Request 6068 (accepted)

Overview

Request 6068 (accepted)

New stable branch

Created by zaitor 6 months ago
In state accepted
Package maintainer: zaitor

Submit gstreamer-plugins-bad-codecs

Submit package home:zait...sentials / gstreamer...d-codecs to package Essentials / gstreamer-plugins-bad-codecs

gstreamer-plugins-bad-codecs.changes Changed

gstreamer-plugins-bad-codecs.spec Changed

@@ -4,10 +4,10 @@
 
 %define _name gst-plugins-bad
 %define gst_branch 1.0
-%define _version 1.22.0
+%define _version 1.24.0
 
 Name:           gstreamer-plugins-bad-codecs
-Version:        1.22.7
+Version:        1.24.5
 Release:        0
 Summary:        Codecs/plugins for gstreamer-plugins-bad
 License:        LGPL-2.1-or-later
@@ -38,7 +38,7 @@
 #BuildRequires:  pkgconfig(libmodplug)
 BuildRequires:  pkgconfig(libopenaptx)
 BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  pkgconfig(vo-aacenc) >= 0.1.0
+#BuildRequires:  pkgconfig(vo-aacenc) >= 0.1.0
 BuildRequires:  pkgconfig(x265)
 
 Provides:       gstreamer-plugins-bad-orig-addon = %{version}
@@ -89,7 +89,7 @@
 #%%{_libdir}/gstreamer-%%{gst_branch}/libgstmodplug.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstopenaptx.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstrtmp.so
-%{_libdir}/gstreamer-%{gst_branch}/libgstvoaacenc.so
+#%%{_libdir}/gstreamer-%%{gst_branch}/libgstvoaacenc.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstx265.so
 
 %changelog

build_what_we_need_only.patch Changed

@@ -1,61 +1,9 @@
-Index: gst-plugins-bad-1.22.2/meson.build
-===================================================================
---- gst-plugins-bad-1.22.2.orig/meson.build
-+++ gst-plugins-bad-1.22.2/meson.build
-@@ -309,6 +309,8 @@ gstapp_dep = dependency('gstreamer-app-1
-     fallback : 'gst-plugins-base', 'app_dep')
- gstaudio_dep = dependency('gstreamer-audio-1.0', version : gst_req,
-     fallback : 'gst-plugins-base', 'audio_dep')
-+gstcodecparsers_dep = dependency('gstreamer-codecparsers-1.0', version : gst_req,
-+    fallback : 'gst-plugins-bad', 'codecparsers_dep')
- gstfft_dep = dependency('gstreamer-fft-1.0', version : gst_req,
-     fallback : 'gst-plugins-base', 'fft_dep')
- gstriff_dep = dependency('gstreamer-riff-1.0', version : gst_req,
-@@ -540,13 +542,8 @@ pkgconfig.generate(
- 
- gpl_allowed = get_option('gpl').allowed()
- 
--subdir('gst-libs')
- subdir('gst')
--subdir('sys')
- subdir('ext')
--subdir('tests')
--subdir('data')
--subdir('tools')
- 
- if have_orcc
-   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')
-Index: gst-plugins-bad-1.22.2/gst/meson.build
-===================================================================
---- gst-plugins-bad-1.22.2.orig/gst/meson.build
-+++ gst-plugins-bad-1.22.2/gst/meson.build
-@@ -1,19 +1,4 @@
--foreach plugin : 'accurip', 'adpcmdec', 'adpcmenc', 'aiff', 'asfmux',
--                  'audiobuffersplit', 'audiofxbad', 'audiomixmatrix',
--                  'audiolatency', 'audiovisualizers', 'autoconvert', 'bayer',
--                  'camerabin2', 'codecalpha', 'codectimestamper', 'coloreffects',
--                  'debugutils', 'dvbsubenc',
--                  'dvbsuboverlay', 'dvdspu', 'faceoverlay', 'festival',
--                  'fieldanalysis', 'freeverb', 'frei0r', 'gaudieffects', 'gdp',
--                  'geometrictransform', 'id3tag', 'inter', 'interlace',
--                  'ivfparse', 'ivtc', 'jp2kdecimator', 'jpegformat', 'librfb',
--                  'midi', 'mpegdemux', 'mpegpsmux', 'mpegtsdemux', 'mpegtsmux',
--                  'mxf', 'netsim', 'onvif', 'pcapparse', 'pnm', 'proxy',
--                  'rawparse', 'removesilence', 'rist', 'rtmp2', 'rtp', 'sdp',
--                  'segmentclip', 'siren', 'smooth', 'speed', 'subenc', 'switchbin',
--                  'timecode', 'transcode', 'videofilters',
--                  'videoframe_audiolevel', 'videoparsers', 'videosignal',
--                  'vmnc', 'y4m'
-+foreach plugin : 'siren'
-   if not get_option(plugin).disabled()
-     subdir(plugin)
-   endif
-Index: gst-plugins-bad-1.22.2/ext/meson.build
-===================================================================
---- gst-plugins-bad-1.22.2.orig/ext/meson.build
-+++ gst-plugins-bad-1.22.2/ext/meson.build
-@@ -1,75 +1,10 @@
+diff -Nur gst-plugins-bad-1.24.0-orig/ext/meson.build gst-plugins-bad-1.24.0/ext/meson.build
+--- gst-plugins-bad-1.24.0-orig/ext/meson.build	2024-03-05 00:51:42.000000000 +0100
++++ gst-plugins-bad-1.24.0/ext/meson.build	2024-06-28 08:53:47.922413595 +0200
+@@ -1,79 +1,7 @@
 -subdir('aes')
+-subdir('analyticsoverlay')
 -subdir('assrender')
 -subdir('aom')
 -subdir('avtp')
@@ -63,6 +11,7 @@
 -subdir('bz2')
 -subdir('chromaprint')
 -subdir('closedcaption')
+-subdir('codec2json')
 -subdir('colormanagement')
 -subdir('curl')
 -subdir('dash')
@@ -82,13 +31,13 @@
 -subdir('hls')
 -subdir('iqa')
 -subdir('isac')
--subdir('kate')
 -subdir('ladspa')
+-subdir('lc3')
 -subdir('ldac')
  subdir('libde265')
 -subdir('lv2')
 -subdir('mdns')
- subdir('modplug')
+-subdir('modplug')
 -subdir('mpeg2enc')
 -subdir('mplex')
 -subdir('musepack')
@@ -104,6 +53,7 @@
 -subdir('openni2')
 -subdir('opus')
 -subdir('qroverlay')
+-subdir('qt6d3d11')
  subdir('resindvd')
 -subdir('rsvg')
  subdir('rtmp')
@@ -115,10 +65,11 @@
 -subdir('spandsp')
 -subdir('srt')
 -subdir('srtp')
- subdir('svthevcenc')
+-subdir('svtav1')
+-subdir('svthevcenc')
 -subdir('teletextdec')
 -subdir('ttml')
- subdir('voaacenc')
+-subdir('voaacenc')
 -subdir('voamrwbenc')
 -subdir('vulkan')
 -subdir('wayland')
@@ -130,3 +81,53 @@
  subdir('x265')
 -subdir('zxing')
 -subdir('zbar')
+diff -Nur gst-plugins-bad-1.24.0-orig/gst/meson.build gst-plugins-bad-1.24.0/gst/meson.build
+--- gst-plugins-bad-1.24.0-orig/gst/meson.build	2024-03-05 00:51:42.000000000 +0100
++++ gst-plugins-bad-1.24.0/gst/meson.build	2024-06-28 08:22:07.637599366 +0200
+@@ -1,19 +1,4 @@
+-foreach plugin : 'accurip', 'adpcmdec', 'adpcmenc', 'aiff', 'asfmux',
+-                  'audiobuffersplit', 'audiofxbad', 'audiomixmatrix',
+-                  'audiolatency', 'audiovisualizers', 'autoconvert', 'bayer',
+-                  'camerabin2', 'codecalpha', 'codectimestamper', 'coloreffects',
+-                  'debugutils', 'dvbsubenc',
+-                  'dvbsuboverlay', 'dvdspu', 'faceoverlay', 'festival',
+-                  'fieldanalysis', 'freeverb', 'frei0r', 'gaudieffects', 'gdp',
+-                  'geometrictransform', 'id3tag', 'insertbin', 'inter', 'interlace',
+-                  'ivfparse', 'ivtc', 'jp2kdecimator', 'jpegformat', 'librfb',
+-                  'midi', 'mpegdemux', 'mpegpsmux', 'mpegtsdemux', 'mpegtsmux',
+-                  'mse', 'mxf', 'netsim', 'onvif', 'pcapparse', 'pnm', 'proxy',
+-                  'rawparse', 'removesilence', 'rist', 'rtmp2', 'rtp', 'sdp',
+-                  'segmentclip', 'siren', 'smooth', 'speed', 'subenc', 'switchbin',
+-                  'timecode', 'transcode', 'unixfd', 'videofilters',
+-                  'videoframe_audiolevel', 'videoparsers', 'videosignal',
+-                  'vmnc', 'y4m'
++foreach plugin : 'siren'
+   if not get_option(plugin).disabled()
+     subdir(plugin)
+   endif
+diff -Nur gst-plugins-bad-1.24.0-orig/meson.build gst-plugins-bad-1.24.0/meson.build
+--- gst-plugins-bad-1.24.0-orig/meson.build	2024-03-05 00:51:42.000000000 +0100
++++ gst-plugins-bad-1.24.0/meson.build	2024-06-28 08:15:37.518806458 +0200
+@@ -307,6 +307,8 @@
+     fallback : 'gst-plugins-base', 'app_dep')
+ gstaudio_dep = dependency('gstreamer-audio-1.0', version : gst_req,
+     fallback : 'gst-plugins-base', 'audio_dep')
++gstcodecparsers_dep = dependency('gstreamer-codecparsers-1.0', version : gst_req,
++    fallback : 'gst-plugins-bad', 'codecparsers_dep')
+ gstfft_dep = dependency('gstreamer-fft-1.0', version : gst_req,
+     fallback : 'gst-plugins-base', 'fft_dep')
+ gstriff_dep = dependency('gstreamer-riff-1.0', version : gst_req,
+@@ -555,13 +557,8 @@
+ 
+ gpl_allowed = get_option('gpl').allowed()
+ 
+-subdir('gst-libs')
+ subdir('gst')
+-subdir('sys')
+ subdir('ext')
+-subdir('tests')
+-subdir('data')
+-subdir('tools')
+ 
+ if have_orcc
+   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')

gst-plugins-bad-1.22.7.tar.xz/ext/kate Deleted

gst-plugins-bad-1.22.7.tar.xz/ext/kate/README Deleted

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkate.c Deleted

@@ -1,75 +0,0 @@
-/*
- * GStreamer
- * Copyright 2005 Thomas Vander Stichele <thomas@apestaart.org>
- * Copyright 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
- * Copyright 2008 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, the contents of this file may be used under the
- * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
- * which case the following provisions apply instead of the ones
- * mentioned above:
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstkateelements.h"
-
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  gboolean ret = FALSE;
-
-  ret |= GST_ELEMENT_REGISTER (katedec, plugin);
-  ret |= GST_ELEMENT_REGISTER (kateenc, plugin);
-  ret |= GST_ELEMENT_REGISTER (kateparse, plugin);
-  ret |= GST_ELEMENT_REGISTER (katetag, plugin);
-#ifdef HAVE_TIGER
-  ret |= GST_ELEMENT_REGISTER (tiger, plugin);
-#endif
-
-  return ret;
-}
-
-/* this is the structure that gstreamer looks for to register plugins
- */
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    kate,
-    "Kate plugin",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkatedec.c Deleted

@@ -1,561 +0,0 @@
-/*
- * GStreamer
- * Copyright 2005 Thomas Vander Stichele <thomas@apestaart.org>
- * Copyright 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
- * Copyright 2008, 2009 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, the contents of this file may be used under the
- * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
- * which case the following provisions apply instead of the ones
- * mentioned above:
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * SECTION:element-katedec
- * @title: katedec
- * @see_also: oggdemux
- *
- * This element decodes Kate streams.
- *
- * Kate(http://libkate.googlecode.com/) is a free codec
- * for text based data, such as subtitles. Any number of kate streams can be
- * embedded in an Ogg stream.
- *
- * libkate (see above url) is needed to build this plugin.
- *
- * ## Example pipeline
- *
- * This explicitly decodes a Kate stream:
- * |
- * gst-launch-1.0 filesrc location=test.ogg ! oggdemux ! katedec ! fakesink silent=TRUE
- * |
- *
- * This will automatically detect and use any Kate streams multiplexed
- * in an Ogg stream:
- * |
- * gst-launch-1.0 playbin uri=file:///tmp/test.ogg
- * |
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-
-#include <gst/gst.h>
-
-#include "gstkateelements.h"
-#include "gstkatespu.h"
-#include "gstkatedec.h"
-
-GST_DEBUG_CATEGORY_EXTERN (gst_katedec_debug);
-#define GST_CAT_DEFAULT gst_katedec_debug
-
-/* Filter signals and args */
-enum
-{
-  /* FILL ME */
-  LAST_SIGNAL
-};
-
-enum
-{
-  ARG_REMOVE_MARKUP = DECODER_BASE_ARG_COUNT
-};
-
-/* We don't accept application/x-kate here on purpose for now, since we're
- * only really interested in subtitle-like things for playback purposes, not
- * cracktastic complex overlays or presentation images etc. - those should be
- * fed into a tiger overlay plugin directly */
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("subtitle/x-kate")
-    );
-
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("text/x-raw, format = { pango-markup, utf8 }; "
-        GST_KATE_SPU_MIME_TYPE)
-    );
-
-GST_DEBUG_CATEGORY (gst_katedec_debug);
-
-#define gst_kate_dec_parent_class parent_class
-G_DEFINE_TYPE (GstKateDec, gst_kate_dec, GST_TYPE_ELEMENT);
-#define _do_init \
-  kate_element_init (plugin); \
-  GST_DEBUG_CATEGORY_INIT (gst_katedec_debug, "katedec", 0, "Kate decoder");
-GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (katedec, "katedec", GST_RANK_PRIMARY,
-    GST_TYPE_KATE_DEC, _do_init);
-
-static void gst_kate_dec_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_kate_dec_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
-static GstFlowReturn gst_kate_dec_chain (GstPad * pad, GstObject * parent,
-    GstBuffer * buf);
-static GstStateChangeReturn gst_kate_dec_change_state (GstElement * element,
-    GstStateChange transition);
-static gboolean gst_kate_dec_sink_query (GstPad * pad, GstObject * parent,
-    GstQuery * query);
-static gboolean gst_kate_dec_sink_event (GstPad * pad, GstObject * parent,
-    GstEvent * event);
-static gboolean gst_kate_dec_sink_handle_event (GstPad * pad,
-    GstObject * parent, GstEvent * event);
-static gboolean gst_kate_dec_src_query (GstPad * pad, GstObject * parent,
-    GstQuery * query);
-
-/* initialize the plugin's class */
-static void
-gst_kate_dec_class_init (GstKateDecClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-
-  gobject_class->set_property = gst_kate_dec_set_property;
-  gobject_class->get_property = gst_kate_dec_get_property;
-
-  gst_kate_util_install_decoder_base_properties (gobject_class);
-
-  g_object_class_install_property (gobject_class, ARG_REMOVE_MARKUP,
-      g_param_spec_boolean ("remove-markup", "Remove markup",
-          "Remove markup from decoded text ?", FALSE,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  gstelement_class->change_state =
-      GST_DEBUG_FUNCPTR (gst_kate_dec_change_state);
-
-  gst_element_class_add_static_pad_template (gstelement_class, &src_factory);
-  gst_element_class_add_static_pad_template (gstelement_class, &sink_factory);
-
-  gst_element_class_set_static_metadata (gstelement_class,
-      "Kate stream text decoder", "Codec/Decoder/Subtitle",
-      "Decodes Kate text streams",
-      "Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>");
-}
-
-/* initialize the new element
- * instantiate pads and add them to element
- * set functions
- * initialize structure
- */
-static void
-gst_kate_dec_init (GstKateDec * dec)
-{
-  GST_DEBUG_OBJECT (dec, "gst_kate_dec_init");
-
-  dec->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
-  gst_pad_set_chain_function (dec->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_dec_chain));
-  gst_pad_set_query_function (dec->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_dec_sink_query));
-  gst_pad_set_event_function (dec->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_dec_sink_event));
-  gst_pad_use_fixed_caps (dec->sinkpad);
-  gst_pad_set_caps (dec->sinkpad,
-      gst_static_pad_template_get_caps (&sink_factory));
-  gst_element_add_pad (GST_ELEMENT (dec), dec->sinkpad);
-
-  dec->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
-  gst_pad_set_query_function (dec->srcpad,
-      GST_DEBUG_FUNCPTR (gst_kate_dec_src_query));
-  gst_element_add_pad (GST_ELEMENT (dec), dec->srcpad);
-
-  gst_kate_util_decode_base_init (&dec->decoder, TRUE);
-
-  dec->src_caps = NULL;
-  dec->output_format = GST_KATE_FORMAT_UNDEFINED;
-  dec->remove_markup = FALSE;
-}
-
-static void
-gst_kate_dec_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  switch (prop_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_kate_dec_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstKateDec *kd = GST_KATE_DEC (object);
-
-  switch (prop_id) {
-    case ARG_REMOVE_MARKUP:
-      g_value_set_boolean (value, kd->remove_markup);
-      break;
-    default:
-      if (!gst_kate_util_decoder_base_get_property (&kd->decoder, object,
-              prop_id, value, pspec)) {
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      }
-      break;
-  }
-}
-
-static GstFlowReturn
-gst_kate_dec_handle_kate_event (GstKateDec * kd, const kate_event * ev)
-{
-  GstFlowReturn rflow = GST_FLOW_OK;
-  GstKateFormat format = GST_KATE_FORMAT_UNDEFINED;
-  gchar *escaped;
-  GstBuffer *buffer;
-  size_t len;
-  gboolean plain = TRUE;
-
-  if (kd->remove_markup && ev->text_markup_type != kate_markup_none) {
-    size_t len0 = ev->len + 1;
-    escaped = g_strdup (ev->text);
-    if (escaped) {
-      kate_text_remove_markup (ev->text_encoding, escaped, &len0);
-    }
-    plain = TRUE;
-  } else if (ev->text_markup_type == kate_markup_none) {
-    /* no pango markup yet, escape text */
-    /* TODO: actually do the pango thing */
-    escaped = g_strdup (ev->text);
-    plain = TRUE;
-  } else {
-    escaped = g_strdup (ev->text);
-    plain = FALSE;
-  }
-
-  if (G_LIKELY (escaped)) {
-    len = strlen (escaped);
-    if (len > 0) {
-      GST_DEBUG_OBJECT (kd, "kate event: %s, escaped %s", ev->text, escaped);
-      buffer = gst_buffer_new_and_alloc (len + 1);
-      if (G_LIKELY (buffer)) {
-        GstCaps *caps;
-        if (plain)
-          format = GST_KATE_FORMAT_TEXT_UTF8;
-        else
-          format = GST_KATE_FORMAT_TEXT_PANGO_MARKUP;
-        if (format != kd->output_format) {
-          caps = gst_caps_new_simple ("text/x-raw", "format", G_TYPE_STRING,
-              (format == GST_KATE_FORMAT_TEXT_UTF8) ? "utf8" : "pango-markup",
-              NULL);
-          gst_pad_push_event (kd->srcpad, gst_event_new_caps (caps));
-          gst_caps_unref (caps);
-          kd->output_format = format;
-        }
-        /* allocate and copy the NULs, but don't include them in passed size */
-        gst_buffer_fill (buffer, 0, escaped, len + 1);
-        gst_buffer_resize (buffer, 0, len);
-        GST_BUFFER_TIMESTAMP (buffer) = ev->start_time * GST_SECOND;
-        GST_BUFFER_DURATION (buffer) =
-            (ev->end_time - ev->start_time) * GST_SECOND;
-        rflow = gst_pad_push (kd->srcpad, buffer);
-        if (rflow == GST_FLOW_NOT_LINKED) {
-          GST_DEBUG_OBJECT (kd, "source pad not linked, ignored");
-        } else if (rflow != GST_FLOW_OK) {
-          GST_WARNING_OBJECT (kd, "failed to push buffer: %s",
-              gst_flow_get_name (rflow));
-        }
-      } else {
-        GST_ELEMENT_ERROR (kd, STREAM, DECODE, (NULL),
-            ("Failed to create buffer"));
-        rflow = GST_FLOW_ERROR;
-      }
-    } else {
-      GST_WARNING_OBJECT (kd, "Empty string, nothing to do");
-      rflow = GST_FLOW_OK;
-    }
-    g_free (escaped);
-  } else {
-    GST_ELEMENT_ERROR (kd, STREAM, DECODE, (NULL),
-        ("Failed to allocate string"));
-    rflow = GST_FLOW_ERROR;
-  }
-
-  /* if there's a background paletted bitmap, construct a DVD SPU for it */
-  if (ev->bitmap && ev->palette) {
-    GstBuffer *buffer = gst_kate_spu_encode_spu (kd, ev);
-    if (buffer) {
-      GstCaps *caps;
-
-      GST_BUFFER_TIMESTAMP (buffer) = ev->start_time * GST_SECOND;
-      GST_BUFFER_DURATION (buffer) =
-          (ev->end_time - ev->start_time) * GST_SECOND;
-
-      if (kd->output_format != GST_KATE_FORMAT_SPU) {
-        caps = gst_caps_new_empty_simple (GST_KATE_SPU_MIME_TYPE);
-        gst_pad_push_event (kd->srcpad, gst_event_new_caps (caps));
-        gst_caps_unref (caps);
-        kd->output_format = GST_KATE_FORMAT_SPU;
-      }
-
-      rflow = gst_pad_push (kd->srcpad, buffer);
-      if (rflow == GST_FLOW_NOT_LINKED) {
-        GST_DEBUG_OBJECT (kd, "source pad not linked, ignored");
-      } else if (rflow != GST_FLOW_OK) {
-        GST_WARNING_OBJECT (kd, "failed to push buffer: %s",
-            gst_flow_get_name (rflow));
-      }
-    } else {
-      GST_ELEMENT_ERROR (kd, STREAM, DECODE, (NULL),
-          ("failed to create SPU from paletted bitmap"));
-      rflow = GST_FLOW_ERROR;
-    }
-  }
-  return rflow;
-}
-
-/* GstElement vmethod implementations */
-
-/* chain function
- * this function does the actual processing
- */
-
-static GstFlowReturn
-gst_kate_dec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
-{
-  GstKateDec *kd = GST_KATE_DEC (parent);
-  const kate_event *ev = NULL;
-  GstFlowReturn rflow = GST_FLOW_OK;
-
-  if (!gst_kate_util_decoder_base_update_segment (&kd->decoder,
-          GST_ELEMENT_CAST (kd), buf)) {
-    GST_WARNING_OBJECT (kd, "Out of segment!");
-    goto not_in_seg;
-  }
-
-  rflow =
-      gst_kate_util_decoder_base_chain_kate_packet (&kd->decoder,
-      GST_ELEMENT_CAST (kd), pad, buf, kd->srcpad, kd->srcpad, &kd->src_caps,
-      &ev);
-  if (G_UNLIKELY (rflow != GST_FLOW_OK)) {
-    gst_buffer_unref (buf);
-    return rflow;
-  }
-
-  if (ev) {
-    rflow = gst_kate_dec_handle_kate_event (kd, ev);
-  }
-
-not_in_seg:
-  gst_buffer_unref (buf);
-  return rflow;
-}
-
-static GstStateChangeReturn
-gst_kate_dec_change_state (GstElement * element, GstStateChange transition)
-{
-  GstStateChangeReturn ret;
-  GstKateDec *kd = GST_KATE_DEC (element);
-
-  ret = gst_kate_decoder_base_change_state (&kd->decoder, element,
-      parent_class, transition);
-
-  if (transition == GST_STATE_CHANGE_PAUSED_TO_READY) {
-    gst_caps_replace (&kd->src_caps, NULL);
-  }
-
-  return ret;
-}
-
-gboolean
-gst_kate_dec_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
-{
-  GstKateDec *kd = GST_KATE_DEC (parent);
-  gboolean res =
-      gst_kate_decoder_base_sink_query (&kd->decoder, GST_ELEMENT_CAST (kd),
-      pad, parent, query);
-  return res;
-}
-
-static gboolean
-gst_kate_dec_set_caps (GstKateDec * kd, GstCaps * caps)
-{
-  GstStructure *structure = gst_caps_get_structure (caps, 0);
-  GstFlowReturn rflow = GST_FLOW_OK;
-
-  if (gst_structure_has_field (structure, "streamheader")) {
-    const GValue *value;
-    GstBuffer *buf;
-    const kate_event *ev;
-
-    value = gst_structure_get_value (structure, "streamheader");
-
-    if (GST_VALUE_HOLDS_BUFFER (value)) {
-      buf = gst_value_get_buffer (value);
-
-      gst_kate_util_decoder_base_chain_kate_packet (&kd->decoder,
-          GST_ELEMENT_CAST (kd), kd->sinkpad, buf, kd->srcpad, kd->srcpad,
-          &kd->src_caps, &ev);
-
-      if (ev) {
-        rflow = gst_kate_dec_handle_kate_event (kd, ev);
-      }
-    } else if (GST_VALUE_HOLDS_ARRAY (value)) {
-      gint i, size = gst_value_array_get_size (value);
-
-      for (i = 0; i < size; i++) {
-        const GValue *v = gst_value_array_get_value (value, i);
-
-        buf = gst_value_get_buffer (v);
-        gst_kate_util_decoder_base_chain_kate_packet (&kd->decoder,
-            GST_ELEMENT_CAST (kd), kd->sinkpad, buf, kd->srcpad, kd->srcpad,
-            &kd->src_caps, &ev);
-
-        if (ev) {
-          rflow = gst_kate_dec_handle_kate_event (kd, ev);
-          if (rflow != GST_FLOW_OK && rflow != GST_FLOW_NOT_LINKED)
-            break;
-        }
-      }
-    } else {
-      GST_WARNING_OBJECT (kd, "Unhandled streamheader type: %s",
-          G_VALUE_TYPE_NAME (value));
-    }
-  }
-
-  return rflow == GST_FLOW_OK || rflow == GST_FLOW_NOT_LINKED;
-}
-
-static gboolean
-gst_kate_dec_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
-{
-  GstKateDec *kd = GST_KATE_DEC (parent);
-  gboolean res = TRUE;
-
-  GST_LOG_OBJECT (pad, "Event on sink pad: %" GST_PTR_FORMAT, event);
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_CAPS:{
-      GstCaps *caps;
-
-      gst_event_parse_caps (event, &caps);
-      gst_kate_dec_set_caps (kd, caps);
-      break;
-    }
-    default:
-      break;
-  }
-
-  /* Delay events till we've set caps */
-  if (gst_kate_util_decoder_base_queue_event (&kd->decoder, event,
-          &gst_kate_dec_sink_handle_event, parent, pad)) {
-    return TRUE;
-  }
-
-  res = gst_kate_dec_sink_handle_event (pad, parent, event);
-
-  return res;
-}
-
-static gboolean
-gst_kate_dec_sink_handle_event (GstPad * pad, GstObject * parent,
-    GstEvent * event)
-{
-  GstKateDec *kd = GST_KATE_DEC (parent);
-
-  GST_LOG_OBJECT (pad, "Handling event on sink pad: %s",
-      GST_EVENT_TYPE_NAME (event));
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_SEGMENT:
-      break;
-
-    case GST_EVENT_FLUSH_START:
-      gst_kate_util_decoder_base_set_flushing (&kd->decoder, TRUE);
-      break;
-
-    case GST_EVENT_FLUSH_STOP:
-      gst_kate_util_decoder_base_set_flushing (&kd->decoder, FALSE);
-      break;
-
-    case GST_EVENT_TAG:{
-      GstTagList *tags;
-      gst_event_parse_tag (event, &tags);
-      gst_kate_util_decoder_base_add_tags (&kd->decoder, tags, FALSE);
-      gst_event_unref (event);
-      event = gst_kate_util_decoder_base_get_tag_event (&kd->decoder);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return gst_pad_event_default (pad, parent, event);
-}
-
-static gboolean
-gst_kate_dec_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
-{
-  GstKateDec *kd = GST_KATE_DEC (parent);
-  gboolean res = TRUE;
-
-  GST_LOG_OBJECT (pad, "Handling query on src pad: %s",
-      GST_QUERY_TYPE_NAME (query));
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_CAPS:{
-      GstCaps *caps;
-
-      if (kd->src_caps) {
-        GST_DEBUG_OBJECT (kd, "We have src caps %" GST_PTR_FORMAT,
-            kd->src_caps);
-        caps = gst_caps_copy (kd->src_caps);
-      } else {
-        GST_DEBUG_OBJECT (kd, "We have no src caps, using template caps");
-        caps = gst_static_pad_template_get_caps (&src_factory);
-      }
-
-      gst_query_set_caps_result (query, caps);
-      gst_caps_unref (caps);
-      break;
-    }
-    default:
-      res = gst_pad_query_default (pad, parent, query);
-      break;
-  }
-
-  return res;
-}

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkatedec.h Deleted

@@ -1,90 +0,0 @@
-/*
- * GStreamer
- * Copyright 2005 Thomas Vander Stichele <thomas@apestaart.org>
- * Copyright 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
- * Copyright 2008 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, the contents of this file may be used under the
- * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
- * which case the following provisions apply instead of the ones
- * mentioned above:
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_KATE_DEC_H__
-#define __GST_KATE_DEC_H__
-
-#include <kate/kate.h>
-#include <gst/gst.h>
-#include "gstkateutil.h"
-
-G_BEGIN_DECLS
-/* #defines don't like whitespacey bits */
-#define GST_TYPE_KATE_DEC \
-  (gst_kate_dec_get_type())
-#define GST_KATE_DEC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_KATE_DEC,GstKateDec))
-#define GST_KATE_DEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_KATE,GstKateDecClass))
-#define GST_IS_KATE_DEC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_KATE_DEC))
-#define GST_IS_KATE_DEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_KATE_DEC))
-typedef struct _GstKateDec GstKateDec;
-typedef struct _GstKateDecClass GstKateDecClass;
-
-struct _GstKateDec
-{
-  GstKateDecoderBase decoder;
-
-  GstPad *sinkpad;
-  GstPad *srcpad;
-
-  GstCaps *src_caps;
-
-  GstKateFormat output_format;
-
-  gboolean remove_markup;
-};
-
-struct _GstKateDecClass
-{
-  GstElementClass parent_class;
-};
-
-GType gst_kate_dec_get_type (void);
-
-G_END_DECLS
-#endif /* __GST_KATE_DEC_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkateelement.c Deleted

@@ -1,72 +0,0 @@
-/*
- * GStreamer
- * Copyright 2005 Thomas Vander Stichele <thomas@apestaart.org>
- * Copyright 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
- * Copyright 2008 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, the contents of this file may be used under the
- * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
- * which case the following provisions apply instead of the ones
- * mentioned above:
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-
-#include <gst/gst.h>
-
-#include "gstkateelements.h"
-
-#undef HAVE_TIGER
-#ifdef HAVE_TIGER
-#include "gstkatetiger.h"
-#endif
-
-GST_DEBUG_CATEGORY (gst_kateutil_debug);
-
-void
-kate_element_init (GstPlugin * plugin)
-{
-  static gsize res = FALSE;
-  if (g_once_init_enter (&res)) {
-    GST_DEBUG_CATEGORY_INIT (gst_kateutil_debug, "kateutil", 0,
-        "Kate utility functions");
-    g_once_init_leave (&res, TRUE);
-  }
-}

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkateelements.h Deleted

@@ -1,62 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2008 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, the contents of this file may be used under the
- * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
- * which case the following provisions apply instead of the ones
- * mentioned above:
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_KATE_ELEMENT_H__
-#define __GST_KATE_ELEMENT_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-void kate_element_init (GstPlugin * plugin);
-
-GST_ELEMENT_REGISTER_DECLARE (katedec);
-GST_ELEMENT_REGISTER_DECLARE (kateenc);
-GST_ELEMENT_REGISTER_DECLARE (kateparse);
-GST_ELEMENT_REGISTER_DECLARE (tiger);
-GST_ELEMENT_REGISTER_DECLARE (katetag);
-
-
-G_END_DECLS
-
-#endif /* __GST_KATE_ELEMENT_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkateenc.c Deleted

@@ -1,1401 +0,0 @@
-/*
- * GStreamer
- * Copyright 2005 Thomas Vander Stichele <thomas@apestaart.org>
- * Copyright 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2007 Fluendo S.A. <info@fluendo.com>
- * Copyright 2008, 2009 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, the contents of this file may be used under the
- * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
- * which case the following provisions apply instead of the ones
- * mentioned above:
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * SECTION:element-kateenc
- * @title: kateenc
- * @see_also: oggmux
- *
- * This element encodes Kate streams.
- *
- * Kate(http://libkate.googlecode.com/) is a free codec for text based data,
- * such as subtitles. Any number of kate streams can be embedded in an Ogg
- * stream.
- *
- * libkate (see above url) is needed to build this plugin.
- *
- * ## Example pipeline
- *
- * This encodes a DVD SPU track to a Kate stream:
- * |
- * gst-launch-1.0 dvdreadsrc ! dvddemux ! dvdsubparse ! kateenc category=spu-subtitles ! oggmux ! filesink location=test.ogg
- * |
- *
- */
-
-/* FIXME:
- *  - should we automatically pick up the language code from the
- *    upstream event tags if none was set via the property?
- *  - turn category property into an enum (freestyle text property in
- *    combination with supposedly strictly defined known values that
- *    aren't even particularly human-readable is just not very nice)? */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-
-#include <gst/gst.h>
-#include <gst/gsttagsetter.h>
-#include <gst/tag/tag.h>
-
-#include "gstkateelements.h"
-#include "gstkateutil.h"
-#include "gstkatespu.h"
-#include "gstkateenc.h"
-
-GST_DEBUG_CATEGORY_EXTERN (gst_kateenc_debug);
-#define GST_CAT_DEFAULT gst_kateenc_debug
-
-/* Filter signals and args */
-enum
-{
-  /* FILL ME */
-  LAST_SIGNAL
-};
-
-enum
-{
-  ARG_0,
-  ARG_LANGUAGE,
-  ARG_CATEGORY,
-  ARG_GRANULE_RATE_NUM,
-  ARG_GRANULE_RATE_DEN,
-  ARG_GRANULE_SHIFT,
-  ARG_KEEPALIVE_MIN_TIME,
-  ARG_ORIGINAL_CANVAS_WIDTH,
-  ARG_ORIGINAL_CANVAS_HEIGHT,
-  ARG_DEFAULT_SPU_DURATION,
-};
-
-#define DEFAULT_KEEPALIVE_MIN_TIME 2.5f
-#define DEFAULT_DEFAULT_SPU_DURATION 1.5f
-
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("text/x-raw, format={ pango-markup, utf8 }; "
-        GST_KATE_SPU_MIME_TYPE)
-    );
-
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("subtitle/x-kate; application/x-kate")
-    );
-
-static void gst_kate_enc_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_kate_enc_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-static void gst_kate_enc_dispose (GObject * object);
-
-static gboolean gst_kate_enc_setcaps (GstKateEnc * ke, GstCaps * caps);
-static GstFlowReturn gst_kate_enc_chain (GstPad * pad, GstObject * parent,
-    GstBuffer * buf);
-static GstStateChangeReturn gst_kate_enc_change_state (GstElement * element,
-    GstStateChange transition);
-static gboolean gst_kate_enc_sink_event (GstPad * pad, GstObject * parent,
-    GstEvent * event);
-static gboolean gst_kate_enc_source_query (GstPad * pad, GstObject * parent,
-    GstQuery * query);
-
-GST_DEBUG_CATEGORY (gst_kateenc_debug);
-
-#define gst_kate_enc_parent_class parent_class
-G_DEFINE_TYPE_WITH_CODE (GstKateEnc, gst_kate_enc, GST_TYPE_ELEMENT,
-    G_IMPLEMENT_INTERFACE (GST_TYPE_TAG_SETTER, NULL));
-#define _do_init \
-  kate_element_init (plugin); \
-  GST_DEBUG_CATEGORY_INIT (gst_kateenc_debug, "kateenc", 0, "Kate encoder");
-GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (kateenc, "kateenc", GST_RANK_NONE,
-    GST_TYPE_KATE_ENC, _do_init);
-
-/* initialize the plugin's class */
-static void
-gst_kate_enc_class_init (GstKateEncClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-
-  gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_kate_enc_set_property);
-  gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_kate_enc_get_property);
-  gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_kate_enc_dispose);
-
-  g_object_class_install_property (gobject_class, ARG_LANGUAGE,
-      g_param_spec_string ("language", "Language",
-          "The language of the stream (e.g. \"fr\" or \"fr_FR\" for French)",
-          "", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_CATEGORY,
-      g_param_spec_string ("category", "Category",
-          "The category of the stream", "",
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_GRANULE_RATE_NUM,
-      g_param_spec_int ("granule-rate-numerator", "Granule rate numerator",
-          "The numerator of the granule rate",
-          1, G_MAXINT, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_GRANULE_RATE_DEN,
-      g_param_spec_int ("granule-rate-denominator", "Granule rate denominator",
-          "The denominator of the granule rate",
-          1, G_MAXINT, 1000, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_GRANULE_SHIFT,
-      g_param_spec_int ("granule-shift", "Granule shift",
-          "The granule shift", 0, 64, 32,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_ORIGINAL_CANVAS_WIDTH,
-      g_param_spec_int ("original-canvas-width", "Original canvas width",
-          "The width of the canvas this stream was authored for (0 is unspecified)",
-          0, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_ORIGINAL_CANVAS_HEIGHT,
-      g_param_spec_int ("original-canvas-height", "Original canvas height",
-          "The height of the canvas this stream was authored for (0 is unspecified)",
-          0, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_KEEPALIVE_MIN_TIME,
-      g_param_spec_float ("keepalive-min-time", "Keepalive minimum time",
-          "Minimum time to emit keepalive packets (0 disables keepalive packets)",
-          0.0f, FLT_MAX, DEFAULT_KEEPALIVE_MIN_TIME,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEFAULT_SPU_DURATION,
-      g_param_spec_float ("default-spu-duration", "Default SPU duration",
-          "The assumed max duration (in seconds) of SPUs with no duration specified",
-          0.0f, FLT_MAX, DEFAULT_DEFAULT_SPU_DURATION,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  gstelement_class->change_state =
-      GST_DEBUG_FUNCPTR (gst_kate_enc_change_state);
-
-  gst_element_class_add_static_pad_template (gstelement_class, &src_factory);
-  gst_element_class_add_static_pad_template (gstelement_class, &sink_factory);
-
-  gst_element_class_set_static_metadata (gstelement_class,
-      "Kate stream encoder", "Codec/Encoder/Subtitle",
-      "Encodes Kate streams from text or subpictures",
-      "Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>");
-}
-
-/* initialize the new element
- * instantiate pads and add them to element
- * set functions
- * initialize structure
- */
-static void
-gst_kate_enc_init (GstKateEnc * ke)
-{
-  GST_DEBUG_OBJECT (ke, "gst_kate_enc_init");
-
-  ke->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
-  gst_pad_set_chain_function (ke->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_enc_chain));
-  gst_pad_set_event_function (ke->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_enc_sink_event));
-  gst_element_add_pad (GST_ELEMENT (ke), ke->sinkpad);
-
-  ke->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
-  gst_pad_set_query_function (ke->srcpad,
-      GST_DEBUG_FUNCPTR (gst_kate_enc_source_query));
-  gst_element_add_pad (GST_ELEMENT (ke), ke->srcpad);
-
-  ke->initialized = FALSE;
-  ke->headers_sent = FALSE;
-  ke->last_timestamp = 0;
-  ke->latest_end_time = 0;
-  ke->language = NULL;
-  ke->category = NULL;
-  ke->format = GST_KATE_FORMAT_UNDEFINED;
-  ke->granule_rate_numerator = 1000;
-  ke->granule_rate_denominator = 1;
-  ke->granule_shift = 32;
-  ke->original_canvas_width = 0;
-  ke->original_canvas_height = 0;
-  ke->keepalive_min_time = DEFAULT_KEEPALIVE_MIN_TIME;
-  ke->default_spu_duration = DEFAULT_DEFAULT_SPU_DURATION;
-  memcpy (ke->spu_clut, gst_kate_spu_default_clut,
-      sizeof (gst_kate_spu_default_clut));
-  ke->delayed_spu = FALSE;
-  ke->delayed_bitmap = NULL;
-  ke->delayed_palette = NULL;
-  ke->delayed_region = NULL;
-}
-
-static void
-gst_kate_enc_dispose (GObject * object)
-{
-  GstKateEnc *ke = GST_KATE_ENC (object);
-
-  GST_LOG_OBJECT (ke, "disposing");
-
-  if (ke->language) {
-    g_free (ke->language);
-    ke->language = NULL;
-  }
-  if (ke->category) {
-    g_free (ke->category);
-    ke->category = NULL;
-  }
-
-  GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
-}
-
-static void
-gst_kate_enc_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstKateEnc *ke = GST_KATE_ENC (object);
-  const char *str;
-
-  switch (prop_id) {
-    case ARG_LANGUAGE:
-      if (ke->language) {
-        g_free (ke->language);
-        ke->language = NULL;
-      }
-      str = g_value_get_string (value);
-      if (str)
-        ke->language = g_strdup (str);
-      break;
-    case ARG_CATEGORY:
-      if (ke->category) {
-        g_free (ke->category);
-        ke->category = NULL;
-      }
-      str = g_value_get_string (value);
-      if (str)
-        ke->category = g_strdup (str);
-      break;
-    case ARG_GRANULE_RATE_NUM:
-      ke->granule_rate_numerator = g_value_get_int (value);
-      break;
-    case ARG_GRANULE_RATE_DEN:
-      ke->granule_rate_denominator = g_value_get_int (value);
-      break;
-    case ARG_GRANULE_SHIFT:
-      ke->granule_rate_denominator = g_value_get_int (value);
-      break;
-    case ARG_KEEPALIVE_MIN_TIME:
-      ke->keepalive_min_time = g_value_get_float (value);
-      break;
-    case ARG_ORIGINAL_CANVAS_WIDTH:
-      ke->original_canvas_width = g_value_get_int (value);
-      break;
-    case ARG_ORIGINAL_CANVAS_HEIGHT:
-      ke->original_canvas_height = g_value_get_int (value);
-      break;
-    case ARG_DEFAULT_SPU_DURATION:
-      ke->default_spu_duration = g_value_get_float (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_kate_enc_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstKateEnc *ke = GST_KATE_ENC (object);
-
-  switch (prop_id) {
-    case ARG_LANGUAGE:
-      g_value_set_string (value, ke->language ? ke->language : "");
-      break;
-    case ARG_CATEGORY:
-      g_value_set_string (value, ke->category ? ke->category : "");
-      break;
-    case ARG_GRANULE_RATE_NUM:
-      g_value_set_int (value, ke->granule_rate_numerator);
-      break;
-    case ARG_GRANULE_RATE_DEN:
-      g_value_set_int (value, ke->granule_rate_denominator);
-      break;
-    case ARG_GRANULE_SHIFT:
-      g_value_set_int (value, ke->granule_shift);
-      break;
-    case ARG_KEEPALIVE_MIN_TIME:
-      g_value_set_float (value, ke->keepalive_min_time);
-      break;
-    case ARG_ORIGINAL_CANVAS_WIDTH:
-      g_value_set_int (value, ke->original_canvas_width);
-      break;
-    case ARG_ORIGINAL_CANVAS_HEIGHT:
-      g_value_set_int (value, ke->original_canvas_height);
-      break;
-    case ARG_DEFAULT_SPU_DURATION:
-      g_value_set_float (value, ke->default_spu_duration);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-/* GstElement vmethod implementations */
-
-static GstBuffer *
-gst_kate_enc_create_buffer (GstKateEnc * ke, kate_packet * kp,
-    kate_int64_t granpos, GstClockTime timestamp, GstClockTime duration,
-    gboolean header)
-{
-  GstBuffer *buffer;
-
-  g_return_val_if_fail (kp != NULL, NULL);
-  g_return_val_if_fail (kp->data != NULL, NULL);
-
-  buffer = gst_buffer_new_allocate (NULL, kp->nbytes, NULL);
-  if (G_UNLIKELY (!buffer)) {
-    GST_WARNING_OBJECT (ke, "Failed to allocate buffer for %u bytes",
-        (guint) kp->nbytes);
-    return NULL;
-  }
-
-  gst_buffer_fill (buffer, 0, kp->data, kp->nbytes);
-
-  /* same system as other Ogg codecs, as per ext/ogg/README:
-     OFFSET_END is the granulepos
-     OFFSET is its time representation
-   */
-  GST_BUFFER_OFFSET_END (buffer) = granpos;
-  GST_BUFFER_OFFSET (buffer) = timestamp;
-  GST_BUFFER_TIMESTAMP (buffer) = timestamp;
-  GST_BUFFER_DURATION (buffer) = duration;
-
-  return buffer;
-}
-
-static GstFlowReturn
-gst_kate_enc_push_buffer (GstKateEnc * ke, GstBuffer * buffer)
-{
-  GstFlowReturn flow;
-
-  ke->last_timestamp = GST_BUFFER_TIMESTAMP (buffer);
-  if (GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer) >
-      ke->latest_end_time) {
-    ke->latest_end_time =
-        GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer);
-  }
-
-  flow = gst_pad_push (ke->srcpad, buffer);
-  if (G_UNLIKELY (flow != GST_FLOW_OK)) {
-    GST_WARNING_OBJECT (ke->srcpad, "push flow: %s", gst_flow_get_name (flow));
-  }
-
-  return flow;
-}
-
-static GstFlowReturn
-gst_kate_enc_push_and_free_kate_packet (GstKateEnc * ke, kate_packet * kp,
-    kate_int64_t granpos, GstClockTime timestamp, GstClockTime duration,
-    gboolean header)
-{
-  GstBuffer *buffer;
-
-  GST_LOG_OBJECT (ke, "Creating buffer, %u bytes", (guint) kp->nbytes);
-  buffer =
-      gst_kate_enc_create_buffer (ke, kp, granpos, timestamp, duration, header);
-  if (G_UNLIKELY (!buffer)) {
-    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-        ("Failed to create buffer, %u bytes", (guint) kp->nbytes));
-    kate_packet_clear (kp);
-    return GST_FLOW_ERROR;
-  }
-
-  kate_packet_clear (kp);
-
-  return gst_kate_enc_push_buffer (ke, buffer);
-}
-
-static void
-gst_kate_enc_metadata_set1 (const GstTagList * list, const gchar * tag,
-    gpointer kateenc)
-{
-  GstKateEnc *ke = GST_KATE_ENC (kateenc);
-  GList *vc_list, *l;
-
-  vc_list = gst_tag_to_vorbis_comments (list, tag);
-
-  for (l = vc_list; l != NULL; l = l->next) {
-    const gchar *vc_string = (const gchar *) l->data;
-    gchar *key = NULL, *val = NULL;
-
-    GST_LOG_OBJECT (ke, "Kate comment: %s", vc_string);
-    if (gst_tag_parse_extended_comment (vc_string, &key, NULL, &val, TRUE)) {
-      kate_comment_add_tag (&ke->kc, key, val);
-      g_free (key);
-      g_free (val);
-    }
-  }
-
-  g_list_foreach (vc_list, (GFunc) g_free, NULL);
-  g_list_free (vc_list);
-}
-
-static void
-gst_kate_enc_set_metadata (GstKateEnc * ke)
-{
-  GstTagList *merged_tags;
-  const GstTagList *user_tags;
-
-  user_tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (ke));
-
-  GST_DEBUG_OBJECT (ke, "upstream tags = %" GST_PTR_FORMAT, ke->tags);
-  GST_DEBUG_OBJECT (ke, "user-set tags = %" GST_PTR_FORMAT, user_tags);
-
-  /* gst_tag_list_merge() will handle NULL for either or both lists fine */
-  merged_tags = gst_tag_list_merge (user_tags, ke->tags,
-      gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (ke)));
-
-  if (merged_tags) {
-    GST_DEBUG_OBJECT (ke, "merged   tags = %" GST_PTR_FORMAT, merged_tags);
-    gst_tag_list_foreach (merged_tags, gst_kate_enc_metadata_set1, ke);
-    gst_tag_list_unref (merged_tags);
-  }
-}
-
-static gboolean
-gst_kate_enc_setcaps (GstKateEnc * ke, GstCaps * caps)
-{
-  GST_LOG_OBJECT (ke, "input caps: %" GST_PTR_FORMAT, caps);
-
-  /* One day we could try to automatically set the category based on the
-   * input format, assuming that the input is subtitles. Currently that
-   * doesn't work yet though, because we send the header packets already from
-   * the sink event handler when receiving the newsegment event, so before
-   * the first buffer (might be tricky to change too, given that there could
-   * be no data at the beginning for a long time). So for now we just try to
-   * make sure people didn't set the category to something obviously wrong. */
-  if (ke->category != NULL) {
-    GstStructure *s = gst_caps_get_structure (caps, 0);
-
-    if (gst_structure_has_name (s, "text/x-raw")) {
-      const gchar *format;
-
-      format = gst_structure_get_string (s, "format");
-      if (strcmp (format, "utf8") == 0) {
-        ke->format = GST_KATE_FORMAT_TEXT_UTF8;
-      } else if (strcmp (format, "pango-markup") == 0) {
-        ke->format = GST_KATE_FORMAT_TEXT_PANGO_MARKUP;
-      }
-
-      if (strcmp (ke->category, "K-SPU") == 0 ||
-          strcmp (ke->category, "spu-subtitles") == 0) {
-        GST_ELEMENT_WARNING (ke, LIBRARY, SETTINGS, (NULL),
-            ("Category set to '%s', but input is text-based.", ke->category));
-      }
-    } else if (gst_structure_has_name (s, "subpicture/x-dvd")) {
-      ke->format = GST_KATE_FORMAT_SPU;
-      if (strcmp (ke->category, "SUB") == 0 ||
-          strcmp (ke->category, "subtitles") == 0) {
-        GST_ELEMENT_WARNING (ke, LIBRARY, SETTINGS, (NULL),
-            ("Category set to '%s', but input is subpictures.", ke->category));
-      }
-    } else {
-      GST_ERROR_OBJECT (ke, "unexpected input caps %" GST_PTR_FORMAT, caps);
-      return FALSE;
-    }
-  }
-
-  return TRUE;
-}
-
-static gboolean
-gst_kate_enc_is_simple_subtitle_category (GstKateEnc * ke, const char *category)
-{
-  static const char *const simple = {
-    "subtitles",
-    "SUB",
-    "spu-subtitles",
-    "K-SPU",
-  };
-  int n;
-
-  if (!category)
-    return FALSE;
-  for (n = 0; n < G_N_ELEMENTS (simple); ++n) {
-    if (!strcmp (category, simplen))
-      return TRUE;
-  }
-  return FALSE;
-}
-
-static GstFlowReturn
-gst_kate_enc_send_headers (GstKateEnc * ke)
-{
-  GstFlowReturn rflow = GST_FLOW_OK;
-  GstCaps *caps;
-  GList *headers = NULL, *item;
-
-  if (G_UNLIKELY (ke->category == NULL || *ke->category == '\0')) {
-    /* The error code is a bit of a lie, but seems most appropriate. */
-    GST_ELEMENT_ERROR (ke, LIBRARY, SETTINGS, (NULL),
-        ("The 'category' property must be set. For subtitles, set it to "
-            "either 'SUB' (text subtitles) or 'K-SPU' (dvd-style subtitles)"));
-    return GST_FLOW_ERROR;
-  }
-
-  gst_kate_enc_set_metadata (ke);
-
-  /* encode headers and store them in a list */
-  while (1) {
-    kate_packet kp;
-    int ret = kate_encode_headers (&ke->k, &ke->kc, &kp);
-    if (ret == 0) {
-      GstBuffer *buffer;
-
-      buffer = gst_kate_enc_create_buffer (ke, &kp, 0, 0, 0, TRUE);
-      if (!buffer) {
-        GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-            ("Failed to create buffer, %u bytes", (guint) kp.nbytes));
-        rflow = GST_FLOW_ERROR;
-        break;
-      }
-      kate_packet_clear (&kp);
-
-      GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_HEADER);
-      headers = g_list_append (headers, buffer);
-    } else if (ret > 0) {
-      GST_LOG_OBJECT (ke, "Last header encoded");
-      break;
-    } else {
-      GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-          ("Failed encoding headers: %s",
-              gst_kate_util_get_error_message (ret)));
-      rflow = GST_FLOW_ERROR;
-      break;
-    }
-  }
-
-  if (rflow == GST_FLOW_OK) {
-    if (gst_kate_enc_is_simple_subtitle_category (ke, ke->category)) {
-      caps = gst_kate_util_set_header_on_caps (&ke->element,
-          gst_caps_from_string ("subtitle/x-kate"), headers);
-    } else {
-      caps = gst_kate_util_set_header_on_caps (&ke->element,
-          gst_caps_from_string ("application/x-kate"), headers);
-    }
-    if (caps) {
-      GST_DEBUG_OBJECT (ke, "here are the caps: %" GST_PTR_FORMAT, caps);
-      gst_pad_set_caps (ke->srcpad, caps);
-      gst_caps_unref (caps);
-
-      if (ke->pending_segment)
-        gst_pad_push_event (ke->srcpad, ke->pending_segment);
-      ke->pending_segment = NULL;
-
-      GST_LOG_OBJECT (ke, "pushing headers");
-      item = headers;
-      while (item) {
-        GstBuffer *buffer = item->data;
-        GST_LOG_OBJECT (ke, "pushing header %p", buffer);
-        gst_kate_enc_push_buffer (ke, buffer);
-        item = item->next;
-      }
-    } else {
-      GST_ERROR_OBJECT (ke, "Failed to set headers on caps");
-    }
-  }
-
-  g_list_free (headers);
-
-  return rflow;
-}
-
-static GstFlowReturn
-gst_kate_enc_flush_headers (GstKateEnc * ke)
-{
-  GstFlowReturn rflow = GST_FLOW_OK;
-  if (!ke->headers_sent) {
-    GST_INFO_OBJECT (ke, "headers not yet sent, flushing");
-    rflow = gst_kate_enc_send_headers (ke);
-    if (rflow == GST_FLOW_OK) {
-      ke->headers_sent = TRUE;
-      GST_INFO_OBJECT (ke, "headers flushed");
-    } else {
-      GST_WARNING_OBJECT (ke, "Failed to flush headers: %s",
-          gst_flow_get_name (rflow));
-    }
-  }
-  return rflow;
-}
-
-static GstFlowReturn
-gst_kate_enc_chain_push_packet (GstKateEnc * ke, kate_packet * kp,
-    GstClockTime start, GstClockTime duration)
-{
-  kate_int64_t granpos;
-  GstFlowReturn rflow;
-
-  granpos = kate_encode_get_granule (&ke->k);
-  if (G_UNLIKELY (granpos < 0)) {
-    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-        ("Negative granpos for packet"));
-    kate_packet_clear (kp);
-    return GST_FLOW_ERROR;
-  }
-  rflow =
-      gst_kate_enc_push_and_free_kate_packet (ke, kp, granpos, start, duration,
-      FALSE);
-  if (G_UNLIKELY (rflow != GST_FLOW_OK)) {
-    GST_WARNING_OBJECT (ke, "Failed to push Kate packet");
-  }
-  return rflow;
-}
-
-static void
-gst_kate_enc_generate_keepalive (GstKateEnc * ke, GstClockTime timestamp)
-{
-  kate_packet kp;
-  int ret;
-  kate_float t = timestamp / (double) GST_SECOND;
-  GST_DEBUG_OBJECT (ke, "keepalive at %f", t);
-  ret = kate_encode_keepalive (&ke->k, t, &kp);
-  if (ret < 0) {
-    GST_WARNING_OBJECT (ke, "Failed to encode keepalive packet: %s",
-        gst_kate_util_get_error_message (ret));
-  } else {
-    kate_int64_t granpos = kate_encode_get_granule (&ke->k);
-    GST_LOG_OBJECT (ke, "Keepalive packet encoded");
-    if (gst_kate_enc_push_and_free_kate_packet (ke, &kp, granpos, timestamp, 0,
-            FALSE)) {
-      GST_WARNING_OBJECT (ke, "Failed to push keepalive packet");
-    }
-  }
-}
-
-static GstFlowReturn
-gst_kate_enc_flush_waiting (GstKateEnc * ke, GstClockTime now)
-{
-  GstFlowReturn rflow = GST_FLOW_OK;
-  if (ke->delayed_spu) {
-    int ret;
-    kate_packet kp;
-    GstClockTime keepalive_time;
-
-    kate_float t0 = ke->delayed_start / (double) GST_SECOND;
-    kate_float t1 = now / (double) GST_SECOND;
-
-    GST_INFO_OBJECT (ke,
-        "We had a delayed SPU packet starting at %f, flushing at %f (assumed duration %f)",
-        t0, t1, t1 - t0);
-
-    ret = kate_encode_text (&ke->k, t0, t1, "", 0, &kp);
-    if (G_UNLIKELY (ret < 0)) {
-      GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-          ("Failed to encode text packet: %s",
-              gst_kate_util_get_error_message (ret)));
-      rflow = GST_FLOW_ERROR;
-    } else {
-      rflow =
-          gst_kate_enc_chain_push_packet (ke, &kp, ke->delayed_start,
-          now - ke->delayed_start + 1);
-    }
-
-    if (rflow == GST_FLOW_OK) {
-      GST_DEBUG_OBJECT (ke, "delayed SPU packet flushed");
-    } else {
-      GST_WARNING_OBJECT (ke, "Failed to flush delayed SPU packet: %s",
-          gst_flow_get_name (rflow));
-    }
-
-    /* forget it even if we couldn't flush it */
-    ke->delayed_spu = FALSE;
-
-    /* free the delayed data */
-    g_free (ke->delayed_bitmap->pixels);
-    g_free (ke->delayed_bitmap);
-    ke->delayed_bitmap = NULL;
-    g_free (ke->delayed_palette->colors);
-    g_free (ke->delayed_palette);
-    ke->delayed_palette = NULL;
-    g_free (ke->delayed_region);
-    ke->delayed_region = NULL;
-
-    /* now that we've flushed the packet, we want to insert keepalives as requested */
-    if (ke->keepalive_min_time > 0.0f && t1 > t0) {
-      GST_INFO_OBJECT (ke, "generating keepalives at %f from %f to %f",
-          ke->keepalive_min_time, t0, t1);
-      for (keepalive_time = ke->delayed_start;
-          (keepalive_time += ke->keepalive_min_time * GST_SECOND) < now;) {
-        GST_INFO_OBJECT (ke, "generating keepalive at %f",
-            keepalive_time / (double) GST_SECOND);
-        gst_kate_enc_generate_keepalive (ke, keepalive_time);
-      }
-    }
-  }
-  return rflow;
-}
-
-static GstFlowReturn
-gst_kate_enc_chain_spu (GstKateEnc * ke, GstBuffer * buf)
-{
-  kate_packet kp;
-  kate_region *kregion;
-  kate_bitmap *kbitmap;
-  kate_palette *kpalette;
-  GstFlowReturn rflow;
-  int ret = 0;
-  GstClockTime start, stop;
-  kate_float t0, t1;
-
-  /* allocate region, bitmap, and palette, in case we have to delay encoding them */
-  kregion = (kate_region *) g_malloc (sizeof (kate_region));
-  kbitmap = (kate_bitmap *) g_malloc (sizeof (kate_bitmap));
-  kpalette = (kate_palette *) g_malloc (sizeof (kate_palette));
-  if (!kregion || !kpalette || !kbitmap) {
-    g_free (kregion);
-    g_free (kbitmap);
-    g_free (kpalette);
-    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL), ("Out of memory"));
-    return GST_FLOW_ERROR;
-  }
-
-  rflow = gst_kate_spu_decode_spu (ke, buf, kregion, kbitmap, kpalette);
-  if (G_UNLIKELY (rflow != GST_FLOW_OK)) {
-    GST_ERROR_OBJECT (ke, "Failed to decode incoming SPU");
-#if 0
-    {
-      static int spu_count = 0;
-      FILE *f;
-      char name32;
-      snprintf (name, sizeof (name), "/tmp/bad_spu_%04d", spu_count++);
-      namesizeof (name) - 1 = 0;
-      f = fopen (name, "w");
-      if (f) {
-        fwrite (GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf), 1, f);
-        fclose (f);
-      }
-    }
-#endif
-    goto beach;
-  }
-
-  if (G_UNLIKELY (kbitmap->width == 0 || kbitmap->height == 0)) {
-    /* there are some DVDs (well, at least one) where some dimwits put in a wholly transparent full screen 720x576 SPU !!!!?! */
-    GST_WARNING_OBJECT (ke, "SPU is totally invisible - dimwits");
-    rflow = GST_FLOW_OK;
-    goto beach;
-  }
-
-  /* timestamp offsets are hidden in the SPU packets */
-  start = GST_BUFFER_TIMESTAMP (buf) + GST_KATE_STM_TO_GST (ke->show_time);
-  stop = GST_BUFFER_TIMESTAMP (buf) + GST_KATE_STM_TO_GST (ke->hide_time);
-  t0 = start / (double) GST_SECOND;
-  t1 = stop / (double) GST_SECOND;
-  GST_DEBUG_OBJECT (ke, "buf ts %f, start/show %hu/%hu",
-      GST_BUFFER_TIMESTAMP (buf) / (double) GST_SECOND, ke->show_time,
-      ke->hide_time);
-
-#if 0
-  {
-    static int spu_count = 0;
-    FILE *f;
-    char name32;
-    snprintf (name, sizeof (name), "/tmp/spu_%04d", spu_count++);
-    namesizeof (name) - 1 = 0;
-    f = fopen (name, "w");
-    if (f) {
-      fwrite (GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf), 1, f);
-      fclose (f);
-    }
-  }
-#endif
-  GST_DEBUG_OBJECT (ke, "Encoding %" G_GSIZE_FORMAT "x%" G_GSIZE_FORMAT
-      " SPU: (%" G_GSIZE_FORMAT " bytes) from %f to %f",
-      kbitmap->width, kbitmap->height, gst_buffer_get_size (buf), t0, t1);
-
-  ret = kate_encode_set_region (&ke->k, kregion);
-  if (G_UNLIKELY (ret < 0)) {
-    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-        ("Failed to set region: %s", gst_kate_util_get_error_message (ret)));
-    goto error_return;
-  }
-
-  ret = kate_encode_set_palette (&ke->k, kpalette);
-  if (G_UNLIKELY (ret < 0)) {
-    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-        ("Failed to set palette: %s", gst_kate_util_get_error_message (ret)));
-    goto error_return;
-  }
-
-  ret = kate_encode_set_bitmap (&ke->k, kbitmap);
-  if (G_UNLIKELY (ret < 0)) {
-    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-        ("Failed to set bitmap: %s", gst_kate_util_get_error_message (ret)));
-    goto error_return;
-  }
-
-  /* Some SPUs have no hide time - so I'm going to delay the encoding of the packet
-     till either a suitable event happens, and the time of this event will be used
-     as the end time of this SPU, which will then be encoded and sent off. Suitable
-     events are the arrival of a subsequent SPU (eg, this SPU will replace the one
-     with no end), EOS, a new segment event, or a time threshold being reached */
-  if (ke->hide_time <= ke->show_time) {
-    GST_INFO_OBJECT (ke,
-        "Cannot encode SPU packet now, hide time is now known (starting at %f) - delaying",
-        t0);
-    ke->delayed_spu = TRUE;
-    ke->delayed_start = start;
-    ke->delayed_bitmap = kbitmap;
-    ke->delayed_palette = kpalette;
-    ke->delayed_region = kregion;
-    rflow = GST_FLOW_OK;
-    goto beach;
-  }
-
-  ret = kate_encode_text (&ke->k, t0, t1, "", 0, &kp);
-  if (G_UNLIKELY (ret < 0)) {
-    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-        ("Failed to encode empty text for SPU buffer: %s",
-            gst_kate_util_get_error_message (ret)));
-    goto error_return;
-  }
-
-  rflow = gst_kate_enc_chain_push_packet (ke, &kp, start, stop - start + 1);
-
-beach:
-  /* Cleanup data if we're not keeping it around */
-  if (!ke->delayed_spu) {
-    g_free (kpalette->colors);
-    g_free (kpalette);
-    g_free (kbitmap->pixels);
-    g_free (kbitmap);
-    g_free (kregion);
-  }
-
-  return rflow;
-
-error_return:
-  {
-    rflow = GST_FLOW_ERROR;
-    goto beach;
-  }
-}
-
-static GstFlowReturn
-gst_kate_enc_chain_text (GstKateEnc * ke, GstBuffer * buf)
-{
-  kate_packet kp = { 0 };
-  int ret = 0;
-  GstFlowReturn rflow;
-  GstClockTime start = GST_BUFFER_TIMESTAMP (buf);
-  GstClockTime stop = GST_BUFFER_TIMESTAMP (buf) + GST_BUFFER_DURATION (buf);
-
-  if (ke->format == GST_KATE_FORMAT_TEXT_PANGO_MARKUP) {
-    ret = kate_encode_set_markup_type (&ke->k, kate_markup_simple);
-  } else if (ke->format == GST_KATE_FORMAT_TEXT_UTF8) {
-    ret = kate_encode_set_markup_type (&ke->k, kate_markup_none);
-  } else {
-    return GST_FLOW_ERROR;
-  }
-
-  if (G_UNLIKELY (ret < 0)) {
-    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-        ("Failed to set markup type: %s",
-            gst_kate_util_get_error_message (ret)));
-    rflow = GST_FLOW_ERROR;
-  } else {
-    GstMapInfo info;
-    gboolean need_unmap = TRUE;
-    kate_float t0 = start / (double) GST_SECOND;
-    kate_float t1 = stop / (double) GST_SECOND;
-
-    if (!gst_buffer_map (buf, &info, GST_MAP_READ)) {
-      info.data = NULL;
-      info.size = 0;
-      need_unmap = FALSE;
-      GST_WARNING_OBJECT (buf, "Failed to map buffer");
-    }
-
-    GST_LOG_OBJECT (ke, "Encoding text: %*.*s (%u bytes) from %f to %f",
-        (int) info.size, (int) info.size, info.data, (int) info.size, t0, t1);
-    ret = kate_encode_text (&ke->k, t0, t1, (const char *) info.data, info.size,
-        &kp);
-    if (G_UNLIKELY (ret < 0)) {
-      GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-          ("Failed to encode text: %s", gst_kate_util_get_error_message (ret)));
-      rflow = GST_FLOW_ERROR;
-    } else {
-      rflow = gst_kate_enc_chain_push_packet (ke, &kp, start, stop - start + 1);
-    }
-    if (need_unmap)
-      gst_buffer_unmap (buf, &info);
-  }
-
-  return rflow;
-}
-
-/* chain function
- * this function does the actual processing
- */
-static GstFlowReturn
-gst_kate_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
-{
-  GstKateEnc *ke = GST_KATE_ENC (parent);
-  GstFlowReturn rflow;
-
-  GST_DEBUG_OBJECT (ke, "got packet, %" G_GSIZE_FORMAT " bytes",
-      gst_buffer_get_size (buf));
-
-  /* first push headers if we haven't done that yet */
-  rflow = gst_kate_enc_flush_headers (ke);
-
-  if (G_LIKELY (rflow == GST_FLOW_OK)) {
-    /* flush any packet we had waiting */
-    rflow = gst_kate_enc_flush_waiting (ke, GST_BUFFER_TIMESTAMP (buf));
-
-    if (G_LIKELY (rflow == GST_FLOW_OK)) {
-      if (ke->format == GST_KATE_FORMAT_SPU) {
-        /* encode a kate_bitmap */
-        rflow = gst_kate_enc_chain_spu (ke, buf);
-      } else {
-        /* encode text */
-        rflow = gst_kate_enc_chain_text (ke, buf);
-      }
-    }
-  }
-
-  gst_buffer_unref (buf);
-
-  return rflow;
-}
-
-static GstStateChangeReturn
-gst_kate_enc_change_state (GstElement * element, GstStateChange transition)
-{
-  GstKateEnc *ke = GST_KATE_ENC (element);
-  GstStateChangeReturn res;
-  int ret;
-
-  GST_INFO_OBJECT (ke, "gst_kate_enc_change_state");
-
-  switch (transition) {
-    case GST_STATE_CHANGE_NULL_TO_READY:
-      ke->tags = gst_tag_list_new_empty ();
-      break;
-    case GST_STATE_CHANGE_READY_TO_PAUSED:
-      GST_DEBUG_OBJECT (ke, "READY -> PAUSED, initializing kate state");
-      ret = kate_info_init (&ke->ki);
-      if (ret < 0) {
-        GST_WARNING_OBJECT (ke, "failed to initialize kate info structure: %s",
-            gst_kate_util_get_error_message (ret));
-        break;
-      }
-      if (ke->language) {
-        ret = kate_info_set_language (&ke->ki, ke->language);
-        if (ret < 0) {
-          GST_WARNING_OBJECT (ke, "failed to set stream language: %s",
-              gst_kate_util_get_error_message (ret));
-          break;
-        }
-      }
-      if (ke->category) {
-        ret = kate_info_set_category (&ke->ki, ke->category);
-        if (ret < 0) {
-          GST_WARNING_OBJECT (ke, "failed to set stream category: %s",
-              gst_kate_util_get_error_message (ret));
-          break;
-        }
-      }
-      ret =
-          kate_info_set_original_canvas_size (&ke->ki,
-          ke->original_canvas_width, ke->original_canvas_height);
-      if (ret < 0) {
-        GST_WARNING_OBJECT (ke, "failed to set original canvas size: %s",
-            gst_kate_util_get_error_message (ret));
-        break;
-      }
-      ret = kate_comment_init (&ke->kc);
-      if (ret < 0) {
-        GST_WARNING_OBJECT (ke,
-            "failed to initialize kate comment structure: %s",
-            gst_kate_util_get_error_message (ret));
-        break;
-      }
-      ret = kate_encode_init (&ke->k, &ke->ki);
-      if (ret < 0) {
-        GST_WARNING_OBJECT (ke, "failed to initialize kate state: %s",
-            gst_kate_util_get_error_message (ret));
-        break;
-      }
-      ke->headers_sent = FALSE;
-      ke->initialized = TRUE;
-      ke->last_timestamp = 0;
-      ke->latest_end_time = 0;
-      ke->format = GST_KATE_FORMAT_UNDEFINED;
-      break;
-    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
-      break;
-    case GST_STATE_CHANGE_READY_TO_NULL:
-      gst_tag_list_unref (ke->tags);
-      ke->tags = NULL;
-      break;
-    default:
-      break;
-  }
-
-  res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-  if (res == GST_STATE_CHANGE_FAILURE) {
-    GST_WARNING_OBJECT (ke, "Parent failed to change state");
-    return res;
-  }
-
-  switch (transition) {
-    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
-      break;
-    case GST_STATE_CHANGE_PAUSED_TO_READY:
-      GST_DEBUG_OBJECT (ke, "PAUSED -> READY, clearing kate state");
-      if (ke->initialized) {
-        kate_clear (&ke->k);
-        kate_info_clear (&ke->ki);
-        kate_comment_clear (&ke->kc);
-        ke->initialized = FALSE;
-        ke->last_timestamp = 0;
-        ke->latest_end_time = 0;
-      }
-      gst_event_replace (&ke->pending_segment, NULL);
-      break;
-    case GST_STATE_CHANGE_READY_TO_NULL:
-      break;
-    default:
-      break;
-  }
-
-  GST_DEBUG_OBJECT (ke, "State change done");
-
-  return res;
-}
-
-static GstClockTime
-gst_kate_enc_granule_time (kate_state * k, gint64 granulepos)
-{
-  float t;
-
-  if (granulepos == -1)
-    return -1;
-
-  t = kate_granule_time (k->ki, granulepos);
-  return t * GST_SECOND;
-}
-
-/*
-conversions on the sink:
-  - nothing
-conversions on the source:
-  - default is granules at num/den rate
-  - default -> time is possible
-  - bytes do not mean anything, packets can be any number of bytes, and we
-    have no way to know the number of bytes emitted without decoding
-*/
-
-static gboolean
-gst_kate_enc_convert (GstPad * pad, GstFormat src_fmt, gint64 src_val,
-    GstFormat * dest_fmt, gint64 * dest_val)
-{
-  GstKateEnc *ke;
-  gboolean res = FALSE;
-
-  if (src_fmt == *dest_fmt) {
-    *dest_val = src_val;
-    return TRUE;
-  }
-
-  ke = GST_KATE_ENC (gst_pad_get_parent (pad));
-
-  if (!ke->initialized) {
-    GST_WARNING_OBJECT (ke, "not initialized yet");
-    gst_object_unref (ke);
-    return FALSE;
-  }
-
-  if (src_fmt == GST_FORMAT_BYTES || *dest_fmt == GST_FORMAT_BYTES) {
-    GST_WARNING_OBJECT (ke, "unsupported format");
-    gst_object_unref (ke);
-    return FALSE;
-  }
-
-  switch (src_fmt) {
-    case GST_FORMAT_DEFAULT:
-      switch (*dest_fmt) {
-        case GST_FORMAT_TIME:
-          *dest_val = gst_kate_enc_granule_time (&ke->k, src_val);
-          res = TRUE;
-          break;
-        default:
-          res = FALSE;
-          break;
-      }
-      break;
-    default:
-      res = FALSE;
-      break;
-  }
-
-  if (!res) {
-    GST_WARNING_OBJECT (ke, "unsupported format");
-  }
-
-  gst_object_unref (ke);
-  return res;
-}
-
-static gboolean
-gst_kate_enc_source_query (GstPad * pad, GstObject * parent, GstQuery * query)
-{
-  gboolean res = FALSE;
-
-  GST_DEBUG ("source query %d", GST_QUERY_TYPE (query));
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_CONVERT:
-    {
-      GstFormat src_fmt, dest_fmt;
-      gint64 src_val, dest_val;
-
-      gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
-      if (!gst_kate_enc_convert (pad, src_fmt, src_val, &dest_fmt, &dest_val)) {
-        return gst_pad_query_default (pad, parent, query);
-      }
-      gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
-      res = TRUE;
-    }
-      break;
-    default:
-      res = gst_pad_query_default (pad, parent, query);
-      break;
-  }
-
-  return res;
-}
-
-static gboolean
-gst_kate_enc_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
-{
-  GstKateEnc *ke = GST_KATE_ENC (parent);
-  const GstStructure *structure;
-  gboolean ret;
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_CAPS:
-    {
-      GstCaps *caps;
-
-      gst_event_parse_caps (event, &caps);
-      ret = gst_kate_enc_setcaps (ke, caps);
-      gst_event_unref (event);
-      break;
-    }
-    case GST_EVENT_SEGMENT:{
-      GstSegment seg;
-
-      GST_LOG_OBJECT (ke, "Got newsegment event");
-
-      gst_event_copy_segment (event, &seg);
-
-      if (!ke->headers_sent) {
-        if (ke->pending_segment)
-          gst_event_unref (ke->pending_segment);
-        ke->pending_segment = event;
-        event = NULL;
-      }
-
-      if (ke->initialized) {
-        GST_LOG_OBJECT (ke, "ensuring all headers are in");
-        if (gst_kate_enc_flush_headers (ke) != GST_FLOW_OK) {
-          GST_WARNING_OBJECT (ke, "Failed to flush headers");
-        } else {
-          if (seg.format != GST_FORMAT_TIME
-              || !GST_CLOCK_TIME_IS_VALID (seg.start)) {
-            GST_WARNING_OBJECT (ke,
-                "No time in newsegment event %p, format %d, timestamp %"
-                G_GINT64_FORMAT, event, (int) seg.format, seg.start);
-            /* to be safe, we'd need to generate a keepalive anyway, but we'd have to guess at the timestamp to use; a
-               good guess would be the last known timestamp plus the keepalive time, but if we then get a packet with a
-               timestamp less than this, it would fail to encode, which would be Bad. If we don't encode a keepalive, we
-               run the risk of stalling the pipeline and hanging, which is Very Bad. Oh dear. We can't exit(-1), can we ? */
-          } else {
-            float t = seg.start / (double) GST_SECOND;
-
-            if (ke->delayed_spu
-                && t - ke->delayed_start / (double) GST_SECOND >=
-                ke->default_spu_duration) {
-              if (G_UNLIKELY (gst_kate_enc_flush_waiting (ke,
-                          seg.start) != GST_FLOW_OK)) {
-                GST_WARNING_OBJECT (ke, "Failed to encode delayed packet");
-                /* continue with new segment handling anyway */
-              }
-            }
-
-            GST_LOG_OBJECT (ke, "ts %f, last %f (min %f)", t,
-                ke->last_timestamp / (double) GST_SECOND,
-                ke->keepalive_min_time);
-            if (ke->keepalive_min_time > 0.0f
-                && t - ke->last_timestamp / (double) GST_SECOND >=
-                ke->keepalive_min_time) {
-              /* we only generate a keepalive if there is no SPU waiting, as it would
-                 mean out of sequence start times - and granulepos */
-              if (!ke->delayed_spu) {
-                gst_kate_enc_generate_keepalive (ke, seg.start);
-              }
-            }
-          }
-        }
-      }
-      if (event)
-        ret = gst_pad_push_event (ke->srcpad, event);
-      else
-        ret = TRUE;
-      break;
-    }
-    case GST_EVENT_CUSTOM_DOWNSTREAM:
-      GST_LOG_OBJECT (ke, "Got custom downstream event");
-      /* adapted from the dvdsubdec element */
-      structure = gst_event_get_structure (event);
-      if (structure != NULL
-          && gst_structure_has_name (structure, "application/x-gst-dvd")) {
-        if (ke->initialized) {
-          GST_LOG_OBJECT (ke, "ensuring all headers are in");
-          if (gst_kate_enc_flush_headers (ke) != GST_FLOW_OK) {
-            GST_WARNING_OBJECT (ke, "Failed to flush headers");
-          } else {
-            const gchar *event_name =
-                gst_structure_get_string (structure, "event");
-            if (event_name) {
-              if (!strcmp (event_name, "dvd-spu-clut-change")) {
-                gchar name16;
-                int idx;
-                gboolean found;
-                gint value;
-                GST_INFO_OBJECT (ke, "New CLUT received");
-                for (idx = 0; idx < 16; ++idx) {
-                  g_snprintf (name, sizeof (name), "clut%02d", idx);
-                  found = gst_structure_get_int (structure, name, &value);
-                  if (found) {
-                    ke->spu_clutidx = value;
-                  } else {
-                    GST_WARNING_OBJECT (ke,
-                        "DVD CLUT event did not contain %s field", name);
-                  }
-                }
-              } else if (!strcmp (event_name, "dvd-lang-codes")) {
-                /* we can't know which stream corresponds to us */
-              }
-            } else {
-              GST_WARNING_OBJECT (ke, "custom downstream event with no name");
-            }
-          }
-        }
-      }
-      ret = gst_pad_push_event (ke->srcpad, event);
-      break;
-
-    case GST_EVENT_TAG:
-      GST_LOG_OBJECT (ke, "Got tag event");
-      if (ke->tags) {
-        GstTagList *list;
-
-        gst_event_parse_tag (event, &list);
-        gst_tag_list_insert (ke->tags, list,
-            gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (ke)));
-      } else {
-        g_assert_not_reached ();
-      }
-      ret = gst_pad_event_default (pad, parent, event);
-      break;
-
-    case GST_EVENT_EOS:
-      GST_INFO_OBJECT (ke, "Got EOS event");
-      if (ke->initialized) {
-        GST_LOG_OBJECT (ke, "ensuring all headers are in");
-        if (gst_kate_enc_flush_headers (ke) != GST_FLOW_OK) {
-          GST_WARNING_OBJECT (ke, "Failed to flush headers");
-        } else {
-          kate_packet kp;
-          int ret;
-          GstClockTime delayed_end =
-              ke->delayed_start + ke->default_spu_duration * GST_SECOND;
-
-          if (G_UNLIKELY (gst_kate_enc_flush_waiting (ke,
-                      delayed_end) != GST_FLOW_OK)) {
-            GST_WARNING_OBJECT (ke, "Failed to encode delayed packet");
-            /* continue with EOS handling anyway */
-          }
-
-          ret = kate_encode_finish (&ke->k, -1, &kp);
-          if (ret < 0) {
-            GST_WARNING_OBJECT (ke, "Failed to encode EOS packet: %s",
-                gst_kate_util_get_error_message (ret));
-          } else {
-            kate_int64_t granpos = kate_encode_get_granule (&ke->k);
-            GST_LOG_OBJECT (ke, "EOS packet encoded");
-            if (gst_kate_enc_push_and_free_kate_packet (ke, &kp, granpos,
-                    ke->latest_end_time, 0, FALSE)) {
-              GST_WARNING_OBJECT (ke, "Failed to push EOS packet");
-            }
-          }
-        }
-      }
-      ret = gst_pad_event_default (pad, parent, event);
-      break;
-
-    default:
-      GST_LOG_OBJECT (ke, "Got unhandled event");
-      ret = gst_pad_event_default (pad, parent, event);
-      break;
-  }
-
-  return ret;
-}

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkateenc.h Deleted

@@ -1,129 +0,0 @@
-/*
- * GStreamer
- * Copyright 2005 Thomas Vander Stichele <thomas@apestaart.org>
- * Copyright 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
- * Copyright 2008 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, the contents of this file may be used under the
- * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
- * which case the following provisions apply instead of the ones
- * mentioned above:
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_KATE_ENC_H__
-#define __GST_KATE_ENC_H__
-
-#include <gst/gst.h>
-#include <kate/kate.h>
-
-#include "gstkateutil.h"
-
-G_BEGIN_DECLS
-/* #defines don't like whitespacey bits */
-#define GST_TYPE_KATE_ENC \
-  (gst_kate_enc_get_type())
-#define GST_KATE_ENC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_KATE_ENC,GstKateEnc))
-#define GST_KATE_ENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_KATE,GstKateEncClass))
-#define GST_IS_KATE_ENC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_KATE_ENC))
-#define GST_IS_KATE_ENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_KATE_ENC))
-typedef struct _GstKateEnc GstKateEnc;
-typedef struct _GstKateEncClass GstKateEncClass;
-
-struct _GstKateEnc
-{
-  GstElement element;
-
-  GstPad *sinkpad, *srcpad;
-
-  kate_info ki;
-  kate_comment kc;
-  kate_state k;
-
-  GstTagList *tags;
-
-  GstClockTime last_timestamp;
-  GstClockTime latest_end_time;
-
-  GstEvent *pending_segment;
-
-  gboolean headers_sent;
-  gboolean initialized;
-  gboolean delayed_spu;
-  GstClockTime delayed_start;
-  kate_bitmap *delayed_bitmap;
-  kate_palette *delayed_palette;
-  kate_region *delayed_region;
-  gchar *language;
-  gchar *category;
-
-  GstKateFormat format;
-
-  int granule_rate_numerator;
-  int granule_rate_denominator;
-  int granule_shift;
-
-  float keepalive_min_time;
-  float default_spu_duration;
-
-  size_t original_canvas_width;
-  size_t original_canvas_height;
-
-  /* SPU decoding */
-  guint8 spu_colormap4;
-  guint32 spu_clut16;
-  guint8 spu_alpha4;
-  guint16 spu_top;
-  guint16 spu_left;
-  guint16 spu_right;
-  guint16 spu_bottom;
-  guint16 spu_pix_data2;
-  guint16 show_time;
-  guint16 hide_time;
-};
-
-struct _GstKateEncClass
-{
-  GstElementClass parent_class;
-};
-
-GType gst_kate_enc_get_type (void);
-
-G_END_DECLS
-#endif /* __GST_KATE_ENC_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkateparse.c Deleted

@@ -1,634 +0,0 @@
-/* GStreamer
- * Copyright (C) <2004> Thomas Vander Stichele <thomas at apestaart dot org>
- * Copyright (C) 2006 Andy Wingo <wingo@pobox.com>
- * Copyright (C) 2008 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * SECTION:element-kateparse
- * @title: kateparse
- * @short_description: parses kate streams
- * @see_also: katedec, vorbisparse, oggdemux, theoraparse
- *
- * The kateparse element will parse the header packets of the Kate
- * stream and put them as the streamheader in the caps. This is used in the
- * multifdsink case where you want to stream live kate streams to multiple
- * clients, each client has to receive the streamheaders first before they can
- * consume the kate packets.
- *
- * This element also makes sure that the buffers that it pushes out are properly
- * timestamped and that their offset and offset_end are set. The buffers that
- * kateparse outputs have all of the metadata that oggmux expects to receive,
- * which allows you to (for example) remux an ogg/kate file.
- *
- * ## Example pipelines
- *
- * |
- * gst-launch-1.0 -v filesrc location=kate.ogg ! oggdemux ! kateparse ! fakesink
- * |
- * This pipeline shows that the streamheader is set in the caps, and that each
- * buffer has the timestamp, duration, offset, and offset_end set.
- *
- * |
- * gst-launch-1.0 filesrc location=kate.ogg ! oggdemux ! kateparse \
- *            ! oggmux ! filesink location=kate-remuxed.ogg
- * |
- * This pipeline shows remuxing. kate-remuxed.ogg might not be exactly the same
- * as kate.ogg, but they should produce exactly the same decoded data.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "gstkateelements.h"
-#include "gstkateutil.h"
-#include "gstkateparse.h"
-
-GST_DEBUG_CATEGORY_EXTERN (gst_kateparse_debug);
-#define GST_CAT_DEFAULT gst_kateparse_debug
-
-static GstStaticPadTemplate gst_kate_parse_sink_factory =
-    GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("subtitle/x-kate; application/x-kate")
-    );
-
-static GstStaticPadTemplate gst_kate_parse_src_factory =
-    GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("subtitle/x-kate; application/x-kate")
-    );
-
-GST_DEBUG_CATEGORY (gst_kateparse_debug);
-
-#define gst_kate_parse_parent_class parent_class
-G_DEFINE_TYPE (GstKateParse, gst_kate_parse, GST_TYPE_ELEMENT);
-#define _do_init \
-  kate_element_init (plugin); \
-  GST_DEBUG_CATEGORY_INIT (gst_kateparse_debug, "kateparse", 0, "Kate parser");
-GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (kateparse, "kateparse", GST_RANK_NONE,
-    GST_TYPE_KATE_PARSE, _do_init);
-
-static GstFlowReturn gst_kate_parse_chain (GstPad * pad, GstObject * parent,
-    GstBuffer * buffer);
-static GstStateChangeReturn gst_kate_parse_change_state (GstElement * element,
-    GstStateChange transition);
-static gboolean gst_kate_parse_sink_event (GstPad * pad, GstObject * parent,
-    GstEvent * event);
-static gboolean gst_kate_parse_src_query (GstPad * pad, GstObject * parent,
-    GstQuery * query);
-#if 0
-static gboolean gst_kate_parse_convert (GstPad * pad,
-    GstFormat src_format, gint64 src_value,
-    GstFormat * dest_format, gint64 * dest_value);
-#endif
-static GstFlowReturn gst_kate_parse_parse_packet (GstKateParse * parse,
-    GstBuffer * buf);
-
-static void
-gst_kate_parse_class_init (GstKateParseClass * klass)
-{
-  GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
-
-  gstelement_class->change_state = gst_kate_parse_change_state;
-
-  gst_element_class_add_static_pad_template (gstelement_class,
-      &gst_kate_parse_src_factory);
-  gst_element_class_add_static_pad_template (gstelement_class,
-      &gst_kate_parse_sink_factory);
-
-  gst_element_class_set_static_metadata (gstelement_class, "Kate stream parser",
-      "Codec/Parser/Subtitle",
-      "parse raw kate streams",
-      "Vincent Penquerc'h <ogg.k.ogg.k at googlemail dot com>");
-
-  klass->parse_packet = GST_DEBUG_FUNCPTR (gst_kate_parse_parse_packet);
-}
-
-static void
-gst_kate_parse_init (GstKateParse * parse)
-{
-  parse->sinkpad =
-      gst_pad_new_from_static_template (&gst_kate_parse_sink_factory, "sink");
-  gst_pad_set_chain_function (parse->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_parse_chain));
-  gst_pad_set_event_function (parse->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_parse_sink_event));
-  gst_element_add_pad (GST_ELEMENT (parse), parse->sinkpad);
-
-  parse->srcpad =
-      gst_pad_new_from_static_template (&gst_kate_parse_src_factory, "src");
-  gst_pad_set_query_function (parse->srcpad,
-      GST_DEBUG_FUNCPTR (gst_kate_parse_src_query));
-  gst_element_add_pad (GST_ELEMENT (parse), parse->srcpad);
-}
-
-static void
-gst_kate_parse_drain_event_queue (GstKateParse * parse)
-{
-  while (parse->event_queue->length) {
-    GstEvent *event;
-
-    event = GST_EVENT_CAST (g_queue_pop_head (parse->event_queue));
-    gst_pad_event_default (parse->sinkpad, NULL, event);
-  }
-}
-
-static GstFlowReturn
-gst_kate_parse_push_headers (GstKateParse * parse)
-{
-  /* mark and put on caps */
-  GstCaps *caps;
-  GstBuffer *outbuf;
-  kate_packet packet;
-  GList *headers, *outbuf_list = NULL;
-  int ret;
-  gboolean res;
-
-  /* get the headers into the caps, passing them to kate as we go */
-  caps =
-      gst_kate_util_set_header_on_caps (&parse->element,
-      gst_pad_get_current_caps (parse->sinkpad), parse->streamheader);
-
-  if (G_UNLIKELY (!caps)) {
-    GST_ELEMENT_ERROR (parse, STREAM, DECODE, (NULL),
-        ("Failed to set headers on caps"));
-    return GST_FLOW_ERROR;
-  }
-
-  GST_DEBUG_OBJECT (parse, "here are the caps: %" GST_PTR_FORMAT, caps);
-  res = gst_pad_set_caps (parse->srcpad, caps);
-  gst_caps_unref (caps);
-  if (G_UNLIKELY (!res)) {
-    GST_WARNING_OBJECT (parse->srcpad, "Failed to set caps on source pad");
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  headers = parse->streamheader;
-  while (headers) {
-    GstMapInfo info;
-
-    outbuf = GST_BUFFER_CAST (headers->data);
-
-    if (!gst_buffer_map (outbuf, &info, GST_MAP_READ)) {
-      GST_WARNING_OBJECT (outbuf, "Failed to map buffer");
-      continue;
-    }
-
-    kate_packet_wrap (&packet, info.size, info.data);
-    ret = kate_decode_headerin (&parse->ki, &parse->kc, &packet);
-    if (G_UNLIKELY (ret < 0)) {
-      GST_WARNING_OBJECT (parse, "Failed to decode header: %s",
-          gst_kate_util_get_error_message (ret));
-    }
-    gst_buffer_unmap (outbuf, &info);
-    /* takes ownership of outbuf, which was previously in parse->streamheader */
-    GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_HEADER);
-    outbuf_list = g_list_append (outbuf_list, outbuf);
-    headers = headers->next;
-  }
-
-  /* first process queued events */
-  gst_kate_parse_drain_event_queue (parse);
-
-  /* push out buffers, ignoring return value... */
-  headers = outbuf_list;
-  while (headers) {
-    outbuf = GST_BUFFER_CAST (headers->data);
-    gst_pad_push (parse->srcpad, outbuf);
-    headers = headers->next;
-  }
-
-  g_list_free (outbuf_list);
-  g_list_free (parse->streamheader);
-  parse->streamheader = NULL;
-
-  parse->streamheader_sent = TRUE;
-
-  return GST_FLOW_OK;
-}
-
-static void
-gst_kate_parse_clear_queue (GstKateParse * parse)
-{
-  GST_DEBUG_OBJECT (parse, "Clearing queue");
-  while (parse->buffer_queue->length) {
-    GstBuffer *buf;
-
-    buf = GST_BUFFER_CAST (g_queue_pop_head (parse->buffer_queue));
-    gst_buffer_unref (buf);
-  }
-  while (parse->event_queue->length) {
-    GstEvent *event;
-
-    event = GST_EVENT_CAST (g_queue_pop_head (parse->event_queue));
-    gst_event_unref (event);
-  }
-}
-
-static GstFlowReturn
-gst_kate_parse_push_buffer (GstKateParse * parse, GstBuffer * buf,
-    gint64 granulepos)
-{
-  GST_LOG_OBJECT (parse, "granulepos %16" G_GINT64_MODIFIER "x", granulepos);
-  if (granulepos < 0) {
-    /* packets coming not from Ogg won't have a granpos in the offset end,
-       so we have to synthesize one here - only problem is we don't know
-       the backlink - pretend there's none for now */
-    GST_INFO_OBJECT (parse, "No granulepos on buffer, synthesizing one");
-    granulepos =
-        kate_duration_granule (&parse->ki,
-        GST_BUFFER_TIMESTAMP (buf) /
-        (double) GST_SECOND) << kate_granule_shift (&parse->ki);
-  }
-  GST_BUFFER_OFFSET (buf) =
-      kate_granule_time (&parse->ki, granulepos) * GST_SECOND;
-  GST_BUFFER_OFFSET_END (buf) = granulepos;
-  GST_BUFFER_TIMESTAMP (buf) = GST_BUFFER_OFFSET (buf);
-
-  return gst_pad_push (parse->srcpad, buf);
-}
-
-static GstFlowReturn
-gst_kate_parse_drain_queue_prematurely (GstKateParse * parse)
-{
-  GstFlowReturn ret = GST_FLOW_OK;
-
-  /* got an EOS event, make sure to push out any buffers that were in the queue
-   * -- won't normally be the case, but this catches the
-   * didn't-get-a-granulepos-on-the-last-packet case. Assuming a continuous
-   * stream. */
-
-  /* if we got EOS before any buffers came, go ahead and push the other events
-   * first */
-  gst_kate_parse_drain_event_queue (parse);
-
-  while (!g_queue_is_empty (parse->buffer_queue)) {
-    GstBuffer *buf;
-    gint64 granpos;
-
-    buf = GST_BUFFER_CAST (g_queue_pop_head (parse->buffer_queue));
-
-    granpos = GST_BUFFER_OFFSET_END (buf);
-    ret = gst_kate_parse_push_buffer (parse, buf, granpos);
-
-    if (ret != GST_FLOW_OK)
-      goto done;
-  }
-
-  g_assert (g_queue_is_empty (parse->buffer_queue));
-
-done:
-  return ret;
-}
-
-static GstFlowReturn
-gst_kate_parse_drain_queue (GstKateParse * parse, gint64 granulepos)
-{
-  GstFlowReturn ret = GST_FLOW_OK;
-
-  if (!g_queue_is_empty (parse->buffer_queue)) {
-    GstBuffer *buf;
-    buf = GST_BUFFER_CAST (g_queue_pop_head (parse->buffer_queue));
-    ret = gst_kate_parse_push_buffer (parse, buf, granulepos);
-
-    if (ret != GST_FLOW_OK)
-      goto done;
-  }
-  g_assert (g_queue_is_empty (parse->buffer_queue));
-
-done:
-  return ret;
-}
-
-static GstFlowReturn
-gst_kate_parse_queue_buffer (GstKateParse * parse, GstBuffer * buf)
-{
-  GstFlowReturn ret = GST_FLOW_OK;
-  gint64 granpos;
-
-  buf = gst_buffer_make_writable (buf);
-
-  /* oggdemux stores the granule pos in the offset end */
-  granpos = GST_BUFFER_OFFSET_END (buf);
-  GST_LOG_OBJECT (parse, "granpos %16" G_GINT64_MODIFIER "x", granpos);
-  g_queue_push_tail (parse->buffer_queue, buf);
-
-#if 1
-  /* if getting buffers from matroska, we won't have a granpos here... */
-  //if (GST_BUFFER_OFFSET_END_IS_VALID (buf)) {
-  ret = gst_kate_parse_drain_queue (parse, granpos);
-  //}
-#else
-  if (granpos >= 0) {
-    ret = gst_kate_parse_drain_queue (parse, granpos);
-  } else {
-    GST_ELEMENT_ERROR (parse, STREAM, DECODE, (NULL),
-        ("Bad granulepos %" G_GINT64_FORMAT, granpos));
-    ret = GST_FLOW_ERROR;
-  }
-#endif
-
-  return ret;
-}
-
-static GstFlowReturn
-gst_kate_parse_parse_packet (GstKateParse * parse, GstBuffer * buf)
-{
-  GstFlowReturn ret = GST_FLOW_OK;
-  guint8 header1;
-  gsize size;
-
-  g_assert (parse);
-
-  parse->packetno++;
-
-  size = gst_buffer_extract (buf, 0, header, 1);
-
-  GST_LOG_OBJECT (parse, "Got packet %02x, %" G_GSIZE_FORMAT " bytes",
-      size ? header0 : -1, gst_buffer_get_size (buf));
-
-  if (size > 0 && header0 & 0x80) {
-    GST_DEBUG_OBJECT (parse, "Found header %02x", header0);
-    /* if 0x80 is set, it's streamheader,
-     * so put it on the streamheader list and return */
-    parse->streamheader = g_list_append (parse->streamheader, buf);
-    ret = GST_FLOW_OK;
-  } else {
-    if (!parse->streamheader_sent) {
-      GST_DEBUG_OBJECT (parse, "Found non header, pushing headers seen so far");
-      ret = gst_kate_parse_push_headers (parse);
-    }
-
-    if (ret == GST_FLOW_OK) {
-      ret = gst_kate_parse_queue_buffer (parse, buf);
-    }
-  }
-
-  return ret;
-}
-
-static GstFlowReturn
-gst_kate_parse_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
-{
-  GstKateParseClass *klass;
-  GstKateParse *parse;
-
-  parse = GST_KATE_PARSE (parent);
-  klass = GST_KATE_PARSE_CLASS (G_OBJECT_GET_CLASS (parse));
-
-  g_assert (klass->parse_packet != NULL);
-
-  if (G_UNLIKELY (!gst_pad_has_current_caps (pad)))
-    return GST_FLOW_NOT_NEGOTIATED;
-
-  return klass->parse_packet (parse, buffer);
-}
-
-static gboolean
-gst_kate_parse_queue_event (GstKateParse * parse, GstEvent * event)
-{
-  GstFlowReturn ret = TRUE;
-
-  g_queue_push_tail (parse->event_queue, event);
-
-  return ret;
-}
-
-static gboolean
-gst_kate_parse_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
-{
-  gboolean ret;
-  GstKateParse *parse;
-
-  parse = GST_KATE_PARSE (parent);
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_FLUSH_STOP:
-      gst_kate_parse_clear_queue (parse);
-      ret = gst_pad_event_default (pad, parent, event);
-      break;
-    case GST_EVENT_EOS:
-      if (!parse->streamheader_sent) {
-        GST_DEBUG_OBJECT (parse, "Got EOS, pushing headers seen so far");
-        ret = gst_kate_parse_push_headers (parse);
-        if (ret != GST_FLOW_OK)
-          break;
-      }
-      gst_kate_parse_drain_queue_prematurely (parse);
-      ret = gst_pad_event_default (pad, parent, event);
-      break;
-    default:
-      if (!parse->streamheader_sent && GST_EVENT_IS_SERIALIZED (event)
-          && GST_EVENT_TYPE (event) > GST_EVENT_CAPS)
-        ret = gst_kate_parse_queue_event (parse, event);
-      else
-        ret = gst_pad_event_default (pad, parent, event);
-      break;
-  }
-
-  return ret;
-}
-
-#if 0
-static gboolean
-gst_kate_parse_convert (GstPad * pad,
-    GstFormat src_format, gint64 src_value,
-    GstFormat * dest_format, gint64 * dest_value)
-{
-  gboolean res = TRUE;
-  GstKateParse *parse;
-
-  parse = GST_KATE_PARSE (GST_PAD_PARENT (pad));
-
-  /* fixme: assumes atomic access to lots of instance variables modified from
-   * the streaming thread, including 64-bit variables */
-
-  if (!parse->streamheader_sent)
-    return FALSE;
-
-  if (src_format == *dest_format) {
-    *dest_value = src_value;
-    return TRUE;
-  }
-
-  if (parse->sinkpad == pad &&
-      (src_format == GST_FORMAT_BYTES || *dest_format == GST_FORMAT_BYTES))
-    return FALSE;
-
-  switch (src_format) {
-    case GST_FORMAT_TIME:
-      switch (*dest_format) {
-        default:
-          res = FALSE;
-      }
-      break;
-    case GST_FORMAT_DEFAULT:
-      switch (*dest_format) {
-        case GST_FORMAT_TIME:
-          *dest_value = kate_granule_time (&parse->ki, src_value) * GST_SECOND;
-          break;
-        default:
-          res = FALSE;
-      }
-      break;
-    default:
-      res = FALSE;
-  }
-
-  return res;
-}
-#endif
-
-static gboolean
-gst_kate_parse_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
-{
-#if 1
-  // TODO
-  GST_WARNING ("gst_kate_parse_src_query");
-  return FALSE;
-#else
-  gint64 granulepos;
-  GstKateParse *parse;
-  gboolean res = FALSE;
-
-  parse = GST_KATE_PARSE (parent);
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_POSITION:
-    {
-      GstFormat format;
-      gint64 value;
-
-      granulepos = parse->prev_granulepos;
-
-      gst_query_parse_position (query, &format, NULL);
-
-      /* and convert to the final format */
-      if (!(res =
-              gst_kate_parse_convert (pad, GST_FORMAT_DEFAULT, granulepos,
-                  &format, &value)))
-        goto error;
-
-      /* fixme: support segments
-         value = (value - parse->segment_start) + parse->segment_time;
-       */
-
-      gst_query_set_position (query, format, value);
-
-      GST_LOG_OBJECT (parse, "query %p: peer returned granulepos: %"
-          G_GUINT64_FORMAT " - we return %" G_GUINT64_FORMAT " (format %u)",
-          query, granulepos, value, format);
-
-      break;
-    }
-    case GST_QUERY_DURATION:
-    {
-      /* fixme: not threadsafe */
-      /* query peer for total length */
-      if (!gst_pad_is_linked (parse->sinkpad)) {
-        GST_WARNING_OBJECT (parse, "sink pad %" GST_PTR_FORMAT " is not linked",
-            parse->sinkpad);
-        goto error;
-      }
-      if (!(res = gst_pad_query (GST_PAD_PEER (parse->sinkpad), query)))
-        goto error;
-      break;
-    }
-    case GST_QUERY_CONVERT:
-    {
-      GstFormat src_fmt, dest_fmt;
-      gint64 src_val, dest_val;
-
-      gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
-      if (!(res =
-              gst_kate_parse_convert (pad, src_fmt, src_val, &dest_fmt,
-                  &dest_val)))
-        goto error;
-      gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
-      break;
-    }
-    default:
-      res = gst_pad_query_default (pad, query);
-      break;
-  }
-  return res;
-
-error:
-  {
-    GST_WARNING_OBJECT (parse, "error handling query");
-    return res;
-  }
-#endif
-}
-
-static void
-gst_kate_parse_free_stream_headers (GstKateParse * parse)
-{
-  while (parse->streamheader != NULL) {
-    gst_buffer_unref (GST_BUFFER (parse->streamheader->data));
-    parse->streamheader = g_list_delete_link (parse->streamheader,
-        parse->streamheader);
-  }
-}
-
-static GstStateChangeReturn
-gst_kate_parse_change_state (GstElement * element, GstStateChange transition)
-{
-  GstKateParse *parse = GST_KATE_PARSE (element);
-  GstStateChangeReturn ret;
-
-  switch (transition) {
-    case GST_STATE_CHANGE_READY_TO_PAUSED:
-      kate_info_init (&parse->ki);
-      kate_comment_init (&parse->kc);
-      parse->packetno = 0;
-      parse->streamheader_sent = FALSE;
-      parse->streamheader = NULL;
-      parse->buffer_queue = g_queue_new ();
-      parse->event_queue = g_queue_new ();
-      break;
-    default:
-      break;
-  }
-
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_PAUSED_TO_READY:
-      kate_info_clear (&parse->ki);
-      kate_comment_clear (&parse->kc);
-
-      gst_kate_parse_clear_queue (parse);
-      g_queue_free (parse->buffer_queue);
-      parse->buffer_queue = NULL;
-      g_queue_free (parse->event_queue);
-      parse->event_queue = NULL;
-      gst_kate_parse_free_stream_headers (parse);
-      break;
-
-    default:
-      break;
-  }
-
-  return ret;
-}

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkateparse.h Deleted

@@ -1,78 +0,0 @@
-/* -*- c-basic-offset: 2 -*-
- * GStreamer
- * Copyright (C) <2004> Thomas Vander Stichele <thomas at apestaart dot org>
- * Copyright (C) <2008> Vincent Penquerc'h <ogg.k.ogg.k at googlemail dot com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef __GST_KATE_PARSE_H__
-#define __GST_KATE_PARSE_H__
-
-
-#include <gst/gst.h>
-#include <kate/kate.h>
-
-G_BEGIN_DECLS
-#define GST_TYPE_KATE_PARSE \
-  (gst_kate_parse_get_type())
-#define GST_KATE_PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_KATE_PARSE,GstKateParse))
-#define GST_KATE_PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_KATE_PARSE,GstKateParseClass))
-#define GST_IS_KATE_PARSE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_KATE_PARSE))
-#define GST_IS_KATE_PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_KATE_PARSE))
-typedef struct _GstKateParse GstKateParse;
-typedef struct _GstKateParseClass GstKateParseClass;
-
-/**
- * GstKateParse:
- *
- * Opaque data structure.
- */
-struct _GstKateParse
-{
-  GstElement element;
-
-  GstPad *sinkpad;
-  GstPad *srcpad;
-
-  guint packetno;
-  gboolean streamheader_sent;
-  GList *streamheader;
-
-  GQueue *event_queue;
-  GQueue *buffer_queue;
-
-  kate_info ki;
-  kate_comment kc;
-};
-
-struct _GstKateParseClass
-{
-  GstElementClass parent_class;
-
-  /* virtual functions */
-    GstFlowReturn (*parse_packet) (GstKateParse * parse, GstBuffer * buf);
-};
-
-GType gst_kate_parse_get_type (void);
-
-G_END_DECLS
-#endif /* __GST_KATE_PARSE_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkatespu.c Deleted

@@ -1,916 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include <string.h>
-#include <kate/kate.h>
-#include <gst/gst.h>
-#include <gst/gstpad.h>
-#include "gstkatespu.h"
-
-#define MAX_SPU_SIZE 53220
-
-GST_DEBUG_CATEGORY_EXTERN (gst_kateenc_debug);
-GST_DEBUG_CATEGORY_EXTERN (gst_katedec_debug);
-
-/* taken off the dvdsubdec element */
-const guint32 gst_kate_spu_default_clut16 = {
-  0xb48080, 0x248080, 0x628080, 0xd78080,
-  0x808080, 0x808080, 0x808080, 0x808080,
-  0x808080, 0x808080, 0x808080, 0x808080,
-  0x808080, 0x808080, 0x808080, 0x808080
-};
-
-#define GST_CAT_DEFAULT gst_kateenc_debug
-
-static void
-gst_kate_spu_decode_colormap (GstKateEnc * ke, const guint8 * ptr)
-{
-  ke->spu_colormap3 = ptr0 >> 4;
-  ke->spu_colormap2 = ptr0 & 0x0f;
-  ke->spu_colormap1 = ptr1 >> 4;
-  ke->spu_colormap0 = ptr1 & 0x0f;
-}
-
-static void
-gst_kate_spu_decode_alpha (GstKateEnc * ke, const guint8 * ptr)
-{
-  ke->spu_alpha3 = ptr0 >> 4;
-  ke->spu_alpha2 = ptr0 & 0x0f;
-  ke->spu_alpha1 = ptr1 >> 4;
-  ke->spu_alpha0 = ptr1 & 0x0f;
-}
-
-static void
-gst_kate_spu_decode_area (GstKateEnc * ke, const guint8 * ptr)
-{
-  ke->spu_left = ((((guint16) ptr0) & 0xff) << 4) | (ptr1 >> 4);
-  ke->spu_top = ((((guint16) ptr3) & 0xff) << 4) | (ptr4 >> 4);
-  ke->spu_right = ((((guint16) ptr1) & 0x0f) << 8) | ptr2;
-  ke->spu_bottom = ((((guint16) ptr4) & 0x0f) << 8) | ptr5;
-  GST_DEBUG_OBJECT (ke, "SPU area %u %u -> %u %d", ke->spu_left, ke->spu_top,
-      ke->spu_right, ke->spu_bottom);
-}
-
-static void
-gst_kate_spu_decode_pixaddr (GstKateEnc * ke, const guint8 * ptr)
-{
-  ke->spu_pix_data0 = GST_KATE_UINT16_BE (ptr + 0);
-  ke->spu_pix_data1 = GST_KATE_UINT16_BE (ptr + 2);
-}
-
-/* heavily inspired from dvdspudec */
-static guint16
-gst_kate_spu_decode_colcon (GstKateEnc * ke, const guint8 * ptr, guint16 sz)
-{
-  guint16 nbytes = GST_KATE_UINT16_BE (ptr + 0);
-  guint16 nbytes_left = nbytes;
-
-  GST_LOG_OBJECT (ke, "Number of bytes in color/contrast change command is %u",
-      nbytes);
-  if (G_UNLIKELY (nbytes < 2)) {
-    GST_WARNING_OBJECT (ke,
-        "Number of bytes in color/contrast change command is %u, should be at least 2",
-        nbytes);
-    return 0;
-  }
-  if (G_UNLIKELY (nbytes > sz)) {
-    GST_WARNING_OBJECT (ke,
-        "Number of bytes in color/contrast change command is %u, but the buffer "
-        "only contains %u byte(s)", nbytes, sz);
-    return 0;
-  }
-
-  ptr += 2;
-  nbytes_left -= 2;
-
-  /* we will just skip that data for now */
-  while (nbytes_left > 0) {
-    guint32 entry, nchanges, sz;
-    GST_LOG_OBJECT (ke, "Reading a color/contrast change entry, %u bytes left",
-        nbytes_left);
-    if (G_UNLIKELY (nbytes_left < 4)) {
-      GST_WARNING_OBJECT (ke,
-          "Not enough bytes to read a full color/contrast entry header");
-      break;
-    }
-    entry = GST_READ_UINT32_BE (ptr);
-    GST_LOG_OBJECT (ke, "Color/contrast change entry header is %08x", entry);
-    nchanges = CLAMP ((ptr2 >> 4), 1, 8);
-    ptr += 4;
-    nbytes_left -= 4;
-    if (entry == 0x0fffffff) {
-      GST_LOG_OBJECT (ke,
-          "Encountered color/contrast change termination code, breaking, %u bytes left",
-          nbytes_left);
-      break;
-    }
-    GST_LOG_OBJECT (ke, "Color/contrast change entry has %u changes", nchanges);
-    sz = 6 * nchanges;
-    if (G_UNLIKELY (sz > nbytes_left)) {
-      GST_WARNING_OBJECT (ke,
-          "Not enough bytes to read a full color/contrast entry");
-      break;
-    }
-    ptr += sz;
-    nbytes_left -= sz;
-  }
-  return nbytes - nbytes_left;
-}
-
-static inline guint8
-gst_kate_spu_get_nybble (const guint8 * nybbles, size_t * nybble_offset)
-{
-  guint8 ret;
-
-  ret = nybbles(*nybble_offset) / 2;
-
-  /* If the offset is even, we shift the answer down 4 bits, otherwise not */
-  if ((*nybble_offset) & 0x01)
-    ret &= 0x0f;
-  else
-    ret = ret >> 4;
-
-  (*nybble_offset)++;
-
-  return ret;
-}
-
-static guint16
-gst_kate_spu_get_rle_code (const guint8 * nybbles, size_t * nybble_offset)
-{
-  guint16 code;
-
-  code = gst_kate_spu_get_nybble (nybbles, nybble_offset);
-  if (code < 0x4) {             /* 4 .. f */
-    code = (code << 4) | gst_kate_spu_get_nybble (nybbles, nybble_offset);
-    if (code < 0x10) {          /* 1x .. 3x */
-      code = (code << 4) | gst_kate_spu_get_nybble (nybbles, nybble_offset);
-      if (code < 0x40) {        /* 04x .. 0fx */
-        code = (code << 4) | gst_kate_spu_get_nybble (nybbles, nybble_offset);
-      }
-    }
-  }
-  return code;
-}
-
-static void
-gst_kate_spu_crop_bitmap (GstKateEnc * ke, kate_bitmap * kb, guint16 * dx,
-    guint16 * dy)
-{
-  int top, bottom, left, right;
-  guint8 zero = 0;
-  size_t n, x, y, w, h;
-
-#if 0
-  /* find the zero */
-  zero = kb->pixels0;
-  for (x = 0; x < kb->width; ++x) {
-    if (kb->pixelsx != zero) {
-      GST_LOG_OBJECT (ke, "top line at %u is not zero: %u", x, kb->pixelsx);
-      return;
-    }
-  }
-#endif
-
-  /* top */
-  for (top = 0; top < kb->height; ++top) {
-    int empty = 1;
-    for (x = 0; x < kb->width; ++x) {
-      if (G_UNLIKELY (kb->pixelsx + top * kb->width != zero)) {
-        empty = 0;
-        break;
-      }
-    }
-    if (!empty)
-      break;
-  }
-
-  /* bottom */
-  for (bottom = kb->height - 1; bottom >= top; --bottom) {
-    int empty = 1;
-    for (x = 0; x < kb->width; ++x) {
-      if (G_UNLIKELY (kb->pixelsx + bottom * kb->width != zero)) {
-        empty = 0;
-        break;
-      }
-    }
-    if (!empty)
-      break;
-  }
-
-  /* left */
-  for (left = 0; left < kb->width; ++left) {
-    int empty = 1;
-    for (y = top; y <= bottom; ++y) {
-      if (G_UNLIKELY (kb->pixelsleft + y * kb->width != zero)) {
-        empty = 0;
-        break;
-      }
-    }
-    if (!empty)
-      break;
-  }
-
-  /* right */
-  for (right = kb->width - 1; right >= left; --right) {
-    int empty = 1;
-    for (y = top; y <= bottom; ++y) {
-      if (G_UNLIKELY (kb->pixelsright + y * kb->width != zero)) {
-        empty = 0;
-        break;
-      }
-    }
-    if (!empty)
-      break;
-  }
-
-
-  w = right - left + 1;
-  h = bottom - top + 1;
-  GST_LOG_OBJECT (ke, "cropped from %" G_GSIZE_FORMAT " %" G_GSIZE_FORMAT
-      " to %" G_GSIZE_FORMAT " %" G_GSIZE_FORMAT, kb->width, kb->height, w, h);
-  *dx += left;
-  *dy += top;
-  n = 0;
-  for (y = 0; y < h; ++y) {
-    memmove (kb->pixels + n, kb->pixels + kb->width * (y + top) + left, w);
-    n += w;
-  }
-  kb->width = w;
-  kb->height = h;
-}
-
-#define CHECK(x) G_STMT_START { \
-      guint16 _ = (x); \
-      if (G_UNLIKELY((_) > sz)) { \
-        GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL), ("Read outside buffer")); \
-        return GST_FLOW_ERROR; \
-      } \
-    } G_STMT_END
-#define ADVANCE(x) G_STMT_START { \
-      guint16 _ = (x); ptr += (_); sz -= (_); \
-    } G_STMT_END
-#define IGNORE(x) G_STMT_START { \
-      guint16 __ = (x); \
-      CHECK (__); \
-      ADVANCE (__); \
-    } G_STMT_END
-
-static GstFlowReturn
-gst_kate_spu_decode_command_sequence (GstKateEnc * ke, GstBuffer * buf,
-    guint16 command_sequence_offset)
-{
-  guint16 date;
-  guint16 next_command_sequence;
-  const guint8 *ptr;
-  GstMapInfo info;
-  guint16 sz;
-
-  if (!gst_buffer_map (buf, &info, GST_MAP_READ)) {
-    GST_ERROR_OBJECT (ke, "Failed to map buffer");
-    return GST_FLOW_ERROR;
-  }
-
-  if (command_sequence_offset >= info.size)
-    goto out_of_range;
-
-  ptr = info.data + command_sequence_offset;
-  sz = info.size - command_sequence_offset;
-
-  GST_DEBUG_OBJECT (ke, "Decoding command sequence at %u (%u bytes)",
-      command_sequence_offset, sz);
-
-  CHECK (2);
-  date = GST_KATE_UINT16_BE (ptr);
-  ADVANCE (2);
-  GST_DEBUG_OBJECT (ke, "date %u", date);
-
-  CHECK (2);
-  next_command_sequence = GST_KATE_UINT16_BE (ptr);
-  ADVANCE (2);
-  GST_DEBUG_OBJECT (ke, "next command sequence at %u", next_command_sequence);
-
-  while (sz) {
-    guint8 cmd = *ptr++;
-    switch (cmd) {
-      case SPU_CMD_FSTA_DSP:   /* 0x00 */
-        GST_DEBUG_OBJECT (ke, "0 DISPLAY");
-        break;
-      case SPU_CMD_DSP:        /* 0x01 */
-        GST_DEBUG_OBJECT (ke, "1 SHOW");
-        ke->show_time = date;
-        break;
-      case SPU_CMD_STP_DSP:    /* 0x02 */
-        GST_DEBUG_OBJECT (ke, "2 HIDE");
-        ke->hide_time = date;
-        break;
-      case SPU_CMD_SET_COLOR:  /* 0x03 */
-        GST_DEBUG_OBJECT (ke, "3 SET COLOR");
-        CHECK (2);
-        gst_kate_spu_decode_colormap (ke, ptr);
-        ADVANCE (2);
-        break;
-      case SPU_CMD_SET_ALPHA:  /* 0x04 */
-        GST_DEBUG_OBJECT (ke, "4 SET ALPHA");
-        CHECK (2);
-        gst_kate_spu_decode_alpha (ke, ptr);
-        ADVANCE (2);
-        break;
-      case SPU_CMD_SET_DAREA:  /* 0x05 */
-        GST_DEBUG_OBJECT (ke, "5 SET DISPLAY AREA");
-        CHECK (6);
-        gst_kate_spu_decode_area (ke, ptr);
-        ADVANCE (6);
-        break;
-      case SPU_CMD_DSPXA:      /* 0x06 */
-        GST_DEBUG_OBJECT (ke, "6 SET PIXEL ADDRESSES");
-        CHECK (4);
-        gst_kate_spu_decode_pixaddr (ke, ptr);
-        GST_DEBUG_OBJECT (ke, "  -> first pixel address %u",
-            ke->spu_pix_data0);
-        GST_DEBUG_OBJECT (ke, "  -> second pixel address %u",
-            ke->spu_pix_data1);
-        ADVANCE (4);
-        break;
-      case SPU_CMD_CHG_COLCON: /* 0x07 */
-        GST_DEBUG_OBJECT (ke, "7 CHANGE COLOR/CONTRAST");
-        CHECK (2);
-        ADVANCE (gst_kate_spu_decode_colcon (ke, ptr, sz));
-        break;
-      case SPU_CMD_END:        /* 0xff */
-        GST_DEBUG_OBJECT (ke, "0xff END");
-        if (next_command_sequence != command_sequence_offset) {
-          GST_DEBUG_OBJECT (ke, "Jumping to next sequence at offset %u",
-              next_command_sequence);
-          gst_buffer_unmap (buf, &info);
-          return gst_kate_spu_decode_command_sequence (ke, buf,
-              next_command_sequence);
-        } else {
-          gst_buffer_unmap (buf, &info);
-          GST_DEBUG_OBJECT (ke, "No more sequences to decode");
-          return GST_FLOW_OK;
-        }
-        break;
-      default:
-        gst_buffer_unmap (buf, &info);
-        GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-            ("Invalid SPU command: %u", cmd));
-        return GST_FLOW_ERROR;
-    }
-  }
-  gst_buffer_unmap (buf, &info);
-  GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL), ("Error parsing SPU"));
-  return GST_FLOW_ERROR;
-
-  /* ERRORS */
-out_of_range:
-  {
-    gst_buffer_unmap (buf, &info);
-    GST_ELEMENT_ERROR (ke, STREAM, DECODE, (NULL),
-        ("Command sequence offset %u is out of range %" G_GSIZE_FORMAT,
-            command_sequence_offset, info.size));
-    return GST_FLOW_ERROR;
-  }
-}
-
-static inline int
-gst_kate_spu_clamp (int value)
-{
-  if (value < 0)
-    return 0;
-  if (value > 255)
-    return 255;
-  return value;
-}
-
-static void
-gst_kate_spu_yuv2rgb (int y, int u, int v, int *r, int *g, int *b)
-{
-#if 0
-  *r = gst_kate_spu_clamp (y + 1.371 * v);
-  *g = gst_kate_spu_clamp (y - 0.698 * v - 0.336 * u);
-  *b = gst_kate_spu_clamp (y + 1.732 * u);
-#elif 0
-  *r = gst_kate_spu_clamp (y + u);
-  *g = gst_kate_spu_clamp (y - (76 * u - 26 * v) / 256);
-  *b = gst_kate_spu_clamp (y + v);
-#else
-  y = (y - 16) * 255 / 219;
-  u = (u - 128) * 255 / 224;
-  v = (v - 128) * 255 / 224;
-
-  *r = gst_kate_spu_clamp (y + 1.402 * v);
-  *g = gst_kate_spu_clamp (y - 0.34414 * u - 0.71414 * v);
-  *b = gst_kate_spu_clamp (y + 1.772 * u);
-#endif
-}
-
-static GstFlowReturn
-gst_kate_spu_create_spu_palette (GstKateEnc * ke, kate_palette * kp)
-{
-  size_t n;
-
-  kate_palette_init (kp);
-  kp->ncolors = 4;
-  kp->colors = (kate_color *) g_malloc (kp->ncolors * sizeof (kate_color));
-  if (G_UNLIKELY (!kp->colors)) {
-    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL), ("Out of memory"));
-    return GST_FLOW_ERROR;
-  }
-#if 1
-  for (n = 0; n < kp->ncolors; ++n) {
-    int idx = ke->spu_colormapn;
-    guint32 color = ke->spu_clutidx;
-    int y = (color >> 16) & 0xff;
-    int v = (color >> 8) & 0xff;
-    int u = color & 0xff;
-    int r, g, b;
-    gst_kate_spu_yuv2rgb (y, u, v, &r, &g, &b);
-    kp->colorsn.r = r;
-    kp->colorsn.g = g;
-    kp->colorsn.b = b;
-    kp->colorsn.a = ke->spu_alphan * 17;
-  }
-#else
-  /* just make a ramp from 0 to 255 for those non transparent colors */
-  for (n = 0; n < kp->ncolors; ++n)
-    if (ke->spu_alphan == 0)
-      ++ntrans;
-
-  for (n = 0; n < kp->ncolors; ++n) {
-    kp->colorsn.r = luma;
-    kp->colorsn.g = luma;
-    kp->colorsn.b = luma;
-    kp->colorsn.a = ke->spu_alphan * 17;
-    if (ke->spu_alphan)
-      luma /= 2;
-  }
-#endif
-
-  return GST_FLOW_OK;
-}
-
-GstFlowReturn
-gst_kate_spu_decode_spu (GstKateEnc * ke, GstBuffer * buf, kate_region * kr,
-    kate_bitmap * kb, kate_palette * kp)
-{
-  GstMapInfo info;
-  const guint8 *ptr;
-  size_t sz;
-  guint16 packet_size;
-  guint16 x, y;
-  size_t n;
-  guint8 *pixptr2;
-  size_t nybble_offset2;
-  size_t max_nybbles2;
-  GstFlowReturn rflow;
-  guint16 next_command_sequence;
-  guint16 code;
-
-  if (!gst_buffer_map (buf, &info, GST_MAP_READ)) {
-    GST_ERROR_OBJECT (ke, "Failed to map buffer");
-  }
-
-  ptr = info.data;
-  sz = info.size;
-
-  /* before decoding anything, initialize to sensible defaults */
-  memset (ke->spu_colormap, 0, sizeof (ke->spu_colormap));
-  memset (ke->spu_alpha, 0, sizeof (ke->spu_alpha));
-  ke->spu_top = ke->spu_left = 1;
-  ke->spu_bottom = ke->spu_right = 0;
-  ke->spu_pix_data0 = ke->spu_pix_data1 = 0;
-  ke->show_time = ke->hide_time = 0;
-
-  /* read sizes and get to the start of the data */
-  CHECK (2);
-  packet_size = GST_KATE_UINT16_BE (ptr);
-  ADVANCE (2);
-  GST_DEBUG_OBJECT (ke, "packet size %d (GstBuffer size %" G_GSIZE_FORMAT ")",
-      packet_size, info.size);
-
-  CHECK (2);
-  next_command_sequence = GST_KATE_UINT16_BE (ptr);
-  ADVANCE (2);
-  ptr = info.data + next_command_sequence;
-  sz = info.size - next_command_sequence;
-  GST_DEBUG_OBJECT (ke, "next command sequence at %u for %u",
-      next_command_sequence, (guint) sz);
-
-  rflow = gst_kate_spu_decode_command_sequence (ke, buf, next_command_sequence);
-  if (G_UNLIKELY (rflow != GST_FLOW_OK)) {
-    gst_buffer_unmap (buf, &info);
-    return rflow;
-  }
-
-  /* if no addresses or sizes were given, or if they define an empty SPU, nothing more to do */
-  if (G_UNLIKELY (ke->spu_right - ke->spu_left < 0
-          || ke->spu_bottom - ke->spu_top < 0 || ke->spu_pix_data0 == 0
-          || ke->spu_pix_data1 == 0)) {
-    GST_DEBUG_OBJECT (ke,
-        "left %d, right %d, top %d, bottom %d, pix data %d %d", ke->spu_left,
-        ke->spu_right, ke->spu_top, ke->spu_bottom, ke->spu_pix_data0,
-        ke->spu_pix_data1);
-    GST_WARNING_OBJECT (ke, "SPU area is empty, nothing to encode");
-    kate_bitmap_init (kb);
-    kb->width = kb->height = 0;
-    gst_buffer_unmap (buf, &info);
-    return GST_FLOW_OK;
-  }
-
-  /* create the palette */
-  rflow = gst_kate_spu_create_spu_palette (ke, kp);
-  if (G_UNLIKELY (rflow != GST_FLOW_OK)) {
-    gst_buffer_unmap (buf, &info);
-    return rflow;
-  }
-
-  /* create the bitmap */
-  kate_bitmap_init (kb);
-  kb->width = ke->spu_right - ke->spu_left + 1;
-  kb->height = ke->spu_bottom - ke->spu_top + 1;
-  kb->bpp = 2;
-  kb->type = kate_bitmap_type_paletted;
-  kb->pixels = (unsigned char *) g_malloc (kb->width * kb->height);
-  if (G_UNLIKELY (!kb->pixels)) {
-    gst_buffer_unmap (buf, &info);
-    GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL),
-        ("Failed to allocate memory for pixel data"));
-    return GST_FLOW_ERROR;
-  }
-
-  n = 0;
-  pixptr0 = info.data + ke->spu_pix_data0;
-  pixptr1 = info.data + ke->spu_pix_data1;
-  nybble_offset0 = 0;
-  nybble_offset1 = 0;
-  max_nybbles0 = 2 * (packet_size - ke->spu_pix_data0);
-  max_nybbles1 = 2 * (packet_size - ke->spu_pix_data1);
-  for (y = 0; y < kb->height; ++y) {
-    nybble_offsety & 1 = GST_ROUND_UP_2 (nybble_offsety & 1);
-    for (x = 0; x < kb->width;) {
-      if (G_UNLIKELY (nybble_offsety & 1 >= max_nybblesy & 1)) {
-        GST_DEBUG_OBJECT (ke, "RLE overflow, clearing the remainder");
-        memset (kb->pixels + n, 0, kb->width - x);
-        n += kb->width - x;
-        break;
-      }
-      code = gst_kate_spu_get_rle_code (pixptry & 1, &nybble_offsety & 1);
-      if (code == 0) {
-        memset (kb->pixels + n, 0, kb->width - x);
-        n += kb->width - x;
-        break;
-      } else {
-        guint16 npixels = code >> 2;
-        guint16 pixel = code & 3;
-        if (npixels > kb->width - x) {
-          npixels = kb->width - x;
-        }
-        memset (kb->pixels + n, pixel, npixels);
-        n += npixels;
-        x += npixels;
-      }
-    }
-  }
-
-  GST_LOG_OBJECT (ke, "%u/%u bytes left in the data packet",
-      (guint) (max_nybbles0 - nybble_offset0),
-      (guint) (max_nybbles1 - nybble_offset1));
-
-  /* some streams seem to have huge uncropped SPUs, fix those up */
-  x = ke->spu_left;
-  y = ke->spu_top;
-  gst_kate_spu_crop_bitmap (ke, kb, &x, &y);
-
-  /* create the region */
-  kate_region_init (kr);
-  if (ke->original_canvas_width > 0 && ke->original_canvas_height > 0) {
-    /* prefer relative sizes in case we're encoding for a different resolution
-       that what the SPU was created for */
-    kr->metric = kate_millionths;
-    kr->x = 1000000 * (size_t) x / ke->original_canvas_width;
-    kr->y = 1000000 * (size_t) y / ke->original_canvas_height;
-    kr->w = 1000000 * kb->width / ke->original_canvas_width;
-    kr->h = 1000000 * kb->height / ke->original_canvas_height;
-  } else {
-    kr->metric = kate_pixel;
-    kr->x = x;
-    kr->y = y;
-    kr->w = kb->width;
-    kr->h = kb->height;
-  }
-
-  /* some SPUs have no hide time */
-  if (ke->hide_time == 0) {
-    GST_INFO_OBJECT (ke, "SPU has no hide time");
-    /* now, we don't know when the next SPU is scheduled to go, since we probably
-       haven't received it yet, so we'll just make it a 1 second delay, which is
-       probably going to end before the next one while being readable */
-    //ke->hide_time = ke->show_time + (1000 * 90 / 1024);
-  }
-  gst_buffer_unmap (buf, &info);
-
-  return GST_FLOW_OK;
-}
-
-#undef IGNORE
-#undef ADVANCE
-#undef CHECK
-
-#undef GST_CAT_DEFAULT
-#define GST_CAT_DEFAULT gst_katedec_debug
-
-static void
-gst_kate_spu_add_nybble (unsigned char *bytes, size_t nbytes, int nybble_offset,
-    unsigned char nybble)
-{
-  unsigned char *ptr = bytes + nbytes + nybble_offset / 2;
-  if (!(nybble_offset & 1)) {
-    *ptr = nybble << 4;
-  } else {
-    *ptr |= nybble;
-  }
-}
-
-static void
-gst_kate_spu_rgb2yuv (int r, int g, int b, int *y, int *u, int *v)
-{
-  *y = gst_kate_spu_clamp (r * 0.299 * 219 / 255 + g * 0.587 * 219 / 255 +
-      b * 0.114 * 219 / 255 + 16);
-  *u = gst_kate_spu_clamp (-r * 0.16874 * 224 / 255 - g * 0.33126 * 224 / 255 +
-      b * 0.5 * 224 / 255 + 128);
-  *v = gst_kate_spu_clamp (r * 0.5 * 224 / 255 - g * 0.41869 * 224 / 255 -
-      b * 0.08131 * 224 / 255 + 128);
-}
-
-static void
-gst_kate_spu_make_palette (GstKateDec * kd, int palette4,
-    const kate_palette * kp)
-{
-  int n;
-  GstStructure *structure;
-  GstEvent *event;
-  char name16;
-  int y, u, v;
-
-  palette0 = 0;
-  palette1 = 1;
-  palette2 = 2;
-  palette3 = 3;
-
-  structure = gst_structure_new ("application/x-gst-dvd",
-      "event", G_TYPE_STRING, "dvd-spu-clut-change", NULL);
-
-  /* Create a separate field for each value in the table. */
-  for (n = 0; n < 16; n++) {
-    guint32 color = 0;
-    if (n < 4) {
-      gst_kate_spu_rgb2yuv (kp->colorsn.r, kp->colorsn.g, kp->colorsn.b,
-          &y, &u, &v);
-      color = (y << 16) | (v << 8) | u;
-    }
-    g_snprintf (name, sizeof (name), "clut%02d", n);
-    gst_structure_set (structure, name, G_TYPE_INT, (int) color, NULL);
-  }
-
-  /* Create the DVD event and put the structure into it. */
-  event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, structure);
-
-  GST_LOG_OBJECT (kd, "preparing clut change event %" GST_PTR_FORMAT, event);
-  gst_pad_push_event (kd->srcpad, event);
-}
-
-GstBuffer *
-gst_kate_spu_encode_spu (GstKateDec * kd, const kate_event * ev)
-{
-  kate_tracker kin;
-  unsigned char *bytes = NULL;
-  size_t nbytes = 0;
-  GstBuffer *buffer = NULL;
-  int ret;
-  int ocw, och;
-  int top, left, right, bottom;
-  int pass, line, row;
-  int lines_offset2;
-  int first_commands_offset, second_commands_offset;
-  int nybble_count;
-  const kate_bitmap *kb;
-  const kate_palette *kp;
-  int palette4;
-  int delay;
-
-  /* we need a region, a bitmap, and a palette */
-  if (!ev || !ev->region || !ev->bitmap || !ev->palette)
-    return NULL;
-
-  kb = ev->bitmap;
-  kp = ev->palette;
-
-  /* these need particular properties */
-  if (kb->type != kate_bitmap_type_paletted || kb->bpp != 2)
-    return NULL;
-  if (kp->ncolors != 4)
-    return NULL;
-
-  ret = kate_tracker_init (&kin, ev->ki, ev);
-  if (ret < 0) {
-    GST_WARNING_OBJECT (kd, "Failed to initialize kate tracker");
-    return NULL;
-  }
-
-  ocw = ev->ki->original_canvas_width;
-  och = ev->ki->original_canvas_height;
-  ret = kate_tracker_update (&kin, (kate_float) 0, ocw, och, 0, 0, ocw, och);
-  if (ret < 0)
-    goto error;
-
-  if (kin.has.region) {
-    top = (int) (kin.region_y + (kate_float) 0.5);
-    left = (int) (kin.region_x + (kate_float) 0.5);
-  } else {
-    GST_WARNING_OBJECT (kd,
-        "No region information to place SPU, placing at 0 0");
-    top = left = 0;
-  }
-  right = left + kb->width - 1;
-  bottom = top + kb->height - 1;
-
-  /* Allocate space to build the SPU */
-  bytes = g_malloc (MAX_SPU_SIZE);
-  if (G_UNLIKELY (!bytes)) {
-    GST_WARNING_OBJECT (kd,
-        "Failed to allocate %" G_GSIZE_FORMAT " byte buffer", nbytes);
-    goto error;
-  }
-  nbytes = 4;
-  nybble_count = 0;
-
-#define CHKBUFSPC(nybbles) \
-  do { \
-    if ((nbytes + (nybbles + nybble_count + 1) / 2) > MAX_SPU_SIZE) { \
-      GST_WARNING_OBJECT (kd, "Not enough space in SPU buffer"); \
-      goto error; \
-    } \
-  } while(0)
-
-  /* encode lines */
-  for (pass = 0; pass <= 1; ++pass) {
-    lines_offsetpass = nbytes;
-    for (line = pass; line < bottom - top + 1; line += 2) {
-      const unsigned char *ptr = kb->pixels + line * kb->width;
-      for (row = 0; row < kb->width;) {
-        int run = 1;
-        while (row + run < kb->width && run < 255 && ptrrow + run == ptrrow)
-          ++run;
-        if (run >= 63 && row + run == kb->width) {
-          /* special end of line marker */
-          CHKBUFSPC (4);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++, 0);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++, 0);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++, 0);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++, ptrrow);
-        } else if (run >= 1 && run <= 3) {
-          CHKBUFSPC (1);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++,
-              (run << 2) | ptrrow);
-        } else if (run <= 15) {
-          CHKBUFSPC (2);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++, run >> 2);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++,
-              ((run & 3) << 2) | ptrrow);
-        } else if (run <= 63) {
-          CHKBUFSPC (3);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++, 0);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++, run >> 2);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++,
-              ((run & 3) << 2) | ptrrow);
-        } else {
-          CHKBUFSPC (4);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++, 0);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++, (run >> 6));
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++,
-              (run >> 2) & 0xf);
-          gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++,
-              ((run & 3) << 2) | ptrrow);
-        }
-        row += run;
-      }
-      if (nybble_count & 1) {
-        CHKBUFSPC (1);
-        gst_kate_spu_add_nybble (bytes, nbytes, nybble_count++, 0);
-      }
-      nbytes += nybble_count / 2;
-      nybble_count = 0;
-    }
-  }
-  first_commands_offset = nbytes;
-
-  gst_kate_spu_make_palette (kd, palette, kp);
-
-  /* Commands header */
-  CHKBUFSPC (4 * 2);
-  bytesnbytes++ = 0;
-  bytesnbytes++ = 0;
-  /* link to next command chunk will be filled later, when we know where it is */
-  bytesnbytes++ = 0;
-  bytesnbytes++ = 0;
-
-  CHKBUFSPC (3 * 2);
-  bytesnbytes++ = SPU_CMD_SET_COLOR;
-  bytesnbytes++ = (palette3 << 4) | palette2;
-  bytesnbytes++ = (palette1 << 4) | palette0;
-
-  CHKBUFSPC (3 * 2);
-  bytesnbytes++ = SPU_CMD_SET_ALPHA;
-  bytesnbytes++ =
-      ((kp->colorspalette3.a / 17) << 4) | (kp->colorspalette2.a / 17);
-  bytesnbytes++ =
-      ((kp->colorspalette1.a / 17) << 4) | (kp->colorspalette0.a / 17);
-
-  CHKBUFSPC (7 * 2);
-  bytesnbytes++ = SPU_CMD_SET_DAREA;
-  bytesnbytes++ = left >> 4;
-  bytesnbytes++ = ((left & 0xf) << 4) | (right >> 8);
-  bytesnbytes++ = right & 0xff;
-  bytesnbytes++ = top >> 4;
-  bytesnbytes++ = ((top & 0xf) << 4) | (bottom >> 8);
-  bytesnbytes++ = bottom & 0xff;
-
-  CHKBUFSPC (5 * 2);
-  bytesnbytes++ = SPU_CMD_DSPXA;
-  bytesnbytes++ = (lines_offset0 >> 8) & 0xff;
-  bytesnbytes++ = lines_offset0 & 0xff;
-  bytesnbytes++ = (lines_offset1 >> 8) & 0xff;
-  bytesnbytes++ = lines_offset1 & 0xff;
-
-  CHKBUFSPC (1 * 2);
-  bytesnbytes++ = SPU_CMD_DSP;
-
-  CHKBUFSPC (1 * 2);
-  bytesnbytes++ = SPU_CMD_END;
-
-  /* stop display chunk */
-  CHKBUFSPC (4 * 2);
-  second_commands_offset = nbytes;
-  bytesfirst_commands_offset + 2 = (second_commands_offset >> 8) & 0xff;
-  bytesfirst_commands_offset + 3 = second_commands_offset & 0xff;
-  delay = GST_KATE_GST_TO_STM (ev->end_time - ev->start_time);
-  bytesnbytes++ = (delay >> 8) & 0xff;
-  bytesnbytes++ = delay & 0xff;
-  /* close the loop by linking back to self */
-  bytesnbytes++ = (second_commands_offset >> 8) & 0xff;
-  bytesnbytes++ = second_commands_offset & 0xff;
-
-  CHKBUFSPC (1 * 2);
-  bytesnbytes++ = SPU_CMD_STP_DSP;
-
-  CHKBUFSPC (1 * 2);
-  bytesnbytes++ = SPU_CMD_END;
-
-  /* Now that we know the size of the SPU, update the size and pointers */
-  bytes0 = (nbytes >> 8) & 0xff;
-  bytes1 = nbytes & 0xff;
-  bytes2 = (first_commands_offset >> 8) & 0xff;
-  bytes3 = first_commands_offset & 0xff;
-
-  /* Create a buffer with those values */
-  buffer = gst_buffer_new_wrapped (bytes, nbytes);
-  if (G_UNLIKELY (!buffer)) {
-    GST_WARNING_OBJECT (kd,
-        "Failed to allocate %" G_GSIZE_FORMAT " byte buffer", nbytes);
-    goto error;
-  }
-  GST_BUFFER_OFFSET_END (buffer) = GST_SECOND * (ev->end_time);
-  GST_BUFFER_OFFSET (buffer) = GST_SECOND * (ev->start_time);
-  GST_BUFFER_TIMESTAMP (buffer) = GST_SECOND * (ev->start_time);
-  GST_BUFFER_DURATION (buffer) = GST_SECOND * (ev->end_time - ev->start_time);
-
-  GST_DEBUG_OBJECT (kd, "SPU uses %" G_GSIZE_FORMAT " bytes", nbytes);
-
-  kate_tracker_clear (&kin);
-  return buffer;
-
-error:
-  kate_tracker_clear (&kin);
-  g_free (bytes);
-  return NULL;
-}

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkatespu.h Deleted

@@ -1,65 +0,0 @@
-/* -*- c-basic-offset: 2 -*-
- * GStreamer
- * Copyright (C) <2009> ogg.k.ogg.k <ogg.k.ogg.k at googlemail dot com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef __GST_KATE_SPU_H__
-#define __GST_KATE_SPU_H__
-
-#include <gst/gst.h>
-#include <kate/kate.h>
-#include "gstkateenc.h"
-#include "gstkatedec.h"
-
-#define GST_KATE_UINT16_BE(ptr) ( ( ((guint16)((ptr)0)) <<8) | ((ptr)1) )
-
-/* taken off the DVD SPU decoder - now is time for today's WTF ???? */
-#define GST_KATE_STM_TO_GST(stm) ((GST_MSECOND * 1024 * (stm)) / 90)
-#define GST_KATE_GST_TO_STM(gst) ((int)(((gst) * 90000 ) / 1024))
-
-#define GST_KATE_SPU_MIME_TYPE "subpicture/x-dvd"
-
-G_BEGIN_DECLS
-
-enum GstKateSpuCmd
-{
-  SPU_CMD_FSTA_DSP = 0x00,      /* Forced Display */
-  SPU_CMD_DSP = 0x01,           /* Display Start */
-  SPU_CMD_STP_DSP = 0x02,       /* Display Off */
-  SPU_CMD_SET_COLOR = 0x03,     /* Set the color indexes for the palette */
-  SPU_CMD_SET_ALPHA = 0x04,     /* Set the alpha indexes for the palette */
-  SPU_CMD_SET_DAREA = 0x05,     /* Set the display area for the SPU */
-  SPU_CMD_DSPXA = 0x06,         /* Pixel data addresses */
-  SPU_CMD_CHG_COLCON = 0x07,    /* Change Color & Contrast */
-  SPU_CMD_END = 0xff
-};
-
-
-extern const guint32 gst_kate_spu_default_clut16;
-
-extern GstFlowReturn
-gst_kate_spu_decode_spu (GstKateEnc * ke, GstBuffer * buf, kate_region * kr,
-    kate_bitmap * kb, kate_palette * kp);
-
-extern GstBuffer*
-gst_kate_spu_encode_spu (GstKateDec * kd, const kate_event * ev);
-
-G_END_DECLS
-
-#endif /* __GST_KATE_SPU_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkatetag.c Deleted

@@ -1,346 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2006 James Livingston <doclivingston@gmail.com>
- * Copyright (C) 2008 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * SECTION:element-katetag
- * @title: katetag
- * @see_also: #oggdemux, #oggmux, #kateparse, #GstTagSetter
- * @short_description: retags kate streams
- *
- * The katetag element can change the tag contained within a raw
- * kate stream. Specifically, it modifies the comments header packet
- * of the kate stream, as well as the language and category of the
- * kate stream.
- *
- * The element will also process the stream as the #kateparse element does
- * so it can be used when remuxing an Ogg Kate stream, without additional
- * elements.
- *
- * Applications can set the tags to write using the #GstTagSetter interface.
- * Tags contained within the kate stream will be picked up
- * automatically (and merged according to the merge mode set via the tag
- * setter interface).
- *
- * ## Example pipelines
- *
- * This element is only useful with gst-launch-1.0 for modifying the language
- * and/or category (which are properties of the stream located in the kate
- * beginning of stream header), because it does not support setting the tags
- * on a #GstTagSetter interface. Conceptually, the element will usually be
- * used like:
- * |
- * gst-launch-1.0 -v filesrc location=foo.ogg ! oggdemux ! katetag ! oggmux ! filesink location=bar.ogg
- * |
- *
- * This pipeline will set the language and category of the stream to the
- * given values:
- * |
- * gst-launch-1.0 -v filesrc location=foo.ogg ! oggdemux ! katetag language=pt_BR category=subtitles ! oggmux ! filesink location=bar.ogg
- * |
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <gst/tag/tag.h>
-#include <gst/gsttagsetter.h>
-
-#include <kate/kate.h>
-
-#include "gstkateelements.h"
-#include "gstkatetag.h"
-
-
-GST_DEBUG_CATEGORY_EXTERN (gst_katetag_debug);
-#define GST_CAT_DEFAULT gst_katetag_debug
-
-enum
-{
-  ARG_0,
-  ARG_LANGUAGE,
-  ARG_CATEGORY,
-  ARG_ORIGINAL_CANVAS_WIDTH,
-  ARG_ORIGINAL_CANVAS_HEIGHT,
-};
-
-static GstFlowReturn gst_kate_tag_parse_packet (GstKateParse * parse,
-    GstBuffer * buffer);
-static void gst_kate_tag_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_kate_tag_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-static void gst_kate_tag_dispose (GObject * object);
-
-GST_DEBUG_CATEGORY (gst_katetag_debug);
-#define gst_kate_tag_parent_class parent_class
-G_DEFINE_TYPE_WITH_CODE (GstKateTag, gst_kate_tag, GST_TYPE_KATE_PARSE,
-    G_IMPLEMENT_INTERFACE (GST_TYPE_TAG_SETTER, NULL));
-#define _do_init \
-  kate_element_init (plugin); \
-  GST_DEBUG_CATEGORY_INIT (gst_katetag_debug, "katetag", 0, "Kate tagger");
-GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (katetag, "katetag", GST_RANK_NONE,
-    GST_TYPE_KATE_TAG, _do_init);
-
-static void
-gst_kate_tag_class_init (GstKateTagClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-  GstKateParseClass *gstkateparse_class;
-
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-  gstkateparse_class = GST_KATE_PARSE_CLASS (klass);
-
-  gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_kate_tag_set_property);
-  gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_kate_tag_get_property);
-  gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_kate_tag_dispose);
-
-  g_object_class_install_property (gobject_class, ARG_LANGUAGE,
-      g_param_spec_string ("language", "Language",
-          "Set the language of the stream", "",
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_CATEGORY,
-      g_param_spec_string ("category", "Category",
-          "Set the category of the stream", "",
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_ORIGINAL_CANVAS_WIDTH,
-      g_param_spec_int ("original-canvas-width", "Original canvas width",
-          "Set the width of the canvas this stream was authored for (0 is unspecified)",
-          0, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_ORIGINAL_CANVAS_HEIGHT,
-      g_param_spec_int ("original-canvas-height", "Original canvas height",
-          "Set the height of the canvas this stream was authored for (0 is unspecified)",
-          0, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  gst_element_class_set_static_metadata (gstelement_class, "Kate stream tagger",
-      "Formatter/Metadata",
-      "Retags kate streams", "Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>");
-
-  gstkateparse_class->parse_packet =
-      GST_DEBUG_FUNCPTR (gst_kate_tag_parse_packet);
-}
-
-static void
-gst_kate_tag_init (GstKateTag * kt)
-{
-  kt->language = NULL;
-  kt->category = NULL;
-  kt->original_canvas_width = -1;
-  kt->original_canvas_height = -1;
-}
-
-static void
-gst_kate_tag_dispose (GObject * object)
-{
-  GstKateTag *kt = GST_KATE_TAG (object);
-
-  GST_LOG_OBJECT (kt, "disposing");
-
-  if (kt->language) {
-    g_free (kt->language);
-    kt->language = NULL;
-  }
-  if (kt->category) {
-    g_free (kt->category);
-    kt->category = NULL;
-  }
-
-  GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
-}
-
-static void
-gst_kate_tag_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstKateTag *kt = GST_KATE_TAG (object);
-  const char *str;
-
-  switch (prop_id) {
-    case ARG_LANGUAGE:
-      if (kt->language) {
-        g_free (kt->language);
-        kt->language = NULL;
-      }
-      str = g_value_get_string (value);
-      if (str)
-        kt->language = g_strdup (str);
-      break;
-    case ARG_CATEGORY:
-      if (kt->category) {
-        g_free (kt->category);
-        kt->category = NULL;
-      }
-      str = g_value_get_string (value);
-      if (str)
-        kt->category = g_strdup (str);
-      break;
-    case ARG_ORIGINAL_CANVAS_WIDTH:
-      kt->original_canvas_width = g_value_get_int (value);
-      break;
-    case ARG_ORIGINAL_CANVAS_HEIGHT:
-      kt->original_canvas_height = g_value_get_int (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_kate_tag_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstKateTag *kt = GST_KATE_TAG (object);
-
-  switch (prop_id) {
-    case ARG_LANGUAGE:
-      g_value_set_string (value, kt->language ? kt->language : "");
-      break;
-    case ARG_CATEGORY:
-      g_value_set_string (value, kt->category ? kt->category : "");
-      break;
-    case ARG_ORIGINAL_CANVAS_WIDTH:
-      g_value_set_int (value, kt->original_canvas_width);
-      break;
-    case ARG_ORIGINAL_CANVAS_HEIGHT:
-      g_value_set_int (value, kt->original_canvas_height);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static guint16
-encode_canvas_size (size_t size)
-{
-  size_t base = size;
-  size_t shift = 0;
-  int value;
-
-  while (base & ~((1 << 12) - 1)) {
-    /* we have a high bit we can't fit, increase shift if we wouldn't lose low bits */
-    if ((size >> shift) & 1)
-      return 0;
-    ++shift;
-    base >>= 1;
-  }
-  if (G_UNLIKELY (shift >= 16))
-    return 0;
-
-  /* the size can be represented in our encoding */
-  value = (base << 4) | shift;
-
-  return (guint16) value;
-}
-
-static GstFlowReturn
-gst_kate_tag_parse_packet (GstKateParse * parse, GstBuffer * buffer)
-{
-  GstTagList *old_tags, *new_tags;
-  const GstTagList *user_tags;
-  GstKateTag *kt;
-  gchar *encoder = NULL;
-  GstBuffer *new_buf;
-  GstMapInfo info;
-
-  kt = GST_KATE_TAG (parse);
-
-  if (!gst_buffer_map (buffer, &info, GST_MAP_READ)) {
-    GST_ERROR_OBJECT (parse, "Failed to map buffer");
-    return GST_FLOW_ERROR;
-  }
-
-  /* rewrite the language and category */
-  if (info.size >= 64 && info.data0 == 0x80) {
-    GstBuffer *new_buffer;
-
-    gst_buffer_unmap (buffer, &info);
-    new_buffer = gst_buffer_copy (buffer);
-    gst_buffer_unref (buffer);
-    buffer = new_buffer;
-
-    if (!gst_buffer_map (buffer, &info, GST_MAP_READWRITE)) {
-      GST_ERROR_OBJECT (parse, "Failed to map copied buffer READWRITE");
-      return GST_FLOW_ERROR;
-    }
-    /* language is at offset 32, 16 bytes, zero terminated */
-    if (kt->language) {
-      strncpy ((char *) info.data + 32, kt->language, 15);
-      info.data47 = 0;
-    }
-    /* category is at offset 48, 16 bytes, zero terminated */
-    if (kt->category) {
-      strncpy ((char *) info.data + 48, kt->category, 15);
-      info.data63 = 0;
-    }
-    if (kt->original_canvas_width >= 0) {
-      guint16 v = encode_canvas_size (kt->original_canvas_width);
-      info.data16 = v & 0xff;
-      info.data17 = (v >> 8) & 0xff;
-    }
-    if (kt->original_canvas_height >= 0) {
-      guint16 v = encode_canvas_size (kt->original_canvas_height);
-      info.data18 = v & 0xff;
-      info.data19 = (v >> 8) & 0xff;
-    }
-  }
-
-  /*  rewrite the comments packet */
-  if (info.size >= 9 && info.data0 == 0x81) {
-    old_tags =
-        gst_tag_list_from_vorbiscomment (info.data, info.size,
-        (const guint8 *) "\201kate\0\0\0\0", 9, &encoder);
-    user_tags = gst_tag_setter_get_tag_list (GST_TAG_SETTER (kt));
-    gst_buffer_unmap (buffer, &info);
-
-    /* build new tag list */
-    new_tags = gst_tag_list_merge (user_tags, old_tags,
-        gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (kt)));
-    gst_tag_list_unref (old_tags);
-
-    new_buf =
-        gst_tag_list_to_vorbiscomment_buffer (new_tags,
-        (const guint8 *) "\201kate\0\0\0\0", 9, encoder);
-    gst_buffer_copy_into (new_buf, buffer, GST_BUFFER_COPY_TIMESTAMPS, 0, -1);
-
-    gst_tag_list_unref (new_tags);
-    g_free (encoder);
-    gst_buffer_unref (buffer);
-
-    /* the buffer will have the framing bit used by Vorbis, but we don't use it */
-    gst_buffer_resize (new_buf, 0, gst_buffer_get_size (new_buf) - 1);
-
-    buffer = new_buf;
-  } else {
-    gst_buffer_unmap (buffer, &info);
-  }
-
-  return GST_KATE_PARSE_CLASS (parent_class)->parse_packet (parse, buffer);
-}

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkatetag.h Deleted

@@ -1,65 +0,0 @@
-/* -*- c-basic-offset: 2 -*-
- * GStreamer
- * Copyright (C) <2006> James Livingston <doclivingston@gmail.com>
- * Copyright (C) <2008> Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef __GST_KATE_TAG_H__
-#define __GST_KATE_TAG_H__
-
-#include "gstkateparse.h"
-
-G_BEGIN_DECLS
-#define GST_TYPE_KATE_TAG \
-  (gst_kate_tag_get_type())
-#define GST_KATE_TAG(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_KATE_TAG,GstKateTag))
-#define GST_KATE_TAG_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_KATE_TAG,GstKateTagClass))
-#define GST_IS_KATE_TAG(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_KATE_TAG))
-#define GST_IS_KATE_TAG_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_KATE_TAG))
-typedef struct _GstKateTag GstKateTag;
-typedef struct _GstKateTagClass GstKateTagClass;
-
-/**
- * GstKateTag:
- *
- * Opaque data structure.
- */
-struct _GstKateTag
-{
-  GstKateParse parse;
-
-  gchar *language;
-  gchar *category;
-  gint original_canvas_width;
-  gint original_canvas_height;
-};
-
-struct _GstKateTagClass
-{
-  GstKateParseClass parent_class;
-};
-
-GType gst_kate_tag_get_type (void);
-
-G_END_DECLS
-#endif /* __GST_KATE_TAG_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkatetiger.c Deleted

@@ -1,1221 +0,0 @@
-/*
- * GStreamer
- * Copyright 2005 Thomas Vander Stichele <thomas@apestaart.org>
- * Copyright 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
- * Copyright 2008 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, the contents of this file may be used under the
- * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
- * which case the following provisions apply instead of the ones
- * mentioned above:
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * SECTION:element-tiger
- * @title: tiger
- * @see_also: katedec
- *
- * This element decodes and renders Kate streams.
- * Kate(http://libkate.googlecode.com/) is a free codec for text based data,
- * such as subtitles. Any number of kate streams can be embedded in an Ogg
- * stream.
- *
- * libkate (see above url) and libtiger(http://libtiger.googlecode.com/)
- * are needed to build this element.
- *
- * ## Example pipeline
- *
- * This pipeline renders a Kate stream on top of a Theora video multiplexed
- * in the same stream:
- * |
- * gst-launch-1.0 \
- *   filesrc location=video.ogg ! oggdemux name=demux \
- *   demux. ! queue ! theoradec ! videoconvert ! tiger name=tiger \
- *   demux. ! queue ! kateparse ! tiger. \
- *   tiger. ! videoconvert ! autovideosink
- * |
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-
-#include <gst/gst.h>
-#include <gst/glib-compat-private.h>
-#include <gst/video/video.h>
-
-#include "gstkateelements.h"
-#include "gstkatetiger.h"
-
-GST_DEBUG_CATEGORY_EXTERN (gst_katetiger_debug);
-#define GST_CAT_DEFAULT gst_katetiger_debug
-
-#define GST_KATE_TIGER_MUTEX_LOCK(element) \
-  do { \
-    /*GST_LOG_OBJECT ((element), "locking from %s:%d",__FILE__,__LINE__);*/ \
-    g_mutex_lock ((element)->mutex); \
-    /*GST_LOG_OBJECT ((element), "ready from %s:%d",__FILE__,__LINE__);*/ \
-  } while(0)
-
-#define GST_KATE_TIGER_MUTEX_UNLOCK(element) \
-  do { \
-    /*GST_LOG_OBJECT ((element), "unlocking from %s:%d",__FILE__,__LINE__);*/ \
-    g_mutex_unlock ((element)->mutex); \
-  } while(0)
-
-/* Filter signals and args */
-enum
-{
-  /* FILL ME */
-  LAST_SIGNAL
-};
-
-enum
-{
-  ARG_DEFAULT_FONT_DESC = DECODER_BASE_ARG_COUNT,
-  ARG_QUALITY,
-  ARG_DEFAULT_FONT_EFFECT,
-  ARG_DEFAULT_FONT_EFFECT_STRENGTH,
-  ARG_DEFAULT_FONT_RED,
-  ARG_DEFAULT_FONT_GREEN,
-  ARG_DEFAULT_FONT_BLUE,
-  ARG_DEFAULT_FONT_ALPHA,
-  ARG_DEFAULT_BACKGROUND_RED,
-  ARG_DEFAULT_BACKGROUND_GREEN,
-  ARG_DEFAULT_BACKGROUND_BLUE,
-  ARG_DEFAULT_BACKGROUND_ALPHA,
-  ARG_SILENT
-};
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-# define TIGER_ARGB_A 3
-# define TIGER_ARGB_R 2
-# define TIGER_ARGB_G 1
-# define TIGER_ARGB_B 0
-#else
-# define TIGER_ARGB_A 0
-# define TIGER_ARGB_R 1
-# define TIGER_ARGB_G 2
-# define TIGER_ARGB_B 3
-#endif
-
-#define TIGER_UNPREMULTIPLY(a,r,g,b) G_STMT_START { \
-  b = (a > 0) ? MIN ((b * 255 + a / 2) / a, 255) : 0; \
-  g = (a > 0) ? MIN ((g * 255 + a / 2) / a, 255) : 0; \
-  r = (a > 0) ? MIN ((r * 255 + a / 2) / a, 255) : 0; \
-} G_STMT_END
-
-static GstStaticPadTemplate kate_sink_factory =
-    GST_STATIC_PAD_TEMPLATE ("subtitle_sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("subtitle/x-kate; application/x-kate")
-    );
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define TIGER_VIDEO_CAPS \
-    GST_VIDEO_CAPS_xRGB ";" GST_VIDEO_CAPS_BGRx ";" \
-    GST_VIDEO_CAPS_YUV ("{I420, YV12, AYUV, YUY2, UYVY, v308, v210," \
-        " v216, Y41B, Y42B, Y444, Y800, Y16, NV12, NV21, UYVP, A420," \
-        " YUV9, IYU1}")
-
-#else
-#define TIGER_VIDEO_CAPS \
-    GST_VIDEO_CAPS_BGRx ";" GST_VIDEO_CAPS_xRGB ";" \
-    GST_VIDEO_CAPS_YUV ("{I420, YV12, AYUV, YUY2, UYVY, v308, v210," \
-        " v216, Y41B, Y42B, Y444, Y800, Y16, NV12, NV21, UYVP, A420," \
-        " YUV9, IYU1}")
-#endif
-
-static GstStaticPadTemplate video_sink_factory =
-GST_STATIC_PAD_TEMPLATE ("video_sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (TIGER_VIDEO_CAPS));
-
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (TIGER_VIDEO_CAPS));
-
-GST_DEBUG_CATEGORY (gst_katetiger_debug);
-
-GST_BOILERPLATE (GstKateTiger, gst_kate_tiger, GstElement, GST_TYPE_ELEMENT);
-#define _do_init \
-  kate_element_init (plugin); \
-  GST_DEBUG_CATEGORY_INIT (gst_katetiger_debug, "tiger", 0, \
-        "Kate Tiger renderer");
-GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (tiger, "tiger", GST_RANK_NONE,
-    GST_TYPE_KATE_TIGER, _do_init);
-
-static GType
-gst_kate_tiger_font_effect_get_type (void)
-{
-  static GType font_effect_type = 0;
-
-  if (!font_effect_type) {
-    static const GEnumValue font_effects = {
-      {tiger_font_plain, "none", "none"},
-      {tiger_font_shadow, "shadow", "shadow"},
-      {tiger_font_outline, "outline", "outline"},
-      {0, NULL, NULL}
-    };
-    font_effect_type = g_enum_register_static ("GstFontEffect", font_effects);
-  }
-
-  return font_effect_type;
-}
-
-static void gst_kate_tiger_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_kate_tiger_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-static void gst_kate_tiger_dispose (GObject * object);
-
-static GstFlowReturn gst_kate_tiger_kate_chain (GstPad * pad, GstBuffer * buf);
-static GstFlowReturn gst_kate_tiger_video_chain (GstPad * pad, GstBuffer * buf);
-static GstStateChangeReturn gst_kate_tiger_change_state (GstElement * element,
-    GstStateChange transition);
-static gboolean gst_kate_tiger_kate_sink_query (GstPad * pad, GstQuery * query);
-static gboolean gst_kate_tiger_kate_event (GstPad * pad, GstEvent * event);
-static gboolean gst_kate_tiger_video_event (GstPad * pad, GstEvent * event);
-static gboolean gst_kate_tiger_video_set_caps (GstPad * pad, GstCaps * caps);
-static gboolean gst_kate_tiger_source_event (GstPad * pad, GstEvent * event);
-
-static void
-gst_kate_tiger_base_init (gpointer gclass)
-{
-
-  GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
-
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
-  gst_element_class_add_static_pad_template (element_class, &kate_sink_factory);
-  gst_element_class_add_static_pad_template (element_class,
-      &video_sink_factory);
-  gst_element_class_set_static_metadata (element_class, "Kate stream renderer",
-      "Mixer/Video/Overlay/Subtitle",
-      "Decodes and renders Kate streams on top of a video",
-      "Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>");
-}
-
-/* initialize the plugin's class */
-static void
-gst_kate_tiger_class_init (GstKateTigerClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-
-  gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_kate_tiger_get_property);
-  gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_kate_tiger_set_property);
-  gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_kate_tiger_dispose);
-
-  gst_kate_util_install_decoder_base_properties (gobject_class);
-
-  g_object_class_install_property (gobject_class, ARG_QUALITY,
-      g_param_spec_double ("quality", "Rendering quality",
-          "Rendering quality (0 is faster, 1 is best and slower)",
-          0.0, 1.0, 1.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEFAULT_FONT_DESC,
-      g_param_spec_string ("default-font-desc", "Default font description",
-          "Default font description (Pango style) to render text with",
-          "", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEFAULT_FONT_EFFECT,
-      g_param_spec_enum ("default-font-effect", "Default font effect",
-          "Whether to apply an effect to text by default, for increased readability",
-          gst_kate_tiger_font_effect_get_type (),
-          tiger_font_outline,
-          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class,
-      ARG_DEFAULT_FONT_EFFECT_STRENGTH,
-      g_param_spec_double ("default-font-effect-strength",
-          "Default font effect strength",
-          "How pronounced should the font effect be (effect dependent)", 0.0,
-          1.0, 0.5, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEFAULT_FONT_RED,
-      g_param_spec_int ("default-font-red",
-          "Default font color (red component)",
-          "Default font color (red component, between 0 and 255) to render text with",
-          0, 255, 255, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEFAULT_FONT_GREEN,
-      g_param_spec_int ("default-font-green",
-          "Default font color (green component)",
-          "Default font color (green component, between 0 and 255) to render text with",
-          0, 255, 255, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEFAULT_FONT_BLUE,
-      g_param_spec_int ("default-font-blue",
-          "Default font color (blue component)",
-          "Default font color (blue component, between 0 and 255) to render text with",
-          0, 255, 255, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEFAULT_FONT_ALPHA,
-      g_param_spec_int ("default-font-alpha",
-          "Default font color (alpha component)",
-          "Default font color (alpha component, between 0 and 255) to render text with",
-          0, 255, 255, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEFAULT_BACKGROUND_RED,
-      g_param_spec_int ("default-background-red",
-          "Default background color (red component)",
-          "Default background color (red component, between 0 and 255) to render text with",
-          0, 255, 255, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEFAULT_BACKGROUND_GREEN,
-      g_param_spec_int ("default-background-green",
-          "Default background color (green component)",
-          "Default background color (green component, between 0 and 255) to render text with",
-          0, 255, 255, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEFAULT_BACKGROUND_BLUE,
-      g_param_spec_int ("default-background-blue",
-          "Default background color (blue component)",
-          "Default background color (blue component, between 0 and 255) to render text with",
-          0, 255, 255, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEFAULT_BACKGROUND_ALPHA,
-      g_param_spec_int ("default-background-alpha",
-          "Default background color (alpha component)",
-          "Default background color (alpha component, between 0 and 255) to render text with",
-          0, 255, 255, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  /* FIXME 0.11: rename to "visible" or "text-visible" or "render-text" */
-  g_object_class_install_property (gobject_class, ARG_SILENT,
-      g_param_spec_boolean ("silent", "silent",
-          "Whether to render the stream",
-          FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  gstelement_class->change_state =
-      GST_DEBUG_FUNCPTR (gst_kate_tiger_change_state);
-}
-
-/* initialize the new element
- * instantiate pads and add them to element
- * set functions
- * initialize structure
- */
-static void
-gst_kate_tiger_init (GstKateTiger * tiger, GstKateTigerClass * gclass)
-{
-  GST_DEBUG_OBJECT (tiger, "gst_kate_tiger_init");
-
-  tiger->mutex = g_mutex_new ();
-  tiger->cond = g_cond_new ();
-
-  tiger->katesinkpad =
-      gst_pad_new_from_static_template (&kate_sink_factory, "subtitle_sink");
-  gst_pad_set_chain_function (tiger->katesinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_tiger_kate_chain));
-  gst_pad_set_query_function (tiger->katesinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_tiger_kate_sink_query));
-  gst_pad_set_event_function (tiger->katesinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_tiger_kate_event));
-  gst_element_add_pad (GST_ELEMENT (tiger), tiger->katesinkpad);
-
-  tiger->videosinkpad =
-      gst_pad_new_from_static_template (&video_sink_factory, "video_sink");
-  gst_pad_set_chain_function (tiger->videosinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_tiger_video_chain));
-  gst_pad_use_fixed_caps (tiger->videosinkpad);
-  gst_pad_set_setcaps_function (tiger->videosinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_tiger_video_set_caps));
-  gst_pad_set_event_function (tiger->videosinkpad,
-      GST_DEBUG_FUNCPTR (gst_kate_tiger_video_event));
-  gst_element_add_pad (GST_ELEMENT (tiger), tiger->videosinkpad);
-
-  tiger->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
-  gst_pad_set_event_function (tiger->srcpad, gst_kate_tiger_source_event);
-  gst_pad_use_fixed_caps (tiger->srcpad);
-  gst_element_add_pad (GST_ELEMENT (tiger), tiger->srcpad);
-
-  gst_kate_util_decode_base_init (&tiger->decoder, FALSE);
-
-  tiger->tr = NULL;
-
-  tiger->default_font_desc = NULL;
-  tiger->quality = -1.0;
-  tiger->default_font_effect = tiger_font_outline;
-  tiger->default_font_effect_strength = 0.5;
-  tiger->default_font_r = 255;
-  tiger->default_font_g = 255;
-  tiger->default_font_b = 255;
-  tiger->default_font_a = 255;
-  tiger->default_background_r = 0;
-  tiger->default_background_g = 0;
-  tiger->default_background_b = 0;
-  tiger->default_background_a = 0;
-  tiger->silent = FALSE;
-
-  tiger->video_width = 0;
-  tiger->video_height = 0;
-
-  tiger->composition = NULL;
-
-  tiger->seen_header = FALSE;
-}
-
-static void
-gst_kate_tiger_dispose (GObject * object)
-{
-  GstKateTiger *tiger = GST_KATE_TIGER (object);
-
-  GST_LOG_OBJECT (tiger, "disposing");
-
-  if (tiger->default_font_desc) {
-    g_free (tiger->default_font_desc);
-    tiger->default_font_desc = NULL;
-  }
-
-  if (tiger->render_buffer) {
-    gst_buffer_unref (tiger->render_buffer);
-    tiger->render_buffer = NULL;
-  }
-
-  g_cond_free (tiger->cond);
-  tiger->cond = NULL;
-
-  g_mutex_free (tiger->mutex);
-  tiger->mutex = NULL;
-
-  if (tiger->composition) {
-    gst_video_overlay_composition_unref (tiger->composition);
-    tiger->composition = NULL;
-  }
-
-  GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
-}
-
-static void
-gst_kate_tiger_update_quality (GstKateTiger * tiger)
-{
-  if (tiger->tr && tiger->quality >= 0.0) {
-    tiger_renderer_set_quality (tiger->tr, tiger->quality);
-  }
-}
-
-static void
-gst_kate_tiger_update_default_font_effect (GstKateTiger * tiger)
-{
-  if (tiger->tr) {
-    tiger_renderer_set_default_font_effect (tiger->tr,
-        tiger->default_font_effect, tiger->default_font_effect_strength);
-  }
-}
-
-static void
-gst_kate_tiger_update_default_font_color (GstKateTiger * tiger)
-{
-  if (tiger->tr) {
-    tiger_renderer_set_default_font_color (tiger->tr,
-        tiger->default_font_r / 255.0,
-        tiger->default_font_g / 255.0,
-        tiger->default_font_b / 255.0, tiger->default_font_a / 255.0);
-  }
-}
-
-static void
-gst_kate_tiger_update_default_background_color (GstKateTiger * tiger)
-{
-  if (tiger->tr) {
-    tiger_renderer_set_default_background_fill_color (tiger->tr,
-        tiger->default_background_r / 255.0,
-        tiger->default_background_g / 255.0,
-        tiger->default_background_b / 255.0,
-        tiger->default_background_a / 255.0);
-  }
-}
-
-static void
-gst_kate_tiger_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstKateTiger *tiger = GST_KATE_TIGER (object);
-  const char *str;
-
-  GST_KATE_TIGER_MUTEX_LOCK (tiger);
-
-  switch (prop_id) {
-    case ARG_DEFAULT_FONT_DESC:
-      if (tiger->default_font_desc) {
-        g_free (tiger->default_font_desc);
-        tiger->default_font_desc = NULL;
-      }
-      str = g_value_get_string (value);
-      if (str) {
-        tiger->default_font_desc = g_strdup (str);
-        if (tiger->tr)
-          tiger_renderer_set_default_font_description (tiger->tr,
-              tiger->default_font_desc);
-      }
-      break;
-    case ARG_QUALITY:
-      tiger->quality = g_value_get_double (value);
-      gst_kate_tiger_update_quality (tiger);
-      break;
-    case ARG_DEFAULT_FONT_EFFECT:
-      tiger->default_font_effect = g_value_get_enum (value);
-      gst_kate_tiger_update_default_font_effect (tiger);
-      break;
-    case ARG_DEFAULT_FONT_EFFECT_STRENGTH:
-      tiger->default_font_effect_strength = g_value_get_double (value);
-      gst_kate_tiger_update_default_font_effect (tiger);
-      break;
-    case ARG_DEFAULT_FONT_RED:
-      tiger->default_font_r = g_value_get_int (value);
-      gst_kate_tiger_update_default_font_color (tiger);
-      break;
-    case ARG_DEFAULT_FONT_GREEN:
-      tiger->default_font_g = g_value_get_int (value);
-      gst_kate_tiger_update_default_font_color (tiger);
-      break;
-    case ARG_DEFAULT_FONT_BLUE:
-      tiger->default_font_b = g_value_get_int (value);
-      gst_kate_tiger_update_default_font_color (tiger);
-      break;
-    case ARG_DEFAULT_FONT_ALPHA:
-      tiger->default_font_a = g_value_get_int (value);
-      gst_kate_tiger_update_default_font_color (tiger);
-      break;
-    case ARG_DEFAULT_BACKGROUND_RED:
-      tiger->default_background_r = g_value_get_int (value);
-      gst_kate_tiger_update_default_background_color (tiger);
-      break;
-    case ARG_DEFAULT_BACKGROUND_GREEN:
-      tiger->default_background_g = g_value_get_int (value);
-      gst_kate_tiger_update_default_background_color (tiger);
-      break;
-    case ARG_DEFAULT_BACKGROUND_BLUE:
-      tiger->default_background_b = g_value_get_int (value);
-      gst_kate_tiger_update_default_background_color (tiger);
-      break;
-    case ARG_DEFAULT_BACKGROUND_ALPHA:
-      tiger->default_background_a = g_value_get_int (value);
-      gst_kate_tiger_update_default_background_color (tiger);
-      break;
-    case ARG_SILENT:
-      tiger->silent = g_value_get_boolean (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-
-  GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-}
-
-static void
-gst_kate_tiger_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstKateTiger *tiger = GST_KATE_TIGER (object);
-
-  GST_KATE_TIGER_MUTEX_LOCK (tiger);
-
-  switch (prop_id) {
-    case ARG_DEFAULT_FONT_DESC:
-      g_value_set_string (value,
-          tiger->default_font_desc ? tiger->default_font_desc : "");
-      break;
-    case ARG_QUALITY:
-      g_value_set_double (value, tiger->quality);
-      break;
-    case ARG_DEFAULT_FONT_EFFECT:
-      g_value_set_enum (value, tiger->default_font_effect);
-      break;
-    case ARG_DEFAULT_FONT_EFFECT_STRENGTH:
-      g_value_set_double (value, tiger->default_font_effect_strength);
-      break;
-    case ARG_DEFAULT_FONT_RED:
-      g_value_set_int (value, tiger->default_font_r);
-      break;
-    case ARG_DEFAULT_FONT_GREEN:
-      g_value_set_int (value, tiger->default_font_g);
-      break;
-    case ARG_DEFAULT_FONT_BLUE:
-      g_value_set_int (value, tiger->default_font_b);
-      break;
-    case ARG_DEFAULT_FONT_ALPHA:
-      g_value_set_int (value, tiger->default_font_a);
-      break;
-    case ARG_DEFAULT_BACKGROUND_RED:
-      g_value_set_int (value, tiger->default_background_r);
-      break;
-    case ARG_DEFAULT_BACKGROUND_GREEN:
-      g_value_set_int (value, tiger->default_background_g);
-      break;
-    case ARG_DEFAULT_BACKGROUND_BLUE:
-      g_value_set_int (value, tiger->default_background_b);
-      break;
-    case ARG_DEFAULT_BACKGROUND_ALPHA:
-      g_value_set_int (value, tiger->default_background_a);
-      break;
-    case ARG_SILENT:
-      g_value_set_boolean (value, tiger->silent);
-      break;
-    default:
-      if (!gst_kate_util_decoder_base_get_property (&tiger->decoder, object,
-              prop_id, value, pspec)) {
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      }
-      break;
-  }
-
-  GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-}
-
-/* GstElement vmethod implementations */
-
-/* chain function
- * this function does the actual processing
- */
-
-static GstFlowReturn
-gst_kate_tiger_kate_chain (GstPad * pad, GstBuffer * buf)
-{
-  GstKateTiger *tiger = GST_KATE_TIGER (gst_pad_get_parent (pad));
-  const kate_event *ev = NULL;
-  GstFlowReturn rflow = GST_FLOW_OK;
-
-  GST_KATE_TIGER_MUTEX_LOCK (tiger);
-
-  GST_LOG_OBJECT (tiger, "Got kate buffer, caps %" GST_PTR_FORMAT,
-      GST_BUFFER_CAPS (buf));
-
-  /* Now that we have the lock, check if we're flushing */
-  if (tiger->decoder.kate_flushing) {
-    GST_DEBUG_OBJECT (tiger, "Flushing, disregarding buffer");
-    goto done;
-  }
-
-  /* Unfortunately, it can happen that the start of the stream is not sent,
-     for instance if there's a stream selector upstream, which is switched
-     from another Kate stream. If this happens, then we can fallback on the
-     headers stored in the caps (if any). */
-  if (!tiger->seen_header) {
-    if (GST_BUFFER_SIZE (buf) == 0 || (GST_BUFFER_DATA (buf)0 & 0x80) == 0) {
-      /* Not a header, try to fall back on caps */
-      GstStructure *s;
-      const GValue *streamheader;
-
-      GST_INFO_OBJECT (tiger, "Headers not seen, start of stream is cut off");
-      s = gst_caps_get_structure (GST_BUFFER_CAPS (buf), 0);
-      streamheader = gst_structure_get_value (s, "streamheader");
-      if (streamheader && G_VALUE_TYPE (streamheader) == GST_TYPE_ARRAY) {
-        GstPad *tagpad = gst_pad_get_peer (pad);
-        GArray *array;
-        gint i;
-
-        GST_INFO_OBJECT (tiger, "Falling back on caps to initialize decoder");
-        array = g_value_peek_pointer (streamheader);
-        for (i = 0; i < array->len; i++) {
-          GValue *value = &g_array_index (array, GValue, i);
-          if (G_VALUE_TYPE (value) == GST_TYPE_BUFFER) {
-            GstBuffer *hbuf = g_value_peek_pointer (value);
-            gst_buffer_ref (hbuf);
-            rflow =
-                gst_kate_util_decoder_base_chain_kate_packet (&tiger->decoder,
-                GST_ELEMENT_CAST (tiger), pad, hbuf, tiger->srcpad, tagpad,
-                NULL, NULL);
-          } else {
-            GST_WARNING_OBJECT (tiger,
-                "Streamheader index %d does not hold a buffer", i);
-          }
-        }
-        gst_object_unref (tagpad);
-        tiger->seen_header = TRUE;
-      } else {
-        GST_WARNING_OBJECT (tiger, "No headers seen, and no headers on caps");
-      }
-    } else {
-      tiger->seen_header = TRUE;
-    }
-  }
-
-  if (gst_kate_util_decoder_base_update_segment (&tiger->decoder,
-          GST_ELEMENT_CAST (tiger), buf)) {
-    GstPad *tagpad = gst_pad_get_peer (pad);
-    rflow =
-        gst_kate_util_decoder_base_chain_kate_packet (&tiger->decoder,
-        GST_ELEMENT_CAST (tiger), pad, buf, tiger->srcpad, tagpad, NULL, &ev);
-    if (G_LIKELY (rflow == GST_FLOW_OK)) {
-      if (ev) {
-        int ret = tiger_renderer_add_event (tiger->tr, ev->ki, ev);
-        GST_INFO_OBJECT (tiger, "adding event for %p from %f to %f: %p, \"%s\"",
-            ev->ki, ev->start_time, ev->end_time, ev->bitmap, ev->text);
-        if (G_UNLIKELY (ret < 0)) {
-          GST_WARNING_OBJECT (tiger,
-              "failed to add Kate event to Tiger renderer: %s",
-              gst_kate_util_get_error_message (ret));
-        }
-      }
-    }
-    gst_object_unref (tagpad);
-  }
-
-  /* we want to avoid shooting ahead of the video stream, or we will
-     get segment updates which will place us ahead of it, and we won't
-     be able to convert a video timestamp back into a kate timestamp */
-  if (G_LIKELY (GST_BUFFER_TIMESTAMP_IS_VALID (buf))) {
-    while (1) {
-      gint64 kate_time, video_time;
-      kate_time =
-          gst_segment_to_running_time (&tiger->decoder.kate_segment,
-          GST_FORMAT_TIME, GST_BUFFER_TIMESTAMP (buf));
-      video_time =
-          gst_segment_to_running_time (&tiger->video_segment, GST_FORMAT_TIME,
-          tiger->video_segment.last_stop);
-      GST_DEBUG_OBJECT (tiger, "Kate time %.2f, video time %.2f (kts %ld)",
-          kate_time / (float) GST_SECOND, video_time / (float) GST_SECOND,
-          (long) GST_BUFFER_TIMESTAMP (buf));
-      if (kate_time <= video_time) {
-        break;
-      }
-      GST_LOG_OBJECT (tiger, "Waiting to return from chain function");
-      g_cond_wait (tiger->cond, tiger->mutex);
-      if (tiger->decoder.kate_flushing) {
-        GST_DEBUG_OBJECT (tiger, "Flushing while waiting");
-        break;
-      }
-      GST_LOG_OBJECT (tiger, "Woken up, checking time again");
-    }
-  }
-
-done:
-  GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-
-  gst_object_unref (tiger);
-  gst_buffer_unref (buf);
-
-  return rflow;
-}
-
-static gboolean
-gst_kate_tiger_video_set_caps (GstPad * pad, GstCaps * caps)
-{
-  GstKateTiger *tiger = GST_KATE_TIGER (gst_pad_get_parent (pad));
-  GstVideoFormat format;
-  gint w, h;
-  gboolean ret;
-
-  GST_KATE_TIGER_MUTEX_LOCK (tiger);
-
-  /* Cairo expects ARGB in native endianness, and that's what we get
-     as we've forced it in the caps. We might allow swapped red/blue
-     at some point, and get tiger to swap, to make some cases faster */
-  tiger->swap_rgb = FALSE;
-
-  if (gst_video_format_parse_caps (caps, &format, &w, &h)) {
-    tiger->video_format = format;
-    tiger->video_width = w;
-    tiger->video_height = h;
-  }
-
-  GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-
-  ret = gst_pad_set_caps (tiger->srcpad, caps);
-
-  gst_object_unref (tiger);
-  return ret;
-}
-
-static gdouble
-gst_kate_tiger_get_time (GstKateTiger * tiger)
-{
-  gint64 rt =
-      gst_segment_to_running_time (&tiger->video_segment, GST_FORMAT_TIME,
-      tiger->video_segment.last_stop);
-  gint64 pos =
-      gst_segment_to_position (&tiger->decoder.kate_segment, GST_FORMAT_TIME,
-      rt);
-  return pos / (gdouble) GST_SECOND;
-}
-
-static inline void
-gst_kate_tiger_set_composition (GstKateTiger * tiger)
-{
-  GstVideoOverlayRectangle *rectangle;
-
-  if (tiger->render_buffer) {
-    rectangle = gst_video_overlay_rectangle_new_argb (tiger->render_buffer,
-        tiger->video_width, tiger->video_height, 4 * tiger->video_width,
-        0, 0, tiger->video_width, tiger->video_height,
-        GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA);
-
-    if (tiger->composition)
-      gst_video_overlay_composition_unref (tiger->composition);
-    tiger->composition = gst_video_overlay_composition_new (rectangle);
-    gst_video_overlay_rectangle_unref (rectangle);
-
-  } else if (tiger->composition) {
-    gst_video_overlay_composition_unref (tiger->composition);
-    tiger->composition = NULL;
-  }
-}
-
-static GstFlowReturn
-gst_kate_tiger_video_chain (GstPad * pad, GstBuffer * buf)
-{
-  GstKateTiger *tiger = GST_KATE_TIGER (gst_pad_get_parent (pad));
-  GstFlowReturn rflow = GST_FLOW_OK;
-  unsigned char *ptr;
-  int ret;
-  kate_float t;
-
-  GST_KATE_TIGER_MUTEX_LOCK (tiger);
-
-  GST_LOG_OBJECT (tiger, "got video frame, %u bytes", GST_BUFFER_SIZE (buf));
-
-  if (G_UNLIKELY (tiger->video_flushing)) {
-    GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-    gst_object_unref (tiger);
-    gst_buffer_unref (buf);
-    return GST_FLOW_FLUSHING;
-  }
-
-  if (G_LIKELY (GST_BUFFER_TIMESTAMP_IS_VALID (buf))) {
-    gst_segment_set_last_stop (&tiger->video_segment, GST_FORMAT_TIME,
-        GST_BUFFER_TIMESTAMP (buf));
-    g_cond_broadcast (tiger->cond);
-  }
-
-  /* Update first with a dummy buffer pointer we cannot write to, but with the
-     right dimensions. If there is nothing to draw, we will not have to make
-     it writeable. */
-  ptr = GST_BUFFER_DATA (buf);
-  ret =
-      tiger_renderer_set_buffer (tiger->tr, ptr, tiger->video_width,
-      tiger->video_height, tiger->video_width * 4, tiger->swap_rgb);
-  if (G_UNLIKELY (ret < 0)) {
-    GST_WARNING_OBJECT (tiger,
-        "Tiger renderer failed to set buffer to video frame: %s",
-        gst_kate_util_get_error_message (ret));
-    goto pass;
-  }
-
-  /* update the renderer at the time of the video frame */
-  t = gst_kate_tiger_get_time (tiger);
-  GST_LOG_OBJECT (tiger, "Video segment calc: last stop %ld, time %.3f",
-      (long) tiger->video_segment.last_stop, t);
-  ret = tiger_renderer_update (tiger->tr, t, 1);
-  if (G_UNLIKELY (ret < 0)) {
-    GST_WARNING_OBJECT (tiger, "Tiger renderer failed to update: %s",
-        gst_kate_util_get_error_message (ret));
-    goto pass;
-  }
-
-  /* if there nothing to draw, we can just push the video buffer as is */
-  if (ret > 0 || tiger->silent)
-    goto pass;
-
-  /* there is something to draw, so first make the buffer writable */
-  buf = gst_buffer_make_writable (buf);
-  if (G_UNLIKELY (!buf)) {
-    GST_WARNING_OBJECT (tiger, "Failed to make video buffer writable");
-    goto pass;
-  }
-
-  /* and setup that buffer before rendering */
-  if (gst_video_format_is_yuv (tiger->video_format)) {
-    if (!tiger->render_buffer) {
-      tiger->render_buffer =
-          gst_buffer_new_and_alloc (tiger->video_width * tiger->video_height *
-          4);
-    }
-    ptr = GST_BUFFER_DATA (tiger->render_buffer);
-    tiger_renderer_set_surface_clear_color (tiger->tr, 1, 0.0, 0.0, 0.0, 0.0);
-  } else {
-    ptr = GST_BUFFER_DATA (buf);
-  }
-  ret =
-      tiger_renderer_set_buffer (tiger->tr, ptr, tiger->video_width,
-      tiger->video_height, tiger->video_width * 4, tiger->swap_rgb);
-  if (G_UNLIKELY (ret < 0)) {
-    GST_WARNING_OBJECT (tiger,
-        "Tiger renderer failed to set buffer to video frame: %s",
-        gst_kate_util_get_error_message (ret));
-    goto pass;
-  }
-  ret = tiger_renderer_render (tiger->tr);
-  if (G_UNLIKELY (ret < 0)) {
-    GST_WARNING_OBJECT (tiger,
-        "Tiger renderer failed to render to video frame: %s",
-        gst_kate_util_get_error_message (ret));
-  } else {
-    GST_LOG_OBJECT (tiger, "Tiger renderer rendered on video frame at %f", t);
-  }
-
-  if (gst_video_format_is_yuv (tiger->video_format)) {
-    gst_kate_tiger_set_composition (tiger);
-    if (tiger->composition)
-      gst_video_overlay_composition_blend (tiger->composition, buf);
-  }
-
-pass:
-  GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-
-  rflow = gst_pad_push (tiger->srcpad, buf);
-
-  gst_object_unref (tiger);
-
-  return rflow;
-}
-
-static GstStateChangeReturn
-gst_kate_tiger_change_state (GstElement * element, GstStateChange transition)
-{
-  GstKateTiger *tiger = GST_KATE_TIGER (element);
-  GstStateChangeReturn res;
-
-  switch (transition) {
-    case GST_STATE_CHANGE_PAUSED_TO_READY:
-      GST_DEBUG_OBJECT (tiger, "PAUSED -> READY, clearing kate state");
-      GST_KATE_TIGER_MUTEX_LOCK (tiger);
-      gst_kate_util_decoder_base_set_flushing (&tiger->decoder, TRUE);
-      g_cond_broadcast (tiger->cond);
-      if (tiger->tr) {
-        tiger_renderer_destroy (tiger->tr);
-        tiger->tr = NULL;
-      }
-      gst_segment_init (&tiger->video_segment, GST_FORMAT_UNDEFINED);
-      tiger->video_flushing = TRUE;
-      GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-      break;
-    default:
-      break;
-  }
-
-  res =
-      gst_kate_decoder_base_change_state (&tiger->decoder, element,
-      parent_class, transition);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_READY_TO_PAUSED:
-      GST_DEBUG_OBJECT (tiger, "READY -> PAUSED, initializing kate state");
-      GST_KATE_TIGER_MUTEX_LOCK (tiger);
-      if (tiger->decoder.initialized) {
-        int ret = tiger_renderer_create (&tiger->tr);
-        if (ret < 0) {
-          GST_WARNING_OBJECT (tiger, "failed to create tiger renderer: %s",
-              gst_kate_util_get_error_message (ret));
-        } else {
-          ret =
-              tiger_renderer_set_default_font_description (tiger->tr,
-              tiger->default_font_desc);
-          if (ret < 0) {
-            GST_WARNING_OBJECT (tiger,
-                "failed to set tiger default font description: %s",
-                gst_kate_util_get_error_message (ret));
-          }
-          gst_kate_tiger_update_default_font_color (tiger);
-          gst_kate_tiger_update_default_background_color (tiger);
-          gst_kate_tiger_update_default_font_effect (tiger);
-          gst_kate_tiger_update_quality (tiger);
-        }
-      }
-      gst_segment_init (&tiger->video_segment, GST_FORMAT_UNDEFINED);
-      tiger->video_flushing = FALSE;
-      tiger->seen_header = FALSE;
-      GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-      break;
-    default:
-      break;
-  }
-
-  return res;
-}
-
-static gboolean
-gst_kate_tiger_seek (GstKateTiger * tiger, GstPad * pad, GstEvent * event)
-{
-  GstFormat format;
-  gdouble rate;
-  GstSeekFlags flags;
-  GstSeekType cur_type, stop_type;
-  gint64 cur, stop;
-
-  gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur,
-      &stop_type, &stop);
-
-  if (flags & GST_SEEK_FLAG_FLUSH)
-    gst_pad_push_event (tiger->srcpad, gst_event_new_flush_start ());
-
-  GST_KATE_TIGER_MUTEX_LOCK (tiger);
-  tiger->video_flushing = TRUE;
-  gst_kate_util_decoder_base_set_flushing (&tiger->decoder, TRUE);
-  g_cond_broadcast (tiger->cond);
-  GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-
-  if (format == GST_FORMAT_TIME) {
-    /* if seeking in time, we can update tiger to remove any appropriate events */
-    kate_float target;
-    switch (cur_type) {
-      case GST_SEEK_TYPE_SET:
-        target = cur / (float) GST_SECOND;
-        break;
-      case GST_SEEK_TYPE_CUR:
-        GST_WARNING_OBJECT (tiger,
-            "Seeking from the current segment, cannot work out target so flushing everything");
-        target = (kate_float) 0;
-        break;
-      case GST_SEEK_TYPE_END:
-        GST_WARNING_OBJECT (tiger,
-            "Seeking from the end, cannot work out target so flushing everything");
-        target = (kate_float) 0;
-        break;
-      default:
-        GST_WARNING_OBJECT (tiger, "Unexpected seek type");
-        target = (kate_float) 0;
-        break;
-    }
-    GST_INFO_OBJECT (tiger, "Seeking in time to %f", target);
-    GST_KATE_TIGER_MUTEX_LOCK (tiger);
-    tiger_renderer_seek (tiger->tr, target);
-    GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-  }
-
-  /* forward to both sinks */
-  gst_event_ref (event);
-  if (gst_pad_push_event (tiger->videosinkpad, event)) {
-    int ret = gst_pad_push_event (tiger->katesinkpad, event);
-    if (ret) {
-      return TRUE;
-    } else {
-      return FALSE;
-    }
-  } else {
-    gst_event_unref (event);
-    return FALSE;
-  }
-}
-
-static gboolean
-gst_kate_tiger_source_event (GstPad * pad, GstEvent * event)
-{
-  GstKateTiger *tiger =
-      (GstKateTiger *) (gst_object_get_parent (GST_OBJECT (pad)));
-  gboolean res = TRUE;
-
-  g_return_val_if_fail (tiger != NULL, FALSE);
-
-  GST_LOG_OBJECT (tiger, "Event on source pad: %s",
-      GST_EVENT_TYPE_NAME (event));
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_SEEK:
-      GST_INFO_OBJECT (tiger, "Seek on source pad");
-      res = gst_kate_tiger_seek (tiger, pad, event);
-      break;
-    default:
-      res = gst_pad_event_default (pad, event);
-      break;
-  }
-
-  gst_object_unref (tiger);
-
-  return res;
-}
-
-static gboolean
-gst_kate_tiger_handle_kate_event (GstPad * pad, GstEvent * event)
-{
-  GstKateTiger *tiger =
-      (GstKateTiger *) (gst_object_get_parent (GST_OBJECT (pad)));
-  gboolean res = TRUE;
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_NEWSEGMENT:
-      GST_INFO_OBJECT (tiger, "New segment on Kate pad");
-      GST_KATE_TIGER_MUTEX_LOCK (tiger);
-      g_cond_broadcast (tiger->cond);
-      gst_kate_util_decoder_base_new_segment_event (&tiger->decoder, event);
-      GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-      gst_event_unref (event);
-      break;
-    case GST_EVENT_FLUSH_START:
-      GST_KATE_TIGER_MUTEX_LOCK (tiger);
-      gst_kate_util_decoder_base_set_flushing (&tiger->decoder, TRUE);
-      GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-      g_cond_broadcast (tiger->cond);
-      gst_event_unref (event);
-      break;
-    case GST_EVENT_FLUSH_STOP:
-      GST_KATE_TIGER_MUTEX_LOCK (tiger);
-      gst_kate_util_decoder_base_set_flushing (&tiger->decoder, FALSE);
-      GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-      gst_event_unref (event);
-      break;
-    case GST_EVENT_EOS:
-      /* we ignore this, it just means we don't have anymore Kate packets, but
-         the Tiger renderer will still draw (if appropriate) on incoming video */
-      GST_INFO_OBJECT (tiger, "EOS on Kate pad");
-      GST_KATE_TIGER_MUTEX_LOCK (tiger);
-      g_cond_broadcast (tiger->cond);
-      GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-      gst_event_unref (event);
-      break;
-    default:
-      res = gst_pad_event_default (pad, event);
-      break;
-  }
-
-  gst_object_unref (tiger);
-
-  return res;
-}
-
-static gboolean
-gst_kate_tiger_kate_event (GstPad * pad, GstEvent * event)
-{
-  GstKateTiger *tiger =
-      (GstKateTiger *) (gst_object_get_parent (GST_OBJECT (pad)));
-  gboolean res = TRUE;
-
-  g_return_val_if_fail (tiger != NULL, FALSE);
-
-  GST_LOG_OBJECT (tiger, "Event on Kate pad: %s", GST_EVENT_TYPE_NAME (event));
-
-  /* Delay events till we've set caps */
-  if (gst_kate_util_decoder_base_queue_event (&tiger->decoder, event,
-          &gst_kate_tiger_handle_kate_event, pad)) {
-    gst_object_unref (tiger);
-    return TRUE;
-  }
-
-  res = gst_kate_tiger_handle_kate_event (pad, event);
-
-  gst_object_unref (tiger);
-
-  return res;
-}
-
-static gboolean
-gst_kate_tiger_handle_video_event (GstPad * pad, GstEvent * event)
-{
-  GstKateTiger *tiger =
-      (GstKateTiger *) (gst_object_get_parent (GST_OBJECT (pad)));
-  gboolean res = TRUE;
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_NEWSEGMENT:
-    {
-      gboolean update;
-      gdouble rate, arate;
-      GstFormat format;
-      gint64 start, stop, time;
-
-      gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format,
-          &start, &stop, &time);
-
-      if (format == GST_FORMAT_TIME) {
-        GST_DEBUG_OBJECT (tiger, "video pad segment:"
-            " Update %d, rate %g arate %g format %d start %" GST_TIME_FORMAT
-            " %" GST_TIME_FORMAT " position %" GST_TIME_FORMAT,
-            update, rate, arate, format, GST_TIME_ARGS (start),
-            GST_TIME_ARGS (stop), GST_TIME_ARGS (time));
-
-        GST_KATE_TIGER_MUTEX_LOCK (tiger);
-        gst_segment_set_newsegment_full (&tiger->video_segment, update, rate,
-            arate, format, start, stop, time);
-        GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-      }
-
-      res = gst_pad_event_default (pad, event);
-      break;
-    }
-    case GST_EVENT_FLUSH_START:
-      GST_KATE_TIGER_MUTEX_LOCK (tiger);
-      gst_segment_init (&tiger->video_segment, GST_FORMAT_UNDEFINED);
-      tiger->video_flushing = TRUE;
-      GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-      g_cond_broadcast (tiger->cond);
-      res = gst_pad_event_default (pad, event);
-      break;
-    case GST_EVENT_FLUSH_STOP:
-      GST_KATE_TIGER_MUTEX_LOCK (tiger);
-      gst_segment_init (&tiger->video_segment, GST_FORMAT_UNDEFINED);
-      tiger->video_flushing = FALSE;
-      GST_KATE_TIGER_MUTEX_UNLOCK (tiger);
-      res = gst_pad_event_default (pad, event);
-      break;
-    default:
-      res = gst_pad_event_default (pad, event);
-      break;
-  }
-
-  gst_object_unref (tiger);
-
-  return res;
-}
-
-static gboolean
-gst_kate_tiger_video_event (GstPad * pad, GstEvent * event)
-{
-  GstKateTiger *tiger =
-      (GstKateTiger *) (gst_object_get_parent (GST_OBJECT (pad)));
-  gboolean res = TRUE;
-
-  g_return_val_if_fail (tiger != NULL, FALSE);
-
-  GST_INFO_OBJECT (tiger, "Event on video pad: %s",
-      GST_EVENT_TYPE_NAME (event));
-
-  res = gst_kate_tiger_handle_video_event (pad, event);
-
-  gst_object_unref (tiger);
-
-  return res;
-}
-
-gboolean
-gst_kate_tiger_kate_sink_query (GstPad * pad, GstQuery * query)
-{
-  GstKateTiger *tiger = GST_KATE_TIGER (gst_pad_get_parent (pad));
-  gboolean res = gst_kate_decoder_base_sink_query (&tiger->decoder,
-      GST_ELEMENT_CAST (tiger), pad, query);
-  GST_INFO_OBJECT (tiger, "Query on Kate pad");
-  gst_object_unref (tiger);
-  return res;
-}

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkatetiger.h Deleted

@@ -1,118 +0,0 @@
-/*
- * GStreamer
- * Copyright 2005 Thomas Vander Stichele <thomas@apestaart.org>
- * Copyright 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
- * Copyright 2008 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, the contents of this file may be used under the
- * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
- * which case the following provisions apply instead of the ones
- * mentioned above:
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_KATE_TIGER_H__
-#define __GST_KATE_TIGER_H__
-
-#include <kate/kate.h>
-#include <tiger/tiger.h>
-#include <gst/gst.h>
-#include <gst/video/video.h>
-#include <gst/video/video-overlay-composition.h>
-#include "gstkateutil.h"
-
-G_BEGIN_DECLS
-/* #defines don't like whitespacey bits */
-#define GST_TYPE_KATE_TIGER \
-  (gst_kate_tiger_get_type())
-#define GST_KATE_TIGER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_KATE_TIGER,GstKateTiger))
-#define GST_KATE_TIGER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_KATE,GstKateTigerClass))
-#define GST_IS_KATE_TIGER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_KATE_TIGER))
-#define GST_IS_KATE_TIGER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_KATE_TIGER))
-typedef struct _GstKateTiger GstKateTiger;
-typedef struct _GstKateTigerClass GstKateTigerClass;
-
-struct _GstKateTiger
-{
-  GstKateDecoderBase decoder;
-
-  GstPad *katesinkpad;
-  GstPad *videosinkpad;
-  GstPad *srcpad;
-
-  tiger_renderer *tr;
-
-  gdouble quality;
-  gchar *default_font_desc;
-  gboolean default_font_effect;
-  gdouble default_font_effect_strength;
-  guchar default_font_r;
-  guchar default_font_g;
-  guchar default_font_b;
-  guchar default_font_a;
-  guchar default_background_r;
-  guchar default_background_g;
-  guchar default_background_b;
-  guchar default_background_a;
-  gboolean silent;
-
-  GstVideoFormat video_format;
-  gint video_width;
-  gint video_height;
-  gboolean swap_rgb;
-  GstBuffer *render_buffer;
-  GstVideoOverlayComposition *composition;
-
-  GMutex *mutex;
-  GCond *cond;
-
-  GstSegment video_segment;
-  gboolean video_flushing;
-  gboolean seen_header;
-};
-
-struct _GstKateTigerClass
-{
-  GstElementClass parent_class;
-};
-
-GType gst_kate_tiger_get_type (void);
-
-G_END_DECLS
-#endif /* __GST_KATE_TIGER_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkateutil.c Deleted

@@ -1,702 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/* FIXME: shouldn't all this GstKateDecoderBase stuff really be a base class? */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <string.h>
-#ifdef HAVE_TIGER
-#include <tiger/tiger.h>
-#endif
-#include <gst/tag/tag.h>
-#include "gstkateutil.h"
-
-GST_DEBUG_CATEGORY_EXTERN (gst_kateutil_debug);
-#define GST_CAT_DEFAULT gst_kateutil_debug
-
-static void gst_kate_util_decoder_base_free_event_queue (GstKateDecoderBase *
-    decoder);
-
-GstCaps *
-gst_kate_util_set_header_on_caps (GstElement * element, GstCaps * caps,
-    GList * headers)
-{
-  GstStructure *structure;
-  GValue array = { 0 };
-
-  GST_LOG_OBJECT (element, "caps: %" GST_PTR_FORMAT, caps);
-
-  if (G_UNLIKELY (!caps))
-    return NULL;
-  if (G_UNLIKELY (!headers))
-    return NULL;
-
-  caps = gst_caps_make_writable (caps);
-  structure = gst_caps_get_structure (caps, 0);
-
-  g_value_init (&array, GST_TYPE_ARRAY);
-
-  while (headers) {
-    GValue value = { 0 };
-    GstBuffer *buffer = headers->data;
-    g_assert (buffer);
-    g_value_init (&value, GST_TYPE_BUFFER);
-    buffer = gst_buffer_copy (buffer);
-    GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_HEADER);
-    gst_value_take_buffer (&value, buffer);
-    gst_value_array_append_value (&array, &value);
-    g_value_unset (&value);
-    headers = headers->next;
-  }
-
-  gst_structure_take_value (structure, "streamheader", &array);
-
-  GST_LOG_OBJECT (element, "here are the newly set caps: %" GST_PTR_FORMAT,
-      caps);
-
-  return caps;
-}
-
-void
-gst_kate_util_install_decoder_base_properties (GObjectClass * gobject_class)
-{
-  g_object_class_install_property (gobject_class, ARG_DEC_BASE_LANGUAGE,
-      g_param_spec_string ("language", "Language", "The language of the stream",
-          "", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, ARG_DEC_BASE_CATEGORY,
-      g_param_spec_string ("category", "Category", "The category of the stream",
-          "", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class,
-      ARG_DEC_BASE_ORIGINAL_CANVAS_WIDTH,
-      g_param_spec_int ("original-canvas-width",
-          "Original canvas width (0 is unspecified)",
-          "The canvas width this stream was authored for", 0, G_MAXINT, 0,
-          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class,
-      ARG_DEC_BASE_ORIGINAL_CANVAS_HEIGHT,
-      g_param_spec_int ("original-canvas-height", "Original canvas height",
-          "The canvas height this stream was authored for (0 is unspecified)",
-          0, G_MAXINT, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-}
-
-void
-gst_kate_util_decode_base_init (GstKateDecoderBase * decoder,
-    gboolean delay_events)
-{
-  if (G_UNLIKELY (!decoder))
-    return;
-
-  decoder->language = NULL;
-  decoder->category = NULL;
-  decoder->original_canvas_width = 0;
-  decoder->original_canvas_height = 0;
-  decoder->tags = NULL;
-  decoder->tags_changed = FALSE;
-  decoder->initialized = FALSE;
-  decoder->delay_events = delay_events;
-  decoder->event_queue = NULL;
-}
-
-static void
-gst_kate_util_decode_base_reset (GstKateDecoderBase * decoder)
-{
-  g_free (decoder->language);
-  decoder->language = NULL;
-  g_free (decoder->category);
-  decoder->category = NULL;
-  if (decoder->tags) {
-    gst_tag_list_unref (decoder->tags);
-    decoder->tags = NULL;
-  }
-  decoder->tags_changed = FALSE;
-  decoder->original_canvas_width = 0;
-  decoder->original_canvas_height = 0;
-  if (decoder->event_queue) {
-    gst_kate_util_decoder_base_free_event_queue (decoder);
-  }
-  decoder->initialized = FALSE;
-}
-
-gboolean
-gst_kate_util_decoder_base_queue_event (GstKateDecoderBase * decoder,
-    GstEvent * event, gboolean (*handler) (GstPad *, GstObject *, GstEvent *),
-    GstObject * parent, GstPad * pad)
-{
-  gboolean can_be_queued;
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_FLUSH_START:
-    case GST_EVENT_FLUSH_STOP:
-    case GST_EVENT_EOS:
-      can_be_queued = FALSE;
-      break;
-    case GST_EVENT_SEGMENT:
-      gst_kate_util_decoder_base_segment_event (decoder, event);
-      can_be_queued = TRUE;
-      break;
-    default:
-      can_be_queued = TRUE;
-      break;
-  }
-
-  if (GST_EVENT_IS_STICKY (event) && GST_EVENT_TYPE (event) < GST_EVENT_CAPS)
-    can_be_queued = FALSE;
-
-  if (decoder->delay_events && can_be_queued) {
-    GstKateDecoderBaseQueuedEvent *item;
-    GST_DEBUG_OBJECT (decoder, "We have to delay the event");
-    item = g_slice_new (GstKateDecoderBaseQueuedEvent);
-    if (item) {
-      item->event = event;
-      item->parent = parent;
-      item->pad = pad;
-      item->handler = handler;
-      g_queue_push_tail (decoder->event_queue, item);
-      return TRUE;
-    } else {
-      return FALSE;
-    }
-  } else {
-    return FALSE;
-  }
-}
-
-static void
-gst_kate_util_decoder_base_free_event_queue (GstKateDecoderBase * decoder)
-{
-  while (decoder->event_queue->length) {
-    GstKateDecoderBaseQueuedEvent *item = (GstKateDecoderBaseQueuedEvent *)
-        g_queue_pop_head (decoder->event_queue);
-    gst_event_unref (item->event);
-    g_slice_free (GstKateDecoderBaseQueuedEvent, item);
-  }
-  g_queue_free (decoder->event_queue);
-  decoder->event_queue = NULL;
-}
-
-static void
-gst_kate_util_decoder_base_drain_event_queue (GstKateDecoderBase * decoder)
-{
-  decoder->delay_events = FALSE;
-
-  if (decoder->event_queue->length == 0)
-    return;
-
-  GST_DEBUG_OBJECT (decoder, "We can now drain all events!");
-  while (decoder->event_queue->length) {
-    GstKateDecoderBaseQueuedEvent *item = (GstKateDecoderBaseQueuedEvent *)
-        g_queue_pop_head (decoder->event_queue);
-    (*item->handler) (item->pad, item->parent, item->event);
-    g_slice_free (GstKateDecoderBaseQueuedEvent, item);
-  }
-}
-
-void
-gst_kate_util_decoder_base_add_tags (GstKateDecoderBase * decoder,
-    GstTagList * tags, gboolean take_ownership_of_tags)
-{
-  if (!decoder->tags) {
-    if (!take_ownership_of_tags)
-      tags = gst_tag_list_ref (tags);
-    decoder->tags = tags;
-  } else {
-    GstTagList *old = decoder->tags;
-    decoder->tags = gst_tag_list_merge (old, tags, GST_TAG_MERGE_REPLACE);
-    gst_tag_list_unref (old);
-    if (take_ownership_of_tags)
-      gst_tag_list_unref (tags);
-  }
-  decoder->tags_changed = TRUE;
-}
-
-GstEvent *
-gst_kate_util_decoder_base_get_tag_event (GstKateDecoderBase * decoder)
-{
-  if (!decoder->tags)
-    return NULL;
-  decoder->tags_changed = FALSE;
-  return gst_event_new_tag (gst_tag_list_ref (decoder->tags));
-}
-
-gboolean
-gst_kate_util_decoder_base_get_property (GstKateDecoderBase * decoder,
-    GObject * object, guint prop_id, GValue * value, GParamSpec * pspec)
-{
-  gboolean res = TRUE;
-  switch (prop_id) {
-    case ARG_DEC_BASE_LANGUAGE:
-      g_value_set_string (value, decoder->language);
-      break;
-    case ARG_DEC_BASE_CATEGORY:
-      g_value_set_string (value, decoder->category);
-      break;
-    case ARG_DEC_BASE_ORIGINAL_CANVAS_WIDTH:
-      g_value_set_int (value, decoder->original_canvas_width);
-      break;
-    case ARG_DEC_BASE_ORIGINAL_CANVAS_HEIGHT:
-      g_value_set_int (value, decoder->original_canvas_height);
-      break;
-    default:
-      res = FALSE;
-      break;
-  }
-  return res;
-}
-
-static inline gboolean
-gst_kate_util_is_utf8_string (const char *value, size_t len)
-{
-  if (len == 0)
-    return FALSE;
-  if (memchr (value, 0, len - 1))
-    return FALSE;
-  if (valuelen - 1)
-    return FALSE;
-  return (kate_text_validate (kate_utf8, value, len) >= 0);
-}
-
-GstFlowReturn
-gst_kate_util_decoder_base_chain_kate_packet (GstKateDecoderBase * decoder,
-    GstElement * element, GstPad * pad, GstBuffer * buf, GstPad * srcpad,
-    GstPad * tagpad, GstCaps ** src_caps, const kate_event ** ev)
-{
-  kate_packet kp;
-  int ret;
-  GstFlowReturn rflow = GST_FLOW_OK;
-  gboolean is_header;
-  GstMapInfo info;
-  gsize header_size;
-  guint8 header1;
-
-  header_size = gst_buffer_extract (buf, 0, header, 1);
-
-  GST_DEBUG_OBJECT (element,
-      "got kate packet, %" G_GSIZE_FORMAT " bytes, type %02x",
-      gst_buffer_get_size (buf), header_size == 0 ? -1 : header0);
-
-  is_header = header_size > 0 && (header0 & 0x80);
-
-  if (!is_header && decoder->tags_changed) {
-    /* after we've processed headers, send any tags before processing the data packet */
-    GST_DEBUG_OBJECT (element, "Not a header, sending tags for pad %s:%s",
-        GST_DEBUG_PAD_NAME (tagpad));
-    gst_pad_push_event (tagpad,
-        gst_kate_util_decoder_base_get_tag_event (decoder));
-  }
-
-  if (gst_buffer_map (buf, &info, GST_MAP_READ)) {
-    kate_packet_wrap (&kp, info.size, info.data);
-    ret = kate_high_decode_packetin (&decoder->k, &kp, ev);
-    gst_buffer_unmap (buf, &info);
-  } else {
-    GST_ELEMENT_ERROR (element, STREAM, DECODE, (NULL),
-        ("Failed to map buffer"));
-    return GST_FLOW_ERROR;
-  }
-
-  if (G_UNLIKELY (ret < 0)) {
-    GST_ELEMENT_ERROR (element, STREAM, DECODE, (NULL),
-        ("Failed to decode Kate packet: %s",
-            gst_kate_util_get_error_message (ret)));
-    return GST_FLOW_ERROR;
-  }
-
-  if (G_UNLIKELY (ret > 0)) {
-    GST_DEBUG_OBJECT (element,
-        "kate_high_decode_packetin has received EOS packet");
-  }
-
-  /* headers may be interesting to retrieve information from */
-  if (G_UNLIKELY (is_header)) {
-    switch (header0) {
-      case 0x80:               /* ID header */
-        GST_INFO_OBJECT (element, "Parsed ID header: language %s, category %s",
-            decoder->k.ki->language, decoder->k.ki->category);
-        if (src_caps) {
-          if (*src_caps) {
-            gst_caps_unref (*src_caps);
-            *src_caps = NULL;
-          }
-          if (strcmp (decoder->k.ki->category, "K-SPU") == 0 ||
-              strcmp (decoder->k.ki->category, "spu-subtitles") == 0) {
-            *src_caps = gst_caps_new_empty_simple ("subpicture/x-dvd");
-          } else if (decoder->k.ki->text_markup_type == kate_markup_none) {
-            *src_caps = gst_caps_new_simple ("text/x-raw", "format",
-                G_TYPE_STRING, "utf8", NULL);
-          } else {
-            *src_caps = gst_caps_new_simple ("text/x-raw", "format",
-                G_TYPE_STRING, "pango-markup", NULL);
-          }
-          GST_INFO_OBJECT (srcpad, "Setting caps: %" GST_PTR_FORMAT, *src_caps);
-          if (!gst_pad_set_caps (srcpad, *src_caps)) {
-            GST_ERROR_OBJECT (srcpad, "Failed to set caps %" GST_PTR_FORMAT,
-                *src_caps);
-          }
-        }
-        if (decoder->k.ki->language && *decoder->k.ki->language) {
-          GstTagList *tags = gst_tag_list_new_empty ();
-          gchar *lang_code;
-
-          /* en_GB -> en */
-          lang_code = g_ascii_strdown (decoder->k.ki->language, -1);
-          g_strdelimit (lang_code, NULL, '\0');
-          gst_tag_list_add (tags, GST_TAG_MERGE_APPEND, GST_TAG_LANGUAGE_CODE,
-              lang_code, NULL);
-          g_free (lang_code);
-          /* TODO: category - where should it go ? */
-          gst_kate_util_decoder_base_add_tags (decoder, tags, TRUE);
-        }
-
-        /* update properties */
-        g_free (decoder->language);
-        decoder->language = g_strdup (decoder->k.ki->language);
-        g_free (decoder->category);
-        decoder->category = g_strdup (decoder->k.ki->category);
-        decoder->original_canvas_width = decoder->k.ki->original_canvas_width;
-        decoder->original_canvas_height = decoder->k.ki->original_canvas_height;
-
-        /* we can now send away any event we've delayed, as the src pad now has caps */
-        gst_kate_util_decoder_base_drain_event_queue (decoder);
-
-        break;
-
-      case 0x81:               /* Vorbis comments header */
-        GST_INFO_OBJECT (element, "Parsed comments header");
-        {
-          gchar *encoder = NULL;
-          GstTagList *list = gst_tag_list_from_vorbiscomment_buffer (buf,
-              (const guint8 *) "\201kate\0\0\0\0", 9, &encoder);
-          if (!list) {
-            GST_ERROR_OBJECT (element, "failed to decode comment header");
-            list = gst_tag_list_new_empty ();
-          }
-          if (encoder) {
-            gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
-                GST_TAG_ENCODER, encoder, NULL);
-            g_free (encoder);
-          }
-          gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
-              GST_TAG_SUBTITLE_CODEC, "Kate", NULL);
-          gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
-              GST_TAG_ENCODER_VERSION, decoder->k.ki->bitstream_version_major,
-              NULL);
-
-          gst_kate_util_decoder_base_add_tags (decoder, list, TRUE);
-
-          if (decoder->initialized) {
-            gst_pad_push_event (tagpad,
-                gst_event_new_tag (gst_tag_list_ref (decoder->tags)));
-          }
-        }
-        break;
-
-      default:
-        break;
-    }
-  }
-#if ((KATE_VERSION_MAJOR<<16)|(KATE_VERSION_MINOR<<8)|KATE_VERSION_PATCH) >= 0x000400
-  else if (*ev && (*ev)->meta) {
-    int count = kate_meta_query_count ((*ev)->meta);
-    if (count > 0) {
-      GstTagList *evtags = gst_tag_list_new_empty ();
-      int idx;
-      GST_DEBUG_OBJECT (decoder, "Kate event has %d attached metadata", count);
-      for (idx = 0; idx < count; ++idx) {
-        const char *tag, *value;
-        size_t len;
-        if (kate_meta_query ((*ev)->meta, idx, &tag, &value, &len) < 0) {
-          GST_WARNING_OBJECT (decoder, "Failed to retrieve metadata %d", idx);
-        } else {
-          if (gst_kate_util_is_utf8_string (value, len)) {
-            gchar *compound = g_strdup_printf ("%s=%s", tag, value);
-            GST_DEBUG_OBJECT (decoder,
-                "Metadata %d: %s=%s (%" G_GSIZE_FORMAT " bytes)", idx, tag,
-                value, len);
-            gst_tag_list_add (evtags, GST_TAG_MERGE_APPEND,
-                GST_TAG_EXTENDED_COMMENT, compound, NULL);
-            g_free (compound);
-          } else {
-            GST_INFO_OBJECT (decoder,
-                "Metadata %d, (%s, %" G_GSIZE_FORMAT
-                " bytes) is binary, ignored", idx, tag, len);
-          }
-        }
-      }
-      gst_kate_util_decoder_base_add_tags (decoder, evtags, TRUE);
-      gst_pad_push_event (tagpad,
-          gst_kate_util_decoder_base_get_tag_event (decoder));
-    }
-  }
-#endif
-
-  return rflow;
-}
-
-GstStateChangeReturn
-gst_kate_decoder_base_change_state (GstKateDecoderBase * decoder,
-    GstElement * element, GstElementClass * parent_class,
-    GstStateChange transition)
-{
-  GstStateChangeReturn res;
-  int ret;
-
-  switch (transition) {
-    case GST_STATE_CHANGE_NULL_TO_READY:
-      break;
-    case GST_STATE_CHANGE_READY_TO_PAUSED:
-      GST_DEBUG_OBJECT (element, "READY -> PAUSED, initializing kate state");
-      ret = kate_high_decode_init (&decoder->k);
-      if (ret < 0) {
-        GST_WARNING_OBJECT (element, "failed to initialize kate state: %s",
-            gst_kate_util_get_error_message (ret));
-      }
-      gst_segment_init (&decoder->kate_segment, GST_FORMAT_UNDEFINED);
-      decoder->kate_flushing = FALSE;
-      decoder->initialized = TRUE;
-      decoder->event_queue = g_queue_new ();
-      break;
-    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
-      break;
-    default:
-      break;
-  }
-
-  res = parent_class->change_state (element, transition);
-
-  switch (transition) {
-    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
-      break;
-    case GST_STATE_CHANGE_PAUSED_TO_READY:
-      GST_DEBUG_OBJECT (element, "PAUSED -> READY, clearing kate state");
-      if (decoder->initialized) {
-        kate_high_decode_clear (&decoder->k);
-        decoder->initialized = FALSE;
-      }
-      gst_segment_init (&decoder->kate_segment, GST_FORMAT_UNDEFINED);
-      decoder->kate_flushing = TRUE;
-      gst_kate_util_decode_base_reset (decoder);
-      break;
-    case GST_STATE_CHANGE_READY_TO_NULL:
-      gst_kate_util_decode_base_reset (decoder);
-      break;
-    default:
-      break;
-  }
-
-  return res;
-}
-
-void
-gst_kate_util_decoder_base_set_flushing (GstKateDecoderBase * decoder,
-    gboolean flushing)
-{
-  decoder->kate_flushing = flushing;
-  gst_segment_init (&decoder->kate_segment, GST_FORMAT_UNDEFINED);
-}
-
-void
-gst_kate_util_decoder_base_segment_event (GstKateDecoderBase * decoder,
-    GstEvent * event)
-{
-  GstSegment seg;
-
-  gst_event_copy_segment (event, &seg);
-
-  GST_DEBUG_OBJECT (decoder, "kate pad segment: %" GST_SEGMENT_FORMAT, &seg);
-
-  decoder->kate_segment = seg;
-}
-
-gboolean
-gst_kate_util_decoder_base_update_segment (GstKateDecoderBase * decoder,
-    GstElement * element, GstBuffer * buf)
-{
-  guint64 clip_start = 0, clip_stop = 0;
-  gboolean in_seg;
-
-  if (decoder->kate_flushing) {
-    GST_LOG_OBJECT (element, "Kate pad flushing, buffer ignored");
-    return FALSE;
-  }
-
-  if (G_LIKELY (GST_BUFFER_TIMESTAMP_IS_VALID (buf))) {
-    GstClockTime stop;
-
-    if (G_LIKELY (GST_BUFFER_DURATION_IS_VALID (buf)))
-      stop = GST_BUFFER_TIMESTAMP (buf) + GST_BUFFER_DURATION (buf);
-    else
-      stop = GST_CLOCK_TIME_NONE;
-
-    in_seg = gst_segment_clip (&decoder->kate_segment, GST_FORMAT_TIME,
-        GST_BUFFER_TIMESTAMP (buf), stop, &clip_start, &clip_stop);
-  } else {
-    in_seg = TRUE;
-  }
-
-  if (in_seg) {
-    if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
-      decoder->kate_segment.position = clip_start;
-    }
-  } else {
-    GST_INFO_OBJECT (element, "Kate buffer not in segment, ignored");
-  }
-
-  return in_seg;
-}
-
-static GstClockTime
-gst_kate_util_granule_time (kate_state * k, gint64 granulepos)
-{
-  if (G_UNLIKELY (granulepos == -1))
-    return -1;
-
-  return kate_granule_time (k->ki, granulepos) * GST_SECOND;
-}
-
-/*
-conversions on the sink:
-  - default is granules at num/den rate (subject to the granule shift)
-  - default -> time is possible
-  - bytes do not mean anything, packets can be any number of bytes, and we
-    have no way to know the number of bytes emitted without decoding
-conversions on the source:
-  - nothing
-*/
-
-gboolean
-gst_kate_decoder_base_convert (GstKateDecoderBase * decoder,
-    GstElement * element, GstPad * pad, GstFormat src_fmt, gint64 src_val,
-    GstFormat * dest_fmt, gint64 * dest_val)
-{
-  gboolean res = FALSE;
-
-  if (src_fmt == *dest_fmt) {
-    *dest_val = src_val;
-    return TRUE;
-  }
-
-  if (!decoder->initialized) {
-    GST_WARNING_OBJECT (element, "not initialized yet");
-    return FALSE;
-  }
-
-  if (src_fmt == GST_FORMAT_BYTES || *dest_fmt == GST_FORMAT_BYTES) {
-    GST_WARNING_OBJECT (element, "unsupported format");
-    return FALSE;
-  }
-
-  switch (src_fmt) {
-    case GST_FORMAT_DEFAULT:
-      switch (*dest_fmt) {
-        case GST_FORMAT_TIME:
-          *dest_val = gst_kate_util_granule_time (&decoder->k, src_val);
-          res = TRUE;
-          break;
-        default:
-          res = FALSE;
-          break;
-      }
-      break;
-    default:
-      res = FALSE;
-      break;
-  }
-
-  if (!res) {
-    GST_WARNING_OBJECT (element, "unsupported format");
-  }
-
-  return res;
-}
-
-gboolean
-gst_kate_decoder_base_sink_query (GstKateDecoderBase * decoder,
-    GstElement * element, GstPad * pad, GstObject * parent, GstQuery * query)
-{
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_CONVERT:
-    {
-      GstFormat src_fmt, dest_fmt;
-      gint64 src_val, dest_val;
-
-      gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
-      if (!gst_kate_decoder_base_convert (decoder, element, pad, src_fmt,
-              src_val, &dest_fmt, &dest_val)) {
-        return gst_pad_query_default (pad, parent, query);
-      }
-      gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
-      return TRUE;
-    }
-    default:
-      return gst_pad_query_default (pad, parent, query);
-  }
-}
-
-const char *
-gst_kate_util_get_error_message (int ret)
-{
-  switch (ret) {
-    case KATE_E_NOT_FOUND:
-      return "value not found";
-    case KATE_E_INVALID_PARAMETER:
-      return "invalid parameter";
-    case KATE_E_OUT_OF_MEMORY:
-      return "out of memory";
-    case KATE_E_BAD_GRANULE:
-      return "bad granule";
-    case KATE_E_INIT:
-      return "initialization error";
-    case KATE_E_BAD_PACKET:
-      return "bad packet";
-    case KATE_E_TEXT:
-      return "invalid/truncated text";
-    case KATE_E_LIMIT:
-      return "a limit was exceeded";
-    case KATE_E_VERSION:
-      return "unsupported bitstream version";
-    case KATE_E_NOT_KATE:
-      return "not a kate bitstream";
-    case KATE_E_BAD_TAG:
-      return "bad tag";
-    case KATE_E_IMPL:
-      return "not implemented";
-
-#ifdef HAVE_TIGER
-    case TIGER_E_NOT_FOUND:
-      return "value not found";
-    case TIGER_E_INVALID_PARAMETER:
-      return "invalid parameter";
-    case TIGER_E_OUT_OF_MEMORY:
-      return "out of memory";
-    case TIGER_E_CAIRO_ERROR:
-      return "Cairo error";
-    case TIGER_E_BAD_SURFACE_TYPE:
-      return "bad surface type";
-#endif
-
-    default:
-      return "unknown error";
-  }
-}

gst-plugins-bad-1.22.7.tar.xz/ext/kate/gstkateutil.h Deleted

@@ -1,123 +0,0 @@
-/* -*- c-basic-offset: 2 -*-
- * GStreamer
- * Copyright (C) <2008> Vincent Penquerc'h <ogg.k.ogg.k at googlemail dot com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef __GST_KATE_UTIL_H__
-#define __GST_KATE_UTIL_H__
-
-#include <kate/kate.h>
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-typedef enum {
-  GST_KATE_FORMAT_UNDEFINED,
-  GST_KATE_FORMAT_SPU,
-  GST_KATE_FORMAT_TEXT_UTF8,
-  GST_KATE_FORMAT_TEXT_PANGO_MARKUP
-} GstKateFormat;
-
-enum
-{
-  ARG_DEC_BASE_0,
-  ARG_DEC_BASE_LANGUAGE,
-  ARG_DEC_BASE_CATEGORY,
-  ARG_DEC_BASE_ORIGINAL_CANVAS_WIDTH,
-  ARG_DEC_BASE_ORIGINAL_CANVAS_HEIGHT,
-  DECODER_BASE_ARG_COUNT
-};
-
-typedef struct
-{
-  GstEvent * event;
-  gboolean (*handler)(GstPad *, GstObject*, GstEvent *);
-  GstObject * parent;
-  GstPad *pad;
-} GstKateDecoderBaseQueuedEvent;
-
-typedef struct
-{
-  GstElement element;
-
-  kate_state k;
-
-  gboolean initialized;
-
-  GstTagList *tags;
-  gboolean tags_changed;
-
-  gchar *language;
-  gchar *category;
-
-  gint original_canvas_width;
-  gint original_canvas_height;
-
-  GstSegment kate_segment;
-  gboolean kate_flushing;
-
-  gboolean delay_events;
-  GQueue *event_queue;
-} GstKateDecoderBase;
-
-extern GstCaps *gst_kate_util_set_header_on_caps (GstElement * element,
-    GstCaps * caps, GList * headers);
-extern void gst_kate_util_decode_base_init (GstKateDecoderBase * decoder,
-    gboolean delay_events);
-extern void gst_kate_util_install_decoder_base_properties (GObjectClass *
-    gobject_class);
-extern gboolean gst_kate_util_decoder_base_get_property (GstKateDecoderBase *
-    decoder, GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec);
-extern GstFlowReturn
-gst_kate_util_decoder_base_chain_kate_packet (GstKateDecoderBase * decoder,
-    GstElement * element, GstPad * pad, GstBuffer * buffer, GstPad * srcpad,
-    GstPad * tagpad, GstCaps **src_caps, const kate_event ** ev);
-extern void
-gst_kate_util_decoder_base_set_flushing (GstKateDecoderBase * decoder,
-    gboolean flushing);
-extern void
-gst_kate_util_decoder_base_segment_event (GstKateDecoderBase * decoder,
-    GstEvent * event);
-extern gboolean
-gst_kate_util_decoder_base_update_segment (GstKateDecoderBase * decoder,
-    GstElement * element, GstBuffer * buf);
-extern GstStateChangeReturn
-gst_kate_decoder_base_change_state (GstKateDecoderBase * decoder,
-    GstElement * element, GstElementClass * parent_class,
-    GstStateChange transition);
-extern gboolean gst_kate_decoder_base_convert (GstKateDecoderBase * decoder,
-    GstElement * element, GstPad * pad, GstFormat src_fmt, gint64 src_val,
-    GstFormat * dest_fmt, gint64 * dest_val);
-extern gboolean gst_kate_decoder_base_sink_query (GstKateDecoderBase * decoder,
-    GstElement * element, GstPad * pad, GstObject * parent, GstQuery * query);
-extern gboolean
-gst_kate_util_decoder_base_queue_event (GstKateDecoderBase * decoder,
-    GstEvent * event, gboolean (*handler)(GstPad *, GstObject *, GstEvent *),
-    GstObject * parent, GstPad * pad);
-extern void
-gst_kate_util_decoder_base_add_tags (GstKateDecoderBase * decoder,
-    GstTagList * tags, gboolean take_ownership_of_tags);
-extern GstEvent *
-gst_kate_util_decoder_base_get_tag_event (GstKateDecoderBase * decoder);
-extern const char *
-gst_kate_util_get_error_message (int ret);
-
-G_END_DECLS
-#endif /* __GST_KATE_UTIL_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/kate/meson.build Deleted

gst-plugins-bad-1.22.7.tar.xz/ext/onnx/gstonnxelement.c Deleted

@@ -1,104 +0,0 @@
-/*
- * GStreamer gstreamer-onnxelement
- * Copyright (C) 2021 Collabora Ltd
- *
- * gstonnxelement.c
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstonnxelement.h"
-
-GType
-gst_onnx_optimization_level_get_type (void)
-{
-  static GType onnx_optimization_type = 0;
-
-  if (g_once_init_enter (&onnx_optimization_type)) {
-    static GEnumValue optimization_level_types = {
-      {GST_ONNX_OPTIMIZATION_LEVEL_DISABLE_ALL, "Disable all optimization",
-          "disable-all"},
-      {GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_BASIC,
-            "Enable basic optimizations (redundant node removals))",
-          "enable-basic"},
-      {GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_EXTENDED,
-            "Enable extended optimizations (redundant node removals + node fusions)",
-          "enable-extended"},
-      {GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_ALL,
-          "Enable all possible optimizations", "enable-all"},
-      {0, NULL, NULL},
-    };
-
-    GType temp = g_enum_register_static ("GstOnnxOptimizationLevel",
-        optimization_level_types);
-
-    g_once_init_leave (&onnx_optimization_type, temp);
-  }
-
-  return onnx_optimization_type;
-}
-
-GType
-gst_onnx_execution_provider_get_type (void)
-{
-  static GType onnx_execution_type = 0;
-
-  if (g_once_init_enter (&onnx_execution_type)) {
-    static GEnumValue execution_provider_types = {
-      {GST_ONNX_EXECUTION_PROVIDER_CPU, "CPU execution provider",
-          "cpu"},
-      {GST_ONNX_EXECUTION_PROVIDER_CUDA,
-            "CUDA execution provider",
-          "cuda"},
-      {0, NULL, NULL},
-    };
-
-    GType temp = g_enum_register_static ("GstOnnxExecutionProvider",
-        execution_provider_types);
-
-    g_once_init_leave (&onnx_execution_type, temp);
-  }
-
-  return onnx_execution_type;
-}
-
-GType
-gst_ml_model_input_image_format_get_type (void)
-{
-  static GType ml_model_input_image_format = 0;
-
-  if (g_once_init_enter (&ml_model_input_image_format)) {
-    static GEnumValue ml_model_input_image_format_types = {
-      {GST_ML_MODEL_INPUT_IMAGE_FORMAT_HWC,
-            "Height Width Channel (HWC) a.k.a. interleaved image data format",
-          "hwc"},
-      {GST_ML_MODEL_INPUT_IMAGE_FORMAT_CHW,
-            "Channel Height Width (CHW) a.k.a. planar image data format",
-          "chw"},
-      {0, NULL, NULL},
-    };
-
-    GType temp = g_enum_register_static ("GstMlModelInputImageFormat",
-        ml_model_input_image_format_types);
-
-    g_once_init_leave (&ml_model_input_image_format, temp);
-  }
-
-  return ml_model_input_image_format;
-}

gst-plugins-bad-1.22.7.tar.xz/ext/onnx/gstonnxelement.h Deleted

@@ -1,64 +0,0 @@
-/*
- * GStreamer gstreamer-onnxelement
- * Copyright (C) 2021 Collabora Ltd
- *
- * gstonnxelement.h
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_ONNX_ELEMENT_H__
-#define __GST_ONNX_ELEMENT_H__
-
-#include <gst/gst.h>
-
-typedef enum
-{
-  GST_ONNX_OPTIMIZATION_LEVEL_DISABLE_ALL,
-  GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_BASIC,
-  GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_EXTENDED,
-  GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_ALL,
-} GstOnnxOptimizationLevel;
-
-typedef enum
-{
-  GST_ONNX_EXECUTION_PROVIDER_CPU,
-  GST_ONNX_EXECUTION_PROVIDER_CUDA,
-} GstOnnxExecutionProvider;
-
-typedef enum {
-  /* Height Width Channel (a.k.a. interleaved) format */
-  GST_ML_MODEL_INPUT_IMAGE_FORMAT_HWC,
-
-  /* Channel Height Width  (a.k.a. planar) format */
-  GST_ML_MODEL_INPUT_IMAGE_FORMAT_CHW,
-} GstMlModelInputImageFormat;
-
-
-G_BEGIN_DECLS
-
-GType gst_onnx_optimization_level_get_type (void);
-#define GST_TYPE_ONNX_OPTIMIZATION_LEVEL (gst_onnx_optimization_level_get_type ())
-
-GType gst_onnx_execution_provider_get_type (void);
-#define GST_TYPE_ONNX_EXECUTION_PROVIDER (gst_onnx_execution_provider_get_type ())
-
-GType gst_ml_model_input_image_format_get_type (void);
-#define GST_TYPE_ML_MODEL_INPUT_IMAGE_FORMAT (gst_ml_model_input_image_format_get_type ())
-
-G_END_DECLS
-
-#endif

gst-plugins-bad-1.22.7.tar.xz/ext/onnx/gstonnxobjectdetector.cpp Deleted

@@ -1,678 +0,0 @@
-/*
- * GStreamer gstreamer-onnxobjectdetector
- * Copyright (C) 2021 Collabora Ltd.
- *
- * gstonnxobjectdetector.c
- * 
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * SECTION:element-onnxobjectdetector
- * @short_description: Detect objects in video frame
- *
- * This element can apply a generic ONNX object detection model such as YOLO or SSD
- * to each video frame.
- *
- * To install ONNX on your system, recursively clone this repository
- * https://github.com/microsoft/onnxruntime.git
- *
- * and build and install with cmake:
- *
- * CPU:
- *
- *  cmake -Donnxruntime_BUILD_SHARED_LIB:ON -DBUILD_TESTING:OFF \
- *  $SRC_DIR/onnxruntime/cmake && make -j8 && sudo make install
- *
- *
- * GPU :
- *
- * cmake -Donnxruntime_BUILD_SHARED_LIB:ON -DBUILD_TESTING:OFF -Donnxruntime_USE_CUDA:ON \
- * -Donnxruntime_CUDA_HOME=$CUDA_PATH -Donnxruntime_CUDNN_HOME=$CUDA_PATH \
- *  $SRC_DIR/onnxruntime/cmake && make -j8 && sudo make install
- *
- *
- * where :
- *
- * 1. $SRC_DIR and $BUILD_DIR are local source and build directories
- * 2. To run with CUDA, both CUDA and cuDNN libraries must be installed.
- *    $CUDA_PATH is an environment variable set to the CUDA root path.
- *    On Linux, it would be /usr/local/cuda-XX.X where XX.X is the installed version of CUDA.
- *
- *
- * ## Example launch command:
- *
- * (note: an object detection model has 3 or 4 output nodes, but there is no
- * naming convention to indicate which node outputs the bounding box, which
- * node outputs the label, etc. So, the `onnxobjectdetector` element has
- * properties to map each node's functionality to its respective node index in
- * the specified model. Image resolution also need to be adapted to the model.
- * The videoscale in the pipeline below will scale the image, using padding if
- * required, to 640x383 resolution required by the model.)
- *
- * model.onnx can be found here:
- * https://github.com/zoq/onnx-runtime-examples/raw/main/data/models/model.onnx
- *
- * ```
- * GST_DEBUG=objectdetector:5 gst-launch-1.0 multifilesrc \
- * location=000000088462.jpg caps=image/jpeg,framerate=$fraction$30/1 ! jpegdec ! \
- * videoconvert ! \
- * videoscale ! \
- * 'video/x-raw,width=640,height=383' ! \
- * onnxobjectdetector ! \
- * box-node-index=0 \
- * class-node-index=1 \
- * score-node-index=2 \
- * detection-node-index=3 \
- * execution-provider=cpu \
- * model-file=model.onnx \
- * label-file=COCO_classes.txt  !  \
- * videoconvert ! \
- * autovideosink
- * ```
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstonnxobjectdetector.h"
-#include "gstonnxclient.h"
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-#include <gst/video/gstvideometa.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-
-GST_DEBUG_CATEGORY_STATIC (onnx_object_detector_debug);
-#define GST_CAT_DEFAULT onnx_object_detector_debug
-#define GST_ONNX_MEMBER( self ) ((GstOnnxNamespace::GstOnnxClient *) (self->onnx_ptr))
-GST_ELEMENT_REGISTER_DEFINE (onnx_object_detector, "onnxobjectdetector",
-    GST_RANK_PRIMARY, GST_TYPE_ONNX_OBJECT_DETECTOR);
-
-/* GstOnnxObjectDetector properties */
-enum
-{
-  PROP_0,
-  PROP_MODEL_FILE,
-  PROP_LABEL_FILE,
-  PROP_SCORE_THRESHOLD,
-  PROP_DETECTION_NODE_INDEX,
-  PROP_BOUNDING_BOX_NODE_INDEX,
-  PROP_SCORE_NODE_INDEX,
-  PROP_CLASS_NODE_INDEX,
-  PROP_INPUT_IMAGE_FORMAT,
-  PROP_OPTIMIZATION_LEVEL,
-  PROP_EXECUTION_PROVIDER
-};
-
-
-#define GST_ONNX_OBJECT_DETECTOR_DEFAULT_EXECUTION_PROVIDER    GST_ONNX_EXECUTION_PROVIDER_CPU
-#define GST_ONNX_OBJECT_DETECTOR_DEFAULT_OPTIMIZATION_LEVEL    GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_EXTENDED
-#define GST_ONNX_OBJECT_DETECTOR_DEFAULT_SCORE_THRESHOLD       0.3f     /* 0 to 1 */
-
-static GstStaticPadTemplate gst_onnx_object_detector_src_template =
-GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ RGB,RGBA,BGR,BGRA }"))
-    );
-
-static GstStaticPadTemplate gst_onnx_object_detector_sink_template =
-GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ RGB,RGBA,BGR,BGRA }"))
-    );
-
-static void gst_onnx_object_detector_set_property (GObject * object,
-    guint prop_id, const GValue * value, GParamSpec * pspec);
-static void gst_onnx_object_detector_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_onnx_object_detector_finalize (GObject * object);
-static GstFlowReturn gst_onnx_object_detector_transform_ip (GstBaseTransform *
-    trans, GstBuffer * buf);
-static gboolean gst_onnx_object_detector_process (GstBaseTransform * trans,
-    GstBuffer * buf);
-static gboolean gst_onnx_object_detector_create_session (GstBaseTransform * trans);
-static GstCaps *gst_onnx_object_detector_transform_caps (GstBaseTransform *
-    trans, GstPadDirection direction, GstCaps * caps, GstCaps * filter_caps);
-
-G_DEFINE_TYPE (GstOnnxObjectDetector, gst_onnx_object_detector,
-    GST_TYPE_BASE_TRANSFORM);
-
-static void
-gst_onnx_object_detector_class_init (GstOnnxObjectDetectorClass * klass)
-{
-  GObjectClass *gobject_class = (GObjectClass *) klass;
-  GstElementClass *element_class = (GstElementClass *) klass;
-  GstBaseTransformClass *basetransform_class = (GstBaseTransformClass *) klass;
-
-  GST_DEBUG_CATEGORY_INIT (onnx_object_detector_debug, "onnxobjectdetector",
-      0, "onnx_objectdetector");
-  gobject_class->set_property = gst_onnx_object_detector_set_property;
-  gobject_class->get_property = gst_onnx_object_detector_get_property;
-  gobject_class->finalize = gst_onnx_object_detector_finalize;
-
-  /**
-   * GstOnnxObjectDetector:model-file
-   *
-   * ONNX model file
-   *
-   * Since: 1.20
-   */
-  g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MODEL_FILE,
-      g_param_spec_string ("model-file",
-          "ONNX model file", "ONNX model file", NULL, (GParamFlags)
-          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-  /**
-   * GstOnnxObjectDetector:label-file
-   *
-   * Label file for ONNX model
-   *
-   * Since: 1.20
-   */
-  g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_LABEL_FILE,
-      g_param_spec_string ("label-file",
-          "Label file", "Label file associated with model", NULL, (GParamFlags)
-          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-
-  /**
-   * GstOnnxObjectDetector:detection-node-index
-   *
-   * Index of model detection node
-   *
-   * Since: 1.20
-   */
-  g_object_class_install_property (G_OBJECT_CLASS (klass),
-      PROP_DETECTION_NODE_INDEX,
-      g_param_spec_int ("detection-node-index",
-          "Detection node index",
-          "Index of neural network output node corresponding to number of detected objects",
-          GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED,
-          GstOnnxNamespace::GST_ML_OUTPUT_NODE_NUMBER_OF-1,
-		  GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED, (GParamFlags)
-          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-
-  /**
-   * GstOnnxObjectDetector:bounding-box-node-index
-   *
-   * Index of model bounding box node
-   *
-   * Since: 1.20
-   */
-  g_object_class_install_property (G_OBJECT_CLASS (klass),
-      PROP_BOUNDING_BOX_NODE_INDEX,
-      g_param_spec_int ("box-node-index",
-          "Bounding box node index",
-          "Index of neural network output node corresponding to bounding box",
-          GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED,
-          GstOnnxNamespace::GST_ML_OUTPUT_NODE_NUMBER_OF-1,
-		  GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED, (GParamFlags)
-          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-  /**
-   * GstOnnxObjectDetector:score-node-index
-   *
-   * Index of model score node
-   *
-   * Since: 1.20
-   */
-  g_object_class_install_property (G_OBJECT_CLASS (klass),
-      PROP_SCORE_NODE_INDEX,
-      g_param_spec_int ("score-node-index",
-          "Score node index",
-          "Index of neural network output node corresponding to score",
-          GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED,
-          GstOnnxNamespace::GST_ML_OUTPUT_NODE_NUMBER_OF-1,
-		  GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED, (GParamFlags)
-          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-  /**
-   * GstOnnxObjectDetector:class-node-index
-   *
-   * Index of model class (label) node
-   *
-   * Since: 1.20
-   */
-  g_object_class_install_property (G_OBJECT_CLASS (klass),
-      PROP_CLASS_NODE_INDEX,
-      g_param_spec_int ("class-node-index",
-          "Class node index",
-          "Index of neural network output node corresponding to class (label)",
-          GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED,
-          GstOnnxNamespace::GST_ML_OUTPUT_NODE_NUMBER_OF-1,
-		  GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED, (GParamFlags)
-          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-
-  /**
-   * GstOnnxObjectDetector:score-threshold
-   *
-   * Threshold for deciding when to remove boxes based on score
-   *
-   * Since: 1.20
-   */
-  g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SCORE_THRESHOLD,
-      g_param_spec_float ("score-threshold",
-          "Score threshold",
-          "Threshold for deciding when to remove boxes based on score",
-          0.0, 1.0,
-          GST_ONNX_OBJECT_DETECTOR_DEFAULT_SCORE_THRESHOLD, (GParamFlags)
-          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-  /**
-   * GstOnnxObjectDetector:input-image-format
-   *
-   * Model input image format
-   *
-   * Since: 1.20
-   */
-  g_object_class_install_property (G_OBJECT_CLASS (klass),
-      PROP_INPUT_IMAGE_FORMAT,
-      g_param_spec_enum ("input-image-format",
-          "Input image format",
-          "Input image format",
-          GST_TYPE_ML_MODEL_INPUT_IMAGE_FORMAT,
-          GST_ML_MODEL_INPUT_IMAGE_FORMAT_HWC, (GParamFlags)
-          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-   /**
-    * GstOnnxObjectDetector:optimization-level
-    *
-    * ONNX optimization level
-    *
-    * Since: 1.20
-    */
-  g_object_class_install_property (G_OBJECT_CLASS (klass),
-      PROP_OPTIMIZATION_LEVEL,
-      g_param_spec_enum ("optimization-level",
-          "Optimization level",
-          "ONNX optimization level",
-          GST_TYPE_ONNX_OPTIMIZATION_LEVEL,
-          GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_EXTENDED, (GParamFlags)
-          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-  /**
-   * GstOnnxObjectDetector:execution-provider
-   *
-   * ONNX execution provider
-   *
-   * Since: 1.20
-   */
-  g_object_class_install_property (G_OBJECT_CLASS (klass),
-      PROP_EXECUTION_PROVIDER,
-      g_param_spec_enum ("execution-provider",
-          "Execution provider",
-          "ONNX execution provider",
-          GST_TYPE_ONNX_EXECUTION_PROVIDER,
-          GST_ONNX_EXECUTION_PROVIDER_CPU, (GParamFlags)
-          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
-
-  gst_element_class_set_static_metadata (element_class, "onnxobjectdetector",
-      "Filter/Effect/Video",
-      "Apply neural network to detect objects in video frames",
-      "Aaron Boxer <aaron.boxer@collabora.com>, Marcus Edel <marcus.edel@collabora.com>");
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_onnx_object_detector_sink_template));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_onnx_object_detector_src_template));
-  basetransform_class->transform_ip =
-      GST_DEBUG_FUNCPTR (gst_onnx_object_detector_transform_ip);
-  basetransform_class->transform_caps =
-      GST_DEBUG_FUNCPTR (gst_onnx_object_detector_transform_caps);
-}
-
-static void
-gst_onnx_object_detector_init (GstOnnxObjectDetector * self)
-{
-  self->onnx_ptr = new GstOnnxNamespace::GstOnnxClient ();
-  self->onnx_disabled = false;
-}
-
-static void
-gst_onnx_object_detector_finalize (GObject * object)
-{
-  GstOnnxObjectDetector *self = GST_ONNX_OBJECT_DETECTOR (object);
-
-  g_free (self->model_file);
-  delete GST_ONNX_MEMBER (self);
-  G_OBJECT_CLASS (gst_onnx_object_detector_parent_class)->finalize (object);
-}
-
-static void
-gst_onnx_object_detector_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstOnnxObjectDetector *self = GST_ONNX_OBJECT_DETECTOR (object);
-  const gchar *filename;
-  auto onnxClient = GST_ONNX_MEMBER (self);
-
-  switch (prop_id) {
-    case PROP_MODEL_FILE:
-      filename = g_value_get_string (value);
-      if (filename
-          && g_file_test (filename,
-              (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))) {
-        if (self->model_file)
-          g_free (self->model_file);
-        self->model_file = g_strdup (filename);
-      } else {
-        GST_WARNING_OBJECT (self, "Model file '%s' not found!", filename);
-        gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (self), TRUE);
-      }
-      break;
-    case PROP_LABEL_FILE:
-      filename = g_value_get_string (value);
-      if (filename
-          && g_file_test (filename,
-              (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))) {
-        if (self->label_file)
-          g_free (self->label_file);
-        self->label_file = g_strdup (filename);
-      } else {
-        GST_WARNING_OBJECT (self, "Label file '%s' not found!", filename);
-      }
-      break;
-    case PROP_SCORE_THRESHOLD:
-      GST_OBJECT_LOCK (self);
-      self->score_threshold = g_value_get_float (value);
-      GST_OBJECT_UNLOCK (self);
-      break;
-    case PROP_OPTIMIZATION_LEVEL:
-      self->optimization_level =
-          (GstOnnxOptimizationLevel) g_value_get_enum (value);
-      break;
-    case PROP_EXECUTION_PROVIDER:
-      self->execution_provider =
-          (GstOnnxExecutionProvider) g_value_get_enum (value);
-      break;
-    case PROP_DETECTION_NODE_INDEX:
-      onnxClient->setOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_DETECTION,
-          g_value_get_int (value));
-      break;
-    case PROP_BOUNDING_BOX_NODE_INDEX:
-      onnxClient->setOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_BOUNDING_BOX,
-          g_value_get_int (value));
-      break;
-      break;
-    case PROP_SCORE_NODE_INDEX:
-      onnxClient->setOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_SCORE,
-          g_value_get_int (value));
-      break;
-      break;
-    case PROP_CLASS_NODE_INDEX:
-      onnxClient->setOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_CLASS,
-          g_value_get_int (value));
-      break;
-    case PROP_INPUT_IMAGE_FORMAT:
-      onnxClient->setInputImageFormat ((GstMlModelInputImageFormat)
-          g_value_get_enum (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_onnx_object_detector_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstOnnxObjectDetector *self = GST_ONNX_OBJECT_DETECTOR (object);
-  auto onnxClient = GST_ONNX_MEMBER (self);
-
-  switch (prop_id) {
-    case PROP_MODEL_FILE:
-      g_value_set_string (value, self->model_file);
-      break;
-    case PROP_LABEL_FILE:
-      g_value_set_string (value, self->label_file);
-      break;
-    case PROP_SCORE_THRESHOLD:
-      GST_OBJECT_LOCK (self);
-      g_value_set_float (value, self->score_threshold);
-      GST_OBJECT_UNLOCK (self);
-      break;
-    case PROP_OPTIMIZATION_LEVEL:
-      g_value_set_enum (value, self->optimization_level);
-      break;
-    case PROP_EXECUTION_PROVIDER:
-      g_value_set_enum (value, self->execution_provider);
-      break;
-    case PROP_DETECTION_NODE_INDEX:
-      g_value_set_int (value,
-          onnxClient->getOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_DETECTION));
-      break;
-    case PROP_BOUNDING_BOX_NODE_INDEX:
-      g_value_set_int (value,
-          onnxClient->getOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_BOUNDING_BOX));
-      break;
-      break;
-    case PROP_SCORE_NODE_INDEX:
-      g_value_set_int (value,
-          onnxClient->getOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_SCORE));
-      break;
-      break;
-    case PROP_CLASS_NODE_INDEX:
-      g_value_set_int (value,
-          onnxClient->getOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_CLASS));
-      break;
-    case PROP_INPUT_IMAGE_FORMAT:
-      g_value_set_enum (value, onnxClient->getInputImageFormat ());
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static gboolean
-gst_onnx_object_detector_create_session (GstBaseTransform * trans)
-{
-  GstOnnxObjectDetector *self = GST_ONNX_OBJECT_DETECTOR (trans);
-  auto onnxClient = GST_ONNX_MEMBER (self);
-
-  GST_OBJECT_LOCK (self);
-  if (self->onnx_disabled || onnxClient->hasSession ()) {
-    GST_OBJECT_UNLOCK (self);
-
-    return TRUE;
-  }
-  if (self->model_file) {
-    gboolean ret = GST_ONNX_MEMBER (self)->createSession (self->model_file,
-        self->optimization_level,
-        self->execution_provider);
-    if (!ret) {
-      GST_ERROR_OBJECT (self,
-          "Unable to create ONNX session. Detection disabled.");
-    } else {
-      auto outputNames = onnxClient->getOutputNodeNames ();
-
-      for (size_t i = 0; i < outputNames.size (); ++i)
-        GST_INFO_OBJECT (self, "Output node index: %d for node: %s", (gint) i,
-            outputNamesi);
-      if (outputNames.size () < 3) {
-        GST_ERROR_OBJECT (self,
-            "Number of output tensor nodes %d does not match the 3 or 4 nodes "
-            "required for an object detection model. Detection is disabled.",
-            (gint) outputNames.size ());
-        self->onnx_disabled = TRUE;
-      }
-      // sanity check on output node indices
-      if (onnxClient->getOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_DETECTION) ==
-          GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED) {
-        GST_ERROR_OBJECT (self,
-            "Output detection node index not set. Detection disabled.");
-        self->onnx_disabled = TRUE;
-      }
-      if (onnxClient->getOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_BOUNDING_BOX) ==
-          GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED) {
-        GST_ERROR_OBJECT (self,
-            "Output bounding box node index not set. Detection disabled.");
-        self->onnx_disabled = TRUE;
-      }
-      if (onnxClient->getOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_SCORE) ==
-          GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED) {
-        GST_ERROR_OBJECT (self,
-            "Output score node index not set. Detection disabled.");
-        self->onnx_disabled = TRUE;
-      }
-      if (outputNames.size () == 4 && onnxClient->getOutputNodeIndex
-          (GstOnnxNamespace::GST_ML_OUTPUT_NODE_FUNCTION_CLASS) ==
-          GstOnnxNamespace::GST_ML_NODE_INDEX_DISABLED) {
-        GST_ERROR_OBJECT (self,
-            "Output class node index not set. Detection disabled.");
-        self->onnx_disabled = TRUE;
-      }
-	  // model is not usable, so fail
-      if (self->onnx_disabled) {
-		  GST_ELEMENT_WARNING (self, RESOURCE, FAILED,
-			  ("ONNX model cannot be used for object detection"), (NULL));
-
-		  return FALSE;
-      }
-    }
-  } else {
-    self->onnx_disabled = TRUE;
-  }
-  GST_OBJECT_UNLOCK (self);
-  if (self->onnx_disabled){
-    gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (self), TRUE);
-  }
-
-  return TRUE;
-}
-
-
-static GstCaps *
-gst_onnx_object_detector_transform_caps (GstBaseTransform *
-    trans, GstPadDirection direction, GstCaps * caps, GstCaps * filter_caps)
-{
-  GstOnnxObjectDetector *self = GST_ONNX_OBJECT_DETECTOR (trans);
-  auto onnxClient = GST_ONNX_MEMBER (self);
-  GstCaps *other_caps;
-  guint i;
-
-  if ( !gst_onnx_object_detector_create_session (trans) )
-	  return NULL;
-  GST_LOG_OBJECT (self, "transforming caps %" GST_PTR_FORMAT, caps);
-
-  if (gst_base_transform_is_passthrough (trans)
-      || (!onnxClient->isFixedInputImageSize ()))
-    return gst_caps_ref (caps);
-
-  other_caps = gst_caps_new_empty ();
-  for (i = 0; i < gst_caps_get_size (caps); ++i) {
-    GstStructure *structure, *new_structure;
-
-    structure = gst_caps_get_structure (caps, i);
-    new_structure = gst_structure_copy (structure);
-    gst_structure_set (new_structure, "width", G_TYPE_INT,
-        onnxClient->getWidth (), "height", G_TYPE_INT,
-        onnxClient->getHeight (), NULL);
-    GST_LOG_OBJECT (self,
-        "transformed structure %2d: %" GST_PTR_FORMAT " => %"
-        GST_PTR_FORMAT, i, structure, new_structure);
-    gst_caps_append_structure (other_caps, new_structure);
-  }
-
-  if (!gst_caps_is_empty (other_caps) && filter_caps) {
-    GstCaps *tmp = gst_caps_intersect_full (other_caps,filter_caps,
-        GST_CAPS_INTERSECT_FIRST);
-    gst_caps_replace (&other_caps, tmp);
-    gst_caps_unref (tmp);
-  }
-
-  return other_caps;
-}
-
-
-static GstFlowReturn
-gst_onnx_object_detector_transform_ip (GstBaseTransform * trans,
-    GstBuffer * buf)
-{
-  if (!gst_base_transform_is_passthrough (trans)
-      && !gst_onnx_object_detector_process (trans, buf)){
-	    GST_ELEMENT_WARNING (trans, STREAM, FAILED,
-          ("ONNX object detection failed"), (NULL));
-	    return GST_FLOW_ERROR;
-  }
-
-  return GST_FLOW_OK;
-}
-
-static gboolean
-gst_onnx_object_detector_process (GstBaseTransform * trans, GstBuffer * buf)
-{
-  GstMapInfo info;
-  GstVideoMeta *vmeta = gst_buffer_get_video_meta (buf);
-
-  if (!vmeta) {
-    GST_WARNING_OBJECT (trans, "missing video meta");
-    return FALSE;
-  }
-  if (gst_buffer_map (buf, &info, GST_MAP_READ)) {
-    GstOnnxObjectDetector *self = GST_ONNX_OBJECT_DETECTOR (trans);
-    auto boxes = GST_ONNX_MEMBER (self)->run (info.data, vmeta,
-        self->label_file ? self->label_file : "",
-        self->score_threshold);
-  for (auto & b:boxes) {
-      auto vroi_meta = gst_buffer_add_video_region_of_interest_meta (buf,
-          GST_ONNX_OBJECT_DETECTOR_META_NAME,
-          b.x0, b.y0,
-          b.width,
-          b.height);
-      if (!vroi_meta) {
-        GST_WARNING_OBJECT (trans,
-            "Unable to attach GstVideoRegionOfInterestMeta to buffer");
-        return FALSE;
-      }
-      auto s = gst_structure_new (GST_ONNX_OBJECT_DETECTOR_META_PARAM_NAME,
-          GST_ONNX_OBJECT_DETECTOR_META_FIELD_LABEL,
-          G_TYPE_STRING,
-          b.label.c_str (),
-          GST_ONNX_OBJECT_DETECTOR_META_FIELD_SCORE,
-          G_TYPE_DOUBLE,
-          b.score,
-          NULL);
-      gst_video_region_of_interest_meta_add_param (vroi_meta, s);
-      GST_DEBUG_OBJECT (self,
-          "Object detected with label : %s, score: %f, bound box: (%f,%f,%f,%f) \n",
-          b.label.c_str (), b.score, b.x0, b.y0,
-          b.x0 + b.width, b.y0 + b.height);
-    }
-    gst_buffer_unmap (buf, &info);
-  }
-
-  return TRUE;
-}

gst-plugins-bad-1.22.7.tar.xz/ext/onnx/gstonnxobjectdetector.h Deleted

@@ -1,93 +0,0 @@
-/*
- * GStreamer gstreamer-onnxobjectdetector
- * Copyright (C) 2021 Collabora Ltd
- *
- * gstonnxobjectdetector.h
- * 
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_ONNX_OBJECT_DETECTOR_H__
-#define __GST_ONNX_OBJECT_DETECTOR_H__
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-#include <gst/video/gstvideofilter.h>
-#include "gstonnxelement.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ONNX_OBJECT_DETECTOR            (gst_onnx_object_detector_get_type())
-G_DECLARE_FINAL_TYPE (GstOnnxObjectDetector, gst_onnx_object_detector, GST, ONNX_OBJECT_DETECTOR, GstBaseTransform)
-#define GST_ONNX_OBJECT_DETECTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ONNX_OBJECT_DETECTOR,GstOnnxObjectDetector))
-#define GST_ONNX_OBJECT_DETECTOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_ONNX_OBJECT_DETECTOR,GstOnnxObjectDetectorClass))
-#define GST_ONNX_OBJECT_DETECTOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_ONNX_OBJECT_DETECTOR,GstOnnxObjectDetectorClass))
-#define GST_IS_ONNX_OBJECT_DETECTOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ONNX_OBJECT_DETECTOR))
-#define GST_IS_ONNX_OBJECT_DETECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_ONNX_OBJECT_DETECTOR))
-
-#define GST_ONNX_OBJECT_DETECTOR_META_NAME "onnx-object_detector"
-#define GST_ONNX_OBJECT_DETECTOR_META_PARAM_NAME "extra-data"
-#define GST_ONNX_OBJECT_DETECTOR_META_FIELD_LABEL "label"
-#define GST_ONNX_OBJECT_DETECTOR_META_FIELD_SCORE "score"
-
-/**
- * GstOnnxObjectDetector:
- *
- * @model_file model file
- * @label_file label file
- * @score_threshold score threshold
- * @confidence_threshold confidence threshold
- * @iou_threhsold iou threshold
- * @optimization_level ONNX optimization level
- * @execution_provider: ONNX execution provider
- * @onnx_ptr opaque pointer to ONNX implementation
- *
- * Since: 1.20
- */
-struct _GstOnnxObjectDetector
-{
-  GstBaseTransform basetransform;
-  gchar *model_file;
-  gchar *label_file;
-  gfloat score_threshold;
-  gfloat confidence_threshold;
-  gfloat iou_threshold;
-  GstOnnxOptimizationLevel optimization_level;
-  GstOnnxExecutionProvider execution_provider;
-  gpointer onnx_ptr;
-  gboolean onnx_disabled;
-
-  void (*process) (GstOnnxObjectDetector * onnx_object_detector,
-      GstVideoFrame * inframe, GstVideoFrame * outframe);
-};
-
-/**
- * GstOnnxObjectDetectorClass:
- *
- * @parent_class base transform base class
- *
- * Since: 1.20
- */
-struct _GstOnnxObjectDetectorClass
-{
-  GstBaseTransformClass parent_class;
-};
-
-GST_ELEMENT_REGISTER_DECLARE (onnx_object_detector)
-
-G_END_DECLS
-
-#endif /* __GST_ONNX_OBJECT_DETECTOR_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/openh264/gstopenh264element.c Deleted

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2014, Ericsson AB. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this
- * list of conditions and the following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gst/gst.h>
-#include <wels/codec_api.h>
-#include <wels/codec_ver.h>
-#include <string.h>
-#include "gstopenh264elements.h"
-
-
-gboolean
-openh264_element_init (GstPlugin * plugin)
-{
-  OpenH264Version libver;
-  /* g_stCodecVersion is the version detected at build time as defined in the
-   * headers and WelsGetCodecVersion() is the version detected at runtime.
-   * This is a safeguard to avoid crashes since OpenH264  has been changing
-   * ABI without changing the SONAME.
-   */
-  libver = WelsGetCodecVersion ();
-  return (memcmp (&libver, &g_stCodecVersion, sizeof (libver)) == 0);
-}

gst-plugins-bad-1.22.7.tar.xz/ext/wpe/WPEThreadedView.cpp Deleted

@@ -1,888 +0,0 @@
-/* Copyright (C) <2018, 2019, 2020> Philippe Normand <philn@igalia.com>
- * Copyright (C) <2018> Žan Doberšek <zdobersek@igalia.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "WPEThreadedView.h"
-#include "gstwpe.h"
-#include "gstwpesrcbin.h"
-
-#include <gst/gl/gl.h>
-#include <gst/gl/egl/gsteglimage.h>
-#include <gst/gl/egl/gstgldisplay_egl.h>
-#include <wayland-server.h>
-
-#include <cstdio>
-#include <mutex>
-
-#include <wpe/unstable/fdo-shm.h>
-
-GST_DEBUG_CATEGORY_EXTERN (wpe_view_debug);
-#define GST_CAT_DEFAULT wpe_view_debug
-
-class GMutexHolder {
-public:
-    GMutexHolder(GMutex& mutex)
-        : m(mutex)
-    {
-        g_mutex_lock(&m);
-    }
-    ~GMutexHolder()
-    {
-        g_mutex_unlock(&m);
-    }
-
-private:
-    GMutex& m;
-};
-
-static WPEContextThread *s_view = NULL;
-
-WPEContextThread& WPEContextThread::singleton()
-{
-    static gsize initialized = 0;
-
-    if (g_once_init_enter (&initialized)) {
-        s_view = new WPEContextThread;
-
-        g_once_init_leave (&initialized, 1);
-    }
-
-    return *s_view;
-}
-
-WPEContextThread::WPEContextThread()
-{
-    g_mutex_init(&threading.mutex);
-    g_cond_init(&threading.cond);
-
-    {
-        GMutexHolder lock(threading.mutex);
-        threading.thread = g_thread_new("WPEContextThread", s_viewThread, this);
-        while (!threading.ready) {
-            g_cond_wait(&threading.cond, &threading.mutex);
-        }
-        GST_DEBUG("thread spawned");
-    }
-}
-
-WPEContextThread::~WPEContextThread()
-{
-    if (threading.thread) {
-        g_thread_unref(threading.thread);
-        threading.thread = nullptr;
-    }
-
-    g_mutex_clear(&threading.mutex);
-    g_cond_clear(&threading.cond);
-}
-
-template<typename Function>
-void WPEContextThread::dispatch(Function func)
-{
-    struct Job {
-        Job(Function& f)
-            : func(f)
-        {
-            g_mutex_init(&mutex);
-            g_cond_init(&cond);
-            dispatched = FALSE;
-        }
-        ~Job() {
-            g_mutex_clear(&mutex);
-            g_cond_clear(&cond);
-        }
-
-        void dispatch() {
-            GMutexHolder lock(mutex);
-            func();
-            dispatched = TRUE;
-            g_cond_signal(&cond);
-        }
-
-        void waitCompletion() {
-            GMutexHolder lock(mutex);
-            while(!dispatched) {
-                g_cond_wait(&cond, &mutex);
-            }
-        }
-
-        Function& func;
-        GMutex mutex;
-        GCond cond;
-        gboolean dispatched;
-    };
-
-    struct Job job(func);
-    GSource* source = g_idle_source_new();
-    g_source_set_callback(source, (gpointer data) -> gboolean {
-        auto* job = static_cast<struct Job*>(data);
-        job->dispatch();
-        return G_SOURCE_REMOVE;
-    }, &job, nullptr);
-    g_source_set_priority(source, G_PRIORITY_DEFAULT);
-    g_source_attach(source, glib.context);
-    job.waitCompletion();
-    g_source_unref(source);
-}
-
-gpointer WPEContextThread::s_viewThread(gpointer data)
-{
-    auto& view = *static_cast<WPEContextThread*>(data);
-
-    view.glib.context = g_main_context_new();
-    view.glib.loop = g_main_loop_new(view.glib.context, FALSE);
-
-    g_main_context_push_thread_default(view.glib.context);
-
-    {
-        GSource* source = g_idle_source_new();
-        g_source_set_callback(source,
-            (gpointer data) -> gboolean {
-                auto& view = *static_cast<WPEContextThread*>(data);
-                GMutexHolder lock(view.threading.mutex);
-                view.threading.ready = TRUE;
-                g_cond_signal(&view.threading.cond);
-                return G_SOURCE_REMOVE;
-            },
-            &view, nullptr);
-        g_source_attach(source, view.glib.context);
-        g_source_unref(source);
-    }
-
-    g_main_loop_run(view.glib.loop);
-
-    g_main_loop_unref(view.glib.loop);
-    view.glib.loop = nullptr;
-
-    g_main_context_pop_thread_default(view.glib.context);
-    g_main_context_unref(view.glib.context);
-    view.glib.context = nullptr;
-    return nullptr;
-}
-
-#ifdef G_OS_UNIX
-static void
-initialize_web_extensions (WebKitWebContext *context)
-{
-    const gchar *local_path = gst_wpe_get_devenv_extension_path ();
-    const gchar *path = g_file_test (local_path, G_FILE_TEST_IS_DIR) ? local_path : G_STRINGIFY (WPE_EXTENSION_INSTALL_DIR);
-    GST_INFO ("Loading WebExtension from %s", path);
-    webkit_web_context_set_web_extensions_directory (context, path);
-}
-
-static void
-webkit_extension_gerror_msg_received (GstWpeSrc *src, GVariant *params)
-{
-    GstStructure *structure;
-    GstMessage *forwarded;
-    const gchar *src_path, *src_type, *src_name, *error_domain, *msg, *debug_str, *details_str;
-    gint message_type;
-    guint32 error_code;
-
-    g_variant_get (params, "(issssusss)",
-       &message_type,
-       &src_type,
-       &src_name,
-       &src_path,
-       &error_domain,
-       &error_code,
-       &msg,
-       &debug_str,
-       &details_str
-    );
-
-    GError *error = g_error_new(g_quark_from_string(error_domain), error_code, "%s", msg);
-    GstStructure *details = (details_str0 != '\0') ? gst_structure_new_from_string(details_str) : NULL;
-    gchar * our_message = g_strdup_printf(
-        "`%s` posted from %s running inside the web page",
-        debug_str, src_path
-    );
-
-
-    if (message_type == GST_MESSAGE_ERROR) {
-        forwarded =
-            gst_message_new_error_with_details(GST_OBJECT(src), error,
-                                               our_message, details);
-    } else if (message_type == GST_MESSAGE_WARNING) {
-        forwarded =
-            gst_message_new_warning_with_details(GST_OBJECT(src), error,
-                                                 our_message, details);
-    } else {
-        forwarded =
-            gst_message_new_info_with_details(GST_OBJECT(src), error, our_message, details);
-    }
-
-    structure = gst_structure_new ("WpeForwarded",
-        "message", GST_TYPE_MESSAGE, forwarded,
-        "wpe-original-src-name", G_TYPE_STRING, src_name,
-        "wpe-original-src-type", G_TYPE_STRING, src_type,
-        "wpe-original-src-path", G_TYPE_STRING, src_path,
-        NULL
-    );
-
-    g_free (our_message);
-    gst_element_post_message(GST_ELEMENT(src), gst_message_new_custom(GST_MESSAGE_ELEMENT,
-                                                                      GST_OBJECT(src), structure));
-    g_error_free(error);
-    gst_message_unref (forwarded);
-}
-
-static void
-webkit_extension_bus_message_received (GstWpeSrc *src, GVariant *params)
-{
-    GstStructure *original_structure, *structure;
-    const gchar *src_name, *src_type, *src_path, *struct_str;
-    GstMessageType message_type;
-    GstMessage *forwarded;
-
-    g_variant_get (params, "(issss)",
-       &message_type,
-       &src_name,
-       &src_type,
-       &src_path,
-       &struct_str
-    );
-
-    original_structure = (struct_str0 != '\0') ? gst_structure_new_from_string(struct_str) : NULL;
-    if (!original_structure)
-    {
-        if (struct_str0 != '\0')
-            GST_ERROR_OBJECT(src, "Could not deserialize: %s", struct_str);
-        original_structure = gst_structure_new_empty("wpesrc");
-
-    }
-
-    forwarded = gst_message_new_custom(message_type,
-        GST_OBJECT (src), original_structure);
-    structure = gst_structure_new ("WpeForwarded",
-        "message", GST_TYPE_MESSAGE, forwarded,
-        "wpe-original-src-name", G_TYPE_STRING, src_name,
-        "wpe-original-src-type", G_TYPE_STRING, src_type,
-        "wpe-original-src-path", G_TYPE_STRING, src_path,
-        NULL
-    );
-
-    gst_element_post_message(GST_ELEMENT(src), gst_message_new_custom(GST_MESSAGE_ELEMENT,
-                                                                      GST_OBJECT(src), structure));
-
-    gst_message_unref (forwarded);
-}
-
-static gboolean
-webkit_extension_msg_received (WebKitWebContext  *context,
-               WebKitUserMessage *message,
-               GstWpeSrc           *src)
-{
-    const gchar *name = webkit_user_message_get_name (message);
-    GVariant *params = webkit_user_message_get_parameters (message);
-    gboolean res = TRUE;
-
-    GST_TRACE_OBJECT(src, "Handling message %s", name);
-    if (!g_strcmp0(name, "gstwpe.new_stream")) {
-        guint32 id = g_variant_get_uint32 (g_variant_get_child_value (params, 0));
-        const gchar *capsstr = g_variant_get_string (g_variant_get_child_value (params, 1), NULL);
-        GstCaps *caps = gst_caps_from_string (capsstr);
-        const gchar *stream_id = g_variant_get_string (g_variant_get_child_value (params, 2), NULL);
-        gst_wpe_src_new_audio_stream(src, id, caps, stream_id);
-        gst_caps_unref (caps);
-    } else if (!g_strcmp0(name, "gstwpe.set_shm")) {
-        auto fdlist = webkit_user_message_get_fd_list (message);
-        gint id = g_variant_get_uint32 (g_variant_get_child_value (params, 0));
-        gst_wpe_src_set_audio_shm (src, fdlist, id);
-    } else if (!g_strcmp0(name, "gstwpe.new_buffer")) {
-        guint32 id = g_variant_get_uint32 (g_variant_get_child_value (params, 0));
-        guint64 size = g_variant_get_uint64 (g_variant_get_child_value (params, 1));
-        gst_wpe_src_push_audio_buffer (src, id, size);
-
-        webkit_user_message_send_reply(message, webkit_user_message_new ("gstwpe.buffer_processed", NULL));
-    } else if (!g_strcmp0(name, "gstwpe.pause")) {
-        guint32 id = g_variant_get_uint32 (params);
-
-        gst_wpe_src_pause_audio_stream (src, id);
-    } else if (!g_strcmp0(name, "gstwpe.stop")) {
-        guint32 id = g_variant_get_uint32 (params);
-
-        gst_wpe_src_stop_audio_stream (src, id);
-    } else if (!g_strcmp0(name, "gstwpe.bus_gerror_message")) {
-        webkit_extension_gerror_msg_received (src, params);
-    } else if (!g_strcmp0(name, "gstwpe.bus_message")) {
-        webkit_extension_bus_message_received (src, params);
-    } else {
-        res = FALSE;
-        g_error("Unknown event: %s", name);
-    }
-
-    return res;
-}
-#endif
-
-WPEView* WPEContextThread::createWPEView(GstWpeVideoSrc* src, GstGLContext* context, GstGLDisplay* display, int width, int height)
-{
-    GST_DEBUG("context %p display %p, size (%d,%d)", context, display, width, height);
-
-    static std::once_flag s_loaderFlag;
-    std::call_once(s_loaderFlag,
-         {
-            wpe_loader_init("libWPEBackend-fdo-1.0.so");
-        });
-
-    WPEView* view = nullptr;
-    dispatch(&() mutable {
-        if (!glib.web_context) {
-            auto *manager = webkit_website_data_manager_new_ephemeral();
-            glib.web_context =
-                webkit_web_context_new_with_website_data_manager(manager);
-            g_object_unref(manager);
-        }
-        view = new WPEView(glib.web_context, src, context, display, width, height);
-    });
-
-    if (view && view->hasUri()) {
-        GST_DEBUG("waiting load to finish");
-        view->waitLoadCompletion();
-        GST_DEBUG("done");
-    }
-
-    return view;
-}
-
-static gboolean s_loadFailed(WebKitWebView*, WebKitLoadEvent, gchar* failing_uri, GError* error, gpointer data)
-{
-    GstWpeVideoSrc* src = GST_WPE_VIDEO_SRC(data);
-
-    if (g_error_matches(error, WEBKIT_NETWORK_ERROR, WEBKIT_NETWORK_ERROR_CANCELLED)) {
-        GST_INFO_OBJECT (src, "Loading cancelled.");
-
-        return FALSE;
-    }
-
-    GST_ELEMENT_ERROR (GST_ELEMENT_CAST(src), RESOURCE, FAILED, (NULL), ("Failed to load %s (%s)", failing_uri, error->message));
-    return FALSE;
-}
-
-static gboolean s_loadFailedWithTLSErrors(WebKitWebView*,  gchar* failing_uri, GTlsCertificate*, GTlsCertificateFlags, gpointer data)
-{
-    // Defer to load-failed.
-    return FALSE;
-}
-
-static void s_loadProgressChaned(GObject* object, GParamSpec*, gpointer data)
-{
-    GstElement* src = GST_ELEMENT_CAST (data);
-    // The src element is locked already so we can't call
-    // gst_element_post_message(). Instead retrieve the bus manually and use it
-    // directly.
-    GstBus* bus = GST_ELEMENT_BUS (src);
-    double estimatedProgress;
-    g_object_get(object, "estimated-load-progress", &estimatedProgress, nullptr);
-    gst_object_ref (bus);
-    gst_bus_post (bus, gst_message_new_element(GST_OBJECT_CAST(src), gst_structure_new("wpe-stats", "estimated-load-progress", G_TYPE_DOUBLE, estimatedProgress * 100, nullptr)));
-    gst_object_unref (bus);
-}
-
-WPEView::WPEView(WebKitWebContext* web_context, GstWpeVideoSrc* src, GstGLContext* context, GstGLDisplay* display, int width, int height)
-{
-#ifdef G_OS_UNIX
-{
-        GstObject *parent = gst_object_get_parent (GST_OBJECT (src));
-
-        if (parent && GST_IS_WPE_SRC (parent)) {
-            audio.init_ext_sigid = g_signal_connect (web_context,
-                              "initialize-web-extensions",
-                              G_CALLBACK (initialize_web_extensions),
-                              NULL);
-            audio.extension_msg_sigid = g_signal_connect (web_context,
-                                "user-message-received",
-                                G_CALLBACK (webkit_extension_msg_received),
-                                parent);
-            GST_INFO_OBJECT (parent, "Enabled audio");
-        }
-
-        gst_clear_object (&parent);
-}
-#endif // G_OS_UNIX
-
-    g_mutex_init(&threading.ready_mutex);
-    g_cond_init(&threading.ready_cond);
-    threading.ready = FALSE;
-
-    g_mutex_init(&images_mutex);
-    if (context)
-        gst.context = GST_GL_CONTEXT(gst_object_ref(context));
-    if (display) {
-        gst.display = GST_GL_DISPLAY(gst_object_ref(display));
-    }
-
-    wpe.width = width;
-    wpe.height = height;
-
-    if (context && display) {
-      if (gst_gl_context_get_gl_platform(context) == GST_GL_PLATFORM_EGL) {
-        gst.display_egl = gst_gl_display_egl_from_gl_display (gst.display);
-      } else {
-        GST_DEBUG ("Available GStreamer GL Context is not EGL - not creating an EGL display from it");
-      }
-    }
-
-    if (gst.display_egl) {
-        EGLDisplay eglDisplay = (EGLDisplay)gst_gl_display_get_handle (GST_GL_DISPLAY(gst.display_egl));
-        GST_DEBUG("eglDisplay %p", eglDisplay);
-
-        m_isValid = wpe_fdo_initialize_for_egl_display(eglDisplay);
-        GST_DEBUG("FDO EGL display initialisation result: %d", m_isValid);
-    } else {
-        m_isValid = wpe_fdo_initialize_shm();
-        GST_DEBUG("FDO SHM initialisation result: %d", m_isValid);
-    }
-    if (!m_isValid)
-        return;
-
-    if (gst.display_egl) {
-        wpe.exportable = wpe_view_backend_exportable_fdo_egl_create(&s_exportableEGLClient, this, wpe.width, wpe.height);
-    } else {
-        wpe.exportable = wpe_view_backend_exportable_fdo_create(&s_exportableClient, this, wpe.width, wpe.height);
-    }
-
-    auto* wpeViewBackend = wpe_view_backend_exportable_fdo_get_view_backend(wpe.exportable);
-    auto* viewBackend = webkit_web_view_backend_new(wpeViewBackend, (GDestroyNotify) wpe_view_backend_exportable_fdo_destroy, wpe.exportable);
-    wpe_view_backend_add_activity_state(wpeViewBackend, wpe_view_activity_state_visible | wpe_view_activity_state_focused | wpe_view_activity_state_in_window);
-
-    webkit.view = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW,
-        "web-context", web_context,
-        "backend", viewBackend,
-        nullptr));
-
-    g_signal_connect(webkit.view, "load-failed", G_CALLBACK(s_loadFailed), src);
-    g_signal_connect(webkit.view, "load-failed-with-tls-errors", G_CALLBACK(s_loadFailedWithTLSErrors), src);
-    g_signal_connect(webkit.view, "notify::estimated-load-progress", G_CALLBACK(s_loadProgressChaned), src);
-
-    auto* settings = webkit_web_view_get_settings(webkit.view);
-    webkit_settings_set_enable_webaudio(settings, TRUE);
-
-    gst_wpe_video_src_configure_web_view(src, webkit.view);
-
-    gchar* location;
-    gboolean drawBackground = TRUE;
-    g_object_get(src, "location", &location, "draw-background", &drawBackground, nullptr);
-    setDrawBackground(drawBackground);
-    if (location) {
-        loadUriUnlocked(location);
-        g_free(location);
-    }
-}
-
-WPEView::~WPEView()
-{
-    GstEGLImage *egl_pending = NULL;
-    GstEGLImage *egl_committed = NULL;
-    GstBuffer *shm_pending = NULL;
-    GstBuffer *shm_committed = NULL;
-    GST_TRACE ("%p destroying", this);
-
-    g_mutex_clear(&threading.ready_mutex);
-    g_cond_clear(&threading.ready_cond);
-
-    {
-        GMutexHolder lock(images_mutex);
-
-        if (egl.pending) {
-            egl_pending = egl.pending;
-            egl.pending = nullptr;
-        }
-        if (egl.committed) {
-            egl_committed = egl.committed;
-            egl.committed = nullptr;
-        }
-        if (shm.pending) {
-            GST_TRACE ("%p freeing shm pending %" GST_PTR_FORMAT, this, shm.pending);
-            shm_pending = shm.pending;
-            shm.pending = nullptr;
-        }
-        if (shm.committed) {
-            GST_TRACE ("%p freeing shm commited %" GST_PTR_FORMAT, this, shm.committed);
-            shm_committed = shm.committed;
-            shm.committed = nullptr;
-        }
-    }
-
-    if (egl_pending)
-        gst_egl_image_unref (egl_pending);
-    if (egl_committed)
-        gst_egl_image_unref (egl_committed);
-    if (shm_pending)
-        gst_buffer_unref (shm_pending);
-    if (shm_committed)
-        gst_buffer_unref (shm_committed);
-
-    if (audio.init_ext_sigid) {
-        WebKitWebContext* web_context = webkit_web_view_get_context (webkit.view);
-
-        g_signal_handler_disconnect(web_context, audio.init_ext_sigid);
-        g_signal_handler_disconnect(web_context, audio.extension_msg_sigid);
-        audio.init_ext_sigid = 0;
-        audio.extension_msg_sigid = 0;
-    }
-
-    WPEContextThread::singleton().dispatch(&() {
-        if (webkit.view) {
-            g_object_unref(webkit.view);
-            webkit.view = nullptr;
-        }
-    });
-
-    if (gst.display_egl) {
-        gst_object_unref(gst.display_egl);
-        gst.display_egl = nullptr;
-    }
-
-    if (gst.display) {
-        gst_object_unref(gst.display);
-        gst.display = nullptr;
-    }
-
-    if (gst.context) {
-        gst_object_unref(gst.context);
-        gst.context = nullptr;
-    }
-    if (webkit.uri) {
-        g_free(webkit.uri);
-        webkit.uri = nullptr;
-    }
-
-    g_mutex_clear(&images_mutex);
-    GST_TRACE ("%p destroyed", this);
-}
-
-void WPEView::notifyLoadFinished()
-{
-    GMutexHolder lock(threading.ready_mutex);
-    if (!threading.ready) {
-        threading.ready = TRUE;
-        g_cond_signal(&threading.ready_cond);
-    }
-}
-
-void WPEView::waitLoadCompletion()
-{
-    GMutexHolder lock(threading.ready_mutex);
-    while (!threading.ready)
-        g_cond_wait(&threading.ready_cond, &threading.ready_mutex);
-}
-
-GstEGLImage* WPEView::image()
-{
-    GstEGLImage* ret = nullptr;
-    bool dispatchFrameComplete = false;
-    GstEGLImage *prev_image = NULL;
-
-    {
-        GMutexHolder lock(images_mutex);
-
-        GST_TRACE("pending %" GST_PTR_FORMAT " (%d) committed %" GST_PTR_FORMAT " (%d)", egl.pending,
-                  GST_IS_EGL_IMAGE(egl.pending) ? GST_MINI_OBJECT_REFCOUNT_VALUE(GST_MINI_OBJECT_CAST(egl.pending)) : 0,
-                  egl.committed,
-                  GST_IS_EGL_IMAGE(egl.committed) ? GST_MINI_OBJECT_REFCOUNT_VALUE(GST_MINI_OBJECT_CAST(egl.committed)) : 0);
-
-        if (egl.pending) {
-            prev_image = egl.committed;
-            egl.committed = egl.pending;
-            egl.pending = nullptr;
-
-            dispatchFrameComplete = true;
-        }
-
-        if (egl.committed)
-            ret = egl.committed;
-    }
-
-    if (prev_image)
-        gst_egl_image_unref(prev_image);
-
-    if (dispatchFrameComplete)
-        frameComplete();
-
-    return ret;
-}
-
-GstBuffer* WPEView::buffer()
-{
-    GstBuffer* ret = nullptr;
-    bool dispatchFrameComplete = false;
-    GstBuffer *prev_image = NULL;
-
-    {
-        GMutexHolder lock(images_mutex);
-
-        GST_TRACE("pending %" GST_PTR_FORMAT " (%d) committed %" GST_PTR_FORMAT " (%d)", shm.pending,
-                  GST_IS_BUFFER(shm.pending) ? GST_MINI_OBJECT_REFCOUNT_VALUE(GST_MINI_OBJECT_CAST(shm.pending)) : 0,
-                  shm.committed,
-                  GST_IS_BUFFER(shm.committed) ? GST_MINI_OBJECT_REFCOUNT_VALUE(GST_MINI_OBJECT_CAST(shm.committed)) : 0);
-
-        if (shm.pending) {
-            prev_image = shm.committed;
-            shm.committed = shm.pending;
-            shm.pending = nullptr;
-
-            dispatchFrameComplete = true;
-        }
-
-        if (shm.committed)
-            ret = shm.committed;
-    }
-
-    if (prev_image)
-        gst_buffer_unref(prev_image);
-
-    if (dispatchFrameComplete)
-        frameComplete();
-
-    return ret;
-}
-
-void WPEView::resize(int width, int height)
-{
-    GST_DEBUG("resize to %dx%d", width, height);
-    wpe.width = width;
-    wpe.height = height;
-
-    s_view->dispatch(&() {
-        if (wpe.exportable && wpe_view_backend_exportable_fdo_get_view_backend(wpe.exportable))
-          wpe_view_backend_dispatch_set_size(wpe_view_backend_exportable_fdo_get_view_backend(wpe.exportable), wpe.width, wpe.height);
-    });
-}
-
-void WPEView::frameComplete()
-{
-    GST_TRACE("frame complete");
-    s_view->dispatch(&() {
-        GST_TRACE("dispatching");
-        wpe_view_backend_exportable_fdo_dispatch_frame_complete(wpe.exportable);
-    });
-}
-
-void WPEView::loadUriUnlocked(const gchar* uri)
-{
-    if (webkit.uri)
-        g_free(webkit.uri);
-
-    GST_DEBUG("loading %s", uri);
-    webkit.uri = g_strdup(uri);
-    webkit_web_view_load_uri(webkit.view, webkit.uri);
-}
-
-void WPEView::loadUri(const gchar* uri)
-{
-    s_view->dispatch(&() {
-        loadUriUnlocked(uri);
-    });
-}
-
-static void s_runJavascriptFinished(GObject* object, GAsyncResult* result, gpointer user_data)
-{
-    WebKitJavascriptResult* js_result;
-    GError* error = NULL;
-
-    js_result = webkit_web_view_run_javascript_finish(WEBKIT_WEB_VIEW(object), result, &error);
-    if (!js_result) {
-        GST_WARNING("Error running javascript: %s", error->message);
-        g_error_free(error);
-        return;
-    }
-    webkit_javascript_result_unref(js_result);
-}
-
-void WPEView::runJavascript(const char* script)
-{
-    s_view->dispatch(&() {
-        webkit_web_view_run_javascript(webkit.view, script, nullptr, s_runJavascriptFinished, nullptr);
-    });
-}
-
-void WPEView::loadData(GBytes* bytes)
-{
-    s_view->dispatch(this, bytes = g_bytes_ref(bytes)() {
-        webkit_web_view_load_bytes(webkit.view, bytes, nullptr, nullptr, nullptr);
-        g_bytes_unref(bytes);
-    });
-}
-
-void WPEView::setDrawBackground(gboolean drawsBackground)
-{
-    GST_DEBUG("%s background rendering", drawsBackground ? "Enabling" : "Disabling");
-    WebKitColor color;
-    webkit_color_parse(&color, drawsBackground ? "white" : "transparent");
-    webkit_web_view_set_background_color(webkit.view, &color);
-}
-
-void WPEView::releaseImage(gpointer imagePointer)
-{
-    s_view->dispatch(&() {
-        GST_TRACE("Dispatch release exported image %p", imagePointer);
-        wpe_view_backend_exportable_fdo_egl_dispatch_release_exported_image(wpe.exportable,
-                                                                            static_cast<struct wpe_fdo_egl_exported_image*>(imagePointer));
-    });
-}
-
-struct ImageContext {
-    WPEView* view;
-    gpointer image;
-};
-
-void WPEView::handleExportedImage(gpointer image)
-{
-    ImageContext* imageContext = g_slice_new(ImageContext);
-    imageContext->view = this;
-    imageContext->image = static_cast<gpointer>(image);
-    EGLImageKHR eglImage = wpe_fdo_egl_exported_image_get_egl_image(static_cast<struct wpe_fdo_egl_exported_image*>(image));
-
-    auto* gstImage = gst_egl_image_new_wrapped(gst.context, eglImage, GST_GL_RGBA, imageContext, s_releaseImage);
-    {
-      GMutexHolder lock(images_mutex);
-
-      GST_TRACE("EGLImage %p wrapped in GstEGLImage %" GST_PTR_FORMAT, eglImage, gstImage);
-      gst_clear_mini_object ((GstMiniObject **) &egl.pending);
-      egl.pending = gstImage;
-
-      notifyLoadFinished();
-    }
-}
-
-struct SHMBufferContext {
-    WPEView* view;
-    struct wpe_fdo_shm_exported_buffer* buffer;
-};
-
-void WPEView::releaseSHMBuffer(gpointer data)
-{
-    SHMBufferContext* context = static_cast<SHMBufferContext*>(data);
-    s_view->dispatch(&() {
-        auto* buffer = static_cast<struct wpe_fdo_shm_exported_buffer*>(context->buffer);
-        GST_TRACE("Dispatch release exported buffer %p", buffer);
-        wpe_view_backend_exportable_fdo_dispatch_release_shm_exported_buffer(wpe.exportable, buffer);
-    });
-}
-
-void WPEView::s_releaseSHMBuffer(gpointer data)
-{
-    SHMBufferContext* context = static_cast<SHMBufferContext*>(data);
-    context->view->releaseSHMBuffer(data);
-    g_slice_free(SHMBufferContext, context);
-}
-
-void WPEView::handleExportedBuffer(struct wpe_fdo_shm_exported_buffer* buffer)
-{
-    struct wl_shm_buffer* shmBuffer = wpe_fdo_shm_exported_buffer_get_shm_buffer(buffer);
-    auto format = wl_shm_buffer_get_format(shmBuffer);
-    if (format != WL_SHM_FORMAT_ARGB8888 && format != WL_SHM_FORMAT_XRGB8888) {
-        GST_ERROR("Unsupported pixel format: %d", format);
-        return;
-    }
-
-    int32_t width = wl_shm_buffer_get_width(shmBuffer);
-    int32_t height = wl_shm_buffer_get_height(shmBuffer);
-    gint stride = wl_shm_buffer_get_stride(shmBuffer);
-    gsize size = width * height * 4;
-    auto* data = static_cast<uint8_t*>(wl_shm_buffer_get_data(shmBuffer));
-
-    SHMBufferContext* bufferContext = g_slice_new(SHMBufferContext);
-    bufferContext->view = this;
-    bufferContext->buffer = buffer;
-
-    auto* gstBuffer = gst_buffer_new_wrapped_full(GST_MEMORY_FLAG_READONLY, data, size, 0, size, bufferContext, s_releaseSHMBuffer);
-    gsize offsets1;
-    gint strides1;
-    offsets0 = 0;
-    strides0 = stride;
-    gst_buffer_add_video_meta_full(gstBuffer, GST_VIDEO_FRAME_FLAG_NONE, GST_VIDEO_FORMAT_BGRA, width, height, 1, offsets, strides);
-
-    {
-        GMutexHolder lock(images_mutex);
-        GST_TRACE("SHM buffer %p wrapped in buffer %" GST_PTR_FORMAT, buffer, gstBuffer);
-        gst_clear_buffer (&shm.pending);
-        shm.pending = gstBuffer;
-        notifyLoadFinished();
-    }
-}
-
-struct wpe_view_backend_exportable_fdo_egl_client WPEView::s_exportableEGLClient = {
-    // export_egl_image
-    nullptr,
-    (void* data, struct wpe_fdo_egl_exported_image* image) {
-        auto& view = *static_cast<WPEView*>(data);
-        view.handleExportedImage(static_cast<gpointer>(image));
-    },
-    nullptr,
-    // padding
-    nullptr, nullptr
-};
-
-struct wpe_view_backend_exportable_fdo_client WPEView::s_exportableClient = {
-    nullptr,
-    nullptr,
-    // export_shm_buffer
-    (void* data, struct wpe_fdo_shm_exported_buffer* buffer) {
-        auto& view = *static_cast<WPEView*>(data);
-        view.handleExportedBuffer(buffer);
-    },
-    nullptr,
-    nullptr,
-};
-
-void WPEView::s_releaseImage(GstEGLImage* image, gpointer data)
-{
-    ImageContext* context = static_cast<ImageContext*>(data);
-    context->view->releaseImage(context->image);
-    g_slice_free(ImageContext, context);
-}
-
-struct wpe_view_backend* WPEView::backend() const
-{
-    return wpe.exportable ? wpe_view_backend_exportable_fdo_get_view_backend(wpe.exportable) : nullptr;
-}
-
-void WPEView::dispatchKeyboardEvent(struct wpe_input_keyboard_event& wpe_event)
-{
-    s_view->dispatch(&() {
-        wpe_view_backend_dispatch_keyboard_event(backend(), &wpe_event);
-    });
-}
-
-void WPEView::dispatchPointerEvent(struct wpe_input_pointer_event& wpe_event)
-{
-    s_view->dispatch(&() {
-        wpe_view_backend_dispatch_pointer_event(backend(), &wpe_event);
-    });
-}
-
-void WPEView::dispatchAxisEvent(struct wpe_input_axis_event& wpe_event)
-{
-    s_view->dispatch(&() {
-        wpe_view_backend_dispatch_axis_event(backend(), &wpe_event);
-    });
-}
-
-void WPEView::dispatchTouchEvent(struct wpe_input_touch_event& wpe_event)
-{
-    s_view->dispatch(&() {
-        wpe_view_backend_dispatch_touch_event(backend(), &wpe_event);
-    });
-}

gst-plugins-bad-1.22.7.tar.xz/ext/wpe/WPEThreadedView.h Deleted

@@ -1,152 +0,0 @@
-/* Copyright (C) <2018> Philippe Normand <philn@igalia.com>
- * Copyright (C) <2018> Žan Doberšek <zdobersek@igalia.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#pragma once
-
-#include <EGL/egl.h>
-#include <glib.h>
-#include <gst/gl/gstglfuncs.h>
-#include <gst/gl/egl/gstgldisplay_egl.h>
-#include <wpe/fdo.h>
-#include <wpe/fdo-egl.h>
-#include <wpe/webkit.h>
-#include "gstwpevideosrc.h"
-
-typedef struct _GstGLContext GstGLContext;
-typedef struct _GstGLDisplay GstGLDisplay;
-typedef struct _GstEGLImage GstEGLImage;
-
-class WPEView {
-public:
-    WPEView(WebKitWebContext*, GstWpeVideoSrc*, GstGLContext*, GstGLDisplay*, int width, int height);
-    ~WPEView();
-
-    bool operator!() const { return m_isValid; }
-
-    /*  Used by wpevideosrc */
-    void resize(int width, int height);
-    void loadUri(const gchar*);
-    void loadData(GBytes*);
-    void runJavascript(const gchar*);
-    void setDrawBackground(gboolean);
-
-    GstEGLImage* image();
-    GstBuffer* buffer();
-
-    void dispatchKeyboardEvent(struct wpe_input_keyboard_event&);
-    void dispatchPointerEvent(struct wpe_input_pointer_event&);
-    void dispatchAxisEvent(struct wpe_input_axis_event&);
-    void dispatchTouchEvent(struct wpe_input_touch_event&);
-
-    /*  Used by WPEContextThread */
-    bool hasUri() const { return webkit.uri; }
-    void disconnectLoadFailedSignal();
-    void waitLoadCompletion();
-
-protected:
-    void handleExportedImage(gpointer);
-    void handleExportedBuffer(struct wpe_fdo_shm_exported_buffer*);
-
-private:
-    struct wpe_view_backend* backend() const;
-    void frameComplete();
-    void loadUriUnlocked(const gchar*);
-    void notifyLoadFinished();
-
-    void releaseImage(gpointer);
-    void releaseSHMBuffer(gpointer);
-    static void s_releaseSHMBuffer(gpointer);
-
-    struct {
-        GstGLContext* context;
-        GstGLDisplay* display;
-        GstGLDisplayEGL* display_egl;
-    } gst { nullptr, nullptr, nullptr };
-
-    static struct wpe_view_backend_exportable_fdo_egl_client s_exportableEGLClient;
-    static struct wpe_view_backend_exportable_fdo_client s_exportableClient;
-
-    static void s_releaseImage(GstEGLImage*, gpointer);
-    struct {
-        struct wpe_view_backend_exportable_fdo* exportable;
-        int width;
-        int height;
-    } wpe { nullptr, 0, 0, };
-
-    struct {
-        gchar* uri;
-        WebKitWebView* view;
-    } webkit = { nullptr, nullptr };
-
-    bool m_isValid { false };
-
-    struct {
-        GMutex ready_mutex;
-        GCond ready_cond;
-        gboolean ready;
-    } threading;
-
-    // This mutex guards access to either egl or shm resources declared below,
-    // depending on the runtime behavior.
-    GMutex images_mutex;
-
-    struct {
-        GstEGLImage* pending;
-        GstEGLImage* committed;
-    } egl { nullptr, nullptr };
-
-    struct {
-        GstBuffer* pending;
-        GstBuffer* committed;
-    } shm { nullptr, nullptr };
-
-    struct {
-        gulong init_ext_sigid;
-        gulong extension_msg_sigid;
-    } audio {0, 0};
-
-};
-
-class WPEContextThread {
-public:
-    static WPEContextThread& singleton();
-
-    WPEContextThread();
-    ~WPEContextThread();
-
-    WPEView* createWPEView(GstWpeVideoSrc*, GstGLContext*, GstGLDisplay*, int width, int height);
-
-    template<typename Function>
-    void dispatch(Function);
-
-private:
-    static gpointer s_viewThread(gpointer);
-    struct {
-        GMutex mutex;
-        GCond cond;
-        gboolean ready;
-        GThread* thread { nullptr };
-    } threading;
-
-    struct {
-        GMainContext* context;
-        GMainLoop* loop;
-        WebKitWebContext* web_context;
-    } glib { nullptr, nullptr, nullptr };
-};

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudabufferpool.c Deleted

@@ -1,192 +0,0 @@
-/* GStreamer
- * Copyright (C) <2018-2019> Seungha Yang <seungha.yang@navercorp.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstcudabufferpool.h"
-#include "gstcudacontext.h"
-#include "gstcudamemory.h"
-
-GST_DEBUG_CATEGORY_STATIC (gst_cuda_buffer_pool_debug);
-#define GST_CAT_DEFAULT gst_cuda_buffer_pool_debug
-
-struct _GstCudaBufferPoolPrivate
-{
-  GstCudaAllocator *allocator;
-  GstVideoInfo info;
-};
-
-#define gst_cuda_buffer_pool_parent_class parent_class
-G_DEFINE_TYPE_WITH_PRIVATE (GstCudaBufferPool, gst_cuda_buffer_pool,
-    GST_TYPE_BUFFER_POOL);
-
-static const gchar **
-gst_cuda_buffer_pool_get_options (GstBufferPool * pool)
-{
-  static const gchar *options = { GST_BUFFER_POOL_OPTION_VIDEO_META, NULL
-  };
-
-  return options;
-}
-
-static gboolean
-gst_cuda_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
-{
-  GstCudaBufferPool *self = GST_CUDA_BUFFER_POOL (pool);
-  GstCudaBufferPoolPrivate *priv = self->priv;
-  GstCaps *caps = NULL;
-  guint size, min_buffers, max_buffers;
-  GstVideoInfo info;
-  GstMemory *mem;
-  GstCudaMemory *cmem;
-
-  if (!gst_buffer_pool_config_get_params (config, &caps, &size, &min_buffers,
-          &max_buffers)) {
-    GST_WARNING_OBJECT (self, "invalid config");
-    return FALSE;
-  }
-
-  if (!caps) {
-    GST_WARNING_OBJECT (pool, "no caps in config");
-    return FALSE;
-  }
-
-  if (!gst_video_info_from_caps (&info, caps)) {
-    GST_WARNING_OBJECT (self, "Failed to convert caps to video-info");
-    return FALSE;
-  }
-
-  gst_clear_object (&priv->allocator);
-  priv->allocator = (GstCudaAllocator *)
-      gst_allocator_find (GST_CUDA_MEMORY_TYPE_NAME);
-  if (!priv->allocator) {
-    GST_WARNING_OBJECT (self, "CudaAllocator is unavailable");
-    return FALSE;
-  }
-
-  mem = gst_cuda_allocator_alloc (priv->allocator, self->context, &info);
-  if (!mem) {
-    GST_WARNING_OBJECT (self, "Failed to allocate memory");
-    return FALSE;
-  }
-
-  cmem = GST_CUDA_MEMORY_CAST (mem);
-
-  gst_buffer_pool_config_set_params (config, caps,
-      GST_VIDEO_INFO_SIZE (&cmem->info), min_buffers, max_buffers);
-
-  priv->info = info;
-
-  gst_memory_unref (mem);
-
-  return GST_BUFFER_POOL_CLASS (parent_class)->set_config (pool, config);
-}
-
-static GstFlowReturn
-gst_cuda_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
-    GstBufferPoolAcquireParams * params)
-{
-  GstCudaBufferPool *self = GST_CUDA_BUFFER_POOL_CAST (pool);
-  GstCudaBufferPoolPrivate *priv = self->priv;
-  GstVideoInfo *info = &priv->info;
-  GstBuffer *buf;
-  GstMemory *mem;
-  GstCudaMemory *cmem;
-
-  mem = gst_cuda_allocator_alloc (priv->allocator, self->context, &priv->info);
-  if (!mem) {
-    GST_WARNING_OBJECT (pool, "Cannot create CUDA memory");
-    return GST_FLOW_ERROR;
-  }
-
-  cmem = GST_CUDA_MEMORY_CAST (mem);
-
-  buf = gst_buffer_new ();
-
-  gst_buffer_append_memory (buf, mem);
-
-  GST_DEBUG_OBJECT (pool, "adding GstVideoMeta");
-  gst_buffer_add_video_meta_full (buf, GST_VIDEO_FRAME_FLAG_NONE,
-      GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info),
-      GST_VIDEO_INFO_HEIGHT (info), GST_VIDEO_INFO_N_PLANES (info),
-      cmem->info.offset, cmem->info.stride);
-
-  *buffer = buf;
-
-  return GST_FLOW_OK;
-}
-
-/**
- * gst_cuda_buffer_pool_new:
- * @context: The #GstCudaContext to use for the new buffer pool
- *
- * Returns: A newly created #GstCudaBufferPool
- *
- * Since: 1.22
- */
-GstBufferPool *
-gst_cuda_buffer_pool_new (GstCudaContext * context)
-{
-  GstCudaBufferPool *self;
-
-  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), NULL);
-
-  self = g_object_new (GST_TYPE_CUDA_BUFFER_POOL, NULL);
-  gst_object_ref_sink (self);
-
-  self->context = gst_object_ref (context);
-
-  return GST_BUFFER_POOL_CAST (self);
-}
-
-static void
-gst_cuda_buffer_pool_dispose (GObject * object)
-{
-  GstCudaBufferPool *self = GST_CUDA_BUFFER_POOL_CAST (object);
-  GstCudaBufferPoolPrivate *priv = self->priv;
-
-  gst_clear_object (&priv->allocator);
-  gst_clear_object (&self->context);
-
-  G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-gst_cuda_buffer_pool_class_init (GstCudaBufferPoolClass * klass)
-{
-  GObjectClass *gobject_class = (GObjectClass *) klass;
-  GstBufferPoolClass *bufferpool_class = (GstBufferPoolClass *) klass;
-
-  gobject_class->dispose = gst_cuda_buffer_pool_dispose;
-
-  bufferpool_class->get_options = gst_cuda_buffer_pool_get_options;
-  bufferpool_class->set_config = gst_cuda_buffer_pool_set_config;
-  bufferpool_class->alloc_buffer = gst_cuda_buffer_pool_alloc;
-
-  GST_DEBUG_CATEGORY_INIT (gst_cuda_buffer_pool_debug, "cudabufferpool", 0,
-      "CUDA Buffer Pool");
-}
-
-static void
-gst_cuda_buffer_pool_init (GstCudaBufferPool * pool)
-{
-  pool->priv = gst_cuda_buffer_pool_get_instance_private (pool);
-}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudacontext.c Deleted

@@ -1,581 +0,0 @@
-/* GStreamer
- * Copyright (C) <2018-2019> Seungha Yang <seungha.yang@navercorp.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstcudaloader.h"
-#include "gstcudacontext.h"
-#include "gstcudautils.h"
-
-#ifdef GST_CUDA_HAS_D3D
-#include <gst/d3d11/gstd3d11.h>
-#endif
-
-GST_DEBUG_CATEGORY_STATIC (gst_cuda_context_debug);
-#define GST_CAT_DEFAULT gst_cuda_context_debug
-
-/* store all context object with weak ref */
-static GList *context_list = NULL;
-G_LOCK_DEFINE_STATIC (list_lock);
-
-enum
-{
-  PROP_0,
-  PROP_DEVICE_ID,
-  PROP_DXGI_ADAPTER_LUID,
-};
-
-struct _GstCudaContextPrivate
-{
-  CUcontext context;
-  CUdevice device;
-  guint device_id;
-  gint64 dxgi_adapter_luid;
-
-  gint tex_align;
-
-  GHashTable *accessible_peer;
-  gboolean owns_context;
-};
-
-#define gst_cuda_context_parent_class parent_class
-G_DEFINE_TYPE_WITH_PRIVATE (GstCudaContext, gst_cuda_context, GST_TYPE_OBJECT);
-
-static void gst_cuda_context_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_cuda_context_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-static void gst_cuda_context_finalize (GObject * object);
-static void gst_cuda_context_weak_ref_notify (gpointer data,
-    GstCudaContext * context);
-static void gst_cuda_context_enable_peer_access (GstCudaContext * context,
-    GstCudaContext * peer);
-
-static void
-gst_cuda_context_class_init (GstCudaContextClass * klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->set_property = gst_cuda_context_set_property;
-  gobject_class->get_property = gst_cuda_context_get_property;
-  gobject_class->finalize = gst_cuda_context_finalize;
-
-  /**
-   * GstCudaContext::cuda-device-id:
-   *
-   * The GPU index to use for the context.
-   *
-   * Since: 1.22
-   */
-  g_object_class_install_property (gobject_class, PROP_DEVICE_ID,
-      g_param_spec_uint ("cuda-device-id", "Cuda Device ID",
-          "Set the GPU device to use for operations",
-          0, G_MAXUINT, 0,
-          G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-#ifdef GST_CUDA_HAS_D3D
-  g_object_class_install_property (gobject_class, PROP_DXGI_ADAPTER_LUID,
-      g_param_spec_int64 ("dxgi-adapter-luid", "DXGI Adapter LUID",
-          "Associated DXGI Adapter LUID (Locally Unique Identifier) ",
-          G_MININT64, G_MAXINT64, 0,
-          GST_PARAM_CONDITIONALLY_AVAILABLE | G_PARAM_READABLE |
-          G_PARAM_STATIC_STRINGS));
-#endif
-}
-
-static void
-gst_cuda_context_init (GstCudaContext * context)
-{
-  GstCudaContextPrivate *priv = gst_cuda_context_get_instance_private (context);
-
-  priv->accessible_peer = g_hash_table_new (g_direct_hash, g_direct_equal);
-
-  context->priv = priv;
-}
-
-static void
-gst_cuda_context_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstCudaContext *context = GST_CUDA_CONTEXT (object);
-  GstCudaContextPrivate *priv = context->priv;
-
-  switch (prop_id) {
-    case PROP_DEVICE_ID:
-      priv->device_id = g_value_get_uint (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_cuda_context_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstCudaContext *context = GST_CUDA_CONTEXT (object);
-  GstCudaContextPrivate *priv = context->priv;
-
-  switch (prop_id) {
-    case PROP_DEVICE_ID:
-      g_value_set_uint (value, priv->device_id);
-      break;
-    case PROP_DXGI_ADAPTER_LUID:
-      g_value_set_int64 (value, priv->dxgi_adapter_luid);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-#ifdef GST_CUDA_HAS_D3D
-static gint64
-gst_cuda_context_find_dxgi_adapter_luid (CUdevice cuda_device)
-{
-  gint64 ret = 0;
-  HRESULT hr;
-  IDXGIFactory1 *factory = NULL;
-  guint i;
-
-  hr = CreateDXGIFactory1 (&IID_IDXGIFactory1, (void **) &factory);
-  if (FAILED (hr))
-    return 0;
-
-  for (i = 0;; i++) {
-    IDXGIAdapter1 *adapter;
-    DXGI_ADAPTER_DESC desc;
-    CUdevice other_dev = 0;
-    CUresult cuda_ret;
-
-    hr = IDXGIFactory1_EnumAdapters1 (factory, i, &adapter);
-    if (FAILED (hr))
-      break;
-
-    hr = IDXGIAdapter1_GetDesc (adapter, &desc);
-    if (FAILED (hr)) {
-      IDXGIAdapter1_Release (adapter);
-      continue;
-    }
-
-    if (desc.VendorId != 0x10de) {
-      IDXGIAdapter1_Release (adapter);
-      continue;
-    }
-
-    cuda_ret = CuD3D11GetDevice (&other_dev, (IDXGIAdapter *) adapter);
-    IDXGIAdapter1_Release (adapter);
-
-    if (cuda_ret == CUDA_SUCCESS && other_dev == cuda_device) {
-      ret = gst_d3d11_luid_to_int64 (&desc.AdapterLuid);
-      break;
-    }
-  }
-
-  IDXGIFactory1_Release (factory);
-
-  return ret;
-}
-#endif
-static gboolean
-init_cuda_ctx (void)
-{
-  gboolean ret = TRUE;
-
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once)) {
-    if (CuInit (0) != CUDA_SUCCESS) {
-      GST_ERROR ("Failed to cuInit");
-      ret = FALSE;
-    }
-    GST_DEBUG_CATEGORY_INIT (gst_cuda_context_debug,
-        "cudacontext", 0, "CUDA Context");
-    g_once_init_leave (&once, ret);
-  }
-
-  return ret;
-}
-
-static gboolean
-gst_create_cucontext (guint * device_id, CUcontext * context)
-{
-  CUcontext cuda_ctx;
-  CUdevice cdev = 0, cuda_dev = -1;
-  gint dev_count = 0;
-  gchar name256;
-  gint min = 0, maj = 0;
-  gint i;
-
-
-  if (!init_cuda_ctx ())
-    return FALSE;
-
-  if (!gst_cuda_result (CuDeviceGetCount (&dev_count)) || dev_count == 0) {
-    GST_WARNING ("No CUDA devices detected");
-    return FALSE;
-  }
-
-  for (i = 0; i < dev_count; ++i) {
-    if (gst_cuda_result (CuDeviceGet (&cdev, i)) &&
-        gst_cuda_result (CuDeviceGetName (name, sizeof (name), cdev)) &&
-        gst_cuda_result (CuDeviceGetAttribute (&maj,
-                CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, cdev)) &&
-        gst_cuda_result (CuDeviceGetAttribute (&min,
-                CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, cdev))) {
-      GST_INFO ("GPU #%d supports NVENC: %s (%s) (Compute SM %d.%d)", i,
-          (((maj << 4) + min) >= 0x30) ? "yes" : "no", name, maj, min);
-      if (*device_id == -1 || *device_id == cdev) {
-        *device_id = cuda_dev = cdev;
-        break;
-      }
-    }
-  }
-
-  if (cuda_dev == -1) {
-    GST_WARNING ("Device with id %d does not exist", *device_id);
-    return FALSE;
-  }
-
-  if (!gst_cuda_result (CuDeviceGet (&cdev, *device_id))) {
-    GST_WARNING ("Failed to get device for id %d", *device_id);
-    return FALSE;
-  }
-
-  if (!gst_cuda_result (CuCtxCreate (&cuda_ctx, 0, cuda_dev))) {
-    GST_WARNING ("Failed to create CUDA context for cuda device %d", cuda_dev);
-    return FALSE;
-  }
-
-  GST_INFO ("Created CUDA context %p with device-id %d", cuda_ctx, *device_id);
-
-  *context = cuda_ctx;
-
-  return TRUE;
-}
-
-/* must be called with list_lock taken */
-static void
-gst_cuda_context_enable_peer_access (GstCudaContext * context,
-    GstCudaContext * peer)
-{
-  GstCudaContextPrivate *priv = context->priv;
-  GstCudaContextPrivate *peer_priv = peer->priv;
-  CUdevice device = priv->device;
-  CUdevice other_dev = peer_priv->device;
-  CUresult cuda_ret;
-  gint can_access = 0;
-
-  cuda_ret = CuDeviceCanAccessPeer (&can_access, device, other_dev);
-
-  if (!gst_cuda_result (cuda_ret) || !can_access) {
-    GST_DEBUG_OBJECT (context,
-        "Peer access to %" GST_PTR_FORMAT " is not allowed", peer);
-    return;
-  }
-
-  gst_cuda_context_push (context);
-  if (gst_cuda_result (CuCtxEnablePeerAccess (peer_priv->context, 0))) {
-    GST_DEBUG_OBJECT (context, "Enable peer access to %" GST_PTR_FORMAT, peer);
-    g_hash_table_add (priv->accessible_peer, peer);
-  }
-
-  gst_cuda_context_pop (NULL);
-}
-
-static void
-gst_cuda_context_weak_ref_notify (gpointer data, GstCudaContext * context)
-{
-  GList *iter;
-
-  G_LOCK (list_lock);
-  context_list = g_list_remove (context_list, context);
-
-  /* disable self -> peer access */
-  if (context->priv->accessible_peer) {
-    GHashTableIter iter;
-    gpointer key;
-    g_hash_table_iter_init (&iter, context->priv->accessible_peer);
-    if (gst_cuda_context_push (context)) {
-      while (g_hash_table_iter_next (&iter, &key, NULL)) {
-        GstCudaContext *peer = GST_CUDA_CONTEXT (key);
-        CUcontext peer_handle = gst_cuda_context_get_handle (peer);
-        GST_DEBUG_OBJECT (context,
-            "Disable peer access to %" GST_PTR_FORMAT, peer);
-        gst_cuda_result (CuCtxDisablePeerAccess (peer_handle));
-      }
-      gst_cuda_context_pop (NULL);
-    }
-
-    g_hash_table_destroy (context->priv->accessible_peer);
-    context->priv->accessible_peer = NULL;
-  }
-
-  /* disable peer -> self access */
-  for (iter = context_list; iter; iter = g_list_next (iter)) {
-    GstCudaContext *other = (GstCudaContext *) iter->data;
-    GstCudaContextPrivate *other_priv = other->priv;
-    CUcontext self_handle;
-
-    if (!other_priv->accessible_peer)
-      continue;
-
-    if (g_hash_table_lookup (other_priv->accessible_peer, context)) {
-      if (gst_cuda_context_push (other)) {
-        self_handle = gst_cuda_context_get_handle (context);
-        GST_DEBUG_OBJECT (other,
-            "Disable peer access to %" GST_PTR_FORMAT, context);
-        gst_cuda_result (CuCtxDisablePeerAccess (self_handle));
-        gst_cuda_context_pop (NULL);
-      }
-
-      g_hash_table_remove (other_priv->accessible_peer, context);
-    }
-  }
-  G_UNLOCK (list_lock);
-}
-
-static void
-gst_cuda_context_finalize (GObject * object)
-{
-  GstCudaContext *context = GST_CUDA_CONTEXT_CAST (object);
-  GstCudaContextPrivate *priv = context->priv;
-
-  if (priv->context && priv->owns_context) {
-    GST_DEBUG_OBJECT (context, "Destroying CUDA context %p", priv->context);
-    gst_cuda_result (CuCtxDestroy (priv->context));
-  }
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-/**
- * gst_cuda_context_new:
- * @device_id: device-id for creating #GstCudaContext
- *
- * Create #GstCudaContext with given device_id
- *
- * Returns: (transfer full) (nullable): a new #GstCudaContext or %NULL on
- * failure
- *
- * Since: 1.22
- */
-GstCudaContext *
-gst_cuda_context_new (guint device_id)
-{
-  CUcontext old_ctx;
-  CUcontext ctx;
-  GstCudaContext *self;
-
-  if (!gst_create_cucontext (&device_id, &ctx)) {
-    return NULL;
-  }
-
-  self = gst_cuda_context_new_wrapped (ctx, device_id);
-  if (!self) {
-    CuCtxDestroy (ctx);
-    return NULL;
-  }
-
-  self->priv->owns_context = TRUE;
-
-  if (!gst_cuda_result (CuCtxPopCurrent (&old_ctx))) {
-    GST_ERROR ("Could not pop current context");
-    g_object_unref (self);
-
-    return NULL;
-  }
-
-  return self;
-}
-
-/**
- * gst_cuda_context_push:
- * @ctx: a #GstCudaContext to push current thread
- *
- * Pushes the given @ctx onto the CPU thread's stack of current contexts.
- * The specified context becomes the CPU thread's current context,
- * so all CUDA functions that operate on the current context are affected.
- *
- * Returns: %TRUE if @ctx was pushed without error.
- *
- * Since: 1.22
- */
-gboolean
-gst_cuda_context_push (GstCudaContext * ctx)
-{
-  g_return_val_if_fail (ctx, FALSE);
-  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (ctx), FALSE);
-
-  return gst_cuda_result (CuCtxPushCurrent (ctx->priv->context));
-}
-
-/**
- * gst_cuda_context_pop:
- *
- * Pops the current CUDA context from CPU thread
- *
- * Returns: %TRUE if @ctx was pushed without error.
- *
- * Since: 1.22
- */
-gboolean
-gst_cuda_context_pop (CUcontext * cuda_ctx)
-{
-  return gst_cuda_result (CuCtxPopCurrent (cuda_ctx));
-}
-
-/**
- * gst_cuda_context_get_handle:
- * @ctx: a #GstCudaContext
- *
- * Get CUDA device context. Caller must not modify and/or destroy
- * returned device context.
- *
- * Returns: the `CUcontext` of @ctx
- *
- * Since: 1.22
- */
-gpointer
-gst_cuda_context_get_handle (GstCudaContext * ctx)
-{
-  g_return_val_if_fail (ctx, NULL);
-  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (ctx), NULL);
-
-  return ctx->priv->context;
-}
-
-/**
- * gst_cuda_context_get_texture_alignment:
- * @ctx: a #GstCudaContext
- *
- * Get required texture alignment by device
- *
- * Returns: the `CUcontext` of @ctx
- *
- * Since: 1.22
- */
-gint
-gst_cuda_context_get_texture_alignment (GstCudaContext * ctx)
-{
-  g_return_val_if_fail (ctx, 0);
-  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (ctx), 0);
-
-  return ctx->priv->tex_align;
-}
-
-/**
- * gst_cuda_context_can_access_peer:
- * @ctx: a #GstCudaContext
- * @peer: a #GstCudaContext
- *
- * Query whether @ctx can access any memory which belongs to @peer directly.
- *
- * Returns: %TRUE if @ctx can access @peer directly
- *
- * Since: 1.22
- */
-gboolean
-gst_cuda_context_can_access_peer (GstCudaContext * ctx, GstCudaContext * peer)
-{
-  gboolean ret = FALSE;
-
-  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (ctx), FALSE);
-  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (peer), FALSE);
-
-  G_LOCK (list_lock);
-  if (ctx->priv->accessible_peer &&
-      g_hash_table_lookup (ctx->priv->accessible_peer, peer)) {
-    ret = TRUE;
-  }
-  G_UNLOCK (list_lock);
-
-  return ret;
-}
-
-
-/**
- * gst_cuda_context_new_wrapped:
- * @handler: A
- * CUcontext(https://docs.nvidia.com/cuda/cuda-driver-api/group__CUDA__TYPES.html#group__CUDA__TYPES_1gf9f5bd81658f866613785b3a0bb7d7d9)
- * to wrap
- * @device: A
- * CUDevice(https://docs.nvidia.com/cuda/cuda-driver-api/group__CUDA__TYPES.html#group__CUDA__TYPES_1gf9f5bd81658f866613785b3a0bb7d7d9)
- * to wrap
- *
- * Note: The caller is responsible for ensuring that the CUcontext and CUdevice
- * represented by @handle and @device stay alive while the returned
- * #GstCudaContext is active.
- *
- * Returns: (transfer full) (nullable): A newly created #GstCudaContext
- *
- * Since: 1.22
- */
-GstCudaContext *
-gst_cuda_context_new_wrapped (CUcontext handler, CUdevice device)
-{
-  GList *iter;
-  gint tex_align = 0;
-
-  GstCudaContext *self;
-
-  g_return_val_if_fail (handler, NULL);
-  g_return_val_if_fail (device >= 0, NULL);
-
-  if (!init_cuda_ctx ())
-    return NULL;
-
-  if (!gst_cuda_result (CuDeviceGetAttribute (&tex_align,
-              CU_DEVICE_ATTRIBUTE_TEXTURE_ALIGNMENT, device))) {
-    GST_ERROR ("Could not get texture alignment for %d", device);
-
-    return NULL;
-  }
-
-  self = g_object_new (GST_TYPE_CUDA_CONTEXT, "cuda-device-id", device, NULL);
-  self->priv->context = handler;
-  self->priv->device = device;
-  self->priv->tex_align = tex_align;
-  gst_object_ref_sink (self);
-
-#ifdef GST_CUDA_HAS_D3D
-  self->priv->dxgi_adapter_luid =
-      gst_cuda_context_find_dxgi_adapter_luid (self->priv->device);
-#endif
-
-
-  G_LOCK (list_lock);
-  g_object_weak_ref (G_OBJECT (self),
-      (GWeakNotify) gst_cuda_context_weak_ref_notify, NULL);
-  for (iter = context_list; iter; iter = g_list_next (iter)) {
-    GstCudaContext *peer = (GstCudaContext *) iter->data;
-
-    /* EnablePeerAccess is unidirectional */
-    gst_cuda_context_enable_peer_access (self, peer);
-    gst_cuda_context_enable_peer_access (peer, self);
-  }
-
-  context_list = g_list_append (context_list, self);
-  G_UNLOCK (list_lock);
-
-  return self;
-}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudaloader.c Deleted

@@ -1,624 +0,0 @@
-/* GStreamer
- * Copyright (C) 2019 Seungha Yang <seungha.yang@navercorp.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "cuda-gst.h"
-#include "gstcudaloader.h"
-#include <gmodule.h>
-
-GST_DEBUG_CATEGORY (gst_cudaloader_debug);
-#define GST_CAT_DEFAULT gst_cudaloader_debug
-
-#ifndef G_OS_WIN32
-#define CUDA_LIBNAME "libcuda.so.1"
-#else
-#define CUDA_LIBNAME "nvcuda.dll"
-#endif
-
-#define LOAD_SYMBOL(name,func) G_STMT_START { \
-  if (!g_module_symbol (module, G_STRINGIFY (name), (gpointer *) &vtable->func)) { \
-    GST_ERROR ("Failed to load '%s' from %s, %s", G_STRINGIFY (name), filename, g_module_error()); \
-    goto error; \
-  } \
-} G_STMT_END;
-
-/* *INDENT-OFF* */
-typedef struct _GstNvCodecCudaVTable
-{
-  gboolean loaded;
-
-  CUresult (CUDAAPI * CuInit) (unsigned int Flags);
-  CUresult (CUDAAPI * CuGetErrorName) (CUresult error, const char **pStr);
-  CUresult (CUDAAPI * CuGetErrorString) (CUresult error, const char **pStr);
-
-  CUresult (CUDAAPI * CuCtxCreate) (CUcontext * pctx, unsigned int flags,
-      CUdevice dev);
-  CUresult (CUDAAPI * CuCtxDestroy) (CUcontext ctx);
-  CUresult (CUDAAPI * CuCtxPopCurrent) (CUcontext * pctx);
-  CUresult (CUDAAPI * CuCtxPushCurrent) (CUcontext ctx);
-
-  CUresult (CUDAAPI * CuCtxEnablePeerAccess) (CUcontext peerContext,
-      unsigned int Flags);
-  CUresult (CUDAAPI * CuCtxDisablePeerAccess) (CUcontext peerContext);
-  CUresult (CUDAAPI * CuGraphicsMapResources) (unsigned int count,
-      CUgraphicsResource * resources, CUstream hStream);
-  CUresult (CUDAAPI * CuGraphicsUnmapResources) (unsigned int count,
-      CUgraphicsResource * resources, CUstream hStream);
-  CUresult (CUDAAPI *
-      CuGraphicsResourceSetMapFlags) (CUgraphicsResource resource,
-      unsigned int flags);
-  CUresult (CUDAAPI * CuGraphicsSubResourceGetMappedArray) (CUarray * pArray,
-      CUgraphicsResource resource, unsigned int arrayIndex,
-      unsigned int mipLevel);
-  CUresult (CUDAAPI * CuGraphicsResourceGetMappedPointer) (CUdeviceptr *
-      pDevPtr, size_t * pSize, CUgraphicsResource resource);
-  CUresult (CUDAAPI *
-      CuGraphicsUnregisterResource) (CUgraphicsResource resource);
-
-  CUresult (CUDAAPI * CuMemAlloc) (CUdeviceptr * dptr, unsigned int bytesize);
-  CUresult (CUDAAPI * CuMemAllocPitch) (CUdeviceptr * dptr, size_t * pPitch,
-      size_t WidthInBytes, size_t Height, unsigned int ElementSizeBytes);
-  CUresult (CUDAAPI * CuMemAllocHost) (void **pp, unsigned int bytesize);
-  CUresult (CUDAAPI * CuMemcpy2D) (const CUDA_MEMCPY2D * pCopy);
-  CUresult (CUDAAPI * CuMemcpy2DAsync) (const CUDA_MEMCPY2D * pCopy,
-      CUstream hStream);
-
-  CUresult (CUDAAPI * CuMemFree) (CUdeviceptr dptr);
-  CUresult (CUDAAPI * CuMemFreeHost) (void *p);
-
-  CUresult (CUDAAPI * CuStreamCreate) (CUstream * phStream,
-      unsigned int Flags);
-  CUresult (CUDAAPI * CuStreamDestroy) (CUstream hStream);
-  CUresult (CUDAAPI * CuStreamSynchronize) (CUstream hStream);
-
-  CUresult (CUDAAPI * CuDeviceGet) (CUdevice * device, int ordinal);
-  CUresult (CUDAAPI * CuDeviceGetCount) (int *count);
-  CUresult (CUDAAPI * CuDeviceGetName) (char *name, int len, CUdevice dev);
-  CUresult (CUDAAPI * CuDeviceGetAttribute) (int *pi,
-      CUdevice_attribute attrib, CUdevice dev);
-  CUresult (CUDAAPI * CuDeviceCanAccessPeer) (int *canAccessPeer,
-      CUdevice dev, CUdevice peerDev);
-  CUresult (CUDAAPI * CuDriverGetVersion) (int *driverVersion);
-
-  CUresult (CUDAAPI * CuModuleLoadData) (CUmodule * module,
-      const void *image);
-  CUresult (CUDAAPI * CuModuleUnload) (CUmodule module);
-  CUresult (CUDAAPI * CuModuleGetFunction) (CUfunction * hfunc,
-      CUmodule hmod, const char *name);
-  CUresult (CUDAAPI * CuTexObjectCreate) (CUtexObject * pTexObject,
-      const CUDA_RESOURCE_DESC * pResDesc, const CUDA_TEXTURE_DESC * pTexDesc,
-      const CUDA_RESOURCE_VIEW_DESC * pResViewDesc);
-  CUresult (CUDAAPI * CuTexObjectDestroy) (CUtexObject texObject);
-  CUresult (CUDAAPI * CuLaunchKernel) (CUfunction f, unsigned int gridDimX,
-      unsigned int gridDimY, unsigned int gridDimZ,
-      unsigned int blockDimX, unsigned int blockDimY, unsigned int blockDimZ,
-      unsigned int sharedMemBytes, CUstream hStream, void **kernelParams,
-      void **extra);
-
-  CUresult (CUDAAPI * CuGraphicsGLRegisterImage) (CUgraphicsResource *
-      pCudaResource, unsigned int image, unsigned int target,
-      unsigned int Flags);
-  CUresult (CUDAAPI * CuGraphicsGLRegisterBuffer) (CUgraphicsResource *
-      pCudaResource, unsigned int buffer, unsigned int Flags);
-  CUresult (CUDAAPI * CuGLGetDevices) (unsigned int *pCudaDeviceCount,
-      CUdevice * pCudaDevices, unsigned int cudaDeviceCount,
-      CUGLDeviceList deviceList);
-
-#ifdef G_OS_WIN32
-  CUresult (CUDAAPI * CuGraphicsD3D11RegisterResource) (CUgraphicsResource *
-      pCudaResource, ID3D11Resource * pD3DResource, unsigned int Flags);
-  CUresult (CUDAAPI * CuD3D11GetDevice) (CUdevice * device,
-      IDXGIAdapter * pAdapter);
-  CUresult (CUDAAPI * CuD3D11GetDevices) (unsigned int *pCudaDeviceCount,
-      CUdevice * pCudaDevices, unsigned int cudaDeviceCount,
-      ID3D11Device * pD3D11Device, CUd3d11DeviceList deviceList);
-#endif
-} GstNvCodecCudaVTable;
-/* *INDENT-ON* */
-
-static GstNvCodecCudaVTable gst_cuda_vtable = { 0, };
-
-/**
- * gst_cuda_load_library:
- *
- * Loads the cuda library
- *
- * Returns: %TRUE if the libcuda could be loaded %FALSE otherwise
- *
- * Since: 1.22
- */
-gboolean
-gst_cuda_load_library (void)
-{
-  GModule *module;
-  const gchar *filename = CUDA_LIBNAME;
-  GstNvCodecCudaVTable *vtable;
-  static gsize debug_initialized = FALSE;
-
-  if (g_once_init_enter (&debug_initialized)) {
-    GST_DEBUG_CATEGORY_INIT (gst_cudaloader_debug, "cudaloader", 0,
-        "cudaloader");
-
-    g_once_init_leave (&debug_initialized, TRUE);
-  }
-
-  if (gst_cuda_vtable.loaded)
-    return TRUE;
-
-  module = g_module_open (filename, G_MODULE_BIND_LAZY);
-  if (module == NULL) {
-    GST_WARNING ("Could not open library %s, %s", filename, g_module_error ());
-    return FALSE;
-  }
-
-  vtable = &gst_cuda_vtable;
-
-  /* cuda.h */
-  LOAD_SYMBOL (cuInit, CuInit);
-  LOAD_SYMBOL (cuGetErrorName, CuGetErrorName);
-  LOAD_SYMBOL (cuGetErrorString, CuGetErrorString);
-  LOAD_SYMBOL (cuCtxCreate, CuCtxCreate);
-  LOAD_SYMBOL (cuCtxDestroy, CuCtxDestroy);
-  LOAD_SYMBOL (cuCtxPopCurrent, CuCtxPopCurrent);
-  LOAD_SYMBOL (cuCtxPushCurrent, CuCtxPushCurrent);
-  LOAD_SYMBOL (cuCtxEnablePeerAccess, CuCtxEnablePeerAccess);
-  LOAD_SYMBOL (cuCtxDisablePeerAccess, CuCtxDisablePeerAccess);
-
-  LOAD_SYMBOL (cuGraphicsMapResources, CuGraphicsMapResources);
-  LOAD_SYMBOL (cuGraphicsUnmapResources, CuGraphicsUnmapResources);
-  LOAD_SYMBOL (cuGraphicsResourceSetMapFlags, CuGraphicsResourceSetMapFlags);
-  LOAD_SYMBOL (cuGraphicsSubResourceGetMappedArray,
-      CuGraphicsSubResourceGetMappedArray);
-  LOAD_SYMBOL (cuGraphicsResourceGetMappedPointer,
-      CuGraphicsResourceGetMappedPointer);
-  LOAD_SYMBOL (cuGraphicsUnregisterResource, CuGraphicsUnregisterResource);
-
-  LOAD_SYMBOL (cuMemAlloc, CuMemAlloc);
-  LOAD_SYMBOL (cuMemAllocPitch, CuMemAllocPitch);
-  LOAD_SYMBOL (cuMemAllocHost, CuMemAllocHost);
-  LOAD_SYMBOL (cuMemcpy2D, CuMemcpy2D);
-  LOAD_SYMBOL (cuMemcpy2DAsync, CuMemcpy2DAsync);
-
-  LOAD_SYMBOL (cuMemFree, CuMemFree);
-  LOAD_SYMBOL (cuMemFreeHost, CuMemFreeHost);
-
-  LOAD_SYMBOL (cuStreamCreate, CuStreamCreate);
-  LOAD_SYMBOL (cuStreamDestroy, CuStreamDestroy);
-  LOAD_SYMBOL (cuStreamSynchronize, CuStreamSynchronize);
-
-  LOAD_SYMBOL (cuDeviceGet, CuDeviceGet);
-  LOAD_SYMBOL (cuDeviceGetCount, CuDeviceGetCount);
-  LOAD_SYMBOL (cuDeviceGetName, CuDeviceGetName);
-  LOAD_SYMBOL (cuDeviceGetAttribute, CuDeviceGetAttribute);
-  LOAD_SYMBOL (cuDeviceCanAccessPeer, CuDeviceCanAccessPeer);
-
-  LOAD_SYMBOL (cuDriverGetVersion, CuDriverGetVersion);
-
-  LOAD_SYMBOL (cuModuleLoadData, CuModuleLoadData);
-  LOAD_SYMBOL (cuModuleUnload, CuModuleUnload);
-  LOAD_SYMBOL (cuModuleGetFunction, CuModuleGetFunction);
-  LOAD_SYMBOL (cuTexObjectCreate, CuTexObjectCreate);
-  LOAD_SYMBOL (cuTexObjectDestroy, CuTexObjectDestroy);
-  LOAD_SYMBOL (cuLaunchKernel, CuLaunchKernel);
-
-  /* cudaGL.h */
-  LOAD_SYMBOL (cuGraphicsGLRegisterImage, CuGraphicsGLRegisterImage);
-  LOAD_SYMBOL (cuGraphicsGLRegisterBuffer, CuGraphicsGLRegisterBuffer);
-  LOAD_SYMBOL (cuGLGetDevices, CuGLGetDevices);
-
-#ifdef G_OS_WIN32
-  /* cudaD3D11.h */
-  LOAD_SYMBOL (cuGraphicsD3D11RegisterResource,
-      CuGraphicsD3D11RegisterResource);
-  LOAD_SYMBOL (cuD3D11GetDevice, CuD3D11GetDevice);
-  LOAD_SYMBOL (cuD3D11GetDevices, CuD3D11GetDevices);
-#endif
-
-  vtable->loaded = TRUE;
-
-  return TRUE;
-
-error:
-  g_module_close (module);
-
-  return FALSE;
-}
-
-CUresult CUDAAPI
-CuInit (unsigned int Flags)
-{
-  g_assert (gst_cuda_vtable.CuInit != NULL);
-
-  return gst_cuda_vtable.CuInit (Flags);
-}
-
-CUresult CUDAAPI
-CuGetErrorName (CUresult error, const char **pStr)
-{
-  g_assert (gst_cuda_vtable.CuGetErrorName != NULL);
-
-  return gst_cuda_vtable.CuGetErrorName (error, pStr);
-}
-
-CUresult CUDAAPI
-CuGetErrorString (CUresult error, const char **pStr)
-{
-  g_assert (gst_cuda_vtable.CuGetErrorString != NULL);
-
-  return gst_cuda_vtable.CuGetErrorString (error, pStr);
-}
-
-CUresult CUDAAPI
-CuCtxCreate (CUcontext * pctx, unsigned int flags, CUdevice dev)
-{
-  g_assert (gst_cuda_vtable.CuCtxCreate != NULL);
-
-  return gst_cuda_vtable.CuCtxCreate (pctx, flags, dev);
-}
-
-CUresult CUDAAPI
-CuCtxDestroy (CUcontext ctx)
-{
-  g_assert (gst_cuda_vtable.CuCtxDestroy != NULL);
-
-  return gst_cuda_vtable.CuCtxDestroy (ctx);
-}
-
-CUresult CUDAAPI
-CuCtxPopCurrent (CUcontext * pctx)
-{
-  g_assert (gst_cuda_vtable.CuCtxPopCurrent != NULL);
-
-  return gst_cuda_vtable.CuCtxPopCurrent (pctx);
-}
-
-CUresult CUDAAPI
-CuCtxPushCurrent (CUcontext ctx)
-{
-  g_assert (gst_cuda_vtable.CuCtxPushCurrent != NULL);
-
-  return gst_cuda_vtable.CuCtxPushCurrent (ctx);
-}
-
-CUresult CUDAAPI
-CuCtxEnablePeerAccess (CUcontext peerContext, unsigned int Flags)
-{
-  g_assert (gst_cuda_vtable.CuCtxEnablePeerAccess != NULL);
-
-  return gst_cuda_vtable.CuCtxEnablePeerAccess (peerContext, Flags);
-}
-
-CUresult CUDAAPI
-CuCtxDisablePeerAccess (CUcontext peerContext)
-{
-  g_assert (gst_cuda_vtable.CuCtxDisablePeerAccess != NULL);
-
-  return gst_cuda_vtable.CuCtxDisablePeerAccess (peerContext);
-}
-
-CUresult CUDAAPI
-CuGraphicsMapResources (unsigned int count, CUgraphicsResource * resources,
-    CUstream hStream)
-{
-  g_assert (gst_cuda_vtable.CuGraphicsMapResources != NULL);
-
-  return gst_cuda_vtable.CuGraphicsMapResources (count, resources, hStream);
-}
-
-CUresult CUDAAPI
-CuGraphicsUnmapResources (unsigned int count, CUgraphicsResource * resources,
-    CUstream hStream)
-{
-  g_assert (gst_cuda_vtable.CuGraphicsUnmapResources != NULL);
-
-  return gst_cuda_vtable.CuGraphicsUnmapResources (count, resources, hStream);
-}
-
-CUresult CUDAAPI
-CuGraphicsResourceSetMapFlags (CUgraphicsResource resource, unsigned int flags)
-{
-  g_assert (gst_cuda_vtable.CuGraphicsResourceSetMapFlags != NULL);
-
-  return gst_cuda_vtable.CuGraphicsResourceSetMapFlags (resource, flags);
-}
-
-CUresult CUDAAPI
-CuGraphicsSubResourceGetMappedArray (CUarray * pArray,
-    CUgraphicsResource resource, unsigned int arrayIndex, unsigned int mipLevel)
-{
-  g_assert (gst_cuda_vtable.CuGraphicsSubResourceGetMappedArray != NULL);
-
-  return gst_cuda_vtable.CuGraphicsSubResourceGetMappedArray (pArray, resource,
-      arrayIndex, mipLevel);
-}
-
-/* *INDENT-OFF* */
-CUresult CUDAAPI
-CuGraphicsResourceGetMappedPointer (CUdeviceptr * pDevPtr, size_t * pSize,
-    CUgraphicsResource resource)
-{
-  g_assert (gst_cuda_vtable.CuGraphicsResourceGetMappedPointer != NULL);
-
-  return gst_cuda_vtable.CuGraphicsResourceGetMappedPointer (pDevPtr, pSize,
-      resource);
-}
-/* *INDENT-ON* */
-
-CUresult CUDAAPI
-CuGraphicsUnregisterResource (CUgraphicsResource resource)
-{
-  g_assert (gst_cuda_vtable.CuGraphicsUnregisterResource != NULL);
-
-  return gst_cuda_vtable.CuGraphicsUnregisterResource (resource);
-}
-
-CUresult CUDAAPI
-CuMemAlloc (CUdeviceptr * dptr, unsigned int bytesize)
-{
-  g_assert (gst_cuda_vtable.CuMemAlloc != NULL);
-
-  return gst_cuda_vtable.CuMemAlloc (dptr, bytesize);
-}
-
-/* *INDENT-OFF* */
-CUresult CUDAAPI
-CuMemAllocPitch (CUdeviceptr * dptr, size_t * pPitch, size_t WidthInBytes,
-    size_t Height, unsigned int ElementSizeBytes)
-{
-  g_assert (gst_cuda_vtable.CuMemAllocPitch != NULL);
-
-  return gst_cuda_vtable.CuMemAllocPitch (dptr, pPitch, WidthInBytes, Height,
-      ElementSizeBytes);
-}
-/* *INDENT-ON* */
-
-CUresult CUDAAPI
-CuMemAllocHost (void **pp, unsigned int bytesize)
-{
-  g_assert (gst_cuda_vtable.CuMemAllocHost != NULL);
-
-  return gst_cuda_vtable.CuMemAllocHost (pp, bytesize);
-}
-
-CUresult CUDAAPI
-CuMemcpy2D (const CUDA_MEMCPY2D * pCopy)
-{
-  g_assert (gst_cuda_vtable.CuMemcpy2D != NULL);
-
-  return gst_cuda_vtable.CuMemcpy2D (pCopy);
-}
-
-CUresult CUDAAPI
-CuMemcpy2DAsync (const CUDA_MEMCPY2D * pCopy, CUstream hStream)
-{
-  g_assert (gst_cuda_vtable.CuMemcpy2DAsync != NULL);
-
-  return gst_cuda_vtable.CuMemcpy2DAsync (pCopy, hStream);
-}
-
-CUresult CUDAAPI
-CuMemFree (CUdeviceptr dptr)
-{
-  g_assert (gst_cuda_vtable.CuMemFree != NULL);
-
-  return gst_cuda_vtable.CuMemFree (dptr);
-}
-
-CUresult CUDAAPI
-CuMemFreeHost (void *p)
-{
-  g_assert (gst_cuda_vtable.CuMemFreeHost != NULL);
-
-  return gst_cuda_vtable.CuMemFreeHost (p);
-}
-
-CUresult CUDAAPI
-CuStreamCreate (CUstream * phStream, unsigned int Flags)
-{
-  g_assert (gst_cuda_vtable.CuStreamCreate != NULL);
-
-  return gst_cuda_vtable.CuStreamCreate (phStream, Flags);
-}
-
-CUresult CUDAAPI
-CuStreamDestroy (CUstream hStream)
-{
-  g_assert (gst_cuda_vtable.CuStreamDestroy != NULL);
-
-  return gst_cuda_vtable.CuStreamDestroy (hStream);
-}
-
-CUresult CUDAAPI
-CuStreamSynchronize (CUstream hStream)
-{
-  g_assert (gst_cuda_vtable.CuStreamSynchronize != NULL);
-
-  return gst_cuda_vtable.CuStreamSynchronize (hStream);
-}
-
-CUresult CUDAAPI
-CuDeviceGet (CUdevice * device, int ordinal)
-{
-  g_assert (gst_cuda_vtable.CuDeviceGet != NULL);
-
-  return gst_cuda_vtable.CuDeviceGet (device, ordinal);
-}
-
-CUresult CUDAAPI
-CuDeviceGetCount (int *count)
-{
-  g_assert (gst_cuda_vtable.CuDeviceGetCount != NULL);
-
-  return gst_cuda_vtable.CuDeviceGetCount (count);
-}
-
-CUresult CUDAAPI
-CuDeviceGetName (char *name, int len, CUdevice dev)
-{
-  g_assert (gst_cuda_vtable.CuDeviceGetName != NULL);
-
-  return gst_cuda_vtable.CuDeviceGetName (name, len, dev);
-}
-
-CUresult CUDAAPI
-CuDeviceGetAttribute (int *pi, CUdevice_attribute attrib, CUdevice dev)
-{
-  g_assert (gst_cuda_vtable.CuDeviceGetAttribute != NULL);
-
-  return gst_cuda_vtable.CuDeviceGetAttribute (pi, attrib, dev);
-}
-
-CUresult CUDAAPI
-CuDeviceCanAccessPeer (int *canAccessPeer, CUdevice dev, CUdevice peerDev)
-{
-  g_assert (gst_cuda_vtable.CuDeviceCanAccessPeer != NULL);
-
-  return gst_cuda_vtable.CuDeviceCanAccessPeer (canAccessPeer, dev, peerDev);
-}
-
-CUresult CUDAAPI
-CuDriverGetVersion (int *driverVersion)
-{
-  g_assert (gst_cuda_vtable.CuDriverGetVersion != NULL);
-
-  return gst_cuda_vtable.CuDriverGetVersion (driverVersion);
-}
-
-CUresult CUDAAPI
-CuModuleLoadData (CUmodule * module, const void *image)
-{
-  g_assert (gst_cuda_vtable.CuModuleLoadData != NULL);
-
-  return gst_cuda_vtable.CuModuleLoadData (module, image);
-}
-
-CUresult CUDAAPI
-CuModuleUnload (CUmodule module)
-{
-  g_assert (gst_cuda_vtable.CuModuleUnload != NULL);
-
-  return gst_cuda_vtable.CuModuleUnload (module);
-}
-
-CUresult CUDAAPI
-CuModuleGetFunction (CUfunction * hfunc, CUmodule hmod, const char *name)
-{
-  g_assert (gst_cuda_vtable.CuModuleGetFunction != NULL);
-
-  return gst_cuda_vtable.CuModuleGetFunction (hfunc, hmod, name);
-}
-
-CUresult CUDAAPI
-CuTexObjectCreate (CUtexObject * pTexObject,
-    const CUDA_RESOURCE_DESC * pResDesc, const CUDA_TEXTURE_DESC * pTexDesc,
-    const CUDA_RESOURCE_VIEW_DESC * pResViewDesc)
-{
-  g_assert (gst_cuda_vtable.CuTexObjectCreate != NULL);
-
-  return gst_cuda_vtable.CuTexObjectCreate (pTexObject, pResDesc, pTexDesc,
-      pResViewDesc);
-}
-
-CUresult CUDAAPI
-CuTexObjectDestroy (CUtexObject texObject)
-{
-  g_assert (gst_cuda_vtable.CuTexObjectDestroy != NULL);
-
-  return gst_cuda_vtable.CuTexObjectDestroy (texObject);
-}
-
-CUresult CUDAAPI
-CuLaunchKernel (CUfunction f, unsigned int gridDimX,
-    unsigned int gridDimY, unsigned int gridDimZ,
-    unsigned int blockDimX, unsigned int blockDimY, unsigned int blockDimZ,
-    unsigned int sharedMemBytes, CUstream hStream, void **kernelParams,
-    void **extra)
-{
-  g_assert (gst_cuda_vtable.CuLaunchKernel != NULL);
-
-  return gst_cuda_vtable.CuLaunchKernel (f, gridDimX, gridDimY, gridDimZ,
-      blockDimX, blockDimY, blockDimZ, sharedMemBytes, hStream, kernelParams,
-      extra);
-}
-
-/* cudaGL.h */
-CUresult CUDAAPI
-CuGraphicsGLRegisterImage (CUgraphicsResource * pCudaResource,
-    unsigned int image, unsigned int target, unsigned int Flags)
-{
-  g_assert (gst_cuda_vtable.CuGraphicsGLRegisterImage != NULL);
-
-  return gst_cuda_vtable.CuGraphicsGLRegisterImage (pCudaResource, image,
-      target, Flags);
-}
-
-CUresult CUDAAPI
-CuGraphicsGLRegisterBuffer (CUgraphicsResource * pCudaResource,
-    unsigned int buffer, unsigned int Flags)
-{
-  g_assert (gst_cuda_vtable.CuGraphicsGLRegisterBuffer != NULL);
-
-  return gst_cuda_vtable.CuGraphicsGLRegisterBuffer (pCudaResource, buffer,
-      Flags);
-}
-
-CUresult CUDAAPI
-CuGLGetDevices (unsigned int *pCudaDeviceCount, CUdevice * pCudaDevices,
-    unsigned int cudaDeviceCount, CUGLDeviceList deviceList)
-{
-  g_assert (gst_cuda_vtable.CuGLGetDevices != NULL);
-
-  return gst_cuda_vtable.CuGLGetDevices (pCudaDeviceCount, pCudaDevices,
-      cudaDeviceCount, deviceList);
-}
-
-/* cudaD3D11.h */
-#ifdef G_OS_WIN32
-CUresult CUDAAPI
-CuGraphicsD3D11RegisterResource (CUgraphicsResource * pCudaResource,
-    ID3D11Resource * pD3DResource, unsigned int Flags)
-{
-  g_assert (gst_cuda_vtable.CuGraphicsD3D11RegisterResource != NULL);
-
-  return gst_cuda_vtable.CuGraphicsD3D11RegisterResource (pCudaResource,
-      pD3DResource, Flags);
-}
-
-CUresult CUDAAPI
-CuD3D11GetDevice (CUdevice * device, IDXGIAdapter * pAdapter)
-{
-  g_assert (gst_cuda_vtable.CuD3D11GetDevice != NULL);
-
-  return gst_cuda_vtable.CuD3D11GetDevice (device, pAdapter);
-}
-
-CUresult CUDAAPI
-CuD3D11GetDevices (unsigned int *pCudaDeviceCount,
-    CUdevice * pCudaDevices, unsigned int cudaDeviceCount,
-    ID3D11Device * pD3D11Device, CUd3d11DeviceList deviceList)
-{
-  g_assert (gst_cuda_vtable.CuD3D11GetDevices != NULL);
-
-  return gst_cuda_vtable.CuD3D11GetDevices (pCudaDeviceCount, pCudaDevices,
-      cudaDeviceCount, pD3D11Device, deviceList);
-}
-#endif

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudamemory.c Deleted

@@ -1,548 +0,0 @@
-/* GStreamer
- * Copyright (C) <2018-2019> Seungha Yang <seungha.yang@navercorp.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstcudamemory.h"
-#include "gstcudautils.h"
-
-#include <string.h>
-
-GST_DEBUG_CATEGORY_STATIC (cuda_allocator_debug);
-#define GST_CAT_DEFAULT cuda_allocator_debug
-
-static GstAllocator *_gst_cuda_allocator = NULL;
-
-struct _GstCudaMemoryPrivate
-{
-  CUdeviceptr data;
-  void *staging;
-
-  /* params used for cuMemAllocPitch */
-  gsize pitch;
-  guint width_in_bytes;
-  guint height;
-
-  GMutex lock;
-};
-
-#define gst_cuda_allocator_parent_class parent_class
-G_DEFINE_TYPE (GstCudaAllocator, gst_cuda_allocator, GST_TYPE_ALLOCATOR);
-
-static void gst_cuda_allocator_free (GstAllocator * allocator,
-    GstMemory * memory);
-
-static gpointer cuda_mem_map (GstMemory * mem, gsize maxsize,
-    GstMapFlags flags);
-static void cuda_mem_unmap_full (GstMemory * mem, GstMapInfo * info);
-static GstMemory *cuda_mem_copy (GstMemory * mem, gssize offset, gssize size);
-
-static GstMemory *
-gst_cuda_allocator_dummy_alloc (GstAllocator * allocator, gsize size,
-    GstAllocationParams * params)
-{
-  g_return_val_if_reached (NULL);
-}
-
-static void
-gst_cuda_allocator_class_init (GstCudaAllocatorClass * klass)
-{
-  GstAllocatorClass *allocator_class = GST_ALLOCATOR_CLASS (klass);
-
-  allocator_class->alloc = GST_DEBUG_FUNCPTR (gst_cuda_allocator_dummy_alloc);
-  allocator_class->free = GST_DEBUG_FUNCPTR (gst_cuda_allocator_free);
-
-  GST_DEBUG_CATEGORY_INIT (cuda_allocator_debug, "cudaallocator", 0,
-      "CUDA Allocator");
-}
-
-static void
-gst_cuda_allocator_init (GstCudaAllocator * allocator)
-{
-  GstAllocator *alloc = GST_ALLOCATOR_CAST (allocator);
-
-  GST_DEBUG_OBJECT (allocator, "init");
-
-  alloc->mem_type = GST_CUDA_MEMORY_TYPE_NAME;
-
-  alloc->mem_map = cuda_mem_map;
-  alloc->mem_unmap_full = cuda_mem_unmap_full;
-  alloc->mem_copy = cuda_mem_copy;
-
-  GST_OBJECT_FLAG_SET (allocator, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC);
-}
-
-static GstMemory *
-gst_cuda_allocator_alloc_internal (GstCudaAllocator * self,
-    GstCudaContext * context, const GstVideoInfo * info,
-    guint width_in_bytes, guint alloc_height)
-{
-  GstCudaMemoryPrivate *priv;
-  GstCudaMemory *mem;
-  CUdeviceptr data;
-  gboolean ret = FALSE;
-  gsize pitch;
-  guint height = GST_VIDEO_INFO_HEIGHT (info);
-  GstVideoInfo *alloc_info;
-
-  if (!gst_cuda_context_push (context))
-    return NULL;
-
-  ret = gst_cuda_result (CuMemAllocPitch (&data, &pitch, width_in_bytes,
-          alloc_height, 16));
-  gst_cuda_context_pop (NULL);
-
-  if (!ret) {
-    GST_ERROR_OBJECT (self, "Failed to allocate CUDA memory");
-    return NULL;
-  }
-
-  mem = g_new0 (GstCudaMemory, 1);
-  mem->priv = priv = g_new0 (GstCudaMemoryPrivate, 1);
-
-  priv->data = data;
-  priv->pitch = pitch;
-  priv->width_in_bytes = width_in_bytes;
-  priv->height = alloc_height;
-  g_mutex_init (&priv->lock);
-
-  mem->context = gst_object_ref (context);
-  mem->info = *info;
-  mem->info.size = pitch * alloc_height;
-
-  alloc_info = &mem->info;
-  gst_memory_init (GST_MEMORY_CAST (mem), 0, GST_ALLOCATOR_CAST (self),
-      NULL, alloc_info->size, 0, 0, alloc_info->size);
-
-  switch (GST_VIDEO_INFO_FORMAT (info)) {
-    case GST_VIDEO_FORMAT_I420:
-    case GST_VIDEO_FORMAT_YV12:
-    case GST_VIDEO_FORMAT_I420_10LE:
-      /* we are wasting space yes, but required so that this memory
-       * can be used in kernel function */
-      alloc_info->stride0 = pitch;
-      alloc_info->stride1 = pitch;
-      alloc_info->stride2 = pitch;
-      alloc_info->offset0 = 0;
-      alloc_info->offset1 = alloc_info->stride0 * height;
-      alloc_info->offset2 = alloc_info->offset1 +
-          alloc_info->stride1 * height / 2;
-      break;
-    case GST_VIDEO_FORMAT_Y42B:
-    case GST_VIDEO_FORMAT_I422_10LE:
-    case GST_VIDEO_FORMAT_I422_12LE:
-      alloc_info->stride0 = pitch;
-      alloc_info->stride1 = pitch;
-      alloc_info->stride2 = pitch;
-      alloc_info->offset0 = 0;
-      alloc_info->offset1 = alloc_info->stride0 * height;
-      alloc_info->offset2 = alloc_info->offset1 +
-          alloc_info->stride1 * height;
-      break;
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_NV21:
-    case GST_VIDEO_FORMAT_P010_10LE:
-    case GST_VIDEO_FORMAT_P016_LE:
-      alloc_info->stride0 = pitch;
-      alloc_info->stride1 = pitch;
-      alloc_info->offset0 = 0;
-      alloc_info->offset1 = alloc_info->stride0 * height;
-      break;
-    case GST_VIDEO_FORMAT_Y444:
-    case GST_VIDEO_FORMAT_Y444_16LE:
-    case GST_VIDEO_FORMAT_RGBP:
-    case GST_VIDEO_FORMAT_BGRP:
-    case GST_VIDEO_FORMAT_GBR:
-      alloc_info->stride0 = pitch;
-      alloc_info->stride1 = pitch;
-      alloc_info->stride2 = pitch;
-      alloc_info->offset0 = 0;
-      alloc_info->offset1 = alloc_info->stride0 * height;
-      alloc_info->offset2 = alloc_info->offset1 * 2;
-      break;
-    case GST_VIDEO_FORMAT_GBRA:
-      alloc_info->stride0 = pitch;
-      alloc_info->stride1 = pitch;
-      alloc_info->stride2 = pitch;
-      alloc_info->stride3 = pitch;
-      alloc_info->offset0 = 0;
-      alloc_info->offset1 = alloc_info->stride0 * height;
-      alloc_info->offset2 = alloc_info->offset1 * 2;
-      alloc_info->offset3 = alloc_info->offset1 * 3;
-      break;
-    case GST_VIDEO_FORMAT_BGRA:
-    case GST_VIDEO_FORMAT_RGBA:
-    case GST_VIDEO_FORMAT_RGBx:
-    case GST_VIDEO_FORMAT_BGRx:
-    case GST_VIDEO_FORMAT_ARGB:
-    case GST_VIDEO_FORMAT_ABGR:
-    case GST_VIDEO_FORMAT_RGB:
-    case GST_VIDEO_FORMAT_BGR:
-    case GST_VIDEO_FORMAT_BGR10A2_LE:
-    case GST_VIDEO_FORMAT_RGB10A2_LE:
-    case GST_VIDEO_FORMAT_YUY2:
-    case GST_VIDEO_FORMAT_UYVY:
-      alloc_info->stride0 = pitch;
-      alloc_info->offset0 = 0;
-      break;
-    default:
-      GST_ERROR_OBJECT (self, "Unexpected format %s",
-          gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (info)));
-      g_assert_not_reached ();
-      gst_memory_unref (GST_MEMORY_CAST (mem));
-      return NULL;
-  }
-
-  return GST_MEMORY_CAST (mem);
-}
-
-static void
-gst_cuda_allocator_free (GstAllocator * allocator, GstMemory * memory)
-{
-  GstCudaMemory *mem = GST_CUDA_MEMORY_CAST (memory);
-  GstCudaMemoryPrivate *priv = mem->priv;
-
-  gst_cuda_context_push (mem->context);
-  if (priv->data)
-    gst_cuda_result (CuMemFree (priv->data));
-
-  if (priv->staging)
-    gst_cuda_result (CuMemFreeHost (priv->staging));
-  gst_cuda_context_pop (NULL);
-
-  gst_object_unref (mem->context);
-
-  g_mutex_clear (&priv->lock);
-  g_free (mem->priv);
-  g_free (mem);
-}
-
-static gboolean
-gst_cuda_memory_upload (GstCudaAllocator * self, GstCudaMemory * mem)
-{
-  GstCudaMemoryPrivate *priv = mem->priv;
-  gboolean ret = TRUE;
-  CUDA_MEMCPY2D param = { 0, };
-
-  if (!priv->staging ||
-      !GST_MEMORY_FLAG_IS_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD)) {
-    return TRUE;
-  }
-
-  if (!gst_cuda_context_push (mem->context)) {
-    GST_ERROR_OBJECT (self, "Failed to push cuda context");
-    return FALSE;
-  }
-
-  param.srcMemoryType = CU_MEMORYTYPE_HOST;
-  param.srcHost = priv->staging;
-  param.srcPitch = priv->pitch;
-
-  param.dstMemoryType = CU_MEMORYTYPE_DEVICE;
-  param.dstDevice = (CUdeviceptr) priv->data;
-  param.dstPitch = priv->pitch;
-  param.WidthInBytes = priv->width_in_bytes;
-  param.Height = priv->height;
-
-  ret = gst_cuda_result (CuMemcpy2D (&param));
-  gst_cuda_context_pop (NULL);
-
-  if (!ret)
-    GST_ERROR_OBJECT (self, "Failed to upload memory");
-
-  return ret;
-}
-
-static gboolean
-gst_cuda_memory_download (GstCudaAllocator * self, GstCudaMemory * mem)
-{
-  GstCudaMemoryPrivate *priv = mem->priv;
-  gboolean ret = TRUE;
-  CUDA_MEMCPY2D param = { 0, };
-
-  if (!GST_MEMORY_FLAG_IS_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD))
-    return TRUE;
-
-  if (!gst_cuda_context_push (mem->context)) {
-    GST_ERROR_OBJECT (self, "Failed to push cuda context");
-    return FALSE;
-  }
-
-  if (!priv->staging) {
-    ret = gst_cuda_result (CuMemAllocHost (&priv->staging,
-            GST_MEMORY_CAST (mem)->size));
-    if (!ret) {
-      GST_ERROR_OBJECT (self, "Failed to allocate staging memory");
-      gst_cuda_context_pop (NULL);
-      return FALSE;
-    }
-  }
-
-  param.srcMemoryType = CU_MEMORYTYPE_DEVICE;
-  param.srcDevice = (CUdeviceptr) priv->data;
-  param.srcPitch = priv->pitch;
-
-  param.dstMemoryType = CU_MEMORYTYPE_HOST;
-  param.dstHost = priv->staging;
-  param.dstPitch = priv->pitch;
-  param.WidthInBytes = priv->width_in_bytes;
-  param.Height = priv->height;
-
-  ret = gst_cuda_result (CuMemcpy2D (&param));
-  gst_cuda_context_pop (NULL);
-
-  if (!ret)
-    GST_ERROR_OBJECT (self, "Failed to upload memory");
-
-  return ret;
-}
-
-static gpointer
-cuda_mem_map (GstMemory * mem, gsize maxsize, GstMapFlags flags)
-{
-  GstCudaAllocator *self = GST_CUDA_ALLOCATOR (mem->allocator);
-  GstCudaMemory *cmem = GST_CUDA_MEMORY_CAST (mem);
-  GstCudaMemoryPrivate *priv = cmem->priv;
-  gpointer ret = NULL;
-
-  g_mutex_lock (&priv->lock);
-  if ((flags & GST_MAP_CUDA) == GST_MAP_CUDA) {
-    if (!gst_cuda_memory_upload (self, cmem))
-      goto out;
-
-    GST_MEMORY_FLAG_UNSET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD);
-
-    if ((flags & GST_MAP_WRITE) == GST_MAP_WRITE)
-      GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD);
-
-    ret = (gpointer) priv->data;
-    goto out;
-  }
-
-  /* First CPU access, must be downloaded */
-  if (!priv->staging)
-    GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD);
-
-  if (!gst_cuda_memory_download (self, cmem))
-    goto out;
-
-  ret = priv->staging;
-
-  if ((flags & GST_MAP_WRITE) == GST_MAP_WRITE)
-    GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD);
-
-  GST_MEMORY_FLAG_UNSET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD);
-
-out:
-  g_mutex_unlock (&priv->lock);
-
-  return ret;
-}
-
-static void
-cuda_mem_unmap_full (GstMemory * mem, GstMapInfo * info)
-{
-  GstCudaMemory *cmem = GST_CUDA_MEMORY_CAST (mem);
-  GstCudaMemoryPrivate *priv = cmem->priv;
-
-  g_mutex_lock (&priv->lock);
-  if ((info->flags & GST_MAP_CUDA) == GST_MAP_CUDA) {
-    if ((info->flags & GST_MAP_WRITE) == GST_MAP_WRITE)
-      GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD);
-
-    goto out;
-  }
-
-  if ((info->flags & GST_MAP_WRITE) == GST_MAP_WRITE)
-    GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD);
-
-out:
-  g_mutex_unlock (&priv->lock);
-
-  return;
-}
-
-static GstMemory *
-cuda_mem_copy (GstMemory * mem, gssize offset, gssize size)
-{
-  GstCudaAllocator *self = GST_CUDA_ALLOCATOR (mem->allocator);
-  GstCudaMemory *src_mem = GST_CUDA_MEMORY_CAST (mem);
-  GstCudaContext *context = src_mem->context;
-  GstMapInfo src_info, dst_info;
-  CUDA_MEMCPY2D param = { 0, };
-  GstMemory *copy;
-  gboolean ret;
-
-  /* offset and size are ignored */
-  copy = gst_cuda_allocator_alloc_internal (self, context,
-      &src_mem->info, src_mem->priv->width_in_bytes, src_mem->priv->height);
-
-  if (!copy) {
-    GST_ERROR_OBJECT (self, "Failed to allocate memory for copying");
-    return NULL;
-  }
-
-  if (!gst_memory_map (mem, &src_info, GST_MAP_READ | GST_MAP_CUDA)) {
-    GST_ERROR_OBJECT (self, "Failed to map src memory");
-    gst_memory_unref (copy);
-    return NULL;
-  }
-
-  if (!gst_memory_map (copy, &dst_info, GST_MAP_WRITE | GST_MAP_CUDA)) {
-    GST_ERROR_OBJECT (self, "Failed to map dst memory");
-    gst_memory_unmap (mem, &src_info);
-    gst_memory_unref (copy);
-    return NULL;
-  }
-
-  if (!gst_cuda_context_push (context)) {
-    GST_ERROR_OBJECT (self, "Failed to push cuda context");
-    gst_memory_unmap (mem, &src_info);
-    gst_memory_unmap (copy, &dst_info);
-
-    return NULL;
-  }
-
-  param.srcMemoryType = CU_MEMORYTYPE_DEVICE;
-  param.srcDevice = (CUdeviceptr) src_info.data;
-  param.srcPitch = src_mem->priv->pitch;
-
-  param.dstMemoryType = CU_MEMORYTYPE_DEVICE;
-  param.dstDevice = (CUdeviceptr) dst_info.data;
-  param.dstPitch = src_mem->priv->pitch;
-  param.WidthInBytes = src_mem->priv->width_in_bytes;
-  param.Height = src_mem->priv->height;
-
-  ret = gst_cuda_result (CuMemcpy2D (&param));
-  gst_cuda_context_pop (NULL);
-
-  gst_memory_unmap (mem, &src_info);
-  gst_memory_unmap (copy, &dst_info);
-
-  if (!ret) {
-    GST_ERROR_OBJECT (self, "Failed to copy memory");
-    gst_memory_unref (copy);
-    return NULL;
-  }
-
-  return copy;
-}
-
-/**
- * gst_cuda_memory_init_once:
- *
- * Ensures that the #GstCudaAllocator is initialized and ready to be used.
- *
- * Since: 1.22
- */
-void
-gst_cuda_memory_init_once (void)
-{
-  static gsize _init = 0;
-
-  if (g_once_init_enter (&_init)) {
-    _gst_cuda_allocator =
-        (GstAllocator *) g_object_new (GST_TYPE_CUDA_ALLOCATOR, NULL);
-    gst_object_ref_sink (_gst_cuda_allocator);
-
-    gst_allocator_register (GST_CUDA_MEMORY_TYPE_NAME, _gst_cuda_allocator);
-    g_once_init_leave (&_init, 1);
-  }
-}
-
-/**
- * gst_is_cuda_memory:
- * @mem: A #GstMemory
- *
- * Check if @mem is a cuda memory
- *
- * Since: 1.22
- */
-gboolean
-gst_is_cuda_memory (GstMemory * mem)
-{
-  return mem != NULL && mem->allocator != NULL &&
-      GST_IS_CUDA_ALLOCATOR (mem->allocator);
-}
-
-/**
- * gst_cuda_allocator_alloc:
- *
- * Since: 1.22
- */
-GstMemory *
-gst_cuda_allocator_alloc (GstCudaAllocator * allocator,
-    GstCudaContext * context, const GstVideoInfo * info)
-{
-  guint alloc_height;
-
-  g_return_val_if_fail (GST_IS_CUDA_ALLOCATOR (allocator), NULL);
-  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), NULL);
-  g_return_val_if_fail (info != NULL, NULL);
-
-  alloc_height = GST_VIDEO_INFO_HEIGHT (info);
-
-  /* make sure valid height for subsampled formats */
-  switch (GST_VIDEO_INFO_FORMAT (info)) {
-    case GST_VIDEO_FORMAT_I420:
-    case GST_VIDEO_FORMAT_YV12:
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_P010_10LE:
-    case GST_VIDEO_FORMAT_P016_LE:
-    case GST_VIDEO_FORMAT_I420_10LE:
-      alloc_height = GST_ROUND_UP_2 (alloc_height);
-      break;
-    default:
-      break;
-  }
-
-  switch (GST_VIDEO_INFO_FORMAT (info)) {
-    case GST_VIDEO_FORMAT_I420:
-    case GST_VIDEO_FORMAT_YV12:
-    case GST_VIDEO_FORMAT_I420_10LE:
-      alloc_height *= 2;
-      break;
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_NV21:
-    case GST_VIDEO_FORMAT_P010_10LE:
-    case GST_VIDEO_FORMAT_P016_LE:
-      alloc_height += alloc_height / 2;
-      break;
-    case GST_VIDEO_FORMAT_Y42B:
-    case GST_VIDEO_FORMAT_I422_10LE:
-    case GST_VIDEO_FORMAT_I422_12LE:
-    case GST_VIDEO_FORMAT_Y444:
-    case GST_VIDEO_FORMAT_Y444_16LE:
-    case GST_VIDEO_FORMAT_RGBP:
-    case GST_VIDEO_FORMAT_BGRP:
-    case GST_VIDEO_FORMAT_GBR:
-      alloc_height *= 3;
-      break;
-    case GST_VIDEO_FORMAT_GBRA:
-      alloc_height *= 4;
-      break;
-    default:
-      break;
-  }
-
-  return gst_cuda_allocator_alloc_internal (allocator, context,
-      info, info->stride0, alloc_height);
-}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudanvrtc.c Deleted

@@ -1,343 +0,0 @@
-/* GStreamer
- * Copyright (C) 2019 Seungha Yang <seungha.yang@navercorp.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "cuda-gst.h"
-#include "gstcudanvrtc.h"
-#include "gstcudaloader.h"
-#include <nvrtc.h>
-#include <gmodule.h>
-
-GST_DEBUG_CATEGORY_STATIC (gst_cuda_nvrtc_debug);
-#define GST_CAT_DEFAULT gst_cuda_nvrtc_debug
-
-#ifndef G_OS_WIN32
-#define NVRTC_LIBNAME "libnvrtc.so"
-#else
-#define NVRTC_LIBNAME "nvrtc64_%d%d_0.dll"
-#endif
-
-#define LOAD_SYMBOL(name,func) G_STMT_START { \
-  if (!g_module_symbol (module, G_STRINGIFY (name), (gpointer *) &vtable->func)) { \
-    GST_ERROR ("Failed to load '%s', %s", G_STRINGIFY (name), g_module_error()); \
-    goto error; \
-  } \
-} G_STMT_END;
-
-/* *INDENT-OFF* */
-typedef struct _GstCudaNvrtcVTable
-{
-  gboolean loaded;
-
-  nvrtcResult (*NvrtcCompileProgram) (nvrtcProgram prog, int numOptions,
-      const char **options);
-  nvrtcResult (*NvrtcCreateProgram) (nvrtcProgram * prog, const char *src,
-      const char *name, int numHeaders, const char **headers,
-      const char **includeNames);
-  nvrtcResult (*NvrtcDestroyProgram) (nvrtcProgram * prog);
-  nvrtcResult (*NvrtcGetPTX) (nvrtcProgram prog, char *ptx);
-  nvrtcResult (*NvrtcGetPTXSize) (nvrtcProgram prog, size_t * ptxSizeRet);
-  nvrtcResult (*NvrtcGetProgramLog) (nvrtcProgram prog, char *log);
-  nvrtcResult (*NvrtcGetProgramLogSize) (nvrtcProgram prog,
-      size_t * logSizeRet);
-} GstCudaNvrtcVTable;
-/* *INDENT-ON* */
-
-static GstCudaNvrtcVTable gst_cuda_nvrtc_vtable = { 0, };
-
-#ifdef G_OS_WIN32
-static GModule *
-gst_cuda_nvrtc_load_library_once_win32 (void)
-{
-  gchar *dll_name = NULL;
-  GModule *module = NULL;
-  gint cuda_version;
-  gint cuda_major_version;
-  gint cuda_minor_version;
-  gint major, minor;
-  CUresult rst;
-
-  rst = CuDriverGetVersion (&cuda_version);
-  if (rst != CUDA_SUCCESS) {
-    GST_WARNING ("Couldn't get driver version, 0x%x", (guint) rst);
-    return NULL;
-  }
-
-  cuda_major_version = cuda_version / 1000;
-  cuda_minor_version = (cuda_version % 1000) / 10;
-
-  GST_INFO ("CUDA version %d / %d", cuda_major_version, cuda_minor_version);
-
-  /* First path for searching nvrtc library using system CUDA version */
-  for (minor = cuda_minor_version; minor >= 0; minor--) {
-    g_clear_pointer (&dll_name, g_free);
-    dll_name = g_strdup_printf (NVRTC_LIBNAME, cuda_major_version, minor);
-    module = g_module_open (dll_name, G_MODULE_BIND_LAZY);
-    if (module) {
-      GST_INFO ("%s is available", dll_name);
-      g_free (dll_name);
-      return module;
-    }
-
-    GST_DEBUG ("Couldn't open library %s", dll_name);
-  }
-
-  /* CUDA is a part for driever installation, but nvrtc library is a part of
-   * CUDA-toolkit. So CUDA-toolkit version may be lower than
-   * CUDA version. Do search the dll again */
-  for (major = cuda_major_version; major >= 9; major--) {
-    for (minor = 5; minor >= 0; minor--) {
-      g_clear_pointer (&dll_name, g_free);
-      dll_name = g_strdup_printf (NVRTC_LIBNAME, major, minor);
-      module = g_module_open (dll_name, G_MODULE_BIND_LAZY);
-      if (module) {
-        GST_INFO ("%s is available", dll_name);
-        g_free (dll_name);
-        return module;
-      }
-
-      GST_DEBUG ("Couldn't open library %s", dll_name);
-    }
-  }
-
-  g_free (dll_name);
-
-  return NULL;
-}
-#endif
-
-static gboolean
-gst_cuda_nvrtc_load_library_once (void)
-{
-  GModule *module = NULL;
-  const gchar *filename_env;
-  GstCudaNvrtcVTable *vtable;
-
-  filename_env = g_getenv ("GST_CUDA_NVRTC_LIBNAME");
-  if (filename_env)
-    module = g_module_open (filename_env, G_MODULE_BIND_LAZY);
-
-  if (!module) {
-#ifndef G_OS_WIN32
-    module = g_module_open (NVRTC_LIBNAME, G_MODULE_BIND_LAZY);
-#else
-    module = gst_cuda_nvrtc_load_library_once_win32 ();
-#endif
-  }
-
-  if (module == NULL) {
-    GST_WARNING ("Could not open nvrtc library %s", g_module_error ());
-    return FALSE;
-  }
-
-  vtable = &gst_cuda_nvrtc_vtable;
-
-  LOAD_SYMBOL (nvrtcCompileProgram, NvrtcCompileProgram);
-  LOAD_SYMBOL (nvrtcCreateProgram, NvrtcCreateProgram);
-  LOAD_SYMBOL (nvrtcDestroyProgram, NvrtcDestroyProgram);
-  LOAD_SYMBOL (nvrtcGetPTX, NvrtcGetPTX);
-  LOAD_SYMBOL (nvrtcGetPTXSize, NvrtcGetPTXSize);
-  LOAD_SYMBOL (nvrtcGetProgramLog, NvrtcGetProgramLog);
-  LOAD_SYMBOL (nvrtcGetProgramLogSize, NvrtcGetProgramLogSize);
-
-  vtable->loaded = TRUE;
-
-  return TRUE;
-
-error:
-  g_module_close (module);
-
-  return FALSE;
-}
-
-/**
- * gst_cuda_nvrtc_load_library:
- *
- * Loads the nvrtc library.
- *
- * Returns: %TRUE if the library could be loaded, %FALSE otherwise
- *
- * Since: 1.22
- */
-gboolean
-gst_cuda_nvrtc_load_library (void)
-{
-  static gsize init_once = 0;
-
-  if (g_once_init_enter (&init_once)) {
-    GST_DEBUG_CATEGORY_INIT (gst_cuda_nvrtc_debug, "cudanvrtc", 0,
-        "CUDA runtime compiler");
-    if (gst_cuda_load_library ())
-      gst_cuda_nvrtc_load_library_once ();
-    g_once_init_leave (&init_once, 1);
-  }
-
-  return gst_cuda_nvrtc_vtable.loaded;
-}
-
-/* *INDENT-OFF* */
-static nvrtcResult
-NvrtcCompileProgram (nvrtcProgram prog, int numOptions, const char **options)
-{
-  g_assert (gst_cuda_nvrtc_vtable.NvrtcCompileProgram != NULL);
-
-  return gst_cuda_nvrtc_vtable.NvrtcCompileProgram (prog, numOptions, options);
-}
-
-static nvrtcResult
-NvrtcCreateProgram (nvrtcProgram * prog, const char *src, const char *name,
-    int numHeaders, const char **headers, const char **includeNames)
-{
-  g_assert (gst_cuda_nvrtc_vtable.NvrtcCreateProgram != NULL);
-
-  return gst_cuda_nvrtc_vtable.NvrtcCreateProgram (prog, src, name, numHeaders,
-      headers, includeNames);
-}
-
-static nvrtcResult
-NvrtcDestroyProgram (nvrtcProgram * prog)
-{
-  g_assert (gst_cuda_nvrtc_vtable.NvrtcDestroyProgram != NULL);
-
-  return gst_cuda_nvrtc_vtable.NvrtcDestroyProgram (prog);
-}
-
-static nvrtcResult
-NvrtcGetPTX (nvrtcProgram prog, char *ptx)
-{
-  g_assert (gst_cuda_nvrtc_vtable.NvrtcGetPTX != NULL);
-
-  return gst_cuda_nvrtc_vtable.NvrtcGetPTX (prog, ptx);
-}
-
-static nvrtcResult
-NvrtcGetPTXSize (nvrtcProgram prog, size_t *ptxSizeRet)
-{
-  g_assert (gst_cuda_nvrtc_vtable.NvrtcGetPTXSize != NULL);
-
-  return gst_cuda_nvrtc_vtable.NvrtcGetPTXSize (prog, ptxSizeRet);
-}
-
-static nvrtcResult
-NvrtcGetProgramLog (nvrtcProgram prog, char *log)
-{
-  g_assert (gst_cuda_nvrtc_vtable.NvrtcGetProgramLog != NULL);
-
-  return gst_cuda_nvrtc_vtable.NvrtcGetProgramLog (prog, log);
-}
-
-static nvrtcResult
-NvrtcGetProgramLogSize (nvrtcProgram prog, size_t *logSizeRet)
-{
-  g_assert (gst_cuda_nvrtc_vtable.NvrtcGetProgramLogSize != NULL);
-
-  return gst_cuda_nvrtc_vtable.NvrtcGetProgramLogSize (prog, logSizeRet);
-}
-/* *INDENT-ON* */
-
-/**
- * gst_cuda_nvrtc_compile:
- * @source: Source code to compile
- *
- * Since: 1.22
- */
-gchar *
-gst_cuda_nvrtc_compile (const gchar * source)
-{
-  nvrtcProgram prog;
-  nvrtcResult ret;
-  CUresult curet;
-  const gchar *opts = { "--gpu-architecture=compute_30" };
-  gsize ptx_size;
-  gchar *ptx = NULL;
-  int driverVersion;
-
-  g_return_val_if_fail (source != NULL, NULL);
-
-  if (!gst_cuda_nvrtc_load_library ()) {
-    return NULL;
-  }
-
-  GST_TRACE ("CUDA kernel source \n%s", source);
-
-  curet = CuDriverGetVersion (&driverVersion);
-  if (curet != CUDA_SUCCESS) {
-    GST_ERROR ("Failed to query CUDA Driver version, ret %d", curet);
-    return NULL;
-  }
-
-  GST_DEBUG ("CUDA Driver Version %d.%d", driverVersion / 1000,
-      (driverVersion % 1000) / 10);
-
-  ret = NvrtcCreateProgram (&prog, source, NULL, 0, NULL, NULL);
-  if (ret != NVRTC_SUCCESS) {
-    GST_ERROR ("couldn't create nvrtc program, ret %d", ret);
-    return NULL;
-  }
-
-  /* Starting from CUDA 11, the lowest supported architecture is 5.2 */
-  if (driverVersion >= 11000)
-    opts0 = "--gpu-architecture=compute_52";
-
-  ret = NvrtcCompileProgram (prog, 1, opts);
-  if (ret != NVRTC_SUCCESS) {
-    gsize log_size;
-
-    GST_ERROR ("couldn't compile nvrtc program, ret %d", ret);
-    if (NvrtcGetProgramLogSize (prog, &log_size) == NVRTC_SUCCESS &&
-        log_size > 0) {
-      gchar *compile_log = g_alloca (log_size);
-      if (NvrtcGetProgramLog (prog, compile_log) == NVRTC_SUCCESS) {
-        GST_ERROR ("nvrtc compile log %s", compile_log);
-      }
-    }
-
-    goto error;
-  }
-
-  ret = NvrtcGetPTXSize (prog, &ptx_size);
-  if (ret != NVRTC_SUCCESS) {
-    GST_ERROR ("unknown ptx size, ret %d", ret);
-
-    goto error;
-  }
-
-  ptx = g_malloc0 (ptx_size);
-  ret = NvrtcGetPTX (prog, ptx);
-  if (ret != NVRTC_SUCCESS) {
-    GST_ERROR ("couldn't get ptx, ret %d", ret);
-    g_free (ptx);
-
-    goto error;
-  }
-
-  NvrtcDestroyProgram (&prog);
-
-  GST_TRACE ("compiled CUDA PTX %s\n", ptx);
-
-  return ptx;
-
-error:
-  NvrtcDestroyProgram (&prog);
-
-  return NULL;
-}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudautils.c Deleted

@@ -1,1621 +0,0 @@
-/* GStreamer
- * Copyright (C) <2018-2019> Seungha Yang <seungha.yang@navercorp.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstcudautils.h"
-#include "gstcudacontext.h"
-#include "gstcuda-private.h"
-
-#ifdef HAVE_NVCODEC_GST_GL
-#include <gst/gl/gl.h>
-#include <gst/gl/gstglfuncs.h>
-#endif
-
-#ifdef GST_CUDA_HAS_D3D
-#include <gst/d3d11/gstd3d11.h>
-#endif
-
-#ifdef HAVE_NVCODEC_NVMM
-#include "gstcudanvmm.h"
-#endif
-
-#include "gstcudamemory.h"
-
-GST_DEBUG_CATEGORY_STATIC (gst_cuda_utils_debug);
-#define GST_CAT_DEFAULT gst_cuda_utils_debug
-GST_DEBUG_CATEGORY_STATIC (GST_CAT_CONTEXT);
-
-static void
-_init_debug (void)
-{
-  static gsize once_init = 0;
-
-  if (g_once_init_enter (&once_init)) {
-
-    GST_DEBUG_CATEGORY_INIT (gst_cuda_utils_debug, "cudautils", 0,
-        "CUDA utils");
-    GST_DEBUG_CATEGORY_GET (GST_CAT_CONTEXT, "GST_CONTEXT");
-    g_once_init_leave (&once_init, 1);
-  }
-}
-
-static gboolean
-pad_query (const GValue * item, GValue * value, gpointer user_data)
-{
-  GstPad *pad = g_value_get_object (item);
-  GstQuery *query = user_data;
-  gboolean res;
-
-  res = gst_pad_peer_query (pad, query);
-
-  if (res) {
-    g_value_set_boolean (value, TRUE);
-    return FALSE;
-  }
-
-  GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, pad, "pad peer query failed");
-  return TRUE;
-}
-
-static gboolean
-run_query (GstElement * element, GstQuery * query, GstPadDirection direction)
-{
-  GstIterator *it;
-  GstIteratorFoldFunction func = pad_query;
-  GValue res = { 0 };
-
-  g_value_init (&res, G_TYPE_BOOLEAN);
-  g_value_set_boolean (&res, FALSE);
-
-  /* Ask neighbor */
-  if (direction == GST_PAD_SRC)
-    it = gst_element_iterate_src_pads (element);
-  else
-    it = gst_element_iterate_sink_pads (element);
-
-  while (gst_iterator_fold (it, func, &res, query) == GST_ITERATOR_RESYNC)
-    gst_iterator_resync (it);
-
-  gst_iterator_free (it);
-
-  return g_value_get_boolean (&res);
-}
-
-static void
-find_cuda_context (GstElement * element, GstCudaContext ** cuda_ctx)
-{
-  GstQuery *query;
-  GstContext *ctxt;
-
-  /*  1) Query downstream with GST_QUERY_CONTEXT for the context and
-   *      check if upstream already has a context of the specific type
-   *  2) Query upstream as above.
-   */
-  query = gst_query_new_context (GST_CUDA_CONTEXT_TYPE);
-  if (run_query (element, query, GST_PAD_SRC)) {
-    gst_query_parse_context (query, &ctxt);
-    if (ctxt) {
-      GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
-          "found context (%p) in downstream query", ctxt);
-      gst_element_set_context (element, ctxt);
-    }
-  }
-
-  /* although we found cuda context above, the element does not want
-   * to use the context. Then try to find from the other direction */
-  if (*cuda_ctx == NULL && run_query (element, query, GST_PAD_SINK)) {
-    gst_query_parse_context (query, &ctxt);
-    if (ctxt) {
-      GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
-          "found context (%p) in upstream query", ctxt);
-      gst_element_set_context (element, ctxt);
-    }
-  }
-
-  if (*cuda_ctx == NULL) {
-    /* 3) Post a GST_MESSAGE_NEED_CONTEXT message on the bus with
-     *    the required context type and afterwards check if a
-     *    usable context was set now. The message could
-     *    be handled by the parent bins of the element and the
-     *    application.
-     */
-    GstMessage *msg;
-
-    GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
-        "posting need context message");
-    msg = gst_message_new_need_context (GST_OBJECT_CAST (element),
-        GST_CUDA_CONTEXT_TYPE);
-    gst_element_post_message (element, msg);
-  }
-
-  /*
-   * Whomever responds to the need-context message performs a
-   * GstElement::set_context() with the required context in which the element
-   * is required to update the cuda_ctx or call gst_cuda_handle_set_context().
-   */
-
-  gst_query_unref (query);
-}
-
-static void
-context_set_cuda_context (GstContext * context, GstCudaContext * cuda_ctx)
-{
-  GstStructure *s;
-  guint device_id;
-
-  g_return_if_fail (context != NULL);
-
-  g_object_get (G_OBJECT (cuda_ctx), "cuda-device-id", &device_id, NULL);
-
-  GST_CAT_LOG (GST_CAT_CONTEXT,
-      "setting GstCudaContext(%" GST_PTR_FORMAT
-      ") with cuda-device-id %d on context(%" GST_PTR_FORMAT ")",
-      cuda_ctx, device_id, context);
-
-  s = gst_context_writable_structure (context);
-  gst_structure_set (s, GST_CUDA_CONTEXT_TYPE, GST_TYPE_CUDA_CONTEXT,
-      cuda_ctx, "cuda-device-id", G_TYPE_UINT, device_id, NULL);
-}
-
-/**
- * gst_cuda_ensure_element_context:
- * @element: the #GstElement running the query
- * @device_id: preferred device-id, pass device_id >=0 when
- *             the device_id explicitly required. Otherwise, set -1.
- * @cuda_ctx: (inout): the resulting #GstCudaContext
- *
- * Perform the steps necessary for retrieving a #GstCudaContext from the
- * surrounding elements or from the application using the #GstContext mechanism.
- *
- * If the content of @cuda_ctx is not %NULL, then no #GstContext query is
- * necessary for #GstCudaContext.
- *
- * Returns: whether a #GstCudaContext exists in @cuda_ctx
- *
- * Since: 1.22
- */
-gboolean
-gst_cuda_ensure_element_context (GstElement * element, gint device_id,
-    GstCudaContext ** cuda_ctx)
-{
-  guint target_device_id = 0;
-  gboolean ret = TRUE;
-  static GRecMutex lock;
-  static gsize init_lock_once = 0;
-
-  g_return_val_if_fail (element != NULL, FALSE);
-  g_return_val_if_fail (cuda_ctx != NULL, FALSE);
-
-  _init_debug ();
-  if (g_once_init_enter (&init_lock_once)) {
-    g_rec_mutex_init (&lock);
-    g_once_init_leave (&init_lock_once, 1);
-  }
-
-  g_rec_mutex_lock (&lock);
-
-  if (*cuda_ctx)
-    goto out;
-
-  find_cuda_context (element, cuda_ctx);
-  if (*cuda_ctx)
-    goto out;
-
-  if (device_id > 0)
-    target_device_id = device_id;
-
-  /* No available CUDA context in pipeline, create new one here */
-  *cuda_ctx = gst_cuda_context_new (target_device_id);
-
-  if (*cuda_ctx == NULL) {
-    GST_CAT_ERROR_OBJECT (GST_CAT_CONTEXT, element,
-        "Failed to create CUDA context with device-id %d", device_id);
-    ret = FALSE;
-  } else {
-    GstContext *context;
-    GstMessage *msg;
-
-    /* Propagate new CUDA context */
-
-    context = gst_context_new (GST_CUDA_CONTEXT_TYPE, TRUE);
-    context_set_cuda_context (context, *cuda_ctx);
-
-    gst_element_set_context (element, context);
-
-    GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
-        "posting have context (%p) message with CUDA context (%p)",
-        context, *cuda_ctx);
-    msg = gst_message_new_have_context (GST_OBJECT_CAST (element), context);
-    gst_element_post_message (GST_ELEMENT_CAST (element), msg);
-  }
-
-out:
-  g_rec_mutex_unlock (&lock);
-
-  return ret;
-}
-
-/**
- * gst_cuda_handle_set_context:
- * @element: a #GstElement
- * @context: a #GstContext
- * @device_id: preferred device-id, pass device_id >=0 when
- *             the device_id explicitly required. Otherwise, set -1.
- * @cuda_ctx: (inout) (transfer full): location of a #GstCudaContext
- *
- * Helper function for implementing #GstElementClass.set_context() in
- * CUDA capable elements.
- *
- * Retrieves the #GstCudaContext in @context and places the result in @cuda_ctx.
- *
- * Returns: whether the @cuda_ctx could be set successfully
- *
- * Since: 1.22
- */
-gboolean
-gst_cuda_handle_set_context (GstElement * element,
-    GstContext * context, gint device_id, GstCudaContext ** cuda_ctx)
-{
-  const gchar *context_type;
-
-  g_return_val_if_fail (element != NULL, FALSE);
-  g_return_val_if_fail (cuda_ctx != NULL, FALSE);
-
-  _init_debug ();
-
-  if (!context)
-    return FALSE;
-
-  context_type = gst_context_get_context_type (context);
-  if (g_strcmp0 (context_type, GST_CUDA_CONTEXT_TYPE) == 0) {
-    const GstStructure *str;
-    GstCudaContext *other_ctx = NULL;
-    guint other_device_id = 0;
-
-    /* If we had context already, will not replace it */
-    if (*cuda_ctx)
-      return TRUE;
-
-    str = gst_context_get_structure (context);
-    if (gst_structure_get (str, GST_CUDA_CONTEXT_TYPE, GST_TYPE_CUDA_CONTEXT,
-            &other_ctx, NULL)) {
-      g_object_get (other_ctx, "cuda-device-id", &other_device_id, NULL);
-
-      if (device_id == -1 || other_device_id == device_id) {
-        GST_CAT_DEBUG_OBJECT (GST_CAT_CONTEXT, element, "Found CUDA context");
-        *cuda_ctx = other_ctx;
-
-        return TRUE;
-      }
-
-      gst_object_unref (other_ctx);
-    }
-  }
-
-  return FALSE;
-}
-
-/**
- * gst_cuda_handle_context_query:
- * @element: a #GstElement
- * @query: a #GstQuery of type %GST_QUERY_CONTEXT
- * @cuda_ctx: (transfer none) (nullable): a #GstCudaContext
- *
- * Returns: Whether the @query was successfully responded to from the passed
- *          @context.
- *
- * Since: 1.22
- */
-gboolean
-gst_cuda_handle_context_query (GstElement * element,
-    GstQuery * query, GstCudaContext * cuda_ctx)
-{
-  const gchar *context_type;
-  GstContext *context, *old_context;
-
-  g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
-  g_return_val_if_fail (GST_IS_QUERY (query), FALSE);
-  g_return_val_if_fail (cuda_ctx == NULL
-      || GST_IS_CUDA_CONTEXT (cuda_ctx), FALSE);
-
-  _init_debug ();
-
-  GST_CAT_LOG_OBJECT (GST_CAT_CONTEXT, element,
-      "handle context query %" GST_PTR_FORMAT, query);
-  gst_query_parse_context_type (query, &context_type);
-
-  if (cuda_ctx && g_strcmp0 (context_type, GST_CUDA_CONTEXT_TYPE) == 0) {
-    gst_query_parse_context (query, &old_context);
-
-    if (old_context)
-      context = gst_context_copy (old_context);
-    else
-      context = gst_context_new (GST_CUDA_CONTEXT_TYPE, TRUE);
-
-    context_set_cuda_context (context, cuda_ctx);
-    gst_query_set_context (query, context);
-    gst_context_unref (context);
-    GST_CAT_DEBUG_OBJECT (GST_CAT_CONTEXT, element,
-        "successfully set %" GST_PTR_FORMAT " on %" GST_PTR_FORMAT, cuda_ctx,
-        query);
-
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
-/**
- * gst_context_new_cuda_context:
- * @cuda_ctx: (transfer none): a #GstCudaContext
- *
- * Returns: (transfer full): a new #GstContext embedding the @cuda_ctx
- *
- * Since: 1.22
- */
-GstContext *
-gst_context_new_cuda_context (GstCudaContext * cuda_ctx)
-{
-  GstContext *context;
-
-  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (cuda_ctx), NULL);
-
-  _init_debug ();
-
-  context = gst_context_new (GST_CUDA_CONTEXT_TYPE, TRUE);
-  context_set_cuda_context (context, cuda_ctx);
-
-  return context;
-}
-
-static const gchar *gst_cuda_quark_strings =
-    { "GstCudaQuarkGraphicsResource" };
-
-static GQuark gst_cuda_quark_tableGST_CUDA_QUARK_MAX;
-
-static void
-init_cuda_quark_once (void)
-{
-  static gsize once_init = 0;
-
-  if (g_once_init_enter (&once_init)) {
-    gint i;
-
-    for (i = 0; i < GST_CUDA_QUARK_MAX; i++)
-      gst_cuda_quark_tablei =
-          g_quark_from_static_string (gst_cuda_quark_stringsi);
-
-    g_once_init_leave (&once_init, 1);
-  }
-}
-
-/**
- * gst_cuda_quark_from_id: (skip)
- * @id: a #GstCudaQuarkId
- *
- * Returns: the GQuark for given @id or 0 if @id is unknown value
- *
- * Since: 1.22
- */
-GQuark
-gst_cuda_quark_from_id (GstCudaQuarkId id)
-{
-  g_return_val_if_fail (id < GST_CUDA_QUARK_MAX, 0);
-
-  init_cuda_quark_once ();
-  _init_debug ();
-
-  return gst_cuda_quark_tableid;
-}
-
-/**
- * gst_cuda_graphics_resource_new: (skip)
- * @context: (transfer none): a #GstCudaContext
- * @graphics_context: (transfer none) (nullable): a graphics API specific context object
- * @type: a #GstCudaGraphicsResourceType of resource registration
- *
- * Create new #GstCudaGraphicsResource with given @context and @type
- *
- * Returns: a new #GstCudaGraphicsResource.
- * Free with gst_cuda_graphics_resource_free
- *
- * Since: 1.22
- */
-GstCudaGraphicsResource *
-gst_cuda_graphics_resource_new (GstCudaContext *
-    context, GstObject * graphics_context, GstCudaGraphicsResourceType type)
-{
-  GstCudaGraphicsResource *resource;
-
-  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), NULL);
-
-  _init_debug ();
-
-  resource = g_new0 (GstCudaGraphicsResource, 1);
-  resource->cuda_context = gst_object_ref (context);
-  if (graphics_context)
-    resource->graphics_context = gst_object_ref (graphics_context);
-
-  return resource;
-}
-
-/**
- * gst_cuda_graphics_resource_register_gl_buffer: (skip)
- * @resource a #GstCudaGraphicsResource
- * @buffer: a GL buffer object
- * @flags: a `CUgraphicsRegisterFlags`
- *
- * Register the @buffer for access by CUDA.
- * Must be called from the gl context thread with current cuda context was
- * pushed on the current thread
- *
- * Returns: whether @buffer was registered or not
- *
- * Since: 1.22
- */
-gboolean
-gst_cuda_graphics_resource_register_gl_buffer (GstCudaGraphicsResource *
-    resource, guint buffer, CUgraphicsRegisterFlags flags)
-{
-  CUresult cuda_ret;
-
-  g_return_val_if_fail (resource != NULL, FALSE);
-  g_return_val_if_fail (resource->registered == FALSE, FALSE);
-
-  _init_debug ();
-
-  cuda_ret = CuGraphicsGLRegisterBuffer (&resource->resource, buffer, flags);
-
-  if (!gst_cuda_result (cuda_ret))
-    return FALSE;
-
-  resource->registered = TRUE;
-  resource->type = GST_CUDA_GRAPHICS_RESOURCE_GL_BUFFER;
-  resource->flags = flags;
-
-  return TRUE;
-}
-
-#ifdef G_OS_WIN32
-/**
- * gst_cuda_graphics_resource_register_d3d11_resource: (skip)
- * @resource a #GstCudaGraphicsResource
- * @d3d11_resource: a ID3D11Resource
- * @flags: a CUgraphicsRegisterFlags
- *
- * Register the @d3d11_resource for accessing by CUDA.
- * Must be called with d3d11 device lock with current cuda context was
- * pushed on the current thread
- *
- * Returns: whether @d3d11_resource was registered or not
- *
- * Since: 1.22
- */
-gboolean
-gst_cuda_graphics_resource_register_d3d11_resource (GstCudaGraphicsResource *
-    resource, ID3D11Resource * d3d11_resource, CUgraphicsRegisterFlags flags)
-{
-  CUresult cuda_ret;
-
-  g_return_val_if_fail (resource != NULL, FALSE);
-  g_return_val_if_fail (resource->registered == FALSE, FALSE);
-
-  _init_debug ();
-
-  cuda_ret = CuGraphicsD3D11RegisterResource (&resource->resource,
-      d3d11_resource, flags);
-
-  if (!gst_cuda_result (cuda_ret))
-    return FALSE;
-
-  resource->registered = TRUE;
-  resource->type = GST_CUDA_GRAPHICS_RESOURCE_D3D11_RESOURCE;
-  resource->flags = flags;
-
-  return TRUE;
-}
-#endif
-
-/**
- * gst_cuda_graphics_resource_unregister: (skip)
- * @resource: a #GstCudaGraphicsResource
- *
- * Unregister previously registered resource.
- * For GL resource, this method must be called from gl context thread.
- * Also, current cuda context should be pushed on the current thread
- * before calling this method.
- *
- * Since: 1.22
- */
-void
-gst_cuda_graphics_resource_unregister (GstCudaGraphicsResource * resource)
-{
-  g_return_if_fail (resource != NULL);
-
-  _init_debug ();
-
-  if (!resource->registered)
-    return;
-
-  gst_cuda_result (CuGraphicsUnregisterResource (resource->resource));
-  resource->resource = NULL;
-  resource->registered = FALSE;
-
-  return;
-}
-
-/**
- * gst_cuda_graphics_resource_map: (skip)
- * @resource: a #GstCudaGraphicsResource
- * @stream: a CUstream
- * @flags: a CUgraphicsMapResourceFlags
- *
- * Map previously registered resource with map flags
- *
- * Returns: (nullable): the `CUgraphicsResource` if successful or %NULL when failed
- *
- * Since: 1.22
- */
-CUgraphicsResource
-gst_cuda_graphics_resource_map (GstCudaGraphicsResource * resource,
-    CUstream stream, CUgraphicsMapResourceFlags flags)
-{
-  CUresult cuda_ret;
-
-  g_return_val_if_fail (resource != NULL, NULL);
-  g_return_val_if_fail (resource->registered != FALSE, NULL);
-
-  _init_debug ();
-
-  cuda_ret = CuGraphicsResourceSetMapFlags (resource->resource, flags);
-  if (!gst_cuda_result (cuda_ret))
-    return NULL;
-
-  cuda_ret = CuGraphicsMapResources (1, &resource->resource, stream);
-  if (!gst_cuda_result (cuda_ret))
-    return NULL;
-
-  resource->mapped = TRUE;
-
-  return resource->resource;
-}
-
-/**
- * gst_cuda_graphics_resource_unmap: (skip)
- * @resource: a #GstCudaGraphicsResource
- * @stream: a `CUstream`
- *
- * Unmap previously mapped resource
- *
- * Since: 1.22
- */
-void
-gst_cuda_graphics_resource_unmap (GstCudaGraphicsResource * resource,
-    CUstream stream)
-{
-  g_return_if_fail (resource != NULL);
-  g_return_if_fail (resource->registered != FALSE);
-
-  _init_debug ();
-
-  if (!resource->mapped)
-    return;
-
-  gst_cuda_result (CuGraphicsUnmapResources (1, &resource->resource, stream));
-
-  resource->mapped = FALSE;
-}
-
-#ifdef HAVE_NVCODEC_GST_GL
-static void
-unregister_resource_from_gl_thread (GstGLContext * gl_context,
-    GstCudaGraphicsResource * resource)
-{
-  GstCudaContext *cuda_context = resource->cuda_context;
-
-  if (!gst_cuda_context_push (cuda_context)) {
-    GST_WARNING_OBJECT (cuda_context, "failed to push CUDA context");
-    return;
-  }
-
-  gst_cuda_graphics_resource_unregister (resource);
-
-  if (!gst_cuda_context_pop (NULL)) {
-    GST_WARNING_OBJECT (cuda_context, "failed to pop CUDA context");
-  }
-}
-#endif
-
-#ifdef GST_CUDA_HAS_D3D
-static void
-unregister_d3d11_resource (GstCudaGraphicsResource * resource)
-{
-  GstCudaContext *cuda_context = resource->cuda_context;
-  GstD3D11Device *device = GST_D3D11_DEVICE (resource->graphics_context);
-
-  if (!gst_cuda_context_push (cuda_context)) {
-    GST_WARNING_OBJECT (cuda_context, "failed to push CUDA context");
-    return;
-  }
-
-  gst_d3d11_device_lock (device);
-  gst_cuda_graphics_resource_unregister (resource);
-  gst_d3d11_device_unlock (device);
-
-  if (!gst_cuda_context_pop (NULL)) {
-    GST_WARNING_OBJECT (cuda_context, "failed to pop CUDA context");
-  }
-}
-#endif
-
-/**
- * gst_cuda_graphics_resource_free: (skip)
- * @resource: a #GstCudaGraphicsResource
- *
- * Free @resource
- *
- * Since: 1.22
- */
-void
-gst_cuda_graphics_resource_free (GstCudaGraphicsResource * resource)
-{
-  g_return_if_fail (resource != NULL);
-
-  if (resource->registered) {
-#ifdef HAVE_NVCODEC_GST_GL
-    if (resource->type == GST_CUDA_GRAPHICS_RESOURCE_GL_BUFFER) {
-      gst_gl_context_thread_add ((GstGLContext *) resource->graphics_context,
-          (GstGLContextThreadFunc) unregister_resource_from_gl_thread,
-          resource);
-    } else
-#endif
-#ifdef GST_CUDA_HAS_D3D
-    if (resource->type == GST_CUDA_GRAPHICS_RESOURCE_D3D11_RESOURCE) {
-      unregister_d3d11_resource (resource);
-    } else
-#endif
-    {
-      /* FIXME: currently only opengl & d3d11 */
-      g_assert_not_reached ();
-    }
-  }
-
-  gst_object_unref (resource->cuda_context);
-  if (resource->graphics_context)
-    gst_object_unref (resource->graphics_context);
-  g_free (resource);
-}
-
-const gchar *
-gst_cuda_buffer_copy_type_to_string (GstCudaBufferCopyType type)
-{
-  switch (type) {
-    case GST_CUDA_BUFFER_COPY_SYSTEM:
-      return "SYSTEM";
-    case GST_CUDA_BUFFER_COPY_CUDA:
-      return "CUDA";
-    case GST_CUDA_BUFFER_COPY_GL:
-      return "GL";
-    case GST_CUDA_BUFFER_COPY_D3D11:
-      return "D3D11";
-    case GST_CUDA_BUFFER_COPY_NVMM:
-      return "NVMM";
-    default:
-      g_assert_not_reached ();
-      break;
-  }
-
-  return "UNKNOWN";
-}
-
-static gboolean
-gst_cuda_buffer_fallback_copy (GstBuffer * dst, const GstVideoInfo * dst_info,
-    GstBuffer * src, const GstVideoInfo * src_info)
-{
-  GstVideoFrame dst_frame, src_frame;
-  guint i, j;
-
-  if (!gst_video_frame_map (&dst_frame, dst_info, dst, GST_MAP_WRITE)) {
-    GST_ERROR ("Failed to map dst buffer");
-    return FALSE;
-  }
-
-  if (!gst_video_frame_map (&src_frame, src_info, src, GST_MAP_READ)) {
-    gst_video_frame_unmap (&dst_frame);
-    GST_ERROR ("Failed to map src buffer");
-    return FALSE;
-  }
-
-  /* src and dst resolutions can be different, pick min value */
-  for (i = 0; i < GST_VIDEO_FRAME_N_PLANES (&dst_frame); i++) {
-    guint dst_width_in_bytes, src_width_in_bytes;
-    guint dst_height, src_height;
-    guint width_in_bytes, height;
-    guint dst_stride, src_stride;
-    guint8 *dst_data, *src_data;
-
-    dst_width_in_bytes = GST_VIDEO_FRAME_COMP_WIDTH (&dst_frame, i) *
-        GST_VIDEO_FRAME_COMP_PSTRIDE (&dst_frame, i);
-    src_width_in_bytes = GST_VIDEO_FRAME_COMP_WIDTH (&src_frame, i) *
-        GST_VIDEO_FRAME_COMP_PSTRIDE (&src_frame, i);
-
-    width_in_bytes = MIN (dst_width_in_bytes, src_width_in_bytes);
-
-    dst_height = GST_VIDEO_FRAME_COMP_HEIGHT (&dst_frame, i);
-    src_height = GST_VIDEO_FRAME_COMP_HEIGHT (&src_frame, i);
-
-    height = MIN (dst_height, src_height);
-
-    dst_stride = GST_VIDEO_FRAME_PLANE_STRIDE (&dst_frame, i);
-    src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (&src_frame, i);
-
-    dst_data = GST_VIDEO_FRAME_PLANE_DATA (&dst_frame, i);
-    src_data = GST_VIDEO_FRAME_PLANE_DATA (&src_frame, i);
-
-    for (j = 0; j < height; j++) {
-      memcpy (dst_data, src_data, width_in_bytes);
-      dst_data += dst_stride;
-      src_data += src_stride;
-    }
-  }
-
-  gst_video_frame_unmap (&src_frame);
-  gst_video_frame_unmap (&dst_frame);
-
-  return TRUE;
-}
-
-static gboolean
-map_buffer_and_fill_copy2d (GstBuffer * buf, const GstVideoInfo * info,
-    GstCudaBufferCopyType copy_type, GstVideoFrame * frame,
-    GstMapInfo * map_info, gboolean is_src,
-    CUDA_MEMCPY2D copy_paramsGST_VIDEO_MAX_PLANES)
-{
-  gboolean buffer_mapped = FALSE;
-  guint i;
-
-#ifdef HAVE_NVCODEC_NVMM
-  if (copy_type == GST_CUDA_BUFFER_COPY_NVMM) {
-    NvBufSurface *surface;
-    NvBufSurfaceParams *surface_params;
-    NvBufSurfacePlaneParams *plane_params;
-
-    if (!gst_buffer_map (buf, map_info, GST_MAP_READ)) {
-      GST_ERROR ("Failed to map input NVMM buffer");
-      memset (map_info, 0, sizeof (GstMapInfo));
-      return FALSE;
-    }
-
-    surface = (NvBufSurface *) map_info->data;
-
-    GST_TRACE ("batch-size %d, num-filled %d, memType %d",
-        surface->batchSize, surface->numFilled, surface->memType);
-
-    surface_params = surface->surfaceList;
-    buffer_mapped = TRUE;
-    if (!surface_params) {
-      GST_ERROR ("NVMM memory doesn't hold buffer");
-      goto error;
-    }
-
-    plane_params = &surface_params->planeParams;
-    if (plane_params->num_planes != GST_VIDEO_INFO_N_PLANES (info)) {
-      GST_ERROR ("num_planes mismatch, %d / %d",
-          plane_params->num_planes, GST_VIDEO_INFO_N_PLANES (info));
-      goto error;
-    }
-
-    switch (surface->memType) {
-        /* TODO: NVBUF_MEM_DEFAULT on jetson is SURFACE_ARRAY */
-      case NVBUF_MEM_DEFAULT:
-      case NVBUF_MEM_CUDA_DEVICE:
-      {
-        for (i = 0; i < plane_params->num_planes; i++) {
-          if (is_src) {
-            copy_paramsi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
-            copy_paramsi.srcDevice = (CUdeviceptr)
-                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
-            copy_paramsi.srcPitch = plane_params->pitchi;
-          } else {
-            copy_paramsi.dstMemoryType = CU_MEMORYTYPE_DEVICE;
-            copy_paramsi.dstDevice = (CUdeviceptr)
-                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
-            copy_paramsi.dstPitch = plane_params->pitchi;
-          }
-        }
-        break;
-      }
-      case NVBUF_MEM_CUDA_PINNED:
-      {
-        for (i = 0; i < plane_params->num_planes; i++) {
-          if (is_src) {
-            copy_paramsi.srcMemoryType = CU_MEMORYTYPE_HOST;
-            copy_paramsi.srcHost =
-                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
-            copy_paramsi.srcPitch = plane_params->pitchi;
-          } else {
-            copy_paramsi.dstMemoryType = CU_MEMORYTYPE_HOST;
-            copy_paramsi.dstHost =
-                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
-            copy_paramsi.dstPitch = plane_params->pitchi;
-          }
-        }
-        break;
-      }
-      case NVBUF_MEM_CUDA_UNIFIED:
-      {
-        for (i = 0; i < plane_params->num_planes; i++) {
-          if (is_src) {
-            copy_paramsi.srcMemoryType = CU_MEMORYTYPE_UNIFIED;
-            copy_paramsi.srcDevice = (CUdeviceptr)
-                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
-            copy_paramsi.srcPitch = plane_params->pitchi;
-          } else {
-            copy_paramsi.dstMemoryType = CU_MEMORYTYPE_UNIFIED;
-            copy_paramsi.dstDevice = (CUdeviceptr)
-                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
-            copy_paramsi.dstPitch = plane_params->pitchi;
-          }
-        }
-        break;
-      }
-      default:
-        GST_ERROR ("Unexpected NVMM memory type %d", surface->memType);
-        goto error;
-    }
-
-    for (i = 0; i < plane_params->num_planes; i++) {
-      gsize width_in_bytes, height;
-
-      width_in_bytes = plane_params->widthi * plane_params->bytesPerPixi;
-      height = plane_params->heighti;
-
-      if (copy_paramsi.WidthInBytes == 0 ||
-          width_in_bytes < copy_paramsi.WidthInBytes) {
-        copy_paramsi.WidthInBytes = width_in_bytes;
-      }
-
-      if (copy_paramsi.Height == 0 || height < copy_paramsi.Height) {
-        copy_paramsi.Height = height;
-      }
-    }
-  } else
-#endif
-  {
-    GstMapFlags map_flags;
-
-    if (is_src)
-      map_flags = GST_MAP_READ;
-    else
-      map_flags = GST_MAP_WRITE;
-
-    if (copy_type == GST_CUDA_BUFFER_COPY_CUDA)
-      map_flags |= GST_MAP_CUDA;
-
-    if (!gst_video_frame_map (frame, info, buf, map_flags)) {
-      GST_ERROR ("Failed to map buffer");
-      goto error;
-    }
-
-    for (i = 0; i < GST_VIDEO_FRAME_N_PLANES (frame); i++) {
-      gsize width_in_bytes, height;
-
-      if (is_src) {
-        if (copy_type == GST_CUDA_BUFFER_COPY_CUDA) {
-          copy_paramsi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
-          copy_paramsi.srcDevice =
-              (CUdeviceptr) GST_VIDEO_FRAME_PLANE_DATA (frame, i);
-        } else {
-          copy_paramsi.srcMemoryType = CU_MEMORYTYPE_HOST;
-          copy_paramsi.srcHost = GST_VIDEO_FRAME_PLANE_DATA (frame, i);
-        }
-        copy_paramsi.srcPitch = GST_VIDEO_FRAME_PLANE_STRIDE (frame, i);
-      } else {
-        if (copy_type == GST_CUDA_BUFFER_COPY_CUDA) {
-          copy_paramsi.dstMemoryType = CU_MEMORYTYPE_DEVICE;
-          copy_paramsi.dstDevice =
-              (CUdeviceptr) GST_VIDEO_FRAME_PLANE_DATA (frame, i);
-        } else {
-          copy_paramsi.dstMemoryType = CU_MEMORYTYPE_HOST;
-          copy_paramsi.dstHost = GST_VIDEO_FRAME_PLANE_DATA (frame, i);
-        }
-        copy_paramsi.dstPitch = GST_VIDEO_FRAME_PLANE_STRIDE (frame, i);
-      }
-
-      width_in_bytes = GST_VIDEO_FRAME_COMP_WIDTH (frame, i) *
-          GST_VIDEO_FRAME_COMP_PSTRIDE (frame, i);
-      height = GST_VIDEO_FRAME_COMP_HEIGHT (frame, i);
-
-      if (copy_paramsi.WidthInBytes == 0 ||
-          width_in_bytes < copy_paramsi.WidthInBytes) {
-        copy_paramsi.WidthInBytes = width_in_bytes;
-      }
-
-      if (copy_paramsi.Height == 0 || height < copy_paramsi.Height) {
-        copy_paramsi.Height = height;
-      }
-    }
-  }
-
-  return TRUE;
-
-error:
-  if (buffer_mapped) {
-    gst_buffer_unmap (buf, map_info);
-    memset (map_info, 0, sizeof (GstMapInfo));
-  }
-
-  return FALSE;
-}
-
-static void
-unmap_buffer_or_frame (GstBuffer * buf, GstVideoFrame * frame,
-    GstMapInfo * map_info)
-{
-  if (frame->buffer)
-    gst_video_frame_unmap (frame);
-
-  if (map_info->data)
-    gst_buffer_unmap (buf, map_info);
-}
-
-static gboolean
-gst_cuda_buffer_copy_internal (GstBuffer * dst_buf,
-    GstCudaBufferCopyType dst_type, const GstVideoInfo * dst_info,
-    GstBuffer * src_buf, GstCudaBufferCopyType src_type,
-    const GstVideoInfo * src_info, GstCudaContext * context, CUstream stream)
-{
-  GstVideoFrame dst_frame, src_frame;
-  gboolean ret = FALSE;
-  GstMapInfo dst_map, src_map;
-  guint i;
-  CUDA_MEMCPY2D copy_paramsGST_VIDEO_MAX_PLANES;
-
-  memset (copy_params, 0, sizeof (copy_params));
-  memset (&dst_frame, 0, sizeof (GstVideoFrame));
-  memset (&src_frame, 0, sizeof (GstVideoFrame));
-  memset (&dst_map, 0, sizeof (GstMapInfo));
-  memset (&src_map, 0, sizeof (GstMapInfo));
-
-  if (!map_buffer_and_fill_copy2d (dst_buf, dst_info,
-          dst_type, &dst_frame, &dst_map, FALSE, copy_params)) {
-    GST_ERROR_OBJECT (context, "Failed to map output buffer");
-    return FALSE;
-  }
-
-  if (!map_buffer_and_fill_copy2d (src_buf, src_info,
-          src_type, &src_frame, &src_map, TRUE, copy_params)) {
-    GST_ERROR_OBJECT (context, "Failed to map input buffer");
-    unmap_buffer_or_frame (dst_buf, &dst_frame, &dst_map);
-    return FALSE;
-  }
-
-  if (!gst_cuda_context_push (context)) {
-    GST_ERROR_OBJECT (context, "Failed to push our context");
-    goto unmap_and_out;
-  }
-
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (dst_info); i++) {
-    ret = gst_cuda_result (CuMemcpy2DAsync (&copy_paramsi, stream));
-    if (!ret) {
-      GST_ERROR_OBJECT (context, "Failed to copy plane %d", i);
-      break;
-    }
-  }
-
-  gst_cuda_result (CuStreamSynchronize (stream));
-  gst_cuda_context_pop (NULL);
-
-unmap_and_out:
-  unmap_buffer_or_frame (dst_buf, &src_frame, &src_map);
-  unmap_buffer_or_frame (src_buf, &dst_frame, &dst_map);
-
-  return ret;
-}
-
-#ifdef HAVE_NVCODEC_GST_GL
-static gboolean
-ensure_gl_interop (void)
-{
-  guint device_count = 0;
-  CUdevice device_list1 = { 0, };
-  CUresult cuda_ret;
-
-  cuda_ret = CuGLGetDevices (&device_count,
-      device_list, 1, CU_GL_DEVICE_LIST_ALL);
-
-  if (cuda_ret != CUDA_SUCCESS || device_count == 0)
-    return FALSE;
-
-  return TRUE;
-}
-
-typedef struct _GLCopyData
-{
-  GstBuffer *src_buf;
-  const GstVideoInfo *src_info;
-  GstBuffer *dst_buf;
-  const GstVideoInfo *dst_info;
-
-  gboolean pbo_to_cuda;
-  GstCudaBufferCopyType copy_type;
-  GstCudaContext *context;
-  CUstream stream;
-  gboolean ret;
-} GLCopyData;
-
-static GstCudaGraphicsResource *
-ensure_cuda_gl_graphics_resource (GstCudaContext * context, GstMemory * mem)
-{
-  GQuark quark;
-  GstCudaGraphicsResource *ret = NULL;
-
-  if (!gst_is_gl_memory_pbo (mem)) {
-    GST_WARNING_OBJECT (context, "memory is not GL PBO memory, %s",
-        mem->allocator->mem_type);
-    return NULL;
-  }
-
-  quark = gst_cuda_quark_from_id (GST_CUDA_QUARK_GRAPHICS_RESOURCE);
-  ret = (GstCudaGraphicsResource *)
-      gst_mini_object_get_qdata (GST_MINI_OBJECT (mem), quark);
-
-  if (!ret) {
-    GstGLMemoryPBO *pbo;
-    GstGLBuffer *buf;
-    GstMapInfo info;
-
-    ret = gst_cuda_graphics_resource_new (context,
-        GST_OBJECT (GST_GL_BASE_MEMORY_CAST (mem)->context),
-        GST_CUDA_GRAPHICS_RESOURCE_GL_BUFFER);
-
-    if (!gst_memory_map (mem, &info, (GstMapFlags) (GST_MAP_READ | GST_MAP_GL))) {
-      GST_ERROR_OBJECT (context, "Failed to map gl memory");
-      gst_cuda_graphics_resource_free (ret);
-      return NULL;
-    }
-
-    pbo = (GstGLMemoryPBO *) mem;
-    buf = pbo->pbo;
-
-    if (!gst_cuda_graphics_resource_register_gl_buffer (ret,
-            buf->id, CU_GRAPHICS_REGISTER_FLAGS_NONE)) {
-      GST_ERROR_OBJECT (context, "Failed to register gl buffer");
-      gst_memory_unmap (mem, &info);
-      gst_cuda_graphics_resource_free (ret);
-
-      return NULL;
-    }
-
-    gst_memory_unmap (mem, &info);
-
-    gst_mini_object_set_qdata (GST_MINI_OBJECT (mem), quark, ret,
-        (GDestroyNotify) gst_cuda_graphics_resource_free);
-  }
-
-  return ret;
-}
-
-static void
-gl_copy_thread_func (GstGLContext * gl_context, GLCopyData * data)
-{
-  GstCudaGraphicsResource *resourcesGST_VIDEO_MAX_PLANES;
-  guint num_resources;
-  GstBuffer *gl_buf, *cuda_buf;
-  GstVideoFrame cuda_frame;
-  GstMapInfo cuda_map_info;
-  CUDA_MEMCPY2D copy_paramsGST_VIDEO_MAX_PLANES;
-  guint i;
-  GstCudaContext *context = data->context;
-  CUstream stream = data->stream;
-
-  memset (copy_params, 0, sizeof (copy_params));
-  memset (&cuda_frame, 0, sizeof (GstVideoFrame));
-  memset (&cuda_map_info, 0, sizeof (GstMapInfo));
-
-  data->ret = FALSE;
-
-  /* Incompatible gl context */
-  if (!ensure_gl_interop ())
-    return;
-
-  if (data->pbo_to_cuda) {
-    gl_buf = data->src_buf;
-    cuda_buf = data->dst_buf;
-
-    if (!map_buffer_and_fill_copy2d (cuda_buf,
-            data->dst_info, data->copy_type, &cuda_frame, &cuda_map_info,
-            FALSE, copy_params)) {
-      GST_ERROR_OBJECT (context, "Failed to map output CUDA buffer");
-      return;
-    }
-  } else {
-    gl_buf = data->dst_buf;
-    cuda_buf = data->src_buf;
-
-    if (!map_buffer_and_fill_copy2d (cuda_buf,
-            data->src_info, data->copy_type, &cuda_frame, &cuda_map_info,
-            TRUE, copy_params)) {
-      GST_ERROR_OBJECT (context, "Failed to map input CUDA buffer");
-      return;
-    }
-  }
-
-  num_resources = gst_buffer_n_memory (gl_buf);
-  g_assert (num_resources >= GST_VIDEO_INFO_N_PLANES (data->src_info));
-
-  if (!gst_cuda_context_push (context)) {
-    GST_ERROR_OBJECT (context, "Failed to push context");
-    unmap_buffer_or_frame (cuda_buf, &cuda_frame, &cuda_map_info);
-    return;
-  }
-
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (data->src_info); i++) {
-    GstMemory *mem = gst_buffer_peek_memory (gl_buf, i);
-    GstGLMemoryPBO *pbo;
-
-    resourcesi = ensure_cuda_gl_graphics_resource (context, mem);
-    if (!resourcesi)
-      goto out;
-
-    pbo = (GstGLMemoryPBO *) mem;
-    if (!data->pbo_to_cuda) {
-      /* Need PBO -> texture */
-      GST_MINI_OBJECT_FLAG_SET (mem, GST_GL_BASE_MEMORY_TRANSFER_NEED_UPLOAD);
-
-      /* PBO -> sysmem */
-      GST_MINI_OBJECT_FLAG_SET (pbo->pbo,
-          GST_GL_BASE_MEMORY_TRANSFER_NEED_DOWNLOAD);
-    } else {
-      /* get the texture into the PBO */
-      gst_gl_memory_pbo_upload_transfer (pbo);
-      gst_gl_memory_pbo_download_transfer (pbo);
-    }
-  }
-
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (data->src_info); i++) {
-    CUgraphicsResource cuda_resource;
-    CUdeviceptr dev_ptr;
-    size_t size;
-    gboolean copy_ret;
-    gsize width_in_bytes, height;
-
-    if (data->pbo_to_cuda) {
-      cuda_resource =
-          gst_cuda_graphics_resource_map (resourcesi, stream,
-          CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY);
-    } else {
-      cuda_resource =
-          gst_cuda_graphics_resource_map (resourcesi, stream,
-          CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD);
-    }
-
-    if (!cuda_resource) {
-      GST_ERROR_OBJECT (context, "Failed to map graphics resource %d", i);
-      goto out;
-    }
-
-    if (!gst_cuda_result (CuGraphicsResourceGetMappedPointer (&dev_ptr, &size,
-                cuda_resource))) {
-      gst_cuda_graphics_resource_unmap (resourcesi, stream);
-      GST_ERROR_OBJECT (context, "Failed to get mapped pointer");
-      goto out;
-    }
-
-    if (data->pbo_to_cuda) {
-      copy_paramsi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
-      copy_paramsi.srcDevice = dev_ptr;
-      copy_paramsi.srcPitch = GST_VIDEO_INFO_PLANE_STRIDE (data->src_info, i);
-
-      width_in_bytes = GST_VIDEO_INFO_COMP_WIDTH (data->src_info, i) *
-          GST_VIDEO_INFO_COMP_PSTRIDE (data->src_info, i);
-      height = GST_VIDEO_INFO_COMP_HEIGHT (data->src_info, i);
-    } else {
-      copy_paramsi.dstMemoryType = CU_MEMORYTYPE_DEVICE;
-      copy_paramsi.dstDevice = dev_ptr;
-      copy_paramsi.dstPitch = GST_VIDEO_INFO_PLANE_STRIDE (data->dst_info, i);
-
-      width_in_bytes = GST_VIDEO_INFO_COMP_WIDTH (data->dst_info, i) *
-          GST_VIDEO_INFO_COMP_PSTRIDE (data->dst_info, i);
-      height = GST_VIDEO_INFO_COMP_HEIGHT (data->dst_info, i);
-    }
-
-    if (width_in_bytes < copy_paramsi.WidthInBytes)
-      copy_paramsi.WidthInBytes = width_in_bytes;
-
-    if (height < copy_paramsi.Height)
-      copy_paramsi.Height = height;
-
-    copy_ret = gst_cuda_result (CuMemcpy2DAsync (&copy_paramsi, stream));
-    gst_cuda_graphics_resource_unmap (resourcesi, stream);
-
-    if (!copy_ret) {
-      GST_ERROR_OBJECT (context, "Failed to copy plane %d", i);
-      goto out;
-    }
-  }
-
-  data->ret = TRUE;
-
-out:
-  gst_cuda_result (CuStreamSynchronize (stream));
-  gst_cuda_context_pop (NULL);
-  unmap_buffer_or_frame (cuda_buf, &cuda_frame, &cuda_map_info);
-}
-
-static gboolean
-cuda_copy_gl_interop (GstBuffer * dst_buf, const GstVideoInfo * dst_info,
-    GstBuffer * src_buf, const GstVideoInfo * src_info,
-    GstGLContext * gl_context, GstCudaContext * context, CUstream stream,
-    gboolean pbo_to_cuda, GstCudaBufferCopyType copy_type)
-{
-  GLCopyData data;
-
-  g_assert (copy_type == GST_CUDA_BUFFER_COPY_CUDA ||
-      copy_type == GST_CUDA_BUFFER_COPY_NVMM);
-
-  data.src_buf = src_buf;
-  data.src_info = src_info;
-  data.dst_buf = dst_buf;
-  data.dst_info = dst_info;
-  data.pbo_to_cuda = pbo_to_cuda;
-  data.copy_type = copy_type;
-  data.context = context;
-  data.stream = stream;
-  data.ret = FALSE;
-
-  gst_gl_context_thread_add (gl_context,
-      (GstGLContextThreadFunc) gl_copy_thread_func, &data);
-
-  return data.ret;
-}
-#endif
-
-#ifdef GST_CUDA_HAS_D3D
-static gboolean
-ensure_d3d11_interop (GstCudaContext * context, GstD3D11Device * device)
-{
-  guint device_count = 0;
-  guint cuda_device_id;
-  CUdevice device_list1 = { 0, };
-  CUresult cuda_ret;
-
-  g_object_get (context, "cuda-device-id", &cuda_device_id, NULL);
-
-  cuda_ret = CuD3D11GetDevices (&device_count,
-      device_list, 1, gst_d3d11_device_get_device_handle (device),
-      CU_D3D11_DEVICE_LIST_ALL);
-
-  if (cuda_ret != CUDA_SUCCESS || device_count == 0)
-    return FALSE;
-
-  if (device_list0 != (CUdevice) cuda_device_id)
-    return FALSE;
-
-  return TRUE;
-}
-
-static GstCudaGraphicsResource *
-ensure_cuda_d3d11_graphics_resource (GstCudaContext * context, GstMemory * mem)
-{
-  GQuark quark;
-  GstCudaGraphicsResource *ret = NULL;
-
-  if (!gst_is_d3d11_memory (mem)) {
-    GST_WARNING_OBJECT (context, "memory is not D3D11 memory, %s",
-        mem->allocator->mem_type);
-    return NULL;
-  }
-
-  quark = gst_cuda_quark_from_id (GST_CUDA_QUARK_GRAPHICS_RESOURCE);
-  ret = (GstCudaGraphicsResource *)
-      gst_mini_object_get_qdata (GST_MINI_OBJECT (mem), quark);
-
-  if (!ret) {
-    ret = gst_cuda_graphics_resource_new (context,
-        GST_OBJECT (GST_D3D11_MEMORY_CAST (mem)->device),
-        GST_CUDA_GRAPHICS_RESOURCE_D3D11_RESOURCE);
-
-    if (!gst_cuda_graphics_resource_register_d3d11_resource (ret,
-            gst_d3d11_memory_get_resource_handle (GST_D3D11_MEMORY_CAST (mem)),
-            CU_GRAPHICS_REGISTER_FLAGS_SURFACE_LOAD_STORE)) {
-      GST_ERROR_OBJECT (context, "failed to register d3d11 resource");
-      gst_cuda_graphics_resource_free (ret);
-
-      return NULL;
-    }
-
-    gst_mini_object_set_qdata (GST_MINI_OBJECT (mem), quark, ret,
-        (GDestroyNotify) gst_cuda_graphics_resource_free);
-  }
-
-  return ret;
-}
-
-static gboolean
-cuda_copy_d3d11_interop (GstBuffer * dst_buf, const GstVideoInfo * dst_info,
-    GstBuffer * src_buf, const GstVideoInfo * src_info, GstD3D11Device * device,
-    GstCudaContext * context, CUstream stream, gboolean d3d11_to_cuda)
-{
-  GstCudaGraphicsResource *resourcesGST_VIDEO_MAX_PLANES;
-  D3D11_TEXTURE2D_DESC descGST_VIDEO_MAX_PLANES;
-  guint num_resources;
-  GstBuffer *d3d11_buf, *cuda_buf;
-  GstVideoFrame d3d11_frame, cuda_frame;
-  GstMapInfo cuda_map_info;
-  CUDA_MEMCPY2D copy_paramsGST_VIDEO_MAX_PLANES;
-  guint i;
-  gboolean ret = FALSE;
-
-  memset (copy_params, 0, sizeof (copy_params));
-  memset (&cuda_frame, 0, sizeof (GstVideoFrame));
-  memset (&cuda_map_info, 0, sizeof (GstMapInfo));
-
-  /* Incompatible d3d11 device */
-  if (!ensure_d3d11_interop (context, device))
-    return FALSE;
-
-  if (d3d11_to_cuda) {
-    d3d11_buf = src_buf;
-    cuda_buf = dst_buf;
-    if (!gst_video_frame_map (&d3d11_frame, src_info, d3d11_buf,
-            GST_MAP_READ | GST_MAP_D3D11)) {
-      GST_ERROR_OBJECT (context, "Failed to map input D3D11 buffer");
-      return FALSE;
-    }
-    if (!map_buffer_and_fill_copy2d (cuda_buf,
-            dst_info, GST_CUDA_BUFFER_COPY_CUDA, &cuda_frame, &cuda_map_info,
-            FALSE, copy_params)) {
-      GST_ERROR_OBJECT (context, "Failed to map output CUDA buffer");
-      gst_video_frame_unmap (&d3d11_frame);
-      return FALSE;
-    }
-  } else {
-    d3d11_buf = dst_buf;
-    cuda_buf = src_buf;
-    if (!gst_video_frame_map (&d3d11_frame, dst_info, d3d11_buf,
-            GST_MAP_WRITE | GST_MAP_D3D11)) {
-      GST_ERROR_OBJECT (context, "Failed to map output D3D11 buffer");
-      return FALSE;
-    }
-    if (!map_buffer_and_fill_copy2d (cuda_buf,
-            src_info, GST_CUDA_BUFFER_COPY_CUDA, &cuda_frame, &cuda_map_info,
-            TRUE, copy_params)) {
-      GST_ERROR_OBJECT (context, "Failed to map input CUDA buffer");
-      gst_video_frame_unmap (&d3d11_frame);
-      return FALSE;
-    }
-  }
-
-  num_resources = gst_buffer_n_memory (d3d11_buf);
-  g_assert (num_resources >= GST_VIDEO_FRAME_N_PLANES (&d3d11_frame));
-
-  if (!gst_cuda_context_push (context)) {
-    GST_ERROR_OBJECT (context, "Failed to push context");
-    gst_video_frame_unmap (&d3d11_frame);
-    unmap_buffer_or_frame (cuda_buf, &cuda_frame, &cuda_map_info);
-    return FALSE;
-  }
-
-  for (i = 0; i < GST_VIDEO_FRAME_N_PLANES (&d3d11_frame); i++) {
-    GstMemory *mem = gst_buffer_peek_memory (d3d11_buf, i);
-
-    resourcesi = ensure_cuda_d3d11_graphics_resource (context, mem);
-    if (!resourcesi
-        || !gst_d3d11_memory_get_texture_desc (GST_D3D11_MEMORY_CAST (mem),
-            &desci))
-      goto out;
-  }
-
-  for (i = 0; i < GST_VIDEO_FRAME_N_PLANES (&d3d11_frame); i++) {
-    CUgraphicsResource cuda_resource;
-    CUarray d3d11_array;
-    gboolean copy_ret;
-
-    if (d3d11_to_cuda) {
-      cuda_resource =
-          gst_cuda_graphics_resource_map (resourcesi, stream,
-          CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY);
-    } else {
-      cuda_resource =
-          gst_cuda_graphics_resource_map (resourcesi, stream,
-          CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD);
-    }
-
-    if (!cuda_resource) {
-      GST_ERROR_OBJECT (context, "Failed to map graphics resource %d", i);
-      goto out;
-    }
-
-    if (!gst_cuda_result (CuGraphicsSubResourceGetMappedArray (&d3d11_array,
-                cuda_resource, 0, 0))) {
-      gst_cuda_graphics_resource_unmap (resourcesi, stream);
-      GST_ERROR_OBJECT (context, "Failed to get mapped array");
-      goto out;
-    }
-
-    if (d3d11_to_cuda) {
-      copy_paramsi.srcMemoryType = CU_MEMORYTYPE_ARRAY;
-      copy_paramsi.srcArray = d3d11_array;
-      copy_paramsi.srcPitch =
-          desci.Width * GST_VIDEO_FRAME_COMP_PSTRIDE (&d3d11_frame, i);
-    } else {
-      copy_paramsi.dstMemoryType = CU_MEMORYTYPE_ARRAY;
-      copy_paramsi.dstArray = d3d11_array;
-      copy_paramsi.dstPitch =
-          desci.Width * GST_VIDEO_FRAME_COMP_PSTRIDE (&d3d11_frame, i);
-    }
-
-    copy_ret = gst_cuda_result (CuMemcpy2DAsync (&copy_paramsi, stream));
-    gst_cuda_graphics_resource_unmap (resourcesi, stream);
-
-    if (!copy_ret) {
-      GST_ERROR_OBJECT (context, "Failed to copy plane %d", i);
-      goto out;
-    }
-  }
-
-  ret = TRUE;
-
-out:
-  gst_cuda_result (CuStreamSynchronize (stream));
-  gst_cuda_context_pop (NULL);
-  gst_video_frame_unmap (&d3d11_frame);
-  unmap_buffer_or_frame (cuda_buf, &cuda_frame, &cuda_map_info);
-
-  return ret;
-}
-#endif
-
-gboolean
-gst_cuda_buffer_copy (GstBuffer * dst, GstCudaBufferCopyType dst_type,
-    const GstVideoInfo * dst_info, GstBuffer * src,
-    GstCudaBufferCopyType src_type, const GstVideoInfo * src_info,
-    GstCudaContext * context, CUstream stream)
-{
-  gboolean use_copy_2d = FALSE;
-  GstMemory *dst_mem, *src_mem;
-#ifdef GST_CUDA_HAS_D3D
-  D3D11_TEXTURE2D_DESC desc;
-#endif
-  GstCudaContext *cuda_context;
-
-  g_return_val_if_fail (GST_IS_BUFFER (dst), FALSE);
-  g_return_val_if_fail (dst_info != NULL, FALSE);
-  g_return_val_if_fail (GST_IS_BUFFER (src), FALSE);
-  g_return_val_if_fail (src_info != NULL, FALSE);
-  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), FALSE);
-
-  _init_debug ();
-
-  if (dst_type == GST_CUDA_BUFFER_COPY_NVMM &&
-      src_type == GST_CUDA_BUFFER_COPY_NVMM) {
-    GST_ERROR_OBJECT (context, "Not supported copy NVMM -> NVMM");
-    return FALSE;
-  }
-
-  if (GST_VIDEO_INFO_FORMAT (dst_info) != GST_VIDEO_INFO_FORMAT (src_info)) {
-    GST_ERROR_OBJECT (context,
-        "Copy between different format is not supported");
-    return FALSE;
-  }
-
-  if (dst_type == GST_CUDA_BUFFER_COPY_CUDA ||
-      dst_type == GST_CUDA_BUFFER_COPY_NVMM ||
-      src_type == GST_CUDA_BUFFER_COPY_CUDA ||
-      src_type == GST_CUDA_BUFFER_COPY_NVMM) {
-    use_copy_2d = TRUE;
-  }
-
-  if (!use_copy_2d) {
-    GST_TRACE_OBJECT (context, "Not a device memory, use system memory copy");
-    return gst_cuda_buffer_fallback_copy (dst, dst_info, src, src_info);
-  }
-
-  dst_mem = gst_buffer_peek_memory (dst, 0);
-  src_mem = gst_buffer_peek_memory (src, 0);
-
-#ifdef HAVE_NVCODEC_GST_GL
-  if (src_type == GST_CUDA_BUFFER_COPY_GL && gst_is_gl_memory_pbo (src_mem)) {
-    GstGLMemory *gl_mem = (GstGLMemory *) src_mem;
-    GstGLContext *gl_context = gl_mem->mem.context;
-    GstCudaContext *cuda_context = context;
-
-    if (dst_type == GST_CUDA_BUFFER_COPY_CUDA && gst_is_cuda_memory (dst_mem))
-      cuda_context = GST_CUDA_MEMORY_CAST (dst_mem)->context;
-
-    GST_TRACE_OBJECT (context, "GL -> %s",
-        gst_cuda_buffer_copy_type_to_string (dst_type));
-
-    return cuda_copy_gl_interop (dst, dst_info, src, src_info, gl_context,
-        cuda_context, stream, TRUE, dst_type);
-  }
-
-  if (dst_type == GST_CUDA_BUFFER_COPY_GL && gst_is_gl_memory_pbo (dst_mem)) {
-    GstGLMemory *gl_mem = (GstGLMemory *) dst_mem;
-    GstGLContext *gl_context = gl_mem->mem.context;
-    GstCudaContext *cuda_context = context;
-
-    if (src_type == GST_CUDA_BUFFER_COPY_CUDA && gst_is_cuda_memory (src_mem))
-      cuda_context = GST_CUDA_MEMORY_CAST (src_mem)->context;
-
-    GST_TRACE_OBJECT (context, "%s -> GL",
-        gst_cuda_buffer_copy_type_to_string (src_type));
-
-    return cuda_copy_gl_interop (dst, dst_info, src, src_info, gl_context,
-        cuda_context, stream, FALSE, src_type);
-  }
-#endif
-
-#ifdef GST_CUDA_HAS_D3D
-  if (src_type == GST_CUDA_BUFFER_COPY_D3D11 && gst_is_d3d11_memory (src_mem) &&
-      gst_d3d11_memory_get_texture_desc (GST_D3D11_MEMORY_CAST (src_mem), &desc)
-      && desc.Usage == D3D11_USAGE_DEFAULT && gst_is_cuda_memory (dst_mem)) {
-    GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (src_mem);
-    GstD3D11Device *device = dmem->device;
-    GstCudaContext *cuda_context = GST_CUDA_MEMORY_CAST (dst_mem)->context;
-    gboolean ret;
-
-    GST_TRACE_OBJECT (context, "D3D11 -> CUDA");
-
-    gst_d3d11_device_lock (device);
-    ret = cuda_copy_d3d11_interop (dst, dst_info, src, src_info, device,
-        cuda_context, stream, TRUE);
-    gst_d3d11_device_unlock (device);
-
-    return ret;
-  }
-
-  if (dst_type == GST_CUDA_BUFFER_COPY_D3D11 && gst_is_d3d11_memory (dst_mem) &&
-      gst_d3d11_memory_get_texture_desc (GST_D3D11_MEMORY_CAST (dst_mem), &desc)
-      && desc.Usage == D3D11_USAGE_DEFAULT && gst_is_cuda_memory (src_mem)) {
-    GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (dst_mem);
-    GstD3D11Device *device = dmem->device;
-    GstCudaContext *cuda_context = GST_CUDA_MEMORY_CAST (src_mem)->context;
-    gboolean ret;
-
-    GST_TRACE_OBJECT (context, "CUDA -> D3D11");
-
-    gst_d3d11_device_lock (device);
-    ret = cuda_copy_d3d11_interop (dst, dst_info, src, src_info, device,
-        cuda_context, stream, FALSE);
-    gst_d3d11_device_unlock (device);
-
-    return ret;
-  }
-#endif
-
-  if (gst_is_cuda_memory (dst_mem)) {
-    cuda_context = GST_CUDA_MEMORY_CAST (dst_mem)->context;
-  } else if (gst_is_cuda_memory (src_mem)) {
-    cuda_context = GST_CUDA_MEMORY_CAST (src_mem)->context;
-  } else {
-    cuda_context = context;
-  }
-
-  GST_TRACE_OBJECT (context, "%s -> %s",
-      gst_cuda_buffer_copy_type_to_string (src_type),
-      gst_cuda_buffer_copy_type_to_string (dst_type));
-
-  return gst_cuda_buffer_copy_internal (dst, dst_type, dst_info,
-      src, src_type, src_info, cuda_context, stream);
-}

gst-plugins-bad-1.22.7.tar.xz/gst/dvdspu/gstdvdspu-render.c Deleted

@@ -1,99 +0,0 @@
-/* GStreamer DVD Sub-Picture Unit
- * Copyright (C) 2007 Fluendo S.A. <info@fluendo.com>
- * Copyright (C) 2009 Jan Schmidt <thaytan@noraisin.net>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <string.h>
-
-#include <gst/gst.h>
-
-#include "gstdvdspu.h"
-
-GST_DEBUG_CATEGORY_EXTERN (dvdspu_debug);
-#define GST_CAT_DEFAULT dvdspu_debug
-
-void
-gstspu_clear_comp_buffers (SpuState * state)
-{
-  /* The area to clear is the line inside the disp_rect, each entry 4 bytes,
-   * of the sub-sampled UV planes. */
-  gint16 left = state->comp_left / 2;
-  gint16 right = state->comp_right / 2;
-  gint16 uv_width = sizeof (guint32) * (right - left + 1);
-
-  memset (state->comp_bufs0 + left, 0, uv_width);
-  memset (state->comp_bufs1 + left, 0, uv_width);
-  memset (state->comp_bufs2 + left, 0, uv_width);
-}
-
-void
-gstspu_blend_comp_buffers (SpuState * state, guint8 * planes3)
-{
-  gint16 uv_end;
-  gint16 left, x;
-  guint8 *out_U;
-  guint8 *out_V;
-  guint32 *in_U;
-  guint32 *in_V;
-  guint32 *in_A;
-  gint16 comp_last_x = state->comp_right;
-
-  if (comp_last_x < state->comp_left)
-    return;                     /* Didn't draw in the comp buffers, nothing to do... */
-
-#if 0
-  GST_LOG ("Blending comp buffers from x=%d to x=%d",
-      state->comp_left, state->comp_right);
-#endif
-
-  /* Set up the output pointers */
-  out_U = planes1;            /* U plane */
-  out_V = planes2;            /* V plane */
-
-  /* Input starts at the first pixel of the compositing buffer */
-  in_U = state->comp_bufs0;   /* U comp buffer */
-  in_V = state->comp_bufs1;   /* V comp buffer */
-  in_A = state->comp_bufs2;   /* A comp buffer */
-
-  /* Calculate how many pixels to blend based on the maximum X value that was 
-   * drawn in the render_line function, divided by 2 (rounding up) to account 
-   * for UV sub-sampling */
-  uv_end = (comp_last_x + 1) / 2;
-  left = state->comp_left / 2;
-
-  out_U += left * GST_VIDEO_INFO_COMP_PSTRIDE (&state->info, 1);
-  out_V += left * GST_VIDEO_INFO_COMP_PSTRIDE (&state->info, 2);
-  for (x = left; x < uv_end; x++) {
-    guint32 tmp;
-    /* Each entry in the compositing buffer is 4 summed pixels, so the
-     * inverse alpha is (4 * 0xff) - in_Ax */
-    guint16 inv_A = (4 * 0xff) - in_Ax;
-
-    tmp = in_Ux + inv_A * *out_U;
-    *out_U = (guint8) (tmp / (4 * 0xff));
-
-    tmp = in_Vx + inv_A * *out_V;
-    *out_V = (guint8) (tmp / (4 * 0xff));
-
-    out_U += GST_VIDEO_INFO_COMP_PSTRIDE (&state->info, 1);
-    out_V += GST_VIDEO_INFO_COMP_PSTRIDE (&state->info, 2);
-  }
-}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkbufferpool.c Deleted

@@ -1,395 +0,0 @@
-/* GStreamer Intel MSDK plugin
- * Copyright (c) 2018, Intel Corporation
- * Copyright (c) 2018, Igalia S.L.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGDECE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "gstmsdkbufferpool.h"
-#include "gstmsdksystemmemory.h"
-#include "gstmsdkvideomemory.h"
-#ifndef _WIN32
-#include "gstmsdkallocator_libva.h"
-#endif
-
-GST_DEBUG_CATEGORY_STATIC (gst_debug_msdkbufferpool);
-#define GST_CAT_DEFAULT gst_debug_msdkbufferpool
-
-typedef enum _GstMsdkMemoryType
-{
-  GST_MSDK_MEMORY_TYPE_SYSTEM,
-  GST_MSDK_MEMORY_TYPE_VIDEO,
-  GST_MSDK_MEMORY_TYPE_DMABUF,
-} GstMsdkMemoryType;
-
-struct _GstMsdkBufferPoolPrivate
-{
-  GstMsdkContext *context;
-  GstAllocator *allocator;
-  mfxFrameAllocResponse *alloc_response;
-  GstMsdkMemoryType memory_type;
-  gboolean add_videometa;
-  gboolean need_alignment;
-  GstVideoAlignment alignment;
-
-};
-
-#define gst_msdk_buffer_pool_parent_class parent_class
-G_DEFINE_TYPE_WITH_CODE (GstMsdkBufferPool, gst_msdk_buffer_pool,
-    GST_TYPE_VIDEO_BUFFER_POOL, G_ADD_PRIVATE (GstMsdkBufferPool)
-    GST_DEBUG_CATEGORY_INIT (gst_debug_msdkbufferpool, "msdkbufferpool", 0,
-        "MSDK Buffer Pool"));
-
-static const gchar **
-gst_msdk_buffer_pool_get_options (GstBufferPool * pool)
-{
-  static const gchar *options = { GST_BUFFER_POOL_OPTION_VIDEO_META,
-    GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT,
-    GST_BUFFER_POOL_OPTION_MSDK_USE_VIDEO_MEMORY,
-    GST_BUFFER_POOL_OPTION_MSDK_USE_DMABUF,
-    NULL
-  };
-
-  return options;
-}
-
-static inline GstMsdkMemoryType
-_msdk_get_memory_type (GstStructure * config)
-{
-  gboolean video, dmabuf;
-
-  video = gst_buffer_pool_config_has_option (config,
-      GST_BUFFER_POOL_OPTION_MSDK_USE_VIDEO_MEMORY);
-  dmabuf = gst_buffer_pool_config_has_option (config,
-      GST_BUFFER_POOL_OPTION_MSDK_USE_DMABUF);
-
-  if (video && !dmabuf)
-    return GST_MSDK_MEMORY_TYPE_VIDEO;
-  if (video && dmabuf)
-    return GST_MSDK_MEMORY_TYPE_DMABUF;
-  if (!video && dmabuf)
-    GST_WARNING ("Can't use DMAbuf since it's system msdk bufferpool");
-  return GST_MSDK_MEMORY_TYPE_SYSTEM;
-}
-
-static gboolean
-gst_msdk_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
-{
-  GstMsdkBufferPool *msdk_pool = GST_MSDK_BUFFER_POOL_CAST (pool);
-  GstMsdkBufferPoolPrivate *priv = msdk_pool->priv;
-  GstCaps *caps = NULL;
-  GstAllocator *allocator = NULL;
-  GstVideoInfo video_info;
-  guint size, min_buffers, max_buffers;
-
-  if (!gst_buffer_pool_config_get_params (config, &caps, &size, &min_buffers,
-          &max_buffers))
-    goto error_invalid_config;
-
-  if (!caps)
-    goto error_no_caps;
-
-  if (!gst_video_info_from_caps (&video_info, caps))
-    goto error_invalid_caps;
-
-  if (!gst_buffer_pool_config_get_allocator (config, &allocator, NULL))
-    goto error_invalid_allocator;
-
-  if (allocator
-      && (g_strcmp0 (allocator->mem_type, GST_MSDK_SYSTEM_MEMORY_NAME) != 0
-          && g_strcmp0 (allocator->mem_type, GST_MSDK_VIDEO_MEMORY_NAME) != 0
-          && g_strcmp0 (allocator->mem_type,
-              GST_MSDK_DMABUF_MEMORY_NAME) != 0)) {
-    GST_INFO_OBJECT (pool,
-        "This is not MSDK allocator. So this will be ignored");
-    gst_object_unref (allocator);
-    allocator = NULL;
-  }
-
-  priv->add_videometa = gst_buffer_pool_config_has_option (config,
-      GST_BUFFER_POOL_OPTION_VIDEO_META);
-
-  priv->need_alignment = gst_buffer_pool_config_has_option (config,
-      GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
-
-  if (priv->add_videometa && priv->need_alignment) {
-    gst_msdk_set_video_alignment (&video_info, 0, 0, &priv->alignment);
-    gst_video_info_align (&video_info, &priv->alignment);
-    gst_buffer_pool_config_set_video_alignment (config, &priv->alignment);
-  }
-
-  priv->memory_type = _msdk_get_memory_type (config);
-  if (((priv->memory_type == GST_MSDK_MEMORY_TYPE_VIDEO)
-          || (priv->memory_type == GST_MSDK_MEMORY_TYPE_DMABUF))
-      && (!priv->context || !priv->alloc_response)) {
-    GST_ERROR_OBJECT (pool,
-        "No MSDK context or Allocation response for using video memory");
-    goto error_invalid_config;
-  }
-
-  /* create a new allocator if needed */
-  if (!allocator) {
-    GstAllocationParams params = { 0, 31, 0, 0, };
-
-    if (priv->memory_type == GST_MSDK_MEMORY_TYPE_DMABUF)
-      allocator =
-          gst_msdk_dmabuf_allocator_new (priv->context, &video_info,
-          priv->alloc_response);
-    else if (priv->memory_type == GST_MSDK_MEMORY_TYPE_VIDEO)
-      allocator =
-          gst_msdk_video_allocator_new (priv->context, &video_info,
-          priv->alloc_response);
-    else
-      allocator = gst_msdk_system_allocator_new (&video_info);
-
-    if (!allocator)
-      goto error_no_allocator;
-
-    GST_INFO_OBJECT (pool, "created new allocator %" GST_PTR_FORMAT, allocator);
-
-    gst_buffer_pool_config_set_allocator (config, allocator, &params);
-    gst_object_unref (allocator);
-  }
-
-  if (priv->allocator)
-    gst_object_unref (priv->allocator);
-  priv->allocator = gst_object_ref (allocator);
-
-  return GST_BUFFER_POOL_CLASS
-      (gst_msdk_buffer_pool_parent_class)->set_config (pool, config);
-
-error_invalid_config:
-  {
-    GST_ERROR_OBJECT (pool, "invalid config");
-    return FALSE;
-  }
-error_no_caps:
-  {
-    GST_ERROR_OBJECT (pool, "no caps in config");
-    return FALSE;
-  }
-error_invalid_caps:
-  {
-    GST_ERROR_OBJECT (pool, "invalid caps %" GST_PTR_FORMAT, caps);
-    return FALSE;
-  }
-error_invalid_allocator:
-  {
-    GST_ERROR_OBJECT (pool, "no allocator in config");
-    return FALSE;
-  }
-error_no_allocator:
-  {
-    GST_ERROR_OBJECT (pool, "no allocator defined");
-    return FALSE;
-  }
-}
-
-static GstFlowReturn
-gst_msdk_buffer_pool_alloc_buffer (GstBufferPool * pool,
-    GstBuffer ** out_buffer_ptr, GstBufferPoolAcquireParams * params)
-{
-  GstMsdkBufferPool *msdk_pool = GST_MSDK_BUFFER_POOL_CAST (pool);
-  GstMsdkBufferPoolPrivate *priv = msdk_pool->priv;
-  GstMemory *mem;
-  GstBuffer *buf;
-
-  buf = gst_buffer_new ();
-
-  if (priv->memory_type == GST_MSDK_MEMORY_TYPE_DMABUF)
-    mem = gst_msdk_dmabuf_memory_new (priv->allocator);
-  else if (priv->memory_type == GST_MSDK_MEMORY_TYPE_VIDEO)
-    mem = gst_msdk_video_memory_new (priv->allocator);
-  else
-    mem = gst_msdk_system_memory_new (priv->allocator);
-
-  if (!mem)
-    goto no_memory;
-
-  gst_buffer_append_memory (buf, mem);
-
-  if (priv->add_videometa) {
-    GstVideoMeta *vmeta;
-    GstVideoInfo *info;
-
-    if (priv->memory_type == GST_MSDK_MEMORY_TYPE_DMABUF)
-      info = &GST_MSDK_DMABUF_ALLOCATOR_CAST (priv->allocator)->image_info;
-    else if (priv->memory_type == GST_MSDK_MEMORY_TYPE_VIDEO)
-      info = &GST_MSDK_VIDEO_ALLOCATOR_CAST (priv->allocator)->image_info;
-    else
-      info = &GST_MSDK_SYSTEM_ALLOCATOR_CAST (priv->allocator)->image_info;
-
-    vmeta = gst_buffer_add_video_meta_full (buf, GST_VIDEO_FRAME_FLAG_NONE,
-        GST_VIDEO_INFO_FORMAT (info),
-        GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_HEIGHT (info),
-        GST_VIDEO_INFO_N_PLANES (info), info->offset, info->stride);
-
-    if (priv->need_alignment) {
-      if (!gst_video_meta_set_alignment (vmeta, priv->alignment)) {
-        GST_ERROR_OBJECT (pool, "failed to set alignment");
-        return GST_FLOW_ERROR;
-      }
-    }
-
-    if (priv->memory_type == GST_MSDK_MEMORY_TYPE_VIDEO) {
-      vmeta->map = gst_video_meta_map_msdk_memory;
-      vmeta->unmap = gst_video_meta_unmap_msdk_memory;
-    }
-  }
-
-  *out_buffer_ptr = buf;
-  return GST_FLOW_OK;
-
-no_memory:
-  {
-    GST_ERROR_OBJECT (pool, "failed to create new MSDK memory");
-    return GST_FLOW_ERROR;
-  }
-}
-
-static GstFlowReturn
-gst_msdk_buffer_pool_acquire_buffer (GstBufferPool * pool,
-    GstBuffer ** out_buffer_ptr, GstBufferPoolAcquireParams * params)
-{
-  GstMsdkBufferPool *msdk_pool = GST_MSDK_BUFFER_POOL_CAST (pool);
-  GstMsdkBufferPoolPrivate *priv = msdk_pool->priv;
-  GstBuffer *buf = NULL;
-  GstFlowReturn ret;
-  mfxFrameSurface1 *surface;
-
-  ret =
-      GST_BUFFER_POOL_CLASS (parent_class)->acquire_buffer (pool, &buf, params);
-
-  if (ret != GST_FLOW_OK || priv->memory_type == GST_MSDK_MEMORY_TYPE_SYSTEM) {
-    if (buf)
-      *out_buffer_ptr = buf;
-    return ret;
-  }
-
-  surface = gst_msdk_get_surface_from_buffer (buf);
-
-  /* When using video memory, mfx surface is still locked even though
-   * it's finished by SyncOperation. There's no way to get notified when it gets unlocked.
-   * So we need to confirm if it's unlocked every time a gst buffer is acquired.
-   * If it's still locked, we can replace it with new unlocked/unused surface.
-   */
-  if (!surface || surface->Data.Locked > 0) {
-    if (!gst_msdk_video_memory_get_surface_available (gst_buffer_peek_memory
-            (buf, 0))) {
-      GST_WARNING_OBJECT (pool, "failed to get new surface available");
-      return GST_FLOW_ERROR;
-    }
-  }
-#ifndef _WIN32
-  /* When using dmabuf, we should confirm that the fd of memory and
-   * the fd of surface match, since there is no guarantee that fd matches
-   * between surface and memory.
-   */
-  if (priv->memory_type == GST_MSDK_MEMORY_TYPE_DMABUF) {
-    gint fd;
-    surface = gst_msdk_get_surface_from_buffer (buf);
-    gst_msdk_get_dmabuf_info_from_surface (surface, &fd, NULL);
-
-    if (gst_dmabuf_memory_get_fd (gst_buffer_peek_memory (buf, 0)) != fd) {
-      GstMemory *mem;
-      mem = gst_msdk_dmabuf_memory_new_with_surface (priv->allocator, surface);
-      gst_buffer_replace_memory (buf, 0, mem);
-      gst_buffer_unset_flags (buf, GST_BUFFER_FLAG_TAG_MEMORY);
-    }
-  }
-#endif
-
-  *out_buffer_ptr = buf;
-  return GST_FLOW_OK;
-}
-
-static void
-gst_msdk_buffer_pool_release_buffer (GstBufferPool * pool, GstBuffer * buf)
-{
-  mfxFrameSurface1 *surface;
-  GstMsdkBufferPool *msdk_pool = GST_MSDK_BUFFER_POOL_CAST (pool);
-  GstMsdkBufferPoolPrivate *priv = msdk_pool->priv;
-
-  if (priv->memory_type == GST_MSDK_MEMORY_TYPE_SYSTEM)
-    goto done;
-
-  surface = gst_msdk_get_surface_from_buffer (buf);
-  if (!surface)
-    goto done;
-
-  gst_msdk_video_memory_release_surface (gst_buffer_peek_memory (buf, 0));
-
-done:
-  GST_BUFFER_POOL_CLASS (parent_class)->release_buffer (pool, buf);
-}
-
-static void
-gst_msdk_buffer_pool_finalize (GObject * object)
-{
-  GstMsdkBufferPool *pool = GST_MSDK_BUFFER_POOL_CAST (object);
-  GstMsdkBufferPoolPrivate *priv = pool->priv;
-
-  if (priv->allocator)
-    gst_object_unref (priv->allocator);
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-gst_msdk_buffer_pool_init (GstMsdkBufferPool * pool)
-{
-  pool->priv = gst_msdk_buffer_pool_get_instance_private (pool);
-}
-
-static void
-gst_msdk_buffer_pool_class_init (GstMsdkBufferPoolClass * klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GstBufferPoolClass *pool_class = GST_BUFFER_POOL_CLASS (klass);
-
-  object_class->finalize = gst_msdk_buffer_pool_finalize;
-
-  pool_class->get_options = gst_msdk_buffer_pool_get_options;
-  pool_class->set_config = gst_msdk_buffer_pool_set_config;
-  pool_class->alloc_buffer = gst_msdk_buffer_pool_alloc_buffer;
-  pool_class->acquire_buffer = gst_msdk_buffer_pool_acquire_buffer;
-  pool_class->release_buffer = gst_msdk_buffer_pool_release_buffer;
-}
-
-GstBufferPool *
-gst_msdk_buffer_pool_new (GstMsdkContext * context,
-    mfxFrameAllocResponse * alloc_resp)
-{
-  GstMsdkBufferPool *pool = g_object_new (GST_TYPE_MSDK_BUFFER_POOL, NULL);
-
-  /* Doesn't need to count reference of the context */
-  pool->priv->context = context;
-  pool->priv->alloc_response = alloc_resp;
-
-  return GST_BUFFER_POOL_CAST (pool);
-}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkbufferpool.h Deleted

@@ -1,96 +0,0 @@
-/* GStreamer Intel MSDK plugin
- * Copyright (c) 2018, Intel Corporation
- * Copyright (c) 2018, Igalia S.L.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGDECE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GST_MSDK_BUFFER_POOL_H
-#define GST_MSDK_BUFFER_POOL_H
-
-#include "msdk.h"
-#include "gstmsdkcontext.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_MSDK_BUFFER_POOL \
-  (gst_msdk_buffer_pool_get_type ())
-#define GST_MSDK_BUFFER_POOL(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MSDK_BUFFER_POOL, \
-      GstMsdkBufferPool))
-#define GST_MSDK_BUFFER_POOL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_MSDK_BUFFER_POOL, \
-      GstMsdkBufferPoolClass))
-#define GST_IS_MSDK_BUFFER_POOL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MSDK_BUFFER_POOL))
-#define GST_IS_MSDK_BUFFER_POOL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MSDK_BUFFER_POOL))
-#define GST_MSDK_BUFFER_POOL_CAST(obj) ((GstMsdkBufferPool*)(obj))
-
-typedef struct _GstMsdkBufferPool GstMsdkBufferPool;
-typedef struct _GstMsdkBufferPoolClass GstMsdkBufferPoolClass;
-typedef struct _GstMsdkBufferPoolPrivate GstMsdkBufferPoolPrivate;
-
-/*
- * GST_BUFFER_POOL_OPTION_MSDK_USE_VIDEO_MEMORY:
- *
- * An option that presents if the bufferpool will use
- * MsdkSystemAllocator or MsdkVideoAllocator.
- */
-#define GST_BUFFER_POOL_OPTION_MSDK_USE_VIDEO_MEMORY "GstBufferPoolOptionMsdkUseVideoMemory"
-#define GST_BUFFER_POOL_OPTION_MSDK_USE_DMABUF "GstBufferPoolOptionMsdkUseDMABuf"
-
-/**
- * GstMsdkBufferPool:
- *
- * A MSDK buffer pool object.
- */
-struct _GstMsdkBufferPool
-{
-  GstVideoBufferPool parent_instance;
-  GstMsdkBufferPoolPrivate *priv;
-};
-
-/**
- * GstMsdkBufferPoolClass:
- *
- * A MSDK buffer pool class.
- */
-struct _GstMsdkBufferPoolClass
-{
-  GstVideoBufferPoolClass parent_class;
-};
-
-GType gst_msdk_buffer_pool_get_type (void);
-
-GstBufferPool * gst_msdk_buffer_pool_new (GstMsdkContext * context,
-    mfxFrameAllocResponse * alloc_resp);
-
-G_END_DECLS
-
-#endif /* GST_MSDK_BUFFER_POOL_H */

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdksystemmemory.c Deleted

@@ -1,380 +0,0 @@
-/* GStreamer Intel MSDK plugin
- * Copyright (c) 2018, Intel Corporation
- * Copyright (c) 2018, Igalia S.L.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGDECE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _WIN32
-#include <unistd.h>
-#endif
-#include <stdlib.h>
-#include "gstmsdksystemmemory.h"
-#include <string.h>
-
-#ifdef _WIN32
-#define posix_memalign(d, a, s) ((*((void**)d) = _aligned_malloc(s, a)) ? 0 : -1)
-#endif
-
-#ifndef _WIN32
-#define _aligned_free free
-#endif
-
-static gboolean
-ensure_data (GstMsdkSystemMemory * mem)
-{
-  gsize size;
-  void *data;
-  GstVideoInfo *info;
-  GstAllocator *allocator;
-  GstMsdkSystemAllocator *msdk_allocator;
-
-  allocator = GST_MEMORY_CAST (mem)->allocator;
-  msdk_allocator = GST_MSDK_SYSTEM_ALLOCATOR_CAST (allocator);
-
-  info = &msdk_allocator->image_info;
-  size = GST_VIDEO_INFO_SIZE (info);
-
-  if (mem->cache)
-    return TRUE;
-
-  if (posix_memalign (&data, 32, size) != 0) {
-    GST_ERROR ("Memory allocation failed");
-    return FALSE;
-  }
-
-  mem->cache = data;
-  mem->cached_data0 = mem->cache;
-  mem->cached_data1 = mem->cache + GST_VIDEO_INFO_PLANE_OFFSET (info, 1);
-  mem->cached_data2 = mem->cache + GST_VIDEO_INFO_PLANE_OFFSET (info, 2);
-
-  mem->destination_pitches0 = GST_VIDEO_INFO_PLANE_STRIDE (info, 0);
-  mem->destination_pitches1 = GST_VIDEO_INFO_PLANE_STRIDE (info, 1);
-  mem->destination_pitches2 = GST_VIDEO_INFO_PLANE_STRIDE (info, 2);
-
-  switch (GST_VIDEO_INFO_FORMAT (info)) {
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_P010_10LE:
-    case GST_VIDEO_FORMAT_P012_LE:
-      mem->surface->Data.Y = mem->cached_data0;
-      mem->surface->Data.UV = mem->cached_data1;
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      break;
-    case GST_VIDEO_FORMAT_YV12:
-      mem->surface->Data.Y = mem->cached_data0;
-      mem->surface->Data.U = mem->cached_data2;
-      mem->surface->Data.V = mem->cached_data1;
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      break;
-    case GST_VIDEO_FORMAT_I420:
-      mem->surface->Data.Y = mem->cached_data0;
-      mem->surface->Data.U = mem->cached_data1;
-      mem->surface->Data.V = mem->cached_data2;
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      break;
-    case GST_VIDEO_FORMAT_YUY2:
-      mem->surface->Data.Y = mem->cached_data0;
-      mem->surface->Data.U = mem->surface->Data.Y + 1;
-      mem->surface->Data.V = mem->surface->Data.Y + 3;
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      break;
-    case GST_VIDEO_FORMAT_UYVY:
-      mem->surface->Data.Y = mem->cached_data0;
-      mem->surface->Data.U = mem->surface->Data.Y;
-      mem->surface->Data.V = mem->surface->Data.U + 2;
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      break;
-    case GST_VIDEO_FORMAT_BGRA:
-    case GST_VIDEO_FORMAT_BGRx:
-      mem->surface->Data.B = mem->cached_data0;
-      mem->surface->Data.G = mem->surface->Data.B + 1;
-      mem->surface->Data.R = mem->surface->Data.B + 2;
-      mem->surface->Data.A = mem->surface->Data.B + 3;
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      break;
-#if (MFX_VERSION >= 1028)
-    case GST_VIDEO_FORMAT_RGB16:
-      mem->surface->Data.R = mem->cached_data0;
-      mem->surface->Data.G = mem->surface->Data.R;
-      mem->surface->Data.B = mem->surface->Data.R;
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      break;
-#endif
-    case GST_VIDEO_FORMAT_VUYA:
-      mem->surface->Data.V = mem->cached_data0;
-      mem->surface->Data.U = mem->surface->Data.V + 1;
-      mem->surface->Data.Y = mem->surface->Data.V + 2;
-      mem->surface->Data.A = mem->surface->Data.V + 3;
-      mem->surface->Data.PitchHigh =
-          (mfxU16) (mem->destination_pitches0 / (1 << 16));
-      mem->surface->Data.PitchLow =
-          (mfxU16) (mem->destination_pitches0 % (1 << 16));
-      break;
-    case GST_VIDEO_FORMAT_BGR10A2_LE:
-      mem->surface->Data.R = mem->cached_data0;
-      mem->surface->Data.G = mem->surface->Data.R;
-      mem->surface->Data.B = mem->surface->Data.R;
-      mem->surface->Data.A = mem->surface->Data.R;
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      break;
-    case GST_VIDEO_FORMAT_Y210:
-    case GST_VIDEO_FORMAT_Y212_LE:
-      mem->surface->Data.Y = mem->cached_data0;
-      mem->surface->Data.U = mem->surface->Data.Y + 2;
-      mem->surface->Data.V = mem->surface->Data.Y + 6;
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      break;
-    case GST_VIDEO_FORMAT_Y410:
-      mem->surface->Data.U = mem->cached_data0;       /* Data.Y410 */
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      break;
-    case GST_VIDEO_FORMAT_Y412_LE:
-      mem->surface->Data.U = mem->cached_data0;
-      mem->surface->Data.Y = mem->surface->Data.U + 2;
-      mem->surface->Data.V = mem->surface->Data.U + 4;
-      mem->surface->Data.A = mem->surface->Data.U + 6;
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      break;
-#if (MFX_VERSION >= 2004)
-    case GST_VIDEO_FORMAT_RGBP:
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      mem->surface->Data.R = mem->cached_data0;
-      mem->surface->Data.G = mem->cached_data1;
-      mem->surface->Data.B = mem->cached_data2;
-      break;
-    case GST_VIDEO_FORMAT_BGRP:
-      mem->surface->Data.Pitch = mem->destination_pitches0;
-      mem->surface->Data.B = mem->cached_data0;
-      mem->surface->Data.G = mem->cached_data1;
-      mem->surface->Data.R = mem->cached_data2;
-      break;
-#endif
-
-    default:
-      g_assert_not_reached ();
-      break;
-  }
-
-  return TRUE;
-}
-
-static mfxFrameSurface1 *
-gst_msdk_system_allocator_create_surface (GstAllocator * allocator)
-{
-  mfxFrameInfo frame_info = { {0,}, 0, };
-  mfxFrameSurface1 *surface;
-  GstMsdkSystemAllocator *msdk_system_allocator =
-      GST_MSDK_SYSTEM_ALLOCATOR_CAST (allocator);
-
-  surface = (mfxFrameSurface1 *) g_slice_new0 (mfxFrameSurface1);
-
-  if (!surface) {
-    GST_ERROR ("failed to allocate surface");
-    return NULL;
-  }
-
-  gst_msdk_set_mfx_frame_info_from_video_info (&frame_info,
-      &msdk_system_allocator->image_info);
-
-  surface->Info = frame_info;
-
-  return surface;
-}
-
-GstMemory *
-gst_msdk_system_memory_new (GstAllocator * base_allocator)
-{
-  GstMsdkSystemAllocator *allocator;
-  GstVideoInfo *vip;
-  GstMsdkSystemMemory *mem;
-
-  g_return_val_if_fail (base_allocator, NULL);
-  g_return_val_if_fail (GST_IS_MSDK_SYSTEM_ALLOCATOR (base_allocator), NULL);
-
-  allocator = GST_MSDK_SYSTEM_ALLOCATOR_CAST (base_allocator);
-
-  mem = g_slice_new0 (GstMsdkSystemMemory);
-  if (!mem)
-    return NULL;
-
-  mem->surface = gst_msdk_system_allocator_create_surface (base_allocator);
-
-  if (!mem->surface) {
-    g_slice_free (GstMsdkSystemMemory, mem);
-    return NULL;
-  }
-
-  vip = &allocator->image_info;
-  gst_memory_init (&mem->parent_instance, 0,
-      base_allocator, NULL, GST_VIDEO_INFO_SIZE (vip), 0, 0,
-      GST_VIDEO_INFO_SIZE (vip));
-
-  if (!ensure_data (mem)) {
-    g_slice_free (mfxFrameSurface1, mem->surface);
-    g_slice_free (GstMsdkSystemMemory, mem);
-    return NULL;
-  }
-
-  return GST_MEMORY_CAST (mem);
-}
-
-static gpointer
-gst_msdk_system_memory_map_full (GstMemory * base_mem, GstMapInfo * info,
-    gsize maxsize)
-{
-  GstMsdkSystemMemory *const mem = GST_MSDK_SYSTEM_MEMORY_CAST (base_mem);
-
-  g_return_val_if_fail (mem, NULL);
-
-  if (!mem->surface) {
-    GST_WARNING ("The surface is not allocated");
-    return NULL;
-  }
-
-  if ((info->flags & GST_MAP_WRITE) && mem->surface
-      && mem->surface->Data.Locked) {
-    GST_WARNING ("The surface in memory %p is not still available", mem);
-    return NULL;
-  }
-
-  switch (mem->surface->Info.FourCC) {
-    case MFX_FOURCC_RGB4:
-      return mem->surface->Data.B;      /* The first channel is B */
-
-      /* The first channel in memory is V for MFX_FOURCC_AYUV (GST_VIDEO_FORMAT_VUYA) format */
-    case MFX_FOURCC_AYUV:
-      return mem->surface->Data.V;
-
-#if (MFX_VERSION >= 1027)
-    case MFX_FOURCC_Y410:
-      return mem->surface->Data.U;      /* Data.Y410 */
-#endif
-
-#if (MFX_VERSION >= 1031)
-    case MFX_FOURCC_Y416:
-      return mem->surface->Data.U;      /* The first channel is U */
-#endif
-
-#if (MFX_VERSION >= 2004)
-    case MFX_FOURCC_RGBP:
-      return mem->surface->Data.R;
-
-    case MFX_FOURCC_BGRP:
-      return mem->surface->Data.B;
-#endif
-
-    default:
-      return mem->surface->Data.Y;
-  }
-}
-
-static void
-gst_msdk_system_memory_unmap (GstMemory * base_mem)
-{
-}
-
-static GstMemory *
-gst_msdk_system_memory_copy (GstMemory * base_mem, gssize offset, gssize size)
-{
-  GstMsdkSystemMemory *copy;
-  GstVideoInfo *info;
-  GstMsdkSystemAllocator *msdk_allocator;
-  gsize mem_size;
-
-  /* FIXME: can we consider offset and size here ? */
-  copy =
-      (GstMsdkSystemMemory *) gst_msdk_system_memory_new (base_mem->allocator);
-
-  msdk_allocator = GST_MSDK_SYSTEM_ALLOCATOR_CAST (base_mem->allocator);
-
-  info = &msdk_allocator->image_info;
-  mem_size = GST_VIDEO_INFO_SIZE (info);
-
-  memcpy (copy->cache, GST_MSDK_SYSTEM_MEMORY_CAST (base_mem)->cache, mem_size);
-
-  return GST_MEMORY_CAST (copy);
-}
-
-/* GstMsdkSystemAllocator */
-G_DEFINE_TYPE (GstMsdkSystemAllocator, gst_msdk_system_allocator,
-    GST_TYPE_ALLOCATOR);
-
-static void
-gst_msdk_system_allocator_free (GstAllocator * allocator, GstMemory * base_mem)
-{
-  GstMsdkSystemMemory *const mem = GST_MSDK_SYSTEM_MEMORY_CAST (base_mem);
-
-  _aligned_free (mem->cache);
-  g_slice_free (mfxFrameSurface1, mem->surface);
-  g_slice_free (GstMsdkSystemMemory, mem);
-}
-
-static GstMemory *
-gst_msdk_system_allocator_alloc (GstAllocator * allocator, gsize size,
-    GstAllocationParams * params)
-{
-  return gst_msdk_system_memory_new (allocator);
-}
-
-static void
-gst_msdk_system_allocator_class_init (GstMsdkSystemAllocatorClass * klass)
-{
-  GstAllocatorClass *const allocator_class = GST_ALLOCATOR_CLASS (klass);
-
-  allocator_class->alloc = gst_msdk_system_allocator_alloc;
-  allocator_class->free = gst_msdk_system_allocator_free;
-}
-
-static void
-gst_msdk_system_allocator_init (GstMsdkSystemAllocator * allocator)
-{
-  GstAllocator *const base_allocator = GST_ALLOCATOR_CAST (allocator);
-
-  base_allocator->mem_type = GST_MSDK_SYSTEM_MEMORY_NAME;
-  base_allocator->mem_map_full = gst_msdk_system_memory_map_full;
-  base_allocator->mem_unmap = gst_msdk_system_memory_unmap;
-  base_allocator->mem_copy = gst_msdk_system_memory_copy;
-
-  GST_OBJECT_FLAG_SET (allocator, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC);
-}
-
-GstAllocator *
-gst_msdk_system_allocator_new (GstVideoInfo * image_info)
-{
-  GstMsdkSystemAllocator *allocator;
-
-  g_return_val_if_fail (image_info != NULL, NULL);
-
-  allocator = g_object_new (GST_TYPE_MSDK_SYSTEM_ALLOCATOR, NULL);
-  if (!allocator)
-    return NULL;
-
-  allocator->image_info = *image_info;
-
-  return GST_ALLOCATOR_CAST (allocator);
-}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdksystemmemory.h Deleted

@@ -1,119 +0,0 @@
-/* GStreamer Intel MSDK plugin
- * Copyright (c) 2018, Intel Corporation
- * Copyright (c) 2018, Igalia S.L.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGDECE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GST_MSDK_SYSTEM_MEMORY_H
-#define GST_MSDK_SYSTEM_MEMORY_H
-
-#include "msdk.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GstMsdkSystemMemory GstMsdkSystemMemory;
-typedef struct _GstMsdkSystemAllocator GstMsdkSystemAllocator;
-typedef struct _GstMsdkSystemAllocatorClass GstMsdkSystemAllocatorClass;
-
-/* ---------------------------------------------------------------------*/
-/* GstMsdkSystemMemory                                                        */
-/* ---------------------------------------------------------------------*/
-
-#define GST_MSDK_SYSTEM_MEMORY_CAST(mem) \
-  ((GstMsdkSystemMemory *) (mem))
-
-#define GST_IS_MSDK_SYSTEM_MEMORY(mem) \
-  ((mem) && (mem)->allocator && GST_IS_MSDK_SYSTEM_ALLOCATOR((mem)->allocator))
-
-#define GST_MSDK_SYSTEM_MEMORY_NAME             "GstMsdkSystemMemory"
-
-/**
- * GstMsdkSystemMemory:
- *
- * A MSDK memory object holder, including mfxFrameSurface,
- * video info of the surface.
- */
-struct _GstMsdkSystemMemory
-{
-  GstMemory parent_instance;
-
-  mfxFrameSurface1 *surface;
-
-  guint8           *cache;
-  mfxU8            *cached_data4;
-  guint            destination_pitches4;
-};
-
-GstMemory *
-gst_msdk_system_memory_new (GstAllocator * base_allocator);
-
-/* ---------------------------------------------------------------------*/
-/* GstMsdkSystemAllocator                                                     */
-/* ---------------------------------------------------------------------*/
-
-#define GST_MSDK_SYSTEM_ALLOCATOR_CAST(allocator) \
-  ((GstMsdkSystemAllocator *) (allocator))
-
-#define GST_TYPE_MSDK_SYSTEM_ALLOCATOR \
-  (gst_msdk_system_allocator_get_type ())
-#define GST_MSDK_SYSTEM_ALLOCATOR(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MSDK_SYSTEM_ALLOCATOR, \
-      GstMsdkSystemAllocator))
-#define GST_IS_MSDK_SYSTEM_ALLOCATOR(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MSDK_SYSTEM_ALLOCATOR))
-
-/**
- * GstMsdkSystemAllocator:
- *
- * A MSDK memory allocator object.
- */
-struct _GstMsdkSystemAllocator
-{
-  GstAllocator parent_instance;
-
-  GstVideoInfo image_info;
-};
-
-/**
- * GstMsdkSystemAllocatorClass:
- *
- * A MSDK memory allocator class.
- */
-struct _GstMsdkSystemAllocatorClass
-{
-  GstAllocatorClass parent_class;
-};
-
-GType gst_msdk_system_allocator_get_type (void);
-
-GstAllocator * gst_msdk_system_allocator_new (GstVideoInfo *image_info);
-
-G_END_DECLS
-
-#endif /* GST_MSDK_SYSTEM_MEMORY_H */

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvideomemory.c Deleted

@@ -1,597 +0,0 @@
-/* GStreamer Intel MSDK plugin
- * Copyright (c) 2018, Intel Corporation
- * Copyright (c) 2018, Igalia S.L.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGDECE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _WIN32
-#include <unistd.h>
-#include <va/va.h>
-#endif
-#include <stdlib.h>
-#include "gstmsdkvideomemory.h"
-#include "gstmsdkallocator.h"
-
-#define GST_MSDK_BUFFER_SURFACE gst_msdk_buffer_surface_quark_get ()
-static GQuark
-gst_msdk_buffer_surface_quark_get (void)
-{
-  static gsize g_quark;
-
-  if (g_once_init_enter (&g_quark)) {
-    gsize quark = (gsize) g_quark_from_static_string ("GstMsdkBufferSurface");
-    g_once_init_leave (&g_quark, quark);
-  }
-  return g_quark;
-}
-
-static mfxFrameSurface1 *
-gst_msdk_video_allocator_get_surface (GstAllocator * allocator)
-{
-  mfxFrameInfo frame_info = { {0,}, 0, };
-  mfxFrameSurface1 *surface;
-  GstMsdkContext *context = NULL;
-  mfxFrameAllocResponse *resp = NULL;
-  GstVideoInfo *vinfo = NULL;
-
-  if (GST_IS_MSDK_VIDEO_ALLOCATOR (allocator)) {
-    context = GST_MSDK_VIDEO_ALLOCATOR_CAST (allocator)->context;
-    resp = GST_MSDK_VIDEO_ALLOCATOR_CAST (allocator)->alloc_response;
-    vinfo = &GST_MSDK_VIDEO_ALLOCATOR_CAST (allocator)->image_info;
-  } else if (GST_IS_MSDK_DMABUF_ALLOCATOR (allocator)) {
-    context = GST_MSDK_DMABUF_ALLOCATOR_CAST (allocator)->context;
-    resp = GST_MSDK_DMABUF_ALLOCATOR_CAST (allocator)->alloc_response;
-    vinfo = &GST_MSDK_DMABUF_ALLOCATOR_CAST (allocator)->image_info;
-  } else {
-    return NULL;
-  }
-
-  surface = gst_msdk_context_get_surface_available (context, resp);
-  if (!surface) {
-    GST_ERROR ("failed to get surface available");
-    return NULL;
-  }
-
-  gst_msdk_set_mfx_frame_info_from_video_info (&frame_info, vinfo);
-  surface->Info = frame_info;
-
-  return surface;
-}
-
-gboolean
-gst_msdk_video_memory_get_surface_available (GstMemory * mem)
-{
-  GstAllocator *allocator;
-  mfxFrameSurface1 *surface;
-
-  g_return_val_if_fail (mem, FALSE);
-
-  allocator = mem->allocator;
-  surface = gst_msdk_video_allocator_get_surface (allocator);
-
-  if (GST_IS_MSDK_VIDEO_ALLOCATOR (allocator)) {
-    GST_MSDK_VIDEO_MEMORY_CAST (mem)->surface = surface;
-  } else if (GST_IS_MSDK_DMABUF_ALLOCATOR (allocator)) {
-    gst_mini_object_set_qdata (GST_MINI_OBJECT_CAST (mem),
-        GST_MSDK_BUFFER_SURFACE, surface, NULL);
-  }
-
-  return surface ? TRUE : FALSE;
-}
-
-/*
- * Every time releasing a gst buffer, we need to check the status of surface's lock,
- * so that we could manage locked surfaces separately in the context.
- * Otherwise, we put the surface to the available list.
- */
-void
-gst_msdk_video_memory_release_surface (GstMemory * mem)
-{
-  mfxFrameSurface1 *surface = NULL;
-  GstMsdkContext *context = NULL;
-  mfxFrameAllocResponse *alloc_response = NULL;
-
-  g_return_if_fail (mem);
-
-  if (GST_IS_MSDK_VIDEO_ALLOCATOR (mem->allocator)) {
-    surface = GST_MSDK_VIDEO_MEMORY_CAST (mem)->surface;
-    context = GST_MSDK_VIDEO_ALLOCATOR_CAST (mem->allocator)->context;
-    alloc_response =
-        GST_MSDK_VIDEO_ALLOCATOR_CAST (mem->allocator)->alloc_response;
-  } else if (GST_IS_MSDK_DMABUF_ALLOCATOR (mem->allocator)) {
-    surface =
-        gst_mini_object_get_qdata (GST_MINI_OBJECT (mem),
-        GST_MSDK_BUFFER_SURFACE);
-    context = GST_MSDK_DMABUF_ALLOCATOR_CAST (mem->allocator)->context;
-    alloc_response =
-        GST_MSDK_DMABUF_ALLOCATOR_CAST (mem->allocator)->alloc_response;
-  } else {
-    return;
-  }
-
-  if (surface->Data.Locked > 0)
-    gst_msdk_context_put_surface_locked (context, alloc_response, surface);
-  else
-    gst_msdk_context_put_surface_available (context, alloc_response, surface);
-
-  if (GST_IS_MSDK_VIDEO_ALLOCATOR (mem->allocator))
-    GST_MSDK_VIDEO_MEMORY_CAST (mem)->surface = NULL;
-  else if (GST_IS_MSDK_DMABUF_ALLOCATOR (mem->allocator))
-    gst_mini_object_set_qdata (GST_MINI_OBJECT_CAST (mem),
-        GST_MSDK_BUFFER_SURFACE, NULL, NULL);
-
-  return;
-}
-
-GstMemory *
-gst_msdk_video_memory_new (GstAllocator * base_allocator)
-{
-  GstMsdkVideoAllocator *allocator;
-  GstVideoInfo *vip;
-  GstMsdkVideoMemory *mem;
-
-  g_return_val_if_fail (base_allocator, NULL);
-  g_return_val_if_fail (GST_IS_MSDK_VIDEO_ALLOCATOR (base_allocator), NULL);
-
-  allocator = GST_MSDK_VIDEO_ALLOCATOR_CAST (base_allocator);
-
-  mem = g_slice_new0 (GstMsdkVideoMemory);
-  if (!mem)
-    return NULL;
-
-  mem->surface = gst_msdk_video_allocator_get_surface (base_allocator);
-  if (!mem->surface) {
-    g_slice_free (GstMsdkVideoMemory, mem);
-    return NULL;
-  }
-
-  vip = &allocator->image_info;
-  gst_memory_init (&mem->parent_instance, 0,
-      base_allocator, NULL, GST_VIDEO_INFO_SIZE (vip), 0, 0,
-      GST_VIDEO_INFO_SIZE (vip));
-
-  return GST_MEMORY_CAST (mem);
-}
-
-gboolean
-gst_video_meta_map_msdk_memory (GstVideoMeta * meta, guint plane,
-    GstMapInfo * info, gpointer * data, gint * stride, GstMapFlags flags)
-{
-  gboolean ret = FALSE;
-  GstAllocator *allocator;
-  GstMsdkVideoAllocator *msdk_video_allocator;
-  GstMsdkVideoMemory *mem =
-      GST_MSDK_VIDEO_MEMORY_CAST (gst_buffer_peek_memory (meta->buffer, 0));
-  GstMsdkMemoryID *mem_id;
-  guint offset = 0;
-  gint pitch = 0;
-  guint plane_id = plane;
-
-  g_return_val_if_fail (mem, FALSE);
-
-  allocator = GST_MEMORY_CAST (mem)->allocator;
-  msdk_video_allocator = GST_MSDK_VIDEO_ALLOCATOR_CAST (allocator);
-
-  if (!GST_IS_MSDK_VIDEO_ALLOCATOR (allocator)) {
-    GST_WARNING ("The allocator is not MSDK video allocator");
-    return FALSE;
-  }
-
-  if (!mem->surface) {
-    GST_WARNING ("The surface is not allocated");
-    return FALSE;
-  }
-
-  if ((flags & GST_MAP_WRITE) && mem->surface && mem->surface->Data.Locked) {
-    GST_WARNING ("The surface in memory %p is not still available", mem);
-    return FALSE;
-  }
-
-  if (!mem->mapped) {
-    gst_msdk_frame_lock (msdk_video_allocator->context,
-        mem->surface->Data.MemId, &mem->surface->Data);
-  }
-
-  mem->mapped++;
-  mem_id = mem->surface->Data.MemId;
-
-  /* msdk doesn't support I420 format and we used YV12 internally
-   * So we need to swap U/V planes for mapping */
-  if (meta->format == GST_VIDEO_FORMAT_I420)
-    plane_id = plane ? (plane == 1 ? 2 : 1) : plane;
-
-#ifndef _WIN32
-  offset = mem_id->image.offsetsplane_id;
-  pitch = mem_id->image.pitchesplane_id;
-#else
-  /* TODO: This is just to avoid compile errors on Windows.
-   * Implement handling Windows-specific video-memory.
-   */
-  offset = mem_id->offset;
-  pitch = mem_id->pitch;
-#endif
-
-  switch (meta->format) {
-    case GST_VIDEO_FORMAT_BGRA:
-    case GST_VIDEO_FORMAT_BGRx:
-      *data = mem->surface->Data.B + offset;
-      break;
-
-      /* The first channel in memory is V for GST_VIDEO_FORMAT_VUYA */
-    case GST_VIDEO_FORMAT_VUYA:
-      *data = mem->surface->Data.V + offset;
-      break;
-
-    case GST_VIDEO_FORMAT_Y410:
-    case GST_VIDEO_FORMAT_Y412_LE:
-      *data = mem->surface->Data.U + offset;
-      break;
-
-    default:
-      *data = mem->surface->Data.Y + offset;
-      break;
-  }
-
-  *stride = pitch;
-  info->flags = flags;
-  ret = (*data != NULL);
-
-  return ret;
-}
-
-gboolean
-gst_video_meta_unmap_msdk_memory (GstVideoMeta * meta, guint plane,
-    GstMapInfo * info)
-{
-  GstAllocator *allocator;
-  GstMsdkVideoAllocator *msdk_video_allocator;
-  GstMsdkVideoMemory *mem =
-      GST_MSDK_VIDEO_MEMORY_CAST (gst_buffer_peek_memory (meta->buffer, 0));
-
-  g_return_val_if_fail (mem, FALSE);
-
-  allocator = GST_MEMORY_CAST (mem)->allocator;
-  msdk_video_allocator = GST_MSDK_VIDEO_ALLOCATOR_CAST (allocator);
-
-  if (mem->mapped == 1)
-    gst_msdk_frame_unlock (msdk_video_allocator->context,
-        mem->surface->Data.MemId, &mem->surface->Data);
-
-  mem->mapped--;
-
-  return TRUE;
-}
-
-
-static gpointer
-gst_msdk_video_memory_map_full (GstMemory * base_mem, GstMapInfo * info,
-    gsize maxsize)
-{
-  GstMsdkVideoMemory *const mem = GST_MSDK_VIDEO_MEMORY_CAST (base_mem);
-  GstAllocator *allocator = base_mem->allocator;
-  GstMsdkVideoAllocator *msdk_video_allocator =
-      GST_MSDK_VIDEO_ALLOCATOR_CAST (allocator);
-
-  g_return_val_if_fail (mem, NULL);
-
-  if (!mem->surface) {
-    GST_WARNING ("The surface is not allocated");
-    return NULL;
-  }
-
-  if ((info->flags & GST_MAP_WRITE) && mem->surface
-      && mem->surface->Data.Locked) {
-    GST_WARNING ("The surface in memory %p is not still available", mem);
-    return NULL;
-  }
-
-  gst_msdk_frame_lock (msdk_video_allocator->context, mem->surface->Data.MemId,
-      &mem->surface->Data);
-
-  switch (mem->surface->Info.FourCC) {
-    case MFX_FOURCC_RGB4:
-      return mem->surface->Data.B;      /* The first channel is B */
-
-      /* The first channel in memory is V for MFX_FOURCC_AYUV (GST_VIDEO_FORMAT_VUYA) format */
-    case MFX_FOURCC_AYUV:
-      return mem->surface->Data.V;
-
-#if (MFX_VERSION >= 1027)
-    case MFX_FOURCC_Y410:
-      return mem->surface->Data.U;      /* Data.Y410 */
-#endif
-
-#if (MFX_VERSION >= 1031)
-    case MFX_FOURCC_Y416:
-      return mem->surface->Data.U;
-#endif
-
-#if (MFX_VERSION >= 2004)
-    case MFX_FOURCC_RGBP:
-      return mem->surface->Data.R;
-
-    case MFX_FOURCC_BGRP:
-      return mem->surface->Data.B;
-#endif
-
-    default:
-      return mem->surface->Data.Y;
-  }
-}
-
-static void
-gst_msdk_video_memory_unmap (GstMemory * base_mem)
-{
-  GstMsdkVideoMemory *const mem = GST_MSDK_VIDEO_MEMORY_CAST (base_mem);
-  GstAllocator *allocator = base_mem->allocator;
-  GstMsdkVideoAllocator *msdk_video_allocator =
-      GST_MSDK_VIDEO_ALLOCATOR_CAST (allocator);
-
-  gst_msdk_frame_unlock (msdk_video_allocator->context,
-      mem->surface->Data.MemId, &mem->surface->Data);
-}
-
-static GstMemory *
-gst_msdk_video_memory_copy (GstMemory * base_mem, gssize offset, gssize size)
-{
-  GstMemory *copy;
-  GstVideoInfo *info;
-  GstMsdkVideoAllocator *msdk_video_allocator;
-  gsize mem_size;
-  GstMapInfo src_map, dst_map;
-
-  /* FIXME: can we consider offset and size here ? */
-  copy = gst_msdk_video_memory_new (base_mem->allocator);
-
-  if (!copy) {
-    GST_ERROR_OBJECT (base_mem->allocator, "Failed to create new video memory");
-    return NULL;
-  }
-
-  msdk_video_allocator = GST_MSDK_VIDEO_ALLOCATOR_CAST (base_mem->allocator);
-
-  info = &msdk_video_allocator->image_info;
-  mem_size = GST_VIDEO_INFO_SIZE (info);
-
-  gst_memory_map (base_mem, &src_map, GST_MAP_READ);
-  gst_memory_map (copy, &dst_map, GST_MAP_WRITE);
-
-  memcpy (dst_map.data, src_map.data, mem_size);
-  gst_memory_unmap (copy, &dst_map);
-  gst_memory_unmap (base_mem, &src_map);
-
-  return copy;
-}
-
-/* GstMsdkVideoAllocator */
-G_DEFINE_TYPE (GstMsdkVideoAllocator, gst_msdk_video_allocator,
-    GST_TYPE_ALLOCATOR);
-
-static GstMemory *
-gst_msdk_video_allocator_alloc (GstAllocator * allocator, gsize size,
-    GstAllocationParams * params)
-{
-  return gst_msdk_video_memory_new (allocator);
-}
-
-static void
-gst_msdk_video_allocator_finalize (GObject * object)
-{
-  GstMsdkVideoAllocator *allocator = GST_MSDK_VIDEO_ALLOCATOR_CAST (object);
-
-  gst_msdk_frame_free (allocator->context, allocator->alloc_response);
-
-  gst_object_unref (allocator->context);
-  G_OBJECT_CLASS (gst_msdk_video_allocator_parent_class)->finalize (object);
-}
-
-static void
-gst_msdk_video_allocator_free (GstAllocator * allocator, GstMemory * base_mem)
-{
-  GstMsdkVideoMemory *const mem = GST_MSDK_VIDEO_MEMORY_CAST (base_mem);
-
-  g_slice_free (GstMsdkVideoMemory, mem);
-}
-
-static void
-gst_msdk_video_allocator_class_init (GstMsdkVideoAllocatorClass * klass)
-{
-  GObjectClass *const object_class = G_OBJECT_CLASS (klass);
-  GstAllocatorClass *const allocator_class = GST_ALLOCATOR_CLASS (klass);
-
-  object_class->finalize = gst_msdk_video_allocator_finalize;
-
-  allocator_class->alloc = gst_msdk_video_allocator_alloc;
-  allocator_class->free = gst_msdk_video_allocator_free;
-}
-
-static void
-gst_msdk_video_allocator_init (GstMsdkVideoAllocator * allocator)
-{
-  GstAllocator *const base_allocator = GST_ALLOCATOR_CAST (allocator);
-
-  base_allocator->mem_type = GST_MSDK_VIDEO_MEMORY_NAME;
-  base_allocator->mem_map_full = gst_msdk_video_memory_map_full;
-  base_allocator->mem_unmap = gst_msdk_video_memory_unmap;
-  base_allocator->mem_copy = gst_msdk_video_memory_copy;
-
-  GST_OBJECT_FLAG_SET (allocator, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC);
-}
-
-GstAllocator *
-gst_msdk_video_allocator_new (GstMsdkContext * context,
-    GstVideoInfo * image_info, mfxFrameAllocResponse * alloc_resp)
-{
-  GstMsdkVideoAllocator *allocator;
-  GstMsdkAllocResponse *cached = NULL;
-
-  g_return_val_if_fail (context != NULL, NULL);
-  g_return_val_if_fail (image_info != NULL, NULL);
-
-  cached = gst_msdk_context_get_cached_alloc_responses (context, alloc_resp);
-
-  if (!cached) {
-    GST_ERROR ("Failed to get the cached alloc response");
-    return NULL;
-  }
-
-  allocator = g_object_new (GST_TYPE_MSDK_VIDEO_ALLOCATOR, NULL);
-  if (!allocator)
-    return NULL;
-
-  g_atomic_int_inc (&cached->refcount);
-  allocator->context = gst_object_ref (context);
-  allocator->image_info = *image_info;
-  allocator->mfx_response = *alloc_resp;
-  allocator->alloc_response = &allocator->mfx_response;
-
-  return GST_ALLOCATOR_CAST (allocator);
-}
-
-/* GstMsdkDmaBufMemory */
-GstMemory *
-gst_msdk_dmabuf_memory_new (GstAllocator * base_allocator)
-{
-#ifndef _WIN32
-  mfxFrameSurface1 *surface;
-
-  g_return_val_if_fail (base_allocator, NULL);
-  g_return_val_if_fail (GST_IS_MSDK_DMABUF_ALLOCATOR (base_allocator), NULL);
-
-  surface = gst_msdk_video_allocator_get_surface (base_allocator);
-  if (!surface)
-    return NULL;
-
-  return gst_msdk_dmabuf_memory_new_with_surface (base_allocator, surface);
-#else
-  return NULL;
-#endif
-}
-
-GstMemory *
-gst_msdk_dmabuf_memory_new_with_surface (GstAllocator * allocator,
-    mfxFrameSurface1 * surface)
-{
-#ifndef _WIN32
-  GstMemory *mem;
-  GstMsdkMemoryID *mem_id;
-  gint fd;
-  gsize size;
-
-  g_return_val_if_fail (allocator, NULL);
-  g_return_val_if_fail (GST_IS_MSDK_DMABUF_ALLOCATOR (allocator), NULL);
-
-  mem_id = surface->Data.MemId;
-
-  g_assert (mem_id->desc.num_objects == 1);
-
-  fd = mem_id->desc.objects0.fd;
-  size = mem_id->desc.objects0.size;
-
-  if (fd < 0) {
-    GST_ERROR ("Failed to get dmabuf handle");
-    return NULL;
-  }
-
-  mem = gst_fd_allocator_alloc (allocator, fd, size,
-      GST_FD_MEMORY_FLAG_DONT_CLOSE);
-
-  if (!mem) {
-    GST_ERROR ("failed ! dmabuf fd: %d", fd);
-    return NULL;
-  }
-
-  gst_mini_object_set_qdata (GST_MINI_OBJECT_CAST (mem),
-      GST_MSDK_BUFFER_SURFACE, surface, NULL);
-
-  return mem;
-#else
-  return NULL;
-#endif
-}
-
-/* GstMsdkDmaBufAllocator */
-G_DEFINE_TYPE (GstMsdkDmaBufAllocator, gst_msdk_dmabuf_allocator,
-    GST_TYPE_DMABUF_ALLOCATOR);
-
-static void
-gst_msdk_dmabuf_allocator_finalize (GObject * object)
-{
-  GstMsdkDmaBufAllocator *allocator = GST_MSDK_DMABUF_ALLOCATOR_CAST (object);
-
-  gst_msdk_frame_free (allocator->context, allocator->alloc_response);
-
-  gst_object_unref (allocator->context);
-  G_OBJECT_CLASS (gst_msdk_dmabuf_allocator_parent_class)->finalize (object);
-}
-
-static void
-gst_msdk_dmabuf_allocator_class_init (GstMsdkDmaBufAllocatorClass * klass)
-{
-  GObjectClass *const object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = gst_msdk_dmabuf_allocator_finalize;
-}
-
-static void
-gst_msdk_dmabuf_allocator_init (GstMsdkDmaBufAllocator * allocator)
-{
-  GstAllocator *const base_allocator = GST_ALLOCATOR_CAST (allocator);
-  base_allocator->mem_type = GST_MSDK_DMABUF_MEMORY_NAME;
-}
-
-GstAllocator *
-gst_msdk_dmabuf_allocator_new (GstMsdkContext * context,
-    GstVideoInfo * image_info, mfxFrameAllocResponse * alloc_resp)
-{
-  GstMsdkDmaBufAllocator *allocator;
-  GstMsdkAllocResponse *cached = NULL;
-
-  g_return_val_if_fail (context != NULL, NULL);
-  g_return_val_if_fail (image_info != NULL, NULL);
-
-  cached = gst_msdk_context_get_cached_alloc_responses (context, alloc_resp);
-
-  if (!cached) {
-    GST_ERROR ("Failed to get the cached alloc response");
-    return NULL;
-  }
-
-  allocator = g_object_new (GST_TYPE_MSDK_DMABUF_ALLOCATOR, NULL);
-  if (!allocator)
-    return NULL;
-
-  g_atomic_int_inc (&cached->refcount);
-  allocator->context = gst_object_ref (context);
-  allocator->image_info = *image_info;
-  allocator->mfx_response = *alloc_resp;
-  allocator->alloc_response = &allocator->mfx_response;
-
-  return GST_ALLOCATOR_CAST (allocator);
-}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvideomemory.h Deleted

@@ -1,197 +0,0 @@
-/* GStreamer Intel MSDK plugin
- * Copyright (c) 2018, Intel Corporation
- * Copyright (c) 2018, Igalia S.L.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGDECE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GST_MSDK_VIDEO_MEMORY_H
-#define GST_MSDK_VIDEO_MEMORY_H
-
-#include "msdk.h"
-#include "gstmsdkcontext.h"
-#include "gstmsdkallocator.h"
-#include <gst/allocators/allocators.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstMsdkVideoMemory GstMsdkVideoMemory;
-typedef struct _GstMsdkVideoAllocator GstMsdkVideoAllocator;
-typedef struct _GstMsdkVideoAllocatorClass GstMsdkVideoAllocatorClass;
-typedef struct _GstMsdkDmaBufAllocator GstMsdkDmaBufAllocator;
-typedef struct _GstMsdkDmaBufAllocatorClass GstMsdkDmaBufAllocatorClass;
-
-/* ---------------------------------------------------------------------*/
-/* GstMsdkVideoMemory                                                        */
-/* ---------------------------------------------------------------------*/
-
-#define GST_MSDK_VIDEO_MEMORY_CAST(mem) \
-  ((GstMsdkVideoMemory *) (mem))
-
-#define GST_IS_MSDK_VIDEO_MEMORY(mem) \
-  ((mem) && (mem)->allocator && GST_IS_MSDK_VIDEO_ALLOCATOR((mem)->allocator))
-
-#define GST_MSDK_VIDEO_MEMORY_NAME             "GstMsdkVideoMemory"
-
-/*
- * GstMsdkVideoMemory:
- *
- * A MSDK memory object holder, including mfxFrameSurface,
- * video info of the surface.
- */
-struct _GstMsdkVideoMemory
-{
-  GstMemory parent_instance;
-
-  mfxFrameSurface1 *surface;
-  guint mapped;
-};
-
-GstMemory *
-gst_msdk_video_memory_new (GstAllocator * allocator);
-
-gboolean
-gst_msdk_video_memory_get_surface_available (GstMemory * mem);
-
-void
-gst_msdk_video_memory_release_surface (GstMemory * mem);
-
-gboolean
-gst_video_meta_map_msdk_memory (GstVideoMeta * meta, guint plane,
-    GstMapInfo * info, gpointer * data, gint * stride, GstMapFlags flags);
-
-gboolean
-gst_video_meta_unmap_msdk_memory (GstVideoMeta * meta, guint plane,
-    GstMapInfo * info);
-
-
-/* ---------------------------------------------------------------------*/
-/* GstMsdkVideoAllocator                                                */
-/* ---------------------------------------------------------------------*/
-
-#define GST_MSDK_VIDEO_ALLOCATOR_CAST(allocator) \
-  ((GstMsdkVideoAllocator *) (allocator))
-
-#define GST_TYPE_MSDK_VIDEO_ALLOCATOR \
-  (gst_msdk_video_allocator_get_type ())
-#define GST_MSDK_VIDEO_ALLOCATOR(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MSDK_VIDEO_ALLOCATOR, \
-      GstMsdkVideoAllocator))
-#define GST_IS_MSDK_VIDEO_ALLOCATOR(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MSDK_VIDEO_ALLOCATOR))
-
-/*
- * GstMsdkVideoAllocator:
- *
- * A MSDK video memory allocator object.
- */
-struct _GstMsdkVideoAllocator
-{
-  GstAllocator parent_instance;
-
-  GstMsdkContext *context;
-  GstVideoInfo image_info;
-  mfxFrameAllocResponse mfx_response;
-  mfxFrameAllocResponse *alloc_response;
-};
-
-/*
- * GstMsdkVideoAllocatorClass:
- *
- * A MSDK video memory allocator class.
- */
-struct _GstMsdkVideoAllocatorClass
-{
-  GstAllocatorClass parent_class;
-};
-
-GType gst_msdk_video_allocator_get_type (void);
-
-GstAllocator * gst_msdk_video_allocator_new (GstMsdkContext * context,
-    GstVideoInfo *image_info, mfxFrameAllocResponse * alloc_resp);
-
-/* ---------------------------------------------------------------------*/
-/* GstMsdkDmaBufMemory                                                  */
-/* ---------------------------------------------------------------------*/
-
-#define GST_MSDK_DMABUF_MEMORY_NAME             "GstMsdkDmaBufMemory"
-
-GstMemory *
-gst_msdk_dmabuf_memory_new (GstAllocator * allocator);
-
-GstMemory *
-gst_msdk_dmabuf_memory_new_with_surface (GstAllocator * base_allocator, mfxFrameSurface1 * surface);
-
-/* ---------------------------------------------------------------------*/
-/* GstMsdkDmaBufAllocator                                                */
-/* ---------------------------------------------------------------------*/
-
-#define GST_MSDK_DMABUF_ALLOCATOR_CAST(allocator) \
-  ((GstMsdkDmaBufAllocator *) (allocator))
-
-#define GST_TYPE_MSDK_DMABUF_ALLOCATOR \
-  (gst_msdk_dmabuf_allocator_get_type ())
-#define GST_MSDK_DMABUF_ALLOCATOR(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MSDK_DMABUF_ALLOCATOR, \
-      GstMsdkDmaBufAllocator))
-#define GST_IS_MSDK_DMABUF_ALLOCATOR(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MSDK_DMABUF_ALLOCATOR))
-
-/*
- * GstMsdkDmaBufAllocator:
- *
- * A MSDK DMABuf memory allocator object.
- */
-struct _GstMsdkDmaBufAllocator
-{
-  GstDmaBufAllocator parent_instance;
-
-  GstMsdkContext *context;
-  GstVideoInfo image_info;
-  mfxFrameAllocResponse mfx_response;
-  mfxFrameAllocResponse *alloc_response;
-};
-
-/*
- * GstMsdkDmaBufAllocatorClass:
- *
- * A MSDK DMABuf memory allocator class.
- */
-struct _GstMsdkDmaBufAllocatorClass
-{
-  GstDmaBufAllocatorClass parent_class;
-};
-
-GType gst_msdk_dmabuf_allocator_get_type (void);
-
-GstAllocator * gst_msdk_dmabuf_allocator_new (GstMsdkContext * context,
-    GstVideoInfo *image_info, mfxFrameAllocResponse * alloc_resp);
-
-G_END_DECLS
-
-#endif /* GST_MSDK_VIDEO_MEMORY_H */

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstcudafilter.c Deleted

@@ -1,57 +0,0 @@
-/* GStreamer
- * Copyright (C) 2019 Seungha Yang <seungha.yang@navercorp.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/cuda/gstcudaloader.h>
-#include <gst/cuda/gstcudanvrtc.h>
-
-#include "gstcudafilter.h"
-#include "gstcudaconvertscale.h"
-
-/* *INDENT-OFF* */
-const gchar *nvrtc_test_source =
-    "__global__ void\n"
-    "my_kernel (void) {}";
-/* *INDENT-ON* */
-
-void
-gst_cuda_filter_plugin_init (GstPlugin * plugin)
-{
-  gchar *test_ptx = NULL;
-
-  if (!gst_cuda_nvrtc_load_library ())
-    return;
-
-  test_ptx = gst_cuda_nvrtc_compile (nvrtc_test_source);
-
-  if (!test_ptx) {
-    return;
-  }
-  g_free (test_ptx);
-
-  gst_element_register (plugin, "cudaconvert", GST_RANK_NONE,
-      GST_TYPE_CUDA_CONVERT);
-  gst_element_register (plugin, "cudascale", GST_RANK_NONE,
-      GST_TYPE_CUDA_SCALE);
-  gst_element_register (plugin, "cudaconvertscale", GST_RANK_NONE,
-      GST_TYPE_CUDA_CONVERT_SCALE);
-}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstcudafilter.h Deleted

@@ -1,31 +0,0 @@
-/* GStreamer
- * Copyright (C) 2019 Seungha Yang <seungha.yang@navercorp.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_CUDA_FILTER_H__
-#define __GST_CUDA_FILTER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-void gst_cuda_filter_plugin_init (GstPlugin * plugin);
-
-G_END_DECLS
-
-#endif /* __GST_CUDA_FILTER_H__ */

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvav1dec.c Deleted

@@ -1,951 +0,0 @@
-/* GStreamer
- * Copyright (C) 2022 Seungha Yang <seungha@centricular.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * SECTION:element-nvav1dec
- * @title: nvav1dec
- *
- * GstCodecs based NVIDIA AV1 video decoder
- *
- * ## Example launch line
- * ```
- * gst-launch-1.0 filesrc location=/path/to/av1/file ! parsebin ! nvav1dec ! videoconvert ! autovideosink
- * ```
- *
- * Since: 1.22
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/cuda/gstcudautils.h>
-
-#include "gstnvav1dec.h"
-#include "gstnvdecoder.h"
-
-#include <string.h>
-
-GST_DEBUG_CATEGORY_STATIC (gst_nv_av1_dec_debug);
-#define GST_CAT_DEFAULT gst_nv_av1_dec_debug
-
-typedef struct _GstNvAV1Dec
-{
-  GstAV1Decoder parent;
-
-  GstCudaContext *context;
-  GstNvDecoder *decoder;
-
-  GstAV1SequenceHeaderOBU seq_hdr;
-  CUVIDPICPARAMS params;
-
-  /* slice buffer which will be passed to CUVIDPICPARAMS::pBitstreamData */
-  guint8 *bitstream_buffer;
-  /* allocated memory size of bitstream_buffer */
-  gsize bitstream_buffer_alloc_size;
-  /* current offset of bitstream_buffer (per frame) */
-  gsize bitstream_buffer_offset;
-
-  guint *tile_offsets;
-  guint tile_offsets_alloc_len;
-  guint num_tiles;
-
-  guint max_width;
-  guint max_height;
-  guint bitdepth;
-  guint8 film_grain_params_present;
-} GstNvAV1Dec;
-
-typedef struct _GstNvAV1DecClass
-{
-  GstAV1DecoderClass parent_class;
-  guint cuda_device_id;
-} GstNvAV1DecClass;
-
-enum
-{
-  PROP_0,
-  PROP_CUDA_DEVICE_ID,
-};
-
-static GTypeClass *parent_class = NULL;
-
-#define GST_NV_AV1_DEC(object) ((GstNvAV1Dec *) (object))
-#define GST_NV_AV1_DEC_GET_CLASS(object) \
-    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstNvAV1DecClass))
-
-static void gst_nv_av1_dec_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
-static void gst_nv_av1_dec_set_context (GstElement * element,
-    GstContext * context);
-static gboolean gst_nv_av1_dec_open (GstVideoDecoder * decoder);
-static gboolean gst_nv_av1_dec_close (GstVideoDecoder * decoder);
-static gboolean gst_nv_av1_dec_negotiate (GstVideoDecoder * decoder);
-static gboolean gst_nv_av1_dec_decide_allocation (GstVideoDecoder *
-    decoder, GstQuery * query);
-static gboolean gst_nv_av1_dec_src_query (GstVideoDecoder * decoder,
-    GstQuery * query);
-
-static GstFlowReturn gst_nv_av1_dec_new_sequence (GstAV1Decoder * decoder,
-    const GstAV1SequenceHeaderOBU * seq_hdr, gint max_dpb_size);
-static GstFlowReturn gst_nv_av1_dec_new_picture (GstAV1Decoder * decoder,
-    GstVideoCodecFrame * frame, GstAV1Picture * picture);
-static GstAV1Picture *gst_nv_av1_dec_duplicate_picture (GstAV1Decoder *
-    decoder, GstVideoCodecFrame * frame, GstAV1Picture * picture);
-static GstFlowReturn gst_nv_av1_dec_start_picture (GstAV1Decoder * decoder,
-    GstAV1Picture * picture, GstAV1Dpb * dpb);
-static GstFlowReturn gst_nv_av1_dec_decode_tile (GstAV1Decoder * decoder,
-    GstAV1Picture * picture, GstAV1Tile * tile);
-static GstFlowReturn gst_nv_av1_dec_end_picture (GstAV1Decoder * decoder,
-    GstAV1Picture * picture);
-static GstFlowReturn gst_nv_av1_dec_output_picture (GstAV1Decoder *
-    decoder, GstVideoCodecFrame * frame, GstAV1Picture * picture);
-static guint gst_nv_av1_dec_get_preferred_output_delay (GstAV1Decoder * decoder,
-    gboolean is_live);
-
-static void
-gst_nv_av1_dec_class_init (GstNvAV1DecClass * klass,
-    GstNvDecoderClassData * cdata)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
-  GstAV1DecoderClass *av1decoder_class = GST_AV1_DECODER_CLASS (klass);
-
-  object_class->get_property = gst_nv_av1_dec_get_property;
-
-  g_object_class_install_property (object_class, PROP_CUDA_DEVICE_ID,
-      g_param_spec_uint ("cuda-device-id", "CUDA device id",
-          "Assigned CUDA device id", 0, G_MAXINT, 0,
-          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
-  element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_set_context);
-
-  parent_class = (GTypeClass *) g_type_class_peek_parent (klass);
-  gst_element_class_set_static_metadata (element_class, "NVDEC AV1 Decoder",
-      "Codec/Decoder/Video/Hardware",
-      "NVIDIA AV1 video decoder", "Seungha Yang <seungha@centricular.com>");
-
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
-          cdata->sink_caps));
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
-          cdata->src_caps));
-
-  decoder_class->open = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_open);
-  decoder_class->close = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_close);
-  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_negotiate);
-  decoder_class->decide_allocation =
-      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_decide_allocation);
-  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_src_query);
-
-  av1decoder_class->new_sequence =
-      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_new_sequence);
-  av1decoder_class->new_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_new_picture);
-  av1decoder_class->duplicate_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_duplicate_picture);
-  av1decoder_class->start_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_start_picture);
-  av1decoder_class->decode_tile =
-      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_decode_tile);
-  av1decoder_class->end_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_end_picture);
-  av1decoder_class->output_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_output_picture);
-  av1decoder_class->get_preferred_output_delay =
-      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_get_preferred_output_delay);
-
-  klass->cuda_device_id = cdata->cuda_device_id;
-
-  gst_caps_unref (cdata->sink_caps);
-  gst_caps_unref (cdata->src_caps);
-  g_free (cdata);
-}
-
-static void
-gst_nv_av1_dec_init (GstNvAV1Dec * self)
-{
-}
-
-static void
-gst_nv_av1_dec_get_property (GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec)
-{
-  GstNvAV1DecClass *klass = GST_NV_AV1_DEC_GET_CLASS (object);
-
-  switch (prop_id) {
-    case PROP_CUDA_DEVICE_ID:
-      g_value_set_uint (value, klass->cuda_device_id);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_nv_av1_dec_set_context (GstElement * element, GstContext * context)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (element);
-  GstNvAV1DecClass *klass = GST_NV_AV1_DEC_GET_CLASS (self);
-
-  GST_DEBUG_OBJECT (self, "set context %s",
-      gst_context_get_context_type (context));
-
-  if (gst_cuda_handle_set_context (element, context, klass->cuda_device_id,
-          &self->context)) {
-    goto done;
-  }
-
-  if (self->decoder)
-    gst_nv_decoder_handle_set_context (self->decoder, element, context);
-
-done:
-  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
-}
-
-static gboolean
-gst_nv_av1_dec_open (GstVideoDecoder * decoder)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-  GstNvAV1DecClass *klass = GST_NV_AV1_DEC_GET_CLASS (self);
-
-  if (!gst_cuda_ensure_element_context (GST_ELEMENT (self),
-          klass->cuda_device_id, &self->context)) {
-    GST_ERROR_OBJECT (self, "Required element data is unavailable");
-    return FALSE;
-  }
-
-  self->decoder = gst_nv_decoder_new (self->context);
-  if (!self->decoder) {
-    GST_ERROR_OBJECT (self, "Failed to create decoder object");
-    gst_clear_object (&self->context);
-
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-static void
-gst_nv_av1_dec_reset_bitstream_params (GstNvAV1Dec * self)
-{
-  self->bitstream_buffer_offset = 0;
-  self->num_tiles = 0;
-
-  self->params.nBitstreamDataLen = 0;
-  self->params.pBitstreamData = NULL;
-  self->params.nNumSlices = 0;
-  self->params.pSliceDataOffsets = NULL;
-}
-
-static gboolean
-gst_nv_av1_dec_close (GstVideoDecoder * decoder)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-
-  gst_clear_object (&self->decoder);
-  gst_clear_object (&self->context);
-
-  gst_nv_av1_dec_reset_bitstream_params (self);
-
-  g_free (self->bitstream_buffer);
-  self->bitstream_buffer = NULL;
-
-  g_free (self->tile_offsets);
-  self->tile_offsets = NULL;
-
-  self->bitstream_buffer_alloc_size = 0;
-  self->tile_offsets_alloc_len = 0;
-
-  return TRUE;
-}
-
-static gboolean
-gst_nv_av1_dec_negotiate (GstVideoDecoder * decoder)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-  GstAV1Decoder *av1dec = GST_AV1_DECODER (decoder);
-
-  GST_DEBUG_OBJECT (self, "negotiate");
-
-  gst_nv_decoder_negotiate (self->decoder, decoder, av1dec->input_state);
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
-}
-
-static gboolean
-gst_nv_av1_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-
-  if (!gst_nv_decoder_decide_allocation (self->decoder, decoder, query)) {
-    GST_WARNING_OBJECT (self, "Failed to handle decide allocation");
-    return FALSE;
-  }
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
-      (decoder, query);
-}
-
-static gboolean
-gst_nv_av1_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_CONTEXT:
-      if (gst_cuda_handle_context_query (GST_ELEMENT (decoder), query,
-              self->context)) {
-        return TRUE;
-      } else if (self->decoder &&
-          gst_nv_decoder_handle_context_query (self->decoder, decoder, query)) {
-        return TRUE;
-      }
-      break;
-    default:
-      break;
-  }
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
-}
-
-static GstFlowReturn
-gst_nv_av1_dec_new_sequence (GstAV1Decoder * decoder,
-    const GstAV1SequenceHeaderOBU * seq_hdr, gint max_dpb_size)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-  gboolean modified = FALSE;
-  guint max_width, max_height;
-
-  GST_LOG_OBJECT (self, "new sequence");
-
-  if (seq_hdr->seq_profile != GST_AV1_PROFILE_0) {
-    GST_WARNING_OBJECT (self, "Unsupported profile %d", seq_hdr->seq_profile);
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  if (seq_hdr->num_planes != 3) {
-    GST_WARNING_OBJECT (self, "Monochrome is not supported");
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  self->seq_hdr = *seq_hdr;
-
-  if (self->bitdepth != seq_hdr->bit_depth) {
-    GST_INFO_OBJECT (self, "Bitdepth changed %d -> %d", self->bitdepth,
-        seq_hdr->bit_depth);
-    self->bitdepth = seq_hdr->bit_depth;
-    modified = TRUE;
-  }
-
-  max_width = seq_hdr->max_frame_width_minus_1 + 1;
-  max_height = seq_hdr->max_frame_height_minus_1 + 1;
-
-  if (self->max_width != max_width || self->max_height != max_height) {
-    GST_INFO_OBJECT (self, "Resolution changed %dx%d -> %dx%d",
-        self->max_width, self->max_height, max_width, max_height);
-    self->max_width = max_width;
-    self->max_height = max_height;
-    modified = TRUE;
-  }
-
-  if (self->film_grain_params_present != seq_hdr->film_grain_params_present) {
-    GST_INFO_OBJECT (self, "Film grain present changed %d -> %d",
-        self->film_grain_params_present, seq_hdr->film_grain_params_present);
-    self->film_grain_params_present = seq_hdr->film_grain_params_present;
-    modified = TRUE;
-  }
-
-  if (modified || !gst_nv_decoder_is_configured (self->decoder)) {
-    GstVideoInfo info;
-    GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
-
-    if (self->bitdepth == 8) {
-      out_format = GST_VIDEO_FORMAT_NV12;
-    } else if (self->bitdepth == 10) {
-      out_format = GST_VIDEO_FORMAT_P010_10LE;
-    } else {
-      GST_WARNING_OBJECT (self, "Invalid bit-depth %d", seq_hdr->bit_depth);
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    gst_video_info_set_format (&info,
-        out_format, self->max_width, self->max_height);
-
-    if (!gst_nv_decoder_configure (self->decoder, cudaVideoCodec_AV1,
-            &info, self->max_width, self->max_height, self->bitdepth,
-            max_dpb_size, self->film_grain_params_present ? TRUE : FALSE)) {
-      GST_ERROR_OBJECT (self, "Failed to create decoder");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
-      GST_ERROR_OBJECT (self, "Failed to negotiate with downstream");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-  }
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_av1_dec_new_picture (GstAV1Decoder * decoder,
-    GstVideoCodecFrame * frame, GstAV1Picture * picture)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-  GstNvDecoderFrame *nv_frame;
-
-  nv_frame = gst_nv_decoder_new_frame (self->decoder);
-  if (!nv_frame) {
-    GST_ERROR_OBJECT (self, "No available decoder frame");
-    return GST_FLOW_ERROR;
-  }
-
-  GST_LOG_OBJECT (self,
-      "New decoder frame %p (index %d)", nv_frame, nv_frame->index);
-
-  gst_av1_picture_set_user_data (picture,
-      nv_frame, (GDestroyNotify) gst_nv_decoder_frame_unref);
-
-  return GST_FLOW_OK;
-}
-
-static GstNvDecoderFrame *
-gst_nv_av1_dec_get_decoder_frame_from_picture (GstNvAV1Dec * self,
-    GstAV1Picture * picture)
-{
-  GstNvDecoderFrame *frame;
-
-  frame = (GstNvDecoderFrame *) gst_av1_picture_get_user_data (picture);
-
-  if (!frame)
-    GST_DEBUG_OBJECT (self, "current picture does not have decoder frame");
-
-  return frame;
-}
-
-static GstAV1Picture *
-gst_nv_av1_dec_duplicate_picture (GstAV1Decoder * decoder,
-    GstVideoCodecFrame * frame, GstAV1Picture * picture)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-  GstNvDecoderFrame *nv_frame;
-  GstAV1Picture *new_picture;
-
-  nv_frame = gst_nv_av1_dec_get_decoder_frame_from_picture (self, picture);
-
-  if (!nv_frame) {
-    GST_ERROR_OBJECT (self, "Parent picture does not have decoder frame");
-    return NULL;
-  }
-
-  new_picture = gst_av1_picture_new ();
-  new_picture->frame_hdr = picture->frame_hdr;
-
-  gst_av1_picture_set_user_data (new_picture,
-      gst_nv_decoder_frame_ref (nv_frame),
-      (GDestroyNotify) gst_nv_decoder_frame_unref);
-
-  return new_picture;
-}
-
-static inline guint8
-gst_nv_av1_dec_get_lr_unit_size (guint size)
-{
-  switch (size) {
-    case 32:
-      return 0;
-    case 64:
-      return 1;
-    case 128:
-      return 2;
-    case 256:
-      return 3;
-    default:
-      break;
-  }
-
-  return 3;
-}
-
-static GstFlowReturn
-gst_nv_av1_dec_start_picture (GstAV1Decoder * decoder, GstAV1Picture * picture,
-    GstAV1Dpb * dpb)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-  CUVIDPICPARAMS *params = &self->params;
-  CUVIDAV1PICPARAMS *av1_params = &params->CodecSpecific.av1;
-  const GstAV1SequenceHeaderOBU *seq_hdr = &self->seq_hdr;
-  const GstAV1FrameHeaderOBU *frame_hdr = &picture->frame_hdr;
-  const GstAV1GlobalMotionParams *gmp = &frame_hdr->global_motion_params;
-  const GstAV1QuantizationParams *qp = &frame_hdr->quantization_params;
-  const GstAV1TileInfo *ti = &frame_hdr->tile_info;
-  const GstAV1CDEFParams *cp = &frame_hdr->cdef_params;
-  const GstAV1SegmenationParams *sp = &frame_hdr->segmentation_params;
-  const GstAV1LoopFilterParams *lp = &frame_hdr->loop_filter_params;
-  const GstAV1LoopRestorationParams *lrp = &frame_hdr->loop_restoration_params;
-  const GstAV1FilmGrainParams *fgp = &frame_hdr->film_grain_params;
-  GstNvDecoderFrame *frame;
-  GstNvDecoderFrame *other_frame;
-  GstAV1Picture *other_pic;
-  guint i, j;
-
-  frame = gst_nv_av1_dec_get_decoder_frame_from_picture (self, picture);
-  if (!frame) {
-    GST_ERROR_OBJECT (self, "Decoder frame is unavailable");
-    return GST_FLOW_ERROR;
-  }
-
-  memset (params, 0, sizeof (CUVIDPICPARAMS));
-
-  params->PicWidthInMbs = GST_ROUND_UP_16 (frame_hdr->frame_width) >> 4;
-  params->FrameHeightInMbs = GST_ROUND_UP_16 (frame_hdr->frame_height) >> 4;
-  params->CurrPicIdx = frame->index;
-  params->intra_pic_flag = frame_hdr->frame_is_intra;
-
-  av1_params->width = frame_hdr->frame_width;
-  av1_params->height = frame_hdr->frame_height;
-  av1_params->frame_offset = frame_hdr->order_hint;
-  av1_params->decodePicIdx = frame->decode_frame_index;
-
-  /* sequence header */
-  av1_params->profile = seq_hdr->seq_profile;
-  av1_params->use_128x128_superblock = seq_hdr->use_128x128_superblock;
-  av1_params->subsampling_x = seq_hdr->color_config.subsampling_x;
-  av1_params->subsampling_y = seq_hdr->color_config.subsampling_y;
-  av1_params->mono_chrome = seq_hdr->color_config.mono_chrome;
-  av1_params->bit_depth_minus8 = seq_hdr->bit_depth - 8;
-  av1_params->enable_filter_intra = seq_hdr->enable_filter_intra;
-  av1_params->enable_intra_edge_filter = seq_hdr->enable_intra_edge_filter;
-  av1_params->enable_interintra_compound = seq_hdr->enable_interintra_compound;
-  av1_params->enable_masked_compound = seq_hdr->enable_masked_compound;
-  av1_params->enable_dual_filter = seq_hdr->enable_dual_filter;
-  av1_params->enable_order_hint = seq_hdr->enable_order_hint;
-  av1_params->order_hint_bits_minus1 = seq_hdr->order_hint_bits_minus_1;
-  av1_params->enable_jnt_comp = seq_hdr->enable_jnt_comp;
-  av1_params->enable_superres = seq_hdr->enable_superres;
-  av1_params->enable_cdef = seq_hdr->enable_cdef;
-  av1_params->enable_restoration = seq_hdr->enable_restoration;
-  av1_params->enable_fgs = seq_hdr->film_grain_params_present;
-
-  /* frame header */
-  av1_params->frame_type = frame_hdr->frame_type;
-  av1_params->show_frame = frame_hdr->show_frame;
-  av1_params->disable_cdf_update = frame_hdr->disable_cdf_update;
-  av1_params->allow_screen_content_tools =
-      frame_hdr->allow_screen_content_tools;
-  if (frame_hdr->force_integer_mv || frame_hdr->frame_is_intra)
-    av1_params->force_integer_mv = 1;
-  else
-    av1_params->force_integer_mv = 0;
-  if (frame_hdr->use_superres) {
-    av1_params->coded_denom =
-        frame_hdr->superres_denom - GST_AV1_SUPERRES_DENOM_MIN;
-  } else {
-    av1_params->coded_denom = 0;
-  }
-  av1_params->allow_intrabc = frame_hdr->allow_intrabc;
-  av1_params->allow_high_precision_mv = frame_hdr->allow_high_precision_mv;
-  av1_params->interp_filter = frame_hdr->interpolation_filter;
-  av1_params->switchable_motion_mode = frame_hdr->is_motion_mode_switchable;
-  av1_params->use_ref_frame_mvs = frame_hdr->use_ref_frame_mvs;
-  av1_params->disable_frame_end_update_cdf =
-      frame_hdr->disable_frame_end_update_cdf;
-  av1_params->delta_q_present = qp->delta_q_present;
-  av1_params->delta_q_res = qp->delta_q_res;
-  av1_params->using_qmatrix = qp->using_qmatrix;
-  av1_params->coded_lossless = frame_hdr->coded_lossless;
-  av1_params->use_superres = frame_hdr->use_superres;
-  av1_params->tx_mode = frame_hdr->tx_mode;
-  av1_params->reference_mode = frame_hdr->reference_select;
-  av1_params->allow_warped_motion = frame_hdr->allow_warped_motion;
-  av1_params->reduced_tx_set = frame_hdr->reduced_tx_set;
-  av1_params->skip_mode = frame_hdr->skip_mode_present;
-
-  /* tiling info */
-  av1_params->num_tile_cols = ti->tile_cols;
-  av1_params->num_tile_rows = ti->tile_rows;
-  av1_params->context_update_tile_id = ti->context_update_tile_id;
-  for (i = 0; i < ti->tile_cols; i++)
-    av1_params->tile_widthsi = ti->width_in_sbs_minus_1i + 1;
-
-  for (i = 0; i < ti->tile_rows; i++)
-    av1_params->tile_heightsi = ti->height_in_sbs_minus_1i + 1;
-
-  /* CDEF */
-  av1_params->cdef_damping_minus_3 = cp->cdef_damping - 3;
-  av1_params->cdef_bits = cp->cdef_bits;
-  for (i = 0; i < GST_AV1_CDEF_MAX; i++) {
-    guint8 primary;
-    guint8 secondary;
-
-    primary = cp->cdef_y_pri_strengthi;
-    secondary = cp->cdef_y_sec_strengthi;
-    if (secondary == 4)
-      secondary--;
-
-    av1_params->cdef_y_strengthi = (primary & 0x0f) | (secondary << 4);
-
-    primary = cp->cdef_uv_pri_strengthi;
-    secondary = cp->cdef_uv_sec_strengthi;
-    if (secondary == 4)
-      secondary--;
-
-    av1_params->cdef_uv_strengthi = (primary & 0x0f) | (secondary << 4);
-  }
-
-  /* SkipModeFrames */
-  if (frame_hdr->skip_mode_present) {
-    av1_params->SkipModeFrame0 = frame_hdr->skip_mode_frame0;
-    av1_params->SkipModeFrame1 = frame_hdr->skip_mode_frame1;
-  }
-
-  /* qp information */
-  av1_params->base_qindex = qp->base_q_idx;
-  av1_params->qp_y_dc_delta_q = qp->delta_q_y_dc;
-  av1_params->qp_u_dc_delta_q = qp->delta_q_u_dc;
-  av1_params->qp_u_ac_delta_q = qp->delta_q_u_ac;
-  av1_params->qp_v_dc_delta_q = qp->delta_q_v_dc;
-  av1_params->qp_v_ac_delta_q = qp->delta_q_v_ac;
-  av1_params->qm_y = qp->qm_y;
-  av1_params->qm_u = qp->qm_u;
-  av1_params->qm_v = qp->qm_v;
-
-  /* segmentation */
-  av1_params->segmentation_enabled = sp->segmentation_enabled;
-  av1_params->segmentation_update_map = sp->segmentation_update_map;
-  av1_params->segmentation_update_data = sp->segmentation_update_data;
-  av1_params->segmentation_temporal_update = sp->segmentation_temporal_update;
-  for (i = 0; i < GST_AV1_MAX_SEGMENTS; i++) {
-    for (j = 0; j < GST_AV1_SEG_LVL_MAX; j++) {
-      av1_params->segmentation_feature_dataij = sp->feature_dataij;
-      av1_params->segmentation_feature_maski |=
-          sp->feature_enabledij << j;
-    }
-  }
-
-  /* loopfilter */
-  av1_params->loop_filter_level0 = lp->loop_filter_level0;
-  av1_params->loop_filter_level1 = lp->loop_filter_level1;
-  av1_params->loop_filter_level_u = lp->loop_filter_level2;
-  av1_params->loop_filter_level_v = lp->loop_filter_level3;
-  av1_params->loop_filter_sharpness = lp->loop_filter_sharpness;
-  for (i = 0; i < GST_AV1_TOTAL_REFS_PER_FRAME; i++) {
-    av1_params->loop_filter_ref_deltasi = lp->loop_filter_ref_deltasi;
-  }
-  av1_params->loop_filter_mode_deltas0 = lp->loop_filter_mode_deltas0;
-  av1_params->loop_filter_mode_deltas1 = lp->loop_filter_mode_deltas1;
-  av1_params->loop_filter_delta_enabled = lp->loop_filter_delta_enabled;
-  av1_params->loop_filter_delta_update = lp->loop_filter_delta_update;
-  av1_params->delta_lf_present = lp->delta_lf_present;
-  av1_params->delta_lf_res = lp->delta_lf_res;
-  av1_params->delta_lf_multi = lp->delta_lf_multi;
-
-  /* restoration */
-  for (i = 0; i < 3; i++) {
-    av1_params->lr_unit_sizei =
-        gst_nv_av1_dec_get_lr_unit_size (lrp->loop_restoration_sizei);
-  }
-  av1_params->lr_type0 = lrp->frame_restoration_type0;
-  av1_params->lr_type1 = lrp->frame_restoration_type1;
-  av1_params->lr_type2 = lrp->frame_restoration_type2;
-
-  /* reference frames */
-  for (i = 0; i < GST_AV1_TOTAL_REFS_PER_FRAME; i++) {
-    guint8 ref_idx = 0xff;
-
-    other_pic = dpb->pic_listi;
-    if (other_pic) {
-      other_frame =
-          gst_nv_av1_dec_get_decoder_frame_from_picture (self, other_pic);
-      if (!other_frame) {
-        GST_ERROR_OBJECT (self, "reference frame is unavailable");
-        return GST_FLOW_ERROR;
-      }
-
-      ref_idx = other_frame->decode_frame_index;
-    }
-
-    av1_params->ref_frame_mapi = ref_idx;
-  }
-
-  if (frame_hdr->primary_ref_frame == GST_AV1_PRIMARY_REF_NONE) {
-    av1_params->primary_ref_frame = 0xff;
-  } else {
-    guint8 primary_ref_idx;
-
-    g_assert (frame_hdr->primary_ref_frame < 8);
-
-    primary_ref_idx = frame_hdr->ref_frame_idxframe_hdr->primary_ref_frame;
-    av1_params->primary_ref_frame = av1_params->ref_frame_mapprimary_ref_idx;
-  }
-  av1_params->temporal_layer_id = picture->temporal_id;
-  av1_params->spatial_layer_id = picture->spatial_id;
-
-  /* ref frame list and global motion */
-  for (i = 0; i < GST_AV1_REFS_PER_FRAME; i++) {
-    gint8 ref_idx = frame_hdr->ref_frame_idxi;
-
-    other_pic = NULL;
-
-    if (ref_idx >= 0)
-      other_pic = dpb->pic_listref_idx;
-
-    if (other_pic) {
-      other_frame =
-          gst_nv_av1_dec_get_decoder_frame_from_picture (self, other_pic);
-
-      av1_params->ref_framei.index = other_frame->decode_frame_index;
-      av1_params->ref_framei.width = other_pic->frame_hdr.frame_width;
-      av1_params->ref_framei.height = other_pic->frame_hdr.frame_height;
-    } else {
-      av1_params->ref_framei.index = 0xff;
-    }
-
-    av1_params->global_motioni.invalid = gmp->invalidi;
-    av1_params->global_motioni.wmtype =
-        gmp->gm_typeGST_AV1_REF_LAST_FRAME + i;
-    for (j = 0; j < 6; j++) {
-      av1_params->global_motioni.wmmatj =
-          gmp->gm_paramsGST_AV1_REF_LAST_FRAME + ij;
-    }
-  }
-
-  /* film grain params */
-  if (seq_hdr->film_grain_params_present) {
-    av1_params->apply_grain = fgp->apply_grain;
-    av1_params->overlap_flag = fgp->overlap_flag;
-    av1_params->scaling_shift_minus8 = fgp->grain_scaling_minus_8;
-    av1_params->chroma_scaling_from_luma = fgp->chroma_scaling_from_luma;
-    av1_params->ar_coeff_lag = fgp->ar_coeff_lag;
-    av1_params->ar_coeff_shift_minus6 = fgp->ar_coeff_shift_minus_6;
-    av1_params->grain_scale_shift = fgp->grain_scale_shift;
-    av1_params->clip_to_restricted_range = fgp->clip_to_restricted_range;
-    av1_params->num_y_points = fgp->num_y_points;
-    for (i = 0; i < fgp->num_y_points && i < 14; i++) {
-      av1_params->scaling_points_yi0 = fgp->point_y_valuei;
-      av1_params->scaling_points_yi1 = fgp->point_y_scalingi;
-    }
-
-    av1_params->num_cb_points = fgp->num_cb_points;
-    for (i = 0; i < fgp->num_cb_points && i < 10; i++) {
-      av1_params->scaling_points_cbi0 = fgp->point_cb_valuei;
-      av1_params->scaling_points_cbi1 = fgp->point_cb_scalingi;
-    }
-
-    av1_params->num_cr_points = fgp->num_cr_points;
-    for (i = 0; i < fgp->num_cr_points && i < 10; i++) {
-      av1_params->scaling_points_cri0 = fgp->point_cr_valuei;
-      av1_params->scaling_points_cri1 = fgp->point_cr_scalingi;
-    }
-
-    av1_params->random_seed = fgp->grain_seed;
-    for (i = 0; i < 24; i++) {
-      av1_params->ar_coeffs_yi = (short) fgp->ar_coeffs_y_plus_128i - 128;
-    }
-
-    for (i = 0; i < 25; i++) {
-      av1_params->ar_coeffs_cbi = (short) fgp->ar_coeffs_cb_plus_128i - 128;
-      av1_params->ar_coeffs_cri = (short) fgp->ar_coeffs_cr_plus_128i - 128;
-    }
-    av1_params->cb_mult = fgp->cb_mult;
-    av1_params->cb_luma_mult = fgp->cb_luma_mult;
-    av1_params->cb_offset = fgp->cb_offset;
-    av1_params->cr_mult = fgp->cr_mult;
-    av1_params->cr_luma_mult = fgp->cr_luma_mult;
-    av1_params->cr_offset = fgp->cr_offset;
-  }
-
-  gst_nv_av1_dec_reset_bitstream_params (self);
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_av1_dec_decode_tile (GstAV1Decoder * decoder,
-    GstAV1Picture * picture, GstAV1Tile * tile)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-  GstAV1TileGroupOBU *tile_group = &tile->tile_group;
-  guint i;
-  guint buffer_size;
-
-  if (tile_group->num_tiles * 2 > self->tile_offsets_alloc_len) {
-    self->tile_offsets_alloc_len = tile_group->num_tiles * 2;
-
-    self->tile_offsets = (guint *) g_realloc_n (self->tile_offsets,
-        self->tile_offsets_alloc_len, sizeof (guint));
-  }
-
-  self->num_tiles = tile_group->num_tiles;
-
-  for (i = tile_group->tg_start; i <= tile_group->tg_end; i++) {
-    guint offset = self->bitstream_buffer_offset +
-        tile_group->entryi.tile_offset;
-
-    self->tile_offsetsi * 2 = offset;
-    self->tile_offsetsi * 2 + 1 = offset + tile_group->entryi.tile_size;
-  }
-
-  buffer_size = self->bitstream_buffer_offset + tile->obu.obu_size;
-  if (buffer_size > self->bitstream_buffer_alloc_size) {
-    guint alloc_size = buffer_size * 2;
-
-    self->bitstream_buffer = (guint8 *) g_realloc (self->bitstream_buffer,
-        alloc_size);
-    self->bitstream_buffer_alloc_size = alloc_size;
-  }
-
-  memcpy (self->bitstream_buffer + self->bitstream_buffer_offset,
-      tile->obu.data, tile->obu.obu_size);
-
-  self->bitstream_buffer_offset += tile->obu.obu_size;
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_av1_dec_end_picture (GstAV1Decoder * decoder, GstAV1Picture * picture)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-  gboolean ret;
-  CUVIDPICPARAMS *params = &self->params;
-
-  params->nBitstreamDataLen = self->bitstream_buffer_offset;
-  params->pBitstreamData = self->bitstream_buffer;
-  params->nNumSlices = self->num_tiles;
-  params->pSliceDataOffsets = self->tile_offsets;
-
-  ret = gst_nv_decoder_decode_picture (self->decoder, params);
-
-  if (!ret) {
-    GST_ERROR_OBJECT (self, "Failed to decode picture");
-    return GST_FLOW_ERROR;
-  }
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_av1_dec_output_picture (GstAV1Decoder * decoder,
-    GstVideoCodecFrame * frame, GstAV1Picture * picture)
-{
-  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
-  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
-  GstNvDecoderFrame *decoder_frame;
-
-  GST_LOG_OBJECT (self, "Outputting picture %p", picture);
-
-  decoder_frame = (GstNvDecoderFrame *) gst_av1_picture_get_user_data (picture);
-  if (!decoder_frame) {
-    GST_ERROR_OBJECT (self, "No decoder frame in picture %p", picture);
-    goto error;
-  }
-
-  if (!gst_nv_decoder_finish_frame (self->decoder, vdec, picture->discont_state,
-          decoder_frame, &frame->output_buffer)) {
-    GST_ERROR_OBJECT (self, "Failed to handle output picture");
-    goto error;
-  }
-
-  gst_av1_picture_unref (picture);
-
-  return gst_video_decoder_finish_frame (vdec, frame);
-
-error:
-  gst_video_decoder_drop_frame (vdec, frame);
-  gst_av1_picture_unref (picture);
-
-  return GST_FLOW_ERROR;
-}
-
-static guint
-gst_nv_av1_dec_get_preferred_output_delay (GstAV1Decoder * decoder,
-    gboolean is_live)
-{
-  /* Prefer to zero latency for live pipeline */
-  if (is_live)
-    return 0;
-
-  /* NVCODEC SDK uses 4 frame delay for better throughput performance */
-  return 4;
-}
-
-void
-gst_nv_av1_dec_register (GstPlugin * plugin, guint device_id, guint rank,
-    GstCaps * sink_caps, GstCaps * src_caps)
-{
-  GType type;
-  gchar *type_name;
-  gchar *feature_name;
-  guint index = 0;
-  GTypeInfo type_info = {
-    sizeof (GstNvAV1DecClass),
-    NULL,
-    NULL,
-    (GClassInitFunc) gst_nv_av1_dec_class_init,
-    NULL,
-    NULL,
-    sizeof (GstNvAV1Dec),
-    0,
-    (GInstanceInitFunc) gst_nv_av1_dec_init,
-  };
-  GstNvDecoderClassData *cdata;
-
-  GST_DEBUG_CATEGORY_INIT (gst_nv_av1_dec_debug, "nvav1dec", 0, "nvav1dec");
-
-  cdata = g_new0 (GstNvDecoderClassData, 1);
-  cdata->sink_caps = gst_caps_ref (sink_caps);
-  cdata->src_caps = gst_caps_ref (src_caps);
-  cdata->cuda_device_id = device_id;
-
-  type_info.class_data = cdata;
-
-  type_name = g_strdup ("GstNvAV1Dec");
-  feature_name = g_strdup ("nvav1dec");
-
-  while (g_type_from_name (type_name)) {
-    index++;
-    g_free (type_name);
-    g_free (feature_name);
-    type_name = g_strdup_printf ("GstNvAV1Device%dDec", index);
-    feature_name = g_strdup_printf ("nvav1device%ddec", index);
-  }
-
-  type = g_type_register_static (GST_TYPE_AV1_DECODER,
-      type_name, &type_info, 0);
-
-  /* make lower rank than default device */
-  if (rank > 0 && index != 0)
-    rank--;
-
-  if (index != 0)
-    gst_element_type_set_skip_documentation (type);
-
-  if (!gst_element_register (plugin, feature_name, rank, type))
-    GST_WARNING ("Failed to register plugin '%s'", type_name);
-
-  g_free (type_name);
-  g_free (feature_name);
-}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvdecoder.c Deleted

@@ -1,1691 +0,0 @@
-/* GStreamer
- * Copyright (C) 2017 Ericsson AB. All rights reserved.
- * Copyright (C) 2020 Seungha Yang <seungha@centricular.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_NVCODEC_GST_GL
-#include <gst/gl/gl.h>
-#include <gst/gl/gstglfuncs.h>
-#endif
-
-#include <gst/cuda/gstcudamemory.h>
-#include <gst/cuda/gstcudabufferpool.h>
-#include "gstnvdecoder.h"
-#include <string.h>
-
-GST_DEBUG_CATEGORY_EXTERN (gst_nv_decoder_debug);
-#define GST_CAT_DEFAULT gst_nv_decoder_debug
-
-#ifdef HAVE_NVCODEC_GST_GL
-#define SUPPORTED_GL_APIS (GST_GL_API_OPENGL | GST_GL_API_OPENGL3)
-#endif
-
-typedef struct _GstNvDecoderFrameInfo
-{
-  gboolean available;
-} GstNvDecoderFrameInfo;
-
-typedef enum
-{
-  GST_NV_DECODER_OUTPUT_TYPE_SYSTEM = 0,
-  GST_NV_DECODER_OUTPUT_TYPE_GL,
-  GST_NV_DECODER_OUTPUT_TYPE_CUDA,
-  /* FIXME: add support D3D11 memory */
-} GstNvDecoderOutputType;
-
-struct _GstNvDecoder
-{
-  GstObject parent;
-  GstCudaContext *context;
-  CUstream cuda_stream;
-  CUvideodecoder decoder_handle;
-
-  GstNvDecoderFrameInfo *frame_pool;
-  guint pool_size;
-  gboolean alloc_aux_frame;
-
-  GstVideoInfo info;
-  GstVideoInfo coded_info;
-
-  gboolean configured;
-
-  /* For OpenGL interop. */
-  GstObject *gl_display;
-  GstObject *gl_context;
-  GstObject *other_gl_context;
-
-  GstNvDecoderOutputType output_type;
-};
-
-static void gst_nv_decoder_dispose (GObject * object);
-static void gst_nv_decoder_reset (GstNvDecoder * self);
-
-#define parent_class gst_nv_decoder_parent_class
-G_DEFINE_TYPE (GstNvDecoder, gst_nv_decoder, GST_TYPE_OBJECT);
-
-static void
-gst_nv_decoder_class_init (GstNvDecoderClass * klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->dispose = gst_nv_decoder_dispose;
-}
-
-static void
-gst_nv_decoder_init (GstNvDecoder * self)
-{
-}
-
-static void
-gst_nv_decoder_dispose (GObject * object)
-{
-  GstNvDecoder *self = GST_NV_DECODER (object);
-
-  gst_nv_decoder_reset (self);
-
-  if (self->context && self->cuda_stream) {
-    if (gst_cuda_context_push (self->context)) {
-      gst_cuda_result (CuStreamDestroy (self->cuda_stream));
-      gst_cuda_context_pop (NULL);
-      self->cuda_stream = NULL;
-    }
-  }
-
-  gst_clear_object (&self->context);
-  gst_clear_object (&self->gl_display);
-  gst_clear_object (&self->gl_context);
-  gst_clear_object (&self->other_gl_context);
-
-  G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static cudaVideoChromaFormat
-chroma_format_from_video_format (GstVideoFormat format)
-{
-  switch (format) {
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_P010_10LE:
-    case GST_VIDEO_FORMAT_P010_10BE:
-    case GST_VIDEO_FORMAT_P016_LE:
-    case GST_VIDEO_FORMAT_P016_BE:
-      return cudaVideoChromaFormat_420;
-    case GST_VIDEO_FORMAT_Y444:
-    case GST_VIDEO_FORMAT_Y444_16LE:
-    case GST_VIDEO_FORMAT_Y444_16BE:
-      return cudaVideoChromaFormat_444;
-    default:
-      g_assert_not_reached ();
-      break;
-  }
-
-  return cudaVideoChromaFormat_420;
-}
-
-static cudaVideoSurfaceFormat
-output_format_from_video_format (GstVideoFormat format)
-{
-  switch (format) {
-    case GST_VIDEO_FORMAT_NV12:
-      return cudaVideoSurfaceFormat_NV12;
-    case GST_VIDEO_FORMAT_P010_10LE:
-    case GST_VIDEO_FORMAT_P010_10BE:
-    case GST_VIDEO_FORMAT_P016_LE:
-    case GST_VIDEO_FORMAT_P016_BE:
-      return cudaVideoSurfaceFormat_P016;
-    case GST_VIDEO_FORMAT_Y444:
-      return cudaVideoSurfaceFormat_YUV444;
-    case GST_VIDEO_FORMAT_Y444_16LE:
-    case GST_VIDEO_FORMAT_Y444_16BE:
-      return cudaVideoSurfaceFormat_YUV444_16Bit;
-    default:
-      g_assert_not_reached ();
-      break;
-  }
-
-  return cudaVideoSurfaceFormat_NV12;
-}
-
-static gboolean
-gst_nv_decoder_prepare_frame_pool (GstNvDecoder * self, guint pool_size)
-{
-  gint i;
-
-  self->frame_pool = g_new (GstNvDecoderFrameInfo, pool_size);
-
-  for (i = 0; i < pool_size; i++)
-    self->frame_pooli.available = TRUE;
-
-  self->pool_size = pool_size;
-
-  return TRUE;
-}
-
-GstNvDecoder *
-gst_nv_decoder_new (GstCudaContext * context)
-{
-  GstNvDecoder *self;
-
-  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), NULL);
-
-  self = g_object_new (GST_TYPE_NV_DECODER, NULL);
-  self->context = gst_object_ref (context);
-  gst_object_ref_sink (self);
-
-  if (gst_cuda_context_push (context)) {
-    CUresult cuda_ret;
-    cuda_ret = CuStreamCreate (&self->cuda_stream, CU_STREAM_DEFAULT);
-    if (!gst_cuda_result (cuda_ret)) {
-      GST_WARNING_OBJECT (self,
-          "Could not create CUDA stream, will use default stream");
-      self->cuda_stream = NULL;
-    }
-
-    gst_cuda_context_pop (NULL);
-  }
-
-  return self;
-}
-
-gboolean
-gst_nv_decoder_is_configured (GstNvDecoder * decoder)
-{
-  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), FALSE);
-
-  return decoder->configured;
-}
-
-static void
-gst_nv_decoder_reset (GstNvDecoder * self)
-{
-  g_clear_pointer (&self->frame_pool, g_free);
-
-  if (self->decoder_handle) {
-    gst_cuda_context_push (self->context);
-    CuvidDestroyDecoder (self->decoder_handle);
-    gst_cuda_context_pop (NULL);
-    self->decoder_handle = NULL;
-  }
-
-  self->output_type = GST_NV_DECODER_OUTPUT_TYPE_SYSTEM;
-  self->configured = FALSE;
-}
-
-gboolean
-gst_nv_decoder_configure (GstNvDecoder * decoder, cudaVideoCodec codec,
-    GstVideoInfo * info, gint coded_width, gint coded_height,
-    guint coded_bitdepth, guint pool_size, gboolean alloc_aux_frame)
-{
-  CUVIDDECODECREATEINFO create_info = { 0, };
-  GstVideoFormat format;
-  gboolean ret;
-  guint alloc_size;
-
-  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), FALSE);
-  g_return_val_if_fail (codec < cudaVideoCodec_NumCodecs, FALSE);
-  g_return_val_if_fail (info != NULL, FALSE);
-  g_return_val_if_fail (coded_width >= GST_VIDEO_INFO_WIDTH (info), FALSE);
-  g_return_val_if_fail (coded_height >= GST_VIDEO_INFO_HEIGHT (info), FALSE);
-  g_return_val_if_fail (coded_bitdepth >= 8, FALSE);
-  g_return_val_if_fail (pool_size > 0, FALSE);
-
-  gst_nv_decoder_reset (decoder);
-
-  decoder->info = *info;
-  gst_video_info_set_format (&decoder->coded_info, GST_VIDEO_INFO_FORMAT (info),
-      coded_width, coded_height);
-
-  format = GST_VIDEO_INFO_FORMAT (info);
-
-  /* Additional 2 frame margin */
-  pool_size += 2;
-
-  /* Need pool size * 2 for decode-only (used for reference) frame
-   * and output frame, AV1 film grain case for example */
-  if (alloc_aux_frame) {
-    alloc_size = pool_size * 2;
-  } else {
-    alloc_size = pool_size;
-  }
-
-  decoder->alloc_aux_frame = alloc_aux_frame;
-
-  /* FIXME: check aligned resolution or actual coded resolution */
-  create_info.ulWidth = GST_VIDEO_INFO_WIDTH (&decoder->coded_info);
-  create_info.ulHeight = GST_VIDEO_INFO_HEIGHT (&decoder->coded_info);
-  create_info.ulNumDecodeSurfaces = alloc_size;
-  create_info.CodecType = codec;
-  create_info.ChromaFormat = chroma_format_from_video_format (format);
-  create_info.ulCreationFlags = cudaVideoCreate_Default;
-  create_info.bitDepthMinus8 = coded_bitdepth - 8;
-  create_info.ulIntraDecodeOnly = 0;
-
-  create_info.display_area.left = 0;
-  create_info.display_area.top = 0;
-  create_info.display_area.right = GST_VIDEO_INFO_WIDTH (info);
-  create_info.display_area.bottom = GST_VIDEO_INFO_HEIGHT (info);
-  create_info.OutputFormat = output_format_from_video_format (format);
-  create_info.DeinterlaceMode = cudaVideoDeinterlaceMode_Weave;
-
-  create_info.ulTargetWidth = GST_VIDEO_INFO_WIDTH (info);
-  create_info.ulTargetHeight = GST_VIDEO_INFO_HEIGHT (info);
-  /* we always copy decoded picture to output buffer */
-  create_info.ulNumOutputSurfaces = 1;
-
-  create_info.target_rect.left = 0;
-  create_info.target_rect.top = 0;
-  create_info.target_rect.right = GST_VIDEO_INFO_WIDTH (info);
-  create_info.target_rect.bottom = GST_VIDEO_INFO_HEIGHT (info);
-
-  if (!gst_cuda_context_push (decoder->context)) {
-    GST_ERROR_OBJECT (decoder, "Failed to lock CUDA context");
-    return FALSE;
-  }
-
-  ret = gst_cuda_result (CuvidCreateDecoder (&decoder->decoder_handle,
-          &create_info));
-  gst_cuda_context_pop (NULL);
-
-  if (!ret) {
-    GST_ERROR_OBJECT (decoder, "Cannot create decoder instance");
-    return FALSE;
-  }
-
-  if (!gst_nv_decoder_prepare_frame_pool (decoder, pool_size)) {
-    GST_ERROR_OBJECT (decoder, "Cannot prepare internal surface buffer pool");
-    gst_nv_decoder_reset (decoder);
-    return FALSE;
-  }
-
-  decoder->configured = TRUE;
-
-  return TRUE;
-}
-
-GstNvDecoderFrame *
-gst_nv_decoder_new_frame (GstNvDecoder * decoder)
-{
-  GstNvDecoderFrame *frame;
-  gint i;
-  gint index_to_use = -1;
-
-  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), NULL);
-
-  for (i = 0; i < decoder->pool_size; i++) {
-    if (decoder->frame_pooli.available) {
-      decoder->frame_pooli.available = FALSE;
-      index_to_use = i;
-      break;
-    }
-  }
-
-  if (index_to_use < 0) {
-    GST_ERROR_OBJECT (decoder, "No available frame");
-    return NULL;
-  }
-
-  frame = g_new0 (GstNvDecoderFrame, 1);
-  frame->index = index_to_use;
-  frame->decode_frame_index = index_to_use;
-  frame->decoder = gst_object_ref (decoder);
-  frame->ref_count = 1;
-  if (decoder->alloc_aux_frame) {
-    /* 0, pool_size - 1: output picture
-     * pool_size, pool_size * 2 - 1: decoder output without film-grain,
-     * used for reference picture */
-    frame->decode_frame_index = index_to_use + decoder->pool_size;
-  }
-
-  GST_LOG_OBJECT (decoder, "New frame %p (index %d)", frame, frame->index);
-
-  return frame;
-}
-
-/* must be called with gst_cuda_context_push */
-static gboolean
-gst_nv_decoder_frame_map (GstNvDecoderFrame * frame)
-{
-  GstNvDecoder *self;
-  CUVIDPROCPARAMS params = { 0 };
-
-  g_return_val_if_fail (frame != NULL, FALSE);
-  g_return_val_if_fail (frame->index >= 0, FALSE);
-  g_return_val_if_fail (GST_IS_NV_DECODER (frame->decoder), FALSE);
-
-  self = frame->decoder;
-
-  /* TODO: check interlaced */
-  params.progressive_frame = 1;
-  params.output_stream = self->cuda_stream;
-
-  if (frame->mapped) {
-    GST_WARNING_OBJECT (self, "Frame %p is mapped already", frame);
-    return TRUE;
-  }
-
-  if (!gst_cuda_result (CuvidMapVideoFrame (self->decoder_handle,
-              frame->index, &frame->devptr, &frame->pitch, &params))) {
-    GST_ERROR_OBJECT (self, "Cannot map picture");
-    return FALSE;
-  }
-
-  frame->mapped = TRUE;
-
-  return TRUE;
-}
-
-/* must be called with gst_cuda_context_push */
-static void
-gst_nv_decoder_frame_unmap (GstNvDecoderFrame * frame)
-{
-  GstNvDecoder *self;
-
-  g_return_if_fail (frame != NULL);
-  g_return_if_fail (frame->index >= 0);
-  g_return_if_fail (GST_IS_NV_DECODER (frame->decoder));
-
-  self = frame->decoder;
-
-  if (!frame->mapped) {
-    GST_WARNING_OBJECT (self, "Frame %p is not mapped", frame);
-    return;
-  }
-
-  if (!gst_cuda_result (CuvidUnmapVideoFrame (self->decoder_handle,
-              frame->devptr))) {
-    GST_ERROR_OBJECT (self, "Cannot unmap picture");
-  }
-
-  frame->mapped = FALSE;
-}
-
-GstNvDecoderFrame *
-gst_nv_decoder_frame_ref (GstNvDecoderFrame * frame)
-{
-  g_assert (frame != NULL);
-
-  g_atomic_int_add (&frame->ref_count, 1);
-
-  return frame;
-}
-
-void
-gst_nv_decoder_frame_unref (GstNvDecoderFrame * frame)
-{
-  GstNvDecoder *self;
-
-  g_assert (frame != NULL);
-
-  if (g_atomic_int_dec_and_test (&frame->ref_count)) {
-    GST_LOG ("Free frame %p (index %d)", frame, frame->index);
-
-    if (frame->decoder) {
-      self = frame->decoder;
-      if (frame->mapped && gst_cuda_context_push (self->context)) {
-        gst_nv_decoder_frame_unmap (frame);
-        gst_cuda_context_pop (NULL);
-      }
-
-      if (frame->index < self->pool_size) {
-        self->frame_poolframe->index.available = TRUE;
-      } else {
-        GST_WARNING_OBJECT (self,
-            "Frame %p has invalid index %d", frame, frame->index);
-      }
-
-      gst_object_unref (self);
-    }
-
-    g_free (frame);
-  }
-}
-
-gboolean
-gst_nv_decoder_decode_picture (GstNvDecoder * decoder, CUVIDPICPARAMS * params)
-{
-  GstCudaContext *ctx = decoder->context;
-  gboolean ret = TRUE;
-
-  GST_LOG_OBJECT (decoder, "picture index: %u", params->CurrPicIdx);
-
-  if (!gst_cuda_context_push (ctx)) {
-    GST_ERROR_OBJECT (decoder, "Failed to push CUDA context");
-    return FALSE;
-  }
-
-  if (!gst_cuda_result (CuvidDecodePicture (decoder->decoder_handle, params))) {
-    GST_ERROR_OBJECT (decoder, "Failed to decode picture");
-    ret = FALSE;
-  }
-
-  if (!gst_cuda_context_pop (NULL)) {
-    GST_WARNING_OBJECT (decoder, "Failed to pop CUDA context");
-  }
-
-  return ret;
-}
-
-#ifdef HAVE_NVCODEC_GST_GL
-static gboolean
-gst_nv_decoder_register_cuda_resource (GstNvDecoder * self, GstMemory * mem,
-    GstCudaGraphicsResource * resource)
-{
-  GstMapInfo info;
-  gboolean ret = FALSE;
-
-  if (!gst_cuda_context_push (self->context)) {
-    GST_ERROR_OBJECT (self, "Failed to push CUDA context");
-    return FALSE;
-  }
-
-  if (gst_memory_map (mem, &info, GST_MAP_READ | GST_MAP_GL)) {
-    GstGLMemoryPBO *gl_mem = (GstGLMemoryPBO *) mem;
-    GstGLBuffer *gl_buffer = gl_mem->pbo;
-
-    GST_LOG_OBJECT (self,
-        "Register glbuffer %d to CUDA resource", gl_buffer->id);
-
-    /* register resource without read/write only flags, since
-     * downstream CUDA elements (e.g., nvenc) might want to access
-     * this resource later. Instead, use map flags during map/unmap */
-    if (gst_cuda_graphics_resource_register_gl_buffer (resource,
-            gl_buffer->id, CU_GRAPHICS_REGISTER_FLAGS_NONE)) {
-      ret = TRUE;
-    } else {
-      GST_WARNING_OBJECT (self, "Failed to register memory");
-    }
-
-    gst_memory_unmap (mem, &info);
-  } else {
-    GST_WARNING_OBJECT (self, "Failed to map memory");
-  }
-
-  if (!gst_cuda_context_pop (NULL))
-    GST_WARNING_OBJECT (self, "Failed to pop CUDA context");
-
-  return ret;
-}
-
-static GstCudaGraphicsResource *
-gst_nv_decoder_ensure_cuda_graphics_resource (GstNvDecoder * self,
-    GstMemory * mem)
-{
-  GQuark quark;
-  GstCudaGraphicsResource *resource;
-
-  if (!gst_is_gl_memory_pbo (mem)) {
-    GST_WARNING_OBJECT (self, "memory is not GL PBO memory, %s",
-        mem->allocator->mem_type);
-    return NULL;
-  }
-
-  quark = gst_cuda_quark_from_id (GST_CUDA_QUARK_GRAPHICS_RESOURCE);
-
-  resource = (GstCudaGraphicsResource *)
-      gst_mini_object_get_qdata (GST_MINI_OBJECT (mem), quark);
-
-  if (!resource) {
-    gboolean ret;
-
-    resource = gst_cuda_graphics_resource_new (self->context,
-        GST_OBJECT (GST_GL_BASE_MEMORY_CAST (mem)->context),
-        GST_CUDA_GRAPHICS_RESOURCE_GL_BUFFER);
-
-    ret = gst_nv_decoder_register_cuda_resource (self, mem, resource);
-    if (!ret) {
-      GST_WARNING_OBJECT (self, "Couldn't register resource");
-      gst_cuda_graphics_resource_free (resource);
-
-      return NULL;
-    }
-
-    gst_mini_object_set_qdata (GST_MINI_OBJECT (mem), quark, resource,
-        (GDestroyNotify) gst_cuda_graphics_resource_free);
-  }
-
-  return resource;
-}
-
-typedef struct
-{
-  GstNvDecoder *self;
-  gboolean ret;
-  GstNvDecoderFrame *frame;
-  GstBuffer *output_buffer;
-} GstNvDecoderCopyToGLData;
-
-static void
-gst_nv_decoder_copy_frame_to_gl_internal (GstGLContext * context,
-    GstNvDecoderCopyToGLData * data)
-{
-  GstNvDecoder *self = data->self;
-  GstNvDecoderFrame *frame = data->frame;
-  GstCudaGraphicsResource **resources;
-  guint num_resources;
-  guint i;
-  CUDA_MEMCPY2D copy_params = { 0, };
-  GstVideoInfo *info = &self->info;
-
-  data->ret = TRUE;
-
-  num_resources = gst_buffer_n_memory (data->output_buffer);
-  resources = g_newa (GstCudaGraphicsResource *, num_resources);
-
-  for (i = 0; i < num_resources; i++) {
-    GstMemory *mem;
-
-    mem = gst_buffer_peek_memory (data->output_buffer, i);
-    resourcesi = gst_nv_decoder_ensure_cuda_graphics_resource (self, mem);
-    if (!resourcesi) {
-      GST_WARNING_OBJECT (self, "could not register %dth memory", i);
-      data->ret = FALSE;
-
-      return;
-    }
-
-    /* Need PBO -> texture */
-    GST_MINI_OBJECT_FLAG_SET (mem, GST_GL_BASE_MEMORY_TRANSFER_NEED_UPLOAD);
-  }
-
-  if (!gst_cuda_context_push (self->context)) {
-    GST_WARNING_OBJECT (self, "Failed to push CUDA context");
-    data->ret = FALSE;
-    return;
-  }
-
-  copy_params.srcMemoryType = CU_MEMORYTYPE_DEVICE;
-  copy_params.srcPitch = frame->pitch;
-  copy_params.dstMemoryType = CU_MEMORYTYPE_DEVICE;
-
-  for (i = 0; i < num_resources; i++) {
-    CUdeviceptr dst_ptr;
-    gsize size;
-    CUgraphicsResource cuda_resource =
-        gst_cuda_graphics_resource_map (resourcesi, NULL,
-        CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD);
-
-    if (!cuda_resource) {
-      GST_WARNING_OBJECT (self, "failed to map CUDA resources");
-      data->ret = FALSE;
-      goto unmap_video_frame;
-    }
-
-    if (!gst_cuda_result (CuGraphicsResourceGetMappedPointer (&dst_ptr, &size,
-                cuda_resource))) {
-      GST_WARNING_OBJECT (self, "failed to map CUDA resource");
-      data->ret = FALSE;
-      break;
-    }
-
-    copy_params.dstPitch = GST_VIDEO_INFO_PLANE_STRIDE (info, i);
-    copy_params.WidthInBytes = GST_VIDEO_INFO_COMP_WIDTH (info, i)
-        * GST_VIDEO_INFO_COMP_PSTRIDE (info, i);
-
-    copy_params.srcDevice = frame->devptr +
-        (i * frame->pitch * GST_VIDEO_INFO_HEIGHT (&self->info));
-    copy_params.dstDevice = dst_ptr;
-    copy_params.Height = GST_VIDEO_INFO_COMP_HEIGHT (info, i);
-
-    if (!gst_cuda_result (CuMemcpy2DAsync (&copy_params, self->cuda_stream))) {
-      GST_WARNING_OBJECT (self, "memcpy to mapped array failed");
-      data->ret = FALSE;
-    }
-  }
-
-  gst_cuda_result (CuStreamSynchronize (self->cuda_stream));
-
-unmap_video_frame:
-  for (i = 0; i < num_resources; i++) {
-    gst_cuda_graphics_resource_unmap (resourcesi, NULL);
-  }
-
-  if (!gst_cuda_context_pop (NULL))
-    GST_WARNING_OBJECT (self, "Failed to pop CUDA context");
-}
-
-static gboolean
-gst_nv_decoder_copy_frame_to_gl (GstNvDecoder * decoder,
-    GstGLContext * context, GstNvDecoderFrame * frame, GstBuffer * buffer)
-{
-  GstNvDecoderCopyToGLData data;
-
-  data.self = decoder;
-  data.frame = frame;
-  data.output_buffer = buffer;
-
-  gst_gl_context_thread_add (context,
-      (GstGLContextThreadFunc) gst_nv_decoder_copy_frame_to_gl_internal, &data);
-
-  GST_LOG_OBJECT (decoder, "Copy frame to GL ret %d", data.ret);
-
-  return data.ret;
-}
-#endif
-
-static gboolean
-gst_nv_decoder_copy_frame_to_system (GstNvDecoder * decoder,
-    GstNvDecoderFrame * frame, GstBuffer * buffer)
-{
-  GstVideoFrame video_frame;
-  CUDA_MEMCPY2D copy_params = { 0, };
-  gint i;
-  gboolean ret = FALSE;
-
-  if (!gst_video_frame_map (&video_frame, &decoder->info, buffer,
-          GST_MAP_WRITE)) {
-    GST_ERROR_OBJECT (decoder, "Couldn't map video frame");
-    return FALSE;
-  }
-
-  if (!gst_cuda_context_push (decoder->context)) {
-    GST_ERROR_OBJECT (decoder, "Failed to push CUDA context");
-    gst_video_frame_unmap (&video_frame);
-    return FALSE;
-  }
-
-  copy_params.srcMemoryType = CU_MEMORYTYPE_DEVICE;
-  copy_params.srcPitch = frame->pitch;
-  copy_params.dstMemoryType = CU_MEMORYTYPE_HOST;
-  copy_params.WidthInBytes = GST_VIDEO_INFO_COMP_WIDTH (&decoder->info, 0)
-      * GST_VIDEO_INFO_COMP_PSTRIDE (&decoder->info, 0);
-
-  for (i = 0; i < GST_VIDEO_FRAME_N_PLANES (&video_frame); i++) {
-    copy_params.srcDevice = frame->devptr +
-        (i * frame->pitch * GST_VIDEO_INFO_HEIGHT (&decoder->info));
-    copy_params.dstHost = GST_VIDEO_FRAME_PLANE_DATA (&video_frame, i);
-    copy_params.dstPitch = GST_VIDEO_FRAME_PLANE_STRIDE (&video_frame, i);
-    copy_params.Height = GST_VIDEO_FRAME_COMP_HEIGHT (&video_frame, i);
-
-    if (!gst_cuda_result (CuMemcpy2DAsync (&copy_params, decoder->cuda_stream))) {
-      GST_ERROR_OBJECT (decoder, "failed to copy %dth plane", i);
-      goto done;
-    }
-  }
-
-  gst_cuda_result (CuStreamSynchronize (decoder->cuda_stream));
-
-  ret = TRUE;
-
-done:
-  gst_cuda_context_pop (NULL);
-
-  gst_video_frame_unmap (&video_frame);
-
-  GST_LOG_OBJECT (decoder, "Copy frame to system ret %d", ret);
-
-  return ret;
-}
-
-static gboolean
-gst_nv_decoder_copy_frame_to_cuda (GstNvDecoder * decoder,
-    GstNvDecoderFrame * frame, GstBuffer * buffer)
-{
-  CUDA_MEMCPY2D copy_params = { 0, };
-  GstMemory *mem;
-  gint i;
-  gboolean ret = FALSE;
-  GstVideoFrame video_frame;
-
-  mem = gst_buffer_peek_memory (buffer, 0);
-  if (!gst_is_cuda_memory (mem)) {
-    GST_WARNING_OBJECT (decoder, "Not a CUDA memory");
-    return FALSE;
-  }
-
-  if (!gst_video_frame_map (&video_frame,
-          &decoder->info, buffer, GST_MAP_WRITE | GST_MAP_CUDA)) {
-    GST_ERROR_OBJECT (decoder, "frame map failure");
-    return FALSE;
-  }
-
-  if (!gst_cuda_context_push (decoder->context)) {
-    gst_video_frame_unmap (&video_frame);
-    GST_ERROR_OBJECT (decoder, "Failed to push CUDA context");
-    return FALSE;
-  }
-
-  copy_params.srcMemoryType = CU_MEMORYTYPE_DEVICE;
-  copy_params.srcPitch = frame->pitch;
-  copy_params.dstMemoryType = CU_MEMORYTYPE_DEVICE;
-
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&decoder->info); i++) {
-    copy_params.srcDevice = frame->devptr +
-        (i * frame->pitch * GST_VIDEO_INFO_HEIGHT (&decoder->info));
-    copy_params.dstDevice =
-        (CUdeviceptr) GST_VIDEO_FRAME_PLANE_DATA (&video_frame, i);
-    copy_params.dstPitch = GST_VIDEO_FRAME_PLANE_STRIDE (&video_frame, i);
-    copy_params.WidthInBytes = GST_VIDEO_INFO_COMP_WIDTH (&decoder->info, 0)
-        * GST_VIDEO_INFO_COMP_PSTRIDE (&decoder->info, 0);
-    copy_params.Height = GST_VIDEO_INFO_COMP_HEIGHT (&decoder->info, i);
-
-    if (!gst_cuda_result (CuMemcpy2DAsync (&copy_params, decoder->cuda_stream))) {
-      GST_ERROR_OBJECT (decoder, "failed to copy %dth plane", i);
-      goto done;
-    }
-  }
-
-  gst_cuda_result (CuStreamSynchronize (decoder->cuda_stream));
-
-  ret = TRUE;
-
-done:
-  gst_video_frame_unmap (&video_frame);
-  gst_cuda_context_pop (NULL);
-
-  GST_LOG_OBJECT (decoder, "Copy frame to CUDA ret %d", ret);
-
-  return ret;
-}
-
-gboolean
-gst_nv_decoder_finish_frame (GstNvDecoder * decoder, GstVideoDecoder * videodec,
-    GstVideoCodecState * input_state, GstNvDecoderFrame * frame,
-    GstBuffer ** buffer)
-{
-  GstBuffer *outbuf = NULL;
-  gboolean ret = FALSE;
-
-  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), GST_FLOW_ERROR);
-  g_return_val_if_fail (GST_IS_VIDEO_DECODER (videodec), GST_FLOW_ERROR);
-  g_return_val_if_fail (frame != NULL, GST_FLOW_ERROR);
-  g_return_val_if_fail (buffer != NULL, GST_FLOW_ERROR);
-
-  if (input_state) {
-    if (!gst_nv_decoder_negotiate (decoder, videodec, input_state)) {
-      GST_ERROR_OBJECT (videodec, "Couldn't re-negotiate with updated state");
-      return FALSE;
-    }
-  }
-
-  outbuf = gst_video_decoder_allocate_output_buffer (videodec);
-  if (!outbuf) {
-    GST_ERROR_OBJECT (videodec, "Couldn't allocate output buffer");
-    return FALSE;
-  }
-
-  if (!gst_cuda_context_push (decoder->context)) {
-    GST_ERROR_OBJECT (decoder, "Failed to push CUDA context");
-    goto error;
-  }
-
-  if (!gst_nv_decoder_frame_map (frame)) {
-    GST_ERROR_OBJECT (decoder, "Couldn't map frame");
-    gst_cuda_context_pop (NULL);
-    goto error;
-  }
-
-  gst_cuda_context_pop (NULL);
-
-  switch (decoder->output_type) {
-    case GST_NV_DECODER_OUTPUT_TYPE_SYSTEM:
-      ret = gst_nv_decoder_copy_frame_to_system (decoder, frame, outbuf);
-      break;
-#ifdef HAVE_NVCODEC_GST_GL
-    case GST_NV_DECODER_OUTPUT_TYPE_GL:
-      g_assert (decoder->gl_context != NULL);
-
-      ret = gst_nv_decoder_copy_frame_to_gl (decoder,
-          GST_GL_CONTEXT (decoder->gl_context), frame, outbuf);
-      break;
-#endif
-    case GST_NV_DECODER_OUTPUT_TYPE_CUDA:
-      ret = gst_nv_decoder_copy_frame_to_cuda (decoder, frame, outbuf);
-      break;
-    default:
-      g_assert_not_reached ();
-      goto error;
-  }
-
-  /* FIXME: This is the case where OpenGL context of downstream glbufferpool
-   * belongs to non-nvidia (or different device).
-   * There should be enhancement to ensure nvdec has compatible OpenGL context
-   */
-  if (!ret && decoder->output_type == GST_NV_DECODER_OUTPUT_TYPE_GL) {
-    GST_WARNING_OBJECT (videodec,
-        "Couldn't copy frame to GL memory, fallback to system memory");
-    decoder->output_type = GST_NV_DECODER_OUTPUT_TYPE_SYSTEM;
-
-    ret = gst_nv_decoder_copy_frame_to_system (decoder, frame, outbuf);
-  }
-
-  gst_cuda_context_push (decoder->context);
-  gst_nv_decoder_frame_unmap (frame);
-  gst_cuda_context_pop (NULL);
-
-  if (!ret) {
-    GST_WARNING_OBJECT (videodec, "Failed to copy frame");
-    goto error;
-  }
-
-  *buffer = outbuf;
-
-  return TRUE;
-
-error:
-  gst_clear_buffer (&outbuf);
-  return FALSE;
-}
-
-typedef enum
-{
-  GST_NV_DECODER_FORMAT_FLAG_NONE = (1 << 0),
-  GST_NV_DECODER_FORMAT_FLAG_420_8BITS = (1 << 1),
-  GST_NV_DECODER_FORMAT_FLAG_420_10BITS = (1 << 2),
-  GST_NV_DECODER_FORMAT_FLAG_420_12BITS = (1 << 3),
-  GST_NV_DECODER_FORMAT_FLAG_444_8BITS = (1 << 4),
-  GST_NV_DECODER_FORMAT_FLAG_444_10BITS = (1 << 5),
-  GST_NV_DECODER_FORMAT_FLAG_444_12BITS = (1 << 6),
-} GstNvDecoderFormatFlags;
-
-static gboolean
-gst_nv_decoder_get_supported_codec_profiles (GValue * profiles,
-    cudaVideoCodec codec, GstNvDecoderFormatFlags flags)
-{
-  GValue val = G_VALUE_INIT;
-  gboolean ret = FALSE;
-
-  g_value_init (&val, G_TYPE_STRING);
-
-  switch (codec) {
-    case cudaVideoCodec_H264:
-      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_8BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_420_8BITS) {
-        g_value_set_static_string (&val, "constrained-baseline");
-        gst_value_list_append_value (profiles, &val);
-
-        g_value_set_static_string (&val, "baseline");
-        gst_value_list_append_value (profiles, &val);
-
-        g_value_set_static_string (&val, "main");
-        gst_value_list_append_value (profiles, &val);
-
-        g_value_set_static_string (&val, "high");
-        gst_value_list_append_value (profiles, &val);
-
-        g_value_set_static_string (&val, "constrained-high");
-        gst_value_list_append_value (profiles, &val);
-
-        g_value_set_static_string (&val, "progressive-high");
-        gst_value_list_append_value (profiles, &val);
-      }
-
-      /* NVDEC supports only 4:2:0 8bits h264 decoding.
-       * following conditions are for the future enhancement */
-      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_10BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_420_10BITS) {
-        g_value_set_static_string (&val, "high-10");
-        gst_value_list_append_value (profiles, &val);
-
-        g_value_set_static_string (&val, "progressive-high-10");
-        gst_value_list_append_value (profiles, &val);
-      }
-
-      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_12BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_420_12BITS ||
-          (flags & GST_NV_DECODER_FORMAT_FLAG_444_8BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_444_8BITS ||
-          (flags & GST_NV_DECODER_FORMAT_FLAG_444_10BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_444_10BITS ||
-          (flags & GST_NV_DECODER_FORMAT_FLAG_444_12BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_444_12BITS) {
-        g_value_set_static_string (&val, "high-4:4:4");
-        gst_value_list_append_value (profiles, &val);
-      }
-
-      ret = TRUE;
-      break;
-    case cudaVideoCodec_HEVC:
-      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_8BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_420_8BITS) {
-        g_value_set_static_string (&val, "main");
-        gst_value_list_append_value (profiles, &val);
-      }
-
-      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_10BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_420_10BITS) {
-        g_value_set_static_string (&val, "main-10");
-        gst_value_list_append_value (profiles, &val);
-      }
-
-      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_12BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_420_12BITS) {
-        g_value_set_static_string (&val, "main-12");
-        gst_value_list_append_value (profiles, &val);
-      }
-
-      if ((flags & GST_NV_DECODER_FORMAT_FLAG_444_8BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_444_8BITS) {
-        g_value_set_static_string (&val, "main-444");
-        gst_value_list_append_value (profiles, &val);
-      }
-
-      if ((flags & GST_NV_DECODER_FORMAT_FLAG_444_10BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_444_10BITS) {
-        g_value_set_static_string (&val, "main-444-10");
-        gst_value_list_append_value (profiles, &val);
-      }
-
-      if ((flags & GST_NV_DECODER_FORMAT_FLAG_444_12BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_444_12BITS) {
-        g_value_set_static_string (&val, "main-444-12");
-        gst_value_list_append_value (profiles, &val);
-      }
-
-      ret = TRUE;
-      break;
-    case cudaVideoCodec_VP9:
-      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_8BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_420_8BITS) {
-        g_value_set_static_string (&val, "0");
-        gst_value_list_append_value (profiles, &val);
-      }
-
-      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_10BITS) ==
-          GST_NV_DECODER_FORMAT_FLAG_420_10BITS) {
-        g_value_set_static_string (&val, "2");
-        gst_value_list_append_value (profiles, &val);
-      }
-
-      ret = TRUE;
-      break;
-    case cudaVideoCodec_AV1:
-      g_value_set_static_string (&val, "main");
-      gst_value_list_append_value (profiles, &val);
-      ret = TRUE;
-    default:
-      break;
-  }
-
-  g_value_unset (&val);
-
-  return ret;
-}
-
-typedef struct
-{
-  cudaVideoCodec codec;
-  const gchar *codec_name;
-  const gchar *sink_caps_string;
-} GstNvdecoderCodecMap;
-
-const GstNvdecoderCodecMap codec_map_list = {
-  {cudaVideoCodec_MPEG1, "mpegvideo",
-      "video/mpeg, mpegversion = (int) 1, systemstream = (boolean) false"},
-  {cudaVideoCodec_MPEG2, "mpeg2video",
-      "video/mpeg, mpegversion = (int) 2, systemstream = (boolean) false"},
-  {cudaVideoCodec_MPEG4, "mpeg4video",
-      "video/mpeg, mpegversion = (int) 4, systemstream = (boolean) false"},
-#if 0
-  /* FIXME: need verification */
-  {cudaVideoCodec_VC1, "vc1"},
-#endif
-  /* NOTE: common supported h264 profiles for all GPU architecture
-   * 4:2:0, baseline, main, and high profiles
-   */
-  {cudaVideoCodec_H264, "h264",
-      "video/x-h264, stream-format = (string) byte-stream"
-        ", alignment = (string) au"
-        ", profile = (string) { constrained-baseline, baseline, main, high, constrained-high, progressive-high }"},
-  {cudaVideoCodec_JPEG, "jpeg", "image/jpeg"},
-#if 0
-  /* FIXME: need verification */
-  {cudaVideoCodec_H264_SVC, "h264svc"},
-  {cudaVideoCodec_H264_MVC, "h264mvc"},
-#endif
-  {cudaVideoCodec_HEVC, "h265",
-      "video/x-h265, stream-format = (string) byte-stream"
-        ", alignment = (string) au, profile = (string) { main }"},
-  {cudaVideoCodec_VP8, "vp8", "video/x-vp8"},
-  {cudaVideoCodec_VP9, "vp9", "video/x-vp9"},
-  {cudaVideoCodec_AV1, "av1", "video/x-av1, alignment = (string) frame"}
-};
-
-gboolean
-gst_nv_decoder_check_device_caps (CUcontext cuda_ctx, cudaVideoCodec codec,
-    GstCaps ** sink_template, GstCaps ** src_template)
-{
-  CUresult cuda_ret;
-  gint max_width = 0, min_width = G_MAXINT;
-  gint max_height = 0, min_height = G_MAXINT;
-  GstCaps *sink_templ = NULL;
-  GstCaps *src_templ = NULL;
-  /* FIXME: support 12bits format */
-  guint bitdepth_minus83 = { 0, 2, 4 };
-  GstNvDecoderFormatFlags format_flags = 0;
-  gint c_idx, b_idx;
-  guint num_support = 0;
-  cudaVideoChromaFormat chroma_list = {
-#if 0
-    /* FIXME: support monochrome */
-    cudaVideoChromaFormat_Monochrome,
-    /* FIXME: Can our OpenGL support NV16 and its 10/12bits variant?? */
-    cudaVideoChromaFormat_422,
-#endif
-    cudaVideoChromaFormat_420,
-    cudaVideoChromaFormat_444,
-  };
-  GValue format_list = G_VALUE_INIT;
-  GValue format = G_VALUE_INIT;
-  GValue profile_list = G_VALUE_INIT;
-  const GstNvdecoderCodecMap *codec_map = NULL;
-  guint i;
-  gboolean ret = FALSE;
-
-  for (i = 0; i < G_N_ELEMENTS (codec_map_list); i++) {
-    if (codec_map_listi.codec == codec) {
-      codec_map = &codec_map_listi;
-      break;
-    }
-  }
-
-  if (!codec_map) {
-    GST_INFO ("No codec map corresponding to codec %d", codec);
-    return FALSE;
-  }
-
-  if (!gst_cuvid_can_get_decoder_caps ()) {
-    GST_INFO ("Too old nvidia driver to query decoder capability");
-
-    src_templ = gst_caps_from_string (GST_VIDEO_CAPS_MAKE ("NV12"));
-
-    {
-      GstCaps *cuda_caps = gst_caps_copy (src_templ);
-      gst_caps_set_features_simple (cuda_caps,
-          gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY));
-
-#if HAVE_NVCODEC_GST_GL
-      {
-        GstCaps *gl_caps = gst_caps_copy (src_templ);
-        gst_caps_set_features_simple (gl_caps,
-            gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_GL_MEMORY));
-        gst_caps_append (src_templ, gl_caps);
-      }
-#endif
-
-      gst_caps_append (src_templ, cuda_caps);
-    }
-
-    sink_templ = gst_caps_from_string (codec_map->sink_caps_string);
-
-    *src_template = src_templ;
-    *sink_template = sink_templ;
-
-    return TRUE;
-  }
-
-  g_value_init (&format_list, GST_TYPE_LIST);
-  g_value_init (&format, G_TYPE_STRING);
-  g_value_init (&profile_list, GST_TYPE_LIST);
-
-  if (CuCtxPushCurrent (cuda_ctx) != CUDA_SUCCESS)
-    goto done;
-
-  for (c_idx = 0; c_idx < G_N_ELEMENTS (chroma_list); c_idx++) {
-    for (b_idx = 0; b_idx < G_N_ELEMENTS (bitdepth_minus8); b_idx++) {
-      CUVIDDECODECAPS decoder_caps = { 0, };
-      GstNvDecoderFormatFlags cur_flag = 0;
-
-      decoder_caps.eCodecType = codec;
-      decoder_caps.eChromaFormat = chroma_listc_idx;
-      decoder_caps.nBitDepthMinus8 = bitdepth_minus8b_idx;
-
-      cuda_ret = CuvidGetDecoderCaps (&decoder_caps);
-      if (cuda_ret != CUDA_SUCCESS) {
-        GST_INFO ("could not query %s decoder capability, ret %d",
-            codec_map->codec_name, cuda_ret);
-        continue;
-      } else if (!decoder_caps.bIsSupported) {
-        GST_LOG ("%s bit-depth %d with chroma format %d is not supported",
-            codec_map->codec_name, bitdepth_minus8b_idx + 8, c_idx);
-        continue;
-      }
-
-      if (min_width > decoder_caps.nMinWidth)
-        min_width = decoder_caps.nMinWidth;
-      if (min_height > decoder_caps.nMinHeight)
-        min_height = decoder_caps.nMinHeight;
-      if (max_width < decoder_caps.nMaxWidth)
-        max_width = decoder_caps.nMaxWidth;
-      if (max_height < decoder_caps.nMaxHeight)
-        max_height = decoder_caps.nMaxHeight;
-
-      if (chroma_listc_idx == cudaVideoChromaFormat_420)
-        cur_flag = GST_NV_DECODER_FORMAT_FLAG_420_8BITS;
-      else
-        cur_flag = GST_NV_DECODER_FORMAT_FLAG_444_8BITS;
-
-      format_flags |= (cur_flag << (bitdepth_minus8b_idx / 2));
-
-      GST_INFO ("%s bit-depth %d with chroma format %d %d - %d x %d - %d",
-          codec_map->codec_name, bitdepth_minus8b_idx + 8, c_idx, min_width,
-          max_width, min_height, max_height);
-
-      switch (chroma_listc_idx) {
-        case cudaVideoChromaFormat_420:
-          if (bitdepth_minus8b_idx == 0) {
-            g_value_set_string (&format, "NV12");
-          } else if (bitdepth_minus8b_idx == 2) {
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-            g_value_set_string (&format, "P010_10LE");
-#else
-            g_value_set_string (&format, "P010_10BE");
-#endif
-          } else if (bitdepth_minus8b_idx == 4) {
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-            g_value_set_string (&format, "P016_LE");
-#else
-            g_value_set_string (&format, "P016_BE");
-#endif
-          } else {
-            GST_WARNING ("unhandled bitdepth %d", bitdepth_minus8b_idx + 8);
-            break;
-          }
-          num_support++;
-          gst_value_list_append_value (&format_list, &format);
-          break;
-        case cudaVideoChromaFormat_444:
-          if (cudaVideoCodec_JPEG == codec) {
-            /* NVDEC jpeg decoder can decode 4:4:4 format
-             * but it produces 4:2:0 frame */
-            break;
-          }
-
-          if (bitdepth_minus8b_idx == 0) {
-            g_value_set_string (&format, "Y444");
-          } else if (bitdepth_minus8b_idx == 2 || bitdepth_minus8b_idx == 4) {
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-            g_value_set_string (&format, "Y444_16LE");
-#else
-            g_value_set_string (&format, "Y444_16BE");
-#endif
-          } else {
-            GST_WARNING ("unhandled bitdepth %d", bitdepth_minus8b_idx + 8);
-            break;
-          }
-          num_support++;
-          gst_value_list_append_value (&format_list, &format);
-          break;
-        default:
-          break;
-      }
-    }
-  }
-
-  if (num_support == 0) {
-    GST_INFO ("device can not support %s", codec_map->codec_name);
-    goto done;
-  }
-
-  src_templ = gst_caps_new_simple ("video/x-raw",
-      "width", GST_TYPE_INT_RANGE, min_width, max_width,
-      "height", GST_TYPE_INT_RANGE, min_height, max_height,
-      "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
-
-  gst_caps_set_value (src_templ, "format", &format_list);
-
-  {
-    GstCaps *cuda_caps = gst_caps_copy (src_templ);
-    gst_caps_set_features_simple (cuda_caps,
-        gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY));
-
-    /* OpenGL specific */
-#if HAVE_NVCODEC_GST_GL
-    {
-      GstCaps *gl_caps = gst_caps_copy (src_templ);
-      gst_caps_set_features_simple (gl_caps,
-          gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_GL_MEMORY));
-      gst_caps_append (src_templ, gl_caps);
-    }
-#endif
-
-    gst_caps_append (src_templ, cuda_caps);
-  }
-
-  sink_templ = gst_caps_from_string (codec_map->sink_caps_string);
-  gst_caps_set_simple (sink_templ,
-      "width", GST_TYPE_INT_RANGE, min_width, max_width,
-      "height", GST_TYPE_INT_RANGE, min_height, max_height, NULL);
-
-  if (gst_nv_decoder_get_supported_codec_profiles (&profile_list, codec,
-          format_flags)) {
-    gst_caps_set_value (sink_templ, "profile", &profile_list);
-  }
-
-  GST_DEBUG ("sink template caps %" GST_PTR_FORMAT, sink_templ);
-  GST_DEBUG ("src template caps %" GST_PTR_FORMAT, src_templ);
-
-  CuCtxPopCurrent (NULL);
-
-done:
-  g_value_unset (&format_list);
-  g_value_unset (&format);
-  g_value_unset (&profile_list);
-
-  if (!sink_templ || !src_templ) {
-    gst_clear_caps (&sink_templ);
-    gst_clear_caps (&src_templ);
-
-    ret = FALSE;
-  } else {
-    /* class data will be leaked if the element never gets instantiated */
-    GST_MINI_OBJECT_FLAG_SET (src_templ, GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
-    GST_MINI_OBJECT_FLAG_SET (sink_templ, GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
-
-    *src_template = src_templ;
-    *sink_template = sink_templ;
-
-    ret = TRUE;
-  }
-
-  return ret;
-}
-
-const gchar *
-gst_cuda_video_codec_to_string (cudaVideoCodec codec)
-{
-  gint i;
-
-  for (i = 0; i < G_N_ELEMENTS (codec_map_list); i++) {
-    if (codec_map_listi.codec == codec)
-      return codec_map_listi.codec_name;
-  }
-
-  return "unknown";
-}
-
-gboolean
-gst_nv_decoder_handle_set_context (GstNvDecoder * decoder,
-    GstElement * videodec, GstContext * context)
-{
-  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (videodec), FALSE);
-
-#ifdef HAVE_NVCODEC_GST_GL
-  if (gst_gl_handle_set_context (videodec, context,
-          (GstGLDisplay **) & decoder->gl_display,
-          (GstGLContext **) & decoder->other_gl_context)) {
-    return TRUE;
-  }
-#endif
-
-  return FALSE;
-}
-
-gboolean
-gst_nv_decoder_handle_context_query (GstNvDecoder * decoder,
-    GstVideoDecoder * videodec, GstQuery * query)
-{
-  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (videodec), FALSE);
-
-#ifdef HAVE_NVCODEC_GST_GL
-  if (gst_gl_handle_context_query (GST_ELEMENT (videodec), query,
-          (GstGLDisplay *) decoder->gl_display,
-          (GstGLContext *) decoder->gl_context,
-          (GstGLContext *) decoder->other_gl_context)) {
-    if (decoder->gl_display)
-      gst_gl_display_filter_gl_api (GST_GL_DISPLAY (decoder->gl_display),
-          SUPPORTED_GL_APIS);
-    return TRUE;
-  }
-#endif
-
-  return FALSE;
-}
-
-#ifdef HAVE_NVCODEC_GST_GL
-static void
-gst_nv_decoder_check_cuda_device_from_context (GstGLContext * context,
-    gboolean * ret)
-{
-  guint device_count = 0;
-  CUdevice device_list1 = { 0, };
-  CUresult cuda_ret;
-
-  *ret = FALSE;
-
-  cuda_ret = CuGLGetDevices (&device_count,
-      device_list, 1, CU_GL_DEVICE_LIST_ALL);
-
-  if (!gst_cuda_result (cuda_ret) || device_count == 0)
-    return;
-
-  *ret = TRUE;
-
-  return;
-}
-
-static gboolean
-gst_nv_decoder_ensure_gl_context (GstNvDecoder * decoder, GstElement * videodec)
-{
-  gboolean ret;
-  GstGLDisplay *display;
-  GstGLContext *context;
-
-  if (!gst_gl_ensure_element_data (videodec,
-          (GstGLDisplay **) & decoder->gl_display,
-          (GstGLContext **) & decoder->other_gl_context)) {
-    GST_DEBUG_OBJECT (videodec, "No available OpenGL display");
-    return FALSE;
-  }
-
-  display = GST_GL_DISPLAY (decoder->gl_display);
-
-  if (!gst_gl_query_local_gl_context (videodec, GST_PAD_SRC,
-          (GstGLContext **) & decoder->gl_context)) {
-    GST_INFO_OBJECT (videodec, "failed to query local OpenGL context");
-
-    gst_clear_object (&decoder->gl_context);
-    decoder->gl_context =
-        (GstObject *) gst_gl_display_get_gl_context_for_thread (display, NULL);
-    if (decoder->gl_context == NULL
-        || !gst_gl_display_add_context (display,
-            GST_GL_CONTEXT (decoder->gl_context))) {
-      gst_clear_object (&decoder->gl_context);
-      if (!gst_gl_display_create_context (display,
-              (GstGLContext *) decoder->other_gl_context,
-              (GstGLContext **) & decoder->gl_context, NULL)) {
-        GST_WARNING_OBJECT (videodec, "failed to create OpenGL context");
-        return FALSE;
-      }
-
-      if (!gst_gl_display_add_context (display,
-              (GstGLContext *) decoder->gl_context)) {
-        GST_WARNING_OBJECT (videodec,
-            "failed to add the OpenGL context to the display");
-        return FALSE;
-      }
-    }
-  }
-
-  context = GST_GL_CONTEXT (decoder->gl_context);
-
-  if (!gst_gl_context_check_gl_version (context, SUPPORTED_GL_APIS, 3, 0)) {
-    GST_WARNING_OBJECT (videodec,
-        "OpenGL context could not support PBO download");
-    return FALSE;
-  }
-
-  gst_gl_context_thread_add (context,
-      (GstGLContextThreadFunc) gst_nv_decoder_check_cuda_device_from_context,
-      &ret);
-
-  if (!ret) {
-    GST_WARNING_OBJECT (videodec,
-        "Current OpenGL context is not CUDA-compatible");
-    return FALSE;
-  }
-
-  return TRUE;
-}
-#endif
-
-gboolean
-gst_nv_decoder_negotiate (GstNvDecoder * decoder,
-    GstVideoDecoder * videodec, GstVideoCodecState * input_state)
-{
-  GstVideoCodecState *state;
-  GstVideoInfo *info;
-
-  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), FALSE);
-  g_return_val_if_fail (GST_IS_VIDEO_DECODER (videodec), FALSE);
-  g_return_val_if_fail (input_state != NULL, FALSE);
-
-  if (!decoder->configured) {
-    GST_ERROR_OBJECT (videodec, "Should configure decoder first");
-    return FALSE;
-  }
-
-  info = &decoder->info;
-  state = gst_video_decoder_set_interlaced_output_state (videodec,
-      GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_INTERLACE_MODE (info),
-      GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_HEIGHT (info), input_state);
-  state->caps = gst_video_info_to_caps (&state->info);
-
-  /* decoder baseclass will hold other reference to output state */
-  gst_video_codec_state_unref (state);
-
-  decoder->output_type = GST_NV_DECODER_OUTPUT_TYPE_SYSTEM;
-
-  {
-    GstCaps *caps;
-    caps = gst_pad_get_allowed_caps (GST_VIDEO_DECODER_SRC_PAD (videodec));
-    GST_DEBUG_OBJECT (videodec, "Allowed caps %" GST_PTR_FORMAT, caps);
-
-    if (!caps || gst_caps_is_any (caps)) {
-      GST_DEBUG_OBJECT (videodec,
-          "cannot determine output format, using system memory");
-    } else {
-      GstCapsFeatures *features;
-      guint size = gst_caps_get_size (caps);
-      guint i;
-      gboolean have_cuda = FALSE;
-      gboolean have_gl = FALSE;
-
-      for (i = 0; i < size; i++) {
-        features = gst_caps_get_features (caps, i);
-        if (features && gst_caps_features_contains (features,
-                GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY)) {
-          GST_DEBUG_OBJECT (videodec, "found CUDA memory feature");
-          have_cuda = TRUE;
-          break;
-        }
-#ifdef HAVE_NVCODEC_GST_GL
-        if (features && gst_caps_features_contains (features,
-                GST_CAPS_FEATURE_MEMORY_GL_MEMORY)) {
-          GST_DEBUG_OBJECT (videodec, "found GL memory feature");
-          have_gl = TRUE;
-        }
-#endif
-      }
-
-      if (have_cuda)
-        decoder->output_type = GST_NV_DECODER_OUTPUT_TYPE_CUDA;
-      else if (have_gl)
-        decoder->output_type = GST_NV_DECODER_OUTPUT_TYPE_GL;
-    }
-    gst_clear_caps (&caps);
-  }
-
-#ifdef HAVE_NVCODEC_GST_GL
-  if (decoder->output_type == GST_NV_DECODER_OUTPUT_TYPE_GL &&
-      !gst_nv_decoder_ensure_gl_context (decoder, GST_ELEMENT (videodec))) {
-    GST_WARNING_OBJECT (videodec,
-        "OpenGL context is not CUDA-compatible, fallback to system memory");
-    decoder->output_type = GST_NV_DECODER_OUTPUT_TYPE_SYSTEM;
-  }
-#endif
-
-  switch (decoder->output_type) {
-    case GST_NV_DECODER_OUTPUT_TYPE_CUDA:
-      GST_DEBUG_OBJECT (videodec, "using CUDA memory");
-      gst_caps_set_features (state->caps, 0,
-          gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY, NULL));
-      break;
-#ifdef HAVE_NVCODEC_GST_GL
-    case GST_NV_DECODER_OUTPUT_TYPE_GL:
-      GST_DEBUG_OBJECT (videodec, "using GL memory");
-      gst_caps_set_features (state->caps, 0,
-          gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_GL_MEMORY, NULL));
-      gst_caps_set_simple (state->caps, "texture-target", G_TYPE_STRING,
-          "2D", NULL);
-      break;
-#endif
-    default:
-      GST_DEBUG_OBJECT (videodec, "using system memory");
-      break;
-  }
-
-  return TRUE;
-}
-
-static gboolean
-gst_nv_decoder_ensure_cuda_pool (GstNvDecoder * decoder, GstQuery * query)
-{
-  GstCaps *outcaps;
-  GstBufferPool *pool = NULL;
-  guint n, size, min, max;
-  GstVideoInfo vinfo = { 0, };
-  GstStructure *config;
-
-  gst_query_parse_allocation (query, &outcaps, NULL);
-  n = gst_query_get_n_allocation_pools (query);
-  if (n > 0) {
-    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
-    if (pool && !GST_IS_CUDA_BUFFER_POOL (pool)) {
-      gst_object_unref (pool);
-      pool = NULL;
-    }
-  }
-
-  if (!pool) {
-    GST_DEBUG_OBJECT (decoder, "no downstream pool, create our pool");
-    pool = gst_cuda_buffer_pool_new (decoder->context);
-
-    if (outcaps)
-      gst_video_info_from_caps (&vinfo, outcaps);
-    size = (guint) vinfo.size;
-    min = max = 0;
-  }
-
-  config = gst_buffer_pool_get_config (pool);
-  gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
-  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
-  gst_buffer_pool_set_config (pool, config);
-
-  /* Get updated size by cuda buffer pool */
-  config = gst_buffer_pool_get_config (pool);
-  gst_buffer_pool_config_get_params (config, NULL, &size, NULL, NULL);
-  gst_structure_free (config);
-
-  if (n > 0)
-    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
-  else
-    gst_query_add_allocation_pool (query, pool, size, min, max);
-  gst_object_unref (pool);
-
-  return TRUE;
-}
-
-#ifdef HAVE_NVCODEC_GST_GL
-static gboolean
-gst_nv_decoder_ensure_gl_pool (GstNvDecoder * decoder, GstQuery * query)
-{
-  GstCaps *outcaps;
-  GstBufferPool *pool = NULL;
-  guint n, size, min, max;
-  GstVideoInfo vinfo = { 0, };
-  GstStructure *config;
-  GstGLContext *gl_context;
-
-  GST_DEBUG_OBJECT (decoder, "decide allocation");
-
-  if (!decoder->gl_context) {
-    GST_ERROR_OBJECT (decoder, "GL context is not available");
-    return FALSE;
-  }
-
-  gl_context = GST_GL_CONTEXT (decoder->gl_context);
-
-  gst_query_parse_allocation (query, &outcaps, NULL);
-  n = gst_query_get_n_allocation_pools (query);
-  if (n > 0)
-    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
-
-  if (pool && !GST_IS_GL_BUFFER_POOL (pool)) {
-    gst_object_unref (pool);
-    pool = NULL;
-  }
-
-  if (!pool) {
-    GST_DEBUG_OBJECT (decoder, "no downstream pool, create our pool");
-    pool = gst_gl_buffer_pool_new (GST_GL_CONTEXT (gl_context));
-
-    if (outcaps)
-      gst_video_info_from_caps (&vinfo, outcaps);
-    size = (guint) vinfo.size;
-    min = max = 0;
-  }
-
-  config = gst_buffer_pool_get_config (pool);
-  gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
-  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
-  gst_buffer_pool_set_config (pool, config);
-  if (n > 0)
-    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
-  else
-    gst_query_add_allocation_pool (query, pool, size, min, max);
-  gst_object_unref (pool);
-
-  return TRUE;
-}
-#endif
-
-gboolean
-gst_nv_decoder_decide_allocation (GstNvDecoder * decoder,
-    GstVideoDecoder * videodec, GstQuery * query)
-{
-  gboolean ret = TRUE;
-
-  GST_DEBUG_OBJECT (videodec, "decide allocation");
-
-  switch (decoder->output_type) {
-    case GST_NV_DECODER_OUTPUT_TYPE_SYSTEM:
-      /* GstVideoDecoder will take care this case */
-      break;
-#ifdef HAVE_NVCODEC_GST_GL
-    case GST_NV_DECODER_OUTPUT_TYPE_GL:
-      ret = gst_nv_decoder_ensure_gl_pool (decoder, query);
-      break;
-#endif
-    case GST_NV_DECODER_OUTPUT_TYPE_CUDA:
-      ret = gst_nv_decoder_ensure_cuda_pool (decoder, query);
-      break;
-    default:
-      g_assert_not_reached ();
-      return FALSE;
-  }
-
-  return ret;
-}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvh264dec.c Deleted

@@ -1,1028 +0,0 @@
-/* GStreamer
- * Copyright (C) 2017 Ericsson AB. All rights reserved.
- * Copyright (C) 2019 Seungha Yang <seungha.yang@navercorp.com>
- * Copyright (C) 2020 Seungha Yang <seungha@centricular.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * Copyright 2015 The Chromium Authors. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *    * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *    * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * SECTION:element-nvh264sldec
- * @title: nvh264sldec
- *
- * GstCodecs based NVIDIA H.264 video decoder
- *
- * ## Example launch line
- * ```
- * gst-launch-1.0 filesrc location=/path/to/h264/file ! parsebin ! nvh264sldec ! videoconvert ! autovideosink
- * ```
- *
- * Since: 1.18
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/cuda/gstcudautils.h>
-
-#include "gstnvh264dec.h"
-#include "gstnvdecoder.h"
-
-#include <string.h>
-
-GST_DEBUG_CATEGORY_STATIC (gst_nv_h264_dec_debug);
-#define GST_CAT_DEFAULT gst_nv_h264_dec_debug
-
-typedef struct _GstNvH264Dec
-{
-  GstH264Decoder parent;
-
-  GstCudaContext *context;
-  GstNvDecoder *decoder;
-  CUVIDPICPARAMS params;
-
-  /* slice buffer which will be passed to CUVIDPICPARAMS::pBitstreamData */
-  guint8 *bitstream_buffer;
-  /* allocated memory size of bitstream_buffer */
-  gsize bitstream_buffer_alloc_size;
-  /* current offset of bitstream_buffer (per frame) */
-  gsize bitstream_buffer_offset;
-
-  guint *slice_offsets;
-  guint slice_offsets_alloc_len;
-  guint num_slices;
-
-  guint width, height;
-  guint coded_width, coded_height;
-  guint bitdepth;
-  guint chroma_format_idc;
-  gint max_dpb_size;
-
-  gboolean interlaced;
-
-  GArray *ref_list;
-} GstNvH264Dec;
-
-typedef struct _GstNvH264DecClass
-{
-  GstH264DecoderClass parent_class;
-  guint cuda_device_id;
-} GstNvH264DecClass;
-
-enum
-{
-  PROP_0,
-  PROP_CUDA_DEVICE_ID,
-};
-
-static GTypeClass *parent_class = NULL;
-
-#define GST_NV_H264_DEC(object) ((GstNvH264Dec *) (object))
-#define GST_NV_H264_DEC_GET_CLASS(object) \
-    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstNvH264DecClass))
-
-static void gst_nv_h264_decoder_dispose (GObject * object);
-static void gst_nv_h264_dec_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
-static void gst_nv_h264_dec_set_context (GstElement * element,
-    GstContext * context);
-static gboolean gst_nv_h264_dec_open (GstVideoDecoder * decoder);
-static gboolean gst_nv_h264_dec_close (GstVideoDecoder * decoder);
-static gboolean gst_nv_h264_dec_negotiate (GstVideoDecoder * decoder);
-static gboolean gst_nv_h264_dec_decide_allocation (GstVideoDecoder *
-    decoder, GstQuery * query);
-static gboolean gst_nv_h264_dec_src_query (GstVideoDecoder * decoder,
-    GstQuery * query);
-
-/* GstH264Decoder */
-static GstFlowReturn gst_nv_h264_dec_new_sequence (GstH264Decoder * decoder,
-    const GstH264SPS * sps, gint max_dpb_size);
-static GstFlowReturn gst_nv_h264_dec_new_picture (GstH264Decoder * decoder,
-    GstVideoCodecFrame * frame, GstH264Picture * picture);
-static GstFlowReturn
-gst_nv_h264_dec_new_field_picture (GstH264Decoder * decoder,
-    GstH264Picture * first_field, GstH264Picture * second_field);
-static GstFlowReturn gst_nv_h264_dec_output_picture (GstH264Decoder *
-    decoder, GstVideoCodecFrame * frame, GstH264Picture * picture);
-static GstFlowReturn gst_nv_h264_dec_start_picture (GstH264Decoder * decoder,
-    GstH264Picture * picture, GstH264Slice * slice, GstH264Dpb * dpb);
-static GstFlowReturn gst_nv_h264_dec_decode_slice (GstH264Decoder * decoder,
-    GstH264Picture * picture, GstH264Slice * slice, GArray * ref_pic_list0,
-    GArray * ref_pic_list1);
-static GstFlowReturn gst_nv_h264_dec_end_picture (GstH264Decoder * decoder,
-    GstH264Picture * picture);
-static guint
-gst_nv_h264_dec_get_preferred_output_delay (GstH264Decoder * decoder,
-    gboolean live);
-
-static void
-gst_nv_h264_dec_class_init (GstNvH264DecClass * klass,
-    GstNvDecoderClassData * cdata)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
-  GstH264DecoderClass *h264decoder_class = GST_H264_DECODER_CLASS (klass);
-
-  object_class->dispose = gst_nv_h264_decoder_dispose;
-  object_class->get_property = gst_nv_h264_dec_get_property;
-
-  /**
-   * GstNvH264SLDec:cuda-device-id:
-   *
-   * Assigned CUDA device id
-   *
-   * Since: 1.22
-   */
-  g_object_class_install_property (object_class, PROP_CUDA_DEVICE_ID,
-      g_param_spec_uint ("cuda-device-id", "CUDA device id",
-          "Assigned CUDA device id", 0, G_MAXINT, 0,
-          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
-  element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_set_context);
-
-  parent_class = (GTypeClass *) g_type_class_peek_parent (klass);
-  gst_element_class_set_static_metadata (element_class,
-      "NVDEC H.264 Stateless Decoder",
-      "Codec/Decoder/Video/Hardware",
-      "NVIDIA H.264 video decoder", "Seungha Yang <seungha@centricular.com>");
-
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
-          cdata->sink_caps));
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
-          cdata->src_caps));
-
-  decoder_class->open = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_open);
-  decoder_class->close = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_close);
-  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_negotiate);
-  decoder_class->decide_allocation =
-      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_decide_allocation);
-  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_src_query);
-
-  h264decoder_class->new_sequence =
-      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_new_sequence);
-  h264decoder_class->new_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_new_picture);
-  h264decoder_class->new_field_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_new_field_picture);
-  h264decoder_class->output_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_output_picture);
-  h264decoder_class->start_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_start_picture);
-  h264decoder_class->decode_slice =
-      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_decode_slice);
-  h264decoder_class->end_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_end_picture);
-  h264decoder_class->get_preferred_output_delay =
-      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_get_preferred_output_delay);
-
-  klass->cuda_device_id = cdata->cuda_device_id;
-
-  gst_caps_unref (cdata->sink_caps);
-  gst_caps_unref (cdata->src_caps);
-  g_free (cdata);
-}
-
-static void
-gst_nv_h264_dec_init (GstNvH264Dec * self)
-{
-  self->ref_list = g_array_sized_new (FALSE, TRUE,
-      sizeof (GstH264Picture *), 16);
-  g_array_set_clear_func (self->ref_list,
-      (GDestroyNotify) gst_clear_h264_picture);
-}
-
-static void
-gst_nv_h264_decoder_dispose (GObject * object)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (object);
-
-  g_clear_pointer (&self->ref_list, g_array_unref);
-
-  G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-gst_nv_h264_dec_get_property (GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec)
-{
-  GstNvH264DecClass *klass = GST_NV_H264_DEC_GET_CLASS (object);
-
-  switch (prop_id) {
-    case PROP_CUDA_DEVICE_ID:
-      g_value_set_uint (value, klass->cuda_device_id);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_nv_h264_dec_set_context (GstElement * element, GstContext * context)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (element);
-  GstNvH264DecClass *klass = GST_NV_H264_DEC_GET_CLASS (self);
-
-  GST_DEBUG_OBJECT (self, "set context %s",
-      gst_context_get_context_type (context));
-
-  if (gst_cuda_handle_set_context (element, context, klass->cuda_device_id,
-          &self->context)) {
-    goto done;
-  }
-
-  if (self->decoder)
-    gst_nv_decoder_handle_set_context (self->decoder, element, context);
-
-done:
-  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
-}
-
-/* Clear all codec specific (e.g., SPS) data */
-static void
-gst_d3d11_h264_dec_reset (GstNvH264Dec * self)
-{
-  self->width = 0;
-  self->height = 0;
-  self->coded_width = 0;
-  self->coded_height = 0;
-  self->bitdepth = 0;
-  self->chroma_format_idc = 0;
-  self->max_dpb_size = 0;
-  self->interlaced = FALSE;
-}
-
-static gboolean
-gst_nv_h264_dec_open (GstVideoDecoder * decoder)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
-  GstNvH264DecClass *klass = GST_NV_H264_DEC_GET_CLASS (self);
-
-  if (!gst_cuda_ensure_element_context (GST_ELEMENT (self),
-          klass->cuda_device_id, &self->context)) {
-    GST_ERROR_OBJECT (self, "Required element data is unavailable");
-    return FALSE;
-  }
-
-  self->decoder = gst_nv_decoder_new (self->context);
-  if (!self->decoder) {
-    GST_ERROR_OBJECT (self, "Failed to create decoder object");
-    gst_clear_object (&self->context);
-
-    return FALSE;
-  }
-
-  gst_d3d11_h264_dec_reset (self);
-
-  return TRUE;
-}
-
-static gboolean
-gst_nv_h264_dec_close (GstVideoDecoder * decoder)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
-
-  gst_clear_object (&self->decoder);
-  gst_clear_object (&self->context);
-
-  g_clear_pointer (&self->bitstream_buffer, g_free);
-  g_clear_pointer (&self->slice_offsets, g_free);
-
-  self->bitstream_buffer_alloc_size = 0;
-  self->slice_offsets_alloc_len = 0;
-
-  return TRUE;
-}
-
-static gboolean
-gst_nv_h264_dec_negotiate (GstVideoDecoder * decoder)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
-  GstH264Decoder *h264dec = GST_H264_DECODER (decoder);
-
-  GST_DEBUG_OBJECT (self, "negotiate");
-
-  gst_nv_decoder_negotiate (self->decoder, decoder, h264dec->input_state);
-
-  /* TODO: add support D3D11 memory */
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
-}
-
-static gboolean
-gst_nv_h264_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
-
-  if (!gst_nv_decoder_decide_allocation (self->decoder, decoder, query)) {
-    GST_WARNING_OBJECT (self, "Failed to handle decide allocation");
-    return FALSE;
-  }
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
-      (decoder, query);
-}
-
-static gboolean
-gst_nv_h264_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_CONTEXT:
-      if (gst_cuda_handle_context_query (GST_ELEMENT (decoder), query,
-              self->context)) {
-        return TRUE;
-      } else if (self->decoder &&
-          gst_nv_decoder_handle_context_query (self->decoder, decoder, query)) {
-        return TRUE;
-      }
-      break;
-    default:
-      break;
-  }
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
-}
-
-static GstFlowReturn
-gst_nv_h264_dec_new_sequence (GstH264Decoder * decoder, const GstH264SPS * sps,
-    gint max_dpb_size)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
-  gint crop_width, crop_height;
-  gboolean modified = FALSE;
-  gboolean interlaced;
-
-  GST_LOG_OBJECT (self, "new sequence");
-
-  if (sps->frame_cropping_flag) {
-    crop_width = sps->crop_rect_width;
-    crop_height = sps->crop_rect_height;
-  } else {
-    crop_width = sps->width;
-    crop_height = sps->height;
-  }
-
-  if (self->width != crop_width || self->height != crop_height ||
-      self->coded_width != sps->width || self->coded_height != sps->height) {
-    GST_INFO_OBJECT (self, "resolution changed %dx%d (%dx%d)",
-        crop_width, crop_height, sps->width, sps->height);
-    self->width = crop_width;
-    self->height = crop_height;
-    self->coded_width = sps->width;
-    self->coded_height = sps->height;
-    modified = TRUE;
-  }
-
-  if (self->bitdepth != sps->bit_depth_luma_minus8 + 8) {
-    GST_INFO_OBJECT (self, "bitdepth changed");
-    self->bitdepth = sps->bit_depth_luma_minus8 + 8;
-    modified = TRUE;
-  }
-
-  if (self->chroma_format_idc != sps->chroma_format_idc) {
-    GST_INFO_OBJECT (self, "chroma format changed");
-    self->chroma_format_idc = sps->chroma_format_idc;
-    modified = TRUE;
-  }
-
-  interlaced = !sps->frame_mbs_only_flag;
-  if (self->interlaced != interlaced) {
-    GST_INFO_OBJECT (self, "interlaced sequence changed");
-    self->interlaced = interlaced;
-    modified = TRUE;
-  }
-
-  if (self->max_dpb_size < max_dpb_size) {
-    GST_INFO_OBJECT (self, "Requires larger DPB size (%d -> %d)",
-        self->max_dpb_size, max_dpb_size);
-    modified = TRUE;
-  }
-
-  if (modified || !gst_nv_decoder_is_configured (self->decoder)) {
-    GstVideoInfo info;
-    GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
-
-    if (self->bitdepth == 8) {
-      if (self->chroma_format_idc == 1)
-        out_format = GST_VIDEO_FORMAT_NV12;
-      else {
-        GST_FIXME_OBJECT (self, "Could not support 8bits non-4:2:0 format");
-      }
-    } else if (self->bitdepth == 10) {
-      if (self->chroma_format_idc == 1)
-        out_format = GST_VIDEO_FORMAT_P010_10LE;
-      else {
-        GST_FIXME_OBJECT (self, "Could not support 10bits non-4:2:0 format");
-      }
-    }
-
-    if (out_format == GST_VIDEO_FORMAT_UNKNOWN) {
-      GST_ERROR_OBJECT (self, "Could not support bitdepth/chroma format");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    gst_video_info_set_format (&info, out_format, self->width, self->height);
-    if (self->interlaced)
-      GST_VIDEO_INFO_INTERLACE_MODE (&info) = GST_VIDEO_INTERLACE_MODE_MIXED;
-
-    self->max_dpb_size = max_dpb_size;
-    /* FIXME: add support cudaVideoCodec_H264_SVC and cudaVideoCodec_H264_MVC */
-    if (!gst_nv_decoder_configure (self->decoder,
-            cudaVideoCodec_H264, &info, self->coded_width, self->coded_height,
-            self->bitdepth, max_dpb_size, FALSE)) {
-      GST_ERROR_OBJECT (self, "Failed to configure decoder");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
-      GST_ERROR_OBJECT (self, "Failed to negotiate with downstream");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    memset (&self->params, 0, sizeof (CUVIDPICPARAMS));
-  }
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_h264_dec_new_picture (GstH264Decoder * decoder,
-    GstVideoCodecFrame * frame, GstH264Picture * picture)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
-  GstNvDecoderFrame *nv_frame;
-
-  nv_frame = gst_nv_decoder_new_frame (self->decoder);
-  if (!nv_frame) {
-    GST_ERROR_OBJECT (self, "No available decoder frame");
-    return GST_FLOW_ERROR;
-  }
-
-  GST_LOG_OBJECT (self,
-      "New decoder frame %p (index %d)", nv_frame, nv_frame->index);
-
-  gst_h264_picture_set_user_data (picture,
-      nv_frame, (GDestroyNotify) gst_nv_decoder_frame_unref);
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_h264_dec_new_field_picture (GstH264Decoder * decoder,
-    GstH264Picture * first_field, GstH264Picture * second_field)
-{
-  GstNvDecoderFrame *nv_frame;
-
-  nv_frame = (GstNvDecoderFrame *)
-      gst_h264_picture_get_user_data (first_field);
-  if (!nv_frame) {
-    GST_ERROR_OBJECT (decoder,
-        "No decoder frame in the first picture %p", first_field);
-    return GST_FLOW_ERROR;
-  }
-
-  gst_h264_picture_set_user_data (second_field,
-      gst_nv_decoder_frame_ref (nv_frame),
-      (GDestroyNotify) gst_nv_decoder_frame_unref);
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_h264_dec_output_picture (GstH264Decoder * decoder,
-    GstVideoCodecFrame * frame, GstH264Picture * picture)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
-  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
-  GstNvDecoderFrame *decoder_frame;
-
-  GST_LOG_OBJECT (self,
-      "Outputting picture %p (poc %d)", picture, picture->pic_order_cnt);
-
-  decoder_frame =
-      (GstNvDecoderFrame *) gst_h264_picture_get_user_data (picture);
-  if (!decoder_frame) {
-    GST_ERROR_OBJECT (self, "No decoder frame in picture %p", picture);
-    goto error;
-  }
-
-  if (!gst_nv_decoder_finish_frame (self->decoder, vdec, picture->discont_state,
-          decoder_frame, &frame->output_buffer)) {
-    GST_ERROR_OBJECT (self, "Failed to handle output picture");
-    goto error;
-  }
-
-  if (picture->buffer_flags != 0) {
-    gboolean interlaced =
-        (picture->buffer_flags & GST_VIDEO_BUFFER_FLAG_INTERLACED) != 0;
-    gboolean tff = (picture->buffer_flags & GST_VIDEO_BUFFER_FLAG_TFF) != 0;
-
-    GST_TRACE_OBJECT (self,
-        "apply buffer flags 0x%x (interlaced %d, top-field-first %d)",
-        picture->buffer_flags, interlaced, tff);
-    GST_BUFFER_FLAG_SET (frame->output_buffer, picture->buffer_flags);
-  }
-
-  gst_h264_picture_unref (picture);
-
-  return gst_video_decoder_finish_frame (vdec, frame);
-
-error:
-  gst_h264_picture_unref (picture);
-  gst_video_decoder_release_frame (vdec, frame);
-
-  return GST_FLOW_ERROR;
-}
-
-static GstNvDecoderFrame *
-gst_nv_h264_dec_get_decoder_frame_from_picture (GstNvH264Dec * self,
-    GstH264Picture * picture)
-{
-  GstNvDecoderFrame *frame;
-
-  frame = (GstNvDecoderFrame *) gst_h264_picture_get_user_data (picture);
-
-  if (!frame)
-    GST_DEBUG_OBJECT (self, "current picture does not have decoder frame");
-
-  return frame;
-}
-
-static void
-gst_nv_h264_dec_fill_scaling_list_4x4 (const GstH264PPS * pps,
-    CUVIDH264PICPARAMS * params)
-{
-  guint i;
-
-  for (i = 0; i < G_N_ELEMENTS (params->WeightScale4x4); i++)
-    gst_h264_quant_matrix_4x4_get_raster_from_zigzag (params->WeightScale4x4i,
-        pps->scaling_lists_4x4i);
-}
-
-static void
-gst_nv_h264_dec_fill_scaling_list_8x8 (const GstH264PPS * pps,
-    CUVIDH264PICPARAMS * params)
-{
-  guint i;
-
-  for (i = 0; i < G_N_ELEMENTS (params->WeightScale8x8); i++) {
-    gst_h264_quant_matrix_8x8_get_raster_from_zigzag (params->WeightScale8x8i,
-        pps->scaling_lists_8x8i);
-  }
-}
-
-static void
-gst_nv_h264_dec_picture_params_from_sps (GstNvH264Dec * self,
-    const GstH264SPS * sps, gboolean field_pic, CUVIDH264PICPARAMS * params)
-{
-  params->residual_colour_transform_flag = sps->separate_colour_plane_flag;
-  params->MbaffFrameFlag = sps->mb_adaptive_frame_field_flag && !field_pic;
-
-#define COPY_FIELD(f) \
-  (params)->f = (sps)->f
-
-  COPY_FIELD (log2_max_frame_num_minus4);
-  COPY_FIELD (pic_order_cnt_type);
-  COPY_FIELD (log2_max_pic_order_cnt_lsb_minus4);
-  COPY_FIELD (delta_pic_order_always_zero_flag);
-  COPY_FIELD (frame_mbs_only_flag);
-  COPY_FIELD (direct_8x8_inference_flag);
-  COPY_FIELD (num_ref_frames);
-  COPY_FIELD (bit_depth_luma_minus8);
-  COPY_FIELD (bit_depth_chroma_minus8);
-  COPY_FIELD (qpprime_y_zero_transform_bypass_flag);
-
-#undef COPY_FIELD
-}
-
-static void
-gst_nv_h264_dec_picture_params_from_pps (GstNvH264Dec * self,
-    const GstH264PPS * pps, CUVIDH264PICPARAMS * params)
-{
-  params->second_chroma_qp_index_offset =
-      (gint8) pps->second_chroma_qp_index_offset;
-
-#define COPY_FIELD(f) \
-  (params)->f = (pps)->f
-
-  COPY_FIELD (entropy_coding_mode_flag);
-  COPY_FIELD (pic_order_present_flag);
-  COPY_FIELD (num_ref_idx_l0_active_minus1);
-  COPY_FIELD (num_ref_idx_l1_active_minus1);
-  COPY_FIELD (pic_init_qp_minus26);
-  COPY_FIELD (weighted_pred_flag);
-  COPY_FIELD (weighted_bipred_idc);
-  COPY_FIELD (pic_init_qp_minus26);
-  COPY_FIELD (deblocking_filter_control_present_flag);
-  COPY_FIELD (redundant_pic_cnt_present_flag);
-  COPY_FIELD (transform_8x8_mode_flag);
-  COPY_FIELD (constrained_intra_pred_flag);
-  COPY_FIELD (chroma_qp_index_offset);
-#undef COPY_FIELD
-
-  gst_nv_h264_dec_fill_scaling_list_4x4 (pps, params);
-  gst_nv_h264_dec_fill_scaling_list_8x8 (pps, params);
-}
-
-static void
-gst_nv_h264_dec_reset_bitstream_params (GstNvH264Dec * self)
-{
-  self->bitstream_buffer_offset = 0;
-  self->num_slices = 0;
-
-  self->params.nBitstreamDataLen = 0;
-  self->params.pBitstreamData = NULL;
-  self->params.nNumSlices = 0;
-  self->params.pSliceDataOffsets = NULL;
-}
-
-static void
-gst_nv_h264_dec_fill_dpb (GstNvH264Dec * self, GstH264Picture * ref,
-    CUVIDH264DPBENTRY * dpb)
-{
-  GstNvDecoderFrame *frame;
-
-  dpb->not_existing = ref->nonexisting;
-  dpb->PicIdx = -1;
-
-  frame = gst_nv_h264_dec_get_decoder_frame_from_picture (self, ref);
-  if (!frame) {
-    dpb->not_existing = 1;
-  } else if (!dpb->not_existing) {
-    dpb->PicIdx = frame->index;
-  }
-
-  if (dpb->not_existing)
-    return;
-
-  if (GST_H264_PICTURE_IS_LONG_TERM_REF (ref)) {
-    dpb->FrameIdx = ref->long_term_frame_idx;
-    dpb->is_long_term = 1;
-  } else {
-    dpb->FrameIdx = ref->frame_num;
-    dpb->is_long_term = 0;
-  }
-
-  switch (ref->field) {
-    case GST_H264_PICTURE_FIELD_FRAME:
-      dpb->FieldOrderCnt0 = ref->top_field_order_cnt;
-      dpb->FieldOrderCnt1 = ref->bottom_field_order_cnt;
-      dpb->used_for_reference = 0x3;
-      break;
-    case GST_H264_PICTURE_FIELD_TOP_FIELD:
-      dpb->FieldOrderCnt0 = ref->top_field_order_cnt;
-      dpb->used_for_reference = 0x1;
-      if (ref->other_field) {
-        dpb->FieldOrderCnt1 = ref->other_field->bottom_field_order_cnt;
-        dpb->used_for_reference |= 0x2;
-      } else {
-        dpb->FieldOrderCnt1 = 0;
-      }
-      break;
-    case GST_H264_PICTURE_FIELD_BOTTOM_FIELD:
-      dpb->FieldOrderCnt1 = ref->bottom_field_order_cnt;
-      dpb->used_for_reference = 0x2;
-      if (ref->other_field) {
-        dpb->FieldOrderCnt0 = ref->other_field->bottom_field_order_cnt;
-        dpb->used_for_reference |= 0x1;
-      } else {
-        dpb->FieldOrderCnt0 = 0;
-      }
-      break;
-    default:
-      dpb->FieldOrderCnt0 = 0;
-      dpb->FieldOrderCnt1 = 0;
-      dpb->used_for_reference = 0;
-      break;
-  }
-}
-
-static GstFlowReturn
-gst_nv_h264_dec_start_picture (GstH264Decoder * decoder,
-    GstH264Picture * picture, GstH264Slice * slice, GstH264Dpb * dpb)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
-  CUVIDPICPARAMS *params = &self->params;
-  CUVIDH264PICPARAMS *h264_params = &params->CodecSpecific.h264;
-  const GstH264SliceHdr *slice_header = &slice->header;
-  const GstH264SPS *sps;
-  const GstH264PPS *pps;
-  GstNvDecoderFrame *frame;
-  GArray *ref_list = self->ref_list;
-  guint i, ref_frame_idx;
-
-  g_return_val_if_fail (slice_header->pps != NULL, FALSE);
-  g_return_val_if_fail (slice_header->pps->sequence != NULL, FALSE);
-
-  frame = gst_nv_h264_dec_get_decoder_frame_from_picture (self, picture);
-
-  if (!frame) {
-    GST_ERROR_OBJECT (self,
-        "Couldn't get decoder frame frame picture %p", picture);
-    return GST_FLOW_ERROR;
-  }
-
-  gst_nv_h264_dec_reset_bitstream_params (self);
-
-  sps = slice_header->pps->sequence;
-  pps = slice_header->pps;
-
-  /* FIXME: update sps/pps related params only when it's required */
-  params->PicWidthInMbs = sps->pic_width_in_mbs_minus1 + 1;
-  if (!sps->frame_mbs_only_flag) {
-    params->FrameHeightInMbs = (sps->pic_height_in_map_units_minus1 + 1) << 1;
-  } else {
-    params->FrameHeightInMbs = sps->pic_height_in_map_units_minus1 + 1;
-  }
-  params->CurrPicIdx = frame->index;
-  params->field_pic_flag = slice_header->field_pic_flag;
-  params->bottom_field_flag =
-      picture->field == GST_H264_PICTURE_FIELD_BOTTOM_FIELD;
-  params->second_field = picture->second_field;
-
-  if (picture->field == GST_H264_PICTURE_FIELD_TOP_FIELD) {
-    h264_params->CurrFieldOrderCnt0 = picture->top_field_order_cnt;
-    h264_params->CurrFieldOrderCnt1 = 0;
-  } else if (picture->field == GST_H264_PICTURE_FIELD_BOTTOM_FIELD) {
-    h264_params->CurrFieldOrderCnt0 = 0;
-    h264_params->CurrFieldOrderCnt1 = picture->bottom_field_order_cnt;
-  } else {
-    h264_params->CurrFieldOrderCnt0 = picture->top_field_order_cnt;
-    h264_params->CurrFieldOrderCnt1 = picture->bottom_field_order_cnt;
-  }
-
-  /* nBitstreamDataLen, pBitstreamData, nNumSlices and pSliceDataOffsets
-   * will be set later */
-
-  params->ref_pic_flag = GST_H264_PICTURE_IS_REF (picture);
-  /* will be updated later, if any slices belong to this frame is not
-   * intra slice */
-  params->intra_pic_flag = 1;
-
-  h264_params->frame_num = picture->frame_num;
-  h264_params->ref_pic_flag = GST_H264_PICTURE_IS_REF (picture);
-
-  gst_nv_h264_dec_picture_params_from_sps (self,
-      sps, slice_header->field_pic_flag, h264_params);
-  gst_nv_h264_dec_picture_params_from_pps (self, pps, h264_params);
-
-  ref_frame_idx = 0;
-  g_array_set_size (ref_list, 0);
-
-  memset (&h264_params->dpb, 0, sizeof (h264_params->dpb));
-  gst_h264_dpb_get_pictures_short_term_ref (dpb, FALSE, FALSE, ref_list);
-  for (i = 0; ref_frame_idx < 16 && i < ref_list->len; i++) {
-    GstH264Picture *other = g_array_index (ref_list, GstH264Picture *, i);
-    gst_nv_h264_dec_fill_dpb (self, other, &h264_params->dpbref_frame_idx);
-    ref_frame_idx++;
-  }
-  g_array_set_size (ref_list, 0);
-
-  gst_h264_dpb_get_pictures_long_term_ref (dpb, FALSE, ref_list);
-  for (i = 0; ref_frame_idx < 16 && i < ref_list->len; i++) {
-    GstH264Picture *other = g_array_index (ref_list, GstH264Picture *, i);
-    gst_nv_h264_dec_fill_dpb (self, other, &h264_params->dpbref_frame_idx);
-    ref_frame_idx++;
-  }
-  g_array_set_size (ref_list, 0);
-
-  for (i = ref_frame_idx; i < 16; i++)
-    h264_params->dpbi.PicIdx = -1;
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_h264_dec_decode_slice (GstH264Decoder * decoder,
-    GstH264Picture * picture, GstH264Slice * slice, GArray * ref_pic_list0,
-    GArray * ref_pic_list1)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
-  gsize new_size;
-
-  GST_LOG_OBJECT (self, "Decode slice, nalu size %u", slice->nalu.size);
-
-  if (self->slice_offsets_alloc_len < self->num_slices + 1) {
-    self->slice_offsets_alloc_len = 2 * (self->num_slices + 1);
-
-    self->slice_offsets = (guint *) g_realloc_n (self->slice_offsets,
-        self->slice_offsets_alloc_len, sizeof (guint));
-  }
-  self->slice_offsetsself->num_slices = self->bitstream_buffer_offset;
-  GST_LOG_OBJECT (self, "Slice offset %u for slice %d",
-      self->slice_offsetsself->num_slices, self->num_slices);
-
-  self->num_slices++;
-
-  new_size = self->bitstream_buffer_offset + slice->nalu.size + 3;
-  if (self->bitstream_buffer_alloc_size < new_size) {
-    self->bitstream_buffer_alloc_size = 2 * new_size;
-
-    self->bitstream_buffer = (guint8 *) g_realloc (self->bitstream_buffer,
-        self->bitstream_buffer_alloc_size);
-  }
-
-  self->bitstream_bufferself->bitstream_buffer_offset = 0;
-  self->bitstream_bufferself->bitstream_buffer_offset + 1 = 0;
-  self->bitstream_bufferself->bitstream_buffer_offset + 2 = 1;
-
-  memcpy (self->bitstream_buffer + self->bitstream_buffer_offset + 3,
-      slice->nalu.data + slice->nalu.offset, slice->nalu.size);
-  self->bitstream_buffer_offset = new_size;
-
-  if (!GST_H264_IS_I_SLICE (&slice->header) &&
-      !GST_H264_IS_SI_SLICE (&slice->header))
-    self->params.intra_pic_flag = 0;
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_h264_dec_end_picture (GstH264Decoder * decoder, GstH264Picture * picture)
-{
-  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
-  gboolean ret;
-  CUVIDPICPARAMS *params = &self->params;
-
-  params->nBitstreamDataLen = self->bitstream_buffer_offset;
-  params->pBitstreamData = self->bitstream_buffer;
-  params->nNumSlices = self->num_slices;
-  params->pSliceDataOffsets = self->slice_offsets;
-
-  GST_LOG_OBJECT (self, "End picture, bitstream len: %" G_GSIZE_FORMAT
-      ", num slices %d", self->bitstream_buffer_offset, self->num_slices);
-
-  ret = gst_nv_decoder_decode_picture (self->decoder, &self->params);
-
-  if (!ret) {
-    GST_ERROR_OBJECT (self, "Failed to decode picture");
-    return GST_FLOW_ERROR;
-  }
-
-  return GST_FLOW_OK;
-}
-
-static guint
-gst_nv_h264_dec_get_preferred_output_delay (GstH264Decoder * decoder,
-    gboolean live)
-{
-  /* Prefer to zero latency for live pipeline */
-  if (live)
-    return 0;
-
-  /* NVCODEC SDK uses 4 frame delay for better throughput performance */
-  return 4;
-}
-
-void
-gst_nv_h264_dec_register (GstPlugin * plugin, guint device_id, guint rank,
-    GstCaps * sink_caps, GstCaps * src_caps, gboolean is_primary)
-{
-  GType type;
-  gchar *type_name;
-  gchar *feature_name;
-  GstNvDecoderClassData *cdata;
-  gint index = 0;
-  const GValue *value;
-  GstStructure *s;
-  GTypeInfo type_info = {
-    sizeof (GstNvH264DecClass),
-    NULL,
-    NULL,
-    (GClassInitFunc) gst_nv_h264_dec_class_init,
-    NULL,
-    NULL,
-    sizeof (GstNvH264Dec),
-    0,
-    (GInstanceInitFunc) gst_nv_h264_dec_init,
-  };
-
-  GST_DEBUG_CATEGORY_INIT (gst_nv_h264_dec_debug, "nvh264dec", 0, "nvh264dec");
-
-  cdata = g_new0 (GstNvDecoderClassData, 1);
-  cdata->sink_caps = gst_caps_from_string ("video/x-h264, "
-      "stream-format= (string) { avc, avc3, byte-stream }, "
-      "alignment= (string) au, "
-      "profile = (string) { high, main, constrained-high, constrained-baseline, baseline }, "
-      "framerate = " GST_VIDEO_FPS_RANGE);
-
-  s = gst_caps_get_structure (sink_caps, 0);
-  value = gst_structure_get_value (s, "width");
-  gst_caps_set_value (cdata->sink_caps, "width", value);
-
-  value = gst_structure_get_value (s, "height");
-  gst_caps_set_value (cdata->sink_caps, "height", value);
-
-  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
-      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
-  cdata->src_caps = gst_caps_ref (src_caps);
-  cdata->cuda_device_id = device_id;
-
-  if (is_primary) {
-    type_name = g_strdup ("GstNvH264Dec");
-    feature_name = g_strdup ("nvh264dec");
-  } else {
-    type_name = g_strdup ("GstNvH264SLDec");
-    feature_name = g_strdup ("nvh264sldec");
-  }
-
-  while (g_type_from_name (type_name)) {
-    index++;
-    g_free (type_name);
-    g_free (feature_name);
-    if (is_primary) {
-      type_name = g_strdup_printf ("GstNvH264Device%dDec", index);
-      feature_name = g_strdup_printf ("nvh264device%ddec", index);
-    } else {
-      type_name = g_strdup_printf ("GstNvH264SLDevice%dDec", index);
-      feature_name = g_strdup_printf ("nvh264sldevice%ddec", index);
-    }
-  }
-
-  type_info.class_data = cdata;
-
-  type = g_type_register_static (GST_TYPE_H264_DECODER,
-      type_name, &type_info, 0);
-
-  /* make lower rank than default device */
-  if (rank > 0 && index > 0)
-    rank--;
-
-  if (!gst_element_register (plugin, feature_name, rank, type))
-    GST_WARNING ("Failed to register plugin '%s'", type_name);
-
-  g_free (type_name);
-  g_free (feature_name);
-}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvh265dec.c Deleted

@@ -1,1070 +0,0 @@
-/* GStreamer
- * Copyright (C) 2017 Ericsson AB. All rights reserved.
- * Copyright (C) 2019 Seungha Yang <seungha.yang@navercorp.com>
- * Copyright (C) 2020 Seungha Yang <seungha@centricular.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer
- *    in the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * Copyright 2015 The Chromium Authors. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *    * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *    * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * SECTION:element-nvh265sldec
- * @title: nvh265sldec
- *
- * GstCodecs based NVIDIA H.265 video decoder
- *
- * ## Example launch line
- * ```
- * gst-launch-1.0 filesrc location=/path/to/h265/file ! parsebin ! nvh265sldec ! videoconvert ! autovideosink
- * ```
- *
- * Since: 1.18
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/cuda/gstcudautils.h>
-#include "gstnvh265dec.h"
-#include "gstnvdecoder.h"
-
-#include <string.h>
-
-GST_DEBUG_CATEGORY_STATIC (gst_nv_h265_dec_debug);
-#define GST_CAT_DEFAULT gst_nv_h265_dec_debug
-
-typedef struct _GstNvH265Dec
-{
-  GstH265Decoder parent;
-
-  GstCudaContext *context;
-  GstNvDecoder *decoder;
-  CUVIDPICPARAMS params;
-
-  /* slice buffer which will be passed to CUVIDPICPARAMS::pBitstreamData */
-  guint8 *bitstream_buffer;
-  /* allocated memory size of bitstream_buffer */
-  gsize bitstream_buffer_alloc_size;
-  /* current offset of bitstream_buffer (per frame) */
-  gsize bitstream_buffer_offset;
-
-  guint *slice_offsets;
-  guint slice_offsets_alloc_len;
-  guint num_slices;
-
-  guint width, height;
-  guint coded_width, coded_height;
-  guint bitdepth;
-  guint chroma_format_idc;
-} GstNvH265Dec;
-
-typedef struct _GstNvH265DecClass
-{
-  GstH265DecoderClass parent_class;
-  guint cuda_device_id;
-} GstNvH265DecClass;
-
-enum
-{
-  PROP_0,
-  PROP_CUDA_DEVICE_ID,
-};
-
-static GTypeClass *parent_class = NULL;
-
-#define GST_NV_H265_DEC(object) ((GstNvH265Dec *) (object))
-#define GST_NV_H265_DEC_GET_CLASS(object) \
-    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstNvH265DecClass))
-
-static void gst_nv_h265_dec_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
-static void gst_nv_h265_dec_set_context (GstElement * element,
-    GstContext * context);
-static gboolean gst_nv_h265_dec_open (GstVideoDecoder * decoder);
-static gboolean gst_nv_h265_dec_close (GstVideoDecoder * decoder);
-static gboolean gst_nv_h265_dec_negotiate (GstVideoDecoder * decoder);
-static gboolean gst_nv_h265_dec_decide_allocation (GstVideoDecoder *
-    decoder, GstQuery * query);
-static gboolean gst_nv_h265_dec_src_query (GstVideoDecoder * decoder,
-    GstQuery * query);
-
-/* GstH265Decoder */
-static GstFlowReturn gst_nv_h265_dec_new_sequence (GstH265Decoder * decoder,
-    const GstH265SPS * sps, gint max_dpb_size);
-static GstFlowReturn gst_nv_h265_dec_new_picture (GstH265Decoder * decoder,
-    GstVideoCodecFrame * frame, GstH265Picture * picture);
-static GstFlowReturn gst_nv_h265_dec_output_picture (GstH265Decoder *
-    decoder, GstVideoCodecFrame * frame, GstH265Picture * picture);
-static GstFlowReturn gst_nv_h265_dec_start_picture (GstH265Decoder * decoder,
-    GstH265Picture * picture, GstH265Slice * slice, GstH265Dpb * dpb);
-static GstFlowReturn gst_nv_h265_dec_decode_slice (GstH265Decoder * decoder,
-    GstH265Picture * picture, GstH265Slice * slice,
-    GArray * ref_pic_list0, GArray * ref_pic_list1);
-static GstFlowReturn gst_nv_h265_dec_end_picture (GstH265Decoder * decoder,
-    GstH265Picture * picture);
-static guint
-gst_nv_h265_dec_get_preferred_output_delay (GstH265Decoder * decoder,
-    gboolean live);
-
-static void
-gst_nv_h265_dec_class_init (GstNvH265DecClass * klass,
-    GstNvDecoderClassData * cdata)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
-  GstH265DecoderClass *h265decoder_class = GST_H265_DECODER_CLASS (klass);
-
-  object_class->get_property = gst_nv_h265_dec_get_property;
-
-  /**
-   * GstNvH265SLDec:cuda-device-id:
-   *
-   * Assigned CUDA device id
-   *
-   * Since: 1.22
-   */
-  g_object_class_install_property (object_class, PROP_CUDA_DEVICE_ID,
-      g_param_spec_uint ("cuda-device-id", "CUDA device id",
-          "Assigned CUDA device id", 0, G_MAXINT, 0,
-          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
-  element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_set_context);
-
-  parent_class = (GTypeClass *) g_type_class_peek_parent (klass);
-  gst_element_class_set_static_metadata (element_class,
-      "NVDEC H.265 Stateless Decoder",
-      "Codec/Decoder/Video/Hardware",
-      "NVIDIA H.265 video decoder", "Seungha Yang <seungha@centricular.com>");
-
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
-          cdata->sink_caps));
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
-          cdata->src_caps));
-
-  decoder_class->open = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_open);
-  decoder_class->close = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_close);
-  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_negotiate);
-  decoder_class->decide_allocation =
-      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_decide_allocation);
-  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_src_query);
-
-  h265decoder_class->new_sequence =
-      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_new_sequence);
-  h265decoder_class->new_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_new_picture);
-  h265decoder_class->output_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_output_picture);
-  h265decoder_class->start_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_start_picture);
-  h265decoder_class->decode_slice =
-      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_decode_slice);
-  h265decoder_class->end_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_end_picture);
-  h265decoder_class->get_preferred_output_delay =
-      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_get_preferred_output_delay);
-
-  klass->cuda_device_id = cdata->cuda_device_id;
-
-  gst_caps_unref (cdata->sink_caps);
-  gst_caps_unref (cdata->src_caps);
-  g_free (cdata);
-}
-
-static void
-gst_nv_h265_dec_init (GstNvH265Dec * self)
-{
-}
-
-static void
-gst_nv_h265_dec_get_property (GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec)
-{
-  GstNvH265DecClass *klass = GST_NV_H265_DEC_GET_CLASS (object);
-
-  switch (prop_id) {
-    case PROP_CUDA_DEVICE_ID:
-      g_value_set_uint (value, klass->cuda_device_id);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_nv_h265_dec_set_context (GstElement * element, GstContext * context)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (element);
-  GstNvH265DecClass *klass = GST_NV_H265_DEC_GET_CLASS (self);
-
-  GST_DEBUG_OBJECT (self, "set context %s",
-      gst_context_get_context_type (context));
-
-  if (gst_cuda_handle_set_context (element, context, klass->cuda_device_id,
-          &self->context)) {
-    goto done;
-  }
-
-  if (self->decoder)
-    gst_nv_decoder_handle_set_context (self->decoder, element, context);
-
-done:
-  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
-}
-
-static gboolean
-gst_nv_h265_dec_open (GstVideoDecoder * decoder)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
-  GstNvH265DecClass *klass = GST_NV_H265_DEC_GET_CLASS (self);
-
-  if (!gst_cuda_ensure_element_context (GST_ELEMENT (self),
-          klass->cuda_device_id, &self->context)) {
-    GST_ERROR_OBJECT (self, "Required element data is unavailable");
-    return FALSE;
-  }
-
-  self->decoder = gst_nv_decoder_new (self->context);
-  if (!self->decoder) {
-    GST_ERROR_OBJECT (self, "Failed to create decoder object");
-    gst_clear_object (&self->context);
-
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-static gboolean
-gst_nv_h265_dec_close (GstVideoDecoder * decoder)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
-
-  gst_clear_object (&self->decoder);
-  gst_clear_object (&self->context);
-
-  g_clear_pointer (&self->bitstream_buffer, g_free);
-  g_clear_pointer (&self->slice_offsets, g_free);
-
-  self->bitstream_buffer_alloc_size = 0;
-  self->slice_offsets_alloc_len = 0;
-
-  return TRUE;
-}
-
-static gboolean
-gst_nv_h265_dec_negotiate (GstVideoDecoder * decoder)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
-  GstH265Decoder *h265dec = GST_H265_DECODER (decoder);
-
-  GST_DEBUG_OBJECT (self, "negotiate");
-
-  gst_nv_decoder_negotiate (self->decoder, decoder, h265dec->input_state);
-
-  /* TODO: add support D3D11 memory */
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
-}
-
-static gboolean
-gst_nv_h265_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
-
-  if (!gst_nv_decoder_decide_allocation (self->decoder, decoder, query)) {
-    GST_WARNING_OBJECT (self, "Failed to handle decide allocation");
-    return FALSE;
-  }
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
-      (decoder, query);
-}
-
-static gboolean
-gst_nv_h265_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_CONTEXT:
-      if (gst_cuda_handle_context_query (GST_ELEMENT (decoder), query,
-              self->context)) {
-        return TRUE;
-      } else if (self->decoder &&
-          gst_nv_decoder_handle_context_query (self->decoder, decoder, query)) {
-        return TRUE;
-      }
-      break;
-    default:
-      break;
-  }
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
-}
-
-static GstFlowReturn
-gst_nv_h265_dec_new_sequence (GstH265Decoder * decoder, const GstH265SPS * sps,
-    gint max_dpb_size)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
-  gint crop_width, crop_height;
-  gboolean modified = FALSE;
-
-  GST_LOG_OBJECT (self, "new sequence");
-
-  if (sps->conformance_window_flag) {
-    crop_width = sps->crop_rect_width;
-    crop_height = sps->crop_rect_height;
-  } else {
-    crop_width = sps->width;
-    crop_height = sps->height;
-  }
-
-  if (self->width != crop_width || self->height != crop_height ||
-      self->coded_width != sps->width || self->coded_height != sps->height) {
-    GST_INFO_OBJECT (self, "resolution changed %dx%d (%dx%d)",
-        crop_width, crop_height, sps->width, sps->height);
-    self->width = crop_width;
-    self->height = crop_height;
-    self->coded_width = sps->width;
-    self->coded_height = sps->height;
-    modified = TRUE;
-  }
-
-  if (self->bitdepth != sps->bit_depth_luma_minus8 + 8) {
-    GST_INFO_OBJECT (self, "bitdepth changed");
-    self->bitdepth = sps->bit_depth_luma_minus8 + 8;
-    modified = TRUE;
-  }
-
-  if (self->chroma_format_idc != sps->chroma_format_idc) {
-    GST_INFO_OBJECT (self, "chroma format changed");
-    self->chroma_format_idc = sps->chroma_format_idc;
-    modified = TRUE;
-  }
-
-  if (modified || !gst_nv_decoder_is_configured (self->decoder)) {
-    GstVideoInfo info;
-    GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
-
-    if (self->bitdepth == 8) {
-      if (self->chroma_format_idc == 1) {
-        out_format = GST_VIDEO_FORMAT_NV12;
-      } else if (self->chroma_format_idc == 3) {
-        out_format = GST_VIDEO_FORMAT_Y444;
-      } else {
-        GST_FIXME_OBJECT (self, "8 bits supports only 4:2:0 or 4:4:4 format");
-      }
-    } else if (self->bitdepth == 10) {
-      if (self->chroma_format_idc == 1) {
-        out_format = GST_VIDEO_FORMAT_P010_10LE;
-      } else if (self->chroma_format_idc == 3) {
-        out_format = GST_VIDEO_FORMAT_Y444_16LE;
-      } else {
-        GST_FIXME_OBJECT (self, "10 bits supports only 4:2:0 or 4:4:4 format");
-      }
-    } else if (self->bitdepth == 12 || self->bitdepth == 16) {
-      if (self->chroma_format_idc == 1) {
-        out_format = GST_VIDEO_FORMAT_P016_LE;
-      } else if (self->chroma_format_idc == 3) {
-        out_format = GST_VIDEO_FORMAT_Y444_16LE;
-      } else {
-        GST_FIXME_OBJECT (self, "%d bits supports only 4:2:0 or 4:4:4 format",
-            self->bitdepth);
-      }
-    }
-
-    if (out_format == GST_VIDEO_FORMAT_UNKNOWN) {
-      GST_ERROR_OBJECT (self, "Could not support bitdepth/chroma format");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    gst_video_info_set_format (&info, out_format, self->width, self->height);
-
-    if (!gst_nv_decoder_configure (self->decoder,
-            cudaVideoCodec_HEVC, &info, self->coded_width, self->coded_height,
-            self->bitdepth, max_dpb_size, FALSE)) {
-      GST_ERROR_OBJECT (self, "Failed to configure decoder");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
-      GST_ERROR_OBJECT (self, "Failed to negotiate with downstream");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    memset (&self->params, 0, sizeof (CUVIDPICPARAMS));
-  }
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_h265_dec_new_picture (GstH265Decoder * decoder,
-    GstVideoCodecFrame * cframe, GstH265Picture * picture)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
-  GstNvDecoderFrame *frame;
-
-  frame = gst_nv_decoder_new_frame (self->decoder);
-  if (!frame) {
-    GST_ERROR_OBJECT (self, "No available decoder frame");
-    return GST_FLOW_ERROR;
-  }
-
-  GST_LOG_OBJECT (self, "New decoder frame %p (index %d)", frame, frame->index);
-
-  gst_h265_picture_set_user_data (picture,
-      frame, (GDestroyNotify) gst_nv_decoder_frame_unref);
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_h265_dec_output_picture (GstH265Decoder * decoder,
-    GstVideoCodecFrame * frame, GstH265Picture * picture)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
-  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
-  GstNvDecoderFrame *decoder_frame;
-
-  GST_LOG_OBJECT (self,
-      "Outputting picture %p (poc %d)", picture, picture->pic_order_cnt);
-
-  decoder_frame =
-      (GstNvDecoderFrame *) gst_h265_picture_get_user_data (picture);
-  if (!decoder_frame) {
-    GST_ERROR_OBJECT (self, "No decoder frame in picture %p", picture);
-    goto error;
-  }
-
-  if (!gst_nv_decoder_finish_frame (self->decoder, vdec, picture->discont_state,
-          decoder_frame, &frame->output_buffer)) {
-    GST_ERROR_OBJECT (self, "Failed to handle output picture");
-    goto error;
-  }
-
-  gst_h265_picture_unref (picture);
-
-  return gst_video_decoder_finish_frame (GST_VIDEO_DECODER (self), frame);
-
-error:
-  gst_video_decoder_drop_frame (vdec, frame);
-  gst_h265_picture_unref (picture);
-
-  return GST_FLOW_ERROR;
-}
-
-static GstNvDecoderFrame *
-gst_nv_h265_dec_get_decoder_frame_from_picture (GstNvH265Dec * self,
-    GstH265Picture * picture)
-{
-  GstNvDecoderFrame *frame;
-
-  frame = (GstNvDecoderFrame *) gst_h265_picture_get_user_data (picture);
-
-  if (!frame)
-    GST_DEBUG_OBJECT (self, "current picture does not have decoder frame");
-
-  return frame;
-}
-
-static void
-gst_nv_h265_dec_picture_params_from_sps (GstNvH265Dec * self,
-    const GstH265SPS * sps, CUVIDHEVCPICPARAMS * params)
-{
-#define COPY_FIELD(f) \
-  (params)->f = (sps)->f
-#define COPY_FIELD_WITH_PREFIX(f) \
-  (params)->G_PASTE(sps_,f) = (sps)->f
-#define COPY_FIELD_EXTENSION(f) \
-  (params)->f = (sps)->sps_extension_params.f
-
-  params->pic_width_in_luma_samples = sps->width;
-  params->pic_height_in_luma_samples = sps->height;
-  COPY_FIELD (log2_min_luma_coding_block_size_minus3);
-  COPY_FIELD (log2_diff_max_min_luma_coding_block_size);
-  COPY_FIELD (log2_min_transform_block_size_minus2);
-  COPY_FIELD (log2_diff_max_min_transform_block_size);
-  COPY_FIELD (pcm_enabled_flag);
-  COPY_FIELD (log2_min_pcm_luma_coding_block_size_minus3);
-  COPY_FIELD (log2_diff_max_min_pcm_luma_coding_block_size);
-  COPY_FIELD (pcm_sample_bit_depth_luma_minus1);
-  COPY_FIELD (pcm_sample_bit_depth_chroma_minus1);
-  COPY_FIELD (pcm_loop_filter_disabled_flag);
-  COPY_FIELD (strong_intra_smoothing_enabled_flag);
-  COPY_FIELD (max_transform_hierarchy_depth_intra);
-  COPY_FIELD (max_transform_hierarchy_depth_inter);
-  COPY_FIELD (max_transform_hierarchy_depth_inter);
-  COPY_FIELD (amp_enabled_flag);
-  COPY_FIELD (separate_colour_plane_flag);
-  COPY_FIELD (log2_max_pic_order_cnt_lsb_minus4);
-  COPY_FIELD (num_short_term_ref_pic_sets);
-  COPY_FIELD (long_term_ref_pics_present_flag);
-  COPY_FIELD (num_long_term_ref_pics_sps);
-  COPY_FIELD_WITH_PREFIX (temporal_mvp_enabled_flag);
-  COPY_FIELD (sample_adaptive_offset_enabled_flag);
-
-  params->scaling_list_enable_flag = sps->scaling_list_enabled_flag;
-
-  COPY_FIELD (bit_depth_luma_minus8);
-  COPY_FIELD (bit_depth_chroma_minus8);
-
-  /* Extension fields */
-  COPY_FIELD (sps_range_extension_flag);
-  if (sps->sps_range_extension_flag) {
-    COPY_FIELD_EXTENSION (high_precision_offsets_enabled_flag);
-    COPY_FIELD_EXTENSION (transform_skip_rotation_enabled_flag);
-    COPY_FIELD_EXTENSION (implicit_rdpcm_enabled_flag);
-    COPY_FIELD_EXTENSION (explicit_rdpcm_enabled_flag);
-    COPY_FIELD_EXTENSION (extended_precision_processing_flag);
-    COPY_FIELD_EXTENSION (intra_smoothing_disabled_flag);
-    COPY_FIELD_EXTENSION (persistent_rice_adaptation_enabled_flag);
-    COPY_FIELD_EXTENSION (cabac_bypass_alignment_enabled_flag);
-  }
-#undef COPY_FIELD
-#undef COPY_FIELD_WITH_PREFIX
-#undef COPY_FIELD_EXTENSION
-}
-
-static gboolean
-gst_nv_h265_dec_picture_params_from_pps (GstNvH265Dec * self,
-    const GstH265PPS * pps, CUVIDHEVCPICPARAMS * params)
-{
-  gint i;
-
-#define COPY_FIELD(f) \
-  (params)->f = (pps)->f
-#define COPY_FIELD_WITH_PREFIX(f) \
-  (params)->G_PASTE(pps_,f) = (pps)->f
-#define COPY_FIELD_EXTENSION(f) \
-  (params)->f = (pps)->pps_extension_params.f
-
-  COPY_FIELD (dependent_slice_segments_enabled_flag);
-  COPY_FIELD (slice_segment_header_extension_present_flag);
-  COPY_FIELD (sign_data_hiding_enabled_flag);
-  COPY_FIELD (cu_qp_delta_enabled_flag);
-  COPY_FIELD (diff_cu_qp_delta_depth);
-  COPY_FIELD (init_qp_minus26);
-  COPY_FIELD_WITH_PREFIX (cb_qp_offset);
-  COPY_FIELD_WITH_PREFIX (cr_qp_offset);
-  COPY_FIELD (constrained_intra_pred_flag);
-  COPY_FIELD (weighted_pred_flag);
-  COPY_FIELD (weighted_bipred_flag);
-  COPY_FIELD (transform_skip_enabled_flag);
-  COPY_FIELD (transquant_bypass_enabled_flag);
-  COPY_FIELD (entropy_coding_sync_enabled_flag);
-  COPY_FIELD (log2_parallel_merge_level_minus2);
-  COPY_FIELD (num_extra_slice_header_bits);
-  COPY_FIELD (loop_filter_across_tiles_enabled_flag);
-  COPY_FIELD (loop_filter_across_slices_enabled_flag);
-  COPY_FIELD (output_flag_present_flag);
-  COPY_FIELD (num_ref_idx_l0_default_active_minus1);
-  COPY_FIELD (num_ref_idx_l1_default_active_minus1);
-  COPY_FIELD (lists_modification_present_flag);
-  COPY_FIELD (cabac_init_present_flag);
-  COPY_FIELD_WITH_PREFIX (slice_chroma_qp_offsets_present_flag);
-  COPY_FIELD (deblocking_filter_override_enabled_flag);
-  COPY_FIELD_WITH_PREFIX (deblocking_filter_disabled_flag);
-  COPY_FIELD_WITH_PREFIX (beta_offset_div2);
-  COPY_FIELD_WITH_PREFIX (tc_offset_div2);
-  COPY_FIELD (tiles_enabled_flag);
-  COPY_FIELD (uniform_spacing_flag);
-
-  if (pps->tiles_enabled_flag) {
-    guint num_tile_columns;
-    guint num_tile_rows;
-
-    COPY_FIELD (num_tile_columns_minus1);
-    COPY_FIELD (num_tile_rows_minus1);
-
-    if (pps->num_tile_columns_minus1 >
-        G_N_ELEMENTS (params->column_width_minus1)) {
-      GST_ERROR_OBJECT (self,
-          "Too large column_width_minus1 %d", pps->num_tile_columns_minus1);
-      return FALSE;
-    }
-
-    if (pps->num_tile_rows_minus1 > G_N_ELEMENTS (params->row_height_minus1)) {
-      GST_ERROR_OBJECT (self,
-          "Too large num_tile_rows_minus1 %d", pps->num_tile_rows_minus1);
-      return FALSE;
-    }
-
-    /* XXX: The size of column_width_minus1 array in CUVIDHEVCPICPARAMS struct
-     * is 21 which is inconsistent with the spec.
-     * Just copy values as many as possible */
-    num_tile_columns = MIN (pps->num_tile_columns_minus1,
-        G_N_ELEMENTS (pps->column_width_minus1));
-    num_tile_rows = MIN (pps->num_tile_rows_minus1,
-        G_N_ELEMENTS (pps->row_height_minus1));
-
-    for (i = 0; i < num_tile_columns; i++)
-      COPY_FIELD (column_width_minus1i);
-
-    for (i = 0; i < num_tile_rows; i++)
-      COPY_FIELD (row_height_minus1i);
-  }
-
-  COPY_FIELD (pps_range_extension_flag);
-  if (pps->pps_range_extension_flag) {
-    COPY_FIELD_EXTENSION (cross_component_prediction_enabled_flag);
-    COPY_FIELD_EXTENSION (chroma_qp_offset_list_enabled_flag);
-    COPY_FIELD_EXTENSION (diff_cu_chroma_qp_offset_depth);
-    COPY_FIELD_EXTENSION (chroma_qp_offset_list_len_minus1);
-    for (i = 0; i < G_N_ELEMENTS (params->cb_qp_offset_list); i++)
-      COPY_FIELD_EXTENSION (cb_qp_offset_listi);
-    for (i = 0; i < G_N_ELEMENTS (params->cr_qp_offset_list); i++)
-      COPY_FIELD_EXTENSION (cr_qp_offset_listi);
-    COPY_FIELD_EXTENSION (log2_sao_offset_scale_luma);
-    COPY_FIELD_EXTENSION (log2_sao_offset_scale_chroma);
-  }
-#undef COPY_FIELD
-#undef COPY_FIELD_WITH_PREFIX
-#undef COPY_FIELD_EXTENSION
-
-  return TRUE;
-}
-
-static void
-gst_nv_h265_dec_reset_bitstream_params (GstNvH265Dec * self)
-{
-  self->bitstream_buffer_offset = 0;
-  self->num_slices = 0;
-
-  self->params.nBitstreamDataLen = 0;
-  self->params.pBitstreamData = NULL;
-  self->params.nNumSlices = 0;
-  self->params.pSliceDataOffsets = NULL;
-}
-
-static GstFlowReturn
-gst_nv_h265_dec_start_picture (GstH265Decoder * decoder,
-    GstH265Picture * picture, GstH265Slice * slice, GstH265Dpb * dpb)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
-  CUVIDPICPARAMS *params = &self->params;
-  CUVIDHEVCPICPARAMS *h265_params = &params->CodecSpecific.hevc;
-  const GstH265SliceHdr *slice_header = &slice->header;
-  const GstH265SPS *sps;
-  const GstH265PPS *pps;
-  GstNvDecoderFrame *frame;
-  GArray *dpb_array;
-  gint num_ref_pic;
-  gint i, j, k;
-  const GstH265ScalingList *scaling_list = NULL;
-
-  /* both NVDEC and h265parser are using the same order */
-  G_STATIC_ASSERT (sizeof (scaling_list->scaling_lists_4x4) ==
-      sizeof (h265_params->ScalingList4x4));
-  G_STATIC_ASSERT (sizeof (scaling_list->scaling_lists_8x8) ==
-      sizeof (h265_params->ScalingList8x8));
-  G_STATIC_ASSERT (sizeof (scaling_list->scaling_lists_16x16) ==
-      sizeof (h265_params->ScalingList16x16));
-  G_STATIC_ASSERT (sizeof (scaling_list->scaling_lists_32x32) ==
-      sizeof (h265_params->ScalingList32x32));
-
-  g_return_val_if_fail (slice_header->pps != NULL, GST_FLOW_ERROR);
-  g_return_val_if_fail (slice_header->pps->sps != NULL, GST_FLOW_ERROR);
-
-  frame = gst_nv_h265_dec_get_decoder_frame_from_picture (self, picture);
-
-  if (!frame) {
-    GST_ERROR_OBJECT (self,
-        "Couldn't get decoder frame frame picture %p", picture);
-    return GST_FLOW_ERROR;
-  }
-
-  gst_nv_h265_dec_reset_bitstream_params (self);
-
-  pps = slice_header->pps;
-  sps = pps->sps;
-
-  /* FIXME: update sps/pps related params only when it's required */
-  params->PicWidthInMbs = sps->pic_width_in_luma_samples / 16;
-  params->FrameHeightInMbs = sps->pic_height_in_luma_samples / 16;
-  params->CurrPicIdx = frame->index;
-
-  /* nBitstreamDataLen, pBitstreamData, nNumSlices and pSliceDataOffsets
-   * will be set later */
-  params->ref_pic_flag = picture->ref;
-  params->intra_pic_flag = GST_H265_IS_NAL_TYPE_IRAP (slice->nalu.type);
-
-  h265_params->IrapPicFlag = GST_H265_IS_NAL_TYPE_IRAP (slice->nalu.type);
-  h265_params->IdrPicFlag = GST_H265_IS_NAL_TYPE_IDR (slice->nalu.type);
-
-  gst_nv_h265_dec_picture_params_from_sps (self, sps, h265_params);
-  if (!gst_nv_h265_dec_picture_params_from_pps (self, pps, h265_params)) {
-    GST_ERROR_OBJECT (self, "Couldn't copy pps");
-    return GST_FLOW_ERROR;
-  }
-
-  /* Fill reference */
-  if (decoder->NumPocStCurrBefore >
-      G_N_ELEMENTS (h265_params->RefPicSetStCurrBefore)) {
-    GST_ERROR_OBJECT (self, "Too many RefPicSetStCurrBefore");
-    return GST_FLOW_ERROR;
-  }
-
-  if (decoder->NumPocStCurrAfter >
-      G_N_ELEMENTS (h265_params->RefPicSetStCurrAfter)) {
-    GST_ERROR_OBJECT (self, "Too many RefPicSetStCurrAfter");
-    return GST_FLOW_ERROR;
-  }
-
-  if (decoder->NumPocLtCurr > G_N_ELEMENTS (h265_params->RefPicSetLtCurr)) {
-    GST_ERROR_OBJECT (self, "Too many RefPicSetLtCurr");
-    return GST_FLOW_ERROR;
-  }
-
-  /* Fill ref list */
-  h265_params->NumBitsForShortTermRPSInSlice =
-      slice_header->short_term_ref_pic_set_size;
-  h265_params->NumDeltaPocsOfRefRpsIdx =
-      slice_header->short_term_ref_pic_sets.NumDeltaPocsOfRefRpsIdx;
-  h265_params->NumPocTotalCurr = decoder->NumPicTotalCurr;
-  h265_params->NumPocStCurrBefore = decoder->NumPocStCurrBefore;
-  h265_params->NumPocStCurrAfter = decoder->NumPocStCurrAfter;
-  h265_params->NumPocLtCurr = decoder->NumPocLtCurr;
-  h265_params->CurrPicOrderCntVal = picture->pic_order_cnt;
-
-  dpb_array = gst_h265_dpb_get_pictures_all (dpb);
-  /* count only referenced frame */
-  num_ref_pic = 0;
-  for (i = 0; i < dpb_array->len; i++) {
-    GstH265Picture *other = g_array_index (dpb_array, GstH265Picture *, i);
-    GstNvDecoderFrame *other_frame;
-    gint picture_index = -1;
-
-    if (!other->ref)
-      continue;
-
-    if (num_ref_pic >= G_N_ELEMENTS (h265_params->RefPicIdx)) {
-      GST_ERROR_OBJECT (self, "Too many reference frames");
-      return GST_FLOW_ERROR;
-    }
-
-    other_frame = gst_nv_h265_dec_get_decoder_frame_from_picture (self, other);
-    if (other_frame)
-      picture_index = other_frame->index;
-
-    h265_params->RefPicIdxnum_ref_pic = picture_index;
-    h265_params->PicOrderCntValnum_ref_pic = other->pic_order_cnt;
-    h265_params->IsLongTermnum_ref_pic = other->long_term;
-
-    num_ref_pic++;
-  }
-  g_array_unref (dpb_array);
-
-  for (i = 0, j = 0; i < num_ref_pic; i++) {
-    GstH265Picture *other = NULL;
-
-    while (!other && j < decoder->NumPocStCurrBefore)
-      other = decoder->RefPicSetStCurrBeforej++;
-
-    if (other) {
-      for (k = 0; k < num_ref_pic; k++) {
-        if (h265_params->PicOrderCntValk == other->pic_order_cnt) {
-          h265_params->RefPicSetStCurrBeforei = k;
-          break;
-        }
-      }
-    }
-  }
-
-  for (i = 0, j = 0; i < num_ref_pic; i++) {
-    GstH265Picture *other = NULL;
-
-    while (!other && j < decoder->NumPocStCurrAfter)
-      other = decoder->RefPicSetStCurrAfterj++;
-
-    if (other) {
-      for (k = 0; k < num_ref_pic; k++) {
-        if (h265_params->PicOrderCntValk == other->pic_order_cnt) {
-          h265_params->RefPicSetStCurrAfteri = k;
-          break;
-        }
-      }
-    }
-  }
-
-  for (i = 0, j = 0; i < num_ref_pic; i++) {
-    GstH265Picture *other = NULL;
-
-    while (!other && j < decoder->NumPocLtCurr)
-      other = decoder->RefPicSetLtCurrj++;
-
-    if (other) {
-      for (k = 0; k < num_ref_pic; k++) {
-        if (h265_params->PicOrderCntValk == other->pic_order_cnt) {
-          h265_params->RefPicSetLtCurri = k;
-          break;
-        }
-      }
-    }
-  }
-
-  /* Fill scaling list */
-  if (pps->scaling_list_data_present_flag ||
-      (sps->scaling_list_enabled_flag
-          && !sps->scaling_list_data_present_flag)) {
-    scaling_list = &pps->scaling_list;
-  } else {
-    scaling_list = &sps->scaling_list;
-  }
-
-  memcpy (h265_params->ScalingList4x4, scaling_list->scaling_lists_4x4,
-      sizeof (scaling_list->scaling_lists_4x4));
-  memcpy (h265_params->ScalingList8x8, scaling_list->scaling_lists_8x8,
-      sizeof (scaling_list->scaling_lists_8x8));
-  memcpy (h265_params->ScalingList16x16, scaling_list->scaling_lists_16x16,
-      sizeof (scaling_list->scaling_lists_16x16));
-  memcpy (h265_params->ScalingList32x32, scaling_list->scaling_lists_32x32,
-      sizeof (scaling_list->scaling_lists_32x32));
-
-  for (i = 0; i < G_N_ELEMENTS (h265_params->ScalingListDCCoeff16x16); i++) {
-    h265_params->ScalingListDCCoeff16x16i =
-        scaling_list->scaling_list_dc_coef_minus8_16x16i + 8;
-  }
-
-  for (i = 0; i < G_N_ELEMENTS (h265_params->ScalingListDCCoeff32x32); i++) {
-    h265_params->ScalingListDCCoeff32x32i =
-        scaling_list->scaling_list_dc_coef_minus8_32x32i + 8;
-  }
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_h265_dec_decode_slice (GstH265Decoder * decoder,
-    GstH265Picture * picture, GstH265Slice * slice,
-    GArray * ref_pic_list0, GArray * ref_pic_list1)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
-  gsize new_size;
-
-  GST_LOG_OBJECT (self, "Decode slice, nalu size %u", slice->nalu.size);
-
-  if (self->slice_offsets_alloc_len < self->num_slices + 1) {
-    self->slice_offsets_alloc_len = 2 * (self->num_slices + 1);
-
-    self->slice_offsets = (guint *) g_realloc_n (self->slice_offsets,
-        self->slice_offsets_alloc_len, sizeof (guint));
-  }
-  self->slice_offsetsself->num_slices = self->bitstream_buffer_offset;
-  GST_LOG_OBJECT (self, "Slice offset %u for slice %d",
-      self->slice_offsetsself->num_slices, self->num_slices);
-
-  self->num_slices++;
-
-  new_size = self->bitstream_buffer_offset + slice->nalu.size + 3;
-  if (self->bitstream_buffer_alloc_size < new_size) {
-    self->bitstream_buffer_alloc_size = 2 * new_size;
-
-    self->bitstream_buffer = (guint8 *) g_realloc (self->bitstream_buffer,
-        self->bitstream_buffer_alloc_size);
-  }
-
-  self->bitstream_bufferself->bitstream_buffer_offset = 0;
-  self->bitstream_bufferself->bitstream_buffer_offset + 1 = 0;
-  self->bitstream_bufferself->bitstream_buffer_offset + 2 = 1;
-
-  memcpy (self->bitstream_buffer + self->bitstream_buffer_offset + 3,
-      slice->nalu.data + slice->nalu.offset, slice->nalu.size);
-  self->bitstream_buffer_offset = new_size;
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_h265_dec_end_picture (GstH265Decoder * decoder, GstH265Picture * picture)
-{
-  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
-  gboolean ret;
-  CUVIDPICPARAMS *params = &self->params;
-
-  params->nBitstreamDataLen = self->bitstream_buffer_offset;
-  params->pBitstreamData = self->bitstream_buffer;
-  params->nNumSlices = self->num_slices;
-  params->pSliceDataOffsets = self->slice_offsets;
-
-  GST_LOG_OBJECT (self, "End picture, bitstream len: %" G_GSIZE_FORMAT
-      ", num slices %d", self->bitstream_buffer_offset, self->num_slices);
-
-  ret = gst_nv_decoder_decode_picture (self->decoder, &self->params);
-
-  if (!ret) {
-    GST_ERROR_OBJECT (self, "Failed to decode picture");
-    return GST_FLOW_ERROR;
-  }
-
-  return GST_FLOW_OK;
-}
-
-static guint
-gst_nv_h265_dec_get_preferred_output_delay (GstH265Decoder * decoder,
-    gboolean live)
-{
-  /* Prefer to zero latency for live pipeline */
-  if (live)
-    return 0;
-
-  /* NVCODEC SDK uses 4 frame delay for better throughput performance */
-  return 4;
-}
-
-void
-gst_nv_h265_dec_register (GstPlugin * plugin, guint device_id, guint rank,
-    GstCaps * sink_caps, GstCaps * src_caps, gboolean is_primary)
-{
-  GType type;
-  gchar *type_name;
-  gchar *feature_name;
-  GstNvDecoderClassData *cdata;
-  gint index = 0;
-  GValue value_list = G_VALUE_INIT;
-  GValue value = G_VALUE_INIT;
-  GTypeInfo type_info = {
-    sizeof (GstNvH265DecClass),
-    NULL,
-    NULL,
-    (GClassInitFunc) gst_nv_h265_dec_class_init,
-    NULL,
-    NULL,
-    sizeof (GstNvH265Dec),
-    0,
-    (GInstanceInitFunc) gst_nv_h265_dec_init,
-  };
-
-  GST_DEBUG_CATEGORY_INIT (gst_nv_h265_dec_debug, "nvh265dec", 0, "nvh265dec");
-
-  cdata = g_new0 (GstNvDecoderClassData, 1);
-  cdata->sink_caps = gst_caps_copy (sink_caps);
-
-  /* Update stream-format since we support packetized format as well */
-  g_value_init (&value_list, GST_TYPE_LIST);
-  g_value_init (&value, G_TYPE_STRING);
-
-  g_value_set_static_string (&value, "hev1");
-  gst_value_list_append_value (&value_list, &value);
-
-  g_value_set_static_string (&value, "hvc1");
-  gst_value_list_append_value (&value_list, &value);
-
-  g_value_set_static_string (&value, "byte-stream");
-  gst_value_list_append_value (&value_list, &value);
-
-  gst_caps_set_value (cdata->sink_caps, "stream-format", &value_list);
-  g_value_unset (&value);
-  g_value_unset (&value_list);
-
-  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
-      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
-  cdata->src_caps = gst_caps_ref (src_caps);
-  cdata->cuda_device_id = device_id;
-
-  if (is_primary) {
-    type_name = g_strdup ("GstNvH265Dec");
-    feature_name = g_strdup ("nvh265dec");
-  } else {
-    type_name = g_strdup ("GstNvH265SLDec");
-    feature_name = g_strdup ("nvh265sldec");
-  }
-
-  while (g_type_from_name (type_name)) {
-    index++;
-    g_free (type_name);
-    g_free (feature_name);
-    if (is_primary) {
-      type_name = g_strdup_printf ("GstNvH265Device%dDec", index);
-      feature_name = g_strdup_printf ("nvh265device%ddec", index);
-    } else {
-      type_name = g_strdup_printf ("GstNvH265SLDevice%dDec", index);
-      feature_name = g_strdup_printf ("nvh265sldevice%ddec", index);
-    }
-  }
-
-  type_info.class_data = cdata;
-  type = g_type_register_static (GST_TYPE_H265_DECODER,
-      type_name, &type_info, 0);
-
-  /* make lower rank than default device */
-  if (rank > 0 && index > 0)
-    rank--;
-
-  if (!gst_element_register (plugin, feature_name, rank, type))
-    GST_WARNING ("Failed to register plugin '%s'", type_name);
-
-  g_free (type_name);
-  g_free (feature_name);
-}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvvp8dec.c Deleted

@@ -1,572 +0,0 @@
-/* GStreamer
- * Copyright (C) 2020 Seungha Yang <seungha@centricular.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * SECTION:element-nvvp8sldec
- * @title: nvvp8sldec
- *
- * GstCodecs based NVIDIA VP8 video decoder
- *
- * ## Example launch line
- * ```
- * gst-launch-1.0 filesrc location=/path/to/vp8/file ! parsebin ! nvvp8sldec ! videoconvert ! autovideosink
- * ```
- *
- * Since: 1.20
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/cuda/gstcudautils.h>
-
-#include "gstnvvp8dec.h"
-#include "gstnvdecoder.h"
-
-#include <string.h>
-
-GST_DEBUG_CATEGORY_STATIC (gst_nv_vp8_dec_debug);
-#define GST_CAT_DEFAULT gst_nv_vp8_dec_debug
-
-typedef struct _GstNvVp8Dec
-{
-  GstVp8Decoder parent;
-
-  GstCudaContext *context;
-  GstNvDecoder *decoder;
-  CUVIDPICPARAMS params;
-
-  guint width, height;
-} GstNvVp8Dec;
-
-typedef struct _GstNvVp8DecClass
-{
-  GstVp8DecoderClass parent_class;
-  guint cuda_device_id;
-} GstNvVp8DecClass;
-
-enum
-{
-  PROP_0,
-  PROP_CUDA_DEVICE_ID,
-};
-
-static GTypeClass *parent_class = NULL;
-
-#define GST_NV_VP8_DEC(object) ((GstNvVp8Dec *) (object))
-#define GST_NV_VP8_DEC_GET_CLASS(object) \
-    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstNvVp8DecClass))
-
-static void gst_nv_vp8_dec_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
-static void gst_nv_vp8_dec_set_context (GstElement * element,
-    GstContext * context);
-static gboolean gst_nv_vp8_dec_open (GstVideoDecoder * decoder);
-static gboolean gst_nv_vp8_dec_close (GstVideoDecoder * decoder);
-static gboolean gst_nv_vp8_dec_negotiate (GstVideoDecoder * decoder);
-static gboolean gst_nv_vp8_dec_decide_allocation (GstVideoDecoder *
-    decoder, GstQuery * query);
-static gboolean gst_nv_vp8_dec_src_query (GstVideoDecoder * decoder,
-    GstQuery * query);
-
-/* GstVp8Decoder */
-static GstFlowReturn gst_nv_vp8_dec_new_sequence (GstVp8Decoder * decoder,
-    const GstVp8FrameHdr * frame_hdr, gint max_dpb_size);
-static GstFlowReturn gst_nv_vp8_dec_new_picture (GstVp8Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp8Picture * picture);
-static GstFlowReturn gst_nv_vp8_dec_decode_picture (GstVp8Decoder * decoder,
-    GstVp8Picture * picture, GstVp8Parser * parser);
-static GstFlowReturn gst_nv_vp8_dec_output_picture (GstVp8Decoder *
-    decoder, GstVideoCodecFrame * frame, GstVp8Picture * picture);
-static guint gst_nv_vp8_dec_get_preferred_output_delay (GstVp8Decoder * decoder,
-    gboolean is_live);
-
-static void
-gst_nv_vp8_dec_class_init (GstNvVp8DecClass * klass,
-    GstNvDecoderClassData * cdata)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
-  GstVp8DecoderClass *vp8decoder_class = GST_VP8_DECODER_CLASS (klass);
-
-  object_class->get_property = gst_nv_vp8_dec_get_property;
-
-  /**
-   * GstNvVp8SLDec:cuda-device-id:
-   *
-   * Assigned CUDA device id
-   *
-   * Since: 1.22
-   */
-  g_object_class_install_property (object_class, PROP_CUDA_DEVICE_ID,
-      g_param_spec_uint ("cuda-device-id", "CUDA device id",
-          "Assigned CUDA device id", 0, G_MAXINT, 0,
-          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
-  element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_set_context);
-
-  parent_class = (GTypeClass *) g_type_class_peek_parent (klass);
-  gst_element_class_set_metadata (element_class,
-      "NVDEC VP8 Stateless Decoder",
-      "Codec/Decoder/Video/Hardware",
-      "NVIDIA VP8 video decoder", "Seungha Yang <seungha@centricular.com>");
-
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
-          cdata->sink_caps));
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
-          cdata->src_caps));
-
-  decoder_class->open = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_open);
-  decoder_class->close = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_close);
-  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_negotiate);
-  decoder_class->decide_allocation =
-      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_decide_allocation);
-  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_src_query);
-
-  vp8decoder_class->new_sequence =
-      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_new_sequence);
-  vp8decoder_class->new_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_new_picture);
-  vp8decoder_class->decode_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_decode_picture);
-  vp8decoder_class->output_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_output_picture);
-  vp8decoder_class->get_preferred_output_delay =
-      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_get_preferred_output_delay);
-
-  klass->cuda_device_id = cdata->cuda_device_id;
-
-  gst_caps_unref (cdata->sink_caps);
-  gst_caps_unref (cdata->src_caps);
-  g_free (cdata);
-}
-
-static void
-gst_nv_vp8_dec_init (GstNvVp8Dec * self)
-{
-}
-
-static void
-gst_nv_vp8_dec_get_property (GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec)
-{
-  GstNvVp8DecClass *klass = GST_NV_VP8_DEC_GET_CLASS (object);
-
-  switch (prop_id) {
-    case PROP_CUDA_DEVICE_ID:
-      g_value_set_uint (value, klass->cuda_device_id);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_nv_vp8_dec_set_context (GstElement * element, GstContext * context)
-{
-  GstNvVp8Dec *self = GST_NV_VP8_DEC (element);
-  GstNvVp8DecClass *klass = GST_NV_VP8_DEC_GET_CLASS (self);
-
-  GST_DEBUG_OBJECT (self, "set context %s",
-      gst_context_get_context_type (context));
-
-  if (gst_cuda_handle_set_context (element, context, klass->cuda_device_id,
-          &self->context)) {
-    goto done;
-  }
-
-  if (self->decoder)
-    gst_nv_decoder_handle_set_context (self->decoder, element, context);
-
-done:
-  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
-}
-
-static gboolean
-gst_nv_vp8_dec_open (GstVideoDecoder * decoder)
-{
-  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
-  GstNvVp8DecClass *klass = GST_NV_VP8_DEC_GET_CLASS (self);
-
-  if (!gst_cuda_ensure_element_context (GST_ELEMENT (self),
-          klass->cuda_device_id, &self->context)) {
-    GST_ERROR_OBJECT (self, "Required element data is unavailable");
-    return FALSE;
-  }
-
-  self->decoder = gst_nv_decoder_new (self->context);
-  if (!self->decoder) {
-    GST_ERROR_OBJECT (self, "Failed to create decoder object");
-    gst_clear_object (&self->context);
-
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-static gboolean
-gst_nv_vp8_dec_close (GstVideoDecoder * decoder)
-{
-  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
-
-  gst_clear_object (&self->decoder);
-  gst_clear_object (&self->context);
-
-  return TRUE;
-}
-
-static gboolean
-gst_nv_vp8_dec_negotiate (GstVideoDecoder * decoder)
-{
-  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
-  GstVp8Decoder *vp8dec = GST_VP8_DECODER (decoder);
-
-  GST_DEBUG_OBJECT (self, "negotiate");
-
-  gst_nv_decoder_negotiate (self->decoder, decoder, vp8dec->input_state);
-
-  /* TODO: add support D3D11 memory */
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
-}
-
-static gboolean
-gst_nv_vp8_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
-{
-  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
-
-  if (!gst_nv_decoder_decide_allocation (self->decoder, decoder, query)) {
-    GST_WARNING_OBJECT (self, "Failed to handle decide allocation");
-    return FALSE;
-  }
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
-      (decoder, query);
-}
-
-static gboolean
-gst_nv_vp8_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
-{
-  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_CONTEXT:
-      if (gst_cuda_handle_context_query (GST_ELEMENT (decoder), query,
-              self->context)) {
-        return TRUE;
-      } else if (self->decoder &&
-          gst_nv_decoder_handle_context_query (self->decoder, decoder, query)) {
-        return TRUE;
-      }
-      break;
-    default:
-      break;
-  }
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
-}
-
-static GstFlowReturn
-gst_nv_vp8_dec_new_sequence (GstVp8Decoder * decoder,
-    const GstVp8FrameHdr * frame_hdr, gint max_dpb_size)
-{
-  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
-  gboolean modified = FALSE;
-
-  GST_LOG_OBJECT (self, "new sequence");
-
-  if (self->width != frame_hdr->width || self->height != frame_hdr->height) {
-    if (self->decoder) {
-      GST_INFO_OBJECT (self, "resolution changed %dx%d -> %dx%d",
-          self->width, self->height, frame_hdr->width, frame_hdr->height);
-    }
-
-    self->width = frame_hdr->width;
-    self->height = frame_hdr->height;
-
-    modified = TRUE;
-  }
-
-  if (modified || !gst_nv_decoder_is_configured (self->decoder)) {
-    GstVideoInfo info;
-
-    gst_video_info_set_format (&info,
-        GST_VIDEO_FORMAT_NV12, self->width, self->height);
-
-    if (!gst_nv_decoder_configure (self->decoder,
-            cudaVideoCodec_VP8, &info, self->width, self->height, 8,
-            max_dpb_size, FALSE)) {
-      GST_ERROR_OBJECT (self, "Failed to configure decoder");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
-      GST_ERROR_OBJECT (self, "Failed to negotiate with downstream");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    memset (&self->params, 0, sizeof (CUVIDPICPARAMS));
-
-    self->params.PicWidthInMbs = GST_ROUND_UP_16 (self->width) >> 4;
-    self->params.FrameHeightInMbs = GST_ROUND_UP_16 (self->height) >> 4;
-
-    self->params.CodecSpecific.vp8.width = self->width;
-    self->params.CodecSpecific.vp8.height = self->height;
-  }
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_vp8_dec_new_picture (GstVp8Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp8Picture * picture)
-{
-  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
-  GstNvDecoderFrame *nv_frame;
-
-  nv_frame = gst_nv_decoder_new_frame (self->decoder);
-  if (!nv_frame) {
-    GST_ERROR_OBJECT (self, "No available decoder frame");
-    return GST_FLOW_ERROR;
-  }
-
-  GST_LOG_OBJECT (self,
-      "New decoder frame %p (index %d)", nv_frame, nv_frame->index);
-
-  gst_vp8_picture_set_user_data (picture,
-      nv_frame, (GDestroyNotify) gst_nv_decoder_frame_unref);
-
-  return GST_FLOW_OK;
-}
-
-static GstNvDecoderFrame *
-gst_nv_vp8_dec_get_decoder_frame_from_picture (GstNvVp8Dec * self,
-    GstVp8Picture * picture)
-{
-  GstNvDecoderFrame *frame;
-
-  frame = (GstNvDecoderFrame *) gst_vp8_picture_get_user_data (picture);
-
-  if (!frame)
-    GST_DEBUG_OBJECT (self, "current picture does not have decoder frame");
-
-  return frame;
-}
-
-static GstFlowReturn
-gst_nv_vp8_dec_decode_picture (GstVp8Decoder * decoder,
-    GstVp8Picture * picture, GstVp8Parser * parser)
-{
-  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
-  GstVp8FrameHdr *frame_hdr = &picture->frame_hdr;
-  GstNvDecoderFrame *frame;
-  GstNvDecoderFrame *other_frame;
-  guint offset = 0;
-
-  GST_LOG_OBJECT (self, "Decode picture, size %" G_GSIZE_FORMAT, picture->size);
-
-  frame = gst_nv_vp8_dec_get_decoder_frame_from_picture (self, picture);
-  if (!frame) {
-    GST_ERROR_OBJECT (self, "Decoder frame is unavailable");
-    return GST_FLOW_ERROR;
-  }
-
-  self->params.nBitstreamDataLen = picture->size;
-  self->params.pBitstreamData = picture->data;
-  self->params.nNumSlices = 1;
-  self->params.pSliceDataOffsets = &offset;
-
-  self->params.CurrPicIdx = frame->index;
-
-  self->params.CodecSpecific.vp8.first_partition_size =
-      frame_hdr->first_part_size;
-
-  if (decoder->alt_ref_picture) {
-    other_frame =
-        gst_nv_vp8_dec_get_decoder_frame_from_picture (self,
-        decoder->alt_ref_picture);
-    if (!other_frame) {
-      GST_ERROR_OBJECT (self, "Couldn't get decoder frame for AltRef");
-      return GST_FLOW_ERROR;
-    }
-
-    self->params.CodecSpecific.vp8.AltRefIdx = other_frame->index;
-  } else {
-    self->params.CodecSpecific.vp8.AltRefIdx = 0xff;
-  }
-
-  if (decoder->golden_ref_picture) {
-    other_frame =
-        gst_nv_vp8_dec_get_decoder_frame_from_picture (self,
-        decoder->golden_ref_picture);
-    if (!other_frame) {
-      GST_ERROR_OBJECT (self, "Couldn't get decoder frame for GoldenRef");
-      return GST_FLOW_ERROR;
-    }
-
-    self->params.CodecSpecific.vp8.GoldenRefIdx = other_frame->index;
-  } else {
-    self->params.CodecSpecific.vp8.GoldenRefIdx = 0xff;
-  }
-
-  if (decoder->last_picture) {
-    other_frame =
-        gst_nv_vp8_dec_get_decoder_frame_from_picture (self,
-        decoder->last_picture);
-    if (!other_frame) {
-      GST_ERROR_OBJECT (self, "Couldn't get decoder frame for LastRef");
-      return GST_FLOW_ERROR;
-    }
-
-    self->params.CodecSpecific.vp8.LastRefIdx = other_frame->index;
-  } else {
-    self->params.CodecSpecific.vp8.LastRefIdx = 0xff;
-  }
-
-  self->params.CodecSpecific.vp8.vp8_frame_tag.frame_type =
-      frame_hdr->key_frame ? 0 : 1;
-  self->params.CodecSpecific.vp8.vp8_frame_tag.version = frame_hdr->version;
-  self->params.CodecSpecific.vp8.vp8_frame_tag.show_frame =
-      frame_hdr->show_frame;
-  self->params.CodecSpecific.vp8.vp8_frame_tag.update_mb_segmentation_data =
-      parser->segmentation.segmentation_enabled ?
-      parser->segmentation.update_segment_feature_data : 0;
-
-  if (!gst_nv_decoder_decode_picture (self->decoder, &self->params))
-    return GST_FLOW_ERROR;
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_vp8_dec_output_picture (GstVp8Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp8Picture * picture)
-{
-  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
-  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
-  GstNvDecoderFrame *decoder_frame;
-
-  GST_LOG_OBJECT (self, "Outputting picture %p", picture);
-
-  decoder_frame = (GstNvDecoderFrame *) gst_vp8_picture_get_user_data (picture);
-  if (!decoder_frame) {
-    GST_ERROR_OBJECT (self, "No decoder frame in picture %p", picture);
-    goto error;
-  }
-
-  if (!gst_nv_decoder_finish_frame (self->decoder, vdec, picture->discont_state,
-          decoder_frame, &frame->output_buffer)) {
-    GST_ERROR_OBJECT (self, "Failed to handle output picture");
-    goto error;
-  }
-
-  gst_vp8_picture_unref (picture);
-
-  return gst_video_decoder_finish_frame (vdec, frame);
-
-error:
-  gst_video_decoder_drop_frame (vdec, frame);
-  gst_vp8_picture_unref (picture);
-
-  return GST_FLOW_ERROR;
-}
-
-static guint
-gst_nv_vp8_dec_get_preferred_output_delay (GstVp8Decoder * decoder,
-    gboolean is_live)
-{
-  /* Prefer to zero latency for live pipeline */
-  if (is_live)
-    return 0;
-
-  /* NVCODEC SDK uses 4 frame delay for better throughput performance */
-  return 4;
-}
-
-void
-gst_nv_vp8_dec_register (GstPlugin * plugin, guint device_id, guint rank,
-    GstCaps * sink_caps, GstCaps * src_caps, gboolean is_primary)
-{
-  GType type;
-  gchar *type_name;
-  gchar *feature_name;
-  GstNvDecoderClassData *cdata;
-  gint index = 0;
-  GTypeInfo type_info = {
-    sizeof (GstNvVp8DecClass),
-    NULL,
-    NULL,
-    (GClassInitFunc) gst_nv_vp8_dec_class_init,
-    NULL,
-    NULL,
-    sizeof (GstNvVp8Dec),
-    0,
-    (GInstanceInitFunc) gst_nv_vp8_dec_init,
-  };
-
-  GST_DEBUG_CATEGORY_INIT (gst_nv_vp8_dec_debug, "nvvp8dec", 0, "nvvp8dec");
-
-  cdata = g_new0 (GstNvDecoderClassData, 1);
-  cdata->sink_caps = gst_caps_ref (sink_caps);
-  cdata->src_caps = gst_caps_ref (src_caps);
-  cdata->cuda_device_id = device_id;
-
-  if (is_primary) {
-    type_name = g_strdup ("GstNvVp8Dec");
-    feature_name = g_strdup ("nvvp8dec");
-  } else {
-    type_name = g_strdup ("GstNvVp8SLDec");
-    feature_name = g_strdup ("nvvp8sldec");
-  }
-
-  while (g_type_from_name (type_name)) {
-    index++;
-    g_free (type_name);
-    g_free (feature_name);
-    if (is_primary) {
-      type_name = g_strdup_printf ("GstNvVp8Device%dDec", index);
-      feature_name = g_strdup_printf ("nvvp8device%ddec", index);
-    } else {
-      type_name = g_strdup_printf ("GstNvVp8SLDevice%dDec", index);
-      feature_name = g_strdup_printf ("nvvp8sldevice%ddec", index);
-    }
-  }
-
-  type_info.class_data = cdata;
-  type = g_type_register_static (GST_TYPE_VP8_DECODER,
-      type_name, &type_info, 0);
-
-  /* make lower rank than default device */
-  if (rank > 0 && index > 0)
-    rank--;
-
-  if (!gst_element_register (plugin, feature_name, rank, type))
-    GST_WARNING ("Failed to register plugin '%s'", type_name);
-
-  g_free (type_name);
-  g_free (feature_name);
-}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvvp9dec.c Deleted

@@ -1,672 +0,0 @@
-/* GStreamer
- * Copyright (C) 2020 Seungha Yang <seungha@centricular.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * SECTION:element-nvvp9sldec
- * @title: nvvp9sldec
- *
- * GstCodecs based NVIDIA VP9 video decoder
- *
- * ## Example launch line
- * ```
- * gst-launch-1.0 filesrc location=/path/to/vp9/file ! parsebin ! nvvp9sldec ! videoconvert ! autovideosink
- * ```
- *
- * Since: 1.20
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/cuda/gstcudautils.h>
-
-#include "gstnvvp9dec.h"
-#include "gstnvdecoder.h"
-
-#include <string.h>
-
-GST_DEBUG_CATEGORY_STATIC (gst_nv_vp9_dec_debug);
-#define GST_CAT_DEFAULT gst_nv_vp9_dec_debug
-
-typedef struct _GstNvVp9Dec
-{
-  GstVp9Decoder parent;
-
-  GstCudaContext *context;
-  GstNvDecoder *decoder;
-  CUVIDPICPARAMS params;
-
-  guint width, height;
-  GstVP9Profile profile;
-} GstNvVp9Dec;
-
-typedef struct _GstNvVp9DecClass
-{
-  GstVp9DecoderClass parent_class;
-  guint cuda_device_id;
-} GstNvVp9DecClass;
-
-enum
-{
-  PROP_0,
-  PROP_CUDA_DEVICE_ID,
-};
-
-static GTypeClass *parent_class = NULL;
-
-#define GST_NV_VP9_DEC(object) ((GstNvVp9Dec *) (object))
-#define GST_NV_VP9_DEC_GET_CLASS(object) \
-    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstNvVp9DecClass))
-
-static void gst_nv_vp9_dec_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
-static void gst_nv_vp9_dec_set_context (GstElement * element,
-    GstContext * context);
-static gboolean gst_nv_vp9_dec_open (GstVideoDecoder * decoder);
-static gboolean gst_nv_vp9_dec_close (GstVideoDecoder * decoder);
-static gboolean gst_nv_vp9_dec_negotiate (GstVideoDecoder * decoder);
-static gboolean gst_nv_vp9_dec_decide_allocation (GstVideoDecoder *
-    decoder, GstQuery * query);
-static gboolean gst_nv_vp9_dec_src_query (GstVideoDecoder * decoder,
-    GstQuery * query);
-
-/* GstVp9Decoder */
-static GstFlowReturn gst_nv_vp9_dec_new_sequence (GstVp9Decoder * decoder,
-    const GstVp9FrameHeader * frame_hdr, gint max_dpb_size);
-static GstFlowReturn gst_nv_vp9_dec_new_picture (GstVp9Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp9Picture * picture);
-static GstVp9Picture *gst_nv_vp9_dec_duplicate_picture (GstVp9Decoder *
-    decoder, GstVideoCodecFrame * frame, GstVp9Picture * picture);
-static GstFlowReturn gst_nv_vp9_dec_decode_picture (GstVp9Decoder * decoder,
-    GstVp9Picture * picture, GstVp9Dpb * dpb);
-static GstFlowReturn gst_nv_vp9_dec_output_picture (GstVp9Decoder *
-    decoder, GstVideoCodecFrame * frame, GstVp9Picture * picture);
-static guint gst_nv_vp9_dec_get_preferred_output_delay (GstVp9Decoder * decoder,
-    gboolean is_live);
-
-static void
-gst_nv_vp9_dec_class_init (GstNvVp9DecClass * klass,
-    GstNvDecoderClassData * cdata)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
-  GstVp9DecoderClass *vp9decoder_class = GST_VP9_DECODER_CLASS (klass);
-
-  object_class->get_property = gst_nv_vp9_dec_get_property;
-
-  /**
-   * GstNvVp9SLDec:cuda-device-id:
-   *
-   * Assigned CUDA device id
-   *
-   * Since: 1.22
-   */
-  g_object_class_install_property (object_class, PROP_CUDA_DEVICE_ID,
-      g_param_spec_uint ("cuda-device-id", "CUDA device id",
-          "Assigned CUDA device id", 0, G_MAXINT, 0,
-          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
-  element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_set_context);
-
-  parent_class = (GTypeClass *) g_type_class_peek_parent (klass);
-  gst_element_class_set_metadata (element_class,
-      "NVDEC VP9 Stateless Decoder",
-      "Codec/Decoder/Video/Hardware",
-      "NVIDIA VP9 video decoder", "Seungha Yang <seungha@centricular.com>");
-
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
-          cdata->sink_caps));
-  gst_element_class_add_pad_template (element_class,
-      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
-          cdata->src_caps));
-
-  decoder_class->open = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_open);
-  decoder_class->close = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_close);
-  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_negotiate);
-  decoder_class->decide_allocation =
-      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_decide_allocation);
-  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_src_query);
-
-  vp9decoder_class->new_sequence =
-      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_new_sequence);
-  vp9decoder_class->new_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_new_picture);
-  vp9decoder_class->duplicate_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_duplicate_picture);
-  vp9decoder_class->decode_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_decode_picture);
-  vp9decoder_class->output_picture =
-      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_output_picture);
-  vp9decoder_class->get_preferred_output_delay =
-      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_get_preferred_output_delay);
-
-  klass->cuda_device_id = cdata->cuda_device_id;
-
-  gst_caps_unref (cdata->sink_caps);
-  gst_caps_unref (cdata->src_caps);
-  g_free (cdata);
-}
-
-static void
-gst_nv_vp9_dec_init (GstNvVp9Dec * self)
-{
-}
-
-static void
-gst_nv_vp9_dec_get_property (GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec)
-{
-  GstNvVp9DecClass *klass = GST_NV_VP9_DEC_GET_CLASS (object);
-
-  switch (prop_id) {
-    case PROP_CUDA_DEVICE_ID:
-      g_value_set_uint (value, klass->cuda_device_id);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_nv_vp9_dec_set_context (GstElement * element, GstContext * context)
-{
-  GstNvVp9Dec *self = GST_NV_VP9_DEC (element);
-  GstNvVp9DecClass *klass = GST_NV_VP9_DEC_GET_CLASS (self);
-
-  GST_DEBUG_OBJECT (self, "set context %s",
-      gst_context_get_context_type (context));
-
-  if (gst_cuda_handle_set_context (element, context, klass->cuda_device_id,
-          &self->context)) {
-    goto done;
-  }
-
-  if (self->decoder)
-    gst_nv_decoder_handle_set_context (self->decoder, element, context);
-
-done:
-  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
-}
-
-static gboolean
-gst_nv_vp9_dec_open (GstVideoDecoder * decoder)
-{
-  GstVp9Decoder *vp9dec = GST_VP9_DECODER (decoder);
-  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
-  GstNvVp9DecClass *klass = GST_NV_VP9_DEC_GET_CLASS (self);
-
-  if (!gst_cuda_ensure_element_context (GST_ELEMENT (self),
-          klass->cuda_device_id, &self->context)) {
-    GST_ERROR_OBJECT (self, "Required element data is unavailable");
-    return FALSE;
-  }
-
-  self->decoder = gst_nv_decoder_new (self->context);
-  if (!self->decoder) {
-    GST_ERROR_OBJECT (self, "Failed to create decoder object");
-    gst_clear_object (&self->context);
-
-    return FALSE;
-  }
-
-  /* NVDEC doesn't support non-keyframe resolution change and it will result
-   * in outputting broken frames */
-  gst_vp9_decoder_set_non_keyframe_format_change_support (vp9dec, FALSE);
-
-  return TRUE;
-}
-
-static gboolean
-gst_nv_vp9_dec_close (GstVideoDecoder * decoder)
-{
-  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
-
-  gst_clear_object (&self->decoder);
-  gst_clear_object (&self->context);
-
-  return TRUE;
-}
-
-static gboolean
-gst_nv_vp9_dec_negotiate (GstVideoDecoder * decoder)
-{
-  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
-  GstVp9Decoder *vp9dec = GST_VP9_DECODER (decoder);
-
-  GST_DEBUG_OBJECT (self, "negotiate");
-
-  gst_nv_decoder_negotiate (self->decoder, decoder, vp9dec->input_state);
-
-  /* TODO: add support D3D11 memory */
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
-}
-
-static gboolean
-gst_nv_vp9_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
-{
-  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
-
-  if (!gst_nv_decoder_decide_allocation (self->decoder, decoder, query)) {
-    GST_WARNING_OBJECT (self, "Failed to handle decide allocation");
-    return FALSE;
-  }
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
-      (decoder, query);
-}
-
-static gboolean
-gst_nv_vp9_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
-{
-  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
-
-  switch (GST_QUERY_TYPE (query)) {
-    case GST_QUERY_CONTEXT:
-      if (gst_cuda_handle_context_query (GST_ELEMENT (decoder), query,
-              self->context)) {
-        return TRUE;
-      } else if (self->decoder &&
-          gst_nv_decoder_handle_context_query (self->decoder, decoder, query)) {
-        return TRUE;
-      }
-      break;
-    default:
-      break;
-  }
-
-  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
-}
-
-static GstFlowReturn
-gst_nv_vp9_dec_new_sequence (GstVp9Decoder * decoder,
-    const GstVp9FrameHeader * frame_hdr, gint max_dpb_size)
-{
-  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
-  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
-  GstVideoInfo info;
-
-  GST_LOG_OBJECT (self, "new sequence");
-
-  self->width = frame_hdr->width;
-  self->height = frame_hdr->height;
-  self->profile = frame_hdr->profile;
-
-  if (self->profile == GST_VP9_PROFILE_0) {
-    out_format = GST_VIDEO_FORMAT_NV12;
-  } else if (self->profile == GST_VP9_PROFILE_2) {
-    if (frame_hdr->bit_depth == 10) {
-      out_format = GST_VIDEO_FORMAT_P010_10LE;
-    } else {
-      out_format = GST_VIDEO_FORMAT_P016_LE;
-    }
-  }
-
-  if (out_format == GST_VIDEO_FORMAT_UNKNOWN) {
-    GST_ERROR_OBJECT (self, "Could not support profile %d", self->profile);
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  gst_video_info_set_format (&info, out_format, self->width, self->height);
-  if (!gst_nv_decoder_configure (self->decoder,
-          cudaVideoCodec_VP9, &info, self->width, self->height,
-          frame_hdr->bit_depth, max_dpb_size, FALSE)) {
-    GST_ERROR_OBJECT (self, "Failed to configure decoder");
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
-    GST_ERROR_OBJECT (self, "Failed to negotiate with downstream");
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  memset (&self->params, 0, sizeof (CUVIDPICPARAMS));
-
-  self->params.CodecSpecific.vp9.colorSpace = frame_hdr->color_space;
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_vp9_dec_new_picture (GstVp9Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp9Picture * picture)
-{
-  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
-  GstNvDecoderFrame *nv_frame;
-
-  nv_frame = gst_nv_decoder_new_frame (self->decoder);
-  if (!nv_frame) {
-    GST_ERROR_OBJECT (self, "No available decoder frame");
-    return GST_FLOW_ERROR;
-  }
-
-  GST_LOG_OBJECT (self,
-      "New decoder frame %p (index %d)", nv_frame, nv_frame->index);
-
-  gst_vp9_picture_set_user_data (picture,
-      nv_frame, (GDestroyNotify) gst_nv_decoder_frame_unref);
-
-  return GST_FLOW_OK;
-}
-
-static GstNvDecoderFrame *
-gst_nv_vp9_dec_get_decoder_frame_from_picture (GstNvVp9Dec * self,
-    GstVp9Picture * picture)
-{
-  GstNvDecoderFrame *frame;
-
-  frame = (GstNvDecoderFrame *) gst_vp9_picture_get_user_data (picture);
-
-  if (!frame)
-    GST_DEBUG_OBJECT (self, "current picture does not have decoder frame");
-
-  return frame;
-}
-
-static GstVp9Picture *
-gst_nv_vp9_dec_duplicate_picture (GstVp9Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp9Picture * picture)
-{
-  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
-  GstNvDecoderFrame *nv_frame;
-  GstVp9Picture *new_picture;
-
-  nv_frame = gst_nv_vp9_dec_get_decoder_frame_from_picture (self, picture);
-
-  if (!nv_frame) {
-    GST_ERROR_OBJECT (self, "Parent picture does not have decoder frame");
-    return NULL;
-  }
-
-  new_picture = gst_vp9_picture_new ();
-  new_picture->frame_hdr = picture->frame_hdr;
-
-  gst_vp9_picture_set_user_data (new_picture,
-      gst_nv_decoder_frame_ref (nv_frame),
-      (GDestroyNotify) gst_nv_decoder_frame_unref);
-
-  return new_picture;
-}
-
-static GstFlowReturn
-gst_nv_vp9_dec_decode_picture (GstVp9Decoder * decoder,
-    GstVp9Picture * picture, GstVp9Dpb * dpb)
-{
-  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
-  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
-  const GstVp9LoopFilterParams *lfp = &frame_hdr->loop_filter_params;
-  const GstVp9SegmentationParams *sp = &frame_hdr->segmentation_params;
-  const GstVp9QuantizationParams *qp = &frame_hdr->quantization_params;
-  CUVIDPICPARAMS *params = &self->params;
-  CUVIDVP9PICPARAMS *vp9_params = &params->CodecSpecific.vp9;
-  GstNvDecoderFrame *frame;
-  GstNvDecoderFrame *other_frame;
-  guint offset = 0;
-  guint8 ref_frame_mapGST_VP9_REF_FRAMES;
-  gint i;
-
-  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->mbRefLfDelta) ==
-      GST_VP9_MAX_REF_LF_DELTAS);
-  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->mbModeLfDelta) ==
-      GST_VP9_MAX_MODE_LF_DELTAS);
-  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->mb_segment_tree_probs) ==
-      GST_VP9_SEG_TREE_PROBS);
-  G_STATIC_ASSERT (sizeof (vp9_params->mb_segment_tree_probs) ==
-      sizeof (sp->segmentation_tree_probs));
-  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->segment_pred_probs) ==
-      GST_VP9_PREDICTION_PROBS);
-  G_STATIC_ASSERT (sizeof (vp9_params->segment_pred_probs) ==
-      sizeof (sp->segmentation_pred_prob));
-  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->refFrameSignBias) ==
-      GST_VP9_REFS_PER_FRAME + 1);
-  G_STATIC_ASSERT (sizeof (vp9_params->refFrameSignBias) ==
-      sizeof (frame_hdr->ref_frame_sign_bias));
-  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->activeRefIdx) ==
-      GST_VP9_REFS_PER_FRAME);
-  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->segmentFeatureEnable) ==
-      GST_VP9_MAX_SEGMENTS);
-  G_STATIC_ASSERT (sizeof (vp9_params->segmentFeatureEnable) ==
-      sizeof (sp->feature_enabled));
-  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->segmentFeatureData) ==
-      GST_VP9_MAX_SEGMENTS);
-  G_STATIC_ASSERT (sizeof (vp9_params->segmentFeatureData) ==
-      sizeof (sp->feature_data));
-
-  GST_LOG_OBJECT (self, "Decode picture, size %" G_GSIZE_FORMAT, picture->size);
-
-  frame = gst_nv_vp9_dec_get_decoder_frame_from_picture (self, picture);
-  if (!frame) {
-    GST_ERROR_OBJECT (self, "Decoder frame is unavailable");
-    return GST_FLOW_ERROR;
-  }
-
-  params->nBitstreamDataLen = picture->size;
-  params->pBitstreamData = picture->data;
-  params->nNumSlices = 1;
-  params->pSliceDataOffsets = &offset;
-
-  params->PicWidthInMbs = GST_ROUND_UP_16 (frame_hdr->width) >> 4;
-  params->FrameHeightInMbs = GST_ROUND_UP_16 (frame_hdr->height) >> 4;
-  params->CurrPicIdx = frame->index;
-
-  vp9_params->width = frame_hdr->width;
-  vp9_params->height = frame_hdr->height;
-
-  for (i = 0; i < GST_VP9_REF_FRAMES; i++) {
-    if (dpb->pic_listi) {
-      other_frame = gst_nv_vp9_dec_get_decoder_frame_from_picture (self,
-          dpb->pic_listi);
-      if (!other_frame) {
-        GST_ERROR_OBJECT (self, "Couldn't get decoder frame from picture");
-        return GST_FLOW_ERROR;
-      }
-
-      ref_frame_mapi = other_frame->index;
-    } else {
-      ref_frame_mapi = 0xff;
-    }
-  }
-
-  vp9_params->LastRefIdx = ref_frame_mapframe_hdr->ref_frame_idx0;
-  vp9_params->GoldenRefIdx = ref_frame_mapframe_hdr->ref_frame_idx1;
-  vp9_params->AltRefIdx = ref_frame_mapframe_hdr->ref_frame_idx2;
-
-  vp9_params->profile = frame_hdr->profile;
-  vp9_params->frameContextIdx = frame_hdr->frame_context_idx;
-  vp9_params->frameType = frame_hdr->frame_type;
-  vp9_params->showFrame = frame_hdr->show_frame;
-  vp9_params->errorResilient = frame_hdr->error_resilient_mode;
-  vp9_params->frameParallelDecoding = frame_hdr->frame_parallel_decoding_mode;
-  vp9_params->subSamplingX = frame_hdr->subsampling_x;
-  vp9_params->subSamplingY = frame_hdr->subsampling_y;
-  vp9_params->intraOnly = frame_hdr->intra_only;
-  vp9_params->allow_high_precision_mv = frame_hdr->allow_high_precision_mv;
-  vp9_params->refreshEntropyProbs = frame_hdr->refresh_frame_context;
-  vp9_params->bitDepthMinus8Luma = frame_hdr->bit_depth - 8;
-  vp9_params->bitDepthMinus8Chroma = frame_hdr->bit_depth - 8;
-
-  vp9_params->loopFilterLevel = lfp->loop_filter_level;
-  vp9_params->loopFilterSharpness = lfp->loop_filter_sharpness;
-  vp9_params->modeRefLfEnabled = lfp->loop_filter_delta_enabled;
-
-  vp9_params->log2_tile_columns = frame_hdr->tile_cols_log2;
-  vp9_params->log2_tile_rows = frame_hdr->tile_rows_log2;
-
-  vp9_params->segmentEnabled = sp->segmentation_enabled;
-  vp9_params->segmentMapUpdate = sp->segmentation_update_map;
-  vp9_params->segmentMapTemporalUpdate = sp->segmentation_temporal_update;
-  vp9_params->segmentFeatureMode = sp->segmentation_abs_or_delta_update;
-
-  vp9_params->qpYAc = qp->base_q_idx;
-  vp9_params->qpYDc = qp->delta_q_y_dc;
-  vp9_params->qpChDc = qp->delta_q_uv_dc;
-  vp9_params->qpChAc = qp->delta_q_uv_ac;
-
-  vp9_params->resetFrameContext = frame_hdr->reset_frame_context;
-  vp9_params->mcomp_filter_type = frame_hdr->interpolation_filter;
-  vp9_params->frameTagSize = frame_hdr->frame_header_length_in_bytes;
-  vp9_params->offsetToDctParts = frame_hdr->header_size_in_bytes;
-
-  for (i = 0; i < GST_VP9_MAX_REF_LF_DELTAS; i++)
-    vp9_params->mbRefLfDeltai = lfp->loop_filter_ref_deltasi;
-
-  for (i = 0; i < GST_VP9_MAX_MODE_LF_DELTAS; i++)
-    vp9_params->mbModeLfDeltai = lfp->loop_filter_mode_deltasi;
-
-  memcpy (vp9_params->mb_segment_tree_probs, sp->segmentation_tree_probs,
-      sizeof (sp->segmentation_tree_probs));
-  memcpy (vp9_params->segment_pred_probs, sp->segmentation_pred_prob,
-      sizeof (sp->segmentation_pred_prob));
-  memcpy (vp9_params->refFrameSignBias, frame_hdr->ref_frame_sign_bias,
-      sizeof (frame_hdr->ref_frame_sign_bias));
-
-  for (i = 0; i < GST_VP9_REFS_PER_FRAME; i++) {
-    vp9_params->activeRefIdxi = frame_hdr->ref_frame_idxi;
-  }
-
-  memcpy (vp9_params->segmentFeatureEnable, sp->feature_enabled,
-      sizeof (sp->feature_enabled));
-  memcpy (vp9_params->segmentFeatureData, sp->feature_data,
-      sizeof (sp->feature_data));
-
-  if (!gst_nv_decoder_decode_picture (self->decoder, &self->params))
-    return GST_FLOW_ERROR;
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_nv_vp9_dec_output_picture (GstVp9Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp9Picture * picture)
-{
-  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
-  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
-  GstNvDecoderFrame *decoder_frame;
-
-  GST_LOG_OBJECT (self, "Outputting picture %p", picture);
-
-  decoder_frame = (GstNvDecoderFrame *) gst_vp9_picture_get_user_data (picture);
-  if (!decoder_frame) {
-    GST_ERROR_OBJECT (self, "No decoder frame in picture %p", picture);
-    goto error;
-  }
-
-  if (!gst_nv_decoder_finish_frame (self->decoder, vdec, picture->discont_state,
-          decoder_frame, &frame->output_buffer)) {
-    GST_ERROR_OBJECT (self, "Failed to handle output picture");
-    goto error;
-  }
-
-  gst_vp9_picture_unref (picture);
-
-  return gst_video_decoder_finish_frame (vdec, frame);
-
-error:
-  gst_video_decoder_drop_frame (vdec, frame);
-  gst_vp9_picture_unref (picture);
-
-  return GST_FLOW_ERROR;
-}
-
-static guint
-gst_nv_vp9_dec_get_preferred_output_delay (GstVp9Decoder * decoder,
-    gboolean is_live)
-{
-  /* Prefer to zero latency for live pipeline */
-  if (is_live)
-    return 0;
-
-  /* NVCODEC SDK uses 4 frame delay for better throughput performance */
-  return 4;
-}
-
-void
-gst_nv_vp9_dec_register (GstPlugin * plugin, guint device_id, guint rank,
-    GstCaps * sink_caps, GstCaps * src_caps, gboolean is_primary)
-{
-  GType type;
-  gchar *type_name;
-  gchar *feature_name;
-  GstNvDecoderClassData *cdata;
-  gint index = 0;
-  GTypeInfo type_info = {
-    sizeof (GstNvVp9DecClass),
-    NULL,
-    NULL,
-    (GClassInitFunc) gst_nv_vp9_dec_class_init,
-    NULL,
-    NULL,
-    sizeof (GstNvVp9Dec),
-    0,
-    (GInstanceInitFunc) gst_nv_vp9_dec_init,
-  };
-
-  GST_DEBUG_CATEGORY_INIT (gst_nv_vp9_dec_debug, "nvvp9dec", 0, "nvvp9dec");
-
-  cdata = g_new0 (GstNvDecoderClassData, 1);
-  cdata->sink_caps = gst_caps_copy (sink_caps);
-  gst_caps_set_simple (cdata->sink_caps,
-      "alignment", G_TYPE_STRING, "frame", NULL);
-  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
-      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
-  cdata->src_caps = gst_caps_ref (src_caps);
-  cdata->cuda_device_id = device_id;
-
-  if (is_primary) {
-    type_name = g_strdup ("GstNvVp9Dec");
-    feature_name = g_strdup ("nvvp9dec");
-  } else {
-    type_name = g_strdup ("GstNvVp9SLDec");
-    feature_name = g_strdup ("nvvp9sldec");
-  }
-
-  while (g_type_from_name (type_name)) {
-    index++;
-    g_free (type_name);
-    g_free (feature_name);
-    if (is_primary) {
-      type_name = g_strdup_printf ("GstNvVp9Device%dDec", index);
-      feature_name = g_strdup_printf ("nvvp9device%ddec", index);
-    } else {
-      type_name = g_strdup_printf ("GstNvVp9SLDevice%dDec", index);
-      feature_name = g_strdup_printf ("nvvp9sldevice%ddec", index);
-    }
-  }
-
-  type_info.class_data = cdata;
-
-  type = g_type_register_static (GST_TYPE_VP9_DECODER,
-      type_name, &type_info, 0);
-
-  /* make lower rank than default device */
-  if (rank > 0 && index > 0)
-    rank--;
-
-  if (!gst_element_register (plugin, feature_name, rank, type))
-    GST_WARNING ("Failed to register plugin '%s'", type_name);
-
-  g_free (type_name);
-  g_free (feature_name);
-}

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvadevice.c Deleted

@@ -1,135 +0,0 @@
-/* GStreamer
- * Copyright (C) 2020 Igalia, S.L.
- *     Author: Víctor Jáquez <vjaquez@igalia.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstvadevice.h"
-
-#if HAVE_GUDEV
-#include <gudev/gudev.h>
-#endif
-
-#define GST_CAT_DEFAULT gstva_debug
-GST_DEBUG_CATEGORY_EXTERN (gstva_debug);
-
-GST_DEFINE_MINI_OBJECT_TYPE (GstVaDevice, gst_va_device);
-
-static void
-gst_va_device_free (GstVaDevice * device)
-{
-  gst_clear_object (&device->display);
-  g_free (device->render_device_path);
-  g_free (device);
-}
-
-static GstVaDevice *
-gst_va_device_new (GstVaDisplay * display, const gchar * render_device_path,
-    gint index)
-{
-  GstVaDevice *device = g_new0 (GstVaDevice, 1);
-
-  gst_mini_object_init (GST_MINI_OBJECT_CAST (device), 0, GST_TYPE_VA_DEVICE,
-      NULL, NULL, (GstMiniObjectFreeFunction) gst_va_device_free);
-
-  /* take ownership */
-  device->display = display;
-  device->render_device_path = g_strdup (render_device_path);
-  device->index = index;
-
-  return device;
-}
-
-static gint
-compare_device_path (gconstpointer a, gconstpointer b, gpointer user_data)
-{
-  const GstVaDevice *pa = a, *pb = b;
-
-  return g_strcmp0 (pa->render_device_path, pb->render_device_path);
-}
-
-#if HAVE_GUDEV
-GList *
-gst_va_device_find_devices (void)
-{
-  GUdevClient *client;
-  GList *udev_devices, *dev;
-  GQueue devices = G_QUEUE_INIT;
-  gint i = 0;
-
-  client = g_udev_client_new (NULL);
-  udev_devices = g_udev_client_query_by_subsystem (client, "drm");
-
-  for (dev = udev_devices; dev; dev = g_list_next (dev)) {
-    GstVaDisplay *dpy;
-    GUdevDevice *udev = (GUdevDevice *) dev->data;
-    const gchar *path = g_udev_device_get_device_file (udev);
-    const gchar *name = g_udev_device_get_name (udev);
-
-    if (!path || !g_str_has_prefix (name, "renderD")) {
-      GST_LOG ("Ignoring %s in %s", name, path);
-      continue;
-    }
-
-    if (!(dpy = gst_va_display_drm_new_from_path (path)))
-      continue;
-
-    GST_INFO ("Found VA-API device: %s", path);
-    g_queue_push_head (&devices, gst_va_device_new (dpy, path, i++));
-  }
-
-  g_queue_sort (&devices, compare_device_path, NULL);
-  g_list_free_full (udev_devices, g_object_unref);
-  g_object_unref (client);
-
-  return devices.head;
-}
-#else
-GList *
-gst_va_device_find_devices (void)
-{
-  GstVaDisplay *dpy;
-  GQueue devices = G_QUEUE_INIT;
-  gchar path64;
-  guint i, j = 0;
-
-  for (i = 0; i < 8; i++) {
-    g_snprintf (path, sizeof (path), "/dev/dri/renderD%d", 128 + i);
-    if (!g_file_test (path, G_FILE_TEST_EXISTS))
-      continue;
-
-    if (!(dpy = gst_va_display_drm_new_from_path (path)))
-      continue;
-
-    GST_INFO ("Found VA-API device: %s", path);
-    g_queue_push_head (&devices, gst_va_device_new (dpy, path, j++));
-  }
-
-  g_queue_sort (&devices, compare_device_path, NULL);
-  return devices.head;
-}
-#endif
-
-void
-gst_va_device_list_free (GList * devices)
-{
-  g_list_free_full (devices, (GDestroyNotify) gst_mini_object_unref);
-}

gst-plugins-bad-1.22.7.tar.xz/tests/check/elements/kate.c Deleted

@@ -1,880 +0,0 @@
-/* GStreamer
- *
- * unit test for kate
- *
- * Copyright (C) <2007> Stefan Kost <ensonic@users.sf.net>
- * Copyright (C) <2008> ogg.k.ogg.k <ogg.k.ogg.k@googlemail.com>
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <unistd.h>
-
-#include <gst/check/gstcheck.h>
-#include <gst/base/gsttypefindhelper.h>
-
-
-static const guint8 kate_header_0x8064 = {
-  0x80, 0x6b, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x09, 0x00, 0x00, 0x00, 0x20,       /* .kate...... ...  */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,       /* ................ */
-  0x65, 0x6e, 0x5f, 0x47, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,       /* en_GB........... */
-  0x6e, 0x6f, 0x6e, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,       /* none............ */
-};
-
-static const guint8 kate_header_0x8153 = {
-  0x81, 0x6b, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x6c, 0x69, 0x62,       /* .kate........lib */
-  0x6b, 0x61, 0x74, 0x65, 0x20, 0x30, 0x2e, 0x31, 0x2e, 0x30, 0x20, 0x28, 0x54, 0x69, 0x67, 0x65,       /* kate 0.1.0 (Tige */
-  0x72, 0x29, 0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x54, 0x49, 0x54, 0x4c, 0x45, 0x3d,       /* r)........TITLE= */
-  0x54, 0x69, 0x67, 0x65, 0x72, /* Tiger            */
-};
-
-static const guint8 kate_header_0x8x10 = {
-  0x80, 0x6b, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00, 0x00
-};
-
-static const guint8 kate_header_0x8811 = {
-  0x88, 0x6b, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-static const guint8 kate_header_0x0045 = {
-  0x00, 0xe8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,       /* ................ */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x70, 0x6c, 0x61,       /* .............pla */
-  0x69, 0x6e, 0x20, 0x6f, 0x6c, 0x64, 0x20, 0x74, 0x65, 0x78, 0x74, 0x08, 0x00  /* in old text..    */
-};
-
-static const guint8 kate_header_0x7f1 = {
-  0x7f
-};
-
-static const unsigned char kate_spu = {
-  0x00, 0x1b,                   /* size */
-  0x00, 0x06,                   /* commands at offset 6 */
-  0x45,                         /* first line data - 2 pixels of colors 0 and 1 */
-  0x76,                         /* first line data - 2 pixels of colors 3 and 2 */
-  0x00, 0x00,                   /* timestamp */
-  0x00, 0x06,                   /* link to next command sequence - points back to the current one to mark no more */
-  0x06, 0x00, 0x04, 0x00, 0x05, /* pointers to data */
-  0x05, 0x00, 0x30, 0x04, 0x00, 0x10, 0x02,     /* area: 3x1 -> 4x2 */
-  0x04, 0x0f, 0xff,             /* alpha: color 0 transparent, all others opaque */
-  0x01,                         /* show */
-  0xff                          /* end */
-};
-
-/* A lot of these taken from the vorbisdec test */
-
-/* For ease of programming we use globals to keep refs for our floating
- * src and sink pads we create; otherwise we always have to do get_pad,
- * get_peer, and then remove references in every test function */
-static GstPad *mydecsrcpad, *mydecsinkpad;
-static GstPad *myencsrcpad, *myencsinkpad;
-static GstPad *myparsesrcpad, *myparsesinkpad;
-static GstPad *mytagsrcpad, *mytagsinkpad;
-
-static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS_ANY);
-static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS_ANY);
-
-static GList *events = NULL;
-
-static gboolean
-collect_events_func (GstPad * pad, GstObject * parent, GstEvent * event)
-{
-  GST_LOG ("event: %" GST_PTR_FORMAT, event);
-  events = g_list_append (events, gst_event_ref (event));
-  return gst_pad_event_default (pad, parent, event);
-}
-
-static GstElement *
-setup_katedec (void)
-{
-  GstElement *katedec;
-
-  GST_DEBUG ("setup_katedec");
-  katedec = gst_check_setup_element ("katedec");
-  mydecsrcpad = gst_check_setup_src_pad (katedec, &srctemplate);
-  mydecsinkpad = gst_check_setup_sink_pad (katedec, &sinktemplate);
-  gst_pad_set_event_function (mydecsinkpad, collect_events_func);
-  gst_pad_set_active (mydecsrcpad, TRUE);
-  gst_pad_set_active (mydecsinkpad, TRUE);
-
-  return katedec;
-}
-
-static void
-cleanup_katedec (GstElement * katedec)
-{
-  GList *l;
-
-  GST_DEBUG ("cleanup_katedec");
-  gst_element_set_state (katedec, GST_STATE_NULL);
-
-  for (l = events; l != NULL; l = l->next)
-    gst_event_unref (GST_EVENT (l->data));
-  g_list_free (events);
-  events = NULL;
-
-  gst_pad_set_active (mydecsrcpad, FALSE);
-  gst_pad_set_active (mydecsinkpad, FALSE);
-  gst_check_teardown_src_pad (katedec);
-  gst_check_teardown_sink_pad (katedec);
-  gst_check_teardown_element (katedec);
-}
-
-static GstElement *
-setup_kateenc (void)
-{
-  GstElement *kateenc;
-
-  GST_DEBUG ("setup_kateenc");
-  kateenc = gst_check_setup_element ("kateenc");
-  myencsrcpad = gst_check_setup_src_pad (kateenc, &srctemplate);
-  myencsinkpad = gst_check_setup_sink_pad (kateenc, &sinktemplate);
-  gst_pad_set_active (myencsrcpad, TRUE);
-  gst_pad_set_active (myencsinkpad, TRUE);
-
-  return kateenc;
-}
-
-static void
-cleanup_kateenc (GstElement * kateenc)
-{
-  GST_DEBUG ("cleanup_kateenc");
-  gst_element_set_state (kateenc, GST_STATE_NULL);
-
-  gst_pad_set_active (myencsrcpad, FALSE);
-  gst_pad_set_active (myencsinkpad, FALSE);
-  gst_check_teardown_src_pad (kateenc);
-  gst_check_teardown_sink_pad (kateenc);
-  gst_check_teardown_element (kateenc);
-}
-
-static GstElement *
-setup_kateparse (void)
-{
-  GstElement *kateparse;
-
-  GST_DEBUG ("setup_kateparse");
-  kateparse = gst_check_setup_element ("kateparse");
-  myparsesrcpad = gst_check_setup_src_pad (kateparse, &srctemplate);
-  myparsesinkpad = gst_check_setup_sink_pad (kateparse, &sinktemplate);
-  gst_pad_set_active (myparsesrcpad, TRUE);
-  gst_pad_set_active (myparsesinkpad, TRUE);
-
-  return kateparse;
-}
-
-static void
-cleanup_kateparse (GstElement * kateparse)
-{
-  GST_DEBUG ("cleanup_kateparse");
-  gst_element_set_state (kateparse, GST_STATE_NULL);
-
-  gst_pad_set_active (myparsesrcpad, FALSE);
-  gst_pad_set_active (myparsesinkpad, FALSE);
-  gst_check_teardown_src_pad (kateparse);
-  gst_check_teardown_sink_pad (kateparse);
-  gst_check_teardown_element (kateparse);
-}
-
-static GstElement *
-setup_katetag (void)
-{
-  GstElement *katetag;
-
-  GST_DEBUG ("setup_katetag");
-  katetag = gst_check_setup_element ("katetag");
-  mytagsrcpad = gst_check_setup_src_pad (katetag, &srctemplate);
-  mytagsinkpad = gst_check_setup_sink_pad (katetag, &sinktemplate);
-  gst_pad_set_active (mytagsrcpad, TRUE);
-  gst_pad_set_active (mytagsinkpad, TRUE);
-
-  return katetag;
-}
-
-static void
-cleanup_katetag (GstElement * katetag)
-{
-  GST_DEBUG ("cleanup_katetag");
-  gst_element_set_state (katetag, GST_STATE_NULL);
-
-  gst_pad_set_active (mytagsrcpad, FALSE);
-  gst_pad_set_active (mytagsinkpad, FALSE);
-  gst_check_teardown_src_pad (katetag);
-  gst_check_teardown_sink_pad (katetag);
-  gst_check_teardown_element (katetag);
-}
-
-static void
-check_buffers (guint expected, gboolean headers_in_caps)
-{
-  GstBuffer *outbuffer;
-  GstMapInfo info;
-  guint i, num_buffers;
-  const int num_headers = 9;
-  unsigned char packet_type;
-
-  /* check buffers are the type we expect */
-  num_buffers = g_list_length (buffers);
-  fail_unless (num_buffers >= num_headers + expected);  /* at least 9 headers, plus a variable number of data packets */
-  for (i = 0; i < num_buffers; ++i) {
-    outbuffer = GST_BUFFER (buffers->data);
-    fail_if (outbuffer == NULL);
-    fail_if (gst_buffer_get_size (outbuffer) == 0);
-
-    assert_equals_int (gst_buffer_map (outbuffer, &info, GST_MAP_READ), TRUE);
-    if (i < num_headers) {
-      /* different headers packets */
-      packet_type = (0x80 | i);
-      fail_unless (info.data0 == packet_type);
-      /* headers could be in caps, so would have an extra ref */
-    } else if (i == num_buffers - 1) {
-      /* eos data packet */
-      packet_type = 0x7f;
-      fail_unless (info.data0 == packet_type);
-    } else {
-      /* data packet */
-      packet_type = 0;
-      fail_unless (info.data0 >= 0 && info.data0 < 0x7f);
-    }
-    gst_buffer_unmap (outbuffer, &info);
-
-    buffers = g_list_remove (buffers, outbuffer);
-
-    ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1);
-    gst_buffer_unref (outbuffer);
-    outbuffer = NULL;
-  }
-}
-
-GST_START_TEST (test_kate_typefind)
-{
-  GstTypeFindProbability prob;
-  const gchar *type;
-  GstBuffer *buf;
-  GstCaps *caps = NULL;
-
-  buf = gst_buffer_new_memdup (kate_header_0x80, sizeof (kate_header_0x80));
-  GST_BUFFER_OFFSET (buf) = 0;
-
-  caps = gst_type_find_helper_for_buffer (NULL, buf, &prob);
-  fail_unless (caps != NULL);
-  GST_LOG ("Found type: %" GST_PTR_FORMAT, caps);
-
-  type = gst_structure_get_name (gst_caps_get_structure (caps, 0));
-  fail_unless_equals_string (type, "application/x-kate");
-  fail_unless (prob > GST_TYPE_FIND_MINIMUM && prob <= GST_TYPE_FIND_MAXIMUM);
-
-  gst_buffer_unref (buf);
-  gst_caps_unref (caps);
-}
-
-GST_END_TEST;
-
-GST_START_TEST (test_kate_empty_identification_header)
-{
-  GstElement *katedec;
-  GstBuffer *inbuffer;
-  GstBus *bus;
-  GstCaps *caps;
-
-  katedec = setup_katedec ();
-  bus = gst_bus_new ();
-
-  fail_unless (gst_element_set_state (katedec,
-          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to playing");
-
-  caps = gst_caps_new_empty_simple ("subtitle/x-kate");
-  gst_check_setup_events (mydecsrcpad, katedec, caps, GST_FORMAT_TIME);
-  gst_caps_unref (caps);
-
-  inbuffer = gst_buffer_new_and_alloc (0);
-  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-
-  /* set a bus here so we avoid getting state change messages */
-  gst_element_set_bus (katedec, bus);
-
-  fail_unless_equals_int (gst_pad_push (mydecsrcpad, inbuffer), GST_FLOW_ERROR);
-  /* ... but it ends up being collected on the global buffer list */
-  fail_unless_equals_int (g_list_length (buffers), 0);
-
-  gst_element_set_bus (katedec, NULL);
-
-  /* cleanup */
-  gst_object_unref (GST_OBJECT (bus));
-  cleanup_katedec (katedec);
-}
-
-GST_END_TEST;
-
-/* FIXME: also tests comment header */
-GST_START_TEST (test_kate_identification_header)
-{
-  GstElement *katedec;
-  GstBuffer *inbuffer;
-  GstBus *bus;
-  GstCaps *caps;
-
-  katedec = setup_katedec ();
-  fail_unless (gst_element_set_state (katedec,
-          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to playing");
-  bus = gst_bus_new ();
-
-  caps = gst_caps_new_empty_simple ("subtitle/x-kate");
-  gst_check_setup_events (mydecsrcpad, katedec, caps, GST_FORMAT_TIME);
-  gst_caps_unref (caps);
-
-  inbuffer =
-      gst_buffer_new_memdup (kate_header_0x80, sizeof (kate_header_0x80));
-  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-  gst_buffer_ref (inbuffer);
-
-  gst_element_set_bus (katedec, bus);
-  /* pushing gives away my reference ... */
-  fail_unless (gst_pad_push (mydecsrcpad, inbuffer) == GST_FLOW_OK);
-  /* ... and nothing ends up on the global buffer list */
-  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-  gst_buffer_unref (inbuffer);
-  fail_unless (g_list_length (buffers) == 0);
-
-  inbuffer =
-      gst_buffer_new_memdup (kate_header_0x81, sizeof (kate_header_0x81));
-  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-  gst_buffer_ref (inbuffer);
-
-  /* pushing gives away my reference ... */
-  fail_unless (gst_pad_push (mydecsrcpad, inbuffer) == GST_FLOW_OK);
-  /* ... and nothing ends up on the global buffer list */
-  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-  gst_buffer_unref (inbuffer);
-  fail_unless (g_list_length (buffers) == 0);
-
-  /* there should've been a tag event */
-  {
-    gboolean found_tags = FALSE;
-    GList *l;
-
-    for (l = events; l != NULL; l = l->next) {
-      GstEvent *event = GST_EVENT (l->data);
-
-      if (GST_EVENT_TYPE (event) == GST_EVENT_TAG) {
-        GstTagList *tags = NULL;
-        gchar *language;
-        gchar *title;
-
-        found_tags = TRUE;
-        gst_event_parse_tag (event, &tags);
-        fail_unless (tags != NULL);
-        fail_unless (gst_tag_list_get_scope (tags) == GST_TAG_SCOPE_STREAM);
-        fail_unless_equals_int (gst_tag_list_get_tag_size (tags,
-                GST_TAG_LANGUAGE_CODE), 1);
-        fail_unless (gst_tag_list_get_string (tags, GST_TAG_LANGUAGE_CODE,
-                &language));
-        fail_unless_equals_string (language, "en");
-        g_free (language);
-        fail_unless_equals_int (gst_tag_list_get_tag_size (tags, "title"), 1);
-        fail_unless (gst_tag_list_get_string (tags, GST_TAG_TITLE, &title));
-        fail_unless_equals_string (title, "Tiger");
-        g_free (title);
-      }
-    }
-    fail_unless (found_tags);
-  }
-
-  /* cleanup */
-  gst_bus_set_flushing (bus, TRUE);
-  gst_element_set_bus (katedec, NULL);
-  gst_object_unref (GST_OBJECT (bus));
-  cleanup_katedec (katedec);
-}
-
-GST_END_TEST;
-
-GST_START_TEST (test_kate_encode_nothing)
-{
-  GstElement *kateenc;
-
-  kateenc = setup_kateenc ();
-  fail_unless (gst_element_set_state (kateenc,
-          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to playing");
-
-  fail_unless (gst_pad_push_event (myencsrcpad, gst_event_new_eos ()) == TRUE);
-
-  fail_unless (gst_element_set_state (kateenc,
-          GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to ready");
-
-  /* cleanup */
-  cleanup_kateenc (kateenc);
-}
-
-GST_END_TEST;
-
-GST_START_TEST (test_kate_encode_empty)
-{
-  GstElement *kateenc;
-  GstBuffer *inbuffer;
-  GstBus *bus;
-  GstCaps *caps;
-
-  kateenc = setup_kateenc ();
-  fail_unless (gst_element_set_state (kateenc,
-          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to playing");
-  bus = gst_bus_new ();
-
-  inbuffer = gst_buffer_new_and_alloc (0);
-  GST_BUFFER_TIMESTAMP (inbuffer) = GST_BUFFER_OFFSET (inbuffer) =
-      1 * GST_SECOND;
-  GST_BUFFER_DURATION (inbuffer) = 5 * GST_SECOND;
-  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-
-  caps = gst_caps_from_string ("text/x-raw, format=utf8");
-  fail_unless (caps != NULL);
-  gst_check_setup_events (myencsrcpad, kateenc, caps, GST_FORMAT_TIME);
-  gst_caps_unref (caps);
-
-  gst_element_set_bus (kateenc, bus);
-  /* pushing gives away my reference ... */
-  fail_unless (gst_pad_push (myencsrcpad, inbuffer) == GST_FLOW_ERROR);
-
-  fail_unless (gst_pad_push_event (myencsrcpad, gst_event_new_eos ()) == TRUE);
-
-  fail_unless (gst_element_set_state (kateenc,
-          GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to ready");
-
-  gst_element_set_bus (kateenc, NULL);
-
-  /* cleanup */
-  gst_object_unref (GST_OBJECT (bus));
-  cleanup_kateenc (kateenc);
-}
-
-GST_END_TEST;
-
-GST_START_TEST (test_kate_encode_simple)
-{
-  GstElement *kateenc;
-  GstBuffer *inbuffer;
-  GstBus *bus;
-  const gchar *test_string = "";
-  GstCaps *caps;
-
-  kateenc = setup_kateenc ();
-  g_object_set (kateenc, "category", "subtitles", NULL);
-
-  fail_unless (gst_element_set_state (kateenc,
-          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to playing");
-  bus = gst_bus_new ();
-
-  inbuffer = gst_buffer_new_memdup (test_string, strlen (test_string) + 1);
-
-  GST_BUFFER_TIMESTAMP (inbuffer) = GST_BUFFER_OFFSET (inbuffer) =
-      1 * GST_SECOND;
-  GST_BUFFER_DURATION (inbuffer) = 5 * GST_SECOND;
-  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-
-  caps = gst_caps_from_string ("text/x-raw, format=utf8");
-  fail_unless (caps != NULL);
-  gst_check_setup_events (myencsrcpad, kateenc, caps, GST_FORMAT_TIME);
-  gst_caps_unref (caps);
-  gst_buffer_ref (inbuffer);
-
-  gst_element_set_bus (kateenc, bus);
-  /* pushing gives away my reference ... */
-  fail_unless_equals_int (gst_pad_push (myencsrcpad, inbuffer), GST_FLOW_OK);
-  /* ... and nothing ends up on the global buffer list */
-  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-  gst_buffer_unref (inbuffer);
-  fail_unless (gst_pad_push_event (myencsrcpad, gst_event_new_eos ()) == TRUE);
-
-  fail_unless (gst_element_set_state (kateenc,
-          GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to ready");
-
-  /* at least one data packet and one EOS packet should have been emitted */
-  check_buffers (1 + 1, FALSE);
-
-  /* cleanup */
-  gst_bus_set_flushing (bus, TRUE);
-  gst_element_set_bus (kateenc, NULL);
-  gst_object_unref (GST_OBJECT (bus));
-  cleanup_kateenc (kateenc);
-  gst_check_drop_buffers ();
-}
-
-GST_END_TEST;
-
-GST_START_TEST (test_kate_encode_spu)
-{
-  GstElement *kateenc;
-  GstBuffer *inbuffer;
-  GstBus *bus;
-  GstCaps *caps;
-
-  kateenc = setup_kateenc ();
-  g_object_set (kateenc, "category", "spu-subtitles", NULL);
-
-  fail_unless (gst_element_set_state (kateenc,
-          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to playing");
-  bus = gst_bus_new ();
-
-  inbuffer = gst_buffer_new_memdup (kate_spu, sizeof (kate_spu));
-
-  GST_BUFFER_TIMESTAMP (inbuffer) = GST_BUFFER_OFFSET (inbuffer) =
-      1 * GST_SECOND;
-  GST_BUFFER_DURATION (inbuffer) = 5 * GST_SECOND;
-  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-
-  caps = gst_caps_from_string ("subpicture/x-dvd");
-  fail_unless (caps != NULL);
-  gst_check_setup_events (myencsrcpad, kateenc, caps, GST_FORMAT_TIME);
-  gst_caps_unref (caps);
-  gst_buffer_ref (inbuffer);
-
-  gst_element_set_bus (kateenc, bus);
-  /* pushing gives away my reference ... */
-  fail_unless_equals_int (gst_pad_push (myencsrcpad, inbuffer), GST_FLOW_OK);
-  /* ... and nothing ends up on the global buffer list */
-  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-  gst_buffer_unref (inbuffer);
-  fail_unless (gst_pad_push_event (myencsrcpad, gst_event_new_eos ()) == TRUE);
-
-  fail_unless (gst_element_set_state (kateenc,
-          GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to ready");
-
-  /* at least one data packet and one EOS packet should have been emitted */
-  check_buffers (2, FALSE);
-
-  /* cleanup */
-  gst_bus_set_flushing (bus, TRUE);
-  gst_element_set_bus (kateenc, NULL);
-  gst_object_unref (GST_OBJECT (bus));
-  cleanup_kateenc (kateenc);
-  gst_check_drop_buffers ();
-}
-
-GST_END_TEST;
-
-GST_START_TEST (test_kate_encode_keepalives)
-{
-  GstElement *kateenc;
-  GstBus *bus;
-  guint i, round;
-  GstSegment segment;
-  enum
-  { n_keepalives = 1000 };
-  static const struct
-  {
-    gdouble keepalive_min_time;
-    gint packets;
-  } cfg3 = {
-    {
-    0.5, n_keepalives}, {
-    2.0, n_keepalives / 2}, {
-  5.0, n_keepalives / 5},};
-
-  for (round = 0; round < 3; ++round) {
-    kateenc = setup_kateenc ();
-    /* doesn't matter here, since we never send a packet */
-    g_object_set (kateenc, "category", "subtitles", NULL);
-    fail_unless (gst_element_set_state (kateenc,
-            GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
-        "could not set to playing");
-    bus = gst_bus_new ();
-
-    gst_element_set_bus (kateenc, bus);
-
-    g_object_set (kateenc, "keepalive-min-time", cfground.keepalive_min_time,
-        NULL);
-
-    gst_pad_push_event (myencsrcpad, gst_event_new_stream_start ("test"));
-
-    /* the second one here should not emit a keepalive since the time since last packet
-       is less than the keepalive delay */
-    for (i = 1; i <= n_keepalives; ++i) {
-      gint64 t = i * GST_SECOND;
-      gst_segment_init (&segment, GST_FORMAT_TIME);
-      segment.start = t;
-      segment.position = 0;
-      fail_unless (gst_pad_push_event (myencsrcpad,
-              gst_event_new_segment (&segment)) == TRUE);
-    }
-
-    fail_unless (gst_pad_push_event (myencsrcpad,
-            gst_event_new_eos ()) == TRUE);
-
-    fail_unless (gst_element_set_state (kateenc,
-            GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS,
-        "could not set to ready");
-
-    /* at least a number data packet and an EOS packet should have been emitted */
-    check_buffers (cfground.packets + 1, FALSE);
-
-    /* cleanup */
-    gst_bus_set_flushing (bus, TRUE);
-    gst_element_set_bus (kateenc, NULL);
-    gst_object_unref (GST_OBJECT (bus));
-    cleanup_kateenc (kateenc);
-    gst_check_drop_buffers ();
-  }
-}
-
-GST_END_TEST;
-
-static void
-test_kate_send_headers (GstElement * element, GstPad * pad)
-{
-  GstBuffer *inbuffer;
-  GstCaps *caps;
-  GstMapInfo info;
-  int i;
-
-  caps = gst_caps_new_simple ("subtitle/x-kate", NULL, NULL);
-  gst_check_setup_events (pad, element, caps, GST_FORMAT_TIME);
-  gst_caps_unref (caps);
-
-  /* push headers */
-  inbuffer =
-      gst_buffer_new_memdup (kate_header_0x80, sizeof (kate_header_0x80));
-  GST_BUFFER_OFFSET (inbuffer) = GST_BUFFER_OFFSET_END (inbuffer) = 0;
-  fail_unless_equals_int (gst_pad_push (pad, inbuffer), GST_FLOW_OK);
-
-  inbuffer =
-      gst_buffer_new_memdup (kate_header_0x81, sizeof (kate_header_0x81));
-  GST_BUFFER_OFFSET (inbuffer) = GST_BUFFER_OFFSET_END (inbuffer) = 0;
-  fail_unless_equals_int (gst_pad_push (pad, inbuffer), GST_FLOW_OK);
-
-  for (i = 2; i < 8; ++i) {
-    inbuffer =
-        gst_buffer_new_memdup (kate_header_0x8x, sizeof (kate_header_0x8x));
-    fail_if (gst_buffer_map (inbuffer, &info, GST_MAP_WRITE) != TRUE);
-    info.data0 = 0x80 | i;
-    gst_buffer_unmap (inbuffer, &info);
-    GST_BUFFER_OFFSET (inbuffer) = GST_BUFFER_OFFSET_END (inbuffer) = 0;
-    fail_unless_equals_int (gst_pad_push (pad, inbuffer), GST_FLOW_OK);
-  }
-
-  inbuffer =
-      gst_buffer_new_memdup (kate_header_0x88, sizeof (kate_header_0x88));
-  GST_BUFFER_OFFSET (inbuffer) = GST_BUFFER_OFFSET_END (inbuffer) = 0;
-  fail_unless_equals_int (gst_pad_push (pad, inbuffer), GST_FLOW_OK);
-}
-
-GST_START_TEST (test_kate_parse)
-{
-  GstElement *kateparse;
-  GstBuffer *inbuffer;
-  GstBus *bus;
-
-  kateparse = setup_kateparse ();
-  fail_unless (gst_element_set_state (kateparse,
-          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to playing");
-  bus = gst_bus_new ();
-
-  gst_element_set_bus (kateparse, bus);
-
-  test_kate_send_headers (kateparse, myparsesrcpad);
-
-  /* push a text packet */
-  inbuffer =
-      gst_buffer_new_memdup (kate_header_0x00, sizeof (kate_header_0x00));
-  GST_BUFFER_TIMESTAMP (inbuffer) = GST_BUFFER_OFFSET (inbuffer) =
-      1 * GST_SECOND;
-  GST_BUFFER_DURATION (inbuffer) = 5 * GST_SECOND;
-  GST_BUFFER_OFFSET_END (inbuffer) = (GST_BUFFER_TIMESTAMP (inbuffer) << 32);   /* granpos */
-  fail_unless_equals_int (gst_pad_push (myparsesrcpad, inbuffer), GST_FLOW_OK);
-
-  /* push a eos packet */
-  inbuffer =
-      gst_buffer_new_memdup (kate_header_0x7f, sizeof (kate_header_0x7f));
-  GST_BUFFER_TIMESTAMP (inbuffer) = GST_BUFFER_OFFSET (inbuffer) =
-      6 * GST_SECOND;
-  GST_BUFFER_DURATION (inbuffer) = 0;
-  GST_BUFFER_OFFSET_END (inbuffer) = (GST_BUFFER_TIMESTAMP (inbuffer) << 32);   /* granpos */
-  fail_unless_equals_int (gst_pad_push (myparsesrcpad, inbuffer), GST_FLOW_OK);
-
-  /* signal eos */
-  fail_unless (gst_pad_push_event (myparsesrcpad,
-          gst_event_new_eos ()) == TRUE);
-
-  fail_unless (gst_element_set_state (kateparse,
-          GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to ready");
-
-  /* at least one data packet and one EOS packet should have been emitted */
-  check_buffers (2, TRUE);
-
-  /* cleanup */
-  gst_bus_set_flushing (bus, TRUE);
-  gst_element_set_bus (kateparse, NULL);
-  gst_object_unref (GST_OBJECT (bus));
-  cleanup_kateparse (kateparse);
-  g_list_foreach (buffers, (GFunc) gst_buffer_unref, NULL);
-  gst_check_drop_buffers ();
-}
-
-GST_END_TEST;
-
-GST_START_TEST (test_kate_tag_passthrough)
-{
-  GstElement *katetag;
-  GstBus *bus;
-  GstBuffer *outbuffer;
-  GList *list;
-  GstMapInfo info;
-
-  katetag = setup_katetag ();
-  fail_unless (gst_element_set_state (katetag,
-          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to playing");
-  bus = gst_bus_new ();
-
-  gst_element_set_bus (katetag, bus);
-
-  test_kate_send_headers (katetag, mytagsrcpad);
-
-  /* signal eos */
-  fail_unless (gst_pad_push_event (mytagsrcpad, gst_event_new_eos ()) == TRUE);
-
-  fail_unless (gst_element_set_state (katetag,
-          GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to ready");
-
-  /* get the first buffer and check language/category */
-  fail_unless (g_list_length (buffers) >= 2);   /* ID header, Vorbis comments header */
-  outbuffer = GST_BUFFER (buffers->data);
-  fail_if (outbuffer == NULL);
-
-  /* check identification header is unchanged */
-  list = g_list_nth (buffers, 0);
-  fail_unless (list != NULL);
-  outbuffer = list->data;
-  fail_if (gst_buffer_map (outbuffer, &info, GST_MAP_READ) != TRUE);
-  fail_unless_equals_int (info.size, sizeof (kate_header_0x80));
-  fail_unless_equals_int (memcmp (info.data, kate_header_0x80,
-          sizeof (kate_header_0x80)), 0);
-  gst_buffer_unmap (outbuffer, &info);
-
-  /* check comment header is unchanged */
-  list = g_list_nth (buffers, 1);
-  fail_unless (list != NULL);
-  outbuffer = list->data;
-  fail_if (gst_buffer_map (outbuffer, &info, GST_MAP_READ) != TRUE);
-  fail_unless_equals_int (info.size, sizeof (kate_header_0x81));
-  fail_unless_equals_int (memcmp (info.data, kate_header_0x81,
-          sizeof (kate_header_0x81)), 0);
-  gst_buffer_unmap (outbuffer, &info);
-
-  /* all headers should have been emitted, but no particular packets */
-  check_buffers (0, TRUE);
-
-  /* cleanup */
-  gst_bus_set_flushing (bus, TRUE);
-  gst_element_set_bus (katetag, NULL);
-  gst_object_unref (GST_OBJECT (bus));
-  cleanup_katetag (katetag);
-  gst_check_drop_buffers ();
-}
-
-GST_END_TEST;
-
-GST_START_TEST (test_kate_tag)
-{
-  GstElement *katetag;
-  GstBus *bus;
-  GstBuffer *outbuffer;
-  GstMapInfo info;
-
-  katetag = setup_katetag ();
-  fail_unless (gst_element_set_state (katetag,
-          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to playing");
-  bus = gst_bus_new ();
-
-  gst_element_set_bus (katetag, bus);
-
-  g_object_set (katetag, "language", "cy", NULL);
-  g_object_set (katetag, "category", "subtitles", NULL);
-
-  test_kate_send_headers (katetag, mytagsrcpad);
-
-  /* signal eos */
-  fail_unless (gst_pad_push_event (mytagsrcpad, gst_event_new_eos ()) == TRUE);
-
-  fail_unless (gst_element_set_state (katetag,
-          GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS,
-      "could not set to ready");
-
-  /* get the first buffer and check language/category */
-  fail_unless (g_list_length (buffers) >= 1);
-  outbuffer = GST_BUFFER (buffers->data);
-  fail_if (outbuffer == NULL);
-  assert_equals_int (gst_buffer_map (outbuffer, &info, GST_MAP_READ), TRUE);
-  fail_if (info.size != 64);
-  fail_if (strcmp ((const char *) info.data + 32, "cy"));
-  fail_if (strcmp ((const char *) info.data + 48, "subtitles"));
-  gst_buffer_unmap (outbuffer, &info);
-
-  /* all headers should have been emitted, but no particular packets */
-  check_buffers (0, TRUE);
-
-  /* cleanup */
-  gst_bus_set_flushing (bus, TRUE);
-  gst_element_set_bus (katetag, NULL);
-  gst_object_unref (GST_OBJECT (bus));
-  cleanup_katetag (katetag);
-  gst_check_drop_buffers ();
-}
-
-GST_END_TEST;
-
-static Suite *
-kate_suite (void)
-{
-  Suite *s = suite_create ("kate");
-  TCase *tc_chain = tcase_create ("general");
-
-  suite_add_tcase (s, tc_chain);
-
-  tcase_add_test (tc_chain, test_kate_typefind);
-  tcase_add_test (tc_chain, test_kate_empty_identification_header);
-  tcase_add_test (tc_chain, test_kate_identification_header);
-  tcase_add_test (tc_chain, test_kate_encode_nothing);
-  tcase_add_test (tc_chain, test_kate_encode_empty);
-  tcase_add_test (tc_chain, test_kate_encode_simple);
-  tcase_add_test (tc_chain, test_kate_encode_spu);
-  tcase_add_test (tc_chain, test_kate_encode_keepalives);
-  tcase_add_test (tc_chain, test_kate_parse);
-  tcase_add_test (tc_chain, test_kate_tag_passthrough);
-  tcase_add_test (tc_chain, test_kate_tag);
-
-  return s;
-}
-
-GST_CHECK_MAIN (kate);

gst-plugins-bad-1.22.7.tar.xz/ChangeLog -> gst-plugins-bad-1.24.5.tar.xz/ChangeLog Changed

@@ -1,14654 +1,16147 @@
-=== release 1.22.7 ===
+=== release 1.24.5 ===
 
-2023-11-13 11:04:22 +0000  Tim-Philipp Müller <tim@centricular.com>
+2024-06-20 12:54:15 +0100  Tim-Philipp Müller <tim@centricular.com>
 
 	* NEWS:
 	* RELEASE:
 	* gst-plugins-bad.doap:
 	* meson.build:
-	  Release 1.22.7
+	  Release 1.24.5
 
-2023-10-20 00:09:57 +0300  Sebastian Dröge <sebastian@centricular.com>
+2024-06-18 09:10:16 +0200  Edward Hervey <edward@centricular.com>
 
-	* gst/mxf/mxfdemux.c:
-	* gst/mxf/mxfdemux.h:
-	  mxfdemux: Store GstMXFDemuxEssenceTrack in their own fixed allocation
-	  Previously they were stored inline inside a GArray, but as references to
-	  the tracks were stored in various other places although the array could
-	  still be updated (and reallocated!), this could lead to dangling
-	  references in various places.
-	  Instead now store them in a GPtrArray in their own allocation so each
-	  track's memory position stays fixed.
-	  Fixes ZDI-CAN-22299
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3055
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5638>
+	* gst/mpegtsdemux/mpegtspacketizer.c:
+	  tsdemux: Fix maximum PCR/DTS values
+	  * PTS/DTS are stored as 33 bit
+	  * PCR is 33bit multiplied by 300
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7058>
 
-2023-10-04 11:14:38 +0200  Benjamin Gaignard <benjamin.gaignard@collabora.com>
+2024-06-18 05:53:19 +0800  He Junyan <junyan.he@intel.com>
 
 	* gst-libs/gst/codecparsers/gstav1parser.c:
-	  codecparsers: av1: Clip max tile rows and cols values
-	  Clip tile rows and cols to 64 as describe in AV1 specification.
-	  Fixes ZDI-CAN-22226 / CVE-2023-44429
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3015
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5637>
+	  av1parse: Do not return error when expectedFrameId mismatch
+	  According to the SPEC:
+	  The frame id numbers (represented in display_frame_id, current_frame_id,
+	  and RefFrameId i ) are not needed by the decoding process, but allow
+	  decoders to spot when frames have been missed and take an appropriate action.
+	  So we should just print out warning and should not return error in parser when
+	  mismatching. The decoder itself is already robust to handle the reference missing.
+	  Fixes #3622
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7052>
 
-2023-10-06 13:49:15 +0200  Guillaume Desmottes <guillaume.desmottes@onestream.live>
+2024-06-12 18:28:54 +0200  Piotr Brzeziński <piotr@centricular.com>
 
-	* gst/audiobuffersplit/gstaudiobuffersplit.c:
-	  audiobuffersplit: disable max-silence-time if set to 0
-	  According to the property documentation max-silence-time is supposed to be
-	  disabled when set to 0 but it was not.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5632>
+	* sys/applemedia/vtdec.c:
+	  vtdec: Use GST_VIDEO_DECODER_ERROR instead of aborting when frame has an ERROR flag
+	  This was already being used in handle_frame() for errors that happen when queueing a frame for decoding,
+	  let's do the same when a frame is flagged with an error in the output callback.
+	  From quick testing, this makes seeking more reliable (previously, it would sometimes cause a decoding error
+	  and shut the whole decoder down due to GST_FLOW_ERROR).
+	  Also manually sets the max error count to actually stop processing if too many errors occur.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7044>
 
-2023-05-26 17:38:13 +0000  Balló György <ballogyor@gmail.com>
+2024-03-26 15:24:31 +0100  Piotr Brzeziński <piotr@centricular.com>
 
-	* gst-libs/gst/wayland/meson.build:
-	  gstwayland: Don't depend on wayland-protocols
-	  wayland-protocols are needed to build gstwayland, but not for dependent projects.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5618>
+	* sys/applemedia/vtdec.c:
+	  vtdec: Handle some errors without stopping the decoder
+	  ReferenceMissingErr is not critical and the simplest solution is to just ignore it. The frame has
+	  the FrameDropped flag set when it occurs, so we can just drop it as usual.
+	  BadDataErr is also not immediately critical, but in its case let's set the ERROR flag,
+	  so the output loop can use GST_VIDEO_DECODER_ERROR to count and error out if it happens too many times.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7044>
 
-2023-11-04 19:36:06 +0900  Seungha Yang <seungha@centricular.com>
+2024-06-17 11:15:22 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/wasapi2/gstwasapi2client.cpp:
-	* sys/wasapi2/gstwasapi2client.h:
-	* sys/wasapi2/gstwasapi2device.c:
-	  wasapi2device: Ignore activation failed device
-	  Enumerates all devices even if activation error is detected
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3090
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5609>
+	* ext/aom/gstav1dec.c:
+	  av1dec: Don't treat decoding errors as fatal and print more error details
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7041>
 
-2023-10-28 22:55:04 +0800  He Junyan <junyan.he@intel.com>
+2024-06-13 09:11:30 -0500  Zach van Rijn <me@zv.io>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/libde265/libde265-dec.c:
-	  libde265dec: Only decode the main profile
-	  The src caps of the libde265 is now fixed to I420, and so if the
-	  stream is other format, such as 4:4:4 or 10 bits format, the pipeline
-	  will crash because the dowstream element accesses the video buffer as
-	  I420 format.
-	  We now restrain the input caps to "main" profile, which only contains
-	  4:2:0 8 bits stream.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5596>
+	* gst/pcapparse/gstpcapparse.c:
+	  pcapparse: Avoid unaligned memory access
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3602
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7037>
 
-2023-11-04 03:16:47 +0100  Marek Vasut <marex@denx.de>
+2024-05-31 13:07:51 +0200  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2decoder.c:
-	  v4l2codecs: Avoid QBUF/DQBUF struct timeval .tv_usec wrap-around at frame 1000000
-	  When decoding stream using hardware V4L2 decoder element, in any of the
-	  currently supported formats, the decoding will fail once frame number
-	  1000000 is reached. The reported error clearly indicates a wrap-around
-	  occured, instead of receiving decoded frame 1000000, frame 0 is received
-	  from the hardware V4L2 decoder driver.
-	  The problem is actually not in the driver itself, but rather in gstreamer,
-	  which uses `struct v4l2_buffer` member `.timestamp` in a special way. The
-	  timestamp of buffers with encoded data added to the SINK (input) queue of
-	  the driver is copied by the driver into matching buffers with decoded data
-	  added to the SOURCE (output) queue of the driver. In fact, the timestamp
-	  is not a timestamp at all, but rather in this special case, only part of
-	  it is used as an incrementing frame counter.
-	  The `.timestamp` is of type `struct timeval`, which is defined in
-	  `sys/time.h` 1. Only the `tv_usec` member of this structure is used
-	  for the incrementing frame counter. However, suseconds_t tv_usec 2
-	  may be limited to range -1, 1000000:
-	  "
-	  XSI The type suseconds_t shall be a signed integer type capable of
-	  storing values at least in the range -1, 1000000.
-	  "
-	  Therefore, once frame 1000000 is reached, a rollover occurs and decoding
-	  fails.
-	  Fix this by using both `struct timeval` members, `.tv_sec` and `.tv_usec`
-	  with matching modular arithmetic, this way the failure would occur again
-	  just short of 2^84 frames, which should be plenty.
-	  1 https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_time.h.html
-	  2 https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html
-	  A test case using stateless hardware h264 decoder, the WARN/ERROR output
-	  in gstreamer log indicates a failure occurred. With this change, that
-	  error no longer occurs and the WARN/ERROR are not present:
-	  ```
-	  pc$ gst-launch-1.0 videotestsrc num-buffers=1001001 pattern=6 ! \
-	  video/x-raw,width=16,height=16,format=I420 ! \
-	  x264enc ! filesink location=/tmp/test.h264
-	  dut$ GST_DEBUG="*:3" gst-launch-1.0 filesrc location=/tmp/test.h264 ! \
-	  h264parse ! v4l2slh264dec ! fakesink
-	  ...
-	  0:03:51.393677606 12111     0x370df400 WARN      \
-	  v4l2codecs-decoder gstv4l2decoder.c:1157:gst_v4l2_request_set_done:<v4l2decoder2> \
-	  Requested frame 1000000, but driver returned frame 0.
-	  0:03:51.394140597 12111     0x370df400 WARN      \
-	  v4l2codecs-decoder gstv4l2decoder.c:1157:gst_v4l2_request_set_done:<v4l2decoder2> \
-	  Requested frame 1000001, but driver returned frame 1.
-	  0:03:51.394425216 12111     0x370df400 WARN      \
-	  v4l2codecs-decoder gstv4l2decoder.c:1157:gst_v4l2_request_set_done:<v4l2decoder2> \
-	  Requested frame 1000002, but driver returned frame 2.
-	  0:03:51.394665211 12111     0x370df400 WARN      \
-	  v4l2codecs-decoder gstv4l2decoder.c:1157:gst_v4l2_request_set_done:<v4l2decoder2> \
-	  Requested frame 1000003, but driver returned frame 3.
-	  0:03:51.394785833 12111     0x370df400 WARN      \
-	  v4l2codecs-h264dec gstv4l2codech264dec.c:1059:gst_v4l2_codec_h264_dec_output_picture:<v4l2slh264dec0> \
-	  error: Failed to decode frame 1000000
-	  ERROR: from element /GstPipeline:pipeline0/v4l2slh264dec:v4l2slh264dec0: Failed to decode frame 1000000
-	  ```
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5603>
+	* gst/codectimestamper/gstcodectimestamper.c:
+	  codectimestamper: never set DTS to NONE
+	  If we want to avoid the DTS going backward, then we can set DTS to
+	  last_dts as a last resort.
+	  Log a warning in this case
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7033>
+
+2024-06-07 23:09:54 -0700  Khem Raj <raj.khem@gmail.com>
+
+	* sys/uvcgadget/configfs.c:
+	  uvcgadget: Use g_path_get_basename instead of libc basename
+	  Musl does not implement GNU basename and have fixed a bug where the
+	  prototype was leaked into string.h 1, which resullts in compile errors
+	  with GCC-14 and Clang-17+
+	  | sys/uvcgadget/configfs.c:262:21: error: call to undeclared function 'basename'
+	  ISO C99 and later do not support implicit function declarations -Wimplicit-function-declaration
+	  |   262 |     const char *v = basename (globbuf.gl_pathvi);
+	  |       |                     ^
+	  Use glib function instead makes it portable across musl and glibc on
+	  linux
+	  1 https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7a
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7028>
 
-2023-10-31 17:59:32 +0100  Kalev Lember <klember@redhat.com>
+2024-06-10 13:11:19 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* ext/openh264/gstopenh264dec.cpp:
-	* ext/openh264/gstopenh264enc.cpp:
-	  openh264: Fail gracefully if openh264 encoder/decoder creation fails
-	  This can happen with the dummy "noopenh264" library that the freedesktop
-	  flatpak runtime ships, and Fedora is planning on shipping as well. In
-	  both cases the dummy implementation gets replaced with the actual
-	  openh264 library that's downloaded directly from Cisco, but just to be
-	  on safe side, this patch makes it careful to check the return values to
-	  avoid crashing if the underlying library hasn't been swapped out yet.
-	  The patch is taken from freedesktop-sdk and was originally written by
-	  Valentin David <valentin.david@codethink.co.uk>.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5586>
+	* ext/aom/gstav1enc.c:
+	  av1enc: Handle force-keyunit events properly by requesting keyframes
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7022>
 
-2023-10-25 21:37:24 +0900  Seungha Yang <seungha@centricular.com>
+2024-06-10 23:25:46 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
-	  wasapi2: Don't use global volume control object
-	  ISimpleAudioVolume controls volume of corresponding audio session
-	  and there would be only single input/output audio session
-	  in case of share-mode, which means that it controls audio volume of the
-	  process. Instead, use IAudioStreamVolume interface which controls
-	  volume of the stream.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5579>
+	* sys/d3d12/gstd3d12videosink.cpp:
+	  d3d12videosink: Disconnect window signal handler on dispose as intended
+	  Fixing typo
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7014>
 
-2023-10-29 22:42:52 +0900  Seungha Yang <seungha@centricular.com>
+2024-06-02 10:26:19 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Fix window switching in case of fullscreen mode
-	  Other Windows applications allow window switching even when
-	  an application window is in fullscreen mode. Also fixing
-	  regression introduced in 15248d8b84db9e79e6d4587b212b12ca82fc4a6b
-	  which makes restored window is always located at topmost
-	  since we do not call SetWindowPos() anymore when restoring
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5578>
-
-2023-10-28 01:23:36 +0900  Seungha Yang <seungha@centricular.com>
+	* ext/dtls/gstdtlssrtpenc.c:
+	  dtlssrtpenc: Don't crash if no pad name is provided when requesting a new pad
+	  It is mandatory to provide a valid pad name for dtlssrtpenc.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6994>
 
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	  d3d11screencapturesrc: Fix mouse cursor blending
-	  Ignore alpha component of source (mouse cursor texture)
-	  when blending alpha channel, otherwise the background area of source
-	  (which has zeros) will be written to render target. Then it will result
-	  in black rectangle if output texture is converted to premultiplied alpha
-	  texture
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5577>
+2024-05-30 01:30:58 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-10-25 23:19:51 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/d3d12/gstd3d12bufferpool.cpp:
+	* sys/d3d12/gstd3d12memory.cpp:
+	  d3d12memory: Fix staging buffer alignment
+	  Not all GPUs can support arbitrary offset of
+	  D3D12_PLACED_SUBRESOURCE_FOOTPRINT when copying GPU memory between
+	  texture and buffer. Instead of calculating size/offset per plane,
+	  calculate the entire size and offsets at once.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6973>
 
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	  mfvideoencoder: Fix typo in template caps
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3058
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5556>
+2024-05-29 18:54:18 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-10-10 10:39:55 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+	* sys/d3d12/gstd3d12h264enc.cpp:
+	  d3d12encoder: Do not print error log for not-supported feature
+	  gst_d3d12_result() will print message with ERROR level if failed.
+	  Use FAILED/SUCCEEDED macros instead, since not-supported feature
+	  is not a critical error
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6963>
 
-	* gst/mpegtsmux/gstatscmux.c:
-	* gst/mpegtsmux/tsmux/tsmuxstream.c:
-	* gst/mpegtsmux/tsmux/tsmuxstream.h:
-	  tsmux: Fix default get_es_descrs_func
-	  `tsmux_stream_default_get_es_descrs` is missing the `user_data`
-	  parameter and shouldn't be cast to `TsMuxStreamGetESDescriptorsFunc`.
-	  Prefer not casting at all to make sure we don't miss such an issue.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5516>
+2024-05-29 13:51:27 +0300  Tim-Philipp Müller <tim@centricular.com>
 
-2023-10-10 10:22:44 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+	* meson.build:
+	  Back to development after 1.24.4
 
-	* gst/mpegtsmux/gstatscmux.c:
-	* gst/mpegtsmux/tsmux/tsmux.c:
-	* gst/mpegtsmux/tsmux/tsmux.h:
-	  tsmux: Fix default new_stream_func
-	  `tsmux_stream_new` is missing the `user_data` parameter and shouldn't be
-	  cast to `TsMuxNewStreamFunc`.
-	  Prefer not casting at all to make sure we don't miss such an issue.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5516>
+=== release 1.24.4 ===
 
-2023-10-10 10:12:44 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2024-05-29 13:44:50 +0300  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst/mpegtsmux/tsmux/tsmuxstream.h:
-	  tsmux: Add missing include
-	  We need `GstMpegtsPMTStream` here.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5516>
+	* NEWS:
+	* RELEASE:
+	* gst-plugins-bad.doap:
+	* meson.build:
+	  Release 1.24.4
 
-2023-10-17 00:57:56 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2024-05-27 12:28:44 +0100  Philippe Normand <philn@igalia.com>
 
-	* gst/mpegtsmux/tsmux/tsmux.c:
-	  tsmux: Simplify tsmux_section_write_packet
-	  - Don't try to make the parameters match `GHFunc`. Use a dedicated
-	  callback for `g_hash_table_foreach`.
-	  - Don't try to be clever with buffer memories. We're allocating a full
-	  packet anyway, might as well memcpy and save on a lot of complexity.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5516>
+	* ext/webrtc/gstwebrtcbin.c:
+	* ext/webrtc/webrtcsdp.c:
+	* ext/webrtc/webrtcsdp.h:
+	* tests/check/elements/webrtcbin.c:
+	  webrtcbin: Allow session level setup attribute in SDP
+	  An SDP answer can declare its setup attribute at the session level or at the
+	  media level. Until this patch we were validating only the latter case and an
+	  assert was raised in the former case.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6945>
 
-2023-10-17 00:54:38 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2024-05-17 11:13:19 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst/mpegtsmux/tsmux/tsmux.c:
-	  tsmux: tsmux_packet_out should always consume its buffer
-	  Consuming the buffer only when successful is an antipattern and easily
-	  leads to leaks.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5516>
+	* ext/dtls/gstdtlsconnection.c:
+	  dtlsconnection: Fix overflow in timeout calculation on systems with 32 bit time_t
+	  If a timeout of more than 4295s was scheduled, the calculation would
+	  overflow and a too short timeout would be used instead.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6920>
 
-2023-10-16 23:54:20 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-08-11 17:50:23 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst/mpegtsmux/tsmux/tsmux.c:
-	  tsmux: Don't memset in pad_stream when writing a PCR packet
-	  tsmux_write_ts_header will write a stuffing adaptation field, so we
-	  don't need to prefill the buffer.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5516>
+	* sys/kms/gstkmsallocator.c:
+	  kmssink: Do not close the DRM prime handle twice
+	  The prime_fds for multi planes may be the same. For example, on Intel's
+	  platform, the NV12 surface may have the same FD for the plane0 and the
+	  plane1. Then, the DRM_IOCTL_GEM_CLOSE will close the same handle twice
+	  and get an "Invalid argument 22" error the second time.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6916>
 
-2023-10-16 23:52:48 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2024-05-22 12:28:39 +0100  Daniel Stone <daniels@collabora.com>
 
-	* gst/mpegtsmux/tsmux/tsmux.c:
-	  tsmux: Move out parameters of tsmux_write_ts_header
-	  Move them to the end of the parameter list and also allow passing NULLs
-	  to ignore the payload information, but assert that the payload length is
-	  zero in this case.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5516>
+	* gst-libs/gst/wayland/gstwldisplay.c:
+	* gst-libs/gst/wayland/meson.build:
+	  wayland: Use wl_display_create_queue_with_name
+	  Wayland 1.23 and above allow us to attach names to an event queue, which
+	  are printed out when debugging. Do this to make the logs easier to read.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6915>
 
-2023-10-16 23:50:16 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2024-04-30 11:20:54 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst/mpegtsmux/tsmux/tsmux.c:
-	  tsmux: Fix two more uses of gst_buffer_map
-	  The buffers should be used for writing.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5516>
+	* sys/va/gstvaav1enc.c:
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabaseenc.h:
+	  vabaseenc: delete the useless frame counter fields
+	  They are used to calculate the PTS and DTS before, no usage now.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6786>
 
-2023-10-16 15:41:48 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2024-04-30 11:12:05 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst/mpegtsmux/tsmux/tsmux.c:
-	  tsmux: Fix error handling in pad_stream
-	  Don't leak the map or the buffer if we encounter an error.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5513>
+	* sys/va/gstvabaseenc.c:
+	  vabaseenc: Do not set the min_pts
+	  Because all the va encoders improved their PTS/DTS algorithm, now
+	  it is impossible to generate minus DTS. So no underflow will happen
+	  and we do not need to set a 1000 hour offset now.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6786>
 
-2023-10-16 15:31:04 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2024-05-23 11:28:35 +0100  Backport Bot <gitlab-backport-bot@gstreamer-foundation.org>
 
-	* gst/mpegtsmux/tsmux/tsmux.c:
-	  tsmux: Fill padding packets with stuffing bytes
-	  Instead of leaving it uncleared, emitting probably old packet data but
-	  potentially also random or sensitive application data.
-	  Also fix the mapping mode.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5513>
+	* tests/check/libs/d3d11device.cpp:
+	* tests/check/meson.build:
+	  Revert "tests/d3d11: add concurrency test for gstd3d11device"
+	  This reverts commit 203f6b00d426b2ef296fbe8b6591e07b9d6f9b7e.
+	  Revert test that was added with reverted commit as well.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6907>
 
-2023-10-17 14:56:34 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2024-05-23 17:29:54 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codech265dec.c:
-	  v4l2codecs: h265: Fix entry_point_offsets array leak
-	  This array was being leaked.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5503>
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* tests/check/libs/d3d11device.cpp:
+	  Revert "d3d11device: protect device_lock vs device_new"
+	  This reverts commit 0cb12db96c0973e9e0534b7f25665c72b9fd29d4
+	  (i.e. commit 926d5366b99b3498632a45147cfa329dbbf2cc30 on main).
+	  AcquireSRWLockExclusive seems to be acquiring lock in exclusive mode
+	  when the same lock is combined with write lock access.
+	  Reverting the commit because of this is unexpected behavior
+	  and unavoidable OS bug.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6907>
 
-2023-10-17 12:42:59 -0400  Detlev Casanova <detlev.casanova@collabora.com>
+2024-04-12 21:48:13 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  codecs: h265: Do not free slice header before using it
-	  The v4l2codecs H.265 decoder uses the
-	  GstH265SliceHdr::entry_point_offset_minus1 array so make sure that it is not
-	  freed before decoding the frame.
-	  Before this patch, some H.265 input would segfault in
-	  gst_v4l2_codec_h265_dec_fill_slice_params() when executing the line:
-	  guint32 entry_point_offset = slice_hdr->entry_point_offset_minus1i + 1;
-	  Make sure that the array is not freed before using it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5503>
+	* sys/va/gstvah265enc.c:
+	  vah265enc: Let FORCE_KEYFRAME be IDR frame rather than just I frame
+	  The FORCE_KEYFRAME frame which has GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME
+	  bit set should be the sync point. So we should let it be an IDR frame to begin
+	  a new GOP, rather than just promote it to an I frame.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6857>
+
+2024-04-09 23:40:41 +0800  He Junyan <junyan.he@intel.com>
+
+	* sys/va/gstvah264enc.c:
+	  vah264enc: Let FORCE_KEYFRAME be IDR frame rather than just I frame
+	  The FORCE_KEYFRAME frame which has GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME
+	  bit set should be the sync point. So we should let it be an IDR frame to begin
+	  a new GOP, rather than just promote it to an I frame.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6857>
 
-2023-10-12 16:25:59 +0530  Rahul T R <r-ravikumar@ti.com>
+2024-04-12 16:09:26 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/kms/gstkmssink.c:
-	  kmssink: Add TIDSS auto-detection
-	  Add Texas Instruments TIDSS display controller into list of
-	  auto-detected modules.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5486>
+	* tests/examples/va/vaenc-dynamic-reconfigure.c:
+	  examples: vaenc-dynamic: support force key frame setting
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6857>
 
-2023-10-15 20:30:22 +0900  Seungha Yang <seungha@centricular.com>
+2024-05-03 22:57:57 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
-	  d3d11converter: Fix 10/12bits planar output
-	  Simple division can result in 10/12bits overflow.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5484>
+	* sys/va/gstvah265enc.c:
+	  vah265enc: Fix a memory leak when destroying the object
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6913>
 
-2023-10-12 02:26:07 +0900  Seungha Yang <seungha@centricular.com>
+2024-05-03 12:08:19 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Fix rendering with initial fullscreen state
-	  Change fullscreen mode once the swapchain is fully configured
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5466>
+	* sys/va/gstvah265enc.c:
+	  vah265enc: Use a FIFO queue to generate DTS
+	  The base parse will infer the DTS by itself, so we need to make DTS
+	  offset before PTS in order to avoid DTS bigger than PTS. We now use
+	  a FIFO queue to store all PTS and assign it to DTS by an offset.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6913>
 
-2023-10-11 23:29:04 +0900  Seungha Yang <seungha@centricular.com>
+2024-05-02 14:18:16 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Fix toggling between fullscreen and maximized
-	  Use GetWindowPlacement() and SetWindowPlacement() APIs
-	  to remember and restore window status, such as maximized, position,
-	  restore position, etc.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3016
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5466>
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabaseenc.h:
+	* sys/va/gstvah264enc.c:
+	  vah264enc: Use a FIFO queue to generate DTS
+	  The base parse will infer the DTS by itself, so we need to make DTS
+	  offset before PTS in order to avoid DTS bigger than PTS. We now use
+	  a FIFO queue to store all PTS and assign it to DTS by an offset.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6913>
+
+2024-05-23 00:48:11 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	  cudamemory: Fix offset of subsampled planar formats
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6910>
 
-2023-10-10 15:43:07 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2024-05-21 16:58:26 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2format.c:
-	  v4l2codecs: Fix tiled formats stride conversion
-	  While adding arbitrary tile support, a round up operation was badly
-	  converter. This caused the Y component of the stride to be 0. This
-	  eventually lead to a crash in glupoad preceded by the following
-	  assertion.
-	  gst_gl_buffer_allocation_params_new: assertion 'alloc_size > 0' failed
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5463>
+	* ext/aom/gstav1enc.c:
+	  av1enc: Use 1/90000 as timebase and don't use the framerate at all
+	  This mirrors the behaviour in vp8enc / vp9enc and is generally more
+	  useful than using any framerate from the caps as it provides some degree
+	  of accuracy if the stream doesn't have timestamps perfectly according to
+	  the framerate.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6909>
 
-2023-10-09 19:09:15 +0900  Seungha Yang <seungha@centricular.com>
+2024-05-21 16:46:40 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/decklink/gstdecklink.h:
-	  decklink: Fix broken COM string conversion
-	  WideCharToMultiByte return is the string length without null terminate
-	  character if passed "cchWideChar" does not include the null terminate
-	  character size. Instead of passing the exact string length, pass -1 so that
-	  the API can understand the input string is null terminated already and
-	  returned value from the API includes the character.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3023
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5446>
+	* ext/aom/gstav1enc.c:
+	* ext/aom/gstav1enc.h:
+	  av1enc: Fix last timestamp tracking so it actually works
+	  This behaves exactly the same as in vp8enc / vp9enc now.
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3546
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6909>
+
+2024-05-15 15:56:37 -0500  Brad Reitmeyer <brad.reitmeyer@resi.io>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	  nvcodec: Accept progressive-high profiles for h264
+	  Videos using progressive-high used to work on 1.16 before the parser added progressive-high. It looks like partial
+	  support was added to nvcodec in https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1634
+	  but accidentally ommited gstnvh264dec
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6873>
 
-2023-10-05 13:34:14 +0800  James Oliver <james.oliver@icetana.com.au>
+2024-05-14 14:44:45 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/nvcodec/gstnvh265encoder.cpp:
-	  nvh265encoder: fix bounds for auto-select GPU enumeration
-	  Fixes the bounds-check for encoder auto-select GPU enumeration to be
-	  between 0-7 instead of 0-6. This should allow 8-GPU machines to work
-	  with nvautogpuh265enc for the last enumerated GPU.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5439>
+	* gst/mpegtsmux/gstbasetsmux.c:
+	  mpegtsmux: Allow pads to have no caps until they receive their first buffer
+	  If the muxer times out because of the latency deadline it can happen
+	  that some pads have no caps yet. In that case skip creation of streams
+	  for these pads and create updated section tables once the first buffer
+	  arrives later.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6859>
 
-2023-10-05 13:29:49 +0800  James Oliver <james.oliver@icetana.com.au>
+2024-05-09 17:11:59 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/nvcodec/gstnvh264encoder.cpp:
-	  nvh264encoder: fix bounds for auto-select GPU enumeration
-	  Fixes the bounds-check for encoder auto-select GPU enumeration to be
-	  between 0-7 instead of 0-6. This should allow 8-GPU machines to work
-	  with nvautogpuh264enc for the last enumerated GPU.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5439>
+	* gst/mpegtsmux/gstbasetsmux.c:
+	  mpegtsmux: Correctly time out and mux anyway in live pipelines
+	  This makes sure that for sparse streams (KLV, DVB subtitles, ...) the
+	  muxer does not wait until the next buffer is available for them but
+	  times out on the latency deadline and outputs data.
+	  For non-live pipelines it will still be necessary for upstream to
+	  correctly produce gap events for sparse streams.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6859>
 
-2023-09-27 12:33:39 +0200  Philippe Normand <philn@igalia.com>
+2024-05-12 18:15:05 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/inter/gstinteraudiosink.c:
-	  interaudiosink: Ensure adapters don't store buffers with audio meta
-	  The interaudiosrc might take buffers of different sizes from the audio adapter,
-	  so keeping metas consistency would be an issue. So the sink now strips the audio
-	  metas away and the src adds them back (for non-interleaved layouts only) when
-	  taking buffers from the adapter.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5416>
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	  nvencoder: Fix maximum QP value setting
+	  Fixing typo
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6832>
 
-2023-09-13 15:11:32 +0100  Philippe Normand <philn@igalia.com>
+2024-04-15 13:38:15 +0200  Robert Mader <robert.mader@collabora.com>
 
-	* gst/inter/gstinteraudiosrc.c:
-	  interaudiosrc: Add audio meta to buffers containing non-interleaved samples
-	  Without this a downstream audioconverter wouldn't be able to map the
-	  GstAudioBuffer prior to conversion.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5416>
+	* sys/v4l2codecs/gstv4l2decoder.c:
+	  v4l2codecs: decoder: Reorder caps to prefer DMA_DRM ones
+	  Certain V4L2 fourccs don't (yet) have DRM counter parts, in which case
+	  we can't create DMA_DRM caps for them. This is usually the case for
+	  specific tilings, which are represented as modifiers for DMA formats.
+	  While using these tilings is generally preferable - because of e.g.
+	  lower memory usage - it can result in additional conversion steps when
+	  interacting with DMA based APIs such as GL, Vulkan or KMS. In such cases
+	  using a DMA compatible format usually ends up being the better option.
+	  Before the addition of DMA_DRM caps, this was what playbin3 ended up
+	  requesting in various cases - e.g. prefering NV12 over NV12_4L4 - but
+	  the addition of DMA_DRM caps seems to confuse the selection logic.
+	  As a simple and quite robust solution, assume that peers supporting
+	  DMA_DRM caps always prefer these and reorder the caps accordingly.
+	  In the future we plan to have a translation layer for cases where
+	  there is a matching fourcc+modifier pair for a V4L2 fourcc, ensuring
+	  optimal results.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6824>
 
-2023-09-27 01:12:01 +0900  Seungha Yang <seungha@centricular.com>
+2024-05-04 11:56:05 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/d3d11/gstd3d11decoder.cpp:
-	  d3d11decoder: Fix crash on negotiate() when decoder is not configured
-	  The negotiate() can be called by GstVideoDecoder baseclass on GAP event,
-	  and decoder helper object might not be configured at the time
-	  when negotiate() is called.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5401>
+	* gst-libs/gst/play/gstplay.c:
+	* gst-libs/gst/player/gstplayer.c:
+	  play: Mention that gst_play_new() also initialized GStreamer
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6821>
 
-2023-09-20 19:41:00 +0100  Tim-Philipp Müller <tim@centricular.com>
+2024-05-04 11:54:16 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* meson.build:
-	  Back to development
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5371>
+	* gst-libs/gst/play/gstplay.c:
+	* gst-libs/gst/player/gstplayer.c:
+	  play: Initialize debug category and error quark in class_init
+	  Doing it in gst_play_new() means that bindings that directly call
+	  g_object_new() with the GType wouldn't end up initializing both.
+	  This affects at least the Python and GJS bindings.
+	  gst_init() is nonetheless only called from gst_play_new() once because
+	  calling it from class_init would likely lead to problems as that's
+	  called from somewhere in the middle of GObject.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6821>
 
-=== release 1.22.6 ===
+2024-05-07 10:35:26 +0200  Emil Pettersson <khwaaj@gmail.com>
 
-2023-09-20 18:10:57 +0100  Tim-Philipp Müller <tim@centricular.com>
+	* sys/applemedia/vtdec.c:
+	  vtdec: Fix deadlock when negotiating format change
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6817>
 
-	* NEWS:
-	* RELEASE:
-	* gst-plugins-bad.doap:
-	* meson.build:
-	  Release 1.22.6
+2024-05-07 11:18:10 +0200  Piotr Brzeziński <piotr@centricular.com>
 
-2023-08-10 15:47:03 +0300  Sebastian Dröge <sebastian@centricular.com>
+	* tests/check/elements/audiovisualizer.c:
+	* tests/check/meson.build:
+	  audiovisualizer: Add simple pipeline unit test
+	  Creates pipelines with each of our visualizer elements and runs them with 20 buffers from audiotestsrc.
+	  Added after a completely broken (segfaulting) synaescope went unnoticed for a while.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6814>
+
+2024-05-06 20:50:21 +1000  Matthew Waters <matthew@centricular.com>
+
+	* ext/webrtc/gstwebrtcbin.c:
+	  webrtc: request-aux-sender, only sink floating refs
+	  Don't add an extra ref if non-floating as that ref will never be
+	  unreffed.
+	  gst_bin_add() is transfer floating (alias to transfer none).
+	  Fixes a leak when a non-floating ref was provided as a return value in
+	  the request-aux-sender signal.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6809>
+
+2024-05-04 20:08:49 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst-libs/gst/d3d11/hlsl/PSMain_converter.hlsl:
+	* sys/d3d12/hlsl/PSMain_converter.hlsl:
+	  d3dshader: Fix gamma and primaries conversion pixel shader
+	  Fixing regression introduced by the commit of f52ecb960792257b7394a6dc3182b6747c902b5b
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6803>
 
-	* gst/mxf/mxfd10.c:
-	  mxfdemux: Check number of channels for AES3 audio
-	  Only up to 8 channels are allowed and using a higher number would cause
-	  integer overflows when copying the data, and lead to out of bound
-	  writes.
-	  Also check that each buffer is at least 4 bytes long to avoid another
-	  overflow.
-	  Fixes ZDI-CAN-21661, CVE-2023-40475
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2897
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5365>
+2024-05-01 00:12:42 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-08-10 15:45:01 +0300  Sebastian Dröge <sebastian@centricular.com>
+	* sys/qsv/gstqsvh264dec.cpp:
+	* sys/qsv/gstqsvh265dec.cpp:
+	  qsvh264dec,qsvh265dec: Fix nalu leaks
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3514
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6790>
 
-	* gst/mxf/mxfup.c:
-	  mxfdemux: Fix integer overflow causing out of bounds writes when handling invalid uncompressed video
-	  Check ahead of time when parsing the track information whether
-	  width, height and bpp are valid and usable without overflows.
-	  Fixes ZDI-CAN-21660, CVE-2023-40474
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2896
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5365>
+2024-04-30 18:15:56 +0200  Piotr Brzeziński <piotr@centricular.com>
 
-2023-08-09 12:49:19 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+	* sys/applemedia/vtdec.c:
+	  vtdec: Fix PAUSED->READY deadlock when output loop is running
+	  Makes sure the GST_PAD_STREAM_LOCK is not taken when pad is being deactivated.
+	  The lack of this was causing deadlocks when stopping the pipeline right after producing first buffers.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6788>
 
-	* gst-libs/gst/codecparsers/gsth265parser.c:
-	  h265parser: Fix possible overflow using max_sub_layers_minus1
-	  This fixes a possible overflow that can be triggered by an invalid value of
-	  max_sub_layers_minus1 being set in the bitstream. The bitstream uses 3 bits,
-	  but the allowed range is 0 to 6 only.
-	  Fixes ZDI-CAN-21768, CVE-2023-40476
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2895
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5366>
+2024-04-30 18:08:27 +0200  Stéphane Cerveau <scerveau@igalia.com>
 
-2023-09-11 18:12:28 +0200  Hugues Fruchet <hugues.fruchet@foss.st.com>
+	* ext/vulkan/vkh264dec.c:
+	* ext/vulkan/vkh265dec.c:
+	  vkh26xdec: Fix stop memory leak
+	  The h26xdecoder 'stop' method was not called
+	  as the vulkan h26x class rewires the video decoder
+	  'stop' base method to its own one.
+	  It was causing some memory leaks such as dangling parser
+	  and dpb in h26xdecoder base class.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6787>
 
-	* gst-libs/gst/wayland/gstwlwindow.c:
-	  waylandsink: Fix cropping for video with non-square aspect ratio
-	  Padding of unaligned content is still visible at right with some aspect-ratio.
-	  Fix this by giving the original content resolution to wp_viewport_set_source()
-	  instead of pixel aspect ratio scaled one.
-	  Fixes !5259
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5360>
+2024-04-30 00:36:59 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-2023-09-14 01:18:59 +0900  Seungha Yang <seungha@centricular.com>
+	* meson.build:
+	  Back to development after 1.24.3
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6772>
 
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	* gst-libs/gst/codecs/gsth264picture.h:
-	  h264decoder: Update latency dynamically
-	  The actual number of reorder frames is unknown
-	  unless frame reordering is disabled
-	  (e.g., POC type 2 or constrained-* profiles).
-	  Also derived maximum DPB size or max_num_reorder_frames in VUI
-	  is not the upper bound of output delay.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2702
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5341>
+=== release 1.24.3 ===
 
-2023-08-16 13:43:56 +0000  L. E. Segovia <amy@amyspark.me>
+2024-04-30 00:15:23 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/applemedia/avsamplevideosink.m:
-	  applemedia: Also fix inconsistent pixel format definition for NV12
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5203>
+	* NEWS:
+	* RELEASE:
+	* gst-plugins-bad.doap:
+	* meson.build:
+	  Release 1.24.3
 
-2023-08-15 21:45:56 +0000  L. E. Segovia <amy@amyspark.me>
+2024-04-29 18:24:36 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/applemedia/coremediabuffer.c:
-	* sys/applemedia/corevideobuffer.c:
-	  applemedia: Fix pixel format for I420
-	  In Intel Macs, using full range 8-bit 4:2:0 YCbCr results in a failure on
-	  initialization. I've validated this to be the correct pixel format with FFmpeg:
-	  https://github.com/FFmpeg/FFmpeg/blob/8653dcaf7d665b15b40ea9a560c8171b0914a882/libavutil/hwcontext_videotoolbox.c#L45
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5203>
+	* tests/check/elements/unixfd.c:
+	  unixfd: disable flaky test_unixfd_segment for now
+	  It's a problem with the test, and a proper fix might
+	  require new API, so just disable it for now.
 
-2023-08-24 12:12:09 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2024-04-22 15:03:56 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/va/gstvadecoder.c:
-	* sys/va/gstvadisplay_priv.c:
-	  va: Fix in error logs functions mismatches
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5340>
+	* sys/va/gstvah265enc.c:
+	  vah265enc: Set the correct buffer flag for output
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6764>
 
-2023-09-15 11:06:52 +1000  Matthew Waters <matthew@centricular.com>
+2024-04-22 14:44:53 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/androidmedia/gstamcvideoenc.c:
-	  androidmedia/enc: handle codec-data before popping GstVideoCodecFrames
-	  Issue is that when amc was producing a codec-data buffer, a
-	  GstVideoCodecFrame was being popped off the internal queue.  This meant
-	  that the codec-data was being associated with the first input frame and
-	  the second (first encoded buffer) output buffer with the second input
-	  frame.  At the end (assuming one input produces one output which seems
-	  to hold in my testing and how the encoder is currently implemented)
-	  there would be an input frame missing and would be pushed without any
-	  timing information.  This would lead to e.g. muxers rejecting the buffer
-	  without PTS and failing to mux.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5335>
+	* sys/va/gstvah264enc.c:
+	  vah264enc: Set the correct buffer flag for output
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6764>
 
-2023-09-15 11:06:07 +1000  Matthew Waters <matthew@centricular.com>
+2024-04-21 14:55:31 +0800  Seungha Yang <seungha@centricular.com>
 
-	* sys/androidmedia/gstamc-constants.h:
-	* sys/androidmedia/gstamcvideoenc.c:
-	  androidmedia/enc: add fixme log about partial frames
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5335>
+	* sys/va/gstvabaseenc.c:
+	  vabaseenc: Fix frame leak on error path
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6764>
 
-2023-09-16 03:13:33 +0900  Seungha Yang <seungha@centricular.com>
+2024-04-21 14:48:02 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/codecparsers/gstav1parser.c:
-	  av1parser: Fix segmentation params update
-	  Even if the segmentation feature value is not updated,
-	  the parsed "segmentation_update_map" and "segmentation_temporal_update"
-	  values should not be cleared as it's referenced during lower
-	  level bitstream parsing. Also, don't use assert() in parser
-	  unless it's clearly impossible condition.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5336>
+	* sys/va/gstvah265enc.c:
+	  vah265enc: Do not touch the PTS of output frame
+	  1. The PTS of all frames should not be changed.
+	  2. Just update the DTS based on the PTS. For the frame which is not
+	  reordered, the DTS is equal to PTS. For frame which is reordered,
+	  the DTS is equal to previous DTS. For example:
+	  Input: F0D0, P0 -- F1D1, P1 -- F2D2, P2 -- F3D3, P3
+	  Output: F0I, D0, P0 -- F3P, D0, P3 -- F1B, D1, P1 -- F2B, D2, P2
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6764>
+
+2024-04-21 12:51:31 +0800  He Junyan <junyan.he@intel.com>
+
+	* sys/va/gstvah264enc.c:
+	  vah264enc: Do not touch the PTS of output frame
+	  1. The PTS of all frames should not be changed.
+	  2. Just update the DTS based on the PTS. For the frame which is not
+	  reordered, the DTS is equal to PTS. For frame which is reordered,
+	  the DTS is equal to previous DTS. For example:
+	  Input: F0D0, P0 -- F1D1, P1 -- F2D2, P2 -- F3D3, P3
+	  Output: F0I, D0, P0 -- F3P, D0, P3 -- F1B, D1, P1 -- F2B, D2, P2
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6764>
+
+2024-04-28 23:37:55 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Fix d3d12 resource copy
+	  It was copying to self resource
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6755>
 
-2023-08-24 17:40:42 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2024-04-19 00:30:47 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst/rtmp2/rtmp/rtmpclient.c:
-	  rtmp2: Allow NULL flash version, omitting the field
-	  rtmpsink omits it by default. Allow us to do the same.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5248>
+	* sys/va/gstvabaseenc.c:
+	  vabaseenc: No need to call _finish_subframe()
+	  After vaav1enc is aligned to TU, there is no case that generates
+	  multi output for one input.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6751>
+
+2024-04-19 00:22:50 +0800  He Junyan <junyan.he@intel.com>
+
+	* sys/va/gstvaav1enc.c:
+	  vaav1enc: Set the correct buffer flag for output
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6751>
+
+2024-04-19 00:14:15 +0800  He Junyan <junyan.he@intel.com>
+
+	* sys/va/gstvaav1enc.c:
+	  vaav1enc: Do not change the PTS/DTS of output frames
+	  The AV1 encoder does not reorder the frames, so there is no need
+	  to change the timestamp related meta data of output frames, just
+	  inheriting it from the input frames.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6751>
+
+2024-04-18 22:30:20 +0800  He Junyan <junyan.he@intel.com>
+
+	* sys/va/gstvaav1enc.c:
+	  vaav1enc: Change the alignment of output to "tu"
+	  The current output alignment is "frame", which may cause some issues
+	  for PTS and DTS calculation. We now change the alignment to "tu",
+	  and this is also the alignment mode for av1enc and svtav1enc.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6751>
+
+2024-04-15 09:51:53 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+
+	* gst/unixfd/gstunixfdsrc.c:
+	  unixfd: Close file descriptors on error
+	  After calling g_unix_fd_list_steal_fds() and before calling
+	  gst_fd_allocator_alloc(), we are responsible for closing those fds.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6747>
+
+2024-04-03 10:28:28 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+
+	* gst/unixfd/gstunixfdsink.c:
+	* gst/unixfd/gstunixfdsrc.c:
+	* tests/check/elements/unixfd.c:
+	  unixfdsink: Take segment into account when converting timestamps
+	  Also rename `calculate_timestamp()` to `to_monotonic()` and
+	  `from_monotonic()` which better describe what it does.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6747>
+
+2024-04-03 13:17:01 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+
+	* gst/unixfd/gstunixfdsrc.c:
+	  unixfd: Allow sending buffers with no memories
+	  There is no reason to not allow it, and it is useful for simple unit
+	  test.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6747>
 
-2023-09-05 14:15:04 +0200  Thomas Schneider <thomas.schneider@voliro.ch>
+2024-04-24 15:44:41 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/androidmedia/gstamc.c:
-	  androidmedia: fix hevc codec profile registration
-	  Fix the codec registration logic such that all supported
-	  profiles are available instead of just the first in the
-	  list.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5313>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  vaallocator: disable derived all together for Mesa <23.3
+	  First it derived mapping was disabled for P010 formats, but also there's an
+	  issue with interlaced frames.
+	  It would be possible to disable derived mapping only for interlaced (H.264
+	  decoder and vadeinterlace) but it would spread the hacks along the code. It's
+	  simpler and contained to disable derived completely for Mesa <23.3
+	  Fixes: #3450
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6746>
 
-2023-09-03 13:21:30 +0000  Akihiro Sagawa <sagawa.aki@gmail.com>
+2024-04-25 11:50:03 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/codecparsers/gstmpegvideoparser.c:
-	  codecparsers: Fix MPEG-1 aspect ratio table
-	  The values defined in ISO/IEC 11172-2 are different from those used so far.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5300>
+	* gst-libs/gst/va/gstvavideoformat.c:
+	  va: videoformat: use video library to get DRM fourcc
+	  Instead of duplicating the GStreamer format to DRM fourcc mapping, this patch
+	  uses the GstVideo library helpers. This duplicates the big O of looking for,
+	  since the two lists are traversed, but it's less error prone.
+	  Partially reverts commit 547f3e8622a39ce971c272f2c31eab8f1fdfbb45.
+	  Fixes: #3354
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6744>
 
-2023-08-29 14:55:03 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2024-04-17 18:37:30 +0900  Hou Qi <qi.hou@nxp.com>
 
 	* gst-libs/gst/wayland/gstwlwindow.c:
-	  waylandsink: Crop surfaces to their display width height
-	  Setting the surface source rectangle has been omitted so far. As a side effect
-	  surface created with padded width/height are being scaled down. Fix this using
-	  the viewporter source rectangle configuration. This can later be enhanced
-	  to support crop meta.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5298>
+	  wlwindow: free staged buffer when do gst_wl_window_finalize
+	  If waylandsink received buffer rate is high which causes frame
+	  drop, the cached staged buffer will be replaced when next buffer
+	  needs to be rendered and be freed after redraw. But there is
+	  chance to get memory leak if ended without redraw. So need to
+	  free staged buffer when do gst_wl_window_finalize().
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6735>
 
-2023-08-28 20:58:22 +0900  Seungha Yang <seungha@centricular.com>
+2024-04-24 01:02:15 +0900  Haihua Hu <jared.hu@nxp.com>
 
-	* sys/d3d11/gstd3d11convert.cpp:
-	  d3d11convert: Passthrough allocation query on same caps
-	  Since d3d11convert and its variant elements does not enable basetransform's
-	  passthrough, passthrough allocation query needs to be handled
-	  manually in order to respect downstream element's min/max buffer
-	  requirement.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5297>
-
-2023-08-23 19:27:43 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/nvcodec/gstnvencoder.cpp:
-	  nvencoder: Fix negotiation error when interlace-mode is unspecified
-	  Use GST_PAD_SET_ACCEPT_INTERSECT() to accept caps without interlace-mode
-	  field
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5240>
+	* gst-libs/gst/wayland/gstwlwindow.c:
+	  wlwindow: clear configure mutex and cond when finalize
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6724>
 
-2023-08-23 18:07:31 +0900  Seungha Yang <seungha@centricular.com>
+2024-04-23 10:53:54 +0200  Edward Hervey <edward@centricular.com>
 
-	* sys/win32ipc/protocol/win32ipcpipeserver.cpp:
-	  win32ipc: Fix pipe handle leak
-	  Named pipe handle must be closed if it's no longer needed
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2923
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5231>
+	* gst/mpegtsdemux/mpegtsbase.c:
+	  mpegtsbase: Fix Program equality check
+	  There was an issue with this equality check, which was to figure out what to do
+	  with PCR pids (whether they were part of the streams present or not) and whether
+	  we ignore PCR or not.
+	  Turns out ... we already took care of that further up in the function.
+	  The length check can be simplified by just checking whether the length of
+	  the *original* PMT and the new PMT are identical. Since we don't store "magic"
+	  PCR streams in those, we can just use them as-is.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6719>
+
+2024-04-23 01:40:44 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Lock DPB while building command
+	  Since DPB resource can be modified in output thread, protect
+	  it when building command list.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6717>
+
+2024-04-22 19:32:22 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Hold reference pictures in fence data
+	  Keep reference pictures alive during executing decoding commands
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6717>
+
+2024-04-22 21:52:53 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12decoder.h:
+	* sys/d3d12/gstd3d12vp9dec.cpp:
+	  d3d12vp9dec: Disallow resolution change to larger size on non-keyframe
+	  Intel GPU seems to be crashing if the case happens.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6717>
+
+2024-04-21 22:38:50 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Fix potential use after free
+	  A DPB buffer held by codec picture object may not be writable
+	  at the moment, then gst_buffer_make_writable() will unref passed buffer.
+	  Specifically, the use after free or double free can happen if:
+	  * Crop meta of buffer copy is required because of non-zero
+	  top-left crop position
+	  * zero-copy is possible with crop meta
+	  * A picture was duplicated, interlaced h264 stream for example
+	  Interlaced h264 stream with non-zero top-left crop position
+	  is not very common but it's possible configuration in theory.
+	  Thus gst_buffer_make_writable() should be called with
+	  GstVideoCodecFrame.output_buffer directly.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6710>
 
-2023-08-22 02:57:24 +0900  Seungha Yang <seungha@centricular.com>
+2024-04-21 22:07:36 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gsth265parse.c:
-	* tests/check/elements/h265parse.c:
-	  h265parse: Allow partially broken hvcC data
-	  Ignores parsing error on the last nalu of the array if the nalu type
-	  is not VPS/SPS/PPS
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2905
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5220>
+	* sys/d3d11/gstd3d11decoder.cpp:
+	  d3d11decoder: Fix potential use after free
+	  A DPB buffer held by codec picture object may not be writable
+	  at the moment, then gst_buffer_make_writable() will unref passed buffer.
+	  Specifically, the use after free or double free can happen if:
+	  * Crop meta of buffer copy is required because of non-zero
+	  top-left crop position
+	  * zero-copy is possible with crop meta
+	  * A picture was duplicated, interlaced h264 stream for example
+	  Interlaced h264 stream with non-zero top-left crop position
+	  is not very common but it's possible configuration in theory.
+	  Thus gst_buffer_make_writable() should be called with
+	  GstVideoCodecFrame.output_buffer directly.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6710>
 
-2023-08-18 18:21:18 +1000  Jan Schmidt <jan@centricular.com>
+2024-04-16 09:50:52 +0200  Edward Hervey <edward@centricular.com>
 
-	* ext/mdns/gstmicrodnsdevice.c:
-	  mdns: Fix a crash on context error
-	  Make sure not to free the microdns provider context until the
-	  device provider asks it to stop. Fixes a crash if there is
-	  an error (such as MDNS port being busy) that makes the
-	  mdns listener exit early.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5207>
+	* gst/mpegtsdemux/mpegtsbase.c:
+	  tsdemux: Disable smart program update
+	  The goal of this code was, for programs which were updates (i.e. adding/removing
+	  streams but not completely changing) to allow dynamic addition/removal of
+	  streams without completely removing everything.
+	  But this wasn't 100% tested and there are a bunch of issues which make it fail
+	  in plenty of ways.
+	  For now disable that feature and force the legacy "add all pads again and then
+	  remove old ones" behaviour to make it switch.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6708>
 
-2023-08-18 09:27:36 +0200  Guillaume Desmottes <guillaume.desmottes@onestream.live>
+2024-04-21 19:17:53 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/rtmp2/gstrtmp2sink.c:
-	  rtmp2sink: fix crash if message conversion failed
-	  The message pointer is not set so we can't display it in logs.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5202>
+	* sys/mediafoundation/gstmfsourceobject.cpp:
+	  mediafoundation: Fix infinite loop in device provider
+	  Initialize source state with GST_MF_DEVICE_NOT_FOUND to terminate
+	  loop immediately if no available capture device is available
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3492
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6707>
+
+2024-04-19 20:44:44 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12videosink.cpp:
+	  d3d12videosink: Disconnect window's signal on dispose
+	  Same as the commit of 7b69d1758f77331c2801746cd91b1b6b0db9ecfb
+	  but for d3d12videosink.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6700>
+
+2024-04-19 21:17:17 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12window.cpp:
+	  d3d12videosink: Handle external HWND's mouse/keyboard events
+	  OS will not propagate the event to child HWND if it's handled by
+	  the parent. Thus, navigation event should be handled by parent HWND's
+	  event handler.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6700>
 
-2023-08-08 01:29:40 +0900  Seungha Yang <seungha@centricular.com>
+2024-04-18 10:18:05 +0200  Alexander Slobodeniuk <aslobodeniuk@fluendo.com>
 
-	* ext/hls/gsthlssink2.c:
-	  hlssink2: Always use forward slash separator
-	  g_build_filename() will insert back slash on Windows, and resulting
-	  playlist will contain media segment path with back slash if
-	  "playlist-root" property is specified
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5161>
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* tests/check/libs/d3d11device.cpp:
+	  d3d11device: protect device_lock vs device_new
+	  It seems that when D3D11CreateDevice collides in time
+	  with other D3D11 calls, in particular the proccess of
+	  creating a shader, it can corrupt the memory in the driver.
+	  D3D11 spec doesn't seem to require any thread safety from
+	  D3D11CreateDevice. Following MSDN, it is supposed to be called
+	  in the beginning of the proccess, while GStreamer calls it with each
+	  new pipeline.
+	  Such crashes in the driver were frequently reproducing on the
+	  Intel UHD 630 machine.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6702>
 
-2023-08-05 01:39:29 +1000  Jan Schmidt <jan@centricular.com>
+2024-04-16 23:08:51 +0200  Alexander Slobodeniuk <aslobodeniuk@fluendo.com>
 
-	* gst/audiolatency/gstaudiolatency.c:
-	  audiolatency: Fix event refcounting bug handling latency events
-	  Fix a refcounting bug introduced in
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5146
-	  If upstream returns FALSE when processing a latency event, it will
-	  be unreffed an extra time
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5152>
+	* tests/check/libs/d3d11device.cpp:
+	* tests/check/meson.build:
+	  tests/d3d11: add concurrency test for gstd3d11device
+	  We suspect that it's not thread safe to just create and
+	  destroy the device from any thread, particularly because
+	  of D3D11CreateDevice, that is not documented as thread-safe.
+	  While D3D11CreateDevice is usually protected from outside
+	  by the gst_d3d11_ensure_element_data, it still can cross
+	  with the Release() method of another device.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6702>
 
-2023-08-04 17:25:26 +1000  Jan Schmidt <jan@centricular.com>
+2024-04-19 17:17:08 +0900  Elliot Chen <elliot.chen@nxp.com>
 
-	* gst/audiolatency/gstaudiolatency.c:
-	  audiolatency: Forward latency query and event upstream
-	  Make sure the pipeline still configures the latency that it would configure
-	  if audiolatency was not in the pipeline.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5152>
+	* gst-libs/gst/play/gstplay.c:
+	  gstplay: query duration again if previous query failed
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6701>
 
-2023-07-19 18:08:32 -0500  Ryan Pavlik <ryan.pavlik@collabora.com>
+2024-04-17 10:58:00 +0900  Hou Qi <qi.hou@nxp.com>
 
-	* sys/androidmedia/gstjniutils.c:
-	  androidmedia: Add more null checks (of env) to JNI utilities
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5142>
+	* ext/wayland/gstwaylandsink.c:
+	  waylandsink: config buffer pool with query size when propose_allocation
+	  If propose_allocation comes before set_caps, self->video_info
+	  has not been extracted from caps and self->video_info.size is 0.
+	  It causes buffer pool fail to set config . So need to use info
+	  size got from query instead when propose_allocation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6687>
 
-2023-07-22 10:42:39 +0100  Philippe Normand <philn@igalia.com>
+2024-04-17 16:55:31 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* gst/transcode/gsttranscodebin.c:
-	  transcodebin: Fixes for upstream selectable support
-	  The upstream selectable query was not performed in all situations where we
-	  handle the stream-start event. This could potentially lead to unlinked pads
-	  between decodebin3 and encodebin later on.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5141>
+	* sys/v4l2codecs/gstv4l2codecav1dec.c:
+	* sys/v4l2codecs/gstv4l2codech264dec.c:
+	* sys/v4l2codecs/gstv4l2codech265dec.c:
+	* sys/v4l2codecs/gstv4l2codecmpeg2dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp8dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
+	  v4l2codecs: Don't unref allocation query caps
+	  The caps obtained from parsing the allocation query is borrowed and
+	  should not be unreffed. This fixes criticals assertion introduced in
+	  1.24.1.
+	  (gst-launch-1.0:242): GStreamer-CRITICAL **: 19:48:02.667:
+	  gst_mini_object_unref: assertion 'GST_MINI_OBJECT_REFCOUNT_VALUE (mini_object) > 0' failed
+	  Fixes: 5189e8b95630 ("v4l2codecs: decoders: Add DMA_DRM caps support")
+	  Closes #3462
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6682>
 
-2023-07-19 18:08:32 -0500  Ryan Pavlik <ryan.pavlik@collabora.com>
+2024-04-16 22:29:15 +1000  Jan Schmidt <jan@centricular.com>
 
-	* sys/androidmedia/gstjniutils.c:
-	  androidmedia: Add more null checks to JNI utilities
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5136>
+	* gst/dvbsubenc/gstdvbsubenc.c:
+	  dvbsubenc: fixed some memory leaks and a crash
+	  Fix leaks of internal GstBuffers, and a crash if subtitle segments end
+	  up empty.
+	  Based on a patch by Jurijs Satcs <jurijs.satcs@veset.tv>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6672>
 
-2023-07-28 14:02:22 -0500  Ryan Pavlik <ryan.pavlik@collabora.com>
+2024-04-10 20:57:16 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/androidmedia/gstamcvideodec.c:
-	  androidmedia: Fix typo
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5136>
+	* sys/mediafoundation/gstmfcapturedshow.cpp:
+	* sys/mediafoundation/gstmfcapturedshow.h:
+	* sys/mediafoundation/gstmfcapturewinrt.cpp:
+	* sys/mediafoundation/gstmfcapturewinrt.h:
+	* sys/mediafoundation/gstmfdevice.cpp:
+	* sys/mediafoundation/gstmfsourceobject.cpp:
+	* sys/mediafoundation/gstmfsourceobject.h:
+	* sys/mediafoundation/gstmfsourcereader.cpp:
+	* sys/mediafoundation/gstmfsourcereader.h:
+	  mediafoundation: Fix device enumeration
+	  Do not stop device enumerate even if a device could not be opened.
+	  Otherwise the other devices listed after the failed device will not be
+	  reported by device provider
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3460
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6647>
+
+2024-04-13 23:53:00 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12encoder.cpp:
+	  d3d12encoder: Fix buffer pool leak
+	  Add missing buffer pool release
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6637>
 
-2023-07-19 18:08:16 -0500  Ryan Pavlik <ryan.pavlik@collabora.com>
+2024-04-10 22:01:18 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/androidmedia/gst-android-hardware-camera.c:
-	  androidmedia: Clear err if we don't have an optional camera field/constant
-	  Fixes startup on devices where those fields/constants are not found.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5136>
+	* sys/d3d11/gstd3d11videosink.cpp:
+	* sys/d3d11/gstd3d11window.h:
+	* sys/d3d11/gstd3d11window_dummy.cpp:
+	  d3d11videosink: Fix rendering on keyed mutex enabled handle
+	  As of the commit 69b2e1565c5d0e8b2313d52042d73c721fed7edb,
+	  keyed mutex will be handled by the memory object.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3468
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6635>
 
-2023-07-26 16:45:18 -0500  Ryan Pavlik <ryan.pavlik@collabora.com>
+2024-04-15 10:51:03 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtc: Fix docs for create-data-channel action signal
-	  Initial line of the doc comment was incorrect, so the nicely written
-	  docs were not being extracted.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5134>
+	* tests/check/meson.build:
+	  tests: fix possible libscpp build failure in gst-plugins-bad
+	  ../subprojects/gst-plugins-bad/tests/check/libs/gstlibscpp.cc:41:
+	  fatal error: gst/mpegts/gstmpegts-enumtypes.h: No such file or directory
+	  Could only pass the needed deps to the libscpp test, but gets
+	  messier to maintain, so let's at it for consistency.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6644>
 
-2023-07-20 16:57:47 +0100  Tim-Philipp Müller <tim@centricular.com>
+2024-04-10 00:04:02 +0100  Tim-Philipp Müller <tim@centricular.com>
 
 	* meson.build:
-	  Back to development
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5082>
+	  Back to development after 1.24.2
 
-=== release 1.22.5 ===
+=== release 1.24.2 ===
 
-2023-07-20 15:22:48 +0100  Tim-Philipp Müller <tim@centricular.com>
+2024-04-09 21:48:55 +0100  Tim-Philipp Müller <tim@centricular.com>
 
 	* NEWS:
 	* RELEASE:
 	* gst-plugins-bad.doap:
 	* meson.build:
-	  Release 1.22.5
-
-2023-02-19 10:41:51 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
-
-	* gst/jpegformat/gstjpegparse.c:
-	  jpegparse: Warn only malformed data in APP data.
-	  It's only malformed data in APP when its length is less than 6 chars,
-	  because it should have at least an id string. Otherwise, if the id string
-	  is not handled, no warning is raised, only a debug message noticing it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5053>
+	  Release 1.24.2
 
-2023-02-15 19:02:35 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2024-04-06 00:41:29 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/jpegformat/gstjpegparse.c:
-	  jpegparse: Parse AVI1 tag in app0.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5053>
-
-2023-02-12 16:11:34 +0800  He Junyan <junyan.he@intel.com>
-
-	* sys/va/gstjpegdecoder.c:
-	  va: jpegdecoder: Do not check SOS state when parsing DRI marker.
-	  According to spec, the JPEG_MARKER_DRI(Restart interval definition)
-	  marker can come before the SOS marker. So we should not check the SOS
-	  state when parsing the DRI marker.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5053>
+	* ext/closedcaption/gstccconverter.c:
+	  ccconverter: Fix caps leak and remove unnecessary code
+	  The removed code does the exactly same thing as the below code
+	  except for leaking caps
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6587>
 
-2023-07-11 21:41:46 +0200  Carlos Rafael Giani <crg7475@mailbox.org>
+2024-04-09 23:35:13 +0900  Seungha Yang <seungha@centricular.com>
 
-	* meson.build:
-	  gl: Take into account viv-fb vs. viv_fb naming in meson scripts
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4959>
-
-2023-05-16 21:24:44 +1000  Matthew Waters <matthew@centricular.com>
+	* sys/qsv/gstqsvdecoder.cpp:
+	  qsvdecoder: Release too old frames
+	  Release too old frames manually.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3163
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6586>
+
+2024-04-02 18:20:43 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwriteoverlayobject.cpp:
+	  dwrite: Fix crash on device update
+	  Selected blend mode should not be cleared on device update
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6521>
 
-	* meson.build:
-	  gl: provide a pkg-config/gir file for the viv-fb backend
-	  Required to be able to generate coherent bindings for window system
-	  specific APIs due to limitations in gobject-introspection.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4959>
+2024-04-05 21:58:51 -0400  Daniel Morin <daniel.morin@collabora.com>
 
-2023-03-26 16:40:28 +0100  Tim-Philipp Müller <tim@centricular.com>
+	* gst-libs/gst/codecparsers/gsth264parser.h:
+	  h264parser: maintain API changes
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6562>
 
-	* ext/teletextdec/gstteletextdec.c:
-	* sys/winks/gstksvideodevice.c:
-	* sys/winks/kshelpers.c:
-	* tools/gst-app-maker:
-	  taglist, plugins: fix compiler warnings with GLib >= 2.76
-	  Fix compiler warnings about not using the return value when
-	  freeing the GString segment with g_string_free(.., FALSE):
-	  ignoring return value of ‘g_string_free_and_steal’ declared with attribute ‘warn_unused_result’
-	  which we get with newer GLib versions. These were all harmless.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5015>
+2024-04-04 09:38:36 -0400  Daniel Morin <daniel.morin@collabora.com>
 
-2023-06-27 05:09:49 +0900  Seungha Yang <seungha@centricular.com>
+	* tests/check/elements/h264parse.c:
+	  Revert "h264parse: test - AU align with SEI between frame slices"
+	  This reverts commit 533f814fd9a0eff341bb8f400fff82e5f0c4c313.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6562>
 
-	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
-	* tests/check/libs/d3d11memory.c:
-	* tests/check/meson.build:
-	  d3d11bufferpool: Fix heavy CPU usage in case of fixed-size pool
-	  There's no reason to release GstMemory manually at all.
-	  If we do release GstMemory, corresponding GstBuffer will be
-	  discarded by GstBufferPool baseclass because the size is changed
-	  to zero.
-	  Actual cause of heavy CPU usage in case of fixed-size pool
-	  (i.e., decoder output buffer pool) and if we remove GstMemory from
-	  GstBuffer is that GstBufferPool baseclass is doing busy wait in acquire_buffer()
-	  for some reason. That needs to be investigated though, discarding
-	  and re-alloc every GstBuffer is not ideal already.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4943>
+2024-04-04 09:38:16 -0400  Daniel Morin <daniel.morin@collabora.com>
 
-2023-07-10 12:03:25 +0100  Philippe Normand <philn@igalia.com>
+	* gst-libs/gst/codecparsers/gsth264parser.h:
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gsth264parse.h:
+	  Revert "h264parse: Improved AU boundary detection"
+	  This reverts commit 49f200cb549d43067e7c6eee332cdf757a38d82a.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6562>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: Prevent critical warning when creating an additional data channel
-	  The max_channels value wasn't clamped to 65534 in all situations.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5012>
+2024-04-04 09:38:13 -0400  Daniel Morin <daniel.morin@collabora.com>
 
-2023-06-30 18:30:46 +0100  Philippe Normand <philn@igalia.com>
+	* gst/videoparsers/gsth264parse.c:
+	  Revert "h264parse: Remove dead code"
+	  This reverts commit 141cd3871592292a8a6c81c1e018610a82ecaa88.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6562>
 
-	* ext/webrtc/gstwebrtcstats.c:
-	  webrtcstats: Properly report IceCandidate type
-	  strcmp returns a positive value if s1 is greater than s2, while we actually
-	  needed to check equality here.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4957>
+2024-04-04 09:38:08 -0400  Daniel Morin <daniel.morin@collabora.com>
 
-2023-06-20 19:10:38 +0100  Tim-Philipp Müller <tim@centricular.com>
+	* gst/videoparsers/gsth264parse.c:
+	  Revert "h264parse: Fix AU collection"
+	  This reverts commit 495390f63a710559b149e476d3289dc2f37be7f8.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6562>
 
-	* meson.build:
-	  Back to development
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4907>
+2024-04-04 09:37:47 -0400  Daniel Morin <daniel.morin@collabora.com>
 
-=== release 1.22.4 ===
+	* gst/videoparsers/gsth264parse.c:
+	  Revert "h264parse: Remove un-needed check on SPS state"
+	  This reverts commit 73dedf9a51e70868f6aa029b968f8c7ef6af530e.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6562>
 
-2023-06-20 17:42:25 +0100  Tim-Philipp Müller <tim@centricular.com>
+2024-04-04 09:37:40 -0400  Daniel Morin <daniel.morin@collabora.com>
 
-	* NEWS:
-	* RELEASE:
-	* gst-plugins-bad.doap:
-	* meson.build:
-	  Release 1.22.4
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gsth264parse.h:
+	  Revert "h264parse: use AUD to detect first VCL NAL"
+	  This reverts commit 90a3b63eed22d2737dbe8e33ee931e897ccfd128.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6562>
 
-2023-06-13 14:25:04 +0300  Sebastian Dröge <sebastian@centricular.com>
+2024-04-04 09:36:02 -0400  Daniel Morin <daniel.morin@collabora.com>
 
-	* gst/dvdspu/gstspu-pgs.c:
-	  dvdspu: Avoid integer overflow when checking if enough data is available
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4899>
+	* gst/videoparsers/gsth264parse.c:
+	  Revert "h264parse: correct NAL mode backlog processing"
+	  This reverts commit b2098849dc21c3615cb15b1e26bbbe77feb76476.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6562>
 
-2023-06-13 14:23:47 +0300  Sebastian Dröge <sebastian@centricular.com>
+2024-03-29 15:37:55 +0100  Edward Hervey <edward@centricular.com>
 
-	* gst/dvdspu/gstspu-pgs.c:
-	  dvdspu: Make sure enough data is allocated for the available data
-	  If the size read from the stream is smaller than the currently available
-	  data then the size is bogus and the data should simply be discarded.
-	  Fixes ZDI-CAN-20994
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2660
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4899>
+	* gst/videoparsers/gstvideoparseutils.c:
+	  videoparsers: Demote CC warning message
+	  Another warning message which isn't fatal and therefore should just be a DEBUG
+	  line.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6555>
+
+2024-03-20 13:57:56 -0500  Elizabeth Figura <zfigura@codeweavers.com>
+
+	* sys/applemedia/atdec.c:
+	* sys/applemedia/atdec.h:
+	  atdec: Handle channel counts greater than 2
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6546>
+
+2024-02-20 13:20:12 -0600  Elizabeth Figura <zfigura@codeweavers.com>
+
+	* sys/applemedia/atdec.c:
+	  atdec: Use gst_audio_decoder_set_output_caps() directly
+	  The code currently sets the same caps in two different ways, and neither of them correctly handle the channel mask.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6546>
 
-2023-04-18 09:59:36 +0200  Andoni Morales Alastruey <amorales@fluendo.com>
+2024-03-30 15:57:36 +0100  Robert Mader <robert.mader@posteo.de>
 
-	* sys/applemedia/vtenc.c:
-	* sys/applemedia/vtenc.h:
-	  vtenc: remove duplicated framerate and size variables
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4888>
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: turn some bus warnings into object ones
+	  For some cameras `gst_jpeg_parse_app0()` fails on a invalid segment.
+	  While this is likely a driver or firmware bug that should be addressed
+	  accordingly, it's not fatal and likely does not deserve a bus message on
+	  every frame, flooding journals.
+	  Turn down the volume of the warnings by turning them into object
+	  warnings. If we conclude that in some cases we'd still want bus
+	  warnings, they can be done more fine-grained in the
+	  `gst_jpeg_parse_appX()` functions.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6539>
 
-2023-03-30 15:38:22 +0200  Andoni Morales Alastruey <amorales@fluendo.com>
+2024-04-02 16:23:31 +0100  Chris Spencer <spencercw@gmail.com>
 
-	* sys/applemedia/meson.build:
-	* sys/applemedia/vtdec.h:
-	* sys/applemedia/vtenc.c:
-	* sys/applemedia/vtenc.h:
-	* tests/validate/meson.build:
-	* tests/validate/vtenc/vtenc_h264.validatetest:
-	* tests/validate/vtenc/vtenc_h264/flow-expectations/log-enc-src-expected:
-	* tests/validate/vtenc/vtenc_h264_b_frames.validatetest:
-	* tests/validate/vtenc/vtenc_h264_b_frames/flow-expectations/log-enc-src-expected:
-	* tests/validate/vtenc/vtenc_h265.validatetest:
-	* tests/validate/vtenc/vtenc_h265/flow-expectations/log-enc-src-expected:
-	* tests/validate/vtenc/vtenc_h265_b_frames.validatetest:
-	* tests/validate/vtenc/vtenc_h265_b_frames/flow-expectations/log-enc-src-expected:
-	  vtenc: apply DTS offset to ensure DTS <= PTS
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4888>
+	* gst-libs/gst/vulkan/gstvkbufferpool.c:
+	* gst-libs/gst/vulkan/gstvkbufferpool.h:
+	  vkbufferpool: correct usage flags type
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6528>
 
-2023-03-23 20:04:49 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2024-03-18 20:50:56 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/videoparsers/gsth265parse.c:
-	  h265parse: Don't override upstream framerate
-	  The framerate should only be replaced (and corrected for alternating field)
-	  when it is parsed from the bitstream. Otherwise, the upstream framerate
-	  from caps should be trusted and assumed correct.
-	  Related to gst-plugins-bad!2020
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4352>
+	* ext/vulkan/vkh265dec.c:
+	  vkh265dec: add missing VPS parameter
+	  and fix coded size
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6534>
 
-2023-03-23 20:02:16 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2024-03-18 20:00:11 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/videoparsers/gsth265parse.c:
-	* gst/videoparsers/gsth265parse.h:
-	  h265parse: Rename parsed_framerate to framerate_from_caps
-	  That meaning of parsed_framerate is ambigious, it is set whenever the
-	  framerate has been parsed from caps, which can be confused with being
-	  parsed from the bitstream. Rename this as framerate_from_caps.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4352>
+	* ext/vulkan/vkh264dec.c:
+	* ext/vulkan/vkh265dec.c:
+	  vkh26xdec: implement close() vmethod
+	  Since a validation layer error is signaled at EOS because it's required to wait
+	  for the last frame to be processed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6534>
 
-2023-02-15 13:10:39 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2024-04-03 16:44:18 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/videoparsers/gsth265parse.c:
-	  h265parse: Fix to check returned value
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4352>
+	* ext/vulkan/vkh264dec.c:
+	* ext/vulkan/vkh265dec.c:
+	  vkh26xdec: remove unused variables
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6534>
 
-2023-05-11 15:28:35 +0200  Michael Olbrich <m.olbrich@pengutronix.de>
+2024-03-18 19:42:50 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/sdp/gstsdpdemux.c:
-	  sdpdemux: ensure that only one srcpad is created per stream
-	  If two senders use the same multicast IP and port then new_session_pad()
-	  may try to add a srcpad to the same stream twice.
-	  stream->srcpad is updated but gst_element_add_pad() fails the second
-	  time. As a result stream->srcpad points to a deleted object and
-	  access in gst_sdp_demux_stream_free() fails with a segfault.
-	  Just ignore the second pad. Nothing useful can be done with it anyway.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4873>
+	* ext/vulkan/vkh265dec.c:
+	  vkh265dec: fix resource info structure when layered DPB
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6534>
 
-2023-06-11 22:22:36 +0200  Marek Vasut <marex@denx.de>
+2024-04-02 18:18:14 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/kms/gstkmssink.c:
-	  kmssink: Add ST STM32 LTDC auto-detection
-	  Add STM32 LTDC controller into list of auto-detected modules.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4872>
+	* sys/msdk/gstmsdkcontext.c:
+	  msdk: sink context reference
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6527>
 
-2023-06-11 22:22:25 +0200  Marek Vasut <marex@denx.de>
+2024-04-02 18:02:26 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/kms/gstkmssink.c:
-	  kmssink: Add NXP i.MX8M Plus LCDIFv3 auto-detection
-	  Add i.MX8M Plus LCDIFv3 controller into list of auto-detected modules.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4872>
+	* ext/gtk/gstgtkwaylandsink.c:
+	  gtk: sink reference of internal wayland pool
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6527>
 
-2023-04-28 22:25:11 +0800  He Junyan <junyan.he@intel.com>
+2024-04-02 18:00:40 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvah265enc.c:
-	  va: h265enc: map the mbbrc to correct enum value in get_property()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4870>
+	* ext/wayland/gstwaylandsink.c:
+	  wayland: sink reference to internal pool
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6527>
 
-2023-04-28 22:26:34 +0800  He Junyan <junyan.he@intel.com>
+2024-04-02 14:46:32 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvah264enc.c:
-	  va: h264enc: map the mbbrc to correct enum value in get_property()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4870>
+	* ext/dash/gstmpdadaptationsetnode.c:
+	* ext/dash/gstmpdbaseurlnode.c:
+	* ext/dash/gstmpdclient.c:
+	* ext/dash/gstmpdcontentcomponentnode.c:
+	* ext/dash/gstmpddescriptortypenode.c:
+	* ext/dash/gstmpdlocationnode.c:
+	* ext/dash/gstmpdmetricsnode.c:
+	* ext/dash/gstmpdmetricsrangenode.c:
+	* ext/dash/gstmpdperiodnode.c:
+	* ext/dash/gstmpdprograminformationnode.c:
+	* ext/dash/gstmpdreportingnode.c:
+	* ext/dash/gstmpdrepresentationnode.c:
+	* ext/dash/gstmpdrootnode.c:
+	* ext/dash/gstmpdsegmentbasenode.c:
+	* ext/dash/gstmpdsegmentlistnode.c:
+	* ext/dash/gstmpdsegmenttemplatenode.c:
+	* ext/dash/gstmpdsegmenttimelinenode.c:
+	* ext/dash/gstmpdsegmenturlnode.c:
+	* ext/dash/gstmpdsnode.c:
+	* ext/dash/gstmpdsubrepresentationnode.c:
+	* ext/dash/gstmpdsubsetnode.c:
+	* ext/dash/gstmpdurltypenode.c:
+	* ext/dash/gstmpdutctimingnode.c:
+	  dash: sink references of all MDP objects
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6527>
 
-2023-06-14 10:08:51 +0200  François Laignel <francois@centricular.com>
+2024-03-15 19:03:58 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* ext/srtp/gstsrtpdec.c:
-	  srtpdec: fix Got data flow before segment event
-	  A race condition can occur in `srtpdec` during the READY -> NULL transition:
-	  an RTCP buffer can make its way to `gst_srtp_dec_chain` while the element is
-	  partially stopped, resulting in the following critical warning:
-	  > Got data flow before segment event
-	  The problematic sequence is the following:
-	  1. An RTCP buffer is being handled by the chain function for the
-	  `rtcp_sinkpad`. Since, this is the first buffer, we try pushing the sticky
-	  events to `rtcp_srcpad`.
-	  2. At the same moment, the element is being transitioned from PAUSED to READY.
-	  3. While checking and pushing the sticky events for `rtcp_srcpad`, we reach the
-	  Segment event. For this, we try to get it from the "otherpad", in this case
-	  `rtp_srcpad`. In the problematic case, `rtp_srcpad` has already been
-	  deactivated so its sticky events have been cleared. We won't be pushing any
-	  Segment event to `rtcp_srcpad`.
-	  4. We return to the chain function for `rtcp_sinkpad` and try pushing the
-	  buffer to `rtcp_srcpad` for which deactivation hasn't started yet, hence the
-	  "Got data flow before segment event".
-	  This commit:
-	  - Adds a boolean return value to `gst_srtp_dec_push_early_events`: in case the
-	  Segment event can't be retrieved, `gst_srtp_dec_chain` can return  an error
-	  instead of calling `gst_pad_push`.
-	  - Replaces the obsolete `gst_pad_set_caps` with `gst_pad_push_event`. The
-	  additional preconditions checked by previous function are guaranteed here
-	  since we push a fixed Caps which was built in the same function.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4860>
+	* sys/va/gstvadecoder.c:
+	* sys/va/gstvaencoder.c:
+	* sys/va/gstvafilter.c:
+	  va: sink reference at instantiation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6527>
 
-2023-06-15 11:11:39 +0200  François Laignel <francois@centricular.com>
+2023-12-05 12:24:01 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* ext/srtp/gstsrtpdec.c:
-	  srtpdec: backport for fix assertion 'parent->numsinkpads <= 1' failed
-	  Commit 96450f4c uses the new function `gst_element_decorate_stream_id` which
-	  was introduced by 39633967 in 1.23.
-	  This commit backports 96450f4c with a simplified version of
-	  `gst_element_decorate_stream_id_internal` as a private srtpdec function.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4860>
+	* gst-libs/gst/vulkan/gstvkoperation.c:
+	* gst-libs/gst/vulkan/gstvktrash.c:
+	  vulkan: sink references at instantiation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6527>
 
-2023-06-15 01:36:25 +0900  Seungha Yang <seungha@centricular.com>
+2024-04-02 19:00:35 +0200  eri <eri@inventati.org>
 
-	* sys/d3dvideosink/d3dvideosink.c:
-	  d3dvideosink: Fix navigation event leak
-	  Fixing regression introduced in 6c2f6c3bd4dd525eb02c6d7000e84b76663d3daf
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4868>
+	* gst-libs/gst/play/gstplay.c:
+	  play: Update `video_snapshot` to support playbin3
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6526>
 
-2023-06-13 01:29:14 +0100  Tim-Philipp Müller <tim@centricular.com>
+2024-04-02 15:57:58 +0200  Guillaume Desmottes <guillaume.desmottes@onestream.live>
 
-	* gst/asfmux/gstasfobjects.c:
-	  asfmux: fix potentially unaligned write on 32-bit ARM
-	  Fixes #2665
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4855>
+	* tests/examples/webrtc/webrtcswap.c:
+	  examples: set perfect-timestamp=true on opusenc
+	  Fix audio streaming on Chrome, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1524
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6523>
 
-2023-06-01 15:16:47 +0300  Sebastian Dröge <sebastian@centricular.com>
+2024-03-25 23:33:59 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/decklink/gstdecklink.h:
-	  decklink: Implement Windows string conversion with common API between MinGW and MSVC
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4786>
+	* sys/va/gstvaav1enc.c:
+	  va: av1enc: Avoid reopen encoder or renegotiate
+	  If parameters remain similar enough to avoid either encoder reopening
+	  or downstream renegotiation, avoid it.
+	  This is going to be useful for dynamic parameters setting.
+	  To check if the stream parameters changed, so the internal encoder has
+	  to be closed and opened again, are required two steps:
+	  1. If input caps, format, profile, chroma or rate control mode have changed.
+	  2. If any of the calculated variables and element properties have changed.
+	  Later on, only if the output caps also changed, the pipeline
+	  is renegotiated.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6519>
 
-2023-06-01 15:17:26 +0300  Sebastian Dröge <sebastian@centricular.com>
+2024-04-01 01:00:53 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/decklink/gstdecklink.h:
-	  decklink: Add some newlines in long defines
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4786>
+	* gst-libs/gst/d3d11/meson.build:
+	  meson: d3d11: Add support for MinGW DirectXMath package
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3428
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6503>
+
+2024-03-14 23:17:32 +0800  He Junyan <junyan.he@intel.com>
+
+	* sys/va/gstvaav1enc.c:
+	  va: av1enc: Improve the LAST reference assignment
+	  The last frame which has the smallest diff should be consider as
+	  the first choice rather than the golden frame. Especially when only
+	  one reference available, this way can improve the BD rate about 5
+	  percentage.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6507>
+
+2024-03-15 15:48:34 +0800  He Junyan <junyan.he@intel.com>
+
+	* sys/va/gstvaav1enc.c:
+	  va: av1enc: Fix the reference number setting bug
+	  The current way will let the total reference number surplus the
+	  reference number set by the "ref-frames" property.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6507>
 
-2023-05-31 23:44:42 +0300  Maksym Khomenko <maksym.khomenko@skelia.partners>
+2024-03-28 21:59:02 +0100  Alexander Slobodeniuk <aslobodeniuk@fluendo.com>
 
-	* sys/decklink/gstdecklink.h:
-	  decklink: Calculate string size before malloc
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4786>
+	* sys/d3d11/gstd3d11videosink.cpp:
+	  d3d11videosink: disconnect signals before releasing the window
+	  It might happen that the key event arrives when the d3d11videosink
+	  is stopping. In case of GstD3D11WindowWin32 it can raise a
+	  navigation event even when the sink is already freed, because the
+	  window object's refcount may reach 0 in the window thread. In
+	  other words sometimes the GstD3D11WindowWin32 lives few ms more
+	  then the GstD3D11VideoSink, because it's freed asynchronously.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6492>
 
-2023-05-30 15:27:21 +0300  Sebastian Dröge <sebastian@centricular.com>
+2024-03-29 19:34:32 +0100  Ruben Gonzalez <rgonzalez@fluendo.com>
 
-	* sys/decklink/gstdecklink.h:
-	  decklink: Use the macOS version of the SDK on macOS and not the Linux one
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4786>
+	* ext/wpe/gstwpe.cpp:
+	  wpe: avoid crash with G_DEBUG=fatal_criticals and static build
+	  No plugin filenames if static build.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6488>
+
+2024-03-22 12:57:33 +0100  Ruben Gonzalez <rgonzalez@fluendo.com>
+
+	* gst/rist/gstristsrc.c:
+	  ristsrc: Clean caps instead of unref
+	  Fix issue unrefering null caps. Better solution than
+	  ```
+	  if (src->caps)
+	  gst_caps_unref (src->caps);
+	  ```
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6485>
 
-2023-05-30 13:23:28 +0300  Sebastian Dröge <sebastian@centricular.com>
+2024-03-28 20:02:04 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/decklink/gstdecklink.h:
-	  decklink: Free SDK strings after usage on Linux
-	  While they're const char* they still need to be freed like on Windows
-	  and macOS and would be leaked otherwise.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4786>
+	* gst-libs/gst/d3d11/meson.build:
+	  meson: d3d11: Disable library build if DirectXMath header was not found
+	  DirectXMath header library is a hard dependency
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6472>
 
-2023-05-30 13:22:44 +0300  Sebastian Dröge <sebastian@centricular.com>
+2024-03-27 13:53:21 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* sys/decklink/gstdecklink.h:
-	  decklink: Correctly handle SDK strings on macOS
-	  They're CFStringRef* and not plain NUL-terminated char* C strings.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4786>
+	* sys/v4l2codecs/gstv4l2codecalphadecodebin.c:
+	  v4l2codecs: alphadecoder: Explicitly pass 64 bit integers as such through varargs
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6469>
 
-2023-05-26 13:26:42 +0100  Colin Kinloch <colin.kinloch@collabora.com>
+2024-03-27 16:17:44 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* ext/gtk/gstgtkwaylandsink.c:
-	* gst-libs/gst/wayland/gstwlwindow.c:
-	  waylandsink: Emit "map" signal boarder surface is ready
-	  This allows gtkwaylandsink to queue a draw of its gtk widget at the
-	  correct time, avoiding a race.
-	  Signed-off-by: Colin Kinloch <colin.kinloch@collabora.com>
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4754>
+	* gst/codecalpha/gstalphadecodebin.c:
+	  alphadecodebin: Explicitly pass 64 bit integers as such through varargs
+	  Maybe fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3422
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6469>
 
-2023-05-25 17:02:24 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2024-03-22 16:14:24 +0100  Piotr Brzeziński <piotr@centricular.com>
 
-	* ext/fdkaac/gstfdkaacdec.c:
-	  fdkaacdec: Support up to 5 rear channels
-	  The `switch (n_rear)` supports up to 5 rear channels, but our channel
-	  set only had space for 3. Size the set properly to fix this.
-	  This didn't actually cause any memory unsafety as `PUSH_CHAN` would stop
-	  incrementing `n_rear` if the channel set is already full.
-	  Thanks to @alatiera for noticing this.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4740>
+	* sys/applemedia/vtdec.c:
+	  vtdec: Fix caps criticals during negotiation
+	  Calling gst_pad_peer_query_caps() without a filter can give us EMPTY caps, whereas all the code below
+	  assumes that's not the case. Replacing query+intersect with a filtered query ensures we always get a subset
+	  of the template caps back.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6454>
 
-2023-05-24 22:12:51 +0900  Seungha Yang <seungha@centricular.com>
+2024-03-26 15:32:24 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	  d3d11videosink: Fix error on pause and play
-	  The show_frame() can be called without prepare() call on paused to
-	  playing state change. Thus the prepared buffer should not be cleared
-	  on show_frame()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4714>
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: avi1 tag can be progressive
+	  AVI1 tag in APP0 is trivalue: 0 not interleaved, 1 odd, 2 even.
+	  So if avi1 is zero then the frame is progressive.
+	  Also, this patch adds a couple log messages.
+	  Fixes: #3414
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6453>
 
-2023-05-18 09:27:29 -0400  Thibault Saunier <tsaunier@igalia.com>
+2024-03-26 12:46:02 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst/debugutils/gsttestsrcbin.c:
-	  testsrcbin: Remove spurious caps unref
-	  Caps are cleared at the end of the function
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2575
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4685>
+	* tests/check/libs/gstlibscpp.cc:
+	* tests/check/meson.build:
+	  tests: add check to make sure -bad lib headers are C++ compiler clean
+	  Only non-internal libs without external deps for now.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6448>
 
-2023-05-19 12:36:19 +0100  Tim-Philipp Müller <tim@centricular.com>
+2024-03-22 01:38:06 +0100  Tim-Philipp Müller <tim@centricular.com>
 
 	* meson.build:
 	  Back to development
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4679>
 
-=== release 1.22.3 ===
+=== release 1.24.1 ===
 
-2023-05-19 09:23:19 +0100  Tim-Philipp Müller <tim@centricular.com>
+2024-03-21 21:47:53 +0100  Tim-Philipp Müller <tim@centricular.com>
 
 	* NEWS:
-	* README.md:
 	* RELEASE:
 	* gst-plugins-bad.doap:
 	* meson.build:
-	  Release 1.22.3
-
-2023-04-20 16:41:11 +0800  Haihua Hu <jared.hu@nxp.com>
-
-	* gst-libs/gst/play/gstplay.c:
-	  gstplay: fix critical log when enable playbin3
-	  when play rtsp stream with playbin3 enabled, there are some critical logs:
-	  g_object_get_is_valid_property: object class 'GstPlayBin3' has no property named 'n-video'
-	  g_object_get_is_valid_property: object class 'GstPlayBin3' has no property named 'n-audio'
-	  g_object_get_is_valid_property: object class 'GstPlayBin3' has no property named 'n-text'
-	  self->collection could be NULL when READY->PAUSED if the pipeline
-	  is live, then it will fallback to query playbin2's property,
-	  we can call gst_play_streams_info_create_from_collection
-	  directly, it will check self->collection internal.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4666>
+	  Release 1.24.1
 
-2023-03-02 18:09:54 +0800  Elliot Chen <elliot.chen@nxp.com>
+2024-03-18 18:46:17 +0100  Piotr Brzeziński <piotr@centricular.com>
 
-	* gst-libs/gst/play/gstplay.c:
-	  gstplay: avoid getting property of playbin2 if subtitle_sid is null
-	  There is a probability of getting "current-text" property
-	  when play with playbin3, and this property is available
-	  only in playbin2.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4661>
+	* sys/applemedia/vtdec.c:
+	  vtdec: Ignore output loop errors in drain() if we're flushing
+	  In an early non-linked scenario, this was causing a ton of criticals about the queue array,
+	  because the output callback would still fire for leftover frames that were still being processed by VT
+	  at the time the output loop stopped. This makes sure they're flushed correctly as well.
+	  Also renames gst_vtdec_loop to gst_vtdec_output_loop for consistency with related functions.
+	  wip
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6411>
 
-2023-05-16 22:56:15 +0900  Seungha Yang <seungha@centricular.com>
+2024-03-18 18:38:41 +0100  Piotr Brzeziński <piotr@centricular.com>
 
-	* sys/d3d11/gstd3d11convert.cpp:
-	  d3d11convert: Fix for runtime property update
-	  Every setup happens in set_caps() method but basetransform will not
-	  call the set_caps() if in/out caps were not changed
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4652>
+	* sys/applemedia/vtdec.c:
+	  vtdec: Fix a deadlock during ProRes playback
+	  Sometimes a call to negotiate (and thus drain) can happen from the output loop
+	  (via finish_frame()), which will tell VT to output all internal frames, but that won't succeed
+	  if we happen to decide to wait for the queue to empty (because the loop is waiting for draining to finish and
+	  will not make space in the queue!). This commit adds an override for the queue size limit if we're draining/flushing.
+	  This bug could happen for any formats, but was especially obvious for ProRes, which has dpb_size of 0.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6411>
 
-2023-03-17 20:44:30 +0100  Aleksandr Slobodeniuk <aslobodeniuk@fluendo.com>
+2024-03-06 15:39:33 -0500  Ruijing Dong <ruijing.dong@amd.com>
 
-	* sys/d3d11/gstd3d11convert.cpp:
-	  d3d11convert: protect 'add-borders' with mutex
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4652>
+	* sys/va/gstvaencoder.c:
+	* sys/va/gstvaencoder.h:
+	* sys/va/gstvah265enc.c:
+	  va: enc : checking surface alignment attribute
+	  Apply surface alignment attribute when availalbe,
+	  also fix frame cropping issue for va h265 encoder.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6399>
 
-2023-05-15 13:47:16 +0200  Carlos Rafael Giani <crg7475@mailbox.org>
+2024-03-16 19:32:19 +0100  Mark Nauwelaerts <mnauw@users.sourceforge.net>
 
-	* sys/bluez/gstavdtputil.c:
-	  avdtputil: Use int instead of int range for fixed bitpool values
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1698
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4655>
+	* gst/dvdspu/gstspu-pgs.c:
+	  dvdspu: avoid null dereference
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6391>
 
-2023-05-16 16:17:05 +0100  Tim-Philipp Müller <tim@centricular.com>
+2024-03-17 11:18:37 +0000  Philippe Normand <philn@igalia.com>
 
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  Revert "webrtc/nice: support consent-freshness RFC7675"
-	  This reverts commit 0161687505156f54ff38b976668804ac2763a863.
-	  This causes problems when the connection is congested because
-	  libnice uses a too agressive timeout contrary to the spec, so
-	  it's easy for consent to lapse and streaming to stop if there's
-	  packet loss.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4649>
+	* gst-libs/gst/play/gstplay.c:
+	  play: Fix a critical warning in error callback
+	  `on_error()` can be called with a NULL details structure, so in that situation
+	  the `gst_structure_copy()` would raise a critical warning. Create an empty
+	  structure instead of attempting to copy a NULL one.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6387>
+
+2024-03-16 21:25:38 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12device.cpp:
+	  d3d12: Fix SDK debug layer activation
+	  Debug layer must be enabled before creating device. Otherwise
+	  already opened devices before the activation will be removed
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6383>
 
-2023-05-10 12:00:15 +0200  Johan Sternerup <johast@axis.com>
+2024-01-06 13:07:16 +0100  Robert Mader <robert.mader@collabora.com>
 
-	* ext/sctp/gstsctpenc.c:
-	  sctpenc: Fix potential shutdown deadlock
-	  When transitioning from state PAUSED to READY, the sctpenc element
-	  could previously be stuck in an endless loop trying to resend data
-	  in case the underlying sctp stream was in the process of
-	  resetting. usrsctp_sendv() would repeatedly return EAGAIN with the
-	  result that 0 bytes were sent and then sctpenc would retry forever.
-	  To bring sctpenc out of the resend loop we just need to inform the
-	  sink pad that it is flushing, which is already done for the associated
-	  data queue, but we also need to set the bools associated with the
-	  sinkpads that are used as the loop criterion.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4636>
+	* sys/v4l2codecs/gstv4l2codecav1dec.c:
+	* sys/v4l2codecs/gstv4l2codech264dec.c:
+	* sys/v4l2codecs/gstv4l2codech265dec.c:
+	* sys/v4l2codecs/gstv4l2codecmpeg2dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp8dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
+	* sys/v4l2codecs/gstv4l2decoder.c:
+	* sys/v4l2codecs/gstv4l2decoder.h:
+	  v4l2codecs: decoders: Add DMA_DRM caps support
+	  In order to simplify caps negotiations for clients and, notably, be more
+	  compatible with va* decoders.
+	  Crucially this allows clients to know ahead of time whether buffers will
+	  actually be DMABufs.
+	  Similar to GstVaBaseDec we only announce system memory caps if the peer
+	  has ANY caps. Further more, and again like va decoders, we fail in
+	  `decide_allocation()` if DMA_DRM caps are used without VideoMeta.
+	  Apart from buggy peers this can happen e.g. when a peer with ANY caps
+	  is used in combination with caps filters.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6376>
 
-2023-04-18 11:21:05 +0200  Daniel Moberg <daniemob@axis.com>
+2024-02-17 06:01:41 +0100  Robert Mader <robert.mader@collabora.com>
 
-	* ext/webrtc/webrtcdatachannel.c:
-	  webrtc: do not tear down data channel before data is flushed
-	  Current implementation can in some cases detect
-	  that all data is sent but in reality it is not,
-	  leading to a push to an unlinked pad.
-	  This is a race between the probe used to track data sent and a
-	  call to close.
-	  This patch sends an EOS before starting the close procedure
-	  and then waits for the EOS event to come through to the
-	  src pad before commencing with tear down.
-	  This ensures that any queued data before EOS is flushed.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4633>
+	* sys/v4l2codecs/gstv4l2codecav1dec.c:
+	* sys/v4l2codecs/gstv4l2codech264dec.c:
+	* sys/v4l2codecs/gstv4l2codech265dec.c:
+	* sys/v4l2codecs/gstv4l2codecmpeg2dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp8dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
+	* sys/v4l2codecs/gstv4l2decoder.c:
+	* sys/v4l2codecs/gstv4l2decoder.h:
+	  v4l2codecs: decoders: Introduce and use set_output_state helper class
+	  Allowing us to avoid some code duplication. This will become more
+	  important with upcoming changes to caps generation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6376>
 
-2023-04-04 21:50:01 +1000  Jan Schmidt <jan@centricular.com>
+2024-02-17 05:43:23 +0100  Robert Mader <robert.mader@collabora.com>
 
-	* gst/mpegdemux/gstmpegdemux.c:
-	* gst/mpegdemux/gstmpegdemux.h:
-	  mpegpsdemux: Rework gap sending
-	  Take the gap logic from mpegtsdemux, and don't
-	  send gap events on a stream that's outputting buffers with
-	  no timestamps. Time isn't advancing, but the stream has
-	  buffers - so it's not sparse.
-	  Fixes #2374
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4623>
+	* sys/v4l2codecs/gstv4l2decoder.c:
+	* sys/v4l2codecs/gstv4l2decoder.h:
+	  v4l2codecs: decoder: Clean up select_src_format()
+	  Most importantly rely on video info helpers instead of manual parsing
+	  of caps, which will allow us to use additional helpers in the future.
+	  While on it, tighen the check for supported formats - failing that
+	  indicates a bug in caps negotiation - and make some style changes.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6376>
 
-2023-03-05 20:15:19 +0900  Seungha Yang <seungha@centricular.com>
+2024-02-17 04:20:16 +0100  Robert Mader <robert.mader@collabora.com>
 
-	* sys/va/gstvavp8dec.c:
-	  vavp8dec: Fix return type of decode_picture()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4614>
+	* sys/v4l2codecs/gstv4l2decoder.c:
+	  v4l2codecs: decoder: Generalize size enumeration caps
+	  By reducing the generated caps to the minimal number of fields and
+	  using intersections instead of merges. This will allow us to reuse the
+	  result in the future.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6376>
 
-2023-03-05 20:14:06 +0900  Seungha Yang <seungha@centricular.com>
+2024-02-16 22:48:17 +0100  Robert Mader <robert.mader@collabora.com>
 
-	* sys/va/gstjpegdecoder.h:
-	  vajpegdec: Hide gst_jpeg_decoder_get_type() symbol
-	  It's not a public symbol yet
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4614>
+	* sys/v4l2codecs/gstv4l2codecav1dec.c:
+	* sys/v4l2codecs/gstv4l2codech264dec.c:
+	* sys/v4l2codecs/gstv4l2codech265dec.c:
+	* sys/v4l2codecs/gstv4l2codecmpeg2dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp8dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
+	* sys/v4l2codecs/gstv4l2decoder.c:
+	* sys/v4l2codecs/gstv4l2decoder.h:
+	  v4l2codecs: decoders: Use src template for negotiation filter
+	  This ensures we don't create filter caps that are not supported by the
+	  individual codec implementations, as well as that the resulting caps
+	  have the required fields so they can be turned into a GstVideoFormat.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6376>
+
+2024-03-14 20:25:52 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/asio/gstasiosink.cpp:
+	* sys/asio/gstasiosrc.cpp:
+	  asio: Fix {input,output}-channels property handling
+	  Fixing regression introduced by the commit 06dc931b52fbd858640506616f5a1a928792b27c
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6372>
 
-2023-03-05 20:01:44 +0900  Seungha Yang <seungha@centricular.com>
+2024-03-14 00:49:45 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvabaseenc.h:
-	  vabaseenc: Fix return type of encode_frame vfunc
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4614>
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	  d3d11device: Fix adapter LUID comparison in wrapped device mode
+	  Fix integer type mismatching
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3382
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6364>
+
+2024-03-13 00:42:16 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12device.cpp:
+	  d3d12device: Fix IDXGIFactory2 leak
+	  factory passed to gst_d3d12_device_find_adapter() method is valid
+	  handle already
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6353>
 
-2023-03-05 19:53:37 +0900  Seungha Yang <seungha@centricular.com>
+2024-03-11 12:42:48 +0100  Antonio Larrosa <alarrosa@suse.com>
 
-	* sys/va/gstvaav1dec.c:
-	* sys/va/gstvafilter.c:
+	* sys/va/gstvaav1enc.c:
 	* sys/va/gstvah264enc.c:
 	* sys/va/gstvah265enc.c:
-	* sys/va/gstvavp8dec.c:
-	* sys/va/gstvavpp.c:
-	  va: Fix struct empty initialization syntax
-	  "struct Foo bar; bar = {};" is not a valid syntax. Also remove use
-	  of __typeof__ which is GCC specific
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4614>
-
-2023-05-10 00:51:31 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/d3d11/gstd3d11videosink.cpp:
-	  d3d11videosink: Don't clear prepared buffer on unlock_stop()
-	  That can be called between prepare() and render() which results in
-	  unexpected error flow return
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4596>
-
-2023-05-06 04:14:49 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	  h264decoder: Drop nonexisting picture silently without error
-	  If end_picture() was not successful, we do drop corresponding
-	  GstVideoCodecFrame and therefore gst_video_decoder_get_frame()
-	  will return nullptr which is expected behavior.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4586>
-
-2023-03-12 14:55:22 +0000  Philippe Normand <philn@igalia.com>
-
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/webrtcdatachannel.c:
-	* ext/webrtc/webrtcdatachannel.h:
-	  webrtcdatachannel: Bind to parent webrtcbin using a weak reference
-	  The previous approach of using a simple pointer could lead to a use-after-free
-	  in case a data-channel was created and its parent webrtcbin was disposed soon
-	  after.
-	  Fixes #2103
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4580>
-
-2023-05-04 16:30:09 +1000  Matthew Waters <matthew@centricular.com>
-
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  webrtc/nice: support consent-freshness RFC7675
-	  As is supported by libwebrtc already.  This allows ICE components to
-	  transition to failed if consent to send from the peer is revoked or if
-	  multiple consent packets are lost.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4575>
+	  va{h264,h265,av1}enc: fix potential crash on devices without rate control
+	  This fixes a crash in `gst_va_h264_enc_class_init` and `gst_va_h265_enc_class_init`
+	  (and probably also in gst_va_av1_enc_class_init) when calling
+	  `g_object_class_install_properties (object_class, n_props, properties);`
+	  When rate_control_type is 0, the following code is executed in :
+	  ```
+	  } else {
+	  n_props--;
+	  propertiesPROP_RATE_CONTROL = NULL;
+	  }
+	  ```
+	  n_props has initially a value of N_PROPERTIES but PROP_RATE_CONTROL
+	  is not the last element in the array, so it's making
+	  g_object_class_install_properties fail to iterate over the
+	  properties array.
+	  This applies the same fix to gstvah264enc.c, gstvah265enc.c and
+	  gstvaav1enc.c.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6344>
 
-2023-05-05 21:53:44 +0900  Seungha Yang <seungha@centricular.com>
+2024-03-12 13:50:18 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	  d3d11memory: Don't clear wrapped texture memory
-	  The external texture may hold already rendered scene and therefore
-	  it should not be cleared in alloc method
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4558>
+	* gst/videoparsers/gstvideoparseutils.c:
+	  videoparsers: Don't verbosely warn about CEA_708_PROCESS_EM_DATA_FLAG not being set
+	  And the same for CEA_708_PROCESS_CC_DATA_FLAG. This is not really a
+	  problem and was polluting logs with warnings for every single frame.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6352>
 
-2023-05-04 04:44:31 +0900  Seungha Yang <seungha@centricular.com>
+2024-03-12 00:45:15 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	  mfvideoenc: Allow only even resolution numbers
-	  Some H/W vendors support odd resolution if D3D11 texture is used
-	  or via IMF2DBuffer, but not all vendors support it.
-	  Also software MFT does not allow odd resolution.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1165
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2537
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4548>
-
-2023-05-02 18:14:20 +0100  Philippe Normand <philn@igalia.com>
+	* gst-libs/gst/cuda/gstcudabufferpool.cpp:
+	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
+	* sys/d3d12/gstd3d12bufferpool.cpp:
+	  cuda,d3d11,d3d12bufferpool: Disable preallocation
+	  Do not chain up to parent's GstBufferPool::start() which will do
+	  preallocation. We don't want it to be preallocated
+	  since there are various cases where negotiated downstream buffer pool is
+	  not used at all (e.g., zero-copy decoding, IPC elements).
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6345>
+
+2024-03-09 20:16:22 +0800  He Junyan <junyan.he@intel.com>
+
+	* sys/va/gstvaav1enc.c:
+	  va: av1enc: Init the output_frame_num when resetting gf group
+	  Fixes: #3359
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6333>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Fix potential deadlock when closing before any data was sent
-	  A blocking pad probe is added on new sink pads, it's usually removed after the
-	  caps have been negotiated or the signaling state switched to stable, but if that
-	  never happens and the pad is released we kept the pad probe active, leaving the
-	  pad blocked, preventing clean disposal.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4533>
+2024-02-16 18:08:36 +0100  Mathieu Duponchelle <mathieu@centricular.com>
 
-2023-05-01 17:46:25 +0100  Philippe Normand <philn@igalia.com>
+	* gst/onvif/gstrtponviftimestamp.c:
+	* gst/onvif/gstrtponviftimestamp.h:
+	  rtponviftimestamp: make sure to set E and T bits on last buffer of lists
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6298>
 
-	* gst-libs/gst/webrtc/dtlstransport.c:
-	  dtlstransport: Keep strong ref of dtls encoder/decoder
-	  Otherwise get_property() calls for the client, certificate and/or
-	  remote-certificate properties might access moved objects, since the encoder and
-	  decoder are added to the transportsendbin.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4526>
+2024-02-28 09:30:33 +1100  Jan Schmidt <jan@centricular.com>
 
-2023-05-01 10:24:54 +0000  Mihail Ivanchev <contact@ivanchev.net>
+	* gst/onvif/gstrtponviftimestamp.c:
+	  rtponviftimestamp: Use gst_segment_to_stream_time_full()
+	  In the situation where playback starts from a keyframe before
+	  the target playback segment, then the first buffers will be
+	  outside the configured segment and gst_segment_to_stream_time()
+	  will return GST_CLOCK_TIME_NONE unconditionally.
+	  If drop-out-of-segment is false, the RTP buffers will not be
+	  dropped, but will be sent witout ONVIF extension timestamps
+	  and given GST_CLOCK_TIME_NONE timestamps on the receiver.
+	  Instead, use gst_segment_to_stream_time_full() to extrapolate
+	  stream time outside the segment so that such buffers still
+	  get assigned their correct timestamps on the receiver.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6295>
 
-	* gst/codectimestamper/meson.build:
-	  gstcodectimestamper: remove PC file generation from plugin's own meson.build
-	  The file generated here is incomplete; it is generated for all plugins in a loop at an upper level.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4520>
+2024-03-01 21:00:33 +1100  Jan Schmidt <jan@centricular.com>
 
-2023-04-28 04:28:24 +0900  Seungha Yang <seungha@centricular.com>
+	* gst/dvbsubenc/gstdvbsubenc-util.c:
+	  dvbsubenc: Fix bottom field size calculation
+	  Don't accidentally include the stuffing byte (if present)
+	  into the bottom field size. It should only be included in the
+	  total segment length.
+	  Fixes problems with FFmpeg not rendering the subtitles
+	  with a stuffing byte, giving a "Invalid object location!" error.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6277>
 
-	* sys/wasapi2/gstwasapi2util.c:
-	  wasapi2: Allows process loopback capture on Windows 10
-	  As per MS documentation1, it requires Windows 10 Build 20348
-	  but it seems to be supported by old versions too
-	  1 https://learn.microsoft.com/en-us/windows/win32/api/audioclientactivationparams/
-	  ns-audioclientactivationparams-audioclient_process_loopback_params
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2524
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4517>
+2024-03-05 13:45:27 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-2023-04-28 18:52:48 +0900  Seungha Yang <seungha@centricular.com>
+	* meson.build:
+	  Back to development
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6264>
 
-	* gst-libs/gst/cuda/gstcudamemory.c:
-	  cudamemory: Fix for semi planar YUV memory size decision
-	  UV plan of the semi planar format requires only half of Y plane size
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4506>
+=== release 1.24.0 ===
 
-2023-04-25 04:59:33 +0900  Seungha Yang <seungha@centricular.com>
+2024-03-04 23:51:42 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Fix for ignored initial render rectangle
-	  Application can set target render rect before internal HWND
-	  configuration
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2518
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4496>
+	* NEWS:
+	* README.md:
+	* RELEASE:
+	* gst-plugins-bad.doap:
+	* meson.build:
+	  Release 1.24.0
 
-2023-04-25 10:14:47 +0200  Stéphane Cerveau <scerveau@collabora.com>
+2024-03-04 18:01:50 +0100  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* tests/check/meson.build:
-	  bad: disable dtls test if openssl is not present
-	  On MacOS with homebrew, the openssl library is not
-	  properly detected with pkg-config.
-	  So disable the test compilation if openssl
-	  is not properly detected along with libcrypto.
-	  libcrypto is detected but it uses the system one
-	  which leads to the error:
-	  your binary is not an allowed client of /usr/lib/libcrypto.dylib for
-	  architecture x86_64
-	  See more details from Apple:
-	  https://developer.apple.com/forums/thread/124782
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4483>
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.h:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c:
+	  analytics: whitespace matters for gtk-doc syntax
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6253>
 
-2023-04-19 16:59:01 +0200  Martin Nordholts <martn@axis.com>
+2024-03-03 18:35:09 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  webrtc: Plug leaks of resolved ICE addresses
-	  The addresses we get from `resolve_host_finish()` (via
-	  `resolve_host_async()`, `resolve_host_main_cb()`, `on_resolve_host()`,
-	  `g_resolver_lookup_by_name_finish()`) must be freed. Otherwise we leak
-	  memory.
-	  Leak found and confirmed fixed with GCC AddressSanitizer.
-	  Change-Id: If32d24452d626234f01b253b77a7d6d16eac1cee
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4482>
+	* docs/libs/analytics/index.md:
+	* docs/libs/analytics/sitemap.txt:
+	* docs/meson.build:
+	* gst-libs/gst/analytics/analytics-meta-prelude.h:
+	* gst-libs/gst/analytics/meson.build:
+	  analytics: Add documentation to hotdoc build
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6253>
+
+2024-03-03 18:34:41 -0500  Olivier Crête <olivier.crete@collabora.com>
+
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.h:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c:
+	  analytics: Add missing documentation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6253>
+
+2024-03-03 18:33:48 -0500  Olivier Crête <olivier.crete@collabora.com>
+
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.h:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c:
+	  analytics: Fix various typos in the documentation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6253>
 
-2023-04-17 21:34:19 +0900  Seungha Yang <seungha@centricular.com>
+2024-02-29 02:41:42 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	  d3d11compositor: Skip zero alpha input
-	  Blending such input is a waste of resource since nothing will
-	  be rendered
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4456>
+	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
+	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
+	* sys/d3d12/gstd3d12memory.cpp:
+	  d3d11memory, d3d12memory: Fix outstanding memory count tracing
+	  Gets being released memory back to queue even if allocator is flushing
+	  in order to count the number of outstanding memory objects.
+	  Also, clear queue if there's no outstanding memory object and
+	  allocator is flushing
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6240>
 
-2023-03-30 10:11:11 +1100  Matthew Waters <matthew@centricular.com>
+2024-02-29 02:30:38 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/closedcaption/gstccconverter.c:
-	  ccconverter: reintroduce frame count reset on cycle completion
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4453>
+	* tests/check/libs/d3d11memory.c:
+	  tests: d3d11: Add buffer pool test
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6240>
 
-2023-04-18 14:55:23 +0300  Sebastian Dröge <sebastian@centricular.com>
+2024-02-29 02:06:43 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsdemux/tsdemux.c:
-	  tsdemux: Set number of channels to 2 for dual mono Opus
-	  Instead of leaving it at 0, which will then cause caps creation to fail.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4446>
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	  cudamemory: Fix outstanding memory count tracing
+	  Gets being released memory back to queue even if allocator is flushing
+	  in order to count the number of outstanding memory objects.
+	  And fixing double count increment
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6240>
 
-2023-04-17 11:36:55 +0200  Guillaume Desmottes <guillaume.desmottes@onestream.live>
+2024-02-29 02:06:25 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/dash/gstmpdclient.c:
-	  dash: mpdclient: fix divide by 0 if segment has no duration
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4441>
+	* tests/check/libs/cudamemory.c:
+	  tests: cuda: Add buffer pool test
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6240>
 
-2023-04-17 23:06:54 +0900  Seungha Yang <seungha@centricular.com>
+2024-02-15 16:41:54 -0500  Damian Hobson-Garcia <dhobsong@igel.co.jp>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	  d3d11compositor: Reconfigure resource only when output caps is changed
-	  GstD3D11Converter setup is heavy operation since it requires
-	  shader compile, GPU resource allocation, some math, mutex, etc.
-	  We can avoid it if negotiated caps is not changed.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4440>
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	* ext/wayland/gstwaylandsink.h:
+	* gst-libs/gst/wayland/gstwlwindow.c:
+	* gst-libs/gst/wayland/gstwlwindow.h:
+	  waylandsink: Move buffer commits to the display thread
+	  Syncrhonizing buffer commits to the streaming thread can lead to
+	  dropped frames when frame callbacks are not processed before the
+	  next frame is ready for rendering.  Depending on the drift between
+	  the wayland compositor and buffer source timings, this can lead to
+	  periods of significant frame drop, especially when the media frame
+	  rate is close to the display frame rate.
+	  Cache buffers in the streaming thread and peform commits on the
+	  display thread to eliminate the buffer commit racing.
+	  The implementation is the same for both waylandsink and gtkwaylandsink,
+	  so move it to the common wayland library under gst-lib.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6133>
 
-2018-07-19 17:21:22 +0200  Michael Olbrich <m.olbrich@pengutronix.de>
+2024-02-15 16:41:52 -0500  Damian Hobson-Garcia <dhobsong@igel.co.jp>
 
-	* ext/srtp/gstsrtpdec.c:
-	  srtpdec: fix "srtp-key" check
-	  The original code was:
-	  if (!gst_structure_get (s, "srtp-key", GST_TYPE_BUFFER, &buf, NULL) || !buf) {
-	  goto error;
-	  } else {
-	  stream->key = buf;
-	  }
-	  So use "srtp-key" if it is set so a non NULL buffer. The condition was
-	  incorrectly inverted in ad7ffe64a66ab48d81671651031c449149db4973 to:
-	  if (gst_structure_get (s, "srtp-key", GST_TYPE_BUFFER, &buf, NULL) || !buf) {
-	  stream->key = buf;
-	  } ...
-	  Fix the condition so it works as originally intended and avoid accessing
-	  'buf' uninitialised.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4423>
+	* gst-libs/gst/wayland/gstwlbuffer.c:
+	* gst-libs/gst/wayland/gstwlbuffer.h:
+	  wayland: Add API to ref/unref current GstBuffer inside a GstWlBuffer
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6133>
 
-2023-03-27 09:20:27 +0200  Aleksandr Slobodeniuk <aslobodeniuk@fluendo.com>
+2024-02-15 16:42:13 -0500  Damian Hobson-Garcia <dhobsong@igel.co.jp>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: fix race conditions in win32 window
-	  One race condition is the fact that the window object
-	  can be destroyed while running some routine in the UI
-	  thread (such as resizing). To avoid that situation we make
-	  UI thread hold a reference on the window object while it's
-	  running.
-	  Other probpematic case is when the window handle is reused:
-	  if we stop and start the pipeline very fast,
-	  so the sink creates a new window object that is going to use
-	  the same window handle as the previous one.
-	  And finally the case when the pipeline is stopped immediatelly
-	  right after starting, this one is also handled in this commit.
-	  NOTE: a unit test that reproduces this cases have been added
-	  in the previous commit.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4417>
+	* gst-libs/gst/wayland/gstwldisplay.c:
+	* gst-libs/gst/wayland/gstwldisplay.h:
+	  wayland: Add synchronized requests to WlDisplay
+	  Add synchonized versions of wl_display_sync() and wl_callback_destroy()
+	  that will ensure that to callbacks can be managed in a thread safe way
+	  on the display queue even when they are dispatched from a separate
+	  thread.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6133>
 
-2023-03-21 18:17:12 +0100  Aleksandr Slobodeniuk <aslobodeniuk@fluendo.com>
+2024-02-26 09:27:40 +0100  Edward Hervey <edward@centricular.com>
 
-	* tests/check/elements/d3d11videosink.c:
-	* tests/check/meson.build:
-	  d3d11videosink: add gstcheck test for win32 window
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4417>
+	* README.md:
+	* RELEASE:
+	* ext/dtls/README:
+	  docs: Use Discourse and Matrix as prefered communication channels
+	  Part of: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6220
 
-2023-04-02 00:29:24 +0900  Seungha Yang <seungha@centricular.com>
+2024-02-22 15:41:16 +0100  Alexander Slobodeniuk <aslobodeniuk@fluendo.com>
 
 	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Enhancement for initial window size decision
-	  Use AdjustWindowRect() method to calculate window size so that
-	  video scene can be rendered on client area without black borders
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4416>
-
-2023-04-12 00:31:17 +0100  Tim-Philipp Müller <tim@centricular.com>
+	  d3d11window_win32: fix crash on RC unprepare() vs window_proc()
+	  Unprepare method posts WM_GST_D3D11_DESTROY_INTERNAL_WINDOW
+	  command to the window queue, and from that moment considers
+	  internal_hwnd to be released, and so it sets it to null.
+	  The problem is that it's possible that right at that moment
+	  the window thread might be already processing some other
+	  command, or just another command might be already in the queue.
+	  On practice we met a crash when WM_PAINT got processed in between
+	  (unprepare already finished and WM_GST_D3D11_DESTROY_INTERNAL_WINDOW
+	  was not handled yet)
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6187>
 
-	* meson.build:
-	  Back to development
+=== release 1.23.90 ===
 
-=== release 1.22.2 ===
-
-2023-04-11 17:29:28 +0100  Tim-Philipp Müller <tim@centricular.com>
+2024-02-23 18:20:11 +0000  Tim-Philipp Müller <tim@centricular.com>
 
 	* NEWS:
 	* RELEASE:
 	* gst-plugins-bad.doap:
 	* meson.build:
-	  Release 1.22.2
-
-2023-04-10 20:10:50 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	* gst-libs/gst/codecs/gsth264picture.c:
-	  h264decoder: Enable low-latency bumping in case of pic_order_cnt_type 2
-	  In case of POC type 2, output order is equal to decoding order
-	  (no frame reordering)
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2447
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4383>
+	  Release 1.23.90
 
-2023-04-06 20:48:17 +0900  Seungha Yang <seungha@centricular.com>
+2024-02-23 21:54:17 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	* gst-libs/gst/codecs/gsth264picture.c:
-	* gst-libs/gst/codecs/gsth264picture.h:
-	  h264decoder: Fix for latency report
-	  The minimum latency answered by an element should be the maximum
-	  latency from the element's perspective. Also consider max_reorder_frames
-	  update as a sequence change
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4383>
-
-2023-04-06 20:26:24 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/va/gstvabasedec.c:
+	  vabasedec: Fix a possible NULL pointer dereference
+	  The format in _get_preferred_format_and_caps_features() may be NULL.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6206>
 
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	  h264decoder: Ignore invalid max_num_reorder_frames in VUI
-	  It's not fatal and can be ignored
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4383>
+2024-02-22 22:11:36 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-04-06 19:40:12 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/va/gstvabasedec.c:
+	  vabasedec: disable derived images for i965 driver
+	  Since it has a very poor performance at reading derived images, which is the
+	  most common use case for decoders.
+	  Partially fixes: #3325
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6202>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  h265decoder: Fix for latency report when src caps is not configured
-	  Depending on subclass, negotiation might not happen on new_sequence()
-	  Fixing regression introduced by the commit
-	  4a4823b9728fbb944e05d89e0fee681ab5b33e25
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4383>
+2024-02-21 18:14:36 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-04-06 19:36:03 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/va/gstvavpp.c:
+	  vapostproc: optimization for va memory to system memory only
+	  When the conversion is only caps feature from memory:VAMemory to system memory,
+	  it's possible to optimize by doing a pseudo pass-through since the va-backed
+	  buffers are the same for system memory buffers.
+	  This change will also mitigates #2940
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6174>
+
+2024-02-20 20:38:55 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/asio/gstasioobject.cpp:
+	* sys/asio/gstasiosink.cpp:
+	* sys/asio/gstasiosrc.cpp:
+	  asiosink: Fix channel selection
+	  Fixing copy paste mistake
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3321
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6170>
 
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	  h264decoder: Fix for latency report when src caps is not configured
-	  Depending on subclass, negotiation might not happen on new_sequence()
-	  Fixing regression introduced by the commit
-	  4a4823b9728fbb944e05d89e0fee681ab5b33e25
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4383>
+2024-02-20 17:28:29 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-04-10 17:31:29 +0800  Wang Chuan <jdyaomo@gmail.com>
+	* sys/va/gstvabasedec.c:
+	* sys/va/gstvabasetransform.c:
+	* sys/va/gstvacompositor.c:
+	  vabase: fail decide allocation if dmabuf without videometa
+	  If the allocation query received from downstream doesn't handle GstVideoMeta but
+	  it requests memory:DMABuf caps feature, it's incomplete, so we rather reject the
+	  negotiation.
+	  Both in base decoder, base transform and compositor.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6155>
 
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  gstd3d11window: fix memory leak
-	  GstStructure may leak when using external HWND
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4382>
+2024-02-22 09:41:00 +0200  naglis <341855-naglis@users.noreply.gitlab.freedesktop.org>
 
-2023-03-26 16:49:32 +0100  Tim-Philipp Müller <tim@centricular.com>
+	* gst-libs/gst/play/gstplay.c:
+	  gstplay: Fix typos in documentation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6177>
 
-	* ext/qroverlay/gstdebugqroverlay.c:
-	  debugqroverlay: fix string leak
-	  g_string_free(.., FALSE) gives us ownership of the string
-	  already, no need to duplicate that again with g_strdup(),
-	  and doing so will leak the string returned by g_string_free()
-	  here. Caught by compiler warnings in newer GLib versions.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4380>
+2024-02-21 01:13:02 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-04-07 22:13:24 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/nvcodec/plugin.c:
+	  nvcodec: Add plugin status message
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6167>
 
-	* sys/decklink/gstdecklinkaudiosink.cpp:
-	  decklinkaudiosink: Fix playback when video caps is configured before audio
-	  Scheduled playback starts on videosink's state change or on caps
-	  but it's possible that audiosink is configure without caps yet.
-	  Try start scheduled playback on audiosink's caps event as well
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4368>
+2024-02-21 00:57:32 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-04-04 12:22:31 +0200  Wojciech Kapsa <wojciech.kapsa@medvc.eu>
+	* sys/amfcodec/plugin.cpp:
+	  amfcodec: Add plugin status message
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6167>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/decklink/gstdecklink.cpp:
-	* sys/decklink/gstdecklink.h:
-	* sys/decklink/gstdecklinkvideosink.cpp:
-	* sys/decklink/gstdecklinkvideosrc.cpp:
-	  decklink: fix 10 bit RGB (r210) format auto detection
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2391
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4342>
+2024-02-19 22:17:42 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-03-31 04:40:58 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/va/gstvabasedec.c:
+	  vabasedec: refactor format and capsfeature selection
+	  This is a simplification of the venerable
+	  gst_va_base_dec_get_preferred_format_and_caps_features() function, which
+	  predates since gstreamer-vaapi. It's used to select the format and the
+	  capsfeature to use when setting the output state. It was complex and hard to
+	  follow. This refactor simplifies a lot the algorithm.
+	  The first thing to remove _downstream_has_video_meta() since, most of the time
+	  it will be called before the caps negotiation, and allocation queries make sense
+	  only after caps negotiation. It might work during renegotiation but, in that
+	  case, caps feature change is uncommon. Better a simple and common approach.
+	  Also, for performance, instead of dealing with caps features as strings, GQuarks
+	  are used.
+	  The refactor works like this:
+	  1. If peer pad returns any caps, the returned caps feature is system memory and
+	  looks for a proper format in the allowed caps.
+	  2. The allowed caps are traversed at most 3 times: one per each valid caps
+	  feature. First VAMemory, later DMABuf, and last system memory. The first to
+	  match in allowed caps is picked, and the first format matching with the
+	  chroma is picked too.
+	  Notice that, right now, using playbin videoconvert never return any.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6154>
+
+2024-02-20 16:00:07 +0100  Edward Hervey <edward@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/ttml/gstttmlparse.c:
+	  subparsers: Give proper category to subtitle "decoders"
+	  Some subtitle "decoders" had a wrong category of "Parser", which `parsebin`
+	  relies on to identify elements which do not *decode* streams but *parse* them.
+	  This would cause such subtitle decoders to be plugged in within parsebin,
+	  preventing the original stream to be properly used by (more efficient)
+	  downstream decoders or subtitle renderers.
+	  Fixes #1757
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6153>
 
-	* tools/gst-transcoder.c:
-	  tools: Count argc after parsing GOption on Windows
-	  Existing codes rely on modified argc value by g_option_context_parse()
-	  but g_option_context_parse_strv() is used in case of Windows.
-	  Count arguments after the option parsing manually.
-	  Fixing command "gst-inspect-1.0.exe -b"
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4322>
+2024-02-19 12:50:53 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-2023-03-16 16:02:26 +0000  Colin Kinloch <colin.kinloch@collabora.com>
+	* sys/msdk/gstmsdkallocator_libva.c:
+	* sys/msdk/gstmsdkvpp.c:
+	  msdk: Fix possible memory leaks
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6161>
 
-	* ext/gtk/gstgtkwaylandsink.c:
-	  gtkwaylandsink: Destroy GstWlWindow when parent GtkWindow is destroyed
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4312>
+2024-02-21 21:50:20 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-03-29 12:58:14 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* sys/wasapi/gstwasapiutil.c:
+	  wasapi: Fix alloc/free function mismatch
+	  ... and fix leak in wasapi device provider
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3326
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6169>
 
-	* gst-libs/gst/vulkan/gstvkmemory.c:
-	  vkmemory: flush whole size
-	  Running element_vkcolorconver test with Vulkan validation layer this error is
-	  raised:
-	  Code 0 : Validation Error:  VUID-VkMappedMemoryRange-size-01390  Object 0:
-	  handle = 0x100000000010, type = VK_OBJECT_TYPE_DEVICE_MEMORY;
-	  | MessageID = 0xdd4e6d8b
-	  | vkFlushMappedMemoryRanges: Size in pMemRanges0 is 0x4, which is not a
-	  multiple of VkPhysicalDeviceLimits::nonCoherentAtomSize (0x40) and offset +
-	  size (0x0 + 0x4 = 0x4) not equal to the memory size (0xb). The Vulkan spec
-	  states: If size is not equal to VK_WHOLE_SIZE, size must either be a multiple of
-	  VkPhysicalDeviceLimits::nonCoherentAtomSize, or offset plus size must equal the
-	  size of memory
-	  The reason of is that the image size used in the test doesn't comply hardware
-	  restrictions. In order to avoid juggling with image size and hardware
-	  restrictions, this patch proposes to use VK_WHOLE_SIZE macro.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4311>
+2024-02-21 21:46:49 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-03-29 12:44:00 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
+	  wasapi2: Fix task memory leak
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6169>
 
-	* tests/check/libs/vkimage.c:
-	  tests: vkimage: add VK_IMAGE_USAGE_SAMPLED_BIT usage bit
-	  Running tests with Vulkan Validation enabled show an error on vkimage tests:
-	  Code 0 : Validation Error:  VUID-VkImageViewCreateInfo-image-04441 
-	  Object 0: VK_NULL_HANDLE, type = VK_OBJECT_TYPE_COMMAND_BUFFER; Object 1: handle
-	  = 0x50000000005, type = VK_OBJECT_TYPE_IMAGE;
-	  | MessageID = 0xb75da543
-	  | Invalid usage flag for VkImage 0x50000000005 used by vkCreateImageView(). In
-	  this case, VkImage should have VK_IMAGE_USAGE_SAMPLED_BIT |
-	  VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
-	  VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT |
-	  VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT |
-	  VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR |
-	  VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT |
-	  VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR |
-	  VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR |
-	  VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR |
-	  VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR | VK_IMAGE_USAGE_SAMPLE_WEIGHT_BIT_QCOM
-	  | VK_IMAGE_USAGE_SAMPLE_BLOCK_MATCH_BIT_QCOM set during creation.
-	  The Vulkan spec states: image must have been created with a usage value
-	  containing at least one of the usages defined in the valid image usage list for
-	  image views
-	  This patch adds VK_IMAGE_USAGE_SAMPLED_BIT to the usage bits in test.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4311>
+2024-02-01 14:49:21 +0900  ekwange <ekwange@gmail.com>
 
-2023-03-29 11:04:20 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* gst-libs/gst/mse/gstmediasourcesamplemap.c:
+	  mse: Add logging init for mediasource sample map
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6033>
 
-	* gst-libs/gst/vulkan/gstvkfullscreenquad.c:
-	  vkfullscreenquad: set enable_clear as TRUE by default
-	  While using the validation layer with this pipeline:
-	  gst-launch-1.0 videotestsrc num-buffers=10 ! vulkanupload ! vulkancolorconvert ! vulkansink
-	  The validation layer throws this message:
-	  Code 0 : Validation Error:  VUID-VkAttachmentDescription-format-06699 
-	  Object 0: handle = 0x5555562e9610, type = VK_OBJECT_TYPE_DEVICE; | MessageID = 0x52b3229e |
-	  vkCreateRenderPass: pCreateInfo->pAttachments0 format is
-	  VK_FORMAT_B8G8R8A8_UNORM and loadOp is VK_ATTACHMENT_LOAD_OP_LOAD, but
-	  initialLayout is VK_IMAGE_LAYOUT_UNDEFINED.
-	  The Vulkan spec states: If format includes a color or depth aspect and loadOp is
-	  VK_ATTACHMENT_LOAD_OP_LOAD, then initialLayout must not be VK_IMAGE_LAYOUT_UNDEFINED
-	  When creating the render pass the loadOp can be either
-	  `VK_ATTACHMENT_LOAD_OP_CLEAR` or `VK_ATTACHMENT_LOAD_OP_LOAD` depending on
-	  `enable_clear`. While `enable_clear` is FALSE by default (which means
-	  `VK_ATTACHMENT_LOAD_OP_LOAD`). Nonetheless, its value is explicitly changed by
-	  `vkoverlaycompositor` to FALSE too!
-	  This behavior was introduced in merge request #2470 where
-	  `VK_ATTACHMENT_LOAD_OP_CLEAR` was a fixed value for loadOp. Thus, the bug
-	  consists in a missing initialization of `enable_clear` to TRUE from that merge
-	  request.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4311>
+2024-02-17 13:19:15 -0800  Kamal Mostafa <kamal@whence.com>
 
-2023-03-27 16:28:04 +1100  Matthew Waters <matthew@centricular.com>
+	* tests/check/elements/cudafilter.c:
+	  tests: cudafilter: actually check for cudascale
+	  Actually check for availability of 'cudascale' instead of accidentally
+	  checking for 'cudadownload' twice.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3327
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6158>
 
-	* gst-libs/gst/vulkan/gstvkswapper.c:
-	  vulkanswapper: correctly handle force-aspect-ratio=false
-	  It was simply ignored so actually handle it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4290>
+2024-02-19 14:24:51 +0100  Stéphane Cerveau <scerveau@igalia.com>
 
-2023-02-13 12:05:27 +0100  Stéphane Cerveau <scerveau@igalia.com>
+	* tests/check/libs/vkimagebufferpool.c:
+	  test: vkimagebufferpool: fix queue leak
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6143>
 
-	* ext/openjpeg/gstopenjpegdec.c:
-	  openjpegdec: allow multithread decoding only in subframe mode
-	  To avoid mis-ordered frames, allow multithread decoding only in
-	  subframe mode.
-	  Fixes #1786
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4275>
+2023-01-28 02:15:24 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-2023-03-24 00:23:42 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/qsv/plugin.cpp:
+	  qsv: use new plugin status message API
+	  Minimal example.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3832>
 
-	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
-	  d3d11bufferpool: Fix invalid access in debug print loop
-	  Add missing condition check in for loop
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4258>
+2024-02-19 20:57:26 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-03-21 20:06:12 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
+	  wasapi2: Respect ringbuffer buffer/latency time
+	  Decide buffer size based on configured buffer/latency time
+	  if low-latency is disabled, so that ringbuffer can buffer more
+	  than minimum required size.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2870
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6141>
+
+2024-02-20 08:47:21 +0100  Edward Hervey <edward@centricular.com>
+
+	* gst-libs/gst/mpegts/gst-mpegtspesmetadatameta.h:
+	  mpegst: Fix ownership of return value
+	  This inherits from the same rule as gst_buffer_add_meta
+	  ```
+	  gst-mpegtspesmetadatameta.h:98: Warning: GstMpegts:
+	  gst_buffer_add_mpegts_pes_metadata_meta: return value: Invalid non-constant
+	  return of bare structure or union; register as boxed type or (skip)
+	  ```
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6146>
 
-	* sys/nvcodec/gstnvh264encoder.cpp:
-	  nvh264encoder: Fix template caps
-	  It should include progressive as well
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4253>
+2024-02-16 17:06:52 +0100  Guillaume Desmottes <guillaume.desmottes@onestream.live>
 
-2023-03-20 17:44:23 +0000  Colin Kinloch <colin.kinloch@collabora.com>
+	* docs/plugins/gst_plugins_cache.json:
+	  docs: initialize values when GST_PLUGIN_API_FLAG_IGNORE_ENUM_MEMBERS is set
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5491>
 
-	* ext/gtk/gstgtkwaylandsink.c:
-	  gtkwaylandsink: Fix crash when rendering after the window is closed
-	  Continuation of https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4197
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4238>
+2024-02-17 00:11:32 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-03-19 21:21:31 +0100  Adrien De Coninck <deconinck.adrien@gmail.com>
+	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
+	  wasapi2: Fix choppy rendering
+	  This reverts questionable commit 009bc15f3397252e9e3954ae4af15ffcdbdeac69
+	  which looks completely wrong.
+	  The GstWasapi2RingBuffer:buffer_size variable is used to
+	  calculate available buffer size we can write
+	  (i.e., available size = buffer_size - padding_size).
+	  But the commit makes the size to be exactly same as buffer period.
+	  Then, it can confuse this element as if the endpoint buffer is full on
+	  I/O event callback (if padding size is equal to buffer period)
+	  but it's not true.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2870
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6132>
 
-	* sys/winks/ksdeviceprovider.c:
-	  ksdeviceprovider: Fix leak in gst_dshow_device_provider_start
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4227>
+2024-02-14 22:11:51 +0100  Robert Mader <robert.mader@collabora.com>
 
-2023-03-19 20:57:18 +0100  Adrien De Coninck <a.deconinck@intopix.com>
+	* sys/v4l2codecs/gstv4l2codech264dec.c:
+	  v4l2codecs: h264: Fix a memory leak on renegotiation
+	  We only use this anchor when streaming, in which case output_state is
+	  set and needs to get unreffed.
+	  This is in line with how it is handled for all other codecs.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6127>
 
-	* sys/directshow/dshowdeviceprovider.cpp:
-	  dshowdeviceprovider: Fix leak in gst_dshow_device_provider_start
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4227>
+2024-02-15 16:38:53 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-2023-03-17 16:32:45 +0200  Sebastian Dröge <sebastian@centricular.com>
+	* meson.build:
+	  Back to development
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6126>
 
-	* ext/bs2b/gstbs2b.c:
-	* ext/bs2b/gstbs2b.h:
-	* ext/openal/gstopenal.c:
-	* gst/mxf/mxfmetadata.c:
-	* sys/v4l2codecs/gstv4l2codech264dec.c:
-	  plugins: Fix various trivial clang compiler warnings
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4221>
+=== release 1.23.2 ===
 
-2023-03-17 15:51:53 +0200  Sebastian Dröge <sebastian@centricular.com>
+2024-02-15 15:37:17 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst/mpegtsdemux/tsdemux.c:
-	  tsdemux: Fix reading of extended Opus channel configuration
-	  Argument evaluation order is implementation defined in C, and gcc is
-	  evaluating right-to-left (works) while clang is evaluating left-to-right
-	  (does not work).
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4221>
+	* NEWS:
+	* RELEASE:
+	* gst-plugins-bad.doap:
+	* meson.build:
+	  Release 1.23.2
 
-2023-03-17 23:28:58 +0900  Seungha Yang <seungha@centricular.com>
+2024-02-15 15:37:11 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst-libs/gst/codecs/gsth264picture.c:
-	  h264decoder: Fix DPB bumping process
-	  As per spec C.4.5.3 "Bumping", if bumping is needed but DPB holds
-	  no "output needed" picture, then a picture that has the smallest
-	  POC should be considered first for output
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4219>
+	* gst/audiobuffersplit/gstaudiobuffersplit.c:
+	  Revert "audiobuffersplit: Update out_segment even without discont"
+	  This reverts commit c0dc65d40a0dd2b3c0f75ff17bdb5b2664923c1c.
 
-2023-03-18 01:33:20 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-11 12:30:31 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* sys/nvcodec/gstnvh264encoder.cpp:
-	* sys/nvcodec/gstnvh265encoder.cpp:
-	  nvencoder: Fix CQP option setting
-	  ... and zero initialize LUID and CUDA device list to address
-	  coverity issue
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4217>
+	* gst/videoparsers/gstvideoparseutils.c:
+	  videoparseutils: Don't double-attach AFD, Bar or unregistered data
+	  We already did this for captions. We also need to do it for the other
+	  meta types to ensure our parsers are idempotent and don't attach
+	  duplicates.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5450>
 
-2023-03-16 13:33:46 +0100  Albert Sjölund <alberts@axis.com>
+2023-10-10 08:45:06 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* gst-libs/gst/webrtc/nice/nicestream.c:
-	  webrtc: Fix segfault traversing ice transports
-	  Previously, reassigning loop index l in nicestream.c
-	  could cause a segfault if l->data was null, as it could
-	  reassign l to a null variable, triggering the loop
-	  postassignment l->next, which then segfaults due to
-	  l now being null. It is instead moved into the loop.
-	  _delete_transport already performs the reassignment
-	  inline.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4213>
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gsth265parse.c:
+	* gst/videoparsers/gstvideoparseutils.c:
+	* gst/videoparsers/gstvideoparseutils.h:
+	  videoparseutils: Store multiple user data unregistered messages
+	  A frame can have multiple unregistered messages attached. We need to
+	  store them all.
+	  For: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3008
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5450>
 
-2023-03-16 23:09:53 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-10 08:41:12 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* sys/wasapi2/gstwasapi2client.cpp:
-	  wasapi2: Fix potential crash on device activation failure
-	  The activation object is live in COM thread already and therefore
-	  self refcount hack is pointless.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4207>
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gsth265parse.c:
+	* gst/videoparsers/gstvideoparseutils.c:
+	* gst/videoparsers/gstvideoparseutils.h:
+	  videoparsers: Clear user_data_unregistered explicitly in _reset_frame
+	  This fits better with the model used by the parser elements. It also
+	  properly resets the data when the parser is reset.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5450>
 
-2023-03-16 13:25:39 +0100  Albert Sjölund <alberts@axis.com>
+2023-10-10 08:34:29 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* ext/webrtc/webrtcdatachannel.c:
-	  webrtc: patch leak caused by early return
-	  In webrtc_data_channel_send functions, both data and string,
-	  an early return on a non-open datachannel caused it to leak
-	  the buffer used for pushing to appsrc, meaning any buffer
-	  sent after leaving the open state was leaked in full.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4206>
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gsth265parse.c:
+	* gst/videoparsers/gstmpegvideoparse.c:
+	* gst/videoparsers/gstvideoparseutils.c:
+	* gst/videoparsers/gstvideoparseutils.h:
+	  videoparsers: Clear user data explicitly in _reset_frame
+	  This fits better with the model used by the parser elements. It also
+	  properly resets the data when the parser is reset.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5450>
 
-2023-03-15 22:05:33 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-10 08:29:02 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	  d3d11videosink: Fix tearing in case of fullscreen mode
-	  DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING and DXGI_PRESENT_ALLOW_TEARING should
-	  be used only if required, when user wants Vsync off for example.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2376
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4188>
+	* gst/videoparsers/gstvideoparseutils.c:
+	  videoparseutils: Minor improvements to _parse_afd
+	  - Add the missing field parameter and put the output parameter at the
+	  end.
+	  - Use a switch to verify valid values instead of hard-to-follow range
+	  checks.
+	  - Don't consider bad values a programming error, just a regular failure.
+	  - Set all data fields at the end so we can pass a pointer to an
+	  uninitialized structure without GCC complaining.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5450>
 
-2023-03-16 00:53:31 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-10 08:27:23 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
-	  d3d11converter: Fix conversion backend selection
-	  Intended behavior was selecting video processor only if pixel shader
-	  is disabled, since we prefer shader over video processor
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4189>
+	* gst/videoparsers/gstvideoparseutils.c:
+	  videoparseutils: Minor improvements to _parse_bar
+	  Use the enum type for the argument and loudly complain when not passing
+	  a place to output.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5450>
 
-2023-03-14 22:08:54 +0900  Seungha Yang <seungha@centricular.com>
+2024-01-30 15:05:55 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	  d3d11compositor: Fix composition error on release_pad()
-	  Composition might be still in progress while it's being released
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4186>
+	* gst/audiobuffersplit/gstaudiobuffersplit.c:
+	  audiobuffersplit: Update out_segment even without discont
+	  We need to forward the segments we get even if we don't see a discont
+	  buffer, or discont was suppressed by gapless mode.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5450>
+
+2024-02-14 11:44:22 -0500  Xavier Claessens <xavier.claessens@collabora.com>
+
+	* sys/aja/gstajacommon.cpp:
+	* sys/aja/gstajacommon.h:
+	* sys/aja/gstajasink.cpp:
+	* sys/aja/gstajasrc.cpp:
+	  aja: Replace global semaphore with per-device flock()
+	  The global semaphore was never closed/unlinked, causing permission
+	  denied issue if the device is later used by another user. Properly
+	  removing the semaphore when stopping the pipeline would still leave it
+	  open in case of a crash.
+	  With a GStreamer specific name, it was also not preventing other apps to access
+	  the device concurrently.
+	  Finally, if the system has multiple cards, the lock should be per card
+	  and not global (to be confirmed).
+	  Fixes: #3283.
+	  Sponsored-by: Netflix Inc.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6117>
 
-2023-01-07 16:18:03 +0100  Antonio Rojas <arojas@archlinux.org>
+2024-02-15 08:52:33 +0100  Edward Hervey <edward@centricular.com>
 
-	* ext/zxing/gstzxing.cpp:
-	  zxing: add support for zxing-c++ 2.0
-	  format is a C++ string in 2.0
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4148>
+	* gst-libs/gst/play/gstplay.c:
+	  libgstplay: Use playbin3 by default
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6120>
 
-2023-03-10 16:47:17 +1100  Matthew Waters <matthew@centricular.com>
+2024-02-12 23:51:12 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/vulkan/vkoverlaycompositor.c:
-	  vulkanoverlaycompositor: don't do a potential use after free
-	  Removing a meta from a buffer means one doesn't have access to it
-	  anymore.  Instead use the already reffed composition directly.
-	  Fixes a use-after-free in the following pipeline:
-	  ... ! vulkanupload ! timeoverlay ! vulkanoverlaycompositor ! ...
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4147>
+	* gst-libs/gst/codecs/gsth265decoder.c:
+	  h265decoder: Fix DPB size calculation
+	  MaxDpbSize specified in A.4.2 tells upper bound of decoded picture
+	  buffer size but does not tell actual required size.
+	  Use max_dec_pic_buffering value as a dpb size. Some backends
+	  such as DXVA and NVDEC might require pre-allocated DPB buffer
+	  and unnecessary large DPB size will result in waste of GPU memory.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6101>
+
+2024-02-13 18:57:05 +0100  Mathieu Duponchelle <mathieu@centricular.com>
+
+	* ext/webrtc/gstwebrtcbin.c:
+	  webrtcbin, rtpbin: check before setting properties on jitterbuffer
+	  In rtpbin we already systematically check for all property names
+	  except latency, correct that.
+	  In webrtcbin we need to check before trying to use the do-retransmission
+	  property.
+	  This is useful for the case where an element like identity gets passed
+	  to rtpbin's request-jitterbuffer property, when the application wants
+	  to use webrtcbin in an SFU situation, with no reordering and no added
+	  latency
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6112>
 
-2023-03-09 14:38:13 +1100  Matthew Waters <matthew@centricular.com>
+2024-02-14 00:38:40 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* ext/closedcaption/gstcea708decoder.c:
-	  cea708overlay: fix HCR interpretation
-	  An unsigned counter with a for (i = end; i >= 0; i--), can be optimized to
-	  infinite loop as an unsigned value will always be >= 0.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4141>
+	* po/lv.po:
+	  gst-plugins-bad: update translations
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6113>
 
-2023-03-07 23:46:50 +0900  Seungha Yang <seungha@centricular.com>
+2024-02-11 22:08:12 -0500  Daniel Morin <daniel.morin@collabora.com>
 
 	* gst/videoparsers/gsth264parse.c:
-	* gst/videoparsers/gsth264parse.h:
-	  h264parse: Validate VUI framerate
-	  A few streams contain invalid/wrong framerate in VUI. Do validate
-	  it based on the spec and ignore invalid VUI framerate values.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1753
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4131>
+	  h264parse: correct NAL mode backlog processing
+	  - Only process what is left in backlog when AU was completed, draining or next
+	  nal is AUD.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6093>
+
+2024-02-12 22:16:23 +0900  Seungha Yang <seungha@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/nvcodec/gstnvav1dec.cpp:
+	* sys/nvcodec/gstnvdecoder.cpp:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	  nvdecoder: Enable zero-copy only if explicitly enabled
+	  Keep pre-1.24 behavior unless user specifies the number of
+	  output surface size. We are calculating output surface size
+	  conservatively, and it can result in over allocation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6102>
+
+2024-02-12 22:01:45 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/nvcodec/gstnvh265dec.cpp:
+	  nvh265dec: Don't convert unknown video format to string
+	  gst_video_format_to_string() method does not allow unknown format
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6102>
 
-2023-02-28 18:48:24 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2024-02-03 11:54:01 +0000  Philippe Normand <philn@igalia.com>
 
-	* gst/jpegformat/gstjpegparse.c:
-	  jpegparse: demote and promote log messages level
-	  Before those levels where when implementing the plugin. Now these
-	  levels are for reporting issues from users.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4130>
+	* ext/dash/gstdashdemux.c:
+	  dashdemux: Basic support for container-specific-track-id tag
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6041>
 
-2023-02-12 22:37:01 +0800  He Junyan <junyan.he@intel.com>
+2024-02-11 20:35:19 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/jpegformat/gstjpegparse.c:
-	  jpegparse: reset parse state when the SOI is not the first marker
-	  There may be garbage or some bits before a SOI comes in some problematic
-	  mjpeg streams. For example, some network error may cause the EOI marker
-	  of the previous frame lost, and when the new frame's SOI comes, we still
-	  use the state of the last frame, which will generate errors.
-	  For this kind of frames without EOI, if that frame already has some data
-	  (the SOS segment is detected), we still push it as a frame with CORRUPTED
-	  flag set. But if not, we just discard all the data before the new SOI.
-	  Co-Authored-By: Víctor Jáquez <vjaquez@igalia.com>
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4130>
+	* sys/d3d12/gstd3d12dxgicapture.cpp:
+	  d3d12screencapturesrc: Fix choppy display
+	  According to recommendation from MS, IDXGIOutputDuplication::ReleaseFrame()
+	  needs to be called just before IDXGIOutputDuplication::AcquireNextFrame()
+	  for performance reasons, so that driver can accumulate dirty rects
+	  and update texture at once. But it seems to cause choppy output.
+	  Do release acquired frame immediately once processing done,
+	  like d3d11 implementation does.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6092>
 
-2023-03-04 16:13:04 +0000  Tim-Philipp Müller <tim@centricular.com>
+2024-02-07 19:07:24 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* meson.build:
-	  Back to development
+	* ext/vulkan/gstvulkan.c:
+	* ext/vulkan/meson.build:
+	* ext/vulkan/vkh265dec.c:
+	* ext/vulkan/vkh265dec.h:
+	  vulkanh265dec: add H.265 decoder
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6089>
 
-=== release 1.22.1 ===
+2024-02-08 11:32:56 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-03-04 13:42:32 +0000  Tim-Philipp Müller <tim@centricular.com>
+	* tests/check/libs/vkvideodecode.c:
+	  tests: vkvideodecode: add H.265 decoding test
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6089>
 
-	* NEWS:
-	* RELEASE:
-	* gst-plugins-bad.doap:
-	* meson.build:
-	  Release 1.22.1
+2024-02-07 20:11:59 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-02-23 14:14:57 +0100  Piotr Brzeziński <piotr@centricular.com>
+	* tests/check/libs/vkvideodecode.c:
+	  tests: vkvideodecode: choose the queue's codec
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6089>
 
-	* sys/applemedia/meson.build:
-	* sys/applemedia/vtdec.c:
-	* sys/applemedia/vtdec.h:
-	  vtdec: Correctly retrieve reorder queue length from SPS
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4110>
+2024-02-07 20:06:37 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-03-01 06:36:15 +1100  Jan Schmidt <jan@centricular.com>
+	* tests/check/libs/vkvideodecode.c:
+	  tests: vkvideodecode: h264 prefix to global variables
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6089>
 
-	* sys/applemedia/avfvideosrc.m:
-	  avfvideosrc: Fix description and trailing whitespace
-	  Minor fix to mention that the element is also useful on MacOS,
-	  and remove some trailing whitespace
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4096>
+2024-02-09 10:22:55 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-03-01 06:32:19 +1100  Jan Schmidt <jan@centricular.com>
+	* tests/check/libs/vkvideodecode.c:
+	  tests: vkvideodecode: refactor functions for later reuse
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6089>
 
-	* sys/applemedia/avfvideosrc.m:
-	  avfvideosrc: Don't wait on main thread for permissions request
-	  Recursively invoking the NSMainLoop can cause crashes in
-	  applications that don't expect it. Instead of waiting for
-	  permission to be granted, move the wait later - until we
-	  actually need device permissions when starting the capture
-	  session. That moves the wait into the streaming thread
-	  instead of the application thread that's setting the pipeline
-	  state to READY.
-	  Instead of a manual state change implementation to open
-	  and close the device, use the basesrc start/stop methods that
-	  are intended for the purpose.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4096>
+2024-02-09 11:30:58 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-02-28 15:26:45 +0100  Piotr Brzeziński <piotr@centricular.com>
+	* ext/vulkan/vkh264dec.c:
+	  vulkanh264dec: don't remove graphics queue if it's the same as decoder
+	  Since graphics queue is used for the context transference. So lets' keep it with
+	  its own reference.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6089>
 
-	* sys/applemedia/vtenc.c:
-	  vtenc: Fix checking for certain CPU variants when running in VMs
-	  These checks were introduced to prevent exposing ARGB64/RGBA64 in the caps
-	  when running on M1 Pro/Max with macOS <13 because of a bug in VideoToolbox.
-	  Unfortunately, the initial buffer size of 15 is too short when running
-	  in a VM - the CPU brand string there looks like "Apple M1 Pro (Virtual)",
-	  which due to its length causes sysctlbyname to return -1, resulting in
-	  broken formats still showing up in the caps.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4082>
+2024-02-07 19:06:52 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-01-28 02:32:13 +0900  Seungha Yang <seungha@centricular.com>
+	* ext/vulkan/vkh264dec.c:
+	  vulkanh264dec: small cleanups
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6089>
 
-	* tools/gst-transcoder.c:
-	  tools: Make sure UTF-8 encoded command line arguments on Windows
-	  On Windows, arguments passed in main() are system codepage
-	  encoded and might not be valid UTF-8 string.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4072>
+2024-02-05 15:14:38 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-02-20 03:20:46 +0900  Seungha Yang <seungha@centricular.com>
+	* gst-libs/gst/vulkan/gstvkdecoder.c:
+	  vulkan/decoder: fix documentation generation
+	  GstVulkanDecoderParameters is an union, not a struct, and that isn't handled by
+	  hotdoc.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6089>
 
-	* sys/nvcodec/gstnvencoder.cpp:
-	  nvencoder: Fix b-frame encoding on Linux
-	  On Windows, Win32 event handle is used to wait for encoded output,
-	  but it's not available on Linux. We should delay bitstream locking
-	  if encoder returns "need-more-input"
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4008>
+2024-02-07 19:03:56 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2023-02-22 00:47:09 +0900  Seungha Yang <seungha@centricular.com>
+	* gst-libs/gst/vulkan/gstvkdecoder.c:
+	  vulkan/decoder: don't initialize function table once
+	  Since it has to be associated with the device and it gets destroyed when the
+	  decoder is freed.
+	  Now it's created when the decoder starts and it's flagged.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6089>
 
-	* gst/videoparsers/gsth265parse.c:
-	* tests/check/elements/h265parse.c:
-	  h265parse: Always set profile on src caps
-	  h265parse should provide profile for autoplugging
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4068>
+2024-02-10 19:23:25 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-02-24 21:58:00 +0800  He Junyan <junyan.he@intel.com>
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12vp8dec.cpp:
+	* sys/d3d12/gstd3d12vp8dec.h:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add VP8 decoder
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6088>
 
-	* sys/va/gstjpegdecoder.c:
-	  jpegdecoder: fail early if no input caps have been provided
-	  The jpegdecoder class does not implement the ->parse() virtual function,
-	  and we always need to add the jpegparse element before it. So we should
-	  set_needs_format of the decoder to TRUE, then if no parse before it, it
-	  can fail with a "not-negotiated" error early, rather than go on and
-	  generate unexpected error.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1829
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4066>
+2024-02-10 20:11:29 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-02-24 21:49:27 +0800  He Junyan <junyan.he@intel.com>
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Fix bitstream buffer usage
+	  Resource state of a buffer in upload heap should stay in
+	  generic-read although it's effectively in common state. Some drivers
+	  complains about the wrong state.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6088>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	  av1decoder: fail early if no input caps have been provided
-	  The av1decoder class does not implement the ->parse() virtual function,
-	  and we always need to add the av1parse element before it. So we should
-	  set_needs_format of the decoder to TRUE, then if no parse before it, it
-	  can fail with a "not-negotiated" error early, rather than go on and
-	  generate unexpected error.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4066>
+2024-02-10 20:01:14 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-02-24 21:38:48 +0800  He Junyan <junyan.he@intel.com>
+	* gst-libs/gst/dxva/gstdxvavp8decoder.cpp:
+	  dxvavp8decoder: Fix reference frame setting
+	  Fixing typo
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6088>
 
-	* gst-libs/gst/codecs/gstvp9decoder.c:
-	  vp9decoder: fail early if no input caps have been provided
-	  The vp9decoder class does not implement the ->parse() virtual function,
-	  and we always need to add the vp9parse element before it. So we should
-	  set_needs_format of the decoder to TRUE, then if no parse before it, it
-	  can fail with a "not-negotiated" error early, rather than go on and
-	  generate unexpected error.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4066>
+2024-02-09 20:24:13 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-2023-02-24 21:27:27 +0800  He Junyan <junyan.he@intel.com>
+	* sys/aja/meson.build:
+	  aja: suppress compiler warnings for aja ntv2 subproject
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6087>
 
-	* gst-libs/gst/codecs/gstvp8decoder.c:
-	  vp8decoder: fail early if no input caps have been provided
-	  The vp8decoder class does not implement the ->parse() virtual function,
-	  it can only accepts frame aligned data. If some element such as filesrc
-	  feed it with unaligned data, the behaviour is undecided. So we should
-	  set_needs_format of the decoder to TRUE, then it can fail with a
-	  "not-negotiated" error early, rather than go on and generate unexpected
-	  error.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4066>
+2024-02-10 01:45:44 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-02-24 21:12:40 +0800  He Junyan <junyan.he@intel.com>
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/amfcodec/gstamfav1enc.cpp:
+	* sys/amfcodec/gstamfh264enc.cpp:
+	* sys/amfcodec/gstamfh265enc.cpp:
+	  amfcodec: Update plugin cache
+	  Adding AV1 encoder documentation (added in 1.22) with various
+	  new properties
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6084>
 
-	* gst-libs/gst/codecs/gstmpeg2decoder.c:
-	  mpeg2decoder: fail early if no input caps have been provided
-	  The mpeg2decoder class does not implement the ->parse() virtual function,
-	  and we always need to add the mpegvideoparse element before it. So we should
-	  set_needs_format of the decoder to TRUE, then if no parse before it, it
-	  can fail with a "not-negotiated" error early, rather than go on and
-	  generate unexpected error.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4066>
+2024-02-09 13:38:53 +0100  Jonas K Danielsson <jonas.danielsson@spiideo.com>
 
-2023-02-24 21:09:31 +0800  He Junyan <junyan.he@intel.com>
+	* ext/srt/meson.build:
+	  meson: srt: make sure srt_dep is defined
+	  Without this we will get errors when we try to build with srt disabled.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6082>
+
+2023-12-18 15:39:07 -0500  Xavier Claessens <xavier.claessens@collabora.com>
+
+	* tests/examples/nvcodec/cudaipc.c:
+	  structure: Allow STRICT flag only in _serialize_full()
+	  The STRICT flag makes _serialize() nullable which is an API break for
+	  bindings. Forbid it and add _serialize_full() that accepts it and is
+	  properly annotated.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5829>
 
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	  h264decoder: fail early if no input caps have been provided
-	  The h264decoder class does not implement the ->parse() virtual function,
-	  and we always need to add the h264parse element before it. So we should
-	  set_needs_format of the decoder to TRUE, then if no parse before it, it
-	  can fail with a "not-negotiated" error early, rather than go on and
-	  generate unexpected error.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4066>
+2024-02-09 10:50:39 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-2023-02-24 20:15:20 +0800  He Junyan <junyan.he@intel.com>
+	* gst/sdp/gstsdpdemux.c:
+	  sdpdemux: Add SDP message (aka session) attributes to the caps too
+	  They apply to all medias, and if overridden by the specific media then
+	  they would also be overridden just below in the created caps.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6079>
+
+2024-02-09 20:27:29 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/winks/ksvideohelpers.c:
+	  ksdeviceprovider: Fix crash while probing device caps
+	  Ignore unexpected media type reported by driver, instead of abort
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6081>
+
+2024-02-08 15:50:43 +0100  Edward Hervey <edward@centricular.com>
+
+	* ext/musepack/gstmusepackdec.c:
+	  musepack: Prefer using FFmpeg musepack decoder/demuxer
+	  * Bump the rank of the musepack v7/v8 FFmpeg demuxers to SECONDARY
+	  * Bump the rank of the musepack v7/v8 FFmpeg audio decoders to SECONDARY
+	  * Demote the rank of the musepackdec element to MARGINAL
+	  This is for two reasons:
+	  * The musepack library is no longer maintained, whereas the FFmpeg
+	  implementation can/will receive fixes
+	  * The `musepackdec` implementation was a all-in-one "parsing and decoding" blob
+	  which doesn't play nicely with decodebin3 and others
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3033
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6074>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  h265decoder: fail early if no input caps have been provided
-	  The h265decoder class does not implement the ->parse() virtual function,
-	  and we always need to add the h265parse element before it. So we should
-	  set_needs_format of the decoder to TRUE, then if no parse before it, it
-	  can fail with a "not-negotiated" error early, rather than go on and
-	  generate unexpected error.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4066>
+2024-02-08 23:03:29 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-01-27 12:45:10 +0100  Robert Rosengren <robertr@axis.com>
+	* ext/closedcaption/gstccconverter.c:
+	  ccconverter: Send gap event if generated output is empty
+	  Sends a gap event if nothing to output for a given input buffer.
+	  For example, an input buffer might not contain any caption data
+	  for downstream requested field, then we need to inform downstream
+	  of the case.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6073>
+
+2022-02-09 15:45:16 +0100  Guillaume Desmottes <guillaume.desmottes@onestream.live>
+
+	* sys/bluez/gstavdtpsink.c:
+	  avdtpsink: post error message when failing to start
+	  Subclasses are supposed to report errors messages if their start
+	  implementation failed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1678>
 
-	* ext/curl/gstcurlhttpsrc.c:
-	  curlhttpsrc: Add curl anyauth option
-	  Add curl anyauth option to support http request to endpoints not using
-	  only basic authentication (as default in curl). Also aligning with
-	  curlhttpsink that already uses this option.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4065>
+2024-01-19 14:35:05 +0100  Marvin Schmidt <marv@exherbo.org>
 
-2023-02-22 15:18:12 +0100  Célestin Marot <c.marot@intopix.com>
+	* ext/wpe/gstwpesrcbin.cpp:
+	* ext/wpe/gstwpethreadedview.cpp:
+	* ext/wpe/gstwpethreadedview.h:
+	* ext/wpe/gstwpevideosrc.cpp:
+	* ext/wpe/meson.build:
+	  wpe: Rename WPEView to GstWPEThreadedView
+	  WebKit commit b12e7ed2ad3a ("WPE Upstream the new WPE platform API
+	  https://bugs.webkit.org/show_bug.cgi?id=265286")1 added a `WPEView` typedef
+	  which clashes with our `WPEView` class.
+	  Rename the `WPEView` class to `GstWPEThreadedView` to avoid the collision.
+	  Also prefix the `WPEContextThread` class with `Gst` and rename the
+	  source files to reflect the new class name and use lowercase while at it
+	  for consistency
+	  1 https://github.com/WebKit/WebKit/commit/b12e7ed2ad3a47ab322507ebac214225f2298acc
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6065>
+
+2023-05-14 16:36:13 +0200  Carlos Rafael Giani <crg7475@mailbox.org>
+
+	* gst/switchbin/gstswitchbin.c:
+	  switchbin: Rework gst_switch_bin_get_allowed_caps() to limit path lock
+	  Previously, the path lock was held even while issuing caps queries to
+	  other elements. This can lead to deadlocks in more complex pipelines.
+	  Avoid this by reworking gst_switch_bin_get_allowed_caps() to acquire
+	  references to switchbin paths and then releasing the path lock.
+	  Subsequent operations in that function then act on the acquired
+	  references, thus eliminating the need for holding the path lock for
+	  the entirety of that function.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4632>
+
+2023-05-10 12:38:11 +0200  Carlos Rafael Giani <crg7475@mailbox.org>
+
+	* gst/switchbin/gstswitchbin.c:
+	  switchbin: Always respond to caps query with all allowed caps
+	  The caps query specifies _all_ caps that the element can handle, not just
+	  caps from the current path element. If for example a switchbin has two
+	  paths, with one having an element that handles video/x-h264, and another
+	  path whose element handles video/x-raw, and the second path is the
+	  current path, then the existing code would report only video/x-raw as
+	  supported. Fix this by report all allowed caps, even if there is a
+	  current path defined.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4632>
+
+2023-05-09 15:44:02 +0200  Carlos Rafael Giani <crg7475@mailbox.org>
+
+	* gst/switchbin/gstswitchbin.c:
+	  switchbin: Update and improve documentation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4632>
+
+2023-05-09 16:31:44 +0200  Carlos Rafael Giani <crg7475@mailbox.org>
+
+	* gst/switchbin/gstswitchbin.c:
+	  switchbin: Forward filter caps to internal caps queries
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4632>
+
+2023-05-04 21:20:18 +0200  Carlos Rafael Giani <crg7475@mailbox.org>
+
+	* gst/switchbin/gstswitchbin.c:
+	  switchbin: Rework allowed-caps computation to allow for passthrough paths
+	  The rationale is that a passthrough path (= one with no element) behaves
+	  as if the switchbin's sink- and srcpad were one. In particular, internal
+	  caps queries (needed for computing the allowed caps) then go to the peers
+	  instead to path elements. Rework gst_switch_bin_get_allowed_caps () for
+	  a clear handling of NULL path elements and for proper dataflow passthrough
+	  and caps & accept-caps query handling.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4632>
+
+2023-05-04 21:18:28 +0200  Carlos Rafael Giani <crg7475@mailbox.org>
+
+	* gst/switchbin/gstswitchbin.c:
+	  switchbin: Improve filter caps application
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4632>
+
+2023-05-03 09:55:27 +0200  Carlos Rafael Giani <crg7475@mailbox.org>
+
+	* gst/switchbin/gstswitchbin.c:
+	* gst/switchbin/gstswitchbin.h:
+	  switchbin: Remove leftover drop probe code bits
+	  The drop probe was present in early switchbin versions to implement paths
+	  that drop dataflow. However, this feature turned out to be too problematic
+	  and thus was removed. Some bits remained though. This commit removes those
+	  bits and clarifies that in the current switchbin version, a NULL path
+	  element instead means passthrough.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4632>
+
+2024-01-16 16:50:11 +0200  Sebastian Dröge <sebastian@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/aja/gstajasink.cpp:
+	* sys/aja/gstajasink.h:
+	  ajasink: Add HANC/VANC ancillary data from GstAncillaryMeta
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5488>
+
+2024-01-16 15:19:42 +0200  Sebastian Dröge <sebastian@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/aja/gstajasrc.cpp:
+	* sys/aja/gstajasrc.h:
+	  ajasrc: Add GstAncillaryMeta for any HANC/VANC ancillary data that is captured
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5488>
+
+2024-02-05 23:35:31 -0500  Daniel Morin <daniel.morin@collabora.com>
+
+	* ext/analyticsoverlay/gstobjectdetectionoverlay.c:
+	  analyticsoverlay: fix gst-launch exemple
+	  - Adapt example to new onnx elements.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6062>
+
+2024-02-07 21:55:01 +0900  Seungha Yang <seungha@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/nvcodec/gstcudaipcclient.cpp:
+	* sys/nvcodec/gstcudaipcserver.cpp:
+	* sys/nvcodec/gstcudaipcsink.cpp:
+	* sys/nvcodec/gstnvencoder.cpp:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	* sys/nvcodec/gstnvjpegenc.cpp:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	  nvcodec: Update plugin cache
+	  Updating plugin cache for IPC elements, JPEG encoder, and newly added
+	  properties. Also removing Gst*SLDec which does not exist anymore
+	  but renamed to Gst*Dec.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6070>
+
+2024-02-07 12:13:29 +0200  Sebastian Dröge <sebastian@centricular.com>
+
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	  analytics: Allow getting a related meta with ANY type
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6068>
 
-	* sys/d3d11/gstd3d11overlaycompositor.cpp:
-	  d3d11overlaycompositor: fix texture width and height
-	  The dimension of the overlay texture directly corresponds to the size of the overlay **buffer** which is given by its video meta.
-	  The dimension at which the overlay should be displayed directly correspond to the overlay `render_width`and `render_height`.
-	  This match the behavior of glimagesink
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4053>
+2024-01-31 05:16:39 +1100  Jan Schmidt <jan@centricular.com>
 
-2023-02-22 11:52:38 +0000  Tim-Philipp Müller <tim@centricular.com>
+	* gst/mpegtsdemux/tsdemux.c:
+	  tsdemux: Detect reaching the end of configured segment
+	  If the current segment has a configured stop point, detect
+	  when when pad timestamps proceed past that point and mark
+	  them as EOS. Otherwise, tsdemux continues streaming
+	  the whole input downstream (unless something downstream detects
+	  and returns EOS for us)
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6023>
 
-	* po/fur.po:
-	  gst-plugins-bad: update translations
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4041>
+2024-01-25 03:02:59 +1100  Jan Schmidt <jan@centricular.com>
 
-2023-02-16 15:03:25 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+	* gst/mpegtsdemux/mpegtsbase.c:
+	* gst/mpegtsdemux/tsdemux.c:
+	  tsdemux: Support segment seeking
+	  Add support for segment seeks and posting segment-done for
+	  seamless non-flushing looping
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6023>
 
-	* gst-libs/gst/va/gstvaallocator.c:
-	  vaallocator: Check return value from va_sync_surface
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4007>
+2024-02-05 23:04:45 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-2023-02-09 16:54:16 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+	* ext/openjpeg/meson.build:
+	  meson: Fix several warnings in the build
+	  Deprecations, incorrect options, etc.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6058>
 
-	* sys/va/gstvaav1dec.c:
-	* sys/va/gstvabaseenc.c:
-	* sys/va/gstvabasetransform.c:
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvah264enc.c:
-	  va: Fix some code defects
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4007>
+2024-02-06 18:09:02 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-2022-12-22 10:17:42 +0000  Philippe Normand <philn@igalia.com>
+	* meson.build:
+	  Back to development
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6066>
 
-	* ext/wpe/WPEThreadedView.cpp:
-	* ext/wpe/wpe-extension/gstwpeextension.c:
-	  wpe: Logging fixes for the WebExtension
-	  Using logging macros without a `GST_CAT_DEFAULT` in scope leads to critical
-	  warnings.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4022>
+=== release 1.23.1 ===
 
-2023-02-21 15:19:35 +1100  Matthew Waters <matthew@centricular.com>
+2024-02-06 16:37:19 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* ext/closedcaption/gstccconverter.c:
-	  ccconverter: don't debug a potentially freed filter caps
-	  Fixes a use-after-free
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4013>
+	* NEWS:
+	* RELEASE:
+	* gst-plugins-bad.doap:
+	* meson.build:
+	  Release 1.23.1
 
-2023-02-21 00:27:27 +0900  Seungha Yang <seungha@centricular.com>
+2024-02-04 12:20:41 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Fix rendering on external handle
-	  Partial revert of the commit 068a5c1053ae05b3c7747243948447e764d25aa6.
-	  That introduced size mismatch between internal and external HWND
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4010>
+	* gst-libs/gst/codecparsers/gstav1bitwriter.h:
+	  codecparsers: av1bitwriter: fix Since marker
+	  ... and add them to the symbol index to make hotdoc happy
 
-2023-02-19 12:01:59 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2024-02-04 10:20:59 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/va/gstvah265enc.c:
-	  vah265enc: Use helper to update properties.
-	  This is a continuation of the original patch by
-	  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4009>
+	* gst-libs/gst/codecparsers/gsth264parser.h:
+	* gst-libs/gst/codecparsers/gsth265parser.h:
+	  codecparsers: document new GstH265Level and GstH264Level enums
+	  ... and add them to the symbol index to make hotdoc happy.
 
-2023-02-14 10:29:00 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2024-02-03 17:43:23 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst-libs/gst/codecparsers/gstav1parser.c:
-	* gst-libs/gst/codecparsers/gsth265parser.c:
-	  av1parser, h265parser: Fix some code defects
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4003>
+	* gst-libs/gst/va/gstvapool.c:
+	  va: fix g-i annotation
+	  This parameter annotation is unknown :allow-null-none None
 
-2023-02-07 04:58:04 +1100  Jan Schmidt <jan@centricular.com>
+2024-01-26 04:57:21 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* ext/webrtc/gstwebrtcstats.c:
-	  webrtc: Calculate the jitter for remote-inbound-rtp stats
-	  Populate the clock-rate in the internal stats structure, so
-	  it can be used by the _get_stats_from_remote_rtp_source_stats()
-	  method to calculate remote receivers' jitter.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3994>
+	* gst/y4m/gsty4mdec.c:
+	  y4mdec: Fix some debug log categories
+	  Fatal errors should be logged as ERROR, extremely spammy messages
+	  should be logged with TRACE
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5997>
+
+2024-01-26 04:26:07 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/y4m/gsty4mdec.c:
+	  y4mdec: Parse extended headers written out by FFmpeg
+	  References:
+	  https://wiki.multimedia.cx/index.php/YUV4MPEG2
+	  https://github.com/FFmpeg/FFmpeg/blob/eee3b7e2/libavformat/yuv4mpegenc.c#L74-L166
+	  The primary purpose is to add high bit-depth y4m support, which is
+	  commonly used for testing codecs.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5997>
+
+2024-01-26 03:44:44 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+
+	* gst/y4m/gsty4mdec.c:
+	  y4mdec: Simplify header parsing
+	  Use string parsing instead of pointer arithmetic, which makes the code
+	  easier to understand and less error-prone. This has no functional
+	  changes, and is preparation for the next commit, which extends the
+	  header parsing.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5997>
 
-2023-02-01 10:44:26 +1100  Jan Schmidt <jan@centricular.com>
+2024-01-17 13:35:48 +0700  sergey radionov <rsatom@gmail.com>
 
-	* ext/webrtc/gstwebrtcstats.c:
-	  webrtcbin: Report full codec-stats for source pads
-	  Use the current caps for webrtcbin srcpads, as received_caps
-	  are only stored for sink pads based on incoming caps events.
-	  Makes it so that webrtcbin stats reports contain fuller
-	  codec information.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3994>
+	* gst-libs/gst/webrtc/nice/nice.c:
+	  nice: resolve result should go to nice helper thread
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5921>
 
-2023-02-17 14:56:20 +0800  Yinhang Liu <yinhang.liu@intel.com>
+2024-02-05 22:27:59 -0500  Daniel Morin <daniel.morin@collabora.com>
 
-	* sys/msdk/gstmsdk.c:
-	  msdkav1enc: fix the category for msdkav1enc debug
-	  The msdkav1enc debug initialized with gst_msdkav1dec_debug,
-	  fix this.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3991>
+	* ext/onnx/decoders/gstssdobjectdetector.c:
+	* ext/onnx/gstonnxclient.cpp:
+	  onnx: fix, update tensor producer and consumers
+	  - Propagate GstTensor.type becoming to GstTensor.data_type to tensor producer
+	  (onnx) and consumer (TensorDecoder)
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6061>
+
+2024-02-05 14:59:06 -0500  Olivier Crête <olivier.crete@collabora.com>
+
+	* ext/analyticsoverlay/meson.build:
+	  analyticsoverlay: Don't error out on lack on dependency in auto mode
+	  If the option is set to auto, it shouldn't fail if the dependency is missing.
+	  Fixes #3266
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6060>
+
+2024-02-05 17:14:24 +0200  Sebastian Dröge <sebastian@centricular.com>
+
+	* sys/aja/gstajasink.cpp:
+	  ajasink: Remove workaround for NTV SDK bug that is fixed since a while
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6056>
 
-2023-02-16 01:36:41 +0900  Seungha Yang <seungha@centricular.com>
+2024-02-05 14:18:28 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/codectimestamper/gstcodectimestamper.c:
-	  codectimestamper: Fix timestamping on sequence update
-	  ... and enhance debug logging.
-	  Keep internal timestamp offsets on drain, no reason to reset them
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3987>
+	* ext/vulkan/meson.build:
+	* ext/vulkan/vkh264dec.h:
+	  vkh264dec: GST_USE_UNSTABLE_API for plugin compilation
+	  The code to include H264 decoder base class header wrongly disabled the unstable
+	  API  message. This patch fixes it by setting it as a compilation define of the
+	  plugin.¡
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6055>
+
+2024-01-22 16:48:30 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* ext/vulkan/vkupload.c:
+	  vkupload: remove unused parameter fetching
+	  It's not required to create a vulkan buffer to fetch its size since all this
+	  handled by internally by the allocator and it was never needed, so it looks like
+	  dead code. Let's delete it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6028>
+
+2024-02-04 22:06:09 +0700  sergey radionov <rsatom@gmail.com>
+
+	* ext/webrtc/gstwebrtcbin.c:
+	  webrtcbin: it's better to have thread default main context
+	  on thread bound to that main context.
+	  fixes #3271
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6053>
+
+2024-02-04 23:25:19 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12-private.h:
+	* sys/d3d12/gstd3d12commandqueue.cpp:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Fix potential self thread join
+	  Fence data could hold GstD3D12Device directly or indirectly.
+	  Then if it's holding last refcount, the device object will
+	  be released from the device object's internal thread,
+	  and will try join self thread.
+	  Delegates it to other global background thread to avoid
+	  self thread joining.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6042>
+
+2024-02-02 01:17:43 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	  d3d12memory: Remove unused method
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6042>
+
+2024-01-25 00:02:30 -0500  Olivier Crête <olivier.crete@collabora.com>
+
+	* ext/onnx/decoders/gstobjectdetectorutils.cpp:
+	* ext/onnx/decoders/gstobjectdetectorutils.h:
+	* ext/onnx/decoders/gstssdobjectdetector.c:
+	* ext/onnx/decoders/gstssdobjectdetector.h:
+	* ext/onnx/gstonnxclient.cpp:
+	* ext/onnx/gstonnxclient.h:
+	* ext/onnx/meson.build:
+	* ext/onnx/tensor/gsttensormeta.h:
+	  onnx: Port SSD detector to C
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6001>
+
+2024-01-24 22:31:21 -0500  Olivier Crête <olivier.crete@collabora.com>
+
+	* ext/onnx/decoders/gstobjectdetectorutils.cpp:
+	* ext/onnx/decoders/gstobjectdetectorutils.h:
+	* ext/onnx/decoders/gstssdobjectdetector.cpp:
+	* ext/onnx/decoders/gstssdobjectdetector.h:
+	* ext/onnx/meson.build:
+	  onnx: Only read labels file one and use GIO
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6001>
 
-2023-02-15 09:45:28 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2024-01-24 21:31:44 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-	* gst-libs/gst/codecparsers/gsth264bitwriter.c:
-	* gst-libs/gst/codecparsers/gsth265bitwriter.c:
-	  codecparsers: {h264,h265}bitwriter: Remove redundant condition checks
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3978>
+	* ext/onnx/gstonnxclient.cpp:
+	* ext/onnx/gstonnxinference.cpp:
+	* ext/onnx/tensor/gsttensormeta.h:
+	  onnx: Add more tensor data types
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6001>
 
-2023-02-12 23:17:41 +0900  Seungha Yang <seungha@centricular.com>
+2024-01-24 21:22:47 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-	* sys/amfcodec/gstamfav1enc.cpp:
-	  amfav1enc: Set stream-format on caps
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3961>
+	* ext/onnx/decoders/gstssdobjectdetector.cpp:
+	* ext/onnx/tensor/gsttensormeta.c:
+	* ext/onnx/tensor/gsttensormeta.h:
+	  onnx: Remove unecessary gst_tensor_meta_get_all_from_buffer
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6001>
 
-2023-02-12 23:12:21 +0900  Seungha Yang <seungha@centricular.com>
+2024-01-24 21:14:39 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/qsv/gstqsvav1enc.cpp:
-	  qsvav1enc: Set stream-format on caps
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3961>
+	* ext/onnx/tensor/gsttensor.h:
+	* ext/onnx/tensor/gsttensormeta.c:
+	* ext/onnx/tensor/gsttensormeta.h:
+	  onnx: Merge tensor into tensor meta file
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6001>
 
-2023-02-07 16:25:02 +0100  Piotr Brzeziński <piotr@centricular.com>
+2024-01-25 20:09:19 +0100  Loïc Le Page <llepage@igalia.com>
 
-	* sys/applemedia/vtdec.c:
-	* sys/applemedia/vtenc.c:
-	* sys/applemedia/vtutil.h:
-	  vtenc/vtdec: Fix typo in RGBA64_LE availability define
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3962>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/webp/gstwebpenc.c:
+	* ext/webp/gstwebpenc.h:
+	  webpenc: add animation properties
+	  - animation background color
+	  - number of animation loops
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5994>
 
-2023-02-07 16:04:22 +0100  Piotr Brzeziński <piotr@centricular.com>
+2024-01-25 20:06:46 +0100  Loïc Le Page <llepage@igalia.com>
 
-	* sys/applemedia/vtenc.c:
-	  vtenc: Disable ARGB/RGBA64 caps on M1 Pro/Max with macOS <13
-	  Fixes #1358.
-	  Passing ARGB64/RGBA64 to vtenc caused the encoding to fail
-	  when running on M1 Pro/Max variants with macOS 12.x, so let's
-	  remove these formats from caps when such scenario is detected.
-	  This issue appears to have been fixed OS-side in macOS 13.0.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3962>
+	* ext/webp/gstwebpenc.c:
+	  webpenc: don't allow changing resolution in animation mode
+	  - fails on image resolution changes in animation mode
+	  - fails with a log message on invalid color spaces
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5994>
 
-2023-02-09 18:51:30 +0100  Piotr Brzeziński <piotr@centricular.com>
+2024-01-25 19:51:53 +0100  Loïc Le Page <llepage@igalia.com>
 
-	* sys/applemedia/vtdec.c:
-	  vtdec: Fix not waiting for async frames when flushing
-	  This was causing incorrect output when seeking, especially
-	  when used with a multithreaded source like `videotestsrc n-threads=2`.
-	  It should now correctly wait for frames still being processed by VT
-	  while vtdec is flushing.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3937>
+	* ext/webp/gstwebpenc.c:
+	  webpenc: fix naming and libwebp API calls
+	  - uniformize parameters naming
+	  - call symetric init and clear functions systematically from libwebp API
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5994>
 
-2023-02-10 12:52:17 +0100  Alessandro Bono <alessandro.bono369@gmail.com>
+2020-10-23 00:15:32 +0200  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* sys/win32ipc/protocol/win32ipcutils.cpp:
-	  win32ipcutils: Add missing include
-	  We are using std::isspace() with one parameter. That function is defined
-	  in the cctype header.
-	  ```
-	  win32ipcutils.cpp(34): error C2672: 'std::isspace': no matching overloaded function found
-	  win32ipcutils.cpp(34): error C2780: 'bool std::isspace(_Elem,const std::locale &)': expects 2 arguments - 1 provided
-	  ```
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3936>
+	* ext/webp/gstwebpenc.c:
+	* ext/webp/gstwebpenc.h:
+	* ext/webp/meson.build:
+	  webpenc: add support for animated WebP
+	  The libwebp API doesn't match very well with the GstVideoEncoder
+	  API, as it only delivers an unframed bitstream once all pictures
+	  have been processed, which means we can only push a single buffer
+	  manually on our srcpad on finish().
+	  Supporting animated webp is still valuable, and the feature is
+	  behind an opt-in property.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5994>
+
+2024-02-01 18:03:58 -0500  Olivier Crête <olivier.crete@collabora.com>
+
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	  analytics: Always return a string from mtd_type_get_name()
+	  It makes it easier to use in printf() style strings without worrying
+	  about getting a NULL.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6035>
 
-2023-02-06 15:26:48 +0200  Sebastian Dröge <sebastian@centricular.com>
+2023-10-05 16:01:40 +0200  Jonas K Danielsson <jonas.danielsson@spiideo.com>
 
-	* gst-libs/gst/codecparsers/gstav1parser.c:
-	  av1parser: Don't consider unknown metadata OBUs a bitstream error
-	  Just don't parse them.
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1774
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3924>
+	* tests/check/elements/srt.c:
+	* tests/check/meson.build:
+	  srt: Add basic check test of srtsrc|sink
+	  Add some basic tests for the srtsrc and the srtsink and set us up for
+	  more advanced tests down the road.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5440>
 
-2023-02-07 08:49:24 +0100  Edward Hervey <edward@centricular.com>
+2023-09-13 10:42:45 +0200  Jonas K Danielsson <jonas.danielsson@spiideo.com>
 
-	* ext/closedcaption/gstceaccoverlay.c:
-	  closedcaption: Don't leak caps event
-	  All events that we handle should be unreffed
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3906>
+	* ext/srt/gstsrtobject.c:
+	  srt: Add more fields to application/x-srt-statistics
+	  In order to see how many packets where retransmitted and how many was
+	  dropped we add some new fields.
+	  Please see https://github.com/Haivision/srt/blob/master/docs/API/statistics.md
+	  For details about the new fields.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5322>
 
-2023-02-03 22:10:12 +0900  Seungha Yang <seungha@centricular.com>
+2024-02-02 00:18:56 +0100  Heiko Becker <mail@heiko-becker.de>
 
-	* sys/nvcodec/gstnvencoder.cpp:
-	* sys/nvcodec/gstnvencoder.h:
-	* sys/nvcodec/gstnvh264encoder.cpp:
-	* sys/nvcodec/gstnvh265encoder.cpp:
-	  nvencoder: Fix min buffers parameter of allocation query in auto GPU mode
-	  At the time when propose_allocation() get called, encoder session
-	  would not be initialized yet.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3891>
+	* ext/neon/meson.build:
+	  neon: Allow building against neon 0.33.x
+	  From its NEWS file:
+	  "API and ABI backwards-compatible with 0.27.x and later"
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6036>
+
+2024-01-31 15:22:37 +0000  Philippe Normand <philn@igalia.com>
+
+	* ext/srtp/gstsrtpenc.c:
+	  srtpenc: Fix potential leak
+	  When attempting to process a buffer after the rtcp session was closed the output
+	  buffer memory would remain referenced.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6029>
+
+2023-12-05 21:11:31 -0500  Daniel Morin <daniel.morin@collabora.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/analyticsoverlay/gstanalyticsoverlay.c:
+	* ext/analyticsoverlay/gstobjectdetectionoverlay.c:
+	* ext/analyticsoverlay/gstobjectdetectionoverlay.h:
+	* ext/analyticsoverlay/meson.build:
+	* ext/meson.build:
+	* meson_options.txt:
+	  analyticsoverlay: add object-detection overlay
+	  - Overlay analytics-meta-od attached to video buffer
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5768>
+
+2024-01-29 22:26:09 -0500  Daniel Morin <daniel.morin@collabora.com>
+
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.h:
+	  analytics: Change indexes type from i32 -> gsize
+	  - gst_analytics_cls_mtd_get_length() return a gsize, this type dicated index
+	  type for gst_analytics_cls_mtd_get_quark() and
+	  gst_analytics_cls_mtd_get_level().
+	  - Minor cleanup/improvement on index validation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6018>
+
+2024-01-29 22:13:36 -0500  Daniel Morin <daniel.morin@collabora.com>
+
+	* tests/check/libs/analyticsmeta.c:
+	  analytics: add test for OD confidence level retrieval
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6017>
+
+2024-01-29 22:11:17 -0500  Daniel Morin <daniel.morin@collabora.com>
+
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.h:
+	  analytics: add api on OD to retrieve bbox confidence
+	  - Add a specific api to retrieve bbox confidence level without having to
+	  retrieve it's location.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6017>
 
-2023-01-19 11:03:09 +0800  He Junyan <junyan.he@intel.com>
+2024-01-30 02:58:03 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvah264dec.c:
-	  va: Avoid the array index overflow when filling 8x8 scaling list.
-	  The VA API has not defined the scaling list entries for U/V planes
-	  for the 4:4:4 stream. In fact, we do not meet the 4:4:4 format output
-	  for H264 so far, and scaling list is not used frequently, so we just
-	  print out some warning and ignore these scaling list values.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3877>
+	* sys/nvcodec/gstnvjpegenc.cpp:
+	* sys/nvcodec/gstnvjpegenc.h:
+	* sys/nvcodec/meson.build:
+	* sys/nvcodec/plugin.c:
+	  nvcodec: Add JPEG encoder
+	  Adding nvJPEG library based JPEG encoder element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6021>
 
-2022-11-09 20:20:35 +0100  Piotr Brzeziński <piotr@centricular.com>
+2024-01-30 23:17:28 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/applemedia/vtenc.c:
-	  vtenc: Disable HW acceleration for interlaced ProRes
-	  Due to a bug in the VT API, attempting to encode interlaced content
-	  with ProRes results in an error, halting the pipeline instead of
-	  gracefully falling back to software encoding.
-	  Should be removed in the future if Apple ever fixes this issue.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3878>
+	* sys/nvcodec/gstcudafilter.c:
+	* sys/nvcodec/gstcudafilter.h:
+	* sys/nvcodec/meson.build:
+	* sys/nvcodec/plugin.c:
+	  nvcodec: Move runtime compiler check to plugin init function
+	  Required information for other elements
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6021>
 
-2023-02-01 17:26:57 +0200  Sebastian Dröge <sebastian@centricular.com>
+2024-01-12 08:00:31 -0300  Thibault Saunier <tsaunier@igalia.com>
 
 	* docs/plugins/gst_plugins_cache.json:
-	* ext/aom/gstav1dec.c:
-	* ext/aom/gstav1enc.c:
-	  aom: Include stream-format and alignment in the AV1 caps
-	  The decoder does not work with arbitrary alignment and annexb stream
-	  format and the encoder can give the information that it outputs
-	  obu-stream/tu to downstream.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3873>
+	* gst/autoconvert/gstautodeinterlace.c:
+	* gst/autoconvert/plugin.c:
+	  bad: Update plugins cache
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
 
-2023-02-02 05:04:48 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-19 18:37:14 -0400  Thibault Saunier <tsaunier@igalia.com>
 
-	* sys/nvcodec/gstnvvp9dec.c:
-	  nvvp9dec: Fix return value
-	  It should return GstFlowReturn value, not boolean
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3874>
+	* gst/autoconvert/gstbaseautoconvert.c:
+	* gst/autoconvert/gstbaseautoconvert.h:
+	  auto: Reuse subbins instead of recreating them over and over
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
 
-2023-01-27 15:54:48 -0300  Thibault Saunier <tsaunier@igalia.com>
-
-	* gst/transcode/gsturitranscodebin.c:
-	  uritranscodebin: Fix unref of NULL
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3837>
-
-2022-12-30 00:49:27 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst/mpegdemux/gstmpegdemux.c:
-	  mpegpsdemux: Ignore DTS if PTS < DTS
-	  It's possibly timestamp rollover case. But PTS < DTS is already
-	  invalid case anyway.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3836>
+2023-10-10 16:05:34 -0300  Thibault Saunier <tsaunier@igalia.com>
 
-2023-01-24 23:26:50 +0900  Seungha Yang <seungha@centricular.com>
+	* gst/autoconvert/gstautovideoconvert.c:
+	  autoconvert: Force raw memory when using videoconvertscale
+	  videoconvertscale advertises `ANY` feature, but it supports it only
+	  in passthrough. Our goal with autoconvert is to ensure that  conversion
+	  is possible with the elements that are being plugged so we avoid
+	  plugging `videoconvertscale` if the memory type is not system memory.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
 
-	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
-	  wasapi2src: Fix loopback capture on Windows 10 Anniversary Update
-	  ... or older. Work around an OS bug that loopback capture
-	  device doesn't notify event.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1738
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3820>
+2023-04-29 00:33:26 +0200  Thibault Saunier <tsaunier@igalia.com>
 
-2023-01-04 17:30:47 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* gst/autoconvert/gstautovideoconvert.c:
+	  autovideoconvert: Use cudaconvert for formats not allowed by glcolorconverts
+	  There are some pixel formats supported by `cudaconvert` but not `glcolorconvert`
+	  so prefer using `cudaconvert` for those cases rather than using
+	  `videoconvertscale` and system memory
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
 
-	* gst-libs/gst/vulkan/gstvkmemory.c:
-	  vulkan: memory: Flush non coherent memory after write.
-	  Spec 7.1.3:
-	  If a memory object does not have the VK_MEMORY_PROPERTY_HOST_COHERENT_BIT
-	  property, then vkFlushMappedMemoryRanges must be called in order to guarantee
-	  that writes to the memory object from the host are made available to the host
-	  domain, where they can be further made available to the device domain via a
-	  domain operation. Similarly, vkInvalidateMappedMemoryRanges must be called to
-	  guarantee that writes which are available to the host domain are made visible to
-	  host operations.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3817>
+2023-04-24 15:54:47 -0400  Thibault Saunier <tsaunier@igalia.com>
 
-2023-01-24 11:26:02 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+	* gst/autoconvert/gstautovideoflip.c:
+	* gst/autoconvert/gstautovideoflip.h:
+	* gst/autoconvert/meson.build:
+	* gst/autoconvert/plugin.c:
+	  auto: Add an 'autovideoflip' element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2023-04-18 18:13:54 -0400  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstbaseautoconvert.c:
+	  autoconvert: Accept new caps when they are exactly equal to previous ones
+	  That basically was overlooked as the code was clearly intending to do that
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2023-03-31 17:14:19 -0300  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstautodeinterlace.c:
+	* gst/autoconvert/gstautodeinterlace.h:
+	* gst/autoconvert/gstautovideo.c:
+	* gst/autoconvert/gstautovideo.h:
+	* gst/autoconvert/gstautovideoconvert.c:
+	* gst/autoconvert/gstautovideoconvert.h:
+	* gst/autoconvert/meson.build:
+	* gst/autoconvert/plugin.c:
+	  auto: Add a gstautodeinterlace element
+	  Which can do colorspace conversion if necessary.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2023-03-31 13:28:09 -0300  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstautoconvert.c:
+	* gst/autoconvert/gstautovideoconvert.c:
+	* gst/autoconvert/gstautovideoconvert.h:
+	* gst/autoconvert/gstbaseautoconvert.c:
+	* gst/autoconvert/gstbaseautoconvert.h:
+	* tests/validate/autovideoconvert/renegotiate.validatetest:
+	* tests/validate/autovideoconvert/renegotiate/flow-expectations/log-^convert-src569JNRXZghikmsexpected:
+	  autovideoconvert: Handle passing bin description instead of factories
+	  This way we can build our own well know bins for conversion keeping the
+	  code simple.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2023-03-30 17:04:58 -0300  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstautoconvert.c:
+	* gst/autoconvert/gstautoconvert.h:
+	* gst/autoconvert/gstbaseautoconvert.c:
+	* gst/autoconvert/gstbaseautoconvert.h:
+	* gst/autoconvert/meson.build:
+	  autoconvert: Factor out a new GstBaseAutoConvert class
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
 
-	* sys/nvcodec/plugin.c:
-	  nvcodec: Log readable errors when initializing CUDA
-	  It is really difficult for people to figure out why nvcodec has
-	  0 features. Even the debug log is cryptic. Also make sure the errors
-	  go to the ERROR log level, which is more likely to be enabled by
-	  default.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3813>
+2022-03-28 19:09:56 +0200  Thibault Saunier <tsaunier@igalia.com>
 
-2023-01-24 11:16:38 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+	* gst/autoconvert/gstautovideoconvert.c:
+	  auto: Expose colorspace and scaler elements for well know elements
+	  And require Scaler in the class of elements to be plugged by
+	  autovideoconvert
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2021-05-25 20:44:46 -0400  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstautoconvert.c:
+	* tests/validate/autovideoconvert/renegotiate.validatetest:
+	* tests/validate/autovideoconvert/renegotiate/flow-expectations/log-convert-src-expected:
+	* tests/validate/meson.build:
+	  autoconvert: Handle reconfiguring on the srcpad
+	  Only upstream renegotiation was properly handled, we needed to answer
+	  that when downstream forces a renegotiation we take into account the
+	  new downstream restrictions.
+	  And add tests for it
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2021-05-24 16:07:41 -0400  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstautoconvert.c:
+	  autoconvert: Remove unused elements from the bin
+	  Instead of letting all the elements that were added into the bin,
+	  add them only when strictly needed and removed them when we stop using
+	  them.
+	  With previous refactoring we are keeping them in our own hashmap in
+	  amy case so we can keep reusing the same elements as before.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2021-05-21 23:06:34 -0400  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstautovideoconvert.c:
+	  autovideoconvert: Ignore elements with rank == NONE
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2021-05-21 22:25:15 -0400  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstautoconvert.c:
+	  autoconvert: Fix the way we compare element types
+	  We used to conside elements that were subclassses of another
+	  element type as being the same (for example with videoconvertscale,
+	  bother videoconvert and videoscale are subclasses of videoconvertscale
+	  and that code was lost)
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2021-05-20 23:46:15 -0400  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstautoconvert.c:
+	* gst/autoconvert/gstautoconvert.h:
+	  autoconvert: Stop using qdata and unsafe weak refs
+	  We are still using internal pads that are not added to the bin
+	  but we now have a subclass and avoid qdata and weak refs as
+	  they are not MT safe.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2021-05-20 18:50:46 -0400  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstautoconvert.c:
+	* gst/autoconvert/gstautoconvert.h:
+	* gst/autoconvert/gstautovideoconvert.c:
+	* gst/autoconvert/gstautovideoconvert.h:
+	  autovideoconvert: Make it a subclass of GstAutoConvert
+	  Instead of a wrapper, making it much simpler.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
 
-	* sys/nvcodec/plugin.c:
-	  nvcodec: Fix reporting of CuDeviceGetCount error
-	  cuda_ret is was always going to be CUDA_SUCCESS in the error log.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3813>
+2021-05-20 18:13:27 -0400  Thibault Saunier <tsaunier@igalia.com>
 
-2023-01-25 16:46:42 +0000  Tim-Philipp Müller <tim@centricular.com>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/autoconvert/gstautoconvert.c:
+	* gst/autoconvert/meson.build:
+	  autoconvert: Add a 'factory-names' property
+	  Making the element more gst-launch friendly.
+	  This also stop trying to handle usage of ->factories atomic and instead
+	  use the object lock to handle them.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2021-05-20 17:37:47 -0400  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstautoconvert.c:
+	  autoconvert: Remove not thread safe use of ->current_subelement
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2021-05-20 17:22:32 -0400  Thibault Saunier <tsaunier@igalia.com>
+
+	* gst/autoconvert/gstautovideoconvert.c:
+	  autoconvert: Stop using generic element name
+	  It makes it harder to debug for no real benefice in the case
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/899>
+
+2024-01-24 17:11:34 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+
+	* sys/msdk/gstmsdkcaps.c:
+	  msdk: Use gst_video_info_dma_drm_to_video_info to extract video info
+	  Note that we need mappings for all drm_fourcc, otherwise we will get
+	  GST_VIDEO_FORMAT_UNKNOWN for some formats...
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5991>
 
-	* meson.build:
-	  Back to development
+2024-01-30 22:18:06 +0800  He Junyan <junyan.he@intel.com>
 
-=== release 1.22.0 ===
+	* sys/va/gstvabaseenc.c:
+	  va: baseenc: Fix the wrong parameter order to call va_map_buffer()
+	  The current gst_va_base_enc_copy_output_data() uses wrong parameter
+	  order to call va_map_buffer().
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6020>
 
-2023-01-23 19:29:34 +0000  Tim-Philipp Müller <tim@centricular.com>
+2024-01-29 23:25:35 +0900  Seungha Yang <seungha@centricular.com>
 
-	* NEWS:
-	* RELEASE:
-	* gst-plugins-bad.doap:
-	* meson.build:
-	  Release 1.22.0
+	* gst-libs/gst/cuda/stub/cuda.h:
+	* sys/nvcodec/gstnvbaseenc.c:
+	* sys/nvcodec/gstnvencobject.cpp:
+	* sys/nvcodec/plugin.c:
+	  cuda: Report device open error
+	  Call gst_cuda_result() with CUDA_ERROR_NO_DEVICE error code if
+	  we could not open device, so that application can catch the error
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6006>
 
-2023-01-23 16:28:08 +0000  Tim-Philipp Müller <tim@centricular.com>
+2024-01-29 23:20:39 +0900  Seungha Yang <seungha@centricular.com>
 
-	* po/hr.po:
-	* po/ro.po:
-	* po/zh_CN.po:
-	  gst-plugins-bad: update translations
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3773>
+	* gst-libs/gst/cuda/stub/cuda.h:
+	  cuda: Use cuStreamDestroy_v2 API
+	  Sync up with CUDA 11.x/12.0 header
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6006>
+
+2024-01-29 21:37:26 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/nvcodec/gstcudaipc.cpp:
+	* sys/nvcodec/gstcudaipc.h:
+	* sys/nvcodec/gstcudaipcclient.cpp:
+	* sys/nvcodec/gstcudaipcclient.h:
+	* sys/nvcodec/gstcudaipcclient_unix.cpp:
+	* sys/nvcodec/gstcudaipcclient_win32.cpp:
+	* sys/nvcodec/gstcudaipcserver.cpp:
+	* sys/nvcodec/gstcudaipcserver.h:
+	* sys/nvcodec/gstcudaipcsink.cpp:
+	* tests/examples/nvcodec/cudaipc.c:
+	* tests/examples/nvcodec/meson.build:
+	  cudaipc: Add support for custom meta forwarding
+	  Forward custom meta to peer ipcsrc elements
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6006>
 
-2023-01-23 23:29:08 +0900  Seungha Yang <seungha@centricular.com>
+2024-01-24 19:12:57 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	  d3d11compositor: Workaround blending artifacts on Intel platform
-	  Disable vendor implemented converter in d3d11compositor to workaround
-	  artifacts
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3770>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vkformat: fetch correctly feature flags2
+	  Feature flags2 are fetch through VkFormatProperties3KHR and needs more guards
+	  checking.
+	  Moved out all the feature flags fetching to another function for clarity.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6014>
 
-2023-01-19 15:24:05 +0100  Jonas Danielsson <jonas.danielsson@spiideo.com>
+2023-09-13 11:10:56 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* ext/wpe/WPEThreadedView.cpp:
-	* ext/wpe/WPEThreadedView.h:
-	* ext/wpe/gstwpesrcbin.cpp:
-	* ext/wpe/gstwpevideosrc.cpp:
-	  wpe: Add 'run-javascript' action signal
-	  Introduce way of running a script in the context of the internal
-	  webView.
-	  Fixes #1722
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3753>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vkformat: use VK_KHR_get_physical_device_properties2 to guard
+	  and VK_KHR_format_feature_flags2 rather than a meaningless version handling.
+	  Also the patch brings back the usage of features2 for video extensions, use KHR
+	  version to support the guarded symbols.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6014>
+
+2024-01-18 18:35:21 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* ext/vulkan/vkdownload.c:
+	* ext/vulkan/vkupload.c:
+	* gst-libs/gst/vulkan/gstvkvideofilter.c:
+	  vulkan: early return if gst_buffer_pool_set_config() fails
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6013>
 
-2023-01-19 22:40:36 +0900  Seungha Yang <seungha@centricular.com>
+2022-09-12 14:48:50 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/win32ipc/gstwin32ipcvideosrc.cpp:
-	  win32ipcvideosrc: Fix leak in fallback copy path
-	  Clear shared memory after use
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3751>
+	* sys/va/gstvaav1enc.c:
+	* sys/va/gstvaav1enc.h:
+	* sys/va/meson.build:
+	* sys/va/plugin.c:
+	  va: Implement the vaav1enc plugin
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3015>
 
-2023-01-19 15:36:40 +0100  Edward Hervey <edward@centricular.com>
+2023-06-11 20:17:19 +0800  He Junyan <junyan.he@intel.com>
 
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabaseenc.h:
 	* sys/va/gstvah264enc.c:
 	* sys/va/gstvah265enc.c:
-	  va: Fix path leak
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3755>
+	  va: baseenc: Extend the create_output_buffer() to accept prefix data
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3015>
 
-=== release 1.21.90 ===
+2022-11-10 20:36:05 +0800  He Junyan <junyan.he@intel.com>
 
-2023-01-13 19:08:48 +0000  Tim-Philipp Müller <tim@centricular.com>
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabaseenc.h:
+	  va: encoder: Add copy_output_data() helper function
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3015>
 
-	* NEWS:
-	* RELEASE:
-	* gst-plugins-bad.doap:
-	* meson.build:
-	  Release 1.21.90
+2022-11-10 17:00:28 +0800  He Junyan <junyan.he@intel.com>
 
-2023-01-12 22:17:24 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabaseenc.h:
+	* sys/va/gstvah264enc.c:
+	* sys/va/gstvah265enc.c:
+	  va: encoder: extend prepare_output() virtual function
+	  The output of VP9 and AV1 encoder is a little different from the H264
+	  and H265 encoder, it may contain repeat frames and so the output frame
+	  number may be more than the input. We need to call finish_subframe()
+	  when some frame will be repeated later. So we need to extend the
+	  current prepare_output() virtual function.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3015>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	  d3d11memory: Fix potential crash in GstD3D11PoolAllocator
-	  Allocator object can be the final refcount holder, when a GstD3D11Memory
-	  is being released. Do unref allocator once there's no more
-	  remaining operation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3715>
+2022-07-19 17:39:30 +0800  He Junyan <junyan.he@intel.com>
 
-2023-01-12 22:14:30 +0900  Seungha Yang <seungha@centricular.com>
+	* tests/check/libs/av1bitwriter.c:
+	* tests/check/meson.build:
+	  tests: Add the av1 bit code writer test case
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3015>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	  d3d11memory: Remove GstD3D11PoolAllocator::dispose
-	  Clear GstD3D11Device object in finalize method as well
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3715>
-
-2023-01-11 15:41:21 +0000  Tim-Philipp Müller <tim@centricular.com>
-
-	* po/LINGUAS:
-	* po/es.po:
-	* po/hr.po:
-	* po/ka.po:
-	* po/lt.po:
-	* po/nl.po:
-	* po/ru.po:
-	* po/sk.po:
-	* po/sl.po:
-	* po/sr.po:
-	* po/uk.po:
-	* po/zh_TW.po:
-	  gst-plugins-bad: update translations
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3711>
+2022-07-19 17:33:13 +0800  He Junyan <junyan.he@intel.com>
 
-2023-01-11 14:53:39 +0000  Tim-Philipp Müller <tim@centricular.com>
+	* gst-libs/gst/codecparsers/gstav1bitwriter.c:
+	* gst-libs/gst/codecparsers/gstav1bitwriter.h:
+	* gst-libs/gst/codecparsers/meson.build:
+	  codecparsers: Implement the AV1 bit code writer
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3015>
 
-	* scripts/dist-translations.py:
-	* scripts/meson.build:
-	  Fix translation pot files when creating dist tarballs
-	  Add version as per Translation Project requirements and
-	  also add a .pot file without the ABI suffix.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3711>
+2022-09-12 11:17:25 +0800  He Junyan <junyan.he@intel.com>
 
-2023-01-11 12:17:13 +0200  Sebastian Dröge <sebastian@centricular.com>
+	* gst-libs/gst/codecparsers/gstav1parser.h:
+	  codecparsers: av1: add ref_global_motion_params in frame header
+	  In order to ease the AV1 bit writer to write the global_motion_params
+	  when primary_ref_frame is enabled, we need to add this field to set
+	  the global_motion_params of the reference frame.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3015>
 
-	* tools/gst-transcoder.c:
-	  tools: Use `gst_macos_main()` on macOS
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1673
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3709>
+2022-07-19 17:25:50 +0800  He Junyan <junyan.he@intel.com>
 
-2023-01-11 03:23:57 +0900  Seungha Yang <seungha@centricular.com>
+	* gst-libs/gst/codecparsers/gstav1parser.h:
+	  codecparsers: av1: add expected_frame_id in frame header
+	  We need it to ease the bit code writing of AV1 frame header.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3015>
 
-	* meson.build:
-	  meson: gst-plugins-bad: Disable spammy MSVC warning
-	  warning C5051: attribute 'noinline' requires at least '/std:c++20';
-	  ignored
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3705>
+2024-01-28 20:52:40 -0500  Daniel Morin <daniel.morin@collabora.com>
 
-2023-01-09 12:39:55 +0200  Sebastian Dröge <sebastian@centricular.com>
+	* gst/videoparsers/gsth264parse.c:
+	  h264parse: Remove un-needed check on SPS state
+	  Fixes #3254
+	  - Having SEI before SPS is not an issue anymore with AU boundary detection
+	  based on backlog.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6004>
 
-	* gst/mxf/mxfmetadata.c:
-	  mxfmux: Add all local tags to the primer
-	  No matter if they're allocated via GSlice or malloc(). The allocator is
-	  completely irrelevant, all local tags need to be in the primer so they
-	  can be handled.
-	  This didn't have any effect in practice because all local tags that
-	  appear in the muxer are allocated via GSlice. Only from the demuxer they
-	  might be allocated via malloc().
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3699>
+2024-01-23 15:34:15 +0100  Robert Mader <robert.mader@collabora.com>
 
-2022-12-15 18:42:26 +0000  Philippe Normand <philn@igalia.com>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  vaallocator: Allow non-linear modifiers for dummy mem_maps
+	  A client may map dmabufs without the intention to either read or write
+	  to the memory. One example is clients wanting to use the
+	  `gst_video_frame_map()` helper function.
+	  Thus, in order to make buffers from `GstVaDmabufAllocator` conveniently
+	  usable, ignore the modifier check if the client specified neither
+	  `GST_MAP_READ` nor `GST_MAP_WRITE`.
+	  Also skip the `va_sync_surface()` call in that case, as it's likely only
+	  needed for CPU reads/writes.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5965>
+
+2024-01-25 16:16:03 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+
+	* gst-libs/gst/vulkan/gstvkvideo-private.c:
+	  vulkan: Fix clang compiler warning
+	  clang does not like the array index assignment without the `=` sign in
+	  it. This is a gnu extension I believe, and adding the sign is proper.
+	  This fixes the following two warnings:
+	  ```
+	  ../subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.c:32:40:
+	  warning: use of GNU 'missing =' extension in designator -Wgnu-designator
+	  GST_VK_VIDEO_EXTENSION_DECODE_H264 {
+	  ^
+	  =
+	  ../subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkvideo-private.c:36:40:
+	  warning: use of GNU 'missing =' extension in designator -Wgnu-designator
+	  GST_VK_VIDEO_EXTENSION_DECODE_H265 {
+	  ^
+	  =
+	  ```
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5996>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/aom/gstav1enc.c:
-	* ext/aom/gstav1enc.h:
-	  av1enc: Add property for controlling max distance between 2 keyframes
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2743>
+2023-12-19 19:00:57 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-07-11 11:03:16 +0530  Yatin Mann <yatinmaan1@gmail.com>
+	* sys/qsv/gstqsvh264enc.cpp:
+	  qsvh264enc: Always specify field order
+	  qsv runtime will report error when encoding interlaced stream
+	  if session was initialized with unknown field order
+	  but tff/bff is specified in per frame encoding parameter.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5835>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/aom/gstav1enc.c:
-	* ext/aom/gstav1enc.h:
-	  aom: av1enc: Expose more properties
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2743>
+2024-01-25 22:25:19 +1100  Jan Schmidt <jan@centricular.com>
 
-2023-01-08 23:46:40 +0530  yatinmaan <yatinmaan1@gmail.com>
+	* ext/webrtc/gstwebrtcbin.c:
+	* ext/webrtc/utils.c:
+	* ext/webrtc/utils.h:
+	  webrtcbin: Improve SDP intersection for Opus
+	  Remove optional sprop-stereo and sprop-maxcapture fields from Opus
+	  remote offer caps before intersecting with local codec preferences.
+	  According to https://datatracker.ietf.org/doc/html/rfc7587#section-7.1
+	  those fields are sender-only informative, and don't affect
+	  interoperability.
+	  Fixes cases where the webrtc media will end up receive-only if the
+	  local side wants to send stereo but the remote is sending mono, or
+	  vice versa.
+	  There may be other fields in other codecs, so the implementation
+	  anticipates needing to add further fields and codecs in the future.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5993>
+
+2024-01-25 02:17:36 +0900  Seungha Yang <seungha@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* gst-libs/gst/dxva/gstdxvampeg2decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvampeg2decoder.h:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12mpeg2dec.cpp:
+	* sys/d3d12/gstd3d12mpeg2dec.h:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add MPEG-2 decoder
+	  Most of code additions are just gluing already implemented
+	  GstDxva and GstD3D12Decoder interfaces
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5979>
+
+2024-01-18 21:56:35 +1100  Jan Schmidt <jan@centricular.com>
+
+	* gst/timecode/gsttimecodestamper.c:
+	  timecodestamper: Improve error handling and don't crash
+	  Post a bus message explaining that input buffers must
+	  have timestamps and return GST_FLOW_ERROR, instead of
+	  a confusing NOT-NEGOTIATED
+	  Also remove an errant buffer unref in the error handling
+	  that would lead to crashes after.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5935>
+
+2024-01-16 02:52:49 +1100  Jan Schmidt <jan@centricular.com>
+
+	* gst/timecode/gsttimecodestamper.c:
+	  timecodestamper: Don't do finalizing in dispose
+	  Add a finalize method and release locks and things in there, instead
+	  of in the dispose method. Dispose may be called multiple times,
+	  at any time, and should just safely release references to other
+	  memory that might reference it back.
+	  In this case, timecodestamper would later crash in the element
+	  dispose method trying to take the freed mutex from
+	  gst_timecodestamper_release_pad().
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5935>
 
-	* ext/aom/gstav1enc.h:
-	  aom: av1enc: Remove redundant enum variants from header
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2743>
+2024-01-24 17:58:29 +0100  Ruben Gonzalez <rgonzalez@fluendo.com>
 
-2022-07-11 09:27:41 +0530  Yatin Mann <yatinmaan1@gmail.com>
+	* sys/va/meson.build:
+	  SA: Remove extra check since libva min version is 1.12
+	  The libva version was updated to 1.12 in PR 4781 1
+	  1 https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4781
+	  NOTE: I also sort va_sources
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5978>
 
-	* ext/aom/gstav1enc.c:
-	* ext/aom/gstav1enc.h:
-	  aom: av1enc: Ensure that input pts is strictly increasing
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2743>
+2024-01-24 12:36:48 +0000  Philippe Normand <philn@igalia.com>
 
-2022-07-04 19:55:59 +0530  Yatin Mann <yatinmaan1@gmail.com>
+	* gst/videoparsers/gstvp9parse.c:
+	  vp9parse: Fix critical warning during caps negotiation
+	  `gst_pad_get_allowed_caps()` returns a non-writable caps, so we need to make it
+	  writable, otherwise the `gst_caps_remove_structure()` call below might trigger a
+	  critical warning.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5975>
+
+2024-01-23 23:58:53 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12av1dec.cpp:
+	  d3d12av1dec: Fix object type name on multi-gpu system
+	  Fixing typo
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5964>
+
+2023-10-23 17:10:54 +0200  Stéphane Cerveau <scerveau@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkdecoder.c:
+	* gst-libs/gst/vulkan/gstvkvideo-private.c:
+	* gst-libs/gst/vulkan/gstvkvideo-private.h:
+	  vulkan video: add GST_VK_VIDEO_EXTENSIONS enum
+	  To avoid using mysterious value, use an enum to
+	  show the valid value in _vk_codec_extensions
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5922>
 
-	* ext/aom/gstav1enc.c:
-	  aom: av1enc: Fix pts unit
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2743>
+2023-10-30 16:16:34 +1100  Matthew Waters <matthew@centricular.com>
 
-2023-01-02 18:34:59 +0900  ekwange <ekwange@gmail.com>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vulkan/format: also get features in the fallback case
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5576>
 
-	* ext/directfb/dfbvideosink.c:
-	* ext/directfb/dfbvideosink.h:
-	  dfbvideosink: Fix compile error
-	  Fix some compile errors
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3670>
+2023-10-30 15:53:44 +1100  Matthew Waters <matthew@centricular.com>
 
-2023-01-01 19:19:03 -0500  Olivier Crête <olivier.crete@collabora.com>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vulkan/format: don't assign an uneeded boolean
+	  We don't actually need the basics_primary/secondary boolean.  The
+	  returned format is decided by the requested usage with fallbacks as
+	  necessary.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5576>
 
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  webrtc nice: Let libnice handle STUN/TURN DNS resolution
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3676>
+2023-10-30 15:52:44 +1100  Matthew Waters <matthew@centricular.com>
 
-2023-01-06 15:07:42 -0500  Olivier Crête <olivier.crete@collabora.com>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vulkan/format: there is no current need to use the 64-bit feature flags
+	  All of our feature flags are currently covered by the first
+	  VkFormatFeatureFlag enum so far.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5576>
 
-	* gst-libs/gst/webrtc/nice/meson.build:
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  webrtc: Change requirement to libnice 0.1.20
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3676>
+2023-10-30 14:59:33 +1100  Matthew Waters <matthew@centricular.com>
 
-2023-01-04 21:37:55 +0100  Mathieu Duponchelle <mathieu@centricular.com>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vulkan/format: correct fallback features in from_video_info_2
+	  The features were not actually used and were written into a boolean
+	  value.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5576>
 
-	* docs/meson.build:
-	  docs: explicitly declare gir build dependencies
-	  As the path to the gir file is passed to hotdoc.generate_doc() and
-	  not the build target itself, meson doesn't know about the dependency.
-	  In turn, as the CI doesn't build everything before building the
-	  documentation target, some gir files might not exist, for instance
-	  in the case of gst-rtsp-server, causing the output documentation to
-	  be empty.
-	  The error occurred silently because hotdoc accepts wildcards for
-	  *-sources arguments, thus it won't warn about a missing gir file as
-	  it is legitimate for glob matching to resolve to nothing.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3686>
-
-2023-01-04 18:55:08 -0300  Rodrigo Bernardes <rodrigo.bernardes@kantaribopemedia.com>
-
-	* sys/dvb/parsechannels.c:
-	  dvbbasebin: don't rely on g_key_file_get_(integer|uint64) return
-	  instead check if an error was returned, and fail if any
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3688>
+2024-01-10 03:33:59 +0900  Seungha Yang <seungha@centricular.com>
 
-2023-01-03 15:01:37 -0500  Olivier Crête <olivier.crete@collabora.com>
+	* gst-libs/gst/codecparsers/gstav1parser.c:
+	  av1parser: Fix potential stack overflow during tile list parsing
+	  The tile_count_minus_1 must be less than or equal to 511 as specified
+	  in spec "6.11.1 General tile list OBU semantics"
+	  Fixes #3214 / CVE-2024-0444 / ZDI-CAN-22873
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5970>
 
-	* ext/srt/gstsrtobject.c:
-	  srt: Avoid crash on unknown option
-	  Use the correct field that is null instead of the struct value which
-	  never is.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3672>
+2024-01-23 11:47:31 +0000  Daniel Stone <daniels@collabora.com>
 
-2022-12-30 10:30:38 -0500  Xavier Claessens <xavier.claessens@collabora.com>
+	* gst-libs/gst/wayland/meson.build:
+	  wayland: Actually use wayland-protocols version dep
+	  Closes: #3242
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5962>
 
-	* ext/qroverlay/gstbaseqroverlay.c:
-	  qroverlay: Add qrcode-case-sensitive property
-	  This allows to encode case sensitive strings, like wifi SSID/password.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3662>
+2022-06-26 17:44:33 +0100  Daniel Stone <daniels@collabora.com>
 
-2023-01-03 17:28:18 +0800  He Junyan <junyan.he@intel.com>
+	* gst-libs/gst/wayland/gstwldisplay.c:
+	* gst-libs/gst/wayland/gstwldisplay.h:
+	* gst-libs/gst/wayland/gstwlwindow.c:
+	* gst-libs/gst/wayland/meson.build:
+	  gstwayland: Support wp_single_pixel_buffer_v1
+	  This protocol does what it says on the box, avoiding the need for a 1x1
+	  wl_shm buffer.
+	  A wayland-projects wrap has been added for users who do not have v1.26
+	  available.
+	  This commit was partly authored by Robert Mader.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2662>
+
+2024-01-21 19:43:18 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12h264enc.cpp:
+	  d3d12h264enc: Fix profile support check
+	  Add missing CheckFeatureSupport() call, and remove unused field
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5952>
+
+2024-01-22 18:58:44 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12compositor.cpp:
+	* sys/d3d12/gstd3d12converter.cpp:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	  d3d12: Pass target rectangle to ClearRenderTargetView()
+	  Some drivers seem to be crashing if ClearRenderTargetView() is called
+	  for P010/P016 texture's second subresource (UV plane) without
+	  specified target rectangle.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5952>
+
+2024-01-06 21:26:46 +0900  Seungha Yang <seungha@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/d3d12/gstd3d12-private.h:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/gstd3d12dpbstorage.cpp:
+	* sys/d3d12/gstd3d12dpbstorage.h:
+	* sys/d3d12/gstd3d12encoder.cpp:
+	* sys/d3d12/gstd3d12encoder.h:
+	* sys/d3d12/gstd3d12encoderbufferpool.cpp:
+	* sys/d3d12/gstd3d12encoderbufferpool.h:
+	* sys/d3d12/gstd3d12h264enc.cpp:
+	* sys/d3d12/gstd3d12h264enc.h:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	* tests/examples/d3d12/d3d12enc-dynamic-reconfigure.c:
+	* tests/examples/d3d12/meson.build:
+	* tests/examples/meson.build:
+	  d3d12: Add H.264 video encoder
+	  Adding video encoder element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5808>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  h265decoder: Fix a memory leak because of slice header.
-	  The gst_h265_slice_hdr_free() should free the slice header just
-	  parsed, not the priv->current_slice. Or, the memory leak will
-	  happen because we do not free the slices in priv->nalu list.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3671>
+2024-01-15 16:05:07 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-2022-12-30 17:10:12 +0000  مهدي شينون (Mehdi Chinoune) <mehdi.chinoune@hotmail.com>
+	* sys/msdk/gstmsdkdec.c:
+	  msdkdec: Fix leaks
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5930>
 
-	* ext/opencv/meson.build:
-	  meson: Accept latest version of opencv 4.x
-	  We've been bumping along the maximum opencv 4.x version for years,
-	  just accept all opencv versions till someone reports breakage.
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1680
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3664>
+2024-01-17 20:35:26 +0100  Piotr Brzeziński <piotr@centricular.com>
 
-2022-12-26 20:53:53 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/applemedia/vtenc.c:
+	  vtenc: Fix PAUSED->READY deadlock when output loop is running
+	  Explicitly calls gst_vtenc_pause_output_loop when going PAUSED->READY to make sure GST_PAD_STREAM_LOCK is not taken.
+	  Before this change, a deadlock would occur if pipeline got stopped right after one output buffer was generated by vtenc.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5933>
 
-	* sys/va/gstvajpegdec.c:
-	  vajpegdec: Set maybe-leaked flag on template caps
-	  The fixup function could return new caps object
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3642>
+2023-12-06 21:25:44 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-12-22 21:29:39 +0000  Philippe Normand <philn@igalia.com>
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	  h264decoder: Handle malformed avc/avc3 packets
+	  Packetized stream format should not contain start-code prefix
+	  in bitstream and each nal-length-byte, nal-byte unit should consist of
+	  single nal unit. But there are malformed streams in the world.
+	  Use newly added gst_h264_parser_identify_and_split_nalu_avc()
+	  method to identify each nal unit.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3219
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5772>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/gstwebrtcstats.c:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: Support for setting kind attribute on RTCRtpStreamStats
-	  The attribute maps the `kind` property of the associated transceiver.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3630>
+2023-12-06 21:23:08 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-12-23 01:00:57 +0900  Seungha Yang <seungha@centricular.com>
+	* gst-libs/gst/codecparsers/gsth264parser.c:
+	* gst-libs/gst/codecparsers/gsth264parser.h:
+	* tests/check/libs/h264parser.c:
+	  h264parser: Add gst_h264_parser_identify_and_split_nalu_avc() method
+	  Equivalent to _split_nalu_hevc() method in h265parser. This method
+	  will scan start-code prefix and split into individual NAL units
+	  if start-code prefix is detected
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5772>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.h:
-	  d3d11memory: Fix typo in vfunc name
-	  s/set_actvie/set_active/g
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3627>
+2024-01-10 15:11:33 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-2022-12-19 19:53:28 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkdec.h:
+	  msdkdec: Let msdk base decoder maintain the output_state
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5929>
 
-	* sys/nvcodec/gstnvenc.c:
-	* sys/nvcodec/gstnvenc.h:
-	* sys/nvcodec/gstnvencoder.cpp:
-	  nvcudaenc: Don't use default CUDA stream
-	  Set non-default CUDA stream via NvEncSetIOCudaStreams() if possible,
-	  so that NVENC's internal kernel function can run on the given CUDA
-	  stream instead of default CUDA stream
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3615>
+2024-01-12 14:42:29 +0000  Chris Spencer <spencercw@gmail.com>
 
-2022-12-14 10:35:53 +0100  Evgeny Pavlov <lucenticus@gmail.com>
+	* gst-libs/gst/vulkan/gstvkmemory.c:
+	* gst-libs/gst/vulkan/gstvkmemory.h:
+	  vkmemory: don't map memory more than once
+	  vkMapMemory may not be called on a memory object that is already
+	  host-mapped. If the gstreamer memory object is mapped more than once then
+	  reuse the existing Vulkan mapping.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5917>
 
-	* sys/amfcodec/gstamfav1enc.cpp:
-	* sys/amfcodec/gstamfav1enc.h:
-	* sys/amfcodec/include/components/VideoEncoderAV1.h:
-	* sys/amfcodec/meson.build:
-	* sys/amfcodec/plugin.cpp:
-	  amfcodec: add support of AMF AV1 encoder
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3569>
+2023-12-20 13:25:51 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-2022-12-22 00:22:46 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/gstmsdkvpputil.c:
+	  msdkvpp: Fix dma caps negotiation
+	  Modify the fix_output_format in vpp to directly generate caps with
+	  negotiated src caps, and we have the correct dma caps negotiation in
+	  fix_output_format function. And thus, we can remove the redundant
+	  negotiation of using function pad_accept_memory in vpp.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5845>
 
-	* sys/nvcodec/gstcudabasetransform.c:
-	  cudabasetransform: Update CUDA stream on context update
-	  CUDA stream must be associated with updated CUDA context
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3618>
+2024-01-11 22:20:28 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-12-21 14:36:31 +0800  He Junyan <junyan.he@intel.com>
+	* gst/videoparsers/gsth264parse.c:
+	  h264parse: Fix AU collection
+	  If remaining NALUs are expected to be drained in the current
+	  process_frame() loop, do not adjust offsets. Otherwise NALU data
+	  will point to random byte position and it would be broken data.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5911>
+
+2024-01-14 21:22:39 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12memory.cpp:
+	  d3d12memory: Don't use persistent staging buffer map
+	  Persistent map is not recommended in case of readback
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5919>
+
+2024-01-14 19:32:43 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12bufferpool.cpp:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12memory-private.h:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	  d3d12decoder: Use D3D12_HEAP_FLAG_CREATE_NOT_ZEROED flag
+	  Since the first access to a texture is always write, zero initialization
+	  is unnecessary
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5919>
 
-	* sys/va/gstvafilter.c:
-	  va: Delay the VAProcPipelineCaps query after context created.
-	  The VAAPI vaQueryVideoProcPipelineCaps() requires the context as the
-	  parameter. So far, we always pass VA_INVALID_ID and it can succeed.
-	  But the API does not say that and in theory, a valid context is required.
-	  Now the new platform really needs a valid context and so we have to
-	  delay that query until the context is created.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3613>
+2024-01-04 15:23:54 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-2022-12-21 00:20:17 +0900  Seungha Yang <seungha@centricular.com>
+	* ext/onnx/gstonnxclient.cpp:
+	* ext/onnx/gstonnxclient.h:
+	* ext/onnx/gstonnxinference.cpp:
+	  onnxinference: Return caps based on model preference when possible
+	  This should enable zero-copy when the model has the right type
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5885>
 
-	* sys/nvcodec/gstnvdecoder.c:
-	  nvdecoder: Use own CUDA stream in GL output path
-	  Use the same CUDA stream passed to CuvidMapVideoFrame()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3611>
+2024-01-04 15:07:10 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-2022-12-13 08:58:43 -0500  Xavier Claessens <xavier.claessens@collabora.com>
+	* ext/onnx/gstonnxclient.cpp:
+	* ext/onnx/gstonnxclient.h:
+	* ext/onnx/gstonnxinference.cpp:
+	  onnx: Use the element pointer for debug message
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5885>
 
-	* meson.build:
-	  Fix API visibility macros
-	  This copies the logic from GLib discussed there:
-	  https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2936
-	  Beside being simpler, it also fix all public symbols being annotated
-	  with dllexport when doing a static build, as discovered there:
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3540#note_1678335
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3567>
+2024-01-04 14:56:41 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-2022-12-19 18:41:46 +0900  Seungha Yang <seungha@centricular.com>
+	* ext/onnx/gstonnxclient.cpp:
+	* ext/onnx/gstonnxclient.h:
+	* ext/onnx/gstonnxinference.cpp:
+	  onnx: Extract data type from the model itself
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5885>
+
+2023-11-28 14:07:32 +0000  Chris Spencer <spencercw@gmail.com>
+
+	* ext/vulkan/vkh264dec.c:
+	* gst-libs/gst/vulkan/gstvkdecoder.c:
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.h:
+	* gst-libs/gst/vulkan/gstvkimagememory.c:
+	* gst-libs/gst/vulkan/gstvkimagememory.h:
+	* sys/applemedia/iosurfacevulkanmemory.c:
+	* tests/check/libs/vkimagebufferpool.c:
+	* tests/check/libs/vkvideodecode.c:
+	  vkimagebufferpool: allow specifying initial image layout
+	  The pool currently defaults to performing a layout transition to
+	  VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, with some special exceptions for
+	  video usages. This may not be a legal transition depending on the usage.
+	  Provide an API to explicitly control the initial image layout.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5881>
 
-	* sys/nvcodec/gstnvdec.c:
-	* sys/nvcodec/gstnvdecoder.c:
-	  nvdec: Don't use default CUDA stream
-	  NVDEC launches CUDA kernel function (ConvertNV12BLtoNV12 or so)
-	  when CuvidMapVideoFrame() is called. Which seems to be
-	  NVDEC's internal post-processing kernel function, maybe
-	  to convert tiled YUV to linear YUV format or something similar.
-	  A problem if we don't pass CUDA stream to the CuvidMapVideoFrame()
-	  call is that the NVDEC's internel kernel function will use default CUDA stream.
-	  Then lots of the other CUDA API calls will be blocked/serialized.
-	  To avoid the unnecessary blocking, we should pass our own
-	  CUDA stream object to the CuvidMapVideoFrame() call
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3605>
+2023-08-30 10:56:19 -0600  Scott Moreau <oreaus@gmail.com>
 
-2022-12-16 15:03:12 +0100  Edward Hervey <edward@centricular.com>
+	* gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c:
+	* gst-libs/gst/wayland/gstwlwindow.c:
+	  gst-launch: accept option to set program name
+	  The option --prog-name="PROGRAM-NAME" can be passed to set the program name.
+	  The program name is used by gtk and gstreamer to set the class or app-id.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5263>
 
-	* gst/mpegtsdemux/mpegtsbase.c:
-	  mpegts: Always clear packetizer on DISCONT push mode
-	  If a discontinuity is detected in push mode, we need to clear the cached section
-	  observations since they might have potentially changed.
-	  This was only done properly when operating with TIME segments (dvb, udp,
-	  adaptive demuxers, ...) but not with BYTE segments (such as with custom app/fd
-	  sources).
-	  We still don't want to flush out the PCR observations, since this might be
-	  needed for seeking in push-based BYTE sources.
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1650
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3584>
+2023-02-16 15:48:32 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2022-12-17 20:04:01 +0900  Seungha Yang <seungha@centricular.com>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: bump to primary rank
+	  Also updates medias modules for CI.
+	  Fixes: #1775
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3983>
 
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Fixing focus lost on desktop layout change
-	  Watch all message on the window thread, instead of internal window only.
-	  Otherwise, some global window messages, such as desktop layout change,
-	  wouldn't be handled by our window.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3593>
+2023-11-12 02:37:58 +0700  Ratchanan Srirattanamet <peathot@hotmail.com>
 
-2022-12-17 01:01:00 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+	* sys/androidmedia/jni/gstamc-jni.c:
+	* sys/androidmedia/meson.build:
+	* sys/androidmedia/ndk/gstamc-codec-ndk.c:
+	* sys/androidmedia/ndk/gstamc-format-ndk.c:
+	* sys/androidmedia/ndk/gstamc-internal-ndk.h:
+	* sys/androidmedia/ndk/gstamc-ndk.h:
+	  androidmedia: add NDK implementation of Android MediaCodec
+	  This reduces the amount of Java <-> native calls, which should reduce
+	  overhead a bit. It also paves a way to share the code between Android
+	  and a libhybris-based backend (where GNU/Linux system uses Android
+	  driver) in the future.
+	  Bug: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1242
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4115>
+
+2023-11-12 02:32:21 +0700  Ratchanan Srirattanamet <peathot@hotmail.com>
+
+	* sys/androidmedia/gstamc-codec.c:
+	* sys/androidmedia/gstamc-codec.h:
+	* sys/androidmedia/gstamc-format.c:
+	* sys/androidmedia/gstamc-format.h:
+	* sys/androidmedia/jni/gstamc-codec-jni.c:
+	* sys/androidmedia/jni/gstamc-format-jni.c:
+	* sys/androidmedia/jni/gstamc-jni.c:
+	* sys/androidmedia/jni/gstamc-jni.h:
+	* sys/androidmedia/magicleap/gstamc-codec-ml.c:
+	* sys/androidmedia/magicleap/gstamc-format-ml.c:
+	* sys/androidmedia/magicleap/gstamc-internal-ml.h:
+	* sys/androidmedia/magicleap/gstamc-ml.c:
+	* sys/androidmedia/meson.build:
+	  androidmedia: allow multiple implementations of codec and format
+	  When implementing NDK media support, it would be useful to also have JNI
+	  implementation in the same binary as NDK media compatibility is lower.
+	  As such, implement a rudimentary vtable system for gstamc-codec and
+	  gstamc-format, and allow choosing the implementation at static_init()
+	  time.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4115>
+
+2023-11-12 02:27:22 +0700  Ratchanan Srirattanamet <peathot@hotmail.com>
+
+	* sys/androidmedia/gstamc-codec.h:
+	* sys/androidmedia/gstamc-codeclist.h:
+	* sys/androidmedia/gstamc-format.h:
+	* sys/androidmedia/gstamc.c:
+	* sys/androidmedia/gstamc.h:
+	* sys/androidmedia/gstamcsurfacetexture.h:
+	* sys/androidmedia/jni/gstamc-codec-jni.c:
+	* sys/androidmedia/jni/gstamc-codeclist-jni.c:
+	* sys/androidmedia/jni/gstamc-format-jni.c:
+	* sys/androidmedia/jni/gstamc-jni.c:
+	* sys/androidmedia/jni/gstamc-jni.h:
+	* sys/androidmedia/jni/gstamcsurfacetexture-jni.c:
+	* sys/androidmedia/magicleap/gstamc-codec-ml.c:
+	* sys/androidmedia/magicleap/gstamc-codeclist-ml.c:
+	* sys/androidmedia/magicleap/gstamc-format-ml.c:
+	* sys/androidmedia/magicleap/gstamc-ml.c:
+	* sys/androidmedia/magicleap/gstamc-surfacetexture-ml.c:
+	* sys/androidmedia/meson.build:
+	  androidmedia: call all static_init() functions from single entry point
+	  This allows the implementations to do custom logic behind the hood. For
+	  example, when NDK implementation is added, the entrypoint can chooses to
+	  statically initialize the NDK implementations or the JNI one.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4115>
 
-	* sys/applemedia/avfvideosrc.m:
-	  avfvideosrc: Report latency when doing screen capture
-	  There is no `device` when doing screen capture, but there is always an
-	  `input`, so use that to decide when we can reply to a latency query.
-	  Without this, the latency query just fails.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3589>
+2023-12-21 11:49:12 +0100  Stéphane Cerveau <scerveau@igalia.com>
 
-2022-12-16 18:15:04 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+	* gst-libs/gst/codecparsers/gsth265parser.c:
+	* gst-libs/gst/codecparsers/gsth265parser.h:
+	  codecparsers: add slice type name for h265
+	  Add a method to convert the slice type to a descriptive
+	  name.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5908>
 
-	* sys/va/gstvaav1dec.c:
-	  vaav1dec: Remove double caps unref.
-	  There was a duplicated caps unref raising a warning.
-	  Also it reorgs the sorrounding code for simplicity.
-	  Fixes: #1196
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3587>
+2023-12-20 17:03:34 +0100  Stéphane Cerveau <scerveau@igalia.com>
 
-2022-12-16 02:52:08 +0900  Seungha Yang <seungha@centricular.com>
+	* gst-libs/gst/codecparsers/gsth264parser.c:
+	* gst-libs/gst/codecparsers/gsth264parser.h:
+	  codecparsers: add helper methods for h264
+	  Add two helper methods to convert profile
+	  and slice types
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5908>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Move potentially time-consuming operations to ::prepare()
-	  Move following tasks to ::prepare() from ::show_frame()
-	  * CPU -> GPU upload
-	  * GstD3D11Window object setup, including input caps change handling
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3574>
+2023-12-04 16:34:42 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-2022-12-16 21:42:50 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/msdk/gstmsdkallocator_libva.c:
+	* sys/msdk/gstmsdkcaps.c:
+	* sys/msdk/gstmsdkcontext.c:
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkenc.c:
+	* sys/msdk/gstmsdkvpp.c:
+	  msdk: Fix memory leaks
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5819>
 
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Call ShowWindow() from window thread
-	  ... when rendering on external HWND. ShowWindow() will cause
-	  synchronous message passing to window thread and then can be blocked.
-	  At the same time, window thread can wait for GStreamer thread.
-	  Instead of the synchronous call, queue the task to window message
-	  and performs from the window thread.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3583>
+2024-01-05 13:54:21 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-2022-12-15 01:15:10 +0900  Seungha Yang <seungha@centricular.com>
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.h:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c:
+	* gst-libs/gst/analytics/meson.build:
+	  analytics: Implement scale meta transform for Object detection meta
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5863>
+
+2024-01-04 19:27:22 -0500  Olivier Crête <olivier.crete@collabora.com>
+
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.h:
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.h:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.h:
+	* gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.h:
+	* tests/check/libs/analyticsmeta.c:
+	  analytics: Replace type quark with opaque struct pointer
+	  This way, we can add function pointers in there for things like
+	  transformations.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5863>
+
+2023-12-22 19:45:35 -0500  Olivier Crête <olivier.crete@collabora.com>
+
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.h:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c:
+	  analyticsmeta: Make the GstAnalyticsRelatableMtdData struct private
+	  Only ask the subclass about how much space they need, this way we can keep
+	  the allocation details more private.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5863>
+
+2023-10-30 16:40:47 +0100  Stéphane Cerveau <scerveau@igalia.com>
+
+	* ext/vulkan/vkh264dec.c:
+	* gst-libs/gst/vulkan/gstvkdecoder.c:
+	* gst-libs/gst/vulkan/gstvkvideoutils.c:
+	* gst-libs/gst/vulkan/gstvkvideoutils.h:
+	* tests/check/libs/vkvideodecode.c:
+	  vulkan: decoder: create union for profile usage
+	  As a profile can include a VkVideoDecodeUsageInfoKHR
+	  or VkVideoEncodeUsageInfoKHR, use union to separate the both.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5701>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Fix deadlock when parent window is busy
-	  Deadlock sequence:
-	  * From a streaming thread, d3d11videosink sends synchronous message
-	  to the parent window, so that internal (child) window can be
-	  constructed on the parent window's thread
-	  * App thread (parent window thread) is waiting for pipeline's
-	  state change (to GST_STATE_NULL) but streaming thread is
-	  blocked and waiting for app thread
-	  To avoid the deadlock, GstD3D11WindowWin32 should send message
-	  to the parent window asynchronously.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3570>
+2024-01-10 12:40:54 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2022-12-13 12:23:56 +0100  Thibault Saunier <tsaunier@igalia.com>
+	* sys/va/gstvabasedec.c:
+	  va: basedec: fix return type
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5903>
 
-	* ext/wpe/gstwpevideosrc.cpp:
-	  base:navigation: Cleanup navigation key modifiers enum
-	  We were exposing the 'ALT' modifier as if we were guaranteeing its
-	  accuracy but truth is we were only exposing configuration dependent
-	  values.
-	  Make the API simpler for now, the same way as Gtk3 was exposing it, and
-	  when we have time to guarantee more values by making them take backends
-	  configuration into account, we will expose those values in a accurate
-	  way.
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1402
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3565>
+2024-01-08 11:09:51 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-2022-10-18 12:17:04 +1100  Matthew Waters <matthew@centricular.com>
+	* sys/msdk/gstmsdkcaps.c:
+	  msdk: Modify the caps order when register plugins
+	  With this patch, the caps is registered in the order of memory features
+	  as: VAMemory, DMABuf then raw caps in linux path, and D3D11Memory then
+	  raw caps in windows path. It helps to prioritize the video memory for all
+	  msdk elements when doing negotiation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5898>
+
+2024-01-09 10:30:00 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+
+	* sys/msdk/gstmsdkcaps.c:
+	* sys/msdk/gstmsdkcaps.h:
+	* sys/msdk/gstmsdkvc1dec.c:
+	* sys/msdk/gstmsdkvp8dec.c:
+	  msdk: Remove useless function for vp8dec and vc1dec in windows path
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5898>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/gstwebrtcbin.h:
-	* ext/webrtc/utils.c:
-	* ext/webrtc/utils.h:
-	* tests/check/elements/webrtcbin.c:
-	  webrtc: implement support for msid values
-	  Local msid values are taken from sink pad property, or fallback to the
-	  previously used cname.
-	  The remote msid values are exposed on the relevant src pads.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3106>
+2024-01-07 16:43:19 +0100  Robert Mader <robert.mader@collabora.com>
 
-2022-12-13 04:31:24 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/v4l2codecs/gstv4l2codecav1dec.c:
+	* sys/v4l2codecs/gstv4l2codecmpeg2dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
+	  v4l2codecs: Always chain up to parent decide_allocation function for all codecs
+	  Apply the changes to the codecs previously left out, fixing playback
+	  issues seen with VP9.
+	  See: 70ff80a873 ("v4l2codecs: Always chain up to parent decide_allocation function")
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5896>
+
+2024-01-08 23:45:58 +0100  Robert Mader <robert.mader@collabora.com>
+
+	* sys/v4l2codecs/gstv4l2codecav1dec.c:
+	  v4l2codecs/av1decoder: Allow output caps to be updated
+	  To bring AV1 in line - needed for the next commit.
+	  See: d3c5fc815e ("v4l2codecs: Allow output caps to be updated")
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5896>
 
-	* gst-libs/gst/codecparsers/gsth264parser.h:
-	  h264parser: Update doc for GST_H264_FRMAE_PACKING_TOP_BOTTOM
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1318>
+2024-01-05 14:32:00 +0100  Stéphane Cerveau <scerveau@igalia.com>
 
-2021-11-07 11:18:15 +1100  Brad Hards <bradh@frogmouth.net>
+	* gst-libs/gst/codecparsers/gsth264parser.c:
+	* gst-libs/gst/codecparsers/gsth265bitwriter.c:
+	* gst-libs/gst/codecparsers/gsth265parser.c:
+	* gst-libs/gst/codecparsers/nalutils.c:
+	* gst-libs/gst/codecparsers/nalutils.h:
+	  gstutils: add gst_util_ceil_log2
+	  Move ceil_log2 from nalutils.* to gstutils.*
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5888>
+
+2024-01-09 22:40:55 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Release decoder and heap on stop
+	  Sometimes driver crash happens if ID3D12VideoDevice got closed first,
+	  and then ID3D12VideoDecoderHeap/ID3D12VideoDecoder are released.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5895>
+
+2024-01-09 20:44:33 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12window.cpp:
+	  d3d12videosink: Fix crash on set_buffer()
+	  set_buffer() can be called with null buffer
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5895>
+
+2024-01-09 20:27:36 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12compositor.cpp:
+	* sys/d3d12/gstd3d12converter.cpp:
+	* sys/d3d12/gstd3d12testsrc.cpp:
+	  d3d12: Fix warnings reported by debug layer
+	  Fixing below debug layer report
+	  ID3D12Device::CreateCommittedResource: Ignoring InitialState D3D12_RESOURCE_STATE_COPY_DEST.
+	  Buffers are effectively created in state D3D12_RESOURCE_STATE_COMMON.
+	  Buffer resource will be automatically promoted to D3D12_RESOURCE_STATE_COPY_DEST
+	  at the very first COPY operation time.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5895>
+
+2024-01-09 20:18:38 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12_fwd.h:
+	* sys/d3d12/gstd3d12compositor.cpp:
+	* sys/d3d12/gstd3d12convert.cpp:
+	* sys/d3d12/gstd3d12converter.cpp:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/gstd3d12device.h:
+	* sys/d3d12/gstd3d12dxgicapture.cpp:
+	* sys/d3d12/gstd3d12fencedatapool.cpp:
+	* sys/d3d12/gstd3d12fencedatapool.h:
+	* sys/d3d12/gstd3d12overlaycompositor.cpp:
+	* sys/d3d12/gstd3d12testsrc.cpp:
+	* sys/d3d12/gstd3d12window.cpp:
+	  d3d12: Simplify fence data setup
+	  Adding COM and GstMiniObject specific methods to skip passing
+	  free function pointer
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5895>
+
+2024-01-09 19:45:16 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12device.cpp:
+	  d3d12device: Print live objects on finalize()
+	  The report from debug layer can help tracing resource leak
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5895>
+
+2024-01-06 21:15:13 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Set buffer flag on output buffer
+	  ... and remove unnecessary condition check
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5891>
+
+2024-01-06 19:31:01 +0900  Seungha Yang <seungha@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/d3d12/gstd3d12videosink.cpp:
+	* sys/d3d12/gstd3d12window.cpp:
+	* sys/d3d12/gstd3d12window.h:
+	  d3d12videosink: Add gamma, primaries and sampling filter properties
+	  Add properties to control conversion methods
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5891>
+
+2024-01-06 19:05:33 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12converter.cpp:
+	* sys/d3d12/gstd3d12converter.h:
+	* sys/d3d12/gstd3d12pluginutils.cpp:
+	* sys/d3d12/gstd3d12pluginutils.h:
+	* sys/d3d12/gstd3d12videosink.cpp:
+	* sys/d3d12/gstd3d12window.cpp:
+	* sys/d3d12/gstd3d12window.h:
+	  d3d12videosink: Add support for 3D transformation
+	  Add x, y, and z axis rotation with scaling support
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5891>
+
+2024-01-05 20:40:33 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12converter.cpp:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12overlaycompositor.cpp:
+	* sys/d3d12/gstd3d12pluginutils.cpp:
+	* sys/d3d12/gstd3d12pluginutils.h:
+	* sys/d3d12/gstd3d12videosink.cpp:
+	* sys/d3d12/gstd3d12window.cpp:
+	* sys/d3d12/gstd3d12window.h:
+	  d3d12videosink: Add support for MSAA
+	  Adding "msaa" property to support MSAA rendering
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5891>
+
+2024-01-05 21:22:00 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12videosink.cpp:
+	* sys/d3d12/gstd3d12window.cpp:
+	* sys/d3d12/gstd3d12window.h:
+	  d3d12videosink: Add support for fullscreen mode
+	  Adding "fullscreen-on-alt-enter" and "fullscreen" properties so that
+	  use can control fullscreen mode switch
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5891>
 
-	* gst-libs/gst/codecparsers/gsth264parser.h:
-	* sys/msdk/gstmsdkh264enc.c:
-	  h264parser: typo fix in enum value
-	  Old value is marked deprecated, new enum with same entry is added. Should be binary compatible.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1318>
+2024-01-05 21:25:32 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-10-21 22:46:16 -0500  A. Wilcox <AWilcox@Wilcox-Tech.com>
+	* sys/d3d11/gstd3d11dxgicapture.cpp:
+	  d3d11screencapturesrc: Hide symbols
+	  Fix potential linking error in case of static build
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5883>
+
+2024-01-02 01:05:23 +0900  Seungha Yang <seungha@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/d3d12/gstd3d12dxgicapture.cpp:
+	* sys/d3d12/gstd3d12dxgicapture.h:
+	* sys/d3d12/gstd3d12screencapture.cpp:
+	* sys/d3d12/gstd3d12screencapture.h:
+	* sys/d3d12/gstd3d12screencapturedevice.cpp:
+	* sys/d3d12/gstd3d12screencapturedevice.h:
+	* sys/d3d12/gstd3d12screencapturesrc.cpp:
+	* sys/d3d12/gstd3d12screencapturesrc.h:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add screen capture element
+	  Since DXGI desktop duplication API does not work with Direct3D12 device,
+	  this element will use Direct3D11 device to acquire frame.
+	  Then other rendering operations (e.g., texture copy, render pipeline) will
+	  happen using Direct3D12 API
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5883>
 
-	* gst-libs/gst/mpegts/gstmpegtsdescriptor.c:
-	* tests/check/libs/mpegts.c:
-	  mpegts: Handle when iconv doesn't support ISO 6937
-	  Systems like musl libc don't support ISO 6937 in iconv.  This ensures
-	  that the MPEG-TS plugin can cope with that.  There is existing support
-	  in the plugin for other methods, so it seems to have been the original
-	  intent anyway.
-	  Fixes: #1314
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3245>
+2024-01-04 14:07:05 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-2022-12-11 10:12:25 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* ext/onnx/gstonnxclient.cpp:
+	  onnxinference: Fix leak of the output tensors
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5884>
 
-	* gst-libs/gst/va/gstvaallocator.c:
-	  vaallocator: Fix gi annotations.
-	  Remove spurious types and skip functions that returns VASurfaceID
-	  which isn't exposed to introspection.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3557>
+2024-01-04 14:06:44 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-2022-11-22 12:32:52 +0100  Stéphane Cerveau <scerveau@igalia.com>
+	* ext/onnx/decoders/gstssdobjectdetector.cpp:
+	  onnx: Fix leak in ssdobjectdetector decoder
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5884>
 
-	* ext/zxing/gstzxing.cpp:
-	* ext/zxing/meson.build:
-	  zxing: update to 1.4.0 tag
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3450>
+2024-01-03 13:20:09 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-2022-12-06 11:30:47 +0100  Edward Hervey <edward@centricular.com>
+	* sys/msdk/gstmsdkvpp.c:
+	  msdkvpp: Remove passthrough condition in propose_allocation
+	  According to basetransform func: gst_base_transform_do_bufferpool,
+	  it is the upstream to decide if it needs a bufferpool from vpp, so
+	  we don't need passthrough condition in subclass propose_allocation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5879>
 
-	* gst/mpegtsdemux/mpegtspacketizer.c:
-	  mpegts: Check continuity counter on section streams
-	  This wasn't really done, and is needed in order to detect potential section
-	  changes for sections that have got identical information (such as when switching
-	  between streams that have the same PAT/PMT pid and subtable information).
-	  Other checks exist in tsbase to detect if the "new" PAT/PMT really is an update or not.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3530>
-
-2022-12-08 06:05:25 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst-libs/gst/cuda/gstcudanvrtc.c:
-	  cuda: Fix runtime compiler library loading on Windows
-	  The cuda is a part of GPU driver but runtime compiler is a part of
-	  cuda toolkit, which means the version number can be different.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3545>
+2023-12-22 15:58:20 -0500  Daniel Morin <daniel.morin@collabora.com>
 
-2022-12-08 05:58:48 +0900  Seungha Yang <seungha@centricular.com>
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gsth264parse.h:
+	  h264parse: use AUD to detect first VCL NAL
+	  - Fix skipsize on _update_backlog failure.
+	  - Add robustness to AU completion detection by using AUD when present. If we've
+	  received a AUD we overwrite the first VCL NAL detection when the result was
+	  negative. VCL following AUD is the first VCL of next AU.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5862>
+
+2023-12-29 10:23:16 +0200  Sebastian Dröge <sebastian@centricular.com>
+
+	* ext/codec2json/gsth2652json.c:
+	  h2652json: Fix mix-up of different enum types
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5873>
+
+2024-01-03 02:03:23 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Try zero-copy in case of reverse playback too
+	  In case of tier 1 decoder, always use reference-only picture to avoid
+	  fixed-size pool limitation and output decoded picture without
+	  copy even for negative rate. Also do not use copy queue for GPU to GPU
+	  copy. Copy queue is specialized for upload/download and may occupy
+	  PCIE bandwidth. Use direct queue as recommended by vendors.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5877>
+
+2024-01-03 00:36:05 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Fix crash on flush
+	  On flush event, baseclass will discard all pictures from DPB
+	  but there can be still in-flight commands not finished yet.
+	  Use our command queue, allocator and fence data helper objects
+	  to keep resource available during command execution.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5877>
+
+2024-01-03 01:15:27 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12commandallocatorpool.cpp:
+	* sys/d3d12/gstd3d12commandallocatorpool.h:
+	  d3d12: Add {set,get}_user_data() methods to command allocator
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5877>
+
+2024-01-02 23:36:48 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Fix barrier usage
+	  Common state promotion and decay does not seem to be applied to
+	  decoder commands. Use barriers explicitly
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5877>
 
-	* gst-libs/gst/cuda/gstcuda-private.h:
-	* gst-libs/gst/cuda/gstcudautils.c:
-	* gst-libs/gst/cuda/gstcudautils.h:
-	* sys/nvcodec/gstcudamemorycopy.c:
-	  cuda: Hide memory copy util function
-	  The method was intended to be used by only cudaupload/download elements
-	  and not ready to be a part of public API
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3545>
+2023-12-18 16:52:13 +0100  Edward Hervey <edward@centricular.com>
 
-2022-12-08 04:32:47 +0900  Seungha Yang <seungha@centricular.com>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/dvdspu/gstdvdspu.c:
+	  dvdspu: Support all video caps for "ANY" feature
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5827>
 
-	* sys/winks/gstksvideosrc.c:
-	  ksvideosrc: Warn for deprecated plugin use
-	  This plugin should not be used any more
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3544>
-
-2022-12-08 04:25:55 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/winscreencap/gstdx9screencapsrc.c:
-	* sys/winscreencap/gstgdiscreencapsrc.c:
-	  winscreencap: Warn for deprecated plugin use
-	  This plugin should not be used any more
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3544>
-
-2022-11-27 00:26:22 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst/proxy/gstproxysink.c:
-	  proxysink: Post EOS message on EOS event
-	  proxysink is actual sink (GST_ELEMENT_FLAG_SINK flag has configured)
-	  so it should post EOS message.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3472>
+2013-08-30 22:08:01 +0200  Arnaud Vrac <avrac@freebox.fr>
 
-2022-12-07 12:28:55 -0300  Thibault Saunier <tsaunier@igalia.com>
+	* gst/dvdspu/gstspu-vobsub.c:
+	* gst/dvdspu/gstspu-vobsub.h:
+	  dvdspu: handle frame size event from upstream
+	  An IDX file or codec_data normally contains the original frame size of
+	  the video. Allow upstream to provide this information by sending a
+	  custom event, which will allow scaling the overlay correctly.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5827>
 
-	* gst/videoparsers/gsth264parse.c:
-	  h264parse: Avoid setting wrong colorimetry info if the stream doesn't contain it
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3543>
+2013-09-02 17:48:50 +0200  Arnaud Vrac <avrac@freebox.fr>
 
-2022-12-01 19:35:07 +0200  Marek Olejnik <molejnik@fluendo.com>
+	* gst/dvdspu/gstdvdspu.c:
+	* gst/dvdspu/gstdvdspu.h:
+	  dvdspu: cache overlay composition
+	  This avoids rendering the overlay buffer for each video frame.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5827>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  h265decoder: Do not abort when failed to prepare ref pic set
-	  Currently the element calls abort when failed to prepare reference
-	  picture set. This can happent when the input stream is somehow
-	  corrupted, like a rtsp strem with lost packets. Now it will only
-	  return with GST_FLOW_ERROR instead of terminating whole process.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3505>
+2013-01-23 17:59:01 +0100  Arnaud Vrac <avrac@freebox.fr>
 
-2022-12-07 10:21:52 +0200  Sebastian Dröge <sebastian@centricular.com>
+	* gst/dvdspu/gstdvdspu.c:
+	* gst/dvdspu/gstdvdspu.h:
+	  dvdspu: negotiate overlay composition meta with downstream
+	  This allows attaching the overlay composition as a meta on the video
+	  buffer instead of blending with the video.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5827>
 
-	* gst/dvbsubenc/gstdvbsubenc.c:
-	  dvbsubenc: Forward GAP events as-is if we wouldn't produce an end packet and are not in the middle of an existing subtitle
-	  An end packet is only produced once for the last subtitle, so multiple
-	  GAP events between subtitles would result only in a single end packet
-	  and nothing else otherwise. This would potentially starve downstream
-	  then, so instead forward the GAP events in that case.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3534>
-
-2022-12-05 19:30:43 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
-
-	* sys/directshow/dshowvideosink.cpp:
-	  directshow: Fix build error with glib 2.75 and newer
-	  Starting with glib 2.75, `NULL` is `nullptr`, which cannot be
-	  implicitly coerced to `0`, unlike `NULL`. So explicitly pass `0`.
-	  ```
-	  3206/4524 Compiling C++ object subprojects/gst-plugins-bad/sys/directshow/gstdirectshow.dll.p/dshowvideosink.cpp.obj
-	  FAILED: subprojects/gst-plugins-bad/sys/directshow/gstdirectshow.dll.p/dshowvideosink.cpp.obj
-	  "cl" "-Isubprojects\gst-plugins-bad\sys\directshow\gstdirectshow.dll.p" "-Isubprojects\gst-plugins-bad\sys\directshow" "-I..\subprojects\gst-plugins-bad\sys\directshow" "-Isubprojects\gst-plugins-bad" "-I..\subprojects\gst-plugins-bad" "-Isubprojects\gst-plugins-base\gst-libs" "-I..\subprojects\gst-plugins-base\gst-libs" "-Isubprojects\gstreamer\libs" "-I..\subprojects\gstreamer\libs" "-Isubprojects\gstreamer" "-I..\subprojects\gstreamer" "-Isubprojects\orc" "-I..\subprojects\orc" "-I..\subprojects\gst-plugins-bad\sys\directshow\strmbase\baseclasses" "-Isubprojects\gst-plugins-base\gst-libs\gst\video" "-Isubprojects\gstreamer\gst" "-Isubprojects\gst-plugins-base\gst-libs\gst\audio" "-Isubprojects\gst-plugins-base\gst-libs\gst\tag" "-IC:/gst-install/include/glib-2.0" "-IC:/gst-install/lib/glib-2.0/include" "-IC:/gst-install/include" "/MD" "/nologo" "/showIncludes" "/utf-8" "/W2" "/EHsc" "/O2" "/Zi" "/wd4018" "/wd4146" "/wd4244" "/wd4305" "/utf-8" "/we4002" "/we4003" "/we4013" "/we4020" "/we4027" "/we4029" "/we4033" "/we4045" "/we4047" "/we4053" "/we4062" "/we4098" "/we4101" "/we4189" "/utf-8" "-D_MBCS" "/wd4189" "/wd4456" "/wd4701" "/wd4703" "/wd4706" "/wd4996" "-DHAVE_CONFIG_H" "/Fdsubprojects\gst-plugins-bad\sys\directshow\gstdirectshow.dll.p\dshowvideosink.cpp.pdb" /Fosubprojects/gst-plugins-bad/sys/directshow/gstdirectshow.dll.p/dshowvideosink.cpp.obj "/c" ../subprojects/gst-plugins-bad/sys/directshow/dshowvideosink.cpp
-	  ../subprojects/gst-plugins-bad/sys/directshow/dshowvideosink.cpp(62): warning C5051: attribute 'noinline' requires at least '/std:c++20'; ignored
-	  ../subprojects/gst-plugins-bad/sys/directshow/dshowvideosink.cpp(123): error C2664: 'LRESULT SendMessageA(HWND,UINT,WPARAM,LPARAM)': cannot convert argument 3 from 'nullptr' to 'WPARAM'
-	  ../subprojects/gst-plugins-bad/sys/directshow/dshowvideosink.cpp(123): note: A native nullptr can only be converted to bool or, using reinterpret_cast, to an integral type
-	  C:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\um\winuser.h(3690): note: see declaration of 'SendMessageA'
-	  ../subprojects/gst-plugins-bad/sys/directshow/dshowvideosink.cpp(635): error C2664: 'BOOL SystemParametersInfoA(UINT,UINT,PVOID,UINT)': cannot convert argument 2 from 'nullptr' to 'UINT'
-	  ../subprojects/gst-plugins-bad/sys/directshow/dshowvideosink.cpp(635): note: A native nullptr can only be converted to bool or, using reinterpret_cast, to an integral type
-	  C:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\um\winuser.h(13153): note: see declaration of 'SystemParametersInfoA'
-	  ../subprojects/gst-plugins-bad/sys/directshow/dshowvideosink.cpp(1593): error C2664: 'LRESULT SendMessageA(HWND,UINT,WPARAM,LPARAM)': cannot convert argument 3 from 'nullptr' to 'WPARAM'
-	  ../subprojects/gst-plugins-bad/sys/directshow/dshowvideosink.cpp(1593): note: A native nullptr can only be converted to bool or, using reinterpret_cast, to an integral type
-	  C:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\um\winuser.h(3690): note: see declaration of 'SendMessageA'
-	  ```
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3528>
+2015-04-07 14:38:08 +0200  Arnaud Vrac <avrac@freebox.fr>
 
-2022-12-05 02:29:08 +0000  Tim-Philipp Müller <tim@centricular.com>
+	* gst/dvdspu/gstdvdspu.c:
+	* gst/dvdspu/gstspu-common.h:
+	* gst/dvdspu/gstspu-pgs.c:
+	* gst/dvdspu/gstspu-vobsub-render.c:
+	  dvdspu: render to ARGB overlay instead of AYUV
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5827>
 
-	* meson.build:
-	  Back to development
+2013-01-23 17:59:01 +0100  Arnaud Vrac <avrac@freebox.fr>
 
-=== release 1.21.3 ===
+	* gst/dvdspu/gstdvdspu-render.c:
+	* gst/dvdspu/gstdvdspu.c:
+	* gst/dvdspu/gstdvdspu.h:
+	* gst/dvdspu/gstspu-common.h:
+	* gst/dvdspu/gstspu-pgs.c:
+	* gst/dvdspu/gstspu-pgs.h:
+	* gst/dvdspu/gstspu-vobsub-render.c:
+	* gst/dvdspu/gstspu-vobsub.c:
+	* gst/dvdspu/gstspu-vobsub.h:
+	* gst/dvdspu/meson.build:
+	  dvdspu: render to AYUV overlay
+	  Instead of only supporting writing SPU data directly to YUV frames,
+	  render the SPU data to an intermediate AYUV overlay buffer. The overlay
+	  data is then blended to the video frame.
+	  For the PGS format, the overlay buffer size is set to the size of the
+	  Composition Window, and its position in the overlay composition is set
+	  to the window position. The objects to render are now cropped when the
+	  cropping flag is set.
+	  For the Vobsub format, the overlay buffer size is set to the size of the
+	  Display Area.
+	  Once rendered, the overlay composition rectangle is now moved and scaled
+	  to fit the video output size, to avoid clipping.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5827>
+
+2024-01-02 21:03:49 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12videosink.cpp:
+	  d3d12videosink: Fix buffer leak
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5875>
+
+2024-01-02 20:32:50 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12device.cpp:
+	  d3d12device: Store adapter index
+	  ... and remove unused fence object
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5875>
+
+2024-01-01 17:19:16 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12converter.cpp:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	  d3d12: Reduce shader visible descriptor size
+	  Shader visible descriptors occupy GPU resource and there are hardware
+	  limits. Thus, in order to minimize the amount of shader visible heaps,
+	  only non shader visible descriptor heap (staging) will be held by d3d12memory.
+	  Then converter will copy the staging descriptor to shader visible
+	  descriptor heap per draw.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5875>
+
+2024-01-01 01:18:18 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12compositor.cpp:
+	* sys/d3d12/gstd3d12converter.cpp:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12overlaycompositor.cpp:
+	* sys/d3d12/gstd3d12testsrc.cpp:
+	  d3d12: Use CREATE_NOT_ZEROED heap flag if possible
+	  Zero initialization would have overhead and it's not required
+	  most cases except for textures. Use CREATE_NOT_ZEROED flag
+	  in case of buffer resource or if a texture will be rendered without any
+	  prior read operation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5875>
+
+2023-12-31 00:29:10 +0900  Seungha Yang <seungha@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/d3d12/gstd3d12compositor.cpp:
+	* sys/d3d12/gstd3d12compositor.h:
+	* sys/d3d12/hlsl/PSMain_checker_luma.hlsl:
+	* sys/d3d12/hlsl/PSMain_checker_rgb.hlsl:
+	* sys/d3d12/hlsl/PSMain_checker_vuya.hlsl:
+	* sys/d3d12/hlsl/VSMain_pos.hlsl:
+	* sys/d3d12/hlsl/meson.build:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add compositor element
+	  Adding d3d12compositor element. d3d12compositor will build GPU commands
+	  asynchronously and each command is serialized at final render stage.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5875>
+
+2023-12-31 20:20:56 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12convert.cpp:
+	* sys/d3d12/gstd3d12converter.cpp:
+	* sys/d3d12/gstd3d12pluginutils.cpp:
+	* sys/d3d12/gstd3d12pluginutils.h:
+	* sys/d3d12/gstd3d12testsrc.cpp:
+	  d3d12converter: Don't map output buffer with write flag
+	  Conversion will happen when constructed command list is executed,
+	  not by converter element. Thus this object should not map output buffer
+	  with write flag which will result in error if multiple threads
+	  are building commands for the same output target frame.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5875>
+
+2023-12-31 20:03:39 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12converter.cpp:
+	  d3d12converter: Add support for texture upload
+	  If buffer is not a d3d12 memory or allocated by other device,
+	  upload to internal d3d12 memory
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5875>
+
+2023-12-30 23:40:39 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12convert.cpp:
+	* sys/d3d12/gstd3d12converter.cpp:
+	* sys/d3d12/gstd3d12converter.h:
+	* sys/d3d12/gstd3d12testsrc.cpp:
+	* sys/d3d12/gstd3d12window.cpp:
+	  d3d12converter: Add support for blending
+	  Create new PSO if blend state update is required
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5875>
+
+2023-12-30 00:08:27 +0900  Seungha Yang <seungha@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/d3d12/gstd3d11on12.cpp:
+	* sys/d3d12/gstd3d11on12.h:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/gstd3d12device.h:
+	* sys/d3d12/gstd3d12testsrc.cpp:
+	* sys/d3d12/gstd3d12testsrc.h:
+	* sys/d3d12/hlsl/PSMain_checker.hlsl:
+	* sys/d3d12/hlsl/PSMain_color.hlsl:
+	* sys/d3d12/hlsl/PSMain_snow.hlsl:
+	* sys/d3d12/hlsl/VSMain_color.hlsl:
+	* sys/d3d12/hlsl/meson.build:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add testsrc element
+	  Adding testsrc element with d2d interop support via d3d11on12
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5875>
 
-2022-12-05 01:28:21 +0000  Tim-Philipp Müller <tim@centricular.com>
+2023-11-11 00:37:02 +0900  Seungha Yang <seungha@centricular.com>
 
-	* NEWS:
-	* RELEASE:
-	* gst-plugins-bad.doap:
-	* meson.build:
-	  Release 1.21.3
+	* gst-libs/gst/cuda/gstcudanvrtc.cpp:
+	* gst-libs/gst/cuda/gstcudanvrtc.h:
+	* sys/nvcodec/gstcudaconverter.c:
+	  cuda: Prefer CUBIN over PTX
+	  System installed NVRTC library might be newer version than
+	  driver, then generate PTX can be incompatible with the driver.
+	  Instead of the intermediate code PTX, use actual assembly code
+	  directly.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3108
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5639>
+
+2023-12-29 21:55:36 +0900  Seungha Yang <seungha@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	  docs: Update Windows plugins cache
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-26 17:12:31 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12overlaycompositor.cpp:
+	* sys/d3d12/gstd3d12overlaycompositor.h:
+	* sys/d3d12/gstd3d12videosink.cpp:
+	* sys/d3d12/gstd3d12videosink.h:
+	* sys/d3d12/gstd3d12window.cpp:
+	* sys/d3d12/gstd3d12window.h:
+	* sys/d3d12/hlsl/PSMain_sample.hlsl:
+	* sys/d3d12/hlsl/PSMain_sample_premul.hlsl:
+	* sys/d3d12/hlsl/VSMain_coord.hlsl:
+	* sys/d3d12/hlsl/meson.build:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add video sink element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-29 21:22:41 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12-private.h:
+	* sys/d3d12/gstd3d12.h:
+	* sys/d3d12/gstd3d12_fwd.h:
+	* sys/d3d12/gstd3d12convert.cpp:
+	* sys/d3d12/gstd3d12convert.h:
+	* sys/d3d12/gstd3d12converter-builder.cpp:
+	* sys/d3d12/gstd3d12converter-builder.h:
+	* sys/d3d12/gstd3d12converter.cpp:
+	* sys/d3d12/gstd3d12converter.h:
+	* sys/d3d12/gstd3d12format.cpp:
+	* sys/d3d12/gstd3d12format.h:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	* sys/d3d12/gstd3d12pluginutils.cpp:
+	* sys/d3d12/gstd3d12pluginutils.h:
+	* sys/d3d12/hlsl/PSMain_converter.hlsl:
+	* sys/d3d12/hlsl/VSMain_converter.hlsl:
+	* sys/d3d12/hlsl/collect_hlsl_header.py:
+	* sys/d3d12/hlsl/meson.build:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add convert element
+	  Implement converter object with convert element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-28 21:34:17 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12.h:
+	* sys/d3d12/gstd3d12fencedatapool.cpp:
+	* sys/d3d12/gstd3d12fencedatapool.h:
+	* sys/d3d12/meson.build:
+	  d3d12: Add helper object for fence operation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-27 00:04:06 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Enable plugin only for Windows8 or newer
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-29 21:26:29 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12-private.h:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/gstd3d12download.cpp:
+	* sys/d3d12/gstd3d12format.cpp:
+	* sys/d3d12/gstd3d12format.h:
+	* sys/d3d12/gstd3d12pluginutils.h:
+	* sys/d3d12/gstd3d12upload.cpp:
+	  d3d12: Define more formats
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-26 17:26:55 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12.h:
+	* sys/d3d12/gstd3d12basefilter.cpp:
+	* sys/d3d12/gstd3d12basefilter.h:
+	* sys/d3d12/gstd3d12bufferpool.cpp:
+	* sys/d3d12/gstd3d12commandallocatorpool.cpp:
+	* sys/d3d12/gstd3d12commandlistpool.cpp:
+	* sys/d3d12/gstd3d12commandqueue.cpp:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12decoder.h:
+	* sys/d3d12/gstd3d12descriptorpool.cpp:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/gstd3d12download.cpp:
+	* sys/d3d12/gstd3d12format.cpp:
+	* sys/d3d12/gstd3d12h264dec.cpp:
+	* sys/d3d12/gstd3d12h265dec.cpp:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12upload.cpp:
+	* sys/d3d12/gstd3d12utils.cpp:
+	* sys/d3d12/gstd3d12utils.h:
+	* sys/d3d12/gstd3d12vp9dec.cpp:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add header containing core features
+	  ... and include the single header instead of listing many ones
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-24 21:33:34 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12utils.h:
+	  d3d12: Remove unused methods
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-25 22:21:24 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12bufferpool.cpp:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	  d3d12bufferpool: Don't pre-allocate memory for size calculation
+	  Unlike d3d11, we can know CPU accessible memory layout without
+	  allocation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-24 01:28:26 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	  d3d12memory: Add alloc_wrapped() method
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-24 01:05:21 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12upload.cpp:
+	* sys/d3d12/gstd3d12upload.h:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add upload element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-21 20:49:39 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12bufferpool.cpp:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	  d3d12bufferpool: Wait fence before reusing buffer
+	  Buffer can be released without waiting fence for previous commands
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-26 20:41:33 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/plugin.cpp:
+	  d3d12decoder: Remove ID3D12Device4 interface requirement
+	  Old OS may not support the interface. And allow 11_0 feature level
+	  hardware.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-24 16:36:37 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Reduce the number of resource barriers
+	  Single barrier per texture is sufficient in case of array-of-textures.
+	  Avoid unnecessary decay barriers
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-24 21:05:06 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Use flexible task queue
+	  Instead of using fixed size command allocator array, make it
+	  resizable.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-25 16:14:39 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12_fwd.h:
+	* sys/d3d12/gstd3d12commandqueue.cpp:
+	* sys/d3d12/gstd3d12commandqueue.h:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/gstd3d12device.h:
+	* sys/d3d12/gstd3d12fence.cpp:
+	* sys/d3d12/gstd3d12fence.h:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Rework command scheduling
+	  * Use single fence object per queue and remove GstD3D12Fence
+	  implementation
+	  * Add a helper method for texture copy
+	  * Run background thread and release unused resource from the thread
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-24 15:49:56 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12commandallocatorpool.cpp:
+	* sys/d3d12/gstd3d12commandallocatorpool.h:
+	* sys/d3d12/gstd3d12commandlistpool.cpp:
+	* sys/d3d12/gstd3d12commandlistpool.h:
+	* sys/d3d12/gstd3d12descriptorpool.cpp:
+	* sys/d3d12/gstd3d12descriptorpool.h:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/meson.build:
+	  d3d12: Add resource pool objects
+	  Adding pool objects for command list, command allocator, and descriptor
+	  heap
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-16 21:07:14 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	  d3d12memory: Add more SRV/RTV getter methods
+	  Adding a method so that memory object can create SRV/RTV
+	  on external descriptor heap. And remove unused methods
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-16 19:22:34 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12av1dec.cpp:
+	* sys/d3d12/gstd3d12av1dec.h:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12decoder.h:
+	* sys/d3d12/gstd3d12h264dec.cpp:
+	* sys/d3d12/gstd3d12h264dec.h:
+	* sys/d3d12/gstd3d12h265dec.cpp:
+	* sys/d3d12/gstd3d12h265dec.h:
+	* sys/d3d12/gstd3d12vp9dec.cpp:
+	* sys/d3d12/gstd3d12vp9dec.h:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Remove d3d11 dependency
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5870>
+
+2023-12-22 14:41:31 -0500  Olivier Crête <olivier.crete@collabora.com>
+
+	* ext/onnx/README.md:
+	* ext/onnx/gstonnxinference.cpp:
+	  onnx: Update build instructions to use onnx-runtime 0.16.3
+	  This synchronizes it with the meson.build file
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5861>
 
-2022-12-04 12:25:41 +0000  Tim-Philipp Müller <tim@centricular.com>
+2023-12-19 13:40:13 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* ChangeLog:
-	* docs/random/ChangeLog-0.8:
-	  Remove ChangeLog files from git repository
-	  This information is tracked fully in the git repository, so
-	  no point having the ChangeLog duplicate it, and it interferes
-	  with grepping the repository.
-	  We are going to create the ChangeLogs on the fly when generating
-	  tarballs going forward (with a limited history), since it's still
-	  valuable for tarball consumers to be able to easily see a list of
-	  recent changes.
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer-project/-/issues/73
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3521>
+	* sys/va/gstvajpegdec.c:
+	  vajpegdec: only support progressive mjpeg streams
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5838>
 
-2022-11-07 00:10:39 +0000  Tim-Philipp Müller <tim@centricular.com>
+2023-12-20 21:41:00 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* meson.build:
-	* scripts/gen-changelog.py:
-	  meson: Generate ChangeLog files for release tarballs on dist
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3521>
+	* gst/jpegformat/gstjpegparse.c:
+	* gst/jpegformat/gstjpegparse.h:
+	* tests/check/elements/jpegparse.c:
+	  jpegparse: always forward pixel-aspect-ratio
+	  And by default it's 1/1
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5838>
 
-2022-12-01 03:52:53 +0900  Seungha Yang <seungha@centricular.com>
+2023-12-20 21:34:29 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/d3d11/plugin.cpp:
-	  d3d11av1dec: Promote rank to primary + 1
-	  ... so that this element can have higher rank than the other software
-	  AV1 decoders
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3495>
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: fix endianness
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5838>
 
-2022-12-02 07:03:30 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-12-20 20:58:04 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvajpegdec.c:
-	  vajpegdec: Reenable element negotiation.
-	  negotiation vmethod were overwritten by vabasedec, leading to errors.
-	  This was a regression of commit b6538e0560.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3509>
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: on app0 use fourcc rather than strings
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5838>
 
-2022-12-01 13:28:16 +0100  Johan Sternerup <johast@axis.com>
+2023-12-20 20:35:32 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/webrtc/nice/nicestream.c:
-	  webrtc: Fix possible use-after-free of GstWebRTCICETransport
-	  Because of the asynchronous resolving of mDNS ICE candidates it is
-	  possible that GstWebRTCICE outlives webrtcbin. This in turn prolongs
-	  the lifetime of the GstWebRTCNiceStream objects via refs in
-	  nice_stream_map. Thus the GstWebRTCICETransport objects held in
-	  GstWebRTCNiceStream may be invalid at the time they are accessed by
-	  the _on_candidate_gathering_done() callback since GstWebRTCNiceStream
-	  doesn't take a reference to them. Doing so would create a circular
-	  reference, so instead this commit introduces weak references to the
-	  transport objects and then we can check if the objects are valid before
-	  accessing them.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3502>
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: dump whole failed app marker
+	  Instead of just log the parsed string. It's better for debugging.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5838>
 
-2022-11-28 20:42:29 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+2023-12-19 13:16:34 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvaav1dec.c:
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvabasedec.h:
-	* sys/va/gstvah264dec.c:
-	* sys/va/gstvah265dec.c:
-	* sys/va/gstvajpegdec.c:
-	* sys/va/gstvampeg2dec.c:
-	* sys/va/gstvavp8dec.c:
-	* sys/va/gstvavp9dec.c:
-	  va: Handle input caps change.
-	  Update output caps if it's notified by baseclass
-	  See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3328
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3480>
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: don't trigger message for failed com marker
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5838>
 
-2022-11-27 13:00:20 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+2023-12-19 13:16:02 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvaav1dec.c:
-	  vaav1dec: Use gst_va_base_dec_set_output_state().
-	  And even that vaav1dec doesn't use vabasedec negotiate vmethod, it should align
-	  with the new scheme of using base's width & height for surface size and
-	  output_info structure for downstream display size negotiation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3480>
+	* gst/jpegformat/gstjpegparse.c:
+	* gst/jpegformat/gstjpegparse.h:
+	  jpegparse: refactor renegotation
+	  Instead of comparing caps, just signal when renegotation is needed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5838>
 
-2022-11-26 11:45:52 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+2023-12-19 13:13:48 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvavp9dec.c:
-	  vavp9dec: Use gst_va_base_dec_set_output_state().
-	  As this element reopen the internal decoder differently, it only uses the helper
-	  function to negotiate.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3480>
+	* gst/jpegformat/gstjpegparse.c:
+	* gst/jpegformat/gstjpegparse.h:
+	  jpegparse: pass colorimetry in caps
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5838>
 
-2022-11-28 19:31:57 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+2023-12-19 10:39:31 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvampeg2dec.c:
-	  vampeg2dec: Streams are progressive by default.
-	  By initializating progressive, then interlaced streams are detected correctly.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3480>
+	* gst/jpegformat/gstjpegparse.c:
+	* gst/jpegformat/gstjpegparse.h:
+	* tests/check/elements/jpegparse.c:
+	  jpegparse: add support interlaced mjpeg
+	  Interlaced MJPEG is a big hack. Most of the streams we've found are from old
+	  AVID tools. There are two methods to detect interlaced stream: the container
+	  offers a height bigger (or double) than the image's height in SOF. The other
+	  is from a APP0 marker.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5838>
+
+2023-12-15 15:21:50 -0500  Aaron Boxer <boxerab@protonmail.com>
+
+	* ext/onnx/README.md:
+	* ext/onnx/decoders/gstssdobjectdetector.cpp:
+	* ext/onnx/gstonnxinference.cpp:
+	  onnx: add README outlining install and test instructions
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5816>
 
-2022-11-26 09:11:39 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+2023-12-10 14:28:42 +0100  Marek Vasut <marex@denx.de>
 
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvabasedec.h:
-	* sys/va/gstvah264dec.c:
-	* sys/va/gstvah265dec.c:
-	* sys/va/gstvampeg2dec.c:
-	* sys/va/gstvavp8dec.c:
-	  va: Add and use common decode negotiate vmethod.
-	  This vmethod can be used by decoders with the same VA decoder reopen logic:
-	  same profile, chroma, width and height.
-	  Also a new public method called gst_va_base_dec_set_output_state() with the
-	  common GStreamer code for setting the output state, which is always called by
-	  the negotiate vmethod.
-	  In order to do this refactoring, new variables in vabasedec have to be populated
-	  by the decoders:
-	  * width and height define the resolution set in VA decoder. In the case of H264
-	  would be de coded_width and codec_height, or max_width and max_height in AV1.
-	  * output_info is the downstream video info used for negotiation in
-	  gst_va_base_dec_set_output_state().
-	  * input_state, from codec parent class shall be also held by vabasedec
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3480>
+	* sys/v4l2codecs/gstv4l2decoder.h:
+	  v4l2codecs: Switch gst_codec_picture_ts_ns() to gst_util_uint64_scale_int()
+	  Instead of plain multiplication, use gst_util_uint64_scale_int()
+	  to achieve the same effect with additional checks.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5791>
 
-2022-11-24 13:52:59 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-12-10 14:22:00 +0100  Marek Vasut <marex@denx.de>
 
-	* sys/va/gstvaav1dec.c:
-	  vaav1dec: Use gst_va_base_dec_prepare_output_frame().
-	  And simplify a bit the code flow.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3480>
+	* sys/v4l2codecs/gstv4l2codecav1dec.c:
+	* sys/v4l2codecs/gstv4l2codech264dec.c:
+	* sys/v4l2codecs/gstv4l2codech265dec.c:
+	* sys/v4l2codecs/gstv4l2codecmpeg2dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp8dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
+	* sys/v4l2codecs/gstv4l2decoder.h:
+	  v4l2codecs: Deduplicate picture frame number to timestamp in ns
+	  Add macro which converts picture frame number to suitable timestamp in
+	  nanoseconds for use in V4L2 VB2 buffer lookup. Since multiple codecs do
+	  the same operation and almost all got it wrong, do it in one place so it
+	  can be fixed in one place again, if needed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5791>
 
-2022-11-24 13:15:04 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-12-10 14:23:42 +0100  Marek Vasut <marex@denx.de>
 
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvabasedec.h:
-	* sys/va/gstvah264dec.c:
-	* sys/va/gstvajpegdec.c:
-	* sys/va/gstvampeg2dec.c:
-	* sys/va/gstvavp8dec.c:
-	* sys/va/gstvavp9dec.c:
-	  va: Add and use gst_va_base_dec_prepare_output_frame().
-	  This helper will do downstream negotiation and later will
-	  allocate the output frame.
-	  H265 and AV1 decoders don't use this approach since their output
-	  frame allocation is different.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3480>
+	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
+	  vp9decoder: Simplify gst_v4l2_codecs_vp9_dec_fill_refs()
+	  In case reference_frames is NULL, return outright. Remove the
+	  duplicate check from subsequent conditionals. No functional change.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5791>
 
-2022-11-23 18:29:58 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-12-09 16:29:03 +0100  Marek Vasut <marex@denx.de>
 
-	* sys/va/gstvaav1dec.c:
-	* sys/va/gstvah264dec.c:
-	* sys/va/gstvah265dec.c:
-	* sys/va/gstvavp8dec.c:
-	  va: Remove last_ret error handling in decoders.
-	  It was used in the early development of the base classes. Now it
-	  shouldn't be needed.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3480>
+	* sys/v4l2codecs/gstv4l2codech265dec.c:
+	  h265decoder: Align wraparound fix
+	  Instead of casting GST_CODEC_PICTURE_FRAME_NUMBER (ref_pic) to u64,
+	  use 1000ULL which is also u64 . This only aligns the behavior here
+	  with '*decoder: Fix multiplication wraparound' commits.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5791>
 
-2022-11-23 18:14:30 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-12-09 16:27:49 +0100  Marek Vasut <marex@denx.de>
 
-	* sys/va/gstvaav1dec.c:
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvabasedec.h:
-	* sys/va/gstvah264dec.c:
-	* sys/va/gstvah265dec.c:
-	* sys/va/gstvajpegdec.c:
-	* sys/va/gstvampeg2dec.c:
-	* sys/va/gstvavp8dec.c:
-	* sys/va/gstvavp9dec.c:
-	  va: Add and use gst_va_base_dec_process_output().
-	  This function will copy the frame, if it's needed, and will apply buffer flags.
-	  The function is used by all the decoders.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3480>
+	* sys/v4l2codecs/gstv4l2codech264dec.c:
+	  h264decoder: Align wraparound fix
+	  Instead of casting GST_CODEC_PICTURE_FRAME_NUMBER (ref_pic) to u64,
+	  use 1000ULL which is also u64 . This only aligns the behavior here
+	  with '*decoder: Fix multiplication wraparound' commits.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5791>
 
-2022-12-01 22:50:30 +0800  He Junyan <junyan.he@intel.com>
+2023-12-09 16:26:22 +0100  Marek Vasut <marex@denx.de>
 
-	* sys/va/gstvaav1dec.c:
-	* sys/va/gstvabaseenc.c:
-	  va: Fix the caps memory leak by gst_va_pool_new_with_config().
-	  The gst_va_pool_new_with_config() will ref the caps, and so we need
-	  to unref after that.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3503>
+	* sys/v4l2codecs/gstv4l2codecmpeg2dec.c:
+	  mpeg2decoder: Fix multiplication wraparound
+	  The GstMpeg2Picture system_frame_number is guint32, constant 1000 is guint32,
+	  GstV4l2CodecMpeg2Dec *_ref_ts multiplication result is u64 .
+	  ```
+	  u64 result = (u32)((u32)system_frame_number * (u32)1000);
+	  ```
+	  behaves the same as
+	  ```
+	  u64 result = (u32)(((u32)system_frame_number * (u32)1000) & 0xffffffff);
+	  ```
+	  so in case `system_frame_number > 4294967295 / 1000`, the `result` will
+	  wrap around. Since the `result` is really used as a cookie used to look
+	  up V4L2 buffers related to the currently decoded frame, this wraparound
+	  leads to visible corruption during MPEG2 decoding. At 30 FPS this occurs
+	  after cca. 40 hours of playback .
+	  Fix this by changing the 1000 from u32 to u64, i.e.:
+	  ```
+	  u64 result = (u64)((u32)system_frame_number * (u64)1000ULL);
+	  ```
+	  this way, the wraparound is prevented and the correct cookie is used.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5791>
 
-2022-11-30 13:33:49 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-12-09 16:24:22 +0100  Marek Vasut <marex@denx.de>
 
-	* sys/va/gstvaav1dec.c:
-	* sys/va/gstvadevice.c:
-	* sys/va/gstvadevice.h:
-	* sys/va/gstvah264dec.c:
-	* sys/va/gstvah264enc.c:
-	* sys/va/gstvah265dec.c:
-	* sys/va/gstvah265enc.c:
-	* sys/va/gstvajpegdec.c:
-	* sys/va/gstvampeg2dec.c:
-	* sys/va/gstvavp8dec.c:
-	* sys/va/gstvavp9dec.c:
-	  va: Add render node name in non-first devices.
-	  There could be multi-GPU setups where the non-first has more
-	  entrypoints than the first one, and the elements names are not
-	  homogeneous, leading to pipeline building error.
-	  This patch add the render node in the elements names when they belong
-	  to the non-first device.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3491>
+	* sys/v4l2codecs/gstv4l2codecav1dec.c:
+	  av1decoder: Fix multiplication wraparound
+	  The GstAV1Picture system_frame_number is guint32, constant 1000 is guint32,
+	  GstV4l2CodecAV1Dec v4l2_av1_frame.*_frame_ts multiplication result is u64 .
+	  ```
+	  u64 result = (u32)((u32)system_frame_number * (u32)1000);
+	  ```
+	  behaves the same as
+	  ```
+	  u64 result = (u32)(((u32)system_frame_number * (u32)1000) & 0xffffffff);
+	  ```
+	  so in case `system_frame_number > 4294967295 / 1000`, the `result` will
+	  wrap around. Since the `result` is really used as a cookie used to look
+	  up V4L2 buffers related to the currently decoded frame, this wraparound
+	  leads to visible corruption during AV1 decoding. At 30 FPS this occurs
+	  after cca. 40 hours of playback .
+	  Fix this by changing the 1000 from u32 to u64, i.e.:
+	  ```
+	  u64 result = (u64)((u32)system_frame_number * (u64)1000ULL);
+	  ```
+	  this way, the wraparound is prevented and the correct cookie is used.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5791>
 
-2022-11-26 21:02:00 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+2023-12-09 16:08:31 +0100  Marek Vasut <marex@denx.de>
 
-	* sys/va/gstvafilter.c:
-	  vafilter: Increase the caps for HDR.
-	  As they might be other medatadata types.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3473>
+	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
+	  vp9decoder: Fix multiplication wraparound
+	  The GstVp9Picture system_frame_number is guint32, constant 1000 is guint32,
+	  GstV4l2CodecVp9Dec v4l2_vp9_frame.*_frame_ts multiplication result is u64 .
+	  ```
+	  u64 result = (u32)((u32)system_frame_number * (u32)1000);
+	  ```
+	  behaves the same as
+	  ```
+	  u64 result = (u32)(((u32)system_frame_number * (u32)1000) & 0xffffffff);
+	  ```
+	  so in case `system_frame_number > 4294967295 / 1000`, the `result` will
+	  wrap around. Since the `result` is really used as a cookie used to look
+	  up V4L2 buffers related to the currently decoded frame, this wraparound
+	  leads to visible corruption during VP9 decoding. At 30 FPS this occurs
+	  after cca. 40 hours of playback .
+	  Fix this by changing the 1000 from u32 to u64, i.e.:
+	  ```
+	  u64 result = (u64)((u32)system_frame_number * (u64)1000ULL);
+	  ```
+	  this way, the wraparound is prevented and the correct cookie is used.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5791>
 
-2022-11-26 20:48:45 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+2023-12-09 16:08:31 +0100  Marek Vasut <marex@denx.de>
 
-	* sys/va/gstvafilter.c:
-	  vafilter: Increase the number of 3DLUT caps to 16.
-	  To fix the warning on Alderlake
-	  vafilter gstvafilter.c:534:gst_va_filter_ensure_filters:<vafilter0>
-	  vaQueryVideoProcFiltersCaps: list argument exceeds maximum number
-	  Increase the number of caps to 16 as vadumpcaps does.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3473>
+	* sys/v4l2codecs/gstv4l2codecvp8dec.c:
+	  vp8decoder: Fix multiplication wraparound
+	  The GstVp8Picture system_frame_number is guint32, constant 1000 is guint32,
+	  GstV4l2CodecVp8Dec v4l2_vp8_frame.*_frame_ts multiplication result is u64 .
+	  ```
+	  u64 result = (u32)((u32)system_frame_number * (u32)1000);
+	  ```
+	  behaves the same as
+	  ```
+	  u64 result = (u32)(((u32)system_frame_number * (u32)1000) & 0xffffffff);
+	  ```
+	  so in case `system_frame_number > 4294967295 / 1000`, the `result` will
+	  wrap around. Since the `result` is really used as a cookie used to look
+	  up V4L2 buffers related to the currently decoded frame, this wraparound
+	  leads to visible corruption during VP8 decoding. At 30 FPS this occurs
+	  after cca. 40 hours of playback .
+	  Fix this by changing the 1000 from u32 to u64, i.e.:
+	  ```
+	  u64 result = (u64)((u32)system_frame_number * (u64)1000ULL);
+	  ```
+	  this way, the wraparound is prevented and the correct cookie is used.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5791>
 
-2022-11-15 06:58:14 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-12-19 16:41:30 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* tests/examples/va/vaenc-dynamic-reconfigure.c:
-	  example: vaenc-dynamic-reconfigure: Support H265.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2036>
+	* gst/videoparsers/gsth264parse.c:
+	  h264parse: Remove dead code
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5833>
 
-2022-05-04 10:42:59 +0800  He Junyan <junyan.he@intel.com>
+2023-12-19 13:57:04 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/va/gstvah265enc.c:
-	  va: Add H265 SCC profile support.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2036>
+	* docs/plugins/gst_plugins_cache.json:
+	  video-format: Fix format order once again
+	  RGBA should be before RBGA. Both the Python script and the gstreamer-rs
+	  tests agree on that, but somehow this is not caught by the CI.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5837>
 
-2022-05-02 23:14:32 +0800  He Junyan <junyan.he@intel.com>
+2023-12-18 16:33:07 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-	* sys/va/gstvah265enc.c:
-	  va: Add extended formats support such as 10/12 bits, 4:2:2 and 4:4:4.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2036>
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	  meta: Add API to register metas in two steps
+	  And also remove the specific registration APIs for
+	  serializable meta.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5830>
 
-2022-04-25 15:49:31 +0800  He Junyan <junyan.he@intel.com>
+2023-12-18 13:40:53 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	* sys/va/gstvah265enc.c:
-	  va: enable multi tile support for H265 encoder.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2036>
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	  meta: Move the clear operation to its own vfunc
+	  Some transforms always assumed that the transformation was some kind
+	  of copy. So adding a "clear" operation didn't work out in practice.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5830>
 
-2022-06-02 21:18:16 +0800  He Junyan <junyan.he@intel.com>
+2023-12-18 17:02:22 +0000  Philippe Normand <philn@igalia.com>
 
-	* sys/va/gstvah265enc.c:
-	  va: enable vah265lpenc for low power mode H265 encoder.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2036>
+	* gst-libs/gst/play/gstplay.c:
+	* gst-libs/gst/play/gstplay.h:
+	  play: Include pipeline dump in error details structure
+	  This can be useful for debugging purposes. It can't be done on application side
+	  because the on_error callback tears down the pipeline.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5828>
 
-2022-04-18 22:36:09 +0800  He Junyan <junyan.he@intel.com>
+2023-12-18 17:01:36 +0000  Philippe Normand <philn@igalia.com>
 
-	* sys/va/gstvah265enc.c:
-	  va: Add the low-delay-b frame support for H265.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2036>
+	* gst-libs/gst/play/gstplay.c:
+	  play: Fix error details parsing
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5828>
 
-2022-04-06 17:06:20 +0800  He Junyan <junyan.he@intel.com>
+2023-11-18 18:51:04 +0100  Robert Mader <robert.mader@collabora.com>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	  va: Add prediction direction attribute support for H265 encoder.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2036>
+	* gst/camerabin2/gstcamerabin2.c:
+	  camerabin: Correctly relink viewfinderbin_queue
+	  This reverts a part of de92a6c7f2. Unlike `image_filter` and
+	  `video_filter`, `viewfinder_filter` does not get linked to `src` but
+	  `viewfinderbin_queue`. Thus the fix in the mentioned commit does not
+	  apply for it and should be reverted.
+	  This was not spotted earlier as only the other filters are used in
+	  the project that uncovered the issue.
+	  Fixes: de92a6c7f2 ("camerabin: Fix source updates with user filters")
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5689>
 
-2022-03-25 21:55:28 +0800  He Junyan <junyan.he@intel.com>
+2023-11-23 20:24:42 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/plugin.c:
-	  va: Register and enable and the vah265enc plugin.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2036>
+	* gst-libs/gst/codecparsers/gstav1parser.h:
+	* gst/videoparsers/gstav1parse.c:
+	  av1parser: Fix array sizes in scalability structure
+	  Since the AV1 specification is not explicitly mentioning about
+	  the array size bounds, array sizes in scalability structure
+	  should be defined as possible maximum sizes that can have.
+	  Also, this commit removes GST_AV1_MAX_SPATIAL_LAYERS define from
+	  public header which is API break but the define is misleading
+	  and this patch is introducing ABI break already
+	  ZDI-CAN-22300
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5823>
 
-2022-03-25 21:54:30 +0800  He Junyan <junyan.he@intel.com>
+2023-01-04 11:29:27 -0500  Xavier Claessens <xavier.claessens@collabora.com>
 
-	* sys/va/gstvah265enc.c:
-	* sys/va/gstvah265enc.h:
-	* sys/va/meson.build:
-	  va: Implement the vah265enc plugin for va HEVC encoding.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2036>
+	* tests/check/elements/h264parse.c:
+	  h264parse: test - AU align with SEI between frame slices
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5741>
 
-2022-11-29 02:22:50 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-11 11:08:58 -0500  Daniel Morin <daniel.morin@collabora.com>
 
-	* sys/mediafoundation/gstmfvideosrc.cpp:
-	  mfvideosrc: Fix buffer leak
-	  The allocated buffer should be released
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3479>
+	* gst-libs/gst/codecparsers/gsth264parser.h:
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gsth264parse.h:
+	  h264parse: Improved AU boundary detection
+	  - AU boundary detection reviewed to follow more closely H.264 spec. and more
+	  specifically clauses 7.4.1.2.3 and 7.4.1.2.4.
+	  - The gist of the changes is a look-a-head in then next AU required identify the
+	  last vcl-nal of current AU and firt vcl-nal of next AU (according to
+	  7.4.1.2.4) followed by the identification of the first nal of next AU
+	  (according to 7.4.1.2.3).
+	  - A backlog of all nals of current AU and next AU up to the point where current
+	  AU can identified completed is kept.
+	  - In NAL alignement mode vcl-nal are sent immediatly but the history is kept to
+	  allow AU boundary detection. Non-vcl-nal can be delayed up to the reception of
+	  the next vcl-nal to allow a correct AUD insertion.
+	  - Based on this improved AU boudary detection we can avoid erronous AUD
+	  insertion, like the one highlighted by test
+	  test_parse_sliced_with_prefix_and_sei_nal_au.
+	  - Add support for MVC AU boundary detection. (H.7.4.1.2.4)
+	  - Explicitly report SVC not supported. We don't have the SVC NAL parsing
+	  required to identify boundary. (missing dependency_id and quality_id fields
+	  from SVC, see G.7.4.1.2.4)
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5741>
+
+2023-09-22 14:32:27 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+
+	* gst/unixfd/gstunixfd.c:
+	* gst/unixfd/gstunixfd.h:
+	* gst/unixfd/gstunixfdsink.c:
+	* gst/unixfd/gstunixfdsrc.c:
+	* tests/check/elements/unixfd.c:
+	  unixfd: Serialize buffer metas
+	  Serialize every GstMeta that supports serialization into the NEW_BUFFER
+	  payload. This is especially important for GstVideoMeta in the case of
+	  multiplanar buffers, or if stride!=width.
+	  Sponsored-by: Netflix Inc.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5355>
 
-2022-11-29 02:10:42 +0900  Seungha Yang <seungha@centricular.com>
+2023-09-01 15:38:16 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/mediafoundation/gstmfsourcereader.cpp:
-	* sys/mediafoundation/gstwin32devicewatcher.cpp:
-	  mediafoundation: Chain up from GObject::constructed
-	  ... so that GstTracer can trace it
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3479>
+	* sys/va/gstvacompositor.c:
+	  vacompositor: consider the DMA kind input for sink pad
+	  Co-authored-by: Víctor Jáquez <vjaquez@igalia.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5160>
 
-2022-11-29 02:06:11 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-08 15:45:49 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11window_corewindow.cpp:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	* sys/d3d11/gstd3d11window_swapchainpanel.cpp:
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11: Use correct ref/unref methods
-	  Those objects are GstObject subclasses
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3479>
+	* sys/va/gstvacompositor.c:
+	  vacompositor: Override the update_caps() of video aggregator class
+	  The input of the vacompositor may be DMA buffers. And in this case, the input
+	  caps has the format=DMA_DRM, which can not be recognized by base video
+	  aggregator class' find_best_format() function. So we need to override the
+	  update_caps() virtual function.
+	  Also we consider the DMA kind caps in negotiated_src_caps() for output.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5160>
 
-2022-11-25 20:19:22 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-08 15:42:26 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/win32ipc/gstwin32ipcvideosrc.cpp:
-	  win32ipcvideosrc: Fix property name and enum value mismatch
-	  Make them consistent
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3465>
+	* sys/va/gstvacompositor.c:
+	  vacompositor: add helper function to get formats from caps
+	  Co-authored-by: Víctor Jáquez <vjaquez@igalia.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5160>
 
-2022-11-25 20:14:43 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-08 15:34:46 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/win32ipc/gstwin32ipcvideosrc.cpp:
-	  win32ipcvideosrc: Protect pipe from flush thread
-	  The pipe object must be protected against GstBaseSrc::unlock()
-	  thread.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3465>
+	* sys/va/gstvacompositor.c:
+	  vacompositor: add helper function to choose format
+	  The function is based on the most supported formats by Intel/Mesa VA drivers.
+	  Co-authored-by: Víctor Jáquez <vjaquez@igalia.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5160>
 
-2022-11-25 18:38:27 +0800  He Junyan <junyan.he@intel.com>
+2023-08-08 15:11:29 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/codecparsers/gsth264parser.c:
-	  h264parser: Fix a typo in pred_weight_table parsing.
-	  When setting default values, the reference list number of l1 is wrong.
-	  Fix: https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/issues/336
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3464>
+	* sys/va/gstvacompositor.c:
+	  vacompositor: record the input caps for each input pad
+	  The caps of each input sink pad wil decide the final output format and
+	  caps of the src pad.
+	  Co-authored-by: Víctor Jáquez <vjaquez@igalia.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5160>
+
+2023-12-15 18:56:47 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12av1dec.cpp:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12decoder.h:
+	* sys/d3d12/gstd3d12h264dec.cpp:
+	* sys/d3d12/gstd3d12h265dec.cpp:
+	* sys/d3d12/gstd3d12vp9dec.cpp:
+	  d3d12decoder: Implement threaded decoding
+	  To achieve maximum throughput, waiting on command commit thread
+	  is not ideal. And render-delay will introduce unwanted latency.
+	  Best is to split thread and wait finished decoding job in a dedicated
+	  output thread
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5812>
+
+2023-12-15 19:55:28 +0900  Seungha Yang <seungha@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/d3d12/plugin.cpp:
+	  d3d12decoder: Disable d3d11 interop
+	  It does not seem to work with some AMD iGPU
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5812>
+
+2023-12-15 19:18:02 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12fence.cpp:
+	  d3d12fence: Reset fence after waiting done
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5812>
+
+2023-12-15 19:45:44 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12device.cpp:
+	  d3d12: Enable debug layer
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5812>
+
+2023-12-14 21:07:10 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Requires ID3D12Device4 interface
+	  ID3D12Device4::CreateCommandList1() method is required
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5812>
+
+2023-12-14 20:22:35 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12bufferpool.cpp:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12memory-private.h:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	  d3d12: Update allocation params signalling
+	  Sync up with d3d11 implementation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5812>
 
-2022-11-22 17:01:37 +0800  Ma, Mingyang <mingyang.ma@intel.com>
+2023-12-13 12:55:06 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkdec.c:
-	  msdkdec: Update decoding pts
-	  Update frame pts before calling gst_video_decoder_finish_frame, or frames may be lost when transcoding in specific stream
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3449>
+	* sys/va/gstvabasedec.c:
+	  vabasedec: clean up decide_allocation() vmethod
+	  When creating a new VA pool set config size to zero because it's not used.
+	  Also, given the potential different sizes from software buffer pools and VA
+	  buffer pools, this patch handle that potential different values.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5805>
 
-2022-11-19 02:56:27 +0900  Seungha Yang <seungha@centricular.com>
+2023-12-13 11:34:43 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* meson_options.txt:
-	* sys/meson.build:
-	* sys/win32ipc/gstwin32ipcutils.cpp:
-	* sys/win32ipc/gstwin32ipcutils.h:
-	* sys/win32ipc/gstwin32ipcvideosink.cpp:
-	* sys/win32ipc/gstwin32ipcvideosink.h:
-	* sys/win32ipc/gstwin32ipcvideosrc.cpp:
-	* sys/win32ipc/gstwin32ipcvideosrc.h:
-	* sys/win32ipc/meson.build:
-	* sys/win32ipc/plugin.cpp:
-	* sys/win32ipc/protocol/win32ipcmmf.cpp:
-	* sys/win32ipc/protocol/win32ipcmmf.h:
-	* sys/win32ipc/protocol/win32ipcpipeclient.cpp:
-	* sys/win32ipc/protocol/win32ipcpipeclient.h:
-	* sys/win32ipc/protocol/win32ipcpipeserver.cpp:
-	* sys/win32ipc/protocol/win32ipcpipeserver.h:
-	* sys/win32ipc/protocol/win32ipcprotocol.cpp:
-	* sys/win32ipc/protocol/win32ipcprotocol.h:
-	* sys/win32ipc/protocol/win32ipcutils.cpp:
-	* sys/win32ipc/protocol/win32ipcutils.h:
-	  win32ipc: Add WIN32 shared memory videosrc/sink elements
-	  Windows supports various IPC methods but that's completely
-	  different form that of *nix from implementation point of view.
-	  So, instead of adding shared memory functionality to existing
-	  shm plugin, new WIN32 shared memory source/sink elements
-	  are implemented in this commit.
-	  Each videosink (server) and videosrc (client) pair will communicate
-	  using WIN32 named pipe and thus user should configure unique/proper
-	  pipe name to them (e.g., \\.\pipe\MyPipeName).
-	  Once connection is established, videosink will create named shared memory
-	  object per frame and client will be able to consume the object
-	  (i.e., memory mapped file handle) without additional copy operation.
-	  Note that implementations under "protocol" directory are almost
-	  pure C/C++ with WIN32 APIs except for a few defines and debug functions.
-	  So, applications can take only the protocol part so that the application
-	  can send/receive shared-memory object from/to the other end
-	  even if it's not an actual GStreamer element.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3441>
+	* sys/va/gstvabasetransform.c:
+	  vabasetransform: clean up decide_allocation() vmethod
+	  When creating a new VA pool set config size to zero because it's not used.
+	  Also, given the potential different sizes from software buffer pools and VA
+	  buffer pools, this patch handle that potential different values.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5805>
 
-2022-11-23 14:35:07 +0100  Jan Lorenz <jan.lorenz@pascom.net>
+2023-12-13 11:06:01 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/mediafoundation/gstmfcapturedshow.cpp:
-	  mfvideosrc: check HRESULT of CreateClassEnumerator correctly
-	  Fixes a crash during direct show device enumeration
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1599
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3460>
-
-2022-11-22 15:27:38 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
-
-	* sys/kms/gstkmssink.h:
-	  kmssink: Fix compilation without kernel headers
-	  There was a drm/drm_mode.h included added recently, drm/ is usually
-	  referencing the linux kernel header, but we only requires the libdrm
-	  headers to be installed. On top of this, including drm_mode.h is never
-	  needed as its already included by drm.h.
-	  Fixes #1596
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3452>
+	* sys/va/gstvacompositor.c:
+	  vacompositor: clean up decide_allocation() vmethod
+	  When creating a new VA pool set config size to zero because it's not used.
+	  Also, given the potential different sizes from software buffer pools and VA
+	  buffer pools, this patch handle that potential different values.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5805>
+
+2023-12-13 11:31:12 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* sys/va/gstvapluginutils.c:
+	* sys/va/gstvapluginutils.h:
+	  vapluginsutils: add helper gst_va_create_other_pool()
+	  This helper function creates a software-based buffer pool, where if size is
+	  zero, its value is retrieved from the canonical size.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5805>
 
-2022-11-10 08:50:35 -0500  Daniel Morin <daniel.morin@collabora.com>
+2023-12-13 10:20:33 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* ext/onnx/gstonnxclient.cpp:
-	* ext/onnx/gstonnxclient.h:
-	* ext/onnx/gstonnxobjectdetector.cpp:
-	* ext/onnx/meson.build:
-	  onnx: Update to OnnxRT >= 1.13.1 API
-	  - Replace deprecated methods
-	  - Add a check on ORT version we are compatible with.
-	  - Add clarification to the example given.
-	  - Add the url to retrieve the model mentioned in the example.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3388>
+	* gst-libs/gst/va/gstvapool.c:
+	* gst-libs/gst/va/gstvapool.h:
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkenc.c:
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/qsv/gstqsvencoder.cpp:
+	* sys/va/gstvaav1dec.c:
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabasetransform.c:
+	* sys/va/gstvacompositor.c:
+	* sys/va/gstvaencoder.c:
+	  va: no need to provide a buffer size for VA pool
+	  VA drivers allocate surfaces given their properties, so there's no need to
+	  provide a buffer size to the VA pool.
+	  Though, the buffer size is provided by the driver, or the canonical size
+	  is used for single planed surfaces.
+	  This patch removes the need to provide a size for the function
+	  gst_va_pool_new_with_config() and adds a helper method to retrieve the surface
+	  size, gst_va_pool_get_buffer_size(). Also change the callers accordingly.
+	  Changes for custom VA pool creation will be addressed in the following commits.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5805>
+
+2023-12-14 00:50:01 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12bufferpool.cpp:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12format.cpp:
+	* sys/d3d12/gstd3d12format.h:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12utils.cpp:
+	* sys/d3d12/gstd3d12utils.h:
+	* sys/d3d12/meson.build:
+	  d3d12: Use d3dx12.h helper library
+	  ... and remove manually implemented helper methods
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5807>
+
+2023-12-14 00:21:00 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12_fwd.h:
+	* sys/d3d12/meson.build:
+	  d3d12: Use DirectX-Headers and drop MinGW build support
+	  There are some conflicts between MinGW toolchan and DirectX-Headers.
+	  And due to ABI differences, more fixes are required.
+	  We will support only MSVC build for now
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5807>
 
-2022-11-22 16:42:26 +0800  He Junyan <junyan.he@intel.com>
+2023-12-12 15:30:39 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* gst/videoparsers/gsth265parse.c:
-	  h265parse: Add the missing timestamp when splitting a frame.
-	  When splitting a frame, the gst_buffer_copy_region() does not copy
-	  the timestamp correctly for sub frames when the offset is not 0.
-	  We still need those timestamps for each output sub frame.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3448>
+	* sys/msdk/gstmsdkcontext.c:
+	  msdk: Remove dead code
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5796>
 
-2022-11-22 15:50:44 +0800  He Junyan <junyan.he@intel.com>
+2023-12-11 20:35:25 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/videoparsers/gsth264parse.c:
-	  h264parse: Add the missing timestamp when splitting a frame.
-	  When splitting a frame, the gst_buffer_copy_region() does not copy
-	  the timestamp correctly for sub frames when the offset is not 0.
-	  We still need those timestamps for each output sub frame.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3448>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  vaallocator: use gst_va_display_check_version()
+	  Instead of the local method to parse the vendor string.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5800>
 
-2022-11-21 19:40:35 +0200  Sebastian Dröge <sebastian@centricular.com>
+2023-12-11 20:34:30 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/dvbsubenc/gstdvbsubenc-util.c:
-	* gst/dvbsubenc/gstdvbsubenc.c:
-	* gst/dvbsubenc/gstdvbsubenc.h:
-	  dvbsubenc: Write Display Definition Segment if a non-default width/height is used
-	  Otherwise it can't be rendered by dvbsuboverlay or ffmpeg at least.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3446>
+	* gst-libs/gst/va/gstvadisplay.c:
+	* gst-libs/gst/va/gstvadisplay.h:
+	  vadisplay: add gst_va_display_check_version()
+	  This function compares the driver version with the user provided one to check if
+	  driver's is equal or bigger.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5800>
 
-2022-10-28 00:06:23 +0900  Seungha Yang <seungha@centricular.com>
+2023-12-11 17:28:06 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/aom/gstav1dec.c:
-	  av1dec: Demote rank to secondary
-	  cerbero does not build this plugin for now, and there's altanative
-	  dav1ddec
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3287>
+	* gst-libs/gst/va/gstvaallocator.c:
+	* gst-libs/gst/va/gstvaallocator.h:
+	  vaallocator: clean up use derived feature
+	  Remove allocator member variable for use derived feature which doesn't need to be kept,
+	  it's just for configuration purposes.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5799>
 
-2022-11-18 13:32:10 -0800  Bill Hofmann <bill.hofmann@gmail.com>
+2023-12-12 17:14:03 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/kms/gstkmsedid.c:
-	* sys/kms/gstkmsedid.h:
-	* sys/kms/gstkmssink.c:
-	* sys/kms/gstkmssink.h:
-	* sys/kms/meson.build:
-	  kmssink: add HDR10 infoframe support
-	  If stream has HDR10 metadata and HDMI device EDID supports it, this patch
-	  will set the DRM properties accordingly.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3303>
+	* sys/va/gstvah265dec.c:
+	  va: h265dec: Add support for more -still and -intra profiles
+	  They are actually compitable with the main and main-10 profiles.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5797>
 
-2022-11-21 15:48:49 -0500  Bill Hofmann <bill.hofmann@gmail.com>
+2023-12-12 17:09:56 +0800  He Junyan <junyan.he@intel.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/kms/gstkmssink.c:
-	* sys/kms/gstkmssink.h:
-	  kmssink: Add skip-vsync property
-	  The legacy emulation in DRM/KMS drivers badly interact with GStreamer and
-	  may cause the framerate to be halved. With this property, users can disable
-	  vsync (which is handled internally by the emulation) in order to regain the
-	  full framerate.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3303>
+	* sys/va/gstvaprofile.c:
+	  va: Add decoder compatible caps string field into profiles' map
+	  Some profiles such as main or main-10 in HEVC can support more
+	  compatible profiles such as main-still-picture or main-10-intra.
+	  We should add them into decoder's sink caps.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5797>
 
-2022-11-18 02:06:51 +0900  Seungha Yang <seungha@centricular.com>
+2023-12-12 20:41:54 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	  av1decoder: Clear highest_spatial_layer per sequence header
-	  Clear the value to default zero, indicating that no spatial scalability
-	  layer is used.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3430>
+	* sys/va/gstvacaps.c:
+	* sys/va/gstvah264enc.c:
+	* sys/va/gstvah265enc.c:
+	* sys/va/gstvaprofile.c:
+	* sys/va/gstvaprofile.h:
+	  va: Add the entrypoint parameter to gst_va_profile_caps()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5797>
 
-2022-11-18 01:59:55 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-26 18:29:01 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	  av1decoder: Don't error out by dropped OBU
-	  OBU can be dropped if the current layer is not in selected operation
-	  point
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3430>
+	* sys/msdk/gstmsdkvpputil.c:
+	  msdkvpp: Add fix_format for src caps
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5208>
 
-2022-11-18 01:49:43 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-02 17:30:31 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	  av1decoder: Fix wrong spatial layer validation
-	  Highest spatial id and temporal id is independent, and should not drop
-	  temporal enhance layer by the previous condition. Note that
-	  the decision for dropping OBU based on operation point is being
-	  handled in gst_av1_parser_identify_one_obu() already.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1585
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3430>
+	* sys/msdk/gstmsdkcaps.c:
+	  msdk: Add a help func to fix the map
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5208>
 
-2022-11-18 01:43:26 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-01 17:45:36 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* gst-libs/gst/codecparsers/gstav1parser.c:
-	  av1parser: Don't print warning for expected OBU drop
-	  Dropping an OBU which is not in selected operation point is an
-	  expected condition.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3430>
+	* sys/msdk/gstmsdkallocator_libva.c:
+	  msdk: Remove func to export dmabuf to va surface
+	  Since we use va allocator and va dma allocator to create surface, the
+	  surface is already exported in the case of dma allocator. So remove
+	  redundant export function in msdk allocator.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5208>
 
-2022-11-18 01:41:33 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-30 18:12:38 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst-libs/gst/codecparsers/gstav1parser.c:
-	  av1parser: Remove impossible condition
-	  unsigned integer cannot be negative
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3430>
+	* sys/msdk/gstmsdkenc.c:
+	* sys/msdk/gstmsdkenc.h:
+	  msdkenc: Add modifier support
+	  Co-authored-by: Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5208>
 
-2022-11-19 19:22:17 +1100  Jan Schmidt <jan@centricular.com>
+2023-05-30 18:01:49 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Remove queue after rtpfunnel
-	  The original BUNDLE support commit placed a queue after the
-	  rtpfunnel that combines streams, but I don't see a good reason for
-	  it. It has default settings, so if network output is slow might
-	  accidentally store up to 1 second of pending data, increasing
-	  latency.
-	  Remove it in favour of doing any necessary buffering before
-	  webrtcbin. If it turns out that there is a reason for it to
-	  exist, the limits should probably be configurable and small.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3437>
-
-2022-11-19 04:42:56 +1100  Jan Schmidt <jan@centricular.com>
-
-	* gst-libs/gst/webrtc/webrtc_fwd.h:
-	  webrtc: Improve GstWebRTCStatsType docstring
-	  Fix a typo of peer-connectiion -> peer-connection
-	  Add a link to the w3c RTCStats type for a description
-	  of what each statistics type is.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3434>
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/gstmsdkvpp.h:
+	* sys/msdk/gstmsdkvpputil.c:
+	  msdkvpp: Add modifier support
+	  Co-authored-by: Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5208>
 
-2022-11-19 04:42:20 +1100  Jan Schmidt <jan@centricular.com>
+2023-05-30 17:25:45 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Fix a typo in debug log
-	  transceiever -> transceiver
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3434>
+	* sys/msdk/gstmsdkcaps.c:
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkdec.h:
+	  msdkdec: Add modifier support
+	  Co-authored-by: Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5208>
 
-2022-11-13 03:07:54 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-22 14:15:39 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/qsv/plugin.cpp:
-	  qsv: Promote encoder rank to PRIMARY on Windows
-	  QSV is very well integrated with GstD3D11 infrastructure on Windows,
-	  and this is the recommended H/W encoder element over the MediaFoundation
-	  plugins on Intel GPU system.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3393>
+	* sys/msdk/gstmsdkallocator_libva.c:
+	  msdk: Config pool with max/min number of buffers
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5208>
 
-2022-11-15 13:50:13 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-05-30 16:24:46 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* sys/v4l2codecs/gstv4l2format.c:
-	  video: Add arbitrary tile dimensions support
-	  In current tile representation, only tiles with power of two
-	  width and height in bytes are supported. This limitation
-	  prevents adding more complex tiles formats.
-	  In this patch, we deprecate tile_ws and tile_hs from GstVideoFormatInfo and
-	  replace if with an array of GstVideoTileInfo. Each plane tiles are then
-	  described with their pixels width/height, line stride and total size.
-	  The helper gst_video_format_info_get_tile_sizes() that depends on the
-	  deprecated API is also being removed. This can simply be removed as it wasn't
-	  in any stable release yet.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3424>
+	* sys/msdk/gstmsdkcaps.c:
+	* sys/msdk/gstmsdkcaps.h:
+	  msdk: Add help functions to handle drm caps
+	  Co-authored-by: Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5208>
+
+2023-05-18 15:00:37 +0800  Yinhang Liu <yinhang.liu@intel.com>
+
+	* sys/msdk/gstmsdkcaps.c:
+	  msdk: Add modifier when creating dynamic caps
+	  Add modifier in gst-inspect for dma features.
+	  Co-authored-by: Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5208>
 
-2020-08-31 14:04:54 +0200  Johan Sternerup <johast@axis.com>
+2023-05-18 14:36:23 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/webrtc/gstwebrtcbin.c:
-	* gst-libs/gst/webrtc/ice.c:
-	* gst-libs/gst/webrtc/ice.h:
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  webrtcbin: Add settings for HTTP proxy
-	  Pass this to libnice which has a simple HTTP 1.0 proxy with basic
-	  authentication only.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2867>
+	* sys/msdk/gstmsdkallocator_libva.c:
+	* sys/msdk/gstmsdkallocator_libva.h:
+	  msdk: Add a helper function to get supported modifiers
+	  The modifiers will be used when creating caps for dma feature.
+	  co-authored-by: Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5208>
 
-2021-10-20 13:02:31 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
+2023-12-10 04:26:59 +0100  Stefan Brüns <stefan.bruens@rwth-aachen.de>
 
-	* gst/mpegtsdemux/tsdemux.c:
-	  tsdemux: Add pad-name to warning for continuity mismatch
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3141>
+	* ext/ladspa/meson.build:
+	* meson_options.txt:
+	  ladspa: Make RDF parsing truely optional
+	  If the ladspa plugin is enabled explicitly or via auto-features, the
+	  liblrdf dependency can not be disabled.
+	  As the RDF parsing currently provides hardly any features, the possibility
+	  to disable it fairly useful.
+	  Fixes: #3168
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5794>
 
-2022-05-02 19:13:41 +0200  Enrique Ocaña González <eocanha@igalia.com>
+2023-12-06 14:58:38 +0100  Kalev Lember <klember@redhat.com>
 
-	* ext/hls/gsthlsdemux.c:
-	* ext/hls/gsthlsdemux.h:
-	* ext/hls/m3u8.c:
-	* ext/hls/m3u8.h:
-	* tests/check/elements/hlsdemux_m3u8.c:
-	  hlsdemux: Expose EXT-X-PROGRAM-DATE-TIME as tags.
-	  This allows an application to use timestamps associated
-	  with fragments.
-	  Patch by: Thomas Bluemel <tbluemel@control4.com>
-	  See: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/195
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1417>
+	* ext/openh264/gstopenh264dec.cpp:
+	* ext/openh264/gstopenh264element.c:
+	* ext/openh264/gstopenh264elements.h:
+	* ext/openh264/gstopenh264enc.cpp:
+	* ext/openh264/meson.build:
+	  openh264: Drop runtime version checks
+	  With the way the runtime checks are currently set up, every single
+	  openh264 release, no matter how minor, is considered an ABI break and
+	  requires gst-plugins-bad recompilation. This is unnecessarily strict
+	  because it doesn't allow downstream distributions to ship any openh264
+	  bug fix version updates without breaking gstreamer's openh264 support.
+	  Years ago, at the time when gstreamer's openh264 support was merged,
+	  openh264 releases were done without a versioned soname (the library was
+	  just libopenh264.so, unversioned). Since then, starting with version
+	  1.3.0, openh264 has started using versioned sonames and the intent has
+	  been to bump the soname every time there's a new release with an ABI
+	  change.
+	  This patch drops the strict version check. meson.build already has a
+	  minimum requirement on openh264 version 1.3.0 where soname versioning
+	  was added, which should be good enough to ensure that the library is
+	  using soname versioning.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5780>
 
-2022-11-16 19:39:47 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-12-09 20:05:31 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/va/gstvabaseenc.c:
-	  vabaseenc: Reduce logging noise if finish_frame fails.
-	  Fixes: #1579
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3423>
+	* gst-libs/gst/codecs/gsth265picture.c:
+	  codecs: correct the print log for h265 picture getting by poc
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5789>
 
-2022-11-13 03:28:23 +0900  Seungha Yang <seungha@centricular.com>
+2023-12-06 15:32:40 +0200  Jordan Petridis <jordan@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/amfcodec/plugin.cpp:
-	  amfcodec: Promote encoder rank to PRIMARY
-	  This H/W encoder implementation is the recommended element
-	  on AMD system over the MediaFoundation one.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3394>
+	* gst-libs/gst/mse/meson.build:
+	  build/mse: Add the enum sources to the test gstmse_private_test_dep
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5763>
 
-2022-11-02 14:45:51 +0100  Edward Hervey <edward@centricular.com>
+2023-12-06 12:01:36 +0100  Alessandro Bono <alessandro.bono369@gmail.com>
 
-	* gst/mpegtsdemux/tsdemux.c:
-	  tsdemux: Push GST_EVENT_STREAM_COLLECTION
-	  Demuxers that are not streams-aware will have that handled by parsebin. This
-	  created a difference in results downstream between streams-aware and
-	  non-streams-aware demuxers
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2784>
+	* ext/dtls/gstdtlscertificate.c:
+	  gstdtlscertificate: Define _WINSOCKAPI_ before including windows.h
+	  This avoid a build failure when compiling against OpenSSL 3.2.0. The
+	  problem is when windows.h is included before WinSock2.h. Because
+	  windows.h includes winsock.h1. Defining _WINSOCKAPI_ stops windows.h
+	  including winsock.h.
+	  Error:
+	  ```
+	  748/1041 Compiling C object ext/dtls/gstdtls.dll.p/gstdtlscertificate.c.obj
+	  FAILED: ext/dtls/gstdtls.dll.p/gstdtlscertificate.c.obj
+	  ...
+	  Windows Kits\10\include\10.0.17763.0\shared\ws2def.h(235): error C2011: 'sockaddr': 'struct' type redefinition
+	  Windows Kits\10\include\10.0.17763.0\um\winsock.h(482): note: see declaration of 'sockaddr'
+	  ```
+	  1 https://stackoverflow.com/a/1372836
+	  Closes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3167
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5770>
 
-2022-11-14 15:53:00 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-12-07 15:36:26 +0100  Alexander Slobodeniuk <aslobodeniuk@fluendo.com>
 
-	* sys/v4l2codecs/gstv4l2codech264dec.c:
-	* sys/v4l2codecs/gstv4l2codech265dec.c:
-	* sys/v4l2codecs/gstv4l2codecmpeg2dec.c:
-	* sys/v4l2codecs/gstv4l2codecvp8dec.c:
-	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
-	  v4l2codecs: Allow output caps to be updated
-	  This change allow output caps to be updated even though we stay in
-	  streaming state. This is needed so that any upstream updated to fields
-	  like framerate, hdr data, etc. can result in a downstream caps event
-	  being pushed.
-	  Previously, any of these changes was being ignored and the downstream
-	  caps would not reflect it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3328>
+	* sys/d3d11/meson.build:
+	  d3d11: fix building with address sanitizer
+	  When building with address sanitizer it gives next error:
+	  "gstd3d11window_corewindow.cpp : fatal error C1128: number of sections
+	  exceeded object file format limit: compile with /bigobj"
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5779>
 
-2022-11-05 21:06:39 +0900  Seungha Yang <seungha@centricular.com>
+2023-12-04 20:05:48 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/nvcodec/gstnvav1dec.c:
-	* sys/nvcodec/gstnvdecoder.c:
-	* sys/nvcodec/gstnvdecoder.h:
-	* sys/nvcodec/gstnvh264dec.c:
-	* sys/nvcodec/gstnvh265dec.c:
-	* sys/nvcodec/gstnvvp8dec.c:
-	* sys/nvcodec/gstnvvp9dec.c:
-	  nvdecoder: Handle input caps change
-	  Update output caps if it's notified by baseclass
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3328>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  vaallocator: force non-derived for old mesa drivers
+	  Mesa <23.3 can't map derived images for P010 format. This patch forces
+	  non-derived if this is the case.
+	  See: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24381
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5760>
 
-2022-11-05 21:00:43 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-30 16:52:02 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/nvcodec/gstnvav1dec.c:
-	* sys/nvcodec/gstnvdecoder.c:
-	* sys/nvcodec/gstnvdecoder.h:
-	* sys/nvcodec/gstnvh264dec.c:
-	* sys/nvcodec/gstnvh265dec.c:
-	* sys/nvcodec/gstnvvp8dec.c:
-	* sys/nvcodec/gstnvvp9dec.c:
-	  nvdecoder: Don't hold decoder output state
-	  It's not referenced by this implementation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3328>
+	* gst-libs/gst/va/vasurfaceimage.c:
+	  va: check surface status before get derive image
+	  According with documentation the surface has to be in ready state before getting
+	  it derived image. This patch adds that check.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5760>
 
-2022-11-05 20:16:21 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-30 14:47:06 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* tests/examples/codecs/decoder-caps-update.cpp:
-	* tests/examples/codecs/meson.build:
-	* tests/examples/meson.build:
-	  examples: Add test code to verify decoder caps update
-	  Sample command lines
-	  * Configures pipeline with video encoder
-	  decoder-caps-update \
-	  --encoder="video/x-raw,format=NV12 ! qsvh264enc" \
-	  --decoder=d3d11h264dec \
-	  --videosink=d3d11videosink
-	  * Playing exisiting file
-	  decoder-caps-update \
-	  --location=test_file.mp4 \
-	  --decoder=d3d11h264dec \
-	  --videosink=d3d11videosink
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3328>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  vaallocator: remove runtime mapping selection
+	  The original idea was to select the type of mapping (either using derive images
+	  or downloading the image) in runtime, under the assumption that both methods
+	  shared the same memory layout (offsets and strides), because a single
+	  GstVideoMeta is assigned by the buffer pool at allocation time. Nonetheless, in
+	  recent hardware this assumption is invalid, raising memory access errors.
+	  This patch removes completely the mapping type selection at runtime, using the
+	  method selected when the allocator is configured, synced with the bufferpool
+	  allocation.
+	  This problem was fixed originally for iHD driver only. But now it makes sense to
+	  remove all of it.
+	  Original-patch-by: Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5760>
 
-2022-11-05 02:47:54 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-30 12:00:27 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/d3d11/gstd3d11av1dec.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11decoder.h:
-	* sys/d3d11/gstd3d11h264dec.cpp:
-	* sys/d3d11/gstd3d11h265dec.cpp:
-	* sys/d3d11/gstd3d11mpeg2dec.cpp:
-	* sys/d3d11/gstd3d11vp8dec.cpp:
-	* sys/d3d11/gstd3d11vp9dec.cpp:
-	  d3d11decoder: Handle input caps change
-	  Update output caps if it's notified by baseclass
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3328>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  vaallocator: don't fail if drm fourcc are different
+	  When exporting a DMABuf from a VASurface the user might tell that the surface
+	  was allocated with certain fourcc, but the returned VADRMPRIMESurfaceDescriptor
+	  migth tell a different fourcc, as in the case or radeonsi driver, for duplicated
+	  fourcc, such as YUY2 and YUYV.
+	  Originally it was supposed to be a failed exportation. This patch relax this
+	  validation by allowing different fourcc.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5760>
 
-2022-11-05 01:07:02 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-15 16:35:38 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	* gst-libs/gst/codecs/gstav1picture.c:
-	* gst-libs/gst/codecs/gstav1picture.h:
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	* gst-libs/gst/codecs/gsth264picture.c:
-	* gst-libs/gst/codecs/gsth264picture.h:
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	* gst-libs/gst/codecs/gsth265picture.c:
-	* gst-libs/gst/codecs/gsth265picture.h:
-	* gst-libs/gst/codecs/gstmpeg2decoder.c:
-	* gst-libs/gst/codecs/gstmpeg2picture.c:
-	* gst-libs/gst/codecs/gstmpeg2picture.h:
-	* gst-libs/gst/codecs/gstvp8decoder.c:
-	* gst-libs/gst/codecs/gstvp8picture.c:
-	* gst-libs/gst/codecs/gstvp8picture.h:
-	* gst-libs/gst/codecs/gstvp9decoder.c:
-	* gst-libs/gst/codecs/gstvp9picture.c:
-	* gst-libs/gst/codecs/gstvp9picture.h:
-	  codecs: Keep track of non-decoding-essential input state change
-	  In theory, input caps can be updated anytime at non-keyframe or
-	  sequence boundary, such as HDR10 metadata, framerate, aspect-ratio
-	  or so. Those information update might not trigger ::new_sequence()
-	  or subclass may ignore the changes.
-	  By this commit, input state change will be tracked by baseclass
-	  and subclass will be able to know the non-decoding-essential
-	  update by checking the codec specific picture struct
-	  on ::output_picture()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3328>
+	* sys/msdk/gstmsdkcontext.c:
+	* sys/msdk/msdk.c:
+	* sys/msdk/msdk.h:
+	  msdk: Let deviceID config the mfx implementation
+	  In multi-card scenario, user can set GST_MSDK_DRM_DEVICE env variable to
+	  choose the device. This patch can align vpl's queried results with the
+	  users' choice by passing deviceID when creating mfx implementation.
+	  Co-authored-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5697>
 
-2022-11-16 09:42:08 +0100  Edward Hervey <bilboed@bilboed.com>
+2023-12-05 12:21:37 -0500  Daniel Morin <daniel.morin@collabora.com>
 
-	* gst/mpegtsdemux/mpegtspacketizer.c:
-	  Revert "mpegtspacketizer: memcmp potentially seen_before data"
-	  This reverts commit fcad4cc646a23e4e621ec5e8485958ab78d98090.
-	  This was wrong is so many ways.
-	  * The memcmp was badly used (it should use == 0 to check the data is identical,
-	  and not != 0)
-	  * There was no boundary checks on the present stream section_data when passing
-	  it to memcmp.
-	  * The return value should have been TRUE (i.e. we have done all checks, none of
-	  them failed, therefore the section has been seen before)
-	  * stream->section_data would *always* be NULL if the section had already been
-	  processed
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1559
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3421>
+	* ext/onnx/decoders/gstssdobjectdetector.cpp:
+	* ext/onnx/meson.build:
+	  onnx: replace video-region-of-interest with analytics-meta
+	  - Use analytics-meta/OD to transport object detection results
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5767>
+
+2023-12-05 20:12:36 -0500  Daniel Morin <daniel.morin@collabora.com>
+
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	  analytics: fix analytics-meta re-use
+	  - Fix alignment error when source and destination analytics-meta have the same
+	  relation order.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5767>
+
+2023-12-01 21:38:17 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/nvcodec/gstcudaipcserver.cpp:
+	* sys/nvcodec/gstcudaipcserver.h:
+	* sys/nvcodec/gstcudaipcserver_unix.cpp:
+	* sys/nvcodec/gstcudaipcserver_win32.cpp:
+	  cudaipcsink: Fix deadlock on stop
+	  Manually close connection if client does not hold any shared memory
+	  on stop.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5747>
+
+2023-12-01 21:15:00 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d11/gstd3d11ipcserver.cpp:
+	  d3d11ipcsink: Fix deadlock on stop
+	  Manually close connection if client does not hold any shared memory
+	  on stop.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5747>
 
-2022-11-16 09:29:59 +0100  Edward Hervey <edward@centricular.com>
+2023-12-05 19:52:22 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsdemux/mpegtsbase.c:
-	  mpegts: Check is program is identical before updating
-	  There is no need to update the program if it's identical :)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3421>
+	* sys/nvcodec/gstnvdec.c:
+	  nvdec: Fix division by zero when calculating buffer duration
+	  Don't try to calculate buffer duration from variable framerate
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5764>
 
-2022-11-16 03:15:44 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-28 03:25:00 +0000  renjun wang <renjunw@outlook.com>
 
-	* gst/codectimestamper/gstcodectimestamper.c:
-	* gst/codectimestamper/gstcodectimestamper.h:
-	  codectimestamper: Remove duplicated GstSegment struct
-	  Use the one in priv struct. And use gst_segment_is_equal()
-	  to compare GstSegment
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3380>
+	* sys/v4l2codecs/gstv4l2codecav1dec.c:
+	  v4l2codecs: av1: Fix typo in debug log message
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5722>
 
-2022-11-09 18:03:48 +1100  Matthew Waters <matthew@centricular.com>
+2023-12-04 20:47:31 -0500  Daniel Morin <daniel.morin@collabora.com>
 
-	* gst/codectimestamper/gstcodectimestamper.c:
-	* tests/check/elements/h264timestamper.c:
-	* tests/check/meson.build:
-	  h264/5timestamper: provide a workaround for h264/5parse producing pts=NONE buffers
-	  A workaround for
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/649
-	  and
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/287
-	  which is hard to change baseparse behaviour for both video and audio
-	  parsers.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3380>
+	* ext/onnx/gstonnxinference.cpp:
+	  onnx: avoid leak on failure and cleanup
+	  - Unmap buffer on Ort exception
+	  - Avoid retrieving unused videometa
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5761>
 
-2022-11-12 06:16:59 +0900  Seungha Yang <seungha@centricular.com>
+2023-12-04 19:57:39 -0500  Daniel Morin <daniel.morin@collabora.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	  nvcodec: Update plugin cache
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3389>
+	* ext/onnx/gstonnxclient.cpp:
+	* ext/onnx/gstonnxclient.h:
+	* ext/onnx/gstonnxinference.cpp:
+	  onnx: add offset and scale properties
+	  - Offset each datapoint by the value set on offset property.
+	  - Scale each datapoint by the value set on scale property.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5761>
 
-2022-11-12 05:45:15 +0900  Seungha Yang <seungha@centricular.com>
+2023-12-04 19:11:23 -0500  Daniel Morin <daniel.morin@collabora.com>
 
-	* tests/check/elements/cudaconvert.c:
-	  tests: cudaconvert: Update test code
-	  Adding more formats, and rescale test with borders
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3389>
+	* ext/onnx/gstonnxclient.cpp:
+	  onnx: fix tensor id loading
+	  - Fix quark genaration. String loaded from the model/file are not static.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5761>
 
-2022-11-12 04:48:50 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-02 20:43:48 -0400  Daniel Morin <daniel.morin@collabora.com>
 
-	* sys/nvcodec/gstcudaconvertscale.c:
-	  cudaconvertscale, cudascale: Add "add-borders" property and support 8bits RGB planar formats
-	  Adding "add-borders" property which is identical to that of
-	  videoscale and this will be enabled by default.
-	  And adding RGBP/BGRP/GBR/GBRA format support.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3389>
+	* ext/onnx/gstonnxclient.cpp:
+	* ext/onnx/gstonnxclient.h:
+	* ext/onnx/gstonnxinference.cpp:
+	  onnx: Add support for float datatype
+	  This is a bit of a hack solution has I think the correct solution is to
+	  expose model caps on sinkpad (eventually sinkpads). Till then I think
+	  this is reasonable.
+	  - Add a property to onnxinference to set datatype.
+	  - Fix internal buffer allocation size based on datatype.
+	  - Extract method to remove alphe channel and convert to planar image
+	  when requested. Also template the method to support writing to buffers
+	  of different datatype.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5761>
+
+2023-12-05 09:28:25 +0100  Guillaume Desmottes <guillaume.desmottes@onestream.live>
+
+	* meson.build:
+	  meson: update PACKAGE_BUGREPORT
+	  Some were still using pre-monorepo links.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5762>
 
-2022-11-12 04:06:32 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-29 20:58:51 +0100  Ruben Gonzalez <rgonzalez@fluendo.com>
 
-	* sys/nvcodec/cuda-converter.c:
-	* sys/nvcodec/cuda-converter.h:
-	* sys/nvcodec/gstcudaconverter.c:
-	* sys/nvcodec/gstcudaconverter.h:
-	* sys/nvcodec/gstcudaconvertscale.c:
-	* sys/nvcodec/meson.build:
-	  cuda: Rewrite colorspace/rescale object
-	  Rewriting GstCudaConverter object, since the old implementation was not
-	  well organized and it's hard to add new features.
-	  Moreover, the conversion operations were not very optimized.
-	  Major change of this implementation:
-	  * Remove redundant intermediate conversion operations such as
-	  any RGB -> ARGB(64) conversion or any YUV -> Y444 (or 16bits Y444).
-	  That's not required most of cases. The only required case is
-	  converting 24bits (such as RGB/BGR) packed format to 32bits format
-	  because CUDA texture object does not support sampling 24bits format
-	  * Use normalized sample fetching (i.e., 0, 1 range float value)
-	  and also normalized coordinates system for CUDA texture.
-	  It's consistent with the other graphics APIs such as Direct3D
-	  and OpenGL, that makes sampling operations much easier.
-	  * Support a kind of viewport and adopt math for colorspace conversion
-	  from GstD3D11 implementation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3389>
+	* gst/gaudieffects/gstgaussblur.c:
+	  gstgaussblur: delete unused code
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5737>
 
-2022-11-10 19:38:03 +0900  Seungha Yang <seungha@centricular.com>
+2023-12-02 22:17:34 -0500  Daniel Morin <daniel.morin@collabora.com>
 
-	* gst-libs/gst/cuda/gstcudamemory.c:
-	* sys/nvcodec/gstcudaformat.h:
-	  cudaupload,cudadownload: Add support for planar 8bits RGB formats
-	  Defines RGBP, BGRP, and GBR formats, which have the same memory
-	  layout as already supported Y444. And defines GBRA format as well
-	  which needs just one additional alpha plane
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3389>
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.h:
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.h:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.h:
+	* gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.h:
+	* tests/check/libs/analyticsmeta.c:
+	  analytics: replace id type from gint to guint
+	  - Replace all id type from gint to guint
+	  - Fix annotation for GstAnalyticsODMtdData
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5758>
 
-2022-11-10 20:47:44 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-15 22:14:02 -0400  Aaron Boxer <boxerab@protonmail.com>
 
-	* gst-libs/gst/cuda/gstcudacontext.c:
-	  cudacontext: Store texture alignment
-	  it was missed in the previous refactoring
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3389>
-
-2022-11-12 04:01:08 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/nvcodec/gstcudabasefilter.c:
-	* sys/nvcodec/gstcudabasefilter.h:
-	* sys/nvcodec/gstcudaconvert.c:
-	* sys/nvcodec/gstcudaconvert.h:
-	* sys/nvcodec/gstcudaconvertscale.c:
-	* sys/nvcodec/gstcudaconvertscale.h:
-	* sys/nvcodec/gstcudafilter.c:
-	* sys/nvcodec/gstcudascale.c:
-	* sys/nvcodec/gstcudascale.h:
-	* sys/nvcodec/meson.build:
-	  cudaconvert, cudascale: Port to GstCudaBaseCovert baseclass
-	  Don't need to hold duplicated code in the source tree
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3389>
+	* gst/mpegtsmux/gstbasetsmux.c:
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	* gst/mpegtsmux/tsmux/tsmux.h:
+	* gst/mpegtsmux/tsmux/tsmuxstream.h:
+	  mpegtsmux: allow attaching PCR to non-PES streams
+	  There is an existing PMT mapping between PCR_%s and an mpegtsmux sink
+	  pad name, where %s equals the program number that the PCR corresponds
+	  to. We re-purpose this functionality to also support a mapping between
+	  PCR_%s and an arbitrary PID. If this mapping is set, then the header PCR
+	  PID is set to this value, and PCR is attached to the stream with this
+	  PID.
+	  Note: the current implementation also attaches PCR to the video stream,
+	  so this may be inefficient.
+	  Co-authored-by: Jordan Yelloz <jordan.yelloz@collabora.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5726>
 
-2022-11-09 21:31:01 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-30 21:55:24 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/nvcodec/gstcudabasefilter.h:
-	* sys/nvcodec/gstcudaconvertscale.c:
-	* sys/nvcodec/gstcudaconvertscale.h:
-	* sys/nvcodec/gstcudafilter.c:
-	* sys/nvcodec/meson.build:
-	  cuda: Add convertscale element
-	  GstCudaConverter object can do colorspace conversion and scale at once.
-	  Adding new element "cudaconvertscale" to do that, this can
-	  save unnecessary GPU operation if colorspace conversion and
-	  rescale is required for given input stream format.
-	  Most of codes are taken from d3d11convert element
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3389>
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/qsv/gstqsvh265dec.cpp:
+	  qsv: Update plugin doc cache
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5706>
 
-2022-11-10 14:39:12 +0800  Elliot Chen <elliot.chen@nxp.com>
+2023-11-22 01:15:03 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/play/gstplay.c:
-	  gstplay: add warning message details check before post it
-	  For some warning message which has no detail data, need check to avoid printing critical log.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3382>
-
-2021-10-14 11:56:58 +0200  Rafał Dzięgiel <rafostar.github@gmail.com>
-
-	* tests/check/elements/dash_mpd.c:
-	  tests: Add DASH MPD baseURL with query test
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1147>
-
-2021-10-14 10:12:51 +0200  Rafał Dzięgiel <rafostar.github@gmail.com>
-
-	* ext/dash/gstmpdparser.c:
-	  mpdparser: Fix missing baseURL query
-	  When no initializationURL or mediaURL, return baseURL that also
-	  contains original URI query if available. This fixes a problem
-	  where URI query was being omitted in the HTTP requests.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1147>
+	* sys/qsv/gstqsvallocator.cpp:
+	* sys/qsv/gstqsvallocator.h:
+	* sys/qsv/gstqsvallocator_d3d11.cpp:
+	* sys/qsv/gstqsvdecoder.cpp:
+	* sys/qsv/gstqsvh265dec.cpp:
+	* sys/qsv/gstqsvutils.cpp:
+	* sys/qsv/gstqsvutils.h:
+	  qsvh265dec: Add support for GBR decoding
+	  Use GBR equivalent output formats if RGB colorspace is detected
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5706>
 
-2021-10-14 10:09:31 +0200  Rafał Dzięgiel <rafostar.github@gmail.com>
+2023-11-21 21:58:35 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/dash/gstmpdclient.c:
-	* ext/dash/gstmpdparser.c:
-	* ext/dash/gstmpdparser.h:
-	  mpdparser: Be consistent about returning duplicated URL
-	  Instead of returning a "const gchar" or a "gchar" that should not be freed, always
-	  return a duplicated string as those functions were used together with g_strdup anyway.
-	  This is needed to prepare support for returning modified strings in next commit.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1147>
-
-2021-10-14 10:18:40 +0200  Rafał Dzięgiel <rafostar.github@gmail.com>
-
-	* ext/dash/gstmpdparser.c:
-	  mpdparser: Return correct mediaURL value
-	  This fixes a problem where get_mediaURL was returning NULL when segmentURL
-	  was unavailable instead of baseURL as a fallback.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1147>
+	* sys/qsv/gstqsvh265dec.cpp:
+	  qsvh265dec: Add support for HEVC RExt profiles
+	  Adding 4:2:0 high bitdepth and 4:2:2/4:4:4 decoding support
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5706>
 
-2022-11-13 02:08:15 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-21 20:56:36 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
-	  d3d11converter: Fix YUY2 conversion error
-	  Always configure shader conversion path, then fallback to the
-	  shader path if processor is not available
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3392>
+	* sys/qsv/gstqsvallocator.cpp:
+	* sys/qsv/gstqsvallocator.h:
+	* sys/qsv/gstqsvallocator_d3d11.cpp:
+	* sys/qsv/gstqsvav1enc.cpp:
+	* sys/qsv/gstqsvdecoder.cpp:
+	* sys/qsv/gstqsvh264dec.cpp:
+	* sys/qsv/gstqsvh264enc.cpp:
+	* sys/qsv/gstqsvh265dec.cpp:
+	* sys/qsv/gstqsvh265enc.cpp:
+	* sys/qsv/gstqsvjpegdec.cpp:
+	* sys/qsv/gstqsvjpegenc.cpp:
+	* sys/qsv/gstqsvutils.cpp:
+	* sys/qsv/gstqsvutils.h:
+	* sys/qsv/gstqsvvp9dec.cpp:
+	* sys/qsv/gstqsvvp9enc.cpp:
+	  qsv: Add util methods for video format mapping
+	  Remove duplicated format mapping code
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5706>
 
-2022-11-12 22:55:52 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-28 23:27:49 +0900  Seungha Yang <seungha@centricular.com>
 
 	* docs/plugins/gst_plugins_cache.json:
 	* gst-libs/gst/d3d11/gstd3d11-private.h:
+	* gst-libs/gst/d3d11/gstd3d11converter-builder.cpp:
 	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
 	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	* tests/check/elements/d3d11colorconvert.c:
-	  d3d11: Add support for planar RGB formats
-	  Adding RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, and
-	  GBRA_12LE format support
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3392>
-
-2022-11-13 02:28:42 +0900  Seungha Yang <seungha@centricular.com>
-
-	* docs/plugins/gst_plugins_cache.json:
-	  d3d11screencapturesrc: Update plugin cache
-	  Missed in
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3360
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3392>
-
-2022-11-15 00:11:15 +1100  Jan Schmidt <jan@centricular.com>
-
-	* ext/aes/gstaesdec.c:
-	  aesdec: Fix padding removal for per-buffer-padding=FALSE
-	  When per-buffer-padding is FALSE, the OpenSSL context needs
-	  to be told to remove any padding at the end of the ciphertext
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1243
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3406>
-
-2022-11-12 09:16:36 +0100  Edward Hervey <edward@centricular.com>
-
-	* gst/transcode/gsttranscodebin.c:
-	  transcodebin: Use const arguments for clarity
-	  And rename it when it classhes with existing local variable
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3390>
-
-2022-11-12 09:15:23 +0100  Edward Hervey <edward@centricular.com>
+	* gst-libs/gst/d3d11/hlsl/PSMain_converter.hlsl:
+	* gst-libs/gst/d3d11/hlsl/meson.build:
+	  d3d11: Add RBGA format support
+	  Allocates DXGI_FORMAT_AYUV texture for RBGA so that it can be used
+	  by video decoders.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5703>
+
+2023-11-22 00:07:57 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/transcode/gsttranscodebin.c:
-	  transcodebin: Don't leak GstStream
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3390>
+	* docs/plugins/gst_plugins_cache.json:
+	  video: Add RBGA format
+	  This new format is intended to be used by hardware decoders
+	  where VUYA is only supported 4:4:4 decoding surface but
+	  stream is encoded with GBR color space, HEVC and VP9 GBR streams
+	  for example.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5703>
 
-2022-11-12 08:35:27 +0100  Edward Hervey <edward@centricular.com>
+2023-11-21 14:26:54 +0100  Benjamin Gaignard <benjamin.gaignard@collabora.com>
 
-	* gst/transcode/gsttranscodebin.c:
-	  transcode: Don't leak caps
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3390>
+	* gst-libs/gst/codecparsers/gstav1parser.c:
+	  codecparsers: av1: Clip max tile rows and cols values
+	  Clip tile rows and cols to 64 as describe in AV1 specification
+	  to avoid writing outside array range but preserve sb_cols
+	  and sb_rows value which are used to futher computation.
+	  Fixes ZDI-CAN-22226 / CVE-2023-44429
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5702>
 
-2022-11-12 08:35:12 +0100  Edward Hervey <edward@centricular.com>
+2023-11-21 14:04:49 +0100  Benjamin Gaignard <benjamin.gaignard@collabora.com>
 
-	* gst/transcode/gst-cpu-throttling-clock.c:
-	  transcode: Don't leak timer
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3390>
+	* gst-libs/gst/codecparsers/gstav1parser.c:
+	  Revert "codecparsers: av1: Clip max tile rows and cols values"
+	  This reverts commit b76a801f57353b893c344025cac56413140fca6d.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5702>
+
+2023-11-29 13:04:36 +0100  Stéphane Cerveau <scerveau@igalia.com>
+
+	* ext/vulkan/vkupload.c:
+	  vkupload: unref vkimagebufferpool
+	  Since the vkupload pool refacto, the pool
+	  was not properly unrefed leading to a leak.
+	  Fix for fd5c344fb6
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5729>
 
-2022-11-11 14:37:17 +0100  Edward Hervey <edward@centricular.com>
+2023-11-21 01:41:16 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsdemux/mpegtsbase.c:
-	  mpegtsbase: Don't leak GList
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3390>
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	  h264decoder: Fix GstVideoCodecFrame leak
+	  If current buffer has no slice data, frame should be released.
+	  Otherwise frames will stay in decoder baseclass forever.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5693>
+
+2023-09-12 16:11:42 +0200  Stéphane Cerveau <scerveau@igalia.com>
+
+	* ext/vulkan/vkupload.c:
+	  vkupload: browse over the input buffer mems
+	  To upload/convert the GstBuffer to vkImage, need to
+	  browse over the input mems to fill the out gst buffer vkImage.
+	  This patch is fixing a missing plane/mem with encoders.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5651>
+
+2023-07-11 15:51:20 +0200  Stéphane Cerveau <scerveau@igalia.com>
+
+	* ext/vulkan/vkupload.c:
+	  vkupload: implement decide_allocation vmethod
+	  in the case of an upstream element proposing a buffer pool,
+	  use it to allocate the buffer image with the given parameters
+	  set by the upstream element.
+	  Besides the buffer pool handling is sync'd with GstBaseTransform
+	  base class.
+	  See the case of vulkanupload ! vulkanh264enc
+	  Co-authored-by: Victor Jaquez <vjaquez@igalia.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5651>
 
-2022-11-12 10:04:39 +0100  Edward Hervey <edward@centricular.com>
+2023-11-28 21:02:44 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/transcode/gsturitranscodebin.c:
-	  uritranscodebin: Don't leak uris, profile, sinkpad and filters
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3390>
+	* gst-libs/gst/d3d11/hlsl/CSMain_converter.hlsl:
+	* gst-libs/gst/d3d11/hlsl/PSMain_converter.hlsl:
+	  d3d11: Fix string version shader code
+	  RGBA to BGRA conversion code should have written in compute
+	  shader.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5723>
 
-2022-11-12 10:04:26 +0100  Edward Hervey <edward@centricular.com>
+2023-11-28 19:17:20 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/transcode/gsttranscodebin.c:
-	  transcodebin: Don't leak profile
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3390>
+	* sys/msdk/gstmsdkdec.c:
+	  msdk: Fix build error after d3d11 API change
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3158
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5723>
 
-2022-11-12 10:03:48 +0100  Edward Hervey <edward@centricular.com>
+2023-11-25 19:34:12 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/transcode/gsttranscodebin.c:
-	  transcodebin: Actually free the TranscodingStream structure
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3390>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst-libs/gst/d3d11/gstd3d11-private.h:
+	* gst-libs/gst/d3d11/gstd3d11converter-builder.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter-helper.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* gst-libs/gst/d3d11/gstd3d11format.cpp:
+	* gst-libs/gst/d3d11/hlsl/CSMain_converter.hlsl:
+	* gst-libs/gst/d3d11/hlsl/PSMain_converter.hlsl:
+	* gst-libs/gst/d3d11/hlsl/meson.build:
+	* sys/d3d11/gstd3d11convert.cpp:
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	  d3d11: Add support for more packed formats using compute shader
+	  Adding below listed formats support, and reorders supported format
+	  list based on preference
+	  <YUV 4:2:2>
+	  UYVY, VYUY, YVYU, v210, v216
+	  <YUV 4:4:4>
+	  v308, IYU2
+	  <RGB 16bits per pixel>
+	  RGB16, RGB15, BGR16, BGR15
+	  <RGB 8bits per channel>
+	  ARGB, xRGB, ABGR, xBGR, RGB, BGR
+	  <RGB 10bits per channel>
+	  r210, BGR10A2
+	  <RGB 16bits per channel>
+	  BGRA64
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5717>
 
-2022-11-12 10:02:53 +0100  Edward Hervey <edward@centricular.com>
+2023-11-27 01:11:04 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/transcoder/gsttranscoder.c:
-	  transcoder: Don't leak API bus and GMainLoop
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3390>
+	* sys/d3d11/gstd3d11convert.cpp:
+	  d3d11convert: Allow MSAA only for native DXGI formats
+	  Enable MSAA only if converter can render directly on texture
+	  without post-processing
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5717>
 
-2022-11-10 03:23:53 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-24 21:18:38 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/meson.build:
-	  meson: d3d11: Clarify the message for WGC support check
-	  Even Windows10 SDK seems to have required symbols depending on installed
-	  SDK version
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3376>
+	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
+	* gst-libs/gst/d3d11/gstd3d11format.cpp:
+	* gst-libs/gst/d3d11/gstd3d11format.h:
+	* gst-libs/gst/d3d11/gstd3d11memory-private.h:
+	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
+	* gst-libs/gst/d3d11/gstd3d11memory.h:
+	* sys/amfcodec/gstamfencoder.cpp:
+	* sys/d3d11/gstd3d11compositor.cpp:
+	* sys/d3d11/gstd3d11convert.cpp:
+	* sys/d3d11/gstd3d11decoder.cpp:
+	* sys/d3d11/gstd3d11deinterlace.cpp:
+	* sys/d3d11/gstd3d11overlay.cpp:
+	* sys/d3d11/gstd3d11screencapturesrc.cpp:
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	* sys/d3d11/gstd3d11upload.cpp:
+	* sys/dwrite/gstdwriteoverlayobject.cpp:
+	* sys/qsv/gstqsvdecoder.cpp:
+	* tests/check/libs/d3d11memory.c:
+	  d3d11: Rework memory allocation params signalling
+	  Hide GstD3D11AllocationParams detail from public header and
+	  set setter methods.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5717>
 
-2022-11-10 02:49:38 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-25 01:52:44 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11winrtcapture.cpp:
-	  d3d11screencapturesrc: Fix build error with MSVC x86
-	  Delete the code for now. Note that the code block is unnecessary already
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3375>
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* gst-libs/gst/d3d11/gstd3d11shadercache.cpp:
+	* gst-libs/gst/d3d11/hlsl/meson.build:
+	* sys/d3d11/hlsl/meson.build:
+	  d3d11: Use shader model 4
+	  Since shader model 4 is sufficient for the current pixel shader
+	  implementations, prebuild HLSL with shader model 4 as well.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5709>
 
-2022-11-10 14:31:43 +1100  Matthew Waters <matthew@centricular.com>
+2023-11-25 01:26:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/webrtcdatachannel.c:
-	* ext/webrtc/webrtcdatachannel.h:
-	  webrtc/datachannel: handle error messages from appsrc/sink
-	  Fixes a possible race where closing a data channel may produce e.g.
-	  not-linked errors.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3381>
-
-2022-11-10 14:22:30 +1100  Matthew Waters <matthew@centricular.com>
-
-	* ext/sctp/gstsctpdec.c:
-	  sctpdec: fix stream reset (src pad removal) if no data is ever received
-	  If we don't receive any data from usrsctp, then there will be no src pad
-	  for the stream id and the stream reset will fail to remove the relevant
-	  src pad.  Workaround by first attempting to add the relevant src pad, then
-	  almost immediately removing it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3381>
-
-2022-07-19 17:42:12 +0800  He Junyan <junyan.he@intel.com>
-
-	* tests/check/libs/h264bitwriter.c:
-	* tests/check/libs/h265bitwriter.c:
-	  test: Correct the test suite name of the h264 and h265 bitwriter.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3384>
+	* gst-libs/gst/d3d11/gstd3d11converter-helper.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/hlsl/CSMain_converter.hlsl:
+	* gst-libs/gst/d3d11/hlsl/meson.build:
+	  d3d11converter: Do not use R32_UINT UAV
+	  It does not work well with YUY2 texture on some GPUs. Always use
+	  the same DXGI formats for each SRV and UAV
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5709>
 
-2022-10-10 19:58:12 +0100  Colin Kinloch <colin.kinloch@collabora.com>
+2023-11-24 00:17:02 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvavpp.c:
-	  videocrop, videobox: Simplify navigation event handling and support touch events
-	  Signed-off-by: Colin Kinloch <colin.kinloch@collabora.com>
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3053>
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	  d3d11device: Remove outdated comment
+	  We do support 4:2:2 YUV formats using compute shader now
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5709>
 
-2022-09-23 19:29:31 +0100  Colin Kinloch <colin.kinloch@collabora.com>
+2023-11-23 23:32:15 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvavpp.c:
-	  va: Fix vapostproc navigation event co-ordinate mapping
-	  Signed-off-by: Colin Kinloch <colin.kinloch@collabora.com>
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3053>
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* sys/d3d11/plugin.cpp:
+	  d3d11: Drop legacy device support
+	  Direct3D feature level 10 supported GPUs were released
+	  more than 15 years ago, around the time when Windows
+	  Vista / 7 were released. Also our d3d11 plugin/library
+	  does not support feature level 9.x very well already.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5709>
 
-2022-09-19 18:05:28 +0100  Colin Kinloch <colin.kinloch@collabora.com>
+2023-11-13 12:01:03 +0000  Link Mauve <freedesktop@linkmauve.fr>
 
-	* sys/va/gstvavpp.c:
-	  va: Use gst_video_orientation_from_tag to parse orientation
-	  Signed-off-by: Colin Kinloch <colin.kinloch@collabora.com>
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3053>
+	* sys/v4l2codecs/gstv4l2decoder.c:
+	  v4l2codecs: Query the right buffer before expbuf
+	  We were previously always querying index 0, and while the number of planes per
+	  buffer will never change, it seems more proper to query the right buffer rather
+	  than always the first one.
+	  This was found while reading strace logs, and wondering why the
+	  V4L2_BUF_FLAG_MAPPED flag was present on all ¬0 indices even though that
+	  happened before VIDIOC_EXPBUF.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5647>
+
+2023-11-21 12:47:38 +0100  Stéphane Cerveau <scerveau@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkbufferpool.c:
+	  vkbufferpool: add support for video encoded buffers
+	  Add support for non video raw  buffers to allocate memory
+	  such as in encoded content scenario.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5645>
 
-2022-09-07 16:26:22 +0800  Tong Wu <tong1.wu@intel.com>
+2023-11-03 16:52:19 +0100  Stéphane Cerveau <scerveau@igalia.com>
 
-	* sys/msdk/gstmsdkvpp.c:
-	  msdkvpp: delete the macros to make video memory work on Windows
-	  Since gst_msdk_import_to_msdk_surface has been implemented for d3d11, we
-	  delete the macros to make it work on Windows.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* gst-libs/gst/vulkan/gstvkbufferpool.c:
+	* gst-libs/gst/vulkan/gstvkbufferpool.h:
+	  vkbufferpool: allow to set allocation params
+	  Add the possibility to change the vulkan usage and mem properties from
+	  external source.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5645>
+
+2023-07-03 16:44:22 -0400  Daniel Morin <daniel.morin@collabora.com>
+
+	* gst-libs/gst/analytics/analytics-meta-prelude.h:
+	* gst-libs/gst/analytics/analytics.h:
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsclassificationmtd.h:
+	* gst-libs/gst/analytics/gstanalyticsmeta.c:
+	* gst-libs/gst/analytics/gstanalyticsmeta.h:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.h:
+	* gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c:
+	* gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.h:
+	* gst-libs/gst/analytics/meson.build:
+	* gst-libs/gst/meson.build:
+	* tests/check/libs/analyticsmeta.c:
+	* tests/check/meson.build:
+	  analytics: base class for analytics meta
+	  - GstAnalyticRelationMeta is a base class for analytics
+	  meta. It's able to store analytics results (GstAnalyticRelatableMtd)
+	  and describe the relation between each analysis results.
+	  - GstAnalysisRelationMeta also contain an algorithm able to explore
+	  analysis results relation using a bfs.
+	  - Relation(edge) between analysis results (vertice) are stored in an adjacency-matrix
+	  that allow to quickly identify if two analysis results are related and by
+	  which relation they related. It also work for indirect relation
+	  and can provide the path of analysis results by which two
+	  analysis results are related.
+	  - One allocation per buffer to store analysis results. Here we rely on
+	  the application to guess how much space will be required to store all
+	  analysis results. This is something that could be improved
+	  significantly but it's a starting point.
+	  - Define common analysis results, classification, object-detection,
+	  tracking that are subclass of GstAnalyticRelatableMtd. The also
+	  provide exemple of how to extend GstAnalyticRelatableMtd to have them
+	  benefit for the mechanim to express relation with other analysis
+	  results.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4962>
+
+2023-06-30 18:00:38 +0200  Stéphane Cerveau <scerveau@igalia.com>
+
+	* ext/vulkan/vkdownload.c:
+	* ext/vulkan/vkupload.c:
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	* gst-libs/gst/vulkan/gstvkvideofilter.c:
+	* tests/check/libs/vkimagebufferpool.c:
+	  vulkan: use gst_vulkan_device_select_queue
+	  Use gst_vulkan_device_select_queue api to retrieve a valid queue
+	  in vkupload, vkdownload, vkimagebufferpool, and vkvideofilter
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5656>
 
-2022-09-07 15:29:37 +0800  Tong Wu <tong1.wu@intel.com>
+2023-06-28 18:15:59 +0200  Stéphane Cerveau <scerveau@igalia.com>
 
-	* sys/msdk/gstmsdkvpp.c:
-	  msdkvpp: modify the way of copying system memory to msdk surface
-	  Replace video_copy with memcpy to fix the issue when the sizes of the
-	  src frame and dst frame don't match. Moreover, for Windows, you have to
-	  do the copy first and call gst_msdk_import_to_msdk_surface later.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* gst-libs/gst/vulkan/gstvkdevice.c:
+	* gst-libs/gst/vulkan/gstvkdevice.h:
+	* gst-libs/gst/vulkan/gstvkutils.h:
+	  vkdevice: select queue with expected flags
+	  Allow to select a queue with the given flags
+	  such as compute bit etc from a given device.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5656>
 
-2022-09-07 10:55:57 +0800  Tong Wu <tong1.wu@intel.com>
+2023-11-21 21:14:12 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkvpp.c:
-	  msdkvpp: add d3d11 support during negotiation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* sys/qsv/gstqsvh264dec.cpp:
+	* sys/qsv/gstqsvh265dec.cpp:
+	  qsvdecoder: Fix stream format detection
+	  Fixing typo
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5700>
 
-2022-09-02 16:03:09 +0800  Tong Wu <tong1.wu@intel.com>
+2023-11-20 08:22:41 +0000  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/msdk/gstmsdkvpp.c:
-	  msdkvpp: add d3d11 video memory to sink and src caps
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* gst-libs/gst/d3d11/meson.build:
+	  directxmath.wrap: Fix cpuid mismatch on MinGW
+	  This fixes a build failure with meson 1.3.0, which was caused by
+	  a bugfix in Meson that made the cc.compile() check succeed on MSYS2
+	  MinGW and enable DirectXMath SIMD, which in turn triggered the broken
+	  `__cpuid()` issue mentioned in the meson.build file.
+	  Upstream fix: https://github.com/microsoft/DirectXMath/pull/172
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5690>
 
-2022-09-07 10:44:16 +0800  Tong Wu <tong1.wu@intel.com>
+2023-11-20 08:12:48 +0000  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/msdk/gstmsdkvpp.c:
-	* sys/msdk/gstmsdkvpp.h:
-	  msdkvpp: delete use_sinkpad_va and use_srcpad_va
-	  This two variables are no longer useful. Delete them for now.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* gst-libs/gst/d3d11/meson.build:
+	* meson_options.txt:
+	  meson: Rework d3d11 checks, add new d3d11-math option
+	  This allows us to ensure that directxmath SIMD is enabled.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5690>
 
-2022-08-26 16:19:33 +0800  Tong Wu <tong1.wu@intel.com>
+2023-11-21 00:00:27 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkenc.c:
-	  msdkenc: modify the way of copying system memory to msdk surface
-	  Replace video_copy with memcpy to fix the issue when the sizes of the
-	  src frame and dst frame don't match. Moreover, for Windows, you have to
-	  do the copy first and call gst_msdk_import_to_msdk_surface later.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst-libs/gst/d3d11/gstd3d11-private.h:
+	* gst-libs/gst/d3d11/gstd3d11converter-builder.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter-helper.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* gst-libs/gst/d3d11/gstd3d11format.cpp:
+	* gst-libs/gst/d3d11/hlsl/CSMain_converter.hlsl:
+	* gst-libs/gst/d3d11/hlsl/PSMain_converter.hlsl:
+	* gst-libs/gst/d3d11/hlsl/meson.build:
+	  d3d11: Add Y412 format support
+	  It's mapped to DXGI_FORMAT_Y416 and major format for 12bits 4:4:4
+	  video decoding. Since DXGI_FORMAT_Y416 format cannot be a render target,
+	  adding corresponding compute shader code too.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5692>
 
-2022-10-17 17:01:18 +0800  Tong Wu <tong1.wu@intel.com>
+2023-07-03 13:22:47 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkallocator.h:
-	* sys/msdk/gstmsdkallocator_d3d.c:
-	* sys/msdk/gstmsdkenc.c:
-	  msdkallocator_d3d: add d3d11 video memory and import it to msdk surface
-	  This patch introduces d3d11 texture and index to GstMsdkMemoryID and
-	  implements gst_msdk_import_to_msdk_surface in order to wrap the surface
-	  to mfxMemId.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* ext/vulkan/gstvulkan.c:
+	* ext/vulkan/meson.build:
+	* ext/vulkan/vkh264dec.c:
+	* ext/vulkan/vkh264dec.h:
+	  vulkanh264dec: add Vulkan H.264 decoder
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
+
+2023-06-15 12:09:01 +0200  Stéphane Cerveau <scerveau@igalia.com>
+
+	* tests/check/libs/vkimagebufferpool.c:
+	  test: look for proper queue among multiple physical device
+	  There might be multiple GPUs in a system and only one might provided vulkan
+	  video extensions. Now, in order to run the tests, the proper GPU is looked.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-08-26 14:13:36 +0800  Tong Wu <tong1.wu@intel.com>
+2023-05-24 08:49:06 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkallocator_d3d.c:
-	  msdkallocator_d3d: implement GetHDL callback function
-	  During encoding process, oneVPL runtime will call GetHDL callback function.
-	  This patch implements this function for the use of msdk.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* tests/check/libs/vkvideodecode.c:
+	* tests/check/meson.build:
+	  test: add vkvideodecode test
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-10-17 16:48:15 +0800  Tong Wu <tong1.wu@intel.com>
+2023-05-23 22:05:06 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkallocator.h:
-	* sys/msdk/gstmsdkallocator_libva.c:
-	* sys/msdk/gstmsdkallocator_libva.h:
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkvpp.c:
-	  msdkallocator: add a parameter to function gst_msdk_import_to_msdk_surface
-	  Add a flags parameter to function gst_msdk_import_to_msdk_surface and
-	  move the function declaration to gstmsdkallcator.h to prepare for adding
-	  Windows implementation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* gst-libs/gst/vulkan/gstvkqueue.c:
+	* gst-libs/gst/vulkan/gstvkqueue.h:
+	  vkqueue: add decoder factory
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
+
+2023-05-11 16:47:55 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkdecoder.c:
+	* gst-libs/gst/vulkan/gstvkdecoder.h:
+	* gst-libs/gst/vulkan/gstvkhandle.h:
+	* gst-libs/gst/vulkan/meson.build:
+	* gst-libs/gst/vulkan/vulkan_fwd.h:
+	  vkdecoder: add gstvkdecoder helper object
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
+
+2023-05-25 19:03:09 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkhandle.h:
+	* gst-libs/gst/vulkan/gstvkvideo-private.c:
+	* gst-libs/gst/vulkan/gstvkvideo-private.h:
+	* gst-libs/gst/vulkan/meson.build:
+	  vkvideo-private: video structures and session handle
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-08-19 13:51:11 +0800  Tong Wu <tong1.wu@intel.com>
+2023-07-10 14:44:05 +0200  Stéphane Cerveau <scerveau@igalia.com>
 
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkenc.h:
-	  msdkenc: add d3d11 pool during negotiation
-	  This patch adds Windows specific set_format and propose_allocation
-	  functions to enable creating d3d11 pools during negotiation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	* gst-libs/gst/vulkan/gstvkvideoutils.c:
+	* gst-libs/gst/vulkan/gstvkvideoutils.h:
+	* tests/check/libs/vkimagebufferpool.c:
+	  vkvideoutils: add GstVulkanVideoOperation enum
+	  To differentiate a video/x-h264 caps use with a decoder or an encoder
+	  and get the correct video profile, the API expects an enum
+	  GstVulkanVideoOperation to handle this difference.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-08-19 13:40:05 +0800  Tong Wu <tong1.wu@intel.com>
+2023-06-29 18:46:29 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkh265enc.c:
-	* sys/msdk/gstmsdkvp9enc.c:
-	* sys/msdk/msdk.h:
-	  msdkenc: add D3D11 caps for msdkenc
-	  This patch adds D3D11 feature to sink factory for msdkenc.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* gst-libs/gst/vulkan/gstvkvideoutils.c:
+	* gst-libs/gst/vulkan/gstvkvideoutils.h:
+	* tests/check/libs/vkimagebufferpool.c:
+	  vkvideoutils: add dec postfix to profiles
+	  So it the future don't collide with encoding profiles.
+	  Original-patch-by: Stéphane Cerveau <scerveau@igalia.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-05-07 17:10:34 +0800  Tong Wu <tong1.wu@intel.com>
+2023-06-23 17:50:16 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkcontext.c:
-	* sys/msdk/gstmsdkcontext.h:
-	* sys/msdk/gstmsdkcontextutil.c:
-	* sys/msdk/gstmsdkcontextutil.h:
-	* sys/msdk/gstmsdkdec.c:
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkvpp.c:
-	  MSDK: Introduce d3d11 device to MSDK context
-	  Currently MSDK context does not support d3d11va. Now introduce d3d11va
-	  device to MSDK context, making it able to create msdk session with d3d11
-	  device and to easily share with upstream and donwstream.
-	  Add environment variable to enable user to choose GPU device in multi-GPU
-	  environment. This variable is only valid when there's no context
-	  returned by upstream or downstream. Otherwise it will use the device
-	  that created by upstream or downstream.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* gst-libs/gst/vulkan/gstvkvideoutils.h:
+	* gst-libs/gst/vulkan/vulkan_fwd.h:
+	  vkvideoutils: add video capabilities structure
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-05-07 16:28:50 +0800  Tong Wu <tong1.wu@intel.com>
+2023-07-03 17:43:05 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/meson.build:
-	  MSDK: Add gst d3d11 lib into MSDK's dependency
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3231>
+	* gst-libs/gst/vulkan/gstvkvideoutils.c:
+	* gst-libs/gst/vulkan/gstvkvideoutils.h:
+	  vkvideoutils: add gst_vulkan_video_profile_is_equal()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-11-09 14:59:41 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-24 10:03:30 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvafilter.c:
-	  vafilter: Log out processed surfaces for debug.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3373>
+	* gst-libs/gst/vulkan/gstvkvideoutils.c:
+	* gst-libs/gst/vulkan/gstvkvideoutils.h:
+	  vkvideoutils: add gst_vulkan_video_profile_is_valid()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-11-09 14:53:30 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-08-09 11:28:37 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvadeinterlace.c:
-	* sys/va/gstvavpp.c:
-	  vadeinterlace, vapostproc: Drop output buffer if process failed.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3373>
+	* gst-libs/gst/vulkan/gstvkvideoutils.c:
+	* gst-libs/gst/vulkan/gstvkvideoutils.h:
+	  vkvideoutils: add VkVideoDecodeUsageInfoKHR in profile
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-11-07 16:32:50 -0300  Daniel <daniel.almeida@collabora.com>
+2023-06-19 13:26:49 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* gst/debugutils/gstvideocodectestsink.c:
-	  debugutils: videocodectestsink: add support for more formats
-	  Add support for more formats so as to run the libvpx high bit depth test suite.
-	  This means the files under CONFIG_VP9_HIGHBITDEPTH
-	  This also allows running the yuv444p 8bit file in the regular 8 bit vp9 suite.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3356>
+	* gst-libs/gst/vulkan/gstvkvideoutils.c:
+	  vkvideoutils: if unknown codec nullify pNext
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-11-10 15:07:20 +0800  Elliot Chen <elliot.chen@nxp.com>
+2023-11-13 19:50:07 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/play/gstplay.c:
-	  gstplay: fix segmentation fault caused by subtitle info update
-	  For subtitle stream played by subrui, gstplay will update subtitle
-	  information before select the stream by using playbin3. Need check
-	  the subtitle_sid value to avoid segmentation fault.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3383>
-
-2022-11-09 14:16:23 +0100  Guillaume Desmottes <guillaume.desmottes@onestream.live>
-
-	* ext/gs/gstgssink.cpp:
-	  gssink: add 'content-type' property
-	  Useful when one wants to upload a video as `video/mp4` instead of
-	  'video/quicktime` for example.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3371>
+	* gst-libs/gst/vulkan/gstvkvideoutils.h:
+	  vkvideoutils: mark as private members of profile structure
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-06-01 21:24:41 +1000  Matthew Waters <matthew@centricular.com>
+2023-08-10 13:10:04 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* ext/closedcaption/ccutils.c:
-	* ext/closedcaption/ccutils.h:
-	* ext/closedcaption/gstcccombiner.c:
-	* ext/closedcaption/gstcccombiner.h:
-	  cccombiner: initial implementation of using CCBuffer helper
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3211>
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	  vkimagebufferpool: set image's number of layers
+	  Handle the image's number of layers as configuration so it can be set by the
+	  user, still isn't exposed as function since it's very niche.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-06-01 17:47:55 +1000  Matthew Waters <matthew@centricular.com>
+2023-06-16 16:31:36 +0200  Stéphane Cerveau <scerveau@igalia.com>
 
-	* ext/closedcaption/ccutils.c:
-	* ext/closedcaption/ccutils.h:
-	* ext/closedcaption/gstccconverter.c:
-	* ext/closedcaption/gstccconverter.h:
-	* tests/check/elements/ccconverter.c:
-	  closedcaption: move CC buffering to helper object
-	  Move most of the interesting code from ccconverter to this new helper
-	  object.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3211>
+	* gst-libs/gst/vulkan/gstvkmemory.c:
+	  vkmemory: avoid the property flag check
+	  During the video session memory allocation, the property flags can
+	  be different from the expected ones, so do not expect all the
+	  property flags and test it with G_MAXUINT32
+	  It's failing with driver 525.47.26 and NVidia HW NVIDIA GeForce
+	  RTX 3050 and 2060
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4850>
 
-2022-05-30 21:39:13 +1000  Matthew Waters <matthew@centricular.com>
+2023-11-20 20:41:07 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/closedcaption/ccutils.c:
-	* ext/closedcaption/ccutils.h:
-	* ext/closedcaption/gstcccombiner.c:
-	* ext/closedcaption/gstccconverter.c:
-	  closedcaption: move cdp->cc_data into shared location
-	  So it can be used by both ccconverter and cccombiner
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3211>
+	* docs/plugins/gst_plugins_cache.json:
+	  d3d11: Update plugin doc cache
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5691>
 
-2022-05-13 15:19:43 +1000  Matthew Waters <matthew@centricular.com>
+2023-11-20 00:26:44 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/closedcaption/ccutils.c:
-	* ext/closedcaption/ccutils.h:
-	* ext/closedcaption/gstcccombiner.c:
-	* ext/closedcaption/gstccconverter.c:
-	* ext/closedcaption/gstclosedcaption.c:
-	  closedcaption: move cc_data->cdp to shared file
-	  Used by both ccconverter and cccombiner
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3211>
+	* gst-libs/gst/d3d11/gstd3d11-private.h:
+	* gst-libs/gst/d3d11/gstd3d11converter-helper.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* gst-libs/gst/d3d11/gstd3d11format.cpp:
+	* gst-libs/gst/d3d11/hlsl/CSMain_converter.hlsl:
+	* gst-libs/gst/d3d11/hlsl/meson.build:
+	  d3d11: Add support for Y210 and Y212 formats
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5691>
 
-2022-05-12 13:22:00 +1000  Matthew Waters <matthew@centricular.com>
+2023-11-18 23:31:30 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/closedcaption/gstccconverter.c:
-	  ccconverter: avoid different indent versions indenting !! differently.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3211>
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	  d3d11testsrc: Bind UAV if needed
+	  YUV packed formats require UAV
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5691>
 
-2022-05-12 13:19:58 +1000  Matthew Waters <matthew@centricular.com>
+2023-11-18 22:51:41 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/closedcaption/ccutils.c:
-	* ext/closedcaption/ccutils.h:
-	* ext/closedcaption/gstcccombiner.c:
-	* ext/closedcaption/gstcccombiner.h:
-	* ext/closedcaption/gstccconverter.c:
-	* ext/closedcaption/meson.build:
-	  closedcaption: move cdp framerate table to common file
-	  shared by both cccombiner and ccconverter
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3211>
+	* gst-libs/gst/d3d11/gstd3d11-private.h:
+	* sys/d3d11/gstd3d11convert.cpp:
+	  d3d11convert: Add support for YUY2 and Y410 output
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5691>
 
-2022-05-12 13:15:19 +1000  Matthew Waters <matthew@centricular.com>
+2023-11-18 20:45:57 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/closedcaption/gstcccombiner.c:
-	  cccombiner: don't assume a single cea608 data packet per buffer
-	  e.g. 24fps can have up to 3 and would include either two field0 or
-	  field1 cea608 data.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3211>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	  d3d11converter: Port to converter helper
+	  ... add support YUY2 and Y410 output
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5691>
+
+2023-11-17 20:51:31 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst-libs/gst/d3d11/gstd3d11converter-builder.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter-builder.h:
+	* gst-libs/gst/d3d11/gstd3d11converter-helper.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter-helper.h:
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11device-private.h:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* gst-libs/gst/d3d11/gstd3d11shadercache.cpp:
+	* gst-libs/gst/d3d11/gstd3d11shadercache.h:
+	* gst-libs/gst/d3d11/hlsl/CSMain_converter.hlsl:
+	* gst-libs/gst/d3d11/hlsl/collect_hlsl_header.py:
+	* gst-libs/gst/d3d11/hlsl/meson.build:
+	* gst-libs/gst/d3d11/meson.build:
+	  d3d11: Implement helper object for converter
+	  This object will upload system memory to GPU and preprocess
+	  texture using compute shader or software converter if needed
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5691>
 
-2022-05-06 14:00:38 +1000  Matthew Waters <matthew@centricular.com>
+2023-08-03 17:05:17 -0600  Jordan Yelloz <jordan.yelloz@collabora.com>
 
-	* ext/closedcaption/gstccconverter.c:
-	* tests/check/elements/ccconverter.c:
-	  ccconverter: drop data when overflow on extracting cea608 from cc_data
-	  If the buffer overflows, then drop rather than causing a failure and
-	  fropping the output buffer indefinitely.  This may have caused downstream to
-	  be waiting for data the will never arrive.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3211>
+	* docs/libs/mse/index.md:
+	* docs/libs/mse/sitemap.txt:
+	* docs/meson.build:
+	* docs/plugins/gst_plugins_cache.json:
+	* gst-libs/gst/meson.build:
+	* gst-libs/gst/mse/gstappendpipeline-private.h:
+	* gst-libs/gst/mse/gstappendpipeline.c:
+	* gst-libs/gst/mse/gstmediasource-private.h:
+	* gst-libs/gst/mse/gstmediasource.c:
+	* gst-libs/gst/mse/gstmediasource.h:
+	* gst-libs/gst/mse/gstmediasourcesamplemap-private.h:
+	* gst-libs/gst/mse/gstmediasourcesamplemap.c:
+	* gst-libs/gst/mse/gstmediasourcetrack-private.h:
+	* gst-libs/gst/mse/gstmediasourcetrack.c:
+	* gst-libs/gst/mse/gstmediasourcetrackbuffer-private.h:
+	* gst-libs/gst/mse/gstmediasourcetrackbuffer.c:
+	* gst-libs/gst/mse/gstmseeventqueue-private.h:
+	* gst-libs/gst/mse/gstmseeventqueue.c:
+	* gst-libs/gst/mse/gstmselogging-private.h:
+	* gst-libs/gst/mse/gstmselogging.c:
+	* gst-libs/gst/mse/gstmsemediatype-private.h:
+	* gst-libs/gst/mse/gstmsemediatype.c:
+	* gst-libs/gst/mse/gstmsesrc-private.h:
+	* gst-libs/gst/mse/gstmsesrc.c:
+	* gst-libs/gst/mse/gstmsesrc.h:
+	* gst-libs/gst/mse/gstsourcebuffer-private.h:
+	* gst-libs/gst/mse/gstsourcebuffer.c:
+	* gst-libs/gst/mse/gstsourcebuffer.h:
+	* gst-libs/gst/mse/gstsourcebufferlist-private.h:
+	* gst-libs/gst/mse/gstsourcebufferlist.c:
+	* gst-libs/gst/mse/gstsourcebufferlist.h:
+	* gst-libs/gst/mse/meson.build:
+	* gst-libs/gst/mse/mse-prelude.h:
+	* gst-libs/gst/mse/mse.h:
+	* gst/meson.build:
+	* gst/mse/gstmse.c:
+	* gst/mse/gstmse.h:
+	* gst/mse/meson.build:
+	* meson_options.txt:
+	* tests/check/libs/mse.c:
+	* tests/check/meson.build:
+	* tests/files/mse.mp4:
+	* tests/files/mse.webm:
+	  bad: Added W3C Media Source Extensions library
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2992>
 
-2022-05-05 18:27:50 +1000  Matthew Waters <matthew@centricular.com>
+2023-11-16 20:09:21 +0100  Alexander Slobodeniuk <aslobodeniuk@fluendo.com>
 
-	* ext/closedcaption/gstccconverter.c:
-	* tests/check/elements/ccconverter.c:
-	  ccconverter: fix framerate passthrough with malformed input
-	  If an input is malformed (only produces cea608 field 1 cc_data) then
-	  when in passthrough we would effectively be dropping every second cea608
-	  on output as we would not store any unused cea608 data.
-	  Fix by having all code paths go through the framerate conversion code
-	  which will store and retrieve any relevant data across buffers.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3211>
+	* gst-libs/gst/insertbin/gstinsertbin.c:
+	* gst-libs/gst/insertbin/gstinsertbin.h:
+	* gst/insertbin/plugin.c:
+	  insertbin/doc: add "Since" markers to pass CI
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5514>
 
-2022-11-10 05:54:18 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-20 00:55:00 +0200  Alexander Slobodeniuk <aslobodeniuk@fluendo.com>
 
-	* sys/amfcodec/gstamfh264enc.cpp:
-	* sys/amfcodec/gstamfh265enc.cpp:
-	  amfcodec: Fix typos
-	  Fixing typo surfrace -> surface
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3378>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst-libs/gst/insertbin/gstinsertbin.c:
+	* gst/insertbin/meson.build:
+	* gst/insertbin/plugin.c:
+	* gst/meson.build:
+	* meson_options.txt:
+	  insertbin: make it available in the registry
+	  so it could also be used from the gst-parse-launch
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5514>
 
-2022-11-10 06:03:45 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-22 11:06:27 +0200  Robert Mader <robert.mader@collabora.com>
 
-	* sys/mediafoundation/gstmfcapturedshow.cpp:
-	  mfvideosrc: Return S_OK from ISampleGrabberCB callback
-	  The Microsoft's ISampleGrabber implementation seems to be ignoring
-	  the HRESULT return value from the callback though,
-	  S_OK is the right HRESULT code.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3379>
+	* gst/camerabin2/gstcamerabin2.c:
+	  camerabin: Fix source updates with user filters
+	  Take the case into account when user filters have been set before the
+	  source gets updated.
+	  Note that the further linking of the filters, if present, happens below
+	  in the `gst_camera_bin_check_and_replace_filter()` calls.
+	  The audio filter is still affected by the same issue but left out for
+	  now.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5527>
 
-2022-11-08 19:26:39 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-15 22:41:47 +0900  Seungha Yang <seungha@centricular.com>
 
+	* sys/d3d11/gstd3d11dxgicapture.cpp:
+	* sys/d3d11/gstd3d11screencapture.cpp:
+	* sys/d3d11/gstd3d11screencapture.h:
 	* sys/d3d11/gstd3d11screencapturedevice.cpp:
 	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	  d3d11screencapturesrc: Specify PAR 1/1 to template caps
-	  ... otherwise PAR can be wrongly signalled during the negotiation
-	  Fixing below pipeline when desktop resolution is not 640x480
-	  gst-launch-1.0.exe \
-	  d3d11screencapturesrc ! videoscale !
-	  video/x-raw,width=640,height=480,pixel-aspect-ratio=1/1 ! d3d11videosink
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3360>
+	* sys/d3d11/gstd3d11winrtcapture.cpp:
+	  d3d11screencapturesrc: Fix wrong color with HDR enabled
+	  Even if IDXGIOutput6 says current display colorspace is HDR,
+	  captured texture via IDXGIOutputDuplication::AcquireNextFrame()
+	  is converted frame by OS unless we use IDXGIOutput5::DuplicateOutput1()
+	  with DXGI_FORMAT_R16G16B16A16_FLOAT format, in order for captured
+	  frame to be scRGB color space. Then application should perform
+	  tonemap operation based on reported display white level, color primaries, etc.
+	  Since we don't have any tonemapping implementation, ignores colorimetry
+	  reported by IDXGIOutput6.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3128
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5671>
 
-2022-05-22 12:02:15 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-11-15 19:13:08 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* tests/examples/va/meson.build:
-	* tests/examples/va/vaenc-dynamic-reconfigure.c:
-	  tests: examples: va: Add encoders dynamic reconfiguration.
-	  Take the QSV encoder test and used it for VA.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2466>
+	* gst-libs/gst/player/gstplayer.c:
+	  player: Without dispatcher emit signals directly instead of via the default main context
+	  This is how it was documented and how it worked before the port to GstPlay.
+	  Without this, applications expecting signals to be emitted directly
+	  without anything running the main context will simply not receive any
+	  signals.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5672>
 
-2022-11-05 15:12:28 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-11-15 00:38:14 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvacaps.c:
-	* sys/va/gstvah264enc.c:
-	  va: caps: Fix raw caps for H264 encoding.
-	  Mesa gallium and Intel i965 ill reports unsupported video formats.
-	  This commit reverts ecb12a05 and adds a deeper workaround, since
-	  ecb12a05 only fix the template caps, but not when renegotation
-	  happens.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2466>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* sys/d3d11/gstd3d11compositor.cpp:
+	* sys/d3d11/gstd3d11overlaycompositor.cpp:
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	  d3d11: Avoid ID3D11DeviceContext::Map if possible
+	  Allocate resource with initial date instead of calling Map/Unmap
+	  after allocation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5660>
+
+2023-11-15 01:11:24 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwriteoverlayobject.cpp:
+	  dwrite: Protect entire draw operation with D3D11 lock
+	  d2d runtime seems to execute pending GPU command list
+	  when DXGI ID2D1RenderTarget is being released, and it will invoke
+	  d3d11 immediate context APIs. Should protect all rendering operations
+	  and DXGI resources with lock.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5659>
 
-2022-10-21 10:56:59 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-11-07 16:20:10 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* sys/va/gstvabaseenc.c:
-	  vabaseenc: Log out the flow error name.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2466>
+	* sys/msdk/gstmsdk.c:
+	  msdk: Add device env in plugin dependencies
+	  Add env vars GST_MSDK_DRM_DEVICE in plugin_add_dependencies to register
+	  msdk plugins according to user's choice in a multi-gpu platform.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5615>
 
-2022-10-20 11:20:18 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-28 23:59:45 +0100  Michael Grzeschik <m.grzeschik@pengutronix.de>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Enable parameters change while running.
-	  1. Removes the verification if the internal encoder is not opened
-	  yet to allow the property setting.
-	  2. And toggles on the base class' reconf flag for each property
-	  variable that can be modified at run time.
-	  3. Mark those modifiable properties as mutable while playing.
-	  Currently the run-time modifiable properties are:
-	  qpi, qpp, qpb, bitrate, target percentage, target usage and rate control
-	  Other properties can be enabled too, but they need testing.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2466>
+	* gst-libs/gst/codecparsers/gsth264bitwriter.c:
+	  codecparsers: h264bitwriter: Fix trace typo
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5661>
 
-2022-10-20 11:13:19 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-11-13 22:16:06 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvabaseenc.c:
-	* sys/va/gstvabaseenc.h:
-	  vabaseenc: Enable encoder reconfiguration.
-	  Adds an internal function reset() which drains the internal queues and
-	  calls the reconfig() vmethod.
-	  This reset() method is called inconditionally at set_format() and in
-	  handle_frame() if the instance's reconf flag is enabled.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2466>
+	* ext/closedcaption/gstcea608mux.c:
+	  cea608mux: Fix buffer leak
+	  Release buffer after use
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5648>
 
-2022-09-20 20:55:18 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2022-08-08 14:46:16 -0400  Olivier Crête <olivier.crete@collabora.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Avoid reopen encoder or renegotiate.
-	  If parameters remain similar enough to avoid either encoder reopening
-	  or downstream renegotiation, avoid it.
-	  This is going to be useful for dynamic parameters setting.
-	  To check if the stream parameters changed, so the internal encoder has
-	  to be closed and opened again, are required two steps:
-	  1. If input caps, profile, chroma or rate control mode have changed.
-	  2. If any of the calculated variables and element properties have
-	  changed.
-	  Later on, only if the output caps also changed, the pipeline
-	  is renegotiated.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2466>
+	* ext/webrtc/webrtcsdp.c:
+	  webrtcsdp: Don't require fingerprint in inactive media
+	  Inactive m-lines don't need a fingerprint as they may not
+	  have a connection.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1118>
 
-2022-09-20 19:11:35 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2021-10-12 11:29:21 -0400  Olivier Crête <olivier.crete@collabora.com>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	  vaencoder: Add gst_va_encoder_get_reconstruct_pool_config()
-	  This method will return the caps configured in the reconstruct buffer
-	  pool, and its maxium number of buffers to allocate.
-	  The caps are needed later to know if the internal encoder has to be
-	  reopened if the stream properties change.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2466>
-
-2022-11-08 03:43:02 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/directshow/plugin.cpp:
-	  directshow: Demote rank of device provider to GST_RANK_NONE
-	  Current directshow plugin seems to be unstable and unmaintained
-	  for many many years.
-	  See
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3323
-	  and
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1828
-	  Disable this device provider by default to avoid any side-effect
-	  of this plugin
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3355>
+	* ext/webrtc/webrtcsdp.c:
+	  webrtcsdp: Remove comparison between media and session fingerprint
+	  The code seems to validate that the media-level fingerprint matches
+	  the fingerprint of the previous media or of the whole session. There
+	  is no such requirement in any RFC I found. The session-session one
+	  is just meant to act as a fallback when there is no media-level
+	  fingerprint.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1118>
 
-2022-11-08 11:43:19 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+2023-10-19 21:21:51 +0200  Stéphane Cerveau <scerveau@igalia.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Fix properties documentation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3361>
+	* gst-libs/gst/codecparsers/gsth265parser.h:
+	* gst-libs/gst/codecs/gsth265decoder.c:
+	* gst/videoparsers/gsth265parse.c:
+	  codecparsers: introduce h265 level enum
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5644>
 
-2022-11-08 11:36:12 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+2023-02-06 15:47:41 +0100  Benjamin Gaignard <benjamin.gaignard@collabora.com>
 
-	* sys/va/gstvaav1dec.c:
-	* sys/va/gstvabaseenc.c:
-	* sys/va/gstvacompositor.c:
-	* sys/va/gstvah264dec.c:
-	* sys/va/gstvah265dec.c:
-	* sys/va/gstvajpegdec.c:
-	* sys/va/gstvampeg2dec.c:
-	* sys/va/gstvavp8dec.c:
-	* sys/va/gstvavp9dec.c:
-	  va: Document device-path property.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3361>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/codec2json/gsth2652json.c:
+	* ext/codec2json/gsth2652json.h:
+	* ext/codec2json/meson.build:
+	* ext/codec2json/plugin.c:
+	  codec2json: Add h2652json element
+	  This element convert H.265 frame parameters into human readable json data.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3865>
 
-2022-11-08 10:37:10 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+2023-02-01 16:44:39 +0100  Benjamin Gaignard <benjamin.gaignard@collabora.com>
 
 	* docs/plugins/gst_plugins_cache.json:
-	  va: Reenable plugin cache.
-	  This basically a revert of commit 9bb560e7
-	  Also it adds vaav1dec.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3361>
+	* ext/codec2json/gsth2642json.c:
+	* ext/codec2json/gsth2642json.h:
+	* ext/codec2json/meson.build:
+	* ext/codec2json/plugin.c:
+	  codec2json: Add h2642json element
+	  This element convert H.264 frame header into human readable
+	  json data.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3865>
 
-2022-11-08 11:34:20 +0100  Victor Manuel Jaquez Leal <vjaquez@igalia.com>
+2023-11-12 11:07:37 +0000  Philippe Normand <philn@igalia.com>
 
-	* sys/va/gstvampeg2dec.c:
-	* sys/va/gstvavp8dec.c:
-	  vavp8dec, vampeg2dec: Fix type name.
-	  The camel case name is wrong when registering the type.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3361>
+	* gst-libs/gst/play/gstplay.c:
+	  play: Improve documentation header
+	  If the application relies on GstPlaySignalAdapter, no special clean-up is
+	  required.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5643>
 
-2022-10-26 18:05:32 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-11-08 09:53:17 +0000  HuQian <qian.hu@mediatek.com>
 
-	* sys/va/gstvacaps.c:
-	  vacaps: Sort raw caps according their efficiency.
-	  Caps negotiations considers template caps order. This patch sets the
-	  correct order according the feture caps: VAMemory, DMABuf and
-	  SystemMemory.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3349>
+	* gst-libs/gst/wayland/gstwlvideoformat.c:
+	  waylandsink: fix incorrect RGB and BGR mapping about GST DRM and WL_SHM
+	  This commit corrects the mapping relationship between RGB and BGR in GST and DRM.
+	  The previous mapping was incorrect, causing potential color mismatches in the output.
+	  The changes are as follows:
+	  {WL_SHM_FORMAT_RGB888, DRM_FORMAT_RGB888, GST_VIDEO_FORMAT_BGR},
+	  {WL_SHM_FORMAT_BGR888, DRM_FORMAT_BGR888, GST_VIDEO_FORMAT_RGB},
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5620>
 
-2022-11-08 02:08:08 +0000  Tim-Philipp Müller <tim@centricular.com>
+2023-11-11 14:10:37 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* meson.build:
-	  Back to development
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3358>
+	* gst-libs/gst/play/gstplay-signal-adapter.c:
+	  play: Automatically flush the bus when disposing the signal adapter
+	  See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3107
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5642>
 
-=== release 1.21.2 ===
+2023-11-09 17:57:22 +0000  Philippe Normand <philn@igalia.com>
 
-2022-11-07 23:53:59 +0000  Tim-Philipp Müller <tim@centricular.com>
+	* gst-libs/gst/play/gstplay.c:
+	  gstplay: Add a minimal documentation header
+	  Also mentioning the need to set the bus to flushing state before disposing the
+	  player in order to avoid reference cycles.
+	  Fixes #3107
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5631>
+
+2023-11-10 14:49:50 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkoperation.c:
+	  vulkan/operation: wait for pending objects at reset
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5591>
+
+2023-11-09 19:47:33 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkoperation.c:
+	  vulkan/operation: get query only if a operation is submitted
+	  To avoid a validation error if get query is performed before.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5591>
+
+2023-11-02 12:18:47 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkoperation.c:
+	  vulkan/operation: remove stored fences at the end
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5591>
+
+2023-10-31 19:39:02 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkoperation.c:
+	  vulkan/operation: don't fail if extension isn't available
+	  gst_vulkan_operation_add_dependency_frame() is a noop if the required extensions
+	  aren't available.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5591>
 
-	* ChangeLog:
-	* NEWS:
-	* RELEASE:
-	* gst-plugins-bad.doap:
-	* meson.build:
-	  Release 1.21.2
+2023-10-20 00:09:57 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-2022-11-07 23:53:57 +0000  Tim-Philipp Müller <tim@centricular.com>
+	* gst/mxf/mxfdemux.c:
+	* gst/mxf/mxfdemux.h:
+	  mxfdemux: Store GstMXFDemuxEssenceTrack in their own fixed allocation
+	  Previously they were stored inline inside a GArray, but as references to
+	  the tracks were stored in various other places although the array could
+	  still be updated (and reallocated!), this could lead to dangling
+	  references in various places.
+	  Instead now store them in a GPtrArray in their own allocation so each
+	  track's memory position stays fixed.
+	  Fixes ZDI-CAN-22299
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3055
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5635>
+
+2023-10-04 11:14:38 +0200  Benjamin Gaignard <benjamin.gaignard@collabora.com>
 
-	* ChangeLog:
-	  Update ChangeLogs for 1.21.2
+	* gst-libs/gst/codecparsers/gstav1parser.c:
+	  codecparsers: av1: Clip max tile rows and cols values
+	  Clip tile rows and cols to 64 as describe in AV1 specification.
+	  Fixes ZDI-CAN-22226 / CVE-2023-44429
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3015
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5634>
 
-2020-12-08 16:55:26 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-11-09 14:22:06 +0100  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* ext/srt/gstsrtobject.c:
-	* ext/srt/gstsrtobject.h:
-	  srt: Add a property to disable automatic reconnect
-	  This adds a new boolean property `auto-reconnect`, defaulting to `true`.
-	  Setting it to `false` makes the elements (in caller mode) immediately
-	  report an error to the application instead of trying to reconnect.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3326>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/timecode/gsttimecodestamper.c:
+	  timecodestamper: set drop-frame property default to TRUE
+	  After talking with Vivia on IRC, she does not remember why the default
+	  was FALSE and it is in my opinion preferable to stick to whatever
+	  representation best represents time for a given framerate as a default
+	  behavior.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5628>
 
-2022-10-26 18:04:17 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-11-08 13:59:44 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
+	* sys/va/gstvabase.c:
+	* sys/va/gstvabase.h:
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabaseenc.h:
 	* sys/va/gstvabasetransform.c:
-	  vabasetransform: Fail if cannot import the input buffer.
-	  Otherwise got a buffer double free.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3348>
+	* sys/va/gstvabasetransform.h:
+	  va: use GstVideoInfoDmaDrm when importing buffers
+	  In the case of encoders and filters when importing a DMABuf, use
+	  GstVideoInfoDmaDrm to get the drm fourcc and modifier.
+	  In both cases, instead of keeping the original GstVideoInfoDmaDrm from caps, the
+	  GstVideoInfo part of the structure is converted as canonical one, given the
+	  format from the fourcc. It's kept in the way to handle V4L2 linear DMABufs and
+	  to avoid too many changes in the current code.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5264>
 
-2022-11-06 01:53:46 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-30 21:49:22 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/mediafoundation/gstmfcapturedshow.cpp:
-	* sys/mediafoundation/gstmfcapturedshow.h:
-	* sys/mediafoundation/gstmfdevice.cpp:
-	* sys/mediafoundation/gstmfsourceobject.cpp:
-	* sys/mediafoundation/gstmfsourceobject.h:
-	* sys/mediafoundation/gstmfsourcereader.cpp:
-	* sys/mediafoundation/gstmfvideosrc.cpp:
-	* sys/mediafoundation/meson.build:
-	  mfvideosrc: Add support for DirectShow capture filter
-	  Adding DirecShow video capture filter mode, in addition
-	  to existing MediaFoundation and WinRT(UWP) mode, to support
-	  DirectShow only filters (not KS driver compatible)
-	  such as custom virtual camera filters.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3350>
+	* gst-libs/gst/va/gstvaallocator.c:
+	* gst-libs/gst/va/gstvaallocator.h:
+	* sys/va/gstvabase.c:
+	  vaallocator: use GstVideoInfoDmaDrm for dmabuf setup
+	  Instead of guessing the DRM format and modifier, pass a DRM video info to
+	  gst_va_dmabuf_memories_setup().
+	  Still, it checks for the DRM parameters in DRM info, if they are not available,
+	  as in the case of V4L2 buffers, the part of the video info is used.
+	  This is an API breakage, but since the plugin is still in stage, it's still
+	  allowed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5264>
 
-2021-12-01 16:23:41 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-08-30 21:34:58 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/rtmp2/gstrtmp2sink.c:
-	* gst/rtmp2/gstrtmp2src.c:
-	* gst/rtmp2/rtmp/rtmpclient.c:
-	  rtmp2: Improve error messages
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1403>
+	* gst-libs/gst/va/gstvaallocator.c:
+	* gst-libs/gst/va/vasurfaceimage.c:
+	* gst-libs/gst/va/vasurfaceimage.h:
+	  vaallocator: use VADRMPRIMESurfaceDescriptor to create surfaces
+	  To import DMAbufs we used VASurfaceAttribExternalBuffers which works, but it's
+	  not specific for DRM PRIME 2, since it lacks of many metadata. This patch
+	  replaces VASurfaceAttribExternalBuffers with VADRMPRIMESurfaceDescriptor in
+	  va_create_surfaces().
+	  Still, this patch assumes linear modifier only.
+	  The hack for RGB surfaces in I965 driver was pushed down into
+	  va_create_surfaces() to avoid handling both structures.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5264>
 
-2021-12-01 16:04:24 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-08-30 21:25:41 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/rtmp2/gstrtmp2sink.c:
-	* gst/rtmp2/gstrtmp2src.c:
-	* gst/rtmp2/rtmp/rtmpclient.c:
-	* gst/rtmp2/rtmp/rtmpconnection.c:
-	  rtmp2/connection: Pass triggering GError in 'error' signal
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1403>
+	* gst-libs/gst/va/gstvaallocator.c:
+	* gst-libs/gst/va/gstvaallocator.h:
+	* sys/va/gstvabase.c:
+	  vallocator: remove n_planes argument in dmabuf_memories_setup()
+	  Instead of passing the number of planes to process, take that number from the
+	  passed GstVideoInfo.
+	  This is an API breakage, but since the plugin is still in stage, it's still
+	  allowed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5264>
 
-2021-12-01 16:02:53 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-08-30 13:01:04 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/rtmp2/rtmp/rtmpconnection.c:
-	  rtmp2/connection: Pass triggering GError to _emit_error
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1403>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  vaallocator: fix assumption object size equal fd size
+	  Remove the comment and warning message that object size should be equal to the
+	  file descriptor size.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5264>
 
-2021-12-01 16:01:10 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-11-08 17:23:17 +0100  Tobias Rapp <t.rapp@noa-archive.com>
 
-	* gst/rtmp2/rtmp/rtmpconnection.c:
-	  rtmp2/connection: Discern reasons for cancelling all commands
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1403>
+	* sys/decklink/gstdecklinkvideosink.cpp:
+	* sys/decklink/gstdecklinkvideosrc.cpp:
+	  decklink: Fix typo in element documentation
+	  DechLink -> DeckLink
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5625>
 
-2021-12-01 15:53:13 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-11-08 16:59:48 +0100  Tobias Rapp <t.rapp@noa-archive.com>
 
-	* gst/rtmp2/rtmp/rtmpconnection.c:
-	  rtmp2/connection: Handle EOF like error
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1403>
+	* sys/decklink/gstdecklinkvideosink.cpp:
+	* sys/decklink/gstdecklinkvideosrc.cpp:
+	  decklink: Increase section level of video sink/source element documentation
+	  Should fix auto-generated follow-up sections like "Hierarchy" or
+	  "Factory details" to be listed under the element name in the
+	  table-of-contents of the document, instead of a stand-alone
+	  "Duplex-Mode" section.
+	  Also cleanup some spurious colon suffix after section names.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5625>
 
-2021-12-01 15:49:22 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-11-07 11:56:20 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/rtmp2/rtmp/rtmpclient.c:
-	  rtmp2/client: Make sure 'salt' is not NULL
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1403>
+	* gst-libs/gst/va/gstvadisplay.c:
+	* sys/va/plugin.c:
+	  vadisplay: only register elements of allowed drivers
+	  Now that nvidia-vaapi-driver appeared and isn't yet supported by GstVA, we've to
+	  add an allowed list of supported drivers.
+	  This patch implements it adding a environment variable to disable this driver
+	  check: GST_VA_ALL_DRIVERS
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5616>
 
-2021-12-01 15:46:42 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-10-02 15:34:42 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
 
-	* gst/rtmp2/rtmp/rtmpclient.c:
-	  rtmp2/client: Make sure 'reason' is not NULL
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1403>
+	* ext/closedcaption/ccutils.c:
+	* ext/closedcaption/ccutils.h:
+	* ext/closedcaption/gstcccombiner.c:
+	* ext/closedcaption/gstccconverter.c:
+	* ext/closedcaption/gstcea608mux.c:
+	* tests/check/elements/cccombiner.c:
+	  ccutils: Add padding also for ccp data
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5423>
 
-2021-12-01 16:13:42 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-11-03 06:53:35 -0700  Slava Andrejev <vyac.andrejev@gmail.com>
 
-	* gst/rtmp2/rtmp/rtmpclient.c:
-	  rtmp2/client: Make sure 'desc' is not NULL
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1403>
+	* gst-libs/gst/wayland/meson.build:
+	  meson: change Wayland scanner command from "code" to "private-code"
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5593>
 
-2021-12-01 16:11:31 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-11-03 06:47:44 -0700  Slava Andrejev <vyac.andrejev@gmail.com>
 
-	* gst/rtmp2/rtmp/rtmpclient.c:
-	  rtmp2/client: Make sure 'code' is not NULL
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1403>
+	* gst-libs/gst/wayland/meson.build:
+	  meson: add processing of "staging" Wayland protocols
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5593>
 
-2022-11-07 07:45:53 +0100  Edward Hervey <edward@centricular.com>
+2023-11-02 18:41:15 -0700  Slava Andrejev <vyac.andrejev@gmail.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/gstwebrtcstats.c:
-	* ext/webrtc/transportstream.c:
-	* ext/webrtc/utils.c:
-	* ext/webrtc/utils.h:
-	* ext/webrtc/webrtcsdp.c:
-	  webrtcbin: Don't duplicate enum string values
-	  Some were leaked when debugging was enabled. Instead just directly use the
-	  static strings as-is.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3347>
+	* gst-libs/gst/wayland/meson.build:
+	  meson: prevent sandbox violation if GStreamer and wayland-protocols are subprojects
+	  Suppose you have a project where GStreamer and wayland-protocols are
+	  pulled in as dependencies via .wrap files. In that case, Meson's setup
+	  step will fail for gst-plugins-bad with the message "Sandbox violation:
+	  Tried to grab file viewporter.xml outside current (sub)project." To
+	  avoid this exception, one should use Meson's `files` and `join_paths`
+	  functions. The suggested solution is identical to how GTK 4 processes
+	  Wayland files.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5593>
 
-2022-11-04 14:24:58 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-05-26 17:38:13 +0000  Balló György <ballogyor@gmail.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* gst/debugutils/gstvideocodectestsink.c:
-	  videocodectestsink: Add YUV422 support
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3331>
+	* gst-libs/gst/wayland/meson.build:
+	  gstwayland: Don't depend on wayland-protocols
+	  wayland-protocols are needed to build gstwayland, but not for dependent projects.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4724>
 
-2022-11-05 21:35:08 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-06 20:44:08 +0900  Seungha Yang <seungha@centricular.com>
 
 	* sys/d3d11/gstd3d11window.cpp:
-	  d3d11videosink: Always clear back buffer on resize
-	  Swapchain may not need to be resized if the size of backbuffer
-	  is equal to the previous size. Then previously rendered frame will be stay
-	  on the screen. Do clear back buffer whenever resize() is called
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3341>
-
-2022-11-05 00:00:43 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/qsv/gstqsvallocator_va.cpp:
-	  qsv: Fix encoding error when input memory belongs to other GPU
-	  Copy frame if VA display of input buffer is different from that
-	  of encoder, like we've been doing on Windows
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3335>
+	  d3d11window: Fix scale factor setting
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5602>
 
-2022-11-04 21:52:39 +0800  He Junyan <junyan.he@intel.com>
+2023-11-04 21:23:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvabaseenc.c:
-	  va: baseenc: Do not import the VA surface from other display.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1167
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3322>
+	* gst-libs/gst/d3d11/gstd3d11converter-private.h:
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter.h:
+	* gst-libs/gst/d3d11/meson.build:
+	* sys/d3d11/gstd3d11convert.cpp:
+	* sys/d3d11/gstd3d11pluginutils.cpp:
+	* sys/d3d11/gstd3d11pluginutils.h:
+	* sys/d3d11/gstd3d11window.cpp:
+	* sys/d3d11/meson.build:
+	  d3d11: Enable DirectXMath SIMD
+	  * Enable SIMD except for x86 target
+	  * Use aligned matrix struct
+	  * Remove unnecessary matrix copy operations
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5602>
 
-2022-11-04 21:26:23 +0800  He Junyan <junyan.he@intel.com>
+2023-10-18 15:12:38 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
 
-	* sys/va/gstvacompositor.c:
-	  va: compositor: Do not use allocator and pool from other display.
-	  Just like the va decoder, the compositor should not use allocator
-	  and pool from other display. Also, when importing the input buffer,
-	  if it is from other display, we should fallback to memory copy.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1167
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3322>
+	* ext/closedcaption/ccutils.c:
+	* tests/check/elements/ccconverter.c:
+	  ccutils: Keep upstream padding payload
+	  A payload of 0x80 0x80 means that it's padding. It's not a good idea to
+	  throw this away though, because of the cc_valid field.
+	  According to CEA 10-B section 25.2.1, if cc_valid is zero, the run-in
+	  clock and start bit should not be generated. In practice, this means
+	  that any closed captions will be erased and the end-user TV will show
+	  that captions are not available for this stream. This might have
+	  undesired consequences, e.g. we were just showing a long line of
+	  captions and we disable it before the user has had time to read it, or
+	  you can't enable closed captions during silence/music intervals.
+	  We cannot reliably detect whether there's a currently-silent closed
+	  caption stream or just nothing, but we have this information coming from
+	  upstream, so we can at least not discard it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5508>
 
-2022-11-04 17:12:22 +0800  He Junyan <junyan.he@intel.com>
+2023-11-04 19:36:06 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvabasetransform.c:
-	  va: basetransform: Do not use allocator and pool from other display.
-	  Just like the va decoder, the vpp and deinterlace should not use allocator
-	  and pool from other display. Also, when importing the input buffer, if it
-	  is from other display, we should fallback to memory copy.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1167
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3322>
+	* sys/wasapi2/gstwasapi2client.cpp:
+	* sys/wasapi2/gstwasapi2client.h:
+	* sys/wasapi2/gstwasapi2device.c:
+	  wasapi2device: Ignore activation failed device
+	  Enumerates all devices even if activation error is detected
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3090
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5599>
 
-2022-11-04 17:08:12 +0800  He Junyan <junyan.he@intel.com>
+2023-11-04 03:16:47 +0100  Marek Vasut <marex@denx.de>
 
-	* sys/va/gstvabasedec.c:
-	  va: basedec: Do not use allocator and pool from other display.
-	  The command line such as:
-	  gst-launch-1.0 -vf filesrc location=1.264 ! h264parse !
-	  vah264dec ! varenderD129postproc ! fakesink
-	  The decoder here gets the allocation proposal from the vpp which is
-	  on another GPU device. The allocator and pool belong to other display
-	  and should not be used in the decoder.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1167
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3322>
+	* sys/v4l2codecs/gstv4l2decoder.c:
+	  v4l2codecs: Avoid QBUF/DQBUF struct timeval .tv_usec wrap-around at frame 1000000
+	  When decoding stream using hardware V4L2 decoder element, in any of the
+	  currently supported formats, the decoding will fail once frame number
+	  1000000 is reached. The reported error clearly indicates a wrap-around
+	  occured, instead of receiving decoded frame 1000000, frame 0 is received
+	  from the hardware V4L2 decoder driver.
+	  The problem is actually not in the driver itself, but rather in gstreamer,
+	  which uses `struct v4l2_buffer` member `.timestamp` in a special way. The
+	  timestamp of buffers with encoded data added to the SINK (input) queue of
+	  the driver is copied by the driver into matching buffers with decoded data
+	  added to the SOURCE (output) queue of the driver. In fact, the timestamp
+	  is not a timestamp at all, but rather in this special case, only part of
+	  it is used as an incrementing frame counter.
+	  The `.timestamp` is of type `struct timeval`, which is defined in
+	  `sys/time.h` 1. Only the `tv_usec` member of this structure is used
+	  for the incrementing frame counter. However, suseconds_t tv_usec 2
+	  may be limited to range -1, 1000000:
+	  "
+	  XSI The type suseconds_t shall be a signed integer type capable of
+	  storing values at least in the range -1, 1000000.
+	  "
+	  Therefore, once frame 1000000 is reached, a rollover occurs and decoding
+	  fails.
+	  Fix this by using both `struct timeval` members, `.tv_sec` and `.tv_usec`
+	  with matching modular arithmetic, this way the failure would occur again
+	  just short of 2^84 frames, which should be plenty.
+	  1 https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_time.h.html
+	  2 https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html
+	  A test case using stateless hardware h264 decoder, the WARN/ERROR output
+	  in gstreamer log indicates a failure occurred. With this change, that
+	  error no longer occurs and the WARN/ERROR are not present:
+	  ```
+	  pc$ gst-launch-1.0 videotestsrc num-buffers=1001001 pattern=6 ! \
+	  video/x-raw,width=16,height=16,format=I420 ! \
+	  x264enc ! filesink location=/tmp/test.h264
+	  dut$ GST_DEBUG="*:3" gst-launch-1.0 filesrc location=/tmp/test.h264 ! \
+	  h264parse ! v4l2slh264dec ! fakesink
+	  ...
+	  0:03:51.393677606 12111     0x370df400 WARN      \
+	  v4l2codecs-decoder gstv4l2decoder.c:1157:gst_v4l2_request_set_done:<v4l2decoder2> \
+	  Requested frame 1000000, but driver returned frame 0.
+	  0:03:51.394140597 12111     0x370df400 WARN      \
+	  v4l2codecs-decoder gstv4l2decoder.c:1157:gst_v4l2_request_set_done:<v4l2decoder2> \
+	  Requested frame 1000001, but driver returned frame 1.
+	  0:03:51.394425216 12111     0x370df400 WARN      \
+	  v4l2codecs-decoder gstv4l2decoder.c:1157:gst_v4l2_request_set_done:<v4l2decoder2> \
+	  Requested frame 1000002, but driver returned frame 2.
+	  0:03:51.394665211 12111     0x370df400 WARN      \
+	  v4l2codecs-decoder gstv4l2decoder.c:1157:gst_v4l2_request_set_done:<v4l2decoder2> \
+	  Requested frame 1000003, but driver returned frame 3.
+	  0:03:51.394785833 12111     0x370df400 WARN      \
+	  v4l2codecs-h264dec gstv4l2codech264dec.c:1059:gst_v4l2_codec_h264_dec_output_picture:<v4l2slh264dec0> \
+	  error: Failed to decode frame 1000000
+	  ERROR: from element /GstPipeline:pipeline0/v4l2slh264dec:v4l2slh264dec0: Failed to decode frame 1000000
+	  ```
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5598>
 
-2022-11-04 20:28:34 +0800  He Junyan <junyan.he@intel.com>
+2023-10-23 15:11:23 -0400  Xavier Claessens <xavier.claessens@collabora.com>
 
-	* gst-libs/gst/va/gstvaallocator.c:
-	* gst-libs/gst/va/gstvaallocator.h:
-	  libs: va: Add API to peek the va buffer's display.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3322>
+	* gst/unixfd/gstunixfd.c:
+	* gst/unixfd/gstunixfd.h:
+	* gst/unixfd/gstunixfdsink.c:
+	* gst/unixfd/gstunixfdsrc.c:
+	  unixfd: Add support for abstract socket
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5328>
 
-2022-11-04 20:28:34 +0800  He Junyan <junyan.he@intel.com>
+2023-09-28 13:34:32 -0400  Xavier Claessens <xavier.claessens@collabora.com>
 
-	* gst-libs/gst/va/gstvaallocator.c:
-	* gst-libs/gst/va/gstvaallocator.h:
-	  libs: va: Add API to peek the va memory's display.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3322>
+	* gst/unixfd/gstunixfd.h:
+	* gst/unixfd/gstunixfdsink.c:
+	* gst/unixfd/gstunixfdsrc.c:
+	  unixfd: Use DMABuf allocator when needed
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5328>
 
-2022-11-04 17:06:37 +0800  He Junyan <junyan.he@intel.com>
+2023-09-18 14:38:27 -0400  Xavier Claessens <xavier.claessens@collabora.com>
 
-	* gst-libs/gst/va/gstvaallocator.c:
-	* gst-libs/gst/va/gstvaallocator.h:
-	  libs: va: Add API to peek the allocator's display.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3322>
+	* docs/plugins/gst_plugins_cache.json:
+	  unixfd: Update gst_plugins_cache.json
+	  Sponsored-by: Netflix Inc.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5328>
 
-2022-11-04 17:03:35 +0800  He Junyan <junyan.he@intel.com>
+2023-09-18 14:38:26 -0400  Xavier Claessens <xavier.claessens@collabora.com>
 
-	* gst-libs/gst/va/gstvaallocator.h:
-	  libs: va: Fix code style in gstvaallocator.h
-	  Replace all tabs with spaces.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3322>
+	* gst/meson.build:
+	* gst/unixfd/gstunixfd.c:
+	* gst/unixfd/gstunixfd.h:
+	* gst/unixfd/gstunixfdsink.c:
+	* gst/unixfd/gstunixfdsrc.c:
+	* gst/unixfd/meson.build:
+	* meson_options.txt:
+	* tests/check/elements/unixfd.c:
+	* tests/check/meson.build:
+	  unixfd: New plugin with unixfdsink and unixfdsrc elements
+	  This pair of elements, inspired from shmsink/shmsrc, send unix file
+	  descriptors (e.g. memfd, dmabuf) from one sink to multiple source
+	  elements in other processes.
+	  The unixfdsink proposes a memfd/shm allocator, which causes for example
+	  videotestsrc to write directly into memories that can be transfered to
+	  other processes without copying.
+	  Sponsored-by: Netflix Inc.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5328>
 
-2022-11-05 05:32:52 +0900  Seungha Yang <seungha@centricular.com>
+2023-09-18 14:38:23 -0400  Xavier Claessens <xavier.claessens@collabora.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/d3dvideosink/d3dvideosink.c:
-	  d3dvideosink: Update plugin description
-	  Direct3D is too generic (there are various version numbers).
-	  Clarify that this element is using the Direct3D9 API
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3333>
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	* gst-libs/gst/wayland/gstwldisplay.c:
+	* gst-libs/gst/wayland/gstwlshmallocator.c:
+	* gst-libs/gst/wayland/gstwlshmallocator.h:
+	* gst-libs/gst/wayland/gstwlwindow.c:
+	  GstShmAllocator: New shared memory allocator
+	  This makes Wayland's allocator public. It is generally useful to have a
+	  shared memory allocator that can create memfd on Linux.
+	  Sponsored-by: Netflix Inc.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5328>
 
-2022-11-04 08:41:10 +0100  Edward Hervey <edward@centricular.com>
+2023-11-02 00:33:46 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/lv2/gstlv2.c:
-	  lv2: Don't leak plugin information on registration
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3319>
+	* sys/wasapi2/gstwasapi2util.h:
+	  wasapi2: Fix build with GST_DISABLE_GST_DEBUG
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5585>
 
-2022-11-04 08:40:24 +0100  Edward Hervey <edward@centricular.com>
+2023-11-02 00:30:19 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/ladspa/gstladspa.c:
-	  ladspa: Don't leak plugin information on registration
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3319>
+	* sys/mediafoundation/gstmfutils.h:
+	  mediafoundation: Fix build with GST_DISABLE_GST_DEBUG
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5585>
 
-2022-11-04 08:09:52 +0100  Edward Hervey <edward@centricular.com>
+2023-11-02 00:24:35 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/fdkaac/gstfdkaacenc.c:
-	  fdkaacenc: Properly terminate GEnumValue table
-	  It should be terminated with a NULL entry, otherwise we just stray into the
-	  realms of cryptographic libraries^W^W random memory usage.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3319>
+	* sys/d3d12/gstd3d12utils.h:
+	* sys/d3d12/meson.build:
+	  d3d12: Fix build with GST_DISABLE_GST_DEBUG
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5585>
 
-2022-07-27 15:59:35 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-11-02 00:21:17 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/srt/gstsrtobject.c:
-	  srt: Remove callers for which srt_bstats fails
-	  This keeps them from accumulating in the element and in the stats while
-	  the sink is not being fed, as long as we at least periodically grab
-	  stats.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3156>
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* gst-libs/gst/d3d11/gstd3d11utils.cpp:
+	* gst-libs/gst/d3d11/gstd3d11utils.h:
+	* gst-libs/gst/d3d11/meson.build:
+	  d3d11: Fix build with GST_DISABLE_GST_DEBUG
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5585>
 
-2022-07-29 11:53:18 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-11-02 00:03:28 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/srt/gstsrtobject.c:
-	  srt: Use simpler list operations for callers
-	  Avoid `g_list_append` and `g_list_remove` (which have to scan the list)
-	  and replace them with `g_list_prepend` and `g_list_delete_link`.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3156>
+	* meson.build:
+	  meson: Fix MSVC build with GST_DISABLE_GST_DEBUG
+	  MSVC does not understand Wno-unused
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5585>
 
-2020-11-10 10:06:37 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-10-28 22:55:04 +0800  He Junyan <junyan.he@intel.com>
 
-	* ext/srt/gstsrtobject.c:
-	  srt: Clean up poll/sock lifecycle
-	  Make sure `srtobject->poll_id` is never invalid as long as `srtobject`
-	  exists. Only remove our caller socket from it when the socket becomes
-	  invalid.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3156>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/libde265/libde265-dec.c:
+	  libde265dec: Only decode the main profile
+	  The src caps of the libde265 is now fixed to I420, and so if the
+	  stream is other format, such as 4:4:4 or 10 bits format, the pipeline
+	  will crash because the dowstream element accesses the video buffer as
+	  I420 format.
+	  We now restrain the input caps to "main" profile, which only contains
+	  4:2:0 8 bits stream.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5573>
 
-2022-06-08 16:35:54 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-10-31 17:59:32 +0100  Kalev Lember <klember@redhat.com>
 
-	* ext/srt/gstsrtobject.c:
-	  srt: Clean up error handling
-	  - Make the srt_epoll_wait loops more uniform.
-	  - Error only via GError when possible; let the element send the error
-	  message. Avoids a second error message.
-	  - Return 0 when cancelled. Avoids an error message from the element.
-	  - Don't send an error message from send_headers when we're a server
-	  sink.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3156>
+	* ext/openh264/gstopenh264dec.cpp:
+	* ext/openh264/gstopenh264enc.cpp:
+	  openh264: Fail gracefully if openh264 encoder/decoder creation fails
+	  This can happen with the dummy "noopenh264" library that the freedesktop
+	  flatpak runtime ships, and Fedora is planning on shipping as well. In
+	  both cases the dummy implementation gets replaced with the actual
+	  openh264 library that's downloaded directly from Cisco, but just to be
+	  on safe side, this patch makes it careful to check the return values to
+	  avoid crashing if the underlying library hasn't been swapped out yet.
+	  The patch is taken from freedesktop-sdk and was originally written by
+	  Valentin David <valentin.david@codethink.co.uk>.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5581>
 
-2022-10-11 11:14:59 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-11-01 01:58:14 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/srt/gstsrtobject.c:
-	  srt: Simplify socket stats
-	  Don't hide stats depending on whether we're a sending or receiving
-	  socket. While we're here, add some more debug logs.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3156>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter.h:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* sys/d3d11/gstd3d11pluginutils.cpp:
+	  d3d11: Set MaxAnisotropy value for the best quality
+	  ... and use anisotropic filter without comparison, which is actually
+	  intended one.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5580>
 
-2020-10-05 19:50:13 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-11-01 01:32:27 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/srt/gstsrtobject.c:
-	* ext/srt/gstsrtobject.h:
-	  srt: Replace stats accumulation with naive byte counting
-	  srt_bstats cannot be used to get the stats of closed connections, so the
-	  best we can do is keep the running count ourselves.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3156>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	  d3d11converter: Simplify private struct ctor
+	  Initialize transform matrix using memcpy
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5580>
 
-2022-11-04 18:32:05 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-01 01:20:02 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/directshow/gstdshow.cpp:
-	  directshow: Validate enumerated AM_MEDIA_TYPE struct
-	  The video info struct can be null if format is undefined
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3323>
-
-2022-11-03 23:40:00 +0900  Seungha Yang <seungha@centricular.com>
-
-	* tests/examples/d3d11/d3d11decoder-appsink.cpp:
-	* tests/examples/d3d11/d3d11videosink-present.cpp:
-	  examples: d3d11: Fix GCC build error/warning
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3318>
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	  d3d11device: Store device formats in hash map
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5580>
 
-2022-11-03 05:18:03 +0900  Seungha Yang <seungha@centricular.com>
+2023-11-01 00:38:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/qsv/gstqsvjpegenc.cpp:
-	  qsvjpegenc: Add support for YUY2 format
-	  Now GstD3D11 defines YUY2 format
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3316>
+	* sys/d3d11/gstd3d11overlaycompositor.cpp:
+	  d3d11overlaycompositor: Avoid heap allocation per upload
+	  Don't allocate list per upload
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5580>
 
-2022-11-03 05:12:31 +0900  Seungha Yang <seungha@centricular.com>
+2023-09-29 20:11:52 +0000  robert <robert.ayrapetyan@gmail.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/qsv/gstqsvallocator.cpp:
-	* sys/qsv/gstqsvallocator.h:
-	* sys/qsv/gstqsvallocator_d3d11.cpp:
-	* sys/qsv/gstqsvdecoder.cpp:
-	* sys/qsv/gstqsvjpegdec.cpp:
-	* sys/qsv/gstqsvjpegdec.h:
-	* sys/qsv/meson.build:
-	* sys/qsv/plugin.cpp:
-	  qsv: Add JPEG decoder
-	  Because DXVA does not define JPEG decoding, we need this
-	  vendor specific API for Windows
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3316>
+	* ext/dtls/gstdtlsenc.c:
+	  gstdtlsenc: fix stream_id and missing group_id
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5425>
 
-2022-11-03 03:38:33 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-29 23:43:56 +0900  Seungha Yang <seungha@centricular.com>
 
 	* docs/plugins/gst_plugins_cache.json:
-	* gst-libs/gst/d3d11/gstd3d11-private.h:
+	* sys/d3d11/gstd3d11videosink.cpp:
+	* sys/d3d11/gstd3d11window.cpp:
+	* sys/d3d11/gstd3d11window.h:
+	  d3d11videosink: Add redraw-on-update property
+	  If users update geometry related properties very frequently
+	  for a stream to be animated, redrawing on every update
+	  can make rendering choppy or can be a performance bottleneck.
+	  To address the issue, adding a property to control the behavior
+	  of redrawing scene when geometry related properties are updated.
+	  Also, do not resize swapchain on such property update, since
+	  re-allocating backbuffer and multi-sampled render target is
+	  unnecessary in that case.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5575>
+
+2023-10-30 00:00:30 +0900  Seungha Yang <seungha@centricular.com>
+
 	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	  d3d11: Add support for YUY2 format
-	  YUY2 is a primary YUV 4:2:2 format for DXVA.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3316>
+	  d3d11converter: Don't update vertex buffer on transform matrix change
+	  Transform matrix change requires only constant buffer update
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5575>
 
-2022-11-01 09:47:38 +0800  Tong Wu <tong1.wu@intel.com>
+2023-10-29 22:42:52 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkcontext.c:
-	  msdkcontext: use gst_object_unref instead of g_object_unref
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3301>
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: Fix window switching in case of fullscreen mode
+	  Other Windows applications allow window switching even when
+	  an application window is in fullscreen mode. Also fixing
+	  regression introduced in 15248d8b84db9e79e6d4587b212b12ca82fc4a6b
+	  which makes restored window is always located at topmost
+	  since we do not call SetWindowPos() anymore when restoring
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5574>
 
-2022-10-31 16:59:18 +0800  Tong Wu <tong1.wu@intel.com>
+2023-10-29 00:36:23 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkcontext.c:
-	  msdkcontext: use gst_object_ref for GstVaDisplay
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3301>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	  d3d11converter: Fallback to linear sampler if filter is not supported
+	  Use linear sampler if requested filter is not supported
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5572>
 
-2022-10-31 16:56:32 +0800  Tong Wu <tong1.wu@intel.com>
+2023-10-28 23:12:30 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkcontext.c:
-	  msdkcontext: g_object_new() must not return nullptr
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3301>
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/d3d11/gstd3d11videosink.cpp:
+	  d3d11videosink: Add sampling-method property
+	  Identical to "method" property in d3d11convert element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5572>
 
-2022-10-31 16:52:23 +0800  Tong Wu <tong1.wu@intel.com>
+2023-10-28 22:38:02 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkenc.c:
-	  msdkenc: use GST_CAPS_FEATURE_MEMORY_VA to check the feature
-	  Add macros to protect sinkpad_is_va(), since it is not defined on
-	  Windows.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3301>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter.h:
+	* sys/d3d11/gstd3d11convert.cpp:
+	* sys/d3d11/gstd3d11pluginutils.cpp:
+	* sys/d3d11/gstd3d11pluginutils.h:
+	  d3d11convert: Add support for sampling with anisotropic filter
+	  Anisotropic filtering might produce better quality than linear filtering
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5572>
 
-2022-11-01 12:03:24 +0100  Guillaume Desmottes <guillaume.desmottes@onestream.live>
+2023-10-28 22:08:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/wpe/gstwpevideosrc.cpp:
-	  wpe: fix wpevideosrc gst-play example
-	  wpe:// no longer works since 1.20, see wpesrc examples.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3306>
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/d3d11/gstd3d11convert.cpp:
+	  d3d11convert: Add support for transform
+	  Adding 3D rotation and scale transform support to d3d11convert element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5572>
 
-2022-10-27 10:03:34 -0400  Eric Knapp <emkman99@gmail.com>
+2023-10-28 20:15:34 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Added option to insert CEA-708 closed captions
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2910>
+	* sys/d3d11/gstd3d11pluginutils.cpp:
+	* sys/d3d11/gstd3d11pluginutils.h:
+	* sys/d3d11/gstd3d11window.cpp:
+	  d3d11: Move transform matrix related method to utils
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5572>
 
-2022-11-01 22:19:18 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-28 19:34:55 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/qsv/gstqsvav1enc.cpp:
-	* sys/qsv/gstqsvh264dec.cpp:
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh265dec.cpp:
-	* sys/qsv/gstqsvh265enc.cpp:
-	* sys/qsv/gstqsvjpegenc.cpp:
-	* sys/qsv/gstqsvutils.h:
-	* sys/qsv/gstqsvvp9dec.cpp:
-	* sys/qsv/gstqsvvp9enc.cpp:
-	  qsv: Check 16K resolution support
-	  ... and remove duplicated code
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3310>
+	* sys/d3d11/gstd3d11overlaycompositor.cpp:
+	  d3d11overlaycompositor: Set rasterizer state
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5572>
+
+2023-10-27 23:43:03 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d11/gstd3d11dxgicapture.cpp:
+	* sys/d3d11/gstd3d11screencapture.cpp:
+	* sys/d3d11/gstd3d11screencapture.h:
+	* sys/d3d11/gstd3d11screencapturesrc.cpp:
+	* sys/d3d11/gstd3d11winrtcapture.cpp:
+	  d3d11screencapturesrc: Set rasterizer state
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5572>
 
-2021-05-14 10:24:05 +0200  Marijn Suijten <marijns95@gmail.com>
+2023-10-27 23:30:43 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/vulkan/gstvkimageview.c:
-	* gst-libs/gst/vulkan/gstvkimageview.h:
-	  vulkan: Mark gst_vulkan_image_view_new create_info as constant pointer
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1615>
+	* sys/d3d11/gstd3d11compositor.cpp:
+	  d3d11compositor: Set rasterizer state
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5572>
 
-2021-01-05 22:33:12 +0100  Marijn Suijten <marijns95@gmail.com>
+2023-10-27 23:24:15 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/vulkan/gstvkcommandpool.c:
-	* gst-libs/gst/vulkan/gstvkdescriptorpool.c:
-	* gst-libs/gst/vulkan/gstvkdevice.c:
-	* gst-libs/gst/vulkan/gstvkphysicaldevice.c:
-	* gst-libs/gst/vulkan/gstvkqueue.c:
-	  vulkan: Remove unnecessary null checks
-	  These null checkes are slightly misleading when double-checking
-	  mutability for external language interop.  None of the functions in
-	  these files allow the variable at hand to become `NULL` under normal
-	  operation, because they are checked at initialization and never (allowed
-	  to be) reassigned to `NULL`.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1615>
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	  d3d11testsrc: Set rasterizer state
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5572>
 
-2021-01-04 01:07:04 +0100  Marijn Suijten <marijns95@gmail.com>
+2023-10-27 22:51:22 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/vulkan/gstvkdisplay.c:
-	* gst-libs/gst/vulkan/gstvkfence.c:
-	* gst-libs/gst/vulkan/gstvkimagememory.c:
-	* gst-libs/gst/vulkan/gstvkqueue.c:
-	  vulkan: Add missing `(nullable)` annotation to `Returns`
-	  Most of these functions already state they might return `%NULL`, but
-	  this is not picked up by G-IR.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1615>
-
-2021-01-04 00:40:24 +0100  Marijn Suijten <marijns95@gmail.com>
-
-	* gst-libs/gst/vulkan/gstvkdescriptorcache.c:
-	* gst-libs/gst/vulkan/gstvkdescriptorpool.c:
-	* gst-libs/gst/vulkan/gstvkdescriptorset.c:
-	* gst-libs/gst/vulkan/gstvkinstance.c:
-	* gst-libs/gst/vulkan/gstvkwindow.c:
-	  vulkan: Add missing `array length` and `(out)` annotation to parameters
-	  Add `array length` annotation for `layouts` such that `n_layouts` is
-	  properly marked as its length, and add `(out)` where a function returns
-	  in that parameter.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1615>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11device-private.h:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	  d3d11converter: Reuse rasterizer state object
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5572>
 
-2022-11-01 02:00:33 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-27 22:23:46 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11decoder.cpp:
-	  d3d11decoder: Fix for VP9 decoding with odd resolution
-	  Fixing off by one mismatch when width and/or height of stream
-	  is odd number
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3302>
+	* sys/d3d11/gstd3d11dxgicapture.cpp:
+	  d3d11screencapturesrc: Use DirectXMath struct and C++ mutex
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5572>
 
-2022-10-28 03:25:38 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-22 01:10:54 +0900  Seungha Yang <seungha@centricular.com>
 
 	* docs/plugins/gst_plugins_cache.json:
-	* sys/qsv/gstqsvallocator.cpp:
-	* sys/qsv/gstqsvallocator.h:
-	* sys/qsv/gstqsvallocator_d3d11.cpp:
-	* sys/qsv/gstqsvdecoder.cpp:
-	* sys/qsv/gstqsvvp9dec.cpp:
-	* sys/qsv/gstqsvvp9dec.h:
-	* sys/qsv/meson.build:
-	* sys/qsv/plugin.cpp:
-	  qsv: Add VP9 decoder
-	  Recent Intel GPU supports 12bits VP9 decoding but only VP9
-	  profile2 with 10bits is defined by DXVA spec.
-	  Thus, we need this vendor specific decoder element
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3290>
+	* sys/d3d11/gstd3d11pluginutils.cpp:
+	* sys/d3d11/gstd3d11pluginutils.h:
+	* sys/d3d11/gstd3d11videosink.cpp:
+	* sys/d3d11/gstd3d11window.cpp:
+	* sys/d3d11/gstd3d11window.h:
+	* sys/d3d11/meson.build:
+	  d3d11videosink: Add support for transform and MSAA
+	  Adding properties for 3D rotation with arbitrary angle
+	  and scaling. And adding Multi Sampling Anti-Aliasing rendering
+	  support to smooth borders if arbitrary angle is applied
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5532>
 
-2022-10-30 19:01:54 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-22 01:09:34 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11vp9dec.cpp:
-	  d3d11vp9dec: Disallow Profile2 12bits stream
-	  Since DXVA does not support the format, specify bit-depth field
-	  to sinkpad template caps so that d3d11vp9dec can be skipped
-	  during autoplugging
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3297>
+	* sys/d3d11/gstd3d11window.cpp:
+	  d3d11videosink: Fix typo
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5532>
 
-2022-10-30 18:37:55 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-19 22:27:20 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gstvp9parse.c:
-	  vp9parse: Set subsampling to src caps even if GBR stream
-	  Some muxer elements will need the subsampling information
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3297>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
+	  d3d11converter: Add support for MSAA render target
+	  Create multi-sample render target view if sample count > 1
+	  and MSAA enabled rasterizer for multi-sample render target
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5532>
 
-2022-10-30 18:35:08 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-19 21:52:27 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gstvp9parse.c:
-	  vp9parse: Delaying src caps until frame is parsed if profile > 0
-	  subsampling and/or bitdepth information will be required for
-	  negotiation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3297>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter.h:
+	  d3d11converter: Add support for custom transform matrix
+	  Adding gst_d3d11_converter_set_transform_matrix() method so that
+	  user specified transform matrix can be applied when "video-direction=custom"
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5532>
 
-2022-10-29 16:17:53 +0530  Sanchayan Maity <sanchayan@asymptotic.io>
+2023-10-17 20:05:12 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/fdkaac/gstfdkaacenc.c:
-	  fdkaacenc: Update documentation to clarify bitrate and peak-bitrate
-	  bitrate property is only applicable for constant bitrate and
-	  peak-bitrate is only applicable for variable bitrate. Clarify
-	  the same.
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/hlsl/VSMain_converter.hlsl:
+	  d3d11converter: Use transform matrix for rotation/flip
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5532>
 
-2022-10-29 12:19:58 +0530  Sanchayan Maity <sanchayan@asymptotic.io>
+2023-10-25 21:37:24 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/fdkaac/gstfdkaacenc.c:
-	* ext/fdkaac/gstfdkaacenc.h:
-	  fdkaacenc: Add support for setting bitrate mode
+	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
+	  wasapi2: Don't use global volume control object
+	  ISimpleAudioVolume controls volume of corresponding audio session
+	  and there would be only single input/output audio session
+	  in case of share-mode, which means that it controls audio volume of the
+	  process. Instead, use IAudioStreamVolume interface which controls
+	  volume of the stream.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5549>
 
-2021-01-31 22:00:36 +0530  Sanchayan Maity <sanchayan@asymptotic.io>
+2023-10-28 01:23:36 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/fdkaac/gstfdkaacenc.c:
-	* ext/fdkaac/gstfdkaacenc.h:
-	  fdkaacenc: Add support for setting peak bitrate
+	* sys/d3d11/gstd3d11screencapturesrc.cpp:
+	  d3d11screencapturesrc: Fix mouse cursor blending
+	  Ignore alpha component of source (mouse cursor texture)
+	  when blending alpha channel, otherwise the background area of source
+	  (which has zeros) will be written to render target. Then it will result
+	  in black rectangle if output texture is converted to premultiplied alpha
+	  texture
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5566>
 
-2021-01-23 18:35:12 +0530  Sanchayan Maity <sanchayan@asymptotic.io>
+2023-10-26 16:37:23 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/fdkaac/gstfdkaacenc.c:
-	* ext/fdkaac/gstfdkaacenc.h:
-	  fdkaacenc: Add support for enabling afterburner
-	  This is an additional quality parameter. In the default configuration this
-	  quality switch is deactivated because it would cause a workload increase
-	  which might be significant. If workload is not an issue in the application
-	  it can be recommended to activate this feature.
+	* sys/aja/.clang-format:
+	  aja: Move clang-format configuration from the top-level to the plugin subdirectory
+	  This shouldn't have been left at the top-level but was forgotten to be
+	  moved when merging the repository histories.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5558>
 
-2020-11-26 19:23:11 +0530  Sanchayan Maity <sanchayan@asymptotic.io>
+2023-10-26 10:48:01 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* ext/fdkaac/gstfdkaacdec.c:
-	  fdkaacdec: Do not report decoding error for flush request
-	  A flush request is done when set_format is called to empty internal bit
-	  buffer maintained by fdk-aac. When this happens, during the explicit
-	  call to handle_buffer, decodeFrame does not return a AAC_DEC_OK. This
-	  gets reported as a decoding error while no decoding error in fact took
-	  place. Since this can be confusing, just return a GST_FLOW_OK and log
-	  that an explicit flush was requested.
+	* gst/debugutils/fpsdisplaysink.c:
+	* gst/debugutils/fpsdisplaysink.h:
+	  fpsdisplaysink: fix copy'n'paste-o in license header
+	  It's LGPL licensed, remove confusing GPL reference.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5557>
 
-2022-10-25 13:22:30 +1100  Matthew Waters <matthew@centricular.com>
+2023-09-12 12:36:55 +1000  Matthew Waters <matthew@centricular.com>
 
-	* gst-libs/gst/codecparsers/gstvp9parser.c:
-	  vp9parser: initialize subsampling to -1
-	  The default value of 0 is a valid subsampling value and could be
-	  confused with an 'unset' value.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3260>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vkformat: also use the correct srgb vs unorm when using older
+	  gst_video_info_from_video_info()
+	  Fixes sRGB colorspace chosen by GstVulkanSwapper and therefore used for
+	  display.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5316>
+
+2023-09-27 17:47:25 +0200  Tim-Philipp Müller <tim@centricular.com>
+
+	* REQUIREMENTS:
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/kate/README:
+	* ext/kate/gstkate.c:
+	* ext/kate/gstkatedec.c:
+	* ext/kate/gstkatedec.h:
+	* ext/kate/gstkateelement.c:
+	* ext/kate/gstkateelements.h:
+	* ext/kate/gstkateenc.c:
+	* ext/kate/gstkateenc.h:
+	* ext/kate/gstkateparse.c:
+	* ext/kate/gstkateparse.h:
+	* ext/kate/gstkatespu.c:
+	* ext/kate/gstkatespu.h:
+	* ext/kate/gstkatetag.c:
+	* ext/kate/gstkatetag.h:
+	* ext/kate/gstkatetiger.c:
+	* ext/kate/gstkatetiger.h:
+	* ext/kate/gstkateutil.c:
+	* ext/kate/gstkateutil.h:
+	* ext/kate/meson.build:
+	* ext/meson.build:
+	* gst/inter/gstintersubsrc.c:
+	* meson_options.txt:
+	* tests/check/elements/kate.c:
+	* tests/check/meson.build:
+	  kate: remove plugin
+	  Bitrotten and not really used in the wild.
+	  The actual render library (libtiger) is not just unmaintained
+	  but the upstream location has disappeared, and it's also not
+	  even packaged by e.g. debian/ubuntu.
+	  Closes #3071
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5408>
 
-2022-10-27 14:20:37 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-10-23 17:24:40 +0100  Philippe Normand <philn@igalia.com>
 
-	* sys/va/gstvaencoder.c:
-	  vaencoder: Reset attribute index to one.
-	  Further fix to 4ffb3663 where I forgot to reset the attribute index.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3285>
+	* ext/wpe/gstwpesrcbin.cpp:
+	  wpesrcbin: Fix audio metadata
+	  The meta expects the number of samples in the buffer, not the total size.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5531>
 
-2022-10-03 15:20:24 -0300  Thibault Saunier <tsaunier@igalia.com>
+2023-10-26 16:32:28 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* ext/dash/gstdashdemux.c:
-	* gst-libs/gst/adaptivedemux/gstadaptivedemux.c:
-	  adaptivedemux: Minor typo fix
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3159>
+	* gst-libs/gst/opencv/meson.build:
+	  build: opencv: disable opencv deps if it's not installed
+	  When hotdoc documentation is enabled and opencv plugin is set as
+	  auto-detected, but the library isn't installed, meson configuration fails
+	  with this message:
+	  ../subprojects/gst-plugins-bad/docs/meson.build:139:21: ERROR: Unknown variable "gstopencv_dep".
+	  This patch fixes this case defined gstopencv_dep as disabler() when
+	  dependencies aren't found.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5560>
 
-2022-09-20 15:32:52 -0300  Thibault Saunier <tsaunier@igalia.com>
+2023-10-16 15:28:21 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* ext/dash/gstmpdclient.c:
-	  dash: Fix computing `repeat_index` when seeking in stream with a start !=0 on the first fragment
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3159>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  vaallocator: Do not try derive image for d3d backend
+	  Current codes try derive image in _update_image_info first, if
+	  derive returns no error, the va_allocator->info is the one from derived
+	  image, but in va_map_unlocked, we disable derive manner for d3d backend
+	  because it doesn't seem to work, this will cause issue for d3d path,
+	  i.e. possibly using derived info in va_get_image to do mapping...
+	  This patch disables derive image for d3d backend in _update_image_info,
+	  to ensure we only use info from va_create_image for d3d path.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5495>
+
+2023-07-20 18:23:12 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* ext/vulkan/vkdownload.c:
+	  vulkandownload: use GstVulkanOperation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5079>
+
+2023-06-29 14:11:05 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* ext/vulkan/vkupload.c:
+	  vulkanupload: use GstVulkanOperation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5079>
+
+2023-06-29 08:24:18 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	  vkimagebufferpool: use GstVulkanOperation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5079>
 
-2022-10-27 15:21:30 +0800  He Junyan <junyan.he@intel.com>
+2023-05-15 17:14:55 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/codecparsers/gsth265bitwriter.c:
-	* gst-libs/gst/codecparsers/gsth265bitwriter.h:
-	* tests/check/libs/h265bitwriter.c:
-	  h265bitwriter: Correct the all API to byte aligned.
-	  In fact, all the h265 bit writer have byte aligned output. So we
-	  change the API from bit size in unit to byte size, which is easy
-	  to use.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3193>
+	* gst-libs/gst/vulkan/gstvkoperation.c:
+	* gst-libs/gst/vulkan/gstvkoperation.h:
+	* gst-libs/gst/vulkan/meson.build:
+	* gst-libs/gst/vulkan/vulkan.h:
+	* gst-libs/gst/vulkan/vulkan_fwd.h:
+	  vkoperation: synchronization helper object
+	  An operation is an arbitrary amount of work to be executed on the host, a
+	  device, or an external entity such as a presentation engine.
+	  The purpose of this object is to help on the operation's synchronization
+	  through declaring explicit execution dependencies, and memory dependencies
+	  between two sets of operations defined by the command’s two synchronization
+	  scopes.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5079>
 
-2022-10-27 13:42:17 +0800  He Junyan <junyan.he@intel.com>
+2023-06-29 12:30:13 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/codecparsers/gsth264bitwriter.c:
-	* gst-libs/gst/codecparsers/gsth264bitwriter.h:
-	* sys/va/gstvah264enc.c:
-	* tests/check/libs/h264bitwriter.c:
-	  h264bitwriter: Correct the all API to byte aligned.
-	  In fact, all the h264 bit writer have byte aligned output except
-	  the slice header. So we change the API from bit size in unit to
-	  byte size, which is easy to use. For slice header, we add a extra
-	  "trail_bits_num" to return the unaligned bits number.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3193>
+	* gst-libs/gst/vulkan/gstvkbarrier.h:
+	* gst-libs/gst/vulkan/gstvkdevice.c:
+	* gst-libs/gst/vulkan/gstvkimagememory.c:
+	  vulkan: add a timeline semaphore per image
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5079>
 
-2022-10-27 14:40:49 +0800  He Junyan <junyan.he@intel.com>
+2023-07-31 18:41:24 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/codecparsers/gsth264bitwriter.c:
-	* gst-libs/gst/codecparsers/gsth265bitwriter.c:
-	  bitwriter: Fix a nal conversion bug when input is not byte aligned.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3193>
+	* gst-libs/gst/vulkan/gstvkbarrier.h:
+	  vkbarrier: Use guint64 for VkFlags and VkFlags2
+	  While VkPipelineStageFlags is an enum (arguably backed as uint32 in 32bit
+	  platforms), VkPipelineStageFlags2 is a redefinition of guint64; likewise for
+	  VkAccessFlags and VkAccessFlags2.
+	  This patch types both members in GstVulkanBarrierMemoryInfo as guint64 for
+	  compatibility, so it could be used with or without synchronization2 vulkan
+	  extension.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5079>
 
-2022-10-24 11:56:51 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-06-28 19:38:33 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkvpp.c:
-	  msdkvpp: Set va mem caps as higher priority
-	  We use va pool as msdkvpp's bufferpool, which means both va memory
-	  and dma memory will be allocated by va pool. Considering drm modifier
-	  stuff is not ready, we use va memory with higher priortiry than
-	  dma memory when deciding vpp caps.
-	  Besides, this patch removes the specified "interlace-mode" in vpp caps.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3253>
+	* gst-libs/gst/vulkan/gstvkbuffermemory.c:
+	* gst-libs/gst/vulkan/gstvkimagememory.c:
+	  vkmemory: unref queue in barriers
+	  Queue might be assigned for queue transfers, so we need to unref it if the
+	  memory has been assigned to a specific queue.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5079>
 
-2022-10-18 03:36:23 +0000  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-06-27 16:35:36 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkav1enc.c:
-	* sys/msdk/gstmsdkav1enc.h:
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkenc.h:
-	  msdkav1enc: Remove reorder TU workaround
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3225>
+	* gst-libs/gst/vulkan/gstvkdevice.c:
+	  vkdevice: use macro VK_KHR_synchronization2 as guard
+	  Instead of (defined(VK_VERSION_1_3) || (defined(VK_VERSION_1_2) && VK_HEADER_VERSION >= 170))
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5079>
+
+2023-10-23 11:03:32 +0300  Sebastian Dröge <sebastian@centricular.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/aja/README.md:
+	* sys/aja/gstajacommon.cpp:
+	* sys/aja/gstajasink.cpp:
+	* sys/aja/gstajasrc.cpp:
+	* sys/aja/plugin.cpp:
+	  aja: Add basic documentation
+	  Also remove the `gst-inspect-1.0` output from the README.md. This is
+	  listed in the actual documentation and more up to date there.
 
-2022-10-18 03:10:43 +0000  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-10-21 10:26:40 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/msdk/gstmsdkav1enc.c:
-	* sys/msdk/gstmsdkav1enc.h:
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkenc.h:
-	  msdkav1enc: Remove pts workaround
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3225>
+	* docs/plugins/gst_plugins_cache.json:
+	* meson_options.txt:
+	* sys/aja/meson.build:
+	* sys/aja/meson_options.txt:
+	* sys/meson.build:
+	  aja: Integrate AJA plugin into the build system
+	  Co-Authored-By: Nirbheek Chauhan <nirbheek@centricular.com>
 
-2022-10-27 04:15:01 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-21 10:22:39 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/codecparsers/meson.build:
-	  codecparsers: {h264,h265}bitwriter: Don't install headers yet
-	  Those APIs are quite early stage of development, and we might want to
-	  change them in the near future
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3275>
+	* sys/aja/README.md:
+	* sys/aja/gstajacommon.cpp:
+	* sys/aja/gstajacommon.h:
+	* sys/aja/gstajadeviceprovider.cpp:
+	* sys/aja/gstajadeviceprovider.h:
+	* sys/aja/gstajasink.cpp:
+	* sys/aja/gstajasink.h:
+	* sys/aja/gstajasinkcombiner.cpp:
+	* sys/aja/gstajasinkcombiner.h:
+	* sys/aja/gstajasrc.cpp:
+	* sys/aja/gstajasrc.h:
+	* sys/aja/gstajasrcdemux.cpp:
+	* sys/aja/gstajasrcdemux.h:
+	* sys/aja/meson.build:
+	* sys/aja/meson_options.txt:
+	* sys/aja/plugin.cpp:
+	  Prepare for merging into GStreamer
 
-2022-10-18 16:34:41 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2020-07-15 07:04:47 +0300  Jordan Petridis <jordan@centricular.com>
 
-	* sys/msdk/gstmsdkvpp.c:
-	  msdkvpp: Fix upper frc
-	  Refact vpp commit 4c6b7194451ff6fbfe88834219d982302114d74b broke the
-	  upper FRC, here to fix this by using outbuf_new.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3223>
+	* ext/opencv/meson.build:
+	* gst-libs/gst/opencv/meson.build:
+	  opencv: move the dependency check to a single place
+	  Previously we were checking for opencv dep in 2 different places,
+	  and the checks would vary in terms of how complex and exhaustive
+	  they were.
+	  Move the check into the libs module and reuse the result later on.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3016>
 
-2022-07-29 18:15:08 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-10-25 23:19:51 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/msdk/gstmsdkav1enc.c:
-	  bad: Add msdkav1enc docs
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2971>
+	* sys/mediafoundation/gstmfvideoencoder.cpp:
+	  mfvideoencoder: Fix typo in template caps
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3058
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5554>
 
-2022-10-25 08:14:18 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-10-25 16:07:26 +1100  Matthew Waters <matthew@centricular.com>
 
-	* gst/codecalpha/gstalphacombine.c:
-	  alphacombine: Add missing query handler for gaps
-	  The gap handling was in place, but there was no event handler to trigger it.
-	  Implement the alpha sink event handler for the gaps. This fixes handling of
-	  valid streams which may not refresh the alpha frames for every video frames.
-	  It will also allow a clean error if the stream was missing the initial
-	  alpha frame, at least until we find a better way to handle these
-	  invalid frames.
-	  Related to #1518
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3264>
+	* gst-libs/gst/vulkan/gstvkphysicaldevice.c:
+	  vulkan/physical-device: don't assume that queue_family_ops is filled
+	  On old enough vulkan (< 1.2), we will never retrieve the family operations and
+	  will perform a NULL pointer dereference when dumping the queue family op
+	  properties.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5547>
 
-2022-10-26 11:47:43 +0200  Ignacio Casal Quinteiro <qignacio@amazon.com>
+2023-10-24 16:32:36 +0200  Adrien De Coninck <deconinck.adrien@gmail.com>
 
-	* sys/applemedia/avfdeviceprovider.m:
-	  avfdeviceprovider: do not leak the properties
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3268>
+	* sys/d3d11/gstd3d11videosink.cpp:
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	* sys/d3d11/gstd3d11window_win32.h:
+	  d3d11videosink: post "have-window-handle" element message on the bus
+	  * when window_id is not user-provided and window_type==GST_D3D11_WINDOW_NATIVE_TYPE_HWND
+	  * allows user to retrieve internally created window handle
+	  * for custom positionning
+	  * for custom icons
+	  * ...
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5544>
 
-2022-10-21 10:57:39 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-10-12 10:39:39 +0200  David Rosca <nowrep@gmail.com>
 
-	* sys/va/gstvaencoder.c:
-	  vaencoder: Fix caps semantics.
-	  When using gst_va_caps_from_profiles() the semantics of sink/src caps
-	  depends if the element is an encoder or a decoder.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3063>
+	* gst-libs/gst/va/gstvaallocator.c:
+	* gst-libs/gst/va/vasurfaceimage.c:
+	* gst-libs/gst/va/vasurfaceimage.h:
+	* sys/va/gstvabaseenc.c:
+	  va: Use vaMapBuffer2
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5467>
 
-2022-10-19 16:44:07 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-10-03 17:33:42 +0300  Jordan Petridis <jordan@centricular.com>
 
-	* sys/va/gstvadecoder.c:
-	* sys/va/gstvaencoder.c:
-	  va: Fix typos.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3063>
+	* gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.h:
+	  vkwindow_xcb: Make the visible private field a guint
+	  This field is used to store gbooleans (which are ints) but if it's
+	  a :1 bit depth assigning ints to it changes it's value as the only
+	  valid values are -1 and 0.
+	  Make it a guint instead so the cast would be correct.
+	  ```
+	  ../subprojects/gst-plugins-bad/gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.c:151:25: error:
+	  implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1
+	  -Werror,-Wsingle-bit-bitfield-constant-conversion
+	  window_xcb->visible = TRUE;
+	  ```
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5432>
 
-2022-08-11 12:51:17 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2022-04-06 12:56:30 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Fail if unsupported rate control.
-	  Handle when encoder doesn't support rate control, which is set as
-	  VA_RC_NONE, and if the set rate control mode is not supported by the
-	  GStreamer element, the element configuration fails.
-	  Also it logs out max and target bitrate.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3063>
+	* meson.build:
+	  meson: Bump GLib requirement to >= 2.64
+	  This includes fixes to make GstBus watches non-racy.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2126>
 
-2022-09-15 12:56:14 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2020-07-10 12:16:35 +0300  Jordan Petridis <jordan@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Add todo item.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3063>
+	* docs/plugins/gst_plugins_cache.json:
+	  ci: switch the Fedora base image to f34
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1060>
 
-2022-10-19 16:08:17 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-09-29 16:55:15 +0200  Jordan Petridis <jordan@centricular.com>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	* sys/va/gstvah264enc.c:
-	  vaencoder: Honor entrypoint at constructor.
-	  The entrypoint is set when the encoder helper is constructed,
-	  nonetheless it was also passed as parameter when opening. That's
-	  buggy.
-	  In order to simplify the code, the entrypoint at construction is
-	  honored.
-	  But gst_va_encoder_has_profile_and_entrypoint() now doesn't rely in
-	  the internal list of profiles since it only contains those that
-	  belongs to codec and entrypoint, thus it queries directly the VA
-	  driver.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3063>
+	* ext/svthevcenc/gstsvthevcenc.c:
+	  svthevcenc: Fix potential use of unitialized variable
+	  In gst_svthevc_enc_propose_allocation if we don't get info from
+	  the caps, we'd goto done, which could potentially try to unref
+	  and unitialized pool variable.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5476>
 
-2022-08-11 12:50:27 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-10-20 13:50:16 +0200  Piotr Brzeziński <piotr@centricular.com>
 
-	* sys/va/gstvabaseenc.c:
-	  vabaseenc: Scope error bail out.
-	  Though this is not enforced by the GStreamer code style, it's clearer
-	  to add a nested scope for error handling using label/goto.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3063>
+	* sys/applemedia/vtdec.c:
+	  vtdec: Fix deadlock when attempting to negotiate
+	  This was wrongly calling the base class method, which unnecessairly took the stream lock, already taken by
+	  handle_frame(). The drain() call in negotiate() would then wait for the output loop to pause, while that loop
+	  is stuck waiting to take the stream lock, thus causing a deadlock.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5521>
+
+2023-10-20 12:54:44 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+
+	* ext/svtav1/gstsvtav1enc.c:
+	  svtav1enc: Don't segfault on not-negotiated
+	  Don't drain on finish if we didn't configure the encoder.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5517>
 
-2022-09-20 15:00:15 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-10-19 19:33:49 -0400  Olivier Crête <olivier.crete@collabora.com>
 
-	* sys/va/gstvabaseenc.c:
-	* sys/va/gstvabaseenc.h:
-	* sys/va/gstvah264enc.c:
-	  vabaseenc: Use class entrypoint.
-	  Add a macro to access to class entrypoint and use it instead of move
-	  it to a variable.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3063>
+	* ext/onnx/gstonnxclient.h:
+	* ext/onnx/gstonnxenums.h:
+	* ext/onnx/gstonnxinference.cpp:
+	* ext/onnx/gstonnxinference.h:
+	  onnx: Remove enums file
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4916>
 
-2022-10-26 02:55:34 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-19 19:26:51 -0400  Olivier Crête <olivier.crete@collabora.com>
 
-	* gst-libs/gst/d3d11/gstd3d11-private.h:
-	* gst-libs/gst/d3d11/gstd3d11format.h:
-	  d3d11: Move format defines to private header
-	  Those defines will be likely changed/deleted in the future, and we
-	  don't need to expose them to public at the moment
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3265>
+	* ext/onnx/decoders/gstobjectdetectorutils.cpp:
+	* ext/onnx/decoders/gstssdobjectdetector.cpp:
+	* ext/onnx/gstonnxclient.cpp:
+	* ext/onnx/meson.build:
+	* ext/onnx/tensor/gsttensorid.cpp:
+	* ext/onnx/tensor/gsttensorid.h:
+	  onnx: Remove unnecessary tensorid class
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4916>
 
-2022-10-25 09:39:07 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-10-19 16:16:21 -0400  Olivier Crête <olivier.crete@collabora.com>
 
-	* gst-libs/gst/transcoder/gsttranscoder.c:
-	* gst-libs/gst/va/gstvaallocator.c:
-	* gst-libs/gst/vulkan/gstvkerror.c:
-	  Fix various warnings from gobject-introspection
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3261>
+	* ext/onnx/gstonnxclient.cpp:
+	* ext/onnx/meson.build:
+	  onnx: Update to build against 1.16.1
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4916>
 
-2022-10-22 11:13:10 +0100  Tim-Philipp Müller <tim@centricular.com>
+2023-06-26 10:55:53 -0400  Aaron Boxer <boxerab@protonmail.com>
 
-	* tests/check/elements/fdkaac.c:
-	* tests/check/meson.build:
-	  fdkaac: add minimal unit test
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1785>
+	* ext/onnx/decoders/gstobjectdetectorutils.cpp:
+	* ext/onnx/decoders/gstobjectdetectorutils.h:
+	* ext/onnx/decoders/gstssdobjectdetector.cpp:
+	* ext/onnx/decoders/gstssdobjectdetector.h:
+	* ext/onnx/gstml.h:
+	* ext/onnx/gstonnx.c:
+	* ext/onnx/gstonnxclient.cpp:
+	* ext/onnx/gstonnxclient.h:
+	* ext/onnx/gstonnxelement.c:
+	* ext/onnx/gstonnxenums.h:
+	* ext/onnx/gstonnxinference.cpp:
+	* ext/onnx/gstonnxinference.h:
+	* ext/onnx/gstonnxobjectdetector.cpp:
+	* ext/onnx/gstonnxobjectdetector.h:
+	* ext/onnx/meson.build:
+	* ext/onnx/tensor/gsttensor.h:
+	* ext/onnx/tensor/gsttensorid.cpp:
+	* ext/onnx/tensor/gsttensorid.h:
+	* ext/onnx/tensor/gsttensormeta.c:
+	* ext/onnx/tensor/gsttensormeta.h:
+	  onnx: add gstonnxinference element
+	  This element refactors functionality from gstonnxinference element,
+	  namely separating out the ONNX inference from the subsequent analysis.
+	  The new element runs an ONNX model on each video frame, and then
+	  attaches a TensorMeta meta with the output tensor data. This tensor data
+	  will then be consumed by downstream elements such as gstobjectdetector.
+	  At the moment, a provisional TensorMeta is used just in the ONNX
+	  plugin, but in future this will upgraded to a GStreamer API for other
+	  plugins to consume.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4916>
 
-2022-10-22 11:10:24 +0100  Tim-Philipp Müller <tim@centricular.com>
+2023-10-10 10:39:55 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* ext/fdkaac/gstfdkaacenc.c:
-	  fdkaacenc: fix output caps in case of implicit signaling and HE-AAC
-	  Need to put the actual profile in the output caps otherwise any
-	  capsfilter after the encoder that was used to force the output
-	  profile will fail, such as
-	  fdkaacenc ! audio/mpeg,stream-format=adts,profile=he-aac-v1 ! ..
-	  because we put profile=lc in there to match the profile signaled
-	  in the ADTS header. This is expressed through the base-profile=lc
-	  in the GStreamer caps though, the profile needs to carry the
-	  'real' profile.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1785>
+	* gst/mpegtsmux/gstatscmux.c:
+	* gst/mpegtsmux/tsmux/tsmuxstream.c:
+	* gst/mpegtsmux/tsmux/tsmuxstream.h:
+	  tsmux: Fix default get_es_descrs_func
+	  `tsmux_stream_default_get_es_descrs` is missing the `user_data`
+	  parameter and shouldn't be cast to `TsMuxStreamGetESDescriptorsFunc`.
+	  Prefer not casting at all to make sure we don't miss such an issue.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5496>
 
-2022-10-21 17:10:57 +0100  Tim-Philipp Müller <tim@centricular.com>
+2023-10-10 10:22:44 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* ext/fdkaac/gstfdkaacenc.c:
-	  fdkaacenc: don't set base-profile=lc for non-backwards compatible output
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1785>
+	* gst/mpegtsmux/gstatscmux.c:
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	* gst/mpegtsmux/tsmux/tsmux.h:
+	  tsmux: Fix default new_stream_func
+	  `tsmux_stream_new` is missing the `user_data` parameter and shouldn't be
+	  cast to `TsMuxNewStreamFunc`.
+	  Prefer not casting at all to make sure we don't miss such an issue.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5496>
 
-2022-10-21 13:15:29 +0100  Tim-Philipp Müller <tim@centricular.com>
+2023-10-10 10:12:44 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/fdkaac/gstfdkaacenc.c:
-	  fdkaacenc: rename profile=sbr|ps to profile=he-aac-v1|he-aac-v2
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1785>
+	* gst/mpegtsmux/tsmux/tsmuxstream.h:
+	  tsmux: Add missing include
+	  We need `GstMpegtsPMTStream` here.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5496>
 
-2022-03-01 14:12:27 +0100  Piotrek Brzeziński <piotr@centricular.com>
+2023-10-17 00:57:56 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* ext/fdkaac/gstfdkaacenc.c:
-	  fdkaacenc: add support for AAC-LD
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1785>
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	  tsmux: Simplify tsmux_section_write_packet
+	  - Don't try to make the parameters match `GHFunc`. Use a dedicated
+	  callback for `g_hash_table_foreach`.
+	  - Don't try to be clever with buffer memories. We're allocating a full
+	  packet anyway, might as well memcpy and save on a lot of complexity.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5496>
 
-2022-02-23 17:17:25 +0100  Piotrek Brzeziński <piotr@centricular.com>
+2023-10-17 00:54:38 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/fdkaac/gstfdkaacenc.c:
-	  fdkaacenc: add support for HE-AACv1 and HE-AACv2
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1785>
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	  tsmux: tsmux_packet_out should always consume its buffer
+	  Consuming the buffer only when successful is an antipattern and easily
+	  leads to leaks.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5496>
 
-2022-10-22 04:28:03 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-16 23:54:20 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	  gst-plugins-bad: Update Windows plugins cache
-	  Add/update d3d11, qsv, nvcodec, wic, directshow, and amfcodec plugins cache
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3250>
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	  tsmux: Don't memset in pad_stream when writing a PCR packet
+	  tsmux_write_ts_header will write a stuffing adaptation field, so we
+	  don't need to prefill the buffer.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5496>
 
-2022-10-22 03:02:56 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-16 23:52:48 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* sys/nvcodec/gstcudamemorycopy.c:
-	* sys/nvcodec/gstnvencoder.cpp:
-	* sys/nvcodec/gstnvh264encoder.cpp:
-	* sys/nvcodec/gstnvh265encoder.cpp:
-	  nvcodec: Update for documentation
-	  * Use GST_PARAM_DOC_SHOW_DEFAULT flags for GPU ID related
-	  properties
-	  * Fix some typos
-	  * Add since markers
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3250>
-
-2022-10-22 02:59:13 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/mediafoundation/gstmfaudiodecoder.cpp:
-	* sys/mediafoundation/gstmfaudioencoder.cpp:
-	* sys/mediafoundation/gstmfh264enc.cpp:
-	* sys/mediafoundation/gstmfh265enc.cpp:
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	* sys/mediafoundation/gstmfvp9enc.cpp:
-	  mediafoundation: Update for documentation
-	  * Use GST_PARAM_DOC_SHOW_DEFAULT flags for GPU ID related
-	  properties
-	  * Add doc caps
-	  * Add since markers
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3250>
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	  tsmux: Move out parameters of tsmux_write_ts_header
+	  Move them to the end of the parameter list and also allow passing NULLs
+	  to ignore the payload information, but assert that the payload length is
+	  zero in this case.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5496>
 
-2022-10-22 04:09:39 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-16 23:50:16 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	  mfvideoencoder: Document only hardware encoders
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3250>
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	  tsmux: Fix two more uses of gst_buffer_map
+	  The buffers should be used for writing.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5496>
 
-2022-10-22 22:37:33 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-18 14:19:44 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	  mfvideoencoder: Fix device enumeration
-	  Although a GPU does not support the codec, the other GPU might
-	  be able to support the codec
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3250>
+	* ext/dtls/meson.build:
+	* ext/sctp/meson.build:
+	* ext/srtp/meson.build:
+	* meson.build:
+	* meson_options.txt:
+	  meson: Add a top-level option to enable webrtc
+	  There are a bunch of plugins that you need for webrtc support, and
+	  it's not obvious at all to users which those are.
+	  With this commit, srtp, sctp and dtls options will be auto-enabled if
+	  the webrtc option is enabled.
+	  Requires meson 1.1
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5505>
 
-2022-10-22 02:56:23 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-17 14:56:34 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* sys/amfcodec/gstamfh264enc.cpp:
-	* sys/amfcodec/gstamfh265enc.cpp:
-	  amfcodec: Update for documentation
-	  * Use GST_PARAM_DOC_SHOW_DEFAULT flags for GPU ID related
-	  properties
-	  * Add doc caps
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3250>
+	* sys/v4l2codecs/gstv4l2codech265dec.c:
+	  v4l2codecs: h265: Fix entry_point_offsets array leak
+	  This array was being leaked.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5499>
 
-2022-10-22 02:53:16 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-17 12:42:59 -0400  Detlev Casanova <detlev.casanova@collabora.com>
 
-	* sys/qsv/gstqsvdecoder.cpp:
-	* sys/qsv/gstqsvencoder.cpp:
-	  qsv: Use GST_PARAM_DOC_SHOW_DEFAULT flag
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3250>
+	* gst-libs/gst/codecs/gsth265decoder.c:
+	  codecs: h265: Do not free slice header before using it
+	  The v4l2codecs H.265 decoder uses the
+	  GstH265SliceHdr::entry_point_offset_minus1 array so make sure that it is not
+	  freed before decoding the frame.
+	  Before this patch, some H.265 input would segfault in
+	  gst_v4l2_codec_h265_dec_fill_slice_params() when executing the line:
+	  guint32 entry_point_offset = slice_hdr->entry_point_offset_minus1i + 1;
+	  Make sure that the array is not freed before using it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5499>
 
-2022-10-22 02:49:00 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-17 21:07:39 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11deinterlace.cpp:
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/gstd3d11videosink.cpp:
-	  d3d11: Update for documentation
-	  * Use GST_PARAM_DOC_SHOW_DEFAULT flags for GPU ID related
-	  properties
-	  * Add doc caps
-	  * Increase deinterlace max resolution
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3250>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	  d3d11converter: Fix deadlock on taking property mutex
+	  SRWLOCK should be zero initialized, but since we changed the private
+	  struct to C++, use C++ mutex instead.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5498>
 
-2022-10-22 02:48:23 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-17 00:53:46 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	* sys/d3d11/gstd3d11winrtcapture.cpp:
-	  d3d11: Run indent
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3250>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	  d3d11converter: Create ID3D11Buffer with initial data
+	  ... and remove unnecessary device lock
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5492>
 
-2022-10-22 22:33:01 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-17 00:12:56 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/wic/plugin.cpp:
-	  wic: Add since marker
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3250>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	  d3d11converter: Don't set unnecessary constant buffer
+	  Skip PSSetConstantBuffers() if it's not used by pixel shader
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5492>
 
-2022-10-22 03:12:19 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-16 22:58:24 +0200  Diego Nieto <diego.nieto.m@outlook.com>
 
-	* sys/directshow/plugin.cpp:
-	  directshow: Add since marker
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3250>
+	* gst/mpegtsdemux/mpegtspacketizer.c:
+	  mpegtsdemux: Fix comment about the jitter description
+	  According to the information provided below, the Jitter (J) is
+	  defined by a network delay (D) + a noise(i)
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5494>
 
-2022-10-21 23:20:47 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-16 15:41:48 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_config.cpp:
-	* sys/qsv/libmfx/meson.build:
-	* sys/qsv/meson.build:
-	  qsv: Enable MinGW toolchain support
-	  Use PCRE regex method to work around (likely) GCC std::regex bug,
-	  and enable building for non-MSVC
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3239>
-
-2022-10-21 21:50:01 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
-
-	* gst-libs/gst/vulkan/cocoa/gstvkcocoa_utils.h:
-	* gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m:
-	* gst-libs/gst/vulkan/ios/gstvkios_utils.h:
-	* gst-libs/gst/vulkan/ios/gstvkwindow_ios.m:
-	  gl/vulkan: Fix static linking on macOS
-	  duplicate symbol '__invoke_on_main' in:
-	  /Library/Frameworks/GStreamer.framework/Versions/1.0/lib/libgstvulkan-1.0.a(cocoa_gstvkwindow_cocoa.m.o)
-	  /Library/Frameworks/GStreamer.framework/Versions/1.0/lib/libgstgl-1.0.a(cocoa_gstglwindow_cocoa.m.o)
-	  ld: 1 duplicate symbol for architecture x86_64
-	  clang: error: linker command failed with exit code 1 (use -v to see invocation)
-	  Also make the same change in iOS for consistency.
-	  Continuation of https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1132
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3242>
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	  tsmux: Fix error handling in pad_stream
+	  Don't leak the map or the buffer if we encounter an error.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5490>
 
-2022-10-18 17:05:41 +1100  Matthew Waters <matthew@centricular.com>
+2023-10-16 15:31:04 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: configure rtpulpfecdec passthrough property
-	  This allows downstream (payloaders mostly) to be able to correctly
-	  detect actual packet loss from rtp sequence numbers.
-	  See
-	  https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/581
-	  for background.
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1407
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3212>
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	  tsmux: Fill padding packets with stuffing bytes
+	  Instead of leaving it uncleared, emitting probably old packet data but
+	  potentially also random or sensitive application data.
+	  Also fix the mapping mode.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5490>
 
-2022-10-07 04:20:29 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-16 00:59:59 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	* sys/d3d11/gstd3d11screencapture.h:
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
 	* sys/d3d11/gstd3d11winrtcapture.cpp:
-	* sys/d3d11/gstd3d11winrtcapture.h:
-	* sys/d3d11/meson.build:
-	  d3d11screencapture: Add WinRT API based capture mode
-	  Add Windows Graphics Capture (WGC) API based screen capture mode.
-	  The conditions where this mode is used:
-	  * Explicitly requested by user (capture-api property)
-	  * To capture specific window
-	  * When DXGI desktop duplication API does not work on hybrid graphics systems
-	  (e.g., multi-gpu laptop)
-	  Full features of this implementation require Windows 11. And Windows 11
-	  SDK is required to build this feature.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3144>
+	  d3d11screencapturesrc: Fix HWND capture mode
+	  Use per-monitor-aware context to cover different DPI settings per
+	  monitor
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2425
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5485>
+
+2023-10-15 18:58:14 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst-libs/gst/d3d11/hlsl/PSMain_converter.hlsl:
+	  d3d11converter: Update shader code to make 4_0_level_9_1 compatible
+	  4_0_level_9_1 target requires float4 SV_TARGET
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5483>
 
-2022-10-06 23:54:14 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-15 01:47:29 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11dxgicapture.cpp:
-	* sys/d3d11/gstd3d11dxgicapture.h:
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	* sys/d3d11/gstd3d11screencapture.h:
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	* sys/d3d11/meson.build:
-	  d3d11screencapture: Subclassing capture implementation
-	  Preparation to use WinRT capture API
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3144>
+	* gst-libs/gst/d3d11/hlsl/PSMain_converter.hlsl:
+	  d3d11converter: Fix 10/12bits planar output
+	  Simple division can result in 10/12bits overflow.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5483>
 
-2022-10-21 19:08:49 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-15 00:27:27 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/qsv/gstqsvav1enc.cpp:
-	* sys/qsv/gstqsvdecoder.cpp:
-	* sys/qsv/gstqsvencoder.cpp:
-	* sys/qsv/gstqsvh264dec.cpp:
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh265dec.cpp:
-	* sys/qsv/gstqsvh265enc.cpp:
-	* sys/qsv/gstqsvjpegenc.cpp:
-	* sys/qsv/gstqsvvp9enc.cpp:
-	* sys/qsv/plugin.cpp:
-	  qsv: Add plugin doc
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2738>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	  d3d11converter: Print calculated matrix for debugging
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5483>
 
-2022-07-09 05:38:05 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-14 20:46:57 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/qsv/libmfx/api/vpl/mfx.h:
-	* sys/qsv/libmfx/api/vpl/mfxcommon.h:
-	* sys/qsv/libmfx/api/vpl/mfxdefs.h:
-	* sys/qsv/libmfx/api/vpl/mfxencodestats.h:
-	* sys/qsv/libmfx/api/vpl/mfxjpeg.h:
-	* sys/qsv/libmfx/api/vpl/mfxstructures.h:
-	* sys/qsv/libmfx/api/vpl/mfxvideo++.h:
-	* sys/qsv/libmfx/api/vpl/mfxvideo.h:
-	* sys/qsv/libmfx/dispatcher/linux/device_ids.h:
-	* sys/qsv/libmfx/dispatcher/linux/mfxloader.cpp:
-	* sys/qsv/libmfx/dispatcher/linux/mfxloader.h:
-	* sys/qsv/libmfx/dispatcher/linux/mfxvideo_functions.h:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl.cpp:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl.h:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_config.cpp:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_lowlatency.cpp:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/main.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_critical_section.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_critical_section.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dispatcher.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dispatcher.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dispatcher_defs.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dispatcher_log.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dispatcher_log.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_driver_store_loader.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_driver_store_loader.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dxva2_device.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dxva2_device.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_exposed_functions_list.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_function_table.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_library_iterator.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_library_iterator.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_load_dll.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_load_dll.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_vector.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_win_reg_key.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_win_reg_key.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfxvideo++.h:
-	* sys/qsv/libmfx/dispatcher/windows/version.rc.in:
-	* sys/qsv/libmfx/meson.build:
-	  qsv: Update SDK version to v2022.2.4
-	  See release note
-	  https://github.com/oneapi-src/oneVPL/releases/tag/v2022.2.0
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2738>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	  d3d11converter: Calculate gamma LUT only once
+	  Reuse calculated gamma lookup table and use immutable 1D texture
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5482>
 
-2022-10-14 16:05:28 +0800  He Junyan <junyan.he@intel.com>
+2023-10-14 20:22:45 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Correct the pts for frames and OBUs inside a TU.
-	  When the output alignment is smaller than the input alignment, for
-	  example, When the output alignment is "FRAME" and the parse is likely
-	  connecting to a decoder, the current PTS setting for AV1 frames inside
-	  a TU is not very correct.
-	  For example, a TU may begin with non-displayed frames and end with a
-	  displayed frame. The current way will assign the PTS to the first
-	  non-displayed frame, which is a decode-only frame and the PTS will be
-	  discarded in the video decoder. While the last displayed frame has
-	  invalid PTS, and so the video decoder needs to guess its PTS based on
-	  the frame rate and previous frame's PTS. This is not a decent and
-	  robust way. And more important, when the previous frames provide DTS,
-	  the video decoder will also guess the PTS based on the previous frames'
-	  DTS and trigger the warning like:
-	  gstvideodecoder.c:3147:gst_video_decoder_prepare_finish_frame: \
-	  <vavp9dec0> decreasing timestame
-	  It sets the reordered_output and makes the decoder in free run mode.
-	  We should correct the PTS for a TU, let the non-displayed frames have
-	  no PTS while set the correct PTS to the displayed one. Also, when the
-	  AV1 stream has multi spatial layers, there are more than one displayed
-	  frames inside one TU with the same PTS.
-	  Note: If the input alignment is not TU aligned, we can not know the
-	  exact PTS of this TU, and so we just clear the PTS of the decode only
-	  frame and leave others unchanged.
-	  We also correct all the PTS if the output is OBU aligned. All their
-	  PTS and DTS are set to the input buffer's PTS.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3182>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	  d3d11converter: Remove unused variable
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5482>
 
-2022-10-14 17:25:45 +0800  He Junyan <junyan.he@intel.com>
+2023-10-14 01:04:35 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Only check the TU bound when the alignment is TU.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3182>
+	* docs/plugins/gst_plugins_cache.json:
+	  docs: Update Windows plugin docs
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5481>
 
-2022-10-14 15:46:16 +0800  He Junyan <junyan.he@intel.com>
+2023-10-14 00:42:34 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: push all data once when input alignment not smaller than output.
-	  When the incoming data has big alignment than the output, we do not need to
-	  call finish_frame() and exit the current handle_frame() for each splitted
-	  frame. We can push them all at one shot with in one handle_frame(), whcih
-	  may improve the performance and can help us to find the edge of TU.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3182>
+	* docs/libs/dxva/index.md:
+	* docs/libs/dxva/sitemap.txt:
+	* docs/meson.build:
+	* gst-libs/gst/dxva/gstdxvaav1.h:
+	* gst-libs/gst/dxva/gstdxvaav1decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvaav1decoder.h:
+	* gst-libs/gst/dxva/gstdxvah264decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvah264decoder.h:
+	* gst-libs/gst/dxva/gstdxvah265decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvah265decoder.h:
+	* gst-libs/gst/dxva/gstdxvampeg2decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvampeg2decoder.h:
+	* gst-libs/gst/dxva/gstdxvatypedef.h:
+	* gst-libs/gst/dxva/gstdxvavp8decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvavp8decoder.h:
+	* gst-libs/gst/dxva/gstdxvavp9decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvavp9decoder.h:
+	* gst-libs/gst/dxva/meson.build:
+	  dxva: Build gir and remove SDK header dependency
+	  Build gir for documentation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5481>
+
+2023-10-13 21:40:45 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12av1dec.cpp:
+	* sys/d3d12/gstd3d12h264dec.cpp:
+	* sys/d3d12/gstd3d12h265dec.cpp:
+	* sys/d3d12/gstd3d12vp9dec.cpp:
+	* sys/d3d12/plugin.cpp:
+	  d3d12decoder: Hide non-default device from docs
+	  ... and add since marker
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5481>
 
-2022-10-14 15:27:52 +0800  He Junyan <junyan.he@intel.com>
+2023-10-13 21:36:50 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Set the output buffer flags correctly.
-	  The current code forgets to clear some flags and has some typo.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3182>
+	* sys/d3d11/gstd3d11compositor.cpp:
+	  d3d11compositor: Fix typo in property description
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5481>
 
-2022-10-21 10:50:36 +1100  Matthew Waters <matthew@centricular.com>
+2023-10-02 21:57:19 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: also add rtcp-fb ccm fir for video mlines by default
-	  In addition to the 'nack pli' already added.  Both are supported by
-	  rtpbin/rtpsession by default already.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3235>
+	* sys/nvcodec/gstnvenc.c:
+	* sys/nvcodec/gstnvencoder.cpp:
+	* sys/nvcodec/gstnvencoder.h:
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	  nvencoder: Add support for new preset/tune/multi-pass options
+	  Adding new P1 ~ P7 presets and deprecate old preset values.
+	  Also adding tune and multi-pass properties.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5428>
 
-2022-10-19 16:03:55 +0900  Sangchul Lee <sc11.lee@samsung.com>
+2023-10-13 09:28:41 +0300  Mart Raudsepp <leio@gentoo.org>
 
 	* docs/plugins/gst_plugins_cache.json:
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Improve documentation of 'turn-server' property
-	  Description about how to set time-limited credentials is added.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3229>
+	* ext/bs2b/gstbs2b.c:
+	  bs2b: Add missing space in plugin description
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5477>
 
-2022-09-23 18:25:41 +0200  Mathieu Duponchelle <mathieu@centricular.com>
+2023-10-13 10:04:39 +0300  Mart Raudsepp <leio@gentoo.org>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* gst/debugutils/gstfakeaudiosink.c:
-	* gst/debugutils/gstfakesinkutils.c:
-	* gst/debugutils/gstfakesinkutils.h:
-	* gst/debugutils/gstfakevideosink.c:
-	  fake{video|audio}sink: don't proxy properties at instance init.
-	  Instead proxy properties from the GstBaseSink class at class_init time,
-	  and duplicate the rest of the fakesink properties manually.
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1442
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3073>
+	* ext/colormanagement/gstlcms.c:
+	  colormanagement: Fix typo in pipeline example
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5478>
 
-2022-10-18 11:16:20 +0200  Alba Mendez <alba.mendez@dolby.com>
+2023-10-12 16:25:59 +0530  Rahul T R <r-ravikumar@ti.com>
 
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  webrtcbin: support adding TURN servers after pipeline start
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1680
-	  When a TURN server is added for the first time, propagate
-	  the change to all nice streams that already exist. This
-	  lets us add servers after the pipeline has been started
-	  (and streams have been added).
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3217>
+	* sys/kms/gstkmssink.c:
+	  kmssink: Add TIDSS auto-detection
+	  Add Texas Instruments TIDSS display controller into list of
+	  auto-detected modules.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5469>
 
-2022-10-17 06:48:12 -0500  Fabian Orccon <forccon@fluendo.com>
+2023-10-12 18:56:57 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/srtp/meson.build:
-	  srtp: Fix test skipping when plugin option is disabled
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3200>
+	* gst-libs/gst/va/gstvadisplay_win32.cpp:
+	* sys/d3d12/gstd3d12basefilter.cpp:
+	* sys/d3d12/gstd3d12bufferpool.cpp:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/gstd3d12fence.cpp:
+	* sys/d3d12/meson.build:
+	* sys/dwrite/gstdwrite-renderer.cpp:
+	  d3d12, dwrite, va: Fix various msys2 build error/warning
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5454>
 
-2022-10-14 00:17:52 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-10 09:52:48 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* tests/examples/d3d11/d3d11videosink-present.cpp:
-	  d3d11videosink: Add "emit-present" property
-	  Controls the decision for "present" signal use, and
-	  allows delayed "present" signal handler install via the property
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3176>
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/gstmsdkvpp.h:
+	  msdkvpp: Use filter flag to handle passthrough for tone mapping
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5449>
 
-2022-10-17 19:36:13 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-10-12 02:47:28 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/play/gstplay-signal-adapter.c:
-	  play: Add/fix various annotations
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3194>
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: Don't use DXGI_ALPHA_MODE_PREMULTIPLIED for HWND swapchain
+	  It's allowed only for a swapchain type which does composition
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5464>
 
-2022-10-17 11:29:02 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-10-12 02:26:07 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/vulkan/android/gstvkdisplay_android.c:
-	* gst-libs/gst/vulkan/cocoa/gstvkdisplay_cocoa.m:
-	* gst-libs/gst/vulkan/gstvkdevice.c:
-	* gst-libs/gst/vulkan/gstvkdisplay.c:
-	* gst-libs/gst/vulkan/gstvkfence.c:
-	* gst-libs/gst/vulkan/gstvkformat.c:
-	* gst-libs/gst/vulkan/gstvkinstance.c:
-	* gst-libs/gst/vulkan/gstvkqueue.c:
-	* gst-libs/gst/vulkan/gstvkutils.c:
-	* gst-libs/gst/vulkan/ios/gstvkdisplay_ios.m:
-	* gst-libs/gst/vulkan/wayland/gstvkdisplay_wayland.c:
-	* gst-libs/gst/vulkan/xcb/gstvkdisplay_xcb.c:
-	  vulkan: Add/fix various annotations
-	  And fix a memory leak in gst_vulkan_display_wayland_new() in error
-	  cases.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3194>
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: Fix rendering with initial fullscreen state
+	  Change fullscreen mode once the swapchain is fully configured
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5462>
 
-2022-10-17 10:54:06 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-10-11 23:29:04 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	  d3d11: Add/fix various annotations
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3194>
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: Fix toggling between fullscreen and maximized
+	  Use GetWindowPlacement() and SetWindowPlacement() APIs
+	  to remember and restore window status, such as maximized, position,
+	  restore position, etc.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3016
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5462>
 
-2022-10-17 10:51:42 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-10-10 19:40:36 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/cuda/gstcudacontext.c:
-	* gst-libs/gst/cuda/gstcudautils.c:
-	  cuda: Add/fix various annotations
-	  And fix a memory leak when creating a CUDA context fails.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3194>
+	* gst-libs/gst/d3d11/gstd3d11-private.h:
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converterbuilder.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converterbuilder.h:
+	* gst-libs/gst/d3d11/gstd3d11device-private.h:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* gst-libs/gst/d3d11/gstd3d11format.cpp:
+	* gst-libs/gst/d3d11/gstd3d11shadercache.cpp:
+	* gst-libs/gst/d3d11/gstd3d11shadercache.h:
+	* gst-libs/gst/d3d11/hlsl/PSMain_converter.hlsl:
+	* gst-libs/gst/d3d11/hlsl/VSMain_converter.hlsl:
+	* gst-libs/gst/d3d11/hlsl/collect_hlsl_header.py:
+	* gst-libs/gst/d3d11/hlsl/meson.build:
+	* gst-libs/gst/d3d11/meson.build:
+	* sys/d3d11/gstd3d11pluginutils.cpp:
+	  d3d11converter: Add support for HLSL precompile and bytecode caching
+	  Precompile pixel shaders for simple conversion path
+	  (without gamma/primaries conversion) in case of MSVC build.
+	  Even if runtime compile is required (cross-compiled or complex conversion
+	  path), do it only once and reuse the compiled bytecode.
+	  This precompile/caching can save about 95% of time taken by
+	  gst_d3d11_converter_new() call.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3004
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5457>
 
-2022-10-17 10:47:02 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-10-10 20:01:57 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	* gst-libs/gst/codecs/gsth264picture.c:
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	* gst-libs/gst/codecs/gsth265picture.c:
-	* gst-libs/gst/codecs/gstvp9decoder.h:
-	  codecs: Add/fix various annotations
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3194>
+	* gst-libs/gst/d3d11/gstd3d11device-private.h:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* sys/d3d11/gstd3d11dxgicapture.cpp:
+	* sys/d3d11/gstd3d11overlaycompositor.cpp:
+	* sys/d3d11/gstd3d11screencapturesrc.cpp:
+	  d3d11: Reuse sampler object
+	  The linear sampler object can be reused
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5457>
 
-2022-10-17 10:44:24 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-10-10 19:35:36 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/audio/gstnonstreamaudiodecoder.c:
-	  badaudio: Add/fix annotations
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3194>
+	* gst-libs/gst/d3d11/gstd3d11device-private.h:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* gst-libs/gst/d3d11/gstd3d11shadercache.cpp:
+	* gst-libs/gst/d3d11/gstd3d11shadercache.h:
+	* sys/d3d11/gstd3d11pluginutils.cpp:
+	  d3d11: Pass HLSL source size to compile function
+	  The string size is known at build time
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5457>
 
-2022-10-14 21:51:17 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-10-09 01:05:34 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/webrtc/ice.c:
-	* gst-libs/gst/webrtc/ice.h:
-	* gst-libs/gst/webrtc/icetransport.c:
-	* gst-libs/gst/webrtc/icetransport.h:
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  webrtc: Add/fix various annotations
-	  And mark string parameters as const.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3194>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter.h:
+	* sys/d3d11/gstd3d11convert.cpp:
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	* sys/d3d11/gstd3d11window.cpp:
+	* sys/dwrite/gstdwriteoverlayobject.cpp:
+	  d3d11converter: Set alpha-mode using config
+	  ... and disallow runtime alpha-mode update for now
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5457>
 
-2022-10-17 00:40:46 +0900  Seungha Yang <seungha@centricular.com>
+2023-10-06 20:46:23 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/wasapi2/gstwasapi2client.cpp:
-	* sys/wasapi2/gstwasapi2client.h:
-	* sys/wasapi2/gstwasapi2device.c:
-	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
-	* sys/wasapi2/gstwasapi2ringbuffer.h:
-	* sys/wasapi2/gstwasapi2sink.c:
-	* sys/wasapi2/gstwasapi2src.c:
-	* sys/wasapi2/gstwasapi2util.c:
-	* sys/wasapi2/gstwasapi2util.h:
-	  wasapi2: Add support for process loopback capture
-	  Adding loopback capture mode for specified PID.
-	  Note that this feature requires Windows 10 build 20348
-	  (Windows 11/Windows Server 2022 or later),
-	  and any process loopback related properties will not be exposed
-	  if OS does not support it.
-	  Example launch lines:
-	  * wasapi2src loopback-mode=include-process-tree loopback-target-pid=<PID>
-	  Captures audio generated by an application (specified by PID)
-	  and its child process
-	  * wasapi2src loopback-mode=exclude-process-tree loopback-target-pid=<PID>
-	  Captures desktop audio excluding PID and its child process
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1278
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3195>
+	* sys/d3d11/gstd3d11pluginutils.cpp:
+	* sys/d3d11/hlsl/PSMain_checker.hlsl:
+	* sys/d3d11/hlsl/PSMain_checker_luma.hlsl:
+	* sys/d3d11/hlsl/PSMain_checker_rgb.hlsl:
+	* sys/d3d11/hlsl/PSMain_checker_vuya.hlsl:
+	* sys/d3d11/hlsl/PSMain_color.hlsl:
+	* sys/d3d11/hlsl/PSMain_sample.hlsl:
+	* sys/d3d11/hlsl/PSMain_sample_premul.hlsl:
+	* sys/d3d11/hlsl/PSMain_snow.hlsl:
+	* sys/d3d11/hlsl/VSMain_color.hlsl:
+	* sys/d3d11/hlsl/VSMain_coord.hlsl:
+	* sys/d3d11/hlsl/VSMain_pos.hlsl:
+	* sys/d3d11/hlsl/gstd3d11plugin-hlsl.h:
+	* sys/d3d11/hlsl/meson.build:
+	  d3d11: Simplify HLSL build
+	  Unify source/header/entrypoint names
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5457>
 
-2022-10-14 16:21:07 -0400  Arun Raghavan <arun@asymptotic.io>
+2023-10-10 15:43:07 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* gst/rtmp2/gstrtmp2sink.c:
-	  rtmp2sink: Correctly return GST_FLOW_ERROR on error
-	  If there is an error while connecting, the streaming task will be stopped, and
-	  is_running() will be false, causing a GST_FLOW_FLUSHING to be returned. Instead,
-	  we perform the error check (!self->connection) first, to return an error if
-	  that's what occured.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3189>
+	* sys/v4l2codecs/gstv4l2format.c:
+	  v4l2codecs: Fix tiled formats stride conversion
+	  While adding arbitrary tile support, a round up operation was badly
+	  converter. This caused the Y component of the stride to be 0. This
+	  eventually lead to a crash in glupoad preceded by the following
+	  assertion.
+	  gst_gl_buffer_allocation_params_new: assertion 'alloc_size > 0' failed
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5458>
 
-2022-10-14 18:51:43 +0200  Mathieu Duponchelle <mathieu@centricular.com>
+2023-10-09 19:09:15 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  webrtc/nice: fix small leak of split strings
-	  g_strfreev previously stopped at our manual NULL-termination. Fix by
-	  restoring the pointer after joining.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3188>
+	* sys/decklink/gstdecklink.h:
+	  decklink: Fix broken COM string conversion
+	  WideCharToMultiByte return is the string length without null terminate
+	  character if passed "cchWideChar" does not include the null terminate
+	  character size. Instead of passing the exact string length, pass -1 so that
+	  the API can understand the input string is null terminated already and
+	  returned value from the API includes the character.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3023
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5444>
 
-2022-10-12 16:11:47 +0800  He Junyan <junyan.he@intel.com>
+2023-08-10 16:40:41 +0200  Michael Tretter <m.tretter@pengutronix.de>
 
-	* gst/videoparsers/gstvp9parse.c:
-	  vp9parse: The show_existing_frame buffer should not be decode only.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3155>
+	* sys/uvcgadget/gstuvcsink.c:
+	  uvcsink: use the pad's current caps to update caps_changed
+	  The caps that were sent by the caps event can be retrieved from the sinkpad
+	  using gst_pad_get_current_caps(). This is more reliable than using cur_caps as
+	  we know exactly which caps upstream selected when the UVC host didn't select a
+	  format, yet.
+	  This further allows to simplify the check, if the uvcsink has to wait for the
+	  caps event before switching to the internal v4l2sink.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4994>
+
+2023-07-18 15:40:02 +0200  Michael Tretter <m.tretter@pengutronix.de>
+
+	* sys/uvcgadget/gstuvcsink.c:
+	  uvcsink: use event function instead of probe
+	  The probe passes all events except the EVENT_CAPS. Installing and removing the
+	  probe doesn't provide any additional value.
+	  Install an event function and always handle EVENT_CAPS. Use the caps_changed
+	  field, to decide, if the element has to do anything special on a EVENT_CAPS.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4994>
+
+2023-07-19 11:22:03 +0200  Michael Tretter <m.tretter@pengutronix.de>
+
+	* sys/uvcgadget/gstuvcsink.c:
+	  uvcsink: refactor gst_uvc_sink_update_streaming
+	  Move the sanity checks to the beginning of the function. Make the actual effect
+	  of the function more obvious and reset the flags in the end.
+	  This should make it easier to understand what this function is doing.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4994>
+
+2023-07-18 17:54:49 +0200  Michael Tretter <m.tretter@pengutronix.de>
+
+	* sys/uvcgadget/gstuvcsink.c:
+	  uvcsink: extract helper function for updating the stream state
+	  The uvcsink may switch to the v4l2sink after a STREAMON either on a caps event
+	  or on a caps query.
+	  Extract the code that handles the STREAMON into a helper function, as this is
+	  the same code.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4994>
+
+2023-07-19 10:24:04 +0200  Michael Tretter <m.tretter@pengutronix.de>
+
+	* sys/uvcgadget/gstuvcsink.c:
+	  uvcsink: extract common code to reset caps_changed
+	  The caps_changed flag must be reset for streamon and streamoff. Extract it to a
+	  common path.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4994>
+
+2023-07-18 15:52:40 +0200  Michael Tretter <m.tretter@pengutronix.de>
+
+	* sys/uvcgadget/gstuvcsink.c:
+	  uvcsink: remove separate function for buffer probe installation
+	  The probe that installs the buffer probe is already on the correct pad. There is
+	  no need for a separate function to install the probe.
+	  While at it, change the signature of the probe functions to GstPadProbeCallback
+	  to avoid the cast when installing the probes.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4994>
+
+2023-07-19 10:38:40 +0200  Michael Tretter <m.tretter@pengutronix.de>
+
+	* sys/uvcgadget/gstuvcsink.c:
+	  uvcsink: extract common code in idle_probe
+	  The RECONFIGURE event has to be sent in streamon and streamoff. Extract the
+	  common code to a separate branch to make it easier to understand.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4994>
+
+2023-07-18 14:28:40 +0200  Michael Tretter <m.tretter@pengutronix.de>
+
+	* sys/uvcgadget/gstuvcsink.c:
+	  uvcsink: return caps when reading the host configured caps
+	  The uvcsink calculates the caps for the format that the UVC host selected. The
+	  gst_uvc_sink_parse_cur_caps() sets these caps as cur_caps as a side effect. This
+	  behavior is surprising as cur_caps is later updated to reflect the actually used
+	  caps.
+	  Just return the configured caps to avoid side effects. This makes the function
+	  easier to understand. Update the function name to reflect the new behavior.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4994>
+
+2023-06-12 23:31:24 +0200  Michael Grzeschik <m.grzeschik@pengutronix.de>
+
+	* sys/uvcgadget/gstuvcsink.c:
+	  uvcsink: fix event peer probe
+	  The only job of the event peer probe is to catch the upcoming caps event
+	  and be able to react with the sink change. All other events that are
+	  passing the pad shall be passed and ignored.
+	  Since the probe is a blocking probe, there is no use in returning
+	  with GST_PAD_PROBE_OK on other events. Otherwise the event would just
+	  be blocked.
+	  Since we are handling the probe removal of the probe already in the
+	  event switch, we can remove the second explicit probe removal.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4994>
+
+2023-06-16 01:05:22 +0200  Michael Grzeschik <m.grzeschik@pengutronix.de>
+
+	* sys/uvcgadget/gstuvcsink.c:
+	  uvcsink: drop useless debug messages in peer event probe
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4994>
 
-2022-10-11 16:17:26 +0800  He Junyan <junyan.he@intel.com>
+2023-10-06 13:49:15 +0200  Guillaume Desmottes <guillaume.desmottes@onestream.live>
 
-	* gst/videoparsers/gstvp9parse.c:
-	  vp9parse: Correct the pts for frames inside a super frame.
-	  When the alignment is "FRAME" and the parse is likely connecting to
-	  a decoder, the current PTS setting for VP9 frames inside a super
-	  frame is not very correct.
-	  For example, the super frame may begin with non-displayed frames and
-	  end with a displayed frame. The current way will assign the PTS to
-	  the first non-displayed frame, which is a decode-only frame and the
-	  PTS will be discarded in the video decoder. While the last displayed
-	  frame has invalid PTS, and so the video decoder needs to guess its
-	  PTS based on the frame rate and previous frame's PTS. This is not a
-	  decent and robust way. And more important, when the previous frames
-	  provide DTS, the video decoder will also guess the PTS based on the
-	  previous frames' DTS and trigger the warning like:
-	  gstvideodecoder.c:3147:gst_video_decoder_prepare_finish_frame: \
-	  <vavp9dec0> decreasing timestame
-	  It sets the reordered_output and makes the decoder in free run mode.
-	  We should correct the PTS for a super frame, let the non-displayed
-	  frames have no PTS while set the correct PTS to the displayed one.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3155>
+	* gst/audiobuffersplit/gstaudiobuffersplit.c:
+	  audiobuffersplit: disable max-silence-time if set to 0
+	  According to the property documentation max-silence-time is supposed to be
+	  disabled when set to 0 but it was not.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5442>
 
-2022-10-08 00:29:03 +0200  Piotr Brzeziński <piotr@centricular.com>
+2023-10-05 13:34:14 +0800  James Oliver <james.oliver@icetana.com.au>
 
-	* sys/applemedia/avfvideosrc.m:
-	  avfvideosrc: Allow specifying crop coordinates during screen capture
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3153>
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	  nvh265encoder: fix bounds for auto-select GPU enumeration
+	  Fixes the bounds-check for encoder auto-select GPU enumeration to be
+	  between 0-7 instead of 0-6. This should allow 8-GPU machines to work
+	  with nvautogpuh265enc for the last enumerated GPU.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5438>
 
-2022-10-12 11:12:50 +0200  Edward Hervey <edward@centricular.com>
+2023-10-05 13:29:49 +0800  James Oliver <james.oliver@icetana.com.au>
 
-	* gst/mxf/gstmxfelement.c:
-	* gst/mxf/meson.build:
-	* gst/mxf/mxfcustom.c:
-	* gst/mxf/mxfcustom.h:
-	  mxfdemux: Add support for Canon XF-HEVC
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1495
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3163>
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	  nvh264encoder: fix bounds for auto-select GPU enumeration
+	  Fixes the bounds-check for encoder auto-select GPU enumeration to be
+	  between 0-7 instead of 0-6. This should allow 8-GPU machines to work
+	  with nvautogpuh264enc for the last enumerated GPU.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5438>
 
-2022-10-12 11:12:14 +0200  Edward Hervey <edward@centricular.com>
+2023-09-27 12:42:40 +0200  Stéphane Cerveau <scerveau@igalia.com>
 
-	* gst/mxf/mxfdemux.c:
-	  mxfdemux: Don't leak index table segments on failures
-	  The segment was freed ... but not the contents :)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3163>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/dash/gstdashsink.c:
+	  dashsink: add dashmp4mux support
+	  As mp4mux is not correctly suppporting the fragment generation,
+	  see
+	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1722,
+	  we deprecate and advertize the current status of usage.
+	  Added the possibility to use the rust dashmp4mux element.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5403>
 
-2022-10-11 13:09:20 +0300  Sebastian Dröge <sebastian@centricular.com>
+2022-02-15 13:12:32 +0100  Stéphane Cerveau <scerveau@collabora.com>
 
-	* gst-libs/gst/webrtc/webrtc_fwd.h:
-	  webrtc: Move GST_WEBRTC_ERROR_TYPE_ERROR at the end of the enum to keep ABI compatibility
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3154>
+	* ext/dash/gstdashsink.c:
+	  dashsink: Do not reset muxer only for TS
+	  The MP4 needs to be reset to continue to produce segments.
+	  Closes #1015
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5403>
 
-2022-10-06 20:37:45 +0900  Sangchul Lee <sc11.lee@samsung.com>
+2023-10-03 15:05:15 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* tests/check/elements/webrtcbin.c:
-	  tests/webrtc: Add test for 'add-turn-server' action signal
-	  It just checks return value of the action signal.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3131>
+	* docs/plugins/gst_plugins_cache.json:
+	  doc: Update plugin cache for added DMA_DRM format
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5386>
 
-2020-12-10 16:25:26 +0100  Johan Sternerup <johast@axis.com>
+2023-09-27 13:55:33 +0200  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/sctp/gstsctpenc.c:
-	  sctpenc: Prohibit sending of interleaved message parts
-	  Apparently we cannot start sending messages from another datachannel
-	  before the previous message was completely sent. usrsctplib will
-	  complain about being locked on another stream id and set
-	  errno=EINVAL.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2454>
+	* ext/assrender/gstassrender.c:
+	* ext/qroverlay/gstbaseqroverlay.c:
+	* ext/ttml/gstttmlrender.c:
+	* gst/debugutils/gstfakevideosink.c:
+	* gst/dvbsuboverlay/gstdvbsuboverlay.c:
+	  video-filters: Fix passthrough with ANY caps feature
+	  With the support for DRM modifiers, passthrough caps must now include DMA_DRM
+	  format, otherwise pipeline using thhese filters unconditionally may fail
+	  to negotiate.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5386>
+
+2023-10-02 17:13:17 +0200  Jonas K Danielsson <jonas.danielsson@spiideo.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	  doc: rist: Update cache for new properties
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5422>
+
+2023-09-29 06:39:22 +0200  Jonas K Danielsson <jonas.danielsson@spiideo.com>
+
+	* gst/rist/gstristsrc.c:
+	  ristsrc: Add support for dynamic payload
+	  This commit ports functionality from the `rtpsrc` to make the `ristsrc`
+	  work with dynamic payload types.
+	  It adds two properties:
+	  - `caps`
+	  - `encoding-name`
+	  These can be used to make the `ristsrc` receive other payload types than
+	  the MPEG TS one.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5422>
 
-2022-10-07 08:30:05 +0200  Wojciech Kapsa <wojciech.kapsa@medvc.eu>
+2023-09-30 22:21:40 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/decklink/gstdecklinkvideosrc.cpp:
-	* sys/decklink/gstdecklinkvideosrc.h:
-	  decklink: reset calculation of gst_decklink_video_src_update_time_mapping on no_signal. When the HDMI cable was disconnected for a long time, the calculation took too much time. SDI cable works fine.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3132>
-
-2022-10-07 07:56:21 -0400  Xavier Claessens <xavier.claessens@collabora.com>
-
-	* ext/dash/meson.build:
-	  Meson: Fix libxml2 fallback
-	  The variable xml2lib_dep does not exist. The correct name is already in
-	  the wrap file.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3136>
+	* gst-libs/gst/d3d11/gstd3d11device-private.h:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* gst-libs/gst/d3d11/gstd3d11shadercache.cpp:
+	* gst-libs/gst/d3d11/gstd3d11shadercache.h:
+	* gst-libs/gst/d3d11/meson.build:
+	* meson_options.txt:
+	* sys/d3d11/gstd3d11compositor.cpp:
+	* sys/d3d11/gstd3d11dxgicapture.cpp:
+	* sys/d3d11/gstd3d11overlaycompositor.cpp:
+	* sys/d3d11/gstd3d11pluginutils.cpp:
+	* sys/d3d11/gstd3d11pluginutils.h:
+	* sys/d3d11/gstd3d11screencapturesrc.cpp:
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	* sys/d3d11/hlsl/gstd3d11-hlsl.h:
+	* sys/d3d11/hlsl/meson.build:
+	* sys/d3d11/hlsl/ps-checker-luma.hlsl:
+	* sys/d3d11/hlsl/ps-checker-rgb.hlsl:
+	* sys/d3d11/hlsl/ps-checker-vuya.hlsl:
+	* sys/d3d11/hlsl/ps-checker.hlsl:
+	* sys/d3d11/hlsl/ps-color.hlsl:
+	* sys/d3d11/hlsl/ps-sample-premul.hlsl:
+	* sys/d3d11/hlsl/ps-sample.hlsl:
+	* sys/d3d11/hlsl/ps-snow.hlsl:
+	* sys/d3d11/hlsl/vs-color.hlsl:
+	* sys/d3d11/hlsl/vs-coord.hlsl:
+	* sys/d3d11/hlsl/vs-pos.hlsl:
+	* sys/d3d11/meson.build:
+	  d3d11: Add support for HLSL precompile and shader caching
+	  Compile HLSL at build time in case of MSVC, and use it if device
+	  supports shader model 5. Also cache/reuse pixel shader and vertex
+	  shader objects.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5426>
 
-2022-09-22 22:39:31 +0900  Sangchul Lee <sc11.lee@samsung.com>
+2023-09-30 20:30:44 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Fix pointer dereference before null check
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3129>
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	  d3d11testsrc: Use const buffer in shader
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5426>
 
-2022-09-26 13:57:15 +0200  Wojciech Kapsa <wojciech.kapsa@medvc.eu>
+2023-09-29 15:47:48 +0300  Sebastian Dröge <sebastian@centricular.com>
 
 	* docs/plugins/gst_plugins_cache.json:
-	* sys/decklink/gstdecklink.cpp:
-	* sys/decklink/gstdecklink.h:
-	* sys/decklink/gstdecklinkaudiosink.cpp:
-	* sys/decklink/gstdecklinkaudiosink.h:
-	* sys/decklink/gstdecklinkaudiosrc.cpp:
-	* sys/decklink/gstdecklinkaudiosrc.h:
-	* sys/decklink/gstdecklinkdeviceprovider.cpp:
-	* sys/decklink/gstdecklinkvideosink.cpp:
-	* sys/decklink/gstdecklinkvideosink.h:
-	* sys/decklink/gstdecklinkvideosrc.cpp:
-	* sys/decklink/gstdecklinkvideosrc.h:
-	  decklink: Add new persistent-id property and sort devices by persistent ID
-	  The order of the devices iterator from the SDK is undefined and can
-	  randomly change.
-	  Keep the device-number property for backwards compatibility and
-	  simplicity but prefer the persistent-id property and also use it for the
-	  device provider implementation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3078>
+	  docs: Update plugins caches
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5412>
 
-2022-10-04 19:19:57 -0300  Thibault Saunier <tsaunier@igalia.com>
+2023-09-27 20:44:45 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst/transcode/gsttranscodebin.c:
-	* gst/transcode/gsttranscodeelement.c:
-	  transcodebin: Implement support for upstream stream selection
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3128>
+	* gst-libs/gst/wayland/gstwlvideoformat.h:
+	  video-format: Fix up video formats ordering by quality
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5412>
 
-2022-10-05 05:38:54 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+2023-09-29 15:07:42 +0200  Jordan Petridis <jordan@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	  d3d11: Fix debug build on UWP
-	  GstDXGIGetDebugInterface() is unused when targeting UWP. We directly
-	  call DXGIGetDebugInterface1() in that case.
-	  Fixes build failure:
-	  ../gst-libs/gst/d3d11/gstd3d11device.cpp(271): error C2440: '=': cannot convert from 'HRESULT (__cdecl *)(UINT,const IID &,void **)' to 'DXGIGetDebugInterface_t'
-	  ../gst-libs/gst/d3d11/gstd3d11device.cpp(271): note: This conversion requires a reinterpret_cast, a C-style cast or function-style cast
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3118>
+	* ext/svtav1/gstsvtav1enc.c:
+	* ext/svtav1/gstsvtav1enc.h:
+	  svtav1enc: Avoid svtav1 defining TRUE/FALSE
+	  Make sure we include the svt headers first and then undefine TRUE
+	  and FALSE so we will only ever be using glib's defines for those.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5424>
+
+2023-09-28 21:32:12 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/nvcodec/gstnvav1dec.cpp:
+	* sys/nvcodec/gstnvdecoder.cpp:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	  nvdecoder: Handle output surface alignment in decoder helper object
+	  Output resolution might not be an even number. Set output resolution
+	  without round up but consider the alignment inside of decoder
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5409>
 
-2022-10-05 15:59:03 +0900  Sangchul Lee <sc11.lee@samsung.com>
+2023-09-28 00:03:08 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  webrtc/nice: Make sure to return NULL when validating turn server fails
-	  It affects 'add-turn-server' signal action and 'turn-server' property
-	  of webrtcbin.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3120>
+	* sys/nvcodec/gstnvav1dec.cpp:
+	* sys/nvcodec/gstnvav1dec.h:
+	* sys/nvcodec/gstnvdecoder.cpp:
+	* sys/nvcodec/gstnvdecoder.h:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/nvcodec/gstnvh264dec.h:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvh265dec.h:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/nvcodec/gstnvvp8dec.h:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.h:
+	* sys/nvcodec/plugin.c:
+	  nvdecoder: Add support for D3D11 output
+	  Since DXVA does not support some profiles such as HEVC RExt,
+	  vendor specific decoding API is still required.
+	  When decoder is negotiated with d3d11 caps, decoder will convert
+	  semi-planar frame to planar since semi-planar format (e.g.,
+	  DXGI_FORMAT_NV12) is not supported by CUDA/D3D11 interop.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5409>
 
-2022-03-21 10:29:21 +0100  Johan Sternerup <johan.sternerup@axis.com>
+2023-09-27 23:02:43 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/webrtc/webrtcdatachannel.c:
-	* gst-libs/gst/webrtc/datachannel.c:
-	* gst-libs/gst/webrtc/datachannel.h:
-	* gst-libs/gst/webrtc/webrtc-priv.h:
-	* gst-libs/gst/webrtc/webrtc_fwd.h:
-	* tests/check/elements/webrtcbin.c:
-	  webrtc: return error when sending on non-open datachannel
-	  According to W3C
-	  specification (https://w3c.github.io/webrtc-pc/#datachannel-send) we
-	  should return InvalidStateError exception when trying to send when the
-	  channel is not open. In the world of C/glib/gstreamer we don't have
-	  exceptions but have to rely on gboolean/GError instead. Introducing
-	  these calls for a change in function signature of the action signals
-	  used to send data on the datachannel. Changing the signature of the
-	  existing "send-string" and "send-data" signals would mean an immediate
-	  breaking change so instead we deprecate them. Furthermore, there is no
-	  way to express GError** as an argument to an action signal in a way
-	  that fits language bindings (pointer-to-pointer simply does not work)
-	  and we have to use regular functions instead.
-	  Therefore we introduce gst_webrtc_data_channel_send_data_full() and
-	  gst_webrtc_data_channel_send_string_full() while deprecating the old
-	  functions and corresponding signals.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1958>
+	* sys/nvcodec/gstnvav1dec.cpp:
+	* sys/nvcodec/gstnvdecoder.cpp:
+	* sys/nvcodec/gstnvdecoder.h:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	  nvdecoder: Handle GstContext in helper object
+	  ... and move common code to helper object
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5409>
+
+2023-09-27 20:50:20 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst-libs/gst/cuda/gstcudautils.cpp:
+	  cuda: Use d3d11 token data for interop data
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5409>
 
-2022-09-23 17:18:35 +0200  Stéphane Cerveau <scerveau@igalia.com>
+2023-09-28 00:11:53 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/codecparsers/gsth265bitwriter.c:
-	* gst-libs/gst/codecparsers/gsth265parser.c:
-	* gst-libs/gst/codecparsers/gsth265parser.h:
-	* sys/nvcodec/gstnvh265dec.c:
-	* sys/va/gstvah265dec.c:
-	* tests/check/libs/h265bitwriter.c:
-	  h265parse: fix typo in member of GstH265SPS
-	  Rename sps_extnsion_params to sps_extension_params
-	  Fix comment about vui_parameters_present_flag
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3072>
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	* sys/nvcodec/gstcudaconverter.c:
+	* sys/nvcodec/gstcudaconvertscale.c:
+	* sys/nvcodec/gstcudaformat.h:
+	  cuda: Add support for I420_12LE format
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5409>
 
-2022-10-04 03:57:31 +0100  Tim-Philipp Müller <tim@centricular.com>
+2023-09-27 15:24:05 +0200  Philippe Normand <philn@igalia.com>
 
-	* meson.build:
-	  Back to development
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3115>
+	* ext/wpe/gstwpevideosrc.cpp:
+	  wpevideosrc: Add a simple example for headless rendering
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5405>
 
-=== release 1.21.1 ===
+2023-09-20 09:53:41 +0200  David Svensson Fors <davidsf@axis.com>
 
-2022-10-04 01:14:01 +0100  Tim-Philipp Müller <tim@centricular.com>
+	* ext/dash/gstdashsink.c:
+	* ext/dash/gstmpdhelper.c:
+	* ext/dash/gstmpdhelper.h:
+	  dashsink: Use gst_codec_utils_caps_get_mime_codec()
+	  Use gst_codec_utils_caps_get_mime_codec() in pbutils for codec
+	  strings. That function gives more elaborate RFC 6381 compatible
+	  strings than the helper functions in gstmdphelper.c, such as
+	  "avc1.F4000D".
+	  Remove the helper functions, as they were only used from dashsink.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5404>
 
-	* ChangeLog:
-	* NEWS:
-	* RELEASE:
-	* gst-plugins-bad.doap:
-	* meson.build:
-	  Release 1.21.1
+2023-09-27 12:33:39 +0200  Philippe Normand <philn@igalia.com>
 
-2022-10-04 01:13:59 +0100  Tim-Philipp Müller <tim@centricular.com>
+	* gst/inter/gstinteraudiosink.c:
+	  interaudiosink: Ensure adapters don't store buffers with audio meta
+	  The interaudiosrc might take buffers of different sizes from the audio adapter,
+	  so keeping metas consistency would be an issue. So the sink now strips the audio
+	  metas away and the src adds them back (for non-interleaved layouts only) when
+	  taking buffers from the adapter.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5324>
 
-	* ChangeLog:
-	  Update ChangeLogs for 1.21.1
+2023-09-13 15:11:32 +0100  Philippe Normand <philn@igalia.com>
 
-2022-09-29 14:34:31 +0300  Sebastian Dröge <sebastian@centricular.com>
+	* gst/inter/gstinteraudiosrc.c:
+	  interaudiosrc: Add audio meta to buffers containing non-interleaved samples
+	  Without this a downstream audioconverter wouldn't be able to map the
+	  GstAudioBuffer prior to conversion.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5324>
 
-	* gst/gaudieffects/gstgaussblur.c:
-	  gaussblur: Fix memory leak when setting caps multiple times
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3091>
+2023-09-27 08:46:35 -0400  Xavier Claessens <xavier.claessens@collabora.com>
 
-2022-09-27 18:17:24 +0100  Christopher Obbard <chris.obbard@collabora.com>
+	* ext/qroverlay/gstqroverlay.c:
+	  GstCustomMeta: Use simplified API where possible
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5385>
 
-	* sys/v4l2codecs/gstv4l2codecdevice.c:
-	  v4l2codecs: Warn user when no media devices are found
-	  Currently if the user is not able to access the devices under /dev/media*,
-	  either due to no media devices present on the system or simply no permission
-	  to access the device, v4l2codecs initialises with no features or debug messages.
-	  Since calling `GST_DEBUG="v4l2*:7" gst-inspect-1.0 v4l2codecs` is a typical way
-	  to diagnose why element(s) failed to enumerate, we should be more verbose here
-	  when the user is not able to access any /dev/media* device. So print a simple
-	  debug message in this case to aid debugging.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3088>
+2023-08-09 00:20:46 +0200  Piotr Brzeziński <piotr@centricular.com>
 
-2022-09-20 23:31:45 +0300  Mart Raudsepp <mart@leio.tech>
+	* sys/applemedia/vtdec.c:
+	* sys/applemedia/vtdec.h:
+	  vtdec: Handle output in separate thread
+	  Moves outputting frames to a task on the source pad, bringing vtdec in line with vtenc.
+	  This brings possible performance improvements thanks to decoupling queueing new frames from outputting processed ones.
+	  The queue length is limited to `2*DBP` to prevent decoding too far ahead compared to what we're pushing downstream.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5163>
 
-	* gst/mpegtsdemux/mpegtsbase.c:
-	  tsdemux: Don't trigger a program change when falling back to ignore-pcr behaviour
-	  Since commit a79a756b79aa1675e we could change to ignore-pcr automatically at 500ms
-	  into a live stream when no PCR is seen by then. However the stream counting in
-	  program change detection was wrongly considering ignore-pcr programs to have a
-	  separate PCR PID, even though we are actually ignoring the PCR PID completely,
-	  resulting in an erroneous program switch getting triggered from the different
-	  stream count. This in turn would send an EOS and switch out the pads for what
-	  actually is still the same program, while we intended to simply apply a
-	  workaround for broken encoders.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3060>
+2023-09-27 01:12:01 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-27 19:46:28 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+	* sys/d3d11/gstd3d11decoder.cpp:
+	  d3d11decoder: Fix crash on negotiate() when decoder is not configured
+	  The negotiate() can be called by GstVideoDecoder baseclass on GAP event,
+	  and decoder helper object might not be configured at the time
+	  when negotiate() is called.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5394>
 
-	* meson.build:
-	  meson: Remove builtin variable datadir from pkgconfig variables
-	  Fixes warning with meson 0.62:
-	  gst-plugins-bad| subprojects/gst-plugins-bad/meson.build:546: WARNING:
-	  Project targets '>= 0.62' but uses feature deprecated since '0.62.0':
-	  pkgconfig.generate variable for builtin directories. They will be
-	  automatically included when referenced
-	  and more.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3086>
-
-2022-09-22 09:14:57 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
-
-	* tests/interactive/pitch-test.c:
-	  bad/soundtouch: Fix interactive test build on MSVC
-	  Needed for https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/930
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3064>
+2023-09-21 22:18:56 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-21 19:19:45 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+	* sys/nvcodec/gstnvdecobject.cpp:
+	* sys/nvcodec/gstnvdecoder.cpp:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	  nvdecoder: Add support for HEVC GBR output
+	  ... and use P012 format for 12bits instead of P016
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2991
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5375>
 
-	* meson.build:
-	  meson: Use implicit builtin dirs in pkgconfig generation
-	  Starting with Meson 0.62, meson automatically populates the variables
-	  list in the pkgconfig file if you reference builtin directories in the
-	  pkgconfig file (whether via a custom pkgconfig variable or elsewhere).
-	  We need this, because ${prefix}/libexec is a hard-coded value which is
-	  incorrect on, for example, Debian.
-	  Bump requirement to 0.62, and remove version compares that retained
-	  support for older Meson versions.
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1245
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3061>
+2023-09-21 18:35:58 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-20 13:38:26 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* sys/nvcodec/gstnvencobject.cpp:
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	  nvh265encoder: Add support for RGB encoding
+	  Adding GBR format support to nv{autogpu,cuda,d3d11}h265enc.
+	  Note that the only difference between GBR and Y444 encoding
+	  is matrix_coeffs value written in VUI.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5375>
 
-	* sys/va/gstvabaseenc.c:
-	  vabaseenc: Move out encoder validation from assertion.
-	  Assertion can be disabled at compilation time. Still it's important to
-	  validate it the encoder object was opened by the subclass. This patch
-	  removes the assertion and returns if the encoder is open.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3051>
+2023-09-21 19:21:18 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-12 09:46:43 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	* sys/nvcodec/gstcudaconverter.c:
+	* sys/nvcodec/gstcudaconvertscale.c:
+	* sys/nvcodec/gstcudaformat.h:
+	  cuda: Add support for P012_LE and Y444/GBR high bitdepth formats
+	  Adding P012, Y444_10, Y444_12, GBR_10, GBR_12 and GBR_16 formats support
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5375>
 
-	* tools/meson.build:
-	  meson: Set install_tag on some targets
-	  Trying to follow recommendation from Meson documentation:
-	  https://mesonbuild.com/Installing.html#installation-tags
-	  Move tools into 'bin' or 'bin-devel' categories to keep only libs and
-	  plugins in the default 'runtime' category. This simplifies distribution
-	  of GStreamer application skipping parts that are not needed, similarly
-	  to what Cerbero does by hardcoding huge list of files.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3017>
+2023-09-21 20:20:35 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-20 16:21:24 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+	* gst-libs/gst/d3d11/gstd3d11-private.h:
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	  d3d11: Add support for GBR_16LE format
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5375>
 
-	* sys/msdk/gstmsdkav1enc.c:
-	  msdkav1enc: We should not set other alignment here
-	  According to spec, we have 32bit alignment for height (progressive) and
-	  16bit alignment for width, so here we don't need to add other alignment
-	  settings.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3050>
+2023-09-21 19:50:31 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-17 17:49:47 +0800  He Junyan <junyan.he@intel.com>
+	* docs/plugins/gst_plugins_cache.json:
+	  video: Add GBR 16bits formats
+	  Adding 16bits planar RGB formats
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5375>
 
-	* sys/va/gstvah264enc.c:
-	  va: h264enc: Fix rate control enum register failure for the second GPU.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3041>
+2023-09-21 20:34:02 +0800  Tong Wu <tong1.wu@intel.com>
 
-2022-09-17 10:14:40 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/gstmsdkvpp.h:
+	  msdkvpp: fix an issue which causes dangling pointer
+	  Put all the external buffer structures into thiz to avoid being freed
+	  early.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5377>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Avoid precision lost by just rounding up.
-	  The code where dividing by 16 and later multiplying by 16, which is
-	  spurious and a potential loose of precision.
+2023-09-20 22:54:06 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-16 14:17:38 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* gst-libs/gst/codecs/gsth265decoder.c:
+	  h265decoder: Set discont state after new_picture()
+	  Subclass might negotiate with downstream inside of the new_picture().
+	  Set discont state after the new_picture() call
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5368>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Update AUD property if driver can't handle raw data.
+2023-08-10 15:47:03 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-2022-09-16 13:55:11 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* gst/mxf/mxfd10.c:
+	  mxfdemux: Check number of channels for AES3 audio
+	  Only up to 8 channels are allowed and using a higher number would cause
+	  integer overflows when copying the data, and lead to out of bound
+	  writes.
+	  Also check that each buffer is at least 4 bytes long to avoid another
+	  overflow.
+	  Fixes ZDI-CAN-21661, CVE-2023-40475
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2897
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5362>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Remove unused dispose method.
+2023-08-10 15:45:01 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-2022-09-16 15:45:11 -0400  Eric Knapp <emkman99@gmail.com>
+	* gst/mxf/mxfup.c:
+	  mxfdemux: Fix integer overflow causing out of bounds writes when handling invalid uncompressed video
+	  Check ahead of time when parsing the track information whether
+	  width, height and bpp are valid and usable without overflows.
+	  Fixes ZDI-CAN-21660, CVE-2023-40474
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2896
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5362>
 
-	* sys/va/gstvadeinterlace.c:
-	  vadeinterlace: Fix passthrough latency query
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3038>
+2023-08-09 12:49:19 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-2022-09-17 05:01:55 +0900  Seungha Yang <seungha@centricular.com>
+	* gst-libs/gst/codecparsers/gsth265parser.c:
+	  h265parser: Fix possible overflow using max_sub_layers_minus1
+	  This fixes a possible overflow that can be triggered by an invalid value of
+	  max_sub_layers_minus1 being set in the bitstream. The bitstream uses 3 bits,
+	  but the allowed range is 0 to 6 only.
+	  Fixes ZDI-CAN-21768, CVE-2023-40476
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2895
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5364>
 
-	* sys/nvcodec/gstnvh265dec.c:
-	  nvh265sldec: Sync up with d3d11h265dec implementation
-	  Each RefPicSetStCurrBefore/RefPicSetStCurrAfter/RefPicSetLtCurr array
-	  might have empty element (i.e., reference pictures might not be stored
-	  sequentially). Don't error out for the empty element case,
-	  but instead, iterates each array and fill NVDEC's reference list
-	  as much as possible
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1441
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3039>
+2023-09-08 00:26:51 +0200  Piotr Brzeziński <piotr@centricular.com>
 
-2022-09-16 12:50:33 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* sys/applemedia/vtenc.c:
+	  vtenc: Fix deadlock after GST_FLOW_ERROR is received on frame push
+	  This was easy to trigger when testing with e.g. vtenc ! vtdec ! glimagesink and closing the sink via window button,
+	  causing GST_FLOW_ERROR to be received by the output loop, stopping it with the queue still full. This made the
+	  enqueue_buffer() callback to lock waiting for space in our queue, while handle_frame() was waiting for the internal
+	  VideoToolbox queue to free up, so that VTCompressionSessionEncodeFrame could finish. As the output loop was not
+	  running, both functions waited forever.
+	  Fixed by 1) immediately emptying our queue when GST_FLOW_ERROR is received (like we already did with _FLUSHING)
+	  and 2) unconditionally setting the flushing flag in finish_encoding() when it sees the output loop stopped because
+	  of GST_FLOW_ERROR, so that enqueue_buffer() will immediately discard any new frames coming out of VideoToolbox.
+	  Both of those make sure we never run into the both-queues-full scenario.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5303>
+
+2023-09-20 01:37:30 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12av1dec.cpp:
+	* sys/d3d12/gstd3d12av1dec.h:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12decoder.h:
+	* sys/d3d12/gstd3d12h264dec.cpp:
+	* sys/d3d12/gstd3d12h264dec.h:
+	* sys/d3d12/gstd3d12h265dec.cpp:
+	* sys/d3d12/gstd3d12h265dec.h:
+	* sys/d3d12/gstd3d12vp9dec.cpp:
+	* sys/d3d12/gstd3d12vp9dec.h:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12decoder: Add support for D3D11 interop
+	  As a short-term solution before full d3d12 rendering feature,
+	  copy decoded d3d12 texture to shared d3d11 texture in order to use
+	  existing various d3d11 implementations such as conversion, resizing,
+	  and videosink.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5356>
 
-	* sys/va/gstvabaseenc.c:
-	* sys/va/gstvabaseenc.h:
-	* sys/va/gstvah264enc.c:
-	  va: baseenc: Fix gobject style for chained method.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3035>
+2023-09-20 01:13:15 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-13 23:20:54 +0900  Seungha Yang <seungha@centricular.com>
+	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
+	  d3d11memory: Allow CreateSharedHandle() without keyed mutex
+	  For d3d11 resource to be shared with d3d12, keyed mutex shouldn't
+	  be enabled since d3d12 resource does not expose the keyed mutex
+	  interface
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5356>
+
+2023-09-20 00:09:04 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12av1dec.cpp:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12decoder.h:
+	* sys/d3d12/gstd3d12h264dec.cpp:
+	* sys/d3d12/gstd3d12h265dec.cpp:
+	* sys/d3d12/gstd3d12utils.h:
+	* sys/d3d12/gstd3d12vp9dec.cpp:
+	  d3d12decoder: Move common part to helper object
+	  Store device at helper object
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5356>
+
+2023-09-19 18:57:53 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12fence.cpp:
+	  d3d12fence: Check completed value before waiting
+	  If currently completed fence value is larger than target value,
+	  skip waiting.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5356>
 
-	* gst/codectimestamper/gsth264timestamper.c:
-	* gst/codectimestamper/gsth265timestamper.c:
-	  codectimestamper: Update document
-	  Add more description about those elements
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3021>
+2023-09-11 18:12:28 +0200  Hugues Fruchet <hugues.fruchet@foss.st.com>
 
-2022-06-09 22:32:16 +0800  He Junyan <junyan.he@intel.com>
+	* gst-libs/gst/wayland/gstwlwindow.c:
+	  waylandsink: Fix cropping for video with non-square aspect ratio
+	  Padding of unaligned content is still visible at right with some aspect-ratio.
+	  Fix this by giving the original content resolution to wp_viewport_set_source()
+	  instead of pixel aspect ratio scaled one.
+	  Fixes !5259
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5346>
 
-	* sys/va/gstvaav1dec.c:
-	  va: av1dec: user internal buffer pool for non output layers.
-	  The AV1 support multi spatial layers within one TU with different
-	  resolutions, and only the highest spatial layer need to be output.
-	  For example, there are two spatial layer, base level is 800x600
-	  and higher level is 1920x1080. We need to decode both because the
-	  higher level needs base layer as reference, but we only need to output
-	  1920x1080 frames here.
-	  The current manner always renegotiates the caps once we detect the
-	  current picture resolution changes, so we renegotiate again and
-	  again between different layers. That's a big waste and has very
-	  low performance. We now only do the renegotiation for the highest
-	  output layer. For other non output layers, we just keep a internal
-	  buffer pool which is big enough to handle the surface allocation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2382>
+2023-06-14 11:24:49 +0200  Hugues Fruchet <hugues.fruchet@foss.st.com>
 
-2022-05-12 10:12:37 +0800  He Junyan <junyan.he@intel.com>
+	* ext/gtk/gstgtkwaylandsink.c:
+	  gtkwaylandsink: do not use drm dumb pool when importing DMAbuf buffers
+	  There is no need to use DRM dumb pool if buffer to
+	  render is already a DMABuf, just import it and render it.
+	  This fixes a DMAbuf memory leakage when waylandsink downstream
+	  element exports DMABuf while waylandsink is configured to be
+	  DMABuf exporter (drm-device=/drv/dri/card0):
+	  gst-launch-1.0 v4l2src io-mode=4 ! gtkwaylandsink drm-device=/dev/dri/card0
+	  leakage identfied with command:
+	  watch "cat /sys/kernel/debug/dma_buf/bufinfo | grep attached "
+	  Fixes #2729
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5350>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	* gst-libs/gst/codecs/gstav1decoder.h:
-	  codecs: av1decoder: Add the highest_spatial_layer field.
-	  As SPEC says, when multi spatial layer exists, we should only output
-	  one frame with the highest spatial id from each TU. We now store the
-	  highest spatial layer information in the base class in order to let
-	  the sub class handle different layers easily.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2382>
+2023-06-14 16:19:49 +0200  Hugues Fruchet <hugues.fruchet@foss.st.com>
 
-2022-09-15 00:52:14 +0000  Devin Anderson <danderson@microsoft.com>
+	* ext/wayland/gstwaylandsink.c:
+	  waylandsink: do not use drm dumb pool when importing DMAbuf buffers
+	  There is no need to use DRM dumb pool if buffer to
+	  render is already a DMABuf, just import it and render it.
+	  This fixes a DMAbuf memory leakage when waylandsink downstream
+	  element exports DMABuf while waylandsink is configured to be
+	  DMABuf exporter (drm-device=/drv/dri/card0):
+	  gst-launch-1.0 v4l2src io-mode=4 ! waylandsink drm-device=/dev/dri/card0
+	  leakage identfied with command:
+	  watch "cat /sys/kernel/debug/dma_buf/bufinfo | grep attached "
+	  Fixes #2729
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5350>
 
-	* ext/voamrwbenc/gstvoamrwbenc.c:
-	* tests/check/elements/voamrwbenc.c:
-	* tests/check/meson.build:
-	  voamrwbenc: Fix truncation of audio data at end-of-stream when audio data doesn't align on 20 millisecond frame size.
-	  The AMR-WB codec imposes a fixed 20 millisecond frame size.  In its current
-	  form, the `voamrwbenc` plugin deals with this limitation by discarding any
-	  audio at the end of the stream that falls short of 20 milliseconds.  This patch
-	  keeps the audio data, and appends silence to the end to preserve frame size
-	  alignment.
-	  The patch also adds tests to check for the updated behavior.  I noticed that
-	  tests weren't being built, so I changed the build to allow for building the
-	  tests when the `tests` and `voamrwbenc` options are set.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3027>
+2023-09-19 21:40:22 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-15 21:56:27 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/d3d11/gstd3d11pluginutils.cpp:
+	* sys/d3d11/gstd3d11pluginutils.h:
+	* sys/d3d11/gstd3d11vp9dec.cpp:
+	  d3d11vp9dec: Fix critical warning
+	  Don't query GPU vendor using null device.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5353>
+
+2023-09-18 23:38:03 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12av1dec.cpp:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12decoder.h:
+	* sys/d3d12/gstd3d12h264dec.cpp:
+	* sys/d3d12/gstd3d12h265dec.cpp:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	* sys/d3d12/gstd3d12vp9dec.cpp:
+	  d3d12decoder: Add support for d3d12 output
+	  ... and enable zero-copy decoding if downstream supports d3d12 memory
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5345>
+
+2023-09-18 21:00:42 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Use GstD3D12BufferPool
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5345>
+
+2023-09-18 20:27:27 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	  d3d12decoder: Use global copy queue and fence value
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5345>
+
+2023-09-18 22:56:31 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Remove unused debug category
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5345>
+
+2023-09-18 18:54:07 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12basefilter.cpp:
+	* sys/d3d12/gstd3d12basefilter.h:
+	* sys/d3d12/gstd3d12download.cpp:
+	* sys/d3d12/gstd3d12download.h:
+	* sys/d3d12/gstd3d12format.h:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add d3d12download element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5345>
+
+2023-09-18 01:31:41 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12_fwd.h:
+	* sys/d3d12/gstd3d12bufferpool.cpp:
+	* sys/d3d12/gstd3d12bufferpool.h:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	* sys/d3d12/meson.build:
+	  d3d12: Add GstD3D12BufferPool
+	  Adding d3d12 specific bufferpool impl.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5345>
+
+2023-09-18 00:44:10 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12_fwd.h:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/gstd3d12device.h:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	* sys/d3d12/gstd3d12utils.h:
+	  d3d12memory: Add GstD3D12AllocationParams struct
+	  Will be used for buffer pool configuration. And update C++ helper
+	  to reduce the number of required arguments
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5345>
+
+2023-09-17 23:53:18 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/gstd3d12device.h:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	  d3d12memory: Make d3d12memory CPU accessible
+	  Add support for gst_memory_{map,unmap} without GST_MAP_D3D12 flag
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5345>
+
+2023-09-18 21:27:19 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/meson.build:
+	  d3d12: Fix d3d12sdklayer setup and d3d12device debug category
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5345>
 
-	* gst/codectimestamper/gstcodectimestamper.c:
-	  codectimestamper: Fix for unknown framerate
-	  Use default framerate if numerator or denominator is unknown
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3031>
+2023-09-09 15:12:39 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2022-08-26 08:43:34 -0400  Thibault Saunier <tsaunier@igalia.com>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  vaallocator: don't update size in info for single plane images
+	  Don't update info's size with the VA image reported data size for single plane
+	  images, since drivers might allocate bigger space than the strictly required to
+	  store the image, but when we dump the buffer as is (using filesink, for example)
+	  the produced stream is corrupted. For multi-plane images video meta is required
+	  to read/write them.
+	  We updated info's size because gstreamer-vaapi did it too, but the reason to
+	  update it there was for uploading and rendering surfaces (commit c698a015).
+	  Furthermore, this patch adds an error message if the allocated data size for the
+	  image by the driver is lesser than the expected because it would be a buggy
+	  driver.
+	  Fixes: #2959
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5308>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/qsv/plugin.cpp:
-	  Build documentation for rust plugins
-	  - Update the docker image we use, starting using the standard one adding
-	  `gtk4-doc` as required by rust plugins
-	  - Update the plugins_doc_caches as required, some more plugins are built
-	  with the new image
-	  - Install ninja from pip as the version from F31 is too old
-	  - Avoid buildings all GSreamer plugins when building the doc as it takes
-	  time and resources for no good reason
-	  - Stop linking to `GInstanceInitFunc` as it is not present in latest GLib
-	  documentation, leading to warnings in hotdoc.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2954>
+2023-09-14 20:17:06 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2022-08-29 10:17:45 -0400  Thibault Saunier <tsaunier@igalia.com>
+	* sys/msdk/meson.build:
+	  msdk: meson: don't warn deprecated symbols
+	  Since it's impossible to not to use any because any possible version mismatch
+	  between the header and the runtime, such in the case of the denoise structure.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5283>
 
-	* docs/meson.build:
-	  doc: Do not build plugins to build the doc
-	  It is not actually necessary
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2954>
+2023-09-14 20:14:21 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-2022-09-15 12:14:56 +0100  Tim-Philipp Müller <tim@centricular.com>
+	* sys/msdk/gstmsdkdec.c:
+	  msdkdec: fix method declaration signature
+	  Thus silencing a compilation warning.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5283>
+
+2023-09-15 23:55:14 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12av1dec.cpp:
+	* sys/d3d12/gstd3d12av1dec.h:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add AV1 decoder
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4161>
+
+2023-09-15 23:53:24 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12vp9dec.cpp:
+	* sys/d3d12/gstd3d12vp9dec.h:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add VP9 decoder
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4161>
+
+2023-09-15 23:52:34 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12h265dec.cpp:
+	* sys/d3d12/gstd3d12h265dec.h:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	  d3d12: Add H.265 decoder
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4161>
 
-	* tests/check/meson.build:
-	  tests: add a few more orc tests
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3029>
+2023-09-10 23:34:26 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-14 00:58:37 +0900  Seungha Yang <seungha@centricular.com>
+	* meson_options.txt:
+	* sys/d3d12/gstd3d12_fwd.h:
+	* sys/d3d12/gstd3d12decoder.cpp:
+	* sys/d3d12/gstd3d12decoder.h:
+	* sys/d3d12/gstd3d12device.cpp:
+	* sys/d3d12/gstd3d12device.h:
+	* sys/d3d12/gstd3d12fence.cpp:
+	* sys/d3d12/gstd3d12fence.h:
+	* sys/d3d12/gstd3d12format.cpp:
+	* sys/d3d12/gstd3d12format.h:
+	* sys/d3d12/gstd3d12h264dec.cpp:
+	* sys/d3d12/gstd3d12h264dec.h:
+	* sys/d3d12/gstd3d12memory.cpp:
+	* sys/d3d12/gstd3d12memory.h:
+	* sys/d3d12/gstd3d12utils.cpp:
+	* sys/d3d12/gstd3d12utils.h:
+	* sys/d3d12/meson.build:
+	* sys/d3d12/plugin.cpp:
+	* sys/meson.build:
+	  d3d12: Add H.264 decoder
+	  Adding Direct3D12 h264 decoder
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4161>
 
-	* sys/nvcodec/gstnvdec.c:
-	  nvdec: Fix for HEVC decoding when coded resolution is larger than display resolution
-	  As documented in the SDK header, we should set coded width/height
-	  values to the corresponding decoder configuration option,
-	  instead of display resolution
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1438
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3022>
+2023-09-16 23:57:18 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-13 04:06:02 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/d3d11/gstd3d11av1dec.cpp:
+	* sys/d3d11/gstd3d11av1dec.h:
+	* sys/d3d11/gstd3d11decoder.cpp:
+	* sys/d3d11/gstd3d11decoder.h:
+	* sys/d3d11/gstd3d11h264dec.cpp:
+	* sys/d3d11/gstd3d11h264dec.h:
+	* sys/d3d11/gstd3d11h265dec.cpp:
+	* sys/d3d11/gstd3d11h265dec.h:
+	* sys/d3d11/gstd3d11mpeg2dec.cpp:
+	* sys/d3d11/gstd3d11mpeg2dec.h:
+	* sys/d3d11/gstd3d11vp8dec.cpp:
+	* sys/d3d11/gstd3d11vp8dec.h:
+	* sys/d3d11/gstd3d11vp9dec.cpp:
+	* sys/d3d11/gstd3d11vp9dec.h:
+	* sys/d3d11/meson.build:
+	  d3d11decoder: Port to GstDxva
+	  Use new DXVA baseclass
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4161>
+
+2021-11-28 19:29:23 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst-libs/gst/dxva/dxva-prelude.h:
+	* gst-libs/gst/dxva/gstdxva.h:
+	* gst-libs/gst/dxva/gstdxvaav1.h:
+	* gst-libs/gst/dxva/gstdxvaav1decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvaav1decoder.h:
+	* gst-libs/gst/dxva/gstdxvah264decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvah264decoder.h:
+	* gst-libs/gst/dxva/gstdxvah265decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvah265decoder.h:
+	* gst-libs/gst/dxva/gstdxvampeg2decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvampeg2decoder.h:
+	* gst-libs/gst/dxva/gstdxvatypes.h:
+	* gst-libs/gst/dxva/gstdxvautils.cpp:
+	* gst-libs/gst/dxva/gstdxvautils.h:
+	* gst-libs/gst/dxva/gstdxvavp8decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvavp8decoder.h:
+	* gst-libs/gst/dxva/gstdxvavp9decoder.cpp:
+	* gst-libs/gst/dxva/gstdxvavp9decoder.h:
+	* gst-libs/gst/dxva/meson.build:
+	* gst-libs/gst/meson.build:
+	  dxva: Add DXVA decoder baseclass implementation
+	  Extract Direct3D version independent common DXVA logic from d3d11
+	  decoder so that it can be used by the other APIs (D3D9 and D3D12)
+	  as well
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4161>
 
-	* sys/nvcodec/gstcudamemorycopy.c:
-	  cudaupload,cudadownload: Fix document
-	  * Fix typo, NVIDA -> NVIDIA
-	  * Add cudadownload doc to the source file
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3018>
+2023-09-14 01:18:59 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-13 01:02:55 +0900  Seungha Yang <seungha@centricular.com>
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	* gst-libs/gst/codecs/gsth264picture.h:
+	  h264decoder: Update latency dynamically
+	  The actual number of reorder frames is unknown
+	  unless frame reordering is disabled
+	  (e.g., POC type 2 or constrained-* profiles).
+	  Also derived maximum DPB size or max_num_reorder_frames in VUI
+	  is not the upper bound of output delay.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2702
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5326>
 
-	* sys/nvcodec/gstcudamemorycopy.c:
-	  cudaupload,cudadownload: Use shared GstD3D11Device context if possible
-	  Handle d3d11 device context in set_context() method with
-	  additional device compatibility check so that only NVIDIA GPU
-	  associated d3d11 device can be configured in the element.
-	  And clear old d3d11 device per set_info() for d3d11 device to be
-	  updated as well.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3018>
+2023-09-16 23:26:27 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-09-13 01:02:50 +0900  Seungha Yang <seungha@centricular.com>
+	* sys/nvcodec/gstnvdecobject.cpp:
+	* sys/nvcodec/gstnvdecobject.h:
+	* sys/nvcodec/gstnvdecoder.cpp:
+	  nvdecoder: Copy output frame if needed
+	  Even if decoder is negotiated with CUDA memory feature, if downstream
+	  proposed no buffer pool, assume that the pool size is unknown.
+	  And disable zero-copy if there's no more free output surface.
+	  Or, in case of reverse playback, always copy frames.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5338>
+
+2023-09-16 22:59:54 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/nvcodec/gstnvh265dec.cpp:
+	  nvh265dec: Reconfigure decoder on max-dpb-size change
+	  Decoder should create new picture pool for larger DPB size
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5338>
 
-	* gst-libs/gst/cuda/cuda-gst.h:
-	* gst-libs/gst/cuda/gstcudacontext.c:
-	* gst-libs/gst/cuda/gstcudaloader.c:
-	* gst-libs/gst/cuda/gstcudautils.c:
-	* gst-libs/gst/cuda/gstcudautils.h:
-	* gst-libs/gst/cuda/meson.build:
-	* gst-libs/gst/cuda/stub/cuda.h:
-	* gst-libs/gst/cuda/stub/cudaD3D11.h:
-	  cuda: Remove GST_CUDA_HAS_D3D define from header
-	  ... and fix d3d11 specific enum type name
-	  GST_CUDA_HAS_D3D is a build time define which indicates whether
-	  GstD3D11 library is available or not, but DirectX SDK headers
-	  must be available on the build system already.
-	  Expose Direct3D related symbols if the build target is Windows
-	  (i.e., if G_OS_WIN32 is defined)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3018>
+2023-09-16 22:49:30 +0900  Seungha Yang <seungha@centricular.com>
 
-2021-03-24 14:20:18 -0500  Zebediah Figura <z.figura12@gmail.com>
+	* sys/d3d11/gstd3d11h265dec.cpp:
+	  d3d11h265dec: Reconfigure decoder on max-dpb-size change
+	  Decoder should create new picture pool for larger DPB size
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5338>
 
-	* meson.build:
-	  meson: Build with -Wl,-z,nodelete to prevent unloading of dynamic libraries and plugins
-	  GLib made the unfortunate decision to prevent libgobject from ever being
-	  unloaded, which means that now any library which registers a static type
-	  can't ever be unloaded either (and any library that depends on those,
-	  ad nauseam).
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/778>
-
-2022-06-06 10:56:12 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
-
-	* docs/plugins/gst_plugins_cache.json:
-	  va: Remove from plugin cache.
-	  GstVA is not currently build by CI, because libva version is lower
-	  than expected. So, the gstva library is not build, thus some symbols
-	  aren't documented, breaking the documentation CI.
-	  To move things forward, let's just remove temporarly the va plugins
-	  from cache. While we decide on how to update the libva package in
-	  the CI.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1025>
+2023-09-16 03:13:33 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-06-27 18:56:01 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* gst-libs/gst/codecparsers/gstav1parser.c:
+	  av1parser: Fix segmentation params update
+	  Even if the segmentation feature value is not updated,
+	  the parsed "segmentation_update_map" and "segmentation_temporal_update"
+	  values should not be cleared as it's referenced during lower
+	  level bitstream parsing. Also, don't use assert() in parser
+	  unless it's clearly impossible condition.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5334>
 
-	* gst-libs/gst/va/gstvaallocator.h:
-	  va: allocator: Fix parameter name to match signature.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1025>
+2023-09-15 19:54:59 +0900  Seungha Yang <seungha@centricular.com>
 
-2022-02-07 17:34:57 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* gst-libs/gst/codecs/gsth265decoder.c:
+	  h265decoder: Fix DPB overflow
+	  If DPB is full already, GstH265Decoder::new_picture() might fail if
+	  subclass uses fixed size picture pool and its size is equal to the DPB
+	  size. Call the new_picture() after DPB is cleared in gst_h265_decoder_dpb_init()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5333>
 
-	* docs/libs/va/index.md:
-	* docs/libs/va/sitemap.txt:
-	* gst-libs/gst/va/gstva.h:
-	* gst-libs/gst/va/gstvaallocator.c:
-	* gst-libs/gst/va/gstvaallocator.h:
-	* gst-libs/gst/va/gstvadisplay.c:
-	* gst-libs/gst/va/gstvapool.c:
-	* gst-libs/gst/va/gstvasurfacecopy.h:
-	* gst-libs/gst/va/gstvautils.c:
-	* gst-libs/gst/va/gstvavideoformat.c:
-	* gst-libs/gst/va/meson.build:
-	* sys/va/gstjpegdecoder.c:
-	* sys/va/gstjpegdecoder.h:
-	* sys/va/gstvabasetransform.c:
-	* sys/va/gstvacompositor.c:
-	* sys/va/gstvafilter.c:
-	* sys/va/gstvah264enc.c:
-	  va: Complete library and plugin documentation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1025>
+2023-09-15 11:06:52 +1000  Matthew Waters <matthew@centricular.com>
 
-2022-09-13 14:46:37 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* sys/androidmedia/gstamcvideoenc.c:
+	  androidmedia/enc: handle codec-data before popping GstVideoCodecFrames
+	  Issue is that when amc was producing a codec-data buffer, a
+	  GstVideoCodecFrame was being popped off the internal queue.  This meant
+	  that the codec-data was being associated with the first input frame and
+	  the second (first encoded buffer) output buffer with the second input
+	  frame.  At the end (assuming one input produces one output which seems
+	  to hold in my testing and how the encoder is currently implemented)
+	  there would be an input frame missing and would be pushed without any
+	  timing information.  This would lead to e.g. muxers rejecting the buffer
+	  without PTS and failing to mux.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5330>
 
-	* gst-libs/gst/va/gstva.h:
-	* gst-libs/gst/va/meson.build:
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvacaps.c:
-	* sys/va/gstvadecoder.c:
-	* sys/va/gstvadisplay_priv.c:
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvafilter.c:
-	* sys/va/gstvah264enc.c:
-	* sys/va/gstvajpegdec.c:
-	  va: Move gstvavideoformat out of library headers.
-	  Since it's no needed for API consumers. Though it can be added later.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1025>
+2023-09-15 11:06:07 +1000  Matthew Waters <matthew@centricular.com>
 
-2021-10-03 10:17:00 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+	* sys/androidmedia/gstamc-constants.h:
+	* sys/androidmedia/gstamcvideoenc.c:
+	  androidmedia/enc: add fixme log about partial frames
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5330>
 
-	* docs/meson.build:
-	* gst-libs/gst/va/meson.build:
-	  docs: Generate libgstva GI and pkg-config.
-	  Currently libgstva is only exposed internally to gst-plugins-bad. No
-	  headers are installed, no documentation generated, pkgconfig file,
-	  neither gobject-introspection files.
-	  This patch turn on all that.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1025>
+2023-07-20 15:46:32 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/msdk-enums.c:
+	  msdkvpp: Add compute scaling mode
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5128>
 
-2022-05-19 00:44:40 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-11 15:20:30 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
 	* docs/plugins/gst_plugins_cache.json:
-	* gst/codectimestamper/gstcodectimestamper.c:
-	* gst/codectimestamper/gstcodectimestamper.h:
-	* gst/codectimestamper/gsth264timestamper.c:
-	* gst/codectimestamper/gsth264timestamper.h:
-	* gst/codectimestamper/gsth265timestamper.c:
-	* gst/codectimestamper/gsth265timestamper.h:
-	* gst/codectimestamper/meson.build:
-	* gst/codectimestamper/plugin.c:
-	* gst/meson.build:
-	* meson_options.txt:
-	  Add H.264/H.265 timestamp correction element
-	  Adding {h264,h265}timestamper element to correct timestamp of
-	  encoded frames. This initial version supports only DTS
-	  correction based on given PTS and SPS data.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2580>
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/gstmsdkvpp.h:
+	  msdkvpp: Enable HDR-to-SDR tone mapping
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5277>
 
-2022-09-07 11:22:45 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-08-11 11:52:19 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* gst/debugutils/gsttestsrcbin.c:
-	* tests/validate/meson.build:
-	* tests/validate/testsrcbin/caps_spec.validatetest:
-	* tests/validate/testsrcbin/caps_spec/flow-expectations/log-testsrcbin0-video_src_0-expected:
-	  testsrcbin: Add a way to specify caps for the output of the sources
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3007>
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/gstmsdkvpp.h:
+	* sys/msdk/msdk.h:
+	  msdkvpp: Set color properties for input and output
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5277>
 
-2022-09-08 17:29:37 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-09-12 13:05:43 +1000  Matthew Waters <matthew@centricular.com>
 
-	* gst/debugutils/gsttestsrcbin.c:
-	  testsrcbin: Plug some leaks
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3007>
+	* ext/vulkan/vkcolorconvert.c:
+	  vulkancolorconvert: actually support passthrough correctly
+	  e.g. passthrough of YUV (or RGB) formats should not modify any buffers.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5317>
 
-2020-11-19 18:34:00 -0300  Thibault Saunier <tsaunier@igalia.com>
+2023-07-18 10:00:19 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* gst/debugutils/gsttestsrcbin.c:
-	  testsrcbin: Add an 'expose-sources-async' property
-	  Which allows simluating usual source which require decoding etc in decodebin for example
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3007>
+	* sys/msdk/gstmsdkh265enc.c:
+	* sys/msdk/gstmsdkh265enc.h:
+	  msdkh265enc: Use vpl APIs to handle HDR SEIs
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5135>
 
-2022-09-05 18:32:20 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-09-05 14:15:04 +0200  Thomas Schneider <thomas.schneider@voliro.ch>
 
-	* sys/va/gstvajpegdec.c:
-	  vajpegdec: Enhance explanation comment.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2948>
+	* sys/androidmedia/gstamc.c:
+	  androidmedia: fix hevc codec profile registration
+	  Fix the codec registration logic such that all supported
+	  profiles are available instead of just the first in the
+	  list.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5282>
 
-2022-09-06 14:53:41 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-09-06 17:01:09 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/va/gstvacaps.c:
-	  va: caps: Use G_STMT_START / END
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2948>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/rtmp2/gstrtmp2locationhandler.c:
+	  rtmp2: Set default flash version to NULL
+	  This is consistent with the librtmp-based old rtmp plugin and ffmpeg.
+	  While some servers require a valid flash-version, others are failing
+	  with a too long or any flash-version at all.
+	  By changing to the same default as in the old plugin and in ffmpeg,
+	  GStreamer will at least behave the same and will work and fail with the
+	  same servers without setting a flash-version.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5293>
 
-2022-09-05 16:59:12 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-09-10 19:13:28 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* sys/va/gstvajpegdec.c:
-	  vajpegdec: Check if driver has internal color conversion.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2948>
+	* docs/plugins/gst_plugins_cache.json:
+	  doc: Update cache after template pixel formats changes
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5304>
 
-2022-09-06 18:49:02 +0200  Mathieu Duponchelle <mathieu@centricular.com>
+2023-09-08 15:03:51 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: fix picking available payload types
-	  When picking an available payload type, we need to pick one that is
-	  available across all media.
-	  The previous code, when multiple media were present, looked at the first one,
-	  noticed it had pt 96 as the media pt, then simply looked at the next media,
-	  noticed it didn't, and decided 96 was available.
-	  Instead, check if the pt is used by any of the media, if it is, decide
-	  it is not available and go to the next pt. I'm fairly sure that was the
-	  original intent.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2984>
-
-2022-08-03 19:36:11 +0300  Jordan Petridis <jordan@centricular.com>
-
-	* ext/fluidsynth/gstfluiddec.c:
-	  fluidsynth: correctly version guard methods
-	  We bumped the minimum version to 2.1 but the api we used
-	  wasn't introduced till version 2.2 of fluidsynth
-	  Follow-up to gstreamer/gstreamer!2718
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2718
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2835>
+	* gst-libs/gst/wayland/gstwlvideoformat.h:
+	  wayland: Use generated formats list
+	  Update the order according to what the generator produces.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5304>
+
+2023-09-08 17:54:25 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	  vkbufferimagepool: short circuit usage for decoding
+	  NVIDIA & RADV drivers don't report decoding features for color format. Setting
+	  requested usage to zero to short circuit validation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5288>
 
-2022-08-21 03:37:40 +1000  Jan Schmidt <jan@centricular.com>
+2023-09-06 13:13:27 +1000  Matthew Waters <matthew@centricular.com>
 
-	* ext/dash/gstdashdemux.c:
-	* ext/dash/gstdashdemux.h:
-	* ext/dash/gstmpdclient.c:
-	* ext/dash/gstmpdclient.h:
-	  dashdemux: Preserve current representation on live manifest updates
-	  When updating a manifest during live playback, preserve the current
-	  representation for each stream.
-	  During update_fragment_info, if the current representation changed
-	  because it couldn't be matched, trigger a caps change and new
-	  header download.
-	  This reverts commit e0e1db212fd0df2239583b9099fc4361adeded05
-	  and reapplies "dashdemux: Fix issue when manifest update sets slow start
-	  without passing necessary header & caps changes downstream" with
-	  changes.
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/507
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1729
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2920>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vkformat: assume that unknown rgb transfer is sRGB
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5288>
 
-2022-09-02 09:55:20 +0000  Florian Zwoch <fzwoch@gmail.com>
+2023-09-06 12:46:32 +1000  Matthew Waters <matthew@centricular.com>
 
-	* sys/va/plugin.c:
-	  va: Fix log message when registering H264 encoder.
-	  The log message would report an error for the H264 decoder when
-	  registering failed, but we tried to register the H264 encoder instead.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2974>
+	* ext/vulkan/vkupload.c:
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	* gst-libs/gst/vulkan/gstvkformat.h:
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	* tests/check/libs/vkformat.c:
+	  vkformat: also check configured usage flags
+	  This does also mean that if the primary format fails this check, we need
+	  to try the secondary format before returning an error
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2957
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5288>
 
-2022-07-05 17:14:37 -0400  Olivier Crête <olivier.crete@collabora.com>
+2023-09-06 12:41:29 +1000  Matthew Waters <matthew@centricular.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: Allow locked mlines with no caps, as the last ones
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2439>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	* tests/check/libs/vkformat.c:
+	  vkformat: invert srgb and multiplane && planes > 1 checks
+	  The primary format for RGB includes sRGB transfer but was not actually
+	  being used.
+	  The !(no_multiplane && planes > 1) check for YUV resulted in those
+	  formats never being used.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5288>
 
-2022-05-16 18:05:25 -0400  Olivier Crête <olivier.crete@collabora.com>
+2023-09-06 12:29:05 +1000  Matthew Waters <matthew@centricular.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: Reject creating an offer if a locked mline has no caps
-	  This avoids getting in a bunch of corner cases. We'd have to insert
-	  a "rejected" line from the start as a place-holder to get around this,
-	  but the rest of the code just becomes more complicated, so just
-	  disallow it for now.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2439>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vkformat: FORMAT_FEATURE_COLOR_ATTACHMENT also includes INPUT_ATTACHMENT
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5288>
 
-2022-05-16 17:17:13 -0400  Olivier Crête <olivier.crete@collabora.com>
+2023-09-06 12:23:57 +1000  Matthew Waters <matthew@centricular.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/webrtctransceiver.c:
-	* ext/webrtc/webrtctransceiver.h:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: Store pending mid to make create-offer idempotent
-	  If the mid is not stored in the transceiver, but it is stored in
-	  last_offer, then a further create-offer call will just ignore that
-	  transceiver.
-	  Also include unit test for ensure it doesn't regress.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2439>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vkformat: reorder RGBA formats before RGBx formats
+	  Fixes gst_vulkan_format_to_video_format to use the RGBA formats instead
+	  of RGBx formats.
+	  Fixes vulkansink exposing a RGBx/BGRx format instead of the more
+	  relevant RGBA/BGRA formats
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5288>
 
-2022-05-26 18:17:16 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-09-05 23:36:47 +0200  Aleksandr Slobodeniuk <aslobodeniuk@fluendo.com>
 
-	* sys/msdk/gstmsdkvpp.c:
-	* sys/msdk/gstmsdkvpp.h:
-	  msdkvpp: Add va memory when fixating src caps
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2498>
+	* gst-libs/gst/codecparsers/gsth264parser.c:
+	* gst-libs/gst/codecparsers/gsth265parser.c:
+	  h264/h265parser: clarify some gtk-doc annotations
+	  Needed for the documentation since the transfer
+	  is not obvious.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5287>
 
-2022-06-08 12:31:56 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-09-07 20:06:02 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkvpp.c:
-	* sys/msdk/gstmsdkvpp.h:
-	  msdkvpp : Use va pool at linux path and system pool for windows
-	  We use msdkvpp's own pool to allocate buffers instead of external frame
-	  allocator mfxFrameAllocator.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2498>
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gsth265parse.c:
+	  h264parse, h265parse: Fix potential integer overflow
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2961
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5295>
 
-2022-05-09 18:34:38 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-09-06 01:00:42 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkallocator.h:
-	* sys/msdk/gstmsdkallocator_libva.c:
-	* sys/msdk/gstmsdkvpp.c:
-	  msdkvpp: Import buffer to msdk_surface
-	  If the buffer is not msdk_buffer, we can try to directly import the
-	  attached memory (i.e. va mem and dmabuf mem) by applying the common
-	  uitl function: import_to_msdk_function ().
-	  Here add a flag "from_qdata" in GstMsdkSurface to handle the cropping case,
-	  we should avoid updating the crop values when msdk_surface is from the
-	  memory's qdata, because the crop info from this surface is the already
-	  updated one.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2498>
+	* sys/nvcodec/gstnvav1dec.cpp:
+	* sys/nvcodec/gstnvdecoder.cpp:
+	* sys/nvcodec/gstnvdecoder.h:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	  nvdecoder: Move common logic to decoder helper object
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5285>
 
-2022-05-09 18:19:01 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-09-05 23:06:19 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkvpp.c:
-	  msdkvpp: Add va caps at sink and src pad
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2498>
+	* sys/d3d11/gstd3d11av1dec.cpp:
+	* sys/d3d11/gstd3d11decoder.cpp:
+	* sys/d3d11/gstd3d11decoder.h:
+	* sys/d3d11/gstd3d11h264dec.cpp:
+	* sys/d3d11/gstd3d11h265dec.cpp:
+	* sys/d3d11/gstd3d11mpeg2dec.cpp:
+	* sys/d3d11/gstd3d11vp8dec.cpp:
+	* sys/d3d11/gstd3d11vp9dec.cpp:
+	  d3d11decoder: Move common logic to decoder helper object
+	  We can remove duplicated code by using the GstCodecPicture struct
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5285>
 
-2022-08-25 17:28:36 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-09-05 22:21:45 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkenc.c:
-	  msdkenc: Apply common util func to import mem as msdk_surface
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2498>
+	* gst-libs/gst/codecs/gstav1decoder.c:
+	* gst-libs/gst/codecs/gstav1decoder.h:
+	* gst-libs/gst/codecs/gstav1picture.c:
+	* gst-libs/gst/codecs/gstav1picture.h:
+	* sys/d3d11/gstd3d11av1dec.cpp:
+	* sys/nvcodec/gstnvav1dec.cpp:
+	* sys/v4l2codecs/gstv4l2codecav1dec.c:
+	* sys/va/gstvaav1dec.c:
+	  av1decoder: Port to GstCodecPicture struct
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5285>
 
-2022-05-27 17:56:33 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-09-05 22:14:42 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkallocator.c:
-	* sys/msdk/gstmsdkallocator.h:
-	* sys/msdk/gstmsdkallocator_libva.c:
-	* sys/msdk/gstmsdkallocator_libva.h:
-	* sys/msdk/meson.build:
-	* sys/msdk/msdk.h:
-	  msdk: Add help functions to get mfxFrameSurface1 from GstBuffer and wrap it as GstMsdkSurface
-	  Note that the memory abstraction for system memory is for windows path.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2498>
+	* gst-libs/gst/codecs/gstvp9decoder.c:
+	* gst-libs/gst/codecs/gstvp9decoder.h:
+	* gst-libs/gst/codecs/gstvp9picture.c:
+	* gst-libs/gst/codecs/gstvp9picture.h:
+	* sys/d3d11/gstd3d11vp9dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
+	* sys/va/gstvavp9dec.c:
+	  vp9decoder: Port to GstCodecPicture struct
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5285>
 
-2022-05-19 19:18:21 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-09-05 22:01:21 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/msdk.c:
-	* sys/msdk/msdk.h:
-	  msdkenc: Use va pool on linux and system pool for windows
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2498>
+	* gst-libs/gst/codecs/gstvp8decoder.c:
+	* gst-libs/gst/codecs/gstvp8decoder.h:
+	* gst-libs/gst/codecs/gstvp8picture.c:
+	* gst-libs/gst/codecs/gstvp8picture.h:
+	* sys/d3d11/gstd3d11vp8dec.cpp:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/v4l2codecs/gstv4l2codecvp8dec.c:
+	* sys/va/gstvavp8dec.c:
+	  vp8decoder: Port to GstCodecPicture struct
+	  ... and remove unused "pts" variable from GstVp8Picture struct
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5285>
 
-2022-05-19 18:57:50 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-09-05 21:50:33 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkenc.c:
-	  msdkenc: Directly import dmabuf memory as mfx surface
-	  When input buffer is of dmabuf memory but not a msdk buffer (i.e., the
-	  allocator is not msdk_allocator), then we can try to get fd of this mem,
-	  create the corresponding va surface and wrap it as mfx surface.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2498>
+	* gst-libs/gst/codecs/gstmpeg2decoder.c:
+	* gst-libs/gst/codecs/gstmpeg2decoder.h:
+	* gst-libs/gst/codecs/gstmpeg2picture.c:
+	* gst-libs/gst/codecs/gstmpeg2picture.h:
+	* sys/d3d11/gstd3d11mpeg2dec.cpp:
+	* sys/v4l2codecs/gstv4l2codecmpeg2dec.c:
+	* sys/va/gstvampeg2dec.c:
+	  mpeg2decoder: Port to GstCodecPicture struct
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5285>
 
-2022-04-21 17:27:09 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-09-05 21:37:28 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkenc.c:
-	  msdkenc: Directly import va memory as mfx surface
-	  If input buffer is of va memory, we can directly obtain va surface from
-	  the buffer and wrap it as mfx surface.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2498>
+	* gst-libs/gst/codecs/gsth265decoder.c:
+	* gst-libs/gst/codecs/gsth265decoder.h:
+	* gst-libs/gst/codecs/gsth265picture.c:
+	* gst-libs/gst/codecs/gsth265picture.h:
+	* sys/d3d11/gstd3d11h265dec.cpp:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/v4l2codecs/gstv4l2codech265dec.c:
+	* sys/va/gstvah265dec.c:
+	  h265decoder: Port to GstCodecPicture struct
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5285>
 
-2022-03-03 10:07:19 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-09-05 21:27:30 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdk_va.c:
-	* sys/msdk/gstmsdk_va.h:
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/meson.build:
-	  msdk: Use va libs API to get VA surface from buffer
-	  Direct apply gst_va_buffer_get_surface to get VASurface from a buffer,
-	  so remove corresponding functions which are not used.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2498>
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	* gst-libs/gst/codecs/gsth264decoder.h:
+	* gst-libs/gst/codecs/gsth264picture.c:
+	* gst-libs/gst/codecs/gsth264picture.h:
+	* sys/d3d11/gstd3d11h264dec.cpp:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/v4l2codecs/gstv4l2codech264dec.c:
+	* sys/va/gstvah264dec.c:
+	  h264decoder: Port to GstCodecPicture struct
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5285>
 
-2022-09-01 15:11:31 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-09-03 01:46:41 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/aes/meson.build:
-	* ext/aom/meson.build:
-	* ext/assrender/meson.build:
-	* ext/avtp/meson.build:
-	* ext/bs2b/meson.build:
-	* ext/bz2/meson.build:
-	* ext/chromaprint/meson.build:
-	* ext/closedcaption/meson.build:
-	* ext/colormanagement/meson.build:
-	* ext/curl/meson.build:
-	* ext/dash/meson.build:
-	* ext/dc1394/meson.build:
-	* ext/directfb/meson.build:
-	* ext/dtls/meson.build:
-	* ext/dts/meson.build:
-	* ext/faac/meson.build:
-	* ext/faad/meson.build:
-	* ext/fdkaac/meson.build:
-	* ext/flite/meson.build:
-	* ext/fluidsynth/meson.build:
-	* ext/gme/meson.build:
-	* ext/gs/meson.build:
-	* ext/gsm/meson.build:
-	* ext/gtk/meson.build:
-	* ext/hls/meson.build:
-	* ext/iqa/meson.build:
-	* ext/isac/meson.build:
-	* ext/kate/meson.build:
-	* ext/ladspa/meson.build:
-	* ext/ldac/meson.build:
-	* ext/libde265/meson.build:
-	* ext/lv2/meson.build:
-	* ext/mdns/meson.build:
-	* ext/modplug/meson.build:
-	* ext/mpeg2enc/meson.build:
-	* ext/mplex/meson.build:
-	* ext/musepack/meson.build:
-	* ext/neon/meson.build:
-	* ext/onnx/meson.build:
-	* ext/openal/meson.build:
-	* ext/openaptx/meson.build:
-	* ext/opencv/meson.build:
-	* ext/openexr/meson.build:
-	* ext/openh264/meson.build:
-	* ext/openjpeg/meson.build:
-	* ext/openmpt/meson.build:
-	* ext/openni2/meson.build:
-	* ext/opus/meson.build:
-	* ext/qroverlay/meson.build:
-	* ext/resindvd/meson.build:
-	* ext/rsvg/meson.build:
-	* ext/rtmp/meson.build:
-	* ext/sbc/meson.build:
-	* ext/sctp/meson.build:
-	* ext/smoothstreaming/meson.build:
-	* ext/sndfile/meson.build:
-	* ext/soundtouch/meson.build:
-	* ext/spandsp/meson.build:
-	* ext/srt/meson.build:
-	* ext/srtp/meson.build:
-	* ext/svthevcenc/meson.build:
-	* ext/teletextdec/meson.build:
-	* ext/ttml/meson.build:
-	* ext/voaacenc/meson.build:
-	* ext/voamrwbenc/meson.build:
-	* ext/vulkan/meson.build:
-	* ext/wayland/meson.build:
-	* ext/webp/meson.build:
-	* ext/webrtc/meson.build:
-	* ext/webrtcdsp/meson.build:
-	* ext/wildmidi/meson.build:
-	* ext/wpe/meson.build:
-	* ext/x265/meson.build:
-	* ext/zbar/meson.build:
-	* ext/zxing/meson.build:
-	* gst/accurip/meson.build:
-	* gst/adpcmdec/meson.build:
-	* gst/adpcmenc/meson.build:
-	* gst/aiff/meson.build:
-	* gst/asfmux/meson.build:
-	* gst/audiobuffersplit/meson.build:
-	* gst/audiofxbad/meson.build:
-	* gst/audiolatency/meson.build:
-	* gst/audiomixmatrix/meson.build:
-	* gst/audiovisualizers/meson.build:
-	* gst/autoconvert/meson.build:
-	* gst/bayer/meson.build:
-	* gst/camerabin2/meson.build:
-	* gst/codecalpha/meson.build:
-	* gst/coloreffects/meson.build:
-	* gst/debugutils/meson.build:
-	* gst/dvbsubenc/meson.build:
-	* gst/dvbsuboverlay/meson.build:
-	* gst/dvdspu/meson.build:
-	* gst/faceoverlay/meson.build:
-	* gst/festival/meson.build:
-	* gst/fieldanalysis/meson.build:
-	* gst/freeverb/meson.build:
-	* gst/frei0r/meson.build:
-	* gst/gaudieffects/meson.build:
-	* gst/gdp/meson.build:
-	* gst/geometrictransform/meson.build:
-	* gst/id3tag/meson.build:
-	* gst/inter/meson.build:
-	* gst/interlace/meson.build:
-	* gst/ivfparse/meson.build:
-	* gst/ivtc/meson.build:
-	* gst/jp2kdecimator/meson.build:
-	* gst/jpegformat/meson.build:
-	* gst/librfb/meson.build:
-	* gst/midi/meson.build:
-	* gst/mpegdemux/meson.build:
-	* gst/mpegpsmux/meson.build:
-	* gst/mpegtsdemux/meson.build:
-	* gst/mpegtsmux/meson.build:
-	* gst/mxf/meson.build:
-	* gst/netsim/meson.build:
-	* gst/onvif/meson.build:
-	* gst/pcapparse/meson.build:
-	* gst/pnm/meson.build:
-	* gst/proxy/meson.build:
-	* gst/rawparse/meson.build:
-	* gst/removesilence/meson.build:
-	* gst/rist/meson.build:
-	* gst/rtmp2/meson.build:
-	* gst/rtp/meson.build:
-	* gst/sdp/meson.build:
-	* gst/segmentclip/meson.build:
-	* gst/siren/meson.build:
-	* gst/smooth/meson.build:
-	* gst/speed/meson.build:
-	* gst/subenc/meson.build:
-	* gst/switchbin/meson.build:
-	* gst/timecode/meson.build:
-	* gst/transcode/meson.build:
-	* gst/videofilters/meson.build:
-	* gst/videoframe_audiolevel/meson.build:
-	* gst/videoparsers/meson.build:
-	* gst/videosignal/meson.build:
-	* gst/vmnc/meson.build:
-	* gst/y4m/meson.build:
-	* meson.build:
-	* sys/amfcodec/meson.build:
-	* sys/androidmedia/meson.build:
-	* sys/applemedia/meson.build:
-	* sys/asio/meson.build:
-	* sys/bluez/meson.build:
-	* sys/d3d11/meson.build:
-	* sys/d3dvideosink/meson.build:
-	* sys/decklink/meson.build:
-	* sys/directshow/meson.build:
-	* sys/directsound/meson.build:
-	* sys/dvb/meson.build:
-	* sys/fbdev/meson.build:
-	* sys/ipcpipeline/meson.build:
-	* sys/kms/meson.build:
-	* sys/magicleap/meson.build:
-	* sys/mediafoundation/meson.build:
-	* sys/msdk/meson.build:
-	* sys/nvcodec/meson.build:
-	* sys/opensles/meson.build:
-	* sys/qsv/meson.build:
-	* sys/shm/meson.build:
-	* sys/tinyalsa/meson.build:
-	* sys/uvch264/meson.build:
-	* sys/v4l2codecs/meson.build:
-	* sys/va/meson.build:
-	* sys/wasapi/meson.build:
-	* sys/wasapi2/meson.build:
-	* sys/wic/meson.build:
-	* sys/winks/meson.build:
-	* sys/winscreencap/meson.build:
-	  meson: Call pkgconfig.generate in the loop where we declare plugins dependencies
-	  Removing some copy pasted code
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2970>
+	* gst-libs/gst/codecs/gstcodecpicture-private.h:
+	* gst-libs/gst/codecs/gstcodecpicture.c:
+	* gst-libs/gst/codecs/gstcodecpicture.h:
+	* gst-libs/gst/codecs/meson.build:
+	  codecs: Define common codec picture struct
+	  Adding parent class of codec picture struct
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5285>
 
-2022-09-01 11:51:48 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-09-04 20:39:36 +0200  Robert Mader <robert.mader@collabora.com>
 
-	* docs/meson.build:
-	* gst-libs/gst/adaptivedemux/meson.build:
-	* gst-libs/gst/audio/meson.build:
-	* gst-libs/gst/codecparsers/meson.build:
-	* gst-libs/gst/codecs/meson.build:
-	* gst-libs/gst/cuda/meson.build:
-	* gst-libs/gst/d3d11/meson.build:
-	* gst-libs/gst/insertbin/meson.build:
-	* gst-libs/gst/interfaces/meson.build:
-	* gst-libs/gst/mpegts/meson.build:
-	* gst-libs/gst/opencv/meson.build:
-	* gst-libs/gst/play/meson.build:
-	* gst-libs/gst/player/meson.build:
-	* gst-libs/gst/sctp/meson.build:
-	* gst-libs/gst/transcoder/meson.build:
-	* gst-libs/gst/uridownloader/meson.build:
-	* gst-libs/gst/va/meson.build:
-	* gst-libs/gst/vulkan/meson.build:
+	* docs/plugins/gst_plugins_cache.json:
+	* gst-libs/gst/wayland/gstwlvideoformat.c:
+	* gst-libs/gst/wayland/gstwlvideoformat.h:
 	* gst-libs/gst/wayland/meson.build:
-	* gst-libs/gst/webrtc/meson.build:
-	* gst-libs/gst/webrtc/nice/meson.build:
-	* meson.build:
-	  meson: Namespace the plugins_doc_dep/libraries variables
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2970>
+	  wlvideoformat: Add P010
+	  It is similar to NV12 but has 10bits per channel instead of 8.
+	  As it is supported by many modern GPUs, VA-API and an increasing
+	  number of Wayland compositors, let's support it as well.
+	  Also bump the required libdrm version accordingly and add a temporary
+	  define for the WL_SHM format.
+	  Tested with Weston, Mutter and Sway.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5275>
 
-2022-09-01 10:28:13 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-09-06 15:26:48 +0200  Robert Mader <robert.mader@collabora.com>
 
-	* gst-libs/gst/cuda/meson.build:
-	  cuda: meson: Fix generating GstCuda gir file against gstreamer-full
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2970>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	* gst-libs/gst/wayland/gstwlvideoformat.h:
+	  waylandsink: Move format caps list to shared library
+	  So it can be shared and more easily updated. While on it, order the
+	  formats according to the documentation for GstVideo.VIDEO_FORMATS_ALL.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5275>
 
-2022-08-31 18:44:14 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-09-03 13:21:30 +0000  Akihiro Sagawa <sagawa.aki@gmail.com>
 
-	* meson.build:
-	  meson: Rename plugins list and make them "dependency" objects
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2970>
+	* gst-libs/gst/codecparsers/gstmpegvideoparser.c:
+	  codecparsers: Fix MPEG-1 aspect ratio table
+	  The values defined in ISO/IEC 11172-2 are different from those used so far.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5272>
 
-2022-08-30 05:02:31 +0900  Seungha Yang <seungha@centricular.com>
+2023-09-06 15:40:03 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	  d3d11memory: Fix GstAllocator::mem_copy() implementation
-	  We were checking possible bind flags for the DXGI format
-	  of the source texture but that's never applied to
-	  the destination texture desc.
-	  Just use the already configured bind (and misc) flags of source texture
-	  for the destination texture allocation without additional check.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2950>
+	* sys/va/gstvabaseenc.c:
+	  va: baseenc: use in_info rather than input_state->info
+	  The in_info is correct video info which already considers the
+	  DMA kind caps case.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5289>
 
-2022-08-24 08:22:49 +0200  Robert Rosengren <robertr@axis.com>
+2023-09-01 17:26:51 +0800  He Junyan <junyan.he@intel.com>
 
-	* ext/curl/gstcurlbasesink.c:
-	* ext/curl/gstcurlbasesink.h:
-	  curlbasesink: gst_curl_base_sink_transfer_thread_close is internal
-	  gst_curl_base_sink_transfer_thread_close is moved from external header
-	  to be static function, as it has no users.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2732>
+	* gst-libs/gst/va/vasurfaceimage.c:
+	  va: Add modifier paramters check for va_create_surfaces()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5267>
 
-2022-07-07 09:20:04 +0200  Robert Rosengren <robertr@axis.com>
+2023-08-29 03:23:21 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/curl/gstcurlhttpsink.c:
-	* ext/curl/gstcurlhttpsink.h:
-	  curlhttpsink: Only set MIME as content-type if not set by property
-	  Setting the content-type property shall override internally detected MIME
-	  types, to make it possible to do as following example (where audio/basic to be
-	  used prior to audio/x-mulaw):
-	  gst-launch-1.0 ... ! mulawenc ! audio/x-mulaw,rate=8000,channels=1 !
-	  curlhttpsink location=<url> content-type=audio/basic
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2732>
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gsth265parse.c:
+	  h264parse, h265parse: Fix timecode parsing
+	  The scaling factor for nFrame part should be "(1 + nuit_field_based_flag) / 2"
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5254>
 
-2022-08-26 00:16:56 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-29 12:36:34 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/d3d11/gstd3d11-private.h:
-	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
-	* gst-libs/gst/d3d11/gstd3d11bufferpool.h:
-	* gst-libs/gst/d3d11/gstd3d11compile.cpp:
-	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
-	* gst-libs/gst/d3d11/gstd3d11converter.h:
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	* gst-libs/gst/d3d11/gstd3d11device.h:
-	* gst-libs/gst/d3d11/gstd3d11format.cpp:
-	* gst-libs/gst/d3d11/gstd3d11format.h:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.h:
-	* gst-libs/gst/d3d11/gstd3d11utils.cpp:
-	* sys/d3d11/gstd3d11pluginutils.h:
-	  d3d11: Update library doc
-	  * Private header name is changed to gstd3d11-private.h to follow
-	  naming convention
-	  * Add Since mark everywhere
-	  * Update member variable names to be consistent with the other
-	  object implementations in this library
-	  * Correct outdated documentation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2945>
+	* gst-libs/gst/va/vasurfaceimage.c:
+	  va: retry if surface creation fails
+	  Old versions of mesa doesn't support VASurfaceAttribDRMFormatModifiers. To
+	  solve it, by just ignoring the modifiers assuming that linear is accepted and
+	  produced, the creation of frames will be tried again without that attribute.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5256>
 
-2022-08-25 14:24:25 +0200  Piotr Brzeziński <piotr@centricular.com>
+2023-08-29 20:33:33 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/applemedia/avfvideosrc.m:
-	  avfvideosrc: Fix wrong default framerate value
-	  Current default G_MAXINT is not a correct value under any circumstances.
-	  This creates an issue with screen capture, during which we currently do
-	  not get any framerate info causing G_MAXINT to show up, where elements
-	  downstream can possibly misbehave - for example, `vtenc` causes
-	  a kernel panic.
-	  Replace with 30/1 to avoid such scenarios.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2944>
+	* sys/va/gstvabase.c:
+	* sys/va/gstvabase.h:
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabasetransform.c:
+	  va: refactor caps convertion to va caps
+	  To avoid code duplication in code related with buffer importation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5257>
 
-2022-08-25 15:28:21 +0800  He Junyan <junyan.he@intel.com>
+2023-08-29 12:21:36 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstjpegdecoder.c:
-	  jpegdecoder: return the real error of decode_scan and decode_frame.
-	  The current handle_frame() does not return the real error that happens
-	  in decode_scan and decode_frame, which makes the pipeline continue with
-	  the error and may trigger asserting later.
-	  We also return the error when decode_quant_table or decode_huffman_table
-	  fails.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2938>
+	* sys/va/gstvabase.c:
+	* sys/va/gstvabase.h:
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabasetransform.c:
+	* sys/va/gstvacompositor.c:
+	* sys/va/meson.build:
+	* sys/va/plugin.c:
+	  va: refactor buffer import
+	  This patch removes the code duplication of input buffer importation, in all the
+	  va elements that import video frames. It defines a synthetic object whose
+	  members are required to create a new input buffer and do the importation of the
+	  upstream buffer.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5257>
 
-2022-08-19 21:54:48 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-29 14:55:03 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* tests/examples/d3d11/d3d11videosink-present.cpp:
-	* tests/examples/d3d11/meson.build:
-	  examples: d3d11videosink: Add present signal example
-	  Add an example to show the usage of present singal.
-	  In this example, a text overlay with alpha blended background
-	  will be rendered on swapchain's backbuffer by using
-	  Direct3D11, Direct2D, and DirectWrite APIs.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2923>
+	* gst-libs/gst/wayland/gstwlwindow.c:
+	  waylandsink: Crop surfaces to their display width height
+	  Setting the surface source rectangle has been omitted so far. As a side effect
+	  surface created with padded width/height are being scaled down. Fix this using
+	  the viewporter source rectangle configuration. This can later be enhanced
+	  to support crop meta.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5259>
 
-2022-08-24 00:13:21 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-29 23:56:30 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	  d3d11videosink: Add display-format property
-	  Make swapchian's display format configurable, since some DXGI formats
-	  we can use for swapchain are not API interop compatible.
-	  For instance, BGRA format should be used for Direct2D interop.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2923>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/qt6d3d11/plugin.cpp:
+	  qt6d3d11: Add plugin docs
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5258>
 
-2022-08-19 20:25:31 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-29 23:39:30 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/gstd3d11window_corewindow.cpp:
-	* sys/d3d11/gstd3d11window_swapchainpanel.cpp:
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Add present signal
-	  The "present" signal will be emitted just before the
-	  IDXGISwapChain::Present() call. The client can perform additional
-	  GPU operation with given GstD3D11Device object and
-	  ID3D11RenderTargetView handle. Or, the client can read back
-	  the scene to be displayed on window using the signal.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2923>
+	* docs/plugins/gst_plugins_cache.json:
+	  bad: Update Windows plugin docs
+	  Updating wasapi, wasapi2, mediafoundation, and winks plugin docs
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5258>
 
-2022-08-19 04:49:53 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-29 23:34:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  h265decoder: Update SpsMaxLatencyPictures properly
-	  The SpsMaxLatencyPictures value never gets back to zero even if
-	  it's needed. Update the value properly.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2915>
+	* docs/plugins/gst_plugins_cache.json:
+	  qsv: Update plugin docs
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5258>
 
-2022-08-19 04:44:48 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-29 23:29:48 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  h265decoder: Reorganize debug printing
-	  As of the MR
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2575
-	  gst_h265_decoder_process_sps() is called per slice and it causes
-	  noisy debug message print.
-	  Reorganize related and the other debug printings at once.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2915>
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/dwrite/gstdwritebaseoverlay.cpp:
+	  dwrite: Add plugin docs
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5258>
 
-2022-08-20 16:15:15 +0100  Philippe Normand <philn@igalia.com>
+2023-08-29 23:06:42 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/openh264/gstopenh264dec.cpp:
-	* ext/openh264/gstopenh264enc.cpp:
-	  openh264: Register debug categories earlier
-	  Otherwise the GST_ERROR message logged in case of ABI mismatch would be done on
-	  an uninitialized category.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2918>
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/d3d11/gstd3d11convert.cpp:
+	* sys/d3d11/gstd3d11ipcclient.cpp:
+	* sys/d3d11/gstd3d11pluginutils.cpp:
+	* sys/d3d11/gstd3d11pluginutils.h:
+	* sys/d3d11/gstd3d11screencapturesrc.cpp:
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	  d3d11: Update plugin docs
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5258>
 
-2022-08-20 16:57:27 +0100  Philippe Normand <philn@igalia.com>
+2023-08-15 21:31:40 +0800  He Junyan <junyan.he@intel.com>
 
-	* ext/openh264/gstopenh264enc.cpp:
-	  openh264enc: Fix constrained-high encoding
-	  constrained-high is high without B-frames, there is no EProfileIdc for this, so
-	  assume high instead of hitting an assert down the line.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2919>
+	* sys/va/gstvabaseenc.c:
+	  va: baseenc: Add the DMA buffer input support
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5189>
 
-2022-08-19 09:07:50 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-08-15 21:25:41 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/webrtc/ice.c:
-	* gst-libs/gst/webrtc/ice.h:
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  webrtc:ice: Fix candidate stats related APIs for bindings
-	  null-terminated arrays of structures is not usable.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2917>
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabaseenc.h:
+	* sys/va/gstvah264enc.c:
+	* sys/va/gstvah265enc.c:
+	  va: encoder: Add in_info field to base encoder
+	  When we consider the DMA kind caps as input, the input_state->info
+	  only contains the video format of GST_VIDEO_FORMAT_DMA_DRM, which
+	  is not enough for va plugins. The new info in base encoder contains
+	  the correct video info after the DMA caps parsing.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5189>
 
-2022-08-18 13:27:02 +0800  He Junyan <junyan.he@intel.com>
+2023-08-28 20:58:22 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvah265dec.c:
-	  va: h265dec: Enable the scc_main_4:4:4_10 profile.
-	  We should enable this profile which is already allown in vaprofile.c
-	  after libva 1.8 version.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2909>
+	* sys/d3d11/gstd3d11convert.cpp:
+	  d3d11convert: Passthrough allocation query on same caps
+	  Since d3d11convert and its variant elements does not enable basetransform's
+	  passthrough, passthrough allocation query needs to be handled
+	  manually in order to respect downstream element's min/max buffer
+	  requirement.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5255>
 
-2022-07-06 09:08:17 -0400  U. Artie Eoff <ullysses.a.eoff@intel.com>
+2023-08-25 01:40:08 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d11/gstd3d11overlaycompositor.cpp:
+	* sys/d3d11/gstd3d11window.cpp:
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: Use premultiplied-alpha swapchain
+	  Don't ignore alpha component if it's present
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5242>
+
+2023-08-25 22:27:10 +0900  Seungha Yang <seungha@centricular.com>
+
+	* ext/codec2json/meson.build:
+	  codec2json: Fix plugin loading on Windows
+	  * Library versioning should not be used for plugins since it will add
+	  -{version}.dll suffix (and versioned libraries on Linux with symlink).
+	  Then the library file name and plugin init function name mismatch
+	  will result in blacklisted plugin.
+	  * Don't define BUILDING_GST_CODECS, makes no sense
+	  * Don't define G_LOG_DOMAIN, which should be used only for libraries,
+	  not plugins
+	  * Depends on gstcodecparsers libary, not gstcodecs.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5249>
+
+2023-08-24 21:29:29 +0300  Sebastian Dröge <sebastian@centricular.com>
 
 	* docs/plugins/gst_plugins_cache.json:
-	* sys/kms/gstkmssink.c:
-	* sys/kms/gstkmssink.h:
-	  kmssink: add fd property
-	  This allows an application to provide their own opened DRM device
-	  fd handle to kmssink.  For example, an application can lease
-	  multiple fd's from a DRM master to display on different CRTC
-	  outputs at the same time with multiple kmssink instances.
-	  Specifying the fd property is not allowed when driver-name
-	  and/or bus-id properties are specified.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2807>
+	* tests/validate/testsrcbin/caps_spec/flow-expectations/log-testsrcbin0-video_src_0-expected:
+	  video: Fix ordering of video formats in GST_VIDEO_FORMATS_ALL_STR
+	  This now follows the algorithm again that is described in the
+	  documentation and implemented in gstreamer-rs.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5243>
+
+2023-08-23 19:17:57 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/nvcodec/gstcudaipcclient.cpp:
+	* sys/nvcodec/gstcudaipcsrc.cpp:
+	  cudaipcclient: Protect IPC handle import/close with global lock
+	  Protect import/close with signle lock to avoid importing a IPC handle
+	  while it's being closed by another cudaipcsrc from other thread.
+	  Also fixing cuda context leak
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5230>
 
-2022-08-19 00:05:17 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-24 17:40:42 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* sys/d3d11/gstd3d11deinterlace.cpp:
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	* sys/d3d11/gstd3d11videosink.cpp:
-	  d3d11: Use CRITICAL_SECTION instead of GRecMutex
-	  The GRecMutex abstraction (and heap allocation happens in GLib)
-	  is unnecessary for this plugin.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2914>
-
-2022-08-17 11:18:54 -0400  Thibault Saunier <tsaunier@igalia.com>
-
-	* gst-libs/gst/webrtc/webrtc_fwd.h:
-	  webrtc: doc: Cleanup Since markers
-	  We hide some newly public symbols when moving some objects to the library
-	  which was not really correct in the end. Properly add the Since markers
-	  as needed.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2891>
+	* gst/rtmp2/rtmp/rtmpclient.c:
+	  rtmp2: Allow NULL flash version, omitting the field
+	  rtmpsink omits it by default. Allow us to do the same.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5241>
 
-2022-08-16 08:59:00 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-08-24 12:12:09 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/webrtc/ice.h:
-	  webrtc:ice: Reindent header
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2891>
+	* sys/va/gstvadecoder.c:
+	* sys/va/gstvadisplay_priv.c:
+	  va: Fix in error logs functions mismatches
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5236>
 
-2022-08-15 21:27:06 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-08-24 13:32:46 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/webrtc/ice.h:
-	  webrtc:ice: Mark protected fields as such
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2891>
+	* sys/va/gstvabasedec.c:
+	  vabasedec: Remove assertion for resolution change in input state
+	  This is reported from https://bugs.webkit.org/show_bug.cgi?id=259032
+	  Though I couldn't reproduce the issue, it looks to me unneeded to assert for
+	  resolution changes in old frames, since renegotiation is carried out.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5237>
 
-2022-08-15 21:25:25 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-08-23 19:27:43 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/webrtc/datachannel.c:
-	* gst-libs/gst/webrtc/dtlstransport.c:
-	* gst-libs/gst/webrtc/ice.c:
-	* gst-libs/gst/webrtc/icestream.c:
-	* gst-libs/gst/webrtc/icetransport.c:
-	* gst-libs/gst/webrtc/rtpreceiver.c:
-	* gst-libs/gst/webrtc/rtpsender.c:
-	* gst-libs/gst/webrtc/rtptransceiver.c:
-	  webrtc: Fix documentaton moving symbols in the right pages
-	  As those symbols are documented in a 'fwd' header smart indexing in
-	  hotdoc wasn't working.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2891>
+	* sys/nvcodec/gstnvencoder.cpp:
+	  nvencoder: Fix negotiation error when interlace-mode is unspecified
+	  Use GST_PAD_SET_ACCEPT_INTERSECT() to accept caps without interlace-mode
+	  field
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5229>
 
-2022-08-15 11:52:50 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-08-21 17:17:43 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/webrtc/ice.c:
-	* gst-libs/gst/webrtc/ice.h:
-	* gst-libs/gst/webrtc/nice/nice.c:
-	  webrtc:ice: Avoid using GArray in public API
-	  And use plain null terminated C arrays instead.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2891>
+	* sys/va/gstvacompositor.c:
+	  va: compositor: Use va_get_surface_usage_hint() to get the usage hint
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5210>
 
-2022-08-15 11:37:57 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-08-21 16:54:31 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/webrtc/ice.c:
-	  webrtc:ice: Fix some annotations
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2891>
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvaencoder.c:
+	  va: baseenc: Use va_get_surface_usage_hint() to get the usage hint
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5210>
 
-2022-08-15 11:36:25 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-08-21 16:50:39 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/webrtc/ice.c:
-	* gst-libs/gst/webrtc/ice.h:
-	  webrtc: Make GstWebRTCIceCandidateStats a Boxed type
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2891>
+	* sys/va/gstvacaps.c:
+	  va: Use va_get_surface_usage_hint() to detect the modifiers
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5210>
 
-2022-08-14 17:38:24 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-08-21 16:33:05 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/webrtc/ice.h:
-	  webrtc:ice: Add padding to structures
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2891>
+	* sys/va/gstvaav1dec.c:
+	* sys/va/gstvabasedec.c:
+	  va: basedec: Use va_get_surface_usage_hint() to get the usage hint
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5210>
 
-2022-08-14 21:49:27 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-21 15:59:33 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/cuda/cuda-gst.h:
-	* gst-libs/gst/cuda/gstcudanvrtc.c:
-	* gst-libs/gst/cuda/gstcudanvrtc.h:
-	* gst-libs/gst/cuda/gstnvrtcloader.c:
-	* gst-libs/gst/cuda/gstnvrtcloader.h:
-	* gst-libs/gst/cuda/meson.build:
-	* sys/nvcodec/gstcudafilter.c:
-	  cuda: Hide runtime compiler related header and symbols
-	  That's already abstracted via gst_cuda_nvrtc_compile() method
-	  and therefore, we do not need to expose such symbols yet.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2884>
+	* sys/va/gstvabasetransform.c:
+	  va: basetransform: Use va_get_surface_usage_hint() to get the usage hint
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5210>
 
-2022-08-17 12:22:38 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-08-21 15:03:56 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/va/gstvajpegdec.c:
-	  vajpegdec: Fix memory leak.
-	  Free value content.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2899>
+	* gst-libs/gst/va/vasurfaceimage.c:
+	* gst-libs/gst/va/vasurfaceimage.h:
+	  va: Add helper function va_get_surface_usage_hint()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5210>
 
-2022-08-16 20:05:15 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-08-24 11:32:51 +1000  Matthew Waters <matthew@centricular.com>
 
-	* sys/va/gstvajpegdec.c:
-	  vajpegdec: Fix 4:2:2 for i965.
-	  Since i965 uses NV12 either for 4:2:0 and 4:2:2 chroma (using an
-	  internal color conversion) the chroma validation has to be shortcut.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2899>
+	* docs/plugins/gst_plugins_cache.json:
+	  video: add support for A420/A422/A444 16-bit formats
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5233>
 
-2022-08-16 19:50:49 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-08-23 16:33:16 +1000  Matthew Waters <matthew@centricular.com>
 
-	* gst-libs/gst/va/gstvavideoformat.c:
-	  va: libs: Add Y42B format.
-	  Enable 4:2:2 JPEG decoding in iHD.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2899>
+	* docs/plugins/gst_plugins_cache.json:
+	  video: add support for 12-bit A420/A422/A444
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5226>
 
-2022-08-16 16:06:20 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-08-22 14:54:36 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* gst-libs/gst/va/gstvavideoformat.c:
-	* gst-libs/gst/va/gstvavideoformat.h:
-	* sys/va/gstvacaps.c:
-	  va: Validate JPEG subsampling configurations.
-	  There are Mesa Gallium drivers that report subsampling but without
-	  any pixel format. So, strip out these subsamplings.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2899>
+	* ext/wayland/gstwaylandsink.c:
+	  waylandsink: Restore support for render-rectangle
+	  Fixes #2519
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5221>
 
-2022-08-16 14:45:46 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-08-15 19:55:34 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvadecoder.c:
-	* sys/va/gstvaencoder.c:
-	  va: gst_va_create_raw_caps_from_config() may return NULL.
-	  This patch verifies if the function returns NULL in the caller.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2899>
+	* gst-libs/gst/codecparsers/gsth265parser.c:
+	* tests/check/elements/h265parse.c:
+	  h265parser: Allow partially broken hvcC data
+	  Ignores parsing error on the last nalu of the array if the nalu type
+	  is not VPS/SPS/PPS
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2905
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5188>
 
-2022-08-17 11:42:09 -0400  Eric Knapp <emkman99@gmail.com>
+2023-08-23 18:07:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/decklink/gstdecklink.cpp:
-	* sys/decklink/gstdecklink.h:
-	* sys/decklink/gstdecklinkvideosrc.cpp:
-	  decklink: Validate video input format
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2892>
+	* sys/win32ipc/protocol/win32ipcpipeserver.cpp:
+	  win32ipc: Fix pipe handle leak
+	  Named pipe handle must be closed if it's no longer needed
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2923
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5228>
 
-2022-08-15 11:23:56 -0400  Eric Knapp <emkman99@gmail.com>
+2023-08-21 21:02:01 +1000  Matthew Waters <matthew@centricular.com>
 
-	* sys/decklink/gstdecklink.cpp:
-	  decklink: Auto-detect 10-bit YUV
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2892>
+	* docs/plugins/gst_plugins_cache.json:
+	  video: add support for 8-bit A422/A444
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5213>
 
-2022-08-14 22:31:29 -0400  Daniel Morin <daniel.morin@collabora.com>
+2023-07-17 16:21:47 +0000  Rabindra Harlalka <13387-rabindra-harlalka@users.noreply.gitlab.freedesktop.org>
 
-	* gst-libs/gst/play/gstplay-media-info.h:
-	* gst-libs/gst/play/gstplay-signal-adapter.h:
-	* gst-libs/gst/play/gstplay-video-overlay-video-renderer.h:
-	* gst-libs/gst/play/gstplay-video-renderer.h:
-	* gst-libs/gst/play/gstplay-visualization.h:
-	  gst-play: missing cleanup for g_autoptr
-	  Without this change cleanup function for g_autoptr is not defined for
-	  GstPlayMediaInfo, GstPlaySignalAdapter, GstPlayVideoRenderer,
-	  GstPlayVideoOverlayVideoRenderer and GstPlayVisualization. Cleanup
-	  function was defined in gstplay.h, but missing in other header files.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2888>
+	* ext/aes/gstaesenc.c:
+	  aesenc: Fix IV length addition to output buffer length
+	  Add length of IV to output buffer length only for the first buffer.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5093>
 
-2022-08-16 21:01:47 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-18 18:21:18 +1000  Jan Schmidt <jan@centricular.com>
 
-	* gst-libs/gst/d3d11/meson.build:
-	  meson: d3d11: Fix missing header install
-	  Install gstd3d11compile.h header file
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2896>
+	* ext/mdns/gstmicrodnsdevice.c:
+	  mdns: Fix a crash on context error
+	  Make sure not to free the microdns provider context until the
+	  device provider asks it to stop. Fixes a crash if there is
+	  an error (such as MDNS port being busy) that makes the
+	  mdns listener exit early.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5198>
 
-2022-08-15 01:50:15 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-18 09:27:36 +0200  Guillaume Desmottes <guillaume.desmottes@onestream.live>
 
-	* sys/d3d11/gstd3d11av1dec.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11decoder.h:
-	* sys/d3d11/gstd3d11h264dec.cpp:
-	* sys/d3d11/gstd3d11h265dec.cpp:
-	* sys/d3d11/gstd3d11mpeg2dec.cpp:
-	* sys/d3d11/gstd3d11vp8dec.cpp:
-	* sys/d3d11/gstd3d11vp9dec.cpp:
-	  d3d11decoder: Do timer based DecoderBeginFrame retry
-	  ... instead of retry count based one, because the precision of Sleep()
-	  varies depending on system and application configuration.
-	  Also, don't retry DecoderBeginFrame if decoder is doing flush.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2886>
+	* gst/rtmp2/gstrtmp2sink.c:
+	  rtmp2sink: fix crash if message conversion failed
+	  The message pointer is not set so we can't display it in logs.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5197>
 
-2022-08-14 21:18:24 +0900  Seungha Yang <seungha@centricular.com>
+2020-09-25 17:18:10 +0200  Johan Sternerup <johast@axis.com>
 
-	* sys/nvcodec/gstcudamemorycopy.c:
-	  cudaupload,cudadownload: Don't simplify caps in transform_caps
-	  The simplified caps might not be a subset of filter caps
-	  and basetransform will complain about it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2883>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/webrtc/gstwebrtcbin.c:
+	* gst-libs/gst/webrtc/ice.c:
+	* gst-libs/gst/webrtc/nice/nice.c:
+	  webrtcice: Add webrtc ALPN header for HTTP proxy
+	  Section 3.4 in RFC8835 states that if a WebRTC endpoint uses an HTTP
+	  proxy to access the Internet it MUST include the "ALPN" header. This
+	  commit adds this header.
+	  By default the ALPN used when connecting to the TURN/TCP server via a
+	  proxy is set to "webrtc". It can be changed by adding an alpn url
+	  option for the http-proxy. For example:
+	  http://user:pass@my.http.proxy.com:8080?alpn=c-webrtc
+	  This will add the header "ALPN: c-webrtc" to the HTTP proxy CONNECT
+	  request.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4212>
 
-2022-08-15 00:22:14 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-16 13:43:56 +0000  L. E. Segovia <amy@amyspark.me>
 
-	* sys/d3d11/gstd3d11decoder.cpp:
-	  d3d11decoder: Do not use miniobject qdata
-	  The miniobject qdata uses global mutex.
-	  Use ID3D11DeviceChild::{Set,Get}PrivateData methods instead.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2885>
+	* sys/applemedia/avsamplevideosink.m:
+	* sys/applemedia/helpers.c:
+	  applemedia: Also fix inconsistent pixel format definition for NV12
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5191>
 
-2022-08-13 05:24:03 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-15 21:45:56 +0000  L. E. Segovia <amy@amyspark.me>
 
-	* docs/plugins/gst_plugins_cache.json:
-	  docs: Remove dxgiscreencapsrc from documentation
-	  The implementation was dropped in
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1750
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2878>
+	* sys/applemedia/coremediabuffer.c:
+	* sys/applemedia/corevideobuffer.c:
+	* sys/applemedia/helpers.c:
+	  applemedia: Fix pixel format for I420
+	  In Intel Macs, using full range 8-bit 4:2:0 YCbCr results in a failure on
+	  initialization. I've validated this to be the correct pixel format with FFmpeg:
+	  https://github.com/FFmpeg/FFmpeg/blob/8653dcaf7d665b15b40ea9a560c8171b0914a882/libavutil/hwcontext_videotoolbox.c#L45
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5191>
 
-2022-08-13 12:24:37 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-08-14 21:58:29 -0300  L. E. Segovia <amy@centricular.com>
 
-	* gst-libs/gst/player/gstplayer-media-info.c:
-	  player: Don't leak wrapped video info
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1373
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2880>
+	* sys/d3d11/gstd3d11ipcclient.cpp:
+	* sys/nvcodec/gstcudaipcclient.cpp:
+	  windows: Fix mutexes leaking into the exports table
+	  Translation unit-local variables must be marked static on Windows,
+	  otherwise they're made available to the whole binary.
+	  See:
+	  https://learn.microsoft.com/en-us/cpp/cpp/program-and-linkage-cpp?view=msvc-170#external-vs-internal-linkage
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5185>
 
-2022-08-13 11:50:20 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-08-12 21:16:59 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/play/gstplay.c:
-	  play: Make ownership of video-sink clearer in combination with floating references
-	  And correctly handle the case of VideoRenderer::create_video_sink() not
-	  actually returning a floating reference, which might be tricky for some
-	  bindings.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2880>
+	* sys/wasapi2/gstwasapi2client.cpp:
+	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
+	  wasapi2: Use C++ atomic instead of GLib
+	  Release-Acquire ordering could be faster than MemoryBarrier()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5176>
 
-2022-08-13 11:49:08 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-08-12 00:58:10 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/play/gstplay.c:
-	  play: Fix object construction
-	  Ideally new() functions should simply call g_object_new() and not much
-	  else, so let's do that here and handle all the construction properly in
-	  a GObject way.
-	  Now a play object created via g_object_new() is actually usable.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2880>
+	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
+	  wasapi2ringbuffer: Don't use GLib's weak pointer implementation
+	  GWeakRef takes global mutex. Use C++ weak_ptr which will perform
+	  atomic operation internally.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5176>
 
-2022-08-13 11:39:59 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-08-13 00:31:50 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/player/gstplayer.c:
-	  player: Fix object construction
-	  Ideally new() functions should simply call g_object_new() and not much
-	  else, so let's do that here and handle all the construction properly in
-	  a GObject way.
-	  Now a player object created via g_object_new() is actually usable.
-	  In addition, also fix the video-renderer property so that reading it
-	  returns an object of the correct type.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2880>
+	* gst-libs/gst/cuda/stub/cuda.h:
+	  cuda: Add workaround for gir build
+	  ERROR:../girepository/girparser.c:343:state_switch:
+	  assertion failed: (ctx->state != newstate)
+	  Bail out! ERROR:../girepository/girparser.c:343:state_switch:
+	  assertion failed: (ctx->state != newstate)
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4510>
+
+2023-04-19 01:56:20 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/nvcodec/gstcudaipc.cpp:
+	* sys/nvcodec/gstcudaipc.h:
+	* sys/nvcodec/gstcudaipcclient.cpp:
+	* sys/nvcodec/gstcudaipcclient.h:
+	* sys/nvcodec/gstcudaipcclient_unix.cpp:
+	* sys/nvcodec/gstcudaipcclient_unix.h:
+	* sys/nvcodec/gstcudaipcclient_win32.cpp:
+	* sys/nvcodec/gstcudaipcclient_win32.h:
+	* sys/nvcodec/gstcudaipcserver.cpp:
+	* sys/nvcodec/gstcudaipcserver.h:
+	* sys/nvcodec/gstcudaipcserver_unix.cpp:
+	* sys/nvcodec/gstcudaipcserver_unix.h:
+	* sys/nvcodec/gstcudaipcserver_win32.cpp:
+	* sys/nvcodec/gstcudaipcserver_win32.h:
+	* sys/nvcodec/gstcudaipcsink.cpp:
+	* sys/nvcodec/gstcudaipcsink.h:
+	* sys/nvcodec/gstcudaipcsrc.cpp:
+	* sys/nvcodec/gstcudaipcsrc.h:
+	* sys/nvcodec/gstnvcodecutils.h:
+	* sys/nvcodec/meson.build:
+	* sys/nvcodec/plugin.c:
+	  nvcodec: Add support for CUDA IPC
+	  Adding cudaipc{src,sink} element for CUDA IPC support.
+	  Implementation note:
+	  * For the communication between end points, Win32 named-pipe
+	  and unix domain socket will be used on Windows and Linux respectively.
+	  * cudaipcsink behaves as a server, and all GPU resources will be owned by
+	  the server process and exported for other processes, then cudaipcsrc
+	  (client) will import each exported handle.
+	  * User can select IPC mode via "ipc-mode" property of cudaipcsink.
+	  There are two IPC mode, one is "legacy" which uses legacy CUDA IPC
+	  method and the other is "mmap" which uses CUDA virtual memory API
+	  with OS's resource handle sharing method such as DuplicateHandle()
+	  on Windows. The "mmap" mode might be better than "legacy" in terms
+	  of stability since it relies on OS's resource management but
+	  it would consume more GPU memory than "legacy" mode.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4510>
 
-2022-08-13 11:30:35 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-06-04 00:53:40 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/player/gstplayer.c:
-	  player: Release signal adapter on finalize
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2880>
+	* gst-libs/gst/cuda/gstcudabufferpool.cpp:
+	* gst-libs/gst/cuda/gstcudabufferpool.h:
+	  cudabufferpool: Add support for virtual memory
+	  Configure malloc or mmap allocator depending on config option
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4510>
 
-2022-08-08 23:37:11 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-03 23:58:50 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mxf/mxfaes-bwf.c:
-	  mxfdemux: Always calculate BlockAlign of raw audio
-	  Workaround for nBlockAlign and nBitsPerSample mismatch. Always
-	  use the formula described in the specification for BlockAlign value
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2864>
+	* gst-libs/gst/cuda/gstcudacontext.cpp:
+	* gst-libs/gst/cuda/stub/cuda.h:
+	  cudacontext: Add memory allocation related properties
+	  Adding "virtual-memory" and "os-handle" properties. New properties
+	  will be used to query device's capability
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4510>
 
-2022-08-12 22:05:36 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-10 01:37:59 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/meson.build:
-	  meson: d3d11: Fix build with GIR enabled
-	  ... and remove unused list
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2870>
+	* gst-libs/gst/cuda/gstcuda-private.h:
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	* gst-libs/gst/cuda/gstcudamemory.h:
+	* gst-libs/gst/cuda/gstcudautils.cpp:
+	* gst-libs/gst/cuda/meson.build:
+	  cudamemory: Add support for virtual memory in pool allocator
+	  Adding new memory pool allocator for virtual memory
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4510>
 
-2022-08-12 18:24:41 +0300  Matthias Clasen <mclasen@redhat.com>
+2023-06-10 17:48:49 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/player/gstplayer.c:
-	  gstplayer: Plug a memory leak
-	  This was showing up as a memory leak in GTK's
-	  gstreamer media backend:
-	  40 bytes in 1 blocks are definitely lost in loss record 18,487 of 40,868
-	  at 0x484586F: malloc (vg_replace_malloc.c:381)
-	  by 0x50D5278: g_malloc (gmem.c:125)
-	  by 0x50EDBA5: g_slice_alloc (gslice.c:1072)
-	  by 0x50EFBCC: g_slice_alloc0 (gslice.c:1098)
-	  by 0x51F2F45: g_type_create_instance (gtype.c:1911)
-	  by 0x51DAE37: g_object_new_internal (gobject.c:2011)
-	  by 0x51DC080: g_object_new_with_properties (gobject.c:2181)
-	  by 0x51DCB20: g_object_new (gobject.c:1821)
-	  by 0x9855F86: UnknownInlinedFun (gstplayer-wrapped-video-renderer.c:109)
-	  by 0x9855F86: gst_player_new (gstplayer.c:579)
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1374
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2875>
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	* gst-libs/gst/cuda/gstcudamemory.h:
+	  cudamemory: Add support for virtual memory management
+	  Adding new CUDA memory allocation methods
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4510>
 
-2022-08-12 11:32:45 +0200  Corentin Damman <c.damman@intopix.com>
+2023-08-10 01:58:57 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11window.cpp:
-	  d3d11window: fix DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING swap chain flag for full screen
-	  Fixes #1372 (regression introduced in 5eeec165)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2866>
+	* gst-libs/gst/cuda/cuda-gst.h:
+	* gst-libs/gst/cuda/gstcuda-private.h:
+	* gst-libs/gst/cuda/gstcudaloader.cpp:
+	* gst-libs/gst/cuda/stub/cuda.h:
+	  cuda: Load virtual memory management and IPC API symbols
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4510>
 
-2022-08-10 11:12:37 +0100  Philippe Normand <philn@igalia.com>
+2023-08-13 22:02:47 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/wpe/gstwpesrcbin.cpp:
-	  wpesrc: Switch URI handler to web+... protocols
-	  The web://http:// URIs were not compliant with RFC 3986. Using web+http://
-	  allows us to use the GstUri parser to pass down a valid URI to `wpevideosrc`.
-	  Corresponding change for the CEF source element:
-	  https://github.com/centricular/gstcefsrc/commit/8d499495dd79cc0bf9a38ae82b03e374d78f68ae
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2856>
+	* sys/dwrite/gstdwritetimeoverlay.cpp:
+	  dwritetimeoverlay: Fix debug category name
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5179>
+
+2023-08-13 21:58:39 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwrite-renderer.cpp:
+	  dwrite: Re-add background geometry combine
+	  If glyphrun unit is changed in a single line, there could be
+	  overlapped background area which result in drawing background
+	  twice. Adding geometry combine so that background geometry objects
+	  with the same color can be merged and rendered at once
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5179>
 
-2022-08-09 12:24:53 +0200  Corentin Damman <c.damman@intopix.com>
+2023-08-11 12:03:59 +0000  Marcin Kolny <marcin.kolny@gmail.com>
 
-	* sys/nvcodec/gstnvh264encoder.cpp:
-	* sys/nvcodec/gstnvh265encoder.cpp:
-	  nvcodec: fix caps leaks in nvh264/h265encoder
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2850>
+	* ext/qroverlay/gstqroverlay.c:
+	  qroverlay: fix updating "data" property in qroverlay element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5175>
 
-2022-08-09 12:29:34 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-08-10 23:39:06 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Set codec frame sync point if IDR
-	  This flag is used by GstVideoEncoder base class for certain configurations.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2852>
+	* sys/va/plugin.c:
+	  va: Update decoder ranks
+	  Most software decoders are ranked as primary, so use primary + 1 for
+	  all codecs except for jpeg.
+	  But ranks should be demoted on Windows since it's still experimental
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5169>
+
+2023-06-13 03:36:45 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/nvcodec/gstnvav1dec.cpp:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	  nvdecoder: Add max-display-delay property
+	  The same as in old nvdec implementation so that user can control
+	  the number of delayed output frames.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4841>
+
+2023-06-13 03:05:48 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/nvcodec/gstnvdecoder.cpp:
+	  nvdecoder: Reduce DPB size
+	  Decoder will copy decoded picture to downstream buffer or output CUDA
+	  memory even in case of zero-copy mode. Additional margin should be unnecessary
+	  unless baseclass passed wrong max DPB size.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4841>
 
-2022-08-09 12:28:43 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-08-08 14:42:40 +0100  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Packed headers can be zero.
-	  A driver can report back no packed header support (VA_ENC_PACKED_HEADER_NONE).
-	  This patch removes that false verification.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2851>
+	* sys/wasapi/gstwasapiutil.c:
+	* sys/wasapi/meson.build:
+	  wasapi: Don't redefine GUIDs when building under newer MinGW
+	  Latest MSYS2 MinGW provides these now, so we don't need to define them
+	  if they're already present in the header.
+	  The AudioClient3 GUID requires the Windows 10 SDK, so it's only
+	  available in the latest MinGW, and the MinGW in Cerbero is too old.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5155>
 
-2022-08-07 23:24:04 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-08 16:00:02 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	* sys/d3d11/gstd3d11convert.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11: Use WIN32 API directly for locking with RAII pattern
-	  Such abstraction is unnecessary for this library/plugin.
-	  Use WIN32 API directly instead of GLib wrappers.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2848>
+	* sys/wasapi/gstwasapiutil.c:
+	  wasapi: Remove obsolete ifdefs for older MinGW
+	  We no longer ship that ancient MinGW toolchain, and it's causing build
+	  errors with MSYS2 now:
+	  https://gitlab.freedesktop.org/slomo/gstreamer/-/jobs/46866129
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5155>
 
-2022-08-07 22:41:07 +0900  Seungha Yang <seungha@centricular.com>
+2022-04-27 17:03:31 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	  d3d11memory: Remove unnecessary locking
-	  * memory map/unmap is already protected by d3d11 device lock.
-	  Don't need to take another memory lock.
-	  * Use WIN32 critical section and slim reader/writer lock APIs
-	  directly instead of GLib wrappers.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2848>
+	* sys/va/plugin.c:
+	  va/vaapi: promote va ranks and demote vaapi ones
+	  VA decoders implementation has been verified from 1.18 through 1.22
+	  development cycles and also via the Fluster test framework. Similar
+	  to other cases, we can prefer hardware over software in most cases.
+	  At the same time, GStreamer-VAAPI decoders are demoted to NONE to
+	  avoid collisions. The first step to their deprecation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2312>
 
-2022-08-05 17:20:05 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-08-09 00:36:35 +0200  Piotr Brzeziński <piotr@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Fix caps for mesa gallium.
-	  Radeon mesa gallium driver has a bug which adds P010_10LE sink caps
-	  format. This patch removes formats which arent 420 chroma.
-	  gst_caps_set_format_array() wasn't used because the fix traverse
-	  several structures with potential different formats.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2844>
+	* sys/applemedia/vtenc.c:
+	  vtenc: Fix cosmetic issues
+	  Removes accidental GST_VIDEO_DECODER macro usage.
+	  Also sets the initial size of the output queue to avoid having to expand when first buffers come through.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5164>
+
+2023-08-06 09:23:28 +0100  Tim-Philipp Müller <tim@centricular.com>
+
+	* ext/lc3/meson.build:
+	  lc3: fix pkg-config file lookup
+	  There's a mismatch between the pkg-config file ('lc3')
+	  and the subproject/wrap which meant an installed liblc3
+	  wasn't picked up.
+	  Fixes #2883
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5151>
 
-2022-08-05 15:54:39 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2022-11-21 11:33:09 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* sys/va/gstvah264dec.c:
-	* sys/va/gstvaprofile.c:
-	  vah264dec: Complete profiles in decoder.
-	  Instead of specifying all the H.264 "supported" profiles in the global
-	  hash table (used either by decoders and encoders), just complete them
-	  in the decoder only, since the encoder doesn't support them.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2844>
+	* sys/v4l2codecs/gstv4l2format.c:
+	* sys/v4l2codecs/gstv4l2format.h:
+	* sys/v4l2codecs/linux/videodev2.h:
+	  v4l2codecs: Enable Mediatek 10bit 4:2:0 support
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3444>
 
-2022-08-05 22:34:06 +0900  Seungha Yang <seungha@centricular.com>
+2022-11-11 15:10:02 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	* sys/qsv/gstqsvallocator_d3d11.cpp:
-	* tests/examples/d3d11/d3d11converter.cpp:
-	* tests/examples/d3d11/d3d11videosink-appsrc.cpp:
-	  d3d11: Don't find global default allocator
-	  We were using global default allocator already. Pass null
-	  allocator object to *_alloc() methods then the method will
-	  use default allocator.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2843>
+	* docs/plugins/gst_plugins_cache.json:
+	  video: Add Mediatek 10bit formats
+	  These 10bit formats are identical to NV12_16L32S, but 64bytes of data is being
+	  prefixed with 16bytes data with four pixels of lower 2bits per byte. For
+	  MT2110T, the lower two bits set so each bytes contains a column of 4 pixels,
+	  also describe as tiled lower 2 bits. MT2110T has been chosen as a name to match
+	  the vendor chosen name. This format is unlikely to exist for other vendors.
+	  For MT2110R, the 2 low bits are in raster order.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3444>
 
-2022-08-05 22:23:52 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-07 14:59:25 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	  d3d11memory: Allow null GstD3D11Allocator to alloc methods
-	  Similar to gst_allocator_alloc(), use default GstD3D11Allocator
-	  when caller passes null allocator object
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2843>
+	* ext/srt/gstsrtobject.c:
+	  srt: Set SRTO_IPV6ONLY to 0 by default
+	  Since SRT 1.5.2 this option must be explicitly set to `0` or `1` before
+	  binding to `::`, or binding will fail.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5157>
 
-2022-08-06 00:03:43 +0900  Seungha Yang <seungha@centricular.com>
+2023-08-08 01:29:40 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* gst-libs/gst/d3d11/gstd3d11compile.cpp:
-	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	* gst-libs/gst/d3d11/gstd3d11format.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11utils.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11deinterlace.cpp:
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	  d3d11: Use std::call_once()
-	  g_once_init_enter() always takes global mutex for non-GCC build.
-	  Use C++ once call implementation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2843>
+	* ext/hls/gsthlssink2.c:
+	  hlssink2: Always use forward slash separator
+	  g_build_filename() will insert back slash on Windows, and resulting
+	  playlist will contain media segment path with back slash if
+	  "playlist-root" property is specified
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5158>
 
-2022-08-06 04:57:49 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-19 09:51:00 +0200  Fabian Orccon <forccon@fluendo.com>
 
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	  d3d11device: Use WIN32 critical section API directly
-	  GLib's GRecMutex will allocate another heap memory for CRITICAL_SECTION
-	  struct and g_rec_mutex_lock/g_rec_mutex_unlock use WIN32 APIs actually.
-	  We don't need such intermediate function calls and redundant heap allocation.
-	  Just call WIN32 APIs directly.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2845>
+	* gst-libs/gst/codecparsers/gsth264parser.c:
+	* tests/check/libs/h264parser.c:
+	  h264parser: Write Unregistered User Data
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5071>
 
-2022-08-03 17:52:25 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-08-07 13:12:02 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvabaseenc.c:
-	* sys/va/gstvabaseenc.h:
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Lock properties read/write.
-	  This is a first step for changing properties at runtime.
-	  And add missing bitrate upate and notification.
-	  Fixes: #1258
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2836>
+	* sys/va/gstvajpegdec.c:
+	  vajpegdec: simply fixup src caps for iHD
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4044>
 
-2022-08-04 13:02:00 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-06-16 20:12:32 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Use guint32 for rc_ctrl as it's for rc_ctrl_mode.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2836>
+	* sys/va/gstvajpegdec.c:
+	  va: jpegdec: Do not change the DMA template src caps
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4044>
 
-2022-08-04 12:57:11 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-06-03 21:56:09 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Split aud property and its usage.
-	  Just as other property variables, it's split for ease it usage,
-	  particularly after adding access locks.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2836>
+	* sys/va/gstvabasetransform.c:
+	  va: Delete the usage hint hack when we support DRM modifier
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4044>
 
-2022-08-04 12:00:58 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-22 19:36:06 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/va/gstvabaseenc.h:
-	  va: baseenc: Untabbify and format.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2836>
+	* sys/va/gstvabasetransform.c:
+	* sys/va/gstvavpp.c:
+	  va: Apply the new DMA format:modifier pair negotiation in vpp
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4044>
 
-2022-08-03 03:29:20 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-22 19:23:47 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	  d3d11compositor: Add gamma-mode and primaries-mode properties
-	  Allows controlling gamma remap and/or chromatic adaptation behavior.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2831>
+	* sys/va/gstvaav1dec.c:
+	* sys/va/gstvabasedec.c:
+	* sys/va/gstvabasedec.h:
+	* sys/va/gstvajpegdec.c:
+	  va: Apply the new DMA format:modifier pair negotiation in decoder
+	  We will consider the DMA modifier for negotiation, setting caps and
+	  memory pool allocation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4044>
 
-2022-08-03 01:47:46 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-17 21:46:35 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	  d3d11videosink: Add gamma-mode and primaries-mode properties
-	  Allows controlling gamma remap and/or chromatic adaptation behavior.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2831>
+	* gst-libs/gst/va/gstvavideoformat.c:
+	  va: update the gst_va_dma_drm_info_to_video_info() to use DMA_DRM format
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4044>
 
-2022-08-03 01:19:41 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-22 18:53:32 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/d3d11/gstd3d11convert.cpp:
-	  d3d11convert: Add gamma-mode and primaries-mode properties
-	  Allows controlling gamma remap and/or chromatic adaptation behavior.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2831>
+	* sys/va/gstvacaps.c:
+	* sys/va/gstvacaps.h:
+	* sys/va/gstvafilter.c:
+	  va: Improve the template caps for DMA, use new drm-format kind caps
+	  We should add the modifier information for each surface format when
+	  we report the template caps.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4044>
 
-2022-08-03 00:26:33 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-22 18:39:22 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
-	* gst-libs/gst/d3d11/gstd3d11converter.h:
-	  d3d11converter: Add options for gamma and primaries conversion
-	  Gamma remap and/or primaries conversion requires additional
-	  processing which might be something user want to avoid, performance
-	  reason for example
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2831>
+	* gst-libs/gst/va/gstvapool.c:
+	  va: Use new dma drm caps in va pool when we setup DMA pools
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4044>
 
-2022-08-01 13:04:47 +0200  Robert Mader <robert.mader@collabora.com>
+2023-06-14 16:32:52 +0800  He Junyan <junyan.he@intel.com>
 
-	* ext/wayland/gstwaylandsink.c:
-	  waylandsink: Logging code style updates
-	  For better readability of debug messages and to keep similar code
-	  in sync with `GstGtkWaylandsink`.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2694>
+	* gst-libs/gst/va/gstvaallocator.c:
+	* gst-libs/gst/va/gstvaallocator.h:
+	* sys/va/gstvabasetransform.c:
+	* sys/va/gstvacompositor.c:
+	  va: Use GstVideoInfoDmaDrm in DMA allocator's get/set_format() API
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4044>
 
-2022-06-30 11:48:45 +0200  Robert Mader <robert.mader@collabora.com>
+2023-08-04 20:47:38 +0800  He Junyan <junyan.he@intel.com>
 
-	* ext/wayland/gstwaylandsink.c:
-	  waylandsink: Rename occurrences of GstWaylandSink to 'self'
-	  Rename all occurrences to `self`, making it consintent with `GstWl*`
-	  and `GstGtkWaylandsink`.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2694>
+	* gst-libs/gst/va/gstvaallocator.c:
+	* gst-libs/gst/va/gstvavideoformat.h:
+	  va: Include drm fourcc header file in gstvavideoformat.h
+	  And add some definition to pass the Windows compiling.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4044>
 
-2022-07-19 15:10:00 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-08-05 01:39:29 +1000  Jan Schmidt <jan@centricular.com>
 
-	* sys/va/gstvavpp.c:
-	  vapostproc: Check for colorimetry changes.
-	  It uses what's merged in
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2765
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2777>
+	* gst/audiolatency/gstaudiolatency.c:
+	  audiolatency: Fix event refcounting bug handling latency events
+	  Fix a refcounting bug introduced in
+	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5146
+	  If upstream returns FALSE when processing a latency event, it will
+	  be unreffed an extra time
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5150>
 
-2022-04-11 15:35:45 -0500  Olivier Crête <olivier.crete@collabora.com>
+2023-08-04 17:25:26 +1000  Jan Schmidt <jan@centricular.com>
 
-	* tests/examples/gtk/gtkwaylandsink.c:
-	  gtkwaylandsink test: Add navigationtest to example
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1515>
+	* gst/audiolatency/gstaudiolatency.c:
+	  audiolatency: Forward latency query and event upstream
+	  Make sure the pipeline still configures the latency that it would configure
+	  if audiolatency was not in the pipeline.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5146>
 
-2021-12-08 10:30:21 +0200  George Kiagiadakis <george.kiagiadakis@collabora.com>
+2023-07-27 17:14:23 +0200  Guillaume Desmottes <guillaume.desmottes@onestream.live>
 
 	* docs/plugins/gst_plugins_cache.json:
-	* ext/gtk/gstgtkutils.c:
-	* ext/gtk/gstgtkutils.h:
-	* ext/gtk/gstgtkwaylandsink.c:
-	* ext/gtk/gstgtkwaylandsink.h:
-	* ext/gtk/gstplugin.c:
-	* ext/gtk/gtkgstbasewidget.c:
-	* ext/gtk/gtkgstbasewidget.h:
-	* ext/gtk/gtkgstwaylandwidget.c:
-	* ext/gtk/gtkgstwaylandwidget.h:
-	* ext/gtk/meson.build:
-	* ext/meson.build:
-	* meson_options.txt:
-	* tests/examples/gtk/gtkwaylandsink.c:
-	* tests/examples/gtk/meson.build:
-	* tests/examples/gtk/window.ui:
-	* tests/examples/meson.build:
-	  Add new gtkwaylandsink element
-	  This is based on gtksink, but similar to waylandsink uses Wayland APIs
-	  directly instead of rendering with Gtk/Cairo primitives.
-	  Note that the long term plan is to move this into the existing extension
-	  in `-good`, which requires the Wayland library to move the as well.
-	  For this reason several files like `gstgtkutils.*` and `gtkgstbasewidget.*`
-	  are straight copies and should be kept in sync.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1515>
+	* gst/rtmp2/gstrtmp2src.c:
+	  rtmp2src: add 'no-eof-is-error' property
+	  There is currently no way for applications to know if the stream has
+	  been properly terminated by the server or if the network connection
+	  was disconnected as EOS is sent in both cases.
+	  Adding a property so connection errors can be reported as errors
+	  allowing applications to distinguish between both scenarios.
+	  Fix #2828
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5115>
 
-2022-08-02 05:06:24 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-19 18:08:32 -0500  Ryan Pavlik <ryan.pavlik@collabora.com>
 
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Translate mouse position
-	  Converts mouse cursor position represented in display coordinates to
-	  stream coordinates.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2824>
+	* sys/androidmedia/gstjniutils.c:
+	  androidmedia: Add more null checks (of env) to JNI utilities
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5138>
 
-2022-08-02 04:16:31 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-22 10:42:39 +0100  Philippe Normand <philn@igalia.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	  d3d11videosink: Early terminate mouse/keyboard event handling
-	  ... and add missing null check (plus coding style fix)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2824>
+	* gst/transcode/gsttranscodebin.c:
+	  transcodebin: Fixes for upstream selectable support
+	  The upstream selectable query was not performed in all situations where we
+	  handle the stream-start event. This could potentially lead to unlinked pads
+	  between decodebin3 and encodebin later on.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5089>
 
-2022-07-30 17:28:41 +0100  Philippe Normand <philn@igalia.com>
+2023-07-19 18:08:32 -0500  Ryan Pavlik <ryan.pavlik@collabora.com>
 
-	* gst-libs/gst/webrtc/nice/nice.c:
-	* gst-libs/gst/webrtc/nice/nicestream.c:
-	* gst-libs/gst/webrtc/nice/nicetransport.c:
-	  webrtc: nice: WeakRef access fixes
-	  The GstWebRTCNiceStream::ice property getter already hands-off a full reference,
-	  so there is no need to call g_weak_ref_get() in call sites.
-	  Fixes #1350
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2819>
+	* sys/androidmedia/gstjniutils.c:
+	  androidmedia: Add more null checks to JNI utilities
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5130>
 
-2022-07-30 17:19:42 +0100  Philippe Normand <philn@igalia.com>
+2023-07-28 14:02:22 -0500  Ryan Pavlik <ryan.pavlik@collabora.com>
 
-	* gst-libs/gst/webrtc/ice.h:
-	  webrtc: ice: Fix GstWebRTCICE parent class
-	  It is a GstObject, not a GObject.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2819>
+	* sys/androidmedia/gstamcvideodec.c:
+	  androidmedia: Fix typo
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5130>
 
-2022-07-30 17:43:38 +0100  Philippe Normand <philn@igalia.com>
+2023-07-19 18:08:16 -0500  Ryan Pavlik <ryan.pavlik@collabora.com>
 
-	* ext/dtls/gstdtlssrtpdec.c:
-	* ext/dtls/gstdtlssrtpenc.c:
-	  dtls: Properly name encoder/decoder logging categories
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2820>
+	* sys/androidmedia/gst-android-hardware-camera.c:
+	  androidmedia: Clear err if we don't have an optional camera field/constant
+	  Fixes startup on devices where those fields/constants are not found.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5130>
 
-2022-07-30 17:42:50 +0100  Philippe Normand <philn@igalia.com>
+2023-07-26 16:45:18 -0500  Ryan Pavlik <ryan.pavlik@collabora.com>
 
-	* ext/dtls/gstdtlsagent.c:
-	* ext/dtls/gstdtlsagent.h:
-	* ext/dtls/gstdtlsconnection.c:
-	* ext/dtls/gstdtlsconnection.h:
-	  dtls: Make agent and connection GstObjects
-	  Facilitates debug logs interpretation of GST_DEBUG_OBJECT() calls.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2820>
-
-2022-07-30 02:29:49 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
-
-	* ext/sctp/usrsctp/meson.build:
-	* sys/qsv/libmfx/meson.build:
-	  meson: Don't pass -Werror to vendored code
-	  Do it the correct way with libusrsctp -- override the option so that
-	  it's done in a compiler-agnostic and future-proof way.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2494>
+	* ext/webrtc/gstwebrtcbin.c:
+	  webrtc: Fix docs for create-data-channel action signal
+	  Initial line of the doc comment was incorrect, so the nicely written
+	  docs were not being extracted.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5131>
 
-2022-05-25 18:40:30 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+2023-07-28 15:56:32 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* gst/rtmp2/gstrtmp2locationhandler.c:
-	* gst/rtmp2/rtmp/rtmpclient.c:
-	  rtsp+rtmp: Forward warning added to tls-validation-flags to our users
-	  With the 2.72 release, glib-networking developers have decided that
-	  TLS certificate validation cannot be implemented correctly by them, so
-	  they've deprecated it.
-	  In a nutshell: a cert can have several validation errors, but there
-	  are no guarantees that the TLS backend will return all those errors,
-	  and things are made even more complicated by the fact that the list of
-	  errors might refer to certs that are added for backwards-compat and
-	  won't actually be used by the TLS library.
-	  Our best option is to ignore the deprecation and pass the warning onto
-	  users so they can make an appropriate security decision regarding
-	  this.
-	  We can't deprecate the tls-validation-flags property because it is
-	  very useful when connecting to RTSP cameras that will never get
-	  updates to fix certificate errors.
-	  Relevant upstream merge requests / issues:
-	  https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2214
-	  https://gitlab.gnome.org/GNOME/glib-networking/-/issues/179
-	  https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/193
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2494>
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	* ext/wayland/gstwaylandsink.h:
+	* gst-libs/gst/wayland/gstwldisplay.c:
+	* gst-libs/gst/wayland/gstwldisplay.h:
+	* gst-libs/gst/wayland/gstwllinuxdmabuf.c:
+	* gst-libs/gst/wayland/gstwllinuxdmabuf.h:
+	* gst-libs/gst/wayland/gstwlshmallocator.c:
+	  waylandsink: Improve DMA DRM integration
+	  Pass GstVideoInfoDmaDrm or GstVideoInfo whenever possible, avoiding passing
+	  strange combination of GstVieoFormat + modifier. Even though we don't have any
+	  at the moment, this also allow supporting GstVideoFormat that are not supported
+	  in our DRM integration.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5120>
+
+2023-08-02 00:54:34 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwrite-effect.cpp:
+	* sys/dwrite/gstdwrite-effect.h:
+	* sys/dwrite/gstdwrite-renderer.cpp:
+	* sys/dwrite/gstdwrite-renderer.h:
+	* sys/dwrite/gstdwritebaseoverlay.cpp:
+	* sys/dwrite/gstdwriteoverlayobject.cpp:
+	* sys/dwrite/gstdwriteoverlayobject.h:
+	  dwrite: Move background-color and color-emoji options to effect object
+	  ... and simplify background rendering
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5121>
+
+2023-08-01 22:56:37 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwritebaseoverlay.cpp:
+	* sys/dwrite/gstdwriteoverlayobject.cpp:
+	* sys/dwrite/gstdwriteoverlayobject.h:
+	* sys/dwrite/meson.build:
+	  dwrite: Add helper object for blending operation
+	  For easy integration with a new text rendering baseclass
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5121>
+
+2023-08-01 22:50:37 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwritebaseoverlay.cpp:
+	  dwritebaseoverlay: Handle only d3d11 allocation query
+	  ... and passthrough allocation queries of the other types
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5121>
+
+2023-07-29 02:38:01 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwritetextoverlay.cpp:
+	  dwritetextoverlay: Remove leading CRLF sequence from CC
+	  The CRLF sequence is unnecessary
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5121>
+
+2023-07-25 19:57:27 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwrite-effect.h:
+	* sys/dwrite/gstdwrite-renderer.cpp:
+	* sys/dwrite/gstdwritebaseoverlay.cpp:
+	  dwrite: Remove some properties
+	  Remove outline color and auto resize related properties
+	  to be consistent with textoverlay elements
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5121>
 
-2022-05-25 16:03:22 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+2023-07-28 00:39:46 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/dtls/gstdtlscertificate.c:
-	  dtls: Disable OpenSSL 3.0 deprecation warnings for now
-	  Fedora 36 ships with OpenSSL 3.0, which deprecates all low-level APIs,
-	  so this code needs to be rewritten. There is no easy fix in the
-	  porting guide, and it recommends disabling the warnings if you can't
-	  use the high-level API.
-	  https://wiki.openssl.org/index.php/OpenSSL_3.0#Upgrading_to_OpenSSL_3.0_from_OpenSSL_1.1.1
-	  Here's the replacement API:
-	  https://www.openssl.org/docs/man3.0/man7/migration_guide.html#Deprecated-low-level-object-creation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2494>
+	* gst/onvif/gstrtponviftimestamp.c:
+	  rtponviftimestamp: Fix drop-out-of-segment=false mode
+	  Fixing unexpected buffer dropping and flow error in case that:
+	  * use-reference-timestamps=false
+	  * drop-out-of-segment=false
+	  * Calculated utc offset is not valid because buffer is out-of-segment
+	  The above case should be considered as a valid data flow without returning
+	  errors.
+	  Fixing regression introduced by
+	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1683
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5116>
 
-2022-07-29 02:36:40 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-27 15:53:55 +0800  Cheah, Vincent Beng Keat <vincent.beng.keat.cheah@intel.com>
 
-	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
-	  wasapi2: Fix initial mute/volume setting
-	  Fix up volume/mute change flag setting
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2809>
+	* ext/wayland/gstwaylandsink.c:
+	  waylandsink: Add gst_buffer_pool_config_set_params() to a pool
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5103>
 
-2022-07-26 13:59:33 -0400  Eric Knapp <emkman99@gmail.com>
+2023-07-25 11:37:02 +0800  Cheah, Vincent Beng Keat <vincent.beng.keat.cheah@intel.com>
 
-	* sys/va/gstvah264enc.c:
-	  va: h264enc: Make AUD the first NAL unit
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2796>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	* ext/wayland/gstwaylandsink.h:
+	* gst-libs/gst/wayland/gstwldisplay.c:
+	* gst-libs/gst/wayland/gstwldisplay.h:
+	* gst-libs/gst/wayland/gstwllinuxdmabuf.c:
+	* gst-libs/gst/wayland/gstwllinuxdmabuf.h:
+	* gst-libs/gst/wayland/gstwlshmallocator.c:
+	* gst-libs/gst/wayland/gstwlvideoformat.c:
+	* gst-libs/gst/wayland/gstwlvideoformat.h:
+	  waylandsink: Add DRM modifiers support
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5103>
 
-2022-07-26 15:49:32 -0400  U. Artie Eoff <ullysses.a.eoff@intel.com>
+2023-07-19 13:19:06 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* ext/webrtc/meson.build:
-	* gst-libs/gst/webrtc/nice/meson.build:
-	  meson: webrtc: ensure definition of libgstwebrtcnice_dep
-	  ... and skip if it's disabled.
-	  Fixes #1344
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2797>
+	* sys/va/gstvah265enc.c:
+	  vah265enc: Correct the value of cu_qp_delta flag and depth
+	  According to libva API description, cu_qp_delta in VAConfigAttribValEncHEVCFeatures
+	  is supposed to be used as a flag not the value of depth. And if flag enabled,
+	  diff_cu_qp_delta_depth should be decided by log2_diff_max_min_luma_coding_block_size.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5068>
 
-2022-04-18 23:25:13 +0530  yatinmaan <yatinmaan1@gmail.com>
+2023-07-26 14:58:57 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/webrtc/fwd.h:
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/gstwebrtcbin.h:
-	* ext/webrtc/gstwebrtcstats.c:
-	* ext/webrtc/meson.build:
-	* ext/webrtc/transportstream.c:
-	* ext/webrtc/webrtcsctptransport.h:
-	* gst-libs/gst/webrtc/ice.c:
-	* gst-libs/gst/webrtc/ice.h:
-	* gst-libs/gst/webrtc/icestream.c:
-	* gst-libs/gst/webrtc/icestream.h:
-	* gst-libs/gst/webrtc/icetransport.h:
-	* gst-libs/gst/webrtc/meson.build:
-	* gst-libs/gst/webrtc/nice/meson.build:
-	* gst-libs/gst/webrtc/nice/nice.c:
-	* gst-libs/gst/webrtc/nice/nice.h:
-	* gst-libs/gst/webrtc/nice/nice_fwd.h:
-	* gst-libs/gst/webrtc/nice/nicestream.c:
-	* gst-libs/gst/webrtc/nice/nicestream.h:
-	* gst-libs/gst/webrtc/nice/nicetransport.c:
-	* gst-libs/gst/webrtc/nice/nicetransport.h:
-	* gst-libs/gst/webrtc/webrtc-priv.h:
-	* gst-libs/gst/webrtc/webrtc.h:
-	* gst-libs/gst/webrtc/webrtc_fwd.h:
-	  webrtc: Split WebRTCICE into base classes and implementation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2398>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  va:allocator: Rework the func va_map_unlocked
+	  Rework the va_map_unlocked() after we keep mapping behavior (whether to
+	  use derive) consistent with allocator_try stage. Also remove the flag
+	  for iHD case because pitch/stride difference between vaCreateImage and
+	  vaDeriveImage only possibly happen on iHD by now.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5046>
 
-2022-07-22 22:50:33 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-13 16:56:56 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* sys/qsv/gstqsvallocator_d3d11.cpp:
-	* sys/qsv/gstqsvencoder.cpp:
-	  qsvencoder: Add support for D3D11 shared texture
-	  Although input texture belongs to the other d3d11 device,
-	  we can do GPU copy when its physical device is identical.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2790>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  va:allocator: Let pool alloc_info be consitent with the test order in gst_va_allocator_try
+	  In gst_va_allocator_try, the first try is to use derive_image, if it
+	  succeeds, we should use info from derived image to create bufferpool.
+	  If derive fails, then try create_image and give created image info
+	  to the pool.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5046>
 
-2022-07-23 00:41:49 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-27 19:08:59 +1000  Matthew Waters <matthew@centricular.com>
 
-	* sys/amfcodec/gstamfencoder.cpp:
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	* sys/mediafoundation/gstmfvideoencoder.h:
-	* sys/nvcodec/gstnvencoder.cpp:
-	  d3d11: Port to GstD3D11Fence
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2790>
+	* sys/applemedia/avfdeviceprovider.m:
+	* sys/applemedia/avfvideosrc.m:
+	* sys/applemedia/iosassetsrc.h:
+	* sys/applemedia/iosassetsrc.m:
+	* sys/applemedia/videotexturecache-gl.m:
+	  applemedia: silence some deprecation warnings from ios 12.0
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5111>
 
-2022-07-23 00:11:18 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-26 16:27:43 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/d3d11/gstd3d11_fwd.h:
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	* gst-libs/gst/d3d11/gstd3d11device.h:
-	  d3d11: Implement fence abstraction
-	  Depending on device feature level, d3d11 runtime can support
-	  ID3D11Fence which is equivalent to ID3D12Fence.
-	  Waiting using fence has performance-wise benefit over pulling
-	  ID3D11Query status. If ID3D11Fence is not supported by device,
-	  then ID3D11Query will be used instead.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2790>
+	* gst-libs/gst/codecs/gstav1decoder.c:
+	  codecs: AV1: Ensure current picture and frame to NULL before return
+	  The current code fails to clear the current picture and frame pointer if
+	  some flow error such as EOS happens. This causes the double free issue in
+	  gst_av1_decoder_reset().
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5104>
 
-2022-06-08 15:44:26 +0200  Benjamin Gaignard <benjamin.gaignard@collabora.com>
+2023-07-14 13:41:34 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  codecs: h265: Make sure that sps is processed just before decoding
-	  It may happens that bitstream doesn't provided SPS in decoding order
-	  (like in VPSSPSPPS_A_MainConcept_1 conformance test file).
-	  To be sure that the decoder got the correct SPS parameters process
-	  SPS just before start decoding the frame.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2575>
+	* sys/msdk/gstmsdkh264enc.c:
+	  msdkh264enc: Set profile as unknown when not specified by downstream
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5039>
 
-2022-03-18 15:04:18 +0100  Sebastian Fricke <sebastian.fricke@collabora.com>
+2023-07-25 22:00:27 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  codecs: h265: Fix typos
-	  Fix multiple typos in warning and info messages.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2575>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/debugutils/gstfakevideosink.c:
+	  fakevideosink: Add DMA_DRM format into sink template caps
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5094>
 
-2022-05-16 15:27:40 +0200  Benjamin Gaignard <benjamin.gaignard@collabora.com>
+2023-07-19 09:51:12 +0200  Fabian Orccon <forccon@fluendo.com>
 
-	* gst/videoparsers/gsth265parse.c:
-	  videoparsers: h265: Be less restrictive between PPS and SPS parsing order
-	  Allow to parse PPS to be parser even if SPS hasn't been parsered before.
-	  This help to parse VPSSPSPPS_A_MainConcept_1 conformance test
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2575>
+	* gst-libs/gst/codecparsers/gsth265parser.c:
+	* tests/check/libs/h265parser.c:
+	  h265parser: Write Unregistered User Data
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5070>
 
-2022-05-16 15:25:36 +0200  Benjamin Gaignard <benjamin.gaignard@collabora.com>
+2023-07-18 10:08:54 +0200  Fabian Orccon <forccon@fluendo.com>
 
+	* gst-libs/gst/codecparsers/gsth264parser.c:
 	* gst-libs/gst/codecparsers/gsth265parser.c:
 	* gst-libs/gst/codecparsers/gsth265parser.h:
-	  codecparsers: Defering computation of pps and sps fields
-	  While possible defer computataion of pps and sps fields until
-	  slice parsing since it may happens that bitstreams don't encoded
-	  them in expected order.
-	  A example weird ordered bitstreams is VPSSPSPPS_A_MainConcept_1
-	  conformance test.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2575>
+	* gst/videoparsers/gsth265parse.c:
+	* gst/videoparsers/gsth265parse.h:
+	* tests/check/elements/h265parse.c:
+	  h265parse: Parse SEI unregistered user data
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5070>
 
-2022-07-20 12:11:47 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-07-04 17:39:58 +0200  Piotr Brzeziński <piotr@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codech264dec.c:
-	  v4l2codecs: h264: Reset the number of slices on picture start
-	  This way, if we aborted a frame in the middle, we don't endup thinking
-	  there is multiple slices to send.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1079>
+	* sys/applemedia/vtenc.c:
+	* sys/applemedia/vtenc.h:
+	  vtenc: Move output loop to a separate thread
+	  vtenc has an async output queue, which we only iterate over after another frame is enqueued.
+	  At the very least it means we're always a frame behind the fastest possible output.
+	  In edge cases it's also bug-prone - for example if we only have 1 frame, the downstream caps negotiation
+	  will never happen.
+	  This commit adds a separate task running on the source pad, which only iterates over the output queue
+	  and pushes frames out as soon as they're put there. The queue length is limited to ensure we don't encode
+	  too far ahead compared to what downstream can consume. Any failures that occur when pushing data downstream
+	  will be signalled in self->downstream_ret so that other parts of code can act accordingly.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4967>
 
-2022-07-12 15:44:45 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-07-17 14:48:39 +0800  Jakub Adam <jakub.adam@collabora.com>
 
-	* sys/v4l2codecs/gstv4l2codech264dec.c:
-	  v4l2codecs: h264: Fix initialization of the slice array
-	  The function g_array_sized_new() leaves the len to 0, but the slice
-	  implementation assumes it would be set to 4. Sending multiple slices is
-	  not yet support for H.264 as no driver needed it yet, but if that code
-	  was to be used it would have overflowed as the array would never grow as
-	  multiple 0 by 2 always results in 0.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1079>
+	* gst/videoparsers/gstav1parse.c:
+	  av1parse: calculate framerate from AV1 timing info
+	  When framerate info isn't provided by upstream elements, try to extract
+	  it from AV1 timing info, if present.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5041>
 
-2022-07-12 15:43:34 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-07-19 13:08:03 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codech264dec.c:
-	  v4l2codecs: h264: Rename count variable to num_controls
-	  This is the counter for the used control slot. The term num_controls was
-	  introduced in the HEVC decoder and felt like a better choice.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1079>
+	* ext/webrtc/gstwebrtcbin.c:
+	  webrtcbin: Fix support for glib older than 2.74
+	  G_CONNECT_DEFAULT was added in 2.74, and passing `0` in older versions
+	  gets the same behaviour.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5045>
 
-2022-06-20 12:22:20 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-07-17 16:41:25 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codech265dec.c:
-	  v4l2codecs: hevc: Add an API check
-	  This adds an API check and bump recommended base kernel version to 5.20.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1079>
+	* tests/examples/webrtc/webrtcrenego.c:
+	  webrtcrenego: Use payload type correctly for the dynamic stream
+	  All streams were using pt=96 which is incorrect. In some cases that
+	  can cause EOS to be sent to both branches of the receiver.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5045>
 
-2022-07-12 08:56:07 -0400  Benjamin Gaignard <benjamin.gaignard@collabora.com>
+2023-07-17 16:40:05 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codech265dec.c:
-	* sys/v4l2codecs/gstv4l2codech265dec.h:
-	* sys/v4l2codecs/meson.build:
-	* sys/v4l2codecs/plugin.c:
-	  v4l2codecs: Add v4l2 stateless H265 decoder
-	  Add v4l2 stateless H265 decoder.
-	  Co-authored-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
-	  Co-authored-by: Sebastian Fricke <sebastian.fricke@collabora.com>
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1079>
+	* tests/examples/webrtc/webrtcrenego.c:
+	  webrtcrenego: Fix incorrect release of non-request pad
+	  GStreamer-CRITICAL **: 16:39:23.230: gst_element_release_request_pad:
+	  assertion 'GST_PAD_PAD_TEMPLATE (pad) == NULL ||
+	  GST_PAD_TEMPLATE_PRESENCE (GST_PAD_PAD_TEMPLATE (pad)) ==
+	  GST_PAD_REQUEST' failed
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5045>
 
-2022-04-25 15:27:39 +0200  Benjamin Gaignard <benjamin.gaignard@collabora.com>
+2023-07-17 15:56:37 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2decoder.c:
-	  v4l2codecs: Increase minimum payload size
-	  Fluster MAXBINS_{A-C}_TI_5 HEVC tests files require to store
-	  a payload larger than usual given their resolutions.
-	  Increase the minimum payload size to handle them correctly.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1079>
+	* tests/examples/webrtc/webrtcrenego.c:
+	  webrtcrenego: Port to updated mechanism for doing renegotiation
+	  Sending an EOS event is actually really bad because rtpbin doesn't
+	  handle that very well. It was only being used as a way to notify
+	  webrtcbin to check if re-negotiation is needed.
+	  We don't need that anymore, since changing the direction is enough to
+	  notify webrtcbin to check for re-negotiation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5045>
 
-2022-07-12 08:57:38 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-07-17 15:39:59 +1000  Matthew Waters <matthew@centricular.com>
 
-	* sys/v4l2codecs/linux/v4l2-controls.h:
-	* sys/v4l2codecs/linux/videodev2.h:
-	  v4l2codecs: Align v4l2 headers with HEVC final uAPI
-	  HEVC uAPI have landed for kernel 5.10.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1079>
+	* ext/webrtc/gstwebrtcbin.c:
+	  webrtcbin: don't hold the webrtc lock over on-new-transceiver emission
+	  Could potentially produce a deadlock if the direction is changed in the
+	  callback.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5045>
 
-2022-04-29 12:10:05 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2022-11-09 14:25:00 +1100  Matthew Waters <matthew@centricular.com>
 
-	* gst-libs/gst/codecparsers/gsth265parser.c:
-	* gst-libs/gst/codecparsers/gsth265parser.h:
-	  codecparsers: h265: Introduce long_term_ref_pic_set_size
-	  This is the size of the `if( long_term_ref_pics_present_flag )` inside
-	  slice_segment_header( ) syntax. This size in bit, and after de-emulation
-	  is needed by some HW.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1079>
+	* ext/webrtc/gstwebrtcbin.c:
+	  webrtc: don't disallow transceiver direction changes
+	  Initial testing seems to suggest that we support them reasonably well
+	  (at least for BUNDLEd streams).
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5045>
 
-2022-07-21 16:11:03 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-07-17 14:55:30 +1000  Matthew Waters <matthew@centricular.com>
 
-	* gst/audiobuffersplit/gstaudiobuffersplit.c:
-	  audiobuffersplit: Actually store number of samples to drop in gapless mode
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2780>
+	* ext/webrtc/gstwebrtcbin.c:
+	  webrtc: add check for negotiation on transceiver direction changes
+	  As required by the webrtc specification.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5045>
 
-2022-07-21 16:10:18 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-07-05 18:46:25 -0600  Olivier Crête <olivier.crete@collabora.com>
 
-	* gst/audiobuffersplit/gstaudiobuffersplit.c:
-	  audiobuffersplit: Use input running time for comparison instead of the currently tracked running time
-	  Otherwise gapless mode would do completely wrong calculations on
-	  discontinuities and cause input/output to drift slowly.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2780>
+	* scripts/gen-changelog.py:
+	  gst-omx: Retire the whole package
+	  The OpenMAX standard is long dead and even the Raspberry Pi OS
+	  no longer supports it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4976>
 
-2022-07-21 13:38:22 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-07-13 20:38:29 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/audiobuffersplit/gstaudiobuffersplit.c:
-	  audiobuffersplit: Combine two if expressions to reduce indentation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2780>
+	* sys/qsv/meson.build:
+	  qsv: Remove x86_64 constraint on Linux
+	  Updated oneVPL SDK supports 32bit and ARM build
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5032>
 
-2022-07-22 04:51:14 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-13 20:34:24 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	  d3d11compositor: Add support for crop meta
-	  GstD3D11Converter supports cropping already. Cropping is just
-	  a matter of setting source rectangle area to converter,
-	  from d3d11 point of view
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2782>
+	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_config.cpp:
+	* sys/qsv/libmfx/dispatcher/windows/mfx_dxva2_device.h:
+	  qsv: Re-apply MinGW build workaround
+	  Apply the changes of the commits
+	  c80132e4a3fb1fda6d196effe0e6d12dfcc75f25 and
+	  23261bccbba84abb1334ffc4dea0514f74a5f2af
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5032>
 
-2022-07-18 00:41:00 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-13 20:31:40 +0900  Seungha Yang <seungha@centricular.com>
 
-	* tests/examples/d3d11/d3d11converter.cpp:
-	* tests/examples/d3d11/meson.build:
-	  examples: d3d11: Add GstD3D11Converter example
-	  An example to demonstrate color space conversion, rescale and flip/rotation
-	  using GstD3D11Converter
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2767>
-
-2022-07-21 05:13:21 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst-libs/gst/d3d11/gstd3d11.h:
-	* gst-libs/gst/d3d11/gstd3d11_fwd.h:
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
-	* gst-libs/gst/d3d11/gstd3d11converter.h:
-	* gst-libs/gst/d3d11/gstd3d11format.cpp:
-	* gst-libs/gst/d3d11/meson.build:
-	* sys/d3d11/gstd3d11compositor.cpp:
-	* sys/d3d11/gstd3d11convert.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	* sys/d3d11/gstd3d11pluginutils.h:
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/meson.build:
-	  d3d11: Move GstD3D11Converter to gst-libs
-	  The object is equivalent to GstVideoConverter but for D3D11.
-	  Application can use this object directly for various conversions,
-	  such as color space conversion, rescale, crop and flip/rotation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2767>
+	* sys/qsv/libmfx/api/vpl/mfx.h:
+	* sys/qsv/libmfx/api/vpl/mfxadapter.h:
+	* sys/qsv/libmfx/api/vpl/mfxbrc.h:
+	* sys/qsv/libmfx/api/vpl/mfxcamera.h:
+	* sys/qsv/libmfx/api/vpl/mfxcommon.h:
+	* sys/qsv/libmfx/api/vpl/mfxdefs.h:
+	* sys/qsv/libmfx/api/vpl/mfxdispatcher.h:
+	* sys/qsv/libmfx/api/vpl/mfxencodestats.h:
+	* sys/qsv/libmfx/api/vpl/mfxjpeg.h:
+	* sys/qsv/libmfx/api/vpl/mfxstructures.h:
+	* sys/qsv/libmfx/api/vpl/mfxsurfacepool.h:
+	* sys/qsv/libmfx/api/vpl/mfxvideo++.h:
+	* sys/qsv/libmfx/api/vpl/mfxvideo.h:
+	* sys/qsv/libmfx/dispatcher/linux/device_ids.h:
+	* sys/qsv/libmfx/dispatcher/linux/mfxloader.cpp:
+	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl.h:
+	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_config.cpp:
+	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:
+	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp:
+	* sys/qsv/libmfx/dispatcher/windows/mfx_dxva2_device.h:
+	  qsv: Update oneVPL SDK version to v2023.3.0
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5032>
 
-2022-07-21 05:40:45 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-13 01:26:46 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11.h:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.h:
-	* gst-libs/gst/d3d11/meson.build:
-	  d3d11: Define enum and flags types manually
-	  gnome.mkenums_simple() doesn't work well for GstD3D11, seems to
-	  be confused by numeric representation of D3D11, must be a bug
-	  in GLib or so. Just don't rely on the incomplete automagic.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2767>
+	* gst-libs/gst/codecs/gstav1decoder.c:
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	* gst-libs/gst/codecs/gsth265decoder.c:
+	* gst-libs/gst/codecs/gstmpeg2decoder.c:
+	* gst-libs/gst/codecs/gstvp8decoder.c:
+	* gst-libs/gst/codecs/gstvp9decoder.c:
+	  codecs: Use release_frame() instead of drop_frame()
+	  drop_frame() will post QoS message which is not intended here
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5024>
 
-2022-07-21 05:39:58 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-12 00:34:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11format.cpp:
-	  d3d11: Run gst-indent
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2767>
+	* gst-libs/gst/codecs/gstav1decoder.c:
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	* gst-libs/gst/codecs/gsth265decoder.c:
+	* gst-libs/gst/codecs/gstmpeg2decoder.c:
+	* gst-libs/gst/codecs/gstvp8decoder.c:
+	* gst-libs/gst/codecs/gstvp9decoder.c:
+	  codecs: Propagate downstream flow ERROR
+	  Don't translate downstream flow ERROR to OK
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5024>
 
-2022-07-06 16:14:13 +0300  Jordan Petridis <jordan@centricular.com>
+2023-07-12 12:46:17 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* ext/openmpt/gstopenmptdec.c:
-	  openmpt: update from now deprecated api
-	  https://lib.openmpt.org/doc/classopenmpt_1_1module.html#ab2695af0baa274054f5687741fa7c05b
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2721>
+	* tests/examples/d3d11/d3d11overlay.cpp:
+	  d3d11: Fix build on MSYS2 GCC
+	  ```
+	  ../subprojects/gst-plugins-bad/tests/examples/d3d11/d3d11overlay.cpp:145:37: error:
+	  invalid conversion from 'unsigned int' to 'D2D1_DRAW_TEXT_OPTIONS' -fpermissive
+	  145 |         D2D1_DRAW_TEXT_OPTIONS_CLIP | D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT);
+	  |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	  |                                     |
+	  |                                     unsigned int
+	  ```
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5018>
 
-2022-04-29 19:27:16 +0800  Fan F He <fan.f.he@intel.com>
+2023-07-12 09:27:22 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkenc.h:
-	* sys/msdk/gstmsdkh264enc.c:
-	* sys/msdk/gstmsdkh265enc.c:
-	* sys/msdk/gstmsdkh265enc.h:
-	* sys/msdk/msdk-enums.c:
-	* sys/msdk/msdk-enums.h:
-	  msdkenc: Enable LowDelayBrc and MaxFrameSize for I/P frame
-	  Enable these features for accurate bitrate control.
-	  Feature introduction of LowDelayBRC, MaxFrameSizeI and MaxFrameSizeP could be found here:
-	  https://github.com/Intel-Media-SDK/MediaSDK/blob/master/doc/mediasdk-man.md
-	  Signed-off-by: Fan F He <fan.f.he@intel.com>
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2742>
+	* tests/check/meson.build:
+	* tests/examples/camerabin2/meson.build:
+	  meson: Always use forward slashes in defines with paths
+	  Fixes the following build failure on MSYS2:
+	  ```
+	  ../subprojects/gstreamer/tests/check/elements/filesrc.c: In function 'test_seeking':
+	  ../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: error: incomplete universal character name \U
+	  107 |   g_object_set (G_OBJECT (src), "location", TESTFILE, NULL);
+	  |                                                     ^
+	  ../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: warning: unknown escape sequence: '\A'
+	  ../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: warning: unknown escape sequence: '\g'
+	  ../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: warning: unknown escape sequence: '\s'
+	  ../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: warning: unknown escape sequence: '\g'
+	  ../subprojects/gstreamer/tests/check/elements/filesrc.c:107:53: warning: unknown escape sequence: '\c'
+	  ```
+	  Due to: `-DTESTFILE=\"C:\\Users\\Administrator\...`
+	  https://gitlab.freedesktop.org/nirbheek/gstreamer/-/jobs/45317733
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5018>
 
-2022-07-20 05:28:51 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-11 21:41:46 +0200  Carlos Rafael Giani <crg7475@mailbox.org>
 
-	* sys/d3d11/gstd3d11converter.cpp:
-	* sys/d3d11/gstd3d11converter.h:
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	  d3d11converter: Use GstStructure to set initialization options
-	  Runtime updatable options are exposed via object properties
-	  but there are a few options which should be known at initialization
-	  time. Use GstStructure to signal it and to be easily extensible
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2776>
-
-2022-07-19 01:52:48 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/d3d11/gstd3d11converter.cpp:
-	  d3d11converter: Use primaries and transfer function compare methods
-	  Different enum values could be functionally equal, then we don't need
-	  to do full conversion.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2776>
+	* meson.build:
+	  gl: Take into account viv-fb vs. viv_fb naming in meson scripts
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5020>
 
-2022-07-17 04:48:24 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-16 21:24:44 +1000  Matthew Waters <matthew@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11format.cpp:
-	* gst-libs/gst/d3d11/gstd3d11format.h:
-	* sys/d3d11/gstd3d11converter.cpp:
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	* sys/d3d11/gstd3d11pluginutils.h:
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	  d3d11format: Move DXGI color space mapping method to gst-libs
-	  Expose color space mapping method to public so that application
-	  can configure GstCaps or GstVideoInfo using DXGI color space
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2776>
+	* meson.build:
+	  gl: provide a pkg-config/gir file for the viv-fb backend
+	  Required to be able to generate coherent bindings for window system
+	  specific APIs due to limitations in gobject-introspection.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5020>
 
-2022-07-17 00:33:55 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-10 22:56:30 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11convert.cpp:
-	  d3d11convert: Use new colorimetry compare function
-	  Avoid conversion if both are functionally identical
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2765>
+	* ext/qt6d3d11/gstqt6d3d11videoitem.cpp:
+	  qt6d3d11: Set sampler filtering method
+	  QQuickItem::smooth property doesn't seem to be propagated to
+	  newly created QSGSimpleTextureNode automatically.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2793
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5004>
 
-2022-07-17 23:58:19 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-10 12:03:25 +0100  Philippe Normand <philn@igalia.com>
 
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	  d3d11testsrc: Fix SMPTE pattern rendering
-	  It was wrong vertex shader code
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2766>
+	* ext/webrtc/gstwebrtcbin.c:
+	* tests/check/elements/webrtcbin.c:
+	  webrtcbin: Prevent critical warning when creating an additional data channel
+	  The max_channels value wasn't clamped to 65534 in all situations.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5001>
 
-2022-07-13 10:30:49 +0200  Piotr Brzeziński <piotr@centricular.com>
+2023-06-28 03:41:26 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/applemedia/vtdec.c:
-	* sys/applemedia/vtenc.c:
-	  applemedia: Add HEVC support to vtenc and vtdec
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2754>
+	* meson_options.txt:
+	* sys/d3d11/meson.build:
+	  meson: d3d11: Add d3d11-wgc option for Windows Graphics Capture feature
+	  Make the feature requirement explicitly controllable via build option
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4939>
 
-2022-06-16 03:57:37 +0900  Seungha Yang <seungha@centricular.com>
+2023-07-05 19:55:17 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11.h:
-	* gst-libs/gst/d3d11/gstd3d11compile.cpp:
-	* gst-libs/gst/d3d11/gstd3d11compile.h:
-	* gst-libs/gst/d3d11/meson.build:
-	* sys/d3d11/gstd3d11compositor.cpp:
-	* sys/d3d11/gstd3d11converter.cpp:
-	* sys/d3d11/gstd3d11overlaycompositor.cpp:
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	* sys/d3d11/gstd3d11shader.cpp:
-	* sys/d3d11/gstd3d11shader.h:
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/meson.build:
-	* sys/d3d11/plugin.cpp:
-	  d3d11: Move HLSL compiler to gst-libs
-	  We should move this functionality to gst-libs so that GstD3D11Converter
-	  can be moved to gst-libs.
-	  Another advantage is that applications can call our
-	  HLSL compiler wrapper method without any worry about OS version
-	  dependent system installed HLSL library.
-	  Note that there are multiple HLSL compiler library versions
-	  on Windows and system installed one would be OS version dependent.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2760>
+	* docs/plugins/gst_plugins_cache.json:
+	  video: Move NV12_10LE40_4L4 before the BE variant on LE platforms
+	  This keeps the sorting rules for the format list intact.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4974>
 
-2022-06-04 18:07:16 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-05-30 11:31:22 +0530  Taruntej Kanakamalla <taruntej@asymptotic.io>
 
 	* docs/plugins/gst_plugins_cache.json:
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Add a signal to plug bandwidth estimator elements
-	  We need GStreamer elements to do the bandwidth estimation as this way
-	  they can also control the pacing of the transmission flow as specified
-	  in the GCC algorithm for example.
-	  Bandwidth estimator element are placed right before the "RTPSession" as
-	  an "rtp-aux-sender" element. This way they can use the "Transport-wide
-	  Congestion Control" RTCP feedback messages through the "RTPTwcc" custom
-	  events that are sent by the rtpsession.
-	  Applications are responsible to react to the bandwidth estimator element
-	  and set the encoder target bitrate etc... which means that we can not
-	  pass an estimator as an element factory, so a signal as been chosen
-	  instead.
-	  GCC: https://datatracker.ietf.org/doc/html/draft-ietf-rmcat-gcc-02
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2562>
+	* ext/lc3/gstlc3dec.c:
+	* ext/lc3/gstlc3dec.h:
+	* ext/lc3/gstlc3enc.c:
+	* ext/lc3/lc3-plugin.c:
+	* tests/check/elements/lc3.c:
+	* tests/check/meson.build:
+	  lc3: add unit test
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4376>
 
-2022-07-08 00:16:02 +0900  Seungha Yang <seungha@centricular.com>
+2022-08-26 13:35:21 +0530  Taruntej Kanakamalla <taruntej@asymptotic.io>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  h265decoder: Report latency
-	  Similar to that of h264decoder
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2726>
+	* ext/lc3/gstlc3common.h:
+	* ext/lc3/gstlc3dec.c:
+	* ext/lc3/gstlc3dec.h:
+	* ext/lc3/gstlc3enc.c:
+	* ext/lc3/gstlc3enc.h:
+	* ext/lc3/lc3-plugin.c:
+	* ext/lc3/meson.build:
+	* ext/meson.build:
+	* meson_options.txt:
+	  lc3: plugin for LC3 audio codec
+	  lc3enc:
+	  - encodes raw audio into lc3 format
+	  - uses the default bitrate property and frame duration
+	  from the caps to determine the byte count of
+	  the encoded frames if it is not specified in
+	  the downstream caps after negotiation
+	  - uses the same byte count value for all the channels
+	  - all the common session configuration parameters
+	  are passed in the src caps
+	  lc3dec:
+	  - decodes an lc3 encoded audio
+	  - sink caps should contain all the common session configuration
+	  params
+	  - uses frame_duration and frame_bytes (byte count) in the sink
+	  caps as parameters along with sample rate and channel count
+	  - byte count is same for all the channels
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4376>
 
-2022-07-08 22:05:12 +0800  He Junyan <junyan.he@intel.com>
+2023-06-30 18:30:46 +0100  Philippe Normand <philn@igalia.com>
 
-	* sys/va/gstvabaseenc.c:
-	  va: baseenc: Do not use codec frame structure again after finish_frame().
-	  In _push_out_one_buffer(), we use codec frame structure again for error handling
-	  after we already call finish_frame(), which is a latent segment fault.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2739>
+	* ext/webrtc/gstwebrtcstats.c:
+	  webrtcstats: Properly report IceCandidate type
+	  strcmp returns a positive value if s1 is greater than s2, while we actually
+	  needed to check equality here.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4952>
 
-2022-07-08 21:57:40 +0800  He Junyan <junyan.he@intel.com>
+2023-06-30 15:14:59 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* sys/va/gstvabaseenc.c:
-	  va: baseenc: Do not clear the codec frame twice when error.
-	  The current manner will clear the input codec frame twice if we fail
-	  to push the output data, which will trigger an assert.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2739>
-
-2022-07-05 18:21:12 +0300  Jordan Petridis <jordan@centricular.com>
-
-	* ext/fluidsynth/gstfluiddec.c:
-	  fluiddec: Remove workaround for version 1.1.9
-	  We require >= 2.1 version since the previous commit
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2718>
-
-2022-07-05 17:32:12 +0300  Jordan Petridis <jordan@centricular.com>
-
-	* ext/fluidsynth/gstfluiddec.c:
-	* ext/fluidsynth/meson.build:
-	  fluidsynth: update from now deprecated api
-	  fluid_synth_set_chorus_on and fluid_synth_set_reverb_on were
-	  deprecated in favor of new funtions where you can also specify
-	  the fx_group the effect would apply.
-	  The behavior of the set_* variants was to apply to all groups
-	  so we pass -1 to the new functions as per documentation.
-	  https://www.fluidsynth.org/api/group__chorus__effect.html#ga3c48310eecdca9cd338799d19f19c32d
-	  and
-	  https://www.fluidsynth.org/api/group__reverb__effect.html#gacb7917564c988cf54f2e35189b509c8e
-	  and the introduction of the change:
-	  https://github.com/FluidSynth/fluidsynth/pull/673
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2718>
+	* ext/srt/gstsrtobject.c:
+	  srt: Always format reject reason code
+	  `srt_rejectreason_str` doesn't give us a unique string for every
+	  possible reason. Peers can define their own reasons and SRT just gives
+	  us the string `"Application-defined rejection reason"` for all of them.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4948>
+
+2023-06-30 23:21:21 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwritesubtitlemux.cpp:
+	* sys/dwrite/gstdwritesubtitlemux.h:
+	  dwritesubtitlemux: Update object name
+	  Add missing prefix `DWrite` so that this element can coexist with
+	  subtitlemux proposed in
+	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4938
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4949>
+
+2023-06-29 22:13:51 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwrite-utils.h:
+	* sys/dwrite/gstdwritebaseoverlay.cpp:
+	* sys/dwrite/gstdwritesubtitleoverlay.cpp:
+	  dwrite: Add support for non-d3d11/system memory
+	  Attach meta if downstream supports it whatever the negotiated memory type is,
+	  or just silently passthrough when meta is not supported
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4945>
+
+2023-06-27 23:40:20 +0900  Seungha Yang <seungha@centricular.com>
+
+	  dwrite: Add dwritesubtitleoverlay element
+	  Adding new subtitle overlay element. It's a bin which is wrapping
+	  two internal elements dwritesubtitlemux and dwritetextoverlay.
+	  * dwritesubtitlemux: A new internal element to aggregate subtitle
+	  buffers and to attach the aggregated subtitle buffers on
+	  video buffer as meta.
+	  * dwritetextoverlay: Extracts/renders the subtitle meta and
+	  discard the meta after rendering.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4934>
+
+2023-06-27 23:39:32 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwritebaseoverlay.cpp:
+	  dwritebaseoverlay: Fix color-font property get/set
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4934>
+
+2023-06-27 21:31:42 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwritesubtitlemux.cpp:
+	* sys/dwrite/gstdwritesubtitlemux.h:
+	* sys/dwrite/meson.build:
+	* sys/dwrite/plugin.cpp:
+	  dwrite: Add dwritesubtitlemux element
+	  dwrite plugin internal use and will be removed once it's added to -base
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4934>
+
+2023-06-27 22:29:09 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwrite-utils.cpp:
+	* sys/dwrite/gstdwrite-utils.h:
+	  dwrite: Add GstDWriteSubtitleMeta
+	  dwrite plugin internal use and will be removed once it's added to -base
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4934>
 
-2022-07-08 02:24:56 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-16 21:53:11 +0200  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* sys/d3d11/gstd3d11compositor.cpp:
-	* sys/d3d11/gstd3d11convert.cpp:
-	* sys/d3d11/gstd3d11converter.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11deinterlace.cpp:
-	* sys/d3d11/gstd3d11overlaycompositor.cpp:
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window_corewindow.cpp:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	* sys/d3d11/gstd3d11window_swapchainpanel.cpp:
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11: Use scoped device lock
-	  Make code simpler and more deadlock-free
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2728>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/sdp/gstsdpdemux.c:
+	* gst/sdp/gstsdpdemux.h:
+	  rtpsession: expose timeout-inactive-sources property
+	  In some situations it is not desirable to time out when no data is
+	  received any longer, users can opt in to this behavior via a new
+	  property.
+	  The property is also exposed on rtpbin and sdpdemux
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4880>
 
-2022-07-08 18:53:01 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-27 05:09:49 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/qsv/gstqsvencoder.cpp:
-	  qsvencoder: Fix for latency report when B-frame is enabled
-	  QSV runtime will introduce additional delay when B-frame is enabled
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2730>
+	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
+	* tests/check/libs/d3d11memory.c:
+	* tests/check/meson.build:
+	  d3d11bufferpool: Fix heavy CPU usage in case of fixed-size pool
+	  There's no reason to release GstMemory manually at all.
+	  If we do release GstMemory, corresponding GstBuffer will be
+	  discarded by GstBufferPool baseclass because the size is changed
+	  to zero.
+	  Actual cause of heavy CPU usage in case of fixed-size pool
+	  (i.e., decoder output buffer pool) and if we remove GstMemory from
+	  GstBuffer is that GstBufferPool baseclass is doing busy wait in acquire_buffer()
+	  for some reason. That needs to be investigated though, discarding
+	  and re-alloc every GstBuffer is not ideal already.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4935>
 
-2022-07-08 19:05:19 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-27 04:26:23 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/qsv/gstqsvencoder.cpp:
-	  qsvencoder: Do not query again if previous call succeeded
-	  Don't need to query multiple times
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2730>
+	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
+	  d3d11poolallocator: Initialize flush flag with TRUE
+	  If it's not active state, it should return flushing from acquire
+	  method
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4935>
+
+2023-06-27 22:15:12 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwritebaseoverlay.cpp:
+	  dwritebaseoverlay: Forward downstream wanted min buffer size
+	  Upstream element might want to know the min buffer size,
+	  d3d11 decoders for example.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4929>
+
+2023-06-27 22:07:02 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwrite-utils.h:
+	* sys/dwrite/gstdwritebaseoverlay.cpp:
+	  dwrite: Remove unused values
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4929>
+
+2023-06-24 00:00:02 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwritebaseoverlay.cpp:
+	* sys/dwrite/gstdwritebaseoverlay.h:
+	* sys/dwrite/gstdwritetextoverlay.cpp:
+	* sys/dwrite/libcaption/meson.build:
+	* sys/dwrite/meson.build:
+	  dwrite: Add support for closed caption overlay
+	  Adding closed caption rendering feature to dwritetextoverlay
+	  element.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4929>
+
+2023-06-23 23:44:19 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/libcaption/LICENSE.txt:
+	* sys/dwrite/libcaption/caption.c:
+	* sys/dwrite/libcaption/caption.h:
+	* sys/dwrite/libcaption/eia608.c:
+	* sys/dwrite/libcaption/eia608.h:
+	* sys/dwrite/libcaption/eia608_charmap.c:
+	* sys/dwrite/libcaption/eia608_charmap.h:
+	* sys/dwrite/libcaption/eia608_from_utf8.c:
+	* sys/dwrite/libcaption/utf8.c:
+	* sys/dwrite/libcaption/utf8.h:
+	* sys/dwrite/libcaption/version.txt:
+	* sys/dwrite/libcaption/xds.c:
+	* sys/dwrite/libcaption/xds.h:
+	  dwrite: Import libcaption source code
+	  Import the code from gst-plugins-rs
+	  (origin is https://github.com/szatmary/libcaption)
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4929>
+
+2023-06-24 01:43:50 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/dwrite/gstdwritebaseoverlay.h:
+	* sys/dwrite/gstdwritetimeoverlay.cpp:
+	  dwritetimeoverlay: Fix member variable initialization
+	  Use GstBaseTransform::start() instead
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4929>
 
-2022-07-08 03:38:30 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-18 14:30:14 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	* sys/d3d11/gstd3d11screencapture.h:
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	  d3d11screencapturesrc: Set colorimetry to caps
-	  Make use of reported DXGI colorspace if possible
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2729>
+	* gst-libs/gst/va/gstvavideoformat.c:
+	* gst-libs/gst/va/gstvavideoformat.h:
+	* sys/va/gstvacaps.c:
+	  va: Only change video format in gst_va_video_info_from_dma_info()
+	  The current way of using gst_video_info_set_format() will change all
+	  fields of the GstVideoInfo. We only need to change its format, stride
+	  and offset fields.
+	  In order to keep the consistency with th common drm API, we rename the
+	  gst_va_video_info_from_dma_info() into gst_va_dma_drm_info_to_video_info().
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4883>
+
+2023-05-30 09:38:57 +0200  Stéphane Cerveau <scerveau@igalia.com>
+
+	* sys/va/gstvah264enc.c:
+	  va: use GstH264Level enum in _va_h264_level_limits
+	  The 1B value has been changed to 9 instead of 11 in the list
+	  of level limits.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4737>
 
-2022-07-08 20:11:00 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-31 14:51:34 +0200  Stéphane Cerveau <scerveau@igalia.com>
 
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	  d3d11: Update colorspace map
-	  Map DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709 to sRGB colorimetry
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2729>
+	* gst-libs/gst/codecparsers/gsth264parser.h:
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	* gst/codectimestamper/gsth264timestamper.c:
+	* gst/videoparsers/gsth264parse.c:
+	  codecparsers: keep naming consistency in GST_H264_LEVEL
+	  GST_H264_LEVEL_2 should be used instead of GST_H264_LEVEL_2_0
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4737>
 
-2022-07-08 04:37:33 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-22 16:07:08 +0800  Haihua Hu <jared.hu@nxp.com>
 
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	* sys/d3d11/gstd3d11pluginutils.h:
-	  d3d11: Add an utility method for DXGI colorspace conversion
-	  Add a method for DXGI_COLOR_SPACE_TYPE -> GstVideoColorimetry conversion
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2729>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/dash/gstdashsink.c:
+	* ext/dash/gstmpdrootnode.c:
+	  dashsink: add property to set suggested presentation delay of MPD
+	  add property suggested-presentation-delay to configure MPD info
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4687>
 
-2022-07-08 01:30:13 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-23 20:01:04 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/d3d11/gstd3d11utils.cpp:
-	  d3d11: Serialize ensure_element_data() call
-	  It can be called any time from random thread. Thus, multiple
-	  device objects can be created for the same physical device
-	  if the call is not serialized, that's not a scenario we expect.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2727>
-
-2022-07-07 02:17:56 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst/proxy/gstproxysink.c:
-	  proxysink: Fix GstProxySrc leak
-	  Clear weak pointer to peer src when disposing.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1552>
-
-2022-07-06 03:14:25 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst/proxy/gstproxysink.c:
-	* gst/proxy/gstproxysink.h:
-	* tests/check/elements/proxysink.c:
-	* tests/check/meson.build:
-	  proxysink: Make sure stream-start and caps events are forwarded
-	  There might be a sequence of event and buffer flow:
-	  - Got stream-start/caps/segment events
-	  - Got flush events
-	  - And then buffers with a new segment event
-	  In the above case, stream-start and caps event might not be reached to
-	  peer proxysrc if peer proxysrc is not ready to receive them.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1552>
-
-2022-03-04 14:28:21 +1100  Matthew Waters <matthew@centricular.com>
-
-	* ext/webrtc/gstwebrtcice.c:
-	  webrtc: implement support for asynchronous host resolution
-	  Doesn't block anymore if a mdns host resolution takes multiple seconds
-	  to complete in e.g. stun/turn/ice candidate usage.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1961>
-
-2022-07-04 22:27:34 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/d3d11/gstd3d11converter.cpp:
-	* sys/d3d11/gstd3d11converter.h:
-	  d3d11converter: Remove convert() method
-	  Expose only single convert_buffer() method. It's safer approach than
-	  passing arbitrary list of SRV/RTV pointers.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2713>
+	* sys/va/gstvabasedec.c:
+	  va: basedec: Select the best format of the whole caps
+	  The current way only selects the best video format from the first
+	  structure of the caps. The caps like:
+	  video/x-raw(memory:VAMemory),drm-format=(string)NV12;  \
+	  video/x-raw(memory:VAMemory),format=(string){ NV12, Y210 }
+	  Will just choose NV12 as the result, even the bitstream is 10 bits.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4928>
 
-2022-07-04 22:26:19 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-19 13:06:37 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	  d3d11testsrc: Use convert_buffer() method
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2713>
+	* sys/msdk/gstmsdkenc.c:
+	* sys/msdk/gstmsdkh264enc.c:
+	* sys/msdk/gstmsdkh265enc.c:
+	  msdkenc: Apply update functions when setting property
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4865>
 
-2022-07-04 22:01:49 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-23 17:20:05 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	* sys/d3d11/gstd3d11videoprocessor.cpp:
-	* sys/d3d11/gstd3d11videoprocessor.h:
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/meson.build:
-	  d3d11: Remove video processor
-	  Processing using ID3D11VideoProcessor was integrated into
-	  GstD3D11Converter and GstD3D11VideoProcessor implementation is
-	  not used anymore.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2713>
+	* sys/msdk/gstmsdkenc.c:
+	* sys/msdk/gstmsdkenc.h:
+	  msdkenc: Add help functions to check and update property
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4865>
 
-2022-07-04 21:57:42 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-21 13:44:40 +0200  Edward Hervey <edward@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.h:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	* tests/examples/d3d11/d3d11videosink-appsrc.cpp:
-	  d3d11memory: Update alloc_wrapped() API to avoid staging texture alloc
-	  Add size parameter and use it for CPU accessible memory size
-	  instead of allocating staging texture per API call.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2713>
+	* tests/validate/testsrcbin/caps_spec/flow-expectations/log-testsrcbin0-video_src_0-expected:
+	  streamcollection: Use upstream-id as name
+	  It is more coherent, in the same vein as  08dc5d29
+	  Fixes #2640
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4911>
+
+2023-06-19 14:25:09 +0200  Stéphane Cerveau <scerveau@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkvideoutils.c:
+	  vkvideoutils: fix memory leak in structure's string
+	  Retrieve a const char* from structure for "chromat-format" and
+	  avoid extra mem copy.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4904>
+
+2023-06-19 14:27:24 +0200  Stéphane Cerveau <scerveau@igalia.com>
+
+	* tests/check/libs/vkimagebufferpool.c:
+	  tests: fix mem leak in vkimagebufferpool
+	  caps should be freed after usage.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4904>
 
-2022-06-30 11:04:29 +0200  Ignazio Pillai <ignazp@amazon.com>
+2023-06-16 14:37:42 +0200  Stéphane Cerveau <scerveau@igalia.com>
 
-	* sys/wasapi/gstwasapiutil.c:
-	  wasapi: Implement default audio channel mask
-	  Some multichannel capture devices does not provide a channel mask value
-	  which will result in a pipeline failure due to the empty channel mask.
-	  Implemented the same fix used for wasapi2
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1204
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2692>
+	* gst-libs/gst/vulkan/gstvkdevice.c:
+	  vkdevice: fix beta extensions symbol
+	  Missing 's' to VK_ENABLE_BETA_EXTENSIONS
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4904>
 
-2022-07-03 01:22:10 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-19 12:57:23 +0200  Stéphane Cerveau <scerveau@igalia.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Add support for rotation
-	  Adding "rotate-method" property
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1396
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2708>
+	* gst-libs/gst/vulkan/gstvkphysicaldevice.c:
+	  vkphysicaldevice: fix leak with queue_family_query_props
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4904>
 
-2022-07-03 01:18:19 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-20 14:33:48 +0100  Stéphane Cerveau <scerveau@igalia.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11videosink.h:
-	  d3d11videosink: Protect window with lock at every place
-	  Access to the object should be thread safe to support runtime
-	  property update
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2708>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vulkan: fix C2099 error with VS2019
+	  As VK_FORMAT_FEATURE_2_xxx are defined as static const variable, the
+	  vscoce C compiler prevents the initialization of the  vk_usage_map
+	  structure with error "C2099: initializer is not a constant".
+	  Init the structure separately.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4904>
 
-2022-07-02 04:23:41 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-20 23:42:35 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/d3d11/gstd3d11basefilter.cpp:
-	* sys/d3d11/gstd3d11convert.cpp:
-	  d3d11convert: Add support for GstVideoOrientationMethod
-	  Add flip/rotation support via GstVideoDirectionInterface
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2708>
-
-2022-07-02 02:15:00 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/d3d11/gstd3d11converter.cpp:
-	  d3d11converter: Add support for GstVideoOrientationMethod
-	  Shader can handle rotation/flip with other conversions
-	  at once in a single pipeline, and depending on device
-	  capability, videoprocessor may support it too.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2708>
+	* sys/va/gstvabasetransform.c:
+	  va: basetransform: Copy the interested meta data for importing
+	  The current way of using parent's copy_metadata() virtual function will
+	  selectively filter out some meta such as crop meta. That virtual function
+	  should be used when copying input buffer's meta data into output buffer,
+	  not suitable when importing the input buffer.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4887>
 
-2022-07-01 23:49:49 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-20 21:45:56 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	  d3d11videosink: Use single GstD3D11Converter object
-	  GstD3D11Converter supports videoprocessor and texture upload.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2697>
+	* sys/va/gstvabasetransform.c:
+	  va: basetransform: Check the crop meta when importing
+	  When the input buffer has crop meta, and we need to do copy, we
+	  should consider the uncropped video size and copy the full size
+	  of video memory.
+	  The video meta in this case should contain the full uncropped
+	  resolution info. We can use it to create full size va buffers.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4887>
 
-2022-07-01 21:35:15 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-20 20:20:24 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	  d3d11memory: Add private method for texture wrapped memory allocation
-	  Unlike public method gst_d3d11_allocator_alloc_wrapped(), newly
-	  added method by this commit will not calculate CPU accessible memory
-	  size, since staging texture must be allocated to calculate the size.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2697>
+	* sys/va/gstvabasetransform.c:
+	  va: basetransform: Only need va pool for internal usage
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4887>
 
-2022-07-01 21:20:02 +0900  Seungha Yang <seungha@centricular.com>
+2022-12-09 02:10:13 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* sys/d3d11/gstd3d11pluginutils.h:
-	  d3d11: Use library private header in plugin
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2697>
+	* ext/meson.build:
+	* ext/qt6d3d11/gstqml6d3d11sink.cpp:
+	* ext/qt6d3d11/gstqml6d3d11sink.h:
+	* ext/qt6d3d11/gstqsg6d3d11node.cpp:
+	* ext/qt6d3d11/gstqsg6d3d11node.h:
+	* ext/qt6d3d11/gstqt6d3d11videoitem.cpp:
+	* ext/qt6d3d11/gstqt6d3d11videoitem.h:
+	* ext/qt6d3d11/meson.build:
+	* ext/qt6d3d11/plugin.cpp:
+	* meson_options.txt:
+	* tests/examples/meson.build:
+	* tests/examples/qt6d3d11/meson.build:
+	* tests/examples/qt6d3d11/qml6d3d11sink-dyn-add/meson.build:
+	* tests/examples/qt6d3d11/qml6d3d11sink-dyn-add/qml6d3d11sink-dyn-add.cpp:
+	* tests/examples/qt6d3d11/qml6d3d11sink-dyn-add/qml6d3d11sink-dyn-add.qml:
+	* tests/examples/qt6d3d11/qml6d3d11sink-dyn-add/qml6d3d11sink-dyn-add.qrc:
+	* tests/examples/qt6d3d11/qml6d3d11sink/meson.build:
+	* tests/examples/qt6d3d11/qml6d3d11sink/qml6d3d11sink.cpp:
+	* tests/examples/qt6d3d11/qml6d3d11sink/qml6d3d11sink.qml:
+	* tests/examples/qt6d3d11/qml6d3d11sink/qml6d3d11sink.qrc:
+	  qt6d3d11: Add Direct3D11 Qt6 QML sink
+	  Adding Direct3D11 backend Qt6 QML videosink element, qml6d3d11sink.
+	  Implementation details are similar to the qt6 plugin in -good
+	  but there are a few notable differences.
+	  * qml6d3d11sink accepts all GstD3D11 supported video formats (e.g., NV12).
+	  * Scene graph (owned by qml6d3d11sink) will hold dedicated and sharable
+	  RGBA texture which belongs to Qt6's Direct3D11 device, instead of sharing
+	  GStreamer's own texture with Qt6.
+	  * All rendering operations will be done by using GStreamer's Direct3D11 device.
+	  Specifically, upstream texture will be copied (in case of RGBA)
+	  or converted to the above mentioned Qt6's sharable texture.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3707>
 
-2022-07-01 20:47:37 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-13 11:53:57 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	  d3d11compositor: Use single GstD3D11Converter object
-	  ... and remove unnessary videoprocessor/upload/copy code
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2697>
+	* sys/va/gstvavpp.c:
+	  vapostproc: evaluate op_flags validations as boolean
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4910>
 
-2022-07-01 04:12:23 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-13 14:25:04 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/d3d11/gstd3d11convert.cpp:
-	  d3d11convert: Add border-color property
-	  Use user specified border-color instead of black color
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2697>
+	* gst/dvdspu/gstspu-pgs.c:
+	  dvdspu: Avoid integer overflow when checking if enough data is available
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4896>
 
-2022-07-01 20:13:29 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-13 14:23:47 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/d3d11/gstd3d11convert.cpp:
-	  d3d11convert: Use single GstD3D11Converter object
-	  ... and don't use GstD3D11VideoProcessor. Now GstD3D11Converter will
-	  be able to convert using videoprocessor, and texture upload is also supported by
-	  GstD3D11Converter. All the noisy code can be removed therefore.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2697>
+	* gst/dvdspu/gstspu-pgs.c:
+	  dvdspu: Make sure enough data is allocated for the available data
+	  If the size read from the stream is smaller than the currently available
+	  data then the size is bogus and the data should simply be discarded.
+	  Fixes ZDI-CAN-20994
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2660
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4896>
 
-2022-06-22 02:44:26 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-18 09:59:36 +0200  Andoni Morales Alastruey <amorales@fluendo.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	* sys/d3d11/gstd3d11convert.cpp:
-	* sys/d3d11/gstd3d11converter.cpp:
-	* sys/d3d11/gstd3d11converter.h:
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	  d3d11converter: Add support conversion using videoprocessor
-	  * Add videoprocessor feature to d3d11converter, in order to unifiy
-	  conversion flow.
-	  * Add convert_buffer() method to support automatic shader/videoprocessor
-	  selection. The method also supports texture upload if input memory
-	  cannot be used for conversion (e.g., system memory or so)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2697>
+	* sys/applemedia/vtenc.c:
+	* sys/applemedia/vtenc.h:
+	  vtenc: remove duplicated framerate and size variables
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4282>
 
-2022-06-21 23:43:46 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-30 15:38:22 +0200  Andoni Morales Alastruey <amorales@fluendo.com>
 
-	* sys/d3d11/gstd3d11overlaycompositor.cpp:
-	* sys/d3d11/gstd3d11overlaycompositor.h:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	  d3d11overlaycompositor: Objectify overlay render implementation
-	  Be consistent with other implementations
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2697>
+	* sys/applemedia/meson.build:
+	* sys/applemedia/vtdec.h:
+	* sys/applemedia/vtenc.c:
+	* sys/applemedia/vtenc.h:
+	* tests/validate/meson.build:
+	* tests/validate/vtenc/vtenc_h264.validatetest:
+	* tests/validate/vtenc/vtenc_h264/flow-expectations/log-enc-src-expected:
+	* tests/validate/vtenc/vtenc_h264_b_frames.validatetest:
+	* tests/validate/vtenc/vtenc_h264_b_frames/flow-expectations/log-enc-src-expected:
+	* tests/validate/vtenc/vtenc_h265.validatetest:
+	* tests/validate/vtenc/vtenc_h265/flow-expectations/log-enc-src-expected:
+	* tests/validate/vtenc/vtenc_h265_b_frames.validatetest:
+	* tests/validate/vtenc/vtenc_h265_b_frames/flow-expectations/log-enc-src-expected:
+	  vtenc: apply DTS offset to ensure DTS <= PTS
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4282>
 
-2022-06-21 22:44:55 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-19 00:06:56 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	* sys/d3d11/gstd3d11convert.cpp:
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	* sys/d3d11/gstd3d11pluginutils.h:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	  d3d11: Don't use const pointer to GstDxgiColorSpace
-	  Instead, fill values of passed GstDxgiColorSpace struct
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2697>
+	* sys/dwrite/gstdwritebaseoverlay.cpp:
+	  dwrite: Protect ID2D1Factory API with lock
+	  ID2D1Factory::CreateDxgiSurfaceRenderTarget is not thread-safe
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4886>
 
-2022-06-28 16:40:55 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-06-16 19:22:55 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/decklink/gstdecklink.h:
-	* sys/decklink/gstdecklinkvideosink.cpp:
-	  decklinkvideosink: Pass video frames directly to the Decklink SDK without copying
-	  If the video frame is stored in PBO memory then we need to copy anyway as
-	  it might be stored in CPU-accessible GPU memory that can't be accessed
-	  from the Decklink driver.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2674>
+	* sys/d3d11/gstd3d11decoder.cpp:
+	  d3d11decoder: Reduce DPB size
+	  Now all codec baseclasses can inform subclasses of correct max DPB size,
+	  and exception handling (e.g., emergency bumping in h.264) has been
+	  improved as well. Smaller number of additional DPB frame allocation
+	  seems to be safe.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4878>
 
-2022-05-10 14:11:06 +0800  Vincent Cheah Beng Keat <vincent.beng.keat.cheah@intel.com>
+2023-05-29 21:53:52 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkdec.c:
-	* sys/msdk/gstmsdkmjpegdec.c:
-	* sys/msdk/meson.build:
-	  msdkmjpegdec: Add support for error report
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2401>
+	* docs/libs/cuda/index.md:
+	* gst-libs/gst/cuda/gstcudautils.cpp:
+	  cuda: Introduce GST_CUDA_CRITICAL_ERRORS env to abort on critical error
+	  Adding GST_CUDA_CRITICAL_ERRORS env variable so that program can be
+	  terminated on unrecoverable error.
+	  Example)
+	  GST_CUDA_CRITICAL_ERRORS=2,700 gst-launch-1.0 ...
+	  In this example, CUDA_ERROR_OUT_OF_MEMORY(2) and
+	  CUDA_ERROR_ILLEGAL_ADDRESS(700) are registered as critical error
+	  and program will be aborted on those errors
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4729>
 
-2022-06-23 01:10:38 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-29 21:27:17 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/nvcodec/gstnvencoder.cpp:
-	* sys/nvcodec/gstnvencoder.h:
-	* sys/nvcodec/gstnvh264encoder.cpp:
-	* sys/nvcodec/gstnvh264encoder.h:
-	* sys/nvcodec/gstnvh265encoder.cpp:
-	* sys/nvcodec/gstnvh265encoder.h:
-	* sys/nvcodec/plugin.c:
-	  nvencoder: Add support for dynamic GPU device selection
-	  Adding nvautogpu{h264,h265}enc class which will accept upstream logical
-	  GPU device object (GstCudaContext or GstD3D11Device) instead of
-	  using pre-assigned GPU instance.
-	  If upstream logical GPU device object is not NVENC compatible
-	  (e.g., D3D11 device of non-NVIDIA GPU) or it's system memory,
-	  then user specified "cuda-device-id" or "adapter-luid" property
-	  will be used for GPU device selection.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2666>
+	* gst-libs/gst/cuda/gstcudautils.cpp:
+	* gst-libs/gst/cuda/gstcudautils.h:
+	  cuda: Move cuda debug helper function to .cpp
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4729>
 
-2022-06-27 20:50:15 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-18 23:58:22 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/cuda/gstcudautils.c:
-	  cuda: Protect gst_cuda_ensure_element_context() with lock
-	  Serialize the order of context setup since it can be called
-	  from multiple threads
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2666>
+	* sys/d3d11/gstd3d11overlaycompositor.cpp:
+	  d3d11overlaycompositor: Fix resource leak
+	  Fixing regression since 94eadc9810bb1797e291fc36fb48801e3b10d3f2
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4885>
 
-2022-06-30 16:45:46 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-09 00:36:22 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/cuda/gstcudamemory.c:
-	* sys/nvcodec/gstcudabasefilter.c:
-	* sys/nvcodec/gstcudaformat.h:
-	  cuda: Add YUY2 and UYVY formats for GL interop
-	  Those formats are not supported conversion formats by CUDA convert/scale elements
-	  but would be useful for GL <-> CUDA interop use case.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2691>
+	* sys/amfcodec/gstamfav1enc.cpp:
+	  amfav1enc: Workaround driver bug with bt601 color matrix
+	  If bt601 is specified, driver generates sequence header with identity
+	  color matrix
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4370>
 
-2022-06-30 17:47:05 +0900  Seungha Yang <seungha@centricular.com>
+2022-03-18 12:37:46 -0400  Daniel Almeida <daniel.almeida@collabora.com>
 
-	* sys/nvcodec/gstcudamemorycopy.c:
-	  cudadownload: Passthrough in case of CUDA -> SYSTEM
-	  GstCudaMemory supports CPU access via CUDA pinned host memory already
-	  and it would show faster memory transfer performance between
-	  GPU and CPU than copying from/to normal system memory.
-	  If downstream supports video meta, we can passthrough CUDA memory.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2690>
+	* sys/v4l2codecs/gstv4l2codecav1dec.c:
+	* sys/v4l2codecs/gstv4l2codecav1dec.h:
+	* sys/v4l2codecs/meson.build:
+	* sys/v4l2codecs/plugin.c:
+	  v4l2codecs: Add AV1 decoder
+	  This patch adds AV1 stateless v4l2 decode support using the
+	  new v4l2 request API to communicate with hardware accelerators.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1011>
 
-2022-06-30 09:09:02 +0300  Sebastian Dröge <sebastian@centricular.com>
+2022-12-05 14:21:42 +0100  Benjamin Gaignard <benjamin.gaignard@collabora.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Reject caps that are not valid for creating an SDP media.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2689>
+	* gst-libs/gst/codecparsers/gstav1parser.c:
+	  codecparser: AV1: fix reference frame ordering
+	  In AV1 specifications earliest_order_hint is initialized at
+	  beginning of the process and not before each frame ordering.
+	  FFMPEG parser does the same.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1011>
 
-2022-04-22 16:37:34 +0200  Corentin Damman <c.damman@intopix.com>
+2023-05-11 15:28:35 +0200  Michael Olbrich <m.olbrich@pengutronix.de>
 
-	* sys/nvcodec/gstcudaformat.h:
-	  cudaformat: add support for planar 4:2:2 YUV formats in CUDA D3D11 interop
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2269>
+	* gst/sdp/gstsdpdemux.c:
+	  sdpdemux: ensure that only one srcpad is created per stream
+	  If two senders use the same multicast IP and port then new_session_pad()
+	  may try to add a srcpad to the same stream twice.
+	  stream->srcpad is updated but gst_element_add_pad() fails the second
+	  time. As a result stream->srcpad points to a deleted object and
+	  access in gst_sdp_demux_stream_free() fails with a segfault.
+	  Just ignore the second pad. Nothing useful can be done with it anyway.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4603>
 
-2022-04-22 15:58:13 +0200  Corentin Damman <c.damman@intopix.com>
+2023-06-15 01:47:37 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/cuda/gstcudamemory.c:
-	* sys/nvcodec/gstcudaformat.h:
-	  cudamemory: add support for planar 4:2:2 YUV formats
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2269>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  va: Fix Windows build
+	  DRM_FORMAT_MOD_LINEAR and DRM_FORMAT_MOD_INVALID are not defined
+	  on Windows
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4864>
 
-2021-06-22 14:43:29 +0200  Benjamin Gaignard <benjamin.gaignard@collabora.com>
+2023-05-14 13:23:17 +0100  James Cowgill <james.cowgill@blaize.com>
 
-	* sys/v4l2codecs/gstv4l2decoder.c:
-	  v4l2codecs: enumerate all possible formats
-	  Some decoder may also allow to (down) scale the decoded video.
-	  Use VIDIOC_ENUM_FRAMESIZES iotcl to enumerate the possible output
-	  formats resolutions.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2589>
+	* sys/v4l2codecs/gstv4l2codech264dec.c:
+	* sys/v4l2codecs/gstv4l2codech265dec.c:
+	* sys/v4l2codecs/gstv4l2codecvp8dec.c:
+	  v4l2codecs: Always chain up to parent decide_allocation function
+	  The `gst_video_decoder_negotiate_pool` function expects the
+	  `decide_allocation` function to always provide a pool and will fail to
+	  negotiate if the pool is missing. If we return immediately (even if we
+	  don't need to do anything special) negotiation will fail if the
+	  downstream element does not propose a pool.
+	  Fix by chaining up to the default `decide_allocation` function which
+	  adds a fallback pool if one was not already proposed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4630>
 
-2022-06-26 22:26:29 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-15 10:41:26 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* sys/nvcodec/gstnvav1dec.c:
-	* sys/nvcodec/gstnvdecoder.h:
-	* sys/nvcodec/gstnvh264dec.c:
-	* sys/nvcodec/gstnvh264dec.h:
-	* sys/nvcodec/gstnvh265dec.c:
-	* sys/nvcodec/gstnvh265dec.h:
-	* sys/nvcodec/gstnvvp8dec.c:
-	* sys/nvcodec/gstnvvp8dec.h:
-	* sys/nvcodec/gstnvvp9dec.c:
-	* sys/nvcodec/gstnvvp9dec.h:
-	  nvcodec: Add cuda-device-id read-only property to stateless decoders
-	  ... and remove unnecessary intermediate subclass from class hierarchy
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2665>
+	* docs/plugins/gst_plugins_cache.json:
+	  doc: Update plugin cache
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3447>
 
-2022-06-26 21:09:50 +0900  Seungha Yang <seungha@centricular.com>
+2022-11-21 11:33:09 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* sys/nvcodec/gstnvdec.c:
-	  nvcodec: Add cuda-device-id read-only property to CUVID decoders
-	  Similar to the other hardware decoder plugins, provides assigned
-	  device id via property
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2665>
+	* sys/v4l2codecs/gstv4l2format.c:
+	* sys/v4l2codecs/gstv4l2format.h:
+	  v4l2codecs: Enable Verisilicon 10bit 4:2:0 support
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3447>
 
-2022-06-29 10:55:13 +0100  Tim-Philipp Müller <tim@centricular.com>
+2023-06-14 17:18:04 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* meson.build:
-	  coding style: allow declarations after statement
-	  See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1243/
-	  and https://gitlab.freedesktop.org/gstreamer/gstreamer-project/-/issues/78
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2683>
+	* sys/v4l2codecs/linux/media.h:
+	* sys/v4l2codecs/linux/v4l2-common.h:
+	* sys/v4l2codecs/linux/v4l2-controls.h:
+	* sys/v4l2codecs/linux/videodev2.h:
+	  v4l2: Sync headers to current media_stage
+	  commit d78b9d6671decdaedb539635b1d0a34f8f5934f8
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3447>
+
+2023-05-28 01:59:23 +0900  Seungha Yang <seungha@centricular.com>
+
+	  dwrite: Add DirectWrite text rendering plugin
+	  Adding DirectWrite text rendering elements
+	  * dwriteclockoverlay: Equivalent to clockoverlay
+	  * dwritetimeoverlay: Equivalent to timeoverlay
+	  * dwritetextoverlay: Similar to textoverlay but subtitle is not
+	  supported
+	  Newly added elements support system memory and d3d11 memory
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4826>
 
-2022-06-29 00:31:01 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-15 18:40:38 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11convert.cpp:
-	  d3d11convert: Add support for GstVideoCropMeta
-	  Performs crop, scale, and color space conversion all in
-	  a single render pipeline. Note that cropping related property is not
-	  added in this element (which will make negotiation very complicated),
-	  but user can configure videocrop element for crop meta to be attached
-	  on each buffer.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2678>
+	* sys/d3d11/gstd3d11overlaycompositor.cpp:
+	  d3d11overlaycompositor: Add support for d3d11 memory
+	  If overlay buffer is d3d11 memory, use it directly
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4826>
 
-2022-06-28 17:40:56 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-09 14:05:58 -0400  Aaron Boxer <boxerab@protonmail.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	  d3d11videosink: Fix for force-aspect-ratio setting when rendering on shared texture
-	  Set specified force-aspect-ratio value on window object
-	  in case of shared texture rendering as well
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1304
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2671>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/mpegtsmux/gstatscmux.c:
+	* gst/mpegtsmux/gstbasetsmux.c:
+	* gst/mpegtsmux/gstbasetsmux.h:
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	* gst/mpegtsmux/tsmux/tsmux.h:
+	* gst/mpegtsmux/tsmux/tsmuxstream.c:
+	* gst/mpegtsmux/tsmux/tsmuxstream.h:
+	  mpegtsmux: add stream-number property on GstBaseTsMuxPad
+	  This new property allows setting of PES stream number for AAC audio
+	  and AVC video streams.
+	  The stream number is subject to the following constraints:
+	  1. it must be between 0 and 15 for video
+	  2. it must be between 0 and 31 for audio
+	  Currently the PES stream number is hard-coded to zero for these
+	  stream types.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4822>
+
+2023-05-20 19:33:27 +0200  Marek Vasut <marex@denx.de>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/bayer/gstbayer2rgb.c:
+	* gst/bayer/gstbayerorc-dist.c:
+	* gst/bayer/gstbayerorc-dist.h:
+	* gst/bayer/gstbayerorc.orc:
+	  bayer2rgb: Support video/x-bayer 10/12/14/16 bit depths
+	  Add support for 10/12/14/16 bit depths . This consists of multiple parts.
+	  First is the parsing of caps, which pulls out the bitness and endianness
+	  from the video/x-bayer format.
+	  Second, gst_bayer2rgb_split_and_upsample_horiz() is split into two similar
+	  functions, one for 8bit bayer handling and another for 16bit bayer handling.
+	  The content is basically identical, except one uses 8bpp and the other 16bpp
+	  inputs and outputs, and they each use different ORC code to match. The 16bpp
+	  variant also handles endian swapping. There is now a wrapper called
+	  gst_bayer2rgb_split_and_upsample_horiz() which selects the correct function
+	  based on bpp from the parser.
+	  Third, gst_bayer2rgb_process() is extended to handle both 8bit and 16bit
+	  bayer data. Yet again there are matching ORC functions to handle the 16bit
+	  data. This time however the 16bit handling of data is slightly special. The
+	  ORC is not able to emit opcodes for 'x2 mergelq', so the trick here is to
+	  store the BG and GR longs into separate 'dtmp' temporary buffer, and then
+	  do one more ORC post-processing step, compensate for the less-than-16bpp
+	  bitness using left shift, and reorder them into the destination frame
+	  using 'mergelq' .
+	  Example usage:
+	  ```
+	  $ gst-launch-1.0 videotestsrc ! \
+	  video/x-bayer,width=512,height=512,format=bggr16le ! \
+	  bayer2rgb ! \
+	  video/x-raw,format=RGBA64_LE ! \
+	  videoconvert ! \
+	  autovideosink
+	  ```
+	  Example usage:
+	  ```
+	  $ gst-launch-1.0 videotestsrc ! \
+	  video/x-raw,width=512,height=512,format=ARGB ! \
+	  rgb2bayer ! \
+	  video/x-bayer,format=bggr12le ! \
+	  bayer2rgb ! \
+	  video/x-raw,format=RGBA64_LE ! \
+	  videoconvert ! \
+	  autovideosink
+	  ```
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4686>
 
-2022-06-26 06:39:54 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-20 23:33:14 +0200  Marek Vasut <marex@denx.de>
 
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	* sys/mediafoundation/gstmfvideoencoder.h:
-	  mfvideoenc: Fix broken encoding when resolution is not an even number
-	  Width and height values of 4:2:0 subsampled YUV format should be even number,
-	  and if it's not the case, there should be padding which is not a contiguous memory layout.
-	  Do copy input frames to MediaFoundation's memory in that case for now.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1165
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2661>
+	* gst/bayer/gstbayer2rgb.c:
+	  bayer2rgb: Add comments explaining gst_bayer2rgb_process()
+	  Add comments regarding which LINE()s point to which data in the
+	  temporary buffer and a large comment explaining how the buffer
+	  is processed. This will hopefully be useful to someone, as the
+	  code is not obvious. No functional change.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4686>
+
+2023-05-20 16:55:48 +0200  Marek Vasut <marex@denx.de>
+
+	* gst/bayer/gstbayer2rgb.c:
+	  bayer2rgb: Add comment on bayer_orc_horiz_upsample
+	  Explain how the bayer_orc_horiz_upsample function works and
+	  what it does with the pixels, as this may not be obvious.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4686>
+
+2023-05-20 23:34:15 +0200  Marek Vasut <marex@denx.de>
+
+	* gst/bayer/gstbayer2rgb.c:
+	  bayer2rgb: Pass filter pointer into gst_bayer2rgb_split_and_upsample_horiz()
+	  Instead of passing a single element of GstBayer2RGB structure into the
+	  gst_bayer2rgb_split_and_upsample_horiz(), pass the entire pointer and
+	  let the funciton pick out whatever it needs out of the structure. This
+	  is a preparatory patch. No functional change.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4686>
+
+2023-05-20 16:03:10 +0200  Marek Vasut <marex@denx.de>
+
+	* gst/bayer/gstbayer2rgb.c:
+	  bayer2rgb: Pass all parameters to LINE() macro
+	  Pass all three parameters used by the LINE() macro to the LINE() macro
+	  and unroll the code for readability. Add more comments regarding which
+	  of these LINE()s point to which data in the temporary buffer to make
+	  the code less confusing.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4686>
+
+2023-05-20 21:43:13 +0200  Marek Vasut <marex@denx.de>
+
+	* gst/bayer/gstbayer2rgb.c:
+	  bayer2rgb: Fold src_stride into gst_bayer2rgb_process()
+	  The source stride parameter can be easily obtained from GstBayer2RGB
+	  structure, do it within gst_bayer2rgb_process() and drop the parameter.
+	  No functional change.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4686>
+
+2023-05-20 16:01:13 +0200  Marek Vasut <marex@denx.de>
+
+	* gst/bayer/gstbayer2rgb.c:
+	  bayer2rgb: Inline the j=0 value
+	  The j variable is used as an iterator further down in this code, but
+	  here it can be just inlined in the macro parameters to make the code
+	  easier to read. This is done in preparation for further changes. No
+	  functional change.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4686>
+
+2023-06-07 23:33:05 +0200  Marek Vasut <marex@denx.de>
+
+	* gst/bayer/gstbayer2rgb.c:
+	  bayer2rgb: Disable in-place transform
+	  The bayer2rgb process implemented doesn't support in-place tranform.
+	  This element doesn't implement a "transform_ip" vmethod of
+	  GstBaseTransform it will revert to using the "tranform" vmethod.
+	  It's misleading to set it to TRUE, here. Change this to FALSE.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4686>
+
+2023-05-21 00:02:55 +0200  Marek Vasut <marex@denx.de>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/bayer/gstrgb2bayer.c:
+	* gst/bayer/gstrgb2bayer.h:
+	  rgb2bayer: Support video/x-bayer 10/12/14/16 bit depths
+	  Add support for conversion to 10/12/14/16 bit bayer pattern.
+	  The implementation is rather simplistic, just take the ARGB
+	  input, generate 16-bit data out of it instead of 8-bit, shift
+	  them as required by the output bitness, and apply endian swap.
+	  Example usage:
+	  ```
+	  $ gst-launch-1.0 videotestsrc num-buffers=1 ! \
+	  video/x-raw,width=512,height=512,format=ARGB ! \
+	  rgb2bayer ! \
+	  video/x-bayer,format=bggr12le ! \
+	  filesink location=/tmp/bayer12.raw
+	  ```
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4686>
 
-2022-06-28 01:29:06 +0100  Tim-Philipp Müller <tim@centricular.com>
+2023-06-15 01:36:25 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/opus/gstopusheader.h:
-	  dv, opusparse: fix duplicate symbols in static build
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1262
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2670>
+	* sys/d3dvideosink/d3dvideosink.c:
+	  d3dvideosink: Fix navigation event leak
+	  Fixing regression introduced in 6c2f6c3bd4dd525eb02c6d7000e84b76663d3daf
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4863>
 
-2022-06-27 04:07:04 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-15 00:47:11 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/plugin.cpp:
-	  d3d11: Enumerate devices via native DXGI API
-	  D3D11CreateDevice() can fail for some reason (e.g., buggy GPU driver)
-	  and then gst_d3d11_device_new() will return nullptr.
-	  Use DXGI API directly instead of relying on the gst_d3d11_device_new()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2663>
+	* sys/d3d11/gstd3d11overlaycompositor.cpp:
+	* sys/d3d11/gstd3d11videosink.cpp:
+	  d3d11videosink: Fixing unexpected overlay composition meta drops
+	  A buffer can hold multiple GstVideoOverlayCompositionMeta objects.
+	  Should scan all metas on a buffer and render all overlay rectangles
+	  if any.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4862>
 
-2022-06-25 01:15:17 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-11 22:22:36 +0200  Marek Vasut <marex@denx.de>
 
-	* tests/examples/d3d11/d3d11videosink-appsrc.cpp:
-	* tests/examples/d3d11/meson.build:
-	  examples: Add an example for application texture sharing
-	  This example shows GstD3D11BufferPool usage and a way of
-	  D3D11 texture sharing between application and GStreamer via appsrc.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2646>
+	* sys/kms/gstkmssink.c:
+	  kmssink: Add ST STM32 LTDC auto-detection
+	  Add STM32 LTDC controller into list of auto-detected modules.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4858>
 
-2022-06-24 07:06:00 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-11 22:22:25 +0200  Marek Vasut <marex@denx.de>
 
-	* tests/examples/d3d11/d3d11decoder-appsink.cpp:
-	* tests/examples/d3d11/meson.build:
-	  examples: Add d3d11decoder zero-copy rendering example
-	  This example code demonstrates D3D11 device sharing between
-	  application and GStreamer. Application can access texture
-	  using appsink and it can be rendered on application's window without
-	  any copy operation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2646>
+	* sys/kms/gstkmssink.c:
+	  kmssink: Add NXP i.MX8M Plus LCDIFv3 auto-detection
+	  Add i.MX8M Plus LCDIFv3 controller into list of auto-detected modules.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4858>
 
-2022-06-24 22:17:28 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-13 11:41:43 -0400  Arun Raghavan <arun@asymptotic.io>
 
-	* gst-libs/gst/d3d11/gstd3d11utils.cpp:
-	* gst-libs/gst/d3d11/gstd3d11utils.h:
-	  d3d11: Add a helper method for GstContext creation
-	  Add gst_d3d11_context_new() method for application to create
-	  GstContext using GstD3D11Device.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2646>
+	* ext/webrtcdsp/gstwebrtcdsp.cpp:
+	* ext/webrtcdsp/gstwebrtcechoprobe.cpp:
+	* ext/webrtcdsp/gstwebrtcechoprobe.h:
+	  webrtcdsp: Deal with echo probe info not being available
+	  Even if we don't yet know what the echo probe format is, we want to be able to
+	  provide silence for the reverse path, so that when the probe becomes available,
+	  there is no ambiguity around what time period the new set of samples are for.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4849>
+
+2023-06-06 16:34:19 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+
+	* ext/webrtcdsp/gstwebrtcdsp.cpp:
+	  webrtcdsp: Map probe buffers with probe info, not dsp info
+	  The probe's info may not precisely match the dsp's info. For instance,
+	  the number of channels or their layout might be different.
+	  ```
+	  GStreamer-Audio-CRITICAL **: 16:21:32.899: the GstAudioInfo argument is not equal to the GstAudioMeta's attached info
+	  ```
+	  This broke in d5755744c3e2b70e9f04704ae9d18b928d9fa456.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4849>
 
-2022-06-24 01:00:00 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-13 19:19:13 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.h:
-	  d3d11memory: Add support for wrapping application texture
-	  Add gst_d3d11_allocator_alloc_wrapped() method to support wrapping
-	  application texture using GstD3D11Memory without copy.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2646>
-
-2022-06-24 01:25:07 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst-libs/gst/d3d11/d3d11-prelude.h:
-	* gst-libs/gst/d3d11/gstd3d11.h:
-	* gst-libs/gst/d3d11/gstd3d11_fwd.h:
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
-	* gst-libs/gst/d3d11/gstd3d11bufferpool.h:
-	* gst-libs/gst/d3d11/gstd3d11config.h.meson:
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	* gst-libs/gst/d3d11/gstd3d11device.h:
-	* gst-libs/gst/d3d11/gstd3d11format.cpp:
-	* gst-libs/gst/d3d11/gstd3d11format.h:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.h:
-	* gst-libs/gst/d3d11/gstd3d11utils.cpp:
-	* gst-libs/gst/d3d11/gstd3d11utils.h:
-	* gst-libs/gst/d3d11/meson.build:
-	  d3d11: Install library headers
-	  Our Direct3D11 abstraction layer has been improved and
-	  it gained good shape from API point of view.
-	  Also, On Windows, GstD3D11 has various advantages over GstGL
-	  in terms of compatibility/stability/feature/performance.
-	  Note that WGL implementation is known to be buggy for some
-	  drivers/vendors/scenario (that's a reason why Google implemented ANGLE).
-	  Moreover, GstGL is not fully optimized for Windows unfortunately.
-	  It's the time to open this interface to application developers
-	  for various optimized processing using our Direct3D11
-	  infrastructure.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2646>
+	* gst-libs/gst/codecs/gstav1decoder.c:
+	  av1decoder: Fix DPB size signalling
+	  Take current frame into account for the DPB size signalling
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4845>
 
-2022-06-24 01:21:48 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-13 19:18:02 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.h:
-	* sys/amfcodec/gstamfencoder.cpp:
-	* sys/d3d11/gstd3d11compositor.cpp:
-	* sys/d3d11/gstd3d11convert.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11deinterlace.cpp:
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/gstd3d11upload.cpp:
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/nvcodec/gstnvencoder.cpp:
-	* sys/qsv/gstqsvallocator_d3d11.cpp:
-	* sys/qsv/gstqsvdecoder.cpp:
-	* sys/qsv/gstqsvencoder.cpp:
-	  d3d11: Update gst_d3d11_allocation_params_new() interface
-	  Define GST_D3D11_ALLOCATION_FLAG_DEFAULT (0) value instead of
-	  casting enum type everywhere. And pass D3D11_RESOURCE_MISC_FLAG value
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2646>
+	* gst-libs/gst/codecs/gstmpeg2decoder.c:
+	  mpeg2decoder: Fix DPB size signalling
+	  Take current frame into account for the DPB size signalling
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4845>
 
-2022-06-27 12:06:50 -0400  U. Artie Eoff <ullysses.a.eoff@intel.com>
+2023-06-13 19:12:32 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvavpp.c:
-	  va: postproc: add scale-method property
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2654>
+	* gst-libs/gst/codecs/gstvp9decoder.c:
+	  vp9decoder: Fix DPB size signalling
+	  Take current frame into account for the DPB size signalling
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4845>
 
-2022-06-27 11:54:28 -0400  U. Artie Eoff <ullysses.a.eoff@intel.com>
+2023-06-13 19:08:03 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvafilter.c:
-	* sys/va/gstvafilter.h:
-	* sys/va/gstvavpp.c:
-	  va: filter/postproc: move unconditional props to vavpp
-	  Only conditional/dynamic properties should be installed/handled
-	  by vafilter.  Thus, move and install the unconditional/static
-	  properties in vavpp.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2654>
+	* gst-libs/gst/codecs/gstvp8decoder.c:
+	  vp8decoder: Fix DPB size signalling
+	  Take current frame into account for the DPB size signalling
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4845>
 
-2022-06-23 11:39:57 -0400  U. Artie Eoff <ullysses.a.eoff@intel.com>
+2023-06-14 10:08:51 +0200  François Laignel <francois@centricular.com>
 
-	* sys/va/gstvacompositor.c:
-	* sys/va/gstvafilter.c:
-	* sys/va/gstvafilter.h:
-	  va: compositor/filter: use scale method setter
-	  Use the filter's scale method member instead of the sample's member.
-	  Removes the filter_flags member from the composite sample.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2654>
+	* ext/srtp/gstsrtpdec.c:
+	  srtpdec: fix Got data flow before segment event
+	  A race condition can occur in `srtpdec` during the READY -> NULL transition:
+	  an RTCP buffer can make its way to `gst_srtp_dec_chain` while the element is
+	  partially stopped, resulting in the following critical warning:
+	  > Got data flow before segment event
+	  The problematic sequence is the following:
+	  1. An RTCP buffer is being handled by the chain function for the
+	  `rtcp_sinkpad`. Since, this is the first buffer, we try pushing the sticky
+	  events to `rtcp_srcpad`.
+	  2. At the same moment, the element is being transitioned from PAUSED to READY.
+	  3. While checking and pushing the sticky events for `rtcp_srcpad`, we reach the
+	  Segment event. For this, we try to get it from the "otherpad", in this case
+	  `rtp_srcpad`. In the problematic case, `rtp_srcpad` has already been
+	  deactivated so its sticky events have been cleared. We won't be pushing any
+	  Segment event to `rtcp_srcpad`.
+	  4. We return to the chain function for `rtcp_sinkpad` and try pushing the
+	  buffer to `rtcp_srcpad` for which deactivation hasn't started yet, hence the
+	  "Got data flow before segment event".
+	  This commit:
+	  - Adds a boolean return value to `gst_srtp_dec_push_early_events`: in case the
+	  Segment event can't be retrieved, `gst_srtp_dec_chain` can return  an error
+	  instead of calling `gst_pad_push`.
+	  - Replaces the obsolete `gst_pad_set_caps` with `gst_pad_push_event`. The
+	  additional preconditions checked by previous function are guaranteed here
+	  since we push a fixed Caps which was built in the same function.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4844>
 
-2022-06-23 11:11:16 -0400  U. Artie Eoff <ullysses.a.eoff@intel.com>
+2023-06-12 11:05:34 +0200  François Laignel <francois@centricular.com>
 
-	* sys/va/gstvafilter.c:
-	* sys/va/gstvafilter.h:
-	  va: filter: add scale method field and setter
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2654>
+	* ext/srtp/gstsrtpdec.c:
+	  srtpdec: fix assertion 'parent->numsinkpads <= 1' failed
+	  A race condition can occur in `srtpdec` during the READY -> NULL transition:
+	  an RTCP buffer can make its way to `gst_srtp_dec_chain` while the element is
+	  partially stopped, resulting in the following critical warning:
+	  > assertion 'parent->numsinkpads <= 1' failed
+	  This can occur when the first RTCP buffer is received during the READY -> NULL
+	  transition. If deactivation of the `rtp_srcpad` has already reached
+	  `post_activate`, the sticky events are removed from this Pad. In this case,
+	  `gst_srtp_dec_push_early_events` branches to the generation of a stream id
+	  using `gst_pad_create_stream_id`. This function ensures that the element
+	  doesn't own more than 1 sink pad. Since `srtpdec` owns two of them, the
+	  assertion fails.
+	  This commit uses `gst_element_decorate_stream_id` which doesn't perform this
+	  check. The preconditions is not necessary in this particular context since the
+	  stream id for the RTP / RTCP pads are derived from the same id.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4844>
 
-2022-01-21 21:33:52 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-14 20:56:14 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvabasedec.h:
-	* sys/va/gstvajpegdec.c:
-	* sys/va/gstvajpegdec.h:
-	* sys/va/gstvaprofile.c:
-	* sys/va/meson.build:
-	* sys/va/plugin.c:
-	  va: Add vajpegdec element.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1575>
+	* gst-libs/gst/d3d11/gstd3d11-private.h:
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* gst-libs/gst/d3d11/gstd3d11utils.cpp:
+	  d3d11: Log device removed reason
+	  ... and live objects. It could be useful hint for GPU debugging
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4170>
 
-2022-06-24 19:42:36 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-06-13 01:29:14 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst-libs/gst/va/gstva.h:
-	* gst-libs/gst/va/gstvaallocator.c:
-	* gst-libs/gst/va/gstvaallocator.h:
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvabasedec.h:
-	  va: allocator: Add hack for no fourcc when surface creation.
-	  This patch adds general mechanism for handling specific hacks. In this
-	  case for jpeg decoder in i965 driver, which cannot create surfaces
-	  with fourcc specified.
-	  From jpeg decoder to the allocator, which creates the surfaces,
-	  there's a non-simple path: basedec pseudo-class adds a hacks guint32
-	  which will be set by actual elements (vajpegdec, in this case) and
-	  basedec will always set the hack to the allocator when the allocator
-	  is instantiated.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1575>
+	* gst/asfmux/gstasfobjects.c:
+	  asfmux: fix potentially unaligned write on 32-bit ARM
+	  Fixes #2665
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4842>
 
-2022-06-24 19:54:51 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-06-13 11:48:31 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/va/gstvavideoformat.c:
-	  va: Add RGBP format definition.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1575>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  va: dmabuf allocator to use GstVideoInfoDmaDrm
+	  Change the internal GstVideoInfo structure in the GstVaDmabufAllocator to
+	  GstVideoInfoDmaDrm in order to keep track of the exported DRM format by the
+	  driver, and thus removing the DRMModifier quark attached as qdata in the
+	  GstMemory. Though, the exposed API isn't updated yet; that has to go in a
+	  second iteration.
+	  Also this patch clean up some code (remove an unused buffer size assignation)
+	  and fix some typos in documentation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4821>
 
-2022-04-28 13:16:03 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-22 19:00:45 +0800  He Junyan <junyan.he@intel.com>
 
 	* sys/va/gstvacaps.c:
-	  va: caps: Add jpeg fields in coded caps.
-	  Given the supported rt formats in a profile/entrypoint config it's
-	  possible to know the supported JPEG colorspace and subsampling. This
-	  patch adds this information in coded caps to a safer autoplugging
-	  after jpegparser.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1575>
+	* sys/va/gstvacaps.h:
+	  va: Add helper functions to convert GstVideoInfoDmaDrm into va video info
+	  The VA has its internal video format mapping(because different drivers may
+	  have different interpretation for the same format), so we should convert the
+	  info in GstVideoInfoDmaDrm into the according video info based on that mapping.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4821>
 
-2022-01-17 15:43:47 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-22 19:04:07 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/va/gstjpegdecoder.c:
-	* sys/va/gstjpegdecoder.h:
-	* sys/va/meson.build:
-	  va: Add jpegdecoder base class.
-	  This base class is intented for hardware accelerated decoders, but since
-	  only VA uses it, it will be kept internally in va plugin.
-	  It follows the same logic as the others video decoders in the library but.
-	  as JPEG are independet images, there's no need to handle a DBP so no need
-	  of a picture object. Instead a scan object is added with all the structures
-	  required to decode the image (huffman and quant tables, mcus, etc.).
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1575>
+	* sys/va/gstvacaps.h:
+	  va: Replace the tabs into spaces in gstvacaps.h
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4821>
 
-2022-06-27 12:36:29 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-22 16:25:32 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/va/meson.build:
-	  va: build: Remove duplicated source.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1575>
+	* gst-libs/gst/va/gstvaallocator.c:
+	* gst-libs/gst/va/gstvaallocator.h:
+	  va: Add a helper function to detect the surface modifier
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4821>
 
-2022-06-27 19:58:58 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-09 22:19:47 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/nvcodec/gstcudamemorycopy.c:
-	  cudamemorycopy: Make sure writable caps before removing fields
-	  The caps to be modified may not be writable when D3D11/GL/NVMM
-	  are all disabled.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2664>
+	* gst-libs/gst/va/vasurfaceimage.c:
+	  va: Lower the message level for va_export_surface_to_dmabuf()
+	  Some surface formats such as GST_VIDEO_FORMAT_Y42B and GST_VIDEO_FORMAT_RGB
+	  can be created but can not be exported as DMA buffer. You can not say that
+	  this is a driver bug because the driver may never want to share this kind of
+	  surface out of libva.
+	  And this function will be used to detect modifiers later, so the error message
+	  will be annoying.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4821>
 
-2022-06-25 19:50:10 +0100  Tim-Philipp Müller <tim@centricular.com>
+2023-02-22 16:25:32 +0800  He Junyan <junyan.he@intel.com>
 
-	* tests/check/meson.build:
-	  tests: skip unit tests for dependency-less elements that have been disabled
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1136
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2660>
+	* gst-libs/gst/va/gstvaallocator.c:
+	* gst-libs/gst/va/vasurfaceimage.c:
+	* gst-libs/gst/va/vasurfaceimage.h:
+	  va: Extend the va_create_surfaces() function to accept modifiers
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4821>
 
-2022-06-23 14:31:10 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-06-08 21:53:28 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/va/gstvaallocator.c:
-	  va: allocator: Use always lseek to get dmabuf size.
-	  Gallium drivers historically have reported strange dmabuf sizes, from always
-	  zero to the whole frame (multiple fds). The simplest solution is to use lseek
-	  SEEK_END to get the prime descriptor size.
-	  Also the allocator raises a warning if both values differ in order to report
-	  it to driver.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2574>
+	* gst-libs/gst/va/gstvavideoformat.c:
+	* gst-libs/gst/va/gstvavideoformat.h:
+	  va: Add a helper function to convert video drm info to video info
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4821>
 
-2022-06-08 09:02:52 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-06-04 00:10:36 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/va/gstvaallocator.c:
-	  va: allocator: Fix translation of VADRMPRIMESurfaceDescriptor
-	  VADRMPRIMESurfaceDescriptor structure describes the offsets from the
-	  point of view of the specific handle (DMABuf). While GstVideoInfo
-	  (and the meta) describes offsets from the point of the view of the
-	  GstBuffer, an aggregate of all the GstMemory (1 per handle).
-	  This changes combined with Mesa Fix(https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16813)
-	  fixes decoding failure with AMD driver.
-	  Fixes #1223
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2574>
-
-2022-06-23 21:43:11 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst-libs/gst/d3d11/gstd3d11.h:
-	* gst-libs/gst/d3d11/gstd3d11stagingbufferpool.cpp:
-	* gst-libs/gst/d3d11/gstd3d11stagingbufferpool.h:
-	* gst-libs/gst/d3d11/meson.build:
-	* sys/amfcodec/gstamfencoder.cpp:
-	* sys/d3d11/gstd3d11compositor.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11download.cpp:
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/gstd3d11upload.cpp:
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/qsv/gstqsvallocator_d3d11.cpp:
-	* sys/qsv/gstqsvencoder.cpp:
-	  d3d11: Revert staging buffer pool implementation
-	  The staging buffer pool implementation was added to improve
-	  throughput performance since we can avoid per-frame
-	  CPU copy operation via staging texture but it turned out that
-	  we can not make it thread safe. See
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1182
-	  Reverting the staging texture implementation as it does not show
-	  any visible value.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2651>
+	* gst-libs/gst/va/gstvavideoformat.c:
+	* gst-libs/gst/va/gstvavideoformat.h:
+	  va: Map drm fourcc into va fourcc in video format
+	  The fourcc defined in va.h and drm_fourcc.h sometimes is not identical.
+	  For example, the I420 format is defined as "I420" in va.h but defined
+	  as "YU12" in drm_fourcc.h.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4821>
 
-2022-06-23 21:35:23 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-02 15:02:57 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* sys/qsv/gstqsvdecoder.cpp:
-	  qsvdecoder: Fix system memory alignment
-	  Do right padding, not left
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2651>
+	* gst/debugutils/gstfakeaudiosink.c:
+	* gst/debugutils/gstfakevideosink.c:
+	  fakesinks: Fix recursive notify loop
+	  The proxy callback for the notify::last-message was emiting the signal
+	  again on the child, which caused an infinit loop. We could swap the child
+	  and the user data to signal to the bin instead, but it was found that proxying
+	  this signal was not very useful. Typical use case it to set silent=0 and use
+	  deep-notify feature. Proxying that signal just duplicate that output which
+	  isn't very useful.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4766>
 
-2022-06-23 21:41:24 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-13 16:03:13 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* sys/d3d11/gstd3d11decoder.cpp:
-	  d3d11decoder: Fix texture download
-	  Stride applied to src/dst was reversed
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2651>
+	* sys/v4l2codecs/gstv4l2codech265dec.c:
+	  v4l2codecs: h265: Set num_delta_pocs_of_ref_rps_idx
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4413>
 
-2022-06-16 17:02:43 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-04-13 15:31:50 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* gst/jpegformat/gstjpegparse.c:
-	  jpegparse: Add YUV440 sampling support.
-	  Found some samples with this sampling, so in order to support it,
-	  JPEG2000 header cannot be used anymore, a this patch also adds the
-	  enums for each supported colorspace and sampling, avoiding hacks.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2641>
+	* sys/v4l2codecs/linux/v4l2-controls.h:
+	  v4l2codecs: Extend the API with num_delta_pocs_of_ref_rps_idx
+	  This value is an alternative to short_term_ref_pic_set_size and can be used
+	  to parse the RPS portion of a slice header, instead of skipping over it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4413>
 
-2022-06-16 16:33:14 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-06-13 01:51:48 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/va/gstvaallocator.c:
-	* sys/va/gstvafilter.c:
-	  va: Use driver implementation macro rather than function.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2642>
+	* gst-libs/gst/codecs/gsth265decoder.c:
+	  h265decoder: Calculate DPB size based on level
+	  As specified in "A.4 Tiers and levels", calculate DPB size based
+	  on level in order to avoid over preallocated DPB
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4840>
 
-2022-06-18 10:36:53 +0800  He Junyan <junyan.he@intel.com>
+2023-06-07 14:05:46 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* gst/videoparsers/gsth265parse.c:
-	  h265parse: Fix uninitialized width and height when update src caps.
-	  The commit b90d0274 introduces uninitialized width and height when we
-	  consider to change the "pixel-aspect-ratio" for some interlaced stream.
-	  We need to check the resolution in the src caps, and if no resolution
-	  info found, there is no need to consider the aspect ratio.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2630>
+	* gst/mpegtsmux/gstbasetsmux.c:
+	  mpegtsmux: Use terminological ISO 639-2 language codes
+	  These are preferred in most circumstances.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2649
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4795>
 
-2022-06-21 20:04:15 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-10 17:35:14 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11deinterlace.cpp:
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	  d3d11: Fix some typos
-	  Fix up spelling and d3d11testsrc class meta.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2644>
+	* sys/d3d11/gstd3d11convert.cpp:
+	  d3d11convert: Add support for premultiplied alpha conversion
+	  Adding "src-alpha-mode" and "dest-alpha-mode" properties
+	  to support alpha mode conversion
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4825>
 
-2022-06-18 20:14:22 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-10 03:55:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	* sys/d3d11/gstd3d11compositor.h:
-	* sys/d3d11/gstd3d11compositorbin.cpp:
-	* sys/d3d11/gstd3d11compositorbin.h:
-	* sys/d3d11/meson.build:
-	* sys/d3d11/plugin.cpp:
-	  d3d11compositor: Performance optimization
-	  Removing glvideomixer-like nuance (it was initially referenced)
-	  and rewriting element since it's not an optimal design at all
-	  from performance point of view.
-	  * Remove wrapper bin (and internal conversion/upload/download elements)
-	  which will waste CPU/GPU resources. Conversion/blending can be done by the
-	  d3d11compositor element at once.
-	  * Add support YUV blending without RGB conversion.
-	  The RGB <-> YUV conversion is completely unnecessary since YUV textures
-	  support blending as well.
-	  * Remove complicated blending operation properties since it's hard
-	  to use from application point of view. Instead, adding "operator" property
-	  like what compositor element does.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2631>
-
-2022-06-18 20:40:40 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/d3d11/gstd3d11converter.cpp:
-	  d3d11converter: Fix alpha factor update
-	  converter should set entire constant buffer values since it's mapped
-	  with write-discard flag
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2631>
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	  d3d11testsrc: Add "alpha" and "alpha-mode" properties
+	  Adding global alpha and alpha mode options
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4825>
 
-2022-06-02 14:22:21 +0200  Robert Mader <robert.mader@collabora.com>
+2023-06-10 03:19:44 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/wayland/gstwaylandsink.c:
-	* ext/wayland/gstwaylandsink.h:
-	* gst-libs/gst/wayland/gstwlwindow.c:
-	* gst-libs/gst/wayland/gstwlwindow.h:
-	  gstwaylandsink: Add rotate-method property
-	  Similar to and inspired by glimagesink and gtkglsink.
-	  Using the Wayland buffer transform API allows to offload
-	  rotate operations to the Wayland compositor. This can have
-	  several advantages:
-	  - The Wayland compositor may be able to use hardware plane
-	  capabilities to do the rotation.
-	  - In case of pre-rotated content on rotated outputs the
-	  rotations may equal out, potentially allowing the
-	  compositor to use hardware planes even if they don't
-	  support rotate operations.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2543>
+	* sys/d3d11/gstd3d11overlaycompositor.cpp:
+	  d3d11overlaycompositor: Handle premultiplied alpha in pixel shader
+	  Do premultiplied -> straight alpha conversion using GPU
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4825>
 
-2022-06-18 04:05:53 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-10 02:52:09 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11decoder.h:
-	  d3d11decoder: Check 16K resolution support
-	  16K decoding is supported by some GPUs
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2629>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter.h:
+	  d3d11converter: Add support for premultiplied alpha
+	  Adding "src-alpha-mode" and "dest-alpha-mode" properties
+	  and performs premultiplied alpha conversion if needed
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4825>
 
-2022-06-17 05:11:08 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-08 21:29:32 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11av1dec.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11decoder.h:
-	* sys/d3d11/gstd3d11h264dec.cpp:
-	* sys/d3d11/gstd3d11h265dec.cpp:
-	* sys/d3d11/gstd3d11mpeg2dec.cpp:
-	* sys/d3d11/gstd3d11vp8dec.cpp:
-	* sys/d3d11/gstd3d11vp9dec.cpp:
-	  d3d11decoder: Add support for non-zero crop-{x,y} position
-	  AVC and HEVC define crop rectangle and the x/y coordinates might
-	  not be zero. This commit will address the non-zero x/y offset coordinates
-	  via GstVideoCropMeta if downstream supports the meta and d3d11 memory.
-	  Otherwise decoder will copy decoded texture into output frame.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2624>
+	* gst-libs/gst/cuda/gstcuda-private.h:
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	* sys/nvcodec/gstcudamemorycopy.c:
+	* sys/nvcodec/gstnvdecobject.cpp:
+	  cudadownload: Always download CUDA memory if it's bound to decoder
+	  Decoder bounded CUDA memory is allocated by driver and the pool size
+	  is fixed. Since we don't know how many buffers would be held by
+	  downstream non-CUDA element, we should download such CUDA memory
+	  and release it back to decoder.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4810>
 
-2022-06-17 02:45:51 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-07 12:53:17 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/d3d11/gstd3d11convert.cpp:
-	* sys/d3d11/gstd3d11converter.cpp:
-	  d3d11converter: Implement filling border color
-	  Equivalent to GST_VIDEO_CONVERTER_OPT_BORDER_ARGB and
-	  GST_VIDEO_CONVERTER_OPT_FILL_BORDER options of GstVideoConverter
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2622>
+	* docs/meson.build:
+	  doc: use gir file if dependency is not available
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4781>
 
-2022-06-16 02:18:43 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-06 13:27:39 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	* sys/d3d11/gstd3d11convert.cpp:
-	* sys/d3d11/gstd3d11converter.cpp:
-	* sys/d3d11/gstd3d11converter.h:
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window.h:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	* sys/d3d11/plugin.cpp:
-	  d3d11converter: Objectify converter
-	  ... and set conversion options via property
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2622>
-
-2022-06-16 00:52:16 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/d3d11/gstd3d11shader.cpp:
-	* sys/d3d11/gstd3d11shader.h:
-	  d3d11shader: Remove GstD3D11Quad helper object
-	  It's not very generic to be used for various scenario. Use native D3D11
-	  APIs directly instead.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2622>
+	* sys/msdk/gstmsdkallocator_libva.c:
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/msdk_libva.c:
+	  msdk: remove libva check before 1.12
+	  Since gstmsdk depends on gstva library it also bumps the required version.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4781>
 
-2022-06-16 00:50:12 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-06 13:26:12 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/d3d11/gstd3d11compositor.cpp:
-	  d3d11compositor: Don't use GstD3D11Quad
-	  The helper object will be removed
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2622>
+	* gst-libs/gst/va/gstvasurfacecopy.c:
+	* gst-libs/gst/va/meson.build:
+	* gst-libs/gst/va/vasurfaceimage.c:
+	* sys/va/gstvaencoder.c:
+	* sys/va/gstvafilter.c:
+	* sys/va/gstvah265dec.c:
+	* sys/va/gstvah265enc.c:
+	* sys/va/gstvaprofile.c:
+	* sys/va/plugin.c:
+	  va: bump libva version to 1.12
+	  Remove all checks in gstva for all version lower than 1.12
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4781>
 
-2022-06-15 23:46:27 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-07 20:36:36 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11overlaycompositor.cpp:
-	  d3d11overlaycompositor: Fix HLSL compiler warning
-	  warning X3206: 'Sample': implicit truncation of vector type
-	  And don't use GstD3D11Quad since it will result in redundant API calls
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2622>
+	* sys/win32ipc/gstwin32ipcvideosink.cpp:
+	* sys/win32ipc/gstwin32ipcvideosrc.cpp:
+	  win32ipc: Use gst_util_get_timestamp()
+	  Instead of duplicating the same code
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4794>
+
+2023-06-07 20:32:41 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d11/gstd3d11ipc.cpp:
+	* sys/d3d11/gstd3d11ipc.h:
+	* sys/d3d11/gstd3d11ipcclient.cpp:
+	* sys/d3d11/gstd3d11ipcsink.cpp:
+	* sys/d3d11/gstd3d11ipcsrc.cpp:
+	  d3d11: Use gst_util_get_timestamp()
+	  instead of duplicating the same code
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4794>
 
-2022-02-01 23:46:43 +0100  Mathieu Duponchelle <mathieu@centricular.com>
+2023-06-06 20:18:53 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/closedcaption/gstcccombiner.c:
-	* ext/closedcaption/gstcccombiner.h:
-	  cccombiner: expose output-padding property
-	  When schedule=true and output-padding=false, cccombiner will not
-	  inject padding in the output closed caption meta stream.
-	  The property has no effect when schedule=false.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1621>
+	* gst/mpegtsmux/gstbasetsmux.c:
+	  basetsmux: Fix language crash when ts_pad->stream is NULL
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4785>
 
-2022-06-15 15:06:20 -0400  Olivier Crête <olivier.crete@collabora.com>
+2023-05-25 13:02:09 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Limit sink query to sink pads
-	  This allows the reception of streams that don't exactly match
-	  the codec preferences. In particular, the ssrc in the codec preferences
-	  is local sender SSRC, the other side is expected to send a different SSRC.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2615>
+	* gst/mpegtsdemux/gstmpegdesc.h:
+	* gst/mpegtsdemux/tsdemux.c:
+	  tsdemux: Detect language from ac3 descriptor
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4709>
 
-2022-06-08 19:18:48 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
+2023-06-05 23:44:12 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gsth265parse.c:
-	  avviddec, video.c, h265parse: Workaround for broken field-based interlaced encoders
-	  Some encoders (e.g. Makito) have H265 field-based interlacing, but then
-	  also specify an 1:2 pixel aspect ratio. That makes it kind-of work with
-	  decoders that don't properly support field-based decoding, but makes us
-	  end up with the wrong aspect ratio if we implement everything properly.
-	  As a workaround, detect 1:2 pixel aspect ratio for field-based
-	  interlacing, and check if making that 1:1 would make the new display
-	  aspect ratio common. In that case, we override it with 1:1.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2577>
+	* sys/d3d11/gstd3d11ipcclient.cpp:
+	* sys/d3d11/gstd3d11ipcclient.h:
+	* sys/d3d11/plugin.cpp:
+	  d3d11ipcsrc: Stop asynchronously in case of io-mode=import
+	  In case of import mode, d3d11ipcsrc does not know when outputted
+	  memories will be released.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4774>
+
+2023-06-05 22:34:27 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d11/gstd3d11ipc.cpp:
+	* sys/d3d11/gstd3d11ipc.h:
+	* sys/d3d11/gstd3d11ipcclient.cpp:
+	* sys/d3d11/gstd3d11ipcserver.cpp:
+	* sys/d3d11/gstd3d11ipcserver.h:
+	* sys/d3d11/gstd3d11ipcsink.cpp:
+	  d3d11ipc: Use unnamed shareable handle
+	  Exchanging HANDLE would have smaller overhead than string
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4774>
 
-2021-05-19 16:03:22 +0200  Stéphane Cerveau <scerveau@collabora.com>
+2023-06-05 21:16:28 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/srt/gstsrtsrc.c:
-	* ext/srt/gstsrtsrc.h:
-	  srtsrc: add "keep-listening" property to avoid EOS on disconnect
-	  The property 'keep-listening' avoids EOS
-	  when the remote client disconnects.
-	  It can be useful to a keep a pipeline alive
-	  when the srt connection drops remotely.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/967>
+	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
+	* gst-libs/gst/d3d11/gstd3d11memory.h:
+	  d3d11memory: Add support for resource sharing via NT handle
+	  Adding gst_d3d11_memory_get_nt_handle() method so that GstD3D11Memory
+	  can hold shareable NT handle and for easy reuse of it
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4774>
+
+2023-06-05 20:50:18 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/d3d11/gstd3d11ipcsink.cpp:
+	  d3d11ipcsink: Don't clear prepared sample on render
+	  render() can be called multiple times for the same prepared sample
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4774>
 
-2021-05-19 16:00:13 +0200  Stéphane Cerveau <scerveau@collabora.com>
+2023-06-01 15:16:47 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* ext/srt/gstsrtsrc.c:
-	  srtsrc: remove dead code
-	  Remove code useless since
-	  132e3a1af9deb1d2cdf84d22b954967207bcc03a
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/967>
+	* sys/decklink/gstdecklink.h:
+	  decklink: Implement Windows string conversion with common API between MinGW and MSVC
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4738>
 
-2022-05-19 05:24:08 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-01 15:17:26 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/qsv/gstqsvh264dec.cpp:
-	  qsvh264dec: Use newly added avcC data parsing API
-	  Use gst_h264_parser_parse_decoder_config_record() method to parse
-	  codec_data.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2449>
+	* sys/decklink/gstdecklink.h:
+	  decklink: Add some newlines in long defines
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4738>
 
-2022-05-19 05:06:04 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-31 23:44:42 +0300  Maksym Khomenko <maksym.khomenko@skelia.partners>
 
-	* gst/videoparsers/gsth264parse.c:
-	  h264parse: Use newly added avcC data parsing API
-	  Use gst_h264_parser_parse_decoder_config_record() method to parse
-	  codec_data.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2449>
+	* sys/decklink/gstdecklink.h:
+	  decklink: Calculate string size before malloc
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4738>
 
-2022-05-19 04:49:36 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-30 15:27:21 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	  h264decoder: Use newly added avcC data parsing API
-	  Use gst_h264_parser_parse_decoder_config_record() method to parse
-	  codec_data.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2449>
+	* sys/decklink/gstdecklink.h:
+	  decklink: Use the macOS version of the SDK on macOS and not the Linux one
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4738>
 
-2022-05-19 04:25:38 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-30 13:23:28 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/codecparsers/gsth264parser.c:
-	* gst-libs/gst/codecparsers/gsth264parser.h:
-	* tests/check/libs/h264parser.c:
-	  h264parser: Add an API for AVCDecoderConfigurationRecord parsing
-	  Add a method for AVC configuration date parsing
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2449>
+	* sys/decklink/gstdecklink.h:
+	  decklink: Free SDK strings after usage on Linux
+	  While they're const char* they still need to be freed like on Windows
+	  and macOS and would be leaked otherwise.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4738>
 
-2022-06-15 10:07:26 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-05-30 13:22:44 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/decklink/gstdecklink.cpp:
-	  decklinkvideosink: Fix selection of > PAL widescreen modes
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2601>
+	* sys/decklink/gstdecklink.h:
+	  decklink: Correctly handle SDK strings on macOS
+	  They're CFStringRef* and not plain NUL-terminated char* C strings.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4738>
 
-2022-06-07 16:30:36 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-06-02 13:21:06 -0400  Aaron Boxer <boxerab@protonmail.com>
 
-	* sys/va/gstvabasedec.c:
-	  va: basedec: Select output format with the used chroma in decoder.
-	  Currently, video format is decided with downstream caps intersection,
-	  but that's not correct since chroma is not considered. The video
-	  decoders have to decide the output format given the used chroma, not
-	  by the downstream caps negotiation.
-	  This patch changes that. Still, caps feature is selected by caps
-	  negotiation, then, with the preferred caps feature, the output format
-	  is search within that caps feature.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2569>
+	* ext/onnx/gstonnxclient.cpp:
+	* ext/onnx/gstonnxobjectdetector.cpp:
+	  onnxobjectdetector: gracefully handle Ort exceptions rather than dumping core
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4765>
 
-2022-05-23 11:41:17 +1000  Matthew Waters <matthew@centricular.com>
+2023-06-04 18:51:56 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/vulkan/gstvulkan.c:
-	* ext/vulkan/meson.build:
-	* ext/vulkan/vkoverlaycompositor.c:
-	* ext/vulkan/vkoverlaycompositor.h:
-	  vulkan: add vulkan overlay compositor element
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2470>
+	* gst-libs/gst/va/gstvaallocator.c:
+	  va: remove unused parameters in internal function
+	  gst_va_buffer_surface_new() don't use neither format, width nor height.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4768>
 
-2022-05-23 11:26:24 +1000  Matthew Waters <matthew@centricular.com>
+2023-05-30 15:31:47 +1000  Matthew Waters <matthew@centricular.com>
 
-	* gst-libs/gst/vulkan/gstvkfullscreenquad.c:
-	* gst-libs/gst/vulkan/gstvkfullscreenquad.h:
-	  vkfullscreenquad: add support for disabling clearing
-	  e.g. if drawing over the top of an existing image, we don'w want to
-	  clear.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2470>
+	* ext/soundtouch/meson.build:
+	* ext/webrtcdsp/meson.build:
+	* meson.build:
+	  build/android: remove all references to gnustl
+	  Not needed anymore with NDK R25.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4747>
 
-2022-05-23 11:25:03 +1000  Matthew Waters <matthew@centricular.com>
+2023-06-01 02:13:32 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/vulkan/gstvkfullscreenquad.c:
-	* gst-libs/gst/vulkan/gstvkfullscreenquad.h:
-	  vkfullscreenquad: support setting blend operations
-	  Allows e.g. blending with an existing image.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2470>
+	* sys/d3d11/gstd3d11basefilter.cpp:
+	  d3d11basefilter: Forward video related metas if needed
+	  The same as in GstVideoFilter
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4751>
+
+2023-03-21 09:24:18 +0100  Michael Grzeschik <m.grzeschik@pengutronix.de>
+
+	* sys/uvcgadget/gstuvcsink.c:
+	* sys/uvcgadget/gstuvcsink.h:
+	  uvcsink: add probe handling for live pipelines
+	  Currently the uvcsink is only capable to run in an application
+	  that is handling the state transitions of the pipeline properly
+	  by checking on streaming event from the uvcsink.
+	  This code is improving the element by adding an fakesink to
+	  consume possible videostream flow in case the pipeline state
+	  is not changing on hosts streamoff.
+	  This is helpfull when using local gst-launch pipelines where
+	  the streaming event is not monitored to change the pipelines
+	  state.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1304>
 
-2022-05-23 11:24:04 +1000  Matthew Waters <matthew@centricular.com>
+2023-04-17 23:53:58 +0200  Michael Grzeschik <m.grzeschik@pengutronix.de>
 
-	* gst-libs/gst/vulkan/gstvkfullscreenquad.c:
-	  vkfullscreenaud: create the vulkan command pool upfront
-	  Allows outside to reuse the same command buffer pool much more easily.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2470>
+	* docs/plugins/gst_plugins_cache.json:
+	* meson_options.txt:
+	* sys/meson.build:
+	* sys/uvcgadget/gstuvcsink.c:
+	* sys/uvcgadget/gstuvcsink.h:
+	* sys/uvcgadget/meson.build:
+	* sys/uvcgadget/uvc.c:
+	* sys/v4l2codecs/linux/usb/g_uvc.h:
+	* sys/v4l2codecs/linux/usb/video.h:
+	  uvcsink: add new bin element around v4l2sink
+	  This patch adds an element to stream video data to an uvc video gadget.
+	  The element handles the uvc events STREAMON, STREAMOFF, SETUP and DATA.
+	  to start, stop and configure the video buffer flow by the use of pad
+	  probes. It works with linux kernels of versions higher than v6.1.
+	  The element makes use of the v4l2sink proxy property v4l2sink::device
+	  to locate the corresponding device to parse the configfs for additional
+	  data.
+	  The code in uvc.c is basically derived from /lib/uvc.c in
+	  https://git.ideasonboard.org/uvc-gadget.git.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1304>
+
+2023-05-09 00:50:41 +0200  Michael Grzeschik <m.grzeschik@pengutronix.de>
+
+	* sys/uvcgadget/configfs.c:
+	* sys/uvcgadget/configfs.h:
+	  uvcsink: configfs.{c,h}: add helper function to parse by videodev
+	  - add helper function video_find_config_name
+	  - add helper function configfs_parse_uvc_videodev
+	  With these helper functions it is possible to parse the
+	  configfs entry corresponding to the used videodev.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1304>
+
+2023-05-09 00:50:41 +0200  Michael Grzeschik <m.grzeschik@pengutronix.de>
+
+	* sys/uvcgadget/configfs.c:
+	  uvcsink: configfs.c: use G_N_ELEMENTS instead of ARRAY_SIZE
+	  We don't have ARRAY_SIZE in glib.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1304>
+
+2023-05-09 00:50:41 +0200  Michael Grzeschik <m.grzeschik@pengutronix.de>
+
+	* sys/uvcgadget/configfs.c:
+	  uvcsink: configfs.c: fix globing in uvc_video_device
+	  The gadget in the sysfs can be postfixed with an index.
+	  Fix the globbing by adding a wildcard after /gadget*/.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1304>
+
+2023-05-09 00:50:41 +0200  Michael Grzeschik <m.grzeschik@pengutronix.de>
+
+	* sys/uvcgadget/configfs.c:
+	  uvcsink: configfs.c: refactor location of GUID formats
+	  - move GUID handling to beginning
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1304>
+
+2023-05-09 00:50:41 +0200  Michael Grzeschik <m.grzeschik@pengutronix.de>
+
+	* sys/uvcgadget/configfs.c:
+	* sys/uvcgadget/configfs.h:
+	  uvcsink: configfs.{c,h}: add parsing of more fields from format
+	  - add parsing of dwMaxVideoFrameBufferSize
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1304>
+
+2023-05-09 00:50:41 +0200  Michael Grzeschik <m.grzeschik@pengutronix.de>
+
+	* sys/uvcgadget/configfs.c:
+	  uvcsink: configfs.c: fix code for local usage
+	  - use local header file and remove unused reference to tools.h
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1304>
+
+2023-04-17 23:51:52 +0200  Michael Grzeschik <m.grzeschik@pengutronix.de>
+
+	* sys/uvcgadget/configfs.c:
+	* sys/uvcgadget/configfs.h:
+	  uvcsink: add configfs.{c,h} from https://git.ideasonboard.org/uvc-gadget.git
+	  - imported both files and run gst-indent on them
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1304>
 
-2022-05-17 17:07:49 +1000  Matthew Waters <matthew@centricular.com>
+2023-05-25 16:39:46 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
 
-	* gst-libs/gst/vulkan/gstvkbuffermemory.h:
-	* gst-libs/gst/vulkan/gstvkbufferpool.h:
-	* gst-libs/gst/vulkan/gstvkcommandbuffer.h:
-	* gst-libs/gst/vulkan/gstvkdescriptorpool.h:
-	* gst-libs/gst/vulkan/gstvkdescriptorset.h:
-	* gst-libs/gst/vulkan/gstvkfence.h:
-	* gst-libs/gst/vulkan/gstvkimagebufferpool.h:
-	* gst-libs/gst/vulkan/gstvkimagememory.h:
-	* gst-libs/gst/vulkan/gstvkmemory.h:
-	* gst-libs/gst/vulkan/gstvkvideofilter.h:
-	  vulkan: add some missing GAutoPtr definitions
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2470>
-
-2022-05-17 16:32:09 +1000  Matthew Waters <matthew@centricular.com>
-
-	* gst-libs/gst/vulkan/gstvkimageview.h:
-	  vulkan: remove unneeded #ifdef for GAutoPtr
-	  Not necessary anymore as we depend on a new enough Glib version
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2470>
-
-2022-05-17 13:22:33 +1000  Matthew Waters <matthew@centricular.com>
-
-	* ext/vulkan/gstvulkanelements.h:
-	* ext/vulkan/vkcolorconvert.h:
-	* ext/vulkan/vkdeviceprovider.h:
-	* ext/vulkan/vkdownload.h:
-	* ext/vulkan/vkimageidentity.h:
-	* ext/vulkan/vkshaderspv.h:
-	* ext/vulkan/vksink.h:
-	* ext/vulkan/vkupload.h:
-	* ext/vulkan/vkviewconvert.h:
-	  vulkan: move element register definition to relevant element headers
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2470>
+	* gst/mpegtsmux/gstbasetsmux.c:
+	  tsmux: Resend PMT whenever the language changes
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4711>
 
-2022-06-13 03:29:11 +0900  Seungha Yang <seungha@centricular.com>
+2023-06-01 11:55:34 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/d3d11/gstd3d11converter.cpp:
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	* sys/d3d11/gstd3d11pluginutils.h:
-	  d3d11converter: Add support for colorimetry conversion
-	  Handle color primaries and gamma functions.
-	  HDR <-> SDR conversion (tone mapping) should be implemented as well
-	  but not a part of this patch.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2581>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vulkan/format: use basic features (v1) as fallback
+	  if vkGetPhysicalDeviceFormatProperties2 isn't available.
+	  This approach assumes that, for basic features flags symbols,
+	  VkFormatFeatureFlagBits and VkFormatFeatureFlagBits2 are binary equivalent.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4746>
 
-2022-06-14 03:15:42 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-30 16:08:54 +1000  Matthew Waters <matthew@centricular.com>
 
-	* sys/d3d11/gstd3d11convert.cpp:
-	  d3d11convert: Don't passthrough if colorimetry conversion is required
-	  Different input/output colorimetry requires conversion
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2581>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vulkan/format: don't rely on vulkan header version for function availability
+	  e.g. android will have update vulkan.h headers but old platforms will
+	  not contain the function and will result in a link error.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4746>
+
+2020-12-02 18:31:44 -0500  Arun Raghavan <arun@asymptotic.io>
+
+	* ext/webrtcdsp/gstwebrtcdsp.cpp:
+	* ext/webrtcdsp/gstwebrtcechoprobe.cpp:
+	* ext/webrtcdsp/gstwebrtcechoprobe.h:
+	* ext/webrtcdsp/meson.build:
+	  webrtcdsp: Update code for webrtc-audio-processing-1
+	  Updated API usage appropriately, and now we have a versioned package to
+	  track breaking vs. non-breaking updates.
+	  Deprecates a number of properties (and we have to plug in our own values
+	  for related enums which are now gone):
+	  * echo-suprression-level
+	  * experimental-agc
+	  * extended-filter
+	  * delay-agnostic
+	  * voice-detection-frame-size-ms
+	  * voice-detection-likelihood
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2943>
 
-2022-06-14 00:24:41 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-31 17:33:46 +0200  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	  d3d11window: Use SDR colorspace whenever possible
-	  PQ uses completely different light level scale
-	  and it should not be used for SDR bt2020.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2581>
+	* gst-libs/gst/webrtc/nice/meson.build:
+	* gst-libs/gst/webrtc/nice/nice.c:
+	  webrtc/nice: put usage of OPTION_CONSENT_FRESHNESS behind check
+	  See https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/257
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4750>
 
-2022-06-06 03:41:52 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-31 09:39:35 -0400  Thibault Saunier <tsaunier@igalia.com>
 
-	* sys/d3d11/gstd3d11converter.cpp:
-	* sys/d3d11/gstd3d11converter.h:
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	* sys/d3d11/gstd3d11pluginutils.h:
-	  d3d11converter: Rewrite conversion object
-	  Rewriting GstD3D11Converter (equivalent to GstVideoConverter)
-	  to optimize some conversion path and clean up.
-	  * Extract YUV <-> RGB conversion matrix building method to
-	  utils. It will be used by other implementation
-	  * Use calculated offset values for YCbCr <-> YPbPr conversion
-	  instead of hardcoded values
-	  * Handle color range adjustment
-	  * Move transform matrix building helper function to utils.
-	  The method will be used by other elements
-	  * Use single constant buffer. Multiple constatne buffer for
-	  conversion pipeline is almost pointless
-	  * Remove lots of duplicated HLSL code and split pixel shader
-	  code path into sampling -> colorspace conversion ->
-	  shader output packing
-	  * Avoid floating point precision error around UV coordinates
-	  * Optimize RGB -> YUV conversion path
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2581>
+	* sys/nvcodec/gstcudabasetransform.c:
+	  cudabasetransform: Handle video related meta as appropriate
+	  This implements the same logic as GstVideoFilter
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4731>
 
-2022-05-24 10:40:26 +0200  Benjamin Gaignard <benjamin.gaignard@collabora.com>
+2023-05-29 12:32:08 -0400  Thibault Saunier <tsaunier@igalia.com>
 
-	* sys/v4l2codecs/gstv4l2format.c:
-	* sys/v4l2codecs/gstv4l2format.h:
-	* sys/v4l2codecs/linux/videodev2.h:
-	  v4l2codecs: Add P010 pixel format
-	  Copy V4L2_PIX_FMT_P010 define from linux header.
-	  V4L2_PIX_FMT_P010 is the little endian definition of P010 so map
-	  it GST_VIDEO_FORMAT_P010_10LE.
-	  Add it v4l2 default video formats to allows v4l2 decoders to
-	  enumerate and use it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2590>
+	* sys/nvcodec/gstcudamemorycopy.c:
+	  cuda: memory: Enhance debug when CU_GL_DEVICE_LIST_ALL fails
+	  Ensuring error from cuda is logged
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4731>
 
-2022-04-06 12:56:30 +0100  Tim-Philipp Müller <tim@centricular.com>
+2023-05-26 13:26:42 +0100  Colin Kinloch <colin.kinloch@collabora.com>
 
-	* ext/gs/gstgscommon.cpp:
-	* gst/mpegtsdemux/mpegtsbase.c:
-	* gst/mxf/mxfdemux.c:
-	* meson.build:
-	* sys/d3d11/gstd3d11deinterlace.cpp:
-	* sys/va/vacompat.h:
-	  Bump GLib requirement to >= 2.62
-	  Can't require 2.64 yet because of
-	  https://gitlab.freedesktop.org/gstreamer/cerbero/-/issues/323
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2568>
+	* ext/gtk/gstgtkwaylandsink.c:
+	* gst-libs/gst/wayland/gstwlwindow.c:
+	  waylandsink: Emit "map" signal boarder surface is ready
+	  This allows gtkwaylandsink to queue a draw of its gtk widget at the
+	  correct time, avoiding a race.
+	  Signed-off-by: Colin Kinloch <colin.kinloch@collabora.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4722>
 
-2022-06-08 10:42:18 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-03-14 11:49:57 +0100  Stéphane Cerveau <scerveau@igalia.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/decklink/gstdecklink.cpp:
-	* sys/decklink/gstdecklink.h:
-	  decklink: Add support for 4K DCI, 8K/UHD2 and 8K DCI modes
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2570>
+	* meson_options.txt:
+	* tools/meson.build:
+	  tools: add bad/ges/omx tools to gst_tools
+	  In static mode, these tools must be built
+	  after the gstreamer-full library to use
+	  the symbol gst_init_static_plugins.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4128>
 
-2022-06-02 06:06:48 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-07 14:05:54 +0100  Stéphane Cerveau <scerveau@igalia.com>
 
-	* sys/qsv/gstqsvallocator_d3d11.cpp:
-	  qsvencoder: Do not copy if input is D3D11 texture
-	  In case that input is D3D11 texture, QSV seems to work regardless
-	  of the alignment. Actually the alignment requirement seems to make
-	  only sense for system memory.
-	  Other Intel GPU dependent implementations (new VA encoder, and MediaFoundation)
-	  do not require such alignment nor other vendor specific ones (NVENC and AMF)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2540>
+	* tests/meson.build:
+	  gstreamer-full: add full static support
+	  Allow a project to use gstreamer-full as a static library
+	  and link to create a binary without dependencies.
+	  Introduce the option 'gst-full-target-type' to
+	  select the build type, dynamic(default) or static.
+	  In gstreamer-full/static build configuration gstreamer (gst.c)
+	  needs the symbol gst_init_static_plugins which is defined
+	  in gstreamer-full.
+	  All the tests and examples are linking with gstreamer but the
+	  symbol gst_init_static_plugins is only defined in the gstreamer-full
+	  library. gstreamer-full can not be built first as it needs to know what plugins
+	  will be built.
+	  One option would be to build all the examples and tests after
+	  gstreamer-full as the tools.
+	  Disable tools build in subprojects too as it will be built at the end of
+	  build process.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4128>
 
-2022-06-09 23:19:24 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-25 17:02:24 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* sys/d3d11/gstd3d11decoder.cpp:
-	  d3d11decoder: Fix for alternate interlacing signalling
-	  Don't set d3d11+interlace caps feature. None of d3d11 elements
-	  support it
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2579>
+	* ext/fdkaac/gstfdkaacdec.c:
+	  fdkaacdec: Support up to 5 rear channels
+	  The `switch (n_rear)` supports up to 5 rear channels, but our channel
+	  set only had space for 3. Size the set properly to fix this.
+	  This didn't actually cause any memory unsafety as `PUSH_CHAN` would stop
+	  incrementing `n_rear` if the channel set is already full.
+	  Thanks to @alatiera for noticing this.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4712>
 
-2022-06-04 22:33:34 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-27 13:10:33 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* sys/d3d11/gstd3d11testsrc.cpp:
-	* sys/d3d11/gstd3d11testsrc.h:
-	* sys/d3d11/meson.build:
-	* sys/d3d11/plugin.cpp:
-	  d3d11: Add d3d11testsrc element
-	  Adding Direct3D11 based videotestsrc element
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2554>
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/msdk/gstmsdkh264enc.c:
+	* sys/msdk/gstmsdkh264enc.h:
+	* sys/msdk/gstmsdkh265enc.c:
+	* sys/msdk/gstmsdkh265enc.h:
+	  msdkenc: Add a property to insert pic timing SEI for avc and hevc
+	  User can decide whether to insert pic timing sei with pic_struct
+	  syntax via oneVPL API mfxExtCodingOption.PicTimingSEI.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4673>
 
-2022-06-08 16:38:00 +0200  Mathieu Duponchelle <mathieu@centricular.com>
+2023-05-25 19:30:29 +0300  Jordan Petridis <jordan@centricular.com>
 
-	* docs/meson.build:
-	  -bad/docs: be more selective about header files to exclude
-	  A few header files in -bad contain comments that start with the
-	  /** gtk-doc pattern, but should not actually be parsed (and warned
-	  about as such).
-	  Previously, we were using far-reaching wildcard patterns to avoid
-	  parsing those, but this had the unintended side effect of also
-	  excluding legitimate files, and creating confusion when comments
-	  were not parsed from those.
-	  Switch to excluding specific files instead.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2576>
+	* ext/openjpeg/gstopenjpegenc.c:
+	  openjpegenc: do not set bpp field on opj_image_cmptparm_t
+	  It's deprecated in favor of the .prec field which we already set.
+	  https://github.com/uclouvain/openjpeg/pull/1383/
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4715>
 
-2022-05-27 05:15:13 +1000  Jan Schmidt <jan@centricular.com>
+2023-05-25 19:03:29 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/androidmedia/gstamc-constants.h:
-	* sys/androidmedia/gstamc.c:
-	* sys/androidmedia/gstamcvideoenc.c:
-	* sys/androidmedia/gstamcvideoenc.h:
-	  amc: Add H.265 encoder mapping.
-	  Add mime type mapping to enable the use of Android H.265 encoders
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2511>
+	* gst-libs/gst/vulkan/gstvkvideoutils.h:
+	  vkvideoutils: fix code-style
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4716>
 
-2022-05-13 17:21:25 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-05-23 11:52:36 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkdec.c:
-	* sys/msdk/gstmsdkdec.h:
-	  msdkdec: Decoder should use its own pool when downstream allocator is not recognizable
-	  Msdkdec should use it own pool when the allocation from downstream query
-	  is not any msdk_allocator (i.e. msdk_video_allocator,
-	  msdk_dmabuf_allocator and msdk_system_allocator). Otherwise, when using
-	  pipeline "msdkh264dec ! vah264enc !" to transcode a not 16-bit-aligned
-	  stream (i.e. 1920x1080), the transcoding will fail due to the size
-	  mismatch issue between decoder pool and encoder pool.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2451>
+	* tests/check/libs/vkimagebufferpool.c:
+	  tests: check if vulkan h264 decoding is supported
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4716>
 
-2022-06-06 10:56:12 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-23 12:26:37 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	  va: Update plugin cache.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2522>
+	* gst-libs/gst/vulkan/gstvkphysicaldevice.c:
+	* gst-libs/gst/vulkan/gstvkphysicaldevice.h:
+	* gst-libs/gst/vulkan/vulkan_fwd.h:
+	  vkphysicaldevice: fetch queue family query result support
+	  And merged in a single structure the queue family operations report.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4716>
+
+2023-05-24 20:37:13 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	  vkimagebufferpool: chain the correct structure
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4716>
+
+2023-05-24 20:36:14 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkvideoutils.c:
+	  vkvideoutils: fix bug for chroma string comparison
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4716>
 
-2022-05-29 13:43:29 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-24 22:12:51 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Guard logging functions
-	  .. and use spec for rate control rather than static switch.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2522>
+	* sys/d3d11/gstd3d11videosink.cpp:
+	  d3d11videosink: Fix error on pause and play
+	  The show_frame() can be called without prepare() call on paused to
+	  playing state change. Thus the prepared buffer should not be cleared
+	  on show_frame()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4700>
 
-2022-05-30 10:20:11 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-22 13:51:47 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
 
-	* sys/va/gstvabaseenc.c:
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Support default and none rate control.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2522>
+	* gst/mpegtsmux/tsmux/tsmux.h:
+	  tsmux.h: Remove TSMUX_MAX_ES_INFO_LENGTH dead code
+	  Also TsMux.es_info_buf which was also not used anywhere
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4681>
 
-2022-05-29 12:09:05 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-19 16:23:50 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	* sys/va/gstvah264enc.c:
-	  va: encoder: Rate control property.
-	  Fixes: #1241
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2522>
+	* gst/mpegtsmux/gstatscmux.c:
+	* gst/mpegtsmux/gstatscmux.h:
+	* gst/mpegtsmux/tsmux/tsmuxstream.c:
+	  tsmux: Separate DVB and ATSC AC3 descriptors
+	  The previous code was ATSC-specific. Separated it into gstatscmux.c and
+	  added the DVB-specific one from ETSI EN 300 468 V1.11.1 (2010-04)
+	  https://www.etsi.org/deliver/etsi_en/300400_300499/300468/01.11.01_60/en_300468v011101p.pdf
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4681>
 
-2022-05-30 11:26:24 +0100  Philippe Normand <philn@igalia.com>
+2023-05-22 14:37:55 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/webrtc/gstwebrtcbin.c:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: Add a prepare-data-channel GObject signal
-	  This new signal allows data-channel consumers to configure signal handlers on a
-	  newly created data-channel, before any data or state change has been notified.
-	  The webrtcin unit-tests were refactored to make use of this new signal.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2427>
+	* gst/mpegtsmux/tsmux/tsmuxstream.c:
+	  tsmux: Refactor AC3 descriptor to use GstByteWriter
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4681>
 
-2022-05-16 16:43:57 +0100  Philippe Normand <philn@igalia.com>
+2023-05-19 16:21:15 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
 
-	* ext/webrtc/webrtcdatachannel.c:
-	  webrtcdatachannel: Chain to parent class constructed
-	  And add a debug log statement.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2427>
+	* gst/mpegtsmux/gstbasetsmux.c:
+	* gst/mpegtsmux/gstbasetsmux.h:
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	* gst/mpegtsmux/tsmux/tsmux.h:
+	  tsmux: Parse bitrate from tags into the stream
+	  Instead of parsing a hardcoded zero and always writing the highest
+	  limit.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4681>
 
-2022-06-02 10:32:28 -0400  Eric Knapp <emkman99@gmail.com>
+2023-05-19 16:18:08 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/decklink/gstdecklink.cpp:
-	* sys/decklink/gstdecklink.h:
-	* sys/decklink/gstdecklinkvideosink.cpp:
-	* sys/decklink/gstdecklinkvideosink.h:
-	  decklinkvideosink: Add 3G-SDI Level A output support
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2544>
+	* gst/mpegtsmux/tsmux/tsmuxstream.c:
+	  tsmux: Fix 0x81 descriptor for AC3 streams
+	  According to ATSCA/52:2018
+	  https://prdatsc.wpenginepowered.com/wp-content/uploads/2021/04/A52-2018.pdf
+	  Used wireshark as ground truth for detection/parsing.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4681>
 
-2022-06-04 15:05:05 +0800  He Junyan <junyan.he@intel.com>
+2023-05-19 15:50:11 +0200  Ruben Gonzalez <rgonzalez@fluendo.com>
 
-	* gst-libs/gst/codecparsers/gsth264parser.c:
-	  h264parser: Fix memory leaks in parse_user_data_unregistered().
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2551>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/dash/gstdashdemux.c:
+	* ext/hls/gsthlsdemux.c:
+	* ext/mpeg2enc/gstmpeg2enc.cc:
+	* ext/mplex/gstmplex.cc:
+	* gst/mpegtsdemux/tsdemux.c:
+	* gst/removesilence/gstremovesilence.c:
+	* sys/dvb/dvbbasebin.c:
+	* sys/dvb/gstdvbsrc.c:
+	* sys/winks/gstksvideosrc.c:
+	  doc: Fix newline char between authors
+	  Found running `gst-inspect-1.0 -a |& grep -v ":" | grep @`
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4682>
 
-2022-06-04 17:23:00 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-05-20 03:01:03 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/rtmp2/rtmp/rtmpmessage.c:
-	  rtmp2: Fix allocation of GstRtmpMeta
-	  Use the right size.
-	  On 64-bit platforms, `GstMetaInfo` is larger than `GstRtmpMeta`, which
-	  masked this bug. On 32-bit platforms, it causes crashes. Thanks to
-	  @maxatka for discovering this.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1721
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2553>
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: Don't use CS_OWNDC style
+	  It's completely unnecessary since we never use
+	  the device context (e.g., BeginPaint() or GetDC() never called).
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4684>
 
-2022-06-02 16:38:55 +0200  Robert Mader <robert.mader@collabora.com>
+2023-05-19 15:10:12 +0800  Shengqi Yu <shengqi.yu@mediatek.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/wayland/gstwaylandsink.c:
-	  gstwaylandsink: Add support for the "render-rectangle" property
-	  We already implement the `set_render_rectangle` videooverlay interface,
-	  thus install the videooverlay property accordingly.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2479>
+	* gst/videoparsers/gsth264parse.c:
+	  h264parse: adjust some logs printing level in h264parse
+	  adjust log level from GST_ERROR to GST_WARNING when h264 caps have
+	  codec_data but no avc format or have no codec data or stream-format.
+	  Because theses are not real errors, it is easy to mislead if print error
+	  logs.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4675>
 
-2022-01-04 15:20:41 +0100  Robert Mader <robert.mader@collabora.com>
+2023-05-18 09:27:29 -0400  Thibault Saunier <tsaunier@igalia.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/wayland/gstwaylandsink.c:
-	* ext/wayland/gstwaylandsink.h:
-	* ext/wayland/meson.build:
-	* ext/wayland/wldisplay.c:
-	* ext/wayland/wldisplay.h:
-	* ext/wayland/wlwindow.c:
-	* ext/wayland/wlwindow.h:
-	* gst-libs/gst/wayland/gstwl_fwd.h:
-	* gst-libs/gst/wayland/gstwlbuffer.c:
-	* gst-libs/gst/wayland/gstwlbuffer.h:
-	* gst-libs/gst/wayland/gstwlcontext.c:
-	* gst-libs/gst/wayland/gstwlcontext.h:
-	* gst-libs/gst/wayland/gstwldisplay.c:
-	* gst-libs/gst/wayland/gstwldisplay.h:
-	* gst-libs/gst/wayland/gstwllinuxdmabuf.c:
-	* gst-libs/gst/wayland/gstwllinuxdmabuf.h:
-	* gst-libs/gst/wayland/gstwlshmallocator.c:
-	* gst-libs/gst/wayland/gstwlshmallocator.h:
-	* gst-libs/gst/wayland/gstwlvideobufferpool.c:
-	* gst-libs/gst/wayland/gstwlvideobufferpool.h:
-	* gst-libs/gst/wayland/gstwlvideoformat.c:
-	* gst-libs/gst/wayland/gstwlvideoformat.h:
-	* gst-libs/gst/wayland/gstwlwindow.c:
-	* gst-libs/gst/wayland/gstwlwindow.h:
-	* gst-libs/gst/wayland/meson.build:
-	* gst-libs/gst/wayland/wayland-prelude.h:
-	* gst-libs/gst/wayland/wayland.c:
-	* gst-libs/gst/wayland/wayland.h:
-	* tests/examples/waylandsink/main.c:
-	* tests/examples/waylandsink/wayland-threads.c:
-	  gstwayland: Move reusable parts of the waylandsink into a library
-	  In preparation for the new element `GstGtkWaylandSink`, move reusable
-	  parts out of `GstWaylandSink` into the already exisiting but very
-	  barebone library.
-	  Notable changes include:
-	  - the `GstWaylandVideo` interface was dropped
-	  - support for `wl-shell` was dropped
-	  - lots of renaming in order to match established naming patterns
-	  - lots of code modernisations, reducing boilerplate
-	  - members were made private wherever possible
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2479>
+	* gst/debugutils/gsttestsrcbin.c:
+	  testsrcbin: Remove spurious caps unref
+	  Caps are cleared at the end of the function
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2575
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4668>
 
-2022-06-06 00:30:15 +0200  Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+2023-04-18 15:57:45 +0800  Ma, Mingyang <mingyang.ma@intel.com>
 
-	* ext/opencv/gstcvtracker.cpp:
-	* ext/opencv/gstcvtracker.h:
-	* ext/opencv/meson.build:
-	  opencv: Allow building against 4.6.x
-	  Replace the broken version checks with one modeled after
-	  `GLIB_CHECK_VERSION`.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2557>
+	* sys/msdk/gstmsdkdec.c:
+	  msdkdec: Fix decoding cases with resolution change (VP9)
+	  The resolution of VP9 video can be changed without keyframe.
+	  The change detected by MSDK/VPL should be negotiated with downstream.
+	  Only the situation can be fixed here if the changed resolution is less than or equal to the initial surface resolution.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4450>
+
+2023-05-11 13:18:18 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	  vkimagebufferpool: prepare new allocated buffers
+	  This means change initial memory undefined layout and access to the ones
+	  required for their usage.
+	  This is only used if VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME is available.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
+
+2023-01-30 18:35:26 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* ext/vulkan/vkdownload.c:
+	  vkdownload: input memories may not match output memories
+	  Split the iterations, one for images and another for buffers, while first
+	  barrier on images, and later in buffers after copy.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
+
+2023-05-09 17:17:31 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* ext/vulkan/vkcolorconvert.c:
+	* ext/vulkan/vkdownload.c:
+	* ext/vulkan/vkupload.c:
+	* ext/vulkan/vkviewconvert.c:
+	* gst-libs/gst/vulkan/gstvkfullscreenquad.c:
+	  vulkan: number of memories in buffer rather than number of planes
+	  New vulkan formats don't match the number of planes with the number of memories
+	  attached to the buffer. This patch changes the pattern of using planes for
+	  traverse the memories with the number of attached memories.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-30 16:31:38 -0400  Olivier Crête <olivier.crete@collabora.com>
+2023-01-13 16:02:22 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: Reject answers that don't contain the same number of m-line as offer
-	  Otherwise, it segfaults later. Also add test to validate this.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2526>
-
-2022-03-15 12:44:20 +0100  Marc Leeman <m.leeman@televic.com>
-
-	* docs/plugins/gst_plugins_cache.json:
-	* gst/librfb/gstrfb-utils.c:
-	* gst/librfb/gstrfb-utils.h:
-	* gst/librfb/gstrfbsrc.c:
-	* gst/librfb/gstrfbsrc.h:
-	* gst/librfb/meson.build:
-	  rfbsrc: add uri interface
-	  Adding a uri interface enables plugging in RFB/VNC sources to anything
-	  that makes use of uridecodebin:
-	  gst-play-1.0 rfb://:password@10.40.216.180:5903?shared=1
-	  Use userinfo to pass user (ignored) and password, other key/value pairs
-	  can be encoded in the query part of the URI (see shared)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1963>
+	* gst-libs/gst/vulkan/gstvkutils.c:
+	* gst-libs/gst/vulkan/gstvkutils.h:
+	  vkutils: add gst_vulkan_get_or_create_image_view_with_info()
+	  It's a generalization of the original gst_vulkan_get_or_create_image_view().
+	  The reason for passing the whole VkImageViewCreateInfo structure rather than
+	  just the missing fields, is because VkImageSubresourceRange and
+	  VkComponentMapping can be different and those are most of VkImageViewCreateInfo.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-17 00:36:24 +0200  Andoni Morales Alastruey <ylatuya@gmail.com>
+2023-04-21 16:49:01 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/videoparsers/gsth264parse.c:
-	* gst/videoparsers/gstvideoparseutils.c:
-	* gst/videoparsers/gstvideoparseutils.h:
-	  videoparse: rename from _free to _clear
-	  The function does not free the structure but the data
-	  contained within.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1458>
+	* gst-libs/gst/vulkan/gstvkdevice.c:
+	  vkdevice: enable device optional extensions
+	  Enable before-hand what the user might use.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-16 14:21:53 +0200  Andoni Morales Alastruey <ylatuya@gmail.com>
+2023-04-04 19:20:43 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/codecparsers/gsth264parser.c:
-	  h264parse: fix leak in user data unregistered
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1458>
+	* tests/check/libs/vkformat.c:
+	* tests/check/libs/vkimagebufferpool.c:
+	* tests/check/meson.build:
+	  tests: vkimagebufferpool and format mapping
+	  This test will create a pool for VkImageMemory for decoding and others usages.
+	  And a test for the new Vulkan format mapping.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-02-27 18:41:12 +0000  Andoni Morales Alastruey <ylatuya@gmail.com>
+2023-05-09 18:04:13 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/codecparsers/gsth264parser.h:
-	  Fix documentation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1458>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	  vkformat: add VK_FORMAT_G8_B8R8_2PLANE_420_UNORM
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-02-17 15:55:19 +1100  Brad Hards <bradh@frogmouth.net>
+2023-04-05 10:53:57 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* tests/check/elements/h264parse.c:
-	  h264parse: add unit test for Precision Time Stamp in SEI messages
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1458>
+	* gst-libs/gst/vulkan/gstvkswapper.c:
+	  vkswapper: use gst_vulkan_format_to_video_format()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2021-12-19 19:14:05 +0100  Andoni Morales Alastruey <ylatuya@gmail.com>
+2023-04-05 10:53:31 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/codecparsers/gsth264parser.c:
-	* gst-libs/gst/codecparsers/gsth264parser.h:
-	* gst/videoparsers/gsth264parse.c:
-	* gst/videoparsers/gsth264parse.h:
-	* gst/videoparsers/gstvideoparseutils.c:
-	* gst/videoparsers/gstvideoparseutils.h:
-	  h264parse: add support Precision Time Stamp in SEI messages
-	  Expose User Data Unregistered as a new Meta and add
-	  API to parse Precision Time Stamp (ST 0604).
-	  Fixes #927
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1458>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	* gst-libs/gst/vulkan/gstvkformat.h:
+	  vkformat: add gst_vulkan_format_to_video_format()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-06-02 02:22:19 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-05 10:09:39 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/cuda/meson.build:
-	  meson: cuda: Add missing override_dependency()
-	  Required for GstCuda library to be consumed via "gstreamer-cuda-1.0"
-	  dependency.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2539>
+	* gst-libs/gst/vulkan/gstvkimagememory.c:
+	* gst-libs/gst/vulkan/gstvkimagememory.h:
+	* sys/applemedia/iosurfacevulkanmemory.c:
+	  vulkan: use gst_vulkan_format_get_aspect()
+	  In order to use it, without depending in a previous calling of
+	  _create_info_from_args(), VkFormat as input parameter to
+	  gst_vulkan_image_memory_init() was added.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-06-02 21:25:38 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-04 22:23:23 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/cuda/gstcudautils.c:
-	  cuda: Fix uninitialized debug category
-	  Make sure debug category init
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2542>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	* gst-libs/gst/vulkan/gstvkformat.h:
+	  vkformat: add gst_vulkan_format_get_aspect()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-04-22 06:46:07 +0000  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-05-08 17:07:12 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkav1enc.c:
-	* sys/msdk/gstmsdkav1enc.h:
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkenc.h:
-	  msdkav1enc: Reorder pts
-	  This is a workaround for pts because oneVPL cannot handle the pts
-	  correctly when there is b-frames. We first cache the input frame pts in
-	  a queue then retrive the smallest one for the output encoded frame as
-	  we always output the coded frame when this frame is displayable.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2089>
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	  vkimagebufferpool: fail if image cannot be allocated
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-03-31 06:45:03 +0000  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-04-03 21:01:34 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkav1enc.c:
-	* sys/msdk/gstmsdkav1enc.h:
-	  msdkav1enc: Add b-pyramid and p-pyramid
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2089>
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.h:
+	  vkimagebufferpool: gst_vulkan_image_buffer_pool_config_set_decode_caps()
+	  This is going to be used when the pool is used by a video decoder for
+	  VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR, since the frame allocation needs the
+	  VkVideoProfileInfoKHR, and for that here GstCaps is used to wire it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-03-31 06:33:55 +0000  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-04-03 20:56:40 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdkav1enc.c:
-	* sys/msdk/gstmsdkav1enc.h:
-	  msdkav1enc: Add tile for encoding
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2089>
+	* gst-libs/gst/vulkan/gstvkvideoutils.c:
+	* gst-libs/gst/vulkan/gstvkvideoutils.h:
+	* gst-libs/gst/vulkan/meson.build:
+	* gst-libs/gst/vulkan/vulkan.h:
+	* gst-libs/gst/vulkan/vulkan_fwd.h:
+	  vkvideoutils: add gst_vulkan_video_profile_{to/from}_caps()
+	  Add this new source file with utils for video profile mapping with GstCaps.
+	  These method is used to pass this information along GStreamer.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
+
+2023-04-03 20:17:56 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	  vkimagebufferpool: use gst_vulkan_image_memory_alloc_with_image_info()
+	  As the pool will be only used for images with usage
+	  VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR only one layer has to be allocated.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-03-31 06:03:36 +0000  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-04-01 11:25:07 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/gstmsdk.c:
-	* sys/msdk/gstmsdkav1enc.c:
-	* sys/msdk/gstmsdkav1enc.h:
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkenc.h:
-	* sys/msdk/meson.build:
-	  msdk: Add msdkav1enc element
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2089>
+	* gst-libs/gst/vulkan/gstvkbuffermemory.c:
+	* gst-libs/gst/vulkan/gstvkimagememory.c:
+	* gst-libs/gst/vulkan/gstvkmemory.c:
+	* gst-libs/gst/vulkan/gstvkmemory.h:
+	  vulkan: find memory type index with requirements
+	  The specification says:
+	  VUID-vkAllocateMemory-pAllocateInfo-01713
+	  must pAllocateInfo->allocationSize be less than or equal to
+	  VkPhysicalDeviceMemoryProperties::memoryHeapsmemindex.size where memindex =
+	  VkPhysicalDeviceMemoryProperties::memoryTypespAllocateInfo->memoryTypeIndex.heapIndex
+	  as returned by vkGetPhysicalDeviceMemoryProperties for the VkPhysicalDevice that
+	  device was created from.
+	  Though this can be catch by the validation layer, the requested frame size
+	  depends on the use case so it's better to check this restriction by our code.
+	  This patch also makes use of this new function to find memory type index,
+	  and removes the unused function to find memory type index, which, as GstVulkan is
+	  considered unstable, we can do it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
+
+2023-04-01 08:12:28 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	  vkimagebufferpool: use gst_vulkan_format_from_video_info_2()
+	  To get the number of images and its Vulkan formats for the GStreamer format.
+	  Also it gets the basic image usage by default if it's not defined. It fails if the
+	  video format is not supported.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-31 20:39:29 +0200  Jakub Adam <jakub.adam@collabora.com>
+2023-03-31 12:43:59 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/amfcodec/gstamfencoder.cpp:
-	  amfencoder: always empty the queue when pushing output samples
-	  gst_amf_encoder_try_output() pushes at most one output buffer downstream
-	  although more may be ready. As a consequence, output samples will keep
-	  queueing up in AMFComponent whenever QueryOutput() returns AMF_REPEAT
-	  (and do_wait is FALSE). This has negative impact on latency when the
-	  video being encoded is a live stream.
-	  In order to avoid it, always retrieve and push all samples available in
-	  AMFComponent's output queue at once.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2536>
-
-2022-05-29 06:55:27 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/directshow/gstdshowvideosrc.cpp:
-	* sys/directshow/plugin.cpp:
-	  directshow: Fix for uninitialized debug category warning
-	  A method in the code is used in another place (device provider)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2519>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	* gst-libs/gst/vulkan/gstvkformat.h:
+	  vkformat: add gst_vulkan_format_from_video_info_2()
+	  The purpose of this function is to get more info about the mapped Vulkan format
+	  from the GStreamer format, since they can be multiple Vulkan formats for one
+	  GStreamer format.
+	  Also a Vulkan format may have certain usage and aspects that must be verified.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-29 12:42:52 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-31 12:53:42 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvabaseenc.c:
-	* sys/va/gstvabasetransform.c:
-	  va: Register base classes as abstract.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2521>
+	* gst-libs/gst/vulkan/gstvkformat.c:
+	* gst-libs/gst/vulkan/gstvkformat.h:
+	* gst-libs/gst/vulkan/gstvkimagememory.c:
+	* gst-libs/gst/vulkan/gstvkimagememory.h:
+	  vkformat: move gst_vulkan_format_from_video_info()
+	  Moved gst_vulkan_format_from_video_info() from gstvkimagememory to gstvkformat
+	  in order to centralize the video format operations in a single source file.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-29 12:09:22 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2021-04-23 12:23:00 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvaencoder.c:
-	  va: encoder: Use entrypoint type.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2521>
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.h:
+	  vkimagebufferpool: pass usage and memory properties
+	  Pass, in config structure, usage and memory properties, assigning proper
+	  defaults if they aren't set. This parameters are used in image memory
+	  allocation.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-27 14:47:21 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-28 15:31:19 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvah264enc.c:
-	  va264enc: Fix typo.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2508>
+	* gst-libs/gst/vulkan/gstvkdevice.c:
+	* gst-libs/gst/vulkan/gstvkdevice.h:
+	  vkdevice: add gst_vulkan_device_queue_family_indices()
+	  This method will return a GArray with all the queue family indices created by
+	  the device when it's opened. This array will be used by VkImageCreateInfo to
+	  allocate a new Vulkan image.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-27 14:45:51 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-28 15:27:18 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvaencoder.c:
-	  va: encoder: Fix regression since commit 2042c2d4f0.
-	  There's no need to compare with the open entrypoint to query the
-	  encoder. This commit removes the checks to the configured entrypoint
-	  with the parameter.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2508>
+	* gst-libs/gst/vulkan/gstvkdevice.c:
+	  vkdevice: add programming parameters verification
+	  To `gst_vulkan_device_foreach_queue()`.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-03-26 23:48:46 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-17 15:07:14 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/mediafoundation/gstmfh264enc.cpp:
-	* sys/mediafoundation/gstmfh265enc.cpp:
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	* sys/mediafoundation/gstmfvideoencoder.h:
-	* sys/mediafoundation/gstmfvp9enc.cpp:
-	* tests/examples/mediafoundation/meson.build:
-	* tests/examples/mediafoundation/mfvideoenc-dynamic-reconfigure.c:
-	* tests/examples/meson.build:
-	  mfvideoencoder: Handle dynamic property update
-	  Re-init MFT on property update to apply new encoding options
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2037>
+	* gst-libs/gst/vulkan/gstvkbuffermemory.c:
+	* gst-libs/gst/vulkan/gstvkbuffermemory.h:
+	  vkbuffermemory: add gst_vulkan_buffer_memory_alloc_with_buffer_info()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-03-26 23:50:24 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-04 17:10:11 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/mediafoundation/plugin.cpp:
-	  mediafoundation: Run indent
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2037>
+	* gst-libs/gst/vulkan/gstvkimagememory.c:
+	* gst-libs/gst/vulkan/gstvkimagememory.h:
+	  vkimagememory: gst_vulkan_image_memory_alloc_with_image_info()
+	  This new method instead of passing a bunch of variables which will fill
+	  `VkImageCreateInfo`, the method accepts this whole structure, so the caller can
+	  customize it as much as they want.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-03-26 22:24:27 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-27 19:19:51 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	  mfvideoenc: Remove redundant bitwise or operation
-	  MFT_ENUM_FLAG_SORTANDFILTER_APPROVED_ONLY (0xc0) covers
-	  MFT_ENUM_FLAG_SORTANDFILTER (0x40)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2037>
+	* gst-libs/gst/vulkan/gstvkimagememory.c:
+	  vkimagememory: look up for Vulkan format using a static table
+	  Replace the switch structure with explicit and extendable static table.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-03-26 21:47:10 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-23 11:09:29 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	  mfvideoencoder: Early terminate d3d11 interop
-	  Shared texture will work only for the same GPU
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2037>
+	* gst-libs/gst/vulkan/gstvkdevice.c:
+	  vkdevice: enable multiple queues per device
+	  Originally the opened device only created one queue of one family queue, to say
+	  graphics one. This approach felt short when other queue family is required not
+	  shared with the graphics queue family, for example video decoding.
+	  This new approach proposes to create those queues with supported families. For
+	  now, only video decoding and encoder are created, if they are available.
+	  In order to hold multiple queues opened, an array of VkDeviceQueueCreateInfo is
+	  held along the live the device object, because it's used to traverse or get the
+	  opened queues.
+	  The algorithm to choose which queues create (or open) is to look for the queue
+	  with more family bits, which also supports the one we are requesting, thus
+	  minimizing the number of global queues of a certain family to create.
+	  Nonetheless, the number of queues to open per family is set to be all of them,
+	  widening the possibility of parallelism.
+	  Also, this commit do a cosmetic refactor the assigning the physical device
+	  nearer where it's used.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-03-26 21:43:50 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-21 21:25:52 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	  mfvideoencoder: Check HRESULT code as well for GPU sync
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2037>
+	* gst-libs/gst/vulkan/gstvkdevice.c:
+	  vkdevice: enable features from physical device
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-03-26 21:40:47 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-17 12:32:31 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	  mfvideoencoder: Don't specify keyed mutex misc flag
-	  Current implemetation copies textures using non-keyed mutex way.
-	  D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX is pointless
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2037>
+	* gst-libs/gst/vulkan/gstvkphysicaldevice-private.h:
+	* gst-libs/gst/vulkan/gstvkphysicaldevice.c:
+	  vkphysicaldevice: add gst_vulkan_physical_device_get_features()
+	  gst_vulkan_physical_device_get_features() is a private function to access to the
+	  available features in the device.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-25 13:25:15 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-20 20:44:28 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvacompositor.c:
-	  vacompositor: Pass video info pointer than copying it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2496>
+	* gst-libs/gst/vulkan/gstvkphysicaldevice.c:
+	* gst-libs/gst/vulkan/gstvkphysicaldevice.h:
+	  vkphysicaldevice: fetch queue family video codec operations
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-25 13:24:41 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-01-04 13:28:20 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvacompositor.c:
-	  vacompositor: Remove useless consts.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2496>
+	* gst-libs/gst/vulkan/gstvkdebug.c:
+	  vkdebug: add video queue flags strings
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-27 21:13:43 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-04 13:23:45 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.h:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	  d3d11decoder: Work around Intel DXVA driver crash
-	  Intel DXVA driver crashes sometimes (from GPU thread) if
-	  ID3D11VideoDecoder is released while there are outstanding view objects.
-	  To make sure the object life cycle, holds an ID3D11VideoDecoder refcount
-	  in GstD3D11Memory object.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2504>
+	* gst-libs/gst/vulkan/gstvkconfig.h.meson:
+	* gst-libs/gst/vulkan/meson.build:
+	* meson_options.txt:
+	  vulkan: detect vulkan video extensions
+	  Also adds a meson option to enable them.
+	  The symbol GST_VULKAN_HAVE_VIDEO_EXTENSIONS is an alias of
+	  defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 238
+	  if the option is allowed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
 
-2022-05-26 23:50:08 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-15 14:37:10 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* sys/qsv/gstqsvencoder.cpp:
-	  qsvencoder: Bind internal texture to render target
-	  ... so that memory allocator can initialize texture with black color
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2502>
+	* docs/plugins/gst_plugins_cache.json:
+	  docs: msdkenc: update supported image formats
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4000>
 
-2022-05-26 23:46:05 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-30 11:05:04 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	  d3d11memory: Clear YUV texture with black color
-	  We prefer black color as an initial texture color and
-	  Direct3D11 runtime will initialize texture with zeros (except for alpha)
-	  which is fine for RGB formats. But UV components of YUV texture
-	  requires manual clear for black color.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2502>
+	* sys/msdk/gstmsdkcaps.c:
+	  msdkenc: Remove unsupported image formats for MSDK path
+	  For unsupported encoding formats, please use msdkvpp plugin
+	  to do conversion first.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4000>
 
-2022-05-24 12:54:05 -0400  U. Artie Eoff <ullysses.a.eoff@intel.com>
+2023-03-30 09:39:31 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* tests/check/elements/vacompositor.c:
-	* tests/check/meson.build:
-	  tests: va: add simple vacompositor test
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2481>
+	* sys/msdk/gstmsdkav1enc.c:
+	* sys/msdk/gstmsdkenc.c:
+	* sys/msdk/gstmsdkenc.h:
+	* sys/msdk/gstmsdkh264enc.c:
+	* sys/msdk/gstmsdkh265enc.c:
+	* sys/msdk/gstmsdkmjpegenc.c:
+	* sys/msdk/gstmsdkvp9enc.c:
+	  msdkenc: Remove internal vpp function
+	  The internal vpp function and msdkvpp plugin are duplicated,
+	  so remove the internal vpp, please use msdkvpp plugin to do
+	  conversion if necessary.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4000>
 
-2022-04-22 16:29:56 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-05-15 15:42:04 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/msdk/gstmsdkh264enc.c:
 	* sys/msdk/gstmsdkh265enc.c:
-	* sys/msdk/gstmsdkh265enc.h:
-	  msdkh265enc: Add intra refresh parameters
-	  Note that for msdkh265enc, intra refresh parameters are only supported
-	  under low-power mode. If these parameters are set without enabling lowpower,
-	  they will be simply ignored.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2308>
+	  bad:docs: Add new properties description for msdkh264enc and msdkh265enc
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4589>
 
-2022-04-15 13:38:20 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-04-27 10:19:57 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
 	* sys/msdk/gstmsdkh264enc.c:
 	* sys/msdk/gstmsdkh264enc.h:
-	  msdkh264enc: Add intra refresh parameters
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2308>
+	* sys/msdk/gstmsdkh265enc.c:
+	* sys/msdk/gstmsdkh265enc.h:
+	  msdkenc: Add properties max/min-qp for I/P/B frame separately in avc and hevc
+	  max-qp and min-qp will set the same quantizer scale for I/P/B frames,
+	  while max-qp-i/p/b and min-qp-i/p/b enable the max/min quantizer for I,P,B
+	  frame separately. When max/min-qp and max/min-qp-i/p/b are given
+	  simultaneously, the later set one will overide the previous one.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4589>
 
-2022-05-23 00:36:50 +0900  Seungha Yang <seungha@centricular.com>
+2022-04-07 09:58:48 +0900  Sangchul Lee <sc11.lee@samsung.com>
 
-	* tests/examples/d3d11/d3d11videosink-kb.c:
-	* tests/examples/d3d11/d3d11videosink-kb.h:
-	* tests/examples/d3d11/d3d11videosink.c:
-	* tests/examples/d3d11/meson.build:
-	* tests/examples/key-handler.c:
-	* tests/examples/key-handler.h:
-	* tests/examples/nvcodec/meson.build:
-	* tests/examples/nvcodec/nvcodec-kb.c:
-	* tests/examples/nvcodec/nvcodec.c:
-	* tests/examples/nvcodec/nvcodec.h:
-	* tests/examples/qsv/meson.build:
-	* tests/examples/qsv/qsvenc-dynamic-reconfigure.c:
-	  tests: examples: Stop duplicating keyboard interaction handler code
-	  Extract the code from QSV and use it for D3D11 and NVCODEC examples
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2468>
-
-2022-05-26 14:08:55 +0100  Tim-Philipp Müller <tim@centricular.com>
-
-	* ext/webrtc/gstwebrtcice.c:
-	  webrtc: fix build with older libnice versions
-	  1) check for right macro name when checking for NICE_VERSION_CHECK
-	  2) if libnice version is 0.1.18.1 this should not satisfy
-	  a NICE_VERSION_CHECK(0,1,19).
-	  Fixes build with libnice 0.1.18.1 subproject checkout.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2499>
+	* tests/check/elements/webrtcbin.c:
+	  tests/webrtc: Validate peer connection stats
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2127>
 
-2022-05-24 05:33:05 +1000  Jan Schmidt <jan@centricular.com>
+2022-04-06 10:14:07 +0900  Sangchul Lee <sc11.lee@samsung.com>
 
-	* sys/androidmedia/gstamc.c:
-	  amc: Don't map input buffer with write mode
-	  When copying data out of a GStreamer buffer, we don't
-	  need to map it writable.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2492>
-
-2022-05-11 09:17:46 +0100  Philippe Normand <philn@igalia.com>
-
-	* ext/webrtc/gstwebrtcice.c:
-	  webrtc: Use new libnice API to get the candidate relay address
-	  Corresponding libnice API added in:
-	  https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/229 (0.1.19)
-	  https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/232 (0.1.20)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1998>
-
-2022-05-11 09:15:33 +0100  Philippe Normand <philn@igalia.com>
-
-	* ext/webrtc/gstwebrtcice.c:
-	* ext/webrtc/meson.build:
-	  webrtc: Ensure the NICE_CHECK_VERSION macro is available
-	  This macro was introduced in libnice 0.1.19.1, so until we bump our libnice
-	  dependency to 0.1.20 we have to vendor the macro.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1998>
+	* ext/webrtc/gstwebrtcbin.c:
+	  webrtc: Add data-channels-opened/closed to get-stats signal documentation
+	  With contributions from: Matthew Waters <matthew@centricular.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2127>
 
-2022-03-26 12:36:46 +0000  Philippe Normand <philn@igalia.com>
+2023-04-20 16:41:11 +0800  Haihua Hu <jared.hu@nxp.com>
 
-	* ext/webrtc/gstwebrtcice.c:
-	* ext/webrtc/gstwebrtcice.h:
-	* ext/webrtc/gstwebrtcstats.c:
-	  webrtc: Refactor ICECandidateStats freeing logic to a dedicated function
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1998>
+	* gst-libs/gst/play/gstplay.c:
+	  gstplay: fix critical log when enable playbin3
+	  when play rtsp stream with playbin3 enabled, there are some critical logs:
+	  g_object_get_is_valid_property: object class 'GstPlayBin3' has no property named 'n-video'
+	  g_object_get_is_valid_property: object class 'GstPlayBin3' has no property named 'n-audio'
+	  g_object_get_is_valid_property: object class 'GstPlayBin3' has no property named 'n-text'
+	  self->collection could be NULL when READY->PAUSED if the pipeline
+	  is live, then it will fallback to query playbin2's property,
+	  we can call gst_play_streams_info_create_from_collection
+	  directly, it will check self->collection internal.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4460>
 
-2022-03-20 12:36:07 +0000  Philippe Normand <philn@igalia.com>
+2023-05-17 22:58:46 +0200  Ruben Gonzalez <rgonzalez@fluendo.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Document IceCandidateStats and RTCIceCandidatePairStats
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1998>
+	* README.md:
+	  README.md: fix current version
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4662>
 
-2021-09-01 16:12:24 +0000  Sherrill Lin <lshuying@amazon.com>
+2023-05-15 11:14:24 +0200  Martin Nordholts <martn@axis.com>
 
-	* tests/check/elements/webrtcbin.c:
-	  webrtcstats: Update unit test for outbound rtp stats
-	  "remote-id" is not guaranteed to present after commit 1deb034e3d873f577a38bc483e6256b0346ee874.
-	  Thus, we should not fail the test if "remote-id" is not found.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1998>
-
-2021-06-30 16:01:10 -0400  Sherrill Lin <lshuying@amazon.com>
-
-	  webrtcstats: Improve selected candidate pair stats by adding ICE candidate info
-	  The implementation follows w3.org specs:
-	  * https://www.w3.org/TR/webrtc-stats/#icecandidate-dict*
-	  * https://www.w3.org/TR/webrtc-stats/#candidatepair-dict*
-	  Corresponding unit tests are also added.
-	  Rebased and updated from
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1462
-	  Fixes #1207
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1998>
+	* ext/webrtc/gstwebrtcbin.c:
+	* ext/webrtc/gstwebrtcbin.h:
+	* ext/webrtc/gstwebrtcstats.c:
+	  webrtc: Track stats for data channels opened and closed
+	  Track data channel stats for `dataChannelsOpened` and
+	  `dataChannelsClosed` in `RTCPeerConnectionStats` as specified by
+	  https://www.w3.org/TR/webrtc-stats/#dictionary-rtcpeerconnectionstats-members
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4638>
 
-2022-05-23 20:58:47 +0800  He Junyan <junyan.he@intel.com>
+2023-05-14 20:05:25 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvabaseenc.c:
-	* sys/va/gstvabaseenc.h:
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	* sys/va/gstvah264enc.c:
-	* sys/va/gstvah264enc.h:
-	* sys/va/plugin.c:
-	  va: H264enc: Add encoder for VAEntrypointEncSliceLP.
-	  We name vah264lpenc to support H264's VAEntrypointEncSliceLP encoder.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2472>
+	* sys/d3d11/gstd3d11videosink.cpp:
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: Add render-rectangle property
+	  ... and resize HWND on GstVideoOverlay::set_render_rectangle even when
+	  we are rendering without external HWND
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2563
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4653>
 
-2022-05-25 20:01:34 +0800  He Junyan <junyan.he@intel.com>
+2023-05-11 04:53:24 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvabaseenc.c:
-	  va: encoder: Do not reset the frame count when reconfig().
-	  We should not reset the input/output_frame_count when some configure
-	  changes. For example, the if resolution changes, the current way just
-	  resets the frame count and make the PTS of the output buffer restart
-	  from the original PTS of the first frame. That causes a lot of QOS
-	  event and drop all the new frames.
-	  We should only reset them when encoder start().
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2489>
+	* gst-libs/gst/codecparsers/gsth264parser.h:
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	* gst/codectimestamper/gsth264timestamper.c:
+	* gst/videoparsers/gsth264parse.c:
+	  h264parser: Define level enum values
+	  ... and stop duplicating it
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4595>
 
-2022-05-25 19:57:18 +0800  He Junyan <junyan.he@intel.com>
+2023-03-02 18:09:54 +0800  Elliot Chen <elliot.chen@nxp.com>
 
-	* sys/va/gstvabaseenc.c:
-	* sys/va/gstvabaseenc.h:
-	* sys/va/gstvah264enc.c:
-	  va: encoder: change reset_state() to a virtual function of base class.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2489>
+	* gst-libs/gst/play/gstplay.c:
+	  gstplay: avoid getting property of playbin2 if subtitle_sid is null
+	  There is a probability of getting "current-text" property
+	  when play with playbin3, and this property is available
+	  only in playbin2.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4106>
 
-2022-05-24 10:21:31 -0400  U. Artie Eoff <ullysses.a.eoff@intel.com>
+2023-05-17 03:54:43 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvacompositor.c:
-	  vacompositor: check caps and info return values
-	  Check return values for get caps and video info from caps.
-	  This was flagged by static analysis.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2480>
+	* sys/wasapi2/gstwasapi2client.cpp:
+	* sys/wasapi2/gstwasapi2device.c:
+	* sys/wasapi2/gstwasapi2sink.c:
+	* sys/wasapi2/gstwasapi2src.c:
+	  wasapi2: fix "device" property description
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4651>
 
-2022-05-25 02:38:01 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-16 17:01:32 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/d3d11/gstd3d11av1dec.cpp:
-	* sys/d3d11/gstd3d11h264dec.cpp:
-	* sys/d3d11/gstd3d11h265dec.cpp:
-	* sys/d3d11/gstd3d11mpeg2dec.cpp:
-	* sys/d3d11/gstd3d11vp8dec.cpp:
-	* sys/d3d11/gstd3d11vp9dec.cpp:
-	  d3d11decoder: Don't print error log on negotiation failure
-	  It may not be a critical error and even expected when shutting down
-	  pipeline or flushing.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2483>
+	* sys/wasapi/gstwasapisink.c:
+	* sys/wasapi/gstwasapisrc.c:
+	  wasapi: fix "device" property description
+	  Fixes gstreamer/gst-plugins-bad#1620
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4651>
 
-2022-05-24 11:06:39 +0200  Erwann Gouesbet <erwann.gouesbet@blacknut.com>
+2023-05-15 13:47:16 +0200  Carlos Rafael Giani <crg7475@mailbox.org>
 
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	  d3d11screencapture: Fix missing/outdated cursor shape
-	  d3d11screencapture can miss a cursor shape to draw or draw an outdated cursor shape.
-	  - AcquireNextFrame only provides cursor shape when there is one update
-	  - current d3d11screencapture skips cursor shape when mouse is not drawn
-	  So, if a gstreamer application uses d3d11screencapture with cursor initially not drawn
-	  "show-cursor"=false and then switches this property to true, the cursor will not be
-	  actually drawn until AcquireNextFrame provides a new cursor shape.
-	  This commit makes d3d11screencapture always update the cursor shape information, even
-	  if the mouse is not drawn. d3d11screencapture will always have the latest cursor shape
-	  when requested to draw it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2485>
+	* sys/bluez/gstavdtputil.c:
+	  avdtputil: Use int instead of int range for fixed bitpool values
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1698
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4650>
 
-2022-05-24 14:47:43 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-15 22:05:55 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/plugin.c:
-	  va: Avoid unused variable if logging is disabled.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2478>
+	* sys/nvcodec/gstcudaconverter.c:
+	* sys/nvcodec/gstcudaconverter.h:
+	* sys/nvcodec/gstcudaconvertscale.c:
+	  cudaconvertscale: Add support for flip/rotation
+	  Similar to the d3d11convert element, colorspace conversion, resizing and
+	  flip/rotation operations can be done in a single kernel function call
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4640>
 
-2022-05-22 10:10:38 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-16 22:56:15 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvah264enc.c:
-	  va: Keep include's code style
-	  Headers are in alphabetical order.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2465>
+	* sys/d3d11/gstd3d11convert.cpp:
+	  d3d11convert: Fix for runtime property update
+	  Every setup happens in set_caps() method but basetransform will not
+	  call the set_caps() if in/out caps were not changed
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4646>
 
-2022-05-24 13:19:45 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-16 15:32:56 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/va/gstvafilter.c:
-	  vafilter: Fix logging of unsupported alpha blending.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2477>
+	* sys/va/gstvadevice_linux.c:
+	  va: No need to sort the device after registered
+	  The va devices are already registered by the drm path order, so
+	  there is no need to sort them again after registered.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4643>
+
+2023-05-16 14:38:44 +0800  He Junyan <junyan.he@intel.com>
+
+	* sys/va/gstvadevice_linux.c:
+	  va: Sort udev path name before register the va plugins
+	  The devices list returned by g_udev_client_query_by_subsystem() may
+	  contain udev devices in disorder path name. For example, on some
+	  platform it may contain renderD129 before renderD128 device. This
+	  will cause we register wrong va plugin name. In this case, the
+	  renderD129 will be registered as default plugins such as vah265dec,
+	  while the renderD128 will be registered as varenderD128h265dec.
+	  This conflicts with the non-udev version of gst_va_device_find_devices().
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4643>
 
-2022-05-24 14:36:36 +1000  Matthew Waters <matthew@centricular.com>
+2023-05-15 17:31:58 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: reuese the same fec/rtx/red payload types for the same media payload
-	  WHen bundling, if multiple medias are used with the same media payload, then
-	  each of the fec/rtx/red additions would add a distinct payload.  This could
-	  very easily overflow the available payload space.
-	  Instead, track the relationship between the media payload value and
-	  the relevant fec/rtx/red payload values and reuse them whenever
-	  necessary, even when bundling.
-	  e.g.
-	  ...
-	  a=group:BUNDLE video0 video1
-	  m=video 9 UDP/SAVPF 96 97
-	  a=mid:video0
-	  a=rtpmap:96 VP8/90000
-	  a=rtpmap:97 rtx/90000
-	  a=fmtp:97 apt=96
-	  ...
-	  m=video 9 UDP/SAVPF 96 97
-	  a=mid:video1
-	  a=rtpmap:96 VP8/90000
-	  a=rtpmap:97 rtx/90000
-	  a=fmtp:97 apt=96
-	  ...
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2474>
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: fix warning text and debug data
+	  They were backwards or missing.
+	  Fix: #2567
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4641>
 
-2022-05-23 00:04:03 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-10 12:00:15 +0200  Johan Sternerup <johast@axis.com>
 
-	* tests/examples/qsv/qsvenc-dynamic-reconfigure.c:
-	  tests: examples: Fix typo in QSV encoder example
-	  Fixing width adjustment
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2467>
+	* ext/sctp/gstsctpenc.c:
+	  sctpenc: Fix potential shutdown deadlock
+	  When transitioning from state PAUSED to READY, the sctpenc element
+	  could previously be stuck in an endless loop trying to resend data
+	  in case the underlying sctp stream was in the process of
+	  resetting. usrsctp_sendv() would repeatedly return EAGAIN with the
+	  result that 0 bytes were sent and then sctpenc would retry forever.
+	  To bring sctpenc out of the resend loop we just need to inform the
+	  sink pad that it is flushing, which is already done for the associated
+	  data queue, but we also need to set the bools associated with the
+	  sinkpads that are used as the loop criterion.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4601>
 
-2022-05-22 22:44:11 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-25 16:03:08 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* sys/qsv/gstqsvav1enc.cpp:
-	* sys/qsv/gstqsvav1enc.h:
-	* sys/qsv/meson.build:
-	* sys/qsv/plugin.cpp:
-	* tests/examples/qsv/qsvenc-dynamic-reconfigure.c:
-	  qsv: Add AV1 encoder element
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2467>
+	* sys/msdk/gstmsdkcaps.c:
+	  msdkmjpegdec: Fix ColorFormat for BGRx format
+	  For msdkmjpegdec, the BGRx format is supported in src caps,
+	  set the ColorFormat to MFX_JPEG_COLORFORMAT_RGB.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4489>
 
-2022-05-22 21:38:34 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-11 12:30:11 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* sys/qsv/gstqsvencoder.cpp:
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh265enc.cpp:
-	* sys/qsv/gstqsvjpegenc.cpp:
-	* sys/qsv/gstqsvvp9enc.cpp:
-	  qsvencoder: Move common property to baseclass
-	  adapter-luid and device-path are common for all codecs
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2467>
+	* sys/msdk/msdk.c:
+	  msdk: Fix initialization of the msdk_session.impl_idx
+	  This fixes the issue of msdk_session.impl_idx not being initialized.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4448>
 
-2022-05-23 15:03:03 +0800  He Junyan <junyan.he@intel.com>
+2023-05-12 22:18:22 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvabaseenc.c:
-	  va: baseenc: No need to check the frame pointer in handle_frame().
-	  No need to check the NULL pointer of "frame" in error handling, it
-	  is assured non-NULL by base class and we already use it everywhere
-	  in this function.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2471>
+	* sys/d3d11/gstd3d11convert.cpp:
+	* sys/d3d11/gstd3d11download.cpp:
+	* sys/d3d11/gstd3d11ipcsink.cpp:
+	* sys/d3d11/gstd3d11ipcsrc.cpp:
+	* sys/d3d11/gstd3d11screencapturedevice.cpp:
+	* sys/d3d11/gstd3d11screencapturesrc.cpp:
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	* sys/d3d11/gstd3d11upload.cpp:
+	* sys/d3d11/gstd3d11videosink.cpp:
+	  d3d11: Update element meta
+	  Make them consistent, update outdated description and fix some typos
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4619>
 
-2022-05-22 15:03:54 +0800  He Junyan <junyan.he@intel.com>
+2023-05-12 17:13:21 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvabaseenc.c:
-	  va: baseenc: include the "vacompat.h" for old version glib.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2463>
+	* ext/vulkan/meson.build:
+	* ext/vulkan/shaders/meson.build:
+	  vulkan: minor meson clean ups
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4621>
 
-2022-04-26 12:07:26 -0400  U. Artie Eoff <ullysses.a.eoff@intel.com>
+2023-03-12 12:59:11 +0000  Philippe Normand <philn@igalia.com>
 
-	* sys/va/plugin.c:
-	  va: vpp: enable compositor
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2332>
+	* ext/wpe/WPEThreadedView.cpp:
+	* ext/wpe/meson.build:
+	* ext/wpe/wpe-extension/gstwpeextension.c:
+	* ext/wpe/wpe-extension/gstwpeextension.h:
+	* ext/wpe/wpe-extension/meson.build:
+	* meson_options.txt:
+	  wpe: Add support for the WPEWebKit 2.0 API version
+	  Most notably this disables console messages support when the 2.0 API is used,
+	  because there is no replacement for it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4159>
 
-2022-04-26 12:06:17 -0400  U. Artie Eoff <ullysses.a.eoff@intel.com>
+2023-05-11 17:28:52 +1000  Matthew Waters <matthew@centricular.com>
 
-	* sys/va/gstvacompositor.c:
-	* sys/va/gstvacompositor.h:
-	* sys/va/gstvafilter.c:
-	* sys/va/gstvafilter.h:
-	* sys/va/meson.build:
-	  va: vpp: add compositor
-	  New implementation of a VA-API compositor with blend feature.
-	  Various chunks of code was taken from vavpp.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2332>
+	* ext/webrtc/gstwebrtcbin.c:
+	* tests/check/elements/webrtcbin.c:
+	  webrtc: advertise end-of-candidate with an empty candidate string
+	  Just like what is done in the browsers.  When this is sent to the peer,
+	  they will be able to know that no more candidates are coming and can
+	  complete ICE.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4598>
 
-2022-03-25 21:51:47 +0800  He Junyan <junyan.he@intel.com>
+2023-05-10 22:35:27 +0200  Piotr Brzeziński <piotr@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  va: Apply the va base encoder to the vah264enc.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2330>
+	* gst-libs/gst/vulkan/cocoa/gstvkdisplay_cocoa.m:
+	  macos: Remove old NSApp workaround related code
+	  This is no longer needed since the introduction of `gst_macos_main()` in 1.22.
+	  Before that existed, we had a patch for GLib in Cerbero, which did work but made it
+	  impossible to update GLib at all. The code being removed was a fail-safe in case of
+	  running without said patch being applied. It's no longer needed, since for macOS
+	  we just wrap our GStreamer with an NSApplication using `gst_macos_main()`.
+	  Warnings will be displayed if no NSApp/NSRunLoop is found wherever needed,
+	  pointing the user towards using the new API.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4366>
 
-2022-03-25 21:48:05 +0800  He Junyan <junyan.he@intel.com>
+2023-05-10 19:14:58 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/va/gstvabaseenc.c:
-	* sys/va/gstvabaseenc.h:
-	* sys/va/meson.build:
-	  va: Add the GstVaBaseEnc common object for all va encoders.
-	  Just like the GstVaBaseDec and GstVaBaseTransform, this base encoder
-	  will handle all common logic for all va encoders.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2330>
+	* ext/vulkan/vkshaderspv.c:
+	  vkshaderspv: fix example
+	  Use the correct element names.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4594>
 
-2022-05-15 00:56:59 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-10 00:51:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	* gst-libs/gst/d3d11/gstd3d11format.cpp:
-	* gst-libs/gst/d3d11/gstd3d11format.h:
-	  d3d11device: Enhance format enumeration and debugging
-	  * Enhance debug log to print human readable D3D11_FORMAT_SUPPORT flags
-	  value, instead of packed numeric flagset value.
-	  * Only device supported format will be added to format table.
-	  Depending on device feature level (i.e., D3D9 feature devices),
-	  16bits formats will not be supported. Although there might be formats
-	  we deinfed but not supported, it will not be a major issue in practice
-	  since our D3D11 implementation does not support legacy devices already
-	  (known limitation) and also old d3dvideosink will be promoted in that case.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2441>
+	* sys/d3d11/gstd3d11videosink.cpp:
+	  d3d11videosink: Don't clear prepared buffer on unlock_stop()
+	  That can be called between prepare() and render() which results in
+	  unexpected error flow return
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4583>
 
-2021-12-22 19:23:37 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-10 14:34:32 +0800  Tong Wu <tong1.wu@intel.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* gst/jpegformat/gstjpegparse.c:
-	* gst/jpegformat/gstjpegparse.h:
-	* gst/jpegformat/meson.build:
-	* tests/check/elements/jpegparse.c:
-	  jpegparse: Rewrite element.
-	  Now it uses the JPEG parser in libgstcodecparsers, while the whole
-	  code is simplified by relying more in baseparser class for tag
-	  handling.
-	  The element now signals chroma-format and default framerate is 0/1,
-	  which is for still-images.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1473>
+	* sys/msdk/gstmsdkcaps.c:
+	  msdk: fix a not referenced build error
+	  Error Type: error C4189: ‘dma_caps’: local variable is initialized but not referenced
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4587>
 
-2021-12-25 13:00:17 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-05 15:17:16 +1000  Matthew Waters <matthew@centricular.com>
 
-	* tests/check/elements/jpegparse.c:
-	  tests: jpegparse: Mark data as static.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1473>
+	* ext/closedcaption/ccutils.c:
+	* ext/closedcaption/ccutils.h:
+	* ext/closedcaption/gstcccombiner.c:
+	* ext/closedcaption/gstccconverter.c:
+	* ext/closedcaption/gstcea608mux.c:
+	* tests/check/elements/cccombiner.c:
+	* tests/check/elements/ccconverter.c:
+	  closedcaption: write 0x00 padding instead of 0x80 in cc_data/cdp
+	  Depending on the exact output format, 0x00 may be a better default for
+	  padding than 0x80.  0x00 is the recommended padding value when used in
+	  CDP (and cc_data) but is not when used in s334-1a.  See CTA-708-E 4.3.5
+	  amd SMPTE 334-1-2007 5.3.2.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4578>
 
-2021-12-22 18:13:17 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-06 04:14:49 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/jpegformat/gstjifmux.c:
-	* gst/jpegformat/gstjifmux.h:
-	* gst/jpegformat/gstjpegformat.h:
-	* gst/jpegformat/gstjpegparse.c:
-	* gst/jpegformat/meson.build:
-	  jpegformat: Use codecparsers' for JPEG markers.
-	  Instead of repeating JPEG markers definition, this patch uses those
-	  defined in gstcodecparsers library.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1473>
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	  h264decoder: Drop nonexisting picture silently without error
+	  If end_picture() was not successful, we do drop corresponding
+	  GstVideoCodecFrame and therefore gst_video_decoder_get_frame()
+	  will return nullptr which is expected behavior.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4561>
 
-2021-12-22 17:35:23 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-04-18 17:08:54 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst/jpegformat/gstjpegparse.c:
-	* gst/jpegformat/gstjpegparse.h:
-	  jpegparse: Headers cleanup
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1473>
+	* sys/msdk/gstmsdkcaps.c:
+	  msdk: Remove unreachable statement
+	  The execution cannot reach the statement: "gst_caps_unref(dma_caps);",
+	  so remove it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4449>
 
-2022-05-18 16:54:53 +0100  Philippe Normand <philn@igalia.com>
+2023-03-12 14:55:22 +0000  Philippe Normand <philn@igalia.com>
 
+	* ext/webrtc/gstwebrtcbin.c:
 	* ext/webrtc/webrtcdatachannel.c:
-	  datachannel: Notify low buffered amount according to spec
-	  Quoting
-	  https://www.w3.org/TR/webrtc/#dom-rtcdatachannel-bufferedamountlowthreshold
-	  The bufferedAmountLowThreshold attribute sets the threshold at which the
-	  bufferedAmount is considered to be low. When the bufferedAmount decreases from
-	  above this threshold to **equal** or below it, the bufferedamountlow event fires.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2448>
+	* ext/webrtc/webrtcdatachannel.h:
+	  webrtcdatachannel: Bind to parent webrtcbin using a weak reference
+	  The previous approach of using a simple pointer could lead to a use-after-free
+	  in case a data-channel was created and its parent webrtcbin was disposed soon
+	  after.
+	  Fixes #2103
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4160>
 
-2022-05-17 14:15:40 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-05-04 16:30:09 +1000  Matthew Waters <matthew@centricular.com>
 
-	* gst/mpegtsmux/gstbasetsmux.c:
-	  tsmux: Make sure to set srcpad caps under all conditions before outputting the first buffer
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1218
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2438>
+	* gst-libs/gst/webrtc/nice/nice.c:
+	  webrtc/nice: support consent-freshness RFC7675
+	  As is supported by libwebrtc already.  This allows ICE components to
+	  transition to failed if consent to send from the peer is revoked or if
+	  multiple consent packets are lost.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4542>
 
-2022-05-17 04:27:00 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-30 20:42:56 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	  d3d11device: Don't print ERROR log on open failure
-	  Device open can be failed in various reasons, but it's unlikely
-	  our problem
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2433>
+	* sys/d3d11/gstd3d11ipc.cpp:
+	* sys/d3d11/gstd3d11ipc.h:
+	* sys/d3d11/gstd3d11ipcclient.cpp:
+	* sys/d3d11/gstd3d11ipcclient.h:
+	* sys/d3d11/gstd3d11ipcserver.cpp:
+	* sys/d3d11/gstd3d11ipcserver.h:
+	* sys/d3d11/gstd3d11ipcsink.cpp:
+	* sys/d3d11/gstd3d11ipcsink.h:
+	* sys/d3d11/gstd3d11ipcsrc.cpp:
+	* sys/d3d11/gstd3d11ipcsrc.h:
+	* sys/d3d11/meson.build:
+	* sys/d3d11/plugin.cpp:
+	  d3d11: Add support for IPC
+	  Adding d3d11ipcsrc and d3d11ipcsink elements so that Direct3D11 textures
+	  can be shared between processes
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4514>
 
-2022-05-17 14:02:28 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-05-05 21:53:44 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/sdp/gstsdpdemux.c:
-	  sdpdemux: Release request pads from rtpbin when freeing a stream
-	  Otherwise the pads of the rtpbin stay around forever and are leaked.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2437>
+	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
+	  d3d11memory: Don't clear wrapped texture memory
+	  The external texture may hold already rendered scene and therefore
+	  it should not be cleared in alloc method
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4554>
 
-2022-05-17 03:32:10 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-05 13:12:24 +0200  Ruben Gonzalez <rgonzalez@fluendo.com>
 
-	* sys/qsv/libmfx/meson.build:
-	* sys/qsv/meson.build:
-	  qsv: Disable non-MSVC build on Windows
-	  ... and remove pointless UWP consideration that will never work.
-	  Cross-compiled binary has an issue which causes deadlock.
-	  Although cerbero will not build this plugin for non-MSVC build,
-	  people can still build this plugin and may complain its brokenness.
-	  See also
-	  https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/854
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2431>
+	* ext/onnx/gstonnxobjectdetector.cpp:
+	  onnx: Fix typo in documented pipeline
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4552>
 
-2022-04-28 16:02:26 +0100  Diogo Goncalves <diogo@diporg.com>
+2023-05-03 17:44:35 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/applemedia/avfvideosrc.m:
-	  avfvideosrc: fix wrong framerate selected for caps
-	  This fix solves an issue where a format that doesn't support the
-	  requested framerate would be selected. It ensures that we use the first
-	  format and framerate pair that supports the requested caps.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2331>
+	* gst-libs/gst/vulkan/gstvkdebug.c:
+	  vkdebug: fix type compilation warning
+	  Since VkMemoryHeapFlagBits is an enum, while VkMemoryHeapFlags is the expected
+	  alias of VkFlags.
+	  This issue is spotted by warning of gcc 13.1.1
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4547>
 
-2022-05-12 05:13:08 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-04 04:44:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11av1dec.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11decoder.h:
-	* sys/d3d11/gstd3d11h264dec.cpp:
-	* sys/d3d11/gstd3d11h265dec.cpp:
-	* sys/d3d11/gstd3d11mpeg2dec.cpp:
-	* sys/d3d11/gstd3d11vp8dec.cpp:
-	* sys/d3d11/gstd3d11vp9dec.cpp:
-	  d3d11decoder: Add hardcoded minimum resolution values to caps for NVIDIA
-	  NVIDIA GPUs have undocumented limitation regarding minimum resolution
-	  and it can be queried via a NVDEC API. However, since we don't want to
-	  bring CUDA/NVDEC API into D3D11, use hardcoded values for now
-	  until we find a nice way for capability check.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2406>
+	* sys/mediafoundation/gstmfvideoencoder.cpp:
+	  mfvideoenc: Allow only even resolution numbers
+	  Some H/W vendors support odd resolution if D3D11 texture is used
+	  or via IMF2DBuffer, but not all vendors support it.
+	  Also software MFT does not allow odd resolution.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1165
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2537
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4540>
 
-2022-05-12 07:23:29 +0200  Edward Hervey <edward@centricular.com>
+2023-05-02 18:14:20 +0100  Philippe Normand <philn@igalia.com>
 
-	* gst/mxf/mxfdemux.c:
-	  mxfdemux: Handle files produced by legacy FFmpeg
-	  Until March 2022, the FFmpeg MXF muxer would write the various index table
-	  segments with the same instance ID, which should only be used if it is a
-	  duplicate/repeated table.
-	  In order to cope with those, we first compare the other index table segment
-	  properties (body/index SID, start position) before comparing the instance
-	  ID. This will ensure that we don't consider them as duplicate, but can still
-	  detect "real" duplicates (which would have the same other properties).
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2407>
+	* ext/webrtc/gstwebrtcbin.c:
+	  webrtcbin: Fix potential deadlock when closing before any data was sent
+	  A blocking pad probe is added on new sink pads, it's usually removed after the
+	  caps have been negotiated or the signaling state switched to stable, but if that
+	  never happens and the pad is released we kept the pad probe active, leaving the
+	  pad blocked, preventing clean disposal.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4529>
 
-2022-05-03 16:23:09 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-02 11:34:36 +0200  Guillaume Desmottes <guillaume.desmottes@onestream.live>
 
-	* sys/va/gstvabasedec.c:
-	  va: basedec: Always select first available format.
-	  If the stream chroma doesn't match with any video format in the source
-	  caps template (generated from va config surface formats) instead of
-	  return unknown, return the first available format in the template,
-	  assuming that the driver would be capable to do color conversions.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2404>
+	* ext/srt/gstsrtobject.c:
+	  srt: assert instead of segfault when passing no error to ERROR_TO_WARNING
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4524>
 
-2022-05-07 03:15:44 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-02 11:41:41 +0200  Guillaume Desmottes <guillaume.desmottes@onestream.live>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  h265decoder: Improve robustness against malformed NAL packets
-	  Use newly added gst_h265_parser_identify_and_split_nalu_hevc()
-	  method to handle broken streams where packetized NAL unit
-	  contain start code prefix in it.
-	  It's obviously wrong stream but we know how to work around it
-	  and even need to support such broken streams since
-	  stateless decoder implementations are being a primary
-	  decoder element.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2394>
+	* ext/srt/gstsrtobject.c:
+	  srt: fix segfault if send_headers() failed
+	  The error handling code was assuming that 'internal_error' was set,
+	  while we were passing the caller GError.
+	  The internal error is already propagated to the caller later on.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4524>
 
-2022-05-10 03:32:42 +0900  Seungha Yang <seungha@centricular.com>
+2023-05-01 17:46:25 +0100  Philippe Normand <philn@igalia.com>
 
-	* gst-libs/gst/codecparsers/gsth265parser.c:
-	* gst-libs/gst/codecparsers/gsth265parser.h:
-	* tests/check/libs/h265parser.c:
-	  h265parser: Add a new NAL parsing API to handle malformed packets
-	  Add gst_h265_parser_identify_and_split_nalu_hevc() method to
-	  handle a case where packetized stream contains start-code prefix.
-	  This new method behaves similar to exisiting gst_h265_parser_identify_nalu_hevc()
-	  but it will scan start-code prefix to split given data into
-	  NAL units.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2394>
+	* gst-libs/gst/webrtc/dtlstransport.c:
+	  dtlstransport: Keep strong ref of dtls encoder/decoder
+	  Otherwise get_property() calls for the client, certificate and/or
+	  remote-certificate properties might access moved objects, since the encoder and
+	  decoder are added to the transportsendbin.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4519>
 
-2022-03-30 17:19:54 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-05-01 10:24:54 +0000  Mihail Ivanchev <contact@ivanchev.net>
 
-	* sys/va/gstvaav1dec.c:
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvah264dec.c:
-	* sys/va/gstvah265dec.c:
-	* sys/va/gstvampeg2dec.c:
-	* sys/va/gstvavp8dec.c:
-	* sys/va/gstvavp9dec.c:
-	  va: basedec: Select format from template or negotiated caps.
-	  Instead of using a hard-coded list of preferred formats according the
-	  chroma type, now if now caps are pre-negotiated, from template caps
-	  will choose the first format with the same chroma type. If
-	  pre-negotiated, then it will choose the first format, with same chroma
-	  type, from the first caps structure.
-	  Also all the decoders will check if GST_VIDEO_FORMAT_UNKNOWN is
-	  returned, failing the negotiation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2351>
+	* gst/codectimestamper/meson.build:
+	  gstcodectimestamper: remove PC file generation from plugin's own meson.build
+	  The file generated here is incomplete; it is generated for all plugins in a loop at an upper level.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4518>
 
-2022-05-06 17:53:51 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-04-28 22:25:11 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/va/gstvadisplay_drm.c:
-	  libs: va: Add O_CLOEXEC flag at opening drm device.
-	  So any other potential subprocess won't have access to it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2386>
+	* sys/va/gstvah265enc.c:
+	  va: h265enc: map the mbbrc to correct enum value in get_property()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4509>
 
-2022-05-06 18:21:00 -0400  Olivier Crête <olivier.crete@ocrete.ca>
+2023-04-28 22:26:34 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst/pcapparse/gstpcapparse.c:
-	  pcapparse: Set timestamp in DTS, not PTS
-	  This matches the behaviour of basesrc, in particular, it matches the
-	  behaviour of udpsrc, so it's easier to use to as a replacement to test
-	  rtpjitterbuffer and other similar elements.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2388>
+	* sys/va/gstvah264enc.c:
+	  va: h264enc: map the mbbrc to correct enum value in get_property()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4509>
 
-2022-01-16 15:51:32 +0300  Dmitry Osipenko <digetx@gmail.com>
+2023-04-20 18:57:50 -0400  Thibault Saunier <tsaunier@igalia.com>
 
-	* sys/v4l2codecs/gstv4l2codech264dec.c:
-	* sys/v4l2codecs/linux/v4l2-controls.h:
-	  v4l2codecs: h264: Set frame type flags
-	  V4L spec now requires decode_params flags to be set in accordance to the
-	  frame's type. In particular this is required by H.264 decoder of NVIDIA
-	  Tegra SoC to operate properly. Set the flags based on type of parsed
-	  slices.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1757>
+	* gst/rtp/gstrtpsrc.c:
+	  rtpsrc: Give better names to internal elements
+	  Same name was used for all instances of rtpsrc making debugging more complex
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4484>
 
-2022-05-06 10:50:59 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-04-28 04:28:24 +0900  Seungha Yang <seungha@centricular.com>
 
-	* tests/check/meson.build:
-	  tests: Skip test if srtp element not built
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2383>
+	* sys/wasapi2/gstwasapi2util.c:
+	  wasapi2: Allows process loopback capture on Windows 10
+	  As per MS documentation1, it requires Windows 10 Build 20348
+	  but it seems to be supported by old versions too
+	  1 https://learn.microsoft.com/en-us/windows/win32/api/audioclientactivationparams/
+	  ns-audioclientactivationparams-audioclient_process_loopback_params
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2524
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4505>
 
-2022-05-06 01:46:36 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-14 16:11:55 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	  d3d11memory: Protect against concurrent access from GPU and CPU to staging texture
-	  Staging texture does not allow GPU access while it's CPU mapped.
-	  But because we cannot block concurrent READ access by GstMemory design,
-	  additional staging texture is still required.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1182
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2375>
+	* gst-libs/gst/va/meson.build:
+	* meson_options.txt:
+	* sys/va/meson.build:
+	  meson: Add feature options for optional va deps libdrm and gudev
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4428>
 
-2022-05-05 02:16:54 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-14 13:18:52 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	* sys/d3d11/gstd3d11screencapture.h:
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	* tests/examples/d3d11/d3d11screencapturesrc.cpp:
-	  d3d11screencapturesrc: Fix crash when d3d11 device is different from owned one
-	  GstD3D11ScreenCapture object is pipeline-independent global object
-	  and the object can be shared by multiple src elements,
-	  in order to overcome a limitation of DXGI Desktop Duplication API.
-	  Note that the API allows only single capture session in a process for
-	  a monitor.
-	  Therefore GstD3D11ScreenCapture object must be able to handle a case
-	  where a src element holds different GstD3D11Device object. Which can
-	  happen when GstD3D11Device context is not shared by pipelines.
-	  What's changed:
-	  * Allocates capture texture with D3D11_RESOURCE_MISC_SHARED for the
-	  texture to be able to copied into other device's texture
-	  * Holds additional shader objects per src element and use it when drawing
-	  mouse
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1197
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2366>
-
-2022-05-05 20:35:57 +0300  Sebastian Dröge <sebastian@centricular.com>
-
-	* gst/mxf/mxfmux.c:
-	  mxfmux: Disable aggregator's default negotiation
-	  mxfmux can't negotiate caps with upstream/downstream and always outputs
-	  specific caps based on the input streams. This will always happen before
-	  it produces the first buffers.
-	  By having the default aggregator negotiation enabled the same caps
-	  would be pushed twice in the beginning, and again every time a
-	  reconfigure event is received.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2372>
+	* gst-libs/gst/va/meson.build:
+	* sys/kms/meson.build:
+	  meson: Fix libdrm and vaapi configure checks
+	  We do not need fallback: for libdrm checks because the wrap file
+	  already has a provide section.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4428>
 
-2022-05-05 20:35:49 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-04-27 13:32:30 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/mpegtsmux/gstbasetsmux.c:
-	  mpegtsmux: Disable aggregator's default negotiation
-	  mpegtsmux can't negotiate caps with upstream/downstream and always outputs
-	  specific caps based on the input streams. This will always happen before
-	  it produces the first buffers.
-	  By having the default aggregator negotiation enabled the same caps
-	  would be pushed twice in the beginning, and again every time a
-	  reconfigure event is received.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2372>
+	* gst-libs/gst/vulkan/gstvkswapper.c:
+	  vkswapper: missing image barrier after vkCmdClearColorImage
+	  After clear color image command the swapper image needs to add a barrier before
+	  copying the buffer to display on it. Otherwise a potential synchronization
+	  problem might occur.
+	  Fixes #2403
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4501>
 
-2022-05-05 00:24:26 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-27 11:37:34 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	  h264decoder: Fix for unhandled low-delay decoding case
-	  Baseclass calls get_preferred_output_delay() in a chain of
-	  sequence header parsing and then new_sequence() is called
-	  with required DPB size (includes render-delay) information.
-	  Thus latency query should happen before the sequence header
-	  parsing for subclass to report required render-delay accordingly
-	  via get_preferred_output_delay() method.
-	  (e.g., zero delay in case of live pipeline)
-	  This commit is to fix wrong liveness signalling in case of
-	  upstream packetized format.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2363>
+	* ext/vulkan/vkcolorconvert.c:
+	* ext/vulkan/vkdownload.c:
+	* ext/vulkan/vkoverlaycompositor.c:
+	* ext/vulkan/vkupload.c:
+	* gst-libs/gst/vulkan/gstvkfullscreenquad.c:
+	* gst-libs/gst/vulkan/gstvkswapper.c:
+	  vulkan: use VK_QUEUE_FAMILY_IGNORED in barriers
+	  Instead of using the valid queue family 0 (zero) if there aren't queue transfers
+	  there's no need to specify a not validated queue family, but just
+	  VK_QUEUE_FAMILY_IGNORED.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4501>
 
-2022-05-05 00:49:27 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-27 23:49:47 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  h265decoder: Fix for unhandled low-delay decoding case
-	  Baseclass calls get_preferred_output_delay() in a chain of
-	  sequence header parsing and then new_sequence() is called
-	  with required DPB size (includes render-delay) information.
-	  Thus latency query should happen before the sequence header
-	  parsing for subclass to report required render-delay accordingly
-	  via get_preferred_output_delay() method.
-	  (e.g., zero delay in case of live pipeline)
-	  This commit is to fix wrong liveness signalling in case of
-	  upstream packetized format.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2364>
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	  cudamemory: Fix for semi planar YUV memory size decision
+	  UV plan of the semi planar format requires only half of Y plane size
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4502>
 
-2022-05-04 23:36:30 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-18 11:21:05 +0200  Daniel Moberg <daniemob@axis.com>
 
-	* sys/nvcodec/gstnvh264dec.c:
-	* sys/nvcodec/gstnvh265dec.c:
-	  nvh264dec,nvh265dec: Don't realloc bitstream buffer per slice
-	  Allocated memory size has not been updated which results in
-	  realloc per slice. Fixing it and also release bitstream buffer
-	  on ::close(), not finalize.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2361>
+	* ext/webrtc/webrtcdatachannel.c:
+	  webrtc: do not tear down data channel before data is flushed
+	  Current implementation can in some cases detect
+	  that all data is sent but in reality it is not,
+	  leading to a push to an unlinked pad.
+	  This is a race between the probe used to track data sent and a
+	  call to close.
+	  This patch sends an EOS before starting the close procedure
+	  and then waits for the EOS event to come through to the
+	  src pad before commencing with tear down.
+	  This ensures that any queued data before EOS is flushed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4462>
 
-2022-04-29 20:28:53 +0200  Jakub Adam <jakub.adam@collabora.com>
+2023-04-11 12:40:54 +1000  Matthew Waters <matthew@centricular.com>
 
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	  d3d11screencapture: Set viewport when drawing mouse cursor
-	  If there weren't any moved/dirty regions in the captured frame, the
-	  viewport of the ID3D11DeviceContext would be left at whatever previous
-	  value it had, which could lead to the cursor being drawn in a wrong
-	  position and/or in an incorrect size.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2362>
+	* ext/closedcaption/ccutils.c:
+	* tests/check/elements/ccconverter.c:
+	  ccutils: generate valid padding in field 1 when needing to generate field 2
+	  Fixes CC in Field 2 but not in Field 1 errors.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4490>
 
-2022-05-02 22:59:59 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-25 04:59:33 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/nvcodec/gstnvav1dec.c:
-	* sys/nvcodec/gstnvav1dec.h:
-	* sys/nvcodec/gstnvdecoder.c:
-	* sys/nvcodec/gstnvdecoder.h:
-	* sys/nvcodec/gstnvh264dec.c:
-	* sys/nvcodec/gstnvh265dec.c:
-	* sys/nvcodec/gstnvvp8dec.c:
-	* sys/nvcodec/gstnvvp9dec.c:
-	* sys/nvcodec/meson.build:
-	* sys/nvcodec/plugin.c:
-	  nvcodec: Add AV1 decoder
-	  Adding GstCodecs based AV1 decoder element
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1453>
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: Fix for ignored initial render rectangle
+	  Application can set target render rect before internal HWND
+	  configuration
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2518
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4480>
 
-2022-05-03 23:56:12 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-25 10:14:47 +0200  Stéphane Cerveau <scerveau@collabora.com>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	* gst-libs/gst/codecs/gstav1decoder.h:
-	  av1decoder: Add support for render delay
-	  Sync up with other decoder baseclass implementations
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1453>
+	* tests/check/meson.build:
+	  bad: disable dtls test if openssl is not present
+	  On MacOS with homebrew, the openssl library is not
+	  properly detected with pkg-config.
+	  So disable the test compilation if openssl
+	  is not properly detected along with libcrypto.
+	  libcrypto is detected but it uses the system one
+	  which leads to the error:
+	  your binary is not an allowed client of /usr/lib/libcrypto.dylib for
+	  architecture x86_64
+	  See more details from Apple:
+	  https://developer.apple.com/forums/thread/124782
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4481>
 
-2022-04-28 03:14:54 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-21 13:52:50 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	* gst-libs/gst/codecs/gstav1picture.h:
-	  av1decoder: Hold OBU temporal and spatial id in picture struct
-	  NVDEC API requires the information
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1453>
+	* sys/msdk/gstmsdk.c:
+	* sys/msdk/gstmsdkcaps.c:
+	* sys/msdk/gstmsdkcaps.h:
+	  msdk: Fix segfault for OneVPL dispatcher + legacy MSDK runtime path
+	  From the spec, the OneVPL dispatcher should be able to work with
+	  legacy MSDK runtime:
+	  https://www.intel.com/content/www/us/en/docs/onevpl/upgrade-from-msdk/2023-1/onevpl-hardware-support-details.html
+	  Currently supported capabilities:
+	  OneVPL dispatcher + OneVPL runtime: dynamic capability
+	  MSDK dispatcher + MSDK runtime: static capability
+	  MSDK dispatcher + OneVPL runtime: static capability
+	  OneVPL dispatcher + legacy MSDK runtime: static capability
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2506
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4466>
+
+2023-04-21 10:38:54 +0800  Yinhang Liu <yinhang.liu@intel.com>
+
+	* sys/msdk/gstmsdkcaps.c:
+	  msdk: Add NumFilters check for VPP description
+	  When NumFilters is equal to 0, the function should return
+	  immediately.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4466>
 
-2022-05-04 01:03:37 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-21 10:19:32 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* sys/nvcodec/meson.build:
-	  meson: nvcodec: Remove unnecessary override option and fix build with non-MSVC
-	  cpp_std=c++11 was hack for macOS build but we don't build this plugin
-	  for Apple device anymore. And add "-Wno-deprecated-declarations"
-	  compile option for gcc/clang
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1453>
-
-2021-12-17 17:22:22 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/nvcodec/cuviddec.h:
-	* sys/nvcodec/nvEncodeAPI.h:
-	* sys/nvcodec/nvcuvid.h:
-	  nvcodec: Bump SDK header version to 11.1
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1453>
+	* sys/msdk/gstmsdk.c:
+	  msdk: Add return when creating caps fails for VPP
+	  When creating caps fails, the function should return immediately
+	  and should not continue to register the plugin.
+	  This patch fixes the issue of "gst_mini_object_ref: assertion
+	  'mini_object != NULL' failed" in
+	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2506
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4466>
+
+2023-04-06 16:50:23 -0300  Eva Pace <eba.pachi@gmail.com>
+
+	* ext/webrtc/gstwebrtcbin.c:
+	  webrtcbin: Fix trace log 'from' value
+	  `webrtc->signaling_state` (from) and `new_signaling_state` (to) had the
+	  same value when printed in a trace log. This commit adds a
+	  `old_signaling_state` variable to hold the previous value, so that the
+	  print statement works as intented.
+	  Spotted by: Mustafa Asım REYHAN
+	  Fixes #1802
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4362>
 
-2022-05-02 22:46:06 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-19 15:35:29 -0300  Thibault Saunier <tsaunier@igalia.com>
 
-	* sys/nvcodec/gstnvdecoder.c:
-	* sys/nvcodec/gstnvh264dec.c:
-	* sys/nvcodec/gstnvh265dec.c:
-	* sys/nvcodec/gstnvvp8dec.c:
-	* sys/nvcodec/gstnvvp9dec.c:
-	  nvdecoder: Handle DPB size margin in a single place
-	  ... instead of each subclass
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2343>
+	* docs/meson.build:
+	  doc: Avoid shelling out to hotdoc to generate plugins config files
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4479>
 
-2022-05-02 22:41:53 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-23 10:05:17 -0400  Thibault Saunier <tsaunier@igalia.com>
 
-	* sys/d3d11/gstd3d11av1dec.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11h264dec.cpp:
-	* sys/d3d11/gstd3d11h265dec.cpp:
-	* sys/d3d11/gstd3d11mpeg2dec.cpp:
-	* sys/d3d11/gstd3d11vp8dec.cpp:
-	* sys/d3d11/gstd3d11vp9dec.cpp:
-	  d3d11decoder: Handle DPB size margin in a single place
-	  ... instead of each subclass
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2343>
+	* ext/srt/gstsrtsink.c:
+	* gst-libs/gst/basecamerabinsrc/meson.build:
+	* gst-libs/gst/va/meson.build:
+	  meson: Add CameraBin and Va girs
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4479>
 
-2022-04-28 04:25:05 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-24 15:20:45 +0200  Stéphane Cerveau <scerveau@collabora.com>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	* gst-libs/gst/codecs/gstav1decoder.h:
-	* gst-libs/gst/codecs/gstmpeg2decoder.c:
-	* gst-libs/gst/codecs/gstmpeg2decoder.h:
-	* gst-libs/gst/codecs/gstvp8decoder.c:
-	* gst-libs/gst/codecs/gstvp8decoder.h:
-	* gst-libs/gst/codecs/gstvp9decoder.c:
-	* gst-libs/gst/codecs/gstvp9decoder.h:
-	* sys/d3d11/gstd3d11av1dec.cpp:
-	* sys/d3d11/gstd3d11mpeg2dec.cpp:
-	* sys/d3d11/gstd3d11vp8dec.cpp:
-	* sys/d3d11/gstd3d11vp9dec.cpp:
-	* sys/nvcodec/gstnvvp8dec.c:
-	* sys/nvcodec/gstnvvp9dec.c:
-	* sys/v4l2codecs/gstv4l2codecmpeg2dec.c:
-	* sys/v4l2codecs/gstv4l2codecvp8dec.c:
-	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
-	* sys/va/gstvaav1dec.c:
-	* sys/va/gstvampeg2dec.c:
-	* sys/va/gstvavp8dec.c:
-	* sys/va/gstvavp9dec.c:
-	  codecs: Signal required DPB size for AV1,MPEG2,VP8, and VP9 via new_sequence()
-	  Make all codecs consistent so that subclass can know additional DPB
-	  size requirement depending on render-delay configuration regardless
-	  of codec. Note that render-delay feature is not implemented for AV1
-	  yet but it's planned.
-	  Also, consider new_sequence() is mandatory requirement, not optional
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2343>
+	* sys/applemedia/helpers.c:
+	  applemedia: fix missing definition
+	  Fix missing kCVPixelFormatType_64RGBALE definition
+	  on Catalina for example
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4478>
 
-2022-04-12 12:17:09 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-04-19 16:59:01 +0200  Martin Nordholts <martn@axis.com>
 
-	* sys/v4l2codecs/gstv4l2format.c:
-	  v4l2codecs: Port to the new tile size helper
-	  This will complete the scaling of width/height shift scaling
-	  as only a partial implementation was made.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2190>
+	* gst-libs/gst/webrtc/nice/nice.c:
+	  webrtc: Plug leaks of resolved ICE addresses
+	  The addresses we get from `resolve_host_finish()` (via
+	  `resolve_host_async()`, `resolve_host_main_cb()`, `on_resolve_host()`,
+	  `g_resolver_lookup_by_name_finish()`) must be freed. Otherwise we leak
+	  memory.
+	  Leak found and confirmed fixed with GCC AddressSanitizer.
+	  Change-Id: If32d24452d626234f01b253b77a7d6d16eac1cee
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4469>
 
-2022-05-02 11:46:59 -0400  Thibault Saunier <tsaunier@igalia.com>
+2022-08-31 14:15:16 -0400  Thibault Saunier <tsaunier@igalia.com>
 
+	* gst-libs/gst/audio/meson.build:
+	* gst-libs/gst/basecamerabinsrc/meson.build:
+	* gst-libs/gst/codecs/meson.build:
 	* gst-libs/gst/cuda/meson.build:
-	  cuda: Fix introspection warnings
-	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1183
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2344>
+	* gst-libs/gst/d3d11/meson.build:
+	* gst-libs/gst/insertbin/meson.build:
+	* gst-libs/gst/mpegts/meson.build:
+	* gst-libs/gst/play/meson.build:
+	* gst-libs/gst/player/meson.build:
+	* gst-libs/gst/transcoder/meson.build:
+	* gst-libs/gst/vulkan/meson.build:
+	* gst-libs/gst/webrtc/meson.build:
+	  gir: Checkout all .gir files and check that they are updated on the CI
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3010>
 
-2022-05-02 21:57:07 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-20 02:18:21 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/cuda/gstcudautils.c:
-	  Revert "cuda: Fix GstCudaContext refcount bug"
-	  This reverts commit df7ee0e21518ab5586e4094f2089048f3767d5f5.
-	  We should not unref it since gst_message_new_have_context()
-	  takes ownership of the GstContext.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2342>
+	* sys/d3d11/gstd3d11overlay.cpp:
+	  d3d11overlay: Enhance documentation and fix typo
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4455>
 
-2022-05-02 09:15:57 +0200  Edward Hervey <edward@centricular.com>
+2023-03-24 00:11:21 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsdemux/mpegtspacketizer.c:
-	  tsdemux: Demote warning to simple debug
-	  That issue is actually handled, so don't pollute the logs with such warning.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2340>
+	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
+	  d3d11memory: Remove redundant bind flag validation
+	  It has been validated outside of each function already
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4455>
+
+2023-04-20 06:30:52 +0300  Jordan Petridis <jordan@centricular.com>
+
+	* ext/sctp/usrsctp/usrsctplib/netinet/sctp_pcb.c:
+	* ext/sctp/usrsctp/usrsctplib/netinet/sctp_sysctl.c:
+	  sctp: Avoid old-style function defintions
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4457>
 
-2022-04-29 19:08:46 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-04-18 15:28:30 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* gst/interlace/gstinterlace.c:
-	  interlace: Also handle a missing "interlace-mode" field as progressive
-	  Otherwise caps negotiation will fail in situations that are supposed
-	  to work, like:
-	  "video/x-raw,framerate=(fraction)60/1" ! interlace field-pattern=0 ! "video/x-raw,framerate=(fraction)30/1"
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2335>
+	* sys/msdk/meson.build:
+	* sys/uvch264/meson.build:
+	* sys/v4l2codecs/meson.build:
+	* sys/va/meson.build:
+	  meson: Add a wrap file for libgudev
+	  And allow fallback to it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4447>
 
-2022-04-29 19:08:32 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-04-19 09:55:14 +0200  Edward Hervey <edward@centricular.com>
 
-	* gst/interlace/gstinterlace.c:
-	  interlace: Add some more debug output to the getcaps function
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2335>
+	* gst/pcapparse/gstpcapparse.c:
+	* gst/pcapparse/gstpcapparse.h:
+	  pcapparse: Add support for Linux "cooked" capture encapsulation v2
+	  See https://www.tcpdump.org/linktypes/LINKTYPE_LINUX_SLL2.html
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4451>
 
-2022-04-29 16:56:54 +0100  Myles Inglis <myles.inglis@vcatechnology.com>
+2023-04-01 09:21:32 -0300  Thibault Saunier <tsaunier@igalia.com>
 
-	* gst-libs/gst/cuda/gstcudautils.c:
-	  cuda: Fix GstCudaContext refcount bug
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2334>
+	* sys/d3d11/gstd3d11deinterlace.cpp:
+	  d3d11: Fix typo in interlace mode name in enum
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4414>
 
-2022-04-28 17:08:11 +0200  Ludvig Rappe <ludvigr@axis.com>
+2023-04-18 14:55:23 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* ext/webrtc/icestream.c:
-	  webrtc: Fix memory leak in icestream
-	  Since both g_value_set_object() and g_weak_ref_get() takes a reference
-	  there will be two new references to the GstWebRTCICE object when there
-	  should be only one. g_value_take_object() has the same functionality as
-	  g_value_set_object() but does not take a reference.
-	  Without this change, the GstWebRTCICE object will be leaked.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2333>
+	* gst/mpegtsdemux/tsdemux.c:
+	  tsdemux: Set number of channels to 2 for dual mono Opus
+	  Instead of leaving it at 0, which will then cause caps creation to fail.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4445>
 
-2022-04-27 22:50:37 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-17 11:36:55 +0200  Guillaume Desmottes <guillaume.desmottes@onestream.live>
 
-	* gst-libs/gst/cuda/gstcudautils.c:
-	  cuda: Correct CUDA device id field in GstContext structure
-	  device id is unsigned int, not signed.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2311>
+	* ext/dash/gstmpdclient.c:
+	  dash: mpdclient: fix divide by 0 if segment has no duration
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4436>
 
-2022-04-28 13:23:39 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-04-17 23:06:54 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/codecs/gsth265decoder.h:
-	  codecs: h265decoder: Fix documentation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2328>
+	* sys/d3d11/gstd3d11compositor.cpp:
+	  d3d11compositor: Reconfigure resource only when output caps is changed
+	  GstD3D11Converter setup is heavy operation since it requires
+	  shader compile, GPU resource allocation, some math, mutex, etc.
+	  We can avoid it if negotiated caps is not changed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4439>
 
-2022-04-27 15:24:50 +0200  Edward Hervey <edward@centricular.com>
+2023-04-14 02:10:35 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsdemux/mpegtsbase.c:
-	  mpegts: Handle "empty" PMT gracefully
-	  Some streams have 2 PMT sections in a single TS packet. The first one is "valid"
-	  but doesn't contain/define any streams. That causes an unrecoverable issue when
-	  we try to activate the 2nd (valid) PMT.
-	  Instead of doing that, pre-emptively refuse to process PMT without any streams
-	  present within. We still do post that section on the bus to inform applications.
-	  Fixes #1181
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2310>
-
-2022-04-26 09:11:07 +0200  Stéphane Cerveau <scerveau@collabora.com>
-
-	* tests/check/elements/srtp.c:
-	  srtp: fix flaky unit test
-	  Use different port for each test to avoid other UDP
-	  packet to be received.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2294>
+	* sys/d3d11/gstd3d11overlay.cpp:
+	* sys/d3d11/gstd3d11overlay.h:
+	* sys/d3d11/meson.build:
+	* sys/d3d11/plugin.cpp:
+	* tests/examples/d3d11/d3d11overlay.cpp:
+	* tests/examples/d3d11/meson.build:
+	  d3d11: Add d3d11overlay element
+	  Similar to cairooverlay element but this element emits "draw"
+	  signal with Direct3D11 render target view, so that an application
+	  can render/overlay/blend on the given render target view
+	  without any copy operation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4415>
 
-2022-04-28 00:48:35 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-17 21:42:35 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/plugin.cpp:
-	  d3d11h265dec: Assign PRIMARY + 1 rank
-	  Promote d3d11h265dec to be default one if available
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2314>
+	* sys/d3d11/gstd3d11compositor.cpp:
+	  d3d11compositor: Add "ignore-inactive-pads" property
+	  Same as compositor element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4438>
 
-2022-04-28 00:31:49 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-17 21:34:19 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/nvcodec/gstnvvp9dec.c:
-	  nvvp9sldec: Increase DPB size to cover render delay
-	  This should've included in the previous MR
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/987
-	  already, but missed.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2313>
+	* sys/d3d11/gstd3d11compositor.cpp:
+	  d3d11compositor: Skip zero alpha input
+	  Blending such input is a waste of resource since nothing will
+	  be rendered
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4438>
 
-2022-03-07 15:44:04 +0000  Thibault Saunier <tsaunier@igalia.com>
+2023-03-20 20:42:41 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* ext/qroverlay/gstqroverlay.c:
-	  qroverlay: Reset data_changed after we use the info
-	  It was never reset so it was always TRUE once the data was changed!
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2299>
+	* sys/msdk/gstmsdk.c:
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/gstmsdkvpp.h:
+	  msdkvpp: Enable dynamic capability support
+	  Enable dynamic capability support for msdkvpp. The gstmsdkvpp
+	  element can create the sink caps and src caps dynamically for
+	  different platforms.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
+
+2023-03-20 20:41:29 +0800  Yinhang Liu <yinhang.liu@intel.com>
+
+	* sys/msdk/gstmsdkcaps.c:
+	* sys/msdk/gstmsdkcaps.h:
+	  msdkvpp: Add function to dynamically create sink caps and src caps
+	  We need to create the sink caps and src caps dynamically for different
+	  platforms. By default, the vpp init function create static pad template
+	  and the compatibility and flexibility of the platform are too poor.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
 
-2022-03-04 22:00:18 +0000  Thibault Saunier <tsaunier@igalia.com>
+2023-03-10 19:03:47 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* ext/qroverlay/gstqroverlay.c:
-	  qroverlay: Add a GstQROverlay meta
-	  See documentation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2299>
+	* sys/msdk/gstmsdk.c:
+	* sys/msdk/gstmsdkav1dec.c:
+	* sys/msdk/gstmsdkav1dec.h:
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkdec.h:
+	* sys/msdk/gstmsdkh264dec.c:
+	* sys/msdk/gstmsdkh264dec.h:
+	* sys/msdk/gstmsdkh265dec.c:
+	* sys/msdk/gstmsdkh265dec.h:
+	* sys/msdk/gstmsdkmjpegdec.c:
+	* sys/msdk/gstmsdkmjpegdec.h:
+	* sys/msdk/gstmsdkmpeg2dec.c:
+	* sys/msdk/gstmsdkmpeg2dec.h:
+	* sys/msdk/gstmsdkvc1dec.c:
+	* sys/msdk/gstmsdkvc1dec.h:
+	* sys/msdk/gstmsdkvp8dec.c:
+	* sys/msdk/gstmsdkvp8dec.h:
+	* sys/msdk/gstmsdkvp9dec.c:
+	* sys/msdk/gstmsdkvp9dec.h:
+	  msdkdec: Enable dynamic capability support
+	  Enable dynamic capability support for msdkav1dec, msdkh264dec,
+	  msdkh265dec, msdkmjpegdec, msdkmpeg2dec, msdkvc1dec, msdkvp8dec,
+	  msdkvp9dec.
+	  The gstmsdkdec elements can create the sink caps and src caps
+	  dynamically for different platforms.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
+
+2023-03-10 16:32:03 +0800  Yinhang Liu <yinhang.liu@intel.com>
+
+	* sys/msdk/gstmsdkcaps.c:
+	* sys/msdk/gstmsdkcaps.h:
+	  msdkdec: Add function to dynamically create sink caps and src caps
+	  We need to create the sink caps and src caps dynamically for different
+	  platforms. By default, the dec init function create static pad template
+	  and the compatibility and flexibility of the platform are too poor.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
 
-2022-04-27 00:27:06 +0200  Mathieu Duponchelle <mathieu@centricular.com>
+2023-03-06 19:45:06 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst/onvif/gstrtponviftimestamp.c:
-	  rtponviftimestamp: add extension data to all packets ..
-	  regardless of whether they are input as individual buffers or
-	  buffer lists.
-	  The ONVIF specification requires all packets to hold the extension,
-	  it makes no sense to behave differently when handling buffer lists.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2303>
-
-2022-03-08 21:26:16 +0000  Thibault Saunier <tsaunier@igalia.com>
-
-	* sys/nvcodec/gstcudaconvert.c:
-	  cudaconvert: Enhance debugging when setting video info fails
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2300>
+	* sys/msdk/gstmsdkav1enc.c:
+	* sys/msdk/gstmsdkcaps.c:
+	* sys/msdk/gstmsdkcaps.h:
+	* sys/msdk/gstmsdkh264enc.c:
+	* sys/msdk/gstmsdkh265enc.c:
+	* sys/msdk/gstmsdkmjpegenc.c:
+	* sys/msdk/gstmsdkmpeg2enc.c:
+	* sys/msdk/gstmsdkvp9enc.c:
+	  msdkenc: Add documented capabilities to expose "stable" caps
+	  Although msdkenc supports dynamic caps, it still needs to expose
+	  "stable" caps to users.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
+
+2023-02-22 10:41:40 +0800  Yinhang Liu <yinhang.liu@intel.com>
+
+	* sys/msdk/gstmsdkcaps.c:
+	  msdkenc: Support image formats in low power mode for sink caps
+	  There are some special image formats in low power mode, these
+	  image formats should be supported in sink caps.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
 
-2022-04-26 22:35:30 +0800  He Junyan <junyan.he@intel.com>
+2023-02-23 13:20:28 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst-libs/gst/codecparsers/gsth265bitwriter.c:
-	  codecparsers: bitwriter: Calculate PicSizeInCtbsY when writing slice header.
-	  The slice->pps->PicWidthInCtbsY/PicHeightInCtbsY values are calculated when
-	  we parse the slice header. But they are not calculated in bitwriter and so
-	  may not have valid value when writing slice header.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2287>
+	* sys/msdk/gstmsdkav1enc.c:
+	* sys/msdk/gstmsdkh264enc.c:
+	* sys/msdk/gstmsdkh265enc.c:
+	* sys/msdk/gstmsdkmpeg2enc.c:
+	* sys/msdk/gstmsdkvp9enc.c:
+	  msdkenc: Remove static templates in format setting
+	  The elements have supported dynamic capability query, and it is not
+	  necessary to refer the static templates.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
 
-2022-04-24 17:26:03 +0800  He Junyan <junyan.he@intel.com>
+2023-02-22 16:46:23 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst-libs/gst/codecparsers/gsth265bitwriter.c:
-	  codecparsers: bitwriter: Fix some coverity issues of H265 bitwriter.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2287>
+	* sys/msdk/gstmsdk.c:
+	* sys/msdk/gstmsdkav1enc.c:
+	* sys/msdk/gstmsdkav1enc.h:
+	* sys/msdk/gstmsdkenc.c:
+	* sys/msdk/gstmsdkenc.h:
+	* sys/msdk/gstmsdkh264enc.c:
+	* sys/msdk/gstmsdkh264enc.h:
+	* sys/msdk/gstmsdkh265enc.c:
+	* sys/msdk/gstmsdkh265enc.h:
+	* sys/msdk/gstmsdkmjpegenc.c:
+	* sys/msdk/gstmsdkmjpegenc.h:
+	* sys/msdk/gstmsdkmpeg2enc.c:
+	* sys/msdk/gstmsdkmpeg2enc.h:
+	* sys/msdk/gstmsdkvp9enc.c:
+	* sys/msdk/gstmsdkvp9enc.h:
+	  msdkenc: Enable dynamic capability support
+	  Enable dynamic capability support for msdkav1enc, msdkh264enc,
+	  msdkh265enc, msdkmjpegenc, msdkvp9enc, msdkmpeg2enc.
+	  The gstmsdkenc elements can create the sink caps and src caps
+	  dynamically for different platforms.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
+
+2023-02-23 16:33:42 +0800  Yinhang Liu <yinhang.liu@intel.com>
+
+	* sys/msdk/gstmsdkcaps.c:
+	* sys/msdk/gstmsdkcaps.h:
+	  msdk: Add function to specify string array parameters
+	  Sometimes it is necessary to manually specify string parameters
+	  of multiple options, such as format, interlace-mode, etc.
+	  Add function to support this requirment.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
+
+2023-02-22 10:30:57 +0800  Yinhang Liu <yinhang.liu@intel.com>
+
+	* sys/msdk/gstmsdkcaps.c:
+	* sys/msdk/gstmsdkcaps.h:
+	  msdkenc: Add function to dynamically create sink caps and src caps
+	  We need to create the sink caps and src caps dynamically for different
+	  platforms. By default, the enc init function create static pad template
+	  and the compatibility and flexibility of the platform are too poor.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
 
-2022-04-24 00:02:18 +0800  He Junyan <junyan.he@intel.com>
+2022-11-15 18:08:12 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* sys/va/gstvabasedec.c:
-	  va: dec: Use gst_buffer_pool_config_set_va_alignment() to set alignment.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2282>
+	* sys/msdk/msdk.c:
+	* sys/msdk/msdk.h:
+	  msdk: add function to get the format list
+	  This static format list will be used to check the formats
+	  supported by the platform.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
 
-2022-04-23 23:59:08 +0800  He Junyan <junyan.he@intel.com>
+2023-02-22 10:24:12 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst-libs/gst/va/gstvapool.h:
-	  va: pool: Replace all tabs with spaces in header file.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2282>
+	* sys/msdk/gstmsdk.c:
+	  msdk: Register elements based on the codecs supported by the platform
+	  By default, msdk plugin will register all encoders and decoders
+	  on any platform, even unsupported encoders and decoders will be
+	  registered. Dynamically register encoders and decoders besed on
+	  the supported codecs on different platforms.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
 
-2022-04-23 23:52:34 +0800  He Junyan <junyan.he@intel.com>
+2023-02-22 10:23:00 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst-libs/gst/va/gstvapool.c:
-	  va: pool: Delete the GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT.
-	  The va pool is used for GPU side surface/image, its alignment should
-	  not be changed arbitrarily by others. So we decide not to expose the
-	  GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT flag anymore.
-	  Instead, user can call gst_buffer_pool_config_set_va_alignment() to
-	  set its surface/image alignment.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2282>
+	* sys/msdk/msdk.c:
+	* sys/msdk/msdk.h:
+	  msdk: Add function to get the implementation description
+	  Through the implementation description, we can dynamically obtain
+	  the codec capabilities supported by the platform.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
 
-2022-04-23 23:40:14 +0800  He Junyan <junyan.he@intel.com>
+2023-04-07 14:26:55 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst-libs/gst/va/gstvapool.c:
-	* gst-libs/gst/va/gstvapool.h:
-	  va: pool: Add set_va_alignment() API.
-	  We want to use gst_buffer_pool_config_set_va_alignment() to replace
-	  gst_buffer_pool_config_get_video_alignment(). The later one is specific
-	  for GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT option.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2282>
+	* sys/msdk/gstmsdkcontext.c:
+	* sys/msdk/gstmsdkcontext.h:
+	  msdk: Add functions to get data members from MsdkSession
+	  When getting mfxImplDescription, these data members need to
+	  be used.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
 
-2022-04-26 01:16:06 +0800  He Junyan <junyan.he@intel.com>
+2023-04-07 14:09:40 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Fix a latent memory leak in colorimetry setting.
-	  Also delete the useless "have_cinfo" judgement.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2288>
+	* sys/msdk/gstmsdk.c:
+	* sys/msdk/gstmsdkcontext.c:
+	* sys/msdk/gstmsdkcontext.h:
+	* sys/msdk/gstmsdkcontextutil.c:
+	* sys/msdk/msdk.c:
+	* sys/msdk/msdk.h:
+	  msdk: Create msdk context without job_type
+	  The job_type is not necessary when creating a normal msdk
+	  context. Make the APIs for creating context more flexible.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
 
-2022-04-24 22:54:58 +0800  He Junyan <junyan.he@intel.com>
+2023-02-22 10:26:38 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Correct the meaning of color_range flag.
-	  According to spec:
-	  color range equal to 0 shall be referred to as the studio swing
-	  representation and color range equal to 1 shall be referred to as
-	  the full swing representation.
-	  The current status is just the opposite.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2288>
+	* sys/msdk/gstmsdkcaps.c:
+	* sys/msdk/gstmsdkcaps.h:
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkdec.h:
+	* sys/msdk/gstmsdkenc.c:
+	* sys/msdk/gstmsdkenc.h:
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/meson.build:
+	  msdk: Move all _gst_caps_has_feature to gstmsdkcaps.c
+	  _gst_caps_has_feature is used by all msdk elements, so
+	  move it to gstmsdkcaps.c
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4177>
 
-2022-04-25 22:59:14 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-13 01:10:42 +0200  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* sys/qsv/gstqsvencoder.cpp:
-	  qsvencoder: Workaround for invalid DTS with VP9
-	  SDK runtime seems to report zero DTS for all frames in case of VP9 but
-	  we don't need to use DTS for the codec.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2291>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/srt/gstsrtsink.c:
+	* ext/srt/gstsrtsrc.c:
+	  docs: mark GstSRTSink and GstSRTSrc as plugin API
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4408>
 
-2022-04-24 00:37:40 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-13 04:42:52 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/cuda/meson.build:
-	* sys/nvcodec/meson.build:
-	  nvcodec: Stop building for non-{Windows,Linux} target
-	  The other platforms, specifically macOS have not been supported already
-	  because this plugin loads so or dll. Moreover, NVIDIA dropped
-	  support for macOS as of CUDA 11.0. See also
-	  https://developer.nvidia.com/nvidia-cuda-toolkit-11_0_0-developer-tools-mac-hosts
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2283>
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: Remove pointless GetDC call
+	  We don't use the Win32 device context handle at all.
+	  Removing code which was copied from GL code blindly
+	  in early d3d11 implementation stage a long time ago
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4407>
 
-2022-03-28 17:06:46 +0200  Stéphane Cerveau <scerveau@collabora.com>
+2018-07-19 17:21:22 +0200  Michael Olbrich <m.olbrich@pengutronix.de>
 
-	* tests/check/elements/srtp.c:
+	* ext/srtp/gstsrtpdec.c:
+	  srtpdec: fix "srtp-key" check
+	  The original code was:
+	  if (!gst_structure_get (s, "srtp-key", GST_TYPE_BUFFER, &buf, NULL) || !buf) {
+	  goto error;
+	  } else {
+	  stream->key = buf;
+	  }
+	  So use "srtp-key" if it is set so a non NULL buffer. The condition was
+	  incorrectly inverted in ad7ffe64a66ab48d81671651031c449149db4973 to:
+	  if (gst_structure_get (s, "srtp-key", GST_TYPE_BUFFER, &buf, NULL) || !buf) {
+	  stream->key = buf;
+	  } ...
+	  Fix the condition so it works as originally intended and avoid accessing
+	  'buf' uninitialised.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4401>
+
+2022-11-08 19:24:25 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst/sdp/gstsdpdemux.c:
+	* gst/sdp/gstsdpdemux.h:
+	* tests/check/elements/sdpdemux.c:
 	* tests/check/meson.build:
-	  srtp: add unit tests
-	  Enable unit tests in meson.build
-	  Add test_play_key_error to check the stats
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2027>
+	  sdpdemux: Add support for RFC4570 SDP source filters
+	  Parse source-filter attributes and configure udpsrc accordingly
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3485>
 
-2022-03-25 17:47:23 +0100  Stéphane Cerveau <scerveau@collabora.com>
+2023-04-04 17:50:39 -0400  Thibault Saunier <tsaunier@igalia.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/srtp/gstsrtpdec.c:
-	* ext/srtp/gstsrtpdec.h:
-	  srtpdec: add counts in stats
-	  In order to count the buffers which have been received and dropped for
-	  decryption reason, add a stats to track it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2027>
+	* gst/codectimestamper/gstcodectimestamper.c:
+	* gst/codectimestamper/gstcodectimestamper.h:
+	* tests/validate/codectimestamper/h264_propagate_caps.validatetest:
+	* tests/validate/codectimestamper/h264_propagate_caps/flow-expectations/log-sink-sink-expected:
+	* tests/validate/meson.build:
+	  codectimestamper: Implement QUERY_CAPS support
+	  This is required to ensure that downstream restrcitions are also
+	  propagated upstream.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4341>
 
-2022-04-23 04:00:21 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-04 17:54:51 -0400  Thibault Saunier <tsaunier@igalia.com>
 
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11videosink: Fix for unhandled mouse double click events
-	  Only window created with CS_DBLCLKS style can receive those mouse
-	  double click events, so we need to use the style for internal/external
-	  windows can get double click events.
-	  Also, passthrough mouse events to parent window in the same message pumping
-	  threads instead of manually forwarding each mouse event.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1172
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2277>
+	* gst/codectimestamper/gstcodectimestamper.c:
+	  codectimestamper: Use accept-intersect and accept-template caps
+	  We should behave similarly to video parsers so we can use:
+	  - accept-template as we can also accept caps with missing fields.
+	  - accept-intersect to do quick check with the pad template caps as it is
+	  enough. Users should have figured the appropriate full caps on a
+	  previous caps query
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4341>
+
+2023-04-12 02:17:14 +0900  Seungha Yang <seungha@centricular.com>
+
+	* ext/closedcaption/gstcea608mux.c:
+	  cea608mux: Add support for seeking
+	  The "start_time" should be cleared per flush in order to apply
+	  new offset time to each output buffer. Also, input running time
+	  must be compared with output running time, not output position.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4398>
+
+2023-04-12 02:46:15 +0900  Seungha Yang <seungha@centricular.com>
+
+	* ext/closedcaption/gstcea608mux.c:
+	  cea608mux: Implement GstAggregator::clip
+	  Drop buffers if it's outside of segment
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4398>
 
-2022-03-07 08:46:57 -0500  Xavier Claessens <xavier.claessens@collabora.com>
+2022-12-01 15:25:59 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* gst-libs/gst/vulkan/meson.build:
+	* sys/msdk/gstmsdkcontext.c:
+	* sys/msdk/gstmsdkcontext.h:
+	  msdkcontext: Remove unused codes in msdkcontext
+	  We don't maintain three list (i.e. avail, locked and used) surfaces
+	  as the old way did to achieve memory management, so remove the
+	  correcponding codes for old memory management.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4276>
+
+2022-12-01 15:15:27 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+
+	* sys/msdk/gstmsdkav1dec.c:
+	* sys/msdk/gstmsdkbufferpool.c:
+	* sys/msdk/gstmsdkbufferpool.h:
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkenc.c:
+	* sys/msdk/gstmsdkh265dec.c:
+	* sys/msdk/gstmsdkmjpegdec.c:
+	* sys/msdk/gstmsdksystemmemory.c:
+	* sys/msdk/gstmsdksystemmemory.h:
+	* sys/msdk/gstmsdkvideomemory.c:
+	* sys/msdk/gstmsdkvideomemory.h:
+	* sys/msdk/gstmsdkvp9dec.c:
+	* sys/msdk/gstmsdkvpp.c:
 	* sys/msdk/meson.build:
-	  Meson: Fix deprecation warnings
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1876>
+	* sys/msdk/msdk.c:
+	* sys/msdk/msdk.h:
+	  msdk: Remove unused gstmsdkbufferpool and memory
+	  GstMsdkBufferPool, GstMsdkVideoMemory and GstMsdkSystemMemory are no
+	  longer used in msdk plugins, instead we use va/d3d11 pool for memory
+	  allocation. So, remove the codes of unused stuffs.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4276>
 
-2022-04-22 17:44:06 +0200  Stéphane Cerveau <scerveau@collabora.com>
+2022-12-01 14:53:21 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* ext/rsvg/gstrsvgdec.h:
-	  rvsg: fix cairo include
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2276>
+	* sys/msdk/gstmsdkenc.c:
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/msdk.c:
+	* sys/msdk/msdk.h:
+	  msdk: Remove the func gst_msdk_is_msdk_buffer
+	  Since we use va/d3d11 pool to allocate memory, the old msdk bufferpool
+	  stuffs are not used anymore, so we don't need to check if an input
+	  buffer is msdk buffer using gst_msdk_is_msdk_buffer.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4276>
 
-2022-04-22 12:29:29 +0200  Corentin Damman <c.damman@intopix.com>
+2023-04-10 20:10:50 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/nvcodec/cuda-converter.c:
-	  cuda-converter: fix nvrtc compilation on non-English locale systems
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2268>
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	* gst-libs/gst/codecs/gsth264picture.c:
+	  h264decoder: Enable low-latency bumping in case of pic_order_cnt_type 2
+	  In case of POC type 2, output order is equal to decoding order
+	  (no frame reordering)
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2447
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4357>
 
-2022-04-21 00:38:37 +0900  Sangchul Lee <sc11.lee@samsung.com>
+2023-04-06 20:48:17 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Avoid access of freed memory
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2256>
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	* gst-libs/gst/codecs/gsth264picture.c:
+	* gst-libs/gst/codecs/gsth264picture.h:
+	  h264decoder: Fix for latency report
+	  The minimum latency answered by an element should be the maximum
+	  latency from the element's perspective. Also consider max_reorder_frames
+	  update as a sequence change
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4357>
 
-2022-04-15 22:19:09 +0800  He Junyan <junyan.he@intel.com>
+2023-04-06 20:26:24 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  va: h264enc: Do not let L0 number surplus the HW limitation.
-	  The algorithm to calculate the L0/L1 number may let the L0 number
-	  surplus the HW limitation. We should ensure that limitation after
-	  that calculation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2202>
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	  h264decoder: Ignore invalid max_num_reorder_frames in VUI
+	  It's not fatal and can be ignored
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4357>
 
-2022-03-02 14:42:42 +0800  He Junyan <junyan.he@intel.com>
+2023-04-06 19:40:12 +0900  Seungha Yang <seungha@centricular.com>
 
-	* tests/check/libs/h265bitwriter.c:
-	* tests/check/meson.build:
-	  test: Add test cases for the H265 bitwriter.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1831>
+	* gst-libs/gst/codecs/gsth265decoder.c:
+	  h265decoder: Fix for latency report when src caps is not configured
+	  Depending on subclass, negotiation might not happen on new_sequence()
+	  Fixing regression introduced by the commit
+	  4a4823b9728fbb944e05d89e0fee681ab5b33e25
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4357>
 
-2022-03-02 14:31:05 +0800  He Junyan <junyan.he@intel.com>
+2023-04-06 19:36:03 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/codecparsers/gsth265bitwriter.c:
-	* gst-libs/gst/codecparsers/gsth265bitwriter.h:
-	* gst-libs/gst/codecparsers/meson.build:
-	  codecparsers: bitwriter: Add the common bit writer functions for H265.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1831>
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	  h264decoder: Fix for latency report when src caps is not configured
+	  Depending on subclass, negotiation might not happen on new_sequence()
+	  Fixing regression introduced by the commit
+	  4a4823b9728fbb944e05d89e0fee681ab5b33e25
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4357>
 
-2022-04-20 13:18:34 +0800  He Junyan <junyan.he@intel.com>
+2023-04-10 17:31:29 +0800  Wang Chuan <jdyaomo@gmail.com>
 
-	* sys/va/gstvavpp.c:
-	  va: vpp: Update the colorimetry and HDR fields when fixup src caps.
-	  When we fixup src caps, the current way of handling the HDR fields is not
-	  correct.
-	  1. We trim the HDR fields only when the input caps is not a subset of the
-	  fixup src caps. But in fact, the input caps with HDR fields such as the
-	  "mastering-display-info" can possibly be the subset of the fixup src caps,
-	  if they have all same other fields.
-	  2. We always copy the colorimetry from input caps to src caps if it is
-	  absent. But when hdr-tone-mapping is enabled, the HDR->SDR conversion makes
-	  the colorimetry change. We should use downstream's setting, or just use the
-	  default colorimetry of SDR.
-	  We changes to:
-	  1. If hdr-tone-mapping is enabled, we trim all HDR fields and add a correct
-	  colorimetry.
-	  2. Copy colorimetry from input if it is still absent.
-	  3. Consider the subset replacement.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2244>
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  gstd3d11window: fix memory leak
+	  GstStructure may leak when using external HWND
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4373>
 
-2022-04-20 23:06:56 +0900  Seungha Yang <seungha@centricular.com>
+2023-04-08 23:03:15 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/qsv/gstqsvdecoder.h:
-	* sys/qsv/gstqsvh264dec.cpp:
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh265dec.cpp:
-	* sys/qsv/gstqsvh265enc.cpp:
-	* sys/qsv/gstqsvjpegenc.cpp:
-	* sys/qsv/gstqsvvp9enc.cpp:
-	  qsv: Add GPU description to element long-name on Windows
-	  Would be useful for a multi-Intel-GPU system
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2249>
+	* sys/amfcodec/gstamfav1enc.cpp:
+	* sys/amfcodec/gstamfencoder.cpp:
+	* sys/amfcodec/gstamfencoder.h:
+	* sys/amfcodec/gstamfh264enc.cpp:
+	* sys/amfcodec/gstamfh265enc.cpp:
+	  amfencoder: Set output DTS
+	  AMF runtime does not provide correct DTS. Although GetPts() seems to
+	  be returning DTS, it still needs to be adjusted to meet DTS <= PTS
+	  requirement. Do calculate DTS in baseclass instead
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4092>
 
-2022-04-19 21:38:31 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-09 11:12:17 +0100  Evgeny Pavlov <lucenticus@gmail.com>
 
-	* sys/va/gstvavpp.c:
-	  vapostproc: Notify if hdr-tone-mapping property changes.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2247>
+	* sys/amfcodec/gstamfh264enc.cpp:
+	  amfcodec: Add options for B-frames for amfh264enc plugin
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4092>
 
-2022-03-30 18:09:36 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-04-07 22:13:24 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/va/vasurfaceimage.c:
-	* gst-libs/gst/va/vasurfaceimage.h:
-	* sys/va/gstvafilter.c:
-	* sys/va/gstvah264enc.c:
-	  va: Expose a couple va surface/buffer methods.
-	  And use them in va plugin.
-	  Also, set as default logging category the vadisplay one.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2077>
+	* sys/decklink/gstdecklinkaudiosink.cpp:
+	  decklinkaudiosink: Fix playback when video caps is configured before audio
+	  Scheduled playback starts on videosink's state change or on caps
+	  but it's possible that audiosink is configure without caps yet.
+	  Try start scheduled playback on audiosink's caps event as well
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4364>
 
-2022-04-20 08:09:58 +0900  Wonchul Lee <wonchul.dev@gmail.com>
+2023-01-18 14:42:38 +0000  Dario Marino Saccavino <dmsaccav@amazon.com>
 
-	* ext/dash/gstdashsink.c:
-	  dashsink: Unlock when failed to get content
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2242>
+	* sys/wasapi2/gstwasapi2client.cpp:
+	* sys/wasapi2/gstwasapi2client.h:
+	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
+	* sys/wasapi2/gstwasapi2ringbuffer.h:
+	* sys/wasapi2/gstwasapi2src.c:
+	* sys/wasapi2/gstwasapi2util.h:
+	  wasapi2: Add option to monitor loopback device's mute state
+	  When loopback recording from a render device, the wasapi2src element
+	  captures audio even if the device is muted. This change adds the
+	  'loopback-silence-on-device-mute' property that, when set to `true`,
+	  causes wasapi2src to inject silence in the pipeline when
+	  the device is muted.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1306
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4337>
 
-2022-04-18 17:50:22 +0900  Camilo Celis Guzman <camilo@pexip.com>
+2023-04-04 21:50:01 +1000  Jan Schmidt <jan@centricular.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  gstav1parse: fixup various possible logical errors
-	  Found via an analyzed build for Clang. Specifically we had:
-	  gstav1parse.c1850,11 in gst_av1_parse_detect_stream_format: Logic error: The left operand of '==' is a garbage value
-	  gstav1parse.c1606,11 in gst_av1_parse_handle_to_small_and_equal_align: Logic error: The left operand of '==' is a garbage value
-	  Also a couple of false-positives:
-	  gstav1parse.c1398,24 in gst_av1_parse_handle_one_obu: Logic error: Branch condition evaluates to a garbage value
-	  gstav1parse.c1440,37 in gst_av1_parse_handle_one_obu: Logic error: The left operand of '-' is a garbage value
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2230>
+	* gst/mpegdemux/gstmpegdemux.c:
+	* gst/mpegdemux/gstmpegdemux.h:
+	  mpegpsdemux: Rework gap sending
+	  Take the gap logic from mpegtsdemux, and don't
+	  send gap events on a stream that's outputting buffers with
+	  no timestamps. Time isn't advancing, but the stream has
+	  buffers - so it's not sparse.
+	  Fixes #2374
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4333>
 
-2022-03-25 10:18:34 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+2023-04-05 20:12:06 +0300  Sebastian Dröge <sebastian@centricular.com>
 
-	* meson.build:
-	  Always define ENABLE_NLS
-	  GLib guarantees libintl API is always available, provided by
-	  proxy-libintl as last resort. GLib itself unconditionally define
-	  ENABLE_NLS.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2028>
-
-2022-03-25 10:20:24 -0400  Xavier Claessens <xavier.claessens@collabora.com>
-
-	* gst-libs/gst/gettext.h:
-	* gst-libs/gst/gst-i18n-plugin.h:
-	  Delete unused i18n headers
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2028>
+	* gst-libs/gst/vulkan/gstvkdevice.c:
+	* gst-libs/gst/vulkan/gstvkimagememory.c:
+	* gst-libs/gst/vulkan/gstvkinstance.c:
+	  vulkan: Use new GLib APIs as suggested by comments
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4349>
 
-2022-03-25 09:59:23 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+2023-03-23 20:04:49 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/curl/gstcurlelement.c:
-	* ext/curl/gstcurlhttpsrc.c:
-	* ext/dash/gstdashdemux.c:
-	* ext/ladspa/gstladspa.c:
-	* ext/openal/gstopenal.c:
-	* ext/openal/gstopenalelement.c:
-	* ext/opencv/gsttemplatematch.cpp:
-	* ext/resindvd/resindvdbin.c:
-	* ext/resindvd/resindvdsrc.c:
-	* ext/rtmp/gstrtmpsrc.c:
-	* ext/smoothstreaming/gstmssdemux.c:
-	* ext/smoothstreaming/gstsmoothstreaming-plugin.c:
-	* ext/sndfile/gstsf.c:
-	* ext/sndfile/gstsfdec.c:
-	* ext/sndfile/gstsfelement.c:
-	* ext/sndfile/gstsfsink.c:
-	* ext/sndfile/gstsfsrc.c:
-	* gst-libs/gst/adaptivedemux/gstadaptivedemux.c:
-	* gst/aiff/aiffparse.c:
-	* gst/aiff/gstaiffelement.c:
-	* gst/asfmux/gstasfmux.c:
-	* gst/asfmux/gstasfparse.c:
-	* gst/camerabin2/camerabingeneral.c:
-	* gst/camerabin2/gstcamerabin2.c:
-	* gst/camerabin2/gstdigitalzoom.c:
-	* gst/camerabin2/gstviewfinderbin.c:
-	* gst/camerabin2/gstwrappercamerabinsrc.c:
-	* gst/dvdspu/gstdvdspu.c:
-	* gst/midi/midi.c:
-	* gst/mpegtsdemux/mpegtsbase.c:
-	* gst/transcode/gsttranscodebin.c:
-	* gst/transcode/gsttranscodeelement.c:
-	* sys/dvb/gstdvb.c:
-	* sys/dvb/gstdvbelement.c:
-	* sys/dvb/gstdvbsrc.c:
-	* sys/dvb/parsechannels.c:
-	  Replace gst-i18n-*.h with gi18n-lib.h
-	  GLib guarantees libintl is always present, using proxy-libintl as
-	  last resort. There is no need to mock gettex API any more.
-	  This fix static build on Windows because G_INTL_STATIC_COMPILATION must
-	  be defined before including libintl.h, and glib does it for us as part
-	  as including glib.h.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2028>
+	* gst/videoparsers/gsth265parse.c:
+	  h265parse: Don't override upstream framerate
+	  The framerate should only be replaced (and corrected for alternating field)
+	  when it is parsed from the bitstream. Otherwise, the upstream framerate
+	  from caps should be trusted and assumed correct.
+	  Related to gst-plugins-bad!2020
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4259>
 
-2022-04-13 15:23:56 -0400  Thibault Saunier <tsaunier@igalia.com>
+2023-03-23 20:02:16 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* gst-libs/gst/cuda/gstcudautils.c:
-	* gst-libs/gst/cuda/gstcudautils.h:
-	* sys/nvcodec/gstcudamemorycopy.c:
-	  cuda: Fix typo in gst_cuda_buffery_copy_type_to_string
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1472>
+	* gst/videoparsers/gsth265parse.c:
+	* gst/videoparsers/gsth265parse.h:
+	  h265parse: Rename parsed_framerate to framerate_from_caps
+	  That meaning of parsed_framerate is ambigious, it is set whenever the
+	  framerate has been parsed from caps, which can be confused with being
+	  parsed from the bitstream. Rename this as framerate_from_caps.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4259>
 
-2021-12-12 13:19:52 +0000  Thibault Saunier <tsaunier@igalia.com>
+2023-04-04 16:41:39 +0200  Edward Hervey <edward@centricular.com>
 
-	* gst-libs/gst/cuda/gstcudacontext.c:
-	* gst-libs/gst/cuda/gstcudacontext.h:
-	* gst-libs/gst/cuda/gstcudautils.h:
-	  cuda: Add a `gst_cuda_context_new_wrapped` constructor
-	  So that application or people implementing cuda element from
-	  outside GStreamer itself can ensure that their contexts are used
-	  by GStreamer.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1472>
+	* gst/mpegtsdemux/tsdemux.c:
+	  tsdemux: Minor refactoring
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4336>
 
-2021-12-08 11:48:08 +0000  Thibault Saunier <tsaunier@igalia.com>
+2023-04-04 11:51:43 +0200  Edward Hervey <edward@centricular.com>
 
-	* docs/libs/cuda/index.md:
-	* docs/libs/cuda/sitemap.txt:
-	* docs/meson.build:
-	* gst-libs/gst/cuda/cuda-gst.h:
-	* gst-libs/gst/cuda/cuda-prelude.h:
-	* gst-libs/gst/cuda/gstcudabufferpool.c:
-	* gst-libs/gst/cuda/gstcudabufferpool.h:
-	* gst-libs/gst/cuda/gstcudacontext.c:
-	* gst-libs/gst/cuda/gstcudacontext.h:
-	* gst-libs/gst/cuda/gstcudaloader.c:
-	* gst-libs/gst/cuda/gstcudaloader.h:
-	* gst-libs/gst/cuda/gstcudamemory.c:
-	* gst-libs/gst/cuda/gstcudamemory.h:
-	* gst-libs/gst/cuda/gstcudanvrtc.c:
-	* gst-libs/gst/cuda/gstcudanvrtc.h:
-	* gst-libs/gst/cuda/gstcudautils.c:
-	* gst-libs/gst/cuda/gstcudautils.h:
-	* gst-libs/gst/cuda/gstnvrtcloader.c:
-	* gst-libs/gst/cuda/gstnvrtcloader.h:
-	* gst-libs/gst/cuda/meson.build:
-	* gst-libs/gst/cuda/stub/cuda.h:
-	* gst-libs/gst/cuda/stub/cudaGL.h:
-	* gst-libs/gst/cuda/stub/nvrtc.h:
-	* gst-libs/gst/meson.build:
-	* sys/nvcodec/cuda-converter.c:
-	* sys/nvcodec/cuda-converter.h:
-	* sys/nvcodec/gstcudabasefilter.c:
-	* sys/nvcodec/gstcudabasetransform.c:
-	* sys/nvcodec/gstcudabasetransform.h:
-	* sys/nvcodec/gstcudaconvert.c:
-	* sys/nvcodec/gstcudafilter.c:
-	* sys/nvcodec/gstcudamemorycopy.c:
-	* sys/nvcodec/gstcudascale.c:
-	* sys/nvcodec/gstcuvidloader.h:
-	* sys/nvcodec/gstnvbaseenc.c:
-	* sys/nvcodec/gstnvbaseenc.h:
-	* sys/nvcodec/gstnvdec.c:
-	* sys/nvcodec/gstnvdec.h:
-	* sys/nvcodec/gstnvdecoder.c:
-	* sys/nvcodec/gstnvdecoder.h:
-	* sys/nvcodec/gstnvenc.c:
-	* sys/nvcodec/gstnvenc.h:
-	* sys/nvcodec/gstnvencoder.cpp:
-	* sys/nvcodec/gstnvencoder.h:
-	* sys/nvcodec/gstnvh264dec.c:
-	* sys/nvcodec/gstnvh264encoder.cpp:
-	* sys/nvcodec/gstnvh264encoder.h:
-	* sys/nvcodec/gstnvh265dec.c:
-	* sys/nvcodec/gstnvh265encoder.cpp:
-	* sys/nvcodec/gstnvh265encoder.h:
-	* sys/nvcodec/gstnvvp8dec.c:
-	* sys/nvcodec/gstnvvp9dec.c:
-	* sys/nvcodec/meson.build:
-	* sys/nvcodec/plugin.c:
-	  cuda: Factor out a public GstCUDA library
-	  So applications and elements implemented outside GStreamer can reuse
-	  our infrastructure
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1472>
+	* gst-libs/gst/mpegts/mpegts.h:
+	* gst/mpegtsdemux/tsdemux.c:
+	* tests/examples/mpegts/ts-parser.c:
+	  mpegts: Fix include headers
+	  <gst/mpegts/mpegts.h> is the unique header to use
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4336>
 
-2021-12-03 13:12:42 +0000  Thibault Saunier <tsaunier@igalia.com>
+2023-04-04 12:22:31 +0200  Wojciech Kapsa <wojciech.kapsa@medvc.eu>
 
-	* sys/nvcodec/gstnvbaseenc.c:
-	* sys/nvcodec/gstnvenc.c:
-	  nvenc: Give more details about errors
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1472>
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/decklink/gstdecklink.cpp:
+	* sys/decklink/gstdecklink.h:
+	* sys/decklink/gstdecklinkvideosink.cpp:
+	* sys/decklink/gstdecklinkvideosrc.cpp:
+	  decklink: fix 10 bit RGB (r210) format auto detection
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2391
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4332>
 
-2021-11-12 20:13:10 +0100  Ruben Gonzalez <rgonzalez@fluendo.com>
+2023-03-29 03:16:26 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	  gst_plugin_load_file: force plugin reload if diff filename
-	  If a file includes a new version of a plugin that exits in the
-	  registry, the output of gst-inspect is incorrect. The output has the
-	  correct version but incorrect filename, and element description.
-	  This seems to have also fixed some documentation issues.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1344>
+	* sys/d3d11/gstd3d11screencapturesrc.cpp:
+	* sys/d3d11/gstd3d11winrtcapture.cpp:
+	* sys/d3d11/gstd3d11winrtcapture.h:
+	* sys/d3d11/meson.build:
+	  d3d11screencapturesrc: Add "window-capture-mode" property
+	  ... to support capturing only window's client area
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2425
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4324>
+
+2023-04-01 01:57:09 +0900  Seungha Yang <seungha@centricular.com>
+
+	* ext/closedcaption/gstcea608mux.c:
+	* ext/closedcaption/gstcea608mux.h:
+	  cea608mux: Fix output buffer timestamping
+	  Don't assume that input stream starts from zero running time.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4319>
 
-2022-04-19 04:37:05 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-27 09:20:27 +0200  Aleksandr Slobodeniuk <aslobodeniuk@fluendo.com>
 
-	* sys/d3dvideosink/d3dvideosink.c:
-	  d3dvideosink: Remove outdated comment
-	  d3dvideosink is not a primary video sink element
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2223>
+	* sys/d3d11/gstd3d11videosink.cpp:
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: fix race conditions in win32 window
+	  One race condition is the fact that the window object
+	  can be destroyed while running some routine in the UI
+	  thread (such as resizing). To avoid that situation we make
+	  UI thread hold a reference on the window object while it's
+	  running.
+	  Other probpematic case is when the window handle is reused:
+	  if we stop and start the pipeline very fast,
+	  so the sink creates a new window object that is going to use
+	  the same window handle as the previous one.
+	  And finally the case when the pipeline is stopped immediatelly
+	  right after starting, this one is also handled in this commit.
+	  NOTE: a unit test that reproduces this cases have been added
+	  in the previous commit.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4260>
 
-2022-04-18 00:25:18 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-21 18:17:12 +0100  Aleksandr Slobodeniuk <aslobodeniuk@fluendo.com>
 
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	  h264decoder,h265decoder: Do not hold codec_data buffer
-	  ... also do not need to extract it from caps.
-	  Decoder uses codec_data only once per set_format() and
-	  baseclass will extract codec_data buffer already.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2212>
+	* tests/check/elements/d3d11videosink.c:
+	* tests/check/meson.build:
+	  d3d11videosink: add gstcheck test for win32 window
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4260>
 
-2022-04-17 23:55:55 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-31 17:43:16 +1100  Matthew Waters <matthew@centricular.com>
 
-	* sys/d3d11/gstd3d11decoder.cpp:
-	  d3d11decoder: Do not preallocate texture using downstream d3d11 buffer pool
-	  Our decoder implementation does not use downstream d3d11 pool for
-	  decoding because of special requirement of D3D11/DXVA. So preallocation
-	  using the downstream buffer pool will waste GPU memory in most cases.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2211>
+	* gst-libs/gst/vulkan/meson.build:
+	* gst-libs/gst/vulkan/wayland/gstvkdisplay_wayland.c:
+	* gst-libs/gst/vulkan/wayland/gstvkdisplay_wayland_private.h:
+	* gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c:
+	* gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.h:
+	  vulkan/wayland: use xdg_wm_base when available
+	  wl_shell is deprecated and has been removed from some compositors.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4316>
 
-2022-04-14 13:22:03 +0300  Vivia Nikolaidou <vivia@ahiru.eu>
+2023-03-31 16:45:47 +1100  Matthew Waters <matthew@centricular.com>
 
-	* gst/videoparsers/gsth264parse.c:
-	  h264parse: Include coded-picture-structure info in caps
-	  This reverts commit 652773de366a98e155332bf8ffb83ee5e6bea9e5 and
-	  modifies it to rename the caps field name to coded-picture-structure.
-	  It was previously removed because it confuses the decoder and we didn't
-	  have a valid use case for including it in the encoded caps at this
-	  stage. We now do have such a use case but still don't want to confuse
-	  the decoder, so the field is renamed.
-	  However, it is still not accurate without looking at the SEI picture
-	  structure of each frame, so it was named coded-picture-structure. If its
-	  value is "frame" it is most likely progressive, if it's "field" it is
-	  most likely interlaced or mixed.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2177>
+	* gst-libs/gst/vulkan/wayland/gstvkdisplay_wayland.c:
+	  vulkan/wayland: provide a dummy registry global_remove function
+	  Even if we don't care about any global objects being removed, wayland
+	  will still error if globals are removed without a corresponding listener
+	  set up for them.  e.g. wl_output hotplugging
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4316>
+
+2023-03-31 16:33:58 +1100  Matthew Waters <matthew@centricular.com>
+
+	* gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c:
+	  vulkan/wayland: rename debug category to mention wayland instead of XCB
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4316>
 
-2022-04-18 12:44:19 +0800  He Junyan <junyan.he@intel.com>
+2023-04-02 00:29:24 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  va: h264enc: Fix the forgotten unlock() when getting device path property.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2215>
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: Enhancement for initial window size decision
+	  Use AdjustWindowRect() method to calculate window size so that
+	  video scene can be rendered on client area without black borders
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4323>
 
-2022-04-17 22:25:14 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-30 10:11:11 +1100  Matthew Waters <matthew@centricular.com>
 
-	* sys/qsv/gstqsvdecoder.cpp:
-	  qsvdecoder: Use system memory for non-d3d11 downstream
-	  QSV's memory download implementation seems to be more faster
-	  than our implementation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2206>
+	* ext/closedcaption/gstccconverter.c:
+	  ccconverter: reintroduce frame count reset on cycle completion
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4308>
 
-2022-04-17 02:14:50 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-31 04:40:58 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/qsv/gstqsvdecoder.cpp:
-	* sys/qsv/gstqsvh265dec.cpp:
-	* sys/qsv/gstqsvh265dec.h:
-	* sys/qsv/meson.build:
-	* sys/qsv/plugin.cpp:
-	  qsv: Add H.265 decoder
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2206>
+	* tools/gst-transcoder.c:
+	  tools: Count argc after parsing GOption on Windows
+	  Existing codes rely on modified argc value by g_option_context_parse()
+	  but g_option_context_parse_strv() is used in case of Windows.
+	  Count arguments after the option parsing manually.
+	  Fixing command "gst-inspect-1.0.exe -b"
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4313>
 
-2022-04-17 02:18:37 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-31 03:57:10 +1100  Brad Hards <bradh@frogmouth.net>
 
-	* sys/qsv/gstqsvh264dec.cpp:
-	* sys/qsv/gstqsvutils.cpp:
-	* sys/qsv/plugin.cpp:
-	  qsv: Include single gstva.h
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2206>
+	* gst/mpegtsdemux/tsdemux.c:
+	  mpegts: remove stream-type from KLV meta
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4310>
 
-2022-04-17 02:04:08 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-30 20:09:59 +1100  Brad Hards <bradh@frogmouth.net>
 
-	* sys/qsv/gstqsvh264dec.cpp:
-	  qsvh264dec: Don't register element if it's not supported by device
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2206>
+	* gst/mpegtsdemux/tsdemux.c:
+	  mpegts: add support for KLV metadata in PES packets
+	  Co-authored-by: Andoni Morales Alastruey <ylatuya@gmail.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1312>
+
+2023-03-30 20:06:33 +1100  Brad Hards <bradh@frogmouth.net>
+
+	* gst-libs/gst/mpegts/gst-metadata-descriptor.c:
+	* gst-libs/gst/mpegts/gst-metadata-descriptor.h:
+	* gst-libs/gst/mpegts/gst-mpegtspesmetadatameta.c:
+	* gst-libs/gst/mpegts/gst-mpegtspesmetadatameta.h:
+	* gst-libs/gst/mpegts/gstmpegtsdescriptor.h:
+	* gst-libs/gst/mpegts/meson.build:
+	* gst-libs/gst/mpegts/mpegts.h:
+	* gst/mpegtsdemux/tsdemux.c:
+	* tests/examples/mpegts/ts-parser.c:
+	  mpegts: implement metadata in PES packets
+	  Co-authored-by: Andoni Morales Alastruey <ylatuya@gmail.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1312>
 
-2022-04-17 01:27:10 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-29 09:20:52 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/qsv/gstqsvdecoder.cpp:
-	* sys/qsv/gstqsvdecoder.h:
-	* sys/qsv/gstqsvh264dec.cpp:
-	  qsvh264dec: Add support for packetized format
-	  Handle avc/avc3 packetized formats
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2206>
+	* gst-libs/gst/codecs/gsth264picture-private.h:
+	* gst-libs/gst/codecs/gsth264picture.h:
+	  gsth254picture: move internal API to private header
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4288>
 
-2022-04-17 00:00:55 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-27 13:53:34 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/qsv/gstqsvdecoder.cpp:
-	* sys/qsv/gstqsvencoder.cpp:
-	* sys/qsv/gstqsvh264dec.cpp:
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh265enc.cpp:
-	* sys/qsv/gstqsvjpegenc.cpp:
-	* sys/qsv/gstqsvvp9enc.cpp:
-	* sys/qsv/plugin.cpp:
-	  qsv: Move debug init into each source file
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2206>
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	* gst-libs/gst/codecs/gsth264picture-private.h:
+	* gst-libs/gst/codecs/gsth264picture.c:
+	  h264decoder: use last_output_poc from DPB
+	  It seems that `last_output_poc` in `h264decoder` class is a left over of commit
+	  5527cc4a2e7.
+	  This patch removes it but keeps the log message by fetching the `h264picture`'s
+	  `last_output_pic`.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4288>
 
-2022-04-16 23:51:05 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-29 12:58:14 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/qsv/gstqsvdecoder.cpp:
-	  qsvdecoder: Reset next_task_index per init_session()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2206>
+	* gst-libs/gst/vulkan/gstvkmemory.c:
+	  vkmemory: flush whole size
+	  Running element_vkcolorconver test with Vulkan validation layer this error is
+	  raised:
+	  Code 0 : Validation Error:  VUID-VkMappedMemoryRange-size-01390  Object 0:
+	  handle = 0x100000000010, type = VK_OBJECT_TYPE_DEVICE_MEMORY;
+	  | MessageID = 0xdd4e6d8b
+	  | vkFlushMappedMemoryRanges: Size in pMemRanges0 is 0x4, which is not a
+	  multiple of VkPhysicalDeviceLimits::nonCoherentAtomSize (0x40) and offset +
+	  size (0x0 + 0x4 = 0x4) not equal to the memory size (0xb). The Vulkan spec
+	  states: If size is not equal to VK_WHOLE_SIZE, size must either be a multiple of
+	  VkPhysicalDeviceLimits::nonCoherentAtomSize, or offset plus size must equal the
+	  size of memory
+	  The reason of is that the image size used in the test doesn't comply hardware
+	  restrictions. In order to avoid juggling with image size and hardware
+	  restrictions, this patch proposes to use VK_WHOLE_SIZE macro.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4296>
 
-2022-04-16 21:27:57 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-29 12:44:00 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/d3d11/gstd3d11decoder.cpp:
-	  d3d11decoder: Copy HDR10 related caps field manually
-	  If negotiate() is called from the set_format() chain, sinkpad may not
-	  hold caps yet, so baseclass cannot copy it over to srcpad caps.
-	  Copy them manually.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2203>
+	* tests/check/libs/vkimage.c:
+	  tests: vkimage: add VK_IMAGE_USAGE_SAMPLED_BIT usage bit
+	  Running tests with Vulkan Validation enabled show an error on vkimage tests:
+	  Code 0 : Validation Error:  VUID-VkImageViewCreateInfo-image-04441 
+	  Object 0: VK_NULL_HANDLE, type = VK_OBJECT_TYPE_COMMAND_BUFFER; Object 1: handle
+	  = 0x50000000005, type = VK_OBJECT_TYPE_IMAGE;
+	  | MessageID = 0xb75da543
+	  | Invalid usage flag for VkImage 0x50000000005 used by vkCreateImageView(). In
+	  this case, VkImage should have VK_IMAGE_USAGE_SAMPLED_BIT |
+	  VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
+	  VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT |
+	  VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT |
+	  VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR |
+	  VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT |
+	  VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR |
+	  VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR |
+	  VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR |
+	  VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR | VK_IMAGE_USAGE_SAMPLE_WEIGHT_BIT_QCOM
+	  | VK_IMAGE_USAGE_SAMPLE_BLOCK_MATCH_BIT_QCOM set during creation.
+	  The Vulkan spec states: image must have been created with a usage value
+	  containing at least one of the usages defined in the valid image usage list for
+	  image views
+	  This patch adds VK_IMAGE_USAGE_SAMPLED_BIT to the usage bits in test.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4296>
 
-2022-04-16 22:27:13 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-29 11:04:20 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh265enc.cpp:
-	  qsvencoder: Rename property name i-frames to idr-interval
-	  ... and clarify the meaning of the value for each h264 and h265
-	  encoder since the usage of mfxInfoMFX::IdrInterval is different
-	  per codec.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2204>
+	* gst-libs/gst/vulkan/gstvkfullscreenquad.c:
+	  vkfullscreenquad: set enable_clear as TRUE by default
+	  While using the validation layer with this pipeline:
+	  gst-launch-1.0 videotestsrc num-buffers=10 ! vulkanupload ! vulkancolorconvert ! vulkansink
+	  The validation layer throws this message:
+	  Code 0 : Validation Error:  VUID-VkAttachmentDescription-format-06699 
+	  Object 0: handle = 0x5555562e9610, type = VK_OBJECT_TYPE_DEVICE; | MessageID = 0x52b3229e |
+	  vkCreateRenderPass: pCreateInfo->pAttachments0 format is
+	  VK_FORMAT_B8G8R8A8_UNORM and loadOp is VK_ATTACHMENT_LOAD_OP_LOAD, but
+	  initialLayout is VK_IMAGE_LAYOUT_UNDEFINED.
+	  The Vulkan spec states: If format includes a color or depth aspect and loadOp is
+	  VK_ATTACHMENT_LOAD_OP_LOAD, then initialLayout must not be VK_IMAGE_LAYOUT_UNDEFINED
+	  When creating the render pass the loadOp can be either
+	  `VK_ATTACHMENT_LOAD_OP_CLEAR` or `VK_ATTACHMENT_LOAD_OP_LOAD` depending on
+	  `enable_clear`. While `enable_clear` is FALSE by default (which means
+	  `VK_ATTACHMENT_LOAD_OP_LOAD`). Nonetheless, its value is explicitly changed by
+	  `vkoverlaycompositor` to FALSE too!
+	  This behavior was introduced in merge request #2470 where
+	  `VK_ATTACHMENT_LOAD_OP_CLEAR` was a fixed value for loadOp. Thus, the bug
+	  consists in a missing initialization of `enable_clear` to TRUE from that merge
+	  request.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4296>
 
-2022-04-16 21:26:55 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-23 14:44:34 +0000  Erik Fröbrant <erikto@axis.com>
 
-	* sys/qsv/gstqsvh265enc.cpp:
-	  qsvh265enc: Write HDR10 metadata SEI
-	  If device supports HDR10 metadata API, write the information
-	  into bitstream per IDR.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2204>
-
-2022-04-13 06:19:40 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
-
-	* docs/plugins/gst_plugins_cache.json:
-	  gst_plugins_cache.json: Update va plugins.
-	  * Update conditionally-available attribute in vah264enc properties.
-	  * Update GstVaFeature usage.
-	  * Update GstVaEncoderRatecontrol usage.
-	  * Update vapostproc classification.
-	  * Add `add-borders` property in vapostproc.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2169>
+	* ext/curl/gstcurlbasesink.c:
+	  curlbasesink: error codes in transfer error details
+	  There is currently no easy way for an application to distinguish between
+	  different resource write errors being set in the curlbasesink.
+	  Add curl status codes as error details on transfer failure.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4062>
 
-2022-04-13 05:58:46 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-23 14:26:27 +0000  Erik Fröbrant <erikto@axis.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Use GstVaFeature enum for enabling MBBRC.
-	  GstVaFeature is a common enumeration for auto/disabled/enabled kind of
-	  property setting.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2169>
+	* ext/curl/gstcurlhttpsink.c:
+	  curlhttpsink: HTTP code in transfer error details
+	  There is currently no easy way for an application to distinguish between
+	  different resource write errors being set in the curlhttpsink.
+	  Add HTTP status code as error details on transfer failure.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4062>
 
-2022-04-13 05:56:59 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-27 16:28:04 +1100  Matthew Waters <matthew@centricular.com>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Move rate-control enum to encoder class helper.
-	  Since it's a common enumeration used, as user setting property, for
-	  most of codecs.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2169>
+	* gst-libs/gst/vulkan/gstvkswapper.c:
+	  vulkanswapper: correctly handle force-aspect-ratio=false
+	  It was simply ignored so actually handle it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4278>
 
-2022-04-13 05:52:31 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-26 16:49:32 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Add device-path property.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2169>
+	* ext/qroverlay/gstdebugqroverlay.c:
+	  debugqroverlay: fix string leak
+	  g_string_free(.., FALSE) gives us ownership of the string
+	  already, no need to duplicate that again with g_strdup(),
+	  and doing so will leak the string returned by g_string_free()
+	  here. Caught by compiler warnings in newer GLib versions.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4273>
 
-2022-04-15 13:19:36 +0000  Corentin Damman <c.damman@intopix.com>
+2023-03-26 16:40:28 +0100  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/nvcodec/gstcudautils.c:
-	  cudautils: fix critical typo in gst_cuda_buffer_fallback_copy
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2194>
+	* ext/teletextdec/gstteletextdec.c:
+	* sys/winks/gstksvideodevice.c:
+	* sys/winks/kshelpers.c:
+	* tools/gst-app-maker:
+	  taglist, plugins: fix compiler warnings with GLib >= 2.76
+	  Fix compiler warnings about not using the return value when
+	  freeing the GString segment with g_string_free(.., FALSE):
+	  ignoring return value of ‘g_string_free_and_steal’ declared with attribute ‘warn_unused_result’
+	  which we get with newer GLib versions. These were all harmless.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4273>
 
-2022-04-14 20:10:46 +1000  Brad Hards <bradh@frogmouth.net>
+2023-03-19 18:26:56 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* po/POTFILES.skip:
-	* tests/interactive/meson.build:
-	* tests/interactive/pitch-test.c:
-	* tests/meson.build:
-	  tests: rename 'icles' subdir to be more descriptive
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2178>
+	* ext/aom/gstav1enc.c:
+	* ext/aom/gstav1enc.h:
+	* ext/aom/meson.build:
+	  av1enc: Use correct enum type with libaom >= 3
+	  This fixes, among other things, a compiler warning with clang.
+	  Also add static assertions that our own enum values match with the ones
+	  from libaom.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4223>
 
-2022-04-14 08:23:51 +0200  Edward Hervey <edward@centricular.com>
+2023-02-13 12:05:27 +0100  Stéphane Cerveau <scerveau@igalia.com>
 
-	* gst/mpegtsdemux/gstmpegdefs.h:
-	* gst/mpegtsdemux/tsdemux.c:
-	  tsdemux: Fix AC-4 detection
-	  This regression was introduced by
-	  https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1102
-	  and has been present since 1.18
-	  * Stream Type 0x06 is defined in the base mpeg-ts specification as Private PES
-	  Packets. Determining the content should be solely based on descriptors found
-	  within the PMT.
-	  * This was abused in that commit by defining a "bluray-only" stream type for AC4
-	  : `ST_BD_AUDIO_AC4`
-	  * This should be entirely handled in the regular private pes handling further
-	  down in the code
-	  Fixes #1154
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2175>
+	* ext/openjpeg/gstopenjpegdec.c:
+	  openjpegdec: allow multithread decoding only in subframe mode
+	  To avoid mis-ordered frames, allow multithread decoding only in
+	  subframe mode.
+	  Fixes #1786
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3948>
 
-2022-04-10 17:28:03 +0800  He Junyan <junyan.he@intel.com>
+2023-03-24 20:39:42 +0100  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  va: h264enc: Correct the hierarchical level name for pyramid-b frames.
-	  The current way names the level by the number of B frames it contains, the
-	  less it contains, the higher level it is. So the non ref B frames are in the
-	  lowest layer and the B frames in the highest level refer to I/P frames.
-	  But the widely used way is just the opposite, the ref B frames are in the
-	  lower level and non ref B frames are at the highest level.
-	  The is just a terminology change, and does not have any effect for compression
-	  result and quality.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2149>
+	* ext/closedcaption/gstcea608mux.c:
+	  cea608mux: advance segment->position when outputting
+	  It is the responsibility of the subclass to advance segment->position if
+	  it wants to rely on gst_aggregator_simple_get_next_time() for timeouts
+	  in live mode.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4266>
 
-2022-04-12 10:34:27 +0800  He Junyan <junyan.he@intel.com>
+2023-03-24 12:46:55 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst-libs/gst/codecparsers/gstav1parser.c:
-	  codecs: av1parser: Fix a typo in seq_level_idx check.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2157>
+	* sys/va/gstvaencoder.c:
+	* sys/va/gstvaencoder.h:
+	  vaencoder: remove display reference in decode picture
+	  Since it's possible to grab the VA display from the GstBuffer and
+	  GstMemory, there's no need to keep a reference to it in
+	  GstVaEncodePicture.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3066>
 
-2022-04-13 01:46:34 +0900  Seungha Yang <seungha@centricular.com>
+2022-09-22 18:53:30 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/amfcodec/gstamfh265enc.cpp:
-	  amfh265enc: Handle preset option
-	  Add missing preset option handling
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2165>
+	* sys/va/gstvadecoder.c:
+	* sys/va/gstvadecoder.h:
+	  vadecoder: remove display reference in decode picture
+	  Since it's possible to grab the VA display from the GstBuffer and
+	  GstMemory, there's no need to keep a reference to it in
+	  GstVaDecodePicture.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3066>
 
-2022-04-13 01:39:43 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-20 17:12:31 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/amfcodec/gstamfencoder.cpp:
-	  amfencoder: Do shared resource copy only if texture belongs to other device
-	  Staging texture from the same d3d11device can be copied without
-	  shared resource handling
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2165>
+	* gst-libs/gst/vulkan/gstvkinstance.c:
+	  vkinstance: register GStreamer version as engine version
+	  Specification says:
+	  """
+	  engineVersion is an unsigned integer variable containing the developer-supplied
+	  version number of the engine used to create the application.
+	  """
+	  Assuming the engine is GStreamer, it would be expected to set its version as
+	  engine version.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4243>
 
-2022-04-12 01:01:23 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-24 00:23:42 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/meson.build:
-	  win32: Enable high-resolution timer for MinGW build
-	  timeapi.h is missing in our MinGW toolchain. Include mmsystem.h
-	  header instead, which defines struct and APIs in case of our MinGW
-	  toolchain. Note that in case of native Windows10 SDK (MSVC build),
-	  mmsystem.h will include timeapi.h
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2153>
+	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
+	  d3d11bufferpool: Fix invalid access in debug print loop
+	  Add missing condition check in for loop
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4255>
 
-2022-04-11 16:03:41 -0500  Olivier Crête <olivier.crete@collabora.com>
+2023-03-21 21:04:14 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* ext/wpe/gstwpevideosrc.cpp:
-	  wpevideosrc: Give WebKit the keyboard, touch and pointer modifiers
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2156>
+	* gst-libs/gst/vulkan/gstvkinstance.c:
+	  vkinstance: enable GPU assisted validation
+	  This allows to check for syncronization issues while using the validation layer.
+	  https://vulkan.lunarg.com/doc/sdk/1.3.239.0/linux/synchronization_usage.html
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4245>
 
-2022-04-11 15:56:19 -0500  Olivier Crête <olivier.crete@collabora.com>
+2023-03-10 17:37:46 +1100  Matthew Waters <matthew@centricular.com>
 
-	* ext/wpe/gstwpevideosrc.cpp:
-	  wpesrc: Convert from utf32 to support other keys
-	  This makes all of the non-letter keys work.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2156>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/vulkan/vkoverlaycompositor.c:
+	  vulkanoverlaycompositor: also support RGBA vulkan images
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4184>
 
-2022-04-11 15:54:05 -0500  Olivier Crête <olivier.crete@collabora.com>
+2023-03-16 14:21:21 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* ext/wpe/gstwpevideosrc.cpp:
-	  wpesrc: Initialize key event to 0
-	  Otherwise, WebKit sees random modifiers
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2156>
+	* gst/mpegtsdemux/tsdemux.c:
+	  mpegtsdemux: Fix handling of explicit Opus channel mapping
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4180>
 
-2022-04-12 11:20:00 +0200  Andoni Morales Alastruey <amorales@fluendo.com>
+2023-03-16 14:05:43 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/amfcodec/gstamfh264enc.cpp:
-	  amfcodec: fix setting quality presets
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2159>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/mpegtsmux/gstbasetsmux.c:
+	* gst/mpegtsmux/gstmpegtsmux.c:
+	* gst/mpegtsmux/tsmux/tsmuxstream.c:
+	* gst/mpegtsmux/tsmux/tsmuxstream.h:
+	  mpegtsmux: Allow writing arbitrary Opus channel mapping families and up to 255 channels
+	  And fix writing of dual-mono special cases.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4180>
 
-2022-04-11 10:32:40 +0200  Edward Hervey <edward@centricular.com>
+2022-12-07 14:30:23 +0000  Stéphane Cerveau <scerveau@igalia.com>
 
-	* gst/mxf/mxfdemux.c:
-	  mxfdemux: Fix issue with re-syncing
-	  In case of re-syncing (i.e. moving to another partition to avoid too much of an
-	  interleave), there was previously no checks to figure out whether a given
-	  partition was already fully handled (i.e. when coming across it again after a
-	  previous resync).
-	  In order to handle this at least for single-track partitions, check whether we
-	  have reached the essence track duration, and if so skip the partition.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2150>
+	* gst-libs/gst/vulkan/win32/gstvkwindow_win32.c:
+	  vulkan: gl: change symbols to static
+	  Change window_proc and subclass_proc to static to avoid symbols
+	  duplication.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4246>
 
-2022-04-11 10:31:15 +0200  Edward Hervey <edward@centricular.com>
+2022-12-07 12:13:24 +0000  Stéphane Cerveau <scerveau@igalia.com>
 
-	* gst/mxf/mxfdemux.c:
-	  mxfdemux: Don't double-increase track position
-	  The essence track position should only be overriden if we sucesfully switched to
-	  another position. In case of EOS we do not want to override it else we would
-	  increase the track position *again* at the end of this function
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2150>
+	* sys/directshow/gstdshow.cpp:
+	* sys/mediafoundation/gstmfcapturedshow.cpp:
+	  sys: avoid double definition of symbol MEDIASUBTYPE_I420
+	  Namespace the symbol MEDIASUBTYPE_I420 to avoid double definition
+	  across dshow and mediafoundation plugins.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4246>
 
-2022-04-12 01:49:17 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-21 20:06:12 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/amfcodec/gstamfencoder.cpp:
-	* sys/amfcodec/gstamfh264enc.cpp:
-	* sys/amfcodec/gstamfh265enc.cpp:
-	* sys/amfcodec/meson.build:
-	  amfcodec: Fix for MinGW build
-	  timeapi.h header might not be missing depending on toolchain.
-	  Also do hard meson error if winmm dep is not available but
-	  amfcodec is explicitly enabled.
-	  And fixing various GCC build warning errors.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2155>
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	  nvh264encoder: Fix template caps
+	  It should include progressive as well
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4236>
 
-2022-04-09 23:32:19 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-21 14:59:52 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/qsv/gstqsvallocator.cpp:
-	* sys/qsv/gstqsvallocator_d3d11.cpp:
-	* sys/qsv/gstqsvencoder.cpp:
-	* sys/qsv/gstqsvjpegenc.cpp:
-	* sys/qsv/gstqsvjpegenc.h:
-	* sys/qsv/meson.build:
-	* sys/qsv/plugin.cpp:
-	  qsv: Add JPEG encoder
-	  Note that YUY2 is not supported yet, since the format support is not
-	  implemented now.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2142>
+	* gst-libs/gst/vulkan/gstvkfence.c:
+	* gst-libs/gst/vulkan/gstvkinstance.c:
+	* gst-libs/gst/vulkan/gstvkqueue.c:
+	* gst-libs/gst/vulkan/gstvkutils.c:
+	  vulkan: silence gobject-instrospection warnings
+	  According with gi annotations 1 the "optional" annotation must be only
+	  for (out) or (inout) parameters.
+	  1. https://gi.readthedocs.io/en/latest/annotations/giannotations.html
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4244>
 
-2022-04-10 02:34:17 +0900  Seungha Yang <seungha@centricular.com>
+2022-11-24 11:12:14 +0800  Tong Wu <tong1.wu@intel.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* sys/amfcodec/gstamfencoder.cpp:
-	* sys/amfcodec/gstamfh264enc.cpp:
-	* sys/amfcodec/gstamfh265enc.cpp:
-	* sys/amfcodec/plugin.cpp:
-	  amfcodec: Update plugin cache
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2143>
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkdec.h:
+	  msdkdec: delete use_video_memory
+	  Since msdkdec uses video pool as the output buffer pool at all time. The
+	  use_video_memory variable is not useful anymore. Now delete it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4088>
 
-2022-04-09 00:52:07 +0900  Seungha Yang <seungha@centricular.com>
+2022-11-24 11:00:15 +0800  Tong Wu <tong1.wu@intel.com>
 
-	* sys/nvcodec/gstnvencoder.cpp:
-	* sys/nvcodec/gstnvencoder.h:
-	* sys/nvcodec/gstnvh264encoder.cpp:
-	* sys/nvcodec/gstnvh265encoder.cpp:
-	* tests/examples/nvcodec/nvcodec.c:
-	  nvencoder: Update property names and default values
-	  Update properties of newly written D3D11/CUDA mode encoders
-	  to be consistent with Intel QSV plugin. And rename "zerolatency"
-	  to "zero-reorder-delay" because previous "zerolatency" may
-	  misleading
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2140>
+	* sys/msdk/gstmsdkdec.c:
+	  msdkdec: expand retry times to 1s
+	  One-frame sleep time is not enough to wait until there is a surface
+	  unlocked from downstream. Now expand it to 1s and add a return when
+	  fail.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4088>
 
-2022-04-09 00:00:59 +0900  Seungha Yang <seungha@centricular.com>
+2022-11-17 10:41:10 +0800  Tong Wu <tong1.wu@intel.com>
 
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh265enc.cpp:
-	* sys/qsv/gstqsvvp9enc.cpp:
-	* tests/examples/qsv/qsvenc-dynamic-reconfigure.c:
-	  qsvencoder: Update property names and default values
-	  Stop using MSDK plugins property naming, instead use unified names
-	  and default values to be consistent with newly written NVIDIA encoders.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2140>
+	* sys/msdk/gstmsdkallocator_d3d.c:
+	  msdkallocator_d3d: add gst_msdk_frame_free callback function
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4088>
 
-2022-03-31 04:16:24 +0900  Seungha Yang <seungha@centricular.com>
+2022-11-17 10:37:05 +0800  Tong Wu <tong1.wu@intel.com>
 
-	* meson_options.txt:
-	* sys/amfcodec/gstamfencoder.cpp:
-	* sys/amfcodec/gstamfencoder.h:
-	* sys/amfcodec/gstamfh264enc.cpp:
-	* sys/amfcodec/gstamfh264enc.h:
-	* sys/amfcodec/gstamfh265enc.cpp:
-	* sys/amfcodec/gstamfh265enc.h:
-	* sys/amfcodec/gstamfutils.cpp:
-	* sys/amfcodec/gstamfutils.h:
-	* sys/amfcodec/meson.build:
-	* sys/amfcodec/plugin.cpp:
-	* sys/meson.build:
-	  amfcodec: Add support for h264/h265 encoding
-	  New encoder implementations for AMD GPU using AMF API
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2109>
+	* sys/msdk/gstmsdkdec.c:
+	  msdkdec: acquire buffer from video pool on Windows
+	  Video memory is available on Windows. This patch is to make the buffers
+	  acquired from d3d11 video pool.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4088>
 
-2022-03-31 01:36:37 +0900  Seungha Yang <seungha@centricular.com>
+2022-11-17 10:29:55 +0800  Tong Wu <tong1.wu@intel.com>
 
-	* sys/amfcodec/include/components/ColorSpace.h:
-	* sys/amfcodec/include/components/Component.h:
-	* sys/amfcodec/include/components/ComponentCaps.h:
-	* sys/amfcodec/include/components/PreAnalysis.h:
-	* sys/amfcodec/include/components/VideoDecoderUVD.h:
-	* sys/amfcodec/include/components/VideoEncoderHEVC.h:
-	* sys/amfcodec/include/components/VideoEncoderVCE.h:
-	* sys/amfcodec/include/core/AudioBuffer.h:
-	* sys/amfcodec/include/core/Buffer.h:
-	* sys/amfcodec/include/core/Compute.h:
-	* sys/amfcodec/include/core/ComputeFactory.h:
-	* sys/amfcodec/include/core/Context.h:
-	* sys/amfcodec/include/core/CurrentTime.h:
-	* sys/amfcodec/include/core/D3D12AMF.h:
-	* sys/amfcodec/include/core/Data.h:
-	* sys/amfcodec/include/core/Debug.h:
-	* sys/amfcodec/include/core/Dump.h:
-	* sys/amfcodec/include/core/Factory.h:
-	* sys/amfcodec/include/core/Interface.h:
-	* sys/amfcodec/include/core/Plane.h:
-	* sys/amfcodec/include/core/Platform.h:
-	* sys/amfcodec/include/core/PropertyStorage.h:
-	* sys/amfcodec/include/core/PropertyStorageEx.h:
-	* sys/amfcodec/include/core/Result.h:
-	* sys/amfcodec/include/core/Surface.h:
-	* sys/amfcodec/include/core/Trace.h:
-	* sys/amfcodec/include/core/Variant.h:
-	* sys/amfcodec/include/core/Version.h:
-	* sys/amfcodec/include/core/VulkanAMF.h:
-	  amfcodec: Import AMF SDK headers
-	  SDK version v1.4.24 at the commit of
-	  https://github.com/GPUOpen-LibrariesAndSDKs/AMF/commit/fbf12cd39fe1812ed902525a1c001307b94871b9
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2109>
+	* sys/msdk/gstmsdkdec.c:
+	  msdkdec: add thiz->ds_has_known_allocator for d3d11
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4088>
 
-2022-04-09 02:13:57 +0900  Seungha Yang <seungha@centricular.com>
+2022-10-26 10:32:10 +0800  Tong Wu <tong1.wu@intel.com>
 
-	* sys/msdk/gstmsdkcontextutil.c:
-	  msdk: Fix Windows build
-	  Headers of gstva should not be included on Windows
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2141>
+	* sys/msdk/gstmsdkallocator_d3d.c:
+	  msdkallocator_d3d: add alloc callback function for d3d allocator
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4088>
 
-2022-04-08 04:24:36 +0900  Seungha Yang <seungha@centricular.com>
+2022-10-19 15:01:44 +0800  Tong Wu <tong1.wu@intel.com>
 
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	  d3d11window: Use ANSI version WIN32 API explicitly
-	  We were using ANSI version APIs implicitly because UNICODE is not
-	  defined by ourselves. But potentially it can be broken if user
-	  defines UNICODE.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2131>
+	* sys/msdk/gstmsdkdec.c:
+	  msdkdec: add d3d11 pool during negotiation
+	  Enable use_video_memory for Windows and add d3d11 pool.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4088>
 
-2022-04-08 04:02:55 +0900  Seungha Yang <seungha@centricular.com>
+2022-10-18 18:46:52 +0800  Tong Wu <tong1.wu@intel.com>
 
-	* sys/d3d11/gstd3d11av1dec.cpp:
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	* sys/d3d11/gstd3d11videosink.cpp:
-	  d3d11: Run indent
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2131>
+	* sys/msdk/gstmsdkav1dec.c:
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkh264dec.c:
+	* sys/msdk/gstmsdkh265dec.c:
+	* sys/msdk/gstmsdkmjpegdec.c:
+	* sys/msdk/gstmsdkvp9dec.c:
+	  msdkdec: add d3d11 caps for srcpad
+	  Set decoder srcpad with D3D11Memory.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4088>
 
-2022-03-11 20:46:11 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-16 22:13:40 +0100  Aleksandr Slobodeniuk <aslobodeniuk@fluendo.com>
 
-	* gst-libs/gst/codecparsers/gsth265parser.c:
-	* gst-libs/gst/codecparsers/gsth265parser.h:
-	  h265parser: Fix short_term_ref_pic_set() size calculation
-	  This field is used by DXVA/NVDEC/VA, and each specification
-	  describes (NVDEC is not well documented) that it's the number of
-	  bits used in short_term_ref_pic_set().
-	  DXVA doesn't explicitly mention that whether the size of
-	  emulation preventation bytes (EPB) is inclusive or not, but
-	  VA is clearly specifying that it's the size after removing
-	  EPB. Excluding EPB size here makes more sense therefore.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1930>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	* gst-libs/gst/d3d11/gstd3d11converter.h:
+	* sys/d3d11/gstd3d11convert.cpp:
+	  d3d11convert: add "method" property
+	  It allows to select the sampling method, same
+	  as "method" property of videoconvert.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4205>
 
-2022-04-06 11:21:25 +0200  Edward Hervey <edward@centricular.com>
+2023-03-17 20:44:30 +0100  Aleksandr Slobodeniuk <aslobodeniuk@fluendo.com>
 
-	* gst/mxf/mxfvanc.c:
-	  mxfvanc: Handle empty VANC packets
-	  Some XDCAM recorders store empty packets for VANC, and don't even include the
-	  2byte length.
-	  Handle them in the same way as VANC packets with 0 packets.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2122>
-
-2022-04-01 22:52:18 +0900  Sangchul Lee <sc11.lee@samsung.com>
-
-	* gst-libs/gst/webrtc/datachannel.c:
-	* gst-libs/gst/webrtc/webrtc_fwd.h:
-	  webrtc/datachannel: Change initial data channel state to CONNECTING
-	  It complies with http://w3c.github.io/webrtc-pc/#dom-rtcdatachannelstate.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2099>
+	* sys/d3d11/gstd3d11convert.cpp:
+	  d3d11convert: protect 'add-borders' with mutex
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4205>
 
-2022-04-04 20:47:03 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-20 17:44:23 +0000  Colin Kinloch <colin.kinloch@collabora.com>
 
-	* sys/qsv/gstqsvencoder.cpp:
-	  qsvencoder: Don't use USAGE_HINT_ENCODER and enable derived image support
-	  Peformance issue by disabled derived image support was reported
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2111>
+	* ext/gtk/gstgtkwaylandsink.c:
+	  gtkwaylandsink: Fix crash when rendering after the window is closed
+	  Continuation of https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4197
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4232>
 
-2022-04-04 20:36:14 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-09 17:18:16 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* sys/va/gstvah264enc.c:
-	  Revert "vah264enc: Disable derived image support"
-	  This reverts commit 0011feb0d660f331abde5b1e36f1c56e9cf3b014.
-	  The commit caused performance-wise regression for some platforms
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2111>
+	* sys/msdk/gstmsdkvpp.c:
+	  msdkvpp: Pass null formats when create va allocator for RGB565
+	  Fix https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1780
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4136>
 
-2022-04-01 15:35:17 +0800  Tong Wu <tong1.wu@intel.com>
+2023-03-16 17:50:39 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* sys/msdk/msdk.c:
-	  msdk: use mfxU32 instead of uint32_t
-	  Msdk should use mfx variables defined in mfxdefs.h. Replace uint32_t
-	  with mfxU32.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2091>
-
-2022-04-01 15:00:01 +0200  Stéphane Cerveau <scerveau@collabora.com>
-
-	* tests/examples/camerabin2/gst-camerabin2-test.c:
-	  bad: examples: fix unused res warning
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2095>
-
-2022-03-29 14:42:04 +0200  Johan Sternerup <johast@axis.com>
-
-	* ext/webrtc/gstwebrtcice.c:
-	* ext/webrtc/icestream.c:
-	* ext/webrtc/icestream.h:
-	* ext/webrtc/nicetransport.c:
-	  webrtc: Improve robustness of nice agent signal handlers
-	  NiceAgent and it's associated thread is alive for as long as
-	  GstWebRTCICE is alive so make sure any signal handlers connected to
-	  NiceAgent do not access data that is deleted earlier.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2073>
+	* gst-libs/gst/va/gstvadisplay.c:
+	* sys/va/gstvapluginutils.c:
+	  va: add driver description in element metadata
+	  In the same spirit of libva-win32 elements this patch shows the driver of each
+	  element in gst-inspect, giving more information to the user. This driver
+	  description is parsed from vaQueryVendorString from mesa and intel drivers,
+	  while copied as is for others. Also appends the render node for multi gpu
+	  systems.
+	  Fixes #2349
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4204>
 
-2022-04-03 22:12:33 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-20 11:20:30 +0100  Edward Hervey <edward@centricular.com>
 
-	* sys/nvcodec/gstnvh264encoder.cpp:
-	* sys/nvcodec/gstnvh265encoder.cpp:
-	  nvcodec: Fix typos
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2107>
+	* ext/openjpeg/gstopenjpegdec.c:
+	* ext/openjpeg/gstopenjpegdec.h:
+	* gst-libs/gst/adaptivedemux/gstadaptivedemux.c:
+	  plugins: Fix wrong enum usage
+	  gcc 13 now detects conflicting enum usages. Fix the various cases where it was wrong
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4225>
 
-2022-04-03 22:08:51 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-19 21:21:31 +0100  Adrien De Coninck <deconinck.adrien@gmail.com>
 
-	* sys/nvcodec/gstnvencoder.h:
-	  nvencoder: Fix operator overloading
-	  GUID equality check was inverted
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2107>
+	* sys/winks/ksdeviceprovider.c:
+	  ksdeviceprovider: Fix leak in gst_dshow_device_provider_start
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4224>
 
-2022-04-01 21:09:10 +0100  Tim-Philipp Müller <tim@centricular.com>
+2023-03-19 20:57:18 +0100  Adrien De Coninck <a.deconinck@intopix.com>
 
-	* gst-libs/gst/va/meson.build:
-	  libs: va: make sure va-enumtypes.h is generated before it's used
-	  Need to add a dep for the generated header file to the dependency()
-	  so that it gets generated before anyone tries to #include files
-	  from it (which may happen before the actual lib is built because
-	  that's only needed when stuff is linked together later).
-	  See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2057#note_1323236
-	  and CI build failures in https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2096
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2103>
+	* sys/directshow/dshowdeviceprovider.cpp:
+	  dshowdeviceprovider: Fix leak in gst_dshow_device_provider_start
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4224>
 
-2022-04-01 05:02:58 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-18 20:23:10 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Disable derived image support
-	  Behavior of derived image seems to be platform dependent and
-	  it's buggy in some cases.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1110
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2086>
+	* sys/va/gstvabasedec.c:
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabasetransform.c:
+	* sys/va/gstvacompositor.c:
+	  va: Return default device from device-path property getter
+	  Otherwise application would not be able to know matching element
+	  for wanted device. Typical use case of the read-only device path
+	  (DXGI Adapter LUID, CUDA device index, etc) property is that
+	  application enumerates physical devices and then selects matching
+	  GStreamer element (in null state) via device path property.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4220>
 
-2022-04-01 22:47:07 +0800  He Junyan <junyan.he@intel.com>
+2023-03-17 16:32:45 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  va: h264enc: Do not use USAGE_HINT_ENCODER for input pool.
-	  It seems that the VA_SURFACE_ATTRIB_USAGE_HINT_ENCODER is used only
-	  for the recon surfaces, if we set this flags for input raw surfaces,
-	  the alignment is wrong and we get broken result.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2100>
+	* ext/bs2b/gstbs2b.c:
+	* ext/bs2b/gstbs2b.h:
+	* ext/openal/gstopenal.c:
+	* gst/mxf/mxfmetadata.c:
+	* sys/v4l2codecs/gstv4l2codech264dec.c:
+	  plugins: Fix various trivial clang compiler warnings
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4210>
 
-2022-04-01 15:59:58 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-03-17 15:51:53 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/va/gstvaallocator.c:
-	  va: Fix printf format modifier for drm modifiers
-	  DRM modifiers are 64bit, the printf modifier is platform dependant. Use
-	  the G_GINT64_MODIFIER macro to make this printf portable.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2102>
+	* gst/mpegtsdemux/tsdemux.c:
+	  tsdemux: Fix reading of extended Opus channel configuration
+	  Argument evaluation order is implementation defined in C, and gcc is
+	  evaluating right-to-left (works) while clang is evaluating left-to-right
+	  (does not work).
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4210>
 
-2022-03-30 11:06:02 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+2023-03-17 23:28:58 +0900  Seungha Yang <seungha@centricular.com>
 
-	* meson.build:
-	  Use gmodule-no-export-2.0
-	  We don't need `-Wl,--export-dynamic`, that's used only for executables
-	  that needs to export an API to be used by plugins they load.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2031>
+	* gst-libs/gst/codecs/gsth264picture.c:
+	  h264decoder: Fix DPB bumping process
+	  As per spec C.4.5.3 "Bumping", if bumping is needed but DPB holds
+	  no "output needed" picture, then a picture that has the smallest
+	  POC should be considered first for output
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4211>
 
-2022-03-25 15:00:20 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+2023-03-15 15:55:02 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/vulkan/meson.build:
-	* ext/webrtc/meson.build:
-	* gst-libs/gst/d3d11/meson.build:
-	* gst/rtp/meson.build:
-	* meson.build:
-	* sys/bluez/meson.build:
-	* sys/dvb/meson.build:
-	* tests/check/meson.build:
-	* tests/examples/ipcpipeline/meson.build:
-	* tests/examples/opencv/meson.build:
-	* tests/examples/webrtc/meson.build:
-	* tests/examples/wpe/meson.build:
-	* tests/icles/meson.build:
-	  Remove glib and gobject dependencies everywhere
-	  They are part of gst_dep already and we have to make sure to always have
-	  gst_dep. The order in dependencies matters, because it is also the order
-	  in which Meson will set -I args. We want gstreamer's config.h to take
-	  precedence over glib's private config.h when it's a subproject.
-	  While at it, remove useless fallback args for gmodule/gio dependencies,
-	  only gstreamer core needs it.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2031>
+	* gst/videoparsers/gsth264parse.c:
+	  h264parse: Stop considering NO_NAL as an error
+	  The NO_NAL return value simply means that the buffer did not contain
+	  enough data to identity a NAL. This should lead to waiting for more data not
+	  considering the stream as invalid.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3234>
 
-2022-03-24 14:15:00 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+2022-10-20 15:07:15 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/sctp/usrsctp/meson.build:
-	* meson.build:
-	  Fix cross build with mingw32
-	  At least on Ubuntu 20.04 the x86_64-w64-mingw32-gcc toolchain defaults
-	  to WinXP. We require at least Vista for FILE_STANDARD_INFO.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2022>
+	* tests/check/libs/h265parser.c:
+	  test: h265parser: Test for NAL missing header bytes
+	  H.265 NAL always have 2 bytes of headers. Unlike the H.264 parser, this parser
+	  will simply return that there is NO_NAL if some of these bytes are missing.
+	  This is then properly special cased by parsers and decoders. Add a test to
+	  ensure we don't break this in the future.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3234>
 
-2022-03-25 22:04:05 +0900  Seungha Yang <seungha@centricular.com>
+2022-10-20 11:21:00 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* sys/qsv/gstqsvallocator_va.cpp:
-	* sys/qsv/gstqsvencoder.cpp:
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh265enc.cpp:
-	* sys/qsv/gstqsvvp9enc.cpp:
-	  qsvencoder: Add support for VA memory
-	  Use VA allocator and buffer pool implementation for zero-copy
-	  encoding with upstream VA elements
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2030>
+	* gst-libs/gst/codecparsers/gsth264parser.c:
+	* tests/check/libs/h264parser.c:
+	  h264parser: Fix return value parsing short header
+	  The appropriate return value for incomplete NAL header should be
+	  GST_H264_PARSER_NO_NAL_END. This tells the parser element to
+	  gather more data. Previously, it would assume the NAL is corrupted
+	  and would drop the data, potentially causing stream corruption.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3234>
 
-2022-03-25 21:03:02 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-18 01:33:20 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/qsv/gstqsvallocator_va.h:
-	* sys/qsv/gstqsvdecoder.cpp:
-	* sys/qsv/gstqsvencoder.cpp:
-	  qsv: Use pipeline's VA context
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2030>
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	  nvencoder: Fix CQP option setting
+	  ... and zero initialize LUID and CUDA device list to address
+	  coverity issue
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4215>
 
-2022-03-29 14:52:33 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-16 13:33:46 +0100  Albert Sjölund <alberts@axis.com>
 
-	* gst-libs/gst/va/gstva.h:
-	* gst-libs/gst/va/gstvaallocator.c:
-	* gst-libs/gst/va/gstvaallocator.h:
-	* gst-libs/gst/va/gstvapool.c:
-	* gst-libs/gst/va/gstvapool.h:
-	* gst-libs/gst/va/meson.build:
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvabasetransform.c:
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvah264enc.c:
-	  libs: va: add VA allocator parameter for derived images usage.
-	  Added GstVaFeature enum type, and new parameter for VA allocator's
-	  set_format() and get_format(). Also added a new parameter in VA pool
-	  gst_va_pool_new_with_config() and
-	  gst_buffer_pool_config_set_va_allocation_params().
-	  This new parameter will define if derived images will by used for
-	  buffer mapping.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2057>
+	* gst-libs/gst/webrtc/nice/nicestream.c:
+	  webrtc: Fix segfault traversing ice transports
+	  Previously, reassigning loop index l in nicestream.c
+	  could cause a segfault if l->data was null, as it could
+	  reassign l to a null variable, triggering the loop
+	  postassignment l->next, which then segfaults due to
+	  l now being null. It is instead moved into the loop.
+	  _delete_transport already performs the reassignment
+	  inline.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4192>
 
-2022-03-28 21:25:50 +0900  Sangchul Lee <sc11.lee@samsung.com>
+2023-03-16 16:02:26 +0000  Colin Kinloch <colin.kinloch@collabora.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/gstwebrtcstats.c:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcstats: Unify 'packets-lost' data type to int64
-	  Previously, 'packets-lost' member of RTCReceivedRtpStreamStats had
-	  a value of G_TYPE_INT from rtpsource or a value of G_TYPE_UINT64
-	  from rtpjitterbuffer.
-	  Because of the negative value of estimated amount of packets lost
-	  in rtpsource as well as the description in
-	  https://www.w3.org/TR/webrtc-stats/#dom-rtcreceivedrtpstreamstats
-	  it is fixed to set this value with G_TYPE_INT64.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2049>
+	* ext/gtk/gstgtkwaylandsink.c:
+	  gtkwaylandsink: Destroy GstWlWindow when parent GtkWindow is destroyed
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4197>
 
-2022-03-30 12:12:34 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-15 18:54:13 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/va/gstvaencoder.c:
-	  va: encoder: Remove unused allocation config.
-	  Since it's also done inside of gst_va_pool_new_with_config().
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2072>
+	* ext/avtp/gstavtpcrfutil.c:
+	* ext/closedcaption/bit_slicer.c:
+	* ext/closedcaption/io-sim.c:
+	* ext/closedcaption/raw_decoder.c:
+	* ext/closedcaption/sampling_par.c:
+	* ext/dash/gstdashdemux.c:
+	* ext/dtls/gstdtlsconnection.c:
+	* ext/hls/gsthlsdemux.c:
+	* ext/kate/gstkatespu.c:
+	* ext/lv2/gstlv2.c:
+	* ext/openal/gstopenalsink.c:
+	* ext/resindvd/resindvdsrc.c:
+	* ext/vulkan/vkviewconvert.c:
+	* ext/x265/gstx265enc.c:
+	* gst-libs/gst/codecparsers/gsth264parser.c:
+	* gst-libs/gst/codecparsers/gstmpegvideoparser.c:
+	* gst-libs/gst/vulkan/wayland/gstvkdisplay_wayland.c:
+	* gst-libs/gst/wayland/gstwlcontext.c:
+	* gst-libs/gst/wayland/gstwldisplay.c:
+	* gst-libs/gst/wayland/gstwlwindow.c:
+	* gst/dvbsubenc/libimagequant/libimagequant.c:
+	* gst/dvbsubenc/libimagequant/mempool.c:
+	* gst/dvbsubenc/libimagequant/pam.c:
+	* gst/dvdspu/gstspu-pgs.c:
+	* gst/fieldanalysis/gstfieldanalysis.c:
+	* gst/id3tag/id3tag.c:
+	* gst/interlace/gstinterlace.c:
+	* gst/jp2kdecimator/jp2kcodestream.c:
+	* gst/mpegtsdemux/mpegtsbase.c:
+	* gst/mxf/mxfaes-bwf.c:
+	* gst/mxf/mxfdemux.c:
+	* gst/mxf/mxfmetadata.c:
+	* gst/mxf/mxfup.c:
+	* gst/removesilence/vad_private.c:
+	* gst/rtmp2/rtmp/amf.c:
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gstmpegvideoparse.c:
+	* gst/videoparsers/gstvc1parse.c:
+	* sys/androidmedia/gst-android-graphics-imageformat.c:
+	* sys/androidmedia/gst-android-hardware-camera.c:
+	* sys/androidmedia/gst-android-hardware-sensor.c:
+	* sys/androidmedia/gstamc.c:
+	* sys/androidmedia/gstamcaudiodec.c:
+	* sys/androidmedia/gstamcvideodec.c:
+	* sys/androidmedia/gstamcvideoenc.c:
+	* sys/applemedia/vtenc.c:
+	* sys/d3dvideosink/d3dhelpers.c:
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/v4l2codecs/gstv4l2decoder.c:
+	* sys/wasapi/gstwasapiutil.c:
+	* tests/check/elements/avtpcrfsync.c:
+	* tests/check/elements/avwait.c:
+	* tests/check/elements/kate.c:
+	* tests/check/elements/pnm.c:
+	* tests/check/libs/play.c:
+	* tests/check/pipelines/ipcpipeline.c:
+	* tests/examples/d3d11/d3d11videosink.c:
+	  gst-plugins-bad: re-indent with GNU indent 2.2.12
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4182>
 
-2022-03-30 02:49:40 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-16 23:09:53 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/va/gstvadisplay.c:
-	* gst-libs/gst/va/gstvautils.c:
-	  vadisplay: Add description readonly property
-	  Expose description of vendor for user information, similar to
-	  the description property of d3d11device.
-	  Also, set description and DRM device path on GstContext structure
-	  so that user can read them and it will be printed on terminal
-	  when gst-launch-1.0 is used
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2064>
+	* sys/wasapi2/gstwasapi2client.cpp:
+	  wasapi2: Fix potential crash on device activation failure
+	  The activation object is live in COM thread already and therefore
+	  self refcount hack is pointless.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4194>
 
-2022-03-30 07:03:59 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-16 13:25:39 +0100  Albert Sjölund <alberts@axis.com>
 
-	* gst-libs/gst/va/gstvaallocator.c:
-	* gst-libs/gst/va/gstvapool.c:
-	* gst-libs/gst/va/gstvapool.h:
-	* gst-libs/gst/va/va_fwd.h:
-	  va: Don't expose internal classes.
-	  VA allocators and pools classes don't need to be exposed as external
-	  symbols.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2070>
+	* ext/webrtc/webrtcdatachannel.c:
+	  webrtc: patch leak caused by early return
+	  In webrtc_data_channel_send functions, both data and string,
+	  an early return on a non-open datachannel caused it to leak
+	  the buffer used for pushing to appsrc, meaning any buffer
+	  sent after leaving the open state was leaked in full.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4191>
 
-2022-03-30 12:01:20 +0800  Haihua Hu <jared.hu@nxp.com>
+2023-03-16 00:53:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/play/gstplay.c:
-	  gstplay: don't print error log in warning_cb
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2069>
+	* gst-libs/gst/d3d11/gstd3d11converter.cpp:
+	  d3d11converter: Fix conversion backend selection
+	  Intended behavior was selecting video processor only if pixel shader
+	  is disabled, since we prefer shader over video processor
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4179>
 
-2022-03-29 20:14:40 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-15 22:05:33 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvavpp.c:
-	  vapostproc: Build classification dynamically.
-	  By default, the classification is
-	  "Converter/Filter/Colorspace/Scaler/Video/Hardware", but if VA
-	  post-processor driver supports either color balance, skin tone
-	  enhancement, sharpening or noise reduction, "Effect" is added.
-	  Thus, if vapostproc ranking is raised, it can be chosen by
-	  autovideosink.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2066>
+	* sys/d3d11/gstd3d11window.cpp:
+	* sys/d3d11/gstd3d11window.h:
+	  d3d11videosink: Fix tearing in case of fullscreen mode
+	  DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING and DXGI_PRESENT_ALLOW_TEARING should
+	  be used only if required, when user wants Vsync off for example.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2376
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4178>
 
-2022-02-21 14:02:52 +1100  Matthew Waters <matthew@centricular.com>
+2022-11-28 09:00:27 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/gstwebrtcbin.h:
-	* ext/webrtc/gstwebrtcstats.c:
-	  webrtc: produce stats for all relevant streams
-	  Instead of only using the last ssrc that was pushed into a sink pad.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	  waylandsink: Add a comment about dmabuf without feature
+	  The code does not make it obvious that dmabuf is still supported
+	  without the feature. This documents that it is supported, but
+	  only for formats that are also support by SHM interface.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3476>
 
-2022-02-11 16:50:42 +1100  Matthew Waters <matthew@centricular.com>
+2022-11-28 08:59:54 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtc: avoid different versions of gnu-indent always wanting to change !!
-	  Add some sneaky parenthesis to avoid always having to use git commit -n
-	  or revert out hunk of the change.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	* ext/wayland/gstwaylandsink.h:
+	  waylandsink: Remove unused instance member
+	  use_dmabuf is set but never used.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3476>
 
-2021-11-26 22:04:14 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-14 14:05:36 +0800  Teng, Jin Chung <jin.chung.teng@intel.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/transportstream.c:
-	* ext/webrtc/transportstream.h:
-	* tests/check/elements/webrtcbin.c:
-	  webrtc: implement initial simulcast fec/rtx usage
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* sys/msdk/gstmsdkenc.c:
+	  msdkh264enc: Adding BGRx format DMABuf support
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4167>
 
-2021-11-26 22:11:06 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-14 22:08:54 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/webrtc/webrtcdatachannel.c:
-	* gst-libs/gst/webrtc/datachannel.c:
-	  webrtc/datachannel: fix use-after-free in sctp state notification
-	  g_signal_disconnect*() doesn't stop any existing callbacks from running
-	  which means that if the notify::state callback is in progress in one
-	  thread and the data channel object is finalize()ed in another thread,
-	  then there could be a use-after-free trying lock the data channel
-	  object.
-	  We can't reasonably use a GWeakRef as we don't have a 'parent' object to
-	  free the GWeakRef after the data channel is finalized.  This is also
-	  complicated by the fact that the application can hold a reference to the
-	  data channel object that would live beyond the lifetime of webrtcbin
-	  itself.
-	  We solve this by implementing a ghetto weak-ref solution internally with
-	  a list of outstanding data channels.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* sys/d3d11/gstd3d11compositor.cpp:
+	  d3d11compositor: Fix composition error on release_pad()
+	  Composition might be still in progress while it's being released
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4169>
 
-2021-11-26 22:06:39 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-11 01:58:01 +0900  Seungha Yang <seungha@centricular.com>
 
-	* tests/check/elements/webrtcbin.c:
-	  tests/webrtc: fix a use-after-free in test_data_channel_close
-	  g_object_weak_ref() is not thread-safe and the data channel object's
-	  refs/unrefs can happen on multiple threads.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* gst-libs/gst/va/gstvadisplay_win32.cpp:
+	  vadisplay_win32: Query profiles and entry points on init
+	  Depending on driver, display can be initialized but
+	  fails on query calls.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4149>
 
-2021-11-26 21:51:57 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-10 00:24:46 +0900  Seungha Yang <seungha@centricular.com>
 
-	* tests/check/elements/webrtcbin.c:
-	  tests/webrtc: fix a race in the tests related to state tracking
-	  If things progress fast enough, some state changes may not be seen be
-	  the waiting code.
-	  Fix by:
-	  1. keeping a list of all the state changes
-	  2. waiting checks each entry and if the relevant state is found, all
-	  states up to and including then are removed.
-	  This ensures that any waits will see all the state sets.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* sys/va/plugin.c:
+	  va: Don't error out on plugin registration
+	  Keep enumerate devices and don't return FALSE on plugin_init()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4149>
 
-2021-11-26 02:00:12 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-09 09:14:47 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* tests/check/elements/webrtcbin.c:
-	  tests/webrtc: factor out src pad property checking to a separate function
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* sys/applemedia/helpers.c:
+	* sys/applemedia/helpers.h:
+	* sys/applemedia/vtdec.c:
+	* sys/applemedia/vtenc.c:
+	* sys/applemedia/vtutil.h:
+	  applemedia: Consolidate GstVideoFormat <-> CVPixelFormat conversion
+	  In the process we have changed the color value range from video-range
+	  to full-range, which is probably what people want in the first place.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4135>
 
-2021-11-16 19:27:11 +1100  Matthew Waters <matthew@centricular.com>
+2023-02-17 12:10:25 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/gstwebrtcstats.c:
-	* ext/webrtc/transportstream.c:
-	* ext/webrtc/transportstream.h:
-	* ext/webrtc/webrtctransceiver.c:
-	* ext/webrtc/webrtctransceiver.h:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: initial support for sending and receiving simulcast streams
-	  Input (sink pads) is the already-ssrc-muxed stream with the relevant rtp
-	  sdes header extensions already applied:
-	  - mid
-	  - stream-id
-	  - repaired-stream-id
-	  Output (src pads) have the pads separated into individual ssrc's as
-	  that's what rtpbin gives us.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* docs/plugins/gst_plugins_cache.json:
+	  bad: Update doc cache for waylandsink changes
+	  A new drm-device property has been added.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-11-16 18:11:49 +1100  Matthew Waters <matthew@centricular.com>
+2023-02-16 16:21:33 -0500  Colin Kinloch <colin.kinloch@collabora.com>
 
-	* tests/check/elements/webrtcbin.c:
-	  tests/webrtc: test for enabled bundled fec/rtx
-	  Doesn't actually check that any fec/rtx happens, just that the pipeline
-	  is vaguely sane and doesn't error.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	* ext/wayland/gstwaylandsink.h:
+	  wayladnsink: Add DRM Dumb allocator support
+	  If the input is not a DMABuf, attempt to copy into a DRM Dumb
+	  buffer and import it has a DMABuf. This will offload the
+	  compositor from actually doing this copy (needed to handle SHM)
+	  and may allow the software decoded stream to be rendered to
+	  an HW layer, or even reach through some better accelerated
+	  GL import path.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-11-16 17:39:18 +1100  Matthew Waters <matthew@centricular.com>
+2023-02-16 15:40:21 -0500  Colin Kinloch <colin.kinloch@collabora.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: support multiple received streams for a single mline
-	  Each rtpbin exposed recv_src pad is now exposed as webrtcbin src_%u pad
-	  now with no meaining applied to the value of %u.  Previously this used
-	  to mean the mline in the SDP.  If this is is still required, then the
-	  transceiver can be retrieved from the pad and the "mlineindex" property
-	  from the transciever.  The "mid" is also retrievable from the
-	  transceiver.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* gst-libs/gst/wayland/gstwlvideobufferpool.c:
+	* gst-libs/gst/wayland/gstwlvideobufferpool.h:
+	  wlvideobufferpool: Add DRM Dumb buffer support
+	  This allow the wayland buffer pool to use a GstDRMDumbAllocator
+	  if it has been configured to do so.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-11-16 17:28:04 +1100  Matthew Waters <matthew@centricular.com>
+2023-02-17 09:42:42 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* gst-libs/gst/webrtc/webrtc_fwd.h:
-	  webrtc: explicitly error out in a couple of renegotiation cases
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* gst-libs/gst/wayland/gstwldisplay.c:
+	* gst-libs/gst/wayland/gstwllinuxdmabuf.c:
+	* gst-libs/gst/wayland/gstwlvideoformat.c:
+	* gst-libs/gst/wayland/gstwlvideoformat.h:
+	  wlvideoformat: Fix sign issue for DRM fourcc
+	  DRM fourcc ared defined as 32bit unsigned in, but the format helper was passing
+	  an int, while using a unsigned int internally. This is a API/ABI break, but
+	  the API is still unstable.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-11-16 17:21:31 +1100  Matthew Waters <matthew@centricular.com>
+2023-02-16 21:12:08 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/webrtc/transportstream.c:
-	  webrtc/transportstream: add debug category
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	* gst-libs/gst/wayland/gstwllinuxdmabuf.c:
+	  wllinuxdmabuf: Handle video meta inside the importer
+	  This allow simplifying the GstVideoInfo handling in the sinks. Instead
+	  of having to update a video info for the import, the sink can simply pass the
+	  video info associated with the caps and rely on the VideoMeta in the GstBuffer
+	  to obtain the appropriate offset and stride.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-11-03 21:18:53 +1100  Matthew Waters <matthew@centricular.com>
+2023-02-16 14:31:10 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* tests/check/elements/webrtcbin.c:
-	  tests/webrtc: also check valid mline for srcpad codec-preferences negotiation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* ext/gtk/gstgtkwaylandsink.c:
+	  gtkwaylandsink: Fix display/wl_window/pool leaks
+	  These were leaked in the GTK implementation of the sink.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-11-03 20:46:23 +1100  Matthew Waters <matthew@centricular.com>
+2023-02-16 13:54:42 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/gstwebrtcbin.h:
-	  webrtcbin: don't name src pads based on the mline specifically anymore
-	  Naming based on the mline doesn't really work with e.g. simulcast
-	  scenarios.
-	  It is entirely possible to retrieve the transceiver and then the mline
-	  from that if that is so required.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	* ext/wayland/gstwaylandsink.h:
+	  waylandsink: Refactor internal pool handling
+	  This is to make it easier to support more then one allocators
+	  including falling back from one to another.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-10-29 18:40:04 +1100  Matthew Waters <matthew@centricular.com>
+2023-02-15 13:11:36 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* tests/check/elements/webrtcbin.c:
-	  webrtc/tests: print the correct media idx on error
-	  Instead of the attribute index
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	  waylandsink: Let the baseclass know when frames are dropped
+	  This is using the new GST_BASE_SINK_FLOW_DROPPED return value.
+	  With this change, fpsdisplaysink will properly report the
+	  render and dropped rate.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-10-29 18:38:37 +1100  Matthew Waters <matthew@centricular.com>
+2023-02-15 12:34:27 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* tests/check/elements/webrtcbin.c:
-	  webrtc/tests: give slightly better names to the dot file dumps
-	  Don't use printf-specifiers with g_strconcat().
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* ext/gtk/gstgtkwaylandsink.c:
+	  gtkwaylandsink: Force a redraw on resolution change
+	  As we don't render into the widget directly, there is no "initial" draw
+	  happening. As a side effect, the internal aspect ratio adapted display
+	  width/height is never initialize leading to assertions when handling navigation
+	  events.
+	  gst_video_center_rect: assertion 'src->h != 0' failed
+	  Simply queue a redraw after setting the widget format in order to fix the issue.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-07-21 17:48:34 +1000  Matthew Waters <matthew@centricular.com>
+2023-02-15 12:13:16 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/utils.h:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: improve some debugging output
-	  - Put human readable names into debug strings.
-	  - Demote some frequent rtpbin signal logging
-	  - Don't use GST_PTR_FORMAT in g_set_error()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* ext/gtk/gstgtkwaylandsink.c:
+	* ext/wayland/gstwaylandsink.c:
+	  waylandsink: Stop modifying the display GstVideoInfo
+	  The video_info is supposed to match the display dimentions, but as soon as we
+	  get a padded video buffer, we modify it. This has side effect later on and
+	  maybe cause bad frames.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-07-21 17:39:11 +1000  Matthew Waters <matthew@centricular.com>
+2023-02-15 11:49:38 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: silence spurious warning when creating answer transceiver
-	  When creating a transceiver when creating an answer, the media kind of the
-	  transceiver was never set correctly initially.  This would lead to a
-	  GST_WARNING being produced about changin a transceiver's media kind.
-	  Fix by retrieving the GstSDPMedia kind from the offer instead as the answer
-	  GstSDPMedia has not been set as the answer caps have not been chosen yet.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* ext/gtk/gstgtkwaylandsink.c:
+	  gtkwaylandsink: Remove redefine of GST_CAPS_FEATURE_MEMORY_DMABUF
+	  Instead just include the appropriate header file. There is no meson deps
+	  modification as gstallocators_dep is already part of gstwayland_dep.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-07-21 14:29:35 +1000  Matthew Waters <matthew@centricular.com>
+2023-02-10 15:05:17 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
 
-	* tests/check/elements/webrtcbin.c:
-	  tests/webrtc: always use a unique SSRC for each stream
-	  Will become more relevant with mid/rid->ssrc mappings
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* sys/kms/gstkmsallocator.c:
+	* sys/kms/gstkmsallocator.h:
+	  kmsallocator: Port to the new DRM Dumb Allocator
+	  This ports the KMS allocator to use the DRM Dumb allocator from the allocators
+	  library.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
 
-2021-07-21 14:14:30 +1000  Matthew Waters <matthew@centricular.com>
+2023-03-11 14:59:58 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: add a specific find_transceiver_by_mid function
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* sys/androidmedia/gstamc.c:
+	* sys/androidmedia/gstamcvideodec.c:
+	* sys/androidmedia/gstamcvideoenc.c:
+	  androidmedia: Add support for AV1
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4156>
 
-2021-07-20 20:17:13 +1000  Matthew Waters <matthew@centricular.com>
+2023-03-10 22:21:42 +0100  Alicia Boya García <ntrrgc@gmail.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: explicitly use a variable for the rtp session idx
-	  Slightly clearer in meaning.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* gst-libs/gst/cuda/gstcudaloader.cpp:
+	  cudaloader: Initialize logging category
+	  gstcudaloader.cpp defines GST_DEBUG_CATEGORY (gst_cudaloader_debug);
+	  but it wasn't initializing it anywhere.
+	  This caused the following error to be logged by gst-plugin-scanner when
+	  libcuda.so.1/nvcuda.dll couldn't be loaded, e.g. in systems without
+	  CUDA:
+	  (gst-plugin-scanner:39618): GStreamer-CRITICAL **: 14:40:22.346:
+	  gst_debug_log_full_valist: assertion 'category != NULL' failed
+	  This patch fixes the bug by initializing the category in
+	  gst_cuda_load_library_once_func() before any logging occurs.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4154>
 
-2021-07-01 15:54:34 +1000  Matthew Waters <matthew@centricular.com>
+2023-03-09 05:55:28 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: support using an a=mid value from the sink/transceiver caps
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1664>
+	* sys/applemedia/avfvideosrc.m:
+	  avfvideosrc: GL texture cache also supports YUY2 on macOS
+	  BGRA gives black frames, and everything else fails to negotiate.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4134>
 
-2022-03-25 15:56:01 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-03-08 01:06:10 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+
+	* sys/applemedia/avfvideosrc.m:
+	* sys/applemedia/helpers.c:
+	* sys/applemedia/helpers.h:
+	* sys/applemedia/meson.build:
+	  avfvideosrc: Use frame duration instead of frame rate
+	  These days you're can use minFrameDuration and maxFrameDuration which
+	  are CMTime with fractional values. That way we don't need to convert
+	  between double and fractions in a really weird way.
+	  This fixes really odd fractional values exposed in caps, like:
+	  2000000/76923, 1000000/37037, 5000000/178571, 10000000/344827, 10000000/333333
+	  Which are actually just 26/1, 27/1, 28/1, 29/1, 30/1
+	  We can also delete a lot of outdated code for iOS versions older than
+	  7.0 by using newer APIs.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4134>
+
+2023-03-08 22:54:35 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/va/gstva.h:
-	* gst-libs/gst/va/gstvaallocator.h:
-	* gst-libs/gst/va/gstvadisplay.c:
-	* gst-libs/gst/va/gstvadisplay.h:
-	* gst-libs/gst/va/gstvadisplay_drm.c:
-	* gst-libs/gst/va/gstvadisplay_drm.h:
-	* gst-libs/gst/va/gstvadisplay_wrapped.h:
-	* gst-libs/gst/va/gstvapool.c:
-	* gst-libs/gst/va/gstvapool.h:
-	* gst-libs/gst/va/gstvasurfacecopy.h:
-	* gst-libs/gst/va/gstvautils.c:
-	* gst-libs/gst/va/gstvautils.h:
-	* gst-libs/gst/va/gstvavideoformat.h:
-	* gst-libs/gst/va/va_fwd.h:
-	* gst-libs/gst/va/vasurfaceimage.h:
-	* sys/va/gstvaav1dec.c:
 	* sys/va/gstvabasedec.c:
+	* sys/va/gstvabaseenc.c:
 	* sys/va/gstvabasetransform.c:
-	* sys/va/gstvacaps.c:
-	* sys/va/gstvadecoder.c:
+	* sys/va/gstvacompositor.c:
+	* sys/va/gstvapluginutils.h:
+	  va: Update "device-path" property description for Windows
+	  DRM does not make sense on Windows
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4114>
+
+2023-03-08 22:44:42 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/va/gstvaav1dec.c:
+	* sys/va/gstvabasedec.h:
+	* sys/va/gstvacompositor.c:
 	* sys/va/gstvadeinterlace.c:
-	* sys/va/gstvadisplay_priv.c:
-	* sys/va/gstvadisplay_priv.h:
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	* sys/va/gstvafilter.c:
+	* sys/va/gstvah264dec.c:
 	* sys/va/gstvah264enc.c:
+	* sys/va/gstvah265dec.c:
+	* sys/va/gstvah265enc.c:
+	* sys/va/gstvajpegdec.c:
+	* sys/va/gstvampeg2dec.c:
+	* sys/va/gstvapluginutils.c:
+	* sys/va/gstvapluginutils.h:
+	* sys/va/gstvavp8dec.c:
+	* sys/va/gstvavp9dec.c:
 	* sys/va/gstvavpp.c:
-	* tests/examples/va/main.c:
-	* tests/examples/va/multiple-vpp.c:
-	  va: Set <gst/va/gstva.h> as library single point entry header.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2048>
+	* sys/va/meson.build:
+	  va: Add Windows specific element type/feature naming support
+	  Adapter LUID will be changed per boot. Use different naming rule on Windows
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4114>
 
-2022-02-23 15:40:19 +0800  He Junyan <junyan.he@intel.com>
+2023-03-04 04:37:06 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/va/gstvaallocator.c:
-	* gst-libs/gst/va/gstvaallocator.h:
-	* gst-libs/gst/va/gstvapool.c:
-	* gst-libs/gst/va/gstvapool.h:
-	* gst-libs/gst/va/gstvasurfacecopy.c:
-	* gst-libs/gst/va/gstvasurfacecopy.h:
-	* gst-libs/gst/va/meson.build:
-	* gst-libs/gst/va/vasurfaceimage.c:
-	* gst-libs/gst/va/vasurfaceimage.h:
-	* sys/va/gstvaav1dec.c:
 	* sys/va/gstvabasedec.c:
+	* sys/va/gstvabaseenc.c:
 	* sys/va/gstvabasetransform.c:
-	* sys/va/gstvadecoder.c:
+	* sys/va/gstvacompositor.c:
 	* sys/va/gstvadeinterlace.c:
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvafilter.c:
+	* sys/va/gstvadevice_linux.c:
+	* sys/va/gstvadevice_win32.cpp:
 	* sys/va/gstvah264enc.c:
+	* sys/va/gstvah265enc.c:
+	* sys/va/gstvapluginutils.h:
 	* sys/va/gstvavpp.c:
 	* sys/va/meson.build:
-	  va: Move allocators and pool objects into gstva library.
-	  In order to other plugins use gstva objects, such as allocators and buffer
-	  pools, this merge request move them from the va plugin to the gstva library.
-	  This objects are not exposed in <gst/va/gstva.h> since they are not expected
-	  to be used by users, only by plugin implementators.
-	  Because of the surface copy design, which is used to implement allocator's
-	  mem_copy() virtual function, depends on the vafilter, which is kept inside
-	  the plugin, memory copy through VAPosproc is disabled and removed temporarly.
-	  Also added some missing parameter validation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2048>
+	* sys/va/plugin.c:
+	  va: Add support for Win32 backend
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4114>
 
-2022-02-23 15:25:08 +0800  He Junyan <junyan.he@intel.com>
+2023-03-04 04:12:13 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/va/gstvavideoformat.c:
-	* gst-libs/gst/va/gstvavideoformat.h:
+	* gst-libs/gst/va/gstva.h:
+	* gst-libs/gst/va/gstvaallocator.c:
+	* gst-libs/gst/va/gstvadisplay.h:
+	* gst-libs/gst/va/gstvadisplay_drm.c:
+	* gst-libs/gst/va/gstvadisplay_win32.cpp:
+	* gst-libs/gst/va/gstvadisplay_win32.h:
+	* gst-libs/gst/va/gstvautils.c:
 	* gst-libs/gst/va/meson.build:
-	* sys/va/gstvaallocator.c:
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvacaps.c:
+	  va: Add Win32 backend GstVaDisplay implementation
+	  ... and disable derived image on Windows which does not seem to
+	  work
+	  Closes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1750
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4114>
+
+2023-03-07 01:16:26 +0900  Seungha Yang <seungha@centricular.com>
+
 	* sys/va/gstvadecoder.c:
-	* sys/va/gstvadisplay_priv.c:
-	* sys/va/gstvafilter.c:
-	* sys/va/meson.build:
-	* sys/va/vasurfaceimage.c:
-	  va: Move the video format functions into gstlibva.
-	  Untabifying header file.
-	  The logging category was moved from the plugin generic category to
-	  the display category. It can argue that video formats hacks are
-	  display dependant.
-	  Added validations for input parameters.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2048>
+	* sys/va/gstvaencoder.c:
+	* sys/va/gstvah264enc.c:
+	* sys/va/gstvah265enc.c:
+	  va: Drop all GSlice bits
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4114>
 
-2022-03-27 23:27:54 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-10 12:46:34 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/qsv/gstqsvencoder.cpp:
-	* sys/qsv/gstqsvencoder.h:
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh265enc.cpp:
-	* sys/qsv/gstqsvvp9enc.cpp:
-	* tests/examples/meson.build:
-	* tests/examples/qsv/key-handler.c:
-	* tests/examples/qsv/key-handler.h:
-	* tests/examples/qsv/meson.build:
-	* tests/examples/qsv/qsvenc-dynamic-reconfigure.c:
-	  qsvencoder: Add support for dynamic bitrate update
-	  ... and add more encoding options.
-	  QSV API supports dynamic bitrate change without IDR insertion.
-	  That's more efficient way of runtime encoding option update
-	  than starting from new sequence with IDR per bitrate option change.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2039>
+	* ext/webrtc/gstwebrtcbin.c:
+	* gst-libs/gst/webrtc/ice.c:
+	  webrtc: fix g-i annotations for allow-none
+	  'allow none' doesn't exist, and 'allow-none' is now deprecated.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4146>
 
-2022-03-25 23:15:33 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-07 16:18:03 +0100  Antonio Rojas <arojas@archlinux.org>
 
-	* sys/qsv/gstqsvh265enc.cpp:
-	  qsvh265enc: Add missing gop-size property
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2039>
+	* ext/zxing/gstzxing.cpp:
+	  zxing: add support for zxing-c++ 2.0
+	  format is a C++ string in 2.0
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3693>
 
-2022-03-25 21:13:22 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-10 16:47:17 +1100  Matthew Waters <matthew@centricular.com>
 
-	* sys/qsv/gstqsvallocator.cpp:
-	  qsv: Fix mfxFrameAllocator::Lock for encoder
-	  Only read map is possible for encoder input system memory
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2039>
-
-2022-03-28 20:51:35 +1100  Matthew Waters <matthew@centricular.com>
-
-	* sys/applemedia/videotexturecache.m:
-	  applemeida/texturecache: remove unused variable
-	  Fixes:
-	  ../sys/applemedia/videotexturecache.m:71:20: error: variable 'features' set but not used -Werror,-Wunused-but-set-variable
-	  GstCapsFeatures *features;
-	  ^
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2046>
+	* ext/vulkan/vkoverlaycompositor.c:
+	  vulkanoverlaycompositor: don't do a potential use after free
+	  Removing a meta from a buffer means one doesn't have access to it
+	  anymore.  Instead use the already reffed composition directly.
+	  Fixes a use-after-free in the following pipeline:
+	  ... ! vulkanupload ! timeoverlay ! vulkanoverlaycompositor ! ...
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4143>
 
-2022-03-28 20:50:27 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-09 18:03:42 +1100  Matthew Waters <matthew@centricular.com>
 
-	* sys/applemedia/corevideobuffer.c:
-	  applemedia/corevideobuffer: remove unused variable
-	  Fixes:
-	  ../sys/applemedia/corevideobuffer.c:209:19: error: variable 'video_meta' set but not used -Werror,-Wunused-but-set-variable
-	  GstVideoMeta *video_meta;
-	  ^
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2046>
+	* ext/closedcaption/gstcea708decoder.c:
+	  cea708overlay: support multiple service blocks in the same dtvcc packet
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4137>
 
-2022-03-28 20:49:01 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-09 14:38:13 +1100  Matthew Waters <matthew@centricular.com>
 
-	* sys/applemedia/iosurfaceglmemory.c:
-	  applemedia/iosgl: remove unused variable
-	  Fixes:
-	  ../sys/applemedia/iosurfaceglmemory.c:219:41: error: variable 'texfmt' set but not used -Werror,-Wunused-but-set-variable
-	  GLuint tex_id, tex_target, texifmt, texfmt;
-	  ^
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2046>
+	* ext/closedcaption/gstcea708decoder.c:
+	  cea708overlay: fix HCR interpretation
+	  An unsigned counter with a for (i = end; i >= 0; i--), can be optimized to
+	  infinite loop as an unsigned value will always be >= 0.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4133>
 
-2022-03-28 20:37:54 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-07 23:46:50 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/applemedia/vtdec.c:
-	  vtdec: remove unused variable
-	  Fixes:
-	  ../sys/applemedia/vtdec.c:611:35: error: variable 'output_flags' set but not used -Werror,-Wunused-but-set-variable
-	  VTDecodeFrameFlags input_flags, output_flags;
-	  ^
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2046>
+	* gst/videoparsers/gsth264parse.c:
+	* gst/videoparsers/gsth264parse.h:
+	  h264parse: Validate VUI framerate
+	  A few streams contain invalid/wrong framerate in VUI. Do validate
+	  it based on the spec and ignore invalid VUI framerate values.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1753
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4127>
 
-2022-03-28 20:24:59 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-07 17:44:58 +1100  Matthew Waters <matthew@centricular.com>
 
-	* sys/applemedia/avsamplevideosink.m:
-	  avsamplevideosink: remove unused variable
-	  Fixes
-	  ../sys/applemedia/avsamplevideosink.m:80:20: error: variable 'gstelement_class' set but not used -Werror,-Wunused-but-set-variable
-	  GstElementClass *gstelement_class;
-	  ^
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2046>
+	* ext/closedcaption/ccutils.c:
+	* tests/check/elements/cccombiner.c:
+	  cccombiner: fix output-padding=false for a cea608 field 1 only stream
+	  If we have data that needs outputting but we have to output padding to
+	  meet the alternating field requirements of cea608, then output that
+	  padding anyway.
+	  Also includes a test
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4124>
 
-2022-03-28 20:11:29 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-07 15:39:04 +0100  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* sys/applemedia/avfassetsrc.m:
-	  avfassetsrc: fix unused-but-set warning
-	  ../sys/applemedia/avfassetsrc.m:1014:12: error: variable 'caps' set but not used -Werror,-Wunused-but-set-variable
-	  GstCaps *caps;
-	  ^
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2046>
+	* ext/closedcaption/gstccconverter.c:
+	* tests/check/elements/ccconverter.c:
+	  ccconverter: implement field conversion of CEA 608 control codes
+	  As specified in EIA/CEA-608-B section 8.4:
+	  When closed captioning is used on line 21, field 2, it shall conform
+	  to all of the applicable specifications and recommended practices as
+	  defined for field 1 services with the following differences:
+	  a) The non-printing character of the miscellaneous control-character pairs
+	  that fall in the range of 14h, 20h to 14h, 2Fh in field 1, shall be replaced
+	  with 15h, 20h to 15h, 2Fh when used in field 2.
+	  b) The non-printing character of the miscellaneous control-character pairs
+	  that fall in the range of 1Ch, 20h to 1Ch, 2Fh in field 1, shall be replaced
+	  with 1Dh, 20h to 1Dh, 2Fh when used in field 2.
+	  This means simply switching the "field" field in the caps isn't enough for
+	  converting raw 608 from one field to another, some control codes also
+	  need to be amended.
+	  + Adds simple test
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4126>
 
-2022-03-28 19:42:04 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-05 20:15:19 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/speed/gstspeed.c:
-	  speed: fix unused-but-set warning
-	  ../gst/speed/gstspeed.c:523:39: error: variable 'base' set but not used -Werror,-Wunused-but-set-variable
-	  gint64 start_value, stop_value, base;
-	  ^
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2046>
+	* sys/va/gstvavp8dec.c:
+	  vavp8dec: Fix return type of decode_picture()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4113>
 
-2022-03-28 18:38:23 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-05 20:14:06 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/resindvd/gstpesfilter.c:
-	  resindvd: silence unused-but-set warning
-	  ../ext/resindvd/gstpesfilter.c:117:11: error: variable 'STD_buffer_size_bound' set but not used -Werror,-Wunused-but-set-variable
-	  guint16 STD_buffer_size_bound;
-	  ^
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2046>
+	* sys/va/gstjpegdecoder.h:
+	  vajpegdec: Hide gst_jpeg_decoder_get_type() symbol
+	  It's not a public symbol yet
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4113>
 
-2022-03-28 18:23:20 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-05 20:01:44 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsmux/gstbasetsmux.c:
-	  mpegts: don't shadow res variable
-	  Fixes unused-but-set warning:
-	  ../gst/mpegtsmux/gstbasetsmux.c:2115:43: error: variable 'res' set but not used -Werror,-Wunused-but-set-variable
-	  gboolean all_headers, done = FALSE, res = FALSE;
-	  ^
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2046>
+	* sys/va/gstvabaseenc.h:
+	  vabaseenc: Fix return type of encode_frame vfunc
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4113>
 
-2022-03-28 18:12:43 +1100  Matthew Waters <matthew@centricular.com>
+2023-03-05 19:53:37 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/mpegts/gst-dvb-section.c:
-	  mpeg: fix unused-but-set warning
-	  ../gst-libs/gst/mpegts/gst-dvb-section.c:206:9: error: variable 'i' set but not used -Werror,-Wunused-but-set-variable
-	  guint i = 0, allocated_events = 12;
-	  ^
-	  ../gst-libs/gst/mpegts/gst-dvb-section.c:365:9: error: variable 'i' set but not used -Werror,-Wunused-but-set-variable
-	  guint i = 0, allocated_streams = 12;
-	  ^
-	  ../gst-libs/gst/mpegts/gst-dvb-section.c:543:9: error: variable 'i' set but not used -Werror,-Wunused-but-set-variable
-	  guint i = 0, allocated_streams = 12;
-	  ^
-	  ../gst-libs/gst/mpegts/gst-dvb-section.c:885:9: error: variable 'i' set but not used -Werror,-Wunused-but-set-variable
-	  guint i = 0, allocated_services = 8;
-	  ^
-	  ../gst-libs/gst/mpegts/gst-dvb-section.c:1316:9: error: variable 'i' set but not used -Werror,-Wunused-but-set-variable
-	  guint i = 0, allocated_services = 8;
-	  ^
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2046>
+	* sys/va/gstvaav1dec.c:
+	* sys/va/gstvafilter.c:
+	* sys/va/gstvah264enc.c:
+	* sys/va/gstvah265enc.c:
+	* sys/va/gstvavp8dec.c:
+	* sys/va/gstvavpp.c:
+	  va: Fix struct empty initialization syntax
+	  "struct Foo bar; bar = {};" is not a valid syntax. Also remove use
+	  of __typeof__ which is GCC specific
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4113>
 
-2022-03-28 10:10:45 +0300  Sebastian Dröge <sebastian@centricular.com>
+2023-03-01 03:33:24 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	  video-format: Move NV12_8L128 into the correct position in GST_VIDEO_FORMATS_ALL
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2045>
+	* gst/codectimestamper/gsth265timestamper.c:
+	  h265timestamper: Use gst_h265_parser_parse_decoder_config_record()
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2759>
 
-2022-03-28 15:56:22 +1100  Matthew Waters <matthew@centricular.com>
+2022-07-15 01:53:36 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegdemux/gstpesfilter.c:
-	  mpegdemux: silence unused-but-set werror
-	  ../gst/mpegdemux/gstpesfilter.c:117:11: error: variable 'STD_buffer_size_bound' set but not used -Werror,-Wunused-but-set-variable
-	  guint16 STD_buffer_size_bound;
-	  ^
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2044>
+	* sys/qsv/gstqsvh265dec.cpp:
+	  qsvh265dec: Use gst_h265_parser_parse_decoder_config_record()
+	  Stop duplicating code and use newly added parsing method instead
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2759>
 
-2022-03-25 14:25:02 +1100  Andrew Pritchard <andrew@vivi.io>
+2022-08-19 04:25:15 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/androidmedia/jni/gstamcsurfacetexture-jni.c:
-	  Fix GstAmcSurfaceTexture segfault Check that `self` and `self->callback` are defined. `self` can be set to `NULL` in `remove_listener`, and `self->callback` can be set to `NULL` inside `gst_amc_surface_texture_jni_set_on_frame_available_callback`. This can cause a segfault since the Java object can outlive the C object, and call the callback after `remove_listener` is called.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2024>
+	* gst-libs/gst/codecs/gsth265decoder.c:
+	  h265decoder: Use gst_h265_parser_parse_decoder_config_record()
+	  Stop duplicating code and use newly added parsing method instead
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2759>
 
-2022-03-23 17:31:37 +1100  Matthew Waters <matthew@centricular.com>
+2022-07-15 01:23:43 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/closedcaption/gstccconverter.c:
-	* ext/closedcaption/gstccconverter.h:
-	* tests/check/elements/ccconverter.c:
-	  ccconverter: ensure correct ordering of cea608 across output buffers
-	  e.g. if a 60fps output is configured, we can only produce a single field
-	  of cea608 that must alternate between field 1 and field 2.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2019>
+	* gst/videoparsers/gsth265parse.c:
+	  h265parse: Use gst_h265_parser_parse_decoder_config_record()
+	  Stop duplicating code and use newly added parsing method instead
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2759>
 
-2022-03-23 15:13:10 +1100  Matthew Waters <matthew@centricular.com>
+2022-07-15 00:13:45 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/closedcaption/gstccconverter.c:
-	* tests/check/elements/ccconverter.c:
-	  ccconverter: ignore padding cea608 data even if marked as 'valid'
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2019>
+	* gst-libs/gst/codecparsers/gsth265parser.c:
+	* gst-libs/gst/codecparsers/gsth265parser.h:
+	* tests/check/libs/h265parser.c:
+	  h265parser: Add an API for HEVCDecoderConfigurationRecord parsing
+	  Add a method for HEVC configuration data parsing
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2759>
 
-2022-03-23 10:36:28 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-03-06 11:22:45 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* sys/v4l2codecs/gstv4l2decoder.c:
-	  v4l2codecs: Detect missing M2M_HOLD_CAPTURE_BUF
-	  Produce an error if we try to use the feature of holding capture buffer
-	  but it is not supported by the driver. Ingoring this can lead to stalls
-	  as the driver will run-out of capture buffer to decode into. This
-	  affects slice decoders but also split-field interlaced decoding.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2009>
+	* sys/msdk/gstmsdkenc.c:
+	  msdkenc: Fix scale ratio for frame duration
+	  For the calculation of frame duration, the numerator
+	  should be FrameRateExtD, and the denominator should be
+	  FrameRateExtN.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4119>
 
-2022-03-23 09:11:35 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-03-05 22:03:59 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codech264dec.c:
-	  v4l2codecs: h264: Set other field poc if available
-	  Whenever the other field POC is available, pass it back to the
-	  driver. This should not be strictly required, but it makes things
-	  easier to debug and more forgiven.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2009>
+	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
+	  d3d11memory: Remove GstPoll from GstD3D11PoolAllocator
+	  GstBufferPool implementation was referenced for this GstD3D11PoolAllocator,
+	  for example GstAtomicQueue, various atomic operations, and GstPoll ones.
+	  However, such combination seems to be almost pointless
+	  since gst_poll_{read,write}_control() takes mutex and also
+	  GstPoll uses Win32 event handle internally.
+	  Use simple SRWLOCK and CONDITION_VARIABLE instead, and don't make things
+	  complicated/inefficient.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2887>
 
-2021-12-21 10:59:37 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-02-23 14:14:57 +0100  Piotr Brzeziński <piotr@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codech264dec.c:
-	* sys/v4l2codecs/gstv4l2decoder.c:
-	* sys/v4l2codecs/gstv4l2decoder.h:
-	  v4l2codecs: Trace request by it FD
-	  This helps when crossing the debug logs with the kernel logs.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2009>
+	* sys/applemedia/meson.build:
+	* sys/applemedia/vtdec.c:
+	* sys/applemedia/vtdec.h:
+	  vtdec: Correctly retrieve reorder queue length from SPS
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4057>
 
-2021-12-21 10:55:58 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-03-03 00:24:32 +0100  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codech264dec.c:
-	  v4l2codecs: h264: Fix dpb entry flag FLAG_FIELD
-	  The logic to guess back this value was broken. Use the value
-	  now saved into the picture instead. This was tested using
-	  LibreELEC patched 5.15 kernel, and fixed the interlaced decode
-	  issues.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2009>
+	* ext/closedcaption/gstcea608mux.c:
+	  cea608mux: don't consume input buffers too early
+	  CCBuffer has no notion of time, we need to push caption pairs in
+	  it when it is ready for consumption and no earlier.
+	  Also perform comparisons with our output running time, not the raw
+	  output PTS.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4103>
 
-2021-12-21 10:52:32 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-03-02 17:23:44 +0100  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	* gst-libs/gst/codecs/gsth264picture.h:
-	  codecs: h264: Save the field_pic_flag
-	  This flag is set when the stream is interlaced and the specific
-	  slice is made of single parity fields rather the paired at the
-	  macroblock layer. This is rarely needed in late decoding process
-	  but the Rockchip RKVDEC HW interface requires it, hence needs to
-	  be passed through V4L2 Stateless interface.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2009>
+	* ext/closedcaption/gstcccombiner.c:
+	  cccombiner: fix s334-1a in place conversion
+	  The code wants to prepend one byte to every byte pair. It correctly did
+	  so by working backwards pair-wise, but then didn't work backwards
+	  instead of each individual pair / future triplet, overwriting
+	  information before attempting to read it.
+	  The code also failed to update the len pointer after prepending.
+	  This fixes both issues.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4100>
 
-2022-03-25 13:26:52 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+2023-03-02 14:54:45 -0300  Thibault Saunier <tsaunier@igalia.com>
 
-	* tests/examples/d3d11/d3d11device.cpp:
-	  d3d11: Fix example build error
-	  ```
-	  ../subprojects/gst-plugins-bad/tests/examples/d3d11/d3d11device.cpp:129:50: error: invalid conversion from ‘int’ to ‘DXGI_FORMAT’ -fpermissive
-	  129 |     D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc = { 0, };
-	  ```
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2029>
+	* ext/qroverlay/gstbaseqroverlay.c:
+	* ext/qroverlay/gstqroverlayplugin.c:
+	  qroverlay: Fix documentation
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4102>
 
-2022-03-18 16:59:32 +0000  Thibault Saunier <tsaunier@igalia.com>
+2023-03-01 16:46:19 -0500  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* ext/directfb/dfbvideosink.c:
-	* ext/opencv/gsthanddetect.cpp:
-	* ext/vulkan/vksink.c:
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3dvideosink/d3dhelpers.c:
-	* tests/check/pipelines/ipcpipeline.c:
-	  navigation: Add support for key Modifiers in all relevant events
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2010>
+	* ext/srt/gstsrtobject.c:
+	* ext/srt/gstsrtobject.h:
+	  srt: Use g_cancellable_get_fd for poll cancellation
+	  Removing sockets from the epoll for cancellation is unreliable and might
+	  not be thread-safe. Rather, have SRT watch a FD from the cancellable if
+	  available. Keep the cancellable cancelled while we're not open.
+	  Use the regular single-socket `sock` and `poll_id` fields for the
+	  listening thread instead of duplicating them.
+	  Before polling we need to check the socket state. SRT closes broken
+	  sockets by itself and when the epoll contains our cancellation FD it can
+	  no longer be empty, which was an error before.
+	  Treat more failures in the read and write operations as an opportunity
+	  to try a reconnect.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4087>
 
-2022-03-24 21:39:30 +0800  He Junyan <junyan.he@intel.com>
+2023-03-01 16:00:39 -0500  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* sys/va/gstvah265dec.c:
-	  va: h265dec: Fix a crash because of missing reference frame.
-	  Some problematic H265 stream may miss the reference frame in the DPB,
-	  and get some message like: "No short term reference picture for xxx".
-	  So there may be empty entries in ref_pic_list0/1 when passing to
-	  decode_slice() function of sub class. We need to check the NULL pointer.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2018>
-
-2022-03-24 15:19:27 +0800  Chun-wei Fan <fanchunwei@src.gnome.org>
-
-	* ext/openexr/meson.build:
-	  openexr: Specify modules when finding OpenEXR.
-	  Specify modules to look for OpenEXR when CMake is used, as we may have
-	  CMake config files instead of pkg-config files that result from building
-	  OpenEXR, which may be built with CMake which is typically the case on Visual
-	  Studio builds.
-	  In this case, Meson does seem to find the 'OpenEXR' package with CMake
-	  after trying pkg-config, but does not consider it enough without the
-	  'modules:' argument.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2014>
+	* ext/srt/gstsrtobject.c:
+	* ext/srt/gstsrtobject.h:
+	* ext/srt/gstsrtsink.c:
+	* ext/srt/gstsrtsink.h:
+	* ext/srt/gstsrtsrc.c:
+	* ext/srt/gstsrtsrc.h:
+	  srt: Move cancellable into srtobject
+	  Should produce no difference in behavior.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4087>
 
-2022-03-22 00:30:28 +0900  Sangchul Lee <sc11.lee@samsung.com>
+2023-02-28 18:55:25 -0500  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Update documentation of 'get-stats' action signal
-	  Some stats fields are updated according to the current implementation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2005>
+	* ext/srt/gstsrtobject.h:
+	  srt: Set default poll-timeout to one second
+	  Removing a socket from the poll is not a guaranteed unlock. If we let
+	  the poll continue indefinitely, then e.g. an unfed srtsrc can deadlock
+	  when we try to shut it down.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4087>
 
-2022-03-25 00:27:42 +0100  Mathieu Duponchelle <mathieu@centricular.com>
+2023-02-28 18:54:27 -0500  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/webrtctransceiver.c:
-	* ext/webrtc/webrtctransceiver.h:
-	* tests/check/elements/webrtcbin.c:
-	  Revert "webrtcbin: fix msid line and allow customization"
-	  This reverts commit 3cad3455377d5a22faa138d9df840257059776c8.
-	  That commit was breaking the association between an audio and
-	  a video track in the standard case.
-	  In practice, to support carrying separate MediaStream, we are
-	  going a way to map what MediaStreamTrack belong to what MediaStream,
-	  but that will require some thinking about the API.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2023>
+	* ext/srt/gstsrtobject.c:
+	  srt: Consider EPOLLEMPTY an error when not unlocking
+	  Seems that SRT can remove the socket from the poll by itself when the
+	  connection gets closed. Consider this an error condition and ensure we
+	  only "abort successfully" when we're actually trying to unlock.
+	  Needs more investigation but this is enough to prevent the element from
+	  getting stuck not reporting an error.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4087>
 
-2022-03-24 19:55:48 +0200  Vivia Nikolaidou <vivia@ahiru.eu>
+2023-02-15 13:10:39 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* gst/mpegtsdemux/mpegtspacketizer.c:
-	* gst/mpegtsdemux/mpegtspacketizer.h:
-	* gst/mpegtsdemux/tsdemux.c:
-	  tsdemux: Don't check SCTE events for being too far from the PCR
-	  Otherwise it happens that SCTE events can only be scheduled up to 15
-	  seconds since the last seen PCR, which is a useless restriction.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2021>
+	* gst/videoparsers/gsth265parse.c:
+	  h265parse: Fix to check returned value
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3968>
 
-2022-03-21 23:03:36 +0100  Mathieu Duponchelle <mathieu@centricular.com>
+2023-02-20 10:17:53 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/webrtctransceiver.c:
-	* ext/webrtc/webrtctransceiver.h:
-	* tests/check/elements/webrtcbin.c:
-	  webrtcbin: fix msid line and allow customization
-	  From https://datatracker.ietf.org/doc/html/draft-ietf-mmusic-msid-16:
-	  > Multiple media descriptions with the same value for msid-id and
-	  > msid-appdata are not permitted.
-	  Our previous implementation of simply using the CNAME as the msid
-	  identifier and the name of the transceiver as the msid appdata was
-	  misguided and incorrect, and created issues when bundling multiple
-	  video streams together: the ontrack event was emitted with the same
-	  streams for the two bundled medias, at least in Firefox.
-	  Instead, use the transceiver name as the identifier, and expose
-	  a msid-appdata property on transceivers to allow for further
-	  customization by the application. When the property is not set,
-	  msid-appdata can be left empty as it is specified as optional.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2003>
+	* sys/msdk/gstmsdkvpp.c:
+	  msdkvpp: correct the fixated caps for src pad
+	  In src pad, fixate othercaps instead of the NULL result caps
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3999>
 
-2022-01-05 10:15:34 -0300  Thibault Saunier <tsaunier@igalia.com>
+2023-02-27 14:09:12 +0100  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* ext/wpe/gstwpesrcbin.cpp:
-	  wpe: Mark first audio buffer as discont
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1492>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/closedcaption/gstcea608mux.c:
+	* ext/closedcaption/gstcea608mux.h:
+	* ext/closedcaption/gstclosedcaption.c:
+	* ext/closedcaption/meson.build:
+	  closedcaption: implement cea608muxer element
+	  Wrapper aggregator around the CCBuffer internal utility, this
+	  version only supports aggregating CC1 and CC3 608 streams together into
+	  the s334-1a format.
+	  The element exposes CC1 and CC3 request pads.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4084>
 
-2022-01-04 15:49:35 -0300  Thibault Saunier <tsaunier@igalia.com>
+2023-03-01 06:36:15 +1100  Jan Schmidt <jan@centricular.com>
 
-	* ext/wpe/gstwpe.h:
-	* ext/wpe/gstwpesrcbin.cpp:
-	* ext/wpe/gstwpevideosrc.cpp:
-	* ext/wpe/meson.build:
-	* tests/validate/meson.build:
-	* tests/validate/wpe/load_bytes_first.validatetest:
-	  wpe: Use `about:blank` as default URL to support only using load-bytes
-	  WebKit is not going to render anything until a URI is set, leading to a
-	  WPE posting a `WPE View did not render a buffer` error message. To avoid
-	  requiring the user to know it if they only want to use
-	  `wpesrc::load-bytes` we can just use `about:blank` as default and
-	  everything will work as users would expect.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1492>
+	* sys/applemedia/avfvideosrc.m:
+	  avfvideosrc: Fix description and trailing whitespace
+	  Minor fix to mention that the element is also useful on MacOS,
+	  and remove some trailing whitespace
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4083>
 
-2022-01-27 23:54:34 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-01 06:32:19 +1100  Jan Schmidt <jan@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* gst/debugutils/gstfakeaudiosink.c:
-	* gst/debugutils/gstfakeaudiosink.h:
-	* gst/debugutils/gstfakevideosink.c:
-	* gst/debugutils/gstfakevideosink.h:
-	  fakevideosink,fakeaudiosink: Proxy handoff and preroll-handoff signals
-	  Proxy signals for application to be able to consume them
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1585>
+	* sys/applemedia/avfvideosrc.m:
+	  avfvideosrc: Don't wait on main thread for permissions request
+	  Recursively invoking the NSMainLoop can cause crashes in
+	  applications that don't expect it. Instead of waiting for
+	  permission to be granted, move the wait later - until we
+	  actually need device permissions when starting the capture
+	  session. That moves the wait into the streaming thread
+	  instead of the application thread that's setting the pipeline
+	  state to READY.
+	  Instead of a manual state change implementation to open
+	  and close the device, use the basesrc start/stop methods that
+	  are intended for the purpose.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4083>
 
-2021-12-24 19:49:34 +0900  Seungha Yang <seungha@centricular.com>
+2023-03-02 02:51:21 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/aom/gstav1enc.c:
-	  aom: av1enc: Specify Temporal Unit alignment
-	  Encoded bitstream consists of leading Temporal delimiter OBU
-	  with frame, that's Temporal Unit alignment.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1471>
+	* sys/d3d11/gstd3d11dxgicapture.cpp:
+	  d3d11screencapturesrc: Use keyed mutex instead of fence
+	  D3D11 runtime might not support ID3D11Fence, and if so GstD3D11Fence
+	  abstraction will use ID3D11Query instead. However, since the ID3D11Query
+	  requires busy waiting, keyed mutex is better approach.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4094>
 
-2022-03-24 02:52:45 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-28 23:35:59 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh265enc.cpp:
-	* sys/qsv/gstqsvvp9enc.cpp:
-	  qsvencoder: Clear caps after debug print
-	  Otherwise debug function will print (null) for alread cleared pointer
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2012>
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	  d3d11testsrc: Use keyed mutex for rendering patterns
+	  D2D operations would not flush D3D commands. Use keyed mutex
+	  to synchronize between them. Note that previous code was wrong
+	  (Flush should be called inside of BeginDraw/EndDraw calls)
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4081>
 
-2022-03-24 02:43:43 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-28 23:50:41 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/qsv/gstqsvh264enc.cpp:
-	  qsvh264enc: Fix profile and level setting in codec data
-	  The profile field in SPS is located after header byte
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2012>
-
-2022-03-16 04:58:16 +0900  Seungha Yang <seungha@centricular.com>
-
-	  nvcodec: Add new Direct3D11/CUDA mode encoder implementation
-	  Adding new encoder elements nvd3d11{h264,h265}enc for Direct3D11
-	  input support and re-written nvcuda{h264,h265}enc elements.
-	  Newly writeen elements have some differences compared with old
-	  nv{h264,h265}enc including non-backward compatible changes.
-	  * RGBA is not a supported input format any more:
-	  New elements will support only YUV formats to avoid implicit conversion
-	  done by hardware. Ideally it should be done by upstream element
-	  in order to have more control on it. Moreover, RGBA support can cause
-	  redundant RGBA -> YUV conversion if multiple encoders are
-	  used for the same RGBA input
-	  * Subsampled planar format support is dropped:
-	  I420 and YV12 format are not supported formats for Direct3D11.
-	  Although it's supported in CUDA mode, it's not a hardware friendly
-	  memory layout and it will waste GPU memory since UV planes
-	  will have large padding due to the memory layout requirement of NVENC.
-	  * GL support is dropped: Similar to the RGBA case,
-	  GL support in encoder would be suboptimal if GL input is
-	  used by multiple encoders, because each encoder will copy GL memory
-	  into CUDA memory.
-	  Upstream cudaupload element can be used for GL <-> CUDA
-	  interop instead.
-	  * No more pre-allocation of encoder input surfaces. New implementation
-	  will use input CUDA memory without copy (zero-copy) or
-	  will copy into a NVENC's input buffer struct in case of
-	  system memory input.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1997>
+	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
+	  d3d11memory: Add support for keyed mutex
+	  Non-zero mutex key held by application is not considered for now.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4081>
 
-2022-02-10 10:21:01 +0100  Vivienne Watermeier <vwatermeier@igalia.com>
+2023-02-28 18:48:24 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* ext/wpe/WPEThreadedView.cpp:
-	* ext/wpe/WPEThreadedView.h:
-	* ext/wpe/gstwpevideosrc.cpp:
-	  wpevideosrc: Add touch event support
-	  Dispatches a list of active touch events to the wpe view on each
-	  received TOUCH_FRAME event. Touch inputs currently only move the cursor,
-	  since wpe doesn't seem to support clicking/scrolling or zooming with
-	  touch input.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1633>
-
-2022-02-14 16:08:23 +0100  Vivienne Watermeier <vwatermeier@igalia.com>
-
-	* ext/directfb/dfbvideosink.c:
-	* ext/opencv/gsthanddetect.cpp:
-	* ext/vulkan/vksink.c:
-	* gst/librfb/gstrfbsrc.c:
-	* sys/d3d11/gstd3d11videosink.cpp:
-	* sys/d3dvideosink/d3dhelpers.c:
-	* sys/d3dvideosink/d3dvideosink.c:
-	* sys/directshow/dshowvideosink.cpp:
-	* sys/va/gstvavpp.c:
-	* tests/check/pipelines/ipcpipeline.c:
-	  all: Use new navigation interface and API
-	  Use and implement the new navigation interface in all relevant sink elements,
-	  and use API functions everywhere instead of directy accessing the event structure.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1633>
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: demote and promote log messages level
+	  Before those levels where when implementing the plugin. Now these
+	  levels are for reporting issues from users.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4039>
+
+2023-02-12 22:37:01 +0800  He Junyan <junyan.he@intel.com>
 
-2022-03-22 10:37:59 +0800  Tong Wu <tong1.wu@intel.com>
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: reset parse state when the SOI is not the first marker
+	  There may be garbage or some bits before a SOI comes in some problematic
+	  mjpeg streams. For example, some network error may cause the EOI marker
+	  of the previous frame lost, and when the new frame's SOI comes, we still
+	  use the state of the last frame, which will generate errors.
+	  For this kind of frames without EOI, if that frame already has some data
+	  (the SOS segment is detected), we still push it as a frame with CORRUPTED
+	  flag set. But if not, we just discard all the data before the new SOI.
+	  Co-Authored-By: Víctor Jáquez <vjaquez@igalia.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4039>
+
+2023-02-15 17:16:47 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
 	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkh265enc.c:
-	* sys/msdk/gstmsdkvp9enc.c:
-	  msdkenc: add macro definitions to avoid the gst-inspect error
-	  Since the strings are empty for GST_MSDK_CAPS_MAKE_WITH_DMABUF_FEATURE
-	  and GST_MSDK_CAPS_MAKE_WITH_VA_FEATURE, when excuting
-	  gst-inspect-1.0.exe msdkh265enc, there will be convert static caps error
-	  because of the extra semicolon between two empty strings. Now macro
-	  definitions are added to avoid this issue.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2004>
+	* sys/msdk/gstmsdkenc.h:
+	  msdkenc: Set pts at handle_frame
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3998>
 
-2022-01-26 14:55:51 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-02-21 19:54:12 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkdec.c:
-	  msdkdec: Check width and height of mfxVideoParam before allocation
-	  DecodeHeader must be called to fill the mfxVideoParam before allocation,
-	  and thus the check for width and height in mfxVideoParam is necessary.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1817>
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/nvcodec/gstnvh264dec.h:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvh265dec.h:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/nvcodec/gstnvvp8dec.h:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.h:
+	* sys/nvcodec/plugin.c:
+	  nvcodec: Remove stateful decoders
+	  Use H.264, H.265, VP8, and VP9 stateless decoders unconditionally
+	  and don't register its stateful counterpart
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1768
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1621
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1432
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4015>
+
+2022-01-13 00:45:25 +0100  Mathieu Duponchelle <mathieu@centricular.com>
+
+	* tests/check/elements/mpegtsmux.c:
+	  aggregator: improve parsing in create_new_pad
+	  The previous implementation was a bit primitive, assuming the subclass
+	  had registered a template name starting with sink_ . Instead make
+	  the effort of parsing the actual template name, and use that to generate
+	  the final pad name.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4032>
 
-2022-03-18 16:34:38 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-02-28 15:26:45 +0100  Piotr Brzeziński <piotr@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	  doc: Update cache after NV12_8L128 addition
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1379>
+	* sys/applemedia/vtenc.c:
+	  vtenc: Fix checking for certain CPU variants when running in VMs
+	  These checks were introduced to prevent exposing ARGB64/RGBA64 in the caps
+	  when running on M1 Pro/Max with macOS <13 because of a bug in VideoToolbox.
+	  Unfortunately, the initial buffer size of 15 is too short when running
+	  in a VM - the CPU brand string there looks like "Apple M1 Pro (Virtual)",
+	  which due to its length causes sysctlbyname to return -1, resulting in
+	  broken formats still showing up in the caps.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4080>
 
-2022-03-21 13:01:03 +0100  Benjamin Gaignard <benjamin.gaignard@collabora.com>
+2023-02-09 11:16:19 +0100  Evgeny Pavlov <lucenticus@gmail.com>
 
-	* sys/v4l2codecs/gstv4l2decoder.c:
-	  v4l2codecs: Fix memory leak
-	  Free pending_requests array when releasing decoder to avoid memory leak
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2000>
+	* sys/amfcodec/gstamfav1enc.cpp:
+	* sys/amfcodec/gstamfencoder.cpp:
+	* sys/amfcodec/gstamfencoder.h:
+	* sys/amfcodec/gstamfh264enc.cpp:
+	* sys/amfcodec/gstamfh265enc.cpp:
+	  amfcodec: Initial support of preanalysis and preencoding for AMF encoders
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3847>
 
-2022-02-02 10:05:16 -0300  Daniel Almeida <daniel.almeida@collabora.com>
+2023-01-22 19:23:18 +0100  Jonas Danielsson <jonas.danielsson@spiideo.com>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	* gst-libs/gst/codecs/gstav1decoder.h:
-	* gst-libs/gst/codecs/gstvp9decoder.c:
-	* sys/d3d11/gstd3d11av1dec.cpp:
-	* sys/va/gstvaav1dec.c:
-	  av1decoder: Sync duplicate_picture with VP9 one
-	  Pass the current frame to the duplicate_picture callback. This makes it easier
-	  to set the frame's output_buffer if we already have one available. Also
-	  documented that unlike VP9, it is not optional to implement this as the
-	  picture will populate the DPB if it is a key-frame. To ensure this, remove the
-	  default implementation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1992>
+	* ext/wpe/WPEThreadedView.cpp:
+	* ext/wpe/wpe-extension/gstwpeextension.c:
+	  wpe: Post console messages as element messages
+	  Fixes #1731
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3769>
 
-2022-03-18 15:59:21 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-02-21 22:26:37 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/codecs/gstvp9decoder.c:
-	  vp9decoder: Copy system_frame_number in duplicate_picture
-	  Just like AV1, copy the system_frame_number from the original picture to make
-	  it clear they reference the same data.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1992>
+	* sys/amfcodec/gstamfencoder.cpp:
+	* sys/d3d11/gstd3d11screencapturedevice.cpp:
+	* sys/mediafoundation/gstmfutils.cpp:
+	* sys/wic/gstwicutils.cpp:
+	  bad: Update indent
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4023>
 
-2022-03-09 16:35:56 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-02-25 22:40:19 +0000  amindfv <amindfv@mailbox.org>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	  cdoecs: av1: Copy system_frame_number in duplicate_picture
-	  The system_frame_number is notably used by V4L2 decoder as a unique
-	  indentifier for the frame that was decoded. This value is used to tell driver
-	  which frame to reference, as V4L2 does not have an efficient mechanism to
-	  otherwise pass back the frames.
-	  For this reason, and because it is more ligical, copy the original
-	  system_frame_number into the duplicate picture instead of using the current
-	  frame.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1992>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/codecalpha/gstalphacombine.c:
+	  alphacombine: add support for I420_10LE
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4071>
 
-2022-03-21 22:03:53 +0900  Seungha Yang <seungha@centricular.com>
+2022-09-24 17:03:22 +0100  Philippe Normand <philn@igalia.com>
 
-	* sys/va/meson.build:
-	  meson: va: Define GST_USE_UNSTABLE_API
-	  Remove extra_c_args which is not defined in this meson file at all,
-	  and define GST_USE_UNSTABLE_API to avoid build warnings
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1999>
+	* ext/wpe/WPEThreadedView.cpp:
+	* ext/wpe/WPEThreadedView.h:
+	  wpe: Add a basic WebProcess crash handler
+	  For now an error is emitted. Additional notification could be sent to the
+	  application as well, if needed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3077>
 
-2022-03-16 13:17:21 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2022-09-24 16:59:47 +0100  Philippe Normand <philn@igalia.com>
 
-	* gst-libs/gst/codecparsers/gstav1parser.c:
-	* gst-libs/gst/codecparsers/gstav1parser.h:
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	  codecs: av1: Fix state when we show existing keyframe
-	  Showing existing keyframe have special meaning in AV1. All the references
-	  frame will be refreshed with the original keyframe information. The refresh
-	  process (7.20) is implemented by saving data from the frame_header into the
-	  state. To fix this special case, load all the relevant information into the
-	  frame_header.
-	  As there is nothing happening in between this and the loading of the key-frame
-	  into the state, this patch also remove the separate API function, using it
-	  internally instead.
-	  Fixes #1090
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1971>
+	* ext/wpe/WPEThreadedView.cpp:
+	  wpe: Fix typo in estimate-load-progress signal callback name
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3077>
 
-2022-03-18 13:04:59 +0100  Jakub Adam <jakub.adam@collabora.com>
+2022-08-23 14:20:35 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	  d3d11: Fix some typos
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1985>
+	* sys/msdk/gstmsdkdec.c:
+	  msdkdec: Check available surfaces when all pre-allocated surfaces are in use
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3439>
 
-2022-03-18 13:42:27 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+2022-08-23 11:47:02 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* meson.build:
-	  meson: Bump all meson requirements to 0.60
-	  Lots of new warnings ever since
-	  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1934
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1977>
-
-2022-03-18 13:37:30 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
-
-	* ext/openexr/gstopenexrdec.cpp:
-	  openexr: Fix some warnings
-	  ```
-	  ../subprojects/gst-plugins-bad/ext/openexr/gstopenexrdec.cpp:46:24: warning: ‘Imf_3_1::Int64’ is deprecated: use uint64_t -Wdeprecated-declarations
-	  46 |   virtual Int64 tellg ();
-	  |                        ^
-	  In file included from ../subprojects/gst-plugins-bad/ext/openexr/gstopenexrdec.cpp:32:
-	  /usr/include/OpenEXR/ImfInt64.h:23:32: note: declared here
-	  23 | typedef IMATH_NAMESPACE::Int64 Int64;
-	  |                                ^~~~~
-	  ../subprojects/gst-plugins-bad/ext/openexr/gstopenexrdec.cpp:47:32: warning: ‘Imf_3_1::Int64’ is deprecated: use uint64_t -Wdeprecated-declarations
-	  47 |   virtual void seekg (Int64 pos);
-	  |                                ^
-	  In file included from ../subprojects/gst-plugins-bad/ext/openexr/gstopenexrdec.cpp:32:
-	  /usr/include/OpenEXR/ImfInt64.h:23:32: note: declared here
-	  23 | typedef IMATH_NAMESPACE::Int64 Int64;
-	  |                                ^~~~~
-	  ../subprojects/gst-plugins-bad/ext/openexr/gstopenexrdec.cpp:67:26: warning: ‘Imf_3_1::Int64’ is deprecated: use uint64_t -Wdeprecated-declarations
-	  67 | Int64 MemIStream::tellg ()
-	  |                          ^
-	  In file included from ../subprojects/gst-plugins-bad/ext/openexr/gstopenexrdec.cpp:32:
-	  /usr/include/OpenEXR/ImfInt64.h:23:32: note: declared here
-	  23 | typedef IMATH_NAMESPACE::Int64 Int64;
-	  |                                ^~~~~
-	  ../subprojects/gst-plugins-bad/ext/openexr/gstopenexrdec.cpp:73:29: warning: ‘Imf_3_1::Int64’ is deprecated: use uint64_t -Wdeprecated-declarations
-	  73 | MemIStream::seekg (Int64 pos)
-	  |                             ^
-	  In file included from ../subprojects/gst-plugins-bad/ext/openexr/gstopenexrdec.cpp:32:
-	  /usr/include/OpenEXR/ImfInt64.h:23:32: note: declared here
-	  23 | typedef IMATH_NAMESPACE::Int64 Int64;
-	  |                                ^~~~~
-	  ```
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1977>
+	* sys/msdk/gstmsdkallocator.h:
+	* sys/msdk/gstmsdkallocator_libva.c:
+	* sys/msdk/gstmsdkcontext.c:
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkdec.h:
+	  msdkdec: Apply the modified memory allocation logic
+	  We did several things to enable the new memory logic in msdkdec:
+	  (1) We always use video memory for decoder in linux path;
+	  (2) We give negotiated pool to alloc_pool stored in GstMsdkContext which
+	  will be used in callback mfxFrameAllocator:Alloc to alloc surfaces as
+	  MediaSDK needs, and this pool is also available for decoder itself;
+	  (3) We modify decide_allocation process, that is we make pool negotiaion
+	  before gst_msdk_init_decoder to ensure the pool is decided and ready for
+	  use in mfxFrameAllocator:Alloc callback; then we will consider the case
+	  when we need to do the gpu to cpu copy.
+	  (4) In gst_msdkdec_finish_task, we modify the way for copy following the
+	  logic in (3).
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3439>
 
-2022-03-18 09:48:46 +0800  He Junyan <junyan.he@intel.com>
+2022-08-23 11:25:15 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* gst-libs/gst/codecparsers/gstav1parser.h:
-	  codecparsers: av1parser: Fix a typo in FilmGrainParams comment.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1974>
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkdec.h:
+	  msdkdec: Add a function to create va pool
+	  Add a pool creation function name as 2 for later use which will create
+	  va pool for video memory in linux and keep system pool for windows.
+	  This gst_msdkdec_create_buffer_pool2 will replace gst_msdkdec_create_buffer_pool
+	  when all the memory allocation modifications are ready in the commits after.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3439>
 
-2022-03-10 17:37:26 +0100  Jakub Adam <jakub.adam@collabora.com>
+2022-08-23 10:48:50 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* sys/d3d11/gstd3d11screencapture.cpp:
-	* sys/d3d11/gstd3d11screencapture.h:
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	  d3d11screencapturesrc: Allow capturing screen sub-area
-	  Adds crop-x, crop-y, crop-width, crop-height properties specifying the
-	  screen area to capture.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1932>
+	* sys/msdk/gstmsdkallocator_libva.c:
+	  msdkallocator_libva: Rewrite gst_msdk_frame_alloc
+	  Rewrite gst_msdk_frame_alloc and name it as xxx_2 before applying it.
+	  It uses negotiated bufferpool stored in GstMsdkContext to allocate buffers
+	  in the callback MfxFrameAllocator:Alloc, then extract VASurface from buffer,
+	  wrap it as mfxMemIDs and pass these IDs to MediaSDK/oneVPL.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3439>
 
-2022-03-15 17:01:59 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+2022-08-22 18:33:35 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Warn when offer didn't intersect with transceiver caps
-	  We were silently falling back to creating a recvonly offer if the caps
-	  didn't intersect.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1864>
+	* sys/msdk/gstmsdkallocator.c:
+	* sys/msdk/gstmsdkallocator.h:
+	* sys/msdk/gstmsdkallocator_libva.c:
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkdec.h:
+	  msdkdec: Add a function to directly allocate output GstMsdkSurface
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3439>
 
-2022-03-17 13:36:25 +1100  Matthew Waters <matthew@centricular.com>
+2022-08-22 17:44:35 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* ext/closedcaption/gstccconverter.c:
-	  ccconverter: drop data with a warning if scratch buffers overflow
-	  Instead of asserting which could bring down the entire application.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1972>
+	* sys/msdk/gstmsdkcontext.c:
+	* sys/msdk/gstmsdkcontext.h:
+	  msdk: Add a bufferpool in GstMsdkContext structure
+	  This alloc_pool is the negotiated pool and will be used in
+	  mfxFrameAllocator:Alloc to create surfaces.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3439>
 
-2022-03-11 17:02:55 +0000  Philippe Normand <philn@igalia.com>
+2022-06-08 17:13:47 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* ext/wpe/WPEThreadedView.cpp:
-	  wpe: Reintroduce persistent WebContext
-	  A WebContext leak was introduced in MR
-	  https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2252.
-	  If we wanted one WebContext per WebView we should also unref the
-	  WebKitWebContext when destroying the WebView.
-	  This patch reintroduces the persistent WebContext, initially part of
-	  https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1484.
-	  Fixes #1084
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1933>
+	* sys/msdk/gstmsdkav1dec.c:
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkh264dec.c:
+	* sys/msdk/gstmsdkh265dec.c:
+	* sys/msdk/gstmsdkmjpegdec.c:
+	* sys/msdk/gstmsdkmpeg2dec.c:
+	* sys/msdk/gstmsdkvc1dec.c:
+	* sys/msdk/gstmsdkvp9dec.c:
+	  msdkdec: Enable va caps at srcpad
+	  Set caps with VA memory at src pad with a higher priority, then comes
+	  dmabuf caps.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3439>
 
-2022-03-16 00:05:19 +0100  Mathieu Duponchelle <mathieu@centricular.com>
+2023-02-17 16:20:37 +0000  Philippe Normand <philn@igalia.com>
 
 	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: fix deadlock when setting up FEC encoder
-	  We bind transceivers' fec_percentage property to the FEC encoder
-	  percentage property, and with the binding bidirectional a deadlock
-	  was introduced by the latest changes from !1762:
-	  We take hold of the transceiver's object lock, then add the binding
-	  and set the property to its initial value on the encoder, which causes
-	  set_property to deadlock in the transceiver when the binding kicks in.
-	  Changing the binding type to DEFAULT (source to target) is enough
-	  to address the deadlock and still serves the original intent.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1967>
-
-2022-03-10 19:22:52 +0900  Sangchul Lee <sc11.lee@samsung.com>
+	* gst-libs/gst/webrtc/ice.c:
+	* gst-libs/gst/webrtc/ice.h:
+	* gst-libs/gst/webrtc/nice/nice.c:
+	  webrtcbin: Relay add-ice-candidate errors from Ice implementation to Application
+	  The `add_candidate` vfunc of the GstWebRTCICE interface gained a GstPromise
+	  argument, which is an ABI break. We're not aware of any external user of this
+	  interface yet so we think it's OK.
+	  This change is useful in cases where the application needs to bubble up errors
+	  from the underlying ICE agent, for instance when the agent was given an invalid
+	  ICE candidate.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3960>
+
+2023-02-14 16:25:15 +0000  Philippe Normand <philn@igalia.com>
 
+	* docs/plugins/gst_plugins_cache.json:
 	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: Check data channel transport for notifying 'ice-gathering-state'
-	  Previously, it did not care about data channel's. It is fixed by adding
-	  some conditions.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1957>
+	  webrtcbin: Add add-ice-candidate-full signal
+	  The signal triggers an asynchronous task on the PC thread but in some cases it
+	  can be useful for apps to be notified when the task completed. This method of
+	  the PeerConnection spec also returns a Promise so the interface is now more
+	  coherent with the spec.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3960>
 
-2022-03-14 01:19:53 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-25 22:35:57 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/nvcodec/gstcudamemorycopy.c:
-	* sys/nvcodec/gstcudautils.c:
-	* sys/nvcodec/gstcudautils.h:
-	  nvcodec: Move CUDA <-> GL, D3D11, NVMM copy function to utils
-	  This method can be used in other elements as well.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1945>
+	* sys/d3d11/gstd3d11testsrc.cpp:
+	* sys/d3d11/meson.build:
+	  d3d11testsrc: Add circular, blink and ball patterns
+	  Note that circular and ball patterns will be rendered via
+	  Direct2D (and Direct3D11 interop)
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4070>
 
-2022-03-12 01:12:25 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-24 21:58:00 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/nvcodec/gstnvh265dec.c:
-	  nvh265sldec: Add support for delayed output
-	  Delay 4 frames in case of non-live to improve throughput
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1937>
+	* sys/va/gstjpegdecoder.c:
+	  jpegdecoder: fail early if no input caps have been provided
+	  The jpegdecoder class does not implement the ->parse() virtual function,
+	  and we always need to add the jpegparse element before it. So we should
+	  set_needs_format of the decoder to TRUE, then if no parse before it, it
+	  can fail with a "not-negotiated" error early, rather than go on and
+	  generate unexpected error.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1829
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4064>
 
-2022-03-12 21:54:45 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-24 21:49:27 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	* gst-libs/gst/codecs/gsth265decoder.h:
-	  h265decoder: Add support for delayed output
-	  Functionally identical to the other decoder baseclasses.
-	  Delayed output can improve throughput depending on decoding APIs.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1937>
+	* gst-libs/gst/codecs/gstav1decoder.c:
+	  av1decoder: fail early if no input caps have been provided
+	  The av1decoder class does not implement the ->parse() virtual function,
+	  and we always need to add the av1parse element before it. So we should
+	  set_needs_format of the decoder to TRUE, then if no parse before it, it
+	  can fail with a "not-negotiated" error early, rather than go on and
+	  generate unexpected error.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4064>
 
-2022-03-12 00:53:04 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-24 21:38:48 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/codecs/gsth265decoder.h:
-	  h265decoder: Update documentation
-	  Sync up with other baseclasses
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1937>
+	* gst-libs/gst/codecs/gstvp9decoder.c:
+	  vp9decoder: fail early if no input caps have been provided
+	  The vp9decoder class does not implement the ->parse() virtual function,
+	  and we always need to add the vp9parse element before it. So we should
+	  set_needs_format of the decoder to TRUE, then if no parse before it, it
+	  can fail with a "not-negotiated" error early, rather than go on and
+	  generate unexpected error.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4064>
 
-2022-03-12 04:45:22 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-24 21:27:27 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	* gst-libs/gst/codecs/gsth265picture.h:
-	  h265decoder: Drain decoder on new_sequence()
-	  Holding previously decoded but not outputted pictures even after
-	  new_sequence is not a safe approach in various aspect.
-	  However, we cannot drain out DPB on new_sequence() unconditionally,
-	  because there is a case where decoder should drop decoded pictures
-	  if NoOutputOfPriorPicsFlag is set.
-	  To detect NoOutputOfPriorPicsFlag before the new_sequence() call,
-	  this patch splits decoding process into two path, one for nal unit parsing
-	  in order to detect NoOutputOfPriorPicsFlag and then each nal unit
-	  will be decoded.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1937>
+	* gst-libs/gst/codecs/gstvp8decoder.c:
+	  vp8decoder: fail early if no input caps have been provided
+	  The vp8decoder class does not implement the ->parse() virtual function,
+	  it can only accepts frame aligned data. If some element such as filesrc
+	  feed it with unaligned data, the behaviour is undecided. So we should
+	  set_needs_format of the decoder to TRUE, then it can fail with a
+	  "not-negotiated" error early, rather than go on and generate unexpected
+	  error.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4064>
+
+2023-02-24 21:12:40 +0800  He Junyan <junyan.he@intel.com>
+
+	* gst-libs/gst/codecs/gstmpeg2decoder.c:
+	  mpeg2decoder: fail early if no input caps have been provided
+	  The mpeg2decoder class does not implement the ->parse() virtual function,
+	  and we always need to add the mpegvideoparse element before it. So we should
+	  set_needs_format of the decoder to TRUE, then if no parse before it, it
+	  can fail with a "not-negotiated" error early, rather than go on and
+	  generate unexpected error.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4064>
 
-2022-03-12 03:15:48 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-24 21:09:31 +0800  He Junyan <junyan.he@intel.com>
+
+	* gst-libs/gst/codecs/gsth264decoder.c:
+	  h264decoder: fail early if no input caps have been provided
+	  The h264decoder class does not implement the ->parse() virtual function,
+	  and we always need to add the h264parse element before it. So we should
+	  set_needs_format of the decoder to TRUE, then if no parse before it, it
+	  can fail with a "not-negotiated" error early, rather than go on and
+	  generate unexpected error.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4064>
+
+2023-02-24 20:15:20 +0800  He Junyan <junyan.he@intel.com>
 
 	* gst-libs/gst/codecs/gsth265decoder.c:
-	* gst-libs/gst/codecs/gsth265picture.c:
-	* gst-libs/gst/codecs/gsth265picture.h:
-	  h265decoder: Remove unused pts variable
-	  We can know timestamp from associated GstVideoCodecFrame
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1937>
+	  h265decoder: fail early if no input caps have been provided
+	  The h265decoder class does not implement the ->parse() virtual function,
+	  and we always need to add the h265parse element before it. So we should
+	  set_needs_format of the decoder to TRUE, then if no parse before it, it
+	  can fail with a "not-negotiated" error early, rather than go on and
+	  generate unexpected error.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4064>
 
-2022-03-13 00:17:48 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-21 19:47:42 +0100  Mathieu Duponchelle <mathieu@centricular.com>
 
-	* sys/nvcodec/gstnvbaseenc.c:
-	  nvenc: Fix deadlock because of too strict buffer pool size
-	  The pool size might need to be larger than encoding surface pool size.
-	  Also, because we always copy input frame into internal CUDA memory,
-	  there's no reason to restrict max size of buffer pool.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1939>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/closedcaption/gstccconverter.c:
+	* ext/closedcaption/gstccconverter.h:
+	* tests/check/elements/ccconverter.c:
+	  ccconverter: add support for advertising / selecting field
+	  Raw 608 caps can now contain a "field" field. On the input side it
+	  signifies that the input raw 608 is attached to either field 0 or 1,
+	  on the output side it allows selecting whether to extract the raw 608
+	  data for field 0 or 1 for field-aware formats.
+	  In addition, it is also allowed to use ccconverter to "convert" 608
+	  field 0 to 608 field 1 (and conversely), this is passthrough as the
+	  change only needs to happen in the caps.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4031>
 
-2022-03-12 10:31:13 +0800  He Junyan <junyan.he@intel.com>
+2023-01-27 12:45:10 +0100  Robert Rosengren <robertr@axis.com>
 
-	* sys/va/gstvah264enc.c:
-	  va: Fix a regression because of "Invert video codec frame dependency".
-	  1. Always set the according GstVaH264EncFrame pointer when GstVideoCodecFrame
-	  pointer is assigned, which can make the logic safe.
-	  2. Fix the forgotten change in _sort_by_frame_num. Its input pointer now is
-	  GstVideoCodecFrame type.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1935>
+	* ext/curl/gstcurlhttpsrc.c:
+	  curlhttpsrc: Add curl anyauth option
+	  Add curl anyauth option to support http request to endpoints not using
+	  only basic authentication (as default in curl). Also aligning with
+	  curlhttpsink that already uses this option.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3824>
 
-2022-03-09 03:45:18 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-22 00:47:09 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/codecs/gstav1decoder.c:
-	* gst-libs/gst/codecs/gstav1picture.c:
-	* gst-libs/gst/codecs/gstav1picture.h:
-	* gst-libs/gst/codecs/gsth264decoder.c:
-	* gst-libs/gst/codecs/gsth264picture.c:
-	* gst-libs/gst/codecs/gsth264picture.h:
-	* gst-libs/gst/codecs/gsth265decoder.c:
-	* gst-libs/gst/codecs/gsth265picture.c:
-	* gst-libs/gst/codecs/gsth265picture.h:
-	* gst-libs/gst/codecs/gstmpeg2decoder.c:
-	* gst-libs/gst/codecs/gstmpeg2picture.c:
-	* gst-libs/gst/codecs/gstmpeg2picture.h:
-	* gst-libs/gst/codecs/gstvp8decoder.c:
-	* gst-libs/gst/codecs/gstvp8picture.h:
-	* gst-libs/gst/codecs/gstvp9decoder.c:
-	* gst-libs/gst/codecs/gstvp9picture.c:
-	* gst-libs/gst/codecs/gstvp9picture.h:
-	* sys/nvcodec/gstnvh264dec.c:
-	* sys/va/gstvah264dec.c:
-	  codecs: Rename picture clear functions
-	  Our convention for clear method is gst_clear_foo_bar().
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1897>
+	* gst/videoparsers/gsth265parse.c:
+	* tests/check/elements/h265parse.c:
+	  h265parse: Always set profile on src caps
+	  h265parse should provide profile for autoplugging
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4026>
 
-2022-03-11 23:20:26 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-22 15:18:12 +0100  Célestin Marot <c.marot@intopix.com>
 
-	* sys/nvcodec/gstnvh265dec.c:
-	  nvh265sldec: Always fill SPS/PPS related parameters
-	  Address compare was not a valid approach since it works
-	  only if SPS/PPS id are changed. Otherwise it will always point to
-	  the same address of member variables of h265parser.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1931>
+	* sys/d3d11/gstd3d11overlaycompositor.cpp:
+	  d3d11overlaycompositor: fix texture width and height
+	  The dimension of the overlay texture directly corresponds to the size of the overlay **buffer** which is given by its video meta.
+	  The dimension at which the overlay should be displayed directly correspond to the overlay `render_width`and `render_height`.
+	  This match the behavior of glimagesink
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4046>
 
-2022-03-11 19:32:59 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-22 11:52:38 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst-libs/gst/codecs/gsth264picture.c:
-	  h264decoder: Fix invalid memory access
-	  gst_h264_dpb_needs_bump() can be called with null picture
-	  in case of live
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1928>
+	* po/fur.po:
+	  gst-plugins-bad: update translations
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4040>
 
-2022-02-10 08:01:02 +0100  Branko Subasic <branko@axis.com>
+2023-02-19 10:41:51 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* gst/onvif/gstrtponviftimestamp.c:
-	* gst/onvif/gstrtponviftimestamp.h:
-	* tests/check/elements/rtponviftimestamp.c:
-	  rtponviftimestamp: add support for using reference timestamps
-	  Make it posible to configure the element to obtain the timestamps from
-	  reference timestamp meta data instead of using the ntp-offset property,
-	  or estimating its own offset. Currently the only time format supported
-	  is "timestamp/x-unix", i.e. UTC time expressed in the unix time epoch.
-	  In addition the custom event GstNtpOffset has been renamed to
-	  GstOnvifTimestamp, to reflect that it is not necessarily used to convey
-	  the ntp-offset. As a consequence we had to modify a couple of files in
-	  the rtsp-server as well.
-	  Fixes #984
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1683>
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: Warn only malformed data in APP data.
+	  It's only malformed data in APP when its length is less than 6 chars,
+	  because it should have at least an id string. Otherwise, if the id string
+	  is not handled, no warning is raised, only a debug message noticing it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3943>
 
-2022-03-10 18:40:12 +0000  Tim-Philipp Müller <tim@centricular.com>
+2023-02-15 19:02:35 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/sdp/gstsdpdemux.c:
-	  sdpdemux: add media attributes to caps to fix ptp clock handling
-	  Those are needed by rtpjitterbuffer to do the right thing, e.g.
-	  a=ts-refclk:ptp=IEEE1588-2008:00-**-**-**-**-**-**-**:0
-	  a=mediaclk:direct=1266592257
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1924>
+	* gst/jpegformat/gstjpegparse.c:
+	  jpegparse: Parse AVI1 tag in app0.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3943>
 
-2022-03-08 16:20:27 +0100  Corentin Damman <c.damman@intopix.com>
+2023-02-12 16:11:34 +0800  He Junyan <junyan.he@intel.com>
 
-	* sys/nvcodec/gstcudaformat.h:
-	* sys/nvcodec/gstcudamemorycopy.c:
-	  cudamemorycopy: add D3D11 resource support
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1807>
+	* sys/va/gstjpegdecoder.c:
+	  va: jpegdecoder: Do not check SOS state when parsing DRI marker.
+	  According to spec, the JPEG_MARKER_DRI(Restart interval definition)
+	  marker can come before the SOS marker. So we should not check the SOS
+	  state when parsing the DRI marker.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3943>
 
-2022-03-09 09:35:16 +0100  Corentin Damman <c.damman@intopix.com>
+2023-02-22 02:56:55 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/nvcodec/gstcudacontext.c:
-	* sys/nvcodec/meson.build:
-	  cudacontext: find associated DXGI Adapter LUID
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1807>
+	* sys/nvcodec/gstcudaconverter.c:
+	  cudaconverter: Rename CUDA kernel function
+	  Changing its name (was too generic) to help GPU tracing via Nsight tool
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4029>
 
-2022-02-28 14:40:51 +0100  Corentin Damman <c.damman@intopix.com>
+2023-02-21 19:29:18 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/nvcodec/gstcudautils.c:
-	* sys/nvcodec/gstcudautils.h:
-	* sys/nvcodec/meson.build:
-	* sys/nvcodec/stub/cuda.h:
-	  cudautils: add support of D3D11 resource as Cuda graphics resource type
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1807>
-
-2022-02-28 11:24:31 +0100  Corentin Damman <c.damman@intopix.com>
-
-	* sys/nvcodec/gstcudaloader.c:
-	* sys/nvcodec/gstcudaloader.h:
-	* sys/nvcodec/stub/cuda.h:
-	  cudaloader: add D3D11 API
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1807>
+	* sys/d3d11/plugin.cpp:
+	  d3d11mpeg2dec: Promote rank to PRIMARY + 1
+	  Make its rank higher than avdec_mpeg2video
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4014>
 
-2022-03-10 10:33:56 +0100  Edward Hervey <edward@centricular.com>
+2023-02-19 20:51:37 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsdemux/mpegtsbase.c:
-	* gst/mpegtsdemux/mpegtsbase.h:
-	  mpegts: Handle glib < 2.58
-	  By using a workaround to the lack of g_ptr_array_steal_index.
-	  Fixes #1078
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1917>
+	* gst-libs/gst/cuda/meson.build:
+	  cuda: Link libatomic if needed
+	  Looks like C++ does not pull it automatically
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3997>
 
-2022-03-10 15:36:00 +1100  Matthew Waters <matthew@centricular.com>
+2022-12-22 10:17:42 +0000  Philippe Normand <philn@igalia.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	  webrtcbin: fix ulpfecenc passthrough pt
-	  ulpfecenc uses a value of pt=255 for passthrough.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1075
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1914>
+	* ext/wpe/WPEThreadedView.cpp:
+	* ext/wpe/wpe-extension/gstwpeextension.c:
+	  wpe: Logging fixes for the WebExtension
+	  Using logging macros without a `GST_CAT_DEFAULT` in scope leads to critical
+	  warnings.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3623>
 
-2022-03-10 02:28:11 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-21 15:19:35 +1100  Matthew Waters <matthew@centricular.com>
 
-	* sys/nvcodec/gstnvdec.c:
-	* sys/nvcodec/gstnvdec.h:
-	  nvh264dec,nvh265dec: Fix broken key-unit trick and reverse playback
-	  On GstVideoDecoder::{drain,flush}, we send null packet with
-	  CUVID_PKT_ENDOFSTREAM flag to drain out decoder. Which will
-	  reset CUVID parser as well.
-	  To continue decoding after the drain, the next input buffer
-	  should include sequence headers otherwise CUVID parser will
-	  not report any decodeable frame.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1911>
+	* ext/closedcaption/gstccconverter.c:
+	  ccconverter: don't debug a potentially freed filter caps
+	  Fixes a use-after-free
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4011>
 
-2021-11-02 09:20:55 +0100  Edward Hervey <edward@centricular.com>
+2023-02-21 00:27:27 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsdemux/mpegtsbase.c:
-	  tsbase: Handle more program updates
-	  There could be a case where the new program has the same program number as the
-	  previous one ... but is actually located on a PID previously used for elementary
-	  stream. In that case the program is guaranteed to not be an update of the
-	  previous program but a completely new one.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1893>
+	* sys/d3d11/gstd3d11videosink.cpp:
+	* sys/d3d11/gstd3d11window.cpp:
+	* sys/d3d11/gstd3d11window.h:
+	* sys/d3d11/gstd3d11window_win32.cpp:
+	  d3d11videosink: Fix rendering on external handle
+	  Partial revert of the commit 068a5c1053ae05b3c7747243948447e764d25aa6.
+	  That introduced size mismatch between internal and external HWND
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4006>
 
-2021-11-02 09:18:57 +0100  Edward Hervey <edward@centricular.com>
+2023-02-20 21:42:19 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsdemux/mpegtsbase.c:
-	* gst/mpegtsdemux/mpegtsbase.h:
-	  mpegtsbase: Use an array to track programs
-	  We need to be able to look for programs by their PID also. Using a hash table
-	  was a bit sub-par (and overkill) for storing a range of programs.
-	  This is needed because there could potentially be two programs with the same
-	  program id but different PMT PID (while one is being deactivated the new one
-	  would "exist").
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1893>
+	* sys/qsv/gstqsvav1enc.cpp:
+	* sys/qsv/gstqsvh264enc.cpp:
+	* sys/qsv/gstqsvh265enc.cpp:
+	* sys/qsv/gstqsvjpegenc.cpp:
+	* sys/qsv/gstqsvvp9enc.cpp:
+	  qsvenc: Simplify property update helpers
+	  Takes lock outside of helper methods, and protect property getter too
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4005>
 
-2022-03-04 13:19:17 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-20 01:30:06 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Invert video codec frame dependency.
-	  Instead of using GstMiniObject to hold H264 frame, now it uses a plain
-	  structure. Besides, instead of holding a reference to
-	  GstVideoCodecFrame, the H264 frame structure is set as a
-	  GstVideoCodecFrame user data.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1856>
+	* sys/qsv/gstqsvh264enc.cpp:
+	  qsvh264enc: Add more encoding options
+	  Adding trellis quantization, frame size, slice size and number of
+	  slices related encoding options
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4005>
 
-2022-03-09 02:14:50 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-19 22:43:57 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/nvcodec/gstcudamemorycopy.c:
-	  cudamemorycopy: Fix GL resource leak
-	  Clear GL resources on stop()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1896>
+	* sys/qsv/gstqsvav1enc.cpp:
+	* sys/qsv/gstqsvencoder.cpp:
+	* sys/qsv/gstqsvh264enc.cpp:
+	* sys/qsv/gstqsvh265enc.cpp:
+	* sys/qsv/gstqsvutils.cpp:
+	* sys/qsv/gstqsvutils.h:
+	* sys/qsv/gstqsvvp9enc.cpp:
+	  qsv: Use std::once_flag
+	  GLib's once implementation will take mutex every time
+	  in case of non-GCC build
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4005>
 
-2022-03-07 18:46:55 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-02-19 22:14:39 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsmux/gstbasetsmux.c:
-	  mpegtsmux: Start last_ts with GST_CLOCK_TIME_NONE
-	  And use the output segment position for the outgoing timestamp while it
-	  is. This is needed to delay the calculation of `output_ts_offset` until
-	  we actually have a usable timestamp, as tsmux will output a few initial
-	  packets while `last_ts` is still unset.
-	  Without this, the calculation would use the initial `0` value, which did
-	  not have the intended effect of making VBR mode behave like CBR mode,
-	  but always calculated an offset equal to the selected start time.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1884>
+	* sys/qsv/gstqsvh264enc.cpp:
+	  qsvh264enc: Optimization for byte-stream to packetized format conversion
+	  Allocate single memory instead of per NAL
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4005>
 
-2022-03-07 18:46:08 +0100  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+2023-02-20 02:10:07 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsmux/gstbasetsmux.c:
-	  mpegtsmux: Use GST_CLOCK_STIME_NONE for output_ts_offset
-	  It's a GstClockTimeDiff, thus GST_CLOCK_TIME_NONE isn't appropriate.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1884>
-
-2022-03-08 01:26:50 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/decklink/linux/DeckLinkAPI.h:
-	* sys/decklink/linux/DeckLinkAPIConfiguration.h:
-	* sys/decklink/linux/DeckLinkAPIDeckControl.h:
-	* sys/decklink/linux/DeckLinkAPIDiscovery.h:
-	* sys/decklink/linux/DeckLinkAPIDispatch.cpp:
-	* sys/decklink/linux/DeckLinkAPIModes.h:
-	* sys/decklink/linux/DeckLinkAPITypes.h:
-	* sys/decklink/linux/DeckLinkAPIVersion.h:
-	* sys/decklink/linux/LinuxCOM.h:
-	* sys/decklink/osx/DeckLinkAPI.h:
-	* sys/decklink/osx/DeckLinkAPIConfiguration.h:
-	* sys/decklink/osx/DeckLinkAPIDeckControl.h:
-	* sys/decklink/osx/DeckLinkAPIDiscovery.h:
-	* sys/decklink/osx/DeckLinkAPIDispatch.cpp:
-	* sys/decklink/osx/DeckLinkAPIModes.h:
-	* sys/decklink/osx/DeckLinkAPIStreaming.h:
-	* sys/decklink/osx/DeckLinkAPITypes.h:
-	* sys/decklink/osx/DeckLinkAPIVersion.h:
-	* sys/decklink/win/DeckLinkAPI.h:
-	* sys/decklink/win/DeckLinkAPI_i.c:
-	  decklink: Update SDK version to 12.2.2
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1883>
+	* sys/nvcodec/gstnvencobject.cpp:
+	* sys/nvcodec/gstnvencobject.h:
+	  nvencoder: Fix b-frame encoding on Linux
+	  On Windows, Win32 event handle is used to wait for encoded output,
+	  but it's not available on Linux. We should delay bitstream locking
+	  if encoder returns "need-more-input"
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4004>
 
-2022-03-08 03:45:01 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-17 19:16:33 +0000  Colin Kinloch <colin.kinloch@collabora.com>
 
-	* sys/nvcodec/gstcudamemorycopy.c:
-	  cudamemorycopy: Remove texture-target caps field
-	  It's GL specific field, and we can remove it unconditionally
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1865>
+	* gst/debugutils/fpsdisplaysink.c:
+	  fpsdisplaysink: Skip reporting on frame counter reset
+	  When the QoS stats are reset (e.g. changing the source) the counters for
+	  dropped + rendered frames are reset to zero which result in negative values
+	  for their difference. This results in max-fps getting pegged at an extremely
+	  high value.
+	  ```
+	  fpsdisplaysink.c:373:display_current_fps:<fpsdisplaysink0> Updated max-fps to 36840705952231460864.000000
+	  ```
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3989>
 
-2022-03-05 02:30:24 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-17 17:29:32 +0000  Colin Kinloch <colin.kinloch@collabora.com>
 
-	* sys/nvcodec/gstcudaformat.h:
-	* sys/nvcodec/gstcudamemorycopy.c:
-	* sys/nvcodec/gstcudanvmm.c:
-	* sys/nvcodec/gstcudanvmm.h:
-	* sys/nvcodec/meson.build:
-	* sys/nvcodec/plugin.c:
-	  cudaupload,cudadownload: Add support for dGPU NVMM
-	  Implement NVMM <-> CUDA, GL, SYSTEM memory conversion. Jetson is
-	  not supported yet. Note that NVMM <-> GL interop on Jetson platform
-	  is supported by GstGL
-	  Some example pipelines are:
-	  - Convert NVMM to GstGL memory
-	  nvv4l2decoder ! "video/x-raw(memory:NVMM)" ! cudadownload ! "video/x-raw(memory:GLMemory)" ! glimagesink
-	  - Upload system memory to NVMM and encode
-	  video/x-raw,format=NV12 ! cudaupload ! "video/x-raw(memory:NVMM)" ! nvv4l2h264enc
-	  - Convert NVMM to GstCUDA memory and encode
-	  nvvideoconvert ! "video/x-raw(memory:NVMM)" ! cudaupload ! "video/x-raw(memory:CUDAMemory)" ! nvh264enc
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1865>
+	* gst/debugutils/fpsdisplaysink.c:
+	  fpsdisplaysink: Log final statistics on stop
+	  Add a final message to the debug log that lists the min, max and average framerates when state of fpsdisplaysink transisions to NULL.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3988>
+
+2023-02-19 12:01:59 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+
+	* sys/va/gstvah265enc.c:
+	  vah265enc: Use helper to update properties.
+	  This is a continuation of the original patch by
+	  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3996>
 
-2022-03-03 15:06:00 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-20 10:56:27 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+
+	* gst-libs/gst/codecparsers/gsth264bitwriter.c:
+	  h264bitwriter: Remove second_chroma_qp_index_offset cast
+	  That API pps->second_chroma_qp_index_offset has been fixed to reflect
+	  the sign of field in the spec.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3966>
+
+2023-02-16 11:18:39 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+
+	* sys/nvcodec/gstnvh264dec.cpp:
+	  nvh264dec: Remove type casting
+	  Have fixed type of second_chroma_qp_index_offset as gint8, so remove the type
+	  casting here.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3966>
+
+2023-02-15 09:32:57 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+
+	* gst-libs/gst/codecparsers/gsth264parser.h:
+	  h264parser: Fix the type of a parameter
+	  From spec, the value of second_chroma_qp_index_offset is in the range of
+	  -12 to +12 inclusive. Fix its type from guint8 to gint8.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3966>
+
+2023-02-16 15:03:25 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
+	* gst-libs/gst/va/gstvaallocator.c:
+	  vaallocator: Check return value from va_sync_surface
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3919>
+
+2023-02-09 16:54:16 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+
+	* sys/va/gstvaav1dec.c:
+	* sys/va/gstvabaseenc.c:
+	* sys/va/gstvabasetransform.c:
 	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
 	* sys/va/gstvah264enc.c:
-	  va: encoder: Don't preallocate reconstruct buffers.
-	  It's not required by VA to register the reconstruct buffers at context
-	  creation, just as in decoders.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1857>
+	  va: Fix some code defects
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3919>
 
-2022-03-07 10:19:53 +0000  Philippe Normand <philn@igalia.com>
+2023-02-09 15:08:43 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* tests/check/libs/play.c:
-	  gstplay: tests: Keep track of errors/warnings
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1869>
+	* sys/msdk/gstmsdkdec.c:
+	* sys/msdk/gstmsdkmjpegdec.c:
+	  msdkdec: Fix some lock issue
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3947>
 
-2022-03-07 10:16:36 +0000  Philippe Normand <philn@igalia.com>
+2023-02-19 03:39:21 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/play/gstplay.c:
-	  gstplay: Do not error out on message parsing failures
-	  Specially when parsing errors and warnings, the details field can be NULL and
-	  the gst_structure_get() call would return FALSE in such cases, triggering false
-	  positive errors.
-	  Follow-up for #1063
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1869>
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	  nvencoder: Optimization for byte-stream to packetized format conversion
+	  Allocate single memory instead of per NAL
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3992>
 
-2022-03-07 10:14:43 +0000  Philippe Normand <philn@igalia.com>
+2023-02-19 03:17:09 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/play/gstplay.c:
-	* gst-libs/gst/play/gstplay.h:
-	  gstplay: Fix warning parsing API
-	  The GError is an out parameter, so should be a ** parameter, like the details
-	  parameter.
-	  See also #1063
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1869>
+	* sys/nvcodec/gstnvencobject.cpp:
+	* sys/nvcodec/gstnvencobject.h:
+	* sys/nvcodec/gstnvencoder.cpp:
+	* sys/nvcodec/gstnvencoder.h:
+	  nvencoder: Add support for caption insert
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1406
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3992>
 
-2022-03-07 18:59:37 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-18 23:45:43 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/nvcodec/gstcudamemorycopy.c:
-	  cudamemorycopy: Fix build when gl is disabled
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1707
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1868>
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	  nvencoder: Add support for HDR10 static metadata
+	  Insert HDR10 SEIs per IDR
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3992>
 
-2022-03-02 09:15:12 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-02-18 02:50:31 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkdec.c:
-	  msdkdec: Fix to not trigger SFC scaling when vpp at downstream
-	  When there is vpp scaling downstream, we need to make sure SFC is not
-	  triggered because vpp may fall into passthrough mode which causes
-	  the decoder negotiation to create src caps with vpp scaled width/height.
-	  This patch includes bitstream's original size in first query with
-	  downstream in gst_msdkdec_src_caps, which is the same for what we do for
-	  color format in this query. This is to ensure SFC scaling starts to
-	  work only when downstream directly asks for a different size instead of
-	  through vpp.
-	  Note that here SFC scaling follows the same behavior as msdkvpp:
-	  if user only changes width or height, e.g. dec ! video/x-raw,width=xx !,
-	  the height will be modified to the value which fits the original DAR.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1838>
-
-2022-03-06 19:18:20 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/nvcodec/gstcudautils.c:
-	  nvcodec: Add missing null check in context sharing code
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1834>
+	* sys/nvcodec/gstnvencoder.cpp:
+	* sys/nvcodec/gstnvencoder.h:
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	  nvencoder: Add support for GL memory
+	  preparation to deprecate old NVENC elements
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3992>
 
-2022-03-04 03:33:41 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-18 22:09:37 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/nvcodec/gstcudadownload.c:
-	* sys/nvcodec/gstcudadownload.h:
-	* sys/nvcodec/gstcudaformat.h:
+	* sys/nvcodec/gstnvencoder.cpp:
+	  nvencoder: Fix critical warning in autogpu mode
+	  If upstream memory is not CUDA, CUDA context will be null.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3992>
+
+2023-02-18 00:36:29 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst-libs/gst/cuda/gstcudautils.cpp:
+	* gst-libs/gst/cuda/meson.build:
 	* sys/nvcodec/gstcudamemorycopy.c:
-	* sys/nvcodec/gstcudamemorycopy.h:
-	* sys/nvcodec/gstcudaupload.c:
-	* sys/nvcodec/gstcudaupload.h:
-	* sys/nvcodec/meson.build:
-	* sys/nvcodec/plugin.c:
-	  nvcodec: Refactor cudaupload/download and add support for GL memory
-	  * Implement new baseclass GstCudaMemoryCopy to remove duplicated
-	  cudaupload/download code
-	  * Add support for CUDA <-> GL memory conversion via cudaupload/download
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1834>
-
-2022-03-03 03:25:47 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/nvcodec/cuda-converter.c:
-	* sys/nvcodec/cuda-converter.h:
-	* sys/nvcodec/gstcudabasefilter.c:
-	* sys/nvcodec/gstcudabufferpool.c:
-	* sys/nvcodec/gstcudadownload.c:
-	* sys/nvcodec/gstcudamemory.c:
-	* sys/nvcodec/gstcudamemory.h:
-	* sys/nvcodec/gstcudaupload.c:
 	* sys/nvcodec/gstnvbaseenc.c:
 	* sys/nvcodec/gstnvdec.c:
-	* sys/nvcodec/gstnvdecoder.c:
-	* sys/nvcodec/plugin.c:
-	  nvcodec: Refactor GstCudaMemory abstraction
-	  * Hide GstCudaMemory member variables
-	  * Make GstCudaAllocator object GstCudaContext independent
-	  * Set offset/stride of memory correctly via video meta
-	  * Drop GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT support.
-	  This implementation actually does not support custom alignment
-	  because we allocate device memory via cuMemAllocPitch
-	  of which alignment is almost uncontrollable
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1834>
-
-2022-03-02 22:03:54 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/nvcodec/cuda-converter.h:
-	* sys/nvcodec/gstcudabasefilter.c:
-	* sys/nvcodec/gstcudabasefilter.h:
-	* sys/nvcodec/gstcudabasetransform.c:
-	* sys/nvcodec/gstcudabasetransform.h:
-	* sys/nvcodec/gstcudaconvert.c:
-	* sys/nvcodec/gstcudadownload.c:
-	* sys/nvcodec/gstcudadownload.h:
-	* sys/nvcodec/gstcudaformat.h:
-	* sys/nvcodec/gstcudaupload.c:
-	* sys/nvcodec/gstcudaupload.h:
-	  nvcodec: Refactor basetransform subclasses
-	  * cudaupload/download
-	  - Specify only formats actually we can deal with
-	  nvcodec elements, not all video formats
-	  - Supports CUDA output for download and input for upload in order
-	  to make passthrough possible, like other upload/download elements.
-	  * cudabasetransform
-	  - Reset conversion element if upstream CUDA memory
-	  holds different CUDA context and the element can accept it.
-	  This is the same behavior as corresponding d3d11 filter elements.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1834>
-
-2022-03-02 20:55:29 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/nvcodec/gstcudabufferpool.c:
-	* sys/nvcodec/gstcudabufferpool.h:
-	  cudabufferpool: Move GstCudaContext object to public member
-	  ... so that plugins can understand assosicated cuda context with the
-	  pool.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1834>
-
-2022-03-03 02:48:17 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/nvcodec/gstcudacontext.c:
-	* sys/nvcodec/gstcudacontext.h:
-	* sys/nvcodec/gstcudautils.c:
-	  cudacontext: Require explicit gpu id instead of auto (-1)
-	  Sync up with GstD3D11Device implementation. The auto stuff should
-	  be handled in context sharing step, not device creation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1834>
-
-2022-03-03 03:24:14 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/nvcodec/gstcudaloader.c:
-	* sys/nvcodec/gstcudamemory.c:
-	* sys/nvcodec/gstcudascale.c:
-	* sys/nvcodec/gstcuvidloader.c:
-	* sys/nvcodec/gstnvrtcloader.c:
-	  nvcodec: Indent update
-	  ... to prevent gnu indent version dependent diffs.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1834>
-
-2022-03-02 05:01:42 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/nvcodec/gstcudacontext.c:
-	  cudacontext: Remove unnecessary cuInit() call
-	  It's already called at plugin init time
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1834>
+	* sys/nvcodec/gstnvdec.h:
+	* sys/nvcodec/gstnvdecoder.cpp:
+	* sys/nvcodec/gstnvenc.c:
+	* sys/nvcodec/meson.build:
+	  cuda: Rename macro HAVE_NVCODEC_GST_GL -> HAVE_CUDA_GST_GL
+	  ... and always use #ifdef instead of #if
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3992>
 
-2022-03-05 11:35:29 +0800  He Junyan <junyan.he@intel.com>
+2023-02-14 10:29:00 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Add a comment when the detection of TU fails.
-	  Also update the print message.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1863>
-
-2022-03-04 16:48:54 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
-
-	* gst/camerabin2/gstwrappercamerabinsrc.c:
-	  camerabin: Remove drain query
-	  This was to support very old V4L2 kernel. As we moved to DMABuf and can now
-	  detach buffers on renegotiation, the buffer it tries to fix no longer exist.
-	  The risk to blocking indefinitly the application does still exist though.
-	  Fixes #1070
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1861>
+	* gst-libs/gst/codecparsers/gstav1parser.c:
+	* gst-libs/gst/codecparsers/gsth265parser.c:
+	  av1parser, h265parser: Fix some code defects
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3953>
 
-2022-03-03 23:00:41 +0800  He Junyan <junyan.he@intel.com>
+2023-02-17 14:56:20 +0800  Yinhang Liu <yinhang.liu@intel.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: check the error return when parse_alignment_from_caps()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1837>
+	* sys/msdk/gstmsdk.c:
+	  msdkav1enc: fix the category for msdkav1enc debug
+	  The msdkav1enc debug initialized with gst_msdkav1dec_debug,
+	  fix this.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3985>
 
-2022-03-03 22:38:56 +0800  He Junyan <junyan.he@intel.com>
+2023-02-13 21:59:05 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Use the intersected caps to decide the alignment.
-	  When we negotiate with downstream, We should use the intersected
-	  caps of input and output to decide the alignment and stream format.
-	  The current code just uses the input caps which may lack the stream
-	  format.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1837>
-
-2022-03-03 21:30:00 +0800  He Junyan <junyan.he@intel.com>
-
-	* gst/ivfparse/gstivfparse.c:
-	  ivfparse: Set the alignment to tu for AV1 stream.
-	  Just do the same as other demux.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1837>
+	* sys/nvcodec/gstcuvidloader.c:
+	* sys/nvcodec/gstcuvidloader.h:
+	* sys/nvcodec/gstnvav1dec.cpp:
+	* sys/nvcodec/gstnvdecobject.cpp:
+	* sys/nvcodec/gstnvdecobject.h:
+	* sys/nvcodec/gstnvdecoder.cpp:
+	* sys/nvcodec/gstnvdecoder.h:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	  nvdecoder: Add support for reconfiguration
+	  Instead of creating new decoder instance per new sequence,
+	  re-use configured decoder instance via cuvidReconfigureDecoder()
+	  API. It will make output surface reusable without re-allocation.
+	  Also, in order for application to be able to reserve higher resolution
+	  output surface, "init-max-width" and "init-max-height" properties are
+	  added to each decoder.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
 
-2022-03-03 17:51:11 +0800  He Junyan <junyan.he@intel.com>
+2023-02-05 23:12:47 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Only detect the stream format when input alignment is tu.
-	  The demux now outputs the AV1 stream in "tu" alignment, so we do not need
-	  to detect the input alignment. But the annex b stream format is not recognized
-	  by the demux, we still need to detect that stream format for the first input.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1837>
+	* sys/nvcodec/gstnvencobject.cpp:
+	* sys/nvcodec/gstnvencobject.h:
+	* sys/nvcodec/gstnvencoder.cpp:
+	* sys/nvcodec/gstnvencoder.h:
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	* sys/nvcodec/meson.build:
+	  nvencoder: Reuse input resource
+	  Call input resource map functions (i.e., nvEncRegisterResource,
+	  nvEncUnregisterResource, nvEncMapInputResource, and
+	  nvEncUnmapInputResource) only once and reuse the mapped resources,
+	  instead of per input frame map/unmap
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
 
-2022-03-02 16:22:25 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-02-08 02:47:45 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Save the default alignment
-	  Otherwise the transformation is not applied and decoders may not
-	  get the appropriate format despite the caps being negotiated
-	  correctly.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1837>
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	* gst-libs/gst/cuda/gstcudamemory.h:
+	* gst-libs/gst/cuda/gstcudautils.cpp:
+	* gst-libs/gst/cuda/gstcudautils.h:
+	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
+	* gst-libs/gst/d3d11/gstd3d11memory.h:
+	* gst-libs/gst/d3d11/gstd3d11utils.cpp:
+	* gst-libs/gst/d3d11/gstd3d11utils.h:
+	  cudamemory, d3d11memory: Add memory_{get,set}_token_data() methods
+	  Similar to GstMiniObject qdata but new methods will use int64
+	  token value and per object lock, instead of GQuark with global
+	  mutex in qdata
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
+
+2023-02-08 02:25:35 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/nvcodec/gstnvav1dec.cpp:
+	* sys/nvcodec/gstnvdecobject.cpp:
+	* sys/nvcodec/gstnvdecobject.h:
+	* sys/nvcodec/gstnvdecoder.cpp:
+	* sys/nvcodec/gstnvdecoder.h:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	* sys/nvcodec/meson.build:
+	  nvdecoder: Add support for CUDA zero-copy in stateless decoder
+	  Wrap mapped decoder output surface using GstCudaMemory and
+	  output without any copy operation. Also, for application to be able to
+	  control the number of zero-copyable output surfaces,
+	  "num-output-surfaces" property is added.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
+
+2023-02-08 01:42:55 +0900  Seungha Yang <seungha@centricular.com>
+
+	* sys/nvcodec/gstnvav1dec.cpp:
+	* sys/nvcodec/gstnvdecoder.cpp:
+	* sys/nvcodec/gstnvh264dec.cpp:
+	* sys/nvcodec/gstnvh265dec.cpp:
+	* sys/nvcodec/gstnvvp8dec.cpp:
+	* sys/nvcodec/gstnvvp9dec.cpp:
+	* sys/nvcodec/meson.build:
+	  nvdecoder: Port to C++
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
 
-2022-03-02 16:20:31 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-02-02 03:45:26 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Remove duplicated check
-	  The case of both strings being empty is already checked in the
-	  helper function. No functional changes.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1837>
+	* sys/nvcodec/gstnvav1dec.c:
+	* sys/nvcodec/gstnvh264dec.c:
+	* sys/nvcodec/gstnvh265dec.c:
+	* sys/nvcodec/gstnvvp8dec.c:
+	* sys/nvcodec/gstnvvp9dec.c:
+	  nvdecoder: Reduce render delay to 2 frames
+	  4 frames delay seems to be too high
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
 
-2022-03-04 10:02:56 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-02-05 20:03:04 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/videoparsers/gstvp9parse.c:
-	  vp9parse: Fix auto-plugging of HW frame decoder
-	  Decoders that required frame aligmment and didn't have an associated
-	  alpha decoder were skipped. This is because the parser was constructing
-	  caps based on the software alpha decoder, which specify super-frame
-	  alignment.
-	  Iterate over the caps to filter the one that have a matching codec-alpha, with
-	  the semantic the no codec-alpha field means codec-alpha=false. Then if
-	  everything was removed, callback to the original, so that the first non-alpha
-	  decoder will be picked.
-	  Fixes #820
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1855>
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	* gst-libs/gst/cuda/gstcudamemory.h:
+	  cudamemory: Add gst_cuda_allocator_alloc_wrapped() method
+	  ... so that application can pass already allocated CUDA memory
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
+
+2023-02-05 20:00:04 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	  cudamemory: Skip sync if no I/O operation happend on free()
+	  Synchronization for unused memory is not required
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
 
-2022-03-04 14:17:47 +0100  Edward Hervey <edward@centricular.com>
+2023-02-04 20:32:34 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsdemux/tsdemux.c:
-	  tsdemux: Handle PES headers bigger than a mpeg-ts packet
-	  While the actual PES header parser could notify us that it needed more data, we
-	  would never actually act on it.
-	  This commit will accumulate incoming packets in such situation and re-attempt
-	  the header parsing.
-	  Fixes #1027
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1852>
+	* sys/nvcodec/gstcudaconverter.c:
+	  cudaconverter: Use cached texture
+	  ... instead of per conversion texture alloc/free
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
 
-2022-03-03 11:32:23 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-05 19:58:24 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvabasetransform.c:
-	  va: basetransform: Add device-path read-only property.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1844>
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	* gst-libs/gst/cuda/gstcudamemory.h:
+	  cudamemory: Make CUtexObject object reusable
+	  Create and hold CUtexObject objects in GstCudaMemory so that it can
+	  be reusable
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
 
-2022-03-03 11:05:36 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-06 02:41:57 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvabasedec.h:
-	  va: basedec: Add device-path read-only property.
-	  And elements will notify the used device-path if display is DRM.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1844>
+	* gst-libs/gst/cuda/gstcudacontext.cpp:
+	* gst-libs/gst/cuda/gstcudautils.cpp:
+	* gst-libs/gst/cuda/meson.build:
+	* sys/nvcodec/gstcudamemorycopy.c:
+	* sys/nvcodec/gstnvencoder.cpp:
+	* sys/nvcodec/gstnvencoder.h:
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	* sys/nvcodec/gstnvh264encoder.h:
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	* sys/nvcodec/gstnvh265encoder.h:
+	* sys/nvcodec/meson.build:
+	* sys/nvcodec/plugin.c:
+	  cuda, nvcodec: Make GstD3D11 dependency mandatory
+	  GstD3D11 build-time dependencies should be always available on Windows already
+	  and runtime dependencies as well, since required external
+	  (non-GStreamer) depends are all system DLLs
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
 
-2022-03-04 13:34:50 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-05 19:50:36 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Remove GST_PARAM_CONDITIONALLY_AVAILABLE.
-	  Since it's used only when the property is conditionally installed, and
-	  these parameters are always installed.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1845>
+	* docs/meson.build:
+	* gst-libs/gst/cuda/gstcuda-private.h:
+	* gst-libs/gst/cuda/gstcudabufferpool.cpp:
+	* gst-libs/gst/cuda/gstcudacontext.cpp:
+	* gst-libs/gst/cuda/gstcudaloader.cpp:
+	* gst-libs/gst/cuda/gstcudamemory.cpp:
+	* gst-libs/gst/cuda/gstcudanvrtc.cpp:
+	* gst-libs/gst/cuda/gstcudastream.cpp:
+	* gst-libs/gst/cuda/gstcudautils.cpp:
+	* gst-libs/gst/cuda/meson.build:
+	  cuda: Port to C++
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3884>
 
-2022-03-04 09:15:42 +0100  He Junyan <junyan.he@intel.com>
+2023-02-16 01:36:41 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvaencoder.c:
-	  va: encoder: Clean dead code.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1845>
+	* gst/codectimestamper/gstcodectimestamper.c:
+	  codectimestamper: Fix timestamping on sequence update
+	  ... and enhance debug logging.
+	  Keep internal timestamp offsets on drain, no reason to reset them
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3973>
 
-2022-03-03 14:08:16 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-15 09:45:28 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
-	* sys/va/gstvaencoder.c:
-	  va: encoder: Fix error code path when open.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1845>
+	* gst-libs/gst/codecparsers/gsth264bitwriter.c:
+	* gst-libs/gst/codecparsers/gsth265bitwriter.c:
+	  codecparsers: {h264,h265}bitwriter: Remove redundant condition checks
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3967>
 
-2022-03-03 13:57:35 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-01-12 17:49:14 +0100  Evgeny Pavlov <lucenticus@gmail.com>
 
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Remove preferred_output_delay.
-	  In the current state of the encoder it's just dead code.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1845>
+	* sys/amfcodec/gstamfav1enc.cpp:
+	* sys/amfcodec/gstamfh264enc.cpp:
+	* sys/amfcodec/gstamfh265enc.cpp:
+	  amfcodec: Initial support of Smart Access Video
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3904>
 
-2022-03-03 09:59:28 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-07 15:10:54 +0100  Evgeny Pavlov <lucenticus@gmail.com>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Avoid mapping coded buffer twice.
-	  Currently for copying the coded buffer onto a GStreamer buffer, the
-	  coded buffer is mapped two times: one for getting the size, and later
-	  for do the actual copy. We can avoid this by doing directly in the
-	  element rather than in the general encoder object.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1845>
+	* sys/amfcodec/include/components/ColorSpace.h:
+	* sys/amfcodec/include/components/Component.h:
+	* sys/amfcodec/include/components/PreAnalysis.h:
+	* sys/amfcodec/include/components/VideoDecoderUVD.h:
+	* sys/amfcodec/include/components/VideoEncoderAV1.h:
+	* sys/amfcodec/include/components/VideoEncoderHEVC.h:
+	* sys/amfcodec/include/components/VideoEncoderVCE.h:
+	* sys/amfcodec/include/core/D3D12AMF.h:
+	* sys/amfcodec/include/core/Factory.h:
+	* sys/amfcodec/include/core/Platform.h:
+	* sys/amfcodec/include/core/Surface.h:
+	* sys/amfcodec/include/core/Variant.h:
+	* sys/amfcodec/include/core/Version.h:
+	* sys/amfcodec/include/core/VulkanAMF.h:
+	  amfcodec: Update AMF headers to version 1.4.29
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3904>
 
-2022-03-02 20:53:16 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-14 13:00:40 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	* sys/va/gstvah264enc.c:
-	  vah264enc: Single parameter array per picture.
-	  There's no need, at least in H.264, to hold a global parameter array,
-	  since there's no need to submit SPS, trellis, hdr or quality in every
-	  buffer, but only on IDR ones.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1845>
+	* ext/svtav1/gstsvtav1enc.c:
+	  svtav1enc: Drain and completely reallocate the encoder instance on caps changes
+	  The encoder does not support reconfiguration, and only deinitializing it
+	  and then initializing it again causes deadlocks.
+	  Also only reconfigure and drain the encoder if the video info has
+	  actually changed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3957>
 
-2022-03-02 20:06:01 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-07 16:25:02 +0100  Piotr Brzeziński <piotr@centricular.com>
 
-	* sys/va/plugin.c:
-	  va: Fix log message
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1845>
+	* sys/applemedia/vtdec.c:
+	* sys/applemedia/vtenc.c:
+	* sys/applemedia/vtutil.h:
+	  vtenc/vtdec: Fix typo in RGBA64_LE availability define
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3912>
 
-2022-03-04 09:57:02 +0000  Philippe Normand <philn@igalia.com>
+2023-02-07 16:04:22 +0100  Piotr Brzeziński <piotr@centricular.com>
 
-	* gst-libs/gst/play/gstplay.c:
-	* gst-libs/gst/play/gstplay.h:
-	  play: Fix error parsing API
-	  The GError is an out parameter, so should be a ** parameter, like the details
-	  parameter.
-	  Fixes #1063
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1849>
+	* sys/applemedia/vtenc.c:
+	  vtenc: Disable ARGB/RGBA64 caps on M1 Pro/Max with macOS <13
+	  Fixes #1358.
+	  Passing ARGB64/RGBA64 to vtenc caused the encoding to fail
+	  when running on M1 Pro/Max variants with macOS 12.x, so let's
+	  remove these formats from caps when such scenario is detected.
+	  This issue appears to have been fixed OS-side in macOS 13.0.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3912>
 
-2021-08-03 12:14:49 +1000  Matthew Waters <matthew@centricular.com>
+2023-02-10 19:03:13 +0100  Evgeny Pavlov <lucenticus@gmail.com>
 
-	* ext/webrtc/gstwebrtcbin.c:
-	* ext/webrtc/transportstream.c:
-	* ext/webrtc/transportstream.h:
-	* ext/webrtc/webrtctransceiver.c:
-	* ext/webrtc/webrtctransceiver.h:
-	* tests/check/elements/webrtcbin.c:
-	  webrtc: support renegotiating adding/removing RTX
-	  We need to always add the RTX/RED/ULPFEC elements as rtpbin will only
-	  call us once to request aux/fec senders/receivers.
-	  We also need to regenerate the media section of the SDP instead of
-	  blindly copying from the previous offer.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1762>
+	* sys/amfcodec/gstamfav1enc.cpp:
+	  amfcodec: Add 10-bit & HDR support in AMF AV1 encoder
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3641>
 
-2022-03-01 11:43:09 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2022-12-23 19:40:32 +0100  Evgeny Pavlov <lucenticus@gmail.com>
 
-	* sys/msdk/gstmsdkenc.c:
-	  msdkenc: Change default ref frames number as 0
-	  When user does not set ref-frames in pipeline, we should let MediaSDK
-	  decide the reference frame number via setting default value as 0 at
-	  gstreamer side.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1839>
-
-2022-03-04 04:18:06 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/wic/meson.build:
-	  meson: wic: Fix typo
-	  Should check WIC build option, not MediaFoundation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1847>
+	* sys/amfcodec/gstamfh265enc.cpp:
+	  amfcodec: Add 10-bit & HDR support in h265 encoder
+	  This commit adds 10 bit source file encoding and HDR metadata support in AMF HEVC encoding.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3641>
 
-2022-03-03 04:22:15 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-12 23:17:41 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/qsv/gstqsvdecoder.h:
-	* sys/qsv/gstqsvencoder.h:
-	* sys/qsv/gstqsvh264dec.cpp:
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh265enc.cpp:
-	* sys/qsv/gstqsvvp9enc.cpp:
-	  qsv: Remove strcpy for DRM device path
-	  Simplify code. It's just one-time allocation, so don't need to worry
-	  about leaking.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1835>
+	* sys/amfcodec/gstamfav1enc.cpp:
+	  amfav1enc: Set stream-format on caps
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3946>
 
-2022-03-03 04:57:42 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-12 23:12:21 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkcontext.c:
-	  msdk: Don't print error log for missing DRM device path
-	  It's expected in case that such DRM device is unavailable for some reasons,
-	  specifically non-Intel platform or so
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1836>
+	* docs/plugins/gst_plugins_cache.json:
+	* sys/qsv/gstqsvav1enc.cpp:
+	  qsvav1enc: Set stream-format on caps
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3946>
 
-2022-01-30 03:11:37 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-09 18:51:30 +0100  Piotr Brzeziński <piotr@centricular.com>
 
-	* meson_options.txt:
-	* sys/meson.build:
-	* sys/wic/gstwicdecoder.cpp:
-	* sys/wic/gstwicdecoder.h:
-	* sys/wic/gstwicimagingfactory.cpp:
-	* sys/wic/gstwicimagingfactory.h:
-	* sys/wic/gstwicjpegdec.cpp:
-	* sys/wic/gstwicjpegdec.h:
-	* sys/wic/gstwicpngdec.cpp:
-	* sys/wic/gstwicpngdec.h:
-	* sys/wic/gstwicutils.cpp:
-	* sys/wic/gstwicutils.h:
-	* sys/wic/meson.build:
-	* sys/wic/plugin.cpp:
-	  wic: Add support for JPEG and PNG decoding
-	  Adding Windows Imaging Component (WIC) plugin with JPEG/PNG decoding
-	  support.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1605>
+	* sys/applemedia/vtdec.c:
+	  vtdec: Fix not waiting for async frames when flushing
+	  This was causing incorrect output when seeking, especially
+	  when used with a multithreaded source like `videotestsrc n-threads=2`.
+	  It should now correctly wait for frames still being processed by VT
+	  while vtdec is flushing.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3922>
 
-2022-03-02 06:17:22 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-10 12:52:17 +0100  Alessandro Bono <alessandro.bono369@gmail.com>
 
-	* sys/directshow/gstdshow.cpp:
-	* sys/directshow/gstdshowvideodec.cpp:
-	  directshow: Fix for division by zero
-	  The AvgTimePerFrame value may be unknown. Use arbitrary
-	  value (30 fps) instead of crashing.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1828>
+	* sys/win32ipc/protocol/win32ipcutils.cpp:
+	  win32ipcutils: Add missing include
+	  We are using std::isspace() with one parameter. That function is defined
+	  in the cctype header.
+	  ```
+	  win32ipcutils.cpp(34): error C2672: 'std::isspace': no matching overloaded function found
+	  win32ipcutils.cpp(34): error C2780: 'bool std::isspace(_Elem,const std::locale &)': expects 2 arguments - 1 provided
+	  ```
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3933>
 
-2022-02-20 03:59:32 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-06 17:47:11 +0100  Edward Hervey <bilboed@bilboed.com>
 
-	* sys/qsv/gstqsvallocator.cpp:
-	* sys/qsv/gstqsvallocator.h:
-	* sys/qsv/gstqsvallocator_d3d11.cpp:
-	* sys/qsv/gstqsvallocator_va.cpp:
-	* sys/qsv/gstqsvdecoder.cpp:
-	* sys/qsv/gstqsvdecoder.h:
-	* sys/qsv/gstqsvencoder.cpp:
-	* sys/qsv/gstqsvh264dec.cpp:
-	* sys/qsv/gstqsvh264dec.h:
-	* sys/qsv/gstqsvutils.h:
-	* sys/qsv/meson.build:
-	* sys/qsv/plugin.cpp:
-	  qsv: Add H.264 decoder
-	  Initial decoder implementation with baseclass
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1786>
+	* gst/mxf/gstmxfelement.c:
+	* gst/mxf/meson.build:
+	* gst/mxf/mxfffv1.c:
+	* gst/mxf/mxfffv1.h:
+	* gst/mxf/mxfquark.c:
+	* gst/mxf/mxfquark.h:
+	  mxfdemux: Add support for FFV1 demuxing
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3899>
 
-2022-02-21 10:49:15 +0100  Sebastian Fricke <sebastian.fricke@collabora.com>
+2023-02-10 07:12:25 +0100  Edward Hervey <edward@centricular.com>
 
-	* ext/wpe/WPEThreadedView.cpp:
-	* ext/wpe/gstwpe.cpp:
-	* ext/wpe/gstwpe.h:
-	  Remove the uninstalled term
-	  Remove the symbolic link `gst-uninstalled` which points to `gst-env`.
-	  The `uninstalled` is the old name and the project should stick to a
-	  single name for the procedure.
-	  Remove the term from all the files, exceptions are variables from
-	  dependencies like `uninstalled_variables` from pkgconfig and
-	  `meson-uninstalled`.
-	  Adjust mentions of the script in the documentation and README.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1743>
+	* gst/mxf/mxfaes-bwf.c:
+	* gst/mxf/mxfalaw.c:
+	* gst/mxf/mxfcustom.c:
+	* gst/mxf/mxfd10.c:
+	* gst/mxf/mxfdv-dif.c:
+	* gst/mxf/mxfessence.c:
+	* gst/mxf/mxfessence.h:
+	* gst/mxf/mxfjpeg2000.c:
+	* gst/mxf/mxfmpeg.c:
+	* gst/mxf/mxfprores.c:
+	* gst/mxf/mxfup.c:
+	* gst/mxf/mxfvanc.c:
+	* gst/mxf/mxfvc3.c:
+	  mxf: simplify essence track matching
+	  By directly providing a valid descriptor to match against
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3899>
 
-2022-02-23 11:10:11 +0100  Sebastian Fricke <sebastian.fricke@collabora.com>
+2023-02-06 17:57:32 +0100  Edward Hervey <bilboed@bilboed.com>
 
-	* README.md:
-	  Maintain build instructions at a single location
-	  Do not maintain similar build instructions within each gst-plugins-*
-	  subproject and the subproject/gstreamer subproject. Use the build
-	  instructions from the mono-repository and link to them via hyperlink.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1743>
+	* gst/mxf/mxfdemux.c:
+	  mxfdemux: Handle empty tracks
+	  This can happen when tracks aren't fully/properly detected due to new descriptors
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3899>
 
-2022-02-21 12:26:49 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-02-06 15:59:56 +0100  Edward Hervey <bilboed@bilboed.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	  docs: Add vah264enc metadata.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1051>
+	* gst/mxf/mxfdemux.c:
+	* gst/mxf/mxfmetadata.c:
+	* gst/mxf/mxfmetadata.h:
+	* gst/mxf/mxful.c:
+	* gst/mxf/mxful.h:
+	  mxfdemux: Handle sub-descriptor in generic descriptors
+	  Specificied in S377-1 (2019) B.2 Generic Descriptor
+	  This is one of the ways to store more "sub descriptors" for a single track
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3899>
+
+2023-02-06 15:57:58 +0100  Edward Hervey <edward@centricular.com>
+
+	* gst/mxf/mxfmpeg.c:
+	* gst/mxf/mxftypes.c:
+	* gst/mxf/mxftypes.h:
+	  mxf: Add convenience function for looking up primer tags
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3899>
 
-2021-10-05 01:53:19 +0800  He Junyan <junyan.he@intel.com>
+2023-02-06 15:26:48 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/va/plugin.c:
-	  va: enable the H264 encoder.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1051>
+	* gst-libs/gst/codecparsers/gstav1parser.c:
+	  av1parser: Don't consider unknown metadata OBUs a bitstream error
+	  Just don't parse them.
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1774
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3898>
 
-2021-10-05 01:51:48 +0800  He Junyan <junyan.he@intel.com>
+2023-02-07 08:49:24 +0100  Edward Hervey <edward@centricular.com>
 
-	* sys/va/gstvah264enc.c:
-	* sys/va/gstvah264enc.h:
-	* sys/va/meson.build:
-	  va: Add H264 encoder.
-	  This a new VA-API implementation of a H264 encoder.
-	  It can control the GOP and parameter settings, while the MV searching,
-	  VCL and the rate control algorithm are implemented by VA drivers and HW.
-	  It supports most of the common usage options in H264, but still lacks
-	  of look ahead, field, B frame weighted prediction, etc.
-	  Co-authored-by: Victor Jaquez <vjaquez@igalia.com>
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1051>
+	* ext/closedcaption/gstceaccoverlay.c:
+	  closedcaption: Don't leak caps event
+	  All events that we handle should be unreffed
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3902>
 
-2021-10-05 01:50:07 +0800  He Junyan <junyan.he@intel.com>
+2023-02-07 04:58:04 +1100  Jan Schmidt <jan@centricular.com>
 
-	* sys/va/gstvaencoder.c:
-	* sys/va/gstvaencoder.h:
-	* sys/va/meson.build:
-	  va: Add a common encoder object.
-	  As the counterpart of the va decoder, this class handles all the
-	  common logic for the encoding routine and miscellaneous queries about
-	  encoding.
-	  Co-authored-by: Victor Jaquez <vjaquez@igalia.com>
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1051>
+	* ext/webrtc/gstwebrtcstats.c:
+	  webrtc: Calculate the jitter for remote-inbound-rtp stats
+	  Populate the clock-rate in the internal stats structure, so
+	  it can be used by the _get_stats_from_remote_rtp_source_stats()
+	  method to calculate remote receivers' jitter.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3900>
 
-2022-01-20 21:44:20 +0800  He Junyan <junyan.he@intel.com>
+2023-02-01 10:44:26 +1100  Jan Schmidt <jan@centricular.com>
 
-	* sys/va/vacompat.h:
-	  va: Add vacompat.h to wrap glib functions.
-	  The g_queue_clear_full() and g_array_copy() functions in the glib
-	  may not be available for the current glib version check, so we add
-	  helper functions to wrap it.
-	  This should be deleted after the glib version bumps.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1051>
+	* ext/webrtc/gstwebrtcstats.c:
+	  webrtcbin: Report full codec-stats for source pads
+	  Use the current caps for webrtcbin srcpads, as received_caps
+	  are only stored for sink pads based on incoming caps events.
+	  Makes it so that webrtcbin stats reports contain fuller
+	  codec information.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3900>
 
-2021-10-21 22:56:23 +0800  He Junyan <junyan.he@intel.com>
+2023-02-06 13:55:32 +0100  Adrian Fiergolski <adrian.fiergolski@fastree3d.com>
 
-	* sys/va/gstvaprofile.c:
-	* sys/va/gstvaprofile.h:
-	  va: Add the profile string name into the profile_map.
-	  We also add a helper function of gst_va_profile_from_name to get
-	  the VA profile value by its profile string name.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1051>
+	* ext/avtp/meson.build:
+	  avtp: specify the required version of libavtp
+	  Support of RVF requires libavtp in version 0.2.0 at least.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3897>
 
-2021-10-05 01:53:47 +0800  He Junyan <junyan.he@intel.com>
+2022-11-24 12:50:33 +0800  Ma, Mingyang <mingyang.ma@intel.com>
 
-	* sys/va/gstvaprofile.c:
-	  va: Change the H264 profile string order in the profile_map.
-	  The first one should be the one that matches the VA profile's name
-	  most precisely.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1051>
+	* sys/msdk/gstmsdkenc.c:
+	* sys/msdk/gstmsdkenc.h:
+	  msdkenc: Let runtime decide parameters
+	  Some parameters can be determined by runtime instead of default values. So unset the default and let runtime choose the best parameters
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3660>
 
-2021-10-05 01:45:25 +0800  He Junyan <junyan.he@intel.com>
+2023-02-03 21:33:17 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/va/gstvacaps.c:
-	* sys/va/gstvacaps.h:
-	  va: caps: Expose gst_va_create_coded_caps as helper function.
-	  And allow free indentation for array declaration.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1051>
+	* ext/svtav1/gstsvtav1enc.c:
+	* ext/svtav1/gstsvtav1enc.h:
+	  svtav1enc: Use G_DECLARE_FINAL_TYPE and GST_ELEMENT_REGISTER_DEFINE
 
-2021-10-05 01:43:28 +0800  He Junyan <junyan.he@intel.com>
+2023-02-03 21:25:43 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* tests/check/libs/h264bitwriter.c:
-	* tests/check/meson.build:
-	  test: Add test cases for the H264 bitwriter.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1051>
+	* ext/svtav1/gstsvtav1enc.c:
+	  svtav1enc: Fix compilation with SVT-AV1 1.1 and drop GStreamer 1.16 compatibility
 
-2021-10-05 01:42:41 +0800  He Junyan <junyan.he@intel.com>
+2023-02-03 21:20:56 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/codecparsers/gsth264bitwriter.c:
-	* gst-libs/gst/codecparsers/gsth264bitwriter.h:
-	* gst-libs/gst/codecparsers/meson.build:
-	  codecparsers: bitwriter: Add the common bit writer functions for H264.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1051>
+	* ext/svtav1/gstsvtav1enc.c:
+	  svtav1enc: Fix indentation
 
-2021-10-05 01:41:07 +0800  He Junyan <junyan.he@intel.com>
+2023-01-31 16:34:33 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/codecparsers/nalutils.c:
-	* gst-libs/gst/codecparsers/nalutils.h:
-	  codecparsers: nalutils: Add nal_writer_reset_and_get_data help function.
-	  We not only want to create a NAL gstmemory, but also need to create and
-	  get the raw data of a NAL writer for the later usage.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1051>
-
-2022-02-28 16:33:23 +0100  Guillaume Desmottes <guillaume.desmottes@onestream.live>
-
-	* ext/gs/meson.build:
-	  gs: look for google_cloud_cpp_storage.pc
-	  storage_client.pc was legacy and has been removed:
-	  https://github.com/googleapis/google-cloud-cpp/commit/df6fa3611cdfbc37d40e1451afa91fd7d2e7d5f7#diff-bc35ad7c2fe631fd5578a06092412dba81c7ddd27bb25df7e17bb13771799afcL743
-	  No need to keep looking for storage_client.pc as a fallback as 1.25.0,
-	  our minimum version, already ships google_cloud_cpp_storage.pc
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1815>
-
-2022-02-25 15:00:05 +0800  jinsl00000 <jinsl00000@msn.cn>
-
-	* sys/ipcpipeline/gstipcpipelinecomm.c:
-	* sys/ipcpipeline/meson.build:
-	  ipcpipeline: fix crash and error on windows with SOCKET or _pipe()
-	  The fd was in different meanings on windows:
-	  POSIX read and write use the fd as a file descriptor.
-	  The gst_poll use the fd as a WSASocket.
-	  This patch use WSASocket as default on windows. This is a temporary measure, because IPC has many different implement. There may be a better way in the future.
-	  See #1044
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1791>
+	* ext/meson.build:
+	* ext/svtav1/gstsvtav1enc.c:
+	* ext/svtav1/meson.build:
+	* meson_options.txt:
+	  svtav1: Integrate into the build system properly
 
-2022-02-14 16:15:46 +0800  Wu Tong <tong1.wu@intel.com>
+2023-01-25 01:13:27 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/msdk/gstmsdkcontextutil.c:
-	* sys/msdk/gstmsdkenc.c:
-	  MSDK: Add _context_query() and avoid compile error on Windows
-	  To avoid compile error on Windows, macro definitions are added to suppress va
-	  variables. In the meantime, add function _context_query() to query
-	  context on Windows.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1693>
-
-2022-02-24 20:26:46 +0530  Sanchayan Maity <sanchayan@asymptotic.io>
-
-	* ext/ldac/gstldacenc.c:
-	  ldac: Set eqmid in caps
-	  We set the eqmid in caps to be usable downstream by rtpldacpay for
-	  knowing the frame count.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1797>
+	* sys/kms/gstkmsallocator.c:
+	  kms: drop use of GSlice allocator and remove unnecessary check
+	  g_new0() will never return NULL but just abort if it can't
+	  allocate memory (same for g_slice_new).
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3784>
+
+2023-01-25 01:11:14 +0000  Tim-Philipp Müller <tim@centricular.com>
+
+	* sys/shm/gstshmsink.c:
+	* sys/shm/gstshmsrc.c:
+	* sys/shm/shmalloc.h:
+	  shm: drop use of GSlice allocator
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3784>
+
+2023-01-25 00:39:54 +0000  Tim-Philipp Müller <tim@centricular.com>
+
+	* gst/midi/midiparse.c:
+	  midiparse: drop use of GSlice allocator
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3784>
 
-2022-01-31 16:13:32 +0200  Vivia Nikolaidou <vivia@ahiru.eu>
+2023-01-25 00:33:33 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst/mpegtsmux/gstbasetsmux.c:
-	  tsmux: Skip empty buffers
-	  They can be created e.g. by aggregator when there is a gap. Such buffers
-	  should not be muxed at all.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1611>
-
-2022-02-21 11:37:26 -0500  Xavier Claessens <xavier.claessens@collabora.com>
-
-	* data/meson.build:
-	* ext/voamrwbenc/meson.build:
-	* gst/freeverb/meson.build:
-	  devenv: Add some missing GStreamer specific env variables
-	  This should make "meson devenv" closer to what "gst-env.py" sets.
-	  - GST_VALIDATE_SCENARIOS_PATH
-	  - GST_VALIDATE_APPS_DIR
-	  - GST_OMX_CONFIG_DIR
-	  - GST_ENCODING_TARGET_PATH
-	  - GST_PRESET_PATH
-	  - GST_PLUGIN_SCANNER
-	  - GST_PTP_HELPER
-	  - _GI_OVERRIDES_PATH
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1768>
+	* ext/closedcaption/gstceaccoverlay.c:
+	* ext/closedcaption/gstceaccoverlay.h:
+	* ext/closedcaption/meson.build:
+	  cc708overlay: bump pango requirement and drop no longer required locking
+	  Gets rid of GSlice allocation that's never freed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3784>
 
-2018-12-05 01:22:48 +0100  Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+2023-01-28 02:32:13 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/fdkaac/gstfdkaacdec.c:
-	* ext/fdkaac/gstfdkaacdec.h:
-	  fdkaacdec: Support arbitrary channel configs
-	  Try to match the config to GStreamer positions. If something doesn't
-	  fit, fall back to a set of unpositioned channels.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1561>
+	* tools/gst-transcoder.c:
+	  tools: Make sure UTF-8 encoded command line arguments on Windows
+	  On Windows, arguments passed in main() are system codepage
+	  encoded and might not be valid UTF-8 string.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3828>
 
-2018-12-05 01:07:19 +0100  Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+2023-01-12 21:45:58 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/fdkaac/gstfdkaacdec.c:
-	* ext/fdkaac/gstfdkaacdec.h:
-	  fdkaacdec: Use predefined channel layouts
-	  This limits the decoder to the layouts predefined for the encoder
-	  (including the MPEG standard layouts) but greatly simplifies the
-	  implementation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1561>
+	* gst-libs/gst/cuda/meson.build:
+	* tests/check/libs/cudamemory.c:
+	* tests/check/meson.build:
+	  tests: Add CUDA memory allocator test
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-02-01 14:51:27 +0200  Vivia Nikolaidou <vivia@ahiru.eu>
+2022-12-23 03:12:24 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst/mpegtsmux/gstbasetsmux.c:
-	* gst/mpegtsmux/gstbasetsmux.h:
-	  tsmux: Lock mux->tsmux, the programs hash table, and pad streams
-	  They contain implementations that are not thread-safe (e.g. GList, GHashTable).
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1616>
+	* sys/nvcodec/gstnvbaseenc.c:
+	  nvenc: Use CUDA stream of memory if exists
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-02-17 15:16:40 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2022-12-22 02:27:36 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkdec.c:
-	  msdkdec: Fix uninitialized variables
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1731>
+	* gst-libs/gst/cuda/gstcuda-private.h:
+	* gst-libs/gst/cuda/gstcudautils.c:
+	* sys/nvcodec/gstcudamemorycopy.c:
+	  cudaupload, cudadownload: Update for shared CUDA stream
+	  Use CUDA stream of memory if exists
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-02-17 15:12:52 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2022-12-21 00:13:56 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkdec.c:
-	* sys/msdk/gstmsdkvpp.c:
-	  msdk: Fix unchecked return values
-	  There are several calls of gst_video_info_from_caps and gst_video_frame_copy
-	  without checks for the returned values. This patch adds all necessary
-	  function return checks.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1738>
+	* sys/nvcodec/gstnvdec.c:
+	* sys/nvcodec/gstnvdecoder.c:
+	  nvdecoder: Skip synchronization if downstream buffer holds CUDA stream
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-02-22 05:19:51 +0900  Seungha Yang <seungha@centricular.com>
+2022-12-20 23:04:12 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/qsv/gstqsvencoder.cpp:
-	  qsvencoder: Fix caps leak in Linux build
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1769>
+	* sys/nvcodec/gstcudaconvertscale.c:
+	  cudaconvertscale: Add support for shared CUDA stream
+	  If CUDA stream is shared by upstream/downstream, don't sync at
+	  convert element
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-02-22 05:15:04 +0900  Seungha Yang <seungha@centricular.com>
+2022-12-20 01:23:42 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/qsv/plugin.cpp:
-	  qsv: Fix debug category name of qsvallocator
-	  Remove gst prefix to make $env:GST_DEBUG="qsv*:6" work for qsvallocator
-	  as well
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1769>
+	* sys/nvcodec/gstcudaconverter.c:
+	* sys/nvcodec/gstcudaconverter.h:
+	* sys/nvcodec/gstcudaconvertscale.c:
+	  cudaconverter: Don't sync per conversion
+	  Caller should take care of synchronization
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-02-21 16:45:50 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2022-12-20 00:54:42 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	  bad:docs: Add vaav1dec in documentation
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1773>
+	* sys/nvcodec/gstnvencoder.cpp:
+	  nvencoder: Add support for shared CUDA stream
+	  Sets CUDA stream on CUDA buffer pool so that CUDA stream object
+	  can be shared
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-02-21 14:17:11 +0200  Sebastian Dröge <sebastian@centricular.com>
+2022-12-23 00:37:36 +0900  Seungha Yang <seungha@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.h:
-	  d3d11: Remove non-existing gst_d3d11_memory_get_type() API from header
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1764>
+	* gst-libs/gst/cuda/gstcudabufferpool.c:
+	* gst-libs/gst/cuda/gstcudabufferpool.h:
+	  cudabufferpool: Add support for CUDA stream use in memory
+	  * Use GstCudaPoolAllocator
+	  * Pass configured GstCudaStream object to allocator
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-02-14 23:30:45 +0300  Dmitry Osipenko <dmitry.osipenko@collabora.com>
+2022-12-19 21:56:37 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2format.c:
-	* sys/v4l2codecs/gstv4l2format.h:
-	  v4l2codecs: Support YUV420M format
-	  YUV420M format of V4L essentially is I420 with separate memory planes.
-	  It's used by NVIDIA Tegra V4L decoder. Support this format by v4l2codecs.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1727>
+	* gst-libs/gst/cuda/gstcudabufferpool.c:
+	* gst-libs/gst/cuda/gstcudamemory.c:
+	* gst-libs/gst/cuda/gstcudamemory.h:
+	  cudamemory: Make GstCudaStream-aware
+	  This will be used for CUDA stream sharing.
+	  * Adding GstCudaPoolAllocator object. The pool allocator will
+	  control synchronization of allocated memory objects.
+	  * Modify gst_cuda_allocator_alloc() API so that caller can specify/set
+	  GstCudaStream object for the newly allocated memory.
+	  * GST_CUDA_MEMORY_TRANSFER_NEED_SYNC flag is added in addition to
+	  existing GST_CUDA_MEMORY_TRANSFER_NEED_{UPLOAD,DOWNLOAD}.
+	  The flag indicates that any GPU command queued in the CUDA stream
+	  may not be finished yet, and caller should take care of the
+	  synchronization.
+	  The flag is controlled by GstCudaMemory object if the memory holds
+	  GstCudaStream. (Otherwise, GstCudaMemory will do synchronization
+	  as before this commit). Specifically, GstCudaMemory object will set
+	  the new flag automatically when memory is mapped with
+	  (GST_MAP_CUDA | GST_MAP_WRITE) flags. Caller will need to unset
+	  the flag via GST_MEMORY_FLAG_UNSET() if it's already synchronized
+	  by client code.
+	  * gst_cuda_memory_sync() helper function is added to perform synchronization
+	  * Why not use CUevent object to keep track of synchronization status?
+	  CUDA provides fence-like interface already via CUevent object,
+	  but cuEventRecord/cuEventQuery APIs are not zero-cost operations.
+	  Instead, in this version, the status is tracked by using map and
+	  object flags.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-02-20 23:59:46 +0900  Seungha Yang <seungha@centricular.com>
+2022-12-19 22:16:01 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/d3d11/gstd3d11screencapturesrc.cpp:
-	  d3d11screencapturesrc: Use staging buffer pool for performance
-	  By using staging pool/buffer, we can avoid per frame
-	  staging texture -> system memory copy.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1756>
+	* gst-libs/gst/cuda/gstcudabufferpool.c:
+	* gst-libs/gst/cuda/gstcudacontext.c:
+	* gst-libs/gst/cuda/gstcudamemory.c:
+	  cudamemory: Allow nullptr allocator object
+	  The GstCudaAllocator object doesn't hold any device object.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-02-20 15:20:07 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2022-12-21 23:59:19 +0900  Seungha Yang <seungha@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	  doc: Add NV12_16L32S into the cache
-	  Autogenerated by CI
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1567>
+	* sys/nvcodec/gstcudabasetransform.c:
+	* sys/nvcodec/gstcudabasetransform.h:
+	* sys/nvcodec/gstcudaconvertscale.c:
+	* sys/nvcodec/gstcudamemorycopy.c:
+	* sys/nvcodec/gstnvbaseenc.c:
+	* sys/nvcodec/gstnvbaseenc.h:
+	* sys/nvcodec/gstnvdec.c:
+	* sys/nvcodec/gstnvdec.h:
+	* sys/nvcodec/gstnvdecoder.c:
+	* sys/nvcodec/gstnvencoder.cpp:
+	  nvcodec: Port to GstCudaStream
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-01-26 13:39:40 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2022-12-19 20:57:30 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2format.c:
-	* sys/v4l2codecs/gstv4l2format.h:
-	  v4l2codecs: Enable MediaTek MM21 (NV12_16L32S)
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1567>
+	* gst-libs/gst/cuda/gstcuda.h:
+	* gst-libs/gst/cuda/gstcudastream.c:
+	* gst-libs/gst/cuda/gstcudastream.h:
+	* gst-libs/gst/cuda/meson.build:
+	  cuda: Add GstCudaStream object
+	  Wrap CUstream handle with GstCudaStream to make it ref-counted
+	  object. This GstCudaStream object will be used later for
+	  CUDA stream sharing
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-01-19 15:53:05 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2022-12-21 23:57:15 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2format.c:
-	  v4l2codecs: Add support for multi planar buffers
-	  V4L2 have some pixel formats that produces 2 dmabuf, this add
-	  support for these format.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1567>
+	* gst-libs/gst/cuda/cuda-gst.h:
+	* gst-libs/gst/cuda/gstcuda-private.h:
+	* gst-libs/gst/cuda/gstcuda.h:
+	* gst-libs/gst/cuda/gstcudabufferpool.h:
+	* gst-libs/gst/cuda/gstcudacontext.h:
+	* gst-libs/gst/cuda/gstcudaloader.h:
+	* gst-libs/gst/cuda/gstcudamemory.h:
+	* gst-libs/gst/cuda/gstcudanvrtc.h:
+	* gst-libs/gst/cuda/gstcudautils.h:
+	* gst-libs/gst/cuda/meson.build:
+	* sys/nvcodec/gstcudabasetransform.c:
+	* sys/nvcodec/gstcudabasetransform.h:
+	* sys/nvcodec/gstcudaconverter.c:
+	* sys/nvcodec/gstcudaconverter.h:
+	* sys/nvcodec/gstcudafilter.c:
+	* sys/nvcodec/gstcudamemorycopy.c:
+	* sys/nvcodec/gstcuvidloader.h:
+	* sys/nvcodec/gstnvav1dec.c:
+	* sys/nvcodec/gstnvbaseenc.c:
+	* sys/nvcodec/gstnvbaseenc.h:
+	* sys/nvcodec/gstnvdec.c:
+	* sys/nvcodec/gstnvdec.h:
+	* sys/nvcodec/gstnvdecoder.h:
+	* sys/nvcodec/gstnvenc.h:
+	* sys/nvcodec/gstnvencoder.h:
+	* sys/nvcodec/gstnvh264dec.c:
+	* sys/nvcodec/gstnvvp8dec.c:
+	* sys/nvcodec/gstnvvp9dec.c:
+	  cuda: Provide single header include entry point
+	  Add "gstcuda.h" header file
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3629>
 
-2022-01-25 14:08:47 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-02-03 22:10:12 +0900  Seungha Yang <seungha@centricular.com>
 
-	* ext/wayland/wlshmallocator.c:
-	* sys/kms/gstkmsallocator.c:
-	* sys/v4l2codecs/gstv4l2format.c:
-	  Port plugins to gst_video_format_info_extrapolate_stride()
-	  This reduces code duplication and simplify addition of new
-	  pixel formats into related plugins.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1567>
-
-2022-02-20 06:36:45 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/winscreencap/dxgicapture.c:
-	* sys/winscreencap/dxgicapture.h:
-	* sys/winscreencap/gstdxgiscreencapsrc.c:
-	* sys/winscreencap/gstdxgiscreencapsrc.h:
-	* sys/winscreencap/gstwinscreencap.c:
-	* sys/winscreencap/meson.build:
-	  winscreencap: Remove dxgiscreencapsrc element
-	  We have the d3d11screencapturesrc element in d3d11 plugin
-	  which is obviously better than this element in terms of performance
-	  and design, so we don't need to make people be confused by two separate elements.
-	  Let's pick the better implementation and remove unnecessary one.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1750>
+	* sys/nvcodec/gstnvencoder.cpp:
+	* sys/nvcodec/gstnvencoder.h:
+	* sys/nvcodec/gstnvh264encoder.cpp:
+	* sys/nvcodec/gstnvh265encoder.cpp:
+	  nvencoder: Fix min buffers parameter of allocation query in auto GPU mode
+	  At the time when propose_allocation() get called, encoder session
+	  would not be initialized yet.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3888>
 
-2022-02-08 15:23:17 +0100  Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+2023-02-02 10:34:40 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* ext/wpe/meson.build:
-	  wpe: Clean up build script
-	  Use feature.require to check for gstgl and exit early if 'wpe' is
-	  disabled (don't even check for wpe-webkit-1.1).
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1668>
-
-2022-02-19 00:37:34 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/directshow/dshowvideosink.cpp:
-	* sys/directshow/gstdshowaudiodec.h:
-	  directshow: Fix build warnings
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1744>
-
-2022-02-19 00:14:38 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/directshow/dshowdecwrapper/gstdshowdecwrapper.cpp:
-	* sys/directshow/dshowdecwrapper/gstdshowdecwrapper.h:
-	* sys/directshow/dshowdecwrapper/meson.build:
-	* sys/directshow/dshowdeviceprovider.cpp:
-	* sys/directshow/dshowdeviceprovider.h:
-	* sys/directshow/dshowsinkwrapper/meson.build:
-	* sys/directshow/dshowsrcwrapper/meson.build:
-	* sys/directshow/dshowvideofakesrc.cpp:
-	* sys/directshow/dshowvideofakesrc.h:
-	* sys/directshow/dshowvideosink.cpp:
-	* sys/directshow/dshowvideosink.h:
-	* sys/directshow/gstdshow.cpp:
-	* sys/directshow/gstdshow.h:
-	* sys/directshow/gstdshowaudiodec.cpp:
-	* sys/directshow/gstdshowaudiodec.h:
-	* sys/directshow/gstdshowaudiosrc.cpp:
-	* sys/directshow/gstdshowaudiosrc.h:
-	* sys/directshow/gstdshowfakesink.cpp:
-	* sys/directshow/gstdshowfakesink.h:
-	* sys/directshow/gstdshowfakesrc.cpp:
-	* sys/directshow/gstdshowfakesrc.h:
-	* sys/directshow/gstdshowutil.cpp:
-	* sys/directshow/gstdshowutil.h:
-	* sys/directshow/gstdshowvideodec.cpp:
-	* sys/directshow/gstdshowvideodec.h:
-	* sys/directshow/gstdshowvideosrc.cpp:
-	* sys/directshow/gstdshowvideosrc.h:
-	* sys/directshow/meson.build:
-	* sys/directshow/plugin.cpp:
-	  directshow: Merge plugins into single directshow plugin
-	  ... and lower rank of dshowvideosink and dshowdeviceprovider
-	  to GST_RANK_MARGINAL since we don't prefer this plugin
-	  by default
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1744>
-
-2022-02-19 00:12:55 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/directshow/dshowdecwrapper/gstdshowaudiodec.cpp:
-	* sys/directshow/dshowdecwrapper/gstdshowaudiodec.h:
-	* sys/directshow/dshowdecwrapper/gstdshowfakesrc.cpp:
-	* sys/directshow/dshowdecwrapper/gstdshowfakesrc.h:
-	* sys/directshow/dshowdecwrapper/gstdshowutil.cpp:
-	* sys/directshow/dshowdecwrapper/gstdshowutil.h:
-	* sys/directshow/dshowdecwrapper/gstdshowvideodec.cpp:
-	* sys/directshow/dshowdecwrapper/gstdshowvideodec.h:
-	* sys/directshow/dshowsinkwrapper/dshowvideofakesrc.cpp:
-	* sys/directshow/dshowsinkwrapper/dshowvideosink.cpp:
-	* sys/directshow/dshowsinkwrapper/dshowvideosink.h:
-	* sys/directshow/dshowsrcwrapper/gstdshow.h:
-	* sys/directshow/dshowsrcwrapper/gstdshowaudiosrc.h:
-	* sys/directshow/dshowsrcwrapper/gstdshowsrcwrapper.cpp:
-	* sys/directshow/dshowsrcwrapper/gstdshowvideosrc.cpp:
-	* sys/directshow/dshowsrcwrapper/gstdshowvideosrc.h:
-	  directshow: Remove white spaces
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1744>
+	* ext/svtav1/gstsvtav1enc.c:
+	* ext/svtav1/gstsvtav1enc.h:
+	  gstreamer: Decide rate-control-mode based on the bitrate/cqp/crf settings
+	  And also keep the default encoder settings but simply override them with
+	  our own values that we care about.
+	  This mirrors the encoder configuration behaviour from ffmpeg.
 
-2021-10-19 16:10:06 -0300  Martin Reboredo <yakoyoku@gmail.com>
+2023-02-02 09:50:16 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* docs/plugins/gst_plugins_cache.json:
-	* ext/vulkan/gstvulkan.c:
-	* ext/vulkan/gstvulkanelements.h:
-	* ext/vulkan/meson.build:
-	* ext/vulkan/vkshaderspv.c:
-	* ext/vulkan/vkshaderspv.h:
-	  vulkanshaderspv: SPIRV based filter
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1197>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Use GLib types instead of stdint.h types consistently
 
-2022-02-18 16:23:09 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-02-01 17:26:01 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
-	  v4l2codecs: vp9: Fix reset_frame_context parameter
-	  It was assumed that the kernel parameters would match with the bitstream value
-	  but instead the author when with another set of value. Surprisingly, this
-	  makes no difference with the resulting fluster score.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1748>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Fix double unref
+	  The ownership of the caps is passed to `gst_video_encoder_set_output_state()`.
 
-2022-02-18 16:02:27 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-02-01 14:06:53 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
-	  v4l2codecs: vp9: Only fill compressed headers if needed
-	  Fixes: 13944cf3ee871722 ("v4l2codecs: vp9: Make compressed hdr control optional")
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1748>
-
-2022-01-14 23:42:27 -0600  Tim Mooney <Tim.Mooney@ndsu.edu>
-
-	* sys/v4l2codecs/linux/types-compat.h:
-	  v4l2: include <sys/ioccom.h> on Illumos
-	  Needed for _IOR/_IORW
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1524>
-
-2022-01-26 21:06:45 +0100  Loic Le Page <llepage@fluendo.com>
-
-	* sys/directshow/dshowsinkwrapper/dshowvideofakesrc.cpp:
-	* sys/directshow/dshowsinkwrapper/dshowvideofakesrc.h:
-	* sys/directshow/dshowsinkwrapper/dshowvideosink.cpp:
-	* sys/directshow/dshowsinkwrapper/dshowvideosink.h:
-	* sys/directshow/dshowsinkwrapper/meson.build:
-	* sys/directshow/dshowvideosink/README:
-	* sys/directshow/meson.build:
-	  Add build files and fix build for gst-plugins-bad dshowsinkwrapper plugin
-	  dshowsinkwrapper plugin is the old dshowvideosink plugin that has been
-	  renamed to be compliant with the actuel plugin name in the source code.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1577>
-
-2022-01-26 21:03:10 +0100  Loic Le Page <llepage@fluendo.com>
-
-	* sys/directshow/dshowsrcwrapper/BUILD.txt:
-	* sys/directshow/dshowsrcwrapper/CMakeLists.txt:
-	* sys/directshow/dshowsrcwrapper/gstdshowvideosrc.cpp:
-	* sys/directshow/dshowsrcwrapper/meson.build:
-	* sys/directshow/meson.build:
-	  Add build files and fix build for gst-plugins-bad dshowsrcwrapper plugin
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1577>
-
-2022-01-26 20:58:12 +0100  Loic Le Page <llepage@fluendo.com>
-
-	* sys/directshow/dshowdecwrapper/CMakeLists.txt:
-	* sys/directshow/dshowdecwrapper/gstdshowvideodec.cpp:
-	* sys/directshow/dshowdecwrapper/meson.build:
-	* sys/directshow/meson.build:
-	  Add build files and fix build for gst-plugins-bad dshowdecwrapper plugin
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1577>
+	* ext/svtav1/gstsvtav1enc.c:
+	* ext/svtav1/meson.build:
+	  gstreamer: Configure colorimetry and HDR metadata if present
+	  This raises the minimum GStreamer requirement to 1.16 as used by the CI
+	  and optionally makes use of 1.18 features, including HDR.
 
-2022-01-26 20:43:09 +0100  Loic Le Page <llepage@fluendo.com>
+2023-02-01 13:03:14 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* meson_options.txt:
-	* sys/directshow/meson.build:
-	* sys/directshow/strmbase/LICENSE:
-	* sys/directshow/strmbase/baseclasses/amextra.cpp:
-	* sys/directshow/strmbase/baseclasses/amextra.h:
-	* sys/directshow/strmbase/baseclasses/amfilter.cpp:
-	* sys/directshow/strmbase/baseclasses/amfilter.h:
-	* sys/directshow/strmbase/baseclasses/amvideo.cpp:
-	* sys/directshow/strmbase/baseclasses/arithutil.cpp:
-	* sys/directshow/strmbase/baseclasses/cache.h:
-	* sys/directshow/strmbase/baseclasses/checkbmi.h:
-	* sys/directshow/strmbase/baseclasses/combase.cpp:
-	* sys/directshow/strmbase/baseclasses/combase.h:
-	* sys/directshow/strmbase/baseclasses/cprop.cpp:
-	* sys/directshow/strmbase/baseclasses/cprop.h:
-	* sys/directshow/strmbase/baseclasses/ctlutil.cpp:
-	* sys/directshow/strmbase/baseclasses/ctlutil.h:
-	* sys/directshow/strmbase/baseclasses/ddmm.cpp:
-	* sys/directshow/strmbase/baseclasses/ddmm.h:
-	* sys/directshow/strmbase/baseclasses/dllentry.cpp:
-	* sys/directshow/strmbase/baseclasses/dllsetup.cpp:
-	* sys/directshow/strmbase/baseclasses/dllsetup.h:
-	* sys/directshow/strmbase/baseclasses/dxmperf.h:
-	* sys/directshow/strmbase/baseclasses/fourcc.h:
-	* sys/directshow/strmbase/baseclasses/measure.h:
-	* sys/directshow/strmbase/baseclasses/msgthrd.h:
-	* sys/directshow/strmbase/baseclasses/mtype.cpp:
-	* sys/directshow/strmbase/baseclasses/mtype.h:
-	* sys/directshow/strmbase/baseclasses/outputq.cpp:
-	* sys/directshow/strmbase/baseclasses/outputq.h:
-	* sys/directshow/strmbase/baseclasses/perflog.cpp:
-	* sys/directshow/strmbase/baseclasses/perflog.h:
-	* sys/directshow/strmbase/baseclasses/perfstruct.h:
-	* sys/directshow/strmbase/baseclasses/pstream.cpp:
-	* sys/directshow/strmbase/baseclasses/pstream.h:
-	* sys/directshow/strmbase/baseclasses/pullpin.cpp:
-	* sys/directshow/strmbase/baseclasses/pullpin.h:
-	* sys/directshow/strmbase/baseclasses/refclock.cpp:
-	* sys/directshow/strmbase/baseclasses/refclock.h:
-	* sys/directshow/strmbase/baseclasses/reftime.h:
-	* sys/directshow/strmbase/baseclasses/renbase.cpp:
-	* sys/directshow/strmbase/baseclasses/renbase.h:
-	* sys/directshow/strmbase/baseclasses/schedule.cpp:
-	* sys/directshow/strmbase/baseclasses/schedule.h:
-	* sys/directshow/strmbase/baseclasses/seekpt.cpp:
-	* sys/directshow/strmbase/baseclasses/seekpt.h:
-	* sys/directshow/strmbase/baseclasses/source.cpp:
-	* sys/directshow/strmbase/baseclasses/source.h:
-	* sys/directshow/strmbase/baseclasses/streams.h:
-	* sys/directshow/strmbase/baseclasses/strmctl.cpp:
-	* sys/directshow/strmbase/baseclasses/strmctl.h:
-	* sys/directshow/strmbase/baseclasses/sysclock.cpp:
-	* sys/directshow/strmbase/baseclasses/sysclock.h:
-	* sys/directshow/strmbase/baseclasses/transfrm.cpp:
-	* sys/directshow/strmbase/baseclasses/transfrm.h:
-	* sys/directshow/strmbase/baseclasses/transip.cpp:
-	* sys/directshow/strmbase/baseclasses/transip.h:
-	* sys/directshow/strmbase/baseclasses/videoctl.cpp:
-	* sys/directshow/strmbase/baseclasses/videoctl.h:
-	* sys/directshow/strmbase/baseclasses/vtrans.cpp:
-	* sys/directshow/strmbase/baseclasses/vtrans.h:
-	* sys/directshow/strmbase/baseclasses/winctrl.cpp:
-	* sys/directshow/strmbase/baseclasses/winctrl.h:
-	* sys/directshow/strmbase/baseclasses/winutil.cpp:
-	* sys/directshow/strmbase/baseclasses/winutil.h:
-	* sys/directshow/strmbase/baseclasses/wxdebug.cpp:
-	* sys/directshow/strmbase/baseclasses/wxdebug.h:
-	* sys/directshow/strmbase/baseclasses/wxlist.cpp:
-	* sys/directshow/strmbase/baseclasses/wxlist.h:
-	* sys/directshow/strmbase/baseclasses/wxutil.cpp:
-	* sys/directshow/strmbase/baseclasses/wxutil.h:
-	* sys/directshow/strmbase/meson.build:
-	* sys/meson.build:
-	  Add directshow strmbase library source code from Microsoft repo
-	  Original repo is here:
-	  https://github.com/microsoft/Windows-classic-samples
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1577>
-
-2022-02-16 14:53:12 +0100  Loïc Le Page <llepage@fluendo.com>
-
-	* sys/directshow/dshowdecwrapper/CMakeLists.txt:
-	* sys/directshow/dshowdecwrapper/gstdshowaudiodec.cpp:
-	* sys/directshow/dshowdecwrapper/gstdshowaudiodec.h:
-	* sys/directshow/dshowdecwrapper/gstdshowdecwrapper.cpp:
-	* sys/directshow/dshowdecwrapper/gstdshowdecwrapper.h:
-	* sys/directshow/dshowdecwrapper/gstdshowfakesrc.cpp:
-	* sys/directshow/dshowdecwrapper/gstdshowfakesrc.h:
-	* sys/directshow/dshowdecwrapper/gstdshowutil.cpp:
-	* sys/directshow/dshowdecwrapper/gstdshowutil.h:
-	* sys/directshow/dshowdecwrapper/gstdshowvideodec.cpp:
-	* sys/directshow/dshowdecwrapper/gstdshowvideodec.h:
-	* sys/directshow/dshowsrcwrapper/BUILD.txt:
-	* sys/directshow/dshowsrcwrapper/CMakeLists.txt:
-	* sys/directshow/dshowsrcwrapper/dshowdeviceprovider.cpp:
-	* sys/directshow/dshowsrcwrapper/dshowdeviceprovider.h:
-	* sys/directshow/dshowsrcwrapper/gstdshow.cpp:
-	* sys/directshow/dshowsrcwrapper/gstdshow.h:
-	* sys/directshow/dshowsrcwrapper/gstdshowaudiosrc.cpp:
-	* sys/directshow/dshowsrcwrapper/gstdshowaudiosrc.h:
-	* sys/directshow/dshowsrcwrapper/gstdshowfakesink.cpp:
-	* sys/directshow/dshowsrcwrapper/gstdshowfakesink.h:
-	* sys/directshow/dshowsrcwrapper/gstdshowsrcwrapper.cpp:
-	* sys/directshow/dshowsrcwrapper/gstdshowvideosrc.cpp:
-	* sys/directshow/dshowsrcwrapper/gstdshowvideosrc.h:
-	* sys/directshow/dshowvideosink/README:
-	* sys/directshow/dshowvideosink/dshowvideofakesrc.cpp:
-	* sys/directshow/dshowvideosink/dshowvideofakesrc.h:
-	* sys/directshow/dshowvideosink/dshowvideosink.cpp:
-	* sys/directshow/dshowvideosink/dshowvideosink.h:
-	  Move all directshow plugins to the same sub-folder
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1577>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Set correct maximum width/height limits
 
-2022-01-15 00:04:05 -0600  Tim Mooney <Tim.Mooney@ndsu.edu>
+2023-02-01 13:02:11 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* ext/curl/meson.build:
-	* gst/festival/meson.build:
-	* meson.build:
-	* sys/shm/meson.build:
-	  meson: check for libsocket and libnsl
-	  If present, add '-lsocket' and '-lnsl' to network_deps.
-	  ext/curl/meson.build: add network_deps to dependencies
-	  gst/festival/meson.build: same
-	  sys/shm/meson.build: same
-	  Fixes linking issues on Illumos distros.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1525>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Use correct 10-bit format on big endian systems
 
-2022-02-14 22:59:01 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-01 12:57:01 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	* gst-libs/gst/d3d11/gstd3d11format.h:
-	* sys/d3d11/gstd3d11converter.cpp:
-	* tests/check/elements/d3d11colorconvert.c:
-	  d3d11: Add support for AYUV, AYUV64, and RGBA64_LE formats
-	  Note that AYUV and AYUV64 formats will be used to expand format
-	  support, especially some packed YUV formats (e.g., Y410, YUY2)
-	  are common DXGI formats used for hardware decoder/encoder on Windows
-	  but those formats cannot be used as a render target. We need to handle
-	  them differently without pixel shader help, using compute shader
-	  for example.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1699>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Set `force_key_frames=true` in CQP/CRF mode
+	  Other modes don't support that so keyframes can't be requested at
+	  arbitrary times.
 
-2022-02-13 20:32:48 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-01 12:49:44 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	* gst-libs/gst/d3d11/gstd3d11format.cpp:
-	* gst-libs/gst/d3d11/gstd3d11format.h:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11stagingbufferpool.cpp:
-	  d3d11: Reorganize format mapping table
-	  ... and handle GST <-> D3D11 format mapping in a single place to
-	  make adding format easier
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1699>
+	* ext/svtav1/gstsvtav1enc.c:
+	* ext/svtav1/gstsvtav1enc.h:
+	  gstreamer: Add support for setting arbitrary parameters via `parameters-string` property
 
-2022-02-13 04:36:39 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-31 19:04:24 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	* gst-libs/gst/d3d11/gstd3d11device.h:
-	* gst-libs/gst/d3d11/gstd3d11format.cpp:
-	* gst-libs/gst/d3d11/gstd3d11format.h:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.h:
-	* gst-libs/gst/d3d11/gstd3d11stagingbufferpool.cpp:
-	* sys/d3d11/gstd3d11convert.cpp:
-	* sys/d3d11/gstd3d11converter.cpp:
-	* sys/d3d11/gstd3d11decoder.cpp:
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	* sys/d3d11/gstd3d11upload.cpp:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	* sys/mediafoundation/plugin.cpp:
-	  d3d11: Store device format in struct
-	  Holding pointer to struct was unsafe approach because
-	  the pointer to d3d11 format will be invalidated once d3d11 device
-	  object is released
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1699>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Fix naming of function name that was taken over from the SVT-HEVC encoder
 
-2021-10-01 20:27:28 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-31 15:30:24 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/vulkan/win32/gstvkwindow_win32.c:
-	* gst/festival/gstfestival.c:
-	* meson.build:
-	* sys/ipcpipeline/gstipcpipelinecomm.c:
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	* tests/examples/nvcodec/nvcodec.c:
-	  meson: Do hard build error for some MSVC warnings
-	  Handle various MSVC warnings as errors for development version.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1006>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Don't overwrite application configuration on initialization and initialize with the default configuration
 
-2022-02-14 16:18:54 +0300  Dmitry Osipenko <dmitry.osipenko@collabora.com>
+2023-01-31 15:25:06 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codech264dec.c:
-	  v4l2codecs: h264: Correct scaling matrix ABI check
-	  Scaling matrix V4L UAPI control not presents on NVIDIA Tegra, the default
-	  matrix should be used in this case. Mark scaling matrix presence optional.
-	  Fixes: 47bfa71530c ("v4l2codecs: h264: Improve ABI check ")
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1726>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Clean up property handling
+	  Use more correct types, defaults and clean up property names a bit.
+	  This now matches the configuration provided by ffmpeg.
 
-2022-01-21 15:32:09 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-01-31 13:37:15 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/msdk/gstmsdkdec.c:
-	* sys/msdk/gstmsdkdec.h:
-	  msdkdec: Enable SFC scaling for AVC and HEVC
-	  Decoder SFC only supports down-scaling at most to 1/8.
-	  For example, given a 4K bistream, SFC can scale it to 1080p via:
-	  "msdkh265dec ! video/x-raw,width=1920,height=1080 ! glimagesink"
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1444>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Mark all internal functions as `static`
 
-2021-12-15 11:49:40 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-01-31 13:06:16 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/msdk/gstmsdkdec.c:
-	* sys/msdk/gstmsdkh264dec.c:
-	* sys/msdk/gstmsdkh265dec.c:
-	  msdkdec: Enable SFC csc for AVC and HEVC
-	  Decoder SFC will be triggered when default output format is not accept at
-	  downstream. One use case below can work without using msdkvpp:
-	  "! msdkh265dec ! "video/x-raw,format=BGRA" ! glimagesink",
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1444>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Fix encoder and buffer state life cycle
+	  Allocate/deallocate the encoder in `open()`/`close()` and its buffers in
+	  `start()` / `stop()`.
+	  Also fail correctly if configuring the encoder fails.
 
-2021-11-17 17:05:09 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
+2023-01-31 13:03:49 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/msdk/gstmsdkdec.c:
-	* sys/msdk/gstmsdkdec.h:
-	  msdkdec: Add SFC codes
-	  SFC refers to Scaler Format Converter, more details here:
-	  https://01.org/sites/default/files/documentation/intel-gfx-prm-osrc-kbl-vol15-sfc.pdf
-	  By attaching mfxExtDecVideoProcessing buffer to mfxVideoParam, decoder
-	  can do SFC for csc and scaling.
-	  MSDK will check if surface bitdepth equals to input when no SFC is
-	  triggered, which means in the case of SFC, there is no need to update
-	  surface bitdepth via gst_msdk_update_mfx_frame_info_from_mfx_video_param.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1444>
-
-2022-02-16 02:23:58 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/d3d11/gstd3d11converter.cpp:
-	  d3d11converter: Fix for missing GRAY conversion
-	  Add missing Y410 -> GRAY and GRAY -> semi-planar conversion
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1724>
-
-2022-02-16 02:11:53 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/d3d11/gstd3d11converter.cpp:
-	  d3d11converter: Don't use FIXME_OBJECT for non-GstObject
-	  ... and print ERROR messages for unexpected input/output formats
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1724>
+	* ext/svtav1/gstsvtav1enc.c:
+	* ext/svtav1/gstsvtav1enc.h:
+	  gstreamer: Remove unused `frame_count` and `dts_offset`
 
-2021-11-10 15:18:24 +0800  He Junyan <junyan.he@intel.com>
+2023-01-31 12:59:50 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/va/gstvadisplay.c:
-	* gst-libs/gst/va/gstvadisplay.h:
-	* sys/va/gstvacaps.c:
-	* sys/va/gstvadecoder.c:
-	* sys/va/gstvadisplay_priv.c:
-	* sys/va/gstvafilter.c:
-	* sys/va/gstvasurfacecopy.c:
-	* sys/va/vasurfaceimage.c:
-	  va: Delete the display lock/unlock when we call VA-API.
-	  According to the VA-API's description, they are MT-safe, we do not
-	  need to care about that in our middleware layer. The lock/unlock
-	  operations have overhead and make the performance lower.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1333>
-
-2022-02-08 15:22:39 +0100  Jan Alexander Steffens (heftig) <heftig@archlinux.org>
-
-	* ext/openaptx/gstopenaptxdec.h:
-	* ext/openaptx/gstopenaptxenc.h:
-	* ext/openaptx/meson.build:
-	  openaptx: Support libfreeaptx
-	  libfreeaptx1 is a fork of libopenapt 0.2.0, used by pipewire.
-	  1: https://github.com/iamthehorker/libfreeaptx
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1642
-	  Closes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1589
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1667>
-
-2022-02-15 02:26:46 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/d3d11/gstd3d11converter.cpp:
-	  d3d11converter: Fix RGB to GRAY conversion
-	  Fix typo in shader code
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1697>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Fix debug category description
 
-2022-02-14 12:57:44 +0100  Stéphane Cerveau <scerveau@collabora.com>
+2023-02-02 18:48:41 +0100  Adrian Fiergolski <adrian.fiergolski@fastree3d.com>
 
-	* gst/mpegtsdemux/tsdemux.c:
-	  tsdemux: unlock mutex on -1 start_offfset
-	  Closing #1013
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1694>
+	* ext/avtp/gstavtprvfdepay.c:
+	* ext/avtp/gstavtprvfpay.c:
+	  avtp: rvf: add missing since markers
+	  Add missing markers.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1335>
 
-2022-02-13 22:39:46 +0900  Seungha Yang <seungha@centricular.com>
+2021-11-08 13:18:49 +0100  Adrian Fiergolski <adrian.fiergolski@fastree3d.com>
 
-	* sys/d3d11/gstd3d11download.cpp:
-	  d3d11download: Fix decide_allocation
-	  Caps should be parsed in any cases.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1691>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/avtp/gstavtp.c:
+	* ext/avtp/gstavtprvfdepay.c:
+	* ext/avtp/gstavtprvfdepay.h:
+	* ext/avtp/meson.build:
+	  avtp: rvf: add AVTP RVF de-payload support
+	  Add AVTP Raw Video Format de-payload support. The element supports only
+	  GRAY16_LE output format, so:
+	  - active pixels (no vertical blanking),
+	  - progressive mode,
+	  - 8 and 16-bit pixel depth,
+	  - mono pixel format,
+	  - grayscale colorspace.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1335>
+
+2021-11-09 13:20:01 +0100  Adrian Fiergolski <adrian.fiergolski@fastree3d.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/avtp/gstavtpcvfdepay.c:
+	* ext/avtp/gstavtpcvfdepay.h:
+	* ext/avtp/gstavtpvfdepaybase.c:
+	* ext/avtp/gstavtpvfdepaybase.h:
+	* ext/avtp/meson.build:
+	  avtp: cvf: extract AVTP VF depayload base class
+	  Extract a part which could be common with the AVTP RVF depayload plugin to a separate class.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1335>
 
-2022-02-13 10:49:31 +0800  He Junyan <junyan.he@intel.com>
+2021-11-02 12:49:31 +0100  Adrian Fiergolski <adrian.fiergolski@fastree3d.com>
 
-	* sys/va/meson.build:
-	  meson: va: Add va option check into plugin's build.
-	  Because the liblibgstva is built unconditionally, we now move the
-	  va option check into va plugin's build.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1685>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/avtp/gstavtp.c:
+	* ext/avtp/gstavtprvfpay.c:
+	* ext/avtp/gstavtprvfpay.h:
+	* ext/avtp/meson.build:
+	  avtp: rvf: add AVTP RVF payload support
+	  Add AVTP Raw Video Format payload support. The element supports only GRAY16_LE
+	  input format, so:
+	  - active pixels (no vertical blanking),
+	  - progressive mode,
+	  - 8 and 16-bit pixel depth,
+	  - mono pixel format,
+	  - grayscale colorspace.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1335>
+
+2021-11-04 12:59:21 +0100  Adrian Fiergolski <adrian.fiergolski@fastree3d.com>
+
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/avtp/gstavtpcvfpay.c:
+	* ext/avtp/gstavtpcvfpay.h:
+	* ext/avtp/gstavtpvfpaybase.c:
+	* ext/avtp/gstavtpvfpaybase.h:
+	* ext/avtp/meson.build:
+	  avtp: cvf: extract AVTP VF payload base class
+	  Extract a part which could be common with the AVTP RVF payload plugin to a separate class.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1335>
 
-2022-02-13 10:39:37 +0800  He Junyan <junyan.he@intel.com>
+2022-11-09 20:20:35 +0100  Piotr Brzeziński <piotr@centricular.com>
 
-	* gst-libs/gst/va/meson.build:
-	  meson: va: Remove va option check from gst-libs
-	  Building libgstva-1.0 unconditionally for the va implementation can be
-	  used by non-va plugins such as MSDK even when va plugin is disabled
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1685>
+	* sys/applemedia/vtenc.c:
+	  vtenc: Disable HW acceleration for interlaced ProRes
+	  Due to a bug in the VT API, attempting to encode interlaced content
+	  with ProRes results in an error, halting the pipeline instead of
+	  gracefully falling back to software encoding.
+	  Should be removed in the future if Apple ever fixes this issue.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3222>
 
-2022-02-12 10:05:11 +0000  Philippe Normand <philn@igalia.com>
+2023-01-19 11:03:09 +0800  He Junyan <junyan.he@intel.com>
 
-	* gst-libs/gst/webrtc/dtlstransport.c:
-	  dtlstransport: Notify ICE transport property changes
-	  The application might track the underlying ICE transport, so not notifying
-	  changes might lead to use-after-free issues.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1688>
+	* sys/va/gstvah264dec.c:
+	  va: Avoid the array index overflow when filling 8x8 scaling list.
+	  The VA API has not defined the scaling list entries for U/V planes
+	  for the 4:4:4 stream. In fact, we do not meet the 4:4:4 format output
+	  for H264 so far, and scaling list is not used frequently, so we just
+	  print out some warning and ignore these scaling list values.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3749>
 
-2022-02-12 14:51:51 +0800  He Junyan <junyan.he@intel.com>
+2023-02-02 05:04:48 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvavpp.c:
-	  vavpp: Fix the caps leak in the transform_caps() function.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1689>
+	* sys/nvcodec/gstnvvp9dec.c:
+	  nvvp9dec: Fix return value
+	  It should return GstFlowReturn value, not boolean
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3870>
 
-2022-02-12 00:51:56 +0900  Seungha Yang <seungha@centricular.com>
+2023-02-01 17:26:57 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* gst-libs/gst/d3d11/meson.build:
-	  meson: d3d11: Remove d3d11 option check from gst-libs
-	  Build gstd3d11-1.0 unconditionally for d3d11 implementation can be used
-	  by non-d3d11 plugins even when d3d11 plugin is disabled
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1684>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/aom/gstav1dec.c:
+	* ext/aom/gstav1enc.c:
+	  aom: Include stream-format and alignment in the AV1 caps
+	  The decoder does not work with arbitrary alignment and annexb stream
+	  format and the encoder can give the information that it outputs
+	  obu-stream/tu to downstream.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3862>
 
-2022-02-10 22:31:06 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-27 15:40:21 -0500  Olivier Crête <olivier.crete@collabora.com>
 
-	* gst-libs/gst/d3d11/gstd3d11_fwd.h:
-	* gst-libs/gst/d3d11/gstd3d11_private.h:
-	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
-	* gst-libs/gst/d3d11/gstd3d11config.h.meson:
-	* gst-libs/gst/d3d11/gstd3d11device.cpp:
-	* gst-libs/gst/d3d11/gstd3d11format.cpp:
-	* gst-libs/gst/d3d11/gstd3d11stagingbufferpool.cpp:
-	* gst-libs/gst/d3d11/meson.build:
-	* sys/d3d11/gstd3d11convert.cpp:
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	* sys/d3d11/gstd3d11pluginutils.h:
-	* sys/d3d11/gstd3d11screencapturedevice.h:
-	* sys/d3d11/gstd3d11videoprocessor.cpp:
-	* sys/d3d11/gstd3d11videoprocessor.h:
-	* sys/d3d11/gstd3d11window.cpp:
-	* sys/d3d11/gstd3d11window_dummy.cpp:
-	* sys/d3d11/gstd3d11window_win32.cpp:
-	* sys/d3d11/meson.build:
-	* sys/d3d11/plugin.cpp:
-	* sys/mediafoundation/plugin.cpp:
-	  d3d11: Update build-time dependency
-	  Remove all the d3d11 and dxgi header version dependent ifdef
-	  and bump the minimum requirement to d3d11_4.h and dxgi1_6.h.
-	  We are already failing support old Visual Studio (Windows SDK actually)
-	  such as Visual Studio 2015. Note that our MinGW toolchain satisfies
-	  the requirement.
-	  From runtime point of view, this change should be fine since
-	  we are checking OS version with IUnknown::QueryInterface()
-	  everywhere in order to check API availability
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1684>
+	* gst-libs/gst/wayland/gstwlbuffer.h:
+	* gst-libs/gst/wayland/gstwldisplay.h:
+	* gst-libs/gst/wayland/gstwlshmallocator.h:
+	* gst-libs/gst/wayland/gstwlvideobufferpool.h:
+	* gst-libs/gst/wayland/gstwlwindow.h:
+	  wayland: Export the _get_type() functions
+	  Add the macro before the declaration so the types are properly exported,
+	  this makes it possible to do dynamic casting and checks.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3858>
 
-2021-05-08 17:54:34 +0800  He Junyan <junyan.he@intel.com>
+2022-12-21 16:32:10 +0800  Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>
 
+	* sys/msdk/gstmsdkallocator.c:
+	* sys/msdk/gstmsdkallocator.h:
 	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkenc.h:
-	* sys/msdk/gstmsdkh265enc.c:
-	* sys/msdk/gstmsdkvp9enc.c:
+	* sys/msdk/gstmsdkvpp.c:
+	* sys/msdk/msdk.c:
 	* sys/msdk/msdk.h:
-	  MSDK: Import VA surface as encoder's input.
-	  We make all MSDK encoders declare "memory:VAMemory" feature. Then
-	  the pipeline such as:
-	  gst-launch-1.0 -vf filesrc location=xxx.h264 ! h264parse ! \
-	  vah264dec ! msdkh265enc ! fakesink
-	  will choose VA memory caps between the VA decoder and MSDK encoder.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1087>
+	  msdkallocator: Use const ptr of videoinfo in func param
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3621>
 
-2021-05-08 17:26:27 +0800  He Junyan <junyan.he@intel.com>
+2023-01-11 15:20:21 +0100  Benjamin Gaignard <benjamin.gaignard@collabora.com>
 
-	* sys/msdk/gstmsdk_va.c:
-	* sys/msdk/gstmsdk_va.h:
-	* sys/msdk/meson.build:
-	  MSDK: Add helper function to peek VA surface of VA kind gstbuffer.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1087>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/codec2json/gstav12json.c:
+	* ext/codec2json/gstav12json.h:
+	* ext/codec2json/meson.build:
+	* ext/codec2json/plugin.c:
+	  codec2json: Add av12json element
+	  This element convert AV1 frame header into human readable
+	  json data.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3734>
 
-2021-05-08 15:51:11 +0800  He Junyan <junyan.he@intel.com>
+2023-01-04 10:35:20 +0100  Benjamin Gaignard <benjamin.gaignard@collabora.com>
 
-	* sys/msdk/gstmsdkenc.c:
-	  MSDK: Handle context query into the encoder's query function.
-	  The MSDK encoder's query function is not set and it just forwards
-	  all query to its base class. We now need to answer the context
-	  query correctly. Other VA plugins need to query the VA display.
-	  By the way, the current query of "gst.msdk.Context" is also missing.
-	  The other MSDK elements must depend on the bin's context message(
-	  sent in context_propagate()) to set their MsdkContext correctly.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1087>
+	* docs/plugins/gst_plugins_cache.json:
+	* ext/codec2json/gstvp82json.c:
+	* ext/codec2json/gstvp82json.h:
+	* ext/codec2json/meson.build:
+	* ext/codec2json/plugin.c:
+	* ext/meson.build:
+	* meson_options.txt:
+	  codec2json: Add vp82json element
+	  This element convert vp8 frame header into human readable
+	  json data.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3734>
 
-2021-08-17 22:36:59 +0800  He Junyan <junyan.he@intel.com>
+2023-01-25 19:20:19 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/msdk/gstmsdkvpp.c:
-	  MSDK: Handle context query into the VPP's query function.
-	  The MSDK VPP's query function is not set and it just forwards
-	  all query to its base class. We now need to answer the context
-	  query correctly. Other VA plugins need to query the VA display.
-	  By the way, the current query of "gst.msdk.Context" is also missing.
-	  The other MSDK elements must depend on the bin's context message(
-	  sent in context_propagate()) to set their MsdkContext correctly.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1087>
+	* gst-libs/gst/codecparsers/gstvp9parser.c:
+	* gst-libs/gst/codecparsers/gstvp9parser.h:
+	  codecparsers: vp9parser: use single allocation for parser structs
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3790>
 
-2021-08-17 22:34:43 +0800  He Junyan <junyan.he@intel.com>
+2023-01-27 15:54:48 -0300  Thibault Saunier <tsaunier@igalia.com>
 
-	* sys/msdk/gstmsdkdec.c:
-	  MSDK: Handle context query into the decoder's query function.
-	  The MSDK decoder's query function is not set and it just forwards
-	  all query to its base class. We now need to answer the context
-	  query correctly. Other VA plugins need to query the VA display.
-	  By the way, the current query of "gst.msdk.Context" is also missing.
-	  The other MSDK elements must depend on the bin's context message(
-	  sent in context_propagate()) to set their MsdkContext correctly.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1087>
+	* gst/transcode/gsturitranscodebin.c:
+	  uritranscodebin: Fix unref of NULL
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3831>
 
-2021-08-17 22:33:18 +0800  He Junyan <junyan.he@intel.com>
+2023-01-19 22:22:52 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkcontextutil.c:
-	* sys/msdk/gstmsdkcontextutil.h:
-	  MSDK: Add a handle_context_query() helper function.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1087>
+	* sys/win32ipc/gstwin32ipcbufferpool.cpp:
+	* sys/win32ipc/gstwin32ipcbufferpool.h:
+	* sys/win32ipc/gstwin32ipcmemory.cpp:
+	* sys/win32ipc/gstwin32ipcmemory.h:
+	* sys/win32ipc/gstwin32ipcvideosink.cpp:
+	* sys/win32ipc/gstwin32ipcvideosrc.cpp:
+	* sys/win32ipc/meson.build:
+	* sys/win32ipc/protocol/win32ipcpipeclient.cpp:
+	* sys/win32ipc/protocol/win32ipcpipeclient.h:
+	* sys/win32ipc/protocol/win32ipcpipeserver.cpp:
+	* sys/win32ipc/protocol/win32ipcpipeserver.h:
+	* sys/win32ipc/protocol/win32ipcprotocol.cpp:
+	* sys/win32ipc/protocol/win32ipcprotocol.h:
+	  win32ipc: Add support for zero-copy rendering
+	  * Extend protocol so that client can notify of releasing shared memory
+	  * Server will hold shared memory object until it's released by client
+	  * Add allocator/buffer pool to reuse shared memory objects and buffers
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3765>
 
-2021-08-17 21:51:58 +0800  He Junyan <junyan.he@intel.com>
+2022-12-30 00:49:27 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/gstmsdkcontextutil.c:
-	* sys/msdk/gstmsdkcontextutil.h:
-	* sys/msdk/gstmsdkdec.c:
-	* sys/msdk/gstmsdkenc.c:
-	* sys/msdk/gstmsdkvpp.c:
-	  MSDK: Improve the GstContext setting logic.
-	  We now can use the gst va lib's display to create our MSDK context,
-	  and use its helper functions to simplify our code. The improved logic
-	  is like this:
-	  1. Every MSDK element should use gst_msdk_context_find() to find a MSDK
-	  context from neighbour. If valid, reuse it.
-	  2. Use gst_msdk_ensure_new_context(). It will first query neighbours
-	  about the GstVaDisplay, if found(e.g. some VA element is connected),
-	  use gst_msdk_context_from_external_display() to create a MSDK context.
-	  3. Then, creating the MSDK context from scratch. It creates both the
-	  display and MSDK context.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1087>
+	* gst/mpegdemux/gstmpegdemux.c:
+	  mpegpsdemux: Ignore DTS if PTS < DTS
+	  It's possibly timestamp rollover case. But PTS < DTS is already
+	  invalid case anyway.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3657>
 
-2021-05-08 13:49:23 +0800  He Junyan <junyan.he@intel.com>
+2022-12-06 16:30:32 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/msdk/gstmsdkcontext.c:
-	* sys/msdk/gstmsdkcontext.h:
-	  MSDK: Add new_with_va_display() helper function to create context.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1087>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/sdp/gstsdpdemux.c:
+	* gst/sdp/gstsdpdemux.h:
+	  sdpdemux: add "media" property to allow audio-only or video-only streaming
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3531>
 
-2021-05-08 11:44:57 +0800  He Junyan <junyan.he@intel.com>
+2022-12-06 16:13:56 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/msdk/gstmsdkcontext.c:
-	* sys/msdk/gstmsdkcontext.h:
-	  MSDK: Use the VA display object to replace the raw display handle.
-	  The VA display object from VA lib is a common defined object. which
-	  contain the whole display things. It is easier to use, and more important,
-	  we can share it with the other VA plugins and keep all the VA related
-	  plugins working on the same GPU device.
-	  We also delete the useless gst_msdk_context_get_fd() API.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1087>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/sdp/gstsdpdemux.c:
+	* gst/sdp/gstsdpdemux.h:
+	  sdpdemux: add "rtcp-mode" property to disable RTCP
+	  If we know there's only one stream we care about and we
+	  don't have to synchronise audio and video, or send RRs,
+	  we might just as well not hook up all the RTCP bits and
+	  use fewer threads and sockets and simplify the pipeline.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3531>
 
-2022-02-11 11:11:03 +0800  He Junyan <junyan.he@intel.com>
+2023-01-24 23:26:50 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/msdk/meson.build:
-	  MSDK: Add the gst va lib into MSDK's dependency.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1087>
+	* sys/wasapi2/gstwasapi2ringbuffer.cpp:
+	  wasapi2src: Fix loopback capture on Windows 10 Anniversary Update
+	  ... or older. Work around an OS bug that loopback capture
+	  device doesn't notify event.
+	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1738
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3782>
 
-2022-02-10 12:52:30 +0800  He Junyan <junyan.he@intel.com>
+2023-01-12 17:15:12 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Add temporal unit check when TD is absent.
-	  The current manner for deciding the new temporal unit is based on
-	  temporal delimiter(TD) OBU. We only start a new temporal unit when
-	  the TD comes.
-	  But some streams do not have TD at all, which makes the output "TU"
-	  alignment fail to work. We now add check based on the relationship
-	  between the different layers and it can successfully judge the TU edge.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1634>
+	* gst-libs/gst/vulkan/gstvkimagebufferpool.c:
+	* gst-libs/gst/vulkan/gstvkvideofilter.c:
+	  vulkan: imagebufferpool: Remove video meta handling.
+	  Remove video meta handling since it's not used at all, also removed its usage in
+	  vkvideofilter.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3722>
 
-2022-02-04 17:12:15 +0800  He Junyan <junyan.he@intel.com>
+2023-01-11 16:46:40 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: let the parse continue when MISSING_OBU_REFERENCE error.
-	  Some streams may have verbose OBUs before a valid sequence header. We
-	  should let the parse continue rather than return a error.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1634>
+	* gst-libs/gst/vulkan/gstvkphysicaldevice.c:
+	  vulkan: physicaldevice: Dump 1.3 features and properties.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3721>
 
-2022-02-04 11:40:18 +0800  He Junyan <junyan.he@intel.com>
+2023-01-04 17:30:47 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
 
-	* gst/videoparsers/gstav1parse.c:
-	  av1parse: Continue when we fail to detect the alignment.
-	  Some streams may have problematic OBUs at the beginning, which causes
-	  the parse fail to detect the alignment and return error. For example,
-	  there may be verbose OBUs before a valid sequence, which should be
-	  discarded until we meet a valid sequence. We should let the parse
-	  continue when we meet such cases, rather than just return error.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1634>
-
-2021-03-30 19:23:12 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst/ivfparse/gstivfparse.c:
-	  ivfparse: Don't set zero resolution on caps
-	  It could be zero if the information is not available at ivfparse
-	  side, or not implemented. In that case, simply don't set
-	  width/height on caps, otherwise downstream would be confused
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1649>
-
-2022-01-29 01:52:26 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/mediafoundation/gstmfmp3dec.cpp:
-	* sys/mediafoundation/gstmfmp3dec.h:
-	* sys/mediafoundation/meson.build:
-	* sys/mediafoundation/plugin.cpp:
-	  mediafoundation: Add support for MP3 decoding
-	  See also
-	  https://docs.microsoft.com/en-us/windows/win32/medfound/windows-media-mp3-decoder
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1596>
-
-2022-01-27 02:20:37 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/mediafoundation/gstmfaacdec.cpp:
-	* sys/mediafoundation/gstmfaacdec.h:
-	* sys/mediafoundation/gstmfaudiodecoder.cpp:
-	* sys/mediafoundation/gstmfaudiodecoder.h:
-	* sys/mediafoundation/gstmfutils.cpp:
-	* sys/mediafoundation/gstmfutils.h:
-	* sys/mediafoundation/meson.build:
-	* sys/mediafoundation/plugin.cpp:
-	  mediafoundation: Add support for AAC decoding
-	  See also
-	  https://docs.microsoft.com/en-us/windows/win32/medfound/aac-decoder
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1596>
-
-2022-01-28 01:45:30 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/mediafoundation/gstmfaacenc.cpp:
-	* sys/mediafoundation/gstmfaudioencoder.cpp:
-	* sys/mediafoundation/gstmfaudioencoder.h:
-	* sys/mediafoundation/gstmfh264enc.cpp:
-	* sys/mediafoundation/gstmfh265enc.cpp:
-	* sys/mediafoundation/gstmfmp3enc.cpp:
-	* sys/mediafoundation/gstmfsourcereader.cpp:
-	* sys/mediafoundation/gstmftransform.cpp:
-	* sys/mediafoundation/gstmfvideoencoder.cpp:
-	* sys/mediafoundation/gstmfvideoencoder.h:
-	* sys/mediafoundation/gstmfvp9enc.cpp:
-	* sys/mediafoundation/meson.build:
-	* sys/mediafoundation/plugin.cpp:
-	  mediafoundation: Cosmetic changes
-	  Rename baseclass to be consistent with other Windows plugins
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1596>
-
-2022-01-27 02:26:02 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/mediafoundation/gstmfaudioenc.cpp:
-	* sys/mediafoundation/gstmftransform.cpp:
-	* sys/mediafoundation/gstmfvideoenc.cpp:
-	  mediafoundation: Use & operator instead of GetAddressOf()
-	  Use shorter expression
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1596>
+	* gst-libs/gst/vulkan/gstvkmemory.c:
+	  vulkan: memory: Flush non coherent memory after write.
+	  Spec 7.1.3:
+	  If a memory object does not have the VK_MEMORY_PROPERTY_HOST_COHERENT_BIT
+	  property, then vkFlushMappedMemoryRanges must be called in order to guarantee
+	  that writes to the memory object from the host are made available to the host
+	  domain, where they can be further made available to the device domain via a
+	  domain operation. Similarly, vkInvalidateMappedMemoryRanges must be called to
+	  guarantee that writes which are available to the host domain are made visible to
+	  host operations.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3723>
 
-2022-01-24 02:41:29 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-24 20:43:35 +0200  Sebastian Dröge <sebastian@centricular.com>
 
-	* sys/mediafoundation/gstmfaacenc.cpp:
-	* sys/mediafoundation/gstmfaudioenc.cpp:
-	* sys/mediafoundation/gstmfcapturewinrt.cpp:
-	* sys/mediafoundation/gstmfdevice.cpp:
-	* sys/mediafoundation/gstmfh264enc.cpp:
-	* sys/mediafoundation/gstmfh265enc.cpp:
-	* sys/mediafoundation/gstmfmp3enc.cpp:
-	* sys/mediafoundation/gstmfplatloader.cpp:
-	* sys/mediafoundation/gstmfsourceobject.cpp:
-	* sys/mediafoundation/gstmfsourcereader.cpp:
-	* sys/mediafoundation/gstmftransform.cpp:
-	* sys/mediafoundation/gstmfutils.cpp:
-	* sys/mediafoundation/gstmfvideobuffer.cpp:
-	* sys/mediafoundation/gstmfvideoenc.cpp:
-	* sys/mediafoundation/gstmfvideosrc.cpp:
-	* sys/mediafoundation/gstmfvp9enc.cpp:
-	* sys/mediafoundation/gstwin32devicewatcher.cpp:
-	* sys/mediafoundation/mediacapturewrapper.cpp:
-	* sys/mediafoundation/meson.build:
-	* sys/mediafoundation/plugin.cpp:
-	  mediafoundation: Port to C++
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1596>
+	* ext/svtav1/gstsvtav1enc.c:
+	  gstreamer: Use stream-format=obu-stream alignment=tu in the caps
+	  There is no byte-stream/au format for AV1 but only for H264, and the
+	  encoder actually outputs obu-stream/tu instead of the annexb
+	  stream-format that is similar to H264 byte-stream format.
+	  Without this the encoder can't be used with elements that require a
+	  specific AV1 stream-format, e.g. the MP4 or Matroska/WebM muxer.
 
-2022-02-09 03:27:41 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-25 09:10:57 -0500  U. Artie Eoff <ullysses.a.eoff@intel.com>
 
-	* sys/d3d11/plugin.cpp:
-	  d3d11decoder: Promote rank to primary except for mpeg2
-	  Our D3D11/DXVA codecs implementation has been verified
-	  during 1.18 and 1.20 development cycle and also via the Fluster
-	  test framework. Similar to the case of nvdec and vtdec,
-	  we can prefer hardware over software in most cases
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1672>
+	* gst-libs/gst/codecparsers/gstvp9parser.c:
+	  vp9parser: remove checks for g_new0 result
+	  The g_new0 aborts the process if it fails.  Thus,
+	  there is no need to check if the g_new0 call succeeded.
+	  This should silence a resource leak warning by static
+	  scan.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3788>
 
-2022-02-09 15:05:14 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-01-14 12:29:03 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
-	  v4l2codecs: vp9: Fix duplicating a duplicated picture
-	  Duplicating a picture what was already a dup was leading to a crash. Rename
-	  the custom picture flags as HOLDS_BUFFER to make its meaning clear. Then save
-	  then ref and store the picture as userdata, so it can be obtained when
-	  duplicating. Finally, mark the doplicated as HOLDS_BUFFER to avoid thinking it
-	  holds a request.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1681>
-
-2022-02-10 01:48:23 +0900  Seungha Yang <seungha@centricular.com>
-
-	* sys/mediafoundation/gstmfaudioenc.cpp:
-	  mfaudioenc: Handle empty IMFMediaBuffer
-	  IMFMediaBuffer may not hold encoded data, which seems to happen
-	  while draining.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1679>
+	* ext/srtp/meson.build:
+	  meson: Add a wrap file for libsrt2p
+	  And allow fallback to it.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3708>
 
-2022-02-03 10:10:44 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-01-24 11:26:02 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/va/gstvadecoder.c:
-	  va: decoder: Log profile name.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1675>
+	* sys/nvcodec/plugin.c:
+	  nvcodec: Log readable errors when initializing CUDA
+	  It is really difficult for people to figure out why nvcodec has
+	  0 features. Even the debug log is cryptic. Also make sure the errors
+	  go to the ERROR log level, which is more likely to be enabled by
+	  default.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3776>
 
-2022-01-24 16:25:18 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-01-24 11:16:38 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
 
-	* sys/va/gstvafilter.c:
-	  va: filter: Log the added filter name.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1675>
+	* sys/nvcodec/plugin.c:
+	  nvcodec: Fix reporting of CuDeviceGetCount error
+	  cuda_ret is was always going to be CUDA_SUCCESS in the error log.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3776>
 
-2021-10-25 13:41:49 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2022-12-29 02:25:52 +0900  Seungha Yang <seungha@centricular.com>
 
-	* sys/va/gstvafilter.c:
-	* sys/va/gstvafilter.h:
-	* sys/va/gstvavpp.c:
-	  vapostproc: Process HDR caps
-	  This patch adds a new parameter: hdr-tone-mapping (same as
-	  vaapipostproc), if the HDR capabilites are availabe in driver, and
-	  it's disabled by default.
-	  If hdr-tone-mapping is enabled then HDR fields in sink caps are
-	  processed in frames from HDR to SDR, removing those hdr fields in
-	  source pad caps too.
-	  hdr-tone-mapping is not enabled if a color conversion is also
-	  requested, since it fails to process in the iHD driver, so far.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1258>
+	* gst-libs/gst/d3d11/gstd3d11device.cpp:
+	* sys/d3d11/gstd3d11decoder.cpp:
+	* sys/d3d11/gstd3d11screencapturedevice.cpp:
+	  d3d11: Don't use g_alloca()
+	  _alloca CRT function is deprecated. Moreover, stack allocation
+	  for string is not a good idea. We can use _malloca inline
+	  function instead, but all use of _alloca in d3d11 library/plugin
+	  are not performance critical path at all.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3652>
 
-2021-09-30 17:42:19 +0200  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-01-24 09:25:52 -0300  Thibault Saunier <tsaunier@igalia.com>
 
-	* gst-libs/gst/va/meson.build:
-	* sys/msdk/meson.build:
-	  build: Add libva dependency fallback.
-	  Then libva can be subproject and used by either gstreamer-vaapi,
-	  va and msdk in gst-plugins-bad.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1397>
-
-2022-02-06 23:20:32 +0900  Sangchul Lee <sc11.lee@samsung.com>
-
-	* ext/webrtc/gstwebrtcice.c:
-	  webrtcice: Fix memory leaks in gst_webrtc_ice_add_candidate()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1646>
+	* docs/plugins/gst_plugins_cache.json:
+	* gst/codectimestamper/gsth264timestamper.c:
+	* gst/codectimestamper/gsth265timestamper.c:
+	  timestamper: Classify as Timestamper and make them RANK_MARGINAL
+	  This way those elements can be autoplugged when needed
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3779>
 
-2022-01-28 14:49:42 -0500  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+2023-01-08 18:48:15 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/v4l2codecs/gstv4l2codecvp9dec.c:
-	* sys/v4l2codecs/gstv4l2decoder.c:
-	  v4l2codecs: vp9: Make compressed hdr control optional
-	  This is to supported by Mediatek VP9 driver. Mediatek handles
-	  the forward probabilities in hardware hence does not need and
-	  does not implement support for
-	  V4L2_CID_STATELESS_VP9_COMPRESSED_HDR.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1600>
+	* gst/jpegformat/gstjifmux.c:
+	  jpegformat: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-07 12:34:53 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-01-08 18:47:51 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst-libs/gst/va/meson.build:
-	  va: Fix and simplify build recipe.
-	  1. Use api_version variable rather than static string.
-	  2. Remove pkgconfig generation since currently the library
-	  is not installed, only used internally.
-	  3. Rely on dependency "required" to abort compilation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1650>
+	* gst/rist/gstristrtxsend.c:
+	* gst/rist/gstristsink.c:
+	* gst/rist/gstristsrc.c:
+	  rist: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-07 11:27:57 +0100  Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
+2023-01-08 18:47:24 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst-libs/gst/va/meson.build:
-	* sys/va/meson.build:
-	  va: Remove libgudev crumbs in library.
-	  In commit e699aaeb we moved linking of libgudev to the plugin rather
-	  the library, because it's only used in the plugin. But the dependency
-	  check is still done in library.
-	  This patch removes the dependency check in library, and updates the
-	  dependency check in plugin.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1650>
+	* gst/netsim/gstnetsim.c:
+	  netsim: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-08 04:51:24 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:46:53 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/msdk/msdk.c:
-	* sys/msdk/msdk.h:
-	  msdk: Fix for MFXUnload symbol re-definition build error
-	  Fix for libgstreamer-full build
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1408>
+	* gst/mpegpsmux/bits.h:
+	* gst/mpegpsmux/psmux.c:
+	* gst/mpegpsmux/psmuxstream.c:
+	  mpegpsmux: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2021-12-25 00:13:04 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:46:03 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/qsv/gstqsvh265enc.cpp:
-	* sys/qsv/gstqsvh265enc.h:
-	* sys/qsv/meson.build:
-	* sys/qsv/plugin.cpp:
-	  qsv: Add support for HEVC encoding
-	  main and main-10 profiles are supported for now
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1408>
+	* gst/mpegtsdemux/mpegtspacketizer.c:
+	* gst/mpegtsdemux/tsdemux.c:
+	  mpegtsdemux: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2021-12-19 21:39:53 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:44:53 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/qsv/gstqsvallocator.cpp:
-	* sys/qsv/gstqsvallocator_d3d11.cpp:
-	* sys/qsv/gstqsvvp9enc.cpp:
-	* sys/qsv/gstqsvvp9enc.h:
-	* sys/qsv/meson.build:
-	* sys/qsv/plugin.cpp:
-	  qsv: Add support for VP9 encoding and more video formats
-	  Add VP9 encoder with 4:2:0 8 bits and 4:4:4 8/10 bits formats support
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1408>
+	* gst/mpegtsmux/tsmux/tsmux.c:
+	* gst/mpegtsmux/tsmux/tsmuxstream.c:
+	  mpegtsmux: drop use of GSlice allocator
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-06 21:34:43 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:43:02 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* meson_options.txt:
-	* sys/meson.build:
-	* sys/qsv/gstqsvallocator.cpp:
-	* sys/qsv/gstqsvallocator.h:
-	* sys/qsv/gstqsvallocator_d3d11.cpp:
-	* sys/qsv/gstqsvallocator_d3d11.h:
-	* sys/qsv/gstqsvallocator_va.cpp:
-	* sys/qsv/gstqsvallocator_va.h:
-	* sys/qsv/gstqsvencoder.cpp:
-	* sys/qsv/gstqsvencoder.h:
-	* sys/qsv/gstqsvh264enc.cpp:
-	* sys/qsv/gstqsvh264enc.h:
-	* sys/qsv/gstqsvutils.cpp:
-	* sys/qsv/gstqsvutils.h:
-	* sys/qsv/libmfx/meson.build:
-	* sys/qsv/meson.build:
-	* sys/qsv/plugin.cpp:
-	  qsv: Introduce H.264 Intel Quick Sync Video Encoder
-	  A new implementation of Intel Quick Sync Video plugin.
-	  This plugin supports both Windows and Linux but optimization for
-	  VA/DMABuf is not implemented yet.
-	  This new plugin has some notable differences compared with existing
-	  MSDK plugin.
-	  * Encoder will expose formats which can be natively supported
-	  without internal conversion. This will make encoder
-	  control/negotiation flow much simpler and cleaner than
-	  that of MSDK plugin.
-	  * This plugin includes QSV specific library loading helper,
-	  called dispatcher, with QSV SDK headers as a part of this plugin.
-	  So, there will be no more SDK version dependent #ifdef in the code
-	  and also there will be no more build-time MSDK/oneVPL SDK
-	  dependency.
-	  * Memory allocator interop between GStreamer and QSV is re-designed
-	  and decoupled. Instead of implementing QSV specific allocator/bufferpool,
-	  this plugin will make use of generic GStreamer memory
-	  allocator/bufferpool (e.g., GstD3D11Allocator and GstD3D11BufferPool).
-	  Specifically, GstQsvAllocator object will help interop between
-	  GstMemory and mfxFrameAllocator memory abstraction layers.
-	  Note that because of the design decision, VA/DMABuf support is not made
-	  as a part of this initial commit. We can add the optimization for Linux
-	  later once GstVA library exposes allocator/bufferpool implementation as
-	  an API like GstD3D11.
-	  * Initial encoder implementation supports interop with GstD3D11
-	  infrastructure, including zero-copy encoding with upstream D3D11 element.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1408>
+	* gst/jp2kdecimator/jp2kcodestream.c:
+	  jp2kdecimator: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2021-12-01 22:18:42 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:39:59 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dxva2_device.h:
-	  qsv: Remove unnecessary pargma message
-	  We know what we are doing, just remove noisy build warnings
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1408>
+	* gst/rtmp2/TODO:
+	* gst/rtmp2/rtmp/amf.c:
+	* gst/rtmp2/rtmp/rtmpchunkstream.c:
+	* gst/rtmp2/rtmp/rtmpclient.c:
+	* gst/rtmp2/rtmp/rtmpconnection.c:
+	* gst/rtmp2/rtmp/rtmphandshake.c:
+	* gst/rtmp2/rtmp/rtmputils.c:
+	  rtmp2: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2021-12-01 22:18:04 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:35:48 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/qsv/libmfx/api/vpl/mfx.h:
-	* sys/qsv/libmfx/api/vpl/mfxadapter.h:
-	* sys/qsv/libmfx/api/vpl/mfxbrc.h:
-	* sys/qsv/libmfx/api/vpl/mfxcommon.h:
-	* sys/qsv/libmfx/api/vpl/mfxdefs.h:
-	* sys/qsv/libmfx/api/vpl/mfxdispatcher.h:
-	* sys/qsv/libmfx/api/vpl/mfxdispatcherprefixedfunctions.h:
-	* sys/qsv/libmfx/api/vpl/mfximplcaps.h:
-	* sys/qsv/libmfx/api/vpl/mfxjpeg.h:
-	* sys/qsv/libmfx/api/vpl/mfxmvc.h:
-	* sys/qsv/libmfx/api/vpl/mfxpcp.h:
-	* sys/qsv/libmfx/api/vpl/mfxsession.h:
-	* sys/qsv/libmfx/api/vpl/mfxstructures.h:
-	* sys/qsv/libmfx/api/vpl/mfxsurfacepool.h:
-	* sys/qsv/libmfx/api/vpl/mfxvideo++.h:
-	* sys/qsv/libmfx/api/vpl/mfxvideo.h:
-	* sys/qsv/libmfx/api/vpl/mfxvp8.h:
-	* sys/qsv/libmfx/dispatcher/linux/device_ids.h:
-	* sys/qsv/libmfx/dispatcher/linux/libvpl.map:
-	* sys/qsv/libmfx/dispatcher/linux/mfxloader.cpp:
-	* sys/qsv/libmfx/dispatcher/linux/mfxloader.h:
-	* sys/qsv/libmfx/dispatcher/linux/mfxvideo_functions.h:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl.cpp:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl.h:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_config.cpp:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_log.cpp:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_log.h:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_lowlatency.cpp:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp:
-	* sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_win.h:
-	* sys/qsv/libmfx/dispatcher/windows/libmfx.def:
-	* sys/qsv/libmfx/dispatcher/windows/main.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_critical_section.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_critical_section.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dispatcher.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dispatcher.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dispatcher_defs.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dispatcher_log.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dispatcher_log.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_driver_store_loader.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_driver_store_loader.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dxva2_device.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_dxva2_device.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_exposed_functions_list.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_function_table.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_library_iterator.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_library_iterator.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_load_dll.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_load_dll.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_vector.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_win_reg_key.cpp:
-	* sys/qsv/libmfx/dispatcher/windows/mfx_win_reg_key.h:
-	* sys/qsv/libmfx/dispatcher/windows/mfxvideo++.h:
-	* sys/qsv/libmfx/dispatcher/windows/version.rc.in:
-	  qsv: Import libmfx API and dispatch code from oneVPL project
-	  Copied from oneVPL project (https://github.com/oneapi-src/oneVPL)
-	  v2022.0.3 tag at the commit of efc259f8b7ee5c334bca1a904a503186038bbbdd
-	  This is corresponding to MFX API version 2.6
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1408>
+	* gst/mxf/mxfaes-bwf.c:
+	* gst/mxf/mxfmetadata.c:
+	* gst/mxf/mxfmpeg.c:
+	* gst/mxf/mxftypes.c:
+	* gst/mxf/mxftypes.h:
+	  mxf: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2021-12-07 21:29:05 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:15:46 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	  d3d11memory: Inform subresource index via GstMapInfo::user_data
-	  By using this way, caller does not need to call another method
-	  gst_d3d11_memory_get_subresource_index()
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1408>
+	* gst/dvbsuboverlay/dvb-sub.c:
+	  dvbsuboverlay: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-06 21:36:28 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:14:24 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst-libs/gst/d3d11/gstd3d11bufferpool.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.cpp:
-	* gst-libs/gst/d3d11/gstd3d11memory.h:
-	* gst-libs/gst/d3d11/gstd3d11stagingbufferpool.cpp:
-	* sys/d3d11/gstd3d11pluginutils.cpp:
-	  d3d11memory: Add support for ID3D11Buffer
-	  Allow wrap ID3D11Buffer via GstD3D11Memory object
-	  At the moment, only staging ID3D11Buffer is supported.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1408>
+	* ext/svthevcenc/gstsvthevcenc.c:
+	  svthevcenc: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-01 00:50:53 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:10:42 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/nvcodec/gstnvh265dec.c:
-	  nvh265sldec: Fix for decoding 12bits stream
-	  We've been exposing main-444-12 profile as a supported profile
-	  in its sinkpad template but not actaully. Adding code to
-	  covert 12 and 16 bits as well.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1612>
+	* ext/x265/gstx265enc.c:
+	  x265: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-01 00:12:06 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:10:12 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/nvcodec/gstnvdecoder.c:
-	* sys/nvcodec/gstnvdecoder.h:
-	* sys/nvcodec/gstnvh264dec.c:
-	* sys/nvcodec/gstnvh265dec.c:
-	* sys/nvcodec/gstnvvp8dec.c:
-	* sys/nvcodec/gstnvvp9dec.c:
-	  nvdecoder: Fix for HEVC 4:4:4 format decoding
-	  Map chroma_format_idc == 3 (which means 4:4:4 subsampling) correctly,
-	  also pass coded bitdepth for decoder initialization instead of
-	  inferring it from output format since they can be different.
-	  Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/949
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1612>
-
-2022-02-07 22:38:02 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst-libs/gst/d3d11/gstd3d11stagingbufferpool.cpp:
-	  d3d11stagingbufferpool: Fix typo in texture description
-	  Fixing typo, it should be height
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1652>
+	* ext/wpe/WPEThreadedView.cpp:
+	  wpe: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2021-10-27 11:08:39 +0800  He Junyan <junyan.he@intel.com>
+2023-01-08 18:08:34 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst-libs/gst/va/gstva.h:
-	* gst-libs/gst/va/meson.build:
-	* sys/va/gstvaallocator.h:
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvabasetransform.c:
-	* sys/va/gstvacaps.h:
-	* sys/va/gstvadecoder.c:
-	* sys/va/gstvadecoder.h:
-	* sys/va/gstvadeinterlace.c:
-	* sys/va/gstvadevice.h:
-	* sys/va/gstvafilter.h:
-	* sys/va/gstvasurfacecopy.h:
-	* sys/va/gstvavpp.c:
-	* sys/va/vasurfaceimage.h:
-	* tests/examples/va/main.c:
-	* tests/examples/va/multiple-vpp.c:
-	  va: Add a gstva.h to include all va lib header files.
-	  And replacing all va lib headers with this new header files
-	  when including.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1256>
+	* ext/ttml/gstttmlrender.c:
+	* ext/ttml/subtitle.c:
+	* ext/ttml/ttmlparse.c:
+	  ttml: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2021-10-07 14:31:28 +0800  He Junyan <junyan.he@intel.com>
+2023-01-08 18:08:05 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst-libs/gst/va/gstvautils.c:
-	* gst-libs/gst/va/gstvautils.h:
-	* gst-libs/gst/va/meson.build:
-	* sys/va/gstvabasedec.c:
-	* sys/va/gstvabasetransform.c:
-	* sys/va/gstvadeinterlace.c:
-	* sys/va/gstvavpp.c:
-	* sys/va/meson.build:
-	  va: Move the vautils into the gst va lib.
-	  The context query and handle are common logic for all va related
-	  elements. So we move it from va plugins to the common gst va lib.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1256>
+	* ext/srtp/gstsrtp.c:
+	* ext/srtp/gstsrtpdec.c:
+	  srtp: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2021-10-24 22:07:38 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:06:48 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* gst-libs/gst/codecs/gsth264decoder.h:
-	* gst-libs/gst/codecs/gstmpeg2decoder.h:
-	* sys/d3d11/gstd3d11h264dec.cpp:
-	* sys/d3d11/gstd3d11mpeg2dec.cpp:
-	* sys/nvcodec/gstnvh264dec.c:
-	* sys/v4l2codecs/gstv4l2codech264dec.c:
-	* sys/va/gstvah264dec.c:
-	* sys/va/gstvampeg2dec.c:
-	  codecs: Stop claiming constness for refcounted object
-	  It's almost pointless and makes little sense as subclass might
-	  want to modify refcount of the object or so. And all subclasses
-	  are already casting them to non-const version as well.
-	  In a general sense, we need to avoid passing refcounted object
-	  with const qualifier.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1238>
+	* ext/resindvd/resindvdbin.c:
+	* ext/resindvd/rsninputselector.c:
+	  resindvd: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-06 01:06:36 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:06:24 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/d3d11/gstd3d11videosink.cpp:
-	  d3d11videosink: Use staging buffer pool for non-d3d11 upstream
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1643>
+	* ext/kate/gstkateutil.c:
+	  kate: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-06 00:53:34 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:06:07 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/d3d11/gstd3d11download.cpp:
-	* sys/d3d11/gstd3d11upload.cpp:
-	  d3d11upload,d3d11download: Use staging buffer pool
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1643>
+	* ext/openjpeg/gstopenjpegdec.c:
+	* ext/openjpeg/gstopenjpegenc.c:
+	  openjpeg: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-05 23:25:12 +0900  Seungha Yang <seungha@centricular.com>
+2023-01-08 18:03:49 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* sys/d3d11/gstd3d11decoder.cpp:
-	  d3d11decoder: Use staging buffer pool for non-d3d11 downstream
-	  In specific condition, this can show about 10% ~ 30%
-	  performance gain with non-d3d11 downstream element.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1643>
-
-2022-02-05 23:08:48 +0900  Seungha Yang <seungha@centricular.com>
-
-	* gst-libs/gst/d3d11/gstd3d11.h:
-	* gst-libs/gst/d3d11/gstd3d11_fwd.h:
-	* gst-libs/gst/d3d11/gstd3d11stagingbufferpool.cpp:
-	* gst-libs/gst/d3d11/gstd3d11stagingbufferpool.h:
-	* gst-libs/gst/d3d11/meson.build:
-	  d3d11: Add new buffer pool implementation for staging texture
-	  staging buffer pool will allocate staging d3d11 texture
-	  for upload/download optimization. By using staging buffer,
-	  we can avoid per frame staging -> system memory copy operation.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1643>
-
-2022-02-02 00:15:34 -0300  Martin Reboredo <yakoyoku@gmail.com>
-
-	* gst-libs/gst/vulkan/gstvkerror.c:
-	* gst-libs/gst/vulkan/gstvkerror.h:
-	  gstvulkan: Expose gst_vulkan_result_to_string
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1623>
+	* gst-libs/gst/va/gstvaallocator.c:
+	* gst-libs/gst/va/gstvasurfacecopy.c:
+	  libs: va: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-05 17:36:41 +0300  Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+2023-01-08 18:02:47 +0000  Tim-Philipp Müller <tim@centricular.com>
 
-	* meson_options.txt:
-	  qroverlay: move to plugins that need external deps
-	  qroverlay requires libqrencode dependency, move it next to similar plugins.
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1642>
+	* gst-libs/gst/codecparsers/gstav1parser.c:
+	* gst-libs/gst/codecparsers/gsth264parser.c:
+	* gst-libs/gst/codecparsers/gsth265parser.c:
+	* gst-libs/gst/codecparsers/gstmpegvideometa.c:
+	* gst-libs/gst/codecparsers/gstvc1parser.c:
+	* gst-libs/gst/codecparsers/gstvp9parser.c:
+	  libs: codecparsers: drop use of GSlice
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
 
-2022-02-04 11:15:47 +0000  Tim-Philipp Müller <tim@centricular.com>
+2023-01-08 17:58:38 +0000  Tim-Philipp Müller <tim@centricular.com>
+
+	* gst-libs/gst/insertbin/gstinsertbin.c:
+	  libs: insertbin: drop use of GSlice allocator
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
+
+2023-01-08 17:56:42 +0000  Tim-Philipp Müller <tim@centricular.com>
+
+	* gst-libs/gst/mpegts/gst-atsc-section.c:
+	* gst-libs/gst/mpegts/gst-dvb-descriptor.c:
+	* gst-libs/gst/mpegts/gst-dvb-section.c:
+	* gst-libs/gst/mpegts/gst-scte-section.c:
+	* gst-libs/gst/mpegts/gstmpegtsdescriptor.c:
+	* gst-libs/gst/mpegts/gstmpegtssection.c:
+	  libs: mpegts: drop use of GSlice allocator
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
+
+2023-01-23 23:04:53 +0000  Tim-Philipp Müller <tim@centricular.com>
 
 	* meson.build:
 	  Back to development
-	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1635>
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3775>
 
-=== release 1.20.0 ===
+=== release 1.22.0 ===

gst-plugins-bad-1.22.7.tar.xz/NEWS -> gst-plugins-bad-1.24.5.tar.xz/NEWS Changed

@@ -1,1776 +1,1465 @@
-GStreamer 1.22 Release Notes
+GStreamer 1.24 Release Notes
 
-GStreamer 1.22.0 was originally released on 23 January 2023.
+GStreamer 1.24.0 was originally released on 4 March 2024.
 
-The latest bug-fix release in the stable 1.22 series is 1.22.7 and was
-released on 13 November 2023.
+The latest bug-fix release in the stable 1.24 series is 1.24.5 and was released on 20 June 2024.
 
-See https://gstreamer.freedesktop.org/releases/1.22/ for the latest
-version of this document.
-
-Last updated: Monday 13 November 2023, 10:00 UTC (log)
-
-Introduction
-
-The GStreamer team is proud to announce a new major feature release in
-the stable 1.x API series of your favourite cross-platform multimedia
-framework!
-
-As always, this release is again packed with many new features, bug
-fixes and other improvements.
-
-Highlights
-
--   AV1 video codec support improvements
--   New HLS, DASH and Microsoft Smooth Streaming adaptive streaming
-    clients
--   Qt6 support for rendering video inside a QML scene
--   Minimal builds optimised for binary size, including only the
-    individual elements needed
--   Playbin3, Decodebin3, UriDecodebin3, Parsebin enhancements and
-    stabilisation
--   WebRTC simulcast support and support for Google Congestion Control
--   WebRTC-based media server ingestion/egress (WHIP/WHEP) support
--   New easy to use batteries-included WebRTC sender plugin
--   Easy RTP sender timestamp reconstruction for RTP and RTSP
--   ONVIF timed metadata support
--   New fragmented MP4 muxer and non-fragmented MP4 muxer
--   New plugins for Amazon AWS storage and audio transcription services
--   New gtk4paintablesink and gtkwaylandsink renderers
--   New videocolorscale element that can convert and scale in one go for
-    better performance
--   High bit-depth video improvements
--   Touchscreen event support in navigation API
--   Rust plugins now shipped in macOS and Windows/MSVC binary packages
--   H.264/H.265 timestamp correction elements for PTS/DTS reconstruction
-    before muxers
--   Improved design for DMA buffer sharing and modifier handling for
-    hardware-accelerated video decoders/encoders/filters and
-    capturing/rendering on Linux
--   Video4Linux2 hardware accelerated decoder improvements
--   CUDA integration and Direct3D11 integration and plugin improvements
--   New H.264 / AVC, H.265 / HEVC and AV1 hardware-accelerated video
-    encoders for AMD GPUs using the Advanced Media Framework (AMF) SDK
--   applemedia: H.265 / HEVC video encoding + decoding support
--   androidmedia: H.265 / HEVC video encoding support
--   New “force-live” property for audiomixer, compositor, glvideomixer,
-    d3d11compositor etc.
--   Lots of new plugins, features, performance improvements and bug
-    fixes
-
-Major new features and changes
-
-AV1 video codec support improvements
-
-AV1 is a royalty free next-generation video codec by AOMedia and a free
-alternative to H.265/HEVC.
-
-While supported in earlier versions of GStreamer already, this release
-saw a lot of improvements across the board:
-
--   Support for hardware encoding and decoding via VAAPI/VA, AMF, D3D11,
-    NVCODEC, QSV and Intel MediaSDK. Hardware codecs for AV1 are slowly
-    becoming available in embedded systems and desktop GPUs (AMD, Intel,
-    NVIDIA), and these can now be used via GStreamer.
-
--   New AV1 RTP payloader and depayloader elements.
-
--   New encoder settings in the AOM reference encoder-based av1enc
-    element.
-
--   Various improvements in the AV1 parser and in the MP4/Matroska/WebM
-    muxers/demuxers.
-
--   dav1d and rav1e based software decoder/encoder elements shipped as
-    part of the binaries.
-
--   AV1 parser improvements and various bugfixes all over the place.
-
-Touchscreen event support in Navigation API
-
-The Navigation API supports the sending of key press events and mouse
-events through a GStreamer pipeline. Typically these will be picked up
-by a video sink on which these events happen and then the event is
-transmitted into the pipeline so it can be handled by elements inside
-the pipeline if it wasn’t handled by the application.
-
-This has traditionally been used for DVD menu support, but can also be
-used to forward such inputs to source elements that render a web page
-using a browser engine such as WebKit or Chromium.
-
-This API has now gained support for touchscreen events, and this has
-been implemented in various plugins such as the GTK, Qt, XV, and x11
-video sinks as well as the wpevideosrc element.
-
-GStreamer CUDA integration
-
--   New gst-cuda library
--   integration with D3D11 and NVIDIA dGPU NVMM elements
--   new cudaconvertscale element
-
-GStreamer Direct3D11 integration
-
--   New gst-d3d11 public library
-    -   gst-d3d11 library is not integrated with GStreamer documentation
-        system yet. Please refer to the examples
--   d3d11screencapture: Add Windows Graphics Capture API based capture
-    mode, including Win32 application window capturing
--   d3d11videosink and d3d11convert can support flip/rotation and crop
-    meta
--   d3d11videosink: New emit-present property and present signal so that
-    applications can overlay an image on Direct3D11 swapchain’s
-    backbuffer via Direct3D/Direct2D APIs. See also C++ and Rust
-    examples
--   d3d11compositor supports YUV blending/composing without intermediate
-    RGB(A) conversion to improve performance
--   Direct3D11 video decoders are promoted to GST_RANK_PRIMARY or
-    higher, except for the MPEG2 decoder
-
-H.264/H.265 timestamp correction elements
-
--   Muxers are often picky and need proper PTS/DTS timestamps set on the
-    input buffers, but that can be a problem if the encoded input media
-    stream comes from a source that doesn’t provide proper signalling of
-    DTS, such as is often the case for RTP, RTSP and WebRTC streams or
-    Matroska container files. Theoretically parsers should be able to
-    fix this up, but it would probably require fairly invasive changes
-    in the parsers, so two new elements h264timestamper and
-    h265timestamper bridge the gap in the meantime and can reconstruct
-    missing PTS/DTS.
-
-Easy sender timestamp reconstruction for RTP and RTSP
-
--   it was always possible to reconstruct and retrieve the original RTP
-    sender timestamps in GStreamer, but required a fair bit of
-    understanding of the internal mechanisms and the right property
-    configuration and clock setup.
-
--   rtspsrc and rtpjitterbuffer gained a new
-    “add-reference-timestamp-meta” property that if set puts the
-    original absolute reconstructed sender timestamps on the output
-    buffers via a meta. This is particularly useful if the sender is
-    synced to an NTP clock or PTP clock. The original sender timestamps
-    are either based on the RTCP NTP times, NTP RTP header extensions
-    (RFC6051) or RFC7273-style clock signalling.
-
-Qt6 support
-
--   new qml6glsink element for Qt6 similar to the existing Qt5 element.
-    Matching source and overlay elements will hopefully follow in the
-    near future.
-
-OpenGL + Video library enhancements
-
--   Support for new video formats (NV12_4L4, NV12_16L32S, NV12_8L128,
-    NV12_10BE_8L128) and dmabuf import in more formats (Y410, Y212_LE,
-    Y212_BE, Y210, NV21, NV61)
-
--   Improved support for tiled formats with arbitrary tile dimensions,
-    as needed by certain hardware decoders/encoders
-
--   glvideomixer: New “crop-left,”crop-right, “crop-top” and
-    “crop-bottom” pad properties for cropping inputs
-
--   OpenGL support for gst_video_sample_convert():
-
-    -   Used for video snapshotting and thumbnailing, to convert buffers
-        retrieved from appsinks or sink “last-sample” properties in
-        JPG/PNG thumbnails.
-    -   This function can now take samples and buffers backed by GL
-        textures as input and will automatically plug a gldownload
-        element in that case.
-
-High bit-depth support (10, 12, 16 bits per component value) improvements
-
--   compositor can now handle any supported input format and also mix
-    high-bitdepth (10-16 bit) formats (naively)
-
--   videoflip has gained support for higher bit depth formats.
-
--   vp9enc, vp9dec now support 12-bit formats and also 10-bit 4:4:4
-
-WebRTC
-
--   Allow insertion of bandwidth estimation elements e.g. for Google
-    Congestion Control (GCC) support
-
--   Initial support for sending or receiving simulcast streams
-
--   Support for asynchronous host resolution for STUN/TURN servers
-
--   GstWebRTCICE was split into base classes and implementation to make
-    it possible to plug custom ICE implementations
-
--   webrtcsink: batteries-included WebRTC sender (Rust)
-
--   whipsink: WebRTC HTTP ingest (WHIP) to a MediaServer (Rust)
-
--   whepsrc: WebRTC HTTP egress (WHEP) from a MediaServer (Rust)
-
--   Many other improvements and bug fixes
-
-New HLS, DASH and MSS adaptive streaming clients
-
-A new set of “adaptive demuxers” to support HLS, DASH and MSS adaptive
-streaming protocols has been added. They provide improved performance,
-new features and better stream compatibility compared to the previous
-elements. These new elements require a “streams-aware” pipeline such as
-playbin3, uridecodebin3 or urisourcebin.
-
-The previous elements’ design prevented implementing several use-cases
-and fixing long-standing issues. The new elements were re-designed from
-scratch to tackle those:
-
--   Scheduling Only 3 threads are present, regardless of the number of
-    streams selected. One in charge of downloading fragments and
-    manifests, one in charge of outputting parsed data downstream, and
-    one in charge of scheduling. This improves performance, resource
-    usage and latency.
-
--   Better download control The elements now directly control the
-    scheduling and download of manifests and fragments using libsoup
-    directly instead of depending on external elements for downloading.
-
--   Stream selection, only the selected streams are downloaded. This
-    improves bandwith usage. Switching stream is done in such a way to
-    ensure there are no gaps, meaning the new stream will be switched to
-    only once enough data for it has been downloaded.
-
--   Internal parsing, the downloaded streams are parsed internally. This
-    allows the element to fully respect the various specifications and
-    offer accurate buffering, seeking and playback. This is especially
-    important for HLS streams which require parsing for proper
-    positioning of streams.
-
--   Buffering and adaptive rate switching, the new elements handle
-    buffering internally which allows them to have a more accurate
-    visibility of which bandwith variant to switch to.
-
-Playbin3, Decodebin3, UriDecodebin3, Parsebin improvements
-
-The “new” playback elements introduced in 1.18 (playbin3 and its various
-components) have been refactored to allow more use-cases and improve
-performance. They are no longer considered experimental, so applications
-using the legacy playback elements (playbin and (uri)decodebin) can
-migrate to the new components to benefit from these improvements.
-
--   Gapless The “gapless” feature allows files and streams to be
-    fetched, buffered and decoded in order to provide a “gapless”
-    output. This feature has been refactored extensively in the new
-    components:
-    -   A single (uri)decodebin3 (and therefore a single set of
-        decoders) is used. This improves memory and cpu usage, since on
-        identical codecs a single decoder will be used.
-    -   The “next” stream to play will be pre-rolled “just-in-time”
-        thanks to the buffering improvements in urisourcebin (see below)
-    -   This feature is now handled at the uridecodebin3 level.
-        Applications that wish to have a “gapless” stream and process it
-        (instead of just outputting it, for example for transcoding,
-        retransmission, …) can now use uridecodebin3 directly. Note that
-        a streamsynchronizer element is required in that case.
--   Buffering improvements The urisourcebin element is in charge of
-    fetching and (optionally) buffering/downloading the stream. It has
-    been extended and improved:
-    -   When the parse-streams property is used (by default in
-        uridecodebin3 and playbin3), compatible streams will be demuxed
-        and parsed (via parsebin) and buffering will be done on the
-        elementary streams. This provides a more accurate handling of
-        buffering. Previously buffering was done on a best-effort basis
-        and was mostly wrong (i.e. downloading more than needed).
-    -   Applications can use urisourcebin with this property as a
-        convenient way of getting elementary streams from a given URI.
-    -   Elements can handle buffering themselves (such as the new
-        adaptive demuxers) by answering the GST_QUERY_BUFFERING query.
-        In that case urisourcebin will not handle it.
--   Stream Selection Efficient stream selection was previously only
-    possible within decodebin3. The downside is that this meant that
-    upstream elements had to provide all the streams from which to chose
-    from, which is inefficient. With the addition of the
-    GST_QUERY_SELECTABLE query, this can now be handled by elements
-    upstream (i.e. sources)
-    -   Elements that can handle stream selection internally (such as
-        the new adaptive demuxer elements) answer that query, and handle
-        the stream selection events themselves.
-    -   In this case, decodebin3 will always process all streams that
-        are provided to it.
--   Instant URI switching This new feature allows switching URIs
-    “instantly” in playbin3 (and uridecodebin3) without having to change
-    states. This mimics switching channels on a television.
-    -   If compatible, decoders will be re-used, providing lower
-        latency/cpu/memory than by switching states.
-    -   This is enabled by setting the instant-uri property to true,
-        setting the URI to switch to immediately, and then disabling the
-        instant-uri property again afterwards.
--   playbin3, decodebin3, uridecodebin3, parsebin, and urisourcebin are
-    no longer experimental
-    -   They were originally marked as ‘technology preview’ but have
-        since seen extensive usage in production settings, so are
-        considered ready for general use now.
-
-Fraunhofer AAC audio encoder HE-AAC and AAC-LD profile support
-
--   fdkaacenc:
-    -   Support for encoding to HE-AACv1 and HE-AACv2 profile
-    -   Support for encoding to AAC Low Delay (LD) profile
-    -   Advanced bitrate control options via new “rate-control”,
-        “vbr-preset”, “peak-bitrate”, and “afterburner” properties
-
-RTP rapid synchronization support in the RTP stack (RFC6051)
-
-RTP provides several mechanisms how streams can be synchronized relative
-to each other, and how absolute sender times for RTP packets can be
-obtained. One of these mechanisms is via RTCP, which has the
-disadvantage that the synchronization information is only distributed
-out-of-band and usually some time after the start.
-
-GStreamer’s RTP stack, specifically the rtpbin, rtpsession and
-rtpjitterbuffer elements, now also have support for retrieving and
-sending the same synchronization information in-band via RTP header
-extensions according to RFC6051 (Rapid Synchronisation of RTP Flows).
-Only 64-bit timestamps are supported currently.
-
-This provides per packet synchronization information from the very
-beginning of a stream and allows accurate inter-stream, and (depending
-on setup) inter-device, synchronization at the receiver side.
-
-ONVIF XML Timed Metadata support
-
-The ONVIF standard implemented by various security cameras also
-specifies a format for timed metadata that is transmitted together with
-the audio/video streams, usually over RTSP.
-
-Support for this timed metadata is implemented in the MP4 demuxer now as
-well as the new fragmented MP4 muxer and the new non-fragmented MP4
-muxer from the GStreamer Rust plugins. Additionally, the new onvif
-plugin ‒ which is part of the GStreamer Rust plugins ‒ provides general
-elements for handling the metadata and e.g. overlaying certain parts of
-it over a video stream.
-
-As part of this support for absolute UTC times was also implemented
-according to the requirements of the ONVIF standards in the
-corresponding elements.
-
-MP3 gapless playback support
-
-While MP3 can probably considered a legacy format at this point, a new
-feature was added with this release.
-
-When playing back plain MP3 files, i.e. outside a container format,
-switches between files can now be completely gapless if the required
-metadata is provided inside the file. There is no standardized metadata
-for this, but the LAME MP3 encoder writes metadata that can be parsed by
-the mpegaudioparse element now and forwarded to decoders for ensuring
-removal of padding samples at the front and end of MP3 files.
-
-“force-live” property for audio + video aggregators
-
-This is a quality of life fix for playout and streaming applications
-where it is common to have audio and video mixer elements that should
-operate in live mode from the start and produce output continuously.
-
-Often one would start a pipeline without any inputs hooked up to these
-mixers in the beginning, and up until now there was no way to easily
-force these elements into live mode from the start. One would have to
-add an initial live video or audio test source as dummy input to achieve
-this.
-
-The new “force-live” property makes these audio and video aggregators
-start in live mode without the need for any dummy inputs, which is
-useful for scenarios where inputs are only added after starting the
-pipeline.
-
-This new property should usually be used in connection with the
-“min-upstream-latency” property, i.e. you should always set a non-0
-minimum upstream latency then.
-
-This is now supported in all GstAudioAggregator and GstVideoAggregator
-subclasses such as audiomixer, audiointerleave, compositor,
-glvideomixer, d3d11compositor, etc.
-
-New elements and plugins
-
--   new cudaconvertscale element that can convert and scale in one pass
-
--   new gtkwaylandsink element based on gtksink, but similar to
-    waylandsink and uses Wayland APIs directly instead of rendering with
-    Gtk/Cairo primitives. This approach is only compatible with Gtk3,
-    and like gtksink this element only supports Gtk3.
-
--   new h264timestamper and h265timestamper elements to reconstruct
-    missing pts/dts from inputs that might not provide them such as
-    e.g. RTP/RTSP/WebRTC inputs (see above)
-
--   mfaacdec, mfmp3dec: Windows MediaFoundation AAC and MP3 decoders
-
--   new msdkav1enc AV1 video encoder element
-
--   new nvcudah264enc, nvcudah265enc, nvd3d11h264enc, and nvd3d11h265enc
-    NVIDIA GPU encoder elements to support zero-copy encoding, via CUDA
-    and Direct3D11 APIs, respectively
-
--   new nvautogpuh264enc and nvautogpuh265enc NVIDIA GPU encoder
-    elements: The auto GPU elements will automatically select a target
-    GPU instance in case multiple NVIDIA desktop GPUs are present, also
-    taking into account the input memory. On Windows CUDA or Direct3D11
-    mode will be determined by the elements automatically as well. Those
-    new elements are useful if target GPU and/or API mode (either CUDA
-    or Direct3D11 in case of Windows) is undeterminable from the encoder
-    point of view at the time when pipeline is configured, and therefore
-    lazy target GPU and/or API selection are required in order to avoid
-    unnecessary memory copy operations.
-
--   new nvav1dec AV1 NVIDIA desktop GPU decoder element
-
--   new qml6glsink element to render video with Qt6
-
--   qsv: New Intel OneVPL/MediaSDK (a.k.a Intel Quick Sync) based
-    decoder and encoder elements, with gst-d3d11 (on Windows) and gst-va
-    (on Linux) integration
-
-    -   Support multi-GPU environment, for example, concurrent video
-        encoding using Intel iGPU and dGPU in a single pipeline
-    -   H.264 / H.265 / VP9 and JPEG decoders
-    -   H.264 / H.265 / VP9 / AV1 / JPEG encoders with dynamic encoding
-        bitrate update
-    -   New plugin does not require external SDK for building on Windows
-
--   vulkanoverlaycompositor: new vulkan overlay compositor element to
-    overlay upstream GstVideoOverlayCompositonMeta onto the video
-    stream.
-
--   vulkanshaderspv: performs operations with SPIRV shaders in Vulkan
-
--   win32ipcvideosink, win32ipcvideosrc: new shared memory videosrc/sink
-    elements for Windows
-
--   wicjpegdec, wicpngdec: Windows Imaging Component (WIC) based JPEG
-    and PNG decoder elements.
-
--   Many exciting new Rust elements, see Rust section below
-
-New element features and additions
-
--   audioconvert: Dithering now uses a slightly slower, less biased PRNG
-    which results in better quality output. Also dithering can now be
-    enabled via the new “dithering-threshold” property for target bit
-    depths of more than 20 bits.
-
--   av1enc: Add “keyframe-max-dist” property for controlling max
-    distance between keyframes, as well as “enc-pass”, “keyframe-mode”,
-    “lag-in-frames” and “usage-profile” properties.
-
--   cccombiner: new “output-padding” property
-
--   decklink: Add support for 4k DCI, 8k/UHD2 and 8k DCI modes
-
--   dvbsubenc: Support for >SD resolutions is working correctly now.
-
--   fdkaacenc: Add HE-AAC / HE-AACv2 profile support
+See https://gstreamer.freedesktop.org/releases/1.24/ for the latest version of this document.
 
--   glvideomixer: New “crop-left,”crop-right, “crop-top” and
-    “crop-bottom” pad properties for cropping inputs
+Last updated: Wednesday 20 June 2024, 22:35 UTC (log)
 
--   gssink: new ‘content-type’ property. Useful when one wants to upload
-    a video as video/mp4 instead of ’video/quicktime` for example.
+## Introduction
 
--   jpegparse: Rewritten using the common parser library
+The GStreamer team is proud to announce a new major feature release in the stable 1.x API series of your favourite
+cross-platform multimedia framework!
+
+As always, this release is again packed with many new features, bug fixes and other improvements.
+
+## Highlights
+
+-   New Discourse forum and Matrix chat space
+-   New Analytics and Machine Learning abstractions and elements
+-   Playbin3 and decodebin3 are now stable and the default in gst-play-1.0, GstPlay/GstPlayer
+-   The va plugin is now preferred over gst-vaapi and has higher ranks
+-   GstMeta serialization/deserialization and other GstMeta improvements
+-   New GstMeta for SMPTE ST-291M HANC/VANC Ancillary Data
+-   New unixfd plugin for efficient 1:N inter-process communication on Linux
+-   cudaipc source and sink for zero-copy CUDA memory sharing between processes
+-   New intersink and intersrc elements for 1:N pipeline decoupling within the same process
+-   Qt5 + Qt6 QML integration improvements including qml6glsrc, qml6glmixer, qml6gloverlay, and qml6d3d11sink elements
+-   DRM Modifier Support for dmabufs on Linux
+-   OpenGL, Vulkan and CUDA integration enhancements
+-   Vulkan H.264 and H.265 video decoders
+-   RTP stack improvements including new RFC7273 modes and more correct header extension handling in depayloaders
+-   WebRTC improvements such as support for ICE consent freshness, and a new webrtcsrc element to complement webrtcsink
+-   WebRTC signallers and webrtcsink implementations for LiveKit and AWS Kinesis Video Streams
+-   WHIP server source and client sink, and a WHEP source
+-   Precision Time Protocol (PTP) clock support for Windows and other additions
+-   Low-Latency HLS (LL-HLS) support and many other HLS and DASH enhancements
+-   New W3C Media Source Extensions library
+-   Countless closed caption handling improvements including new cea608mux and cea608tocea708 elements
+-   Translation support for awstranscriber
+-   Bayer 10/12/14/16-bit depth support
+-   MPEG-TS support for asynchronous KLV demuxing and segment seeking, plus various new muxer features
+-   Capture source and sink for AJA capture and playout cards
+-   SVT-AV1 and VA-API AV1 encoders, stateless AV1 video decoder
+-   New uvcsink element for exporting streams as UVC camera
+-   DirectWrite text rendering plugin for windows
+-   Direct3D12-based video decoding, conversion, composition, and rendering
+-   AMD Advanced Media Framework AV1 + H.265 video encoders with 10-bit and HDR support
+-   AVX/AVX2 support and NEON support on macOS on Apple ARM64 CPUs via new liborc
+-   GStreamer C# bindings have been updated
+-   Rust bindings improvements and many new and improved Rust plugins
+-   Rust plugins now shipped in packages for all major platforms including Android and iOS
+-   Lots of new plugins, features, performance improvements and bug fixes
+
+## Major new features and changes
+
+### Discourse forum and Matrix chat space
+
+-   The new Discourse forum and Matrix chat space are now our preferred communication channels for support and developer chat.
+
+-   The mailing lists and IRC channel are on their way to being phased out, but Discourse can be used via e-mail as well.
+
+-   For release announcements please subscribe to the News + Announcements category on Discourse, although we will continue to
+    also send announcements to the mailing list for the time being.
+
+### Playbin3, decodebin3 now stable and default
+
+-   After a year of stability, testing and more improvements, playbin3, and its various components (uridecodebin3, decodebin3
+    and urisourcebin), are now the recommended playback components.
+
+-   Some playback components have now switched to defaulting to playbin3: gst-play-1.0 and the GstPlay / GstPlayer libraries.
+    Application developers are strongly recommended to switch to using those components instead of the legacy playbin and
+    (uri)decodebin.
+
+Improvements in this cycle:
+
+-   Better support missing/faulty decoders, attempt to use another one or gracefully un-select the stream.
+
+-   Many fixes for more complex gapless and instant-switching scenarios
+
+-   Lower latency for live pipelines
+
+-   Fix for “chained” streams (ex: Ogg, or PMT update in MPEG-TS)
+
+-   Fixes for hardware-accelerated playback with subtitles (provided the sink can handle offloading composition). This was also
+    partly due to a historical confusion between subtitle “decoders” (which decode the format to text and “parsers” (which only
+    do timing detection and optional seeking).
+
+### GstMeta serialization/deserialization and other GstMeta improvements
+
+-   GstMeta serialization/deserialization allows metas to be transmitted or stored. This is used by the unixfd and cudaipc
+    plugins for inter-process communication (IPC). Implemented so far for GstCustomMeta, GstVideoMeta, GstAudioMeta and
+    GstReferenceTimestampMeta.
+
+-   Simplified GstCustomMeta registration with gst_meta_register_custom_simple() for the simple case where tags and transform
+    functions are not needed.
+
+-   GstMetaClearFunction clears the content of the meta. This will be called by buffer pools when a pooled buffer is returned to
+    the pool.
+
+-   Add gst_meta_info_new() and gst_meta_info_register() to register a GstMeta in two steps for easier extensibility.
+
+### New unixfd plugin for efficient 1:N inter-process communication on Linux
+
+-   unixfdsink and unixfdsrc are elements that, inspired by shmsink andn shmsrc, send UNIX file descriptors (e.g. memfd, dmabuf)
+    from one sink to multiple source elements in other processes on Linux.
+
+-   The unixfdsink proposes a memfd/shm allocator to upstream elements which allows for example videotestsrc to write directly
+    into memory that can be transfered to other processes without copying.
+
+### New GstMeta for SMPTE ST-291M HANC/VANC Ancillary Data
+
+-   Previously only various specific GstMeta for ancillary data were provided, such as GstVideoCaptionMeta and GstVideoAFDMeta.
+    The new GstAncillaryMeta allows passing arbitrary ancillary data between elements, including custom and non-standard
+    ancillary data. See GstAncillaryMeta for details.
+
+-   Add with gst_buffer_add_ancillary_meta() and retrieve with gst_buffer_get_ancillary_meta() or
+    gst_buffer_iterate_ancillary_meta().
+
+-   Supported by the newly added AJA sink and source elements
+
+### DSD audio support
+
+-   DSD audio is a non-PCM raw audio format representation and the GstAudio library gained support for this in form of new
+    GstDsdInfo and GstDsdFormat API.
+
+-   Support for DSD audio has been implemented in alsasink as well as the GstAudioSink and GstAudioRingBuffer base classes, and
+    the gst-libav plugin to enable FFmpeg-based DSD elements and functionality.
+
+### Analytics and Machine Learning
+
+-   A new library, GstAnalytics, has been added. It defines a GstAnalyticsRelationMeta that can efficiently hold a large number
+    of observations from a data analysis process, for example from machine learning. It also contains a matrix of the
+    relationship between those observations.
+
+-   Three types of metadata are already defined in the library: object detection, classification and tracking.
+
+-   A new objectdetectionoverlay element has been merged that draws the bounding boxes and the classes from the object detection
+    and classification metadata types.
+
+-   The onnxinference element has been split into two parts. The first part works with the ONNX Runtime library to do the actual
+    inference, while the second part called ssdobjectdetector interprets the produced tensor. This new element creates
+    GstAnalyticsRelationMeta.
+
+-   The onnxinference element now accepts video frames without transformation if the module declares that it accepts the “Image”
+    type and the format is something that GStreamer knows.
+
+-   In the next release, tensor decoders such as ssdobjectdetector will live outside of the ONNX plugin so they can be used with
+    other machine learning acceleration frameworks.
+
+### Qt5 + Qt6 QML integration improvements
+
+-   The Qt5 qmlglsink, qmlgloverlay, qmlglmixer received support for directly consuming BGRA and YV12 video frames without a
+    prior glcolorconvert.
+
+-   New qml6glsrc, qml6glmixer, and qml6gloverlay elements as Qt6 counterparts to the existing Qt5 elements, also with support
+    for directly consuming BGRA and YV12 video frames without a prior glcolorconvert.
+
+-   qml6d3d11sink is a new Direct3D11 Qt6 QML sink for Windows as an alternative to the existing qml6glsink.
+
+### DRM Modifier Support for dmabufs on Linux
+
+The Linux dmabuf subsystem provides buffer sharing across different hardware device drivers and subsystems, and is used
+extensively by the DRM subsystem to exchange buffers between processes, contexts, and library APIs within the same process, and
+also to exchange buffers with other subsystems such as Linux Media.
+
+In GStreamer, it’s used on the capture side (v4l2src, pipewire), hardware-accelerated video decoders and encoders, OpenGL
+integration, Wayland renderers, etc.
+
+GStreamer has had support for dmabufs for a long time and was able to negotiate “zero-copy” paths between different components,
+however it only supported and assumed simple linear formats and was not able to negotiate complex non-linear formats. This meant
+that dmabuf support actually had to be disabled in many scenarios to avoid “garbled video”.
+
+With GStreamer 1.24 there is now full DRM modifier support and complex non-linear formats can be supported and negotiated
+between components.
+
+This is achieved with an extra drm_format field in video/x-raw(memory:DMABuf), format=(string)DMA_DRM caps, e.g.
+drm-format=(string)NV12:0x0x0100000000000001.
+
+See the GStreamer DMA buffers design documentation for more details.
+
+This is used in the VA-API va plugin, waylandsink, the MSDK plugin, and the OpenGL integration. Video4Linux support is expected
+to land in one of the next minor releases.
+
+New API has been added for easy handling of these new caps:
+
+-   GstVideoInfoDmaDrm plus associated functions, similar to GstVideoInfo, including conversion to and from GstVideoInfo with
+    gst_video_info_dma_drm_from_video_info() and gst_video_info_dma_drm_to_video_info()
+
+-   GST_VIDEO_DMA_DRM_CAPS_MAKE
+
+-   GST_VIDEO_FORMAT_DMA_DRM
+
+### OpenGL integration enhancements
+
+-   When using EGL, if both OpenGL ES and OpenGL are available, OpenGL ES is preferred over OpenGL. OpenGL ES supports some
+    necessary features required for dmabuf support. This does not apply if an external library/application chooses an OpenGL API
+    first.
+
+-   Improved support for dmabuf use cases. The glupload element now supports the new and improved dmabuf negotiation with
+    explicit modifiers.
+
+-   Base classes for mixing with OpenGL are now public API. GstGLBaseMixer and GstGLMixer are exposed matching the existing
+    filter-based GstGLBaseFilter and GstGLFilter base classes. The new OpenGL mixer base classes are based on
+    GstVideoAggregator.
+
+-   Add support for a ‘surfaceless’ EGL context using EGL_MESA_platform_surfaceless.
+
+-   Expose Vivante Framebuffer build-related files (pkg-config, gir) as public API
+
+-   Add support for more video formats:
+
+    -   A420 8/10/12/16-bit.
+    -   A422 8/10/12/16-bit.
+    -   A444 8/10/12/16-bit.
+    -   I420 10/12 bit.
+    -   RBGA.
+
+-   Add support for tiled video formats
+
+    -   NV12_16L32S (Mediatek format)
+    -   NV12_4L4 (Verisilicon Hantro format)
+
+-   glcolorconvert now has API for retrieving shader strings for:
+
+    -   swizzling (reordering components).
+    -   YUV->RGB conversion.
+    -   RGB->YUV conversion.
+
+-   Add more helpers for information about a particular video and/or GL format e.g. number of components, bytes used, or pixel
+    ordering.
+
+-   glvideomixer has new sink pad properties sizing-policy, xalign, yalign matching compositor.
+
+-   GstGLBufferPool now has a configuration option for allowing a number of buffers to be always outstanding allowing for
+    reducing the potential synchronisation delay when reusing OpenGL memory backed buffers.
+
+### Vulkan integration enhancements
+
+-   Add support for the Vulkan H.264 and H.265 decoders.
+
+-   Add support for timeline semaphores.
+
+-   Optionally use newer Vulkan functions for format selection.
+
+-   Add support for GPU-assisted validation.
+
+-   Vulkan/Wayland: add support for xdg_wm_base protocol for creating a visible debug window. Required as the previous wl_shell
+    interface is being removed from compositors.
+
+### CUDA / NVCODEC integration and feature additions
+
+-   New cudaipcsrc and cudaipcsink elements for zero-copy CUDA memory sharing between processes
+
+-   New nvJPEG library based nvjpegenc JPEG encoder element
+
+-   The NVIDIA desktop GPU decoder nvh264sldec, nvh265sldec, nvvp8sldec, and nvvp9sldec elements were renamed to nvh264dec,
+    nvh265dec, nvvp8dec, and nvvp9dec, respectively.
+
+-   GStreamer NVIDIA H.264 and H.265 encoders except for nvh264enc and nvh265enc gained support for CEA708 Closed Caption
+    inserting.
+
+-   OpenGL memory support is added to nv{cuda,autogpu}h264enc and nv{cuda,autogpu}h265enc elements
+
+-   CUDA stream integration: As of 1.24, CUDA stream synchronization is an application’s responsibility, and GStreamer will not
+    execute unnecessary synchronization operations. If an application needs direct access to CUDA memory via GST_MAP_CUDA map
+    flag, cuStreamSynchronize() or gst_cuda_memory_sync() call is required unless application-side CUDA operation is executed
+    with the GstCudaMemory’s associated CUDA stream.
+
+### RTP stack improvements
+
+-   New rtppassthroughpay element which just passes RTP packets through unchanged, but appears like an RTP payloader element.
+    This is useful for relaying an RTP stream as-is through gst-rtsp-server, which expects an RTP payloader with certain
+    properties at the end of an RTSP media sub-pipeline.
+
+-   New “timeout-inactive-rtp-sources” property on rtpbin, sdpdemux and rtpsession to allow applications to disable automatic
+    timeout of sources from which no data has been received for a while.
+
+-   rtpvp8pay, rtpvp9pay: expose “picture-id” as a property, and add a “picture-id-offset” property to the VP9 payloader to
+    bring it in line with the VP8 payloader.
+
+-   rtpjitterbuffer has seen improved media clock handling (clock equality and clock setting/resetting), as well as two new
+    properties that allow reconstruction of absolute PTP timestamps without actually syncing to the PTP clock, which can be
+    useful in scenarios where one wants to reconstruct the absolute PTP clock timestamps on a machine that doesn’t have access
+    to the network of the PTP clock provider. The two new properties are:
+
+    -   “rfc7273-use-system-clock”: allows the jitter buffer to assume that the system clock is synced sufficiently close to the
+        media clock used by an RFC7273 stream. By default the property is disabled and the jitter buffer will create a media
+        clock and try to sync to it, but this is only required to determine in which wraparound period from the media clock’s
+        Epoch the current RTP timestamps refer to (and thus to reconstruct absolute time stamps from them). If the property is
+        enabled the wraparound period and current offset from the Epoch will be determined based on the local system clock,
+        which means that no direct network connection to the media clock provider is needed to reconstruct absolute timestamps.
+        There is also no start-up delay, because there’s no clock sync that needs to be established first.
+
+    -   “rfc7273-reference-timestamp-meta-only”: If this property is enabled then the jitter buffer will do the normal timestamp
+        calculations for the output buffers according to the configured mode instead of making use of the RFC7273 media clock
+        for that. It will still calculate RFC7273 media clock timestamps, but only attach them to the output buffers in form of
+        a clock reference meta.
+
+-   RTP payloaders and depayloaders now have an “extensions” property for retrieving the list of currently enabled RTP header
+    extensions.
+
+-   rtpbin and webrtcbin no longer blindly set properties on the jitter buffer assuming it’s a standard rtpjitterbuffer, but
+    instead check if the property is available first, to better support non-standard jitterbuffers or even an identity element
+    in lieu of a jitter buffer.
+
+-   RTP header extension handling fixes for depayloaders that aggregate multiple input buffers into a single output buffer.
+    Before, only the last RTP input buffer was checked for header extensions. Now the depayloader remembers all RTP packets
+    pushed before an output buffer is produced and checks all RTP input buffers for header extensions.
+
+    -   Affected depayloaders: rtph264depay, rtph265depay, rtpvp8depay, rtpvp9depay, rtpxqtdepay, rtpasfdepay, rtpmp4gdepay,
+        rtpsbcdepay, rtpvorbisdepay, rtpmp4vdepay, rtptheoradepay, rtpsv3vdepay, rtpmp4adepay, rtpklvdepay, rtpjpegdepay,
+        rtpj2kdepay, rtph263pdepay, rtph263depay, rtph261depay. rtpgstdepay.
+
+### WebRTC improvements
+
+-   Add support for ICE consent freshness (RFC 7675). This requires libnice >= 0.1.22.
+
+-   Advertise the local side of an end-of-candidates with an empty candidate string.
+
+-   Add the number of Data Channels opened and closed to webrtcbin’s statistics.
+
+-   Various improvements and feature additions in the Rust webrtc plugin, which provides webrtcsrc and webrtcsink elements as
+    well as specific elements for different WebRTC signalling protocols. See the Rust plugins section below for more details.
+
+### Adaptive Streaming improvements and Low-Latency HLS (LL-HLS) support
+
+-   hlsdemux2 now supports Low-Latency HLS (LL-HLS)
+
+-   hlsdemux2 asynchronous playlist download and update improves responsiveness and bandwith usage.
+
+-   hlsdemux2 handles fallback variant URLs.
+
+-   hlsdemux2 is more responsive and accurate when handling seeks.
+
+-   dashdemux2 and hlsdemux2 have a new “start-bitrate” property, improving the decision for which initial stream variant that
+    will be used.
+
+-   dashdemux2, hlsdemux2, mssdemux2 have received many improvements regarding seeking, along with support for “early-seek”
+    which allows playback to start immediately from the requested position without any previous download.
+
+-   dashdemux2, hlsdemux2, mssdemux2 better handle errors on or near the live edge.
+
+-   dashsink can now use the dashmp4mux muxer from the Rust plugins and will also produce better and RFC 6381-compatible codec
+    strings. The “suggested-presentation-delay” property allows to set the suggested presentation delay in the MPD.
+
+-   No development took place on the legacy demuxers (dashdemux, hlsdemux, mssdemux). Application developers are reminded to use
+    the new demuxers instead. They are automatically picked up when using urisourcebin, uridecodebin3 or playbin3.
+
+### W3C Media Source Extensions library
+
+-   A new GStreamer library (mse) implementing the W3C Media Source Extensions specification was added.
+
+-   Applications can embed this library along with GStreamer in order to integrate software that uses the Media Source APIs
+    without relying on a web browser engine. Typically an application consuming this library will wrap the C API with JavaScript
+    bindings that match the Media Source API so their existing code can integrate with this library.
+
+### Closed Caption handling improvements
+
+-   ccconverter supports converting between the two CEA-608 fields.
+
+-   New cea608mux element for muxing multiple CEA-608 streams together.
+
+-   Various improvements and feature additions in the Rust-based closed caption elements. Check out the Rust plugins section
+    below for more details.
+
+### Precision Time Protocol (PTP) clock improvements
+
+-   Many fixes and compatibility/interoperability improvements.
+
+-   Better support for running on devices with multiple network interfaces.
+
+-   Allow sync to master clock on same host.
+
+-   PTP clock support is now also available on Windows.
+
+-   The standalone ptp-helper binary has been rewritten in Rust for portability and security. This works on Linux, Android,
+    Windows, macOS, FreeBSD, NetBSD, OpenBSD, DragonFlyBSD, Solaris and Illumos. Newly supported compared to the C version is
+    Windows. Compared to the C version various error paths are handled more correctly and a couple of memory leaks are fixed.
+    Otherwise it should work identically. The minimum required Rust version for compiling this is 1.48, i.e. the version
+    currently in Debian oldstable. On Windows, Rust 1.54 is needed at least.
+
+-   New ptp-helper Meson build option so PTP support can be disabled or required.
+
+-   gst_ptp_init_full() allows for a more fine-grained and extensible configuration and initialization of the GStreamer PTP
+    subsystem, including TTL configuration.
+
+### Bayer 10/12/14/16-bit depth support
+
+-   bayer2rgb and rgb2bayer now support bayer with 10/12/14/16 bit depths
+
+-   v4l2src and videotestsrc now support bayer with 10/12/14/16 bit depths
+
+-   imagefreeze gained bayer support as well
+
+### MPEG-TS improvements
+
+-   mpegtsdemux gained support for
+    -   segment seeking for seamless non-flushing looping, and
+    -   synchronous KLV
+-   mpegtsmux now
+    -   allows attaching PCR to non-PES streams
+    -   allows setting of the PES stream number for AAC audio and AVC video streams via a new “stream-number” property on the
+        muxer sink pads. Currently the PES stream number is hard-coded to zero for these stream types.
+    -   allows writing arbitrary Opus channel mapping families and up to 255 channels
+    -   separate handling of DVB and ATSC AC3 descriptors
+
+## New elements and plugins
+
+-   analyticsoverlay visualises object-detection metas on a video stream.
+
+-   autovideoflip and autodeinterlace are two new auto elements.
+
+-   AJA source and sink elements plus device provider for AJA capture and playout cards, including support for HANC/VANC
+    ancillary data.
+
+-   New cea608mux element for muxing multiple CEA-608 streams together.
+
+-   The codec2json plugin adds av12json, h2642json, h2652json and vp82json elements which convert AV1, H.264, H.265 and VP8
+    frame parameters into human readable JSON data, which is useful for debugging and testing purposes.
+
+-   New lc3 plugin with a decoder and encoder for the Bluetooth LC3 audio codec.
+
+-   New onnxinference element to run ONNX inference models on video buffers.
+
+-   New rtppassthroughpay element which just passes RTP packets through unchanged, but appears like an RTP payloader element.
+    This is mostly useful for medias that simply pass through an existing RTP stream in gst-rtsp-server.
+
+-   Qt6: qml6glsrc, qml6glmixer, qml6gloverlay, and qml6d3d11sink
+
+-   New SVT-AV1 encoder plugin, imported from SVT-AV1 but with many fixes.
+
+-   Many exciting new Rust elements, see Rust section below.
+
+-   New DirectWrite text rendering and Direct3D12 plugins (see Windows section below).
+
+-   New vaav1enc element for encoding video in AV1 (See VA-API section)
+
+-   New uvcsink element for exporting streams as UVC camera
+
+## New element features and additions
+
+-   alphacombine supports I420_10LE now for 10-bit WebM/alpha support.
+
+-   The amfcodec for hardware-accelerated video encoding using the Advanced Media Framework (AMF) SDK for AMD GPUs gained some
+    new features:
+
+    -   10-bit and HDR support for H.265 / HEVC and AV1 video encoders
+    -   B-frame support in the H.264 encoder
+    -   Initial support of pre-analysis and pre-encoding
+    -   Initial support of Smart Access Video for optimal distribution amongst multiple AMD hardware instances.
+
+-   appsink: new “propose-allocation” signal so applications can provide a buffer pool or allocators to the upstream elements,
+    as well as “max-time” and “max-buffers” properties to configure the maximum size of the appsink-internal queue in addition
+    to the existing “max-bytes” property.
+
+-   autovideoconvert exposes colorspace and scaler elements for well know elements
+
+-   avtp: add AVTP Raw Video Format payload and de-payload support.
+
+-   cacasink’s output driver can now be selected via the “driver” property.
+
+-   camerabin: various fixes and stability improvements
+
+-   clocksync: “QoS” property to optionally send QoS events upstream like a synchronising sink would.
+
+-   cutter: can add GstAudioLevelMeta on output buffers, which can be enabled via the new “audio-level-meta” property.
+
+-   dashdemux2 has a new “start-bitrate” property.
+
+-   dashsink can now use the dashmp4mux muxer from the Rust plugins and will also produce better and RFC 6381-compatible codec
+    strings. The “suggested-presentation-delay” property allows to set the suggested presentation delay in the MPD.
+
+-   deinterlace: Add support for 10/12/16-bit planar YUV formats
+
+-   The dvdspu subpicture overlay now implements GstVideoOverlayComposition support to make it work better with hardware
+    decoders where the video data should ideally stay on the GPU/VPU and the overlay blitting be delegated to the renderer.
+
+-   encodebin now automatically autoplugs timestamper elements such as h264timestamper or h265timestamper, based on new
+    “Timestamper” element factory type and rank.
+
+-   New fakevideodec element (see debugging section below).
+
+-   filesink: “file-mode” property to allow the ability to specify rb+ file mode, which overwrites an existing file. This is
+    useful in combination with splitmuxsink so that files can be pre-allocated which can be useful to reduce disk fragmentation
+    over time.
+
+-   flvmux: add “enforce-increasing-timestamps” property to allow disabling a hack that was added back in the day because
+    librtmp as used in rtmpsink would get confused by timestamps going backwards, but this is no longer required with rtmpsink2.
+    If set to true (still the default, for backwards compatibility), flvmux will modify buffers timestamps to ensure they are
+    always strictly increasing, inside one stream and also between the audio and video streams.
+
+-   giostreamsink: Add a property to close the stream on stop().
+
+-   h264parse improved its AU boundary detection.
+
+-   h264parse, h265parse, mpegvideoparse now support multiple unregistered user data SEI messages.
+
+-   insertbin is now a registered element and available via the registry, so can be constructed via parse-launch and not just
+    via the insertbin API.
+
+-   jack: libjack is now loaded dynamically at runtime instead of linking it at build time. This means the plugin can be shipped
+    on Windows and macOS and will work if there’s a user-installed JACK server/library setup.
+
+-   jpegparse now has a rank so it will be autoplugged if needed.
+
+-   kmssink: Add auto-detection for NXP i.MX8M Plus LCDIFv3, ST STM32 LTDC, and Texas Instruments TIDSS display controllers.
+
+-   matroskademux and matroskamux gained support for more raw video formats, namely RGBA64_LE, BGRA64_LE, GRAY10_BE32, GRAY16_LE
+
+-   mpg123audiodec’s rank was changed from MARGINAL to PRIMARY so it’s now higher than avdec_mp3, as it works better with
+    “freeformat” MP3s.
 
 -   msdk:
 
-    -   new msdkav1enc AV1 video encoder element
-    -   msdk decoders: Add support for Scaler Format Converter (SFC) on
-        supported Intel platforms for hardware accelerated conversion
-        and scaling
-    -   msdk encoders: support import of dmabuf, va memory and D3D11
-        memory
-    -   msdk encoders: add properties for low delay bitrate control and
-        max frame sizes for I/P frames
-    -   msdkh264enc, msdkh265enc: more properties to control intra
-        refresh
-    -   note that on systems with multi GPUs the Windows D3D11
-        integration might only work reliably if the Intel GPU is the
-        primary GPU
+    -   DRM modifier support on Linux
 
--   mxfdemux: Add support for Canon XF-HEVC
+    -   only expose codecs and capabilities actually supported by the platform
 
--   openaptx: Support the freeaptx library
+    -   msdkvpp video post-processing:
 
--   qroverlay:
+        -   new “hdr-tone-mapping” property to enable HDR-to-SDR tone mapping
+        -   new compute scaling mode
 
-    -   new “qrcode-case-sensitive” property allows encoding case
-        sensitive strings like wifi SSIDs or passwords.
-    -   added the ability to pick up data to render from an
-        upstream-provided custom GstQROverlay meta
+    -   Decoders sport D3D11 and VA integration, and the VP9 decoder supports certain resolution changes.
 
--   qtdemux: Add support for ONVIF XML Timed MetaData and AVC-Intra
-    video
+    -   Encoders:
 
--   rfbsrc now supports the uri handler interface, so applications can
-    use RFB/VNC sources in uridecodebin(3) and playbin, with
-    e.g. rfb://:password@10.1.2.3:5903?shared=1
+        -   msdkh264enc, msdkh265enc**: “pic-timing-sei” property to insert pic timing SEI
+        -   msdkh264enc, msdkh265enc**: Add properties to allow different max/min-qp values for I/P/B frames
+        -   msdkh264enc: Added BGRx format DMABuf support
+        -   Advertise special image formats in low power mode
 
--   rtponviftimestamp: Add support for using reference timestamps
+-   mxfdemux gained support for FFV1 demuxing
 
--   rtpvp9depay now has the same keyframe-related properties as
-    rtpvp8depay and rtph264depay: “request-keyframe” and
-    “wait-for-keyframe”
+-   opusenc, opusdec now support decoding and encoding more than 8 channels, and can also handle unknown/unpositioned channel
+    layouts.
 
--   rtspsrc: Various RTSP servers are using invalid URL operations for
-    constructing the control URL. Until GStreamer 1.16 these worked
-    correctly because GStreamer was just appending strings itself to
-    construct the control URL, but starting version 1.18 the correct URL
-    operations were used. With GStreamer 1.22, rtspsrc now first tries
-    with the correct control URL and if that fails it will retry with
-    the wrongly constructed control URL to restore support for such
-    servers.
+-   The oss plugin gained a device provider for audio device discovery
 
--   rtspsrc and rtpjitterbuffer gained a new
-    “add-reference-timestamp-meta” property that makes them put the
-    unmodified original sender timestamp on output buffers for NTP or
-    PTP clock synced senders
+-   pcapparse learned how to handle the Linux “cooked” capture encapsulation v2
 
--   srtsrc, srtsink: new “auto-reconnect” property to make it possible
-    to disable automatic reconnects (in caller mode) and make the
-    elements post an error immediately instead; also stats improvements
+-   Intel Quick Sync plugin improvements:
 
--   srtsrc: new “keep-listening” property to avoid EOS on disconnect and
-    keep the source running while it waits for a new connection.
+    -   qsvh264enc gained more encoding options
+    -   qsvh265dec now supports GBR decoding and HEVC RExt profiles
 
--   videocodectestsink: added YUV 4:2:2 support
+-   qtdemux now adds audio clipping meta when playing gapless m4a content, supports CENC sample grouping, as well as the SpeedHQ
+    video codec.
 
--   wasapi2src: Add support for process loopback capture
+-   ristsrc gained support for dynamic payloads via the new “caps” and “encoding-name” properties. These can be used to make the
+    ristsrc receive other payload types than MPEG-TS.
 
--   wpesrc: Add support for modifiers in key/touch/pointer events
+-   rtmp2src: a new “no-eof-is-error” property was added: There is currently no way for applications to know if the stream has
+    been properly terminated by the server or if the network connection was disconnected, as an EOS is sent in both cases. With
+    the property set, connection errors will be reported as errors, allowing applications to distinguish between both scenarios.
 
-Plugin and library moves
+-   rtspsrc: new “extra-http-request-headers” property for adding custom http request headers when using http tunnelling.
 
--   The xingmux plugin has been moved from gst-plugins-ugly into
-    gst-plugins-good.
+-   sdpdemux now supports SDP source filters as per RFC 4570; audio-only or video-only streaming can be selected via the new
+    “media” property, and RTCP feedback can be disabled via the “rtcp-mode” property.
 
--   The various Windows directshow plugins in gst-plugins-bad have been
-    unified into a single directshow plugin.
+-   splitmuxsrc uses natural ordering to sort globbed filenames now, i.e. 0, 1, 2, 10, 11 instead of 0, 1, 10, 11, 2, …
 
-Plugin removals
+-   srt: Add more fields to the statistics to see how many packets were retransmitted and how many were dropped.
 
--   The dxgiscreencapsrc element has been removed, use
-    d3d11screencapturesrc instead
+-   switchbin: many improvements, especially for caps handling and passthrough.
 
-Miscellaneous API additions
+-   taginject: a “scope” property was added to allow injection of global tags in addition to the current default which is stream
+    tags.
 
--   GST_AUDIO_FORMAT_INFO_IS_VALID_RAW() and
-    GST_VIDEO_FORMAT_INFO_IS_VALID_RAW() can be used to check if a
-    GstAudioFormatInfo or GstVideoFormatInfo has been initialised to a
-    valid raw format.
+-   timeoverlay: add buffer-count and buffer-offset time modes.
 
--   Video SEI meta: new GstVideoSEIUserDataUnregisteredMeta to carry
-    H.264 and H.265 metadata from SEI User Data Unregistered messages.
+-   udpsrc: new “multicast-source” property to support IGMPv3 Source Specific Muliticast (SSM) as per RFC 4604.
 
--   vulkan: Expose gst_vulkan_result_to_string()
+-   videoconvertscale, videoconvert: add a “converter-config” property to allow fine-tuning conversion parameters that are not
+    exposed directly as property.
 
-Miscellaneous performance, latency and memory optimisations
+-   videoflip: many orientation tag handling fixes and improvements
 
--   liborc 0.4.33 adds support for aarch64 (64-bit ARM) architecture
-    (not enabled by default on Windows yet though) and improvements for
-    32-bit ARM and should greatly enhance performance for certain
-    operations that use ORC.
+-   videorate: add “drop-out-of-segment” property to force dropping of out-of-segment buffers.
 
--   as always there have been plenty of performance, latency and memory
-    optimisations all over the place.
+-   volume now supports arbitrarily-large positive gains via a new “volume-full-range” property (it was not possibly to just
+    allow a bigger maximum value for the existing “volume” property for GstController-related backwards-compatibility reasons).
 
-Miscellaneous other changes and enhancements
+-   waylandsink, gtkwaylandsink: improved frame scheduling reducing frame drops and improve throughput.
 
--   the audio/video decoder base classes will not consider decoding
-    errors a hard error by default anymore but will continue trying to
-    decode. Previously more than 10 consecutive errors were considered a
-    hard error but this caused various partially broken streams to fail.
-    The threshold is configurable via the “max-errors” property.
+-   webpenc now has support for animated WebP which can be enabled via the new “animated” property. By default it will just
+    output a stand-alone WebP image for each input buffer, just like before.
 
--   compatibility of the GStreamer PTP clock implementation with
-    different PTP server implementations was improved, and
-    synchronization is achieved successfully in various scenarios that
-    failed before.
+-   wpe: added a WebProcess crash handler; gained WPEWebKit 2.0 API support.
 
-Tracing framework and debugging improvements
+-   x264enc gained support for 8-bit monochrome video (GRAY8).
 
-New tracers
+-   ximagesrc gained navigation support (mouse and keyboard events).
 
--   buffer-lateness: Records lateness of buffers and the reported
-    latency for each pad in a CSV file. Comes with a script for
-    visualisation.
+-   y4mdec now parses extended headers to support high bit depth video.
 
--   pipeline-snapshot: Creates a .dot file of all pipelines in the
-    application whenever requested via SIGUSR1 (on UNIX systems)
+## Plugin and library moves
 
--   queue-levels: Records queue levels for each queue in a CSV file.
-    Comes with a script for visualisation.
+-   The AMR-NB and AMR-WB plugins have been moved from -ugly to -good.
 
-Debug logging system improvements
+## Plugin and element removals
 
--   new log macros GST_LOG_ID, GST_DEBUG_ID, GST_INFO_ID,
-    GST_WARNING_ID, GST_ERROR_ID, and GST_TRACE_ID allow passing a
-    string identifier instead of a GObject. This makes it easier to log
-    non-gobject-based items and also has performance benefits.
+-   The entire gst-omx package and plugin has been retired. See the OMX section below for more details.
 
-Tools
+-   The RealServer RTSP extension, RDT handling and PNM source have been removed from the realmedia plugin.
 
--   gst-play-1.0 gained a --no-position command line option to suppress
-    position/duration queries, which can be useful to reduce debug log
-    noise.
+-   The kate subtitle plugin has been removed.
 
-GStreamer FFMPEG wrapper
+## Miscellaneous API additions
 
--   Fixed bitrate management and timestamp inaccuracies for video
-    encoders
+GStreamer Core
 
--   Fix synchronization issues and errors created by the (wrong)
-    forwarding of upstream segment events by ffmpeg demuxers.
+-   gst_pipeline_get_configured_latency() and gst_pipeline_is_live() convenience functions to query liveness and configured
+    latency of a pipeline.
 
--   Clipping meta support for gapless mp3 playback
+-   Plugins can now provide status info messages for plugins that will be displayed in gst-inspect-1.0 and is useful for dynamic
+    plugins that register features at runtime. They are now able to provide information to the user why features might not be
+    available. This is now used in the amfcodec, nvcodec, qsv, and va plugins.
 
-GStreamer RTSP server
+-   GST_OBJECT_AUTO_LOCK() and GST_PAD_STREAM_AUTO_LOCK() are g_autoptr(GMutexLocker)-based helpers for GstPad and GstObject
+    that unlock the mutex automatically when the helper goes out of scope. This is not portable so should not be used in
+    GStreamer code that needs to be portable to e.g. Windows with MSVC.
 
--   Add RFC5576 Source-specific media attribute to the SDP media for
-    signalling the CNAME
+-   gst_clear_context(), gst_clear_promise(), gst_clear_sample()
 
--   Add support for adjusting request response on pipeline errors
+-   gst_util_ceil_log2() and gst_util_simplify_fraction() utility functions
 
-    -   Give the application the possibility to adjust the error code
-        when responding to a request. For that purpose the pipeline’s
-        bus messages are emitted to subscribers through a
-        “handle-message” signal. The subscribers can then check those
-        messages for errors and adjust the response error code by
-        overriding the virtual method
-        GstRTSPClientClass::adjust_error_code().
+-   New TAG_CONTAINER_SPECIFIC_TRACK_ID tag for container specific track ID as used in an HTML5 context, plus basic support in
+    matroskademux, qtdemux, dashdemux and dashdemux2
 
--   Add gst_rtsp_context_set_token() method to make it possible to set
-    the RTSPToken on some RTSPContext from bindings such as the Python
-    bindings.
+-   New utility functions to create a stream-id without a pad for elements:
 
--   rtspclientsink gained a “publish-clock-mode” property to configure
-    whether the pipeline clock should be published according to RFC7273
-    (RTP Clock Source Signalling), similar to the same API on
-    GstRTSPMedia.
+    -   gst_element_decorate_stream_id()
+    -   gst_element_decorate_stream_id_printf_valist()
+    -   gst_element_decorate_stream_id_printf()
 
-GStreamer VA-API support
+-   GstQueueArray gained API for sorting and sorted insertion
 
--   Development activity has shifted towards the new va plugin, with
-    gstreamer-vaapi now basically in maintenance-only mode. Most of the
-    below refers to the va plugin (not gstreamer-vaapi).
+-   Add strict GstStructure serialisation with gst_structure_serialize_full() in combination with GST_SERIALIZE_FLAG_STRICT
+    which only succeeds if the result can later be fully deserialised again.
 
--   new gst-va library for GStreamer VA-API integration
+-   GstBaseSrc enhancements: the “automatic-eos” property can be used to do the equivalent to gst_base_src_set_automatic_eos().
+    gst_base_src_push_segment() sends a segment event right away which can be useful for subclasses like appsrc which have their
+    own internal queuing.
 
--   vajpegdec: new JPEG decoder
+-   GstBaseSink gained a new custom GST_BASE_SINK_FLOW_DROPPED flow return which can be used by subclasses from the virtual
+    ::render method to signal to the base class that a frame is not being rendered. This is used in e.g. waylandsink and ensures
+    that elements such as fpsdisplaysink will correctly report the rate of frames rendered and dropped.
 
--   vah264enc, vah265enc: new H.264/H.265 encoders
+GstDiscoverer
 
--   vah264lpenc, vah265lpenc: new low power mode encoders
+-   New “load-serialized-info” signal to retrieve a serialized GstDiscovererInfo
 
--   vah265enc: Add extended formats support such as 10/12 bits, 4:2:2
-    and 4:4:4
+GstSDP
 
--   Support encoder reconfiguration
+-   Add gst_sdp_message_remove_media()
 
--   vacompositor: Add new compositor element using the VA-API VPP
-    interface
+Video Library
 
--   vapostproc:
+DRM Modifier Support for dmabufs on Linux
 
-    -   new “scale-method” property
-    -   Process HDR caps if supported
-    -   parse video orientation from tags
+See section above.
 
--   vaapipostproc: Enable the use of DMA-Buf import and export
-    (gstreamer-vaapi)
+List of Video Formats for Passthrough
 
-GStreamer Video4Linux2 support
+New helper API was added to get a list of all supported video formats, including DMA_DRM formats, and can be used to advertise
+all supported formats for passthrough purposes:
 
--   Added support for Mediatek Stateless CODEC (VP8, H.264, VP9)
+-   GST_VIDEO_FORMATS_ANY_STR, GST_VIDEO_FORMATS_ANY
+-   gst_video_formats_any() which can be used by bindings or for code that prefers GstVideoFormat values instead of strings.
 
--   Stateless H.264 interlaced decoder support
+New Video Formats
 
--   Stateless H.265 decoder support
+-   12-bit and 16-bit A420 / A422 / A444 (YUV with alpha channel) variants:
 
--   Stateful decoder support for driver resolution change events
+    -   A444_12BE, A444_12LE
+    -   A422_12BE, A422_12LE
+    -   A420_12BE, A420_12LE
+    -   A444_16BE, A444_16LE
+    -   A422_16BE, A422_16LE
+    -   A420_16BE, A420_16LE
 
--   Stateful decoding support fixes for NXP/Amphion driver
+-   8-bit A422 / A444 (YUV with alpha channel) variant:
 
--   Support for hardware crop in v4l2src
+    -   A422
+    -   A444
 
--   Conformance test improvement for stateful decoders
+-   Planar 16-bit 4:4:4 RGB formats:
 
--   Fixes for Raspberry Pi CODEC
+    -   GBR_16BE
+    -   GBR_16LE
 
-GStreamer OMX
+-   RBGA, intended to be used by hardware decoders where VUYA is only supported 4:4:4 decoding surface but the stream is encoded
+    with GBR color space, such as HEVC and VP9 GBR streams for example.
 
--   There were no changes in this module
+-   Two tiled Mediatek 10-bit formats:
 
-GStreamer Editing Services and NLE
+    -   MT2110T
+    -   MT2110R
 
--   Handle compositors that are bins around the actual compositor
-    implementation (like glvideomixers which wraps several elements)
+-   Tiled 10-bit NV12 format NV12_10LE40_4L4 (Verisilicon Hantro)
 
--   Add a mode to disable timeline editing API so the user can be in
-    full control of its layout (meaning that the user is responsible for
-    ensuring its validity/coherency)
+## Miscellaneous performance, latency and memory optimisations
 
--   Add a new fade-in transition type
+-   liborc 0.4.35 (latest: 0.4.38) adds support for AVX/AVX2 and contains improvements for the SSE backend.
 
--   Add support for non-1/1 PAR source videos
+-   liborc 0.4.37 adds support for NEON on macOS on Apple ARM64 CPUs.
 
--   Fix frame accuracy when working with very low framerate streams
+-   Most direct use of the GLib GSLice allocator has been removed, as there is little evidence that it actually still provides
+    much advantage over the standard system allocator on Linux or Windows in 2024. There is strong evidence however that it
+    causes memory fragmentation for standard GStreamer workloads such as RTSP/RTP/WebRTC streaming.
 
-GStreamer validate
+-   As always there have been plenty of performance, latency and memory optimisations all over the place.
 
--   Clean up and stabilize API so we can now generate rust bindings
+## Tracing framework and debugging improvements
 
--   Enhance the appsrc-push action type allowing to find tune the
-    buffers more in details
+-   The gst-stats tool can now be passed a custom regular expression
 
--   Add an action type to verify currently configured pad caps
+-   gst-debug-viewer from the devtools module has seen minor improvements and fixes
 
--   Add a way to run checks from any thread after executing a ‘wait’
-    action. This is useful when waiting on a signal and want to check
-    the value of a property right when it is emited for example.
+New tracers
 
-GStreamer Python Bindings
+-   None in this release.
 
--   Add a Gst.init_python() function to be called from plugins which
-    will initialise everything needed for the GStreamer Python bindings
-    but not call Gst.init() again since this will have been called
-    already.
+Debug logging system improvements
 
--   Add support for the GstURIHandlerInterface that allows elements to
-    advertise what URI protocols they support.
+-   Nothing major in this cycle.
 
-GStreamer C# Bindings
+Fake video decoder
 
--   Fix AppSrc and AppSink constructors
+-   The new fakevideodec element does not decode the input bitstream, it only reads video width, height and framerate from the
+    caps and then pushes out raw video frames of the expected size in RGB format.
 
--   The C# bindings have yet to be updated to include new 1.22 API,
-    which requires improvements in various places in the bindings /
-    binding generator stack. See issue #1718 in GitLab for more
-    information and to track progress.
+-   It draws a snake moving from left to right in the middle of the frame, which is reasonably light weight and still provides
+    an idea about how smooth the rendering is.
 
-GStreamer Rust Bindings and Rust Plugins
+## Tools
 
-The GStreamer Rust bindings are released separately with a different
-release cadence that’s tied to gtk-rs, but the latest release has
-already been updated for the new GStreamer 1.22 API. Check the bindings
-release notes for details of the changes since 0.18, which was released
-around GStreamer 1.20.
+-   gst-launch-1.0 gained a new --prog-name command line option to set the program name, which will be used by GTK and GStreamer
+    to set the class or app-id.
 
-gst-plugins-rs, the module containing GStreamer plugins written in Rust,
-has also seen lots of activity with many new elements and plugins. A
-list of all Rust plugins and elements provided with the 0.9 release can
-be found in the repository.
+-   gst-play-1.0 now defaults to using playbin3, but can still be made to use the old playbin by passing the --use-playbin2
+    command line argument.
 
--   33% of GStreamer commits are now in Rust (bindings + plugins), and
-    the Rust plugins module is also where most of the new plugins are
-    added these days.
+## GStreamer FFmpeg wrapper
 
--   The Rust plugins are now shipped as part of the Windows MSVC + macOS
-    binary packages. See below for the list of shipped plugins and the
-    status of Rust support in cerbero.
+-   New avvideocompare element to compare two incoming video buffers using a specified comparison method (e.g. SSIM or PSNR).
 
--   The Rust plugins are also part of the documentation on the GStreamer
-    website now.
+-   Prefer using FFmpeg Musepack decoder/demuxer over musepackdec as they work better with decodebin3 and playbin3 which likes
+    to have parsers and decoders separate.
 
--   Rust plugins can be used from any programming language. To the
-    outside they look just like a plugin written in C or C++.
+-   Added codec mappings for AV1, MxPEG, FFVHuff video
 
-New Rust plugins and elements
+-   Added raw video format support for P010, VUYA, Y410, P012, Y212 and Y412.
 
--   rtpav1pay / rtpav1depay: RTP (de)payloader for the AV1 video codec
--   gtk4paintablesink: a GTK4 video sink that provides a GdkPaintable
-    for rendering a video in any place inside a GTK UI. Supports
-    zero-copy rendering via OpenGL on Linux and macOS.
--   ndi: source, sink and device provider for NewTek NDI protocol
--   onvif: Various elements for parsing, RTP (de)payloading, overlaying
-    of ONVIF timed metadata.
--   livesync: Element for converting a live stream into a continuous
-    stream without gaps and timestamp jumps while preserving live
-    latency requirements.
--   raptorq: Encoder/decoder elements for the RaptorQ FEC mechanism that
-    can be used for RTP streams (RFC6330).
+-   Newer, non-deprecated APIs are used by the plugin when built with FFmpeg 6.0 or newer.
 
-WebRTC elements
+-   The FFmpeg meson subproject wrap has been updated to v6.1
 
--   webrtcsink: a WebRTC sink (batteries included WebRTC sender with
-    specific signalling)
--   whipsink: WebRTC HTTP ingest (WHIP) to MediaServer
--   whepsrc: WebRTC HTTP egress (WHEP) from MediaServer
--   rtpgccbwe: RTP bandwidth estimator based on the Google Congestion
-    Control algorithm (GCC), used by webrtcsink
+-   Note: see Known Issues section below for known issues with FFmpeg 6.0.0 and the latest FFmpeg 7.x release
 
-Amazon AWS services
+## GStreamer RTSP server
 
--   awss3src / awss3sink: A source and sink element to talk to the
-    Amazon S3 object storage system.
--   awss3hlssink: A sink element to store HLS streams on Amazon S3.
--   awstranscriber: an element wrapping the AWS Transcriber service.
--   awstranscribeparse: an element parsing the packets of the AWS
-    Transcriber service.
+-   New “ensure-keyunit-on-start” property: While the suspend modes NONE and PAUSED provided a low startup latency for
+    connecting clients, it did not ensure that streams started on fresh data. With this new property it is possible to maintain
+    the low startup latency of those suspend modes while also ensuring that a stream starts on a key unit. Furthermore, by
+    setting the new “ensure-keyunit-on-start-timeout” property it is also possible to accept a key unit of a certain age, but
+    discard it if too much time has passed and instead force a new key unit.
 
-Video Effects (videofx)
+-   rtspclientsink: apply “port-range” property for RTCP port selection as well
 
--   roundedcorners: Element to make the corners of a video rounded via
-    the alpha channel.
--   colordetect: A pass-through filter able to detect the dominant
-    color(s) on incoming frames, using color-thief.
--   videocompare: Compare similarity of video frames. The element can
-    use different hashing algorithms like Blockhash, DSSIM, and others.
+## GStreamer VA-API support
 
-New MP4 muxer + Fragmented MP4 muxer
+GstVA
 
--   isofmp4mux, cmafmux, dashmp4mux, onviffmp4mux: New fragmented
-    MP4/ISOBMFF/CMAF muxer for generating e.g. DASH/HLS media fragments.
--   isomp4mux, onvifmp4mux: New non-fragmented, normal MP4 muxer.
+-   vah264dec, vah265dec, vavp8dec, vavp9dec, vampeg2dec and vaav1dec were promoted to rank PRIMARY+1 on Linux
 
-Both plugins provides elements that replace the existing qtmux/mp4mux
-element from gst-plugins-good. While not feature-equivalent yet, the new
-codebase and using separate elements for the fragment and non-fragmented
-case allows for easier extensability in the future.
+-   Improved support for dmabuf use cases. All va elements now negotiate the new and improved dmabuf capabilities with explicit
+    modifiers. This supports both import and export of dmabufs.
 
-Cerbero Rust support
+-   Added vaav1enc element, available in recent Intel and AMD GPUs
 
--   Starting this release, cerbero has support for building and shipping
-    Rust code on Linux, Windows (MSVC) and macOS. The Windows (MSVC) and
-    macOS binaries also ship the GStreamer Rust plugins in this release.
-    Only dynamic plugins are built and shipped currently.
+-   Added support for the experimental VA-Win32 backend. It needs at least libva 1.18
 
--   Preliminary support for Android, iOS and Windows (MinGW) exists but
-    more work is needed. Check the tracker issue for more details about
-    future work.
+-   Improved handling of multi-GPU systems. Still, sharing buffers among them is not advised.
 
--   The following plugins are included currently: audiofx, aws, cdg,
-    claxon, closedcaption, dav1d, fallbackswitch, ffv1, fmp4, gif,
-    hlssink3, hsv, json, livesync, lewton, mp4, ndi, onvif, rav1e,
-    regex, reqwest, raptorq, png, rtp, textahead, textwrap, threadshare,
-    togglerecord, tracers, uriplaylistbin, videofx, webrtc, webrtchttp.
+-   Bumped minimum libva version to 1.12
 
-Build and Dependencies
+-   Enhanced support for RadeonSI Mesa driver for 10bit decoding
 
--   meson 0.62 or newer is required
+-   Register elements only for allowed drivers (Intel and Mesa, for the moment)
 
--   GLib >= 2.62 is now required (but GLib >= 2.64 is strongly
-    recommended)
+GStreamer-VAAPI
 
--   libnice >= 0.1.21 is now required and contains important fixes for
-    GStreamer’s WebRTC stack.
+-   The new GstVA elements (see above) should be preferred when possible.
 
--   liborc >= 0.4.33 is recommended for 64-bit ARM support and 32-bit
-    ARM improvements
+-   Ranks of decoders were demoted to NONE so they won’t be used automatically by playbin and similar elements anymore.
 
--   onnx: OnnxRT >= 1.13.1 is now required
+-   Clean-ups and minimal fixes.
 
--   openaptx: can now be built against libfreeaptx
+-   gstreamer-vaapi should be considered deprecated and may be discontinued as soon as the va plugin is fully feature
+    equivalent. Users who rely on gstreamer-vaapi are encouraged to migrate and test the va elements at the earliest
+    opportunity.
 
--   opencv: allow building against any 4.x version
+## GStreamer Video4Linux2 support
 
--   shout: libshout >= 2.4.3 is now required
+-   New uvcsink element, based on v4l2sink allow streaming your pipeline as a UVC camera using Linux UVC Gadget driver.
 
--   gstreamer-vaapi’s Meson build options have been switched from a
-    custom combo type (yes/no/auto) to the built-in Meson feature type
-    (enabled/disabled/auto)
+-   v4l2src now supports 10/12/14/16-bit bayer formats.
 
--   The GStreamer Rust plugins module gst-plugins-rs is now considered
-    an essential part of the GStreamer plugin offering and packagers and
-    distributors are strongly encouraged to package and ship those
-    plugins alongside the existing plugin modules.
+-   Stateful decoders now pass too large encoded frames over multiple buffers.
 
--   we now make use of Meson’s install tags feature which allows
-    selective installation of installl components and might be useful
-    for packagers.
+-   AV1 Stateless video decoder.
 
-Monorepo build (gst-build)
+-   Stateless decoders now tested using Virtual driver (visl), making it possible to run the tests in the cloud based CI
 
--   new “orc-source” build option to allow build against a
-    system-installed liborc instead of forcing the use of orc as a
-    subproject.
+## GStreamer OMX
 
--   GStreamer command line tools can now be linked to the gstreamer-full
-    library if it’s built
+-   The gst-omx module has been removed. The OpenMAX standard is long dead and even the Raspberry Pi OS no longer supports it.
+    There has not been any development since 1.22 was released. Users of these elements should switch to the Video4Linux-based
+    video encoders and decoders which have been the standard on embedded Linux for quite some time now.
 
-Cerbero
+-   Hardware vendors which still use OpenMAX are known to have non-standard forks and it is recommended that they maintain it
+    while planning their move to the Video4Linux API.
 
-Cerbero is a meta build system used to build GStreamer plus dependencies
-on platforms where dependencies are not readily available, such as
-Windows, Android, iOS, and macOS.
+## GStreamer Editing Services and NLE
 
-General improvements
+-   Implement a gesvideoscale effect which gives user the ability to chooses where a clip has to be scaled in the chain of
+    effects. By default scaling is done in the compositor.
 
--   Rust support was added for all support configurations, controlled by
-    the rust variant; see above for more details
--   All pkgconfig files are now reliably relocatable without requiring
-    pkg-config --define-prefix. This also fixes statically linking with
-    GStreamer plugins using the corresponding pkgconfig files.
--   New documentation on how to build a custom GStreamer repository
-    using Cerbero, please see the README
--   HTTPS certificate checking is enabled for downloads on all platforms
-    now
--   Fetching now automatically retries on error for robustness against
-    transient errors
--   Support for building the new Qt6 plugin was added
--   pkgconfig files for various recipes were fixed
--   Several recipes were updated to newer versions
--   New plugins: adaptivedemux2 aes codectimestamper dav1d
--   New libraries: cuda webrtcnice
-
-macOS / iOS
-
--   Added support for running Cerbero on ARM64 macOS
--   GStreamer.framework and all libraries in it are now relocatable,
-    which means they use LC_RPATH entries to find dependencies instead
-    of using an absolute path. If you link to GStreamer using the
-    pkgconfig files, no action is necessary. However, if you use the
-    framework directly or link to the libraries inside the framework by
-    hand, then you need to pass -Wl,-rpath,<path_to_libdir> to the
-    linker.
--   Apple bitcode support was dropped, since Apple has deprecated it
--   macOS installer now correctly advertises support for both x86_64 and
-    arm64
--   macOS framework now ships the gst-rtsp-server-1.0 library
--   Various fixes were made to make static linking to gstreamer
-    libraries and plugins work correctly on macOS
--   When statically linking to the applemedia plugin using Xcode 13, you
-    will need to pass -fno-objc-msgsend-selector-stubs which works
-    around a backwards-incompatible change in Xcode 14. This is not
-    required for the rest of GStreamer at present, but will be in the
-    future.
--   macOS installer now shows the GStreamer logo correctly
+-   Add support for gessrc as sub-timeline element so third party can implement their own formatters and use their timelines as
+    sub-timelines. Before that, only timelines serialized as files on the filesystem could be loaded as sub-timelines (using
+    gesdemux).
 
-Windows
+-   Implement a new GESDiscovererManager singleton object making management of the discoverers used to discoverer media files
+    cleaner and allowing to expose the following APIs:
 
--   MSVC is now required by default on Windows, and the Visual Studio
-    variant is enabled by default
-    -   To build with MinGW, use the mingw variant
--   Visual Studio props files were updated for newer Visual Studio
-    versions
--   Visual Studio 2015 support was dropped
--   MSYS2 is now supported as the base instead of MSYS. Please see the
-    README for more details. Some advantages include:
-    -   Faster build times, since parallel make works
-    -   Faster bootstrap, since some tools are provided by MSYS2
-    -   Other speed-ups due to using MSYS2 tools instead of MSYS
--   Faster download by using powershell instead of hand-rolled Python
-    code
--   Many recipes were ported from Autotools to Meson, speeding up the
-    build
--   Universal Windows Platform is no longer supported, and binaries are
-    no longer shipped for it
--   New documentation on how to force a specific Visual Studio
-    installation in Cerbero, please see the README
--   New plugins: qsv wavpack directshow amfcodec wic win32ipc
--   New libraries: d3d11
+    -   load-serialize-info signal so GstDiscovererInfo can be serialized by users the way they like and load them without
+        requiring discovering the file when reloading a project.
+    -   source-setup signal so user can tweak source elements during discovery
 
-Windows MSI installer
+-   Expose GESFrameCompositionMeta in public API so user can implement their own effects targetting GES which take into account
+    that meta.
 
--   Universal Windows Platform prebuilt binaries are no longer available
+-   Expose audioconvert:mix-matrix property in audio sources
 
-Linux
+-   Port GESPipeline rendering to use encodebin2. This allows rendering timelines directly with a muxing sink (like hlssinkX
+    etc..) and leverage all new features of that new element.
 
--   Various fixes for RHEL/CentOS 7 support
--   Added support for running on Linux ARM64
+ges-launch
 
-Android
+-   Fix setting keyframes
 
--   Android support now requires Android API version 21 (Lollipop)
--   Support for Android Gradle plugin 7.2
+-   Add an ignore-eos option
 
-Platform-specific changes and improvements
+-   Allow overriding container profile so that the user can build encoding profiles following the media format of a specific
+    media file, for example, but ensuring it is muxed using a specific format
 
-Android
+-   Ensure sink elements are inside a GstBin and never in a GstPipeline
 
--   Android SDK 21 is required now as minimum SDK version
+-   Move +effect stack effects from source to last effect added, so it feels more natural to user as adding them at the
+    beginning of the chain while the syntax is +effect felt wrong
 
--   androidmedia: Add H.265 / HEVC video encoder mapping
+## GStreamer validate
 
--   Implement JNI_OnLoad() to register static plugins etc. automatically
-    in case GStreamer is loaded from Java using System.loadLibrary(),
-    which is also useful for the gst-full deployment scenario.
-
-Apple macOS and iOS
-
--   The GLib version shipped with the GStreamer binaries does not
-    initialize an NSApp and does not run a NSRunLoop on the main thread
-    anymore. This was a custom GLib patch and caused it to behave
-    different from the GLib shipped by Homebrew or anybody else.
-
-    The change was originally introduced because various macOS APIs
-    require a NSRunLoop to run on the main thread to function correctly
-    but as this change will never get merged into GLib and it was
-    reverted for 1.22. Applications that relied on this behaviour should
-    move to the new gst_macos_main() function, which also does not
-    require the usage of a GMainLoop.
-
-    See e.g. gst-play.c for an example for the usage of
-    gst_macos_main().
-
--   GStreamer.framework and all libraries in it are now relocatable,
-    which means they use LC_RPATH entries to find dependencies instead
-    of using an absolute path. If you link to GStreamer using the
-    pkgconfig files, no action is necessary. However, if you use the
-    framework directly or link to the libraries inside the framework by
-    hand, then you need to pass -Wl,-rpath,<path_to_libdir> to the
-    linker.
-
--   avfvideosrc: Allow specifying crop coordinates during screen capture
-
--   vtenc, vtdec: H.265 / HEVC video encoding + decoding support
-
--   osxaudiosrc: Support a device as both input and output
-
-    -   osxaudiodeviceprovider now probes devices more than once to
-        determine if the device can function as both an input AND and
-        output device. Previously, if the device provider detected that
-        a device had any output capabilities, it was treated solely as
-        an Audio/Sink. This caused issues for devices that have both
-        input and output capabilities (for example, USB interfaces for
-        professional audio have both input and output channels). Such
-        devicesare now listed as both an Audio/Sink as well as an
-        Audio/Source.
-
--   osxaudio: support hidden devices on macOS
-
-    -   These are devices that will not be shown in the macOS UIs and
-        that cannot be retrieved without having the specific UID of the
-        hidden device. There are cases when you might want to have a
-        hidden device, for example when having a virtual speaker that
-        forwards the data to a virtual hidden input device from which
-        you can then grab the audio. The blackhole project supports
-        these hidden devices and this change provides a way that if the
-        device id is a hidden device it will use it instead of checkinf
-        the hardware list of devices to understand if the device is
-        valid.
+-   In action types, add a way to avoid checking property value after setting it, in case elements do it async for example.
 
-Windows
+-   Add a vmethod to free GstValidateActionParameters to be more binding friendly.
 
--   win32ipcvideosink, win32ipcvideosrc: new shared memory videosrc/sink
-    elements
+-   Allow scenarios to define the pipeline state target in the metadata instead of assuming PLAYING state.
 
--   wasapi2: Add support for process loopback capture for a specified
-    PID (requires Windows 11/Windows Server 2022)
+-   Add support to run sub-pipelines/scenarios
 
--   The Windows universal UWP build is currently non-functional and will
-    need updating after the recent GLib upgrade. It is unclear if anyone
-    is using these binaries, so if you are please make yourself known.
+    -   Added support to forward buffers from appsink to appsrc
 
--   wicjpegdec, wicpngdec: Windows Imaging Component (WIC) based JPEG
-    and PNG decoder elements.
+-   Add a way to set pipeline base-time, start-time and force using the system clock.
 
--   mfaacdec, mfmp3dec: Windows MediaFoundation AAC and MP3 decoders
+-   Add a ‘fill-mode’ to the appsrc-push action type so we can create some type of streams easily using an appsrc, giving
+    control when writing scenarios without requiring files with the content.
 
--   The uninstalled development environment supports PowerShell 7 now
+-   Add a “select-streams” action type to test “stream aware” elements.
 
-Linux
+-   Add a way to wait for a property to reach a specified value before executing an action. For example it is possible to wait
+    for a pad to get some specific caps set before executing an action.
 
--   Improved design for DMA buffer sharing and modifier handling for
-    hardware-accelerated video decoders/encoders/filters and
-    capture/rendering on Linux and Linux-like system.
+-   validate: Add support to replace variables in deeply nested structures in particular for more complex action types where
+    some of the properties are inside structures.
 
--   kmssink
+-   Fixed compatibility with Python 3.12.
 
-    -   new “fd” property which allows an application to provide their
-        own opened DRM device fd handle to kmssink. That way an
-        application can lease multiple fd’s from a DRM master to display
-        on different CRTC outputs at the same time with multiple kmssink
-        instances, for example.
-    -   new “skip-vsync” property to achieve full framerate with legacy
-        emulation in drivers.
-    -   HDR10 infoframe support
+## GStreamer Python Bindings
 
--   va plugin and gstreamer-vaapi improvements (see above)
+gst-python is an extension of the regular GStreamer Python bindings based on gobject-introspection information and PyGObject,
+and provides “syntactic sugar” in form of overrides for various GStreamer APIs that makes them easier to use in Python and more
+pythonic; as well as support for APIs that aren’t available through the regular gobject-introspection based bindings, such as
+e.g. GStreamer’s fundamental GLib types such as Gst.Fraction, Gst.IntRange etc.
 
--   waylandsink: Add “rotate-method” property and “render-rectangle”
-    property
+-   Added a GstTagList override that makes a tag list act like a dict
 
--   new gtkwaylandsink element based on gtksink, but similar to
-    waylandsink and uses Wayland APIs directly instead of rendering with
-    Gtk/Cairo primitives. This approach is only compatible with Gtk3,
-    and like gtksink this element only supports Gtk3.
+-   Fix build and usage in Windows
 
-Documentation improvements
+-   Various fixes for Python >= 3.12
 
--   The GStreamer Rust plugins are now included and documented in the
-    plugin documentation.
+-   Rework libpython loading to be relocatable
 
-Possibly Breaking Changes
+-   Fix libpython dlopen on macOS
 
--   the Opus audio RTP payloader and depayloader no longer accept the
-    lower case encoding-format=multiopus but instead produce and accept
-    only the upper case variant encoding-format=MULTIOPUS, since those
-    should always be upper case in GStreamer (caps fields are always
-    case sensitive). This should hopefully only affect applications
-    where RTP caps are set manually and multi-channel audio (>= 3
-    channels) is used.
+## GStreamer C# Bindings
 
--   wpesrc: the URI handler protocols changed from wpe:// and web:// to
-    web+http://, web+https://, and web+file:// which means URIs are RFC
-    3986 compliant and the source can simply strip the prefix from the
-    protocol.
+-   The GStreamer C# bindings have been updated to a more recent version of GtkSharp and the bindings have been regenerated with
+    that version.
 
--   The Windows screen capture element dxgiscreencapsrc has been
-    removed, please use d3d11screencapturesrc instead.
+-   GStreamer API added in recent GStreamer releases is now available
 
--   On Android the minimum supported Android API version is now version
-    21 and has been increased from 16.
+-   GstRtspServer bindings have been added, plus an RTSP server example
 
--   On macOS, the GLib version shipped with the GStreamer binaries will
-    no longer initialize an NSApp or run an NSRunLoop on the main
-    thread. See macOS/iOS section above for details.
+## GStreamer Rust Bindings and Rust Plugins
 
--   decklink: The decklink plugin is now using the 12.2.2 version of the
-    SDK and will not work with drivers older than version 12.
+The GStreamer Rust bindings and plugins are released separately with a different release cadence that’s tied to the twice-a-year
+GNOME release cycle.
 
--   On iOS Apple Bitcode support was removed from the binaries. This
-    feature is deprecated since XCode 14 and not used on the App Store
-    anymore.
+The latest release of the bindings (0.22) has already been updated for the new GStreamer 1.24 APIs, and works with any GStreamer
+version starting at 1.14.
 
--   The MP4/Matroska/WebM muxers now require the “stream-format” to be
-    provided as part of the AV1 caps as only the original “obu-stream”
-    format is supported in these containers and not the “annexb” format.
+gst-plugins-rs, the module containing GStreamer plugins written in Rust, has also seen lots of activity with many new elements
+and plugins. The GStreamer 1.24 binaries track the 0.12 release series of gst-plugins-rs, and fixes from newer versions will be
+backported as needed to the 0.12 brach for future 1.24.x bugfix releases.
 
-Known Issues
+Rust plugins can be used from any programming language. To applications they look just like a plugin written in C or C++.
 
--   The Windows UWP build in Cerbero needs fixing after the recent GLib
-    upgrade (see above)
+### WebRTC
 
--   The C# bindings have not been updated to include new 1.22 API yet
-    (see above)
+-   New element webrtcsrc that can act as a recvonly WebRTC client. Just like the opposite direction, webrtcsink, this can
+    support various different WebRTC signalling protocols. Some are included with the plugin and provide their own element
+    factory for easier usage but it is also possible for applications to provide new signalling protocol implementations.
 
-Statistics
+-   webrtcsink now exposes the signaller as property and allows implementing a custom signaller by connecting signal handlers to
+    the default signaller.
 
--   4072 commits
+-   A new signaller and webrtcsink implementation for Janus’ VideoRoom implementation. The corresponding webrtcsrc signaller
+    implementation is currently in a merge request in GitLab.
 
--   2224 Merge Requests
+-   New whepsrc element that can receive WHEP WebRTC streams. This is currently not based on webrtcsrc but in the future a new
+    element around webrtcsrc will be added.
 
--   716 Issues
+-   New whipserversrc element around webrtcsrc for ingesting WHIP WebRTC streams in GStreamer.
 
--   200+ Contributors
+-   New whipclientsink element around webrtcsink for publishing WHIP WebRTC streams from GStreamer. This deprecates the old
+    whipsink element.
 
--   ~33% of all commits and Merge Requests were in Rust modules
+-   A new signaller and webrtcsink implementation for LiveKit. The corresponding webrtcsrc signaller implementation was merged
+    into the git repository recently.
 
--   4747 files changed
+-   A new signaller and webrtcsink implementation for AWS Kinesis Video Streams
 
--   469633 lines added
+-   webrtcsink has a new payloader-setup signal to allow the application more fine grained control over the RTP payloader
+    configuration, similar to the already existing encoder-setup signal for encoders.
 
--   209842 lines deleted
+-   webrtcsrc gained support for a custom navigation event protocol over the data channel, which is compatible with the
+    navigation event protocol supported by webrtcsink.
 
--   259791 lines added (net)
+-   webrtcsink supports encoded streams as input. Using encoded streams will disable webrtcsinks congestion control changing any
+    encoded stream parameters.
 
-Contributors
+-   webrtcsink and webrtcsrc have a new signal ‘request-encoded-filter’ to allow transformations of the encoded stream. This can
+    be used, for example, for the same use-cases as the WebRTC Insertable Streams API.
 
-Ádám Balázs, Adam Doupe, Adrian Fiergolski, Adrian Perez de Castro, Alba
-Mendez, Aleix Conchillo Flaqué, Aleksandr Slobodeniuk, Alicia Boya
-García, Alireza Miryazdi, Andoni Morales Alastruey, Andrew Pritchard,
-Arun Raghavan, A. Wilcox, Bastian Krause, Bastien Nocera, Benjamin
-Gaignard, Bill Hofmann, Bo Elmgreen, Boyuan Zhang, Brad Hards, Branko
-Subasic, Bruce Liang, Bunio FH, byran77, Camilo Celis Guzman, Carlos
-Falgueras García, Carlos Rafael Giani, Célestin Marot, Christian Wick,
-Christopher Obbard, Christoph Reiter, Chris Wiggins, Chun-wei Fan, Colin
-Kinloch, Corentin Damman, Corentin Noël, Damian Hobson-Garcia, Daniel
-Almeida, Daniel Morin, Daniel Stone, Daniels Umanovskis, Danny Smith,
-David Svensson Fors, Devin Anderson, Diogo Goncalves, Dmitry Osipenko,
-Dongil Park, Doug Nazar, Edward Hervey, ekwange, Eli Schwartz, Elliot
-Chen, Enrique Ocaña González, Eric Knapp, Erwann Gouesbet, Evgeny
-Pavlov, Fabian Orccon, Fabrice Fontaine, Fan F He, F. Duncanh, Filip
-Hanes, Florian Zwoch, François Laignel, Fuga Kato, George Kiagiadakis,
-Guillaume Desmottes, Gu Yanjie, Haihao Xiang, Haihua Hu, Havard Graff,
-Heiko Becker, He Junyan, Henry Hoegelow, Hiero32, Hoonhee Lee, Hosang
-Lee, Hou Qi, Hugo Svirak, Ignacio Casal Quinteiro, Ignazio Pillai, Igor
-V. Kovalenko, Jacek Skiba, Jakub Adam, James Cowgill, James Hilliard,
-Jan Alexander Steffens (heftig), Jan Lorenz, Jan Schmidt, Jianhui Dai,
-jinsl00000, Johan Sternerup, Jonas Bonn, Jonas Danielsson, Jordan
-Petridis, Joseph Donofry, Jose Quaresma, Julian Bouzas, Junsoo Park,
-Justin Chadwell, Khem Raj, Krystian Wojtas, László Károlyi, Linus
-Svensson, Loïc Le Page, Ludvig Rappe, Marc Leeman, Marek Olejnik, Marek
-Vasut, Marijn Suijten, Mark Nauwelaerts, Martin Dørum, Martin Reboredo,
-Mart Raudsepp, Mathieu Duponchelle, Matt Crane, Matthew Waters, Matthias
-Clasen, Matthias Fuchs, Mengkejiergeli Ba, MGlolenstine, Michael Gruner,
-Michiel Konstapel, Mikhail Fludkov, Ming Qian, Mingyang Ma, Myles
-Inglis, Nicolas Dufresne, Nirbheek Chauhan, Olivier Crête, Pablo Marcos
-Oltra, Patricia Muscalu, Patrick Griffis, Paweł Stawicki, Peter
-Stensson, Philippe Normand, Philipp Zabel, Pierre Bourré, Piotr
-Brzeziński, Rabindra Harlalka, Rafael Caricio, Rafael Sobral, Rafał
-Dzięgiel, Raul Tambre, Robert Mader, Robert Rosengren, Rodrigo
-Bernardes, Rouven Czerwinski, Ruben Gonzalez, Sam Van Den Berge,
-Sanchayan Maity, Sangchul Lee, Sebastian Dröge, Sebastian Fricke,
-Sebastian Groß, Sebastian Mueller, Sebastian Wick, Sergei Kovalev,
-Seungha Yang, Seungmin Kim, sezanzeb, Sherrill Lin, Shingo Kitagawa,
-Stéphane Cerveau, Talha Khan, Taruntej Kanakamalla, Thibault Saunier,
-Tim Mooney, Tim-Philipp Müller, Tomasz Andrzejak, Tom Schuring, Tong Wu,
-toor, Tristan Matthews, Tulio Beloqui, U. Artie Eoff, Víctor Manuel
-Jáquez Leal, Vincent Cheah Beng Keat, Vivia Nikolaidou, Vivienne
-Watermeier, WANG Xuerui, Wojciech Kapsa, Wonchul Lee, Wu Tong, Xabier
-Rodriguez Calvar, Xavier Claessens, Yatin Mann, Yeongjin Jeong, Zebediah
-Figura, Zhao Zhili, Zhiyuaniu, مهدي شينون (Mehdi Chinoune),
-
-… and many others who have contributed bug reports, translations, sent
-suggestions or helped testing.
-
-Stable 1.22 branch
-
-After the 1.22.0 release there will be several 1.22.x bug-fix releases
-which will contain bug fixes which have been deemed suitable for a
-stable branch, but no new features or intrusive changes will be added to
-a bug-fix release usually. The 1.22.x bug-fix releases will be made from
-the git 1.22 branch, which will be a stable branch.
-
-1.22.0
-
-1.22.0 was originally released on 23 January 2023.
-
-1.22.1
-
-The first 1.22 bug-fix release (1.22.1) was released on 04 March 2023.
-
-This release only contains bugfixes and it should be safe to update from
-1.22.0.
-
-Highlighted bugfixes in 1.22.1
-
--   audio channel-mix: allow up to 64 channels (instead of up to 63
-    channels)
--   avfvideosrc: Don’t wait on main thread for permissions request
--   avvidenc: avoid generating inaccurate output timestamps, especially
-    with variable framerate streams
--   AV1 video codec caps signalling improvements in various elements
--   codectimestamper: Fix timestamping on sequence update
--   d3d11overlaycompositor: fix texture width and height
--   d3d11videosink: Fix rendering on external handle
--   dashdemux2: fix seek operation taking a log time to finish for some
-    streams
--   nvencoder: Fix B-frame encoding on Linux and min buffers in auto GPU
-    mode
--   playbin3: fixing buffering for live pipelines
--   playbin: fix potential deadlock when stopping stream with subtitles
-    visible
--   redenc: fix setting of extension ID for twcc
--   rtspsrc: improved compatibility with more broken RTSP servers
--   v4l2h264dec: Fix Raspberry Pi4 will not play video in application
--   vtdec: fix jittery playback of H.264 Level 4.1 movies in macOS
--   vtdec: Fix non-deterministic frame output after flushing seeks
--   vtenc: fix handling of interlaced ProRes on Apple M1 hardware
--   vtenc: don’t advertise ARGB/RGBA64 input caps on M1 Pro/Max with
-    macOS <13
--   wasapi2src: Fix loopback capture on Windows 10 Anniversary Update
--   tools: better handling of non-ASCII command line arguments on
-    Windows
--   gst-libav: fix build against newer ffmpeg versions
--   gst-python: Use arch-specific install dir for gi overrides
--   cerbero: Fix setuptools site.py breakage in Python 3.11
--   macOS packages: Fix broken binaries on macos < 11.0
--   various bug fixes, memory leak fixes, and other stability and
-    reliability improvements
+-   gstwebrtc-api: JavaScript API for interacting with the default signalling protocol used by webrtcsink / webrtcsrc.
 
-gstreamer
+… and various other smaller improvements!
 
--   buffer: fix copy meta reference debug log formatting
--   bin: Don’t unlock unlocked mutex in gst_bin_remove_func()
--   pad: Don’t leak user_data in gst_pad_start_task()
--   aggregator: Always lock aggpad around update_time_level
--   inputselector: Avoid potential deadlock when shutting down,
-    e.g. playbin with subtitles
--   multiqueue: Handle use-interleave latency live pipelines, fixing
-    buffering for live pipelines in playbin3
--   GstBaseSrc: fix transfer annotation for fixate() virtual method
--   GstBaseSrc, GstPushSrc: add nullable annotations to virtual methods
--   tools: Make sure UTF-8 encoded command line arguments on Windows
+### RTSP
 
-gst-plugins-base
+-   New rtspsrc2 element. Only a subset of RTSP features are implemented so far:
+    -   RTSP 1.0 support
+    -   TCP, UDP, UDP-Multicast lower transports
+    -   RTCP SR, RTCP RR, RTCP-based A/V sync
+        -   Tested for correctness in multicast cases too
+    -   Lower transport selection and order (NEW!)
+        -   The existing rtspsrc has a hard-coded order list for lower transports
+    -   Many advanced features are not implemented yet, such as non-live support. See the README for the current status.
 
--   alsasink: Fix stall when going from PLAYING to NULL (stucked at
-    PAUSED) with uac1 gadget
--   appsrc: Don’t chain up BaseSrc::negotiate()
--   audio: channel-mix: Fix channel count limit to be able to equal 64
--   gldisplay: Mark gst_gl_display_create_context() other_context
-    parameter as nullable
--   gldisplay: Remove unused code
--   gstglwindow_x11.c: Fix colormap leak
--   gl/cocoa: Return a strong ref to the parent GstGLContext
--   rtspconnection: Annotate RTSP message and RTSP events parameters
-    correctly
--   sdp, typefind: Fix some annotations
--   sdp: gstmikey: gst_mikey_message_to_caps: extract ROC from first
-    crypto session
--   subparse: Properly forward segment seqnum
--   uridecodebin: Set source element to READY before querying it
--   uritranscodebin: Fix unref of NULL
--   gst-play-1.0: Don’t force accurate seeking
+### GTK4
 
-gst-plugins-good
+-   Support for rendering GL textures on X11/EGL, X11/GLX, Wayland, macOS, and WGL/EGL on Windows.
 
--   adaptivedemux2: Fix buffering threshold initialization
--   dashdemux2: the seek operation takes a log time to finish for some
-    streams
--   glvideomixer: Keep a reference to the underlying pad
--   qtdemux: Don’t emit GstSegment correcting start time when in MSE
-    mode
--   qtdemux: Handle moov atom length=0 case by reading until the end
--   qtdemux, qtmux: Drop av1C version 0 parsing and implement version 1
-    parsing/writing
--   qtmux: Fix assertion on caps update
--   redenc: fix setting of extension ID for twcc
--   rtspsrc: Use the correct vfunc for the push-backchannel-sample
-    action signal
--   rtpssrcdemux: set different stream-id on each src pad
--   udpsrc: GstSocketTimestampMessage only for SCM_TIMESTAMPNS
--   v4l2h264dec: Fix Raspberry Pi4 will not play video in application
+-   Create a window for testing purposes when running in gst-launch-1.0 or if GST_GTK4_WINDOW=1 is set.
 
-gst-plugins-bad
+-   New background-color property for setting the color of the background of the frame and the borders, if any. This also allows
+    setting a fully transparent background.
 
--   aom: Include stream-format and alignment in the AV1 caps
--   av1parser, h265parser: Fix some code defects
--   av1parser: Don’t consider unknown metadata OBUs a bitstream error
--   avfvideosrc: Don’t wait on main thread for permissions request
--   ccconverter: don’t debug a potentially freed filter caps
--   codectimestamper: Fix timestamping on sequence update
--   codecparsers: {h264, h265}bitwriter: Remove redundant condition
-    checks
--   codecs: decoders: fail early if no input caps have been provided for
-    all new decoder base classes
--   closedcaption: Don’t leak caps event
--   curlhttpsrc: Add curl anyauth option
--   d3d11overlaycompositor: fix texture width and height
--   d3d11videosink: Fix rendering on external handle
--   h265parse: Always set profile on src caps
--   msdkav1enc: fix the category for msdkav1enc debug
--   nvcodec: improve error reporting on plugin init
--   nvencoder: Fix b-frame encoding on Linux
--   nvencoder: Fix min buffers parameter of allocation query in auto GPU
-    mode
--   nvvp9dec: Fix return value
--   qsvav1enc, amfav1enc: Set stream-format on caps
--   vtdec: Jittery playback of H.264 Level 4.1 movies in macOS (both
-    x86_64 and arm64)
--   vtdec: Fix DPB size calculations not taking values from SPS into
-    account
--   vtdec: Fix not waiting for async frames when flushing
--   vtenc: Disable ARGB/RGBA64 caps on M1 Pro/Max with macOS <13
--   vtenc: Fix checking for certain CPU variants when running in VMs
--   vtenc: Disable HW acceleration for interlaced ProRes
--   va: Avoid the array index overflow when filling 8x8 scaling list.
--   va: Fix some code defects
--   vah265enc: Use helper to update properties.
--   vulkan: memory: Flush non coherent memory after write.
--   wasapi2src: Fix loopback capture on Windows 10 Anniversary Update
--   webrtcbin: small stats improvements
--   win32ipcutils: Add missing include
--   wpe: Logging fixes for the WebExtension
+-   New scale-filter property for defining how to scale the frames.
 
-gst-plugins-ugly
+-   Add Python example application to the repository.
 
--   mpegpsdemux: Ignore DTS if PTS < DTS
+-   Various bugfixes, including support for the new GTK 4.14 GL renderer. The plugin needs to be built with at least the
+    gtk_v4_10 feature to work with the new GTK 4.14 GL renderer, and will work best if built with the gtk_v4_14 feature.
 
-gst-libav
+### Closed Caption
 
--   avauddec, avviddec: Free packet side data after usage
--   avviddec: change
-    AV_CODEC_CAP_AUTO_THREADS->AV_CODEC_CAP_OTHER_THREADS to fix build
-    against newer ffmpeg versions
--   Memory leak in ’ av_packet_add_side_data’ in
-    /lib/x86_64-linux-gnu/libavcodec.so reading the file
-    clock_odd_size_RLE_g1597902.avi
--   avvidenc: Don’t take ffmpeg timestamps verbatim but only use them to
-    calculate DTS
+-   Add cea608tocea708 element for upconverting CEA-608 captions to their CEA-708 representation.
 
-gst-rtsp-server
+-   Add support for translations within transcriberbin.
 
--   No changes
+-   awstranscriber supports translating the transcribed text into different languages, including multiple languages at the same
+    time.
 
-gstreamer-vaapi
+-   awstranscriber is using the new HTTP/2-based API now instead of the WebSocket-based one.
 
--   vaapi: Skip plugin pc file for shared plugins
+### Other new elements
 
-gstreamer-sharp
+-   New awss3putobjectsink that works similar to awss3sink but with a different upload strategy.
 
--   No changes
+-   New hlscmafsink element for writing HLS streams with CMAF/ISOBMFF fragments.
 
-gst-omx
+-   New inter plugin with new intersink and intersrc elements that allow to 1:N connect different pipelines in the same process.
+    This is implemented around the appsrc / appsink-based StreamProducer API that is provided as part of the GStreamer Rust
+    bindings, and is also used inside webrtcsrc and webrtcsink.
 
--   No changes
+-   New livesync element that allows maintaining a contiguous live stream without gaps from a potentially unstable source.
 
-gst-python
+-   New isomp4mux non-fragmented MP4 muxer element.
 
--   gst-python: Use arch-specific install dir for gi overrides
+### Other improvements
 
-gst-editing-services
+-   audiornnoise
+    -   Attach audio level meta to output buffers.
+    -   Add voice detection threshold property
+-   fmp4mux
+    -   Add support for CMAF-style chunking, e.g. low-latency / LL HLS and DASH
+    -   Add support for muxing Opus, VP8, VP9 and AV1 streams
+    -   Add ‘offset-to-zero’ property and make media/track timescales configurable
+-   hlssink3
+    -   Allow adding EXT-X-PROGRAM-DATE-TIME tag to the manifest.
+    -   Allow generating I-frame-only playlist
+-   ndi
+    -   Closed Caption support in ndisrc / ndisink
+    -   Zero-copy output support in ndisrc for raw video and audio
+-   spotifyaudiosrc: Support configurable bitrate
 
--   No changes
+For a full list of changes in the Rust plugins see the gst-plugins-rs ChangeLog between versions 0.9 (shipped with GStreamer
+1.22) and 0.12 (shipped with GStreamer 1.24).
 
-gst-validate + gst-integration-testsuites
+## Cerbero Rust support
 
--   validate:scenario: sink refs when building
--   tests: Fix known issue definition location for unit tests and how we
-    handle them in validate launcher
--   tests: mark elements_srtp.test_play test as flaky
--   Fix gstreamer-validate-1.0 dependency name
--   validate-scenario: fix g-i warning in annotation
--   validate: Fix gst_validate_execute_action annotation
+-   As of GStreamer 1.24, the GStreamer Rust plugins are shipped as part of our binary packages on all major platforms. This
+    includes Android and iOS now in addition to macOS and Windows/MSVC.
 
-gst-examples
+## Build and Dependencies
 
--   webrtc examples: Use webrtc.gstreamer.net
--   webrtc_sendrecv.py: Various fixes
+-   Meson >= 1.1 is now required for all modules
 
-Development build environment
+-   The GLib requirement has been bumped to >= 2.64
 
--   gst-env: Handle installing python modules to dist-packages
--   meson: Allow sysdeps to be forced as fallback subprojects
--   meson: Switch dav1d wrap to a tarball and update to dav1d 1.1.0
-
-Cerbero build tool and packaging changes in 1.22.1
-
--   macos: Fix broken binaries on macos < 11.0
--   orc: Update pthread_jit_write_protect fix for macOS/iOS
--   dav1d: Update to 1.1.0
--   libsrtp: update to v2.5.0
--   rustup: Update to 1.25.2
--   rust: Update to 1.67; cargo-c to 0.9.16
--   cerbero: Don’t error out if bindir already exists
--   Fix setuptools site.py breakage in Python 3.11, bump
-    gobject-introspection, bump windows image
--   cerbero: Retry if cargo update fails on macOS
--   gst-plugins-rs: Build glib/gio bindings with 2.74 API support
-
-Contributors to 1.22.1
-
-Alessandro Bono, Arun Raghavan, Bart Van Severen, Carlos Falgueras
-García, Célestin Marot, David Svensson Fors, Edward Hervey, Enrique
-Ocaña González, Frank Dana, Guillaume Desmottes, He Junyan, James
-Hilliard, Jan Alexander Steffens (heftig), Jan Schmidt, Jordan Petridis,
-Mathieu Duponchelle, Matthew Waters, medithe, Mengkejiergeli Ba, Nicolas
-Beland, Nirbheek Chauhan, Patricia Muscalu, Pawel Stawicki, Philippe
-Normand, Piotr Brzeziński, Rajneesh Soni, Robert Rosengren, Sanchayan
-Maity, Sebastian Dröge, Seungha Yang, Simon Himmelbauer, Thibault
-Saunier, Tim-Philipp Müller, Tristan van Berkom, U. Artie Eoff, Víctor
-Manuel Jáquez Leal, Vivia Nikolaidou, Xuchen Yang, Yinhang Liu,
-
-… and many others who have contributed bug reports, translations, sent
-suggestions or helped testing. Thank you all!
-
-List of merge requests and issues fixed in 1.22.1
-
--   List of Merge Requests applied in 1.22.1
--   List of Issues fixed in 1.22.1
-
-1.22.2
-
-The second 1.22 bug-fix release (1.22.2) was released on 11 April 2023.
-
-This release only contains bugfixes and it should be safe to update from
-1.22.x.
-
-Highlighted bugfixes in 1.22.2
-
--   avdec_h264: fix decoder deadlocks with FFmpeg 6.0
--   rtspsrc: fix regression with URI protocols in OPTIONS requests for
-    RTSP over TLS
--   rtspsrc: improved control url handling compatibility for broken
-    servers
--   decklink: fix 10 bit RGB (r210) format auto detection for capture
-    and fix playout if video caps are configured before audio caps
--   d3d11videosink: Fix tearing in case of fullscreen mode
--   playbin: fix deadlock when stopping stream with subtitles visible
-    (even more)
--   typefinding: fix regression not detecting application/dash+xml in
-    some corner cases
--   osxvideosink: fix broken aspect ratio and frame drawing region
--   decodebin3, parsebin: Improve elementary stream handling when
-    decoders are not present and fix hang when removing a failing stream
--   urisourcebin: Propagate sticky events from parsebin, so that the
-    STREAM_START event with the GstStream info is always available when
-    pads get exposed
--   v4l2: Add support for YVU420M format; mark JPEG content as parsed
--   h264decoder, h265decoder: DPB bumping process and latency reporting
-    fixes
--   Opus: Fix reading of extended channel config in MPEG-TS and fix
-    missing sample rate when remuxing from RTP to Matroska
--   zxing: add support for building against zxing-c++ 2.0
--   cerbero: Fix packaging of Rust plugins on Android; fix modern Gentoo
-    distro detection
--   various bug fixes, memory leak fixes, and other stability and
-    reliability improvements
+-   liborc >= 0.4.38 is strongly recommended
 
-gstreamer
+-   libnice >= 0.1.22 is strongly recommended, as it is required for WebRTC ICE consent freshness (RFC 7675).
 
--   datetime: Return G_MAXFLOAT instead of G_MAXDOUBLE for no timezone
-    offset
--   inputselector: Wake up streaming thread before PLAYING_TO_PAUSED
-    transition
--   tools: fix potential crash when passing command-line options on
-    Windows
+-   gst-libav was updated for FFmpeg API deprecations and removals
 
-gst-plugins-base
+-   libwebpmux is required for the animated WebP support
 
--   alsasink: Fix for being stuck in stop_streaming_threads state
--   decodebin3: fix hang when removing a failing stream
--   gl: wayland: cleanup on close
--   parsebin: Improve elementary stream handling
--   playbin: fix deadlock when stopping stream with subtitles visible
-    even more
--   sdp: Skip source-specific caps fields when creating an SDP media
-    from caps
--   urisourcebin: Propagate sticky events from parsebin
--   urisourcebin: Activate pad before transferring sticky events
--   typefinding: fix failure to recognize application/dash+xml in some
-    cases
+-   The wpe plugin gained support for the WPEWebKit 2.0 API version
 
-gst-plugins-good
+-   Bumped minimum libva version to 1.12 for the va plugin.
 
--   osxvideosink: fix broken aspect ratio and frame drawing region
--   qtdemux: Fix seek adjustment with SNAP_AFTER flag
--   rtpopusdepay, matroskamux: Fix invalid rate while muxing Opus in
-    Matroska
--   rtpmanager: twcc: Fix duplicate packet handling
--   rtsp: url: fix incorrect request URI scheme for TLS transport
-    methods (regression)
--   rtspsrc: Consider “451: Parameter Not Understood” when handling
-    broken control urls
--   rtspsrc: fix behavior change with URI protocols in OPTIONS requests
--   rtspsrc: Skip PTs with caps incompatible to the global caps
--   rtpjpegdepay: fix logic error when checking if an end of image (EOI)
-    tag is present
--   v4l2: Add support for YVU420M format
--   v4l2: mark JPEG as parsed
+-   zxing: added support for the zxing-c++ 2.0 API
 
-gst-plugins-bad
+-   The ptp-helper for Precision Time Protocol (PTP) support in GStreamer core has been rewritten in Rust, and the minimum
+    required Rust version for building this is 1.48, i.e. the version currently in Debian oldstable. On Windows, at least Rust
+    1.54 is needed. There is a new ptp-helper Meson feature option that can be used to make sure everything needed for PTP
+    support is available (if set to ptp-helper=enabled). cargo is not required for building.
 
--   cea708overlay: fix HCR interpretation
--   d3d11bufferpool: Fix invalid access in debug print loop
--   d3d11compositor: Fix composition error on release_pad()
--   d3d11converter: Fix conversion backend selection
--   d3d11videosink: Fix tearing in case of fullscreen mode -
-    d3d11bufferpool: Fix invalid access in debug print loop
--   d3d11window: fix memory leak
--   decklink: fix 10 bit RGB (r210) format auto detection
--   decklinkaudiosink: Fix playback when video caps is configured before
-    audio
--   decklinkvideosrc: RGB 4:4:4 doesn’t work after GStreamer upgrade
-    (regression)
--   decklinkvideosrc: unable to show HDMI stream that Blackmagic’s Media
-    Express is able to see
--   debugqroverlay: fix string leak
--   gtkwaylandsink: Destroy GstWlWindow when parent GtkWindow is
-    destroyed
--   gtkwaylandsink: Fix crash when rendering after the window is closed
--   ksvideo, directshow: Fix reference leaks in device providers
--   h264decoder: Fix DPB bumping process
--   h264decoder, h265decoder: Latency reporting related fixes
--   h264parse: Validate VUI framerate
--   jpegparse: reset parse state when the SOI is not the first marker
--   nvencoder: Fix CQP option setting
--   nvh264encoder: Fix template caps to include progressive mode as well
--   openjpegdec: allow multithread decoding only in subframe mode
--   tsdemux: Fix reading of extended Opus channel configuration
--   vulkan: fix validation layer issues
--   vulkanoverlaycompositor: fix potential use after free
--   vulkanswapper: correctly handle force-aspect-ratio=false
--   wasapi2: Fix potential crash on device activation failure
--   webrtc: Fix segfault traversing ice transports
--   webrtc: patch leak caused by early return
--   zxing: add support for zxing-c++ 2.0
+-   gst-plugins-rs requires Rust 1.70 or newer.
 
-gst-plugins-ugly
+-   Link to libsoup at build time in all cases on non-Linux, and only load it dynamically on Linux systems where we might need
+    to support a mix of applications with dependencies that might be using libsoup2 or libsoup3. A “soup-version” meson build
+    option was added to prefer a specific version. Distros should make sure that libsoup is still a package dependency, since
+    it’s still required at runtime for the soup and adaptivedemux2 plugins to function.
 
--   No changes
+-   libjack is now dynamically loaded at runtime by the JACK audio plugin, and no longer a hard build dependency. However, it
+    still is a runtime dependency, so distros should make sure it remains a package dependency.
 
-gst-libav
+Monorepo build (née gst-build)
 
--   avdec_h264 pipeline freeze with FFmpeg6
--   avdeinterlace, avmux: fix element reference leak
--   avviddec: Drop decoder stream lock when calling send_packet
+-   There is now a top-level meson build option to enable/require webrtc
 
-gst-rtsp-server
+-   The FFmpeg subproject wrap was udpated to 6.1
 
--   rtsp-server: fix deadlock on shutdown with non-live pipeline if
-    media isn’t playing/prerolled yet and eos-shutdown is enabled for
-    the media
+-   A libvpx wrap was added (for VP8/VP9 software encoding/decoding)
 
-gstreamer-vaapi
+gstreamer-full
 
--   No changes
+-   Add full static build support, including on Windows: Allow a project to use gstreamer-full as a static library and link to
+    create a binary without dependencies. Introduce the meson build option gst-full-target-type to select the build type:
+    dynamic (default) or static.
 
-gstreamer-sharp
+-   Registers all full features in a plugin now to offer the possibility to get information at the plugin level and get it from
+    the registry. All the full features are now registered in a fullstaticfeatures meta plugin instead of having a NULL plugin.
 
--   No changes
+Development environment
 
-gst-omx
+-   add VSCode IDE integration
 
--   No changes
+-   gst-env.py: Output a setting for the prompt with --only-environment
 
-gst-python
+### Cerbero
 
--   No changes
+Cerbero is a meta build system used to build GStreamer plus dependencies on platforms where dependencies are not readily
+available, such as Windows, Android, iOS, and macOS.
 
-gst-editing-services
+General improvements
 
--   No changes
+-   New plugins have been added
+    -   codecalpha dvbsubenc rtponvif switchbin videosignal isac ivfparse inter rtspsrc2
+-   JACK plugin is now available all platforms (previously only Linux), and will be loaded if the JACK library is found at
+    plugin load time
+-   Several recipes were ported to meson, leading to faster builds and better MSVC support
+    -   ffmpeg, gperf, lame, libvpx, ogg, opencore-amr, sbc, speex, tiff, webrtc-audio-processing
+    -   For more information, please see the tracker issue
+-   Some recipes are now outdated or unnecessary and have been removed:
+    -   intltool, libkate
+-   Various recipe updated to their latest versions
+-   Rust toolchain updated to 1.76.0 (latest as of writing)
+-   Rust plugins are now stripped and debug info split out correctly, reducing their size
+-   Fix several spurious build issues, especially with the Rust toolchain
+-   CMake is picked up from the system if available
+-   Cerbero will no longer OOM or consume excessive resources on low-end systems
+-   Python recipes have been moved from setuptools to virtualenv
+-   Fixed support for Python 3.12+
+
+macOS
+
+-   Minimum macOS version has been increased to 10.13 (High Sierra)
+    -   Released 5½ years ago, >95% marketshare
+-   Fix macOS app store validation issue caused by absolute RPATHs
+-   Rosetta is automatically installed if required for universal builds on Apple Silicon
+-   The official macOS binaries now also include static libs for the GStreamer Rust plugins
+
+iOS
+
+-   Minimum iOS version has been increased to 12.0
+-   The iOS binary packages now include the GStreamer Rust plugins
+-   tremor and ivorbisdec plugins are no longer shipped on iOS
 
-gst-validate + gst-integration-testsuites
+Windows
 
--   No changes
+-   New features shipped with the official binaries:
+    -   plugins: dwrite d3d12 (MSVC) soundtouch (MSVC) taglib (MSVC) webrtcdsp (MSVC)
+    -   plugin features: d3d11-wgc (Windows Graphics Capture Support)
+    -   libraries: gstdxva-1.0
+-   New qml6 plugin can be built on Windows with the qt6 variant enabled
+    -   Similar to qt5, this plugin cannot be included in the official binaries
+-   GLib process handling helpers for Windows are now shipped
+-   Windows 11 SDK is now required for builds
+    -   Visual Studio 2019 and newer ship this SDK
+-   MSYS is now deprecated for building Windows binaries, will be removed in the next release
+    -   MSYS2 is required, and the bootstrap script tools/bootstrap-windows.ps can install it for you
+-   Windows bootstrap script tools/bootstrap-windows.ps1 is much more interactive and user-friendly now
+-   Fixed Pango crash on 32-bit Windows
+-   WiX packaging now works with cross-windows builds from linux
 
-gst-examples
+Linux
 
--   No changes
+-   Linux packages will now also include static libs for the GStreamer Rust plugins
+-   Add Python support for multiarch distributions
+-   Build fixes for various recipes on multiarch distributions
+-   Use arch-specific libdir correctly on multiarch distributions
+-   gst-omx was removed from gstreamer, and hence is no longer shipped
+-   Fixed Gentoo support
+-   Added support for RHEL 9
+-   Added support for Rocky Linux
+-   Added support for Manjaro Linux
 
-Development build environment
+Android
+
+-   Android NDK has been updated to r25c
+    -   Only the Clang toolchain is used from the NDK now (both target and host)
+    -   gnustl has been completely removed
+-   The Android binary packages now include the GStreamer Rust plugins
+-   tremor and ivorbisdec plugins are no longer shipped on Android
+-   openh264 plugin no longer enables ASM optimizations on Android x86 due to relocation errors
+
+## Platform-specific changes and improvements
+
+### Android
+
+-   Add NDK implementation of Android MediaCodec. This reduces the amount of Java <-> native calls, which should reduce
+    overhead.
+
+-   Add support for AV1 to the androidmedia video encoder and decoder.
+
+### Apple macOS and iOS
+
+-   osxaudio: audio clock improvements (interpolate based on system time)
+
+-   Set activation policy in gst_macos_main() and in osxvideosink and glimagesink. Setting the policy to
+    NSApplicationActivationPolicyAccessory by default makes sure that we can activate windows programmatically or by clicking on
+    them. Without that, windows would disappear if you clicked outside them and there would be no way to bring them to front
+    again. This change also allows osxvideosink to receive navigation events correctly.
+
+### Windows
+
+-   New DirectWrite text rendering plugin with dwriteclockoverlay, dwritetimeoverlay, dwritetextoverlay, dwritesubtitlemux, and
+    dwritesubtitleoverlay elements, including closed caption overlay support in dwritetextoverlay.
+
+-   PTP clock support is now also available on Windows
+
+-   qml6d3d11sink is a new Direct3D11 Qt6 QML sink for Windows as an alternative to the existing qml6glsink.
+
+-   wasapi2 audio plugin:
+
+    -   Added an option to monitor a loopback device’s mute state
+    -   Allows process loopback capture on Windows 10
+
+-   win32ipc supports zero-copy rendering now through a shared bufferpool.
+
+-   Add a Windows-specific plugin loader implementation (gst-plugin-scanner), so plugin loading during registry updates happens
+    in an external process on Windows as well.
+
+-   gst_video_convert_sample() which is often used for thumbnailing gained a D3D11 specific conversion path.
+
+-   d3d11 plugin:
+
+    -   d3d11mpeg2dec element is promoted to PRIMARY + 1 rank
+    -   Added d3d11ipcsrc and d3d11ipcsink elements for zero-copy GPU memory sharing between multiple processes.
+    -   Added HLSL shader pre-compilation (at binary build time) support in MSVC build.
+    -   d3d11videosink and d3d11convert elements support 3D transform, MSAA (MultiSampling Anti-Aliasing) and anisotropic
+        sampling method.
+    -   Added support for more raw video formats by using compute shader. A list of supported raw video formats can be found in
+        the d3d11videosink plugin documentation.
+    -   Added d3d11overlay element for applications to be able to draw/blend an overlay image on Direct3D11 texture directly.
+
+-   New Direct3D12 plugin: From a video decoding, conversion, composition, and rendering point of view, this new d3d12 plugin is
+    feature-wise near equivalent to the d3d11 plugin. Notable differences between d3d12 and d3d11 are:
+    -   The GStreamer Direct3D12 integration layer is not exposed as a GStreamer API yet. Thus, other plugins such as amfcodec,
+        nvcodec, qsv, and dwrite are not integrated with d3d12 yet.
+    -   H.264 video encoding support via d3d12h264enc element.
+        -   Direct3D12 video encoding API requires Windows 11 or DirectX 12 Agility SDK
+    -   IPC, overlay, and deinterlace elements are not implemented in d3d12
+    -   Windows Graphics Capture API based screen capturing is not implemented in d3d12
+    -   In this release, MSVC is the only officially supported toolchain for the d3d12 plugin build.
+    -   All d3d12 elements are zero ranked for now. Users will need to adjust rank of each d3d12 element via GST_PLUGIN_RANK
+        environment or appropriate plugin feature APIs if they want these elements autoplugged.
+
+## Documentation improvements
+
+-   hotdoc has been updated to the latest version, and the theme has also been updated, which should fix various usability
+    issues.
+
+## Possibly Breaking Changes
+
+-   gst_plugin_feature_check_version() has been updated to fix unexpected version check behaviour for git versions. It would
+    return TRUE if the plugin version is for a git development version (e.g. 1.24.0.1) and the check is for the “next” micro
+    version (1.24.1). Now it no longer does this. This just brings the runtime version check in line with the build time version
+    checks which have been fixed some time ago.
+
+-   GstAudioAggregator and subclasses such as audiomixer now sync property values to output timestamp, which is what
+    GstVideoAggregator has been doing already since 2019, and which makes sense, as the properties need to change at every
+    output frame based on the output time because they may change even though the input frame is not changing.
+
+-   rtpac3depay now outputs audio/x-ac3 instead of audio/ac3 as that is the canonical media format in GStreamer. audio/ac3 is
+    still sometimes accepted as input format for backwards compatibility (e.g. in rtpac3pay or ac3parse), but shouldn’t be
+    output.
+
+-   timecodestamper: The “drop-frame” property now defaults to TRUE
 
--   git: prevent CRLF line ending conversion for patches to fix pango
-    subproject patching issues on Windows
+-   The NVIDIA desktop GPU decoders nvh264sldec, nvh265sldec, nvvp8sldec and nvvp9sldec were renamed to nvh264dec, nvh265dec,
+    nvvp8dec and nvvp9dec, respectively.
 
-Cerbero build tool and packaging changes in 1.22.2
+## Known Issues
 
--   build: retry rust build on SIGBUS errors too
--   Fix packaging of rust plugins on Android
--   Modern Gentoo distro adaptation
--   sbc: update to 2.0
--   speex: update to 1.2.1
-
-Contributors to 1.22.2
-
-Adrien De Coninck, Albert Sjölund, Alexande B, Antonio Rojas, Arun
-Raghavan, Bart Van Severen, Carlo Cabrera, Colin Kinloch, Edward Hervey,
-Guillaume Desmottes, Haihua Hu, He Junyan, Ilie Halip, Jordan Petridis,
-Josef Kolář, Lily Foster, Mathieu Duponchelle, Matt Feury, Matthew
-Waters, Maxim P. Dementyev, Michael Tretter, Nicolas Dufresne, Nirbheek
-Chauhan, Piotr Brzeziński, Robert Rosengren, Rouven Czerwinski,
-Sebastian Dröge, Seungha Yang, Shengqi Yu, Stéphane Cerveau, Talha Khan,
-Thibault Saunier, Tim-Philipp Müller, Víctor Manuel Jáquez Leal, Vivia
-Nikolaidou, Wang Chuan, Wojciech Kapsa,
-
-… and many others who have contributed bug reports, translations, sent
-suggestions or helped testing. Thank you all!
-
-List of merge requests and issues fixed in 1.22.2
-
--   List of Merge Requests applied in 1.22.2
--   List of Issues fixed in 1.22.2
-
-1.22.3
-
-The third 1.22 bug-fix release (1.22.3) was released on 19 May 2023.
-
-This release only contains bugfixes and it should be safe to update from
-1.22.x.
-
-Highlighted bugfixes in 1.22.3
-
--   avdec: fix occasional video decoder deadlock on seeking with FFmpeg
-    6.0
--   decodebin3: fix regression handling input streams without CAPS or
-    TIME segment such as e.g. udpsrc or `pushfilesrc
--   bluez: a2dpsink: fix Bluetooth SIG Certification test failures
--   osxvideosink: fix deadlock upon closing output window
--   qtdemux: fix edit list handling regression and AV1 codec box parsing
--   qtmux: fix extraction of CEA608 closed caption data from S334-1A
-    packets
--   rtspsrc: Fix handling of * control path
--   splitmux: timestamp handling improvements
--   v4l2videodec: Rework dynamic resolution change handling (needed for
-    IMX6 mainline codec)
--   videoflip: fix regression with automatically rotating video based on
-    tags
--   d3d11: many d3d11videosink and d3d11compositor fixes
--   webrtc, rtp: numerous data race fixes and stability fixes
--   various bug fixes, memory leak fixes, and other stability and
-    reliability improvements
+-   There are known issues with FFmpeg version 6.0.0 due to opaque passing being broken in that version. This affects at least
+    avdec_h264, but may affect other decoders as well. Versions before 6.0.0, and 6.0.1 or higher are not affected.
+
+-   gst-libav currently doesn’t build against the latest FFmpeg 7.0 release. This is being worked on and tracked in this “libav:
+    Fix compatibility with ffmpeg 7” Merge Request.
+
+## Statistics
+
+-   4643 commits
+
+-   2405 Merge Requests
+
+-   850 Issues
+
+-   290+ Contributors
+
+-   ~25% of all commits and Merge Requests were in Rust modules
+
+-   4747 files changed
+
+-   469633 lines added
+
+-   209842 lines deleted
+
+-   259791 lines added (net)
+
+## Contributors
+
+Aaron Boxer, Aaron Huang, Acky Xu, adixonn, Adrian Fiergolski, Adrien De Coninck, Akihiro Sagawa, Albert Sjölund, Alessandro
+Bono, Alexande B, Alexander Slobodeniuk, Alicia Boya García, amindfv, Amir Naghdinezhad, anaghdin, Anders Hellerup Madsen,
+Andoni Morales Alastruey, Antonio Kevo, Antonio Rojas, Arnaud Rebillout, Arnaud Vrac, Arun Raghavan, badcel, Balló György, Bart
+Van Severen, Bastien Nocera, Benjamin Gaignard, Bilal Elmoussaoui, Brad Hards, Camilo Celis Guzman, Carlo Cabrera, Carlos
+Falgueras García, Carlos Rafael Giani, Célestin Marot, Chao Guo, Charlie Blevins, Cheah, Vincent Beng Keat, Chris Degawa, Chris
+Spencer, Christian Curtis Veng, Christian Meissl, Christopher Degawa, Chris Wiggins, Cidana-Developers, Colin Kinloch, Damian
+Hobson-Garcia, Daniel Almeida, Daniel Knobe, Daniel Moberg, Daniel Morin, Daniel Pendse, Daniel Stone, Daniel Ulery, Dan
+Searles, Dario Marino Saccavino, Dave Patrick Caberto, David Craven, David Revay, David Rosca, David Svensson Fors, Detlev
+Casanova, Diego Nieto, Dominique Leroux, Dongyun Seo, Doug Nazar, Edward Hervey, Ekwang Lee, elenril, Elliot Chen, Enrique Ocaña
+González, Erik Fröbrant, Eva Pace, Evgeny Pavlov, Fabian Orccon, Felix Yan, Fernando Jiménez Moreno, Florian Zwoch, François
+Laignel, Frank Dana, Georges Basile Stavracas Neto, Guillaume Desmottes, Guillaume Gomez, Gwyn Ciesla, Haihua Hu, Hassene Tmar,
+hassount, Heiko Becker, He Junyan, hguermaz, Hiero32, Hosang Lee, Hou Qi, Hugo Svirak, Hugues Fruchet, Hu Qian, Hyung Song,
+Ignazio Pillai, Ilie Halip, Itamar Marom, Ivan Molodetskikh, Ivan Tishchenko, JackZhouVCD, Jacob Johnsson, jainl28patel, Jakub
+Adam, James Cowgill, James Hilliard, James Oliver, Jan Alexander Steffens (heftig), Jan Beich, Jan Schmidt, Jan Vermaete, Jayson
+Reis, Jeff Wilson, Jeongki Kim, Jeri Li, Jimmi Holst Christensen, Jimmy Ohn, Jochen Henneberg, Johan Adam Nilsson, Johan
+Sternerup, John King, Jonas Danielsson, Jonas K Danielsson, Jonas Kvinge, Jordan Petridis, Jordan Yelloz, Josef Kolář, Juan
+Navarro, Julien Isorce, Jun Zhao, Jurijs Satcs, Kalev Lember, Kamal Mostafa, kelvinhu325, Kevin Song, Khem Raj, Kourosh
+Firoozbakht, Leander Schulten, Leif Andersen, L. E. Segovia, Lieven Paulissen, lijing0010, Lily Foster, Link Mauve, Li Yuanheng,
+Loïc Le Page, Loïc Molinari, Lukas Geiger, Luke McGartland, Maksym Khomenko, Ma, Mingyang, Manel J, Marcin Kolny, Marc Leeman,
+Marc Solsona, Marc Wiblishauser, Marek Vasut, Marijn Suijten, Mark Hymers, Markus Ebner, Martin Nordholts, Martin Robinson, Mart
+Raudsepp, Marvin Schmidt, Mathieu Duponchelle, Matt Feury, Matthew Waters, Matthias Fuchs, Matthieu Volat, Maxim P. Dementyev,
+medithe, Mengkejiergeli Ba, Michael Bunk, Michael Gruner, Michael Grzeschik, Michael Olbrich, Michael Tretter, Michiel
+Westerbeek, Mihail Ivanchev, Ming Qian, Nader Mahdi, naglis, Nick Steel, Nicolas Beland, Nicolas Dufresne, Nirbheek Chauhan,
+Olivier Babasse, Olivier Blin, Olivier Crête, Omar Khlif, Onur Demiralay, Patricia Muscalu, Paul Fee, Pawel Stawicki, Peter
+Stensson, Philippe Normand, Philipp Zabel, PhoenixWorthVCD, Piotr Brzeziński, Priit Laes, Qian Hu, Rabindra Harlalka, Rafał
+Dzięgiel, Rahul T R, rajneeshksoni, Ratchanan Srirattanamet, renjun wang, Rhythm Narula, Robert Ayrapetyan, Robert Mader, Robert
+Rosengren, Robin Gustavsson, Roman Lebedev, Rouven Czerwinski, Ruben Gonzalez, Ruslan Khamidullin, Ryan Pavlik, Sanchayan Maity,
+Sangchul Lee, Scott Kanowitz, Scott Moreau, SeaDve, Sean DuBois, Sebastian Dröge, Sebastian Szczepaniak, Sergey Radionov,
+Seungha Yang, Shengqi Yu, Simon Himmelbauer, Slava Andrejev, Slawomir Pawlowski, soak, Stefan Brüns, Stéphane Cerveau, Stephan
+Seitz, Stijn Last, Talha Khan, Taruntej Kanakamalla, Jin Chung Teng, Théo Maillart, Thibault Saunier, Thomas Schneider,
+Tim-Philipp Müller, Tobias Rapp, Tong Wu, Tristan van Berkom, ttrigui, U. Artie Eoff, utzcoz, Víctor Manuel Jáquez Leal, Vivia
+Nikolaidou, Wang Chuan, William Manley, Wojciech Kapsa, Xabier Rodriguez Calvar, Xavier Claessens, Xuchen Yang, Yatin Maan,
+Yinhang Liu, Yorick Smilda, Yuri Fedoseev, Gang Zhao, Jack Zhou, …
+
+… and many others who have contributed bug reports, translations, sent suggestions or helped testing. Thank you all!
+
+Stable 1.24 branch
+
+After the 1.24.0 release there will be several 1.24.x bug-fix releases which will contain bug fixes which have been deemed
+suitable for a stable branch, but no new features or intrusive changes will be added to a bug-fix release usually. The 1.24.x
+bug-fix releases will be made from the git 1.24 branch, which will be a stable branch.
+
+1.24.0
+
+GStreamer 1.24.0 was released on 4 March 2024.
+
+1.24.1
+
+The first 1.24 bug-fix release (1.24.1) was released on 21 March 2024.
+
+This release only contains bugfixes and it should be safe to update from 1.24.0.
+
+Highlighted bugfixes in 1.24.1
+
+-   Fix instant-EOS regression in audio sinks in some cases when volume is 0
+-   rtspsrc: server compatibility improvements and ONVIF trick mode fixes
+-   rtsp-server: fix issues if RTSP media was set to be both shared and reusable
+-   (uri)decodebin3 and playbin3 fixes
+-   adaptivdemux2/hlsdemux2: Fix issues with failure updating playlists
+-   mpeg123 audio decoder fixes
+-   v4l2codecs: DMA_DRM caps support for decoders
+-   va: various AV1 / H.264 / H.265 video encoder fixes
+-   vtdec: fix potential deadlock regression with ProRes playback
+-   gst-libav: fixes for video decoder frame handling, interlaced mode detection
+-   avenc_aac: support for 7.1 and 16 channel modes
+-   glimagesink: Fix the sink not always respecting preferred size on macOS
+-   gtk4paintablesink: Fix scaling of texture position
+-   webrtc: Allow resolution and framerate changes, and many other improvements
+-   webrtc: Add new LiveKit source element
+-   Fix usability of binary packages on arm64 iOS
+-   various bug fixes, memory leak fixes, and other stability and reliability improvements
 
 gstreamer
 
--   tracing: Initialize tracing infrastructure even if the debug system
-    is not compiled in
--   parse-launch: fix missing unref of looked-up child element
--   gstutils: Add category and object to most logging messages
+-   registry, ptp: Canonicalize the library path returned by dladdr
+-   segment: Don’t use g_return_val_if_fail() in gst_segment_to_running_time_full()
+-   uri: Sort uri protocol sources/sinks by feature name to break a feature rank tie
+-   ptp: Initialize expected DELAY_REQ seqnum to an invalid value
+-   ptp: Don’t install test executable
+-   gst-inspect: fix –exists for plugins with versions other than GStreamer’s version, like the Rust plugins
+-   identity: Don’t refuse seeks unless single-segment=true
 
 gst-plugins-base
 
--   allocators: Fix fdmem unit test with recent GLib versions
--   audiotestsrc: Initialize all samples in wave=ticks mode
--   decodebin3: Handle input streams without CAPS or TIME segment such
-    as e.g. udpsrc or pushfilesrc
--   decodebin3: fix regression handling streams without caps
--   decodebin3: fix random hang when remove failing stream
--   uridecodebin3: Ensure atomic urisourcebin state change
--   glvideoflip: fix leaked caps
--   glcontext_wgl: fix missing unref
--   playsink: Fix volume leak
+-   audiobasesink: Don’t wait on gap events
+-   audioencoder: Avoid using temporarily mapped memory as base for input buffers
+-   decodebin3: Be more specific when sending missing plugin messages
+-   decodebin3: Fix re-usability issues
+-   decodebin3: Provide clear error message if no decoders present
+-   playbin3: Remove un-needed URI NULL check
+-   uridecodebin3: Don’t hold lock when posting messages or signals
+-   uridecodebin3: Handle potential double redirection errors
+-   glimagesink: Fix the sink not always respecting preferred size on macOS
+-   glupload: Do not propose allocators with sysmem, fixes warning when playing VP9 with alpha
+-   shmallocator: fix build on Illumos
+-   meson: Fix the condition to skip theoradec test
 
 gst-plugins-good
 
--   adaptivedemux2: fix critical when using an unsupported URI
--   dashdemux2: mpdclient: fix divide by 0 if segment has no duration
--   imagesequencesrc: Properly set default location
--   multifile: error out if no filename was set
--   osxvideosink: fix deadlock upon closing output window
--   rtpmanager: rtpsession: data race leading to critical warnings
--   rtpmanager: rtpsession: race conditions leading to critical warnings
--   rtspsrc: Fix handling of * control path
--   splitmuxsink: Catch invalid DTS to avoid running into problems later
--   splitmuxsrc: Make PTS contiguous by preference
--   qtdemux: emit no-more-pads after pruning old pads
--   Revert “qtdemux: fix conditions for end of segment in reverse
-    playback” to fix edit list regression
--   qtdemux: Fix av1C parsing
--   qtmux: Fix extraction of CEA608 data from S334-1A packets
--   qtwindow: unref caps in destructor
--   v4l2: device provider: Fix GMainLoop leak
--   v4l2: videodec: Rework dynamic resolution change handling
--   v4l2: videodec: Prefer acquired caps over anything downstream
--   videoflip: fix setting of method property at construction time
--   videoflip 1.22.2 not rotating video when extracting frames
+-   adaptivdemux/hlsdemux2: Fix issues with failure updating playlists
+-   mpg123audiodec: Correctly handle the case of clipping all decoded samples
+-   mpg123audiodec: gst_audio_decoder_allocate_output_buffer: assertion ‘size > 0’ failed
+-   qt: Fix description in meson build options
+-   qtdemux: Do not set channel-mask to zero
+-   rtspsrc: remove ‘deprecated’ flag from the ‘push-backchannel-sample’ signal
+-   rtspsrc: Consider 503 Service Not Available when handling broken control urls
+-   rtspsrc, rtponviftimestamp: ONVIF mode fixes
+-   rtspsrc: Don’t invoke close when stopping if we’ve started cleanup, fixing potential crash on shutdown
+-   rtpgstpay: Delay pushing of event packets until the next buffer
 
 gst-plugins-bad
 
--   a2dpsink: Fails many tests in Bluetooth SIG Certification
--   avdtputil: Use int instead of int range for fixed bitpool values
--   ccconverter: reintroduce frame count reset on cycle completion
--   ccconverter: integer overflow & crashing
--   codectimestamper: remove PC file generation from plugin’s own
-    meson.build
--   cudamemory: Fix for semi planar YUV memory size decision
--   d3d11compositor: Reconfigure resource only when output caps is
-    changed
--   d3d11compositor: Skip zero alpha input
--   d3d11convert: Fix for runtime property update
--   d3d11memory: Don’t clear wrapped texture memory
--   d3d11videosink: Fix for ignored initial render rectangle
--   d3d11videosink: fix race condition in window unprepare
--   d3d11videosink: Enhancement for initial window size decision
--   d3d11videosink: Don’t clear prepared buffer on unlock_stop()
--   dashdemux: mpdclient: fix divide by 0 if segment has no duration
--   dtlstransport: Keep strong ref of dtls encoder/decoder
--   GstPlay: avoid getting property of playbin2 if subtitle_sid is null
--   GstPlay: fix critical log when using playbin3
--   h264decoder: Drop nonexisting picture silently without error
--   dtmf: element classification improvements
--   mfvideoenc: Allow only even resolution numbers
--   sctpenc: Fix potential shutdown deadlock
--   srtpdec: fix “srtp-key” check
--   tests: disable dtls test if openssl is not present
--   tsdemux: Set number of channels to 2 for dual mono Opus
--   va: Various fixes for defects found with MSVC
--   wasapi2: Allows process loopback capture on Windows 10
--   webrtcdatachannel: Bind to parent webrtcbin using a weak reference
--   webrtcbin: Fix potential deadlock when closing before any data was
-    sent
--   webrtc: Plug leaks of resolved ICE addresses
--   webrtc: do not tear down data channel before data is flushed
+-   asio: Fix {input,output}-channels property handling
+-   cuda,d3d11,d3d12bufferpool: Disable preallocation
+-   d3d11device: Fix adapter LUID comparison in wrapped device mode
+-   d3d12device: Fix IDXGIFactory2 leak
+-   d3d12: Fix SDK debug layer activation
+-   dvbsubenc: Fix bottom field size calculation
+-   dvdspu: avoid null dereference
+-   GstPlay: Fix a critical warning in error callback
+-   v4l2codecs: decoders: Add DMA_DRM caps support
+-   vaav1enc: Init the output_frame_num when resetting gf group
+-   vah264enc, vah265enc, vaav1enc: fix potential crash on devices without rate control
+-   vah265enc: checking surface alignment
+-   videoparsers: Don’t verbosely warn about CEA_708_PROCESS_EM_DATA_FLAG not being set
+-   vtdec: Fix a deadlock during ProRes playback, handle non-linked gracefully
 
 gst-plugins-ugly
 
--   mpegpsdemux: Rework gap sending
+-   No changes
+
+GStreamer Rust plugins
+
+-   gtk4paintablesink: Fix scaling of texture position
+-   janusvrwebrtcsink: Handle 64 bit numerical room ids
+-   janusvrwebrtcsink: Don’t include deprecated audio/video fields in publish messages
+-   janusvrwebrtcsink: Handle various other messages to avoid printing errors
+-   livekitwebrtc: Fix shutdown behaviour
+-   rtpgccbwe: Don’t forward buffer lists with buffers from different SSRCs to avoid breaking assumptions in rtpsession
+-   sccparse: Ignore invalid timecodes during seeking
+-   webrtcsink: Don’t try parsing audio caps as video caps
+-   webrtc: Allow resolution and framerate changes
+-   webrtcsrc: Make producer-peer-id optional
+-   livekitwebrtcsrc: Add new LiveKit source element
+-   regex: Add support for configuring regex behaviour
+-   spotifyaudiosrc: Document how to use with non-Facebook accounts
+-   webrtcsrc: Add do-retransmission property
 
 gst-libav
 
--   avviddec: Temporarily unlock stream lock while flushing buffers
--   Random freeze and deadlock in ffmpegviddec flush and get_buffer
-    while seeking
+-   avcodecmap: Increase max AAC channels to 16
+-   avviddec: Fix how we get back the codec frame
+-   avviddec: Fix interlaced mode detection
+-   avviddec: Double check if AV_CODEC_FLAG_COPY_OPAQUE port is safe for our scenario
 
 gst-rtsp-server
 
--   No changes
+-   media: gst_rtsp_media_set_reusable() and gst_rtsp_media_set_shared() have become incompatible
+-   rtsp-stream: clear sockets when leaving bin
 
 gstreamer-vaapi
 
@@ -1790,8 +1479,7 @@
 
 gst-editing-services
 
--   ges: base-xml-formatter: Don’t pass non-GObject pointers to
-    GST_DEBUG_OBJECT
+-   ges: Fix critical warning
 
 gst-validate + gst-integration-testsuites
 
@@ -1805,140 +1493,125 @@
 
 -   No changes
 
-Cerbero build tool and packaging changes in 1.22.3
+Cerbero build tool and packaging changes in 1.24.1
+
+-   gstreamer: Enable ptp helper explicitly
+-   gst-plugins-bad: Package new insertbin plugin
+-   gst-plugins-rs: Adjust parallel architecture build blocks
+-   libnice: update to 0.1.22
+-   pixman: Bump to 0.43.4
+-   orc: disable JIT code generation on arm64 on iOS again, fixing crashes
 
--   glib: Ship Windows process spawning helpers
--   recipes: add recipe for libltc for timecodestamper element
--   Add support for RHEL9 and Rocky Linux
-
-Contributors to 1.22.3
-
-Aleksandr Slobodeniuk, Antonio Kevo, Arun Raghavan, Carlos Rafael Giani,
-Daniel Moberg, Edward Hervey, Elliot Chen, François Laignel, Guillaume
-Desmottes, Haihua Hu, Jan Alexander Steffens (heftig), Jan Beich, Jan
-Schmidt, Johan Sternerup, John King, Jordan Petridis, Juan Navarro, Lily
-Foster, Martin Nordholts, Mathieu Duponchelle, Matthew Waters, Matthias
-Fuchs, Michael Olbrich, Mihail Ivanchev, Nick Steel, Nicolas Dufresne,
-Nirbheek Chauhan, Patricia Muscalu, Philippe Normand, Piotr Brzeziński,
-Sanchayan Maity, Sebastian Dröge, Seungha Yang, Stéphane Cerveau,
-Thibault Saunier, Tim-Philipp Müller, Xabier Rodriguez Calvar,
-
-… and many others who have contributed bug reports, translations, sent
-suggestions or helped testing. Thank you all!
-
-List of merge requests and issues fixed in 1.22.3
-
--   List of Merge Requests applied in 1.22.3
--   List of Issues fixed in 1.22.3
-
-1.22.4
-
-The fourth 1.22 bug-fix release (1.22.4) was released on 20 June 2023.
-
-This release only contains bugfixes and security fixes and it should be
-safe to update from 1.22.x.
-
-Highlighted bugfixes in 1.22.4
-
--   Security fixes for flacparse, dvdspu, and subparse
--   d3d11videosink: Fix error on pause and play
--   decklink: Correctly handle SDK strings on macOS and free strings
-    after usage on Linux
--   filesink: Fix buffered mode writing of buffer lists and buffers with
-    multiple memories
--   gldownload: handle passthrough without a critical
--   h265parse: Fix framerate handling regression
--   oggdemux: vp8 fixes
--   mp4mux, qtmux, qtdemux: Opus audio mapping fixes
--   pngdec: Fix wrong colours output from 16bit RGB images
--   ptp clock: Work around ptpd bug in default configuration
--   srtpdec: fix critical warnings on shutdown
--   v4l2src: fix support for bayer format
--   v4l2videoenc: support force-keyframe event in v4l2 encoder
--   vtenc: apply DTS offset to ensure DTS <= PTS
--   gst-python: allow more functions to be called before gst_init()
--   cerbero: fix vaapi variant; add qt6 build on windows; ensure errors
-    on unguarded use of new APIs, require macOS 10.13
--   packages: ship codecalpha, rtponvif, dvbsubenc, switchbin,
-    videosignal plugins; fix pango crash on 32-bit windows
--   various bug fixes, memory leak fixes, and other stability and
-    reliability improvements
+Contributors to 1.24.1
+
+Alexander Slobodeniuk, Antonio Larrosa, Edward Hervey, Elizabeth Figura, François Laignel, Guillaume Desmottes, He Junyan, Jan
+Schmidt, Jordan Yelloz, L. E. Segovia, Mark Nauwelaerts, Mathieu Duponchelle, Michael Tretter, Mikhail Rudenko, Nicolas
+Dufresne, Nirbheek Chauhan, Philippe Normand, Piotr Brzeziński, Robert Mader, Ruijing Dong, Sebastian Dröge, Seungha Yang,
+Thomas Goodwin, Thomas Klausner, Tim-Philipp Müller, Xi Ruoyao,
+
+… and many others who have contributed bug reports, translations, sent suggestions or helped testing. Thank you all!
+
+List of merge requests and issues fixed in 1.24.1
+
+-   List of Merge Requests applied in 1.24.1
+-   List of Issues fixed in 1.24.1
+
+1.24.2
+
+The second 1.24 bug-fix release (1.24.2) was released on 9 April 2024.
+
+This release only contains bugfixes and it should be safe to update from 1.24.x.
+
+Highlighted bugfixes in 1.24.2
+
+-   H.264 parsing regression fixes
+-   WavPack typefinding improvements
+-   Video4linux fixes and improvements
+-   Android build and runtime fixes
+-   macOS OpenGL memory leak and robustness fixes
+-   Qt/QML video sink fixes
+-   Package new analytics and mse libraries in binary packages
+-   Windows MSVC binary packages: fix libvpx avx/avx2/avx512 instruction set detection
+-   various bug fixes, memory leak fixes, and other stability and reliability improvements
 
 gstreamer
 
--   filesink: Fix buffered mode writing of buffer lists and buffers with
-    multiple memories
--   basesink: Clear EOS flag on STREAM-START event
--   typefindhelper: downgrade bogus error level debug log message
--   ptp: Correctly parse clock ID from the commandline parameters in the
-    helper
--   ptp: Work around bug in ptpd in default configuration
+-   clock: Block futex_time64 usage on Android API level < 30
+-   basesrc: Clear submitted buffer lists consistently with buffers
+-   ptpclock: fix double free of domain data during deinit
+-   clocksync: Proxy allocation queries
+-   inputselector: fix possible clock leak on shutdown
+-   typefind: Handle WavPack block sizes > 131072
 
 gst-plugins-base
 
--   alsasink: Fix stall for transition from PAUSED to READY with USB
-    speakerphone.
--   appsink: unref buffer in prev sample early so buffers from v4l2 can
-    be released properly
--   basetextoverlay: Fix typo in “text-y” property description
--   gldownload: handle passthrough without a critical
--   glfilter: add parent meta to output buffer for input buffer
--   oggdemux: vp8: Push headers downstream and detect keyframe packets
--   opus: Fix potential crash when getting unexpected channel position
--   streamsynchronizer: reset eos on STREAM_START
--   subparse: Look for the closing > of a tag after the opening <
--   video: convertframe: Add D3D11 specific conversion path
--   videometa: Only validate the alignment only when it contains some
-    info
--   video-blend: Fix linking error with C++
+-   glcolorconvert: Ensure glcolorconvert does not miss supported RGB formats
+-   gl/macos: a couple of race/reference count fixes
+-   pbutils: descriptions: Don’t warn on MPEG-1 audio caps without layer field
+-   encodebin: Add the parser before timestamper to tosync list
+-   videorate: Reset last_ts when a new segment is received
 
 gst-plugins-good
 
--   flacparse: Avoid integer overflow in available data check for image
-    tags
--   flvmux: use the correct timestamp to calculate wait times
--   isomp4: Fix (E)AC-3 channel count handling
--   jpegdec: fixes related to interlaced jpeg
--   pngdec: Fix wrong colours output from 16bit RGB images
--   qtmux, qtdemux: fix byte order for opus extension
--   rtspsrc: Do not try send dropped get/set parameter
--   qt5, qt6: Add more meson options and eliminate all automagic
--   qt: glrenderer: don’t attempt to use QWindow from non-Qt main thread
--   qml6glsink: Support building on win32
--   v4l2src: fix support for bayer format
--   v4l2: Change to query only up to
-    V4L2_CID_PRIVATE_BASE+V4L2_CID_MAX_CTRLS
--   v4l2videodec: treat MPEG-1 format as MPEG-2
--   v4l2videoenc: support force keyframe event in v4l2 encoder
--   tests: rtpbin_buffer_list: fix possible unaligned write/read on
-    32-bit ARM
+-   qml6glsink: fix destruction of underlying texture
+-   qt/qt6: Fixup for dummy textures
+-   rtpjitterbuffer: Don’t use estimated_dts to do default skew adjustment
+-   rtpjitterbuffer: Use an extended RTP timestamp for the clock-base
+-   rtpmp4adepay: Set duration on outgoing buffers
+-   tests: rtpred: fix out-of-bound writes
+-   v4l2: allocator: Fix unref log/trace on memory release
+-   v4l2: Also set max_width/max_width if enum framesize fail
+-   v4l2: enforce a pixel aspect ratio of 1/1 if no data are available
+-   v4l2: fix error in calculating padding bottom for tile format
+-   v4l2src: need maintain the caps order in caps compare when fixate
+-   vpxenc: Include vpx error details in errors and warnings
 
 gst-plugins-bad
 
--   asfmux: fix possible unaligned write on 32-bit ARM
--   d3d11videosink: Fix error on pause and play
--   d3dvideosink: Fix navigation event leak
--   decklink: Correctly handle SDK strings on macOS and free strings
-    after usage on Linux
--   dvdspu: Make sure enough data is allocated for the available data
--   fdkaacdec: Support up to 5 rear channels
--   h265parse: Fix framerate handling
--   kmssink: Add STM32 LTDC and NXP i.MX8M Plus LCDIFv3 auto-detection
--   sdpdemux: ensure that only one srcpad is created per stream
--   srtpdec: fix critical warnings on shutdown
--   testsrcbin: Remove spurious caps unref
--   va: map the mbbrc to correct enum value in get_property()
--   vtenc: apply DTS offset to ensure DTS <= PTS
--   vtdec: time glitches on h264 playback
--   waylandsink: Emit “map” signal boarder surface is ready
+-   h264parse: element hangs with some video streams (regression)
+-   h264parse: Revert “AU boundary detection changes”
+-   alphadecodebin: Explicitly pass 64 bit integers as such through varargs
+-   atdec: Set a channel mask for channel counts greater than 2
+-   ccconverter: Fix caps leak and remove unnecessary code
+-   d3d11videosink: disconnect signals before releasing the window
+-   d3d11: meson: Add support for MinGW DirectXMath package and update directxmath wrap to 3.1.9
+-   d3d11: meson: Disable library build if DirectXMath header was not found
+-   dwrite: Fix crash on device update
+-   GstPlay: Update video_snapshot to support playbin3
+-   jpegparse: avi1 tag can be progressive
+-   jpegparse: turn some bus warnings into object ones
+-   qsvdecoder: Release too old frames
+-   ristsrc: Only free caps if needed
+-   va: av1enc: Correct the reference number and improve the reference setting
+-   va: {vp9, av1}enc: Avoid reopen encoder or renegotiate
+-   videoparsers: Demote CC warning message
+-   vkbufferpool: correct usage flags type
+-   vkh26xdec: a couple decoding fixes
+-   vtdec: Fix caps criticals during negotiation
+-   wpe: avoid crash with G_DEBUG=fatal_criticals and static build
+-   Sink missing floating references
 
 gst-plugins-ugly
 
 -   No changes
 
+GStreamer Rust plugins
+
+-   aws: use fixed BehaviorVersion
+-   aws: improve error message logs
+-   fmp4: Update to dash-mpd 0.16
+-   fmp4mux: Require gstreamer-pbutils 1.20 for the examples
+-   onvifmetadataparse: Reset state in PAUSED->READY after pad deactivation, fixing occasional deadlock on shutdown
+-   reqwest: Update to reqwest 0.12
+-   webrtcsink: set perfect-timestamp=true on audio encoders
+-   webrtcsink: improve panic message on unexpected caps during discovery
+-   webrtchttp: Update to reqwest 0.12
+-   webrtc: fix inconsistencies in documentation of object names
+-   Fix clippy warnings after upgrade to Rust 1.77
+
 gst-libav
 
--   No changes
+-   avviddec: Fix AVPacket leak
 
 gst-rtsp-server
 
@@ -1946,7 +1619,7 @@
 
 gstreamer-vaapi
 
--   vaapidecodebin: don’t load vaapipostproc if not available
+-   No changes
 
 gstreamer-sharp
 
@@ -1958,11 +1631,11 @@
 
 gst-python
 
--   python: More functions can be called before gst_init()
+-   No changes
 
 gst-editing-services
 
--   ges: launcher: Never put sinks in a GstPipeline
+-   ges: frame-composition-meta: Stop using keyword ‘operator’ for field in C++
 
 gst-validate + gst-integration-testsuites
 
@@ -1970,159 +1643,147 @@
 
 gst-examples
 
--   No changes
+-   webrtc examples: set perfect-timestamp=true on opusenc for better Chrome interoperability
 
 Development build environment
 
--   No changes
+-   flac: Add subproject wrap and allow falling back to it in the flac plugin
+-   libnice: bump subproject wrap to v0.1.22 (needed for ICE consent freshness support in gstwebrtc)
 
-Cerbero build tool and packaging changes in 1.22.4
+Cerbero build tool and packaging changes in 1.24.2
 
--   Ship codecalpha, rtponvif, dvbsubenc, switchbin, videosignal plugins
--   pango: Fix crash on Windows 32bit build
--   qml6: Add support for building the qml6 plugin on Windows and bump
-    meson to 1.1.1
--   vaapi: update vaapi variant/recipe for meson option changes
--   packages: Put libass in the same category as assrender
--   cerbero: Don’t extract if already extracted in fetch
--   darwin: Ensure errors on unguarded use of new APIs, require macOS
-    10.13
-
-Contributors to 1.22.4
-
-Andoni Morales Alastruey, Arun Raghavan, Colin Kinloch, Daniel Morin,
-Edward Hervey, ekwange, Elliot Chen, François Laignel, Guillaume
-Desmottes, Haihua Hu, He Junyan, Hou Qi, Jan Alexander Steffens
-(heftig), Jochen Henneberg, Jordan Petridis, Kevin Song, Maksym
-Khomenko, Marek Vasut, Mathieu Duponchelle, Matthew Waters,
-Mengkejiergeli Ba, Michael Olbrich, Nicolas Beland, Nicolas Dufresne,
-Nirbheek Chauhan, Philippe Normand, Piotr Brzeziński, Sebastian Dröge,
-Seungha Yang, Thibault Saunier, Tim-Philipp Müller, Víctor Manuel Jáquez
-Leal, William Manley, Xavier Claessens, Yuri Fedoseev,
-
-… and many others who have contributed bug reports, translations, sent
-suggestions or helped testing. Thank you all!
-
-List of merge requests and issues fixed in 1.22.4
-
--   List of Merge Requests applied in 1.22.4
--   List of Issues fixed in 1.22.4
-
-1.22.5
-
-The fifth 1.22 bug-fix release (1.22.5) was released on 20 July 2023.
-
-This release only contains bugfixes and security fixes and it should be
-safe to update from 1.22.x.
-
-Highlighted bugfixes in 1.22.5
-
--   Security fixes for the RealMedia demuxer
--   vaapi decoders, postproc: Disable DMAbuf from caps negotiation to
-    fix garbled video in some cases
--   decodebin3, playbin3, parsebin fixes, especially for stream
-    reconfiguration
--   hlsdemux2: fix early seeking; don’t pass referer when updating
-    playlists; webvtt fixes
--   gtk: Fix critical caused by pointer movement when stream is getting
-    ready
--   qt6: Set sampler filtering method, fixes bad quality with qml6glsink
-    and gstqt6d3d11
--   v4l2src: handle resolution change when buffers are copied
--   videoflip: update orientation tag in auto mode
--   video timecode: Add support for framerates lower than 1fps and
-    accept 119.88 (120/1.001) fps
--   webrtcsink: fixes for x264enc and NVIDIA encoders
--   cerbero: Pull ninja from system if possible, avoid spurious
-    bootstrap of cmake
--   packages: Recipe updates for ffmpeg, libsoup, orc
--   various bug fixes, memory leak fixes, and other stability and
-    reliability improvements
+-   glib: Block futex_time64 usage on Android API level < 30
+-   libvpx: Fix build with Python 3.8
+-   libvpx: Fix errors with avx* instruction set detection for x86* builds and MSVC
+-   openjpeg: Update to 2.5.2
+-   directxmath: Update to 3.1.9
+-   gst-plugins-rs: Fix superstripping for ELF breaking all plugins
+-   Rust-based plugin initialization hangs on Android with GStreamer 1.24.0
+
+Contributors to 1.24.2
+
+Alexander Slobodeniuk, Arnaud Vrac, Chao Guo, Chris Spencer, Daniel Morin, Edward Hervey, Elizabeth Figura, Elliot Chen, eri,
+François Laignel, Guillaume Desmottes, Haihua Hu, He Junyan, Hou Qi, Jan Schmidt, Jochen Henneberg, L. E. Segovia, Martin
+Nordholts, Matthew Waters, Nicolas Dufresne, Philippe Normand, Philipp Zabel, Piotr Brzeziński, Robert Guziolowski, Robert
+Mader, Ruben Gonzalez, Sebastian Dröge, Seungha Yang, Taruntej Kanakamalla, Thibault Saunier, Tim Blechmann, Tim-Philipp Müller,
+Víctor Manuel Jáquez Leal, Wojciech Kapsa, Xavier Claessens,
+
+… and many others who have contributed bug reports, translations, sent suggestions or helped testing. Thank you all!
+
+List of merge requests and issues fixed in 1.24.2
+
+-   List of Merge Requests applied in 1.24.2
+-   List of Issues fixed in 1.24.2
+
+1.24.3
+
+The third 1.24 bug-fix release (1.24.3) was released on 30 April 2024.
+
+This release only contains bugfixes and it should be safe to update from 1.24.x.
+
+Highlighted bugfixes in 1.24.3
+
+-   EXIF image tag parsing security fixes
+-   Subtitle handling improvements in parsebin
+-   Fix issues with HLS streams that contain VTT subtitles
+-   Qt6 QML sink re-render and re-sizing fixes
+-   unixfd ipc plugin timestamp and segment handling fixes
+-   vah264enc, vah265enc: Do not touch the PTS of the output frame
+-   vah264dec and vapostproc fixes and improvements
+-   v4l2: multiple fixes and improvements, incl. for mediatek JPEG decoder and v4l2 loopback
+-   v4l2: fix hang after seek with some v4l2 decoders
+-   Wayland sink fixes
+-   ximagesink: fix regression on RPi/aarch64
+-   fmp4mux, mp4mux gained FLAC audio support
+-   D3D11, D3D12: reliablity improvements and memory leak fixes
+-   Media Foundation device provider fixes
+-   GTK4 paintable sink improvements including support for directly importing dmabufs with GTK 4.14
+-   WebRTC sink/source fixes and improvements
+-   AWS s3sink, s3src, s3hlssink now support path-style addressing
+-   MPEG-TS demuxer fixes
+-   Python bindings fixes
+-   various bug fixes, memory leak fixes, and other stability and reliability improvements
 
 gstreamer
 
--   taglist, plugins: fix compiler warnings with GLib >= 2.76
--   tracerutils: allow casting parameter types
--   inputselector: fix playing variable is never set
+-   ptp: Silence Rust compiler warning about some unused trait methods
 
 gst-plugins-base
 
--   appsink: add missing make_writable call
--   audioaggregator: Do not post message before being constructed
--   decodebin3: Prevent a critical warning when reassigning output slots
--   decodebin3: Fix slot input linking when the associated stream has
-    changed
--   decodebin3: Remove spurious input locking during parsebin
-    reconfiguration
--   urisourcebin: Set source element to READY before querying it
--   gl/viv-fb: meson build updates
--   plugins: fix compiler warnings with GLib >= 2.76
--   subtitleoverlay: fix mutex error if sink caps is not video
--   video: timecode: Add support for framerates lower than 1fps
--   video: accept timecode of 119.88 (120/1.001) FPS
--   video: cannot attach time code meta when frame rate is 119.88
-    (120000/1001)
--   videodecoder: fix copying buffer metas
+-   EXIF image tag parsing security fixes
+-   glcolorconvert: remove some dead code
+-   parsebin: Ensure non-time subtitle streams get “parsed”
+-   playbin3: Handle combiner update in case of errors
+-   ximagesink: initialize mask for XISelectEvents
 
 gst-plugins-good
 
--   adaptivedemux2: Fix early seeking
--   hlsdemux2: Ensure processed webvtt ends with empty new line
--   hlsdemux2: Don’t set a referer when updating playlists
--   matroska: demux: Strip signal byte when encrypted
--   rtspsrc: Fix crash when is-live=false
--   gtk: Fix critical caused by pointer movement when stream is getting
-    ready
--   qt6: Set sampler filtering method, fixes bad quality with qml6glsink
-    and gstqt6d3d11
--   qtdemux: opus: set entry as sampled
--   v4l2src: handle resolution change when buffers are copied
--   v4l2videodec: Fix handling of initial gaps
--   v4l2videodec: correctly register v4l2mpeg2dec
--   v4l2videoenc: replace custom QUERY_CAPS handling with getcaps
-    callback
--   videoflip: update orientation tag in auto mode
--   videoflip: fix critical when tag list is not writable
+-   adaptivedemux2: Playback hangs with VTT fragments
+-   adaptivedemux2: Avoid double usage of parsebin
+-   pulsedeviceprovider: Add compare_device_type_name function and missing lock
+-   qml6glsink: Notify that the returned QSGNode node has changes
+-   qml6glsink: video content resizes to new item size
+-   qtdemux: fix wrong full_range offset when parsing colr box
+-   soup: fix thread name
+-   v4l2: add multiplane y42b (yuv422m) support (for mediatek v4l2 jpeg decoder)
+-   v4l2: bufferpool: Drop writable check on output pool process
+-   v4l2: bufferpool: Ensure freshly created buffers are not marked as queued, fixing issues with v4l2sink on a v4l2loopback
+    device
+-   v4l2: bufferpool: queue back the buffer flagged LAST but empty, fixes hangs after seek with some decoders
+-   v4l2: silence valgrind warning
+-   vpx: Include vpx error details in errors and warnings
 
 gst-plugins-bad
 
--   d3d11bufferpool: Fix heavy CPU usage in case of fixed-size pool
--   jpegparser: jpegdecoder: Don’t pollute bus and comply with spec
--   plugins: fix compiler warnings with GLib >= 2.76
--   webrtcbin: Prevent critical warning when creating an additional data
-    channel
--   webrtcstats: Properly report IceCandidate type
+-   d3d11device: protect device_lock vs device_new
+-   d3d11decoder, d3d12decoder: Fix potential use after free
+-   d3d11videosink: Fix rendering on keyed mutex enabled handle
+-   d3d12decoder: Fix d3d12 resource copy
+-   d3d12encoder: Fix buffer pool leak
+-   d3d12videosink: HWND event handling related fixes
+-   d3d12vp9dec: Fix Intel GPU crash occurred when decoding VP9 SVC
+-   dvbsubenc: fixed some memory leaks and a crash
+-   GstPlay: fix read duration failure issue for some type rtsp streams which have valid duration
+-   mediafoundation: Fix device enumeration
+-   mediafoundation: Fix infinite loop in device provider
+-   tests: fix possible libscpp build failure in gst-plugins-bad
+-   tsdemux, tsparse: Fix Program equality check
+-   tsdemux: Disable smart program update
+-   unixfdsink: Take segment into account when converting timestamps
+-   va: videoformat: use video library to get DRM fourcc
+-   va: radeonsi: DRM RGB formats doesn’t look correctly mapped to VA formats
+-   vah264enc, vah265enc: Do not touch the PTS of output frame
+-   vaav1enc: Change the alignment of output to “tu”
+-   vaallocator: disable derived all together for Mesa <23.3
+-   waylandsink: free staged buffer when do gst_wl_window_finalize
+-   wlwindow: clear configure mutex and cond when finalize
+-   waylandsink: config buffer pool with query size when propose_allocation
+-   v4l2codecs: Don’t unref allocation query caps
 
 gst-plugins-ugly
 
--   rmdemux: add some integer overflow checks
+-   No changes
+
+GStreamer Rust plugins
 
-gst-plugins-rs
+Fixed:
 
--   fallbackswitch: Change the threshold for trailing buffers
--   fallbackswitch: Fix pad health calculation and notifies
--   fmp4mux: Fix draining in chunk mode if keyframes are too late
--   livesync: Wait for the end timestamp of the previous buffer before
-    looking at queue
--   livesync: Improve EOS handling
--   togglerecord: Clip segment before calculating timestamp/duration
--   togglerecord: Error out if main stream buffer has no valid running
-    time
--   webrtcsink: fix pipeline when input caps contain max-framerate
--   webrtcsink: Configure only 4 threads for x264enc
--   webrtcsink: Translate force-keyunit events to force-IDR action
-    signal for NVIDIA encoders
--   webrtcsink: Set config-interval=-1 and aggregate-mode=zero-latency
-    on rtph264pay and rtph265pay
--   webrtcsink: Set VP8/VP9 payloader based on payloader element factory
-    name
--   webrtcink: Use correct property types for nvvideoconvert
--   webrtc/signalling: fix race condition in message ordering
--   videofx: Minimize dependencies of the image crate
+-   hrtfrender: Use a bitmask instead of an int in the caps for the channel-mask
+-   rtpgccbwe: Don’t log an error when pushing a buffer list fails while stopping
+-   webrtcsink: Don’t panic in bitrate handling with unsupported encoders
+-   webrtcsink: Don’t panic if unsupported input caps are used
+-   webrtcsrc: Allow a None producer-id in request-encoded-filter signal
+
+Added:
+
+-   aws: New property to support path-style addressing
+-   fmp4mux / mp4mux: Support FLAC inside (f)MP4
+-   gtk4: Support directly importing dmabufs with GTK 4.14
+-   gtk4: Add force-aspect-ratio property similar to other video sinks
 
 gst-libav
 
--   No changes
+-   libav: guard some recently dropped APIs
 
 gst-rtsp-server
 
@@ -2130,7 +1791,7 @@
 
 gstreamer-vaapi
 
--   vaapidecode,vaapipostproc: Disable DMAbuf from caps negotiation.
+-   No changes
 
 gstreamer-sharp
 
@@ -2142,17 +1803,17 @@
 
 gst-python
 
--   No changes
+-   Fix Python library name fetching and library searching on Windows
+-   Don’t link to python for the gi overrides module
 
 gst-editing-services
 
--   ges: some fixes for 32-bit systems
--   ges, nle: Avoid setting state or sending query when constructing
-    objects
+-   ges-launcher: Fix for forcing container profiles
 
-gst-validate + gst-integration-testsuites
+gst-devtools, gst-validate + gst-integration-testsuites
 
--   No changes
+-   debug-viewer: Fix plugin loading machinery
+-   validate/flvdemux: Stop spamming audio/video on test
 
 gst-examples
 
@@ -2162,146 +1823,112 @@
 
 -   No changes
 
-Cerbero build tool and packaging changes in 1.22.5
+Cerbero build tool and packaging changes in 1.24.3
+
+-   No changes
+
+Contributors to 1.24.3
+
+Alexander Slobodeniuk, Edward Hervey, Elliot Chen, F. Duncanh, François Laignel, Haihua Hu, He Junyan, Hou Qi, Jan Schmidt,
+Jimmy Ohn, Maksym Khomenko, Matthew Waters, Nicolas Dufresne, Nirbheek Chauhan, Philippe Normand, Philipp Zabel, Qian Hu (胡骞),
+Sanchayan Maity, Sebastian Dröge, Seungha Yang, Simonas Kazlauskas, Taruntej Kanakamalla, Tim Blechmann, Tim-Philipp Müller, U.
+Artie Eoff, Víctor Manuel Jáquez Leal, William Wedler, Xavier Claessens,
+
+… and many others who have contributed bug reports, translations, sent suggestions or helped testing. Thank you all!
+
+List of merge requests and issues fixed in 1.24.3
+
+-   List of Merge Requests applied in 1.24.3
+-   List of Issues fixed in 1.24.3
+
+1.24.4
+
+The fourth 1.24 bug-fix release (1.24.4) was released on 29 May 2024.
 
--   Pull ninja from system if possible, avoid spurious bootstrap of
-    cmake
--   ffmpeg: update to 5.0.3
--   libsoup: update to 2.74.3
--   orc: update to 0.4.34
-
-Contributors to 1.22.5
-
-Andoni Morales Alastruey, Bastien Nocera, Carlos Rafael Giani, David
-Craven, Doug Nazar, Edward Hervey, François Laignel, Guillaume
-Desmottes, He Junyan, Hou Qi, Jan Alexander Steffens (heftig), Jan
-Schmidt, Maksym Khomenko, Mathieu Duponchelle, Matthew Waters, Michael
-Olbrich, Michael Tretter, Nicolas Dufresne, Nirbheek Chauhan, Philippe
-Normand, Ruslan Khamidullin, Sebastian Dröge, Seungha Yang, Théo
-Maillart, Thibault Saunier, Tim-Philipp Müller, Víctor Manuel Jáquez
-Leal, Vivia Nikolaidou, Yatin Maan,
-
-… and many others who have contributed bug reports, translations, sent
-suggestions or helped testing. Thank you all!
-
-List of merge requests and issues fixed in 1.22.5
-
--   List of Merge Requests applied in 1.22.5
--   List of Issues fixed in 1.22.5
-
-1.22.6
-
-The sixth 1.22 bug-fix release (1.22.6) was released on 20 September
-2023.
-
-This release only contains bugfixes and security fixes and it should be
-safe to update from 1.22.x.
-
-Highlighted bugfixes in 1.22.6
-
--   Security fixes for the MXF demuxer and H.265 video parser
--   Fix latency regression in H.264 hardware decoder base class
--   androidmedia: fix HEVC codec profile registration and fix coded_data
-    handling
--   decodebin3: fix switching from a raw stream to an encoded stream
--   gst-inspect: prettier and more correct signal and action signals
-    printing
--   rtmp2: Allow NULL flash version, omitting the field, for better RTMP
-    server compatibility
--   rtspsrc: better compatibility with buggy RTSP servers that don’t set
-    a clock-rate
--   rtpjitterbuffer: fix integer overflow that led to more packets being
-    declared lost than have been lost
--   v4l2: fix video encoding regression on RPi and fix support for left
-    and top padding
--   waylandsink: Crop surfaces to their display width height
--   cerbero: recognise Manjaro; add Rust support for MSVC ARM64; cmake
-    detection fixes
--   various bug fixes, build fixes, memory leak fixes, and other
-    stability and reliability improvements
+This release only contains bugfixes and it should be safe to update from 1.24.x.
+
+Highlighted bugfixes in 1.24.4
+
+-   audioconvert: support more than 64 audio channels
+-   avvidec: fix dropped frames when doing multi-threaded decoding of I-frame codecs such as DV Video
+-   mpegtsmux: Correctly time out in live pipelines, esp. for sparse streams like KLV and DVB subtitles
+-   vtdec deadlock fixes on shutdown and format/resolution changes (as might happen with e.g. HLS/DASH)
+-   fmp4mux, isomp4mux: Add support for adding AV1 header OBUs into the MP4 headers, and add language from tags
+-   gtk4paintablesink improvements: fullscreen mode and gst-play-1.0 support
+-   webrtcsink: add support for insecure TLS and improve error handling and VP9 handling
+-   v4l2codecs: decoder: Reorder caps to prefer DMA_DRM ones, fixes issues with playbin3
+-   vah264enc, vah265enc: timestamp handling fixes; generate IDR frames on force-keyunit-requests, not I frames
+-   Visualizer plugins fixes
+-   Avoid using private APIs on iOS
+-   Various bug fixes, memory leak fixes, and other stability and reliability improvements
 
 gstreamer
 
--   gst-inspect: prettier and more correct signal printing, and print
-    action signals in g_signal_emit_by_name() format
--   gst-launch: Disable fault signal handlers on macOS
+-   clock: Fix 32 bit assertions in GST_TIME_TO_TIMEVAL and GST_TIME_TO_TIMESPEC
+-   systemclock: fix usage of __STDC_NO_ATOMICS__
+-   filesrc: Don’t abort on _get_osfhandle() on Windows
+-   tests: Avoid using “bool” for the variable name
+-   Various Solaris / Illumos fixes
+-   parse: Don’t assume that child proxy child objects are GstObjects
 
 gst-plugins-base
 
--   audio: Make sure to stop ringbuffer on error
--   decodebin3: avoid identity, sinkpad, parsebin leakage when reset
-    input
--   decodebin3: Ensure the slot is unlinked before linking to decoder
--   sdp: fix wrong debug log error message for missing clock-rate in
-    caps
--   sdp: Parse zero clock-rate as default
+-   audioconvert: Support converting >64 channels
+-   decodebin3: Fix caps and stream leaks
+-   playbin(3), streamsynchronizer: Fix deadlock when streams have been flushed before others start
+-   videotestsrc: fix race condition when clearing cached buffer
+-   Fix visualization plugins
+-   GstDiscoverer hangs when processing media file containing mebx on MacOS
+-   glmixer: Add GL_SYNC_META option to buffer pool
+-   typefinding: Fix ID_ODD_SIZE handling regression in WavPack typefinder
 
 gst-plugins-good
 
--   adaptivedemux2: fix memory leak
--   pulsedeviceprovider: fix incorrect usage of GST_ELEMENT_ERROR
--   qt: Unbreak build with qt-egl enabled but viv_fb missing
--   qt: Fix searching of qt5/qt6 tools with qmake in Meson
--   qtdemux: Fix premature EOS when some files are played in push mode
--   qtdemux: attach cbcs crypt info at the right moment
--   rtpjitterbuffer: Avoid integer overflow in max saveable packets
-    calculation with negative offset
--   videoflip: fix concurrent access when modifying the tag list
--   v4l2: allocator: Don’t close foreign dmabuf
--   v4l2: bufferpool: Fix large encoded stream regression
--   v4l2: bufferpool: Problems when checking for truncated buffer
--   v4l2: Fix support for left and top padding
--   v4l2object: clear format lists if source change event is received
+-   osxaudio: Avoid using private APIs on iOS
+-   qtdemux: unit test fixes for 32-bit platforms
 
 gst-plugins-bad
 
--   androidmedia/enc: handle codec-data before popping
-    GstVideoCodecFrames
--   androidmedia: fix hevc codec profile registration
--   androidmedia: Small fixes
--   androidmedia: Add more null checks (of env) to JNI utilities
--   applemedia: Fix pixel format for I420 and NV12
--   audiolatency: Forward latency query and event upstream
--   av1parser: Fix segmentation params update
--   codecparsers: Fix MPEG-1 aspect ratio table
--   d3d11convert: Passthrough allocation query on same caps
--   h264decoder: Update latency dynamically
--   h265parser: Allow partially broken hvcC data
--   h265parser: Fix possible overflow using max_sub_layers_minus1
--   hlssink2: Always use forward slash separator
--   mdns: Fix a crash on context error
--   mxfdemux: Fix integer overflow causing out of bounds writes when
-    handling invalid uncompressed video and check channels for AES3
--   nvencoder: Fix negotiation error when interlace-mode is unspecified
--   rtmp2: Allow NULL flash version, omitting the field
--   rtmp2sink: fix crash if message conversion failed
--   transcodebin: Fixes for upstream selectable support
--   va: Fix in error logs functions mismatches
--   waylandsink: Crop surfaces to their display width height
--   waylandsink: Fix cropping for video with non-square aspect ratio
--   webrtc: Fix docs for create-data-channel action signal
--   win32ipc: Fix pipe handle leak
+-   cudamemory: Fix offset of subsampled planar formats
+-   d3d11: Revert “d3d11device: protect device_lock vs device_new
+-   d3dshader: Fix gamma and primaries conversion pixel shader
+-   dtlsconnection: Fix overflow in timeout calculation on systems with 32 bit time_t
+-   GstPlay: Initialize debug category and error quark in class_init
+-   kmssink: Do not close the DRM prime handle twice
+-   mpegtsmux: Correctly time out and mux anyway in live pipelines
+-   nvcodec: Accept progressive-high profiles for h264
+-   nvencoder: Fix maximum QP value setting
+-   qsvh264dec, qsvh265dec: Fix nalu leaks
+-   v4l2codecs: decoder: Reorder caps to prefer DMA_DRM ones
+-   vah264enc, vah265enc: Let FORCE_KEYFRAME be IDR frame rather than just I frame
+-   vah264enc, vah265enc: Set DTS offset before PTS
+-   vkh26xdec: Fix stop memory leak
+-   vtdec: Fix deadlock when negotiating format change
+-   vtdec: Fix PAUSED->READY deadlock when output loop is running
+-   wayland: Use wl_display_create_queue_with_name
+-   webrtc: request-aux-sender, only sink floating refs
+-   webrtcbin: Allow session level setup attribute in SDP
 
 gst-plugins-ugly
 
 -   No changes
 
-gst-plugins-rs
+GStreamer Rust plugins
 
--   fallbackswitch: locking/deadlock fixes
--   onvifmetadataparse: Skip metadata frames with unrepresentable UTC
-    time
--   transcriberbin: Configure audioresample in front of transcriber
--   webrtcsink: Propagate GstContext messages
--   webrtcsink: Add support for d3d11 memory and qsvh264enc
--   webrtcsink: fix TWCC extension adding
--   webrtcsink: don’t forget to setup encoders for discoveries
--   webrtcsink: NVIDIA V4L2 encoders always require NVMM memory
--   meson: Fix handling of optional deps, and don’t require Python 3.8
+-   fmp4mux, isomp4mux: Add support for adding AV1 header OBUs into the MP4 headers
+-   fmp4mux, isomp4mux: Add language from tags
+-   gtk4paintablesink: Also create own window for gst-play-1.0
+-   gtk4paintablesink: Add GST_GTK4_WINDOW_FULLSCREEN environment variable to fullscreen window for testing with
+    e.g. gst-launch-1.0
+-   gtk4: Fix plugin description and update python examples
+-   rtpgccbwe: Log effective bitrate in more places, and log delay and loss target bitrates separately
+-   webrtcsink: Improve error when no encoder was found or RTP plugins were missing
+-   webrtcsink: Add VP9 parser after the encoder for VP9 too
+-   webrtc: Add support for insecure TLS connections
 
 gst-libav
 
--   No changes
+-   avvidec: Fix dropping wrong “ghost” frames - fixing multi-threaded decoding of I-frame codecs such as DV Video
 
 gst-rtsp-server
 
@@ -2325,11 +1952,11 @@
 
 gst-editing-services
 
--   No changes
+-   ges-pipeline: Configure encodebin before linking
 
-gst-validate + gst-integration-testsuites
+gst-devtools, gst-validate + gst-integration-testsuites
 
--   gst-validate: Disable fault signal handlers on macOS
+-   No changes
 
 gst-examples
 
@@ -2337,179 +1964,113 @@
 
 Development build environment
 
--   macos-bison: Update to 3.8.2 and add an ARM64 build
--   wrap: update libpsl to 0.21.2
+-   No changes
+
+Cerbero build tool and packaging changes in 1.24.4
+
+-   Add Fedora 40 support
+-   srt: bump version to 1.5.3
+-   pango: Fix leaks on Windows (textoverlay plugins)
+-   windows runtime installer has empty qt6 msm
+-   WiX: assorted fixes
+
+Contributors to 1.24.4
+
+Alexander Slobodeniuk, Bill Nottingham, Brad Reitmeyer, Chris Del Guercio, Daniel Stone, Edward Hervey, Emil Pettersson, He
+Junyan, Jordan Petridis, Joshua Breeden, L. E. Segovia, Martin Nordholts, Mathieu Duponchelle, Matthew Waters, Nirbheek Chauhan,
+Philippe Normand, Piotr Brzeziński, Rafael Carício, Robert Ayrapetyan, Robert Mader, Sebastian Dröge, Seungha Yang, Shengqi Yu,
+Stéphane Cerveau, Tim-Philipp Müller,
 
-Cerbero build tool and packaging changes in 1.22.6
+… and many others who have contributed bug reports, translations, sent suggestions or helped testing. Thank you all!
 
--   Add Rust support for MSVC ARM64
--   Recognise PERL5LIB as a joinable Unix variable
--   Recognise Manjaro as an Arch derivative
--   Fix picking up cmake from build-tools
-
-Contributors to 1.22.6
-
-Akihiro Sagawa, Alicia Boya García, Guillaume Desmottes, Haihua Hu,
-Hugues Fruchet, Ivan Molodetskikh, Jan Alexander Steffens (heftig), Jan
-Schmidt, L. E. Segovia, Mathieu Duponchelle, Matthew Waters, Ming Qian,
-Nicolas Dufresne, Nirbheek Chauhan, Olivier Blin, Olivier Crête,
-Philippe Normand, Piotr Brzeziński, Robert Ayrapetyan, Ryan Pavlik,
-Sebastian Dröge, Seungha Yang, Stéphane Cerveau, Stephan Seitz, Thomas
-Schneider, Tim-Philipp Müller, Víctor Manuel Jáquez Leal, Wang Chuan,
-Xabier Rodriguez Calvar,
-
-… and many others who have contributed bug reports, translations, sent
-suggestions or helped testing. Thank you all!
-
-List of merge requests and issues fixed in 1.22.6
-
--   List of Merge Requests applied in 1.22.6
--   List of Issues fixed in 1.22.6
-
-1.22.7
-
-The seventh 1.22 bug-fix release (1.22.7) was released on 13 November
-2023.
-
-This release only contains bugfixes and security fixes and it should be
-safe to update from 1.22.x.
-
-Highlighted bugfixes in 1.22.7
-
--   Security fixes for the MXF demuxer and AV1 codec parser
--   glfilter: Memory leak fix for OpenGL filter elements
--   d3d11videosink: Fix toggling between fullscreen and maximized, and
-    window switching in fullscreen mode
--   DASH / HLS adaptive streaming fixes
--   Decklink card device provider device name string handling fixes
--   interaudiosrc: handle non-interleaved audio properly
--   openh264: Fail gracefully if openh264 encoder/decoder creation fails
--   rtspsrc: improved whitespace handling in response headers by certain
-    cameras
--   v4l2codecs: avoid wrap-around after 1000000 frames; tiled formats
-    handling fixes
--   video-scaler, audio-resampler: downgraded “Can’t find exact taps”
-    debug log messages
--   wasapi2: Don’t use global volume control object
--   Rust plugins: various improvements in aws, fmp4mux, hlssink3,
-    livesync, ndisrc, rtpav1depay, rsfilesink, s3sink, sccparse
--   WebRTC: various webrtchttp, webrtcsrc, and webrtcsink improvements
-    and fixes
--   Cerbero build tools: recognise Windows 11; restrict parallelism of
-    gst-plugins-rs build on small systems
--   Packages: ca-certificates update; fix gio module loading and TLS
-    support on macOS
+List of merge requests and issues fixed in 1.24.4
+
+-   List of Merge Requests applied in 1.24.4
+-   List of Issues fixed in 1.24.4
+
+1.24.5
+
+The fifth 1.24 bug-fix release (1.24.5) was released on 20 June 2024.
+
+This release only contains bugfixes and it should be safe to update from 1.24.x.
+
+Highlighted bugfixes in 1.24.5
+
+-   webrtcsink: Support for AV1 via nvav1enc, av1enc or rav1enc encoders
+-   AV1 RTP payloader/depayloader fixes to work correctly with Chrome and Pion WebRTC
+-   av1parse, av1dec error handling/robustness improvements
+-   av1enc: Handle force-keyunit events properly for WebRTC
+-   decodebin3: selection and collection handling improvements
+-   hlsdemux2: Various fixes for discontinuities, variant switching, playlist updates
+-   qml6glsink: fix RGB format support
+-   rtspsrc: more control URL handling fixes
+-   v4l2src: Interpret V4L2 report of sync loss as video signal loss
+-   d3d12 encoder, memory and videosink fixes
+-   vtdec: more robust error handling, fix regression
+-   ndi: support for NDI SDK v6
+-   Various bug fixes, memory leak fixes, and other stability and reliability improvements
 
 gstreamer
 
--   debugutils: provide gst_debug_bin_to_dot_data() implementation even
-    if debug system is disabled
+-   promise: Don’t use g_return_* for internal checks
+-   debug: Add missing gst_debug_log_id_literal() dummy with gst_debug=false
+-   ptp-helper: Add GNU/Hurd support
 
 gst-plugins-base
 
--   audioaggregator, audiomixer: Make access to the pad list thread-safe
-    while mixing
--   basetextoverlay: Fix overlay never rendering again if width reaches
-    1px
--   glfiter: Protect GstGLContext access
--   glfilter: Only add parent meta if inbuf != outbuf
--   macOS: fix huge memory leak with glfilter-based elements
--   rtspconnection: Ignore trailing whitespace in rtsp headers
--   video-scaler, audio-resampler: downgrade ‘can’t find exact taps’ to
-    debug
+-   uridecodebin3: Don’t hold PLAY_ITEMS lock when activating them
+-   decodebin3: Always ensure we end up with parsebin or identity
+-   decodebin3: Properly support changing input collections
+-   decodebin3: Avoid usage of parsebin even more
+-   decodebin3: Fix dealing with input without caps
+-   video-info: Don’t crash in gst_video_info_is_equal() if one videoinfo is zero-initialized
 
 gst-plugins-good
 
--   adaptivedemux2: Do not submit_transfer when cancelled
--   adaptivedemux2: Call GTasks’s return functions for blocking tasks
--   flacenc: Correctly handle up to 255 cue entries
--   flvmux: set the src segment position as running time
--   imagesequencesrc: fix deadlock when feeding the same image in a loop
--   pngenc: output one frame only in snapshot mode and mark output
-    frames as I-frames
--   qmlglsrc: sync on the streaming thread
--   souphttpsrc: Chain up to finalize to fix memory leak
--   wavparse: fix buffer leak with adtl tag
--   v4l2codecs: Avoid QBUF/DQBUF struct timeval .tv_usec wrap-around at
-    frame 1000000
--   v4l2codecs: Fix tiled formats stride conversion
+-   flacparse: fix buffer overflow
+-   hlsdemux2: Various fixes for discontinuities, variant switching, playlist updates
+-   qml6glsink: fix RGB format support
+-   rtpdtmfdepay: fix caps negotiation with audioconvert
+-   rtpdtmfsrc: fix leak when shutting down mid-event
+-   rtspsrc: fix invalid seqnum assertions
+-   rtspsrc: Various control URL handling fixes
+-   v4l2src: Interpret V4L2 report of sync loss as video signal loss
 
 gst-plugins-bad
 
--   audiobuffersplit: disable max-silence-time if set to 0
--   libde265: Do not decode the non 4:2:0 8 bits format
--   codecparsers: av1: Clip max tile rows and cols values
--   codecs: h265: Do not free slice header before using it
--   d3d11converter: Fix 10/12bits planar output
--   d3d11decoder: Fix crash on negotiate() when decoder is not
-    configured
--   d3d11videosink: Fix toggling between fullscreen and maximized
--   d3d11videosink: Fix window switching in case of fullscreen mode
--   d3d11screencapturesrc: Fix mouse cursor blending
--   decklink: Fix broken COM string conversion
--   decklink: Decklink Device Provider wrongly parses SDK strings
--   gstwayland: Don’t depend on wayland-protocols
--   interaudiosrc: Add audio meta to buffers containing non-interleaved
-    samples
--   kmssink: Add TIDSS auto-detection
--   mfvideoencoder: Fix typo in template caps
--   mxfdemux: Store GstMXFDemuxEssenceTrack in their own fixed
-    allocation
--   nvcodec: fix bounds for auto-select GPU enumeration
--   openh264: Fail gracefully if openh264 encoder/decoder creation fails
--   tsmux: More cleanups
--   tsmux: Fill padding packets with stuffing bytes
--   v4l2codecs: Fix tiled formats stride conversion
--   v4l2videodec: Correctly free caps to avoid memory leak
--   wasapi2: Don’t use global volume control object
--   wasapi2device: Ignore activation failed device
+-   av1parse: Do not return error when expectedFrameId mismatch
+-   av1dec: Don’t treat decoding errors as fatal and print more error details
+-   av1enc: Handle force-keyunit events properly by requesting keyframes
+-   codectimestamper: never set DTS to NONE
+-   d3d12encoder: Do not print error log for not-supported feature
+-   d3d12memory: Fix staging buffer alignment
+-   d3d12videosink: Disconnect window signal handler on dispose as intended
+-   dtlssrtpenc: Don’t crash if no pad name is provided when requesting a new pad
+-   glcolorconvert: update existing sync meta if outbuf has one
+-   pcapparse: Parsing code assumes unaligned memory accesses are OK
+-   pcapparse: Avoid unaligned memory access
+-   tsdemux: Fix maximum PCR/DTS values
+-   vtdec: Improve error handling in edge cases
+-   vtdec, qtdemux: regression in 1.24.3 - internal data stream error
+-   uvcgadget: Use g_path_get_basename instead of libc basename
 
 gst-plugins-ugly
 
 -   No changes
 
-gst-plugins-rs
+GStreamer Rust plugins
 
--   aws: s3sink: Fix handling of special characters in key
--   aws: s3: Properly percent-decode GstS3Url
--   fmp4mux: Don’t overflow negative composition offset calculation
--   fmp4mux: specify the fragment duration unit
--   hlssink3: Use Path API for getting file name
--   hlssink3: Use sprintf for segment name formatting
--   hlssink3: Remove unused deps
--   hlssink3: Don’t remove old files if max-files is zero
--   hlssink3: Don’t remove uri from playlist if playlist-length is zero
--   hlssink3: Various cleanup
--   livesync: log new pending segments
--   livesync: display jitter when waiting on clock
--   livesync: Rename activatemode methods to *_activatemode
--   livesync: Simplify start_src_task and src_loop
--   livesync: Improve audio duration fixups
--   livesync: Log a category error when we are missing the segment
--   livesync: Clean up state handling
--   livesync: Replace an if-let with match
--   livesync: Move a notify closer to the interesting state change
--   livesync: Move num_in counting to the src task
--   livesync: Simplify num_duplicate counting
--   livesync: Handle flags and late buffer patching after queueing
--   livesync: Separate out_buffer duplicate status from GAP flag
--   livesync: Use fallback_duration for audio repeat buffers as well
--   livesync: example: Add identities single-segment=1
--   livesync: Split fallback_duration into in_ and out_duration
--   livesync: Keep existing buffer duration in some cases
--   livesync: Remove the stop from outgoing segments
--   ndisrc: Assume input with more than 8 raw audio channels is
-    unpositioned
--   rtpav1depay: Skip unexpected leading fragments
--   rtpav1depay: Don’t push stale temporal delimiters downstream
--   rsfilesink: set sync=false
--   s3sink: set sync=false
--   sccparse: Fix leading spaces between the tab and caption data
--   webrtchttp: Respect HTTP redirects
--   webrtcsrc: use @watch instead of @to-owned
--   webrtcsrc: add turn-servers property
--   webrtc: Fix paths in README
--   webrtcsink: don’t miss ice candidates
+-   gtk4: update flatpak integration code
+-   ndi: Add support for loading NDI SDK v6
+-   reqwesthttpsrc: Fix race condition when unlocking
+-   rtp: Don’t restrict payload types for payloaders
+-   rtp: av1pay: Correctly use N flag for marking keyframes
+-   rtp: av1depay: Parse internal size fields of OBUs and handle them
+-   webrtcsink: Refactor value retrieval to avoid lock poisoning
+-   webrtcsink: Add support for AV1
+-   webrtc: Update to async-tungstenite 0.26
+-   Fix various new clippy 1.79 warnings
+-   meson: Fix various issues in dependency management, feature detection, some regressions, and add logging
 
 gst-libav
 
@@ -2517,7 +2078,7 @@
 
 gst-rtsp-server
 
--   rtspclientsink: Don’t leak previous server_ip
+-   No changes
 
 gstreamer-vaapi
 
@@ -2539,9 +2100,9 @@
 
 -   No changes
 
-gst-validate + gst-integration-testsuites
+gst-devtools, gst-validate + gst-integration-testsuites
 
--   gst-validate: Fix compatibility with Python 3.12
+-   No changes
 
 gst-examples
 
@@ -2551,54 +2112,36 @@
 
 -   No changes
 
-Cerbero build tool and packaging changes in 1.22.7
+Cerbero build tool and packaging changes in 1.24.5
+
+-   No changes
+
+Contributors to 1.24.5
+
+Angelo Verlain, Chris Del Guercio, Corentin Damman, Edward Hervey, Francisco Javier Velázquez-García, He Junyan, Jakub Adam,
+Jakub Vaněk, Khem Raj, Martin Nordholts, Mathieu Duponchelle, Nirbheek Chauhan, Piotr Brzeziński, Samuel Thibault, Sebastian
+Dröge, Sergey Krivohatskiy, Seungha Yang, Tim-Philipp Müller, Zach van Rijn,
+
+… and many others who have contributed bug reports, translations, sent suggestions or helped testing. Thank you all!
+
+List of merge requests and issues fixed in 1.24.5
+
+-   List of Merge Requests applied in 1.24.5
+-   List of Issues fixed in 1.24.5
+
+Schedule for 1.26
+
+Our next major feature release will be 1.26, and 1.25 will be the unstable development version leading up to the stable 1.26
+release. The development of 1.25/1.25 will happen in the git main branch of the GStreamer mono repository.
+
+The schedule for 1.26 is yet to be decided.
+
+1.26 will be backwards-compatible to the stable 1.24, 1.22, 1.20, 1.18, 1.16, 1.14, 1.12, 1.10, 1.8, 1.6, 1.4, 1.2 and 1.0
+release series.
+
+--------------------------------------------------------------------------------------------------------------------------------
 
--   Add Windows 11 to the supported versions list
--   ca-certificates: Update to version from 2023-08-22
--   cargo: Restrict parallelism if a small system is detected (for
-    gst-plugins-rs build)
--   Fix venv setup on Python 3.11+
--   Fix unlinking of Android NDK directories if install fails midway
--   glib: Work around AppleClang + -Werror test build failure
--   glib: Re-add gio module loading patch for macOS, remove unused patch
-    files
-
-Contributors to 1.22.7
-
-Albert Sjölund, Arun Raghavan, Balló György, Benjamin Gaignard, Detlev
-Casanova, Doug Nazar, Eric, Florian Zwoch, François Laignel, Guillaume
-Desmottes, He Junyan, Hou Qi, James Oliver, Jan Alexander Steffens
-(heftig), Jan Schmidt, Johan Adam Nilsson, Jordan Yelloz, Kalev Lember,
-L. E. Segovia, Lieven Paulissen, Maksym Khomenko, Marek Vasut, Matthias
-Fuchs, Michiel Westerbeek, Nicolas Dufresne, Philippe Normand, Piotr
-Brzeziński, Rahul T R, Sean DuBois, Sebastian Dröge, Seungha Yang,
-Stéphane Cerveau, Thibault Saunier, Tim-Philipp Müller,
-
-… and many others who have contributed bug reports, translations, sent
-suggestions or helped testing. Thank you all!
-
-List of merge requests and issues fixed in 1.22.7
-
--   List of Merge Requests applied in 1.22.7
--   List of Issues fixed in 1.22.7
-
-Schedule for 1.24
-
-Our next major feature release will be 1.24, and 1.23 will be the
-unstable development version leading up to the stable 1.24 release. The
-development of 1.23/1.24 will happen in the git main branch of the
-GStreamer mono repository.
-
-The plan for the 1.24 development cycle is yet to be confirmed.
-
-1.24 will be backwards-compatible to the stable 1.22, 1.20, 1.18, 1.16,
-1.14, 1.12, 1.10, 1.8, 1.6, 1.4, 1.2 and 1.0 release series.
-
-------------------------------------------------------------------------
-
-These release notes have been prepared by Tim-Philipp Müller with
-contributions from Edward Hervey, Matthew Waters, Nicolas Dufresne,
-Nirbheek Chauhan, Olivier Crête, Sebastian Dröge, Seungha Yang, and
-Thibault Saunier.
+These release notes have been prepared by Tim-Philipp Müller with contributions from Edward Hervey, Matthew Waters, Nicolas
+Dufresne, Nirbheek Chauhan, Olivier Crête, Sebastian Dröge, Seungha Yang, Thibault Saunier, and Víctor Manuel Jáquez Leal.
 
 License: CC BY-SA 4.0

gst-plugins-bad-1.22.7.tar.xz/README.md -> gst-plugins-bad-1.24.5.tar.xz/README.md Changed

gst-plugins-bad-1.22.7.tar.xz/RELEASE -> gst-plugins-bad-1.24.5.tar.xz/RELEASE Changed

@@ -1,17 +1,17 @@
-This is GStreamer gst-plugins-bad 1.22.7.
+This is GStreamer gst-plugins-bad 1.24.5.
 
 The GStreamer team is thrilled to announce a new major feature release
 of your favourite cross-platform multimedia framework!
 
 As always, this release is again packed with new features, bug fixes and
 other improvements.
-
-The 1.22 release series adds new features on top of the 1.20 series and is
+ 
+The 1.24 release series adds new features on top of the 1.22 series and is
 part of the API and ABI-stable 1.x release series.
 
 Full release notes can be found at:
 
-  https://gstreamer.freedesktop.org/releases/1.22/
+  https://gstreamer.freedesktop.org/releases/1.24/
 
 Binaries for Android, iOS, Mac OS X and Windows will usually be provided
 shortly after the release.
@@ -44,10 +44,7 @@
 
  - gstreamer-vaapi: hardware-accelerated video decoding and encoding using
                     VA-API on Linux. Primarily for Intel graphics hardware.
-
- - gst-omx: hardware-accelerated video decoding and encoding, primarily for
-                    embedded Linux systems that provide an OpenMax
-                    implementation layer such as the Raspberry Pi.
+                    (Deprecated, use the new "va" plugin instead)
 
  - gst-rtsp-server: library to serve files or streaming pipelines via RTSP
 
@@ -80,14 +77,18 @@
 
 for more details.
 
-For help and support, please subscribe to and send questions to the
-gstreamer-devel mailing list (see below for details).
+For help and support, please head over to our Discourse forum at
 
-There is also a #gstreamer IRC channel on the OFTC IRC network, which is
-also bridged into the Matrix network.
+  https://discourse.gstreamer.org/
 
-Please do not submit support requests in GitLab, we only use it
-for bug tracking and merge requests review.
+or pop into one of our Matrix chat rooms, see
+
+  https://discourse.gstreamer.org/t/new-gstreamer-matrix-chat-space/675
+
+for more details.
+
+Please do not submit support requests in GitLab, we only use it for
+bug tracking and merge requests review. Use the Discourse forum instead.
 
 ==== Developers ====
 
@@ -99,6 +100,9 @@
 Merge Requests or file issues for bugs or feature requests.
 
 Interested developers of the core library, plugins, and applications should
-subscribe to the gstreamer-devel list:
+join us on Matrix for chat and the Discourse forum for announcements, help
+and discussions.
+
+There is also a gstreamer-devel mailing list, but Discourse is preferred:
 
   https://lists.freedesktop.org/mailman/listinfo/gstreamer-devel

gst-plugins-bad-1.22.7.tar.xz/REQUIREMENTS -> gst-plugins-bad-1.24.5.tar.xz/REQUIREMENTS Changed

gst-plugins-bad-1.24.5.tar.xz/docs/libs/analytics Added

gst-plugins-bad-1.24.5.tar.xz/docs/libs/analytics/index.md Added

gst-plugins-bad-1.24.5.tar.xz/docs/libs/analytics/sitemap.txt Added

gst-plugins-bad-1.22.7.tar.xz/docs/libs/cuda/index.md -> gst-plugins-bad-1.24.5.tar.xz/docs/libs/cuda/index.md Changed

gst-plugins-bad-1.24.5.tar.xz/docs/libs/dxva Added

gst-plugins-bad-1.24.5.tar.xz/docs/libs/dxva/index.md Added

gst-plugins-bad-1.24.5.tar.xz/docs/libs/dxva/sitemap.txt Added

gst-plugins-bad-1.24.5.tar.xz/docs/libs/mse Added

gst-plugins-bad-1.24.5.tar.xz/docs/libs/mse/index.md Added

gst-plugins-bad-1.24.5.tar.xz/docs/libs/mse/sitemap.txt Added

gst-plugins-bad-1.22.7.tar.xz/docs/meson.build -> gst-plugins-bad-1.24.5.tar.xz/docs/meson.build Changed

@@ -112,7 +112,8 @@
         'sys/winks/ksvideohelpers.h',
         'gst/videoparsers/gstjpeg2000parse.h',
         'gst-libs/gst/*/*-prelude.h',
-        'gst-libs/gst/vulkan/vulkan_fwd.h'
+        'gst-libs/gst/vulkan/vulkan_fwd.h',
+        'gst-libs/gst/dxva/gstdxvatypedef.h',
     
     excludes += join_paths(meson.current_source_dir(), root_rel, f)
 endforeach
@@ -131,7 +132,10 @@
         {'name': 'audio', 'gir': audio_gir, 'lib': gstbadaudio_dep, 'prefix': 'bad-'},
         {'name': 'transcoder', 'gir': transcoder_gir, 'lib': gst_transcoder_dep},
         {'name': 'codecs', 'gir': codecs_gir, 'lib': gstcodecs_dep},
-        {'name': 'cuda', 'gir': gst_cuda_gir, 'lib': gstcuda_dep},
+        {'name': 'cuda', 'gir': gst_cuda_gir, 'lib': gstcuda_dep, 'c_source_patterns': '*.h', '*.cpp'},
+        {'name': 'dxva', 'gir': dxva_gir, 'lib': gstdxva_dep, 'c_source_patterns': '*.h', '*.cpp'},
+        {'name': 'mse', 'gir': mse_gir, 'lib': gstmse_dep, 'suffix': 'lib'},
+        {'name': 'analytics', 'gir': analytics_gir, 'lib': gstanalytics_dep},
     
 
     if gstopencv_dep.found()
@@ -142,6 +146,8 @@
 
     if gstva_dep.found()
         libs += {'name': 'va', 'gir': va_gir, 'lib': gstva_dep, 'suffix': 'lib'}
+    else
+        libs += {'name': 'va', 'gir-file': join_paths(meson.global_source_root(), 'girs', 'GstVa-1.0.gir'), 'lib': }
     endif
 
     if gstvulkan_dep.found()
@@ -180,25 +186,34 @@
   endforeach
   c_sources += extra_sources
 
-    if lib_def.has_key('gir')
+    if lib_def.has_key('gir') or lib_def.has_key('gir-file')
         if has_gi_extension
-            gir = lib_def'gir'
+            if lib_def.has_key('gir')
+                gir_targets = lib_def'gir'
+                gir = gir_targets0
+                gir_file = gir0.full_path()
+            else
+                gir_targets = 
+                gir = 
+                gir_file = lib_def'gir-file'
+            endif
+
             prefix = lib_def.get('prefix', '')
             suffix = lib_def.get('suffix', '')
             libs_doc += hotdoc.generate_doc(prefix + name + suffix,
                 project_version: api_version,
                 gi_c_sources: c_sources,
-                gi_sources: gir0.full_path(),
+                gi_sources: gir_file,
                 gi_c_source_filters: excludes,
                 sitemap: join_paths('libs', name, 'sitemap.txt'),
                 index: join_paths('libs/', name, 'index.md'),
                 gi_index: join_paths('libs/', name, 'index.md'),
                 gi_smart_index: true,
                 gi_order_generated_subpages: true,
-                dependencies: lib, gir,
+                dependencies: lib, gir_targets,
                 c_flags: '-DGST_USE_UNSTABLE_API',
                 install: false,
-                depends: gir0,
+                depends: gir,
             )
         endif
     else
@@ -220,45 +235,35 @@
     endif
 endforeach
 
-list_plugin_res = run_command(python3, '-c',
-'''
-import sys
-import json
-
-with open("@0@") as f:
-    print(':'.join(json.load(f).keys()), end='')
-'''.format(plugins_cache),
-  check: true)
-
-plugins_doc = 
-foreach plugin_name: list_plugin_res.stdout().split(':')
-    plugins_doc += hotdoc.generate_doc(plugin_name,
-        project_version: api_version,
-        sitemap: 'plugins/sitemap.txt',
-        index: 'plugins/index.md',
-        c_flags: '-DGST_USE_UNSTABLE_API',
-        gst_index: 'plugins/index.md',
-        gst_smart_index: true,
-        gst_c_sources: 
-            join_paths(root_rel, 'sys/*/*.cmh'),
-            join_paths(root_rel, 'sys/*/*.cpp'),
-            join_paths(root_rel, 'sys/*/*.cc'),
-            join_paths(root_rel, 'sys/*/*.mm'),
-            join_paths(root_rel, 'sys/*/*.hh'),
-            join_paths(root_rel, 'ext/*/*.ch'),
-            join_paths(root_rel, 'ext/*/*.cpp'),
-            join_paths(root_rel, 'ext/*/*.cc'),
-            join_paths(root_rel, 'ext/*/*.hh'),
-            join_paths(root_rel, 'gst/*/*.ch'),
-            join_paths(root_rel, 'gst/rtmp2/*/*.ch'),
-        ,
-        dependencies: gst_dep,
-        install: false,
-        disable_incremental_build: true,
-        gst_cache_file: plugins_cache,
-        gst_c_source_filters: excludes,
-        gst_order_generated_subpages: true,
-        gst_plugin_name: plugin_name,
-        include_paths: join_paths(meson.current_source_dir(), '..'),
-    )
-endforeach
+cdir = meson.current_source_dir()
+if host_machine.system() == 'windows'
+  pathsep = ';'
+else
+  pathsep = ':'
+endif
+gst_plugins_doc = run_command(
+    plugins_cache_generator,
+    'hotdoc-config',
+    '--builddir', meson.current_build_dir(),
+    '--project_version', api_version,
+    '--sitemap', cdir / 'plugins/sitemap.txt',
+    '--index', cdir / 'plugins/index.md',
+    '--c_flags', '\-DGST_USE_UNSTABLE_API',
+    '--gst_index', 'plugins/index.md',
+    '--gst_c_sources',
+        cdir / '../sys/*/*.cmh',
+        cdir / '../sys/*/*.cpp',
+        cdir / '../sys/*/*.cc',
+        cdir / '../sys/*/*.mm',
+        cdir / '../sys/*/*.hh',
+        cdir / '../ext/*/*.ch',
+        cdir / '../ext/*/*.cpp',
+        cdir / '../ext/*/*.cc',
+        cdir / '../ext/*/*.hh',
+        cdir / '../gst/*/*.ch',
+        cdir / '../gst/rtmp2/*/*.ch',
+    '--gst_cache_file', plugins_cache,
+    '--gst_c_source_filters', excludes,
+    '--include_paths', join_paths(meson.current_source_dir(), '..'),
+    check: true,
+).stdout().split(pathsep)

gst-plugins-bad-1.22.7.tar.xz/docs/plugins/gst_plugins_cache.json -> gst-plugins-bad-1.24.5.tar.xz/docs/plugins/gst_plugins_cache.json Changed

@@ -456,9 +456,1725 @@
         "tracers": {},
         "url": "Unknown package origin"
     },
+    "aja": {
+        "description": "GStreamer AJA plugin",
+        "elements": {
+            "ajasink": {
+                "author": "Sebastian Dröge <sebastian@centricular.com>",
+                "description": "Outputs audio/video frames with AJA devices",
+                "hierarchy": 
+                    "GstAjaSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Audio/Video/Sink",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: interleaved\n    field-order: top-field-first\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: interleaved\n    field-order: top-field-first\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: interleaved\n    field-order: top-field-first\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 1280\n         height: 720\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 1280\n         height: 720\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 1280\n         height: 720\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 1280\n         height: 720\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 1280\n         height: 720\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 576\n interlace-mode: interleaved\n    field-order: top-field-first\npixel-aspect-ratio: 12/11\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 576\n interlace-mode: interleaved\n    field-order: top-field-first\npixel-aspect-ratio: 16/11\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: interleaved\n    field-order: bottom-field-first\npixel-aspect-ratio: 10/11\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: interleaved\n    field-order: bottom-field-first\npixel-aspect-ratio: 40/33\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: progressive\npixel-aspect-ratio: 10/11\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: progressive\npixel-aspect-ratio: 40/33\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: progressive\npixel-aspect-ratio: 10/11\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: progressive\npixel-aspect-ratio: 40/33\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "audio-system": {
+                        "blurb": "Audio system to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Auto (based on selected channel) (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaAudioSystem",
+                        "writable": true
+                    },
+                    "cea608-line-number": {
+                        "blurb": "Sets the line number to use for CEA608 S334-1 Annex A Closed Captions (-1=disabled)",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "12",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "cea708-line-number": {
+                        "blurb": "Sets the line number to use for CEA708 S334-2 Closed Captions (-1=disabled)",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "12",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "channel": {
+                        "blurb": "Channel to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "7",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "device-identifier": {
+                        "blurb": "Input device instance to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "end-frame": {
+                        "blurb": "End frame buffer to be used for output (auto if same number as start-frame).",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "handle-ancillary-meta": {
+                        "blurb": "Handle ancillary meta on video frames",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "output-cpu-core": {
+                        "blurb": "Sets the affinity of the output thread to this CPU core (-1=disabled)",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "output-destination": {
+                        "blurb": "Output destination to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Auto (based on selected channel) (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaOutputDestination",
+                        "writable": true
+                    },
+                    "queue-size": {
+                        "blurb": "Size of internal queue in number of video frames. Half of this is allocated as device buffers and equal to the latency.",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "16",
+                        "max": "2147483647",
+                        "min": "1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "reference-source": {
+                        "blurb": "Reference source to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Auto (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaReferenceSource",
+                        "writable": true
+                    },
+                    "rp188": {
+                        "blurb": "Enable RP188 timecode transmission",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "sdi-mode": {
+                        "blurb": "SDI mode to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Single Link (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaSdiMode",
+                        "writable": true
+                    },
+                    "start-frame": {
+                        "blurb": "Start frame buffer to be used for output (auto if same number as end-frame).",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "timecode-index": {
+                        "blurb": "Timecode index to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Embedded SDI VITC (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaTimecodeIndex",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "ajasinkcombiner": {
+                "author": "Sebastian Dröge <sebastian@centricular.com>",
+                "description": "Combines corresponding audio/video frames",
+                "hierarchy": 
+                    "GstAjaSinkCombiner",
+                    "GstAggregator",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Audio/Video/Combiner",
+                "pad-templates": {
+                    "audio": {
+                        "caps": "audio/x-raw:\n         format: S32LE\n           rate: 48000\n       channels:  1, 16 \n         layout: interleaved\n",
+                        "direction": "sink",
+                        "presence": "request",
+                        "type": "GstAggregatorPad"
+                    },
+                    "src": {
+                        "caps": "video/x-raw:\n",
+                        "direction": "src",
+                        "presence": "always",
+                        "type": "GstAggregatorPad"
+                    },
+                    "video": {
+                        "caps": "video/x-raw:\n",
+                        "direction": "sink",
+                        "presence": "always",
+                        "type": "GstAggregatorPad"
+                    }
+                },
+                "rank": "none"
+            },
+            "ajasrc": {
+                "author": "Sebastian Dröge <sebastian@centricular.com>",
+                "description": "Captures audio/video frames with AJA devices",
+                "hierarchy": 
+                    "GstAjaSrc",
+                    "GstPushSrc",
+                    "GstBaseSrc",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Audio/Video/Source",
+                "pad-templates": {
+                    "src": {
+                        "caps": "video/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: interleaved\n    field-order: top-field-first\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: interleaved\n    field-order: top-field-first\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: interleaved\n    field-order: top-field-first\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 1280\n         height: 720\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 1280\n         height: 720\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 1280\n         height: 720\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 1280\n         height: 720\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 1280\n         height: 720\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 1920\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 576\n interlace-mode: interleaved\n    field-order: top-field-first\npixel-aspect-ratio: 12/11\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 576\n interlace-mode: interleaved\n    field-order: top-field-first\npixel-aspect-ratio: 16/11\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: interleaved\n    field-order: bottom-field-first\npixel-aspect-ratio: 10/11\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: interleaved\n    field-order: bottom-field-first\npixel-aspect-ratio: 40/33\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: progressive\npixel-aspect-ratio: 10/11\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: progressive\npixel-aspect-ratio: 40/33\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: progressive\npixel-aspect-ratio: 10/11\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 720\n         height: 486\n interlace-mode: progressive\npixel-aspect-ratio: 40/33\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 2048\n         height: 1080\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 3840\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 4096\n         height: 2160\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 7680\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24000/1001\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 24/1\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 25/1\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30000/1001\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 30/1\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 50/1\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60000/1001\nvideo/x-raw:\n         format: v210\n          width: 8192\n         height: 4320\n interlace-mode: progressive\npixel-aspect-ratio: 1/1\n      framerate: 60/1\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "attach-ancillary-meta": {
+                        "blurb": "Attach ancillary meta to video frames",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "audio-source": {
+                        "blurb": "Audio source to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Embedded (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaAudioSource",
+                        "writable": true
+                    },
+                    "audio-system": {
+                        "blurb": "Audio system to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Auto (based on selected channel) (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaAudioSystem",
+                        "writable": true
+                    },
+                    "capture-cpu-core": {
+                        "blurb": "Sets the affinity of the capture thread to this CPU core (-1=disabled)",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "channel": {
+                        "blurb": "Channel to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "7",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "closed-caption-capture-mode": {
+                        "blurb": "Closed Caption Capture Mode",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "CEA708 S334-2 and CEA608 S334-1 Annex A Closed Captions (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaClosedCaptionCaptureMode",
+                        "writable": true
+                    },
+                    "device-identifier": {
+                        "blurb": "Input device instance to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "embedded-audio-input": {
+                        "blurb": "Embedded Audio Input to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "auto (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaEmbeddedAudioInput",
+                        "writable": true
+                    },
+                    "end-frame": {
+                        "blurb": "End frame buffer to be used for capturing (automatically assign that many frames if same number as start-frame).",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "8",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "input-source": {
+                        "blurb": "Input source to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Auto (based on selected channel) (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaInputSource",
+                        "writable": true
+                    },
+                    "queue-size": {
+                        "blurb": "Size of internal queue in number of video frames. Half of this is allocated as device buffers and equal to the latency.",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "16",
+                        "max": "2147483647",
+                        "min": "1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "reference-source": {
+                        "blurb": "Reference source to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Freerun (1)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaReferenceSource",
+                        "writable": true
+                    },
+                    "rp188": {
+                        "blurb": "Enable RP188 timecode retrieval",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "sdi-input-mode": {
+                        "blurb": "SDI input mode to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Single Link (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaSdiMode",
+                        "writable": true
+                    },
+                    "signal": {
+                        "blurb": "True if there is a valid input signal available",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": false
+                    },
+                    "start-frame": {
+                        "blurb": "Start frame buffer to be used for capturing (automatically assign that many frames if same number as end-frame).",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "8",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "timecode-index": {
+                        "blurb": "Timecode index to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Embedded SDI VITC (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaTimecodeIndex",
+                        "writable": true
+                    },
+                    "video-format": {
+                        "blurb": "Video format to use",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Auto detect format (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAjaVideoFormat",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "ajasrcdemux": {
+                "author": "Sebastian Dröge <sebastian@centricular.com>",
+                "description": "Demuxes audio/video from video buffers",
+                "hierarchy": 
+                    "GstAjaSrcDemux",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Audio/Video/Demux",
+                "pad-templates": {
+                    "audio": {
+                        "caps": "audio/x-raw:\n",
+                        "direction": "src",
+                        "presence": "always"
+                    },
+                    "sink": {
+                        "caps": "video/x-raw:\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "video": {
+                        "caps": "video/x-raw:\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            }
+        },
+        "filename": "gstaja",
+        "license": "LGPL",
+        "other-types": {
+            "GstAjaAudioSource": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "embedded",
+                        "name": "Embedded",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "aes",
+                        "name": "AES",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "analog",
+                        "name": "Analog",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "hdmi",
+                        "name": "HDMI",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "mic",
+                        "name": "Microphone",
+                        "value": "4"
+                    }
+                
+            },
+            "GstAjaAudioSystem": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "auto",
+                        "name": "Auto (based on selected channel)",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "1",
+                        "name": "Audio system 1",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "2",
+                        "name": "Audio system 2",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "3",
+                        "name": "Audio system 3",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "4",
+                        "name": "Audio system 4",
+                        "value": "4"
+                    },
+                    {
+                        "desc": "5",
+                        "name": "Audio system 5",
+                        "value": "5"
+                    },
+                    {
+                        "desc": "6",
+                        "name": "Audio system 6",
+                        "value": "6"
+                    },
+                    {
+                        "desc": "7",
+                        "name": "Audio system 7",
+                        "value": "7"
+                    },
+                    {
+                        "desc": "8",
+                        "name": "Audio system 8",
+                        "value": "8"
+                    }
+                
+            },
+            "GstAjaClosedCaptionCaptureMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "cea708-and-cea608",
+                        "name": "CEA708 S334-2 and CEA608 S334-1 Annex A Closed Captions",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "cea708-or-cea608",
+                        "name": "CEA708 S334-2 or if not existing CEA608 S334-1 Annex A Closed Captions",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "cea608-or-cea708",
+                        "name": "CEA608 S334-1 Annex A or if not existing CEA708 S334-2 Closed Captions",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "cea708-only",
+                        "name": "CEA708 S334-2 Closed Captions only",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "cea608-only",
+                        "name": "CEA608 S334-1 Annex A Closed Captions only",
+                        "value": "4"
+                    },
+                    {
+                        "desc": "none",
+                        "name": "Don't capture Closed Captions",
+                        "value": "5"
+                    }
+                
+            },
+            "GstAjaEmbeddedAudioInput": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "auto",
+                        "name": "auto",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "video-1",
+                        "name": "Video 1",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "video-2",
+                        "name": "Video 2",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "video-3",
+                        "name": "Video 3",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "video-4",
+                        "name": "Video 4",
+                        "value": "4"
+                    },
+                    {
+                        "desc": "video-5",
+                        "name": "Video 5",
+                        "value": "5"
+                    },
+                    {
+                        "desc": "video-6",
+                        "name": "Video 6",
+                        "value": "6"
+                    },
+                    {
+                        "desc": "video-7",
+                        "name": "Video 7",
+                        "value": "7"
+                    },
+                    {
+                        "desc": "video-8",
+                        "name": "Video 8",
+                        "value": "8"
+                    }
+                
+            },
+            "GstAjaInputSource": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "auto",
+                        "name": "Auto (based on selected channel)",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "analog-1",
+                        "name": "Analog Input 1",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "sdi-1",
+                        "name": "SDI Input 1",
+                        "value": "6"
+                    },
+                    {
+                        "desc": "sdi-2",
+                        "name": "SDI Input 2",
+                        "value": "7"
+                    },
+                    {
+                        "desc": "sdi-3",
+                        "name": "SDI Input 3",
+                        "value": "8"
+                    },
+                    {
+                        "desc": "sdi-4",
+                        "name": "SDI Input 4",
+                        "value": "9"
+                    },
+                    {
+                        "desc": "sdi-5",
+                        "name": "SDI Input 5",
+                        "value": "10"
+                    },
+                    {
+                        "desc": "sdi-6",
+                        "name": "SDI Input 6",
+                        "value": "11"
+                    },
+                    {
+                        "desc": "sdi-7",
+                        "name": "SDI Input 7",
+                        "value": "12"
+                    },
+                    {
+                        "desc": "sdi-8",
+                        "name": "SDI Input 8",
+                        "value": "13"
+                    },
+                    {
+                        "desc": "hdmi-1",
+                        "name": "HDMI Input 1",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "hdmi-2",
+                        "name": "HDMI Input 2",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "hdmi-3",
+                        "name": "HDMI Input 3",
+                        "value": "4"
+                    },
+                    {
+                        "desc": "hdmi-4",
+                        "name": "HDMI Input 4",
+                        "value": "5"
+                    }
+                
+            },
+            "GstAjaOutputDestination": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "auto",
+                        "name": "Auto (based on selected channel)",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "analog",
+                        "name": "Analog Output",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "sdi-1",
+                        "name": "SDI Output 1",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "sdi-2",
+                        "name": "SDI Output 2",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "sdi-3",
+                        "name": "SDI Output 3",
+                        "value": "4"
+                    },
+                    {
+                        "desc": "sdi-4",
+                        "name": "SDI Output 4",
+                        "value": "5"
+                    },
+                    {
+                        "desc": "sdi-5",
+                        "name": "SDI Output 5",
+                        "value": "6"
+                    },
+                    {
+                        "desc": "sdi-6",
+                        "name": "SDI Output 6",
+                        "value": "7"
+                    },
+                    {
+                        "desc": "sdi-7",
+                        "name": "SDI Output 7",
+                        "value": "8"
+                    },
+                    {
+                        "desc": "sdi-8",
+                        "name": "SDI Output 8",
+                        "value": "9"
+                    },
+                    {
+                        "desc": "hdmi",
+                        "name": "HDMI Output",
+                        "value": "10"
+                    }
+                
+            },
+            "GstAjaReferenceSource": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "auto",
+                        "name": "Auto",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "freerun",
+                        "name": "Freerun",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "external",
+                        "name": "External",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "input-1",
+                        "name": "SDI Input 1",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "input-2",
+                        "name": "SDI Input 2",
+                        "value": "4"
+                    },
+                    {
+                        "desc": "input-3",
+                        "name": "SDI Input 3",
+                        "value": "5"
+                    },
+                    {
+                        "desc": "input-4",
+                        "name": "SDI Input 4",
+                        "value": "6"
+                    },
+                    {
+                        "desc": "input-5",
+                        "name": "SDI Input 5",
+                        "value": "7"
+                    },
+                    {
+                        "desc": "input-6",
+                        "name": "SDI Input 6",
+                        "value": "8"
+                    },
+                    {
+                        "desc": "input-7",
+                        "name": "SDI Input 7",
+                        "value": "9"
+                    },
+                    {
+                        "desc": "input-8",
+                        "name": "SDI Input 8",
+                        "value": "10"
+                    }
+                
+            },
+            "GstAjaSdiMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "single-link",
+                        "name": "Single Link",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "quad-link-sqd",
+                        "name": "Quad Link SQD",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "quad-link-tsi",
+                        "name": "Quad Link TSI",
+                        "value": "2"
+                    }
+                
+            },
+            "GstAjaTimecodeIndex": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "vitc",
+                        "name": "Embedded SDI VITC",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "atc-ltc",
+                        "name": "Embedded SDI ATC LTC",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "ltc-1",
+                        "name": "Analog LTC 1",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "ltc-2",
+                        "name": "Analog LTC 2",
+                        "value": "3"
+                    }
+                
+            },
+            "GstAjaVideoFormat": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "auto",
+                        "name": "Auto detect format",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "1080i-5000",
+                        "name": "1080i 5000",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "1080i-5994",
+                        "name": "1080i 5994",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "1080i-6000",
+                        "name": "1080i 6000",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "720p-5994",
+                        "name": "720p 5994",
+                        "value": "4"
+                    },
+                    {
+                        "desc": "720p-6000",
+                        "name": "720p 6000",
+                        "value": "5"
+                    },
+                    {
+                        "desc": "1080psf-2398",
+                        "name": "1080psf 2398",
+                        "value": "6"
+                    },
+                    {
+                        "desc": "1080psf-2400",
+                        "name": "1080psf 2400",
+                        "value": "7"
+                    },
+                    {
+                        "desc": "1080p-2997",
+                        "name": "1080p 2997",
+                        "value": "8"
+                    },
+                    {
+                        "desc": "1080p-3000",
+                        "name": "1080p 3000",
+                        "value": "9"
+                    },
+                    {
+                        "desc": "1080p-2500",
+                        "name": "1080p 2500",
+                        "value": "10"
+                    },
+                    {
+                        "desc": "1080p-2398",
+                        "name": "1080p 2398",
+                        "value": "11"
+                    },
+                    {
+                        "desc": "1080p-2400",
+                        "name": "1080p 2400",
+                        "value": "12"
+                    },
+                    {
+                        "desc": "720p-5000",
+                        "name": "720p 5000",
+                        "value": "13"
+                    },
+                    {
+                        "desc": "1080p-5000-a",
+                        "name": "1080p 5000 A",
+                        "value": "14"
+                    },
+                    {
+                        "desc": "1080p-5994-a",
+                        "name": "1080p 5994 A",
+                        "value": "15"
+                    },
+                    {
+                        "desc": "1080p-6000-a",
+                        "name": "1080p 6000 A",
+                        "value": "16"
+                    },
+                    {
+                        "desc": "720p-2398",
+                        "name": "720p 2398",
+                        "value": "17"
+                    },
+                    {
+                        "desc": "720p-2500",
+                        "name": "720p 2500",
+                        "value": "18"
+                    },
+                    {
+                        "desc": "1080psf-2500-2",
+                        "name": "1080psf 2500 2",
+                        "value": "19"
+                    },
+                    {
+                        "desc": "1080psf-2997-2",
+                        "name": "1080psf 2997 2",
+                        "value": "20"
+                    },
+                    {
+                        "desc": "1080psf-3000-2",
+                        "name": "1080psf 3000 2",
+                        "value": "21"
+                    },
+                    {
+                        "desc": "625-5000",
+                        "name": "625 5000",
+                        "value": "22"
+                    },
+                    {
+                        "desc": "525-5994",
+                        "name": "525 5994",
+                        "value": "23"
+                    },
+                    {
+                        "desc": "525-2398",
+                        "name": "525 2398",
+                        "value": "24"
+                    },
+                    {
+                        "desc": "525-2400",
+                        "name": "525 2400",
+                        "value": "25"
+                    },
+                    {
+                        "desc": "1080p-dci-2398",
+                        "name": "1080p DCI 2398",
+                        "value": "26"
+                    },
+                    {
+                        "desc": "1080p-dci-2400",
+                        "name": "1080p DCI 2400",
+                        "value": "27"
+                    },
+                    {
+                        "desc": "1080p-dci-2500",
+                        "name": "1080p DCI 2500",
+                        "value": "28"
+                    },
+                    {
+                        "desc": "1080p-dci-2997",
+                        "name": "1080p DCI 2997",
+                        "value": "29"
+                    },
+                    {
+                        "desc": "1080p-dci-3000",
+                        "name": "1080p DCI 3000",
+                        "value": "30"
+                    },
+                    {
+                        "desc": "1080p-dci-5000-a",
+                        "name": "1080p DCI 5000 A",
+                        "value": "31"
+                    },
+                    {
+                        "desc": "1080p-dci-5994-a",
+                        "name": "1080p DCI 5994 A",
+                        "value": "32"
+                    },
+                    {
+                        "desc": "1080p-dci-6000-a",
+                        "name": "1080p DCI 6000 A",
+                        "value": "33"
+                    },
+                    {
+                        "desc": "2160p-2398",
+                        "name": "2160p 2398",
+                        "value": "34"
+                    },
+                    {
+                        "desc": "2160p-2400",
+                        "name": "2160p 2400",
+                        "value": "35"
+                    },
+                    {
+                        "desc": "2160p-2500",
+                        "name": "2160p 2500",
+                        "value": "36"
+                    },
+                    {
+                        "desc": "2160p-2997",
+                        "name": "2160p 2997",
+                        "value": "37"
+                    },
+                    {
+                        "desc": "2160p-3000",
+                        "name": "2160p 3000",
+                        "value": "38"
+                    },
+                    {
+                        "desc": "2160p-5000",
+                        "name": "2160p 5000",
+                        "value": "39"
+                    },
+                    {
+                        "desc": "2160p-5994",
+                        "name": "2160p 5994",
+                        "value": "40"
+                    },
+                    {
+                        "desc": "2160p-6000",
+                        "name": "2160p 6000",
+                        "value": "41"
+                    },
+                    {
+                        "desc": "2160p-dci-2398",
+                        "name": "2160p DCI 2398",
+                        "value": "42"
+                    },
+                    {
+                        "desc": "2160p-dci-2400",
+                        "name": "2160p DCI 2400",
+                        "value": "43"
+                    },
+                    {
+                        "desc": "2160p-dci-2500",
+                        "name": "2160p DCI 2500",
+                        "value": "44"
+                    },
+                    {
+                        "desc": "2160p-dci-2997",
+                        "name": "2160p DCI 2997",
+                        "value": "45"
+                    },
+                    {
+                        "desc": "2160p-dci-3000",
+                        "name": "2160p DCI 3000",
+                        "value": "46"
+                    },
+                    {
+                        "desc": "2160p-dci-5000",
+                        "name": "2160p DCI 5000",
+                        "value": "47"
+                    },
+                    {
+                        "desc": "2160p-dci-5994",
+                        "name": "2160p DCI 5994",
+                        "value": "48"
+                    },
+                    {
+                        "desc": "2160p-dci-6000",
+                        "name": "2160p DCI 6000",
+                        "value": "49"
+                    },
+                    {
+                        "desc": "4320p-2398",
+                        "name": "4320p 2398",
+                        "value": "50"
+                    },
+                    {
+                        "desc": "4320p-2400",
+                        "name": "4320p 2400",
+                        "value": "51"
+                    },
+                    {
+                        "desc": "4320p-2500",
+                        "name": "4320p 2500",
+                        "value": "52"
+                    },
+                    {
+                        "desc": "4320p-2997",
+                        "name": "4320p 2997",
+                        "value": "53"
+                    },
+                    {
+                        "desc": "4320p-3000",
+                        "name": "4320p 3000",
+                        "value": "54"
+                    },
+                    {
+                        "desc": "4320p-5000",
+                        "name": "4320p 5000",
+                        "value": "55"
+                    },
+                    {
+                        "desc": "4320p-5994",
+                        "name": "4320p 5994",
+                        "value": "56"
+                    },
+                    {
+                        "desc": "4320p-6000",
+                        "name": "4320p 6000",
+                        "value": "57"
+                    },
+                    {
+                        "desc": "4320p-dci-2398",
+                        "name": "4320p DCI 2398",
+                        "value": "58"
+                    },
+                    {
+                        "desc": "4320p-dci-2400",
+                        "name": "4320p DCI 2400",
+                        "value": "59"
+                    },
+                    {
+                        "desc": "4320p-dci-2500",
+                        "name": "4320p DCI 2500",
+                        "value": "60"
+                    },
+                    {
+                        "desc": "4320p-dci-2997",
+                        "name": "4320p DCI 2997",
+                        "value": "61"
+                    },
+                    {
+                        "desc": "4320p-dci-3000",
+                        "name": "4320p DCI 3000",
+                        "value": "62"
+                    },
+                    {
+                        "desc": "4320p-dci-5000",
+                        "name": "4320p DCI 5000",
+                        "value": "63"
+                    },
+                    {
+                        "desc": "4320p-dci-5994",
+                        "name": "4320p DCI 5994",
+                        "value": "64"
+                    },
+                    {
+                        "desc": "4320p-dci-6000",
+                        "name": "4320p DCI 6000",
+                        "value": "65"
+                    }
+                
+            }
+        },
+        "package": "GStreamer Bad Plug-ins",
+        "source": "gst-plugins-bad",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
     "amfcodec": {
         "description": "AMD AMF Codec plugin",
         "elements": {
+            "amfav1enc": {
+                "author": "Seungha Yang <seungha@centricular.com>, Evgeny Pavlov <lucenticus@gmail.com>",
+                "description": "Encode AV1 video streams using AMF API",
+                "hierarchy": 
+                    "GstAmfAv1Enc",
+                    "GstAmfEncoder",
+                    "GstVideoEncoder",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstPreset"
+                ,
+                "klass": "Codec/Encoder/Video/Hardware",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { NV12, P010_10LE }\n          width:  128, 4096 \n         height:  128, 4096 \nvideo/x-raw:\n         format: { NV12, P010_10LE }\n          width:  128, 4096 \n         height:  128, 4096 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-av1:\n          width:  128, 4096 \n         height:  128, 4096 \n        profile: main\n  stream-format: obu-stream\n      alignment: tu\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "adapter-luid": {
+                        "blurb": "DXGI Adapter LUID (Locally Unique Identifier) of associated GPU",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "9223372036854775807",
+                        "min": "-9223372036854775808",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint64",
+                        "writable": false
+                    },
+                    "bitrate": {
+                        "blurb": "Target bitrate in kbit/sec (0: USAGE default)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "2147483",
+                        "min": "0",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "gop-size": {
+                        "blurb": "Number of pictures within a GOP",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "30",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-bitrate": {
+                        "blurb": "Maximum bitrate in kbit/sec (0: USAGE default)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "2147483",
+                        "min": "0",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-qp-i": {
+                        "blurb": "Maximum allowed QP value for I frames (-1: USAGE default)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "255",
+                        "min": "-1",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "max-qp-p": {
+                        "blurb": "Maximum allowed QP value for P frames (-1: USAGE default)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "255",
+                        "min": "-1",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "min-qp-i": {
+                        "blurb": "Minimum allowed QP value for I frames (-1: USAGE default)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "255",
+                        "min": "-1",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "min-qp-p": {
+                        "blurb": "Minimum allowed QP value for P frames (-1: USAGE default)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "255",
+                        "min": "-1",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "pa-activity-type": {
+                        "blurb": "Set the type of activity analysis for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "y (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAActivityType",
+                        "writable": true
+                    },
+                    "pa-caq-strength": {
+                        "blurb": "Content Adaptive Quantization strength for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "medium (1)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPACAQStrength",
+                        "writable": true
+                    },
+                    "pa-frame-sad": {
+                        "blurb": "Enable Frame SAD algorithm",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-hqmb-mode": {
+                        "blurb": "Set the PA high motion quality boost mode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAHQMBMode",
+                        "writable": true
+                    },
+                    "pa-initial-qp": {
+                        "blurb": "The QP value that is used immediately after a scene change",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "pa-lookahead-buffer-depth": {
+                        "blurb": "Set the PA lookahead buffer size",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "41",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "pa-ltr": {
+                        "blurb": "Enable long term reference frame management",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-max-qp": {
+                        "blurb": "The QP threshold to allow a skip frame",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "35",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "pa-paq-mode": {
+                        "blurb": "Set the perceptual adaptive quantization mode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAPAQMode",
+                        "writable": true
+                    },
+                    "pa-scene-change-detection": {
+                        "blurb": "Enable scene change detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-scene-change-detection-sensitivity": {
+                        "blurb": "Set the sensitivity of scene change detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "medium (1)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPASceneChangeDetectionSensitivity",
+                        "writable": true
+                    },
+                    "pa-static-scene-detection": {
+                        "blurb": "Enable static scene detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-static-scene-detection-sensitivity": {
+                        "blurb": "Set the sensitivity of static scene detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "high (2)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAStaticSceneDetectionSensitivity",
+                        "writable": true
+                    },
+                    "pa-taq-mode": {
+                        "blurb": "Set the temporal adaptive quantization mode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPATAQMode",
+                        "writable": true
+                    },
+                    "pre-analysis": {
+                        "blurb": "Enable pre-analysis",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pre-encode": {
+                        "blurb": "Enable pre-encode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "preset": {
+                        "blurb": "Preset",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (-1)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstAmfAv1EncPreset",
+                        "writable": true
+                    },
+                    "qp-i": {
+                        "blurb": "Constant QP for I frames",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "26",
+                        "max": "255",
+                        "min": "0",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "qp-p": {
+                        "blurb": "Constant QP for P frames",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "26",
+                        "max": "255",
+                        "min": "0",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "rate-control": {
+                        "blurb": "Rate Control Method",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (-1)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstAmfAv1EncRateControl",
+                        "writable": true
+                    },
+                    "ref-frames": {
+                        "blurb": "Number of reference frames",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "8",
+                        "min": "0",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "smart-access-video": {
+                        "blurb": "Enable AMF SmartAccess Video feature for optimal distribution between multiple AMD hardware instances",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "usage": {
+                        "blurb": "Target usage",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "transcoding (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstAmfAv1EncUsage",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
             "amfh264enc": {
                 "author": "Seungha Yang <seungha@centricular.com>",
                 "description": "Encode H.264 video streams using AMF API",
@@ -502,6 +2218,18 @@
                         "type": "gint64",
                         "writable": false
                     },
+                    "adaptive-mini-gop": {
+                        "blurb": "Enable Adaptive MiniGOP. Determines the number of B-frames to be inserted between I and P frames, or between two consecutive P-frames",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "aud": {
                         "blurb": "Use AU (Access Unit) delimiter",
                         "conditionally-available": false,
@@ -514,6 +2242,32 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "b-frames": {
+                        "blurb": "Number of consecutive B-frames in a GOP. If b-frames > max-b-frames, then b-frames set to max-b-frames (-1: USAGE default)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "3",
+                        "min": "-1",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "b-reference": {
+                        "blurb": "Enables or disables using B-pictures as references",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "bitrate": {
                         "blurb": "Target bitrate in kbit/sec (0: USAGE default)",
                         "conditionally-available": false,
@@ -554,6 +2308,20 @@
                         "type": "gint",
                         "writable": true
                     },
+                    "max-b-frames": {
+                        "blurb": "Maximum number of consecutive B Pictures. Suggestion set to 3 if b-frames is not 0",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "3",
+                        "min": "0",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
                     "max-bitrate": {
                         "blurb": "Maximum bitrate in kbit/sec (0: USAGE default)",
                         "conditionally-available": false,
@@ -596,6 +2364,204 @@
                         "type": "gint",
                         "writable": true
                     },
+                    "pa-activity-type": {
+                        "blurb": "Set the type of activity analysis for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "y (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAActivityType",
+                        "writable": true
+                    },
+                    "pa-caq-strength": {
+                        "blurb": "Content Adaptive Quantization strength for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "medium (1)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPACAQStrength",
+                        "writable": true
+                    },
+                    "pa-frame-sad": {
+                        "blurb": "Enable Frame SAD algorithm",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-hqmb-mode": {
+                        "blurb": "Set the PA high motion quality boost mode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAHQMBMode",
+                        "writable": true
+                    },
+                    "pa-initial-qp": {
+                        "blurb": "The QP value that is used immediately after a scene change",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "pa-lookahead-buffer-depth": {
+                        "blurb": "Set the PA lookahead buffer size",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "41",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "pa-ltr": {
+                        "blurb": "Enable long term reference frame management",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-max-qp": {
+                        "blurb": "The QP threshold to allow a skip frame",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "35",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "pa-paq-mode": {
+                        "blurb": "Set the perceptual adaptive quantization mode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAPAQMode",
+                        "writable": true
+                    },
+                    "pa-scene-change-detection": {
+                        "blurb": "Enable scene change detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-scene-change-detection-sensitivity": {
+                        "blurb": "Set the sensitivity of scene change detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "medium (1)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPASceneChangeDetectionSensitivity",
+                        "writable": true
+                    },
+                    "pa-static-scene-detection": {
+                        "blurb": "Enable static scene detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-static-scene-detection-sensitivity": {
+                        "blurb": "Set the sensitivity of static scene detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "high (2)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAStaticSceneDetectionSensitivity",
+                        "writable": true
+                    },
+                    "pa-taq-mode": {
+                        "blurb": "Set the temporal adaptive quantization mode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPATAQMode",
+                        "writable": true
+                    },
+                    "pre-analysis": {
+                        "blurb": "Enable pre-analysis",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pre-encode": {
+                        "blurb": "Enable pre-encode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "preset": {
                         "blurb": "Preset",
                         "conditionally-available": false,
@@ -662,6 +2628,18 @@
                         "type": "guint",
                         "writable": true
                     },
+                    "smart-access-video": {
+                        "blurb": "Enable AMF SmartAccess Video feature for optimal distribution between multiple AMD hardware instances",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "usage": {
                         "blurb": "Target usage",
                         "conditionally-available": false,
@@ -695,12 +2673,12 @@
                 "klass": "Codec/Encoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: NV12\n          width:  128, 4096 \n         height:  128, 4096 \nvideo/x-raw:\n         format: NV12\n          width:  128, 4096 \n         height:  128, 4096 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { NV12, P010_10LE }\n          width:  128, 4096 \n         height:  128, 4096 \nvideo/x-raw:\n         format: { NV12, P010_10LE }\n          width:  128, 4096 \n         height:  128, 4096 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-h265:\n          width:  128, 4096 \n         height:  128, 4096 \n        profile: main\n  stream-format: byte-stream\n      alignment: au\n",
+                        "caps": "video/x-h265:\n          width:  128, 4096 \n         height:  128, 4096 \n        profile: { (string)main, (string)main-10 }\n  stream-format: byte-stream\n      alignment: au\n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -830,6 +2808,204 @@
                         "type": "gint",
                         "writable": true
                     },
+                    "pa-activity-type": {
+                        "blurb": "Set the type of activity analysis for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "y (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAActivityType",
+                        "writable": true
+                    },
+                    "pa-caq-strength": {
+                        "blurb": "Content Adaptive Quantization strength for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "medium (1)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPACAQStrength",
+                        "writable": true
+                    },
+                    "pa-frame-sad": {
+                        "blurb": "Enable Frame SAD algorithm",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-hqmb-mode": {
+                        "blurb": "Set the PA high motion quality boost mode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAHQMBMode",
+                        "writable": true
+                    },
+                    "pa-initial-qp": {
+                        "blurb": "The QP value that is used immediately after a scene change",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "pa-lookahead-buffer-depth": {
+                        "blurb": "Set the PA lookahead buffer size",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "41",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "pa-ltr": {
+                        "blurb": "Enable long term reference frame management",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-max-qp": {
+                        "blurb": "The QP threshold to allow a skip frame",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "35",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "pa-paq-mode": {
+                        "blurb": "Set the perceptual adaptive quantization mode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAPAQMode",
+                        "writable": true
+                    },
+                    "pa-scene-change-detection": {
+                        "blurb": "Enable scene change detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-scene-change-detection-sensitivity": {
+                        "blurb": "Set the sensitivity of scene change detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "medium (1)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPASceneChangeDetectionSensitivity",
+                        "writable": true
+                    },
+                    "pa-static-scene-detection": {
+                        "blurb": "Enable static scene detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pa-static-scene-detection-sensitivity": {
+                        "blurb": "Set the sensitivity of static scene detection for pre-analysis",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "high (2)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPAStaticSceneDetectionSensitivity",
+                        "writable": true
+                    },
+                    "pa-taq-mode": {
+                        "blurb": "Set the temporal adaptive quantization mode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAmfEncPATAQMode",
+                        "writable": true
+                    },
+                    "pre-analysis": {
+                        "blurb": "Enable pre-analysis",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pre-encode": {
+                        "blurb": "Enable pre-encode",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "preset": {
                         "blurb": "Preset",
                         "conditionally-available": false,
@@ -896,6 +3072,18 @@
                         "type": "guint",
                         "writable": true
                     },
+                    "smart-access-video": {
+                        "blurb": "Enable AMF SmartAccess Video feature for optimal distribution between multiple AMD hardware instances",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "usage": {
                         "blurb": "Target usage",
                         "conditionally-available": false,
@@ -915,6 +3103,206 @@
         "filename": "gstamfcodec",
         "license": "LGPL",
         "other-types": {
+            "GstAmfAv1EncPreset": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Default, depends on USAGE",
+                        "name": "default",
+                        "value": "-1"
+                    },
+                    {
+                        "desc": "High quality",
+                        "name": "high-quality",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Quality",
+                        "name": "quality",
+                        "value": "30"
+                    },
+                    {
+                        "desc": "Balanced",
+                        "name": "balanced",
+                        "value": "70"
+                    },
+                    {
+                        "desc": "Speed",
+                        "name": "speed",
+                        "value": "100"
+                    }
+                
+            },
+            "GstAmfAv1EncRateControl": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Default, depends on Usage",
+                        "name": "default",
+                        "value": "-1"
+                    },
+                    {
+                        "desc": "Constant QP",
+                        "name": "cqp",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Latency Constrained VBR",
+                        "name": "lcvbr",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Peak Constrained VBR",
+                        "name": "vbr",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "Constant Bitrate",
+                        "name": "cbr",
+                        "value": "3"
+                    }
+                
+            },
+            "GstAmfAv1EncUsage": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Transcoding",
+                        "name": "transcoding",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Low Latency",
+                        "name": "low-latency",
+                        "value": "1"
+                    }
+                
+            },
+            "GstAmfEncPAActivityType": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Luma (Y) component only",
+                        "name": "y",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Luma and Chroma components (YUV)",
+                        "name": "yuv",
+                        "value": "1"
+                    }
+                
+            },
+            "GstAmfEncPACAQStrength": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Low",
+                        "name": "low",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Medium",
+                        "name": "medium",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "High",
+                        "name": "high",
+                        "value": "2"
+                    }
+                
+            },
+            "GstAmfEncPAHQMBMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "None",
+                        "name": "none",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Auto",
+                        "name": "auto",
+                        "value": "1"
+                    }
+                
+            },
+            "GstAmfEncPAPAQMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "None",
+                        "name": "none",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Content Adaptive Quantization (CAQ) mode",
+                        "name": "caq",
+                        "value": "1"
+                    }
+                
+            },
+            "GstAmfEncPASceneChangeDetectionSensitivity": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Low",
+                        "name": "low",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Medium",
+                        "name": "medium",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "High",
+                        "name": "high",
+                        "value": "2"
+                    }
+                
+            },
+            "GstAmfEncPAStaticSceneDetectionSensitivity": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Low",
+                        "name": "low",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Medium",
+                        "name": "medium",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "High",
+                        "name": "high",
+                        "value": "2"
+                    }
+                
+            },
+            "GstAmfEncPATAQMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "None",
+                        "name": "none",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Mode_1 is suitable for non-gaming applications",
+                        "name": "mode1",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Mode_2 is suitable for gaming applications",
+                        "name": "mode2",
+                        "value": "2"
+                    }
+                
+            },
             "GstAmfEncoder": {
                 "hierarchy": 
                     "GstAmfEncoder",
@@ -1095,6 +3483,87 @@
         "tracers": {},
         "url": "Unknown package origin"
     },
+    "analyticsoverlay": {
+        "description": "Analytics-meta overlay elements",
+        "elements": {
+            "objectdetectionoverlay": {
+                "author": "Daniel Morin",
+                "description": "Overlay a visual representation of analytics metadata on the video",
+                "hierarchy": 
+                    "GstObjectDetectionOverlay",
+                    "GstVideoFilter",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Analyzer/Visualization/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "draw-labels": {
+                        "blurb": "Draw object labels",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "labels-color": {
+                        "blurb": "Color (ARGB) to use for object labels",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "object-detection-outline-color": {
+                        "blurb": "Color (ARGB) to use for object detection overlay outline",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            }
+        },
+        "filename": "gstanalyticsoverlay",
+        "license": "LGPL",
+        "other-types": {},
+        "package": "GStreamer Bad Plug-ins",
+        "source": "gst-plugins-bad",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
     "aom": {
         "description": "AOM plugin library",
         "elements": {
@@ -2621,7 +5090,7 @@
                 "long-name": "ASS/SSA Render",
                 "pad-templates": {
                     "src": {
-                        "caps": "video/x-raw:\n         format: { BGRx, RGBx, xRGB, xBGR, RGBA, BGRA, ARGB, ABGR, RGB, BGR, I420, YV12, AYUV, YUY2, UYVY, v308, Y41B, Y42B, Y444, NV12, NV21, A420, YUV9, YVU9, IYU1, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { BGRx, RGBx, xRGB, xBGR, RGBA, BGRA, ARGB, ABGR, RGB, BGR, I420, YV12, AYUV, YUY2, UYVY, v308, Y41B, Y42B, Y444, NV12, NV21, A420, YUV9, YVU9, IYU1, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { DMA_DRM, A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     },
@@ -2631,7 +5100,7 @@
                         "presence": "always"
                     },
                     "video_sink": {
-                        "caps": "video/x-raw:\n         format: { BGRx, RGBx, xRGB, xBGR, RGBA, BGRA, ARGB, ABGR, RGB, BGR, I420, YV12, AYUV, YUY2, UYVY, v308, Y41B, Y42B, Y444, NV12, NV21, A420, YUV9, YVU9, IYU1, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { BGRx, RGBx, xRGB, xBGR, RGBA, BGRA, ARGB, ABGR, RGB, BGR, I420, YV12, AYUV, YUY2, UYVY, v308, Y41B, Y42B, Y444, NV12, NV21, A420, YUV9, YVU9, IYU1, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { DMA_DRM, A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     }
@@ -3346,6 +5815,7 @@
                 "description": "Selects the right transform element based on the caps",
                 "hierarchy": 
                     "GstAutoConvert",
+                    "GstBaseAutoConvert",
                     "GstBin",
                     "GstElement",
                     "GstObject",
@@ -3380,15 +5850,95 @@
                         "readable": true,
                         "type": "gpointer",
                         "writable": true
+                    },
+                    "factory-names": {
+                        "blurb": "Names of the GstElementFactory to be used to automatically plug elements.",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstValueArray",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "autodeinterlace": {
+                "author": "Thibault Saunier <tsaunier@igalia.com>",
+                "description": "Selects the right deinterlacer based on caps",
+                "hierarchy": 
+                    "GstAutoDeinterlace",
+                    "GstBaseAutoConvert",
+                    "GstBin",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstChildProxy"
+                ,
+                "klass": "Bin/Colorspace/Scale/Video/Converter/Deinterlace",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "ANY",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "ANY",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "fields": {
+                        "blurb": "Fields to use for deinterlacing. Note that if the underlying implementation doesn't support the property it will be ignored.",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "all (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAutoDeinterlaceFields",
+                        "writable": true
+                    },
+                    "layout": {
+                        "blurb": "Layout to use Note that if the underlying implementation doesn't support the property it will be ignored.",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "auto (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAutoDeinterlaceFieldLayout",
+                        "writable": true
+                    },
+                    "mode": {
+                        "blurb": "Deinterlace Mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "auto (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstAutoDeinterlaceModes",
+                        "writable": true
                     }
                 },
                 "rank": "none"
             },
             "autovideoconvert": {
-                "author": "Benjamin Gaignard <benjamin.gaignard@stericsson.com>",
+                "author": "Thibault Saunier <tsaunier@igalia.com>",
                 "description": "Selects the right color space converter based on the caps",
                 "hierarchy": 
                     "GstAutoVideoConvert",
+                    "GstBaseAutoConvert",
                     "GstBin",
                     "GstElement",
                     "GstObject",
@@ -3398,7 +5948,7 @@
                 "interfaces": 
                     "GstChildProxy"
                 ,
-                "klass": "Generic/Bin",
+                "klass": "Bin/Colorspace/Scale/Video/Converter",
                 "long-name": "Select color space converter based on caps",
                 "pad-templates": {
                     "sink": {
@@ -3414,11 +5964,140 @@
                 },
                 "properties": {},
                 "rank": "none"
+            },
+            "autovideoflip": {
+                "author": "Thibault Saunier <tsaunier@igalia.com>",
+                "description": "Selects the right video flip element based on the caps",
+                "hierarchy": 
+                    "GstAutoVideoFlip",
+                    "GstBaseAutoConvert",
+                    "GstBin",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstChildProxy"
+                ,
+                "klass": "Bin/Filter/Effect/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "ANY",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "ANY",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "video-direction": {
+                        "blurb": "Video direction: rotation and flipping",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "identity (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstVideoOrientationMethod",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
             }
         },
         "filename": "gstautoconvert",
         "license": "LGPL",
-        "other-types": {},
+        "other-types": {
+            "GstAutoDeinterlaceFieldLayout": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Auto detection",
+                        "name": "auto",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Top field first",
+                        "name": "tff",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Bottom field first",
+                        "name": "bff",
+                        "value": "2"
+                    }
+                
+            },
+            "GstAutoDeinterlaceFields": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "All fields",
+                        "name": "all",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Top fields only",
+                        "name": "top",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Bottom fields only",
+                        "name": "bottom",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "Automatically detect",
+                        "name": "auto",
+                        "value": "3"
+                    }
+                
+            },
+            "GstAutoDeinterlaceModes": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Auto detection (best effort)",
+                        "name": "auto",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Force deinterlacing",
+                        "name": "interlaced",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Run in passthrough mode",
+                        "name": "disabled",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "Auto detection (strict)",
+                        "name": "auto-strict",
+                        "value": "3"
+                    }
+                
+            },
+            "GstBaseAutoConvert": {
+                "hierarchy": 
+                    "GstBaseAutoConvert",
+                    "GstBin",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstChildProxy"
+                ,
+                "kind": "object"
+            }
+        },
         "package": "GStreamer Bad Plug-ins",
         "source": "gst-plugins-bad",
         "tracers": {},
@@ -3560,6 +6239,7 @@
                 "description": "Extracts compressed video from CVF AVTPDUs",
                 "hierarchy": 
                     "GstAvtpCvfDepay",
+                    "GstAvtpVfDepayBase",
                     "GstAvtpBaseDepayload",
                     "GstElement",
                     "GstObject",
@@ -3582,6 +6262,7 @@
                 "description": "Payload-encode compressed video into CVF AVTPDU (IEEE 1722)",
                 "hierarchy": 
                     "GstAvtpCvfPay",
+                    "GstAvtpVfPayBase",
                     "GstAvtpBasePayload",
                     "GstElement",
                     "GstObject",
@@ -3597,48 +6278,50 @@
                         "presence": "always"
                     }
                 },
-                "properties": {
-                    "max-interval-frames": {
-                        "blurb": "Maximum number of network frames to be sent on each Measurement Interval",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "1",
-                        "max": "-1",
-                        "min": "1",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "guint",
-                        "writable": true
-                    },
-                    "measurement-interval": {
-                        "blurb": "Measurement interval of stream in nanoseconds",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "250000",
-                        "max": "18446744073709551615",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "guint64",
-                        "writable": true
-                    },
-                    "mtu": {
-                        "blurb": "Maximum Transit Unit (MTU) of underlying network in bytes",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "1500",
-                        "max": "-1",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "guint",
-                        "writable": true
+                "rank": "none"
+            },
+            "avtprvfdepay": {
+                "author": "Adrian Fiergolski <Adrian.Fiergolski@fastree3d.com>",
+                "description": "Extracts raw video from RVF AVTPDUs",
+                "hierarchy": 
+                    "GstAvtpRvfDepay",
+                    "GstAvtpVfDepayBase",
+                    "GstAvtpBaseDepayload",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Codec/Depayloader/Network/AVTP",
+                "long-name": "AVTP Raw Video Format (RVF) depayloader",
+                "pad-templates": {
+                    "src": {
+                        "caps": "video/x-raw:\n         format: { GRAY16_LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            },
+            "avtprvfpay": {
+                "author": "Adrian Fiergolski <Adrian.Fiergolski@fastree3d.com>",
+                "description": "Payload-encode raw video into RVF AVTPDU (IEEE 1722)",
+                "hierarchy": 
+                    "GstAvtpRvfPay",
+                    "GstAvtpVfPayBase",
+                    "GstAvtpBasePayload",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Codec/Payloader/Network/AVTP",
+                "long-name": "AVTP Raw Video Format (RVF) payloader",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw:\n         format: { GRAY16_LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "sink",
+                        "presence": "always"
                     }
                 },
                 "rank": "none"
@@ -3917,6 +6600,72 @@
                         "writable": true
                     }
                 }
+            },
+            "GstAvtpVfDepayBase": {
+                "hierarchy": 
+                    "GstAvtpVfDepayBase",
+                    "GstAvtpBaseDepayload",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "kind": "object"
+            },
+            "GstAvtpVfPayBase": {
+                "hierarchy": 
+                    "GstAvtpVfPayBase",
+                    "GstAvtpBasePayload",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "kind": "object",
+                "properties": {
+                    "max-interval-frames": {
+                        "blurb": "Maximum number of network frames to be sent on each Measurement Interval",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "-1",
+                        "min": "1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "measurement-interval": {
+                        "blurb": "Measurement interval of stream in nanoseconds",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "250000",
+                        "max": "18446744073709551615",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint64",
+                        "writable": true
+                    },
+                    "mtu": {
+                        "blurb": "Maximum Transit Unit (MTU) of underlying network in bytes",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1500",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    }
+                }
             }
         },
         "package": "GStreamer Bad Plug-ins",
@@ -3942,12 +6691,12 @@
                 "long-name": "Bayer to RGB decoder for cameras",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-bayer:\n         format: { bggr, grbg, gbrg, rggb }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-bayer:\n         format: { bggr, rggb, grbg, gbrg, bggr10le, rggb10le, grbg10le, gbrg10le, bggr10be, rggb10be, grbg10be, gbrg10be, bggr12le, rggb12le, grbg12le, gbrg12le, bggr12be, rggb12be, grbg12be, gbrg12be, bggr14le, rggb14le, grbg14le, gbrg14le, bggr14be, rggb14be, grbg14be, gbrg14be, bggr16le, rggb16le, grbg16le, gbrg16le, bggr16be, rggb16be, grbg16be, gbrg16be }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n         format: { RGBx, xRGB, BGRx, xBGR, RGBA, ARGB, BGRA, ABGR }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { RGBx, xRGB, BGRx, xBGR, RGBA, ARGB, BGRA, ABGR, RGBA64_LE, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -3975,7 +6724,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-bayer:\n         format: { bggr, gbrg, grbg, rggb }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-bayer:\n         format: { bggr, rggb, grbg, gbrg, bggr10le, rggb10le, grbg10le, gbrg10le, bggr10be, rggb10be, grbg10be, gbrg10be, bggr12le, rggb12le, grbg12le, gbrg12le, bggr12be, rggb12be, grbg12be, gbrg12be, bggr14le, rggb14le, grbg14le, gbrg14le, bggr14be, rggb14be, grbg14be, gbrg14be, bggr16le, rggb16le, grbg16le, gbrg16le, bggr16be, rggb16be, grbg16be, gbrg16be }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -4178,7 +6927,7 @@
         "url": "Unknown package origin"
     },
     "bs2b": {
-        "description": "Improve headphone listening of stereo audio recordsusing the bs2b library.",
+        "description": "Improve headphone listening of stereo audio records using the bs2b library.",
         "elements": {
             "bs2b": {
                 "author": "Christoph Reiter <reiter.christoph@gmail.com>",
@@ -4962,12 +7711,12 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     },
                     "video_sink": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     }
@@ -5116,12 +7865,12 @@
                 "long-name": "Closed Caption Converter",
                 "pad-templates": {
                     "sink": {
-                        "caps": "closedcaption/x-cea-708:\n         format: cdp\nclosedcaption/x-cea-708:\n         format: cc_data\nclosedcaption/x-cea-608:\n         format: s334-1a\nclosedcaption/x-cea-608:\n         format: raw\n",
+                        "caps": "closedcaption/x-cea-708:\n         format: cdp\nclosedcaption/x-cea-708:\n         format: cc_data\nclosedcaption/x-cea-608:\n         format: s334-1a\nclosedcaption/x-cea-608:\n         format: raw\n          field: { (int)0, (int)1 }\n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "closedcaption/x-cea-708:\n         format: cdp\nclosedcaption/x-cea-708:\n         format: cc_data\nclosedcaption/x-cea-608:\n         format: s334-1a\nclosedcaption/x-cea-608:\n         format: raw\n",
+                        "caps": "closedcaption/x-cea-708:\n         format: cdp\nclosedcaption/x-cea-708:\n         format: cc_data\nclosedcaption/x-cea-608:\n         format: s334-1a\nclosedcaption/x-cea-608:\n         format: raw\n          field: { (int)0, (int)1 }\n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -5188,6 +7937,40 @@
                 "rank": "none",
                 "signals": {}
             },
+            "cea608mux": {
+                "author": "Mathieu Duponchelle <mathieu@centricular.com>",
+                "description": "Combines raw 608 streams",
+                "hierarchy": 
+                    "GstCea608Mux",
+                    "GstAggregator",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Aggregator",
+                "pad-templates": {
+                    "cc1": {
+                        "caps": "closedcaption/x-cea-608:\n         format: raw\n          field: 0\n",
+                        "direction": "sink",
+                        "presence": "request",
+                        "type": "GstAggregatorPad"
+                    },
+                    "cc3": {
+                        "caps": "closedcaption/x-cea-608:\n         format: raw\n          field: 1\n",
+                        "direction": "sink",
+                        "presence": "request",
+                        "type": "GstAggregatorPad"
+                    },
+                    "src": {
+                        "caps": "closedcaption/x-cea-608:\n         format: s334-1a\n      framerate: { (fraction)60/1, (fraction)60000/1001, (fraction)50/1, (fraction)30/1, (fraction)30000/1001, (fraction)25/1, (fraction)24/1, (fraction)24000/1001 }\n",
+                        "direction": "src",
+                        "presence": "always",
+                        "type": "GstAggregatorPad"
+                    }
+                },
+                "rank": "none"
+            },
             "line21decoder": {
                 "author": "Edward Hervey <edward@centricular.com>",
                 "description": "Extract line21 CC from SD video streams",
@@ -5359,6 +8142,118 @@
         "tracers": {},
         "url": "Unknown package origin"
     },
+    "codec2json": {
+        "description": "Plugin with feature to annotate and format CODEC bitstream in JSON",
+        "elements": {
+            "av12json": {
+                "author": "Benjamin Gaignard <benjamin.gaignard@collabora.com>",
+                "description": "AV1 to json element",
+                "hierarchy": 
+                    "GstAV12json",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Transform",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-av1:\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "text/x-json:\n         format: av1\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            },
+            "h2642json": {
+                "author": "Benjamin Gaignard <benjamin.gaignard@collabora.com>",
+                "description": "H264 to json element",
+                "hierarchy": 
+                    "GstH2642json",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Transform",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-h264:\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "text/x-json:\n         format: h264\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            },
+            "h2652json": {
+                "author": "Benjamin Gaignard <benjamin.gaignard@collabora.com>",
+                "description": "H265 to json element",
+                "hierarchy": 
+                    "GstH2652json",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Transform",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-h265:\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "text/x-json:\n         format: h265\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            },
+            "vp82json": {
+                "author": "Benjamin Gaignard <benjamin.gaignard@collabora.com>",
+                "description": "VP8 to json element",
+                "hierarchy": 
+                    "GstVp82json",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Transform",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-vp8:\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "text/x-json:\n         format: vp8\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            }
+        },
+        "filename": "gstcodec2json",
+        "license": "LGPL",
+        "other-types": {},
+        "package": "GStreamer Bad Plug-ins",
+        "source": "gst-plugins-bad",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
     "codecalpha": {
         "description": "CODEC Alpha Utilities",
         "elements": {
@@ -5376,17 +8271,17 @@
                 "long-name": "Alpha Combiner",
                 "pad-templates": {
                     "alpha": {
-                        "caps": "video/x-raw:\n         format: { GRAY8, I420, NV12 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { GRAY8, I420, I420_10LE, NV12 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "sink": {
-                        "caps": "video/x-raw:\n         format: { I420, NV12 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { I420, I420_10LE, NV12 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n         format: { A420, AV12 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A420, A420_10LE, AV12 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -5524,7 +8419,7 @@
                     "GInitiallyUnowned",
                     "GObject"
                 ,
-                "klass": "Codec/Video",
+                "klass": "Codec/Video/Timestamper",
                 "long-name": "H.264 timestamper",
                 "pad-templates": {
                     "sink": {
@@ -5538,7 +8433,7 @@
                         "presence": "always"
                     }
                 },
-                "rank": "none"
+                "rank": "marginal"
             },
             "h265timestamper": {
                 "author": "Seungha Yang <seungha@centricular.com>",
@@ -5551,7 +8446,7 @@
                     "GInitiallyUnowned",
                     "GObject"
                 ,
-                "klass": "Codec/Video",
+                "klass": "Codec/Video/Timestamper",
                 "long-name": "H.265 timestamper",
                 "pad-templates": {
                     "sink": {
@@ -5565,7 +8460,7 @@
                         "presence": "always"
                     }
                 },
-                "rank": "none"
+                "rank": "marginal"
             }
         },
         "filename": "gstcodectimestamper",
@@ -7365,6 +10260,7 @@
                 "description": "Direct3D11/DXVA based AV1 video decoder",
                 "hierarchy": 
                     "GstD3D11AV1Dec",
+                    "GstDxvaAV1Decoder",
                     "GstAV1Decoder",
                     "GstVideoDecoder",
                     "GstElement",
@@ -7447,17 +10343,29 @@
                 "klass": "Filter/Converter/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
                 },
                 "properties": {
+                    "dest-alpha-mode": {
+                        "blurb": "Output alpha mode to be applied",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "unspecified (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstD3D11AlphaMode",
+                        "writable": true
+                    },
                     "gamma-mode": {
                         "blurb": "Gamma conversion mode",
                         "conditionally-available": false,
@@ -7481,6 +10389,18 @@
                         "readable": true,
                         "type": "GstVideoPrimariesMode",
                         "writable": true
+                    },
+                    "src-alpha-mode": {
+                        "blurb": "Applied input alpha mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "unspecified (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstD3D11AlphaMode",
+                        "writable": true
                     }
                 },
                 "rank": "none"
@@ -7503,7 +10423,7 @@
                 "klass": "Filter/Editor/Video/Compositor",
                 "pad-templates": {
                     "sink_%%u": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "request",
                         "type": "GstD3D11CompositorPad"
@@ -7541,13 +10461,25 @@
                         "readable": true,
                         "type": "GstD3D11CompositorBackground",
                         "writable": true
+                    },
+                    "ignore-inactive-pads": {
+                        "blurb": "Avoid timing out waiting for inactive pads",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
                     }
                 },
                 "rank": "secondary"
             },
             "d3d11convert": {
                 "author": "Seungha Yang <seungha.yang@navercorp.com>, Jeongki Kim <jeongki.kim@jeongki.kim>",
-                "description": "Resizes video and allow color conversion using Direct3D11",
+                "description": "Performs resizing, colorspace conversion, cropping, and flipping/rotating using Direct3D11",
                 "hierarchy": 
                     "GstD3D11Convert",
                     "GstD3D11BaseConvert",
@@ -7564,12 +10496,12 @@
                 "klass": "Filter/Converter/Scaler/Effect/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -7601,6 +10533,32 @@
                         "type": "guint64",
                         "writable": true
                     },
+                    "dest-alpha-mode": {
+                        "blurb": "Output alpha mode to be applied",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "unspecified (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstD3D11AlphaMode",
+                        "writable": true
+                    },
+                    "fov": {
+                        "blurb": "Field of view angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "90",
+                        "max": "3.40282e+38",
+                        "min": "0",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
                     "gamma-mode": {
                         "blurb": "Gamma conversion mode",
                         "conditionally-available": false,
@@ -7613,6 +10571,30 @@
                         "type": "GstVideoGammaMode",
                         "writable": true
                     },
+                    "msaa": {
+                        "blurb": "MSAA (Multi-Sampling Anti-Aliasing) level. This value will be ignored if device does not support the specified level for negotiated output format",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "disabled (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstD3D11MSAAMode",
+                        "writable": true
+                    },
+                    "ortho": {
+                        "blurb": "Use orthographic projection",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "primaries-mode": {
                         "blurb": "Primaries conversion mode",
                         "conditionally-available": false,
@@ -7624,6 +10606,88 @@
                         "readable": true,
                         "type": "GstVideoPrimariesMode",
                         "writable": true
+                    },
+                    "rotation-x": {
+                        "blurb": "x-axis rotation angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "rotation-y": {
+                        "blurb": "y-axis rotation angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "rotation-z": {
+                        "blurb": "z-axis rotation angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "scale-x": {
+                        "blurb": "Scale multiplier for x-axis",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "scale-y": {
+                        "blurb": "Scale multiplier for y-axis",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "src-alpha-mode": {
+                        "blurb": "Applied input alpha mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "unspecified (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstD3D11AlphaMode",
+                        "writable": true
                     }
                 },
                 "rank": "none"
@@ -7645,12 +10709,12 @@
                 "klass": "Filter/Effect/Video/Deinterlace/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -7846,12 +10910,12 @@
                 "klass": "Filter/Video",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -7863,6 +10927,7 @@
                 "description": "Direct3D11/DXVA based H.264 video decoder",
                 "hierarchy": 
                     "GstD3D11H264Dec",
+                    "GstDxvaH264Decoder",
                     "GstH264Decoder",
                     "GstVideoDecoder",
                     "GstElement",
@@ -7934,6 +10999,7 @@
                 "description": "Direct3D11/DXVA based H.265 video decoder",
                 "hierarchy": 
                     "GstD3D11H265Dec",
+                    "GstDxvaH265Decoder",
                     "GstH265Decoder",
                     "GstVideoDecoder",
                     "GstElement",
@@ -8000,11 +11066,150 @@
                 },
                 "rank": "primary + 1"
             },
+            "d3d11ipcsink": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Sends Direct3D11 shared handle to peer d3d11ipcsrc elements",
+                "hierarchy": 
+                    "GstD3D11IpcSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Sink/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "adapter": {
+                        "blurb": "DXGI adapter index (-1 for default)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "2147483647",
+                        "min": "-1",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "min-buffer-size": {
+                        "blurb": "Minumum number of buffers",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "pipe-name": {
+                        "blurb": "The name of Win32 named pipe to communicate with clients. Validation of the pipe name is caller's responsibility",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "\\\\.\\pipe\\gst.d3d11.ipc",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d11ipcsrc": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Receives Direct3D11 shared handle from the d3d11ipcsink element",
+                "hierarchy": 
+                    "GstD3D11IpcSrc",
+                    "GstBaseSrc",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Source/Video",
+                "pad-templates": {
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "connection-timeout": {
+                        "blurb": "Connection timeout in seconds (0 = never timeout)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "5",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "io-mode": {
+                        "blurb": "Memory I/O mode to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "copy (0)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GstD3D11IpcIOMode",
+                        "writable": true
+                    },
+                    "pipe-name": {
+                        "blurb": "The name of Win32 named pipe to communicate with clients. Validation of the pipe name is caller's responsibility",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "\\\\.\\pipe\\gst.d3d11.ipc",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "processing-deadline": {
+                        "blurb": "Maximum processing time for a buffer in nanoseconds",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "20000000",
+                        "max": "18446744073709551615",
+                        "min": "0",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "guint64",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
             "d3d11mpeg2dec": {
                 "author": "Seungha Yang <seungha@centricular.com>",
                 "description": "Direct3D11/DXVA based MPEG2 video decoder",
                 "hierarchy": 
                     "GstD3D11Mpeg2Dec",
+                    "GstDxvaMpeg2Decoder",
                     "GstMpeg2Decoder",
                     "GstVideoDecoder",
                     "GstElement",
@@ -8069,7 +11274,68 @@
                         "writable": false
                     }
                 },
-                "rank": "secondary"
+                "rank": "primary + 1"
+            },
+            "d3d11overlay": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Provides application renderable Direct3D11 render target view",
+                "hierarchy": 
+                    "GstD3D11Overlay",
+                    "GstD3D11BaseFilter",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Filter/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { BGRA, RGBA }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { BGRA, RGBA }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none",
+                "signals": {
+                    "caps-changed": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GstCaps"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
+                    "draw": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GstObject"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gpointer"
+                            },
+                            {
+                                "name": "arg2",
+                                "type": "guint64"
+                            },
+                            {
+                                "name": "arg3",
+                                "type": "guint64"
+                            }
+                        ,
+                        "return-type": "gboolean",
+                        "when": "last"
+                    }
+                }
             },
             "d3d11scale": {
                 "author": "Seungha Yang <seungha@centricular.com>",
@@ -8087,12 +11353,12 @@
                 "klass": "Filter/Converter/Video/Scaler/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -8141,7 +11407,7 @@
                 "klass": "Source/Video",
                 "pad-templates": {
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: BGRA\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \npixel-aspect-ratio: 1/1\nvideo/x-raw:\n         format: BGRA\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \npixel-aspect-ratio: 1/1\n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: BGRA\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \npixel-aspect-ratio: 1/1\n    colorimetry: sRGB\nvideo/x-raw:\n         format: BGRA\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \npixel-aspect-ratio: 1/1\n    colorimetry: sRGB\n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -8281,6 +11547,18 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "window-capture-mode": {
+                        "blurb": "Window capture mode to use if \"window-handle\" is set",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GstD3D11WindowCaptureMode",
+                        "writable": true
+                    },
                     "window-handle": {
                         "blurb": "A HWND handle of window to capture",
                         "conditionally-available": true,
@@ -8312,7 +11590,7 @@
                 "klass": "Source/Video",
                 "pad-templates": {
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -8332,6 +11610,32 @@
                         "type": "gint",
                         "writable": true
                     },
+                    "alpha": {
+                        "blurb": "Global alpha value to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "alpha-mode": {
+                        "blurb": "alpha mode to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "unspecified (0)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GstD3D11AlphaMode",
+                        "writable": true
+                    },
                     "is-live": {
                         "blurb": "Whether to act as a live source",
                         "conditionally-available": false,
@@ -8374,12 +11678,12 @@
                 "klass": "Filter/Video",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -8405,7 +11709,7 @@
                 "klass": "Sink/Video",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, YUY2, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8, v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, RGB15, BGR15 }\n          width:  1, 16384 \n         height:  1, 16384 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     }
@@ -8485,6 +11789,20 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "fov": {
+                        "blurb": "Field of view angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "90",
+                        "max": "3.40282e+38",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
                     "fullscreen": {
                         "blurb": "Ignored when \"fullscreen-toggle-mode\" does not include \"property\"",
                         "conditionally-available": false,
@@ -8521,6 +11839,30 @@
                         "type": "GstVideoGammaMode",
                         "writable": true
                     },
+                    "msaa": {
+                        "blurb": "MSAA (Multi-Sampling Anti-Aliasing) level",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "disabled (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstD3D11MSAAMode",
+                        "writable": true
+                    },
+                    "ortho": {
+                        "blurb": "Use orthographic projection",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "primaries-mode": {
                         "blurb": "Primaries conversion mode",
                         "conditionally-available": false,
@@ -8533,6 +11875,29 @@
                         "type": "GstVideoPrimariesMode",
                         "writable": true
                     },
+                    "redraw-on-update": {
+                        "blurb": "Immediately apply updated geometry related properties and redraw. If disabled, properties will be applied on the next frame or window resize",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "render-rectangle": {
+                        "blurb": "The render rectangle ('<x, y, width, height>')",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "mutable": "null",
+                        "readable": false,
+                        "type": "GstValueArray",
+                        "writable": true
+                    },
                     "rotate-method": {
                         "blurb": "Rotate method to use",
                         "conditionally-available": false,
@@ -8544,6 +11909,88 @@
                         "readable": true,
                         "type": "GstVideoOrientationMethod",
                         "writable": true
+                    },
+                    "rotation-x": {
+                        "blurb": "x-axis rotation angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "rotation-y": {
+                        "blurb": "y-axis rotation angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "rotation-z": {
+                        "blurb": "z-axis rotation angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "sampling-method": {
+                        "blurb": "Sampler filter type to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "bilinear (1)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GstD3D11SamplingMethod",
+                        "writable": true
+                    },
+                    "scale-x": {
+                        "blurb": "Scale multiplier for x-axis",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "scale-y": {
+                        "blurb": "Scale multiplier for y-axis",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
                     }
                 },
                 "rank": "primary",
@@ -8590,13 +12037,1915 @@
                         "return-type": "void",
                         "when": "last"
                     }
-                }
+                }
+            },
+            "d3d11vp8dec": {
+                "author": "Seungha Yang <seungha.yang@navercorp.com>",
+                "description": "Direct3D11/DXVA based VP8 video decoder",
+                "hierarchy": 
+                    "GstD3D11Vp8Dec",
+                    "GstDxvaVp8Decoder",
+                    "GstVp8Decoder",
+                    "GstVideoDecoder",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Codec/Decoder/Video/Hardware",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-vp8:\n          width:  1, 4096 \n         height:  1, 4096 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: NV12\n          width:  1, 4096 \n         height:  1, 4096 \nvideo/x-raw:\n         format: NV12\n          width:  1, 4096 \n         height:  1, 4096 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "adapter-luid": {
+                        "blurb": "DXGI Adapter LUID (Locally Unique Identifier) of created device",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "9223372036854775807",
+                        "min": "-9223372036854775808",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint64",
+                        "writable": false
+                    },
+                    "device-id": {
+                        "blurb": "DXGI Device ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "vendor-id": {
+                        "blurb": "DXGI Vendor ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    }
+                },
+                "rank": "primary"
+            },
+            "d3d11vp9dec": {
+                "author": "Seungha Yang <seungha.yang@navercorp.com>",
+                "description": "Direct3D11/DXVA based VP9 video decoder",
+                "hierarchy": 
+                    "GstD3D11Vp9Dec",
+                    "GstDxvaVp9Decoder",
+                    "GstVp9Decoder",
+                    "GstVideoDecoder",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Codec/Decoder/Video/Hardware",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-vp9:\n          width:  1, 16384 \n         height:  1, 16384 \n      alignment: frame\n        profile: { (string)0, (string)2 }\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { NV12, P010_10LE }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { NV12, P010_10LE }\n          width:  1, 16384 \n         height:  1, 16384 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "adapter-luid": {
+                        "blurb": "DXGI Adapter LUID (Locally Unique Identifier) of created device",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "9223372036854775807",
+                        "min": "-9223372036854775808",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint64",
+                        "writable": false
+                    },
+                    "device-id": {
+                        "blurb": "DXGI Device ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "vendor-id": {
+                        "blurb": "DXGI Vendor ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    }
+                },
+                "rank": "primary"
+            }
+        },
+        "filename": "gstd3d11",
+        "license": "LGPL",
+        "other-types": {
+            "GstD3D11AlphaMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Unspecified",
+                        "name": "unspecified",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Premultiplied",
+                        "name": "premultiplied",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Straight",
+                        "name": "straight",
+                        "value": "2"
+                    }
+                
+            },
+            "GstD3D11BaseConvert": {
+                "hierarchy": 
+                    "GstD3D11BaseConvert",
+                    "GstD3D11BaseFilter",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "kind": "object",
+                "properties": {
+                    "method": {
+                        "blurb": "Method used for sampling",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "bilinear (1)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstD3D11SamplingMethod",
+                        "writable": true
+                    }
+                }
+            },
+            "GstD3D11BaseFilter": {
+                "hierarchy": 
+                    "GstD3D11BaseFilter",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "kind": "object",
+                "properties": {
+                    "adapter": {
+                        "blurb": "Adapter index for creating device (-1 for default)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "2147483647",
+                        "min": "-1",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    }
+                }
+            },
+            "GstD3D11CompositorBackground": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Checker pattern",
+                        "name": "checker",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Black",
+                        "name": "black",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "White",
+                        "name": "white",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "Transparent Background to enable further compositing",
+                        "name": "transparent",
+                        "value": "3"
+                    }
+                
+            },
+            "GstD3D11CompositorOperator": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Source",
+                        "name": "source",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Over",
+                        "name": "over",
+                        "value": "1"
+                    }
+                
+            },
+            "GstD3D11CompositorPad": {
+                "hierarchy": 
+                    "GstD3D11CompositorPad",
+                    "GstVideoAggregatorPad",
+                    "GstAggregatorPad",
+                    "GstPad",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "kind": "object",
+                "properties": {
+                    "alpha": {
+                        "blurb": "Alpha of the picture",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "1",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gdouble",
+                        "writable": true
+                    },
+                    "gamma-mode": {
+                        "blurb": "Gamma conversion mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstVideoGammaMode",
+                        "writable": true
+                    },
+                    "height": {
+                        "blurb": "Height of the picture",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "2147483647",
+                        "min": "-2147483648",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "operator": {
+                        "blurb": "Blending operator to use for blending this pad over the previous ones",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "over (1)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstD3D11CompositorOperator",
+                        "writable": true
+                    },
+                    "primaries-mode": {
+                        "blurb": "Primaries conversion mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstVideoPrimariesMode",
+                        "writable": true
+                    },
+                    "sizing-policy": {
+                        "blurb": "Sizing policy to use for image scaling",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstD3D11CompositorSizingPolicy",
+                        "writable": true
+                    },
+                    "width": {
+                        "blurb": "Width of the picture",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "2147483647",
+                        "min": "-2147483648",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "xpos": {
+                        "blurb": "X position of the picture",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "2147483647",
+                        "min": "-2147483648",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "ypos": {
+                        "blurb": "Y position of the picture",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "2147483647",
+                        "min": "-2147483648",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    }
+                }
+            },
+            "GstD3D11CompositorSizingPolicy": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "None: Image is scaled to fill configured destination rectangle without padding or keeping the aspect ratio",
+                        "name": "none",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Keep Aspect Ratio: Image is scaled to fit destination rectangle specified by GstD3D11CompositorPad:{xpos, ypos, width, height} with preserved aspect ratio. Resulting image will be centered in the destination rectangle with padding if necessary",
+                        "name": "keep-aspect-ratio",
+                        "value": "1"
+                    }
+                
+            },
+            "GstD3D11DeinterlaceMethod": {
+                "kind": "flags",
+                "values": 
+                    {
+                        "desc": "Blend: Blending top/bottom field pictures into one frame. Framerate will be preserved (e.g., 60i -> 30p)",
+                        "name": "blend",
+                        "value": "0x00000001"
+                    },
+                    {
+                        "desc": "Bob: Interpolating missing lines by using the adjacent lines. Framerate will be doubled (e,g, 60i -> 60p)",
+                        "name": "bob",
+                        "value": "0x00000002"
+                    },
+                    {
+                        "desc": "Adaptive: Interpolating missing lines by using spatial/temporal references. Framerate will be doubled (e,g, 60i -> 60p)",
+                        "name": "adaptive",
+                        "value": "0x00000004"
+                    },
+                    {
+                        "desc": "Motion Compensation: Recreating missing lines by using motion vector. Framerate will be doubled (e,g, 60i -> 60p)",
+                        "name": "mocomp",
+                        "value": "0x00000008"
+                    }
+                
+            },
+            "GstD3D11IpcIOMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Copy remote texture",
+                        "name": "copy",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Import remote texture",
+                        "name": "import",
+                        "value": "1"
+                    }
+                
+            },
+            "GstD3D11MSAAMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Disabled",
+                        "name": "disabled",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "2x MSAA",
+                        "name": "2x",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "4x MSAA",
+                        "name": "4x",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "8x MSAA",
+                        "name": "8x",
+                        "value": "3"
+                    }
+                
+            },
+            "GstD3D11SamplingMethod": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Nearest Neighbour",
+                        "name": "nearest-neighbour",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Bilinear",
+                        "name": "bilinear",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Linear minification, point magnification",
+                        "name": "linear-minification",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "Anisotropic",
+                        "name": "anisotropic",
+                        "value": "3"
+                    }
+                
+            },
+            "GstD3D11ScreenCaptureAPI": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "DXGI Desktop Duplication",
+                        "name": "dxgi",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Windows Graphics Capture",
+                        "name": "wgc",
+                        "value": "1"
+                    }
+                
+            },
+            "GstD3D11TestSrcPattern": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "SMPTE 100%% color bars",
+                        "name": "smpte",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Random (television snow)",
+                        "name": "snow",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "100%% Black",
+                        "name": "black",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "100%% White",
+                        "name": "white",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "Red",
+                        "name": "red",
+                        "value": "4"
+                    },
+                    {
+                        "desc": "Green",
+                        "name": "green",
+                        "value": "5"
+                    },
+                    {
+                        "desc": "Blue",
+                        "name": "blue",
+                        "value": "6"
+                    },
+                    {
+                        "desc": "Checkers 1px",
+                        "name": "checkers-1",
+                        "value": "7"
+                    },
+                    {
+                        "desc": "Checkers 2px",
+                        "name": "checkers-2",
+                        "value": "8"
+                    },
+                    {
+                        "desc": "Checkers 4px",
+                        "name": "checkers-4",
+                        "value": "9"
+                    },
+                    {
+                        "desc": "Checkers 8px",
+                        "name": "checkers-8",
+                        "value": "10"
+                    },
+                    {
+                        "desc": "Circular",
+                        "name": "circular",
+                        "value": "11"
+                    },
+                    {
+                        "desc": "Blink",
+                        "name": "blink",
+                        "value": "12"
+                    },
+                    {
+                        "desc": "Moving ball",
+                        "name": "ball",
+                        "value": "18"
+                    }
+                
+            },
+            "GstD3D11VideoSinkDisplayFormat": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "DXGI_FORMAT_UNKNOWN",
+                        "name": "unknown",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "DXGI_FORMAT_R10G10B10A2_UNORM",
+                        "name": "r10g10b10a2-unorm",
+                        "value": "24"
+                    },
+                    {
+                        "desc": "DXGI_FORMAT_R8G8B8A8_UNORM",
+                        "name": "r8g8b8a8-unorm",
+                        "value": "28"
+                    },
+                    {
+                        "desc": "DXGI_FORMAT_B8G8R8A8_UNORM",
+                        "name": "b8g8r8a8-unorm",
+                        "value": "87"
+                    }
+                
+            },
+            "GstD3D11WindowCaptureMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Capture entire window area",
+                        "name": "default",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Capture client area",
+                        "name": "client",
+                        "value": "1"
+                    }
+                
+            },
+            "GstD3D11WindowFullscreenToggleMode": {
+                "kind": "flags",
+                "values": 
+                    {
+                        "desc": "GST_D3D11_WINDOW_FULLSCREEN_TOGGLE_MODE_NONE",
+                        "name": "none",
+                        "value": "0x00000000"
+                    },
+                    {
+                        "desc": "GST_D3D11_WINDOW_FULLSCREEN_TOGGLE_MODE_ALT_ENTER",
+                        "name": "alt-enter",
+                        "value": "0x00000002"
+                    },
+                    {
+                        "desc": "GST_D3D11_WINDOW_FULLSCREEN_TOGGLE_MODE_PROPERTY",
+                        "name": "property",
+                        "value": "0x00000004"
+                    }
+                
+            }
+        },
+        "package": "GStreamer Bad Plug-ins",
+        "source": "gst-plugins-bad",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
+    "d3d12": {
+        "description": "Direct3D12 plugin",
+        "elements": {
+            "d3d12av1dec": {
+                "author": "Seungha Yang <seungha@centricualr.com>",
+                "description": "Direct3D12/DXVA based AV1 video decoder",
+                "hierarchy": 
+                    "GstD3D12AV1Dec",
+                    "GstDxvaAV1Decoder",
+                    "GstAV1Decoder",
+                    "GstVideoDecoder",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Codec/Decoder/Video/Hardware",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-av1:\n      alignment: frame\n        profile: main\n          width:  1, 16384 \n         height:  1, 16384 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { NV12, P010_10LE }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { NV12, P010_10LE }\n          width:  1, 16384 \n         height:  1, 16384 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "adapter-luid": {
+                        "blurb": "DXGI Adapter LUID (Locally Unique Identifier) of created device",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "9223372036854775807",
+                        "min": "-9223372036854775808",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint64",
+                        "writable": false
+                    },
+                    "device-id": {
+                        "blurb": "DXGI Device ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "vendor-id": {
+                        "blurb": "DXGI Vendor ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d12compositor": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "A Direct3D12 compositor",
+                "hierarchy": 
+                    "GstD3D12Compositor",
+                    "GstVideoAggregator",
+                    "GstAggregator",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstChildProxy"
+                ,
+                "klass": "Filter/Editor/Video/Compositor",
+                "pad-templates": {
+                    "sink_%%u": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "sink",
+                        "presence": "request",
+                        "type": "GstD3D12CompositorPad"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, Y42B, Y444, Y444_16LE, GRAY8, GRAY16_LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, Y42B, Y444, Y444_16LE, GRAY8, GRAY16_LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "src",
+                        "presence": "always",
+                        "type": "GstAggregatorPad"
+                    }
+                },
+                "properties": {
+                    "adapter": {
+                        "blurb": "Adapter index for creating device (-1 for default)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "2147483647",
+                        "min": "-1",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "background": {
+                        "blurb": "Background type",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "checker (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstD3D12CompositorBackground",
+                        "writable": true
+                    },
+                    "ignore-inactive-pads": {
+                        "blurb": "Avoid timing out waiting for inactive pads",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d12convert": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Performs resizing, colorspace conversion, cropping and flipping/rotating using Direct3D12",
+                "hierarchy": 
+                    "GstD3D12Convert",
+                    "GstD3D12BaseFilter",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstVideoDirection"
+                ,
+                "klass": "Filter/Converter/Scaler/Effect/Video/Hardware",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D12Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D12Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "add-borders": {
+                        "blurb": "Add black borders if necessary to keep the display aspect ratio",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "border-color": {
+                        "blurb": "Border color to use in ARGB64 format",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "18446462598732840960",
+                        "max": "18446744073709551615",
+                        "min": "0",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "guint64",
+                        "writable": true
+                    },
+                    "gamma-mode": {
+                        "blurb": "Gamma conversion mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstVideoGammaMode",
+                        "writable": true
+                    },
+                    "method": {
+                        "blurb": "Method used for sampling",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "bilinear (1)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstD3D12SamplingMethod",
+                        "writable": true
+                    },
+                    "primaries-mode": {
+                        "blurb": "Primaries conversion mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstVideoPrimariesMode",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d12download": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Downloads Direct3D12 texture memory into system memory",
+                "hierarchy": 
+                    "GstD3D12Download",
+                    "GstD3D12BaseFilter",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Filter/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D12Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D12Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d12h264dec": {
+                "author": "Seungha Yang <seungha@centricualr.com>",
+                "description": "Direct3D12/DXVA based H.264 video decoder",
+                "hierarchy": 
+                    "GstD3D12H264Dec",
+                    "GstDxvaH264Decoder",
+                    "GstH264Decoder",
+                    "GstVideoDecoder",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Codec/Decoder/Video/Hardware",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-h264:\n  stream-format: { (string)avc, (string)avc3, (string)byte-stream }\n      alignment: au\n        profile: { (string)high, (string)progressive-high, (string)constrained-high, (string)main, (string)constrained-baseline, (string)baseline }\n          width:  1, 4096 \n         height:  1, 4096 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: NV12\n          width:  1, 4096 \n         height:  1, 4096 \nvideo/x-raw:\n         format: NV12\n          width:  1, 4096 \n         height:  1, 4096 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "adapter-luid": {
+                        "blurb": "DXGI Adapter LUID (Locally Unique Identifier) of created device",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "9223372036854775807",
+                        "min": "-9223372036854775808",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint64",
+                        "writable": false
+                    },
+                    "device-id": {
+                        "blurb": "DXGI Device ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "vendor-id": {
+                        "blurb": "DXGI Vendor ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d12h264enc": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Direct3D12 H.264 Video Encoder",
+                "hierarchy": 
+                    "GstD3D12H264Enc",
+                    "GstD3D12Encoder",
+                    "GstVideoEncoder",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstPreset"
+                ,
+                "klass": "Codec/Encoder/Video/Hardware",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: NV12\n          width:  16, 4096 \n         height:  16, 4096 \n interlace-mode: progressive\nvideo/x-raw:\n         format: NV12\n          width:  16, 4096 \n         height:  16, 4096 \n interlace-mode: progressive\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-h264:\n          width:  16, 4096 \n         height:  16, 4096 \n  stream-format: byte-stream\n      alignment: au\n        profile: { (string)high, (string)main, (string)constrained-baseline }\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "aud": {
+                        "blurb": "Use AU delimiter",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "bitrate": {
+                        "blurb": "Target bitrate in kbits/second. Used for \"cbr\", \"vbr\", and \"qvbr\" rate control",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "2000",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "cc-insert": {
+                        "blurb": "Closed Caption insert mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "insert (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstD3D12EncoderSeiInsertMode",
+                        "writable": true
+                    },
+                    "frame-analysis": {
+                        "blurb": "Enable 2 pass encoding if supported by hardware",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "gop-size": {
+                        "blurb": "Size of GOP (0 = infinite)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "60",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-bitrate": {
+                        "blurb": "Peak bitrate in kbits/second. Used for \"vbr\", and \"qvbr\" rate control",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "4000",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "qp-b": {
+                        "blurb": "Constant QP value for B frames. Used for \"cqp\" rate control",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "23",
+                        "max": "51",
+                        "min": "1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "qp-i": {
+                        "blurb": "Constant QP value for I frames. Used for \"cqp\" rate control",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "23",
+                        "max": "51",
+                        "min": "1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "qp-init": {
+                        "blurb": "Initial QP value. Used for \"cbr\", \"vbr\", and \"qvbr\" rate control",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "qp-max": {
+                        "blurb": "Maximum QP value for \"cbr\", \"vbr\", and \"qvbr\" rate control. To enable min/max QP setting, \"qp-max >= qp-min > 0\" condition should be satisfied",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "qp-min": {
+                        "blurb": "Minimum QP value for \"cbr\", \"vbr\", and \"qvbr\" rate control. To enable min/max QP setting, \"qp-max >= qp-min > 0\" condition should be satisfied",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "qp-p": {
+                        "blurb": "Constant QP value for P frames. Used for \"cqp\" rate control",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "23",
+                        "max": "51",
+                        "min": "1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "qvbr-quality": {
+                        "blurb": "Constant quality target value for \"qvbr\" rate control",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "23",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "rate-control": {
+                        "blurb": "Rate Control Method",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "vbr (3)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstD3D12EncoderRateControl",
+                        "writable": true
+                    },
+                    "rate-control-support": {
+                        "blurb": "Supported rate control modes",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "(none)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstD3D12EncoderRateControlSupport",
+                        "writable": false
+                    },
+                    "ref-frames": {
+                        "blurb": "Preferred number of reference frames. Actual number of reference frames can be limited depending on hardware (0 = unspecified)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "16",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "slice-mode": {
+                        "blurb": "Slice partiton mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "full (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstD3D12EncoderSubregionLayout",
+                        "writable": true
+                    },
+                    "slice-mode-support": {
+                        "blurb": "Supported slice partition modes",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "full",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstD3D12EncoderSubregionLayoutSupport",
+                        "writable": false
+                    },
+                    "slice-partition": {
+                        "blurb": "Slice partition threshold interpreted depending on \"slice-mode\". If set zero, full frame encoding will be selected without partitioning regardless of requested \"slice-mode\"",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d12h265dec": {
+                "author": "Seungha Yang <seungha@centricualr.com>",
+                "description": "Direct3D12/DXVA based H.265 video decoder",
+                "hierarchy": 
+                    "GstD3D12H265Dec",
+                    "GstDxvaH265Decoder",
+                    "GstH265Decoder",
+                    "GstVideoDecoder",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Codec/Decoder/Video/Hardware",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-h265:\n  stream-format: { (string)hev1, (string)hvc1, (string)byte-stream }\n      alignment: au\n        profile: { (string)main, (string)main-10 }\n          width:  1, 16384 \n         height:  1, 16384 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { NV12, P010_10LE }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { NV12, P010_10LE }\n          width:  1, 16384 \n         height:  1, 16384 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "adapter-luid": {
+                        "blurb": "DXGI Adapter LUID (Locally Unique Identifier) of created device",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "9223372036854775807",
+                        "min": "-9223372036854775808",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint64",
+                        "writable": false
+                    },
+                    "device-id": {
+                        "blurb": "DXGI Device ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "vendor-id": {
+                        "blurb": "DXGI Vendor ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d12mpeg2dec": {
+                "author": "Seungha Yang <seungha@centricualr.com>",
+                "description": "Direct3D12/DXVA based MPEG2 video decoder",
+                "hierarchy": 
+                    "GstD3D12Mpeg2Dec",
+                    "GstDxvaMpeg2Decoder",
+                    "GstMpeg2Decoder",
+                    "GstVideoDecoder",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Codec/Decoder/Video/Hardware",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/mpeg:\n    mpegversion: 2\n   systemstream: false\n        profile: { (string)main, (string)simple }\n          width:  1, 1920 \n         height:  1, 1920 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: NV12\n          width:  1, 1920 \n         height:  1, 1920 \nvideo/x-raw:\n         format: NV12\n          width:  1, 1920 \n         height:  1, 1920 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "adapter-luid": {
+                        "blurb": "DXGI Adapter LUID (Locally Unique Identifier) of created device",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "9223372036854775807",
+                        "min": "-9223372036854775808",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint64",
+                        "writable": false
+                    },
+                    "device-id": {
+                        "blurb": "DXGI Device ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "vendor-id": {
+                        "blurb": "DXGI Vendor ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d12screencapturesrc": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Captures desktop screen",
+                "hierarchy": 
+                    "GstD3D12ScreenCaptureSrc",
+                    "GstBaseSrc",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Source/Video",
+                "pad-templates": {
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: BGRA\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \npixel-aspect-ratio: 1/1\n    colorimetry: sRGB\nvideo/x-raw:\n         format: BGRA\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \npixel-aspect-ratio: 1/1\n    colorimetry: sRGB\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "crop-height": {
+                        "blurb": "Height of screen capture area (0 = maximum)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "crop-width": {
+                        "blurb": "Width of screen capture area (0 = maximum)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "crop-x": {
+                        "blurb": "Horizontal coordinate of top left corner for the screen capture area",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "crop-y": {
+                        "blurb": "Vertical coordinate of top left corner for the screen capture area",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "monitor-handle": {
+                        "blurb": "A HMONITOR handle of monitor to capture",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "18446744073709551615",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint64",
+                        "writable": true
+                    },
+                    "monitor-index": {
+                        "blurb": "Zero-based index for monitor to capture (-1 = primary monitor)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "2147483647",
+                        "min": "-1",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "show-cursor": {
+                        "blurb": "Whether to show mouse cursor",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d12testsrc": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Creates a test video stream",
+                "hierarchy": 
+                    "GstD3D12TestSrc",
+                    "GstBaseSrc",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Source/Video",
+                "pad-templates": {
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "adapter": {
+                        "blurb": "DXGI Adapter index (-1 for any device)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "2147483647",
+                        "min": "-1",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "alpha": {
+                        "blurb": "Global alpha value to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "is-live": {
+                        "blurb": "Whether to act as a live source",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pattern": {
+                        "blurb": "Type of test pattern to generate",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "smpte (0)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GstD3D12TestSrcPattern",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d12upload": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Uploads system memory into Direct3D12 texture memory",
+                "hierarchy": 
+                    "GstD3D12Upload",
+                    "GstD3D12BaseFilter",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Filter/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D12Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D12Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            },
+            "d3d12videosink": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "A Direct3D12 Video Sink",
+                "hierarchy": 
+                    "GstD3D12VideoSink",
+                    "GstVideoSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstVideoOverlay",
+                    "GstNavigation"
+                ,
+                "klass": "Sink/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D12Memory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:SystemMemory, meta:GstVideoOverlayComposition):\n         format: { RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, NV12, AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, I420, YV12, GRAY16_LE, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "adapter": {
+                        "blurb": "Adapter index for creating device (-1 for default)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "2147483647",
+                        "min": "-1",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "enable-navigation-events": {
+                        "blurb": "When enabled, navigation events are sent upstream",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "force-aspect-ratio": {
+                        "blurb": "When enabled, scaling will respect original aspect ratio",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "fov": {
+                        "blurb": "Field of view angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "90",
+                        "max": "3.40282e+38",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "fullscreen": {
+                        "blurb": "Fullscreen mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "fullscreen-on-alt-enter": {
+                        "blurb": "Enable fullscreen toggle on alt+enter key input",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "gamma-mode": {
+                        "blurb": "Gamma conversion mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstVideoGammaMode",
+                        "writable": true
+                    },
+                    "msaa": {
+                        "blurb": "MSAA (Multi-Sampling Anti-Aliasing) level",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "disabled (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstD3D12MSAAMode",
+                        "writable": true
+                    },
+                    "ortho": {
+                        "blurb": "Use orthographic projection",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "primaries-mode": {
+                        "blurb": "Primaries conversion mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "none (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstVideoPrimariesMode",
+                        "writable": true
+                    },
+                    "redraw-on-update": {
+                        "blurb": "Immediately apply updated geometry related properties and redraw. If disabled, properties will be applied on the next frame or window resize",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "rotate-method": {
+                        "blurb": "Rotate method to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "identity (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstVideoOrientationMethod",
+                        "writable": true
+                    },
+                    "rotation-x": {
+                        "blurb": "x-axis rotation angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "rotation-y": {
+                        "blurb": "y-axis rotation angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "rotation-z": {
+                        "blurb": "z-axis rotation angle in degrees",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "sampling-method": {
+                        "blurb": "Sampler filter type to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "bilinear (1)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstD3D12SamplingMethod",
+                        "writable": true
+                    },
+                    "scale-x": {
+                        "blurb": "Scale multiplier for x-axis",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "scale-y": {
+                        "blurb": "Scale multiplier for y-axis",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
             },
-            "d3d11vp8dec": {
-                "author": "Seungha Yang <seungha.yang@navercorp.com>",
-                "description": "Direct3D11/DXVA based VP8 video decoder",
+            "d3d12vp8dec": {
+                "author": "Seungha Yang <seungha@centricualr.com>",
+                "description": "Direct3D12/DXVA based VP8 video decoder",
                 "hierarchy": 
-                    "GstD3D11Vp8Dec",
+                    "GstD3D12Vp8Dec",
+                    "GstDxvaVp8Decoder",
                     "GstVp8Decoder",
                     "GstVideoDecoder",
                     "GstElement",
@@ -8612,7 +13961,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: NV12\n          width:  1, 4096 \n         height:  1, 4096 \nvideo/x-raw:\n         format: NV12\n          width:  1, 4096 \n         height:  1, 4096 \n",
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: NV12\n          width:  1, 4096 \n         height:  1, 4096 \nvideo/x-raw:\n         format: NV12\n          width:  1, 4096 \n         height:  1, 4096 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -8661,13 +14010,14 @@
                         "writable": false
                     }
                 },
-                "rank": "primary"
+                "rank": "none"
             },
-            "d3d11vp9dec": {
-                "author": "Seungha Yang <seungha.yang@navercorp.com>",
-                "description": "Direct3D11/DXVA based VP9 video decoder",
+            "d3d12vp9dec": {
+                "author": "Seungha Yang <seungha@centricualr.com>",
+                "description": "Direct3D12/DXVA based VP9 video decoder",
                 "hierarchy": 
-                    "GstD3D11Vp9Dec",
+                    "GstD3D12Vp9Dec",
+                    "GstDxvaVp9Decoder",
                     "GstVp9Decoder",
                     "GstVideoDecoder",
                     "GstElement",
@@ -8678,12 +14028,12 @@
                 "klass": "Codec/Decoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-vp9:\n          width:  1, 16384 \n         height:  1, 16384 \n      alignment: frame\n        profile: { (string)0, (string)2 }\n",
+                        "caps": "video/x-vp9:\n      alignment: frame\n        profile: 0\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-vp9:\n      alignment: frame\n        profile: 2\n bit-depth-luma: 10\nbit-depth-chroma: 10\n          width:  1, 16384 \n         height:  1, 16384 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { NV12, P010_10LE }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { NV12, P010_10LE }\n          width:  1, 16384 \n         height:  1, 16384 \n",
+                        "caps": "video/x-raw(memory:D3D12Memory):\n         format: { NV12, P010_10LE }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { NV12, P010_10LE }\n          width:  1, 16384 \n         height:  1, 16384 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -8732,16 +14082,15 @@
                         "writable": false
                     }
                 },
-                "rank": "primary"
+                "rank": "none"
             }
         },
-        "filename": "gstd3d11",
+        "filename": "gstd3d12",
         "license": "LGPL",
         "other-types": {
-            "GstD3D11BaseConvert": {
+            "GstD3D12BaseFilter": {
                 "hierarchy": 
-                    "GstD3D11BaseConvert",
-                    "GstD3D11BaseFilter",
+                    "GstD3D12BaseFilter",
                     "GstBaseTransform",
                     "GstElement",
                     "GstObject",
@@ -8750,34 +14099,7 @@
                 ,
                 "kind": "object"
             },
-            "GstD3D11BaseFilter": {
-                "hierarchy": 
-                    "GstD3D11BaseFilter",
-                    "GstBaseTransform",
-                    "GstElement",
-                    "GstObject",
-                    "GInitiallyUnowned",
-                    "GObject"
-                ,
-                "kind": "object",
-                "properties": {
-                    "adapter": {
-                        "blurb": "Adapter index for creating device (-1 for default)",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "-1",
-                        "max": "2147483647",
-                        "min": "-1",
-                        "mutable": "ready",
-                        "readable": true,
-                        "type": "gint",
-                        "writable": true
-                    }
-                }
-            },
-            "GstD3D11CompositorBackground": {
+            "GstD3D12CompositorBackground": {
                 "kind": "enum",
                 "values": 
                     {
@@ -8802,7 +14124,7 @@
                     }
                 
             },
-            "GstD3D11CompositorOperator": {
+            "GstD3D12CompositorOperator": {
                 "kind": "enum",
                 "values": 
                     {
@@ -8817,9 +14139,9 @@
                     }
                 
             },
-            "GstD3D11CompositorPad": {
+            "GstD3D12CompositorPad": {
                 "hierarchy": 
-                    "GstD3D11CompositorPad",
+                    "GstD3D12CompositorPad",
                     "GstVideoAggregatorPad",
                     "GstAggregatorPad",
                     "GstPad",
@@ -8843,18 +14165,6 @@
                         "type": "gdouble",
                         "writable": true
                     },
-                    "gamma-mode": {
-                        "blurb": "Gamma conversion mode",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": true,
-                        "default": "none (0)",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "GstVideoGammaMode",
-                        "writable": true
-                    },
                     "height": {
                         "blurb": "Height of the picture",
                         "conditionally-available": false,
@@ -8878,19 +14188,7 @@
                         "default": "over (1)",
                         "mutable": "null",
                         "readable": true,
-                        "type": "GstD3D11CompositorOperator",
-                        "writable": true
-                    },
-                    "primaries-mode": {
-                        "blurb": "Primaries conversion mode",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": true,
-                        "default": "none (0)",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "GstVideoPrimariesMode",
+                        "type": "GstD3D12CompositorOperator",
                         "writable": true
                     },
                     "sizing-policy": {
@@ -8902,7 +14200,7 @@
                         "default": "none (0)",
                         "mutable": "null",
                         "readable": true,
-                        "type": "GstD3D11CompositorSizingPolicy",
+                        "type": "GstD3D12CompositorSizingPolicy",
                         "writable": true
                     },
                     "width": {
@@ -8949,7 +14247,7 @@
                     }
                 }
             },
-            "GstD3D11CompositorSizingPolicy": {
+            "GstD3D12CompositorSizingPolicy": {
                 "kind": "enum",
                 "values": 
                     {
@@ -8958,53 +14256,251 @@
                         "value": "0"
                     },
                     {
-                        "desc": "Keep Aspect Ratio: Image is scaled to fit destination rectangle specified by GstCompositorPad:{xpos, ypos, width, height} with preserved aspect ratio. Resulting image will be centered in the destination rectangle with padding if necessary",
+                        "desc": "Keep Aspect Ratio: Image is scaled to fit destination rectangle specified by GstD3D12CompositorPad:{xpos, ypos, width, height} with preserved aspect ratio. Resulting image will be centered in the destination rectangle with padding if necessary",
                         "name": "keep-aspect-ratio",
                         "value": "1"
                     }
                 
             },
-            "GstD3D11DeinterlaceMethod": {
+            "GstD3D12Encoder": {
+                "hierarchy": 
+                    "GstD3D12Encoder",
+                    "GstVideoEncoder",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstPreset"
+                ,
+                "kind": "object",
+                "properties": {
+                    "adapter-luid": {
+                        "blurb": "DXGI Adapter LUID (Locally Unique Identifier) of created device",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "9223372036854775807",
+                        "min": "-9223372036854775808",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint64",
+                        "writable": false
+                    },
+                    "device-id": {
+                        "blurb": "DXGI Device ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "vendor-id": {
+                        "blurb": "DXGI Vendor ID",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    }
+                }
+            },
+            "GstD3D12EncoderRateControl": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Constant QP",
+                        "name": "cqp",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Constant bitrate",
+                        "name": "cbr",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "Variable bitrate",
+                        "name": "vbr",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "Constant quality variable bitrate",
+                        "name": "qvbr",
+                        "value": "4"
+                    }
+                
+            },
+            "GstD3D12EncoderRateControlSupport": {
                 "kind": "flags",
                 "values": 
                     {
-                        "desc": "Blend: Blending top/bottom field pictures into one frame. Framerate will be preserved (e.g., 60i -> 30p)",
-                        "name": "blend",
+                        "desc": "Constant QP",
+                        "name": "cqp",
+                        "value": "0x00000002"
+                    },
+                    {
+                        "desc": "Constant bitrate",
+                        "name": "cbr",
+                        "value": "0x00000004"
+                    },
+                    {
+                        "desc": "Variable bitrate",
+                        "name": "vbr",
+                        "value": "0x00000008"
+                    },
+                    {
+                        "desc": "Constant quality variable bitrate",
+                        "name": "qvbr",
+                        "value": "0x00000010"
+                    }
+                
+            },
+            "GstD3D12EncoderSeiInsertMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Insert",
+                        "name": "insert",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Insert and drop",
+                        "name": "insert-and-drop",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Disabled",
+                        "name": "disabled",
+                        "value": "2"
+                    }
+                
+            },
+            "GstD3D12EncoderSubregionLayout": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Full frame without partitioning",
+                        "name": "full",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Bytes per subregion",
+                        "name": "bytes",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Coding units (e.g., macroblock) per subregion",
+                        "name": "coding-units",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "Uniform rows per subregion",
+                        "name": "rows",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "Uniform subregions per frame",
+                        "name": "subregions",
+                        "value": "4"
+                    }
+                
+            },
+            "GstD3D12EncoderSubregionLayoutSupport": {
+                "kind": "flags",
+                "values": 
+                    {
+                        "desc": "Full frame without partitioning",
+                        "name": "full",
                         "value": "0x00000001"
                     },
                     {
-                        "desc": "Bob: Interpolating missing lines by using the adjacent lines. Framerate will be doubled (e,g, 60i -> 60p)",
-                        "name": "bob",
+                        "desc": "Bytes per subregion",
+                        "name": "bytes",
                         "value": "0x00000002"
                     },
                     {
-                        "desc": "Adaptive: Interpolating missing lines by using spatial/temporal references. Framerate will be doubled (e,g, 60i -> 60p)",
-                        "name": "adaptive",
+                        "desc": "Coding units (e.g., macroblock) per subregion",
+                        "name": "coding-units",
                         "value": "0x00000004"
                     },
                     {
-                        "desc": "Motion Compensation: Recreating missing lines by using motion vector. Framerate will be doubled (e,g, 60i -> 60p)",
-                        "name": "mocomp",
+                        "desc": "Uniform rows (in coding-unit) per subregion",
+                        "name": "rows",
                         "value": "0x00000008"
+                    },
+                    {
+                        "desc": "Uniform subregions per frame",
+                        "name": "subregions",
+                        "value": "0x00000010"
                     }
                 
             },
-            "GstD3D11ScreenCaptureAPI": {
+            "GstD3D12MSAAMode": {
                 "kind": "enum",
                 "values": 
                     {
-                        "desc": "DXGI Desktop Duplication",
-                        "name": "dxgi",
+                        "desc": "Disabled",
+                        "name": "disabled",
                         "value": "0"
                     },
                     {
-                        "desc": "Windows Graphics Capture",
-                        "name": "wgc",
+                        "desc": "2x MSAA",
+                        "name": "2x",
                         "value": "1"
+                    },
+                    {
+                        "desc": "4x MSAA",
+                        "name": "4x",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "8x MSAA",
+                        "name": "8x",
+                        "value": "3"
                     }
                 
             },
-            "GstD3D11TestSrcPattern": {
+            "GstD3D12SamplingMethod": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Nearest Neighbour",
+                        "name": "nearest-neighbour",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Bilinear",
+                        "name": "bilinear",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Linear minification, point magnification",
+                        "name": "linear-minification",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "Anisotropic",
+                        "name": "anisotropic",
+                        "value": "3"
+                    }
+                
+            },
+            "GstD3D12TestSrcPattern": {
                 "kind": "enum",
                 "values": 
                     {
@@ -9061,51 +14557,21 @@
                         "desc": "Checkers 8px",
                         "name": "checkers-8",
                         "value": "10"
-                    }
-                
-            },
-            "GstD3D11VideoSinkDisplayFormat": {
-                "kind": "enum",
-                "values": 
-                    {
-                        "desc": "DXGI_FORMAT_UNKNOWN",
-                        "name": "unknown",
-                        "value": "0"
-                    },
-                    {
-                        "desc": "DXGI_FORMAT_R10G10B10A2_UNORM",
-                        "name": "r10g10b10a2-unorm",
-                        "value": "24"
-                    },
-                    {
-                        "desc": "DXGI_FORMAT_R8G8B8A8_UNORM",
-                        "name": "r8g8b8a8-unorm",
-                        "value": "28"
                     },
                     {
-                        "desc": "DXGI_FORMAT_B8G8R8A8_UNORM",
-                        "name": "b8g8r8a8-unorm",
-                        "value": "87"
-                    }
-                
-            },
-            "GstD3D11WindowFullscreenToggleMode": {
-                "kind": "flags",
-                "values": 
-                    {
-                        "desc": "GST_D3D11_WINDOW_FULLSCREEN_TOGGLE_MODE_NONE",
-                        "name": "none",
-                        "value": "0x00000000"
+                        "desc": "Circular",
+                        "name": "circular",
+                        "value": "11"
                     },
                     {
-                        "desc": "GST_D3D11_WINDOW_FULLSCREEN_TOGGLE_MODE_ALT_ENTER",
-                        "name": "alt-enter",
-                        "value": "0x00000002"
+                        "desc": "Blink",
+                        "name": "blink",
+                        "value": "12"
                     },
                     {
-                        "desc": "GST_D3D11_WINDOW_FULLSCREEN_TOGGLE_MODE_PROPERTY",
-                        "name": "property",
-                        "value": "0x00000004"
+                        "desc": "Moving ball",
+                        "name": "ball",
+                        "value": "18"
                     }
                 
             }
@@ -9119,7 +14585,7 @@
         "description": "DASH plugin",
         "elements": {
             "dashdemux": {
-                "author": "David Corvoysier <david.corvoysier@orange.com>\n                Hamid Zakari <hamid.zakari@gmail.com>\n                Gianluca Gennari <gennarone@gmail.com>",
+                "author": "David Corvoysier <david.corvoysier@orange.com>, Hamid Zakari <hamid.zakari@gmail.com>, Gianluca Gennari <gennarone@gmail.com>",
                 "description": "Dynamic Adaptive Streaming over HTTP demuxer",
                 "hierarchy": 
                     "GstDashDemux",
@@ -9406,6 +14872,20 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "suggested-presentation-delay": {
+                        "blurb": "Provides to the manifest a suggested presentation delay in milliseconds",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "18446744073709551615",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint64",
+                        "writable": true
+                    },
                     "target-duration": {
                         "blurb": "The target duration in seconds of a segment/file. (0 - disabled, useful for management of segment duration by the streaming server)",
                         "conditionally-available": false,
@@ -9470,9 +14950,14 @@
                         "value": "0"
                     },
                     {
-                        "desc": "Use mp4mux",
+                        "desc": "Use mp4mux (deprecated, non-functional)",
                         "name": "mp4",
                         "value": "1"
+                    },
+                    {
+                        "desc": "Use dashmp4mux",
+                        "name": "dashmp4",
+                        "value": "2"
                     }
                 
             }
@@ -10487,7 +15972,7 @@
                 "long-name": "Fake Video Sink",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(ANY):\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(ANY):\n         format: { DMA_DRM, A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     }
@@ -14413,7 +19898,7 @@
         "description": "DVB elements",
         "elements": {
             "dvbbasebin": {
-                "author": "Alessandro Decina <alessandro.d@gmail.com>\nReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>",
+                "author": "Alessandro Decina <alessandro.d@gmail.com>, Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>",
                 "description": "Access descramble and split DVB streams",
                 "hierarchy": 
                     "DvbBaseBin",
@@ -15045,7 +20530,7 @@
                 }
             },
             "dvbsrc": {
-                "author": "P2P-VCR, C-Lab, University of Paderborn, Zaheer Abbas Merali <zaheerabbas at merali dot org>\nReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>",
+                "author": "P2P-VCR, C-Lab, University of Paderborn, Zaheer Abbas Merali <zaheerabbas at merali dot org>, Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>",
                 "description": "Digital Video Broadcast Source",
                 "hierarchy": 
                     "GstDvbSrc",
@@ -16317,7 +21802,7 @@
                 "long-name": "DVB Subtitles Overlay",
                 "pad-templates": {
                     "src": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { DMA_DRM, A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     },
@@ -16327,7 +21812,7 @@
                         "presence": "always"
                     },
                     "video_sink": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { DMA_DRM, A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     }
@@ -16400,7 +21885,7 @@
                 "long-name": "Sub-picture Overlay",
                 "pad-templates": {
                     "src": {
-                        "caps": "video/x-raw:\n         format: { I420, NV12, YV12 }\n          width:  16, 4096 \n         height:  16, 4096 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { DMA_DRM, A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     },
@@ -16410,7 +21895,7 @@
                         "presence": "always"
                     },
                     "video": {
-                        "caps": "video/x-raw:\n         format: { I420, NV12, YV12 }\n          width:  16, 4096 \n         height:  16, 4096 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { DMA_DRM, A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     }
@@ -16426,6 +21911,1141 @@
         "tracers": {},
         "url": "Unknown package origin"
     },
+    "dwrite": {
+        "description": "dwrite",
+        "elements": {
+            "dwriteclockoverlay": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Overlays the current clock time on a video stream",
+                "hierarchy": 
+                    "GstDWriteClockOverlay",
+                    "GstDWriteBaseOverlay",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Filter/Editor/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(ANY):\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(ANY):\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "time-format": {
+                        "blurb": "Format to use for time and date value, as in strftime.",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "%%H:%%M:%%S",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "dwritesubtitlemux": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Attach subtitle metas on video buffers",
+                "hierarchy": 
+                    "GstDWriteSubtitleMux",
+                    "GstAggregator",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Generic",
+                "pad-templates": {
+                    "src": {
+                        "caps": "video/x-raw(ANY):\n",
+                        "direction": "src",
+                        "presence": "always",
+                        "type": "GstAggregatorPad"
+                    },
+                    "text_%%u": {
+                        "caps": "text/x-raw:\n",
+                        "direction": "sink",
+                        "presence": "request",
+                        "type": "GstDWriteSubtitleMuxPad"
+                    },
+                    "video": {
+                        "caps": "video/x-raw(ANY):\n",
+                        "direction": "sink",
+                        "presence": "always",
+                        "type": "GstDWriteSubtitleMuxPad"
+                    }
+                },
+                "rank": "none"
+            },
+            "dwritesubtitleoverlay": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Adds subtitle strings on top of a video buffer",
+                "hierarchy": 
+                    "GstDWriteSubtitleOverlay",
+                    "GstBin",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstChildProxy"
+                ,
+                "klass": "Filter/Editor/Video/Overlay/Subtitle",
+                "pad-templates": {
+                    "src": {
+                        "caps": "video/x-raw(ANY):\n",
+                        "direction": "src",
+                        "presence": "always"
+                    },
+                    "text": {
+                        "caps": "text/x-raw:\n         format: { pango-markup, utf8 }\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "video": {
+                        "caps": "video/x-raw(ANY):\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "auto-resize": {
+                        "blurb": "Calculate font size to be equivalent to \"font-size\" at \"reference-frame-size\"",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "background-color": {
+                        "blurb": "Background color to use (big-endian ARGB)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "cc-field": {
+                        "blurb": "The closed caption field to render when available, (-1 = automatic)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "1",
+                        "min": "-1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "cc-timeout": {
+                        "blurb": "Duration after which to erase overlay when no cc data has arrived for the selected field, in nanoseconds unit",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "18446744073709551615",
+                        "max": "18446744073709551615",
+                        "min": "16000000000",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint64",
+                        "writable": true
+                    },
+                    "color-font": {
+                        "blurb": "Enable color font, requires Windows 10 or newer",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "enable-cc": {
+                        "blurb": "Enable closed caption rendering",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "font-family": {
+                        "blurb": "Font family to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "MS Reference Sans Serif",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "font-size": {
+                        "blurb": "Font size to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "20",
+                        "max": "1638",
+                        "min": "0.1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "font-stretch": {
+                        "blurb": "Font Stretch",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "normal (5)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstDWriteFontStretch",
+                        "writable": true
+                    },
+                    "font-style": {
+                        "blurb": "Font Style",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "normal (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstDWriteFontStyle",
+                        "writable": true
+                    },
+                    "font-weight": {
+                        "blurb": "Font Weight",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "normal (400)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstDWriteFontWeight",
+                        "writable": true
+                    },
+                    "foreground-color": {
+                        "blurb": "Foreground color to use (big-endian ARGB)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "layout-height": {
+                        "blurb": "Normalized height of text layout",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0.92",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gdouble",
+                        "writable": true
+                    },
+                    "layout-width": {
+                        "blurb": "Normalized width of text layout",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0.92",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gdouble",
+                        "writable": true
+                    },
+                    "layout-x": {
+                        "blurb": "Normalized X coordinate of text layout",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0.03",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gdouble",
+                        "writable": true
+                    },
+                    "layout-y": {
+                        "blurb": "Normalized Y coordinate of text layout",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0.03",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gdouble",
+                        "writable": true
+                    },
+                    "outline-color": {
+                        "blurb": "Text outline color to use (big-endian ARGB)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-16777216",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "paragraph-alignment": {
+                        "blurb": "Paragraph Alignment",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "far (1)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstDWriteParagraphAlignment",
+                        "writable": true
+                    },
+                    "remove-cc-meta": {
+                        "blurb": "Remove caption meta from output buffers when closed caption rendering is enabled",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "shadow-color": {
+                        "blurb": "Shadow color to use (big-endian ARGB)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-2147483648",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "text": {
+                        "blurb": "Text to render",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "text-alignment": {
+                        "blurb": "Text Alignment",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "center (2)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstDWriteTextAlignment",
+                        "writable": true
+                    },
+                    "visible": {
+                        "blurb": "Whether to draw text",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "dwritetextoverlay": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Adds text strings on top of a video buffer",
+                "hierarchy": 
+                    "GstDWriteTextOverlay",
+                    "GstDWriteBaseOverlay",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Filter/Editor/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(ANY):\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(ANY):\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "cc-field": {
+                        "blurb": "The closed caption field to render when available, (-1 = automatic)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "1",
+                        "min": "-1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "cc-timeout": {
+                        "blurb": "Duration after which to erase overlay when no cc data has arrived for the selected field, in nanoseconds unit",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "18446744073709551615",
+                        "max": "18446744073709551615",
+                        "min": "16000000000",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint64",
+                        "writable": true
+                    },
+                    "enable-cc": {
+                        "blurb": "Enable closed caption rendering",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "remove-cc-meta": {
+                        "blurb": "Remove caption meta from output buffers when closed caption rendering is enabled",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "dwritetimeoverlay": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Overlays buffer time stamps on a video stream",
+                "hierarchy": 
+                    "GstDWriteTimeOverlay",
+                    "GstDWriteBaseOverlay",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Filter/Editor/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(ANY):\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw(ANY):\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "datetime-epoch": {
+                        "blurb": "When showing times as dates, the initial date from which time is counted, if not specified prime epoch is used (1900-01-01)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GDateTime",
+                        "writable": true
+                    },
+                    "datetime-format": {
+                        "blurb": "When showing times as dates, the format to render date and time in",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "%%F %%T",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "reference-timestamp-caps": {
+                        "blurb": "Caps to use for the reference timestamp time mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "timestamp/x-ntp",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstCaps",
+                        "writable": true
+                    },
+                    "show-times-as-dates": {
+                        "blurb": "Whether to display times, counted from datetime-epoch, as dates",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "time-mode": {
+                        "blurb": "What time to show",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "buffer-time (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstDWriteTimeOverlayTimeLine",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            }
+        },
+        "filename": "gstdwrite",
+        "license": "LGPL",
+        "other-types": {
+            "GstDWriteBaseOverlay": {
+                "hierarchy": 
+                    "GstDWriteBaseOverlay",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "kind": "object",
+                "properties": {
+                    "auto-resize": {
+                        "blurb": "Calculate font size to be equivalent to \"font-size\" at \"reference-frame-size\"",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "background-color": {
+                        "blurb": "Background color to use (big-endian ARGB)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "color-font": {
+                        "blurb": "Enable color font, requires Windows 10 or newer",
+                        "conditionally-available": true,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "font-family": {
+                        "blurb": "Font family to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "MS Reference Sans Serif",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "font-size": {
+                        "blurb": "Font size to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "24",
+                        "max": "1638",
+                        "min": "0.1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "font-stretch": {
+                        "blurb": "Font Stretch",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "normal (5)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstDWriteFontStretch",
+                        "writable": true
+                    },
+                    "font-style": {
+                        "blurb": "Font Style",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "normal (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstDWriteFontStyle",
+                        "writable": true
+                    },
+                    "font-weight": {
+                        "blurb": "Font Weight",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "normal (400)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstDWriteFontWeight",
+                        "writable": true
+                    },
+                    "foreground-color": {
+                        "blurb": "Foreground color to use (big-endian ARGB)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "layout-height": {
+                        "blurb": "Normalized height of text layout",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0.92",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gdouble",
+                        "writable": true
+                    },
+                    "layout-width": {
+                        "blurb": "Normalized width of text layout",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0.92",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gdouble",
+                        "writable": true
+                    },
+                    "layout-x": {
+                        "blurb": "Normalized X coordinate of text layout",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0.03",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gdouble",
+                        "writable": true
+                    },
+                    "layout-y": {
+                        "blurb": "Normalized Y coordinate of text layout",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0.03",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gdouble",
+                        "writable": true
+                    },
+                    "outline-color": {
+                        "blurb": "Text outline color to use (big-endian ARGB)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-16777216",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "paragraph-alignment": {
+                        "blurb": "Paragraph Alignment",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "near (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstDWriteParagraphAlignment",
+                        "writable": true
+                    },
+                    "shadow-color": {
+                        "blurb": "Shadow color to use (big-endian ARGB)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-2147483648",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "text": {
+                        "blurb": "Text to render",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "text-alignment": {
+                        "blurb": "Text Alignment",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "leading (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstDWriteTextAlignment",
+                        "writable": true
+                    },
+                    "visible": {
+                        "blurb": "Whether to draw text",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    }
+                }
+            },
+            "GstDWriteFontStretch": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "DWRITE_FONT_STRETCH_UNDEFINED",
+                        "name": "undefined",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STRETCH_ULTRA_CONDENSED",
+                        "name": "ultra-condensed",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STRETCH_EXTRA_CONDENSED",
+                        "name": "extra-condensed",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STRETCH_CONDENSED",
+                        "name": "condensed",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STRETCH_SEMI_CONDENSED",
+                        "name": "semi-condensed",
+                        "value": "4"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STRETCH_NORMAL",
+                        "name": "normal",
+                        "value": "5"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STRETCH_MEDIUM",
+                        "name": "medium",
+                        "value": "5"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STRETCH_SEMI_EXPANDED",
+                        "name": "semi-expanded",
+                        "value": "6"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STRETCH_EXPANDED",
+                        "name": "expanded",
+                        "value": "7"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STRETCH_EXTRA_EXPANDED",
+                        "name": "extra-expanded",
+                        "value": "8"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STRETCH_ULTRA_EXPANDED",
+                        "name": "ultra-expanded",
+                        "value": "9"
+                    }
+                
+            },
+            "GstDWriteFontStyle": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "DWRITE_FONT_STYLE_NORMAL",
+                        "name": "normal",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STYLE_OBLIQUE",
+                        "name": "oblique",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_STYLE_ITALIC",
+                        "name": "italic",
+                        "value": "2"
+                    }
+                
+            },
+            "GstDWriteFontWeight": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_THIN",
+                        "name": "thin",
+                        "value": "100"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_EXTRA_LIGHT",
+                        "name": "extra-light",
+                        "value": "200"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_ULTRA_LIGHT",
+                        "name": "ultra-light",
+                        "value": "200"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_LIGHT",
+                        "name": "light",
+                        "value": "300"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_SEMI_LIGHT",
+                        "name": "semi-light",
+                        "value": "350"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_NORMAL",
+                        "name": "normal",
+                        "value": "400"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_REGULAR",
+                        "name": "regular",
+                        "value": "400"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_MEDIUM",
+                        "name": "medium",
+                        "value": "500"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_DEMI_BOLD",
+                        "name": "demi-bold",
+                        "value": "600"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_SEMI_BOLD",
+                        "name": "semi-bold",
+                        "value": "600"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_BOLD",
+                        "name": "bold",
+                        "value": "700"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_EXTRA_BOLD",
+                        "name": "extra-bold",
+                        "value": "800"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_ULTRA_BOLD",
+                        "name": "ultra-bold",
+                        "value": "800"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_BLACK",
+                        "name": "black",
+                        "value": "900"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_HEAVY",
+                        "name": "heavy",
+                        "value": "900"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_EXTRA_BLACK",
+                        "name": "extra-black",
+                        "value": "950"
+                    },
+                    {
+                        "desc": "DWRITE_FONT_WEIGHT_ULTRA_BLACK",
+                        "name": "ultra-black",
+                        "value": "950"
+                    }
+                
+            },
+            "GstDWriteParagraphAlignment": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "DWRITE_PARAGRAPH_ALIGNMENT_NEAR",
+                        "name": "near",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "DWRITE_PARAGRAPH_ALIGNMENT_FAR",
+                        "name": "far",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "DWRITE_PARAGRAPH_ALIGNMENT_CENTER",
+                        "name": "center",
+                        "value": "2"
+                    }
+                
+            },
+            "GstDWriteSubtitleMuxPad": {
+                "hierarchy": 
+                    "GstDWriteSubtitleMuxPad",
+                    "GstAggregatorPad",
+                    "GstPad",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "kind": "object",
+                "properties": {
+                    "active": {
+                        "blurb": "Active state of the pad. If FALSE, subtitle from this pad will bebe ignored",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    }
+                }
+            },
+            "GstDWriteTextAlignment": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "DWRITE_TEXT_ALIGNMENT_LEADING",
+                        "name": "leading",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "DWRITE_TEXT_ALIGNMENT_TRAILING",
+                        "name": "trailing",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "DWRITE_TEXT_ALIGNMENT_CENTER",
+                        "name": "center",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "DWRITE_TEXT_ALIGNMENT_JUSTIFIED",
+                        "name": "justified",
+                        "value": "3"
+                    }
+                
+            },
+            "GstDWriteTimeOverlayTimeLine": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "buffer-time",
+                        "name": "buffer-time",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "stream-time",
+                        "name": "stream-time",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "running-time",
+                        "name": "running-time",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "time-code",
+                        "name": "time-code",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "elapsed-running-time",
+                        "name": "elapsed-running-time",
+                        "value": "4"
+                    },
+                    {
+                        "desc": "reference-timestamp",
+                        "name": "reference-timestamp",
+                        "value": "5"
+                    },
+                    {
+                        "desc": "buffer-count",
+                        "name": "buffer-count",
+                        "value": "6"
+                    },
+                    {
+                        "desc": "buffer-offset",
+                        "name": "buffer-offset",
+                        "value": "7"
+                    }
+                
+            }
+        },
+        "package": "GStreamer Bad Plug-ins",
+        "source": "gst-plugins-bad",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
     "faac": {
         "description": "Free AAC Encoder (FAAC)",
         "elements": {
@@ -29461,12 +36081,24 @@
                 "long-name": "Gtk Wayland Video Sink",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw:\n         format: { BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, NV61, YUV9, YVU9, Y41B, I420, YV12, Y42B, v308 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:DMABuf):\n         format: { BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, NV61, YUV9, YVU9, Y41B, I420, YV12, Y42B, v308 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { AYUV, RGBA, ARGB, BGRA, ABGR, P010_10LE, v308, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:DMABuf):\n         format: DMA_DRM\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     }
                 },
                 "properties": {
+                    "drm-device": {
+                        "blurb": "Path of the DRM device to use for dumb buffer allocation",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": true,
+                        "controllable": false,
+                        "default": "NULL",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
                     "rotate-method": {
                         "blurb": "rotate method",
                         "conditionally-available": false,
@@ -29506,7 +36138,7 @@
         "description": "HTTP Live Streaming (HLS)",
         "elements": {
             "hlsdemux": {
-                "author": "Marc-Andre Lureau <marcandre.lureau@gmail.com>\nAndoni Morales Alastruey <ylatuya@gmail.com>",
+                "author": "Marc-Andre Lureau <marcandre.lureau@gmail.com>, Andoni Morales Alastruey <ylatuya@gmail.com>",
                 "description": "HTTP Live Streaming demuxer",
                 "hierarchy": 
                     "GstHLSDemux",
@@ -29888,6 +36520,152 @@
         "tracers": {},
         "url": "Unknown package origin"
     },
+    "insertbin": {
+        "description": "insertbin",
+        "elements": {
+            "insertbin": {
+                "author": "Olivier Crete <olivier.crete@collabora.com>",
+                "description": "Auto-links filter style elements insertally",
+                "hierarchy": 
+                    "GstInsertBin",
+                    "GstBin",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstChildProxy"
+                ,
+                "klass": "Generic/Bin/Filter",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "ANY",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "ANY",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none",
+                "signals": {
+                    "append": {
+                        "action": true,
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GstElement"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gpointer"
+                            },
+                            {
+                                "name": "arg2",
+                                "type": "gpointer"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
+                    "insert-after": {
+                        "action": true,
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GstElement"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "GstElement"
+                            },
+                            {
+                                "name": "arg2",
+                                "type": "gpointer"
+                            },
+                            {
+                                "name": "arg3",
+                                "type": "gpointer"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
+                    "insert-before": {
+                        "action": true,
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GstElement"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "GstElement"
+                            },
+                            {
+                                "name": "arg2",
+                                "type": "gpointer"
+                            },
+                            {
+                                "name": "arg3",
+                                "type": "gpointer"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
+                    "prepend": {
+                        "action": true,
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GstElement"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gpointer"
+                            },
+                            {
+                                "name": "arg2",
+                                "type": "gpointer"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
+                    "remove": {
+                        "action": true,
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GstElement"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gpointer"
+                            },
+                            {
+                                "name": "arg2",
+                                "type": "gpointer"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    }
+                }
+            }
+        },
+        "filename": "gstinsertbin",
+        "license": "LGPL",
+        "other-types": {},
+        "package": "GStreamer Bad Plug-ins",
+        "source": "gst-plugins-bad",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
     "inter": {
         "description": "plugin for inter-pipeline communication",
         "elements": {
@@ -30093,7 +36871,7 @@
                 "long-name": "Internal video sink",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     }
@@ -30129,7 +36907,7 @@
                 "long-name": "Internal video source",
                 "pad-templates": {
                     "src": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -30873,377 +37651,10 @@
                     }
                 },
                 "properties": {},
-                "rank": "none"
-            }
-        },
-        "filename": "gstjpegformat",
-        "license": "LGPL",
-        "other-types": {},
-        "package": "GStreamer Bad Plug-ins",
-        "source": "gst-plugins-bad",
-        "tracers": {},
-        "url": "Unknown package origin"
-    },
-    "kate": {
-        "description": "Kate plugin",
-        "elements": {
-            "katedec": {
-                "author": "Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>",
-                "description": "Decodes Kate text streams",
-                "hierarchy": 
-                    "GstKateDec",
-                    "GstElement",
-                    "GstObject",
-                    "GInitiallyUnowned",
-                    "GObject"
-                ,
-                "klass": "Codec/Decoder/Subtitle",
-                "long-name": "Kate stream text decoder",
-                "pad-templates": {
-                    "sink": {
-                        "caps": "subtitle/x-kate:\n",
-                        "direction": "sink",
-                        "presence": "always"
-                    },
-                    "src": {
-                        "caps": "text/x-raw:\n         format: { pango-markup, utf8 }\nsubpicture/x-dvd:\n",
-                        "direction": "src",
-                        "presence": "always"
-                    }
-                },
-                "properties": {
-                    "category": {
-                        "blurb": "The category of the stream",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "NULL",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gchararray",
-                        "writable": false
-                    },
-                    "language": {
-                        "blurb": "The language of the stream",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "NULL",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gchararray",
-                        "writable": false
-                    },
-                    "original-canvas-height": {
-                        "blurb": "The canvas height this stream was authored for (0 is unspecified)",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "0",
-                        "max": "2147483647",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gint",
-                        "writable": false
-                    },
-                    "original-canvas-width": {
-                        "blurb": "The canvas width this stream was authored for",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "0",
-                        "max": "2147483647",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gint",
-                        "writable": false
-                    },
-                    "remove-markup": {
-                        "blurb": "Remove markup from decoded text ?",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "false",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gboolean",
-                        "writable": true
-                    }
-                },
                 "rank": "primary"
-            },
-            "kateenc": {
-                "author": "Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>",
-                "description": "Encodes Kate streams from text or subpictures",
-                "hierarchy": 
-                    "GstKateEnc",
-                    "GstElement",
-                    "GstObject",
-                    "GInitiallyUnowned",
-                    "GObject"
-                ,
-                "interfaces": 
-                    "GstTagSetter"
-                ,
-                "klass": "Codec/Encoder/Subtitle",
-                "long-name": "Kate stream encoder",
-                "pad-templates": {
-                    "sink": {
-                        "caps": "text/x-raw:\n         format: { pango-markup, utf8 }\nsubpicture/x-dvd:\n",
-                        "direction": "sink",
-                        "presence": "always"
-                    },
-                    "src": {
-                        "caps": "subtitle/x-kate:\napplication/x-kate:\n",
-                        "direction": "src",
-                        "presence": "always"
-                    }
-                },
-                "properties": {
-                    "category": {
-                        "blurb": "The category of the stream",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gchararray",
-                        "writable": true
-                    },
-                    "default-spu-duration": {
-                        "blurb": "The assumed max duration (in seconds) of SPUs with no duration specified",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "1.5",
-                        "max": "3.40282e+38",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gfloat",
-                        "writable": true
-                    },
-                    "granule-rate-denominator": {
-                        "blurb": "The denominator of the granule rate",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "1",
-                        "max": "2147483647",
-                        "min": "1",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gint",
-                        "writable": true
-                    },
-                    "granule-rate-numerator": {
-                        "blurb": "The numerator of the granule rate",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "1000",
-                        "max": "2147483647",
-                        "min": "1",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gint",
-                        "writable": true
-                    },
-                    "granule-shift": {
-                        "blurb": "The granule shift",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "32",
-                        "max": "64",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gint",
-                        "writable": true
-                    },
-                    "keepalive-min-time": {
-                        "blurb": "Minimum time to emit keepalive packets (0 disables keepalive packets)",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "2.5",
-                        "max": "3.40282e+38",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gfloat",
-                        "writable": true
-                    },
-                    "language": {
-                        "blurb": "The language of the stream (e.g. \"fr\" or \"fr_FR\" for French)",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gchararray",
-                        "writable": true
-                    },
-                    "original-canvas-height": {
-                        "blurb": "The height of the canvas this stream was authored for (0 is unspecified)",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "0",
-                        "max": "2147483647",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gint",
-                        "writable": true
-                    },
-                    "original-canvas-width": {
-                        "blurb": "The width of the canvas this stream was authored for (0 is unspecified)",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "0",
-                        "max": "2147483647",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gint",
-                        "writable": true
-                    }
-                },
-                "rank": "none"
-            },
-            "kateparse": {
-                "author": "Vincent Penquerc'h <ogg.k.ogg.k at googlemail dot com>",
-                "description": "parse raw kate streams",
-                "hierarchy": 
-                    "GstKateParse",
-                    "GstElement",
-                    "GstObject",
-                    "GInitiallyUnowned",
-                    "GObject"
-                ,
-                "klass": "Codec/Parser/Subtitle",
-                "long-name": "Kate stream parser",
-                "pad-templates": {
-                    "sink": {
-                        "caps": "subtitle/x-kate:\napplication/x-kate:\n",
-                        "direction": "sink",
-                        "presence": "always"
-                    },
-                    "src": {
-                        "caps": "subtitle/x-kate:\napplication/x-kate:\n",
-                        "direction": "src",
-                        "presence": "always"
-                    }
-                },
-                "rank": "none"
-            },
-            "katetag": {
-                "author": "Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>",
-                "description": "Retags kate streams",
-                "hierarchy": 
-                    "GstKateTag",
-                    "GstKateParse",
-                    "GstElement",
-                    "GstObject",
-                    "GInitiallyUnowned",
-                    "GObject"
-                ,
-                "interfaces": 
-                    "GstTagSetter"
-                ,
-                "klass": "Formatter/Metadata",
-                "long-name": "Kate stream tagger",
-                "pad-templates": {
-                    "sink": {
-                        "caps": "subtitle/x-kate:\napplication/x-kate:\n",
-                        "direction": "sink",
-                        "presence": "always"
-                    },
-                    "src": {
-                        "caps": "subtitle/x-kate:\napplication/x-kate:\n",
-                        "direction": "src",
-                        "presence": "always"
-                    }
-                },
-                "properties": {
-                    "category": {
-                        "blurb": "Set the category of the stream",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gchararray",
-                        "writable": true
-                    },
-                    "language": {
-                        "blurb": "Set the language of the stream",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gchararray",
-                        "writable": true
-                    },
-                    "original-canvas-height": {
-                        "blurb": "Set the height of the canvas this stream was authored for (0 is unspecified)",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "-1",
-                        "max": "2147483647",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gint",
-                        "writable": true
-                    },
-                    "original-canvas-width": {
-                        "blurb": "Set the width of the canvas this stream was authored for (0 is unspecified)",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "-1",
-                        "max": "2147483647",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "gint",
-                        "writable": true
-                    }
-                },
-                "rank": "none"
             }
         },
-        "filename": "gstkate",
+        "filename": "gstjpegformat",
         "license": "LGPL",
         "other-types": {},
         "package": "GStreamer Bad Plug-ins",
@@ -31708,6 +38119,258 @@
                 },
                 "rank": "none"
             },
+            "ladspa-ladspa-rubberband-so-rubberband-pitchshifter-mono": {
+                "author": "Breakfast Quay, Juan Manuel Borges Caño <juanmabcmail@gmail.com>, Andy Wingo <wingo at pobox.com>, Steve Baker <stevebaker_org@yahoo.co.uk>, Erik Walthinsen <omega@cse.ogi.edu>, Stefan Sauer <ensonic@users.sf.net>, Wim Taymans <wim@fluendo.com>",
+                "description": "Rubber Band Mono Pitch Shifter",
+                "hierarchy": 
+                    "ladspa-ladspa-rubberband-so-rubberband-pitchshifter-mono",
+                    "GstLADSPAFilter",
+                    "GstAudioFilter",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Filter/Effect/Audio/LADSPA/Frequency/Pitch shifters",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "audio/x-raw:\n         format: F32LE\n       channels: 1\n           rate:  1, 2147483647 \n         layout: interleaved\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "audio/x-raw:\n         format: F32LE\n       channels: 1\n           rate:  1, 2147483647 \n         layout: interleaved\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "cents": {
+                        "blurb": "Cents",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "100",
+                        "min": "-100",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "crispness": {
+                        "blurb": "Crispness",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "3",
+                        "max": "3",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "formant-preserving": {
+                        "blurb": "Formant Preserving",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "latency": {
+                        "blurb": "latency",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": false
+                    },
+                    "octaves": {
+                        "blurb": "Octaves",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "2",
+                        "min": "-2",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "semitones": {
+                        "blurb": "Semitones",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "12",
+                        "min": "-12",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "wet-dry-mix": {
+                        "blurb": "Wet-Dry Mix",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "ladspa-ladspa-rubberband-so-rubberband-pitchshifter-stereo": {
+                "author": "Breakfast Quay, Juan Manuel Borges Caño <juanmabcmail@gmail.com>, Andy Wingo <wingo at pobox.com>, Steve Baker <stevebaker_org@yahoo.co.uk>, Erik Walthinsen <omega@cse.ogi.edu>, Stefan Sauer <ensonic@users.sf.net>, Wim Taymans <wim@fluendo.com>",
+                "description": "Rubber Band Stereo Pitch Shifter",
+                "hierarchy": 
+                    "ladspa-ladspa-rubberband-so-rubberband-pitchshifter-stereo",
+                    "GstLADSPAFilter",
+                    "GstAudioFilter",
+                    "GstBaseTransform",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Filter/Effect/Audio/LADSPA/Frequency/Pitch shifters",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "audio/x-raw:\n         format: F32LE\n       channels: 2\n           rate:  1, 2147483647 \n         layout: interleaved\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "audio/x-raw:\n         format: F32LE\n       channels: 2\n           rate:  1, 2147483647 \n         layout: interleaved\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "cents": {
+                        "blurb": "Cents",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "100",
+                        "min": "-100",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    },
+                    "crispness": {
+                        "blurb": "Crispness",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "3",
+                        "max": "3",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "formant-preserving": {
+                        "blurb": "Formant Preserving",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "latency": {
+                        "blurb": "latency",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "3.40282e+38",
+                        "min": "-3.40282e+38",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": false
+                    },
+                    "octaves": {
+                        "blurb": "Octaves",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "2",
+                        "min": "-2",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "semitones": {
+                        "blurb": "Semitones",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "12",
+                        "min": "-12",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "wet-dry-mix": {
+                        "blurb": "Wet-Dry Mix",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": true,
+                        "default": "0",
+                        "max": "1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gfloat",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
             "ladspa-sine-so-sine-faaa": {
                 "author": "Richard Furse (LADSPA example plugins), Juan Manuel Borges Caño <juanmabcmail@gmail.com>, Andy Wingo <wingo at pobox.com>, Steve Baker <stevebaker_org@yahoo.co.uk>, Erik Walthinsen <omega@cse.ogi.edu>, Stefan Sauer <ensonic@users.sf.net>, Wim Taymans <wim@fluendo.com>",
                 "description": "Sine Oscillator (Freq:audio, Amp:audio)",
@@ -32081,6 +38744,73 @@
         "tracers": {},
         "url": "Unknown package origin"
     },
+    "lc3": {
+        "description": "LC3 codec for Bluetooth LE Audio",
+        "elements": {
+            "lc3dec": {
+                "author": "Taruntej Kanakamalla <taruntej@asymptotic.io>",
+                "description": "Decodes an LC3 Audio stream to raw audio",
+                "hierarchy": 
+                    "GstLc3Dec",
+                    "GstAudioDecoder",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Codec/Decoder/Audio",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "audio/x-lc3:\n           rate: { (int)8000, (int)16000, (int)24000, (int)32000, (int)48000 }\n       channels:  1, 2147483647 \n    frame-bytes:  20, 400 \nframe-duration-us: { (int)10000, (int)7500 }\n         framed: true\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "audio/x-raw:\n         format: { S16LE, S24LE, S32LE, F32LE }\n           rate: { (int)8000, (int)16000, (int)24000, (int)32000, (int)48000 }\n       channels:  1, 2147483647 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            },
+            "lc3enc": {
+                "author": "Taruntej Kanakamalla <taruntej@asymptotic.io>",
+                "description": "Encodes a raw audio stream to LC3",
+                "hierarchy": 
+                    "GstLc3Enc",
+                    "GstAudioEncoder",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstPreset"
+                ,
+                "klass": "Codec/Encoder/Audio",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "audio/x-raw:\n         format: { S16LE, S24LE, S32LE, F32LE }\n           rate: { (int)8000, (int)16000, (int)24000, (int)32000, (int)48000 }\n       channels:  1, 2147483647 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "audio/x-lc3:\n           rate: { (int)8000, (int)16000, (int)24000, (int)32000, (int)48000 }\n       channels:  1, 2147483647 \n    frame-bytes:  20, 400 \nframe-duration-us: { (int)10000, (int)7500 }\n         framed: true\n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            }
+        },
+        "filename": "gstlc3",
+        "license": "LGPL",
+        "other-types": {},
+        "package": "GStreamer Bad Plug-ins",
+        "source": "gst-plugins-bad",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
     "legacyrawparse": {
         "description": "Parses byte streams into raw frames",
         "elements": {
@@ -211685,19 +218415,19 @@
                 "klass": "Codec/Encoder/Audio",
                 "pad-templates": {
                     "sink": {
-                        "caps": "audio/x-raw:\n         layout: interleaved\n         format: S16LE\n       channels: { (int)1, (int)2, (int)6 }\n           rate: { (int)44100, (int)48000 }\n",
+                        "caps": "audio/x-raw:\n         layout: interleaved\n         format: S16LE\n       channels: { (int)1, (int)2, (int)6, (int)8 }\n           rate: { (int)11025, (int)16000, (int)22050, (int)24000, (int)32000, (int)44100, (int)48000, (int)96000 }\n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "audio/mpeg:\n    mpegversion: 4\n  stream-format: raw\n         framed: true\n   base-profile: lc\n       channels: { (int)1, (int)2, (int)6 }\n           rate: { (int)44100, (int)48000 }\n",
+                        "caps": "audio/mpeg:\n    mpegversion: 4\n  stream-format: raw\n         framed: true\n   base-profile: lc\n       channels: { (int)1, (int)2, (int)6, (int)8 }\n           rate: { (int)11025, (int)16000, (int)22050, (int)24000, (int)32000, (int)44100, (int)48000, (int)96000 }\n",
                         "direction": "src",
                         "presence": "always"
                     }
                 },
                 "properties": {
                     "bitrate": {
-                        "blurb": "Bitrate in bit/sec, (0 = auto), valid values are { 0, 96000, 128000, 160000, 192000, 576000, 768000, 960000, 1152000 }",
+                        "blurb": "Bitrate in bit/sec, (0 = auto), valid values are { 0, 8000, 12000, 16000, 24000, 32000, 48000, 64000, 96000, 128000, 160000, 192000, 256000, 320000, 480000, 512000, 576000, 640000, 720000, 768000, 960000, 1152000 }",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -212903,7 +219633,7 @@
         "description": "High-quality MPEG-1/2 video encoder",
         "elements": {
             "mpeg2enc": {
-                "author": "Andrew Stevens <andrew.stevens@nexgo.de>\nRonald Bultje <rbultje@ronald.bitfreak.net>",
+                "author": "Andrew Stevens <andrew.stevens@nexgo.de>, Ronald Bultje <rbultje@ronald.bitfreak.net>",
                 "description": "High-quality MPEG-1/2 video encoder",
                 "hierarchy": 
                     "GstMpeg2enc",
@@ -213772,7 +220502,7 @@
         "description": "MPEG TS demuxer",
         "elements": {
             "tsdemux": {
-                "author": "Zaheer Abbas Merali <zaheerabbas at merali dot org>\nEdward Hervey <edward.hervey@collabora.co.uk>",
+                "author": "Zaheer Abbas Merali <zaheerabbas at merali dot org>, Edward Hervey <edward.hervey@collabora.co.uk>",
                 "description": "Demuxes MPEG2 transport streams",
                 "hierarchy": 
                     "GstTSDemux",
@@ -214064,7 +220794,7 @@
                 "long-name": "MPEG Transport Stream Muxer",
                 "pad-templates": {
                     "sink_%%d": {
-                        "caps": "video/mpeg:\n         parsed: true\n    mpegversion: { (int)1, (int)2, (int)4 }\n   systemstream: false\nvideo/x-dirac:\nimage/x-jpc:\n      alignment: frame\nvideo/x-h264:\n  stream-format: byte-stream\n      alignment: { (string)au, (string)nal }\nvideo/x-h265:\n  stream-format: byte-stream\n      alignment: { (string)au, (string)nal }\naudio/mpeg:\n         parsed: true\n    mpegversion: 1\naudio/mpeg:\n         framed: true\n    mpegversion: { (int)2, (int)4 }\n  stream-format: { (string)adts, (string)raw }\naudio/x-lpcm:\n          width: { (int)16, (int)20, (int)24 }\n           rate: { (int)48000, (int)96000 }\n       channels:  1, 8 \n  dynamic_range:  0, 255 \n       emphasis: { (boolean)false, (boolean)true }\n           mute: { (boolean)false, (boolean)true }\naudio/x-ac3:\n         framed: true\naudio/x-dts:\n         framed: true\naudio/x-opus:\n       channels:  1, 8 \nchannel-mapping-family: { (int)0, (int)1 }\nsubpicture/x-dvb:\napplication/x-teletext:\nmeta/x-klv:\n         parsed: true\nimage/x-jpc:\n      alignment: frame\n        profile:  0, 49151 \n",
+                        "caps": "video/mpeg:\n         parsed: true\n    mpegversion: { (int)1, (int)2, (int)4 }\n   systemstream: false\nvideo/x-dirac:\nimage/x-jpc:\n      alignment: frame\nvideo/x-h264:\n  stream-format: byte-stream\n      alignment: { (string)au, (string)nal }\nvideo/x-h265:\n  stream-format: byte-stream\n      alignment: { (string)au, (string)nal }\naudio/mpeg:\n         parsed: true\n    mpegversion: 1\naudio/mpeg:\n         framed: true\n    mpegversion: { (int)2, (int)4 }\n  stream-format: { (string)adts, (string)raw }\naudio/x-lpcm:\n          width: { (int)16, (int)20, (int)24 }\n           rate: { (int)48000, (int)96000 }\n       channels:  1, 8 \n  dynamic_range:  0, 255 \n       emphasis: { (boolean)false, (boolean)true }\n           mute: { (boolean)false, (boolean)true }\naudio/x-ac3:\n         framed: true\naudio/x-dts:\n         framed: true\naudio/x-opus:\n       channels:  1, 255 \nsubpicture/x-dvb:\napplication/x-teletext:\nmeta/x-klv:\n         parsed: true\nimage/x-jpc:\n      alignment: frame\n        profile:  0, 49151 \n",
                         "direction": "sink",
                         "presence": "request",
                         "type": "GstBaseTsMuxPad"
@@ -214242,7 +220972,22 @@
                     "GObject"
                 ,
                 "kind": "object",
-                "properties": {},
+                "properties": {
+                    "stream-number": {
+                        "blurb": "stream number",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "31",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    }
+                },
                 "signals": {}
             }
         },
@@ -214255,7 +221000,7 @@
         "description": "High-quality MPEG/DVD/SVCD/VCD video/audio multiplexer",
         "elements": {
             "mplex": {
-                "author": "Andrew Stevens <andrew.stevens@nexgo.de>\nRonald Bultje <rbultje@ronald.bitfreak.net>\nMark Nauwelaerts <mnauw@users.sourceforge.net>",
+                "author": "Andrew Stevens <andrew.stevens@nexgo.de>, Ronald Bultje <rbultje@ronald.bitfreak.net>, Mark Nauwelaerts <mnauw@users.sourceforge.net>",
                 "description": "High-quality MPEG/DVD/SVCD/VCD video/audio multiplexer",
                 "hierarchy": 
                     "GstMplex",
@@ -214636,7 +221381,7 @@
                 "long-name": "Intel MSDK H264 encoder",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw\n        format: { NV12, I420, YV12, YUY2, UYVY, BGRA }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\nvideo/x-raw(memory:DMABuf)\n        format: NV12\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\n",
+                        "caps": "video/x-raw\n        format: { NV12, YUY2, UYVY, BGRA }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\nvideo/x-raw(memory:DMABuf)\n        format: NV12\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\n",
                         "direction": "sink",
                         "presence": "always"
                     },
@@ -214722,7 +221467,49 @@
                         "writable": true
                     },
                     "max-qp": {
-                        "blurb": "Maximum quantizer for I/P/B frames",
+                        "blurb": "Maximum quantizer scale for I/P/B frames",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-qp-b": {
+                        "blurb": "Maximum quantizer scale for B frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-qp-i": {
+                        "blurb": "Maximum quantizer scale for I frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-qp-p": {
+                        "blurb": "Maximum quantizer scale for P frame",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -214750,7 +221537,49 @@
                         "writable": true
                     },
                     "min-qp": {
-                        "blurb": "Minimal quantizer for I/P/B frames",
+                        "blurb": "Minimal quantizer scale for I/P/B frames",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "min-qp-b": {
+                        "blurb": "Miminum quantizer scale for B frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "min-qp-i": {
+                        "blurb": "Miminum quantizer scale for I frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "min-qp-p": {
+                        "blurb": "Miminum quantizer scale for P frame",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -214775,6 +221604,18 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "pic-timing-sei": {
+                        "blurb": "Insert picture timing SEI with pic_struct syntax",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "rc-lookahead-ds": {
                         "blurb": "Down sampling mode in look ahead bitrate control",
                         "conditionally-available": false,
@@ -214872,7 +221713,7 @@
                 "long-name": "Intel MSDK H265 encoder",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw\n        format: { NV12, I420, YV12, YUY2, UYVY, BGRA, P010_10LE, VUYA, Y410, Y210, P012_LE }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\nvideo/x-raw(memory:DMABuf)\n        format: { NV12, P010_10LE }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\n",
+                        "caps": "video/x-raw\n        format: { NV12, YUY2, BGRA, BGR10A2_LE, P010_10LE, VUYA, Y410, Y210, P012_LE }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\nvideo/x-raw(memory:DMABuf)\n        format: { NV12, P010_10LE }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\n",
                         "direction": "sink",
                         "presence": "always"
                     },
@@ -214934,7 +221775,49 @@
                         "writable": true
                     },
                     "max-qp": {
-                        "blurb": "Maximum quantizer for I/P/B frames",
+                        "blurb": "Maximum quantizer scale for I/P/B frames",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-qp-b": {
+                        "blurb": "Maximum quantizer scale for B frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-qp-i": {
+                        "blurb": "Maximum quantizer scale for I frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-qp-p": {
+                        "blurb": "Maximum quantizer scale for P frame",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -214962,7 +221845,49 @@
                         "writable": true
                     },
                     "min-qp": {
-                        "blurb": "Minimal quantizer for I/P/B frames",
+                        "blurb": "Minimal quantizer scale for I/P/B frames",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "min-qp-b": {
+                        "blurb": "Miminum quantizer scale for B frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "min-qp-i": {
+                        "blurb": "Miminum quantizer scale for I frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "51",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "min-qp-p": {
+                        "blurb": "Miminum quantizer scale for P frame",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -215015,6 +221940,18 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "pic-timing-sei": {
+                        "blurb": "Insert picture timing SEI with pic_struct syntax",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "transform-skip": {
                         "blurb": "Transform Skip option",
                         "conditionally-available": false,
@@ -215087,7 +222024,7 @@
                 "long-name": "Intel MSDK MJPEG encoder",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw\n        format: { NV12, I420, YV12, YUY2, UYVY, BGRA }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\nvideo/x-raw(memory:DMABuf)\n        format: NV12\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\n",
+                        "caps": "video/x-raw\n        format: { NV12, YUY2, UYVY, BGRA }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\nvideo/x-raw(memory:DMABuf)\n        format: NV12\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\n",
                         "direction": "sink",
                         "presence": "always"
                     },
@@ -215173,7 +222110,7 @@
                 "long-name": "Intel MSDK MPEG2 encoder",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw\n        format: { NV12, I420, YV12, YUY2, UYVY, BGRA }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\nvideo/x-raw(memory:DMABuf)\n        format: NV12\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\n",
+                        "caps": "video/x-raw\n        format: { NV12 }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\nvideo/x-raw(memory:DMABuf)\n        format: NV12\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\n",
                         "direction": "sink",
                         "presence": "always"
                     },
@@ -215328,7 +222265,7 @@
                 "long-name": "Intel MSDK VP9 encoder",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw\n        format: { NV12, I420, YV12, YUY2, UYVY, BGRA, P010_10LE, VUYA, Y410 }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\nvideo/x-raw(memory:DMABuf)\n        format: { NV12, P010_10LE }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\n",
+                        "caps": "video/x-raw\n        format: { NV12, P010_10LE, VUYA, Y410 }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\nvideo/x-raw(memory:DMABuf)\n        format: { NV12, P010_10LE }\n         width:  1, 2147483647 \n        height:  1, 2147483647 \n     framerate:  0/1, 2147483647/1 \ninterlace-mode: progressive\n",
                         "direction": "sink",
                         "presence": "always"
                     },
@@ -215553,6 +222490,18 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "hdr-tone-mapping": {
+                        "blurb": "Enable HDR to SDR tone mapping",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "hue": {
                         "blurb": "The hue of the video",
                         "conditionally-available": false,
@@ -216409,6 +223358,126 @@
         "tracers": {},
         "url": "Unknown package origin"
     },
+    "mse": {
+        "description": "W3C Media Source Extensions Support",
+        "elements": {
+            "msesrc": {
+                "author": "Collabora",
+                "description": "Implements a GStreamer Source for the gstreamer-mse API",
+                "hierarchy": 
+                    "GstMseSrc",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstURIHandler"
+                ,
+                "klass": "Generic/Source",
+                "pad-templates": {
+                    "src_%%s": {
+                        "caps": "ANY",
+                        "direction": "src",
+                        "presence": "sometimes",
+                        "type": "GstMseSrcPad"
+                    }
+                },
+                "properties": {
+                    "duration": {
+                        "blurb": "The duration of the stream as a GstClockTime",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "18446744073709551615",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint64",
+                        "writable": true
+                    },
+                    "n-audio": {
+                        "blurb": "The number of audio tracks in the Media Source",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "n-text": {
+                        "blurb": "The number of text tracks in the Media Source",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "n-video": {
+                        "blurb": "The number of video tracks in the Media Source",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "position": {
+                        "blurb": "The playback position as a GstClockTime",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "18446744073709551615",
+                        "max": "18446744073709551615",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint64",
+                        "writable": false
+                    },
+                    "ready-state": {
+                        "blurb": "The Ready State of this Element",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "nothing (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstMseSrcReadyState",
+                        "writable": false
+                    }
+                },
+                "rank": "none"
+            }
+        },
+        "filename": "gstmse",
+        "license": "LGPL",
+        "other-types": {},
+        "package": "GStreamer Bad Plug-ins",
+        "source": "gst-plugins-bad",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
     "musepack": {
         "description": "Musepack decoder",
         "elements": {
@@ -216987,12 +224056,12 @@
                 "klass": "Filter/Converter/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA, GBR_10LE, GBR_12LE, GBR_16LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA, GBR_10LE, GBR_12LE, GBR_16LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -217012,22 +224081,25 @@
                     "GInitiallyUnowned",
                     "GObject"
                 ,
-                "klass": "Filter/Converter/Video/Scaler/Colorspace/Hardware",
+                "interfaces": 
+                    "GstVideoDirection"
+                ,
+                "klass": "Filter/Converter/Video/Scaler/Colorspace/Effect/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA, GBR_10LE, GBR_12LE, GBR_16LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA, GBR_10LE, GBR_12LE, GBR_16LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
                 },
                 "properties": {
                     "add-borders": {
-                        "blurb": "Add black borders if necessary to keep the display aspect ratio",
+                        "blurb": "Add borders if necessary to keep the display aspect ratio",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -217057,16 +224129,180 @@
                 "klass": "Filter/Video",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    },
+                    "src": {
+                        "caps": "video/x-raw:\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:GLMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, Y444, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory):\n         format: { I420, YV12, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, BGRx, RGBx, Y42B, I422_10LE, I422_12LE, GBR, GBR, GBR_10LE, GBR_12LE, GBR_16LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            },
+            "cudaipcsink": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Send CUDA memory to peer cudaipcsrc elements",
+                "hierarchy": 
+                    "GstCudaIpcSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Sink/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
+                    }
+                },
+                "properties": {
+                    "address": {
+                        "blurb": "Server address. Specifies name of WIN32 named pipe or unix domain socket path on Linux",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "\\\\.\\pipe\\gst.cuda.ipc",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "cuda-device-id": {
+                        "blurb": "CUDA device id to use (-1 = auto)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "2147483647",
+                        "min": "-1",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
                     },
+                    "ipc-mode": {
+                        "blurb": "IPC mode to use",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "legacy (0)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GstCudaIpcMode",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "cudaipcsrc": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Receive CUDA memory from the cudaipcsrc element",
+                "hierarchy": 
+                    "GstCudaIpcSrc",
+                    "GstBaseSrc",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Source/Video",
+                "pad-templates": {
                     "src": {
-                        "caps": "video/x-raw:\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:GLMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, Y444, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory):\n         format: { I420, YV12, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, BGRx, RGBx, Y42B, I422_10LE, I422_12LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
                 },
+                "properties": {
+                    "address": {
+                        "blurb": "Server address. Specifies name of WIN32 named pipe or unix domain socket path on Linux",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "\\\\.\\pipe\\gst.cuda.ipc",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "buffer-size": {
+                        "blurb": "Size of internal buffer",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "3",
+                        "max": "2147483647",
+                        "min": "1",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "connection-timeout": {
+                        "blurb": "Connection timeout in seconds (0 = never timeout)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "5",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "cuda-device-id": {
+                        "blurb": "CUDA device id to use (-1 = auto)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "2147483647",
+                        "min": "-1",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "io-mode": {
+                        "blurb": "Memory I/O mode to use. This option will be ignored if the selected IPC mode is mmap",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "copy (0)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GstCudaIpcIOMode",
+                        "writable": true
+                    },
+                    "processing-deadline": {
+                        "blurb": "Maximum processing time for a buffer in nanoseconds",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "20000000",
+                        "max": "18446744073709551615",
+                        "min": "0",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "guint64",
+                        "writable": true
+                    }
+                },
                 "rank": "none"
             },
             "cudascale": {
@@ -217085,19 +224321,19 @@
                 "klass": "Filter/Converter/Video/Scaler/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA, GBR_10LE, GBR_12LE, GBR_16LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA, GBR_10LE, GBR_12LE, GBR_16LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
                 },
                 "properties": {
                     "add-borders": {
-                        "blurb": "Add black borders if necessary to keep the display aspect ratio",
+                        "blurb": "Add borders if necessary to keep the display aspect ratio",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -217127,12 +224363,12 @@
                 "klass": "Filter/Video",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw:\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:GLMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, Y444, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory):\n         format: { I420, YV12, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, BGRx, RGBx, Y42B, I422_10LE, I422_12LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:GLMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, Y444, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:D3D11Memory):\n         format: { I420, YV12, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, BGRx, RGBx, Y42B, I422_10LE, I422_12LE, GBR, GBR, GBR_10LE, GBR_12LE, GBR_16LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -217157,7 +224393,7 @@
                 "klass": "Codec/Encoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\n\nvideo/x-raw(memory:D3D11Memory):\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\nvideo/x-raw:\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\n\nvideo/x-raw(memory:D3D11Memory):\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\n\nvideo/x-raw(memory:GLMemory):\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\nvideo/x-raw:\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\n",
                         "direction": "sink",
                         "presence": "always"
                     },
@@ -217412,6 +224648,18 @@
                         "type": "gint",
                         "writable": true
                     },
+                    "multi-pass": {
+                        "blurb": "Multi pass encoding",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderMultiPass",
+                        "writable": true
+                    },
                     "nonref-p": {
                         "blurb": "Automatic insertion of non-reference P-frames",
                         "conditionally-available": false,
@@ -217430,7 +224678,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "default (0)",
+                        "default": "p4 (11)",
                         "mutable": "playing",
                         "readable": true,
                         "type": "GstNvEncoderPreset",
@@ -217552,6 +224800,18 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "tune": {
+                        "blurb": "Encoding tune",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderTune",
+                        "writable": true
+                    },
                     "vbv-buffer-size": {
                         "blurb": "VBV(HRD) Buffer Size in kbits (0 = NVENC default)",
                         "conditionally-available": true,
@@ -217611,7 +224871,7 @@
                 "klass": "Codec/Encoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, P010_10LE, Y444, Y444_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\n\nvideo/x-raw(memory:D3D11Memory):\n         format: { NV12, P010_10LE, Y444, Y444_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\nvideo/x-raw:\n         format: { NV12, P010_10LE, Y444, Y444_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, P010_10LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\n\nvideo/x-raw(memory:D3D11Memory):\n         format: { NV12, P010_10LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\n\nvideo/x-raw(memory:GLMemory):\n         format: { NV12, P010_10LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\nvideo/x-raw:\n         format: { NV12, P010_10LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\n",
                         "direction": "sink",
                         "presence": "always"
                     },
@@ -217854,6 +225114,18 @@
                         "type": "gint",
                         "writable": true
                     },
+                    "multi-pass": {
+                        "blurb": "Multi pass encoding",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderMultiPass",
+                        "writable": true
+                    },
                     "nonref-p": {
                         "blurb": "Automatic insertion of non-reference P-frames",
                         "conditionally-available": false,
@@ -217872,7 +225144,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "default (0)",
+                        "default": "p4 (11)",
                         "mutable": "playing",
                         "readable": true,
                         "type": "GstNvEncoderPreset",
@@ -217994,6 +225266,18 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "tune": {
+                        "blurb": "Encoding tune",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderTune",
+                        "writable": true
+                    },
                     "vbv-buffer-size": {
                         "blurb": "VBV(HRD) Buffer Size in kbits (0 = NVENC default)",
                         "conditionally-available": true,
@@ -218055,7 +225339,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n          width:  128, 8192 \n         height:  128, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE }\n\nvideo/x-raw(memory:GLMemory):\n          width:  128, 8192 \n         height:  128, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  128, 8192 \n         height:  128, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE }\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, P010_10LE }\n          width:  128, 8192 \n         height:  128, 8192 \n\nvideo/x-raw(memory:D3D11Memory):\n         format: { I420, I420_10LE }\n          width:  128, 8192 \n         height:  128, 8192 \n\nvideo/x-raw(memory:GLMemory):\n         format: { NV12, P010_10LE }\n          width:  128, 8192 \n         height:  128, 8192 \nvideo/x-raw:\n         format: { NV12, P010_10LE }\n          width:  128, 8192 \n         height:  128, 8192 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -218074,9 +225358,65 @@
                         "readable": true,
                         "type": "guint",
                         "writable": false
+                    },
+                    "init-max-height": {
+                        "blurb": "Expected maximum coded height of stream. This value is used to pre-allocate higher dimension of output surfaces than that of input stream, in order to help decoder reconfiguration",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "8192",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "init-max-width": {
+                        "blurb": "Expected maximum coded width of stream. This value is used to pre-allocate higher dimension of output surfaces than that of input stream, in order to help decoder reconfiguration",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "8192",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-display-delay": {
+                        "blurb": "Improves pipelining of decode with display, 0 means no delay (auto = -1)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "16",
+                        "min": "-1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "num-output-surfaces": {
+                        "blurb": "Maximum number of output surfaces simultaneously mapped in CUDA output mode (0 = auto, 1 = always copy)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "64",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
                     }
                 },
-                "rank": "primary"
+                "rank": "primary + 1"
             },
             "nvcudah264enc": {
                 "author": "Seungha Yang <seungha@centricular.com>",
@@ -218096,7 +225436,7 @@
                 "klass": "Codec/Encoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\nvideo/x-raw:\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\n\nvideo/x-raw(memory:GLMemory):\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\nvideo/x-raw:\n         format: { NV12, Y444 }\n          width:  160, 4096 \n         height:  64, 4096 \n interlace-mode: progressive\n",
                         "direction": "sink",
                         "presence": "always"
                     },
@@ -218337,6 +225677,18 @@
                         "type": "gint",
                         "writable": true
                     },
+                    "multi-pass": {
+                        "blurb": "Multi pass encoding",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderMultiPass",
+                        "writable": true
+                    },
                     "nonref-p": {
                         "blurb": "Automatic insertion of non-reference P-frames",
                         "conditionally-available": false,
@@ -218355,7 +225707,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "default (0)",
+                        "default": "p4 (11)",
                         "mutable": "playing",
                         "readable": true,
                         "type": "GstNvEncoderPreset",
@@ -218477,6 +225829,18 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "tune": {
+                        "blurb": "Encoding tune",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderTune",
+                        "writable": true
+                    },
                     "vbv-buffer-size": {
                         "blurb": "VBV(HRD) Buffer Size in kbits (0 = NVENC default)",
                         "conditionally-available": true,
@@ -218536,7 +225900,7 @@
                 "klass": "Codec/Encoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, P010_10LE, Y444, Y444_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\nvideo/x-raw:\n         format: { NV12, P010_10LE, Y444, Y444_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, P010_10LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\n\nvideo/x-raw(memory:GLMemory):\n         format: { NV12, P010_10LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\nvideo/x-raw:\n         format: { NV12, P010_10LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\n",
                         "direction": "sink",
                         "presence": "always"
                     },
@@ -218765,6 +226129,18 @@
                         "type": "gint",
                         "writable": true
                     },
+                    "multi-pass": {
+                        "blurb": "Multi pass encoding",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderMultiPass",
+                        "writable": true
+                    },
                     "nonref-p": {
                         "blurb": "Automatic insertion of non-reference P-frames",
                         "conditionally-available": false,
@@ -218783,7 +226159,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "default (0)",
+                        "default": "p4 (11)",
                         "mutable": "playing",
                         "readable": true,
                         "type": "GstNvEncoderPreset",
@@ -218905,6 +226281,18 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "tune": {
+                        "blurb": "Encoding tune",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderTune",
+                        "writable": true
+                    },
                     "vbv-buffer-size": {
                         "blurb": "VBV(HRD) Buffer Size in kbits (0 = NVENC default)",
                         "conditionally-available": true,
@@ -219205,6 +226593,18 @@
                         "type": "gint",
                         "writable": true
                     },
+                    "multi-pass": {
+                        "blurb": "Multi pass encoding",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderMultiPass",
+                        "writable": true
+                    },
                     "nonref-p": {
                         "blurb": "Automatic insertion of non-reference P-frames",
                         "conditionally-available": false,
@@ -219223,7 +226623,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "default (0)",
+                        "default": "p4 (11)",
                         "mutable": "playing",
                         "readable": true,
                         "type": "GstNvEncoderPreset",
@@ -219345,6 +226745,18 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "tune": {
+                        "blurb": "Encoding tune",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderTune",
+                        "writable": true
+                    },
                     "vbv-buffer-size": {
                         "blurb": "VBV(HRD) Buffer Size in kbits (0 = NVENC default)",
                         "conditionally-available": true,
@@ -219404,7 +226816,7 @@
                 "klass": "Codec/Encoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { NV12, P010_10LE, Y444, Y444_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\nvideo/x-raw:\n         format: { NV12, P010_10LE, Y444, Y444_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { NV12, P010_10LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\nvideo/x-raw:\n         format: { NV12, P010_10LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  48, 8192 \n interlace-mode: progressive\n",
                         "direction": "sink",
                         "presence": "always"
                     },
@@ -219633,6 +227045,18 @@
                         "type": "gint",
                         "writable": true
                     },
+                    "multi-pass": {
+                        "blurb": "Multi pass encoding",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderMultiPass",
+                        "writable": true
+                    },
                     "nonref-p": {
                         "blurb": "Automatic insertion of non-reference P-frames",
                         "conditionally-available": false,
@@ -219651,7 +227075,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "default (0)",
+                        "default": "p4 (11)",
                         "mutable": "playing",
                         "readable": true,
                         "type": "GstNvEncoderPreset",
@@ -219773,6 +227197,18 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "tune": {
+                        "blurb": "Encoding tune",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "default (0)",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "GstNvEncoderTune",
+                        "writable": true
+                    },
                     "vbv-buffer-size": {
                         "blurb": "VBV(HRD) Buffer Size in kbits (0 = NVENC default)",
                         "conditionally-available": true,
@@ -219815,11 +227251,11 @@
                 "rank": "none"
             },
             "nvh264dec": {
-                "author": "Ericsson AB, http://www.ericsson.com, Seungha Yang <seungha.yang@navercorp.com>",
-                "description": "NVDEC video decoder",
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "NVIDIA H.264 video decoder",
                 "hierarchy": 
-                    "nvh264dec",
-                    "GstNvDec",
+                    "GstNvH264Dec",
+                    "GstH264Decoder",
                     "GstVideoDecoder",
                     "GstElement",
                     "GstObject",
@@ -219829,17 +227265,89 @@
                 "klass": "Codec/Decoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-h264:\n  stream-format: byte-stream\n      alignment: au\n        profile: { (string)constrained-baseline, (string)baseline, (string)main, (string)high, (string)constrained-high, (string)progressive-high }\n          width:  48, 4096 \n         height:  16, 4096 \n",
+                        "caps": "video/x-h264:\n  stream-format: { (string)avc, (string)avc3, (string)byte-stream }\n      alignment: au\n        profile: { (string)high, (string)main, (string)constrained-high, (string)constrained-baseline, (string)baseline, (string)progressive-high }\n      framerate:  0/1, 2147483647/1 \n          width:  48, 4096 \n         height:  16, 4096 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:GLMemory):\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: NV12\n          width:  48, 4096 \n         height:  16, 4096 \n\nvideo/x-raw(memory:D3D11Memory):\n         format: I420\n          width:  48, 4096 \n         height:  16, 4096 \n\nvideo/x-raw(memory:GLMemory):\n         format: NV12\n          width:  48, 4096 \n         height:  16, 4096 \nvideo/x-raw:\n         format: NV12\n          width:  48, 4096 \n         height:  16, 4096 \n",
                         "direction": "src",
                         "presence": "always"
                     }
                 },
-                "rank": "primary"
+                "properties": {
+                    "cuda-device-id": {
+                        "blurb": "Assigned CUDA device id",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "init-max-height": {
+                        "blurb": "Expected maximum coded height of stream. This value is used to pre-allocate higher dimension of output surfaces than that of input stream, in order to help decoder reconfiguration",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "4096",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "init-max-width": {
+                        "blurb": "Expected maximum coded width of stream. This value is used to pre-allocate higher dimension of output surfaces than that of input stream, in order to help decoder reconfiguration",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "4096",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-display-delay": {
+                        "blurb": "Improves pipelining of decode with display, 0 means no delay (auto = -1)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "16",
+                        "min": "-1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "num-output-surfaces": {
+                        "blurb": "Maximum number of output surfaces simultaneously mapped in CUDA output mode (0 = auto, 1 = always copy)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "64",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    }
+                },
+                "rank": "primary + 1"
             },
             "nvh264enc": {
                 "author": "Tim-Philipp Müller <tim@centricular.com>, Matthew Waters <matthew@centricular.com>, Seungha Yang <seungha.yang@navercorp.com>",
@@ -219964,12 +227472,12 @@
                 },
                 "rank": "primary + 256"
             },
-            "nvh264sldec": {
+            "nvh265dec": {
                 "author": "Seungha Yang <seungha@centricular.com>",
-                "description": "NVIDIA H.264 video decoder",
+                "description": "NVIDIA H.265 video decoder",
                 "hierarchy": 
-                    "GstNvH264SLDec",
-                    "GstH264Decoder",
+                    "GstNvH265Dec",
+                    "GstH265Decoder",
                     "GstVideoDecoder",
                     "GstElement",
                     "GstObject",
@@ -219979,12 +227487,12 @@
                 "klass": "Codec/Decoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-h264:\n  stream-format: { (string)avc, (string)avc3, (string)byte-stream }\n      alignment: au\n        profile: { (string)high, (string)main, (string)constrained-high, (string)constrained-baseline, (string)baseline }\n      framerate:  0/1, 2147483647/1 \n          width:  48, 4096 \n         height:  16, 4096 \n",
+                        "caps": "video/x-h265:\n  stream-format: { (string)hev1, (string)hvc1, (string)byte-stream }\n      alignment: au\n        profile: { (string)main, (string)main-10, (string)main-12, (string)main-444, (string)main-444-10, (string)main-444-12 }\n          width:  144, 8192 \n         height:  144, 8192 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:GLMemory):\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, P010_10LE, P012_LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  144, 8192 \n\nvideo/x-raw(memory:D3D11Memory):\n         format: { I420, I420_10LE, I420_12LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  144, 8192 \n\nvideo/x-raw(memory:GLMemory):\n         format: { NV12, P010_10LE, P012_LE, Y444, GBR }\n          width:  144, 8192 \n         height:  144, 8192 \nvideo/x-raw:\n         format: { NV12, P010_10LE, P012_LE, Y444, Y444_16LE, GBR, GBR_16LE }\n          width:  144, 8192 \n         height:  144, 8192 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -220003,36 +227511,65 @@
                         "readable": true,
                         "type": "guint",
                         "writable": false
-                    }
-                },
-                "rank": "secondary"
-            },
-            "nvh265dec": {
-                "author": "Ericsson AB, http://www.ericsson.com, Seungha Yang <seungha.yang@navercorp.com>",
-                "description": "NVDEC video decoder",
-                "hierarchy": 
-                    "nvh265dec",
-                    "GstNvDec",
-                    "GstVideoDecoder",
-                    "GstElement",
-                    "GstObject",
-                    "GInitiallyUnowned",
-                    "GObject"
-                ,
-                "klass": "Codec/Decoder/Video/Hardware",
-                "pad-templates": {
-                    "sink": {
-                        "caps": "video/x-h265:\n  stream-format: byte-stream\n      alignment: au\n        profile: { (string)main, (string)main-10, (string)main-12, (string)main-444, (string)main-444-10, (string)main-444-12 }\n          width:  144, 8192 \n         height:  144, 8192 \n",
-                        "direction": "sink",
-                        "presence": "always"
                     },
-                    "src": {
-                        "caps": "video/x-raw:\n          width:  144, 8192 \n         height:  144, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE, Y444, Y444_16LE, Y444_16LE }\n\nvideo/x-raw(memory:GLMemory):\n          width:  144, 8192 \n         height:  144, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE, Y444, Y444_16LE, Y444_16LE }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  144, 8192 \n         height:  144, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE, Y444, Y444_16LE, Y444_16LE }\n",
-                        "direction": "src",
-                        "presence": "always"
+                    "init-max-height": {
+                        "blurb": "Expected maximum coded height of stream. This value is used to pre-allocate higher dimension of output surfaces than that of input stream, in order to help decoder reconfiguration",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "8192",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "init-max-width": {
+                        "blurb": "Expected maximum coded width of stream. This value is used to pre-allocate higher dimension of output surfaces than that of input stream, in order to help decoder reconfiguration",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "8192",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-display-delay": {
+                        "blurb": "Improves pipelining of decode with display, 0 means no delay (auto = -1)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "16",
+                        "min": "-1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "num-output-surfaces": {
+                        "blurb": "Maximum number of output surfaces simultaneously mapped in CUDA output mode (0 = auto, 1 = always copy)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "64",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
                     }
                 },
-                "rank": "primary"
+                "rank": "primary + 1"
             },
             "nvh265enc": {
                 "author": "Tim-Philipp Müller <tim@centricular.com>, Matthew Waters <matthew@centricular.com>, Seungha Yang <pudding8757@gmail.com>",
@@ -220157,12 +227694,12 @@
                 },
                 "rank": "primary + 256"
             },
-            "nvh265sldec": {
-                "author": "Seungha Yang <seungha@centricular.com>",
-                "description": "NVIDIA H.265 video decoder",
+            "nvjpegdec": {
+                "author": "Ericsson AB, http://www.ericsson.com, Seungha Yang <seungha.yang@navercorp.com>",
+                "description": "NVDEC video decoder",
                 "hierarchy": 
-                    "GstNvH265SLDec",
-                    "GstH265Decoder",
+                    "nvjpegdec",
+                    "GstNvDec",
                     "GstVideoDecoder",
                     "GstElement",
                     "GstObject",
@@ -220172,60 +227709,76 @@
                 "klass": "Codec/Decoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-h265:\n  stream-format: { (string)hev1, (string)hvc1, (string)byte-stream }\n      alignment: au\n        profile: { (string)main, (string)main-10, (string)main-12, (string)main-444, (string)main-444-10, (string)main-444-12 }\n          width:  144, 8192 \n         height:  144, 8192 \n",
+                        "caps": "image/jpeg:\n          width:  64, 32768 \n         height:  64, 16384 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n          width:  144, 8192 \n         height:  144, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE, Y444, Y444_16LE, Y444_16LE }\n\nvideo/x-raw(memory:GLMemory):\n          width:  144, 8192 \n         height:  144, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE, Y444, Y444_16LE, Y444_16LE }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  144, 8192 \n         height:  144, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE, Y444, Y444_16LE, Y444_16LE }\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: NV12\n          width:  64, 32768 \n         height:  64, 16384 \n\nvideo/x-raw(memory:GLMemory):\n         format: NV12\n          width:  64, 32768 \n         height:  64, 16384 \nvideo/x-raw:\n         format: NV12\n          width:  64, 32768 \n         height:  64, 16384 \n",
                         "direction": "src",
                         "presence": "always"
                     }
                 },
-                "properties": {
-                    "cuda-device-id": {
-                        "blurb": "Assigned CUDA device id",
-                        "conditionally-available": false,
-                        "construct": false,
-                        "construct-only": false,
-                        "controllable": false,
-                        "default": "0",
-                        "max": "2147483647",
-                        "min": "0",
-                        "mutable": "null",
-                        "readable": true,
-                        "type": "guint",
-                        "writable": false
-                    }
-                },
-                "rank": "secondary"
+                "rank": "primary"
             },
-            "nvjpegdec": {
-                "author": "Ericsson AB, http://www.ericsson.com, Seungha Yang <seungha.yang@navercorp.com>",
-                "description": "NVDEC video decoder",
+            "nvjpegenc": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "Encode JPEG image using nvJPEG library",
                 "hierarchy": 
-                    "nvjpegdec",
-                    "GstNvDec",
-                    "GstVideoDecoder",
+                    "GstNvJpegEnc",
+                    "GstVideoEncoder",
                     "GstElement",
                     "GstObject",
                     "GInitiallyUnowned",
                     "GObject"
                 ,
-                "klass": "Codec/Decoder/Video/Hardware",
+                "interfaces": 
+                    "GstPreset"
+                ,
+                "klass": "Codec/Encoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "image/jpeg:\n          width:  64, 32768 \n         height:  64, 16384 \n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, I420, Y42B, Y444 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \nvideo/x-raw:\n         format: { I420, Y42B, Y444 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n          width:  64, 32768 \n         height:  64, 16384 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:GLMemory):\n          width:  64, 32768 \n         height:  64, 16384 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  64, 32768 \n         height:  64, 16384 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n",
+                        "caps": "image/jpeg:\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n",
                         "direction": "src",
                         "presence": "always"
                     }
                 },
-                "rank": "primary"
+                "properties": {
+                    "cuda-device-id": {
+                        "blurb": "CUDA device ID of associated GPU",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": false
+                    },
+                    "quality": {
+                        "blurb": "Quality of encoding",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "85",
+                        "max": "100",
+                        "min": "1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
             },
             "nvmpeg2videodec": {
                 "author": "Ericsson AB, http://www.ericsson.com, Seungha Yang <seungha.yang@navercorp.com>",
@@ -220247,7 +227800,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n          width:  48, 4080 \n         height:  16, 4080 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:GLMemory):\n          width:  48, 4080 \n         height:  16, 4080 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  48, 4080 \n         height:  16, 4080 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: NV12\n          width:  48, 4080 \n         height:  16, 4080 \n\nvideo/x-raw(memory:GLMemory):\n         format: NV12\n          width:  48, 4080 \n         height:  16, 4080 \nvideo/x-raw:\n         format: NV12\n          width:  48, 4080 \n         height:  16, 4080 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -220274,7 +227827,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n          width:  48, 2032 \n         height:  16, 2032 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:GLMemory):\n          width:  48, 2032 \n         height:  16, 2032 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  48, 2032 \n         height:  16, 2032 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: NV12\n          width:  48, 2032 \n         height:  16, 2032 \n\nvideo/x-raw(memory:GLMemory):\n         format: NV12\n          width:  48, 2032 \n         height:  16, 2032 \nvideo/x-raw:\n         format: NV12\n          width:  48, 2032 \n         height:  16, 2032 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -220301,7 +227854,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n          width:  48, 4080 \n         height:  16, 4080 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:GLMemory):\n          width:  48, 4080 \n         height:  16, 4080 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  48, 4080 \n         height:  16, 4080 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: NV12\n          width:  48, 4080 \n         height:  16, 4080 \n\nvideo/x-raw(memory:GLMemory):\n         format: NV12\n          width:  48, 4080 \n         height:  16, 4080 \nvideo/x-raw:\n         format: NV12\n          width:  48, 4080 \n         height:  16, 4080 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -220309,37 +227862,10 @@
                 "rank": "primary"
             },
             "nvvp8dec": {
-                "author": "Ericsson AB, http://www.ericsson.com, Seungha Yang <seungha.yang@navercorp.com>",
-                "description": "NVDEC video decoder",
-                "hierarchy": 
-                    "nvvp8dec",
-                    "GstNvDec",
-                    "GstVideoDecoder",
-                    "GstElement",
-                    "GstObject",
-                    "GInitiallyUnowned",
-                    "GObject"
-                ,
-                "klass": "Codec/Decoder/Video/Hardware",
-                "pad-templates": {
-                    "sink": {
-                        "caps": "video/x-vp8:\n          width:  48, 4096 \n         height:  16, 4096 \n",
-                        "direction": "sink",
-                        "presence": "always"
-                    },
-                    "src": {
-                        "caps": "video/x-raw:\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:GLMemory):\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n",
-                        "direction": "src",
-                        "presence": "always"
-                    }
-                },
-                "rank": "primary"
-            },
-            "nvvp8sldec": {
                 "author": "Seungha Yang <seungha@centricular.com>",
                 "description": "NVIDIA VP8 video decoder",
                 "hierarchy": 
-                    "GstNvVp8SLDec",
+                    "GstNvVp8Dec",
                     "GstVp8Decoder",
                     "GstVideoDecoder",
                     "GstElement",
@@ -220355,7 +227881,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:GLMemory):\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  48, 4096 \n         height:  16, 4096 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12 }\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: NV12\n          width:  48, 4096 \n         height:  16, 4096 \n\nvideo/x-raw(memory:D3D11Memory):\n         format: I420\n          width:  48, 4096 \n         height:  16, 4096 \n\nvideo/x-raw(memory:GLMemory):\n         format: NV12\n          width:  48, 4096 \n         height:  16, 4096 \nvideo/x-raw:\n         format: NV12\n          width:  48, 4096 \n         height:  16, 4096 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -220374,42 +227900,71 @@
                         "readable": true,
                         "type": "guint",
                         "writable": false
-                    }
-                },
-                "rank": "secondary"
-            },
-            "nvvp9dec": {
-                "author": "Ericsson AB, http://www.ericsson.com, Seungha Yang <seungha.yang@navercorp.com>",
-                "description": "NVDEC video decoder",
-                "hierarchy": 
-                    "nvvp9dec",
-                    "GstNvDec",
-                    "GstVideoDecoder",
-                    "GstElement",
-                    "GstObject",
-                    "GInitiallyUnowned",
-                    "GObject"
-                ,
-                "klass": "Codec/Decoder/Video/Hardware",
-                "pad-templates": {
-                    "sink": {
-                        "caps": "video/x-vp9:\n          width:  128, 8192 \n         height:  128, 8192 \n        profile: { (string)0, (string)2 }\n",
-                        "direction": "sink",
-                        "presence": "always"
                     },
-                    "src": {
-                        "caps": "video/x-raw:\n          width:  128, 8192 \n         height:  128, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE }\n\nvideo/x-raw(memory:GLMemory):\n          width:  128, 8192 \n         height:  128, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  128, 8192 \n         height:  128, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE }\n",
-                        "direction": "src",
-                        "presence": "always"
+                    "init-max-height": {
+                        "blurb": "Expected maximum coded height of stream. This value is used to pre-allocate higher dimension of output surfaces than that of input stream, in order to help decoder reconfiguration",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "4096",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "init-max-width": {
+                        "blurb": "Expected maximum coded width of stream. This value is used to pre-allocate higher dimension of output surfaces than that of input stream, in order to help decoder reconfiguration",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "4096",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-display-delay": {
+                        "blurb": "Improves pipelining of decode with display, 0 means no delay (auto = -1)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "16",
+                        "min": "-1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "num-output-surfaces": {
+                        "blurb": "Maximum number of output surfaces simultaneously mapped in CUDA output mode (0 = auto, 1 = always copy)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "64",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
                     }
                 },
                 "rank": "primary"
             },
-            "nvvp9sldec": {
+            "nvvp9dec": {
                 "author": "Seungha Yang <seungha@centricular.com>",
                 "description": "NVIDIA VP9 video decoder",
                 "hierarchy": 
-                    "GstNvVp9SLDec",
+                    "GstNvVp9Dec",
                     "GstVp9Decoder",
                     "GstVideoDecoder",
                     "GstElement",
@@ -220425,7 +227980,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n          width:  128, 8192 \n         height:  128, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE }\n\nvideo/x-raw(memory:GLMemory):\n          width:  128, 8192 \n         height:  128, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE }\n\nvideo/x-raw(memory:CUDAMemory):\n          width:  128, 8192 \n         height:  128, 8192 \n      framerate:  0/1, 2147483647/1 \n         format: { NV12, P010_10LE, P016_LE }\n",
+                        "caps": "video/x-raw(memory:CUDAMemory):\n         format: { NV12, P010_10LE, P012_LE }\n          width:  128, 8192 \n         height:  128, 8192 \n\nvideo/x-raw(memory:D3D11Memory):\n         format: { I420, I420_10LE, I420_12LE }\n          width:  128, 8192 \n         height:  128, 8192 \n\nvideo/x-raw(memory:GLMemory):\n         format: { NV12, P010_10LE, P012_LE }\n          width:  128, 8192 \n         height:  128, 8192 \nvideo/x-raw:\n         format: { NV12, P010_10LE, P012_LE }\n          width:  128, 8192 \n         height:  128, 8192 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -220444,9 +227999,65 @@
                         "readable": true,
                         "type": "guint",
                         "writable": false
+                    },
+                    "init-max-height": {
+                        "blurb": "Expected maximum coded height of stream. This value is used to pre-allocate higher dimension of output surfaces than that of input stream, in order to help decoder reconfiguration",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "8192",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "init-max-width": {
+                        "blurb": "Expected maximum coded width of stream. This value is used to pre-allocate higher dimension of output surfaces than that of input stream, in order to help decoder reconfiguration",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "8192",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-display-delay": {
+                        "blurb": "Improves pipelining of decode with display, 0 means no delay (auto = -1)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "-1",
+                        "max": "16",
+                        "min": "-1",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "num-output-surfaces": {
+                        "blurb": "Maximum number of output surfaces simultaneously mapped in CUDA output mode (0 = auto, 1 = always copy)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1",
+                        "max": "64",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
                     }
                 },
-                "rank": "secondary"
+                "rank": "primary"
             }
         },
         "filename": "gstnvcodec",
@@ -220491,6 +228102,36 @@
                     }
                 }
             },
+            "GstCudaIpcIOMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Copy remote memory",
+                        "name": "copy",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Import remote memory",
+                        "name": "import",
+                        "value": "1"
+                    }
+                
+            },
+            "GstCudaIpcMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Legacy IPC mode",
+                        "name": "legacy",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Memory Map",
+                        "name": "mmap",
+                        "value": "1"
+                    }
+                
+            },
             "GstCudaMemoryCopy": {
                 "hierarchy": 
                     "GstCudaMemoryCopy",
@@ -220938,50 +228579,124 @@
                 "interfaces": 
                     "GstPreset"
                 ,
-                "kind": "object"
+                "kind": "object",
+                "properties": {
+                    "cc-insert": {
+                        "blurb": "Closed Caption Insert mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "insert (0)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstNvEncoderSeiInsertMode",
+                        "writable": true
+                    }
+                }
+            },
+            "GstNvEncoderMultiPass": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Disable multi-pass when cqp, vbr or cbr is used. Otherwise encoder will select it based on rc-mode",
+                        "name": "default",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Disabled",
+                        "name": "disabled",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Two pass with quarter resolution encoding in first pass",
+                        "name": "two-pass-quarter",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "Two pass",
+                        "name": "two-pass",
+                        "value": "3"
+                    }
+                
             },
             "GstNvEncoderPreset": {
                 "kind": "enum",
                 "values": 
                     {
-                        "desc": "Default",
+                        "desc": "Default (deprecated, use p1~7 with tune)",
                         "name": "default",
                         "value": "0"
                     },
                     {
-                        "desc": "High Performance",
+                        "desc": "High Performance (deprecated, use p1~7 with tune)",
                         "name": "hp",
                         "value": "1"
                     },
                     {
-                        "desc": "High Quality",
+                        "desc": "High Quality (deprecated, use p1~7 with tune)",
                         "name": "hq",
                         "value": "2"
                     },
                     {
-                        "desc": "Low Latency",
+                        "desc": "Low Latency (deprecated, use p1~7 with tune)",
                         "name": "low-latency",
                         "value": "3"
                     },
                     {
-                        "desc": "Low Latency, High Quality",
+                        "desc": "Low Latency (deprecated, use p1~7 with tune), High Quality",
                         "name": "low-latency-hq",
                         "value": "4"
                     },
                     {
-                        "desc": "Low Latency, High Performance",
+                        "desc": "Low Latency (deprecated, use p1~7 with tune), High Performance",
                         "name": "low-latency-hp",
                         "value": "5"
                     },
                     {
-                        "desc": "Lossless",
+                        "desc": "Lossless (deprecated, use p1~7 with tune)",
                         "name": "lossless",
                         "value": "6"
                     },
                     {
-                        "desc": "Lossless, High Performance",
+                        "desc": "Lossless (deprecated, use p1~7 with tune), High Performance",
                         "name": "lossless-hp",
                         "value": "7"
+                    },
+                    {
+                        "desc": "P1, fastest",
+                        "name": "p1",
+                        "value": "8"
+                    },
+                    {
+                        "desc": "P2, faster",
+                        "name": "p2",
+                        "value": "9"
+                    },
+                    {
+                        "desc": "P3, fast",
+                        "name": "p3",
+                        "value": "10"
+                    },
+                    {
+                        "desc": "P4, medium",
+                        "name": "p4",
+                        "value": "11"
+                    },
+                    {
+                        "desc": "P5, slow",
+                        "name": "p5",
+                        "value": "12"
+                    },
+                    {
+                        "desc": "P6, slower",
+                        "name": "p6",
+                        "value": "13"
+                    },
+                    {
+                        "desc": "P7, slowest",
+                        "name": "p7",
+                        "value": "14"
                     }
                 
             },
@@ -221004,22 +228719,72 @@
                         "value": "2"
                     },
                     {
-                        "desc": "Low-Delay CBR, High Quality",
+                        "desc": "Low-Delay CBR, High Quality (deprecated, use cbr with tune and multipass)",
                         "name": "cbr-ld-hq",
                         "value": "3"
                     },
                     {
-                        "desc": "CBR, High Quality (slower)",
+                        "desc": "CBR, High Quality (deprecated, use cbr with tune and multipass)",
                         "name": "cbr-hq",
                         "value": "4"
                     },
                     {
-                        "desc": "VBR, High Quality (slower)",
+                        "desc": "VBR, High Quality (deprecated, use vbr with tune and multipass)",
                         "name": "vbr-hq",
                         "value": "5"
                     }
                 
             },
+            "GstNvEncoderSeiInsertMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "Insert SEI",
+                        "name": "insert",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "Insert SEI and remove corresponding meta from output buffer",
+                        "name": "insert-and-drop",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Disable SEI insertion",
+                        "name": "disabled",
+                        "value": "2"
+                    }
+                
+            },
+            "GstNvEncoderTune": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "High quality when p1~7 preset is used. Otherwise encoder will select it based on preset",
+                        "name": "default",
+                        "value": "0"
+                    },
+                    {
+                        "desc": "High quality",
+                        "name": "high-quality",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "Low latency",
+                        "name": "low-latency",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "Ultra low latency",
+                        "name": "ultra-low-latency",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "Lossless",
+                        "name": "lossless",
+                        "value": "4"
+                    }
+                
+            },
             "GstNvPreset": {
                 "kind": "enum",
                 "values": 
@@ -222416,7 +230181,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "/usr/share/OpenCV/haarcascades/haarcascade_frontalface_default.xml",
+                        "default": "/usr/share/opencv4/haarcascades/haarcascade_frontalface_default.xml",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -222485,7 +230250,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "/usr/share/OpenCV/haarcascades/haarcascade_mcs_eyepair_small.xml",
+                        "default": "/usr/share/opencv4/haarcascades/haarcascade_mcs_eyepair_small.xml",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -222565,7 +230330,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "/usr/share/OpenCV/haarcascades/haarcascade_mcs_mouth.xml",
+                        "default": "/usr/share/opencv4/haarcascades/haarcascade_mcs_mouth.xml",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -222577,7 +230342,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "/usr/share/OpenCV/haarcascades/haarcascade_mcs_nose.xml",
+                        "default": "/usr/share/opencv4/haarcascades/haarcascade_mcs_nose.xml",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -222589,7 +230354,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "/usr/share/OpenCV/haarcascades/haarcascade_frontalface_default.xml",
+                        "default": "/usr/share/opencv4/haarcascades/haarcascade_frontalface_default.xml",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -225711,6 +233476,48 @@
                         "type": "guint",
                         "writable": true
                     },
+                    "max-frame-size": {
+                        "blurb": "Maximum encoded frame size in bytes, used for VBR based bitrate control modes",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-frame-size-i": {
+                        "blurb": "Maximum encoded I frame size in bytes, used for VBR based bitrate control modes",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "max-frame-size-p": {
+                        "blurb": "Maximum encoded P and B frame size in bytes, used for VBR based bitrate control modes. \"max-frame-size-i\" must be non-zero, otherwise this propert will be ignored",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
                     "max-qp-b": {
                         "blurb": "Maximum allowed QP value for B-frame types (0: default)",
                         "conditionally-available": false,
@@ -225753,6 +233560,20 @@
                         "type": "guint",
                         "writable": true
                     },
+                    "max-slice-size": {
+                        "blurb": "Maximum slice size in bytes. If this parameter is specified other controls over number of slices are ignored",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
                     "min-qp-b": {
                         "blurb": "Minimum allowed QP value for B-frame types (0: default)",
                         "conditionally-available": false,
@@ -225795,6 +233616,62 @@
                         "type": "guint",
                         "writable": true
                     },
+                    "num-slice": {
+                        "blurb": "Number of slices in each video frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "65535",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "num-slice-b": {
+                        "blurb": "Number of slices for B frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "65535",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "num-slice-i": {
+                        "blurb": "Number of slices for I frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "65535",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "num-slice-p": {
+                        "blurb": "Number of slices for P frame",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "65535",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
                     "qp-b": {
                         "blurb": "Constant quantizer for B frames (0: default)",
                         "conditionally-available": false,
@@ -225902,6 +233779,18 @@
                         "readable": true,
                         "type": "guint",
                         "writable": true
+                    },
+                    "trellis": {
+                        "blurb": "Trellis quantization mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "unknown",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstQsvH264Trellis",
+                        "writable": true
                     }
                 },
                 "rank": "primary"
@@ -225921,12 +233810,12 @@
                 "klass": "Codec/Decoder/Video/Hardware",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-h265:\n          width:  1, 16384 \n         height:  1, 16384 \n  stream-format: { (string)byte-stream, (string)hev1, (string)hvc1 }\n      alignment: au\n        profile: { (string)main, (string)main-10 }\n",
+                        "caps": "video/x-h265:\n          width:  1, 16384 \n         height:  1, 16384 \n  stream-format: { (string)byte-stream, (string)hev1, (string)hvc1 }\n      alignment: au\n        profile: { (string)main, (string)main-10, (string)main-12, (string)main-422-10, (string)main-422-12, (string)main-444, (string)main-444-10, (string)main-444-12 }\n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: NV12\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: NV12\n          width:  1, 16384 \n         height:  1, 16384 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { NV12, P010_10LE, P012_LE, YUY2, Y210, Y212_LE, VUYA, RBGA, Y410, BGR10A2_LE, Y412_LE, BGRA64_LE }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { NV12, P010_10LE, P012_LE, YUY2, Y210, Y212_LE, VUYA, RBGA, Y410, BGR10A2_LE, Y412_LE, BGRA64_LE }\n          width:  1, 16384 \n         height:  1, 16384 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -226332,7 +234221,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { NV12, P010_10LE, P016_LE }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { NV12, P010_10LE, P016_LE }\n          width:  1, 16384 \n         height:  1, 16384 \n",
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { NV12, P010_10LE, P012_LE }\n          width:  1, 16384 \n         height:  1, 16384 \nvideo/x-raw:\n         format: { NV12, P010_10LE, P012_LE }\n          width:  1, 16384 \n         height:  1, 16384 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -226708,6 +234597,36 @@
                     }
                 
             },
+            "GstQsvH264Trellis": {
+                "kind": "flags",
+                "values": 
+                    {
+                        "desc": "Unknown",
+                        "name": "unknown",
+                        "value": "0x00000000"
+                    },
+                    {
+                        "desc": "Disable for all frame types",
+                        "name": "off",
+                        "value": "0x00000001"
+                    },
+                    {
+                        "desc": "Enable for I frames",
+                        "name": "i",
+                        "value": "0x00000002"
+                    },
+                    {
+                        "desc": "Enable for P frames",
+                        "name": "p",
+                        "value": "0x00000004"
+                    },
+                    {
+                        "desc": "Enable for B frames",
+                        "name": "b",
+                        "value": "0x00000008"
+                    }
+                
+            },
             "GstQsvH265EncRateControl": {
                 "kind": "enum",
                 "values": 
@@ -226794,11 +234713,73 @@
         "tracers": {},
         "url": "Unknown package origin"
     },
+    "qt6d3d11": {
+        "description": "Qt6 Direct3D11 plugin",
+        "elements": {
+            "qml6d3d11sink": {
+                "author": "Seungha Yang <seungha@centricular.com>",
+                "description": "A video sink that renders to a QQuickItem for Qt6 using Direct3D11",
+                "hierarchy": 
+                    "GstQml6D3D11Sink",
+                    "GstVideoSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstNavigation"
+                ,
+                "klass": "Sink/Video",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:D3D11Memory):\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-raw:\n         format: { RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, GBRA, GBRA_10LE, GBRA_12LE, Y410, YUY2 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "direction": "sink",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "force-aspect-ratio": {
+                        "blurb": "When enabled, scaling will respect original aspect ratio",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "widget": {
+                        "blurb": "The QQuickItem to place in the object hierarchy",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gpointer",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            }
+        },
+        "filename": "gstqt6d3d11",
+        "license": "LGPL",
+        "other-types": {},
+        "package": "GStreamer Bad Plug-ins",
+        "source": "gst-plugins-bad",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
     "removesilence": {
         "description": "Removes silence from an audio stream",
         "elements": {
             "removesilence": {
-                "author": "Tiago Katcipis <tiagokatcipis@gmail.com>\n        Paulo Pizarro  <paulo.pizarro@gmail.com>\n        Nicola Murino  <nicola.murino@gmail.com>",
+                "author": "Tiago Katcipis <tiagokatcipis@gmail.com>, Paulo Pizarro  <paulo.pizarro@gmail.com>, Nicola Murino  <nicola.murino@gmail.com>",
                 "description": "Removes all the silence periods from the audio stream.",
                 "hierarchy": 
                     "GstRemoveSilence",
@@ -226959,7 +234940,7 @@
                         "presence": "sometimes"
                     },
                     "video": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "sometimes"
                     }
@@ -227724,6 +235705,17 @@
                         "type": "gchararray",
                         "writable": true
                     },
+                    "caps": {
+                        "blurb": "The caps of the incoming stream",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstCaps",
+                        "writable": true
+                    },
                     "cname": {
                         "blurb": "Set the CNAME in the SDES block of the receiver report.",
                         "conditionally-available": false,
@@ -227736,6 +235728,18 @@
                         "type": "gchararray",
                         "writable": true
                     },
+                    "encoding-name": {
+                        "blurb": "Encoding name use to determine caps parameters",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "NULL",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
                     "max-rtcp-bandwidth": {
                         "blurb": "The maximum bandwidth used for RTCP as a fraction of RTP bandwdith",
                         "conditionally-available": false,
@@ -228413,6 +236417,18 @@
                         "type": "guint",
                         "writable": true
                     },
+                    "no-eof-is-error": {
+                        "blurb": "If set, an error is raised if the connection is closed without receiving an EOF RTMP message first. If not set, those are reported using EOS",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "stats": {
                         "blurb": "Retrieve a statistics structure",
                         "conditionally-available": false,
@@ -228489,7 +236505,7 @@
                         "construct": true,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "LNX 10,0,32,18",
+                        "default": "NULL",
                         "mutable": "null",
                         "readable": true,
                         "type": "gchararray",
@@ -229372,6 +237388,18 @@
                         "type": "guint",
                         "writable": true
                     },
+                    "media": {
+                        "blurb": "Media to use, e.g. audio or video (NULL = all)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "NULL",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
                     "redirect": {
                         "blurb": "Sends a redirection message instead of using a custom session element",
                         "conditionally-available": false,
@@ -229384,6 +237412,18 @@
                         "type": "gboolean",
                         "writable": true
                     },
+                    "rtcp-mode": {
+                        "blurb": "Enable or disable receiving of RTCP sender reports and sending of RTCP receiver reports",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "Send + Receive RTCP (3)",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstSDPDemuxRTCPMode",
+                        "writable": true
+                    },
                     "timeout": {
                         "blurb": "Fail transport after UDP timeout microseconds (0 = disabled)",
                         "conditionally-available": false,
@@ -229397,6 +237437,18 @@
                         "readable": true,
                         "type": "guint64",
                         "writable": true
+                    },
+                    "timeout-inactive-rtp-sources": {
+                        "blurb": "Whether RTP sources that don't receive RTP or RTCP packets for longer than 5x RTCP interval should be removed",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
                     }
                 },
                 "rank": "none",
@@ -229458,7 +237510,33 @@
         },
         "filename": "gstsdpelem",
         "license": "LGPL",
-        "other-types": {},
+        "other-types": {
+            "GstSDPDemuxRTCPMode": {
+                "kind": "enum",
+                "values": 
+                    {
+                        "desc": "sendrecv",
+                        "name": "Send + Receive RTCP",
+                        "value": "3"
+                    },
+                    {
+                        "desc": "recvonly",
+                        "name": "Receive RTCP sender reports",
+                        "value": "1"
+                    },
+                    {
+                        "desc": "sendonly",
+                        "name": "Send RTCP receiver reports",
+                        "value": "2"
+                    },
+                    {
+                        "desc": "inactivate",
+                        "name": "Disable RTCP",
+                        "value": "0"
+                    }
+                
+            }
+        },
         "package": "GStreamer Bad Plug-ins",
         "source": "gst-plugins-bad",
         "tracers": {},
@@ -230621,6 +238699,30 @@
                     }
                 },
                 "properties": {
+                    "authentication": {
+                        "blurb": "Authenticate a connection",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "auto-reconnect": {
+                        "blurb": "Automatically reconnect when connection fails",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "latency": {
                         "blurb": "Minimum latency (milliseconds)",
                         "conditionally-available": false,
@@ -230703,7 +238805,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "-1",
+                        "default": "1000",
                         "max": "2147483647",
                         "min": "-1",
                         "mutable": "ready",
@@ -230776,6 +238878,34 @@
                         "return-type": "void",
                         "when": "last"
                     },
+                    "caller-connecting": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GSocketAddress"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gchararray"
+                            }
+                        ,
+                        "return-type": "gboolean",
+                        "when": "last"
+                    },
+                    "caller-rejected": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GSocketAddress"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gchararray"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
                     "caller-removed": {
                         "args": 
                             {
@@ -230817,6 +238947,42 @@
                     }
                 },
                 "properties": {
+                    "authentication": {
+                        "blurb": "Authenticate a connection",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "auto-reconnect": {
+                        "blurb": "Automatically reconnect when connection fails",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "keep-listening": {
+                        "blurb": "Toggle keep-listening for connection reuse",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "latency": {
                         "blurb": "Minimum latency (milliseconds)",
                         "conditionally-available": false,
@@ -230899,7 +239065,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "-1",
+                        "default": "1000",
                         "max": "2147483647",
                         "min": "-1",
                         "mutable": "ready",
@@ -230972,6 +239138,34 @@
                         "return-type": "void",
                         "when": "last"
                     },
+                    "caller-connecting": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GSocketAddress"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gchararray"
+                            }
+                        ,
+                        "return-type": "gboolean",
+                        "when": "last"
+                    },
+                    "caller-rejected": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GSocketAddress"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gchararray"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
                     "caller-removed": {
                         "args": 
                             {
@@ -231046,6 +239240,491 @@
                         "value": "32"
                     }
                 
+            },
+            "GstSRTSink": {
+                "hierarchy": 
+                    "GstSRTSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstURIHandler"
+                ,
+                "kind": "object",
+                "properties": {
+                    "authentication": {
+                        "blurb": "Authenticate a connection",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "auto-reconnect": {
+                        "blurb": "Automatically reconnect when connection fails",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "latency": {
+                        "blurb": "Minimum latency (milliseconds)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "125",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "localaddress": {
+                        "blurb": "Local address to bind",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "NULL",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "localport": {
+                        "blurb": "Local port to bind",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "7001",
+                        "max": "65535",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "mode": {
+                        "blurb": "SRT connection mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "caller (1)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GstSRTConnectionMode",
+                        "writable": true
+                    },
+                    "passphrase": {
+                        "blurb": "Password for the encrypted transmission",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "",
+                        "mutable": "ready",
+                        "readable": false,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "pbkeylen": {
+                        "blurb": "Crypto key length in bytes",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "no-key (0)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GstSRTKeyLength",
+                        "writable": true
+                    },
+                    "poll-timeout": {
+                        "blurb": "Return poll wait after timeout milliseconds (-1 = infinite)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1000",
+                        "max": "2147483647",
+                        "min": "-1",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "stats": {
+                        "blurb": "SRT Statistics",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "application/x-srt-statistics, bytes-sent-total=(guint64)0;",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstStructure",
+                        "writable": false
+                    },
+                    "streamid": {
+                        "blurb": "Stream ID for the SRT access control",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "NULL",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "uri": {
+                        "blurb": "URI in the form of srt://address:port",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "srt://127.0.0.1:7001",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "wait-for-connection": {
+                        "blurb": "Block the stream until a client connects",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    }
+                },
+                "signals": {
+                    "caller-added": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "gint"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "GSocketAddress"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
+                    "caller-connecting": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GSocketAddress"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gchararray"
+                            }
+                        ,
+                        "return-type": "gboolean",
+                        "when": "last"
+                    },
+                    "caller-rejected": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GSocketAddress"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gchararray"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
+                    "caller-removed": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "gint"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "GSocketAddress"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    }
+                }
+            },
+            "GstSRTSrc": {
+                "hierarchy": 
+                    "GstSRTSrc",
+                    "GstPushSrc",
+                    "GstBaseSrc",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstURIHandler"
+                ,
+                "kind": "object",
+                "properties": {
+                    "authentication": {
+                        "blurb": "Authenticate a connection",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "auto-reconnect": {
+                        "blurb": "Automatically reconnect when connection fails",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "keep-listening": {
+                        "blurb": "Toggle keep-listening for connection reuse",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "latency": {
+                        "blurb": "Minimum latency (milliseconds)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "125",
+                        "max": "2147483647",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "localaddress": {
+                        "blurb": "Local address to bind",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "NULL",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "localport": {
+                        "blurb": "Local port to bind",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "7001",
+                        "max": "65535",
+                        "min": "0",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "mode": {
+                        "blurb": "SRT connection mode",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "caller (1)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GstSRTConnectionMode",
+                        "writable": true
+                    },
+                    "passphrase": {
+                        "blurb": "Password for the encrypted transmission",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "",
+                        "mutable": "ready",
+                        "readable": false,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "pbkeylen": {
+                        "blurb": "Crypto key length in bytes",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "no-key (0)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GstSRTKeyLength",
+                        "writable": true
+                    },
+                    "poll-timeout": {
+                        "blurb": "Return poll wait after timeout milliseconds (-1 = infinite)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "1000",
+                        "max": "2147483647",
+                        "min": "-1",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gint",
+                        "writable": true
+                    },
+                    "stats": {
+                        "blurb": "SRT Statistics",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "application/x-srt-statistics, bytes-received-total=(guint64)0;",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstStructure",
+                        "writable": false
+                    },
+                    "streamid": {
+                        "blurb": "Stream ID for the SRT access control",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "NULL",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "uri": {
+                        "blurb": "URI in the form of srt://address:port",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "srt://127.0.0.1:7001",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "wait-for-connection": {
+                        "blurb": "Block the stream until a client connects",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    }
+                },
+                "signals": {
+                    "caller-added": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "gint"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "GSocketAddress"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
+                    "caller-connecting": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GSocketAddress"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gchararray"
+                            }
+                        ,
+                        "return-type": "gboolean",
+                        "when": "last"
+                    },
+                    "caller-rejected": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "GSocketAddress"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gchararray"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
+                    "caller-removed": {
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "gint"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "GSocketAddress"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    }
+                }
             }
         },
         "package": "GStreamer Bad Plug-ins",
@@ -231870,7 +240549,7 @@
                         "construct": false,
                         "construct-only": false,
                         "controllable": false,
-                        "default": "false",
+                        "default": "true",
                         "mutable": "null",
                         "readable": true,
                         "type": "gboolean",
@@ -232695,7 +241374,7 @@
                     "GInitiallyUnowned",
                     "GObject"
                 ,
-                "klass": "Codec/Parser/Subtitle",
+                "klass": "Codec/Decoder/Subtitle",
                 "long-name": "TTML subtitle parser",
                 "pad-templates": {
                     "sink": {
@@ -232725,7 +241404,7 @@
                 "long-name": "TTML subtitle renderer",
                 "pad-templates": {
                     "src": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { DMA_DRM, A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     },
@@ -232735,7 +241414,7 @@
                         "presence": "always"
                     },
                     "video_sink": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { DMA_DRM, A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     }
@@ -232751,6 +241430,156 @@
         "tracers": {},
         "url": "Unknown package origin"
     },
+    "unixfd": {
+        "description": "Unix file descriptor sink and source",
+        "elements": {
+            "unixfdsink": {
+                "author": "Xavier Claessens <xavier.claessens@collabora.com>",
+                "description": "Unix file descriptor sink",
+                "hierarchy": 
+                    "GstUnixFdSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Sink",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "ANY",
+                        "direction": "sink",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "socket-path": {
+                        "blurb": "The path to the control socket used to control the shared memory transport. This may be modified during the NULL->READY transition",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "NULL",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "socket-type": {
+                        "blurb": "The type of underlying socket",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "path (2)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GUnixSocketAddressType",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            },
+            "unixfdsrc": {
+                "author": "Xavier Claessens <xavier.claessens@collabora.com>",
+                "description": "Unix file descriptor source",
+                "hierarchy": 
+                    "GstUnixFdSrc",
+                    "GstPushSrc",
+                    "GstBaseSrc",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "klass": "Src",
+                "pad-templates": {
+                    "src": {
+                        "caps": "ANY",
+                        "direction": "src",
+                        "presence": "always"
+                    }
+                },
+                "properties": {
+                    "socket-path": {
+                        "blurb": "The path to the control socket used to control the shared memory transport. This may be modified during the NULL->READY transition",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "NULL",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
+                    "socket-type": {
+                        "blurb": "The type of underlying socket",
+                        "conditionally-available": false,
+                        "construct": true,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "path (2)",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "GUnixSocketAddressType",
+                        "writable": true
+                    }
+                },
+                "rank": "none"
+            }
+        },
+        "filename": "gstunixfd",
+        "license": "LGPL",
+        "other-types": {},
+        "package": "GStreamer Bad Plug-ins",
+        "source": "gst-plugins-bad",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
+    "uvcgadget": {
+        "description": "gstuvcgadget plugin",
+        "elements": {
+            "uvcsink": {
+                "author": "Michael Grzeschik <mgr@pengutronix.de>",
+                "description": "Streams Video via UVC Gadget",
+                "hierarchy": 
+                    "GstUvcSink",
+                    "GstBin",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ,
+                "interfaces": 
+                    "GstChildProxy"
+                ,
+                "klass": "Sink/Video",
+                "properties": {
+                    "streaming": {
+                        "blurb": "The stream status of the host",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": false
+                    }
+                },
+                "rank": "none"
+            }
+        },
+        "filename": "gstuvcgadget",
+        "license": "LGPL",
+        "other-types": {},
+        "package": "GStreamer Bad Plug-ins",
+        "source": "gst-plugins-bad",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
     "uvch264": {
         "description": "UVC compliant H264 encoding cameras plugin",
         "elements": {
@@ -232849,12 +241678,12 @@
                         "presence": "always"
                     },
                     "vfsrc": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nimage/jpeg:\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nimage/jpeg:\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     },
                     "vidsrc": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nimage/jpeg:\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-h264:\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n  stream-format: { (string)byte-stream, (string)avc }\n      alignment: au\n        profile: { (string)high, (string)main, (string)baseline, (string)constrained-baseline }\n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nimage/jpeg:\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \nvideo/x-h264:\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n  stream-format: { (string)byte-stream, (string)avc }\n      alignment: au\n        profile: { (string)high, (string)main, (string)baseline, (string)constrained-baseline }\n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -235704,12 +244533,12 @@
                 "long-name": "Vulkan Overlay Compositor",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw(memory:VulkanImage, meta:GstVideoOverlayComposition):\n         format: { BGRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:VulkanImage):\n         format: { BGRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { BGRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:VulkanImage, meta:GstVideoOverlayComposition):\n         format: { BGRA, RGBA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:VulkanImage):\n         format: { BGRA, RGBA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { BGRA, RGBA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw(memory:VulkanImage, meta:GstVideoOverlayComposition):\n         format: { BGRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:VulkanImage):\n         format: { BGRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { BGRA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw(memory:VulkanImage, meta:GstVideoOverlayComposition):\n         format: { BGRA, RGBA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:VulkanImage):\n         format: { BGRA, RGBA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(ANY):\n         format: { BGRA, RGBA }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -236033,7 +244862,7 @@
                 },
                 "properties": {
                     "device": {
-                        "blurb": "WASAPI playback device as a GUID string",
+                        "blurb": "WASAPI device endpoint ID as provided by IMMDevice::GetId",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -236132,7 +244961,7 @@
                 },
                 "properties": {
                     "device": {
-                        "blurb": "WASAPI playback device as a GUID string",
+                        "blurb": "WASAPI device endpoint ID as provided by IMMDevice::GetId",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -236265,7 +245094,7 @@
                 },
                 "properties": {
                     "device": {
-                        "blurb": "WASAPI playback device as a GUID string",
+                        "blurb": "Audio device ID as provided by Windows.Devices.Enumeration.DeviceInformation.Id",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -236355,7 +245184,7 @@
                 },
                 "properties": {
                     "device": {
-                        "blurb": "WASAPI playback device as a GUID string",
+                        "blurb": "Audio device ID as provided by Windows.Devices.Enumeration.DeviceInformation.Id",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -236401,6 +245230,18 @@
                         "type": "GstWasapi2SrcLoopbackMode",
                         "writable": true
                     },
+                    "loopback-silence-on-device-mute": {
+                        "blurb": "When loopback recording, if the device is muted, inject silence in the pipeline",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "playing",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
                     "loopback-target-pid": {
                         "blurb": "Process ID to be recorded or excluded for process loopback mode",
                         "conditionally-available": true,
@@ -236508,7 +245349,7 @@
                 "long-name": "wayland video sink",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw:\n         format: { BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, NV61, YUV9, YVU9, Y41B, I420, YV12, Y42B, v308 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:DMABuf):\n         format: { BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, NV61, YUV9, YVU9, Y41B, I420, YV12, Y42B, v308 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { AYUV, RGBA, ARGB, BGRA, ABGR, P010_10LE, v308, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n\nvideo/x-raw(memory:DMABuf):\n         format: DMA_DRM\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     }
@@ -236526,6 +245367,18 @@
                         "type": "gchararray",
                         "writable": true
                     },
+                    "drm-device": {
+                        "blurb": "Path of the DRM device to use for dumb buffer allocation",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": true,
+                        "controllable": false,
+                        "default": "NULL",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    },
                     "fullscreen": {
                         "blurb": "Whether the surface should be made fullscreen ",
                         "conditionally-available": false,
@@ -236670,6 +245523,46 @@
                     }
                 },
                 "properties": {
+                    "animated": {
+                        "blurb": "Encode an animated webp, instead of several pictures",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "false",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "animation-background-color": {
+                        "blurb": "The animation background color in ARGB order (1 byte per component).",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
+                    "animation-loops": {
+                        "blurb": "The number of animation loops for the animated mode. If set to 0, the animation will loop forever.",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0",
+                        "max": "-1",
+                        "min": "0",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "guint",
+                        "writable": true
+                    },
                     "lossless": {
                         "blurb": "Enable lossless encoding",
                         "conditionally-available": false,
@@ -236851,7 +245744,7 @@
                         "writable": false
                     },
                     "http-proxy": {
-                        "blurb": "A HTTP proxy for use with TURN/TCP of the form http://username:password@hostname:port",
+                        "blurb": "A HTTP proxy for use with TURN/TCP of the form http://username:password@hostname:port?alpn=<alpn>",
                         "conditionally-available": false,
                         "construct": false,
                         "construct-only": false,
@@ -237032,6 +245925,25 @@
                         "return-type": "void",
                         "when": "last"
                     },
+                    "add-ice-candidate-full": {
+                        "action": true,
+                        "args": 
+                            {
+                                "name": "arg0",
+                                "type": "guint"
+                            },
+                            {
+                                "name": "arg1",
+                                "type": "gchararray"
+                            },
+                            {
+                                "name": "arg2",
+                                "type": "GstPromise"
+                            }
+                        ,
+                        "return-type": "void",
+                        "when": "last"
+                    },
                     "add-transceiver": {
                         "action": true,
                         "args": 
@@ -237886,7 +246798,7 @@
                 "klass": "Sink/Video",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "sink",
                         "presence": "always"
                     }
@@ -237921,7 +246833,7 @@
                 "klass": "Source/Video",
                 "pad-templates": {
                     "src": {
-                        "caps": "video/x-raw:\n         format: { ABGR64_LE, BGRA64_LE, AYUV64, ARGB64_LE, ARGB64, RGBA64_LE, ABGR64_BE, BGRA64_BE, ARGB64_BE, RGBA64_BE, GBRA_12LE, GBRA_12BE, Y412_LE, Y412_BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, RGB10A2_LE, BGR10A2_LE, Y410, GBRA, ABGR, VUYA, BGRA, AYUV, ARGB, RGBA, A420, AV12, Y444_16LE, Y444_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, v210, UYVP, I420_10LE, I420_10BE, P010_10LE, NV12_10LE32, NV12_10LE40, P010_10BE, NV12_10BE_8L128, Y444, RGBP, GBR, BGRP, NV24, xBGR, BGRx, xRGB, RGBx, BGR, IYU2, v308, RGB, Y42B, NV61, NV16, VYUY, UYVY, YVYU, YUY2, I420, YV12, NV21, NV12, NV12_8L128, NV12_64Z32, NV12_4L4, NV12_32L32, NV12_16L32S, Y41B, IYU1, YVU9, YUV9, RGB16, BGR16, RGB15, BGR15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { A444_16LE, A444_16BE, AYUV64, RGBA64_LE, ARGB64, ARGB64_LE, BGRA64_LE, ABGR64_LE, RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE, A422_16LE, A422_16BE, A420_16LE, A420_16BE, A444_12LE, GBRA_12LE, A444_12BE, GBRA_12BE, Y412_LE, Y412_BE, A422_12LE, A422_12BE, A420_12LE, A420_12BE, A444_10LE, GBRA_10LE, A444_10BE, GBRA_10BE, A422_10LE, A422_10BE, A420_10LE, A420_10BE, BGR10A2_LE, RGB10A2_LE, Y410, A444, GBRA, AYUV, VUYA, RGBA, RBGA, ARGB, BGRA, ABGR, A422, A420, AV12, Y444_16LE, GBR_16LE, Y444_16BE, GBR_16BE, v216, P016_LE, P016_BE, Y444_12LE, GBR_12LE, Y444_12BE, GBR_12BE, I422_12LE, I422_12BE, Y212_LE, Y212_BE, I420_12LE, I420_12BE, P012_LE, P012_BE, Y444_10LE, GBR_10LE, Y444_10BE, GBR_10BE, r210, I422_10LE, I422_10BE, NV16_10LE32, Y210, UYVP, v210, I420_10LE, I420_10BE, P010_10LE, NV12_10LE40, NV12_10LE32, P010_10BE, MT2110R, MT2110T, NV12_10BE_8L128, NV12_10LE40_4L4, Y444, BGRP, GBR, RGBP, NV24, v308, IYU2, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, VYUY, I420, YV12, NV12, NV21, NV12_16L32S, NV12_32L32, NV12_4L4, NV12_64Z32, NV12_8L128, Y41B, IYU1, YUV9, YVU9, BGR16, RGB16, BGR15, RGB15, RGB8P, GRAY16_LE, GRAY16_BE, GRAY10_LE32, GRAY8 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }
@@ -237969,7 +246881,7 @@
         "description": "Windows kernel streaming plugin",
         "elements": {
             "ksvideosrc": {
-                "author": "Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>\nHaakon Sporsheim <hakon.sporsheim@tandberg.com>\nAndres Colubri <andres.colubri@gmail.com>",
+                "author": "Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>, Haakon Sporsheim <hakon.sporsheim@tandberg.com>, Andres Colubri <andres.colubri@gmail.com>",
                 "description": "Stream data from a video capture device through Windows kernel streaming",
                 "hierarchy": 
                     "GstKsVideoSrc",
@@ -238701,43 +247613,7 @@
             "GstX265Tune": {
                 "ignore-enum-members": true,
                 "kind": "enum",
-                "values": 
-                    {
-                        "desc": "No tunning",
-                        "name": "No tunning",
-                        "value": "0"
-                    },
-                    {
-                        "desc": "psnr",
-                        "name": "psnr",
-                        "value": "1"
-                    },
-                    {
-                        "desc": "ssim",
-                        "name": "ssim",
-                        "value": "2"
-                    },
-                    {
-                        "desc": "grain",
-                        "name": "grain",
-                        "value": "3"
-                    },
-                    {
-                        "desc": "zerolatency",
-                        "name": "zerolatency",
-                        "value": "4"
-                    },
-                    {
-                        "desc": "fastdecode",
-                        "name": "fastdecode",
-                        "value": "5"
-                    },
-                    {
-                        "desc": "animation",
-                        "name": "animation",
-                        "value": "6"
-                    }
-                
+                "values": 
             }
         },
         "package": "GStreamer Bad Plug-ins",
@@ -238767,7 +247643,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "video/x-raw:\n         format: { I420, Y42B, Y444 }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
+                        "caps": "video/x-raw:\n         format: { I420, Y41B, Y42B, Y444, I420_10LE, I422_10LE, Y444_10LE, I420_12LE, I422_12LE, Y444_12LE, Y444_16LE, GRAY8, GRAY16_LE }\n          width:  1, 2147483647 \n         height:  1, 2147483647 \n      framerate:  0/1, 2147483647/1 \n",
                         "direction": "src",
                         "presence": "always"
                     }

gst-plugins-bad-1.22.7.tar.xz/ext/aes/gstaesenc.c -> gst-plugins-bad-1.24.5.tar.xz/ext/aes/gstaesenc.c Changed

gst-plugins-bad-1.24.5.tar.xz/ext/analyticsoverlay Added

gst-plugins-bad-1.24.5.tar.xz/ext/analyticsoverlay/gstanalyticsoverlay.c Added

@@ -0,0 +1,52 @@
+/* GStreamer object detection overlay
+ * Copyright (C) <2022> Collabora Ltd.
+ *  @author: Daniel Morin <daniel.morin@collabora.com>
+ *
+ * gstanalyticsoverlay.c
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
+#include "gstobjectdetectionoverlay.h"
+
+/**
+ * SECTION:plugin-analyticsoverlay
+ *
+ * Analytics overlay
+ *
+ * See also: @objectdetectionoverlay
+ * Since: 1.24
+ */
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  gboolean ret = FALSE;
+
+  ret |= GST_ELEMENT_REGISTER (objectdetectionoverlay, plugin);
+
+  return ret;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    analyticsoverlay,
+    "Analytics-meta overlay elements",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

gst-plugins-bad-1.24.5.tar.xz/ext/analyticsoverlay/gstobjectdetectionoverlay.c Added

@@ -0,0 +1,889 @@
+/* GStreamer object detection overlay
+ * Copyright (C) <2023> Collabora Ltd.
+ *  @author: Aaron Boxer <aaron.boxer@collabora.com>
+ *  @author: Daniel Morin <daniel.morin@collabora.com>
+ *
+ * gstobjectdetectionoverlay.c
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-objectdetectionoverlay
+ * @title: objectdetectionoverlay
+ * @see_also: #GstObjectDetectionOverlay
+ *
+ * This element create a graphical representation of the analytics object
+ * detection metadata attached to video stream and overlay graphics above the
+ * video.
+ *
+ * The object detection overlay element monitor video stream for
+ * @GstAnalyticsRelationMeta and query @GstAnalyticsODMtd. Retrieved
+ * @GstAnalyticsODMtd are then used to generate an overlay highlighing objects
+ * detected.
+ *
+ * ## Example launch line
+ * |
+ * gst-launch-1.0 multifilesrc location=/onnx-models/images/bus.jpg ! jpegdec ! videoconvert ! onnxinference execution-provider=cpu model-file=/onnx-models/models/ssd_mobilenet_v1_coco.onnx ! ssdobjectdetector label-file=/onnx-models/labels/COCO_classes.txt ! objectdetectionoverlay object-detection-outline-color=0xFF0000FF draw-labels=true ! videoconvertscale ! imagefreeze ! autovideosink
+ * | This pipeline create an overlay representing results of an object detetion
+ * analysis.
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/analytics/analytics.h>
+#include <pango/pangocairo.h>
+
+#include "gstobjectdetectionoverlay.h"
+
+struct _GstObjectDetectionOverlay
+{
+  GstVideoFilter parent;
+
+  cairo_matrix_t cairo_matrix;
+  gsize render_len;
+
+  /* stream metrics */
+  GstVideoInfo *in_info;
+  GMutex stream_event_mutex;
+  gboolean flushing;
+  gboolean eos;
+
+  /* properties */
+  guint od_outline_color;
+  guint od_outline_stroke_width;
+  gboolean draw_labels;
+  guint labels_color;
+  gdouble labels_stroke_width;
+  gdouble labels_outline_ofs;
+
+  /* composition */
+  gboolean attach_compo_to_buffer;
+  GstBuffer *canvas;
+  gint canvas_length;
+  GstVideoOverlayComposition *composition;
+  GstVideoOverlayComposition *upstream_composition;
+
+  /* Graphic Outline */
+  PangoContext *pango_context;
+  PangoLayout *pango_layout;
+
+};
+
+
+#define MINIMUM_TEXT_OUTLINE_OFFSET 1.0
+
+GST_DEBUG_CATEGORY_STATIC (objectdetectionoverlay_debug);
+#define GST_CAT_DEFAULT objectdetectionoverlay_debug
+
+enum
+{
+  PROP_OD_OUTLINE_COLOR = 1,
+  PROP_DRAW_LABELS,
+  PROP_LABELS_COLOR,
+  _PROP_COUNT
+};
+
+typedef struct _GstObjectDetectionOverlayPangoCairoContext
+    GstObjectDetectionOverlayPangoCairoContext;
+
+struct _GstObjectDetectionOverlayPangoCairoContext
+{
+  cairo_t *cr;
+  cairo_surface_t *surface;
+  guint8 *data;
+  cairo_matrix_t *cairo_matrix;
+};
+
+#define VIDEO_FORMATS GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS
+#define OBJECT_DETECTION_OVERLAY_CAPS GST_VIDEO_CAPS_MAKE (VIDEO_FORMATS)
+
+static GstStaticCaps sw_template_caps =
+GST_STATIC_CAPS (OBJECT_DETECTION_OVERLAY_CAPS);
+
+static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (OBJECT_DETECTION_OVERLAY_CAPS)
+    );
+
+static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (OBJECT_DETECTION_OVERLAY_CAPS)
+    );
+
+G_DEFINE_TYPE (GstObjectDetectionOverlay,
+    gst_object_detection_overlay, GST_TYPE_VIDEO_FILTER);
+
+#define parent_class gst_object_detection_overlay_parent_class
+
+GST_ELEMENT_REGISTER_DEFINE (objectdetectionoverlay, "objectdetectionoverlay",
+    GST_RANK_NONE, GST_TYPE_OBJECT_DETECTION_OVERLAY);
+
+static void gst_object_detection_overlay_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+
+static void gst_object_detection_overlay_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+
+static gboolean gst_object_detection_overlay_sink_event (GstBaseTransform *
+    trans, GstEvent * event);
+
+static gboolean gst_object_detection_overlay_start (GstBaseTransform * trans);
+static gboolean gst_object_detection_overlay_stop (GstBaseTransform * trans);
+
+
+static gboolean gst_object_detection_overlay_set_info (GstVideoFilter * filter,
+    GstCaps * incaps, GstVideoInfo * in_info, GstCaps * outcaps,
+    GstVideoInfo * out_info);
+
+static GstFlowReturn
+gst_object_detection_overlay_transform_frame_ip (GstVideoFilter * filter,
+    GstVideoFrame * buf);
+
+static void gst_object_detection_overlay_finalize (GObject * object);
+
+static void
+gst_object_detection_overlay_render_boundingbox (GstObjectDetectionOverlay
+    * overlay, GstObjectDetectionOverlayPangoCairoContext * cairo_ctx,
+    GstAnalyticsODMtd * od_mtd);
+
+static void
+gst_object_detection_overlay_render_text_annotation (GstObjectDetectionOverlay
+    * overlay, GstObjectDetectionOverlayPangoCairoContext * cairo_ctx,
+    GstAnalyticsODMtd * od_mtd, const gchar * annotation);
+
+static void
+gst_object_detection_overlay_class_init (GstObjectDetectionOverlayClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *element_class;
+  GstBaseTransformClass *basetransform_class;
+  GstVideoFilterClass *videofilter_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gobject_class->set_property = gst_object_detection_overlay_set_property;
+  gobject_class->get_property = gst_object_detection_overlay_get_property;
+  gobject_class->finalize = gst_object_detection_overlay_finalize;
+
+  /**
+   * GstObjectDetectionOverlay:object-detection-outline-color
+   *
+   * Object Detetion Overlay outline color
+   * ARGB format (ex. 0xFFFF0000 for red)
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_OD_OUTLINE_COLOR,
+      g_param_spec_uint ("object-detection-outline-color",
+          "Object detection outline color",
+          "Color (ARGB) to use for object detection overlay outline",
+          0, G_MAXUINT, 0xFFFFFFFF,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstObjectDetectionOverlay:draw-labels
+   *
+   * Control labels drawing
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_DRAW_LABELS,
+      g_param_spec_boolean ("draw-labels",
+          "Draw labels",
+          "Draw object labels",
+          TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstObjectDetectionOverlay:labels-color
+   *
+   * Control labels color
+   * Format ARGB (ex. 0xFFFF0000 for red)
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_LABELS_COLOR,
+      g_param_spec_uint ("labels-color",
+          "Labels color",
+          "Color (ARGB) to use for object labels",
+          0, G_MAXUINT, 0xFFFFFF, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  element_class = (GstElementClass *) klass;
+
+  gst_element_class_add_static_pad_template (element_class, &sink_template);
+  gst_element_class_add_static_pad_template (element_class, &src_template);
+  gst_element_class_set_static_metadata (element_class,
+      "Object Detection Overlay",
+      "Analyzer/Visualization/Video",
+      "Overlay a visual representation of analytics metadata on the video",
+      "Daniel Morin");
+
+  basetransform_class = (GstBaseTransformClass *) klass;
+  basetransform_class->passthrough_on_same_caps = FALSE;
+  basetransform_class->start =
+      GST_DEBUG_FUNCPTR (gst_object_detection_overlay_start);
+
+  basetransform_class->stop =
+      GST_DEBUG_FUNCPTR (gst_object_detection_overlay_stop);
+
+  basetransform_class->sink_event =
+      GST_DEBUG_FUNCPTR (gst_object_detection_overlay_sink_event);
+
+  videofilter_class = (GstVideoFilterClass *) klass;
+  videofilter_class->set_info =
+      GST_DEBUG_FUNCPTR (gst_object_detection_overlay_set_info);
+  videofilter_class->transform_frame_ip =
+      GST_DEBUG_FUNCPTR (gst_object_detection_overlay_transform_frame_ip);
+}
+
+static void
+gst_object_detection_overlay_adj_labels_outline_ofs (GstObjectDetectionOverlay *
+    overlay, PangoFontDescription * desc)
+{
+  gint font_size = pango_font_description_get_size (desc) / PANGO_SCALE;
+  overlay->labels_outline_ofs = (double) (font_size) / 15.0;
+  if (overlay->labels_outline_ofs < MINIMUM_TEXT_OUTLINE_OFFSET)
+    overlay->labels_outline_ofs = MINIMUM_TEXT_OUTLINE_OFFSET;
+}
+
+static void
+gst_object_detection_overlay_finalize (GObject * object)
+{
+  gst_object_detection_overlay_stop (GST_BASE_TRANSFORM (object));
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_object_detection_overlay_init (GstObjectDetectionOverlay * overlay)
+{
+  overlay->pango_context = NULL;
+  overlay->pango_layout = NULL;
+  overlay->od_outline_color = 0xFFFFFFFF;
+  overlay->draw_labels = TRUE;
+  overlay->labels_color = 0xFFFFFFFF;
+  overlay->in_info = &GST_VIDEO_FILTER (overlay)->in_info;
+  overlay->attach_compo_to_buffer = TRUE;
+  overlay->canvas = NULL;
+  overlay->labels_stroke_width = 1.0;
+  overlay->od_outline_stroke_width = 2;
+  overlay->composition = NULL;
+  overlay->upstream_composition = NULL;
+  overlay->flushing = FALSE;
+  GST_DEBUG_CATEGORY_INIT (objectdetectionoverlay_debug,
+      "analytics_overlay_od", 0, "Object detection overlay");
+}
+
+static void
+gst_object_detection_overlay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstObjectDetectionOverlay *overlay;
+  overlay = GST_OBJECT_DETECTION_OVERLAY (object);
+
+  switch (prop_id) {
+    case PROP_OD_OUTLINE_COLOR:
+      overlay->od_outline_color = g_value_get_uint (value);
+      break;
+    case PROP_DRAW_LABELS:
+      overlay->draw_labels = g_value_get_boolean (value);
+      break;
+    case PROP_LABELS_COLOR:
+      overlay->labels_color = g_value_get_uint (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_object_detection_overlay_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec)
+{
+  GstObjectDetectionOverlay *od_overlay = GST_OBJECT_DETECTION_OVERLAY (object);
+
+  switch (prop_id) {
+    case PROP_OD_OUTLINE_COLOR:
+      g_value_set_uint (value, od_overlay->od_outline_color);
+      break;
+    case PROP_DRAW_LABELS:
+      g_value_set_boolean (value, od_overlay->draw_labels);
+      break;
+    case PROP_LABELS_COLOR:
+      g_value_set_uint (value, od_overlay->labels_color);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static gboolean
+gst_object_detection_overlay_can_handle_caps (GstCaps * incaps)
+{
+  gboolean ret;
+  GstCaps *caps;
+
+  caps = gst_static_caps_get (&sw_template_caps);
+  ret = gst_caps_is_subset (incaps, caps);
+  gst_caps_unref (caps);
+
+  return ret;
+}
+
+static gboolean
+gst_object_detection_overlay_negotiate (GstObjectDetectionOverlay * overlay,
+    GstCaps * caps)
+{
+  GstBaseTransform *basetransform = GST_BASE_TRANSFORM (overlay);
+  gboolean upstream_has_meta = FALSE;
+  gboolean caps_has_meta = FALSE;
+  gboolean alloc_has_meta = FALSE;
+  gboolean attach = FALSE;
+  gboolean ret = TRUE;
+  guint width, height;
+  GstCapsFeatures *f;
+  GstCaps *overlay_caps;
+  GstQuery *query;
+  guint alloc_index;
+  GstPad *srcpad = basetransform->srcpad;
+  GstPad *sinkpad = basetransform->sinkpad;
+
+  GST_DEBUG_OBJECT (overlay, "performing negotiation");
+
+  /* Clear any pending reconfigure to avoid negotiating twice */
+  gst_pad_check_reconfigure (sinkpad);
+
+  /* Check if upstream caps have meta */
+  if ((f = gst_caps_get_features (caps, 0))) {
+    GST_DEBUG_OBJECT (overlay, "upstream has caps");
+    upstream_has_meta = gst_caps_features_contains (f,
+        GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
+  }
+
+  /* Initialize dimensions */
+  width = GST_VIDEO_INFO_WIDTH (overlay->in_info);
+  height = GST_VIDEO_INFO_HEIGHT (overlay->in_info);
+  GST_DEBUG_OBJECT (overlay, "initial dims: %ux%u", width, height);
+
+  if (upstream_has_meta) {
+    overlay_caps = gst_caps_ref (caps);
+  } else {
+    GstCaps *peercaps;
+
+    /* BaseTransform requires caps for the allocation query to work */
+    overlay_caps = gst_caps_copy (caps);
+    f = gst_caps_get_features (overlay_caps, 0);
+    gst_caps_features_add (f,
+        GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
+
+    /* Then check if downstream accept overlay composition in caps */
+    /* FIXME: We should probably check if downstream *prefers* the
+     * overlay meta, and only enforce usage of it if we can't handle
+     * the format ourselves and thus would have to drop the overlays.
+     * Otherwise we should prefer what downstream wants here.
+     */
+    peercaps = gst_pad_peer_query_caps (srcpad, overlay_caps);
+    caps_has_meta = !gst_caps_is_empty (peercaps);
+    gst_caps_unref (peercaps);
+
+    GST_DEBUG_OBJECT (overlay, "caps have overlay meta %d", caps_has_meta);
+  }
+
+  if (upstream_has_meta || caps_has_meta) {
+    /* Send caps immediately, it's needed by GstBaseTransform to get a reply
+     * from allocation query */
+    GST_BASE_TRANSFORM_CLASS (parent_class)->set_caps (basetransform, caps,
+        overlay_caps);
+    ret = gst_pad_set_caps (srcpad, overlay_caps);
+
+    /* First check if the allocation meta has compositon */
+    query = gst_query_new_allocation (overlay_caps, FALSE);
+
+    if (!gst_pad_peer_query (srcpad, query)) {
+      /* no problem, we use the query defaults */
+      GST_DEBUG_OBJECT (overlay, "ALLOCATION query failed");
+
+      /* In case we were flushing, mark reconfigure and fail this method,
+       * will make it retry */
+      if (overlay->flushing)
+        ret = FALSE;
+    }
+
+    alloc_has_meta = gst_query_find_allocation_meta (query,
+        GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE, &alloc_index);
+
+    GST_DEBUG_OBJECT (overlay, "sink alloc has overlay meta %d",
+        alloc_has_meta);
+
+    if (alloc_has_meta) {
+      const GstStructure *params;
+
+      gst_query_parse_nth_allocation_meta (query, alloc_index, &params);
+      if (params) {
+        if (gst_structure_get (params, "width", G_TYPE_UINT, &width,
+                "height", G_TYPE_UINT, &height, NULL)) {
+          GST_DEBUG_OBJECT (overlay, "received window size: %dx%d", width,
+              height);
+          g_assert (width != 0 && height != 0);
+        }
+      }
+    }
+
+    gst_query_unref (query);
+  }
+
+  /* Update render size if needed */
+  overlay->canvas_length = width * height;
+
+  /* For backward compatibility, we will prefer blitting if downstream
+   * allocation does not support the meta. In other case we will prefer
+   * attaching, and will fail the negotiation in the unlikely case we are
+   * force to blit, but format isn't supported. */
+
+  if (upstream_has_meta) {
+    attach = TRUE;
+  } else if (caps_has_meta) {
+    if (alloc_has_meta) {
+      attach = TRUE;
+    } else {
+      /* Don't attach unless we cannot handle the format */
+      attach = !gst_object_detection_overlay_can_handle_caps (caps);
+    }
+  } else {
+    ret = gst_object_detection_overlay_can_handle_caps (caps);
+  }
+
+  /* If we attach, then pick the overlay caps */
+  if (attach) {
+    GST_DEBUG_OBJECT (overlay, "Using caps %" GST_PTR_FORMAT, overlay_caps);
+    /* Caps where already sent */
+  } else if (ret) {
+    GST_DEBUG_OBJECT (overlay, "Using caps %" GST_PTR_FORMAT, caps);
+    GST_BASE_TRANSFORM_CLASS (parent_class)->set_caps (basetransform, caps,
+        caps);
+    ret = gst_pad_set_caps (srcpad, caps);
+  }
+
+  overlay->attach_compo_to_buffer = attach;
+
+  if (attach) {
+    GST_BASE_TRANSFORM_CLASS (parent_class)->passthrough_on_same_caps = FALSE;
+  }
+
+  if (!ret) {
+    GST_DEBUG_OBJECT (overlay, "negotiation failed, schedule reconfigure");
+    gst_pad_mark_reconfigure (srcpad);
+  }
+
+  gst_caps_unref (overlay_caps);
+
+  return ret;
+}
+
+static gboolean
+gst_object_detection_overlay_setcaps (GstObjectDetectionOverlay * overlay,
+    GstCaps * caps)
+{
+  gboolean ret = FALSE;
+
+  if (!gst_video_info_from_caps (overlay->in_info, caps))
+    goto invalid_caps;
+
+  ret = gst_object_detection_overlay_negotiate (overlay, caps);
+  GST_VIDEO_FILTER (overlay)->negotiated = ret;
+
+  if (!overlay->attach_compo_to_buffer &&
+      !gst_object_detection_overlay_can_handle_caps (caps)) {
+    GST_DEBUG_OBJECT (overlay, "unsupported caps %" GST_PTR_FORMAT, caps);
+    ret = FALSE;
+  }
+
+  return ret;
+
+  /* ERRORS */
+invalid_caps:
+  {
+    GST_DEBUG_OBJECT (overlay, "could not parse caps");
+    return FALSE;
+  }
+}
+
+static gboolean
+gst_object_detection_overlay_sink_event (GstBaseTransform * trans,
+    GstEvent * event)
+{
+  gboolean ret = FALSE;
+  GST_DEBUG_OBJECT (trans, "received sink event %s",
+      GST_EVENT_TYPE_NAME (event));
+
+  GstObjectDetectionOverlay *overlay = GST_OBJECT_DETECTION_OVERLAY (trans);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CAPS:
+    {
+      GstCaps *caps;
+      gst_event_parse_caps (event, &caps);
+      ret = gst_object_detection_overlay_setcaps (overlay, caps);
+      gst_event_unref (event);
+      break;
+    }
+    case GST_EVENT_EOS:
+      g_mutex_lock (&overlay->stream_event_mutex);
+      GST_INFO_OBJECT (overlay, "EOS");
+      overlay->eos = TRUE;
+      g_mutex_unlock (&overlay->stream_event_mutex);
+      break;
+    case GST_EVENT_FLUSH_START:
+      g_mutex_lock (&overlay->stream_event_mutex);
+      GST_INFO_OBJECT (overlay, "Flush stop");
+      overlay->flushing = TRUE;
+      g_mutex_unlock (&overlay->stream_event_mutex);
+      break;
+    case GST_EVENT_FLUSH_STOP:
+      g_mutex_lock (&overlay->stream_event_mutex);
+      GST_INFO_OBJECT (overlay, "Flush stop");
+      overlay->eos = FALSE;
+      overlay->flushing = FALSE;
+      g_mutex_unlock (&overlay->stream_event_mutex);
+      break;
+    default:
+      ret = GST_BASE_TRANSFORM_CLASS (parent_class)->sink_event (trans, event);
+      break;
+  }
+
+  return ret;
+}
+
+static gboolean
+gst_object_detection_overlay_start (GstBaseTransform * trans)
+{
+  GstObjectDetectionOverlay *overlay = GST_OBJECT_DETECTION_OVERLAY (trans);
+  PangoFontDescription *desc;
+  PangoFontMap *fontmap;
+
+  fontmap = pango_cairo_font_map_new ();
+  overlay->pango_context =
+      pango_font_map_create_context (PANGO_FONT_MAP (fontmap));
+  g_object_unref (fontmap);
+  overlay->pango_layout = pango_layout_new (overlay->pango_context);
+  desc = pango_context_get_font_description (overlay->pango_context);
+  pango_font_description_set_size (desc, 10000);
+  pango_font_description_set_weight (desc, PANGO_WEIGHT_ULTRALIGHT);
+  pango_context_set_font_description (overlay->pango_context, desc);
+  pango_layout_set_alignment (overlay->pango_layout, PANGO_ALIGN_LEFT);
+
+  gst_object_detection_overlay_adj_labels_outline_ofs (overlay, desc);
+  GST_DEBUG_OBJECT (overlay, "labels_outline_offset %f",
+      overlay->labels_outline_ofs);
+
+  return TRUE;
+}
+
+static gboolean
+gst_object_detection_overlay_stop (GstBaseTransform * trans)
+{
+  GstObjectDetectionOverlay *overlay = GST_OBJECT_DETECTION_OVERLAY (trans);
+
+  g_clear_object (&overlay->pango_layout);
+  g_clear_object (&overlay->pango_context);
+  gst_clear_buffer (&overlay->canvas);
+
+  return TRUE;
+}
+
+static gboolean
+gst_object_detection_overlay_set_info (GstVideoFilter * filter,
+    GstCaps * incaps, GstVideoInfo * in_info, GstCaps * outcaps,
+    GstVideoInfo * out_info)
+{
+  GstObjectDetectionOverlay *overlay = GST_OBJECT_DETECTION_OVERLAY (filter);
+  GST_DEBUG_OBJECT (filter, "set_info incaps:%s", gst_caps_to_string (incaps));
+  GST_DEBUG_OBJECT (filter, "set_info outcaps:%s",
+      gst_caps_to_string (outcaps));
+
+  filter->in_info = *in_info;
+  filter->out_info = *out_info;
+
+  cairo_matrix_init_scale (&overlay->cairo_matrix, 1, 1);
+  overlay->render_len = GST_VIDEO_INFO_WIDTH (in_info) *
+      GST_VIDEO_INFO_HEIGHT (in_info) * 4;
+  return TRUE;
+}
+
+static void
+gst_object_detection_overlay_create_cairo_context (GstObjectDetectionOverlay *
+    overlay, GstObjectDetectionOverlayPangoCairoContext * cairo_ctx,
+    guint8 * data)
+{
+  cairo_ctx->cairo_matrix = &overlay->cairo_matrix;
+  cairo_ctx->surface = cairo_image_surface_create_for_data (data,
+      CAIRO_FORMAT_ARGB32, GST_VIDEO_INFO_WIDTH (overlay->in_info),
+      GST_VIDEO_INFO_HEIGHT (overlay->in_info),
+      GST_VIDEO_INFO_WIDTH (overlay->in_info) * 4);
+  cairo_ctx->cr = cairo_create (cairo_ctx->surface);
+
+  /* clear surface */
+  cairo_set_operator (cairo_ctx->cr, CAIRO_OPERATOR_CLEAR);
+  cairo_paint (cairo_ctx->cr);
+  cairo_set_operator (cairo_ctx->cr, CAIRO_OPERATOR_OVER);
+
+  /* apply transformations */
+  cairo_set_matrix (cairo_ctx->cr, cairo_ctx->cairo_matrix);
+  cairo_save (cairo_ctx->cr);
+}
+
+static void
+    gst_object_detection_overlay_destroy_cairo_context
+    (GstObjectDetectionOverlayPangoCairoContext * cairo_ctx)
+{
+  cairo_restore (cairo_ctx->cr);
+  cairo_destroy (cairo_ctx->cr);
+  cairo_surface_destroy (cairo_ctx->surface);
+}
+
+static GstFlowReturn
+gst_object_detection_overlay_transform_frame_ip (GstVideoFilter * filter,
+    GstVideoFrame * frame)
+{
+  GstObjectDetectionOverlay *overlay = GST_OBJECT_DETECTION_OVERLAY (filter);
+  GstVideoOverlayCompositionMeta *composition_meta;
+  gpointer state = NULL;
+  GstVideoOverlayRectangle *rectangle = NULL;
+  gchar str_buf5;
+  GstAnalyticsMtd rlt_mtd;
+  GstAnalyticsODMtd *od_mtd;
+  gint x, y, w, h;
+  gfloat loc_confi_lvl;
+  gboolean success;
+
+  GST_DEBUG_OBJECT (filter, "buffer writeable=%d",
+      gst_buffer_is_writable (frame->buffer));
+
+  g_mutex_lock (&overlay->stream_event_mutex);
+  if (overlay->eos || overlay->flushing) {
+    g_mutex_unlock (&overlay->stream_event_mutex);
+    return GST_FLOW_EOS;
+  }
+  g_mutex_unlock (&overlay->stream_event_mutex);
+
+  composition_meta =
+      gst_buffer_get_video_overlay_composition_meta (frame->buffer);
+  if (composition_meta) {
+    if (overlay->upstream_composition != composition_meta->overlay) {
+      GST_DEBUG_OBJECT (overlay, "GstVideoOverlayCompositionMeta found.");
+      overlay->upstream_composition = composition_meta->overlay;
+    }
+  } else if (overlay->upstream_composition != NULL) {
+    overlay->upstream_composition = NULL;
+  }
+
+  GstAnalyticsRelationMeta *rmeta = (GstAnalyticsRelationMeta *)
+      gst_buffer_get_meta (GST_BUFFER (frame->buffer),
+      GST_ANALYTICS_RELATION_META_API_TYPE);
+
+  if (rmeta) {
+    GST_DEBUG_OBJECT (filter, "received buffer with analytics relation meta");
+
+    GstBuffer *buffer;
+    GstMapInfo map;
+    GstObjectDetectionOverlayPangoCairoContext cairo_ctx;
+
+    buffer = gst_buffer_new_and_alloc (overlay->render_len);
+    gst_buffer_add_video_meta (buffer,
+        GST_VIDEO_FRAME_FLAG_NONE, GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_RGB,
+        GST_VIDEO_INFO_WIDTH (overlay->in_info),
+        GST_VIDEO_INFO_HEIGHT (overlay->in_info));
+
+    gst_buffer_replace (&overlay->canvas, buffer);
+    gst_buffer_unref (buffer);
+
+    gst_buffer_map (buffer, &map, GST_MAP_READWRITE);
+    memset (map.data, 0, overlay->render_len);
+
+    gst_object_detection_overlay_create_cairo_context (overlay,
+        &cairo_ctx, map.data);
+
+    if (overlay->composition)
+      gst_video_overlay_composition_unref (overlay->composition);
+
+    if (overlay->upstream_composition) {
+      overlay->composition =
+          gst_video_overlay_composition_copy (overlay->upstream_composition);
+    } else {
+      overlay->composition = gst_video_overlay_composition_new (NULL);
+    }
+
+    /* Get quark represent object detection metadata type */
+    GstAnalyticsMtdType rlt_type = gst_analytics_od_mtd_get_mtd_type ();
+    while (gst_analytics_relation_meta_iterate (rmeta, &state, rlt_type,
+            &rlt_mtd)) {
+      od_mtd = (GstAnalyticsODMtd *) & rlt_mtd;
+      GST_DEBUG_OBJECT (filter, "buffer contain OD mtd");
+
+      /* Quark representing the type of the object detected by OD */
+      GQuark od_obj_type = gst_analytics_od_mtd_get_obj_type (od_mtd);
+
+      // Find classification metadata attached to object detection metadata
+      GstAnalyticsMtd cls_rlt_mtd;
+      success = gst_analytics_relation_meta_get_direct_related (rmeta,
+          gst_analytics_mtd_get_id (
+              (GstAnalyticsMtd *) od_mtd),
+          GST_ANALYTICS_REL_TYPE_RELATE_TO,
+          gst_analytics_cls_mtd_get_mtd_type (), NULL, &cls_rlt_mtd);
+
+      gst_object_detection_overlay_render_boundingbox
+          (GST_OBJECT_DETECTION_OVERLAY (filter), &cairo_ctx, od_mtd);
+
+      if (overlay->draw_labels) {
+        if (success) {
+          /* Use associated classification analytics-meta */
+          g_snprintf (str_buf, sizeof (str_buf), "%04.2f",
+              gst_analytics_cls_mtd_get_level (
+                  (GstAnalyticsClsMtd *) & cls_rlt_mtd, 0));
+
+          od_obj_type = gst_analytics_cls_mtd_get_quark (&cls_rlt_mtd, 0);
+        } else {
+          /* Use basic class type directly on OD.
+           * Here we want the confidence level of the bbox but to retrieve
+           * we need to also retrieve the bbox location. */
+          gst_analytics_od_mtd_get_location (od_mtd, &x, &y, &w, &h,
+              &loc_confi_lvl);
+          GST_TRACE_OBJECT (filter, "obj {type: %s loc:(%u,%u)-(%ux%u) @ %f}",
+              g_quark_to_string (od_obj_type), x, y, w, h, loc_confi_lvl);
+
+          g_snprintf (str_buf, sizeof (str_buf), "%04.2f", loc_confi_lvl);
+        }
+        gchar *text = g_strdup_printf ("%s (c=%s)",
+            g_quark_to_string (od_obj_type), str_buf);
+
+        gst_object_detection_overlay_render_text_annotation
+            (GST_OBJECT_DETECTION_OVERLAY (filter), &cairo_ctx, od_mtd, text);
+
+        g_free (text);
+      }
+    }
+
+    rectangle = gst_video_overlay_rectangle_new_raw (overlay->canvas,
+        0, 0, GST_VIDEO_INFO_WIDTH (overlay->in_info),
+        GST_VIDEO_INFO_HEIGHT (overlay->in_info),
+        GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA);
+    gst_video_overlay_composition_add_rectangle (overlay->composition,
+        rectangle);
+    gst_video_overlay_rectangle_unref (rectangle);
+
+    gst_object_detection_overlay_destroy_cairo_context (&cairo_ctx);
+    gst_buffer_unmap (buffer, &map);
+
+  }
+
+  if (overlay->composition) {
+    GST_DEBUG_OBJECT (filter, "have composition");
+
+    if (overlay->attach_compo_to_buffer) {
+      GST_DEBUG_OBJECT (filter, "attach");
+
+      gst_buffer_add_video_overlay_composition_meta (frame->buffer,
+          overlay->composition);
+    } else {
+      gst_video_overlay_composition_blend (overlay->composition, frame);
+    }
+  }
+
+  return GST_FLOW_OK;
+}
+
+static void
+gst_object_detection_overlay_render_boundingbox (GstObjectDetectionOverlay
+    * overlay, GstObjectDetectionOverlayPangoCairoContext * ctx,
+    GstAnalyticsODMtd * od_mtd)
+{
+  gint x, y, w, h;
+  gfloat _dummy;
+  cairo_save (ctx->cr);
+  gst_analytics_od_mtd_get_location (od_mtd, &x, &y, &w, &h, &_dummy);
+  gint maxw = GST_VIDEO_INFO_WIDTH (overlay->in_info) - 1;
+  gint maxh = GST_VIDEO_INFO_HEIGHT (overlay->in_info) - 1;
+
+  x = CLAMP (x, 0, maxw);
+  y = CLAMP (y, 0, maxh);
+  w = CLAMP (w, 0, maxw - x);
+  h = CLAMP (h, 0, maxh - y);
+
+  /* Set bounding box stroke color and width */
+  cairo_set_source_rgba (ctx->cr,
+      ((overlay->od_outline_color >> 16) & 0xFF) / 255.0,
+      ((overlay->od_outline_color >> 8) & 0xFF) / 255.0,
+      ((overlay->od_outline_color) & 0xFF) / 255.0,
+      ((overlay->od_outline_color >> 24) & 0xFF) / 255.0);
+  cairo_set_line_width (ctx->cr, overlay->od_outline_stroke_width);
+
+  /* draw bounding box */
+  cairo_rectangle (ctx->cr, x, y, w, h);
+  cairo_stroke (ctx->cr);
+  cairo_restore (ctx->cr);
+}
+
+static void
+gst_object_detection_overlay_render_text_annotation (GstObjectDetectionOverlay
+    * overlay, GstObjectDetectionOverlayPangoCairoContext * ctx,
+    GstAnalyticsODMtd * od_mtd, const gchar * annotation)
+{
+  PangoRectangle ink_rect, logical_rect;
+  gint x, y, w, h;
+  gfloat _dummy;
+  gint maxw = GST_VIDEO_INFO_WIDTH (overlay->in_info) - 1;
+  gint maxh = GST_VIDEO_INFO_HEIGHT (overlay->in_info) - 1;
+
+  cairo_save (ctx->cr);
+  gst_analytics_od_mtd_get_location (od_mtd, &x, &y, &w, &h, &_dummy);
+
+  x = CLAMP (x, 0, maxw);
+  y = CLAMP (y, 0, maxh);
+  w = CLAMP (w, 0, maxw - x);
+  h = CLAMP (h, 0, maxh - y);
+
+  /* Set label strokes color and width */
+  cairo_set_source_rgba (ctx->cr,
+      ((overlay->labels_color >> 16) & 0xFF) / 255.0,
+      ((overlay->labels_color >> 8) & 0xFF) / 255.0,
+      ((overlay->labels_color) & 0xFF) / 255.0,
+      ((overlay->labels_color >> 24) & 0xFF) / 255.0);
+  cairo_set_line_width (ctx->cr, overlay->labels_stroke_width);
+
+  pango_layout_set_markup (overlay->pango_layout, annotation,
+      strlen (annotation));
+  pango_layout_get_pixel_extents (overlay->pango_layout, &ink_rect,
+      &logical_rect);
+  GST_DEBUG_OBJECT (overlay, "logical_rect:(%d,%d),%dx%d", logical_rect.x,
+      logical_rect.y, logical_rect.width, logical_rect.height);
+  GST_DEBUG_OBJECT (overlay, "ink_rect:(%d,%d),%dx%d", ink_rect.x, ink_rect.y,
+      ink_rect.width, ink_rect.height);
+  cairo_move_to (ctx->cr, x + overlay->labels_outline_ofs,
+      y - logical_rect.height - overlay->labels_outline_ofs);
+
+  pango_cairo_layout_path (ctx->cr, overlay->pango_layout);
+  cairo_stroke (ctx->cr);
+  cairo_restore (ctx->cr);
+}

gst-plugins-bad-1.24.5.tar.xz/ext/analyticsoverlay/gstobjectdetectionoverlay.h Added

@@ -0,0 +1,40 @@
+/* GStreamer object detection overlay
+ * Copyright (C) <2023> Collabora Ltd.
+ *  @author: Aaron Boxer <aaron.boxer@collabora.com>
+ *  @author: Daniel Morin <daniel.morin@collabora.com>
+ *
+ * gstobjectdetectionoverlay.h
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_OBJECT_DETECTION_OVERLAY_H__
+#define __GST_OBJECT_DETECTION_OVERLAY_H__
+
+#include <gst/video/gstvideofilter.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_OBJECT_DETECTION_OVERLAY \
+  (gst_object_detection_overlay_get_type())
+
+G_DECLARE_FINAL_TYPE (GstObjectDetectionOverlay, gst_object_detection_overlay,
+    GST, OBJECT_DETECTION_OVERLAY, GstVideoFilter)
+
+GST_ELEMENT_REGISTER_DECLARE (objectdetectionoverlay);
+
+G_END_DECLS
+#endif /* __GST_OBJECT_DETECTION_OVERLAY_H__ */

gst-plugins-bad-1.24.5.tar.xz/ext/analyticsoverlay/meson.build Added

gst-plugins-bad-1.22.7.tar.xz/ext/aom/gstav1dec.c -> gst-plugins-bad-1.24.5.tar.xz/ext/aom/gstav1dec.c Changed

@@ -415,7 +415,7 @@
 gst_av1_dec_handle_frame (GstVideoDecoder * dec, GstVideoCodecFrame * frame)
 {
   GstAV1Dec *av1dec = GST_AV1_DEC_CAST (dec);
-  GstFlowReturn ret;
+  GstFlowReturn ret = GST_FLOW_OK;
   GstMapInfo minfo;
   aom_codec_err_t status;
   aom_image_t *img;
@@ -444,8 +444,11 @@
   gst_buffer_unmap (frame->input_buffer, &minfo);
 
   if (status) {
-    GST_ELEMENT_ERROR (av1dec, LIBRARY, INIT,
-        ("Failed to decode frame"), ("%s", ""));
+    const gchar *error = aom_codec_error (&av1dec->decoder);
+    const gchar *details = aom_codec_error_detail (&av1dec->decoder);
+    GST_VIDEO_DECODER_ERROR (av1dec, 1, LIBRARY, INIT,
+        ("Failed to decode frame"), ("%s (details: %s)", error,
+            GST_STR_NULL (details)), ret);
     gst_video_codec_frame_unref (frame);
     return ret;
   }
@@ -454,11 +457,11 @@
   if (img) {
     if (gst_av1_dec_get_valid_format (av1dec, img, &fmt) == FALSE) {
       aom_img_free (img);
-      GST_ELEMENT_ERROR (dec, LIBRARY, ENCODE,
+      GST_VIDEO_DECODER_ERROR (dec, 1, LIBRARY, ENCODE,
           ("Failed to decode frame"), ("Unsupported color format %d",
-              img->fmt));
+              img->fmt), ret);
       gst_video_codec_frame_unref (frame);
-      return GST_FLOW_ERROR;
+      return ret;
     }
 
     gst_av1_dec_handle_resolution_change (av1dec, img, fmt);

gst-plugins-bad-1.22.7.tar.xz/ext/aom/gstav1enc.c -> gst-plugins-bad-1.24.5.tar.xz/ext/aom/gstav1enc.c Changed

@@ -568,7 +568,11 @@
   av1enc->aom_cfg.rc_resize_mode = DEFAULT_RESIZE_MODE;
   av1enc->aom_cfg.rc_resize_denominator = DEFAULT_RESIZE_DENOMINATOR;
   av1enc->aom_cfg.rc_resize_kf_denominator = DEFAULT_RESIZE_KF_DENOMINATOR;
+#ifdef HAVE_LIBAOM_3
+  av1enc->aom_cfg.rc_superres_mode = (aom_superres_mode) DEFAULT_SUPERRES_MODE;
+#else
   av1enc->aom_cfg.rc_superres_mode = DEFAULT_SUPERRES_MODE;
+#endif
   av1enc->aom_cfg.rc_superres_denominator = DEFAULT_SUPERRES_DENOMINATOR;
   av1enc->aom_cfg.rc_superres_kf_denominator = DEFAULT_SUPERRES_KF_DENOMINATOR;
   av1enc->aom_cfg.rc_superres_qthresh = DEFAULT_SUPERRES_QTHRESH;
@@ -831,15 +835,13 @@
 
   av1enc->aom_cfg.g_w = GST_VIDEO_INFO_WIDTH (info);
   av1enc->aom_cfg.g_h = GST_VIDEO_INFO_HEIGHT (info);
-  /* Recommended method is to set the timebase to that of the parent
-   * container or multimedia framework (ex: 1/1000 for ms, as in FLV) */
-  if (GST_VIDEO_INFO_FPS_D (info) != 0 && GST_VIDEO_INFO_FPS_N (info) != 0) {
-    av1enc->aom_cfg.g_timebase.num = GST_VIDEO_INFO_FPS_D (info);
-    av1enc->aom_cfg.g_timebase.den = GST_VIDEO_INFO_FPS_N (info);
-  } else {
-    av1enc->aom_cfg.g_timebase.num = DEFAULT_TIMEBASE_N;
-    av1enc->aom_cfg.g_timebase.den = DEFAULT_TIMEBASE_D;
-  }
+  /* Zero framerate and max-framerate but still need to setup the timebase to avoid
+   * a divide by zero error. Presuming the lowest common denominator will be RTP -
+   * VP8 payload draft states clock rate of 90000 which should work for anyone where
+   * FPS < 90000 (shouldn't be too many cases where it's higher) though wouldn't be optimal. RTP specification
+   * http://tools.ietf.org/html/draft-ietf-payload-vp8-01 section 6.3.1 */
+  av1enc->aom_cfg.g_timebase.num = 1;
+  av1enc->aom_cfg.g_timebase.den = 90000;
   av1enc->aom_cfg.g_error_resilient = AOM_ERROR_RESILIENT_DEFAULT;
 
   if (av1enc->threads == DEFAULT_THREADS)
@@ -870,6 +872,8 @@
     return FALSE;
   }
   av1enc->encoder_inited = TRUE;
+  av1enc->last_pts = GST_CLOCK_TIME_NONE;
+  av1enc->last_input_duration = GST_CLOCK_TIME_NONE;
 
   GST_AV1_ENC_APPLY_CODEC_CONTROL (av1enc, AOME_SET_CPUUSED, av1enc->cpu_used);
 #ifdef AOM_CTRL_AV1E_SET_ROW_MT
@@ -968,30 +972,31 @@
       gst_segment_to_running_time (&encoder->input_segment,
       GST_FORMAT_TIME, frame->pts);
 
-  if (GST_CLOCK_TIME_IS_VALID (av1enc->next_pts)
-      && pts_rt <= av1enc->next_pts) {
+  if (GST_CLOCK_TIME_IS_VALID (av1enc->last_pts)
+      && pts_rt <= av1enc->last_pts) {
     GST_WARNING_OBJECT (av1enc,
         "decreasing pts %" GST_TIME_FORMAT " previous buffer was %"
         GST_TIME_FORMAT " enforce increasing pts", GST_TIME_ARGS (pts_rt),
-        GST_TIME_ARGS (av1enc->next_pts));
-    pts_rt = av1enc->next_pts + 1;
+        GST_TIME_ARGS (av1enc->last_pts));
+    pts_rt = av1enc->last_pts + 1;
   }
 
-  av1enc->next_pts = pts_rt;
+  av1enc->last_pts = pts_rt;
 
   // Convert the pts from nanoseconds to timebase units
   scaled_pts =
-      gst_util_uint64_scale_int (pts_rt,
+      gst_util_uint64_scale (pts_rt,
       av1enc->aom_cfg.g_timebase.den,
       av1enc->aom_cfg.g_timebase.num * (GstClockTime) GST_SECOND);
 
   if (frame->duration != GST_CLOCK_TIME_NONE) {
     duration =
-        gst_util_uint64_scale (frame->duration, av1enc->aom_cfg.g_timebase.den,
+        gst_util_uint64_scale_round (frame->duration,
+        av1enc->aom_cfg.g_timebase.den,
         av1enc->aom_cfg.g_timebase.num * (GstClockTime) GST_SECOND);
 
     if (duration > 0) {
-      av1enc->next_pts += frame->duration;
+      av1enc->last_input_duration = frame->duration;
     } else {
       /* We force the path ignoring the duration if we end up with a zero
        * value for duration after scaling (e.g. duration value too small) */
@@ -999,11 +1004,15 @@
           "Ignoring too small frame duration %" GST_TIME_FORMAT,
           GST_TIME_ARGS (frame->duration));
       duration = 1;
-      av1enc->next_pts += 1;
     }
   } else {
     duration = 1;
-    av1enc->next_pts += 1;
+  }
+
+  if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame)) {
+    GST_DEBUG_OBJECT (av1enc, "Forcing keyframe for frame %u",
+        frame->system_frame_number);
+    flags |= AOM_EFLAG_FORCE_KF;
   }
 
   if (aom_codec_encode (&av1enc->encoder, &raw, scaled_pts, duration, flags)
@@ -1038,8 +1047,11 @@
     GST_DEBUG_OBJECT (encoder, "Calling finish");
     g_mutex_lock (&av1enc->encoder_lock);
 
-    if (GST_CLOCK_TIME_IS_VALID (av1enc->next_pts))
-      pts = av1enc->next_pts;
+    if (GST_CLOCK_TIME_IS_VALID (av1enc->last_pts))
+      pts = av1enc->last_pts;
+    if (GST_CLOCK_TIME_IS_VALID (av1enc->last_input_duration))
+      pts += av1enc->last_input_duration;
+
     scaled_pts =
         gst_util_uint64_scale (pts,
         av1enc->aom_cfg.g_timebase.den,
@@ -1071,7 +1083,8 @@
     av1enc->encoder_inited = FALSE;
   }
 
-  av1enc->next_pts = GST_CLOCK_TIME_NONE;
+  av1enc->last_pts = GST_CLOCK_TIME_NONE;
+  av1enc->last_input_duration = GST_CLOCK_TIME_NONE;
 
   g_mutex_unlock (&av1enc->encoder_lock);
 }

gst-plugins-bad-1.22.7.tar.xz/ext/aom/gstav1enc.h -> gst-plugins-bad-1.24.5.tar.xz/ext/aom/gstav1enc.h Changed

@@ -82,6 +82,13 @@
   GST_AV1_ENC_SUPERRES_QTHRESH = 3,
 } GstAV1EncSuperresMode;
 
+#ifdef HAVE_LIBAOM_3
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_SUPERRES_NONE == (guint) AOM_SUPERRES_NONE);
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_SUPERRES_FIXED == (guint) AOM_SUPERRES_FIXED);
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_SUPERRES_RANDOM == (guint) AOM_SUPERRES_RANDOM);
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_SUPERRES_QTHRESH == (guint) AOM_SUPERRES_QTHRESH);
+#endif
+
 /**
  * GstAV1EncEndUsageMode:
  * @GST_AV1_ENC_END_USAGE_VBR: Variable Bit Rate Mode
@@ -100,6 +107,11 @@
   GST_AV1_ENC_END_USAGE_Q = 3,
 } GstAV1EncEndUsageMode;
 
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_END_USAGE_VBR == (guint) AOM_VBR);
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_END_USAGE_CBR == (guint) AOM_CBR);
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_END_USAGE_CQ == (guint) AOM_CQ);
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_END_USAGE_Q == (guint) AOM_Q);
+
 /**
  * GstAV1EncKFMode:
  * @GST_AV1_ENC_KF_DISABLED: Encoder does not place keyframes
@@ -116,6 +128,9 @@
   GST_AV1_ENC_KF_AUTO = 1,
 } GstAV1EncKFMode;
 
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_KF_DISABLED == (guint) AOM_KF_DISABLED);
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_KF_AUTO == (guint) AOM_KF_AUTO);
+
 /**
  * GstAV1EncEncPass:
  * @GST_AV1_ENC_ONE_PASS: Single pass mode
@@ -135,6 +150,13 @@
   GST_AV1_ENC_THIRD_PASS = 3,
 } GstAV1EncEncPass;
 
+#ifdef HAVE_LIBAOM_3_2
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_ONE_PASS == (guint) AOM_RC_ONE_PASS);
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_FIRST_PASS == (guint) AOM_RC_FIRST_PASS);
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_SECOND_PASS == (guint) AOM_RC_SECOND_PASS);
+G_STATIC_ASSERT ((guint) GST_AV1_ENC_THIRD_PASS == (guint) AOM_RC_THIRD_PASS);
+#endif
+
 /**
  * GstAV1EncUsageProfile:
  * @GST_AV1_ENC_USAGE_GOOD_QUALITY: Good Quality profile
@@ -172,8 +194,10 @@
   aom_img_fmt_t format;
   GMutex encoder_lock;
 
-  /* next pts, in running time */
-  GstClockTime next_pts;
+  /* Last inputi pts, in running time */
+  GstClockTime last_pts;
+  /* duration of the last input buffer */
+  GstClockTime last_input_duration;
 
   gboolean target_bitrate_set;
 };

gst-plugins-bad-1.22.7.tar.xz/ext/aom/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/aom/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/ext/assrender/gstassrender.c -> gst-plugins-bad-1.24.5.tar.xz/ext/assrender/gstassrender.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/avtp/gstavtp.c -> gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtp.c Changed

@@ -149,8 +149,9 @@
  * Each element has its own configuration properties, with some being common
  * to several elements. Basic properties are:
  *
- *   * streamid (avtpaafpay, avtpcvfpay, avtpaafdepay, avtpcvfdepay,
- *     avtpcrfsync, avtpcrfcheck): Stream ID associated with the stream.
+ *   * streamid (avtpaafpay, avtprvfpay, avtpcvfpay, avtprvfdepay, avtpcvfdepay,
+ *     avtprvfdepay, avtpcrfsync, avtpcrfcheck): Stream ID associated with the
+ *     stream.
  *
  *   * ifname (avtpsink, avtpsrc, avtpcrfsync, avtpcrfcheck): Network interface
  *     used to send/receive AVTP packets.
@@ -160,23 +161,23 @@
  *   * priority (avtpsink): Priority used by the plugin to transmit AVTP
  *     traffic.
  *
- *   * mtt (avtpaafpay, avtpcvfpay): Maximum Transit Time, in nanoseconds, as
- *     defined in AVTP spec.
+ *   * mtt (avtpaafpay, avtprvfpay, avtpcvfpay): Maximum Transit Time, in
+ *     nanoseconds, as defined in AVTP spec.
  *
- *   * tu (avtpaafpay, avtpcvfpay): Maximum Time Uncertainty, in nanoseconds, as
- *     defined in AVTP spec.
+ *   * tu (avtpaafpay, avtprvfpay, avtpcvfpay): Maximum Time Uncertainty, in
+ *     nanoseconds, as defined in AVTP spec.
  *
- *   * processing-deadline (avtpaafpay, avtpcvfpay, avtpsink): Maximum amount of
- *     time, in nanoseconds, that the pipeline is expected to process any
- *     buffer. This value should be in sync between the one used on the
- *     payloader and the sink, as this time is also taken into consideration to
- *     define the correct presentation time of the packets on the AVTP listener
+ *   * processing-deadline (avtpaafpay, avtprvfpay, avtpcvfpay, avtpsink):
+ *     Maximum amount of time, in nanoseconds, that the pipeline is expected to
+ *     process any buffer. This value should be in sync between the one used on
+ *     the payloader and the sink, as this time is also taken into consideration
+ *     to define the correct presentation time of the packets on the AVTP listener
  *     side. It should be as low as possible (zero if possible).
  *
  *   * timestamp-mode (avtpaafpay): AAF timestamping mode, as defined in AVTP spec.
  *
- *   * mtu (avtpcvfpay): Maximum Transmit Unit of the underlying network, used
- *     to determine when to fragment a CVF packet and how big it should be.
+ *   * mtu (avtprvfpay, avtpcvfpay): Maximum Transmit Unit of the underlying network,
+ *     used to determine when to fragment a RVF/CVF packet and how big it should be.
  *
  * Check each element documentation for more details.
  *
@@ -240,7 +241,9 @@
 #include "gstavtpaafdepay.h"
 #include "gstavtpaafpay.h"
 #include "gstavtpcvfdepay.h"
+#include "gstavtprvfdepay.h"
 #include "gstavtpcvfpay.h"
+#include "gstavtprvfpay.h"
 #include "gstavtpsink.h"
 #include "gstavtpsrc.h"
 #include "gstavtpcrfsync.h"
@@ -255,7 +258,9 @@
   ret |= GST_ELEMENT_REGISTER (avtpaafdepay, plugin);
   ret |= GST_ELEMENT_REGISTER (avtpsink, plugin);
   ret |= GST_ELEMENT_REGISTER (avtpsrc, plugin);
+  ret |= GST_ELEMENT_REGISTER (avtprvfpay, plugin);
   ret |= GST_ELEMENT_REGISTER (avtpcvfpay, plugin);
+  ret |= GST_ELEMENT_REGISTER (avtprvfdepay, plugin);
   ret |= GST_ELEMENT_REGISTER (avtpcvfdepay, plugin);
   ret |= GST_ELEMENT_REGISTER (avtpcrfsync, plugin);
   ret |= GST_ELEMENT_REGISTER (avtpcrfcheck, plugin);

gst-plugins-bad-1.22.7.tar.xz/ext/avtp/gstavtpcrfutil.c -> gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtpcrfutil.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/avtp/gstavtpcvfdepay.c -> gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtpcvfdepay.c Changed

@@ -51,8 +51,7 @@
 
 static GstFlowReturn gst_avtp_cvf_depay_chain (GstPad * pad, GstObject * parent,
     GstBuffer * buffer);
-static GstStateChangeReturn gst_avtp_cvf_depay_change_state (GstElement *
-    element, GstStateChange transition);
+static gboolean gst_avtp_cvf_depay_push_caps (GstAvtpVfDepayBase * avtpvfdepay);
 
 #define AVTP_CVF_H264_HEADER_SIZE (sizeof(struct avtp_stream_pdu) + sizeof(guint32))
 #define FU_A_HEADER_SIZE (sizeof(guint16))
@@ -82,7 +81,7 @@
 
 #define gst_avtp_cvf_depay_parent_class parent_class
 G_DEFINE_TYPE (GstAvtpCvfDepay, gst_avtp_cvf_depay,
-    GST_TYPE_AVTP_BASE_DEPAYLOAD);
+    GST_TYPE_AVTP_VF_DEPAY_BASE);
 GST_ELEMENT_REGISTER_DEFINE (avtpcvfdepay, "avtpcvfdepay", GST_RANK_NONE,
     GST_TYPE_AVTP_CVF_DEPAY);
 
@@ -92,6 +91,8 @@
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   GstAvtpBaseDepayloadClass *avtpbasedepayload_class =
       GST_AVTP_BASE_DEPAYLOAD_CLASS (klass);
+  GstAvtpVfDepayBaseClass *avtpvfdepaybase_class =
+      GST_AVTP_VF_DEPAY_BASE_CLASS (klass);
 
   gst_element_class_add_static_pad_template (element_class, &src_template);
 
@@ -101,11 +102,11 @@
       "Extracts compressed video from CVF AVTPDUs",
       "Ederson de Souza <ederson.desouza@intel.com>");
 
-  element_class->change_state =
-      GST_DEBUG_FUNCPTR (gst_avtp_cvf_depay_change_state);
-
   avtpbasedepayload_class->chain = GST_DEBUG_FUNCPTR (gst_avtp_cvf_depay_chain);
 
+  avtpvfdepaybase_class->depay_push_caps =
+      GST_DEBUG_FUNCPTR (gst_avtp_cvf_depay_push_caps);
+
   GST_DEBUG_CATEGORY_INIT (avtpcvfdepay_debug, "avtpcvfdepay",
       0, "debug category for avtpcvfdepay element");
 }
@@ -113,38 +114,16 @@
 static void
 gst_avtp_cvf_depay_init (GstAvtpCvfDepay * avtpcvfdepay)
 {
-  avtpcvfdepay->out_buffer = NULL;
   avtpcvfdepay->fragments = NULL;
   avtpcvfdepay->seqnum = 0;
 }
 
-static GstStateChangeReturn
-gst_avtp_cvf_depay_change_state (GstElement *
-    element, GstStateChange transition)
-{
-  GstAvtpCvfDepay *avtpcvfdepay = GST_AVTP_CVF_DEPAY (element);
-  GstStateChangeReturn ret;
-
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-  if (ret == GST_STATE_CHANGE_FAILURE) {
-    return ret;
-  }
-
-  if (transition == GST_STATE_CHANGE_READY_TO_NULL) {
-    if (avtpcvfdepay->out_buffer) {
-      gst_buffer_unref (avtpcvfdepay->out_buffer);
-      avtpcvfdepay->out_buffer = NULL;
-    }
-  }
-
-  return ret;
-}
-
 static gboolean
-gst_avtp_cvf_depay_push_caps (GstAvtpCvfDepay * avtpcvfdepay)
+gst_avtp_cvf_depay_push_caps (GstAvtpVfDepayBase * avtpvfdepay)
 {
   GstAvtpBaseDepayload *avtpbasedepayload =
-      GST_AVTP_BASE_DEPAYLOAD (avtpcvfdepay);
+      GST_AVTP_BASE_DEPAYLOAD (avtpvfdepay);
+  GstAvtpCvfDepay *avtpcvfdepay = GST_AVTP_CVF_DEPAY (avtpvfdepay);
   GstBuffer *codec_data;
   GstEvent *event;
   GstMapInfo map;
@@ -176,109 +155,16 @@
 }
 
 static GstFlowReturn
-gst_avtp_cvf_depay_push (GstAvtpCvfDepay * avtpcvfdepay)
-{
-  GstAvtpBaseDepayload *avtpbasedepayload =
-      GST_AVTP_BASE_DEPAYLOAD (avtpcvfdepay);
-  GstFlowReturn ret;
-
-  if (G_UNLIKELY (!gst_pad_has_current_caps (avtpbasedepayload->srcpad))) {
-    guint64 pts_m;
-    guint32 dts, pts;
-
-    if (gst_debug_category_get_threshold (GST_CAT_DEFAULT) >= GST_LEVEL_DEBUG) {
-      GstClock *clock = gst_element_get_clock (GST_ELEMENT_CAST (avtpcvfdepay));
-      if (clock == NULL) {
-        GST_DEBUG_OBJECT (avtpcvfdepay,
-            "Sending initial CAPS and SEGMENT, no pipeline time.");
-      } else {
-        GST_DEBUG_OBJECT (avtpcvfdepay,
-            "Sending initial CAPS and SEGMENT, pipeline time: %"
-            GST_TIME_FORMAT, GST_TIME_ARGS (gst_clock_get_time (clock)));
-      }
-    }
-
-    if (!gst_avtp_cvf_depay_push_caps (avtpcvfdepay)) {
-      GST_ELEMENT_ERROR (avtpcvfdepay, CORE, CAPS, (NULL), (NULL));
-      return GST_FLOW_ERROR;
-    }
-
-    if (!gst_avtp_base_depayload_push_segment_event (avtpbasedepayload,
-            GST_BUFFER_PTS (avtpcvfdepay->out_buffer))) {
-      GST_ELEMENT_ERROR (avtpcvfdepay, CORE, EVENT,
-          ("Could not send SEGMENT event"), (NULL));
-    }
-
-    /* Now that we sent our segment starting on the first Presentation
-     * time available, `avtpbasedepayload->prev_ptime` saves that value,
-     * to be a reference for calculating future buffer timestamps from
-     * the AVTP timestamps (avtp_ts and h264_ts).
-     *
-     * However, decode timestamps can be smaller than presentation
-     * timestamps. So we can't use `avtpbasedepayload->prev_time` as
-     * reference to calculate them. Instead, here, we calculate the
-     * first decode timestamp and save it on `avtpcvfdepay->prev_ptime`.
-     *
-     * The method used to calculate the "absolute" decode timestamp (DTS)
-     * from presentation timestamp is as follows:
-     *
-     *   DTS = dts > pts ? (PTSm - 1) | dts : PTSm | dts
-     *
-     * Where:
-     *   dts: 32 bits gPTP decode timestamp
-     *   pts: 32 bits gPTP presentation timestamp
-     *   PTSm: 32 most signifactive bits of the "absolute" presentation
-     *   timestamp
-     *
-     * This allow us to handle cases where the pts ends up being smaller
-     * than dts due pts falling after an AVTP timestamp wrapping.
-     */
-
-    pts = GST_BUFFER_PTS (avtpcvfdepay->out_buffer);
-    dts = GST_BUFFER_DTS (avtpcvfdepay->out_buffer);
-    pts_m = avtpbasedepayload->prev_ptime & 0xFFFFFFFF00000000ULL;
-
-    avtpbasedepayload->prev_ptime = dts > pts ? (pts_m -=
-        (1ULL << 32)) | dts : pts_m | dts;
-    GST_DEBUG_OBJECT (avtpcvfdepay, "prev_ptime set to %" GST_TIME_FORMAT,
-        GST_TIME_ARGS (avtpbasedepayload->prev_ptime));
-  }
-
-  /* At this point, we're sure segment was sent, so we can properly calc
-   * buffer timestamps */
-  GST_DEBUG_OBJECT (avtpcvfdepay, "Converting %" GST_TIME_FORMAT " to PTS",
-      GST_TIME_ARGS (GST_BUFFER_PTS (avtpcvfdepay->out_buffer)));
-  GST_BUFFER_PTS (avtpcvfdepay->out_buffer) =
-      gst_avtp_base_depayload_tstamp_to_ptime (avtpbasedepayload, GST_BUFFER_PTS
-      (avtpcvfdepay->out_buffer), avtpbasedepayload->prev_ptime);
-
-  GST_DEBUG_OBJECT (avtpcvfdepay, "Converting %" GST_TIME_FORMAT " to DTS",
-      GST_TIME_ARGS (GST_BUFFER_DTS (avtpcvfdepay->out_buffer)));
-  GST_BUFFER_DTS (avtpcvfdepay->out_buffer) =
-      gst_avtp_base_depayload_tstamp_to_ptime (avtpbasedepayload, GST_BUFFER_DTS
-      (avtpcvfdepay->out_buffer), avtpbasedepayload->prev_ptime);
-
-  /* Use DTS as prev_ptime as it is smaller or equal to PTS, so that
-   * next calculations of PTS/DTS won't wrap too early */
-  avtpbasedepayload->prev_ptime = GST_BUFFER_DTS (avtpcvfdepay->out_buffer);
-
-  ret = gst_pad_push (GST_AVTP_BASE_DEPAYLOAD (avtpcvfdepay)->srcpad,
-      avtpcvfdepay->out_buffer);
-  avtpcvfdepay->out_buffer = NULL;
-
-  return ret;
-}
-
-static GstFlowReturn
 gst_avtp_cvf_depay_push_and_discard (GstAvtpCvfDepay * avtpcvfdepay)
 {
+  GstAvtpVfDepayBase *avtpvfdepaybase = GST_AVTP_VF_DEPAY_BASE (avtpcvfdepay);
   GstFlowReturn ret = GST_FLOW_OK;
 
   /* Push everything we have, hopefully decoder can handle it */
-  if (avtpcvfdepay->out_buffer != NULL) {
+  if (avtpvfdepaybase->out_buffer != NULL) {
     GST_DEBUG_OBJECT (avtpcvfdepay, "Pushing incomplete buffers");
 
-    ret = gst_avtp_cvf_depay_push (avtpcvfdepay);
+    ret = gst_avtp_vf_depay_base_push (GST_AVTP_VF_DEPAY_BASE (avtpcvfdepay));
   }
 
   /* Discard any incomplete fragments */
@@ -449,6 +335,7 @@
 gst_avtp_cvf_depay_internal_push (GstAvtpCvfDepay * avtpcvfdepay,
     GstBuffer * buffer, gboolean M)
 {
+  GstAvtpVfDepayBase *avtpvfdepaybase = GST_AVTP_VF_DEPAY_BASE (avtpcvfdepay);
   GstFlowReturn ret = GST_FLOW_OK;
 
   GST_LOG_OBJECT (avtpcvfdepay,
@@ -456,16 +343,16 @@
       G_GSIZE_FORMAT ") to out_buffer", gst_buffer_get_size (buffer),
       gst_buffer_get_size (buffer) - sizeof (guint32));
 
-  if (avtpcvfdepay->out_buffer) {
-    avtpcvfdepay->out_buffer =
-        gst_buffer_append (avtpcvfdepay->out_buffer, buffer);
+  if (avtpvfdepaybase->out_buffer) {
+    avtpvfdepaybase->out_buffer =
+        gst_buffer_append (avtpvfdepaybase->out_buffer, buffer);
   } else {
-    avtpcvfdepay->out_buffer = buffer;
+    avtpvfdepaybase->out_buffer = buffer;
   }
 
   /* We only truly push to decoder when we get the last video buffer */
   if (M) {
-    ret = gst_avtp_cvf_depay_push (avtpcvfdepay);
+    ret = gst_avtp_vf_depay_base_push (GST_AVTP_VF_DEPAY_BASE (avtpcvfdepay));
   }
 
   return ret;

gst-plugins-bad-1.22.7.tar.xz/ext/avtp/gstavtpcvfdepay.h -> gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtpcvfdepay.h Changed

@@ -24,10 +24,9 @@
 
 #include <gst/gst.h>
 
-#include "gstavtpbasedepayload.h"
+#include "gstavtpvfdepaybase.h"
 
 G_BEGIN_DECLS
-
 #define GST_TYPE_AVTP_CVF_DEPAY (gst_avtp_cvf_depay_get_type())
 #define GST_AVTP_CVF_DEPAY(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AVTP_CVF_DEPAY,GstAvtpCvfDepay))
@@ -37,22 +36,20 @@
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AVTP_CVF_DEPAY))
 #define GST_IS_AVTP_CVF_DEPAY_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AVTP_CVF_DEPAY))
-
 typedef struct _GstAvtpCvfDepay GstAvtpCvfDepay;
 typedef struct _GstAvtpCvfDepayClass GstAvtpCvfDepayClass;
 
 struct _GstAvtpCvfDepay
 {
-  GstAvtpBaseDepayload depayload;
+  GstAvtpVfDepayBaseClass vfdepayload;
 
   guint8 seqnum;
-  GstBuffer *out_buffer;
   GstBuffer *fragments;
 };
 
 struct _GstAvtpCvfDepayClass
 {
-  GstAvtpBaseDepayloadClass parent_class;
+  GstAvtpVfDepayBaseClass parent_class;
 };
 
 GType gst_avtp_cvf_depay_get_type (void);
@@ -60,5 +57,4 @@
 GST_ELEMENT_REGISTER_DECLARE (avtpcvfdepay);
 
 G_END_DECLS
-
 #endif /* __GST_AVTP_CVF_DEPAY_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/avtp/gstavtpcvfpay.c -> gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtpcvfpay.c Changed

@@ -1,6 +1,8 @@
 /*
  * GStreamer AVTP Plugin
  * Copyright (C) 2019 Intel Corporation
+ * Copyright (c) 2021, Fastree3D
+ * Adrian Fiergolski <Adrian.Fiergolski@fastree3d.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -46,31 +48,19 @@
 
 /* prototypes */
 
-static GstFlowReturn gst_avtp_cvf_pay_chain (GstPad * pad, GstObject * parent,
-    GstBuffer * buffer);
-static gboolean gst_avtp_cvf_pay_sink_event (GstPad * pad, GstObject * parent,
-    GstEvent * event);
-
-static void gst_avtp_cvf_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_avtp_cvf_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
 static GstStateChangeReturn gst_avtp_cvf_change_state (GstElement *
     element, GstStateChange transition);
 
+static gboolean gst_avtp_cvf_pay_new_caps (GstAvtpVfPayBase * avtpvfpaybase,
+    GstCaps * caps);
+static gboolean gst_avtp_cvf_pay_prepare_avtp_packets (GstAvtpVfPayBase *
+    avtpvfpaybase, GstBuffer * buffer, GPtrArray * avtp_packets);
+
 enum
 {
   PROP_0,
-  PROP_MTU,
-  PROP_MEASUREMENT_INTERVAL,
-  PROP_MAX_INTERVAL_FRAME
 };
 
-#define DEFAULT_MTU 1500
-#define DEFAULT_MEASUREMENT_INTERVAL 250000
-#define DEFAULT_MAX_INTERVAL_FRAMES 1
-
 #define AVTP_CVF_H264_HEADER_SIZE (sizeof(struct avtp_stream_pdu) + sizeof(guint32))
 #define FU_A_TYPE 28
 #define FU_A_HEADER_SIZE (sizeof(guint16))
@@ -96,17 +86,16 @@
 /* class initialization */
 
 #define gst_avtp_cvf_pay_parent_class parent_class
-G_DEFINE_TYPE (GstAvtpCvfPay, gst_avtp_cvf_pay, GST_TYPE_AVTP_BASE_PAYLOAD);
+G_DEFINE_TYPE (GstAvtpCvfPay, gst_avtp_cvf_pay, GST_TYPE_AVTP_VF_PAY_BASE);
 GST_ELEMENT_REGISTER_DEFINE (avtpcvfpay, "avtpcvfpay", GST_RANK_NONE,
     GST_TYPE_AVTP_CVF_PAY);
 
 static void
 gst_avtp_cvf_pay_class_init (GstAvtpCvfPayClass * klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
-  GstAvtpBasePayloadClass *avtpbasepayload_class =
-      GST_AVTP_BASE_PAYLOAD_CLASS (klass);
+  GstAvtpVfPayBaseClass *avtpvfpaybase_class =
+      GST_AVTP_VF_PAY_BASE_CLASS (klass);
 
   gst_element_class_add_static_pad_template (gstelement_class, &sink_template);
 
@@ -116,32 +105,12 @@
       "Payload-encode compressed video into CVF AVTPDU (IEEE 1722)",
       "Ederson de Souza <ederson.desouza@intel.com>");
 
-  gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_avtp_cvf_set_property);
-  gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_avtp_cvf_get_property);
-
   gstelement_class->change_state =
       GST_DEBUG_FUNCPTR (gst_avtp_cvf_change_state);
 
-  avtpbasepayload_class->chain = GST_DEBUG_FUNCPTR (gst_avtp_cvf_pay_chain);
-  avtpbasepayload_class->sink_event =
-      GST_DEBUG_FUNCPTR (gst_avtp_cvf_pay_sink_event);
-
-  g_object_class_install_property (gobject_class, PROP_MTU,
-      g_param_spec_uint ("mtu", "Maximum Transit Unit",
-          "Maximum Transit Unit (MTU) of underlying network in bytes", 0,
-          G_MAXUINT, DEFAULT_MTU, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, PROP_MEASUREMENT_INTERVAL,
-      g_param_spec_uint64 ("measurement-interval", "Measurement Interval",
-          "Measurement interval of stream in nanoseconds", 0,
-          G_MAXUINT64, DEFAULT_MEASUREMENT_INTERVAL,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, PROP_MAX_INTERVAL_FRAME,
-      g_param_spec_uint ("max-interval-frames", "Maximum Interval Frames",
-          "Maximum number of network frames to be sent on each Measurement Interval",
-          1, G_MAXUINT, DEFAULT_MAX_INTERVAL_FRAMES,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  avtpvfpaybase_class->new_caps = GST_DEBUG_FUNCPTR (gst_avtp_cvf_pay_new_caps);
+  avtpvfpaybase_class->prepare_avtp_packets =
+      GST_DEBUG_FUNCPTR (gst_avtp_cvf_pay_prepare_avtp_packets);
 
   GST_DEBUG_CATEGORY_INIT (avtpcvfpay_debug, "avtpcvfpay",
       0, "debug category for avtpcvfpay element");
@@ -150,60 +119,8 @@
 static void
 gst_avtp_cvf_pay_init (GstAvtpCvfPay * avtpcvfpay)
 {
-  avtpcvfpay->mtu = DEFAULT_MTU;
   avtpcvfpay->header = NULL;
   avtpcvfpay->nal_length_size = 0;
-  avtpcvfpay->measurement_interval = DEFAULT_MEASUREMENT_INTERVAL;
-  avtpcvfpay->max_interval_frames = DEFAULT_MAX_INTERVAL_FRAMES;
-  avtpcvfpay->last_interval_ct = 0;
-}
-
-static void
-gst_avtp_cvf_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstAvtpCvfPay *avtpcvfpay = GST_AVTP_CVF_PAY (object);
-
-  GST_DEBUG_OBJECT (avtpcvfpay, "prop_id: %u", prop_id);
-
-  switch (prop_id) {
-    case PROP_MTU:
-      avtpcvfpay->mtu = g_value_get_uint (value);
-      break;
-    case PROP_MEASUREMENT_INTERVAL:
-      avtpcvfpay->measurement_interval = g_value_get_uint64 (value);
-      break;
-    case PROP_MAX_INTERVAL_FRAME:
-      avtpcvfpay->max_interval_frames = g_value_get_uint (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_avtp_cvf_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstAvtpCvfPay *avtpcvfpay = GST_AVTP_CVF_PAY (object);
-
-  GST_DEBUG_OBJECT (avtpcvfpay, "prop_id: %u", prop_id);
-
-  switch (prop_id) {
-    case PROP_MTU:
-      g_value_set_uint (value, avtpcvfpay->mtu);
-      break;
-    case PROP_MEASUREMENT_INTERVAL:
-      g_value_set_uint64 (value, avtpcvfpay->measurement_interval);
-      break;
-    case PROP_MAX_INTERVAL_FRAME:
-      g_value_set_uint (value, avtpcvfpay->max_interval_frames);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
 }
 
 static GstStateChangeReturn
@@ -338,6 +255,7 @@
 gst_avtpcvpay_fragment_nal (GstAvtpCvfPay * avtpcvfpay, GstBuffer * nal,
     gsize * offset, gboolean * last_fragment)
 {
+  GstAvtpVfPayBase *avtpvfpaybase = GST_AVTP_VF_PAY_BASE (avtpcvfpay);
   GstBuffer *fragment_header, *fragment;
   guint8 nal_header, nal_type, nal_nri, fu_indicator, fu_header;
   gsize available, nal_size, fragment_size, remaining;
@@ -346,7 +264,8 @@
   nal_size = gst_buffer_get_size (nal);
 
   /* If NAL + header will be smaller than MTU, nothing to fragment */
-  if (*offset == 0 && (nal_size + AVTP_CVF_H264_HEADER_SIZE) <= avtpcvfpay->mtu) {
+  if (*offset == 0
+      && (nal_size + AVTP_CVF_H264_HEADER_SIZE) <= avtpvfpaybase->mtu) {
     *last_fragment = TRUE;
     *offset = nal_size;
     GST_DEBUG_OBJECT (avtpcvfpay,
@@ -363,7 +282,7 @@
 
   /* Remaining size is smaller than MTU, so this is the last fragment */
   remaining = nal_size - *offset + AVTP_CVF_H264_HEADER_SIZE + FU_A_HEADER_SIZE;
-  if (remaining <= avtpcvfpay->mtu) {
+  if (remaining <= avtpvfpaybase->mtu) {
     *last_fragment = TRUE;
   }
 
@@ -388,7 +307,7 @@
   gst_buffer_unmap (fragment_header, &map);
 
   available =
-      avtpcvfpay->mtu - AVTP_CVF_H264_HEADER_SIZE -
+      avtpvfpaybase->mtu - AVTP_CVF_H264_HEADER_SIZE -
       gst_buffer_get_size (fragment_header);
 
   /* NAL unit header is not sent, but spread into FU indicator and header,
@@ -411,123 +330,21 @@
   return fragment;
 }
 
-static void
-gst_avtp_cvf_pay_spread_ts (GstAvtpCvfPay * avtpcvfpay,
-    GPtrArray * avtp_packets)
-{
-  /* A bit of the idea of what this function do:
-   *
-   * After fragmenting the NAL unit, we have a series of AVTPDUs (AVTP Data Units)
-   * that should be transmitted. They are going to be transmitted according to GstBuffer
-   * DTS (or PTS in case there's no DTS), but all of them have the same DTS, as they
-   * came from the same original NAL unit.
-   *
-   * However, TSN streams should send their data according to a "measurement interval",
-   * which is an arbitrary interval defined for the stream. For instance, a class A
-   * stream has measurement interval of 125us. Also, there's a MaxIntervalFrames
-   * parameter, that defines how many network frames can be sent on a given measurement
-   * interval. We also spread MaxIntervalFrames per measurement interval.
-   *
-   * To that end, this function will spread the DTS so that fragments follow measurement
-   * interval and MaxIntervalFrames, adjusting them to end before the actual DTS of the
-   * original NAL unit.
-   *
-   * Roughly, this function does:
-   *
-   *  DTSn = DTSbase - (measurement_interval/MaxIntervalFrames) * (total - n - 1)
-   *
-   * Where:
-   *  DTSn = DTS of nth fragment
-   *  DTSbase = DTS of original NAL unit
-   *  total = # of fragments
-   *
-   * Another issue that this function takes care of is avoiding DTSs that overlap between
-   * two different set of fragments. Assuming DTSlast is the DTS of the last fragment
-   * generated on previous call to this function, we don't want any DTSn for the current
-   * call to be smaller than DTSlast + (measurement_interval / MaxIntervalFrames). If
-   * that's the case, we adjust DTSbase to preserve this difference (so we don't schedule
-   * packets transmission times that violate stream spec). This will cause the last
-   * fragment DTS to be bigger than DTSbase - we emit a warning, as this may be a sign
-   * of a bad pipeline setup or inappropriate stream spec.
-   *
-   * Finally, we also avoid underflows - which would occur when DTSbase is zero or small
-   * enough. In this case, we'll again make last fragment DTS > DTSbase, so we log it.
-   *
-   */
-
-  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (avtpcvfpay);
-
-  gint i, ret;
-  guint len;
-  guint64 tx_interval, total_interval;
-  GstClockTime base_time, base_dts, rt;
-  GstBuffer *packet;
-
-  base_time = gst_element_get_base_time (GST_ELEMENT (avtpcvfpay));
-  base_dts = GST_BUFFER_DTS (g_ptr_array_index (avtp_packets, 0));
-
-  tx_interval =
-      avtpcvfpay->measurement_interval / avtpcvfpay->max_interval_frames;
-  len = avtp_packets->len;
-  total_interval = tx_interval * (len - 1);
-
-  /* We don't want packets transmission time to overlap, so let's ensure
-   * packets are scheduled after last interval used */
-  if (avtpcvfpay->last_interval_ct != 0) {
-    GstClockTime dts_ct, dts_rt;
-
-    ret =
-        gst_segment_to_running_time_full (&avtpbasepayload->segment,
-        GST_FORMAT_TIME, base_dts, &dts_rt);
-    if (ret == -1)
-      dts_rt = -dts_rt;
-
-    dts_ct = base_time + dts_rt;
-
-    if (dts_ct < avtpcvfpay->last_interval_ct + total_interval + tx_interval) {
-      base_dts +=
-          avtpcvfpay->last_interval_ct + total_interval + tx_interval - dts_ct;
-
-      GST_WARNING_OBJECT (avtpcvfpay,
-          "Not enough measurements intervals between frames to transmit fragments"
-          ". Check stream transmission spec.");
-    }
-  }
-
-  /* Not enough room to spread tx before DTS (or we would underflow),
-   * add offset */
-  if (total_interval > base_dts) {
-    base_dts += total_interval - base_dts;
-
-    GST_INFO_OBJECT (avtpcvfpay,
-        "Not enough measurements intervals to transmit fragments before base "
-        "DTS. Check pipeline settings. Are we live?");
-  }
-
-  for (i = 0; i < len; i++) {
-    packet = g_ptr_array_index (avtp_packets, i);
-    GST_BUFFER_DTS (packet) = base_dts - tx_interval * (len - i - 1);
-  }
-
-  /* Remember last interval used, in clock time */
-  ret =
-      gst_segment_to_running_time_full (&avtpbasepayload->segment,
-      GST_FORMAT_TIME, GST_BUFFER_DTS (g_ptr_array_index (avtp_packets,
-              avtp_packets->len - 1)), &rt);
-  if (ret == -1)
-    rt = -rt;
-  avtpcvfpay->last_interval_ct = base_time + rt;
-}
-
 static gboolean
-gst_avtp_cvf_pay_prepare_avtp_packets (GstAvtpCvfPay * avtpcvfpay,
-    GPtrArray * nals, GPtrArray * avtp_packets)
+gst_avtp_cvf_pay_prepare_avtp_packets (GstAvtpVfPayBase * avtpvfpaybase,
+    GstBuffer * buffer, GPtrArray * avtp_packets)
 {
-  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (avtpcvfpay);
+  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (avtpvfpaybase);
+  GstAvtpCvfPay *avtpcvfpay = GST_AVTP_CVF_PAY (avtpvfpaybase);
+  GPtrArray *nals;
   GstBuffer *header, *nal;
   GstMapInfo map;
   gint i;
 
+  /* Get all NALs inside buffer */
+  nals = g_ptr_array_new ();
+  gst_avtp_cvf_pay_extract_nals (avtpcvfpay, buffer, nals);
+
   for (i = 0; i < nals->len; i++) {
     guint64 avtp_time, h264_time;
     gboolean last_fragment;
@@ -626,71 +443,17 @@
     gst_buffer_unref (nal);
   }
 
-  GST_LOG_OBJECT (avtpcvfpay, "Prepared %u AVTP packets", avtp_packets->len);
+  g_ptr_array_free (nals, TRUE);
 
-  /* Ensure DTS/PTS respect stream transmit spec, so PDUs are transmitted
-   * according to measurement interval. */
-  if (avtp_packets->len > 0)
-    gst_avtp_cvf_pay_spread_ts (avtpcvfpay, avtp_packets);
+  GST_LOG_OBJECT (avtpcvfpay, "Prepared %u AVTP packets", avtp_packets->len);
 
   return TRUE;
 }
 
-static GstFlowReturn
-gst_avtp_cvf_pay_push_packets (GstAvtpCvfPay * avtpcvfpay,
-    GPtrArray * avtp_packets)
-{
-  int i;
-  GstFlowReturn ret;
-  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (avtpcvfpay);
-
-  for (i = 0; i < avtp_packets->len; i++) {
-    GstBuffer *packet;
-
-    packet = g_ptr_array_index (avtp_packets, i);
-    ret = gst_pad_push (avtpbasepayload->srcpad, packet);
-    if (ret != GST_FLOW_OK)
-      return ret;
-  }
-
-  return GST_FLOW_OK;
-}
-
-static GstFlowReturn
-gst_avtp_cvf_pay_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
-{
-  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (parent);
-  GstAvtpCvfPay *avtpcvfpay = GST_AVTP_CVF_PAY (avtpbasepayload);
-  GPtrArray *nals, *avtp_packets;
-  GstFlowReturn ret = GST_FLOW_OK;
-
-  GST_LOG_OBJECT (avtpcvfpay,
-      "Incoming buffer size: %" G_GSIZE_FORMAT " PTS: %" GST_TIME_FORMAT
-      " DTS: %" GST_TIME_FORMAT, gst_buffer_get_size (buffer),
-      GST_TIME_ARGS (GST_BUFFER_PTS (buffer)),
-      GST_TIME_ARGS (GST_BUFFER_DTS (buffer)));
-
-  /* Get all NALs inside buffer */
-  nals = g_ptr_array_new ();
-  gst_avtp_cvf_pay_extract_nals (avtpcvfpay, buffer, nals);
-
-  /* Prepare a list of avtp_packets to send */
-  avtp_packets = g_ptr_array_new ();
-  gst_avtp_cvf_pay_prepare_avtp_packets (avtpcvfpay, nals, avtp_packets);
-
-  ret = gst_avtp_cvf_pay_push_packets (avtpcvfpay, avtp_packets);
-
-  /* Contents of both ptr_arrays should be unref'd or transferred
-   * to rightful owner by this point, no need to unref them again */
-  g_ptr_array_free (nals, TRUE);
-  g_ptr_array_free (avtp_packets, TRUE);
-
-  return ret;
-}
-
 static gboolean
-gst_avtp_cvf_pay_new_caps (GstAvtpCvfPay * avtpcvfpay, GstCaps * caps)
+gst_avtp_cvf_pay_new_caps (GstAvtpVfPayBase * avtpvfpaybase, GstCaps * caps)
 {
+  GstAvtpCvfPay *avtpcvfpay = GST_AVTP_CVF_PAY (avtpvfpaybase);
   const GValue *value;
   GstStructure *str;
   GstBuffer *buffer;
@@ -730,41 +493,3 @@
   gst_buffer_unmap (buffer, &map);
   return FALSE;
 }
-
-static gboolean
-gst_avtp_cvf_pay_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
-{
-  GstCaps *caps;
-  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (parent);
-  GstAvtpCvfPay *avtpcvfpay = GST_AVTP_CVF_PAY (avtpbasepayload);
-  gboolean ret;
-
-  GST_DEBUG_OBJECT (avtpcvfpay, "Sink event %s", GST_EVENT_TYPE_NAME (event));
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_CAPS:
-      gst_event_parse_caps (event, &caps);
-      ret = gst_avtp_cvf_pay_new_caps (avtpcvfpay, caps);
-      gst_event_unref (event);
-      return ret;
-    case GST_EVENT_FLUSH_STOP:
-      if (GST_ELEMENT (avtpcvfpay)->current_state == GST_STATE_PLAYING) {
-        /* After a flush, the sink will reset pipeline base_time, but only
-         * after it gets the first buffer. So, here, we used the wrong
-         * base_time to calculate DTS. We'll just notice base_time changed
-         * when we get the next buffer. So, we'll basically mess with
-         * timestamps of two frames, which is bad. Known workaround is
-         * to pause the pipeline before a flushing seek - so that we'll
-         * be up to date to new pipeline base_time */
-        GST_WARNING_OBJECT (avtpcvfpay,
-            "Flushing seek performed while pipeline is PLAYING, "
-            "AVTP timestamps will be incorrect!");
-      }
-      break;
-    default:
-      break;
-  }
-
-  return GST_AVTP_BASE_PAYLOAD_CLASS (parent_class)->sink_event (pad, parent,
-      event);
-}

gst-plugins-bad-1.22.7.tar.xz/ext/avtp/gstavtpcvfpay.h -> gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtpcvfpay.h Changed

gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtprvfdepay.c Added

@@ -0,0 +1,711 @@
+/*
+ * GStreamer AVTP Plugin
+ * Copyright (c) 2021, Fastree3D
+ * Adrian Fiergolski <Adrian.Fiergolski@fastree3d.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
+ */
+
+/**
+ * SECTION:element-avtprvfdepay
+ * @see_also: avtprvfpay
+ *
+ * De-payload RVF AVTPDUs into x-raw video according
+ * to IEEE 1722-2016. For detailed information see
+ * https://standards.ieee.org/standard/1722-2016.html.
+ *
+ * <refsect2>
+ * <title>Example pipeline</title>
+ * |
+ * gst-launch-1.0 avtpsrc ! avtprvfdepay ! videoconvert ! autovideosink
+ * | This example pipeline will de-payload raw video from the AVTPDUs
+ * and play them. Refer to the avtprvfpay example to payload raw video and send the
+ * AVTP stream.
+ * </refsect2>
+ * Since: 1.24
+ */
+
+#include <avtp.h>
+#include <avtp_rvf.h>
+
+#include <gst/video/video.h>
+#include "gstavtprvfdepay.h"
+
+GST_DEBUG_CATEGORY_STATIC (avtprvfdepay_debug);
+#define GST_CAT_DEFAULT avtprvfdepay_debug
+
+/* prototypes */
+
+static GstFlowReturn gst_avtp_rvf_depay_chain (GstPad * pad, GstObject * parent,
+    GstBuffer * buffer);
+
+static gboolean gst_avtp_rvf_depay_push_caps (GstAvtpVfDepayBase * avtpvfdepay);
+
+gboolean is_first_fragment (GstAvtpRvfDepay * avtprvfdepay, GstMapInfo * map);
+gboolean is_last_fragment (GstAvtpRvfDepay * avtprvfdepay, GstMapInfo * map);
+
+#define AVTP_RVF_HEADER_SIZE (sizeof(struct avtp_stream_pdu) + sizeof(uint64_t))
+
+/* pad templates */
+
+static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{GRAY16_LE}"))
+    );
+
+#define gst_avtp_rvf_depay_parent_class parent_class
+G_DEFINE_TYPE (GstAvtpRvfDepay, gst_avtp_rvf_depay,
+    GST_TYPE_AVTP_VF_DEPAY_BASE);
+GST_ELEMENT_REGISTER_DEFINE (avtprvfdepay, "avtprvfdepay", GST_RANK_NONE,
+    GST_TYPE_AVTP_RVF_DEPAY);
+
+static void
+gst_avtp_rvf_depay_class_init (GstAvtpRvfDepayClass * klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstAvtpBaseDepayloadClass *avtpbasedepayload_class =
+      GST_AVTP_BASE_DEPAYLOAD_CLASS (klass);
+  GstAvtpVfDepayBaseClass *avtpvfdepaybase_class =
+      GST_AVTP_VF_DEPAY_BASE_CLASS (klass);
+
+  gst_element_class_add_static_pad_template (element_class, &src_template);
+
+  gst_element_class_set_static_metadata (element_class,
+      "AVTP Raw Video Format (RVF) depayloader",
+      "Codec/Depayloader/Network/AVTP",
+      "Extracts raw video from RVF AVTPDUs",
+      "Adrian Fiergolski <Adrian.Fiergolski@fastree3d.com>");
+
+  avtpbasedepayload_class->chain = GST_DEBUG_FUNCPTR (gst_avtp_rvf_depay_chain);
+
+  avtpvfdepaybase_class->depay_push_caps =
+      GST_DEBUG_FUNCPTR (gst_avtp_rvf_depay_push_caps);
+
+  GST_DEBUG_CATEGORY_INIT (avtprvfdepay_debug, "avtprvfdepay",
+      0, "debug category for avtprvfdepay element");
+}
+
+static void
+gst_avtp_rvf_depay_init (GstAvtpRvfDepay * avtprvfdepay)
+{
+  avtprvfdepay->seqnum = 0;
+  avtprvfdepay->format_fixed = FALSE;
+}
+
+static guint
+translate_pixel_depth (guint8 pixel_depth)
+{
+  switch (pixel_depth) {
+    case AVTP_RVF_PIXEL_DEPTH_8:
+      return 8;
+    case AVTP_RVF_PIXEL_DEPTH_10:
+      return 10;
+    case AVTP_RVF_PIXEL_DEPTH_12:
+      return 12;
+    case AVTP_RVF_PIXEL_DEPTH_16:
+      return 16;
+    default:
+      return 0;
+  }
+}
+
+static guint
+translate_frame_rate (guint8 frame_rate)
+{
+  switch (frame_rate) {
+    case AVTP_RVF_FRAME_RATE_1:
+      return 1;
+    case AVTP_RVF_FRAME_RATE_2:
+      return 2;
+    case AVTP_RVF_FRAME_RATE_5:
+      return 5;
+    case AVTP_RVF_FRAME_RATE_10:
+      return 10;
+    case AVTP_RVF_FRAME_RATE_15:
+      return 15;
+    case AVTP_RVF_FRAME_RATE_20:
+      return 20;
+    case AVTP_RVF_FRAME_RATE_24:
+      return 24;
+    case AVTP_RVF_FRAME_RATE_25:
+      return 25;
+    case AVTP_RVF_FRAME_RATE_30:
+      return 30;
+    case AVTP_RVF_FRAME_RATE_48:
+      return 48;
+    case AVTP_RVF_FRAME_RATE_50:
+      return 50;
+    case AVTP_RVF_FRAME_RATE_60:
+      return 60;
+    case AVTP_RVF_FRAME_RATE_72:
+      return 72;
+    case AVTP_RVF_FRAME_RATE_85:
+      return 85;
+    case AVTP_RVF_FRAME_RATE_100:
+      return 100;
+    case AVTP_RVF_FRAME_RATE_120:
+      return 120;
+    case AVTP_RVF_FRAME_RATE_150:
+      return 150;
+    case AVTP_RVF_FRAME_RATE_200:
+      return 200;
+    case AVTP_RVF_FRAME_RATE_240:
+      return 240;
+    case AVTP_RVF_FRAME_RATE_300:
+      return 300;
+    default:
+      return 0;
+  }
+}
+
+static gboolean
+gst_avtp_rvf_depay_push_caps (GstAvtpVfDepayBase * avtpvfdepay)
+{
+  GstAvtpBaseDepayload *avtpbasedepayload =
+      GST_AVTP_BASE_DEPAYLOAD (avtpvfdepay);
+  GstAvtpRvfDepay *avtprvfdepay = GST_AVTP_RVF_DEPAY (avtpvfdepay);
+  GstEvent *event;
+  GstCaps *caps;
+  GstVideoInfo info;
+  GstVideoFormat format;
+
+  GST_DEBUG_OBJECT (avtprvfdepay, "Setting src pad caps");
+
+  format = GST_VIDEO_FORMAT_UNKNOWN;
+  if (avtprvfdepay->pixel_depth == AVTP_RVF_PIXEL_DEPTH_16 &&
+      avtprvfdepay->pixel_format == AVTP_RVF_PIXEL_FORMAT_MONO &&
+      avtprvfdepay->colorspace == AVTP_RVF_COLORSPACE_GRAY) {
+    format = GST_VIDEO_FORMAT_GRAY16_LE;
+  }
+
+  /* Unsupported format */
+  if (format == GST_VIDEO_FORMAT_UNKNOWN) {
+    GST_ERROR_OBJECT (avtprvfdepay, "Unsupported raw video format");
+    return FALSE;
+  }
+
+  GST_DEBUG_OBJECT (avtprvfdepay,
+      "Selected source format: %s", gst_video_format_to_string (format));
+
+  gst_video_info_set_interlaced_format (&info, format,
+      GST_VIDEO_INTERLACE_MODE_PROGRESSIVE, avtprvfdepay->active_pixels,
+      avtprvfdepay->total_lines);
+
+  info.fps_n = translate_frame_rate (avtprvfdepay->frame_rate);
+  info.fps_d = 1;
+  if (avtprvfdepay->pd) {
+    info.fps_n *= 1000;
+    info.fps_d = 1001;
+  }
+
+  caps = gst_video_info_to_caps (&info);
+  event = gst_event_new_caps (caps);
+
+  gst_caps_unref (caps);
+
+  return gst_pad_push_event (avtpbasedepayload->srcpad, event);
+}
+
+static GstFlowReturn
+gst_avtp_rvf_depay_discard (GstAvtpRvfDepay * avtprvfdepay)
+{
+  GstAvtpVfDepayBase *avtpvfdepaybase = GST_AVTP_VF_DEPAY_BASE (avtprvfdepay);
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  /* Discard any incomplete frame */
+  if (avtpvfdepaybase->out_buffer != NULL) {
+    GST_DEBUG_OBJECT (avtprvfdepay, "Discarding incomplete frame");
+    gst_buffer_unref (avtpvfdepaybase->out_buffer);
+    avtpvfdepaybase->out_buffer = NULL;
+  }
+
+  return ret;
+}
+
+static gboolean
+gst_avtp_rvf_depay_validate_avtpdu (GstAvtpRvfDepay * avtprvfdepay,
+    GstMapInfo * map, gboolean * lost_packet)
+{
+  GstAvtpBaseDepayload *avtpbasedepayload =
+      GST_AVTP_BASE_DEPAYLOAD (avtprvfdepay);
+  struct avtp_stream_pdu *pdu;
+  gboolean result = FALSE;
+  guint64 val;
+  guint val32;
+  gint r;
+
+  if (G_UNLIKELY (map->size < AVTP_RVF_HEADER_SIZE)) {
+    GST_DEBUG_OBJECT (avtprvfdepay,
+        "Incomplete AVTP header, expected it to have size of %zd, got %zd",
+        AVTP_RVF_HEADER_SIZE, map->size);
+    goto end;
+  }
+
+  pdu = (struct avtp_stream_pdu *) map->data;
+
+  r = avtp_pdu_get ((struct avtp_common_pdu *) pdu, AVTP_FIELD_SUBTYPE, &val32);
+  g_assert (r == 0);
+  if (val32 != AVTP_SUBTYPE_RVF) {
+    GST_DEBUG_OBJECT (avtprvfdepay,
+        "Unexpected AVTP header subtype %d, expected %d", val32,
+        AVTP_SUBTYPE_RVF);
+    goto end;
+  }
+
+  r = avtp_pdu_get ((struct avtp_common_pdu *) pdu, AVTP_FIELD_VERSION, &val32);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val32 != 0)) {
+    GST_DEBUG_OBJECT (avtprvfdepay,
+        "Unexpected AVTP header version %d, expected %d", val32, 0);
+    goto end;
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_SV, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != 1)) {
+    GST_DEBUG_OBJECT (avtprvfdepay,
+        "Unexpected AVTP header stream valid %" G_GUINT64_FORMAT
+        ", expected %d", val, 1);
+    goto end;
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_STREAM_ID, &val);
+  g_assert (r == 0);
+  if (val != avtpbasedepayload->streamid) {
+    GST_DEBUG_OBJECT (avtprvfdepay,
+        "Unexpected AVTP header stream id 0x%" G_GINT64_MODIFIER
+        "x, expected 0x%" G_GINT64_MODIFIER "x", val,
+        avtpbasedepayload->streamid);
+    goto end;
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_STREAM_DATA_LEN, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != avtprvfdepay->stream_data_length)) {
+    if (!avtprvfdepay->format_fixed) {
+      if (G_UNLIKELY (map->size < sizeof (*pdu) + val)) {
+        GST_DEBUG_OBJECT (avtprvfdepay,
+            "AVTP packet size %" G_GSIZE_FORMAT
+            " too small, expected at least %" G_GUINT64_FORMAT,
+            map->size - AVTP_RVF_HEADER_SIZE, sizeof (*pdu) + val);
+        goto end;
+      }
+
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Data length of the video format %" G_GSIZE_FORMAT, val);
+      avtprvfdepay->stream_data_length = (guint) val;
+    } else {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Unexpected AVTP header data_length %" G_GSIZE_FORMAT
+          ", should be fixed for a given stream (expected %d)", val,
+          avtprvfdepay->stream_data_length);
+      goto end;
+    }
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_AP, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != 1)) {
+    GST_DEBUG_OBJECT (avtprvfdepay,
+        "Unexpected AVTP header AP field %" G_GUINT64_FORMAT ", expected %d",
+        val, 1);
+    goto end;
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_F, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != 0)) {
+    GST_DEBUG_OBJECT (avtprvfdepay,
+        "Unexpected AVTP header F field %" G_GUINT64_FORMAT ", expected %d",
+        val, 0);
+    goto end;
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_ACTIVE_PIXELS, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != avtprvfdepay->active_pixels)) {
+    if (!avtprvfdepay->format_fixed) {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Active pixels of the AVTP raw video stream %" G_GUINT64_FORMAT, val);
+      avtprvfdepay->active_pixels = (guint) val;
+    } else {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Unexpected AVTP header active_pixels %" G_GUINT64_FORMAT
+          ", expected %u", val, avtprvfdepay->active_pixels);
+      goto end;
+    }
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_TOTAL_LINES, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != avtprvfdepay->total_lines)) {
+    if (!avtprvfdepay->format_fixed) {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Total lines of the AVTP raw video stream %" G_GUINT64_FORMAT, val);
+      avtprvfdepay->total_lines = (guint) val;
+    } else {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Unexpected AVTP header total_lines %" G_GUINT64_FORMAT
+          ", expected %d", val, avtprvfdepay->active_pixels);
+      goto end;
+    }
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_PD, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != avtprvfdepay->pd)) {
+    if (!avtprvfdepay->format_fixed) {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Pull-down (PD) filed of the of the AVTP raw video stream %"
+          G_GUINT64_FORMAT, val);
+      avtprvfdepay->pd = (guint) val;
+    } else {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Unexpected AVTP header PD filed %" G_GUINT64_FORMAT ", expected %d",
+          val, avtprvfdepay->pd);
+      goto end;
+    }
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_RAW_PIXEL_DEPTH, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != avtprvfdepay->pixel_depth)) {
+    if (!avtprvfdepay->format_fixed) {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Pixel depth of the AVTP raw video stream %" G_GUINT64_FORMAT, val);
+      avtprvfdepay->pixel_depth = (guint) val;
+    } else {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Unexpected AVTP header pixel_depth %" G_GUINT64_FORMAT
+          ", expected %d", val, avtprvfdepay->pixel_depth);
+      goto end;
+    }
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_RAW_PIXEL_FORMAT, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != avtprvfdepay->pixel_format)) {
+    if (!avtprvfdepay->format_fixed) {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Pixel format of the of the AVTP raw video stream 0x%"
+          G_GINT64_MODIFIER "x", val);
+      avtprvfdepay->pixel_format = (guint) val;
+    } else {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Unexpected AVTP header pixel_format filed 0x%" G_GINT64_MODIFIER
+          "x, expected %x", val, avtprvfdepay->pixel_format);
+      goto end;
+    }
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != avtprvfdepay->frame_rate)) {
+    if (!avtprvfdepay->format_fixed) {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Frame_rate of the AVTP raw video stream 0x%" G_GINT64_MODIFIER "x",
+          val);
+      avtprvfdepay->frame_rate = (guint) val;
+    } else {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Unexpected AVTP header frame_rate filed 0x%" G_GINT64_MODIFIER
+          "x, expected %x", val, avtprvfdepay->frame_rate);
+      goto end;
+    }
+  }
+
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_RAW_COLORSPACE, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != avtprvfdepay->colorspace)) {
+    if (!avtprvfdepay->format_fixed) {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Colorspace of the AVTP raw video stream 0x%" G_GINT64_MODIFIER "x",
+          val);
+      avtprvfdepay->colorspace = (guint) val;
+    } else {
+      GST_DEBUG_OBJECT (avtprvfdepay,
+          "Unexpected AVTP header colorspace filed 0x%" G_GINT64_MODIFIER
+          "x, expected %x", val, avtprvfdepay->colorspace);
+      goto end;
+    }
+  }
+
+  if (G_UNLIKELY (!avtprvfdepay->format_fixed)) {
+    guint8 pixelDepth;
+    guint8 samplesPerPixels;
+    const guint8 samplesPerPixelsFactor = 4;    //multiplied by 4 to avoid floating numbers
+
+    pixelDepth = translate_pixel_depth (avtprvfdepay->pixel_depth);
+    if (!pixelDepth) {
+      GST_DEBUG_OBJECT (avtprvfdepay, "Unsupported pixel depth");
+      goto end;
+    }
+
+    switch (avtprvfdepay->pixel_format) {
+      case AVTP_RVF_PIXEL_FORMAT_MONO:
+        samplesPerPixels = 1 * samplesPerPixelsFactor;
+        break;
+      case AVTP_RVF_PIXEL_FORMAT_411:
+        samplesPerPixels = 1.5 * samplesPerPixelsFactor;
+        break;
+      case AVTP_RVF_PIXEL_FORMAT_420:
+        samplesPerPixels = 1.5 * samplesPerPixelsFactor;
+        break;
+      case AVTP_RVF_PIXEL_FORMAT_422:
+        samplesPerPixels = 2 * samplesPerPixelsFactor;
+        break;
+      case AVTP_RVF_PIXEL_FORMAT_444:
+        samplesPerPixels = 3 * samplesPerPixelsFactor;
+        break;
+      case AVTP_RVF_PIXEL_FORMAT_4224:
+        samplesPerPixels = 2.25 * samplesPerPixelsFactor;
+        break;
+      case AVTP_RVF_PIXEL_FORMAT_4444:
+        samplesPerPixels = 4 * samplesPerPixelsFactor;
+        break;
+      case AVTP_RVF_PIXEL_FORMAT_BAYER_GRBG:
+      case AVTP_RVF_PIXEL_FORMAT_BAYER_RGGB:
+      case AVTP_RVF_PIXEL_FORMAT_BAYER_BGGR:
+      case AVTP_RVF_PIXEL_FORMAT_BAYER_GBRG:
+        samplesPerPixels = 2 * samplesPerPixelsFactor;
+        break;
+      default:
+        GST_DEBUG_OBJECT (avtprvfdepay, "Unsupported colorspace");
+        goto end;
+    }
+
+    avtprvfdepay->line_size =
+        (avtprvfdepay->active_pixels * samplesPerPixels * pixelDepth +
+        (samplesPerPixelsFactor * 8 - 1)) / (samplesPerPixelsFactor * 8);
+
+    /* Take into account AVTP raw header which is considered to be part of the payload too */
+    avtprvfdepay->fragment_size =
+        avtprvfdepay->stream_data_length - sizeof (uint64_t);
+
+    r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_RAW_NUM_LINES, &val);
+    g_assert (r == 0);
+
+    if (val == 0) {             //large raster
+      avtprvfdepay->fragment_eol_size =
+          avtprvfdepay->line_size % avtprvfdepay->fragment_size;
+      avtprvfdepay->i_seq_max =
+          avtprvfdepay->line_size / avtprvfdepay->fragment_size;
+    }
+
+    /* Video format paramaters fixed */
+    avtprvfdepay->format_fixed = TRUE;
+  }
+
+  *lost_packet = FALSE;
+  r = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_SEQ_NUM, &val);
+  g_assert (r == 0);
+  if (G_UNLIKELY (val != avtprvfdepay->seqnum)) {
+    GST_INFO_OBJECT (avtprvfdepay,
+        "Unexpected AVTP header seq num %" G_GUINT64_FORMAT ", expected %u",
+        val, avtprvfdepay->seqnum);
+
+    avtprvfdepay->seqnum = val;
+
+    *lost_packet = TRUE;
+  }
+  avtprvfdepay->seqnum++;
+
+  result = TRUE;
+
+end:
+  return result;
+}
+
+static void
+gst_avtp_rvf_depay_get_avtp_timestamp (GstAvtpRvfDepay * avtprvfdepay,
+    GstMapInfo * map, GstClockTime * ts)
+{
+  struct avtp_stream_pdu *pdu;
+  guint64 avtp_time, tv;
+  gint res;
+
+  pdu = (struct avtp_stream_pdu *) map->data;
+
+  res = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_TV, &tv);
+  g_assert (res == 0);
+
+  if (tv == 1) {
+    res = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_TIMESTAMP, &avtp_time);
+    g_assert (res == 0);
+
+    *ts = avtp_time;
+  } else {
+    *ts = GST_CLOCK_TIME_NONE;
+  }
+}
+
+gboolean
+is_first_fragment (GstAvtpRvfDepay * avtprvfdepay, GstMapInfo * map)
+{
+  struct avtp_stream_pdu *pdu;
+  guint64 num_lines, line_number, i_seq_num;
+  gint res;
+
+  pdu = (struct avtp_stream_pdu *) map->data;
+
+  res = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_RAW_NUM_LINES, &num_lines);
+  g_assert (res == 0);
+
+  res = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_RAW_LINE_NUMBER, &line_number);
+  g_assert (res == 0);
+
+
+  if (line_number == 1) {
+    if (num_lines == 0) {       //large raster
+      res = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_RAW_I_SEQ_NUM, &i_seq_num);
+      g_assert (res == 0);
+
+      if (i_seq_num == 0)
+        return TRUE;
+    } else
+      return TRUE;
+  }
+  return FALSE;
+}
+
+gboolean
+is_last_fragment (GstAvtpRvfDepay * avtprvfdepay, GstMapInfo * map)
+{
+  struct avtp_stream_pdu *pdu;
+  guint64 val;
+  gint res;
+
+  pdu = (struct avtp_stream_pdu *) map->data;
+
+  res = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_EF, &val);
+  g_assert (res == 0);
+
+  return (gboolean) val;
+}
+
+static void
+gst_avtp_rvf_depay_get_fragment_size (GstAvtpRvfDepay * avtprvfdepay,
+    GstMapInfo * map, guint16 * fragment_size)
+{
+  struct avtp_stream_pdu *pdu;
+  guint64 val;
+  gint res;
+
+  pdu = (struct avtp_stream_pdu *) map->data;
+
+  res = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_RAW_NUM_LINES, &val);
+  g_assert (res == 0);
+
+  if (val == 0) {               //large raster
+    res = avtp_rvf_pdu_get (pdu, AVTP_RVF_FIELD_RAW_I_SEQ_NUM, &val);
+    g_assert (res == 0);
+
+    if (val == avtprvfdepay->i_seq_max)
+      *fragment_size = avtprvfdepay->fragment_eol_size;
+    else
+      *fragment_size = avtprvfdepay->fragment_size;
+  } else {                      //small raster
+    *fragment_size = val * avtprvfdepay->line_size;
+  }
+}
+
+static GstFlowReturn
+gst_avtp_rvf_depay_internal_push (GstAvtpRvfDepay * avtprvfdepay,
+    GstBuffer * buffer, GstMapInfo * map)
+{
+  GstAvtpVfDepayBase *avtpvfdepaybase = GST_AVTP_VF_DEPAY_BASE (avtprvfdepay);
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  GST_LOG_OBJECT (avtprvfdepay,
+      "Adding buffer of size %" G_GSIZE_FORMAT " to out_buffer",
+      gst_buffer_get_size (buffer));
+
+  if (avtpvfdepaybase->out_buffer) {
+    avtpvfdepaybase->out_buffer =
+        gst_buffer_append (avtpvfdepaybase->out_buffer, buffer);
+  } else {
+
+    /* Store only if it's a first fragment of the video frame
+     * drop the packet otherwise */
+    if (is_first_fragment (avtprvfdepay, map))
+      avtpvfdepaybase->out_buffer = buffer;
+  }
+
+  /* We only truly push downstream when we get the last video buffer */
+  if (is_last_fragment (avtprvfdepay, map) && avtpvfdepaybase->out_buffer) {
+    ret = gst_avtp_vf_depay_base_push (GST_AVTP_VF_DEPAY_BASE (avtprvfdepay));
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_avtp_rvf_depay_handle_single_fragment (GstAvtpRvfDepay * avtprvfdepay,
+    GstBuffer * buffer, GstMapInfo * map)
+{
+  GstClockTime ts;
+  GstBuffer *fragment;
+  guint16 fragment_size;
+
+  GST_DEBUG_OBJECT (avtprvfdepay, "Handling single fragment unit");
+
+  fragment = gst_buffer_new ();
+  if (G_UNLIKELY (fragment == NULL)) {
+    GST_ERROR_OBJECT (avtprvfdepay, "Could not allocate buffer");
+    return GST_FLOW_ERROR;
+  }
+
+  gst_avtp_rvf_depay_get_avtp_timestamp (avtprvfdepay, map, &ts);
+  gst_avtp_rvf_depay_get_fragment_size (avtprvfdepay, map, &fragment_size);
+  gst_buffer_copy_into (fragment, buffer, GST_BUFFER_COPY_MEMORY,
+      AVTP_RVF_HEADER_SIZE, fragment_size);
+
+  GST_BUFFER_PTS (fragment) = ts;
+  GST_BUFFER_DTS (fragment) = ts;
+
+  return gst_avtp_rvf_depay_internal_push (avtprvfdepay, fragment, map);
+}
+
+static GstFlowReturn
+gst_avtp_rvf_depay_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
+{
+  GstAvtpRvfDepay *avtprvfdepay = GST_AVTP_RVF_DEPAY (parent);
+  GstFlowReturn ret = GST_FLOW_OK;
+  gboolean lost_packet;
+  GstMapInfo map;
+
+  gst_buffer_map (buffer, &map, GST_MAP_READ);
+
+  if (!gst_avtp_rvf_depay_validate_avtpdu (avtprvfdepay, &map, &lost_packet)) {
+    GST_DEBUG_OBJECT (avtprvfdepay, "Invalid AVTPDU buffer, dropping it");
+    goto end;
+  }
+  if (lost_packet) {
+    ret = gst_avtp_rvf_depay_discard (avtprvfdepay);
+    if (ret != GST_FLOW_OK)
+      goto end;
+  }
+
+  gst_avtp_rvf_depay_handle_single_fragment (avtprvfdepay, buffer, &map);
+
+end:
+  gst_buffer_unmap (buffer, &map);
+  gst_buffer_unref (buffer);
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtprvfdepay.h Added

@@ -0,0 +1,76 @@
+/*
+ * GStreamer AVTP Plugin
+ * Copyright (c) 2021, Fastree3D
+ * Adrian Fiergolski <Adrian.Fiergolski@fastree3d.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_AVTP_RVF_DEPAY_H__
+#define __GST_AVTP_RVF_DEPAY_H__
+
+#include <gst/gst.h>
+
+#include "gstavtpvfdepaybase.h"
+
+G_BEGIN_DECLS
+#define GST_TYPE_AVTP_RVF_DEPAY (gst_avtp_rvf_depay_get_type())
+#define GST_AVTP_RVF_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AVTP_RVF_DEPAY,GstAvtpRvfDepay))
+#define GST_AVTP_RVF_DEPAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AVTP_RVF_DEPAY,GstAvtpRvfDepayClass))
+#define GST_IS_AVTP_RVF_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AVTP_RVF_DEPAY))
+#define GST_IS_AVTP_RVF_DEPAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AVTP_RVF_DEPAY))
+typedef struct _GstAvtpRvfDepay GstAvtpRvfDepay;
+typedef struct _GstAvtpRvfDepayClass GstAvtpRvfDepayClass;
+
+struct _GstAvtpRvfDepay
+{
+  GstAvtpVfDepayBaseClass vfdepayload;
+
+  guint8 seqnum;
+
+  gboolean format_fixed;
+
+  guint16 active_pixels;
+  guint16 total_lines;
+  guint16 stream_data_length;
+  gboolean pd;
+  guint8 pixel_depth;
+  guint8 pixel_format;
+  guint8 frame_rate;
+  guint8 colorspace;
+
+  gsize line_size;
+  gsize fragment_size;
+  gsize fragment_eol_size;
+  guint8 i_seq_max;
+};
+
+struct _GstAvtpRvfDepayClass
+{
+  GstAvtpVfDepayBaseClass parent_class;
+};
+
+GType gst_avtp_rvf_depay_get_type (void);
+
+GST_ELEMENT_REGISTER_DECLARE (avtprvfdepay);
+
+G_END_DECLS
+#endif /* __GST_AVTP_RVF_DEPAY_H__ */

gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtprvfpay.c Added

@@ -0,0 +1,553 @@
+/*
+ * GStreamer AVTP Plugin
+ * Copyright (c) 2021, Fastree3D
+ * Adrian Fiergolski <Adrian.Fiergolski@fastree3d.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
+ */
+
+/**
+ * SECTION:element-avtprvfpay
+ * @see_also: avtprvfdepay
+ *
+ * Payload raw video into AVTPDUs according
+ * to IEEE 1722-2016. For detailed information see
+ * https://standards.ieee.org/standard/1722-2016.html.
+ *
+ * <refsect2>
+ * <title>Example pipeline</title>
+ * |
+ * gst-launch-1.0 videotestsrc ! avtprvfpay ! avtpsink
+ * | This example pipeline will payload raw video. Refer to the avtprvfdepay
+ * example to depayload and play the AVTP stream.
+ * </refsect2>
+ * Since: 1.24
+ */
+
+#include <avtp.h>
+#include <avtp_rvf.h>
+
+#include <gst/video/video.h>
+#include "gstavtprvfpay.h"
+
+GST_DEBUG_CATEGORY_STATIC (avtprvfpay_debug);
+#define GST_CAT_DEFAULT avtprvfpay_debug
+
+/* prototypes */
+static GstStateChangeReturn gst_avtp_rvf_change_state (GstElement *
+    element, GstStateChange transition);
+
+static gboolean gst_avtp_rvf_pay_new_caps (GstAvtpVfPayBase * avtpvfpaybase,
+    GstCaps * caps);
+static gboolean gst_avtp_rvf_pay_prepare_avtp_packets (GstAvtpVfPayBase *
+    avtpvfpaybase, GstBuffer * buffer, GPtrArray * avtp_packets);
+
+enum
+{
+  PROP_0,
+};
+
+#define AVTP_RVF_HEADER_SIZE (sizeof(struct avtp_stream_pdu) + sizeof(uint64_t))
+
+/* pad templates */
+
+static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{GRAY16_LE}"))
+    );
+
+/* class initialization */
+
+#define gst_avtp_rvf_pay_parent_class parent_class
+G_DEFINE_TYPE (GstAvtpRvfPay, gst_avtp_rvf_pay, GST_TYPE_AVTP_VF_PAY_BASE);
+GST_ELEMENT_REGISTER_DEFINE (avtprvfpay, "avtprvfpay", GST_RANK_NONE,
+    GST_TYPE_AVTP_RVF_PAY);
+
+static void
+gst_avtp_rvf_pay_class_init (GstAvtpRvfPayClass * klass)
+{
+  GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
+  GstAvtpVfPayBaseClass *avtpvfpaybase_class =
+      GST_AVTP_VF_PAY_BASE_CLASS (klass);
+
+  gst_element_class_add_static_pad_template (gstelement_class, &sink_template);
+
+  gst_element_class_set_static_metadata (gstelement_class,
+      "AVTP Raw Video Format (RVF) payloader",
+      "Codec/Payloader/Network/AVTP",
+      "Payload-encode raw video into RVF AVTPDU (IEEE 1722)",
+      "Adrian Fiergolski <Adrian.Fiergolski@fastree3d.com>");
+
+  gstelement_class->change_state =
+      GST_DEBUG_FUNCPTR (gst_avtp_rvf_change_state);
+
+  avtpvfpaybase_class->new_caps = GST_DEBUG_FUNCPTR (gst_avtp_rvf_pay_new_caps);
+  avtpvfpaybase_class->prepare_avtp_packets =
+      GST_DEBUG_FUNCPTR (gst_avtp_rvf_pay_prepare_avtp_packets);
+
+  GST_DEBUG_CATEGORY_INIT (avtprvfpay_debug, "avtprvfpay",
+      0, "debug category for avtprvfpay element");
+}
+
+static void
+gst_avtp_rvf_pay_init (GstAvtpRvfPay * avtprvfpay)
+{
+  avtprvfpay->header = NULL;
+  /* size of the payload */
+  avtprvfpay->fragment_size = 0;
+  /* large raster: number of data bytes for a fragment at the end of line */
+  avtprvfpay->fragment_eol_size = 0;
+  avtprvfpay->fragment_padding = NULL;
+  avtprvfpay->num_lines = 0;
+  /* size of the line in bytes */
+  avtprvfpay->line_size = 0;
+  /* large raster: maximum i_seq_num */
+  avtprvfpay->i_seq_max = 0;
+}
+
+static gboolean
+gst_avtp_rvf_pay_new_caps (GstAvtpVfPayBase * avtpvfpaybase, GstCaps * caps)
+{
+  GstAvtpRvfPay *avtprvfpay = GST_AVTP_RVF_PAY (avtpvfpaybase);
+  GstMapInfo map;
+  struct avtp_stream_pdu *pdu;
+
+  GstVideoInfo info;
+  unsigned int fps_up, fps_down;
+
+  gboolean ret = FALSE;
+
+  gsize fragment_padding_size;
+
+  GST_DEBUG_OBJECT (avtprvfpay, "gst_avtp_rvf_pay_new_caps");
+
+  gst_buffer_map (avtprvfpay->header, &map, GST_MAP_WRITE);
+  pdu = (struct avtp_stream_pdu *) map.data;
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_ERROR_OBJECT (avtprvfpay,
+        "Can't retrieve the video information from caps");
+    goto error;
+  }
+
+  avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_ACTIVE_PIXELS, info.width);
+  avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_TOTAL_LINES, info.height);
+
+  switch (info.interlace_mode) {
+    case GST_VIDEO_INTERLACE_MODE_PROGRESSIVE:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_I, 0);
+      break;
+      /* to-do: support for interleaved modes */
+    case GST_VIDEO_INTERLACE_MODE_INTERLEAVED:
+    case GST_VIDEO_INTERLACE_MODE_FIELDS:
+    case GST_VIDEO_INTERLACE_MODE_ALTERNATE:
+    default:
+      GST_ERROR_OBJECT (avtprvfpay, "Unsupported interlace mode");
+      goto error;
+  }
+  avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_F, 0);
+
+  switch (*info.finfo->depth) {
+    case 8:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_PIXEL_DEPTH,
+          AVTP_RVF_PIXEL_DEPTH_8);
+      break;
+    case 16:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_PIXEL_DEPTH,
+          AVTP_RVF_PIXEL_DEPTH_16);
+      break;
+      /* to-do: add support for 10 and 12 bit pixel depth
+       * it requires shifting of the buffer data */
+    case 10:
+    case 12:
+    default:
+      GST_ERROR_OBJECT (avtprvfpay, "Unsupported pixel depth");
+      goto error;
+  }
+
+  if (info.finfo->n_planes != 1) {
+    GST_ERROR_OBJECT (avtprvfpay, "Planar formats are not supported");
+    goto error;
+  }
+  //All pixels are active
+  avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_AP, 1);
+
+  switch (info.finfo->format) {
+    case GST_VIDEO_FORMAT_GRAY16_LE:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_PIXEL_FORMAT,
+          AVTP_RVF_PIXEL_FORMAT_MONO);
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_COLORSPACE,
+          AVTP_RVF_COLORSPACE_GRAY);
+      break;
+      /* to-do: support more formats */
+    default:
+      GST_ERROR_OBJECT (avtprvfpay, "Unsupported video format");
+      goto error;
+  }
+
+  avtprvfpay->line_size =
+      (info.finfo->n_components * (*info.finfo->depth) * info.width) / 8;
+  //video_data_payload field for large rasters
+  if (avtprvfpay->line_size > avtpvfpaybase->mtu - AVTP_RVF_HEADER_SIZE) {
+    avtprvfpay->num_lines = 0;
+
+    avtprvfpay->fragment_size = avtpvfpaybase->mtu - AVTP_RVF_HEADER_SIZE;
+    avtprvfpay->fragment_eol_size =
+        avtprvfpay->line_size % avtprvfpay->fragment_size;
+    avtprvfpay->i_seq_max = avtprvfpay->line_size / avtprvfpay->fragment_size;
+
+    fragment_padding_size =
+        avtprvfpay->fragment_size - avtprvfpay->fragment_eol_size;
+  }
+  //video_data_payload field for small rasters
+  else {
+    //only full lines
+    avtprvfpay->num_lines =
+        (avtpvfpaybase->mtu - AVTP_RVF_HEADER_SIZE) / avtprvfpay->line_size;
+
+    //Full video frame is smaller than MTU
+    if (avtprvfpay->num_lines > info.height)
+      avtprvfpay->num_lines = info.height;
+
+    //num_lines field is 4 bit only
+    if (avtprvfpay->num_lines > 15)
+      avtprvfpay->num_lines = 15;
+
+    avtprvfpay->fragment_size = avtprvfpay->num_lines * avtprvfpay->line_size;
+    avtprvfpay->fragment_eol_size = 0;
+    avtprvfpay->i_seq_max = 0;
+
+    fragment_padding_size =
+        avtprvfpay->fragment_size -
+        ((info.height % avtprvfpay->num_lines) * avtprvfpay->line_size);
+  }
+  avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_NUM_LINES, avtprvfpay->num_lines);
+
+  //FPS
+  fps_down = info.fps_n / info.fps_d;   //Round down
+  fps_up = (info.fps_n + (info.fps_d - 1)) / info.fps_d;        //Round up
+
+  if (fps_down == fps_up) {
+    avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_PD, 0);
+  } else {
+    if ((info.fps_n * 1001) == info.fps_d * 1000 * fps_up)
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_PD, 1);
+    else
+      GST_ERROR_OBJECT (avtprvfpay, "Unsupported frame rate");
+    goto error;
+  }
+
+  switch (fps_up) {
+    case 1:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_1);
+      break;
+    case 2:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_2);
+      break;
+    case 5:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_5);
+      break;
+    case 10:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_10);
+      break;
+    case 15:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_15);
+      break;
+    case 20:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_20);
+      break;
+    case 24:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_24);
+      break;
+    case 25:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_25);
+      break;
+    case 30:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_30);
+      break;
+    case 48:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_48);
+      break;
+    case 50:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_50);
+      break;
+    case 60:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_60);
+      break;
+    case 72:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_72);
+      break;
+    case 85:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_85);
+      break;
+    case 100:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_100);
+      break;
+    case 120:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_120);
+      break;
+    case 150:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_150);
+      break;
+    case 200:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_200);
+      break;
+    case 240:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_240);
+      break;
+    case 300:
+      avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_FRAME_RATE,
+          AVTP_RVF_FRAME_RATE_300);
+      break;
+    default:
+      GST_ERROR_OBJECT (avtprvfpay, "Unsupported frame rate");
+      goto error;
+  }
+
+  //padding bytes
+  avtprvfpay->fragment_padding = gst_buffer_new_allocate (NULL,
+      fragment_padding_size, NULL);
+  if (G_UNLIKELY (avtprvfpay->fragment_padding == NULL)) {
+    GST_ERROR_OBJECT (avtprvfpay,
+        "Could not allocate memory for padding bytes");
+    goto error;
+  }
+  gst_buffer_memset (avtprvfpay->fragment_padding, 0, 0U,
+      fragment_padding_size);
+
+  ret = TRUE;
+
+error:
+  gst_buffer_unmap (avtprvfpay->header, &map);
+
+  return ret;
+}
+
+static GstStateChangeReturn
+gst_avtp_rvf_change_state (GstElement * element, GstStateChange transition)
+{
+  GstAvtpRvfPay *avtprvfpay = GST_AVTP_RVF_PAY (element);
+  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (avtprvfpay);
+  GstStateChangeReturn ret;
+
+  if (transition == GST_STATE_CHANGE_NULL_TO_READY) {
+    GstMapInfo map;
+    struct avtp_stream_pdu *pdu;
+    int res;
+
+    avtprvfpay->header = gst_buffer_new_allocate (NULL,
+        AVTP_RVF_HEADER_SIZE, NULL);
+    if (avtprvfpay->header == NULL) {
+      GST_ERROR_OBJECT (avtprvfpay, "Could not allocate buffer");
+      return GST_STATE_CHANGE_FAILURE;
+    }
+
+    gst_buffer_map (avtprvfpay->header, &map, GST_MAP_WRITE);
+    pdu = (struct avtp_stream_pdu *) map.data;
+
+    res = avtp_rvf_pdu_init (pdu);
+    g_assert (res == 0);
+
+    res =
+        avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_STREAM_ID,
+        avtpbasepayload->streamid);
+    g_assert (res == 0);
+
+    gst_buffer_unmap (avtprvfpay->header, &map);
+  }
+
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+  if (ret == GST_STATE_CHANGE_FAILURE) {
+    return ret;
+  }
+
+  if (transition == GST_STATE_CHANGE_READY_TO_NULL) {
+    gst_buffer_unref (avtprvfpay->header);
+  }
+
+  return ret;
+}
+
+/* Checks if stream is large raster video (see: 12.2.9) */
+static gboolean
+is_large_raster (GstAvtpRvfPay * avtprvfpay)
+{
+  return avtprvfpay->num_lines == 0;
+}
+
+static gboolean
+gst_avtp_rvf_pay_prepare_avtp_packets (GstAvtpVfPayBase * avtpvfpaybase,
+    GstBuffer * buffer, GPtrArray * avtp_packets)
+{
+  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (avtpvfpaybase);
+  GstAvtpRvfPay *avtprvfpay = GST_AVTP_RVF_PAY (avtpvfpaybase);
+  GstBuffer *header;
+  GstMapInfo map;
+  guint64 avtp_time;
+  gsize offset, buffer_size;
+  gsize i_seq_num, line_number;
+
+  GST_LOG_OBJECT (avtprvfpay,
+      "Preparing AVTP packets for video frame whose size is %" G_GSIZE_FORMAT,
+      gst_buffer_get_size (buffer));
+
+  /* Calculate timestamps using PTS as base
+   * - code inherited from avtpbasepayload.
+   * Also worth noting: `avtpbasepayload->latency` is updated after
+   * first call to gst_avtp_base_payload_calc_ptime, so we MUST call
+   * it before using the latency value */
+  avtp_time = gst_avtp_base_payload_calc_ptime (avtpbasepayload, buffer);
+
+  offset = 0;
+  buffer_size = gst_buffer_get_size (buffer);
+  i_seq_num = 0;
+  line_number = 1;
+  while (offset != buffer_size) {
+    GstBuffer *packet;
+    struct avtp_stream_pdu *pdu;
+    gint res;
+    GstBuffer *fragment;
+    gsize fragment_size;
+
+    /* Copy header to reuse common fields and change what is needed */
+    header = gst_buffer_copy (avtprvfpay->header);
+    gst_buffer_map (header, &map, GST_MAP_WRITE);
+    pdu = (struct avtp_stream_pdu *) map.data;
+
+    /* Prepare the fragment */
+    if (is_large_raster (avtprvfpay)) {
+      if (i_seq_num == avtprvfpay->i_seq_max)
+        fragment_size = avtprvfpay->fragment_eol_size;
+      else
+        fragment_size = avtprvfpay->fragment_size;
+    } else {
+      guint reamaining_size = buffer_size - offset;
+      if (reamaining_size < avtprvfpay->fragment_size)
+        fragment_size = reamaining_size;
+      else
+        fragment_size = avtprvfpay->fragment_size;
+    }
+
+    fragment = gst_buffer_copy_region (buffer,
+        GST_BUFFER_COPY_MEMORY, offset, fragment_size);
+
+    offset += fragment_size;
+
+    /* video_data_payload is always the same size
+     * so add padding bytes if needed */
+    if (fragment_size != avtprvfpay->fragment_size) {
+      fragment = gst_buffer_append (fragment, avtprvfpay->fragment_padding);
+    }
+
+    GST_DEBUG_OBJECT (avtprvfpay,
+        "Generated fragment with size %" G_GSIZE_FORMAT,
+        avtprvfpay->fragment_size);
+
+    /* Stream data len includes AVTP raw header len as this is part of
+     * the payload too. It's just the uint64_t */
+    res =
+        avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_STREAM_DATA_LEN,
+        avtprvfpay->fragment_size + sizeof (uint64_t));
+    g_assert (res == 0);
+
+    res =
+        avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_SEQ_NUM,
+        avtpbasepayload->seqnum++);
+    g_assert (res == 0);
+
+    /* AVTP_TS fields */
+    if ((is_large_raster (avtprvfpay) && i_seq_num == 0)
+        || (!is_large_raster (avtprvfpay)
+            && line_number == 1)) {
+      res = avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_TV, 1);
+      g_assert (res == 0);
+
+      res = avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_TIMESTAMP, avtp_time);
+      g_assert (res == 0);
+
+      GST_LOG_OBJECT (avtprvfpay, "TV packet sent, PTS: %" GST_TIME_FORMAT
+          " DTS: %" GST_TIME_FORMAT " AVTP_TS: %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (avtp_time),
+          GST_TIME_ARGS (GST_BUFFER_DTS (buffer)),
+          GST_TIME_ARGS (avtp_time & 0xffffffff));
+    }
+
+    /* Set ef */
+    if (offset == buffer_size) {        //last fragment
+      res = avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_EF, 1);
+      g_assert (res == 0);
+    }
+
+    /* Set line_number */
+    res = avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_LINE_NUMBER, line_number);
+    g_assert (res == 0);
+
+    if (is_large_raster (avtprvfpay)) {
+      if (i_seq_num == avtprvfpay->i_seq_max)
+        line_number++;
+    } else {
+      line_number += avtprvfpay->num_lines;
+    }
+
+    /* Handle i_seq_num only for large raster */
+    if (is_large_raster (avtprvfpay)) {
+      res = avtp_rvf_pdu_set (pdu, AVTP_RVF_FIELD_RAW_I_SEQ_NUM, i_seq_num);
+      g_assert (res == 0);
+
+      if (i_seq_num < avtprvfpay->i_seq_max)
+        i_seq_num++;
+      else
+        i_seq_num = 0;
+    }
+
+    packet = gst_buffer_append (header, fragment);
+
+    /* Keep original timestamps */
+    GST_BUFFER_PTS (packet) = GST_BUFFER_PTS (buffer);
+    GST_BUFFER_DTS (packet) = GST_BUFFER_DTS (buffer);
+
+    g_ptr_array_add (avtp_packets, packet);
+
+    gst_buffer_unmap (header, &map);
+  }
+
+  gst_buffer_unref (buffer);
+
+  GST_LOG_OBJECT (avtprvfpay, "Prepared %u AVTP packets", avtp_packets->len);
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtprvfpay.h Added

@@ -0,0 +1,72 @@
+/*
+ * GStreamer AVTP Plugin
+ * Copyright (c) 2021, Fastree3D
+ * Adrian Fiergolski <Adrian.Fiergolski@fastree3d.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_AVTP_RVF_PAY_H__
+#define __GST_AVTP_RVF_PAY_H__
+
+#include <gst/gst.h>
+
+#include "gstavtpvfpaybase.h"
+
+G_BEGIN_DECLS
+#define GST_TYPE_AVTP_RVF_PAY (gst_avtp_rvf_pay_get_type())
+#define GST_AVTP_RVF_PAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AVTP_RVF_PAY,GstAvtpRvfPay))
+#define GST_AVTP_RVF_PAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AVTP_RVF_PAY,GstAvtpRvfPayClass))
+#define GST_IS_AVTP_RVF_PAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AVTP_RVF_PAY))
+#define GST_IS_AVTP_RVF_PAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AVTP_RVF_PAY))
+typedef struct _GstAvtpRvfPay GstAvtpRvfPay;
+typedef struct _GstAvtpRvfPayClass GstAvtpRvfPayClass;
+
+struct _GstAvtpRvfPay
+{
+  GstAvtpVfPayBase vfbase;
+
+  GstBuffer *header;
+  //size of the buffer fragment
+  gsize fragment_size;
+  //large raster: size of the end of line fragment
+  gsize fragment_eol_size;
+  //padding bytes appended to the last fragment of the frame
+  GstBuffer *fragment_padding;
+  //number of lines per fragment
+  guint num_lines;
+  //size of the single line
+  gsize line_size;
+  //maximum value of i_seq_num
+  guint8 i_seq_max;
+};
+
+struct _GstAvtpRvfPayClass
+{
+  GstAvtpVfPayBaseClass parent_class;
+};
+
+GType gst_avtp_rvf_pay_get_type (void);
+
+GST_ELEMENT_REGISTER_DECLARE (avtprvfpay);
+
+G_END_DECLS
+#endif /* __GST_AVTP_RVF_PAY_H__ */

gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtpvfdepaybase.c Added

@@ -0,0 +1,175 @@
+/*
+ * GStreamer AVTP Plugin
+ * Copyright (c) 2021, Fastree3D
+ * Adrian Fiergolski <Adrian.Fiergolski@fastree3d.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 <avtp.h>
+
+#include "gstavtpvfdepaybase.h"
+
+GST_DEBUG_CATEGORY_STATIC (avtpvfdepaybase_debug);
+#define GST_CAT_DEFAULT avtpvfdepaybase_debug
+
+static GstStateChangeReturn gst_avtp_vf_depay_change_state (GstElement *
+    element, GstStateChange transition);
+
+#define gst_avtp_vf_depay_base_parent_class parent_class
+G_DEFINE_TYPE_EXTENDED (GstAvtpVfDepayBase, gst_avtp_vf_depay_base,
+    GST_TYPE_AVTP_BASE_DEPAYLOAD, G_TYPE_FLAG_ABSTRACT, {
+    });
+
+static void
+gst_avtp_vf_depay_base_class_init (GstAvtpVfDepayBaseClass * klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+
+  element_class->change_state =
+      GST_DEBUG_FUNCPTR (gst_avtp_vf_depay_change_state);
+
+  klass->depay_push_caps = NULL;
+
+  GST_DEBUG_CATEGORY_INIT (avtpvfdepaybase_debug, "avtpvfdepaybase",
+      0, "debug category for avtpvfdepay element");
+}
+
+static void
+gst_avtp_vf_depay_base_init (GstAvtpVfDepayBase * avtpvfdepaybase)
+{
+  avtpvfdepaybase->out_buffer = NULL;
+}
+
+static GstStateChangeReturn
+gst_avtp_vf_depay_change_state (GstElement * element, GstStateChange transition)
+{
+  GstAvtpVfDepayBase *avtpvfdepaybase = GST_AVTP_VF_DEPAY_BASE (element);
+  GstStateChangeReturn ret;
+
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+  if (ret == GST_STATE_CHANGE_FAILURE) {
+    return ret;
+  }
+
+  if (transition == GST_STATE_CHANGE_READY_TO_NULL) {
+    if (avtpvfdepaybase->out_buffer) {
+      gst_buffer_unref (avtpvfdepaybase->out_buffer);
+      avtpvfdepaybase->out_buffer = NULL;
+    }
+  }
+
+  return ret;
+}
+
+GstFlowReturn
+gst_avtp_vf_depay_base_push (GstAvtpVfDepayBase * avtpvfdepaybase)
+{
+  GstAvtpBaseDepayload *avtpbasedepayload =
+      GST_AVTP_BASE_DEPAYLOAD (avtpvfdepaybase);
+  GstFlowReturn ret;
+
+  if (G_UNLIKELY (!gst_pad_has_current_caps (avtpbasedepayload->srcpad))) {
+    guint64 pts_m;
+    guint32 dts, pts;
+
+    if (gst_debug_category_get_threshold (GST_CAT_DEFAULT) >= GST_LEVEL_DEBUG) {
+      GstClock *clock =
+          gst_element_get_clock (GST_ELEMENT_CAST (avtpvfdepaybase));
+      if (clock == NULL) {
+        GST_DEBUG_OBJECT (avtpvfdepaybase,
+            "Sending initial CAPS and SEGMENT, no pipeline time.");
+      } else {
+        GST_DEBUG_OBJECT (avtpvfdepaybase,
+            "Sending initial CAPS and SEGMENT, pipeline time: %"
+            GST_TIME_FORMAT, GST_TIME_ARGS (gst_clock_get_time (clock)));
+      }
+    }
+
+    g_assert (GST_AVTP_VF_DEPAY_BASE_GET_CLASS
+        (avtpvfdepaybase)->depay_push_caps != NULL);
+    if (!GST_AVTP_VF_DEPAY_BASE_GET_CLASS (avtpvfdepaybase)->depay_push_caps
+        (avtpvfdepaybase)) {
+      GST_ELEMENT_ERROR (avtpvfdepaybase, CORE, CAPS, (NULL), (NULL));
+      return GST_FLOW_ERROR;
+    }
+
+    if (!gst_avtp_base_depayload_push_segment_event (avtpbasedepayload,
+            GST_BUFFER_PTS (avtpvfdepaybase->out_buffer))) {
+      GST_ELEMENT_ERROR (avtpvfdepaybase, CORE, EVENT,
+          ("Could not send SEGMENT event"), (NULL));
+    }
+
+    /* Now that we sent our segment starting on the first Presentation
+     * time available, `avtpbasedepayload->prev_ptime` saves that value,
+     * to be a reference for calculating future buffer timestamps from
+     * the AVTP timestamps.
+     *
+     * However, decode timestamps can be smaller than presentation
+     * timestamps. So we can't use `avtpbasedepayload->prev_time` as
+     * reference to calculate them. Instead, here, we calculate the
+     * first decode timestamp and save it on `avtpvfdepaybase->prev_ptime`.
+     *
+     * The method used to calculate the "absolute" decode timestamp (DTS)
+     * from presentation timestamp is as follows:
+     *
+     *   DTS = dts > pts ? (PTSm - 1) | dts : PTSm | dts
+     *
+     * Where:
+     *   dts: 32 bits gPTP decode timestamp
+     *   pts: 32 bits gPTP presentation timestamp
+     *   PTSm: 32 most signifactive bits of the "absolute" presentation
+     *   timestamp
+     *
+     * This allow us to handle cases where the pts ends up being smaller
+     * than dts due pts falling after an AVTP timestamp wrapping.
+     */
+
+    pts = GST_BUFFER_PTS (avtpvfdepaybase->out_buffer);
+    dts = GST_BUFFER_DTS (avtpvfdepaybase->out_buffer);
+    pts_m = avtpbasedepayload->prev_ptime & 0xFFFFFFFF00000000ULL;
+
+    avtpbasedepayload->prev_ptime = dts > pts ? (pts_m -=
+        (1ULL << 32)) | dts : pts_m | dts;
+    GST_DEBUG_OBJECT (avtpvfdepaybase, "prev_ptime set to %" GST_TIME_FORMAT,
+        GST_TIME_ARGS (avtpbasedepayload->prev_ptime));
+  }
+
+  /* At this point, we're sure segment was sent, so we can properly calc
+   * buffer timestamps */
+  GST_DEBUG_OBJECT (avtpvfdepaybase, "Converting %" GST_TIME_FORMAT " to PTS",
+      GST_TIME_ARGS (GST_BUFFER_PTS (avtpvfdepaybase->out_buffer)));
+  GST_BUFFER_PTS (avtpvfdepaybase->out_buffer) =
+      gst_avtp_base_depayload_tstamp_to_ptime (avtpbasedepayload, GST_BUFFER_PTS
+      (avtpvfdepaybase->out_buffer), avtpbasedepayload->prev_ptime);
+
+  GST_DEBUG_OBJECT (avtpvfdepaybase, "Converting %" GST_TIME_FORMAT " to DTS",
+      GST_TIME_ARGS (GST_BUFFER_DTS (avtpvfdepaybase->out_buffer)));
+  GST_BUFFER_DTS (avtpvfdepaybase->out_buffer) =
+      gst_avtp_base_depayload_tstamp_to_ptime (avtpbasedepayload, GST_BUFFER_DTS
+      (avtpvfdepaybase->out_buffer), avtpbasedepayload->prev_ptime);
+
+  /* Use DTS as prev_ptime as it is smaller or equal to PTS, so that
+   * next calculations of PTS/DTS won't wrap too early */
+  avtpbasedepayload->prev_ptime = GST_BUFFER_DTS (avtpvfdepaybase->out_buffer);
+
+  ret = gst_pad_push (GST_AVTP_BASE_DEPAYLOAD (avtpvfdepaybase)->srcpad,
+      avtpvfdepaybase->out_buffer);
+  avtpvfdepaybase->out_buffer = NULL;
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtpvfdepaybase.h Added

@@ -0,0 +1,70 @@
+/*
+ * GStreamer AVTP Plugin
+ * Copyright (c) 2021, Fastree3D
+ * Adrian Fiergolski <Adrian.Fiergolski@fastree3d.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_AVTP_VF_DEPAY_BASE_H__
+#define __GST_AVTP_VF_DEPAY_BASE_H__
+
+#include <gst/gst.h>
+
+#include "gstavtpbasedepayload.h"
+
+G_BEGIN_DECLS
+#define GST_TYPE_AVTP_VF_DEPAY_BASE (gst_avtp_vf_depay_base_get_type())
+#define GST_AVTP_VF_DEPAY_BASE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AVTP_VF_DEPAY_BASE,GstAvtpVfDepayBase))
+#define GST_AVTP_VF_DEPAY_BASE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AVTP_VF_DEPAY_BASE,GstAvtpVfDepayBaseClass))
+#define GST_IS_AVTP_VF_DEPAY_BASE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AVTP_VF_DEPAY_BASE))
+#define GST_IS_AVTP_VF_DEPAY_BASE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AVTP_VF_DEPAY_BASE))
+#define GST_AVTP_VF_DEPAY_BASE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_AVTP_VF_DEBAYPAY_BASE, GstAvtpVfDepayBaseClass))
+typedef struct _GstAvtpVfDepayBase GstAvtpVfDepayBase;
+typedef struct _GstAvtpVfDepayBaseClass GstAvtpVfDepayBaseClass;
+
+typedef gboolean (*GstAvtpDepayVdDepayPushCapsFunction) (GstAvtpVfDepayBase *
+    avtpvfdepay);
+
+struct _GstAvtpVfDepayBase
+{
+
+  GstAvtpBaseDepayload depayload;
+
+  GstBuffer *out_buffer;
+};
+
+struct _GstAvtpVfDepayBaseClass
+{
+  GstAvtpBaseDepayloadClass parent_class;
+
+  /* Pure virtual function. */
+  GstAvtpDepayVdDepayPushCapsFunction depay_push_caps;
+};
+
+GType gst_avtp_vf_depay_base_get_type (void);
+
+GstFlowReturn gst_avtp_vf_depay_base_push (GstAvtpVfDepayBase *
+    avtpvfdepaybase);
+
+G_END_DECLS
+#endif /* __GST_AVTP_VF_DEPAY_BASE_H__ */

gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtpvfpaybase.c Added

@@ -0,0 +1,364 @@
+/*
+ * GStreamer AVTP Plugin
+ * Copyright (C) 2019 Intel Corporation
+ * Copyright (c) 2021, Fastree3D
+ * Adrian Fiergolski <Adrian.Fiergolski@fastree3d.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 "gstavtpvfpaybase.h"
+
+GST_DEBUG_CATEGORY_STATIC (avtpvfpaybase_debug);
+#define GST_CAT_DEFAULT avtpvfpaybase_debug
+
+/* prototypes */
+static GstFlowReturn gst_avtp_vf_pay_base_chain (GstPad * pad,
+    GstObject * parent, GstBuffer * buffer);
+static gboolean gst_avtp_vf_pay_base_sink_event (GstPad * pad,
+    GstObject * parent, GstEvent * event);
+
+static void gst_avtp_rvf_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_avtp_rvf_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+enum
+{
+  PROP_0,
+  PROP_MTU,
+  PROP_MEASUREMENT_INTERVAL,
+  PROP_MAX_INTERVAL_FRAME
+};
+
+#define DEFAULT_MTU 1500
+#define DEFAULT_MEASUREMENT_INTERVAL 250000
+#define DEFAULT_MAX_INTERVAL_FRAMES 1
+
+#define gst_avtp_vf_pay_base_parent_class parent_class
+G_DEFINE_TYPE_EXTENDED (GstAvtpVfPayBase, gst_avtp_vf_pay_base,
+    GST_TYPE_AVTP_BASE_PAYLOAD, G_TYPE_FLAG_ABSTRACT, {
+    });
+
+/* class initialization */
+
+static void
+gst_avtp_vf_pay_base_class_init (GstAvtpVfPayBaseClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstAvtpBasePayloadClass *avtpbasepayload_class =
+      GST_AVTP_BASE_PAYLOAD_CLASS (klass);
+
+  gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_avtp_rvf_set_property);
+  gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_avtp_rvf_get_property);
+
+  avtpbasepayload_class->chain = GST_DEBUG_FUNCPTR (gst_avtp_vf_pay_base_chain);
+  avtpbasepayload_class->sink_event =
+      GST_DEBUG_FUNCPTR (gst_avtp_vf_pay_base_sink_event);
+
+  klass->new_caps = NULL;
+  klass->prepare_avtp_packets = NULL;
+
+  g_object_class_install_property (gobject_class, PROP_MTU,
+      g_param_spec_uint ("mtu", "Maximum Transit Unit",
+          "Maximum Transit Unit (MTU) of underlying network in bytes", 0,
+          G_MAXUINT, DEFAULT_MTU, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class, PROP_MEASUREMENT_INTERVAL,
+      g_param_spec_uint64 ("measurement-interval", "Measurement Interval",
+          "Measurement interval of stream in nanoseconds", 0,
+          G_MAXUINT64, DEFAULT_MEASUREMENT_INTERVAL,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class, PROP_MAX_INTERVAL_FRAME,
+      g_param_spec_uint ("max-interval-frames", "Maximum Interval Frames",
+          "Maximum number of network frames to be sent on each Measurement Interval",
+          1, G_MAXUINT, DEFAULT_MAX_INTERVAL_FRAMES,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  GST_DEBUG_CATEGORY_INIT (avtpvfpaybase_debug, "avtpvfpaybase",
+      0, "debug category for avtpvfpaybase element");
+}
+
+static void
+gst_avtp_vf_pay_base_init (GstAvtpVfPayBase * avtpvfpaybase)
+{
+  avtpvfpaybase->mtu = DEFAULT_MTU;
+  avtpvfpaybase->measurement_interval = DEFAULT_MEASUREMENT_INTERVAL;
+  avtpvfpaybase->max_interval_frames = DEFAULT_MAX_INTERVAL_FRAMES;
+  avtpvfpaybase->last_interval_ct = 0;
+}
+
+static void
+gst_avtp_rvf_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstAvtpVfPayBase *avtpvfpaybase = GST_AVTP_VF_PAY_BASE (object);
+
+  GST_DEBUG_OBJECT (avtpvfpaybase, "prop_id: %u", prop_id);
+
+  switch (prop_id) {
+    case PROP_MTU:
+      avtpvfpaybase->mtu = g_value_get_uint (value);
+      break;
+    case PROP_MEASUREMENT_INTERVAL:
+      avtpvfpaybase->measurement_interval = g_value_get_uint64 (value);
+      break;
+    case PROP_MAX_INTERVAL_FRAME:
+      avtpvfpaybase->max_interval_frames = g_value_get_uint (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_avtp_rvf_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstAvtpVfPayBase *avtpvfpaybase = GST_AVTP_VF_PAY_BASE (object);
+
+  GST_DEBUG_OBJECT (avtpvfpaybase, "prop_id: %u", prop_id);
+
+  switch (prop_id) {
+    case PROP_MTU:
+      g_value_set_uint (value, avtpvfpaybase->mtu);
+      break;
+    case PROP_MEASUREMENT_INTERVAL:
+      g_value_set_uint64 (value, avtpvfpaybase->measurement_interval);
+      break;
+    case PROP_MAX_INTERVAL_FRAME:
+      g_value_set_uint (value, avtpvfpaybase->max_interval_frames);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_avtp_vf_pay_base_spread_ts (GstAvtpVfPayBase * avtpvfpaybase,
+    GPtrArray * avtp_packets)
+{
+  /* A bit of the idea of what this function do:
+   *
+   * After fragmenting the buffert, we have a series of AVTPDUs (AVTP Data Units)
+   * that should be transmitted. They are going to be transmitted according to GstBuffer
+   * DTS (or PTS in case there's no DTS), but all of them have the same PTS/DTS, as they
+   * came from the same original buffer.
+   *
+   * However, TSN streams should send their data according to a "measurement interval",
+   * which is an arbitrary interval defined for the stream. For instance, a class A
+   * stream has measurement interval of 125us. Also, there's a MaxIntervalFrames
+   * parameter, that defines how many network frames can be sent on a given measurement
+   * interval. We also spread MaxIntervalFrames per measurement interval.
+   *
+   * To that end, this function will spread the DTS/PTS so that fragments follow measurement
+   * interval and MaxIntervalFrames, adjusting them to end before the actual DTS/PTS of the
+   * original buffer.
+   *
+   * Roughly, this function does:
+   *
+   *  DTSn = DTSbase - (measurement_interval/MaxIntervalFrames) * (total - n - 1)
+   *
+   * Where:
+   *  DTSn = DTS/PTS of nth fragment
+   *  DTSbase = DTS/PTS of original buffer
+   *  total = # of fragments
+   *
+   * Another issue that this function takes care of is avoiding DTSs/PTSs that overlap between
+   * two different set of fragments. Assuming DTSlast/PTSlast is the DTS/PTS of the last fragment
+   * generated on previous call to this function, we don't want any DTSn for the current
+   * call to be smaller than DTSlast + (measurement_interval / MaxIntervalFrames). If
+   * that's the case, we adjust DTSbase to preserve this difference (so we don't schedule
+   * packets transmission times that violate stream spec). This will cause the last
+   * fragment DTS to be bigger than DTSbase - we emit a warning, as this may be a sign
+   * of a bad pipeline setup or inappropriate stream spec.
+   *
+   * Finally, we also avoid underflows - which would occur when DTSbase is zero or small
+   * enough. In this case, we'll again make last fragment DTS > DTSbase, so we log it.
+   *
+   */
+
+  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (avtpvfpaybase);
+
+  gint i, ret;
+  guint len;
+  guint64 tx_interval, total_interval;
+  GstClockTime base_time, base_ts, rt;
+  GstBuffer *packet;
+
+  base_time = gst_element_get_base_time (GST_ELEMENT (avtpvfpaybase));
+  base_ts = GST_BUFFER_DTS_OR_PTS (g_ptr_array_index (avtp_packets, 0));
+
+  tx_interval =
+      avtpvfpaybase->measurement_interval / avtpvfpaybase->max_interval_frames;
+  len = avtp_packets->len;
+  total_interval = tx_interval * (len - 1);
+
+  /* We don't want packets transmission time to overlap, so let's ensure
+   * packets are scheduled after last interval used */
+  if (avtpvfpaybase->last_interval_ct != 0) {
+    GstClockTime ts_ct, ts_rt;
+
+    ret =
+        gst_segment_to_running_time_full (&avtpbasepayload->segment,
+        GST_FORMAT_TIME, base_ts, &ts_rt);
+    if (ret == -1)
+      ts_rt = -ts_rt;
+
+    ts_ct = base_time + ts_rt;
+
+    if (ts_ct < avtpvfpaybase->last_interval_ct + total_interval + tx_interval) {
+      base_ts +=
+          avtpvfpaybase->last_interval_ct + total_interval + tx_interval -
+          ts_ct;
+
+      GST_WARNING_OBJECT (avtpvfpaybase,
+          "Not enough measurements intervals between frames to transmit fragments"
+          ". Check stream transmission spec.");
+    }
+  }
+
+  /* Not enough room to spread tx before TS (or we would underflow),
+   * add offset */
+  if (total_interval > base_ts) {
+    base_ts += total_interval - base_ts;
+
+    GST_INFO_OBJECT (avtpvfpaybase,
+        "Not enough measurements intervals to transmit fragments before base "
+        "DTS/PTS. Check pipeline settings. Are we live?");
+  }
+
+  for (i = 0; i < len; i++) {
+    GstClockTime *packet_ts;
+    packet = g_ptr_array_index (avtp_packets, i);
+    packet_ts =
+        GST_BUFFER_DTS_IS_VALID (packet) ? &GST_BUFFER_DTS (packet) :
+        &GST_BUFFER_PTS (packet);
+    *packet_ts = base_ts - tx_interval * (len - i - 1);
+  }
+
+  /* Remember last interval used, in clock time */
+  ret =
+      gst_segment_to_running_time_full (&avtpbasepayload->segment,
+      GST_FORMAT_TIME, GST_BUFFER_DTS_OR_PTS (g_ptr_array_index (avtp_packets,
+              avtp_packets->len - 1)), &rt);
+  if (ret == -1)
+    rt = -rt;
+  avtpvfpaybase->last_interval_ct = base_time + rt;
+}
+
+static GstFlowReturn
+gst_avtp_vf_pay_base_push_packets (GstAvtpVfPayBase * avtpvfpaybase,
+    GPtrArray * avtp_packets)
+{
+  int i;
+  GstFlowReturn ret;
+  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (avtpvfpaybase);
+
+  for (i = 0; i < avtp_packets->len; i++) {
+    GstBuffer *packet;
+
+    packet = g_ptr_array_index (avtp_packets, i);
+    ret = gst_pad_push (avtpbasepayload->srcpad, packet);
+    if (ret != GST_FLOW_OK)
+      return ret;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_avtp_vf_pay_base_chain (GstPad * pad, GstObject * parent,
+    GstBuffer * buffer)
+{
+  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (parent);
+  GstAvtpVfPayBase *avtpvfpaybase = GST_AVTP_VF_PAY_BASE (avtpbasepayload);
+  GPtrArray *avtp_packets;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  GST_LOG_OBJECT (avtpvfpaybase,
+      "Incoming buffer size: %" G_GSIZE_FORMAT " PTS: %" GST_TIME_FORMAT
+      " DTS: %" GST_TIME_FORMAT, gst_buffer_get_size (buffer),
+      GST_TIME_ARGS (GST_BUFFER_PTS (buffer)),
+      GST_TIME_ARGS (GST_BUFFER_DTS (buffer)));
+
+  /* Prepare a list of avtp_packets to send */
+  avtp_packets = g_ptr_array_new ();
+
+  g_assert (GST_AVTP_VF_PAY_BASE_GET_CLASS (avtpvfpaybase)->prepare_avtp_packets
+      != NULL);
+  GST_AVTP_VF_PAY_BASE_GET_CLASS (avtpvfpaybase)->prepare_avtp_packets
+      (avtpvfpaybase, buffer, avtp_packets);
+
+  if (avtp_packets->len > 0)
+    gst_avtp_vf_pay_base_spread_ts (avtpvfpaybase, avtp_packets);
+
+  ret = gst_avtp_vf_pay_base_push_packets (avtpvfpaybase, avtp_packets);
+
+  /* Contents of both ptr_arrays should be unref'd or transferred
+   * to rightful owner by this point, no need to unref them again */
+  g_ptr_array_free (avtp_packets, TRUE);
+
+  return ret;
+}
+
+static gboolean
+gst_avtp_vf_pay_base_sink_event (GstPad * pad, GstObject * parent,
+    GstEvent * event)
+{
+  GstCaps *caps;
+  GstAvtpBasePayload *avtpbasepayload = GST_AVTP_BASE_PAYLOAD (parent);
+  GstAvtpVfPayBase *avtpvfpaybase = GST_AVTP_VF_PAY_BASE (avtpbasepayload);
+  gboolean ret;
+
+  GST_DEBUG_OBJECT (avtpvfpaybase, "Sink event %s",
+      GST_EVENT_TYPE_NAME (event));
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CAPS:
+      gst_event_parse_caps (event, &caps);
+      g_assert (GST_AVTP_VF_PAY_BASE_GET_CLASS (avtpvfpaybase)->new_caps !=
+          NULL);
+      ret =
+          GST_AVTP_VF_PAY_BASE_GET_CLASS (avtpvfpaybase)->new_caps
+          (avtpvfpaybase, caps);
+      gst_event_unref (event);
+      return ret;
+    case GST_EVENT_FLUSH_STOP:
+      if (GST_ELEMENT (avtpvfpaybase)->current_state == GST_STATE_PLAYING) {
+        /* After a flush, the sink will reset pipeline base_time, but only
+         * after it gets the first buffer. So, here, we used the wrong
+         * base_time to calculate DTS. We'll just notice base_time changed
+         * when we get the next buffer. So, we'll basically mess with
+         * timestamps of two frames, which is bad. Known workaround is
+         * to pause the pipeline before a flushing seek - so that we'll
+         * be up to date to new pipeline base_time */
+        GST_WARNING_OBJECT (avtpvfpaybase,
+            "Flushing seek performed while pipeline is PLAYING, "
+            "AVTP timestamps will be incorrect!");
+      }
+      break;
+    default:
+      break;
+  }
+
+  return GST_AVTP_BASE_PAYLOAD_CLASS (parent_class)->sink_event (pad, parent,
+      event);
+}

gst-plugins-bad-1.24.5.tar.xz/ext/avtp/gstavtpvfpaybase.h Added

@@ -0,0 +1,73 @@
+/*
+ * GStreamer AVTP Plugin
+ * Copyright (C) 2019 Intel Corporation
+ * Copyright (c) 2021, Fastree3D
+ * Adrian Fiergolski <Adrian.Fiergolski@fastree3d.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_AVTP_PAY_BASE_H__
+#define __GST_AVTP_PAY_BASE_H__
+
+#include <gst/gst.h>
+
+#include "gstavtpbasepayload.h"
+
+G_BEGIN_DECLS
+#define GST_TYPE_AVTP_VF_PAY_BASE (gst_avtp_vf_pay_base_get_type())
+#define GST_AVTP_VF_PAY_BASE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AVTP_VF_PAY_BASE,GstAvtpVfPayBase))
+#define GST_AVTP_VF_PAY_BASE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AVTP_VF_PAY_BASE,GstAvtpVfPayBaseClass))
+#define GST_IS_AVTP_VF_PAY_BASE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AVTP_VF_PAY_BASE))
+#define GST_IS_AVTP_VF_PAY_BASE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AVTP_VF_PAY_BASE))
+#define GST_AVTP_VF_PAY_BASE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_AVTP_VF_PAY_BASE, GstAvtpVfPayBaseClass))
+typedef struct _GstAvtpVfPayBase GstAvtpVfPayBase;
+typedef struct _GstAvtpVfPayBaseClass GstAvtpVfPayBaseClass;
+
+typedef gboolean (*GstAvtpVfPayNewCapsFunction) (GstAvtpVfPayBase *
+    avtpvfpaybase, GstCaps * caps);
+typedef gboolean (*GstAvtpVfPayPrepareAvtpPacketsFunction) (GstAvtpVfPayBase *
+    avtprvfpaybase, GstBuffer * buffer, GPtrArray * avtp_packets);
+
+struct _GstAvtpVfPayBase
+{
+  GstAvtpBasePayload payload;
+
+  guint mtu;
+  guint64 measurement_interval;
+  guint max_interval_frames;
+  guint64 last_interval_ct;
+};
+
+struct _GstAvtpVfPayBaseClass
+{
+  GstAvtpBasePayloadClass parent_class;
+
+  /* Pure virtual function. */
+  GstAvtpVfPayNewCapsFunction new_caps;
+  GstAvtpVfPayPrepareAvtpPacketsFunction prepare_avtp_packets;
+};
+
+GType gst_avtp_vf_pay_base_get_type (void);
+
+G_END_DECLS
+#endif /* __GST_AVTP_PAY_BASE_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/avtp/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/avtp/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/ext/bs2b/gstbs2b.c -> gst-plugins-bad-1.24.5.tar.xz/ext/bs2b/gstbs2b.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/bit_slicer.c -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/bit_slicer.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/ccutils.c -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/ccutils.c Changed

@@ -382,10 +382,8 @@
           return CC_DATA_EXTRACT_TOO_MANY_FIELD1;
         }
 
-        if (byte1 != 0x80 || byte2 != 0x80) {
-          cea608_field1(*cea608_field1_len)++ = byte1;
-          cea608_field1(*cea608_field1_len)++ = byte2;
-        }
+        cea608_field1(*cea608_field1_len)++ = byte1;
+        cea608_field1(*cea608_field1_len)++ = byte2;
       }
     } else if (cc_type == 0x01) {
       if (!cc_valid)
@@ -397,10 +395,8 @@
               *cea608_field2_len + 2);
           return CC_DATA_EXTRACT_TOO_MANY_FIELD2;
         }
-        if (byte1 != 0x80 || byte2 != 0x80) {
-          cea608_field2(*cea608_field2_len)++ = byte1;
-          cea608_field2(*cea608_field2_len)++ = byte2;
-        }
+        cea608_field2(*cea608_field2_len)++ = byte1;
+        cea608_field2(*cea608_field2_len)++ = byte2;
       }
     } else {
       /* all cea608 packets must be at the beginning of a cc_data */
@@ -437,6 +433,7 @@
   /* properties */
   GstClockTime max_buffer_time;
   gboolean output_padding;
+  gboolean output_ccp_padding;
 };
 
 G_DEFINE_TYPE (CCBuffer, cc_buffer, G_TYPE_OBJECT);
@@ -456,6 +453,7 @@
 
   buf->max_buffer_time = DEFAULT_MAX_BUFFER_TIME;
   buf->output_padding = TRUE;
+  buf->output_ccp_padding = FALSE;
 }
 
 static void
@@ -775,10 +773,17 @@
     wrote_first = TRUE;
   }
 
+  // don't write padding if not requested
   if (!buf->output_padding && write_cea608_1_size == 0
       && write_cea608_2_size == 0) {
-    *field1_padding = 0;
-    *field2_padding = 0;
+    // however if we are producing data for a cdp that only has a single 608 field,
+    // in order to keep processing data will still need to alternate fields and
+    // produce the relevant padding data
+    if (fps_entry->max_cea608_count != 1 || (extra_cea608_1 == 0
+            && extra_cea608_2 == 0)) {
+      *field1_padding = 0;
+      *field2_padding = 0;
+    }
   }
 
   GST_TRACE_OBJECT (buf, "allocated sizes ccp:%u, cea608-1:%u (pad:%u), "
@@ -835,8 +840,32 @@
           "small to hold output (%u)", *cc_data_len, write_ccp_size);
       *cc_data_len = 0;
     } else if (cc_data) {
+      guint ccp_padding = 0;
       memcpy (cc_data, buf->cc_data->data, write_ccp_size);
-      *cc_data_len = write_ccp_size;
+      if (buf->output_ccp_padding
+          && (write_ccp_size < 3 * fps_entry->max_ccp_count)) {
+        guint i;
+
+        ccp_padding = 3 * fps_entry->max_ccp_count - write_ccp_size;
+        GST_TRACE_OBJECT (buf, "need %u ccp padding bytes (%u - %u)",
+            ccp_padding, fps_entry->max_ccp_count, write_ccp_size);
+        for (i = 0; i < ccp_padding; i += 3) {
+          cc_datai + write_ccp_size = 0xfa;
+          cc_datai + 1 + write_ccp_size = 0x00;
+          cc_datai + 2 + write_ccp_size = 0x00;
+        }
+      }
+      *cc_data_len = write_ccp_size + ccp_padding;
+    } else if (buf->output_padding) {
+      guint i;
+      guint padding = 3 * fps_entry->max_ccp_count;
+      for (i = 0; i < padding; i += 3) {
+        cc_datai + write_ccp_size = 0xfa;
+        cc_datai + 1 + write_ccp_size = 0x00;
+        cc_datai + 2 + write_ccp_size = 0x00;
+      }
+      GST_TRACE_OBJECT (buf, "outputting only %u padding bytes", padding);
+      *cc_data_len = padding;
     } else {
       *cc_data_len = 0;
     }
@@ -852,12 +881,13 @@
 
 void
 cc_buffer_take_cc_data (CCBuffer * buf,
-    const struct cdp_fps_entry *fps_entry, guint8 * cc_data,
-    guint * cc_data_len)
+    const struct cdp_fps_entry *fps_entry, gboolean nul_padding,
+    guint8 * cc_data, guint * cc_data_len)
 {
   guint write_cea608_1_size, write_cea608_2_size, write_ccp_size;
   guint field1_padding, field2_padding;
   gboolean wrote_first;
+  guint8 padding_byte = nul_padding ? 0x00 : 0x80;
 
   cc_buffer_get_out_sizes (buf, fps_entry, &write_cea608_1_size,
       &field1_padding, &write_cea608_2_size, &field2_padding, &write_ccp_size);
@@ -870,6 +900,7 @@
     guint cea608_output_count =
         write_cea608_1_size + write_cea608_2_size + field1_padding +
         field2_padding;
+    guint ccp_padding = 0;
 
     wrote_first = !buf->last_cea608_written_was_field1;
     while (cea608_1_i + cea608_2_i < cea608_output_count) {
@@ -881,9 +912,22 @@
           cea608_1_i += 2;
           buf->last_cea608_written_was_field1 = TRUE;
         } else if (cea608_1_i < write_cea608_1_size + field1_padding) {
-          cc_dataout_i++ = 0xf8;
-          cc_dataout_i++ = 0x80;
-          cc_dataout_i++ = 0x80;
+          GST_TRACE_OBJECT (buf,
+              "write field2:%u field2_i:%u, cea608-2 buf len:%u",
+              write_cea608_2_size, cea608_2_i, buf->cea608_2->len);
+          if (cea608_2_i < write_cea608_2_size
+              || buf->cea608_2->len > write_cea608_2_size) {
+            /* if we are writing field 2, then we have to write valid field 1 */
+            GST_TRACE_OBJECT (buf, "writing valid field1 padding because "
+                "we need to write valid field2");
+            cc_dataout_i++ = 0xfc;
+            cc_dataout_i++ = 0x80;
+            cc_dataout_i++ = 0x80;
+          } else {
+            cc_dataout_i++ = 0xf8;
+            cc_dataout_i++ = padding_byte;
+            cc_dataout_i++ = padding_byte;
+          }
           cea608_1_i += 2;
           buf->last_cea608_written_was_field1 = TRUE;
         }
@@ -897,8 +941,8 @@
         buf->last_cea608_written_was_field1 = FALSE;
       } else if (cea608_2_i < write_cea608_2_size + field2_padding) {
         cc_dataout_i++ = 0xf9;
-        cc_dataout_i++ = 0x80;
-        cc_dataout_i++ = 0x80;
+        cc_dataout_i++ = padding_byte;
+        cc_dataout_i++ = padding_byte;
         cea608_2_i += 2;
         buf->last_cea608_written_was_field1 = FALSE;
       }
@@ -908,7 +952,22 @@
 
     if (write_ccp_size > 0)
       memcpy (&cc_dataout_i, buf->cc_data->data, write_ccp_size);
-    *cc_data_len = out_i + write_ccp_size;
+    if (buf->output_ccp_padding
+        && (write_ccp_size < 3 * fps_entry->max_ccp_count)) {
+      guint i;
+
+      ccp_padding = 3 * fps_entry->max_ccp_count - write_ccp_size;
+      GST_TRACE_OBJECT (buf, "need %u ccp padding bytes (%u - %u)", ccp_padding,
+          fps_entry->max_ccp_count, write_ccp_size);
+      for (i = 0; i < ccp_padding; i += 3) {
+        cc_datai + out_i + write_ccp_size = 0xfa;
+        cc_datai + 1 + out_i + write_ccp_size = 0x00;
+        cc_datai + 2 + out_i + write_ccp_size = 0x00;
+      }
+    }
+    *cc_data_len = out_i + write_ccp_size + ccp_padding;
+    GST_TRACE_OBJECT (buf, "cc_data_len is %u (%u + %u + %u)", *cc_data_len,
+        out_i, write_ccp_size, ccp_padding);
   }
 
   g_array_remove_range (buf->cea608_1, 0, write_cea608_1_size);
@@ -993,7 +1052,9 @@
 }
 
 void
-cc_buffer_set_output_padding (CCBuffer * buf, gboolean output_padding)
+cc_buffer_set_output_padding (CCBuffer * buf, gboolean output_padding,
+    gboolean output_ccp_padding)
 {
   buf->output_padding = output_padding;
+  buf->output_ccp_padding = output_ccp_padding;
 }

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/ccutils.h -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/ccutils.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/gstcccombiner.c -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/gstcccombiner.c Changed

@@ -156,7 +156,8 @@
 
   gst_buffer_map (buffer, &map, GST_MAP_WRITE);
   len = map.size;
-  cc_buffer_take_cc_data (self->cc_buffer, self->cdp_fps_entry, map.data, &len);
+  cc_buffer_take_cc_data (self->cc_buffer, self->cdp_fps_entry, TRUE, map.data,
+      &len);
   gst_buffer_unmap (buffer, &map);
   gst_buffer_set_size (buffer, len);
 }
@@ -170,10 +171,12 @@
   g_assert (*len / 2 * 3 <= alloc_len);
 
   for (i = *len / 2; i >= 0; i--) {
-    datai * 3 + 0 = field == 0 ? 0x80 : 0x00;
-    datai * 3 + 1 = datai * 2 + 0;
     datai * 3 + 2 = datai * 2 + 1;
+    datai * 3 + 1 = datai * 2 + 0;
+    datai * 3 + 0 = field == 0 ? 0x80 : 0x00;
   }
+
+  *len = *len * 3 / 2;
 }
 
 static void
@@ -185,8 +188,8 @@
   gst_buffer_map (buffer, &out, GST_MAP_READWRITE);
 
   cc_data_len = out.size;
-  cc_buffer_take_cc_data (self->cc_buffer, self->cdp_fps_entry, out.data,
-      &cc_data_len);
+  cc_buffer_take_cc_data (self->cc_buffer, self->cdp_fps_entry, FALSE,
+      out.data, &cc_data_len);
   s334_len = drop_ccp_from_cc_data (out.data, cc_data_len);
   if (s334_len < 0) {
     s334_len = 0;
@@ -348,16 +351,16 @@
       if (GST_BUFFER_FLAG_IS_SET (self->current_video_buffer,
               GST_VIDEO_BUFFER_FLAG_INTERLACED)) {
         if (!GST_VIDEO_BUFFER_IS_BOTTOM_FIELD (self->current_video_buffer)) {
-          cc_buffer_take_cc_data (self->cc_buffer, self->cdp_fps_entry, cc_data,
-              &cc_data_len);
+          cc_buffer_take_cc_data (self->cc_buffer, self->cdp_fps_entry, TRUE,
+              cc_data, &cc_data_len);
           caption_data.buffer =
               make_cdp_buffer (self, cc_data, cc_data_len, self->cdp_fps_entry,
               tc);
           g_array_append_val (self->current_frame_captions, caption_data);
         }
       } else {
-        cc_buffer_take_cc_data (self->cc_buffer, self->cdp_fps_entry, cc_data,
-            &cc_data_len);
+        cc_buffer_take_cc_data (self->cc_buffer, self->cdp_fps_entry, TRUE,
+            cc_data, &cc_data_len);
         caption_data.buffer =
             make_cdp_buffer (self, cc_data, cc_data_len, self->cdp_fps_entry,
             tc);
@@ -1096,7 +1099,8 @@
       self->max_scheduled = self->prop_max_scheduled;
       self->output_padding = self->prop_output_padding;
       cc_buffer_set_max_buffer_time (self->cc_buffer, GST_CLOCK_TIME_NONE);
-      cc_buffer_set_output_padding (self->cc_buffer, self->prop_output_padding);
+      cc_buffer_set_output_padding (self->cc_buffer, self->prop_output_padding,
+          self->prop_output_padding);
       break;
     default:
       break;

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/gstccconverter.c -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/gstccconverter.c Changed

@@ -50,13 +50,14 @@
 };
 
 #define DEFAULT_CDP_MODE (GST_CC_CONVERTER_CDP_MODE_TIME_CODE | GST_CC_CONVERTER_CDP_MODE_CC_DATA | GST_CC_CONVERTER_CDP_MODE_CC_SVC_INFO)
+#define DEFAULT_FIELD 0
 
 /* Ordered by the amount of information they can contain */
 #define CC_CAPS \
         "closedcaption/x-cea-708,format=(string) cdp; " \
         "closedcaption/x-cea-708,format=(string) cc_data; " \
         "closedcaption/x-cea-608,format=(string) s334-1a; " \
-        "closedcaption/x-cea-608,format=(string) raw"
+        "closedcaption/x-cea-608,format=(string) raw, field=(int) {0, 1}"
 
 #define VAL_OR_0(v) ((v) ? (*(v)) : 0)
 
@@ -126,12 +127,14 @@
   static GstStaticCaps non_cdp_caps =
       GST_STATIC_CAPS ("closedcaption/x-cea-708, format=(string)cc_data; "
       "closedcaption/x-cea-608,format=(string) s334-1a; "
-      "closedcaption/x-cea-608,format=(string) raw");
+      "closedcaption/x-cea-608,format=(string) raw, field=(int) {0, 1}");
   static GstStaticCaps cdp_caps =
       GST_STATIC_CAPS ("closedcaption/x-cea-708, format=(string)cdp");
   static GstStaticCaps cdp_caps_framerate =
       GST_STATIC_CAPS ("closedcaption/x-cea-708, format=(string)cdp, "
       "framerate=(fraction){60/1, 60000/1001, 50/1, 30/1, 30000/1001, 25/1, 24/1, 24000/1001}");
+  static GstStaticCaps raw_608_caps =
+      GST_STATIC_CAPS ("closedcaption/x-cea-608,format=(string) raw");
 
   GstCCConverter *self = GST_CCCONVERTER (base);
   guint i, n;
@@ -149,8 +152,17 @@
     const GValue *framerate = gst_structure_get_value (s, "framerate");
 
     if (gst_structure_has_name (s, "closedcaption/x-cea-608")) {
+      const GValue *field = gst_structure_get_value (s, "field");
 
       if (direction == GST_PAD_SRC) {
+        GstCaps *tmp;
+
+        tmp = gst_caps_make_writable (gst_static_caps_get (&non_cdp_caps));
+
+        if (!field) {
+          tmp = gst_caps_merge (tmp, gst_static_caps_get (&raw_608_caps));
+        }
+
         /* SRC direction: We produce upstream caps
          *
          * Downstream wanted CEA608 caps. If it had a framerate, we
@@ -162,14 +174,9 @@
         res = gst_caps_merge (res, gst_static_caps_get (&cdp_caps_framerate));
         if (framerate) {
           /* we can only keep the same framerate for non-cdp */
-          GstCaps *tmp;
-
-          tmp = gst_caps_make_writable (gst_static_caps_get (&non_cdp_caps));
           gst_caps_set_value (tmp, "framerate", framerate);
-          res = gst_caps_merge (res, tmp);
-        } else {
-          res = gst_caps_merge (res, gst_static_caps_get (&non_cdp_caps));
         }
+        res = gst_caps_merge (res, tmp);
       } else {
         /* SINK: We produce downstream caps
          *
@@ -205,10 +212,19 @@
           }
           /* And we can convert to everything else with the given framerate */
           tmp = gst_caps_make_writable (gst_static_caps_get (&non_cdp_caps));
+
+          if (!field) {
+            tmp = gst_caps_merge (tmp, gst_static_caps_get (&raw_608_caps));
+          }
+
           gst_caps_set_value (tmp, "framerate", framerate);
           res = gst_caps_merge (res, tmp);
         } else {
           res = gst_caps_merge (res, gst_static_caps_get (&non_cdp_caps));
+
+          if (!field) {
+            res = gst_caps_merge (res, gst_static_caps_get (&raw_608_caps));
+          }
         }
       }
     } else if (gst_structure_has_name (s, "closedcaption/x-cea-708")) {
@@ -231,25 +247,7 @@
           res = gst_caps_merge (res, gst_static_caps_get (&cdp_caps_framerate));
 
           /* Or anything else with a CDP framerate */
-          if (framerate) {
-            GstCaps *tmp;
-            GstStructure *t;
-            const GValue *cdp_framerate;
-
-            /* Create caps that contain the intersection of all framerates with
-             * the CDP allowed framerates */
-            tmp =
-                gst_caps_make_writable (gst_static_caps_get
-                (&cdp_caps_framerate));
-            t = gst_caps_get_structure (tmp, 0);
-
-            /* There's an intersection between the framerates so we can convert
-             * into CDP with exactly those framerates from anything else */
-            cdp_framerate = gst_structure_get_value (t, "framerate");
-            tmp = gst_caps_make_writable (gst_static_caps_get (&non_cdp_caps));
-            gst_caps_set_value (tmp, "framerate", cdp_framerate);
-            res = gst_caps_merge (res, tmp);
-          } else {
+          {
             GstCaps *tmp, *cdp_caps;
             const GValue *cdp_framerate;
 
@@ -261,6 +259,7 @@
                 "framerate");
 
             tmp = gst_caps_make_writable (gst_static_caps_get (&non_cdp_caps));
+            tmp = gst_caps_merge (tmp, gst_static_caps_get (&raw_608_caps));
             gst_caps_set_value (tmp, "framerate", cdp_framerate);
             gst_caps_unref (cdp_caps);
 
@@ -274,10 +273,12 @@
             GstCaps *tmp;
 
             tmp = gst_caps_make_writable (gst_static_caps_get (&non_cdp_caps));
+            tmp = gst_caps_merge (tmp, gst_static_caps_get (&raw_608_caps));
             gst_caps_set_value (tmp, "framerate", framerate);
             res = gst_caps_merge (res, tmp);
           } else {
             res = gst_caps_merge (res, gst_static_caps_get (&non_cdp_caps));
+            res = gst_caps_merge (res, gst_static_caps_get (&raw_608_caps));
           }
         }
       } else {
@@ -330,10 +331,12 @@
           GstCaps *tmp;
 
           tmp = gst_caps_make_writable (gst_static_caps_get (&non_cdp_caps));
+          tmp = gst_caps_merge (tmp, gst_static_caps_get (&raw_608_caps));
           gst_caps_set_value (tmp, "framerate", framerate);
           res = gst_caps_merge (res, tmp);
         } else {
           res = gst_caps_merge (res, gst_static_caps_get (&non_cdp_caps));
+          res = gst_caps_merge (res, gst_static_caps_get (&raw_608_caps));
         }
       }
     } else {
@@ -433,6 +436,8 @@
   GstCCConverter *self = GST_CCCONVERTER (base);
   const GstStructure *s;
   gboolean passthrough;
+  static GstStaticCaps raw_608_caps =
+      GST_STATIC_CAPS ("closedcaption/x-cea-608,format=(string) raw");
 
   self->input_caption_type = gst_video_caption_type_from_caps (incaps);
   self->output_caption_type = gst_video_caption_type_from_caps (outcaps);
@@ -446,16 +451,28 @@
           &self->in_fps_d))
     self->in_fps_n = self->in_fps_d = 0;
 
+  if (!gst_structure_get_int (s, "field", &self->in_field))
+    self->in_field = 0;
+
   s = gst_caps_get_structure (outcaps, 0);
   if (!gst_structure_get_fraction (s, "framerate", &self->out_fps_n,
           &self->out_fps_d))
     self->out_fps_n = self->out_fps_d = 0;
 
+  if (!gst_structure_get_int (s, "field", &self->out_field))
+    self->out_field = 0;
+
   gst_video_time_code_clear (&self->current_output_timecode);
 
-  /* Caps can be different but we can passthrough as long as they can
-   * intersect, i.e. have same caps name and format */
-  passthrough = gst_caps_can_intersect (incaps, outcaps);
+  if (gst_caps_is_subset (incaps, gst_static_caps_get (&raw_608_caps)) &&
+      gst_caps_is_subset (outcaps, gst_static_caps_get (&raw_608_caps))) {
+    passthrough = self->in_field == self->out_field;
+  } else {
+    /* Caps can be different but we can passthrough as long as they can
+     * intersect, i.e. have same caps name and format */
+    passthrough = gst_caps_can_intersect (incaps, outcaps);
+  }
+
   gst_base_transform_set_passthrough (base, passthrough);
 
   GST_DEBUG_OBJECT (self,
@@ -682,10 +699,9 @@
   gst_buffer_map (inbuf, &in, GST_MAP_READ);
   gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
 
-  /* We have to assume that each value is from the first field and
-   * don't know from which line offset it originally is */
+  /* We don't know from which line offset it originally is */
   for (i = 0; i < n; i++) {
-    out.datai * 3 = 0x80;
+    out.datai * 3 = self->in_field == 0 ? 0x80 : 0x00;
     out.datai * 3 + 1 = in.datai * 2;
     out.datai * 3 + 2 = in.datai * 2 + 1;
   }
@@ -696,6 +712,85 @@
   return GST_FLOW_OK;
 }
 
+static inline guint8
+eia608_parity_strip (guint8 cc_data)
+{
+  return cc_data & 0x7F;
+}
+
+static GstFlowReturn
+convert_cea608_raw_cea608_raw (GstCCConverter * self, GstBuffer * inbuf,
+    GstBuffer * outbuf)
+{
+  GstMapInfo in, out;
+  guint i, n;
+
+  g_assert (self->in_field != self->out_field);
+
+  n = gst_buffer_get_size (inbuf);
+  if (n & 1) {
+    GST_WARNING_OBJECT (self, "Invalid raw CEA608 buffer size");
+    gst_buffer_set_size (outbuf, 0);
+    return GST_FLOW_OK;
+  }
+
+  n /= 2;
+
+  if (n > 3) {
+    GST_WARNING_OBJECT (self, "Too many CEA608 pairs %u.  Truncating to %u", n,
+        3);
+    n = 3;
+  }
+
+  gst_buffer_set_size (outbuf, 2 * n);
+
+  gst_buffer_map (inbuf, &in, GST_MAP_READ);
+  gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
+
+  /* EIA/CEA-608-B 8.4 Closed Caption Mode:
+   *
+   * When closed captioning is used on line 21, field 2,
+   * it shall conform to all of the applicable specifications and
+   * recommended practices as defined for field 1 services with the
+   * following differences:
+   *
+   * a) The non-printing character of the miscellaneous control-character pairs
+   * that fall in the range of 14h, 20h to 14h, 2Fh in field 1, shall be
+   * replaced with 15h, 20h to 15h, 2Fh when used in field 2.
+   *
+   * b) The non-printing character of the miscellaneous control-character pairs
+   * that fall in the range of 1Ch, 20h to 1Ch, 2Fh in field 1, shall be replaced
+   * with 1Dh, 20h to 1Dh, 2Fh when used in field 2.
+   */
+
+  for (i = 0; i < n; i++) {
+    guint8 cc_data_1 = eia608_parity_strip (in.datai * 2);
+    guint8 cc_data_2 = eia608_parity_strip (in.datai * 2 + 1);
+
+    out.datai * 2 = in.datai * 2;
+    out.datai * 2 + 1 = in.datai * 2 + 1;
+
+    if (self->in_field == 0 && self->out_field == 1) {
+      if (cc_data_1 == 0x14 && cc_data_2 >= 0x20 && cc_data_2 <= 0x2f) {
+        out.datai * 2 = 0x15;
+      } else if (cc_data_1 == 0x1c && cc_data_2 >= 0x20 && cc_data_2 <= 0x2f) {
+        out.datai * 2 = 0x9d;
+      }
+    } else if (self->in_field == 1 && self->out_field == 0) {
+      if (cc_data_1 == 0x15 && cc_data_2 >= 0x20 && cc_data_2 <= 0x2f) {
+        out.datai * 2 = 0x94;
+      } else if (cc_data_1 == 0x1d && cc_data_2 >= 0x20 && cc_data_2 <= 0x2f) {
+        out.datai * 2 = 0x1c;
+      }
+    }
+  }
+
+  gst_buffer_unmap (inbuf, &in);
+  gst_buffer_unmap (outbuf, &out);
+
+  return GST_FLOW_OK;
+}
+
 static GstFlowReturn
 convert_cea608_raw_cea708_cc_data (GstCCConverter * self, GstBuffer * inbuf,
     GstBuffer * outbuf)
@@ -723,10 +818,9 @@
   gst_buffer_map (inbuf, &in, GST_MAP_READ);
   gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
 
-  /* We have to assume that each value is from the first field and
-   * don't know from which line offset it originally is */
+  /* We don't know from which line offset it originally is */
   for (i = 0; i < n; i++) {
-    out.datai * 3 = 0xfc;
+    out.datai * 3 = self->in_field == 0 ? 0xfc : 0xfd;
     out.datai * 3 + 1 = in.datai * 2;
     out.datai * 3 + 2 = in.datai * 2 + 1;
   }
@@ -769,8 +863,13 @@
     }
 
     gst_buffer_map (inbuf, &in, GST_MAP_READ);
-    cc_buffer_push_separated (self->cc_buffer, in.data, in.size, NULL, 0, NULL,
-        0);
+    if (self->in_field == 0) {
+      cc_buffer_push_separated (self->cc_buffer, in.data, in.size, NULL, 0,
+          NULL, 0);
+    } else {
+      cc_buffer_push_separated (self->cc_buffer, NULL, 0, in.data, in.size,
+          NULL, 0);
+    }
     gst_buffer_unmap (inbuf, &in);
     self->input_frames++;
   }
@@ -783,7 +882,7 @@
           tc_meta ? &tc_meta->tc : NULL, &self->current_output_timecode))
     goto drop;
 
-  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, cc_data,
+  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, TRUE, cc_data,
       &cc_data_len);
 
   gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
@@ -828,9 +927,10 @@
   gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
 
   for (i = 0; i < n; i++) {
-    if (in.datai * 3 & 0x80) {
-      out.datai * 2 = in.datai * 3 + 1;
-      out.datai * 2 + 1 = in.datai * 3 + 2;
+    if ((in.datai * 3 & 0x80 && self->out_field == 0) ||
+        (!(in.datai * 3 & 0x80) && self->out_field == 1)) {
+      out.datacea608 * 2 = in.datai * 3 + 1;
+      out.datacea608 * 2 + 1 = in.datai * 3 + 2;
       cea608++;
     }
   }
@@ -943,7 +1043,7 @@
           tc_meta ? &tc_meta->tc : NULL, &self->current_output_timecode))
     goto drop;
 
-  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, cc_data,
+  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, TRUE, cc_data,
       &cc_data_len);
 
   gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
@@ -988,11 +1088,8 @@
   gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
 
   for (i = 0; i < n; i++) {
-    /* We can only really copy the first field here as there can't be any
-     * signalling in raw CEA608 and we must not mix the streams of different
-     * fields
-     */
-    if (in.datai * 3 == 0xfc) {
+    if ((in.datai * 3 == 0xfc && self->out_field == 0) ||
+        (in.datai * 3 == 0xfd && self->out_field == 1)) {
       out.datacea608 * 2 = in.datai * 3 + 1;
       out.datacea608 * 2 + 1 = in.datai * 3 + 2;
       cea608++;
@@ -1086,7 +1183,7 @@
           tc_meta ? &tc_meta->tc : NULL, &self->current_output_timecode))
     goto drop;
 
-  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, cc_data,
+  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, TRUE, cc_data,
       &cc_data_len);
 
   gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
@@ -1112,7 +1209,7 @@
 {
   GstMapInfo out;
   GstVideoTimeCode tc = GST_VIDEO_TIME_CODE_INIT;
-  guint cea608_1_len;
+  guint cea608_len;
   const struct cdp_fps_entry *in_fps_entry = NULL, *out_fps_entry;
 
   if (!push_cdp_buffer (self, inbuf, &tc, &in_fps_entry)) {
@@ -1129,9 +1226,14 @@
     goto drop;
 
   gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
-  cea608_1_len = out.size;
-  cc_buffer_take_separated (self->cc_buffer, out_fps_entry, out.data,
-      &cea608_1_len, NULL, 0, NULL, 0);
+  cea608_len = out.size;
+  if (self->out_field == 0) {
+    cc_buffer_take_separated (self->cc_buffer, out_fps_entry, out.data,
+        &cea608_len, NULL, 0, NULL, 0);
+  } else {
+    cc_buffer_take_separated (self->cc_buffer, out_fps_entry, NULL, 0, out.data,
+        &cea608_len, NULL, 0);
+  }
   gst_buffer_unmap (outbuf, &out);
   self->output_frames++;
 
@@ -1142,11 +1244,11 @@
   }
 
 out:
-  gst_buffer_set_size (outbuf, cea608_1_len);
+  gst_buffer_set_size (outbuf, cea608_len);
   return GST_FLOW_OK;
 
 drop:
-  cea608_1_len = 0;
+  cea608_len = 0;
   goto out;
 }
 
@@ -1175,8 +1277,8 @@
   gst_buffer_map (outbuf, &out, GST_MAP_READWRITE);
 
   cc_data_len = out.size;
-  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, out.data,
-      &cc_data_len);
+  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, FALSE,
+      out.data, &cc_data_len);
   s334_len = drop_ccp_from_cc_data (out.data, cc_data_len);
   if (s334_len < 0)
     goto drop;
@@ -1227,7 +1329,8 @@
 
   gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
   out_len = (guint) out.size;
-  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, out.data, &out_len);
+  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, TRUE, out.data,
+      &out_len);
 
   gst_buffer_unmap (outbuf, &out);
   self->output_frames++;
@@ -1266,7 +1369,7 @@
           &self->current_output_timecode))
     goto out;
 
-  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, cc_data,
+  cc_buffer_take_cc_data (self->cc_buffer, out_fps_entry, TRUE, cc_data,
       &cc_data_len);
 
   gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
@@ -1329,6 +1432,8 @@
           ret = convert_cea608_raw_cea708_cdp (self, inbuf, outbuf, tc_meta);
           break;
         case GST_VIDEO_CAPTION_TYPE_CEA608_RAW:
+          ret = convert_cea608_raw_cea608_raw (self, inbuf, outbuf);
+          break;
         default:
           g_assert_not_reached ();
           break;
@@ -1579,6 +1684,25 @@
     if (gst_buffer_get_size (*outbuf) <= 0) {
       gst_buffer_unref (*outbuf);
       *outbuf = NULL;
+
+      if (inbuf && GST_BUFFER_PTS_IS_VALID (inbuf)) {
+        GstClockTime dur = 0;
+        GstEvent *gap;
+
+        GST_TRACE_OBJECT (self, "Empty generated output for input %"
+            GST_PTR_FORMAT, inbuf);
+
+        if (GST_BUFFER_DURATION_IS_VALID (inbuf)) {
+          dur = GST_BUFFER_DURATION (inbuf);
+        } else if (self->in_fps_n > 0 && self->in_fps_d > 0) {
+          dur = gst_util_uint64_scale (GST_SECOND,
+              self->in_fps_d, self->in_fps_n);
+        }
+
+        gap = gst_event_new_gap (GST_BUFFER_PTS (inbuf), dur);
+        gst_pad_push_event (GST_BASE_TRANSFORM_SRC_PAD (self), gap);
+      }
+
       ret = GST_FLOW_OK;
     }
 
@@ -1754,5 +1878,8 @@
 gst_cc_converter_init (GstCCConverter * self)
 {
   self->cdp_mode = DEFAULT_CDP_MODE;
+  self->in_field = 0;
+  self->out_field = 0;
   self->cc_buffer = cc_buffer_new ();
+  cc_buffer_set_output_padding (self->cc_buffer, TRUE, FALSE);
 }

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/gstccconverter.h -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/gstccconverter.h Changed

gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/gstcea608mux.c Added

@@ -0,0 +1,443 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Mathieu Duponchelle <mathieu@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-cea608mux
+ * @title: cea608mux
+ * @short_description: Combine CC1 and CC3 raw 608 streams
+ *
+ * ```
+ * gst-launch-1.0 cea608mux name=mux ! fakesink dump=true \
+ * filesrc location=one.scc ! sccparse ! closedcaption/x-cea-608 ! ccconverter ! mux. \
+ * filesrc location=two.scc ! sccparse ! ccconverter ! closedcaption/x-cea-608, format=raw, field=0 ! \
+ *     capssetter caps="closedcaption/x-cea-608, format=raw, field=1" ! mux.
+ * ```
+ *
+ * Since: 1.24
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <gst/gst.h>
+#include <gst/base/base.h>
+#include <gst/video/video.h>
+#include <string.h>
+
+#include "ccutils.h"
+#include "gstcea608mux.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_cea608_mux_debug);
+#define GST_CAT_DEFAULT gst_cea608_mux_debug
+
+static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("closedcaption/x-cea-608, format=s334-1a, "
+        "framerate=(fraction){60/1, 60000/1001, 50/1, 30/1, 30000/1001, 25/1, 24/1, 24000/1001}"));
+
+static GstStaticPadTemplate cc1_template = GST_STATIC_PAD_TEMPLATE ("cc1",
+    GST_PAD_SINK,
+    GST_PAD_REQUEST,
+    GST_STATIC_CAPS ("closedcaption/x-cea-608,format=raw,field=0"));
+
+static GstStaticPadTemplate cc3_template = GST_STATIC_PAD_TEMPLATE ("cc3",
+    GST_PAD_SINK,
+    GST_PAD_REQUEST,
+    GST_STATIC_CAPS ("closedcaption/x-cea-608,format=raw,field=1"));
+
+#define parent_class gst_cea608_mux_parent_class
+G_DEFINE_TYPE (GstCea608Mux, gst_cea608_mux, GST_TYPE_AGGREGATOR);
+GST_ELEMENT_REGISTER_DEFINE (cea608mux, "cea608mux",
+    GST_RANK_NONE, GST_TYPE_CEA608MUX);
+
+enum
+{
+  PROP_0,
+};
+
+static void
+gst_cea608_mux_finalize (GObject * object)
+{
+  GstCea608Mux *self = GST_CEA608MUX (object);
+
+  gst_clear_object (&self->cc_buffer);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+#define GST_FLOW_NEED_DATA GST_FLOW_CUSTOM_SUCCESS
+
+static GstAggregatorPad *
+find_best_pad (GstAggregator * aggregator, GstClockTime * ts, gboolean timeout)
+{
+  GstAggregatorPad *best = NULL;
+  GstClockTime best_ts = GST_CLOCK_TIME_NONE;
+  GstIterator *pads;
+  GValue padptr = { 0, };
+  gboolean done = FALSE;
+
+  pads = gst_element_iterate_sink_pads (GST_ELEMENT (aggregator));
+
+  while (!done) {
+    switch (gst_iterator_next (pads, &padptr)) {
+      case GST_ITERATOR_OK:{
+        GstAggregatorPad *apad = g_value_get_object (&padptr);
+        GstClockTime t = GST_CLOCK_TIME_NONE;
+        GstBuffer *buffer;
+
+        buffer = gst_aggregator_pad_peek_buffer (apad);
+        if (!buffer) {
+          if (!timeout && !GST_PAD_IS_EOS (apad)) {
+            gst_object_replace ((GstObject **) & best, NULL);
+            best_ts = GST_CLOCK_TIME_NONE;
+            done = TRUE;
+          }
+          break;
+        }
+
+        if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DTS_OR_PTS (buffer))) {
+          t = gst_segment_to_running_time (&apad->segment, GST_FORMAT_TIME,
+              GST_BUFFER_PTS (buffer));
+        }
+
+        if (!GST_CLOCK_TIME_IS_VALID (best_ts) ||
+            (GST_CLOCK_TIME_IS_VALID (t) && t < best_ts)) {
+          gst_object_replace ((GstObject **) & best, GST_OBJECT (apad));
+          best_ts = t;
+        }
+        gst_buffer_unref (buffer);
+        break;
+      }
+      case GST_ITERATOR_DONE:
+        done = TRUE;
+        break;
+      case GST_ITERATOR_RESYNC:
+        gst_iterator_resync (pads);
+        /* Clear the best pad and start again. It might have disappeared */
+        gst_object_replace ((GstObject **) & best, NULL);
+        best_ts = GST_CLOCK_TIME_NONE;
+        break;
+      case GST_ITERATOR_ERROR:
+        /* This can't happen if the parameters to gst_iterator_next() are valid */
+        g_assert_not_reached ();
+        break;
+    }
+    g_value_reset (&padptr);
+  }
+  g_value_unset (&padptr);
+  gst_iterator_free (pads);
+
+  if (best) {
+    GST_LOG_OBJECT (aggregator,
+        "Best pad found with TS %" GST_TIME_FORMAT ": %" GST_PTR_FORMAT,
+        GST_TIME_ARGS (best_ts), best);
+  } else {
+    GST_LOG_OBJECT (aggregator, "Best pad not found");
+  }
+
+  if (ts && GST_CLOCK_TIME_IS_VALID (best_ts))
+    *ts = best_ts;
+
+  return best;
+}
+
+static gboolean
+all_pads_eos (GstAggregator * agg)
+{
+  GList *l;
+  gboolean ret = TRUE;
+
+  GST_OBJECT_LOCK (agg);
+  for (l = GST_ELEMENT_CAST (agg)->sinkpads; l; l = l->next) {
+    GstAggregatorPad *pad = GST_AGGREGATOR_PAD (l->data);
+
+    if (!gst_aggregator_pad_is_eos (pad)) {
+      ret = FALSE;
+      break;
+    }
+  }
+  GST_OBJECT_UNLOCK (agg);
+
+  return ret;
+}
+
+static void
+take_s334_both_fields (GstCea608Mux * self, GstBuffer * buffer)
+{
+  GstMapInfo out = GST_MAP_INFO_INIT;
+  guint s334_len, cc_data_len, i;
+
+  gst_buffer_map (buffer, &out, GST_MAP_READWRITE);
+
+  cc_data_len = out.size;
+  cc_buffer_take_cc_data (self->cc_buffer, self->cdp_fps_entry, FALSE, out.data,
+      &cc_data_len);
+  s334_len = drop_ccp_from_cc_data (out.data, cc_data_len);
+  if (s334_len < 0) {
+    s334_len = 0;
+    goto out;
+  }
+
+  for (i = 0; i < s334_len / 3; i++) {
+    guint byte = out.datai * 3;
+    /* We have to assume a line offset of 0 */
+    out.datai * 3 = (byte == 0xfc || byte == 0xf8) ? 0x80 : 0x00;
+  }
+
+out:
+  gst_buffer_unmap (buffer, &out);
+  gst_buffer_set_size (buffer, s334_len);
+}
+
+static GstFlowReturn
+finish_s334_both_fields (GstCea608Mux * self)
+{
+  GstClockTime output_pts = gst_util_uint64_scale_int (GST_SECOND,
+      self->cdp_fps_entry->fps_d * self->n_output_buffers,
+      self->cdp_fps_entry->fps_n);
+  GstClockTime output_duration =
+      gst_util_uint64_scale_int (GST_SECOND, self->cdp_fps_entry->fps_d,
+      self->cdp_fps_entry->fps_n);
+  GstBuffer *output = gst_buffer_new_allocate (NULL, MAX_CDP_PACKET_LEN, NULL);
+  GstSegment *agg_segment =
+      &GST_AGGREGATOR_PAD (GST_AGGREGATOR (self)->srcpad)->segment;
+
+  output_pts += self->start_time;
+
+  take_s334_both_fields (self, output);
+  GST_BUFFER_PTS (output) = output_pts;
+  GST_BUFFER_DURATION (output) = output_duration;
+  GST_DEBUG_OBJECT (self, "Finishing %" GST_PTR_FORMAT, output);
+  self->n_output_buffers += 1;
+  agg_segment->position = output_pts + output_duration;
+
+  return gst_aggregator_finish_buffer (GST_AGGREGATOR (self), output);
+}
+
+static GstFlowReturn
+gst_cea608_mux_aggregate (GstAggregator * aggregator, gboolean timeout)
+{
+  GstCea608Mux *self = GST_CEA608MUX (aggregator);
+  GstFlowReturn flow_ret = GST_FLOW_OK;
+  GstAggregatorPad *best_pad = NULL;
+  GstClockTime output_duration =
+      gst_util_uint64_scale_int (GST_SECOND, self->cdp_fps_entry->fps_d,
+      self->cdp_fps_entry->fps_n);
+  GstSegment *agg_segment = &GST_AGGREGATOR_PAD (aggregator->srcpad)->segment;
+  GstClockTime output_start_time = agg_segment->position;
+  GstClockTime output_end_running_time;
+
+  if (agg_segment->position == -1 || agg_segment->position < agg_segment->start)
+    output_start_time = agg_segment->start;
+
+  if (!GST_CLOCK_TIME_IS_VALID (self->start_time)) {
+    self->start_time = output_start_time;
+    GST_DEBUG_OBJECT (self, "Start time %" GST_TIME_FORMAT,
+        GST_TIME_ARGS (self->start_time));
+  }
+
+  best_pad =
+      find_best_pad (aggregator, &self->earliest_input_running_time, timeout);
+
+  output_end_running_time =
+      gst_segment_to_running_time (agg_segment, GST_FORMAT_TIME,
+      output_start_time + output_duration);
+
+  GST_LOG_OBJECT (self, "best-pad: %s, timeout: %d, "
+      "earliest input running time: %"
+      GST_TIME_FORMAT ", output running time: %" GST_TIME_FORMAT,
+      best_pad ? GST_OBJECT_NAME (best_pad) : "NULL", timeout,
+      GST_TIME_ARGS (self->earliest_input_running_time),
+      GST_TIME_ARGS (output_end_running_time));
+
+  if (GST_CLOCK_TIME_IS_VALID (self->earliest_input_running_time)
+      && self->earliest_input_running_time > output_end_running_time) {
+    /* Nothing to consume, earliest pad is not ready yet */
+    GST_LOG_OBJECT (self, "Nothing to consume");
+  } else if (best_pad) {
+    GstBuffer *buffer;
+
+    buffer = gst_aggregator_pad_pop_buffer (GST_AGGREGATOR_PAD (best_pad));
+
+    if (buffer) {
+      GstMapInfo map;
+
+      gst_buffer_map (buffer, &map, GST_MAP_READ);
+
+      if (g_strcmp0 (GST_PAD_NAME (best_pad), "cc1") == 0) {
+        GST_DEBUG_OBJECT (self, "Consuming CC1 %" GST_PTR_FORMAT, buffer);
+        cc_buffer_push_separated (self->cc_buffer, map.data, map.size, NULL, 0,
+            NULL, 0);
+      } else {
+        GST_DEBUG_OBJECT (self, "Consuming CC3 %" GST_PTR_FORMAT, buffer);
+        cc_buffer_push_separated (self->cc_buffer, NULL, 0, map.data, map.size,
+            NULL, 0);
+      }
+
+      gst_buffer_unmap (buffer, &map);
+      gst_buffer_unref (buffer);
+    } else {
+      /* We got flushed */
+      flow_ret = GST_AGGREGATOR_FLOW_NEED_DATA;
+    }
+  } else if (all_pads_eos (aggregator)) {
+    GST_INFO_OBJECT (self, "EOS!");
+    flow_ret = GST_FLOW_EOS;
+  } else {
+    GST_LOG_OBJECT (self, "Need more data");
+    flow_ret = GST_AGGREGATOR_FLOW_NEED_DATA;
+  }
+
+  if (flow_ret == GST_FLOW_OK) {
+    if (timeout || output_end_running_time < self->earliest_input_running_time) {
+      flow_ret = finish_s334_both_fields (self);
+    }
+  } else if (flow_ret == GST_FLOW_EOS && !cc_buffer_is_empty (self->cc_buffer)) {
+    flow_ret = finish_s334_both_fields (self);
+  }
+
+  g_clear_pointer (&best_pad, gst_object_unref);
+
+  return flow_ret;
+}
+
+static gboolean
+gst_cea608_mux_stop (GstAggregator * aggregator)
+{
+  GstCea608Mux *self = GST_CEA608MUX (aggregator);
+
+  cc_buffer_discard (self->cc_buffer);
+  self->n_output_buffers = 0;
+  self->earliest_input_running_time = 0;
+  self->start_time = GST_CLOCK_TIME_NONE;
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_cea608_mux_flush (GstAggregator * aggregator)
+{
+  GstCea608Mux *self = GST_CEA608MUX (aggregator);
+  GstSegment *agg_segment = &GST_AGGREGATOR_PAD (aggregator->srcpad)->segment;
+
+  GST_DEBUG_OBJECT (self, "Flush");
+
+  cc_buffer_discard (self->cc_buffer);
+  self->n_output_buffers = 0;
+  self->earliest_input_running_time = 0;
+  self->start_time = GST_CLOCK_TIME_NONE;
+  agg_segment->position = -1;
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_cea608_mux_negotiated_src_caps (GstAggregator * agg, GstCaps * caps)
+{
+  GstStructure *s = gst_caps_get_structure (caps, 0);
+  gint fps_n, fps_d;
+  GstCea608Mux *self = GST_CEA608MUX (agg);
+  GstClockTime latency;
+
+  GST_INFO_OBJECT (agg->srcpad, "set src caps: %" GST_PTR_FORMAT, caps);
+
+  g_assert (gst_structure_get_fraction (s, "framerate", &fps_n,
+          &fps_d) == TRUE);
+  self->cdp_fps_entry = cdp_fps_entry_from_fps (fps_n, fps_d);
+  g_assert (self->cdp_fps_entry != NULL && self->cdp_fps_entry->fps_n != 0);
+
+  latency =
+      gst_util_uint64_scale (GST_SECOND, self->cdp_fps_entry->fps_d,
+      self->cdp_fps_entry->fps_n);
+  gst_aggregator_set_latency (agg, latency, latency);
+
+  return TRUE;
+}
+
+static GstBuffer *
+gst_cea608_mux_clip (GstAggregator * aggregator, GstAggregatorPad * pad,
+    GstBuffer * buffer)
+{
+  GstClockTime time;
+
+  if (!GST_BUFFER_PTS_IS_VALID (buffer))
+    return buffer;
+
+  time = gst_segment_to_running_time (&pad->segment, GST_FORMAT_TIME,
+      GST_BUFFER_PTS (buffer));
+  if (!GST_CLOCK_TIME_IS_VALID (time)) {
+    GST_DEBUG_OBJECT (pad, "Dropping buffer on pad outside segment %"
+        GST_TIME_FORMAT, GST_TIME_ARGS (GST_BUFFER_PTS (buffer)));
+    gst_buffer_unref (buffer);
+    return NULL;
+  }
+
+  return buffer;
+}
+
+static void
+gst_cea608_mux_class_init (GstCea608MuxClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+  GstAggregatorClass *aggregator_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
+  aggregator_class = (GstAggregatorClass *) klass;
+
+  gobject_class->finalize = gst_cea608_mux_finalize;
+
+  gst_element_class_set_static_metadata (gstelement_class,
+      "Closed Caption Muxer",
+      "Aggregator",
+      "Combines raw 608 streams",
+      "Mathieu Duponchelle <mathieu@centricular.com>");
+
+  gst_element_class_add_static_pad_template_with_gtype (gstelement_class,
+      &srctemplate, GST_TYPE_AGGREGATOR_PAD);
+  gst_element_class_add_static_pad_template_with_gtype (gstelement_class,
+      &cc1_template, GST_TYPE_AGGREGATOR_PAD);
+  gst_element_class_add_static_pad_template_with_gtype (gstelement_class,
+      &cc3_template, GST_TYPE_AGGREGATOR_PAD);
+
+  aggregator_class->aggregate = gst_cea608_mux_aggregate;
+  aggregator_class->stop = gst_cea608_mux_stop;
+  aggregator_class->flush = gst_cea608_mux_flush;
+  aggregator_class->negotiated_src_caps = gst_cea608_mux_negotiated_src_caps;
+  aggregator_class->get_next_time = gst_aggregator_simple_get_next_time;
+  aggregator_class->clip = gst_cea608_mux_clip;
+
+  GST_DEBUG_CATEGORY_INIT (gst_cea608_mux_debug, "cea608mux",
+      0, "Closed Caption muxer");
+}
+
+static void
+gst_cea608_mux_init (GstCea608Mux * self)
+{
+  self->cc_buffer = cc_buffer_new ();
+  cc_buffer_set_max_buffer_time (self->cc_buffer, GST_CLOCK_TIME_NONE);
+  cc_buffer_set_output_padding (self->cc_buffer, TRUE, FALSE);
+  self->cdp_fps_entry = &null_fps_entry;
+  self->start_time = GST_CLOCK_TIME_NONE;
+}

gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/gstcea608mux.h Added

@@ -0,0 +1,65 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Mathieu Duponchelle <mathieu@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_CEA608MUX_H__
+#define __GST_CEA608MUX_H__
+
+#include <gst/gst.h>
+#include <gst/base/base.h>
+
+#include "ccutils.h"
+
+G_BEGIN_DECLS
+#define GST_TYPE_CEA608MUX \
+  (gst_cea608_mux_get_type())
+#define GST_CEA608MUX(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CEA608MUX,GstCea608Mux))
+#define GST_CEA608MUX_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CEA608MUX,GstCea608MuxClass))
+#define GST_IS_CEA608MUX(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CEA608MUX))
+#define GST_IS_CEA608MUX_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CEA608MUX))
+
+typedef struct _GstCea608Mux GstCea608Mux;
+typedef struct _GstCea608MuxClass GstCea608MuxClass;
+
+struct _GstCea608Mux
+{
+  GstAggregator parent;
+
+  CCBuffer *cc_buffer;
+  GstClockTime earliest_input_running_time;
+  GstClockTime start_time;
+  gint n_output_buffers;
+  const struct cdp_fps_entry *cdp_fps_entry;
+};
+
+struct _GstCea608MuxClass
+{
+  GstAggregatorClass parent_class;
+};
+
+GType gst_cea608_mux_get_type (void);
+
+GST_ELEMENT_REGISTER_DECLARE (cea608mux);
+
+G_END_DECLS
+#endif /* __GST_CEA608MUX_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/gstcea708decoder.c -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/gstcea708decoder.c Changed

@@ -227,39 +227,43 @@
 
   parse_index += 1;
 
-  block_size = dtvcc_bufferparse_index & 0x1F;
-  service_number = (dtvcc_bufferparse_index & 0xE0) >> 5;
-  parse_index += 1;
-
-  if (service_number == 7) {
-    /* Get extended service number */
-    service_number = dtvcc_bufferparse_index & 0x3F;
+  while (parse_index < dtvcc_size) {
+    block_size = dtvcc_bufferparse_index & 0x1F;
+    service_number = (dtvcc_bufferparse_index & 0xE0) >> 5;
     parse_index += 1;
-  }
-
-  GST_LOG ("full_size:%" G_GSIZE_FORMAT
-      " size=%d seq=%d block_size=%d service_num=%d", dtvcc_size, pkt_size,
-      sequence_number, block_size, service_number);
-
 
-  /* Process desired_service cc data */
-  if (decoder->desired_service == service_number) {
-    for (i = 0; i < block_size; i++) {
-      /* The Dtvcc buffer contains a stream of commands, command parameters,
-       * and characters which are the actual captions. Process commands and
-       * store captions in simulated 708 windows: */
-      gst_cea708dec_process_dtvcc_byte (decoder, dtvcc_buffer, parse_index + i);
+    if (service_number == 7) {
+      /* Get extended service number */
+      service_number = dtvcc_bufferparse_index & 0x3F;
+      parse_index += 1;
     }
 
-    for (window_id = 0; window_id < 8; window_id++) {
-      window = decoder->cc_windowswindow_id;
-      GST_LOG ("window #%02d deleted:%d visible:%d updated:%d", window_id,
-          window->deleted, window->visible, window->updated);
-      if (!window->updated) {
-        continue;
+    GST_LOG ("full_size:%" G_GSIZE_FORMAT
+        " size=%d seq=%d block_size=%d service_num=%d", dtvcc_size, pkt_size,
+        sequence_number, block_size, service_number);
+
+    /* Process desired_service cc data */
+    if (decoder->desired_service == service_number) {
+      for (i = 0; i < block_size; i++) {
+        /* The Dtvcc buffer contains a stream of commands, command parameters,
+         * and characters which are the actual captions. Process commands and
+         * store captions in simulated 708 windows: */
+        gst_cea708dec_process_dtvcc_byte (decoder, dtvcc_buffer,
+            parse_index + i);
+      }
+
+      for (window_id = 0; window_id < 8; window_id++) {
+        window = decoder->cc_windowswindow_id;
+        GST_LOG ("window #%02d deleted:%d visible:%d updated:%d", window_id,
+            window->deleted, window->visible, window->updated);
+        if (!window->updated) {
+          continue;
+        }
+        need_render = TRUE;
       }
-      need_render = TRUE;
     }
+
+    parse_index += block_size;
   }
 
   return need_render;

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/gstceaccoverlay.c -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/gstceaccoverlay.c Changed

@@ -207,15 +207,9 @@
   /* Only lock for the subclasses here, the base class
    * doesn't have this mutex yet and it's not necessary
    * here */
-  /* FIXME : Not needed anymore since pango 1.32.6 ! */
-  if (klass->pango_lock)
-    g_mutex_lock (klass->pango_lock);
   fontmap = pango_cairo_font_map_get_default ();
   klass->pango_context =
       pango_font_map_create_context (PANGO_FONT_MAP (fontmap));
-  if (klass->pango_lock)
-    g_mutex_unlock (klass->pango_lock);
-
 }
 
 static void
@@ -246,9 +240,6 @@
   gstelement_class->change_state =
       GST_DEBUG_FUNCPTR (gst_cea_cc_overlay_change_state);
 
-  klass->pango_lock = g_slice_new (GMutex);
-  g_mutex_init (klass->pango_lock);
-
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SERVICE_NUMBER,
       g_param_spec_int ("service-number", "service-number",
           "Service number. Service 1 is designated as the Primary Caption Service,"
@@ -524,14 +515,11 @@
   ret = gst_cea_cc_overlay_negotiate (overlay, caps);
 
   GST_CEA_CC_OVERLAY_LOCK (overlay);
-  g_mutex_lock (GST_CEA_CC_OVERLAY_GET_CLASS (overlay)->pango_lock);
   if (!overlay->attach_compo_to_buffer &&
       !gst_cea_cc_overlay_can_handle_caps (caps)) {
     GST_DEBUG_OBJECT (overlay, "unsupported caps %" GST_PTR_FORMAT, caps);
     ret = FALSE;
   }
-
-  g_mutex_unlock (GST_CEA_CC_OVERLAY_GET_CLASS (overlay)->pango_lock);
   GST_CEA_CC_OVERLAY_UNLOCK (overlay);
 
   return ret;

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/gstceaccoverlay.h -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/gstceaccoverlay.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/gstclosedcaption.c -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/gstclosedcaption.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/io-sim.c -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/io-sim.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/raw_decoder.c -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/raw_decoder.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/closedcaption/sampling_par.c -> gst-plugins-bad-1.24.5.tar.xz/ext/closedcaption/sampling_par.c Changed

@@ -332,7 +332,8 @@
 vbi_service_set
     _vbi_sampling_par_check_services_log
     (const vbi_sampling_par * sp,
-    vbi_service_set services, unsigned int strict, _vbi_log_hook * log) {
+    vbi_service_set services, unsigned int strict, _vbi_log_hook * log)
+{
   const _vbi_service_par *par;
   vbi_service_set rservices;
 
@@ -359,7 +360,8 @@
     (vbi_sampling_par * sp,
     unsigned int *max_rate,
     vbi_videostd_set videostd_set_req,
-    vbi_service_set services, _vbi_log_hook * log) {
+    vbi_service_set services, _vbi_log_hook * log)
+{
   const _vbi_service_par *par;
   vbi_service_set rservices;
   vbi_videostd_set videostd_set;
@@ -502,8 +504,8 @@
  */
 vbi_service_set
     vbi_sampling_par_check_services
-    (const vbi_sampling_par * sp,
-    vbi_service_set services, unsigned int strict) {
+    (const vbi_sampling_par * sp, vbi_service_set services, unsigned int strict)
+{
   return _vbi_sampling_par_check_services_log (sp, services, strict,
       /* log_hook */ NULL);
 }

gst-plugins-bad-1.24.5.tar.xz/ext/codec2json Added

gst-plugins-bad-1.24.5.tar.xz/ext/codec2json/gstav12json.c Added

@@ -0,0 +1,1036 @@
+/*
+ * gstav12json.c - AV1 parsed bistream to json
+ *
+ * Copyright (C) 2023 Collabora
+ *   Author: Benjamin Gaignard <benjamin.gaignard@collabora.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-av12json
+ * @title: av12json
+ *
+ * Convert AV1 bitstream parameters to JSON formated text.
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/av1/file ! parsebin ! av12json ! filesink location=/path/to/json/file
+ * ```
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gst/base/base.h>
+#include <json-glib/json-glib.h>
+
+#include "gstav12json.h"
+
+GST_DEBUG_CATEGORY (gst_av1_2_json_debug);
+#define GST_CAT_DEFAULT gst_av1_2_json_debug
+
+struct _GstAV12json
+{
+  GstElement parent;
+
+  GstPad *sinkpad, *srcpad;
+  GstAV1Parser *parser;
+  gboolean use_annex_b;
+
+  JsonObject *json;
+};
+
+static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-av1")
+    );
+
+static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("text/x-json,format=av1"));
+
+G_DEFINE_TYPE_WITH_CODE (GstAV12json, gst_av1_2_json,
+    GST_TYPE_ELEMENT,
+    GST_DEBUG_CATEGORY_INIT (gst_av1_2_json_debug, "av12json", 0,
+        "AV1 to json"));
+
+static void
+gst_av1_2_json_finalize (GObject * object)
+{
+  GstAV12json *self = GST_AV1_2_JSON (object);
+
+  gst_av1_parser_free (self->parser);
+  json_object_unref (self->json);
+}
+
+static gchar *
+get_string_from_json_object (JsonObject * object)
+{
+  JsonNode *root;
+  JsonGenerator *generator;
+  gchar *text;
+
+  /* Make it the root node */
+  root = json_node_init_object (json_node_alloc (), object);
+  generator = json_generator_new ();
+  json_generator_set_indent (generator, 2);
+  json_generator_set_indent_char (generator, ' ');
+  json_generator_set_pretty (generator, TRUE);
+  json_generator_set_root (generator, root);
+  text = json_generator_to_data (generator, NULL);
+
+  /* Release everything */
+  g_object_unref (generator);
+  json_node_free (root);
+  return text;
+}
+
+static void
+gst_av1_2_json_sequence_header (GstAV12json * self,
+    GstAV1SequenceHeaderOBU * seq_header)
+{
+  JsonObject *json = self->json;
+  JsonObject *hdr = json_object_new ();
+  JsonArray *operating_points;
+  JsonObject *color_config;
+  guint i;
+
+  json_object_set_int_member (hdr, "seq profile", seq_header->seq_profile);
+  json_object_set_boolean_member (hdr, "still picture",
+      seq_header->still_picture);
+  json_object_set_int_member (hdr, "reduced still picture header",
+      seq_header->reduced_still_picture_header);
+  json_object_set_int_member (hdr, "frame width bits minus 1",
+      seq_header->frame_width_bits_minus_1);
+  json_object_set_int_member (hdr, "frame height bits minus 1",
+      seq_header->frame_height_bits_minus_1);
+  json_object_set_int_member (hdr, "max frame width minus 1",
+      seq_header->max_frame_width_minus_1);
+  json_object_set_int_member (hdr, "max frame height minus 1",
+      seq_header->max_frame_height_minus_1);
+  json_object_set_boolean_member (hdr, "frame id numbers present flag",
+      seq_header->frame_id_numbers_present_flag);
+  json_object_set_int_member (hdr, "delta frame id length minus 2",
+      seq_header->delta_frame_id_length_minus_2);
+  json_object_set_int_member (hdr, "additional frame id length minus 1",
+      seq_header->additional_frame_id_length_minus_1);
+  json_object_set_boolean_member (hdr, "use 128x128 superblock",
+      seq_header->use_128x128_superblock);
+  json_object_set_boolean_member (hdr, "enable filter intra",
+      seq_header->enable_filter_intra);
+  json_object_set_boolean_member (hdr, "enable intra edge filter",
+      seq_header->enable_intra_edge_filter);
+  json_object_set_boolean_member (hdr, "enable interintra compound",
+      seq_header->enable_interintra_compound);
+  json_object_set_boolean_member (hdr, "enable masked compound",
+      seq_header->enable_masked_compound);
+  json_object_set_boolean_member (hdr, "enable warped motion",
+      seq_header->enable_warped_motion);
+  json_object_set_boolean_member (hdr, "enable order hint",
+      seq_header->enable_order_hint);
+  json_object_set_boolean_member (hdr, "enable dual filter",
+      seq_header->enable_dual_filter);
+  json_object_set_boolean_member (hdr, "enable jnt comp",
+      seq_header->enable_jnt_comp);
+  json_object_set_boolean_member (hdr, "enable ref frame mvs",
+      seq_header->enable_ref_frame_mvs);
+  json_object_set_boolean_member (hdr, "seq choose screen content tools",
+      seq_header->seq_choose_screen_content_tools);
+  json_object_set_int_member (hdr, "seq force screen content tools",
+      seq_header->seq_force_screen_content_tools);
+  json_object_set_boolean_member (hdr, "seq choose integer mv",
+      seq_header->seq_choose_integer_mv);
+  json_object_set_int_member (hdr, "seq force integer mv",
+      seq_header->seq_force_integer_mv);
+  json_object_set_int_member (hdr, "order hint bits minus 1",
+      seq_header->order_hint_bits_minus_1);
+  json_object_set_boolean_member (hdr, "enable superres",
+      seq_header->enable_superres);
+  json_object_set_boolean_member (hdr, "enable cdef", seq_header->enable_cdef);
+  json_object_set_boolean_member (hdr, "enable restoration",
+      seq_header->enable_restoration);
+  json_object_set_int_member (hdr, "film grain params present",
+      seq_header->film_grain_params_present);
+  json_object_set_int_member (hdr, "operating points cnt minus 1",
+      seq_header->operating_points_cnt_minus_1);
+
+  operating_points = json_array_new ();
+  for (i = 0; i < seq_header->operating_points_cnt_minus_1 + 1; i++) {
+    JsonObject *operating_point = json_object_new ();
+
+    json_object_set_int_member (operating_point, "seq level idx",
+        seq_header->operating_pointsi.seq_level_idx);
+    json_object_set_int_member (operating_point, "seq tier",
+        seq_header->operating_pointsi.seq_tier);
+    json_object_set_int_member (operating_point, "idc",
+        seq_header->operating_pointsi.idc);
+    json_object_set_boolean_member (operating_point,
+        "decoder model present for this op",
+        seq_header->operating_pointsi.decoder_model_present_for_this_op);
+    json_object_set_int_member (operating_point, "decoder buffer delay",
+        seq_header->operating_pointsi.decoder_buffer_delay);
+    json_object_set_int_member (operating_point, "encoder buffer delay",
+        seq_header->operating_pointsi.encoder_buffer_delay);
+    json_object_set_boolean_member (operating_point, "low delay mode flag",
+        seq_header->operating_pointsi.low_delay_mode_flag);
+    json_object_set_boolean_member (operating_point,
+        "initial display delay present for this op",
+        seq_header->
+        operating_pointsi.initial_display_delay_present_for_this_op);
+    json_object_set_int_member (operating_point,
+        "initial display delay minus 1",
+        seq_header->operating_pointsi.initial_display_delay_minus_1);
+    json_array_add_object_element (operating_points, operating_point);
+  }
+  json_object_set_array_member (hdr, "operating points", operating_points);
+
+  json_object_set_boolean_member (hdr, "decoder model info present flag",
+      seq_header->decoder_model_info_present_flag);
+  if (seq_header->decoder_model_info_present_flag) {
+    JsonObject *decoder_model_info = json_object_new ();
+
+    json_object_set_int_member (decoder_model_info,
+        "buffer delay length minus 1",
+        seq_header->decoder_model_info.buffer_delay_length_minus_1);
+    json_object_set_int_member (decoder_model_info,
+        "num units in decoding tick",
+        seq_header->decoder_model_info.num_units_in_decoding_tick);
+    json_object_set_int_member (decoder_model_info,
+        "buffer removal time length minus 1",
+        seq_header->decoder_model_info.buffer_removal_time_length_minus_1);
+    json_object_set_int_member (decoder_model_info,
+        "frame presentation time length minus 1",
+        seq_header->decoder_model_info.frame_presentation_time_length_minus_1);
+    json_object_set_object_member (hdr, "decoder model info",
+        decoder_model_info);
+  }
+
+  json_object_set_int_member (hdr, "initial display delay present flag",
+      seq_header->initial_display_delay_present_flag);
+
+  json_object_set_boolean_member (hdr, "timing info present flag",
+      seq_header->timing_info_present_flag);
+  if (seq_header->timing_info_present_flag) {
+    JsonObject *timing_info = json_object_new ();
+
+    json_object_set_int_member (timing_info, "num units in display tick",
+        seq_header->timing_info.num_units_in_display_tick);
+    json_object_set_int_member (timing_info, "time scale",
+        seq_header->timing_info.time_scale);
+    json_object_set_boolean_member (timing_info, "equal picture interval",
+        seq_header->timing_info.equal_picture_interval);
+    json_object_set_int_member (timing_info, "num ticks per picture minus 1",
+        seq_header->timing_info.num_ticks_per_picture_minus_1);
+    json_object_set_object_member (hdr, "timing info", timing_info);
+  }
+
+  color_config = json_object_new ();
+  json_object_set_boolean_member (color_config, "high bitdepth",
+      seq_header->color_config.high_bitdepth);
+  json_object_set_boolean_member (color_config, "twelve bit",
+      seq_header->color_config.twelve_bit);
+  json_object_set_boolean_member (color_config, "mono chrome",
+      seq_header->color_config.mono_chrome);
+  json_object_set_boolean_member (color_config,
+      "color description present flag",
+      seq_header->color_config.color_description_present_flag);
+  json_object_set_int_member (color_config, "color primaries",
+      seq_header->color_config.color_primaries);
+  json_object_set_int_member (color_config, "transfer characteristics",
+      seq_header->color_config.transfer_characteristics);
+  json_object_set_int_member (color_config, "matrix coefficients",
+      seq_header->color_config.matrix_coefficients);
+  json_object_set_boolean_member (color_config, "color range",
+      seq_header->color_config.color_range);
+  json_object_set_int_member (color_config, "subsampling x",
+      seq_header->color_config.subsampling_x);
+  json_object_set_int_member (color_config, "subsampling y",
+      seq_header->color_config.subsampling_y);
+  json_object_set_int_member (color_config, "chroma sample position",
+      seq_header->color_config.chroma_sample_position);
+  json_object_set_boolean_member (color_config, "separate uv delta q",
+      seq_header->color_config.separate_uv_delta_q);
+  json_object_set_object_member (hdr, "color config", color_config);
+
+  json_object_set_int_member (hdr, "order hint bits",
+      seq_header->order_hint_bits);
+  json_object_set_int_member (hdr, "bit depth", seq_header->bit_depth);
+  json_object_set_int_member (hdr, "num planes", seq_header->num_planes);
+
+  json_object_set_object_member (json, "sequence header", hdr);
+}
+
+static void
+gst_av1_2_json_frame_header (GstAV12json * self,
+    GstAV1FrameHeaderOBU * frame_header)
+{
+  JsonObject *json = self->json;
+  JsonArray *buffer_removal_time, *ref_order_hint, *ref_frame_idx,
+      *loop_filter_level, *loop_filter_ref_deltas, *loop_filter_mode_deltas,
+      *feature_enabled, *feature_data, *width_in_sbs_minus_1,
+      *height_in_sbs_minus_1, *mi_col_starts, *mi_row_starts,
+      *cdef_y_pri_strength, *cdef_y_sec_strength, *cdef_uv_pri_strength,
+      *cdef_uv_sec_strength, *frame_restoration_type, *loop_restoration_size,
+      *is_global, *is_rot_zoom, *is_translation, *gm_params, *gm_type, *invalid,
+      *point_y_value, *point_y_scaling, *point_cb_value, *point_cb_scaling,
+      *point_cr_value, *point_cr_scaling, *ar_coeffs_y_plus_128,
+      *ar_coeffs_cb_plus_128, *ar_coeffs_cr_plus_128, *order_hints,
+      *ref_frame_sign_bias, *lossless_array, *seg_qm_level, *skip_mode_frame;
+  JsonObject *hdr = json_object_new ();
+  JsonObject *loop_filter_params, *quantization_params, *segmentation_params,
+      *tile_info, *cdef_params, *loop_restoration_params, *global_motion_params,
+      *film_grain_params;
+  guint i, j;
+
+  json_object_set_boolean_member (hdr, "show existing frame",
+      frame_header->show_existing_frame);
+  json_object_set_int_member (hdr, "frame to show map idx",
+      frame_header->frame_to_show_map_idx);
+  json_object_set_int_member (hdr, "frame presentation time",
+      frame_header->frame_presentation_time);
+  json_object_set_int_member (hdr, "tu presentation delay",
+      frame_header->tu_presentation_delay);
+  json_object_set_int_member (hdr, "display frame id",
+      frame_header->display_frame_id);
+  switch (frame_header->frame_type) {
+    case GST_AV1_KEY_FRAME:
+      json_object_set_string_member (hdr, "frame type", "key frame");
+      break;
+    case GST_AV1_INTER_FRAME:
+      json_object_set_string_member (hdr, "frame type", "inter frame");
+      break;
+    case GST_AV1_INTRA_ONLY_FRAME:
+      json_object_set_string_member (hdr, "frame type", "intra only frame");
+      break;
+    case GST_AV1_SWITCH_FRAME:
+      json_object_set_string_member (hdr, "frame type", "switch frame");
+      break;
+  }
+  json_object_set_boolean_member (hdr, "show frame", frame_header->show_frame);
+  json_object_set_boolean_member (hdr, "showable frame",
+      frame_header->showable_frame);
+  json_object_set_boolean_member (hdr, "error resilient mode",
+      frame_header->error_resilient_mode);
+  json_object_set_boolean_member (hdr, "disable cdf update",
+      frame_header->disable_cdf_update);
+  json_object_set_int_member (hdr, "allow screen content tools",
+      frame_header->allow_screen_content_tools);
+  json_object_set_boolean_member (hdr, "force integer_mv",
+      frame_header->force_integer_mv);
+  json_object_set_int_member (hdr, "current frame id",
+      frame_header->current_frame_id);
+  json_object_set_boolean_member (hdr, "frame size override flag",
+      frame_header->frame_size_override_flag);
+  json_object_set_int_member (hdr, "order hint", frame_header->order_hint);
+  json_object_set_int_member (hdr, "primary ref_frame",
+      frame_header->primary_ref_frame);
+  json_object_set_boolean_member (hdr, "buffer removal time present flag",
+      frame_header->buffer_removal_time_present_flag);
+
+  buffer_removal_time = json_array_new ();
+  for (i = 0; i < GST_AV1_MAX_OPERATING_POINTS; i++)
+    json_array_add_int_element (buffer_removal_time,
+        frame_header->buffer_removal_timei);
+  json_object_set_array_member (hdr, "buffer removal time",
+      buffer_removal_time);
+
+  json_object_set_int_member (hdr, "refresh frame flags",
+      frame_header->refresh_frame_flags);
+
+  ref_order_hint = json_array_new ();
+  for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++)
+    json_array_add_int_element (ref_order_hint,
+        frame_header->ref_order_hinti);
+  json_object_set_array_member (hdr, "ref order hint", ref_order_hint);
+
+  json_object_set_boolean_member (hdr, "allow intrabc",
+      frame_header->allow_intrabc);
+  json_object_set_boolean_member (hdr, "frame refs short signaling",
+      frame_header->frame_refs_short_signaling);
+  json_object_set_int_member (hdr, "last frame idx",
+      frame_header->last_frame_idx);
+  json_object_set_int_member (hdr, "gold frame idx",
+      frame_header->gold_frame_idx);
+
+  ref_frame_idx = json_array_new ();
+  for (i = 0; i < GST_AV1_REFS_PER_FRAME; i++)
+    json_array_add_int_element (ref_frame_idx, frame_header->ref_frame_idxi);
+  json_object_set_array_member (hdr, "ref frame idx", ref_frame_idx);
+
+  json_object_set_boolean_member (hdr, "allow high precision mv",
+      frame_header->allow_high_precision_mv);
+  json_object_set_boolean_member (hdr, "is motion mode switchable",
+      frame_header->is_motion_mode_switchable);
+  json_object_set_boolean_member (hdr, "use ref frame mvs",
+      frame_header->use_ref_frame_mvs);
+  json_object_set_boolean_member (hdr, "disable frame end update cdf",
+      frame_header->disable_frame_end_update_cdf);
+  json_object_set_boolean_member (hdr, "allow warped motion",
+      frame_header->allow_warped_motion);
+  json_object_set_boolean_member (hdr, "reduced tx set",
+      frame_header->reduced_tx_set);
+  json_object_set_boolean_member (hdr, "render and frame size different",
+      frame_header->render_and_frame_size_different);
+  json_object_set_boolean_member (hdr, "use superres",
+      frame_header->use_superres);
+  json_object_set_boolean_member (hdr, "is filter switchable",
+      frame_header->is_filter_switchable);
+  json_object_set_int_member (hdr, "interpolation filter",
+      frame_header->interpolation_filter);
+
+  loop_filter_params = json_object_new ();
+  loop_filter_level = json_array_new ();
+  for (i = 0; i < 4; i++)
+    json_array_add_int_element (loop_filter_level,
+        frame_header->loop_filter_params.loop_filter_leveli);
+  json_object_set_array_member (loop_filter_params, "loop filter level",
+      loop_filter_level);
+  json_object_set_int_member (loop_filter_params, "loop filter sharpness",
+      frame_header->loop_filter_params.loop_filter_sharpness);
+  json_object_set_boolean_member (loop_filter_params,
+      "loop filter delta enabled",
+      frame_header->loop_filter_params.loop_filter_delta_enabled);
+  json_object_set_boolean_member (loop_filter_params,
+      "loop filter delta update",
+      frame_header->loop_filter_params.loop_filter_delta_update);
+
+  loop_filter_ref_deltas = json_array_new ();
+  for (i = 0; i < GST_AV1_TOTAL_REFS_PER_FRAME; i++)
+    json_array_add_int_element (loop_filter_ref_deltas,
+        frame_header->loop_filter_params.loop_filter_ref_deltasi);
+  json_object_set_array_member (loop_filter_params, "loop filter ref deltas",
+      loop_filter_ref_deltas);
+
+  loop_filter_mode_deltas = json_array_new ();
+  for (i = 0; i < 2; i++)
+    json_array_add_int_element (loop_filter_mode_deltas,
+        frame_header->loop_filter_params.loop_filter_mode_deltasi);
+  json_object_set_array_member (loop_filter_params, "loop filter mode deltas",
+      loop_filter_mode_deltas);
+  json_object_set_boolean_member (loop_filter_params, "delta lf present",
+      frame_header->loop_filter_params.delta_lf_present);
+  json_object_set_int_member (loop_filter_params, "delta lf res",
+      frame_header->loop_filter_params.delta_lf_res);
+  json_object_set_int_member (loop_filter_params, "delta lf multi",
+      frame_header->loop_filter_params.delta_lf_multi);
+  json_object_set_object_member (hdr, "loop filter params", loop_filter_params);
+
+  quantization_params = json_object_new ();
+  json_object_set_int_member (quantization_params, "base q idx",
+      frame_header->quantization_params.base_q_idx);
+  json_object_set_boolean_member (quantization_params, "diff uv delta",
+      frame_header->quantization_params.diff_uv_delta);
+  json_object_set_boolean_member (quantization_params, "using qmatrix",
+      frame_header->quantization_params.using_qmatrix);
+  json_object_set_int_member (quantization_params, "qm y",
+      frame_header->quantization_params.qm_y);
+  json_object_set_int_member (quantization_params, "qm u",
+      frame_header->quantization_params.qm_u);
+  json_object_set_int_member (quantization_params, "qm v",
+      frame_header->quantization_params.qm_v);
+  json_object_set_boolean_member (quantization_params, "delta q present",
+      frame_header->quantization_params.delta_q_present);
+  json_object_set_int_member (quantization_params, "delta q res",
+      frame_header->quantization_params.delta_q_res);
+  json_object_set_int_member (quantization_params, "delta q y dc",
+      frame_header->quantization_params.delta_q_y_dc);
+  json_object_set_int_member (quantization_params, "delta q u dc",
+      frame_header->quantization_params.delta_q_u_dc);
+  json_object_set_int_member (quantization_params, "delta q u ac",
+      frame_header->quantization_params.delta_q_u_ac);
+  json_object_set_int_member (quantization_params, "delta q v dc",
+      frame_header->quantization_params.delta_q_v_dc);
+  json_object_set_int_member (quantization_params, "delta q v ac",
+      frame_header->quantization_params.delta_q_v_ac);
+  json_object_set_object_member (hdr, "quantization params",
+      quantization_params);
+
+  segmentation_params = json_object_new ();
+  json_object_set_boolean_member (segmentation_params, "segmentation enabled",
+      frame_header->segmentation_params.segmentation_enabled);
+  json_object_set_int_member (segmentation_params, "segmentation update map",
+      frame_header->segmentation_params.segmentation_update_map);
+  json_object_set_int_member (segmentation_params,
+      "segmentation temporal update",
+      frame_header->segmentation_params.segmentation_temporal_update);
+  json_object_set_int_member (segmentation_params, "segmentation update data",
+      frame_header->segmentation_params.segmentation_update_data);
+  feature_enabled = json_array_new ();
+  feature_data = json_array_new ();
+  for (i = 0; i < GST_AV1_MAX_SEGMENTS; i++) {
+    for (j = 0; j < GST_AV1_SEG_LVL_MAX; j++) {
+      json_array_add_int_element (feature_enabled,
+          frame_header->segmentation_params.feature_enabledij);
+      json_array_add_int_element (feature_data,
+          frame_header->segmentation_params.feature_dataij);
+    }
+  }
+  json_object_set_array_member (segmentation_params, "feature enabled",
+      feature_enabled);
+  json_object_set_array_member (segmentation_params, "feature data",
+      feature_data);
+  json_object_set_int_member (segmentation_params, "seg id pre skip",
+      frame_header->segmentation_params.seg_id_pre_skip);
+  json_object_set_int_member (segmentation_params, "last active seg id",
+      frame_header->segmentation_params.last_active_seg_id);
+  json_object_set_object_member (hdr, "segmentation params",
+      segmentation_params);
+
+  tile_info = json_object_new ();
+  json_object_set_int_member (tile_info, "uniform tile spacing flag",
+      frame_header->tile_info.uniform_tile_spacing_flag);
+  json_object_set_int_member (tile_info, "increment tile rows log2",
+      frame_header->tile_info.increment_tile_rows_log2);
+  width_in_sbs_minus_1 = json_array_new ();
+  height_in_sbs_minus_1 = json_array_new ();
+  for (i = 0; i < GST_AV1_MAX_TILE_COLS; i++) {
+    json_array_add_int_element (width_in_sbs_minus_1,
+        frame_header->tile_info.width_in_sbs_minus_1i);
+    json_array_add_int_element (height_in_sbs_minus_1,
+        frame_header->tile_info.height_in_sbs_minus_1i);
+  }
+  json_object_set_array_member (tile_info, "width in sbs minus 1",
+      width_in_sbs_minus_1);
+  json_object_set_array_member (tile_info, "height in sbs minus 1",
+      height_in_sbs_minus_1);
+  json_object_set_int_member (tile_info, "tile size bytes minus 1",
+      frame_header->tile_info.tile_size_bytes_minus_1);
+  json_object_set_int_member (tile_info, "context update tile id",
+      frame_header->tile_info.context_update_tile_id);
+  mi_col_starts = json_array_new ();
+  mi_row_starts = json_array_new ();
+  for (i = 0; i < GST_AV1_MAX_TILE_COLS + 1; i++) {
+    json_array_add_int_element (mi_col_starts,
+        frame_header->tile_info.mi_col_startsi);
+    json_array_add_int_element (mi_row_starts,
+        frame_header->tile_info.mi_row_startsi);
+  }
+  json_object_set_array_member (tile_info, "mi col starts", mi_col_starts);
+  json_object_set_array_member (tile_info, "mi row starts", mi_row_starts);
+  json_object_set_int_member (tile_info, "tile cols log2",
+      frame_header->tile_info.tile_cols_log2);
+  json_object_set_int_member (tile_info, "tile cols",
+      frame_header->tile_info.tile_cols);
+  json_object_set_int_member (tile_info, "tile rows log2",
+      frame_header->tile_info.tile_rows_log2);
+  json_object_set_int_member (tile_info, "tile rows",
+      frame_header->tile_info.tile_rows);
+  json_object_set_int_member (tile_info, "tile size bytes",
+      frame_header->tile_info.tile_size_bytes);
+  json_object_set_object_member (hdr, "tile_info", tile_info);
+
+  cdef_params = json_object_new ();
+  json_object_set_int_member (cdef_params, "cdef damping",
+      frame_header->cdef_params.cdef_damping);
+  json_object_set_int_member (cdef_params, "cdef bits",
+      frame_header->cdef_params.cdef_bits);
+  cdef_y_pri_strength = json_array_new ();
+  cdef_y_sec_strength = json_array_new ();
+  cdef_uv_pri_strength = json_array_new ();
+  cdef_uv_sec_strength = json_array_new ();
+  for (i = 0; i < GST_AV1_CDEF_MAX; i++) {
+    json_array_add_int_element (cdef_y_pri_strength,
+        frame_header->cdef_params.cdef_y_pri_strengthi);
+    json_array_add_int_element (cdef_y_sec_strength,
+        frame_header->cdef_params.cdef_y_sec_strengthi);
+    json_array_add_int_element (cdef_uv_pri_strength,
+        frame_header->cdef_params.cdef_uv_pri_strengthi);
+    json_array_add_int_element (cdef_uv_sec_strength,
+        frame_header->cdef_params.cdef_uv_sec_strengthi);
+  }
+  json_object_set_array_member (cdef_params, "cdef y pri strength",
+      cdef_y_pri_strength);
+  json_object_set_array_member (cdef_params, "cdef y sec strength",
+      cdef_y_sec_strength);
+  json_object_set_array_member (cdef_params, "cdef uv pri_strength",
+      cdef_uv_pri_strength);
+  json_object_set_array_member (cdef_params, "cdef uv sec_strength",
+      cdef_uv_sec_strength);
+  json_object_set_object_member (hdr, "cdef params", cdef_params);
+
+  loop_restoration_params = json_object_new ();
+  json_object_set_int_member (loop_restoration_params, "lr unit shift",
+      frame_header->loop_restoration_params.lr_unit_shift);
+  json_object_set_int_member (loop_restoration_params, "lr uv shift",
+      frame_header->loop_restoration_params.lr_uv_shift);
+  frame_restoration_type = json_array_new ();
+  loop_restoration_size = json_array_new ();
+  for (i = 0; i < GST_AV1_MAX_NUM_PLANES; i++) {
+    json_array_add_int_element (frame_restoration_type,
+        frame_header->loop_restoration_params.frame_restoration_typei);
+    json_array_add_int_element (loop_restoration_size,
+        frame_header->loop_restoration_params.loop_restoration_sizei);
+  }
+  json_object_set_array_member (loop_restoration_params,
+      "frame restoration type", frame_restoration_type);
+  json_object_set_array_member (loop_restoration_params,
+      "loop restoration size", loop_restoration_size);
+  json_object_set_int_member (loop_restoration_params, "uses lr",
+      frame_header->loop_restoration_params.uses_lr);
+  json_object_set_object_member (hdr, "loop restoration params",
+      loop_restoration_params);
+
+  json_object_set_boolean_member (hdr, "tx mode select",
+      frame_header->tx_mode_select);
+  json_object_set_boolean_member (hdr, "skip mode present",
+      frame_header->skip_mode_present);
+  json_object_set_boolean_member (hdr, "reference select",
+      frame_header->reference_select);
+
+  global_motion_params = json_object_new ();
+  is_global = json_array_new ();
+  is_rot_zoom = json_array_new ();
+  is_translation = json_array_new ();
+  gm_params = json_array_new ();
+  gm_type = json_array_new ();
+  invalid = json_array_new ();
+  for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
+    json_array_add_boolean_element (is_global,
+        frame_header->global_motion_params.is_globali);
+    json_array_add_boolean_element (is_rot_zoom,
+        frame_header->global_motion_params.is_rot_zoomi);
+    json_array_add_boolean_element (is_translation,
+        frame_header->global_motion_params.is_translationi);
+    for (j = 0; j < 6; j++)
+      json_array_add_int_element (gm_params,
+          frame_header->global_motion_params.gm_paramsij);
+    json_array_add_int_element (gm_type,
+        frame_header->global_motion_params.gm_typei);
+    json_array_add_boolean_element (invalid,
+        frame_header->global_motion_params.invalidi);
+  }
+  json_object_set_array_member (global_motion_params, "is global", is_global);
+  json_object_set_array_member (global_motion_params, "is rot zoom",
+      is_rot_zoom);
+  json_object_set_array_member (global_motion_params, "is translation",
+      is_translation);
+  json_object_set_array_member (global_motion_params, "gm params", gm_params);
+  json_object_set_array_member (global_motion_params, "gm type", gm_type);
+  json_object_set_array_member (global_motion_params, "invalid", invalid);
+  json_object_set_object_member (hdr, "global motion params",
+      global_motion_params);
+
+  film_grain_params = json_object_new ();
+  json_object_set_boolean_member (film_grain_params, "apply grain",
+      frame_header->film_grain_params.apply_grain);
+  json_object_set_int_member (film_grain_params, "grain seed",
+      frame_header->film_grain_params.grain_seed);
+  json_object_set_boolean_member (film_grain_params, "update grain",
+      frame_header->film_grain_params.update_grain);
+  json_object_set_int_member (film_grain_params, "film grain params ref idx",
+      frame_header->film_grain_params.film_grain_params_ref_idx);
+  json_object_set_int_member (film_grain_params, "num y points",
+      frame_header->film_grain_params.num_y_points);
+  point_y_value = json_array_new ();
+  point_y_scaling = json_array_new ();
+  for (i = 0; i < GST_AV1_MAX_NUM_Y_POINTS; i++) {
+    json_array_add_int_element (point_y_value,
+        frame_header->film_grain_params.point_y_valuei);
+    json_array_add_int_element (point_y_scaling,
+        frame_header->film_grain_params.point_y_scalingi);
+  }
+  json_object_set_array_member (film_grain_params, "point y value",
+      point_y_value);
+  json_object_set_array_member (film_grain_params, "point y scaling",
+      point_y_scaling);
+  json_object_set_int_member (film_grain_params, "chroma scaling from luma",
+      frame_header->film_grain_params.chroma_scaling_from_luma);
+  json_object_set_int_member (film_grain_params, "num cb points",
+      frame_header->film_grain_params.num_cb_points);
+  point_cb_value = json_array_new ();
+  point_cb_scaling = json_array_new ();
+  for (i = 0; i < GST_AV1_MAX_NUM_CB_POINTS; i++) {
+    json_array_add_int_element (point_cb_value,
+        frame_header->film_grain_params.point_cb_valuei);
+    json_array_add_int_element (point_cb_scaling,
+        frame_header->film_grain_params.point_cb_scalingi);
+  }
+  json_object_set_array_member (film_grain_params, "point cb value",
+      point_cb_value);
+  json_object_set_array_member (film_grain_params, "point cb scaling",
+      point_cb_scaling);
+  json_object_set_int_member (film_grain_params, "num cr points",
+      frame_header->film_grain_params.num_cr_points);
+  point_cr_value = json_array_new ();
+  point_cr_scaling = json_array_new ();
+  for (i = 0; i < GST_AV1_MAX_NUM_CR_POINTS; i++) {
+    json_array_add_int_element (point_cr_value,
+        frame_header->film_grain_params.point_cr_valuei);
+    json_array_add_int_element (point_cr_scaling,
+        frame_header->film_grain_params.point_cr_scalingi);
+  }
+  json_object_set_array_member (film_grain_params, "point cr value",
+      point_cr_value);
+  json_object_set_array_member (film_grain_params, "point cr scaling",
+      point_cr_scaling);
+  json_object_set_int_member (film_grain_params, "grain scaling minus 8",
+      frame_header->film_grain_params.grain_scaling_minus_8);
+  json_object_set_int_member (film_grain_params, "ar coeff lag",
+      frame_header->film_grain_params.ar_coeff_lag);
+  ar_coeffs_y_plus_128 = json_array_new ();
+  ar_coeffs_cb_plus_128 = json_array_new ();
+  ar_coeffs_cr_plus_128 = json_array_new ();
+  for (i = 0; i < GST_AV1_MAX_NUM_POS_LUMA; i++) {
+    json_array_add_int_element (ar_coeffs_y_plus_128,
+        frame_header->film_grain_params.ar_coeffs_y_plus_128i);
+    json_array_add_int_element (ar_coeffs_cb_plus_128,
+        frame_header->film_grain_params.ar_coeffs_cb_plus_128i);
+    json_array_add_int_element (ar_coeffs_cr_plus_128,
+        frame_header->film_grain_params.ar_coeffs_cr_plus_128i);
+  }
+  json_object_set_array_member (film_grain_params, "ar coeffs y plus 128",
+      ar_coeffs_y_plus_128);
+  json_object_set_array_member (film_grain_params, "ar coeffs cb plus 128",
+      ar_coeffs_cb_plus_128);
+  json_object_set_array_member (film_grain_params, "ar coeffs cr plus 128",
+      ar_coeffs_cr_plus_128);
+  json_object_set_int_member (film_grain_params, "ar coeff shift minus 6",
+      frame_header->film_grain_params.ar_coeff_shift_minus_6);
+  json_object_set_int_member (film_grain_params, "grain scale shift",
+      frame_header->film_grain_params.grain_scale_shift);
+  json_object_set_int_member (film_grain_params, "cb mult",
+      frame_header->film_grain_params.cb_mult);
+  json_object_set_int_member (film_grain_params, "cb luma mult",
+      frame_header->film_grain_params.cb_luma_mult);
+  json_object_set_int_member (film_grain_params, "cb offset",
+      frame_header->film_grain_params.cb_offset);
+  json_object_set_int_member (film_grain_params, "cr mult",
+      frame_header->film_grain_params.cr_mult);
+  json_object_set_int_member (film_grain_params, "cr luma mult",
+      frame_header->film_grain_params.cr_luma_mult);
+  json_object_set_int_member (film_grain_params, "cr offset",
+      frame_header->film_grain_params.cr_offset);
+  json_object_set_boolean_member (film_grain_params, "overlap flag",
+      frame_header->film_grain_params.overlap_flag);
+  json_object_set_boolean_member (film_grain_params, "clip to restricted range",
+      frame_header->film_grain_params.clip_to_restricted_range);
+  json_object_set_object_member (hdr, "film grain params", film_grain_params);
+
+  json_object_set_int_member (hdr, "superres denom",
+      frame_header->superres_denom);
+  json_object_set_int_member (hdr, "frame is intra",
+      frame_header->frame_is_intra);
+
+  order_hints = json_array_new ();
+  ref_frame_sign_bias = json_array_new ();
+  for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
+    json_array_add_int_element (order_hints, frame_header->order_hintsi);
+    json_array_add_int_element (ref_frame_sign_bias,
+        frame_header->ref_frame_sign_biasi);
+  }
+  json_object_set_array_member (hdr, "order hints", order_hints);
+  json_object_set_array_member (hdr, "ref frame sign bias",
+      ref_frame_sign_bias);
+
+  json_object_set_int_member (hdr, "coded lossless",
+      frame_header->coded_lossless);
+  json_object_set_int_member (hdr, "all lossless", frame_header->all_lossless);
+
+  lossless_array = json_array_new ();
+  for (i = 0; i < GST_AV1_MAX_SEGMENTS; i++)
+    json_array_add_int_element (lossless_array,
+        frame_header->lossless_arrayi);
+  json_object_set_array_member (hdr, "lossless array", lossless_array);
+
+  seg_qm_level = json_array_new ();
+  for (i = 0; i < 3; i++)
+    for (j = 0; j < GST_AV1_MAX_SEGMENTS; j++)
+      json_array_add_int_element (seg_qm_level,
+          frame_header->seg_qm_Levelij);
+  json_object_set_array_member (hdr, "seg qm level", seg_qm_level);
+
+  json_object_set_int_member (hdr, "upscaled width",
+      frame_header->upscaled_width);
+  json_object_set_int_member (hdr, "frame width", frame_header->frame_width);
+  json_object_set_int_member (hdr, "frame height", frame_header->frame_height);
+  json_object_set_int_member (hdr, "render width", frame_header->render_width);
+  json_object_set_int_member (hdr, "render height",
+      frame_header->render_height);
+  json_object_set_int_member (hdr, "tx mode", frame_header->tx_mode);
+
+  skip_mode_frame = json_array_new ();
+  json_array_add_int_element (skip_mode_frame,
+      frame_header->skip_mode_frame0);
+  json_array_add_int_element (skip_mode_frame,
+      frame_header->skip_mode_frame1);
+  json_object_set_array_member (hdr, "skip mode frame", skip_mode_frame);
+
+  json_object_set_object_member (json, "frame header", hdr);
+}
+
+static GstAV1ParserResult
+gst_av1_2_json_handle_one_obu (GstAV12json * self, GstAV1OBU * obu)
+{
+  GstAV1ParserResult pres = GST_AV1_PARSER_OK;
+  GstAV1FrameHeaderOBU frame_header;
+  GstAV1FrameOBU frame;
+
+  switch (obu->obu_type) {
+    case GST_AV1_OBU_TEMPORAL_DELIMITER:
+      pres = gst_av1_parser_parse_temporal_delimiter_obu (self->parser, obu);
+      break;
+
+    case GST_AV1_OBU_SEQUENCE_HEADER:
+    {
+      GstAV1SequenceHeaderOBU seq_header;
+
+      pres = gst_av1_parser_parse_sequence_header_obu (self->parser,
+          obu, &seq_header);
+
+      if (pres == GST_AV1_PARSER_OK)
+        gst_av1_2_json_sequence_header (self, &seq_header);
+      break;
+    }
+
+    case GST_AV1_OBU_REDUNDANT_FRAME_HEADER:
+    case GST_AV1_OBU_FRAME_HEADER:
+      pres = gst_av1_parser_parse_frame_header_obu (self->parser, obu,
+          &frame_header);
+      if (pres == GST_AV1_PARSER_OK)
+        gst_av1_2_json_frame_header (self, &frame_header);
+      break;
+
+    case GST_AV1_OBU_FRAME:
+      pres = gst_av1_parser_parse_frame_obu (self->parser, obu, &frame);
+
+      if (pres == GST_AV1_PARSER_OK)
+        gst_av1_2_json_frame_header (self, &frame.frame_header);
+      break;
+
+    case GST_AV1_OBU_METADATA:
+    {
+      GstAV1MetadataOBU metadata;
+
+      pres = gst_av1_parser_parse_metadata_obu (self->parser, obu, &metadata);
+      break;
+    }
+
+    case GST_AV1_OBU_TILE_GROUP:
+    {
+      GstAV1TileGroupOBU tile_group;
+
+      pres =
+          gst_av1_parser_parse_tile_group_obu (self->parser, obu, &tile_group);
+      break;
+    }
+
+    case GST_AV1_OBU_TILE_LIST:
+    {
+      GstAV1TileListOBU tile_list;
+
+      pres = gst_av1_parser_parse_tile_list_obu (self->parser, obu, &tile_list);
+      break;
+    }
+
+    case GST_AV1_OBU_PADDING:
+      break;
+    default:
+      GST_WARNING_OBJECT (self, "an unrecognized obu type %d", obu->obu_type);
+      pres = GST_AV1_PARSER_BITSTREAM_ERROR;
+      break;
+  }
+
+  if (obu->obu_type == GST_AV1_OBU_FRAME_HEADER
+      || obu->obu_type == GST_AV1_OBU_FRAME
+      || obu->obu_type == GST_AV1_OBU_REDUNDANT_FRAME_HEADER) {
+    GstAV1FrameHeaderOBU *fh = &frame_header;
+
+    if (obu->obu_type == GST_AV1_OBU_FRAME)
+      fh = &frame.frame_header;
+
+    if (!fh->show_existing_frame || fh->frame_type == GST_AV1_KEY_FRAME)
+      pres = gst_av1_parser_reference_frame_update (self->parser, fh);
+  }
+
+  return pres;
+}
+
+static GstFlowReturn
+gst_av1_2_json_chain (GstPad * sinkpad, GstObject * object, GstBuffer * in_buf)
+{
+  GstAV12json *self = GST_AV1_2_JSON (object);
+  JsonObject *json = self->json;
+  GstAV1ParserResult pres;
+  GstAV1OBU obu;
+  GstBuffer *out_buf;
+  gchar *json_string;
+  guint32 offset = 0, consumed;
+  guint length;
+  GstMapInfo in_map, out_map;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  if (!gst_buffer_map (in_buf, &in_map, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (self, "Cannot map buffer");
+    return GST_FLOW_ERROR;
+  }
+
+  while (offset < in_map.size) {
+    pres =
+        gst_av1_parser_identify_one_obu (self->parser, in_map.data + offset,
+        in_map.size - offset, &obu, &consumed);
+
+    if (pres != GST_AV1_PARSER_OK) {
+      GST_WARNING_OBJECT (self, "Cannot get OBU");
+      ret = GST_FLOW_ERROR;
+      goto unmap;
+    }
+
+    pres = gst_av1_2_json_handle_one_obu (self, &obu);
+    if (pres != GST_AV1_PARSER_OK) {
+      GST_WARNING_OBJECT (self, "Cannot parse frame header");
+      ret = GST_FLOW_ERROR;
+      goto unmap;
+    }
+    offset += consumed;
+  }
+
+  json_string = get_string_from_json_object (json);
+  length = strlen (json_string);
+  out_buf = gst_buffer_new_allocate (NULL, length, NULL);
+  gst_buffer_map (out_buf, &out_map, GST_MAP_WRITE);
+  if (length)
+    memcpy (&out_map.data0, json_string, length);
+  gst_buffer_unmap (out_buf, &out_map);
+
+  g_free (json_string);
+
+  gst_buffer_copy_into (out_buf, in_buf,
+      GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS |
+      GST_BUFFER_COPY_METADATA, 0, -1);
+  ret = gst_pad_push (self->srcpad, out_buf);
+
+unmap:
+  switch (pres) {
+    case GST_AV1_PARSER_BITSTREAM_ERROR:
+    case GST_AV1_PARSER_MISSING_OBU_REFERENCE:
+    case GST_AV1_PARSER_NO_MORE_DATA:
+      if (self->use_annex_b)
+        gst_av1_parser_reset_annex_b (self->parser);
+      break;
+    default:
+      break;
+  }
+  gst_buffer_unmap (in_buf, &in_map);
+  gst_buffer_unref (in_buf);
+
+  return ret;
+}
+
+static void
+gst_av1_2_json_use_annexb (GstAV12json * self, GstCaps * caps)
+{
+  if (caps && gst_caps_get_size (caps) > 0) {
+    GstStructure *s = gst_caps_get_structure (caps, 0);
+    const gchar *str_align = NULL;
+    const gchar *str_stream = NULL;
+
+    str_align = gst_structure_get_string (s, "alignment");
+    str_stream = gst_structure_get_string (s, "stream-format");
+
+    self->use_annex_b = FALSE;
+    if (str_stream && g_strcmp0 (str_stream, "annexb") == 0)
+      if (str_align && g_strcmp0 (str_align, "tu") == 0) {
+        self->use_annex_b = TRUE;
+        return;
+      }
+  }
+
+  gst_av1_parser_reset (self->parser, self->use_annex_b);
+}
+
+
+static gboolean
+gst_av1_2_json_set_caps (GstAV12json * self, GstCaps * caps)
+{
+  GstCaps *src_caps =
+      gst_caps_new_simple ("text/x-json", "format", G_TYPE_STRING, "av1", NULL);
+  GstEvent *event;
+
+  event = gst_event_new_caps (src_caps);
+  gst_caps_unref (src_caps);
+
+  gst_av1_2_json_use_annexb (self, caps);
+
+  return gst_pad_push_event (self->srcpad, event);
+}
+
+static gboolean
+gst_av1_2_json_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+{
+  GstAV12json *self = GST_AV1_2_JSON (parent);
+  gboolean res = TRUE;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CAPS:
+    {
+      GstCaps *caps;
+
+      gst_event_parse_caps (event, &caps);
+      res = gst_av1_2_json_set_caps (self, caps);
+      gst_event_unref (event);
+      break;
+    }
+    default:
+      res = gst_pad_event_default (pad, parent, event);
+      break;
+  }
+
+  return res;
+}
+
+static void
+gst_av1_2_json_class_init (GstAV12jsonClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
+
+  gobject_class->finalize = gst_av1_2_json_finalize;
+
+  gst_element_class_add_static_pad_template (gstelement_class, &src_factory);
+  gst_element_class_add_static_pad_template (gstelement_class, &sink_factory);
+
+  gst_element_class_set_static_metadata (gstelement_class, "Av12json",
+      "Transform",
+      "AV1 to json element",
+      "Benjamin Gaignard <benjamin.gaignard@collabora.com>");
+}
+
+static void
+gst_av1_2_json_init (GstAV12json * self)
+{
+  self->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
+  gst_pad_set_chain_function (self->sinkpad, gst_av1_2_json_chain);
+  gst_element_add_pad (GST_ELEMENT (self), self->sinkpad);
+  gst_pad_set_event_function (self->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_av1_2_json_sink_event));
+
+  self->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
+  gst_element_add_pad (GST_ELEMENT (self), self->srcpad);
+
+  self->json = json_object_new ();
+
+  self->parser = gst_av1_parser_new ();
+  gst_av1_parser_reset (self->parser, FALSE);
+}

gst-plugins-bad-1.24.5.tar.xz/ext/codec2json/gstav12json.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2023 Benjamin Gaignard <benjamin.gaignard@collabora.Com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_AV1_2_JSON_H__
+#define __GST_AV1_2_JSON_H__
+
+#include <gst/codecparsers/gstav1parser.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_AV1_2_JSON (gst_av1_2_json_get_type())
+G_DECLARE_FINAL_TYPE (GstAV12json,
+    gst_av1_2_json, GST, AV1_2_JSON, GstElement);
+
+G_END_DECLS
+
+#endif /* __GST_AV1_2_TXT_H__ */

gst-plugins-bad-1.24.5.tar.xz/ext/codec2json/gsth2642json.c Added

@@ -0,0 +1,1107 @@
+/*
+ * gsth2642json.c - H.264 parsed bistream to json
+ *
+ * Copyright (C) 2023 Collabora
+ *   Author: Benjamin Gaignard <benjamin.gaignard@collabora.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-h2642json
+ * @title: h2642json
+ *
+ * Convert H.264 bitstream parameters to JSON formated text.
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/h.264/file ! parsebin ! h2642json ! filesink location=/path/to/json/file
+ * ```
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gst/base/base.h>
+#include <json-glib/json-glib.h>
+
+#include "gsth2642json.h"
+
+GST_DEBUG_CATEGORY (gst_h264_2_json_debug);
+#define GST_CAT_DEFAULT gst_h264_2_json_debug
+
+struct _GstH2642json
+{
+  GstElement parent;
+
+  GstPad *sinkpad, *srcpad;
+  GstH264NalParser *parser;
+
+  guint nal_length_size;
+
+  gboolean use_avc;
+
+  JsonObject *json;
+};
+
+static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-h264")
+    );
+
+static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("text/x-json,format=h264"));
+
+G_DEFINE_TYPE_WITH_CODE (GstH2642json, gst_h264_2_json,
+    GST_TYPE_ELEMENT,
+    GST_DEBUG_CATEGORY_INIT (gst_h264_2_json_debug, "h2642json", 0,
+        "H.264 to json"));
+
+static void
+gst_h264_2_json_finalize (GObject * object)
+{
+  GstH2642json *self = GST_H264_2_JSON (object);
+
+  json_object_unref (self->json);
+  gst_h264_nal_parser_free (self->parser);
+}
+
+static gchar *
+get_string_from_json_object (JsonObject * object)
+{
+  JsonNode *root;
+  JsonGenerator *generator;
+  gchar *text;
+
+  /* Make it the root node */
+  root = json_node_init_object (json_node_alloc (), object);
+  generator = json_generator_new ();
+  json_generator_set_indent (generator, 2);
+  json_generator_set_indent_char (generator, ' ');
+  json_generator_set_pretty (generator, TRUE);
+  json_generator_set_root (generator, root);
+  text = json_generator_to_data (generator, NULL);
+
+  /* Release everything */
+  g_object_unref (generator);
+  json_node_free (root);
+  return text;
+}
+
+static GstFlowReturn
+gst_h264_2_json_parse_sps (GstH2642json * self, GstH264NalUnit * nalu)
+{
+  JsonObject *json = self->json;
+  JsonObject *sps;
+  JsonArray *scaling_lists_4x4, *scaling_lists_8x8, *offset_for_ref_frame;
+  GstH264SPS h264_sps;
+  GstH264ParserResult pres;
+  GstFlowReturn ret = GST_FLOW_OK;
+  gint i, j;
+
+  pres = gst_h264_parse_sps (nalu, &h264_sps);
+  if (pres != GST_H264_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to parse SPS, result %d", pres);
+    return GST_FLOW_ERROR;
+  }
+
+  GST_LOG_OBJECT (self, "SPS parsed");
+
+  if (gst_h264_parser_update_sps (self->parser,
+          &h264_sps) != GST_H264_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to update SPS");
+    ret = GST_FLOW_ERROR;
+    goto error;
+  }
+
+  sps = json_object_new ();
+
+  json_object_set_int_member (sps, "id", h264_sps.id);
+  json_object_set_int_member (sps, "profile idc", h264_sps.profile_idc);
+  json_object_set_boolean_member (sps, "constraint set0 flag",
+      h264_sps.constraint_set0_flag);
+  json_object_set_boolean_member (sps, "constraint set1 flag",
+      h264_sps.constraint_set1_flag);
+  json_object_set_boolean_member (sps, "constraint set2 flag",
+      h264_sps.constraint_set2_flag);
+  json_object_set_boolean_member (sps, "constraint set3 flag",
+      h264_sps.constraint_set3_flag);
+  json_object_set_boolean_member (sps, "constraint set4 flag",
+      h264_sps.constraint_set4_flag);
+  json_object_set_boolean_member (sps, "constraint set5 flag",
+      h264_sps.constraint_set5_flag);
+  json_object_set_int_member (sps, "level idc", h264_sps.level_idc);
+  json_object_set_int_member (sps, "chroma format idc",
+      h264_sps.chroma_format_idc);
+  json_object_set_boolean_member (sps, "separate colour plane flag",
+      h264_sps.separate_colour_plane_flag);
+  json_object_set_int_member (sps, "bit depth luma minus8",
+      h264_sps.bit_depth_luma_minus8);
+  json_object_set_int_member (sps, "bit depth chroma minus8",
+      h264_sps.bit_depth_chroma_minus8);
+  json_object_set_boolean_member (sps, "qpprime y zero transform bypass flag",
+      h264_sps.qpprime_y_zero_transform_bypass_flag);
+
+  json_object_set_boolean_member (sps, "scaling matrix present flag",
+      h264_sps.scaling_matrix_present_flag);
+
+  scaling_lists_4x4 = json_array_new ();
+  for (i = 0; i < 6; i++)
+    for (j = 0; j < 16; j++)
+      json_array_add_int_element (scaling_lists_4x4,
+          h264_sps.scaling_lists_4x4ij);
+  json_object_set_array_member (sps, "scaling lists 4x4", scaling_lists_4x4);
+
+  scaling_lists_8x8 = json_array_new ();
+  for (i = 0; i < 6; i++)
+    for (j = 0; j < 64; j++)
+      json_array_add_int_element (scaling_lists_8x8,
+          h264_sps.scaling_lists_8x8ij);
+  json_object_set_array_member (sps, "scaling lists 8x8", scaling_lists_8x8);
+
+  json_object_set_int_member (sps, "log2 max frame num minus4",
+      h264_sps.log2_max_frame_num_minus4);
+  json_object_set_int_member (sps, "pic order cnt type",
+      h264_sps.pic_order_cnt_type);
+  json_object_set_int_member (sps, "log2 max pic order cnt lsb minus4",
+      h264_sps.log2_max_pic_order_cnt_lsb_minus4);
+  json_object_set_boolean_member (sps, "delta pic order always zero flag",
+      h264_sps.delta_pic_order_always_zero_flag);
+  json_object_set_int_member (sps, "offset for non ref pic",
+      h264_sps.offset_for_non_ref_pic);
+  json_object_set_int_member (sps, "offset for top to bottom field",
+      h264_sps.offset_for_top_to_bottom_field);
+  json_object_set_int_member (sps, "num ref frames in pic order cnt cycle",
+      h264_sps.num_ref_frames_in_pic_order_cnt_cycle);
+
+  offset_for_ref_frame = json_array_new ();
+  for (i = 0; i < 255; i++)
+    json_array_add_int_element (offset_for_ref_frame,
+        h264_sps.offset_for_ref_framei);
+  json_object_set_array_member (sps, "offset for ref frame",
+      offset_for_ref_frame);
+
+  json_object_set_int_member (sps, "max num ref frames",
+      h264_sps.num_ref_frames);
+  json_object_set_boolean_member (sps, "gaps in frame num value allowed flag",
+      h264_sps.gaps_in_frame_num_value_allowed_flag);
+
+  json_object_set_int_member (sps, "pic width in mbs minus1",
+      h264_sps.pic_width_in_mbs_minus1);
+  json_object_set_int_member (sps, "pic height in map units minus1",
+      h264_sps.pic_height_in_map_units_minus1);
+  json_object_set_boolean_member (sps, "frame mbs only flag",
+      h264_sps.frame_mbs_only_flag);
+
+  json_object_set_boolean_member (sps, "mb adaptive frame field flag",
+      h264_sps.mb_adaptive_frame_field_flag);
+  json_object_set_boolean_member (sps, "direct 8x8 inference flag",
+      h264_sps.direct_8x8_inference_flag);
+  json_object_set_boolean_member (sps, "frame cropping flag",
+      h264_sps.frame_cropping_flag);
+
+  json_object_set_int_member (sps, "frame crop left offset",
+      h264_sps.frame_crop_left_offset);
+  json_object_set_int_member (sps, "frame crop right offset",
+      h264_sps.frame_crop_right_offset);
+  json_object_set_int_member (sps, "frame crop top offset",
+      h264_sps.frame_crop_top_offset);
+  json_object_set_int_member (sps, "frame crop bottom offset",
+      h264_sps.frame_crop_bottom_offset);
+
+  json_object_set_boolean_member (sps, "vui parameters present flag",
+      h264_sps.vui_parameters_present_flag);
+
+  if (h264_sps.vui_parameters_present_flag) {
+    JsonObject *vui = json_object_new ();
+    GstH264VUIParams *vui_parameters = &h264_sps.vui_parameters;
+
+    json_object_set_boolean_member (vui, "aspect ratio info present flag",
+        vui_parameters->aspect_ratio_info_present_flag);
+    json_object_set_int_member (vui, "aspect ratio idc",
+        vui_parameters->aspect_ratio_idc);
+    if (vui_parameters->aspect_ratio_idc == 255) {
+      json_object_set_int_member (vui, "sar width", vui_parameters->sar_width);
+      json_object_set_int_member (vui, "sar height",
+          vui_parameters->sar_height);
+    }
+
+    json_object_set_boolean_member (vui, "overscan info present flag",
+        vui_parameters->overscan_info_present_flag);
+    if (vui_parameters->overscan_info_present_flag)
+      json_object_set_boolean_member (vui, "overscan appropriate flag",
+          vui_parameters->overscan_appropriate_flag);
+
+    json_object_set_boolean_member (vui, "video signal type present flag",
+        vui_parameters->video_signal_type_present_flag);
+    json_object_set_int_member (vui, "video_format",
+        vui_parameters->video_format);
+    json_object_set_boolean_member (vui, "video_full_range_flag",
+        vui_parameters->video_full_range_flag);
+    json_object_set_boolean_member (vui, "colour description present flag",
+        vui_parameters->colour_description_present_flag);
+    json_object_set_int_member (vui, "colour primaries",
+        vui_parameters->colour_primaries);
+    json_object_set_int_member (vui, "transfer characteristics",
+        vui_parameters->transfer_characteristics);
+    json_object_set_int_member (vui, "matrix coefficients",
+        vui_parameters->matrix_coefficients);
+    json_object_set_boolean_member (vui, "chroma loc info present flag",
+        vui_parameters->chroma_loc_info_present_flag);
+    json_object_set_int_member (vui, "chroma sample loc type top field",
+        vui_parameters->chroma_sample_loc_type_top_field);
+    json_object_set_int_member (vui, "chroma sample loc type bottom field",
+        vui_parameters->chroma_sample_loc_type_bottom_field);
+
+    json_object_set_boolean_member (vui, "timing_info_present_flag",
+        vui_parameters->timing_info_present_flag);
+    if (vui_parameters->timing_info_present_flag) {
+      json_object_set_int_member (vui, "num units in tick",
+          vui_parameters->num_units_in_tick);
+      json_object_set_int_member (vui, "time scale",
+          vui_parameters->time_scale);
+      json_object_set_boolean_member (vui, "fixed frame rate flag",
+          vui_parameters->fixed_frame_rate_flag);
+    }
+
+    json_object_set_boolean_member (vui, "nal hrd parameters present flag",
+        vui_parameters->nal_hrd_parameters_present_flag);
+    if (vui_parameters->nal_hrd_parameters_present_flag) {
+      JsonObject *nal_hrd_parameters = json_object_new ();
+      JsonArray *bit_rate_value_minus1, *cpb_size_value_minus1, *cbr_flag;
+
+      json_object_set_int_member (nal_hrd_parameters, "cpb cnt minus1",
+          vui_parameters->nal_hrd_parameters.cpb_cnt_minus1);
+      json_object_set_int_member (nal_hrd_parameters, "bit rate scale",
+          vui_parameters->nal_hrd_parameters.bit_rate_scale);
+      json_object_set_int_member (nal_hrd_parameters, "cpb size scale",
+          vui_parameters->nal_hrd_parameters.cpb_size_scale);
+
+      bit_rate_value_minus1 = json_array_new ();
+      for (i = 0; i < 32; i++)
+        json_array_add_int_element (bit_rate_value_minus1,
+            vui_parameters->nal_hrd_parameters.bit_rate_value_minus1i);
+      json_object_set_array_member (nal_hrd_parameters, "bit rate value minus1",
+          bit_rate_value_minus1);
+
+      cpb_size_value_minus1 = json_array_new ();
+      for (i = 0; i < 32; i++)
+        json_array_add_int_element (cpb_size_value_minus1,
+            vui_parameters->nal_hrd_parameters.cpb_size_value_minus1i);
+      json_object_set_array_member (nal_hrd_parameters, "cpb size value minus1",
+          cpb_size_value_minus1);
+
+      cbr_flag = json_array_new ();
+      for (i = 0; i < 32; i++)
+        json_array_add_boolean_element (cbr_flag,
+            vui_parameters->nal_hrd_parameters.cbr_flagi);
+      json_object_set_array_member (nal_hrd_parameters, "cbr flag", cbr_flag);
+
+      json_object_set_int_member (nal_hrd_parameters,
+          "initial cpb removal delay length minus1",
+          vui_parameters->
+          nal_hrd_parameters.initial_cpb_removal_delay_length_minus1);
+      json_object_set_int_member (nal_hrd_parameters,
+          "cpb removal delay length minus1",
+          vui_parameters->nal_hrd_parameters.cpb_removal_delay_length_minus1);
+      json_object_set_int_member (nal_hrd_parameters,
+          "dpb output delay length minus1",
+          vui_parameters->nal_hrd_parameters.dpb_output_delay_length_minus1);
+      json_object_set_int_member (nal_hrd_parameters, "time offset length",
+          vui_parameters->nal_hrd_parameters.time_offset_length);
+
+      json_object_set_object_member (vui, "nal hrd parameters",
+          nal_hrd_parameters);
+    }
+
+    json_object_set_boolean_member (vui, "vcl_hrd_parameters_present_flag",
+        vui_parameters->vcl_hrd_parameters_present_flag);
+    if (vui_parameters->vcl_hrd_parameters_present_flag) {
+      JsonObject *vcl_hrd_parameters = json_object_new ();
+      JsonArray *bit_rate_value_minus1, *cpb_size_value_minus1, *cbr_flag;
+
+      json_object_set_int_member (vcl_hrd_parameters, "cpb cnt minus1",
+          vui_parameters->vcl_hrd_parameters.cpb_cnt_minus1);
+      json_object_set_int_member (vcl_hrd_parameters, "bit rate scale",
+          vui_parameters->vcl_hrd_parameters.bit_rate_scale);
+      json_object_set_int_member (vcl_hrd_parameters, "cpb size scale",
+          vui_parameters->vcl_hrd_parameters.cpb_size_scale);
+
+      bit_rate_value_minus1 = json_array_new ();
+      for (i = 0; i < 32; i++)
+        json_array_add_int_element (bit_rate_value_minus1,
+            vui_parameters->vcl_hrd_parameters.bit_rate_value_minus1i);
+      json_object_set_array_member (vcl_hrd_parameters, "bit rate value minus1",
+          bit_rate_value_minus1);
+
+      cpb_size_value_minus1 = json_array_new ();
+      for (i = 0; i < 32; i++)
+        json_array_add_int_element (cpb_size_value_minus1,
+            vui_parameters->vcl_hrd_parameters.cpb_size_value_minus1i);
+      json_object_set_array_member (vcl_hrd_parameters, "cpb size value minus1",
+          cpb_size_value_minus1);
+
+      cbr_flag = json_array_new ();
+      for (i = 0; i < 32; i++)
+        json_array_add_boolean_element (cbr_flag,
+            vui_parameters->vcl_hrd_parameters.cbr_flagi);
+      json_object_set_array_member (vcl_hrd_parameters, "cbr flag", cbr_flag);
+
+      json_object_set_int_member (vcl_hrd_parameters,
+          "initial cpb removal delay length minus1",
+          vui_parameters->
+          vcl_hrd_parameters.initial_cpb_removal_delay_length_minus1);
+      json_object_set_int_member (vcl_hrd_parameters,
+          "cpb removal delay length minus1",
+          vui_parameters->vcl_hrd_parameters.cpb_removal_delay_length_minus1);
+      json_object_set_int_member (vcl_hrd_parameters,
+          "dpb output delay length minus1",
+          vui_parameters->vcl_hrd_parameters.dpb_output_delay_length_minus1);
+      json_object_set_int_member (vcl_hrd_parameters, "time offset length",
+          vui_parameters->vcl_hrd_parameters.time_offset_length);
+
+      json_object_set_object_member (vui, "vcl hrd parameters",
+          vcl_hrd_parameters);
+    }
+
+    json_object_set_boolean_member (vui, "low delay hrd flag",
+        vui_parameters->low_delay_hrd_flag);
+    json_object_set_boolean_member (vui, "pic struct present flag",
+        vui_parameters->pic_struct_present_flag);
+
+    json_object_set_boolean_member (vui, "bitstream restriction flag",
+        vui_parameters->bitstream_restriction_flag);
+    if (vui_parameters->bitstream_restriction_flag) {
+      json_object_set_boolean_member (vui,
+          "motion vectors over pic boundaries flag",
+          vui_parameters->motion_vectors_over_pic_boundaries_flag);
+      json_object_set_int_member (vui, "max bytes per pic denom",
+          vui_parameters->max_bytes_per_pic_denom);
+      json_object_set_int_member (vui, "max bits per mb denom",
+          vui_parameters->max_bits_per_mb_denom);
+      json_object_set_int_member (vui, "log2 max mv length horizontal",
+          vui_parameters->log2_max_mv_length_horizontal);
+      json_object_set_int_member (vui, "log2 max mv length vertical",
+          vui_parameters->log2_max_mv_length_vertical);
+      json_object_set_int_member (vui, "num reorder frames",
+          vui_parameters->num_reorder_frames);
+      json_object_set_int_member (vui, "max dec frame buffering",
+          vui_parameters->max_dec_frame_buffering);
+    }
+    json_object_set_object_member (sps, "VUI params", vui);
+  }
+
+  json_object_set_int_member (sps, "extension type", h264_sps.extension_type);
+  json_object_set_object_member (json, "sps", sps);
+
+error:
+  gst_h264_sps_clear (&h264_sps);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_h264_2_json_parse_pps (GstH2642json * self, GstH264NalUnit * nalu)
+{
+  GstH264PPS h264_pps;
+  JsonObject *pps;
+  GstH264ParserResult pres;
+  JsonObject *json = self->json;
+  GstFlowReturn ret = GST_FLOW_OK;
+  JsonArray *scaling_lists_4x4, *scaling_lists_8x8;
+  gint i, j;
+
+  pres = gst_h264_parse_pps (self->parser, nalu, &h264_pps);
+  if (pres != GST_H264_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to parse PPS, result %d", pres);
+    return GST_FLOW_ERROR;
+  }
+
+  GST_LOG_OBJECT (self, "PPS parsed");
+
+  if (h264_pps.num_slice_groups_minus1 > 0) {
+    GST_FIXME_OBJECT (self, "FMO is not supported");
+    ret = GST_FLOW_ERROR;
+    goto error;
+  } else if (gst_h264_parser_update_pps (self->parser,
+          &h264_pps) != GST_H264_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to update PPS");
+    ret = GST_FLOW_ERROR;
+    goto error;
+  }
+
+  pps = json_object_new ();
+
+  json_object_set_boolean_member (pps, "entropy coding mode flag",
+      h264_pps.entropy_coding_mode_flag);
+  json_object_set_boolean_member (pps, "pic order present flag",
+      h264_pps.pic_order_present_flag);
+
+  json_object_set_int_member (pps, "num slice groups minus1",
+      h264_pps.num_slice_groups_minus1);
+  if (h264_pps.num_slice_groups_minus1 > 0) {
+    json_object_set_int_member (pps, "slice group map type",
+        h264_pps.slice_group_map_type);
+    switch (h264_pps.slice_group_map_type) {
+      case 0:
+      {
+        JsonArray *run_length_minus1 = json_array_new ();
+
+        for (i = 0; i < 8; i++)
+          json_array_add_int_element (run_length_minus1,
+              h264_pps.run_length_minus1i);
+        json_object_set_array_member (pps, "run lengthminus1",
+            run_length_minus1);
+        break;
+      }
+      case 2:
+      {
+        JsonArray *top_left = json_array_new ();
+        JsonArray *bottom_right = json_array_new ();
+        for (i = 0; i < 8; i++) {
+          json_array_add_int_element (top_left, h264_pps.top_lefti);
+          json_array_add_int_element (bottom_right, h264_pps.bottom_righti);
+        }
+        json_object_set_array_member (pps, "top left", top_left);
+        json_object_set_array_member (pps, "bottom right", bottom_right);
+        break;
+      }
+      case 3:
+      case 4:
+      case 5:
+      {
+        json_object_set_boolean_member (pps,
+            "slice group change direction flag",
+            h264_pps.slice_group_change_direction_flag);
+        json_object_set_int_member (pps, "slice group change rate minus1",
+            h264_pps.slice_group_change_rate_minus1);
+        break;
+      }
+      case 6:
+      {
+        json_object_set_int_member (pps, "pic size in map units minus1",
+            h264_pps.pic_size_in_map_units_minus1);
+        break;
+      }
+    }
+  }
+
+  json_object_set_int_member (pps, "num ref idx l0 default active minus1",
+      h264_pps.num_ref_idx_l0_active_minus1);
+  json_object_set_int_member (pps, "num ref idx l1 default active minus1",
+      h264_pps.num_ref_idx_l1_active_minus1);
+  json_object_set_boolean_member (pps, "weighted pred flag",
+      h264_pps.weighted_pred_flag);
+  json_object_set_int_member (pps, "weighted bipred idc",
+      h264_pps.weighted_bipred_idc);
+  json_object_set_int_member (pps, "pic init qp minus26",
+      h264_pps.pic_init_qp_minus26);
+  json_object_set_int_member (pps, "pic init qs minus26",
+      h264_pps.pic_init_qs_minus26);
+  json_object_set_int_member (pps, "chroma qp index offset",
+      h264_pps.chroma_qp_index_offset);
+  json_object_set_boolean_member (pps, "deblocking filter control present flag",
+      h264_pps.deblocking_filter_control_present_flag);
+  json_object_set_boolean_member (pps, "constrained intra pred flag",
+      h264_pps.constrained_intra_pred_flag);
+  json_object_set_boolean_member (pps, "redundant pic cnt present flag",
+      h264_pps.redundant_pic_cnt_present_flag);
+
+  json_object_set_boolean_member (pps, "transform 8x8 mode flag",
+      h264_pps.transform_8x8_mode_flag);
+
+  json_object_set_int_member (pps, "second chroma qp index offset",
+      h264_pps.second_chroma_qp_index_offset);
+  json_object_set_boolean_member (pps, "pic scaling matrix present flag",
+      h264_pps.pic_scaling_matrix_present_flag);
+
+  scaling_lists_4x4 = json_array_new ();
+  for (i = 0; i < 6; i++)
+    for (j = 0; j < 16; j++)
+      json_array_add_int_element (scaling_lists_4x4,
+          h264_pps.scaling_lists_4x4ij);
+  json_object_set_array_member (pps, "scaling lists 4x4", scaling_lists_4x4);
+
+  scaling_lists_8x8 = json_array_new ();
+  for (i = 0; i < 6; i++)
+    for (j = 0; j < 64; j++)
+      json_array_add_int_element (scaling_lists_8x8,
+          h264_pps.scaling_lists_8x8ij);
+  json_object_set_array_member (pps, "scaling lists 8x8", scaling_lists_8x8);
+
+  json_object_set_object_member (json, "pps", pps);
+
+error:
+  gst_h264_pps_clear (&h264_pps);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_h264_2_json_parse_slice (GstH2642json * self, GstH264NalUnit * nalu)
+{
+  GstH264SliceHdr slice;
+  GstH264PPS *pps;
+  GstH264SPS *sps;
+  GstH264ParserResult pres = GST_H264_PARSER_OK;
+  JsonObject *json = self->json;
+  JsonArray *delta_pic_order_cnt, *ref_pic_list_modification_l0,
+      *ref_pic_list_modification_l1, *luma_weight_l0, *luma_offset_l0;
+  JsonObject *hdr, *pred_weight_table;
+  gint i, j;
+
+  pres =
+      gst_h264_parser_parse_slice_hdr (self->parser, nalu, &slice, TRUE, TRUE);
+
+  if (pres != GST_H264_PARSER_OK) {
+    GST_ERROR_OBJECT (self, "Failed to parse slice header, ret %d", pres);
+    return GST_FLOW_ERROR;
+  }
+
+  pps = slice.pps;
+  sps = pps->sequence;
+
+  hdr = json_object_new ();
+
+  json_object_set_int_member (hdr, "first mb in slice",
+      slice.first_mb_in_slice);
+  json_object_set_int_member (hdr, "type", slice.type);
+
+  if (sps->separate_colour_plane_flag)
+    json_object_set_int_member (hdr, "colour plane id", slice.colour_plane_id);
+
+  json_object_set_int_member (hdr, "frame num", slice.frame_num);
+
+  json_object_set_boolean_member (hdr, "field pic flag", slice.field_pic_flag);
+  json_object_set_boolean_member (hdr, "bottom field flag",
+      slice.bottom_field_flag);
+
+  if (nalu->type == GST_H264_NAL_SLICE_IDR)
+    json_object_set_int_member (hdr, "idr pic id", slice.idr_pic_id);
+
+  if (sps->pic_order_cnt_type == 0)
+    json_object_set_int_member (hdr, "pic order cnt lsb",
+        slice.pic_order_cnt_lsb);
+
+  if (pps->pic_order_present_flag && !slice.field_pic_flag)
+    json_object_set_int_member (hdr, "delta pic order cnt bottom",
+        slice.delta_pic_order_cnt_bottom);
+
+  delta_pic_order_cnt = json_array_new ();
+  for (i = 0; i < 2; i++)
+    json_array_add_int_element (delta_pic_order_cnt,
+        slice.delta_pic_order_cnti);
+  json_object_set_array_member (hdr, "delta pic order cnt",
+      delta_pic_order_cnt);
+
+  json_object_set_int_member (hdr, "redundant pic cnt",
+      slice.redundant_pic_cnt);
+
+  if (GST_H264_IS_B_SLICE (&slice))
+    json_object_set_boolean_member (hdr, "direct spatial mv pred flag",
+        slice.direct_spatial_mv_pred_flag);
+
+  json_object_set_int_member (hdr, "num ref idx l0 active minus1",
+      slice.num_ref_idx_l0_active_minus1);
+  json_object_set_int_member (hdr, "num ref idx l1 active minus1",
+      slice.num_ref_idx_l1_active_minus1);
+
+  json_object_set_int_member (hdr, "ref pic list modification flag l0",
+      slice.ref_pic_list_modification_flag_l0);
+  json_object_set_int_member (hdr, "n ref pic list modification l0",
+      slice.n_ref_pic_list_modification_l0);
+  ref_pic_list_modification_l0 = json_array_new ();
+  for (i = 0; i < 32; i++) {
+    JsonObject *modification = json_object_new ();
+
+    json_object_set_int_member (modification, "modification of pic nums idc",
+        slice.ref_pic_list_modification_l0i.modification_of_pic_nums_idc);
+    switch (slice.ref_pic_list_modification_l0i.modification_of_pic_nums_idc) {
+      case 0:
+      case 1:
+      {
+        json_object_set_int_member (modification, "abs diff pic num minus1",
+            slice.ref_pic_list_modification_l0i.
+            value.abs_diff_pic_num_minus1);
+        break;
+      }
+      case 2:
+      {
+        json_object_set_int_member (modification, "long term pic num",
+            slice.ref_pic_list_modification_l0i.value.long_term_pic_num);
+        break;
+      }
+      case 4:
+      case 5:
+      {
+        json_object_set_int_member (modification, "abs diff view idx minus1",
+            slice.ref_pic_list_modification_l0i.
+            value.abs_diff_view_idx_minus1);
+        break;
+      }
+    }
+    json_array_add_object_element (ref_pic_list_modification_l0, modification);
+  }
+  json_object_set_array_member (hdr, "ref pic list modification l0",
+      ref_pic_list_modification_l0);
+
+  json_object_set_int_member (hdr, "ref pic list modification flag l0",
+      slice.ref_pic_list_modification_flag_l1);
+  json_object_set_int_member (hdr, "n ref pic list modification l0",
+      slice.n_ref_pic_list_modification_l1);
+  ref_pic_list_modification_l1 = json_array_new ();
+  for (i = 0; i < 32; i++) {
+    JsonObject *modification = json_object_new ();
+
+    json_object_set_int_member (modification, "modification of pic nums idc",
+        slice.ref_pic_list_modification_l1i.modification_of_pic_nums_idc);
+    switch (slice.ref_pic_list_modification_l1i.modification_of_pic_nums_idc) {
+      case 0:
+      case 1:
+      {
+        json_object_set_int_member (modification, "abs diff pic num minus1",
+            slice.ref_pic_list_modification_l1i.
+            value.abs_diff_pic_num_minus1);
+        break;
+      }
+      case 2:
+      {
+        json_object_set_int_member (modification, "long term pic num",
+            slice.ref_pic_list_modification_l1i.value.long_term_pic_num);
+        break;
+      }
+      case 4:
+      case 5:
+      {
+        json_object_set_int_member (modification, "abs diff view idx minus1",
+            slice.ref_pic_list_modification_l1i.
+            value.abs_diff_view_idx_minus1);
+        break;
+      }
+    }
+    json_array_add_object_element (ref_pic_list_modification_l1, modification);
+  }
+  json_object_set_array_member (hdr, "ref pic list modification l1",
+      ref_pic_list_modification_l1);
+
+  pred_weight_table = json_object_new ();
+  json_object_set_int_member (pred_weight_table, "luma log2 weight denom",
+      slice.pred_weight_table.luma_log2_weight_denom);
+  json_object_set_int_member (pred_weight_table, "chroma log2 weight denom",
+      slice.pred_weight_table.chroma_log2_weight_denom);
+
+  luma_weight_l0 = json_array_new ();
+  luma_offset_l0 = json_array_new ();
+  for (i = 0; i < 32; i++) {
+    json_array_add_int_element (luma_weight_l0,
+        slice.pred_weight_table.luma_weight_l0i);
+    json_array_add_int_element (luma_offset_l0,
+        slice.pred_weight_table.luma_offset_l0i);
+  }
+  json_object_set_array_member (pred_weight_table, "luma weight l0",
+      luma_weight_l0);
+  json_object_set_array_member (pred_weight_table, "luma offset l0",
+      luma_offset_l0);
+
+  if (sps->chroma_array_type != 0) {
+    JsonArray *chroma_weight_l0 = json_array_new ();
+    JsonArray *chroma_offset_l0 = json_array_new ();
+
+    for (i = 0; i < 32; i++) {
+      for (j = 0; j < 2; j++) {
+        json_array_add_int_element (chroma_weight_l0,
+            slice.pred_weight_table.chroma_weight_l0ij);
+        json_array_add_int_element (chroma_offset_l0,
+            slice.pred_weight_table.chroma_offset_l0ij);
+      }
+    }
+    json_object_set_array_member (pred_weight_table, "chroma weight l0",
+        chroma_weight_l0);
+    json_object_set_array_member (pred_weight_table, "chroma offset l0",
+        chroma_offset_l0);
+  }
+
+  if (GST_H264_IS_B_SLICE (&slice)) {
+    JsonArray *luma_weight_l1 = json_array_new ();
+    JsonArray *luma_offset_l1 = json_array_new ();
+    for (i = 0; i < 32; i++) {
+      json_array_add_int_element (luma_weight_l1,
+          slice.pred_weight_table.luma_weight_l1i);
+      json_array_add_int_element (luma_offset_l1,
+          slice.pred_weight_table.luma_offset_l1i);
+    }
+    json_object_set_array_member (pred_weight_table, "luma weight l1",
+        luma_weight_l1);
+    json_object_set_array_member (pred_weight_table, "luma offset l1",
+        luma_offset_l1);
+
+    if (sps->chroma_array_type != 0) {
+      JsonArray *chroma_weight_l1 = json_array_new ();
+      JsonArray *chroma_offset_l1 = json_array_new ();
+
+      for (i = 0; i < 32; i++) {
+        for (j = 0; j < 2; j++) {
+          json_array_add_int_element (chroma_weight_l1,
+              slice.pred_weight_table.chroma_weight_l1ij);
+          json_array_add_int_element (chroma_offset_l1,
+              slice.pred_weight_table.chroma_offset_l1ij);
+        }
+      }
+      json_object_set_array_member (pred_weight_table, "chroma weight l1",
+          chroma_weight_l1);
+      json_object_set_array_member (pred_weight_table, "chroma offset l1",
+          chroma_offset_l1);
+    }
+  }
+  json_object_set_object_member (hdr, "pred weight table", pred_weight_table);
+
+  if (nalu->ref_idc != 0) {
+    JsonObject *dec_ref_pic_marking = json_object_new ();
+    JsonArray *ref_pic_marking = json_array_new ();
+
+    if (nalu->idr_pic_flag) {
+      json_object_set_boolean_member (dec_ref_pic_marking,
+          "no output of prior pics flag",
+          slice.dec_ref_pic_marking.no_output_of_prior_pics_flag);
+      json_object_set_boolean_member (dec_ref_pic_marking,
+          "long term reference flag",
+          slice.dec_ref_pic_marking.long_term_reference_flag);
+    }
+    json_object_set_boolean_member (dec_ref_pic_marking,
+        "adaptive ref pic marking mode flag",
+        slice.dec_ref_pic_marking.adaptive_ref_pic_marking_mode_flag);
+
+    for (i = 0; i < 10; i++) {
+      GstH264RefPicMarking *m = &slice.dec_ref_pic_marking.ref_pic_markingi;
+      JsonObject *marking = json_object_new ();
+
+      json_object_set_int_member (marking,
+          "memory management control operation",
+          m->memory_management_control_operation);
+      json_object_set_int_member (marking, "difference of pic nums minus1",
+          m->difference_of_pic_nums_minus1);
+      json_object_set_int_member (marking, "long term pic num",
+          m->long_term_pic_num);
+      json_object_set_int_member (marking, "long term frame idx",
+          m->long_term_frame_idx);
+      json_object_set_int_member (marking, "max long term frame idx plus1",
+          m->max_long_term_frame_idx_plus1);
+      json_array_add_object_element (ref_pic_marking, marking);
+    }
+    json_object_set_array_member (dec_ref_pic_marking, "ref pic marking",
+        ref_pic_marking);
+
+    json_object_set_int_member (dec_ref_pic_marking, "n ref pic marking",
+        slice.dec_ref_pic_marking.n_ref_pic_marking);
+    json_object_set_int_member (dec_ref_pic_marking, "bit size",
+        slice.dec_ref_pic_marking.bit_size);
+
+    json_object_set_object_member (hdr, "dec ref pic marking",
+        dec_ref_pic_marking);
+  }
+
+  json_object_set_int_member (hdr, "cabac init idc", slice.cabac_init_idc);
+  json_object_set_int_member (hdr, "slice qp delta", slice.slice_qp_delta);
+  json_object_set_int_member (hdr, "slice qs delta", slice.slice_qs_delta);
+  json_object_set_int_member (hdr, "disable deblocking filter idc",
+      slice.disable_deblocking_filter_idc);
+  json_object_set_int_member (hdr, "slice alpha c0 offset div2",
+      slice.slice_alpha_c0_offset_div2);
+  json_object_set_int_member (hdr, "slice beta offset div2",
+      slice.slice_beta_offset_div2);
+  json_object_set_int_member (hdr, "slice group change cycle",
+      slice.slice_group_change_cycle);
+
+  json_object_set_object_member (json, "slice header", hdr);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_h264_2_json_decode_nal (GstH2642json * self, GstH264NalUnit * nalu)
+{
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  GST_LOG_OBJECT (self, "Parsed nal type: %d, offset %d, size %d",
+      nalu->type, nalu->offset, nalu->size);
+
+  switch (nalu->type) {
+    case GST_H264_NAL_SPS:
+      ret = gst_h264_2_json_parse_sps (self, nalu);
+      break;
+    case GST_H264_NAL_PPS:
+      ret = gst_h264_2_json_parse_pps (self, nalu);
+      break;
+    case GST_H264_NAL_SLICE:
+    case GST_H264_NAL_SLICE_DPA:
+    case GST_H264_NAL_SLICE_DPB:
+    case GST_H264_NAL_SLICE_DPC:
+    case GST_H264_NAL_SLICE_IDR:
+    case GST_H264_NAL_SLICE_EXT:
+      ret = gst_h264_2_json_parse_slice (self, nalu);
+      break;
+    default:
+      break;
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_h264_2_json_chain (GstPad * sinkpad, GstObject * object, GstBuffer * in_buf)
+{
+  GstH2642json *self = GST_H264_2_JSON (object);
+  JsonObject *json = self->json;
+  GstBuffer *out_buf;
+  gchar *json_string;
+  guint length;
+  GstH264NalUnit nalu;
+  GstH264ParserResult pres;
+  GstMapInfo in_map, out_map;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  if (!gst_buffer_map (in_buf, &in_map, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (self, "Cannot map buffer");
+    return GST_FLOW_ERROR;
+  }
+
+  if (self->use_avc) {
+    pres = gst_h264_parser_identify_nalu_avc (self->parser,
+        in_map.data, 0, in_map.size, self->nal_length_size, &nalu);
+
+    while (pres == GST_H264_PARSER_OK && ret == GST_FLOW_OK) {
+      ret = gst_h264_2_json_decode_nal (self, &nalu);
+
+      pres = gst_h264_parser_identify_nalu_avc (self->parser,
+          in_map.data, nalu.offset + nalu.size, in_map.size,
+          self->nal_length_size, &nalu);
+    }
+  } else {
+    pres = gst_h264_parser_identify_nalu (self->parser,
+        in_map.data, 0, in_map.size, &nalu);
+
+    if (pres == GST_H264_PARSER_NO_NAL_END)
+      pres = GST_H264_PARSER_OK;
+
+    while (pres == GST_H264_PARSER_OK && ret == GST_FLOW_OK) {
+      ret = gst_h264_2_json_decode_nal (self, &nalu);
+
+      pres = gst_h264_parser_identify_nalu (self->parser,
+          in_map.data, nalu.offset + nalu.size, in_map.size, &nalu);
+
+      if (pres == GST_H264_PARSER_NO_NAL_END)
+        pres = GST_H264_PARSER_OK;
+    }
+  }
+
+  json_string = get_string_from_json_object (json);
+  length = strlen (json_string);
+  out_buf = gst_buffer_new_allocate (NULL, length, NULL);
+  gst_buffer_map (out_buf, &out_map, GST_MAP_WRITE);
+  if (length)
+    memcpy (&out_map.data0, json_string, length);
+  gst_buffer_unmap (out_buf, &out_map);
+
+  g_free (json_string);
+
+  gst_buffer_copy_into (out_buf, in_buf,
+      GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS |
+      GST_BUFFER_COPY_METADATA, 0, -1);
+  ret = gst_pad_push (self->srcpad, out_buf);
+
+  gst_buffer_unmap (in_buf, &in_map);
+  gst_buffer_unref (in_buf);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_h264_2_json_parse_codec_data (GstH2642json * self, const guint8 * data,
+    gsize size)
+{
+  GstH264DecoderConfigRecord *config = NULL;
+  GstFlowReturn ret = GST_FLOW_OK;
+  GstH264NalUnit *nalu;
+  guint i;
+
+  if (gst_h264_parser_parse_decoder_config_record (self->parser, data, size,
+          &config) != GST_H264_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to parse codec-data");
+    return GST_FLOW_ERROR;
+  }
+
+  self->nal_length_size = config->length_size_minus_one + 1;
+  for (i = 0; i < config->sps->len; i++) {
+    nalu = &g_array_index (config->sps, GstH264NalUnit, i);
+
+    /* TODO: handle subset sps for SVC/MVC. That would need to be stored in
+     * separate array instead of putting SPS/subset-SPS into a single array */
+    if (nalu->type != GST_H264_NAL_SPS)
+      continue;
+
+    ret = gst_h264_2_json_parse_sps (self, nalu);
+    if (ret != GST_FLOW_OK) {
+      GST_WARNING_OBJECT (self, "Failed to parse SPS");
+      goto out;
+    }
+  }
+
+  for (i = 0; i < config->pps->len; i++) {
+    nalu = &g_array_index (config->pps, GstH264NalUnit, i);
+    if (nalu->type != GST_H264_NAL_PPS)
+      continue;
+
+    ret = gst_h264_2_json_parse_pps (self, nalu);
+    if (ret != GST_FLOW_OK) {
+      GST_WARNING_OBJECT (self, "Failed to parse PPS");
+      goto out;
+    }
+  }
+
+out:
+  gst_h264_decoder_config_record_free (config);
+  return ret;
+}
+
+static void
+gst_h264_2_json_get_codec_data (GstH2642json * self, GstCaps * caps)
+{
+  if (caps && gst_caps_get_size (caps) > 0) {
+    GstStructure *s = gst_caps_get_structure (caps, 0);
+
+    if (gst_structure_has_field (s, "codec_data")) {
+      GST_WARNING_OBJECT (self, "get codec-data");
+
+      const GValue *h = gst_structure_get_value (s, "codec_data");
+      GstBuffer *codec_data = gst_value_get_buffer (h);
+      GstMapInfo map;
+
+      gst_buffer_map (codec_data, &map, GST_MAP_READ);
+      if (gst_h264_2_json_parse_codec_data (self, map.data,
+              map.size) != GST_FLOW_OK) {
+        /* keep going without error.
+         * Probably inband SPS/PPS might be valid data */
+        GST_WARNING_OBJECT (self, "Failed to handle codec data");
+      }
+      gst_buffer_unmap (codec_data, &map);
+    }
+  }
+}
+
+static void
+gst_h264_2_json_use_avc (GstH2642json * self, GstCaps * caps)
+{
+  if (caps && gst_caps_get_size (caps) > 0) {
+    GstStructure *s = gst_caps_get_structure (caps, 0);
+    const gchar *str_stream = NULL;
+
+    str_stream = gst_structure_get_string (s, "stream-format");
+
+    self->use_avc = FALSE;
+    if (str_stream && (g_strcmp0 (str_stream, "avc") == 0
+            || g_strcmp0 (str_stream, "avc3") == 0)) {
+      self->use_avc = TRUE;
+      return;
+    }
+  }
+}
+
+static gboolean
+gst_h264_2_json_set_caps (GstH2642json * self, GstCaps * caps)
+{
+  GstCaps *src_caps =
+      gst_caps_new_simple ("text/x-json", "format", G_TYPE_STRING, "h264",
+      NULL);
+  GstEvent *event;
+
+  event = gst_event_new_caps (src_caps);
+  gst_caps_unref (src_caps);
+
+  gst_h264_2_json_use_avc (self, caps);
+
+  gst_h264_2_json_get_codec_data (self, caps);
+
+  return gst_pad_push_event (self->srcpad, event);
+}
+
+static gboolean
+gst_h264_2_json_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+{
+  GstH2642json *self = GST_H264_2_JSON (parent);
+  gboolean res = TRUE;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CAPS:
+    {
+      GstCaps *caps;
+
+      gst_event_parse_caps (event, &caps);
+      res = gst_h264_2_json_set_caps (self, caps);
+      gst_event_unref (event);
+      break;
+    }
+    default:
+      res = gst_pad_event_default (pad, parent, event);
+      break;
+  }
+
+  return res;
+}
+
+static void
+gst_h264_2_json_class_init (GstH2642jsonClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
+
+  gobject_class->finalize = gst_h264_2_json_finalize;
+
+  gst_element_class_add_static_pad_template (gstelement_class, &src_factory);
+  gst_element_class_add_static_pad_template (gstelement_class, &sink_factory);
+
+  gst_element_class_set_static_metadata (gstelement_class, "H2642json",
+      "Transform",
+      "H264 to json element",
+      "Benjamin Gaignard <benjamin.gaignard@collabora.com>");
+}
+
+static void
+gst_h264_2_json_init (GstH2642json * self)
+{
+  self->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
+  gst_pad_set_chain_function (self->sinkpad, gst_h264_2_json_chain);
+  gst_element_add_pad (GST_ELEMENT (self), self->sinkpad);
+  gst_pad_set_event_function (self->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_h264_2_json_sink_event));
+
+  self->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
+  gst_element_add_pad (GST_ELEMENT (self), self->srcpad);
+
+  self->json = json_object_new ();
+
+  self->parser = gst_h264_nal_parser_new ();
+  self->use_avc = FALSE;
+  self->nal_length_size = 4;
+}

gst-plugins-bad-1.24.5.tar.xz/ext/codec2json/gsth2642json.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2023 Benjamin Gaignard <benjamin.gaignard@collabora.Com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_H264_2_JSON_H__
+#define __GST_H264_2_JSON_H__
+
+#include <gst/codecparsers/gsth264parser.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_H264_2_JSON (gst_h264_2_json_get_type())
+G_DECLARE_FINAL_TYPE (GstH2642json,
+    gst_h264_2_json, GST, H264_2_JSON, GstElement);
+
+G_END_DECLS
+
+#endif /* __GST_H264_2_TXT_H__ */

gst-plugins-bad-1.24.5.tar.xz/ext/codec2json/gsth2652json.c Added

@@ -0,0 +1,1736 @@
+/*
+ * gsth2652json.c - H.265 parsed bistream to json
+ *
+ * Copyright (C) 2023 Collabora
+ *   Author: Benjamin Gaignard <benjamin.gaignard@collabora.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-h2652json
+ * @title: h2652json
+ *
+ * Convert H.265 bitstream parameters to JSON formated text.
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/h.265/file ! parsebin ! h2652json ! filesink location=/path/to/json/file
+ * ```
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gst/base/base.h>
+#include <json-glib/json-glib.h>
+
+#include "gsth2652json.h"
+
+GST_DEBUG_CATEGORY (gst_h265_2_json_debug);
+#define GST_CAT_DEFAULT gst_h265_2_json_debug
+
+struct _GstH2652json
+{
+  GstElement parent;
+
+  GstPad *sinkpad, *srcpad;
+  GstH265Parser *parser;
+
+  GArray *split_nalu;
+
+  gint nal_length_size;
+  gboolean use_hevc;
+
+  JsonObject *json;
+};
+
+static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-h265")
+    );
+
+static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("text/x-json,format=h265"));
+
+G_DEFINE_TYPE_WITH_CODE (GstH2652json, gst_h265_2_json,
+    GST_TYPE_ELEMENT,
+    GST_DEBUG_CATEGORY_INIT (gst_h265_2_json_debug, "h2652json", 0,
+        "H.265 to json"));
+
+static void
+gst_h265_2_json_finalize (GObject * object)
+{
+  GstH2652json *self = GST_H265_2_JSON (object);
+
+  json_object_unref (self->json);
+  gst_h265_parser_free (self->parser);
+  g_array_unref (self->split_nalu);
+}
+
+static gchar *
+get_string_from_json_object (JsonObject * object)
+{
+  JsonNode *root;
+  JsonGenerator *generator;
+  gchar *text;
+
+  /* Make it the root node */
+  root = json_node_init_object (json_node_alloc (), object);
+  generator = json_generator_new ();
+  json_generator_set_indent (generator, 2);
+  json_generator_set_indent_char (generator, ' ');
+  json_generator_set_pretty (generator, TRUE);
+  json_generator_set_root (generator, root);
+  text = json_generator_to_data (generator, NULL);
+
+  /* Release everything */
+  g_object_unref (generator);
+  json_node_free (root);
+  return text;
+}
+
+static JsonObject *
+gst_h265_2_json_hrd_params (GstH265HRDParams * hrd_params,
+    int max_sub_layers_minus1)
+{
+  JsonObject *hrd = json_object_new ();
+  JsonArray *fixed_pic_rate_general_flag, *fixed_pic_rate_within_cvs_flag;
+  JsonArray *elemental_duration_in_tc_minus1, *low_delay_hrd_flag,
+      *cpb_cnt_minus1;
+  JsonArray *sublayer_hrd_params;
+  gint i, j;
+
+  json_object_set_boolean_member (hrd, "nal hrd parameters present flag",
+      hrd_params->nal_hrd_parameters_present_flag);
+  json_object_set_boolean_member (hrd, "vcl hrd parameters present flag",
+      hrd_params->vcl_hrd_parameters_present_flag);
+
+  if (hrd_params->nal_hrd_parameters_present_flag
+      || hrd_params->vcl_hrd_parameters_present_flag) {
+    json_object_set_boolean_member (hrd, "sub pic hrd params present flag",
+        hrd_params->sub_pic_hrd_params_present_flag);
+
+    if (hrd_params->sub_pic_hrd_params_present_flag) {
+      json_object_set_int_member (hrd, "tick divisor minus2",
+          hrd_params->tick_divisor_minus2);
+      json_object_set_int_member (hrd,
+          "du cpb removal delay increment length minus1",
+          hrd_params->du_cpb_removal_delay_increment_length_minus1);
+      json_object_set_boolean_member (hrd,
+          "sub pic cpb params in pic timing sei flag",
+          hrd_params->sub_pic_cpb_params_in_pic_timing_sei_flag);
+      json_object_set_int_member (hrd, "dpb output delay du length minus1",
+          hrd_params->dpb_output_delay_du_length_minus1);
+    }
+
+    json_object_set_int_member (hrd, "bit rate scale",
+        hrd_params->bit_rate_scale);
+    json_object_set_int_member (hrd, "cpb size scale",
+        hrd_params->cpb_size_scale);
+    if (hrd_params->sub_pic_hrd_params_present_flag)
+      json_object_set_int_member (hrd, "cpb size du scale",
+          hrd_params->cpb_size_du_scale);
+
+    json_object_set_int_member (hrd, "initial cpb removal delay length minus1",
+        hrd_params->initial_cpb_removal_delay_length_minus1);
+    json_object_set_int_member (hrd, "au cpb removal delay length minus1",
+        hrd_params->au_cpb_removal_delay_length_minus1);
+    json_object_set_int_member (hrd, "dpb output delay length minus1",
+        hrd_params->dpb_output_delay_length_minus1);
+  }
+
+  fixed_pic_rate_general_flag = json_array_new ();
+  fixed_pic_rate_within_cvs_flag = json_array_new ();
+  elemental_duration_in_tc_minus1 = json_array_new ();
+  low_delay_hrd_flag = json_array_new ();
+  cpb_cnt_minus1 = json_array_new ();
+  sublayer_hrd_params = json_array_new ();
+
+  for (i = 0; i <= max_sub_layers_minus1 && i < 7; i++) {
+    GstH265SubLayerHRDParams *subparams = &hrd_params->sublayer_hrd_paramsi;
+
+    json_array_add_boolean_element (fixed_pic_rate_general_flag,
+        hrd_params->fixed_pic_rate_general_flagi);
+    json_array_add_boolean_element (fixed_pic_rate_within_cvs_flag,
+        hrd_params->fixed_pic_rate_within_cvs_flagi);
+    json_array_add_int_element (elemental_duration_in_tc_minus1,
+        hrd_params->elemental_duration_in_tc_minus1i);
+    json_array_add_boolean_element (low_delay_hrd_flag,
+        hrd_params->low_delay_hrd_flagi);
+    json_array_add_int_element (cpb_cnt_minus1, hrd_params->cpb_cnt_minus1i);
+
+    for (j = 0; j < 32; j++) {
+      JsonObject *subparam = json_object_new ();
+
+      json_object_set_int_member (subparam, "bit rate value minus1",
+          subparams->bit_rate_value_minus1j);
+      json_object_set_int_member (subparam, "cpb size value minus1",
+          subparams->cpb_size_value_minus1j);
+      json_object_set_int_member (subparam, "cpb size du value minus1",
+          subparams->cpb_size_du_value_minus1j);
+      json_object_set_int_member (subparam, "bit rate du value minus1",
+          subparams->bit_rate_du_value_minus1j);
+      json_object_set_boolean_member (subparam, "cbr flag",
+          subparams->cbr_flagj);
+      json_array_add_object_element (sublayer_hrd_params, subparam);
+    }
+  }
+  json_object_set_array_member (hrd, "fixed pic rate general flag",
+      fixed_pic_rate_general_flag);
+  json_object_set_array_member (hrd, "fixed pic rate within cvs flag",
+      fixed_pic_rate_within_cvs_flag);
+  json_object_set_array_member (hrd, "elemental duration in tc minus1",
+      elemental_duration_in_tc_minus1);
+  json_object_set_array_member (hrd, "low delay hrd flag", low_delay_hrd_flag);
+  json_object_set_array_member (hrd, "cpb cnt minus1", cpb_cnt_minus1);
+  json_object_set_array_member (hrd, "sublayer hrd params",
+      sublayer_hrd_params);
+
+  return hrd;
+}
+
+static JsonObject *
+gst_h265_2_json_profile_tier_level (const GstH265ProfileTierLevel * ptl)
+{
+  JsonObject *profile_tier_level = json_object_new ();
+  JsonArray *profile_compatibility_flag;
+  JsonArray *sub_layer_profile_present_flag, *sub_layer_level_present_flag,
+      *sub_layer_profile_space;
+  JsonArray *sub_layer_tier_flag, *sub_layer_profile_idc,
+      *sub_layer_profile_compatibility_flag;
+  JsonArray *sub_layer_progressive_source_flag,
+      *sub_layer_interlaced_source_flag, *sub_layer_non_packed_constraint_flag;
+  JsonArray *sub_layer_frame_only_constraint_flag, *sub_layer_level_idc;
+  gint i, j;
+
+  json_object_set_int_member (profile_tier_level, "profile space",
+      ptl->profile_space);
+  json_object_set_int_member (profile_tier_level, "tier flag", ptl->tier_flag);
+  json_object_set_int_member (profile_tier_level, "profile idc",
+      ptl->profile_idc);
+  profile_compatibility_flag = json_array_new ();
+  for (i = 0; i < 32; i++)
+    json_array_add_boolean_element (profile_compatibility_flag,
+        ptl->profile_compatibility_flagi);
+  json_object_set_array_member (profile_tier_level,
+      "profile compatibility flag", profile_compatibility_flag);
+  json_object_set_boolean_member (profile_tier_level, "progressive source flag",
+      ptl->progressive_source_flag);
+  json_object_set_boolean_member (profile_tier_level, "interlaced source flag",
+      ptl->interlaced_source_flag);
+  json_object_set_boolean_member (profile_tier_level,
+      "non packed constraint flag", ptl->non_packed_constraint_flag);
+  json_object_set_boolean_member (profile_tier_level,
+      "frame only constraint flag", ptl->frame_only_constraint_flag);
+  json_object_set_boolean_member (profile_tier_level,
+      "max 12bit constraint flag", ptl->max_12bit_constraint_flag);
+  json_object_set_boolean_member (profile_tier_level,
+      "max 10bit constraint flag", ptl->max_10bit_constraint_flag);
+  json_object_set_boolean_member (profile_tier_level,
+      "max 8bit constraint flag", ptl->max_8bit_constraint_flag);
+  json_object_set_boolean_member (profile_tier_level,
+      "max 422chroma constraint flag", ptl->max_422chroma_constraint_flag);
+  json_object_set_boolean_member (profile_tier_level,
+      "max 420chroma constraint flag", ptl->max_420chroma_constraint_flag);
+  json_object_set_boolean_member (profile_tier_level,
+      "max monochrome constraint flag", ptl->max_monochrome_constraint_flag);
+  json_object_set_boolean_member (profile_tier_level, "intra constraint flag",
+      ptl->intra_constraint_flag);
+  json_object_set_boolean_member (profile_tier_level,
+      "one picture only constraint flag",
+      ptl->one_picture_only_constraint_flag);
+  json_object_set_boolean_member (profile_tier_level,
+      "lower bit rate constraint flag", ptl->lower_bit_rate_constraint_flag);
+  json_object_set_boolean_member (profile_tier_level,
+      "max 14bit constraint flag", ptl->max_14bit_constraint_flag);
+  json_object_set_int_member (profile_tier_level, "level idc", ptl->level_idc);
+
+  sub_layer_profile_present_flag = json_array_new ();
+  sub_layer_level_present_flag = json_array_new ();
+  sub_layer_profile_space = json_array_new ();
+  sub_layer_tier_flag = json_array_new ();
+  sub_layer_profile_idc = json_array_new ();
+  sub_layer_profile_compatibility_flag = json_array_new ();
+  sub_layer_progressive_source_flag = json_array_new ();
+  sub_layer_interlaced_source_flag = json_array_new ();
+  sub_layer_non_packed_constraint_flag = json_array_new ();
+  sub_layer_frame_only_constraint_flag = json_array_new ();
+  sub_layer_level_idc = json_array_new ();
+
+  for (i = 0; i < 6; i++) {
+    json_array_add_boolean_element (sub_layer_profile_present_flag,
+        ptl->sub_layer_profile_present_flagi);
+    json_array_add_boolean_element (sub_layer_level_present_flag,
+        ptl->sub_layer_level_present_flagi);
+    json_array_add_int_element (sub_layer_profile_space,
+        ptl->sub_layer_profile_spacei);
+    json_array_add_int_element (sub_layer_tier_flag,
+        ptl->sub_layer_tier_flagi);
+    json_array_add_int_element (sub_layer_profile_idc,
+        ptl->sub_layer_profile_idci);
+    for (j = 0; j < 32; j++)
+      json_array_add_boolean_element (sub_layer_profile_compatibility_flag,
+          ptl->sub_layer_profile_compatibility_flagij);
+    json_array_add_boolean_element (sub_layer_progressive_source_flag,
+        ptl->sub_layer_progressive_source_flagi);
+    json_array_add_boolean_element (sub_layer_interlaced_source_flag,
+        ptl->sub_layer_interlaced_source_flagi);
+    json_array_add_boolean_element (sub_layer_non_packed_constraint_flag,
+        ptl->sub_layer_non_packed_constraint_flagi);
+    json_array_add_boolean_element (sub_layer_frame_only_constraint_flag,
+        ptl->sub_layer_frame_only_constraint_flagi);
+    json_array_add_int_element (sub_layer_level_idc,
+        ptl->sub_layer_level_idci);
+  }
+
+  json_object_set_array_member (profile_tier_level,
+      "sub layer profile present flag", sub_layer_profile_present_flag);
+  json_object_set_array_member (profile_tier_level,
+      "sub layer level present flag", sub_layer_level_present_flag);
+  json_object_set_array_member (profile_tier_level, "sub layer profile space",
+      sub_layer_profile_space);
+  json_object_set_array_member (profile_tier_level, "sub layer tier flag",
+      sub_layer_tier_flag);
+  json_object_set_array_member (profile_tier_level, "sub layer profile idc",
+      sub_layer_profile_idc);
+  json_object_set_array_member (profile_tier_level,
+      "sub layer profile compatibility flag",
+      sub_layer_profile_compatibility_flag);
+  json_object_set_array_member (profile_tier_level,
+      "sub layer progressive source flag", sub_layer_progressive_source_flag);
+  json_object_set_array_member (profile_tier_level,
+      "sub layer interlaced source flag", sub_layer_interlaced_source_flag);
+  json_object_set_array_member (profile_tier_level,
+      "sub layer non packed constraint flag",
+      sub_layer_non_packed_constraint_flag);
+  json_object_set_array_member (profile_tier_level,
+      "sub layer frame_only constraint flag",
+      sub_layer_frame_only_constraint_flag);
+  json_object_set_array_member (profile_tier_level, "sub layer level idc",
+      sub_layer_level_idc);
+
+  return profile_tier_level;
+}
+
+static JsonObject *
+gst_h265_2_json_scaling_list (GstH265ScalingList * sl)
+{
+  JsonObject *scaling_list = json_object_new ();
+  JsonArray *scaling_list_dc_coef_minus8_16x16;
+  JsonArray *scaling_list_dc_coef_minus8_32x32;
+  JsonArray *scaling_lists_4x4;
+  JsonArray *scaling_lists_8x8;
+  JsonArray *scaling_lists_16x16;
+  JsonArray *scaling_lists_32x32;
+  gint i, j;
+
+  scaling_list_dc_coef_minus8_16x16 = json_array_new ();
+  for (i = 0; i < 6; i++)
+    json_array_add_int_element (scaling_list_dc_coef_minus8_16x16,
+        sl->scaling_list_dc_coef_minus8_16x16i);
+  json_object_set_array_member (scaling_list,
+      "scaling list dc coef minus8 16x16", scaling_list_dc_coef_minus8_16x16);
+
+  scaling_list_dc_coef_minus8_32x32 = json_array_new ();
+  for (i = 0; i < 2; i++)
+    json_array_add_int_element (scaling_list_dc_coef_minus8_32x32,
+        sl->scaling_list_dc_coef_minus8_32x32i);
+  json_object_set_array_member (scaling_list,
+      "scaling list dc coef minus8 32x32", scaling_list_dc_coef_minus8_32x32);
+
+  scaling_lists_4x4 = json_array_new ();
+  for (i = 0; i < 6; i++)
+    for (j = 0; j < 16; j++)
+      json_array_add_int_element (scaling_lists_4x4,
+          sl->scaling_lists_4x4ij);
+  json_object_set_array_member (scaling_list, "scaling lists 4x4",
+      scaling_lists_4x4);
+
+  scaling_lists_8x8 = json_array_new ();
+  for (i = 0; i < 6; i++)
+    for (j = 0; j < 64; j++)
+      json_array_add_int_element (scaling_lists_8x8,
+          sl->scaling_lists_8x8ij);
+  json_object_set_array_member (scaling_list, "scaling lists 8x8",
+      scaling_lists_8x8);
+
+  scaling_lists_16x16 = json_array_new ();
+  for (i = 0; i < 6; i++)
+    for (j = 0; j < 64; j++)
+      json_array_add_int_element (scaling_lists_16x16,
+          sl->scaling_lists_16x16ij);
+  json_object_set_array_member (scaling_list, "scaling lists 16x16",
+      scaling_lists_16x16);
+
+  scaling_lists_32x32 = json_array_new ();
+  for (i = 0; i < 2; i++)
+    for (j = 0; j < 64; j++)
+      json_array_add_int_element (scaling_lists_32x32,
+          sl->scaling_lists_32x32ij);
+  json_object_set_array_member (scaling_list, "scaling lists 32x32",
+      scaling_lists_32x32);
+
+  return scaling_list;
+}
+
+static GstFlowReturn
+gst_h265_2_json_parse_sps (GstH2652json * self, GstH265NalUnit * nalu)
+{
+  JsonObject *json = self->json;
+  JsonObject *sps, *profile_tier_level, *scaling_list;
+  JsonArray *max_dec_pic_buffering_minus1;
+  JsonArray *max_num_reorder_pics;
+  JsonArray *max_latency_increase_plus1;
+  JsonArray *short_term_ref_pic_set;
+  GstH265SPS h265_sps;
+  GstH265ParserResult pres;
+  gint i, j;
+
+  pres = gst_h265_parser_parse_sps (self->parser, nalu, &h265_sps, TRUE);
+  if (pres != GST_H265_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to parse SPS, result %d", pres);
+    return GST_FLOW_ERROR;
+  }
+
+  pres = gst_h265_parser_update_sps (self->parser, &h265_sps);
+  if (pres != GST_H265_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to update SPS, result %d", pres);
+    return GST_FLOW_ERROR;
+  }
+
+  GST_LOG_OBJECT (self, "SPS parsed");
+
+  sps = json_object_new ();
+
+  json_object_set_int_member (sps, "vps id", h265_sps.vps_id);
+  json_object_set_int_member (sps, "max sub layers minus1",
+      h265_sps.max_sub_layers_minus1);
+  json_object_set_boolean_member (sps, "temporal id nesting flag",
+      h265_sps.temporal_id_nesting_flag);
+
+  profile_tier_level =
+      gst_h265_2_json_profile_tier_level (&h265_sps.profile_tier_level);
+  json_object_set_object_member (sps, "profile tier level", profile_tier_level);
+
+  json_object_set_int_member (sps, "chroma format idc",
+      h265_sps.chroma_format_idc);
+  json_object_set_boolean_member (sps, "separate colour plane flag",
+      h265_sps.separate_colour_plane_flag);
+  json_object_set_int_member (sps, "pic width in luma samples",
+      h265_sps.pic_width_in_luma_samples);
+  json_object_set_int_member (sps, "pic height in luma_samples",
+      h265_sps.pic_height_in_luma_samples);
+
+  json_object_set_boolean_member (sps, "conformance window flag",
+      h265_sps.conformance_window_flag);
+  if (h265_sps.conformance_window_flag) {
+    json_object_set_int_member (sps, "conf win left offset",
+        h265_sps.conf_win_left_offset);
+    json_object_set_int_member (sps, "conf win right offset",
+        h265_sps.conf_win_right_offset);
+    json_object_set_int_member (sps, "conf win top offset",
+        h265_sps.conf_win_top_offset);
+    json_object_set_int_member (sps, "conf win bottom offset",
+        h265_sps.conf_win_bottom_offset);
+  }
+
+  json_object_set_int_member (sps, "bit depth luma minus8",
+      h265_sps.bit_depth_luma_minus8);
+  json_object_set_int_member (sps, "bit depth chroma minus8",
+      h265_sps.bit_depth_chroma_minus8);
+  json_object_set_int_member (sps, "log2 max pic order cnt lsb minus4",
+      h265_sps.log2_max_pic_order_cnt_lsb_minus4);
+  json_object_set_boolean_member (sps, "sub_layer_ordering_info_present_flag",
+      h265_sps.sub_layer_ordering_info_present_flag);
+
+  max_dec_pic_buffering_minus1 = json_array_new ();
+  for (i = 0; i < GST_H265_MAX_SUB_LAYERS; i++)
+    json_array_add_int_element (max_dec_pic_buffering_minus1,
+        h265_sps.max_dec_pic_buffering_minus1i);
+  json_object_set_array_member (sps, "max dec pic buffering minus1",
+      max_dec_pic_buffering_minus1);
+
+  max_num_reorder_pics = json_array_new ();
+  for (i = 0; i < GST_H265_MAX_SUB_LAYERS; i++)
+    json_array_add_int_element (max_num_reorder_pics,
+        h265_sps.max_num_reorder_picsi);
+  json_object_set_array_member (sps, "max num reorder pics",
+      max_num_reorder_pics);
+
+  max_latency_increase_plus1 = json_array_new ();
+  for (i = 0; i < GST_H265_MAX_SUB_LAYERS; i++)
+    json_array_add_int_element (max_latency_increase_plus1,
+        h265_sps.max_latency_increase_plus1i);
+  json_object_set_array_member (sps, "max_latency_increase_plus1",
+      max_latency_increase_plus1);
+
+  json_object_set_int_member (sps, "log2 min luma coding block size minus3",
+      h265_sps.log2_min_luma_coding_block_size_minus3);
+  json_object_set_int_member (sps, "log2 diff max min luma coding block size",
+      h265_sps.log2_diff_max_min_luma_coding_block_size);
+  json_object_set_int_member (sps, "log2 min transform block size minus2",
+      h265_sps.log2_min_transform_block_size_minus2);
+  json_object_set_int_member (sps, "log2 diff max min transform block size",
+      h265_sps.log2_diff_max_min_transform_block_size);
+  json_object_set_int_member (sps, "max transform hierarchy depth inter",
+      h265_sps.max_transform_hierarchy_depth_inter);
+  json_object_set_int_member (sps, "max transform hierarchy depth intra",
+      h265_sps.max_transform_hierarchy_depth_intra);
+
+  json_object_set_boolean_member (sps, "scaling list enabled flag",
+      h265_sps.scaling_list_enabled_flag);
+  if (h265_sps.scaling_list_enabled_flag)
+    json_object_set_boolean_member (sps, "scaling list data present flag",
+        h265_sps.scaling_list_data_present_flag);
+
+  scaling_list = gst_h265_2_json_scaling_list (&h265_sps.scaling_list);
+  json_object_set_object_member (sps, "scaling list", scaling_list);
+
+  json_object_set_boolean_member (sps, "amp enabled flag",
+      h265_sps.amp_enabled_flag);
+  json_object_set_boolean_member (sps, "sample adaptive offset enabled flag",
+      h265_sps.sample_adaptive_offset_enabled_flag);
+  json_object_set_boolean_member (sps, "pcm enabled flag",
+      h265_sps.pcm_enabled_flag);
+  if (h265_sps.pcm_enabled_flag) {
+    json_object_set_int_member (sps, "pcm sample bit depth luma minus1",
+        h265_sps.pcm_sample_bit_depth_luma_minus1);
+    json_object_set_int_member (sps, "pcm sample bit depth chroma minus1",
+        h265_sps.pcm_sample_bit_depth_chroma_minus1);
+    json_object_set_int_member (sps,
+        "log2 min pcm luma coding block size minus3",
+        h265_sps.log2_min_pcm_luma_coding_block_size_minus3);
+    json_object_set_int_member (sps,
+        "log2 diff max min pcm luma coding block size",
+        h265_sps.log2_diff_max_min_pcm_luma_coding_block_size);
+    json_object_set_boolean_member (sps, "pcm loop filter disabled flag",
+        h265_sps.pcm_loop_filter_disabled_flag);
+  }
+
+  json_object_set_int_member (sps, "num short term ref pic sets",
+      h265_sps.num_short_term_ref_pic_sets);
+  short_term_ref_pic_set = json_array_new ();
+  for (i = 0; i < h265_sps.num_short_term_ref_pic_sets; i++) {
+    JsonObject *pic_set = json_object_new ();
+
+    json_object_set_boolean_member (pic_set,
+        "inter ref pic set prediction flag",
+        h265_sps.short_term_ref_pic_seti.inter_ref_pic_set_prediction_flag);
+    json_object_set_int_member (pic_set, "delta idx minus1",
+        h265_sps.short_term_ref_pic_seti.delta_idx_minus1);
+    json_object_set_int_member (pic_set, "delta rps sign",
+        h265_sps.short_term_ref_pic_seti.delta_rps_sign);
+    json_object_set_int_member (pic_set, "abs delta rps minus1",
+        h265_sps.short_term_ref_pic_seti.abs_delta_rps_minus1);
+
+    json_array_add_object_element (short_term_ref_pic_set, pic_set);
+  }
+  json_object_set_array_member (sps, "num short term ref pic sets",
+      short_term_ref_pic_set);
+
+  json_object_set_boolean_member (sps, "long term ref pics present flag",
+      h265_sps.long_term_ref_pics_present_flag);
+  if (h265_sps.long_term_ref_pics_present_flag) {
+    JsonArray *lt_ref_pic_poc_lsb_sps = json_array_new ();
+    JsonArray *used_by_curr_pic_lt_sps_flag = json_array_new ();
+
+    json_object_set_int_member (sps, "num long term ref pics sps",
+        h265_sps.num_long_term_ref_pics_sps);
+
+    for (j = 0; j < h265_sps.num_long_term_ref_pics_sps; j++) {
+      json_array_add_int_element (lt_ref_pic_poc_lsb_sps,
+          h265_sps.lt_ref_pic_poc_lsb_spsj);
+      json_array_add_int_element (used_by_curr_pic_lt_sps_flag,
+          h265_sps.used_by_curr_pic_lt_sps_flagi);
+    }
+    json_object_set_array_member (sps, "lt ref pic poc lsb sps",
+        lt_ref_pic_poc_lsb_sps);
+    json_object_set_array_member (sps, "used by curr pic lt sps flag",
+        used_by_curr_pic_lt_sps_flag);
+  }
+
+  json_object_set_boolean_member (sps, "temporal mvp enabled flag",
+      h265_sps.temporal_mvp_enabled_flag);
+  json_object_set_boolean_member (sps, "strong intra smoothing enabled flag",
+      h265_sps.strong_intra_smoothing_enabled_flag);
+  json_object_set_boolean_member (sps, "vui parameters present flag",
+      h265_sps.vui_parameters_present_flag);
+
+  if (h265_sps.vui_parameters_present_flag) {
+    GstH265VUIParams *params = &h265_sps.vui_params;
+    JsonObject *vui = json_object_new ();
+
+    json_object_set_boolean_member (vui, "aspect ratio info present flag",
+        params->aspect_ratio_info_present_flag);
+    json_object_set_int_member (vui, "aspect ratio idc",
+        params->aspect_ratio_idc);
+    if (params->aspect_ratio_idc == 255) {
+      json_object_set_int_member (vui, "sar width", params->sar_width);
+      json_object_set_int_member (vui, "sar height", params->sar_height);
+    }
+
+    json_object_set_boolean_member (vui, "overscan info present flag",
+        params->overscan_info_present_flag);
+    if (params->overscan_info_present_flag)
+      json_object_set_boolean_member (vui, "overscan appropriate flag",
+          params->overscan_appropriate_flag);
+
+    json_object_set_boolean_member (vui, "video signal type present flag",
+        params->video_signal_type_present_flag);
+    if (params->video_signal_type_present_flag) {
+      json_object_set_int_member (vui, "video format", params->video_format);
+      json_object_set_boolean_member (vui, "video full range flag",
+          params->video_full_range_flag);
+      json_object_set_boolean_member (vui, "colour description present flag",
+          params->colour_description_present_flag);
+      json_object_set_int_member (vui, "colour primaries",
+          params->colour_primaries);
+      json_object_set_int_member (vui, "transfer characteristics",
+          params->transfer_characteristics);
+      json_object_set_int_member (vui, "matrix coefficients",
+          params->matrix_coefficients);
+    }
+
+    json_object_set_boolean_member (vui, "chroma loc info present flag",
+        params->chroma_loc_info_present_flag);
+    if (params->chroma_loc_info_present_flag) {
+      json_object_set_int_member (vui, "chroma sample loc type top field",
+          params->chroma_sample_loc_type_top_field);
+      json_object_set_int_member (vui, "chroma sample loc type bottom field",
+          params->chroma_sample_loc_type_bottom_field);
+    }
+
+    json_object_set_boolean_member (vui, "neutral chroma indication flag",
+        params->neutral_chroma_indication_flag);
+    json_object_set_boolean_member (vui, "field seq flag",
+        params->field_seq_flag);
+    json_object_set_boolean_member (vui, "frame field info present flag",
+        params->frame_field_info_present_flag);
+
+    json_object_set_boolean_member (vui, "default display window flag",
+        params->default_display_window_flag);
+    if (params->default_display_window_flag) {
+      json_object_set_int_member (vui, "def disp win left offset",
+          params->def_disp_win_left_offset);
+      json_object_set_int_member (vui, "def disp win right offset",
+          params->def_disp_win_right_offset);
+      json_object_set_int_member (vui, "def disp win top offset",
+          params->def_disp_win_top_offset);
+      json_object_set_int_member (vui, "def disp win bottom offset",
+          params->def_disp_win_bottom_offset);
+    }
+
+    json_object_set_boolean_member (vui, "timing info present flag",
+        params->timing_info_present_flag);
+    if (params->timing_info_present_flag) {
+      json_object_set_int_member (vui, "num units in tick",
+          params->num_units_in_tick);
+      json_object_set_int_member (vui, "time scale", params->time_scale);
+
+      json_object_set_boolean_member (vui, "poc proportional to timing flag",
+          params->poc_proportional_to_timing_flag);
+      if (params->poc_proportional_to_timing_flag)
+        json_object_set_int_member (vui, "num ticks poc diff one minus1",
+            params->num_ticks_poc_diff_one_minus1);
+
+      json_object_set_boolean_member (vui, "hrd_parameters_present_flag",
+          params->hrd_parameters_present_flag);
+      if (params->hrd_parameters_present_flag) {
+        JsonObject *hrd = gst_h265_2_json_hrd_params (&params->hrd_params,
+            h265_sps.max_sub_layers_minus1);
+
+        json_object_set_object_member (vui, "hrd params", hrd);
+      }
+    }
+
+    json_object_set_boolean_member (vui, "bitstream restriction flag",
+        params->bitstream_restriction_flag);
+    if (params->bitstream_restriction_flag) {
+      json_object_set_boolean_member (vui, "tiles fixed structure flag",
+          params->tiles_fixed_structure_flag);
+      json_object_set_boolean_member (vui,
+          "motion vectors over pic boundaries flag",
+          params->motion_vectors_over_pic_boundaries_flag);
+      json_object_set_boolean_member (vui, "restricted ref pic lists flag",
+          params->restricted_ref_pic_lists_flag);
+      json_object_set_int_member (vui, "min spatial segmentation idc",
+          params->min_spatial_segmentation_idc);
+      json_object_set_int_member (vui, "max bytes per pic denom",
+          params->max_bytes_per_pic_denom);
+      json_object_set_int_member (vui, "max bits per min cu denom",
+          params->max_bits_per_min_cu_denom);
+      json_object_set_int_member (vui, "log2 max mv length horizontal",
+          params->log2_max_mv_length_horizontal);
+      json_object_set_int_member (vui, "log2 max mv length vertical",
+          params->log2_max_mv_length_vertical);
+    }
+
+    json_object_set_object_member (sps, "vui params", vui);
+  }
+
+  json_object_set_boolean_member (sps, "sps extension flag",
+      h265_sps.sps_extension_flag);
+  if (h265_sps.sps_extension_flag) {
+    json_object_set_boolean_member (sps, "sps range extension flag",
+        h265_sps.sps_range_extension_flag);
+    json_object_set_boolean_member (sps, "sps multilayer extension_flag",
+        h265_sps.sps_multilayer_extension_flag);
+    json_object_set_boolean_member (sps, "sps 3d extension flag",
+        h265_sps.sps_3d_extension_flag);
+    json_object_set_boolean_member (sps, "sps scc extension flag",
+        h265_sps.sps_scc_extension_flag);
+    json_object_set_int_member (sps, "sps extension 4bits",
+        h265_sps.sps_extension_4bits);
+
+    if (h265_sps.sps_range_extension_flag) {
+      json_object_set_boolean_member (sps,
+          "transform skip rotation enabled flag",
+          h265_sps.sps_extension_params.transform_skip_rotation_enabled_flag);
+      json_object_set_boolean_member (sps,
+          "transform skip context enabled flag",
+          h265_sps.sps_extension_params.transform_skip_context_enabled_flag);
+      json_object_set_boolean_member (sps, "implicit rdpcm enabled flag",
+          h265_sps.sps_extension_params.implicit_rdpcm_enabled_flag);
+      json_object_set_boolean_member (sps, "explicit rdpcm enabled flag",
+          h265_sps.sps_extension_params.explicit_rdpcm_enabled_flag);
+      json_object_set_boolean_member (sps, "extended precision processing flag",
+          h265_sps.sps_extension_params.extended_precision_processing_flag);
+      json_object_set_boolean_member (sps, "intra smoothing disabled flag",
+          h265_sps.sps_extension_params.intra_smoothing_disabled_flag);
+      json_object_set_boolean_member (sps,
+          "high precision offsets enabled flag",
+          h265_sps.sps_extension_params.high_precision_offsets_enabled_flag);
+      json_object_set_boolean_member (sps,
+          "persistent rice adaptation enabled flag",
+          h265_sps.
+          sps_extension_params.persistent_rice_adaptation_enabled_flag);
+      json_object_set_boolean_member (sps,
+          "cabac bypass alignment enabled flag",
+          h265_sps.sps_extension_params.cabac_bypass_alignment_enabled_flag);
+    }
+
+    if (h265_sps.sps_scc_extension_flag) {
+      JsonArray *sps_palette_predictor_initializer = json_array_new ();
+
+      json_object_set_boolean_member (sps, "sps curr pic ref enabled flag",
+          h265_sps.sps_scc_extension_params.sps_curr_pic_ref_enabled_flag);
+      json_object_set_boolean_member (sps, "palette mode enabled flag",
+          h265_sps.sps_scc_extension_params.palette_mode_enabled_flag);
+      json_object_set_int_member (sps, "palette max size",
+          h265_sps.sps_scc_extension_params.palette_max_size);
+      json_object_set_int_member (sps, "delta palette max_predictor size",
+          h265_sps.sps_scc_extension_params.delta_palette_max_predictor_size);
+      json_object_set_boolean_member (sps,
+          "sps palette predictor initializers present flag",
+          h265_sps.
+          sps_scc_extension_params.sps_palette_predictor_initializers_present_flag);
+      json_object_set_int_member (sps,
+          "sps num palette predictor initializer minus1",
+          h265_sps.
+          sps_scc_extension_params.sps_num_palette_predictor_initializer_minus1);
+
+      for (i = 0; i < 3; i++) {
+        JsonArray *sub = json_array_new ();
+        for (j = 0; j < 128; j++)
+          json_array_add_int_element (sub,
+              h265_sps.
+              sps_scc_extension_params.sps_palette_predictor_initializerij);
+        json_array_add_array_element (sps_palette_predictor_initializer, sub);
+      }
+      json_object_set_array_member (sps, "sps palette predictor initializer",
+          sps_palette_predictor_initializer);
+      json_object_set_int_member (sps, "motion vector resolution control idc",
+          h265_sps.
+          sps_scc_extension_params.motion_vector_resolution_control_idc);
+      json_object_set_boolean_member (sps,
+          "intra boundary filtering disabled flag",
+          h265_sps.
+          sps_scc_extension_params.intra_boundary_filtering_disabled_flag);
+    }
+  }
+
+  json_object_set_object_member (json, "sps", sps);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_h265_2_json_parse_vps (GstH2652json * self, GstH265NalUnit * nalu)
+{
+  GstH265VPS h265_vps;
+  JsonObject *vps;
+  GstH265ParserResult pres;
+  JsonObject *json = self->json;
+  JsonObject *profile_tier_level, *hrd;
+  JsonArray *max_dec_pic_buffering_minus1, *max_num_reorder_pics,
+      *max_latency_increase_plus1;
+  gint i;
+
+  pres = gst_h265_parser_parse_vps (self->parser, nalu, &h265_vps);
+  if (pres != GST_H265_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to parse VPS, result %d", pres);
+    return GST_FLOW_ERROR;
+  }
+
+  pres = gst_h265_parser_update_vps (self->parser, &h265_vps);
+  if (pres != GST_H265_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to update VPS, result %d", pres);
+    return GST_FLOW_ERROR;
+  }
+
+  GST_LOG_OBJECT (self, "VPS parsed");
+
+  vps = json_object_new ();
+
+  json_object_set_boolean_member (vps, "base layer internal flag",
+      h265_vps.base_layer_internal_flag);
+  json_object_set_boolean_member (vps, "base layer available flag",
+      h265_vps.base_layer_available_flag);
+
+  json_object_set_int_member (vps, "max layers minus1",
+      h265_vps.max_layers_minus1);
+  json_object_set_int_member (vps, "max sub layers minus1",
+      h265_vps.max_sub_layers_minus1);
+  json_object_set_boolean_member (vps, "temporal id nesting flag",
+      h265_vps.temporal_id_nesting_flag);
+
+  profile_tier_level =
+      gst_h265_2_json_profile_tier_level (&h265_vps.profile_tier_level);
+  json_object_set_object_member (vps, "profile tier level", profile_tier_level);
+
+  json_object_set_boolean_member (vps, "sub layer ordering info present flag",
+      h265_vps.sub_layer_ordering_info_present_flag);
+
+  max_dec_pic_buffering_minus1 = json_array_new ();
+  max_num_reorder_pics = json_array_new ();
+  max_latency_increase_plus1 = json_array_new ();
+
+  for (i = 0; i < GST_H265_MAX_SUB_LAYERS; i++) {
+    json_array_add_int_element (max_dec_pic_buffering_minus1,
+        h265_vps.max_dec_pic_buffering_minus1i);
+    json_array_add_int_element (max_num_reorder_pics,
+        h265_vps.max_num_reorder_picsi);
+    json_array_add_int_element (max_latency_increase_plus1,
+        h265_vps.max_latency_increase_plus1i);
+  }
+  json_object_set_array_member (vps, "max dec pic buffering minus1",
+      max_dec_pic_buffering_minus1);
+  json_object_set_array_member (vps, "max num reorder pics",
+      max_num_reorder_pics);
+  json_object_set_array_member (vps, "max latency increase plus1",
+      max_latency_increase_plus1);
+
+  json_object_set_int_member (vps, "max layer id", h265_vps.max_layer_id);
+  json_object_set_int_member (vps, "num layer sets minus1",
+      h265_vps.num_layer_sets_minus1);
+
+  json_object_set_boolean_member (vps, "timing info present flag",
+      h265_vps.timing_info_present_flag);
+  json_object_set_int_member (vps, "num units in tick",
+      h265_vps.num_units_in_tick);
+  json_object_set_int_member (vps, "time scale", h265_vps.time_scale);
+  json_object_set_boolean_member (vps, "poc proportional to timing flag",
+      h265_vps.poc_proportional_to_timing_flag);
+  json_object_set_int_member (vps, "num ticks poc diff one minus1",
+      h265_vps.num_ticks_poc_diff_one_minus1);
+
+  json_object_set_int_member (vps, "hrd layer set idx",
+      h265_vps.hrd_layer_set_idx);
+  json_object_set_boolean_member (vps, "cprms present flag",
+      h265_vps.cprms_present_flag);
+
+  json_object_set_int_member (vps, "vps extension", h265_vps.vps_extension);
+
+  hrd = gst_h265_2_json_hrd_params (&h265_vps.hrd_params, 0);
+  json_object_set_object_member (vps, "hrd params", hrd);
+
+  json_object_set_object_member (json, "vps", vps);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_h265_2_json_parse_pps (GstH2652json * self, GstH265NalUnit * nalu)
+{
+  GstH265PPS h265_pps;
+  JsonObject *pps;
+  GstH265ParserResult pres;
+  JsonObject *json = self->json;
+  JsonObject *scaling_list;
+  JsonArray *column_width_minus1, *row_height_minus1;
+  gint i, j;
+
+  pres = gst_h265_parser_parse_pps (self->parser, nalu, &h265_pps);
+  if (pres != GST_H265_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to parse PPS, result %d", pres);
+    return GST_FLOW_ERROR;
+  }
+
+  GST_LOG_OBJECT (self, "PPS parsed");
+
+  pps = json_object_new ();
+
+  json_object_set_int_member (pps, "sps id", h265_pps.sps_id);
+
+  json_object_set_boolean_member (pps, "dependent slice segments enabled flag",
+      h265_pps.dependent_slice_segments_enabled_flag);
+  json_object_set_boolean_member (pps, "output flag present flag",
+      h265_pps.output_flag_present_flag);
+  json_object_set_int_member (pps, "num extra slice header bits",
+      h265_pps.num_extra_slice_header_bits);
+  json_object_set_boolean_member (pps, "sign data hiding enabled flag",
+      h265_pps.sign_data_hiding_enabled_flag);
+  json_object_set_boolean_member (pps, "cabac init present flag",
+      h265_pps.cabac_init_present_flag);
+  json_object_set_int_member (pps, "num ref idx l0 default active minus1",
+      h265_pps.num_ref_idx_l0_default_active_minus1);
+  json_object_set_int_member (pps, "num ref idx l1 default active minus1",
+      h265_pps.num_ref_idx_l1_default_active_minus1);
+  json_object_set_int_member (pps, "init qp minus26", h265_pps.init_qp_minus26);
+  json_object_set_boolean_member (pps, "constrained intra pred flag",
+      h265_pps.constrained_intra_pred_flag);
+  json_object_set_boolean_member (pps, "transform skip enabled flag",
+      h265_pps.transform_skip_enabled_flag);
+  json_object_set_boolean_member (pps, "cu qp delta enabled flag",
+      h265_pps.cu_qp_delta_enabled_flag);
+  if (h265_pps.cu_qp_delta_enabled_flag)
+    json_object_set_int_member (pps, "diff cu qp delta depth",
+        h265_pps.diff_cu_qp_delta_depth);
+
+  json_object_set_int_member (pps, "cb qp offset", h265_pps.cb_qp_offset);
+  json_object_set_int_member (pps, "cr qp offset", h265_pps.cr_qp_offset);
+  json_object_set_boolean_member (pps, "slice chroma qp offsets present flag",
+      h265_pps.slice_chroma_qp_offsets_present_flag);
+  json_object_set_boolean_member (pps, "weighted pred flag",
+      h265_pps.weighted_pred_flag);
+  json_object_set_boolean_member (pps, "weighted bipred flag",
+      h265_pps.weighted_bipred_flag);
+  json_object_set_boolean_member (pps, "transquant bypass enabled flag",
+      h265_pps.transquant_bypass_enabled_flag);
+  json_object_set_boolean_member (pps, "tiles enabled flag",
+      h265_pps.tiles_enabled_flag);
+  json_object_set_boolean_member (pps, "entropy_coding_sync_enabled_flag",
+      h265_pps.entropy_coding_sync_enabled_flag);
+
+  json_object_set_int_member (pps, "num tile columns minus1",
+      h265_pps.num_tile_columns_minus1);
+  json_object_set_int_member (pps, "num tile rows minus1",
+      h265_pps.num_tile_rows_minus1);
+  json_object_set_boolean_member (pps, "uniform spacing flag",
+      h265_pps.uniform_spacing_flag);
+
+  column_width_minus1 = json_array_new ();
+  for (i = 0; i < 20; i++)
+    json_array_add_int_element (column_width_minus1,
+        h265_pps.column_width_minus1i);
+  json_object_set_array_member (pps, "column width minus1",
+      column_width_minus1);
+
+  row_height_minus1 = json_array_new ();
+  for (i = 0; i < 22; i++)
+    json_array_add_int_element (row_height_minus1,
+        h265_pps.row_height_minus1i);
+  json_object_set_array_member (pps, "row height minus1", row_height_minus1);
+
+  json_object_set_boolean_member (pps, "loop filter across tiles enabled flag",
+      h265_pps.loop_filter_across_tiles_enabled_flag);
+  json_object_set_boolean_member (pps, "loop filter across slices enabled flag",
+      h265_pps.loop_filter_across_slices_enabled_flag);
+  json_object_set_boolean_member (pps, "deblocking filter control present flag",
+      h265_pps.deblocking_filter_control_present_flag);
+  json_object_set_boolean_member (pps,
+      "deblocking filter override enabled_flag",
+      h265_pps.deblocking_filter_override_enabled_flag);
+  json_object_set_boolean_member (pps, "deblocking filter disabled flag",
+      h265_pps.deblocking_filter_disabled_flag);
+  json_object_set_int_member (pps, "beta offset div2",
+      h265_pps.beta_offset_div2);
+  json_object_set_int_member (pps, "tc offset div2", h265_pps.tc_offset_div2);
+
+  json_object_set_boolean_member (pps, "scaling list data present flag",
+      h265_pps.scaling_list_data_present_flag);
+
+  scaling_list = gst_h265_2_json_scaling_list (&h265_pps.scaling_list);
+  json_object_set_object_member (pps, "scaling list", scaling_list);
+
+  json_object_set_boolean_member (pps, "lists modification present_flag",
+      h265_pps.lists_modification_present_flag);
+  json_object_set_int_member (pps, "log2 parallel merge level minus2",
+      h265_pps.log2_parallel_merge_level_minus2);
+  json_object_set_boolean_member (pps,
+      "slice segment header extension present flag",
+      h265_pps.slice_segment_header_extension_present_flag);
+
+  json_object_set_boolean_member (pps, "pps extension flag",
+      h265_pps.pps_extension_flag);
+  if (h265_pps.pps_extension_flag) {
+    json_object_set_boolean_member (pps, "pps range extension flag",
+        h265_pps.pps_range_extension_flag);
+    json_object_set_boolean_member (pps, "pps multilayer extension flag",
+        h265_pps.pps_multilayer_extension_flag);
+    json_object_set_boolean_member (pps, "pps 3d extension flag",
+        h265_pps.pps_3d_extension_flag);
+    json_object_set_boolean_member (pps, "pps scc extension flag",
+        h265_pps.pps_scc_extension_flag);
+    json_object_set_int_member (pps, "pps extension 4bits",
+        h265_pps.pps_extension_4bits);
+  }
+
+  if (h265_pps.pps_range_extension_flag) {
+    GstH265PPSExtensionParams *p = &h265_pps.pps_extension_params;
+    JsonObject *params = json_object_new ();
+    JsonArray *cb_qp_offset_list = json_array_new ();
+    JsonArray *cr_qp_offset_list = json_array_new ();
+
+    json_object_set_int_member (params,
+        "log2 max transform skip block size minus2",
+        p->log2_max_transform_skip_block_size_minus2);
+    json_object_set_boolean_member (params,
+        "cross component prediction enabled flag",
+        p->cross_component_prediction_enabled_flag);
+    json_object_set_boolean_member (params,
+        "chroma qp offset list enabled flag",
+        p->chroma_qp_offset_list_enabled_flag);
+    json_object_set_int_member (params, "diff cu chroma qp offset depth",
+        p->diff_cu_chroma_qp_offset_depth);
+    json_object_set_int_member (params, "chroma qp offset list len_minus1",
+        p->chroma_qp_offset_list_len_minus1);
+
+    for (i = 0; i < 6; i++) {
+      json_array_add_int_element (cb_qp_offset_list, p->cb_qp_offset_listi);
+      json_array_add_int_element (cr_qp_offset_list, p->cr_qp_offset_listi);
+    }
+    json_object_set_array_member (params, "cb qp offset list",
+        cb_qp_offset_list);
+    json_object_set_array_member (params, "cr qp offset list",
+        cr_qp_offset_list);
+
+    json_object_set_int_member (params, "log2 sao offset scale luma",
+        p->log2_sao_offset_scale_luma);
+    json_object_set_int_member (params, "log2 sao offset scale chroma",
+        p->log2_sao_offset_scale_chroma);
+
+    json_object_set_object_member (pps, "pps extension params", params);
+  }
+
+  if (h265_pps.pps_scc_extension_flag) {
+    GstH265PPSSccExtensionParams *p = &h265_pps.pps_scc_extension_params;
+    JsonObject *params = json_object_new ();
+    JsonArray *initializer = json_array_new ();
+
+    json_object_set_boolean_member (params, "pps curr pic ref enabled flag",
+        p->pps_curr_pic_ref_enabled_flag);
+    json_object_set_boolean_member (params,
+        "residual adaptive colour transform enabled flag",
+        p->residual_adaptive_colour_transform_enabled_flag);
+    json_object_set_boolean_member (params,
+        "pps slice act qp offsets present flag",
+        p->pps_slice_act_qp_offsets_present_flag);
+    json_object_set_int_member (params, "pps act y qp offset plus5",
+        p->pps_act_y_qp_offset_plus5);
+    json_object_set_int_member (params, "pps act cb qp offset plus5",
+        p->pps_act_cb_qp_offset_plus5);
+    json_object_set_int_member (params, "pps act cr qp offset plus3",
+        p->pps_act_cr_qp_offset_plus3);
+    json_object_set_boolean_member (params,
+        "pps palette predictor initializers present flag",
+        p->pps_palette_predictor_initializers_present_flag);
+    json_object_set_int_member (params, "pps num palette predictor initializer",
+        p->pps_num_palette_predictor_initializer);
+    json_object_set_boolean_member (params, "monochrome palette flag",
+        p->monochrome_palette_flag);
+    json_object_set_int_member (params, "luma bit depth entry minus8",
+        p->luma_bit_depth_entry_minus8);
+    json_object_set_int_member (params, "chroma bit depth entry minus8",
+        p->chroma_bit_depth_entry_minus8);
+
+    for (i = 0; i < 3; i++) {
+      JsonArray *sub = json_array_new ();
+      for (j = 0; j < 128; j++)
+        json_array_add_int_element (sub,
+            p->pps_palette_predictor_initializerij);
+      json_array_add_array_element (initializer, sub);
+    }
+    json_object_set_array_member (params, "pps palette predictor initializer",
+        initializer);
+    json_object_set_object_member (pps, "pps scc extension_params", params);
+  }
+
+  json_object_set_object_member (json, "pps", pps);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_h265_2_json_parse_sei (GstH2652json * self, GstH265NalUnit * nalu)
+{
+  JsonObject *sei;
+  GstH265ParserResult pres;
+  JsonObject *json = self->json;
+  GArray *messages = NULL;
+  gint i;
+
+  pres = gst_h265_parser_parse_sei (self->parser, nalu, &messages);
+  if (pres != GST_H265_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to parse SEI, result %d", pres);
+
+    /* XXX: Ignore error from SEI parsing, it might be malformed bitstream,
+     * or our fault. But shouldn't be critical  */
+    g_clear_pointer (&messages, g_array_unref);
+    return GST_FLOW_OK;
+  }
+
+  sei = json_object_new ();
+
+  GST_LOG_OBJECT (self, "SEI parsed");
+
+  for (i = 0; i < messages->len; i++) {
+    GstH265SEIMessage *m = &g_array_index (messages, GstH265SEIMessage, i);
+
+    switch (m->payloadType) {
+      case GST_H265_SEI_PIC_TIMING:
+      {
+        JsonObject *timing = json_object_new ();
+
+        json_object_set_int_member (timing, "pic struct",
+            m->payload.pic_timing.pic_struct);
+        json_object_set_int_member (timing, "source scan type",
+            m->payload.pic_timing.source_scan_type);
+        json_object_set_boolean_member (timing, "duplicate flag",
+            m->payload.pic_timing.duplicate_flag);
+        json_object_set_object_member (sei, "timing", timing);
+        break;
+      }
+      default:
+        break;
+    }
+  }
+
+  g_array_free (messages, TRUE);
+
+  json_object_set_object_member (json, "sei", sei);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_h265_2_json_parse_slice (GstH2652json * self, GstH265NalUnit * nalu)
+{
+  GstH265ParserResult pres = GST_H265_PARSER_OK;
+  GstH265SliceHdr slice_hdr;
+  GstH265PPS *pps;
+  GstH265SPS *sps;
+  JsonObject *json = self->json;
+  JsonObject *hdr, *ref_pic_list_modification, *pred_weight_table;
+  JsonArray *lt_idx_sps;
+  JsonArray *poc_lsb_lt;
+  JsonArray *used_by_curr_pic_lt_flag;
+  JsonArray *delta_poc_msb_present_flag;
+  JsonArray *delta_poc_msb_cycle_lt;
+  JsonArray *luma_weight_l0_flag;
+  JsonArray *chroma_weight_l0_flag;
+  JsonArray *delta_luma_weight_l0;
+  JsonArray *luma_offset_l0;
+  JsonArray *delta_chroma_weight_l0;
+  JsonArray *delta_chroma_offset_l0;
+  JsonArray *luma_weight_l1_flag;
+  JsonArray *chroma_weight_l1_flag;
+  JsonArray *delta_luma_weight_l1;
+  JsonArray *luma_offset_l1;
+  JsonArray *delta_chroma_weight_l1;
+  JsonArray *delta_chroma_offset_l1;
+
+  GstH265RefPicListModification *m;
+  GstH265PredWeightTable *pwt;
+  gint i, j;
+
+  pres = gst_h265_parser_parse_slice_hdr (self->parser, nalu, &slice_hdr);
+
+  if (pres != GST_H265_PARSER_OK) {
+    GST_ERROR_OBJECT (self, "Failed to parse slice header, ret %d", pres);
+    return GST_FLOW_ERROR;
+  }
+
+  pps = slice_hdr.pps;
+  sps = pps->sps;
+
+  hdr = json_object_new ();
+
+  json_object_set_boolean_member (hdr, "dependent slice segment flag",
+      slice_hdr.dependent_slice_segment_flag);
+  json_object_set_int_member (hdr, "segment address",
+      slice_hdr.segment_address);
+  json_object_set_int_member (hdr, "type", slice_hdr.type);
+
+  json_object_set_boolean_member (hdr, "pic output flag",
+      slice_hdr.pic_output_flag);
+  json_object_set_int_member (hdr, "colour plane id",
+      slice_hdr.colour_plane_id);
+  json_object_set_int_member (hdr, "pic_order_cnt_lsb",
+      slice_hdr.pic_order_cnt_lsb);
+
+  json_object_set_boolean_member (hdr, "short term ref pic set sps flag",
+      slice_hdr.short_term_ref_pic_set_sps_flag);
+  if (!slice_hdr.short_term_ref_pic_set_sps_flag) {
+    JsonObject *st_rps = json_object_new ();
+
+    json_object_set_boolean_member (st_rps, "inter ref pic set prediction flag",
+        slice_hdr.short_term_ref_pic_sets.inter_ref_pic_set_prediction_flag);
+    json_object_set_int_member (st_rps, "delta idx minus1",
+        slice_hdr.short_term_ref_pic_sets.delta_idx_minus1);
+    json_object_set_int_member (st_rps, "delta rps sign",
+        slice_hdr.short_term_ref_pic_sets.delta_rps_sign);
+    json_object_set_int_member (st_rps, "abs delta rps minus1",
+        slice_hdr.short_term_ref_pic_sets.abs_delta_rps_minus1);
+
+    json_object_set_object_member (hdr, "short term ref pic sets", st_rps);
+  } else if (sps->num_short_term_ref_pic_sets > 1) {
+    json_object_set_int_member (hdr, "short term ref pic set idx",
+        slice_hdr.short_term_ref_pic_set_idx);
+  }
+
+  json_object_set_int_member (hdr, "num long term sps",
+      slice_hdr.num_long_term_sps);
+  json_object_set_int_member (hdr, "num long term pics",
+      slice_hdr.num_long_term_pics);
+
+  lt_idx_sps = json_array_new ();
+  poc_lsb_lt = json_array_new ();
+  used_by_curr_pic_lt_flag = json_array_new ();
+  delta_poc_msb_present_flag = json_array_new ();
+  delta_poc_msb_cycle_lt = json_array_new ();
+  for (i = 0; i < 16; i++) {
+    json_array_add_int_element (lt_idx_sps, slice_hdr.lt_idx_spsi);
+    json_array_add_int_element (poc_lsb_lt, slice_hdr.poc_lsb_lti);
+    json_array_add_boolean_element (used_by_curr_pic_lt_flag,
+        slice_hdr.used_by_curr_pic_lt_flagi);
+    json_array_add_boolean_element (delta_poc_msb_present_flag,
+        slice_hdr.delta_poc_msb_present_flagi);
+    json_array_add_int_element (delta_poc_msb_cycle_lt,
+        slice_hdr.delta_poc_msb_cycle_lti);
+  }
+  json_object_set_array_member (hdr, "lt idx sps", lt_idx_sps);
+  json_object_set_array_member (hdr, "poc lsb lt", poc_lsb_lt);
+  json_object_set_array_member (hdr, "used by curr pic lt flag",
+      used_by_curr_pic_lt_flag);
+  json_object_set_array_member (hdr, "delta poc msb present flag",
+      delta_poc_msb_present_flag);
+  json_object_set_array_member (hdr, "delta poc msb cycle lt",
+      delta_poc_msb_cycle_lt);
+
+  json_object_set_boolean_member (hdr, "temporal mvp enabled flag",
+      slice_hdr.temporal_mvp_enabled_flag);
+  json_object_set_boolean_member (hdr, "sao luma flag",
+      slice_hdr.sao_luma_flag);
+  json_object_set_boolean_member (hdr, "sao chroma flag",
+      slice_hdr.sao_chroma_flag);
+  json_object_set_boolean_member (hdr, "num ref idx active override flag",
+      slice_hdr.num_ref_idx_active_override_flag);
+  json_object_set_int_member (hdr, "num ref idx l0 active minus1",
+      slice_hdr.num_ref_idx_l0_active_minus1);
+  json_object_set_int_member (hdr, "num ref idx l1 active minus1",
+      slice_hdr.num_ref_idx_l1_active_minus1);
+
+  m = &slice_hdr.ref_pic_list_modification;
+  ref_pic_list_modification = json_object_new ();
+  json_object_set_boolean_member (ref_pic_list_modification,
+      "ref pic list modification flag l0",
+      m->ref_pic_list_modification_flag_l0);
+  if (m->ref_pic_list_modification_flag_l0) {
+    JsonArray *list_entry_l0 = json_array_new ();
+
+    for (i = 0; i < slice_hdr.num_ref_idx_l0_active_minus1 && i < 15; i++)
+      json_array_add_int_element (list_entry_l0, m->list_entry_l0i);
+
+    json_object_set_array_member (ref_pic_list_modification, "list entry l0",
+        list_entry_l0);
+
+    if (GST_H265_IS_B_SLICE (&slice_hdr)) {
+      json_object_set_boolean_member (ref_pic_list_modification,
+          "ref pic list modification flag l1",
+          m->ref_pic_list_modification_flag_l1);
+
+      if (m->ref_pic_list_modification_flag_l1) {
+        JsonArray *list_entry_l1 = json_array_new ();
+
+        for (i = 0; i < slice_hdr.num_ref_idx_l1_active_minus1 && i < 15; i++)
+          json_array_add_int_element (list_entry_l1, m->list_entry_l1i);
+
+        json_object_set_array_member (ref_pic_list_modification,
+            "list entry l1", list_entry_l1);
+      }
+    }
+  }
+  json_object_set_object_member (hdr, "ref pic list modification",
+      ref_pic_list_modification);
+
+  json_object_set_boolean_member (hdr, "mvd l1 zero flag",
+      slice_hdr.mvd_l1_zero_flag);
+  json_object_set_boolean_member (hdr, "cabac init flag",
+      slice_hdr.cabac_init_flag);
+  json_object_set_boolean_member (hdr, "collocated from l0 flag",
+      slice_hdr.collocated_from_l0_flag);
+  json_object_set_int_member (hdr, "collocated ref idx",
+      slice_hdr.collocated_ref_idx);
+
+  pred_weight_table = json_object_new ();
+  pwt = &slice_hdr.pred_weight_table;
+  luma_weight_l0_flag = json_array_new ();
+  chroma_weight_l0_flag = json_array_new ();
+  delta_luma_weight_l0 = json_array_new ();
+  luma_offset_l0 = json_array_new ();
+  delta_chroma_weight_l0 = json_array_new ();
+  delta_chroma_offset_l0 = json_array_new ();
+  luma_weight_l1_flag = json_array_new ();
+  chroma_weight_l1_flag = json_array_new ();
+  delta_luma_weight_l1 = json_array_new ();
+  luma_offset_l1 = json_array_new ();
+  delta_chroma_weight_l1 = json_array_new ();
+  delta_chroma_offset_l1 = json_array_new ();
+
+  json_object_set_int_member (pred_weight_table, "luma log2 weight denom",
+      pwt->luma_log2_weight_denom);
+  json_object_set_int_member (pred_weight_table,
+      "delta chroma log2 weight denom", pwt->delta_chroma_log2_weight_denom);
+  for (i = 0; i < 15; i++) {
+    json_array_add_boolean_element (luma_weight_l0_flag,
+        pwt->luma_weight_l0_flagi);
+    json_array_add_boolean_element (chroma_weight_l0_flag,
+        pwt->chroma_weight_l0_flagi);
+    json_array_add_int_element (delta_luma_weight_l0,
+        pwt->delta_luma_weight_l0i);
+    json_array_add_int_element (luma_offset_l0, pwt->luma_offset_l0i);
+    for (j = 0; j < 2; j++) {
+      json_array_add_int_element (delta_chroma_weight_l0,
+          pwt->delta_chroma_weight_l0ij);
+      json_array_add_int_element (delta_chroma_offset_l0,
+          pwt->delta_chroma_offset_l0ij);
+    }
+    json_array_add_boolean_element (luma_weight_l1_flag,
+        pwt->luma_weight_l1_flagi);
+    json_array_add_boolean_element (chroma_weight_l1_flag,
+        pwt->chroma_weight_l1_flagi);
+    json_array_add_int_element (delta_luma_weight_l1,
+        pwt->delta_luma_weight_l1i);
+    json_array_add_int_element (luma_offset_l1, pwt->luma_offset_l1i);
+    for (j = 0; j < 2; j++) {
+      json_array_add_int_element (delta_chroma_weight_l1,
+          pwt->delta_chroma_weight_l1ij);
+      json_array_add_int_element (delta_chroma_offset_l1,
+          pwt->delta_chroma_offset_l1ij);
+    }
+  }
+  json_object_set_array_member (pred_weight_table, "luma weight l0 flag",
+      luma_weight_l0_flag);
+  json_object_set_array_member (pred_weight_table, "chroma weight l0 flag",
+      chroma_weight_l0_flag);
+  json_object_set_array_member (pred_weight_table, "delta luma weight l0",
+      delta_luma_weight_l0);
+  json_object_set_array_member (pred_weight_table, "luma offset l0",
+      luma_offset_l0);
+  json_object_set_array_member (pred_weight_table, "delta chroma weight l0",
+      delta_chroma_weight_l0);
+  json_object_set_array_member (pred_weight_table, "delta chroma offset l0",
+      delta_chroma_offset_l0);
+  json_object_set_array_member (pred_weight_table, "luma weight l1 flag",
+      luma_weight_l1_flag);
+  json_object_set_array_member (pred_weight_table, "chroma weight l1 flag",
+      chroma_weight_l1_flag);
+  json_object_set_array_member (pred_weight_table, "delta luma weight l1",
+      delta_luma_weight_l1);
+  json_object_set_array_member (pred_weight_table, "luma offset l1",
+      luma_offset_l1);
+  json_object_set_array_member (pred_weight_table, "delta chroma weight l1",
+      delta_chroma_weight_l1);
+  json_object_set_array_member (pred_weight_table, "delta chroma offset l1",
+      delta_chroma_offset_l1);
+
+  json_object_set_object_member (hdr, "pred weight table", pred_weight_table);
+
+  json_object_set_int_member (hdr, "five minus max num merge cand",
+      slice_hdr.five_minus_max_num_merge_cand);
+  json_object_set_boolean_member (hdr, "use integer mv flag",
+      slice_hdr.use_integer_mv_flag);
+
+  json_object_set_int_member (hdr, "qp delta", slice_hdr.qp_delta);
+  json_object_set_int_member (hdr, "cb qp offset", slice_hdr.cb_qp_offset);
+  json_object_set_int_member (hdr, "cr qp offset", slice_hdr.cr_qp_offset);
+  json_object_set_int_member (hdr, "slice act y qp offset",
+      slice_hdr.slice_act_y_qp_offset);
+  json_object_set_int_member (hdr, "slice act cb qp offset",
+      slice_hdr.slice_act_cb_qp_offset);
+  json_object_set_int_member (hdr, "slice act cr qp offset",
+      slice_hdr.slice_act_cr_qp_offset);
+
+  json_object_set_boolean_member (hdr, "cu chroma qp offset enabled flag",
+      slice_hdr.cu_chroma_qp_offset_enabled_flag);
+
+  json_object_set_boolean_member (hdr, "deblocking filter override flag",
+      slice_hdr.deblocking_filter_override_flag);
+  json_object_set_boolean_member (hdr, "deblocking filter disabled flag",
+      slice_hdr.deblocking_filter_disabled_flag);
+  json_object_set_int_member (hdr, "beta offset div2",
+      slice_hdr.beta_offset_div2);
+  json_object_set_int_member (hdr, "tc offset div2", slice_hdr.tc_offset_div2);
+
+  json_object_set_boolean_member (hdr, "loop filter across slices enabled flag",
+      slice_hdr.loop_filter_across_slices_enabled_flag);
+
+  json_object_set_int_member (hdr, "num entry point offsets",
+      slice_hdr.num_entry_point_offsets);
+  if (slice_hdr.num_entry_point_offsets) {
+    JsonArray *entry_point_offset_minus1 = json_array_new ();
+
+    json_object_set_int_member (hdr, "offset len minus1",
+        slice_hdr.offset_len_minus1);
+    for (i = 0; i < slice_hdr.num_entry_point_offsets; i++)
+      json_array_add_int_element (entry_point_offset_minus1,
+          slice_hdr.entry_point_offset_minus1i);
+
+    json_object_set_array_member (hdr, "entry point offset minus1",
+        entry_point_offset_minus1);
+  }
+
+  json_object_set_object_member (json, "slice header", hdr);
+
+  gst_h265_slice_hdr_free (&slice_hdr);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_h265_2_json_decode_nal (GstH2652json * self, GstH265NalUnit * nalu)
+{
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  GST_LOG_OBJECT (self, "Parsed nal type: %d, offset %d, size %d",
+      nalu->type, nalu->offset, nalu->size);
+
+  switch (nalu->type) {
+    case GST_H265_NAL_VPS:
+      ret = gst_h265_2_json_parse_vps (self, nalu);
+      break;
+    case GST_H265_NAL_SPS:
+      ret = gst_h265_2_json_parse_sps (self, nalu);
+      break;
+    case GST_H265_NAL_PPS:
+      ret = gst_h265_2_json_parse_pps (self, nalu);
+      break;
+    case GST_H265_NAL_PREFIX_SEI:
+    case GST_H265_NAL_SUFFIX_SEI:
+      ret = gst_h265_2_json_parse_sei (self, nalu);
+      break;
+    case GST_H265_NAL_SLICE_TRAIL_N:
+    case GST_H265_NAL_SLICE_TRAIL_R:
+    case GST_H265_NAL_SLICE_TSA_N:
+    case GST_H265_NAL_SLICE_TSA_R:
+    case GST_H265_NAL_SLICE_STSA_N:
+    case GST_H265_NAL_SLICE_STSA_R:
+    case GST_H265_NAL_SLICE_RADL_N:
+    case GST_H265_NAL_SLICE_RADL_R:
+    case GST_H265_NAL_SLICE_RASL_N:
+    case GST_H265_NAL_SLICE_RASL_R:
+    case GST_H265_NAL_SLICE_BLA_W_LP:
+    case GST_H265_NAL_SLICE_BLA_W_RADL:
+    case GST_H265_NAL_SLICE_BLA_N_LP:
+    case GST_H265_NAL_SLICE_IDR_W_RADL:
+    case GST_H265_NAL_SLICE_IDR_N_LP:
+    case GST_H265_NAL_SLICE_CRA_NUT:
+      ret = gst_h265_2_json_parse_slice (self, nalu);
+      break;
+    case GST_H265_NAL_EOB:
+    case GST_H265_NAL_EOS:
+    default:
+      break;
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_h265_2_json_chain (GstPad * sinkpad, GstObject * object, GstBuffer * in_buf)
+{
+  GstH2652json *self = GST_H265_2_JSON (object);
+  JsonObject *json = self->json;
+  GstBuffer *out_buf;
+  gchar *json_string;
+  guint length;
+  GstH265NalUnit nalu;
+  GstH265ParserResult pres;
+  GstMapInfo in_map, out_map;
+  GstFlowReturn ret = GST_FLOW_OK;
+  gint i;
+
+  if (!gst_buffer_map (in_buf, &in_map, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (self, "Cannot map buffer");
+    return GST_FLOW_ERROR;
+  }
+
+  if (self->use_hevc) {
+    guint offset = 0;
+    gsize consumed;
+
+    do {
+      pres = gst_h265_parser_identify_and_split_nalu_hevc (self->parser,
+          in_map.data, offset, in_map.size, self->nal_length_size,
+          self->split_nalu, &consumed);
+      if (pres != GST_H265_PARSER_OK)
+        break;
+
+      for (i = 0; i < self->split_nalu->len; i++) {
+        GstH265NalUnit *nl =
+            &g_array_index (self->split_nalu, GstH265NalUnit, i);
+        ret = gst_h265_2_json_decode_nal (self, nl);
+        if (ret != GST_FLOW_OK)
+          break;
+      }
+
+      if (pres != GST_H265_PARSER_OK)
+        break;
+
+      offset += consumed;
+    } while (pres == GST_H265_PARSER_OK);
+  } else {
+    pres = gst_h265_parser_identify_nalu (self->parser,
+        in_map.data, 0, in_map.size, &nalu);
+
+    if (pres == GST_H265_PARSER_NO_NAL_END)
+      pres = GST_H265_PARSER_OK;
+
+    while (pres == GST_H265_PARSER_OK) {
+      ret = gst_h265_2_json_decode_nal (self, &nalu);
+      if (ret != GST_FLOW_OK)
+        break;
+
+      pres = gst_h265_parser_identify_nalu (self->parser,
+          in_map.data, nalu.offset + nalu.size, in_map.size, &nalu);
+      if (pres == GST_H265_PARSER_NO_NAL_END)
+        pres = GST_H265_PARSER_OK;
+    }
+  }
+
+  if (ret != GST_FLOW_OK)
+    goto err;
+
+  json_string = get_string_from_json_object (json);
+  length = strlen (json_string);
+  out_buf = gst_buffer_new_allocate (NULL, length, NULL);
+  gst_buffer_map (out_buf, &out_map, GST_MAP_WRITE);
+  if (length)
+    memcpy (&out_map.data0, json_string, length);
+  gst_buffer_unmap (out_buf, &out_map);
+
+  g_free (json_string);
+
+  gst_buffer_copy_into (out_buf, in_buf,
+      GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS |
+      GST_BUFFER_COPY_METADATA, 0, -1);
+  ret = gst_pad_push (self->srcpad, out_buf);
+
+err:
+  gst_buffer_unmap (in_buf, &in_map);
+  gst_buffer_unref (in_buf);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_h265_2_json_parse_codec_data (GstH2652json * self, const guint8 * data,
+    gsize size)
+{
+  guint num_nal_arrays;
+  guint off;
+  guint num_nals, i, j;
+  GstH265ParserResult pres;
+  GstH265NalUnit nalu;
+
+  /* parse the hvcC data */
+  if (size < 23) {
+    GST_WARNING_OBJECT (self, "hvcC too small");
+    return GST_FLOW_ERROR;
+  }
+
+  /* wrong hvcC version */
+  if (data0 != 0 && data0 != 1) {
+    return GST_FLOW_ERROR;
+  }
+
+  self->nal_length_size = (data21 & 0x03) + 1;
+  GST_DEBUG_OBJECT (self, "nal length size %u", self->nal_length_size);
+
+  num_nal_arrays = data22;
+  off = 23;
+
+  for (i = 0; i < num_nal_arrays; i++) {
+    if (off + 3 >= size) {
+      GST_WARNING_OBJECT (self, "hvcC too small");
+      return GST_FLOW_ERROR;
+    }
+
+    num_nals = GST_READ_UINT16_BE (data + off + 1);
+    off += 3;
+    for (j = 0; j < num_nals; j++) {
+      GstFlowReturn ret;
+
+      pres = gst_h265_parser_identify_nalu_hevc (self->parser,
+          data, off, size, 2, &nalu);
+
+      if (pres != GST_H265_PARSER_OK) {
+        GST_WARNING_OBJECT (self, "hvcC too small");
+        return GST_FLOW_ERROR;
+      }
+
+      ret = gst_h265_2_json_decode_nal (self, &nalu);
+      if (ret != GST_FLOW_OK)
+        return ret;
+
+      off = nalu.offset + nalu.size;
+    }
+  }
+
+  return GST_FLOW_OK;
+}
+
+static void
+gst_h265_2_json_get_codec_data (GstH2652json * self, GstCaps * caps)
+{
+  if (caps && gst_caps_get_size (caps) > 0) {
+    GstStructure *s = gst_caps_get_structure (caps, 0);
+
+    if (gst_structure_has_field (s, "codec_data")) {
+      GST_WARNING_OBJECT (self, "get codec-data");
+
+      const GValue *h = gst_structure_get_value (s, "codec_data");
+      GstBuffer *codec_data = gst_value_get_buffer (h);
+      GstMapInfo map;
+
+      gst_buffer_map (codec_data, &map, GST_MAP_READ);
+      if (gst_h265_2_json_parse_codec_data (self, map.data,
+              map.size) != GST_FLOW_OK) {
+        /* keep going without error.
+         * Probably inband SPS/PPS might be valid data */
+        GST_WARNING_OBJECT (self, "Failed to handle codec data");
+      }
+      gst_buffer_unmap (codec_data, &map);
+    }
+  }
+}
+
+static void
+gst_h265_2_json_use_hevc (GstH2652json * self, GstCaps * caps)
+{
+  if (caps && gst_caps_get_size (caps) > 0) {
+    GstStructure *s = gst_caps_get_structure (caps, 0);
+    const gchar *str_stream = NULL;
+
+    str_stream = gst_structure_get_string (s, "stream-format");
+
+    self->use_hevc = FALSE;
+    if (str_stream && (g_strcmp0 (str_stream, "hvc1") == 0
+            || g_strcmp0 (str_stream, "hev1") == 0)) {
+      self->use_hevc = TRUE;
+      return;
+    }
+  }
+}
+
+static gboolean
+gst_h265_2_json_set_caps (GstH2652json * self, GstCaps * caps)
+{
+  GstCaps *src_caps =
+      gst_caps_new_simple ("text/x-json", "format", G_TYPE_STRING, "h265",
+      NULL);
+  GstEvent *event;
+
+  event = gst_event_new_caps (src_caps);
+  gst_caps_unref (src_caps);
+
+  gst_h265_2_json_use_hevc (self, caps);
+
+  gst_h265_2_json_get_codec_data (self, caps);
+
+  return gst_pad_push_event (self->srcpad, event);
+}
+
+static gboolean
+gst_h265_2_json_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+{
+  GstH2652json *self = GST_H265_2_JSON (parent);
+  gboolean res = TRUE;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CAPS:
+    {
+      GstCaps *caps;
+
+      gst_event_parse_caps (event, &caps);
+      res = gst_h265_2_json_set_caps (self, caps);
+      gst_event_unref (event);
+      break;
+    }
+    default:
+      res = gst_pad_event_default (pad, parent, event);
+      break;
+  }
+
+  return res;
+}
+
+static void
+gst_h265_2_json_class_init (GstH2652jsonClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
+
+  gobject_class->finalize = gst_h265_2_json_finalize;
+
+  gst_element_class_add_static_pad_template (gstelement_class, &src_factory);
+  gst_element_class_add_static_pad_template (gstelement_class, &sink_factory);
+
+  gst_element_class_set_static_metadata (gstelement_class, "H2652json",
+      "Transform",
+      "H265 to json element",
+      "Benjamin Gaignard <benjamin.gaignard@collabora.com>");
+}
+
+static void
+gst_h265_2_json_init (GstH2652json * self)
+{
+  self->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
+  gst_pad_set_chain_function (self->sinkpad, gst_h265_2_json_chain);
+  gst_element_add_pad (GST_ELEMENT (self), self->sinkpad);
+  gst_pad_set_event_function (self->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_h265_2_json_sink_event));
+
+  self->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
+  gst_element_add_pad (GST_ELEMENT (self), self->srcpad);
+
+  self->json = json_object_new ();
+
+  self->parser = gst_h265_parser_new ();
+  self->nal_length_size = 4;
+  self->split_nalu = g_array_new (FALSE, FALSE, sizeof (GstH265NalUnit));
+}

gst-plugins-bad-1.24.5.tar.xz/ext/codec2json/gsth2652json.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2023 Benjamin Gaignard <benjamin.gaignard@collabora.Com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_H265_2_JSON_H__
+#define __GST_H265_2_JSON_H__
+
+#include <gst/codecparsers/gsth265parser.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_H265_2_JSON (gst_h265_2_json_get_type())
+G_DECLARE_FINAL_TYPE (GstH2652json,
+    gst_h265_2_json, GST, H265_2_JSON, GstElement);
+
+G_END_DECLS
+
+#endif /* __GST_H265_2_TXT_H__ */

gst-plugins-bad-1.24.5.tar.xz/ext/codec2json/gstvp82json.c Added

@@ -0,0 +1,371 @@
+/*
+ * gstvp82json.c - VP8 parsed bistream to json
+ *
+ * Copyright (C) 2023 Collabora
+ *   Author: Benjamin Gaignard <benjamin.gaignard@collabora.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-vp82json
+ * @title: vp82json
+ *
+ * Convert VP8 bitstream parameters to JSON formated text.
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/vp8/file ! parsebin ! vp82json ! filesink location=/path/to/json/file
+ * ```
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gst/base/base.h>
+#include <json-glib/json-glib.h>
+
+#include "gstvp82json.h"
+
+GST_DEBUG_CATEGORY (gst_vp8_2_json_debug);
+#define GST_CAT_DEFAULT gst_vp8_2_json_debug
+
+struct _GstVp82json
+{
+  GstElement parent;
+
+  GstPad *sinkpad, *srcpad;
+  guint frame_counter;
+  GstVp8Parser parser;
+
+  JsonObject *json;
+};
+
+static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-vp8")
+    );
+
+static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("text/x-json,format=vp8"));
+
+
+#define gst_vp8_2_json_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstVp82json, gst_vp8_2_json,
+    GST_TYPE_ELEMENT,
+    GST_DEBUG_CATEGORY_INIT (gst_vp8_2_json_debug, "vp82json", 0,
+        "VP8 to json"));
+
+static void
+gst_vp8_2_json_finalize (GObject * object)
+{
+  GstVp82json *self = GST_VP8_2_JSON (object);
+
+  json_object_unref (self->json);
+}
+
+static gchar *
+get_string_from_json_object (JsonObject * object)
+{
+  JsonNode *root;
+  JsonGenerator *generator;
+  gchar *text;
+
+  /* Make it the root node */
+  root = json_node_init_object (json_node_alloc (), object);
+  generator = json_generator_new ();
+  json_generator_set_indent (generator, 2);
+  json_generator_set_indent_char (generator, ' ');
+  json_generator_set_pretty (generator, TRUE);
+  json_generator_set_root (generator, root);
+  text = json_generator_to_data (generator, NULL);
+
+  /* Release everything */
+  g_object_unref (generator);
+  json_node_free (root);
+  return text;
+}
+
+static GstFlowReturn
+gst_vp8_2_json_chain (GstPad * sinkpad, GstObject * object, GstBuffer * in_buf)
+{
+  GstVp82json *self = GST_VP8_2_JSON (object);
+  JsonObject *json = self->json;
+  GstVp8ParserResult pres;
+  GstVp8FrameHdr frame_hdr;
+  JsonObject *range;
+  GstBuffer *out_buf;
+  gchar *json_string;
+  guint length;
+  GstMapInfo in_map, out_map;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  if (!gst_buffer_map (in_buf, &in_map, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (self, "Cannot map buffer");
+    return GST_FLOW_ERROR;
+  }
+
+  pres =
+      gst_vp8_parser_parse_frame_header (&self->parser, &frame_hdr, in_map.data,
+      in_map.size);
+  if (pres != GST_VP8_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Cannot parse frame header");
+    goto unmap;
+  }
+
+  json_object_set_int_member (json, "frame number", self->frame_counter++);
+
+  if (frame_hdr.key_frame)
+    json_object_set_string_member (json, "frame type", "keyframe");
+  else
+    json_object_set_string_member (json, "frame type", "interframe");
+
+  json_object_set_int_member (json, "version", frame_hdr.version);
+  json_object_set_int_member (json, "show frame", frame_hdr.show_frame);
+  json_object_set_int_member (json, "data chunk size",
+      frame_hdr.data_chunk_size);
+  json_object_set_int_member (json, "first part size",
+      frame_hdr.first_part_size);
+
+  if (frame_hdr.key_frame) {
+    JsonArray *array, *token_probs, *mv_probs, *y_prob, *uv_prob;
+    JsonObject *quant_indices, *mode_probs;
+    guint i, j, k, l;
+
+    json_object_set_int_member (json, "width", frame_hdr.width);
+    json_object_set_int_member (json, "height", frame_hdr.height);
+    json_object_set_int_member (json, "horizontal scale code",
+        frame_hdr.horiz_scale_code);
+    json_object_set_int_member (json, "vertical scale code",
+        frame_hdr.vert_scale_code);
+    json_object_set_int_member (json, "color space", frame_hdr.color_space);
+    json_object_set_int_member (json, "clamping type", frame_hdr.clamping_type);
+    json_object_set_int_member (json, "filter type", frame_hdr.filter_type);
+    json_object_set_int_member (json, "loop filter level",
+        frame_hdr.loop_filter_level);
+    json_object_set_int_member (json, "sharpness level",
+        frame_hdr.sharpness_level);
+    json_object_set_int_member (json, "log2 nbr of dct partitions",
+        frame_hdr.log2_nbr_of_dct_partitions);
+
+    array = json_array_new ();
+    for (i = 0; i < 8; i++)
+      json_array_add_int_element (array, frame_hdr.partition_sizei);
+
+    json_object_set_array_member (json, "partition size", array);
+
+    quant_indices = json_object_new ();
+    json_object_set_int_member (quant_indices, "y ac qi",
+        frame_hdr.quant_indices.y_ac_qi);
+    json_object_set_int_member (quant_indices, "y dc delta",
+        frame_hdr.quant_indices.y_dc_delta);
+    json_object_set_int_member (quant_indices, "y2 dc delta",
+        frame_hdr.quant_indices.y2_dc_delta);
+    json_object_set_int_member (quant_indices, "y2 ac delta",
+        frame_hdr.quant_indices.y2_ac_delta);
+    json_object_set_int_member (quant_indices, "uv dc delta",
+        frame_hdr.quant_indices.uv_dc_delta);
+    json_object_set_int_member (quant_indices, "uv ac delta",
+        frame_hdr.quant_indices.uv_ac_delta);
+    json_object_set_object_member (json, "quant indices", quant_indices);
+
+    token_probs = json_array_new ();
+    for (i = 0; i < 4; i++)
+      for (j = 0; j < 8; j++)
+        for (k = 0; k < 3; k++)
+          for (l = 0; l < 11; l++)
+            json_array_add_int_element (token_probs,
+                frame_hdr.token_probs.probijkl);
+
+    json_object_set_array_member (json, "token probabilities", token_probs);
+
+    mv_probs = json_array_new ();
+    for (i = 0; i < 2; i++)
+      for (j = 0; j < 19; j++)
+        json_array_add_int_element (mv_probs, frame_hdr.mv_probs.probij);
+
+    json_object_set_array_member (json, "motion vector probabilities",
+        mv_probs);
+
+    mode_probs = json_object_new ();
+    y_prob = json_array_new ();
+    for (i = 0; i < 4; i++)
+      json_array_add_int_element (y_prob, frame_hdr.mode_probs.y_probi);
+
+    json_object_set_array_member (mode_probs, "y probabilities", y_prob);
+
+    uv_prob = json_array_new ();
+    for (i = 0; i < 3; i++)
+      json_array_add_int_element (uv_prob, frame_hdr.mode_probs.uv_probi);
+
+    json_object_set_array_member (mode_probs, "uv probabilities", uv_prob);
+
+    json_object_set_object_member (json, "mode probabilities", mode_probs);
+
+    json_object_set_int_member (json, "refresh entropy probs",
+        frame_hdr.refresh_entropy_probs);
+    json_object_set_int_member (json, "refresh last", frame_hdr.refresh_last);
+  } else {
+    json_object_set_int_member (json, "refresh golden frame",
+        frame_hdr.refresh_golden_frame);
+    json_object_set_int_member (json, "refresh alternate frame",
+        frame_hdr.refresh_alternate_frame);
+    json_object_set_int_member (json, "copy buffer to golden",
+        frame_hdr.copy_buffer_to_golden);
+    json_object_set_int_member (json, "copy buffer to alternate",
+        frame_hdr.copy_buffer_to_alternate);
+    json_object_set_int_member (json, "sign bias golden",
+        frame_hdr.sign_bias_golden);
+    json_object_set_int_member (json, "sign bias alternate",
+        frame_hdr.sign_bias_alternate);
+    json_object_set_int_member (json, "mb no skip coeff",
+        frame_hdr.mb_no_skip_coeff);
+    json_object_set_int_member (json, "prob skip false",
+        frame_hdr.prob_skip_false);
+    json_object_set_int_member (json, "prob intra", frame_hdr.prob_intra);
+    json_object_set_int_member (json, "prob last", frame_hdr.prob_last);
+    json_object_set_int_member (json, "prob gf", frame_hdr.prob_gf);
+  }
+
+  range = json_object_new ();
+
+  json_object_set_int_member (range, "rd range", frame_hdr.rd_range);
+  json_object_set_int_member (range, "rd value", frame_hdr.rd_value);
+  json_object_set_int_member (range, "rd count", frame_hdr.rd_count);
+
+  json_object_set_object_member (json, "range decoder", range);
+
+  json_object_set_int_member (json, "header size", frame_hdr.header_size);
+
+  json_string = get_string_from_json_object (json);
+  length = strlen (json_string);
+  out_buf = gst_buffer_new_allocate (NULL, length, NULL);
+  gst_buffer_map (out_buf, &out_map, GST_MAP_WRITE);
+  if (length)
+    memcpy (&out_map.data0, json_string, length);
+  gst_buffer_unmap (out_buf, &out_map);
+
+  g_free (json_string);
+
+  gst_buffer_copy_into (out_buf, in_buf,
+      GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS |
+      GST_BUFFER_COPY_METADATA, 0, -1);
+  gst_pad_push (self->srcpad, out_buf);
+
+unmap:
+  gst_buffer_unmap (in_buf, &in_map);
+  gst_buffer_unref (in_buf);
+
+  return ret;
+}
+
+static gboolean
+gst_vp8_2_json_set_caps (GstVp82json * self, GstCaps * caps)
+{
+  GstCaps *src_caps =
+      gst_caps_new_simple ("text/x-json", "format", G_TYPE_STRING, "vp8", NULL);
+  GstEvent *event;
+
+  event = gst_event_new_caps (src_caps);
+  gst_caps_unref (src_caps);
+
+  return gst_pad_push_event (self->srcpad, event);
+}
+
+static gboolean
+gst_vp8_2_json_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+{
+  GstVp82json *self = GST_VP8_2_JSON (parent);
+  gboolean res = TRUE;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CAPS:
+    {
+      GstCaps *caps;
+
+      gst_event_parse_caps (event, &caps);
+      res = gst_vp8_2_json_set_caps (self, caps);
+      gst_event_unref (event);
+      break;
+    }
+    default:
+      res = gst_pad_event_default (pad, parent, event);
+      break;
+  }
+
+  return res;
+}
+
+static GstStateChangeReturn
+gst_vp8_2_json_change_state (GstElement * element, GstStateChange transition)
+{
+  GstVp82json *self = GST_VP8_2_JSON (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      self->frame_counter = 0;
+      break;
+    default:
+      break;
+  }
+
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+}
+
+static void
+gst_vp8_2_json_class_init (GstVp82jsonClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
+
+  gstelement_class->change_state = gst_vp8_2_json_change_state;
+  gobject_class->finalize = gst_vp8_2_json_finalize;
+
+  gst_element_class_add_static_pad_template (gstelement_class, &src_factory);
+  gst_element_class_add_static_pad_template (gstelement_class, &sink_factory);
+
+  gst_element_class_set_static_metadata (gstelement_class, "Vp82json",
+      "Transform",
+      "VP8 to json element",
+      "Benjamin Gaignard <benjamin.gaignard@collabora.com>");
+}
+
+static void
+gst_vp8_2_json_init (GstVp82json * self)
+{
+  self->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
+  gst_pad_set_chain_function (self->sinkpad, gst_vp8_2_json_chain);
+  gst_element_add_pad (GST_ELEMENT (self), self->sinkpad);
+  gst_pad_set_event_function (self->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_vp8_2_json_sink_event));
+
+  self->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
+  gst_element_add_pad (GST_ELEMENT (self), self->srcpad);
+
+  self->json = json_object_new ();
+  self->frame_counter = 0;
+
+  gst_vp8_parser_init (&self->parser);
+}

gst-plugins-bad-1.24.5.tar.xz/ext/codec2json/gstvp82json.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2023 Benjamin Gaignard <benjamin.gaignard@collabora.Com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_VP8_2_JSON_H__
+#define __GST_VP8_2_JSON_H__
+
+#include <gst/codecparsers/gstvp8parser.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_VP8_2_JSON (gst_vp8_2_json_get_type())
+G_DECLARE_FINAL_TYPE (GstVp82json,
+    gst_vp8_2_json, GST, VP8_2_JSON, GstElement);
+
+G_END_DECLS
+
+#endif /* __GST_VP8_2_TXT_H__ */

gst-plugins-bad-1.24.5.tar.xz/ext/codec2json/meson.build Added

gst-plugins-bad-1.24.5.tar.xz/ext/codec2json/plugin.c Added

@@ -0,0 +1,64 @@
+/*
+ * Gstreamer
+ *
+ * Copyright (C) 2023 Collabora
+ *   Author: Benjamin Gaignard <benjamin.gaignard@collabora.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * plugin-codec2json:
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstav12json.h"
+#include "gsth2642json.h"
+#include "gsth2652json.h"
+#include "gstvp82json.h"
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  if (!gst_element_register (plugin, "vp82json", GST_RANK_NONE,
+          GST_TYPE_VP8_2_JSON))
+    return FALSE;
+
+  if (!gst_element_register (plugin, "av12json", GST_RANK_NONE,
+          GST_TYPE_AV1_2_JSON))
+    return FALSE;
+
+  if (!gst_element_register (plugin, "h2642json", GST_RANK_NONE,
+          GST_TYPE_H264_2_JSON))
+    return FALSE;
+
+  if (!gst_element_register (plugin, "h2652json", GST_RANK_NONE,
+          GST_TYPE_H265_2_JSON))
+    return FALSE;
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    codec2json,
+    "Plugin with feature to annotate and format CODEC bitstream in JSON",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

gst-plugins-bad-1.22.7.tar.xz/ext/colormanagement/gstlcms.c -> gst-plugins-bad-1.24.5.tar.xz/ext/colormanagement/gstlcms.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/curl/gstcurlbasesink.c -> gst-plugins-bad-1.24.5.tar.xz/ext/curl/gstcurlbasesink.c Changed

@@ -1032,8 +1032,10 @@
   }
 
   if (m_code != CURLM_OK) {
-    sink->error = g_strdup_printf ("failed to write data: %s",
-        curl_multi_strerror (m_code));
+    GST_ELEMENT_ERROR_WITH_DETAILS (sink, RESOURCE, WRITE,
+        ("Failed to write data"), ("Curl multi error: %s",
+            curl_multi_strerror (m_code)), ("curl-multi-status-code",
+            G_TYPE_INT, m_code, NULL));
     retval = GST_FLOW_ERROR;
     goto fail;
   }
@@ -1041,8 +1043,10 @@
   /* problems still might have occurred on individual transfers even when
    * curl_multi_perform returns CURLM_OK */
   if ((e_code = gst_curl_base_sink_transfer_check (sink)) != CURLE_OK) {
-    sink->error = g_strdup_printf ("failed to transfer data: %s",
-        curl_easy_strerror (e_code));
+    GST_ELEMENT_ERROR_WITH_DETAILS (sink, RESOURCE, WRITE,
+        ("Failed to transfer data"), ("Curl easy error: %s",
+            curl_easy_strerror (e_code)), ("curl-status-code", G_TYPE_INT,
+            e_code, NULL));
     retval = GST_FLOW_ERROR;
     goto fail;
   }

gst-plugins-bad-1.22.7.tar.xz/ext/curl/gstcurlhttpsink.c -> gst-plugins-bad-1.24.5.tar.xz/ext/curl/gstcurlhttpsink.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstdashdemux.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstdashdemux.c Changed

@@ -611,9 +611,9 @@
       "DASH Demuxer",
       "Codec/Demuxer/Adaptive",
       "Dynamic Adaptive Streaming over HTTP demuxer",
-      "David Corvoysier <david.corvoysier@orange.com>\n\
-                Hamid Zakari <hamid.zakari@gmail.com>\n\
-                Gianluca Gennari <gennarone@gmail.com>");
+      "David Corvoysier <david.corvoysier@orange.com>, "
+      "Hamid Zakari <hamid.zakari@gmail.com>, "
+      "Gianluca Gennari <gennarone@gmail.com>");
 
 
   gstadaptivedemux_class->get_duration = gst_dash_demux_get_duration;
@@ -796,6 +796,7 @@
     GstPad *srcpad;
     gchar *lang = NULL;
     GstTagList *tags = NULL;
+    gchar *track_id = NULL;
 
     active_stream =
         gst_mpd_client_get_active_stream_by_index (demux->client, i);
@@ -813,6 +814,48 @@
     if (srcpad == NULL)
       continue;
 
+    if (active_stream->cur_adapt_set) {
+      /* FIXME: For CEA 608 and CEA 708 tracks we should check the Accessibility
+       * descriptor:
+       * https://dev.w3.org/html5/html-sourcing-inband-tracks/#mpegdash
+       * * An ISOBMFF CEA 608 caption service: the string "cc" concatenated with
+       * the value of the 'channel-number' field in the Accessibility descriptor
+       * in the ContentComponent or AdaptationSet.
+       * * An ISOBMFF CEA 708 caption service: the string "sn" concatenated with
+       * the value of the 'service-number' field in the Accessibility descriptor
+       * in the ContentComponent or AdaptationSet.
+       * * Otherwise:
+       */
+
+      /* Content of the id attribute in the ContentComponent or AdaptationSet
+       * element. */
+      if (active_stream->cur_adapt_set->id) {
+        track_id = g_strdup_printf ("%d", active_stream->cur_adapt_set->id);
+      } else {
+        GList *it;
+
+        for (it = active_stream->cur_adapt_set->ContentComponents; it;
+            it = it->next) {
+          GstMPDContentComponentNode *cc_node = it->data;
+          if (cc_node->id) {
+            track_id = g_strdup_printf ("%u", cc_node->id);
+            break;
+          }
+        }
+        /* Empty string if the id attribute is not present on either
+         * element. */
+        if (!track_id)
+          track_id = g_strdup ("");
+      }
+    }
+
+    if (track_id) {
+      tags =
+          gst_tag_list_new (GST_TAG_CONTAINER_SPECIFIC_TRACK_ID, track_id,
+          NULL);
+      g_free (track_id);
+    }
+
     caps = gst_dash_demux_get_input_caps (demux, active_stream);
     GST_LOG_OBJECT (demux, "Creating stream %d %" GST_PTR_FORMAT, i, caps);
 
@@ -835,10 +878,14 @@
     }
 
     if (lang) {
+      if (!tags)
+        tags = gst_tag_list_new_empty ();
       if (gst_tag_check_language_code (lang))
-        tags = gst_tag_list_new (GST_TAG_LANGUAGE_CODE, lang, NULL);
+        gst_tag_list_add (tags, GST_TAG_MERGE_REPLACE, GST_TAG_LANGUAGE_CODE,
+            lang, NULL);
       else
-        tags = gst_tag_list_new (GST_TAG_LANGUAGE_NAME, lang, NULL);
+        gst_tag_list_add (tags, GST_TAG_MERGE_REPLACE, GST_TAG_LANGUAGE_NAME,
+            lang, NULL);
     }
 
     stream = (GstDashDemuxStream *)
@@ -2398,7 +2445,7 @@
     return FALSE;
   }
 
-  trickmode_no_audio = ! !(flags & GST_SEEK_FLAG_TRICKMODE_NO_AUDIO);
+  trickmode_no_audio = !!(flags & GST_SEEK_FLAG_TRICKMODE_NO_AUDIO);
 
   streams = demux->streams;
   if (current_period != gst_mpd_client_get_period_index (dashdemux->client)) {

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstdashsink.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstdashsink.c Changed

@@ -100,6 +100,7 @@
  * GstDashSinkMuxerType:
  * @GST_DASH_SINK_MUXER_TS: Use mpegtsmux
  * @GST_DASH_SINK_MUXER_MP4: Use mp4mux
+ * @GST_DASH_SINK_MUXER_DASHMP4: Use dashmp4mux
  *
  * Muxer type
  */
@@ -107,6 +108,7 @@
 {
   GST_DASH_SINK_MUXER_TS = 0,
   GST_DASH_SINK_MUXER_MP4 = 1,
+  GST_DASH_SINK_MUXER_DASHMP4 = 2,
 } GstDashSinkMuxerType;
 
 typedef struct _DashSinkMuxer
@@ -124,7 +126,14 @@
   static GType dash_sink_muxer_type = 0;
   static const GEnumValue muxer_type = {
     {GST_DASH_SINK_MUXER_TS, "Use mpegtsmux", "ts"},
-    {GST_DASH_SINK_MUXER_MP4, "Use mp4mux", "mp4"},
+    {GST_DASH_SINK_MUXER_MP4, "Use mp4mux (deprecated, non-functional)", "mp4"},
+    /**
+     * GstDashSinkMuxerType::dashmp4
+     *
+     *
+     * Since: 1.24
+     */
+    {GST_DASH_SINK_MUXER_DASHMP4, "Use dashmp4mux", "dashmp4"},
     {0, NULL, NULL},
   };
 
@@ -146,6 +155,11 @@
         "mp4mux",
         "video/mp4",
       "mp4"},
+  {
+        GST_DASH_SINK_MUXER_DASHMP4,
+        "dashmp4mux",
+        "video/mp4",
+      "mp4"},
 };
 
 #define DEFAULT_SEGMENT_LIST_TPL "_%05d"
@@ -160,6 +174,7 @@
 #define DEFAULT_MPD_USE_SEGMENT_LIST FALSE
 #define DEFAULT_MPD_MIN_BUFFER_TIME 2000
 #define DEFAULT_MPD_PERIOD_DURATION GST_CLOCK_TIME_NONE
+#define DEFAULT_MPD_SUGGESTED_PRESENTATION_DELAY 0
 
 #define DEFAULT_DASH_SINK_MUXER GST_DASH_SINK_MUXER_TS
 
@@ -184,6 +199,7 @@
   PROP_MPD_MIN_BUFFER_TIME,
   PROP_MPD_BASEURL,
   PROP_MPD_PERIOD_DURATION,
+  PROP_MPD_SUGGESTED_PRESENTATION_DELAY,
 };
 
 enum
@@ -248,6 +264,7 @@
   guint index;
   GList *streams;
   guint64 minimum_update_period;
+  guint64 suggested_presentation_delay;
   guint64 min_buffer_time;
   gint64 period_duration;
 };
@@ -540,6 +557,21 @@
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   /**
+   * GstDashSink:suggested-presentation-delay
+   *
+   * set suggested presentation delay of MPD file in milliseconds
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class,
+      PROP_MPD_SUGGESTED_PRESENTATION_DELAY,
+      g_param_spec_uint64 ("suggested-presentation-delay",
+          "suggested presentation delay",
+          "Provides to the manifest a suggested presentation delay in milliseconds",
+          0, G_MAXUINT64, DEFAULT_MPD_SUGGESTED_PRESENTATION_DELAY,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
    * GstDashSink::get-playlist-stream:
    * @sink: the #GstDashSink
    * @location: Location for the playlist file
@@ -628,9 +660,13 @@
       gst_element_factory_make (dash_muxer_listsink->muxer.element_name,
       NULL);
 
-  if (sink->muxer == GST_DASH_SINK_MUXER_MP4)
+  if (sink->muxer == GST_DASH_SINK_MUXER_MP4) {
     g_object_set (mux, "fragment-duration", sink->target_duration * GST_MSECOND,
         NULL);
+  } else if (sink->muxer == GST_DASH_SINK_MUXER_DASHMP4) {
+    g_object_set (mux, "fragment-duration", sink->target_duration * GST_SECOND,
+        NULL);
+  }
 
   g_return_val_if_fail (mux != NULL, FALSE);
 
@@ -657,9 +693,12 @@
   g_object_set (stream->splitmuxsink, "location", NULL,
       "max-size-time", ((GstClockTime) sink->target_duration * GST_SECOND),
       "send-keyframe-requests", TRUE, "muxer", mux, "sink",
-      stream->giostreamsink, "reset-muxer", FALSE, "send-keyframe-requests",
+      stream->giostreamsink, "send-keyframe-requests",
       sink->send_keyframe_requests, NULL);
 
+  if (sink->muxer == GST_DASH_SINK_MUXER_TS)
+    g_object_set (stream->splitmuxsink, "reset-muxer", FALSE, NULL);
+
   g_signal_connect (stream->splitmuxsink, "format-location",
       G_CALLBACK (on_format_location), stream);
 
@@ -680,6 +719,7 @@
 
   sink->min_buffer_time = DEFAULT_MPD_MIN_BUFFER_TIME;
   sink->period_duration = DEFAULT_MPD_PERIOD_DURATION;
+  sink->suggested_presentation_delay = DEFAULT_MPD_SUGGESTED_PRESENTATION_DELAY;
 
   g_mutex_init (&sink->mpd_lock);
 
@@ -704,23 +744,20 @@
   GST_DEBUG_OBJECT (sink, "stream caps %s", gst_caps_to_string (caps));
   s = gst_caps_get_structure (caps, 0);
 
+  g_free (stream->codec);
+  stream->codec = gst_codec_utils_caps_get_mime_codec (caps);
+
   switch (stream->type) {
     case DASH_SINK_STREAM_TYPE_VIDEO:
     {
       gst_structure_get_int (s, "width", &stream->info.video.width);
       gst_structure_get_int (s, "height", &stream->info.video.height);
-      g_free (stream->codec);
-      stream->codec =
-          g_strdup (gst_mpd_helper_get_video_codec_from_mime (caps));
       break;
     }
     case DASH_SINK_STREAM_TYPE_AUDIO:
     {
       gst_structure_get_int (s, "channels", &stream->info.audio.channels);
       gst_structure_get_int (s, "rate", &stream->info.audio.rate);
-      g_free (stream->codec);
-      stream->codec =
-          g_strdup (gst_mpd_helper_get_audio_codec_from_mime (caps));
       break;
     }
     case DASH_SINK_STREAM_TYPE_SUBTITLE:
@@ -756,6 +793,10 @@
     if (sink->minimum_update_period)
       gst_mpd_client_set_root_node (sink->mpd_client,
           "minimum-update-period", sink->minimum_update_period, NULL);
+    if (sink->suggested_presentation_delay)
+      gst_mpd_client_set_root_node (sink->mpd_client,
+          "suggested-presentation-delay", sink->suggested_presentation_delay,
+          NULL);
     if (sink->mpd_baseurl)
       gst_mpd_client_add_baseurl_node (sink->mpd_client, "url",
           sink->mpd_baseurl, NULL);
@@ -1111,6 +1152,9 @@
     case PROP_MPD_MINIMUM_UPDATE_PERIOD:
       sink->minimum_update_period = g_value_get_uint64 (value);
       break;
+    case PROP_MPD_SUGGESTED_PRESENTATION_DELAY:
+      sink->suggested_presentation_delay = g_value_get_uint64 (value);
+      break;
     case PROP_MPD_MIN_BUFFER_TIME:
       sink->min_buffer_time = g_value_get_uint64 (value);
       break;
@@ -1157,6 +1201,9 @@
     case PROP_MPD_MINIMUM_UPDATE_PERIOD:
       g_value_set_uint64 (value, sink->minimum_update_period);
       break;
+    case PROP_MPD_SUGGESTED_PRESENTATION_DELAY:
+      g_value_set_uint64 (value, sink->suggested_presentation_delay);
+      break;
     case PROP_MPD_MIN_BUFFER_TIME:
       g_value_set_uint64 (value, sink->min_buffer_time);
       break;

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdadaptationsetnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdadaptationsetnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdbaseurlnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdbaseurlnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdclient.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdclient.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdcontentcomponentnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdcontentcomponentnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpddescriptortypenode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpddescriptortypenode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdhelper.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdhelper.c Changed

@@ -79,61 +79,6 @@
 }
 
 const gchar *
-gst_mpd_helper_get_audio_codec_from_mime (GstCaps * caps)
-{
-  GstStructure *s;
-  const gchar *name = "";
-  const gchar *codec_name = NULL;
-
-  if (!caps)
-    return NULL;
-  s = gst_caps_get_structure (caps, 0);
-  if (!s)
-    goto done;
-  name = gst_structure_get_name (s);
-  if (!g_strcmp0 (name, "audio/mpeg")) {
-    gint mpeg_version;
-    if (gst_structure_get_int (s, "mpegversion", &mpeg_version)) {
-      if (mpeg_version == 4)
-        return "mp4a";
-    }
-
-  } else {
-    GST_DEBUG ("No codecs for this caps name %s", name);
-  }
-
-done:
-  return codec_name;
-}
-
-const gchar *
-gst_mpd_helper_get_video_codec_from_mime (GstCaps * caps)
-{
-  GstStructure *s;
-  const gchar *name = "";
-  const gchar *codec_name = NULL;
-
-  if (!caps)
-    return NULL;
-
-  s = gst_caps_get_structure (caps, 0);
-  if (!s)
-    goto done;
-  name = gst_structure_get_name (s);
-  if (!g_strcmp0 (name, "video/x-h264")) {
-    return "avc1";
-  } else if (!g_strcmp0 (name, "video/x-h265")) {
-    return "hvc1";
-  } else {
-    GST_DEBUG ("No codecs for this caps name %s", name);
-  }
-
-done:
-  return codec_name;
-}
-
-
-const gchar *
 gst_mpd_helper_mimetype_to_caps (const gchar * mimeType)
 {
   if (mimeType == NULL)

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdhelper.h -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdhelper.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdlocationnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdlocationnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdmetricsnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdmetricsnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdmetricsrangenode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdmetricsrangenode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdperiodnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdperiodnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdprograminformationnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdprograminformationnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdreportingnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdreportingnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdrepresentationnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdrepresentationnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdrootnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdrootnode.c Changed

@@ -101,6 +101,9 @@
     case PROP_MPD_ROOT_MINIMUM_UPDATE_PERIOD:
       self->minimumUpdatePeriod = g_value_get_uint64 (value);
       break;
+    case PROP_MPD_ROOT_SUGGESTED_PRESENTATION_DELAY:
+      self->suggestedPresentationDelay = g_value_get_uint64 (value);
+      break;
     case PROP_MPD_ROOT_MIN_BUFFER_TIME:
       self->minBufferTime = g_value_get_uint64 (value);
       break;
@@ -152,6 +155,9 @@
     case PROP_MPD_ROOT_MINIMUM_UPDATE_PERIOD:
       g_value_set_uint64 (value, self->minimumUpdatePeriod);
       break;
+    case PROP_MPD_ROOT_SUGGESTED_PRESENTATION_DELAY:
+      g_value_set_uint64 (value, self->suggestedPresentationDelay);
+      break;
     case PROP_MPD_ROOT_MIN_BUFFER_TIME:
       g_value_set_uint64 (value, self->minBufferTime);
       break;
@@ -351,6 +357,11 @@
           "minimum update period", "minimum update period", 0,
           G_MAXUINT64, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
+      PROP_MPD_ROOT_SUGGESTED_PRESENTATION_DELAY,
+      g_param_spec_uint64 ("suggested-presentation-delay",
+          "suggested presentation delay", "suggested presentation delay", 0,
+          G_MAXUINT64, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (object_class,
       PROP_MPD_ROOT_MIN_BUFFER_TIME,
       g_param_spec_uint64 ("min-buffer-time", "mininim buffer time",
           "mininim buffer time", 0,
@@ -394,7 +405,11 @@
 GstMPDRootNode *
 gst_mpd_root_node_new (void)
 {
-  return g_object_new (GST_TYPE_MPD_ROOT_NODE, NULL);
+  GstMPDRootNode *ret;
+
+  ret = g_object_new (GST_TYPE_MPD_ROOT_NODE, NULL);
+  gst_object_ref_sink (ret);
+  return ret;
 }
 
 void

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdsegmentbasenode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdsegmentbasenode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdsegmentlistnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdsegmentlistnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdsegmenttemplatenode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdsegmenttemplatenode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdsegmenttimelinenode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdsegmenttimelinenode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdsegmenturlnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdsegmenturlnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdsnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdsnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdsubrepresentationnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdsubrepresentationnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdsubsetnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdsubsetnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdurltypenode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdurltypenode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dash/gstmpdutctimingnode.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dash/gstmpdutctimingnode.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dtls/README -> gst-plugins-bad-1.24.5.tar.xz/ext/dtls/README Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dtls/gstdtlscertificate.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dtls/gstdtlscertificate.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dtls/gstdtlsconnection.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dtls/gstdtlsconnection.c Changed

@@ -449,7 +449,7 @@
   priv = self->priv;
 
   if (DTLSv1_get_timeout (priv->ssl, &timeout)) {
-    wait_time = timeout.tv_sec * G_USEC_PER_SEC + timeout.tv_usec;
+    wait_time = ((gint64) timeout.tv_sec) * G_USEC_PER_SEC + timeout.tv_usec;
 
     GST_DEBUG_OBJECT (self, "waiting for %" G_GINT64_FORMAT " usec", wait_time);
     if (wait_time) {
@@ -832,13 +832,13 @@
   GstDtlsConnectionPrivate *priv = self->priv;
   guint states = 0;
 
-  states |= (! !SSL_is_init_finished (priv->ssl) << 0);
-  states |= (! !SSL_in_init (priv->ssl) << 4);
-  states |= (! !SSL_in_before (priv->ssl) << 8);
-  states |= (! !SSL_in_connect_init (priv->ssl) << 12);
-  states |= (! !SSL_in_accept_init (priv->ssl) << 16);
-  states |= (! !SSL_want_write (priv->ssl) << 20);
-  states |= (! !SSL_want_read (priv->ssl) << 24);
+  states |= (!!SSL_is_init_finished (priv->ssl) << 0);
+  states |= (!!SSL_in_init (priv->ssl) << 4);
+  states |= (!!SSL_in_before (priv->ssl) << 8);
+  states |= (!!SSL_in_connect_init (priv->ssl) << 12);
+  states |= (!!SSL_in_accept_init (priv->ssl) << 16);
+  states |= (!!SSL_want_write (priv->ssl) << 20);
+  states |= (!!SSL_want_read (priv->ssl) << 24);
 
 #if OPENSSL_VERSION_NUMBER < 0x10100001L
   GST_LOG_OBJECT (self, "%s: role=%s buf=(%d,%p:%d/%d) %x|%x %s",

gst-plugins-bad-1.22.7.tar.xz/ext/dtls/gstdtlsenc.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dtls/gstdtlsenc.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dtls/gstdtlssrtpenc.c -> gst-plugins-bad-1.24.5.tar.xz/ext/dtls/gstdtlssrtpenc.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/dtls/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/dtls/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/ext/gtk/gstgtkwaylandsink.c -> gst-plugins-bad-1.24.5.tar.xz/ext/gtk/gstgtkwaylandsink.c Changed

@@ -25,13 +25,14 @@
 #endif
 
 #include "gstgtkwaylandsink.h"
+#include "gstgtkutils.h"
+#include "gtkgstwaylandwidget.h"
 
+#include <drm_fourcc.h>
 #include <gdk/gdk.h>
+#include <gst/allocators/allocators.h>
 #include <gst/wayland/wayland.h>
 
-#include "gstgtkutils.h"
-#include "gtkgstwaylandwidget.h"
-
 #ifdef GDK_WINDOWING_WAYLAND
 #include <gdk/gdkwayland.h>
 #else
@@ -41,21 +42,11 @@
 #define GST_CAT_DEFAULT gst_debug_gtk_wayland_sink
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
-#ifndef GST_CAPS_FEATURE_MEMORY_DMABUF
-#define GST_CAPS_FEATURE_MEMORY_DMABUF "memory:DMABuf"
-#endif
-
-#define WL_VIDEO_FORMATS \
-  "{ BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, " \
-  "RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, NV61, " \
-  "YUV9, YVU9, Y41B, I420, YV12, Y42B, v308 }"
-
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (WL_VIDEO_FORMATS) ";"
-        GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_DMABUF,
-            WL_VIDEO_FORMATS))
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (GST_WL_VIDEO_FORMATS) ";"
+        GST_VIDEO_DMA_DRM_CAPS_MAKE)
     );
 
 static void gst_gtk_wayland_sink_get_property (GObject * object,
@@ -91,7 +82,8 @@
   PROP_0,
   PROP_WIDGET,
   PROP_DISPLAY,
-  PROP_ROTATE_METHOD
+  PROP_ROTATE_METHOD,
+  PROP_DRM_DEVICE,
 };
 
 typedef struct _GstGtkWaylandSinkPrivate
@@ -109,19 +101,20 @@
 
   GstBufferPool *pool;
   GstBuffer *last_buffer;
-  gboolean use_dmabuf;
 
   gboolean video_info_changed;
   GstVideoInfo video_info;
+  GstVideoInfoDmaDrm drm_info;
+  GstCaps *caps;
 
-  gboolean redraw_pending;
   GMutex render_lock;
 
   GstVideoOrientationMethod sink_rotate_method;
   GstVideoOrientationMethod tag_rotate_method;
   GstVideoOrientationMethod current_rotate_method;
 
-  struct wl_callback *callback;
+  gchar *drm_device;
+  gboolean skip_dumb_buffer_copy;
 } GstGtkWaylandSinkPrivate;
 
 #define gst_gtk_wayland_sink_parent_class parent_class
@@ -164,6 +157,17 @@
           GST_TYPE_VIDEO_ORIENTATION_METHOD, GST_VIDEO_ORIENTATION_IDENTITY,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstGtkWaylandSink:drm-device:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_DRM_DEVICE,
+      g_param_spec_string ("drm-device", "DRM Device", "Path of the "
+          "DRM device to use for dumb buffer allocation",
+          NULL,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
+
   gstelement_class->change_state =
       GST_DEBUG_FUNCPTR (gst_gtk_wayland_sink_change_state);
 
@@ -203,7 +207,14 @@
   GstGtkWaylandSinkPrivate *priv =
       gst_gtk_wayland_sink_get_instance_private (self);
 
+  g_clear_object (&priv->display);
+  g_clear_object (&priv->wl_window);
+  g_clear_object (&priv->pool);
+
   g_clear_object (&priv->gtk_widget);
+  gst_clear_caps (&priv->caps);
+
+  g_free (priv->drm_device);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -378,6 +389,11 @@
     case PROP_ROTATE_METHOD:
       g_value_set_enum (value, priv->current_rotate_method);
       break;
+    case PROP_DRM_DEVICE:
+      GST_OBJECT_LOCK (self);
+      g_value_set_string (value, priv->drm_device);
+      GST_OBJECT_UNLOCK (self);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -389,12 +405,19 @@
     const GValue * value, GParamSpec * pspec)
 {
   GstGtkWaylandSink *self = GST_GTK_WAYLAND_SINK (object);
+  GstGtkWaylandSinkPrivate *priv =
+      gst_gtk_wayland_sink_get_instance_private (self);
 
   switch (prop_id) {
     case PROP_ROTATE_METHOD:
       gst_gtk_wayland_sink_set_rotate_method (self, g_value_get_enum (value),
           FALSE);
       break;
+    case PROP_DRM_DEVICE:
+      GST_OBJECT_LOCK (self);
+      priv->drm_device = g_value_dup_string (value);
+      GST_OBJECT_UNLOCK (self);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -723,6 +746,8 @@
 
   switch (transition) {
     case GST_STATE_CHANGE_READY_TO_NULL:
+      g_clear_object (&priv->pool);
+      /* fallthrough */
     case GST_STATE_CHANGE_NULL_TO_NULL:
       gst_gtk_invoke_on_main ((GThreadFunc)
           gst_gtk_wayland_sink_stop_on_main, element);
@@ -733,14 +758,6 @@
         /* remove buffer from surface, show nothing */
         gst_wl_window_render (priv->wl_window, NULL, NULL);
       }
-
-      g_mutex_lock (&priv->render_lock);
-      if (priv->callback) {
-        wl_callback_destroy (priv->callback);
-        priv->callback = NULL;
-      }
-      priv->redraw_pending = FALSE;
-      g_mutex_unlock (&priv->render_lock);
       break;
     default:
       break;
@@ -765,10 +782,11 @@
   if (priv->display) {
     GValue shm_list = G_VALUE_INIT, dmabuf_list = G_VALUE_INIT;
     GValue value = G_VALUE_INIT;
-    GArray *formats;
+    GArray *formats, *modifiers;
     gint i;
     guint fmt;
     GstVideoFormat gfmt;
+    guint64 mod;
 
     g_value_init (&shm_list, GST_TYPE_LIST);
     g_value_init (&dmabuf_list, GST_TYPE_LIST);
@@ -790,17 +808,19 @@
 
     /* Add corresponding dmabuf formats */
     formats = gst_wl_display_get_dmabuf_formats (priv->display);
+    modifiers = gst_wl_display_get_dmabuf_modifiers (priv->display);
     for (i = 0; i < formats->len; i++) {
       fmt = g_array_index (formats, uint32_t, i);
       gfmt = gst_wl_dmabuf_format_to_video_format (fmt);
+      mod = g_array_index (modifiers, guint64, i);
       if (gfmt != GST_VIDEO_FORMAT_UNKNOWN) {
         g_value_init (&value, G_TYPE_STRING);
-        g_value_set_static_string (&value, gst_video_format_to_string (gfmt));
+        g_value_take_string (&value, gst_wl_dmabuf_format_to_string (fmt, mod));
         gst_value_list_append_and_take_value (&dmabuf_list, &value);
       }
     }
 
-    gst_structure_take_value (gst_caps_get_structure (caps, 1), "format",
+    gst_structure_take_value (gst_caps_get_structure (caps, 1), "drm-format",
         &dmabuf_list);
 
     GST_DEBUG_OBJECT (self, "display caps: %" GST_PTR_FORMAT, caps);
@@ -820,30 +840,93 @@
   return caps;
 }
 
-static GstBufferPool *
-gst_gtk_wayland_create_pool (GstGtkWaylandSink * self, GstCaps * caps)
+static gboolean
+gst_gtk_wayland_update_pool (GstGtkWaylandSink * self, GstAllocator * allocator)
 {
   GstGtkWaylandSinkPrivate *priv =
       gst_gtk_wayland_sink_get_instance_private (self);
-  GstBufferPool *pool = NULL;
-  GstStructure *structure;
   gsize size = priv->video_info.size;
+  GstStructure *config;
+
+  /* Pools with outstanding buffer cannot be reconfigured, so we must use
+   * a new pool. */
+  if (priv->pool) {
+    gst_buffer_pool_set_active (priv->pool, FALSE);
+    gst_object_unref (priv->pool);
+  }
+  priv->pool = gst_wl_video_buffer_pool_new ();
+  gst_object_ref_sink (priv->pool);
+
+  config = gst_buffer_pool_get_config (priv->pool);
+  gst_buffer_pool_config_set_params (config, priv->caps, size, 2, 0);
+  gst_buffer_pool_config_set_allocator (config, allocator, NULL);
+
+  if (!gst_buffer_pool_set_config (priv->pool, config))
+    return FALSE;
+
+  return gst_buffer_pool_set_active (priv->pool, TRUE);
+}
+
+static gboolean
+gst_gtk_wayland_activate_shm_pool (GstGtkWaylandSink * self)
+{
+  GstGtkWaylandSinkPrivate *priv =
+      gst_gtk_wayland_sink_get_instance_private (self);
+  GstAllocator *alloc = NULL;
+
+  if (priv->pool && gst_buffer_pool_is_active (priv->pool)) {
+    GstStructure *config = gst_buffer_pool_get_config (priv->pool);
+    gboolean is_shm = FALSE;
+
+    if (gst_buffer_pool_config_get_allocator (config, &alloc, NULL) && alloc)
+      is_shm = GST_IS_SHM_ALLOCATOR (alloc);
+
+    gst_structure_free (config);
+
+    if (is_shm)
+      return TRUE;
+  }
+
+  alloc = gst_shm_allocator_get ();
+  gst_gtk_wayland_update_pool (self, alloc);
+  gst_object_unref (alloc);
+
+  return TRUE;
+}
+
+static gboolean
+gst_gtk_wayland_activate_drm_dumb_pool (GstGtkWaylandSink * self)
+{
+  GstGtkWaylandSinkPrivate *priv =
+      gst_gtk_wayland_sink_get_instance_private (self);
   GstAllocator *alloc;
 
-  pool = gst_wl_video_buffer_pool_new ();
+  if (!priv->drm_device)
+    return FALSE;
 
-  structure = gst_buffer_pool_get_config (pool);
-  gst_buffer_pool_config_set_params (structure, caps, size, 2, 0);
+  if (priv->pool && gst_buffer_pool_is_active (priv->pool)) {
+    GstStructure *config = gst_buffer_pool_get_config (priv->pool);
+    gboolean ret = FALSE;
+    gboolean is_drm_dumb = FALSE;
 
-  alloc = gst_wl_shm_allocator_get ();
-  gst_buffer_pool_config_set_allocator (structure, alloc, NULL);
-  if (!gst_buffer_pool_set_config (pool, structure)) {
-    g_object_unref (pool);
-    pool = NULL;
+    ret = gst_buffer_pool_config_get_allocator (config, &alloc, NULL);
+    gst_structure_free (config);
+
+    if (ret && alloc)
+      is_drm_dumb = GST_IS_DRM_DUMB_ALLOCATOR (alloc);
+
+    if (is_drm_dumb)
+      return TRUE;
   }
-  g_object_unref (alloc);
 
-  return pool;
+  alloc = gst_drm_dumb_allocator_new_with_device_path (priv->drm_device);
+  if (!alloc)
+    return FALSE;
+
+  gst_gtk_wayland_update_pool (self, alloc);
+  gst_object_unref (alloc);
+
+  return TRUE;
 }
 
 static gboolean
@@ -853,30 +936,48 @@
   GstGtkWaylandSinkPrivate *priv =
       gst_gtk_wayland_sink_get_instance_private (self);
   gboolean use_dmabuf;
-  GstVideoFormat format;
 
   GST_DEBUG_OBJECT (self, "set caps %" GST_PTR_FORMAT, caps);
 
-  /* extract info from caps */
-  if (!gst_video_info_from_caps (&priv->video_info, caps))
-    goto invalid_format;
+  if (gst_video_is_dma_drm_caps (caps)) {
+    if (!gst_video_info_dma_drm_from_caps (&priv->drm_info, caps))
+      goto invalid_format;
+
+    if (!gst_video_info_dma_drm_to_video_info (&priv->drm_info,
+            &priv->video_info))
+      goto invalid_format;
+  } else {
+    /* extract info from caps */
+    if (!gst_video_info_from_caps (&priv->video_info, caps))
+      goto invalid_format;
+
+    if (!gst_video_info_dma_drm_from_video_info (&priv->drm_info,
+            &priv->video_info, DRM_FORMAT_MOD_LINEAR))
+      gst_video_info_dma_drm_init (&priv->drm_info);
+  }
 
-  format = GST_VIDEO_INFO_FORMAT (&priv->video_info);
   priv->video_info_changed = TRUE;
+  priv->skip_dumb_buffer_copy = FALSE;
 
-  /* create a new pool for the new caps */
-  if (priv->pool)
-    gst_object_unref (priv->pool);
-  priv->pool = gst_gtk_wayland_create_pool (self, caps);
+  /* free pooled buffer used with previous caps */
+  if (priv->pool) {
+    gst_buffer_pool_set_active (priv->pool, FALSE);
+    gst_clear_object (&priv->pool);
+  }
 
   use_dmabuf = gst_caps_features_contains (gst_caps_get_features (caps, 0),
       GST_CAPS_FEATURE_MEMORY_DMABUF);
 
   /* validate the format base on the memory type. */
   if (use_dmabuf) {
-    if (!gst_wl_display_check_format_for_dmabuf (priv->display, format))
-      goto unsupported_format;
-  } else if (!gst_wl_display_check_format_for_shm (priv->display, format)) {
+    if (!gst_wl_display_check_format_for_dmabuf (priv->display,
+            &priv->drm_info))
+      goto unsupported_drm_format;
+  } else if (!gst_wl_display_check_format_for_shm (priv->display,
+          &priv->video_info)) {
+    /* Note: we still support dmabuf in this case, but formats must also be
+     * supported on SHM interface to ensure a fallback is possible as we are
+     * not guarantied we'll get dmabuf in the buffers. */
     goto unsupported_format;
   }
 
@@ -894,9 +995,16 @@
     GST_OBJECT_UNLOCK (self);
     return FALSE;
   }
+
+  /* Ensure queue_draw get executed and internal display size get initialized.
+   * This does not happen otherwise as we don't draw in the widget
+   */
+  gtk_gst_base_widget_queue_draw (GTK_GST_BASE_WIDGET (priv->gtk_widget));
+
   GST_OBJECT_UNLOCK (self);
 
-  priv->use_dmabuf = use_dmabuf;
+  /* Will be used to create buffer pools */
+  gst_caps_replace (&priv->caps, caps);
 
   return TRUE;
 
@@ -906,10 +1014,17 @@
         "Could not locate image format from caps %" GST_PTR_FORMAT, caps);
     return FALSE;
   }
+unsupported_drm_format:
+  {
+    GST_ERROR_OBJECT (self, "DRM format %" GST_FOURCC_FORMAT
+        " is not available on the display",
+        GST_FOURCC_ARGS (priv->drm_info.drm_fourcc));
+    return FALSE;
+  }
 unsupported_format:
   {
     GST_ERROR_OBJECT (self, "Format %s is not available on the display",
-        gst_video_format_to_string (format));
+        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&priv->video_info)));
     return FALSE;
   }
 }
@@ -927,14 +1042,22 @@
 
   gst_query_parse_allocation (query, &caps, &need_pool);
 
-  if (need_pool)
-    pool = gst_gtk_wayland_create_pool (self, caps);
+  if (need_pool) {
+    GstStructure *config;
+    pool = gst_wl_video_buffer_pool_new ();
+    config = gst_buffer_pool_get_config (pool);
+    gst_buffer_pool_config_set_params (config,
+        caps, priv->video_info.size, 2, 0);
+    gst_buffer_pool_config_set_allocator (config,
+        gst_shm_allocator_get (), NULL);
+    gst_buffer_pool_set_config (pool, config);
+  }
 
   gst_query_add_allocation_pool (query, pool, priv->video_info.size, 2, 0);
   if (pool)
     g_object_unref (pool);
 
-  alloc = gst_wl_shm_allocator_get ();
+  alloc = gst_shm_allocator_get ();
   gst_query_add_allocation_param (query, alloc, NULL);
   gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);
   g_object_unref (alloc);
@@ -942,56 +1065,25 @@
   return TRUE;
 }
 
-static void
-frame_redraw_callback (void *data, struct wl_callback *callback, uint32_t time)
-{
-  GstGtkWaylandSink *self = data;
-  GstGtkWaylandSinkPrivate *priv =
-      gst_gtk_wayland_sink_get_instance_private (self);
-
-  GST_LOG_OBJECT (self, "frame_redraw_cb");
-
-  g_mutex_lock (&priv->render_lock);
-  priv->redraw_pending = FALSE;
-
-  if (priv->callback) {
-    wl_callback_destroy (callback);
-    priv->callback = NULL;
-  }
-  g_mutex_unlock (&priv->render_lock);
-}
-
-static const struct wl_callback_listener frame_callback_listener = {
-  frame_redraw_callback
-};
-
 /* must be called with the render lock */
-static void
+static gboolean
 render_last_buffer (GstGtkWaylandSink * self, gboolean redraw)
 {
   GstGtkWaylandSinkPrivate *priv =
       gst_gtk_wayland_sink_get_instance_private (self);
   GstWlBuffer *wlbuffer;
   const GstVideoInfo *info = NULL;
-  struct wl_surface *surface;
-  struct wl_callback *callback;
 
   if (!priv->wl_window)
-    return;
+    return FALSE;
 
   wlbuffer = gst_buffer_get_wl_buffer (priv->display, priv->last_buffer);
-  surface = gst_wl_window_get_wl_surface (priv->wl_window);
-
-  priv->redraw_pending = TRUE;
-  callback = wl_surface_frame (surface);
-  priv->callback = callback;
-  wl_callback_add_listener (callback, &frame_callback_listener, self);
 
   if (G_UNLIKELY (priv->video_info_changed && !redraw)) {
     info = &priv->video_info;
     priv->video_info_changed = FALSE;
   }
-  gst_wl_window_render (priv->wl_window, wlbuffer, info);
+  return gst_wl_window_render (priv->wl_window, wlbuffer, info);
 }
 
 static GstFlowReturn
@@ -1002,9 +1094,6 @@
       gst_gtk_wayland_sink_get_instance_private (self);
   GstBuffer *to_render;
   GstWlBuffer *wlbuffer;
-  GstVideoMeta *vmeta;
-  GstVideoFormat format;
-  GstVideoInfo old_vinfo;
   GstMemory *mem;
   struct wl_buffer *wbuf = NULL;
 
@@ -1017,13 +1106,7 @@
   if (!priv->wl_window) {
     GST_LOG_OBJECT (self,
         "buffer %" GST_PTR_FORMAT " dropped (waiting for window)", buffer);
-    goto done;
-  }
-
-  /* drop buffers until we get a frame callback */
-  if (priv->redraw_pending) {
-    GST_LOG_OBJECT (self, "buffer %" GST_PTR_FORMAT " dropped (redraw pending)",
-        buffer);
+    ret = GST_BASE_SINK_FLOW_DROPPED;
     goto done;
   }
 
@@ -1045,24 +1128,11 @@
   /* update video info from video meta */
   mem = gst_buffer_peek_memory (buffer, 0);
 
-  old_vinfo = priv->video_info;
-  vmeta = gst_buffer_get_video_meta (buffer);
-  if (vmeta) {
-    gint i;
-
-    for (i = 0; i < vmeta->n_planes; i++) {
-      priv->video_info.offseti = vmeta->offseti;
-      priv->video_info.stridei = vmeta->stridei;
-    }
-    priv->video_info.size = gst_buffer_get_size (buffer);
-  }
-
   GST_LOG_OBJECT (self,
       "buffer %" GST_PTR_FORMAT " does not have a wl_buffer from our "
       "display, creating it", buffer);
 
-  format = GST_VIDEO_INFO_FORMAT (&priv->video_info);
-  if (gst_wl_display_check_format_for_dmabuf (priv->display, format)) {
+  if (gst_wl_display_check_format_for_dmabuf (priv->display, &priv->drm_info)) {
     guint i, nb_dmabuf = 0;
 
     for (i = 0; i < gst_buffer_n_memory (buffer); i++)
@@ -1071,10 +1141,63 @@
 
     if (nb_dmabuf && (nb_dmabuf == gst_buffer_n_memory (buffer)))
       wbuf = gst_wl_linux_dmabuf_construct_wl_buffer (buffer, priv->display,
-          &priv->video_info);
+          &priv->drm_info);
+
+    if (!wbuf && !priv->skip_dumb_buffer_copy) {
+      /* DMABuf did not work, let try and make this a dmabuf, it does not matter
+       * if it was a SHM since the compositor needs to copy that anyway, and
+       * offloading the compositor from a copy helps maintaining a smoother
+       * desktop.
+       */
+      GstVideoFrame src, dst;
+
+      if (!gst_gtk_wayland_activate_drm_dumb_pool (self)) {
+        priv->skip_dumb_buffer_copy = TRUE;
+        goto handle_shm;
+      }
+
+      ret = gst_buffer_pool_acquire_buffer (priv->pool, &to_render, NULL);
+      if (ret != GST_FLOW_OK)
+        goto no_buffer;
+
+      wlbuffer = gst_buffer_get_wl_buffer (priv->display, to_render);
+
+      /* attach a wl_buffer if there isn't one yet */
+      if (G_UNLIKELY (!wlbuffer)) {
+        wbuf = gst_wl_linux_dmabuf_construct_wl_buffer (to_render,
+            priv->display, &priv->drm_info);
+
+        if (G_UNLIKELY (!wbuf)) {
+          GST_WARNING_OBJECT (self, "failed to import DRM Dumb dmabuf");
+          gst_clear_buffer (&to_render);
+          priv->skip_dumb_buffer_copy = TRUE;
+          goto handle_shm;
+        }
+
+        wlbuffer = gst_buffer_add_wl_buffer (to_render, wbuf, priv->display);
+      }
+
+      if (!gst_video_frame_map (&dst, &priv->video_info, to_render,
+              GST_MAP_WRITE))
+        goto dst_map_failed;
+
+      if (!gst_video_frame_map (&src, &priv->video_info, buffer, GST_MAP_READ)) {
+        gst_video_frame_unmap (&dst);
+        goto src_map_failed;
+      }
+
+      gst_video_frame_copy (&dst, &src);
+
+      gst_video_frame_unmap (&src);
+      gst_video_frame_unmap (&dst);
+
+      goto render;
+    }
   }
 
-  if (!wbuf && gst_wl_display_check_format_for_shm (priv->display, format)) {
+handle_shm:
+  if (!wbuf && gst_wl_display_check_format_for_shm (priv->display,
+          &priv->video_info)) {
     if (gst_buffer_n_memory (buffer) == 1 && gst_is_fd_memory (mem))
       wbuf = gst_wl_shm_memory_construct_wl_buffer (mem, priv->display,
           &priv->video_info);
@@ -1082,10 +1205,6 @@
     /* If nothing worked, copy into our internal pool */
     if (!wbuf) {
       GstVideoFrame src, dst;
-      GstVideoInfo src_info = priv->video_info;
-
-      /* rollback video info changes */
-      priv->video_info = old_vinfo;
 
       /* we don't know how to create a wl_buffer directly from the provided
        * memory, so we have to copy the data to shm memory that we know how
@@ -1095,25 +1214,10 @@
           "buffer %" GST_PTR_FORMAT " cannot have a wl_buffer, "
           "copying to wl_shm memory", buffer);
 
-      /* priv->pool always exists (created in set_caps), but it may not
-       * be active if upstream is not using it */
-      if (!gst_buffer_pool_is_active (priv->pool)) {
-        GstStructure *config;
-        GstCaps *caps;
-
-        config = gst_buffer_pool_get_config (priv->pool);
-        gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL);
 
-        /* revert back to default strides and offsets */
-        gst_video_info_from_caps (&priv->video_info, caps);
-        gst_buffer_pool_config_set_params (config, caps, priv->video_info.size,
-            2, 0);
-
-        /* This is a video pool, it should not fail with basic settings */
-        if (!gst_buffer_pool_set_config (priv->pool, config) ||
-            !gst_buffer_pool_set_active (priv->pool, TRUE))
-          goto activate_failed;
-      }
+      /* ensure the internal pool is configured for SHM */
+      if (!gst_gtk_wayland_activate_shm_pool (self))
+        goto activate_failed;
 
       ret = gst_buffer_pool_acquire_buffer (priv->pool, &to_render, NULL);
       if (ret != GST_FLOW_OK)
@@ -1137,7 +1241,7 @@
               GST_MAP_WRITE))
         goto dst_map_failed;
 
-      if (!gst_video_frame_map (&src, &src_info, buffer, GST_MAP_READ)) {
+      if (!gst_video_frame_map (&src, &priv->video_info, buffer, GST_MAP_READ)) {
         gst_video_frame_unmap (&dst);
         goto src_map_failed;
       }
@@ -1166,7 +1270,8 @@
   }
 
   gst_buffer_replace (&priv->last_buffer, to_render);
-  render_last_buffer (self, FALSE);
+  if (!render_last_buffer (self, FALSE))
+    ret = GST_BASE_SINK_FLOW_DROPPED;
 
   if (buffer != to_render)
     gst_buffer_unref (to_render);

gst-plugins-bad-1.22.7.tar.xz/ext/hls/gsthlsdemux.c -> gst-plugins-bad-1.24.5.tar.xz/ext/hls/gsthlsdemux.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/ladspa/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/ladspa/meson.build Changed

gst-plugins-bad-1.24.5.tar.xz/ext/lc3 Added

gst-plugins-bad-1.24.5.tar.xz/ext/lc3/gstlc3common.h Added

@@ -0,0 +1,30 @@
+/* GStreamer LC3 Bluetooth LE audio decoder
+ * Copyright (C) 2023 Asymptotic Inc. <taruntej@asymptotic.io>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <glib.h>
+
+#define SAMPLE_RATES "8000, 16000, 24000, 32000, 48000"
+#define FORMAT "S16LE"
+
+#define FRAME_DURATION_10000US 10000
+
+#define FRAME_DURATIONS    "10000, 7500"
+#define FRAME_BYTES_RANGE  "20, 400"

gst-plugins-bad-1.24.5.tar.xz/ext/lc3/gstlc3dec.c Added

@@ -0,0 +1,349 @@
+/* GStreamer LC3 Bluetooth LE audio decoder
+ * Copyright (C) 2023 Asymptotic Inc. <taruntej@asymptotic.io>
+ *
+ * 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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+
+/**
+ * SECTION:element-lc3dec
+ *
+ * The lc3dec decodes LC3 data into raw audio.
+ *
+ * ## Example pipeline
+ * |
+ * gst-launch-1.0 -v filesrc location=encoded.lc3 blocksize=200 ! \
+ *   audio/x-lc3,frame-bytes=100,frame-duration-us=10000,channels=2,rate=48000,channel-mask=$bitmask$0x00000000000000003 !\
+ *   lc3dec ! wavenc ! filesink location=decoded.wav
+ * |
+ *
+ * Decodes the LC3 frames each with 100 bytes of size, converts it to raw audio and saves into a .wav file
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/audio/gstaudiodecoder.h>
+
+#include "gstlc3common.h"
+#include "gstlc3dec.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_lc3_dec_debug_category);
+#define GST_CAT_DEFAULT gst_lc3_dec_debug_category
+
+#define parent_class gst_lc3_dec_parent_class
+G_DEFINE_TYPE (GstLc3Dec, gst_lc3_dec, GST_TYPE_AUDIO_DECODER);
+GST_ELEMENT_REGISTER_DEFINE (lc3dec, "lc3dec", GST_RANK_NONE, GST_TYPE_LC3_DEC);
+
+/* prototypes */
+static gboolean gst_lc3_dec_start (GstAudioDecoder * decoder);
+static gboolean gst_lc3_dec_stop (GstAudioDecoder * decoder);
+static gboolean gst_lc3_dec_set_format (GstAudioDecoder * decoder,
+    GstCaps * caps);
+static GstFlowReturn gst_lc3_dec_handle_frame (GstAudioDecoder * decoder,
+    GstBuffer * buffer);
+
+/* pad templates */
+static GstStaticPadTemplate gst_lc3_dec_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-raw, "
+        "format = " FORMAT ", layout=interleaved, "
+        "rate = { " SAMPLE_RATES " }, channels = 1,MAX")
+    );
+
+static GstStaticPadTemplate gst_lc3_dec_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-lc3, rate = { " SAMPLE_RATES " }, "
+        "channels = 1,MAX,"
+        "frame-bytes = (int) " FRAME_BYTES_RANGE ", "
+        "frame-duration-us = (int) { " FRAME_DURATIONS " }, "
+        "framed=(boolean) true")
+    );
+
+/* class initialization */
+static void
+gst_lc3_dec_class_init (GstLc3DecClass * klass)
+{
+  GstAudioDecoderClass *audio_decoder_class = GST_AUDIO_DECODER_CLASS (klass);
+
+  gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass),
+      &gst_lc3_dec_src_template);
+  gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass),
+      &gst_lc3_dec_sink_template);
+
+  gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (klass),
+      "LC3 Bluetooth Audio decoder", "Codec/Decoder/Audio",
+      "Decodes an LC3 Audio stream to raw audio",
+      "Taruntej Kanakamalla <taruntej@asymptotic.io>");
+
+  GST_DEBUG_CATEGORY_INIT (gst_lc3_dec_debug_category, "lc3dec", 0,
+      "debug category for lc3dec element");
+
+  audio_decoder_class->start = GST_DEBUG_FUNCPTR (gst_lc3_dec_start);
+  audio_decoder_class->stop = GST_DEBUG_FUNCPTR (gst_lc3_dec_stop);
+  audio_decoder_class->set_format = GST_DEBUG_FUNCPTR (gst_lc3_dec_set_format);
+  audio_decoder_class->handle_frame =
+      GST_DEBUG_FUNCPTR (gst_lc3_dec_handle_frame);
+}
+
+static void
+gst_lc3_dec_init (GstLc3Dec * lc3_dec)
+{
+}
+
+static gboolean
+gst_lc3_dec_start (GstAudioDecoder * decoder)
+{
+  /* let the baseclass convert the segment data
+   * from 'bytes' to 'time' format
+   */
+  gst_audio_decoder_set_estimate_rate (decoder, TRUE);
+
+  /* Inform the base class that the LC3 lib can do PLC */
+  gst_audio_decoder_set_plc_aware (decoder, TRUE);
+
+  return TRUE;
+}
+
+static gboolean
+gst_lc3_dec_stop (GstAudioDecoder * decoder)
+{
+  GstLc3Dec *lc3_dec = GST_LC3_DEC (decoder);
+
+  if (lc3_dec->dec_ch != NULL) {
+    for (int ich = 0; ich < lc3_dec->channels; ich++) {
+      g_free (lc3_dec->dec_chich);
+      lc3_dec->dec_chich = NULL;
+    }
+
+    g_free (lc3_dec->dec_ch);
+    lc3_dec->dec_ch = NULL;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_lc3_dec_set_format (GstAudioDecoder * decoder, GstCaps * caps)
+{
+  GstLc3Dec *lc3_dec = GST_LC3_DEC (decoder);
+  GstAudioInfo info;
+  GstStructure *s;
+  GstAudioChannelPosition pos64 = { GST_AUDIO_CHANNEL_POSITION_INVALID, };
+  gint in_ch, in_rate;
+  guint64 in_chmsk = 0;
+  GstClockTime latency;
+
+  GST_DEBUG_OBJECT (lc3_dec, "set_format");
+  GST_DEBUG_OBJECT (lc3_dec, "input caps %" GST_PTR_FORMAT, caps);
+
+  s = gst_caps_get_structure (caps, 0);
+  if (!gst_structure_get_int (s, "frame-duration-us",
+          &lc3_dec->frame_duration_us)) {
+    GST_ERROR_OBJECT (lc3_dec,
+        "sink caps does not contain 'frame-duration-us'");
+    return FALSE;
+  }
+
+  if (!gst_structure_get_int (s, "frame-bytes", &lc3_dec->frame_bytes)) {
+    GST_ERROR_OBJECT (lc3_dec, "sink caps does not contain 'frame-bytes'");
+    return FALSE;
+  }
+  /* use rate and channel from input caps to create filter caps */
+  gst_structure_get_int (s, "rate", &in_rate);
+  gst_structure_get_int (s, "channels", &in_ch);
+  if (!gst_structure_get (s, "channel-mask", GST_TYPE_BITMASK, &in_chmsk, NULL)) {
+    GST_INFO_OBJECT (lc3_dec,
+        "channel-mask not present in the sink caps, getting fallback mask");
+    in_chmsk = gst_audio_channel_get_fallback_mask (in_ch);
+  }
+  s = NULL;
+
+  gst_audio_channel_positions_from_mask (in_ch, in_chmsk, pos);
+  gst_audio_info_set_format (&info, GST_AUDIO_FORMAT_S16LE, in_rate, in_ch,
+      pos);
+
+  /* get rate, format, channels from the output caps */
+  lc3_dec->rate = GST_AUDIO_INFO_RATE (&info);
+  lc3_dec->channels = GST_AUDIO_INFO_CHANNELS (&info);
+
+  switch (GST_AUDIO_INFO_FORMAT (&info)) {
+    case GST_AUDIO_FORMAT_S16LE:
+      lc3_dec->format = LC3_PCM_FORMAT_S16;
+      break;
+    case GST_AUDIO_FORMAT_S24LE:
+      lc3_dec->format = LC3_PCM_FORMAT_S24_3LE;
+      break;
+    case GST_AUDIO_FORMAT_F32:
+      lc3_dec->format = LC3_PCM_FORMAT_FLOAT;
+      break;
+    case GST_AUDIO_FORMAT_S24_32LE:
+    default:
+      lc3_dec->format = LC3_PCM_FORMAT_S24;
+      break;
+  }
+
+  GST_INFO_OBJECT (lc3_dec, "lc3dec params "
+      "rate: %" G_GINT32_FORMAT ", channels: %" G_GINT32_FORMAT
+      ", lc3_pcm_format = %" G_GINT32_FORMAT " frame len: %" G_GINT32_FORMAT
+      ", frame_duration " "%" G_GINT32_FORMAT, lc3_dec->rate, lc3_dec->channels,
+      lc3_dec->format, lc3_dec->frame_bytes, lc3_dec->frame_duration_us);
+
+  lc3_dec->frame_samples =
+      lc3_frame_samples (lc3_dec->frame_duration_us, lc3_dec->rate);
+  lc3_dec->bpf = GST_AUDIO_INFO_BPF (&info);
+
+  latency =
+      gst_util_uint64_scale_int (lc3_dec->frame_bytes, GST_SECOND,
+      lc3_dec->rate);
+  gst_audio_decoder_set_latency (decoder, latency, latency);
+
+  /* Setup and Init decoder handle */
+  if (lc3_dec->dec_ch != NULL) {
+    for (int ich = 0; ich < lc3_dec->channels; ich++) {
+      g_free (lc3_dec->dec_chich);
+      lc3_dec->dec_chich = NULL;
+    }
+    g_free (lc3_dec->dec_ch);
+    lc3_dec->dec_ch = NULL;
+  }
+
+  lc3_dec->dec_ch = g_new0 (lc3_decoder_t, lc3_dec->channels);
+
+  for (guint8 i = 0; i < lc3_dec->channels; i++) {
+    /* The decoder can resample for us. But we leave the resampling to before decoding
+     * explicitly for now. So pass the same sample rate for sr_hz and sr_pcm_hz
+     */
+    lc3_dec->dec_chi =
+        lc3_setup_decoder (lc3_dec->frame_duration_us, lc3_dec->rate,
+        lc3_dec->rate, g_malloc (lc3_decoder_size (lc3_dec->frame_duration_us,
+                lc3_dec->rate)));
+
+    if (lc3_dec->dec_chi == NULL) {
+      GST_ERROR_OBJECT (lc3_dec,
+          "Failed to create decoder handle for channel %" G_GUINT32_FORMAT, i);
+      return FALSE;
+    }
+  }
+
+  gst_audio_decoder_set_output_format (decoder, &info);
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_lc3_dec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf)
+{
+  GstLc3Dec *lc3_dec = GST_LC3_DEC (decoder);
+  GstBuffer *outbuf = NULL;
+  GstMapInfo out_map;
+  GstMapInfo in_map;
+  gssize output_size;
+  GstAudioClippingMeta *audio_meta;
+  gboolean do_plc = gst_audio_decoder_get_plc (decoder) &&
+      gst_audio_decoder_get_plc_aware (decoder);
+
+  /* no fancy draining */
+  if (G_UNLIKELY (inbuf == NULL))
+    return GST_FLOW_OK;
+
+  gst_buffer_map (inbuf, &in_map, GST_MAP_READ);
+
+  if (G_UNLIKELY (in_map.size == 0 && !do_plc)) {
+    GST_ERROR_OBJECT (lc3_dec,
+        "PLC handled by the base class, should not get a zero sized buffer");
+    return GST_FLOW_ERROR;
+  }
+
+  GST_LOG_OBJECT (lc3_dec, "received %lu bytes ", in_map.size);
+
+  /* we expect exactly one frame each time */
+  if (G_UNLIKELY (in_map.size == 0 && !do_plc) &&
+      (in_map.size != (lc3_dec->frame_bytes * lc3_dec->channels)))
+    goto mixed_frames;
+
+  output_size = lc3_dec->frame_samples * lc3_dec->bpf;
+  GST_LOG_OBJECT (lc3_dec, "allocating %lu bytes to output buffer",
+      output_size);
+  outbuf = gst_audio_decoder_allocate_output_buffer (decoder, output_size);
+
+  if (outbuf == NULL)
+    goto no_buffer;
+
+  gst_buffer_map (outbuf, &out_map, GST_MAP_WRITE);
+
+  for (guint c = 0; c < lc3_dec->channels; c++) {
+    gint ret = 0;
+    void *in = in_map.data ? in_map.data + (c * lc3_dec->frame_bytes) : NULL;
+    ret =
+        lc3_decode (lc3_dec->dec_chc, in, lc3_dec->frame_bytes,
+        lc3_dec->format, out_map.data + (c * lc3_dec->bpf / lc3_dec->channels),
+        lc3_dec->channels);
+
+    if (ret < 0) {
+      GST_ERROR_OBJECT (lc3_dec,
+          "Failed to decode frame for buffer %" GST_PTR_FORMAT, inbuf);
+      return GST_FLOW_ERROR;
+    } else if (ret == 1) {
+      GST_INFO_OBJECT (lc3_dec, "PLC operated for channel: %d", c + 1);
+    }
+  }
+
+  audio_meta = gst_buffer_get_audio_clipping_meta (inbuf);
+  if (audio_meta) {
+    switch (audio_meta->format) {
+      case GST_FORMAT_DEFAULT:
+      {
+        output_size =
+            output_size - (audio_meta->start * lc3_dec->bpf) -
+            (audio_meta->end * lc3_dec->bpf);
+        gst_buffer_resize (outbuf, (audio_meta->start * lc3_dec->bpf),
+            output_size);
+      }
+        break;
+      default:
+        GST_WARNING_OBJECT (lc3_dec, "audio meta format: %d not handled",
+            audio_meta->format);
+        break;
+    }
+  }
+
+  gst_buffer_unmap (outbuf, &out_map);
+  gst_buffer_unmap (inbuf, &in_map);
+
+  return gst_audio_decoder_finish_frame (decoder, outbuf, 1);
+
+/* ERRORS */
+mixed_frames:
+  {
+    GST_WARNING_OBJECT (lc3_dec,
+        "inconsistent input data/frames, Need to be %"
+        G_GINT32_FORMAT " bytes", lc3_dec->frame_bytes * lc3_dec->channels);
+    return GST_FLOW_ERROR;
+  }
+
+no_buffer:
+  {
+    GST_ERROR_OBJECT (lc3_dec, "could not allocate output buffer");
+    return GST_FLOW_ERROR;
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/ext/lc3/gstlc3dec.h Added

@@ -0,0 +1,53 @@
+/* GStreamer LC3 Bluetooth LE audio decoder
+ * Copyright (C) 2023 Asymptotic Inc. <taruntej@asymptotic.io>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GST_LC3DEC_H_
+#define _GST_LC3DEC_H_
+
+#include <gst/audio/gstaudioencoder.h>
+#include <lc3.h>
+
+G_BEGIN_DECLS
+#define GST_TYPE_LC3_DEC   (gst_lc3_dec_get_type())
+G_DECLARE_FINAL_TYPE (GstLc3Dec, gst_lc3_dec, GST, LC3_DEC, GstAudioDecoder)
+
+struct _GstLc3Dec
+{
+  GstAudioDecoder base;
+  lc3_decoder_t *dec_ch;
+  gint channels;
+  gint rate;
+  gint frame_duration_us;
+  /* byte count per channel, same for all channels */
+  gint frame_bytes;
+  gint frame_samples;
+  enum lc3_pcm_format format;
+  /* bytes per sample */
+  gint bpf;
+};
+
+struct _GstLc3DecClass
+{
+  GstAudioDecoderClass base_class;
+};
+
+GST_ELEMENT_REGISTER_DECLARE (lc3dec);
+
+G_END_DECLS
+#endif

gst-plugins-bad-1.24.5.tar.xz/ext/lc3/gstlc3enc.c Added

@@ -0,0 +1,424 @@
+/* GStreamer LC3 Bluetooth LE audio encoder
+ * Copyright (C) 2023 Asymptotic Inc. <taruntej@asymptotic.io>
+ *
+ * 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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+
+/**
+ * SECTION:element-lc3enc
+ *
+ * The lc3enc element encodes raw audio using the Low Complexity Communication
+ * Codec (LC3).
+ *
+ * ## Example pipeline
+ * |
+ * gst-launch-1.0 audiotestsrc ! lc3enc ! audio/x-lc3,channels=2,rate=48000,frame-duration-us=10000 !\
+ *  filesink location=audio.lc3
+ * |
+ *
+ * Encodes a sine wave into LC3 format using the config params frame-duration-us
+ * specified by the caps downstream and save it to file audio.lc3
+ *
+ * Since: 1.24
+ */
+
+#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/audio/gstaudioencoder.h>
+
+#include "gstlc3common.h"
+#include "gstlc3enc.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_lc3_enc_debug_category);
+#define GST_CAT_DEFAULT gst_lc3_enc_debug_category
+
+#define parent_class gst_lc3_enc_parent_class
+G_DEFINE_TYPE (GstLc3Enc, gst_lc3_enc, GST_TYPE_AUDIO_ENCODER);
+GST_ELEMENT_REGISTER_DEFINE (lc3enc, "lc3enc", GST_RANK_NONE, GST_TYPE_LC3_ENC);
+
+static gboolean gst_lc3_enc_start (GstAudioEncoder * encoder);
+static gboolean gst_lc3_enc_stop (GstAudioEncoder * encoder);
+static gboolean gst_lc3_enc_set_format (GstAudioEncoder * encoder,
+    GstAudioInfo * info);
+static GstFlowReturn gst_lc3_enc_handle_frame (GstAudioEncoder * encoder,
+    GstBuffer * buffer);
+
+#define DEFAULT_BITRATE_PER_CHANNEL     160000
+
+static GstStaticPadTemplate gst_lc3_enc_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-lc3, "
+        "rate = (int) { " SAMPLE_RATES " }, "
+        "channels = (int) 1, MAX, "
+        "frame-bytes = (int) " FRAME_BYTES_RANGE ", "
+        "frame-duration-us = (int) { " FRAME_DURATIONS "}, "
+        "framed=(boolean) true")
+    );
+
+static GstStaticPadTemplate gst_lc3_enc_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-raw, "
+        "format = " FORMAT ", "
+        "rate = (int) { " SAMPLE_RATES " }, channels = (int) 1, MAX")
+    );
+
+static void
+gst_lc3_enc_class_init (GstLc3EncClass * klass)
+{
+  GstAudioEncoderClass *audio_encoder_class = GST_AUDIO_ENCODER_CLASS (klass);
+
+  audio_encoder_class->start = GST_DEBUG_FUNCPTR (gst_lc3_enc_start);
+  audio_encoder_class->stop = GST_DEBUG_FUNCPTR (gst_lc3_enc_stop);
+  audio_encoder_class->set_format = GST_DEBUG_FUNCPTR (gst_lc3_enc_set_format);
+  audio_encoder_class->handle_frame =
+      GST_DEBUG_FUNCPTR (gst_lc3_enc_handle_frame);
+
+  gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass),
+      &gst_lc3_enc_src_template);
+  gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass),
+      &gst_lc3_enc_sink_template);
+
+  gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (klass),
+      "LC3 Bluetooth Audio encoder", "Codec/Encoder/Audio",
+      "Encodes a raw audio stream to LC3",
+      "Taruntej Kanakamalla <taruntej@asymptotic.io>");
+
+  GST_DEBUG_CATEGORY_INIT (gst_lc3_enc_debug_category, "lc3enc", 0,
+      "debug category for lc3enc element");
+}
+
+static void
+gst_lc3_enc_init (GstLc3Enc * lc3_enc)
+{
+}
+
+static gboolean
+gst_lc3_enc_start (GstAudioEncoder * encoder)
+{
+  GstLc3Enc *lc3_enc = GST_LC3_ENC (encoder);
+
+  lc3_enc->enc_ch = NULL;
+  lc3_enc->frame_bytes = 0;
+  /* Set to true at the start of processing */
+  lc3_enc->first_frame = TRUE;
+  lc3_enc->pending_bytes = 0;
+
+  return TRUE;
+}
+
+static gboolean
+gst_lc3_enc_stop (GstAudioEncoder * encoder)
+{
+  GstLc3Enc *lc3_enc = GST_LC3_ENC (encoder);
+
+  if (lc3_enc->enc_ch != NULL) {
+    for (int ich = 0; ich < lc3_enc->channels; ich++) {
+      g_free (lc3_enc->enc_chich);
+      lc3_enc->enc_chich = NULL;
+    }
+
+    g_free (lc3_enc->enc_ch);
+    lc3_enc->enc_ch = NULL;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_lc3_enc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info)
+{
+  GstLc3Enc *lc3_enc = GST_LC3_ENC (encoder);
+  GstCaps *caps = NULL, *filter_caps = NULL;
+  GstCaps *output_caps = NULL;
+  GstStructure *s;
+  GstClockTime latency;
+
+  lc3_enc->bpf = GST_AUDIO_INFO_BPF (info);
+
+  switch (GST_AUDIO_INFO_FORMAT (info)) {
+    case GST_AUDIO_FORMAT_S16LE:
+      lc3_enc->format = LC3_PCM_FORMAT_S16;
+      break;
+    case GST_AUDIO_FORMAT_S24LE:
+      lc3_enc->format = LC3_PCM_FORMAT_S24_3LE;
+      break;
+    case GST_AUDIO_FORMAT_F32:
+      lc3_enc->format = LC3_PCM_FORMAT_FLOAT;
+      break;
+    case GST_AUDIO_FORMAT_S24_32LE:
+    default:
+      lc3_enc->format = LC3_PCM_FORMAT_S24;
+      break;
+  }
+
+  caps = gst_pad_get_allowed_caps (GST_AUDIO_ENCODER_SRC_PAD (lc3_enc));
+  if (caps == NULL)
+    caps = gst_static_pad_template_get_caps (&gst_lc3_enc_src_template);
+  else if (gst_caps_is_empty (caps))
+    goto failure;
+
+  filter_caps = gst_caps_new_simple ("audio/x-lc3", "rate", G_TYPE_INT,
+      GST_AUDIO_INFO_RATE (info), "channels", G_TYPE_INT,
+      GST_AUDIO_INFO_CHANNELS (info), NULL);
+
+  output_caps = gst_caps_intersect (caps, filter_caps);
+
+  if (output_caps == NULL || gst_caps_is_empty (output_caps)) {
+    GST_WARNING_OBJECT (lc3_enc,
+        "Couldn't negotiate filter caps %" GST_PTR_FORMAT
+        " and allowed output caps %" GST_PTR_FORMAT, filter_caps, caps);
+
+    goto failure;
+  }
+
+  gst_caps_unref (filter_caps);
+  filter_caps = NULL;
+  gst_caps_unref (caps);
+  caps = NULL;
+
+  GST_DEBUG_OBJECT (lc3_enc, "fixating caps %" GST_PTR_FORMAT, output_caps);
+  output_caps = gst_caps_truncate (output_caps);
+  GST_DEBUG_OBJECT (lc3_enc, "truncated caps %" GST_PTR_FORMAT, output_caps);
+
+  s = gst_caps_get_structure (output_caps, 0);
+
+  gst_structure_get_int (s, "rate", &lc3_enc->rate);
+  gst_structure_get_int (s, "channels", &lc3_enc->channels);
+  gst_structure_get_int (s, "frame-bytes", &lc3_enc->frame_bytes);
+
+  if (gst_structure_fixate_field (s, "frame-duration-us")) {
+    gst_structure_get_int (s, "frame-duration-us", &lc3_enc->frame_duration_us);
+  } else {
+    lc3_enc->frame_duration_us = FRAME_DURATION_10000US;
+
+    GST_INFO_OBJECT (lc3_enc, "Frame duration not fixed, setting to %d",
+        lc3_enc->frame_duration_us);
+    gst_caps_set_simple (output_caps, "frame-duration-us", G_TYPE_INT,
+        lc3_enc->frame_duration_us, NULL);
+  }
+
+  if (lc3_enc->frame_bytes == 0) {
+    /* fixate_field() is always setting the frame_bytes to 20 which is not desired
+     * since we can get the value using frame duration and default bitrate
+     * compute the frame bytes and set the value to the caps
+     */
+
+    lc3_enc->frame_bytes = lc3_frame_bytes (lc3_enc->frame_duration_us,
+        DEFAULT_BITRATE_PER_CHANNEL);
+    GST_INFO_OBJECT (lc3_enc, "frame bytes computed %d using duration %d",
+        lc3_enc->frame_bytes, lc3_enc->frame_duration_us);
+
+    gst_caps_set_simple (output_caps, "frame-bytes", G_TYPE_INT,
+        lc3_enc->frame_bytes, NULL);
+  }
+
+  GST_INFO_OBJECT (lc3_enc, "output caps %" GST_PTR_FORMAT, output_caps);
+
+  lc3_enc->frame_samples =
+      lc3_frame_samples (lc3_enc->frame_duration_us, lc3_enc->rate);
+
+  gst_audio_encoder_set_frame_samples_min (encoder, lc3_enc->frame_samples);
+  gst_audio_encoder_set_frame_samples_max (encoder, lc3_enc->frame_samples);
+  gst_audio_encoder_set_frame_max (encoder, 1);
+
+  latency =
+      gst_util_uint64_scale_int (lc3_enc->frame_samples, GST_SECOND,
+      lc3_enc->rate);
+  gst_audio_encoder_set_latency (encoder, latency, latency);
+
+  /* Free the encoder handles if it was initialised previously */
+  if (lc3_enc->enc_ch != NULL) {
+    for (int ich = 0; ich < lc3_enc->channels; ich++) {
+      g_free (lc3_enc->enc_chich);
+      lc3_enc->enc_chich = NULL;
+    }
+    g_free (lc3_enc->enc_ch);
+    lc3_enc->enc_ch = NULL;
+  }
+
+  lc3_enc->enc_ch =
+      (lc3_encoder_t *) g_malloc (sizeof (lc3_encoder_t) * lc3_enc->channels);
+
+  for (guint8 i = 0; i < lc3_enc->channels; i++) {
+    /* The encoder can resample for us. But we leave the resampling to
+     * happen before encoding explicitly for now. So pass the same sample rate
+     * for sr_hz and sr_pcm_hz
+     */
+    lc3_enc->enc_chi =
+        lc3_setup_encoder (lc3_enc->frame_duration_us, lc3_enc->rate,
+        lc3_enc->rate, g_malloc (lc3_encoder_size (lc3_enc->frame_duration_us,
+                lc3_enc->rate)));
+
+    if (lc3_enc->enc_chi == NULL) {
+      GST_ERROR_OBJECT (lc3_enc,
+          "Failed to create encoder handle for channel %" G_GUINT32_FORMAT, i);
+      goto failure;
+    }
+  }
+
+  if (!gst_audio_encoder_set_output_format (encoder, output_caps))
+    goto failure;
+
+  gst_caps_unref (output_caps);
+
+  return gst_audio_encoder_negotiate (encoder);
+
+failure:
+  if (output_caps)
+    gst_caps_unref (output_caps);
+  if (caps)
+    gst_caps_unref (caps);
+  if (filter_caps)
+    gst_caps_unref (filter_caps);
+  return FALSE;
+}
+
+static GstFlowReturn
+gst_lc3_enc_handle_frame (GstAudioEncoder * encoder, GstBuffer * buffer)
+{
+  GstLc3Enc *lc3_enc = GST_LC3_ENC (encoder);
+  GstMapInfo in_map = GST_MAP_INFO_INIT, out_map = GST_MAP_INFO_INIT;
+  GstBuffer *outbuf = NULL;
+  guint samplesize, stride, req_samples, req_bytes, frame_bytes;
+  guint8 *pcm_in;
+  gint ret = -1;
+  guint64 trim_start = 0, trim_end = 0;
+
+  if (buffer == NULL && !lc3_enc->pending_bytes)
+    return GST_FLOW_OK;
+
+  if (G_UNLIKELY (lc3_enc->channels == 0))
+    return GST_FLOW_ERROR;
+
+  if (buffer && !gst_buffer_map (buffer, &in_map, GST_MAP_READ))
+    goto map_failed;
+
+  GST_TRACE_OBJECT (lc3_enc,
+      "encoding %" G_GSIZE_FORMAT " frame samples of %" G_GSIZE_FORMAT
+      " bytes", in_map.size / lc3_enc->bpf, in_map.size);
+
+  frame_bytes = lc3_enc->frame_bytes;
+
+  /* allocate frame_bytes for each channel in the output buffer */
+  outbuf =
+      gst_audio_encoder_allocate_output_buffer (encoder,
+      frame_bytes * lc3_enc->channels);
+
+  if (outbuf == NULL)
+    goto no_buffer;
+
+  if (!gst_buffer_map (outbuf, &out_map, GST_MAP_WRITE))
+    goto map_failed;
+
+  stride = lc3_enc->channels;
+  samplesize = lc3_enc->bpf / lc3_enc->channels;
+
+  /* Calculate the expected bytes */
+  req_samples = lc3_enc->frame_samples;
+  req_bytes = req_samples * lc3_enc->bpf;
+
+  if (lc3_enc->first_frame) {
+    /* LC3 encoder introduces extra samples as a part of the
+     * algorithmic delay at the beginning of the frame
+     */
+    lc3_enc->pending_bytes =
+        lc3_enc->bpf * lc3_delay_samples (lc3_enc->frame_duration_us,
+        lc3_enc->rate);
+
+    /* trim start 'delay_samples' bytes for the first frame */
+    trim_start = lc3_enc->pending_bytes / lc3_enc->bpf;
+    lc3_enc->first_frame = FALSE;
+  }
+
+  if (in_map.size < req_bytes) {
+    /* update the pending bytes and trim_end */
+    if (in_map.size + lc3_enc->pending_bytes > req_bytes) {
+      lc3_enc->pending_bytes = in_map.size + lc3_enc->pending_bytes - req_bytes;
+    } else {
+      trim_end =
+          (req_bytes - in_map.size - lc3_enc->pending_bytes) / lc3_enc->bpf;
+      lc3_enc->pending_bytes = 0;
+    }
+
+    /* The encoder always expects fixed number of bytes in the input
+     * If we get less bytes than req_bytes, most likely in the last iteration,
+     * add zero-padding bytes at the end
+     */
+    pcm_in = (guint8 *) g_malloc0 (req_bytes);
+    if (in_map.size && in_map.data)
+      memcpy (pcm_in, in_map.data, in_map.size);
+  } else {
+    pcm_in = in_map.data;
+  }
+
+  if (trim_start || trim_end) {
+    GST_TRACE_OBJECT (lc3_enc,
+        "Adding trim-start %" G_GUINT64_FORMAT " trim-end %" G_GUINT64_FORMAT,
+        trim_start, trim_end);
+    gst_buffer_add_audio_clipping_meta (outbuf, GST_FORMAT_DEFAULT, trim_start,
+        trim_end);
+  }
+
+  for (guint8 ch = 0; ch < lc3_enc->channels; ch++) {
+    ret = lc3_encode (lc3_enc->enc_chch, lc3_enc->format,
+        pcm_in + (ch * samplesize), stride, frame_bytes,
+        out_map.data + (ch * frame_bytes));
+
+    if (ret < 0) {
+      GST_WARNING_OBJECT (lc3_enc,
+          "encoding error: invalid  enc handle or frame_bytes");
+      break;
+    }
+  }
+
+  if (in_map.size < req_bytes)
+    g_free (pcm_in);
+
+  gst_buffer_unmap (outbuf, &out_map);
+  if (buffer)
+    gst_buffer_unmap (buffer, &in_map);
+
+  if (ret < 0)
+    return GST_FLOW_ERROR;
+
+  return gst_audio_encoder_finish_frame (encoder, outbuf, req_samples);
+
+no_buffer:
+  {
+    if (buffer)
+      gst_buffer_unmap (buffer, &in_map);
+    GST_ELEMENT_ERROR (lc3_enc, STREAM, FAILED, (NULL),
+        ("Could not allocate output buffer"));
+    return GST_FLOW_ERROR;
+  }
+
+map_failed:
+  {
+    if (buffer)
+      gst_buffer_unmap (buffer, &in_map);
+    GST_ELEMENT_ERROR (lc3_enc, STREAM, FAILED, (NULL),
+        ("Failed to get the buffer memory map"));
+    return GST_FLOW_ERROR;
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/ext/lc3/gstlc3enc.h Added

@@ -0,0 +1,57 @@
+/* GStreamer LC3 Bluetooth LE audio encoder
+ * Copyright (C) 2023 Asymptotic Inc. <taruntej@asymptotic.io>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GST_LC3ENC_H_
+#define _GST_LC3ENC_H_
+
+#include <gst/audio/gstaudioencoder.h>
+
+#include <lc3.h>
+
+G_BEGIN_DECLS
+#define GST_TYPE_LC3_ENC   (gst_lc3_enc_get_type())
+G_DECLARE_FINAL_TYPE (GstLc3Enc, gst_lc3_enc, GST, LC3_ENC, GstAudioEncoder)
+
+struct _GstLc3Enc
+{
+  GstAudioEncoder base;
+  lc3_encoder_t *enc_ch;
+  enum lc3_pcm_format format;
+  int rate;
+  int channels;
+  int frame_duration_us;
+  /* byte count per channel, same for all channels */
+  int frame_bytes;
+  /* bytes per sample */
+  int bpf;
+  /* pcm samples per encoded frame */
+  int frame_samples;
+  gboolean first_frame;
+  int pending_bytes;
+};
+
+struct _GstLc3EncClass
+{
+  GstAudioEncoderClass base_class;
+};
+
+GST_ELEMENT_REGISTER_DECLARE (lc3enc);
+
+G_END_DECLS
+#endif

gst-plugins-bad-1.24.5.tar.xz/ext/lc3/lc3-plugin.c Added

@@ -0,0 +1,46 @@
+/* GStreamer LC3 audio plugin
+ * Copyright (C) 2023 Asymptotic Inc. <taruntej@asymptotic.io>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstlc3dec.h"
+#include "gstlc3enc.h"
+
+/**
+ * plugin-lc3:
+ *
+ * Since: 1.24
+ */
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  gboolean ret = FALSE;
+  ret |= GST_ELEMENT_REGISTER (lc3dec, plugin);
+  ret |= GST_ELEMENT_REGISTER (lc3enc, plugin);
+  return ret;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    lc3,
+    "LC3 codec for Bluetooth LE Audio",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);

gst-plugins-bad-1.24.5.tar.xz/ext/lc3/meson.build Added

gst-plugins-bad-1.22.7.tar.xz/ext/lv2/gstlv2.c -> gst-plugins-bad-1.24.5.tar.xz/ext/lv2/gstlv2.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/ext/mpeg2enc/gstmpeg2enc.cc -> gst-plugins-bad-1.24.5.tar.xz/ext/mpeg2enc/gstmpeg2enc.cc Changed

gst-plugins-bad-1.22.7.tar.xz/ext/mplex/gstmplex.cc -> gst-plugins-bad-1.24.5.tar.xz/ext/mplex/gstmplex.cc Changed

gst-plugins-bad-1.22.7.tar.xz/ext/musepack/gstmusepackdec.c -> gst-plugins-bad-1.24.5.tar.xz/ext/musepack/gstmusepackdec.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/neon/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/neon/meson.build Changed

gst-plugins-bad-1.24.5.tar.xz/ext/onnx/README.md Added

@@ -0,0 +1,36 @@
+ONNX Build Instructions
+
+
+### Build
+
+ 1. do a recursive checkout of onnxruntime tag 1.16.3(https://github.com/microsoft/onnxruntime)
+ 1. `$SRC_DIR` and `$BUILD_DIR` are local source and build directories
+ 1. To run with CUDA, both CUDA(https://developer.nvidia.com/cuda-downloads) and cuDNN(https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn_762/cudnn-install/index.html) libraries must be installed.
+
+```
+$ cd $SRC_DIR
+$ git clone --recursive https://github.com/microsoft/onnxruntime.git && cd onnxruntime && git checkout -b v1.16.3 refs/tags/v1.16.3
+$ mkdir $BUILD_DIR/onnxruntime && cd $BUILD_DIR/onnxruntime
+
+```
+
+1. CPU
+```
+$ cmake -Donnxruntime_BUILD_SHARED_LIB=ON -DBUILD_TESTING=OFF -Donnxruntime_BUILD_UNIT_TESTS=OFF $SRC_DIR/onnxruntime/cmake && make -j$(nproc) && sudo make install
+```
+2. CUDA
+```
+cmake -Donnxruntime_BUILD_SHARED_LIB=ON -DBUILD_TESTING=OFF -Donnxruntime_BUILD_UNIT_TESTS=OFF -Donnxruntime_USE_CUDA=ON -Donnxruntime_CUDA_HOME=/usr/local/cuda -Donnxruntime_CUDNN_HOME=/usr/local/cuda -DCMAKE_CUDA_ARCHITECTURES=native -DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc $SRC_DIR/onnxruntime/cmake && make -j$(nproc) && sudo make install
+```
+3. Intel oneDNN
+
+3.0 install intel oneDNN(https://www.intel.com/content/www/us/en/developer/tools/oneapi/onednn.html)
+
+3.1 clone, build and install Khronos OpenCL SDK(https://github.com/KhronosGroup/OpenCL-SDK.git). Build dependencies for Fedora are
+
+`sudo dnf install libudev-devel libXrandr-devel  mesa-libGLU-devel mesa-libGL-devel    libX11-devel intel-opencl`
+
+3.2 build and install `onnxruntime` :
+```
+cmake -Donnxruntime_BUILD_SHARED_LIB=ON -DBUILD_TESTING=OFF -Donnxruntime_BUILD_UNIT_TESTS=OFF -Donnxruntime_USE_DNNL=ON -Donnxruntime_DNNL_GPU_RUNTIME=ocl -Donnxruntime_DNNL_OPENCL_ROOT=$SRC_DIR/OpenCL-SDK/install  $SRC_DIR/onnxruntime/cmake && make -j$(nproc) && sudo make install
+```

gst-plugins-bad-1.24.5.tar.xz/ext/onnx/decoders Added

gst-plugins-bad-1.24.5.tar.xz/ext/onnx/decoders/gstssdobjectdetector.c Added

@@ -0,0 +1,539 @@
+/*
+ * GStreamer gstreamer-ssdobjectdetector
+ * Copyright (C) 2021 Collabora Ltd.
+ *
+ * gstssdobjectdetector.cpp
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-ssdobjectdetector
+ * @short_description: Detect objects in video buffers using SSD neural network
+ *
+ * This element can parse per-buffer inference tensor meta data generated by an upstream
+ * inference element
+ *
+ *
+ * ## Example launch command:
+ *
+ * Test image file, model file (SSD) and label file can be found here :
+ * https://gitlab.collabora.com/gstreamer/onnx-models
+ *
+ * GST_DEBUG=ssdobjectdetector:5 \
+ * gst-launch-1.0 multifilesrc location=onnx-models/images/bus.jpg ! \
+ * jpegdec ! videoconvert ! onnxinference execution-provider=cpu model-file=onnx-models/models/ssd_mobilenet_v1_coco.onnx !  \
+ * ssdobjectdetector label-file=onnx-models/labels/COCO_classes.txt  ! videoconvert ! autovideosink
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstssdobjectdetector.h"
+
+#include <gio/gio.h>
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/analytics/analytics.h>
+#include "tensor/gsttensormeta.h"
+
+/* Object detection tensor id strings */
+#define GST_MODEL_OBJECT_DETECTOR_BOXES "Gst.Model.ObjectDetector.Boxes"
+#define GST_MODEL_OBJECT_DETECTOR_SCORES "Gst.Model.ObjectDetector.Scores"
+#define GST_MODEL_OBJECT_DETECTOR_NUM_DETECTIONS "Gst.Model.ObjectDetector.NumDetections"
+#define GST_MODEL_OBJECT_DETECTOR_CLASSES "Gst.Model.ObjectDetector.Classes"
+
+GST_DEBUG_CATEGORY_STATIC (ssd_object_detector_debug);
+#define GST_CAT_DEFAULT ssd_object_detector_debug
+GST_ELEMENT_REGISTER_DEFINE (ssd_object_detector, "ssdobjectdetector",
+    GST_RANK_PRIMARY, GST_TYPE_SSD_OBJECT_DETECTOR);
+
+/* GstSsdObjectDetector properties */
+enum
+{
+  PROP_0,
+  PROP_LABEL_FILE,
+  PROP_SCORE_THRESHOLD,
+};
+
+#define GST_SSD_OBJECT_DETECTOR_DEFAULT_SCORE_THRESHOLD       0.3f      /* 0 to 1 */
+
+static GstStaticPadTemplate gst_ssd_object_detector_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-raw")
+    );
+
+static GstStaticPadTemplate gst_ssd_object_detector_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-raw")
+    );
+
+static void gst_ssd_object_detector_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_ssd_object_detector_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+static void gst_ssd_object_detector_finalize (GObject * object);
+static GstFlowReturn gst_ssd_object_detector_transform_ip (GstBaseTransform *
+    trans, GstBuffer * buf);
+static gboolean gst_ssd_object_detector_process (GstBaseTransform * trans,
+    GstBuffer * buf);
+static gboolean
+gst_ssd_object_detector_set_caps (GstBaseTransform * trans, GstCaps * incaps,
+    GstCaps * outcaps);
+
+G_DEFINE_TYPE (GstSsdObjectDetector, gst_ssd_object_detector,
+    GST_TYPE_BASE_TRANSFORM);
+
+static void
+gst_ssd_object_detector_class_init (GstSsdObjectDetectorClass * klass)
+{
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GstElementClass *element_class = (GstElementClass *) klass;
+  GstBaseTransformClass *basetransform_class = (GstBaseTransformClass *) klass;
+
+  GST_DEBUG_CATEGORY_INIT (ssd_object_detector_debug, "ssdobjectdetector",
+      0, "ssdobjectdetector");
+  gobject_class->set_property = gst_ssd_object_detector_set_property;
+  gobject_class->get_property = gst_ssd_object_detector_get_property;
+  gobject_class->finalize = gst_ssd_object_detector_finalize;
+
+  /**
+   * GstSsdObjectDetector:label-file
+   *
+   * Label file
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_LABEL_FILE,
+      g_param_spec_string ("label-file",
+          "Label file", "Label file", NULL, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstSsdObjectDetector:score-threshold
+   *
+   * Threshold for deciding when to remove boxes based on score
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SCORE_THRESHOLD,
+      g_param_spec_float ("score-threshold",
+          "Score threshold",
+          "Threshold for deciding when to remove boxes based on score",
+          0.0, 1.0, GST_SSD_OBJECT_DETECTOR_DEFAULT_SCORE_THRESHOLD,
+          (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  gst_element_class_set_static_metadata (element_class, "objectdetector",
+      "Filter/Effect/Video",
+      "Apply tensor output from inference to detect objects in video frames",
+      "Aaron Boxer <aaron.boxer@collabora.com>, Marcus Edel <marcus.edel@collabora.com>");
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_ssd_object_detector_sink_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_ssd_object_detector_src_template));
+  basetransform_class->transform_ip =
+      GST_DEBUG_FUNCPTR (gst_ssd_object_detector_transform_ip);
+  basetransform_class->set_caps =
+      GST_DEBUG_FUNCPTR (gst_ssd_object_detector_set_caps);
+}
+
+static void
+gst_ssd_object_detector_init (GstSsdObjectDetector * self)
+{
+}
+
+static void
+gst_ssd_object_detector_finalize (GObject * object)
+{
+  GstSsdObjectDetector *self = GST_SSD_OBJECT_DETECTOR (object);
+
+  g_free (self->label_file);
+  g_clear_pointer (&self->labels, g_array_unref);
+
+  G_OBJECT_CLASS (gst_ssd_object_detector_parent_class)->finalize (object);
+}
+
+static GArray *
+read_labels (const char *labels_file)
+{
+  GArray *array;
+  GFile *file = g_file_new_for_path (labels_file);
+  GFileInputStream *file_stream;
+  GDataInputStream *data_stream;
+  GError *error = NULL;
+  gchar *line;
+
+  file_stream = g_file_read (file, NULL, &error);
+  g_object_unref (file);
+  if (!file_stream) {
+    GST_WARNING ("Could not open file %s: %s\n", labels_file, error->message);
+    g_clear_error (&error);
+    return NULL;
+  }
+
+  data_stream = g_data_input_stream_new (G_INPUT_STREAM (file_stream));
+  g_object_unref (file_stream);
+
+  array = g_array_new (FALSE, FALSE, sizeof (GQuark));
+
+  while ((line = g_data_input_stream_read_line (data_stream, NULL, NULL,
+              &error))) {
+    GQuark label = g_quark_from_string (line);
+    g_array_append_val (array, label);
+    g_free (line);
+  }
+
+  g_object_unref (data_stream);
+
+  if (error) {
+    GST_WARNING ("Could not open file %s: %s", labels_file, error->message);
+    g_array_free (array, TRUE);
+    g_clear_error (&error);
+    return NULL;
+  }
+
+  if (array->len == 0) {
+    g_array_free (array, TRUE);
+    return NULL;
+  }
+
+  return array;
+}
+
+static void
+gst_ssd_object_detector_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstSsdObjectDetector *self = GST_SSD_OBJECT_DETECTOR (object);
+  const gchar *filename;
+
+  switch (prop_id) {
+    case PROP_LABEL_FILE:
+    {
+      GArray *labels;
+
+      filename = g_value_get_string (value);
+      labels = read_labels (filename);
+
+      if (labels) {
+        g_free (self->label_file);
+        self->label_file = g_strdup (filename);
+        g_clear_pointer (&self->labels, g_array_unref);
+        self->labels = labels;
+      } else {
+        GST_WARNING_OBJECT (self, "Label file '%s' not found!", filename);
+      }
+    }
+      break;
+    case PROP_SCORE_THRESHOLD:
+      GST_OBJECT_LOCK (self);
+      self->score_threshold = g_value_get_float (value);
+      GST_OBJECT_UNLOCK (self);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_ssd_object_detector_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstSsdObjectDetector *self = GST_SSD_OBJECT_DETECTOR (object);
+
+  switch (prop_id) {
+    case PROP_LABEL_FILE:
+      g_value_set_string (value, self->label_file);
+      break;
+    case PROP_SCORE_THRESHOLD:
+      GST_OBJECT_LOCK (self);
+      g_value_set_float (value, self->score_threshold);
+      GST_OBJECT_UNLOCK (self);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstTensorMeta *
+gst_ssd_object_detector_get_tensor_meta (GstSsdObjectDetector * object_detector,
+    GstBuffer * buf)
+{
+  GstMeta *meta = NULL;
+  gpointer iter_state = NULL;
+
+  if (!gst_buffer_get_meta (buf, GST_TENSOR_META_API_TYPE)) {
+    GST_DEBUG_OBJECT (object_detector,
+        "missing tensor meta from buffer %" GST_PTR_FORMAT, buf);
+    return NULL;
+  }
+
+  // find object detector meta
+
+  while ((meta = gst_buffer_iterate_meta_filtered (buf, &iter_state,
+              GST_TENSOR_META_API_TYPE))) {
+    GstTensorMeta *tensor_meta = (GstTensorMeta *) meta;
+    /* SSD model must have either 3 or 4 output tensor nodes: 4 if there is a label node,
+     * and only 3 if there is no label  */
+    if (tensor_meta->num_tensors != 3 && tensor_meta->num_tensors != 4)
+      continue;
+
+    gint boxesIndex = gst_tensor_meta_get_index_from_id (tensor_meta,
+        g_quark_from_static_string (GST_MODEL_OBJECT_DETECTOR_BOXES));
+    gint scoresIndex = gst_tensor_meta_get_index_from_id (tensor_meta,
+        g_quark_from_static_string (GST_MODEL_OBJECT_DETECTOR_SCORES));
+    gint numDetectionsIndex = gst_tensor_meta_get_index_from_id (tensor_meta,
+        g_quark_from_static_string (GST_MODEL_OBJECT_DETECTOR_NUM_DETECTIONS));
+    gint clasesIndex = gst_tensor_meta_get_index_from_id (tensor_meta,
+        g_quark_from_static_string (GST_MODEL_OBJECT_DETECTOR_CLASSES));
+
+    if (boxesIndex == GST_TENSOR_MISSING_ID
+        || scoresIndex == GST_TENSOR_MISSING_ID
+        || numDetectionsIndex == GST_TENSOR_MISSING_ID)
+      continue;
+
+    if (tensor_meta->num_tensors == 4 && clasesIndex == GST_TENSOR_MISSING_ID)
+      continue;
+
+    return tensor_meta;
+  }
+
+  return NULL;
+}
+
+static gboolean
+gst_ssd_object_detector_set_caps (GstBaseTransform * trans, GstCaps * incaps,
+    GstCaps * outcaps)
+{
+  GstSsdObjectDetector *self = GST_SSD_OBJECT_DETECTOR (trans);
+
+  if (!gst_video_info_from_caps (&self->video_info, incaps)) {
+    GST_ERROR_OBJECT (self, "Failed to parse caps");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_ssd_object_detector_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
+{
+  if (!gst_base_transform_is_passthrough (trans)) {
+    if (!gst_ssd_object_detector_process (trans, buf)) {
+      GST_ELEMENT_ERROR (trans, STREAM, FAILED,
+          (NULL), ("ssd object detection failed"));
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  return GST_FLOW_OK;
+}
+
+#define DEFINE_GET_FUNC(TYPE, MAX)                                      \
+  static gboolean							\
+  get_ ## TYPE ## _at_index (GstTensor *tensor, GstMapInfo *map,        \
+      guint index, TYPE * out)                                          \
+  {									\
+    switch (tensor->data_type) {                                        \
+  case GST_TENSOR_TYPE_FLOAT32: {					\
+    float *f = (float *) map->data;                                     \
+    if (sizeof(*f) * (index + 1) > map->size)				\
+      return FALSE;							\
+    *out = findex;							\
+    break;                                                              \
+  }									\
+  case GST_TENSOR_TYPE_UINT32: {					\
+    guint32 *u = (guint32 *) map->data;                                 \
+    if (sizeof(*u) * (index + 1) > map->size)				\
+      return FALSE;							\
+    *out = uindex;							\
+    break;                                                              \
+  }									\
+  default:								\
+    GST_ERROR ("Only float32 and int32 tensors are understood");	\
+    return FALSE;							\
+  }									\
+  return TRUE;								\
+  }
+
+DEFINE_GET_FUNC (guint32, UINT32_MAX)
+    DEFINE_GET_FUNC (float, FLOAT_MAX)
+#undef DEFINE_GET_FUNC
+     static void
+         extract_bounding_boxes (GstSsdObjectDetector * self, gsize w, gsize h,
+    GstAnalyticsRelationMeta * rmeta, GstTensorMeta * tmeta)
+{
+  gint classes_index;
+  gint boxes_index;
+  gint scores_index;
+  gint numdetect_index;
+
+  GstMapInfo boxes_map = GST_MAP_INFO_INIT;
+  GstMapInfo numdetect_map = GST_MAP_INFO_INIT;
+  GstMapInfo scores_map = GST_MAP_INFO_INIT;
+  GstMapInfo classes_map = GST_MAP_INFO_INIT;
+
+  guint num_detections = 0;
+
+  classes_index = gst_tensor_meta_get_index_from_id (tmeta,
+      g_quark_from_static_string (GST_MODEL_OBJECT_DETECTOR_CLASSES));
+  numdetect_index = gst_tensor_meta_get_index_from_id (tmeta,
+      g_quark_from_static_string (GST_MODEL_OBJECT_DETECTOR_NUM_DETECTIONS));
+  scores_index = gst_tensor_meta_get_index_from_id (tmeta,
+      g_quark_from_static_string (GST_MODEL_OBJECT_DETECTOR_SCORES));
+  boxes_index = gst_tensor_meta_get_index_from_id (tmeta,
+      g_quark_from_static_string (GST_MODEL_OBJECT_DETECTOR_BOXES));
+
+  if (numdetect_index == GST_TENSOR_MISSING_ID
+      || scores_index == GST_TENSOR_MISSING_ID
+      || numdetect_index == GST_TENSOR_MISSING_ID) {
+    GST_WARNING ("Missing tensor data expected for SSD model");
+    return;
+  }
+
+  if (!gst_buffer_map (tmeta->tensornumdetect_index.data, &numdetect_map,
+          GST_MAP_READ)) {
+    GST_ERROR_OBJECT (self, "Failed to map tensor memory for index %d",
+        numdetect_index);
+    goto cleanup;
+  }
+
+  if (!gst_buffer_map (tmeta->tensorboxes_index.data, &boxes_map,
+          GST_MAP_READ)) {
+    GST_ERROR_OBJECT (self, "Failed to map tensor memory for index %d",
+        boxes_index);
+    goto cleanup;
+  }
+
+  if (!gst_buffer_map (tmeta->tensorscores_index.data, &scores_map,
+          GST_MAP_READ)) {
+    GST_ERROR_OBJECT (self, "Failed to map tensor memory for index %d",
+        scores_index);
+    goto cleanup;
+  }
+
+  if (classes_index != GST_TENSOR_MISSING_ID &&
+      !gst_buffer_map (tmeta->tensorclasses_index.data, &classes_map,
+          GST_MAP_READ)) {
+    GST_DEBUG_OBJECT (self, "Failed to map tensor memory for index %d",
+        classes_index);
+  }
+
+
+  if (!get_guint32_at_index (&tmeta->tensornumdetect_index, &numdetect_map,
+          0, &num_detections)) {
+    GST_ERROR_OBJECT (self, "Failed to get the number of detections");
+    goto cleanup;
+  }
+
+
+  GST_LOG_OBJECT (self, "Model claims %d detections", num_detections);
+
+  for (int i = 0; i < num_detections; i++) {
+    float score;
+    float x, y, bwidth, bheight;
+    gint x_i, y_i, bwidth_i, bheight_i;
+    guint32 bclass;
+    GQuark label = 0;
+    GstAnalyticsODMtd odmtd;
+
+    if (!get_float_at_index (&tmeta->tensornumdetect_index, &scores_map,
+            i, &score))
+      continue;
+
+    GST_LOG_OBJECT (self, "Detection %u score is %f", i, score);
+    if (score < self->score_threshold)
+      continue;
+
+    if (!get_float_at_index (&tmeta->tensorboxes_index, &boxes_map,
+            i * 4, &y))
+      continue;
+    if (!get_float_at_index (&tmeta->tensorboxes_index, &boxes_map,
+            i * 4 + 1, &x))
+      continue;
+    if (!get_float_at_index (&tmeta->tensorboxes_index, &boxes_map,
+            i * 4 + 2, &bheight))
+      continue;
+    if (!get_float_at_index (&tmeta->tensorboxes_index, &boxes_map,
+            i * 4 + 3, &bwidth))
+      continue;
+
+    if (self->labels && classes_map.memory &&
+        get_guint32_at_index (&tmeta->tensorclasses_index, &classes_map,
+            i, &bclass)) {
+      if (bclass < self->labels->len)
+        label = g_array_index (self->labels, GQuark, bclass);
+    }
+
+    x_i = x * w;
+    y_i = y * h;
+    bheight_i = (bheight * h) - y_i;
+    bwidth_i = (bwidth * w) - x_i;
+
+    if (gst_analytics_relation_meta_add_od_mtd (rmeta, label,
+            x_i, y_i, bwidth_i, bheight_i, score, &odmtd))
+      GST_DEBUG_OBJECT (self,
+          "Object detected with label : %s, score: %f, bound box: %dx%d at (%d,%d)",
+          g_quark_to_string (label), score, bwidth_i, bheight_i, x_i, y_i);
+    else
+      GST_WARNING_OBJECT (self, "Could not add detection to meta");
+  }
+
+cleanup:
+
+  if (numdetect_map.memory)
+    gst_buffer_unmap (tmeta->tensornumdetect_index.data, &numdetect_map);
+  if (classes_map.memory)
+    gst_buffer_unmap (tmeta->tensorclasses_index.data, &classes_map);
+  if (scores_map.memory)
+    gst_buffer_unmap (tmeta->tensorscores_index.data, &scores_map);
+  if (boxes_map.memory)
+    gst_buffer_unmap (tmeta->tensorboxes_index.data, &boxes_map);
+}
+
+
+static gboolean
+gst_ssd_object_detector_process (GstBaseTransform * trans, GstBuffer * buf)
+{
+  GstSsdObjectDetector *self = GST_SSD_OBJECT_DETECTOR (trans);
+  GstTensorMeta *tmeta;
+  GstAnalyticsRelationMeta *rmeta;
+
+  // get all tensor metas
+  tmeta = gst_ssd_object_detector_get_tensor_meta (self, buf);
+  if (!tmeta) {
+    GST_WARNING_OBJECT (trans, "missing tensor meta");
+    return TRUE;
+  } else {
+    rmeta = gst_buffer_add_analytics_relation_meta (buf);
+    g_assert (rmeta);
+  }
+
+  extract_bounding_boxes (self, self->video_info.width,
+      self->video_info.height, rmeta, tmeta);
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/ext/onnx/decoders/gstssdobjectdetector.h Added

@@ -0,0 +1,73 @@
+/*
+ * GStreamer gstreamer-ssdobjectdetector
+ * Copyright (C) 2021 Collabora Ltd
+ *
+ * gstssdobjectdetector.h
+ * 
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_SSD_OBJECT_DETECTOR_H__
+#define __GST_SSD_OBJECT_DETECTOR_H__
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/video/gstvideofilter.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_SSD_OBJECT_DETECTOR            (gst_ssd_object_detector_get_type())
+G_DECLARE_FINAL_TYPE (GstSsdObjectDetector, gst_ssd_object_detector, GST, SSD_OBJECT_DETECTOR, GstBaseTransform)
+
+#define GST_SSD_OBJECT_DETECTOR_META_NAME "ssd-object-detector"
+#define GST_SSD_OBJECT_DETECTOR_META_PARAM_NAME "extra-data"
+#define GST_SSD_OBJECT_DETECTOR_META_FIELD_LABEL "label"
+#define GST_SSD_OBJECT_DETECTOR_META_FIELD_SCORE "score"
+
+/*
+ * GstSsdObjectDetector:
+ *
+ * @label_file label file
+ * @score_threshold score threshold
+ *
+ * Since: 1.20
+ */
+struct _GstSsdObjectDetector
+{
+  GstBaseTransform basetransform;
+  gchar *label_file;
+  GArray *labels;
+  gfloat score_threshold;
+  GstVideoInfo video_info;
+};
+
+/**
+ * GstSsdObjectDetectorClass:
+ *
+ * @parent_class base transform base class
+ *
+ * Since: 1.20
+ */
+struct _GstSsdObjectDetectorClass
+{
+  GstBaseTransformClass parent_class;
+};
+
+GST_ELEMENT_REGISTER_DECLARE (ssd_object_detector)
+
+G_END_DECLS
+
+#endif /* __GST_SSD_OBJECT_DETECTOR_H__ */

gst-plugins-bad-1.24.5.tar.xz/ext/onnx/gstml.h Added

@@ -0,0 +1,41 @@
+/*
+ * GStreamer gstreamer-ml
+ * Copyright (C) 2021 Collabora Ltd
+ *
+ * gstml.h
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef __GST_ML_H__
+#define __GST_ML_H__
+
+
+/**
+ * GstMlInputImageFormat:
+ *
+ * @GST_ML_INPUT_IMAGE_FORMAT_HWC Height Width Channel (a.k.a. interleaved) format
+ * @GST_ML_INPUT_IMAGE_FORMAT_CHW Channel Height Width  (a.k.a. planar) format
+ *
+ * Since: 1.20
+ */
+typedef enum {
+  GST_ML_INPUT_IMAGE_FORMAT_HWC,
+  GST_ML_INPUT_IMAGE_FORMAT_CHW,
+} GstMlInputImageFormat;
+
+
+
+#endif

gst-plugins-bad-1.22.7.tar.xz/ext/onnx/gstonnx.c -> gst-plugins-bad-1.24.5.tar.xz/ext/onnx/gstonnx.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/onnx/gstonnxclient.cpp -> gst-plugins-bad-1.24.5.tar.xz/ext/onnx/gstonnxclient.cpp Changed

@@ -1,6 +1,6 @@
 /*
  * GStreamer gstreamer-onnxclient
- * Copyright (C) 2021 Collabora Ltd
+ * Copyright (C) 2021-2023 Collabora Ltd
  *
  * gstonnxclient.cpp
  *
@@ -21,23 +21,16 @@
  */
 
 #include "gstonnxclient.h"
-#include <providers/cpu/cpu_provider_factory.h>
-#ifdef GST_ML_ONNX_RUNTIME_HAVE_CUDA
-#include <providers/cuda/cuda_provider_factory.h>
-#endif
-#include <exception>
-#include <fstream>
-#include <iostream>
-#include <limits>
-#include <numeric>
-#include <cmath>
+#include <cpu_provider_factory.h>
 #include <sstream>
 
+#define GST_CAT_DEFAULT onnx_inference_debug
+
 namespace GstOnnxNamespace
 {
-template < typename T >
-    std::ostream & operator<< (std::ostream & os, const std::vector < T > &v)
-{
+  template < typename T >
+      std::ostream & operator<< (std::ostream & os, const std::vector < T > &v)
+  {
     os << "";
     for (size_t i = 0; i < v.size (); ++i)
     {
@@ -50,137 +43,131 @@
     os << "";
 
     return os;
-}
-
-GstMlOutputNodeInfo::GstMlOutputNodeInfo (void):index
-  (GST_ML_NODE_INDEX_DISABLED),
-  type (ONNXTensorElementDataType::ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT)
-{
-}
+  }
 
-GstOnnxClient::GstOnnxClient ():session (nullptr),
+GstOnnxClient::GstOnnxClient (GstElement *debug_parent):debug_parent(debug_parent),
+      session (nullptr),
       width (0),
       height (0),
       channels (0),
       dest (nullptr),
       m_provider (GST_ONNX_EXECUTION_PROVIDER_CPU),
-      inputImageFormat (GST_ML_MODEL_INPUT_IMAGE_FORMAT_HWC),
-      fixedInputImageSize (true)
-{
-    for (size_t i = 0; i < GST_ML_OUTPUT_NODE_NUMBER_OF; ++i)
-      outputNodeIndexToFunctioni = (GstMlOutputNodeFunction) i;
-}
+      inputImageFormat (GST_ML_INPUT_IMAGE_FORMAT_HWC),
+      inputDatatype (GST_TENSOR_TYPE_UINT8),
+      inputDatatypeSize (sizeof (uint8_t)),
+      fixedInputImageSize (false),
+      inputTensorOffset (0.0),
+      inputTensorScale (1.0)
+       {
+  }
 
-GstOnnxClient::~GstOnnxClient ()
-{
-    outputNames.clear();
+  GstOnnxClient::~GstOnnxClient () {
     delete session;
     deletedest;
-}
-
-Ort::Env & GstOnnxClient::getEnv (void)
-{
-    static Ort::Env env (OrtLoggingLevel::ORT_LOGGING_LEVEL_WARNING,
-        "GstOnnxNamespace");
-
-    return env;
-}
+  }
 
-int32_t GstOnnxClient::getWidth (void)
-{
+  int32_t GstOnnxClient::getWidth (void)
+  {
     return width;
-}
+  }
 
-int32_t GstOnnxClient::getHeight (void)
-{
+  int32_t GstOnnxClient::getHeight (void)
+  {
     return height;
-}
+  }
 
-bool GstOnnxClient::isFixedInputImageSize (void)
-{
+  int32_t GstOnnxClient::getChannels (void)
+  {
+    return channels;
+  }
+
+  bool GstOnnxClient::isFixedInputImageSize (void)
+  {
     return fixedInputImageSize;
-}
+  }
 
-std::string GstOnnxClient::getOutputNodeName (GstMlOutputNodeFunction nodeType)
-{
-    switch (nodeType) {
-      case GST_ML_OUTPUT_NODE_FUNCTION_DETECTION:
-        return "detection";
+  void GstOnnxClient::setInputImageFormat (GstMlInputImageFormat format)
+  {
+    inputImageFormat = format;
+  }
+
+  GstMlInputImageFormat GstOnnxClient::getInputImageFormat (void)
+  {
+    return inputImageFormat;
+  }
+
+  void GstOnnxClient::setInputImageDatatype(GstTensorDataType datatype)
+  {
+    inputDatatype = datatype;
+    switch (inputDatatype) {
+      case GST_TENSOR_TYPE_UINT8:
+        inputDatatypeSize = sizeof (uint8_t);
+        break;
+      case GST_TENSOR_TYPE_UINT16:
+        inputDatatypeSize = sizeof (uint16_t);
         break;
-      case GST_ML_OUTPUT_NODE_FUNCTION_BOUNDING_BOX:
-        return "bounding box";
+      case GST_TENSOR_TYPE_UINT32:
+        inputDatatypeSize = sizeof (uint32_t);
         break;
-      case GST_ML_OUTPUT_NODE_FUNCTION_SCORE:
-        return "score";
+      case GST_TENSOR_TYPE_INT32:
+        inputDatatypeSize = sizeof (int32_t);
         break;
-      case GST_ML_OUTPUT_NODE_FUNCTION_CLASS:
-        return "label";
+      case GST_TENSOR_TYPE_FLOAT16:
+        inputDatatypeSize = 2;
         break;
-      case GST_ML_OUTPUT_NODE_NUMBER_OF:
-        g_assert_not_reached();
-        GST_WARNING("Invalid parameter");
+      case GST_TENSOR_TYPE_FLOAT32:
+        inputDatatypeSize = sizeof (float);
         break;
+    default:
+        g_error ("Data type %d not handled", inputDatatype);
+	break;
     };
+  }
 
-    return "";
-}
-
-void GstOnnxClient::setInputImageFormat (GstMlModelInputImageFormat format)
-{
-    inputImageFormat = format;
-}
-
-GstMlModelInputImageFormat GstOnnxClient::getInputImageFormat (void)
-{
-    return inputImageFormat;
-}
+  void GstOnnxClient::setInputImageOffset (float offset)
+  {
+    inputTensorOffset = offset;
+  }
 
-std::vector< const char *> GstOnnxClient::getOutputNodeNames (void)
-{
-    if (!outputNames.empty() && outputNamesRaw.size() != outputNames.size()) {
-        outputNamesRaw.resize(outputNames.size());
-        for (size_t i = 0; i < outputNamesRaw.size(); i++) {
-          outputNamesRawi = outputNamesi.get();
-        }
-    }
+  float GstOnnxClient::getInputImageOffset ()
+  {
+    return inputTensorOffset;
+  }
 
-    return outputNamesRaw;
-}
+  void GstOnnxClient::setInputImageScale (float scale)
+  {
+    inputTensorScale = scale;
+  }
 
-void GstOnnxClient::setOutputNodeIndex (GstMlOutputNodeFunction node,
-      gint index)
-{
-    g_assert (index < GST_ML_OUTPUT_NODE_NUMBER_OF);
-    outputNodeInfonode.index = index;
-    if (index != GST_ML_NODE_INDEX_DISABLED)
-      outputNodeIndexToFunctionindex = node;
-}
+  float GstOnnxClient::getInputImageScale ()
+  {
+    return inputTensorScale;
+  }
 
-gint GstOnnxClient::getOutputNodeIndex (GstMlOutputNodeFunction node)
-{
-    return outputNodeInfonode.index;
-}
+  GstTensorDataType GstOnnxClient::getInputImageDatatype(void)
+  {
+    return inputDatatype;
+  }
 
-void GstOnnxClient::setOutputNodeType (GstMlOutputNodeFunction node,
-      ONNXTensorElementDataType type)
-{
-    outputNodeInfonode.type = type;
-}
+  std::vector < const char *>GstOnnxClient::genOutputNamesRaw (void)
+  {
+    if (!outputNames.empty () && outputNamesRaw.size () != outputNames.size ()) {
+      outputNamesRaw.resize (outputNames.size ());
+      for (size_t i = 0; i < outputNamesRaw.size (); i++)
+        outputNamesRawi = outputNamesi.get ();
+    }
 
-ONNXTensorElementDataType
-      GstOnnxClient::getOutputNodeType (GstMlOutputNodeFunction node)
-{
-    return outputNodeInfonode.type;
-}
+    return outputNamesRaw;
+  }
 
-bool GstOnnxClient::hasSession (void)
-{
+  bool GstOnnxClient::hasSession (void)
+  {
     return session != nullptr;
-}
+  }
 
-bool GstOnnxClient::createSession (std::string modelFile,
+  bool GstOnnxClient::createSession (std::string modelFile,
       GstOnnxOptimizationLevel optim, GstOnnxExecutionProvider provider)
-{
+  {
     if (session)
       return true;
 
@@ -203,93 +190,211 @@
         break;
     };
 
-    Ort::SessionOptions sessionOptions;
-    // for debugging
-    //sessionOptions.SetIntraOpNumThreads (1);
-    sessionOptions.SetGraphOptimizationLevel (onnx_optim);
-    m_provider = provider;
-    switch (m_provider) {
-      case GST_ONNX_EXECUTION_PROVIDER_CUDA:
-#ifdef GST_ML_ONNX_RUNTIME_HAVE_CUDA
-        Ort::ThrowOnError (OrtSessionOptionsAppendExecutionProvider_CUDA
-            (sessionOptions, 0));
-#else
-        return false;
-#endif
-        break;
-      default:
-        break;
+    try {
+      Ort::SessionOptions sessionOptions;
+      const auto & api = Ort::GetApi ();
+      // for debugging
+      //sessionOptions.SetIntraOpNumThreads (1);
+      sessionOptions.SetGraphOptimizationLevel (onnx_optim);
+      m_provider = provider;
+      switch (m_provider) {
+        case GST_ONNX_EXECUTION_PROVIDER_CUDA:
+        try {
+          OrtCUDAProviderOptionsV2 *cuda_options = nullptr;
+          Ort::ThrowOnError (api.CreateCUDAProviderOptions (&cuda_options));
+          std::unique_ptr < OrtCUDAProviderOptionsV2,
+              decltype (api.ReleaseCUDAProviderOptions) >
+              rel_cuda_options (cuda_options, api.ReleaseCUDAProviderOptions);
+          Ort::ThrowOnError (api.SessionOptionsAppendExecutionProvider_CUDA_V2
+              (static_cast < OrtSessionOptions * >(sessionOptions),
+                  rel_cuda_options.get ()));
+        }
+          catch (Ort::Exception & ortex) {
+            GST_WARNING
+                ("Failed to create CUDA provider - dropping back to CPU");
+            Ort::ThrowOnError (OrtSessionOptionsAppendExecutionProvider_CPU
+                (sessionOptions, 1));
+          }
+          break;
+        default:
+          Ort::ThrowOnError (OrtSessionOptionsAppendExecutionProvider_CPU
+              (sessionOptions, 1));
+          break;
+      };
+      env =
+          Ort::Env (OrtLoggingLevel::ORT_LOGGING_LEVEL_WARNING,
+          "GstOnnxNamespace");
+      session = new Ort::Session (env, modelFile.c_str (), sessionOptions);
+      auto inputTypeInfo = session->GetInputTypeInfo (0);
+      std::vector < int64_t > inputDims =
+          inputTypeInfo.GetTensorTypeAndShapeInfo ().GetShape ();
+      if (inputImageFormat == GST_ML_INPUT_IMAGE_FORMAT_HWC) {
+        height = inputDims1;
+        width = inputDims2;
+        channels = inputDims3;
+      } else {
+        channels = inputDims1;
+        height = inputDims2;
+        width = inputDims3;
+      }
 
-    };
-    session = new Ort::Session (getEnv (), modelFile.c_str (), sessionOptions);
-    auto inputTypeInfo = session->GetInputTypeInfo (0);
-    std::vector < int64_t > inputDims =
-        inputTypeInfo.GetTensorTypeAndShapeInfo ().GetShape ();
-    if (inputImageFormat == GST_ML_MODEL_INPUT_IMAGE_FORMAT_HWC) {
-      height = inputDims1;
-      width = inputDims2;
-      channels = inputDims3;
-    } else {
-      channels = inputDims1;
-      height = inputDims2;
-      width = inputDims3;
-    }
+      fixedInputImageSize = width > 0 && height > 0;
+      GST_DEBUG_OBJECT (debug_parent, "Number of Output Nodes: %d",
+          (gint) session->GetOutputCount ());
+
+      ONNXTensorElementDataType elementType =
+          inputTypeInfo.GetTensorTypeAndShapeInfo ().GetElementType ();
+
+      switch (elementType) {
+        case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT8:
+          setInputImageDatatype(GST_TENSOR_TYPE_UINT8);
+          break;
+        case ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT:
+          setInputImageDatatype(GST_TENSOR_TYPE_FLOAT32);
+          break;
+        default:
+          GST_ERROR_OBJECT (debug_parent,
+            "Only input tensors of type int8 and floatare supported");
+          return false;
+        }
 
-    fixedInputImageSize = width > 0 && height > 0;
-    GST_DEBUG ("Number of Output Nodes: %d", (gint) session->GetOutputCount ());
+      Ort::AllocatorWithDefaultOptions allocator;
+      auto input_name = session->GetInputNameAllocated (0, allocator);
+      GST_DEBUG_OBJECT (debug_parent, "Input name: %s", input_name.get ());
 
-    Ort::AllocatorWithDefaultOptions allocator;
-    auto input_name = session->GetInputNameAllocated (0, allocator);
-    GST_DEBUG ("Input name: %s", input_name.get());
-
-    for (size_t i = 0; i < session->GetOutputCount (); ++i) {
-      auto output_name = session->GetOutputNameAllocated (i, allocator);
-      GST_DEBUG("Output name %lu:%s", i, output_name.get());
-      outputNames.push_back (std::move(output_name));
-      auto type_info = session->GetOutputTypeInfo (i);
-      auto tensor_info = type_info.GetTensorTypeAndShapeInfo ();
-
-      if (i < GST_ML_OUTPUT_NODE_NUMBER_OF) {
-        auto function = outputNodeIndexToFunctioni;
-        outputNodeInfofunction.type = tensor_info.GetElementType ();
+      for (size_t i = 0; i < session->GetOutputCount (); ++i) {
+        auto output_name = session->GetOutputNameAllocated (i, allocator);
+        GST_DEBUG_OBJECT (debug_parent, "Output name %lu:%s", i, output_name.get ());
+        outputNames.push_back (std::move (output_name));
       }
+      genOutputNamesRaw ();
+
+      // look up tensor ids
+      auto metaData = session->GetModelMetadata ();
+      OrtAllocator *ortAllocator;
+      auto status =
+          Ort::GetApi ().GetAllocatorWithDefaultOptions (&ortAllocator);
+      if (status) {
+        // Handle the error case
+        const char *errorString = Ort::GetApi ().GetErrorMessage (status);
+        GST_WARNING_OBJECT (debug_parent, "Failed to get allocator: %s", errorString);
+
+        // Clean up the error status
+        Ort::GetApi ().ReleaseStatus (status);
+
+        return false;
+      }
+      for (auto & name:outputNamesRaw) {
+          Ort::AllocatedStringPtr res =
+              metaData.LookupCustomMetadataMapAllocated (name, ortAllocator);
+          if (res)
+            {
+              GQuark quark = g_quark_from_string (res.get ());
+              outputIds.push_back (quark);
+            } else {
+          GST_ERROR_OBJECT (debug_parent, "Failed to look up id for key %s", name);
+
+          return false;
+        }
+      }
+    }
+    catch (Ort::Exception & ortex) {
+      GST_ERROR_OBJECT (debug_parent, "%s", ortex.what ());
+      return false;
     }
 
     return true;
-}
+  }
 
-std::vector < GstMlBoundingBox > GstOnnxClient::run (uint8_t * img_data,
-      GstVideoMeta * vmeta, std::string labelPath, float scoreThreshold)
-{
-    auto type = getOutputNodeType (GST_ML_OUTPUT_NODE_FUNCTION_CLASS);
-    return (type ==
-        ONNXTensorElementDataType::ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT) ?
-          doRun < float >(img_data, vmeta, labelPath, scoreThreshold)
-            : doRun < int >(img_data, vmeta, labelPath, scoreThreshold);
-}
+  void GstOnnxClient::parseDimensions (GstVideoInfo vinfo)
+  {
+    int32_t newWidth = fixedInputImageSize ? width : vinfo.width;
+    int32_t newHeight = fixedInputImageSize ? height : vinfo.height;
 
-void GstOnnxClient::parseDimensions (GstVideoMeta * vmeta)
-{
-    int32_t newWidth = fixedInputImageSize ? width : vmeta->width;
-    int32_t newHeight = fixedInputImageSize ? height : vmeta->height;
+    if (!fixedInputImageSize) {
+      GST_WARNING_OBJECT (debug_parent, "Allocating before knowing model input size");
+    }
 
     if (!dest || width * height < newWidth * newHeight) {
-      delete dest;
-      dest = new uint8_tnewWidth * newHeight * channels;
+      deletedest;
+      dest = new uint8_tnewWidth * newHeight * channels * inputDatatypeSize;
     }
     width = newWidth;
     height = newHeight;
-}
+  }
 
-template < typename T > std::vector < GstMlBoundingBox >
-      GstOnnxClient::doRun (uint8_t * img_data, GstVideoMeta * vmeta,
-      std::string labelPath, float scoreThreshold)
-{
-    std::vector < GstMlBoundingBox > boundingBoxes;
-    if (!img_data)
-      return boundingBoxes;
+// copy tensor data to a GstTensorMeta
+  GstTensorMeta *GstOnnxClient::copy_tensors_to_meta (std::vector < Ort::Value >
+      &outputs, GstBuffer * buffer)
+  {
+    size_t num_tensors = outputNamesRaw.size ();
+    GstTensorMeta *tmeta = (GstTensorMeta *) gst_buffer_add_meta (buffer,
+        gst_tensor_meta_get_info (),
+        NULL);
+    tmeta->num_tensors = num_tensors;
+    tmeta->tensor = (GstTensor *) g_malloc (num_tensors * sizeof (GstTensor));
+    bool hasIds = outputIds.size () == num_tensors;
+    for (size_t i = 0; i < num_tensors; i++) {
+      Ort::Value outputTensor = std::move (outputsi);
+
+      ONNXTensorElementDataType tensorType =
+          outputTensor.GetTensorTypeAndShapeInfo ().GetElementType ();
+
+      GstTensor *tensor = &tmeta->tensori;
+      if (hasIds)
+        tensor->id = outputIdsi;
+      else
+	tensor->id = 0;
+      auto tensorShape = outputTensor.GetTensorTypeAndShapeInfo ().GetShape ();
+      tensor->num_dims = tensorShape.size ();
+      tensor->dims = g_new (int64_t, tensor->num_dims);
+
+      for (size_t j = 0; j < tensorShape.size (); ++j)
+        tensor->dimsj = tensorShapej;
+
+      size_t numElements =
+          outputTensor.GetTensorTypeAndShapeInfo ().GetElementCount ();
+
+      if (tensorType == ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT) {
+	size_t buffer_size = 0;
+
+        buffer_size = numElements * sizeof (float);
+	tensor->data = gst_buffer_new_allocate (NULL, buffer_size, NULL);
+	gst_buffer_fill (tensor->data, 0, outputTensor.GetTensorData < float >(),
+            buffer_size);
+        tensor->data_type = GST_TENSOR_TYPE_FLOAT32;
+      } else if (tensorType == ONNX_TENSOR_ELEMENT_DATA_TYPE_INT32) {
+	size_t buffer_size = 0;
+
+        buffer_size = numElements * sizeof (int);
+	tensor->data = gst_buffer_new_allocate (NULL, buffer_size, NULL);
+	gst_buffer_fill (tensor->data, 0, outputTensor.GetTensorData < float >(),
+            buffer_size);
+        tensor->data_type = GST_TENSOR_TYPE_INT32;
+      } else {
+	GST_ERROR_OBJECT (debug_parent, "Output tensor is not FLOAT32 or INT32, not supported");
+	gst_buffer_remove_meta (buffer, (GstMeta*) tmeta);
+	return NULL;
+      }
+    }
+
+    return tmeta;
+
+  }
 
-    parseDimensions (vmeta);
+  std::vector < Ort::Value > GstOnnxClient::run (uint8_t * img_data,
+      GstVideoInfo vinfo) {
+    std::vector < Ort::Value > modelOutput;
+    doRun (img_data, vinfo, modelOutput);
+
+    return modelOutput;
+  }
+
+  bool GstOnnxClient::doRun (uint8_t * img_data, GstVideoInfo vinfo,
+      std::vector < Ort::Value > &modelOutput)
+  {
+    if (!img_data)
+      return false;
 
     Ort::AllocatorWithDefaultOptions allocator;
     auto inputName = session->GetInputNameAllocated (0, allocator);
@@ -297,7 +402,7 @@
     std::vector < int64_t > inputDims =
         inputTypeInfo.GetTensorTypeAndShapeInfo ().GetShape ();
     inputDims0 = 1;
-    if (inputImageFormat == GST_ML_MODEL_INPUT_IMAGE_FORMAT_HWC) {
+    if (inputImageFormat == GST_ML_INPUT_IMAGE_FORMAT_HWC) {
       inputDims1 = height;
       inputDims2 = width;
     } else {
@@ -307,12 +412,12 @@
 
     std::ostringstream buffer;
     buffer << inputDims;
-    GST_DEBUG ("Input dimensions: %s", buffer.str ().c_str ());
+    GST_DEBUG_OBJECT (debug_parent, "Input dimensions: %s", buffer.str ().c_str ());
 
     // copy video frame
     uint8_t *srcPtr3 = { img_data, img_data + 1, img_data + 2 };
     uint32_t srcSamplesPerPixel = 3;
-    switch (vmeta->format) {
+    switch (vinfo.finfo->format) {
       case GST_VIDEO_FORMAT_RGBA:
         srcSamplesPerPixel = 4;
         break;
@@ -342,13 +447,66 @@
       default:
         break;
     }
+    uint32_t stride = vinfo.stride0;
+    const size_t inputTensorSize = width * height * channels * inputDatatypeSize;
+    auto memoryInfo =
+        Ort::MemoryInfo::CreateCpu (OrtAllocatorType::OrtArenaAllocator,
+        OrtMemType::OrtMemTypeDefault);
+
+    std::vector < Ort::Value > inputTensors;
+
+    switch (inputDatatype) {
+      case GST_TENSOR_TYPE_UINT8:
+        uint8_t *src_data;
+        if (inputTensorOffset == 00 && inputTensorScale == 1.0) {
+          src_data = img_data;
+        } else {
+          convert_image_remove_alpha (
+            dest, inputImageFormat, srcPtr, srcSamplesPerPixel, stride,
+            (uint8_t)inputTensorOffset, (uint8_t)inputTensorScale);
+          src_data = dest;
+        }
+
+        inputTensors.push_back (Ort::Value::CreateTensor < uint8_t > (
+              memoryInfo, src_data, inputTensorSize, inputDims.data (),
+              inputDims.size ()));
+        break;
+      case GST_TENSOR_TYPE_FLOAT32: {
+        convert_image_remove_alpha ((float*)dest, inputImageFormat , srcPtr,
+        srcSamplesPerPixel, stride, (float)inputTensorOffset, (float)
+        inputTensorScale);
+        inputTensors.push_back (Ort::Value::CreateTensor < float > (
+              memoryInfo, (float*)dest, inputTensorSize, inputDims.data (),
+              inputDims.size ()));
+        }
+        break;
+      default:
+        break;
+    }
+
+    std::vector < const char *>inputNames { inputName.get () };
+    modelOutput = session->Run (Ort::RunOptions {nullptr},
+        inputNames.data (),
+        inputTensors.data (), 1, outputNamesRaw.data (),
+        outputNamesRaw.size ());
+
+    return true;
+  }
+
+  template < typename T>
+  void GstOnnxClient::convert_image_remove_alpha (T *dst,
+      GstMlInputImageFormat hwc, uint8_t **srcPtr, uint32_t srcSamplesPerPixel,
+      uint32_t stride, T offset, T div) {
     size_t destIndex = 0;
-    uint32_t stride = vmeta->stride0;
-    if (inputImageFormat == GST_ML_MODEL_INPUT_IMAGE_FORMAT_HWC) {
+    T tmp;
+
+    if (inputImageFormat == GST_ML_INPUT_IMAGE_FORMAT_HWC) {
       for (int32_t j = 0; j < height; ++j) {
         for (int32_t i = 0; i < width; ++i) {
           for (int32_t k = 0; k < channels; ++k) {
-            destdestIndex++ = *srcPtrk;
+            tmp = *srcPtrk;
+            tmp += offset;
+            dstdestIndex++ = (T)(tmp / div);
             srcPtrk += srcSamplesPerPixel;
           }
         }
@@ -358,11 +516,13 @@
       }
     } else {
       size_t frameSize = width * height;
-      uint8_t *destPtr3 = { dest, dest + frameSize, dest + 2 * frameSize };
+      T *destPtr3 = { dst, dst + frameSize, dst + 2 * frameSize };
       for (int32_t j = 0; j < height; ++j) {
         for (int32_t i = 0; i < width; ++i) {
           for (int32_t k = 0; k < channels; ++k) {
-            destPtrkdestIndex = *srcPtrk;
+            tmp = *srcPtrk;
+            tmp += offset;
+            destPtrkdestIndex = (T)(tmp / div);
             srcPtrk += srcSamplesPerPixel;
           }
           destIndex++;
@@ -372,66 +532,5 @@
           srcPtrk += stride - srcSamplesPerPixel * width;
       }
     }
-
-    const size_t inputTensorSize = width * height * channels;
-    auto memoryInfo =
-        Ort::MemoryInfo::CreateCpu (OrtAllocatorType::OrtArenaAllocator,
-        OrtMemType::OrtMemTypeDefault);
-    std::vector < Ort::Value > inputTensors;
-    inputTensors.push_back (Ort::Value::CreateTensor < uint8_t > (memoryInfo,
-            dest, inputTensorSize, inputDims.data (), inputDims.size ()));
-    std::vector < const char *>inputNames { inputName.get () };
-
-    std::vector < Ort::Value > modelOutput = session->Run (Ort::RunOptions { nullptr},
-        inputNames.data (),
-        inputTensors.data (), 1, outputNamesRaw.data (), outputNamesRaw.size ());
-
-    auto numDetections =
-        modelOutputgetOutputNodeIndex
-        (GST_ML_OUTPUT_NODE_FUNCTION_DETECTION).GetTensorMutableData < float >();
-    auto bboxes =
-        modelOutputgetOutputNodeIndex
-        (GST_ML_OUTPUT_NODE_FUNCTION_BOUNDING_BOX).GetTensorMutableData < float >();
-    auto scores =
-        modelOutputgetOutputNodeIndex
-        (GST_ML_OUTPUT_NODE_FUNCTION_SCORE).GetTensorMutableData < float >();
-    T *labelIndex = nullptr;
-    if (getOutputNodeIndex (GST_ML_OUTPUT_NODE_FUNCTION_CLASS) !=
-        GST_ML_NODE_INDEX_DISABLED) {
-      labelIndex =
-          modelOutputgetOutputNodeIndex
-          (GST_ML_OUTPUT_NODE_FUNCTION_CLASS).GetTensorMutableData < T > ();
-    }
-    if (labels.empty () && !labelPath.empty ())
-      labels = ReadLabels (labelPath);
-
-    for (int i = 0; i < numDetections0; ++i) {
-      if (scoresi > scoreThreshold) {
-        std::string label = "";
-
-        if (labelIndex && !labels.empty ())
-          label = labelslabelIndexi - 1;
-        auto score = scoresi;
-        auto y0 = bboxesi * 4 * height;
-        auto x0 = bboxesi * 4 + 1 * width;
-        auto bheight = bboxesi * 4 + 2 * height - y0;
-        auto bwidth = bboxesi * 4 + 3 * width - x0;
-        boundingBoxes.push_back (GstMlBoundingBox (label, score, x0, y0, bwidth,
-                bheight));
-      }
-    }
-    return boundingBoxes;
-}
-
-std::vector < std::string >
-    GstOnnxClient::ReadLabels (const std::string & labelsFile)
-{
-    std::vector < std::string > labels;
-    std::string line;
-    std::ifstream fp (labelsFile);
-    while (std::getline (fp, line))
-      labels.push_back (line);
-
-    return labels;
   }
 }

gst-plugins-bad-1.22.7.tar.xz/ext/onnx/gstonnxclient.h -> gst-plugins-bad-1.24.5.tar.xz/ext/onnx/gstonnxclient.h Changed

@@ -25,77 +25,60 @@
 #include <gst/gst.h>
 #include <onnxruntime_cxx_api.h>
 #include <gst/video/video.h>
-#include "gstonnxelement.h"
-#include <string>
-#include <vector>
+#include "gstml.h"
+#include "tensor/gsttensormeta.h"
 
-namespace GstOnnxNamespace {
-  enum GstMlOutputNodeFunction {
-    GST_ML_OUTPUT_NODE_FUNCTION_DETECTION,
-    GST_ML_OUTPUT_NODE_FUNCTION_BOUNDING_BOX,
-    GST_ML_OUTPUT_NODE_FUNCTION_SCORE,
-    GST_ML_OUTPUT_NODE_FUNCTION_CLASS,
-    GST_ML_OUTPUT_NODE_NUMBER_OF,
-  };
+GST_DEBUG_CATEGORY_EXTERN (onnx_inference_debug);
 
-  const gint GST_ML_NODE_INDEX_DISABLED = -1;
+typedef enum
+{
+  GST_ONNX_OPTIMIZATION_LEVEL_DISABLE_ALL,
+  GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_BASIC,
+  GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_EXTENDED,
+  GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_ALL,
+} GstOnnxOptimizationLevel;
 
-  struct GstMlOutputNodeInfo {
-    GstMlOutputNodeInfo(void);
-	gint index;
-    ONNXTensorElementDataType type;
-  };
+typedef enum
+{
+  GST_ONNX_EXECUTION_PROVIDER_CPU,
+  GST_ONNX_EXECUTION_PROVIDER_CUDA,
+} GstOnnxExecutionProvider;
 
-  struct GstMlBoundingBox {
-    GstMlBoundingBox(std::string lbl,
-                     float score,
-                     float _x0,
-                     float _y0,
-                     float _width,
-                     float _height):label(lbl),
-      score(score), x0(_x0), y0(_y0), width(_width), height(_height) {
-    }
-    GstMlBoundingBox():GstMlBoundingBox("", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f) {
-    }
-    std::string label;
-    float score;
-    float x0;
-    float y0;
-    float width;
-    float height;
-  };
+
+namespace GstOnnxNamespace {
 
   class GstOnnxClient {
   public:
-    GstOnnxClient(void);
+    GstOnnxClient(GstElement *debug_parent);
     ~GstOnnxClient(void);
     bool createSession(std::string modelFile, GstOnnxOptimizationLevel optim,
                        GstOnnxExecutionProvider provider);
     bool hasSession(void);
-    void setInputImageFormat(GstMlModelInputImageFormat format);
-    GstMlModelInputImageFormat getInputImageFormat(void);
-    void setOutputNodeIndex(GstMlOutputNodeFunction nodeType, gint index);
-    gint getOutputNodeIndex(GstMlOutputNodeFunction nodeType);
-    void setOutputNodeType(GstMlOutputNodeFunction nodeType,
-                           ONNXTensorElementDataType type);
-    ONNXTensorElementDataType getOutputNodeType(GstMlOutputNodeFunction type);
-    std::string getOutputNodeName(GstMlOutputNodeFunction nodeType);
-    std::vector < GstMlBoundingBox > run(uint8_t * img_data,
-                                          GstVideoMeta * vmeta,
-                                          std::string labelPath,
-                                          float scoreThreshold);
-    std::vector < GstMlBoundingBox > &getBoundingBoxes(void);
-    std::vector < const char *>getOutputNodeNames(void);
+    void setInputImageFormat(GstMlInputImageFormat format);
+    GstMlInputImageFormat getInputImageFormat(void);
+    GstTensorDataType getInputImageDatatype(void);
+    void setInputImageOffset (float offset);
+    float getInputImageOffset ();
+    void setInputImageScale (float offset);
+    float getInputImageScale ();
+    std::vector < Ort::Value > run (uint8_t * img_data, GstVideoInfo vinfo);
+    std::vector < const char *> genOutputNamesRaw(void);
     bool isFixedInputImageSize(void);
     int32_t getWidth(void);
     int32_t getHeight(void);
+    int32_t getChannels (void);
+    GstTensorMeta *copy_tensors_to_meta (std::vector<Ort::Value> &outputs,
+                                         GstBuffer *buffer);
+    void parseDimensions(GstVideoInfo vinfo);
   private:
-    void parseDimensions(GstVideoMeta * vmeta);
-    template < typename T > std::vector < GstMlBoundingBox >
-    doRun(uint8_t * img_data, GstVideoMeta * vmeta, std::string labelPath,
-            float scoreThreshold);
-    std::vector < std::string > ReadLabels(const std::string & labelsFile);
-    Ort::Env & getEnv(void);
+
+    GstElement *debug_parent;
+    void setInputImageDatatype (GstTensorDataType datatype);
+    template < typename T>
+    void convert_image_remove_alpha (T *dest, GstMlInputImageFormat hwc,
+        uint8_t **srcPtr, uint32_t srcSamplesPerPixel, uint32_t stride, T offset, T div);
+    bool doRun(uint8_t * img_data, GstVideoInfo vinfo, std::vector < Ort::Value > &modelOutput);
+    Ort::Env env;
     Ort::Session * session;
     int32_t width;
     int32_t height;
@@ -104,14 +87,15 @@
     GstOnnxExecutionProvider m_provider;
     std::vector < Ort::Value > modelOutput;
     std::vector < std::string > labels;
-    // !! indexed by function
-    GstMlOutputNodeInfo outputNodeInfoGST_ML_OUTPUT_NODE_NUMBER_OF;
-    // !! indexed by array index
-	size_t outputNodeIndexToFunctionGST_ML_OUTPUT_NODE_NUMBER_OF;
     std::vector < const char *> outputNamesRaw;
     std::vector < Ort::AllocatedStringPtr > outputNames;
-    GstMlModelInputImageFormat inputImageFormat;
+    std::vector < GQuark > outputIds;
+    GstMlInputImageFormat inputImageFormat;
+    GstTensorDataType inputDatatype;
+    size_t inputDatatypeSize;
     bool fixedInputImageSize;
+    float inputTensorOffset;
+    float inputTensorScale;
   };
 }

gst-plugins-bad-1.24.5.tar.xz/ext/onnx/gstonnxinference.cpp Added

@@ -0,0 +1,602 @@
+/*
+ * GStreamer gstreamer-onnxinference
+ * Copyright (C) 2023 Collabora Ltd.
+ *
+ * gstonnxinference.cpp
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-onnxinference
+ * @short_description: Run ONNX inference model on video buffers
+ *
+ * This element can apply an ONNX model to video buffers. It attaches
+ * the tensor output to the buffer as a @ref GstTensorMeta.
+ *
+ * To install ONNX on your system, follow the instructions in the
+ * README.md in with this plugin.
+ *
+ * ## Example launch command:
+ *
+ * Test image file, model file (SSD) and label file can be found here :
+ * https://gitlab.collabora.com/gstreamer/onnx-models
+ *
+ * GST_DEBUG=ssdobjectdetector:5 \
+ * gst-launch-1.0 filesrc location=onnx-models/images/bus.jpg ! \
+ * jpegdec ! videoconvert ! onnxinference execution-provider=cpu model-file=onnx-models/models/ssd_mobilenet_v1_coco.onnx !  \
+ * ssdobjectdetector label-file=onnx-models/labels/COCO_classes.txt  ! videoconvert ! imagefreeze ! autovideosink
+ *
+ *
+ * Note: in order for downstream tensor decoders to correctly parse the tensor
+ * data in the GstTensorMeta, meta data must be attached to the ONNX model
+ * assigning a unique string id to each output layer. These unique string ids
+ * and corresponding GQuark ids are currently stored in the tensor decoder's
+ * header file, in this case gstssdobjectdetector.h. If the meta data is absent,
+ * the pipeline will fail.
+ *
+ * As a convenience, there is a python script
+ * currently stored at
+ * https://gitlab.collabora.com/gstreamer/onnx-models/-/blob/master/scripts/modify_onnx_metadata.py
+ * to enable users to easily add and remove meta data from json files. It can also dump
+ * the names of all output layers, which can then be used to craft the json meta data file.
+ *
+ *
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include "gstonnxinference.h"
+#include "gstonnxclient.h"
+
+
+/*
+ * GstOnnxInference:
+ *
+ * @model_file model file
+ * @optimization_level: ONNX session optimization level
+ * @execution_provider: ONNX execution provider
+ * @onnx_client opaque pointer to ONNX client
+ * @onnx_disabled true if inference is disabled
+ * @video_info @ref GstVideoInfo of sink caps
+ */
+struct _GstOnnxInference
+{
+  GstBaseTransform basetransform;
+  gchar *model_file;
+  GstOnnxOptimizationLevel optimization_level;
+  GstOnnxExecutionProvider execution_provider;
+  gpointer onnx_client;
+  gboolean onnx_disabled;
+  GstVideoInfo video_info;
+};
+
+GST_DEBUG_CATEGORY (onnx_inference_debug);
+
+#define GST_CAT_DEFAULT onnx_inference_debug
+#define GST_ONNX_CLIENT_MEMBER( self ) ((GstOnnxNamespace::GstOnnxClient *) (self->onnx_client))
+GST_ELEMENT_REGISTER_DEFINE (onnx_inference, "onnxinference",
+    GST_RANK_PRIMARY, GST_TYPE_ONNX_INFERENCE);
+
+/* GstOnnxInference properties */
+enum
+{
+  PROP_0,
+  PROP_MODEL_FILE,
+  PROP_INPUT_IMAGE_FORMAT,
+  PROP_OPTIMIZATION_LEVEL,
+  PROP_EXECUTION_PROVIDER,
+  PROP_INPUT_OFFSET,
+  PROP_INPUT_SCALE
+};
+
+#define GST_ONNX_INFERENCE_DEFAULT_EXECUTION_PROVIDER    GST_ONNX_EXECUTION_PROVIDER_CPU
+#define GST_ONNX_INFERENCE_DEFAULT_OPTIMIZATION_LEVEL    GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_EXTENDED
+
+static GstStaticPadTemplate gst_onnx_inference_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ RGB,RGBA,BGR,BGRA }"))
+    );
+
+static GstStaticPadTemplate gst_onnx_inference_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ RGB,RGBA,BGR,BGRA }"))
+    );
+
+static void gst_onnx_inference_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_onnx_inference_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+static void gst_onnx_inference_finalize (GObject * object);
+static GstFlowReturn gst_onnx_inference_transform_ip (GstBaseTransform *
+    trans, GstBuffer * buf);
+static gboolean gst_onnx_inference_process (GstBaseTransform * trans,
+    GstBuffer * buf);
+static gboolean gst_onnx_inference_create_session (GstBaseTransform * trans);
+static GstCaps *gst_onnx_inference_transform_caps (GstBaseTransform *
+    trans, GstPadDirection direction, GstCaps * caps, GstCaps * filter_caps);
+static gboolean
+gst_onnx_inference_set_caps (GstBaseTransform * trans, GstCaps * incaps,
+    GstCaps * outcaps);
+
+G_DEFINE_TYPE (GstOnnxInference, gst_onnx_inference, GST_TYPE_BASE_TRANSFORM);
+
+GType gst_onnx_optimization_level_get_type (void);
+#define GST_TYPE_ONNX_OPTIMIZATION_LEVEL (gst_onnx_optimization_level_get_type ())
+
+GType gst_onnx_execution_provider_get_type (void);
+#define GST_TYPE_ONNX_EXECUTION_PROVIDER (gst_onnx_execution_provider_get_type ())
+
+GType gst_ml_model_input_image_format_get_type (void);
+#define GST_TYPE_ML_MODEL_INPUT_IMAGE_FORMAT (gst_ml_model_input_image_format_get_type ())
+
+GType
+gst_onnx_optimization_level_get_type (void)
+{
+  static GType onnx_optimization_type = 0;
+
+  if (g_once_init_enter (&onnx_optimization_type)) {
+    static GEnumValue optimization_level_types = {
+      {GST_ONNX_OPTIMIZATION_LEVEL_DISABLE_ALL, "Disable all optimization",
+          "disable-all"},
+      {GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_BASIC,
+            "Enable basic optimizations (redundant node removals))",
+          "enable-basic"},
+      {GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_EXTENDED,
+            "Enable extended optimizations (redundant node removals + node fusions)",
+          "enable-extended"},
+      {GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_ALL,
+          "Enable all possible optimizations", "enable-all"},
+      {0, NULL, NULL},
+    };
+
+    GType temp = g_enum_register_static ("GstOnnxOptimizationLevel",
+        optimization_level_types);
+
+    g_once_init_leave (&onnx_optimization_type, temp);
+  }
+
+  return onnx_optimization_type;
+}
+
+GType
+gst_onnx_execution_provider_get_type (void)
+{
+  static GType onnx_execution_type = 0;
+
+  if (g_once_init_enter (&onnx_execution_type)) {
+    static GEnumValue execution_provider_types = {
+      {GST_ONNX_EXECUTION_PROVIDER_CPU, "CPU execution provider",
+          "cpu"},
+      {GST_ONNX_EXECUTION_PROVIDER_CUDA,
+            "CUDA execution provider",
+          "cuda"},
+      {0, NULL, NULL},
+    };
+
+    GType temp = g_enum_register_static ("GstOnnxExecutionProvider",
+        execution_provider_types);
+
+    g_once_init_leave (&onnx_execution_type, temp);
+  }
+
+  return onnx_execution_type;
+}
+
+GType
+gst_ml_model_input_image_format_get_type (void)
+{
+  static GType ml_model_input_image_format = 0;
+
+  if (g_once_init_enter (&ml_model_input_image_format)) {
+    static GEnumValue ml_model_input_image_format_types = {
+      {GST_ML_INPUT_IMAGE_FORMAT_HWC,
+            "Height Width Channel (HWC) a.k.a. interleaved image data format",
+          "hwc"},
+      {GST_ML_INPUT_IMAGE_FORMAT_CHW,
+            "Channel Height Width (CHW) a.k.a. planar image data format",
+          "chw"},
+      {0, NULL, NULL},
+    };
+
+    GType temp = g_enum_register_static ("GstMlInputImageFormat",
+        ml_model_input_image_format_types);
+
+    g_once_init_leave (&ml_model_input_image_format, temp);
+  }
+
+  return ml_model_input_image_format;
+}
+
+static void
+gst_onnx_inference_class_init (GstOnnxInferenceClass * klass)
+{
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GstElementClass *element_class = (GstElementClass *) klass;
+  GstBaseTransformClass *basetransform_class = (GstBaseTransformClass *) klass;
+
+  GST_DEBUG_CATEGORY_INIT (onnx_inference_debug, "onnxinference",
+      0, "onnx_inference");
+  gobject_class->set_property = gst_onnx_inference_set_property;
+  gobject_class->get_property = gst_onnx_inference_get_property;
+  gobject_class->finalize = gst_onnx_inference_finalize;
+
+  /**
+   * GstOnnxInference:model-file
+   *
+   * ONNX model file
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MODEL_FILE,
+      g_param_spec_string ("model-file",
+          "ONNX model file", "ONNX model file", NULL, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstOnnxInference:input-image-format
+   *
+   * Model input image format
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (G_OBJECT_CLASS (klass),
+      PROP_INPUT_IMAGE_FORMAT,
+      g_param_spec_enum ("input-image-format",
+          "Input image format",
+          "Input image format",
+          GST_TYPE_ML_MODEL_INPUT_IMAGE_FORMAT,
+          GST_ML_INPUT_IMAGE_FORMAT_HWC, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+   /**
+    * GstOnnxInference:optimization-level
+    *
+    * ONNX optimization level
+    *
+    * Since: 1.24
+    */
+  g_object_class_install_property (G_OBJECT_CLASS (klass),
+      PROP_OPTIMIZATION_LEVEL,
+      g_param_spec_enum ("optimization-level",
+          "Optimization level",
+          "ONNX optimization level",
+          GST_TYPE_ONNX_OPTIMIZATION_LEVEL,
+          GST_ONNX_OPTIMIZATION_LEVEL_ENABLE_EXTENDED, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstOnnxInference:execution-provider
+   *
+   * ONNX execution provider
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (G_OBJECT_CLASS (klass),
+      PROP_EXECUTION_PROVIDER,
+      g_param_spec_enum ("execution-provider",
+          "Execution provider",
+          "ONNX execution provider",
+          GST_TYPE_ONNX_EXECUTION_PROVIDER,
+          GST_ONNX_EXECUTION_PROVIDER_CPU, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (G_OBJECT_CLASS (klass),
+      PROP_INPUT_OFFSET,
+      g_param_spec_float ("input-tensor-offset",
+          "Input tensor offset",
+          "offset each tensor value by this value",
+          -G_MAXFLOAT, G_MAXFLOAT, 0.0,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (G_OBJECT_CLASS (klass),
+      PROP_INPUT_SCALE,
+      g_param_spec_float ("input-tensor-scale",
+          "Input tensor scale",
+          "Divide each tensor value by this value",
+          G_MINFLOAT, G_MAXFLOAT, 1.0,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+
+  gst_element_class_set_static_metadata (element_class, "onnxinference",
+      "Filter/Effect/Video",
+      "Apply neural network to video frames and create tensor output",
+      "Aaron Boxer <aaron.boxer@collabora.com>");
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_onnx_inference_sink_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_onnx_inference_src_template));
+  basetransform_class->transform_ip =
+      GST_DEBUG_FUNCPTR (gst_onnx_inference_transform_ip);
+  basetransform_class->transform_caps =
+      GST_DEBUG_FUNCPTR (gst_onnx_inference_transform_caps);
+  basetransform_class->set_caps =
+      GST_DEBUG_FUNCPTR (gst_onnx_inference_set_caps);
+}
+
+static void
+gst_onnx_inference_init (GstOnnxInference * self)
+{
+  self->onnx_client = new GstOnnxNamespace::GstOnnxClient (GST_ELEMENT(self));
+  self->onnx_disabled = TRUE;
+}
+
+static void
+gst_onnx_inference_finalize (GObject * object)
+{
+  GstOnnxInference *self = GST_ONNX_INFERENCE (object);
+
+  g_free (self->model_file);
+  delete GST_ONNX_CLIENT_MEMBER (self);
+  G_OBJECT_CLASS (gst_onnx_inference_parent_class)->finalize (object);
+}
+
+static void
+gst_onnx_inference_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstOnnxInference *self = GST_ONNX_INFERENCE (object);
+  const gchar *filename;
+  auto onnxClient = GST_ONNX_CLIENT_MEMBER (self);
+
+  switch (prop_id) {
+    case PROP_MODEL_FILE:
+      filename = g_value_get_string (value);
+      if (filename
+          && g_file_test (filename,
+              (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))) {
+        if (self->model_file)
+          g_free (self->model_file);
+        self->model_file = g_strdup (filename);
+        self->onnx_disabled = FALSE;
+      } else {
+        GST_WARNING_OBJECT (self, "Model file '%s' not found!", filename);
+      }
+      break;
+    case PROP_OPTIMIZATION_LEVEL:
+      self->optimization_level =
+          (GstOnnxOptimizationLevel) g_value_get_enum (value);
+      break;
+    case PROP_EXECUTION_PROVIDER:
+      self->execution_provider =
+          (GstOnnxExecutionProvider) g_value_get_enum (value);
+      break;
+    case PROP_INPUT_IMAGE_FORMAT:
+      onnxClient->setInputImageFormat ((GstMlInputImageFormat)
+          g_value_get_enum (value));
+      break;
+    case PROP_INPUT_OFFSET:
+      onnxClient->setInputImageOffset (g_value_get_float (value));
+      break;
+    case PROP_INPUT_SCALE:
+      onnxClient->setInputImageScale (g_value_get_float (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_onnx_inference_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstOnnxInference *self = GST_ONNX_INFERENCE (object);
+  auto onnxClient = GST_ONNX_CLIENT_MEMBER (self);
+
+  switch (prop_id) {
+    case PROP_MODEL_FILE:
+      g_value_set_string (value, self->model_file);
+      break;
+    case PROP_OPTIMIZATION_LEVEL:
+      g_value_set_enum (value, self->optimization_level);
+      break;
+    case PROP_EXECUTION_PROVIDER:
+      g_value_set_enum (value, self->execution_provider);
+      break;
+    case PROP_INPUT_IMAGE_FORMAT:
+      g_value_set_enum (value, onnxClient->getInputImageFormat ());
+      break;
+    case PROP_INPUT_OFFSET:
+      g_value_set_float (value, onnxClient->getInputImageOffset ());
+      break;
+    case PROP_INPUT_SCALE:
+      g_value_set_float (value, onnxClient->getInputImageScale ());
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static gboolean
+gst_onnx_inference_create_session (GstBaseTransform * trans)
+{
+  GstOnnxInference *self = GST_ONNX_INFERENCE (trans);
+  auto onnxClient = GST_ONNX_CLIENT_MEMBER (self);
+
+  GST_OBJECT_LOCK (self);
+  if (self->onnx_disabled) {
+    GST_OBJECT_UNLOCK (self);
+
+    return FALSE;
+  }
+  if (onnxClient->hasSession ()) {
+    GST_OBJECT_UNLOCK (self);
+
+    return TRUE;
+  }
+  if (self->model_file) {
+    gboolean ret =
+        GST_ONNX_CLIENT_MEMBER (self)->createSession (self->model_file,
+        self->optimization_level,
+        self->execution_provider);
+    if (!ret) {
+      GST_ERROR_OBJECT (self,
+          "Unable to create ONNX session. Model is disabled.");
+      self->onnx_disabled = TRUE;
+    }
+  } else {
+    self->onnx_disabled = TRUE;
+    GST_ELEMENT_ERROR (self, STREAM, FAILED, (NULL), ("Model file not found"));
+  }
+  GST_OBJECT_UNLOCK (self);
+  if (self->onnx_disabled) {
+    gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (self), TRUE);
+  }
+
+  return TRUE;
+}
+
+static GstCaps *
+gst_onnx_inference_transform_caps (GstBaseTransform *
+    trans, GstPadDirection direction, GstCaps * caps, GstCaps * filter_caps)
+{
+  GstOnnxInference *self = GST_ONNX_INFERENCE (trans);
+  auto onnxClient = GST_ONNX_CLIENT_MEMBER (self);
+  GstCaps *other_caps;
+  GstCaps *restrictions;
+
+  if (!gst_onnx_inference_create_session (trans))
+    return NULL;
+  GST_LOG_OBJECT (self, "transforming caps %" GST_PTR_FORMAT, caps);
+
+  if (gst_base_transform_is_passthrough (trans))
+    return gst_caps_ref (caps);
+
+  restrictions = gst_caps_new_empty_simple ("video/x-raw");
+  if (onnxClient->isFixedInputImageSize ())
+    gst_caps_set_simple (restrictions, "width", G_TYPE_INT,
+      onnxClient->getWidth (), "height", G_TYPE_INT,
+      onnxClient->getHeight (), NULL);
+
+  if (onnxClient->getInputImageDatatype() == GST_TENSOR_TYPE_UINT8 &&
+      onnxClient->getInputImageScale() == 1.0 &&
+      onnxClient->getInputImageOffset() == 0.0) {
+    switch (onnxClient->getChannels()) {
+      case 1:
+        gst_caps_set_simple (restrictions, "format", G_TYPE_STRING, "GRAY8",
+          NULL);
+        break;
+      case 3:
+        switch (onnxClient->getInputImageFormat ()) {
+        case GST_ML_INPUT_IMAGE_FORMAT_HWC:
+          gst_caps_set_simple (restrictions, "format", G_TYPE_STRING, "RGB",
+                               NULL);
+          break;
+        case GST_ML_INPUT_IMAGE_FORMAT_CHW:
+          gst_caps_set_simple (restrictions, "format", G_TYPE_STRING, "RGBP",
+                               NULL);
+          break;
+        }
+        break;
+      case 4:
+        switch (onnxClient->getInputImageFormat ()) {
+        case GST_ML_INPUT_IMAGE_FORMAT_HWC:
+          gst_caps_set_simple (restrictions, "format", G_TYPE_STRING, "RGBA",
+                               NULL);
+          break;
+        case GST_ML_INPUT_IMAGE_FORMAT_CHW:
+          gst_caps_set_simple (restrictions, "format", G_TYPE_STRING, "RGBAP",
+                               NULL);
+          break;
+        }
+        break;
+      default:
+        GST_ERROR_OBJECT (self, "Invalid number of channels %d",
+          onnxClient->getChannels());
+        return NULL;
+    }
+  }
+
+  GST_DEBUG_OBJECT(self, "Applying caps restrictions: %" GST_PTR_FORMAT,
+    restrictions);
+
+  other_caps = gst_caps_intersect_full (caps, restrictions,
+                                        GST_CAPS_INTERSECT_FIRST);
+  gst_caps_unref (restrictions);
+
+  if (filter_caps) {
+    GstCaps *tmp = gst_caps_intersect_full (
+        other_caps, filter_caps, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_replace (&other_caps, tmp);
+    gst_caps_unref (tmp);
+  }
+
+  return other_caps;
+}
+
+static gboolean
+gst_onnx_inference_set_caps (GstBaseTransform * trans, GstCaps * incaps,
+    GstCaps * outcaps)
+{
+  GstOnnxInference *self = GST_ONNX_INFERENCE (trans);
+  auto onnxClient = GST_ONNX_CLIENT_MEMBER (self);
+
+  if (!gst_video_info_from_caps (&self->video_info, incaps)) {
+    GST_ERROR_OBJECT (self, "Failed to parse caps");
+    return FALSE;
+  }
+
+  onnxClient->parseDimensions (self->video_info);
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_onnx_inference_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
+{
+  if (!gst_base_transform_is_passthrough (trans)
+      && !gst_onnx_inference_process (trans, buf)) {
+    GST_ELEMENT_ERROR (trans, STREAM, FAILED,
+        (NULL), ("ONNX inference failed"));
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_onnx_inference_process (GstBaseTransform * trans, GstBuffer * buf)
+{
+  GstMapInfo info;
+  if (gst_buffer_map (buf, &info, GST_MAP_READ)) {
+    GstOnnxInference *self = GST_ONNX_INFERENCE (trans);
+    try {
+      auto client = GST_ONNX_CLIENT_MEMBER (self);
+      auto outputs = client->run (info.data, self->video_info);
+      auto meta = client->copy_tensors_to_meta (outputs, buf);
+      if (!meta)
+        return FALSE;
+      GST_TRACE_OBJECT (trans, "Num tensors:%d", meta->num_tensors);
+      meta->batch_size = 1;
+    }
+    catch (Ort::Exception & ortex) {
+      GST_ERROR_OBJECT (self, "%s", ortex.what ());
+      gst_buffer_unmap (buf, &info);
+      return FALSE;
+    }
+
+    gst_buffer_unmap (buf, &info);
+  }
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/ext/onnx/gstonnxinference.h Added

@@ -0,0 +1,40 @@
+/*
+ * GStreamer gstreamer-onnxinference
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * gstonnxinference.h
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_ONNX_INFERENCE_H__
+#define __GST_ONNX_INFERENCE_H__
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/video/gstvideofilter.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_ONNX_INFERENCE            (gst_onnx_inference_get_type())
+G_DECLARE_FINAL_TYPE (GstOnnxInference, gst_onnx_inference, GST,
+    ONNX_INFERENCE, GstBaseTransform)
+
+GST_ELEMENT_REGISTER_DECLARE (onnx_inference)
+
+G_END_DECLS
+
+#endif /* __GST_ONNX_INFERENCE_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/onnx/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/onnx/meson.build Changed

@@ -3,27 +3,28 @@
 endif
 
 
-onnxrt_dep = dependency('libonnxruntime', version : '>= 1.13.1', required : get_option('onnx'))
+onnxrt_dep = dependency('libonnxruntime', version : '>= 1.16.1', required : get_option('onnx'))
+
+extra_args = 
+extra_deps = 
+if gstcuda_dep.found()
+    extra_args += '-DHAVE_CUDA'
+    extra_deps += gstcuda_dep
+endif
 
 if onnxrt_dep.found()
-	onnxrt_include_root = onnxrt_dep.get_variable('includedir')
-	onnxrt_includes = onnxrt_include_root / 'core/session', onnxrt_include_root / 'core'
-	onnxrt_dep_args = 
-	
-	compiler = meson.get_compiler('cpp')
-	if compiler.has_header(onnxrt_include_root / 'core/providers/cuda/cuda_provider_factory.h')
-	  onnxrt_dep_args = '-DGST_ML_ONNX_RUNTIME_HAVE_CUDA'
-	endif
     gstonnx = library('gstonnx',
     'gstonnx.c',
-    'gstonnxelement.c',
-    'gstonnxobjectdetector.cpp',
+    'decoders/gstssdobjectdetector.c',
+    'gstonnxinference.cpp',
     'gstonnxclient.cpp',
-    c_args : gst_plugins_bad_args,
-    cpp_args: onnxrt_dep_args,
+    'tensor/gsttensormeta.c',
+    c_args : gst_plugins_bad_args + extra_args,
+    cpp_args : gst_plugins_bad_args + extra_args,
     link_args : noseh_link_args,
-    include_directories : configinc, libsinc, onnxrt_includes,
-    dependencies : gstbase_dep, gstvideo_dep, onnxrt_dep, libm,
+    include_directories : configinc, libsinc, cuda_stubinc,
+    dependencies : gstbase_dep, gstvideo_dep, gstanalytics_dep, onnxrt_dep,
+        libm, gio_dep + extra_deps,
     install : true,
     install_dir : plugins_install_dir,
   )

gst-plugins-bad-1.24.5.tar.xz/ext/onnx/tensor Added

gst-plugins-bad-1.24.5.tar.xz/ext/onnx/tensor/gsttensormeta.c Added

@@ -0,0 +1,89 @@
+/*
+ * GStreamer gstreamer-tensormeta
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * gsttensormeta.c
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "gsttensormeta.h"
+
+static gboolean
+gst_tensor_meta_init (GstMeta * meta, gpointer params, GstBuffer * buffer)
+{
+  GstTensorMeta *tmeta = (GstTensorMeta *) meta;
+
+  tmeta->num_tensors = 0;
+  tmeta->tensor = NULL;
+
+  return TRUE;
+}
+
+static void
+gst_tensor_meta_free (GstMeta * meta, GstBuffer * buffer)
+{
+  GstTensorMeta *tmeta = (GstTensorMeta *) meta;
+
+  for (int i = 0; i < tmeta->num_tensors; i++) {
+    g_free (tmeta->tensori.dims);
+    gst_buffer_unref (tmeta->tensori.data);
+  }
+  g_free (tmeta->tensor);
+}
+
+GType
+gst_tensor_meta_api_get_type (void)
+{
+  static GType type = 0;
+  static const gchar *tags = { NULL };
+
+  if (g_once_init_enter (&type)) {
+    GType _type = gst_meta_api_type_register ("GstTensorMetaAPI", tags);
+    g_once_init_leave (&type, _type);
+  }
+  return type;
+}
+
+
+const GstMetaInfo *
+gst_tensor_meta_get_info (void)
+{
+  static const GstMetaInfo *tmeta_info = NULL;
+
+  if (g_once_init_enter (&tmeta_info)) {
+    const GstMetaInfo *meta =
+        gst_meta_register (gst_tensor_meta_api_get_type (),
+        "GstTensorMeta",
+        sizeof (GstTensorMeta),
+        gst_tensor_meta_init,
+        gst_tensor_meta_free,
+        NULL);                  /* tensor_meta_transform not implemented */
+    g_once_init_leave (&tmeta_info, meta);
+  }
+  return tmeta_info;
+}
+
+gint
+gst_tensor_meta_get_index_from_id (GstTensorMeta * meta, GQuark id)
+{
+  for (int i = 0; i < meta->num_tensors; ++i) {
+    if ((meta->tensor + i)->id == id)
+      return i;
+  }
+
+  return GST_TENSOR_MISSING_ID;
+}

gst-plugins-bad-1.24.5.tar.xz/ext/onnx/tensor/gsttensormeta.h Added

@@ -0,0 +1,124 @@
+/*
+ * GStreamer gstreamer-tensormeta
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * gsttensormeta.h
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef __GST_TENSOR_META_H__
+#define __GST_TENSOR_META_H__
+
+#include <gst/gst.h>
+
+/**
+ * GstTensorDataType:
+ *
+ * @GST_TENSOR_TYPE_INT4 signed 4 bit integer tensor data
+ * @GST_TENSOR_TYPE_INT8 signed 8 bit integer tensor data
+ * @GST_TENSOR_TYPE_INT16 signed 16 bit integer tensor data
+ * @GST_TENSOR_TYPE_INT32 signed 32 bit integer tensor data
+ * @GST_TENSOR_TYPE_INT64 signed 64 bit integer tensor data
+ * @GST_TENSOR_TYPE_UINT4 unsigned 4 bit integer tensor data
+ * @GST_TENSOR_TYPE_UINT8 unsigned 8 bit integer tensor data
+ * @GST_TENSOR_TYPE_UINT16 unsigned 16 bit integer tensor data
+ * @GST_TENSOR_TYPE_UINT32 unsigned 32 bit integer tensor data
+ * @GST_TENSOR_TYPE_UINT64 unsigned 64 bit integer tensor data
+ * @GST_TENSOR_TYPE_FLOAT16 16 bit floating point tensor data
+ * @GST_TENSOR_TYPE_FLOAT32 32 bit floating point tensor data
+ * @GST_TENSOR_TYPE_FLOAT64 64 bit floating point tensor data
+ * @GST_TENSOR_TYPE_BFLOAT16 "brain" 16 bit floating point tensor data
+ *
+ * Describe the type of data contain in the tensor.
+ *
+ * Since: 1.24
+ */
+typedef enum _GstTensorDataType
+{
+  GST_TENSOR_TYPE_INT4,
+  GST_TENSOR_TYPE_INT8,
+  GST_TENSOR_TYPE_INT16,
+  GST_TENSOR_TYPE_INT32,
+  GST_TENSOR_TYPE_INT64,
+  GST_TENSOR_TYPE_UINT4,
+  GST_TENSOR_TYPE_UINT8,
+  GST_TENSOR_TYPE_UINT16,
+  GST_TENSOR_TYPE_UINT32,
+  GST_TENSOR_TYPE_UINT64,
+  GST_TENSOR_TYPE_FLOAT16,
+  GST_TENSOR_TYPE_FLOAT32,
+  GST_TENSOR_TYPE_FLOAT64,
+  GST_TENSOR_TYPE_BFLOAT16,
+} GstTensorDataType;
+
+
+/**
+ * GstTensor:
+ *
+ * @id: semantically identify the contents of the tensor
+ * @num_dims: number of tensor dimensions
+ * @dims: tensor dimensions
+ * @type: #GstTensorDataType of tensor data
+ * @data: #GstBuffer holding tensor data
+ *
+ * Since: 1.24
+ */
+typedef struct _GstTensor
+{
+  GQuark id;
+  gint num_dims;
+  int64_t *dims;
+  GstTensorDataType data_type;
+  GstBuffer *data;
+} GstTensor;
+
+#define GST_TENSOR_MISSING_ID -1
+
+/**
+ * GstTensorMeta:
+ *
+ * @meta base GstMeta
+ * @num_tensors number of tensors
+ * @tensor @ref GstTensor for each tensor
+ * @batch_size model batch size
+ *
+ * Since: 1.24
+ */
+typedef struct _GstTensorMeta
+{
+  GstMeta meta;
+
+  gint num_tensors;
+  GstTensor *tensor;
+  int batch_size;
+} GstTensorMeta;
+
+G_BEGIN_DECLS
+
+#define GST_TENSOR_META_API_TYPE \
+  (gst_tensor_meta_api_get_type())
+
+#define GST_TENSOR_META_INFO \
+  (gst_tensor_meta_get_info())
+
+
+GType gst_tensor_meta_api_get_type (void);
+const GstMetaInfo *gst_tensor_meta_get_info (void);
+gint gst_tensor_meta_get_index_from_id(GstTensorMeta *meta, GQuark id);
+
+G_END_DECLS
+
+#endif

gst-plugins-bad-1.22.7.tar.xz/ext/openal/gstopenalsink.c -> gst-plugins-bad-1.24.5.tar.xz/ext/openal/gstopenalsink.c Changed

@@ -358,46 +358,47 @@
     GstAudioChannelPosition positions8;
   } chans = {
     {
-      1, {
-      GST_AUDIO_CHANNEL_POSITION_MONO}
-    }, {
-      2, {
-      GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
-            GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}
-    }, {
-      4, {
-      GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
-            GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
-            GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
-            GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}
-    }, {
-      6, {
-      GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
-            GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
-            GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
-            GST_AUDIO_CHANNEL_POSITION_LFE1,
-            GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
-            GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}
-    }, {
-      7, {
-      GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
-            GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
-            GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
-            GST_AUDIO_CHANNEL_POSITION_LFE1,
-            GST_AUDIO_CHANNEL_POSITION_REAR_CENTER,
-            GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
-            GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}
-    }, {
-      8, {
-      GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
-            GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
-            GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
-            GST_AUDIO_CHANNEL_POSITION_LFE1,
-            GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
-            GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
-            GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
-            GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}
-  },};
+          1, {
+              GST_AUDIO_CHANNEL_POSITION_MONO}
+        }, {
+          2, {
+                GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+              GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}
+        }, {
+          4, {
+                GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+                GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+                GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
+              GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}
+        }, {
+          6, {
+                GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+                GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+                GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+                GST_AUDIO_CHANNEL_POSITION_LFE1,
+                GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
+              GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}
+        }, {
+          7, {
+                GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+                GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+                GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+                GST_AUDIO_CHANNEL_POSITION_LFE1,
+                GST_AUDIO_CHANNEL_POSITION_REAR_CENTER,
+                GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
+              GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}
+        }, {
+          8, {
+                GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+                GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+                GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+                GST_AUDIO_CHANNEL_POSITION_LFE1,
+                GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
+                GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
+                GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
+              GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}
+        },
+  };
   GstStructure *structure;
   guint64 channel_mask;
   GstCaps *caps;
@@ -417,15 +418,17 @@
       "AL_FORMAT_71CHN32",
       NULL
     }, *fmt16 = {
-    "AL_FORMAT_MONO16",
-          "AL_FORMAT_STEREO16",
-          "AL_FORMAT_QUAD16",
-          "AL_FORMAT_51CHN16",
-          "AL_FORMAT_61CHN16", "AL_FORMAT_71CHN16", NULL}, *fmt8 = {
-    "AL_FORMAT_MONO8",
-          "AL_FORMAT_STEREO8",
-          "AL_FORMAT_QUAD8",
-          "AL_FORMAT_51CHN8", "AL_FORMAT_61CHN8", "AL_FORMAT_71CHN8", NULL};
+      "AL_FORMAT_MONO16",
+      "AL_FORMAT_STEREO16",
+      "AL_FORMAT_QUAD16",
+      "AL_FORMAT_51CHN16",
+      "AL_FORMAT_61CHN16", "AL_FORMAT_71CHN16", NULL
+    }, *fmt8 = {
+      "AL_FORMAT_MONO8",
+      "AL_FORMAT_STEREO8",
+      "AL_FORMAT_QUAD8",
+      "AL_FORMAT_51CHN8", "AL_FORMAT_61CHN8", "AL_FORMAT_71CHN8", NULL
+    };
     int i;
 
     if (alIsExtensionPresent ("AL_EXT_FLOAT32")) {

gst-plugins-bad-1.22.7.tar.xz/ext/opencv/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/opencv/meson.build Changed

@@ -34,87 +34,7 @@
   'gstcvtracker.cpp'
 
 
-libopencv_headers = 
-  'opencv2/bgsegm.hpp',
-  'opencv2/calib3d.hpp',
-  'opencv2/core.hpp',
-  'opencv2/imgproc.hpp',
-  'opencv2/objdetect.hpp',
-  'opencv2/opencv.hpp',
-  'opencv2/video.hpp',
-  'opencv2/tracking.hpp',
-
-
-libopencv4_headers = 
-  'opencv4/opencv2/bgsegm.hpp',
-  'opencv4/opencv2/calib3d.hpp',
-  'opencv4/opencv2/core.hpp',
-  'opencv4/opencv2/imgproc.hpp',
-  'opencv4/opencv2/objdetect.hpp',
-  'opencv4/opencv2/opencv.hpp',
-  'opencv4/opencv2/video.hpp',
-  'opencv4/opencv2/tracking.hpp',
-
-
-gstopencv_cargs = '-DGST_HAAR_CASCADES_DIR="@0@"'
-
-opencv_dep = dependency('opencv', version : '>= 3.0.0', '< 3.5.0', required : false)
-opencv_found = opencv_dep.found()
-
-if opencv_found
-  foreach h : libopencv_headers
-    if not cxx.has_header(h)
-      message('Needed header "' + h + '" not found')
-      opencv_found = false
-    endif
-  endforeach
-endif
-
-if not opencv_found
-  opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false)
-  opencv_found = opencv_dep.found()
-  if opencv_found
-    foreach h : libopencv4_headers
-      if not cxx.has_header(h)
-        message('Needed header "' + h + '" not found')
-        opencv_found = false
-      endif
-    endforeach
-  endif
-endif
-
-if opencv_found
-  opencv_prefix = opencv_dep.get_variable('prefix')
-  gstopencv_cargs += '-DOPENCV_PREFIX="' + opencv_prefix + '"'
-
-  # Check the data dir used by opencv for its xml data files
-  # Use prefix from pkg-config to be compatible with cross-compilation
-  r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false)
-  if r.returncode() == 0
-    gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"'
-  else
-    r = run_command('test', '-d', opencv_prefix + '/share/OpenCV', check: false)
-    if r.returncode() == 0
-      gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"'
-    else
-      r = run_command('test', '-d', opencv_prefix + '/share/opencv4', check: false)
-      if r.returncode() == 0
-        gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"'
-      else
-        message('Unable to detect OpenCV data directory')
-        opencv_found = false
-      endif
-    endif
-  endif
-endif
-
 if opencv_found
-  # opencv4 seems to ship with .pc file that references non-existent include dir
-  # (/usr/include/opencv4/opencv instead of /usr/include/opencv4/opencv2)
-  # clang 10 complains about the following header in opencv4
-  # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal -Werror,-Wformat-nonliteral
-  gstopencv_cargs += cxx.get_supported_arguments('-Wno-missing-include-dirs', '-Wno-format-nonliteral')
-
   gstopencv = library('gstopencv',
     gstopencv_sources,
     cpp_args : gst_plugins_bad_args + gstopencv_cargs +  '-DGST_USE_UNSTABLE_API' ,

gst-plugins-bad-1.22.7.tar.xz/ext/openh264/gstopenh264dec.cpp -> gst-plugins-bad-1.24.5.tar.xz/ext/openh264/gstopenh264dec.cpp Changed

gst-plugins-bad-1.22.7.tar.xz/ext/openh264/gstopenh264elements.h -> gst-plugins-bad-1.24.5.tar.xz/ext/openh264/gstopenh264elements.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/openh264/gstopenh264enc.cpp -> gst-plugins-bad-1.24.5.tar.xz/ext/openh264/gstopenh264enc.cpp Changed

gst-plugins-bad-1.22.7.tar.xz/ext/openh264/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/openh264/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/ext/openjpeg/gstopenjpegdec.c -> gst-plugins-bad-1.24.5.tar.xz/ext/openjpeg/gstopenjpegdec.c Changed

@@ -70,7 +70,7 @@
 static gboolean gst_openjpeg_dec_set_format (GstVideoDecoder * decoder,
     GstVideoCodecState * state);
 static gboolean gst_openjpeg_dec_flush (GstVideoDecoder * decoder);
-static gboolean gst_openjpeg_dec_finish (GstVideoDecoder * decoder);
+static GstFlowReturn gst_openjpeg_dec_finish (GstVideoDecoder * decoder);
 static GstFlowReturn gst_openjpeg_dec_handle_frame (GstVideoDecoder * decoder,
     GstVideoCodecFrame * frame);
 static gboolean gst_openjpeg_dec_decide_allocation (GstVideoDecoder * decoder,
@@ -80,10 +80,10 @@
 static void gst_openjpeg_dec_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
-static gboolean gst_openjpeg_dec_decode_frame_multiple (GstVideoDecoder *
+static GstFlowReturn gst_openjpeg_dec_decode_frame_multiple (GstVideoDecoder *
+    decoder, GstVideoCodecFrame * frame);
+static GstFlowReturn gst_openjpeg_dec_decode_frame_single (GstVideoDecoder *
     decoder, GstVideoCodecFrame * frame);
-static gboolean gst_openjpeg_dec_decode_frame_single (GstVideoDecoder * decoder,
-    GstVideoCodecFrame * frame);
 
 static void gst_openjpeg_dec_pause_loop (GstOpenJPEGDec * self,
     GstFlowReturn flow_ret);
@@ -1237,7 +1237,7 @@
 gst_openjpeg_decode_message_new (GstOpenJPEGDec * self,
     GstVideoCodecFrame * frame, int num_stripe)
 {
-  GstOpenJPEGCodecMessage *message = g_slice_new0 (GstOpenJPEGCodecMessage);
+  GstOpenJPEGCodecMessage *message = g_new0 (GstOpenJPEGCodecMessage, 1);
   GST_DEBUG_OBJECT (self, "message: %p", message);
   message->frame = gst_video_codec_frame_ref (frame);
   message->stripe = num_stripe;
@@ -1257,7 +1257,7 @@
   gst_buffer_unref (message->input_buffer);
   gst_video_codec_frame_unref (message->frame);
   GST_DEBUG_OBJECT (self, "message: %p", message);
-  g_slice_free (GstOpenJPEGCodecMessage, message);
+  g_free (message);
   return NULL;
 }

gst-plugins-bad-1.22.7.tar.xz/ext/openjpeg/gstopenjpegdec.h -> gst-plugins-bad-1.24.5.tar.xz/ext/openjpeg/gstopenjpegdec.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/openjpeg/gstopenjpegenc.c -> gst-plugins-bad-1.24.5.tar.xz/ext/openjpeg/gstopenjpegenc.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/openjpeg/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/openjpeg/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/ext/qroverlay/gstbaseqroverlay.c -> gst-plugins-bad-1.24.5.tar.xz/ext/qroverlay/gstbaseqroverlay.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/qroverlay/gstqroverlay.c -> gst-plugins-bad-1.24.5.tar.xz/ext/qroverlay/gstqroverlay.c Changed

@@ -88,15 +88,13 @@
   GstCustomMeta *meta = gst_buffer_get_custom_meta (buf, "GstQROverlayMeta");
   if (meta) {
     gchar *data;
-    GstStructure *structure =
-        gst_custom_meta_get_structure ((GstCustomMeta *) meta);
 
-    if (gst_structure_get (structure, "data", G_TYPE_STRING, &data, NULL)) {
+    if (gst_structure_get (meta->structure, "data", G_TYPE_STRING, &data, NULL)) {
       gboolean keep_data;
 
       GST_OBJECT_LOCK (self);
       self->data_changed = TRUE;
-      if (gst_structure_get_boolean (structure, "keep_data", &keep_data)
+      if (gst_structure_get_boolean (meta->structure, "keep_data", &keep_data)
           && keep_data) {
         g_free (self->data);
         self->data = g_strdup (self->data);
@@ -115,7 +113,7 @@
 
   GST_OBJECT_LOCK (self);
   content = g_strdup (self->data);
-  *reuse_prev = self->data_changed;
+  *reuse_prev = !self->data_changed;
   self->data_changed = FALSE;
   GST_OBJECT_UNLOCK (self);
 
@@ -162,7 +160,6 @@
 {
   GObjectClass *gobject_class;
   GstElementClass *gstelement_class;
-  static const gchar *tags = { NULL };
 
   gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
@@ -177,7 +174,7 @@
       "Overlay Qrcodes over each buffer with data passed in",
       "Thibault Saunier <tsaunier@igalia.com>");
 
-  gst_meta_register_custom ("GstQROverlayMeta", tags, NULL, NULL, NULL);
+  gst_meta_register_custom_simple ("GstQROverlayMeta");
 
   g_object_class_install_property (gobject_class,
       PROP_DATA, g_param_spec_string ("data",

gst-plugins-bad-1.22.7.tar.xz/ext/qroverlay/gstqroverlayplugin.c -> gst-plugins-bad-1.24.5.tar.xz/ext/qroverlay/gstqroverlayplugin.c Changed

gst-plugins-bad-1.24.5.tar.xz/ext/qt6d3d11 Added

gst-plugins-bad-1.24.5.tar.xz/ext/qt6d3d11/gstqml6d3d11sink.cpp Added

@@ -0,0 +1,664 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/d3d11/gstd3d11.h>
+#include <gst/d3d11/gstd3d11-private.h>
+#include "gstqml6d3d11sink.h"
+#include "gstqt6d3d11videoitem.h"
+#include <mutex>
+
+GST_DEBUG_CATEGORY_STATIC (gst_qml6_d3d11_sink_debug);
+#define GST_CAT_DEFAULT gst_qml6_d3d11_sink_debug
+
+static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, GST_D3D11_SINK_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE (GST_D3D11_SINK_FORMATS)));
+
+enum
+{
+  PROP_0,
+  PROP_WIDGET,
+  PROP_FORCE_ASPECT_RATIO,
+};
+
+#define DEFAULT_FORCE_ASPECT_RATIO TRUE
+
+struct GstQml6D3D11SinkPrivate
+{
+  QSharedPointer < GstQt6D3D11VideoItemProxy > widget;
+
+  std::recursive_mutex lock;
+
+  GstVideoInfo info;
+
+  GstD3D11Device *device = nullptr;
+  gint64 adapter_luid = 0;
+  GstBuffer *prepared_buffer = nullptr;
+  GstBufferPool *pool = nullptr;
+
+  gboolean force_aspect_ratio = DEFAULT_FORCE_ASPECT_RATIO;
+};
+
+struct _GstQml6D3D11Sink
+{
+  GstVideoSink parent;
+
+  GstQml6D3D11SinkPrivate *priv;
+};
+
+static void
+gst_qml6_d3d11_sink_navigation_init (GstNavigationInterface * iface);
+static void gst_qml6_d3d11_sink_dispose (GObject * object);
+static void gst_qml6_d3d11_sink_finalize (GObject * object);
+static void gst_qml6_d3d11_sink_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_qml6_d3d11_sink_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+static void gst_qml6_d3d11_sink_set_context (GstElement * element,
+    GstContext * context);
+static gboolean gst_qml6_d3d11_sink_set_caps (GstBaseSink * sink,
+    GstCaps * caps);
+static gboolean gst_qml6_d3d11_sink_start (GstBaseSink * sink);
+static gboolean gst_qml6_d3d11_sink_stop (GstBaseSink * sink);
+static gboolean gst_qml6_d3d11_sink_propose_allocation (GstBaseSink * sink,
+    GstQuery * query);
+static gboolean gst_qml6_d3d11_sink_query (GstBaseSink * sink,
+    GstQuery * query);
+static GstFlowReturn gst_qml6_d3d11_sink_prepare (GstBaseSink * sink,
+    GstBuffer * buf);
+static GstFlowReturn gst_qml6_d3d11_sink_show_frame (GstVideoSink * sink,
+    GstBuffer * buf);
+
+#define gst_qml6_d3d11_sink_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstQml6D3D11Sink, gst_qml6_d3d11_sink,
+    GST_TYPE_VIDEO_SINK, GST_DEBUG_CATEGORY_INIT (gst_qml6_d3d11_sink_debug,
+        "qml6d3d11sink", 0, "qml6d3d11sink");
+    G_IMPLEMENT_INTERFACE (GST_TYPE_NAVIGATION,
+        gst_qml6_d3d11_sink_navigation_init);
+    gst_qt6_d3d11_video_item_init_once ());
+
+static void
+gst_qml6_d3d11_sink_class_init (GstQml6D3D11SinkClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseSinkClass *sink_class = GST_BASE_SINK_CLASS (klass);
+  GstVideoSinkClass *videosink_class = GST_VIDEO_SINK_CLASS (klass);
+
+  object_class->dispose = gst_qml6_d3d11_sink_dispose;
+  object_class->finalize = gst_qml6_d3d11_sink_finalize;
+  object_class->set_property = gst_qml6_d3d11_sink_set_property;
+  object_class->get_property = gst_qml6_d3d11_sink_get_property;
+
+  g_object_class_install_property (object_class, PROP_WIDGET,
+      g_param_spec_pointer ("widget", "QQuickItem",
+          "The QQuickItem to place in the object hierarchy",
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_FORCE_ASPECT_RATIO,
+      g_param_spec_boolean ("force-aspect-ratio",
+          "Force aspect ratio",
+          "When enabled, scaling will respect original aspect ratio",
+          DEFAULT_FORCE_ASPECT_RATIO,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  gst_element_class_set_static_metadata (element_class,
+      "Qt6 Direct3D11 Video Sink", "Sink/Video",
+      "A video sink that renders to a QQuickItem for Qt6 using Direct3D11",
+      "Seungha Yang <seungha@centricular.com>");
+
+  gst_element_class_add_static_pad_template (element_class, &sink_template);
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_qml6_d3d11_sink_set_context);
+
+  sink_class->set_caps = GST_DEBUG_FUNCPTR (gst_qml6_d3d11_sink_set_caps);
+  sink_class->start = GST_DEBUG_FUNCPTR (gst_qml6_d3d11_sink_start);
+  sink_class->stop = GST_DEBUG_FUNCPTR (gst_qml6_d3d11_sink_stop);
+  sink_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_qml6_d3d11_sink_propose_allocation);
+  sink_class->query = GST_DEBUG_FUNCPTR (gst_qml6_d3d11_sink_query);
+  sink_class->prepare = GST_DEBUG_FUNCPTR (gst_qml6_d3d11_sink_prepare);
+
+  videosink_class->show_frame =
+      GST_DEBUG_FUNCPTR (gst_qml6_d3d11_sink_show_frame);
+}
+
+static void
+gst_qml6_d3d11_sink_init (GstQml6D3D11Sink * self)
+{
+  self->priv = new GstQml6D3D11SinkPrivate ();
+}
+
+static void
+gst_qml6_d3d11_sink_dispose (GObject * object)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (object);
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+
+  gst_clear_object (&priv->device);
+  self->priv->widget.clear ();
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gst_qml6_d3d11_sink_finalize (GObject * object)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_qml6_d3d11_sink_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (object);
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_FORCE_ASPECT_RATIO:
+      priv->force_aspect_ratio = g_value_get_boolean (value);
+      if (priv->widget)
+        priv->widget->SetForceAspectRatio (priv->force_aspect_ratio);
+      break;
+    case PROP_WIDGET:
+    {
+      GstQt6D3D11VideoItem *item =
+          (GstQt6D3D11VideoItem *) g_value_get_pointer (value);
+      if (item) {
+        priv->widget = item->Proxy ();
+        if (priv->widget) {
+          priv->widget->SetSink (GST_ELEMENT_CAST (self));
+          priv->widget->SetForceAspectRatio (priv->force_aspect_ratio);
+        }
+      } else {
+        priv->widget.clear ();
+      }
+      break;
+    }
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_qml6_d3d11_sink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (object);
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_FORCE_ASPECT_RATIO:
+      g_value_set_boolean (value, priv->force_aspect_ratio);
+      break;
+    case PROP_WIDGET:
+      if (priv->widget) {
+        g_value_set_pointer (value, priv->widget->Item ());
+      } else {
+        g_value_set_pointer (value, nullptr);
+      }
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_qml6_d3d11_sink_set_context (GstElement * element, GstContext * context)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (element);
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+
+  if (priv->widget) {
+    gint64 adapter_luid = priv->widget->AdapterLuid ();
+    gst_d3d11_handle_set_context_for_adapter_luid (element,
+        context, adapter_luid, &priv->device);
+  }
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_qml6_d3d11_sink_set_caps (GstBaseSink * sink, GstCaps * caps)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (sink);
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  GstBufferPool *pool;
+  GstStructure *config;
+  GstD3D11AllocationParams *params;
+
+  if (!priv->widget) {
+    GST_ERROR_OBJECT (self, "Widget is not configured");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&priv->info, caps)) {
+    GST_ERROR_OBJECT (self, "Invalid caps");
+    return FALSE;
+  }
+
+  if (priv->pool) {
+    gst_buffer_pool_set_active (priv->pool, FALSE);
+    gst_clear_object (&priv->pool);
+  }
+
+  priv->widget->SetCaps (caps);
+
+  pool = gst_d3d11_buffer_pool_new (priv->device);
+  config = gst_buffer_pool_get_config (pool);
+  params = gst_d3d11_allocation_params_new (priv->device, &priv->info,
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0);
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_d3d11_allocation_params_free (params);
+
+  gst_buffer_pool_config_set_params (config, caps, priv->info.size, 0, 0);
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (self, "Couldn't set pool config");
+    goto error;
+  }
+
+  if (!gst_buffer_pool_set_active (pool, TRUE)) {
+    GST_ERROR_OBJECT (self, "Couldn't set active");
+    goto error;
+  }
+
+  priv->pool = pool;
+
+  return TRUE;
+
+error:
+  gst_clear_object (&pool);
+  return FALSE;
+}
+
+static gboolean
+gst_qml6_d3d11_sink_start (GstBaseSink * sink)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (sink);
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  gint64 adapter_luid;
+
+  GST_DEBUG_OBJECT (self, "Start");
+
+  if (!priv->widget) {
+    GST_ERROR_OBJECT (self, "Widget is not configured");
+    return FALSE;
+  }
+
+  adapter_luid = priv->widget->AdapterLuid ();
+  if (!gst_d3d11_ensure_element_data_for_adapter_luid (GST_ELEMENT_CAST (self),
+          adapter_luid, &priv->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create d3d11 device for luid %"
+        G_GINT64_FORMAT, adapter_luid);
+    return FALSE;
+  }
+
+  priv->adapter_luid = adapter_luid;
+
+  return TRUE;
+}
+
+static gboolean
+gst_qml6_d3d11_sink_stop (GstBaseSink * sink)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (sink);
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  if (priv->pool) {
+    gst_buffer_pool_set_active (priv->pool, FALSE);
+    gst_clear_object (&priv->pool);
+  }
+
+  gst_clear_buffer (&priv->prepared_buffer);
+  gst_clear_object (&priv->device);
+
+  return TRUE;
+}
+
+static gboolean
+gst_qml6_d3d11_sink_propose_allocation (GstBaseSink * sink, GstQuery * query)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (sink);
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+  GstCaps *caps;
+  GstBufferPool *pool = nullptr;
+  GstVideoInfo info;
+  guint size;
+  gboolean need_pool;
+
+  if (!priv->device) {
+    GST_ERROR_OBJECT (self, "No d3d11 device configured");
+    return FALSE;
+  }
+
+  gst_query_parse_allocation (query, &caps, &need_pool);
+  if (!caps) {
+    GST_WARNING_OBJECT (self, "No caps specified");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_WARNING_OBJECT (self, "Invalid caps");
+    return FALSE;
+  }
+
+  /* the normal size of a frame */
+  size = info.size;
+
+  if (need_pool) {
+    GstCapsFeatures *features;
+    GstStructure *config;
+    gboolean is_d3d11 = FALSE;
+
+    features = gst_caps_get_features (caps, 0);
+    if (features
+        && gst_caps_features_contains (features,
+            GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY)) {
+      GST_DEBUG_OBJECT (self, "upstream support d3d11 memory");
+      pool = gst_d3d11_buffer_pool_new (priv->device);
+      is_d3d11 = TRUE;
+    } else {
+      pool = gst_video_buffer_pool_new ();
+    }
+
+    config = gst_buffer_pool_get_config (pool);
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
+    if (!is_d3d11) {
+      gst_buffer_pool_config_add_option (config,
+          GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+    }
+
+    size = GST_VIDEO_INFO_SIZE (&info);
+    if (is_d3d11) {
+      GstD3D11AllocationParams *d3d11_params =
+          gst_d3d11_allocation_params_new (priv->device, &info,
+          GST_D3D11_ALLOCATION_FLAG_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0);
+
+      gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
+      gst_d3d11_allocation_params_free (d3d11_params);
+    }
+
+    gst_buffer_pool_config_set_params (config, caps, (guint) size, 2, 0);
+
+    if (!gst_buffer_pool_set_config (pool, config)) {
+      GST_ERROR_OBJECT (pool, "Couldn't set config");
+      gst_object_unref (pool);
+
+      return FALSE;
+    }
+
+    /* d3d11 buffer pool will update buffer size based on allocated texture,
+     * get size from config again */
+    config = gst_buffer_pool_get_config (pool);
+    gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr,
+        nullptr);
+    gst_structure_free (config);
+  }
+
+  gst_query_add_allocation_pool (query, pool, size, 2, 0);
+  if (pool)
+    gst_object_unref (pool);
+
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);
+
+  return TRUE;
+}
+
+static gboolean
+gst_qml6_d3d11_sink_query (GstBaseSink * sink, GstQuery * query)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (sink);
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      if (gst_d3d11_handle_context_query (GST_ELEMENT (self), query,
+              priv->device)) {
+        return TRUE;
+      }
+      break;
+    default:
+      break;
+  }
+
+  return GST_BASE_SINK_CLASS (parent_class)->query (sink, query);
+}
+
+static GstBuffer *
+gst_qml6_d3d11_sink_do_system_copy (GstQml6D3D11Sink * self, GstBuffer * in_buf)
+{
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+  GstBuffer *out_buf;
+  GstVideoFrame in_frame, out_frame;
+
+  if (!gst_video_frame_map (&in_frame, &priv->info, in_buf, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (self, "Couldn't map input buffer");
+
+    return nullptr;
+  }
+
+  if (gst_buffer_pool_acquire_buffer (priv->pool, &out_buf, nullptr)
+      != GST_FLOW_OK) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire buffer");
+    gst_video_frame_unmap (&in_frame);
+
+    return nullptr;
+  }
+
+  if (!gst_video_frame_map (&out_frame, &priv->info, out_buf, GST_MAP_WRITE)) {
+    GST_ERROR_OBJECT (self, "Couldn't map output buffer");
+    gst_video_frame_unmap (&in_frame);
+    gst_buffer_unref (out_buf);
+
+    return nullptr;
+  }
+
+  gst_video_frame_copy (&out_frame, &in_frame);
+  gst_video_frame_unmap (&in_frame);
+  gst_video_frame_unmap (&out_frame);
+
+  /* Do upload staging to default texture */
+  for (guint i = 0; i < gst_buffer_n_memory (out_buf); i++) {
+    GstMemory *mem = gst_buffer_peek_memory (out_buf, i);
+    GstMapInfo info;
+
+    gst_memory_map (mem, &info, (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D11));
+    gst_memory_unmap (mem, &info);
+  }
+
+  return out_buf;
+}
+
+static GstBuffer *
+gst_qml6_d3d11_sink_do_gpu_copy (GstQml6D3D11Sink * self, GstBuffer * in_buf)
+{
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+  GstBuffer *out_buf;
+  ID3D11DeviceContext *context;
+
+  if (gst_buffer_pool_acquire_buffer (priv->pool, &out_buf, nullptr)
+      != GST_FLOW_OK) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire buffer");
+    return nullptr;
+  }
+
+  GstD3D11DeviceLockGuard lk (priv->device);
+  context = gst_d3d11_device_get_device_context_handle (priv->device);
+
+  for (guint i = 0; i < gst_buffer_n_memory (in_buf); i++) {
+    GstMapInfo src_info, dst_info;
+    GstMemory *src_mem, *dst_mem;
+    D3D11_TEXTURE2D_DESC src_desc, dst_desc;
+    D3D11_BOX src_box;
+    guint subresource_idx;
+    ID3D11Texture2D *src_tex, *dst_tex;
+
+    src_mem = gst_buffer_peek_memory (in_buf, i);
+    dst_mem = gst_buffer_peek_memory (out_buf, i);
+
+    gst_memory_map (src_mem, &src_info,
+        (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D11));
+    gst_memory_map (dst_mem,
+        &dst_info, (GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D11));
+
+    src_tex = (ID3D11Texture2D *) src_info.data;
+    dst_tex = (ID3D11Texture2D *) dst_info.data;
+
+    src_tex->GetDesc (&src_desc);
+    dst_tex->GetDesc (&dst_desc);
+
+    subresource_idx = GPOINTER_TO_UINT (src_info.user_data0);
+
+    src_box.left = 0;
+    src_box.top = 0;
+    src_box.front = 0;
+    src_box.back = 1;
+    src_box.right = MIN (src_desc.Width, dst_desc.Width);
+    src_box.bottom = MIN (src_desc.Height, dst_desc.Height);
+
+    context->CopySubresourceRegion (dst_tex, 0,
+        0, 0, 0, src_tex, subresource_idx, &src_box);
+    gst_memory_unmap (src_mem, &src_info);
+    gst_memory_unmap (dst_mem, &dst_info);
+  }
+
+  return out_buf;
+}
+
+static GstFlowReturn
+gst_qml6_d3d11_sink_prepare (GstBaseSink * sink, GstBuffer * buf)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (sink);
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  GstBuffer *render_buf = nullptr;
+  GstMemory *mem;
+  GstD3D11Device *other_device = nullptr;
+
+  if (!priv->widget) {
+    GST_ERROR_OBJECT (self, "Widget is not configured");
+    return GST_FLOW_ERROR;
+  }
+
+  gst_clear_buffer (&priv->prepared_buffer);
+  mem = gst_buffer_peek_memory (buf, 0);
+  if (!gst_is_d3d11_memory (mem)) {
+    render_buf = gst_qml6_d3d11_sink_do_system_copy (self, buf);
+  } else {
+    GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
+
+    other_device = dmem->device;
+    if (dmem->device != priv->device) {
+      gint64 luid;
+
+      /* different device, check if it's the same GPU */
+      g_object_get (dmem->device, "adapter-luid", &luid, nullptr);
+      if (luid != priv->adapter_luid) {
+        /* From other GPU, system copy */
+        render_buf = gst_qml6_d3d11_sink_do_system_copy (self, buf);
+      } else {
+        /* same GPU and sharable, increase ref */
+        render_buf = gst_buffer_ref (buf);
+      }
+    } else {
+      render_buf = gst_buffer_ref (buf);
+    }
+  }
+
+  if (!render_buf) {
+    GST_ERROR_OBJECT (self, "Couldn't prepare output buffer");
+    return GST_FLOW_ERROR;
+  }
+
+  priv->prepared_buffer = render_buf;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_qml6_d3d11_sink_show_frame (GstVideoSink * sink, GstBuffer * buf)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (sink);
+  GstQml6D3D11SinkPrivate *priv = self->priv;
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+
+  if (!priv->widget) {
+    GST_ERROR_OBJECT (self, "Widget is not configured");
+    return GST_FLOW_ERROR;
+  }
+
+  if (!priv->prepared_buffer) {
+    GST_ERROR_OBJECT (self, "No prepared sample");
+    return GST_FLOW_ERROR;
+  }
+
+  priv->widget->SetBuffer (priv->prepared_buffer);
+
+  return GST_FLOW_OK;
+}
+
+static void
+gst_qml6_d3d11_sink_navigation_send_event (GstNavigation * navigation,
+    GstEvent * event)
+{
+  GstQml6D3D11Sink *self = GST_QML6_D3D11_SINK (navigation);
+
+  if (event) {
+    gboolean handled;
+
+    gst_event_ref (event);
+    handled = gst_pad_push_event (GST_VIDEO_SINK_PAD (self), event);
+    if (!handled) {
+      gst_element_post_message (GST_ELEMENT_CAST (self),
+          gst_navigation_message_new_event (GST_OBJECT_CAST (self), event));
+    }
+
+    gst_event_unref (event);
+  }
+}
+
+static void
+gst_qml6_d3d11_sink_navigation_init (GstNavigationInterface * iface)
+{
+  iface->send_event_simple = gst_qml6_d3d11_sink_navigation_send_event;
+}

gst-plugins-bad-1.24.5.tar.xz/ext/qt6d3d11/gstqml6d3d11sink.h Added

@@ -0,0 +1,31 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_QML6_D3D11_SINK (gst_qml6_d3d11_sink_get_type())
+G_DECLARE_FINAL_TYPE (GstQml6D3D11Sink, gst_qml6_d3d11_sink,
+    GST, QML6_D3D11_SINK, GstVideoSink);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/ext/qt6d3d11/gstqsg6d3d11node.cpp Added

@@ -0,0 +1,257 @@
+/* GStreamer
+ * Copyright (C) 2022 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstqsg6d3d11node.h"
+#include <wrl.h>
+
+GST_DEBUG_CATEGORY_EXTERN (gst_qt6_d3d11_debug);
+#define GST_CAT_DEFAULT gst_qt6_d3d11_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GstQSG6D3D11Node::GstQSG6D3D11Node (QQuickItem * item, GstD3D11Device * device)
+{
+  window_ = item->window ();
+  qt_device_ = (GstD3D11Device *) gst_object_ref (device);
+
+  frame_.buffer = nullptr;
+
+  gst_video_info_init (&render_info_);
+  gst_video_info_init (&info_);
+
+  setOwnsTexture (true);
+  resize (8, 8);
+
+  mapTexture ();
+}
+
+GstQSG6D3D11Node::~GstQSG6D3D11Node ()
+{
+  GST_DEBUG ("Destroying %p", this);
+
+  unmapTexture ();
+  gst_clear_buffer (&sharable_);
+  gst_clear_buffer (&backbuffer_);
+  gst_clear_buffer (&buffer_);
+  gst_clear_caps (&caps_);
+
+  if (pool_) {
+    gst_buffer_pool_set_active (pool_, FALSE);
+    gst_object_unref (pool_);
+  }
+
+  gst_clear_object (&conv_);
+  gst_clear_object (&device_);
+  gst_clear_object (&qt_device_);
+}
+
+QSGTexture *
+GstQSG6D3D11Node::texture () const
+{
+  return QSGSimpleTextureNode::texture ();
+}
+
+void
+GstQSG6D3D11Node::mapTexture ()
+{
+  if (backbuffer_) {
+    gst_video_frame_map (&frame_, &render_info_, backbuffer_,
+        (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D11));
+  }
+}
+
+void
+GstQSG6D3D11Node::unmapTexture ()
+{
+  if (frame_.buffer)
+    gst_video_frame_unmap (&frame_);
+  frame_.buffer = nullptr;
+}
+
+void
+GstQSG6D3D11Node::resize (guint width, guint height)
+{
+  GstStructure *config;
+  GstD3D11AllocationParams *params;
+  GstCaps *caps;
+  GstD3D11Memory *dmem;
+  ID3D11Texture2D *tex;
+
+  if (pool_ && width == render_info_.width && height == render_info_.height)
+    return;
+
+  gst_clear_buffer (&sharable_);
+  gst_clear_buffer (&backbuffer_);
+
+  if (pool_) {
+    gst_buffer_pool_set_active (pool_, FALSE);
+    gst_clear_object (&pool_);
+  }
+
+  pool_ = gst_d3d11_buffer_pool_new (qt_device_);
+
+  gst_video_info_set_format (&render_info_, GST_VIDEO_FORMAT_RGBA,
+      width, height);
+  render_info_.colorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_BT709;
+  caps = gst_video_info_to_caps (&render_info_);
+
+  params = gst_d3d11_allocation_params_new (qt_device_, &render_info_,
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT,
+      D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET,
+      D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX);
+
+  config = gst_buffer_pool_get_config (pool_);
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_d3d11_allocation_params_free (params);
+
+  gst_buffer_pool_config_set_params (config, caps, render_info_.size, 0, 0);
+  gst_caps_unref (caps);
+  gst_buffer_pool_set_config (pool_, config);
+  gst_buffer_pool_set_active (pool_, TRUE);
+
+  gst_buffer_pool_acquire_buffer (pool_, &backbuffer_, nullptr);
+
+  dmem = (GstD3D11Memory *) gst_buffer_peek_memory (backbuffer_, 0);
+  tex = (ID3D11Texture2D *) gst_d3d11_memory_get_resource_handle (dmem);
+  auto qt_texture = QNativeInterface::QSGD3D11Texture::fromNative (tex, window_,
+      QSize (render_info_.width, render_info_.height),
+      QQuickWindow::TextureHasAlphaChannel);
+  setTexture (qt_texture);
+}
+
+/* only called from QT rendering thread */
+void
+GstQSG6D3D11Node::SetCaps (GstCaps * caps)
+{
+  if (caps_ && caps && gst_caps_is_equal (caps_, caps))
+    return;
+
+  gst_clear_object (&conv_);
+  gst_clear_buffer (&sharable_);
+  gst_clear_buffer (&buffer_);
+
+  if (caps)
+    gst_video_info_from_caps (&info_, caps);
+  else
+    gst_video_info_init (&info_);
+
+  gst_caps_replace (&caps_, caps);
+}
+
+/* only called from QT rendering thread */
+void
+GstQSG6D3D11Node::SetBuffer (GstBuffer * buffer)
+{
+  gboolean buffer_changed;
+
+  buffer_changed = gst_buffer_replace (&buffer_, buffer);
+
+  unmapTexture ();
+
+  if (buffer_ && buffer_changed) {
+    GstD3D11Memory *dmem;
+
+    resize (info_.width, info_.height);
+
+    dmem = (GstD3D11Memory *) gst_buffer_peek_memory (buffer, 0);
+    if (dmem->device != device_) {
+      gst_clear_object (&conv_);
+      gst_clear_buffer (&sharable_);
+      gst_clear_object (&device_);
+      device_ = (GstD3D11Device *) gst_object_ref (dmem->device);
+    }
+
+    gst_d3d11_device_lock (device_);
+    if (!conv_)
+      conv_ = gst_d3d11_converter_new (device_, &info_, &render_info_, nullptr);
+
+    if (!sharable_) {
+      GstMemory *mem_wrapped;
+      ID3D11Resource *resource;
+      ComPtr < IDXGIResource > dxgi_resource;
+      ComPtr < ID3D11Texture2D > shared_texture;
+      ID3D11Device *device_handle;
+      HANDLE handle;
+
+      device_handle = gst_d3d11_device_get_device_handle (dmem->device);
+      dmem = (GstD3D11Memory *) gst_buffer_peek_memory (backbuffer_, 0);
+      resource = gst_d3d11_memory_get_resource_handle (dmem);
+      resource->QueryInterface (IID_PPV_ARGS (&dxgi_resource));
+      dxgi_resource->GetSharedHandle (&handle);
+      device_handle->OpenSharedResource (handle,
+          IID_PPV_ARGS (&shared_texture));
+
+      mem_wrapped = gst_d3d11_allocator_alloc_wrapped (nullptr, device_,
+          shared_texture.Get (), render_info_.size, nullptr, nullptr);
+
+      sharable_ = gst_buffer_new ();
+      gst_buffer_append_memory (sharable_, mem_wrapped);
+    }
+
+    if (GST_VIDEO_INFO_FORMAT (&info_) == GST_VIDEO_FORMAT_RGBA) {
+      GstMapInfo src_info, dst_info;
+      GstMemory *src_mem, *dst_mem;
+      D3D11_TEXTURE2D_DESC src_desc, dst_desc;
+      D3D11_BOX src_box;
+      ID3D11Texture2D *src_tex, *dst_tex;
+      ID3D11DeviceContext *context =
+          gst_d3d11_device_get_device_context_handle (device_);
+
+      src_mem = gst_buffer_peek_memory (buffer_, 0);
+      dst_mem = gst_buffer_peek_memory (sharable_, 0);
+
+      gst_memory_map (src_mem, &src_info,
+          (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D11));
+      gst_memory_map (dst_mem,
+          &dst_info, (GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D11));
+
+      src_tex = (ID3D11Texture2D *) src_info.data;
+      dst_tex = (ID3D11Texture2D *) dst_info.data;
+
+      src_tex->GetDesc (&src_desc);
+      dst_tex->GetDesc (&dst_desc);
+
+      src_box.left = 0;
+      src_box.top = 0;
+      src_box.front = 0;
+      src_box.back = 1;
+      src_box.right = MIN (src_desc.Width, dst_desc.Width);
+      src_box.bottom = MIN (src_desc.Height, dst_desc.Height);
+
+      context->CopySubresourceRegion (dst_tex, 0,
+          0, 0, 0, src_tex, 0, &src_box);
+      gst_memory_unmap (src_mem, &src_info);
+      gst_memory_unmap (dst_mem, &dst_info);
+    } else {
+      gst_d3d11_converter_convert_buffer_unlocked (conv_, buffer_, sharable_);
+    }
+    gst_d3d11_device_unlock (device_);
+
+    markDirty (QSGNode::DirtyMaterial);
+  }
+
+  mapTexture ();
+}

gst-plugins-bad-1.24.5.tar.xz/ext/qt6d3d11/gstqsg6d3d11node.h Added

@@ -0,0 +1,62 @@
+/* GStreamer
+ * Copyright (C) 2022 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/d3d11/gstd3d11.h>
+#include <QtQuick/QQuickItem>
+#include <QtQuick/QSGTexture>
+#include <QtQuick/QSGTextureProvider>
+#include <QtQuick/QSGSimpleTextureNode>
+
+class GstQSG6D3D11Node : public QSGTextureProvider, public QSGSimpleTextureNode
+{
+  Q_OBJECT
+
+public:
+  GstQSG6D3D11Node (QQuickItem * item, GstD3D11Device * device);
+  ~GstQSG6D3D11Node ();
+
+  QSGTexture *texture() const override;
+
+  void SetCaps (GstCaps * caps);
+  void SetBuffer (GstBuffer * buffer);
+
+private:
+  void resize (guint width, guint height);
+  void mapTexture ();
+  void unmapTexture ();
+
+private:
+  QQuickWindow *window_;
+  GstD3D11Device *qt_device_;
+  GstD3D11Device *device_ = nullptr;
+  GstBuffer *buffer_ = nullptr;
+  GstCaps *caps_ = nullptr;
+  GstBuffer *sharable_ = nullptr;
+  GstBuffer *backbuffer_ = nullptr;
+  GstVideoFrame frame_;
+  GstVideoInfo info_;
+  GstVideoInfo render_info_;
+  GstBufferPool *pool_ = nullptr;
+  GstD3D11Converter *conv_ = nullptr;
+};

gst-plugins-bad-1.24.5.tar.xz/ext/qt6d3d11/gstqt6d3d11videoitem.cpp Added

@@ -0,0 +1,634 @@
+/* GStreamer
+ * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/d3d11/gstd3d11.h>
+#include <gst/d3d11/gstd3d11-private.h>
+#include "gstqt6d3d11videoitem.h"
+#include "gstqsg6d3d11node.h"
+
+GST_DEBUG_CATEGORY_EXTERN (gst_qt6_d3d11_debug);
+#define GST_CAT_DEFAULT gst_qt6_d3d11_debug
+
+void
+GstQt6D3D11VideoItemProxy::InvalidateRef (void)
+{
+  std::lock_guard < std::mutex > lk (lock);
+  item = nullptr;
+}
+
+void
+GstQt6D3D11VideoItemProxy::SetSink (GstElement * sink)
+{
+  std::lock_guard < std::mutex > lk (lock);
+  if (!item)
+    return;
+
+  item->setSink (sink);
+}
+
+void
+GstQt6D3D11VideoItemProxy::SetCaps (GstCaps * caps)
+{
+  std::lock_guard < std::mutex > lk (lock);
+  if (!item)
+    return;
+
+  item->setCaps (caps);
+}
+
+void
+GstQt6D3D11VideoItemProxy::SetBuffer (GstBuffer * buffer)
+{
+  std::lock_guard < std::mutex > lk (lock);
+  if (!item)
+    return;
+
+  item->setBuffer (buffer);
+}
+
+void
+GstQt6D3D11VideoItemProxy::SetForceAspectRatio (bool force)
+{
+  std::lock_guard < std::mutex > lk (lock);
+  if (!item)
+    return item->setForceAspectRatio (force);
+}
+
+gint64
+GstQt6D3D11VideoItemProxy::AdapterLuid ()
+{
+  std::lock_guard < std::mutex > lk (lock);
+  if (!item)
+    return 0;
+
+  return item->AdapterLuid ();
+}
+
+GstQt6D3D11VideoItem *
+GstQt6D3D11VideoItemProxy::Item (void)
+{
+  std::lock_guard < std::mutex > lk (lock);
+
+  return item;
+}
+
+GstQt6D3D11VideoItem::GstQt6D3D11VideoItem ()
+{
+  g_weak_ref_init (&sink_, nullptr);
+
+  connect (this, &QQuickItem::windowChanged, this,
+      &GstQt6D3D11VideoItem::handleWindowChanged);
+
+  proxy_ = QSharedPointer < GstQt6D3D11VideoItemProxy >
+      (new GstQt6D3D11VideoItemProxy (this));
+
+  setFlag (ItemHasContents, true);
+  setAcceptedMouseButtons (Qt::AllButtons);
+  setAcceptHoverEvents (true);
+  setAcceptTouchEvents (true);
+
+  gst_video_info_init (&info_);
+
+  GST_DEBUG ("%p New Qt6 Video Item", this);
+}
+
+GstQt6D3D11VideoItem::~GstQt6D3D11VideoItem ()
+{
+  GST_DEBUG ("%p Destroying Qt6 Video Item", this);
+
+  proxy_->InvalidateRef ();
+  proxy_.clear ();
+
+  gst_clear_buffer (&buffer_);
+  gst_clear_caps (&caps_);
+
+  g_weak_ref_clear (&sink_);
+}
+
+QSharedPointer < GstQt6D3D11VideoItemProxy > GstQt6D3D11VideoItem::Proxy (void)
+{
+  return proxy_;
+}
+
+void
+GstQt6D3D11VideoItem::setSink (GstElement * sink)
+{
+  std::lock_guard < std::mutex > lk (lock_);
+  g_weak_ref_set (&sink_, sink);
+}
+
+void
+GstQt6D3D11VideoItem::setCaps (GstCaps * caps)
+{
+  std::lock_guard < std::mutex > lk (lock_);
+  guint num, den;
+
+  gst_caps_replace (&caps_, caps);
+  gst_video_info_from_caps (&info_, caps);
+
+  gst_video_calculate_display_ratio (&num, &den, info_.width, info_.height,
+      info_.par_n, info_.par_d, 1, 1);
+
+  display_width_ = info_.width;
+  display_height_ = info_.height;
+
+  if (display_width_ % num == 0) {
+    display_height_ = gst_util_uint64_scale_int (display_width_, den, num);
+  } else {
+    display_width_ = gst_util_uint64_scale_int (display_height_, num, den);
+  }
+
+  update_par_ = true;
+}
+
+void
+GstQt6D3D11VideoItem::setBuffer (GstBuffer * buffer)
+{
+  std::lock_guard < std::mutex > lk (lock_);
+
+  gst_buffer_replace (&buffer_, buffer);
+
+  if (this->window_)
+    QMetaObject::invokeMethod (this->window_, "update", Qt::QueuedConnection);
+}
+
+void
+GstQt6D3D11VideoItem::setForceAspectRatio (bool force)
+{
+  std::lock_guard < std::mutex > lk (lock_);
+
+  if (force != force_aspect_ratio_)
+    update_par_ = true;
+
+  force_aspect_ratio_ = force;
+}
+
+gint64
+GstQt6D3D11VideoItem::AdapterLuid (void)
+{
+  std::lock_guard < std::mutex > lk (lock_);
+
+  if (!qt_device_)
+    return 0;
+
+  return luid_;
+}
+
+void
+GstQt6D3D11VideoItem::handleWindowChanged (QQuickWindow * window)
+{
+  if (window) {
+    connect (window, &QQuickWindow::beforeSynchronizing, this,
+        &GstQt6D3D11VideoItem::onBeforeSynchronizing, Qt::DirectConnection);
+    connect (window, &QQuickWindow::sceneGraphInvalidated, this,
+        &GstQt6D3D11VideoItem::onSceneGraphInvalidated, Qt::DirectConnection);
+  } else {
+    gst_clear_object (&qt_device_);
+    window_ = nullptr;
+  }
+  node_ = nullptr;
+}
+
+QSGNode *
+GstQt6D3D11VideoItem::updatePaintNode (QSGNode * old_node,
+    UpdatePaintNodeData * data)
+{
+  if (!qt_device_)
+    return old_node;
+
+  GstQSG6D3D11Node *new_node = static_cast < GstQSG6D3D11Node * >(old_node);
+  GstVideoRectangle src, dst, result;
+
+  std::lock_guard < std::mutex > lk (lock_);
+
+  GST_TRACE ("%p updatePaintNode", this);
+
+  if (!new_node) {
+    bool is_smooth = this->smooth ();
+    new_node = new GstQSG6D3D11Node (this, qt_device_);
+    new_node->setFiltering (is_smooth ? QSGTexture::Filtering::Linear :
+        QSGTexture::Filtering::Nearest);
+  }
+
+  if (force_aspect_ratio_ && caps_) {
+    src.w = display_width_;
+    src.h = display_height_;
+
+    dst.x = boundingRect ().x ();
+    dst.y = boundingRect ().y ();
+    dst.w = boundingRect ().width ();
+    dst.h = boundingRect ().height ();
+
+    gst_video_sink_center_rect (src, dst, &result, TRUE);
+  } else {
+    result.x = boundingRect ().x ();
+    result.y = boundingRect ().y ();
+    result.w = boundingRect ().width ();
+    result.h = boundingRect ().height ();
+  }
+
+  new_node->setRect (QRectF (result.x, result.y, result.w, result.h));
+  node_ = new_node;
+  if (caps_ || !force_aspect_ratio_)
+    update_par_ = false;
+  else
+    update_par_ = true;
+
+  return new_node;
+}
+
+void
+GstQt6D3D11VideoItem::onBeforeSynchronizing (void)
+{
+  QSGRendererInterface *iface;
+  QQuickWindow *window;
+  ID3D11Device *device;
+  std::unique_lock < std::mutex > lk (lock_);
+
+  if (window_)
+    return;
+
+  GST_DEBUG ("%p Scene graph initialized", this);
+
+  window = this->window ();
+
+  if (!window) {
+    GST_WARNING ("Initialized scene graph has no associated window");
+    return;
+  }
+
+  iface = window->rendererInterface ();
+  if (!iface) {
+    GST_WARNING ("Couldn't get renderer interface");
+    return;
+  }
+
+  if (iface->graphicsApi () != QSGRendererInterface::Direct3D11) {
+    GST_WARNING ("Not a d3d11 api");
+    return;
+  }
+
+  device = reinterpret_cast < ID3D11Device * >(iface->getResource (window,
+          QSGRendererInterface::DeviceResource));
+  if (!device) {
+    GST_WARNING ("Couldn't get d3d11 device");
+    return;
+  }
+
+  qt_device_ = gst_d3d11_device_new_wrapped (device);
+  g_object_get (qt_device_, "adapter-luid", &luid_, nullptr);
+  window_ = window;
+
+  lk.unlock ();
+
+  connect (window, &QQuickWindow::beforeRendering, this,
+      &GstQt6D3D11VideoItem::onBeforeRendering, Qt::DirectConnection);
+}
+
+void
+GstQt6D3D11VideoItem::onSceneGraphInvalidated (void)
+{
+  std::unique_lock < std::mutex > lk (lock_);
+
+  GST_DEBUG ("%p Scene graph invalidated", this);
+
+  gst_clear_object (&qt_device_);
+  window_ = nullptr;
+  node_ = nullptr;
+}
+
+void
+GstQt6D3D11VideoItem::onBeforeRendering (void)
+{
+  std::lock_guard < std::mutex > lk (lock_);
+
+  if (update_par_ && caps_ && node_) {
+    GstVideoRectangle src, dst, result;
+
+    GST_DEBUG ("Updating node rect");
+
+    if (force_aspect_ratio_ && caps_) {
+      src.w = display_width_;
+      src.h = display_height_;
+
+      dst.x = boundingRect ().x ();
+      dst.y = boundingRect ().y ();
+      dst.w = boundingRect ().width ();
+      dst.h = boundingRect ().height ();
+
+      gst_video_sink_center_rect (src, dst, &result, TRUE);
+    } else {
+      result.x = boundingRect ().x ();
+      result.y = boundingRect ().y ();
+      result.w = boundingRect ().width ();
+      result.h = boundingRect ().height ();
+    }
+
+    node_->setRect (QRectF (result.x, result.y, result.w, result.h));
+    update_par_ = false;
+  }
+
+  if (node_) {
+    node_->SetCaps (caps_);
+    node_->SetBuffer (buffer_);
+  }
+
+  return;
+}
+
+void
+GstQt6D3D11VideoItem::hoverEnterEvent (QHoverEvent * event)
+{
+  mouse_hovering_ = true;
+}
+
+void
+GstQt6D3D11VideoItem::hoverLeaveEvent (QHoverEvent * event)
+{
+  mouse_hovering_ = false;
+}
+
+void
+GstQt6D3D11VideoItem::fitStreamToAllocatedSize (GstVideoRectangle * result)
+{
+  if (force_aspect_ratio_) {
+    GstVideoRectangle src, dst;
+
+    src.x = 0;
+    src.y = 0;
+    src.w = display_width_;
+    src.h = display_height_;
+
+    dst.x = 0;
+    dst.y = 0;
+    dst.w = width ();
+    dst.h = height ();
+
+    gst_video_sink_center_rect (src, dst, result, TRUE);
+  } else {
+    result->x = 0;
+    result->y = 0;
+    result->w = width ();
+    result->h = height ();
+  }
+}
+
+QPointF
+GstQt6D3D11VideoItem::mapPointToStreamSize (QPointF pos)
+{
+  gdouble stream_width, stream_height;
+  GstVideoRectangle result;
+  double stream_x, stream_y;
+  double x, y;
+
+  fitStreamToAllocatedSize (&result);
+
+  stream_width = (gdouble) GST_VIDEO_INFO_WIDTH (&info_);
+  stream_height = (gdouble) GST_VIDEO_INFO_HEIGHT (&info_);
+  x = pos.x ();
+  y = pos.y ();
+
+  /* from display coordinates to stream coordinates */
+  if (result.w > 0)
+    stream_x = (x - result.x) / result.w * stream_width;
+  else
+    stream_x = 0.;
+
+  /* clip to stream size */
+  stream_x = CLAMP (stream_x, 0., stream_width);
+
+  /* same for y-axis */
+  if (result.h > 0)
+    stream_y = (y - result.y) / result.h * stream_height;
+  else
+    stream_y = 0.;
+
+  stream_y = CLAMP (stream_y, 0., stream_height);
+
+  return QPointF (stream_x, stream_y);
+}
+
+static GstNavigationModifierType
+translateModifiers (Qt::KeyboardModifiers modifiers)
+{
+  return (GstNavigationModifierType) (
+      ((modifiers & Qt::KeyboardModifier::ShiftModifier) ?
+          GST_NAVIGATION_MODIFIER_SHIFT_MASK : 0) | ((modifiers &
+              Qt::KeyboardModifier::ControlModifier) ?
+          GST_NAVIGATION_MODIFIER_CONTROL_MASK : 0) | ((modifiers &
+              Qt::
+              KeyboardModifier::AltModifier) ? GST_NAVIGATION_MODIFIER_MOD1_MASK
+          : 0) | ((modifiers & Qt::
+              KeyboardModifier::MetaModifier) ?
+          GST_NAVIGATION_MODIFIER_META_MASK : 0));
+}
+
+static GstNavigationModifierType
+translateMouseButtons (Qt::MouseButtons buttons)
+{
+  return (GstNavigationModifierType) (
+      ((buttons & Qt::LeftButton) ? GST_NAVIGATION_MODIFIER_BUTTON1_MASK : 0) |
+      ((buttons & Qt::RightButton) ? GST_NAVIGATION_MODIFIER_BUTTON2_MASK : 0) |
+      ((buttons & Qt::MiddleButton) ? GST_NAVIGATION_MODIFIER_BUTTON3_MASK : 0)
+      | ((buttons & Qt::BackButton) ? GST_NAVIGATION_MODIFIER_BUTTON4_MASK : 0)
+      | ((buttons & Qt::ForwardButton) ? GST_NAVIGATION_MODIFIER_BUTTON5_MASK :
+          0));
+}
+
+void
+GstQt6D3D11VideoItem::hoverMoveEvent (QHoverEvent * event)
+{
+  if (!mouse_hovering_)
+    return;
+
+  if (event->position () == event->oldPos ())
+    return;
+
+  std::lock_guard < std::mutex > lk (lock_);
+  if (GST_VIDEO_INFO_FORMAT (&info_) == GST_VIDEO_FORMAT_UNKNOWN)
+    return;
+
+  GstElement *sink = (GstElement *) g_weak_ref_get (&sink_);
+  if (!sink)
+    return;
+
+  auto pos = mapPointToStreamSize (event->position ());
+  gst_navigation_send_event_simple (GST_NAVIGATION (sink),
+      gst_navigation_event_new_mouse_move (pos.x (), pos.y (),
+          translateModifiers (event->modifiers ())));
+
+  gst_object_unref (sink);
+}
+
+void
+GstQt6D3D11VideoItem::touchEvent (QTouchEvent * event)
+{
+  std::lock_guard < std::mutex > lk (lock_);
+  if (GST_VIDEO_INFO_FORMAT (&info_) == GST_VIDEO_FORMAT_UNKNOWN)
+    return;
+
+  GstElement *sink = (GstElement *) g_weak_ref_get (&sink_);
+  if (!sink)
+    return;
+
+  if (event->type () == QEvent::TouchCancel) {
+    gst_navigation_send_event_simple (GST_NAVIGATION (sink),
+        gst_navigation_event_new_touch_cancel (translateModifiers
+            (event->modifiers ())));
+  } else {
+    const QList < QTouchEvent::TouchPoint > points = event->points ();
+    gboolean sent_event = FALSE;
+
+    for (int i = 0; i < points.count (); i++) {
+      GstEvent *nav_event;
+      QPointF pos = mapPointToStreamSize (pointsi.position ());
+
+      switch (pointsi.state ()) {
+        case QEventPoint::Pressed:
+          nav_event =
+              gst_navigation_event_new_touch_down ((guint) pointsi.id (),
+              pos.x (), pos.y (), (gdouble) pointsi.pressure (),
+              translateModifiers (event->modifiers ()));
+          break;
+        case QEventPoint::Updated:
+          nav_event =
+              gst_navigation_event_new_touch_motion ((guint) pointsi.id (),
+              pos.x (), pos.y (), (gdouble) pointsi.pressure (),
+              translateModifiers (event->modifiers ()));
+          break;
+        case QEventPoint::Released:
+          nav_event =
+              gst_navigation_event_new_touch_up ((guint) pointsi.id (),
+              pos.x (), pos.y (), translateModifiers (event->modifiers ()));
+          break;
+          /* Don't send an event if the point did not change */
+        default:
+          nav_event = nullptr;
+          break;
+      }
+
+      if (nav_event) {
+        gst_navigation_send_event_simple (GST_NAVIGATION (sink), nav_event);
+        sent_event = TRUE;
+      }
+    }
+
+    /* Group simultaneous touch events with a frame event */
+    if (sent_event) {
+      gst_navigation_send_event_simple (GST_NAVIGATION (sink),
+          gst_navigation_event_new_touch_frame (translateModifiers
+              (event->modifiers ())));
+    }
+  }
+
+  gst_object_unref (sink);
+}
+
+void
+GstQt6D3D11VideoItem::sendMouseEvent (QMouseEvent * event, gboolean is_press)
+{
+  std::lock_guard < std::mutex > lk (lock_);
+  if (GST_VIDEO_INFO_FORMAT (&info_) == GST_VIDEO_FORMAT_UNKNOWN)
+    return;
+
+  GstElement *sink = (GstElement *) g_weak_ref_get (&sink_);
+  if (!sink)
+    return;
+
+  gint button = 0;
+  switch (event->button ()) {
+    case Qt::LeftButton:
+      button = 1;
+      break;
+    case Qt::RightButton:
+      button = 2;
+      break;
+    case Qt::MiddleButton:
+      button = 3;
+    default:
+      break;
+  }
+
+  auto pos = mapPointToStreamSize (event->pos ());
+  GstEvent *navi;
+  GstNavigationModifierType type = (GstNavigationModifierType)
+      (translateModifiers (event->modifiers ()) |
+      translateMouseButtons (event->buttons ()));
+  if (is_press) {
+    navi = gst_navigation_event_new_mouse_button_press (button,
+        pos.x (), pos.y (), type);
+  } else {
+    navi = gst_navigation_event_new_mouse_button_release (button,
+        pos.x (), pos.y (), type);
+  }
+
+  gst_navigation_send_event_simple (GST_NAVIGATION (sink), navi);
+  gst_object_unref (sink);
+}
+
+void
+GstQt6D3D11VideoItem::mousePressEvent (QMouseEvent * event)
+{
+  sendMouseEvent (event, TRUE);
+}
+
+void
+GstQt6D3D11VideoItem::mouseReleaseEvent (QMouseEvent * event)
+{
+  sendMouseEvent (event, FALSE);
+}
+
+void
+GstQt6D3D11VideoItem::wheelEvent (QWheelEvent * event)
+{
+  std::lock_guard < std::mutex > lk (lock_);
+  if (GST_VIDEO_INFO_FORMAT (&info_) == GST_VIDEO_FORMAT_UNKNOWN)
+    return;
+
+  GstElement *sink = (GstElement *) g_weak_ref_get (&sink_);
+  if (!sink)
+    return;
+
+  auto pos = mapPointToStreamSize (event->position ());
+  auto delta = event->angleDelta ();
+  GstNavigationModifierType type = (GstNavigationModifierType)
+      (translateModifiers (event->modifiers ()) |
+      translateMouseButtons (event->buttons ()));
+
+  gst_navigation_send_event_simple (GST_NAVIGATION (sink),
+      gst_navigation_event_new_mouse_scroll (pos.x (), pos.y (),
+          delta.x (), delta.y (), type));
+  gst_object_unref (sink);
+}
+
+void
+gst_qt6_d3d11_video_item_init_once (void)
+{
+  GST_D3D11_CALL_ONCE_BEGIN {
+    qmlRegisterType < GstQt6D3D11VideoItem >
+        ("org.freedesktop.gstreamer.Qt6D3D11VideoItem",
+        1, 0, "GstD3D11Qt6VideoItem");
+  } GST_D3D11_CALL_ONCE_END;
+}

gst-plugins-bad-1.24.5.tar.xz/ext/qt6d3d11/gstqt6d3d11videoitem.h Added

@@ -0,0 +1,119 @@
+/* GStreamer
+ * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/d3d11/gstd3d11.h>
+#include <QQuickItem>
+#include <QQuickWindow>
+#include <mutex>
+#include "gstqsg6d3d11node.h"
+
+class GstQt6D3D11VideoItem;
+
+class GstQt6D3D11VideoItemProxy : public QObject
+{
+  Q_OBJECT
+  QML_ELEMENT
+
+public:
+  GstQt6D3D11VideoItemProxy (GstQt6D3D11VideoItem * videoItem)
+    : item (videoItem)
+  {
+  }
+
+  void InvalidateRef (void);
+
+  void SetSink (GstElement * sink);
+  void SetCaps (GstCaps * caps);
+  void SetBuffer (GstBuffer * buffer);
+  void SetForceAspectRatio (bool force);
+
+  gint64 AdapterLuid (void);
+  GstQt6D3D11VideoItem * Item (void);
+
+private:
+  GstQt6D3D11VideoItem *item;
+  std::mutex lock;
+};
+
+class GstQt6D3D11VideoItem : public QQuickItem
+{
+  friend class GstQt6D3D11VideoItemProxy;
+
+  Q_OBJECT
+  QML_ELEMENT
+
+public:
+  GstQt6D3D11VideoItem ();
+  ~GstQt6D3D11VideoItem ();
+
+  QSharedPointer<GstQt6D3D11VideoItemProxy> Proxy (void);
+
+protected:
+  QSGNode * updatePaintNode (QSGNode * oldNode, UpdatePaintNodeData * data);
+  void hoverEnterEvent (QHoverEvent * event);
+  void hoverLeaveEvent (QHoverEvent * event);
+  void hoverMoveEvent (QHoverEvent * event);
+  void touchEvent (QTouchEvent * event);
+  void mousePressEvent (QMouseEvent * event);
+  void mouseReleaseEvent (QMouseEvent * event);
+  void wheelEvent (QWheelEvent * event);
+
+private:
+  void setSink (GstElement * sink);
+  void setCaps (GstCaps * caps);
+  void setBuffer (GstBuffer * buffer);
+  void setForceAspectRatio (bool force);
+  gint64 AdapterLuid ();
+  void fitStreamToAllocatedSize (GstVideoRectangle * result);
+  QPointF mapPointToStreamSize (QPointF point);
+  void sendMouseEvent (QMouseEvent * event, gboolean is_press);
+  void clearResource ();
+  void clearFrameResource ();
+  bool setupShader ();
+
+private slots:
+  void handleWindowChanged (QQuickWindow * window);
+  void onBeforeSynchronizing (void);
+  void onSceneGraphInvalidated (void);
+  void onBeforeRendering (void);
+
+private:
+  QSharedPointer<GstQt6D3D11VideoItemProxy> proxy_;
+  QQuickWindow *window_ = nullptr;
+  GstCaps *caps_ = nullptr;
+  GstBuffer *buffer_ = nullptr;
+  bool force_aspect_ratio_ = true;
+  gint64 luid_ = 0;
+  GstVideoInfo info_;
+  int display_width_ = 0;
+  int display_height_ = 0;
+  GWeakRef sink_;
+  std::mutex lock_;
+  bool mouse_hovering_ = false;
+  bool update_par_ = false;
+  GstD3D11Device *qt_device_ = nullptr;
+  GstQSG6D3D11Node *node_ = nullptr;
+};
+
+void gst_qt6_d3d11_video_item_init_once (void);

gst-plugins-bad-1.24.5.tar.xz/ext/qt6d3d11/meson.build Added

@@ -0,0 +1,53 @@
+gstqt6d3d11_sources = 
+  'gstqml6d3d11sink.cpp',
+  'gstqsg6d3d11node.cpp',
+  'gstqt6d3d11videoitem.cpp',
+  'plugin.cpp',
+
+
+moc_headers = 
+  'gstqsg6d3d11node.h',
+  'gstqt6d3d11videoitem.h'
+
+
+have_qt6d3d11 = false
+
+qt6_option = get_option('qt6d3d11')
+if qt6_option.disabled()
+  subdir_done()
+endif
+
+if not gstd3d11_dep.found()
+  if qt6_option.enabled()
+    error('qt6 plugin was enabled explicitly, but required d3d11 dep was not found')
+  else
+    subdir_done()
+  endif
+endif
+
+qt6_mod = import('qt6')
+if not qt6_mod.has_tools()
+  if qt6_option.enabled()
+    error('qt6 plugin was enabled, but qt specific tools were not found')
+  endif
+  subdir_done()
+endif
+
+qt6qml_dep = dependency('qt6', modules : 'Core', 'Gui', 'Qml', 'Quick',
+                        required: qt6_option)
+if not qt6qml_dep.found()
+  subdir_done()
+endif
+
+have_qt6d3d11 = true
+moc_files = qt6_mod.preprocess(moc_headers : moc_headers)
+gstqt6d3d11 = library('gstqt6d3d11', gstqt6d3d11_sources, moc_files,
+  c_args : gst_plugins_bad_args + '-DGST_USE_UNSTABLE_API',
+  cpp_args : gst_plugins_bad_args + '-DGST_USE_UNSTABLE_API',
+  include_directories: configinc, libsinc,
+  dependencies : gst_dep, gstvideo_dep, gstd3d11_dep, qt6qml_dep,
+  override_options : 'cpp_std=c++17',
+  install: true,
+  install_dir : plugins_install_dir
+)
+plugins += gstqt6d3d11

gst-plugins-bad-1.24.5.tar.xz/ext/qt6d3d11/plugin.cpp Added

gst-plugins-bad-1.22.7.tar.xz/ext/resindvd/resindvdbin.c -> gst-plugins-bad-1.24.5.tar.xz/ext/resindvd/resindvdbin.c Changed

@@ -356,7 +356,7 @@
 {
   gst_object_unref (ctx->dvdbin);
   gst_object_unref (ctx->pad);
-  g_slice_free (RsnDvdBinPadBlockCtx, ctx);
+  g_free (ctx);
 }
 
 #if DEBUG_TIMING
@@ -505,7 +505,7 @@
   if (dvdbin->video_pad == NULL)
     goto failed_video_ghost;
   gst_pad_set_active (dvdbin->video_pad, TRUE);
-  bctx = g_slice_new (RsnDvdBinPadBlockCtx);
+  bctx = g_new (RsnDvdBinPadBlockCtx, 1);
   bctx->dvdbin = gst_object_ref (dvdbin);
   bctx->pad = gst_object_ref (dvdbin->video_pad);
   bctx->pad_block_id =
@@ -559,7 +559,7 @@
   if (dvdbin->subpicture_pad == NULL)
     goto failed_spu_ghost;
   gst_pad_set_active (dvdbin->subpicture_pad, TRUE);
-  bctx = g_slice_new (RsnDvdBinPadBlockCtx);
+  bctx = g_new (RsnDvdBinPadBlockCtx, 1);
   bctx->dvdbin = gst_object_ref (dvdbin);
   bctx->pad = gst_object_ref (dvdbin->subpicture_pad);
   bctx->pad_block_id =
@@ -599,7 +599,7 @@
   if (dvdbin->audio_pad == NULL)
     goto failed_aud_ghost;
   gst_pad_set_active (dvdbin->audio_pad, TRUE);
-  bctx = g_slice_new (RsnDvdBinPadBlockCtx);
+  bctx = g_new (RsnDvdBinPadBlockCtx, 1);
   bctx->dvdbin = gst_object_ref (dvdbin);
   bctx->pad = gst_object_ref (dvdbin->audio_pad);
   bctx->pad_block_id =

gst-plugins-bad-1.22.7.tar.xz/ext/resindvd/resindvdsrc.c -> gst-plugins-bad-1.24.5.tar.xz/ext/resindvd/resindvdsrc.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/resindvd/rsninputselector.c -> gst-plugins-bad-1.24.5.tar.xz/ext/resindvd/rsninputselector.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/sctp/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/sctp/meson.build Changed

@@ -5,7 +5,8 @@
   'sctpassociation.c'
 
 
-if get_option('sctp').disabled()
+sctp_option = get_option('sctp').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled')
+if sctp_option.disabled()
   subdir_done()
 endif
 
@@ -23,7 +24,7 @@
   found_system_usrsctp = sctp_dep.found() and sctp_header
 
   if get_option('sctp-internal-usrsctp').disabled() and not found_system_usrsctp
-    if get_option('sctp').enabled()
+    if sctp_option.enabled()
       error('sctp plugin enabled but could not find libusrsctp or usrsctp.h, and internal libusrsctp disabled')
     else
       message('Could not find libusrsctp or usrsctp.h, and internal libusrsctp disabled - not building sctp plugin')
@@ -37,7 +38,7 @@
   subdir('usrsctp')
   sctp_dep = usrsctp_dep
   sctp_header = true
-  if get_option('sctp').enabled() and not sctp_dep.found()
+  if sctp_option.enabled() and not sctp_dep.found()
     error('sctp plugin enabled but could not find system libusrsctp or configure internal libusrsctp')
   endif
 endif

gst-plugins-bad-1.22.7.tar.xz/ext/sctp/usrsctp/usrsctplib/netinet/sctp_pcb.c -> gst-plugins-bad-1.24.5.tar.xz/ext/sctp/usrsctp/usrsctplib/netinet/sctp_pcb.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/sctp/usrsctp/usrsctplib/netinet/sctp_sysctl.c -> gst-plugins-bad-1.24.5.tar.xz/ext/sctp/usrsctp/usrsctplib/netinet/sctp_sysctl.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/soundtouch/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/soundtouch/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/ext/srt/gstsrtobject.c -> gst-plugins-bad-1.24.5.tar.xz/ext/srt/gstsrtobject.c Changed

@@ -37,9 +37,20 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_debug_srtobject);
 #define GST_CAT_DEFAULT gst_debug_srtobject
 
+#define ERROR_TO_WARNING(srtobject, error, suffix)                             \
+G_STMT_START {                                                                 \
+  gchar *text;                                                                 \
+  g_assert (error);                                                            \
+  text = g_strdup_printf ("%s%s", (error)->message, (suffix));                 \
+  GST_WARNING_OBJECT ((srtobject)->element, "warning: %s", text);              \
+  gst_element_message_full ((srtobject)->element, GST_MESSAGE_WARNING,         \
+    (error)->domain, (error)->code, text, NULL, __FILE__, GST_FUNCTION,        \
+    __LINE__);                                                                 \
+} G_STMT_END
+
 #if SRT_VERSION_VALUE > 0x10402
-#define REASON_FORMAT "s"
-#define REASON_ARGS(reason) srt_rejectreason_str (reason)
+#define REASON_FORMAT "s (%d)"
+#define REASON_ARGS(reason) srt_rejectreason_str (reason), (reason)
 #else
 /* srt_rejectreason_str() is unavailable in libsrt 1.4.2 and prior due to
  * unexported symbol. See https://github.com/Haivision/srt/pull/1728. */
@@ -128,6 +139,7 @@
 
 static const bool bool_false = false;
 static const bool bool_true = true;
+static const int32_t int32_zero = 0;
 static const struct linger no_linger = { 0, 0 };
 
 /* *INDENT-OFF* */
@@ -136,6 +148,7 @@
   {"SRTO_RCVSYN",    SRTO_RCVSYN,    &bool_false, sizeof bool_false}, /* non-blocking */
   {"SRTO_LINGER",    SRTO_LINGER,    &no_linger,  sizeof no_linger},  /* no linger time */
   {"SRTO_TSBPDMODE", SRTO_TSBPDMODE, &bool_true,  sizeof bool_true},  /* Timestamp-based Packet Delivery mode must be enabled */
+  {"SRTO_IPV6ONLY",  SRTO_IPV6ONLY,  &int32_zero, sizeof int32_zero}, /* must be either 0 or 1 before binding to :: */
   {NULL, -1, NULL, 0},
 };
 /* *INDENT-ON* */
@@ -192,7 +205,7 @@
 
 static GSocketAddress *
 gst_srt_object_resolve (GstSRTObject * srtobject, const gchar * address,
-    guint port, GCancellable * cancellable, GError ** err_out)
+    guint port, GError ** err_out)
 {
   GError *err = NULL;
   GSocketAddress *saddr;
@@ -205,7 +218,9 @@
     GST_DEBUG_OBJECT (srtobject->element, "resolving IP address for host %s",
         address);
     resolver = g_resolver_get_default ();
-    results = g_resolver_lookup_by_name (resolver, address, cancellable, &err);
+    results =
+        g_resolver_lookup_by_name (resolver, address, srtobject->cancellable,
+        &err);
     if (!results)
       goto name_resolve;
 
@@ -336,6 +351,7 @@
 gst_srt_object_new (GstElement * element)
 {
   GstSRTObject *srtobject;
+  gint fd, fd_flags = SRT_EPOLL_ERR | SRT_EPOLL_IN;
 
   if (g_atomic_int_add (&srt_init_refcount, 1) == 0) {
     GST_DEBUG_OBJECT (element, "Starting up SRT");
@@ -347,15 +363,19 @@
 
   srtobject = g_new0 (GstSRTObject, 1);
   srtobject->element = element;
+  srtobject->cancellable = g_cancellable_new ();
   srtobject->parameters = gst_structure_new_empty ("application/x-srt-params");
   srtobject->sock = SRT_INVALID_SOCK;
   srtobject->poll_id = srt_epoll_create ();
-  srtobject->listener_sock = SRT_INVALID_SOCK;
-  srtobject->listener_poll_id = SRT_ERROR;
   srtobject->sent_headers = FALSE;
   srtobject->wait_for_connection = GST_SRT_DEFAULT_WAIT_FOR_CONNECTION;
   srtobject->auto_reconnect = GST_SRT_DEFAULT_AUTO_RECONNECT;
 
+  fd = g_cancellable_get_fd (srtobject->cancellable);
+  if (fd >= 0)
+    srt_epoll_add_ssock (srtobject->poll_id, fd, &fd_flags);
+  g_cancellable_cancel (srtobject->cancellable);
+
   g_cond_init (&srtobject->sock_cond);
   return srtobject;
 }
@@ -382,6 +402,7 @@
   }
 
   g_clear_pointer (&srtobject->uri, gst_uri_unref);
+  g_clear_object (&srtobject->cancellable);
 
   g_free (srtobject);
 }
@@ -924,92 +945,129 @@
 thread_func (gpointer data)
 {
   GstSRTObject *srtobject = data;
-  SRTSOCKET caller_sock;
-  union
-  {
-    struct sockaddr_storage ss;
-    struct sockaddr sa;
-  } caller_sa;
-  int caller_sa_len = sizeof (caller_sa);
-
   gint poll_timeout;
 
-  SRTSOCKET rsock;
-  gint rsocklen = 1;
+  GST_OBJECT_LOCK (srtobject->element);
+  if (!gst_structure_get_int (srtobject->parameters, "poll-timeout",
+          &poll_timeout)) {
+    poll_timeout = GST_SRT_DEFAULT_POLL_TIMEOUT;
+  }
+  GST_OBJECT_UNLOCK (srtobject->element);
 
   for (;;) {
+    SRTSOCKET rsock;
+    gint rsocklen = 1;
+    SYSSOCKET rsys, wsys;
+    gint rsyslen = 1, wsyslen = 1;
+    gint ret;
+    SRTSOCKET caller_sock;
+    union
+    {
+      struct sockaddr_storage ss;
+      struct sockaddr sa;
+    } caller_sa;
+    int caller_sa_len = sizeof (caller_sa);
+    SRTCaller *caller;
+    gint flag = SRT_EPOLL_ERR;
+    gint fd, fd_flags = SRT_EPOLL_ERR | SRT_EPOLL_IN;
+
     GST_OBJECT_LOCK (srtobject->element);
-    if (!gst_structure_get_int (srtobject->parameters, "poll-timeout",
-            &poll_timeout)) {
-      poll_timeout = GST_SRT_DEFAULT_POLL_TIMEOUT;
+    if (!srtobject->opened) {
+      GST_OBJECT_UNLOCK (srtobject->element);
+      break;
     }
     GST_OBJECT_UNLOCK (srtobject->element);
 
-    GST_DEBUG_OBJECT (srtobject->element, "Waiting a request from caller");
+    switch (srt_getsockstate (srtobject->sock)) {
+      case SRTS_BROKEN:
+      case SRTS_CLOSING:
+      case SRTS_CLOSED:
+      case SRTS_NONEXIST:
+        GST_ELEMENT_ERROR (srtobject->element, RESOURCE, FAILED,
+            ("Socket is broken or closed"), (NULL));
+        return NULL;
 
-    if (srt_epoll_wait (srtobject->listener_poll_id, &rsock, &rsocklen, 0, 0,
-            poll_timeout, NULL, 0, NULL, 0) < 0) {
-      gint srt_errno = srt_getlasterror (NULL);
+      default:
+        break;
+    }
 
-      if (srtobject->listener_poll_id == SRT_ERROR)
-        return NULL;
+    GST_TRACE_OBJECT (srtobject->element, "Waiting on listening socket");
+    ret =
+        srt_epoll_wait (srtobject->poll_id, &rsock, &rsocklen, NULL, 0,
+        poll_timeout, &rsys, &rsyslen, &wsys, &wsyslen);
+
+    GST_OBJECT_LOCK (srtobject->element);
+    if (!srtobject->opened) {
+      GST_OBJECT_UNLOCK (srtobject->element);
+      break;
+    }
+    GST_OBJECT_UNLOCK (srtobject->element);
 
+    if (ret < 0) {
+      gint srt_errno = srt_getlasterror (NULL);
       if (srt_errno == SRT_ETIMEOUT)
         continue;
 
       GST_ELEMENT_ERROR (srtobject->element, RESOURCE, FAILED,
-          ("abort polling: %s", srt_getlasterror_str ()), (NULL));
+          ("Failed to poll socket: %s", srt_getlasterror_str ()), (NULL));
       return NULL;
     }
 
-    caller_sock =
-        srt_accept (srtobject->listener_sock, &caller_sa.sa, &caller_sa_len);
-
-    if (caller_sock != SRT_INVALID_SOCK) {
-      SRTCaller *caller;
-      gint flag = SRT_EPOLL_ERR;
+    if (rsocklen != 1)
+      continue;
 
-      caller = srt_caller_new ();
-      caller->sockaddr =
-          g_socket_address_new_from_native (&caller_sa.sa, caller_sa_len);
-      caller->poll_id = srt_epoll_create ();
-      caller->sock = caller_sock;
+    caller_sock = srt_accept (rsock, &caller_sa.sa, &caller_sa_len);
 
-      if (gst_uri_handler_get_uri_type (GST_URI_HANDLER
-              (srtobject->element)) == GST_URI_SRC) {
-        flag |= SRT_EPOLL_IN;
-      } else {
-        flag |= SRT_EPOLL_OUT;
-      }
+    if (caller_sock == SRT_INVALID_SOCK) {
+      GST_ELEMENT_ERROR (srtobject->element, RESOURCE, FAILED,
+          ("Failed to accept connection: %s", srt_getlasterror_str ()), (NULL));
+      return NULL;
+    }
 
-      if (srt_epoll_add_usock (caller->poll_id, caller_sock, &flag)) {
+    caller = srt_caller_new ();
+    caller->sockaddr =
+        g_socket_address_new_from_native (&caller_sa.sa, caller_sa_len);
+    caller->poll_id = srt_epoll_create ();
+    caller->sock = caller_sock;
+
+    fd = g_cancellable_get_fd (srtobject->cancellable);
+    if (fd >= 0)
+      srt_epoll_add_ssock (srtobject->poll_id, fd, &fd_flags);
+
+    if (gst_uri_handler_get_uri_type (GST_URI_HANDLER
+            (srtobject->element)) == GST_URI_SRC) {
+      flag |= SRT_EPOLL_IN;
+    } else {
+      flag |= SRT_EPOLL_OUT;
+    }
 
-        GST_ELEMENT_ERROR (srtobject->element, RESOURCE, SETTINGS,
-            ("%s", srt_getlasterror_str ()), (NULL));
+    if (srt_epoll_add_usock (caller->poll_id, caller_sock, &flag) < 0) {
+      GST_ELEMENT_WARNING (srtobject->element, LIBRARY, SETTINGS,
+          ("%s", srt_getlasterror_str ()), (NULL));
 
-        srt_caller_free (caller);
+      srt_caller_free (caller);
 
-        /* try-again */
-        continue;
-      }
+      /* try-again */
+      continue;
+    }
 
-      GST_DEBUG_OBJECT (srtobject->element, "Accept to connect %d",
-          caller->sock);
+    GST_DEBUG_OBJECT (srtobject->element, "Accept to connect %d", caller->sock);
 
-      g_mutex_lock (&srtobject->sock_lock);
-      srtobject->callers = g_list_prepend (srtobject->callers, caller);
-      g_cond_signal (&srtobject->sock_cond);
-      g_mutex_unlock (&srtobject->sock_lock);
+    g_mutex_lock (&srtobject->sock_lock);
+    srtobject->callers = g_list_prepend (srtobject->callers, caller);
+    g_cond_signal (&srtobject->sock_cond);
+    g_mutex_unlock (&srtobject->sock_lock);
 
-      /* notifying caller-added */
-      g_signal_emit_by_name (srtobject->element, "caller-added", 0,
-          caller->sockaddr);
+    /* notifying caller-added */
+    g_signal_emit_by_name (srtobject->element, "caller-added", 0,
+        caller->sockaddr);
 
-      if (gst_uri_handler_get_uri_type (GST_URI_HANDLER (srtobject->element)) ==
-          GST_URI_SRC)
-        return NULL;
-    }
+    if (gst_uri_handler_get_uri_type (GST_URI_HANDLER (srtobject->element)) ==
+        GST_URI_SRC)
+      break;
   }
+
+  return NULL;
 }
 
 static GSocketAddress *
@@ -1069,13 +1127,14 @@
 }
 
 static gboolean
-gst_srt_object_wait_connect (GstSRTObject * srtobject,
-    GCancellable * cancellable, gpointer sa, size_t sa_len, GError ** error)
+gst_srt_object_wait_connect (GstSRTObject * srtobject, gpointer sa,
+    size_t sa_len, GError ** error)
 {
   SRTSOCKET sock = SRT_INVALID_SOCK;
   const gchar *local_address = NULL;
   guint local_port = 0;
   gint sock_flags = SRT_EPOLL_ERR | SRT_EPOLL_IN;
+  gboolean poll_added = FALSE;
 
   gpointer bind_sa;
   gsize bind_sa_len;
@@ -1093,8 +1152,7 @@
   GST_OBJECT_UNLOCK (srtobject->element);
 
   bind_addr =
-      gst_srt_object_resolve (srtobject, local_address, local_port, cancellable,
-      error);
+      gst_srt_object_resolve (srtobject, local_address, local_port, error);
   if (!bind_addr) {
     goto failed;
   }
@@ -1129,25 +1187,25 @@
     goto failed;
   }
 
-  if (srt_epoll_add_usock (srtobject->listener_poll_id, sock, &sock_flags)) {
+  if (srt_epoll_add_usock (srtobject->poll_id, sock, &sock_flags) < 0) {
     g_set_error (error, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_SETTINGS, "%s",
         srt_getlasterror_str ());
     goto failed;
   }
+  poll_added = TRUE;
 
   GST_DEBUG_OBJECT (srtobject->element, "Starting to listen on bind socket");
   if (srt_listen (sock, 1) == SRT_ERROR) {
     g_set_error (error, GST_RESOURCE_ERROR,
         GST_RESOURCE_ERROR_OPEN_READ_WRITE, "Cannot listen on bind socket: %s",
         srt_getlasterror_str ());
-
     goto failed;
   }
 
-  srtobject->listener_sock = sock;
+  srtobject->sock = sock;
 
   /* Register the SRT listen callback */
-  if (srt_listen_callback (srtobject->listener_sock,
+  if (srt_listen_callback (srtobject->sock,
           (srt_listen_callback_fn *) srt_listen_callback_func, srtobject)) {
     goto failed;
   }
@@ -1161,10 +1219,10 @@
 
   return TRUE;
 
-failed:
 
-  if (srtobject->listener_poll_id != SRT_ERROR) {
-    srt_epoll_release (srtobject->listener_poll_id);
+failed:
+  if (poll_added) {
+    srt_epoll_remove_usock (srtobject->poll_id, sock);
   }
 
   if (sock != SRT_INVALID_SOCK) {
@@ -1173,14 +1231,13 @@
 
   g_clear_object (&bind_addr);
 
-  srtobject->listener_poll_id = SRT_ERROR;
-  srtobject->listener_sock = SRT_INVALID_SOCK;
+  srtobject->sock = SRT_INVALID_SOCK;
 
   return FALSE;
 }
 
 static gboolean
-gst_srt_object_connect (GstSRTObject * srtobject, GCancellable * cancellable,
+gst_srt_object_connect (GstSRTObject * srtobject,
     GstSRTConnectionMode connection_mode, gpointer sa, size_t sa_len,
     GError ** error)
 {
@@ -1242,8 +1299,7 @@
     gsize bind_sa_len;
 
     GSocketAddress *bind_addr =
-        gst_srt_object_resolve (srtobject, local_address,
-        local_port, cancellable, error);
+        gst_srt_object_resolve (srtobject, local_address, local_port, error);
 
     if (!bind_addr) {
       goto failed;
@@ -1270,7 +1326,7 @@
     }
   }
 
-  if (srt_epoll_add_usock (srtobject->poll_id, sock, &sock_flags)) {
+  if (srt_epoll_add_usock (srtobject->poll_id, sock, &sock_flags) < 0) {
     g_set_error (error, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_SETTINGS, "%s",
         srt_getlasterror_str ());
     goto failed;
@@ -1293,27 +1349,7 @@
 }
 
 static gboolean
-gst_srt_object_open_connection (GstSRTObject * srtobject,
-    GCancellable * cancellable, GstSRTConnectionMode connection_mode,
-    gpointer sa, size_t sa_len, GError ** error)
-{
-  gboolean ret = FALSE;
-
-  if (connection_mode == GST_SRT_CONNECTION_MODE_LISTENER) {
-    ret =
-        gst_srt_object_wait_connect (srtobject, cancellable, sa, sa_len, error);
-  } else {
-    ret =
-        gst_srt_object_connect (srtobject, cancellable, connection_mode, sa,
-        sa_len, error);
-  }
-
-  return ret;
-}
-
-static gboolean
-gst_srt_object_open_internal (GstSRTObject * srtobject,
-    GCancellable * cancellable, GError ** error)
+gst_srt_object_open_internal (GstSRTObject * srtobject, GError ** error)
 {
   GSocketAddress *socket_address = NULL;
   GstSRTConnectionMode connection_mode;
@@ -1326,8 +1362,6 @@
 
   GST_OBJECT_LOCK (srtobject->element);
 
-  srtobject->opened = FALSE;
-
   if (!gst_structure_get_enum (srtobject->parameters,
           "mode", GST_TYPE_SRT_CONNECTION_MODE, (gint *) & connection_mode)) {
     GST_WARNING_OBJECT (srtobject->element,
@@ -1352,8 +1386,7 @@
 
   GST_OBJECT_UNLOCK (srtobject->element);
 
-  socket_address =
-      gst_srt_object_resolve (srtobject, addr_str, port, cancellable, error);
+  socket_address = gst_srt_object_resolve (srtobject, addr_str, port, error);
   if (socket_address == NULL) {
     goto out;
   }
@@ -1365,15 +1398,12 @@
     goto out;
   }
 
-  srtobject->listener_poll_id = srt_epoll_create ();
-
-  ret =
-      gst_srt_object_open_connection
-      (srtobject, cancellable, connection_mode, sa, sa_len, error);
-
-  GST_OBJECT_LOCK (srtobject->element);
-  srtobject->opened = ret;
-  GST_OBJECT_UNLOCK (srtobject->element);
+  if (connection_mode == GST_SRT_CONNECTION_MODE_LISTENER) {
+    ret = gst_srt_object_wait_connect (srtobject, sa, sa_len, error);
+  } else {
+    ret =
+        gst_srt_object_connect (srtobject, connection_mode, sa, sa_len, error);
+  }
 
 out:
   g_clear_object (&socket_address);
@@ -1382,16 +1412,20 @@
 }
 
 gboolean
-gst_srt_object_open (GstSRTObject * srtobject, GCancellable * cancellable,
-    GError ** error)
+gst_srt_object_open (GstSRTObject * srtobject, GError ** error)
 {
+  GST_OBJECT_LOCK (srtobject->element);
+  srtobject->opened = TRUE;
+  GST_OBJECT_UNLOCK (srtobject->element);
+
+  g_cancellable_reset (srtobject->cancellable);
   srtobject->bytes = 0;
 
-  return gst_srt_object_open_internal (srtobject, cancellable, error);
+  return gst_srt_object_open_internal (srtobject, error);
 }
 
-void
-gst_srt_object_close (GstSRTObject * srtobject)
+static void
+gst_srt_object_close_internal (GstSRTObject * srtobject)
 {
   g_mutex_lock (&srtobject->sock_lock);
 
@@ -1405,15 +1439,6 @@
     srtobject->sock = SRT_INVALID_SOCK;
   }
 
-  if (srtobject->listener_poll_id != SRT_ERROR) {
-    if (srtobject->listener_sock != SRT_INVALID_SOCK) {
-      srt_epoll_remove_usock (srtobject->listener_poll_id,
-          srtobject->listener_sock);
-    }
-    srt_epoll_release (srtobject->listener_poll_id);
-    srtobject->listener_poll_id = SRT_ERROR;
-  }
-
   if (srtobject->thread) {
     GThread *thread = g_steal_pointer (&srtobject->thread);
     g_mutex_unlock (&srtobject->sock_lock);
@@ -1421,30 +1446,31 @@
     g_mutex_lock (&srtobject->sock_lock);
   }
 
-  if (srtobject->listener_sock != SRT_INVALID_SOCK) {
-    GST_DEBUG_OBJECT (srtobject->element, "Closing SRT listener socket (0x%x)",
-        srtobject->listener_sock);
-
-    srt_close (srtobject->listener_sock);
-    srtobject->listener_sock = SRT_INVALID_SOCK;
-  }
-
   if (srtobject->callers) {
     GList *callers = g_steal_pointer (&srtobject->callers);
     g_list_foreach (callers, (GFunc) srt_caller_signal_removed, srtobject);
     g_list_free_full (callers, (GDestroyNotify) srt_caller_free);
   }
 
+  srtobject->sent_headers = FALSE;
+
   g_mutex_unlock (&srtobject->sock_lock);
+}
 
+void
+gst_srt_object_close (GstSRTObject * srtobject)
+{
   GST_OBJECT_LOCK (srtobject->element);
   srtobject->opened = FALSE;
   GST_OBJECT_UNLOCK (srtobject->element);
+
+  g_cancellable_cancel (srtobject->cancellable);
+
+  gst_srt_object_close_internal (srtobject);
 }
 
 static gboolean
-gst_srt_object_wait_caller (GstSRTObject * srtobject,
-    GCancellable * cancellable)
+gst_srt_object_wait_caller (GstSRTObject * srtobject)
 {
   gboolean ret;
 
@@ -1453,7 +1479,7 @@
   ret = (srtobject->callers != NULL);
   if (!ret) {
     GST_INFO_OBJECT (srtobject->element, "Waiting for connection");
-    while (!ret && !g_cancellable_is_cancelled (cancellable)) {
+    while (!ret && !g_cancellable_is_cancelled (srtobject->cancellable)) {
       g_cond_wait (&srtobject->sock_cond, &srtobject->sock_lock);
       ret = (srtobject->callers != NULL);
     }
@@ -1469,15 +1495,16 @@
 }
 
 gssize
-gst_srt_object_read (GstSRTObject * srtobject,
-    guint8 * data, gsize size, GCancellable * cancellable, GError ** error,
-    SRT_MSGCTRL * mctrl)
+gst_srt_object_read (GstSRTObject * srtobject, guint8 * data, gsize size,
+    GError ** error, SRT_MSGCTRL * mctrl)
 {
   gssize len = 0;
   gint poll_timeout;
   GstSRTConnectionMode connection_mode = GST_SRT_CONNECTION_MODE_NONE;
   gint poll_id = SRT_ERROR;
+  SRTSOCKET sock = SRT_INVALID_SOCK;
   gboolean auto_reconnect;
+  GError *internal_error = NULL;
 
   /* Only source element can read data */
   g_return_val_if_fail (gst_uri_handler_get_uri_type (GST_URI_HANDLER
@@ -1497,14 +1524,16 @@
 
   GST_OBJECT_UNLOCK (srtobject->element);
 
+retry:
   if (connection_mode == GST_SRT_CONNECTION_MODE_LISTENER) {
-    if (!gst_srt_object_wait_caller (srtobject, cancellable))
+    if (!gst_srt_object_wait_caller (srtobject))
       return 0;
 
     g_mutex_lock (&srtobject->sock_lock);
     if (srtobject->callers) {
       SRTCaller *caller = srtobject->callers->data;
       poll_id = caller->poll_id;
+      sock = caller->sock;
     }
     g_mutex_unlock (&srtobject->sock_lock);
 
@@ -1512,91 +1541,78 @@
       return 0;
   } else {
     poll_id = srtobject->poll_id;
-  }
-
-  while (!g_cancellable_is_cancelled (cancellable)) {
+    sock = srtobject->sock;
+  }
+
+  while (!g_cancellable_is_cancelled (srtobject->cancellable)) {
+    SRTSOCKET rsock, wsock;
+    gint rsocklen = 1, wsocklen = 1;
+    SYSSOCKET rsys, wsys;
+    gint rsyslen = 1, wsyslen = 1;
+    gint ret;
+
+    switch (srt_getsockstate (sock)) {
+      case SRTS_BROKEN:
+      case SRTS_CLOSING:
+      case SRTS_CLOSED:
+      case SRTS_NONEXIST:
+        g_set_error (&internal_error, GST_RESOURCE_ERROR,
+            GST_RESOURCE_ERROR_READ, "Socket is broken or closed");
+        goto err;
 
-    SRTSOCKET rsock;
-    gint rsocklen = 1;
-    SRTSOCKET wsock;
-    gint wsocklen = 1;
+      default:
+        break;
+    }
 
-    if (srt_epoll_wait (poll_id, &rsock, &rsocklen, &wsock, &wsocklen,
-            poll_timeout, NULL, 0, NULL, 0) < 0) {
-      gint srt_errno = srt_getlasterror (NULL);
+    GST_TRACE_OBJECT (srtobject->element, "Waiting for read");
+    ret =
+        srt_epoll_wait (poll_id, &rsock, &rsocklen, &wsock, &wsocklen,
+        poll_timeout, &rsys, &rsyslen, &wsys, &wsyslen);
 
-#if SRT_VERSION_VALUE >= 0x010402
-      if (srt_errno == SRT_EPOLLEMPTY)
-        return 0;
-#endif
+    if (g_cancellable_is_cancelled (srtobject->cancellable))
+      break;
 
+    if (ret < 0) {
+      gint srt_errno = srt_getlasterror (NULL);
       if (srt_errno == SRT_ETIMEOUT)
         continue;
 
-      g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_WRITE,
+      g_set_error (&internal_error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_READ,
           "Failed to poll socket: %s", srt_getlasterror_str ());
-      return -1;
+      goto err;
     }
 
+    if (rsocklen != 1)
+      continue;
+
     if (wsocklen == 1 && rsocklen == 1) {
       /* Socket reported in wsock AND rsock signifies an error. */
       gint reason = srt_getrejectreason (wsock);
 
       if (reason == SRT_REJ_BADSECRET || reason == SRT_REJ_UNSECURE) {
-        if (connection_mode == GST_SRT_CONNECTION_MODE_LISTENER) {
-          GST_ELEMENT_WARNING (srtobject->element, RESOURCE, NOT_AUTHORIZED,
-              ("Caller failed to authenticate: %" REASON_FORMAT,
-                  REASON_ARGS (reason)), (NULL));
-          return 0;
-        }
-
-        if (!auto_reconnect) {
-          g_set_error (error, GST_RESOURCE_ERROR,
-              GST_RESOURCE_ERROR_NOT_AUTHORIZED,
-              "Failed to authenticate: %" REASON_FORMAT, REASON_ARGS (reason));
-          return -1;
-        }
-
-        GST_ELEMENT_WARNING (srtobject->element, RESOURCE, NOT_AUTHORIZED,
-            ("Failed to authenticate: %" REASON_FORMAT ". Trying to reconnect",
-                REASON_ARGS (reason)), (NULL));
+        g_set_error (&internal_error, GST_RESOURCE_ERROR,
+            GST_RESOURCE_ERROR_NOT_AUTHORIZED,
+            "Failed to authenticate: %" REASON_FORMAT, REASON_ARGS (reason));
       } else {
-        if (connection_mode == GST_SRT_CONNECTION_MODE_LISTENER) {
-          /* Caller has disappeared. */
-          return 0;
-        }
-
-        if (!auto_reconnect) {
-          g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_READ,
-              "Error on SRT socket: %" REASON_FORMAT, REASON_ARGS (reason));
-          return -1;
-        }
-
-        GST_ELEMENT_WARNING (srtobject->element, RESOURCE, READ,
-            ("Error on SRT socket: %" REASON_FORMAT ". Trying to reconnect",
-                REASON_ARGS (reason)), (NULL));
+        g_set_error (&internal_error, GST_RESOURCE_ERROR,
+            GST_RESOURCE_ERROR_READ,
+            "Error on SRT socket: %" REASON_FORMAT, REASON_ARGS (reason));
       }
 
-      gst_srt_object_close (srtobject);
-      if (!gst_srt_object_open_internal (srtobject, cancellable, error)) {
-        return -1;
-      }
-      continue;
+      goto err;
     }
 
-
     srt_msgctrl_init (mctrl);
     len = srt_recvmsg2 (rsock, (char *) (data), size, mctrl);
 
     if (len == SRT_ERROR) {
       gint srt_errno = srt_getlasterror (NULL);
-      if (srt_errno == SRT_EASYNCRCV) {
+      if (srt_errno == SRT_EASYNCRCV)
         continue;
-      } else {
-        g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_READ,
-            "Failed to receive from SRT socket: %s", srt_getlasterror_str ());
-        return -1;
-      }
+
+      g_set_error (&internal_error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_READ,
+          "Failed to receive from SRT socket: %s", srt_getlasterror_str ());
+      goto err;
     }
 
     srtobject->bytes += len;
@@ -1604,34 +1620,59 @@
   }
 
   return len;
+
+err:
+  if (g_cancellable_is_cancelled (srtobject->cancellable))
+    return 0;
+
+  if (connection_mode == GST_SRT_CONNECTION_MODE_LISTENER) {
+    /* Caller has disappeared. */
+    ERROR_TO_WARNING (srtobject, internal_error, "");
+    g_clear_error (&internal_error);
+    return 0;
+  }
+
+  if (!auto_reconnect) {
+    g_propagate_error (error, internal_error);
+    return -1;
+  }
+
+  ERROR_TO_WARNING (srtobject, internal_error, ". Trying to reconnect");
+  g_clear_error (&internal_error);
+
+  gst_srt_object_close_internal (srtobject);
+  if (!gst_srt_object_open_internal (srtobject, error)) {
+    return -1;
+  }
+
+  goto retry;
 }
 
 void
-gst_srt_object_wakeup (GstSRTObject * srtobject, GCancellable * cancellable)
+gst_srt_object_unlock (GstSRTObject * srtobject)
 {
   GST_DEBUG_OBJECT (srtobject->element, "waking up SRT");
 
-  /* Removing all socket descriptors from the monitoring list
-   * wakes up SRT's threads. We only have one to remove. */
-  if (srtobject->sock != SRT_INVALID_SOCK) {
-    srt_epoll_remove_usock (srtobject->poll_id, srtobject->sock);
-  }
-
   /* connection is only waited for in listener mode,
    * but there is no harm in raising signal in any case */
   g_mutex_lock (&srtobject->sock_lock);
   /* however, a race might be harmful ...
    * the cancellation is used as 'flushing' flag here,
    * so make sure it is so detected by the intended part at proper time */
-  g_cancellable_cancel (cancellable);
+  g_cancellable_cancel (srtobject->cancellable);
   g_cond_signal (&srtobject->sock_cond);
   g_mutex_unlock (&srtobject->sock_lock);
 }
 
+void
+gst_srt_object_unlock_stop (GstSRTObject * srtobject)
+{
+  g_cancellable_reset (srtobject->cancellable);
+}
+
 static gboolean
 gst_srt_object_send_headers (GstSRTObject * srtobject, SRTSOCKET sock,
-    gint poll_id, gint poll_timeout, GstBufferList * headers,
-    GCancellable * cancellable, GError ** error)
+    gint poll_id, gint poll_timeout, GstBufferList * headers, GError ** error)
 {
   guint size, i;
 
@@ -1645,24 +1686,41 @@
   for (i = 0; i < size; i++) {
     SRTSOCKET wsock = sock;
     gint wsocklen = 1;
-    gint sent;
+    SYSSOCKET rsys, wsys;
+    gint rsyslen = 1, wsyslen = 1;
+    gint ret = 0, sent;
 
     GstBuffer *buffer = gst_buffer_list_get (headers, i);
     GstMapInfo mapinfo;
 
-    if (g_cancellable_is_cancelled (cancellable)) {
-      return TRUE;
-    }
+    if (g_cancellable_is_cancelled (srtobject->cancellable))
+      break;
 
-    if (poll_id >= 0 && srt_epoll_wait (poll_id, 0, 0, &wsock, &wsocklen,
-            poll_timeout, NULL, 0, NULL, 0) < 0) {
-      gint srt_errno = srt_getlasterror (NULL);
+    if (poll_id >= 0) {
+      switch (srt_getsockstate (sock)) {
+        case SRTS_BROKEN:
+        case SRTS_CLOSING:
+        case SRTS_CLOSED:
+        case SRTS_NONEXIST:
+          g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_WRITE,
+              "Socket is broken or closed");
+          return FALSE;
 
-#if SRT_VERSION_VALUE >= 0x010402
-      if (srt_errno == SRT_EPOLLEMPTY)
-        return TRUE;
-#endif
+        default:
+          break;
+      }
+
+      GST_TRACE_OBJECT (srtobject->element, "Waiting for header write");
+      ret =
+          srt_epoll_wait (poll_id, NULL, 0, &wsock, &wsocklen, poll_timeout,
+          &rsys, &rsyslen, &wsys, &wsyslen);
 
+      if (g_cancellable_is_cancelled (srtobject->cancellable))
+        break;
+    }
+
+    if (ret < 0) {
+      gint srt_errno = srt_getlasterror (NULL);
       if (srt_errno == SRT_ETIMEOUT)
         continue;
 
@@ -1671,6 +1729,9 @@
       return FALSE;
     }
 
+    if (wsocklen != 1)
+      continue;
+
     GST_TRACE_OBJECT (srtobject->element, "sending header %u %" GST_PTR_FORMAT,
         i, buffer);
 
@@ -1698,8 +1759,7 @@
 
 static gssize
 gst_srt_object_write_to_callers (GstSRTObject * srtobject,
-    GstBufferList * headers,
-    const GstMapInfo * mapinfo, GCancellable * cancellable)
+    GstBufferList * headers, const GstMapInfo * mapinfo)
 {
   GList *item, *next;
 
@@ -1713,18 +1773,18 @@
 
     next = item->next;
 
-    if (g_cancellable_is_cancelled (cancellable)) {
+    if (g_cancellable_is_cancelled (srtobject->cancellable)) {
       goto cancelled;
     }
 
     if (!caller->sent_headers) {
       GError *error = NULL;
 
-      if (!gst_srt_object_send_headers (srtobject, caller->sock, -1, 0,
-              headers, cancellable, &error)) {
+      if (!gst_srt_object_send_headers (srtobject, caller->sock, -1, 0, headers,
+              &error)) {
         GST_WARNING_OBJECT (srtobject->element,
-            "Failed to send headers to caller %d: %s",
-            caller->sock, error->message);
+            "Failed to send headers to caller %d: %s", caller->sock,
+            error->message);
         g_error_free (error);
         goto err;
       }
@@ -1767,15 +1827,15 @@
 }
 
 static gssize
-gst_srt_object_write_one (GstSRTObject * srtobject,
-    GstBufferList * headers,
-    const GstMapInfo * mapinfo, GCancellable * cancellable, GError ** error)
+gst_srt_object_write_one (GstSRTObject * srtobject, GstBufferList * headers,
+    const GstMapInfo * mapinfo, GError ** error)
 {
   gssize len = 0;
   gint poll_timeout;
   const guint8 *msg = mapinfo->data;
   gint payload_size, optlen = sizeof (payload_size);
   gboolean wait_for_connection, auto_reconnect;
+  GError *internal_error = NULL;
 
   GST_OBJECT_LOCK (srtobject->element);
   wait_for_connection = srtobject->wait_for_connection;
@@ -1787,111 +1847,138 @@
   }
   GST_OBJECT_UNLOCK (srtobject->element);
 
+retry:
   if (!srtobject->sent_headers) {
     if (!gst_srt_object_send_headers (srtobject, srtobject->sock,
-            srtobject->poll_id, poll_timeout, headers, cancellable, error)) {
-      return -1;
+            srtobject->poll_id, poll_timeout, headers, &internal_error)) {
+      goto err;
     }
 
     srtobject->sent_headers = TRUE;
   }
 
   while (len < mapinfo->size) {
-    SRTSOCKET rsock;
-    gint rsocklen = 1;
-    SRTSOCKET wsock;
-    gint wsocklen = 1;
+    SRTSOCKET rsock, wsock;
+    gint rsocklen = 1, wsocklen = 1;
+    SYSSOCKET rsys, wsys;
+    gint rsyslen = 1, wsyslen = 1;
+    gint ret, sent, rest;
+    gboolean connecting_but_not_waiting = FALSE;
+
+    if (g_cancellable_is_cancelled (srtobject->cancellable))
+      break;
 
-    gint sent;
-    gint rest;
+    switch (srt_getsockstate (srtobject->sock)) {
+      case SRTS_BROKEN:
+      case SRTS_CLOSING:
+      case SRTS_CLOSED:
+      case SRTS_NONEXIST:
+        g_set_error (&internal_error, GST_RESOURCE_ERROR,
+            GST_RESOURCE_ERROR_WRITE, "Socket is broken or closed");
+        goto err;
 
-    if (g_cancellable_is_cancelled (cancellable)) {
-      break;
-    }
+      case SRTS_CONNECTING:
+        if (!wait_for_connection) {
+          /* We need to check for SRT_EPOLL_ERR */
+          connecting_but_not_waiting = TRUE;
+        }
+        break;
 
-    if (!wait_for_connection &&
-        srt_getsockstate (srtobject->sock) == SRTS_CONNECTING) {
-      GST_LOG_OBJECT (srtobject->element,
-          "Not connected yet. Dropping the buffer.");
-      break;
+      default:
+        break;
     }
 
-    if (srt_epoll_wait (srtobject->poll_id, &rsock, &rsocklen, &wsock,
-            &wsocklen, poll_timeout, NULL, 0, NULL, 0) < 0) {
-      gint srt_errno = srt_getlasterror (NULL);
+    GST_TRACE_OBJECT (srtobject->element, "Waiting a write");
+    ret =
+        srt_epoll_wait (srtobject->poll_id, &rsock, &rsocklen, &wsock,
+        &wsocklen, connecting_but_not_waiting ? 0 : poll_timeout, &rsys,
+        &rsyslen, &wsys, &wsyslen);
 
-#if SRT_VERSION_VALUE >= 0x010402
-      if (srt_errno == SRT_EPOLLEMPTY)
-        return 0;
-#endif
+    if (g_cancellable_is_cancelled (srtobject->cancellable))
+      break;
 
+    if (ret < 0) {
+      gint srt_errno = srt_getlasterror (NULL);
       if (srt_errno == SRT_ETIMEOUT)
         continue;
 
-      g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_WRITE,
-          "Failed to poll socket: %s", srt_getlasterror_str ());
-      return -1;
+      g_set_error (&internal_error, GST_RESOURCE_ERROR,
+          GST_RESOURCE_ERROR_WRITE, "Failed to poll socket: %s",
+          srt_getlasterror_str ());
+      goto err;
     }
 
+    if (wsocklen != 1)
+      continue;
+
     if (wsocklen == 1 && rsocklen == 1) {
       /* Socket reported in wsock AND rsock signifies an error. */
       gint reason = srt_getrejectreason (wsock);
 
       if (reason == SRT_REJ_BADSECRET || reason == SRT_REJ_UNSECURE) {
-        if (!auto_reconnect) {
-          g_set_error (error, GST_RESOURCE_ERROR,
-              GST_RESOURCE_ERROR_NOT_AUTHORIZED,
-              "Failed to authenticate: %" REASON_FORMAT, REASON_ARGS (reason));
-          return -1;
-        }
-
-        GST_ELEMENT_WARNING (srtobject->element, RESOURCE, NOT_AUTHORIZED,
-            ("Failed to authenticate: %" REASON_FORMAT ". Trying to reconnect",
-                REASON_ARGS (reason)), (NULL));
+        g_set_error (&internal_error, GST_RESOURCE_ERROR,
+            GST_RESOURCE_ERROR_NOT_AUTHORIZED,
+            "Failed to authenticate: %" REASON_FORMAT, REASON_ARGS (reason));
       } else {
-        if (!auto_reconnect) {
-          g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_WRITE,
-              "Error on SRT socket: %" REASON_FORMAT, REASON_ARGS (reason));
-          return -1;
-        }
-
-        GST_ELEMENT_WARNING (srtobject->element, RESOURCE, WRITE,
-            ("Error on SRT socket: %" REASON_FORMAT ". Trying to reconnect",
-                REASON_ARGS (reason)), (NULL));
+        g_set_error (&internal_error, GST_RESOURCE_ERROR,
+            GST_RESOURCE_ERROR_WRITE,
+            "Error on SRT socket: %" REASON_FORMAT, REASON_ARGS (reason));
       }
 
-      gst_srt_object_close (srtobject);
-      if (!gst_srt_object_open_internal (srtobject, cancellable, error)) {
-        return -1;
-      }
-      continue;
+      goto err;
+    }
+
+    if (connecting_but_not_waiting) {
+      GST_LOG_OBJECT (srtobject->element,
+          "Not connected yet. Dropping the buffer.");
+      break;
     }
 
     if (srt_getsockflag (wsock, SRTO_PAYLOADSIZE, &payload_size, &optlen)) {
-      g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_WRITE, "%s",
-          srt_getlasterror_str ());
-      return -1;
+      g_set_error (&internal_error, GST_RESOURCE_ERROR,
+          GST_RESOURCE_ERROR_WRITE, "%s", srt_getlasterror_str ());
+      goto err;
     }
 
     rest = MIN (mapinfo->size - len, payload_size);
 
     sent = srt_sendmsg2 (wsock, (char *) (msg + len), rest, 0);
     if (sent < 0) {
-      g_set_error (error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_WRITE, "%s",
-          srt_getlasterror_str ());
-      return -1;
+      g_set_error (&internal_error, GST_RESOURCE_ERROR,
+          GST_RESOURCE_ERROR_WRITE, "%s", srt_getlasterror_str ());
+      goto err;
     }
+
     len += sent;
     srtobject->bytes += sent;
+    continue;
   }
 
   return len;
+
+err:
+  if (g_cancellable_is_cancelled (srtobject->cancellable))
+    return 0;
+
+  if (!auto_reconnect) {
+    g_propagate_error (error, internal_error);
+    return -1;
+  }
+
+  ERROR_TO_WARNING (srtobject, internal_error, ". Trying to reconnect");
+  g_clear_error (&internal_error);
+
+  gst_srt_object_close_internal (srtobject);
+  if (!gst_srt_object_open_internal (srtobject, error)) {
+    return -1;
+  }
+
+  goto retry;
 }
 
 gssize
-gst_srt_object_write (GstSRTObject * srtobject,
-    GstBufferList * headers,
-    const GstMapInfo * mapinfo, GCancellable * cancellable, GError ** error)
+gst_srt_object_write (GstSRTObject * srtobject, GstBufferList * headers,
+    const GstMapInfo * mapinfo, GError ** error)
 {
   gssize len = 0;
   GstSRTConnectionMode connection_mode = GST_SRT_CONNECTION_MODE_NONE;
@@ -1909,16 +1996,12 @@
 
   if (connection_mode == GST_SRT_CONNECTION_MODE_LISTENER) {
     if (wait_for_connection) {
-      if (!gst_srt_object_wait_caller (srtobject, cancellable))
+      if (!gst_srt_object_wait_caller (srtobject))
         return 0;
     }
-    len =
-        gst_srt_object_write_to_callers (srtobject, headers, mapinfo,
-        cancellable);
+    len = gst_srt_object_write_to_callers (srtobject, headers, mapinfo);
   } else {
-    len =
-        gst_srt_object_write_one (srtobject, headers, mapinfo, cancellable,
-        error);
+    len = gst_srt_object_write_one (srtobject, headers, mapinfo, error);
   }
 
   return len;
@@ -1967,6 +2050,10 @@
       "negotiated-latency-ms", G_TYPE_INT, stats.msSndTsbPdDelay,
       "packets-received", G_TYPE_INT64, stats.pktRecvTotal,
       "packets-received-lost", G_TYPE_INT, stats.pktRcvLossTotal,
+      /* number of retransmitted packets registered at receiver side */
+      "packets-received-retransmitted", G_TYPE_INT, stats.pktRcvRetrans,
+      /* number of dropped packets by the receiver */
+      "packets-received-dropped", G_TYPE_INT, stats.pktRcvDropTotal,
       /* number of sent ACK packets */
       "packet-ack-sent", G_TYPE_INT, stats.pktSentACK,
       /* number of sent NAK packets */
@@ -1992,7 +2079,8 @@
 
   g_mutex_lock (&srtobject->sock_lock);
 
-  if (srtobject->sock != SRT_INVALID_SOCK) {
+  if (srtobject->thread == NULL) {
+    /* Not a listening socket */
     s = get_stats_for_srtsock (srtobject, srtobject->sock);
   }

gst-plugins-bad-1.22.7.tar.xz/ext/srt/gstsrtobject.h -> gst-plugins-bad-1.24.5.tar.xz/ext/srt/gstsrtobject.h Changed

@@ -38,7 +38,7 @@
 
 #define GST_SRT_DEFAULT_MODE GST_SRT_CONNECTION_MODE_CALLER
 #define GST_SRT_DEFAULT_PBKEYLEN GST_SRT_KEY_LENGTH_0
-#define GST_SRT_DEFAULT_POLL_TIMEOUT -1
+#define GST_SRT_DEFAULT_POLL_TIMEOUT 1000
 #define GST_SRT_DEFAULT_LATENCY 125
 #define GST_SRT_DEFAULT_MSG_SIZE 1316
 #define GST_SRT_DEFAULT_WAIT_FOR_CONNECTION (TRUE)
@@ -49,6 +49,7 @@
 struct _GstSRTObject
 {
   GstElement                   *element;
+  GCancellable                 *cancellable;
   GstUri                       *uri;
 
   GstStructure                 *parameters;
@@ -58,8 +59,6 @@
   gboolean                      sent_headers;
 
   GTask                        *listener_task;
-  SRTSOCKET                     listener_sock;
-  gint                          listener_poll_id;
 
   GThread                      *thread;
 
@@ -82,7 +81,6 @@
 void            gst_srt_object_destroy          (GstSRTObject *srtobject);
 
 gboolean        gst_srt_object_open             (GstSRTObject *srtobject,
-                                                 GCancellable *cancellable,
                                                  GError **error);
 
 void            gst_srt_object_close            (GstSRTObject *srtobject);
@@ -101,18 +99,16 @@
 
 gssize          gst_srt_object_read     (GstSRTObject * srtobject,
                                          guint8 *data, gsize size,
-                                         GCancellable *cancellable,
                                          GError **err,
 					 SRT_MSGCTRL *mctrl);
 
 gssize          gst_srt_object_write    (GstSRTObject * srtobject,
                                          GstBufferList * headers,
                                          const GstMapInfo * mapinfo,
-                                         GCancellable *cancellable,
                                          GError **err);
 
-void            gst_srt_object_wakeup   (GstSRTObject * srtobject,
-                                         GCancellable *cancellable);
+void            gst_srt_object_unlock       (GstSRTObject * srtobject);
+void            gst_srt_object_unlock_stop  (GstSRTObject * srtobject);
 
 GstStructure   *gst_srt_object_get_stats        (GstSRTObject * srtobject);

gst-plugins-bad-1.22.7.tar.xz/ext/srt/gstsrtsink.c -> gst-plugins-bad-1.24.5.tar.xz/ext/srt/gstsrtsink.c Changed

@@ -130,7 +130,6 @@
 {
   GstSRTSink *self = GST_SRT_SINK (object);
 
-  g_clear_object (&self->cancellable);
   gst_srt_object_destroy (self->srtobject);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -140,8 +139,6 @@
 gst_srt_sink_init (GstSRTSink * self)
 {
   self->srtobject = gst_srt_object_new (GST_ELEMENT (self));
-  self->cancellable = g_cancellable_new ();
-
   gst_srt_object_set_uri (self->srtobject, GST_SRT_DEFAULT_URI, NULL);
 }
 
@@ -153,7 +150,7 @@
   GError *error = NULL;
   gboolean ret = FALSE;
 
-  ret = gst_srt_object_open (self->srtobject, self->cancellable, &error);
+  ret = gst_srt_object_open (self->srtobject, &error);
 
   if (!ret) {
     /* ensure error is posted since state change will fail */
@@ -184,7 +181,7 @@
   GstMapInfo info;
   GError *error = NULL;
 
-  if (g_cancellable_is_cancelled (self->cancellable)) {
+  if (g_cancellable_is_cancelled (self->srtobject->cancellable)) {
     ret = GST_FLOW_FLUSHING;
   }
 
@@ -200,8 +197,7 @@
     return GST_FLOW_ERROR;
   }
 
-  if (gst_srt_object_write (self->srtobject, self->headers, &info,
-          self->cancellable, &error) < 0) {
+  if (gst_srt_object_write (self->srtobject, self->headers, &info, &error) < 0) {
     GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
         ("Failed to write to SRT socket: %s",
             error ? error->message : "Unknown error"), (NULL));
@@ -229,7 +225,7 @@
 {
   GstSRTSink *self = GST_SRT_SINK (bsink);
 
-  gst_srt_object_wakeup (self->srtobject, self->cancellable);
+  gst_srt_object_unlock (self->srtobject);
 
   return TRUE;
 }
@@ -239,7 +235,7 @@
 {
   GstSRTSink *self = GST_SRT_SINK (bsink);
 
-  g_cancellable_reset (self->cancellable);
+  gst_srt_object_unlock_stop (self->srtobject);
 
   return TRUE;
 }
@@ -311,7 +307,7 @@
    * @gstsrtsink: the srtsink element that emitted this signal
    * @unused: always zero (for ABI compatibility with previous versions)
    * @addr: the #GSocketAddress of the new caller
-   * 
+   *
    * A new caller has connected to @gstsrtsink.
    */
   signalsSIG_CALLER_ADDED =
@@ -383,6 +379,7 @@
   gstbasesink_class->unlock_stop = GST_DEBUG_FUNCPTR (gst_srt_sink_unlock_stop);
   gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_srt_sink_set_caps);
 
+  gst_type_mark_as_plugin_api (GST_TYPE_SRT_SINK, 0);
 }
 
 static GstURIType

gst-plugins-bad-1.22.7.tar.xz/ext/srt/gstsrtsink.h -> gst-plugins-bad-1.24.5.tar.xz/ext/srt/gstsrtsink.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/srt/gstsrtsrc.c -> gst-plugins-bad-1.24.5.tar.xz/ext/srt/gstsrtsrc.c Changed

@@ -116,7 +116,7 @@
   GError *error = NULL;
   gboolean ret = FALSE;
 
-  ret = gst_srt_object_open (self->srtobject, self->cancellable, &error);
+  ret = gst_srt_object_open (self->srtobject, &error);
 
   if (!ret) {
     /* ensure error is posted since state change will fail */
@@ -157,7 +157,7 @@
   SRT_MSGCTRL mctrl;
 
 retry:
-  if (g_cancellable_is_cancelled (self->cancellable)) {
+  if (g_cancellable_is_cancelled (self->srtobject->cancellable)) {
     ret = GST_FLOW_FLUSHING;
   }
 
@@ -178,7 +178,7 @@
   base_time = gst_element_get_base_time (GST_ELEMENT (src));
 
   recv_len = gst_srt_object_read (self->srtobject, info.data,
-      gst_buffer_get_size (outbuf), self->cancellable, &err, &mctrl);
+      gst_buffer_get_size (outbuf), &err, &mctrl);
 
   /* Capture clock values ASAP */
   capture_time = gst_clock_get_time (clock);
@@ -197,7 +197,7 @@
       "recv_len:%" G_GSIZE_FORMAT " pktseq:%d msgno:%d srctime:%"
       G_GINT64_FORMAT, recv_len, mctrl.pktseq, mctrl.msgno, mctrl.srctime);
 
-  if (g_cancellable_is_cancelled (self->cancellable)) {
+  if (g_cancellable_is_cancelled (self->srtobject->cancellable)) {
     ret = GST_FLOW_FLUSHING;
     goto out;
   }
@@ -276,7 +276,6 @@
 gst_srt_src_init (GstSRTSrc * self)
 {
   self->srtobject = gst_srt_object_new (GST_ELEMENT (self));
-  self->cancellable = g_cancellable_new ();
 
   gst_base_src_set_format (GST_BASE_SRC (self), GST_FORMAT_TIME);
   gst_base_src_set_live (GST_BASE_SRC (self), TRUE);
@@ -292,7 +291,6 @@
 {
   GstSRTSrc *self = GST_SRT_SRC (object);
 
-  g_clear_object (&self->cancellable);
   gst_srt_object_destroy (self->srtobject);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -303,7 +301,7 @@
 {
   GstSRTSrc *self = GST_SRT_SRC (bsrc);
 
-  gst_srt_object_wakeup (self->srtobject, self->cancellable);
+  gst_srt_object_unlock (self->srtobject);
 
   return TRUE;
 }
@@ -313,7 +311,7 @@
 {
   GstSRTSrc *self = GST_SRT_SRC (bsrc);
 
-  g_cancellable_reset (self->cancellable);
+  gst_srt_object_unlock_stop (self->srtobject);
 
   return TRUE;
 }
@@ -478,6 +476,8 @@
   gstbasesrc_class->query = GST_DEBUG_FUNCPTR (gst_srt_src_query);
 
   gstpushsrc_class->fill = GST_DEBUG_FUNCPTR (gst_srt_src_fill);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_SRT_SRC, 0);
 }
 
 static GstURIType

gst-plugins-bad-1.22.7.tar.xz/ext/srt/gstsrtsrc.h -> gst-plugins-bad-1.24.5.tar.xz/ext/srt/gstsrtsrc.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/srt/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/srt/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/ext/srtp/gstsrtp.c -> gst-plugins-bad-1.24.5.tar.xz/ext/srtp/gstsrtp.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/srtp/gstsrtpdec.c -> gst-plugins-bad-1.24.5.tar.xz/ext/srtp/gstsrtpdec.c Changed

@@ -561,7 +561,7 @@
   const gchar *rtp_cipher, *rtp_auth, *rtcp_cipher, *rtcp_auth;
 
   /* Create new stream structure and set default values */
-  stream = g_slice_new0 (GstSrtpDecSsrcStream);
+  stream = g_new0 (GstSrtpDecSsrcStream, 1);
   stream->ssrc = ssrc;
   stream->key = NULL;
 
@@ -671,7 +671,7 @@
   return stream;
 
 error:
-  g_slice_free (GstSrtpDecSsrcStream, stream);
+  g_free (stream);
   return NULL;
 }
 
@@ -848,7 +848,7 @@
     gst_buffer_unref (stream->key);
   if (stream->keys)
     g_array_free (stream->keys, TRUE);
-  g_slice_free (GstSrtpDecSsrcStream, stream);
+  g_free (stream);
 }
 
 static gboolean
@@ -949,7 +949,7 @@
       GST_WARNING_OBJECT (filter, "Failed to create the stream (err: %d)", err);
       if (stream->key)
         gst_buffer_unref (stream->key);
-      g_slice_free (GstSrtpDecSsrcStream, stream);
+      g_free (stream);
       stream = NULL;
     }
   }
@@ -1260,53 +1260,6 @@
   return gst_srtp_dec_iterate_internal_links (pad, parent, TRUE);
 }
 
-/* Partial backport to 1.22 of `gst_element_decorate_stream_id_internal`,
- * which was introduced in 1.23 */
-static gchar *
-decorate_stream_id_private (GstElement * element, const gchar * stream_id)
-{
-  gchar *upstream_stream_id = NULL, *new_stream_id;
-  GstQuery *query;
-  gchar *uri = NULL;
-
-  /* Try to generate a stream-id from the URI query and
-   * if it fails take a random number instead */
-  query = gst_query_new_uri ();
-  if (gst_element_query (element, query)) {
-    gst_query_parse_uri (query, &uri);
-  }
-
-  if (uri) {
-    GChecksum *cs;
-
-    /* And then generate an SHA256 sum of the URI */
-    cs = g_checksum_new (G_CHECKSUM_SHA256);
-    g_checksum_update (cs, (const guchar *) uri, strlen (uri));
-    g_free (uri);
-    upstream_stream_id = g_strdup (g_checksum_get_string (cs));
-    g_checksum_free (cs);
-  } else {
-    /* Just get some random number if the URI query fails */
-    GST_FIXME_OBJECT (element, "Creating random stream-id, consider "
-        "implementing a deterministic way of creating a stream-id");
-    upstream_stream_id =
-        g_strdup_printf ("%08x%08x%08x%08x", g_random_int (), g_random_int (),
-        g_random_int (), g_random_int ());
-  }
-
-  gst_query_unref (query);
-
-  if (stream_id) {
-    new_stream_id = g_strconcat (upstream_stream_id, "/", stream_id, NULL);
-  } else {
-    new_stream_id = g_strdup (upstream_stream_id);
-  }
-
-  g_free (upstream_stream_id);
-
-  return new_stream_id;
-}
-
 static gboolean
 gst_srtp_dec_push_early_events (GstSrtpDec * filter, GstPad * pad,
     GstPad * otherpad, gboolean is_rtcp)
@@ -1330,7 +1283,7 @@
           is_rtcp ? "rtcp" : "rtp");
       gst_event_unref (otherev);
     } else {
-      new_stream_id = decorate_stream_id_private (GST_ELEMENT (filter),
+      new_stream_id = gst_element_decorate_stream_id (GST_ELEMENT (filter),
           is_rtcp ? "rtcp" : "rtp");
     }

gst-plugins-bad-1.22.7.tar.xz/ext/srtp/gstsrtpenc.c -> gst-plugins-bad-1.24.5.tar.xz/ext/srtp/gstsrtpenc.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/srtp/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/srtp/meson.build Changed

gst-plugins-bad-1.24.5.tar.xz/ext/svtav1 Added

gst-plugins-bad-1.24.5.tar.xz/ext/svtav1/gstsvtav1enc.c Added

@@ -0,0 +1,1127 @@
+/*
+* Copyright(c) 2019 Intel Corporation
+*     Authors: Jun Tian <jun.tian@intel.com> Xavier Hallade <xavier.hallade@intel.com>
+* SPDX - License - Identifier: LGPL-2.1-or-later
+*/
+
+/**
+ * SECTION:element-gstsvtav1enc
+ *
+ * The svtav1enc element does AV1 encoding using Scalable
+ * Video Technology for AV1 Encoder (SVT-AV1 Encoder).
+ *
+ * <refsect2>
+ * <title>Example launch line</title>
+ * |
+ * gst-launch-1.0 -e videotestsrc ! video/x-raw ! svtav1enc ! matroskamux ! filesink location=out.mkv
+ * |
+ * Encodes test input into AV1 compressed data which is then packaged in out.mkv
+ * </refsect2>
+ */
+
+#include "config.h"
+
+#include "gstsvtav1enc.h"
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/video/gstvideoencoder.h>
+
+#if !SVT_AV1_CHECK_VERSION(1,2,1)
+#define SVT_AV1_RC_MODE_CQP_OR_CRF 0
+#define SVT_AV1_RC_MODE_VBR 1
+#define SVT_AV1_RC_MODE_CBR 2
+#endif
+
+GST_DEBUG_CATEGORY_STATIC (gst_svtav1enc_debug_category);
+#define GST_CAT_DEFAULT gst_svtav1enc_debug_category
+
+#define GST_SVTAV1ENC_TYPE_INTRA_REFRESH_TYPE (gst_svtav1enc_intra_refresh_type_get_type())
+static GType
+gst_svtav1enc_intra_refresh_type_get_type (void)
+{
+  static GType intra_refresh_type = 0;
+  static const GEnumValue intra_refresh = {
+    {SVT_AV1_FWDKF_REFRESH, "Open GOP", "CRA"},
+    {SVT_AV1_KF_REFRESH, "Closed GOP", "IDR"},
+    {0, NULL, NULL},
+  };
+
+  if (!intra_refresh_type) {
+    intra_refresh_type =
+        g_enum_register_static ("GstSvtAv1EncIntraRefreshType", intra_refresh);
+  }
+  return intra_refresh_type;
+}
+
+typedef struct _GstSvtAv1Enc
+{
+  GstVideoEncoder video_encoder;
+
+  /* SVT-AV1 Encoder Handle */
+  EbComponentType *svt_encoder;
+
+  /* GStreamer Codec state */
+  GstVideoCodecState *state;
+
+  /* SVT-AV1 configuration */
+  EbSvtAv1EncConfiguration *svt_config;
+  /* Property values */
+  guint preset;
+  guint target_bitrate;
+  guint max_bitrate;
+  guint max_qp_allowed;
+  guint min_qp_allowed;
+  gint cqp, crf;
+  guint maximum_buffer_size;
+  gint intra_period_length;
+  gint intra_refresh_type;
+  gint logical_processors;
+  gint target_socket;
+  gchar *parameters_string;
+
+  EbBufferHeaderType *input_buf;
+} GstSvtAv1Enc;
+
+
+/* prototypes */
+static void gst_svtav1enc_set_property (GObject * object, guint property_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_svtav1enc_get_property (GObject * object, guint property_id,
+    GValue * value, GParamSpec * pspec);
+static void gst_svtav1enc_finalize (GObject * object);
+
+static void gst_svtav1enc_allocate_svt_buffers (GstSvtAv1Enc * svtav1enc);
+static void gst_svtav1enc_deallocate_svt_buffers (GstSvtAv1Enc * svtav1enc);
+static gboolean gst_svtav1enc_configure_svt (GstSvtAv1Enc * svtav1enc);
+static GstFlowReturn gst_svtav1enc_encode (GstSvtAv1Enc * svtav1enc,
+    GstVideoCodecFrame * frame);
+static gboolean gst_svtav1enc_send_eos (GstSvtAv1Enc * svtav1enc);
+static GstFlowReturn gst_svtav1enc_dequeue_encoded_frames (GstSvtAv1Enc *
+    svtav1enc, gboolean closing_encoder, gboolean output_frames);
+
+static gboolean gst_svtav1enc_open (GstVideoEncoder * encoder);
+static gboolean gst_svtav1enc_close (GstVideoEncoder * encoder);
+static gboolean gst_svtav1enc_start (GstVideoEncoder * encoder);
+static gboolean gst_svtav1enc_stop (GstVideoEncoder * encoder);
+static gboolean gst_svtav1enc_set_format (GstVideoEncoder * encoder,
+    GstVideoCodecState * state);
+static GstFlowReturn gst_svtav1enc_handle_frame (GstVideoEncoder * encoder,
+    GstVideoCodecFrame * frame);
+static GstFlowReturn gst_svtav1enc_finish (GstVideoEncoder * encoder);
+static gboolean gst_svtav1enc_propose_allocation (GstVideoEncoder * encoder,
+    GstQuery * query);
+static gboolean gst_svtav1enc_flush (GstVideoEncoder * encoder);
+
+static void gst_svtav1enc_parse_parameters_string (GstSvtAv1Enc * svtav1enc);
+
+enum
+{
+  PROP_0,
+  PROP_PRESET,
+  PROP_TARGET_BITRATE,
+  PROP_MAX_BITRATE,
+  PROP_MAX_QP_ALLOWED,
+  PROP_MIN_QP_ALLOWED,
+  PROP_CQP,
+  PROP_CRF,
+  PROP_MAXIMUM_BUFFER_SIZE,
+  PROP_INTRA_PERIOD_LENGTH,
+  PROP_INTRA_REFRESH_TYPE,
+  PROP_LOGICAL_PROCESSORS,
+  PROP_TARGET_SOCKET,
+  PROP_PARAMETERS_STRING,
+};
+
+#define PROP_PRESET_DEFAULT 10
+#define PROP_TARGET_BITRATE_DEFAULT 0
+#define PROP_MAX_BITRATE_DEFAULT 0
+#define PROP_QP_MAX_QP_ALLOWED_DEFAULT 63
+#define PROP_QP_MIN_QP_ALLOWED_DEFAULT 1
+#define PROP_CQP_DEFAULT -1
+#define PROP_CRF_DEFAULT 35
+#define PROP_MAXIMUM_BUFFER_SIZE_DEFAULT 1000
+#define PROP_INTRA_PERIOD_LENGTH_DEFAULT -2
+#define PROP_INTRA_REFRESH_TYPE_DEFAULT SVT_AV1_KF_REFRESH
+#define PROP_LOGICAL_PROCESSORS_DEFAULT 0
+#define PROP_TARGET_SOCKET_DEFAULT -1
+#define PROP_PARAMETERS_STRING_DEFAULT NULL
+
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+#define FORMAT_I420_10 "I420_10LE"
+#else
+#define FORMAT_I420_10 "I420_10BE"
+#endif
+
+/* pad templates */
+static GstStaticPadTemplate gst_svtav1enc_sink_pad_template =
+GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-raw, " "format = (string) {I420, " FORMAT_I420_10
+        "}, " "width = (int) 64, 16384, " "height = (int) 64, 8704, "
+        "framerate = (fraction) 0, MAX"));
+
+static GstStaticPadTemplate gst_svtav1enc_src_pad_template =
+GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-av1, " "stream-format = (string) obu-stream, "
+        "alignment = (string) tu, " "width = (int) 64, 16384, "
+        "height = (int) 64, 8704, " "framerate = (fraction) 0, MAX"));
+
+/* class initialization */
+G_DEFINE_TYPE_WITH_CODE (GstSvtAv1Enc, gst_svtav1enc, GST_TYPE_VIDEO_ENCODER,
+    GST_DEBUG_CATEGORY_INIT (gst_svtav1enc_debug_category, "svtav1enc", 0,
+        "SVT-AV1 encoder element"));
+
+GST_ELEMENT_REGISTER_DEFINE (svtav1enc, "svtav1enc", GST_RANK_SECONDARY,
+    gst_svtav1enc_get_type ());
+
+/* this mutex is required to avoid race conditions in SVT-AV1 memory allocations, which aren't thread-safe */
+G_LOCK_DEFINE_STATIC (init_mutex);
+
+static void
+gst_svtav1enc_class_init (GstSvtAv1EncClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstVideoEncoderClass *video_encoder_class = GST_VIDEO_ENCODER_CLASS (klass);
+
+  gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass),
+      &gst_svtav1enc_src_pad_template);
+
+  gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass),
+      &gst_svtav1enc_sink_pad_template);
+
+  gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (klass),
+      "SvtAv1Enc",
+      "Codec/Encoder/Video",
+      "Scalable Video Technology for AV1 Encoder (SVT-AV1 Encoder)",
+      "Jun Tian <jun.tian@intel.com> Xavier Hallade <xavier.hallade@intel.com>");
+
+  gobject_class->set_property = gst_svtav1enc_set_property;
+  gobject_class->get_property = gst_svtav1enc_get_property;
+  gobject_class->finalize = gst_svtav1enc_finalize;
+  video_encoder_class->open = GST_DEBUG_FUNCPTR (gst_svtav1enc_open);
+  video_encoder_class->close = GST_DEBUG_FUNCPTR (gst_svtav1enc_close);
+  video_encoder_class->start = GST_DEBUG_FUNCPTR (gst_svtav1enc_start);
+  video_encoder_class->stop = GST_DEBUG_FUNCPTR (gst_svtav1enc_stop);
+  video_encoder_class->set_format =
+      GST_DEBUG_FUNCPTR (gst_svtav1enc_set_format);
+  video_encoder_class->handle_frame =
+      GST_DEBUG_FUNCPTR (gst_svtav1enc_handle_frame);
+  video_encoder_class->finish = GST_DEBUG_FUNCPTR (gst_svtav1enc_finish);
+  video_encoder_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_svtav1enc_propose_allocation);
+  video_encoder_class->flush = GST_DEBUG_FUNCPTR (gst_svtav1enc_flush);
+
+  g_object_class_install_property (gobject_class,
+      PROP_PRESET,
+      g_param_spec_uint ("preset",
+          "Preset",
+          "Quality vs density tradeoff point"
+          " that the encoding is to be performed at"
+          " (0 is the highest quality, 13 is the highest speed) ",
+          0,
+          13, PROP_PRESET_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class,
+      PROP_TARGET_BITRATE,
+      g_param_spec_uint ("target-bitrate",
+          "Target bitrate",
+          "Target bitrate in kbits/sec. Enables CBR or VBR mode",
+          0,
+          100000,
+          PROP_TARGET_BITRATE_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class,
+      PROP_MAX_BITRATE,
+      g_param_spec_uint ("max-bitrate",
+          "Maximum bitrate",
+          "Maximum bitrate in kbits/sec. Enables VBR mode if a different "
+          "target-bitrate is provided",
+          0,
+          100000,
+          PROP_MAX_BITRATE_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+          GST_PARAM_MUTABLE_PLAYING));
+
+  g_object_class_install_property (gobject_class,
+      PROP_MAX_QP_ALLOWED,
+      g_param_spec_uint ("max-qp-allowed",
+          "Max Quantization parameter",
+          "Maximum QP value allowed for rate control use"
+          " Only used in CBR and VBR mode.",
+          0,
+          63, PROP_MAX_QP_ALLOWED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class,
+      PROP_MIN_QP_ALLOWED,
+      g_param_spec_uint ("min-qp-allowed",
+          "Min Quantization parameter",
+          "Minimum QP value allowed for rate control use"
+          " Only used in CBR and VBR mode.",
+          0,
+          63, PROP_MIN_QP_ALLOWED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class,
+      PROP_CQP,
+      g_param_spec_int ("cqp",
+          "Quantization parameter",
+          "Quantization parameter used in CQP mode (-1 is disabled)",
+          -1,
+          63, PROP_CQP_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class,
+      PROP_CRF,
+      g_param_spec_int ("crf",
+          "Constant Rate Factor",
+          "Quantization parameter used in CRF mode (-1 is disabled)",
+          -1,
+          63, PROP_CRF_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class,
+      PROP_MAXIMUM_BUFFER_SIZE,
+      g_param_spec_uint ("maximum-buffer-size",
+          "Maximum Buffer Size",
+          "Maximum buffer size in milliseconds."
+          " Only used in CBR mode.",
+          20,
+          10000,
+          PROP_MAXIMUM_BUFFER_SIZE_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class,
+      PROP_INTRA_PERIOD_LENGTH,
+      g_param_spec_int ("intra-period-length",
+          "Intra Period Length",
+          "Period of Intra Frames insertion (-2 is auto, -1 no updates)",
+          -2,
+          G_MAXINT,
+          PROP_INTRA_PERIOD_LENGTH_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class,
+      PROP_INTRA_REFRESH_TYPE,
+      g_param_spec_enum ("intra-refresh-type",
+          "Intra refresh type",
+          "CRA (open GOP)"
+          "or IDR frames (closed GOP)",
+          GST_SVTAV1ENC_TYPE_INTRA_REFRESH_TYPE,
+          PROP_INTRA_REFRESH_TYPE_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class,
+      PROP_LOGICAL_PROCESSORS,
+      g_param_spec_uint ("logical-processors",
+          "Logical Processors",
+          "Number of logical CPU cores to be used. 0: auto",
+          0,
+          G_MAXUINT,
+          PROP_LOGICAL_PROCESSORS_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class,
+      PROP_TARGET_SOCKET,
+      g_param_spec_int ("target-socket",
+          "Target socket",
+          "Target CPU socket to run on. -1: all available",
+          -1,
+          15,
+          PROP_TARGET_SOCKET_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (gobject_class,
+      PROP_PARAMETERS_STRING,
+      g_param_spec_string ("parameters-string",
+          "Parameters String",
+          "Colon-delimited list of key=value pairs of additional parameters to set",
+          PROP_PARAMETERS_STRING_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+}
+
+static void
+gst_svtav1enc_init (GstSvtAv1Enc * svtav1enc)
+{
+  svtav1enc->svt_config = g_new0 (EbSvtAv1EncConfiguration, 1);
+  svtav1enc->preset = PROP_PRESET_DEFAULT;
+  svtav1enc->target_bitrate = PROP_TARGET_BITRATE_DEFAULT;
+  svtav1enc->max_bitrate = PROP_MAX_BITRATE_DEFAULT;
+  svtav1enc->max_qp_allowed = PROP_QP_MAX_QP_ALLOWED_DEFAULT;
+  svtav1enc->min_qp_allowed = PROP_QP_MIN_QP_ALLOWED_DEFAULT;
+  svtav1enc->cqp = PROP_CQP_DEFAULT;
+  svtav1enc->crf = PROP_CRF_DEFAULT;
+  svtav1enc->maximum_buffer_size = PROP_MAXIMUM_BUFFER_SIZE_DEFAULT;
+  svtav1enc->intra_period_length = PROP_INTRA_PERIOD_LENGTH_DEFAULT;
+  svtav1enc->intra_refresh_type = PROP_INTRA_REFRESH_TYPE_DEFAULT;
+  svtav1enc->logical_processors = PROP_LOGICAL_PROCESSORS_DEFAULT;
+  svtav1enc->target_socket = PROP_TARGET_SOCKET_DEFAULT;
+  svtav1enc->parameters_string = PROP_PARAMETERS_STRING_DEFAULT;
+}
+
+static void
+gst_svtav1enc_set_property (GObject * object, guint property_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstSvtAv1Enc *svtav1enc = GST_SVTAV1ENC (object);
+
+  /* TODO: support reconfiguring on the fly when possible */
+  if (svtav1enc->state) {
+    GST_ERROR_OBJECT (svtav1enc,
+        "encoder state has been set before properties, this isn't supported yet.");
+    return;
+  }
+
+  GST_LOG_OBJECT (svtav1enc, "setting property %u", property_id);
+
+  switch (property_id) {
+    case PROP_PRESET:
+      svtav1enc->preset = g_value_get_uint (value);
+      break;
+    case PROP_TARGET_BITRATE:
+      svtav1enc->target_bitrate = g_value_get_uint (value) * 1000;
+      break;
+    case PROP_MAX_BITRATE:
+      svtav1enc->max_bitrate = g_value_get_uint (value) * 1000;
+      break;
+    case PROP_MAX_QP_ALLOWED:
+      svtav1enc->max_qp_allowed = g_value_get_uint (value);
+      break;
+    case PROP_MIN_QP_ALLOWED:
+      svtav1enc->min_qp_allowed = g_value_get_uint (value);
+      break;
+    case PROP_CQP:
+      svtav1enc->cqp = g_value_get_int (value);
+      break;
+    case PROP_CRF:
+      svtav1enc->crf = g_value_get_int (value);
+      break;
+    case PROP_MAXIMUM_BUFFER_SIZE:
+      svtav1enc->maximum_buffer_size = g_value_get_uint (value);
+      break;
+    case PROP_INTRA_PERIOD_LENGTH:
+      svtav1enc->intra_period_length = g_value_get_int (value);
+      break;
+    case PROP_INTRA_REFRESH_TYPE:
+      svtav1enc->intra_refresh_type = g_value_get_enum (value);
+      break;
+    case PROP_LOGICAL_PROCESSORS:
+      svtav1enc->logical_processors = g_value_get_uint (value);
+      break;
+    case PROP_TARGET_SOCKET:
+      svtav1enc->target_socket = g_value_get_int (value);
+      break;
+    case PROP_PARAMETERS_STRING:{
+      g_free (svtav1enc->parameters_string);
+      svtav1enc->parameters_string = g_value_dup_string (value);
+      break;
+    }
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_svtav1enc_get_property (GObject * object, guint property_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstSvtAv1Enc *svtav1enc = GST_SVTAV1ENC (object);
+
+  GST_LOG_OBJECT (svtav1enc, "getting property %u", property_id);
+
+  switch (property_id) {
+    case PROP_PRESET:
+      g_value_set_uint (value, svtav1enc->preset);
+      break;
+    case PROP_TARGET_BITRATE:
+      g_value_set_uint (value, svtav1enc->target_bitrate / 1000);
+      break;
+    case PROP_MAX_BITRATE:
+      g_value_set_uint (value, svtav1enc->max_bitrate / 1000);
+      break;
+    case PROP_MAX_QP_ALLOWED:
+      g_value_set_uint (value, svtav1enc->max_qp_allowed);
+      break;
+    case PROP_MIN_QP_ALLOWED:
+      g_value_set_uint (value, svtav1enc->min_qp_allowed);
+      break;
+    case PROP_CQP:
+      g_value_set_int (value, svtav1enc->cqp);
+      break;
+    case PROP_CRF:
+      g_value_set_int (value, svtav1enc->crf);
+      break;
+    case PROP_MAXIMUM_BUFFER_SIZE:
+      g_value_set_uint (value, svtav1enc->maximum_buffer_size);
+      break;
+    case PROP_INTRA_PERIOD_LENGTH:
+      g_value_set_int (value, svtav1enc->intra_period_length);
+      break;
+    case PROP_INTRA_REFRESH_TYPE:
+      g_value_set_enum (value, svtav1enc->intra_refresh_type);
+      break;
+    case PROP_LOGICAL_PROCESSORS:
+      g_value_set_uint (value, svtav1enc->logical_processors);
+      break;
+    case PROP_TARGET_SOCKET:
+      g_value_set_int (value, svtav1enc->target_socket);
+      break;
+    case PROP_PARAMETERS_STRING:
+      g_value_set_string (value, svtav1enc->parameters_string);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_svtav1enc_finalize (GObject * object)
+{
+  GstSvtAv1Enc *svtav1enc = GST_SVTAV1ENC (object);
+
+  GST_DEBUG_OBJECT (svtav1enc, "finalizing svtav1enc");
+
+  g_free (svtav1enc->svt_config);
+  g_free (svtav1enc->parameters_string);
+
+  G_OBJECT_CLASS (gst_svtav1enc_parent_class)->finalize (object);
+}
+
+static void
+gst_svtav1enc_allocate_svt_buffers (GstSvtAv1Enc * svtav1enc)
+{
+  svtav1enc->input_buf = g_new0 (EbBufferHeaderType, 1);
+  svtav1enc->input_buf->p_buffer = (guint8 *) g_new0 (EbSvtIOFormat, 1);
+  svtav1enc->input_buf->size = sizeof (EbBufferHeaderType);
+  svtav1enc->input_buf->p_app_private = NULL;
+  svtav1enc->input_buf->pic_type = EB_AV1_INVALID_PICTURE;
+  svtav1enc->input_buf->metadata = NULL;
+}
+
+static void
+gst_svtav1enc_deallocate_svt_buffers (GstSvtAv1Enc * svtav1enc)
+{
+  if (svtav1enc->input_buf) {
+    g_free (svtav1enc->input_buf->p_buffer);
+    svtav1enc->input_buf->p_buffer = NULL;
+    g_free (svtav1enc->input_buf);
+    svtav1enc->input_buf = NULL;
+  }
+}
+
+static gboolean
+gst_svtav1enc_configure_svt (GstSvtAv1Enc * svtav1enc)
+{
+  if (!svtav1enc->state) {
+    GST_WARNING_OBJECT (svtav1enc, "no state, can't configure encoder yet");
+    return FALSE;
+  }
+
+  /* set object properties */
+  svtav1enc->svt_config->enc_mode = svtav1enc->preset;
+  if (svtav1enc->target_bitrate != 0) {
+    svtav1enc->svt_config->target_bit_rate = svtav1enc->target_bitrate;
+    if (svtav1enc->target_bitrate != svtav1enc->max_bitrate) {
+      GST_DEBUG_OBJECT (svtav1enc,
+          "Enabling VBR mode (br %u max-br %u max-qp %u min-qp %u)",
+          svtav1enc->target_bitrate,
+          svtav1enc->max_bitrate,
+          svtav1enc->max_qp_allowed, svtav1enc->min_qp_allowed);
+      svtav1enc->svt_config->max_bit_rate = svtav1enc->max_bitrate;
+      svtav1enc->svt_config->rate_control_mode = SVT_AV1_RC_MODE_VBR;
+    } else {
+      GST_DEBUG_OBJECT (svtav1enc,
+          "Enabling CBR mode (br %u max-bs %u)",
+          svtav1enc->target_bitrate, svtav1enc->maximum_buffer_size);
+      svtav1enc->svt_config->rate_control_mode = SVT_AV1_RC_MODE_CBR;
+      svtav1enc->svt_config->maximum_buffer_size_ms =
+          svtav1enc->maximum_buffer_size;
+    }
+    svtav1enc->svt_config->max_qp_allowed = svtav1enc->max_qp_allowed;
+    svtav1enc->svt_config->min_qp_allowed = svtav1enc->min_qp_allowed;
+    svtav1enc->svt_config->force_key_frames = FALSE;
+  } else if (svtav1enc->crf > 0) {
+    GST_DEBUG_OBJECT (svtav1enc, "Enabling CRF mode (qp %u)", svtav1enc->crf);
+    svtav1enc->svt_config->qp = svtav1enc->crf;
+    svtav1enc->svt_config->rate_control_mode = SVT_AV1_RC_MODE_CQP_OR_CRF;
+    svtav1enc->svt_config->force_key_frames = TRUE;
+  } else if (svtav1enc->cqp > 0) {
+    GST_DEBUG_OBJECT (svtav1enc, "Enabling CQP mode (qp %u)", svtav1enc->cqp);
+    svtav1enc->svt_config->qp = svtav1enc->cqp;
+    svtav1enc->svt_config->rate_control_mode = SVT_AV1_RC_MODE_CQP_OR_CRF;
+    svtav1enc->svt_config->enable_adaptive_quantization = FALSE;
+    svtav1enc->svt_config->force_key_frames = TRUE;
+  } else {
+    GST_DEBUG_OBJECT (svtav1enc, "Using default rate control settings");
+  }
+  svtav1enc->svt_config->intra_period_length = svtav1enc->intra_period_length;
+  svtav1enc->svt_config->intra_refresh_type = svtav1enc->intra_refresh_type;
+  svtav1enc->svt_config->logical_processors = svtav1enc->logical_processors;
+  svtav1enc->svt_config->target_socket = svtav1enc->target_socket;
+  gst_svtav1enc_parse_parameters_string (svtav1enc);
+
+  /* set properties out of GstVideoInfo */
+  const GstVideoInfo *info = &svtav1enc->state->info;
+  svtav1enc->svt_config->encoder_bit_depth =
+      GST_VIDEO_INFO_COMP_DEPTH (info, 0);
+  svtav1enc->svt_config->source_width = GST_VIDEO_INFO_WIDTH (info);
+  svtav1enc->svt_config->source_height = GST_VIDEO_INFO_HEIGHT (info);
+  svtav1enc->svt_config->frame_rate_numerator = GST_VIDEO_INFO_FPS_N (info) > 0
+      ? GST_VIDEO_INFO_FPS_N (info)
+      : 1;
+  svtav1enc->svt_config->frame_rate_denominator =
+      GST_VIDEO_INFO_FPS_D (info) > 0 ? GST_VIDEO_INFO_FPS_D (info)
+      : 1;
+  GST_LOG_OBJECT (svtav1enc,
+      "width %d, height %d, framerate %d/%d",
+      svtav1enc->svt_config->source_width,
+      svtav1enc->svt_config->source_height,
+      svtav1enc->svt_config->frame_rate_numerator,
+      svtav1enc->svt_config->frame_rate_denominator);
+
+  switch (GST_VIDEO_INFO_COLORIMETRY (info).primaries) {
+    case GST_VIDEO_COLOR_PRIMARIES_BT709:
+      svtav1enc->svt_config->color_primaries = EB_CICP_CP_BT_709;
+      break;
+    case GST_VIDEO_COLOR_PRIMARIES_BT470M:
+      svtav1enc->svt_config->color_primaries = EB_CICP_CP_BT_470_M;
+      break;
+    case GST_VIDEO_COLOR_PRIMARIES_BT470BG:
+      svtav1enc->svt_config->color_primaries = EB_CICP_CP_BT_470_B_G;
+      break;
+    case GST_VIDEO_COLOR_PRIMARIES_SMPTE170M:
+      svtav1enc->svt_config->color_primaries = EB_CICP_CP_BT_601;
+      break;
+    case GST_VIDEO_COLOR_PRIMARIES_SMPTE240M:
+      svtav1enc->svt_config->color_primaries = EB_CICP_CP_SMPTE_240;
+      break;
+    case GST_VIDEO_COLOR_PRIMARIES_FILM:
+      svtav1enc->svt_config->color_primaries = EB_CICP_CP_GENERIC_FILM;
+      break;
+    case GST_VIDEO_COLOR_PRIMARIES_BT2020:
+      svtav1enc->svt_config->color_primaries = EB_CICP_CP_BT_2020;
+      break;
+    case GST_VIDEO_COLOR_PRIMARIES_SMPTERP431:
+      svtav1enc->svt_config->color_primaries = EB_CICP_CP_SMPTE_431;
+      break;
+    case GST_VIDEO_COLOR_PRIMARIES_SMPTEEG432:
+      svtav1enc->svt_config->color_primaries = EB_CICP_CP_SMPTE_432;
+      break;
+    case GST_VIDEO_COLOR_PRIMARIES_EBU3213:
+      svtav1enc->svt_config->color_primaries = EB_CICP_CP_EBU_3213;
+      break;
+    default:
+      svtav1enc->svt_config->color_primaries = EB_CICP_CP_UNSPECIFIED;
+      break;
+  }
+
+  switch (GST_VIDEO_INFO_COLORIMETRY (info).transfer) {
+    case GST_VIDEO_TRANSFER_BT709:
+      svtav1enc->svt_config->transfer_characteristics = EB_CICP_TC_BT_709;
+      break;
+    case GST_VIDEO_TRANSFER_GAMMA28:
+      svtav1enc->svt_config->transfer_characteristics = EB_CICP_TC_BT_470_B_G;
+      break;
+    case GST_VIDEO_TRANSFER_BT601:
+      svtav1enc->svt_config->transfer_characteristics = EB_CICP_TC_BT_601;
+      break;
+    case GST_VIDEO_TRANSFER_SMPTE240M:
+      svtav1enc->svt_config->transfer_characteristics = EB_CICP_TC_SMPTE_240;
+      break;
+    case GST_VIDEO_TRANSFER_GAMMA10:
+      svtav1enc->svt_config->transfer_characteristics = EB_CICP_TC_LINEAR;
+      break;
+    case GST_VIDEO_TRANSFER_LOG100:
+      svtav1enc->svt_config->transfer_characteristics = EB_CICP_TC_LOG_100;
+      break;
+    case GST_VIDEO_TRANSFER_LOG316:
+      svtav1enc->svt_config->transfer_characteristics =
+          EB_CICP_TC_LOG_100_SQRT10;
+      break;
+    case GST_VIDEO_TRANSFER_SRGB:
+      svtav1enc->svt_config->transfer_characteristics = EB_CICP_TC_SRGB;
+      break;
+    case GST_VIDEO_TRANSFER_BT2020_10:
+      svtav1enc->svt_config->transfer_characteristics =
+          EB_CICP_TC_BT_2020_10_BIT;
+      break;
+    case GST_VIDEO_TRANSFER_BT2020_12:
+      svtav1enc->svt_config->transfer_characteristics =
+          EB_CICP_TC_BT_2020_12_BIT;
+      break;
+    case GST_VIDEO_TRANSFER_SMPTE2084:
+      svtav1enc->svt_config->transfer_characteristics = EB_CICP_TC_SMPTE_2084;
+      break;
+    case GST_VIDEO_TRANSFER_ARIB_STD_B67:
+      svtav1enc->svt_config->transfer_characteristics = EB_CICP_TC_HLG;
+      break;
+    default:
+      svtav1enc->svt_config->transfer_characteristics = EB_CICP_TC_UNSPECIFIED;
+      break;
+  }
+
+  switch (GST_VIDEO_INFO_COLORIMETRY (info).matrix) {
+    case GST_VIDEO_COLOR_MATRIX_RGB:
+      svtav1enc->svt_config->matrix_coefficients = EB_CICP_MC_IDENTITY;
+      break;
+    case GST_VIDEO_COLOR_MATRIX_BT709:
+      svtav1enc->svt_config->matrix_coefficients = EB_CICP_MC_BT_709;
+      break;
+    case GST_VIDEO_COLOR_MATRIX_FCC:
+      svtav1enc->svt_config->matrix_coefficients = EB_CICP_MC_FCC;
+      break;
+    case GST_VIDEO_COLOR_MATRIX_BT601:
+      svtav1enc->svt_config->matrix_coefficients = EB_CICP_MC_BT_601;
+      break;
+    case GST_VIDEO_COLOR_MATRIX_SMPTE240M:
+      svtav1enc->svt_config->matrix_coefficients = EB_CICP_MC_SMPTE_240;
+      break;
+    case GST_VIDEO_COLOR_MATRIX_BT2020:
+      svtav1enc->svt_config->matrix_coefficients = EB_CICP_MC_BT_2020_NCL;
+      break;
+
+    default:
+      svtav1enc->svt_config->matrix_coefficients = EB_CICP_MC_UNSPECIFIED;
+      break;
+  }
+
+  if (GST_VIDEO_INFO_COLORIMETRY (info).range == GST_VIDEO_COLOR_RANGE_0_255) {
+    svtav1enc->svt_config->color_range = EB_CR_FULL_RANGE;
+  } else {
+    svtav1enc->svt_config->color_range = EB_CR_STUDIO_RANGE;
+  }
+
+  switch (GST_VIDEO_INFO_CHROMA_SITE (info)) {
+    case GST_VIDEO_CHROMA_SITE_V_COSITED:
+      svtav1enc->svt_config->chroma_sample_position = EB_CSP_VERTICAL;
+      break;
+    case GST_VIDEO_CHROMA_SITE_COSITED:
+      svtav1enc->svt_config->chroma_sample_position = EB_CSP_COLOCATED;
+      break;
+    default:
+      svtav1enc->svt_config->chroma_sample_position = EB_CSP_UNKNOWN;
+  }
+
+  GstVideoMasteringDisplayInfo master_display_info;
+  if (gst_video_mastering_display_info_from_caps (&master_display_info,
+          svtav1enc->state->caps)) {
+    svtav1enc->svt_config->mastering_display.r.x =
+        master_display_info.display_primaries0.x;
+    svtav1enc->svt_config->mastering_display.r.y =
+        master_display_info.display_primaries0.y;
+    svtav1enc->svt_config->mastering_display.g.x =
+        master_display_info.display_primaries1.x;
+    svtav1enc->svt_config->mastering_display.g.y =
+        master_display_info.display_primaries1.y;
+    svtav1enc->svt_config->mastering_display.b.x =
+        master_display_info.display_primaries2.x;
+    svtav1enc->svt_config->mastering_display.b.y =
+        master_display_info.display_primaries2.y;
+    svtav1enc->svt_config->mastering_display.white_point.x =
+        master_display_info.white_point.x;
+    svtav1enc->svt_config->mastering_display.white_point.y =
+        master_display_info.white_point.y;
+    svtav1enc->svt_config->mastering_display.max_luma =
+        master_display_info.max_display_mastering_luminance;
+    svtav1enc->svt_config->mastering_display.min_luma =
+        master_display_info.min_display_mastering_luminance;
+    svtav1enc->svt_config->high_dynamic_range_input = TRUE;
+  } else {
+    memset (&svtav1enc->svt_config->mastering_display,
+        0, sizeof (svtav1enc->svt_config->mastering_display));
+    svtav1enc->svt_config->high_dynamic_range_input = FALSE;
+  }
+
+  GstVideoContentLightLevel content_light_level;
+  if (gst_video_content_light_level_from_caps (&content_light_level,
+          svtav1enc->state->caps)) {
+    svtav1enc->svt_config->content_light_level.max_cll =
+        content_light_level.max_content_light_level;
+    svtav1enc->svt_config->content_light_level.max_fall =
+        content_light_level.max_frame_average_light_level;
+  } else {
+    memset (&svtav1enc->svt_config->content_light_level,
+        0, sizeof (svtav1enc->svt_config->content_light_level));
+  }
+
+  EbErrorType res =
+      svt_av1_enc_set_parameter (svtav1enc->svt_encoder, svtav1enc->svt_config);
+  if (res != EB_ErrorNone) {
+    GST_ELEMENT_ERROR (svtav1enc,
+        LIBRARY,
+        INIT, (NULL), ("svt_av1_enc_set_parameter failed with error %d", res));
+    return FALSE;
+  }
+  return TRUE;
+}
+
+static gboolean
+gst_svtav1enc_start_svt (GstSvtAv1Enc * svtav1enc)
+{
+  G_LOCK (init_mutex);
+  EbErrorType res = svt_av1_enc_init (svtav1enc->svt_encoder);
+  G_UNLOCK (init_mutex);
+
+  if (res != EB_ErrorNone) {
+    GST_ELEMENT_ERROR (svtav1enc, LIBRARY, INIT, (NULL),
+        ("svt_av1_enc_init failed with error %d", res));
+    return FALSE;
+  }
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_svtav1enc_encode (GstSvtAv1Enc * svtav1enc, GstVideoCodecFrame * frame)
+{
+  GstFlowReturn ret = GST_FLOW_OK;
+  EbErrorType res = EB_ErrorNone;
+  EbBufferHeaderType *input_buffer = svtav1enc->input_buf;
+  EbSvtIOFormat *input_picture_buffer =
+      (EbSvtIOFormat *) svtav1enc->input_buf->p_buffer;
+  GstVideoFrame video_frame;
+
+  if (!gst_video_frame_map (&video_frame, &svtav1enc->state->info,
+          frame->input_buffer, GST_MAP_READ)) {
+    GST_ELEMENT_ERROR (svtav1enc, LIBRARY, ENCODE, (NULL),
+        ("couldn't map input frame"));
+    return GST_FLOW_ERROR;
+  }
+
+  input_picture_buffer->y_stride =
+      GST_VIDEO_FRAME_COMP_STRIDE (&video_frame,
+      0) / GST_VIDEO_FRAME_COMP_PSTRIDE (&video_frame, 0);
+  input_picture_buffer->cb_stride =
+      GST_VIDEO_FRAME_COMP_STRIDE (&video_frame,
+      1) / GST_VIDEO_FRAME_COMP_PSTRIDE (&video_frame, 1);
+  input_picture_buffer->cr_stride =
+      GST_VIDEO_FRAME_COMP_STRIDE (&video_frame,
+      2) / GST_VIDEO_FRAME_COMP_PSTRIDE (&video_frame, 2);
+
+  input_picture_buffer->luma = GST_VIDEO_FRAME_PLANE_DATA (&video_frame, 0);
+  input_picture_buffer->cb = GST_VIDEO_FRAME_PLANE_DATA (&video_frame, 1);
+  input_picture_buffer->cr = GST_VIDEO_FRAME_PLANE_DATA (&video_frame, 2);
+
+  input_buffer->n_filled_len = GST_VIDEO_FRAME_SIZE (&video_frame);
+
+  /* Fill in Buffers Header control data */
+  input_buffer->flags = 0;
+  input_buffer->p_app_private = NULL;
+  input_buffer->pts = frame->pts;
+  input_buffer->pic_type = EB_AV1_INVALID_PICTURE;
+
+  if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame)) {
+    input_buffer->pic_type = EB_AV1_KEY_PICTURE;
+  }
+
+  input_buffer->metadata = NULL;
+
+  res = svt_av1_enc_send_picture (svtav1enc->svt_encoder, input_buffer);
+  if (res != EB_ErrorNone) {
+    GST_ELEMENT_ERROR (svtav1enc, LIBRARY, ENCODE, (NULL),
+        ("error in sending picture to encoder"));
+    ret = GST_FLOW_ERROR;
+  }
+  gst_video_frame_unmap (&video_frame);
+
+  return ret;
+}
+
+static gboolean
+gst_svtav1enc_send_eos (GstSvtAv1Enc * svtav1enc)
+{
+  EbErrorType ret = EB_ErrorNone;
+
+  EbBufferHeaderType input_buffer;
+  input_buffer.n_alloc_len = 0;
+  input_buffer.n_filled_len = 0;
+  input_buffer.n_tick_count = 0;
+  input_buffer.p_app_private = NULL;
+  input_buffer.flags = EB_BUFFERFLAG_EOS;
+  input_buffer.p_buffer = NULL;
+  input_buffer.metadata = NULL;
+
+  GST_DEBUG_OBJECT (svtav1enc, "send eos");
+
+  ret = svt_av1_enc_send_picture (svtav1enc->svt_encoder, &input_buffer);
+
+  if (ret != EB_ErrorNone) {
+    GST_ELEMENT_ERROR (svtav1enc, LIBRARY, ENCODE, (NULL),
+        ("couldn't send EOS frame."));
+    return FALSE;
+  }
+
+  return (ret == EB_ErrorNone);
+}
+
+static gboolean
+gst_svtav1enc_flush (GstVideoEncoder * encoder)
+{
+  GstFlowReturn ret =
+      gst_svtav1enc_dequeue_encoded_frames (GST_SVTAV1ENC (encoder), TRUE,
+      FALSE);
+
+  return (ret != GST_FLOW_ERROR);
+}
+
+static GstFlowReturn
+gst_svtav1enc_dequeue_encoded_frames (GstSvtAv1Enc * svtav1enc,
+    gboolean done_sending_pics, gboolean output_frames)
+{
+  GstFlowReturn ret = GST_FLOW_OK;
+  EbErrorType res = EB_ErrorNone;
+  gboolean encode_at_eos = FALSE;
+
+  GST_DEBUG_OBJECT (svtav1enc, "dequeue encoded frames");
+
+  do {
+    GstVideoCodecFrame *frame = NULL;
+    EbBufferHeaderType *output_buf = NULL;
+
+    res =
+        svt_av1_enc_get_packet (svtav1enc->svt_encoder, &output_buf,
+        done_sending_pics);
+
+    if (output_buf != NULL)
+      encode_at_eos =
+          ((output_buf->flags & EB_BUFFERFLAG_EOS) == EB_BUFFERFLAG_EOS);
+
+    if (res == EB_ErrorMax) {
+      GST_ELEMENT_ERROR (svtav1enc, LIBRARY, ENCODE, (NULL), ("encode failed"));
+      return GST_FLOW_ERROR;
+    } else if (res != EB_NoErrorEmptyQueue && output_frames && output_buf) {
+      // AV1 has no frame re-ordering so always get the oldest frame
+      frame =
+          gst_video_encoder_get_oldest_frame (GST_VIDEO_ENCODER (svtav1enc));
+      if (output_buf->pic_type == EB_AV1_KEY_PICTURE
+          || output_buf->pic_type == EB_AV1_INTRA_ONLY_PICTURE) {
+        GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
+      }
+
+      if ((ret =
+              gst_video_encoder_allocate_output_frame (GST_VIDEO_ENCODER
+                  (svtav1enc), frame,
+                  output_buf->n_filled_len)) != GST_FLOW_OK) {
+        svt_av1_enc_release_out_buffer (&output_buf);
+        gst_video_codec_frame_unref (frame);
+        return ret;
+      }
+      gst_buffer_fill (frame->output_buffer, 0, output_buf->p_buffer,
+          output_buf->n_filled_len);
+
+      frame->pts = frame->output_buffer->pts = output_buf->pts;
+
+      GST_LOG_OBJECT (svtav1enc,
+          "#frame:%u pts:%" G_GINT64_FORMAT " SliceType:%d\n",
+          frame->system_frame_number, (frame->pts), output_buf->pic_type);
+
+      svt_av1_enc_release_out_buffer (&output_buf);
+      output_buf = NULL;
+
+      ret =
+          gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (svtav1enc), frame);
+    }
+
+  } while (res == EB_ErrorNone && !encode_at_eos && ret == GST_FLOW_OK);
+
+  return ret;
+}
+
+static gboolean
+gst_svtav1enc_open (GstVideoEncoder * encoder)
+{
+  GstSvtAv1Enc *svtav1enc = GST_SVTAV1ENC (encoder);
+
+  GST_DEBUG_OBJECT (svtav1enc, "open");
+
+  EbErrorType res = svt_av1_enc_init_handle (&svtav1enc->svt_encoder, NULL,
+      svtav1enc->svt_config);
+  if (res != EB_ErrorNone) {
+    GST_ELEMENT_ERROR (svtav1enc,
+        LIBRARY,
+        INIT, (NULL), ("svt_av1_enc_init_handle failed with error %d", res));
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_svtav1enc_close (GstVideoEncoder * encoder)
+{
+  GstSvtAv1Enc *svtav1enc = GST_SVTAV1ENC (encoder);
+
+  GST_DEBUG_OBJECT (svtav1enc, "close");
+
+  svt_av1_enc_deinit_handle (svtav1enc->svt_encoder);
+  svtav1enc->svt_encoder = NULL;
+  return TRUE;
+}
+
+static gboolean
+gst_svtav1enc_start (GstVideoEncoder * encoder)
+{
+  GstSvtAv1Enc *svtav1enc = GST_SVTAV1ENC (encoder);
+
+  GST_DEBUG_OBJECT (svtav1enc, "start");
+
+  gst_svtav1enc_allocate_svt_buffers (svtav1enc);
+  return TRUE;
+}
+
+static gboolean
+gst_svtav1enc_stop (GstVideoEncoder * encoder)
+{
+  GstSvtAv1Enc *svtav1enc = GST_SVTAV1ENC (encoder);
+
+  GST_DEBUG_OBJECT (svtav1enc, "stop");
+
+  if (svtav1enc->state)
+    gst_video_codec_state_unref (svtav1enc->state);
+  svtav1enc->state = NULL;
+
+  svt_av1_enc_deinit (svtav1enc->svt_encoder);
+  gst_svtav1enc_deallocate_svt_buffers (svtav1enc);
+
+  return TRUE;
+}
+
+static gboolean
+gst_svtav1enc_set_format (GstVideoEncoder * encoder, GstVideoCodecState * state)
+{
+  GstSvtAv1Enc *svtav1enc = GST_SVTAV1ENC (encoder);
+  GstClockTime min_latency_frames = 0;
+  GstCaps *src_caps = NULL;
+  GstVideoCodecState *output_state;
+  GST_DEBUG_OBJECT (svtav1enc, "set_format");
+
+  if (svtav1enc->state
+      && !gst_video_info_is_equal (&svtav1enc->state->info, &state->info)) {
+    gst_svtav1enc_finish (encoder);
+    gst_svtav1enc_stop (encoder);
+    gst_svtav1enc_close (encoder);
+    gst_svtav1enc_open (encoder);
+    gst_svtav1enc_start (encoder);
+  }
+  svtav1enc->state = gst_video_codec_state_ref (state);
+
+  if (!gst_svtav1enc_configure_svt (svtav1enc))
+    return FALSE;
+  if (!gst_svtav1enc_start_svt (svtav1enc))
+    return FALSE;
+
+  guint32 fps = svtav1enc->svt_config->frame_rate_numerator /
+      svtav1enc->svt_config->frame_rate_denominator;
+  fps = fps > 120 ? 120 : fps;
+  fps = fps < 24 ? 24 : fps;
+
+  min_latency_frames = ((fps * 5) >> 2);
+
+  gst_video_encoder_set_latency (encoder,
+      min_latency_frames * GST_SECOND /
+      (svtav1enc->svt_config->frame_rate_numerator /
+          svtav1enc->svt_config->frame_rate_denominator), -1);
+
+  src_caps = gst_static_pad_template_get_caps (&gst_svtav1enc_src_pad_template);
+  output_state =
+      gst_video_encoder_set_output_state (GST_VIDEO_ENCODER (encoder), src_caps,
+      svtav1enc->state);
+  gst_video_codec_state_unref (output_state);
+
+  GST_DEBUG_OBJECT (svtav1enc, "output caps: %" GST_PTR_FORMAT,
+      svtav1enc->state->caps);
+
+  return gst_video_encoder_negotiate (encoder);
+}
+
+static GstFlowReturn
+gst_svtav1enc_handle_frame (GstVideoEncoder * encoder,
+    GstVideoCodecFrame * frame)
+{
+  GstSvtAv1Enc *svtav1enc = GST_SVTAV1ENC (encoder);
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  GST_DEBUG_OBJECT (svtav1enc, "handle_frame");
+
+  ret = gst_svtav1enc_encode (svtav1enc, frame);
+  gst_video_codec_frame_unref (frame);
+  if (ret != GST_FLOW_OK) {
+    GST_DEBUG_OBJECT (svtav1enc, "gst_svtav1enc_encode returned %d", ret);
+    return ret;
+  }
+
+  return gst_svtav1enc_dequeue_encoded_frames (svtav1enc, FALSE, TRUE);
+}
+
+static GstFlowReturn
+gst_svtav1enc_finish (GstVideoEncoder * encoder)
+{
+  GstFlowReturn ret = GST_FLOW_OK;
+  GstSvtAv1Enc *svtav1enc = GST_SVTAV1ENC (encoder);
+
+  GST_DEBUG_OBJECT (svtav1enc, "finish");
+
+  if (svtav1enc->state) {
+    gst_svtav1enc_send_eos (svtav1enc);
+    ret = gst_svtav1enc_dequeue_encoded_frames (svtav1enc, TRUE, TRUE);
+  }
+
+  return ret;
+}
+
+static gboolean
+gst_svtav1enc_propose_allocation (GstVideoEncoder * encoder, GstQuery * query)
+{
+  GstSvtAv1Enc *svtav1enc = GST_SVTAV1ENC (encoder);
+
+  GST_DEBUG_OBJECT (svtav1enc, "propose_allocation");
+
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);
+
+  return
+      GST_VIDEO_ENCODER_CLASS (gst_svtav1enc_parent_class)->propose_allocation
+      (encoder, query);
+}
+
+static void
+gst_svtav1enc_parse_parameters_string (GstSvtAv1Enc * svtav1enc)
+{
+  gchar **key_values, **p;
+
+  if (!svtav1enc->parameters_string)
+    return;
+
+  p = key_values = g_strsplit (svtav1enc->parameters_string, ":", -1);
+  while (p && *p) {
+    gchar *equals;
+    EbErrorType res;
+
+    equals = strchr (*p, '=');
+    if (!equals) {
+      p++;
+      continue;
+    }
+
+    *equals = '\0';
+    equals++;
+
+    GST_DEBUG_OBJECT (svtav1enc, "Setting parameter %s=%s", *p, equals);
+
+    res = svt_av1_enc_parse_parameter (svtav1enc->svt_config, *p, equals);
+    if (res != EB_ErrorNone) {
+      GST_WARNING_OBJECT (svtav1enc, "Failed to set parameter %s=%s: %d", *p,
+          equals, res);
+    }
+
+    p++;
+  }
+
+  g_strfreev (key_values);
+}
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  return GST_ELEMENT_REGISTER (svtav1enc, plugin);
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, svtav1,
+    "Scalable Video Technology for AV1 (SVT-AV1)", plugin_init,
+    VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN)

gst-plugins-bad-1.24.5.tar.xz/ext/svtav1/gstsvtav1enc.h Added

gst-plugins-bad-1.24.5.tar.xz/ext/svtav1/meson.build Added

gst-plugins-bad-1.22.7.tar.xz/ext/svthevcenc/gstsvthevcenc.c -> gst-plugins-bad-1.24.5.tar.xz/ext/svthevcenc/gstsvthevcenc.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/ttml/gstttmlparse.c -> gst-plugins-bad-1.24.5.tar.xz/ext/ttml/gstttmlparse.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/ttml/gstttmlrender.c -> gst-plugins-bad-1.24.5.tar.xz/ext/ttml/gstttmlrender.c Changed

@@ -58,7 +58,7 @@
 #define TTML_RENDER_CAPS GST_VIDEO_CAPS_MAKE (VIDEO_FORMATS)
 
 #define TTML_RENDER_ALL_CAPS TTML_RENDER_CAPS ";" \
-    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ALL)
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ANY)
 
 GST_DEBUG_CATEGORY_EXTERN (ttmlrender_debug);
 #define GST_CAT_DEFAULT ttmlrender_debug
@@ -273,7 +273,7 @@
   gstelement_class->change_state =
       GST_DEBUG_FUNCPTR (gst_ttml_render_change_state);
 
-  klass->pango_lock = g_slice_new (GMutex);
+  klass->pango_lock = g_new (GMutex, 1);
   g_mutex_init (klass->pango_lock);
 }
 
@@ -1228,7 +1228,7 @@
 static void
 gst_ttml_render_char_range_free (CharRange * range)
 {
-  g_slice_free (CharRange, range);
+  g_free (range);
 }
 
 
@@ -1301,7 +1301,7 @@
 
   gst_subtitle_element_unref (unified_element->element);
   g_free (unified_element->text);
-  g_slice_free (UnifiedElement, unified_element);
+  g_free (unified_element);
 }
 
 
@@ -1313,7 +1313,7 @@
   if (!unified_element)
     return NULL;
 
-  ret = g_slice_new0 (UnifiedElement);
+  ret = g_new0 (UnifiedElement, 1);
   ret->element = gst_subtitle_element_ref (unified_element->element);
   ret->pango_font_size = unified_element->pango_font_size;
   ret->pango_font_metrics.height = unified_element->pango_font_metrics.height;
@@ -1334,7 +1334,7 @@
   gst_subtitle_style_set_unref (unified_block->style_set);
   g_ptr_array_unref (unified_block->unified_elements);
   g_free (unified_block->joined_text);
-  g_slice_free (UnifiedBlock, unified_block);
+  g_free (unified_block);
 }
 
 
@@ -1358,7 +1358,7 @@
   if (!block)
     return NULL;
 
-  ret = g_slice_new0 (UnifiedBlock);
+  ret = g_new0 (UnifiedBlock, 1);
   ret->joined_text = g_strdup (block->joined_text);
   ret->style_set = gst_subtitle_style_set_ref (block->style_set);
   ret->unified_elements = g_ptr_array_new_with_free_func ((GDestroyNotify)
@@ -1485,7 +1485,7 @@
 gst_ttml_render_unify_block (GstTtmlRender * render,
     const GstSubtitleBlock * block, GstBuffer * buf)
 {
-  UnifiedBlock *ret = g_slice_new0 (UnifiedBlock);
+  UnifiedBlock *ret = g_new0 (UnifiedBlock, 1);
   guint i;
 
   ret->unified_elements = g_ptr_array_new_with_free_func ((GDestroyNotify)
@@ -1495,7 +1495,7 @@
 
   for (i = 0; i < gst_subtitle_block_get_element_count (block); ++i) {
     gchar *text;
-    UnifiedElement *ue = g_slice_new0 (UnifiedElement);
+    UnifiedElement *ue = g_new0 (UnifiedElement, 1);
     ue->element =
         gst_subtitle_element_ref (gst_subtitle_block_get_element (block, i));
     ue->pango_font_size =
@@ -1584,7 +1584,7 @@
 
   /* Handle hard breaks in block text. */
   while (start_index < strlen (block->joined_text)) {
-    CharRange *range = g_slice_new0 (CharRange);
+    CharRange *range = g_new0 (CharRange, 1);
     gchar *c = block->joined_text + start_index;
     while (*c != '\0' && *c != '\n')
       ++c;
@@ -1647,7 +1647,7 @@
         end_index = gst_ttml_render_get_nearest_breakpoint (block, end_index);
 
         if (end_index > range->first_index) {
-          new_range = g_slice_new0 (CharRange);
+          new_range = g_new0 (CharRange, 1);
           new_range->first_index = end_index + 1;
           new_range->last_index = range->last_index;
           GST_CAT_LOG (ttmlrender_debug,
@@ -2279,7 +2279,7 @@
 {
   GstTtmlRenderRenderedImage *ret;
 
-  ret = g_slice_new0 (GstTtmlRenderRenderedImage);
+  ret = g_new0 (GstTtmlRenderRenderedImage, 1);
 
   ret->image = image;
   ret->x = x;
@@ -2301,7 +2301,7 @@
 static inline GstTtmlRenderRenderedImage *
 gst_ttml_render_rendered_image_copy (GstTtmlRenderRenderedImage * image)
 {
-  GstTtmlRenderRenderedImage *ret = g_slice_new0 (GstTtmlRenderRenderedImage);
+  GstTtmlRenderRenderedImage *ret = g_new0 (GstTtmlRenderRenderedImage, 1);
 
   ret->image = gst_buffer_ref (image->image);
   ret->x = image->x;
@@ -2319,7 +2319,7 @@
   if (!image)
     return;
   gst_buffer_unref (image->image);
-  g_slice_free (GstTtmlRenderRenderedImage, image);
+  g_free (image);
 }
 
 
@@ -2343,7 +2343,7 @@
   if (image2 && !image1)
     return gst_ttml_render_rendered_image_copy (image2);
 
-  ret = g_slice_new0 (GstTtmlRenderRenderedImage);
+  ret = g_new0 (GstTtmlRenderRenderedImage, 1);
 
   /* Work out dimensions of combined image. */
   ret->x = MIN (image1->x, image2->x);
@@ -2429,7 +2429,7 @@
     return NULL;
   }
 
-  ret = g_slice_new0 (GstTtmlRenderRenderedImage);
+  ret = g_new0 (GstTtmlRenderRenderedImage, 1);
 
   ret->x = MAX (image->x, x);
   ret->y = MAX (image->y, y);

gst-plugins-bad-1.22.7.tar.xz/ext/ttml/subtitle.c -> gst-plugins-bad-1.24.5.tar.xz/ext/ttml/subtitle.c Changed

@@ -44,7 +44,7 @@
 {
   g_return_if_fail (style_set != NULL);
   g_free (style_set->font_family);
-  g_slice_free (GstSubtitleStyleSet, style_set);
+  g_free (style_set);
 }
 
 GST_DEFINE_MINI_OBJECT_TYPE (GstSubtitleStyleSet, gst_subtitle_style_set);
@@ -59,7 +59,7 @@
 GstSubtitleStyleSet *
 gst_subtitle_style_set_new (void)
 {
-  GstSubtitleStyleSet *ret = g_slice_new0 (GstSubtitleStyleSet);
+  GstSubtitleStyleSet *ret = g_new0 (GstSubtitleStyleSet, 1);
   GstSubtitleColor white = { 255, 255, 255, 255 };
   GstSubtitleColor transparent = { 0, 0, 0, 0 };
 
@@ -88,7 +88,7 @@
 {
   g_return_if_fail (element != NULL);
   gst_subtitle_style_set_unref (element->style_set);
-  g_slice_free (GstSubtitleElement, element);
+  g_free (element);
 }
 
 GST_DEFINE_MINI_OBJECT_TYPE (GstSubtitleElement, gst_subtitle_element);
@@ -113,7 +113,7 @@
 
   g_return_val_if_fail (style_set != NULL, NULL);
 
-  element = g_slice_new0 (GstSubtitleElement);
+  element = g_new0 (GstSubtitleElement, 1);
   gst_mini_object_init (GST_MINI_OBJECT_CAST (element), 0,
       gst_subtitle_element_get_type (), NULL, NULL,
       (GstMiniObjectFreeFunction) _gst_subtitle_element_free);
@@ -131,7 +131,7 @@
   g_return_if_fail (block != NULL);
   gst_subtitle_style_set_unref (block->style_set);
   g_ptr_array_unref (block->elements);
-  g_slice_free (GstSubtitleBlock, block);
+  g_free (block);
 }
 
 GST_DEFINE_MINI_OBJECT_TYPE (GstSubtitleBlock, gst_subtitle_block);
@@ -154,7 +154,7 @@
 
   g_return_val_if_fail (style_set != NULL, NULL);
 
-  block = g_slice_new0 (GstSubtitleBlock);
+  block = g_new0 (GstSubtitleBlock, 1);
   gst_mini_object_init (GST_MINI_OBJECT_CAST (block), 0,
       gst_subtitle_block_get_type (), NULL, NULL,
       (GstMiniObjectFreeFunction) _gst_subtitle_block_free);
@@ -227,7 +227,7 @@
   g_return_if_fail (region != NULL);
   gst_subtitle_style_set_unref (region->style_set);
   g_ptr_array_unref (region->blocks);
-  g_slice_free (GstSubtitleRegion, region);
+  g_free (region);
 }
 
 GST_DEFINE_MINI_OBJECT_TYPE (GstSubtitleRegion, gst_subtitle_region);
@@ -250,7 +250,7 @@
 
   g_return_val_if_fail (style_set != NULL, NULL);
 
-  region = g_slice_new0 (GstSubtitleRegion);
+  region = g_new0 (GstSubtitleRegion, 1);
   gst_mini_object_init (GST_MINI_OBJECT_CAST (region), 0,
       gst_subtitle_region_get_type (), NULL, NULL,
       (GstMiniObjectFreeFunction) _gst_subtitle_region_free);

gst-plugins-bad-1.22.7.tar.xz/ext/ttml/ttmlparse.c -> gst-plugins-bad-1.24.5.tar.xz/ext/ttml/ttmlparse.c Changed

@@ -111,7 +111,7 @@
 static TtmlStyleSet *
 ttml_style_set_new (void)
 {
-  TtmlStyleSet *ret = g_slice_new0 (TtmlStyleSet);
+  TtmlStyleSet *ret = g_new0 (TtmlStyleSet, 1);
   ret->table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
   return ret;
 }
@@ -122,7 +122,7 @@
 {
   if (style_set) {
     g_hash_table_unref (style_set->table);
-    g_slice_free (TtmlStyleSet, style_set);
+    g_free (style_set);
   }
 }
 
@@ -254,7 +254,7 @@
   g_free ((gpointer) element->region);
   ttml_style_set_delete (element->style_set);
   g_free ((gpointer) element->text);
-  g_slice_free (TtmlElement, element);
+  g_free (element);
 }
 
 
@@ -355,7 +355,7 @@
     return NULL;
   }
 
-  element = g_slice_new0 (TtmlElement);
+  element = g_new0 (TtmlElement, 1);
   element->type = type;
 
   if ((value = ttml_get_xml_property (node, "id"))) {
@@ -1257,7 +1257,7 @@
         "transition", g_list_length (active_trees));
 
     if (active_trees) {
-      cur_scene = g_slice_new0 (TtmlScene);
+      cur_scene = g_new0 (TtmlScene, 1);
       cur_scene->begin = timestamp;
       cur_scene->trees = active_trees;
     } else {
@@ -1439,7 +1439,7 @@
 static TtmlElement *
 ttml_copy_element (const TtmlElement * element)
 {
-  TtmlElement *ret = g_slice_new0 (TtmlElement);
+  TtmlElement *ret = g_new0 (TtmlElement, 1);
 
   ret->type = element->type;
   if (element->id)
@@ -1765,7 +1765,7 @@
     g_list_free_full (scene->trees, (GDestroyNotify) ttml_delete_tree);
   if (scene->buf)
     gst_buffer_unref (scene->buf);
-  g_slice_free (TtmlScene, scene);
+  g_free (scene);
 }

gst-plugins-bad-1.22.7.tar.xz/ext/vulkan/gstvulkan.c -> gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/gstvulkan.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/vulkan/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/meson.build Changed

@@ -15,7 +15,7 @@
 
 subdir('shaders')
 
-vulkan_sources = 
+vulkan_sources = files(
   'gstvulkan.c',
   'gstvulkanelement.c',
   'vkcolorconvert.c',
@@ -27,27 +27,32 @@
   'vkupload.c',
   'vkviewconvert.c',
   'vkoverlaycompositor.c',
-
+)
 
-vulkan_plugin_enum_headers = 
+vulkan_plugin_enum_headers = files(
   'vkviewconvert.h',
-
+)
+
+extra_deps = 
+extra_args = 
+if vulkan_conf.get('GST_VULKAN_HAVE_VIDEO_EXTENSIONS') == 1
+  vulkan_sources += files('vkh264dec.c', 'vkh265dec.c')
+  extra_deps += gstcodecs_dep
+  extra_args += '-DGST_USE_UNSTABLE_API'
+endif
 
 vulkan_plugin_enums = gnome.mkenums_simple('gstvulkan-plugins-enumtypes',
     sources : vulkan_plugin_enum_headers,
     body_prefix : '#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif',
     header_prefix : '#include <gst/gst.h>')
-vulkan_plugin_enumtypes_c = vulkan_plugin_enums0
-vulkan_plugin_enumtypes_h = vulkan_plugin_enums1
-vulkan_plugin_gen_sources = vulkan_plugin_enumtypes_h
 
 gstvulkan_plugin = library('gstvulkan',
-  vulkan_sources, vulkan_compiled_shader_sources, vulkan_plugin_enumtypes_c, vulkan_plugin_enumtypes_h,
-  c_args : gst_plugins_bad_args,
+  vulkan_sources, vulkan_compiled_shader_sources, vulkan_plugin_enums,
+  c_args : gst_plugins_bad_args + extra_args,
   objc_args : gst_plugins_bad_args,
   link_args : noseh_link_args,
   include_directories : configinc,
-  dependencies : gstvideo_dep, gstbase_dep, gstvulkan_dep, vulkan_dep, gio_dep,
+  dependencies : gstvideo_dep, gstbase_dep, gstvulkan_dep, vulkan_dep, gio_dep + extra_deps,
   install : true,
   install_dir : plugins_install_dir,
 )

gst-plugins-bad-1.22.7.tar.xz/ext/vulkan/shaders/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/shaders/meson.build Changed

@@ -43,16 +43,14 @@
   c_shader_header = basename + '.h'
 
   compiled_shader = custom_target(spv_shader,
-                                  input: shader,
-                                  output: spv_shader,
-                                  depfile: '@PLAINNAME@.d',
-                                  command: glslc + glslc_build_options + 
-                                    stage_arg,
-                                    '--target-env=vulkan1.0',
-                                    '-MD', '-MF', '@DEPFILE@',
-                                    '@INPUT@',
-                                    '-o', '@OUTPUT@'
-                                  )
+      input: shader,
+      output: spv_shader,
+      depfile: '@PLAINNAME@.d',
+      command: glslc + glslc_build_options + stage_arg,
+        '--target-env=vulkan1.0',
+        '-MD', '-MF', '@DEPFILE@',
+        '@INPUT@',
+        '-o', '@OUTPUT@')
 
   c_shader = custom_target (c_shader_source,
       input: compiled_shader,
@@ -63,7 +61,7 @@
         '--element-type=gchar',
         '--element-size=1',
         '--linebreak=8',
-        '--input', '@INPUT@', 
+        '--input', '@INPUT@',
         '--output', '@OUTPUT0@',
         '--header-output', '@OUTPUT1@')

gst-plugins-bad-1.22.7.tar.xz/ext/vulkan/vkcolorconvert.c -> gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/vkcolorconvert.c Changed

@@ -1114,18 +1114,54 @@
 }
 
 static gboolean
+vulkan_color_convert_can_passthrough_info (const GstVideoInfo * in,
+    const GstVideoInfo * out)
+{
+  gint i;
+
+  if (GST_VIDEO_INFO_FORMAT (in) != GST_VIDEO_INFO_FORMAT (out))
+    return FALSE;
+  if (GST_VIDEO_INFO_WIDTH (in) != GST_VIDEO_INFO_WIDTH (out))
+    return FALSE;
+  if (GST_VIDEO_INFO_HEIGHT (in) != GST_VIDEO_INFO_HEIGHT (out))
+    return FALSE;
+  if (GST_VIDEO_INFO_SIZE (in) != GST_VIDEO_INFO_SIZE (out))
+    return FALSE;
+
+  for (i = 0; i < in->finfo->n_planes; i++) {
+    if (in->stridei != out->stridei)
+      return FALSE;
+    if (in->offseti != out->offseti)
+      return FALSE;
+  }
+
+  if (!gst_video_colorimetry_is_equal (&in->colorimetry, &out->colorimetry))
+    return FALSE;
+  if (in->chroma_site != out->chroma_site)
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
 gst_vulkan_color_convert_set_caps (GstBaseTransform * bt, GstCaps * in_caps,
     GstCaps * out_caps)
 {
   GstVulkanVideoFilter *vfilter = GST_VULKAN_VIDEO_FILTER (bt);
   GstVulkanColorConvert *conv = GST_VULKAN_COLOR_CONVERT (bt);
   GstVulkanHandle *vert, *frag;
+  gboolean passthrough;
   int i;
 
   if (!GST_BASE_TRANSFORM_CLASS (parent_class)->set_caps (bt, in_caps,
           out_caps))
     return FALSE;
 
+  passthrough =
+      vulkan_color_convert_can_passthrough_info (&vfilter->in_info,
+      &vfilter->out_info);
+  gst_base_transform_set_passthrough (bt, passthrough);
+
   if (!gst_vulkan_full_screen_quad_set_info (conv->quad, &vfilter->in_info,
           &vfilter->out_info))
     return FALSE;
@@ -1135,6 +1171,11 @@
     conv->current_shader = NULL;
   }
 
+  if (passthrough) {
+    conv->current_shader = NULL;
+    return TRUE;
+  }
+
   for (i = 0; i < G_N_ELEMENTS (shader_infos); i++) {
     if (shader_infosi.from != GST_VIDEO_INFO_FORMAT (&vfilter->in_info))
       continue;
@@ -1211,6 +1252,7 @@
   GError *error = NULL;
   VkResult err;
   int i;
+  guint in_n_mems, out_n_mems;
 
   fence = gst_vulkan_device_create_fence (vfilter->device, &error);
   if (!fence)
@@ -1219,7 +1261,8 @@
   if (!gst_vulkan_full_screen_quad_set_input_buffer (conv->quad, inbuf, &error))
     goto error;
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&conv->quad->in_info); i++) {
+  in_n_mems = gst_buffer_n_memory (inbuf);
+  for (i = 0; i < in_n_mems; i++) {
     GstMemory *img_mem = gst_buffer_peek_memory (inbuf, i);
     if (!gst_is_vulkan_image_memory (img_mem)) {
       g_set_error_literal (&error, GST_VULKAN_ERROR, GST_VULKAN_FAILED,
@@ -1237,7 +1280,8 @@
   {
     gboolean need_render_buf = FALSE;
 
-    for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&conv->quad->out_info); i++) {
+    out_n_mems = gst_buffer_n_memory (outbuf);
+    for (i = 0; i < out_n_mems; i++) {
       GstMemory *mem = gst_buffer_peek_memory (outbuf, i);
       if (!gst_is_vulkan_image_memory (mem)) {
         g_set_error_literal (&error, GST_VULKAN_ERROR, GST_VULKAN_FAILED,
@@ -1279,7 +1323,7 @@
 
     if (need_render_buf) {
       render_buf = gst_buffer_new ();
-      for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&conv->quad->out_info); i++) {
+      for (i = 0; i < out_n_mems; i++) {
         gst_buffer_append_memory (render_buf,
             gst_memory_ref ((GstMemory *) render_img_memsi));
       }
@@ -1291,7 +1335,7 @@
       render_buf = outbuf;
     }
 
-    for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&conv->quad->out_info); i++) {
+    for (i = 0; i < out_n_mems; i++) {
       GstMemory *img_mem = gst_buffer_peek_memory (render_buf, i);
       if (!gst_is_vulkan_image_memory (img_mem)) {
         g_set_error_literal (&error, GST_VULKAN_ERROR, GST_VULKAN_FAILED,
@@ -1352,7 +1396,7 @@
           fence, &error))
     goto unlock_error;
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&conv->quad->out_info); i++) {
+  for (i = 0; i < out_n_mems; i++) {
     if (render_img_memsi != out_img_memsi) {
       VkImageMemoryBarrier out_image_memory_barrier;
       VkImageMemoryBarrier render_image_memory_barrier;
@@ -1367,8 +1411,8 @@
           .oldLayout = render_img_memsi->barrier.image_layout,
           .newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
           /* FIXME: implement exclusive transfers */
-          .srcQueueFamilyIndex = 0,
-          .dstQueueFamilyIndex = 0,
+          .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+          .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
           .image = render_img_memsi->image,
           .subresourceRange = render_img_memsi->barrier.subresource_range
       };
@@ -1380,8 +1424,8 @@
           .oldLayout = out_img_memsi->barrier.image_layout,
           .newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
           /* FIXME: implement exclusive transfers */
-          .srcQueueFamilyIndex = 0,
-          .dstQueueFamilyIndex = 0,
+          .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+          .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
           .image = out_img_memsi->image,
           .subresourceRange = out_img_memsi->barrier.subresource_range
       };

gst-plugins-bad-1.22.7.tar.xz/ext/vulkan/vkdownload.c -> gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/vkdownload.c Changed

@@ -85,8 +85,7 @@
   GstBufferPool *pool;
   gboolean pool_active;
 
-  GstVulkanCommandPool *cmd_pool;
-  GstVulkanTrashList *trash_list;
+  GstVulkanOperation *exec;
 };
 
 static gpointer
@@ -95,7 +94,6 @@
   struct ImageToRawDownload *raw = g_new0 (struct ImageToRawDownload, 1);
 
   raw->download = download;
-  raw->trash_list = gst_vulkan_trash_fence_list_new ();
 
   return raw;
 }
@@ -147,20 +145,21 @@
   GstVulkanCommandBuffer *cmd_buf;
   GError *error = NULL;
   GstFlowReturn ret;
-  VkResult err;
-  int i;
+  GArray *barriers = NULL;
+  int i, n_mems, n_planes;
+  VkImageLayout dst_layout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
 
-  if (!raw->cmd_pool) {
-    if (!(raw->cmd_pool =
-            gst_vulkan_queue_create_command_pool (raw->download->queue,
-                &error))) {
+  if (!raw->exec) {
+    GstVulkanCommandPool *cmd_pool;
+
+    cmd_pool = gst_vulkan_queue_create_command_pool (raw->download->queue,
+        &error);
+    if (!cmd_pool)
       goto error;
-    }
+    raw->exec = gst_vulkan_operation_new (cmd_pool);
+    gst_object_unref (cmd_pool);
   }
 
-  if (!(cmd_buf = gst_vulkan_command_pool_create (raw->cmd_pool, &error)))
-    goto error;
-
   if (!raw->pool) {
     GstStructure *config;
     guint min = 0, max = 0;
@@ -170,7 +169,10 @@
     config = gst_buffer_pool_get_config (raw->pool);
     gst_buffer_pool_config_set_params (config, raw->download->out_caps, size,
         min, max);
-    gst_buffer_pool_set_config (raw->pool, config);
+    if (!gst_buffer_pool_set_config (raw->pool, config)) {
+      gst_clear_object (&raw->pool);
+      return GST_FLOW_ERROR;
+    }
   }
   if (!raw->pool_active) {
     gst_buffer_pool_set_active (raw->pool, TRUE);
@@ -182,36 +184,68 @@
               NULL)) != GST_FLOW_OK)
     goto out;
 
-  {
-    /* *INDENT-OFF* */
-    VkCommandBufferBeginInfo cmd_buf_info = {
-        .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
-        .pNext = NULL,
-        .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
-        .pInheritanceInfo = NULL
+  if (!gst_vulkan_operation_begin (raw->exec, &error))
+    goto error;
+
+  n_mems = gst_buffer_n_memory (inbuf);
+  g_assert (n_mems < GST_VIDEO_MAX_PLANES);
+
+  if (!gst_vulkan_operation_add_dependency_frame (raw->exec, inbuf,
+          VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT))
+    goto unlock_error;
+
+  cmd_buf = raw->exec->cmd_buf;
+
+  if (!gst_vulkan_operation_add_frame_barrier (raw->exec, inbuf,
+          VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_TRANSFER_READ_BIT,
+          VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, NULL))
+    goto unlock_error;
+
+  barriers = gst_vulkan_operation_retrieve_image_barriers (raw->exec);
+  if (barriers->len == 0) {
+    ret = GST_FLOW_ERROR;
+    goto unlock_error;
+  }
+
+  if (gst_vulkan_operation_use_sync2 (raw->exec)) {
+#if defined(VK_KHR_synchronization2)
+    VkDependencyInfoKHR dependency_info = {
+      .sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR,
+      .pImageMemoryBarriers = (gpointer) barriers->data,
+      .imageMemoryBarrierCount = barriers->len,
     };
-    /* *INDENT-ON* */
 
+    gst_vulkan_operation_pipeline_barrier2 (raw->exec, &dependency_info);
+    dst_layout =
+        g_array_index (barriers, VkImageMemoryBarrier2KHR, 0).newLayout;
+#endif
+  } else {
     gst_vulkan_command_buffer_lock (cmd_buf);
-    err = vkBeginCommandBuffer (cmd_buf->cmd, &cmd_buf_info);
-    if (gst_vulkan_error_to_g_error (err, &error, "vkBeginCommandBuffer") < 0)
-      goto unlock_error;
+    vkCmdPipelineBarrier (cmd_buf->cmd,
+        VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+        VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 0, NULL, barriers->len,
+        (gpointer) barriers->data);
+    gst_vulkan_command_buffer_unlock (cmd_buf);
+
+    dst_layout = g_array_index (barriers, VkImageMemoryBarrier, 0).newLayout;
   }
+  g_clear_pointer (&barriers, g_array_unref);
+
+  n_planes = GST_VIDEO_INFO_N_PLANES (&raw->out_info);
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&raw->out_info); i++) {
+  for (i = 0; i < n_planes; i++) {
     VkBufferImageCopy region;
-    GstMemory *in_mem, *out_mem;
+    GstMemory *out_mem;
     GstVulkanBufferMemory *buf_mem;
     GstVulkanImageMemory *img_mem;
-    VkImageMemoryBarrier image_memory_barrier;
-    VkBufferMemoryBarrier buffer_memory_barrier;
+    gint idx;
+    const VkImageAspectFlags aspects = { VK_IMAGE_ASPECT_PLANE_0_BIT,
+      VK_IMAGE_ASPECT_PLANE_1_BIT, VK_IMAGE_ASPECT_PLANE_2_BIT,
+    };
+    VkImageAspectFlags plane_aspect;
 
-    in_mem = gst_buffer_peek_memory (inbuf, i);
-    if (!gst_is_vulkan_image_memory (in_mem)) {
-      GST_WARNING_OBJECT (raw->download, "Input is not a GstVulkanImageMemory");
-      goto unlock_error;
-    }
-    img_mem = (GstVulkanImageMemory *) in_mem;
+    idx = MIN (i, n_mems - 1);
+    img_mem = (GstVulkanImageMemory *) gst_buffer_peek_memory (inbuf, idx);
 
     out_mem = gst_buffer_peek_memory (*outbuf, i);
     if (!gst_is_vulkan_buffer_memory (out_mem)) {
@@ -221,13 +255,19 @@
     }
     buf_mem = (GstVulkanBufferMemory *) out_mem;
 
+    if (n_planes == n_mems)
+      plane_aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+    else
+      plane_aspect = aspectsi;
+
     /* *INDENT-OFF* */
     region = (VkBufferImageCopy) {
         .bufferOffset = 0,
         .bufferRowLength = GST_VIDEO_INFO_COMP_WIDTH (&raw->in_info, i),
         .bufferImageHeight = GST_VIDEO_INFO_COMP_HEIGHT (&raw->in_info, i),
         .imageSubresource = {
-            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+             /* XXX: each plane is a buffer */
+          .aspectMask = plane_aspect,
             .mipLevel = 0,
             .baseArrayLayer = 0,
             .layerCount = 1,
@@ -239,99 +279,21 @@
             .depth = 1,
         }
     };
-
-    image_memory_barrier = (VkImageMemoryBarrier) {
-        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-        .pNext = NULL,
-        .srcAccessMask = img_mem->barrier.parent.access_flags,
-        .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
-        .oldLayout = img_mem->barrier.image_layout,
-        .newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
-        /* FIXME: implement exclusive transfers */
-        .srcQueueFamilyIndex = 0,
-        .dstQueueFamilyIndex = 0,
-        .image = img_mem->image,
-        .subresourceRange = img_mem->barrier.subresource_range
-    };
-
-    buffer_memory_barrier = (VkBufferMemoryBarrier) {
-        .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
-        .pNext = NULL,
-        .srcAccessMask = buf_mem->barrier.parent.access_flags,
-        .dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
-        /* FIXME: implement exclusive transfers */
-        .srcQueueFamilyIndex = 0,
-        .dstQueueFamilyIndex = 0,
-        .buffer = buf_mem->buffer,
-        .offset = region.bufferOffset,
-        .size = region.bufferRowLength * region.bufferImageHeight
-    };
     /* *INDENT-ON* */
 
-    vkCmdPipelineBarrier (cmd_buf->cmd,
-        buf_mem->barrier.parent.pipeline_stages | img_mem->barrier.
-        parent.pipeline_stages, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 1,
-        &buffer_memory_barrier, 1, &image_memory_barrier);
-
-    buf_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
-    buf_mem->barrier.parent.access_flags = buffer_memory_barrier.dstAccessMask;
-
-    img_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
-    img_mem->barrier.parent.access_flags = image_memory_barrier.dstAccessMask;
-    img_mem->barrier.image_layout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
-
-    vkCmdCopyImageToBuffer (cmd_buf->cmd, img_mem->image,
-        img_mem->barrier.image_layout, buf_mem->buffer, 1, &region);
+    gst_vulkan_command_buffer_lock (cmd_buf);
+    vkCmdCopyImageToBuffer (cmd_buf->cmd, img_mem->image, dst_layout,
+        buf_mem->buffer, 1, &region);
+    gst_vulkan_command_buffer_unlock (cmd_buf);
   }
 
-  err = vkEndCommandBuffer (cmd_buf->cmd);
-  gst_vulkan_command_buffer_unlock (cmd_buf);
-  if (gst_vulkan_error_to_g_error (err, &error, "vkEndCommandBuffer") < 0)
+  if (!gst_vulkan_operation_end (raw->exec, &error))
     goto error;
 
-  {
-    VkSubmitInfo submit_info = { 0, };
-    VkPipelineStageFlags stages = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
-    GstVulkanFence *fence;
-
-    /* *INDENT-OFF* */
-    submit_info = (VkSubmitInfo) {
-        .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
-        .pNext = NULL,
-        .waitSemaphoreCount = 0,
-        .pWaitSemaphores = NULL,
-        .pWaitDstStageMask = &stages,
-        .commandBufferCount = 1,
-        .pCommandBuffers = &cmd_buf->cmd,
-        .signalSemaphoreCount = 0,
-        .pSignalSemaphores = NULL
-    };
-    /* *INDENT-ON* */
-
-    fence = gst_vulkan_device_create_fence (raw->download->device, &error);
-    if (!fence)
-      goto error;
-
-    gst_vulkan_queue_submit_lock (raw->download->queue);
-    err =
-        vkQueueSubmit (raw->download->queue->queue, 1, &submit_info,
-        GST_VULKAN_FENCE_FENCE (fence));
-    gst_vulkan_queue_submit_unlock (raw->download->queue);
-    if (gst_vulkan_error_to_g_error (err, &error, "vkQueueSubmit") < 0)
-      goto error;
-
-    gst_vulkan_trash_list_add (raw->trash_list,
-        gst_vulkan_trash_list_acquire (raw->trash_list, fence,
-            gst_vulkan_trash_mini_object_unref,
-            GST_MINI_OBJECT_CAST (cmd_buf)));
-    gst_vulkan_fence_unref (fence);
-  }
-
   /* XXX: STALL!
    * Need to have the buffer gst_memory_map() wait for this fence before
    * allowing access */
-  gst_vulkan_trash_list_wait (raw->trash_list, -1);
-  gst_vulkan_trash_list_gc (raw->trash_list);
+  gst_vulkan_operation_wait (raw->exec);
 
   ret = GST_FLOW_OK;
 
@@ -339,10 +301,9 @@
   return ret;
 
 unlock_error:
-  if (cmd_buf) {
-    gst_vulkan_command_buffer_unlock (cmd_buf);
-    gst_vulkan_command_buffer_unref (cmd_buf);
-  }
+  g_clear_pointer (&barriers, g_array_unref);
+  gst_vulkan_operation_reset (raw->exec);
+
 error:
   if (error) {
     GST_WARNING_OBJECT (raw->download, "Error: %s", error->message);
@@ -367,13 +328,7 @@
     raw->pool = NULL;
   }
 
-  if (raw->cmd_pool) {
-    gst_object_unref (raw->cmd_pool);
-    raw->cmd_pool = NULL;
-  }
-
-  gst_object_unref (raw->trash_list);
-  raw->trash_list = NULL;
+  gst_clear_object (&raw->exec);
 
   g_free (impl);
 }
@@ -592,37 +547,6 @@
   GstVulkanQueue *queue;
 };
 
-static gboolean
-_choose_queue (GstVulkanDevice * device, GstVulkanQueue * queue,
-    struct choose_data *data)
-{
-  guint flags =
-      device->physical_device->queue_family_propsqueue->family.queueFlags;
-
-  if ((flags & VK_QUEUE_GRAPHICS_BIT) != 0) {
-    if (data->queue)
-      gst_object_unref (data->queue);
-    data->queue = gst_object_ref (queue);
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-static GstVulkanQueue *
-_find_graphics_queue (GstVulkanDownload * download)
-{
-  struct choose_data data;
-
-  data.download = download;
-  data.queue = NULL;
-
-  gst_vulkan_device_foreach_queue (download->device,
-      (GstVulkanDeviceForEachQueueFunc) _choose_queue, &data);
-
-  return data.queue;
-}
-
 static GstStateChangeReturn
 gst_vulkan_download_change_state (GstElement * element,
     GstStateChange transition)
@@ -663,7 +587,9 @@
       if (!gst_vulkan_queue_run_context_query (GST_ELEMENT (vk_download),
               &vk_download->queue)) {
         GST_DEBUG_OBJECT (vk_download, "No queue retrieved from peer elements");
-        vk_download->queue = _find_graphics_queue (vk_download);
+        vk_download->queue =
+            gst_vulkan_device_select_queue (vk_download->device,
+            VK_QUEUE_GRAPHICS_BIT);
       }
       if (!vk_download->queue) {
         GST_ELEMENT_ERROR (vk_download, RESOURCE, NOT_FOUND,

gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/vkh264dec.c Added

@@ -0,0 +1,1347 @@
+/* GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "vkh264dec.h"
+
+#include <gst/video/video.h>
+#include <gst/vulkan/vulkan.h>
+
+#include "gstvulkanelements.h"
+
+typedef struct _GstVulkanH264Decoder GstVulkanH264Decoder;
+typedef struct _GstVulkanH264Picture GstVulkanH264Picture;
+
+struct _GstVulkanH264Picture
+{
+  GstVulkanDecoderPicture base;
+
+  /* Picture refs. */
+  StdVideoDecodeH264ReferenceInfo std_refs36;
+  VkVideoDecodeH264DpbSlotInfoKHR vk_slots36;
+
+  /* Current picture */
+  StdVideoDecodeH264ReferenceInfo std_ref;
+  VkVideoDecodeH264DpbSlotInfoKHR vk_slot;
+
+  VkVideoDecodeH264PictureInfoKHR vk_h264pic;
+  StdVideoDecodeH264PictureInfo std_h264pic;
+
+  gint32 slot_idx;
+};
+
+struct _GstVulkanH264Decoder
+{
+  GstH264Decoder parent;
+
+  GstVulkanInstance *instance;
+  GstVulkanDevice *device;
+  GstVulkanQueue *graphic_queue, *decode_queue;
+
+  GstVulkanDecoder *decoder;
+
+  gboolean need_negotiation;
+  gboolean need_params_update;
+
+  gint width;
+  gint height;
+  gint coded_width;
+  gint coded_height;
+  gint dpb_size;
+
+  VkSamplerYcbcrRange range;
+  VkChromaLocation xloc, yloc;
+
+  GstVideoCodecState *output_state;
+};
+
+static GstStaticPadTemplate gst_vulkan_h264dec_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-h264, "
+        "profile = { (string) high, (string) main, (string) constrained-baseline, (string) baseline } ,"
+        "stream-format = { (string) avc, (string) byte-stream }, "
+        "alignment = (string) au"));
+
+static GstStaticPadTemplate gst_vulkan_h264dec_src_template =
+GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_VULKAN_IMAGE, "NV12")));
+
+GST_DEBUG_CATEGORY (gst_debug_vulkan_h264_decoder);
+#define GST_CAT_DEFAULT gst_debug_vulkan_h264_decoder
+
+#define gst_vulkan_h264_decoder_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstVulkanH264Decoder, gst_vulkan_h264_decoder,
+    GST_TYPE_H264_DECODER,
+    GST_DEBUG_CATEGORY_INIT (gst_debug_vulkan_h264_decoder,
+        "vulkanh264dec", 0, "Vulkan H.264 Decoder"));
+GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (vulkanh264dec, "vulkanh264dec",
+    GST_RANK_NONE, GST_TYPE_VULKAN_H264_DECODER, vulkan_element_init (plugin));
+
+static gboolean
+_find_queues (GstVulkanDevice * device, GstVulkanQueue * queue, gpointer data)
+{
+  GstVulkanH264Decoder *self = data;
+  guint32 flags =
+      device->physical_device->queue_family_propsqueue->family.queueFlags;
+  guint32 codec =
+      device->physical_device->queue_family_opsqueue->family.video;
+
+  if (!self->graphic_queue
+      && ((flags & VK_QUEUE_GRAPHICS_BIT) == VK_QUEUE_GRAPHICS_BIT)) {
+    self->graphic_queue = gst_object_ref (queue);
+  }
+
+  if (!self->decode_queue
+      && ((codec & VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR)
+          == VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR)
+      && ((flags & VK_QUEUE_VIDEO_DECODE_BIT_KHR)
+          == VK_QUEUE_VIDEO_DECODE_BIT_KHR)) {
+    self->decode_queue = gst_object_ref (queue);
+  }
+
+  return !(self->decode_queue && self->graphic_queue);
+}
+
+static gboolean
+gst_vulkan_h264_decoder_open (GstVideoDecoder * decoder)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+
+  if (!gst_vulkan_ensure_element_data (GST_ELEMENT (decoder), NULL,
+          &self->instance)) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+        ("Failed to retrieve vulkan instance"), (NULL));
+    return FALSE;
+  }
+
+  if (!gst_vulkan_device_run_context_query (GST_ELEMENT (decoder),
+          &self->device)) {
+    GError *error = NULL;
+    GST_DEBUG_OBJECT (self, "No device retrieved from peer elements");
+    self->device = gst_vulkan_instance_create_device (self->instance, &error);
+    if (!self->device) {
+      GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+          ("Failed to create vulkan device"),
+          ("%s", error ? error->message : ""));
+      g_clear_error (&error);
+      return FALSE;
+    }
+  }
+
+  if (!gst_vulkan_queue_run_context_query (GST_ELEMENT (self),
+          &self->graphic_queue)) {
+    GST_DEBUG_OBJECT (self, "No graphic queue retrieved from peer elements");
+  }
+
+  gst_vulkan_device_foreach_queue (self->device, _find_queues, self);
+
+  if (!self->decode_queue) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+        ("Failed to create/retrieve vulkan H.264 decoder queue"), (NULL));
+    return FALSE;
+  }
+
+  self->decoder = gst_vulkan_queue_create_decoder (self->decode_queue,
+      VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR);
+  if (!self->decoder) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+        ("Failed to create vulkan H.264 decoder"), (NULL));
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_vulkan_h264_decoder_close (GstVideoDecoder * decoder)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+
+  gst_clear_object (&self->decoder);
+  gst_clear_object (&self->decode_queue);
+  gst_clear_object (&self->graphic_queue);
+  gst_clear_object (&self->device);
+  gst_clear_object (&self->instance);
+
+  return TRUE;
+}
+
+static gboolean
+gst_vulkan_h264_decoder_stop (GstVideoDecoder * decoder)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+
+  if (self->decoder)
+    gst_vulkan_decoder_stop (self->decoder);
+
+  if (self->output_state)
+    gst_video_codec_state_unref (self->output_state);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+}
+
+static void
+gst_vulkan_h264_decoder_set_context (GstElement * element, GstContext * context)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (element);
+
+  gst_vulkan_handle_set_context (element, context, NULL, &self->instance);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+_query_context (GstVulkanH264Decoder * self, GstQuery * query)
+{
+  if (gst_vulkan_handle_context_query (GST_ELEMENT (self), query, NULL,
+          self->instance, self->device))
+    return TRUE;
+
+  if (gst_vulkan_queue_handle_context_query (GST_ELEMENT (self), query,
+          self->graphic_queue))
+    return TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+gst_vulkan_h264_decoder_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  gboolean ret = FALSE;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      ret = _query_context (GST_VULKAN_H264_DECODER (decoder), query);
+      break;
+    default:
+      ret = GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+      break;
+  }
+
+  return ret;
+}
+
+static gboolean
+gst_vulkan_h264_decoder_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  gboolean ret = FALSE;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      ret = _query_context (GST_VULKAN_H264_DECODER (decoder), query);
+      break;
+    default:
+      ret = GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+      break;
+  }
+
+  return ret;
+}
+
+static gboolean
+gst_vulkan_h264_decoder_negotiate (GstVideoDecoder * decoder)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+  GstH264Decoder *h264dec = GST_H264_DECODER (decoder);
+  VkVideoFormatPropertiesKHR format_prop;
+  GstVideoInterlaceMode interlace_mode;
+  GstVideoFormat format;
+
+  /* Ignore downstream renegotiation request. */
+  if (!self->need_negotiation)
+    return TRUE;
+
+  if (!gst_vulkan_decoder_out_format (self->decoder, &format_prop))
+    return FALSE;
+
+  self->need_negotiation = FALSE;
+
+  if (self->output_state)
+    gst_video_codec_state_unref (self->output_state);
+
+  interlace_mode =
+      self->decoder->profile.codec.h264dec.pictureLayout ==
+      VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_INTERLACED_INTERLEAVED_LINES_BIT_KHR ?
+      GST_VIDEO_INTERLACE_MODE_MIXED : GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
+
+  format = gst_vulkan_format_to_video_format (format_prop.format);
+  self->output_state = gst_video_decoder_set_interlaced_output_state (decoder,
+      format, interlace_mode, self->width, self->height, h264dec->input_state);
+
+  self->output_state->caps = gst_video_info_to_caps (&self->output_state->info);
+  gst_caps_set_features_simple (self->output_state->caps,
+      gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_VULKAN_IMAGE, NULL));
+
+  GST_INFO_OBJECT (self, "Negotiated caps %" GST_PTR_FORMAT,
+      self->output_state->caps);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_vulkan_h264_decoder_decide_allocation (GstVideoDecoder * decoder,
+    GstQuery * query)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+  GstCaps *new_caps, *profile_caps, *caps = NULL;
+  GstBufferPool *pool = NULL;
+  GstStructure *config;
+  guint size, min, max;
+  gboolean update_pool;
+  VkImageUsageFlags usage;
+  GstVulkanVideoCapabilities vk_caps;
+
+  gst_query_parse_allocation (query, &caps, NULL);
+  if (!caps)
+    return FALSE;
+  if (!gst_vulkan_decoder_caps (self->decoder, &vk_caps))
+    return FALSE;
+
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+    update_pool = TRUE;
+  } else {
+    GstVideoInfo vinfo;
+
+    gst_video_info_from_caps (&vinfo, caps);
+    size = GST_VIDEO_INFO_SIZE (&vinfo);
+    min = 2;
+    max = 0;
+    update_pool = FALSE;
+  }
+
+  if (!(pool && GST_IS_VULKAN_IMAGE_BUFFER_POOL (pool))) {
+    gst_clear_object (&pool);
+    pool = gst_vulkan_image_buffer_pool_new (self->device);
+  }
+
+  usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT
+      | VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR;
+
+  if (!self->decoder->dedicated_dpb) {
+    min = MAX (min, MIN (self->dpb_size, vk_caps.caps.maxDpbSlots));
+    max = 0;
+    usage |= VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR;
+  }
+
+  new_caps = gst_caps_copy (caps);
+  gst_caps_set_simple (new_caps, "width", G_TYPE_INT, self->coded_width,
+      "height", G_TYPE_INT, self->coded_height, NULL);
+  profile_caps = gst_vulkan_decoder_profile_caps (self->decoder);
+
+  config = gst_buffer_pool_get_config (pool);
+
+  gst_buffer_pool_config_set_params (config, new_caps, size, min, max);
+
+  gst_vulkan_image_buffer_pool_config_set_allocation_params (config, usage,
+      VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR,
+      VK_ACCESS_TRANSFER_WRITE_BIT);
+  gst_vulkan_image_buffer_pool_config_set_decode_caps (config, profile_caps);
+
+  gst_caps_unref (profile_caps);
+  gst_caps_unref (new_caps);
+
+  if (!gst_buffer_pool_set_config (pool, config))
+    goto bail;
+
+  if (update_pool)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+
+  gst_object_unref (pool);
+
+  gst_vulkan_decoder_create_dpb_pool (self->decoder, new_caps);
+
+  return TRUE;
+
+bail:
+  {
+    gst_clear_caps (&new_caps);
+    gst_clear_object (&pool);
+    return FALSE;
+  }
+}
+
+/* set a common pipeline stage valid for any queue to avoid Vulkan Validation
+ * errors */
+static void
+reset_pipeline_stage_mask (GstBuffer * buf)
+{
+  guint i, n = gst_buffer_n_memory (buf);
+
+  for (i = 0; i < n; i++) {
+    GstVulkanImageMemory *vk_mem =
+        (GstVulkanImageMemory *) gst_buffer_peek_memory (buf, i);
+    vk_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
+  }
+}
+
+static GstVulkanH264Picture *
+gst_vulkan_h264_picture_new (GstVulkanH264Decoder * self, GstBuffer * out)
+{
+  GstVulkanH264Picture *pic;
+
+  pic = g_new0 (GstVulkanH264Picture, 1);
+  gst_vulkan_decoder_picture_init (self->decoder, &pic->base, out);
+  reset_pipeline_stage_mask (out);
+
+  return pic;
+}
+
+static void
+gst_vulkan_h264_picture_free (gpointer data)
+{
+  GstVulkanH264Picture *pic = data;
+
+  gst_vulkan_decoder_picture_release (&pic->base);
+  g_free (pic);
+}
+
+static VkVideoChromaSubsamplingFlagBitsKHR
+_get_chroma_subsampling_flag (guint8 chroma_format_idc)
+{
+  switch (chroma_format_idc) {
+    case 1:
+      return VK_VIDEO_CHROMA_SUBSAMPLING_420_BIT_KHR;
+    case 2:
+      return VK_VIDEO_CHROMA_SUBSAMPLING_422_BIT_KHR;
+    case 3:
+      return VK_VIDEO_CHROMA_SUBSAMPLING_444_BIT_KHR;
+    default:
+      return VK_VIDEO_CHROMA_SUBSAMPLING_INVALID_KHR;
+  }
+}
+
+static VkVideoComponentBitDepthFlagBitsKHR
+_get_component_bit_depth (guint8 bit_depth)
+{
+  switch (bit_depth) {
+    case 8:
+      return VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR;
+    case 10:
+      return VK_VIDEO_COMPONENT_BIT_DEPTH_10_BIT_KHR;
+    case 12:
+      return VK_VIDEO_COMPONENT_BIT_DEPTH_12_BIT_KHR;
+    default:
+      return VK_VIDEO_COMPONENT_BIT_DEPTH_INVALID_KHR;
+  }
+}
+
+static StdVideoH264ProfileIdc
+_get_h264_profile (GstH264Profile profile_idc)
+{
+  switch (profile_idc) {
+    case GST_H264_PROFILE_BASELINE:
+      return STD_VIDEO_H264_PROFILE_IDC_BASELINE;
+    case GST_H264_PROFILE_MAIN:
+      return STD_VIDEO_H264_PROFILE_IDC_MAIN;
+    case GST_H264_PROFILE_HIGH:
+      return STD_VIDEO_H264_PROFILE_IDC_HIGH;
+    case GST_H264_PROFILE_HIGH_444:
+      return STD_VIDEO_H264_PROFILE_IDC_HIGH_444_PREDICTIVE;
+    default:
+      return STD_VIDEO_H264_PROFILE_IDC_INVALID;
+  }
+}
+
+static StdVideoH264LevelIdc
+_get_h264_level_idc (int level_idc)
+{
+  switch (level_idc) {
+    case 10:
+      return STD_VIDEO_H264_LEVEL_IDC_1_0;
+    case 11:
+      return STD_VIDEO_H264_LEVEL_IDC_1_1;
+    case 12:
+      return STD_VIDEO_H264_LEVEL_IDC_1_2;
+    case 13:
+      return STD_VIDEO_H264_LEVEL_IDC_1_3;
+    case 20:
+      return STD_VIDEO_H264_LEVEL_IDC_2_0;
+    case 21:
+      return STD_VIDEO_H264_LEVEL_IDC_2_1;
+    case 22:
+      return STD_VIDEO_H264_LEVEL_IDC_2_2;
+    case 30:
+      return STD_VIDEO_H264_LEVEL_IDC_3_0;
+    case 31:
+      return STD_VIDEO_H264_LEVEL_IDC_3_1;
+    case 32:
+      return STD_VIDEO_H264_LEVEL_IDC_3_2;
+    case 40:
+      return STD_VIDEO_H264_LEVEL_IDC_4_0;
+    case 41:
+      return STD_VIDEO_H264_LEVEL_IDC_4_1;
+    case 42:
+      return STD_VIDEO_H264_LEVEL_IDC_4_2;
+    case 50:
+      return STD_VIDEO_H264_LEVEL_IDC_5_0;
+    case 51:
+      return STD_VIDEO_H264_LEVEL_IDC_5_1;
+    case 52:
+      return STD_VIDEO_H264_LEVEL_IDC_5_2;
+    case 60:
+      return STD_VIDEO_H264_LEVEL_IDC_6_0;
+    case 61:
+      return STD_VIDEO_H264_LEVEL_IDC_6_1;
+    default:
+    case 62:
+      return STD_VIDEO_H264_LEVEL_IDC_6_2;
+  }
+}
+
+static void
+gst_vulkan_video_profile_from_h264_sps (GstVulkanVideoProfile * profile,
+    const GstH264SPS * sps)
+{
+  /* *INDENT-OFF* */
+  *profile = (GstVulkanVideoProfile) {
+    .profile = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR,
+      .pNext = &profile->usage,
+      .videoCodecOperation = VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR,
+      .chromaSubsampling = _get_chroma_subsampling_flag (sps->chroma_format_idc),
+      .lumaBitDepth = _get_component_bit_depth (sps->bit_depth_luma_minus8 + 8),
+      .chromaBitDepth = _get_component_bit_depth (sps->bit_depth_chroma_minus8 + 8),
+    },
+    .usage.decode = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR,
+      .videoUsageHints = VK_VIDEO_DECODE_USAGE_DEFAULT_KHR,
+      .pNext = &profile->codec,
+    },
+    .codec.h264dec = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR,
+      .stdProfileIdc = _get_h264_profile (sps->profile_idc),
+      .pictureLayout = sps->frame_mbs_only_flag ?
+          VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_PROGRESSIVE_KHR :
+          VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_INTERLACED_INTERLEAVED_LINES_BIT_KHR,
+    },
+  };
+  /* *INDENT-ON* */
+}
+
+static GstFlowReturn
+gst_vulkan_h264_decoder_new_sequence (GstH264Decoder * decoder,
+    const GstH264SPS * sps, gint max_dpb_size)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+  GstVulkanVideoProfile profile;
+  GstVulkanVideoCapabilities vk_caps;
+  GError *error = NULL;
+  gint width, height;
+  VkFormat old_format = VK_FORMAT_UNDEFINED;
+  VkVideoFormatPropertiesKHR format_prop;
+
+  gst_vulkan_video_profile_from_h264_sps (&profile, sps);
+
+  if (gst_vulkan_decoder_is_started (self->decoder)) {
+    if (!gst_vulkan_video_profile_is_equal (&self->decoder->profile, &profile)) {
+      if (gst_vulkan_decoder_out_format (self->decoder, &format_prop))
+        old_format = format_prop.format;
+      gst_vulkan_decoder_stop (self->decoder);
+    } else {
+      self->need_negotiation = FALSE;
+    }
+  }
+
+  if (!gst_vulkan_decoder_is_started (self->decoder)) {
+    self->need_negotiation = TRUE;
+    if (!gst_vulkan_decoder_start (self->decoder, &profile, &error)) {
+      GST_ERROR_OBJECT (self, "Couldn't start decoder: %s",
+          error ? error->message : "");
+      g_clear_error (&error);
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  self->dpb_size = MAX (self->dpb_size, max_dpb_size);
+
+  if (sps->frame_cropping_flag) {
+    width = sps->crop_rect_width;
+    height = sps->crop_rect_height;
+  } else {
+    width = sps->width;
+    height = sps->height;
+  }
+
+  gst_vulkan_decoder_caps (self->decoder, &vk_caps);
+  self->coded_width =
+      GST_ROUND_UP_N (sps->width, vk_caps.caps.pictureAccessGranularity.width);
+  self->coded_height = GST_ROUND_UP_N (sps->height,
+      vk_caps.caps.pictureAccessGranularity.height);
+
+  self->need_negotiation &= (width != self->width || height != self->height);
+  self->width = width;
+  self->height = height;
+
+  /* Ycbcr sampler */
+  {
+    VkSamplerYcbcrRange range;
+    VkChromaLocation xloc, yloc;
+    gboolean ret;
+    int loc;
+
+    ret = gst_vulkan_decoder_out_format (self->decoder, &format_prop);
+    g_assert (ret);
+
+    range = VK_SAMPLER_YCBCR_RANGE_ITU_FULL;
+    loc = 0;
+
+    if (sps->vui_parameters_present_flag) {
+      const GstH264VUIParams *vui = &sps->vui_parameters;
+
+      range = vui->video_full_range_flag > 0 ?
+          VK_SAMPLER_YCBCR_RANGE_ITU_FULL : VK_SAMPLER_YCBCR_RANGE_ITU_NARROW;
+
+      if (vui->chroma_loc_info_present_flag)
+        loc = vui->chroma_sample_loc_type_top_field;
+    }
+
+    xloc = (loc % 2 == 0) ? VK_CHROMA_LOCATION_MIDPOINT
+        : VK_CHROMA_LOCATION_COSITED_EVEN;
+    yloc = ((loc >> 1) ^ (loc < 4)) ? VK_CHROMA_LOCATION_MIDPOINT
+        : VK_CHROMA_LOCATION_COSITED_EVEN;
+
+    if (old_format != format_prop.format || range != self->range
+        || xloc != self->xloc || yloc != self->yloc) {
+      self->range = range;
+      self->xloc = xloc;
+      self->yloc = yloc;
+      ret = gst_vulkan_decoder_update_ycbcr_sampler (self->decoder, range, xloc,
+          yloc, &error);
+      if (!ret && error) {
+        GST_WARNING_OBJECT (self, "Unable to create Ycbcr sampler: %s",
+            error->message);
+        g_clear_error (&error);
+      }
+    }
+  }
+
+  self->need_params_update = TRUE;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_vulkan_h264_decoder_new_picture (GstH264Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH264Picture * picture)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
+  GstFlowReturn ret;
+  GstVulkanH264Picture *pic;
+
+  GST_TRACE_OBJECT (self, "New picture");
+
+  if (self->need_negotiation) {
+    if (!gst_video_decoder_negotiate (vdec)) {
+      GST_ERROR_OBJECT (self, "Failed downstream negotiation.");
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  ret = gst_video_decoder_allocate_output_frame (vdec, frame);
+  if (ret != GST_FLOW_OK)
+    goto allocation_failed;
+
+  pic = gst_vulkan_h264_picture_new (self, frame->output_buffer);
+  gst_h264_picture_set_user_data (picture, pic, gst_vulkan_h264_picture_free);
+
+  return GST_FLOW_OK;
+
+allocation_failed:
+  {
+    GST_WARNING_OBJECT (self, "Failed to allocated input or output buffer: %s",
+        gst_flow_get_name (ret));
+    return ret;
+  }
+}
+
+static GstFlowReturn
+gst_vulkan_h264_decoder_new_field_picture (GstH264Decoder * decoder,
+    GstH264Picture * first_field, GstH264Picture * second_field)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+  GstVulkanH264Picture *first_pic, *second_pic;
+
+  GST_TRACE_OBJECT (self, "New field picture");
+
+  first_pic = gst_h264_picture_get_user_data (first_field);
+  if (!first_pic)
+    return GST_FLOW_ERROR;
+
+  second_pic = gst_vulkan_h264_picture_new (self, first_pic->base.out);
+  gst_h264_picture_set_user_data (second_field, second_pic,
+      gst_vulkan_h264_picture_free);
+
+  GST_LOG_OBJECT (self, "New vulkan decode picture %p", second_pic);
+
+  return GST_FLOW_OK;
+}
+
+static void
+_fill_sps (const GstH264SPS * sps, StdVideoH264SequenceParameterSet * std_sps,
+    StdVideoH264HrdParameters * vkhrd,
+    StdVideoH264SequenceParameterSetVui * vkvui,
+    StdVideoH264ScalingLists * vkscaling_lists)
+{
+  const GstH264VUIParams *vui = &sps->vui_parameters;
+  const GstH264HRDParams *hrd;
+  int i;
+
+  /* *INDENT-OFF* */
+  *vkscaling_lists = (StdVideoH264ScalingLists) {
+    .scaling_list_present_mask = sps->scaling_matrix_present_flag,
+    .use_default_scaling_matrix_mask = 0, /* We already fill in the default matrix */
+  };
+
+  for (i = 0; i < STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS; i++) {
+    memcpy (vkscaling_lists->ScalingList4x4i, sps->scaling_lists_4x4i,
+        STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS
+        * sizeof (**sps->scaling_lists_4x4));
+  }
+
+  for (i = 0; i < STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS; i++) {
+    memcpy (vkscaling_lists->ScalingList8x8i, sps->scaling_lists_8x8i,
+            STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS
+            * sizeof (**sps->scaling_lists_8x8));
+  }
+
+  if (sps->vui_parameters_present_flag) {
+    if (vui->nal_hrd_parameters_present_flag)
+      hrd = &vui->nal_hrd_parameters;
+    else if (vui->vcl_hrd_parameters_present_flag)
+      hrd = &vui->vcl_hrd_parameters;
+    else
+      hrd = NULL;
+
+    if (hrd) {
+      *vkhrd = (StdVideoH264HrdParameters) {
+        .cpb_cnt_minus1 = hrd->cpb_cnt_minus1,
+        .bit_rate_scale = hrd->bit_rate_scale,
+        .cpb_size_scale = hrd->cpb_size_scale,
+        .initial_cpb_removal_delay_length_minus1 =
+            hrd->initial_cpb_removal_delay_length_minus1,
+        .cpb_removal_delay_length_minus1 = hrd->cpb_removal_delay_length_minus1,
+        .dpb_output_delay_length_minus1 = hrd->dpb_output_delay_length_minus1,
+        .time_offset_length = hrd->time_offset_length,
+      };
+
+      memcpy (vkhrd->bit_rate_value_minus1, hrd->bit_rate_value_minus1,
+          STD_VIDEO_H264_CPB_CNT_LIST_SIZE
+          * sizeof (*hrd->bit_rate_value_minus1));
+
+      memcpy (vkhrd->cpb_size_value_minus1, hrd->cpb_size_value_minus1,
+          STD_VIDEO_H264_CPB_CNT_LIST_SIZE
+          * sizeof (*hrd->cpb_size_value_minus1));
+
+      memcpy (vkhrd->cbr_flag, hrd->cbr_flag,
+          STD_VIDEO_H264_CPB_CNT_LIST_SIZE * sizeof (*hrd->cbr_flag));
+    }
+
+    *vkvui = (StdVideoH264SequenceParameterSetVui) {
+      .flags = {
+        .aspect_ratio_info_present_flag = vui->aspect_ratio_info_present_flag,
+        .overscan_info_present_flag = vui->overscan_info_present_flag,
+        .overscan_appropriate_flag = vui->overscan_appropriate_flag,
+        .video_signal_type_present_flag = vui->video_signal_type_present_flag,
+        .video_full_range_flag = vui->video_full_range_flag,
+        .color_description_present_flag = vui->colour_description_present_flag,
+        .chroma_loc_info_present_flag = vui->chroma_loc_info_present_flag,
+        .timing_info_present_flag = vui->timing_info_present_flag,
+        .fixed_frame_rate_flag = vui->fixed_frame_rate_flag,
+        .bitstream_restriction_flag = vui->bitstream_restriction_flag,
+        .nal_hrd_parameters_present_flag = vui->nal_hrd_parameters_present_flag,
+        .vcl_hrd_parameters_present_flag = vui->vcl_hrd_parameters_present_flag,
+      },
+      .aspect_ratio_idc = vui->aspect_ratio_idc,
+      .sar_width = vui->sar_width,
+      .sar_height = vui->sar_height,
+      .video_format = vui->video_format,
+      .colour_primaries = vui->colour_primaries,
+      .transfer_characteristics = vui->transfer_characteristics,
+      .matrix_coefficients = vui->matrix_coefficients,
+      .num_units_in_tick = vui->num_units_in_tick,
+      .time_scale = vui->time_scale,
+      .max_num_reorder_frames = (uint8_t) vui->num_reorder_frames,
+      .max_dec_frame_buffering = (uint8_t) vui->max_dec_frame_buffering,
+      .chroma_sample_loc_type_top_field = vui->chroma_sample_loc_type_top_field,
+      .chroma_sample_loc_type_bottom_field =
+          vui->chroma_sample_loc_type_bottom_field,
+      .pHrdParameters = hrd ? vkhrd : NULL,
+    };
+  }
+
+  *std_sps = (StdVideoH264SequenceParameterSet) {
+    .flags = {
+      .constraint_set0_flag = sps->constraint_set0_flag,
+      .constraint_set1_flag = sps->constraint_set1_flag,
+      .constraint_set2_flag = sps->constraint_set2_flag,
+      .constraint_set3_flag = sps->constraint_set3_flag,
+      .constraint_set4_flag = sps->constraint_set4_flag,
+      .constraint_set5_flag = sps->constraint_set5_flag,
+      .direct_8x8_inference_flag = sps->direct_8x8_inference_flag,
+      .mb_adaptive_frame_field_flag = sps->mb_adaptive_frame_field_flag,
+      .frame_mbs_only_flag = sps->frame_mbs_only_flag,
+      .delta_pic_order_always_zero_flag = sps->delta_pic_order_always_zero_flag,
+      .separate_colour_plane_flag = sps->separate_colour_plane_flag,
+      .gaps_in_frame_num_value_allowed_flag =
+          sps->gaps_in_frame_num_value_allowed_flag,
+      .qpprime_y_zero_transform_bypass_flag =
+          sps->qpprime_y_zero_transform_bypass_flag,
+      .frame_cropping_flag = sps->frame_cropping_flag,
+      .seq_scaling_matrix_present_flag = sps->scaling_matrix_present_flag,
+      .vui_parameters_present_flag = sps->vui_parameters_present_flag,
+    },
+    .profile_idc = sps->profile_idc,
+    .level_idc = _get_h264_level_idc (sps->level_idc),
+    .chroma_format_idc = sps->chroma_format_idc,
+    .seq_parameter_set_id = (uint8_t) sps->id,
+    .bit_depth_luma_minus8 = sps->bit_depth_luma_minus8,
+    .bit_depth_chroma_minus8 = sps->bit_depth_chroma_minus8,
+    .log2_max_frame_num_minus4 = sps->log2_max_frame_num_minus4,
+    .pic_order_cnt_type = sps->pic_order_cnt_type,
+    .offset_for_non_ref_pic = sps->offset_for_non_ref_pic,
+    .offset_for_top_to_bottom_field = sps->offset_for_top_to_bottom_field,
+    .log2_max_pic_order_cnt_lsb_minus4 = sps->log2_max_pic_order_cnt_lsb_minus4,
+    .num_ref_frames_in_pic_order_cnt_cycle =
+        sps->num_ref_frames_in_pic_order_cnt_cycle,
+    .max_num_ref_frames = (uint8_t) sps->num_ref_frames,
+    .pic_width_in_mbs_minus1 = sps->pic_width_in_mbs_minus1,
+    .pic_height_in_map_units_minus1 = sps->pic_height_in_map_units_minus1,
+    .frame_crop_left_offset = sps->frame_crop_left_offset,
+    .frame_crop_right_offset = sps->frame_crop_right_offset,
+    .frame_crop_top_offset = sps->frame_crop_top_offset,
+    .frame_crop_bottom_offset = sps->frame_crop_bottom_offset,
+    .pOffsetForRefFrame = sps->offset_for_ref_frame,
+    .pScalingLists = vkscaling_lists,
+    .pSequenceParameterSetVui = sps->vui_parameters_present_flag ? vkvui : NULL,
+  };
+  /* *INDENT-ON* */
+
+  return;
+}
+
+static void
+_fill_pps (const GstH264PPS * pps, StdVideoH264PictureParameterSet * std_pps,
+    StdVideoH264ScalingLists * vkscaling_lists)
+{
+  int i;
+
+  /* *INDENT-OFF* */
+  *vkscaling_lists = (StdVideoH264ScalingLists) {
+    .scaling_list_present_mask = pps->pic_scaling_matrix_present_flag,
+    .use_default_scaling_matrix_mask = 0, /* We already fill in the default matrix */
+  };
+
+  for (i = 0; i < STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS; i++) {
+    memcpy (vkscaling_lists->ScalingList4x4i, pps->scaling_lists_4x4i,
+        STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS
+        * sizeof (**pps->scaling_lists_4x4));
+  }
+
+  for (i = 0; i < STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS; i++) {
+    memcpy (vkscaling_lists->ScalingList8x8i, pps->scaling_lists_8x8i,
+        STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS
+        * sizeof (**pps->scaling_lists_8x8));
+  }
+
+  *std_pps = (StdVideoH264PictureParameterSet) {
+    .flags = {
+      .transform_8x8_mode_flag = pps->transform_8x8_mode_flag,
+      .redundant_pic_cnt_present_flag = pps->redundant_pic_cnt_present_flag,
+      .constrained_intra_pred_flag = pps->constrained_intra_pred_flag,
+      .deblocking_filter_control_present_flag =
+          pps->deblocking_filter_control_present_flag,
+      .weighted_pred_flag = pps->weighted_pred_flag,
+      .bottom_field_pic_order_in_frame_present_flag =
+          pps->pic_order_present_flag,
+      .entropy_coding_mode_flag = pps->entropy_coding_mode_flag,
+      .pic_scaling_matrix_present_flag = pps->pic_scaling_matrix_present_flag,
+    },
+    .seq_parameter_set_id = (uint8_t) pps->sequence->id,
+    .pic_parameter_set_id = (uint8_t) pps->id,
+    .num_ref_idx_l0_default_active_minus1 = pps->num_ref_idx_l0_active_minus1,
+    .num_ref_idx_l1_default_active_minus1 = pps->num_ref_idx_l1_active_minus1,
+    .weighted_bipred_idc = pps->weighted_bipred_idc,
+    .pic_init_qp_minus26 = pps->pic_init_qp_minus26,
+    .pic_init_qs_minus26 = pps->pic_init_qs_minus26,
+    .chroma_qp_index_offset = pps->chroma_qp_index_offset,
+    .second_chroma_qp_index_offset =
+        (int8_t) pps->second_chroma_qp_index_offset,
+    .pScalingLists = vkscaling_lists,
+  };
+  /* *INDENT-ON* */
+
+  return;
+}
+
+static GstFlowReturn
+_update_parameters (GstVulkanH264Decoder * self, const GstH264SPS * sps,
+    const GstH264PPS * pps)
+{
+  /* SPS */
+  StdVideoH264SequenceParameterSet std_sps;
+  StdVideoH264HrdParameters hrd;
+  StdVideoH264SequenceParameterSetVui vui;
+  StdVideoH264ScalingLists sps_scaling_lists;
+
+  /* PPS */
+  StdVideoH264PictureParameterSet std_pps;
+  StdVideoH264ScalingLists pps_scaling_lists;
+
+  VkVideoDecodeH264SessionParametersAddInfoKHR params = {
+    .sType =
+        VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR,
+    /* .pNext =  */
+    .stdSPSCount = 1,
+    .pStdSPSs = &std_sps,
+    .stdPPSCount = 1,
+    .pStdPPSs = &std_pps,
+  };
+  VkVideoDecodeH264SessionParametersCreateInfoKHR info = {
+    .sType =
+        VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR,
+    /* .pNext =  */
+    .maxStdSPSCount = params.stdSPSCount,
+    .maxStdPPSCount = params.stdPPSCount,
+    .pParametersAddInfo = &params,
+  };
+
+  GError *error = NULL;
+
+  _fill_sps (sps, &std_sps, &hrd, &vui, &sps_scaling_lists);
+  _fill_pps (pps, &std_pps, &pps_scaling_lists);
+
+  if (!gst_vulkan_decoder_update_video_session_parameters (self->decoder,
+          &(GstVulkanDecoderParameters) {
+          info}
+          , &error)) {
+    if (error) {
+      GST_ERROR_OBJECT (self, "Couldn't set codec parameters: %s",
+          error->message);
+      g_clear_error (&error);
+    }
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static void
+_fill_h264_pic (const GstH264Picture * picture, const GstH264Slice * slice,
+    VkVideoDecodeH264PictureInfoKHR * vk_h264pic,
+    StdVideoDecodeH264PictureInfo * std_h264pic)
+{
+  GstH264PPS *pps = slice->header.pps;
+  GstH264SPS *sps = pps->sequence;
+
+  /* *INDENT-OFF* */
+  *std_h264pic = (StdVideoDecodeH264PictureInfo) {
+    .flags = {
+      .field_pic_flag = slice->header.field_pic_flag,
+      .is_intra = 1,
+      .IdrPicFlag = slice->nalu.idr_pic_flag,
+      .bottom_field_flag = slice->header.bottom_field_flag,
+      .is_reference = GST_H264_PICTURE_IS_REF (picture),
+      .complementary_field_pair = picture->second_field,
+    },
+    .seq_parameter_set_id = sps->id,
+    .pic_parameter_set_id = pps->id,
+    /* .reserved1 = */
+    /* .reserved2 = */
+    .frame_num = picture->frame_num,
+    .idr_pic_id = picture->idr_pic_id,
+    .PicOrderCnt = { picture->top_field_order_cnt,
+        picture->bottom_field_order_cnt },
+  };
+
+  *vk_h264pic = (VkVideoDecodeH264PictureInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_KHR,
+    /* .pNext = */
+    .pStdPictureInfo = std_h264pic,
+    /* .slicesCount = , *//* filled in end_picture() */
+    /* .pSlicesDataOffsets = *//* filled in end_picture() */
+  };
+  /* *INDENT-ON* */
+}
+
+static gint32
+_find_next_slot_idx (GArray * dpb)
+{
+  gint32 i;
+  guint len;
+  GstH264Picture *arr36 = { NULL, };
+
+  g_assert (dpb->len < 36);
+
+  len = dpb->len;
+
+  for (i = 0; i < len; i++) {
+    GstH264Picture *pic = g_array_index (dpb, GstH264Picture *, i);
+    GstVulkanH264Picture *h264_pic = gst_h264_picture_get_user_data (pic);
+    arrh264_pic->slot_idx = pic;
+  }
+
+  /* let's return the smallest available / not ref index */
+  for (i = 0; i < len; i++) {
+    if (!arri)
+      return i;
+  }
+
+  return len;
+}
+
+static inline void
+_fill_h264_slot (GstH264Picture * picture,
+    VkVideoDecodeH264DpbSlotInfoKHR * vkh264_slot,
+    StdVideoDecodeH264ReferenceInfo * stdh264_ref)
+{
+  /* *INDENT-OFF* */
+  *stdh264_ref = (StdVideoDecodeH264ReferenceInfo) {
+    .flags = {
+      .top_field_flag =
+          (picture->field == GST_H264_PICTURE_FIELD_TOP_FIELD),
+      .bottom_field_flag =
+          (picture->field == GST_H264_PICTURE_FIELD_BOTTOM_FIELD),
+      .is_non_existing = picture->nonexisting,
+      .used_for_long_term_reference =
+          GST_H264_PICTURE_IS_LONG_TERM_REF (picture),
+    },
+    .FrameNum = GST_H264_PICTURE_IS_LONG_TERM_REF (picture) ?
+        picture->long_term_pic_num : picture->pic_num,
+    /* .reserved = */
+    /* .PicOrderCnt = */
+  };
+  /* *INDENT-ON* */
+
+  switch (picture->field) {
+    case GST_H264_PICTURE_FIELD_FRAME:
+      stdh264_ref->PicOrderCnt0 = picture->top_field_order_cnt;
+      stdh264_ref->PicOrderCnt1 = picture->bottom_field_order_cnt;
+      break;
+    case GST_H264_PICTURE_FIELD_BOTTOM_FIELD:
+      if (picture->other_field)
+        stdh264_ref->PicOrderCnt0 = picture->other_field->top_field_order_cnt;
+      else
+        stdh264_ref->PicOrderCnt0 = 0;
+      stdh264_ref->PicOrderCnt1 = picture->bottom_field_order_cnt;
+      break;
+    case GST_H264_PICTURE_FIELD_TOP_FIELD:
+      stdh264_ref->PicOrderCnt0 = picture->top_field_order_cnt;
+      if (picture->other_field) {
+        stdh264_ref->PicOrderCnt1 =
+            picture->other_field->bottom_field_order_cnt;
+      } else {
+        stdh264_ref->PicOrderCnt1 = 0;
+      }
+      break;
+    default:
+      break;
+  }
+
+  /* *INDENT-OFF* */
+  *vkh264_slot = (VkVideoDecodeH264DpbSlotInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR,
+    .pStdReferenceInfo = stdh264_ref,
+  };
+  /* *INDENT-ON* */
+
+}
+
+static inline void
+_fill_ref_slot (GstVulkanH264Decoder * self, GstH264Picture * picture,
+    VkVideoReferenceSlotInfoKHR * slot, VkVideoPictureResourceInfoKHR * res,
+    VkVideoDecodeH264DpbSlotInfoKHR * vkh264_slot,
+    StdVideoDecodeH264ReferenceInfo * stdh264_ref,
+    GstVulkanDecoderPicture ** ref)
+{
+  GstVulkanH264Picture *pic;
+
+  _fill_h264_slot (picture, vkh264_slot, stdh264_ref);
+
+  pic = gst_h264_picture_get_user_data (picture);
+  g_assert (pic);
+
+  /* *INDENT-OFF* */
+  *res = (VkVideoPictureResourceInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR,
+    .codedOffset = {
+      .x = 0,
+      .y = 0,
+    },
+    .codedExtent = {
+      .width = self->coded_width,
+      .height = self->coded_height,
+    },
+    .baseArrayLayer = self->decoder->layered_dpb ? pic->slot_idx : 0,
+    .imageViewBinding = pic->base.img_view_ref->view,
+  };
+
+  *slot = (VkVideoReferenceSlotInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR,
+    .pNext = vkh264_slot,
+    .slotIndex = pic->slot_idx,
+    .pPictureResource = res,
+  };
+  /* *INDENT-ON* */
+
+  if (ref)
+    *ref = &pic->base;
+
+  GST_TRACE_OBJECT (self, "0x%lx slotIndex: %d", res->imageViewBinding,
+      slot->slotIndex);
+}
+
+static GstFlowReturn
+gst_vulkan_h264_decoder_start_picture (GstH264Decoder * decoder,
+    GstH264Picture * picture, GstH264Slice * slice, GstH264Dpb * dpb)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+  GstH264PPS *pps = slice->header.pps;
+  GstH264SPS *sps = pps->sequence;
+  GstFlowReturn ret;
+  GstVulkanH264Picture *pic;
+  GArray *refs;
+  guint i, j;
+
+  GST_TRACE_OBJECT (self, "Start picture");
+
+  if (self->need_params_update) {
+    ret = _update_parameters (self, sps, pps);
+    if (ret != GST_FLOW_OK)
+      return ret;
+    self->need_params_update = FALSE;
+  }
+
+  refs = gst_h264_dpb_get_pictures_all (dpb);
+
+  pic = gst_h264_picture_get_user_data (picture);
+  g_assert (pic);
+
+  _fill_h264_pic (picture, slice, &pic->vk_h264pic, &pic->std_h264pic);
+  pic->slot_idx = _find_next_slot_idx (refs);
+
+  /* fill main slot */
+  _fill_ref_slot (self, picture, &pic->base.slot,
+      &pic->base.pic_res, &pic->vk_slot, &pic->std_ref, NULL);
+
+  j = 0;
+
+  /* Fill in short-term references */
+  for (i = 0; i < refs->len; i++) {
+    GstH264Picture *picture = g_array_index (refs, GstH264Picture *, i);
+    /* XXX: shall we add second fields? */
+    if (GST_H264_PICTURE_IS_SHORT_TERM_REF (picture)) {
+      _fill_ref_slot (self, picture, &pic->base.slotsj,
+          &pic->base.pics_resj, &pic->vk_slotsj, &pic->std_refsj,
+          &pic->base.refsj);
+      j++;
+    }
+    /* FIXME: do it in O(n) rather O(2n) */
+  }
+
+  /* Fill in long-term refs */
+  for (i = 0; i < refs->len; i++) {
+    GstH264Picture *picture = g_array_index (refs, GstH264Picture *, i);
+    /* XXX: shall we add non existing and second fields? */
+    if (GST_H264_PICTURE_IS_LONG_TERM_REF (picture)) {
+      _fill_ref_slot (self, picture, &pic->base.slotsj,
+          &pic->base.pics_resj, &pic->vk_slotsj, &pic->std_refsj,
+          &pic->base.refsj);
+      j++;
+    }
+  }
+
+  g_array_unref (refs);
+
+  /* *INDENT-OFF* */
+  pic->base.decode_info = (VkVideoDecodeInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR,
+    .pNext = &pic->vk_h264pic,
+    .flags = 0x0,
+    /* .srcBuffer = */
+    .srcBufferOffset = 0,
+    /* .srcBufferRange = */
+    .dstPictureResource = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR,
+      .codedOffset = {
+        .x = 0,
+        .y = 0,
+      },
+      .codedExtent = {
+        .width = self->coded_width,
+        .height = self->coded_height,
+      },
+      .baseArrayLayer = 0,
+      .imageViewBinding = pic->base.img_view_out->view,
+    },
+    .pSetupReferenceSlot = &pic->base.slot,
+    .referenceSlotCount = j,
+    .pReferenceSlots = pic->base.slots,
+  };
+  /* *INDENT-ON* */
+
+  /* only wait if there's a buffer processed */
+  if (GST_CODEC_PICTURE_FRAME_NUMBER (picture) > 0) {
+    if (!gst_vulkan_decoder_wait (self->decoder)) {
+      GST_ERROR_OBJECT (self, "Error at waiting for decoding operation to end");
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_vulkan_h264_decoder_decode_slice (GstH264Decoder * decoder,
+    GstH264Picture * picture, GstH264Slice * slice, GArray * ref_pic_list0,
+    GArray * ref_pic_list1)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+  GstVulkanH264Picture *pic;
+
+  GST_TRACE_OBJECT (self, "Decode slice");
+
+  pic = gst_h264_picture_get_user_data (picture);
+  g_assert (pic);
+
+  if (!gst_vulkan_decoder_append_slice (self->decoder, &pic->base,
+          slice->nalu.data + slice->nalu.offset, slice->nalu.size, TRUE))
+    return GST_FLOW_ERROR;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_vulkan_h264_decoder_end_picture (GstH264Decoder * decoder,
+    GstH264Picture * picture)
+{
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+  GstVulkanH264Picture *pic;
+  GError *error = NULL;
+
+  GST_TRACE_OBJECT (self, "End picture");
+
+  pic = gst_h264_picture_get_user_data (picture);
+  g_assert (pic);
+
+  pic->vk_h264pic.sliceCount = pic->base.slice_offs->len - 1;
+  pic->vk_h264pic.pSliceOffsets = (const guint32 *) pic->base.slice_offs->data;
+
+  GST_LOG_OBJECT (self, "Decoding frame, %d bytes %d slices",
+      pic->vk_h264pic.pSliceOffsetspic->vk_h264pic.sliceCount,
+      pic->vk_h264pic.sliceCount);
+
+  if (!gst_vulkan_decoder_decode (self->decoder, &pic->base, &error)) {
+    GST_ERROR_OBJECT (self, "Couldn't decode frame: %s",
+        error ? error->message : "");
+    g_clear_error (&error);
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_vulkan_h264_decoder_output_picture (GstH264Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH264Picture * picture)
+{
+  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
+  GstVulkanH264Decoder *self = GST_VULKAN_H264_DECODER (decoder);
+
+  GST_TRACE_OBJECT (self, "Output picture");
+
+  GST_LOG_OBJECT (self,
+      "Outputting picture %p (poc %d)", picture, picture->pic_order_cnt);
+
+  if (GST_CODEC_PICTURE (picture)->discont_state) {
+    self->need_negotiation = TRUE;
+    if (!gst_video_decoder_negotiate (vdec)) {
+      gst_h264_picture_unref (picture);
+      GST_ERROR_OBJECT (self, "Could not re-negotiate with updated state");
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  gst_h264_picture_unref (picture);
+
+  reset_pipeline_stage_mask (frame->output_buffer);
+
+  return gst_video_decoder_finish_frame (vdec, frame);
+}
+
+static void
+gst_vulkan_h264_decoder_init (GstVulkanH264Decoder * self)
+{
+  gst_vulkan_buffer_memory_init_once ();
+}
+
+static void
+gst_vulkan_h264_decoder_class_init (GstVulkanH264DecoderClass * klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstH264DecoderClass *h264decoder_class = GST_H264_DECODER_CLASS (klass);
+
+  gst_element_class_set_metadata (element_class, "Vulkan H.264 decoder",
+      "Codec/Decoder/Video/Hardware", "A H.264 video decoder based on Vulkan",
+      "Víctor Jáquez <vjaquez@igalia.com>");
+
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vulkan_h264dec_sink_template);
+
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vulkan_h264dec_src_template);
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_set_context);
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_open);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_close);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_stop);
+  decoder_class->src_query =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_src_query);
+  decoder_class->sink_query =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_sink_query);
+  decoder_class->negotiate =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_decide_allocation);
+
+  h264decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_new_sequence);
+  h264decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_new_picture);
+  h264decoder_class->new_field_picture =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_new_field_picture);
+  h264decoder_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_start_picture);
+  h264decoder_class->decode_slice =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_decode_slice);
+  h264decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_end_picture);
+  h264decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h264_decoder_output_picture);
+}

gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/vkh264dec.h Added

@@ -0,0 +1,31 @@
+/* GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/codecs/gsth264decoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_VULKAN_H264_DECODER (gst_vulkan_h264_decoder_get_type())
+G_DECLARE_FINAL_TYPE (GstVulkanH264Decoder, gst_vulkan_h264_decoder, GST, VULKAN_H264_DECODER, GstH264Decoder)
+
+GST_ELEMENT_REGISTER_DECLARE (vulkanh264dec);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/vkh265dec.c Added

@@ -0,0 +1,1687 @@
+/* GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "vkh265dec.h"
+
+#include <gst/video/video.h>
+#include <gst/vulkan/vulkan.h>
+
+#include "gstvulkanelements.h"
+
+typedef struct _GstVulkanH265Decoder GstVulkanH265Decoder;
+typedef struct _GstVulkanH265Picture GstVulkanH265Picture;
+
+struct _GstVulkanH265Picture
+{
+  GstVulkanDecoderPicture base;
+
+  /* 16 is max DPB size */
+  /* Picture refs */
+  StdVideoDecodeH265ReferenceInfo std_refs16;
+  VkVideoDecodeH265DpbSlotInfoKHR vk_slots16;
+
+  /* Current picture */
+  StdVideoDecodeH265ReferenceInfo std_ref;
+  VkVideoDecodeH265DpbSlotInfoKHR vk_slot;
+
+  VkVideoDecodeH265PictureInfoKHR vk_h265pic;
+  StdVideoDecodeH265PictureInfo std_h265pic;
+
+  gint32 slot_idx;
+};
+
+struct _GstVulkanH265Decoder
+{
+  GstH265Decoder parent;
+
+  GstVulkanInstance *instance;
+  GstVulkanDevice *device;
+  GstVulkanQueue *graphic_queue, *decode_queue;
+
+  GstVulkanDecoder *decoder;
+
+  gboolean need_negotiation;
+  gboolean need_params_update;
+
+  gint x, y;
+  gint width, height;
+  gint coded_width, coded_height;
+  gint dpb_size;
+
+  VkSamplerYcbcrRange range;
+  VkChromaLocation xloc, yloc;
+
+  GstVideoCodecState *output_state;
+};
+
+static GstStaticPadTemplate gst_vulkan_h265dec_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-h265, "
+        "profile = (string) main,"
+        "stream-format = { (string) hvc1, (string) hev1, (string) byte-stream }, "
+        "alignment = (string) au"));
+
+static GstStaticPadTemplate gst_vulkan_h265dec_src_template =
+GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_VULKAN_IMAGE, "NV12")));
+
+GST_DEBUG_CATEGORY (gst_debug_vulkan_h265_decoder);
+#define GST_CAT_DEFAULT gst_debug_vulkan_h265_decoder
+
+#define gst_vulkan_h265_decoder_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstVulkanH265Decoder, gst_vulkan_h265_decoder,
+    GST_TYPE_H265_DECODER,
+    GST_DEBUG_CATEGORY_INIT (gst_debug_vulkan_h265_decoder,
+        "vulkanh265dec", 0, "Vulkan H.265 Decoder"));
+GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (vulkanh265dec, "vulkanh265dec",
+    GST_RANK_NONE, GST_TYPE_VULKAN_H265_DECODER, vulkan_element_init (plugin));
+
+static void
+gst_vulkan_h265_decoder_set_context (GstElement * element, GstContext * context)
+{
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (element);
+
+  gst_vulkan_handle_set_context (element, context, NULL, &self->instance);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+_query_context (GstVulkanH265Decoder * self, GstQuery * query)
+{
+  if (gst_vulkan_handle_context_query (GST_ELEMENT (self), query, NULL,
+          self->instance, self->device))
+    return TRUE;
+
+  if (gst_vulkan_queue_handle_context_query (GST_ELEMENT (self), query,
+          self->graphic_queue))
+    return TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+gst_vulkan_h265_decoder_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  gboolean ret = FALSE;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      ret = _query_context (GST_VULKAN_H265_DECODER (decoder), query);
+      break;
+    default:
+      ret = GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+      break;
+  }
+
+  return ret;
+}
+
+static gboolean
+gst_vulkan_h265_decoder_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  gboolean ret = FALSE;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      ret = _query_context (GST_VULKAN_H265_DECODER (decoder), query);
+      break;
+    default:
+      ret = GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+      break;
+  }
+
+  return ret;
+}
+
+static gboolean
+_find_queues (GstVulkanDevice * device, GstVulkanQueue * queue, gpointer data)
+{
+  GstVulkanH265Decoder *self = data;
+  guint32 flags =
+      device->physical_device->queue_family_propsqueue->family.queueFlags;
+  guint32 codec =
+      device->physical_device->queue_family_opsqueue->family.video;
+
+  if (!self->graphic_queue
+      && ((flags & VK_QUEUE_GRAPHICS_BIT) == VK_QUEUE_GRAPHICS_BIT)) {
+    self->graphic_queue = gst_object_ref (queue);
+  }
+
+  if (!self->decode_queue
+      && ((codec & VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR)
+          == VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR)
+      && ((flags & VK_QUEUE_VIDEO_DECODE_BIT_KHR)
+          == VK_QUEUE_VIDEO_DECODE_BIT_KHR)) {
+    self->decode_queue = gst_object_ref (queue);
+  }
+
+  return !(self->decode_queue && self->graphic_queue);
+}
+
+static gboolean
+gst_vulkan_h265_decoder_open (GstVideoDecoder * decoder)
+{
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (decoder);
+
+  if (!gst_vulkan_ensure_element_data (GST_ELEMENT (decoder), NULL,
+          &self->instance)) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+        ("Failed to retrieve vulkan instance"), (NULL));
+    return FALSE;
+  }
+
+  if (!gst_vulkan_device_run_context_query (GST_ELEMENT (decoder),
+          &self->device)) {
+    GError *error = NULL;
+    GST_DEBUG_OBJECT (self, "No device retrieved from peer elements");
+    self->device = gst_vulkan_instance_create_device (self->instance, &error);
+    if (!self->device) {
+      GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+          ("Failed to create vulkan device"),
+          ("%s", error ? error->message : ""));
+      g_clear_error (&error);
+      return FALSE;
+    }
+  }
+
+  if (!gst_vulkan_queue_run_context_query (GST_ELEMENT (self),
+          &self->graphic_queue)) {
+    GST_DEBUG_OBJECT (self, "No graphic queue retrieved from peer elements");
+  }
+
+  gst_vulkan_device_foreach_queue (self->device, _find_queues, self);
+
+  if (!self->decode_queue) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+        ("Failed to create/retrieve vulkan H.264 decoder queue"), (NULL));
+    return FALSE;
+  }
+
+  self->decoder = gst_vulkan_queue_create_decoder (self->decode_queue,
+      VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR);
+  if (!self->decoder) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+        ("Failed to create vulkan H.264 decoder"), (NULL));
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_vulkan_h265_decoder_close (GstVideoDecoder * decoder)
+{
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (decoder);
+
+  gst_clear_object (&self->decoder);
+  gst_clear_object (&self->decode_queue);
+  gst_clear_object (&self->graphic_queue);
+  gst_clear_object (&self->device);
+  gst_clear_object (&self->instance);
+
+  return TRUE;
+}
+
+static gboolean
+gst_vulkan_h265_decoder_stop (GstVideoDecoder * decoder)
+{
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (decoder);
+
+  if (self->decoder)
+    gst_vulkan_decoder_stop (self->decoder);
+
+  if (self->output_state)
+    gst_video_codec_state_unref (self->output_state);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+}
+
+static gboolean
+gst_vulkan_h265_decoder_negotiate (GstVideoDecoder * decoder)
+{
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (decoder);
+  GstH265Decoder *h265dec = GST_H265_DECODER (decoder);
+  VkVideoFormatPropertiesKHR format_prop;
+  GstVideoFormat format;
+
+  /* Ignore downstream renegotiation request. */
+  if (!self->need_negotiation)
+    return TRUE;
+
+  if (!gst_vulkan_decoder_out_format (self->decoder, &format_prop))
+    return FALSE;
+
+  self->need_negotiation = FALSE;
+
+  if (self->output_state)
+    gst_video_codec_state_unref (self->output_state);
+
+  format = gst_vulkan_format_to_video_format (format_prop.format);
+  self->output_state = gst_video_decoder_set_interlaced_output_state (decoder,
+      format, GST_VIDEO_INTERLACE_MODE_PROGRESSIVE, self->width, self->height,
+      h265dec->input_state);
+
+  self->output_state->caps = gst_video_info_to_caps (&self->output_state->info);
+  gst_caps_set_features_simple (self->output_state->caps,
+      gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_VULKAN_IMAGE, NULL));
+
+  GST_INFO_OBJECT (self, "Negotiated caps %" GST_PTR_FORMAT,
+      self->output_state->caps);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_vulkan_h265_decoder_decide_allocation (GstVideoDecoder * decoder,
+    GstQuery * query)
+{
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (decoder);
+  GstCaps *new_caps, *profile_caps, *caps = NULL;
+  GstBufferPool *pool = NULL;
+  GstStructure *config;
+  guint size, min, max;
+  gboolean update_pool;
+  VkImageUsageFlags usage;
+  GstVulkanVideoCapabilities vk_caps;
+
+  gst_query_parse_allocation (query, &caps, NULL);
+  if (!caps)
+    return FALSE;
+  if (!gst_vulkan_decoder_caps (self->decoder, &vk_caps))
+    return FALSE;
+
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+    update_pool = TRUE;
+  } else {
+    GstVideoInfo vinfo;
+
+    gst_video_info_from_caps (&vinfo, caps);
+    size = GST_VIDEO_INFO_SIZE (&vinfo);
+    min = 2;
+    max = 0;
+    update_pool = FALSE;
+  }
+
+  if (!(pool && GST_IS_VULKAN_IMAGE_BUFFER_POOL (pool))) {
+    gst_clear_object (&pool);
+    pool = gst_vulkan_image_buffer_pool_new (self->device);
+  }
+
+  usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT
+      | VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR;
+
+  if (!self->decoder->dedicated_dpb) {
+    min = MAX (min, MIN (self->dpb_size, vk_caps.caps.maxDpbSlots));
+    max = 0;
+    usage |= VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR;
+  }
+
+  new_caps = gst_caps_copy (caps);
+  gst_caps_set_simple (new_caps, "width", G_TYPE_INT, self->coded_width,
+      "height", G_TYPE_INT, self->coded_height, NULL);
+  profile_caps = gst_vulkan_decoder_profile_caps (self->decoder);
+
+  config = gst_buffer_pool_get_config (pool);
+
+  gst_buffer_pool_config_set_params (config, new_caps, size, min, max);
+
+  gst_vulkan_image_buffer_pool_config_set_allocation_params (config, usage,
+      VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR,
+      VK_ACCESS_TRANSFER_WRITE_BIT);
+  gst_vulkan_image_buffer_pool_config_set_decode_caps (config, profile_caps);
+
+  gst_caps_unref (profile_caps);
+  gst_caps_unref (new_caps);
+
+  if (!gst_buffer_pool_set_config (pool, config))
+    goto bail;
+
+  if (update_pool)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+
+  gst_object_unref (pool);
+
+  gst_vulkan_decoder_create_dpb_pool (self->decoder, new_caps);
+
+  return TRUE;
+
+bail:
+  {
+    gst_clear_caps (&new_caps);
+    gst_clear_object (&pool);
+    return FALSE;
+  }
+}
+
+/* FIXME: dup with h264 */
+static VkVideoChromaSubsamplingFlagBitsKHR
+_get_chroma_subsampling_flag (guint8 chroma_format_idc)
+{
+  switch (chroma_format_idc) {
+    case 1:
+      return VK_VIDEO_CHROMA_SUBSAMPLING_420_BIT_KHR;
+    case 2:
+      return VK_VIDEO_CHROMA_SUBSAMPLING_422_BIT_KHR;
+    case 3:
+      return VK_VIDEO_CHROMA_SUBSAMPLING_444_BIT_KHR;
+    default:
+      return VK_VIDEO_CHROMA_SUBSAMPLING_INVALID_KHR;
+  }
+}
+
+/* FIXME: dup with h264 */
+static VkVideoComponentBitDepthFlagBitsKHR
+_get_component_bit_depth (guint8 bit_depth)
+{
+  switch (bit_depth) {
+    case 8:
+      return VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR;
+    case 10:
+      return VK_VIDEO_COMPONENT_BIT_DEPTH_10_BIT_KHR;
+    case 12:
+      return VK_VIDEO_COMPONENT_BIT_DEPTH_12_BIT_KHR;
+    default:
+      return VK_VIDEO_COMPONENT_BIT_DEPTH_INVALID_KHR;
+  }
+}
+
+static StdVideoH265ProfileIdc
+_get_h265_profile (GstH265Profile profile_idc)
+{
+  switch (profile_idc) {
+    case GST_H265_PROFILE_MAIN:
+      return STD_VIDEO_H265_PROFILE_IDC_MAIN;
+    case GST_H265_PROFILE_MAIN_10:
+      return STD_VIDEO_H265_PROFILE_IDC_MAIN_10;
+    case GST_H265_PROFILE_MAIN_STILL_PICTURE:
+      return STD_VIDEO_H265_PROFILE_IDC_MAIN_STILL_PICTURE;
+      /* FIXME */
+      /* case GST_H265_PROFILE_XXX: */
+      /*   return STD_VIDEO_H265_PROFILE_IDC_FORMAT_RANGE_EXTENSIONS; */
+    case GST_H265_PROFILE_SCALABLE_MAIN:
+      return STD_VIDEO_H265_PROFILE_IDC_SCC_EXTENSIONS;
+    default:
+      return STD_VIDEO_H265_PROFILE_IDC_INVALID;
+  }
+}
+
+static void
+gst_vulkan_video_profile_from_h265_sps (GstVulkanVideoProfile * profile,
+    const GstH265SPS * sps)
+{
+  /* *INDENT-OFF* */
+  *profile = (GstVulkanVideoProfile) {
+    .profile = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR,
+      .pNext = &profile->usage,
+      .videoCodecOperation = VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR,
+      .chromaSubsampling = _get_chroma_subsampling_flag (sps->chroma_format_idc),
+      .lumaBitDepth = _get_component_bit_depth (sps->bit_depth_luma_minus8 + 8),
+      .chromaBitDepth = _get_component_bit_depth (sps->bit_depth_chroma_minus8 + 8),
+    },
+    .usage.decode = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR,
+      .videoUsageHints = VK_VIDEO_DECODE_USAGE_DEFAULT_KHR,
+      .pNext = &profile->codec,
+    },
+    .codec.h265dec = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR,
+      .stdProfileIdc =
+        _get_h265_profile (gst_h265_get_profile_from_sps ((GstH265SPS *) sps)),
+    },
+  };
+  /* *INDENT-ON* */
+}
+
+static GstFlowReturn
+gst_vulkan_h265_decoder_new_sequence (GstH265Decoder * decoder,
+    const GstH265SPS * sps, gint max_dpb_size)
+{
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (decoder);
+  GstVulkanVideoProfile profile;
+  GstVulkanVideoCapabilities vk_caps;
+  GError *error = NULL;
+  gint x, y, width, height;
+  VkFormat old_format = VK_FORMAT_UNDEFINED;
+  VkVideoFormatPropertiesKHR format_prop;
+
+  gst_vulkan_video_profile_from_h265_sps (&profile, sps);
+
+  if (gst_vulkan_decoder_is_started (self->decoder)) {
+    if (!gst_vulkan_video_profile_is_equal (&self->decoder->profile, &profile)) {
+      if (gst_vulkan_decoder_out_format (self->decoder, &format_prop))
+        old_format = format_prop.format;
+      gst_vulkan_decoder_stop (self->decoder);
+    } else {
+      self->need_negotiation = FALSE;
+    }
+  }
+
+  if (!gst_vulkan_decoder_is_started (self->decoder)) {
+    self->need_negotiation = TRUE;
+    if (!gst_vulkan_decoder_start (self->decoder, &profile, &error)) {
+      GST_ERROR_OBJECT (self, "Couldn't start decoder: %s",
+          error ? error->message : "");
+      g_clear_error (&error);
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  self->dpb_size = MAX (self->dpb_size, max_dpb_size);
+
+  if (sps->conformance_window_flag) {
+    x = sps->crop_rect_x;
+    y = sps->crop_rect_y;
+    width = sps->crop_rect_width;
+    height = sps->crop_rect_height;
+  } else {
+    width = sps->width;
+    height = sps->height;
+    x = y = 0;
+  }
+
+  gst_vulkan_decoder_caps (self->decoder, &vk_caps);
+  self->coded_width =
+      GST_ROUND_UP_N (sps->width, vk_caps.caps.pictureAccessGranularity.width);
+  self->coded_height = GST_ROUND_UP_N (sps->height,
+      vk_caps.caps.pictureAccessGranularity.height);
+
+  self->need_negotiation &= (x != self->x || y != self->y
+      || width != self->width || height != self->height);
+  self->x = x;
+  self->y = y;
+  self->width = width;
+  self->height = height;
+
+  /* Ycbcr sampler */
+  {
+    VkSamplerYcbcrRange range;
+    VkChromaLocation xloc, yloc;
+    gboolean ret;
+    int loc;
+
+    ret = gst_vulkan_decoder_out_format (self->decoder, &format_prop);
+    g_assert (ret);
+
+    range = VK_SAMPLER_YCBCR_RANGE_ITU_FULL;
+    loc = 0;
+
+    if (sps->vui_parameters_present_flag) {
+      const GstH265VUIParams *vui = &sps->vui_params;
+
+      range = vui->video_full_range_flag > 0 ?
+          VK_SAMPLER_YCBCR_RANGE_ITU_FULL : VK_SAMPLER_YCBCR_RANGE_ITU_NARROW;
+
+      if (vui->chroma_loc_info_present_flag)
+        loc = vui->chroma_sample_loc_type_top_field;
+    }
+
+    xloc = (loc % 2 == 0) ? VK_CHROMA_LOCATION_MIDPOINT
+        : VK_CHROMA_LOCATION_COSITED_EVEN;
+    yloc = ((loc >> 1) ^ (loc < 4)) ? VK_CHROMA_LOCATION_MIDPOINT
+        : VK_CHROMA_LOCATION_COSITED_EVEN;
+
+    if (old_format != format_prop.format || range != self->range
+        || xloc != self->xloc || yloc != self->yloc) {
+      self->range = range;
+      self->xloc = xloc;
+      self->yloc = yloc;
+      ret = gst_vulkan_decoder_update_ycbcr_sampler (self->decoder, range, xloc,
+          yloc, &error);
+      if (!ret && error) {
+        GST_WARNING_OBJECT (self, "Unable to create Ycbcr sampler: %s",
+            error->message);
+        g_clear_error (&error);
+      }
+    }
+  }
+
+  self->need_params_update = TRUE;
+
+  return GST_FLOW_OK;
+}
+
+/* set a common pipeline stage valid for any queue to avoid Vulkan Validation
+ * errors */
+static void
+reset_pipeline_stage_mask (GstBuffer * buf)
+{
+  guint i, n = gst_buffer_n_memory (buf);
+
+  for (i = 0; i < n; i++) {
+    GstVulkanImageMemory *vk_mem =
+        (GstVulkanImageMemory *) gst_buffer_peek_memory (buf, i);
+    vk_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
+  }
+}
+
+static GstVulkanH265Picture *
+gst_vulkan_h265_picture_new (GstVulkanH265Decoder * self, GstBuffer * out)
+{
+  GstVulkanH265Picture *pic;
+
+  pic = g_new0 (GstVulkanH265Picture, 1);
+  gst_vulkan_decoder_picture_init (self->decoder, &pic->base, out);
+  reset_pipeline_stage_mask (out);
+
+  return pic;
+}
+
+static void
+gst_vulkan_h265_picture_free (gpointer data)
+{
+  GstVulkanH265Picture *pic = data;
+
+  gst_vulkan_decoder_picture_release (&pic->base);
+  g_free (pic);
+}
+
+static GstFlowReturn
+gst_vulkan_h265_decoder_new_picture (GstH265Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH265Picture * picture)
+{
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (decoder);
+  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
+  GstFlowReturn ret;
+  GstVulkanH265Picture *pic;
+
+  GST_TRACE_OBJECT (self, "New picture");
+
+  if (self->need_negotiation) {
+    if (!gst_video_decoder_negotiate (vdec)) {
+      GST_ERROR_OBJECT (self, "Failed downstream negotiation.");
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  ret = gst_video_decoder_allocate_output_frame (vdec, frame);
+  if (ret != GST_FLOW_OK)
+    goto allocation_failed;
+
+  pic = gst_vulkan_h265_picture_new (self, frame->output_buffer);
+  gst_h265_picture_set_user_data (picture, pic, gst_vulkan_h265_picture_free);
+
+  return GST_FLOW_OK;
+
+allocation_failed:
+  {
+    GST_WARNING_OBJECT (self, "Failed to allocated input or output buffer: %s",
+        gst_flow_get_name (ret));
+    return ret;
+  }
+}
+
+struct SPS
+{
+  StdVideoH265SequenceParameterSet sps;
+  StdVideoH265ScalingLists scaling;
+  StdVideoH265HrdParameters vui_header;
+  StdVideoH265SequenceParameterSetVui vui;
+  StdVideoH265ProfileTierLevel ptl;
+  StdVideoH265DecPicBufMgr dpbm;
+  StdVideoH265PredictorPaletteEntries pal;
+  StdVideoH265SubLayerHrdParameters nal_hrdGST_H265_MAX_SUB_LAYERS;
+  StdVideoH265SubLayerHrdParameters vcl_hrdGST_H265_MAX_SUB_LAYERS;
+  /* 7.4.3.2.1: num_short_term_ref_pic_sets is in 0, 64. */
+  StdVideoH265ShortTermRefPicSet str64;
+  StdVideoH265LongTermRefPicsSps ltr;
+};
+
+struct PPS
+{
+  StdVideoH265PictureParameterSet pps;
+  StdVideoH265ScalingLists scaling;
+  StdVideoH265PredictorPaletteEntries pal;
+};
+
+struct VPS
+{
+  StdVideoH265VideoParameterSet vps;
+  StdVideoH265ProfileTierLevel ptl;
+  StdVideoH265DecPicBufMgr dpbm;
+  /* FIXME: a VPS can have multiple header params, each with its own nal and vlc
+     headers sets. Sadly, that's not currently supported by the GStreamer H265
+     parser, which only supports one header params per VPS. */
+  StdVideoH265HrdParameters hrd;
+  StdVideoH265SubLayerHrdParameters nal_hdrGST_H265_MAX_SUB_LAYERS;
+  StdVideoH265SubLayerHrdParameters vcl_hdrGST_H265_MAX_SUB_LAYERS;
+};
+
+static void
+_copy_scaling_list (const GstH265ScalingList * scaling_list,
+    StdVideoH265ScalingLists * vk_scaling_lists)
+{
+  int i;
+
+  for (i = 0; i < STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS; i++) {
+    gst_h265_quant_matrix_4x4_get_raster_from_uprightdiagonal
+        (vk_scaling_lists->ScalingList4x4i,
+        scaling_list->scaling_lists_4x4i);
+  }
+
+  for (i = 0; i < STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS; i++) {
+    gst_h265_quant_matrix_8x8_get_raster_from_uprightdiagonal
+        (vk_scaling_lists->ScalingList8x8i,
+        scaling_list->scaling_lists_8x8i);
+  }
+
+  for (i = 0; i < STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS; i++) {
+    gst_h265_quant_matrix_16x16_get_raster_from_uprightdiagonal
+        (vk_scaling_lists->ScalingList16x16i,
+        scaling_list->scaling_lists_16x16i);
+  }
+
+  for (i = 0; i < STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS; i++) {
+    gst_h265_quant_matrix_32x32_get_raster_from_uprightdiagonal
+        (vk_scaling_lists->ScalingList32x32i,
+        scaling_list->scaling_lists_32x32i);
+  }
+
+  for (i = 0; i < STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS; i++) {
+    vk_scaling_lists->ScalingListDCCoef16x16i =
+        scaling_list->scaling_list_dc_coef_minus8_16x16i + 8;
+  }
+
+  for (i = 0; i < STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS; i++) {
+    vk_scaling_lists->ScalingListDCCoef32x32i =
+        scaling_list->scaling_list_dc_coef_minus8_32x32i + 8;
+  }
+}
+
+static guint32
+_array_2_bitmask (const guint8 * array, guint8 size)
+{
+  guint8 i;
+  guint32 bitmask = 0;
+
+  for (i = 0; i < MIN (size, 32); i++)
+    bitmask |= !!arrayi << i;
+  return bitmask;
+}
+
+static StdVideoH265LevelIdc
+_get_h265_level_idc (int level_idc)
+{
+  switch (level_idc) {
+    case 10:
+      return STD_VIDEO_H265_LEVEL_IDC_1_0;
+    case 20:
+      return STD_VIDEO_H265_LEVEL_IDC_2_0;
+    case 21:
+      return STD_VIDEO_H265_LEVEL_IDC_2_1;
+    case 30:
+      return STD_VIDEO_H265_LEVEL_IDC_3_0;
+    case 31:
+      return STD_VIDEO_H265_LEVEL_IDC_3_1;
+    case 40:
+      return STD_VIDEO_H265_LEVEL_IDC_4_0;
+    case 41:
+      return STD_VIDEO_H265_LEVEL_IDC_4_1;
+    case 50:
+      return STD_VIDEO_H265_LEVEL_IDC_5_0;
+    case 51:
+      return STD_VIDEO_H265_LEVEL_IDC_5_1;
+    case 52:
+      return STD_VIDEO_H265_LEVEL_IDC_5_2;
+    case 60:
+      return STD_VIDEO_H265_LEVEL_IDC_6_0;
+    case 61:
+      return STD_VIDEO_H265_LEVEL_IDC_6_1;
+    default:
+    case 62:
+      return STD_VIDEO_H265_LEVEL_IDC_6_2;
+  }
+}
+
+static void
+_copy_sub_layers_hrd_params (const GstH265SubLayerHRDParams * params,
+    StdVideoH265SubLayerHrdParameters * vkparams, int num_params)
+{
+  int i;
+
+  for (i = 0; i < num_params; i++) {
+    memcpy (vkparamsi.bit_rate_du_value_minus1,
+        paramsi.bit_rate_du_value_minus1, STD_VIDEO_H265_CPB_CNT_LIST_SIZE
+        * sizeof (*vkparamsi.bit_rate_du_value_minus1));
+    memcpy (vkparamsi.bit_rate_value_minus1, paramsi.bit_rate_value_minus1,
+        STD_VIDEO_H265_CPB_CNT_LIST_SIZE
+        * sizeof (*vkparamsi.bit_rate_value_minus1));
+    memcpy (vkparamsi.cpb_size_value_minus1, paramsi.cpb_size_value_minus1,
+        STD_VIDEO_H265_CPB_CNT_LIST_SIZE
+        * sizeof (*vkparamsi.cpb_size_value_minus1));
+    memcpy (vkparamsi.cpb_size_du_value_minus1,
+        paramsi.cpb_size_du_value_minus1, STD_VIDEO_H265_CPB_CNT_LIST_SIZE
+        * sizeof (*vkparamsi.cpb_size_du_value_minus1));
+
+    vkparamsi.cbr_flag =
+        _array_2_bitmask (paramsi.cbr_flag, STD_VIDEO_H265_CPB_CNT_LIST_SIZE);
+  }
+}
+
+static void
+_copy_profile_tier_level (const GstH265ProfileTierLevel * ptl,
+    StdVideoH265ProfileTierLevel * vk_ptl)
+{
+  /* *INDENT-OFF* */
+  *vk_ptl = (StdVideoH265ProfileTierLevel) {
+    .flags = {
+      .general_tier_flag = ptl->tier_flag,
+      .general_progressive_source_flag = ptl->progressive_source_flag,
+      .general_interlaced_source_flag = ptl->interlaced_source_flag,
+      .general_non_packed_constraint_flag = ptl->non_packed_constraint_flag,
+      .general_frame_only_constraint_flag = ptl->frame_only_constraint_flag,
+    },
+    .general_profile_idc = _get_h265_profile (ptl->profile_idc),
+    .general_level_idc = _get_h265_level_idc (ptl->level_idc),
+  };
+  /* *INDENT-ON* */
+}
+
+static void
+_fill_sps (const GstH265SPS * sps, struct SPS *std_sps)
+{
+  int i;
+  const GstH265VUIParams *vui_params = &sps->vui_params;
+
+  _copy_scaling_list (&sps->scaling_list, &std_sps->scaling);
+
+  if (vui_params->hrd_params.nal_hrd_parameters_present_flag) {
+    _copy_sub_layers_hrd_params (vui_params->hrd_params.sublayer_hrd_params,
+        std_sps->nal_hrd, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE);
+  }
+  if (vui_params->hrd_params.vcl_hrd_parameters_present_flag) {
+    _copy_sub_layers_hrd_params (vui_params->hrd_params.sublayer_hrd_params,
+        std_sps->vcl_hrd, STD_VIDEO_H265_SUBLAYERS_LIST_SIZE);
+  }
+  std_sps->vui_header = (StdVideoH265HrdParameters) {
+    /* *INDENT-OFF* */
+    .flags = {
+      .nal_hrd_parameters_present_flag =
+          vui_params->hrd_params.nal_hrd_parameters_present_flag,
+      .vcl_hrd_parameters_present_flag =
+          vui_params->hrd_params.vcl_hrd_parameters_present_flag,
+      .sub_pic_hrd_params_present_flag =
+          vui_params->hrd_params.sub_pic_hrd_params_present_flag,
+      .sub_pic_cpb_params_in_pic_timing_sei_flag =
+          vui_params->hrd_params.sub_pic_cpb_params_in_pic_timing_sei_flag,
+      .fixed_pic_rate_general_flag =
+          _array_2_bitmask (vui_params->hrd_params.fixed_pic_rate_general_flag,
+          sizeof (vui_params->hrd_params.fixed_pic_rate_general_flag)),
+      .fixed_pic_rate_within_cvs_flag =
+          _array_2_bitmask (vui_params->hrd_params.fixed_pic_rate_within_cvs_flag,
+          sizeof (vui_params->hrd_params.fixed_pic_rate_within_cvs_flag)),
+      .low_delay_hrd_flag =
+          _array_2_bitmask (vui_params->hrd_params.low_delay_hrd_flag,
+          sizeof (vui_params->hrd_params.low_delay_hrd_flag)),
+    },
+    .tick_divisor_minus2 = vui_params->hrd_params.tick_divisor_minus2,
+    .du_cpb_removal_delay_increment_length_minus1 =
+        vui_params->hrd_params.du_cpb_removal_delay_increment_length_minus1,
+    .dpb_output_delay_du_length_minus1 =
+        vui_params->hrd_params.dpb_output_delay_du_length_minus1,
+    .bit_rate_scale = vui_params->hrd_params.bit_rate_scale,
+    .cpb_size_scale = vui_params->hrd_params.cpb_size_scale,
+    .cpb_size_du_scale = vui_params->hrd_params.cpb_size_du_scale,
+    .initial_cpb_removal_delay_length_minus1 =
+        vui_params->hrd_params.initial_cpb_removal_delay_length_minus1,
+    .au_cpb_removal_delay_length_minus1 =
+        vui_params->hrd_params.au_cpb_removal_delay_length_minus1,
+    .dpb_output_delay_length_minus1 =
+        vui_params->hrd_params.dpb_output_delay_length_minus1,
+    .pSubLayerHrdParametersNal =
+        (const StdVideoH265SubLayerHrdParameters *) &std_sps->nal_hrd,
+    .pSubLayerHrdParametersVcl =
+        (const StdVideoH265SubLayerHrdParameters *) &std_sps->vcl_hrd,
+    /* *INDENT-ON* */
+  };
+
+  /* *INDENT-OFF* */
+  std_sps->vui = (StdVideoH265SequenceParameterSetVui) {
+    .flags =  {
+      .aspect_ratio_info_present_flag =
+          vui_params->aspect_ratio_info_present_flag,
+      .overscan_info_present_flag = vui_params->overscan_info_present_flag,
+      .overscan_appropriate_flag = vui_params->overscan_appropriate_flag,
+      .video_signal_type_present_flag =
+          vui_params->video_signal_type_present_flag,
+      .video_full_range_flag = vui_params->video_full_range_flag,
+      .colour_description_present_flag =
+          vui_params->colour_description_present_flag,
+      .chroma_loc_info_present_flag = vui_params->chroma_loc_info_present_flag,
+      .neutral_chroma_indication_flag =
+          vui_params->neutral_chroma_indication_flag,
+      .field_seq_flag = vui_params->field_seq_flag,
+      .frame_field_info_present_flag =
+          vui_params->frame_field_info_present_flag,
+      .default_display_window_flag = vui_params->default_display_window_flag,
+      .vui_timing_info_present_flag = vui_params->timing_info_present_flag,
+      .vui_poc_proportional_to_timing_flag =
+          vui_params->poc_proportional_to_timing_flag,
+      .vui_hrd_parameters_present_flag =
+          vui_params->hrd_parameters_present_flag,
+      .bitstream_restriction_flag = vui_params->bitstream_restriction_flag,
+      .tiles_fixed_structure_flag = vui_params->tiles_fixed_structure_flag,
+      .motion_vectors_over_pic_boundaries_flag =
+          vui_params->motion_vectors_over_pic_boundaries_flag,
+      .restricted_ref_pic_lists_flag =
+          vui_params->restricted_ref_pic_lists_flag,
+    },
+    .aspect_ratio_idc = vui_params->aspect_ratio_idc,
+    .sar_width = vui_params->sar_width,
+    .sar_height = vui_params->sar_height,
+    .video_format = vui_params->video_format,
+    .colour_primaries = vui_params->colour_primaries,
+    .transfer_characteristics = vui_params->transfer_characteristics,
+    .matrix_coeffs = vui_params->matrix_coefficients,
+    .chroma_sample_loc_type_top_field =
+        vui_params->chroma_sample_loc_type_top_field,
+    .chroma_sample_loc_type_bottom_field =
+        vui_params->chroma_sample_loc_type_bottom_field,
+    /* Reserved */
+    /* Reserved */
+    .def_disp_win_left_offset = vui_params->def_disp_win_left_offset,
+    .def_disp_win_right_offset = vui_params->def_disp_win_right_offset,
+    .def_disp_win_top_offset = vui_params->def_disp_win_top_offset,
+    .def_disp_win_bottom_offset = vui_params->def_disp_win_bottom_offset,
+    .vui_num_units_in_tick = vui_params->num_units_in_tick,
+    .vui_time_scale = vui_params->time_scale,
+    .vui_num_ticks_poc_diff_one_minus1 =
+       vui_params->num_ticks_poc_diff_one_minus1,
+    .min_spatial_segmentation_idc = vui_params->min_spatial_segmentation_idc,
+    .max_bytes_per_pic_denom = vui_params->max_bytes_per_pic_denom,
+    .max_bits_per_min_cu_denom = vui_params->max_bits_per_min_cu_denom,
+    .log2_max_mv_length_horizontal = vui_params->log2_max_mv_length_horizontal,
+    .log2_max_mv_length_vertical = vui_params->log2_max_mv_length_vertical,
+    .pHrdParameters = &std_sps->vui_header,
+  };
+  /* *INDENT-ON* */
+
+  _copy_profile_tier_level (&sps->profile_tier_level, &std_sps->ptl);
+
+  memcpy (std_sps->dpbm.max_latency_increase_plus1,
+      sps->max_latency_increase_plus1, GST_H265_MAX_SUB_LAYERS
+      * sizeof (*std_sps->dpbm.max_latency_increase_plus1));
+  memcpy (std_sps->dpbm.max_dec_pic_buffering_minus1,
+      sps->max_dec_pic_buffering_minus1, GST_H265_MAX_SUB_LAYERS
+      * sizeof (*std_sps->dpbm.max_dec_pic_buffering_minus1));
+  memcpy (std_sps->dpbm.max_num_reorder_pics,
+      sps->max_num_reorder_pics, GST_H265_MAX_SUB_LAYERS
+      * sizeof (*std_sps->dpbm.max_num_reorder_pics));
+
+  memcpy (std_sps->pal.PredictorPaletteEntries,
+      sps->sps_scc_extension_params.sps_palette_predictor_initializer,
+      STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE
+      * sizeof (*std_sps->pal.PredictorPaletteEntries));
+
+  for (i = 0; i < sps->num_short_term_ref_pic_sets; i++) {
+    /* *INDENT-OFF* */
+    std_sps->stri = (StdVideoH265ShortTermRefPicSet) {
+      .flags = {
+        .inter_ref_pic_set_prediction_flag =
+            sps->short_term_ref_pic_seti.inter_ref_pic_set_prediction_flag,
+        .delta_rps_sign = sps->short_term_ref_pic_seti.delta_rps_sign,
+      },
+      .delta_idx_minus1 = sps->short_term_ref_pic_seti.delta_idx_minus1,
+      .use_delta_flag = 0,  /* FIXME: not exposed by parser and cannot deduce */
+      .abs_delta_rps_minus1 =
+          sps->short_term_ref_pic_seti.abs_delta_rps_minus1,
+      .used_by_curr_pic_flag  = 0, /* FIXME: not exposed by parser and cannot deduce */
+      .used_by_curr_pic_s0_flag =
+          _array_2_bitmask (sps->short_term_ref_pic_seti.UsedByCurrPicS0,
+          sps->short_term_ref_pic_seti.NumDeltaPocs),
+      .used_by_curr_pic_s1_flag =
+          _array_2_bitmask (sps->short_term_ref_pic_seti.UsedByCurrPicS0,
+          sps->short_term_ref_pic_seti.NumDeltaPocs),
+      /* Reserved */
+      /* Reserved */
+      /* Reserved */
+      .num_negative_pics = sps->short_term_ref_pic_seti.NumNegativePics,
+      .num_positive_pics = sps->short_term_ref_pic_seti.NumPositivePics,
+    };
+    /* *INDENT-ON* */
+  }
+
+  std_sps->ltr.used_by_curr_pic_lt_sps_flag =
+      _array_2_bitmask (sps->used_by_curr_pic_lt_sps_flag,
+      sps->num_long_term_ref_pics_sps);
+  memcpy (std_sps->ltr.lt_ref_pic_poc_lsb_sps, sps->lt_ref_pic_poc_lsb_sps,
+      32 * sizeof (*std_sps->ltr.lt_ref_pic_poc_lsb_sps));
+
+  /* *INDENT-OFF* */
+  std_sps->sps = (StdVideoH265SequenceParameterSet) {
+    .flags = {
+      .sps_temporal_id_nesting_flag = sps->temporal_id_nesting_flag,
+      .separate_colour_plane_flag = sps->separate_colour_plane_flag,
+      .conformance_window_flag = sps->conformance_window_flag,
+      .sps_sub_layer_ordering_info_present_flag =
+          sps->sub_layer_ordering_info_present_flag,
+      .scaling_list_enabled_flag = sps->scaling_list_enabled_flag,
+      .sps_scaling_list_data_present_flag = sps->scaling_list_enabled_flag,
+      .amp_enabled_flag = sps->amp_enabled_flag,
+      .sample_adaptive_offset_enabled_flag =
+          sps->sample_adaptive_offset_enabled_flag,
+      .pcm_enabled_flag = sps->pcm_enabled_flag,
+      .pcm_loop_filter_disabled_flag = sps->pcm_loop_filter_disabled_flag,
+      .long_term_ref_pics_present_flag = sps->long_term_ref_pics_present_flag,
+      .sps_temporal_mvp_enabled_flag = sps->temporal_mvp_enabled_flag,
+      .strong_intra_smoothing_enabled_flag =
+          sps->strong_intra_smoothing_enabled_flag,
+      .vui_parameters_present_flag = sps->vui_parameters_present_flag,
+      .sps_extension_present_flag = sps->sps_extension_flag,
+      .sps_range_extension_flag = sps->sps_range_extension_flag,
+      .transform_skip_rotation_enabled_flag =
+          sps->sps_extension_params.transform_skip_rotation_enabled_flag,
+      .transform_skip_context_enabled_flag =
+          sps->sps_extension_params.transform_skip_context_enabled_flag,
+      .implicit_rdpcm_enabled_flag =
+          sps->sps_extension_params.implicit_rdpcm_enabled_flag,
+      .explicit_rdpcm_enabled_flag =
+          sps->sps_extension_params.explicit_rdpcm_enabled_flag,
+      .extended_precision_processing_flag =
+          sps->sps_extension_params.extended_precision_processing_flag,
+      .intra_smoothing_disabled_flag =
+          sps->sps_extension_params.intra_smoothing_disabled_flag,
+      .high_precision_offsets_enabled_flag =
+          sps->sps_extension_params.high_precision_offsets_enabled_flag,
+      .persistent_rice_adaptation_enabled_flag =
+          sps->sps_extension_params.persistent_rice_adaptation_enabled_flag,
+      .cabac_bypass_alignment_enabled_flag =
+          sps->sps_extension_params.cabac_bypass_alignment_enabled_flag,
+      .sps_scc_extension_flag = sps->sps_scc_extension_flag,
+      .sps_curr_pic_ref_enabled_flag =
+          sps->sps_scc_extension_params.sps_curr_pic_ref_enabled_flag,
+      .palette_mode_enabled_flag =
+          sps->sps_scc_extension_params.palette_mode_enabled_flag,
+      .sps_palette_predictor_initializers_present_flag =
+          sps->sps_scc_extension_params.sps_palette_predictor_initializers_present_flag,
+      .intra_boundary_filtering_disabled_flag =
+          sps->sps_scc_extension_params.intra_boundary_filtering_disabled_flag,
+    },
+    .chroma_format_idc = sps->chroma_format_idc,
+    .pic_width_in_luma_samples = sps->width,
+    .pic_height_in_luma_samples = sps->height,
+    .sps_video_parameter_set_id = sps->vps_id,
+    .sps_max_sub_layers_minus1 = sps->max_sub_layers_minus1,
+    .sps_seq_parameter_set_id = sps->id,
+    .bit_depth_luma_minus8 = sps->bit_depth_luma_minus8,
+    .bit_depth_chroma_minus8 = sps->bit_depth_chroma_minus8,
+    .log2_max_pic_order_cnt_lsb_minus4 = sps->log2_max_pic_order_cnt_lsb_minus4,
+    .log2_min_luma_coding_block_size_minus3 =
+        sps->log2_min_luma_coding_block_size_minus3,
+    .log2_diff_max_min_luma_coding_block_size =
+        sps->log2_diff_max_min_luma_coding_block_size,
+    .log2_min_luma_transform_block_size_minus2 =
+        sps->log2_min_transform_block_size_minus2,
+    .log2_diff_max_min_luma_transform_block_size =
+        sps->log2_diff_max_min_transform_block_size,
+    .max_transform_hierarchy_depth_inter =
+        sps->max_transform_hierarchy_depth_inter,
+    .max_transform_hierarchy_depth_intra =
+        sps->max_transform_hierarchy_depth_intra,
+    .num_short_term_ref_pic_sets = sps->num_short_term_ref_pic_sets,
+    .num_long_term_ref_pics_sps = sps->num_long_term_ref_pics_sps,
+    .pcm_sample_bit_depth_luma_minus1 = sps->pcm_sample_bit_depth_luma_minus1,
+    .pcm_sample_bit_depth_chroma_minus1 =
+        sps->pcm_sample_bit_depth_chroma_minus1,
+    .log2_min_pcm_luma_coding_block_size_minus3 =
+        sps->log2_min_pcm_luma_coding_block_size_minus3,
+    .log2_diff_max_min_pcm_luma_coding_block_size =
+        sps->log2_diff_max_min_pcm_luma_coding_block_size,
+    /* Reserved */
+    /* Reserved */
+    .palette_max_size = sps->sps_scc_extension_params.palette_max_size,
+    .delta_palette_max_predictor_size =
+        sps->sps_scc_extension_params.delta_palette_max_predictor_size,
+    .motion_vector_resolution_control_idc =
+        sps->sps_scc_extension_params.motion_vector_resolution_control_idc,
+    .sps_num_palette_predictor_initializers_minus1 =
+        sps->sps_scc_extension_params.sps_num_palette_predictor_initializer_minus1,
+    .conf_win_left_offset = sps->conf_win_left_offset,
+    .conf_win_right_offset = sps->conf_win_right_offset,
+    .conf_win_top_offset = sps->conf_win_top_offset,
+    .conf_win_bottom_offset = sps->conf_win_bottom_offset,
+    .pProfileTierLevel = &std_sps->ptl,
+    .pDecPicBufMgr = &std_sps->dpbm,
+    .pScalingLists = &std_sps->scaling,
+    .pShortTermRefPicSet = std_sps->str,
+    .pLongTermRefPicsSps = &std_sps->ltr,
+    .pSequenceParameterSetVui = &std_sps->vui,
+    .pPredictorPaletteEntries = &std_sps->pal,
+  };
+  /* *INDENT-ON* */
+}
+
+static void
+_fill_pps (const GstH265PPS * pps, const GstH265SPS * sps, struct PPS *std_pps)
+{
+  int i, j;
+
+  _copy_scaling_list (&pps->scaling_list, &std_pps->scaling);
+
+  /* *INDENT-OFF* */
+  std_pps->pps = (StdVideoH265PictureParameterSet) {
+    .flags = {
+      .dependent_slice_segments_enabled_flag =
+          pps->dependent_slice_segments_enabled_flag,
+      .output_flag_present_flag = pps->output_flag_present_flag,
+      .sign_data_hiding_enabled_flag = pps->sign_data_hiding_enabled_flag,
+      .cabac_init_present_flag = pps->cabac_init_present_flag,
+      .constrained_intra_pred_flag = pps->constrained_intra_pred_flag,
+      .transform_skip_enabled_flag = pps->transform_skip_enabled_flag,
+      .cu_qp_delta_enabled_flag = pps->cu_qp_delta_enabled_flag,
+      .pps_slice_chroma_qp_offsets_present_flag =
+          pps->slice_chroma_qp_offsets_present_flag,
+      .weighted_pred_flag = pps->weighted_pred_flag,
+      .weighted_bipred_flag = pps->weighted_bipred_flag,
+      .transquant_bypass_enabled_flag = pps->transquant_bypass_enabled_flag,
+      .tiles_enabled_flag = pps->tiles_enabled_flag,
+      .entropy_coding_sync_enabled_flag = pps->entropy_coding_sync_enabled_flag,
+      .uniform_spacing_flag = pps->uniform_spacing_flag,
+      .loop_filter_across_tiles_enabled_flag =
+          pps->loop_filter_across_tiles_enabled_flag,
+      .pps_loop_filter_across_slices_enabled_flag =
+          pps->loop_filter_across_slices_enabled_flag,
+      .deblocking_filter_control_present_flag =
+          pps->deblocking_filter_control_present_flag,
+      .deblocking_filter_override_enabled_flag =
+          pps->deblocking_filter_override_enabled_flag,
+      .pps_deblocking_filter_disabled_flag =
+          pps->deblocking_filter_disabled_flag,
+      .pps_scaling_list_data_present_flag = pps->scaling_list_data_present_flag,
+      .lists_modification_present_flag = pps->lists_modification_present_flag,
+      .slice_segment_header_extension_present_flag =
+          pps->slice_segment_header_extension_present_flag,
+      .pps_extension_present_flag = pps->pps_extension_flag,
+      .cross_component_prediction_enabled_flag =
+          pps->pps_extension_params.cross_component_prediction_enabled_flag,
+      .chroma_qp_offset_list_enabled_flag =
+          pps->pps_extension_params.chroma_qp_offset_list_enabled_flag,
+      .pps_curr_pic_ref_enabled_flag =
+          pps->pps_scc_extension_params.pps_curr_pic_ref_enabled_flag,
+      .residual_adaptive_colour_transform_enabled_flag =
+          pps->pps_scc_extension_params.residual_adaptive_colour_transform_enabled_flag,
+      .pps_slice_act_qp_offsets_present_flag =
+          pps->pps_scc_extension_params.pps_slice_act_qp_offsets_present_flag,
+      .pps_palette_predictor_initializers_present_flag =
+          pps->pps_scc_extension_params.pps_palette_predictor_initializers_present_flag,
+      .monochrome_palette_flag =
+          pps->pps_scc_extension_params.monochrome_palette_flag,
+      .pps_range_extension_flag = pps->pps_range_extension_flag,
+    },
+    .pps_pic_parameter_set_id = pps->id,
+    .pps_seq_parameter_set_id = pps->sps_id,
+    .sps_video_parameter_set_id = sps->vps_id,
+    .num_extra_slice_header_bits = pps->num_extra_slice_header_bits,
+    .num_ref_idx_l0_default_active_minus1 =
+        pps->num_ref_idx_l0_default_active_minus1,
+    .num_ref_idx_l1_default_active_minus1 =
+        pps->num_ref_idx_l1_default_active_minus1,
+    .init_qp_minus26 = pps->init_qp_minus26,
+    .diff_cu_qp_delta_depth = pps->diff_cu_qp_delta_depth,
+    .pps_cb_qp_offset = pps->cb_qp_offset,
+    .pps_cr_qp_offset = pps->cr_qp_offset,
+    .pps_beta_offset_div2 = pps->beta_offset_div2,
+    .pps_tc_offset_div2 = pps->tc_offset_div2,
+    .log2_parallel_merge_level_minus2 = pps->log2_parallel_merge_level_minus2,
+    .log2_max_transform_skip_block_size_minus2 =
+        pps->pps_extension_params.log2_max_transform_skip_block_size_minus2,
+    .diff_cu_chroma_qp_offset_depth =
+        pps->pps_extension_params.diff_cu_chroma_qp_offset_depth,
+    .chroma_qp_offset_list_len_minus1 =
+        pps->pps_extension_params.chroma_qp_offset_list_len_minus1,
+    .log2_sao_offset_scale_luma =
+        pps->pps_extension_params.log2_sao_offset_scale_luma,
+    .log2_sao_offset_scale_chroma =
+        pps->pps_extension_params.log2_sao_offset_scale_chroma,
+    .pps_act_y_qp_offset_plus5 =
+        pps->pps_scc_extension_params.pps_act_y_qp_offset_plus5,
+    .pps_act_cb_qp_offset_plus5 =
+        pps->pps_scc_extension_params.pps_act_cb_qp_offset_plus5,
+    .pps_act_cr_qp_offset_plus3 =
+        pps->pps_scc_extension_params.pps_act_cr_qp_offset_plus3,
+    .pps_num_palette_predictor_initializers =
+        pps->pps_scc_extension_params.pps_num_palette_predictor_initializer,
+    .luma_bit_depth_entry_minus8 =
+        pps->pps_scc_extension_params.luma_bit_depth_entry_minus8,
+    .chroma_bit_depth_entry_minus8 =
+        pps->pps_scc_extension_params.chroma_bit_depth_entry_minus8,
+    .num_tile_columns_minus1 = pps->num_tile_columns_minus1,
+    .num_tile_rows_minus1 = pps->num_tile_rows_minus1,
+    .pScalingLists = &std_pps->scaling,
+    .pPredictorPaletteEntries = &std_pps->pal,
+  };
+  /* *INDENT-OFF* */
+
+  for (i = 0; i < (pps->pps_scc_extension_params.monochrome_palette_flag ? 1 : 3); i++) {
+    for (j = 0; j < pps->pps_scc_extension_params.pps_num_palette_predictor_initializer; j++) {
+      std_pps->pal.PredictorPaletteEntriesij =
+         pps->pps_scc_extension_params.pps_palette_predictor_initializerij;
+    }
+  }
+
+  for (i = 0; i < pps->num_tile_columns_minus1 + 1; i++)
+    std_pps->pps.column_width_minus1i = pps->column_width_minus1i;
+
+  for (i = 0; i < pps->num_tile_rows_minus1 + 1; i++)
+    std_pps->pps.row_height_minus1i = pps->row_height_minus1i;
+
+  for ( i = 0; i <= pps->pps_extension_params.chroma_qp_offset_list_len_minus1 + 1; i++) {
+    std_pps->pps.cb_qp_offset_listi =
+        pps->pps_extension_params.cb_qp_offset_listi;
+    std_pps->pps.cr_qp_offset_listi =
+        pps->pps_extension_params.cr_qp_offset_listi;
+  }
+}
+
+static void
+_fill_vps (const GstH265VPS * vps, struct VPS * std_vps)
+{
+  const GstH265HRDParams *hrd = &vps->hrd_params;
+
+  if (vps->num_hrd_parameters > 1)
+    GST_FIXME ("H.265 parser only supports one header parameters per VPS");
+
+  if (hrd->nal_hrd_parameters_present_flag) {
+    _copy_sub_layers_hrd_params (hrd->sublayer_hrd_params, std_vps->nal_hdr,
+        GST_H265_MAX_SUB_LAYERS);
+  }
+  if (hrd->vcl_hrd_parameters_present_flag) {
+    _copy_sub_layers_hrd_params (hrd->sublayer_hrd_params, std_vps->vcl_hdr,
+        GST_H265_MAX_SUB_LAYERS);
+  }
+
+  /* for (i = 0; i < vps->num_hrd_parameters; i++) { */
+  /* *INDENT-OFF* */
+  std_vps->hrd = (StdVideoH265HrdParameters) {
+    .flags = {
+      .nal_hrd_parameters_present_flag = hrd->nal_hrd_parameters_present_flag,
+      .vcl_hrd_parameters_present_flag = hrd->vcl_hrd_parameters_present_flag,
+      .sub_pic_hrd_params_present_flag = hrd->sub_pic_hrd_params_present_flag,
+      .sub_pic_cpb_params_in_pic_timing_sei_flag =
+          hrd->sub_pic_cpb_params_in_pic_timing_sei_flag,
+      .fixed_pic_rate_general_flag =
+          _array_2_bitmask (hrd->fixed_pic_rate_general_flag, 7),
+      .fixed_pic_rate_within_cvs_flag =
+          _array_2_bitmask (hrd->fixed_pic_rate_within_cvs_flag, 7),
+      .low_delay_hrd_flag = _array_2_bitmask (hrd->low_delay_hrd_flag, 7),
+    },
+    .tick_divisor_minus2 = hrd->tick_divisor_minus2,
+    .du_cpb_removal_delay_increment_length_minus1 = hrd->du_cpb_removal_delay_increment_length_minus1,
+    .dpb_output_delay_du_length_minus1 = hrd->dpb_output_delay_du_length_minus1,
+    .bit_rate_scale = hrd->bit_rate_scale,
+    .cpb_size_scale = hrd->cpb_size_scale,
+    .cpb_size_du_scale = hrd->cpb_size_du_scale,
+    .initial_cpb_removal_delay_length_minus1 = hrd->initial_cpb_removal_delay_length_minus1,
+    .au_cpb_removal_delay_length_minus1 = hrd->au_cpb_removal_delay_length_minus1,
+    .dpb_output_delay_length_minus1 = hrd->dpb_output_delay_length_minus1,
+    /* Reserved: uint16_t3 */
+    .pSubLayerHrdParametersNal = std_vps->nal_hdr,
+    .pSubLayerHrdParametersVcl = std_vps->vcl_hdr,
+  };
+  /* *INDENT-ON* */
+
+  _copy_profile_tier_level (&vps->profile_tier_level, &std_vps->ptl);
+
+  memcpy (std_vps->dpbm.max_latency_increase_plus1,
+      vps->max_latency_increase_plus1, GST_H265_MAX_SUB_LAYERS
+      * sizeof (*std_vps->dpbm.max_latency_increase_plus1));
+  memcpy (std_vps->dpbm.max_dec_pic_buffering_minus1,
+      vps->max_dec_pic_buffering_minus1, GST_H265_MAX_SUB_LAYERS
+      * sizeof (*std_vps->dpbm.max_dec_pic_buffering_minus1));
+  memcpy (std_vps->dpbm.max_num_reorder_pics,
+      vps->max_num_reorder_pics, GST_H265_MAX_SUB_LAYERS
+      * sizeof (*std_vps->dpbm.max_num_reorder_pics));
+
+  /* *INDENT-OFF* */
+  std_vps->vps = (StdVideoH265VideoParameterSet) {
+    .flags = {
+      .vps_temporal_id_nesting_flag = vps->temporal_id_nesting_flag,
+      .vps_sub_layer_ordering_info_present_flag =
+          vps->sub_layer_ordering_info_present_flag,
+      .vps_timing_info_present_flag = vps->timing_info_present_flag,
+      .vps_poc_proportional_to_timing_flag =
+          vps->poc_proportional_to_timing_flag,
+    },
+    .vps_video_parameter_set_id = vps->id,
+    .vps_max_sub_layers_minus1 = vps->max_sub_layers_minus1,
+    /* Reserved */
+    /* Reserved */
+    .vps_num_units_in_tick = vps->num_units_in_tick,
+    .vps_time_scale = vps->time_scale,
+    .vps_num_ticks_poc_diff_one_minus1 = vps->num_ticks_poc_diff_one_minus1,
+    /* Reserved */
+    .pDecPicBufMgr = &std_vps->dpbm,
+    .pHrdParameters = &std_vps->hrd,
+    .pProfileTierLevel = &std_vps->ptl,
+  };
+  /* *INDENT-ON* */
+}
+
+static GstFlowReturn
+_update_parameters (GstVulkanH265Decoder * self, const GstH265PPS * pps)
+{
+  GstH265SPS *sps = pps->sps;
+  GstH265VPS *vps = sps->vps;
+  struct SPS std_sps;
+  struct PPS std_pps;
+  struct VPS std_vps;
+  VkVideoDecodeH265SessionParametersAddInfoKHR params = {
+    .sType =
+        VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_KHR,
+    .stdSPSCount = 1,
+    .pStdSPSs = &std_sps.sps,
+    .stdPPSCount = 1,
+    .pStdPPSs = &std_pps.pps,
+    .stdVPSCount = 1,
+    .pStdVPSs = &std_vps.vps,
+  };
+  /* *INDENT-OFF* */
+  GstVulkanDecoderParameters dec_params = {
+    .h265 = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR,
+      /* .pNext =  */
+      .maxStdSPSCount = params.stdSPSCount,
+      .maxStdPPSCount = params.stdPPSCount,
+      .maxStdVPSCount = params.stdVPSCount,
+      .pParametersAddInfo = &params,
+    }
+  };
+  /* *INDENT-ON* */
+  GError *error = NULL;
+
+  _fill_sps (sps, &std_sps);
+  _fill_pps (pps, sps, &std_pps);
+  _fill_vps (vps, &std_vps);
+
+  if (!gst_vulkan_decoder_update_video_session_parameters (self->decoder,
+          &dec_params, &error)) {
+    if (error) {
+      GST_ERROR_OBJECT (self, "Couldn't set codec parameters: %s",
+          error->message);
+      g_clear_error (&error);
+    }
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static gint32
+_find_next_slot_idx (GArray * dpb)
+{
+  gint32 i;
+  guint len;
+  GstH265Picture *arr16 = { NULL, };
+
+  g_assert (dpb->len < 16);
+
+  len = dpb->len;
+
+  for (i = 0; i < len; i++) {
+    GstH265Picture *pic = g_array_index (dpb, GstH265Picture *, i);
+    GstVulkanH265Picture *h265_pic;
+
+    if (!pic->ref)
+      continue;
+
+    h265_pic = gst_h265_picture_get_user_data (pic);
+    arrh265_pic->slot_idx = pic;
+  }
+
+  /* let's return the smallest available / not ref index */
+  for (i = 0; i < len; i++) {
+    if (!arri)
+      return i;
+  }
+
+  return len;
+}
+
+static void
+_fill_ref_slot (GstVulkanH265Decoder * self, GstH265Picture * picture,
+    VkVideoReferenceSlotInfoKHR * slot, VkVideoPictureResourceInfoKHR * res,
+    VkVideoDecodeH265DpbSlotInfoKHR * vkh265_slot,
+    StdVideoDecodeH265ReferenceInfo * stdh265_ref,
+    GstVulkanDecoderPicture ** ref)
+{
+  GstVulkanH265Picture *pic = gst_h265_picture_get_user_data (picture);
+
+  /* *INDENT-OFF* */
+  *stdh265_ref = (StdVideoDecodeH265ReferenceInfo) {
+    .flags = {
+      .used_for_long_term_reference = picture->ref && picture->long_term,
+      .unused_for_reference = 0,
+    },
+    .PicOrderCntVal = picture->pic_order_cnt,
+  };
+
+  *vkh265_slot = (VkVideoDecodeH265DpbSlotInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_KHR,
+    .pStdReferenceInfo = stdh265_ref,
+  };
+
+  *res = (VkVideoPictureResourceInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR,
+    .codedOffset = { self->x, self->y },
+    .codedExtent = { self->coded_width, self->coded_height },
+    .baseArrayLayer = self->decoder->layered_dpb ? pic->slot_idx : 0,
+    .imageViewBinding = pic->base.img_view_ref->view,
+  };
+
+  *slot = (VkVideoReferenceSlotInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR,
+    .pNext = vkh265_slot,
+    .slotIndex = pic->slot_idx,
+    .pPictureResource = res,
+  };
+  /* *INDENT-ON* */
+
+  if (ref)
+    *ref = &pic->base;
+
+
+  GST_TRACE_OBJECT (self, "0x%lx slotIndex: %d", res->imageViewBinding,
+      slot->slotIndex);
+}
+
+static GstFlowReturn
+gst_vulkan_h265_decoder_start_picture (GstH265Decoder * decoder,
+    GstH265Picture * picture, GstH265Slice * slice, GstH265Dpb * dpb)
+{
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (decoder);
+  GstH265PPS *pps = slice->header.pps;
+  GstFlowReturn ret;
+  GstVulkanH265Picture *pic;
+  GArray *refs;
+  guint i, j, num_refs;
+
+  GST_TRACE_OBJECT (self, "Start picture");
+
+  if (self->need_params_update) {
+    ret = _update_parameters (self, pps);
+    if (ret != GST_FLOW_OK)
+      return ret;
+    self->need_params_update = FALSE;
+  }
+
+  refs = gst_h265_dpb_get_pictures_all (dpb);
+
+  pic = gst_h265_picture_get_user_data (picture);
+  g_assert (pic);
+
+  /* *INDENT-OFF* */
+  pic->std_h265pic = (StdVideoDecodeH265PictureInfo) {
+    .flags = {
+      .IrapPicFlag = GST_H265_IS_NAL_TYPE_IRAP (slice->nalu.type),
+      .IdrPicFlag = GST_H265_IS_NAL_TYPE_IDR (slice->nalu.type),
+      .IsReference = picture->ref,
+      .short_term_ref_pic_set_sps_flag =
+         slice->header.short_term_ref_pic_set_sps_flag,
+    },
+    .sps_video_parameter_set_id = pps->sps->vps_id,
+    .pps_seq_parameter_set_id = pps->sps_id,
+    .pps_pic_parameter_set_id = pps->id,
+    .NumDeltaPocsOfRefRpsIdx =
+       slice->header.short_term_ref_pic_sets.NumDeltaPocsOfRefRpsIdx,
+    .PicOrderCntVal = picture->pic_order_cnt,
+    .NumBitsForSTRefPicSetInSlice =
+        !slice->header.short_term_ref_pic_set_sps_flag ?
+        slice->header.short_term_ref_pic_set_size : 0,
+  };
+
+  pic->vk_h265pic = (VkVideoDecodeH265PictureInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_KHR,
+    .pStdPictureInfo = &pic->std_h265pic,
+    .sliceSegmentCount = 0,
+  };
+  /* *INDENT-ON* */
+
+  pic->slot_idx = _find_next_slot_idx (refs);
+
+  /* fill main slot */
+  _fill_ref_slot (self, picture, &pic->base.slot, &pic->base.pic_res,
+      &pic->vk_slot, &pic->std_ref, NULL);
+
+  j = 0;
+
+  for (i = 0; i < refs->len; i++) {
+    GstH265Picture *ref_pic = g_array_index (refs, GstH265Picture *, i);
+    if (!ref_pic->ref)
+      continue;
+    _fill_ref_slot (self, ref_pic, &pic->base.slotsj, &pic->base.pics_resj,
+        &pic->vk_slotsj, &pic->std_refsj, &pic->base.refsj);
+    j++;
+  }
+
+  num_refs = j;
+
+  memset (pic->std_h265pic.RefPicSetStCurrBefore, 0xff, 8);
+  memset (pic->std_h265pic.RefPicSetStCurrAfter, 0xff, 8);
+  memset (pic->std_h265pic.RefPicSetLtCurr, 0xff, 8);
+
+  for (i = 0; i < G_N_ELEMENTS (decoder->RefPicSetStCurrBefore); i++) {
+    for (j = 0; j < refs->len; j++) {
+      GstH265Picture *ref_pic = g_array_index (refs, GstH265Picture *, j);
+      if (ref_pic == decoder->RefPicSetStCurrBeforei) {
+        GstVulkanH265Picture *h265_ref_pic =
+            gst_h265_picture_get_user_data (ref_pic);
+        pic->std_h265pic.RefPicSetStCurrBeforei = h265_ref_pic->slot_idx;
+        break;
+      }
+    }
+  }
+
+  for (i = 0; i < G_N_ELEMENTS (decoder->RefPicSetStCurrAfter); i++) {
+    for (j = 0; j < refs->len; j++) {
+      GstH265Picture *ref_pic = g_array_index (refs, GstH265Picture *, j);
+      if (ref_pic == decoder->RefPicSetStCurrAfteri) {
+        GstVulkanH265Picture *h265_ref_pic =
+            gst_h265_picture_get_user_data (ref_pic);
+        pic->std_h265pic.RefPicSetStCurrAfteri = h265_ref_pic->slot_idx;
+        break;
+      }
+    }
+  }
+
+  for (i = 0; i < G_N_ELEMENTS (decoder->RefPicSetLtCurr); i++) {
+    for (j = 0; j < refs->len; j++) {
+      GstH265Picture *ref_pic = g_array_index (refs, GstH265Picture *, j);
+      if (ref_pic == decoder->RefPicSetLtCurri) {
+        GstVulkanH265Picture *h265_ref_pic =
+            gst_h265_picture_get_user_data (ref_pic);
+        pic->std_h265pic.RefPicSetLtCurri = h265_ref_pic->slot_idx;
+        break;
+      }
+    }
+  }
+
+  g_array_unref (refs);
+
+
+  /* *INDENT-OFF* */
+  pic->base.decode_info = (VkVideoDecodeInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR,
+    .pNext = &pic->vk_h265pic,
+    .flags = 0x0,
+    .pSetupReferenceSlot = &pic->base.slot,
+    .referenceSlotCount = num_refs,
+    .pReferenceSlots = (const VkVideoReferenceSlotInfoKHR *) &pic->base.slots,
+    .dstPictureResource = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR,
+      .codedOffset = { self->x, self->y },
+      .codedExtent = { self->coded_width, self->coded_height },
+      .baseArrayLayer = 0,
+      .imageViewBinding = pic->base.img_view_out->view,
+    },
+  };
+  /* *INDENT-ON* */
+
+  /* only wait if there's a buffer processed */
+  if (GST_CODEC_PICTURE_FRAME_NUMBER (picture) > 0) {
+    if (!gst_vulkan_decoder_wait (self->decoder)) {
+      GST_ERROR_OBJECT (self, "Error at waiting for decoding operation to end");
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_vulkan_h265_decoder_decode_slice (GstH265Decoder * decoder,
+    GstH265Picture * picture, GstH265Slice * slice, GArray * ref_pic_list0,
+    GArray * ref_pic_list1)
+{
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (decoder);
+  GstVulkanH265Picture *pic;
+
+  GST_TRACE_OBJECT (self, "Decode slice");
+
+  pic = gst_h265_picture_get_user_data (picture);
+  g_assert (pic);
+
+  if (!gst_vulkan_decoder_append_slice (self->decoder, &pic->base,
+          slice->nalu.data + slice->nalu.offset, slice->nalu.size, TRUE))
+    return GST_FLOW_ERROR;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_vulkan_h265_decoder_end_picture (GstH265Decoder * decoder,
+    GstH265Picture * picture)
+{
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (decoder);
+  GstVulkanH265Picture *pic;
+  GError *error = NULL;
+
+  GST_TRACE_OBJECT (self, "End picture");
+
+  pic = gst_h265_picture_get_user_data (picture);
+  g_assert (pic);
+
+  if (pic->base.slice_offs->len == 0)
+    return GST_FLOW_OK;
+
+  pic->vk_h265pic.sliceSegmentCount = pic->base.slice_offs->len - 1;
+  pic->vk_h265pic.pSliceSegmentOffsets =
+      (const guint32 *) pic->base.slice_offs->data;
+
+  GST_LOG_OBJECT (self, "Decoding frame, %d bytes %d slices",
+      pic->vk_h265pic.pSliceSegmentOffsetspic->vk_h265pic.sliceSegmentCount,
+      pic->vk_h265pic.sliceSegmentCount);
+
+  if (!gst_vulkan_decoder_decode (self->decoder, &pic->base, &error)) {
+    GST_ERROR_OBJECT (self, "Couldn't decode frame: %s",
+        error ? error->message : "");
+    g_clear_error (&error);
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_vulkan_h265_decoder_output_picture (GstH265Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH265Picture * picture)
+{
+  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
+  GstVulkanH265Decoder *self = GST_VULKAN_H265_DECODER (decoder);
+
+  GST_TRACE_OBJECT (self, "Output picture");
+
+  GST_LOG_OBJECT (self,
+      "Outputting picture %p (poc %d)", picture, picture->pic_order_cnt);
+
+  if (GST_CODEC_PICTURE (picture)->discont_state) {
+    self->need_negotiation = TRUE;
+    if (!gst_video_decoder_negotiate (vdec)) {
+      gst_h265_picture_unref (picture);
+      GST_ERROR_OBJECT (self, "Could not re-negotiate with updated state");
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  gst_h265_picture_unref (picture);
+
+  reset_pipeline_stage_mask (frame->output_buffer);
+
+  return gst_video_decoder_finish_frame (vdec, frame);
+}
+
+static void
+gst_vulkan_h265_decoder_init (GstVulkanH265Decoder * self)
+{
+  gst_vulkan_buffer_memory_init_once ();
+}
+
+static void
+gst_vulkan_h265_decoder_class_init (GstVulkanH265DecoderClass * klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstH265DecoderClass *h265decoder_class = GST_H265_DECODER_CLASS (klass);
+
+  gst_element_class_set_metadata (element_class, "Vulkan H.265 decoder",
+      "Codec/Decoder/Video/Hardware", "A H.265 video decoder based on Vulkan",
+      "Víctor Jáquez <vjaquez@igalia.com>");
+
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vulkan_h265dec_sink_template);
+
+  gst_element_class_add_static_pad_template (element_class,
+      &gst_vulkan_h265dec_src_template);
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_set_context);
+
+  decoder_class->src_query =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_src_query);
+  decoder_class->sink_query =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_sink_query);
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_open);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_close);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_stop);
+  decoder_class->negotiate =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_decide_allocation);
+
+  h265decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_new_sequence);
+  h265decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_new_picture);
+  h265decoder_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_start_picture);
+  h265decoder_class->decode_slice =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_decode_slice);
+  h265decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_end_picture);
+  h265decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_vulkan_h265_decoder_output_picture);
+}

gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/vkh265dec.h Added

@@ -0,0 +1,31 @@
+/* GStreamer
+ * Copyright (C) 2024 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/codecs/gsth265decoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_VULKAN_H265_DECODER (gst_vulkan_h265_decoder_get_type())
+G_DECLARE_FINAL_TYPE (GstVulkanH265Decoder, gst_vulkan_h265_decoder, GST, VULKAN_H265_DECODER, GstH265Decoder)
+
+GST_ELEMENT_REGISTER_DECLARE (vulkanh265dec);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/ext/vulkan/vkoverlaycompositor.c -> gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/vkoverlaycompositor.c Changed

@@ -204,8 +204,8 @@
       .srcAccessMask = buf_mem->barrier.parent.access_flags,
       .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
       /* FIXME: implement exclusive transfers */
-      .srcQueueFamilyIndex = 0,
-      .dstQueueFamilyIndex = 0,
+      .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+      .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
       .buffer = buf_mem->buffer,
       .offset = region.bufferOffset,
       .size = region.bufferRowLength * region.bufferImageHeight,
@@ -219,8 +219,8 @@
       .oldLayout = img_mem->barrier.image_layout,
       .newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
       /* FIXME: implement exclusive transfers */
-      .srcQueueFamilyIndex = 0,
-      .dstQueueFamilyIndex = 0,
+      .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+      .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
       .image = img_mem->image,
       .subresourceRange = img_mem->barrier.subresource_range,
   };
@@ -446,7 +446,7 @@
 gst_vulkan_overlay_compositor_transform_ip (GstBaseTransform * bt,
     GstBuffer * inbuf);
 
-#define IMAGE_FORMATS " { BGRA }"
+#define IMAGE_FORMATS " { BGRA, RGBA }"
 
 static GstStaticPadTemplate gst_vulkan_sink_template =
     GST_STATIC_PAD_TEMPLATE ("sink",

gst-plugins-bad-1.22.7.tar.xz/ext/vulkan/vkshaderspv.c -> gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/vkshaderspv.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/vulkan/vkupload.c -> gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/vkupload.c Changed

@@ -186,11 +186,6 @@
 
   GstVideoInfo in_info;
   GstVideoInfo out_info;
-
-  GstBufferPool *pool;
-  gboolean pool_active;
-
-  gsize alloc_sizesGST_VIDEO_MAX_PLANES;
 };
 
 static gpointer
@@ -226,8 +221,6 @@
 _raw_to_buffer_set_caps (gpointer impl, GstCaps * in_caps, GstCaps * out_caps)
 {
   struct RawToBufferUpload *raw = impl;
-  guint out_width, out_height;
-  guint i;
 
   if (!gst_video_info_from_caps (&raw->in_info, in_caps))
     return FALSE;
@@ -235,26 +228,6 @@
   if (!gst_video_info_from_caps (&raw->out_info, out_caps))
     return FALSE;
 
-  out_width = GST_VIDEO_INFO_WIDTH (&raw->out_info);
-  out_height = GST_VIDEO_INFO_HEIGHT (&raw->out_info);
-
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&raw->out_info); i++) {
-    GstVulkanImageMemory *img_mem;
-    VkFormat vk_format;
-
-    vk_format = gst_vulkan_format_from_video_info (&raw->out_info, i);
-
-    img_mem = (GstVulkanImageMemory *)
-        gst_vulkan_image_memory_alloc (raw->upload->device, vk_format,
-        out_width, out_height, VK_IMAGE_TILING_OPTIMAL,
-        VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
-        VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
-
-    raw->alloc_sizesi = img_mem->requirements.size;
-
-    gst_memory_unref (GST_MEMORY_CAST (img_mem));
-  }
-
   return TRUE;
 }
 
@@ -272,27 +245,17 @@
   struct RawToBufferUpload *raw = impl;
   GstVideoFrame v_frame;
   GstFlowReturn ret;
-  guint i;
+  guint i, n_mems;
+  GstBufferPool *pool;
 
-  if (!raw->pool) {
-    GstStructure *config;
-    guint min = 0, max = 0;
-    gsize size = 1;
-
-    raw->pool = gst_vulkan_buffer_pool_new (raw->upload->device);
-    config = gst_buffer_pool_get_config (raw->pool);
-    gst_buffer_pool_config_set_params (config, raw->upload->out_caps, size, min,
-        max);
-    gst_buffer_pool_set_config (raw->pool, config);
-  }
-  if (!raw->pool_active) {
-    gst_buffer_pool_set_active (raw->pool, TRUE);
-    raw->pool_active = TRUE;
-  }
+  pool = gst_base_transform_get_buffer_pool
+      (GST_BASE_TRANSFORM_CAST (raw->upload));
+  if (!pool)
+    return GST_FLOW_ERROR;
 
-  if ((ret =
-          gst_buffer_pool_acquire_buffer (raw->pool, outbuf,
-              NULL)) != GST_FLOW_OK)
+  gst_buffer_pool_set_active (pool, TRUE);
+  if ((ret = gst_buffer_pool_acquire_buffer (pool, outbuf, NULL))
+      != GST_FLOW_OK)
     goto out;
 
   if (!gst_video_frame_map (&v_frame, &raw->in_info, inbuf, GST_MAP_READ)) {
@@ -301,7 +264,8 @@
     return GST_FLOW_ERROR;
   }
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&raw->out_info); i++) {
+  n_mems = gst_buffer_n_memory (*outbuf);
+  for (i = 0; i < n_mems; i++) {
     GstMapInfo map_info;
     gsize plane_size;
     GstMemory *mem;
@@ -330,23 +294,13 @@
   ret = GST_FLOW_OK;
 
 out:
+  gst_object_unref (pool);
   return ret;
 }
 
 static void
 _raw_to_buffer_free (gpointer impl)
 {
-  struct RawToBufferUpload *raw = impl;
-
-  if (raw->pool) {
-    if (raw->pool_active) {
-      gst_buffer_pool_set_active (raw->pool, FALSE);
-    }
-    raw->pool_active = FALSE;
-    gst_object_unref (raw->pool);
-    raw->pool = NULL;
-  }
-
   g_free (impl);
 }
 
@@ -373,11 +327,7 @@
   GstVideoInfo in_info;
   GstVideoInfo out_info;
 
-  GstBufferPool *pool;
-  gboolean pool_active;
-
-  GstVulkanCommandPool *cmd_pool;
-  GstVulkanTrashList *trash_list;
+  GstVulkanOperation *exec;
 };
 
 static gpointer
@@ -386,7 +336,6 @@
   struct BufferToImageUpload *raw = g_new0 (struct BufferToImageUpload, 1);
 
   raw->upload = upload;
-  raw->trash_list = gst_vulkan_trash_fence_list_new ();
 
   return raw;
 }
@@ -438,65 +387,88 @@
   struct BufferToImageUpload *raw = impl;
   GstFlowReturn ret;
   GError *error = NULL;
-  VkResult err;
   GstVulkanCommandBuffer *cmd_buf;
-  guint i;
+  guint i, n_mems, n_planes;
+  GArray *barriers = NULL;
+  VkImageLayout dst_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+  GstBufferPool *pool;
+
+  pool = gst_base_transform_get_buffer_pool
+      (GST_BASE_TRANSFORM_CAST (raw->upload));
+  if (!pool)
+    return GST_FLOW_ERROR;
+
+  gst_buffer_pool_set_active (pool, TRUE);
+  if ((ret = gst_buffer_pool_acquire_buffer (pool, outbuf, NULL))
+      != GST_FLOW_OK)
+    goto out;
 
-  if (!raw->cmd_pool) {
-    if (!(raw->cmd_pool =
-            gst_vulkan_queue_create_command_pool (raw->upload->queue,
-                &error))) {
+  if (!raw->exec) {
+    GstVulkanCommandPool *cmd_pool =
+        gst_vulkan_queue_create_command_pool (raw->upload->queue, &error);
+    if (!cmd_pool)
       goto error;
-    }
+
+    raw->exec = gst_vulkan_operation_new (cmd_pool);
+    gst_object_unref (cmd_pool);
   }
 
-  if (!(cmd_buf = gst_vulkan_command_pool_create (raw->cmd_pool, &error)))
+  if (!gst_vulkan_operation_add_dependency_frame (raw->exec, *outbuf,
+          VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT))
     goto error;
 
-  if (!raw->pool) {
-    GstStructure *config;
-    guint min = 0, max = 0;
-    gsize size = 1;
-
-    raw->pool = gst_vulkan_image_buffer_pool_new (raw->upload->device);
-    config = gst_buffer_pool_get_config (raw->pool);
-    gst_buffer_pool_config_set_params (config, raw->upload->out_caps, size, min,
-        max);
-    gst_buffer_pool_set_config (raw->pool, config);
-  }
-  if (!raw->pool_active) {
-    gst_buffer_pool_set_active (raw->pool, TRUE);
-    raw->pool_active = TRUE;
-  }
+  if (!gst_vulkan_operation_begin (raw->exec, &error))
+    goto error;
 
-  if ((ret =
-          gst_buffer_pool_acquire_buffer (raw->pool, outbuf,
-              NULL)) != GST_FLOW_OK)
-    goto out;
+  cmd_buf = raw->exec->cmd_buf;
 
-  {
-    /* *INDENT-OFF* */
-    VkCommandBufferBeginInfo cmd_buf_info = {
-        .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
-        .pNext = NULL,
-        .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
-        .pInheritanceInfo = NULL
+  if (!gst_vulkan_operation_add_frame_barrier (raw->exec, *outbuf,
+          VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_TRANSFER_WRITE_BIT,
+          VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, NULL))
+    goto unlock_error;
+
+  barriers = gst_vulkan_operation_retrieve_image_barriers (raw->exec);
+  if (barriers->len == 0) {
+    ret = GST_FLOW_ERROR;
+    goto unlock_error;
+  }
+
+  if (gst_vulkan_operation_use_sync2 (raw->exec)) {
+#if defined(VK_KHR_synchronization2)
+    VkDependencyInfoKHR dependency_info = {
+      .sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR,
+      .pImageMemoryBarriers = (gpointer) barriers->data,
+      .imageMemoryBarrierCount = barriers->len,
     };
-    /* *INDENT-ON* */
 
+    gst_vulkan_operation_pipeline_barrier2 (raw->exec, &dependency_info);
+    dst_layout =
+        g_array_index (barriers, VkImageMemoryBarrier2KHR, 0).newLayout;
+#endif
+  } else {
     gst_vulkan_command_buffer_lock (cmd_buf);
-    err = vkBeginCommandBuffer (cmd_buf->cmd, &cmd_buf_info);
-    if (gst_vulkan_error_to_g_error (err, &error, "vkBeginCommandBuffer") < 0)
-      goto unlock_error;
+    vkCmdPipelineBarrier (cmd_buf->cmd, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+        VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 0, NULL,
+        barriers->len, (gpointer) barriers->data);
+    gst_vulkan_command_buffer_unlock (cmd_buf);
+
+    dst_layout = g_array_index (barriers, VkImageMemoryBarrier, 0).newLayout;
   }
+  g_clear_pointer (&barriers, g_array_unref);
+
+  n_mems = gst_buffer_n_memory (*outbuf);
+  n_planes = GST_VIDEO_INFO_N_PLANES (&raw->out_info);
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&raw->out_info); i++) {
+  for (i = 0; i < n_planes; i++) {
     VkBufferImageCopy region;
     GstMemory *in_mem, *out_mem;
     GstVulkanBufferMemory *buf_mem;
     GstVulkanImageMemory *img_mem;
-    VkImageMemoryBarrier image_memory_barrier;
-    VkBufferMemoryBarrier buffer_memory_barrier;
+    const VkImageAspectFlags aspects = { VK_IMAGE_ASPECT_PLANE_0_BIT,
+      VK_IMAGE_ASPECT_PLANE_1_BIT, VK_IMAGE_ASPECT_PLANE_2_BIT,
+    };
+    VkImageAspectFlags plane_aspect;
+    guint idx;
 
     in_mem = gst_buffer_peek_memory (inbuf, i);
     if (!gst_is_vulkan_buffer_memory (in_mem)) {
@@ -505,12 +477,10 @@
     }
     buf_mem = (GstVulkanBufferMemory *) in_mem;
 
-    out_mem = gst_buffer_peek_memory (*outbuf, i);
-    if (!gst_is_vulkan_image_memory (out_mem)) {
-      GST_WARNING_OBJECT (raw->upload, "Output is not a GstVulkanImageMemory");
-      goto unlock_error;
-    }
-    img_mem = (GstVulkanImageMemory *) out_mem;
+    if (n_planes == n_mems)
+      plane_aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+    else
+      plane_aspect = aspectsi;
 
     /* *INDENT-OFF* */
     region = (VkBufferImageCopy) {
@@ -518,7 +488,7 @@
         .bufferRowLength = GST_VIDEO_INFO_COMP_WIDTH (&raw->in_info, i),
         .bufferImageHeight = GST_VIDEO_INFO_COMP_HEIGHT (&raw->in_info, i),
         .imageSubresource = {
-            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+            .aspectMask = plane_aspect,
             .mipLevel = 0,
             .baseArrayLayer = 0,
             .layerCount = 1,
@@ -531,103 +501,32 @@
         }
     };
 
-    image_memory_barrier = (VkImageMemoryBarrier) {
-        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-        .pNext = NULL,
-        .srcAccessMask = img_mem->barrier.parent.access_flags,
-        .dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
-        .oldLayout = img_mem->barrier.image_layout,
-        .newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-        /* FIXME: implement exclusive transfers */
-        .srcQueueFamilyIndex = 0,
-        .dstQueueFamilyIndex = 0,
-        .image = img_mem->image,
-        .subresourceRange = img_mem->barrier.subresource_range
-    };
-
-    buffer_memory_barrier = (VkBufferMemoryBarrier) {
-        .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
-        .pNext = NULL,
-        .srcAccessMask = buf_mem->barrier.parent.access_flags,
-        .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
-        /* FIXME: implement exclusive transfers */
-        .srcQueueFamilyIndex = 0,
-        .dstQueueFamilyIndex = 0,
-        .buffer = buf_mem->buffer,
-        .offset = region.bufferOffset,
-        .size = region.bufferRowLength * region.bufferImageHeight
-    };
-    /* *INDENT-ON* */
-
-    vkCmdPipelineBarrier (cmd_buf->cmd,
-        buf_mem->barrier.parent.pipeline_stages | img_mem->barrier.
-        parent.pipeline_stages, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 1,
-        &buffer_memory_barrier, 1, &image_memory_barrier);
-
-    buf_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
-    buf_mem->barrier.parent.access_flags = buffer_memory_barrier.dstAccessMask;
-
-    img_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
-    img_mem->barrier.parent.access_flags = image_memory_barrier.dstAccessMask;
-    img_mem->barrier.image_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+    idx = MIN (i, n_mems - 1);
+    out_mem = gst_buffer_peek_memory (*outbuf, idx);
+    if (!gst_is_vulkan_image_memory (out_mem)) {
+      GST_WARNING_OBJECT (raw->upload, "Output is not a GstVulkanImageMemory");
+      goto unlock_error;
+    }
+    img_mem = (GstVulkanImageMemory *) out_mem;
 
+    gst_vulkan_command_buffer_lock (cmd_buf);
     vkCmdCopyBufferToImage (cmd_buf->cmd, buf_mem->buffer, img_mem->image,
-        img_mem->barrier.image_layout, 1, &region);
+        dst_layout, 1, &region);
+    gst_vulkan_command_buffer_unlock (cmd_buf);
   }
 
-  err = vkEndCommandBuffer (cmd_buf->cmd);
-  gst_vulkan_command_buffer_unlock (cmd_buf);
-  if (gst_vulkan_error_to_g_error (err, &error, "vkEndCommandBuffer") < 0)
+  if (!gst_vulkan_operation_end (raw->exec, &error))
     goto error;
 
-  {
-    VkSubmitInfo submit_info = { 0, };
-    VkPipelineStageFlags stages = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
-    GstVulkanFence *fence;
-
-    /* *INDENT-OFF* */
-    submit_info = (VkSubmitInfo) {
-        .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
-        .pNext = NULL,
-        .waitSemaphoreCount = 0,
-        .pWaitSemaphores = NULL,
-        .pWaitDstStageMask = &stages,
-        .commandBufferCount = 1,
-        .pCommandBuffers = &cmd_buf->cmd,
-        .signalSemaphoreCount = 0,
-        .pSignalSemaphores = NULL
-    };
-    /* *INDENT-ON* */
-
-    fence = gst_vulkan_device_create_fence (raw->upload->device, &error);
-    if (!fence)
-      goto error;
-
-    err =
-        vkQueueSubmit (raw->upload->queue->queue, 1, &submit_info,
-        GST_VULKAN_FENCE_FENCE (fence));
-    if (gst_vulkan_error_to_g_error (err, &error, "vkQueueSubmit") < 0)
-      goto error;
-
-    gst_vulkan_trash_list_add (raw->trash_list,
-        gst_vulkan_trash_list_acquire (raw->trash_list, fence,
-            gst_vulkan_trash_mini_object_unref,
-            GST_MINI_OBJECT_CAST (cmd_buf)));
-    gst_vulkan_fence_unref (fence);
-  }
-
-  gst_vulkan_trash_list_gc (raw->trash_list);
-
   ret = GST_FLOW_OK;
 
 out:
+  gst_object_unref (pool);
   return ret;
 
 unlock_error:
-  if (cmd_buf) {
-    gst_vulkan_command_buffer_unlock (cmd_buf);
-    gst_vulkan_command_buffer_unref (cmd_buf);
-  }
+  gst_vulkan_operation_reset (raw->exec);
+
 error:
   if (error) {
     GST_WARNING_OBJECT (raw->upload, "Error: %s", error->message);
@@ -643,25 +542,15 @@
 {
   struct BufferToImageUpload *raw = impl;
 
-  if (raw->pool) {
-    if (raw->pool_active) {
-      gst_buffer_pool_set_active (raw->pool, FALSE);
+  if (raw->exec) {
+    if (!gst_vulkan_operation_wait (raw->exec)) {
+      GST_WARNING_OBJECT (raw->upload,
+          "Failed to wait for all fences to complete before shutting down");
     }
-    raw->pool_active = FALSE;
-    gst_object_unref (raw->pool);
-    raw->pool = NULL;
+    gst_object_unref (raw->exec);
+    raw->exec = NULL;
   }
 
-  if (raw->cmd_pool)
-    gst_object_unref (raw->cmd_pool);
-  raw->cmd_pool = NULL;
-
-  if (!gst_vulkan_trash_list_wait (raw->trash_list, -1))
-    GST_WARNING_OBJECT (raw->upload,
-        "Failed to wait for all fences to complete " "before shutting down");
-  gst_object_unref (raw->trash_list);
-  raw->trash_list = NULL;
-
   g_free (impl);
 }
 
@@ -689,14 +578,10 @@
   GstVideoInfo in_info;
   GstVideoInfo out_info;
 
-  GstBufferPool *pool;
-  gboolean pool_active;
-
   GstBufferPool *in_pool;
   gboolean in_pool_active;
 
-  GstVulkanCommandPool *cmd_pool;
-  GstVulkanTrashList *trash_list;
+  GstVulkanOperation *exec;
 };
 
 static gpointer
@@ -705,7 +590,6 @@
   struct RawToImageUpload *raw = g_new0 (struct RawToImageUpload, 1);
 
   raw->upload = upload;
-  raw->trash_list = gst_vulkan_trash_fence_list_new ();
 
   return raw;
 }
@@ -768,64 +652,88 @@
   GstBuffer *in_vk_copy = NULL;
   GstVulkanCommandBuffer *cmd_buf;
   GError *error = NULL;
-  VkResult err;
-  guint i;
+  GArray *barriers = NULL;
+  guint i, n_mems, n_planes, n_out_mems;
+  VkImageLayout dst_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+  GstBufferPool *pool;
 
-  if (!raw->cmd_pool) {
-    if (!(raw->cmd_pool =
-            gst_vulkan_queue_create_command_pool (raw->upload->queue,
-                &error))) {
-      goto error;
-    }
+  pool = gst_base_transform_get_buffer_pool
+      (GST_BASE_TRANSFORM_CAST (raw->upload));
+  if (!pool)
+    return GST_FLOW_ERROR;
+
+  gst_buffer_pool_set_active (pool, TRUE);
+  if ((ret = gst_buffer_pool_acquire_buffer (pool, outbuf, NULL))
+      != GST_FLOW_OK)
+    goto out;
+
+  if (!raw->exec) {
+    GstVulkanCommandPool *cmd_pool =
+        gst_vulkan_queue_create_command_pool (raw->upload->queue, &error);
+
+    raw->exec = gst_vulkan_operation_new (cmd_pool);
+    gst_object_unref (cmd_pool);
   }
 
-  if (!(cmd_buf = gst_vulkan_command_pool_create (raw->cmd_pool, &error)))
+  if (!gst_vulkan_operation_begin (raw->exec, &error))
     goto error;
 
-  if (!raw->pool) {
-    GstStructure *config;
-    guint min = 0, max = 0;
-    gsize size = 1;
-
-    raw->pool = gst_vulkan_image_buffer_pool_new (raw->upload->device);
-    config = gst_buffer_pool_get_config (raw->pool);
-    gst_buffer_pool_config_set_params (config, raw->upload->out_caps, size, min,
-        max);
-    gst_buffer_pool_set_config (raw->pool, config);
-  }
-  if (!raw->pool_active) {
-    gst_buffer_pool_set_active (raw->pool, TRUE);
-    raw->pool_active = TRUE;
-  }
+  if (!gst_vulkan_operation_add_dependency_frame (raw->exec, *outbuf,
+          VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT))
+    goto unlock_error;
 
-  if ((ret =
-          gst_buffer_pool_acquire_buffer (raw->pool, outbuf,
-              NULL)) != GST_FLOW_OK)
-    goto out;
+  cmd_buf = raw->exec->cmd_buf;
 
-  {
-    /* *INDENT-OFF* */
-    VkCommandBufferBeginInfo cmd_buf_info = {
-        .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
-        .pNext = NULL,
-        .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
-        .pInheritanceInfo = NULL
+  if (!gst_vulkan_operation_add_frame_barrier (raw->exec, *outbuf,
+          VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
+          VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, NULL))
+    goto unlock_error;
+
+  barriers = gst_vulkan_operation_retrieve_image_barriers (raw->exec);
+  if (barriers->len == 0) {
+    ret = GST_FLOW_ERROR;
+    goto unlock_error;
+  }
+
+  if (gst_vulkan_operation_use_sync2 (raw->exec)) {
+#if defined(VK_KHR_synchronization2)
+    VkDependencyInfoKHR dependency_info = {
+      .sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR,
+      .pImageMemoryBarriers = (gpointer) barriers->data,
+      .imageMemoryBarrierCount = barriers->len,
     };
-    /* *INDENT-ON* */
 
+    gst_vulkan_operation_pipeline_barrier2 (raw->exec, &dependency_info);
+    dst_layout =
+        g_array_index (barriers, VkImageMemoryBarrier2KHR, 0).newLayout;
+#endif
+  } else {
     gst_vulkan_command_buffer_lock (cmd_buf);
-    err = vkBeginCommandBuffer (cmd_buf->cmd, &cmd_buf_info);
-    if (gst_vulkan_error_to_g_error (err, &error, "vkBeginCommandBuffer") < 0)
-      return FALSE;
+    vkCmdPipelineBarrier (cmd_buf->cmd, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+        VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 0, NULL,
+        barriers->len, (gpointer) barriers->data);
+    gst_vulkan_command_buffer_unlock (cmd_buf);
+
+    dst_layout = g_array_index (barriers, VkImageMemoryBarrier, 0).newLayout;
   }
+  g_clear_pointer (&barriers, g_array_unref);
+
+  n_mems = gst_buffer_n_memory (inbuf);
+  n_out_mems = gst_buffer_n_memory (*outbuf);
+  if (n_mems != n_out_mems)
+    goto unlock_error;
+  n_planes = GST_VIDEO_INFO_N_PLANES (&raw->in_info);
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&raw->out_info); i++) {
+  for (i = 0; i < n_mems; i++) {
     VkBufferImageCopy region;
     GstMemory *in_mem, *out_mem;
     GstVulkanBufferMemory *buf_mem;
     GstVulkanImageMemory *img_mem;
-    VkImageMemoryBarrier image_memory_barrier;
-    VkBufferMemoryBarrier buffer_memory_barrier;
+    const VkImageAspectFlags aspects = { VK_IMAGE_ASPECT_PLANE_0_BIT,
+      VK_IMAGE_ASPECT_PLANE_1_BIT, VK_IMAGE_ASPECT_PLANE_2_BIT,
+    };
+    VkImageAspectFlags plane_aspect;
+    guint idx;
 
     in_mem = gst_buffer_peek_memory (inbuf, i);
     if (gst_is_vulkan_buffer_memory (in_mem)) {
@@ -890,20 +798,26 @@
       buf_mem = (GstVulkanBufferMemory *) in_mem;
     }
 
-    out_mem = gst_buffer_peek_memory (*outbuf, i);
+    idx = MIN (i, n_mems - 1);
+    out_mem = gst_buffer_peek_memory (*outbuf, idx);
     if (!gst_is_vulkan_image_memory (out_mem)) {
       GST_WARNING_OBJECT (raw->upload, "Output is not a GstVulkanImageMemory");
       goto unlock_error;
     }
     img_mem = (GstVulkanImageMemory *) out_mem;
 
+    if (n_planes == n_mems)
+      plane_aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+    else
+      plane_aspect = aspectsi;
+
     /* *INDENT-OFF* */
     region = (VkBufferImageCopy) {
         .bufferOffset = 0,
         .bufferRowLength = GST_VIDEO_INFO_COMP_WIDTH (&raw->in_info, i),
         .bufferImageHeight = GST_VIDEO_INFO_COMP_HEIGHT (&raw->in_info, i),
         .imageSubresource = {
-            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+            .aspectMask = plane_aspect,
             .mipLevel = 0,
             .baseArrayLayer = 0,
             .layerCount = 1,
@@ -915,109 +829,29 @@
             .depth = 1,
         }
     };
-
-    buffer_memory_barrier = (VkBufferMemoryBarrier) {
-        .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
-        .pNext = NULL,
-        .srcAccessMask = buf_mem->barrier.parent.access_flags,
-        .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
-        /* FIXME: implement exclusive transfers */
-        .srcQueueFamilyIndex = 0,
-        .dstQueueFamilyIndex = 0,
-        .buffer = buf_mem->buffer,
-        .offset = region.bufferOffset,
-        .size = region.bufferRowLength * region.bufferImageHeight,
-    };
-
-    image_memory_barrier = (VkImageMemoryBarrier) {
-        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-        .pNext = NULL,
-        .srcAccessMask = img_mem->barrier.parent.access_flags,
-        .dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
-        .oldLayout = img_mem->barrier.image_layout,
-        .newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-        /* FIXME: implement exclusive transfers */
-        .srcQueueFamilyIndex = 0,
-        .dstQueueFamilyIndex = 0,
-        .image = img_mem->image,
-        .subresourceRange = img_mem->barrier.subresource_range,
-    };
     /* *INDENT-ON* */
 
-    vkCmdPipelineBarrier (cmd_buf->cmd,
-        buf_mem->barrier.parent.pipeline_stages | img_mem->barrier.
-        parent.pipeline_stages, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 1,
-        &buffer_memory_barrier, 1, &image_memory_barrier);
-
-    buf_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
-    buf_mem->barrier.parent.access_flags = buffer_memory_barrier.dstAccessMask;
-
-    img_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
-    img_mem->barrier.parent.access_flags = image_memory_barrier.dstAccessMask;
-    img_mem->barrier.image_layout = image_memory_barrier.newLayout;
-
+    gst_vulkan_command_buffer_lock (cmd_buf);
     vkCmdCopyBufferToImage (cmd_buf->cmd, buf_mem->buffer, img_mem->image,
-        img_mem->barrier.image_layout, 1, &region);
+        dst_layout, 1, &region);
+    gst_vulkan_command_buffer_unlock (cmd_buf);
   }
 
-  err = vkEndCommandBuffer (cmd_buf->cmd);
-  gst_vulkan_command_buffer_unlock (cmd_buf);
-  if (gst_vulkan_error_to_g_error (err, &error, "vkEndCommandBuffer") < 0) {
+  if (!gst_vulkan_operation_end (raw->exec, &error))
     goto error;
-  }
-
-  {
-    VkSubmitInfo submit_info = { 0, };
-    GstVulkanFence *fence;
-
-    /* *INDENT-OFF* */
-    submit_info = (VkSubmitInfo) {
-        .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
-        .pNext = NULL,
-        .waitSemaphoreCount = 0,
-        .pWaitSemaphores = NULL,
-        .pWaitDstStageMask = NULL,
-        .commandBufferCount = 1,
-        .pCommandBuffers = &cmd_buf->cmd,
-        .signalSemaphoreCount = 0,
-        .pSignalSemaphores = NULL,
-    };
-    /* *INDENT-ON* */
-
-    fence = gst_vulkan_device_create_fence (raw->upload->device, &error);
-    if (!fence)
-      goto error;
-
-    gst_vulkan_queue_submit_lock (raw->upload->queue);
-    err =
-        vkQueueSubmit (raw->upload->queue->queue, 1, &submit_info,
-        GST_VULKAN_FENCE_FENCE (fence));
-    gst_vulkan_queue_submit_unlock (raw->upload->queue);
-    if (gst_vulkan_error_to_g_error (err, &error, "vkQueueSubmit") < 0)
-      goto error;
-
-    gst_vulkan_trash_list_add (raw->trash_list,
-        gst_vulkan_trash_list_acquire (raw->trash_list, fence,
-            gst_vulkan_trash_mini_object_unref,
-            GST_MINI_OBJECT_CAST (cmd_buf)));
-    gst_vulkan_fence_unref (fence);
-  }
-
-  gst_vulkan_trash_list_gc (raw->trash_list);
 
   ret = GST_FLOW_OK;
 
 out:
+  gst_object_unref (pool);
   if (in_vk_copy)
     gst_buffer_unref (in_vk_copy);
 
   return ret;
 
 unlock_error:
-  if (cmd_buf) {
-    gst_vulkan_command_buffer_lock (cmd_buf);
-    gst_vulkan_command_buffer_unref (cmd_buf);
-  }
+  gst_vulkan_operation_reset (raw->exec);
+
 error:
   if (error) {
     GST_WARNING_OBJECT (raw->upload, "Error: %s", error->message);
@@ -1033,15 +867,6 @@
 {
   struct RawToImageUpload *raw = impl;
 
-  if (raw->pool) {
-    if (raw->pool_active) {
-      gst_buffer_pool_set_active (raw->pool, FALSE);
-    }
-    raw->pool_active = FALSE;
-    gst_object_unref (raw->pool);
-    raw->pool = NULL;
-  }
-
   if (raw->in_pool) {
     if (raw->in_pool_active) {
       gst_buffer_pool_set_active (raw->in_pool, FALSE);
@@ -1051,15 +876,14 @@
     raw->in_pool = NULL;
   }
 
-  if (raw->cmd_pool)
-    gst_object_unref (raw->cmd_pool);
-  raw->cmd_pool = NULL;
-
-  if (!gst_vulkan_trash_list_wait (raw->trash_list, -1))
-    GST_WARNING_OBJECT (raw->upload,
-        "Failed to wait for all fences to complete " "before shutting down");
-  gst_object_unref (raw->trash_list);
-  raw->trash_list = NULL;
+  if (raw->exec) {
+    if (!gst_vulkan_operation_wait (raw->exec)) {
+      GST_WARNING_OBJECT (raw->upload,
+          "Failed to wait for all fences to complete before shutting down");
+    }
+    gst_object_unref (raw->exec);
+    raw->exec = NULL;
+  }
 
   g_free (impl);
 }
@@ -1306,43 +1130,6 @@
   GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
 }
 
-struct choose_data
-{
-  GstVulkanUpload *upload;
-  GstVulkanQueue *queue;
-};
-
-static gboolean
-_choose_queue (GstVulkanDevice * device, GstVulkanQueue * queue,
-    struct choose_data *data)
-{
-  guint flags =
-      device->physical_device->queue_family_propsqueue->family.queueFlags;
-
-  if ((flags & VK_QUEUE_GRAPHICS_BIT) != 0) {
-    if (data->queue)
-      gst_object_unref (data->queue);
-    data->queue = gst_object_ref (queue);
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-static GstVulkanQueue *
-_find_graphics_queue (GstVulkanUpload * upload)
-{
-  struct choose_data data;
-
-  data.upload = upload;
-  data.queue = NULL;
-
-  gst_vulkan_device_foreach_queue (upload->device,
-      (GstVulkanDeviceForEachQueueFunc) _choose_queue, &data);
-
-  return data.queue;
-}
-
 static GstStateChangeReturn
 gst_vulkan_upload_change_state (GstElement * element, GstStateChange transition)
 {
@@ -1380,7 +1167,9 @@
       if (!gst_vulkan_queue_run_context_query (GST_ELEMENT (vk_upload),
               &vk_upload->queue)) {
         GST_DEBUG_OBJECT (vk_upload, "No queue retrieved from peer elements");
-        vk_upload->queue = _find_graphics_queue (vk_upload);
+        vk_upload->queue =
+            gst_vulkan_device_select_queue (vk_upload->device,
+            VK_QUEUE_GRAPHICS_BIT);
       }
       if (!vk_upload->queue) {
         GST_ELEMENT_ERROR (vk_upload, RESOURCE, NOT_FOUND,
@@ -1544,6 +1333,53 @@
 static gboolean
 gst_vulkan_upload_decide_allocation (GstBaseTransform * bt, GstQuery * query)
 {
+  GstVulkanUpload *vk_upload = GST_VULKAN_UPLOAD (bt);
+  GstBufferPool *pool = NULL;
+  GstStructure *config;
+  GstCaps *caps;
+  guint min, max, size;
+  gboolean update_pool;
+
+  gst_query_parse_allocation (query, &caps, NULL);
+  if (!caps)
+    return FALSE;
+
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+
+    update_pool = TRUE;
+  } else {
+    GstVideoInfo vinfo;
+
+    gst_video_info_init (&vinfo);
+    gst_video_info_from_caps (&vinfo, caps);
+    size = vinfo.size;
+    min = max = 0;
+    update_pool = FALSE;
+  }
+
+  if (!pool || !GST_IS_VULKAN_IMAGE_BUFFER_POOL (pool)) {
+    if (pool)
+      gst_object_unref (pool);
+    pool = gst_vulkan_image_buffer_pool_new (vk_upload->device);
+  }
+
+  config = gst_buffer_pool_get_config (pool);
+
+  gst_buffer_pool_config_set_params (config, caps, size, min, max);
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    gst_object_unref (pool);
+    return TRUE;
+  }
+
+  if (update_pool)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+
+  gst_object_unref (pool);
+
   return TRUE;
 }

gst-plugins-bad-1.22.7.tar.xz/ext/vulkan/vkviewconvert.c -> gst-plugins-bad-1.24.5.tar.xz/ext/vulkan/vkviewconvert.c Changed

@@ -292,7 +292,7 @@
 
 static void
 update_descriptor_set (GstVulkanViewConvert * conv,
-    GstVulkanImageView ** in_views)
+    GstVulkanImageView ** in_views, guint n_mems)
 {
   GstVulkanVideoFilter *vfilter = GST_VULKAN_VIDEO_FILTER (conv);
   VkDescriptorImageInfo image_infoGST_VIDEO_MAX_PLANES;
@@ -308,7 +308,7 @@
     in_flags = GST_VIDEO_INFO_MULTIVIEW_FLAGS (&vfilter->in_info);
   out_flags = GST_VIDEO_INFO_MULTIVIEW_FLAGS (&vfilter->out_info);
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&vfilter->in_info); i++) {
+  for (i = 0; i < n_mems; i++) {
     if ((in_flags & GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST) ==
         (out_flags & GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST)) {
       views2 * i = in_viewsi->view;
@@ -319,7 +319,7 @@
     }
   }
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&vfilter->in_info) * 2; i++) {
+  for (i = 0; i < n_mems * 2; i++) {
     /* *INDENT-OFF* */
     image_infoi = (VkDescriptorImageInfo) {
         .imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
@@ -1359,7 +1359,8 @@
   GstStructure *ins, *outs;
   const GValue *from_par, *to_par;
   GValue fpar = { 0, }, tpar = {
-  0,};
+    0,
+  };
 
   othercaps = gst_caps_make_writable (othercaps);
   othercaps = gst_caps_truncate (othercaps);
@@ -1777,7 +1778,8 @@
 }
 
 static gboolean
-create_descriptor_set_layout (GstVulkanViewConvert * conv, GError ** error)
+create_descriptor_set_layout (GstVulkanViewConvert * conv, guint n_mems,
+    GError ** error)
 {
   GstVulkanVideoFilter *vfilter = GST_VULKAN_VIDEO_FILTER (conv);
   VkDescriptorSetLayoutBinding bindingsGST_VIDEO_MAX_PLANES * 2 + 1 =
@@ -1796,9 +1798,9 @@
       .pImmutableSamplers = NULL,
       .stageFlags = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT
   };
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&vfilter->in_info) * 2; i++) {
+  for (i = 0; i < n_mems * 2; i++) {
     bindingsdescriptor_n++ = (VkDescriptorSetLayoutBinding) {
-      .binding = i+1,
+      .binding = i + 1,
       .descriptorCount = 1,
       .descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
       .pImmutableSamplers = NULL,
@@ -1913,6 +1915,7 @@
   GstVulkanFence *fence = NULL;
   GError *error = NULL;
   VkResult err;
+  guint in_n_mems, out_n_mems;
   int i;
 
   if (!gst_vulkan_full_screen_quad_set_input_buffer (conv->quad, inbuf, &error))
@@ -1925,7 +1928,8 @@
   if (!fence)
     goto error;
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&conv->quad->in_info); i++) {
+  in_n_mems = gst_buffer_n_memory (inbuf);
+  for (i = 0; i < in_n_mems; i++) {
     GstMemory *img_mem = gst_buffer_peek_memory (inbuf, i);
     if (!gst_is_vulkan_image_memory (img_mem)) {
       g_set_error_literal (&error, GST_VULKAN_ERROR, GST_VULKAN_FAILED,
@@ -1939,7 +1943,8 @@
             gst_vulkan_trash_mini_object_unref,
             (GstMiniObject *) in_img_viewsi));
   }
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&conv->quad->out_info); i++) {
+  out_n_mems = gst_buffer_n_memory (outbuf);
+  for (i = 0; i < out_n_mems; i++) {
     GstMemory *mem = gst_buffer_peek_memory (outbuf, i);
     if (!gst_is_vulkan_image_memory (mem)) {
       g_set_error_literal (&error, GST_VULKAN_ERROR, GST_VULKAN_FAILED,
@@ -1963,7 +1968,7 @@
   }
 
   if (!conv->quad->descriptor_set_layout)
-    if (!create_descriptor_set_layout (conv, &error))
+    if (!create_descriptor_set_layout (conv, in_n_mems, &error))
       goto error;
 
   if (!gst_vulkan_full_screen_quad_prepare_draw (conv->quad, fence, &error))
@@ -1991,7 +1996,7 @@
       goto error;
   }
 
-  update_descriptor_set (conv, in_img_views);
+  update_descriptor_set (conv, in_img_views, in_n_mems);
   if (!gst_vulkan_full_screen_quad_fill_command_buffer (conv->quad, cmd_buf,
           fence, &error))
     goto unlock_error;

gst-plugins-bad-1.22.7.tar.xz/ext/wayland/gstwaylandsink.c -> gst-plugins-bad-1.24.5.tar.xz/ext/wayland/gstwaylandsink.c Changed

@@ -43,8 +43,9 @@
 #endif
 
 #include "gstwaylandsink.h"
-#include <gst/allocators/allocators.h>
 
+#include <drm_fourcc.h>
+#include <gst/allocators/allocators.h>
 #include <gst/video/videooverlay.h>
 
 /* signals */
@@ -61,23 +62,18 @@
   PROP_DISPLAY,
   PROP_FULLSCREEN,
   PROP_ROTATE_METHOD,
+  PROP_DRM_DEVICE,
   PROP_LAST
 };
 
 GST_DEBUG_CATEGORY (gstwayland_debug);
 #define GST_CAT_DEFAULT gstwayland_debug
 
-#define WL_VIDEO_FORMATS \
-    "{ BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, " \
-    "RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, NV61, " \
-    "YUV9, YVU9, Y41B, I420, YV12, Y42B, v308 }"
-
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (WL_VIDEO_FORMATS) ";"
-        GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_DMABUF,
-            WL_VIDEO_FORMATS))
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (GST_WL_VIDEO_FORMATS) ";"
+        GST_VIDEO_DMA_DRM_CAPS_MAKE)
     );
 
 static void gst_wayland_sink_get_property (GObject * object,
@@ -178,6 +174,18 @@
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
  /**
+   * waylandsink:drm-device:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_DRM_DEVICE,
+      g_param_spec_string ("drm-device", "DRM Device", "Path of the "
+          "DRM device to use for dumb buffer allocation",
+          NULL,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
+
+
+ /**
   * waylandsink:render-rectangle:
   *
   * This helper installs the "render-rectangle" property into the
@@ -266,6 +274,11 @@
       g_value_set_enum (value, self->current_rotate_method);
       GST_OBJECT_UNLOCK (self);
       break;
+    case PROP_DRM_DEVICE:
+      GST_OBJECT_LOCK (self);
+      g_value_set_string (value, self->drm_device);
+      GST_OBJECT_UNLOCK (self);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -293,8 +306,14 @@
       gst_wayland_sink_set_rotate_method (self, g_value_get_enum (value),
           FALSE);
       break;
+    case PROP_DRM_DEVICE:
+      GST_OBJECT_LOCK (self);
+      self->drm_device = g_value_dup_string (value);
+      GST_OBJECT_UNLOCK (self);
+      break;
     default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      if (!gst_video_overlay_set_property (object, PROP_LAST, prop_id, value))
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
 }
@@ -315,7 +334,10 @@
   if (self->pool)
     gst_object_unref (self->pool);
 
+  gst_clear_caps (&self->caps);
+
   g_free (self->display_name);
+  g_free (self->drm_device);
 
   g_mutex_clear (&self->display_lock);
   g_mutex_clear (&self->render_lock);
@@ -426,13 +448,6 @@
         }
       }
 
-      g_mutex_lock (&self->render_lock);
-      if (self->callback) {
-        wl_callback_destroy (self->callback);
-        self->callback = NULL;
-      }
-      self->redraw_pending = FALSE;
-      g_mutex_unlock (&self->render_lock);
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
       g_mutex_lock (&self->display_lock);
@@ -523,10 +538,11 @@
   if (self->display) {
     GValue shm_list = G_VALUE_INIT, dmabuf_list = G_VALUE_INIT;
     GValue value = G_VALUE_INIT;
-    GArray *formats;
+    GArray *formats, *modifiers;
     gint i;
     guint fmt;
     GstVideoFormat gfmt;
+    guint64 mod;
 
     g_value_init (&shm_list, GST_TYPE_LIST);
     g_value_init (&dmabuf_list, GST_TYPE_LIST);
@@ -548,17 +564,19 @@
 
     /* Add corresponding dmabuf formats */
     formats = gst_wl_display_get_dmabuf_formats (self->display);
+    modifiers = gst_wl_display_get_dmabuf_modifiers (self->display);
     for (i = 0; i < formats->len; i++) {
       fmt = g_array_index (formats, uint32_t, i);
       gfmt = gst_wl_dmabuf_format_to_video_format (fmt);
+      mod = g_array_index (modifiers, guint64, i);
       if (gfmt != GST_VIDEO_FORMAT_UNKNOWN) {
         g_value_init (&value, G_TYPE_STRING);
-        g_value_set_static_string (&value, gst_video_format_to_string (gfmt));
+        g_value_take_string (&value, gst_wl_dmabuf_format_to_string (fmt, mod));
         gst_value_list_append_and_take_value (&dmabuf_list, &value);
       }
     }
 
-    gst_structure_take_value (gst_caps_get_structure (caps, 1), "format",
+    gst_structure_take_value (gst_caps_get_structure (caps, 1), "drm-format",
         &dmabuf_list);
 
     GST_DEBUG_OBJECT (self, "display caps: %" GST_PTR_FORMAT, caps);
@@ -578,28 +596,87 @@
   return caps;
 }
 
-static GstBufferPool *
-gst_wayland_create_pool (GstWaylandSink * self, GstCaps * caps)
+static gboolean
+gst_wayland_update_pool (GstWaylandSink * self, GstAllocator * allocator)
 {
-  GstBufferPool *pool = NULL;
-  GstStructure *structure;
   gsize size = self->video_info.size;
+  GstStructure *config;
+
+  /* Pools with outstanding buffer cannot be reconfigured, so we must use
+   * a new pool. */
+  if (self->pool) {
+    gst_buffer_pool_set_active (self->pool, FALSE);
+    gst_object_unref (self->pool);
+  }
+  self->pool = gst_wl_video_buffer_pool_new ();
+  gst_object_ref_sink (self->pool);
+
+  config = gst_buffer_pool_get_config (self->pool);
+  gst_buffer_pool_config_set_params (config, self->caps, size, 2, 0);
+  gst_buffer_pool_config_set_allocator (config, allocator, NULL);
+
+  if (!gst_buffer_pool_set_config (self->pool, config))
+    return FALSE;
+
+  return gst_buffer_pool_set_active (self->pool, TRUE);
+}
+
+static gboolean
+gst_wayland_activate_shm_pool (GstWaylandSink * self)
+{
+  GstAllocator *alloc = NULL;
+
+  if (self->pool && gst_buffer_pool_is_active (self->pool)) {
+    GstStructure *config = gst_buffer_pool_get_config (self->pool);
+    gboolean is_shm = FALSE;
+
+    if (gst_buffer_pool_config_get_allocator (config, &alloc, NULL) && alloc)
+      is_shm = GST_IS_SHM_ALLOCATOR (alloc);
+
+    gst_structure_free (config);
+
+    if (is_shm)
+      return TRUE;
+  }
+
+  alloc = gst_shm_allocator_get ();
+  gst_wayland_update_pool (self, alloc);
+  gst_object_unref (alloc);
+
+  return TRUE;
+}
+
+static gboolean
+gst_wayland_activate_drm_dumb_pool (GstWaylandSink * self)
+{
   GstAllocator *alloc;
 
-  pool = gst_wl_video_buffer_pool_new ();
+  if (!self->drm_device)
+    return FALSE;
 
-  structure = gst_buffer_pool_get_config (pool);
-  gst_buffer_pool_config_set_params (structure, caps, size, 2, 0);
+  if (self->pool && gst_buffer_pool_is_active (self->pool)) {
+    GstStructure *config = gst_buffer_pool_get_config (self->pool);
+    gboolean ret = FALSE;
+    gboolean is_drm_dumb = FALSE;
 
-  alloc = gst_wl_shm_allocator_get ();
-  gst_buffer_pool_config_set_allocator (structure, alloc, NULL);
-  if (!gst_buffer_pool_set_config (pool, structure)) {
-    g_object_unref (pool);
-    pool = NULL;
+    ret = gst_buffer_pool_config_get_allocator (config, &alloc, NULL);
+    gst_structure_free (config);
+
+    if (ret && alloc)
+      is_drm_dumb = GST_IS_DRM_DUMB_ALLOCATOR (alloc);
+
+    if (is_drm_dumb)
+      return TRUE;
   }
-  g_object_unref (alloc);
 
-  return pool;
+  alloc = gst_drm_dumb_allocator_new_with_device_path (self->drm_device);
+  if (!alloc)
+    return FALSE;
+
+  gst_wayland_update_pool (self, alloc);
+  gst_object_unref (alloc);
+
+  return TRUE;
 }
 
 static gboolean
@@ -607,34 +684,53 @@
 {
   GstWaylandSink *self = GST_WAYLAND_SINK (bsink);;
   gboolean use_dmabuf;
-  GstVideoFormat format;
 
   GST_DEBUG_OBJECT (self, "set caps %" GST_PTR_FORMAT, caps);
 
-  /* extract info from caps */
-  if (!gst_video_info_from_caps (&self->video_info, caps))
-    goto invalid_format;
+  if (gst_video_is_dma_drm_caps (caps)) {
+    if (!gst_video_info_dma_drm_from_caps (&self->drm_info, caps))
+      goto invalid_format;
+
+    if (!gst_video_info_dma_drm_to_video_info (&self->drm_info,
+            &self->video_info))
+      goto invalid_format;
+  } else {
+    /* extract info from caps */
+    if (!gst_video_info_from_caps (&self->video_info, caps))
+      goto invalid_format;
+
+    if (!gst_video_info_dma_drm_from_video_info (&self->drm_info,
+            &self->video_info, DRM_FORMAT_MOD_LINEAR))
+      gst_video_info_dma_drm_init (&self->drm_info);
+  }
 
-  format = GST_VIDEO_INFO_FORMAT (&self->video_info);
   self->video_info_changed = TRUE;
+  self->skip_dumb_buffer_copy = FALSE;
 
-  /* create a new pool for the new caps */
-  if (self->pool)
-    gst_object_unref (self->pool);
-  self->pool = gst_wayland_create_pool (self, caps);
+  /* free pooled buffer used with previous caps */
+  if (self->pool) {
+    gst_buffer_pool_set_active (self->pool, FALSE);
+    gst_clear_object (&self->pool);
+  }
 
   use_dmabuf = gst_caps_features_contains (gst_caps_get_features (caps, 0),
       GST_CAPS_FEATURE_MEMORY_DMABUF);
 
   /* validate the format base on the memory type. */
   if (use_dmabuf) {
-    if (!gst_wl_display_check_format_for_dmabuf (self->display, format))
-      goto unsupported_format;
-  } else if (!gst_wl_display_check_format_for_shm (self->display, format)) {
+    if (!gst_wl_display_check_format_for_dmabuf (self->display,
+            &self->drm_info))
+      goto unsupported_drm_format;
+  } else if (!gst_wl_display_check_format_for_shm (self->display,
+          &self->video_info)) {
+    /* Note: we still support dmabuf in this case, but formats must also be
+     * supported on SHM interface to ensure a fallback is possible as we are
+     * not guarantied we'll get dmabuf in the buffers. */
     goto unsupported_format;
   }
 
-  self->use_dmabuf = use_dmabuf;
+  /* Will be used to create buffer pools */
+  gst_caps_replace (&self->caps, caps);
 
   return TRUE;
 
@@ -644,10 +740,17 @@
         "Could not locate image format from caps %" GST_PTR_FORMAT, caps);
     return FALSE;
   }
+unsupported_drm_format:
+  {
+    GST_ERROR_OBJECT (self, "DRM format %" GST_FOURCC_FORMAT
+        " is not available on the display",
+        GST_FOURCC_ARGS (self->drm_info.drm_fourcc));
+    return FALSE;
+  }
 unsupported_format:
   {
     GST_ERROR_OBJECT (self, "Format %s is not available on the display",
-        gst_video_format_to_string (format));
+        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&self->video_info)));
     return FALSE;
   }
 }
@@ -655,22 +758,45 @@
 static gboolean
 gst_wayland_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
 {
-  GstWaylandSink *self = GST_WAYLAND_SINK (bsink);
   GstCaps *caps;
   GstBufferPool *pool = NULL;
   gboolean need_pool;
   GstAllocator *alloc;
+  GstVideoInfoDmaDrm drm_info;
+  GstVideoInfo vinfo;
+  guint size;
 
   gst_query_parse_allocation (query, &caps, &need_pool);
 
-  if (need_pool)
-    pool = gst_wayland_create_pool (self, caps);
+  if (caps == NULL)
+    return FALSE;
+
+  if (gst_video_is_dma_drm_caps (caps)) {
+    if (!gst_video_info_dma_drm_from_caps (&drm_info, caps))
+      return FALSE;
+    size = drm_info.vinfo.size;
+  } else {
+    /* extract info from caps */
+    if (!gst_video_info_from_caps (&vinfo, caps))
+      return FALSE;
+    size = vinfo.size;
+  }
+
+  if (need_pool) {
+    GstStructure *config;
+    pool = gst_wl_video_buffer_pool_new ();
+    config = gst_buffer_pool_get_config (pool);
+    gst_buffer_pool_config_set_params (config, caps, size, 2, 0);
+    gst_buffer_pool_config_set_allocator (config,
+        gst_shm_allocator_get (), NULL);
+    gst_buffer_pool_set_config (pool, config);
+  }
 
-  gst_query_add_allocation_pool (query, pool, self->video_info.size, 2, 0);
+  gst_query_add_allocation_pool (query, pool, size, 2, 0);
   if (pool)
     g_object_unref (pool);
 
-  alloc = gst_wl_shm_allocator_get ();
+  alloc = gst_shm_allocator_get ();
   gst_query_add_allocation_param (query, alloc, NULL);
   gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);
   g_object_unref (alloc);
@@ -678,49 +804,20 @@
   return TRUE;
 }
 
-static void
-frame_redraw_callback (void *data, struct wl_callback *callback, uint32_t time)
-{
-  GstWaylandSink *self = data;
-
-  GST_LOG_OBJECT (self, "frame_redraw_cb");
-
-  g_mutex_lock (&self->render_lock);
-  self->redraw_pending = FALSE;
-
-  if (self->callback) {
-    wl_callback_destroy (callback);
-    self->callback = NULL;
-  }
-  g_mutex_unlock (&self->render_lock);
-}
-
-static const struct wl_callback_listener frame_callback_listener = {
-  frame_redraw_callback
-};
-
 /* must be called with the render lock */
-static void
+static gboolean
 render_last_buffer (GstWaylandSink * self, gboolean redraw)
 {
   GstWlBuffer *wlbuffer;
   const GstVideoInfo *info = NULL;
-  struct wl_surface *surface;
-  struct wl_callback *callback;
 
   wlbuffer = gst_buffer_get_wl_buffer (self->display, self->last_buffer);
-  surface = gst_wl_window_get_wl_surface (self->window);
-
-  self->redraw_pending = TRUE;
-  callback = wl_surface_frame (surface);
-  self->callback = callback;
-  wl_callback_add_listener (callback, &frame_callback_listener, self);
 
   if (G_UNLIKELY (self->video_info_changed && !redraw)) {
     info = &self->video_info;
     self->video_info_changed = FALSE;
   }
-  gst_wl_window_render (self->window, wlbuffer, info);
+  return gst_wl_window_render (self->window, wlbuffer, info);
 }
 
 static void
@@ -739,9 +836,6 @@
   GstWaylandSink *self = GST_WAYLAND_SINK (vsink);
   GstBuffer *to_render;
   GstWlBuffer *wlbuffer;
-  GstVideoMeta *vmeta;
-  GstVideoFormat format;
-  GstVideoInfo old_vinfo;
   GstMemory *mem;
   struct wl_buffer *wbuf = NULL;
 
@@ -769,13 +863,6 @@
     }
   }
 
-  /* drop buffers until we get a frame callback */
-  if (self->redraw_pending) {
-    GST_LOG_OBJECT (self, "buffer %" GST_PTR_FORMAT " dropped (redraw pending)",
-        buffer);
-    goto done;
-  }
-
   /* make sure that the application has called set_render_rectangle() */
   if (G_UNLIKELY (gst_wl_window_get_render_rectangle (self->window)->w == 0))
     goto no_window_size;
@@ -794,24 +881,11 @@
   /* update video info from video meta */
   mem = gst_buffer_peek_memory (buffer, 0);
 
-  old_vinfo = self->video_info;
-  vmeta = gst_buffer_get_video_meta (buffer);
-  if (vmeta) {
-    gint i;
-
-    for (i = 0; i < vmeta->n_planes; i++) {
-      self->video_info.offseti = vmeta->offseti;
-      self->video_info.stridei = vmeta->stridei;
-    }
-    self->video_info.size = gst_buffer_get_size (buffer);
-  }
-
   GST_LOG_OBJECT (self,
       "buffer %" GST_PTR_FORMAT " does not have a wl_buffer from our "
       "display, creating it", buffer);
 
-  format = GST_VIDEO_INFO_FORMAT (&self->video_info);
-  if (gst_wl_display_check_format_for_dmabuf (self->display, format)) {
+  if (gst_wl_display_check_format_for_dmabuf (self->display, &self->drm_info)) {
     guint i, nb_dmabuf = 0;
 
     for (i = 0; i < gst_buffer_n_memory (buffer); i++)
@@ -820,10 +894,63 @@
 
     if (nb_dmabuf && (nb_dmabuf == gst_buffer_n_memory (buffer)))
       wbuf = gst_wl_linux_dmabuf_construct_wl_buffer (buffer, self->display,
-          &self->video_info);
+          &self->drm_info);
+
+    if (!wbuf && !self->skip_dumb_buffer_copy) {
+      /* DMABuf did not work, let try and make this a dmabuf, it does not matter
+       * if it was a SHM since the compositor needs to copy that anyway, and
+       * offloading the compositor from a copy helps maintaining a smoother
+       * desktop.
+       */
+      GstVideoFrame src, dst;
+
+      if (!gst_wayland_activate_drm_dumb_pool (self)) {
+        self->skip_dumb_buffer_copy = TRUE;
+        goto handle_shm;
+      }
+
+      ret = gst_buffer_pool_acquire_buffer (self->pool, &to_render, NULL);
+      if (ret != GST_FLOW_OK)
+        goto no_buffer;
+
+      wlbuffer = gst_buffer_get_wl_buffer (self->display, to_render);
+
+      /* attach a wl_buffer if there isn't one yet */
+      if (G_UNLIKELY (!wlbuffer)) {
+        wbuf = gst_wl_linux_dmabuf_construct_wl_buffer (to_render,
+            self->display, &self->drm_info);
+
+        if (G_UNLIKELY (!wbuf)) {
+          GST_WARNING_OBJECT (self, "failed to import DRM Dumb dmabuf");
+          gst_clear_buffer (&to_render);
+          self->skip_dumb_buffer_copy = TRUE;
+          goto handle_shm;
+        }
+
+        wlbuffer = gst_buffer_add_wl_buffer (to_render, wbuf, self->display);
+      }
+
+      if (!gst_video_frame_map (&dst, &self->video_info, to_render,
+              GST_MAP_WRITE))
+        goto dst_map_failed;
+
+      if (!gst_video_frame_map (&src, &self->video_info, buffer, GST_MAP_READ)) {
+        gst_video_frame_unmap (&dst);
+        goto src_map_failed;
+      }
+
+      gst_video_frame_copy (&dst, &src);
+
+      gst_video_frame_unmap (&src);
+      gst_video_frame_unmap (&dst);
+
+      goto render;
+    }
   }
 
-  if (!wbuf && gst_wl_display_check_format_for_shm (self->display, format)) {
+handle_shm:
+  if (!wbuf && gst_wl_display_check_format_for_shm (self->display,
+          &self->video_info)) {
     if (gst_buffer_n_memory (buffer) == 1 && gst_is_fd_memory (mem))
       wbuf = gst_wl_shm_memory_construct_wl_buffer (mem, self->display,
           &self->video_info);
@@ -831,10 +958,6 @@
     /* If nothing worked, copy into our internal pool */
     if (!wbuf) {
       GstVideoFrame src, dst;
-      GstVideoInfo src_info = self->video_info;
-
-      /* rollback video info changes */
-      self->video_info = old_vinfo;
 
       /* we don't know how to create a wl_buffer directly from the provided
        * memory, so we have to copy the data to shm memory that we know how
@@ -844,25 +967,9 @@
           "buffer %" GST_PTR_FORMAT " cannot have a wl_buffer, "
           "copying to wl_shm memory", buffer);
 
-      /* self->pool always exists (created in set_caps), but it may not
-       * be active if upstream is not using it */
-      if (!gst_buffer_pool_is_active (self->pool)) {
-        GstStructure *config;
-        GstCaps *caps;
-
-        config = gst_buffer_pool_get_config (self->pool);
-        gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL);
-
-        /* revert back to default strides and offsets */
-        gst_video_info_from_caps (&self->video_info, caps);
-        gst_buffer_pool_config_set_params (config, caps, self->video_info.size,
-            2, 0);
-
-        /* This is a video pool, it should not fail with basic settings */
-        if (!gst_buffer_pool_set_config (self->pool, config) ||
-            !gst_buffer_pool_set_active (self->pool, TRUE))
-          goto activate_failed;
-      }
+      /* ensure the internal pool is configured for SHM */
+      if (!gst_wayland_activate_shm_pool (self))
+        goto activate_failed;
 
       ret = gst_buffer_pool_acquire_buffer (self->pool, &to_render, NULL);
       if (ret != GST_FLOW_OK)
@@ -886,7 +993,7 @@
               GST_MAP_WRITE))
         goto dst_map_failed;
 
-      if (!gst_video_frame_map (&src, &src_info, buffer, GST_MAP_READ)) {
+      if (!gst_video_frame_map (&src, &self->video_info, buffer, GST_MAP_READ)) {
         gst_video_frame_unmap (&dst);
         goto src_map_failed;
       }
@@ -915,7 +1022,8 @@
   }
 
   gst_buffer_replace (&self->last_buffer, to_render);
-  render_last_buffer (self, FALSE);
+  if (!render_last_buffer (self, FALSE))
+    ret = GST_BASE_SINK_FLOW_DROPPED;
 
   if (buffer != to_render)
     gst_buffer_unref (to_render);
@@ -1059,7 +1167,7 @@
   GST_DEBUG_OBJECT (self, "expose");
 
   g_mutex_lock (&self->render_lock);
-  if (self->last_buffer && !self->redraw_pending) {
+  if (self->last_buffer) {
     GST_DEBUG_OBJECT (self, "redrawing last buffer");
     render_last_buffer (self, TRUE);
   }

gst-plugins-bad-1.22.7.tar.xz/ext/wayland/gstwaylandsink.h -> gst-plugins-bad-1.24.5.tar.xz/ext/wayland/gstwaylandsink.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/webp/gstwebpenc.c -> gst-plugins-bad-1.24.5.tar.xz/ext/webp/gstwebpenc.c Changed

@@ -21,7 +21,6 @@
 #endif
 
 #include <string.h>
-#include <stdlib.h>             /* free */
 
 #include <gst/video/video.h>
 #include <gst/video/gstvideometa.h>
@@ -37,26 +36,33 @@
   PROP_LOSSLESS,
   PROP_QUALITY,
   PROP_SPEED,
-  PROP_PRESET
+  PROP_PRESET,
+  PROP_ANIMATED,
+  PROP_ANIMATION_LOOPS,
+  PROP_ANIMATION_BACKGROUND_COLOR
 };
 
 #define DEFAULT_LOSSLESS FALSE
 #define DEFAULT_QUALITY 90
 #define DEFAULT_SPEED 4
 #define DEFAULT_PRESET WEBP_PRESET_PHOTO
+#define DEFAULT_ANIMATED FALSE
+#define DEFAULT_ANIMATION_LOOPS 0
+#define DEFAULT_ANIMATION_BACKGROUND_COLOR 0
 
 static void gst_webp_enc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_webp_enc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-static gboolean gst_webp_enc_start (GstVideoEncoder * benc);
-static gboolean gst_webp_enc_stop (GstVideoEncoder * benc);
+static gboolean gst_webp_enc_start (GstVideoEncoder * encoder);
+static gboolean gst_webp_enc_stop (GstVideoEncoder * encoder);
 static gboolean gst_webp_enc_set_format (GstVideoEncoder * encoder,
     GstVideoCodecState * state);
 static GstFlowReturn gst_webp_enc_handle_frame (GstVideoEncoder * encoder,
     GstVideoCodecFrame * frame);
 static gboolean gst_webp_enc_propose_allocation (GstVideoEncoder * encoder,
     GstQuery * query);
+static GstFlowReturn gst_webp_enc_finish (GstVideoEncoder * encoder);
 
 static GstStaticPadTemplate webp_enc_sink_factory =
 GST_STATIC_PAD_TEMPLATE ("sink",
@@ -134,6 +140,7 @@
       "Sreerenj Balachandran <sreerenjb@gnome.org>");
 
   venc_class->start = gst_webp_enc_start;
+  venc_class->finish = gst_webp_enc_finish;
   venc_class->stop = gst_webp_enc_stop;
   venc_class->set_format = gst_webp_enc_set_format;
   venc_class->handle_frame = gst_webp_enc_handle_frame;
@@ -157,6 +164,47 @@
           GST_WEBP_ENC_PRESET_TYPE, DEFAULT_PRESET,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstWebpEnc:animated:
+   *
+   * Encode an animated webp, instead of several pictures.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_ANIMATED,
+      g_param_spec_boolean ("animated", "Animated",
+          "Encode an animated webp, instead of several pictures",
+          DEFAULT_ANIMATED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstWebpEnc:animation-loops:
+   *
+   * The number of animation loops for the animated mode.
+   * If set to 0, the animation will loop forever.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_ANIMATION_LOOPS,
+      g_param_spec_uint ("animation-loops", "Animation Loops",
+          "The number of animation loops for the animated mode. "
+          "If set to 0, the animation will loop forever.", 0, G_MAXUINT,
+          DEFAULT_ANIMATION_LOOPS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstWebpEnc:animation-background-color:
+   *
+   * The animation background color in ARGB order (1 byte per component).
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class,
+      PROP_ANIMATION_BACKGROUND_COLOR,
+      g_param_spec_uint ("animation-background-color",
+          "Animation Background Color",
+          "The animation background color in ARGB order (1 byte per component).",
+          0, G_MAXUINT32, DEFAULT_ANIMATION_BACKGROUND_COLOR,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
   GST_DEBUG_CATEGORY_INIT (webpenc_debug, "webpenc", 0,
       "WEBP encoding element");
 
@@ -172,6 +220,9 @@
   webpenc->quality = DEFAULT_QUALITY;
   webpenc->speed = DEFAULT_SPEED;
   webpenc->preset = DEFAULT_PRESET;
+  webpenc->animated = DEFAULT_ANIMATED;
+  webpenc->animation_loops = DEFAULT_ANIMATION_LOOPS;
+  webpenc->animation_background_color = DEFAULT_ANIMATION_BACKGROUND_COLOR;
 
   webpenc->use_argb = FALSE;
   webpenc->rgb_format = GST_VIDEO_FORMAT_UNKNOWN;
@@ -182,11 +233,10 @@
 {
   GstWebpEnc *enc = GST_WEBP_ENC (encoder);
   GstVideoCodecState *output_state;
-  GstVideoInfo *info;
-  GstVideoFormat format;
-
-  info = &state->info;
-  format = GST_VIDEO_INFO_FORMAT (info);
+  GstVideoInfo *info = &state->info;
+  GstVideoFormat format = GST_VIDEO_INFO_FORMAT (info);
+  gint width = GST_VIDEO_INFO_WIDTH (info);
+  gint height = GST_VIDEO_INFO_HEIGHT (info);
 
   if (GST_VIDEO_INFO_IS_YUV (info)) {
     switch (format) {
@@ -195,17 +245,30 @@
         enc->webp_color_space = WEBP_YUV420;
         break;
       default:
-        break;
+        GST_ERROR_OBJECT (enc, "Invalid color format");
+        return FALSE;
     }
+  } else if (GST_VIDEO_INFO_IS_RGB (info)) {
+    enc->rgb_format = format;
+    enc->use_argb = 1;
   } else {
-    if (GST_VIDEO_INFO_IS_RGB (info)) {
-      enc->rgb_format = format;
-      enc->use_argb = 1;
-    }
+    GST_ERROR_OBJECT (enc, "Invalid color format");
+    return FALSE;
   }
 
-  if (enc->input_state)
+  if (enc->input_state) {
+    if (enc->anim_enc) {
+      gint prev_width = GST_VIDEO_INFO_WIDTH (&enc->input_state->info);
+      gint prev_height = GST_VIDEO_INFO_HEIGHT (&enc->input_state->info);
+
+      if (prev_width != width || prev_height != height) {
+        GST_ERROR_OBJECT (enc, "Image size is changing in animation mode");
+        return FALSE;
+      }
+    }
+
     gst_video_codec_state_unref (enc->input_state);
+  }
   enc->input_state = gst_video_codec_state_ref (state);
 
   output_state =
@@ -213,20 +276,34 @@
       gst_caps_new_empty_simple ("image/webp"), enc->input_state);
   gst_video_codec_state_unref (output_state);
 
+  if (enc->animated && !enc->anim_enc) {
+    WebPAnimEncoderOptions enc_options = { 0 };
+    if (!WebPAnimEncoderOptionsInit (&enc_options)) {
+      GST_ERROR_OBJECT (enc, "Failed to initialize animation encoder options");
+      return FALSE;
+    }
+
+    enc_options.anim_params.bgcolor = enc->animation_background_color;
+    enc_options.anim_params.loop_count = enc->animation_loops;
+
+    enc->anim_enc = WebPAnimEncoderNew (width, height, &enc_options);
+    if (!enc->anim_enc) {
+      GST_ERROR_OBJECT (enc, "Failed to create the animation encoder");
+      return FALSE;
+    }
+  }
+
   return TRUE;
 }
 
 static gboolean
-gst_webp_set_picture_params (GstWebpEnc * enc)
+gst_webp_enc_init_picture (GstWebpEnc * enc)
 {
-  GstVideoInfo *info;
-  gboolean ret = TRUE;
-
-  info = &enc->input_state->info;
+  GstVideoInfo *info = &enc->input_state->info;
 
   if (!WebPPictureInit (&enc->webp_picture)) {
-    ret = FALSE;
-    goto failed_pic_init;
+    GST_ERROR_OBJECT (enc, "Failed to Initialize WebPPicture !");
+    return FALSE;
   }
 
   enc->webp_picture.use_argb = enc->use_argb;
@@ -240,13 +317,14 @@
   enc->webp_picture.writer = WebPMemoryWrite;
   enc->webp_picture.custom_ptr = &enc->webp_writer;
 
-  return ret;
+  return TRUE;
+}
 
-failed_pic_init:
-  {
-    GST_ERROR_OBJECT (enc, "Failed to Initialize WebPPicture !");
-    return ret;
-  }
+static void
+gst_webp_enc_clear_picture (GstWebpEnc * enc)
+{
+  WebPMemoryWriterClear (&enc->webp_writer);
+  WebPPictureFree (&enc->webp_picture);
 }
 
 static GstFlowReturn
@@ -254,16 +332,18 @@
     GstVideoCodecFrame * frame)
 {
   GstWebpEnc *enc = GST_WEBP_ENC (encoder);
-  GstBuffer *out_buffer = NULL;
   GstVideoFrame vframe;
 
   GST_LOG_OBJECT (enc, "got new frame");
 
-  gst_webp_set_picture_params (enc);
+  if (!gst_webp_enc_init_picture (enc))
+    return GST_FLOW_ERROR;
 
   if (!gst_video_frame_map (&vframe, &enc->input_state->info,
-          frame->input_buffer, GST_MAP_READ))
+          frame->input_buffer, GST_MAP_READ)) {
+    gst_webp_enc_clear_picture (enc);
     return GST_FLOW_ERROR;
+  }
 
   if (!enc->use_argb) {
     enc->webp_picture.y = GST_VIDEO_FRAME_COMP_DATA (&vframe, 0);
@@ -290,27 +370,45 @@
     }
   }
 
-  if (WebPEncode (&enc->webp_config, &enc->webp_picture)) {
-    WebPPictureFree (&enc->webp_picture);
+  if (enc->anim_enc) {
+    /* Webp timestamps are in milliseconds */
+    int timestamp = frame->pts / 1000000;
+    enc->next_timestamp = (frame->pts + frame->duration) / 1000000;
+
+    if (!WebPAnimEncoderAdd (enc->anim_enc, &enc->webp_picture,
+            timestamp, &enc->webp_config)) {
+      GST_ERROR_OBJECT (enc, "Failed to add WebPPicture: %d (%s)",
+          enc->webp_picture.error_code,
+          WebPAnimEncoderGetError (enc->anim_enc));
+      goto error;
+    }
+  } else {
+    GstBuffer *out_buffer;
+
+    if (!WebPEncode (&enc->webp_config, &enc->webp_picture)) {
+      GST_ERROR_OBJECT (enc, "Failed to encode WebPPicture");
+      goto error;
+    }
 
     out_buffer = gst_buffer_new_allocate (NULL, enc->webp_writer.size, NULL);
     if (!out_buffer) {
       GST_ERROR_OBJECT (enc, "Failed to create output buffer");
-      gst_video_frame_unmap (&vframe);
-      return GST_FLOW_ERROR;
+      goto error;
     }
+
     gst_buffer_fill (out_buffer, 0, enc->webp_writer.mem,
         enc->webp_writer.size);
-    free (enc->webp_writer.mem);
-  } else {
-    GST_ERROR_OBJECT (enc, "Failed to encode WebPPicture");
-    gst_video_frame_unmap (&vframe);
-    return GST_FLOW_ERROR;
+    frame->output_buffer = out_buffer;
   }
 
   gst_video_frame_unmap (&vframe);
-  frame->output_buffer = out_buffer;
+  gst_webp_enc_clear_picture (enc);
   return gst_video_encoder_finish_frame (encoder, frame);
+
+error:
+  gst_video_frame_unmap (&vframe);
+  gst_webp_enc_clear_picture (enc);
+  return GST_FLOW_ERROR;
 }
 
 static gboolean
@@ -341,11 +439,19 @@
     case PROP_PRESET:
       webpenc->preset = g_value_get_enum (value);
       break;
+    case PROP_ANIMATED:
+      webpenc->animated = g_value_get_boolean (value);
+      break;
+    case PROP_ANIMATION_LOOPS:
+      webpenc->animation_loops = g_value_get_uint (value);
+      break;
+    case PROP_ANIMATION_BACKGROUND_COLOR:
+      webpenc->animation_background_color = g_value_get_uint (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
-
 }
 
 static void
@@ -367,6 +473,15 @@
     case PROP_PRESET:
       g_value_set_enum (value, webpenc->preset);
       break;
+    case PROP_ANIMATED:
+      g_value_set_boolean (value, webpenc->animated);
+      break;
+    case PROP_ANIMATION_LOOPS:
+      g_value_set_uint (value, webpenc->animation_loops);
+      break;
+    case PROP_ANIMATION_BACKGROUND_COLOR:
+      g_value_set_uint (value, webpenc->animation_background_color);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -374,9 +489,9 @@
 }
 
 static gboolean
-gst_webp_enc_start (GstVideoEncoder * benc)
+gst_webp_enc_start (GstVideoEncoder * encoder)
 {
-  GstWebpEnc *enc = (GstWebpEnc *) benc;
+  GstWebpEnc *enc = (GstWebpEnc *) encoder;
 
   if (!WebPConfigPreset (&enc->webp_config, enc->preset, enc->quality)) {
     GST_ERROR_OBJECT (enc, "Failed to Initialize WebPConfig ");
@@ -389,14 +504,61 @@
     GST_ERROR_OBJECT (enc, "Failed to Validate the WebPConfig");
     return FALSE;
   }
+
+  enc->next_timestamp = 0;
+
   return TRUE;
 }
 
+static GstFlowReturn
+gst_webp_enc_finish (GstVideoEncoder * encoder)
+{
+  GstWebpEnc *enc = GST_WEBP_ENC (encoder);
+  WebPData data = { 0 };
+  GstBuffer *out;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  if (!enc->anim_enc)
+    return ret;
+
+  if (!WebPAnimEncoderAdd (enc->anim_enc, NULL, enc->next_timestamp,
+          &enc->webp_config)) {
+    GST_ERROR_OBJECT (enc, "Failed to flush animation encoder");
+    ret = GST_FLOW_ERROR;
+    goto done;
+  }
+
+  if (!WebPAnimEncoderAssemble (enc->anim_enc, &data)) {
+    GST_ERROR_OBJECT (enc, "Failed to assemble output animation");
+    ret = GST_FLOW_ERROR;
+    goto done;
+  }
+
+  out = gst_buffer_new_allocate (NULL, data.size, NULL);
+  gst_buffer_fill (out, 0, data.bytes, data.size);
+  WebPDataClear (&data);
+  ret = gst_pad_push (encoder->srcpad, out);
+
+done:
+  WebPAnimEncoderDelete (enc->anim_enc);
+  enc->anim_enc = NULL;
+
+  return ret;
+}
+
 static gboolean
-gst_webp_enc_stop (GstVideoEncoder * benc)
+gst_webp_enc_stop (GstVideoEncoder * encoder)
 {
-  GstWebpEnc *enc = GST_WEBP_ENC (benc);
-  if (enc->input_state)
+  GstWebpEnc *enc = GST_WEBP_ENC (encoder);
+  if (enc->input_state) {
     gst_video_codec_state_unref (enc->input_state);
+    enc->input_state = NULL;
+  }
+
+  if (enc->anim_enc) {
+    WebPAnimEncoderDelete (enc->anim_enc);
+    enc->anim_enc = NULL;
+  }
+
   return TRUE;
 }

gst-plugins-bad-1.22.7.tar.xz/ext/webp/gstwebpenc.h -> gst-plugins-bad-1.24.5.tar.xz/ext/webp/gstwebpenc.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/webp/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/webp/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/ext/webrtc/gstwebrtcbin.c -> gst-plugins-bad-1.24.5.tar.xz/ext/webrtc/gstwebrtcbin.c Changed

@@ -70,6 +70,10 @@
 #define RTPHDREXT_STREAM_ID GST_RTP_HDREXT_BASE "sdes:rtp-stream-id"
 #define RTPHDREXT_REPAIRED_STREAM_ID GST_RTP_HDREXT_BASE "sdes:repaired-rtp-stream-id"
 
+#if !GLIB_CHECK_VERSION(2, 74, 0)
+#define G_CONNECT_DEFAULT 0
+#endif
+
 /**
  * SECTION: element-webrtcbin
  * title: webrtcbin
@@ -650,6 +654,7 @@
   ON_DATA_CHANNEL_SIGNAL,
   PREPARE_DATA_CHANNEL_SIGNAL,
   REQUEST_AUX_SENDER,
+  ADD_ICE_CANDIDATE_FULL_SIGNAL,
   LAST_SIGNAL,
 };
 
@@ -820,6 +825,30 @@
   return stream;
 }
 
+static gboolean
+match_stream_for_ice_transport (TransportStream * trans,
+    GstWebRTCICETransport * transport)
+{
+  return trans->transport && trans->transport->transport == transport;
+}
+
+static TransportStream *
+_find_transport_for_ice_transport (GstWebRTCBin * webrtc,
+    GstWebRTCICETransport * transport)
+{
+  TransportStream *stream;
+
+  stream = _find_transport (webrtc, transport,
+      (FindTransportFunc) match_stream_for_ice_transport);
+
+  GST_TRACE_OBJECT (webrtc,
+      "Found transport %" GST_PTR_FORMAT " for ice transport %" GST_PTR_FORMAT,
+      stream, transport);
+
+  return stream;
+}
+
+
 typedef gboolean (*FindPadFunc) (GstWebRTCBinPad * p1, gconstpointer data);
 
 static GstWebRTCBinPad *
@@ -1081,10 +1110,9 @@
   g_main_context_invoke (webrtc->priv->main_context,
       (GSourceFunc) _unlock_pc_thread, PC_GET_LOCK (webrtc));
 
-  /* Having the thread be the thread default GMainContext will break the
-   * required queue-like ordering (from W3's peerconnection spec) of re-entrant
-   * tasks */
+  g_main_context_push_thread_default (webrtc->priv->main_context);
   g_main_loop_run (webrtc->priv->loop);
+  g_main_context_pop_thread_default (webrtc->priv->main_context);
 
   GST_OBJECT_LOCK (webrtc);
   g_main_context_unref (webrtc->priv->main_context);
@@ -1227,6 +1255,20 @@
   return TRUE;
 }
 
+void
+gst_webrtc_bin_get_peer_connection_stats (GstWebRTCBin * webrtc,
+    guint * data_channels_opened, guint * data_channels_closed)
+{
+  DC_LOCK (webrtc);
+  if (data_channels_opened) {
+    *data_channels_opened = webrtc->priv->data_channels_opened;
+  }
+  if (data_channels_closed) {
+    *data_channels_closed = webrtc->priv->data_channels_closed;
+  }
+  DC_UNLOCK (webrtc);
+}
+
 /* https://www.w3.org/TR/webrtc/#dom-rtciceconnectionstate */
 static GstWebRTCICEConnectionState
 _collate_ice_connection_states (GstWebRTCBin * webrtc)
@@ -1600,13 +1642,6 @@
   return NULL;
 }
 
-static void
-_update_ice_gathering_state (GstWebRTCBin * webrtc)
-{
-  gst_webrtc_bin_enqueue_task (webrtc, _update_ice_gathering_state_task, NULL,
-      NULL, NULL);
-}
-
 static GstStructure *
 _update_ice_connection_state_task (GstWebRTCBin * webrtc, gpointer data)
 {
@@ -2116,10 +2151,26 @@
 }
 
 static void
+_on_local_ice_candidate_cb (GstWebRTCICE * ice, guint session_id,
+    gchar * candidate, GstWebRTCBin * webrtc);
+
+static void
 _on_ice_transport_notify_gathering_state (GstWebRTCICETransport * transport,
     GParamSpec * pspec, GstWebRTCBin * webrtc)
 {
-  _update_ice_gathering_state (webrtc);
+  GstWebRTCICEGatheringState ice_state;
+
+  g_object_get (transport, "gathering-state", &ice_state, NULL);
+  if (ice_state == GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE) {
+    TransportStream *stream =
+        _find_transport_for_ice_transport (webrtc, transport);
+    /* signal end-of-candidates */
+    _on_local_ice_candidate_cb (webrtc->priv->ice, stream->session_id,
+        (char *) "", webrtc);
+  }
+
+  gst_webrtc_bin_enqueue_task (webrtc, _update_ice_gathering_state_task, NULL,
+      NULL, NULL);
 }
 
 static void
@@ -2386,6 +2437,15 @@
   gst_webrtc_bin_update_sctp_priority (webrtc);
 }
 
+static void
+on_transceiver_notify_direction (GstWebRTCRTPTransceiver * transceiver,
+    GParamSpec * pspec, GstWebRTCBin * webrtc)
+{
+  PC_LOCK (webrtc);
+  _update_need_negotiation (webrtc);
+  PC_UNLOCK (webrtc);
+}
+
 static WebRTCTransceiver *
 _create_webrtc_transceiver (GstWebRTCBin * webrtc,
     GstWebRTCRTPTransceiverDirection direction, guint mline, GstWebRTCKind kind,
@@ -2415,15 +2475,14 @@
 
   g_signal_connect_object (sender, "notify::priority",
       G_CALLBACK (gst_webrtc_bin_attach_tos), webrtc, G_CONNECT_SWAPPED);
+  g_signal_connect_object (trans, "notify::direction",
+      G_CALLBACK (on_transceiver_notify_direction), webrtc, G_CONNECT_DEFAULT);
 
   g_ptr_array_add (webrtc->priv->transceivers, trans);
 
   gst_object_unref (sender);
   gst_object_unref (receiver);
 
-  g_signal_emit (webrtc, gst_webrtc_bin_signalsON_NEW_TRANSCEIVER_SIGNAL,
-      0, trans);
-
   return trans;
 }
 
@@ -2507,6 +2566,7 @@
     }
 
     g_ptr_array_add (webrtc->priv->data_channels, gst_object_ref (channel));
+    webrtc->priv->data_channels_opened++;
     DC_UNLOCK (webrtc);
 
     gst_webrtc_bin_update_sctp_priority (webrtc);
@@ -2514,14 +2574,19 @@
     g_signal_emit (webrtc, gst_webrtc_bin_signalsON_DATA_CHANNEL_SIGNAL, 0,
         channel);
   } else if (ready_state == GST_WEBRTC_DATA_CHANNEL_STATE_CLOSED) {
+    gboolean found_pending;
     gboolean found;
 
     DC_LOCK (webrtc);
-    found = g_ptr_array_remove (webrtc->priv->pending_data_channels, channel)
+    found_pending =
+        g_ptr_array_remove (webrtc->priv->pending_data_channels, channel);
+    found = found_pending
         || g_ptr_array_remove (webrtc->priv->data_channels, channel);
 
     if (found == FALSE) {
       GST_FIXME_OBJECT (webrtc, "Received close for unknown data channel");
+    } else if (found_pending == FALSE) {
+      webrtc->priv->data_channels_closed++;
     }
     DC_UNLOCK (webrtc);
   }
@@ -4476,6 +4541,8 @@
       gst_sdp_media_set_proto (media, "UDP/TLS/RTP/SAVPF");
       offer_caps = _rtp_caps_from_media (offer_media);
 
+      _remove_optional_offer_fields (offer_caps);
+
       if (last_answer && i < gst_sdp_message_medias_len (last_answer)
           && (rtp_trans = _find_transceiver_for_mid (webrtc, mid))) {
         const GstSDPMedia *last_media =
@@ -4586,6 +4653,11 @@
         trans = _create_webrtc_transceiver (webrtc, answer_dir, i, kind, NULL);
         rtp_trans = GST_WEBRTC_RTP_TRANSCEIVER (trans);
 
+        PC_UNLOCK (webrtc);
+        g_signal_emit (webrtc,
+            gst_webrtc_bin_signalsON_NEW_TRANSCEIVER_SIGNAL, 0, rtp_trans);
+        PC_LOCK (webrtc);
+
         GST_LOG_OBJECT (webrtc, "Created new transceiver %" GST_PTR_FORMAT
             " for mline %u with media kind %d", trans, i, kind);
 
@@ -5302,12 +5374,15 @@
 {
   guint mlineindex;
   gchar *candidate;
+  GstPromise *promise;
 } IceCandidateItem;
 
 static void
 _clear_ice_candidate_item (IceCandidateItem * item)
 {
   g_free (item->candidate);
+  if (item->promise)
+    gst_promise_unref (item->promise);
 }
 
 static void
@@ -5319,12 +5394,23 @@
   stream = _find_ice_stream_for_session (webrtc, item->mlineindex);
   if (stream == NULL) {
     if (drop_invalid) {
-      GST_WARNING_OBJECT (webrtc, "Unknown mline %u, dropping",
-          item->mlineindex);
+      if (item->promise) {
+        GError *error =
+            g_error_new (GST_WEBRTC_ERROR, GST_WEBRTC_ERROR_INTERNAL_FAILURE,
+            "Unknown mline %u, dropping", item->mlineindex);
+        GstStructure *s = gst_structure_new ("application/x-gst-promise",
+            "error", G_TYPE_ERROR, error, NULL);
+        gst_promise_reply (item->promise, s);
+        g_clear_error (&error);
+      } else {
+        GST_WARNING_OBJECT (webrtc, "Unknown mline %u, dropping",
+            item->mlineindex);
+      }
     } else {
       IceCandidateItem new;
       new.mlineindex = item->mlineindex;
       new.candidate = g_strdup (item->candidate);
+      new.promise = NULL;
       GST_INFO_OBJECT (webrtc, "Unknown mline %u, deferring", item->mlineindex);
 
       ICE_LOCK (webrtc);
@@ -5337,7 +5423,8 @@
   GST_LOG_OBJECT (webrtc, "adding ICE candidate with mline:%u, %s",
       item->mlineindex, item->candidate);
 
-  gst_webrtc_ice_add_candidate (webrtc->priv->ice, stream, item->candidate);
+  gst_webrtc_ice_add_candidate (webrtc->priv->ice, stream, item->candidate,
+      item->promise);
 }
 
 static void
@@ -5363,7 +5450,7 @@
       candidate = g_strdup_printf ("a=candidate:%s", attr->value);
       GST_LOG_OBJECT (webrtc, "adding ICE candidate with mline:%u, %s",
           mlineindex, candidate);
-      gst_webrtc_ice_add_candidate (webrtc->priv->ice, stream, candidate);
+      gst_webrtc_ice_add_candidate (webrtc->priv->ice, stream, candidate, NULL);
       g_free (candidate);
     }
   }
@@ -5395,6 +5482,24 @@
   gst_sdp_media_add_attribute (media, "candidate", candidate + 10);
 }
 
+static void
+_add_end_of_candidate_to_sdp (GstWebRTCBin * webrtc,
+    GstSDPMessage * sdp, gint mline_index)
+{
+  GstSDPMedia *media = NULL;
+
+  if (mline_index < sdp->medias->len) {
+    media = &g_array_index (sdp->medias, GstSDPMedia, mline_index);
+  }
+
+  if (media == NULL) {
+    GST_WARNING_OBJECT (webrtc, "Couldn't find mline %d to merge ICE candidate",
+        mline_index);
+    return;
+  }
+  gst_sdp_media_add_attribute (media, "end-of-candidates", "");
+}
+
 static gboolean
 _filter_sdp_fields (GQuark field_id, const GValue * value,
     GstStructure * new_structure)
@@ -5632,7 +5737,15 @@
     GstWebRTCDTLSSetup local_setup, remote_setup;
 
     local_setup = _get_dtls_setup_from_media (local_media);
+    if (local_setup == GST_WEBRTC_DTLS_SETUP_NONE)
+      local_setup =
+          _get_dtls_setup_from_session (webrtc->current_local_description->sdp);
+
     remote_setup = _get_dtls_setup_from_media (remote_media);
+    if (remote_setup == GST_WEBRTC_DTLS_SETUP_NONE)
+      remote_setup =
+          _get_dtls_setup_from_session (webrtc->
+          current_remote_description->sdp);
     new_setup = _get_final_setup (local_setup, remote_setup);
     if (new_setup == GST_WEBRTC_DTLS_SETUP_NONE) {
       g_set_error (error, GST_WEBRTC_ERROR, GST_WEBRTC_ERROR_SDP_SYNTAX_ERROR,
@@ -5648,7 +5761,7 @@
           "Cannot intersect dtls setup attributes for media %u", media_idx);
       return;
     }
-
+#if 0
     if (prev_dir != GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_NONE
         && new_dir != GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_INACTIVE
         && prev_dir != new_dir) {
@@ -5658,7 +5771,7 @@
           media_idx);
       return;
     }
-
+#endif
     if (!bundled || bundle_idx == media_idx) {
       new_rtcp_rsize = _media_has_attribute_key (local_media, "rtcp-rsize")
           && _media_has_attribute_key (remote_media, "rtcp-rsize");
@@ -6116,6 +6229,10 @@
               _get_direction_from_media (media), i, kind, NULL);
           webrtc_transceiver_set_transport (t, stream);
           trans = GST_WEBRTC_RTP_TRANSCEIVER (t);
+          PC_UNLOCK (webrtc);
+          g_signal_emit (webrtc,
+              gst_webrtc_bin_signalsON_NEW_TRANSCEIVER_SIGNAL, 0, trans);
+          PC_LOCK (webrtc);
         }
 
         _update_transceiver_from_sdp_media (webrtc, sdp->sdp, i, stream,
@@ -6284,6 +6401,7 @@
 static GstStructure *
 _set_description_task (GstWebRTCBin * webrtc, struct set_description *sd)
 {
+  GstWebRTCSignalingState old_signaling_state = webrtc->signaling_state;
   GstWebRTCSignalingState new_signaling_state = webrtc->signaling_state;
   gboolean signalling_state_changed = FALSE;
   GError *error = NULL;
@@ -6638,7 +6756,7 @@
    */
   if (signalling_state_changed) {
     const gchar *from = _enum_value_to_string (GST_TYPE_WEBRTC_SIGNALING_STATE,
-        webrtc->signaling_state);
+        old_signaling_state);
     const gchar *to = _enum_value_to_string (GST_TYPE_WEBRTC_SIGNALING_STATE,
         new_signaling_state);
     GST_TRACE_OBJECT (webrtc, "notify signaling-state from %s "
@@ -6767,6 +6885,7 @@
     IceCandidateItem new;
     new.mlineindex = item->mlineindex;
     new.candidate = g_steal_pointer (&item->candidate);
+    new.promise = NULL;
 
     ICE_LOCK (webrtc);
     g_array_append_val (webrtc->priv->pending_remote_ice_candidates, new);
@@ -6787,21 +6906,32 @@
 
 static void
 gst_webrtc_bin_add_ice_candidate (GstWebRTCBin * webrtc, guint mline,
-    const gchar * attr)
+    const gchar * attr, GstPromise * promise)
 {
   IceCandidateItem *item;
 
   item = g_new0 (IceCandidateItem, 1);
   item->mlineindex = mline;
+  item->promise = promise ? gst_promise_ref (promise) : NULL;
   if (attr && attr0 != 0) {
     if (!g_ascii_strncasecmp (attr, "a=candidate:", 12))
       item->candidate = g_strdup (attr);
     else if (!g_ascii_strncasecmp (attr, "candidate:", 10))
       item->candidate = g_strdup_printf ("a=%s", attr);
   }
-  gst_webrtc_bin_enqueue_task (webrtc,
-      (GstWebRTCBinFunc) _add_ice_candidate_task, item,
-      (GDestroyNotify) _free_ice_candidate_item, NULL);
+  if (!gst_webrtc_bin_enqueue_task (webrtc,
+          (GstWebRTCBinFunc) _add_ice_candidate_task, item,
+          (GDestroyNotify) _free_ice_candidate_item, promise)) {
+    GError *error =
+        g_error_new (GST_WEBRTC_ERROR, GST_WEBRTC_ERROR_INVALID_STATE,
+        "Could not add ICE candidate. webrtcbin is closed");
+    GstStructure *s = gst_structure_new ("application/x-gst-promise", "error",
+        G_TYPE_ERROR, error, NULL);
+
+    gst_promise_reply (promise, s);
+
+    g_clear_error (&error);
+  }
 }
 
 static GstStructure *
@@ -6832,7 +6962,7 @@
     IceCandidateItem *item = &g_array_index (items, IceCandidateItem, i);
     const gchar *cand = item->candidate;
 
-    if (!g_ascii_strncasecmp (cand, "a=candidate:", 12)) {
+    if (cand && !g_ascii_strncasecmp (cand, "a=candidate:", 12)) {
       /* stripping away "a=" */
       cand += 2;
     }
@@ -6847,12 +6977,24 @@
      * FIXME: This ICE candidate should be stored somewhere with
      * the associated mid and also merged back into any subsequent
      * local descriptions on renegotiation */
-    if (webrtc->current_local_description)
-      _add_ice_candidate_to_sdp (webrtc, webrtc->current_local_description->sdp,
-          item->mlineindex, cand);
-    if (webrtc->pending_local_description)
-      _add_ice_candidate_to_sdp (webrtc, webrtc->pending_local_description->sdp,
-          item->mlineindex, cand);
+    if (webrtc->current_local_description) {
+      if (cand && cand0 != '\0') {
+        _add_ice_candidate_to_sdp (webrtc,
+            webrtc->current_local_description->sdp, item->mlineindex, cand);
+      } else {
+        _add_end_of_candidate_to_sdp (webrtc,
+            webrtc->current_local_description->sdp, item->mlineindex);
+      }
+    }
+    if (webrtc->pending_local_description) {
+      if (cand && cand0 != '\0') {
+        _add_ice_candidate_to_sdp (webrtc,
+            webrtc->pending_local_description->sdp, item->mlineindex, cand);
+      } else {
+        _add_end_of_candidate_to_sdp (webrtc,
+            webrtc->pending_local_description->sdp, item->mlineindex);
+      }
+    }
 
     PC_UNLOCK (webrtc);
     g_signal_emit (webrtc, gst_webrtc_bin_signalsON_ICE_CANDIDATE_SIGNAL,
@@ -6874,6 +7016,7 @@
 
   item.mlineindex = session_id;
   item.candidate = g_strdup (candidate);
+  item.promise = NULL;
 
   ICE_LOCK (webrtc);
   g_array_append_val (webrtc->priv->pending_local_ice_candidates, item);
@@ -6966,6 +7109,9 @@
 
   PC_UNLOCK (webrtc);
 
+  g_signal_emit (webrtc, gst_webrtc_bin_signalsON_NEW_TRANSCEIVER_SIGNAL, 0,
+      trans);
+
   return gst_object_ref (trans);
 }
 
@@ -7172,6 +7318,7 @@
   ret = gst_object_ref (ret);
   webrtc_data_channel_set_webrtcbin (ret, webrtc);
   g_ptr_array_add (webrtc->priv->data_channels, ret);
+  webrtc->priv->data_channels_opened++;
   DC_UNLOCK (webrtc);
 
   gst_webrtc_bin_update_sctp_priority (webrtc);
@@ -7365,7 +7512,8 @@
     GstPad *sinkpad = gst_element_get_static_pad (aux_sender, "sink");
     GstPad *srcpad = gst_element_get_static_pad (aux_sender, "src");
 
-    gst_object_ref_sink (aux_sender);
+    if (g_object_is_floating (aux_sender))
+      aux_sender = gst_object_ref_sink (aux_sender);
 
     if (!sinkpad || !srcpad) {
       GST_ERROR_OBJECT (webrtc,
@@ -7727,6 +7875,7 @@
 {
   GstWebRTCRTPTransceiver *trans;
   gboolean do_nack;
+  GObjectClass *jb_class;
 
   if (item->media_idx == -1)
     return TRUE;
@@ -7737,13 +7886,23 @@
     return TRUE;
   }
 
+  jb_class = G_OBJECT_GET_CLASS (G_OBJECT (data->jitterbuffer));
   do_nack = WEBRTC_TRANSCEIVER (trans)->do_nack;
-  /* We don't set do-retransmission on rtpbin as we want per-session control */
-  GST_LOG_OBJECT (data->webrtc, "setting do-nack=%s for transceiver %"
-      GST_PTR_FORMAT " with transport %" GST_PTR_FORMAT
-      " rtp session %u ssrc %u", do_nack ? "true" : "false", trans,
-      data->stream, data->stream->session_id, data->ssrc);
-  g_object_set (data->jitterbuffer, "do-retransmission", do_nack, NULL);
+  if (g_object_class_find_property (jb_class, "do-retransmission")) {
+    /* We don't set do-retransmission on rtpbin as we want per-session control */
+    GST_LOG_OBJECT (data->webrtc, "setting do-nack=%s for transceiver %"
+        GST_PTR_FORMAT " with transport %" GST_PTR_FORMAT
+        " rtp session %u ssrc %u", do_nack ? "true" : "false", trans,
+        data->stream, data->stream->session_id, data->ssrc);
+    g_object_set (data->jitterbuffer, "do-retransmission", do_nack, NULL);
+  } else if (do_nack) {
+    GST_WARNING_OBJECT (data->webrtc, "Not setting do-nack for transceiver %"
+        GST_PTR_FORMAT " with transport %" GST_PTR_FORMAT
+        " rtp session %u ssrc %u"
+        " as its jitterbuffer does not have a do-retransmission property",
+        trans, data->stream, data->stream->session_id, data->ssrc);
+  }
+
 
   g_weak_ref_set (&item->rtpjitterbuffer, data->jitterbuffer);
 
@@ -7994,7 +8153,7 @@
     const gchar * name, const GstCaps * caps)
 {
   GstWebRTCBin *webrtc = GST_WEBRTC_BIN (element);
-  GstWebRTCRTPTransceiver *trans = NULL;
+  GstWebRTCRTPTransceiver *trans = NULL, *created_trans = NULL;
   GstWebRTCBinPad *pad = NULL;
   guint serial;
   gboolean lock_mline = FALSE;
@@ -8122,7 +8281,8 @@
   }
 
   if (!trans) {
-    trans = GST_WEBRTC_RTP_TRANSCEIVER (_create_webrtc_transceiver (webrtc,
+    trans = created_trans =
+        GST_WEBRTC_RTP_TRANSCEIVER (_create_webrtc_transceiver (webrtc,
             GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_SENDRECV, -1,
             webrtc_kind_from_caps (caps), NULL));
     GST_LOG_OBJECT (webrtc, "Created new transceiver %" GST_PTR_FORMAT, trans);
@@ -8162,6 +8322,10 @@
 
   PC_UNLOCK (webrtc);
 
+  if (created_trans)
+    g_signal_emit (webrtc, gst_webrtc_bin_signalsON_NEW_TRANSCEIVER_SIGNAL,
+        0, created_trans);
+
   _add_pad (webrtc, pad);
 
   return GST_PAD (pad);
@@ -8633,7 +8797,7 @@
    * GstWebRTCBin:http-proxy:
    *
    * A HTTP proxy for use with TURN/TCP of the form
-   * http://username:password@hostname:port
+   * http://username:password@hostname:port?alpn=<alpn>
    *
    * Since: 1.22
    */
@@ -8641,7 +8805,7 @@
       PROP_HTTP_PROXY,
       g_param_spec_string ("http-proxy", "HTTP Proxy",
           "A HTTP proxy for use with TURN/TCP of the form "
-          "http://username:password@hostname:port",
+          "http://username:password@hostname:port?alpn=<alpn>",
           NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   /**
@@ -8720,6 +8884,26 @@
       G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
 
   /**
+   * GstWebRTCBin::add-ice-candidate-full:
+   * @object: the #webrtcbin
+   * @mline_index: the index of the media description in the SDP
+   * @ice-candidate: an ice candidate or NULL/"" to mark that no more candidates
+   * will arrive
+   * @promise: (nullable): a #GstPromise to be notified when the task is
+   * complete
+   *
+   * Variant of the `add-ice-candidate` signal, allowing the call site to be
+   * notified using a #GstPromise when the task has completed.
+   *
+   * Since: 1.24
+   */
+  gst_webrtc_bin_signalsADD_ICE_CANDIDATE_FULL_SIGNAL =
+      g_signal_new_class_handler ("add-ice-candidate-full",
+      G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+      G_CALLBACK (gst_webrtc_bin_add_ice_candidate), NULL, NULL, NULL,
+      G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, GST_TYPE_PROMISE);
+
+  /**
    * GstWebRTCBin::get-stats:
    * @object: the #webrtcbin
    * @pad: (nullable): A #GstPad to get the stats for, or %NULL for all
@@ -8797,6 +8981,11 @@
    *  "local-id"            G_TYPE_STRING               identifier for the associated RTCInboundRTPSTreamStats
    *  "remote-timestamp"    G_TYPE_DOUBLE               remote timestamp the statistics were sent by the remote
    *
+   * RTCPeerConnectionStats supported fields (https://w3c.github.io/webrtc-stats/#pcstats-dict*) (Since: 1.24)
+   *
+   *  "data-channels-opened"  G_TYPE_UINT               number of unique data channels that have entered the 'open' state
+   *  "data-channels-closed"  G_TYPE_UINT               number of unique data channels that have left the 'open' state
+   *
    * RTCIceCandidateStats supported fields (https://www.w3.org/TR/webrtc-stats/#icecandidate-dict*) (Since: 1.22)
    *
    *  "transport-id"         G_TYPE_STRING              identifier for the associated RTCTransportStats for this stream
@@ -8895,7 +9084,7 @@
    * GstWebRTCBin::add-transceiver:
    * @object: the #webrtcbin
    * @direction: the direction of the new transceiver
-   * @caps: (allow none): the codec preferences for this transceiver
+   * @caps: (nullable): the codec preferences for this transceiver
    *
    * Returns: the new #GstWebRTCRTPTransceiver
    */

gst-plugins-bad-1.22.7.tar.xz/ext/webrtc/gstwebrtcbin.h -> gst-plugins-bad-1.24.5.tar.xz/ext/webrtc/gstwebrtcbin.h Changed

@@ -108,11 +108,15 @@
   gboolean bundle;
   GPtrArray *transceivers;
   GPtrArray *transports;
+  /* stats according to https://www.w3.org/TR/webrtc-stats/#dictionary-rtcpeerconnectionstats-members */
+  guint data_channels_opened;
+  guint data_channels_closed;
   GPtrArray *data_channels;
   /* list of data channels we've received a sctp stream for but no data
    * channel protocol for */
   GPtrArray *pending_data_channels;
-  /* dc_lock protects data_channels and pending_data_channels */
+  /* dc_lock protects data_channels and pending_data_channels
+   * and data_channels_opened and data_channels_closed */
   /* lock ordering is pc_lock first, then dc_lock */
   GMutex dc_lock;
 
@@ -172,6 +176,10 @@
                                                          GDestroyNotify notify,
                                                          GstPromise *promise);
 
+void            gst_webrtc_bin_get_peer_connection_stats(GstWebRTCBin * pc,
+                                                         guint * data_channels_opened,
+                                                         guint * data_channels_closed);
+
 G_END_DECLS
 
 #endif /* __GST_WEBRTC_BIN_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/webrtc/gstwebrtcstats.c -> gst-plugins-bad-1.24.5.tar.xz/ext/webrtc/gstwebrtcstats.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/webrtc/utils.c -> gst-plugins-bad-1.24.5.tar.xz/ext/webrtc/utils.c Changed

gst-plugins-bad-1.22.7.tar.xz/ext/webrtc/utils.h -> gst-plugins-bad-1.24.5.tar.xz/ext/webrtc/utils.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/webrtc/webrtcsdp.c -> gst-plugins-bad-1.24.5.tar.xz/ext/webrtc/webrtcsdp.c Changed

@@ -101,7 +101,7 @@
 _check_sdp_crypto (SDPSource source, GstWebRTCSessionDescription * sdp,
     GError ** error)
 {
-  const gchar *message_fingerprint, *fingerprint;
+  const gchar *message_fingerprint;
   const GstSDPKey *key;
   int i;
 
@@ -112,12 +112,18 @@
     return FALSE;
   }
 
-  message_fingerprint = fingerprint =
+  message_fingerprint =
       gst_sdp_message_get_attribute_val (sdp->sdp, "fingerprint");
   for (i = 0; i < gst_sdp_message_medias_len (sdp->sdp); i++) {
     const GstSDPMedia *media = gst_sdp_message_get_media (sdp->sdp, i);
     const gchar *media_fingerprint =
         gst_sdp_media_get_attribute_val (media, "fingerprint");
+    GstWebRTCRTPTransceiverDirection direction =
+        _get_direction_from_media (media);
+
+    /* Skip inactive media */
+    if (direction == GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_INACTIVE)
+      continue;
 
     if (!IS_EMPTY_SDP_ATTRIBUTE (message_fingerprint)
         && !IS_EMPTY_SDP_ATTRIBUTE (media_fingerprint)) {
@@ -126,18 +132,6 @@
           "No fingerprint lines in sdp for media %u", i);
       return FALSE;
     }
-    if (IS_EMPTY_SDP_ATTRIBUTE (fingerprint)) {
-      fingerprint = media_fingerprint;
-    }
-    if (!IS_EMPTY_SDP_ATTRIBUTE (media_fingerprint)
-        && g_strcmp0 (fingerprint, media_fingerprint) != 0) {
-      g_set_error (error, GST_WEBRTC_ERROR,
-          GST_WEBRTC_ERROR_FINGERPRINT_FAILURE,
-          "Fingerprint in media %u differs from %s fingerprint. "
-          "\'%s\' != \'%s\'", i, message_fingerprint ? "global" : "previous",
-          fingerprint, media_fingerprint);
-      return FALSE;
-    }
   }
 
   return TRUE;
@@ -242,9 +236,20 @@
 }
 
 static gboolean
-_media_has_setup (const GstSDPMedia * media, guint media_idx, GError ** error)
+_validate_setup_attribute (const gchar * setup, GError ** error)
 {
   static const gchar *valid_setups = { "actpass", "active", "passive", NULL };
+  if (!g_strv_contains (valid_setups, setup)) {
+    g_set_error (error, GST_WEBRTC_ERROR, GST_WEBRTC_ERROR_SDP_SYNTAX_ERROR,
+        "SDP contains unknown \'setup\' attribute, \'%s\'", setup);
+    return FALSE;
+  }
+  return TRUE;
+}
+
+static gboolean
+_media_has_setup (const GstSDPMedia * media, guint media_idx, GError ** error)
+{
   const gchar *setup = gst_sdp_media_get_attribute_val (media, "setup");
   if (IS_EMPTY_SDP_ATTRIBUTE (setup)) {
     g_set_error (error, GST_WEBRTC_ERROR, GST_WEBRTC_ERROR_SDP_SYNTAX_ERROR,
@@ -252,13 +257,7 @@
         media_idx);
     return FALSE;
   }
-  if (!g_strv_contains (valid_setups, setup)) {
-    g_set_error (error, GST_WEBRTC_ERROR, GST_WEBRTC_ERROR_SDP_SYNTAX_ERROR,
-        "media %u contains unknown \'setup\' attribute, \'%s\'", media_idx,
-        setup);
-    return FALSE;
-  }
-  return TRUE;
+  return _validate_setup_attribute (setup, error);
 }
 
 #if 0
@@ -279,9 +278,11 @@
 validate_sdp (GstWebRTCSignalingState state, SDPSource source,
     GstWebRTCSessionDescription * sdp, GError ** error)
 {
-  const gchar *group, *bundle_ice_ufrag = NULL, *bundle_ice_pwd = NULL;
+  const gchar *group, *bundle_ice_ufrag = NULL, *bundle_ice_pwd = NULL, *setup =
+      NULL;
   gchar **group_members = NULL;
   gboolean is_bundle = FALSE;
+  gboolean has_session_setup = FALSE;
   int i;
 
   if (!_check_valid_state_for_sdp_change (state, source, sdp->type, error))
@@ -296,6 +297,13 @@
   if (is_bundle)
     group_members = g_strsplit (&group6, " ", -1);
 
+  setup = gst_sdp_message_get_attribute_val (sdp->sdp, "setup");
+  if (setup) {
+    if (!_validate_setup_attribute (setup, error))
+      return FALSE;
+    has_session_setup = TRUE;
+  }
+
   for (i = 0; i < gst_sdp_message_medias_len (sdp->sdp); i++) {
     const GstSDPMedia *media = gst_sdp_message_get_media (sdp->sdp, i);
     const gchar *mid;
@@ -316,7 +324,7 @@
           "media %u is missing or contains an empty \'ice-pwd\' attribute", i);
       goto fail;
     }
-    if (!_media_has_setup (media, i, error))
+    if (!has_session_setup && !_media_has_setup (media, i, error))
       goto fail;
     /* check parameters in bundle are the same */
     if (media_in_bundle) {
@@ -534,6 +542,26 @@
 }
 
 GstWebRTCDTLSSetup
+_get_dtls_setup_from_session (const GstSDPMessage * sdp)
+{
+  const gchar *attr = gst_sdp_message_get_attribute_val (sdp, "setup");
+  if (!attr) {
+    GST_LOG ("no setup attribute in session");
+    return SETUP (NONE);
+  }
+  if (g_strcmp0 (attr, "actpass") == 0) {
+    return SETUP (ACTPASS);
+  } else if (g_strcmp0 (attr, "active") == 0) {
+    return SETUP (ACTIVE);
+  } else if (g_strcmp0 (attr, "passive") == 0) {
+    return SETUP (PASSIVE);
+  }
+
+  GST_ERROR ("unknown setup value %s", attr);
+  return SETUP (NONE);
+}
+
+GstWebRTCDTLSSetup
 _intersect_dtls_setup (GstWebRTCDTLSSetup offer)
 {
   switch (offer) {

gst-plugins-bad-1.22.7.tar.xz/ext/webrtc/webrtcsdp.h -> gst-plugins-bad-1.24.5.tar.xz/ext/webrtc/webrtcsdp.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/webrtcdsp/gstwebrtcdsp.cpp -> gst-plugins-bad-1.24.5.tar.xz/ext/webrtcdsp/gstwebrtcdsp.cpp Changed

@@ -71,9 +71,7 @@
 #include "gstwebrtcdsp.h"
 #include "gstwebrtcechoprobe.h"
 
-#include <webrtc/modules/audio_processing/include/audio_processing.h>
-#include <webrtc/modules/interface/module_common_types.h>
-#include <webrtc/system_wrappers/include/trace.h>
+#include <modules/audio_processing/include/audio_processing.h>
 
 GST_DEBUG_CATEGORY (webrtc_dsp_debug);
 #define GST_CAT_DEFAULT (webrtc_dsp_debug)
@@ -82,10 +80,9 @@
 #define DEFAULT_COMPRESSION_GAIN_DB 9
 #define DEFAULT_STARTUP_MIN_VOLUME 12
 #define DEFAULT_LIMITER TRUE
-#define DEFAULT_GAIN_CONTROL_MODE webrtc::GainControl::kAdaptiveDigital
+#define DEFAULT_GAIN_CONTROL_MODE webrtc::AudioProcessing::Config::GainController1::Mode::kAdaptiveDigital
 #define DEFAULT_VOICE_DETECTION FALSE
 #define DEFAULT_VOICE_DETECTION_FRAME_SIZE_MS 10
-#define DEFAULT_VOICE_DETECTION_LIKELIHOOD webrtc::VoiceDetection::kLowLikelihood
 
 static GstStaticPadTemplate gst_webrtc_dsp_sink_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
@@ -119,7 +116,7 @@
         "channels = (int) 1, MAX")
     );
 
-typedef webrtc::EchoCancellation::SuppressionLevel GstWebrtcEchoSuppressionLevel;
+typedef int GstWebrtcEchoSuppressionLevel;
 #define GST_TYPE_WEBRTC_ECHO_SUPPRESSION_LEVEL \
     (gst_webrtc_echo_suppression_level_get_type ())
 static GType
@@ -127,10 +124,9 @@
 {
   static GType suppression_level_type = 0;
   static const GEnumValue level_types = {
-    {webrtc::EchoCancellation::kLowSuppression, "Low Suppression", "low"},
-    {webrtc::EchoCancellation::kModerateSuppression,
-      "Moderate Suppression", "moderate"},
-    {webrtc::EchoCancellation::kHighSuppression, "high Suppression", "high"},
+    {1, "Low Suppression", "low"},
+    {2, "Moderate Suppression", "moderate"},
+    {3, "high Suppression", "high"},
     {0, NULL, NULL}
   };
 
@@ -141,7 +137,7 @@
   return suppression_level_type;
 }
 
-typedef webrtc::NoiseSuppression::Level GstWebrtcNoiseSuppressionLevel;
+typedef webrtc::AudioProcessing::Config::NoiseSuppression::Level GstWebrtcNoiseSuppressionLevel;
 #define GST_TYPE_WEBRTC_NOISE_SUPPRESSION_LEVEL \
     (gst_webrtc_noise_suppression_level_get_type ())
 static GType
@@ -149,10 +145,10 @@
 {
   static GType suppression_level_type = 0;
   static const GEnumValue level_types = {
-    {webrtc::NoiseSuppression::kLow, "Low Suppression", "low"},
-    {webrtc::NoiseSuppression::kModerate, "Moderate Suppression", "moderate"},
-    {webrtc::NoiseSuppression::kHigh, "High Suppression", "high"},
-    {webrtc::NoiseSuppression::kVeryHigh, "Very High Suppression",
+    {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kLow, "Low Suppression", "low"},
+    {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kModerate, "Moderate Suppression", "moderate"},
+    {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kHigh, "High Suppression", "high"},
+    {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kVeryHigh, "Very High Suppression",
       "very-high"},
     {0, NULL, NULL}
   };
@@ -164,7 +160,7 @@
   return suppression_level_type;
 }
 
-typedef webrtc::GainControl::Mode GstWebrtcGainControlMode;
+typedef webrtc::AudioProcessing::Config::GainController1::Mode GstWebrtcGainControlMode;
 #define GST_TYPE_WEBRTC_GAIN_CONTROL_MODE \
     (gst_webrtc_gain_control_mode_get_type ())
 static GType
@@ -172,8 +168,9 @@
 {
   static GType gain_control_mode_type = 0;
   static const GEnumValue mode_types = {
-    {webrtc::GainControl::kAdaptiveDigital, "Adaptive Digital", "adaptive-digital"},
-    {webrtc::GainControl::kFixedDigital, "Fixed Digital", "fixed-digital"},
+    {webrtc::AudioProcessing::Config::GainController1::kAdaptiveDigital, "Adaptive Digital", "adaptive-digital"},
+    {webrtc::AudioProcessing::Config::GainController1::kFixedDigital, "Fixed Digital", "fixed-digital"},
+    {webrtc::AudioProcessing::Config::GainController1::kAdaptiveAnalog, "Adaptive Analog", "adaptive-analog"},
     {0, NULL, NULL}
   };
 
@@ -184,7 +181,7 @@
   return gain_control_mode_type;
 }
 
-typedef webrtc::VoiceDetection::Likelihood GstWebrtcVoiceDetectionLikelihood;
+typedef int GstWebrtcVoiceDetectionLikelihood;
 #define GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD \
     (gst_webrtc_voice_detection_likelihood_get_type ())
 static GType
@@ -192,10 +189,10 @@
 {
   static GType likelihood_type = 0;
   static const GEnumValue likelihood_types = {
-    {webrtc::VoiceDetection::kVeryLowLikelihood, "Very Low Likelihood", "very-low"},
-    {webrtc::VoiceDetection::kLowLikelihood, "Low Likelihood", "low"},
-    {webrtc::VoiceDetection::kModerateLikelihood, "Moderate Likelihood", "moderate"},
-    {webrtc::VoiceDetection::kHighLikelihood, "High Likelihood", "high"},
+    {1, "Very Low Likelihood", "very-low"},
+    {2, "Low Likelihood", "low"},
+    {3, "Moderate Likelihood", "moderate"},
+    {4, "High Likelihood", "high"},
     {0, NULL, NULL}
   };
 
@@ -227,6 +224,7 @@
   PROP_VOICE_DETECTION,
   PROP_VOICE_DETECTION_FRAME_SIZE_MS,
   PROP_VOICE_DETECTION_LIKELIHOOD,
+  PROP_EXTRA_DELAY_MS,
 };
 
 /**
@@ -248,7 +246,7 @@
   /* Protected by the stream lock */
   GstAdapter *adapter;
   GstPlanarAudioAdapter *padapter;
-  webrtc::AudioProcessing * apm;
+  webrtc::AudioProcessing *apm;
 
   /* Protected by the object lock */
   gchar *probe_name;
@@ -257,21 +255,15 @@
   /* Properties */
   gboolean high_pass_filter;
   gboolean echo_cancel;
-  webrtc::EchoCancellation::SuppressionLevel echo_suppression_level;
   gboolean noise_suppression;
-  webrtc::NoiseSuppression::Level noise_suppression_level;
+  webrtc::AudioProcessing::Config::NoiseSuppression::Level noise_suppression_level;
   gboolean gain_control;
-  gboolean experimental_agc;
-  gboolean extended_filter;
-  gboolean delay_agnostic;
   gint target_level_dbfs;
   gint compression_gain_db;
   gint startup_min_volume;
   gboolean limiter;
-  webrtc::GainControl::Mode gain_control_mode;
+  webrtc::AudioProcessing::Config::GainController1::Mode gain_control_mode;
   gboolean voice_detection;
-  gint voice_detection_frame_size_ms;
-  webrtc::VoiceDetection::Likelihood voice_detection_likelihood;
 };
 
 G_DEFINE_TYPE_WITH_CODE (GstWebrtcDsp, gst_webrtc_dsp, GST_TYPE_AUDIO_FILTER,
@@ -376,63 +368,63 @@
     GstClockTime rec_time)
 {
   GstWebrtcEchoProbe *probe = NULL;
-  webrtc::AudioProcessing * apm;
-  webrtc::AudioFrame frame;
+  webrtc::AudioProcessing *apm;
   GstBuffer *buf = NULL;
+  GstAudioInfo info;
+  gboolean interleaved = self->interleaved;
+  GstAudioBuffer abuf;
   GstFlowReturn ret = GST_FLOW_OK;
   gint err, delay;
 
   GST_OBJECT_LOCK (self);
   if (self->echo_cancel)
     probe = GST_WEBRTC_ECHO_PROBE (g_object_ref (self->probe));
+  info = self->info;
   GST_OBJECT_UNLOCK (self);
 
   /* If echo cancellation is disabled */
   if (!probe)
     return GST_FLOW_OK;
 
+  delay =
+    gst_webrtc_echo_probe_read (probe, rec_time, &buf, &info, &interleaved);
+
   apm = self->apm;
+  apm->set_stream_delay_ms (delay);
 
-  if (self->delay_agnostic)
-    rec_time = GST_CLOCK_TIME_NONE;
+  webrtc::StreamConfig config (info.rate, info.channels, false);
 
-again:
-  delay = gst_webrtc_echo_probe_read (probe, rec_time, (gpointer) &frame, &buf);
-  apm->set_stream_delay_ms (delay);
+  g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
 
   if (delay < 0)
     goto done;
 
-  if (frame.sample_rate_hz_ != self->info.rate) {
+  if (info.rate != self->info.rate) {
     GST_ELEMENT_ERROR (self, STREAM, FORMAT,
         ("Echo Probe has rate %i , while the DSP is running at rate %i,"
          " use a caps filter to ensure those are the same.",
-         frame.sample_rate_hz_, self->info.rate), (NULL));
+         info.rate, self->info.rate), (NULL));
     ret = GST_FLOW_ERROR;
     goto done;
   }
 
-  if (buf) {
-    webrtc::StreamConfig config (frame.sample_rate_hz_, frame.num_channels_,
-        false);
-    GstAudioBuffer abuf;
-    float * const * data;
+  gst_audio_buffer_map (&abuf, &info, buf, GST_MAP_READWRITE);
+
+  if (interleaved) {
+    int16_t * const data = (int16_t * const) abuf.planes0;
 
-    gst_audio_buffer_map (&abuf, &self->info, buf, GST_MAP_READWRITE);
-    data = (float * const *) abuf.planes;
     if ((err = apm->ProcessReverseStream (data, config, config, data)) < 0)
       GST_WARNING_OBJECT (self, "Reverse stream analyses failed: %s.",
           webrtc_error_to_string (err));
-    gst_audio_buffer_unmap (&abuf);
-    gst_buffer_replace (&buf, NULL);
   } else {
-    if ((err = apm->AnalyzeReverseStream (&frame)) < 0)
+    float * const * data = (float * const *) abuf.planes;
+
+    if ((err = apm->ProcessReverseStream (data, config, config, data)) < 0)
       GST_WARNING_OBJECT (self, "Reverse stream analyses failed: %s.",
           webrtc_error_to_string (err));
   }
 
-  if (self->delay_agnostic)
-      goto again;
+  gst_audio_buffer_unmap (&abuf);
 
 done:
   gst_object_unref (probe);
@@ -443,16 +435,14 @@
 
 static void
 gst_webrtc_vad_post_activity (GstWebrtcDsp *self, GstBuffer *buffer,
-    gboolean stream_has_voice)
+    gboolean stream_has_voice, guint8 level)
 {
   GstClockTime timestamp = GST_BUFFER_PTS (buffer);
   GstBaseTransform *trans = GST_BASE_TRANSFORM_CAST (self);
   GstStructure *s;
   GstClockTime stream_time;
   GstAudioLevelMeta *meta;
-  guint8 level;
 
-  level = self->apm->level_estimator ()->RMS ();
   meta = gst_buffer_get_audio_level_meta (buffer);
   if (meta) {
     meta->voice_activity = stream_has_voice;
@@ -481,6 +471,7 @@
 {
   GstAudioBuffer abuf;
   webrtc::AudioProcessing * apm = self->apm;
+  webrtc::StreamConfig config (self->info.rate, self->info.channels, false);
   gint err;
 
   if (!gst_audio_buffer_map (&abuf, &self->info, buffer,
@@ -490,19 +481,10 @@
   }
 
   if (self->interleaved) {
-    webrtc::AudioFrame frame;
-    frame.num_channels_ = self->info.channels;
-    frame.sample_rate_hz_ = self->info.rate;
-    frame.samples_per_channel_ = self->period_samples;
-
-    memcpy (frame.data_, abuf.planes0, self->period_size);
-    err = apm->ProcessStream (&frame);
-    if (err >= 0)
-      memcpy (abuf.planes0, frame.data_, self->period_size);
+    int16_t * const data = (int16_t * const) abuf.planes0;
+    err = apm->ProcessStream (data, config, config, data);
   } else {
     float * const * data = (float * const *) abuf.planes;
-    webrtc::StreamConfig config (self->info.rate, self->info.channels, false);
-
     err = apm->ProcessStream (data, config, config, data);
   }
 
@@ -511,10 +493,13 @@
         webrtc_error_to_string (err));
   } else {
     if (self->voice_detection) {
-      gboolean stream_has_voice = apm->voice_detection ()->stream_has_voice ();
+      webrtc::AudioProcessingStats stats = apm->GetStatistics ();
+      gboolean stream_has_voice = stats.voice_detected && *stats.voice_detected;
+      // The meta takes the value as -dbov, so we negate
+      guint8 level = stats.output_rms_dbfs ? (guint8) -(*stats.output_rms_dbfs) : 127;
 
       if (stream_has_voice != self->stream_has_voice)
-        gst_webrtc_vad_post_activity (self, buffer, stream_has_voice);
+        gst_webrtc_vad_post_activity (self, buffer, stream_has_voice, level);
 
       self->stream_has_voice = stream_has_voice;
     }
@@ -583,21 +568,9 @@
 gst_webrtc_dsp_start (GstBaseTransform * btrans)
 {
   GstWebrtcDsp *self = GST_WEBRTC_DSP (btrans);
-  webrtc::Config config;
 
   GST_OBJECT_LOCK (self);
 
-  config.Set < webrtc::ExtendedFilter >
-      (new webrtc::ExtendedFilter (self->extended_filter));
-  config.Set < webrtc::ExperimentalAgc >
-      (new webrtc::ExperimentalAgc (self->experimental_agc, self->startup_min_volume));
-  config.Set < webrtc::DelayAgnostic >
-      (new webrtc::DelayAgnostic (self->delay_agnostic));
-
-  /* TODO Intelligibility enhancer, Beamforming, etc. */
-
-  self->apm = webrtc::AudioProcessing::Create (config);
-
   if (self->echo_cancel) {
     self->probe = gst_webrtc_acquire_echo_probe (self->probe_name);
 
@@ -618,10 +591,8 @@
 gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info)
 {
   GstWebrtcDsp *self = GST_WEBRTC_DSP (filter);
-  webrtc::AudioProcessing * apm;
-  webrtc::ProcessingConfig pconfig;
+  webrtc::AudioProcessing::Config config;
   GstAudioInfo probe_info = *info;
-  gint err = 0;
 
   GST_LOG_OBJECT (self, "setting format to %s with %i Hz and %i channels",
       info->finfo->description, info->rate, info->channels);
@@ -633,7 +604,7 @@
 
   self->info = *info;
   self->interleaved = (info->layout == GST_AUDIO_LAYOUT_INTERLEAVED);
-  apm = self->apm;
+  self->apm = webrtc::AudioProcessingBuilder().Create();
 
   if (!self->interleaved)
     gst_planar_audio_adapter_configure (self->padapter, info);
@@ -642,8 +613,7 @@
   self->period_samples = info->rate / 100;
   self->period_size = self->period_samples * info->bpf;
 
-  if (self->interleaved &&
-      (webrtc::AudioFrame::kMaxDataSizeSamples * 2) < self->period_size)
+  if (self->interleaved && (self->period_size > MAX_DATA_SIZE_SAMPLES * 2))
     goto period_too_big;
 
   if (self->probe) {
@@ -658,40 +628,31 @@
     GST_WEBRTC_ECHO_PROBE_UNLOCK (self->probe);
   }
 
-  /* input stream */
-  pconfig.streamswebrtc::ProcessingConfig::kInputStream =
-      webrtc::StreamConfig (info->rate, info->channels, false);
-  /* output stream */
-  pconfig.streamswebrtc::ProcessingConfig::kOutputStream =
-      webrtc::StreamConfig (info->rate, info->channels, false);
-  /* reverse input stream */
-  pconfig.streamswebrtc::ProcessingConfig::kReverseInputStream =
-      webrtc::StreamConfig (probe_info.rate, probe_info.channels, false);
-  /* reverse output stream */
-  pconfig.streamswebrtc::ProcessingConfig::kReverseOutputStream =
-      webrtc::StreamConfig (probe_info.rate, probe_info.channels, false);
-
-  if ((err = apm->Initialize (pconfig)) < 0)
-    goto initialize_failed;
-
   /* Setup Filters */
+  // TODO: expose pre_amplifier
+
   if (self->high_pass_filter) {
     GST_DEBUG_OBJECT (self, "Enabling High Pass filter");
-    apm->high_pass_filter ()->Enable (true);
+    config.high_pass_filter.enabled = true;
   }
 
   if (self->echo_cancel) {
     GST_DEBUG_OBJECT (self, "Enabling Echo Cancellation");
-    apm->echo_cancellation ()->enable_drift_compensation (false);
-    apm->echo_cancellation ()
-        ->set_suppression_level (self->echo_suppression_level);
-    apm->echo_cancellation ()->Enable (true);
+    config.echo_canceller.enabled = true;
   }
 
   if (self->noise_suppression) {
     GST_DEBUG_OBJECT (self, "Enabling Noise Suppression");
-    apm->noise_suppression ()->set_level (self->noise_suppression_level);
-    apm->noise_suppression ()->Enable (true);
+    config.noise_suppression.enabled = true;
+    config.noise_suppression.level = self->noise_suppression_level;
+  }
+
+  // TODO: expose transient suppression
+
+  if (self->voice_detection) {
+    GST_DEBUG_OBJECT (self, "Enabling Voice Activity Detection");
+    config.voice_detection.enabled = true;
+    self->stream_has_voice = FALSE;
   }
 
   if (self->gain_control) {
@@ -706,30 +667,17 @@
 
     g_type_class_unref (mode_class);
 
-    apm->gain_control ()->set_mode (self->gain_control_mode);
-    apm->gain_control ()->set_target_level_dbfs (self->target_level_dbfs);
-    apm->gain_control ()->set_compression_gain_db (self->compression_gain_db);
-    apm->gain_control ()->enable_limiter (self->limiter);
-    apm->gain_control ()->Enable (true);
+    config.gain_controller1.enabled = true;
+    config.gain_controller1.target_level_dbfs = self->target_level_dbfs;
+    config.gain_controller1.compression_gain_db = self->compression_gain_db;
+    config.gain_controller1.enable_limiter = self->limiter;
+    config.level_estimation.enabled = true;
   }
 
-  if (self->voice_detection) {
-    GEnumClass *likelihood_class = (GEnumClass *)
-        g_type_class_ref (GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD);
-    GST_DEBUG_OBJECT (self, "Enabling Voice Activity Detection, frame size "
-      "%d milliseconds, likelihood: %s", self->voice_detection_frame_size_ms,
-      g_enum_get_value (likelihood_class,
-          self->voice_detection_likelihood)->value_name);
-    g_type_class_unref (likelihood_class);
-
-    self->stream_has_voice = FALSE;
+  // TODO: expose gain controller 2
+  // TODO: expose residual echo detector
 
-    apm->voice_detection ()->Enable (true);
-    apm->voice_detection ()->set_likelihood (self->voice_detection_likelihood);
-    apm->voice_detection ()->set_frame_size_ms (
-        self->voice_detection_frame_size_ms);
-    apm->level_estimator ()->Enable (true);
-  }
+  self->apm->ApplyConfig (config);
 
   GST_OBJECT_UNLOCK (self);
 
@@ -738,9 +686,9 @@
 period_too_big:
   GST_OBJECT_UNLOCK (self);
   GST_WARNING_OBJECT (self, "webrtcdsp format produce too big period "
-      "(maximum is %" G_GSIZE_FORMAT " samples and we have %u samples), "
+      "(maximum is %d samples and we have %u samples), "
       "reduce the number of channels or the rate.",
-      webrtc::AudioFrame::kMaxDataSizeSamples, self->period_size / 2);
+      MAX_DATA_SIZE_SAMPLES, self->period_size / 2);
   return FALSE;
 
 probe_has_wrong_rate:
@@ -751,14 +699,6 @@
           " use a caps filter to ensure those are the same.",
           probe_info.rate, info->rate), (NULL));
   return FALSE;
-
-initialize_failed:
-  GST_OBJECT_UNLOCK (self);
-  GST_ELEMENT_ERROR (self, LIBRARY, INIT,
-      ("Failed to initialize WebRTC Audio Processing library"),
-      ("webrtc::AudioProcessing::Initialize() failed: %s",
-          webrtc_error_to_string (err)));
-  return FALSE;
 }
 
 static gboolean
@@ -803,8 +743,6 @@
       self->echo_cancel = g_value_get_boolean (value);
       break;
     case PROP_ECHO_SUPPRESSION_LEVEL:
-      self->echo_suppression_level =
-          (GstWebrtcEchoSuppressionLevel) g_value_get_enum (value);
       break;
     case PROP_NOISE_SUPPRESSION:
       self->noise_suppression = g_value_get_boolean (value);
@@ -817,13 +755,10 @@
       self->gain_control = g_value_get_boolean (value);
       break;
     case PROP_EXPERIMENTAL_AGC:
-      self->experimental_agc = g_value_get_boolean (value);
       break;
     case PROP_EXTENDED_FILTER:
-      self->extended_filter = g_value_get_boolean (value);
       break;
     case PROP_DELAY_AGNOSTIC:
-      self->delay_agnostic = g_value_get_boolean (value);
       break;
     case PROP_TARGET_LEVEL_DBFS:
       self->target_level_dbfs = g_value_get_int (value);
@@ -845,11 +780,8 @@
       self->voice_detection = g_value_get_boolean (value);
       break;
     case PROP_VOICE_DETECTION_FRAME_SIZE_MS:
-      self->voice_detection_frame_size_ms = g_value_get_int (value);
       break;
     case PROP_VOICE_DETECTION_LIKELIHOOD:
-      self->voice_detection_likelihood =
-          (GstWebrtcVoiceDetectionLikelihood) g_value_get_enum (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -876,7 +808,7 @@
       g_value_set_boolean (value, self->echo_cancel);
       break;
     case PROP_ECHO_SUPPRESSION_LEVEL:
-      g_value_set_enum (value, self->echo_suppression_level);
+      g_value_set_enum (value, (GstWebrtcEchoSuppressionLevel) 2);
       break;
     case PROP_NOISE_SUPPRESSION:
       g_value_set_boolean (value, self->noise_suppression);
@@ -888,13 +820,13 @@
       g_value_set_boolean (value, self->gain_control);
       break;
     case PROP_EXPERIMENTAL_AGC:
-      g_value_set_boolean (value, self->experimental_agc);
+      g_value_set_boolean (value, false);
       break;
     case PROP_EXTENDED_FILTER:
-      g_value_set_boolean (value, self->extended_filter);
+      g_value_set_boolean (value, false);
       break;
     case PROP_DELAY_AGNOSTIC:
-      g_value_set_boolean (value, self->delay_agnostic);
+      g_value_set_boolean (value, false);
       break;
     case PROP_TARGET_LEVEL_DBFS:
       g_value_set_int (value, self->target_level_dbfs);
@@ -915,10 +847,10 @@
       g_value_set_boolean (value, self->voice_detection);
       break;
     case PROP_VOICE_DETECTION_FRAME_SIZE_MS:
-      g_value_set_int (value, self->voice_detection_frame_size_ms);
+      g_value_set_int (value, 0);
       break;
     case PROP_VOICE_DETECTION_LIKELIHOOD:
-      g_value_set_enum (value, self->voice_detection_likelihood);
+      g_value_set_enum (value, 2);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1005,13 +937,13 @@
 
   g_object_class_install_property (gobject_class,
       PROP_ECHO_SUPPRESSION_LEVEL,
-      g_param_spec_enum ("echo-suppression-level", "Echo Suppression Level",
+      g_param_spec_enum ("echo-suppression-level",
+          "Echo Suppression Level (does nothing)",
           "Controls the aggressiveness of the suppressor. A higher level "
           "trades off double-talk performance for increased echo suppression.",
-          GST_TYPE_WEBRTC_ECHO_SUPPRESSION_LEVEL,
-          webrtc::EchoCancellation::kModerateSuppression,
+          GST_TYPE_WEBRTC_ECHO_SUPPRESSION_LEVEL, 2,
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
-              G_PARAM_CONSTRUCT)));
+              G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED)));
 
   g_object_class_install_property (gobject_class,
       PROP_NOISE_SUPPRESSION,
@@ -1026,7 +958,7 @@
           "Controls the aggressiveness of the suppression. Increasing the "
           "level will reduce the noise level at the expense of a higher "
           "speech distortion.", GST_TYPE_WEBRTC_NOISE_SUPPRESSION_LEVEL,
-          webrtc::EchoCancellation::kModerateSuppression,
+          webrtc::AudioProcessing::Config::NoiseSuppression::Level::kModerate,
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
               G_PARAM_CONSTRUCT)));
 
@@ -1039,24 +971,26 @@
 
   g_object_class_install_property (gobject_class,
       PROP_EXPERIMENTAL_AGC,
-      g_param_spec_boolean ("experimental-agc", "Experimental AGC",
+      g_param_spec_boolean ("experimental-agc",
+          "Experimental AGC (does nothing)",
           "Enable or disable experimental automatic gain control.",
           FALSE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
-              G_PARAM_CONSTRUCT)));
+              G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED)));
 
   g_object_class_install_property (gobject_class,
       PROP_EXTENDED_FILTER,
       g_param_spec_boolean ("extended-filter", "Extended Filter",
           "Enable or disable the extended filter.",
           TRUE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
-              G_PARAM_CONSTRUCT)));
+              G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED)));
 
   g_object_class_install_property (gobject_class,
       PROP_DELAY_AGNOSTIC,
-      g_param_spec_boolean ("delay-agnostic", "Delay Agnostic",
+      g_param_spec_boolean ("delay-agnostic",
+          "Delay agnostic mode (does nothing)",
           "Enable or disable the delay agnostic mode.",
           FALSE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
-              G_PARAM_CONSTRUCT)));
+              G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED)));
 
   g_object_class_install_property (gobject_class,
       PROP_TARGET_LEVEL_DBFS,
@@ -1111,24 +1045,23 @@
   g_object_class_install_property (gobject_class,
       PROP_VOICE_DETECTION_FRAME_SIZE_MS,
       g_param_spec_int ("voice-detection-frame-size-ms",
-          "Voice Detection Frame Size Milliseconds",
+          "Voice detection frame size in milliseconds (does nothing)",
           "Sets the |size| of the frames in ms on which the VAD will operate. "
           "Larger frames will improve detection accuracy, but reduce the "
           "frequency of updates",
           10, 30, DEFAULT_VOICE_DETECTION_FRAME_SIZE_MS,
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
-              G_PARAM_CONSTRUCT)));
+              G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED)));
 
   g_object_class_install_property (gobject_class,
       PROP_VOICE_DETECTION_LIKELIHOOD,
       g_param_spec_enum ("voice-detection-likelihood",
-          "Voice Detection Likelihood",
+          "Voice detection likelihood (does nothing)",
           "Specifies the likelihood that a frame will be declared to contain "
           "voice.",
-          GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD,
-          DEFAULT_VOICE_DETECTION_LIKELIHOOD,
+          GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD, 2,
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
-              G_PARAM_CONSTRUCT)));
+              G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED)));
 
   gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_GAIN_CONTROL_MODE, (GstPluginAPIFlags) 0);
   gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_NOISE_SUPPRESSION_LEVEL, (GstPluginAPIFlags) 0);

gst-plugins-bad-1.22.7.tar.xz/ext/webrtcdsp/gstwebrtcechoprobe.cpp -> gst-plugins-bad-1.24.5.tar.xz/ext/webrtcdsp/gstwebrtcechoprobe.cpp Changed

@@ -33,7 +33,8 @@
 
 #include "gstwebrtcechoprobe.h"
 
-#include <webrtc/modules/interface/module_common_types.h>
+#include <modules/audio_processing/include/audio_processing.h>
+
 #include <gst/audio/audio.h>
 
 GST_DEBUG_CATEGORY_EXTERN (webrtc_dsp_debug);
@@ -102,7 +103,7 @@
   self->period_size = self->period_samples * info->bpf;
 
   if (self->interleaved &&
-      (webrtc::AudioFrame::kMaxDataSizeSamples * 2) < self->period_size)
+      (MAX_DATA_SIZE_SAMPLES * 2) < self->period_size)
     goto period_too_big;
 
   GST_WEBRTC_ECHO_PROBE_UNLOCK (self);
@@ -112,9 +113,9 @@
 period_too_big:
   GST_WEBRTC_ECHO_PROBE_UNLOCK (self);
   GST_WARNING_OBJECT (self, "webrtcdsp format produce too big period "
-      "(maximum is %" G_GSIZE_FORMAT " samples and we have %u samples), "
+      "(maximum is %d samples and we have %u samples), "
       "reduce the number of channels or the rate.",
-      webrtc::AudioFrame::kMaxDataSizeSamples, self->period_size / 2);
+      MAX_DATA_SIZE_SAMPLES, self->period_size / 2);
   return FALSE;
 }
 
@@ -303,18 +304,27 @@
 
 gint
 gst_webrtc_echo_probe_read (GstWebrtcEchoProbe * self, GstClockTime rec_time,
-    gpointer _frame, GstBuffer ** buf)
+    GstBuffer ** buf, GstAudioInfo * info, gboolean * interleaved)
 {
-  webrtc::AudioFrame * frame = (webrtc::AudioFrame *) _frame;
   GstClockTimeDiff diff;
-  gsize avail, skip, offset, size;
+  gsize avail, skip, offset, size = 0;
   gint delay = -1;
 
   GST_WEBRTC_ECHO_PROBE_LOCK (self);
 
-  if (!GST_CLOCK_TIME_IS_VALID (self->latency) ||
-      !GST_AUDIO_INFO_IS_VALID (&self->info))
-    goto done;
+  /* We always return a buffer -- if don't have data (size == 0), we generate a
+   * silence buffer */
+
+  if (!GST_CLOCK_TIME_IS_VALID (self->latency))
+    goto copy;
+
+  /* If we have a format, use that, else generate silence in input format */
+  if (!GST_AUDIO_INFO_IS_VALID (&self->info)) {
+    goto copy;
+  } else {
+   *info = self->info;
+   *interleaved = self->interleaved;
+  }
 
   if (self->interleaved)
     avail = gst_adapter_available (self->adapter) / self->info.bpf;
@@ -324,7 +334,7 @@
   /* In delay agnostic mode, just return 10ms of data */
   if (!GST_CLOCK_TIME_IS_VALID (rec_time)) {
     if (avail < self->period_samples)
-      goto done;
+      goto copy;
 
     size = self->period_samples;
     skip = 0;
@@ -371,23 +381,54 @@
   size = MIN (avail - offset, self->period_samples - skip);
 
 copy:
-  if (self->interleaved) {
-    skip *= self->info.bpf;
-    offset *= self->info.bpf;
-    size *= self->info.bpf;
-
-    if (size < self->period_size)
-      memset (frame->data_, 0, self->period_size);
-
-    if (size) {
-      gst_adapter_copy (self->adapter, (guint8 *) frame->data_ + skip,
-          offset, size);
-      gst_adapter_flush (self->adapter, offset + size);
-    }
+  if (!size) {
+    /* No data, provide a period's worth of silence, using our format if we have
+     * it, or the provided format if we don't */
+    guint period_samples = info->rate / 100;
+    guint period_size = period_samples * info->bpf;
+
+    *buf = gst_buffer_new_allocate (NULL, period_size, NULL);
+    gst_buffer_memset (*buf, 0, 0, period_size);
+    gst_buffer_add_audio_meta (*buf, info, period_samples, NULL);
   } else {
+    /* We have some actual data, pop period_samples' worth if have it, else pad
+     * with silence and provide what we do have */
     GstBuffer *ret, *taken, *tmp;
 
-    if (size) {
+    if (self->interleaved) {
+      skip *= self->info.bpf;
+      offset *= self->info.bpf;
+      size *= self->info.bpf;
+
+      gst_adapter_flush (self->adapter, offset);
+
+      /* we need to fill silence at the beginning and/or the end of the
+       * buffer in order to have period_samples in the buffer */
+      if (size < self->period_size) {
+        gsize padding = self->period_size - (skip + size);
+
+        taken = gst_adapter_take_buffer (self->adapter, size);
+        ret = gst_buffer_new ();
+
+        /* need some silence at the beginning */
+        if (skip) {
+          tmp = gst_buffer_new_allocate (NULL, skip, NULL);
+          gst_buffer_memset (tmp, 0, 0, skip);
+          ret = gst_buffer_append (ret, tmp);
+        }
+
+        ret = gst_buffer_append (ret, taken);
+
+        /* need some silence at the end */
+        if (padding) {
+          tmp = gst_buffer_new_allocate (NULL, padding, NULL);
+          gst_buffer_memset (tmp, 0, 0, padding);
+          ret = gst_buffer_append (ret, tmp);
+        }
+      } else {
+        ret = gst_adapter_take_buffer (self->adapter, size);
+      }
+    } else {
       gst_planar_audio_adapter_flush (self->padapter, offset);
 
       /* we need to fill silence at the beginning and/or the end of each
@@ -430,23 +471,13 @@
         ret = gst_planar_audio_adapter_take_buffer (self->padapter, size,
           GST_MAP_READWRITE);
       }
-    } else {
-      ret = gst_buffer_new_allocate (NULL, self->period_size, NULL);
-      gst_buffer_memset (ret, 0, 0, self->period_size);
-      gst_buffer_add_audio_meta (ret, &self->info, self->period_samples,
-          NULL);
     }
 
     *buf = ret;
   }
 
-  frame->num_channels_ = self->info.channels;
-  frame->sample_rate_hz_ = self->info.rate;
-  frame->samples_per_channel_ = self->period_samples;
-
   delay = self->delay;
 
-done:
   GST_WEBRTC_ECHO_PROBE_UNLOCK (self);
 
   return delay;

gst-plugins-bad-1.22.7.tar.xz/ext/webrtcdsp/gstwebrtcechoprobe.h -> gst-plugins-bad-1.24.5.tar.xz/ext/webrtcdsp/gstwebrtcechoprobe.h Changed

@@ -45,6 +45,12 @@
 #define GST_WEBRTC_ECHO_PROBE_LOCK(obj) g_mutex_lock (&GST_WEBRTC_ECHO_PROBE (obj)->lock)
 #define GST_WEBRTC_ECHO_PROBE_UNLOCK(obj) g_mutex_unlock (&GST_WEBRTC_ECHO_PROBE (obj)->lock)
 
+/* From the webrtc audio_frame.h definition of kMaxDataSizeSamples:
+ * Stereo, 32 kHz, 120 ms (2 * 32 * 120)
+ * Stereo, 192 kHz, 20 ms (2 * 192 * 20)
+ */
+#define MAX_DATA_SIZE_SAMPLES 7680
+
 typedef struct _GstWebrtcEchoProbe GstWebrtcEchoProbe;
 typedef struct _GstWebrtcEchoProbeClass GstWebrtcEchoProbeClass;
 
@@ -71,6 +77,7 @@
   GstClockTime latency;
   gint delay;
   gboolean interleaved;
+  gint extra_delay;
 
   GstSegment segment;
   GstAdapter *adapter;
@@ -92,7 +99,8 @@
 GstWebrtcEchoProbe *gst_webrtc_acquire_echo_probe (const gchar * name);
 void gst_webrtc_release_echo_probe (GstWebrtcEchoProbe * probe);
 gint gst_webrtc_echo_probe_read (GstWebrtcEchoProbe * self,
-    GstClockTime rec_time, gpointer frame, GstBuffer ** buf);
+    GstClockTime rec_time, GstBuffer ** buf, GstAudioInfo * info,
+    gboolean * interleaved);
 
 G_END_DECLS
 #endif /* __GST_WEBRTC_ECHO_PROBE_H__ */

gst-plugins-bad-1.22.7.tar.xz/ext/webrtcdsp/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/webrtcdsp/meson.build Changed

@@ -4,23 +4,19 @@
   'gstwebrtcdspplugin.cpp'
 
 
-webrtc_dep = dependency('webrtc-audio-processing', version : '>= 0.2', '< 0.4',
+webrtc_dep = dependency('webrtc-audio-processing-1', version : '>= 1.0',
                         required : get_option('webrtcdsp'))
 
-if not gnustl_dep.found() and get_option('webrtcdsp').enabled()
-  error('webrtcdsp plugin enabled but could not find gnustl dep for Android c++ support')
-endif
-
-if webrtc_dep.found() and gnustl_dep.found()
+if webrtc_dep.found()
   gstwebrtcdsp = library('gstwebrtcdsp',
     webrtc_sources,
     cpp_args : gst_plugins_bad_args,
     link_args : noseh_link_args,
     include_directories : configinc,
-    dependencies : gstbase_dep, gstaudio_dep, gstbadaudio_dep, webrtc_dep, gnustl_dep,
+    dependencies : gstbase_dep, gstaudio_dep, gstbadaudio_dep, webrtc_dep,
     install : true,
     install_dir : plugins_install_dir,
-    override_options : 'cpp_std=c++11',
+    override_options : 'cpp_std=c++17',
   )
   plugins += gstwebrtcdsp
 endif

gst-plugins-bad-1.22.7.tar.xz/ext/wpe/gstwpe.cpp -> gst-plugins-bad-1.24.5.tar.xz/ext/wpe/gstwpe.cpp Changed

gst-plugins-bad-1.22.7.tar.xz/ext/wpe/gstwpesrcbin.cpp -> gst-plugins-bad-1.24.5.tar.xz/ext/wpe/gstwpesrcbin.cpp Changed

gst-plugins-bad-1.24.5.tar.xz/ext/wpe/gstwpethreadedview.cpp Added

@@ -0,0 +1,938 @@
+/* Copyright (C) <2018, 2019, 2020> Philippe Normand <philn@igalia.com>
+ * Copyright (C) <2018> Žan Doberšek <zdobersek@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstwpe.h"
+#include "gstwpesrcbin.h"
+#include "gstwpethreadedview.h"
+
+#include <gst/gl/gl.h>
+#include <gst/gl/egl/gsteglimage.h>
+#include <gst/gl/egl/gstgldisplay_egl.h>
+#include <wayland-server.h>
+
+#include <cstdio>
+#include <mutex>
+
+#include <wpe/unstable/fdo-shm.h>
+
+GST_DEBUG_CATEGORY_EXTERN (wpe_view_debug);
+#define GST_CAT_DEFAULT wpe_view_debug
+
+class GMutexHolder {
+public:
+    GMutexHolder(GMutex& mutex)
+        : m(mutex)
+    {
+        g_mutex_lock(&m);
+    }
+    ~GMutexHolder()
+    {
+        g_mutex_unlock(&m);
+    }
+
+private:
+    GMutex& m;
+};
+
+static GstWPEContextThread *s_view = NULL;
+
+GstWPEContextThread& GstWPEContextThread::singleton()
+{
+    static gsize initialized = 0;
+
+    if (g_once_init_enter (&initialized)) {
+        s_view = new GstWPEContextThread;
+
+        g_once_init_leave (&initialized, 1);
+    }
+
+    return *s_view;
+}
+
+GstWPEContextThread::GstWPEContextThread()
+{
+    g_mutex_init(&threading.mutex);
+    g_cond_init(&threading.cond);
+
+    {
+        GMutexHolder lock(threading.mutex);
+        threading.thread = g_thread_new("GstWPEContextThread", s_viewThread, this);
+        while (!threading.ready) {
+            g_cond_wait(&threading.cond, &threading.mutex);
+        }
+        GST_DEBUG("thread spawned");
+    }
+}
+
+GstWPEContextThread::~GstWPEContextThread()
+{
+    if (threading.thread) {
+        g_thread_unref(threading.thread);
+        threading.thread = nullptr;
+    }
+
+    g_mutex_clear(&threading.mutex);
+    g_cond_clear(&threading.cond);
+}
+
+template<typename Function>
+void GstWPEContextThread::dispatch(Function func)
+{
+    struct Job {
+        Job(Function& f)
+            : func(f)
+        {
+            g_mutex_init(&mutex);
+            g_cond_init(&cond);
+            dispatched = FALSE;
+        }
+        ~Job() {
+            g_mutex_clear(&mutex);
+            g_cond_clear(&cond);
+        }
+
+        void dispatch() {
+            GMutexHolder lock(mutex);
+            func();
+            dispatched = TRUE;
+            g_cond_signal(&cond);
+        }
+
+        void waitCompletion() {
+            GMutexHolder lock(mutex);
+            while(!dispatched) {
+                g_cond_wait(&cond, &mutex);
+            }
+        }
+
+        Function& func;
+        GMutex mutex;
+        GCond cond;
+        gboolean dispatched;
+    };
+
+    struct Job job(func);
+    GSource* source = g_idle_source_new();
+    g_source_set_callback(source, (gpointer data) -> gboolean {
+        auto* job = static_cast<struct Job*>(data);
+        job->dispatch();
+        return G_SOURCE_REMOVE;
+    }, &job, nullptr);
+    g_source_set_priority(source, G_PRIORITY_DEFAULT);
+    g_source_attach(source, glib.context);
+    job.waitCompletion();
+    g_source_unref(source);
+}
+
+gpointer GstWPEContextThread::s_viewThread(gpointer data)
+{
+    auto& view = *static_cast<GstWPEContextThread*>(data);
+
+    view.glib.context = g_main_context_new();
+    view.glib.loop = g_main_loop_new(view.glib.context, FALSE);
+
+    g_main_context_push_thread_default(view.glib.context);
+
+    {
+        GSource* source = g_idle_source_new();
+        g_source_set_callback(source,
+            (gpointer data) -> gboolean {
+                auto& view = *static_cast<GstWPEContextThread*>(data);
+                GMutexHolder lock(view.threading.mutex);
+                view.threading.ready = TRUE;
+                g_cond_signal(&view.threading.cond);
+                return G_SOURCE_REMOVE;
+            },
+            &view, nullptr);
+        g_source_attach(source, view.glib.context);
+        g_source_unref(source);
+    }
+
+    g_main_loop_run(view.glib.loop);
+
+    g_main_loop_unref(view.glib.loop);
+    view.glib.loop = nullptr;
+
+    g_main_context_pop_thread_default(view.glib.context);
+    g_main_context_unref(view.glib.context);
+    view.glib.context = nullptr;
+    return nullptr;
+}
+
+#ifdef G_OS_UNIX
+static void
+initialize_web_extensions (WebKitWebContext *context)
+{
+    const gchar *local_path = gst_wpe_get_devenv_extension_path ();
+    const gchar *path = g_file_test (local_path, G_FILE_TEST_IS_DIR) ? local_path : G_STRINGIFY (WPE_EXTENSION_INSTALL_DIR);
+    GST_INFO ("Loading WebExtension from %s", path);
+#if USE_WPE2
+    webkit_web_context_set_web_process_extensions_directory (context, path);
+#else
+    webkit_web_context_set_web_extensions_directory (context, path);
+#endif
+}
+
+static void
+webkit_extension_gerror_msg_received (GstWpeSrc *src, GVariant *params)
+{
+    GstStructure *structure;
+    GstMessage *forwarded;
+    const gchar *src_path, *src_type, *src_name, *error_domain, *msg, *debug_str, *details_str;
+    gint message_type;
+    guint32 error_code;
+
+    g_variant_get (params, "(issssusss)",
+       &message_type,
+       &src_type,
+       &src_name,
+       &src_path,
+       &error_domain,
+       &error_code,
+       &msg,
+       &debug_str,
+       &details_str
+    );
+
+    GError *error = g_error_new(g_quark_from_string(error_domain), error_code, "%s", msg);
+    GstStructure *details = (details_str0 != '\0') ? gst_structure_new_from_string(details_str) : NULL;
+    gchar * our_message = g_strdup_printf(
+        "`%s` posted from %s running inside the web page",
+        debug_str, src_path
+    );
+
+
+    if (message_type == GST_MESSAGE_ERROR) {
+        forwarded =
+            gst_message_new_error_with_details(GST_OBJECT(src), error,
+                                               our_message, details);
+    } else if (message_type == GST_MESSAGE_WARNING) {
+        forwarded =
+            gst_message_new_warning_with_details(GST_OBJECT(src), error,
+                                                 our_message, details);
+    } else {
+        forwarded =
+            gst_message_new_info_with_details(GST_OBJECT(src), error, our_message, details);
+    }
+
+    structure = gst_structure_new ("WpeForwarded",
+        "message", GST_TYPE_MESSAGE, forwarded,
+        "wpe-original-src-name", G_TYPE_STRING, src_name,
+        "wpe-original-src-type", G_TYPE_STRING, src_type,
+        "wpe-original-src-path", G_TYPE_STRING, src_path,
+        NULL
+    );
+
+    g_free (our_message);
+    gst_element_post_message(GST_ELEMENT(src), gst_message_new_custom(GST_MESSAGE_ELEMENT,
+                                                                      GST_OBJECT(src), structure));
+    g_error_free(error);
+    gst_message_unref (forwarded);
+}
+
+static void
+webkit_extension_bus_message_received (GstWpeSrc *src, GVariant *params)
+{
+    GstStructure *original_structure, *structure;
+    const gchar *src_name, *src_type, *src_path, *struct_str;
+    GstMessageType message_type;
+    GstMessage *forwarded;
+
+    g_variant_get (params, "(issss)",
+       &message_type,
+       &src_name,
+       &src_type,
+       &src_path,
+       &struct_str
+    );
+
+    original_structure = (struct_str0 != '\0') ? gst_structure_new_from_string(struct_str) : NULL;
+    if (!original_structure)
+    {
+        if (struct_str0 != '\0')
+            GST_ERROR_OBJECT(src, "Could not deserialize: %s", struct_str);
+        original_structure = gst_structure_new_empty("wpesrc");
+
+    }
+
+    forwarded = gst_message_new_custom(message_type,
+        GST_OBJECT (src), original_structure);
+    structure = gst_structure_new ("WpeForwarded",
+        "message", GST_TYPE_MESSAGE, forwarded,
+        "wpe-original-src-name", G_TYPE_STRING, src_name,
+        "wpe-original-src-type", G_TYPE_STRING, src_type,
+        "wpe-original-src-path", G_TYPE_STRING, src_path,
+        NULL
+    );
+
+    gst_element_post_message(GST_ELEMENT(src), gst_message_new_custom(GST_MESSAGE_ELEMENT,
+                                                                      GST_OBJECT(src), structure));
+
+    gst_message_unref (forwarded);
+}
+
+static gboolean
+webkit_extension_msg_received (WebKitWebContext  *context,
+               WebKitUserMessage *message,
+               GstWpeSrc           *src)
+{
+    const gchar *name = webkit_user_message_get_name (message);
+    GVariant *params = webkit_user_message_get_parameters (message);
+    gboolean res = TRUE;
+
+    GST_TRACE_OBJECT(src, "Handling message %s", name);
+    if (!g_strcmp0(name, "gstwpe.new_stream")) {
+        guint32 id = g_variant_get_uint32 (g_variant_get_child_value (params, 0));
+        const gchar *capsstr = g_variant_get_string (g_variant_get_child_value (params, 1), NULL);
+        GstCaps *caps = gst_caps_from_string (capsstr);
+        const gchar *stream_id = g_variant_get_string (g_variant_get_child_value (params, 2), NULL);
+        gst_wpe_src_new_audio_stream(src, id, caps, stream_id);
+        gst_caps_unref (caps);
+    } else if (!g_strcmp0(name, "gstwpe.set_shm")) {
+        auto fdlist = webkit_user_message_get_fd_list (message);
+        gint id = g_variant_get_uint32 (g_variant_get_child_value (params, 0));
+        gst_wpe_src_set_audio_shm (src, fdlist, id);
+    } else if (!g_strcmp0(name, "gstwpe.new_buffer")) {
+        guint32 id = g_variant_get_uint32 (g_variant_get_child_value (params, 0));
+        guint64 size = g_variant_get_uint64 (g_variant_get_child_value (params, 1));
+        gst_wpe_src_push_audio_buffer (src, id, size);
+
+        webkit_user_message_send_reply(message, webkit_user_message_new ("gstwpe.buffer_processed", NULL));
+    } else if (!g_strcmp0(name, "gstwpe.pause")) {
+        guint32 id = g_variant_get_uint32 (params);
+
+        gst_wpe_src_pause_audio_stream (src, id);
+    } else if (!g_strcmp0(name, "gstwpe.stop")) {
+        guint32 id = g_variant_get_uint32 (params);
+
+        gst_wpe_src_stop_audio_stream (src, id);
+    } else if (!g_strcmp0(name, "gstwpe.bus_gerror_message")) {
+        webkit_extension_gerror_msg_received (src, params);
+    } else if (!g_strcmp0(name, "gstwpe.bus_message")) {
+        webkit_extension_bus_message_received (src, params);
+    } else if (!g_strcmp0(name, "gstwpe.console_message")) {
+        const gchar *message = g_variant_get_string (g_variant_get_child_value (params, 0), NULL);
+        GstStructure *structure = gst_structure_new ("wpe-console-message",
+            "message", G_TYPE_STRING, message,
+            NULL);
+
+        gst_element_post_message(GST_ELEMENT(src), gst_message_new_custom(GST_MESSAGE_ELEMENT,
+            GST_OBJECT(src), structure));
+    } else {
+        res = FALSE;
+        g_error("Unknown event: %s", name);
+    }
+
+    return res;
+}
+#endif
+
+GstWPEThreadedView* GstWPEContextThread::createWPEView(GstWpeVideoSrc* src, GstGLContext* context, GstGLDisplay* display, int width, int height)
+{
+    GST_DEBUG("context %p display %p, size (%d,%d)", context, display, width, height);
+
+    static std::once_flag s_loaderFlag;
+    std::call_once(s_loaderFlag,
+         {
+            wpe_loader_init("libWPEBackend-fdo-1.0.so");
+        });
+
+    GstWPEThreadedView* view = nullptr;
+    dispatch(&() mutable {
+        if (!glib.web_context) {
+#if USE_WPE2
+            glib.web_context = WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT, nullptr));
+#else
+            auto *manager = webkit_website_data_manager_new(NULL);
+            glib.web_context =
+                webkit_web_context_new_with_website_data_manager(manager);
+            g_object_unref(manager);
+#endif
+        }
+        view = new GstWPEThreadedView(glib.web_context, src, context, display, width, height);
+    });
+
+    if (view && view->hasUri()) {
+        GST_DEBUG("waiting load to finish");
+        view->waitLoadCompletion();
+        GST_DEBUG("done");
+    }
+
+    return view;
+}
+
+static gboolean s_loadFailed(WebKitWebView*, WebKitLoadEvent, gchar* failing_uri, GError* error, gpointer data)
+{
+    GstWpeVideoSrc* src = GST_WPE_VIDEO_SRC(data);
+
+    if (g_error_matches(error, WEBKIT_NETWORK_ERROR, WEBKIT_NETWORK_ERROR_CANCELLED)) {
+        GST_INFO_OBJECT (src, "Loading cancelled.");
+
+        return FALSE;
+    }
+
+    GST_ELEMENT_ERROR (GST_ELEMENT_CAST(src), RESOURCE, FAILED, (NULL), ("Failed to load %s (%s)", failing_uri, error->message));
+    return FALSE;
+}
+
+static gboolean s_loadFailedWithTLSErrors(WebKitWebView*,  gchar* failing_uri, GTlsCertificate*, GTlsCertificateFlags, gpointer data)
+{
+    // Defer to load-failed.
+    return FALSE;
+}
+
+static void s_loadProgressChanged(GObject* object, GParamSpec*, gpointer data)
+{
+    GstElement* src = GST_ELEMENT_CAST (data);
+    // The src element is locked already so we can't call
+    // gst_element_post_message(). Instead retrieve the bus manually and use it
+    // directly.
+    GstBus* bus = GST_ELEMENT_BUS (src);
+    double estimatedProgress;
+    g_object_get(object, "estimated-load-progress", &estimatedProgress, nullptr);
+    gst_object_ref (bus);
+    gst_bus_post (bus, gst_message_new_element(GST_OBJECT_CAST(src), gst_structure_new("wpe-stats", "estimated-load-progress", G_TYPE_DOUBLE, estimatedProgress * 100, nullptr)));
+    gst_object_unref (bus);
+}
+
+static void s_webProcessCrashed(WebKitWebView*, WebKitWebProcessTerminationReason reason, gpointer data)
+{
+    auto &view = *static_cast<GstWPEThreadedView *>(data);
+    auto *src = view.src();
+    gchar *reason_str =
+        g_enum_to_string (WEBKIT_TYPE_WEB_PROCESS_TERMINATION_REASON, reason);
+
+    // In case the crash happened while doing the initial URL loading, unlock
+    // the load completion waiting.
+    view.notifyLoadFinished();
+
+    // TODO: Emit a signal here and fallback to error system if signal wasn't handled by application?
+
+    GST_ELEMENT_ERROR(GST_ELEMENT_CAST(src), RESOURCE, FAILED, (NULL), ("%s", reason_str));
+
+    g_free (reason_str);
+}
+
+GstWPEThreadedView::GstWPEThreadedView(WebKitWebContext* web_context, GstWpeVideoSrc* src, GstGLContext* context, GstGLDisplay* display, int width, int height)
+  : m_src(src)
+{
+#ifdef G_OS_UNIX
+{
+        GstObject *parent = gst_object_get_parent (GST_OBJECT (src));
+
+        if (parent && GST_IS_WPE_SRC (parent)) {
+            audio.init_ext_sigid = g_signal_connect (web_context,
+#if USE_WPE2
+                              "initialize-web-process-extensions",
+#else
+                              "initialize-web-extensions",
+#endif
+                              G_CALLBACK (initialize_web_extensions),
+                              NULL);
+            audio.extension_msg_sigid = g_signal_connect (web_context,
+                                "user-message-received",
+                                G_CALLBACK (webkit_extension_msg_received),
+                                parent);
+            GST_INFO_OBJECT (parent, "Enabled audio");
+        }
+
+        gst_clear_object (&parent);
+}
+#endif // G_OS_UNIX
+
+    g_mutex_init(&threading.ready_mutex);
+    g_cond_init(&threading.ready_cond);
+    threading.ready = FALSE;
+
+    g_mutex_init(&images_mutex);
+    if (context)
+        gst.context = GST_GL_CONTEXT(gst_object_ref(context));
+    if (display) {
+        gst.display = GST_GL_DISPLAY(gst_object_ref(display));
+    }
+
+    wpe.width = width;
+    wpe.height = height;
+
+    if (context && display) {
+      if (gst_gl_context_get_gl_platform(context) == GST_GL_PLATFORM_EGL) {
+        gst.display_egl = gst_gl_display_egl_from_gl_display (gst.display);
+      } else {
+        GST_DEBUG ("Available GStreamer GL Context is not EGL - not creating an EGL display from it");
+      }
+    }
+
+    if (gst.display_egl) {
+        EGLDisplay eglDisplay = (EGLDisplay)gst_gl_display_get_handle (GST_GL_DISPLAY(gst.display_egl));
+        GST_DEBUG("eglDisplay %p", eglDisplay);
+
+        m_isValid = wpe_fdo_initialize_for_egl_display(eglDisplay);
+        GST_DEBUG("FDO EGL display initialisation result: %d", m_isValid);
+    } else {
+        m_isValid = wpe_fdo_initialize_shm();
+        GST_DEBUG("FDO SHM initialisation result: %d", m_isValid);
+    }
+    if (!m_isValid)
+        return;
+
+    if (gst.display_egl) {
+        wpe.exportable = wpe_view_backend_exportable_fdo_egl_create(&s_exportableEGLClient, this, wpe.width, wpe.height);
+    } else {
+        wpe.exportable = wpe_view_backend_exportable_fdo_create(&s_exportableClient, this, wpe.width, wpe.height);
+    }
+
+    auto* wpeViewBackend = wpe_view_backend_exportable_fdo_get_view_backend(wpe.exportable);
+    auto* viewBackend = webkit_web_view_backend_new(wpeViewBackend, (GDestroyNotify) wpe_view_backend_exportable_fdo_destroy, wpe.exportable);
+    wpe_view_backend_add_activity_state(wpeViewBackend, wpe_view_activity_state_visible | wpe_view_activity_state_focused | wpe_view_activity_state_in_window);
+
+    webkit.view = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW,
+        "web-context", web_context,
+        "backend", viewBackend,
+        nullptr));
+
+    g_signal_connect(webkit.view, "load-failed", G_CALLBACK(s_loadFailed), src);
+    g_signal_connect(webkit.view, "load-failed-with-tls-errors", G_CALLBACK(s_loadFailedWithTLSErrors), src);
+    g_signal_connect(webkit.view, "notify::estimated-load-progress", G_CALLBACK(s_loadProgressChanged), src);
+    g_signal_connect(webkit.view, "web-process-terminated", G_CALLBACK(s_webProcessCrashed), this);
+
+    auto* settings = webkit_web_view_get_settings(webkit.view);
+    webkit_settings_set_enable_webaudio(settings, TRUE);
+
+    gst_wpe_video_src_configure_web_view(src, webkit.view);
+
+    gchar* location;
+    gboolean drawBackground = TRUE;
+    g_object_get(src, "location", &location, "draw-background", &drawBackground, nullptr);
+    setDrawBackground(drawBackground);
+    if (location) {
+        loadUriUnlocked(location);
+        g_free(location);
+    }
+}
+
+GstWPEThreadedView::~GstWPEThreadedView()
+{
+    GstEGLImage *egl_pending = NULL;
+    GstEGLImage *egl_committed = NULL;
+    GstBuffer *shm_pending = NULL;
+    GstBuffer *shm_committed = NULL;
+    GST_TRACE ("%p destroying", this);
+
+    g_mutex_clear(&threading.ready_mutex);
+    g_cond_clear(&threading.ready_cond);
+
+    {
+        GMutexHolder lock(images_mutex);
+
+        if (egl.pending) {
+            egl_pending = egl.pending;
+            egl.pending = nullptr;
+        }
+        if (egl.committed) {
+            egl_committed = egl.committed;
+            egl.committed = nullptr;
+        }
+        if (shm.pending) {
+            GST_TRACE ("%p freeing shm pending %" GST_PTR_FORMAT, this, shm.pending);
+            shm_pending = shm.pending;
+            shm.pending = nullptr;
+        }
+        if (shm.committed) {
+            GST_TRACE ("%p freeing shm commited %" GST_PTR_FORMAT, this, shm.committed);
+            shm_committed = shm.committed;
+            shm.committed = nullptr;
+        }
+    }
+
+    if (egl_pending)
+        gst_egl_image_unref (egl_pending);
+    if (egl_committed)
+        gst_egl_image_unref (egl_committed);
+    if (shm_pending)
+        gst_buffer_unref (shm_pending);
+    if (shm_committed)
+        gst_buffer_unref (shm_committed);
+
+    if (audio.init_ext_sigid) {
+        WebKitWebContext* web_context = webkit_web_view_get_context (webkit.view);
+
+        g_signal_handler_disconnect(web_context, audio.init_ext_sigid);
+        g_signal_handler_disconnect(web_context, audio.extension_msg_sigid);
+        audio.init_ext_sigid = 0;
+        audio.extension_msg_sigid = 0;
+    }
+
+    GstWPEContextThread::singleton().dispatch(&() {
+        if (webkit.view) {
+            g_object_unref(webkit.view);
+            webkit.view = nullptr;
+        }
+    });
+
+    if (gst.display_egl) {
+        gst_object_unref(gst.display_egl);
+        gst.display_egl = nullptr;
+    }
+
+    if (gst.display) {
+        gst_object_unref(gst.display);
+        gst.display = nullptr;
+    }
+
+    if (gst.context) {
+        gst_object_unref(gst.context);
+        gst.context = nullptr;
+    }
+    if (webkit.uri) {
+        g_free(webkit.uri);
+        webkit.uri = nullptr;
+    }
+
+    g_mutex_clear(&images_mutex);
+    GST_TRACE ("%p destroyed", this);
+}
+
+void GstWPEThreadedView::notifyLoadFinished()
+{
+    GMutexHolder lock(threading.ready_mutex);
+    if (!threading.ready) {
+        threading.ready = TRUE;
+        g_cond_signal(&threading.ready_cond);
+    }
+}
+
+void GstWPEThreadedView::waitLoadCompletion()
+{
+    GMutexHolder lock(threading.ready_mutex);
+    while (!threading.ready)
+        g_cond_wait(&threading.ready_cond, &threading.ready_mutex);
+}
+
+GstEGLImage* GstWPEThreadedView::image()
+{
+    GstEGLImage* ret = nullptr;
+    bool dispatchFrameComplete = false;
+    GstEGLImage *prev_image = NULL;
+
+    {
+        GMutexHolder lock(images_mutex);
+
+        GST_TRACE("pending %" GST_PTR_FORMAT " (%d) committed %" GST_PTR_FORMAT " (%d)", egl.pending,
+                  GST_IS_EGL_IMAGE(egl.pending) ? GST_MINI_OBJECT_REFCOUNT_VALUE(GST_MINI_OBJECT_CAST(egl.pending)) : 0,
+                  egl.committed,
+                  GST_IS_EGL_IMAGE(egl.committed) ? GST_MINI_OBJECT_REFCOUNT_VALUE(GST_MINI_OBJECT_CAST(egl.committed)) : 0);
+
+        if (egl.pending) {
+            prev_image = egl.committed;
+            egl.committed = egl.pending;
+            egl.pending = nullptr;
+
+            dispatchFrameComplete = true;
+        }
+
+        if (egl.committed)
+            ret = egl.committed;
+    }
+
+    if (prev_image)
+        gst_egl_image_unref(prev_image);
+
+    if (dispatchFrameComplete)
+        frameComplete();
+
+    return ret;
+}
+
+GstBuffer* GstWPEThreadedView::buffer()
+{
+    GstBuffer* ret = nullptr;
+    bool dispatchFrameComplete = false;
+    GstBuffer *prev_image = NULL;
+
+    {
+        GMutexHolder lock(images_mutex);
+
+        GST_TRACE("pending %" GST_PTR_FORMAT " (%d) committed %" GST_PTR_FORMAT " (%d)", shm.pending,
+                  GST_IS_BUFFER(shm.pending) ? GST_MINI_OBJECT_REFCOUNT_VALUE(GST_MINI_OBJECT_CAST(shm.pending)) : 0,
+                  shm.committed,
+                  GST_IS_BUFFER(shm.committed) ? GST_MINI_OBJECT_REFCOUNT_VALUE(GST_MINI_OBJECT_CAST(shm.committed)) : 0);
+
+        if (shm.pending) {
+            prev_image = shm.committed;
+            shm.committed = shm.pending;
+            shm.pending = nullptr;
+
+            dispatchFrameComplete = true;
+        }
+
+        if (shm.committed)
+            ret = shm.committed;
+    }
+
+    if (prev_image)
+        gst_buffer_unref(prev_image);
+
+    if (dispatchFrameComplete)
+        frameComplete();
+
+    return ret;
+}
+
+void GstWPEThreadedView::resize(int width, int height)
+{
+    GST_DEBUG("resize to %dx%d", width, height);
+    wpe.width = width;
+    wpe.height = height;
+
+    s_view->dispatch(&() {
+        if (wpe.exportable && wpe_view_backend_exportable_fdo_get_view_backend(wpe.exportable))
+          wpe_view_backend_dispatch_set_size(wpe_view_backend_exportable_fdo_get_view_backend(wpe.exportable), wpe.width, wpe.height);
+    });
+}
+
+void GstWPEThreadedView::frameComplete()
+{
+    GST_TRACE("frame complete");
+    s_view->dispatch(&() {
+        GST_TRACE("dispatching");
+        wpe_view_backend_exportable_fdo_dispatch_frame_complete(wpe.exportable);
+    });
+}
+
+void GstWPEThreadedView::loadUriUnlocked(const gchar* uri)
+{
+    if (webkit.uri)
+        g_free(webkit.uri);
+
+    GST_DEBUG("loading %s", uri);
+    webkit.uri = g_strdup(uri);
+    webkit_web_view_load_uri(webkit.view, webkit.uri);
+}
+
+void GstWPEThreadedView::loadUri(const gchar* uri)
+{
+    s_view->dispatch(&() {
+        loadUriUnlocked(uri);
+    });
+}
+
+static void s_runJavascriptFinished(GObject* object, GAsyncResult* result, gpointer user_data)
+{
+    GError *error = NULL;
+#if USE_WPE2
+    g_autoptr(JSCValue) js_result = webkit_web_view_evaluate_javascript_finish(
+#else
+    g_autoptr(WebKitJavascriptResult) js_result = webkit_web_view_run_javascript_finish(
+#endif
+        WEBKIT_WEB_VIEW(object), result, &error);
+
+    // TODO: Pass result back to signal call site using a GstPromise?
+    (void) js_result;
+
+    if (error) {
+        GST_WARNING("Error running javascript: %s", error->message);
+        g_error_free(error);
+    }
+}
+
+void GstWPEThreadedView::runJavascript(const char* script)
+{
+    s_view->dispatch(&() {
+#if USE_WPE2
+        webkit_web_view_evaluate_javascript(webkit.view, script, -1, nullptr, nullptr, nullptr,
+                                            s_runJavascriptFinished, nullptr);
+#else
+        webkit_web_view_run_javascript(webkit.view, script, nullptr, s_runJavascriptFinished, nullptr);
+#endif
+    });
+}
+
+void GstWPEThreadedView::loadData(GBytes* bytes)
+{
+    s_view->dispatch(this, bytes = g_bytes_ref(bytes)() {
+        webkit_web_view_load_bytes(webkit.view, bytes, nullptr, nullptr, nullptr);
+        g_bytes_unref(bytes);
+    });
+}
+
+void GstWPEThreadedView::setDrawBackground(gboolean drawsBackground)
+{
+    GST_DEBUG("%s background rendering", drawsBackground ? "Enabling" : "Disabling");
+    WebKitColor color;
+    webkit_color_parse(&color, drawsBackground ? "white" : "transparent");
+    webkit_web_view_set_background_color(webkit.view, &color);
+}
+
+void GstWPEThreadedView::releaseImage(gpointer imagePointer)
+{
+    s_view->dispatch(&() {
+        GST_TRACE("Dispatch release exported image %p", imagePointer);
+        wpe_view_backend_exportable_fdo_egl_dispatch_release_exported_image(wpe.exportable,
+                                                                            static_cast<struct wpe_fdo_egl_exported_image*>(imagePointer));
+    });
+}
+
+struct ImageContext {
+    GstWPEThreadedView* view;
+    gpointer image;
+};
+
+void GstWPEThreadedView::handleExportedImage(gpointer image)
+{
+    ImageContext* imageContext = g_new (ImageContext, 1);
+    imageContext->view = this;
+    imageContext->image = static_cast<gpointer>(image);
+    EGLImageKHR eglImage = wpe_fdo_egl_exported_image_get_egl_image(static_cast<struct wpe_fdo_egl_exported_image*>(image));
+
+    auto* gstImage = gst_egl_image_new_wrapped(gst.context, eglImage, GST_GL_RGBA, imageContext, s_releaseImage);
+    {
+      GMutexHolder lock(images_mutex);
+
+      GST_TRACE("EGLImage %p wrapped in GstEGLImage %" GST_PTR_FORMAT, eglImage, gstImage);
+      gst_clear_mini_object ((GstMiniObject **) &egl.pending);
+      egl.pending = gstImage;
+
+      notifyLoadFinished();
+    }
+}
+
+struct SHMBufferContext {
+    GstWPEThreadedView* view;
+    struct wpe_fdo_shm_exported_buffer* buffer;
+};
+
+void GstWPEThreadedView::releaseSHMBuffer(gpointer data)
+{
+    SHMBufferContext* context = static_cast<SHMBufferContext*>(data);
+    s_view->dispatch(&() {
+        auto* buffer = static_cast<struct wpe_fdo_shm_exported_buffer*>(context->buffer);
+        GST_TRACE("Dispatch release exported buffer %p", buffer);
+        wpe_view_backend_exportable_fdo_dispatch_release_shm_exported_buffer(wpe.exportable, buffer);
+    });
+}
+
+void GstWPEThreadedView::s_releaseSHMBuffer(gpointer data)
+{
+    SHMBufferContext* context = static_cast<SHMBufferContext*>(data);
+    context->view->releaseSHMBuffer(data);
+    g_free (context);
+}
+
+void GstWPEThreadedView::handleExportedBuffer(struct wpe_fdo_shm_exported_buffer* buffer)
+{
+    struct wl_shm_buffer* shmBuffer = wpe_fdo_shm_exported_buffer_get_shm_buffer(buffer);
+    auto format = wl_shm_buffer_get_format(shmBuffer);
+    if (format != WL_SHM_FORMAT_ARGB8888 && format != WL_SHM_FORMAT_XRGB8888) {
+        GST_ERROR("Unsupported pixel format: %d", format);
+        return;
+    }
+
+    int32_t width = wl_shm_buffer_get_width(shmBuffer);
+    int32_t height = wl_shm_buffer_get_height(shmBuffer);
+    gint stride = wl_shm_buffer_get_stride(shmBuffer);
+    gsize size = width * height * 4;
+    auto* data = static_cast<uint8_t*>(wl_shm_buffer_get_data(shmBuffer));
+
+    SHMBufferContext* bufferContext = g_new (SHMBufferContext, 1);
+    bufferContext->view = this;
+    bufferContext->buffer = buffer;
+
+    auto* gstBuffer = gst_buffer_new_wrapped_full(GST_MEMORY_FLAG_READONLY, data, size, 0, size, bufferContext, s_releaseSHMBuffer);
+    gsize offsets1;
+    gint strides1;
+    offsets0 = 0;
+    strides0 = stride;
+    gst_buffer_add_video_meta_full(gstBuffer, GST_VIDEO_FRAME_FLAG_NONE, GST_VIDEO_FORMAT_BGRA, width, height, 1, offsets, strides);
+
+    {
+        GMutexHolder lock(images_mutex);
+        GST_TRACE("SHM buffer %p wrapped in buffer %" GST_PTR_FORMAT, buffer, gstBuffer);
+        gst_clear_buffer (&shm.pending);
+        shm.pending = gstBuffer;
+        notifyLoadFinished();
+    }
+}
+
+struct wpe_view_backend_exportable_fdo_egl_client GstWPEThreadedView::s_exportableEGLClient = {
+    // export_egl_image
+    nullptr,
+    (void* data, struct wpe_fdo_egl_exported_image* image) {
+        auto& view = *static_cast<GstWPEThreadedView*>(data);
+        view.handleExportedImage(static_cast<gpointer>(image));
+    },
+    nullptr,
+    // padding
+    nullptr, nullptr
+};
+
+struct wpe_view_backend_exportable_fdo_client GstWPEThreadedView::s_exportableClient = {
+    nullptr,
+    nullptr,
+    // export_shm_buffer
+    (void* data, struct wpe_fdo_shm_exported_buffer* buffer) {
+        auto& view = *static_cast<GstWPEThreadedView*>(data);
+        view.handleExportedBuffer(buffer);
+    },
+    nullptr,
+    nullptr,
+};
+
+void GstWPEThreadedView::s_releaseImage(GstEGLImage* image, gpointer data)
+{
+    ImageContext* context = static_cast<ImageContext*>(data);
+    context->view->releaseImage(context->image);
+    g_free (context);
+}
+
+struct wpe_view_backend* GstWPEThreadedView::backend() const
+{
+    return wpe.exportable ? wpe_view_backend_exportable_fdo_get_view_backend(wpe.exportable) : nullptr;
+}
+
+void GstWPEThreadedView::dispatchKeyboardEvent(struct wpe_input_keyboard_event& wpe_event)
+{
+    s_view->dispatch(&() {
+        wpe_view_backend_dispatch_keyboard_event(backend(), &wpe_event);
+    });
+}
+
+void GstWPEThreadedView::dispatchPointerEvent(struct wpe_input_pointer_event& wpe_event)
+{
+    s_view->dispatch(&() {
+        wpe_view_backend_dispatch_pointer_event(backend(), &wpe_event);
+    });
+}
+
+void GstWPEThreadedView::dispatchAxisEvent(struct wpe_input_axis_event& wpe_event)
+{
+    s_view->dispatch(&() {
+        wpe_view_backend_dispatch_axis_event(backend(), &wpe_event);
+    });
+}
+
+void GstWPEThreadedView::dispatchTouchEvent(struct wpe_input_touch_event& wpe_event)
+{
+    s_view->dispatch(&() {
+        wpe_view_backend_dispatch_touch_event(backend(), &wpe_event);
+    });
+}

gst-plugins-bad-1.24.5.tar.xz/ext/wpe/gstwpethreadedview.h Added

@@ -0,0 +1,156 @@
+/* Copyright (C) <2018> Philippe Normand <philn@igalia.com>
+ * Copyright (C) <2018> Žan Doberšek <zdobersek@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <EGL/egl.h>
+#include <glib.h>
+#include <gst/gl/gstglfuncs.h>
+#include <gst/gl/egl/gstgldisplay_egl.h>
+#include <wpe/fdo.h>
+#include <wpe/fdo-egl.h>
+#include <wpe/webkit.h>
+#include "gstwpevideosrc.h"
+
+typedef struct _GstGLContext GstGLContext;
+typedef struct _GstGLDisplay GstGLDisplay;
+typedef struct _GstEGLImage GstEGLImage;
+
+class GstWPEThreadedView {
+public:
+    GstWPEThreadedView(WebKitWebContext*, GstWpeVideoSrc*, GstGLContext*, GstGLDisplay*, int width, int height);
+    ~GstWPEThreadedView();
+
+    bool operator!() const { return m_isValid; }
+
+    /*  Used by wpevideosrc */
+    void resize(int width, int height);
+    void loadUri(const gchar*);
+    void loadData(GBytes*);
+    void runJavascript(const gchar*);
+    void setDrawBackground(gboolean);
+
+    GstEGLImage* image();
+    GstBuffer* buffer();
+
+    void dispatchKeyboardEvent(struct wpe_input_keyboard_event&);
+    void dispatchPointerEvent(struct wpe_input_pointer_event&);
+    void dispatchAxisEvent(struct wpe_input_axis_event&);
+    void dispatchTouchEvent(struct wpe_input_touch_event&);
+
+    /*  Used by GstWPEContextThread */
+    bool hasUri() const { return webkit.uri; }
+    void disconnectLoadFailedSignal();
+    void waitLoadCompletion();
+
+    GstWpeVideoSrc *src() const { return m_src; }
+
+    void notifyLoadFinished();
+
+protected:
+    void handleExportedImage(gpointer);
+    void handleExportedBuffer(struct wpe_fdo_shm_exported_buffer*);
+
+private:
+    struct wpe_view_backend* backend() const;
+    void frameComplete();
+    void loadUriUnlocked(const gchar*);
+
+    void releaseImage(gpointer);
+    void releaseSHMBuffer(gpointer);
+    static void s_releaseSHMBuffer(gpointer);
+
+    struct {
+        GstGLContext* context;
+        GstGLDisplay* display;
+        GstGLDisplayEGL* display_egl;
+    } gst { nullptr, nullptr, nullptr };
+
+    static struct wpe_view_backend_exportable_fdo_egl_client s_exportableEGLClient;
+    static struct wpe_view_backend_exportable_fdo_client s_exportableClient;
+
+    static void s_releaseImage(GstEGLImage*, gpointer);
+    struct {
+        struct wpe_view_backend_exportable_fdo* exportable;
+        int width;
+        int height;
+    } wpe { nullptr, 0, 0, };
+
+    struct {
+        gchar* uri;
+        WebKitWebView* view;
+    } webkit = { nullptr, nullptr };
+
+    bool m_isValid { false };
+
+    struct {
+        GMutex ready_mutex;
+        GCond ready_cond;
+        gboolean ready;
+    } threading;
+
+    // This mutex guards access to either egl or shm resources declared below,
+    // depending on the runtime behavior.
+    GMutex images_mutex;
+
+    struct {
+        GstEGLImage* pending;
+        GstEGLImage* committed;
+    } egl { nullptr, nullptr };
+
+    struct {
+        GstBuffer* pending;
+        GstBuffer* committed;
+    } shm { nullptr, nullptr };
+
+    struct {
+        gulong init_ext_sigid;
+        gulong extension_msg_sigid;
+    } audio {0, 0};
+
+    GstWpeVideoSrc *m_src { nullptr };
+};
+
+class GstWPEContextThread {
+public:
+    static GstWPEContextThread& singleton();
+
+    GstWPEContextThread();
+    ~GstWPEContextThread();
+
+    GstWPEThreadedView* createWPEView(GstWpeVideoSrc*, GstGLContext*, GstGLDisplay*, int width, int height);
+
+    template<typename Function>
+    void dispatch(Function);
+
+private:
+    static gpointer s_viewThread(gpointer);
+    struct {
+        GMutex mutex;
+        GCond cond;
+        gboolean ready;
+        GThread* thread { nullptr };
+    } threading;
+
+    struct {
+        GMainContext* context;
+        GMainLoop* loop;
+        WebKitWebContext* web_context;
+    } glib { nullptr, nullptr, nullptr };
+};

gst-plugins-bad-1.22.7.tar.xz/ext/wpe/gstwpevideosrc.cpp -> gst-plugins-bad-1.24.5.tar.xz/ext/wpe/gstwpevideosrc.cpp Changed

@@ -70,6 +70,12 @@
  * ```
  * Composite WPE with a video stream, sink_0 pad properties have to match the video dimensions.
  *
+ * ```shell
+ * weston -S $HOME/weston-sock -B headless-backend.so --use-gl &
+ * WAYLAND_DISPLAY=$HOME/weston-sock gst-launch-1.0 wpevideosrc location=https://google.com ! queue ! fakevideosink
+ * ```
+ * Render Google.com with WPE in a headless Weston compositor. This can be useful for server-side WPE video processing.
+ *
  * Since: 1.16
  */
 
@@ -92,7 +98,7 @@
 #include <gst/video/video.h>
 #include <xkbcommon/xkbcommon.h>
 
-#include "WPEThreadedView.h"
+#include "gstwpethreadedview.h"
 
 #define DEFAULT_WIDTH 1920
 #define DEFAULT_HEIGHT 1080
@@ -129,7 +135,7 @@
 
   gint64 n_frames;              /* total frames sent */
 
-  WPEView *view;
+  GstWPEThreadedView *view;
 
   GArray *touch_points;
   struct wpe_input_touch_event_raw *last_touch;
@@ -289,7 +295,7 @@
   GST_DEBUG_OBJECT (src, "Will %sfill GLMemories",
       src->gl_enabled ? "" : "NOT ");
 
-  auto & thread = WPEContextThread::singleton ();
+  auto & thread = GstWPEContextThread::singleton ();
 
   if (!src->view) {
     src->view = thread.createWPEView (src, context, display,

gst-plugins-bad-1.22.7.tar.xz/ext/wpe/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/wpe/meson.build Changed

@@ -6,16 +6,47 @@
   subdir_done()
 endif
 
-wpe_dep = dependency('wpe-webkit-1.1', version : '>= 2.28', required : false)
-if not wpe_dep.found()
-  wpe_dep = dependency('wpe-webkit-1.0', version : '>= 2.28', required : wpe_feat)
+# Version checks copied from Cog, licensed under MIT.
+# https://github.com/Igalia/cog. The difference is that for the 2.0 API we
+# require version 2.40.1, the first one without strict Application ID
+# requirement for the WebProcess sandbox.
+wpe_target_api_version_required = {
+  '2.0': '>=2.40.1',
+  '1.1': '>=2.33.1',
+  '1.0': '>=2.28.0',
+}
+
+wpe_target_api = get_option('wpe_api')
+if wpe_target_api == 'auto'
+  foreach try_api : '2.0', '1.1', '1.0'
+    wpewebkit_dep = dependency('wpe-webkit-' + try_api,
+                               version: wpe_target_api_version_requiredtry_api,
+                               required: false)
+    if wpewebkit_dep.found()
+      wpe_target_api = try_api
+      break
+    endif
+  endforeach
+else
+  wpewebkit_dep = dependency('wpe-webkit-' + wpe_target_api,
+                             version: wpe_target_api_version_requiredwpe_target_api)
+endif
+if wpe_target_api == 'auto' or not wpewebkit_dep.found()
+  subdir_done()
 endif
+
+use_wpe2 = 0
+if wpe_target_api == '2.0'
+  use_wpe2 = 1
+endif
+gst_wpe_c_args = '-DUSE_WPE2=@0@'.format(use_wpe2)
+
 wpe_fdo_dep = dependency('wpebackend-fdo-1.0', version : '>= 1.8', required : wpe_feat)
 egl_dep = dependency('egl', required : wpe_feat)
 xkbcommon_dep = dependency('xkbcommon', version : '>= 0.8', required : wpe_feat)
 wl_server_dep = dependency('wayland-server', required : wpe_feat)
 
-if not (wpe_dep.found() and wpe_fdo_dep.found() and egl_dep.found() and xkbcommon_dep.found())
+if not (wpe_fdo_dep.found() and egl_dep.found() and xkbcommon_dep.found())
   subdir_done()
 endif
 
@@ -25,11 +56,11 @@
 
 building_wpe = true
 gstwpe = library('gstwpe',
-  'WPEThreadedView.cpp', 'gstwpe.cpp', 'gstwpevideosrc.cpp', 'gstwpesrcbin.cpp',
-  dependencies : egl_dep, wpe_dep, wpe_fdo_dep, gstallocators_dep, gstaudio_dep, gstvideo_dep,
+  'gstwpethreadedview.cpp', 'gstwpe.cpp', 'gstwpevideosrc.cpp', 'gstwpesrcbin.cpp',
+  dependencies : egl_dep, wpewebkit_dep, wpe_fdo_dep, gstallocators_dep, gstaudio_dep, gstvideo_dep,
     gstbase_dep, gstgl_dep, xkbcommon_dep, wl_server_dep, giounix_dep,
   cpp_args : gst_plugins_bad_args + '-DHAVE_CONFIG_H=1',
-    '-DWPE_EXTENSION_INSTALL_DIR=' + wpe_extension_install_dir,
+    '-DWPE_EXTENSION_INSTALL_DIR=' + wpe_extension_install_dir + gst_wpe_c_args,
   include_directories : configinc,
   install : true,
   install_dir : plugins_install_dir)

gst-plugins-bad-1.22.7.tar.xz/ext/wpe/wpe-extension/gstwpeextension.c -> gst-plugins-bad-1.24.5.tar.xz/ext/wpe/wpe-extension/gstwpeextension.c Changed

@@ -28,18 +28,49 @@
 #include <gst/gst.h>
 #include <gmodule.h>
 #include <gio/gunixfdlist.h>
-#include <wpe/webkit-web-extension.h>
 
 GST_DEBUG_CATEGORY_STATIC (wpe_extension_debug);
 #define GST_CAT_DEFAULT wpe_extension_debug
 
-G_MODULE_EXPORT void webkit_web_extension_initialize (WebKitWebExtension *
-    extension);
+#if USE_WPE2
+#define WebKitWebExtension WebKitWebProcessExtension
+#define extension_initialize webkit_web_process_extension_initialize
+#define extension_send_message_to_context webkit_web_process_extension_send_message_to_context
+#else
+#define extension_initialize webkit_web_extension_initialize
+#define extension_send_message_to_context webkit_web_extension_send_message_to_context
+#endif
+
+G_MODULE_EXPORT void extension_initialize (WebKitWebExtension * extension);
 
 static WebKitWebExtension *global_extension = NULL;
 
+#if !USE_WPE2
+static void
+console_message_cb (WebKitWebPage * page,
+    WebKitConsoleMessage * console_message, gpointer data)
+{
+  char *message = g_strdup (webkit_console_message_get_text (console_message));
+  gst_wpe_extension_send_message (webkit_user_message_new
+      ("gstwpe.console_message", g_variant_new ("(s)", message)), NULL, NULL,
+      NULL);
+  g_free (message);
+}
+#endif
+
+static void
+web_page_created_callback (WebKitWebExtension * extension,
+    WebKitWebPage * web_page, gpointer data)
+{
+  // WebKitConsoleMessage is deprecated in wpe1 and has no replacement in wpe2.
+#if !USE_WPE2
+  g_signal_connect (web_page, "console-message-sent",
+      G_CALLBACK (console_message_cb), NULL);
+#endif
+}
+
 void
-webkit_web_extension_initialize (WebKitWebExtension * extension)
+extension_initialize (WebKitWebExtension * extension)
 {
   g_return_if_fail (!global_extension);
 
@@ -55,12 +86,15 @@
 
   global_extension = extension;
   GST_INFO ("Setting as global extension.");
+
+  g_signal_connect (global_extension, "page-created",
+      G_CALLBACK (web_page_created_callback), NULL);
 }
 
 void
 gst_wpe_extension_send_message (WebKitUserMessage * msg,
     GCancellable * cancellable, GAsyncReadyCallback cb, gpointer udata)
 {
-  webkit_web_extension_send_message_to_context (global_extension, msg,
-      cancellable, cb, udata);
+  extension_send_message_to_context (global_extension, msg, cancellable, cb,
+      udata);
 }

gst-plugins-bad-1.22.7.tar.xz/ext/wpe/wpe-extension/gstwpeextension.h -> gst-plugins-bad-1.24.5.tar.xz/ext/wpe/wpe-extension/gstwpeextension.h Changed

gst-plugins-bad-1.22.7.tar.xz/ext/wpe/wpe-extension/meson.build -> gst-plugins-bad-1.24.5.tar.xz/ext/wpe/wpe-extension/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/ext/x265/gstx265enc.c -> gst-plugins-bad-1.24.5.tar.xz/ext/x265/gstx265enc.c Changed

@@ -422,9 +422,9 @@
     if (max_bit_minus_8 >= 2)
       has_10bit = TRUE;
 
-    has_8bit &= ! !vtable_8bit;
-    has_10bit &= ! !vtable_10bit;
-    has_12bit &= ! !vtable_12bit;
+    has_8bit &= !!vtable_8bit;
+    has_10bit &= !!vtable_10bit;
+    has_12bit &= !!vtable_12bit;
 
     /* 4:4:4 profiles can handle 4:2:2 and 4:2:0 */
     if (max_chroma_index >= 2)
@@ -534,8 +534,8 @@
       "height", GST_TYPE_INT_RANGE, 16, G_MAXINT, NULL);
 
   gst_x265_enc_add_x265_chroma_format (gst_caps_get_structure
-      (supported_sinkcaps, 0), TRUE, TRUE, TRUE, ! !vtable_8bit,
-      ! !vtable_10bit, ! !vtable_12bit);
+      (supported_sinkcaps, 0), TRUE, TRUE, TRUE, !!vtable_8bit,
+      !!vtable_10bit, !!vtable_12bit);
 
   sink_templ = gst_pad_template_new ("sink",
       GST_PAD_SINK, GST_PAD_ALWAYS, supported_sinkcaps);
@@ -591,7 +591,7 @@
   if (!gst_video_frame_map (&vframe, info, frame->input_buffer, GST_MAP_READ))
     return NULL;
 
-  fdata = g_slice_new (FrameData);
+  fdata = g_new (FrameData, 1);
   fdata->frame = gst_video_codec_frame_ref (frame);
   fdata->vframe = vframe;
 
@@ -613,7 +613,7 @@
 
     gst_video_frame_unmap (&fdata->vframe);
     gst_video_codec_frame_unref (fdata->frame);
-    g_slice_free (FrameData, fdata);
+    g_free (fdata);
 
     enc->pending_frames = g_list_delete_link (enc->pending_frames, l);
     return;
@@ -630,7 +630,7 @@
 
     gst_video_frame_unmap (&fdata->vframe);
     gst_video_codec_frame_unref (fdata->frame);
-    g_slice_free (FrameData, fdata);
+    g_free (fdata);
   }
   g_list_free (enc->pending_frames);
   enc->pending_frames = NULL;

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/adaptivedemux/gstadaptivedemux.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/adaptivedemux/gstadaptivedemux.c Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics Added

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics/analytics-meta-prelude.h Added

@@ -0,0 +1,36 @@
+/* GStreamer
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * analytics-meta-prelude.h
+ *
+ * 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 Publicn
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_ANALYTICS_META_PRELUDE_H__
+#define __GST_ANALYTICS_META_PRELUDE_H__
+
+#include <gst/gst.h>
+
+#ifndef GST_ANALYTICS_META_API
+# ifdef BUILDING_GST_ANALYTICS
+#   define GST_ANALYTICS_META_API GST_API_EXPORT
+# else
+#   define GST_ANALYTICS_META_API GST_API_IMPORT
+# endif
+#endif
+
+#endif /* __GST_ANALYTICS_META_PRELUDE_H__ */
+

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics/analytics.h Added

@@ -0,0 +1,34 @@
+/* GStreamer
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * analytics.h
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+
+#ifndef __ANALYTICS_H__
+#define __ANALYTICS_H__
+
+#include <gst/gst.h>
+#include <gst/analytics/analytics-meta-prelude.h>
+#include <gst/analytics/gstanalyticsmeta.h>
+#include <gst/analytics/gstanalyticsclassificationmtd.h>
+#include <gst/analytics/gstanalyticsobjectdetectionmtd.h>
+#include <gst/analytics/gstanalyticsobjecttrackingmtd.h>
+
+#endif /* __ANALYTICS_H__ */

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics/gstanalyticsclassificationmtd.c Added

@@ -0,0 +1,263 @@
+/* GStreamer
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * gstanalyticsclassificationmtd.c
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstanalyticsclassificationmtd.h"
+
+/**
+ * SECTION:gstanalyticsclassificationtd
+ * @title: GstAnalyticsClsMtd
+ * @short_description: An analytics metadata for classification inside a #GstAnalyticsRelationMeta
+ * @symbols:
+ * - GstAnalyticsClsMtd
+ * @see_also: #GstAnalyticsMtd, #GstAnalyticsRelationMeta
+ *
+ * This type of metadata holds classification, it is generally used in
+ * relationship with another metadata type to enhance its content. For example,
+ * it can enhance the classifcation of an object detection held by the
+ * #GstAnalyticsODMtd metadata type.
+ *
+ * Since: 1.24
+ */
+
+static const GstAnalyticsMtdImpl cls_impl = {
+  "classification",
+  NULL
+};
+
+typedef struct _GstAnalyticsClsConfLvlAndClass GstAnalyticsClsConfLvlAndClass;
+typedef struct _GstAnalyticsClsMtdData GstAnalyticsClsMtdData;
+
+struct _GstAnalyticsClsConfLvlAndClass
+{
+  GQuark class;
+  gfloat confidence_levels;
+};
+
+/*
+ * GstAnalyticsClsMtd:
+ * @length: classes and confidence levels count
+ * @class_quarks: (array length=length): Array of quark representing a class
+ * @confidence_levels: (array length=length): Array of confidence levels for
+ * each class in @class_quarks.
+ *
+ * Information on results of a classification of buffer content.
+ */
+struct _GstAnalyticsClsMtdData
+{
+  gsize length;
+  GstAnalyticsClsConfLvlAndClass confidence_levels_and_classes;       // Must be last
+};
+
+/**
+ * gst_analytics_cls_mtd_get_mtd_type:
+ *
+ * Get an id identifying #GstAnalyticsMtd type.
+ *
+ * Returns: opaque id of #GstAnalyticsMtd type
+ *
+ * Since: 1.24
+ */
+GstAnalyticsMtdType
+gst_analytics_cls_mtd_get_mtd_type (void)
+{
+  return (GstAnalyticsMtdType) & cls_impl;
+}
+
+/**
+ * gst_analytics_cls_mtd_get_level:
+ * @handle: instance handle
+ * @index: Object class index
+ *
+ * Get confidence level for class at @index
+ * Returns: confidence level for @index, <0.0 if the call failed.
+ *
+ * Since: 1.24
+ */
+gfloat
+gst_analytics_cls_mtd_get_level (GstAnalyticsClsMtd * handle, gsize index)
+{
+  g_return_val_if_fail (handle, -1.0);
+  g_return_val_if_fail (handle->meta != NULL, -1.0);
+  GstAnalyticsClsMtdData *cls_mtd_data;
+  cls_mtd_data = gst_analytics_relation_meta_get_mtd_data (handle->meta,
+      handle->id);
+  g_return_val_if_fail (cls_mtd_data != NULL, -1.0);
+  g_return_val_if_fail (cls_mtd_data->length > index, -1.0);
+  return cls_mtd_data->confidence_levels_and_classesindex.confidence_levels;
+}
+
+/**
+ * gst_analytics_cls_mtd_get_index_by_quark:
+ * @handle: Instance handle
+ * @quark: Quark of the class
+ * Get index of class represented by @quark
+ * Returns: index of the class associated with @quarks ( and label) or
+ *     a negative value on failure.
+ *
+ * Since: 1.24
+ */
+gint
+gst_analytics_cls_mtd_get_index_by_quark (GstAnalyticsClsMtd * handle,
+    GQuark quark)
+{
+  g_return_val_if_fail (handle, -1);
+
+  GstAnalyticsClsMtdData *cls_mtd_data;
+  cls_mtd_data = gst_analytics_relation_meta_get_mtd_data (handle->meta,
+      handle->id);
+  g_return_val_if_fail (cls_mtd_data != NULL, -1);
+
+  for (gint i = 0; i < cls_mtd_data->length; i++) {
+    if (quark == cls_mtd_data->confidence_levels_and_classesi.class) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+/**
+ * gst_analytics_cls_mtd_get_length:
+ * @handle: Instance handle
+ * Get number of classes
+ * Returns: Number of classes in this classification instance
+ *
+ * Since: 1.24
+ */
+gsize
+gst_analytics_cls_mtd_get_length (GstAnalyticsClsMtd * handle)
+{
+  GstAnalyticsClsMtdData *cls_mtd_data;
+  cls_mtd_data = gst_analytics_relation_meta_get_mtd_data (handle->meta,
+      handle->id);
+  g_return_val_if_fail (cls_mtd_data != NULL, 0);
+  return cls_mtd_data->length;
+}
+
+/**
+ * gst_analytics_cls_mtd_get_quark:
+ * @handle: Instance handle
+ * @index: index of the class
+ * Get quark of the class at @index
+ * Returns: Quark of this class (label) associated with @index
+ *
+ * Since: 1.24
+ */
+GQuark
+gst_analytics_cls_mtd_get_quark (GstAnalyticsClsMtd * handle, gsize index)
+{
+  GstAnalyticsClsMtdData *cls_mtd_data;
+  g_return_val_if_fail (handle, 0);
+  cls_mtd_data = gst_analytics_relation_meta_get_mtd_data (handle->meta,
+      handle->id);
+  g_return_val_if_fail (cls_mtd_data != NULL, 0);
+  g_return_val_if_fail (cls_mtd_data->length > index, 0);
+
+  return cls_mtd_data->confidence_levels_and_classesindex.class;
+}
+
+/**
+ * gst_analytics_relation_meta_add_cls_mtd:
+ * @instance: Instance of #GstAnalyticsRelationMeta where to add classification instance
+ * @length: length of @confidence_levels
+ * @confidence_levels: (array length=length): confidence levels
+ * @class_quarks: (array length=length): labels of this
+ *    classification. Order define index, quark, labels relation. This array
+ *    need to exist as long has this classification meta exist.
+ * @cls_mtd: (out) (not nullable): Handle updated to newly added classification meta.
+ *
+ * Add analytic classification metadata to @instance.
+ * Returns: Added successfully
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_add_cls_mtd (GstAnalyticsRelationMeta *
+    instance, gsize length, gfloat * confidence_levels, GQuark * class_quarks,
+    GstAnalyticsClsMtd * cls_mtd)
+{
+  g_return_val_if_fail (instance, FALSE);
+  gsize confidence_levels_size =
+      (sizeof (GstAnalyticsClsConfLvlAndClass) * length);
+  gsize size = sizeof (GstAnalyticsClsMtdData) + confidence_levels_size;
+  GstAnalyticsClsConfLvlAndClass *conf_lvls_and_classes;
+
+  GstAnalyticsClsMtdData *cls_mtd_data = (GstAnalyticsClsMtdData *)
+      gst_analytics_relation_meta_add_mtd (instance, &cls_impl, size, cls_mtd);
+  if (cls_mtd_data) {
+    cls_mtd_data->length = length;
+    for (gsize i = 0; i < length; i++) {
+      conf_lvls_and_classes = &(cls_mtd_data->confidence_levels_and_classesi);
+      conf_lvls_and_classes->class = class_quarksi;
+      conf_lvls_and_classes->confidence_levels = confidence_levelsi;
+    }
+  }
+  return cls_mtd_data != NULL;
+}
+
+/**
+ * gst_analytics_relation_meta_add_one_cls_mtd:
+ * @instance: Instance of #GstAnalyticsRelationMeta where to add classification instance
+ * @confidence_level: confidence levels
+ * @class_quark: labels of this
+ *    classification. Order define index, quark, labels relation. This array
+ *    need to exist as long has this classification meta exist.
+ * @cls_mtd: (out) (not nullable): Handle updated to newly added classification meta.
+ *
+ * Add analytic classification metadata to @instance.
+ * Returns: Added successfully
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_add_one_cls_mtd (GstAnalyticsRelationMeta *
+    instance, gfloat confidence_level, GQuark class_quark,
+    GstAnalyticsClsMtd * cls_mtd)
+{
+  static const gsize len = 1;
+
+  return gst_analytics_relation_meta_add_cls_mtd (instance, len,
+      &confidence_level, &class_quark, cls_mtd);
+}
+
+/**
+ * gst_analytics_relation_meta_get_cls_mtd:
+ * @meta: Instance of #GstAnalyticsRelationMeta
+ * @an_meta_id: Id of #GstAnalyticsClsMtd instance to retrieve
+ * @rlt: (out caller-allocates)(not nullable): Will be filled with relatable
+ *    meta
+ *
+ * Fill @rlt if a analytics-meta with id == @an_meta_id exist in @meta instance,
+ * otherwise this method return FALSE and @rlt is invalid.
+ *
+ * Returns: TRUE if successful.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_get_cls_mtd (GstAnalyticsRelationMeta * meta,
+    guint an_meta_id, GstAnalyticsClsMtd * rlt)
+{
+  return gst_analytics_relation_meta_get_mtd (meta, an_meta_id,
+      gst_analytics_cls_mtd_get_mtd_type (), (GstAnalyticsClsMtd *) rlt);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics/gstanalyticsclassificationmtd.h Added

@@ -0,0 +1,80 @@
+/* GStreamer
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * gstanalyticsclassificationmtd.h
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_ANALYTICS_CLASSIFICATION_H__
+#define __GST_ANALYTICS_CLASSIFICATION_H__
+
+#include <gst/gst.h>
+#include <gst/analytics/analytics-meta-prelude.h>
+#include <gst/analytics/gstanalyticsmeta.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GstAnalyticsClsMtd:
+ * @id: Instance identifier.
+ * @meta: Instance of #GstAnalyticsRelationMeta where the analysis-metadata
+ * identified by @id is stored.
+ *
+ * Handle containing data required to use gst_analytics_cls_mtd APIs. This type
+ * is generally expected to be allocated on the stack.
+ *
+ * Since: 1.24
+ */
+typedef struct _GstAnalyticsMtd GstAnalyticsClsMtd;
+
+GST_ANALYTICS_META_API
+GstAnalyticsMtdType gst_analytics_cls_mtd_get_mtd_type (void);
+
+GST_ANALYTICS_META_API
+gfloat gst_analytics_cls_mtd_get_level (GstAnalyticsClsMtd * handle,
+    gsize index);
+
+GST_ANALYTICS_META_API
+gint gst_analytics_cls_mtd_get_index_by_quark (GstAnalyticsClsMtd * handle,
+    GQuark quark);
+
+GST_ANALYTICS_META_API
+gsize gst_analytics_cls_mtd_get_length (GstAnalyticsClsMtd * handle);
+
+GST_ANALYTICS_META_API
+GQuark gst_analytics_cls_mtd_get_quark (GstAnalyticsClsMtd * handle,
+    gsize index);
+
+GST_ANALYTICS_META_API
+gboolean
+gst_analytics_relation_meta_add_cls_mtd (GstAnalyticsRelationMeta *
+    instance, gsize length, gfloat * confidence_levels, GQuark * class_quarks,
+    GstAnalyticsClsMtd * cls_mtd);
+
+GST_ANALYTICS_META_API
+gboolean
+gst_analytics_relation_meta_add_one_cls_mtd (GstAnalyticsRelationMeta *
+    instance, gfloat confidence_level, GQuark class_quark,
+    GstAnalyticsClsMtd * cls_mtd);
+
+GST_ANALYTICS_META_API
+gboolean
+gst_analytics_relation_meta_get_cls_mtd (GstAnalyticsRelationMeta * meta,
+    guint an_meta_id, GstAnalyticsClsMtd * rlt);
+
+G_END_DECLS
+#endif // __GST_ANALYTICS_CLASSIFICATION_H__

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics/gstanalyticsmeta.c Added

@@ -0,0 +1,1125 @@
+/* GStreamer
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * gstanalyticsmeta.c
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstanalyticsmeta.h"
+
+#include <gst/video/video.h>
+
+/**
+ * SECTION:gstanalyticsmeta
+ * @title: GstAnalyticsRelationMeta
+ * @short_description: A GstMeta for analytics metadata
+ * @symbols:
+ * - GstAnalyticsRelationMeta
+ * - GstAnalyticsMtd
+ * @see_also: #GstAnalyticsODMtd, #GstAnalyticsClsMtd, #GstAnalyticsTrackingMtd
+ *
+ * The #GstAnalyticsRelationMeta is a #GstMeta that can contain a large number
+ * of results from the analysis of a meta. Each result can be accessed by
+ * using its id, or more conviently, by using a #GstAnalyticsMtd. A matrix
+ * of relationships between the various metadata is also defined and can be
+ * filled by the analysis processes.
+ *
+ * Since: 1.24
+ */
+
+GST_DEBUG_CATEGORY_STATIC (an_relation_meta_debug);
+#define GST_CAT_AN_RELATION an_relation_meta_debug
+
+/*
+ * GstAnalyticsRelatableMtdData:
+ * @analysis_type: Identify the type of analysis-metadata
+ * @id: Instance identifier.
+ * @size: Size in bytes of the instance
+ *
+ * Base structure for analysis-metadata that can be placed in relation. Only
+ * other analysis-metadata based on GstAnalyticsRelatableMtdDatax should
+ * directly use this structure.
+ */
+typedef struct
+{
+  const GstAnalyticsMtdImpl *impl;
+  guint id;
+  gsize size;
+  gpointer data;
+} GstAnalyticsRelatableMtdData;
+
+
+/*
+ * GstAnalyticsRelationMeta:
+ * Meta storing analysis-metadata relation information.
+ *
+ */
+typedef struct _GstAnalyticsRelationMeta
+{
+  GstMeta parent_meta;
+
+  /*< Next id > */
+  guint next_id;
+
+  /* Adjacency-matrix */
+  guint8 **adj_mat;
+
+  /* Lookup (offset relative to analysis_results) of relatable metadata */
+  gsize *mtd_data_lookup;
+
+  /* Relation order */
+  gsize rel_order;
+
+  /* Increment used when relation order grow */
+  gsize rel_order_increment;
+
+  /* Analysis metadata based on GstAnalyticsRelatableMtdData */
+  gint8 *analysis_results;
+
+  /* Current writing location in analysis_results buffer */
+  gsize offset;
+
+  /* Size of analysis_results buffer */
+  gsize max_size;
+
+  /* Increment of analysis_results */
+  gsize max_size_increment;
+
+  /* Number of analytic metadata (GstAnalyticsRelatableMtdData) in
+   * analysis_results */
+  gsize length;
+
+} GstAnalyticsRelationMeta;
+
+static guint
+gst_analytics_relation_meta_get_next_id (GstAnalyticsRelationMeta * meta);
+
+
+static GstAnalyticsRelatableMtdData *
+gst_analytics_relation_meta_get_mtd_data_internal (GstAnalyticsRelationMeta *
+    meta, guint an_meta_id)
+{
+  GstAnalyticsRelatableMtdData *rv;
+  g_return_val_if_fail (meta, NULL);
+  if (an_meta_id >= meta->rel_order) {
+    GST_CAT_ERROR (GST_CAT_AN_RELATION, "Invalid parameter");
+    return NULL;
+  }
+  rv = (GstAnalyticsRelatableMtdData *)
+      (meta->mtd_data_lookupan_meta_id + meta->analysis_results);
+
+  return rv;
+}
+
+/**
+ * gst_analytics_mtd_get_mtd_type:
+ *
+ * @instance: Instance of #GstAnalyticsMtd
+ * Get analysis result type.
+ *
+ * Returns: opaque id of the type
+ * Since: 1.24
+ */
+GstAnalyticsMtdType
+gst_analytics_mtd_get_mtd_type (GstAnalyticsMtd * handle)
+{
+  GstAnalyticsRelatableMtdData *rlt;
+  rlt = gst_analytics_relation_meta_get_mtd_data_internal (handle->meta,
+      handle->id);
+
+  g_return_val_if_fail (rlt != NULL, 0);
+
+  return (GstAnalyticsMtdType) rlt->impl;
+}
+
+/**
+ * gst_analytics_mtd_get_id:
+ * @instance: Instance of #GstAnalyticsMtd
+ *
+ * Get instance id
+ *
+ * Returns: Id of @instance
+ * Since: 1.24
+ */
+guint
+gst_analytics_mtd_get_id (GstAnalyticsMtd * handle)
+{
+  return handle->id;
+}
+
+/**
+ * gst_analytics_mtd_get_size:
+ * @instance: Instance of #GstAnalyticsMtd
+ *
+ * Get instance size
+ *
+ * Returns: Size (in bytes) of this instance or 0 on failure.
+ * Since: 1.24
+ */
+gsize
+gst_analytics_mtd_get_size (GstAnalyticsMtd * handle)
+{
+  GstAnalyticsRelatableMtdData *rlt;
+  rlt = gst_analytics_relation_meta_get_mtd_data_internal (handle->meta,
+      handle->id);
+  if (rlt == NULL) {
+    GST_CAT_ERROR (GST_CAT_AN_RELATION, "Invalid parameter");
+    return 0;
+  }
+
+  return rlt->size;
+}
+
+/**
+ * gst_analytics_mtd_type_get_name:
+ * @type: The type of analytics data
+ *
+ * Gets the string version of the name of this type of analytics data
+ *
+ * Returns: the name
+ * Since: 1.24
+ */
+const gchar *
+gst_analytics_mtd_type_get_name (GstAnalyticsMtdType type)
+{
+  GstAnalyticsMtdImpl *impl = (GstAnalyticsMtdImpl *) type;
+
+  g_return_val_if_fail (impl != NULL, NULL);
+
+  if (type == GST_ANALYTICS_MTD_TYPE_ANY)
+    return "ANY";
+  else
+    return impl->name;
+}
+
+/**
+ * gst_analytics_relation_get_length:
+ * @instance: Instance of #GstAnalyticsRelationMeta
+ *
+ * Get number of relatable meta attached to instance
+ *
+ * Returns: Number of analysis-meta attached to this
+ *  instance.
+ * Since: 1.24
+ */
+gsize
+gst_analytics_relation_get_length (GstAnalyticsRelationMeta * instance)
+{
+  gsize rv;
+  g_return_val_if_fail (instance, 0);
+
+  rv = instance->length;
+  return rv;
+}
+
+/*
+ * gst_analytics_relation_adj_mat_create:
+ * @order: Order or the adjacency-matrix to create.
+ * Create a new adjacency-matrix (array of MxN where M and N are equal
+ * to order).
+ *
+ * Returns: new adjacency-matrix
+ *
+ * Since: 1.24
+ */
+static guint8 **
+gst_analytics_relation_adj_mat_create (gsize order)
+{
+  guint8 **adj_mat, *data;
+  gsize sz = sizeof (guint8 *) * order + sizeof (guint8) * order * order;
+  adj_mat = (guint8 **) g_malloc0 (sz);
+  data = (guint8 *) (adj_mat + order);
+  for (gsize r = 0; r < order; r++) {
+    adj_matr = (data + order * r);
+  }
+  return adj_mat;
+}
+
+/**
+ * gst_analytics_relation_adj_mat_dup:
+ * @adj_mat: Adjcency-matrix (array or MxN)
+ * @order: Order of the existing matrix
+ * @new_order: Order of the matrix to create
+ *
+ * Duplicate adj_mat to a newly allocated array new_order x new_order dimension
+ * while keep values of adj_mat at the same indexes in the new array.
+ *
+ * Returns: New adjacency matrix with maintained values.
+ * Since: 1.24
+ */
+static guint8 **
+gst_analytics_relation_adj_mat_dup (guint8 ** adj_mat, gsize order,
+    gsize new_order)
+{
+  guint8 **new_adj_mat = gst_analytics_relation_adj_mat_create (new_order);
+  for (gsize r = 0; r < order; r++) {
+    memcpy (new_adj_matr, adj_matr, sizeof (guint8) * order);
+  }
+  return new_adj_mat;
+}
+
+/**
+ * gst_analytics_relation_meta_api_get_type:
+ *
+ * Returns: GType of GstAnalyticsRelationMeta
+ * Since: 1.24
+ */
+GType
+gst_analytics_relation_meta_api_get_type (void)
+{
+  static GType type = 0;
+  static const gchar *tags = {
+    GST_META_TAG_VIDEO_SIZE_STR,
+    GST_META_TAG_VIDEO_ORIENTATION_STR,
+    GST_META_TAG_VIDEO_STR,
+    NULL
+  };
+  if (g_once_init_enter (&type)) {
+    GType newType =
+        gst_meta_api_type_register ("GstAnalyticsRelationMetaAPI", tags);
+    GST_DEBUG_CATEGORY_INIT (an_relation_meta_debug, "anrelmeta",
+        GST_DEBUG_FG_BLACK, "Content analysis meta relations meta");
+    g_once_init_leave (&type, newType);
+  }
+  return type;
+}
+
+static gboolean
+gst_analytics_relation_meta_init (GstMeta * meta, gpointer params,
+    GstBuffer * buffer)
+{
+  GstAnalyticsRelationMeta *rmeta = (GstAnalyticsRelationMeta *) meta;
+  GstAnalyticsRelationMetaInitParams *rel_params = params;
+  rmeta->next_id = 0;
+
+  g_return_val_if_fail (params != NULL, FALSE);
+
+  GST_CAT_TRACE (GST_CAT_AN_RELATION, "Relation order:%" G_GSIZE_FORMAT,
+      *((gsize *) params));
+
+  rmeta->rel_order_increment = rel_params->initial_relation_order;
+  rmeta->rel_order = rmeta->rel_order_increment;
+  if (rmeta->rel_order > 0) {
+    rmeta->adj_mat = gst_analytics_relation_adj_mat_create (rmeta->rel_order);
+    rmeta->mtd_data_lookup = g_malloc0 (sizeof (gpointer) * rmeta->rel_order);
+  }
+  rmeta->offset = 0;
+  rmeta->max_size = rmeta->max_size_increment = rel_params->initial_buf_size;
+  rmeta->analysis_results = g_malloc (rel_params->initial_buf_size);
+  rmeta->length = 0;
+
+  if (buffer->pool)
+    GST_META_FLAG_SET (meta, GST_META_FLAG_POOLED);
+
+  GST_CAT_DEBUG (GST_CAT_AN_RELATION,
+      "Content analysis meta-relation meta(%p, order=%" G_GSIZE_FORMAT
+      ") created for buffer(%p)", (gpointer) rmeta, *(gsize *) params,
+      (gpointer) buffer);
+  return TRUE;
+}
+
+static void
+gst_analytics_relation_meta_free (GstMeta * meta, GstBuffer * buffer)
+{
+  GstAnalyticsRelationMeta *rmeta = (GstAnalyticsRelationMeta *) meta;
+
+  GST_CAT_TRACE (GST_CAT_AN_RELATION,
+      "Content analysis meta-data(%p) freed for buffer(%p)",
+      (gpointer) rmeta, (gpointer) buffer);
+
+  g_free (rmeta->analysis_results);
+  g_free (rmeta->adj_mat);
+  g_free (rmeta->mtd_data_lookup);
+}
+
+static gboolean
+gst_analytics_relation_meta_transform (GstBuffer * transbuf,
+    GstMeta * meta, GstBuffer * buffer, GQuark type, gpointer data)
+{
+
+  GST_CAT_TRACE (GST_CAT_AN_RELATION, "meta transform %s",
+      g_quark_to_string (type));
+
+  if (GST_META_TRANSFORM_IS_COPY (type) ||
+      GST_VIDEO_META_TRANSFORM_IS_SCALE (type)) {
+    GstAnalyticsRelationMeta *rmeta = (GstAnalyticsRelationMeta *) meta;
+    GstAnalyticsRelationMeta *new = (GstAnalyticsRelationMeta *)
+        gst_buffer_get_meta (transbuf, GST_ANALYTICS_RELATION_META_API_TYPE);
+
+    if (new == NULL) {
+      GstAnalyticsRelationMetaInitParams init_params = {
+        rmeta->rel_order, rmeta->max_size
+      };
+
+      GST_CAT_TRACE (GST_CAT_AN_RELATION,
+          "meta transform creating new meta rel_order:%" G_GSIZE_FORMAT
+          " max_size:%" G_GSIZE_FORMAT,
+          init_params.initial_relation_order, init_params.initial_buf_size);
+
+      new =
+          gst_buffer_add_analytics_relation_meta_full (transbuf, &init_params);
+    }
+
+    if (new->offset == 0) {
+      guint i;
+
+      if (new->rel_order < rmeta->rel_order) {
+        g_free (new->adj_mat);
+        g_free (new->mtd_data_lookup);
+        new->adj_mat = gst_analytics_relation_adj_mat_create (rmeta->rel_order);
+        new->mtd_data_lookup = g_malloc0 (sizeof (gpointer) * rmeta->rel_order);
+        new->rel_order = rmeta->rel_order;
+      }
+
+      if (new->max_size < rmeta->max_size) {
+        g_free (new->analysis_results);
+        new->analysis_results = g_malloc (rmeta->max_size);
+        new->max_size = rmeta->max_size;
+      }
+
+      if (rmeta->rel_order == new->rel_order) {
+        memcpy (new->adj_mat + new->rel_order, rmeta->adj_mat +
+            rmeta->rel_order, rmeta->rel_order * rmeta->rel_order);
+      } else {
+        /* When destination adj_mat has a higher order than source we need
+         * to copy by row to have the correct alignment */
+        for (gsize r = 0; r < rmeta->rel_order; r++) {
+          memcpy (new->adj_matr, rmeta->adj_matr, rmeta->rel_order);
+        }
+      }
+      memcpy (new->mtd_data_lookup, rmeta->mtd_data_lookup,
+          sizeof (gpointer) * rmeta->rel_order);
+      memcpy (new->analysis_results, rmeta->analysis_results, rmeta->offset);
+
+      new->length = rmeta->length;
+      new->next_id = rmeta->next_id;
+      new->offset = rmeta->offset;
+
+      for (i = 0; i < new->length; i++) {
+        GstAnalyticsRelatableMtdData *rlt_mtd_data =
+            (GstAnalyticsRelatableMtdData *) (new->mtd_data_lookupi +
+            new->analysis_results);
+        if (rlt_mtd_data->impl && rlt_mtd_data->impl->mtd_meta_transform) {
+          GstAnalyticsMtd transmtd;
+          transmtd.id = rlt_mtd_data->id;
+          transmtd.meta = new;
+          rlt_mtd_data->impl->mtd_meta_transform (transbuf, &transmtd, buffer,
+              type, data);
+        }
+      }
+      return TRUE;
+    } else {
+      g_warning ("Trying to copy GstAnalyticsRelationMeta into non-empty meta");
+      g_debug ("ofs:%" G_GSIZE_FORMAT, new->offset);
+
+      return FALSE;
+    }
+  }
+
+  return FALSE;
+}
+
+static void
+gst_analytics_relation_meta_clear (GstBuffer * buffer, GstMeta * meta)
+{
+  GstAnalyticsRelationMeta *rmeta = (GstAnalyticsRelationMeta *) meta;
+  gsize adj_mat_data_size =
+      (sizeof (guint8) * rmeta->rel_order * rmeta->rel_order);
+
+  rmeta->next_id = 0;
+  rmeta->offset = 0;
+  rmeta->length = 0;
+  if (adj_mat_data_size) {
+    /* Only clear data and not lines addresses occupying begining of this
+     * array. */
+    memset (rmeta->adj_mat + rmeta->rel_order, 0, adj_mat_data_size);
+  }
+}
+
+/**
+ * gst_analytics_relation_meta_get_info: (skip)
+ *
+ * Get the meta info
+ *
+ * Since: 1.24
+ */
+const GstMetaInfo *
+gst_analytics_relation_meta_get_info (void)
+{
+  static const GstMetaInfo *info = NULL;
+  if (g_once_init_enter ((GstMetaInfo **) & info)) {
+    GstMetaInfo *meta = gst_meta_info_new (GST_ANALYTICS_RELATION_META_API_TYPE,
+        "GstAnalyticsRelationMeta",
+        sizeof (GstAnalyticsRelationMeta));
+    meta->init_func = gst_analytics_relation_meta_init;
+    meta->free_func = gst_analytics_relation_meta_free;
+    meta->transform_func = gst_analytics_relation_meta_transform;
+    meta->clear_func = gst_analytics_relation_meta_clear;
+    meta = (GstMetaInfo *) gst_meta_info_register (meta);
+    g_once_init_leave ((GstMetaInfo **) & info, (GstMetaInfo *) meta);
+  }
+  return info;
+}
+
+/*
+ * gst_analytics_relation_meta_bfs:
+ * @start: start vertex
+ * @adj_mat: graph's adjacency matrix
+ * @adj_mat_order: order of the adjacency matrix (number of vertex in the graph)
+ * @edge_mask: allow to select edge type we are interested by.
+ * @max_span: Maximum number of edge to traverse from start vertex while
+ * exploring graph.
+ * @level: (out)(not nullable)(array length=adj_mat_order): Array that will be
+ *    filled with number of edge to traverse to reach @start from the vertex
+ *    identified by the array index. (Ex: start=1 and level3=2, mean we need
+ *    to traverse 2 edges from vertex 2 to vertex 3. A value of -1 in @level
+ *    mean this vertex is un-reachable considering @edge_mask, @max_span and
+ *    @adj_mat.
+ * @parent: (out)(array length=adj_mat_order): Array that will be filled with
+ *    shortest path information. The shortest path from vertex X and vertex
+ *    @start, where X is the index of @parent array. To find each node on the
+ *    path we need to recursively do ...parentparentparentX until value
+ *    is @start. Value at index Y equal to -1 mean there's no path from
+ *    vertex Y to vertex @start.
+ *
+ * This function can be used to find the existence of relation paths that
+ * emerge from a analysis-metadata (@start). The existence verification can
+ * also be parametrize by only considering certain types of relation
+ * (@edge_mask), a maximum intermediates analysis-metadata (@max_span). A
+ * usage exemple can be found in @gst_analytics_relation_meta_exist.
+ */
+static void
+gst_analytics_relation_meta_bfs (guint start, const guint8 ** adj_mat,
+    gsize adj_mat_order, guint8 edge_mask, gsize max_span, gint * level,
+    gint * parent)
+{
+  GSList *frontier = NULL;
+  GSList *iter;
+  GSList *next_frontier;
+  gsize i = 1;
+  memset (level, -1, sizeof (gint) * adj_mat_order);
+  memset (parent, -1, sizeof (gint) * adj_mat_order);
+
+  GST_CAT_TRACE (GST_CAT_AN_RELATION,
+      "Performing bfs to find relation(%x) starting from %d with less than %"
+      G_GSIZE_FORMAT " edges from start", edge_mask, start, max_span);
+
+  // vertex that has a relation with itself
+  if (adj_matstartstart & edge_mask) {
+    levelstart = 0;
+  }
+
+  frontier = g_slist_prepend (frontier, GINT_TO_POINTER (start));
+
+  while (frontier && i <= max_span) {
+    next_frontier = NULL;
+    for (iter = frontier; iter; iter = iter->next) {
+      for (gsize j = 0; j < adj_mat_order; j++) {
+        if (adj_mat(gsize) GPOINTER_TO_INT (iter->data)j & edge_mask) {
+          if (levelj == -1) {
+            levelj = i;
+            parentj = GPOINTER_TO_INT (iter->data);
+            GST_CAT_TRACE (GST_CAT_AN_RELATION, "Parent of %" G_GSIZE_FORMAT
+                " is %d", j, parentj);
+            next_frontier =
+                g_slist_prepend (next_frontier, GINT_TO_POINTER ((gint) j));
+          }
+        }
+      }
+    }
+    g_slist_free (frontier);
+    frontier = next_frontier;
+    i++;
+  }
+  g_slist_free (frontier);
+}
+
+/*
+ * gst_analytics_relation_meta_get_next_id:
+ * @meta a #GstAnalyticsRelationMeta from which we want to get next id.
+ *
+ * Get next id and prepare for future request.
+ *
+ * Returns: next id
+ *
+ */
+static guint
+gst_analytics_relation_meta_get_next_id (GstAnalyticsRelationMeta * meta)
+{
+  g_return_val_if_fail (meta != NULL, -1);
+  return g_atomic_int_add (&meta->next_id, 1);
+}
+
+/**
+ * gst_analytics_relation_meta_get_relation:
+ * @meta: (transfer none): a #GstAnalyticsRelationMeta
+ * @an_meta_first_id: Id of first analysis-meta
+ * @an_meta_second_id: Id of second  analysis-meta
+ *
+ * Get relations between first and second analysis-meta.
+ * Ids (@an_meta_first_id and @an_meta_second_id) must be from a call to
+ * @gst_analytics_mtd_get_id (handle).
+ *
+ * Returns: relation description between first and second analysis-meta.
+ * Since: 1.24
+ */
+GstAnalyticsRelTypes
+gst_analytics_relation_meta_get_relation (GstAnalyticsRelationMeta * meta,
+    guint an_meta_first_id, guint an_meta_second_id)
+{
+  GstAnalyticsRelTypes types = GST_ANALYTICS_REL_TYPE_NONE;
+  g_return_val_if_fail (meta, GST_ANALYTICS_REL_TYPE_NONE);
+
+  g_return_val_if_fail (meta->adj_mat != NULL, GST_ANALYTICS_REL_TYPE_NONE);
+  if (meta->rel_order > an_meta_first_id && meta->rel_order > an_meta_second_id) {
+    types = meta->adj_matan_meta_first_idan_meta_second_id;
+  } else {
+    GST_CAT_DEBUG (GST_CAT_AN_RELATION,
+        "an_meta_first(%u) and an_meta_second(%u) must be inferior to %"
+        G_GSIZE_FORMAT, an_meta_first_id, an_meta_second_id, meta->rel_order);
+
+    if (an_meta_first_id >= meta->rel_order) {
+      GST_CAT_ERROR (GST_CAT_AN_RELATION,
+          "an_meta_first(%u) must be from a call to "
+          "gst_analytics_mtd_get_id(...)", an_meta_first_id);
+    }
+
+    if (an_meta_second_id >= meta->rel_order) {
+      GST_CAT_ERROR (GST_CAT_AN_RELATION,
+          "an_meta_second(%u) must be from a call to "
+          "gst_analytics_mtd_get_id(...)", an_meta_second_id);
+    }
+  }
+  return types;
+}
+
+/**
+ * gst_analytics_relation_meta_set_relation:
+ * @meta: (transfer none): Parameter to receive new maximum number of
+ *    analysis-meta described by relation.
+ * @type: a #GstAnalyticsRelTypes defining relation between two analysis-meta
+ * @an_meta_first_id: first meta id
+ * @an_meta_second_id: second meta id
+ *
+ * Sets the relation (#GstAnalyticsRelTypes) between @an_meta_first and
+ *    @an_meta_second.
+ * Ids must have been obtained a call to
+ *    @gst_analytics_mtd_get_id(handle).
+ *
+ * Returns: TRUE on success and FALSE on failure.
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_set_relation (GstAnalyticsRelationMeta * meta,
+    GstAnalyticsRelTypes type, guint an_meta_first_id, guint an_meta_second_id)
+{
+  g_return_val_if_fail (type < GST_ANALYTICS_REL_TYPE_LAST, FALSE);
+  g_return_val_if_fail (meta, FALSE);
+  if (an_meta_first_id >= meta->rel_order
+      || an_meta_second_id >= meta->rel_order) {
+    GST_CAT_ERROR (GST_CAT_AN_RELATION, "Invalid parameter");
+    return FALSE;
+  }
+  meta->adj_matan_meta_first_idan_meta_second_id = type;
+  GST_CAT_TRACE (GST_CAT_AN_RELATION,
+      "Relation %x set between %u and %u",
+      type, an_meta_first_id, an_meta_second_id);
+  return TRUE;
+}
+
+/**
+ * gst_analytics_relation_meta_exist:
+ * @rmeta: (transfer none): a #GstAnalyticsRelationMeta describing analysis-meta
+ *    relation
+ * @an_meta_first_id: First analysis-meta
+ * @an_meta_second_id: Second analysis-meta
+ * @max_relation_span: Maximum number of relation between @an_meta_first_id and
+ *    @an_meta_second_id.
+ *    A value of 1 mean only only consider direct relation.
+ * @cond_types: condition on relation types.
+ * @relations_path: (transfer full)(nullable)(out caller-allocates)(array)
+ *    (element-type gint):
+ *    If not NULL this list will be filled with relation path between
+ *    @an_meta_first_id and
+ *    @an_meta_second_id. List value should be access with GSList API. Use
+ *    GPOINTER_TO_INT(iter->data) where iter is a GSList element to get
+ *    analysis-meta id on the relation path. Free this list with g_slist_free
+ *    (@relations_path) after using.
+ *
+ * Verify existence of relation(s) between @an_meta_first_d and
+ * @an_meta_second_id according to relation condition @cond_types. It optionally
+ * also return a shortest path of relations ( compliant with @cond_types)
+ * between @an_meta_first_id and @an_meta_second_id.
+ *
+ * Returns: TRUE if a relation between exit between @an_meta_first_id and
+ *  @an_meta_second_id, otherwise FALSE.
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_exist (GstAnalyticsRelationMeta * rmeta,
+    guint an_meta_first_id,
+    guint an_meta_second_id,
+    gint max_relation_span,
+    GstAnalyticsRelTypes cond_types, GArray ** relations_path)
+{
+  gboolean rv = FALSE;
+  guint8 **adj_mat;
+  gsize adj_mat_order, span;
+  GArray *path = NULL;
+  gint *level, i, path_left;
+  gint *parent;
+  g_return_val_if_fail (rmeta, FALSE);
+
+  if (!rmeta) {
+    GST_CAT_ERROR (GST_CAT_AN_RELATION, "Invalid parameter");
+    return EINVAL;
+  }
+  adj_mat_order = rmeta->rel_order;
+
+  if (adj_mat_order < (an_meta_first_id + 1)
+      || adj_mat_order < (an_meta_second_id + 1)) {
+
+    GST_CAT_DEBUG (GST_CAT_AN_RELATION,
+        "Testing relation existence for analysis-meta that have no index in "
+        "adj-mat.");
+
+    return FALSE;
+  }
+
+  adj_mat = rmeta->adj_mat;
+  if (max_relation_span < 0) {
+    span = G_MAXSIZE;
+  }
+  // If we're only considering the direct relation (@max_relation_span <= 1) we can directly read the
+  // adjacency-matrix,
+  if (max_relation_span == 0 || max_relation_span == 1) {
+    rv = (adj_matan_meta_first_idan_meta_second_id & cond_types) != 0;
+    if (rv && relations_path) {
+      path = *relations_path;
+
+      /* re-use array if possible */
+      if (path != NULL && (g_array_get_element_size (path) != sizeof (gint)
+              || path->len < 2)) {
+        g_array_free (path, TRUE);
+        path = NULL;
+      }
+
+      if (path == NULL) {
+        path = g_array_sized_new (FALSE, FALSE, sizeof (gint), 2);
+      }
+      g_array_index (path, gint, 0) = an_meta_first_id;
+      g_array_index (path, gint, 1) = an_meta_second_id;
+      path->len = 2;
+      *relations_path = path;
+    }
+  } else {
+
+    level = g_malloc (sizeof (gint) * adj_mat_order);
+    parent = g_malloc (sizeof (gint) * adj_mat_order);
+    gst_analytics_relation_meta_bfs (an_meta_first_id,
+        (const guint8 **) adj_mat, adj_mat_order, cond_types, span, level,
+        parent);
+
+    GST_CAT_TRACE (GST_CAT_AN_RELATION, "Adj order:%" G_GSIZE_FORMAT,
+        adj_mat_order);
+
+    rv = levelan_meta_second_id != -1;
+    if (rv && relations_path) {
+      path_left = levelan_meta_second_id + 1;
+      i = parentan_meta_second_id;
+      if (i != -1) {
+        path = *relations_path;
+
+        /* re-use array if possible */
+        if (path != NULL && (g_array_get_element_size (path) != sizeof (gint)
+                || path->len < path_left)) {
+          g_array_free (path, TRUE);
+          path = NULL;
+        }
+
+        if (path == NULL) {
+          path = g_array_sized_new (FALSE, FALSE, sizeof (gint), path_left);
+        }
+
+        path->len = path_left;
+        g_array_index (path, gint, --path_left) = an_meta_second_id;
+        //path = g_slist_prepend (path, GINT_TO_POINTER (an_meta_second_id));
+        while (i != -1 && i != an_meta_second_id) {
+          GST_CAT_TRACE (GST_CAT_AN_RELATION, "Relation parent of %d", i);
+          g_array_index (path, gint, --path_left) = i;
+          //path = g_slist_prepend (path, GINT_TO_POINTER (i));
+          i = parenti;
+        }
+
+        while (path_left > 0) {
+          g_array_index (path, gint, --path_left) = -1;
+        }
+      }
+      *relations_path = path;
+    }
+
+    g_free (level);
+    g_free (parent);
+  }
+
+  GST_CAT_TRACE (GST_CAT_AN_RELATION,
+      "Relation %x between %d and %d %s",
+      cond_types, an_meta_first_id, an_meta_second_id,
+      rv ? "exist" : "does not exist");
+  return rv;
+}
+
+
+/**
+ * gst_buffer_add_analytics_relation_meta:
+ * @buffer: (transfer none): a #GstBuffer
+ *
+ * Attach a analysis-results-meta-relation  meta (#GstAnalyticsRelationMeta)to @buffer.
+ *
+ * A #GstAnalyticsRelationMeta is a metadata describing relation between other
+ * analysis meta. It's more efficient to use #gst_buffer_add_analytics_relation_meta_full
+ * and providing the maximum number of analysis meta that will attached to a buffer.
+ *
+ * Returns: (transfer none) (nullable) : Newly attached #GstAnalyticsRelationMeta
+ * Since: 1.24
+ */
+GstAnalyticsRelationMeta *
+gst_buffer_add_analytics_relation_meta (GstBuffer * buffer)
+{
+  GstAnalyticsRelationMetaInitParams init_params = { 5, 1024 };
+  return gst_buffer_add_analytics_relation_meta_full (buffer, &init_params);
+}
+
+/**
+ * gst_buffer_add_analytics_relation_meta_full:
+ * @buffer: (transfer none): a #GstBuffer
+ * @init_params: Initialization parameters
+ *
+ * Attache a analysis-results relation-meta (#GstAnalyticsRelationMeta) to @buffer.
+ *
+ * A #GstAnalyticsRelationMeta is a metadata describing relation between other
+ * analysis meta.
+ *
+ * Returns: (transfer none) (nullable) : Newly attached #GstAnalyticsRelationMeta
+ * Since: 1.24
+ */
+GstAnalyticsRelationMeta *
+gst_buffer_add_analytics_relation_meta_full (GstBuffer * buffer,
+    GstAnalyticsRelationMetaInitParams * init_params)
+{
+  GstAnalyticsRelationMeta *meta = NULL;
+  g_return_val_if_fail (init_params != NULL, NULL);
+  g_return_val_if_fail (buffer != NULL, NULL);
+
+  // We only want one relation-meta on a buffer, will check if one already
+  // exist.
+  meta = (GstAnalyticsRelationMeta *) gst_buffer_get_meta (buffer,
+      GST_ANALYTICS_RELATION_META_API_TYPE);
+
+  if (!meta) {
+    meta =
+        (GstAnalyticsRelationMeta *) gst_buffer_add_meta (buffer,
+        GST_ANALYTICS_RELATION_META_INFO, init_params);
+  }
+
+  return meta;
+}
+
+/**
+ * gst_buffer_get_analytics_relation_meta:
+ * @buffer: a #GstBuffer
+ *
+ * Retrives the meta or %NULL if it doesn't exist
+ *
+ * Returns: (transfer none) (nullable) :The #GstAnalyticsRelationMeta if there is one
+ * Since: 1.24:
+ */
+GstAnalyticsRelationMeta *
+gst_buffer_get_analytics_relation_meta (GstBuffer * buffer)
+{
+  return (GstAnalyticsRelationMeta *)
+      gst_buffer_get_meta (buffer, GST_ANALYTICS_RELATION_META_API_TYPE);
+}
+
+/**
+ * gst_analytics_relation_meta_add_mtd: (skip)
+ * @meta: Instance
+ * @impl: Implementation of relatable (#GstAnalyticsRelatableMtd)
+ * @size: Size required
+ * @rlt_mtd: Updated handle
+ *
+ * Add a relatable metadata to @meta. This method is meant to be used by
+ * new struct sub-classing GstAnalyticsRelatableMtd.
+ *
+ * Returns: A pointer to a memory area of size @size where to put the data
+ * Since: 1.24
+ */
+gpointer
+gst_analytics_relation_meta_add_mtd (GstAnalyticsRelationMeta * meta,
+    const GstAnalyticsMtdImpl * impl, gsize size, GstAnalyticsMtd * rlt_mtd)
+{
+  gsize object_size;
+  gsize new_size;
+  GstAnalyticsRelatableMtdData *dest = NULL;
+  gpointer mem;
+  guint8 **new_adj_mat;
+  gsize new_mem_cap, new_rel_order;
+  GST_CAT_TRACE (GST_CAT_AN_RELATION, "Adding relatable metadata to rmeta %p",
+      meta);
+
+  object_size = sizeof (GstAnalyticsRelatableMtdData);
+  object_size += sizeof (gpointer) * (size / sizeof (gpointer));
+  if (size % sizeof (gpointer))
+    object_size += sizeof (gpointer);
+  new_size = meta->offset + object_size;
+
+  if (new_size > meta->max_size) {
+
+    if (new_size > meta->max_size_increment + meta->offset) {
+      new_mem_cap = new_size;
+    } else {
+      new_mem_cap = meta->max_size + meta->max_size_increment;
+    }
+
+    mem = g_realloc (meta->analysis_results, new_mem_cap);
+    meta->max_size = new_mem_cap;
+    meta->analysis_results = mem;
+  }
+
+  if (meta->length >= meta->rel_order) {
+    new_rel_order = meta->rel_order + meta->rel_order_increment;
+    new_adj_mat = gst_analytics_relation_adj_mat_dup (meta->adj_mat,
+        meta->rel_order, new_rel_order);
+    g_free (meta->adj_mat);
+    meta->adj_mat = new_adj_mat;
+
+    mem = g_realloc (meta->mtd_data_lookup, sizeof (gpointer) * new_rel_order);
+    meta->mtd_data_lookup = mem;
+    meta->rel_order = new_rel_order;
+  }
+
+  if (new_size <= meta->max_size && (meta->length < meta->rel_order)) {
+    dest =
+        (GstAnalyticsRelatableMtdData *) (meta->analysis_results +
+        meta->offset);
+    dest->impl = impl;
+    dest->id = gst_analytics_relation_meta_get_next_id (meta);
+    dest->size = size;
+    meta->mtd_data_lookupdest->id = meta->offset;
+    meta->offset += object_size;
+    meta->length++;
+    rlt_mtd->id = dest->id;
+    rlt_mtd->meta = meta;
+    GST_CAT_TRACE (GST_CAT_AN_RELATION, "Add %p relatable type=%s (%"
+        G_GSIZE_FORMAT " / %" G_GSIZE_FORMAT ").", dest,
+        impl->name, new_size, meta->max_size);
+  } else {
+    GST_CAT_ERROR (GST_CAT_AN_RELATION,
+        "Failed to add relatable, out-of-space (%" G_GSIZE_FORMAT " / %"
+        G_GSIZE_FORMAT ").", new_size, meta->max_size);
+  }
+  return &dest->data0;
+}
+
+/**
+ * gst_analytics_relation_meta_get_mtd:
+ * @meta: Instance of GstAnalyticsRelationMeta
+ * @an_meta_id: Id of GstAnalyticsMtd instance to retrieve
+ * @type: Filter on a specific type of analysis, use
+ *  %GST_ANALYTICS_MTD_TYPE_ANY to match any type
+ * @rlt: (out caller-allocates)(not nullable): Will be filled with relatable
+ *    meta
+ *
+ * Fill @rlt if a analytics-meta with id == @an_meta_id exist in @meta instance,
+ * otherwise this method return FALSE and @rlt is invalid.
+ *
+ * Returns: TRUE if successful.
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_get_mtd (GstAnalyticsRelationMeta * meta,
+    guint an_meta_id, GstAnalyticsMtdType type, GstAnalyticsMtd * rlt)
+{
+  GstAnalyticsRelatableMtdData *d;
+
+  g_return_val_if_fail (meta, FALSE);
+  g_return_val_if_fail (rlt, FALSE);
+
+  rlt->meta = NULL;
+
+  if (an_meta_id >= meta->length) {
+    GST_CAT_ERROR (GST_CAT_AN_RELATION, "Invalid parameter");
+    return FALSE;
+  }
+
+  d = gst_analytics_relation_meta_get_mtd_data_internal (meta, an_meta_id);
+  if (d == NULL)
+    return FALSE;
+
+  if (d->impl == NULL) {
+    return FALSE;
+  }
+
+  if (type != GST_ANALYTICS_MTD_TYPE_ANY &&
+      d->impl != (GstAnalyticsMtdImpl *) type) {
+    return FALSE;
+  }
+
+  rlt->meta = meta;
+  rlt->id = an_meta_id;
+
+  return TRUE;
+}
+
+/**
+ * gst_analytics_relation_meta_get_mtd_data: (skip)
+ * @meta: Instance of GstAnalyticsRelationMeta
+ * @an_meta_id: Id of GstAnalyticsMtd instance to retrieve
+ *
+ * Returns:(nullable): Analytics data pointer
+ * Since: 1.24
+ */
+gpointer
+gst_analytics_relation_meta_get_mtd_data (GstAnalyticsRelationMeta *
+    meta, guint an_meta_id)
+{
+  GstAnalyticsRelatableMtdData *rv =
+      gst_analytics_relation_meta_get_mtd_data_internal (meta, an_meta_id);
+  return &rv->data0;
+}
+
+
+/**
+ * gst_analytics_relation_meta_get_direct_related:
+ * @meta: GstAnalyticsRelationMeta instance where to query for
+ *    GstAnalyticsRelatableMtd.
+ * @an_meta_id: Id of GstAnalyticsMtd involved in relation to query
+ * @relation_type: Type of relation to filter on.
+ * @type: Type of GstAnalyticsMtd to filter on
+ * @state: (inout) (not nullable): Opaque data to store state of the query.
+ *    If @state point to NULL, the first analytics-metadata directly related
+ *    to @an_meta_id will be set in @rlt_mtd. Doesn't need to be free.
+ * @rlt_mtd: Handle updated to directly related relatable meta.
+ *
+ * Returns: TRUE if @rlt_mtd was updated, other wise FALSE
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_get_direct_related (GstAnalyticsRelationMeta * meta,
+    guint an_meta_id, GstAnalyticsRelTypes relation_type,
+    GstAnalyticsMtdType type, gpointer * state, GstAnalyticsMtd * rlt_mtd)
+{
+  guint8 **adj_mat;
+  gsize adj_mat_order;
+  GstAnalyticsRelationMeta *rmeta = (GstAnalyticsRelationMeta *) meta;
+  GstAnalyticsRelatableMtdData *rlt_mtd_data = NULL;
+  gsize i;
+
+  GST_CAT_TRACE (GST_CAT_AN_RELATION,
+      "Looking for %s related to %u by %d",
+      gst_analytics_mtd_type_get_name (type), an_meta_id, relation_type);
+
+  g_return_val_if_fail (rmeta != NULL, FALSE);
+
+  if (state) {
+    if (*state) {
+      i = ~G_MINSSIZE & (GPOINTER_TO_SIZE (*state) + 1);
+    } else {
+      i = 0;
+      *state = GSIZE_TO_POINTER (G_MINSSIZE | i);
+    }
+  } else {
+    i = 0;
+  }
+
+  adj_mat_order = meta->rel_order;
+
+  if (adj_mat_order < (an_meta_id + 1)) {
+    GST_CAT_DEBUG (GST_CAT_AN_RELATION,
+        "Testing relation existence for analysis-meta that have no index in "
+        "adj-mat.");
+    return FALSE;
+  }
+
+  rlt_mtd->meta = rmeta;
+  adj_mat = meta->adj_mat;
+  for (; i < adj_mat_order; i++) {
+    if (adj_matan_meta_idi & relation_type) {
+      rlt_mtd_data = (GstAnalyticsRelatableMtdData *)
+          (meta->mtd_data_lookupi + meta->analysis_results);
+      rlt_mtd->id = rlt_mtd_data->id;
+      if (type == GST_ANALYTICS_MTD_TYPE_ANY
+          || gst_analytics_mtd_get_mtd_type (rlt_mtd) == type) {
+        if (state) {
+          *state = GSIZE_TO_POINTER (G_MINSSIZE | i);
+        }
+        GST_CAT_TRACE (GST_CAT_AN_RELATION, "Found match at %" G_GSIZE_FORMAT,
+            i);
+        break;
+      }
+      rlt_mtd_data = NULL;
+    }
+  }
+
+  return rlt_mtd_data != NULL;
+}
+
+/**
+ * gst_analytics_relation_meta_iterate:
+ * @meta: Instance of GstAnalyticsRelationMeta
+ * @state: Opaque data to store iteration state, initialize to NULL, no need to
+ *    free it.
+ * @type: Type of GstAnalyticsMtd to iterate on or use
+ *  %GST_ANALYTICS_MTD_TYPE_ANY for any.
+ * @rlt_mtd: Handle updated to iterated GstAnalyticsRelatableMtd.
+ *
+ * Returns: FALSE if end was reached and iteration is completed.
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_iterate (GstAnalyticsRelationMeta * meta,
+    gpointer * state, GstAnalyticsMtdType type, GstAnalyticsMtd * rlt_mtd)
+{
+  gsize index;
+  gsize len = gst_analytics_relation_get_length (meta);
+  GstAnalyticsRelatableMtdData *rlt_mtd_data = NULL;
+
+  g_return_val_if_fail (rlt_mtd != NULL, FALSE);
+
+  if (*state) {
+    index = ~G_MINSSIZE & (GPOINTER_TO_SIZE (*state) + 1);
+  } else {
+    index = 0;
+    *state = GSIZE_TO_POINTER (G_MINSSIZE | index);
+  }
+  for (; index < len; index++) {
+    rlt_mtd_data = (GstAnalyticsRelatableMtdData *)
+        (meta->mtd_data_lookupindex + meta->analysis_results);
+    rlt_mtd->id = rlt_mtd_data->id;
+    rlt_mtd->meta = meta;
+    if (type == GST_ANALYTICS_MTD_TYPE_ANY ||
+        gst_analytics_mtd_get_mtd_type (rlt_mtd) == type) {
+      *state = GSIZE_TO_POINTER (G_MINSSIZE | index);
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics/gstanalyticsmeta.h Added

@@ -0,0 +1,267 @@
+/* GStreamer
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * gstanalyticsmeta.h
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef __GST_ANALYTICS_META_H__
+#define __GST_ANALYTICS_META_H__
+
+#include <gst/gst.h>
+#include <gst/analytics/analytics-meta-prelude.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GST_INF_RELATION_SPAN:
+ *
+ * Passes to functions asking for a relation span when the span is
+ * infinite.
+ *
+ * Since: 1.24
+ */
+#define GST_INF_RELATION_SPAN -1
+typedef struct _GstAnalyticsMtd GstAnalyticsMtd;
+
+/**
+ * GstAnalyticsMtdType:
+ *
+ * Type of analytics meta data
+ *
+ * Since: 1.24
+ */
+typedef guintptr GstAnalyticsMtdType;
+
+/**
+ * GST_ANALYTICS_MTD_TYPE_ANY:
+ *
+ * A wildcard matching any type of analysis
+ *
+ * Since: 1.24
+ */
+
+#define GST_ANALYTICS_MTD_TYPE_ANY (0)
+
+/**
+ * GST_ANALYTICS_MTD_CAST: (skip)
+ *
+ * Since: 1.24
+ */
+#define GST_ANALYTICS_MTD_CAST(mtd) \
+    ((GstAnalyticsMtd *)(mtd))
+
+/**
+ * GstAnalyticsRelationMeta:
+ *
+ * An opaque #GstMeta that can be used to hold various types of results
+ * from analysis processes.
+ *
+ * The content should be accessed through the API.
+ *
+ * Since: 1.24
+ */
+
+typedef struct _GstAnalyticsRelationMeta GstAnalyticsRelationMeta;
+
+/**
+ * GstAnalyticsMtd:
+ * @id: Instance identifier.
+ * @meta: Instance of #GstAnalyticsRelationMeta where the analysis-metadata
+ * identified by @id is stored.
+ *
+ * Handle containing data required to use gst_analytics_mtd API. This type
+ * is generally expected to be allocated on the stack.
+ *
+ * Since: 1.24
+ */
+struct _GstAnalyticsMtd
+{
+  guint id;
+  GstAnalyticsRelationMeta *meta;
+};
+
+/**
+ * GstAnalyticsMtdImpl:
+ * @name: The name of the metadata type
+ * @mtd_meta_transform: A pointer to a function that will be called
+ * when the containing meta is transform to potentially copy the data
+ * into a new Mtd into the new meta.
+ *
+ * This structure must be provided when registering a new type of Mtd. It must
+ * have a static lifetime (never be freed).
+ *
+ * Since: 1.24
+ */
+
+typedef struct {
+  const char *name;
+
+  gboolean (*mtd_meta_transform) (GstBuffer *transbuf, GstAnalyticsMtd *transmtd,
+                                  GstBuffer *buffer, GQuark type,
+                                  gpointer data);
+
+  /*< private >*/
+  gpointer _reservedGST_PADDING_LARGE;
+} GstAnalyticsMtdImpl;
+
+GST_ANALYTICS_META_API
+GstAnalyticsMtdType gst_analytics_mtd_get_mtd_type (GstAnalyticsMtd * instance);
+
+GST_ANALYTICS_META_API
+guint gst_analytics_mtd_get_id (GstAnalyticsMtd * instance);
+
+GST_ANALYTICS_META_API
+gsize gst_analytics_mtd_get_size (GstAnalyticsMtd * instance);
+
+GST_ANALYTICS_META_API
+const gchar *gst_analytics_mtd_type_get_name (GstAnalyticsMtdType type);
+
+typedef struct _GstAnalyticsRelationMetaInitParams
+    GstAnalyticsRelationMetaInitParams;
+
+/**
+ * GST_ANALYTICS_RELATION_META_API_TYPE:
+ *
+ * The Analyics Relation Meta API type
+ *
+ * Since: 1.24
+ */
+#define GST_ANALYTICS_RELATION_META_API_TYPE \
+  (gst_analytics_relation_meta_api_get_type())
+
+/**
+ * GST_ANALYTICS_RELATION_META_INFO: (skip)
+ *
+ * Get the meta info
+ *
+ * Since: 1.24
+ */
+#define GST_ANALYTICS_RELATION_META_INFO \
+  (gst_analytics_relation_meta_get_info())
+
+/**
+ * GstAnalyticsRelTypes:
+ * @GST_ANALYTICS_REL_TYPE_NONE: No relation
+ * @GST_ANALYTICS_REL_TYPE_IS_PART_OF: First analysis-meta is part of second analysis-meta
+ * @GST_ANALYTICS_REL_TYPE_CONTAIN: First analysis-meta contain second analysis-meta.
+ * @GST_ANALYTICS_REL_TYPE_RELATE: First analysis-meta relate to second analysis-meta.
+ * @GST_ANALYTICS_REL_TYPE_LAST: reserved
+ * @GST_ANALYTICS_REL_TYPE_ANY: Only use for criteria.
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_ANALYTICS_REL_TYPE_NONE = 0,
+  GST_ANALYTICS_REL_TYPE_IS_PART_OF = (1 << 1),
+  GST_ANALYTICS_REL_TYPE_CONTAIN = (1 << 2),
+  GST_ANALYTICS_REL_TYPE_RELATE_TO = (1 << 3),
+  GST_ANALYTICS_REL_TYPE_LAST = (1 << 4),
+  GST_ANALYTICS_REL_TYPE_ANY = G_MAXINT
+} GstAnalyticsRelTypes;
+
+
+/**
+ * GstAnalyticsRelationMetaInitParams:
+ * @initial_relation_order: Initial relations order.
+ * @initial_buf_size: Buffer size in bytes to store relatable metadata
+ *
+ * GstAnalyticsRelationMeta initialization parameters.
+ *
+ * Since: 1.24
+ */
+struct _GstAnalyticsRelationMetaInitParams
+{
+  gsize initial_relation_order;
+  gsize initial_buf_size;
+};
+
+GST_ANALYTICS_META_API GType gst_analytics_relation_meta_api_get_type (void);
+
+GST_ANALYTICS_META_API
+const GstMetaInfo *gst_analytics_relation_meta_get_info (void);
+
+GST_ANALYTICS_META_API
+gsize
+gst_analytics_relation_get_length (GstAnalyticsRelationMeta *
+    instance);
+
+GST_ANALYTICS_META_API
+GstAnalyticsRelTypes
+gst_analytics_relation_meta_get_relation (GstAnalyticsRelationMeta * meta,
+    guint an_meta_first_id, guint an_meta_second_id);
+
+GST_ANALYTICS_META_API
+gboolean
+gst_analytics_relation_meta_set_relation (GstAnalyticsRelationMeta
+    * meta, GstAnalyticsRelTypes type, guint an_meta_first_id,
+    guint an_meta_second_id);
+
+GST_ANALYTICS_META_API
+gboolean
+gst_analytics_relation_meta_exist (GstAnalyticsRelationMeta *
+    rmeta, guint an_meta_first_id, guint an_meta_second_id,
+    gint max_relation_span, GstAnalyticsRelTypes cond_types,
+    GArray ** relations_path);
+
+GST_ANALYTICS_META_API
+GstAnalyticsRelationMeta *
+gst_buffer_add_analytics_relation_meta (GstBuffer * buffer);
+
+GST_ANALYTICS_META_API
+GstAnalyticsRelationMeta *
+gst_buffer_add_analytics_relation_meta_full (GstBuffer * buffer,
+    GstAnalyticsRelationMetaInitParams * init_params);
+
+GST_ANALYTICS_META_API
+GstAnalyticsRelationMeta *
+gst_buffer_get_analytics_relation_meta (GstBuffer * buffer);
+
+GST_ANALYTICS_META_API
+gpointer
+gst_analytics_relation_meta_add_mtd (GstAnalyticsRelationMeta * meta,
+    const GstAnalyticsMtdImpl * impl, gsize size, GstAnalyticsMtd * rlt_mtd);
+
+GST_ANALYTICS_META_API
+gboolean
+gst_analytics_relation_meta_get_mtd (GstAnalyticsRelationMeta *
+    meta, guint an_meta_id, GstAnalyticsMtdType type, GstAnalyticsMtd * rlt);
+
+GST_ANALYTICS_META_API
+gpointer
+gst_analytics_relation_meta_get_mtd_data (GstAnalyticsRelationMeta * meta,
+    guint an_meta_id);
+
+GST_ANALYTICS_META_API
+gboolean
+gst_analytics_relation_meta_iterate (GstAnalyticsRelationMeta *
+    meta, gpointer * state, GstAnalyticsMtdType type,
+    GstAnalyticsMtd * rlt_mtd);
+
+GST_ANALYTICS_META_API
+gboolean
+gst_analytics_relation_meta_get_direct_related (GstAnalyticsRelationMeta * meta,
+    guint an_meta_id, GstAnalyticsRelTypes relation_type,
+    GstAnalyticsMtdType type, gpointer * state, GstAnalyticsMtd * rlt_mtd);
+
+G_END_DECLS
+#endif // __GST_ANALYTICS_META_H__

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c Added

@@ -0,0 +1,262 @@
+/* GStreamer
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * gstanalyticsobjectdetectionmtd.c
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstanalyticsobjectdetectionmtd.h"
+
+#include <gst/video/video.h>
+
+/**
+ * SECTION:gstanalyticsobjectdetectionmtd
+ * @title: GstAnalyticsODMtd
+ * @short_description: An analytics metadata for object dection inside a #GstAnalyticsRelationMeta
+ * @symbols:
+ * - GstAnalyticsODMtd
+ * @see_also: #GstAnalyticsMtd, #GstAnalyticsRelationMeta
+ *
+ * This type of metadata holds the position of detected object inside the
+ * image, along with the probabily of each detection.
+ *
+ * Since: 1.24
+ */
+
+typedef struct _GstAnalyticsODMtdData GstAnalyticsODMtdData;
+
+/**
+ * GstAnalyticsODMtdData:
+ * @object_type: Type of object
+ * @x: x component of upper-left corner
+ * @y: y component of upper-left corner
+ * @w: bounding box width
+ * @h: bounding box height
+ * @location_confidence_lvl: Confidence on object location
+ *
+ * Store information on results of object detection
+ *
+ * Since: 1.24
+ */
+struct _GstAnalyticsODMtdData
+{
+  GQuark object_type;
+  gint x;
+  gint y;
+  gint w;
+  gint h;
+  gfloat location_confidence_lvl;
+};
+
+static gboolean
+gst_analytics_od_mtd_meta_transform (GstBuffer * transbuf,
+    GstAnalyticsMtd * transmtd, GstBuffer * buffer, GQuark type, gpointer data)
+{
+  if (GST_VIDEO_META_TRANSFORM_IS_SCALE (type)) {
+    GstVideoMetaTransform *trans = data;
+    gint ow, oh, nw, nh;
+    GstAnalyticsODMtdData *oddata;
+
+    ow = GST_VIDEO_INFO_WIDTH (trans->in_info);
+    nw = GST_VIDEO_INFO_WIDTH (trans->out_info);
+    oh = GST_VIDEO_INFO_HEIGHT (trans->in_info);
+    nh = GST_VIDEO_INFO_HEIGHT (trans->out_info);
+
+    oddata = gst_analytics_relation_meta_get_mtd_data (transmtd->meta,
+        transmtd->id);
+
+    oddata->x *= nw;
+    oddata->x /= ow;
+
+    oddata->w *= nw;
+    oddata->w /= ow;
+
+    oddata->y *= nh;
+    oddata->y /= oh;
+
+    oddata->h *= nh;
+    oddata->h /= oh;
+  }
+
+  return TRUE;
+}
+
+static const GstAnalyticsMtdImpl od_impl = {
+  "object-detection",
+  gst_analytics_od_mtd_meta_transform
+};
+
+/**
+ * gst_analytics_od_mtd_get_mtd_type:
+ *
+ * Get an id that represent object-detection metadata type
+ *
+ * Returns: Opaque id of the #GstAnalyticsMtd type
+ *
+ * Since: 1.24
+ */
+GstAnalyticsMtdType
+gst_analytics_od_mtd_get_mtd_type (void)
+{
+  return (GstAnalyticsMtdType) & od_impl;
+}
+
+/**
+ * gst_analytics_od_mtd_get_location:
+ * @instance: instance
+ * @x: (out): x component of upper-left corner of the object location
+ * @y: (out): y component of upper-left corner of the object location
+ * @w: (out): bounding box width of the object location
+ * @h: (out): bounding box height of the object location
+ * @loc_conf_lvl: (out)(optional): Confidence on object location
+
+ *
+ * Retrieve location and location confidence level.
+ *
+ * Returns: TRUE on success, otherwise FALSE.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_od_mtd_get_location (GstAnalyticsODMtd * instance,
+    gint * x, gint * y, gint * w, gint * h, gfloat * loc_conf_lvl)
+{
+  GstAnalyticsODMtdData *data;
+
+  g_return_val_if_fail (instance && x && y && w && h, FALSE);
+  data = gst_analytics_relation_meta_get_mtd_data (instance->meta,
+      instance->id);
+  g_return_val_if_fail (data != NULL, FALSE);
+
+  *x = data->x;
+  *y = data->y;
+  *w = data->w;
+  *h = data->h;
+
+  if (loc_conf_lvl)
+    *loc_conf_lvl = data->location_confidence_lvl;
+
+  return TRUE;
+}
+
+/**
+ * gst_analytics_od_mtd_get_confidence_lvl:
+ * @instance: instance
+ * @loc_conf_lvl: (out): Confidence on object location
+ *
+ * Retrieve location confidence level.
+ *
+ * Returns: TRUE on success, otherwise FALSE.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_od_mtd_get_confidence_lvl (GstAnalyticsODMtd * instance,
+    gfloat * loc_conf_lvl)
+{
+  GstAnalyticsODMtdData *data;
+
+  g_return_val_if_fail (instance && loc_conf_lvl, FALSE);
+  data = gst_analytics_relation_meta_get_mtd_data (instance->meta,
+      instance->id);
+  g_return_val_if_fail (data != NULL, FALSE);
+
+  *loc_conf_lvl = data->location_confidence_lvl;
+
+  return TRUE;
+}
+
+/**
+ * gst_analytics_od_mtd_get_obj_type:
+ * @handle: Instance handle
+ *
+ * Quark of the class of object associated with this location.
+ *
+ * Returns: Quark different from on success and 0 on failure.
+ *
+ * Since: 1.24
+ */
+GQuark
+gst_analytics_od_mtd_get_obj_type (GstAnalyticsODMtd * handle)
+{
+  GstAnalyticsODMtdData *data;
+  g_return_val_if_fail (handle != NULL, 0);
+  data = gst_analytics_relation_meta_get_mtd_data (handle->meta, handle->id);
+  g_return_val_if_fail (data != NULL, 0);
+  return data->object_type;
+}
+
+/**
+ * gst_analytics_relation_meta_add_od_mtd:
+ * @instance: Instance of #GstAnalyticsRelationMeta where to add classification instance
+ * @type: Quark of the object type
+ * @x: x component of bounding box upper-left corner
+ * @y: y component of bounding box upper-left corner
+ * @w: bounding box width
+ * @h: bounding box height
+ * @loc_conf_lvl: confidence level on the object location
+ * @od_mtd: (out)(nullable): Handle updated with newly added object detection
+ *    meta. Add an object-detetion metadata to @instance.
+ *
+ * Returns: Added successfully
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_add_od_mtd (GstAnalyticsRelationMeta *
+    instance, GQuark type, gint x, gint y, gint w, gint h,
+    gfloat loc_conf_lvl, GstAnalyticsODMtd * od_mtd)
+{
+  g_return_val_if_fail (instance != NULL, FALSE);
+  gsize size = sizeof (GstAnalyticsODMtdData);
+  GstAnalyticsODMtdData *od_mtd_data = (GstAnalyticsODMtdData *)
+      gst_analytics_relation_meta_add_mtd (instance, &od_impl, size, od_mtd);
+  if (od_mtd_data) {
+    od_mtd_data->x = x;
+    od_mtd_data->y = y;
+    od_mtd_data->w = w;
+    od_mtd_data->h = h;
+    od_mtd_data->location_confidence_lvl = loc_conf_lvl;
+    od_mtd_data->object_type = type;
+  }
+  return od_mtd_data != NULL;
+}
+
+/**
+ * gst_analytics_relation_meta_get_od_mtd:
+ * @meta: Instance of #GstAnalyticsRelationMeta
+ * @an_meta_id: Id of #GstAnalyticsODMtd instance to retrieve
+ * @rlt: (out caller-allocates)(not nullable): Will be filled with relatable
+ *    meta
+ *
+ * Fill @rlt if a analytics-meta with id == @an_meta_id exist in @meta instance,
+ * otherwise this method return FALSE and @rlt is invalid.
+ *
+ * Returns: TRUE if successful.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_get_od_mtd (GstAnalyticsRelationMeta * meta,
+    guint an_meta_id, GstAnalyticsODMtd * rlt)
+{
+  return gst_analytics_relation_meta_get_mtd (meta, an_meta_id,
+      gst_analytics_od_mtd_get_mtd_type (), (GstAnalyticsODMtd *) rlt);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.h Added

@@ -0,0 +1,74 @@
+/* GStreamer
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * gstanalyticsobjectdetectionmtd.h
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef __GST_ANALYTICS_OBJECT_DETECTION_MTD__
+#define __GST_ANALYTICS_OBJECT_DETECTION_MTD__
+
+#include <gst/gst.h>
+#include <gst/analytics/analytics-meta-prelude.h>
+#include <gst/analytics/gstanalyticsmeta.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GstAnalyticsODMtd:
+ * @id: Instance identifier.
+ * @meta: Instance of #GstAnalyticsRelationMeta where the analysis-metadata
+ * identified by @id is stored.
+ *
+ * Handle containing data required to use gst_analytics_od_mtd APIs. This type
+ * is generally expected to be allocated on the stack.
+ *
+ * Since: 1.24
+ */
+typedef struct _GstAnalyticsMtd GstAnalyticsODMtd;
+
+GST_ANALYTICS_META_API
+GstAnalyticsMtdType gst_analytics_od_mtd_get_mtd_type (void);
+
+GST_ANALYTICS_META_API
+gboolean gst_analytics_od_mtd_get_location (GstAnalyticsODMtd * instance,
+    gint * x, gint * y, gint * w, gint * h, gfloat * loc_conf_lvl);
+
+GST_ANALYTICS_META_API
+gboolean gst_analytics_od_mtd_get_confidence_lvl (GstAnalyticsODMtd * instance,
+    gfloat * loc_conf_lvl);
+
+GST_ANALYTICS_META_API
+GQuark gst_analytics_od_mtd_get_obj_type (GstAnalyticsODMtd * handle);
+
+GST_ANALYTICS_META_API
+gboolean gst_analytics_relation_meta_add_od_mtd (
+    GstAnalyticsRelationMeta * instance, GQuark type, gint x, gint y,
+    gint w, gint h, gfloat loc_conf_lvl, GstAnalyticsODMtd * od_mtd);
+
+GST_ANALYTICS_META_API
+gboolean
+gst_analytics_relation_meta_get_od_mtd (GstAnalyticsRelationMeta * meta,
+    guint an_meta_id, GstAnalyticsODMtd * rlt);
+
+
+G_END_DECLS
+#endif // __GST_ANALYTICS_OBJECT_DETECTION_MTD__

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c Added

@@ -0,0 +1,218 @@
+/* GStreamer
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * gstanalyticsobjecttrackingmtd.c
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstanalyticsobjecttrackingmtd.h"
+
+/**
+ * SECTION:gstanalyticsobjecttrackingmtd
+ * @title: GstAnalyticsTrackingMtd
+ * @short_description: An analytics metadata for tracking inside a #GstAnalyticsRelationMeta
+ * @symbols:
+ * - GstAnalyticsTrackingMtd
+ * @see_also: #GstAnalyticsMtd, #GstAnalyticsRelationMeta
+ *
+ * This type of metadata holds tracking information. In many cases, it is
+ * desired to track an object across many frames. This type of metadata holds
+ * information about the tracking, for example, it can be used alongside a
+ * #GstAnalyticsODMtd to track an object.
+ *
+ * Since: 1.24
+ */
+
+typedef struct _GstAnalyticsTrackingMtdData GstAnalyticsTrackingMtdData;
+
+/**
+ * GstAnalyticsTrackingMtd:
+ * @tracking_id: Tracking identifier
+ * @tracking_first_seen: Tracking creation time
+ * @tracking_last_seen: Tracking last observation
+ * @tracking_lost: Track lost
+ *
+ * Store information on results of object tracking
+ *
+ * Since: 1.24
+ */
+struct _GstAnalyticsTrackingMtdData
+{
+  guint64 tracking_id;
+  GstClockTime tracking_first_seen;
+  GstClockTime tracking_last_seen;
+  gboolean tracking_lost;
+};
+
+
+static const GstAnalyticsMtdImpl tracking_impl = {
+  "object-tracking",
+  NULL
+};
+
+/**
+ * gst_analytics_tracking_mtd_get_mtd_type:
+ *
+ * Returns: id representing the type of GstAnalyticsRelatableMtd
+ *
+ * Get the opaque id identifying the relatable type
+ *
+ * Since: 1.24
+ */
+GstAnalyticsMtdType
+gst_analytics_tracking_mtd_get_mtd_type (void)
+{
+  return (GstAnalyticsMtdType) & tracking_impl;
+}
+
+/**
+ * gst_analytics_tracking_mtd_update_last_seen:
+ * @instance: GstAnalyticsTrackingMtd instance
+ * @last_seen: Timestamp of last time this object was tracked
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_tracking_mtd_update_last_seen (GstAnalyticsTrackingMtd * instance,
+    GstClockTime last_seen)
+{
+  GstAnalyticsTrackingMtdData *trk_mtd_data;
+  g_return_val_if_fail (instance, FALSE);
+  trk_mtd_data = gst_analytics_relation_meta_get_mtd_data (instance->meta,
+      instance->id);
+  g_return_val_if_fail (trk_mtd_data != NULL, FALSE);
+
+  trk_mtd_data->tracking_last_seen = last_seen;
+  return TRUE;
+}
+
+/**
+ * gst_analytics_tracking_mtd_set_lost:
+ * @instance: Instance of GstAnalyticsTrackingMtd.
+ * Set tracking to lost
+ *
+ * Returns: Update successful
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_tracking_mtd_set_lost (GstAnalyticsTrackingMtd * instance)
+{
+  GstAnalyticsTrackingMtdData *trk_mtd_data;
+  g_return_val_if_fail (instance, FALSE);
+  trk_mtd_data = gst_analytics_relation_meta_get_mtd_data (instance->meta,
+      instance->id);
+  g_return_val_if_fail (trk_mtd_data != NULL, FALSE);
+  trk_mtd_data->tracking_lost = TRUE;
+  return TRUE;
+}
+
+/**
+ * gst_analytics_tracking_mtd_get_info:
+ * @instance: Instance of tracking metadata
+ * @tracking_id: (out): Updated tracking id
+ * @tracking_first_seen: (out): Updated timestamp of the tracking first observation.
+ * @tracking_last_seen: (out): Updated timestamp of the tracking last observation.
+ * @tracking_lost: (out): Has the tracking been lost
+ *
+ * Retrieve tracking information.
+ *
+ * Returns: Successfully retrieved info.
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_tracking_mtd_get_info (GstAnalyticsTrackingMtd * instance,
+    guint64 * tracking_id, GstClockTime * tracking_first_seen, GstClockTime *
+    tracking_last_seen, gboolean * tracking_lost)
+{
+  GstAnalyticsTrackingMtdData *trk_mtd_data;
+  g_return_val_if_fail (instance, FALSE);
+  trk_mtd_data = gst_analytics_relation_meta_get_mtd_data (instance->meta,
+      instance->id);
+
+  g_return_val_if_fail (trk_mtd_data != NULL, FALSE);
+
+  if (tracking_id)
+    *tracking_id = trk_mtd_data->tracking_id;
+  if (tracking_first_seen)
+    *tracking_first_seen = trk_mtd_data->tracking_first_seen;
+  if (tracking_last_seen)
+    *tracking_last_seen = trk_mtd_data->tracking_last_seen;
+  if (tracking_lost)
+    *tracking_lost = trk_mtd_data->tracking_lost;
+
+  return TRUE;
+}
+
+
+/**
+ * gst_analytics_relation_meta_add_tracking_mtd:
+ * @instance: Instance of GstAnalyticsRelationMeta where to add tracking mtd
+ * @tracking_id: Tracking id
+ * @tracking_first_seen: Timestamp of first time the object was observed.
+ * @trk_mtd: (out) (not nullable): Handle updated with newly added tracking meta.
+ * Add an analytic tracking metadata to @instance.
+ * Returns: Added successfully
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_add_tracking_mtd (GstAnalyticsRelationMeta *
+    instance, guint64 tracking_id, GstClockTime tracking_first_seen,
+    GstAnalyticsTrackingMtd * trk_mtd)
+{
+  g_return_val_if_fail (instance, FALSE);
+
+  gsize size = sizeof (GstAnalyticsTrackingMtdData);
+  GstAnalyticsTrackingMtdData *trk_mtd_data = (GstAnalyticsTrackingMtdData *)
+      gst_analytics_relation_meta_add_mtd (instance, &tracking_impl, size,
+      trk_mtd);
+
+  if (trk_mtd_data) {
+    trk_mtd_data->tracking_id = tracking_id;
+    trk_mtd_data->tracking_first_seen = tracking_first_seen;
+    trk_mtd_data->tracking_last_seen = tracking_first_seen;
+    trk_mtd_data->tracking_lost = FALSE;
+  }
+  return trk_mtd_data != NULL;
+}
+
+/**
+ * gst_analytics_relation_meta_get_tracking_mtd:
+ * @meta: Instance of GstAnalyticsRelationMeta
+ * @an_meta_id: Id of GstAnalyticsMtd instance to retrieve
+ * @rlt: (out caller-allocates)(not nullable): Will be filled with relatable
+ *    meta
+ *
+ * Fill @rlt if a analytics-meta with id == @an_meta_id exist in @meta instance,
+ * otherwise this method return FALSE and @rlt is invalid.
+ *
+ * Returns: TRUE if successful.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_analytics_relation_meta_get_tracking_mtd (GstAnalyticsRelationMeta * meta,
+    guint an_meta_id, GstAnalyticsTrackingMtd * rlt)
+{
+  return gst_analytics_relation_meta_get_mtd (meta, an_meta_id,
+      gst_analytics_tracking_mtd_get_mtd_type (),
+      (GstAnalyticsTrackingMtd *) rlt);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.h Added

@@ -0,0 +1,75 @@
+/* GStreamer
+ * Copyright (C) 2023 Collabora Ltd
+ *
+ * gstobjecttrackingmtd.h
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef __GST_ANALYTICS_OBJECT_TRACKING_MTD__
+#define __GST_ANALYTICS_OBJECT_TRACKING_MTD__
+
+#include <gst/gst.h>
+#include <gst/analytics/analytics-meta-prelude.h>
+#include <gst/analytics/gstanalyticsmeta.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GstAnalyticsTrackMtd:
+ * @id: Instance identifier.
+ * @meta: Instance of #GstAnalyticsRelationMeta where the analysis-metadata
+ * identified by @id is stored.
+ *
+ * Handle containing data required to use gst_analytics_track_mtd APIs.
+ * This type is generally expected to be allocated on the stack.
+ *
+ * Since: 1.24
+ */
+typedef struct _GstAnalyticsMtd GstAnalyticsTrackingMtd;
+
+GST_ANALYTICS_META_API
+GstAnalyticsMtdType gst_analytics_tracking_mtd_get_mtd_type (void);
+
+GST_ANALYTICS_META_API
+gboolean gst_analytics_tracking_mtd_update_last_seen (GstAnalyticsTrackingMtd * instance,
+    GstClockTime last_seen);
+
+GST_ANALYTICS_META_API
+gboolean gst_analytics_tracking_mtd_set_lost (GstAnalyticsTrackingMtd * instance);
+
+GST_ANALYTICS_META_API
+gboolean gst_analytics_tracking_mtd_get_info (GstAnalyticsTrackingMtd * instance,
+    guint64 * tracking_id, GstClockTime * tracking_first_seen, GstClockTime *
+    tracking_last_seen, gboolean * tracking_lost);
+
+GST_ANALYTICS_META_API
+gboolean gst_analytics_relation_meta_add_tracking_mtd (
+    GstAnalyticsRelationMeta * instance, guint64 tracking_id,
+    GstClockTime tracking_first_seen, GstAnalyticsTrackingMtd * trk_mtd);
+
+GST_ANALYTICS_META_API
+gboolean
+gst_analytics_relation_meta_get_tracking_mtd (GstAnalyticsRelationMeta * meta,
+    guint an_meta_id, GstAnalyticsTrackingMtd * rlt);
+
+
+G_END_DECLS
+#endif // __GST_ANALYTICS_OBJECT_TRACKING_MTD__

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/analytics/meson.build Added

@@ -0,0 +1,64 @@
+analytics_sources = files( 'gstanalyticsmeta.c',
+                              'gstanalyticsclassificationmtd.c',
+                              'gstanalyticsobjectdetectionmtd.c',
+                              'gstanalyticsobjecttrackingmtd.c')
+
+analytics_headers = files(    'analytics.h',
+                              'gstanalyticsmeta.h',
+                              'analytics-meta-prelude.h',
+                              'gstanalyticsclassificationmtd.h',
+                              'gstanalyticsobjectdetectionmtd.h',
+                              'gstanalyticsobjecttrackingmtd.h')
+install_headers(analytics_headers, subdir : 'gstreamer-1.0/gst/analytics')
+
+pkg_name = 'gstreamer-analytics-1.0'
+gstanalytics = library('gstanalytics-' + api_version,
+  analytics_sources,
+  c_args : gst_plugins_bad_args + '-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_ANALYTICS', '-DG_LOG_DOMAIN="GStreamer-Analytics"',
+  include_directories : configinc, libsinc,
+  version : libversion,
+  soversion : soversion,
+  darwin_versions : osxversion,
+  install : true,
+  dependencies : gstbase_dep, gstvideo_dep)
+
+gst_libraries += pkg_name, {'lib': gstanalytics}
+pkgconfig.generate(gstanalytics,
+  libraries : gst_dep, gstbase_dep,
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : pkg_name,
+  description : 'GStreamer analytics metadata library',
+)
+gen_sources = 
+
+if build_gir
+  gir = {
+    'sources' : analytics_sources + analytics_headers,
+    'namespace' : 'GstAnalytics',
+    'nsversion' : api_version,
+    'identifier_prefix' : 'GstAnalytics', 'Gst',
+    'symbol_prefix' : 'gst_analytics', 'gst',
+    'export_packages' : pkg_name,
+    'includes' : 'Gst-1.0', 'GstBase-1.0',
+    'install' : true,
+    'extra_args' : gir_init_section + '-DGST_USE_UNSTABLE_API',
+    'dependencies' : gstbase_dep, gstvideo_dep
+  }
+  library_def += {'gir': gir}
+  if not static_build
+    analytics_gir = gnome.generate_gir(gstanalytics, kwargs: gir)
+    library_def += {'gir_targets':  library_def.get('gir_targets', ) + analytics_gir}
+    gen_sources += analytics_gir
+  endif
+endif
+gst_libraries += pkg_name, library_def
+
+
+
+gstanalytics_dep = declare_dependency(link_with : gstanalytics,
+  include_directories : libsinc,
+  sources: gen_sources,
+  dependencies : gstbase_dep, gstvideo_dep)
+
+meson.override_dependency(pkg_name, gstanalytics_dep)

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/audio/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/audio/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/basecamerabinsrc/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/basecamerabinsrc/meson.build Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gstav1bitwriter.c Added

@@ -0,0 +1,2469 @@
+/* GStreamer
+ *  Copyright (C) 2022 Intel Corporation
+ *     Author: He Junyan <junyan.he@intel.com>
+ *
+ * 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 the0
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstav1bitwriter.h"
+#include <gst/base/gstbitwriter.h>
+
+#define WRITE_BITS_UNCHECK(bw, val, nbits)                                    \
+  (nbits <= 8 ? gst_bit_writer_put_bits_uint8 (bw, val, nbits) :              \
+   (nbits <= 16 ? gst_bit_writer_put_bits_uint16 (bw, val, nbits) :           \
+    (nbits <= 32 ? gst_bit_writer_put_bits_uint32 (bw, val, nbits) :          \
+     FALSE)))
+
+#define WRITE_BITS(bw, val, nbits)                                            \
+  if (!WRITE_BITS_UNCHECK (bw, val, nbits)) {                                 \
+    g_warning ("Unsupported bit size: %u", nbits);                            \
+    have_space = FALSE;                                                       \
+    goto error;                                                               \
+  }
+
+static guint
+_av1_uleb_size_in_bytes (guint64 value)
+{
+  guint size = 0;
+
+  do {
+    ++size;
+  } while ((value >>= 7) != 0);
+  return size;
+}
+
+static gboolean
+_av1_encode_uleb (guint64 value, guint available,
+    guint8 * coded_value, guint coded_size)
+{
+  const guint kMaximumLeb128Size = 8;
+  const guint leb_size = _av1_uleb_size_in_bytes (value);
+  const guint64 kMaximumLeb128Value = 0xffffffff /* 4294967295U */ ;
+  guint i;
+
+  g_assert (coded_size >= leb_size);
+
+  if (value > kMaximumLeb128Value || coded_size > kMaximumLeb128Size ||
+      coded_size > available || !coded_value) {
+    return FALSE;
+  }
+
+  if (leb_size == coded_size) {
+    for (i = 0; i < leb_size; i++) {
+      guint8 byte = value & 0x7f;
+      value >>= 7;
+
+      if (value != 0)
+        byte |= 0x80;           // Signal that more bytes follow.
+
+      *(coded_value + i) = byte;
+    }
+  } else {
+    memset (coded_value, 0, coded_size);
+
+    i = 0;
+    do {
+      *(coded_value + i) = value & 0x7fU;
+      value >>= 7;
+      i++;
+    } while (value);
+
+    for (i = 0; i < coded_size - 1; i++)
+      *(coded_value + i) |= 0x80;
+  }
+
+  return TRUE;
+}
+
+/* 4.10.3
+ *
+ * Variable length unsigned n-bit number appearing directly in the
+ * bitstream */
+static gboolean
+_av1_write_uvlc (GstBitWriter * bw, guint32 value, gboolean * space)
+{
+  gboolean have_space = TRUE;
+  gint64 shift_val = value;
+  gint32 leading_zeroes = 1;
+
+  value++;
+
+  g_assert (shift_val > 0);
+
+  while (shift_val >>= 1)
+    leading_zeroes += 2;
+
+  WRITE_BITS (bw, 0, leading_zeroes >> 1);
+  WRITE_BITS (bw, value, (leading_zeroes + 1) >> 1);
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  *space = have_space;
+  return FALSE;
+}
+
+static gint
+_av1_helper_msb (guint n)
+{
+  int log = 0;
+  guint value = n;
+  int i;
+
+  g_assert (n != 0);
+
+  for (i = 4; i >= 0; --i) {
+    const gint shift = (1 << i);
+    const guint x = value >> shift;
+
+    if (x != 0) {
+      value = x;
+      log += shift;
+    }
+  }
+  return log;
+}
+
+static gboolean
+_av1_write_uniform (GstBitWriter * bw, guint32 max_value, guint32 value,
+    gboolean * space)
+{
+  gboolean have_space = TRUE;
+  const gint l = max_value ? _av1_helper_msb (max_value) + 1 : 0;
+  const gint m = (1 << l) - max_value;
+
+  if (l == 0)
+    goto success;
+
+  if (value < m) {
+    WRITE_BITS (bw, value, l - 1);
+  } else {
+    WRITE_BITS (bw, m + ((value - m) >> 1), l - 1);
+    WRITE_BITS (bw, (value - m) & 1, 1);
+  }
+
+success:
+  *space = TRUE;
+  return TRUE;
+
+error:
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.13
+ *
+ * Delta quantizer */
+static gboolean
+_av1_write_delta_q (GstBitWriter * bw, gint32 delta_q, gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  if (delta_q != 0) {
+    WRITE_BITS (bw, 1, 1);
+    WRITE_BITS (bw, delta_q, 7);
+  } else {
+    WRITE_BITS (bw, 0, 1);
+  }
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  *space = have_space;
+  return FALSE;
+}
+
+/* 4.10.6
+ *
+ * su(n) */
+static gboolean
+_av1_write_su (GstBitWriter * bw, gint32 val, guint n, gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  g_assert (n < 31);
+  WRITE_BITS (bw, val, n + 1);
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.16 Tile size calculation
+ *
+ * returns the smallest value for k such that blkSize << k is greater
+ * than or equal to target */
+static gint
+_av1_helper_tile_log2 (gint blkSize, gint target)
+{
+  gint k;
+
+  for (k = 0; (blkSize << k) < target; k++);
+
+  return k;
+}
+
+static gboolean
+_av1_write_primitive_quniform (GstBitWriter * bw, guint16 n, guint16 v,
+    gboolean * space)
+{
+  gboolean have_space = TRUE;
+  const gint l = _av1_helper_msb (n) + 1;
+  const gint m = (1 << l) - n;
+
+  if (n <= 1)
+    goto success;
+
+  if (v < m) {
+    WRITE_BITS (bw, v, l - 1);
+  } else {
+    WRITE_BITS (bw, m + ((v - m) >> 1), l - 1);
+    WRITE_BITS (bw, (v - m) & 1, 1);
+  }
+
+success:
+  *space = TRUE;
+  return TRUE;
+
+error:
+  *space = have_space;
+  return FALSE;
+}
+
+static gboolean
+_av1_write_primitive_subexpfin (GstBitWriter * bw, guint16 n, guint16 k,
+    guint16 v, gboolean * space)
+{
+  gboolean have_space = TRUE;
+  gint i = 0;
+  gint mk = 0;
+
+  while (1) {
+    gint b = (i ? k + i - 1 : k);
+    gint a = (1 << b);
+
+    if (n <= mk + 3 * a) {
+      if (!_av1_write_primitive_quniform (bw, n - mk, v - mk, space))
+        goto error;
+
+      break;
+    } else {
+      gint t = (v >= mk + a);
+      WRITE_BITS (bw, t, 1);
+      if (t) {
+        i = i + 1;
+        mk += a;
+      } else {
+        WRITE_BITS (bw, v - mk, b);
+        break;
+      }
+    }
+  }
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  *space = have_space;
+  return FALSE;
+}
+
+/* Recenters a non-negative literal v around a reference r */
+static guint16
+_av1_helper_recenter_nonneg (guint16 r, guint16 v)
+{
+  if (v > (r << 1))
+    return v;
+  else if (v >= r)
+    return ((v - r) << 1);
+  else
+    return ((r - v) << 1) - 1;
+}
+
+/* Recenters a non-negative literal v in 0, n-1 around
+   a reference r also in 0, n-1 */
+static guint16
+_av1_helper_recenter_finite_nonneg (guint16 n, guint16 r, guint16 v)
+{
+  if ((r << 1) <= n) {
+    return _av1_helper_recenter_nonneg (r, v);
+  } else {
+    return _av1_helper_recenter_nonneg (n - 1 - r, n - 1 - v);
+  }
+}
+
+static gboolean
+_av1_write_primitive_refsubexpfin (GstBitWriter * bw,
+    guint16 n, guint16 k, guint16 ref, guint16 v, gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  if (!_av1_write_primitive_subexpfin (bw, n, k,
+          _av1_helper_recenter_finite_nonneg (n, ref, v), space))
+    goto error;
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  *space = have_space;
+  return FALSE;
+}
+
+static gboolean
+_av1_write_signed_primitive_refsubexpfin (GstBitWriter * bw,
+    guint16 n, guint16 k, gint16 ref, gint16 v, gboolean * space)
+{
+  gboolean have_space = TRUE;
+  const guint16 scaled_n = (n << 1) - 1;
+  ref += n - 1;
+  v += n - 1;
+
+  if (!_av1_write_primitive_refsubexpfin (bw, scaled_n, k, ref, v, space))
+    goto error;
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  *space = have_space;
+  return FALSE;
+}
+
+static gboolean
+_av1_seq_level_idx_is_valid (GstAV1SeqLevels seq_level_idx)
+{
+  return seq_level_idx == GST_AV1_SEQ_LEVEL_MAX
+      || (seq_level_idx < GST_AV1_SEQ_LEVELS
+      /* The following levels are currently undefined. */
+      && seq_level_idx != GST_AV1_SEQ_LEVEL_2_2
+      && seq_level_idx != GST_AV1_SEQ_LEVEL_2_3
+      && seq_level_idx != GST_AV1_SEQ_LEVEL_3_2
+      && seq_level_idx != GST_AV1_SEQ_LEVEL_3_3
+      && seq_level_idx != GST_AV1_SEQ_LEVEL_4_2
+      && seq_level_idx != GST_AV1_SEQ_LEVEL_4_3
+      && seq_level_idx != GST_AV1_SEQ_LEVEL_7_0
+      && seq_level_idx != GST_AV1_SEQ_LEVEL_7_1
+      && seq_level_idx != GST_AV1_SEQ_LEVEL_7_2
+      && seq_level_idx != GST_AV1_SEQ_LEVEL_7_3);
+}
+
+static gboolean
+_av1_bit_writer_timing_info (const GstAV1TimingInfo * timing_info,
+    GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing timing info");
+
+  if (timing_info->num_units_in_display_tick == 0 ||
+      timing_info->time_scale == 0)
+    goto error;
+
+  WRITE_BITS (bw, timing_info->num_units_in_display_tick, 32);
+  WRITE_BITS (bw, timing_info->time_scale, 32);
+
+  WRITE_BITS (bw, timing_info->equal_picture_interval, 1);
+  if (timing_info->equal_picture_interval) {
+    if (timing_info->num_ticks_per_picture_minus_1 == G_MAXUINT)
+      goto error;
+
+    if (!_av1_write_uvlc (bw, timing_info->num_ticks_per_picture_minus_1,
+            &have_space))
+      goto error;
+  }
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write timing info");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.5.4 */
+static gboolean
+_av1_bit_writer_decoder_model_info (const GstAV1DecoderModelInfo *
+    decoder_model_info, GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing decoder model info");
+
+  WRITE_BITS (bw, decoder_model_info->buffer_delay_length_minus_1, 5);
+  WRITE_BITS (bw, decoder_model_info->num_units_in_decoding_tick, 32);
+  WRITE_BITS (bw, decoder_model_info->buffer_removal_time_length_minus_1, 5);
+  WRITE_BITS (bw, decoder_model_info->frame_presentation_time_length_minus_1,
+      5);
+
+  *space = TRUE;
+  return TRUE;
+error:
+  GST_WARNING ("failed to write decoder model info");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.5.5 */
+static gboolean
+_av1_bit_writer_operating_parameters_info (const GstAV1SequenceHeaderOBU *
+    seq_header, const GstAV1OperatingPoint * op_point, GstBitWriter * bw,
+    gboolean * space)
+{
+  gboolean have_space = TRUE;
+  guint32 n = seq_header->decoder_model_info.buffer_delay_length_minus_1 + 1;
+
+  GST_DEBUG ("writing operating parameters info");
+
+  if (n > 32)
+    goto error;
+
+  WRITE_BITS (bw, op_point->decoder_buffer_delay, n);
+  WRITE_BITS (bw, op_point->encoder_buffer_delay, n);
+  WRITE_BITS (bw, op_point->low_delay_mode_flag, 1);
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write operating parameters info");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.5.2 */
+static gboolean
+_av1_bit_writer_color_config (const GstAV1SequenceHeaderOBU * seq_header,
+    const GstAV1ColorConfig * color_config, GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing color config");
+
+  WRITE_BITS (bw, color_config->high_bitdepth, 1);
+
+  if (seq_header->seq_profile == GST_AV1_PROFILE_2
+      && color_config->high_bitdepth) {
+    WRITE_BITS (bw, color_config->twelve_bit, 1);
+  } else if (seq_header->seq_profile > GST_AV1_PROFILE_2) {
+    GST_WARNING ("Unsupported profile/bit-depth combination");
+    goto error;
+  }
+
+  if (seq_header->seq_profile != GST_AV1_PROFILE_1)
+    WRITE_BITS (bw, color_config->mono_chrome, 1);
+
+  if (seq_header->num_planes != 1 && seq_header->num_planes != 3) {
+    GST_WARNING ("num_planes is not correct");
+    goto error;
+  }
+  if (!color_config->mono_chrome && seq_header->num_planes != 3) {
+    GST_WARNING ("num_planes is not correct");
+    goto error;
+  }
+
+  WRITE_BITS (bw, color_config->color_description_present_flag, 1);
+
+  if (color_config->color_description_present_flag) {
+    WRITE_BITS (bw, color_config->color_primaries, 8);
+    WRITE_BITS (bw, color_config->transfer_characteristics, 8);
+    WRITE_BITS (bw, color_config->matrix_coefficients, 8);
+  }
+
+  if (color_config->mono_chrome) {
+    if (color_config->subsampling_x != 1 || color_config->subsampling_y != 1) {
+      GST_WARNING ("set subsampling_x or subsampling_y wrong value");
+      goto error;
+    }
+
+    WRITE_BITS (bw, color_config->color_range, 1);
+    goto success;
+  } else if (color_config->color_primaries == GST_AV1_CP_BT_709 &&
+      color_config->transfer_characteristics == GST_AV1_TC_SRGB &&
+      color_config->matrix_coefficients == GST_AV1_MC_IDENTITY) {
+
+    if (color_config->color_range != 1) {
+      GST_WARNING ("set color_range wrong value");
+      goto error;
+    }
+
+    if (color_config->subsampling_x != 0 || color_config->subsampling_y != 0) {
+      GST_WARNING ("set subsampling_x or subsampling_y wrong value");
+      goto error;
+    }
+
+    if (!(seq_header->seq_profile == GST_AV1_PROFILE_1 ||
+            (seq_header->seq_profile == GST_AV1_PROFILE_2
+                && seq_header->bit_depth == 12))) {
+      GST_WARNING ("sRGB colorspace not compatible with specified profile");
+      goto error;
+    }
+  } else {
+    WRITE_BITS (bw, color_config->color_range, 1);
+
+    if (seq_header->seq_profile == GST_AV1_PROFILE_0) {
+      if (color_config->subsampling_x != 1 || color_config->subsampling_y != 1) {
+        GST_WARNING ("set subsampling_x or subsampling_y wrong value");
+        goto error;
+      }
+    } else if (seq_header->seq_profile == GST_AV1_PROFILE_1) {
+      if (color_config->subsampling_x != 0 || color_config->subsampling_y != 0) {
+        GST_WARNING ("set subsampling_x or subsampling_y wrong value");
+        goto error;
+      }
+    } else if (seq_header->seq_profile == GST_AV1_PROFILE_2) {
+      if (seq_header->bit_depth == 12) {
+        WRITE_BITS (bw, color_config->subsampling_x, 1);
+
+        if (color_config->subsampling_x) {
+          /* 422 or 420 */
+          WRITE_BITS (bw, color_config->subsampling_y, 1);
+        }
+      }
+    }
+
+    if (color_config->subsampling_x && color_config->subsampling_y)
+      WRITE_BITS (bw, color_config->chroma_sample_position, 2);
+  }
+
+  WRITE_BITS (bw, color_config->separate_uv_delta_q, 1);
+
+  if (!(color_config->subsampling_x == 0 && color_config->subsampling_y == 0) &&
+      !(color_config->subsampling_x == 1 && color_config->subsampling_y == 1) &&
+      !(color_config->subsampling_x == 1 && color_config->subsampling_y == 0)) {
+    GST_WARNING ("Only 4:4:4, 4:2:2 and 4:2:0 are currently supported, "
+        "%d %d subsampling is not supported.\n",
+        color_config->subsampling_x, color_config->subsampling_y);
+    goto error;
+  }
+
+success:
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write color config");
+  *space = have_space;
+  return FALSE;
+}
+
+static gboolean
+_av1_bit_writer_sequence_header (const GstAV1SequenceHeaderOBU * seq_header,
+    GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+  gint i;
+
+  GST_DEBUG ("writing sequence header");
+
+  if (seq_header->seq_profile > GST_AV1_PROFILE_2) {
+    GST_WARNING ("Unsupported profile %d", seq_header->seq_profile);
+    goto error;
+  }
+  WRITE_BITS (bw, seq_header->seq_profile, 3);
+
+  WRITE_BITS (bw, seq_header->still_picture, 1);
+
+  if (!seq_header->still_picture && seq_header->reduced_still_picture_header) {
+    GST_WARNING (" If reduced_still_picture_header is equal to 1, it is a"
+        " requirement of bitstream conformance that still_picture is equal"
+        " to 1. ");
+    goto error;
+  }
+  WRITE_BITS (bw, seq_header->reduced_still_picture_header, 1);
+
+  if (seq_header->reduced_still_picture_header) {
+    if (!_av1_seq_level_idx_is_valid
+        (seq_header->operating_points0.seq_level_idx)) {
+      GST_WARNING ("The seq_level_idx is unsupported");
+      goto error;
+    }
+    WRITE_BITS (bw, seq_header->operating_points0.seq_level_idx, 5);
+  } else {
+    WRITE_BITS (bw, seq_header->timing_info_present_flag, 1);
+    if (seq_header->timing_info_present_flag) {
+      if (!_av1_bit_writer_timing_info (&seq_header->timing_info, bw,
+              &have_space))
+        goto error;
+
+      WRITE_BITS (bw, seq_header->decoder_model_info_present_flag, 1);
+      if (seq_header->decoder_model_info_present_flag) {
+        if (!_av1_bit_writer_decoder_model_info
+            (&seq_header->decoder_model_info, bw, &have_space))
+          goto error;
+      }
+    }
+
+    WRITE_BITS (bw, seq_header->initial_display_delay_present_flag, 1);
+
+    if (seq_header->operating_points_cnt_minus_1 + 1 >
+        GST_AV1_MAX_OPERATING_POINTS) {
+      GST_WARNING ("The operating points number %d is too big",
+          seq_header->operating_points_cnt_minus_1 + 1);
+      goto error;
+    }
+    WRITE_BITS (bw, seq_header->operating_points_cnt_minus_1, 5);
+
+    for (i = 0; i < seq_header->operating_points_cnt_minus_1 + 1; i++) {
+      const GstAV1OperatingPoint *op = &seq_header->operating_pointsi;
+
+      WRITE_BITS (bw, op->idc, 12);
+
+      if (!_av1_seq_level_idx_is_valid (op->seq_level_idx)) {
+        GST_WARNING ("The seq_level_idx is unsupported");
+        goto error;
+      }
+      WRITE_BITS (bw, op->seq_level_idx, 5);
+
+      if (op->seq_level_idx > GST_AV1_SEQ_LEVEL_3_3)
+        WRITE_BITS (bw, op->seq_tier, 1);
+
+      if (seq_header->decoder_model_info_present_flag) {
+        WRITE_BITS (bw, op->decoder_model_present_for_this_op, 1);
+        if (op->decoder_model_present_for_this_op) {
+          if (!_av1_bit_writer_operating_parameters_info (seq_header,
+                  op, bw, &have_space))
+            goto error;
+        }
+      }
+
+      if (seq_header->initial_display_delay_present_flag) {
+        WRITE_BITS (bw, op->initial_display_delay_present_for_this_op, 1);
+
+        if (op->initial_display_delay_present_for_this_op) {
+          if (op->initial_display_delay_minus_1 + 1 > 10) {
+            GST_INFO ("AV1 does not support more than 10 decoded frames delay");
+            goto error;
+          }
+
+          WRITE_BITS (bw, op->initial_display_delay_minus_1, 4);
+        }
+      }
+    }
+  }
+
+  WRITE_BITS (bw, seq_header->frame_width_bits_minus_1, 4);
+  WRITE_BITS (bw, seq_header->frame_height_bits_minus_1, 4);
+  WRITE_BITS (bw, seq_header->max_frame_width_minus_1,
+      seq_header->frame_width_bits_minus_1 + 1);
+  WRITE_BITS (bw, seq_header->max_frame_height_minus_1,
+      seq_header->frame_height_bits_minus_1 + 1);
+
+  if (!seq_header->reduced_still_picture_header)
+    WRITE_BITS (bw, seq_header->frame_id_numbers_present_flag, 1);
+
+  if (seq_header->frame_id_numbers_present_flag) {
+    if (seq_header->additional_frame_id_length_minus_1 + 1 +
+        seq_header->delta_frame_id_length_minus_2 + 2 > 16) {
+      GST_WARNING ("Invalid frame_id_length");
+      goto error;
+    }
+    WRITE_BITS (bw, seq_header->delta_frame_id_length_minus_2, 4);
+    WRITE_BITS (bw, seq_header->additional_frame_id_length_minus_1, 3);
+  }
+
+  WRITE_BITS (bw, seq_header->use_128x128_superblock, 1);
+  WRITE_BITS (bw, seq_header->enable_filter_intra, 1);
+  WRITE_BITS (bw, seq_header->enable_intra_edge_filter, 1);
+
+  if (!seq_header->reduced_still_picture_header) {
+    WRITE_BITS (bw, seq_header->enable_interintra_compound, 1);
+    WRITE_BITS (bw, seq_header->enable_masked_compound, 1);
+    WRITE_BITS (bw, seq_header->enable_warped_motion, 1);
+    WRITE_BITS (bw, seq_header->enable_dual_filter, 1);
+    WRITE_BITS (bw, seq_header->enable_order_hint, 1);
+    if (seq_header->enable_order_hint) {
+      WRITE_BITS (bw, seq_header->enable_jnt_comp, 1);
+      WRITE_BITS (bw, seq_header->enable_ref_frame_mvs, 1);
+    }
+
+    WRITE_BITS (bw, seq_header->seq_choose_screen_content_tools, 1);
+    if (!seq_header->seq_choose_screen_content_tools)
+      WRITE_BITS (bw, seq_header->seq_force_screen_content_tools, 1);
+
+    if (seq_header->seq_force_screen_content_tools > 0) {
+      WRITE_BITS (bw, seq_header->seq_choose_integer_mv, 1);
+      if (!seq_header->seq_choose_integer_mv)
+        WRITE_BITS (bw, seq_header->seq_force_integer_mv, 1);
+    }
+
+    if (seq_header->enable_order_hint)
+      WRITE_BITS (bw, seq_header->order_hint_bits_minus_1, 3);
+  }
+
+  WRITE_BITS (bw, seq_header->enable_superres, 1);
+  WRITE_BITS (bw, seq_header->enable_cdef, 1);
+  WRITE_BITS (bw, seq_header->enable_restoration, 1);
+
+  if (!_av1_bit_writer_color_config (seq_header, &seq_header->color_config,
+          bw, &have_space))
+    goto error;
+
+  WRITE_BITS (bw, seq_header->film_grain_params_present, 1);
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write sequence header");
+  *space = have_space;
+  return FALSE;
+}
+
+/* Return the actual size field size. */
+static guint
+_av1_bit_writer_add_size_field (guint8 * data, guint * size, guint header_size,
+    guint payload_size, guint size_field_size, gboolean * space)
+{
+  guint size_field_sz;
+
+  size_field_sz = _av1_uleb_size_in_bytes (payload_size);
+  g_assert (size_field_sz > 0);
+
+  if (size_field_size > 0) {
+    if (size_field_sz > size_field_size) {
+      GST_WARNING ("the fixed size field size is too small");
+      goto error;
+    }
+
+    size_field_sz = size_field_size;
+  }
+
+  /* Move and write the data size field */
+  if (header_size + payload_size + size_field_sz > *size) {
+    *space = FALSE;
+    goto error;
+  }
+  *space = TRUE;
+
+  memmove (data + header_size + size_field_sz,
+      data + header_size, payload_size);
+
+  if (!_av1_encode_uleb (payload_size, sizeof (payload_size),
+          data + header_size, size_field_sz))
+    goto error;
+
+  *size = header_size + payload_size + size_field_sz;
+  return size_field_sz;
+
+error:
+  GST_WARNING ("failed to write the size field");
+  return 0;
+}
+
+/**
+ * gst_av1_bit_writer_sequence_header_obu:
+ * @seq_hdr: the sequence header of #GstAV1SequenceHeaderOBU to write
+ * @size_field: whether the header contain size feild
+ * @data: (out): the bit stream generated by the sequence header
+ * @size: (inout): the size in bytes of the input and output
+ *
+ * Generating the according AV1 bit stream OBU by providing the sequence header.
+ *
+ * Returns: a #GstAV1BitWriterResult
+ *
+ * Since: 1.22
+ **/
+GstAV1BitWriterResult
+gst_av1_bit_writer_sequence_header_obu (const GstAV1SequenceHeaderOBU *
+    seq_hdr, gboolean size_field, guint8 * data, guint * size)
+{
+  gboolean have_space = TRUE;
+  GstBitWriter bw;
+  guint header_size;
+  guint payload_size;
+
+  g_return_val_if_fail (seq_hdr != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (data != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (size != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (*size > 0, GST_AV1_BIT_WRITER_ERROR);
+
+  gst_bit_writer_init_with_data (&bw, data, *size, FALSE);
+
+  /* obu_forbidden_bit */
+  WRITE_BITS (&bw, 0, 1);
+  /* obu_type */
+  WRITE_BITS (&bw, GST_AV1_OBU_SEQUENCE_HEADER, 4);
+  /* obu_extention_flag */
+  WRITE_BITS (&bw, 0, 1);
+  /* obu_has_size_field */
+  WRITE_BITS (&bw, 1, 1);
+  /* obu_reserved_1bit */
+  WRITE_BITS (&bw, 0, 1);
+
+  header_size = gst_bit_writer_get_size (&bw);
+  g_assert (header_size % 8 == 0);
+  header_size /= 8;
+
+  if (!_av1_bit_writer_sequence_header (seq_hdr, &bw, &have_space))
+    goto error;
+
+  /* Add trailings. */
+  WRITE_BITS (&bw, 1, 1);
+  if (!gst_bit_writer_align_bytes (&bw, 0)) {
+    have_space = FALSE;
+    goto error;
+  }
+
+  payload_size = gst_bit_writer_get_size (&bw);
+  g_assert (payload_size % 8 == 0);
+  payload_size /= 8;
+  payload_size -= header_size;
+
+  gst_bit_writer_reset (&bw);
+
+  if (size_field) {
+    if (!_av1_bit_writer_add_size_field (data, size,
+            header_size, payload_size, 0, &have_space))
+      goto error;
+  } else {
+    *size = header_size + payload_size;
+  }
+
+  return GST_AV1_BIT_WRITER_OK;
+
+error:
+  gst_bit_writer_reset (&bw);
+  *size = 0;
+  return have_space ? GST_AV1_BIT_WRITER_INVALID_DATA :
+      GST_AV1_BIT_WRITER_NO_MORE_SPACE;
+}
+
+/* 5.9.5 */
+static gboolean
+_av1_bit_writer_superres_params (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, GstBitWriter * bw,
+    gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing superres param");
+
+  if (seq_header->enable_superres)
+    WRITE_BITS (bw, frame_header->use_superres, 1);
+
+  if (frame_header->use_superres) {
+    guint8 coded_denom;
+
+    if (frame_header->superres_denom < GST_AV1_SUPERRES_DENOM_MIN)
+      goto error;
+
+    coded_denom = frame_header->superres_denom - GST_AV1_SUPERRES_DENOM_MIN;
+    if (coded_denom > (1 << GST_AV1_SUPERRES_DENOM_BITS) - 1)
+      goto error;
+
+    WRITE_BITS (bw, coded_denom, GST_AV1_SUPERRES_DENOM_BITS);
+  }
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write superres param");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.5 */
+static gboolean
+_av1_bit_writer_frame_size (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, GstBitWriter * bw,
+    gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing frame size");
+
+  if (frame_header->frame_size_override_flag) {
+    guint16 frame_width_minus_1;
+    guint16 frame_height_minus_1;
+
+    frame_width_minus_1 = frame_header->frame_width - 1;
+    WRITE_BITS (bw, frame_width_minus_1,
+        seq_header->frame_width_bits_minus_1 + 1);
+    frame_height_minus_1 = frame_header->frame_height - 1;
+    WRITE_BITS (bw, frame_height_minus_1,
+        seq_header->frame_height_bits_minus_1 + 1);
+  }
+
+  if (!_av1_bit_writer_superres_params (frame_header, seq_header, bw, space))
+    goto error;
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write frame size");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.6 */
+static gboolean
+_av1_bit_writer_render_size (const GstAV1FrameHeaderOBU * frame_header,
+    GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing render size");
+
+  WRITE_BITS (bw, frame_header->render_and_frame_size_different, 1);
+
+  if (frame_header->render_and_frame_size_different) {
+    guint16 render_width_minus_1 = frame_header->render_width - 1;
+    guint16 render_height_minus_1 = frame_header->render_height - 1;
+
+    WRITE_BITS (bw, render_width_minus_1, 16);
+    WRITE_BITS (bw, render_height_minus_1, 16);
+  }
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write render size");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.15 */
+static gboolean
+_av1_bit_writer_tile_info (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, GstBitWriter * bw,
+    gboolean * space)
+{
+  gboolean have_space = TRUE;
+  const GstAV1TileInfo *tile_info;
+  guint32 mi_cols /* MiCols */ ;
+  guint32 mi_rows /* MiRows */ ;
+  gint sb_cols /* sbCols */ ;
+  gint sb_rows /* sbRows */ ;
+  gint sb_shift /*sbShift */ ;
+  gint sb_size /* sbSize */ ;
+  gint max_tile_width_sb /* maxTileWidthSb */ ;
+  gint max_tile_height_sb /* maxTileHeightSb */ ;
+  gint max_tile_area_sb /* maxTileAreaSb */ ;
+  gint min_log2_tile_cols /* minLog2TileCols */ ;
+  gint max_log2_tile_cols /* maxLog2TileCols */ ;
+  gint min_log2_tile_rows /* minLog2TileRows */ ;
+  gint max_log2_tile_rows /* maxLog2TileRows */ ;
+  gint min_log2_tiles /* minLog2Tiles */ ;
+  gint size_sb /* sizeSb */ ;
+  gint widest_tile_sb /* widestTileSb */ ;
+
+  tile_info = &frame_header->tile_info;
+
+  GST_DEBUG ("writing tile info");
+
+  /* User must specify the frame resolution. */
+  if (frame_header->frame_width == 0 || frame_header->frame_height == 0) {
+    GST_WARNING ("unknown frame_width or frame_height");
+    goto error;
+  }
+
+  mi_cols = 2 * ((frame_header->frame_width + 7) >> 3);
+  mi_rows = 2 * ((frame_header->frame_height + 7) >> 3);
+
+  sb_cols = seq_header->use_128x128_superblock ?
+      ((mi_cols + 31) >> 5) : ((mi_cols + 15) >> 4);
+  sb_rows = seq_header->use_128x128_superblock ?
+      ((mi_rows + 31) >> 5) : ((mi_rows + 15) >> 4);
+  sb_shift = seq_header->use_128x128_superblock ? 5 : 4;
+  sb_size = sb_shift + 2;
+
+  max_tile_width_sb = GST_AV1_MAX_TILE_WIDTH >> sb_size;
+  max_tile_area_sb = GST_AV1_MAX_TILE_AREA >> (2 * sb_size);
+  min_log2_tile_cols = _av1_helper_tile_log2 (max_tile_width_sb, sb_cols);
+  max_log2_tile_cols = _av1_helper_tile_log2 (1, MIN (sb_cols,
+          GST_AV1_MAX_TILE_COLS));
+  max_log2_tile_rows = _av1_helper_tile_log2 (1, MIN (sb_rows,
+          GST_AV1_MAX_TILE_ROWS));
+  min_log2_tiles = MAX (min_log2_tile_cols,
+      _av1_helper_tile_log2 (max_tile_area_sb, sb_rows * sb_cols));
+
+  WRITE_BITS (bw, tile_info->uniform_tile_spacing_flag, 1);
+  if (tile_info->uniform_tile_spacing_flag) {
+    /* columns */
+    gint ones = tile_info->tile_cols_log2 - min_log2_tile_cols;
+    if (ones < 0)
+      goto error;
+
+    while (ones--)
+      WRITE_BITS (bw, 1, 1);
+    if (tile_info->tile_cols_log2 < max_log2_tile_cols)
+      WRITE_BITS (bw, 0, 1);
+
+    /* rows */
+    min_log2_tile_rows = MAX (min_log2_tiles - tile_info->tile_cols_log2, 0);
+    ones = tile_info->tile_rows_log2 - min_log2_tile_rows;
+    if (ones < 0)
+      goto error;
+
+    while (ones--)
+      WRITE_BITS (bw, 1, 1);
+    if (tile_info->tile_rows_log2 < max_log2_tile_rows)
+      WRITE_BITS (bw, 0, 1);
+  } else {
+    /* Explicit tiles with configurable tile widths and heights */
+    guint i;
+    guint width_sb;
+    guint height_sb;
+
+    widest_tile_sb = 0;
+
+    /* columns */
+    width_sb = sb_cols;
+    for (i = 0; i < tile_info->tile_cols; i++) {
+      size_sb = tile_info->mi_col_startsi + 1 - tile_info->mi_col_startsi;
+      size_sb = size_sb >> sb_shift;
+      widest_tile_sb = MAX (size_sb, widest_tile_sb);
+      if (_av1_write_uniform (bw, MIN (width_sb, max_tile_width_sb),
+              size_sb - 1, &have_space))
+        goto error;
+
+      width_sb -= size_sb;
+    }
+
+    if (width_sb != 0)
+      goto error;
+
+    // rows
+    if (min_log2_tiles > 0) {
+      max_tile_area_sb = (sb_rows * sb_cols) >> (min_log2_tiles + 1);
+    } else {
+      max_tile_area_sb = sb_rows * sb_cols;
+    }
+
+    max_tile_height_sb = MAX (max_tile_area_sb / widest_tile_sb, 1);
+
+    height_sb = sb_rows;
+    for (i = 0; i < tile_info->tile_rows; i++) {
+      size_sb = tile_info->mi_row_startsi + 1 - tile_info->mi_row_startsi;
+      size_sb = size_sb >> sb_shift;
+      if (_av1_write_uniform (bw, MIN (height_sb, max_tile_height_sb),
+              size_sb - 1, &have_space))
+        goto error;
+
+      height_sb -= size_sb;
+    }
+
+    if (height_sb != 0)
+      goto error;
+  }
+
+  if (tile_info->tile_cols_log2 > 0 || tile_info->tile_rows_log2 > 0) {
+    WRITE_BITS (bw, tile_info->context_update_tile_id,
+        tile_info->tile_cols_log2 + tile_info->tile_rows_log2);
+
+    WRITE_BITS (bw, tile_info->tile_size_bytes_minus_1, 2);
+  }
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write tile info");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.12 */
+static gboolean
+_av1_bit_writer_quantization_params (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, guint * qindex_offset,
+    GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+  const GstAV1QuantizationParams *quant_params =
+      &(frame_header->quantization_params);
+
+  GST_DEBUG ("writing quantization params");
+
+  if (qindex_offset)
+    *qindex_offset = gst_bit_writer_get_size (bw);
+
+  WRITE_BITS (bw, quant_params->base_q_idx, 8);
+
+  if (!_av1_write_delta_q (bw,
+          frame_header->quantization_params.delta_q_y_dc, &have_space))
+    goto error;
+
+  if (seq_header->num_planes > 1) {
+    if (seq_header->color_config.separate_uv_delta_q)
+      WRITE_BITS (bw, quant_params->diff_uv_delta, 1);
+
+    if (!_av1_write_delta_q (bw,
+            frame_header->quantization_params.delta_q_u_dc, &have_space))
+      goto error;
+
+    if (!_av1_write_delta_q (bw,
+            frame_header->quantization_params.delta_q_u_ac, &have_space))
+      goto error;
+
+    if (quant_params->diff_uv_delta) {
+      if (!_av1_write_delta_q (bw,
+              frame_header->quantization_params.delta_q_v_dc, &have_space))
+        goto error;
+
+      if (!_av1_write_delta_q (bw,
+              frame_header->quantization_params.delta_q_v_ac, &have_space))
+        goto error;
+    }
+  }
+
+  WRITE_BITS (bw, quant_params->using_qmatrix, 1);
+  if (quant_params->using_qmatrix) {
+    WRITE_BITS (bw, quant_params->qm_y, 4);
+    WRITE_BITS (bw, quant_params->qm_u, 4);
+
+    if (seq_header->color_config.separate_uv_delta_q)
+      WRITE_BITS (bw, quant_params->qm_v, 4);
+  }
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write quantization params");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.14 */
+static gboolean
+_av1_bit_writer_segmentation_params (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, guint * segmentation_offset,
+    GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing segmentation params");
+
+  if (segmentation_offset)
+    *segmentation_offset = gst_bit_writer_get_size (bw);
+
+  /* TODO: segmentation support. */
+  if (frame_header->segmentation_params.segmentation_enabled) {
+    GST_WARNING ("segmentation is not supported now");
+    goto error;
+  }
+
+  WRITE_BITS (bw, frame_header->segmentation_params.segmentation_enabled, 1);
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write segmentation params");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.17 */
+static gboolean
+_av1_bit_writer_delta_q_params (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, GstBitWriter * bw,
+    gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing delta q params");
+
+  if (frame_header->quantization_params.base_q_idx > 0)
+    WRITE_BITS (bw, frame_header->quantization_params.delta_q_present, 1);
+
+  if (frame_header->quantization_params.delta_q_present)
+    WRITE_BITS (bw, frame_header->quantization_params.delta_q_res, 2);
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write delta q params");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.18 */
+static gboolean
+_av1_bit_writer_delta_lf_params (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, GstBitWriter * bw,
+    gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing delta lf params");
+
+  if (frame_header->quantization_params.delta_q_present) {
+    if (!frame_header->allow_intrabc)
+      WRITE_BITS (bw, frame_header->loop_filter_params.delta_lf_present, 1);
+
+    if (frame_header->loop_filter_params.delta_lf_present) {
+      WRITE_BITS (bw, frame_header->loop_filter_params.delta_lf_res, 2);
+      WRITE_BITS (bw, frame_header->loop_filter_params.delta_lf_multi, 1);
+    }
+  }
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write delta lf params");
+  *space = have_space;
+  return FALSE;
+}
+
+static gboolean
+_av1_bit_writer_loop_filter_params (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, guint * loopfilter_offset,
+    GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+  const GstAV1LoopFilterParams *lf_params = &frame_header->loop_filter_params;
+
+  GST_DEBUG ("writing loop filter params");
+
+  if (frame_header->coded_lossless || frame_header->allow_intrabc)
+    goto success;
+
+  if (loopfilter_offset)
+    *loopfilter_offset = gst_bit_writer_get_size (bw);
+
+  WRITE_BITS (bw, lf_params->loop_filter_level0, 6);
+  WRITE_BITS (bw, lf_params->loop_filter_level1, 6);
+  if (seq_header->num_planes > 1) {
+    if (lf_params->loop_filter_level0 || lf_params->loop_filter_level1) {
+      WRITE_BITS (bw, lf_params->loop_filter_level2, 6);
+      WRITE_BITS (bw, lf_params->loop_filter_level3, 6);
+    }
+  }
+
+  WRITE_BITS (bw, lf_params->loop_filter_sharpness, 3);
+
+  WRITE_BITS (bw, lf_params->loop_filter_delta_enabled, 1);
+  if (lf_params->loop_filter_delta_enabled) {
+    guint i;
+
+    WRITE_BITS (bw, lf_params->loop_filter_delta_update, 1);
+
+    if (lf_params->loop_filter_delta_update) {
+      const gint8 default_loop_filter_ref_deltas =
+          { 1, 0, 0, 0, -1, 0, -1, -1 };
+      gboolean update_ref_deltas;
+
+      for (i = 0; i < GST_AV1_TOTAL_REFS_PER_FRAME; i++) {
+        /* If loop_filter_ref_deltasi is different from default
+           value, we update it. */
+        update_ref_deltas = (lf_params->loop_filter_ref_deltasi !=
+            default_loop_filter_ref_deltasi);
+
+        WRITE_BITS (bw, update_ref_deltas, 1);
+
+        if (update_ref_deltas) {
+          if (!_av1_write_su (bw, lf_params->loop_filter_ref_deltasi,
+                  6, space))
+            goto error;
+        }
+      }
+
+      for (i = 0; i < 2; i++) {
+        /* If loop_filter_mode_deltasi is different from default
+           value, we update it. */
+        update_ref_deltas = (lf_params->loop_filter_mode_deltasi != 0);
+
+        WRITE_BITS (bw, update_ref_deltas, 1);
+
+        if (update_ref_deltas) {
+          if (!_av1_write_su (bw, lf_params->loop_filter_mode_deltasi,
+                  6, space))
+            goto error;
+        }
+      }
+    }
+  }
+
+success:
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write loop filter params");
+  *space = have_space;
+  return FALSE;
+}
+
+static gboolean
+_av1_bit_writer_cdef_params (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, guint * cdef_offset,
+    guint * cdef_size, GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+  const GstAV1CDEFParams *cdef_params = &frame_header->cdef_params;
+  guint cdef_start;
+  guint i;
+
+  GST_DEBUG ("writing cdef params");
+
+  if (frame_header->coded_lossless || frame_header->allow_intrabc
+      || !seq_header->enable_cdef)
+    goto success;
+
+  cdef_start = gst_bit_writer_get_size (bw);
+  if (cdef_offset)
+    *cdef_offset = cdef_start;
+
+  WRITE_BITS (bw, cdef_params->cdef_damping - 3, 2);
+  WRITE_BITS (bw, cdef_params->cdef_bits, 2);
+
+  for (i = 0; i < (1 << cdef_params->cdef_bits); i++) {
+    guint8 cdef_y_sec_strength;
+
+    WRITE_BITS (bw, cdef_params->cdef_y_pri_strengthi, 4);
+
+    cdef_y_sec_strength = cdef_params->cdef_y_sec_strengthi;
+
+    if (cdef_y_sec_strength >= 4) {
+      GST_WARNING ("cdef_y_sec_strength is not valid");
+      goto error;
+    }
+    WRITE_BITS (bw, cdef_y_sec_strength, 2);
+
+    if (seq_header->num_planes > 1) {
+      guint8 cdef_uv_sec_strength;
+
+      WRITE_BITS (bw, cdef_params->cdef_uv_pri_strengthi, 4);
+
+      cdef_uv_sec_strength = cdef_params->cdef_uv_sec_strengthi;
+
+      if (cdef_uv_sec_strength >= 4) {
+        GST_WARNING ("cdef_uv_sec_strength is not valid");
+        goto error;
+      }
+      WRITE_BITS (bw, cdef_uv_sec_strength, 2);
+    }
+  }
+
+  if (cdef_size)
+    *cdef_size = gst_bit_writer_get_size (bw) - cdef_start;
+
+success:
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write cdef params");
+  *space = have_space;
+  return FALSE;
+}
+
+static gboolean
+_av1_bit_writer_loop_restoration_params (const GstAV1FrameHeaderOBU *
+    frame_header, const GstAV1SequenceHeaderOBU * seq_header,
+    GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+  guint i, j;
+  guint8 use_chroma_lr = 0 /* useChromaLr */ ;
+  const GstAV1LoopRestorationParams *lr_params =
+      &frame_header->loop_restoration_params;
+  const GstAV1FrameRestorationType remap_lr_type /* Remap_Lr_Type */ 4 = {
+    GST_AV1_FRAME_RESTORE_NONE,
+    GST_AV1_FRAME_RESTORE_SWITCHABLE,
+    GST_AV1_FRAME_RESTORE_WIENER, GST_AV1_FRAME_RESTORE_SGRPROJ
+  };
+
+  GST_DEBUG ("writing loop restoration params");
+
+  if (frame_header->all_lossless || frame_header->allow_intrabc
+      || !seq_header->enable_restoration)
+    goto success;
+
+  for (i = 0; i < seq_header->num_planes; i++) {
+    for (j = 0; j < 4; j++) {
+      if (lr_params->frame_restoration_typei == remap_lr_typej)
+        break;
+    }
+    if (j == 4)
+      goto error;
+
+    if (lr_params->frame_restoration_typei != GST_AV1_FRAME_RESTORE_NONE) {
+      if (!lr_params->uses_lr) {
+        GST_WARNING ("uses_lr set to wrong value");
+        goto error;
+      }
+
+      if (i > 1)
+        use_chroma_lr = 1;
+    }
+
+    WRITE_BITS (bw, j, 2);
+  }
+
+  if (lr_params->uses_lr) {
+    if (lr_params->lr_unit_shift > 2)
+      goto error;
+
+    if (seq_header->use_128x128_superblock) {
+      WRITE_BITS (bw, lr_params->lr_unit_shift - 1, 1);
+    } else {
+      WRITE_BITS (bw, 1, 1);
+
+      if (lr_params->lr_unit_shift > 1)
+        /* lr_unit_extra_shift */
+        WRITE_BITS (bw, 1, 1);
+    }
+
+    if (seq_header->color_config.subsampling_x
+        && seq_header->color_config.subsampling_y && use_chroma_lr)
+      WRITE_BITS (bw, lr_params->lr_uv_shift, 1);
+  }
+
+success:
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write loop restoration params");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.22 */
+static gboolean
+_av1_bit_writer_skip_mode_params (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, GstBitWriter * bw,
+    gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing skip mode params");
+
+  /* if skipModeAllowed is true */
+  if (frame_header->skip_mode_frame0 > 0
+      || frame_header->skip_mode_frame1 > 0)
+    WRITE_BITS (bw, frame_header->skip_mode_present, 1);
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write skip mode params");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.24 */
+static gboolean
+_av1_bit_writer_global_motion_params (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, GstBitWriter * bw,
+    gboolean * space)
+{
+  gboolean have_space = TRUE;
+  gint ref, i;
+  const GstAV1GlobalMotionParams *gm_params =
+      &(frame_header->global_motion_params);
+  gint32 prev_gm_paramsGST_AV1_NUM_REF_FRAMES6 /* PrevGmParams */ ;
+
+  GST_DEBUG ("writing global motion params");
+
+  if (frame_header->frame_is_intra)
+    goto success;
+
+  if (frame_header->primary_ref_frame != GST_AV1_PRIMARY_REF_NONE) {
+    memcpy (prev_gm_params, &frame_header->ref_global_motion_params,
+        sizeof (gint32) * GST_AV1_NUM_REF_FRAMES * 6);
+  } else {
+    for (ref = GST_AV1_REF_INTRA_FRAME; ref < GST_AV1_NUM_REF_FRAMES; ref++)
+      for (i = 0; i < 6; i++)
+        prev_gm_paramsrefi =
+            ((i % 3 == 2) ? 1 << GST_AV1_WARPEDMODEL_PREC_BITS : 0);
+  }
+
+  for (ref = GST_AV1_REF_LAST_FRAME; ref <= GST_AV1_REF_ALTREF_FRAME; ref++) {
+    WRITE_BITS (bw, gm_params->gm_typeref != GST_AV1_WARP_MODEL_IDENTITY, 1);
+
+    if (gm_params->gm_typeref != GST_AV1_WARP_MODEL_IDENTITY) {
+      WRITE_BITS (bw, gm_params->gm_typeref == GST_AV1_WARP_MODEL_ROTZOOM, 1);
+
+      if (gm_params->gm_typeref != GST_AV1_WARP_MODEL_ROTZOOM)
+        WRITE_BITS (bw,
+            gm_params->gm_typeref == GST_AV1_WARP_MODEL_TRANSLATION, 1);
+    }
+
+    if (gm_params->gm_typeref >= GST_AV1_WARP_MODEL_ROTZOOM) {
+      if (!_av1_write_signed_primitive_refsubexpfin (bw,
+              (1 << GST_AV1_GM_ABS_ALPHA_BITS) + 1, 3,
+              (prev_gm_paramsref2 >> (GST_AV1_WARPEDMODEL_PREC_BITS -
+                      GST_AV1_GM_ALPHA_PREC_BITS)) -
+              (1 << GST_AV1_GM_ALPHA_PREC_BITS),
+              (gm_params->gm_paramsref2 >> (GST_AV1_WARPEDMODEL_PREC_BITS -
+                      GST_AV1_GM_ALPHA_PREC_BITS)) -
+              (1 << GST_AV1_GM_ALPHA_PREC_BITS), space))
+        goto error;
+
+      if (!_av1_write_signed_primitive_refsubexpfin (bw,
+              (1 << GST_AV1_GM_ABS_ALPHA_BITS) + 1, 3,
+              (prev_gm_paramsref3 >> (GST_AV1_WARPEDMODEL_PREC_BITS -
+                      GST_AV1_GM_ALPHA_PREC_BITS)),
+              (gm_params->gm_paramsref3 >> (GST_AV1_WARPEDMODEL_PREC_BITS -
+                      GST_AV1_GM_ALPHA_PREC_BITS)), space))
+        goto error;
+    }
+
+    if (gm_params->gm_typeref >= GST_AV1_WARP_MODEL_AFFINE) {
+      if (!_av1_write_signed_primitive_refsubexpfin (bw,
+              (1 << GST_AV1_GM_ABS_ALPHA_BITS) + 1, 3,
+              (prev_gm_paramsref4 >> (GST_AV1_WARPEDMODEL_PREC_BITS -
+                      GST_AV1_GM_ALPHA_PREC_BITS)),
+              (gm_params->gm_paramsref4 >> (GST_AV1_WARPEDMODEL_PREC_BITS -
+                      GST_AV1_GM_ALPHA_PREC_BITS)), space))
+        goto error;
+
+      if (!_av1_write_signed_primitive_refsubexpfin (bw,
+              (1 << GST_AV1_GM_ABS_ALPHA_BITS) + 1, 3,
+              (prev_gm_paramsref5 >> (GST_AV1_WARPEDMODEL_PREC_BITS -
+                      GST_AV1_GM_ALPHA_PREC_BITS)) -
+              (1 << GST_AV1_GM_ALPHA_PREC_BITS),
+              (gm_params->gm_paramsref5 >> (GST_AV1_WARPEDMODEL_PREC_BITS -
+                      GST_AV1_GM_ALPHA_PREC_BITS)) -
+              (1 << GST_AV1_GM_ALPHA_PREC_BITS), space))
+        goto error;
+    }
+
+    if (gm_params->gm_typeref >= GST_AV1_WARP_MODEL_TRANSLATION) {
+      const gint trans_bits =
+          (gm_params->gm_typeref == GST_AV1_WARP_MODEL_TRANSLATION) ?
+          GST_AV1_GM_ABS_TRANS_ONLY_BITS -
+          !frame_header->allow_high_precision_mv : GST_AV1_GM_ABS_TRANS_BITS;
+      const gint trans_prec_diff =
+          (gm_params->gm_typeref == GST_AV1_WARP_MODEL_TRANSLATION) ?
+          GST_AV1_WARPEDMODEL_PREC_BITS - 3 +
+          !frame_header->allow_high_precision_mv :
+          (GST_AV1_WARPEDMODEL_PREC_BITS - GST_AV1_GM_TRANS_PREC_BITS);
+
+      if (!_av1_write_signed_primitive_refsubexpfin (bw, (1 << trans_bits) + 1,
+              3, (prev_gm_paramsref0 >> trans_prec_diff),
+              (gm_params->gm_paramsref0 >> trans_prec_diff), space))
+        goto error;
+
+      if (!_av1_write_signed_primitive_refsubexpfin (bw, (1 << trans_bits) + 1,
+              3, (prev_gm_paramsref1 >> trans_prec_diff),
+              (gm_params->gm_paramsref1 >> trans_prec_diff), space))
+        goto error;
+    }
+  }
+
+success:
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write global motion params");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.9.30 */
+static gboolean
+_av1_bit_writer_film_grain_params (const GstAV1FrameHeaderOBU * frame_header,
+    const GstAV1SequenceHeaderOBU * seq_header, GstBitWriter * bw,
+    gboolean * space)
+{
+  gboolean have_space = TRUE;
+  guint i;
+  gint num_pos_chroma /* numPosChroma */ , num_pos_luma /* numPosLuma */ ;
+  const GstAV1FilmGrainParams *fg_params = &frame_header->film_grain_params;
+
+  GST_DEBUG ("writing film grain params");
+
+  fg_params = &frame_header->film_grain_params;
+  if (!seq_header->film_grain_params_present || (!frame_header->show_frame
+          && !frame_header->showable_frame))
+    goto success;
+
+  WRITE_BITS (bw, fg_params->apply_grain, 1);
+  if (!fg_params->apply_grain)
+    goto success;
+
+  WRITE_BITS (bw, fg_params->grain_seed, 16);
+
+  if (frame_header->frame_type == GST_AV1_INTER_FRAME)
+    WRITE_BITS (bw, fg_params->update_grain, 1);
+
+  if (!fg_params->update_grain) {
+    WRITE_BITS (bw, fg_params->film_grain_params_ref_idx, 3);
+    goto success;
+  }
+
+  WRITE_BITS (bw, fg_params->num_y_points, 4);
+
+  for (i = 0; i < fg_params->num_y_points; i++) {
+    WRITE_BITS (bw, fg_params->point_y_valuei, 8);
+    WRITE_BITS (bw, fg_params->point_y_scalingi, 8);
+  }
+
+  if (!seq_header->color_config.mono_chrome)
+    WRITE_BITS (bw, fg_params->chroma_scaling_from_luma, 1);
+
+  if (!(seq_header->color_config.mono_chrome
+          || fg_params->chroma_scaling_from_luma
+          || (seq_header->color_config.subsampling_x == 1
+              && seq_header->color_config.subsampling_y == 1
+              && fg_params->num_y_points == 0))) {
+    WRITE_BITS (bw, fg_params->num_cb_points, 4);
+
+    for (i = 0; i < fg_params->num_cb_points; i++) {
+      WRITE_BITS (bw, fg_params->point_cb_valuei, 8);
+      WRITE_BITS (bw, fg_params->point_cb_scalingi, 8);
+    }
+
+    WRITE_BITS (bw, fg_params->num_cr_points, 4);
+    for (i = 0; i < fg_params->num_cr_points; i++) {
+      WRITE_BITS (bw, fg_params->point_cr_valuei, 8);
+      WRITE_BITS (bw, fg_params->point_cr_scalingi, 8);
+    }
+  }
+
+  WRITE_BITS (bw, fg_params->grain_scaling_minus_8, 2);
+
+  WRITE_BITS (bw, fg_params->ar_coeff_lag, 2);
+
+  num_pos_luma = 2 * fg_params->ar_coeff_lag * (fg_params->ar_coeff_lag + 1);
+  if (fg_params->num_y_points) {
+    num_pos_chroma = num_pos_luma + 1;
+    for (i = 0; i < num_pos_luma; i++)
+      WRITE_BITS (bw, fg_params->ar_coeffs_y_plus_128i, 8);
+  } else {
+    num_pos_chroma = num_pos_luma;
+  }
+
+  if (fg_params->chroma_scaling_from_luma || fg_params->num_cb_points) {
+    for (i = 0; i < num_pos_chroma; i++)
+      WRITE_BITS (bw, fg_params->ar_coeffs_cb_plus_128i, 8);
+  }
+
+  if (fg_params->chroma_scaling_from_luma || fg_params->num_cr_points) {
+    for (i = 0; i < num_pos_chroma; i++)
+      WRITE_BITS (bw, fg_params->ar_coeffs_cr_plus_128i, 8);
+  }
+
+  WRITE_BITS (bw, fg_params->ar_coeff_shift_minus_6, 2);
+
+  WRITE_BITS (bw, fg_params->grain_scale_shift, 2);
+
+  if (fg_params->num_cb_points) {
+    WRITE_BITS (bw, fg_params->cb_mult, 8);
+    WRITE_BITS (bw, fg_params->cb_luma_mult, 8);
+    WRITE_BITS (bw, fg_params->cb_offset, 9);
+  }
+
+  if (fg_params->num_cr_points) {
+    WRITE_BITS (bw, fg_params->cr_mult, 8);
+    WRITE_BITS (bw, fg_params->cr_luma_mult, 8);
+    WRITE_BITS (bw, fg_params->cr_offset, 9);
+  }
+
+  WRITE_BITS (bw, fg_params->overlap_flag, 1);
+  WRITE_BITS (bw, fg_params->clip_to_restricted_range, 1);
+
+success:
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write film grain params");
+  *space = have_space;
+  return FALSE;
+}
+
+static gboolean
+_av1_bit_writer_uncompressed_frame_header (const GstAV1FrameHeaderOBU *
+    frame_header, const GstAV1SequenceHeaderOBU * seq_header,
+    guint8 temporal_id, guint8 spatial_id, guint * qindex_offset,
+    guint * segmentation_offset, guint * loopfilter_offset,
+    guint * cdef_offset, guint * cdef_size, GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+  guint i;
+  gint id_len /* idLen */  = 0;
+  const GstAV1DecoderModelInfo *cmi = &seq_header->decoder_model_info;
+
+  GST_DEBUG ("writing frame header");
+
+  if (seq_header->frame_id_numbers_present_flag)
+    id_len = seq_header->additional_frame_id_length_minus_1 + 1 +
+        seq_header->delta_frame_id_length_minus_2 + 2;
+
+  if (!seq_header->reduced_still_picture_header) {
+    WRITE_BITS (bw, frame_header->show_existing_frame, 1);
+    if (frame_header->show_existing_frame) {
+      WRITE_BITS (bw, frame_header->frame_to_show_map_idx, 3);
+
+      if (seq_header->decoder_model_info_present_flag
+          && !seq_header->timing_info.equal_picture_interval)
+        WRITE_BITS (bw, frame_header->frame_presentation_time,
+            cmi->frame_presentation_time_length_minus_1 + 1);
+
+      if (seq_header->frame_id_numbers_present_flag) {
+        if (id_len <= 0)
+          goto error;
+
+        WRITE_BITS (bw, frame_header->display_frame_id, id_len);
+      }
+
+      goto success;
+    }
+
+    if (seq_header->still_picture &&
+        (frame_header->frame_type != GST_AV1_KEY_FRAME
+            || !frame_header->show_frame)) {
+      GST_INFO ("Still pictures must be coded as shown keyframes");
+      goto error;
+    }
+    WRITE_BITS (bw, frame_header->frame_type, 2);
+    WRITE_BITS (bw, frame_header->show_frame, 1);
+
+    if (frame_header->show_frame
+        && seq_header->decoder_model_info_present_flag
+        && !seq_header->timing_info.equal_picture_interval)
+      WRITE_BITS (bw, frame_header->frame_presentation_time,
+          cmi->frame_presentation_time_length_minus_1 + 1);
+
+    if (!frame_header->show_frame)
+      WRITE_BITS (bw, frame_header->showable_frame, 1);
+
+    if (!(frame_header->frame_type == GST_AV1_SWITCH_FRAME
+            || (frame_header->frame_type == GST_AV1_KEY_FRAME
+                && frame_header->show_frame)))
+      WRITE_BITS (bw, frame_header->error_resilient_mode, 1);
+  }
+
+  WRITE_BITS (bw, frame_header->disable_cdf_update, 1);
+
+  if (seq_header->seq_force_screen_content_tools ==
+      GST_AV1_SELECT_SCREEN_CONTENT_TOOLS)
+    WRITE_BITS (bw, frame_header->allow_screen_content_tools, 1);
+
+  if (frame_header->allow_screen_content_tools) {
+    if (seq_header->seq_force_integer_mv == GST_AV1_SELECT_INTEGER_MV)
+      WRITE_BITS (bw, frame_header->force_integer_mv, 1);
+  }
+
+  if (seq_header->frame_id_numbers_present_flag) {
+    if (id_len <= 0)
+      goto error;
+
+    WRITE_BITS (bw, frame_header->current_frame_id, id_len);
+  }
+
+  if (frame_header->frame_type != GST_AV1_SWITCH_FRAME
+      && !seq_header->reduced_still_picture_header)
+    WRITE_BITS (bw, frame_header->frame_size_override_flag, 1);
+
+  WRITE_BITS (bw, frame_header->order_hint,
+      seq_header->order_hint_bits_minus_1 + 1);
+
+  if (frame_header->frame_is_intra || frame_header->error_resilient_mode) {
+    if (frame_header->primary_ref_frame != GST_AV1_PRIMARY_REF_NONE) {
+      GST_WARNING ("primary_ref_frame is not none.");
+      goto error;
+    }
+  } else {
+    WRITE_BITS (bw, frame_header->primary_ref_frame, 3);
+  }
+
+  if (seq_header->decoder_model_info_present_flag) {
+    if (frame_header->buffer_removal_time_present_flag) {
+      guint op_num;
+      const GstAV1OperatingPoint *operating_points;
+
+      for (op_num = 0; op_num <= seq_header->operating_points_cnt_minus_1;
+          op_num++) {
+        operating_points = &seq_header->operating_pointsop_num;
+
+        if (operating_points->decoder_model_present_for_this_op) {
+          gint op_pt_idc = operating_points->idc;
+          gint in_temporal_layer = (op_pt_idc >> temporal_id) & 1;
+          gint in_spatial_layer = (op_pt_idc >> (spatial_id + 8)) & 1;
+
+          if (op_pt_idc == 0 || (in_temporal_layer && in_spatial_layer))
+            WRITE_BITS (bw, frame_header->buffer_removal_timeop_num,
+                cmi->buffer_removal_time_length_minus_1 + 1);
+        }
+      }
+    }
+  }
+
+  if (frame_header->frame_type == GST_AV1_INTRA_ONLY_FRAME) {
+    if (frame_header->refresh_frame_flags == 0xFF) {
+      GST_INFO ("Intra only frames cannot have refresh flags 0xFF");
+      goto error;
+    }
+  }
+  if (!(frame_header->frame_type == GST_AV1_SWITCH_FRAME ||
+          (frame_header->frame_type == GST_AV1_KEY_FRAME
+              && frame_header->show_frame)))
+    WRITE_BITS (bw, frame_header->refresh_frame_flags, 8);
+
+  if (!frame_header->frame_is_intra
+      || frame_header->refresh_frame_flags !=
+      (1 << GST_AV1_NUM_REF_FRAMES) - 1) {
+    if (frame_header->error_resilient_mode && seq_header->enable_order_hint) {
+      for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++)
+        WRITE_BITS (bw, frame_header->ref_order_hinti,
+            seq_header->order_hint_bits_minus_1 + 1);
+    }
+  }
+
+  if (frame_header->frame_is_intra) {
+    if (!_av1_bit_writer_frame_size (frame_header, seq_header, bw, space))
+      goto error;
+
+    if (!_av1_bit_writer_render_size (frame_header, bw, space))
+      goto error;
+
+    if (frame_header->allow_screen_content_tools
+        && frame_header->upscaled_width == frame_header->frame_width)
+      WRITE_BITS (bw, frame_header->allow_intrabc, 1);
+  } else {
+    if (seq_header->enable_order_hint) {
+      WRITE_BITS (bw, frame_header->frame_refs_short_signaling, 1);
+
+      if (frame_header->frame_refs_short_signaling) {
+        WRITE_BITS (bw, frame_header->last_frame_idx, 3);
+        WRITE_BITS (bw, frame_header->gold_frame_idx, 3);
+      }
+    }
+
+    for (i = 0; i < GST_AV1_REFS_PER_FRAME; i++) {
+      if (!frame_header->frame_refs_short_signaling)
+        WRITE_BITS (bw, frame_header->ref_frame_idxi, 3);
+
+      if (seq_header->frame_id_numbers_present_flag) {
+        gint32 delta_frame_id /* DeltaFrameId */ ;
+
+        if (id_len <= 0)
+          goto error;
+
+        delta_frame_id =
+            frame_header->current_frame_id - frame_header->expected_frame_idi;
+        delta_frame_id = delta_frame_id + (1 << id_len);
+        delta_frame_id = delta_frame_id % (1 << id_len);
+        WRITE_BITS (bw, delta_frame_id - 1,
+            seq_header->delta_frame_id_length_minus_2 + 2);
+      }
+    }
+
+    if (frame_header->frame_size_override_flag
+        && !frame_header->error_resilient_mode) {
+      /* 5.9.7 */
+      /* TODO: reuse reference frame width/height. Just disable now. */
+      for (i = 0; i < GST_AV1_REFS_PER_FRAME; i++)
+        WRITE_BITS (bw, 0, 1);
+    }
+
+    if (!_av1_bit_writer_frame_size (frame_header, seq_header, bw, space))
+      goto error;
+
+    if (!_av1_bit_writer_render_size (frame_header, bw, space))
+      goto error;
+
+    if (!frame_header->force_integer_mv)
+      WRITE_BITS (bw, frame_header->allow_high_precision_mv, 1);
+
+    WRITE_BITS (bw, frame_header->is_filter_switchable, 1);
+    if (!frame_header->is_filter_switchable)
+      WRITE_BITS (bw, frame_header->interpolation_filter, 2);
+
+    WRITE_BITS (bw, frame_header->is_motion_mode_switchable, 1);
+
+    if (!(frame_header->error_resilient_mode
+            || !seq_header->enable_ref_frame_mvs))
+      WRITE_BITS (bw, frame_header->use_ref_frame_mvs, 1);
+  }
+
+  if (!(seq_header->reduced_still_picture_header
+          || frame_header->disable_cdf_update))
+    WRITE_BITS (bw, frame_header->disable_frame_end_update_cdf, 1);
+
+  if (!_av1_bit_writer_tile_info (frame_header, seq_header, bw, space))
+    goto error;
+
+  if (!_av1_bit_writer_quantization_params (frame_header, seq_header,
+          qindex_offset, bw, space))
+    goto error;
+
+  if (!_av1_bit_writer_segmentation_params (frame_header, seq_header,
+          segmentation_offset, bw, space))
+    goto error;
+
+  if (!_av1_bit_writer_delta_q_params (frame_header, seq_header, bw, space))
+    goto error;
+
+  if (!_av1_bit_writer_delta_lf_params (frame_header, seq_header, bw, space))
+    goto error;
+
+  if (!_av1_bit_writer_loop_filter_params (frame_header, seq_header,
+          loopfilter_offset, bw, space))
+    goto error;
+
+  if (!_av1_bit_writer_cdef_params (frame_header, seq_header,
+          cdef_offset, cdef_size, bw, space))
+    goto error;
+
+  if (!_av1_bit_writer_loop_restoration_params (frame_header, seq_header,
+          bw, space))
+    goto error;
+
+  /* 5.9.21 tx_mode() */
+  if (frame_header->coded_lossless != 1) {
+    /* Write the tx_mode_select bit. */
+    if (frame_header->tx_mode == GST_AV1_TX_MODE_SELECT) {
+      WRITE_BITS (bw, 1, 1);
+    } else {
+      WRITE_BITS (bw, 0, 1);
+    }
+  }
+
+  /* 5.9.23 inlined frame_reference_mode () */
+  if (!frame_header->frame_is_intra)
+    WRITE_BITS (bw, frame_header->reference_select, 1);
+
+  if (!_av1_bit_writer_skip_mode_params (frame_header, seq_header, bw, space))
+    goto error;
+
+  if (!(frame_header->frame_is_intra || frame_header->error_resilient_mode ||
+          !seq_header->enable_warped_motion))
+    WRITE_BITS (bw, frame_header->allow_warped_motion, 1);
+
+  WRITE_BITS (bw, frame_header->reduced_tx_set, 1);
+
+  if (!_av1_bit_writer_global_motion_params (frame_header,
+          seq_header, bw, space))
+    goto error;
+
+  if (!_av1_bit_writer_film_grain_params (frame_header, seq_header, bw, space))
+    goto error;
+
+success:
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write frame header");
+  *space = have_space;
+  return FALSE;
+}
+
+/**
+ * gst_av1_bit_writer_frame_header_obu:
+ * @frame_hdr: the frame header of #GstAV1FrameHeaderOBU to write
+ * @seq_hdr: the sequence header of #GstAV1SequenceHeaderOBU to refer
+ * @temporal_id: specifies the temporal level of the data contained in the OBU.
+ * @spatial_id: specifies the spatial level of the data contained in the OBU.
+ * @size_field: whether the OBU header contains the OBU size.
+ * @data: (out): the bit stream generated by the frame header
+ * @size: (inout): the size in bytes of the input and output
+ *
+ * Generating the according AV1 bit stream OBU by providing the frame header.
+ *
+ * Returns: a #GstAV1BitWriterResult
+ *
+ * Since: 1.22
+ **/
+GstAV1BitWriterResult
+gst_av1_bit_writer_frame_header_obu (const GstAV1FrameHeaderOBU * frame_hdr,
+    const GstAV1SequenceHeaderOBU * seq_hdr, guint8 temporal_id,
+    guint8 spatial_id, gboolean size_field, guint8 * data, guint * size)
+{
+  return gst_av1_bit_writer_frame_header_obu_with_offsets (frame_hdr, seq_hdr,
+      temporal_id, spatial_id, size_field, 0, NULL, NULL, NULL, NULL, NULL,
+      data, size);
+}
+
+/**
+ * gst_av1_bit_writer_frame_header_obu_with_offsets:
+ * @frame_hdr: the frame header of #GstAV1FrameHeaderOBU to write
+ * @seq_hdr: the sequence header of #GstAV1SequenceHeaderOBU to refer
+ * @temporal_id: specifies the temporal level of the data contained in the OBU.
+ * @spatial_id: specifies the spatial level of the data contained in the OBU.
+ * @size_field: whether the OBU header contains the OBU size.
+ * @size_field_size: >0 means a fixed OBU header size field.
+ * @qindex_offset: (out): return the qindex fields offset in bits.
+ * @segmentation_offset: (out): return the segmentation fields offset in bits.
+ * @lf_offset: (out): return the loopfilter fields offset in bits.
+ * @cdef_offset: (out): return the cdef fields offset in bits.
+ * @cdef_size: (out): return the cdef fields size in bits.
+ * @data: (out): the bit stream generated by the frame header
+ * @size: (inout): the size in bytes of the input and output
+ *
+ * While Generating the according AV1 bit stream OBU by providing the frame
+ * header, this function also return bit offsets of qindex, segmentation and
+ * cdef, etc. These offsets can help to change the content of these fields
+ * later. This function is useful if the encoder may change the content of
+ * the frame header after generating it. For example, some HW needs user to
+ * provide a frame header before the real encoding job, and it will change
+ * the according fields in the frame header during the real encoding job.
+ *
+ * Returns: a #GstAV1BitWriterResult
+ *
+ * Since: 1.22
+ **/
+GstAV1BitWriterResult
+gst_av1_bit_writer_frame_header_obu_with_offsets (const GstAV1FrameHeaderOBU *
+    frame_hdr, const GstAV1SequenceHeaderOBU * seq_hdr, guint8 temporal_id,
+    guint8 spatial_id, gboolean size_field, guint size_field_size,
+    guint * qindex_offset, guint * segmentation_offset, guint * lf_offset,
+    guint * cdef_offset, guint * cdef_size, guint8 * data, guint * size)
+{
+  gboolean have_space = TRUE;
+  GstBitWriter bw;
+  guint payload_size;
+  guint header_size;
+
+  g_return_val_if_fail (frame_hdr != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (seq_hdr != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (temporal_id < GST_AV1_MAX_NUM_TEMPORAL_LAYERS,
+      GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (spatial_id < GST_AV1_MAX_NUM_SPATIAL_LAYERS,
+      GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (data != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (size != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (*size > 0, GST_AV1_BIT_WRITER_ERROR);
+
+  gst_bit_writer_init_with_data (&bw, data, *size, FALSE);
+
+  WRITE_BITS (&bw, 0, 1);
+  /* obu_type */
+  WRITE_BITS (&bw, GST_AV1_OBU_FRAME_HEADER, 4);
+  /* obu_extention_flag */
+  if (temporal_id > 0 || spatial_id > 0) {
+    WRITE_BITS (&bw, 1, 1);
+  } else {
+    WRITE_BITS (&bw, 0, 1);
+  }
+
+  /* obu_has_size_field */
+  if (size_field > 0) {
+    WRITE_BITS (&bw, 1, 1);
+  } else {
+    WRITE_BITS (&bw, 0, 1);
+  }
+  /* obu_reserved_1bit */
+  WRITE_BITS (&bw, 0, 1);
+
+  header_size = 1;
+
+  /* 5.3.3 OBU extension header */
+  if (temporal_id > 0 || spatial_id > 0) {
+    WRITE_BITS (&bw, temporal_id, 3);
+    WRITE_BITS (&bw, spatial_id, 2);
+    /* obu_extension_header_reserved_3bits */
+    WRITE_BITS (&bw, 0, 3);
+    header_size = 2;
+  }
+
+  /* Write size field later */
+
+  if (!_av1_bit_writer_uncompressed_frame_header (frame_hdr, seq_hdr,
+          temporal_id, spatial_id, qindex_offset, segmentation_offset,
+          lf_offset, cdef_offset, cdef_size, &bw, &have_space))
+    goto error;
+
+  /* Add trailings. */
+  WRITE_BITS (&bw, 1, 1);
+  if (!gst_bit_writer_align_bytes (&bw, 0)) {
+    have_space = FALSE;
+    goto error;
+  }
+
+  payload_size = gst_bit_writer_get_size (&bw);
+  g_assert (payload_size % 8 == 0);
+  payload_size /= 8;
+  payload_size -= header_size;
+
+  gst_bit_writer_reset (&bw);
+
+  if (size_field) {
+    size_field_size = _av1_bit_writer_add_size_field (data, size,
+        header_size, payload_size, size_field_size, &have_space);
+    if (!size_field_size)
+      goto error;
+  } else {
+    *size = header_size + payload_size;
+    size_field_size = 0;
+  }
+
+  if (qindex_offset)
+    *qindex_offset = *qindex_offset + size_field_size * 8;
+  if (segmentation_offset)
+    *segmentation_offset = *segmentation_offset + size_field_size * 8;
+  if (lf_offset)
+    *lf_offset = *lf_offset + size_field_size * 8;
+  if (cdef_offset)
+    *cdef_offset = *cdef_offset + size_field_size * 8;
+
+  return GST_AV1_BIT_WRITER_OK;
+
+error:
+  gst_bit_writer_reset (&bw);
+  *size = 0;
+  return have_space ? GST_AV1_BIT_WRITER_INVALID_DATA :
+      GST_AV1_BIT_WRITER_NO_MORE_SPACE;
+}
+
+/**
+ * gst_av1_bit_writer_temporal_delimiter_obu:
+ * @size_field: whether the header contain size feild
+ * @data: (out): the bit stream generated
+ * @size: (inout): the size in bytes of the input and output
+ *
+ * Generating the according temporal delimiter AV1 bit stream OBU.
+ *
+ * Returns: a #GstAV1BitWriterResult
+ *
+ * Since: 1.22
+ **/
+GstAV1BitWriterResult
+gst_av1_bit_writer_temporal_delimiter_obu (gboolean size_field,
+    guint8 * data, guint * size)
+{
+  gboolean have_space = TRUE;
+  GstBitWriter bw;
+
+  g_return_val_if_fail (data != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (size != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (*size > 0, GST_AV1_BIT_WRITER_ERROR);
+
+  gst_bit_writer_init_with_data (&bw, data, *size, FALSE);
+
+  /* obu_forbidden_bit */
+  WRITE_BITS (&bw, 0, 1);
+  /* obu_type */
+  WRITE_BITS (&bw, GST_AV1_OBU_TEMPORAL_DELIMITER, 4);
+  /* obu_extention_flag */
+  WRITE_BITS (&bw, 0, 1);
+  /* obu_has_size_field */
+  if (size_field) {
+    WRITE_BITS (&bw, 1, 1);
+  } else {
+    WRITE_BITS (&bw, 0, 1);
+  }
+  /* obu_reserved_1bit */
+  WRITE_BITS (&bw, 0, 1);
+
+  /* No need to add trailings */
+
+  /* header_size is 1 and payload_size is 0 */
+  if (size_field) {
+    if (!_av1_bit_writer_add_size_field (data, size, 1, 0, 0, &have_space))
+      goto error;
+  } else {
+    *size = 1 + 0;
+  }
+
+  return GST_AV1_BIT_WRITER_OK;
+
+error:
+  gst_bit_writer_reset (&bw);
+  *size = 0;
+  return have_space ? GST_AV1_BIT_WRITER_INVALID_DATA :
+      GST_AV1_BIT_WRITER_NO_MORE_SPACE;
+}
+
+/* 5.8.2 */
+static gboolean
+_av1_bit_writer_metadata_itut_t35 (const GstAV1MetadataITUT_T35 * itut_t35,
+    GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing metadata itut t35");
+
+  WRITE_BITS (bw, itut_t35->itu_t_t35_country_code, 8);
+
+  if (itut_t35->itu_t_t35_country_code == 0xFF)
+    WRITE_BITS (bw, itut_t35->itu_t_t35_country_code_extention_byte, 8);
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write metadata itut t35");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.8.3 */
+static gboolean
+_av1_bit_writer_metadata_hdr_cll (const GstAV1MetadataHdrCll * hdr_cll,
+    GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+
+  GST_DEBUG ("writing metadata hdr cll");
+
+  WRITE_BITS (bw, hdr_cll->max_cll, 16);
+  WRITE_BITS (bw, hdr_cll->max_fall, 16);
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write metadata hdr cll");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.8.4 */
+static gboolean
+_av1_bit_writer_metadata_hdr_mdcv (const GstAV1MetadataHdrMdcv * hdr_mdcv,
+    GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+  gint i;
+
+  GST_DEBUG ("writing metadata hdr mdcv");
+
+  for (i = 0; i < 3; i++) {
+    WRITE_BITS (bw, hdr_mdcv->primary_chromaticity_xi, 16);
+    WRITE_BITS (bw, hdr_mdcv->primary_chromaticity_yi, 16);
+  }
+
+  WRITE_BITS (bw, hdr_mdcv->white_point_chromaticity_x, 16);
+  WRITE_BITS (bw, hdr_mdcv->white_point_chromaticity_y, 16);
+
+  WRITE_BITS (bw, hdr_mdcv->luminance_max, 32);
+  WRITE_BITS (bw, hdr_mdcv->luminance_min, 32);
+
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write metadata hdr mdcv");
+  *space = have_space;
+  return FALSE;
+}
+
+/* 5.8.5 */
+static gboolean
+_av1_bit_writer_metadata_scalability (const GstAV1MetadataScalability *
+    scalability, GstBitWriter * bw, gboolean * space)
+{
+  gboolean have_space = TRUE;
+  guint i, j;
+
+  GST_DEBUG ("writing metadata scalability");
+
+  WRITE_BITS (bw, scalability->scalability_mode_idc, 8);
+
+  if (scalability->scalability_mode_idc != GST_AV1_SCALABILITY_SS)
+    goto success;
+
+  /* 5.8.6 */
+  WRITE_BITS (bw, scalability->spatial_layers_cnt_minus_1, 2);
+  WRITE_BITS (bw, scalability->spatial_layer_dimensions_present_flag, 1);
+  WRITE_BITS (bw, scalability->spatial_layer_description_present_flag, 1);
+  WRITE_BITS (bw, scalability->temporal_group_description_present_flag, 1);
+  /* scalability_structure_reserved_3bits */
+  WRITE_BITS (bw, 0, 3);
+
+  if (scalability->spatial_layer_dimensions_present_flag) {
+    for (i = 0; i <= scalability->spatial_layers_cnt_minus_1; i++) {
+      WRITE_BITS (bw, scalability->spatial_layer_max_widthi, 16);
+      WRITE_BITS (bw, scalability->spatial_layer_max_heighti, 16);
+    }
+  }
+
+  if (scalability->spatial_layer_description_present_flag) {
+    for (i = 0; i <= scalability->spatial_layers_cnt_minus_1; i++)
+      WRITE_BITS (bw, scalability->spatial_layer_ref_idi, 8);
+  }
+
+  if (scalability->temporal_group_description_present_flag) {
+    WRITE_BITS (bw, scalability->temporal_group_size, 8);
+
+    for (i = 0; i < scalability->temporal_group_size; i++) {
+      WRITE_BITS (bw, scalability->temporal_group_temporal_idi, 3);
+      WRITE_BITS (bw,
+          scalability->temporal_group_temporal_switching_up_point_flagi, 1);
+      WRITE_BITS (bw,
+          scalability->temporal_group_spatial_switching_up_point_flagi, 1);
+      WRITE_BITS (bw, scalability->temporal_group_ref_cnti, 3);
+      for (j = 0; j < scalability->temporal_group_ref_cnti; j++)
+        WRITE_BITS (bw, scalability->temporal_group_ref_pic_diffij, 8);
+    }
+  }
+
+success:
+  *space = TRUE;
+  return TRUE;
+
+error:
+  GST_WARNING ("failed to write metadata scalability");
+  *space = have_space;
+  return FALSE;
+}
+
+/**
+ * gst_av1_bit_writer_metadata_obu:
+ * @metadata: the meta data of #GstAV1MetadataOBU to write
+ * @temporal_id: specifies the temporal level of the data contained in the OBU.
+ * @spatial_id: specifies the spatial level of the data contained in the OBU.
+ * @size_field: whether the header contain size feild
+ * @data: (out): the bit stream generated by the meta data
+ * @size: (inout): the size in bytes of the input and output
+ *
+ * Generating the according AV1 bit stream OBU by providing the meta data.
+ *
+ * Returns: a #GstAV1BitWriterResult
+ *
+ * Since: 1.22
+ **/
+GstAV1BitWriterResult
+gst_av1_bit_writer_metadata_obu (const GstAV1MetadataOBU * metadata,
+    guint8 temporal_id, guint8 spatial_id, gboolean size_field,
+    guint8 * data, guint * size)
+{
+  gboolean have_space = TRUE;
+  GstBitWriter bw;
+  guint header_size;
+  guint payload_size;
+  guint8 metadata_type_data4;
+  guint metadata_size;
+  guint i;
+
+  g_return_val_if_fail (metadata != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (temporal_id < GST_AV1_MAX_NUM_TEMPORAL_LAYERS,
+      GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (spatial_id < GST_AV1_MAX_NUM_SPATIAL_LAYERS,
+      GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (data != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (size != NULL, GST_AV1_BIT_WRITER_ERROR);
+  g_return_val_if_fail (*size > 0, GST_AV1_BIT_WRITER_ERROR);
+
+  gst_bit_writer_init_with_data (&bw, data, *size, FALSE);
+
+  /* obu_forbidden_bit */
+  WRITE_BITS (&bw, 0, 1);
+  /* obu_type */
+  WRITE_BITS (&bw, GST_AV1_OBU_METADATA, 4);
+  /* obu_extention_flag */
+  if (temporal_id > 0 || spatial_id > 0) {
+    WRITE_BITS (&bw, 1, 1);
+  } else {
+    WRITE_BITS (&bw, 0, 1);
+  }
+  /* obu_has_size_field */
+  if (size_field) {
+    WRITE_BITS (&bw, 1, 1);
+  } else {
+    WRITE_BITS (&bw, 0, 1);
+  }
+  /* obu_reserved_1bit */
+  WRITE_BITS (&bw, 0, 1);
+
+  header_size = 1;
+  /* 5.3.3 OBU extension header */
+  if (temporal_id > 0 || spatial_id > 0) {
+    WRITE_BITS (&bw, temporal_id, 3);
+    WRITE_BITS (&bw, spatial_id, 2);
+    /* obu_extension_header_reserved_3bits */
+    WRITE_BITS (&bw, 0, 3);
+    header_size = 2;
+  }
+
+  /* Generate the metadata_type first */
+  metadata_size = _av1_uleb_size_in_bytes (metadata->metadata_type);
+  if (metadata_size > 4) {
+    GST_WARNING ("Invalid metadata_type");
+    goto error;
+  }
+  if (!_av1_encode_uleb (metadata->metadata_type,
+          sizeof (metadata->metadata_type),
+          metadata_type_data, metadata_size)) {
+    GST_WARNING ("Failed to write metadata_type");
+    goto error;
+  }
+  for (i = 0; i < metadata_size; i++)
+    WRITE_BITS (&bw, metadata_type_datai, 8);
+
+  switch (metadata->metadata_type) {
+    case GST_AV1_METADATA_TYPE_ITUT_T35:
+      if (!_av1_bit_writer_metadata_itut_t35 (&metadata->itut_t35,
+              &bw, &have_space))
+        goto error;
+      break;
+    case GST_AV1_METADATA_TYPE_HDR_CLL:
+      if (!_av1_bit_writer_metadata_hdr_cll (&metadata->hdr_cll,
+              &bw, &have_space))
+        goto error;
+      break;
+    case GST_AV1_METADATA_TYPE_HDR_MDCV:
+      if (!_av1_bit_writer_metadata_hdr_mdcv (&metadata->hdr_mdcv,
+              &bw, &have_space))
+        goto error;
+      break;
+    case GST_AV1_METADATA_TYPE_SCALABILITY:
+      if (!_av1_bit_writer_metadata_scalability (&metadata->scalability,
+              &bw, &have_space))
+        goto error;
+      break;
+    default:
+      GST_WARNING ("Unsupported metadata_type");
+      goto error;
+  }
+
+  /* Add trailings. */
+  WRITE_BITS (&bw, 1, 1);
+  if (!gst_bit_writer_align_bytes (&bw, 0)) {
+    have_space = FALSE;
+    goto error;
+  }
+
+  payload_size = gst_bit_writer_get_size (&bw);
+  g_assert (payload_size % 8 == 0);
+  payload_size /= 8;
+  payload_size -= header_size;
+
+  gst_bit_writer_reset (&bw);
+
+  if (size_field) {
+    if (!_av1_bit_writer_add_size_field (data, size,
+            header_size, payload_size, 0, &have_space))
+      goto error;
+  } else {
+    *size = header_size + payload_size;
+  }
+
+  return GST_AV1_BIT_WRITER_OK;
+
+error:
+  gst_bit_writer_reset (&bw);
+  *size = 0;
+  return have_space ? GST_AV1_BIT_WRITER_INVALID_DATA :
+      GST_AV1_BIT_WRITER_NO_MORE_SPACE;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gstav1bitwriter.h Added

@@ -0,0 +1,88 @@
+/* GStreamer
+ *  Copyright (C) 2022 Intel Corporation
+ *     Author: He Junyan <junyan.he@intel.com>
+ *
+ * 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 the0
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_AV1_BIT_WRITER_H__
+#define __GST_AV1_BIT_WRITER_H__
+
+#include <gst/codecparsers/gstav1parser.h>
+#include <gst/codecparsers/codecparsers-prelude.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GstAV1BitWriterResult:
+ * @GST_AV1_BIT_WRITER_OK: The writing succeeded
+ * @GST_AV1_BIT_WRITER_INVALID_DATA: The input data to write is invalid
+ * @GST_AV1_BIT_WRITER_NO_MORE_SPACE: The output does not have enough size
+ * @GST_AV1_BIT_WRITER_ERROR: An general error occurred when writing
+ *
+ * The result of writing AV1 data into bit stream.
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_AV1_BIT_WRITER_OK,
+  GST_AV1_BIT_WRITER_INVALID_DATA,
+  GST_AV1_BIT_WRITER_NO_MORE_SPACE,
+  GST_AV1_BIT_WRITER_ERROR
+} GstAV1BitWriterResult;
+
+GST_CODEC_PARSERS_API
+GstAV1BitWriterResult    gst_av1_bit_writer_sequence_header_obu (const GstAV1SequenceHeaderOBU * seq_hdr,
+                                                                 gboolean size_field,
+                                                                 guint8 * data,
+                                                                 guint * size);
+GST_CODEC_PARSERS_API
+GstAV1BitWriterResult    gst_av1_bit_writer_frame_header_obu    (const GstAV1FrameHeaderOBU * frame_hdr,
+                                                                 const GstAV1SequenceHeaderOBU * seq_hdr,
+                                                                 guint8 temporal_id,
+                                                                 guint8 spatial_id,
+                                                                 gboolean size_field,
+                                                                 guint8 * data,
+                                                                 guint * size);
+GST_CODEC_PARSERS_API
+GstAV1BitWriterResult    gst_av1_bit_writer_frame_header_obu_with_offsets (const GstAV1FrameHeaderOBU * frame_hdr,
+                                                                           const GstAV1SequenceHeaderOBU * seq_hdr,
+                                                                           guint8 temporal_id,
+                                                                           guint8 spatial_id,
+                                                                           gboolean size_field,
+                                                                           guint size_field_size,
+                                                                           guint * qindex_offset,
+                                                                           guint * segmentation_offset,
+                                                                           guint * lf_offset,
+                                                                           guint * cdef_offset,
+                                                                           guint * cdef_size,
+                                                                           guint8 * data,
+                                                                           guint * size);
+GST_CODEC_PARSERS_API
+GstAV1BitWriterResult    gst_av1_bit_writer_temporal_delimiter_obu (gboolean size_field,
+                                                                    guint8 * data,
+                                                                    guint * size);
+GST_CODEC_PARSERS_API
+GstAV1BitWriterResult    gst_av1_bit_writer_metadata_obu        (const GstAV1MetadataOBU * metadata,
+                                                                 guint8 temporal_id,
+                                                                 guint8 spatial_id,
+                                                                 gboolean size_field,
+                                                                 guint8 * data,
+                                                                 guint * size);
+G_END_DECLS
+
+#endif /* __GST_AV1_BIT_WRITER_H__ */

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gstav1parser.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gstav1parser.c Changed

@@ -544,7 +544,7 @@
     parser->state.sequence_changed = FALSE;
 
     if (parser->seq_header) {
-      g_slice_free (GstAV1SequenceHeaderOBU, parser->seq_header);
+      g_free (parser->seq_header);
       parser->seq_header = NULL;
     }
   }
@@ -1440,10 +1440,10 @@
             sizeof (GstAV1SequenceHeaderOBU)))
       goto success;
 
-    g_slice_free (GstAV1SequenceHeaderOBU, parser->seq_header);
+    g_free (parser->seq_header);
   }
 
-  parser->seq_header = g_slice_dup (GstAV1SequenceHeaderOBU, seq_header);
+  parser->seq_header = g_memdup2 (seq_header, sizeof (GstAV1SequenceHeaderOBU));
   gst_av1_parse_reset_state (parser, FALSE);
 
   /* choose_operating_point() set the operating_point */
@@ -2229,8 +2229,6 @@
       ((parser->state.mi_cols + 31) >> 5) : ((parser->state.mi_cols + 15) >> 4);
   sb_rows = seq_header->use_128x128_superblock ? ((parser->state.mi_rows +
           31) >> 5) : ((parser->state.mi_rows + 15) >> 4);
-  sb_cols = MIN (GST_AV1_MAX_TILE_COLS, sb_cols);
-  sb_rows = MIN (GST_AV1_MAX_TILE_ROWS, sb_rows);
   sb_shift = seq_header->use_128x128_superblock ? 5 : 4;
   sb_size = sb_shift + 2;
   max_tile_width_sb = GST_AV1_MAX_TILE_WIDTH >> sb_size;
@@ -2262,7 +2260,9 @@
     tile_width_sb = (sb_cols + (1 << parser->state.tile_cols_log2) -
         1) >> parser->state.tile_cols_log2;
     i = 0;
-    for (start_sb = 0; start_sb < sb_cols; start_sb += tile_width_sb) {
+    /* Fill mi_col_starts and make sure to not exceed array range */
+    for (start_sb = 0; start_sb < sb_cols && i < GST_AV1_MAX_TILE_COLS;
+        start_sb += tile_width_sb) {
       parser->state.mi_col_startsi = start_sb << sb_shift;
       i += 1;
     }
@@ -2291,7 +2291,9 @@
     tile_height_sb = (sb_rows + (1 << parser->state.tile_rows_log2) -
         1) >> parser->state.tile_rows_log2;
     i = 0;
-    for (start_sb = 0; start_sb < sb_rows; start_sb += tile_height_sb) {
+    /* Fill mi_row_starts and make sure to not exceed array range */
+    for (start_sb = 0; start_sb < sb_rows && i < GST_AV1_MAX_TILE_ROWS;
+        start_sb += tile_height_sb) {
       parser->state.mi_row_startsi = start_sb << sb_shift;
       i += 1;
     }
@@ -2306,7 +2308,8 @@
   } else {
     widest_tile_sb = 0;
     start_sb = 0;
-    for (i = 0; start_sb < sb_cols; i++) {
+    /* Fill mi_col_starts and make sure to not exceed array range */
+    for (i = 0; start_sb < sb_cols && i < GST_AV1_MAX_TILE_COLS; i++) {
       parser->state.mi_col_startsi = start_sb << sb_shift;
       max_width = MIN (sb_cols - start_sb, max_tile_width_sb);
       tile_info->width_in_sbs_minus_1i =
@@ -2331,7 +2334,8 @@
     max_tile_height_sb = MAX (max_tile_area_sb / widest_tile_sb, 1);
 
     start_sb = 0;
-    for (i = 0; start_sb < sb_rows; i++) {
+    /* Fill mi_row_starts and make sure to not exceed array range */
+    for (i = 0; start_sb < sb_rows && i < GST_AV1_MAX_TILE_ROWS; i++) {
       parser->state.mi_row_startsi = start_sb << sb_shift;
       max_height = MIN (sb_rows - start_sb, max_tile_height_sb);
       tile_info->height_in_sbs_minus_1i =
@@ -3412,6 +3416,7 @@
         frame_header->order_hint);
 
   last_order_hint = shifted_order_hintsframe_header->last_frame_idx;
+  earliest_order_hint = shifted_order_hintsframe_header->gold_frame_idx;
 
   /* === Backward Reference Frames === */
   /* The ALTREF_FRAME reference is set to be a backward
@@ -3434,7 +3439,6 @@
   /* The BWDREF_FRAME reference is set to be a backward reference
      to the closest frame. */
   ref = -1;
-  earliest_order_hint = last_order_hint;
   for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
     hint = shifted_order_hintsi;
     if (!used_framei && hint >= cur_frame_hint
@@ -3452,7 +3456,6 @@
   /* The ALTREF2_FRAME reference is set to the next closest
      backward reference. */
   ref = -1;
-  earliest_order_hint = last_order_hint;
   for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
     hint = shifted_order_hintsi;
     if (!used_framei && hint >= cur_frame_hint
@@ -3471,7 +3474,6 @@
 
   /* The remaining references are set to be forward references
      in anti-chronological order. */
-  last_order_hint = 0;
   for (i = 0; i < GST_AV1_REFS_PER_FRAME - 2; i++) {
     GstAV1ReferenceFrame ref_frame = ref_frame_listi;
     if (frame_header->ref_frame_idxref_frame - GST_AV1_REF_LAST_FRAME < 0) {
@@ -3495,7 +3497,6 @@
   /* Finally, any remaining references are set to the reference frame
      with smallest output order. */
   ref = -1;
-  earliest_order_hint = cur_frame_hint * 2;
   for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
     hint = shifted_order_hintsi;
     if (ref < 0 || hint < earliest_order_hint) {
@@ -3956,12 +3957,10 @@
         if (expected_frame_id !=
             parser->state.ref_info.entryframe_header->
                 ref_frame_idxi.ref_frame_id) {
-          GST_INFO ("Reference buffer frame ID mismatch, expectedFrameId"
-              " is %d wihle ref frame id is %d", expected_frame_id,
+          GST_DEBUG ("Reference buffer frame ID mismatch, expectedFrameId"
+              " is %d while ref frame id is %d", expected_frame_id,
               parser->state.ref_info.entryframe_header->
                   ref_frame_idxi.ref_frame_id);
-          retval = GST_AV1_PARSER_BITSTREAM_ERROR;
-          goto error;
         }
       }
     }
@@ -4343,6 +4342,13 @@
   tile_list->output_frame_width_in_tiles_minus_1 = AV1_READ_BITS (br, 8);
   tile_list->output_frame_height_in_tiles_minus_1 = AV1_READ_BITS (br, 8);
   tile_list->tile_count_minus_1 = AV1_READ_BITS (br, 16);
+  if (tile_list->tile_count_minus_1 + 1 > GST_AV1_MAX_TILE_COUNT) {
+    GST_WARNING ("Invalid tile_count_minus_1 %d",
+        tile_list->tile_count_minus_1);
+    retval = GST_AV1_PARSER_BITSTREAM_ERROR;
+    goto error;
+  }
+
   for (tile = 0; tile <= tile_list->tile_count_minus_1; tile++) {
     if (AV1_REMAINING_BITS (br) < 8 + 8 + 8 + 16) {
       retval = GST_AV1_PARSER_NO_MORE_DATA;
@@ -4684,7 +4690,7 @@
 GstAV1Parser *
 gst_av1_parser_new (void)
 {
-  return g_slice_new0 (GstAV1Parser);
+  return g_new0 (GstAV1Parser, 1);
 }
 
 /**
@@ -4703,6 +4709,6 @@
   g_return_if_fail (parser != NULL);
 
   if (parser->seq_header)
-    g_slice_free (GstAV1SequenceHeaderOBU, parser->seq_header);
-  g_slice_free (GstAV1Parser, parser);
+    g_free (parser->seq_header);
+  g_free (parser);
 }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gstav1parser.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gstav1parser.h Changed

@@ -71,9 +71,8 @@
 #define GST_AV1_MAX_TILE_COUNT                 512
 #define GST_AV1_MAX_OPERATING_POINTS    \
   (GST_AV1_MAX_NUM_TEMPORAL_LAYERS * GST_AV1_MAX_NUM_SPATIAL_LAYERS)
-#define GST_AV1_MAX_SPATIAL_LAYERS             2  /* correct? */
-#define GST_AV1_MAX_TEMPORAL_GROUP_SIZE        8  /* correct? */
-#define GST_AV1_MAX_TEMPORAL_GROUP_REFERENCES  8  /* correct? */
+#define GST_AV1_MAX_TEMPORAL_GROUP_SIZE        255
+#define GST_AV1_MAX_TEMPORAL_GROUP_REFERENCES  7
 #define GST_AV1_MAX_NUM_Y_POINTS               16
 #define GST_AV1_MAX_NUM_CB_POINTS              16
 #define GST_AV1_MAX_NUM_CR_POINTS              16
@@ -968,9 +967,9 @@
   gboolean spatial_layer_dimensions_present_flag;
   gboolean spatial_layer_description_present_flag;
   gboolean temporal_group_description_present_flag;
-  guint16 spatial_layer_max_widthGST_AV1_MAX_SPATIAL_LAYERS;
-  guint16 spatial_layer_max_heightGST_AV1_MAX_SPATIAL_LAYERS;
-  guint8 spatial_layer_ref_idGST_AV1_MAX_SPATIAL_LAYERS;
+  guint16 spatial_layer_max_widthGST_AV1_MAX_NUM_SPATIAL_LAYERS;
+  guint16 spatial_layer_max_heightGST_AV1_MAX_NUM_SPATIAL_LAYERS;
+  guint8 spatial_layer_ref_idGST_AV1_MAX_NUM_SPATIAL_LAYERS;
   guint8 temporal_group_size;
 
   guint8 temporal_group_temporal_idGST_AV1_MAX_TEMPORAL_GROUP_SIZE;
@@ -1536,6 +1535,8 @@
  * @render_height: the frame height to be rendered.
  * @tx_mode: specifies how the transform size is determined.
  * @skip_mode_frame: specifies the frames to use for compound prediction when @skip_mode is 1.
+ * @expected_frame_id: specifies the frame id for each frame used for reference. (Since: 1.24)
+ * @ref_global_motion_params: specifies the global motion parameters of the reference. (Since: 1.24)
  */
 struct _GstAV1FrameHeaderOBU {
   gboolean show_existing_frame;
@@ -1605,6 +1606,24 @@
   GstAV1TXModes tx_mode; /* TxMode */
 
   guint8 skip_mode_frame2; /* SkipModeFrame */
+
+  /**
+   * _GstAV1FrameHeaderOBU.expected_frame_id:
+   *
+   * Specifies the frames to use for compound prediction.
+   *
+   * Since: 1.24
+   */
+  gint32 expected_frame_idGST_AV1_REFS_PER_FRAME;
+
+  /**
+   * _GstAV1FrameHeaderOBU.ref_global_motion_params:
+   *
+   * Specifies the global motion parameters of the reference.
+   *
+   * Since: 1.24
+   */
+  GstAV1GlobalMotionParams ref_global_motion_params;
 };
 
 /**

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gsth264bitwriter.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gsth264bitwriter.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gsth264parser.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gsth264parser.c Changed

@@ -986,7 +986,7 @@
       hrd = &vui->vcl_hrd_parameters;
     }
 
-    tim->CpbDpbDelaysPresentFlag = ! !hrd;
+    tim->CpbDpbDelaysPresentFlag = !!hrd;
     tim->pic_struct_present_flag = vui->pic_struct_present_flag;
 
     if (tim->CpbDpbDelaysPresentFlag) {
@@ -1102,8 +1102,8 @@
 
   for (int i = 0; i < 16; i++) {
     READ_UINT8 (nr, urud->uuidi, 8);
-    --payload_size;
   }
+  payload_size -= 16;
 
   urud->size = payload_size;
 
@@ -1432,7 +1432,7 @@
 {
   GstH264NalParser *nalparser;
 
-  nalparser = g_slice_new0 (GstH264NalParser);
+  nalparser = g_new0 (GstH264NalParser, 1);
 
   return nalparser;
 }
@@ -1452,7 +1452,7 @@
     gst_h264_sps_clear (&nalparser->spsi);
   for (i = 0; i < GST_H264_MAX_PPS_COUNT; i++)
     gst_h264_pps_clear (&nalparser->ppsi);
-  g_slice_free (GstH264NalParser, nalparser);
+  g_free (nalparser);
 
   nalparser = NULL;
 }
@@ -1507,9 +1507,9 @@
   nalu->size = size - nalu->offset;
 
   if (!gst_h264_parse_nalu_header (nalu)) {
-    GST_WARNING ("error parsing \"NAL unit header\"");
+    GST_DEBUG ("not enough data to parse \"NAL unit header\"");
     nalu->size = 0;
-    return GST_H264_PARSER_BROKEN_DATA;
+    return GST_H264_PARSER_NO_NAL;
   }
 
   nalu->valid = TRUE;
@@ -1652,6 +1652,179 @@
 }
 
 /**
+ * gst_h264_parser_identify_and_split_nalu_avc:
+ * @nalparser: a #GstH264NalParser
+ * @data: The data to parse, containing an AVC coded NAL unit
+ * @offset: the offset in @data from which to parse the NAL unit
+ * @size: the size of @data
+ * @nal_length_size: the size in bytes of the AVC nal length prefix.
+ * @nalus: a caller allocated GArray of #GstH264NalUnit where to store parsed nal headers
+ * @consumed: (out): the size of consumed bytes
+ *
+ * Parses @data for packetized (e.g., avc/avc3) bitstream and
+ * sets @nalus. In addition to nal identifying process,
+ * this method scans start-code prefix to split malformed packet into
+ * actual nal chunks.
+ *
+ * Returns: a #GstH264ParserResult
+ *
+ * Since: 1.22.9
+ */
+GstH264ParserResult
+gst_h264_parser_identify_and_split_nalu_avc (GstH264NalParser * nalparser,
+    const guint8 * data, guint offset, gsize size, guint8 nal_length_size,
+    GArray * nalus, gsize * consumed)
+{
+  GstBitReader br;
+  guint nalu_size;
+  guint remaining;
+  guint off;
+  guint sc_size;
+
+  g_return_val_if_fail (data != NULL, GST_H264_PARSER_ERROR);
+  g_return_val_if_fail (nalus != NULL, GST_H264_PARSER_ERROR);
+  g_return_val_if_fail (nal_length_size > 0 && nal_length_size < 5,
+      GST_H264_PARSER_ERROR);
+
+  g_array_set_size (nalus, 0);
+
+  if (consumed)
+    *consumed = 0;
+
+  /* Would overflow guint below otherwise: the callers needs to ensure that
+   * this never happens */
+  if (offset > G_MAXUINT32 - nal_length_size) {
+    GST_WARNING ("offset + nal_length_size overflow");
+    return GST_H264_PARSER_BROKEN_DATA;
+  }
+
+  if (size < offset + nal_length_size) {
+    GST_DEBUG ("Can't parse, buffer has too small size %" G_GSIZE_FORMAT
+        ", offset %u", size, offset);
+    return GST_H264_PARSER_ERROR;
+  }
+
+  /* Read nal unit size and unwrap the size field */
+  gst_bit_reader_init (&br, data + offset, size - offset);
+  nalu_size = gst_bit_reader_get_bits_uint32_unchecked (&br,
+      nal_length_size * 8);
+
+  if (nalu_size < 1) {
+    GST_WARNING ("too small nal size %d", nalu_size);
+    return GST_H264_PARSER_BROKEN_DATA;
+  }
+
+  if (size < (gsize) nalu_size + nal_length_size) {
+    GST_WARNING ("larger nalu size %d than data size %" G_GSIZE_FORMAT,
+        nalu_size + nal_length_size, size);
+    return GST_H264_PARSER_BROKEN_DATA;
+  }
+
+  if (consumed)
+    *consumed = nalu_size + nal_length_size;
+
+  off = offset + nal_length_size;
+  remaining = nalu_size;
+  sc_size = nal_length_size;
+
+  /* Drop trailing start-code since it will not be scanned */
+  if (remaining >= 3) {
+    if (dataoff + remaining - 1 == 0x01 && dataoff + remaining - 2 == 0x00
+        && dataoff + remaining - 3 == 0x00) {
+      remaining -= 3;
+
+      /* 4 bytes start-code */
+      if (remaining > 0 && dataoff + remaining - 1 == 0x00)
+        remaining--;
+    }
+  }
+
+  /* Looping to split malformed nal units. nal-length field was dropped above
+   * so expected bitstream structure are:
+   *
+   * <complete nalu>
+   * | nalu |
+   * sc scan result will be -1 and handled in CONDITION-A
+   *
+   * <nalu with startcode prefix>
+   * | SC | nalu |
+   * Hit CONDITION-C first then terminated in CONDITION-A
+   *
+   * <first nal has no startcode but others have>
+   * | nalu | SC | nalu | ...
+   * CONDITION-B handles those cases
+   */
+  do {
+    GstH264NalUnit nalu;
+    gint sc_offset = -1;
+    guint skip_size = 0;
+
+    memset (&nalu, 0, sizeof (GstH264NalUnit));
+
+    /* startcode 3 bytes + minimum nal size 1 */
+    if (remaining >= 4)
+      sc_offset = scan_for_start_codes (data + off, remaining);
+
+    if (sc_offset < 0) {
+      if (remaining >= 1) {
+        /* CONDITION-A */
+        /* Last chunk */
+        nalu.size = remaining;
+        nalu.sc_offset = off - sc_size;
+        nalu.offset = off;
+        nalu.data = (guint8 *) data;
+        nalu.valid = TRUE;
+
+        gst_h264_parse_nalu_header (&nalu);
+        g_array_append_val (nalus, nalu);
+      }
+      break;
+    } else if ((sc_offset == 2 && dataoff + sc_offset - 1 != 0)
+        || sc_offset > 2) {
+      /* CONDITION-B */
+      /* Found trailing startcode prefix */
+
+      nalu.size = sc_offset;
+      if (dataoff + sc_offset - 1 == 0) {
+        /* 4 bytes start code */
+        nalu.size--;
+      }
+
+      nalu.sc_offset = off - sc_size;
+      nalu.offset = off;
+      nalu.data = (guint8 *) data;
+      nalu.valid = TRUE;
+
+      gst_h264_parse_nalu_header (&nalu);
+      g_array_append_val (nalus, nalu);
+    } else {
+      /* CONDITION-C */
+      /* startcode located at beginning of this chunk without actual nal data.
+       * skip this start code */
+    }
+
+    skip_size = sc_offset + 3;
+    if (skip_size >= remaining)
+      break;
+
+    /* no more nal-length bytes but 3bytes startcode */
+    sc_size = 3;
+    if (sc_offset > 0 && dataoff + sc_offset - 1 == 0)
+      sc_size++;
+
+    remaining -= skip_size;
+    off += skip_size;
+  } while (remaining >= 1);
+
+  if (nalus->len > 0)
+    return GST_H264_PARSER_OK;
+
+  GST_WARNING ("No nal found");
+
+  return GST_H264_PARSER_BROKEN_DATA;
+}
+
+/**
  * gst_h264_parser_parse_nal:
  * @nalparser: a #GstH264NalParser
  * @nalu: The #GstH264NalUnit to parse
@@ -2432,7 +2605,8 @@
     guint32 PicHeightInMapUnits = sps->pic_height_in_map_units_minus1 + 1;
     guint32 PicSizeInMapUnits = PicWidthInMbs * PicHeightInMapUnits;
     guint32 SliceGroupChangeRate = pps->slice_group_change_rate_minus1 + 1;
-    const guint n = ceil_log2 (PicSizeInMapUnits / SliceGroupChangeRate + 1);
+    const guint n =
+        gst_util_ceil_log2 (PicSizeInMapUnits / SliceGroupChangeRate + 1);
     READ_UINT16 (&nr, slice->slice_group_change_cycle, n);
   }
 
@@ -2846,6 +3020,19 @@
 }
 
 static gboolean
+gst_h264_write_sei_user_data_unregistered (NalWriter * nw,
+    GstH264UserDataUnregistered * udu)
+{
+  WRITE_BYTES (nw, udu->uuid, 16);
+  WRITE_BYTES (nw, udu->data, udu->size);
+
+  return TRUE;
+
+error:
+  return FALSE;
+}
+
+static gboolean
 gst_h264_write_sei_frame_packing (NalWriter * nw,
     GstH264FramePacking * frame_packing)
 {
@@ -3029,6 +3216,12 @@
         payload_size_data += rud->size;
         break;
       }
+      case GST_H264_SEI_USER_DATA_UNREGISTERED:{
+        GstH264UserDataUnregistered *udu = &msg->payload.user_data_unregistered;
+
+        payload_size_data = 16 + udu->size;
+        break;
+      }
       case GST_H264_SEI_FRAME_PACKING:{
         GstH264FramePacking *frame_packing = &msg->payload.frame_packing;
         guint leading_zeros, rest;
@@ -3216,6 +3409,15 @@
         }
         have_written_data = TRUE;
         break;
+      case GST_H264_SEI_USER_DATA_UNREGISTERED:
+        GST_DEBUG ("Writing \"Unregistered user data\"");
+        if (!gst_h264_write_sei_user_data_unregistered (&nw,
+                &msg->payload.user_data_unregistered)) {
+          GST_WARNING ("Failed to write \"Unregistered user data\"");
+          goto error;
+        }
+        have_written_data = TRUE;
+        break;
       case GST_H264_SEI_FRAME_PACKING:
         GST_DEBUG ("Writing \"Frame packing\"");
         if (!gst_h264_write_sei_frame_packing (&nw,
@@ -3414,7 +3616,7 @@
  * The validation for completeness of @au and @sei is caller's responsibility.
  * Both @au and @sei must be byte-stream formatted
  *
- * Returns: (nullable): a SEI inserted #GstBuffer or %NULL
+ * Returns: (transfer full) (nullable): a SEI inserted #GstBuffer or %NULL
  *   if cannot figure out proper position to insert a @sei
  *
  * Since: 1.18
@@ -3444,7 +3646,7 @@
  * Nal prefix type of both @au and @sei must be packetized, and
  * also the size of nal length field must be identical to @nal_length_size
  *
- * Returns: (nullable): a SEI inserted #GstBuffer or %NULL
+ * Returns: (transfer full) (nullable): a SEI inserted #GstBuffer or %NULL
  *   if cannot figure out proper position to insert a @sei
  *
  * Since: 1.18
@@ -3689,3 +3891,81 @@
 #undef READ_CONFIG_UINT8
 #undef SKIP_CONFIG_BITS
 }
+
+typedef struct
+{
+  const gchar *name;
+  GstH264Profile profile;
+} H264ProfileMapping;
+
+
+static const H264ProfileMapping h264_profiles = {
+  {"baseline", GST_H264_PROFILE_BASELINE},
+  {"main", GST_H264_PROFILE_MAIN},
+  {"high", GST_H264_PROFILE_HIGH},
+  {"high-10", GST_H264_PROFILE_HIGH10},
+  {"high-4:2:2", GST_H264_PROFILE_HIGH_422},
+  {"high-4:4:4", GST_H264_PROFILE_HIGH_444},
+  {"multiview-high", GST_H264_PROFILE_MULTIVIEW_HIGH},
+  {"stereo-high", GST_H264_PROFILE_STEREO_HIGH},
+  {"scalable-baseline", GST_H264_PROFILE_SCALABLE_BASELINE},
+  {"scalable-high", GST_H264_PROFILE_SCALABLE_HIGH},
+};
+
+/**
+ * gst_h264_profile_from_string:
+ * @string: the descriptive name for #GstH264Profile
+ *
+ * Returns a #GstH264Profile for the @string.
+ *
+ * Returns: the #GstH264Profile of @string or %GST_H265_PROFILE_INVALID on error
+ *
+ * Since: 1.24
+ */
+GstH264Profile
+gst_h264_profile_from_string (const gchar * string)
+{
+  guint i;
+
+  if (string == NULL)
+    return GST_H264_PROFILE_INVALID;
+
+  for (i = 0; i < G_N_ELEMENTS (h264_profiles); i++) {
+    if (g_strcmp0 (string, h264_profilesi.name) == 0) {
+      return h264_profilesi.profile;
+    }
+  }
+
+  return GST_H264_PROFILE_INVALID;
+}
+
+/**
+ * gst_h264_slice_type_to_string:
+ * @slice_type: a #GstH264SliceType
+ *
+ * Returns the descriptive name for the #GstH264SliceType.
+ *
+ * Returns: (nullable): the name for @slice_type or %NULL on error
+ *
+ * Since: 1.24
+ */
+const gchar *
+gst_h264_slice_type_to_string (GstH264SliceType slice_type)
+{
+  switch (slice_type) {
+    case GST_H264_P_SLICE:
+      return "P";
+    case GST_H264_B_SLICE:
+      return "B";
+    case GST_H264_I_SLICE:
+      return "I";
+    case GST_H264_SP_SLICE:
+      return "SP";
+    case GST_H264_SI_SLICE:
+      return "SI";
+    default:
+      GST_ERROR ("unknown %d slice type", slice_type);
+  }
+
+  return NULL;
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gsth264parser.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gsth264parser.h Changed

@@ -111,7 +111,15 @@
   GST_H264_PROFILE_MULTIVIEW_HIGH       = 118,
   GST_H264_PROFILE_STEREO_HIGH          = 128,
   GST_H264_PROFILE_SCALABLE_BASELINE    = 83,
-  GST_H264_PROFILE_SCALABLE_HIGH        = 86
+  GST_H264_PROFILE_SCALABLE_HIGH        = 86,
+  /**
+   * GST_H264_PROFILE_INVALID:
+   *
+   * Invalid H264 profile
+   *
+   * Since: 1.24
+   */
+  GST_H264_PROFILE_INVALID              = -1
 } GstH264Profile;
 
 /**
@@ -133,6 +141,8 @@
  * @GST_H264_NAL_PREFIX_UNIT: Prefix NAL unit
  * @GST_H264_NAL_SUBSET_SPS: Subset sequence parameter set (SSPS) NAL unit
  * @GST_H264_NAL_DEPTH_SPS: Depth parameter set (DPS) NAL unit
+ * @GST_H264_NAL_RSV_1: First reserved parameter
+ * @GST_H264_NAL_RSV_2: Second reserved parameter
  * @GST_H264_NAL_SLICE_AUX: Auxiliary coded picture without partitioning NAL unit
  * @GST_H264_NAL_SLICE_EXT: Coded slice extension NAL unit
  * @GST_H264_NAL_SLICE_DEPTH: Coded slice extension for depth or 3D-AVC texture view
@@ -158,6 +168,24 @@
   GST_H264_NAL_PREFIX_UNIT  = 14,
   GST_H264_NAL_SUBSET_SPS   = 15,
   GST_H264_NAL_DEPTH_SPS    = 16,
+
+  /**
+   * GST_H264_NAL_RSV_1:
+   *
+   * First reserved parameter
+   *
+   * Since: 1.24
+   */
+  GST_H264_NAL_RSV_1        = 17,
+
+  /**
+   * GST_H264_NAL_RSV_2:
+   *
+   * Second reserved parameter
+   *
+   * Since: 1.24
+   */
+  GST_H264_NAL_RSV_2        = 18,
   GST_H264_NAL_SLICE_AUX    = 19,
   GST_H264_NAL_SLICE_EXT    = 20,
   GST_H264_NAL_SLICE_DEPTH  = 21
@@ -352,6 +380,57 @@
   GST_H264_CT_TYPE_UNKNOWN = 2,
 } GstCtType;
 
+/**
+ * GstH264Level:
+ * @GST_H264_LEVEL_L1: Level 1
+ * @GST_H264_LEVEL_L1B: Level 1b
+ * @GST_H264_LEVEL_L1_1: Level 1.1
+ * @GST_H264_LEVEL_L1_2: Level 1.2
+ * @GST_H264_LEVEL_L1_3: Level 1.3
+ * @GST_H264_LEVEL_L2: Level 2
+ * @GST_H264_LEVEL_L2_1: Level 2.1
+ * @GST_H264_LEVEL_L2_2: Level 2.2
+ * @GST_H264_LEVEL_L3: Level 3
+ * @GST_H264_LEVEL_L3_1: Level 3.1
+ * @GST_H264_LEVEL_L3_2: Level 3.2
+ * @GST_H264_LEVEL_L4: Level 4
+ * @GST_H264_LEVEL_L4_1: Level 4.1
+ * @GST_H264_LEVEL_L4_2: Level 4.2
+ * @GST_H264_LEVEL_L5: Level 5
+ * @GST_H264_LEVEL_L5_1: Level 5.1
+ * @GST_H264_LEVEL_L5_2: Level 5.2
+ * @GST_H264_LEVEL_L6: Level 6
+ * @GST_H264_LEVEL_L6_1: Level 6.1
+ * @GST_H264_LEVEL_L6_2: Level 6.2
+ *
+ * H.264 level
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_H264_LEVEL_L1 = 10,
+  GST_H264_LEVEL_L1B = 9,
+  GST_H264_LEVEL_L1_1 = 11,
+  GST_H264_LEVEL_L1_2 = 12,
+  GST_H264_LEVEL_L1_3 = 13,
+  GST_H264_LEVEL_L2 = 20,
+  GST_H264_LEVEL_L2_1 = 21,
+  GST_H264_LEVEL_L2_2 = 22,
+  GST_H264_LEVEL_L3 = 30,
+  GST_H264_LEVEL_L3_1 = 31,
+  GST_H264_LEVEL_L3_2 = 32,
+  GST_H264_LEVEL_L4 = 40,
+  GST_H264_LEVEL_L4_1 = 41,
+  GST_H264_LEVEL_L4_2 = 42,
+  GST_H264_LEVEL_L5 = 50,
+  GST_H264_LEVEL_L5_1 = 51,
+  GST_H264_LEVEL_L5_2 = 52,
+  GST_H264_LEVEL_L6 = 60,
+  GST_H264_LEVEL_L6_1 = 61,
+  GST_H264_LEVEL_L6_2 = 62,
+} GstH264Level;
+
 typedef struct _GstH264NalParser              GstH264NalParser;
 
 typedef struct _GstH264NalUnit                GstH264NalUnit;
@@ -840,7 +919,7 @@
   guint8 scaling_lists_4x4616;
   guint8 scaling_lists_8x8664;
 
-  guint8 second_chroma_qp_index_offset;
+  gint8 second_chroma_qp_index_offset;
 
   gboolean valid;
 
@@ -1382,6 +1461,15 @@
                                                        GstH264NalUnit *nalu);
 
 GST_CODEC_PARSERS_API
+GstH264ParserResult gst_h264_parser_identify_and_split_nalu_avc (GstH264NalParser *nalparser,
+                                                                 const guint8 *data,
+                                                                 guint offset,
+                                                                 gsize size,
+                                                                 guint8 nal_length_size,
+                                                                 GArray * nalus,
+                                                                 gsize * consumed);
+
+GST_CODEC_PARSERS_API
 GstH264ParserResult gst_h264_parser_parse_nal         (GstH264NalParser *nalparser,
                                                        GstH264NalUnit *nalu);
 
@@ -1485,6 +1573,11 @@
                                                                  const guint8 * data,
                                                                  gsize size,
                                                                  GstH264DecoderConfigRecord ** config);
+GST_CODEC_PARSERS_API
+GstH264Profile gst_h264_profile_from_string (const gchar * profile);
+
+GST_CODEC_PARSERS_API
+const gchar *   gst_h264_slice_type_to_string      (GstH264SliceType slice_type);
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gsth265bitwriter.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gsth265bitwriter.c Changed

@@ -1411,7 +1411,7 @@
   guint i;
   const GstH265RefPicListModification *rpl_mod =
       &slice->ref_pic_list_modification;
-  const guint n = ceil_log2 (NumPocTotalCurr);
+  const guint n = gst_util_ceil_log2 (NumPocTotalCurr);
 
   WRITE_BITS (bw, rpl_mod->ref_pic_list_modification_flag_l0, 1);
 
@@ -1551,7 +1551,7 @@
         ceil ((gdouble) sps->pic_width_in_luma_samples / (gdouble) CtbSizeY);
     PicSizeInCtbsY = PicWidthInCtbsY * PicHeightInCtbsY;
 
-    n = ceil_log2 (PicSizeInCtbsY);
+    n = gst_util_ceil_log2 (PicSizeInCtbsY);
 
     if (slice->pps->dependent_slice_segments_enabled_flag)
       WRITE_BITS (bw, slice->dependent_slice_segment_flag, 1);
@@ -1584,7 +1584,7 @@
                 slice->pps->sps, bw, &have_space))
           goto error;
       } else if (sps->num_short_term_ref_pic_sets > 1) {
-        const guint n = ceil_log2 (sps->num_short_term_ref_pic_sets);
+        const guint n = gst_util_ceil_log2 (sps->num_short_term_ref_pic_sets);
 
         if (slice->short_term_ref_pic_set_idx >
             sps->num_short_term_ref_pic_sets - 1)
@@ -1605,7 +1605,8 @@
         for (i = 0; i < limit; i++) {
           if (i < slice->num_long_term_sps) {
             if (sps->num_long_term_ref_pics_sps > 1) {
-              const guint n = ceil_log2 (sps->num_long_term_ref_pics_sps);
+              const guint n =
+                  gst_util_ceil_log2 (sps->num_long_term_ref_pics_sps);
               WRITE_BITS (bw, slice->lt_idx_spsi, n);
             }
           } else {

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gsth265parser.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gsth265parser.c Changed

@@ -920,7 +920,7 @@
 {
   guint i;
   GstH265RefPicListModification *rpl_mod = &slice->ref_pic_list_modification;
-  const guint n = ceil_log2 (NumPocTotalCurr);
+  const guint n = gst_util_ceil_log2 (NumPocTotalCurr);
 
   READ_UINT8 (nr, rpl_mod->ref_pic_list_modification_flag_l0, 1);
 
@@ -1242,6 +1242,47 @@
   }
 }
 
+static GstH265ParserResult
+gst_h265_parser_parse_user_data_unregistered (GstH265Parser * parser,
+    GstH265UserDataUnregistered * urud, NalReader * nr, guint payload_size)
+{
+  guint8 *data = NULL;
+  gint i;
+
+  if (payload_size < 16) {
+    GST_WARNING ("Too small payload size %d", payload_size);
+    return GST_H265_PARSER_BROKEN_DATA;
+  }
+
+  for (int i = 0; i < 16; i++) {
+    READ_UINT8 (nr, urud->uuidi, 8);
+  }
+  payload_size -= 16;
+
+  urud->size = payload_size;
+
+  data = g_malloc0 (payload_size);
+  for (i = 0; i < payload_size; ++i) {
+    READ_UINT8 (nr, datai, 8);
+  }
+
+  if (payload_size < 1) {
+    GST_WARNING ("No more remaining payload data to store");
+    g_clear_pointer (&data, g_free);
+    return GST_H265_PARSER_BROKEN_DATA;
+  }
+
+  urud->data = data;
+  GST_MEMDUMP ("SEI user data unregistered", data, payload_size);
+  return GST_H265_PARSER_OK;
+
+error:
+  {
+    GST_WARNING ("error parsing \"User Data Unregistered\"");
+    g_clear_pointer (&data, g_free);
+    return GST_H265_PARSER_ERROR;
+  }
+}
 
 static GstH265ParserResult
 gst_h265_parser_parse_time_code (GstH265Parser * parser,
@@ -1357,7 +1398,7 @@
 {
   GstH265Parser *parser;
 
-  parser = g_slice_new0 (GstH265Parser);
+  parser = g_new0 (GstH265Parser, 1);
 
   return parser;
 }
@@ -1371,7 +1412,7 @@
 void
 gst_h265_parser_free (GstH265Parser * parser)
 {
-  g_slice_free (GstH265Parser, parser);
+  g_free (parser);
   parser = NULL;
 }
 
@@ -2756,7 +2797,7 @@
       pps->loop_filter_across_slices_enabled_flag;
 
   if (!slice->first_slice_segment_in_pic_flag) {
-    const guint n = ceil_log2 (PicSizeInCtbsY);
+    const guint n = gst_util_ceil_log2 (PicSizeInCtbsY);
 
     if (pps->dependent_slice_segments_enabled_flag)
       READ_UINT8 (&nr, slice->dependent_slice_segment_flag, 1);
@@ -2794,7 +2835,7 @@
             (nal_reader_get_pos (&nr) - pos) -
             (8 * (nal_reader_get_epb_count (&nr) - epb_pos));
       } else if (sps->num_short_term_ref_pic_sets > 1) {
-        const guint n = ceil_log2 (sps->num_short_term_ref_pic_sets);
+        const guint n = gst_util_ceil_log2 (sps->num_short_term_ref_pic_sets);
         READ_UINT8 (&nr, slice->short_term_ref_pic_set_idx, n);
         CHECK_ALLOWED_MAX (slice->short_term_ref_pic_set_idx,
             sps->num_short_term_ref_pic_sets - 1);
@@ -2814,7 +2855,8 @@
         for (i = 0; i < limit; i++) {
           if (i < slice->num_long_term_sps) {
             if (sps->num_long_term_ref_pics_sps > 1) {
-              const guint n = ceil_log2 (sps->num_long_term_ref_pics_sps);
+              const guint n =
+                  gst_util_ceil_log2 (sps->num_long_term_ref_pics_sps);
               READ_UINT8 (&nr, slice->lt_idx_spsi, n);
             }
           } else {
@@ -3069,6 +3111,10 @@
         res = gst_h265_parser_parse_registered_user_data (parser,
             &sei->payload.registered_user_data, nr, payload_size >> 3);
         break;
+      case GST_H265_SEI_USER_DATA_UNREGISTERED:
+        res = gst_h265_parser_parse_user_data_unregistered (parser,
+            &sei->payload.user_data_unregistered, nr, payload_size >> 3);
+        break;
       case GST_H265_SEI_RECOVERY_POINT:
         res = gst_h265_parser_parse_recovery_point (parser,
             &sei->payload.recovery_point, nr);
@@ -3230,6 +3276,16 @@
       dst_rud->data = g_malloc (src_rud->size);
       memcpy ((guint8 *) dst_rud->data, src_rud->data, src_rud->size);
     }
+  } else if (dst_sei->payloadType == GST_H265_SEI_USER_DATA_UNREGISTERED) {
+    GstH265UserDataUnregistered *dst_udu =
+        &dst_sei->payload.user_data_unregistered;
+    const GstH265UserDataUnregistered *src_udu =
+        &src_sei->payload.user_data_unregistered;
+
+    if (src_udu->size) {
+      dst_udu->data = g_malloc (src_udu->size);
+      memcpy ((guint8 *) dst_udu->data, src_udu->data, src_udu->size);
+    }
   }
 
   return TRUE;
@@ -3258,6 +3314,10 @@
     GstH265RegisteredUserData *rud = &sei->payload.registered_user_data;
     g_free ((guint8 *) rud->data);
     rud->data = NULL;
+  } else if (sei->payloadType == GST_H265_SEI_USER_DATA_UNREGISTERED) {
+    GstH265UserDataUnregistered *udu = &sei->payload.user_data_unregistered;
+    g_free ((guint8 *) udu->data);
+    udu->data = NULL;
   }
 }
 
@@ -4071,6 +4131,33 @@
   return GST_H265_PROFILE_INVALID;
 }
 
+/**
+ * gst_h265_slice_type_to_string:
+ * @slice_type: a #GstH265SliceType
+ *
+ * Returns the descriptive name for the #GstH265SliceType.
+ *
+ * Returns: (nullable): the name for @slice_type or %NULL on error
+ *
+ * Since: 1.24
+ */
+const gchar *
+gst_h265_slice_type_to_string (GstH265SliceType slice_type)
+{
+  switch (slice_type) {
+    case GST_H265_P_SLICE:
+      return "P";
+    case GST_H265_B_SLICE:
+      return "B";
+    case GST_H265_I_SLICE:
+      return "I";
+    default:
+      GST_ERROR ("unknown %d slice type", slice_type);
+  }
+
+  return NULL;
+}
+
 static gboolean
 gst_h265_write_sei_registered_user_data (NalWriter * nw,
     GstH265RegisteredUserData * rud)
@@ -4088,6 +4175,19 @@
 }
 
 static gboolean
+gst_h265_write_sei_user_data_unregistered (NalWriter * nw,
+    GstH265UserDataUnregistered * udu)
+{
+  WRITE_BYTES (nw, udu->uuid, 16);
+  WRITE_BYTES (nw, udu->data, udu->size);
+
+  return TRUE;
+
+error:
+  return FALSE;
+}
+
+static gboolean
 gst_h265_write_sei_time_code (NalWriter * nw, GstH265TimeCode * tc)
 {
   gint i;
@@ -4217,6 +4317,12 @@
         payload_size_data += rud->size;
         break;
       }
+      case GST_H265_SEI_USER_DATA_UNREGISTERED:{
+        GstH265UserDataUnregistered *udu = &msg->payload.user_data_unregistered;
+
+        payload_size_data = 16 + udu->size;
+        break;
+      }
       case GST_H265_SEI_TIME_CODE:{
         gint j;
         GstH265TimeCode *tc = &msg->payload.time_code;
@@ -4330,6 +4436,15 @@
         }
         have_written_data = TRUE;
         break;
+      case GST_H265_SEI_USER_DATA_UNREGISTERED:
+        GST_DEBUG ("Writing \"Unregistered user data\" done");
+        if (!gst_h265_write_sei_user_data_unregistered (&nw,
+                &msg->payload.user_data_unregistered)) {
+          GST_WARNING ("Failed to write \"Unregistered user data\"");
+          goto error;
+        }
+        have_written_data = TRUE;
+        break;
       case GST_H265_SEI_TIME_CODE:
         GST_DEBUG ("Wrtiting \"Time code\"");
         if (!gst_h265_write_sei_time_code (&nw, &msg->payload.time_code)) {
@@ -4580,7 +4695,7 @@
  * The validation for completeness of @au and @sei is caller's responsibility.
  * Both @au and @sei must be byte-stream formatted
  *
- * Returns: (nullable): a SEI inserted #GstBuffer or %NULL
+ * Returns: (transfer full) (nullable): a SEI inserted #GstBuffer or %NULL
  *   if cannot figure out proper position to insert a @sei
  *
  * Since: 1.18
@@ -4610,7 +4725,7 @@
  * Nal prefix type of both @au and @sei must be packetized, and
  * also the size of nal length field must be identical to @nal_length_size
  *
- * Returns: (nullable): a SEI inserted #GstBuffer or %NULL
+ * Returns: (transfer full) (nullable): a SEI inserted #GstBuffer or %NULL
  *   if cannot figure out proper position to insert a @sei
  *
  * Since: 1.18
@@ -4743,3 +4858,306 @@
   /* first profile of the synthetic ptl */
   return gst_h265_profile_tier_level_get_profile (&tmp_ptl);
 }
+
+/* *INDENT-OFF* */
+static void
+gst_clear_h265_decoder_config_record_nalu_array (
+    GstH265DecoderConfigRecordNalUnitArray * array)
+{
+  if (!array)
+    return;
+
+  if (array->nalu)
+    g_array_unref (array->nalu);
+}
+/* *INDENT-ON* */
+
+/**
+ * gst_h265_decoder_config_record_free:
+ * @config: (nullable): a #GstH265DecoderConfigRecord data
+ *
+ * Free @config data
+ *
+ * Since: 1.24
+ */
+void
+gst_h265_decoder_config_record_free (GstH265DecoderConfigRecord * config)
+{
+  if (!config)
+    return;
+
+  if (config->nalu_array)
+    g_array_unref (config->nalu_array);
+
+  g_free (config);
+}
+
+static GstH265DecoderConfigRecord *
+gst_h265_decoder_config_record_new (void)
+{
+  GstH265DecoderConfigRecord *config;
+
+  config = g_new0 (GstH265DecoderConfigRecord, 1);
+  config->nalu_array = g_array_new (FALSE,
+      FALSE, sizeof (GstH265DecoderConfigRecordNalUnitArray));
+  g_array_set_clear_func (config->nalu_array,
+      (GDestroyNotify) gst_clear_h265_decoder_config_record_nalu_array);
+
+  return config;
+}
+
+/**
+ * gst_h265_parser_parse_decoder_config_record:
+ * @parser: a #GstH265Parser
+ * @data: the data to parse
+ * @size: the size of @data
+ * @config: (out): parsed #GstH265DecoderConfigRecord data
+ *
+ * Parses HEVCDecoderConfigurationRecord data and fill into @config.
+ * The caller must free @config via gst_h265_decoder_config_record_free()
+ *
+ * This method does not parse VPS, SPS and PPS and therefore the caller needs to
+ * parse each NAL unit via appropriate parsing method.
+ *
+ * Returns: a #GstH265ParserResult
+ *
+ * Since: 1.24
+ */
+GstH265ParserResult
+gst_h265_parser_parse_decoder_config_record (GstH265Parser * parser,
+    const guint8 * data, gsize size, GstH265DecoderConfigRecord ** config)
+{
+  GstH265DecoderConfigRecord *ret;
+  GstBitReader br;
+  GstH265ParserResult result = GST_H265_PARSER_OK;
+  guint i;
+  guint8 num_of_arrays;
+
+  g_return_val_if_fail (parser != NULL, GST_H265_PARSER_ERROR);
+  g_return_val_if_fail (data != NULL, GST_H265_PARSER_ERROR);
+  g_return_val_if_fail (config != NULL, GST_H265_PARSER_ERROR);
+
+#define READ_CONFIG_UINT8(val, nbits) G_STMT_START { \
+  if (!gst_bit_reader_get_bits_uint8 (&br, (guint8 *) &val, nbits)) { \
+    GST_WARNING ("Failed to read " G_STRINGIFY (val)); \
+    result = GST_H265_PARSER_ERROR; \
+    goto error; \
+  } \
+} G_STMT_END;
+
+#define READ_CONFIG_UINT16(val, nbits) G_STMT_START { \
+  if (!gst_bit_reader_get_bits_uint16 (&br, &val, nbits)) { \
+    GST_WARNING ("Failed to read " G_STRINGIFY (val)); \
+    result = GST_H265_PARSER_ERROR; \
+    goto error; \
+  } \
+} G_STMT_END;
+
+#define SKIP_CONFIG_BITS(nbits) G_STMT_START { \
+  if (!gst_bit_reader_skip (&br, nbits)) { \
+    GST_WARNING ("Failed to skip %d bits", nbits); \
+    result = GST_H265_PARSER_ERROR; \
+    goto error; \
+  } \
+} G_STMT_END;
+
+  *config = NULL;
+
+  if (size < 23) {
+    GST_WARNING ("Too small size hvcC");
+    return GST_H265_PARSER_ERROR;
+  }
+
+  gst_bit_reader_init (&br, data, size);
+
+  ret = gst_h265_decoder_config_record_new ();
+
+  READ_CONFIG_UINT8 (ret->configuration_version, 8);
+  if (ret->configuration_version != 1) {
+    GST_WARNING ("Wrong configurationVersion %d", ret->configuration_version);
+    /* Must be 1 but allows 0 for backward compatibility.
+     * See commit
+     * https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/63fee31a3f95021fa0bb2429c723f5356c9b3c4b */
+    if (ret->configuration_version != 0) {
+      result = GST_H265_PARSER_ERROR;
+      goto error;
+    }
+  }
+
+  READ_CONFIG_UINT8 (ret->general_profile_space, 2);
+  READ_CONFIG_UINT8 (ret->general_tier_flag, 1);
+  READ_CONFIG_UINT8 (ret->general_profile_idc, 5);
+
+  for (i = 0; i < 32; i++)
+    READ_CONFIG_UINT8 (ret->general_profile_compatibility_flagsi, 1);
+
+  /* 7.3.3 Profile, tier and level syntax */
+  READ_CONFIG_UINT8 (ret->general_progressive_source_flag, 1);
+  READ_CONFIG_UINT8 (ret->general_interlaced_source_flag, 1);
+  READ_CONFIG_UINT8 (ret->general_non_packed_constraint_flag, 1);
+  READ_CONFIG_UINT8 (ret->general_frame_only_constraint_flag, 1);
+
+  if (ret->general_profile_idc == 4 ||
+      ret->general_profile_compatibility_flags4 ||
+      ret->general_profile_idc == 5 ||
+      ret->general_profile_compatibility_flags5 ||
+      ret->general_profile_idc == 6 ||
+      ret->general_profile_compatibility_flags6 ||
+      ret->general_profile_idc == 7 ||
+      ret->general_profile_compatibility_flags7 ||
+      ret->general_profile_idc == 8 ||
+      ret->general_profile_compatibility_flags8 ||
+      ret->general_profile_idc == 9 ||
+      ret->general_profile_compatibility_flags9 ||
+      ret->general_profile_idc == 10 ||
+      ret->general_profile_compatibility_flags10 ||
+      ret->general_profile_idc == 11 ||
+      ret->general_profile_compatibility_flags11) {
+    READ_CONFIG_UINT8 (ret->general_max_12bit_constraint_flag, 1);
+    READ_CONFIG_UINT8 (ret->general_max_10bit_constraint_flag, 1);
+    READ_CONFIG_UINT8 (ret->general_max_8bit_constraint_flag, 1);
+    READ_CONFIG_UINT8 (ret->general_max_422chroma_constraint_flag, 1);
+    READ_CONFIG_UINT8 (ret->general_max_420chroma_constraint_flag, 1);
+    READ_CONFIG_UINT8 (ret->general_max_monochrome_constraint_flag, 1);
+    READ_CONFIG_UINT8 (ret->general_intra_constraint_flag, 1);
+    READ_CONFIG_UINT8 (ret->general_one_picture_only_constraint_flag, 1);
+    READ_CONFIG_UINT8 (ret->general_lower_bit_rate_constraint_flag, 1);
+
+    if (ret->general_profile_idc == 5 ||
+        ret->general_profile_compatibility_flags5 ||
+        ret->general_profile_idc == 9 ||
+        ret->general_profile_compatibility_flags9 ||
+        ret->general_profile_idc == 10 ||
+        ret->general_profile_compatibility_flags10 ||
+        ret->general_profile_idc == 11 ||
+        ret->general_profile_compatibility_flags11) {
+      READ_CONFIG_UINT8 (ret->general_max_14bit_constraint_flag, 1);
+      SKIP_CONFIG_BITS (33);
+    } else {
+      SKIP_CONFIG_BITS (34);
+    }
+  } else if (ret->general_profile_idc == 2 ||
+      ret->general_profile_compatibility_flags2) {
+    SKIP_CONFIG_BITS (7);
+    READ_CONFIG_UINT8 (ret->general_one_picture_only_constraint_flag, 1);
+
+    SKIP_CONFIG_BITS (35);
+  } else {
+    SKIP_CONFIG_BITS (43);
+  }
+
+  if (ret->general_profile_idc == 1 ||
+      ret->general_profile_compatibility_flags1 ||
+      ret->general_profile_idc == 2 ||
+      ret->general_profile_compatibility_flags2 ||
+      ret->general_profile_idc == 3 ||
+      ret->general_profile_compatibility_flags3 ||
+      ret->general_profile_idc == 4 ||
+      ret->general_profile_compatibility_flags4 ||
+      ret->general_profile_idc == 5 ||
+      ret->general_profile_compatibility_flags5 ||
+      ret->general_profile_idc == 9 ||
+      ret->general_profile_compatibility_flags9 ||
+      ret->general_profile_idc == 11 ||
+      ret->general_profile_compatibility_flags11) {
+    READ_CONFIG_UINT8 (ret->general_inbld_flag, 1);
+  } else {
+    SKIP_CONFIG_BITS (1);
+  }
+
+  g_assert (gst_bit_reader_get_pos (&br) == 12 * 8);
+
+  READ_CONFIG_UINT8 (ret->general_level_idc, 8);
+
+  SKIP_CONFIG_BITS (4);
+  READ_CONFIG_UINT16 (ret->min_spatial_segmentation_idc, 12);
+
+  SKIP_CONFIG_BITS (6);
+  READ_CONFIG_UINT8 (ret->parallelism_type, 2);
+
+  SKIP_CONFIG_BITS (6);
+  READ_CONFIG_UINT8 (ret->chroma_format_idc, 2);
+
+  SKIP_CONFIG_BITS (5);
+  READ_CONFIG_UINT8 (ret->bit_depth_luma_minus8, 3);
+
+  SKIP_CONFIG_BITS (5);
+  READ_CONFIG_UINT8 (ret->bit_depth_chroma_minus8, 3);
+
+  READ_CONFIG_UINT16 (ret->avg_frame_rate, 16);
+
+  READ_CONFIG_UINT8 (ret->constant_frame_rate, 2);
+  READ_CONFIG_UINT8 (ret->num_temporal_layers, 3);
+  READ_CONFIG_UINT8 (ret->temporal_id_nested, 1);
+  READ_CONFIG_UINT8 (ret->length_size_minus_one, 2);
+  if (ret->length_size_minus_one == 2) {
+    /* "length_size_minus_one + 1" should be 1, 2, or 4 */
+    GST_WARNING ("Wrong nal-length-size");
+    result = GST_H265_PARSER_ERROR;
+    goto error;
+  }
+
+  READ_CONFIG_UINT8 (num_of_arrays, 8);
+
+  g_assert (gst_bit_reader_get_pos (&br) == 23 * 8);
+  for (i = 0; i < num_of_arrays; i++) {
+    GstH265DecoderConfigRecordNalUnitArray array;
+    guint8 nalu_type;
+    GstH265NalUnit nalu;
+    guint16 num_nalu, j;
+    guint offset;
+
+    READ_CONFIG_UINT8 (array.array_completeness, 1);
+    SKIP_CONFIG_BITS (1);
+    READ_CONFIG_UINT8 (nalu_type, 6);
+    array.nal_unit_type = nalu_type;
+
+    READ_CONFIG_UINT16 (num_nalu, 16);
+
+    offset = gst_bit_reader_get_pos (&br) / 8;
+    array.nalu = g_array_sized_new (FALSE, FALSE, sizeof (GstH265NalUnit),
+        num_nalu);
+    for (j = 0; j < num_nalu; j++) {
+      result = gst_h265_parser_identify_nalu_hevc (parser, data, offset, size,
+          2, &nalu);
+      if (result != GST_H265_PARSER_OK) {
+        g_array_unref (array.nalu);
+        /* Ignores parsing error if this is the last nalu and not an essential
+         * nalu for decoding */
+        if (i + 1 == num_of_arrays && j + 1 == num_nalu &&
+            nalu_type != GST_H265_NAL_VPS && nalu_type != GST_H265_NAL_SPS &&
+            nalu_type != GST_H265_NAL_PPS) {
+          GST_WARNING ("Couldn't parse the last nalu, type %d at array %d / %d",
+              nalu_type, i, j);
+          goto out;
+        }
+        goto error;
+      }
+
+      g_array_append_val (array.nalu, nalu);
+      offset = nalu.offset + nalu.size;
+    }
+
+    g_array_append_val (ret->nalu_array, array);
+
+    if (i != num_of_arrays - 1 && !gst_bit_reader_set_pos (&br, offset * 8)) {
+      GST_WARNING ("Not enough byte for NAL reading");
+      result = GST_H265_PARSER_ERROR;
+      goto error;
+    }
+  }
+
+out:
+  *config = ret;
+  return GST_H265_PARSER_OK;
+
+error:
+  {
+    gst_h265_decoder_config_record_free (ret);
+    return result;
+  }
+
+#undef READ_CONFIG_UINT8
+#undef READ_CONFIG_UINT16
+#undef SKIP_CONFIG_BITS
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gsth265parser.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gsth265parser.h Changed

@@ -348,11 +348,19 @@
  *
  * The type of SEI message.
  */
+/**
+ * GST_H265_SEI_USER_DATA_UNREGISTERED
+ *
+ * User data unregistered (D.2.7)
+ *
+ * Since: 1.24
+ */
 typedef enum
 {
   GST_H265_SEI_BUF_PERIOD = 0,
   GST_H265_SEI_PIC_TIMING = 1,
   GST_H265_SEI_REGISTERED_USER_DATA = 4,
+  GST_H265_SEI_USER_DATA_UNREGISTERED = 5,
   GST_H265_SEI_RECOVERY_POINT = 6,
   GST_H265_SEI_TIME_CODE = 136,
   GST_H265_SEI_MASTERING_DISPLAY_COLOUR_VOLUME = 137,
@@ -422,6 +430,44 @@
   GST_H265_QUANT_MATIX_32X32 = 3
 } GstH265QuantMatrixSize;
 
+
+/**
+ * GstH265Level:
+ * @GST_H265_LEVEL_L1: Level 1
+ * @GST_H265_LEVEL_L2: Level 2
+ * @GST_H265_LEVEL_L2_1: Level 2.1
+ * @GST_H265_LEVEL_L3: Level 3
+ * @GST_H265_LEVEL_L3_1: Level 3.1
+ * @GST_H265_LEVEL_L4: Level 4
+ * @GST_H265_LEVEL_L4_1: Level 4.1
+ * @GST_H265_LEVEL_L5: Level 5
+ * @GST_H265_LEVEL_L5_1: Level 5.1
+ * @GST_H265_LEVEL_L5_2: Level 5.2
+ * @GST_H265_LEVEL_L6: Level 6
+ * @GST_H265_LEVEL_L6_1: Level 6.1
+ * @GST_H265_LEVEL_L6_2: Level 6.2
+ *
+ * H.265 level
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_H265_LEVEL_L1 = 30,
+  GST_H265_LEVEL_L2 = 60,
+  GST_H265_LEVEL_L2_1 = 63,
+  GST_H265_LEVEL_L3 = 90,
+  GST_H265_LEVEL_L3_1 = 93,
+  GST_H265_LEVEL_L4 = 120,
+  GST_H265_LEVEL_L4_1 = 123,
+  GST_H265_LEVEL_L5 = 150,
+  GST_H265_LEVEL_L5_1 = 153,
+  GST_H265_LEVEL_L5_2 = 156,
+  GST_H265_LEVEL_L6 = 180,
+  GST_H265_LEVEL_L6_1 = 183,
+  GST_H265_LEVEL_L6_2 = 186,
+} GstH265Level;
+
 typedef struct _GstH265Parser                   GstH265Parser;
 
 typedef struct _GstH265NalUnit                  GstH265NalUnit;
@@ -446,12 +492,15 @@
 
 typedef struct _GstH265PicTiming                GstH265PicTiming;
 typedef struct _GstH265RegisteredUserData     	GstH265RegisteredUserData;
+typedef struct _GstH265UserDataUnregistered     GstH265UserDataUnregistered;
 typedef struct _GstH265BufferingPeriod          GstH265BufferingPeriod;
 typedef struct _GstH265RecoveryPoint            GstH265RecoveryPoint;
 typedef struct _GstH265TimeCode                 GstH265TimeCode;
 typedef struct _GstH265MasteringDisplayColourVolume GstH265MasteringDisplayColourVolume;
 typedef struct _GstH265ContentLightLevel        GstH265ContentLightLevel;
 typedef struct _GstH265SEIMessage               GstH265SEIMessage;
+typedef struct _GstH265DecoderConfigRecordNalUnitArray GstH265DecoderConfigRecordNalUnitArray;
+typedef struct _GstH265DecoderConfigRecord      GstH265DecoderConfigRecord;
 
 /**
  * GstH265NalUnit:
@@ -1575,6 +1624,22 @@
   guint size;
 };
 
+/**
+ * GstH265UserDataUnregistered:
+ * @uuid: an uuid_iso_iec_11578.
+ * @data: the data of user_data_payload_byte
+ * @size: the size of @data in bytes
+ *
+ * The User data unregistered SEI message syntax.
+ *
+ * Since: 1.24
+ */
+struct _GstH265UserDataUnregistered
+{
+  guint8 uuid16;
+  const guint8 *data;
+  guint size;
+};
 
 /**
  * GstH265TimeCode:
@@ -1640,6 +1705,13 @@
   guint16 max_pic_average_light_level;
 };
 
+/**
+ * _GstH265SEIMessage.payload.user_data_unregistered:
+ *
+ * User Data Unregistered
+ *
+ * Since: 1.24
+ */
 struct _GstH265SEIMessage
 {
   GstH265SEIPayloadType payloadType;
@@ -1652,11 +1724,309 @@
     GstH265TimeCode time_code;
     GstH265MasteringDisplayColourVolume mastering_display_colour_volume;
     GstH265ContentLightLevel content_light_level;
+    GstH265UserDataUnregistered user_data_unregistered;
     /* ... could implement more */
   } payload;
 };
 
 /**
+ * GstH265DecoderConfigRecordNalUnitArray:
+ *
+ * Contains NAL Unit array data as defined in ISO/IEC 14496-15
+ *
+ * Since: 1.24
+ */
+struct _GstH265DecoderConfigRecordNalUnitArray
+{
+  /**
+   * GstH265DecoderConfigRecordNalUnitArray.array_completeness:
+   *
+   * 1: all NAL units of the given type are in this array and none
+   *   are in the stream.
+   * 0: additional NAL units of the indicated type may be in the stream
+   */
+  guint8 array_completeness;
+
+  /**
+   * GstH265DecoderConfigRecordNalUnitArray.nal_unit_type:
+   *
+   * Indicates the type of the NAL units in the following array.
+   * Shall be VPS, SPS, PPS, prefix SEI or suffix SEI
+   */
+  GstH265NalUnitType nal_unit_type;
+
+  /**
+   * GstH265DecoderConfigRecordNalUnitArray.nalu:
+   *
+   * Array of identified #GstH265NalUnit
+   */
+  GArray *nalu;
+};
+
+/**
+ * GstH265DecoderConfigRecord:
+ *
+ * Contains HEVCDecoderConfigurationRecord data as defined in ISO/IEC 14496-15
+ *
+ * Since: 1.24
+ */
+struct _GstH265DecoderConfigRecord
+{
+  /**
+   * GstH265DecoderConfigRecord.configuration_version:
+   *
+   * Indicates configurationVersion, must be 1
+   */
+  guint8 configuration_version;
+
+  /**
+   * GstH265DecoderConfigRecord.general_profile_space:
+   *
+   * general profile space
+   */
+  guint8 general_profile_space;
+
+  /**
+   * GstH265DecoderConfigRecord.general_tier_flag:
+   *
+   * general tier flag
+   */
+  guint8 general_tier_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_profile_idc:
+   *
+   * general profile indiction
+   */
+  guint8 general_profile_idc;
+
+  /**
+   * GstH265DecoderConfigRecord.general_profile_compatibility_flags:
+   *
+   * general profile compatibility flags
+   */
+  guint8 general_profile_compatibility_flags32;
+
+  /**
+   * GstH265DecoderConfigRecord.general_progressive_source_flag:
+   *
+   * general_progressive_source_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_progressive_source_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_interlaced_source_flag:
+   *
+   * general_interlaced_source_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_interlaced_source_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_non_packed_constraint_flag:
+   *
+   * general_non_packed_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_non_packed_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_frame_only_constraint_flag:
+   *
+   * general_frame_only_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_frame_only_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_max_12bit_constraint_flag:
+   *
+   * general_max_12bit_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_max_12bit_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_max_10bit_constraint_flag:
+   *
+   * general_max_10bit_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_max_10bit_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_max_8bit_constraint_flag:
+   *
+   * general_max_8bit_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_max_8bit_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_max_422chroma_constraint_flag:
+   *
+   * general_max_422chroma_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_max_422chroma_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_max_420chroma_constraint_flag:
+   *
+   * general_max_420chroma_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_max_420chroma_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_max_monochrome_constraint_flag:
+   *
+   * general_max_monochrome_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_max_monochrome_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_intra_constraint_flag:
+   *
+   * general_intra_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_intra_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_one_picture_only_constraint_flag:
+   *
+   * general_one_picture_only_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_one_picture_only_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_lower_bit_rate_constraint_flag:
+   *
+   * general_lower_bit_rate_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_lower_bit_rate_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_max_14bit_constraint_flag:
+   *
+   * general_max_14bit_constraint_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_max_14bit_constraint_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_inbld_flag:
+   *
+   * general_inbld_flag parsed from
+   * HEVCDecoderConfigurationRecord.general_constraint_indicator_flags
+   */
+  guint8 general_inbld_flag;
+
+  /**
+   * GstH265DecoderConfigRecord.general_level_idc:
+   *
+   * general level indication
+   */
+  guint8 general_level_idc;
+
+  /**
+   * GstH265DecoderConfigRecord.min_spatial_segmentation_idc:
+   *
+   * min spatial segmentation indication
+   */
+  guint16 min_spatial_segmentation_idc;
+
+  /**
+   * GstH265DecoderConfigRecord.parallelism_type:
+   *
+   * parallelism type
+   */
+  guint8 parallelism_type;
+
+  /**
+   * GstH265DecoderConfigRecord.chroma_format_idc:
+   *
+   * chroma format indication
+   */
+  guint8 chroma_format_idc;
+
+  /**
+   * GstH265DecoderConfigRecord.bit_depth_luma_minus8:
+   *
+   * bit depth luma minus 8
+   */
+  guint8 bit_depth_luma_minus8;
+
+  /**
+   * GstH265DecoderConfigRecord.bit_depth_chroma_minus8:
+   *
+   * bit depth chroma minus 8
+   */
+  guint8 bit_depth_chroma_minus8;
+
+  /**
+   * GstH265DecoderConfigRecord.avg_frame_rate:
+   *
+   * average frame rate in units of frames per 256 seconds,
+   * or 0 when unspecified
+   */
+  guint16 avg_frame_rate;
+
+  /**
+   * GstH265DecoderConfigRecord.constant_frame_rate:
+   *
+   * constant frame rate.
+   * 1: stream to which this configuration record applies is constante frame rate
+   * 2: representation of each temporal layer in the stream is constant frame rate
+   * 0: unspecified
+   */
+  guint8 constant_frame_rate;
+
+  /**
+   * GstH265DecoderConfigRecord.num_temporal_layers:
+   *
+   * 0: unknown whether the stream is temporally scalable
+   * otherwise: the number of temporal layers
+   */
+  guint8 num_temporal_layers;
+
+  /**
+   * GstH265DecoderConfigRecord.temporal_id_nested:
+   *
+   * 1: all SPSs that activated when the stream to this configuration record
+   *   applies is decoded have sps_temporal_id_nesting_flags equal to 1
+   *   and temporal sub-layer up-switching to any higher temporal layer can
+   *   be performed at any semple
+   * 0: unknown
+   */
+  guint8 temporal_id_nested;
+
+  /**
+   * GstH265DecoderConfigRecord.length_size_minus_one:
+   *
+   * indicates the length in bytes of nal unit length field.
+   * This value shall be one of 0, 1, or 3 corresponding to a length
+   * encoded with 1, 2, or 4 bytes, respectively
+   */
+  guint8 length_size_minus_one;
+
+  /**
+   * GstH265DecoderConfigRecord.nalu_array:
+   *
+   * Array of #GstH265DecoderConfigRecordNalUnitArray
+   */
+  GArray *nalu_array;
+
+  /*< private >*/
+  gpointer _gst_reservedGST_PADDING;
+};
+
+/**
  * GstH265Parser:
  *
  * H265 NAL Parser (opaque structure).
@@ -1840,6 +2210,9 @@
 GstH265Profile gst_h265_profile_from_string (const gchar * string);
 
 GST_CODEC_PARSERS_API
+const gchar * gst_h265_slice_type_to_string (GstH265SliceType slice_type);
+
+GST_CODEC_PARSERS_API
 GstMemory * gst_h265_create_sei_memory (guint8 layer_id,
                                         guint8 temporal_id_plus1,
                                         guint8 start_code_prefix_length,
@@ -1865,5 +2238,14 @@
 GST_CODEC_PARSERS_API
 GstH265Profile gst_h265_get_profile_from_sps (GstH265SPS * sps);
 
+GST_CODEC_PARSERS_API
+void           gst_h265_decoder_config_record_free (GstH265DecoderConfigRecord * config);
+
+GST_CODEC_PARSERS_API
+GstH265ParserResult gst_h265_parser_parse_decoder_config_record (GstH265Parser * parser,
+                                                                 const guint8 * data,
+                                                                 gsize size,
+                                                                 GstH265DecoderConfigRecord ** config);
+
 G_END_DECLS
 #endif

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gstmpegvideometa.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gstmpegvideometa.c Changed

@@ -47,18 +47,17 @@
     GstBuffer * buffer)
 {
   if (mpeg_video_meta->sequencehdr)
-    g_slice_free (GstMpegVideoSequenceHdr, mpeg_video_meta->sequencehdr);
+    g_free (mpeg_video_meta->sequencehdr);
   if (mpeg_video_meta->sequenceext)
-    g_slice_free (GstMpegVideoSequenceExt, mpeg_video_meta->sequenceext);
+    g_free (mpeg_video_meta->sequenceext);
   if (mpeg_video_meta->sequencedispext)
-    g_slice_free (GstMpegVideoSequenceDisplayExt,
-        mpeg_video_meta->sequencedispext);
+    g_free (mpeg_video_meta->sequencedispext);
   if (mpeg_video_meta->pichdr)
-    g_slice_free (GstMpegVideoPictureHdr, mpeg_video_meta->pichdr);
+    g_free (mpeg_video_meta->pichdr);
   if (mpeg_video_meta->picext)
-    g_slice_free (GstMpegVideoPictureExt, mpeg_video_meta->picext);
+    g_free (mpeg_video_meta->picext);
   if (mpeg_video_meta->quantext)
-    g_slice_free (GstMpegVideoQuantMatrixExt, mpeg_video_meta->quantext);
+    g_free (mpeg_video_meta->quantext);
 }
 
 static gboolean
@@ -160,19 +159,21 @@
 
   if (seq_hdr)
     mpeg_video_meta->sequencehdr =
-        g_slice_dup (GstMpegVideoSequenceHdr, seq_hdr);
+        g_memdup2 (seq_hdr, sizeof (GstMpegVideoSequenceHdr));
   if (seq_ext)
     mpeg_video_meta->sequenceext =
-        g_slice_dup (GstMpegVideoSequenceExt, seq_ext);
+        g_memdup2 (seq_ext, sizeof (GstMpegVideoSequenceExt));
   if (disp_ext)
     mpeg_video_meta->sequencedispext =
-        g_slice_dup (GstMpegVideoSequenceDisplayExt, disp_ext);
-  mpeg_video_meta->pichdr = g_slice_dup (GstMpegVideoPictureHdr, pic_hdr);
+        g_memdup2 (disp_ext, sizeof (GstMpegVideoSequenceDisplayExt));
+  mpeg_video_meta->pichdr =
+      g_memdup2 (pic_hdr, sizeof (GstMpegVideoPictureHdr));
   if (pic_ext)
-    mpeg_video_meta->picext = g_slice_dup (GstMpegVideoPictureExt, pic_ext);
+    mpeg_video_meta->picext =
+        g_memdup2 (pic_ext, sizeof (GstMpegVideoPictureExt));
   if (quant_ext)
     mpeg_video_meta->quantext =
-        g_slice_dup (GstMpegVideoQuantMatrixExt, quant_ext);
+        g_memdup2 (quant_ext, sizeof (GstMpegVideoQuantMatrixExt));
 
   return mpeg_video_meta;
 }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gstmpegvideoparser.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gstmpegvideoparser.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gstvc1parser.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gstvc1parser.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gstvp9parser.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gstvp9parser.c Changed

@@ -59,7 +59,7 @@
 #define gst_vp9_read_bit(br) gst_bit_reader_get_bits_uint8_unchecked(br, 1)
 #define gst_vp9_read_bits(br, bits) gst_bit_reader_get_bits_uint32_unchecked(br, bits)
 
-#define GST_VP9_PARSER_GET_PRIVATE(parser)  ((GstVp9ParserPrivate *)(parser->priv))
+#define GST_VP9_PARSER_GET_PRIVATE(parser)  ((GstVp9ParserPrivate *)(parser))
 
 typedef struct _ReferenceSize
 {
@@ -69,6 +69,11 @@
 
 typedef struct
 {
+  /* Public part of the struct */
+  GstVp9Parser parser;
+
+  /* Private part of the struct for tracking state variables across frames */
+
   /* for loop filters */
   gint8 ref_deltasGST_VP9_MAX_REF_LF_DELTAS;
   gint8 mode_deltasGST_VP9_MAX_MODE_LF_DELTAS;
@@ -587,16 +592,18 @@
 static void
 gst_vp9_parser_reset (GstVp9Parser * parser)
 {
-  GstVp9ParserPrivate *priv = parser->priv;
-
-  parser->priv = NULL;
-  memset (parser->mb_segment_tree_probs, 0,
-      sizeof (parser->mb_segment_tree_probs));
-  memset (parser->segment_pred_probs, 0, sizeof (parser->segment_pred_probs));
-  memset (parser->segmentation, 0, sizeof (parser->segmentation));
+  GstVp9ParserPrivate *priv = GST_VP9_PARSER_GET_PRIVATE (parser);
+  GstVp9Parser saved_vals = *parser;
 
+  /* Reset almost everything in private struct and public struct */
   memset (priv, 0, sizeof (GstVp9ParserPrivate));
-  parser->priv = priv;
+
+  /* Restore the fields we want to keep as-is */
+  parser->subsampling_x = saved_vals.subsampling_x;
+  parser->subsampling_y = saved_vals.subsampling_y;
+  parser->bit_depth = saved_vals.bit_depth;
+  parser->color_space = saved_vals.color_space;
+  parser->color_range = saved_vals.color_range;
 }
 
 static GstVp9ParserResult
@@ -631,21 +638,14 @@
 GstVp9Parser *
 gst_vp9_parser_new (void)
 {
-  GstVp9Parser *parser;
   GstVp9ParserPrivate *priv;
+  GstVp9Parser *parser;
 
   INITIALIZE_DEBUG_CATEGORY;
   GST_DEBUG ("Create VP9 Parser");
 
-  parser = g_slice_new0 (GstVp9Parser);
-  if (!parser)
-    return NULL;
-
-  priv = g_slice_new0 (GstVp9ParserPrivate);
-  if (!priv)
-    return NULL;
-
-  parser->priv = priv;
+  priv = g_new0 (GstVp9ParserPrivate, 1);
+  parser = &priv->parser;
   parser->subsampling_x = parser->subsampling_y = -1;
 
   return parser;
@@ -663,11 +663,8 @@
 gst_vp9_parser_free (GstVp9Parser * parser)
 {
   if (parser) {
-    if (parser->priv) {
-      g_slice_free (GstVp9ParserPrivate, parser->priv);
-      parser->priv = NULL;
-    }
-    g_slice_free (GstVp9Parser, parser);
+    GstVp9ParserPrivate *priv = GST_VP9_PARSER_GET_PRIVATE (parser);
+    g_free (priv);
   }
 }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/gstvp9parser.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/gstvp9parser.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/nalutils.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/nalutils.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecparsers/nalutils.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecparsers/nalutils.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstav1decoder.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstav1decoder.c Changed

@@ -409,7 +409,8 @@
   }
 
   ret = klass->new_sequence (self, &seq_header,
-      GST_AV1_TOTAL_REFS_PER_FRAME + priv->preferred_output_delay);
+      /* +1 for the current frame */
+      GST_AV1_TOTAL_REFS_PER_FRAME + 1 + priv->preferred_output_delay);
   if (ret != GST_FLOW_OK) {
     GST_ERROR_OBJECT (self, "subclass does not want accept new sequence");
     return ret;
@@ -490,7 +491,7 @@
       return GST_FLOW_ERROR;
     }
 
-    picture->system_frame_number = ref_picture->system_frame_number;
+    GST_CODEC_PICTURE_COPY_FRAME_NUMBER (picture, ref_picture);
     picture->frame_hdr = *frame_header;
     priv->current_picture = picture;
   } else {
@@ -500,7 +501,8 @@
     picture->show_frame = frame_header->show_frame;
     picture->showable_frame = frame_header->showable_frame;
     picture->apply_grain = frame_header->film_grain_params.apply_grain;
-    picture->system_frame_number = priv->current_frame->system_frame_number;
+    GST_CODEC_PICTURE_FRAME_NUMBER (picture) =
+        priv->current_frame->system_frame_number;
     picture->temporal_id = obu->header.obu_temporal_id;
     picture->spatial_id = obu->header.obu_spatial_id;
 
@@ -675,6 +677,7 @@
   GstBuffer *in_buf = frame->input_buffer;
   GstMapInfo map;
   GstFlowReturn ret = GST_FLOW_OK;
+  GstFlowReturn output_ret = GST_FLOW_OK;
   guint32 total_consumed, consumed;
   GstAV1OBU obu;
   GstAV1ParserResult res;
@@ -759,8 +762,8 @@
         /* If subclass didn't update output state at this point,
          * marking this picture as a discont and stores current input state */
         if (priv->input_state_changed) {
-          priv->current_picture->discont_state =
-              gst_video_codec_state_ref (self->input_state);
+          gst_av1_picture_set_discont_state (priv->current_picture,
+              self->input_state);
           priv->input_state_changed = FALSE;
         }
 
@@ -780,14 +783,21 @@
     if (priv->current_picture)
       gst_av1_picture_unref (priv->current_picture);
 
-    gst_video_decoder_drop_frame (decoder, frame);
+    gst_video_decoder_release_frame (decoder, frame);
   }
 
-  gst_av1_decoder_drain_output_queue (self, priv->preferred_output_delay, &ret);
+  gst_av1_decoder_drain_output_queue (self,
+      priv->preferred_output_delay, &output_ret);
 
   priv->current_picture = NULL;
   priv->current_frame = NULL;
 
+  if (output_ret != GST_FLOW_OK) {
+    GST_DEBUG_OBJECT (self,
+        "Output returned %s", gst_flow_get_name (output_ret));
+    return output_ret;
+  }
+
   if (ret == GST_FLOW_ERROR) {
     GST_VIDEO_DECODER_ERROR (decoder, 1, STREAM, DECODE,
         ("Failed to handle the frame %d", frame->system_frame_number),

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstav1decoder.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstav1decoder.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstav1picture.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstav1picture.c Changed

@@ -22,26 +22,13 @@
 #endif
 
 #include "gstav1picture.h"
+#include "gstcodecpicture-private.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gst_av1_decoder_debug);
 #define GST_CAT_DEFAULT gst_av1_decoder_debug
 
 GST_DEFINE_MINI_OBJECT_TYPE (GstAV1Picture, gst_av1_picture);
 
-static void
-_gst_av1_picture_free (GstAV1Picture * picture)
-{
-  GST_TRACE ("Free picture %p", picture);
-
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  if (picture->discont_state)
-    gst_video_codec_state_unref (picture->discont_state);
-
-  g_free (picture);
-}
-
 /**
  * gst_av1_picture_new:
  *
@@ -60,7 +47,7 @@
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (pic), 0,
       GST_TYPE_AV1_PICTURE, NULL, NULL,
-      (GstMiniObjectFreeFunction) _gst_av1_picture_free);
+      (GstMiniObjectFreeFunction) gst_codec_picture_free);
 
   GST_TRACE ("New picture %p", pic);
 
@@ -68,50 +55,6 @@
 }
 
 /**
- * gst_av1_picture_set_user_data:
- * @picture: a #GstAV1Picture
- * @user_data: private data
- * @notify: (closure user_data): a #GDestroyNotify
- *
- * Sets @user_data on the picture and the #GDestroyNotify that will be called when
- * the picture is freed.
- *
- * If a @user_data was previously set, then the previous set @notify will be called
- * before the @user_data is replaced.
- *
- * Since: 1.20
- */
-void
-gst_av1_picture_set_user_data (GstAV1Picture * picture, gpointer user_data,
-    GDestroyNotify notify)
-{
-  g_return_if_fail (GST_IS_AV1_PICTURE (picture));
-
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  picture->user_data = user_data;
-  picture->notify = notify;
-}
-
-/**
- * gst_av1_picture_get_user_data:
- * @picture: a #GstAV1Picture
- *
- * Gets private data set on the picture via
- * gst_av1_picture_set_user_data() previously.
- *
- * Returns: (transfer none): The previously set user_data
- *
- * Since: 1.20
- */
-gpointer
-gst_av1_picture_get_user_data (GstAV1Picture * picture)
-{
-  return picture->user_data;
-}
-
-/**
  * gst_av1_dpb_new: (skip)
  *
  * Create new #GstAV1Dpb

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstav1picture.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstav1picture.h Changed

@@ -21,6 +21,7 @@
 #define __GST_AV1_PICTURE_H__
 
 #include <gst/codecs/codecs-prelude.h>
+#include <gst/codecs/gstcodecpicture.h>
 #include <gst/codecparsers/gstav1parser.h>
 #include <gst/video/video.h>
 
@@ -68,10 +69,7 @@
 struct _GstAV1Picture
 {
   /*< private >*/
-  GstMiniObject parent;
-
-  /* From GstVideoCodecFrame */
-  guint32 system_frame_number;
+  GstCodecPicture parent;
 
   GstAV1FrameHeaderOBU frame_hdr;
 
@@ -84,12 +82,6 @@
   gboolean show_frame;
   gboolean showable_frame;
   gboolean apply_grain;
-
-  /* decoder input state if this picture is discont point */
-  GstVideoCodecState *discont_state;
-
-  gpointer user_data;
-  GDestroyNotify notify;
 };
 
 GST_CODECS_API
@@ -127,13 +119,27 @@
   }
 }
 
-GST_CODECS_API
-void gst_av1_picture_set_user_data (GstAV1Picture * picture,
-                                    gpointer user_data,
-                                    GDestroyNotify notify);
+static inline void
+gst_av1_picture_set_user_data (GstAV1Picture * picture, gpointer user_data,
+    GDestroyNotify notify)
+{
+  gst_codec_picture_set_user_data (GST_CODEC_PICTURE (picture),
+      user_data, notify);
+}
 
-GST_CODECS_API
-gpointer gst_av1_picture_get_user_data (GstAV1Picture * picture);
+static inline gpointer
+gst_av1_picture_get_user_data (GstAV1Picture * picture)
+{
+  return gst_codec_picture_get_user_data (GST_CODEC_PICTURE (picture));
+}
+
+static inline void
+gst_av1_picture_set_discont_state (GstAV1Picture * picture,
+    GstVideoCodecState * discont_state)
+{
+  gst_codec_picture_set_discont_state (GST_CODEC_PICTURE (picture),
+      discont_state);
+}
 
 /*******************
  * GstAV1Dpb *

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstcodecpicture-private.h Added

@@ -0,0 +1,29 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/codecs/gstcodecpicture.h>
+
+G_BEGIN_DECLS
+
+void gst_codec_picture_free (GstCodecPicture * picture);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstcodecpicture.c Added

@@ -0,0 +1,104 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstcodecpicture.h"
+#include "gstcodecpicture-private.h"
+
+void
+gst_codec_picture_free (GstCodecPicture * picture)
+{
+  if (picture->notify)
+    picture->notify (picture->user_data);
+
+  if (picture->discont_state)
+    gst_video_codec_state_unref (picture->discont_state);
+
+  g_free (picture);
+}
+
+/**
+ * gst_codec_picture_set_user_data:
+ * @picture: a #GstCodecPicture
+ * @user_data: (nullable): private data
+ * @notify: (closure user_data): a #GDestroyNotify
+ *
+ * Sets @user_data on the picture and the #GDestroyNotify that will be called when
+ * the picture is freed.
+ *
+ * If a @user_data was previously set, then the previous set @notify will be called
+ * before the @user_data is replaced.
+ *
+ * Since: 1.24
+ */
+void
+gst_codec_picture_set_user_data (GstCodecPicture * picture, gpointer user_data,
+    GDestroyNotify notify)
+{
+  g_return_if_fail (picture);
+
+  if (picture->notify)
+    picture->notify (picture->user_data);
+
+  picture->notify = notify;
+  picture->user_data = user_data;
+}
+
+/**
+ * gst_codec_picture_get_user_data:
+ * @picture: a #GstCodecPicture
+ *
+ * Gets private data set on the picture via
+ * gst_codec_picture_set_user_data() previously.
+ *
+ * Returns: (transfer none) (nullable): The previously set user_data
+ *
+ * Since: 1.24
+ */
+gpointer
+gst_codec_picture_get_user_data (GstCodecPicture * picture)
+{
+  g_return_val_if_fail (picture, NULL);
+
+  return picture->user_data;
+}
+
+/**
+ * gst_codec_picture_set_discont_state:
+ * @picture: a #GstCodecPicture
+ * @discont_state: (transfer none) (allow-none): a #GstVideoCodecState
+ *
+ * Sets @discont_state to @picture
+ *
+ * Since: 1.24
+ */
+void
+gst_codec_picture_set_discont_state (GstCodecPicture * picture,
+    GstVideoCodecState * discont_state)
+{
+  g_return_if_fail (picture);
+
+  g_clear_pointer (&picture->discont_state, gst_video_codec_state_unref);
+
+  if (discont_state)
+    picture->discont_state = gst_video_codec_state_ref (discont_state);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstcodecpicture.h Added

@@ -0,0 +1,107 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/codecs/codecs-prelude.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GstCodecPicture GstCodecPicture;
+#define GST_CODEC_PICTURE(p) ((GstCodecPicture *) p)
+
+/**
+ * GST_CODEC_PICTURE_FRAME_NUMBER:
+ * @picture: a #GstCodecPicture
+ *
+ * Gets access to the system_frame_number field of @picture
+ *
+ * Since: 1.24
+ */
+#define GST_CODEC_PICTURE_FRAME_NUMBER(picture) \
+    GST_CODEC_PICTURE(picture)->system_frame_number
+
+/**
+ * GST_CODEC_PICTURE_COPY_FRAME_NUMBER:
+ * @dst: a #GstCodecPicture
+ * @src: a #GstCodecPicture
+ *
+ * Copy system_frame_number of @src to @dst
+ *
+ * Since: 1.24
+ */
+#define GST_CODEC_PICTURE_COPY_FRAME_NUMBER(dst,src) G_STMT_START { \
+    GST_CODEC_PICTURE(dst)->system_frame_number = \
+    GST_CODEC_PICTURE(src)->system_frame_number; \
+} G_STMT_END
+
+/**
+ * GstCodecPicture:
+ *
+ * Base struct for coded picture representation
+ *
+ * Since: 1.24
+ */
+struct _GstCodecPicture
+{
+  /*< private >*/
+  GstMiniObject parent;
+
+  guint32 system_frame_number;
+  GstVideoCodecState *discont_state;
+
+  gpointer user_data;
+  GDestroyNotify notify;
+
+  gpointer _gst_reservedGST_PADDING;
+};
+
+GST_CODECS_API
+void      gst_codec_picture_set_user_data (GstCodecPicture * picture,
+                                           gpointer user_data,
+                                           GDestroyNotify notify);
+
+GST_CODECS_API
+gpointer  gst_codec_picture_get_user_data (GstCodecPicture * picture);
+
+GST_CODECS_API
+void      gst_codec_picture_set_discont_state (GstCodecPicture * picture,
+                                               GstVideoCodecState * discont_state);
+
+static inline GstCodecPicture *
+gst_codec_picture_ref (GstCodecPicture * picture)
+{
+  return (GstCodecPicture *) gst_mini_object_ref ((GstMiniObject *) picture);
+}
+
+static inline void
+gst_codec_picture_unref (GstCodecPicture * picture)
+{
+  gst_mini_object_unref ((GstMiniObject *) picture);
+}
+
+static inline void
+gst_clear_codec_picture (GstCodecPicture ** picture)
+{
+  gst_clear_mini_object ((GstMiniObject **) picture);
+}
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gsth264decoder.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gsth264decoder.c Changed

@@ -60,6 +60,7 @@
 
 #include <gst/base/base.h>
 #include "gsth264decoder.h"
+#include "gsth264picture-private.h"
 
 GST_DEBUG_CATEGORY (gst_h264_decoder_debug);
 #define GST_CAT_DEFAULT gst_h264_decoder_debug
@@ -126,9 +127,6 @@
 
   GstH264PictureField prev_ref_field;
 
-  /* PicOrderCount of the previously outputted frame */
-  gint last_output_poc;
-
   gboolean process_ref_pic_lists;
   guint preferred_output_delay;
 
@@ -148,11 +146,17 @@
   GArray *ref_pic_list0;
   GArray *ref_pic_list1;
 
+  /* Split packetized data into actual nal chunks (for malformed stream) */
+  GArray *split_nalu;
+
   /* For delayed output */
   GstQueueArray *output_queue;
 
   gboolean input_state_changed;
 
+  /* Return value from output_picture() */
+  GstFlowReturn last_flow;
+
   /* Latency report params */
   guint32 max_reorder_count;
   guint32 last_reorder_frame_number;
@@ -350,8 +354,6 @@
 
   self->priv = priv = gst_h264_decoder_get_instance_private (self);
 
-  priv->last_output_poc = G_MININT32;
-
   priv->ref_pic_list_p0 = g_array_sized_new (FALSE, TRUE,
       sizeof (GstH264Picture *), 32);
   g_array_set_clear_func (priv->ref_pic_list_p0,
@@ -387,6 +389,8 @@
   priv->ref_pic_list1 = g_array_sized_new (FALSE, TRUE,
       sizeof (GstH264Picture *), 32);
 
+  priv->split_nalu = g_array_new (FALSE, FALSE, sizeof (GstH264NalUnit));
+
   priv->output_queue =
       gst_queue_array_new_for_struct (sizeof (GstH264DecoderOutputFrame), 1);
   gst_queue_array_set_clear_func (priv->output_queue,
@@ -407,6 +411,7 @@
   g_array_unref (priv->ref_frame_list_long_term);
   g_array_unref (priv->ref_pic_list0);
   g_array_unref (priv->ref_pic_list1);
+  g_array_unref (priv->split_nalu);
   gst_queue_array_free (priv->output_queue);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -437,6 +442,7 @@
   priv->width = 0;
   priv->height = 0;
   priv->nal_length_size = 4;
+  priv->last_flow = GST_FLOW_OK;
 
   gst_h264_decoder_reset_latency_infos (self);
 }
@@ -492,7 +498,7 @@
   if (!flush) {
     while ((picture = gst_h264_dpb_bump (priv->dpb, TRUE)) != NULL) {
       GstVideoCodecFrame *frame = gst_video_decoder_get_frame (decoder,
-          picture->system_frame_number);
+          GST_CODEC_PICTURE_FRAME_NUMBER (picture));
 
       if (frame)
         gst_video_decoder_release_frame (decoder, frame);
@@ -504,7 +510,6 @@
   gst_h264_decoder_clear_ref_pic_lists (self);
   gst_clear_h264_picture (&priv->last_field);
   gst_h264_dpb_clear (priv->dpb);
-  priv->last_output_poc = G_MININT32;
 }
 
 static gboolean
@@ -540,7 +545,7 @@
   GstH264DecoderPrivate *priv = self->priv;
   GstBuffer *in_buf = frame->input_buffer;
   GstH264NalUnit nalu;
-  GstH264ParserResult pres;
+  GstH264ParserResult pres = GST_H264_PARSER_OK;
   GstMapInfo map;
   GstFlowReturn decode_ret = GST_FLOW_OK;
 
@@ -550,19 +555,31 @@
       GST_TIME_ARGS (GST_BUFFER_DTS (in_buf)));
 
   priv->current_frame = frame;
+  priv->last_flow = GST_FLOW_OK;
 
   gst_buffer_map (in_buf, &map, GST_MAP_READ);
   if (priv->in_format == GST_H264_DECODER_FORMAT_AVC) {
-    pres = gst_h264_parser_identify_nalu_avc (priv->parser,
-        map.data, 0, map.size, priv->nal_length_size, &nalu);
+    guint offset = 0;
+    gsize consumed = 0;
+    guint i;
+
+    do {
+      pres = gst_h264_parser_identify_and_split_nalu_avc (priv->parser,
+          map.data, offset, map.size, priv->nal_length_size, priv->split_nalu,
+          &consumed);
+      if (pres != GST_H264_PARSER_OK)
+        break;
 
-    while (pres == GST_H264_PARSER_OK && decode_ret == GST_FLOW_OK) {
-      decode_ret = gst_h264_decoder_decode_nal (self, &nalu);
+      for (i = 0; i < priv->split_nalu->len; i++) {
+        GstH264NalUnit *nl =
+            &g_array_index (priv->split_nalu, GstH264NalUnit, i);
+        decode_ret = gst_h264_decoder_decode_nal (self, nl);
+        if (decode_ret != GST_FLOW_OK)
+          break;
+      }
 
-      pres = gst_h264_parser_identify_nalu_avc (priv->parser,
-          map.data, nalu.offset + nalu.size, map.size, priv->nal_length_size,
-          &nalu);
-    }
+      offset += consumed;
+    } while (pres == GST_H264_PARSER_OK && decode_ret == GST_FLOW_OK);
   } else {
     pres = gst_h264_parser_identify_nalu (priv->parser,
         map.data, 0, map.size, &nalu);
@@ -589,7 +606,7 @@
           ("Failed to decode data"), (NULL), decode_ret);
     }
 
-    gst_video_decoder_drop_frame (decoder, frame);
+    gst_video_decoder_release_frame (decoder, frame);
     gst_clear_h264_picture (&priv->current_picture);
     priv->current_frame = NULL;
 
@@ -600,6 +617,12 @@
   gst_video_codec_frame_unref (frame);
   priv->current_frame = NULL;
 
+  if (priv->last_flow != GST_FLOW_OK) {
+    GST_DEBUG_OBJECT (self,
+        "Last flow %s", gst_flow_get_name (priv->last_flow));
+    return priv->last_flow;
+  }
+
   if (decode_ret == GST_FLOW_ERROR) {
     GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
         ("Failed to decode data"), (NULL), decode_ret);
@@ -809,7 +832,7 @@
   other_field->frame_num = picture->frame_num;
   other_field->ref = picture->ref;
   other_field->nonexisting = picture->nonexisting;
-  other_field->system_frame_number = picture->system_frame_number;
+  GST_CODEC_PICTURE_COPY_FRAME_NUMBER (other_field, picture);
   other_field->field_pic_flag = picture->field_pic_flag;
 
   return other_field;
@@ -1047,11 +1070,12 @@
   g_assert (priv->active_sps != NULL);
   g_assert (priv->active_pps != NULL);
 
+  current_picture = priv->current_picture;
+
   /* If subclass didn't update output state at this point,
    * marking this picture as a discont and stores current input state */
   if (priv->input_state_changed) {
-    priv->current_picture->discont_state =
-        gst_video_codec_state_ref (self->input_state);
+    gst_h264_picture_set_discont_state (current_picture, self->input_state);
     priv->input_state_changed = FALSE;
   }
 
@@ -1069,8 +1093,6 @@
   if (!gst_h264_decoder_init_current_picture (self))
     return GST_FLOW_ERROR;
 
-  current_picture = priv->current_picture;
-
   /* If the new picture is an IDR, flush DPB */
   if (current_picture->idr) {
     if (!current_picture->dec_ref_pic_marking.no_output_of_prior_pics_flag) {
@@ -1310,7 +1332,8 @@
     }
 
     /* This allows accessing the frame from the picture. */
-    picture->system_frame_number = priv->current_frame->system_frame_number;
+    GST_CODEC_PICTURE_FRAME_NUMBER (picture) =
+        priv->current_frame->system_frame_number;
     priv->current_picture = picture;
 
     ret = gst_h264_decoder_start_current_picture (self);
@@ -1795,20 +1818,23 @@
   GstH264DecoderPrivate *priv = self->priv;
   GstVideoCodecFrame *frame = NULL;
   GstH264DecoderOutputFrame output_frame;
-  GstFlowReturn flow_ret = GST_FLOW_OK;
+#ifndef GST_DISABLE_GST_DEBUG
+  guint32 last_output_poc;
+#endif
 
   g_assert (ret != NULL);
 
   GST_LOG_OBJECT (self, "Outputting picture %p (frame_num %d, poc %d)",
       picture, picture->frame_num, picture->pic_order_cnt);
 
-  if (picture->pic_order_cnt < priv->last_output_poc) {
+#ifndef GST_DISABLE_GST_DEBUG
+  last_output_poc = gst_h264_dpb_get_last_output_poc (priv->dpb);
+  if (picture->pic_order_cnt < last_output_poc) {
     GST_WARNING_OBJECT (self,
         "Outputting out of order %d -> %d, likely a broken stream",
-        priv->last_output_poc, picture->pic_order_cnt);
+        last_output_poc, picture->pic_order_cnt);
   }
-
-  priv->last_output_poc = picture->pic_order_cnt;
+#endif
 
   if (priv->last_reorder_frame_number > picture->reorder_frame_number) {
     guint64 diff = priv->last_reorder_frame_number -
@@ -1833,7 +1859,7 @@
   }
 
   frame = gst_video_decoder_get_frame (GST_VIDEO_DECODER (self),
-      picture->system_frame_number);
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture));
 
   if (!frame) {
     /* The case where the end_picture() got failed and corresponding
@@ -1843,7 +1869,7 @@
     } else {
       GST_ERROR_OBJECT (self,
           "No available codec frame with frame number %d",
-          picture->system_frame_number);
+          GST_CODEC_PICTURE_FRAME_NUMBER (picture));
       UPDATE_FLOW_RETURN (ret, GST_FLOW_ERROR);
     }
 
@@ -1858,8 +1884,7 @@
   gst_queue_array_push_tail_struct (priv->output_queue, &output_frame);
 
   gst_h264_decoder_drain_output_queue (self, priv->preferred_output_delay,
-      &flow_ret);
-  UPDATE_FLOW_RETURN (ret, flow_ret);
+      &priv->last_flow);
 }
 
 static void
@@ -1870,8 +1895,16 @@
   GstH264DecoderClass *klass;
   GstFlowReturn flow_ret = GST_FLOW_OK;
 
-  if (!priv->current_picture)
+  if (!priv->current_picture) {
+    if (priv->current_frame) {
+      GST_DEBUG_OBJECT (self,
+          "AU buffer without slice data, releasing current frame %u",
+          priv->current_frame->system_frame_number);
+      gst_video_decoder_release_frame (GST_VIDEO_DECODER_CAST (self),
+          gst_video_codec_frame_ref (priv->current_frame));
+    }
     return;
+  }
 
   klass = GST_H264_DECODER_GET_CLASS (self);
 
@@ -1886,7 +1919,7 @@
       priv->current_picture->nonexisting = TRUE;
 
       /* this fake nonexisting picture will not trigger ouput_picture() */
-      gst_video_decoder_drop_frame (GST_VIDEO_DECODER (self),
+      gst_video_decoder_release_frame (GST_VIDEO_DECODER (self),
           gst_video_codec_frame_ref (priv->current_frame));
     }
   }
@@ -1928,7 +1961,6 @@
 
   gst_clear_h264_picture (&priv->last_field);
   gst_h264_dpb_clear (priv->dpb);
-  priv->last_output_poc = G_MININT32;
 
   return ret;
 }
@@ -2146,10 +2178,10 @@
    * drop codec frame of the second field because we are consuming
    * only the first codec frame via GstH264Decoder::output_picture() method */
   if (picture->second_field && picture->other_field &&
-      picture->system_frame_number !=
-      picture->other_field->system_frame_number) {
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture) !=
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture->other_field)) {
     GstVideoCodecFrame *frame = gst_video_decoder_get_frame (decoder,
-        picture->system_frame_number);
+        GST_CODEC_PICTURE_FRAME_NUMBER (picture));
 
     gst_video_decoder_release_frame (decoder, frame);
   }
@@ -2264,33 +2296,9 @@
   return max_dpb_size;
 }
 
-typedef enum
-{
-  GST_H264_LEVEL_L1 = 10,
-  GST_H264_LEVEL_L1B = 9,
-  GST_H264_LEVEL_L1_1 = 11,
-  GST_H264_LEVEL_L1_2 = 12,
-  GST_H264_LEVEL_L1_3 = 13,
-  GST_H264_LEVEL_L2_0 = 20,
-  GST_H264_LEVEL_L2_1 = 21,
-  GST_H264_LEVEL_L2_2 = 22,
-  GST_H264_LEVEL_L3 = 30,
-  GST_H264_LEVEL_L3_1 = 31,
-  GST_H264_LEVEL_L3_2 = 32,
-  GST_H264_LEVEL_L4 = 40,
-  GST_H264_LEVEL_L4_1 = 41,
-  GST_H264_LEVEL_L4_2 = 42,
-  GST_H264_LEVEL_L5 = 50,
-  GST_H264_LEVEL_L5_1 = 51,
-  GST_H264_LEVEL_L5_2 = 52,
-  GST_H264_LEVEL_L6 = 60,
-  GST_H264_LEVEL_L6_1 = 61,
-  GST_H264_LEVEL_L6_2 = 62,
-} GstH264DecoderLevel;
-
 typedef struct
 {
-  GstH264DecoderLevel level;
+  GstH264Level level;
 
   guint32 max_mbps;
   guint32 max_fs;
@@ -2304,7 +2312,7 @@
   {GST_H264_LEVEL_L1_1, 3000, 396, 900, 192},
   {GST_H264_LEVEL_L1_2, 6000, 396, 2376, 384},
   {GST_H264_LEVEL_L1_3, 11800, 396, 2376, 768},
-  {GST_H264_LEVEL_L2_0, 11880, 396, 2376, 2000},
+  {GST_H264_LEVEL_L2, 11880, 396, 2376, 2000},
   {GST_H264_LEVEL_L2_1, 19800, 792, 4752, 4000},
   {GST_H264_LEVEL_L2_2, 20250, 1620, 8100, 4000},
   {GST_H264_LEVEL_L3, 40500, 1620, 8100, 10000},
@@ -2322,7 +2330,7 @@
 };
 
 static gint
-h264_level_to_max_dpb_mbs (GstH264DecoderLevel level)
+h264_level_to_max_dpb_mbs (GstH264Level level)
 {
   gint i;
   for (i = 0; i < G_N_ELEMENTS (level_limits_map); i++) {
@@ -2439,7 +2447,7 @@
     level = 9;
   }
 
-  max_dpb_mbs = h264_level_to_max_dpb_mbs ((GstH264DecoderLevel) level);
+  max_dpb_mbs = h264_level_to_max_dpb_mbs ((GstH264Level) level);
   if (!max_dpb_mbs)
     return GST_FLOW_ERROR;

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gsth264decoder.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gsth264decoder.h Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gsth264picture-private.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) <2023> The GStreamer Contributors.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gsth264picture.h"
+
+G_BEGIN_DECLS
+
+gint32 gst_h264_dpb_get_last_output_poc (GstH264Dpb * dpb);
+
+void   gst_h264_picture_set_reference   (GstH264Picture * picture,
+                                         GstH264PictureReference reference,
+                                         gboolean other_field);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gsth264picture.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gsth264picture.c Changed

@@ -21,7 +21,9 @@
 #include <config.h>
 #endif
 
-#include "gsth264picture.h"
+#include "gsth264picture-private.h"
+#include "gstcodecpicture-private.h"
+
 #include <stdlib.h>
 
 GST_DEBUG_CATEGORY_EXTERN (gst_h264_decoder_debug);
@@ -29,18 +31,6 @@
 
 GST_DEFINE_MINI_OBJECT_TYPE (GstH264Picture, gst_h264_picture);
 
-static void
-_gst_h264_picture_free (GstH264Picture * picture)
-{
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  if (picture->discont_state)
-    gst_video_codec_state_unref (picture->discont_state);
-
-  g_free (picture);
-}
-
 /**
  * gst_h264_picture_new:
  *
@@ -61,51 +51,11 @@
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (pic), 0,
       GST_TYPE_H264_PICTURE, NULL, NULL,
-      (GstMiniObjectFreeFunction) _gst_h264_picture_free);
+      (GstMiniObjectFreeFunction) gst_codec_picture_free);
 
   return pic;
 }
 
-/**
- * gst_h264_picture_set_user_data:
- * @picture: a #GstH264Picture
- * @user_data: (nullable): private data
- * @notify: (closure user_data): a #GDestroyNotify
- *
- * Sets @user_data on the picture and the #GDestroyNotify that will be called when
- * the picture is freed.
- *
- * If a @user_data was previously set, then the previous set @notify will be called
- * before the @user_data is replaced.
- */
-void
-gst_h264_picture_set_user_data (GstH264Picture * picture, gpointer user_data,
-    GDestroyNotify notify)
-{
-  g_return_if_fail (GST_IS_H264_PICTURE (picture));
-
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  picture->user_data = user_data;
-  picture->notify = notify;
-}
-
-/**
- * gst_h264_picture_get_user_data:
- * @picture: a #GstH264Picture
- *
- * Gets private data set on the picture via
- * gst_h264_picture_set_user_data() previously.
- *
- * Returns: (transfer none) (nullable): The previously set user_data
- */
-gpointer
-gst_h264_picture_get_user_data (GstH264Picture * picture)
-{
-  return picture->user_data;
-}
-
 struct _GstH264Dpb
 {
   GArray *pic_list;
@@ -215,6 +165,22 @@
 }
 
 /**
+ * gst_h264_dpb_get_last_output_poc:
+ * @dpb: a #GstH264Dpb
+ *
+ * Returns: the last outputted picture order count
+ *
+ * Since: 1.24
+ */
+gint32
+gst_h264_dpb_get_last_output_poc (GstH264Dpb * dpb)
+{
+  g_return_val_if_fail (dpb != NULL, G_MININT32);
+
+  return dpb->last_output_poc;
+}
+
+/**
  * gst_h264_dpb_free:
  * @dpb: a #GstH264Dpb to free
  *
@@ -629,7 +595,7 @@
     GstH264Picture *picture =
         g_array_index (dpb->pic_list, GstH264Picture *, i);
 
-    if (picture->system_frame_number == system_frame_number) {
+    if (GST_CODEC_PICTURE_FRAME_NUMBER (picture) == system_frame_number) {
       gst_h264_picture_ref (picture);
       return picture;
     }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gsth264picture.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gsth264picture.h Changed

@@ -21,6 +21,7 @@
 #define __GST_H264_PICTURE_H__
 
 #include <gst/codecs/codecs-prelude.h>
+#include <gst/codecs/gstcodecpicture.h>
 #include <gst/codecparsers/gsth264parser.h>
 #include <gst/video/video.h>
 
@@ -114,13 +115,10 @@
 struct _GstH264Picture
 {
   /*< private >*/
-  GstMiniObject parent;
+  GstCodecPicture parent;
 
   GstH264SliceType type;
 
-  /* From GstVideoCodecFrame */
-  guint32 system_frame_number;
-
   guint8 pic_order_cnt_type;  /* SPS */
   gint32 top_field_order_cnt;
   gint32 bottom_field_order_cnt;
@@ -163,12 +161,6 @@
   GstH264Picture * other_field;
 
   GstVideoBufferFlags buffer_flags;
-
-  /* decoder input state if this picture is discont point */
-  GstVideoCodecState *discont_state;
-
-  gpointer user_data;
-  GDestroyNotify notify;
 };
 
 /**
@@ -221,13 +213,27 @@
   }
 }
 
-GST_CODECS_API
-void gst_h264_picture_set_user_data (GstH264Picture * picture,
-                                     gpointer user_data,
-                                     GDestroyNotify notify);
+static inline void
+gst_h264_picture_set_user_data (GstH264Picture * picture, gpointer user_data,
+    GDestroyNotify notify)
+{
+  gst_codec_picture_set_user_data (GST_CODEC_PICTURE (picture),
+      user_data, notify);
+}
 
-GST_CODECS_API
-gpointer gst_h264_picture_get_user_data (GstH264Picture * picture);
+static inline gpointer
+gst_h264_picture_get_user_data (GstH264Picture * picture)
+{
+  return gst_codec_picture_get_user_data (GST_CODEC_PICTURE (picture));
+}
+
+static inline void
+gst_h264_picture_set_discont_state (GstH264Picture * picture,
+    GstVideoCodecState * discont_state)
+{
+  gst_codec_picture_set_discont_state (GST_CODEC_PICTURE (picture),
+      discont_state);
+}
 
 /*******************
  * GstH264Dpb *
@@ -330,11 +336,6 @@
                                                                            GstH264RefPicMarking *ref_pic_marking,
                                                                            GstH264Picture * picture);
 
-/* Internal methods */
-void  gst_h264_picture_set_reference (GstH264Picture * picture,
-                                      GstH264PictureReference reference,
-                                      gboolean other_field);
-
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstH264Picture, gst_h264_picture_unref)
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gsth265decoder.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gsth265decoder.c Changed

@@ -136,6 +136,8 @@
   GstQueueArray *output_queue;
 
   gboolean input_state_changed;
+
+  GstFlowReturn last_flow;
 };
 
 typedef struct
@@ -267,6 +269,7 @@
   priv->dpb = gst_h265_dpb_new ();
   priv->new_bitstream = TRUE;
   priv->prev_nal_is_eos = FALSE;
+  priv->last_flow = GST_FLOW_OK;
 
   return TRUE;
 }
@@ -424,23 +427,77 @@
   gst_video_decoder_set_latency (GST_VIDEO_DECODER (self), min, max);
 }
 
-static GstFlowReturn
-gst_h265_decoder_process_sps (GstH265Decoder * self, GstH265SPS * sps)
+typedef struct
 {
-  GstH265DecoderPrivate *priv = self->priv;
+  const gchar *level_name;
+  guint8 level_idc;
+  guint32 MaxLumaPs;
+} GstH265LevelLimits;
+
+/* *INDENT-OFF* */
+/* Table A.8 - General tier and level limits */
+static const GstH265LevelLimits level_limits = {
+  /* level    idc                   MaxLumaPs */
+  {  "1",     GST_H265_LEVEL_L1,    36864    },
+  {  "2",     GST_H265_LEVEL_L2,    122880   },
+  {  "2.1",   GST_H265_LEVEL_L2_1,  245760   },
+  {  "3",     GST_H265_LEVEL_L3,    552960   },
+  {  "3.1",   GST_H265_LEVEL_L3_1,  983040   },
+  {  "4",     GST_H265_LEVEL_L4,    2228224  },
+  {  "4.1",   GST_H265_LEVEL_L4_1,  2228224  },
+  {  "5",     GST_H265_LEVEL_L5,    8912896  },
+  {  "5.1",   GST_H265_LEVEL_L5_1,  8912896  },
+  {  "5.2",   GST_H265_LEVEL_L5_2,  8912896  },
+  {  "6",     GST_H265_LEVEL_L6,    35651584 },
+  {  "6.1",   GST_H265_LEVEL_L6_1,  35651584 },
+  {  "6.2",   GST_H265_LEVEL_L6_2,  35651584 },
+};
+/* *INDENT-ON* */
+
+static gint
+gst_h265_decoder_get_max_dpb_size_from_sps (GstH265Decoder * self,
+    GstH265SPS * sps)
+{
+  guint i;
+  guint PicSizeInSamplesY;
+  /* Default is the worst case level 6.2 */
+  guint32 MaxLumaPS = G_MAXUINT32;
+  gint MaxDpbPicBuf = 6;
   gint max_dpb_size;
-  gint prev_max_dpb_size;
-  gint MaxLumaPS;
-  const gint MaxDpbPicBuf = 6;
-  gint PicSizeInSamplesY;
-  guint8 field_seq_flag = 0;
-  guint8 progressive_source_flag = 0;
-  guint8 interlaced_source_flag = 0;
-  GstFlowReturn ret = GST_FLOW_OK;
 
-  /* A.4.1 */
-  MaxLumaPS = 35651584;
+  /* A.4.2, maxDpbPicBuf is equal to 6 for all profiles where the value of
+   * sps_curr_pic_ref_enabled_flag is required to be equal to 0 and 7 for all
+   * profiles where the value of sps_curr_pic_ref_enabled_flag is not required
+   * to be equal to 0  */
+  if (sps->sps_scc_extension_flag) {
+    /* sps_curr_pic_ref_enabled_flag could be non-zero only if profile is SCC */
+    MaxDpbPicBuf = 7;
+  }
+
+  /* Unknown level */
+  if (sps->profile_tier_level.level_idc == 0)
+    return 16;
+
   PicSizeInSamplesY = sps->width * sps->height;
+  for (i = 0; i < G_N_ELEMENTS (level_limits); i++) {
+    if (sps->profile_tier_level.level_idc <= level_limitsi.level_idc) {
+      if (PicSizeInSamplesY <= level_limitsi.MaxLumaPs) {
+        MaxLumaPS = level_limitsi.MaxLumaPs;
+      } else {
+        GST_DEBUG_OBJECT (self,
+            "%u (%dx%d) exceeds allowed max luma sample for level \"%s\" %u",
+            PicSizeInSamplesY, sps->width, sps->height,
+            level_limitsi.level_name, level_limitsi.MaxLumaPs);
+      }
+      break;
+    }
+  }
+
+  /* Unknown level */
+  if (MaxLumaPS == G_MAXUINT32)
+    return 16;
+
+  /* A.4.2 */
   if (PicSizeInSamplesY <= (MaxLumaPS >> 2))
     max_dpb_size = MaxDpbPicBuf * 4;
   else if (PicSizeInSamplesY <= (MaxLumaPS >> 1))
@@ -452,6 +509,38 @@
 
   max_dpb_size = MIN (max_dpb_size, 16);
 
+  /* MaxDpbSize is not an actual maximum required buffer size.
+   * Instead, it indicates upper bound for other syntax elements, such as
+   * sps_max_dec_pic_buffering_minus1. If this bitstream can satisfy
+   * the requirement, use this as our dpb size */
+  if (sps->max_dec_pic_buffering_minus1sps->max_sub_layers_minus1 + 1 <=
+      max_dpb_size) {
+    GST_DEBUG_OBJECT (self, "max_dec_pic_buffering_minus1 %d < MaxDpbSize %d",
+        sps->max_dec_pic_buffering_minus1sps->max_sub_layers_minus1,
+        max_dpb_size);
+    max_dpb_size =
+        sps->max_dec_pic_buffering_minus1sps->max_sub_layers_minus1 + 1;
+  } else {
+    /* not reliable values, use 16 */
+    max_dpb_size = 16;
+  }
+
+  return max_dpb_size;
+}
+
+static GstFlowReturn
+gst_h265_decoder_process_sps (GstH265Decoder * self, GstH265SPS * sps)
+{
+  GstH265DecoderPrivate *priv = self->priv;
+  gint max_dpb_size;
+  gint prev_max_dpb_size;
+  guint8 field_seq_flag = 0;
+  guint8 progressive_source_flag = 0;
+  guint8 interlaced_source_flag = 0;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  max_dpb_size = gst_h265_decoder_get_max_dpb_size_from_sps (self, sps);
+
   if (sps->vui_parameters_present_flag)
     field_seq_flag = sps->vui_params.field_seq_flag;
 
@@ -779,7 +868,6 @@
   priv->active_sps = priv->active_pps->sps;
 
   if (!priv->current_picture) {
-    GstH265DecoderClass *klass = GST_H265_DECODER_GET_CLASS (self);
     GstH265Picture *picture;
     GstFlowReturn ret = GST_FLOW_OK;
 
@@ -787,20 +875,11 @@
 
     picture = gst_h265_picture_new ();
     /* This allows accessing the frame from the picture. */
-    picture->system_frame_number = priv->current_frame->system_frame_number;
+    GST_CODEC_PICTURE_FRAME_NUMBER (picture) =
+        priv->current_frame->system_frame_number;
 
     priv->current_picture = picture;
 
-    if (klass->new_picture)
-      ret = klass->new_picture (self, priv->current_frame, picture);
-
-    if (ret != GST_FLOW_OK) {
-      GST_WARNING_OBJECT (self, "subclass does not want accept new picture");
-      priv->current_picture = NULL;
-      gst_h265_picture_unref (picture);
-      return ret;
-    }
-
     ret = gst_h265_decoder_start_current_picture (self);
     if (ret != GST_FLOW_OK) {
       GST_WARNING_OBJECT (self, "start picture failed");
@@ -999,80 +1078,66 @@
     gsize size)
 {
   GstH265DecoderPrivate *priv = self->priv;
-  guint num_nal_arrays;
-  guint off;
-  guint num_nals, i, j;
+  GstH265Parser *parser = priv->parser;
   GstH265ParserResult pres;
-  GstH265NalUnit nalu;
+  GstFlowReturn ret = GST_FLOW_ERROR;
   GstH265VPS vps;
   GstH265SPS sps;
   GstH265PPS pps;
+  GstH265DecoderConfigRecord *config = NULL;
+  guint i, j;
 
-  /* parse the hvcC data */
-  if (size < 23) {
-    GST_WARNING_OBJECT (self, "hvcC too small");
-    return GST_FLOW_ERROR;
-  }
-
-  /* wrong hvcC version */
-  if (data0 != 0 && data0 != 1) {
+  pres = gst_h265_parser_parse_decoder_config_record (parser,
+      data, size, &config);
+  if (pres != GST_H265_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to parse hvcC data");
     return GST_FLOW_ERROR;
   }
 
-  priv->nal_length_size = (data21 & 0x03) + 1;
+  priv->nal_length_size = config->length_size_minus_one + 1;
   GST_DEBUG_OBJECT (self, "nal length size %u", priv->nal_length_size);
 
-  num_nal_arrays = data22;
-  off = 23;
-
-  for (i = 0; i < num_nal_arrays; i++) {
-    if (off + 3 >= size) {
-      GST_WARNING_OBJECT (self, "hvcC too small");
-      return GST_FLOW_ERROR;
-    }
-
-    num_nals = GST_READ_UINT16_BE (data + off + 1);
-    off += 3;
-    for (j = 0; j < num_nals; j++) {
-      pres = gst_h265_parser_identify_nalu_hevc (priv->parser,
-          data, off, size, 2, &nalu);
+  for (i = 0; i < config->nalu_array->len; i++) {
+    GstH265DecoderConfigRecordNalUnitArray *array =
+        &g_array_index (config->nalu_array,
+        GstH265DecoderConfigRecordNalUnitArray, i);
 
-      if (pres != GST_H265_PARSER_OK) {
-        GST_WARNING_OBJECT (self, "hvcC too small");
-        return GST_FLOW_ERROR;
-      }
+    for (j = 0; j < array->nalu->len; j++) {
+      GstH265NalUnit *nalu = &g_array_index (array->nalu, GstH265NalUnit, j);
 
-      switch (nalu.type) {
+      switch (nalu->type) {
         case GST_H265_NAL_VPS:
-          pres = gst_h265_parser_parse_vps (priv->parser, &nalu, &vps);
+          pres = gst_h265_parser_parse_vps (parser, nalu, &vps);
           if (pres != GST_H265_PARSER_OK) {
             GST_WARNING_OBJECT (self, "Failed to parse VPS");
-            return GST_FLOW_ERROR;
+            goto out;
           }
           break;
         case GST_H265_NAL_SPS:
-          pres = gst_h265_parser_parse_sps (priv->parser, &nalu, &sps, TRUE);
+          pres = gst_h265_parser_parse_sps (parser, nalu, &sps, TRUE);
           if (pres != GST_H265_PARSER_OK) {
             GST_WARNING_OBJECT (self, "Failed to parse SPS");
-            return GST_FLOW_ERROR;
+            goto out;
           }
           break;
         case GST_H265_NAL_PPS:
-          pres = gst_h265_parser_parse_pps (priv->parser, &nalu, &pps);
+          pres = gst_h265_parser_parse_pps (parser, nalu, &pps);
           if (pres != GST_H265_PARSER_OK) {
             GST_WARNING_OBJECT (self, "Failed to parse PPS");
-            return GST_FLOW_ERROR;
+            goto out;
           }
           break;
         default:
           break;
       }
-
-      off = nalu.offset + nalu.size;
     }
   }
 
-  return GST_FLOW_OK;
+  ret = GST_FLOW_OK;
+
+out:
+  gst_h265_decoder_config_record_free (config);
+  return ret;
 }
 
 static gboolean
@@ -1646,7 +1711,6 @@
   GstH265DecoderPrivate *priv = self->priv;
   GstVideoCodecFrame *frame = NULL;
   GstH265DecoderOutputFrame output_frame;
-  GstFlowReturn flow_ret = GST_FLOW_OK;
 
   g_assert (ret != NULL);
 
@@ -1662,12 +1726,12 @@
   priv->last_output_poc = picture->pic_order_cnt;
 
   frame = gst_video_decoder_get_frame (GST_VIDEO_DECODER (self),
-      picture->system_frame_number);
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture));
 
   if (!frame) {
     GST_ERROR_OBJECT (self,
         "No available codec frame with frame number %d",
-        picture->system_frame_number);
+        GST_CODEC_PICTURE_FRAME_NUMBER (picture));
     UPDATE_FLOW_RETURN (ret, GST_FLOW_ERROR);
 
     gst_h265_picture_unref (picture);
@@ -1680,8 +1744,7 @@
   gst_queue_array_push_tail_struct (priv->output_queue, &output_frame);
 
   gst_h265_decoder_drain_output_queue (self, priv->preferred_output_delay,
-      &flow_ret);
-  UPDATE_FLOW_RETURN (ret, flow_ret);
+      &priv->last_flow);
 }
 
 static void
@@ -1696,7 +1759,7 @@
   if (!flush) {
     while ((picture = gst_h265_dpb_bump (priv->dpb, TRUE)) != NULL) {
       GstVideoCodecFrame *frame = gst_video_decoder_get_frame (decoder,
-          picture->system_frame_number);
+          GST_CODEC_PICTURE_FRAME_NUMBER (picture));
 
       if (frame)
         gst_video_decoder_release_frame (decoder, frame);
@@ -1741,7 +1804,7 @@
   if (slice->clear_dpb) {
     if (picture->NoOutputOfPriorPicsFlag) {
       GST_DEBUG_OBJECT (self, "Clear dpb");
-      gst_h265_decoder_drain_output_queue (self, 0, &ret);
+      gst_h265_decoder_drain_output_queue (self, 0, &priv->last_flow);
       gst_h265_decoder_clear_dpb (self, FALSE);
     } else {
       gst_h265_dpb_delete_unused (priv->dpb);
@@ -1757,12 +1820,28 @@
       }
     }
   } else {
+    /* TODO: According to 7.4.3.3.3, TwoVersionsOfCurrDecPicFlag
+     * should be considered.
+     *
+     * NOTE: (See 8.1.3) if TwoVersionsOfCurrDecPicFlag is 1,
+     * current picture requires two picture buffers allocated in DPB storage,
+     * one is decoded picture *after* in-loop filter, and the other is
+     * decoded picture *before* in-loop filter, so that current picture
+     * can be used as a reference of the current picture
+     * (e.g., intra block copy method in SCC).
+     * Here TwoVersionsOfCurrDecPicFlag takes effect in order to ensure
+     * at least two empty DPB buffer before starting current picture decoding.
+     *
+     * However, two DPB picture allocation is not implemented
+     * in current baseclass (which would imply that we are doing reference
+     * picture management wrongly in case of SCC).
+     * Let's ignore TwoVersionsOfCurrDecPicFlag for now */
+    guint max_dec_pic_buffering =
+        sps->max_dec_pic_buffering_minus1sps->max_sub_layers_minus1 + 1;
     gst_h265_dpb_delete_unused (priv->dpb);
     while (gst_h265_dpb_needs_bump (priv->dpb,
             sps->max_num_reorder_picssps->max_sub_layers_minus1,
-            priv->SpsMaxLatencyPictures,
-            sps->max_dec_pic_buffering_minus1sps->max_sub_layers_minus1 +
-            1)) {
+            priv->SpsMaxLatencyPictures, max_dec_pic_buffering)) {
       to_output = gst_h265_dpb_bump (priv->dpb, FALSE);
 
       /* Something wrong... */
@@ -1797,18 +1876,10 @@
   if (GST_H265_IS_NAL_TYPE_RASL (priv->current_slice.nalu.type) &&
       priv->associated_irap_NoRaslOutputFlag) {
     GST_DEBUG_OBJECT (self, "Drop current picture");
-    gst_h265_picture_replace (&priv->current_picture, NULL);
+    gst_clear_h265_picture (&priv->current_picture);
     return GST_FLOW_OK;
   }
 
-  /* If subclass didn't update output state at this point,
-   * marking this picture as a discont and stores current input state */
-  if (priv->input_state_changed) {
-    priv->current_picture->discont_state =
-        gst_video_codec_state_ref (self->input_state);
-    priv->input_state_changed = FALSE;
-  }
-
   if (!gst_h265_decoder_prepare_rps (self, &priv->current_slice,
           priv->current_picture)) {
     GST_WARNING_OBJECT (self, "Failed to prepare ref pic set");
@@ -1820,20 +1891,40 @@
       &priv->current_slice, priv->current_picture);
   if (ret != GST_FLOW_OK) {
     GST_WARNING_OBJECT (self, "Failed to init dpb");
+    gst_clear_h265_picture (&priv->current_picture);
     return ret;
   }
 
   klass = GST_H265_DECODER_GET_CLASS (self);
+
+  if (klass->new_picture)
+    ret = klass->new_picture (self, priv->current_frame, priv->current_picture);
+
+  if (ret != GST_FLOW_OK) {
+    GST_WARNING_OBJECT (self, "subclass does not want accept new picture");
+    gst_clear_h265_picture (&priv->current_picture);
+    return ret;
+  }
+
   if (klass->start_picture) {
     ret = klass->start_picture (self, priv->current_picture,
         &priv->current_slice, priv->dpb);
 
     if (ret != GST_FLOW_OK) {
       GST_WARNING_OBJECT (self, "subclass does not want to start picture");
+      gst_clear_h265_picture (&priv->current_picture);
       return ret;
     }
   }
 
+  /* If subclass didn't update output state at this point,
+   * marking this picture as a discont and stores current input state */
+  if (priv->input_state_changed) {
+    gst_h265_picture_set_discont_state (priv->current_picture,
+        self->input_state);
+    priv->input_state_changed = FALSE;
+  }
+
   return GST_FLOW_OK;
 }
 
@@ -1856,7 +1947,7 @@
   /* This picture is decode only, drop corresponding frame */
   if (!picture->output_flag) {
     GstVideoCodecFrame *frame = gst_video_decoder_get_frame (decoder,
-        picture->system_frame_number);
+        GST_CODEC_PICTURE_FRAME_NUMBER (picture));
 
     gst_video_decoder_release_frame (decoder, frame);
   }
@@ -1949,6 +2040,7 @@
 
   gst_h265_decoder_reset_frame_state (self);
 
+  priv->last_flow = GST_FLOW_OK;
   priv->current_frame = frame;
 
   if (!gst_buffer_map (in_buf, &map, GST_MAP_READ)) {
@@ -2016,7 +2108,7 @@
           ("Failed to decode data"), (NULL), decode_ret);
     }
 
-    gst_video_decoder_drop_frame (decoder, frame);
+    gst_video_decoder_release_frame (decoder, frame);
     gst_clear_h265_picture (&priv->current_picture);
 
     return decode_ret;
@@ -2030,6 +2122,12 @@
     gst_video_decoder_release_frame (decoder, frame);
   }
 
+  if (priv->last_flow != GST_FLOW_OK) {
+    GST_DEBUG_OBJECT (self,
+        "Last flow %s", gst_flow_get_name (priv->last_flow));
+    return priv->last_flow;
+  }
+
   if (decode_ret == GST_FLOW_ERROR) {
     GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
         ("Failed to decode data"), (NULL), decode_ret);

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gsth265decoder.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gsth265decoder.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gsth265picture.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gsth265picture.c Changed

@@ -22,24 +22,13 @@
 #endif
 
 #include "gsth265picture.h"
+#include "gstcodecpicture-private.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gst_h265_decoder_debug);
 #define GST_CAT_DEFAULT gst_h265_decoder_debug
 
 GST_DEFINE_MINI_OBJECT_TYPE (GstH265Picture, gst_h265_picture);
 
-static void
-_gst_h265_picture_free (GstH265Picture * picture)
-{
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  if (picture->discont_state)
-    gst_video_codec_state_unref (picture->discont_state);
-
-  g_free (picture);
-}
-
 /**
  * gst_h265_picture_new:
  *
@@ -62,51 +51,11 @@
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (pic), 0,
       GST_TYPE_H265_PICTURE, NULL, NULL,
-      (GstMiniObjectFreeFunction) _gst_h265_picture_free);
+      (GstMiniObjectFreeFunction) gst_codec_picture_free);
 
   return pic;
 }
 
-/**
- * gst_h265_picture_set_user_data:
- * @picture: a #GstH265Picture
- * @user_data: (nullable): private data
- * @notify: (closure user_data): a #GDestroyNotify
- *
- * Sets @user_data on the picture and the #GDestroyNotify that will be called when
- * the picture is freed.
- *
- * If a @user_data was previously set, then the previous set @notify will be called
- * before the @user_data is replaced.
- */
-void
-gst_h265_picture_set_user_data (GstH265Picture * picture, gpointer user_data,
-    GDestroyNotify notify)
-{
-  g_return_if_fail (GST_IS_H265_PICTURE (picture));
-
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  picture->user_data = user_data;
-  picture->notify = notify;
-}
-
-/**
- * gst_h265_picture_get_user_data:
- * @picture: a #GstH265Picture
- *
- * Gets private data set on the picture via
- * gst_h265_picture_set_user_data() previously.
- *
- * Returns: (transfer none) (nullable): The previously set user_data
- */
-gpointer
-gst_h265_picture_get_user_data (GstH265Picture * picture)
-{
-  return picture->user_data;
-}
-
 struct _GstH265Dpb
 {
   GArray *pic_list;
@@ -331,7 +280,7 @@
       return gst_h265_picture_ref (picture);
   }
 
-  GST_DEBUG ("No short term reference picture for %d", poc);
+  GST_DEBUG ("No reference picture for poc %d", poc);
 
   return NULL;
 }
@@ -360,7 +309,7 @@
       return gst_h265_picture_ref (picture);
   }
 
-  GST_DEBUG ("No short term reference picture for %d", poc_lsb);
+  GST_DEBUG ("No reference picture for poc lsb %d", poc_lsb);
 
   return NULL;
 }
@@ -389,7 +338,7 @@
       return gst_h265_picture_ref (picture);
   }
 
-  GST_DEBUG ("No short term reference picture for %d", poc);
+  GST_DEBUG ("No short term reference picture for poc %d", poc);
 
   return NULL;
 }
@@ -418,7 +367,7 @@
       return gst_h265_picture_ref (picture);
   }
 
-  GST_DEBUG ("No long term reference picture for %d", poc);
+  GST_DEBUG ("No long term reference picture for poc %d", poc);
 
   return NULL;
 }
@@ -474,7 +423,7 @@
     GstH265Picture *picture =
         g_array_index (dpb->pic_list, GstH265Picture *, i);
 
-    if (picture->system_frame_number == system_frame_number) {
+    if (GST_CODEC_PICTURE_FRAME_NUMBER (picture) == system_frame_number) {
       gst_h265_picture_ref (picture);
       return picture;
     }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gsth265picture.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gsth265picture.h Changed

@@ -27,6 +27,7 @@
 
 #include <gst/gst.h>
 #include <gst/codecs/codecs-prelude.h>
+#include <gst/codecs/gstcodecpicture.h>
 #include <gst/codecparsers/gsth265parser.h>
 #include <gst/video/video.h>
 
@@ -60,13 +61,10 @@
 struct _GstH265Picture
 {
   /*< private >*/
-  GstMiniObject parent;
+  GstCodecPicture parent;
 
   GstH265SliceType type;
 
-  /* From GstVideoCodecFrame */
-  guint32 system_frame_number;
-
   gint pic_order_cnt;
   gint pic_order_cnt_msb;
   gint pic_order_cnt_lsb;
@@ -89,12 +87,6 @@
   guint8 duplicate_flag;
 
   GstVideoBufferFlags buffer_flags;
-
-  /* decoder input state if this picture is discont point */
-  GstVideoCodecState *discont_state;
-
-  gpointer user_data;
-  GDestroyNotify notify;
 };
 
 GST_CODECS_API
@@ -132,13 +124,27 @@
   }
 }
 
-GST_CODECS_API
-void gst_h265_picture_set_user_data (GstH265Picture * picture,
-                                     gpointer user_data,
-                                     GDestroyNotify notify);
+static inline void
+gst_h265_picture_set_user_data (GstH265Picture * picture, gpointer user_data,
+    GDestroyNotify notify)
+{
+  gst_codec_picture_set_user_data (GST_CODEC_PICTURE (picture),
+      user_data, notify);
+}
 
-GST_CODECS_API
-gpointer gst_h265_picture_get_user_data (GstH265Picture * picture);
+static inline gpointer
+gst_h265_picture_get_user_data (GstH265Picture * picture)
+{
+  return gst_codec_picture_get_user_data (GST_CODEC_PICTURE (picture));
+}
+
+static inline void
+gst_h265_picture_set_discont_state (GstH265Picture * picture,
+    GstVideoCodecState * discont_state)
+{
+  gst_codec_picture_set_discont_state (GST_CODEC_PICTURE (picture),
+      discont_state);
+}
 
 /*******************
  * GstH265Dpb *

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstmpeg2decoder.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstmpeg2decoder.c Changed

@@ -269,6 +269,8 @@
   gboolean is_live;
 
   gboolean input_state_changed;
+
+  GstFlowReturn last_flow;
 };
 
 #define UPDATE_FLOW_RETURN(ret,new_ret) G_STMT_START { \
@@ -352,6 +354,7 @@
   priv->dpb = gst_mpeg2_dpb_new ();
   priv->profile = -1;
   priv->progressive = TRUE;
+  priv->last_flow = GST_FLOW_OK;
 
   priv->output_queue =
       gst_queue_array_new_for_struct (sizeof (GstMpeg2DecoderOutputFrame), 1);
@@ -802,8 +805,8 @@
         &priv->seq_display_ext : NULL,
         _seq_scalable_ext_is_valid (&priv->seq_scalable_ext) ?
         &priv->seq_scalable_ext : NULL,
-        /* previous/next 2 pictures */
-        2 + priv->preferred_output_delay);
+        /* previous/next 2 pictures + current picture */
+        3 + priv->preferred_output_delay);
 
     if (ret != GST_FLOW_OK) {
       GST_WARNING_OBJECT (decoder, "new sequence error");
@@ -838,8 +841,8 @@
   /* If subclass didn't update output state at this point,
    * marking this picture as a discont and stores current input state */
   if (priv->input_state_changed) {
-    priv->current_picture->discont_state =
-        gst_video_codec_state_ref (decoder->input_state);
+    gst_mpeg2_picture_set_discont_state (priv->current_picture,
+        decoder->input_state);
     priv->input_state_changed = FALSE;
   }
 
@@ -939,7 +942,8 @@
 
   picture->needed_for_output = TRUE;
   /* This allows accessing the frame from the picture. */
-  picture->system_frame_number = priv->current_frame->system_frame_number;
+  GST_CODEC_PICTURE_FRAME_NUMBER (picture) =
+      priv->current_frame->system_frame_number;
   picture->type = priv->pic_hdr.pic_type;
   picture->tsn = priv->pic_hdr.tsn;
   priv->current_pts =
@@ -953,8 +957,8 @@
       picture,
       (picture->structure == GST_MPEG_VIDEO_PICTURE_STRUCTURE_FRAME) ?
       "frame" : "field",
-      picture->system_frame_number, picture->pic_order_cnt, picture->type,
-      picture->first_field);
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture),
+      picture->pic_order_cnt, picture->type, picture->first_field);
 
   return gst_mpeg2_decoder_start_current_picture (decoder, slice);
 }
@@ -1063,7 +1067,8 @@
   if (ret != GST_FLOW_OK) {
     GST_WARNING_OBJECT (decoder,
         "Subclass didn't want to decode picture %p (frame_num %d, poc %d)",
-        priv->current_picture, priv->current_picture->system_frame_number,
+        priv->current_picture,
+        GST_CODEC_PICTURE_FRAME_NUMBER (priv->current_picture),
         priv->current_picture->pic_order_cnt);
     return ret;
   }
@@ -1152,12 +1157,12 @@
 
   frame =
       gst_video_decoder_get_frame (GST_VIDEO_DECODER (decoder),
-      to_output->system_frame_number);
+      GST_CODEC_PICTURE_FRAME_NUMBER (to_output));
 
   if (!frame) {
     GST_ERROR_OBJECT (decoder,
         "No available codec frame with frame number %d",
-        to_output->system_frame_number);
+        GST_CODEC_PICTURE_FRAME_NUMBER (to_output));
     UPDATE_FLOW_RETURN (ret, GST_FLOW_ERROR);
 
     gst_mpeg2_picture_unref (to_output);
@@ -1170,7 +1175,7 @@
   output_frame.self = decoder;
   gst_queue_array_push_tail_struct (priv->output_queue, &output_frame);
   gst_mpeg2_decoder_drain_output_queue (decoder, priv->preferred_output_delay,
-      ret);
+      &priv->last_flow);
 }
 
 static GstFlowReturn
@@ -1194,7 +1199,8 @@
 
   GST_LOG_OBJECT (decoder,
       "Add picture %p (frame_num %d, poc %d, type 0x%x), into DPB", picture,
-      picture->system_frame_number, picture->pic_order_cnt, picture->type);
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture), picture->pic_order_cnt,
+      picture->type);
 
   while (gst_mpeg2_dpb_need_bump (priv->dpb)) {
     GstMpeg2Picture *to_output;
@@ -1244,6 +1250,7 @@
       GST_TIME_ARGS (GST_BUFFER_DTS (in_buf)), frame->system_frame_number);
 
   priv->state &= ~GST_MPEG2_DECODER_STATE_GOT_SLICE;
+  priv->last_flow = GST_FLOW_OK;
 
   priv->current_frame = frame;
   gst_buffer_map (in_buf, &map_info, GST_MAP_READ);
@@ -1294,6 +1301,18 @@
   gst_clear_mpeg2_picture (&priv->first_field);
   gst_video_codec_frame_unref (priv->current_frame);
   priv->current_frame = NULL;
+
+  if (priv->last_flow != GST_FLOW_OK) {
+    GST_DEBUG_OBJECT (self,
+        "Last flow %s", gst_flow_get_name (priv->last_flow));
+    return priv->last_flow;
+  }
+
+  if (ret == GST_FLOW_ERROR) {
+    GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
+        ("Failed to decode data"), (NULL), ret);
+  }
+
   return ret;
 
 failed:
@@ -1304,7 +1323,7 @@
           ret);
     }
 
-    gst_video_decoder_drop_frame (decoder, frame);
+    gst_video_decoder_release_frame (decoder, frame);
     gst_clear_mpeg2_picture (&priv->current_picture);
     gst_clear_mpeg2_picture (&priv->first_field);
     priv->current_frame = NULL;
@@ -1329,7 +1348,8 @@
     GST_LOG_OBJECT (self,
         "Output picture %p (frame_num %d, poc %d, pts: %" GST_TIME_FORMAT
         "), from DPB",
-        output_frame->picture, output_frame->picture->system_frame_number,
+        output_frame->picture,
+        GST_CODEC_PICTURE_FRAME_NUMBER (output_frame->picture),
         output_frame->picture->pic_order_cnt,
         GST_TIME_ARGS (output_frame->frame->pts));

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstmpeg2decoder.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstmpeg2decoder.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstmpeg2picture.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstmpeg2picture.c Changed

@@ -23,6 +23,7 @@
 #endif
 
 #include "gstmpeg2picture.h"
+#include "gstcodecpicture-private.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gst_mpeg2_decoder_debug);
 #define GST_CAT_DEFAULT gst_mpeg2_decoder_debug
@@ -37,13 +38,7 @@
   if (picture->first_field)
     gst_mpeg2_picture_unref (picture->first_field);
 
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  if (picture->discont_state)
-    gst_video_codec_state_unref (picture->discont_state);
-
-  g_free (picture);
+  gst_codec_picture_free (GST_CODEC_PICTURE (picture));
 }
 
 /**
@@ -74,50 +69,6 @@
   return pic;
 }
 
-/**
- * gst_mpeg2_picture_set_user_data:
- * @picture: a #GstMpeg2Picture
- * @user_data: private data
- * @notify: (closure user_data): a #GDestroyNotify
- *
- * Sets @user_data on the picture and the #GDestroyNotify that will be called when
- * the picture is freed.
- *
- * If a @user_data was previously set, then the previous set @notify will be called
- * before the @user_data is replaced.
- *
- * Since: 1.20
- */
-void
-gst_mpeg2_picture_set_user_data (GstMpeg2Picture * picture, gpointer user_data,
-    GDestroyNotify notify)
-{
-  g_return_if_fail (GST_IS_MPEG2_PICTURE (picture));
-
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  picture->user_data = user_data;
-  picture->notify = notify;
-}
-
-/**
- * gst_mpeg2_picture_get_user_data:
- * @picture: a #GstMpeg2Picture
- *
- * Gets private data set on the picture via
- * gst_mpeg2_picture_set_user_data() previously.
- *
- * Returns: (transfer none): The previously set user_data
- *
- * Since: 1.20
- */
-gpointer
-gst_mpeg2_picture_get_user_data (GstMpeg2Picture * picture)
-{
-  return picture->user_data;
-}
-
 struct _GstMpeg2Dpb
 {
   GstMpeg2Picture *ref_pic_list2;

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstmpeg2picture.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstmpeg2picture.h Changed

@@ -22,6 +22,7 @@
 #define __GST_MPEG2_PICTURE_H__
 
 #include <gst/codecs/codecs-prelude.h>
+#include <gst/codecs/gstcodecpicture.h>
 #include <gst/codecparsers/gstmpegvideoparser.h>
 #include <gst/video/video.h>
 
@@ -79,10 +80,8 @@
 struct _GstMpeg2Picture
 {
   /*< private >*/
-  GstMiniObject parent;
+  GstCodecPicture parent;
 
-  /* From GstVideoCodecFrame */
-  guint32 system_frame_number;
   gboolean needed_for_output;
   /* For interlaced streams */
   GstMpeg2Picture *first_field;
@@ -93,12 +92,6 @@
   gint tsn;
   GstMpegVideoPictureStructure structure;
   GstMpegVideoPictureType type;
-
-  /* decoder input state if this picture is discont point */
-  GstVideoCodecState *discont_state;
-
-  gpointer user_data;
-  GDestroyNotify notify;
 };
 
 /**
@@ -148,14 +141,27 @@
   }
 }
 
-GST_CODECS_API
-void gst_mpeg2_picture_set_user_data (GstMpeg2Picture * picture,
-                                      gpointer user_data,
-                                      GDestroyNotify notify);
+static inline void
+gst_mpeg2_picture_set_user_data (GstMpeg2Picture * picture, gpointer user_data,
+    GDestroyNotify notify)
+{
+  gst_codec_picture_set_user_data (GST_CODEC_PICTURE (picture),
+      user_data, notify);
+}
 
-GST_CODECS_API
-gpointer gst_mpeg2_picture_get_user_data (GstMpeg2Picture * picture);
+static inline gpointer
+gst_mpeg2_picture_get_user_data (GstMpeg2Picture * picture)
+{
+  return gst_codec_picture_get_user_data (GST_CODEC_PICTURE (picture));
+}
 
+static inline void
+gst_mpeg2_picture_set_discont_state (GstMpeg2Picture * picture,
+    GstVideoCodecState * discont_state)
+{
+  gst_codec_picture_set_discont_state (GST_CODEC_PICTURE (picture),
+      discont_state);
+}
 
 /**
  * GstMpeg2Dpb:

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstvp8decoder.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstvp8decoder.c Changed

@@ -193,8 +193,8 @@
     g_assert (klass->new_sequence);
 
     ret = klass->new_sequence (self, frame_hdr,
-        /* last/golden/alt 3 pictures */
-        3 + priv->preferred_output_delay);
+        /* last/golden/alt 3 reference pictures + current picture */
+        4 + priv->preferred_output_delay);
   }
 
   return ret;
@@ -375,6 +375,7 @@
   GstVp8ParserResult pres;
   GstVp8Picture *picture = NULL;
   GstFlowReturn ret = GST_FLOW_OK;
+  GstFlowReturn output_ret = GST_FLOW_OK;
   GstVp8DecoderOutputFrame output_frame;
 
   GST_LOG_OBJECT (self,
@@ -403,7 +404,7 @@
           GST_PTR_FORMAT, in_buf);
 
       gst_buffer_unmap (in_buf, &map);
-      gst_video_decoder_drop_frame (decoder, frame);
+      gst_video_decoder_release_frame (decoder, frame);
 
       return GST_FLOW_OK;
     }
@@ -421,10 +422,9 @@
 
   picture = gst_vp8_picture_new ();
   picture->frame_hdr = frame_hdr;
-  picture->pts = GST_BUFFER_PTS (in_buf);
   picture->data = map.data;
   picture->size = map.size;
-  picture->system_frame_number = frame->system_frame_number;
+  GST_CODEC_PICTURE_FRAME_NUMBER (picture) = frame->system_frame_number;
 
   if (klass->new_picture) {
     ret = klass->new_picture (self, frame, picture);
@@ -473,7 +473,7 @@
     /* If subclass didn't update output state at this point,
      * marking this picture as a discont and stores current input state */
     if (priv->input_state_changed) {
-      picture->discont_state = gst_video_codec_state_ref (self->input_state);
+      gst_vp8_picture_set_discont_state (picture, self->input_state);
       priv->input_state_changed = FALSE;
     }
 
@@ -483,7 +483,13 @@
     gst_queue_array_push_tail_struct (priv->output_queue, &output_frame);
   }
 
-  gst_vp8_decoder_drain_output_queue (self, priv->preferred_output_delay, &ret);
+  gst_vp8_decoder_drain_output_queue (self, priv->preferred_output_delay,
+      &output_ret);
+  if (output_ret != GST_FLOW_OK) {
+    GST_DEBUG_OBJECT (self,
+        "Output returned %s", gst_flow_get_name (output_ret));
+    return output_ret;
+  }
 
   if (ret == GST_FLOW_ERROR) {
     GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
@@ -509,7 +515,7 @@
           ("Failed to decode data"), (NULL), ret);
     }
 
-    gst_video_decoder_drop_frame (decoder, frame);
+    gst_video_decoder_release_frame (decoder, frame);
 
     return ret;
   }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstvp8decoder.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstvp8decoder.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstvp8picture.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstvp8picture.c Changed

@@ -22,26 +22,13 @@
 #endif
 
 #include "gstvp8picture.h"
+#include "gstcodecpicture-private.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gst_vp8_decoder_debug);
 #define GST_CAT_DEFAULT gst_vp8_decoder_debug
 
 GST_DEFINE_MINI_OBJECT_TYPE (GstVp8Picture, gst_vp8_picture);
 
-static void
-_gst_vp8_picture_free (GstVp8Picture * picture)
-{
-  GST_TRACE ("Free picture %p", picture);
-
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  if (picture->discont_state)
-    gst_video_codec_state_unref (picture->discont_state);
-
-  g_free (picture);
-}
-
 /**
  * gst_vp8_picture_new:
  *
@@ -55,53 +42,12 @@
   GstVp8Picture *pic;
 
   pic = g_new0 (GstVp8Picture, 1);
-  pic->pts = GST_CLOCK_TIME_NONE;
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (pic), 0,
       GST_TYPE_VP8_PICTURE, NULL, NULL,
-      (GstMiniObjectFreeFunction) _gst_vp8_picture_free);
+      (GstMiniObjectFreeFunction) gst_codec_picture_free);
 
   GST_TRACE ("New picture %p", pic);
 
   return pic;
 }
-
-/**
- * gst_vp8_picture_set_user_data:
- * @picture: a #GstVp8Picture
- * @user_data: private data
- * @notify: (closure user_data): a #GDestroyNotify
- *
- * Sets @user_data on the picture and the #GDestroyNotify that will be called when
- * the picture is freed.
- *
- * If a @user_data was previously set, then the previous set @notify will be called
- * before the @user_data is replaced.
- */
-void
-gst_vp8_picture_set_user_data (GstVp8Picture * picture, gpointer user_data,
-    GDestroyNotify notify)
-{
-  g_return_if_fail (GST_IS_VP8_PICTURE (picture));
-
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  picture->user_data = user_data;
-  picture->notify = notify;
-}
-
-/**
- * gst_vp8_picture_get_user_data:
- * @picture: a #GstVp8Picture
- *
- * Gets private data set on the picture via
- * gst_vp8_picture_set_user_data() previously.
- *
- * Returns: (transfer none): The previously set user_data
- */
-gpointer
-gst_vp8_picture_get_user_data (GstVp8Picture * picture)
-{
-  return picture->user_data;
-}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstvp8picture.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstvp8picture.h Changed

@@ -21,6 +21,7 @@
 #define __GST_VP8_PICTURE_H__
 
 #include <gst/codecs/codecs-prelude.h>
+#include <gst/codecs/gstcodecpicture.h>
 #include <gst/codecparsers/gstvp8parser.h>
 #include <gst/video/video.h>
 
@@ -36,23 +37,13 @@
 struct _GstVp8Picture
 {
   /*< private >*/
-  GstMiniObject parent;
-
-  GstClockTime pts;
-  /* From GstVideoCodecFrame */
-  guint32 system_frame_number;
+  GstCodecPicture parent;
 
   GstVp8FrameHdr frame_hdr;
 
   /* raw data and size (does not have ownership) */
   const guint8 * data;
   gsize size;
-
-  /* decoder input state if this picture is discont point */
-  GstVideoCodecState *discont_state;
-
-  gpointer user_data;
-  GDestroyNotify notify;
 };
 
 GST_CODECS_API
@@ -90,13 +81,27 @@
   }
 }
 
-GST_CODECS_API
-void gst_vp8_picture_set_user_data (GstVp8Picture * picture,
-                                    gpointer user_data,
-                                    GDestroyNotify notify);
+static inline void
+gst_vp8_picture_set_user_data (GstVp8Picture * picture, gpointer user_data,
+    GDestroyNotify notify)
+{
+  gst_codec_picture_set_user_data (GST_CODEC_PICTURE (picture),
+      user_data, notify);
+}
 
-GST_CODECS_API
-gpointer gst_vp8_picture_get_user_data (GstVp8Picture * picture);
+static inline gpointer
+gst_vp8_picture_get_user_data (GstVp8Picture * picture)
+{
+  return gst_codec_picture_get_user_data (GST_CODEC_PICTURE (picture));
+}
+
+static inline void
+gst_vp8_picture_set_discont_state (GstVp8Picture * picture,
+    GstVideoCodecState * discont_state)
+{
+  gst_codec_picture_set_discont_state (GST_CODEC_PICTURE (picture),
+      discont_state);
+}
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstvp9decoder.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstvp9decoder.c Changed

@@ -251,7 +251,8 @@
   }
 
   ret = klass->new_sequence (self, frame_hdr,
-      GST_VP9_REF_FRAMES + priv->preferred_output_delay);
+      /* +1 for the current frame */
+      GST_VP9_REF_FRAMES + 1 + priv->preferred_output_delay);
 
   if (ret != GST_FLOW_OK)
     priv->had_sequence = FALSE;
@@ -376,6 +377,7 @@
   GstVp9ParserResult pres;
   GstMapInfo map;
   GstFlowReturn ret = GST_FLOW_OK;
+  GstFlowReturn output_ret = GST_FLOW_OK;
   gboolean intra_only = FALSE;
   gboolean check_codec_change = FALSE;
   GstVp9DecoderOutputFrame output_frame;
@@ -490,11 +492,11 @@
       goto unmap_and_error;
     }
 
-    picture->system_frame_number = pic_to_dup->system_frame_number;
+    GST_CODEC_PICTURE_COPY_FRAME_NUMBER (picture, pic_to_dup);
   } else {
     picture = gst_vp9_picture_new ();
     picture->frame_hdr = frame_hdr;
-    picture->system_frame_number = frame->system_frame_number;
+    GST_CODEC_PICTURE_FRAME_NUMBER (picture) = frame->system_frame_number;
     picture->data = map.data;
     picture->size = map.size;
 
@@ -550,7 +552,7 @@
     /* If subclass didn't update output state at this point,
      * marking this picture as a discont and stores current input state */
     if (priv->input_state_changed) {
-      picture->discont_state = gst_video_codec_state_ref (self->input_state);
+      gst_vp9_picture_set_discont_state (picture, self->input_state);
       priv->input_state_changed = FALSE;
     }
 
@@ -560,7 +562,13 @@
     gst_queue_array_push_tail_struct (priv->output_queue, &output_frame);
   }
 
-  gst_vp9_decoder_drain_output_queue (self, priv->preferred_output_delay, &ret);
+  gst_vp9_decoder_drain_output_queue (self,
+      priv->preferred_output_delay, &output_ret);
+  if (output_ret != GST_FLOW_OK) {
+    GST_DEBUG_OBJECT (self,
+        "Output returned %s", gst_flow_get_name (output_ret));
+    return output_ret;
+  }
 
   if (ret == GST_FLOW_ERROR) {
     GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
@@ -586,7 +594,7 @@
           ("Failed to decode data"), (NULL), ret);
     }
 
-    gst_video_decoder_drop_frame (decoder, frame);
+    gst_video_decoder_release_frame (decoder, frame);
 
     return ret;
   }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstvp9decoder.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstvp9decoder.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstvp9picture.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstvp9picture.c Changed

@@ -22,26 +22,13 @@
 #endif
 
 #include "gstvp9picture.h"
+#include "gstcodecpicture-private.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gst_vp9_decoder_debug);
 #define GST_CAT_DEFAULT gst_vp9_decoder_debug
 
 GST_DEFINE_MINI_OBJECT_TYPE (GstVp9Picture, gst_vp9_picture);
 
-static void
-_gst_vp9_picture_free (GstVp9Picture * picture)
-{
-  GST_TRACE ("Free picture %p", picture);
-
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  if (picture->discont_state)
-    gst_video_codec_state_unref (picture->discont_state);
-
-  g_free (picture);
-}
-
 /**
  * gst_vp9_picture_new:
  *
@@ -58,7 +45,7 @@
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (pic), 0,
       GST_TYPE_VP9_PICTURE, NULL, NULL,
-      (GstMiniObjectFreeFunction) _gst_vp9_picture_free);
+      (GstMiniObjectFreeFunction) gst_codec_picture_free);
 
   GST_TRACE ("New picture %p", pic);
 
@@ -66,46 +53,6 @@
 }
 
 /**
- * gst_vp9_picture_set_user_data:
- * @picture: a #GstVp9Picture
- * @user_data: private data
- * @notify: (closure user_data): a #GDestroyNotify
- *
- * Sets @user_data on the picture and the #GDestroyNotify that will be called when
- * the picture is freed.
- *
- * If a @user_data was previously set, then the previous set @notify will be called
- * before the @user_data is replaced.
- */
-void
-gst_vp9_picture_set_user_data (GstVp9Picture * picture, gpointer user_data,
-    GDestroyNotify notify)
-{
-  g_return_if_fail (GST_IS_VP9_PICTURE (picture));
-
-  if (picture->notify)
-    picture->notify (picture->user_data);
-
-  picture->user_data = user_data;
-  picture->notify = notify;
-}
-
-/**
- * gst_vp9_picture_get_user_data:
- * @picture: a #GstVp9Picture
- *
- * Gets private data set on the picture via
- * gst_vp9_picture_set_user_data() previously.
- *
- * Returns: (transfer none): The previously set user_data
- */
-gpointer
-gst_vp9_picture_get_user_data (GstVp9Picture * picture)
-{
-  return picture->user_data;
-}
-
-/**
  * gst_vp9_dpb_new: (skip)
  *
  * Create new #GstVp9Dpb

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/gstvp9picture.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/gstvp9picture.h Changed

@@ -21,6 +21,7 @@
 #define __GST_VP9_PICTURE_H__
 
 #include <gst/codecs/codecs-prelude.h>
+#include <gst/codecs/gstcodecpicture.h>
 #include <gst/codecs/gstvp9statefulparser.h>
 #include <gst/video/video.h>
 
@@ -36,22 +37,13 @@
 struct _GstVp9Picture
 {
   /*< private >*/
-  GstMiniObject parent;
-
-  /* From GstVideoCodecFrame */
-  guint32 system_frame_number;
+  GstCodecPicture parent;
 
   GstVp9FrameHeader frame_hdr;
 
   /* raw data and size (does not have ownership) */
   const guint8 * data;
   gsize size;
-
-  /* decoder input state if this picture is discont point */
-  GstVideoCodecState *discont_state;
-
-  gpointer user_data;
-  GDestroyNotify notify;
 };
 
 GST_CODECS_API
@@ -89,13 +81,27 @@
   }
 }
 
-GST_CODECS_API
-void gst_vp9_picture_set_user_data (GstVp9Picture * picture,
-                                    gpointer user_data,
-                                    GDestroyNotify notify);
+static inline void
+gst_vp9_picture_set_user_data (GstVp9Picture * picture, gpointer user_data,
+    GDestroyNotify notify)
+{
+  gst_codec_picture_set_user_data (GST_CODEC_PICTURE (picture),
+      user_data, notify);
+}
 
-GST_CODECS_API
-gpointer gst_vp9_picture_get_user_data (GstVp9Picture * picture);
+static inline gpointer
+gst_vp9_picture_get_user_data (GstVp9Picture * picture)
+{
+  return gst_codec_picture_get_user_data (GST_CODEC_PICTURE (picture));
+}
+
+static inline void
+gst_vp9_picture_set_discont_state (GstVp9Picture * picture,
+    GstVideoCodecState * discont_state)
+{
+  gst_codec_picture_set_discont_state (GST_CODEC_PICTURE (picture),
+      discont_state);
+}
 
 /*******************
  * GstVp9Dpb *

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/codecs/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/codecs/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/cuda-gst.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/cuda-gst.h Changed

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cuda-prelude.h"
+#include <gst/cuda/cuda-prelude.h>
 #include <cuda.h>
 #include <cudaGL.h>
 
@@ -169,6 +169,108 @@
                                        void **kernelParams,
                                        void **extra);
 
+GST_CUDA_API
+CUresult CUDAAPI CuEventCreate       (CUevent *phEvent,
+                                      unsigned int Flags);
+
+GST_CUDA_API
+CUresult CUDAAPI CuEventDestroy      (CUevent hEvent);
+
+GST_CUDA_API
+CUresult CUDAAPI CuEventRecord       (CUevent hEvent,
+                                      CUstream hStream);
+
+GST_CUDA_API
+CUresult CUDAAPI CuEventSynchronize  (CUevent hEvent);
+
+GST_CUDA_API
+CUresult CUDAAPI CuIpcGetEventHandle (CUipcEventHandle *pHandle,
+                                      CUevent event);
+
+GST_CUDA_API
+CUresult CUDAAPI CuIpcOpenEventHandle (CUevent* phEvent,
+                                       CUipcEventHandle handle);
+
+GST_CUDA_API
+CUresult CUDAAPI CuIpcGetMemHandle   (CUipcMemHandle *pHandle,
+                                      CUdeviceptr dptr);
+
+GST_CUDA_API
+CUresult CUDAAPI CuIpcOpenMemHandle  (CUdeviceptr *pdptr,
+                                      CUipcMemHandle handle,
+                                      unsigned int Flags);
+
+GST_CUDA_API
+CUresult CUDAAPI CuIpcCloseMemHandle (CUdeviceptr dptr);
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemAddressReserve (CUdeviceptr *ptr,
+                                      size_t size,
+                                      size_t alignment,
+                                      CUdeviceptr addr,
+                                      unsigned long long flags);
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemAddressFree    (CUdeviceptr ptr,
+                                      size_t size);
+
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemCreate         (CUmemGenericAllocationHandle *handle,
+                                      size_t size,
+                                      const CUmemAllocationProp *prop,
+                                      unsigned long long flags);
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemRelease        (CUmemGenericAllocationHandle handle);
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemExportToShareableHandle (void *shareableHandle,
+                                               CUmemGenericAllocationHandle handle,
+                                               CUmemAllocationHandleType handleType,
+                                               unsigned long long flags);
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemImportFromShareableHandle (CUmemGenericAllocationHandle *handle,
+                                                 void *osHandle,
+                                                 CUmemAllocationHandleType shHandleType);
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemSetAccess (CUdeviceptr ptr,
+                                 size_t size,
+                                 const CUmemAccessDesc *desc,
+                                 size_t count);
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemGetAccess (unsigned long long *flags,
+                                 const CUmemLocation *location,
+                                 CUdeviceptr ptr);
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemGetAllocationGranularity (size_t *granularity,
+                                                const CUmemAllocationProp *prop,
+                                                CUmemAllocationGranularity_flags option);
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemGetAllocationPropertiesFromHandle (CUmemAllocationProp *prop,
+                                                         CUmemGenericAllocationHandle handle);
+
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemMap (CUdeviceptr ptr,
+                           size_t size,
+                           size_t offset,
+                           CUmemGenericAllocationHandle handle,
+                           unsigned long long flags);
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemUnmap (CUdeviceptr ptr,
+                             size_t size);
+
+GST_CUDA_API
+CUresult CUDAAPI CuMemRetainAllocationHandle (CUmemGenericAllocationHandle *handle,
+                                              void *addr);
+
 /* cudaGL.h */
 GST_CUDA_API
 CUresult CUDAAPI CuGraphicsGLRegisterImage  (CUgraphicsResource * pCudaResource,

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcuda-private.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcuda-private.h Changed

@@ -19,8 +19,10 @@
 
 #pragma once
 
-#include "cuda-prelude.h"
-#include "cuda-gst.h"
+#include <gst/cuda/cuda-prelude.h>
+#include <gst/cuda/cuda-gst.h>
+#include <gst/cuda/gstcudacontext.h>
+#include <gst/cuda/gstcudastream.h>
 
 #include <gst/video/video.h>
 
@@ -46,7 +48,28 @@
                                     GstCudaBufferCopyType src_type,
                                     const GstVideoInfo * src_info,
                                     GstCudaContext * context,
-                                    CUstream stream);
+                                    GstCudaStream * stream);
+
+GST_CUDA_API
+void          gst_cuda_memory_set_from_fixed_pool (GstMemory * mem);
+
+GST_CUDA_API
+gboolean      gst_cuda_memory_is_from_fixed_pool (GstMemory * mem);
+
+gboolean      gst_cuda_virtual_memory_symbol_loaded (void);
+
+gpointer      gst_cuda_get_win32_handle_metadata (void);
 
 G_END_DECLS
 
+#ifdef __cplusplus
+#include <mutex>
+
+#define GST_CUDA_CALL_ONCE_BEGIN \
+    static std::once_flag __once_flag; \
+    std::call_once (__once_flag, &()
+
+#define GST_CUDA_CALL_ONCE_END )
+
+#endif /* __cplusplus */
+

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcuda.h Added

@@ -0,0 +1,37 @@
+/* GStreamer
+ * Copyright (C) 2022 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#ifndef GST_USE_UNSTABLE_API
+#pragma message ("The Cuda library from gst-plugins-bad is unstable API and may change in future.")
+#pragma message ("You can define GST_USE_UNSTABLE_API to avoid this warning.")
+#endif
+
+#include <gst/gst.h>
+#include <gst/cuda/cuda-prelude.h>
+#include <gst/cuda/cuda-gst.h>
+#include <gst/cuda/gstcudabufferpool.h>
+#include <gst/cuda/gstcudacontext.h>
+#include <gst/cuda/gstcudaloader.h>
+#include <gst/cuda/gstcudamemory.h>
+#include <gst/cuda/gstcudanvrtc.h>
+#include <gst/cuda/gstcudastream.h>
+#include <gst/cuda/gstcudautils.h>
+

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudabufferpool.cpp Added

@@ -0,0 +1,377 @@
+/* GStreamer
+ * Copyright (C) <2018-2019> Seungha Yang <seungha.yang@navercorp.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudabufferpool.h"
+#include "gstcudacontext.h"
+#include "gstcudamemory.h"
+#include "gstcuda-private.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_cuda_buffer_pool_debug);
+#define GST_CAT_DEFAULT gst_cuda_buffer_pool_debug
+
+struct _GstCudaBufferPoolPrivate
+{
+  GstVideoInfo info;
+  GstCudaStream *stream;
+  GstCudaPoolAllocator *alloc;
+  GstCudaMemoryAllocMethod alloc_method;
+  CUmemAllocationProp prop;
+};
+
+#define gst_cuda_buffer_pool_parent_class parent_class
+G_DEFINE_TYPE_WITH_PRIVATE (GstCudaBufferPool, gst_cuda_buffer_pool,
+    GST_TYPE_BUFFER_POOL);
+
+static const gchar **
+gst_cuda_buffer_pool_get_options (GstBufferPool * pool)
+{
+  static const gchar *options = { GST_BUFFER_POOL_OPTION_VIDEO_META, nullptr
+  };
+
+  return options;
+}
+
+static gboolean
+gst_cuda_buffer_pool_update_alloc_prop (GstCudaBufferPool * self)
+{
+  GstCudaBufferPoolPrivate *priv = self->priv;
+  gboolean virtual_mem_supported;
+  gboolean os_handle_supported;
+  guint device;
+
+  g_object_get (self->context, "cuda-device-id", &device,
+      "virtual-memory", &virtual_mem_supported,
+      "os-handle", &os_handle_supported, nullptr);
+
+  if (!virtual_mem_supported) {
+    GST_DEBUG_OBJECT (self, "Virtual memory management is not supported");
+    return FALSE;
+  }
+
+  if (!os_handle_supported) {
+    GST_DEBUG_OBJECT (self, "OS handle is not supported");;
+    return FALSE;
+  }
+
+  priv->prop.type = CU_MEM_ALLOCATION_TYPE_PINNED;
+  priv->prop.location.type = CU_MEM_LOCATION_TYPE_DEVICE;
+  priv->prop.location.id = (int) device;
+#ifdef G_OS_WIN32
+  priv->prop.requestedHandleTypes = CU_MEM_HANDLE_TYPE_WIN32;
+  priv->prop.win32HandleMetaData = gst_cuda_get_win32_handle_metadata ();
+#else
+  priv->prop.requestedHandleTypes = CU_MEM_HANDLE_TYPE_POSIX_FILE_DESCRIPTOR;
+#endif
+
+  return TRUE;
+}
+
+static gboolean
+gst_cuda_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
+{
+  GstCudaBufferPool *self = GST_CUDA_BUFFER_POOL (pool);
+  GstCudaBufferPoolPrivate *priv = self->priv;
+  GstCaps *caps = nullptr;
+  guint size, min_buffers, max_buffers;
+  GstVideoInfo info;
+  GstMemory *mem = nullptr;
+  GstCudaMemory *cmem;
+
+  if (!gst_buffer_pool_config_get_params (config, &caps, &size, &min_buffers,
+          &max_buffers)) {
+    GST_WARNING_OBJECT (self, "invalid config");
+    return FALSE;
+  }
+
+  if (!caps) {
+    GST_WARNING_OBJECT (pool, "no caps in config");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_WARNING_OBJECT (self, "Failed to convert caps to video-info");
+    return FALSE;
+  }
+
+  if (priv->alloc) {
+    gst_cuda_allocator_set_active (GST_CUDA_ALLOCATOR (priv->alloc), FALSE);
+    gst_clear_object (&priv->alloc);
+  }
+
+  gst_clear_cuda_stream (&priv->stream);
+  priv->stream = gst_buffer_pool_config_get_cuda_stream (config);
+  priv->alloc_method = gst_buffer_pool_config_get_cuda_alloc_method (config);
+  if (priv->alloc_method == GST_CUDA_MEMORY_ALLOC_UNKNOWN)
+    priv->alloc_method = GST_CUDA_MEMORY_ALLOC_MALLOC;
+
+  if (priv->alloc_method == GST_CUDA_MEMORY_ALLOC_MMAP) {
+    if (!gst_cuda_buffer_pool_update_alloc_prop (self)) {
+      GST_ERROR_OBJECT (self, "Virtual memory management is not supported");
+      return FALSE;
+    }
+
+    priv->alloc = gst_cuda_pool_allocator_new_for_virtual_memory (self->context,
+        priv->stream, &info, &priv->prop, CU_MEM_ALLOC_GRANULARITY_MINIMUM);
+  } else {
+    priv->alloc = gst_cuda_pool_allocator_new (self->context, priv->stream,
+        &info);
+  }
+
+  if (!priv->alloc) {
+    GST_ERROR_OBJECT (self, "Couldn't create allocator");
+    return FALSE;
+  }
+
+  if (!gst_cuda_allocator_set_active (GST_CUDA_ALLOCATOR (priv->alloc), TRUE)) {
+    GST_ERROR_OBJECT (self, "Couldn't set active");
+    return FALSE;
+  }
+
+  gst_cuda_pool_allocator_acquire_memory (priv->alloc, &mem);
+  gst_cuda_allocator_set_active (GST_CUDA_ALLOCATOR (priv->alloc), FALSE);
+  if (!mem) {
+    GST_WARNING_OBJECT (self, "Failed to allocate memory");
+    return FALSE;
+  }
+
+  cmem = GST_CUDA_MEMORY_CAST (mem);
+
+  gst_buffer_pool_config_set_params (config, caps,
+      GST_VIDEO_INFO_SIZE (&cmem->info), min_buffers, max_buffers);
+
+  priv->info = info;
+
+  gst_memory_unref (mem);
+
+  return GST_BUFFER_POOL_CLASS (parent_class)->set_config (pool, config);
+}
+
+static GstFlowReturn
+gst_cuda_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
+    GstBufferPoolAcquireParams * params)
+{
+  GstCudaBufferPool *self = GST_CUDA_BUFFER_POOL_CAST (pool);
+  GstCudaBufferPoolPrivate *priv = self->priv;
+  GstVideoInfo *info = &priv->info;
+  GstBuffer *buf;
+  GstMemory *mem;
+  GstCudaMemory *cmem;
+  GstFlowReturn ret;
+
+  ret = gst_cuda_pool_allocator_acquire_memory (priv->alloc, &mem);
+  if (ret != GST_FLOW_OK) {
+    GST_WARNING_OBJECT (self, "Couldn't acquire memory");
+    return ret;
+  }
+
+  buf = gst_buffer_new ();
+  gst_buffer_append_memory (buf, mem);
+
+  cmem = GST_CUDA_MEMORY_CAST (mem);
+
+  GST_DEBUG_OBJECT (pool, "adding GstVideoMeta");
+  gst_buffer_add_video_meta_full (buf, GST_VIDEO_FRAME_FLAG_NONE,
+      GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info),
+      GST_VIDEO_INFO_HEIGHT (info), GST_VIDEO_INFO_N_PLANES (info),
+      cmem->info.offset, cmem->info.stride);
+
+  *buffer = buf;
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_cuda_buffer_pool_start (GstBufferPool * pool)
+{
+  GstCudaBufferPool *self = GST_CUDA_BUFFER_POOL_CAST (pool);
+  GstCudaBufferPoolPrivate *priv = self->priv;
+
+  if (!gst_cuda_allocator_set_active (GST_CUDA_ALLOCATOR (priv->alloc), TRUE)) {
+    GST_ERROR_OBJECT (self, "Couldn't activate allocator");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_cuda_buffer_pool_stop (GstBufferPool * pool)
+{
+  GstCudaBufferPool *self = GST_CUDA_BUFFER_POOL_CAST (pool);
+  GstCudaBufferPoolPrivate *priv = self->priv;
+
+  if (priv->alloc)
+    gst_cuda_allocator_set_active (GST_CUDA_ALLOCATOR (priv->alloc), FALSE);
+
+  return GST_BUFFER_POOL_CLASS (parent_class)->stop (pool);
+}
+
+/**
+ * gst_cuda_buffer_pool_new:
+ * @context: The #GstCudaContext to use for the new buffer pool
+ *
+ * Returns: A newly created #GstCudaBufferPool
+ *
+ * Since: 1.22
+ */
+GstBufferPool *
+gst_cuda_buffer_pool_new (GstCudaContext * context)
+{
+  GstCudaBufferPool *self;
+
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+
+  self = (GstCudaBufferPool *)
+      g_object_new (GST_TYPE_CUDA_BUFFER_POOL, nullptr);
+  gst_object_ref_sink (self);
+
+  self->context = (GstCudaContext *) gst_object_ref (context);
+  self->priv->alloc_method = GST_CUDA_MEMORY_ALLOC_MALLOC;
+
+  return GST_BUFFER_POOL_CAST (self);
+}
+
+/**
+ * gst_buffer_pool_config_get_cuda_stream:
+ * @config: a buffer pool config
+ *
+ * Returns: (transfer full) (nullable): the currently configured #GstCudaStream
+ * on @config or %NULL if @config doesn't hold #GstCudaStream
+ *
+ * Since: 1.24
+ */
+GstCudaStream *
+gst_buffer_pool_config_get_cuda_stream (GstStructure * config)
+{
+  GstCudaStream *stream = nullptr;
+
+  g_return_val_if_fail (config, nullptr);
+
+  gst_structure_get (config, "cuda-stream", GST_TYPE_CUDA_STREAM, &stream,
+      nullptr);
+
+  return stream;
+}
+
+/**
+ * gst_buffer_pool_config_set_cuda_stream:
+ * @config: a buffer pool config
+ * @stream: a #GstCudaStream
+ *
+ * Sets @stream on @config
+ *
+ * Since: 1.24
+ */
+void
+gst_buffer_pool_config_set_cuda_stream (GstStructure * config,
+    GstCudaStream * stream)
+{
+  g_return_if_fail (config);
+  g_return_if_fail (GST_IS_CUDA_STREAM (stream));
+
+  gst_structure_set (config,
+      "cuda-stream", GST_TYPE_CUDA_STREAM, stream, nullptr);
+}
+
+/**
+ * gst_buffer_pool_config_get_cuda_alloc_method:
+ * @config: a buffer pool config
+ *
+ * Gets configured allocation method
+ *
+ * Since: 1.24
+ */
+GstCudaMemoryAllocMethod
+gst_buffer_pool_config_get_cuda_alloc_method (GstStructure * config)
+{
+  GstCudaMemoryAllocMethod type;
+
+  g_return_val_if_fail (config, GST_CUDA_MEMORY_ALLOC_UNKNOWN);
+
+  if (gst_structure_get_enum (config, "cuda-alloc-method",
+          GST_TYPE_CUDA_MEMORY_ALLOC_METHOD, (gint *) & type)) {
+    return type;
+  }
+
+  return GST_CUDA_MEMORY_ALLOC_UNKNOWN;
+}
+
+/**
+ * gst_buffer_pool_config_set_cuda_alloc_method:
+ * @config: a buffer pool config
+ *
+ * Sets allocation method
+ *
+ * Since: 1.24
+ */
+void
+gst_buffer_pool_config_set_cuda_alloc_method (GstStructure * config,
+    GstCudaMemoryAllocMethod method)
+{
+  g_return_if_fail (config);
+
+  gst_structure_set (config, "cuda-alloc-method",
+      GST_TYPE_CUDA_MEMORY_ALLOC_METHOD, method, nullptr);
+}
+
+static void
+gst_cuda_buffer_pool_dispose (GObject * object)
+{
+  GstCudaBufferPool *self = GST_CUDA_BUFFER_POOL_CAST (object);
+  GstCudaBufferPoolPrivate *priv = self->priv;
+
+  if (priv->alloc) {
+    gst_cuda_allocator_set_active (GST_CUDA_ALLOCATOR (priv->alloc), FALSE);
+    gst_clear_object (&priv->alloc);
+  }
+
+  gst_clear_cuda_stream (&priv->stream);
+  gst_clear_object (&self->context);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gst_cuda_buffer_pool_class_init (GstCudaBufferPoolClass * klass)
+{
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GstBufferPoolClass *bufferpool_class = (GstBufferPoolClass *) klass;
+
+  gobject_class->dispose = gst_cuda_buffer_pool_dispose;
+
+  bufferpool_class->get_options = gst_cuda_buffer_pool_get_options;
+  bufferpool_class->set_config = gst_cuda_buffer_pool_set_config;
+  bufferpool_class->start = gst_cuda_buffer_pool_start;
+  bufferpool_class->stop = gst_cuda_buffer_pool_stop;
+  bufferpool_class->alloc_buffer = gst_cuda_buffer_pool_alloc;
+
+  GST_DEBUG_CATEGORY_INIT (gst_cuda_buffer_pool_debug, "cudabufferpool", 0,
+      "CUDA Buffer Pool");
+}
+
+static void
+gst_cuda_buffer_pool_init (GstCudaBufferPool * pool)
+{
+  pool->priv = (GstCudaBufferPoolPrivate *)
+      gst_cuda_buffer_pool_get_instance_private (pool);
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudabufferpool.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudabufferpool.h Changed

@@ -17,19 +17,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GST_CUDA_BUFFER_POOL_H__
-#define __GST_CUDA_BUFFER_POOL_H__
+#pragma once
 
-#ifndef GST_USE_UNSTABLE_API
-#warning "The Cuda library from gst-plugins-bad is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
+#include <gst/video/video.h>
 
-#include "cuda-prelude.h"
-#include <gst/video/gstvideometa.h>
-#include <gst/video/gstvideopool.h>
-
-#include "gstcudamemory.h"
+#include <gst/cuda/cuda-prelude.h>
+#include <gst/cuda/gstcudamemory.h>
+#include <gst/cuda/gstcudastream.h>
 
 G_BEGIN_DECLS
 
@@ -78,6 +72,19 @@
 GST_CUDA_API
 GstBufferPool * gst_cuda_buffer_pool_new (GstCudaContext * context);
 
+GST_CUDA_API
+GstCudaStream * gst_buffer_pool_config_get_cuda_stream (GstStructure * config);
+
+GST_CUDA_API
+void            gst_buffer_pool_config_set_cuda_stream (GstStructure * config,
+                                                        GstCudaStream * stream);
+
+GST_CUDA_API
+GstCudaMemoryAllocMethod gst_buffer_pool_config_get_cuda_alloc_method (GstStructure * config);
+
+GST_CUDA_API
+void                     gst_buffer_pool_config_set_cuda_alloc_method (GstStructure * config,
+                                                                       GstCudaMemoryAllocMethod method);
+
 G_END_DECLS
 
-#endif /* __GST_CUDA_BUFFER_POOL_H__ */

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudacontext.cpp Added

@@ -0,0 +1,636 @@
+/* GStreamer
+ * Copyright (C) <2018-2019> Seungha Yang <seungha.yang@navercorp.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudaloader.h"
+#include "gstcudacontext.h"
+#include "gstcudautils.h"
+#include "gstcudamemory.h"
+#include "gstcuda-private.h"
+
+#ifdef G_OS_WIN32
+#include <gst/d3d11/gstd3d11.h>
+#include <wrl.h>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+#endif
+
+GST_DEBUG_CATEGORY_STATIC (gst_cuda_context_debug);
+#define GST_CAT_DEFAULT gst_cuda_context_debug
+
+/* store all context object with weak ref */
+static GList *context_list = nullptr;
+
+/* *INDENT-OFF* */
+static std::mutex list_lock;
+/* *INDENT-ON* */
+
+enum
+{
+  PROP_0,
+  PROP_DEVICE_ID,
+  PROP_DXGI_ADAPTER_LUID,
+  PROP_VIRTUAL_MEMORY,
+  PROP_OS_HANDLE,
+};
+
+struct _GstCudaContextPrivate
+{
+  CUcontext context;
+  CUdevice device;
+  guint device_id;
+  gint64 dxgi_adapter_luid;
+  gboolean virtual_memory_supported;
+  gboolean os_handle_supported;
+
+  gint tex_align;
+
+  GHashTable *accessible_peer;
+  gboolean owns_context;
+};
+
+#define gst_cuda_context_parent_class parent_class
+G_DEFINE_TYPE_WITH_PRIVATE (GstCudaContext, gst_cuda_context, GST_TYPE_OBJECT);
+
+static void gst_cuda_context_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_cuda_context_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+static void gst_cuda_context_finalize (GObject * object);
+static void gst_cuda_context_weak_ref_notify (gpointer data,
+    GstCudaContext * context);
+static void gst_cuda_context_enable_peer_access (GstCudaContext * context,
+    GstCudaContext * peer);
+
+static void
+gst_cuda_context_class_init (GstCudaContextClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->set_property = gst_cuda_context_set_property;
+  gobject_class->get_property = gst_cuda_context_get_property;
+  gobject_class->finalize = gst_cuda_context_finalize;
+
+  /**
+   * GstCudaContext::cuda-device-id:
+   *
+   * The GPU index to use for the context.
+   *
+   * Since: 1.22
+   */
+  g_object_class_install_property (gobject_class, PROP_DEVICE_ID,
+      g_param_spec_uint ("cuda-device-id", "Cuda Device ID",
+          "Set the GPU device to use for operations",
+          0, G_MAXUINT, 0,
+          (GParamFlags) (G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+#ifdef G_OS_WIN32
+  g_object_class_install_property (gobject_class, PROP_DXGI_ADAPTER_LUID,
+      g_param_spec_int64 ("dxgi-adapter-luid", "DXGI Adapter LUID",
+          "Associated DXGI Adapter LUID (Locally Unique Identifier) ",
+          G_MININT64, G_MAXINT64, 0,
+          (GParamFlags) (GST_PARAM_CONDITIONALLY_AVAILABLE | G_PARAM_READABLE |
+              G_PARAM_STATIC_STRINGS)));
+#endif
+
+  /**
+   * GstCudaContext:virtual-memory:
+   *
+   * Virtual memory management supportability
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_VIRTUAL_MEMORY,
+      g_param_spec_boolean ("virtual-memory", "Virtual Memory",
+          "Whether virtual memory management is supporte or not", FALSE,
+          (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstCudaContext:os-handle:
+   *
+   * OS handle supportability in virtual memory management
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_OS_HANDLE,
+      g_param_spec_boolean ("os-handle", "OS Handle",
+          "Whether OS specific handle is supported via virtual memory", FALSE,
+          (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
+
+  gst_cuda_memory_init_once ();
+}
+
+static void
+gst_cuda_context_init (GstCudaContext * context)
+{
+  GstCudaContextPrivate *priv = (GstCudaContextPrivate *)
+      gst_cuda_context_get_instance_private (context);
+
+  priv->accessible_peer = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+  context->priv = priv;
+}
+
+static void
+gst_cuda_context_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstCudaContext *context = GST_CUDA_CONTEXT (object);
+  GstCudaContextPrivate *priv = context->priv;
+
+  switch (prop_id) {
+    case PROP_DEVICE_ID:
+      priv->device_id = g_value_get_uint (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_cuda_context_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstCudaContext *context = GST_CUDA_CONTEXT (object);
+  GstCudaContextPrivate *priv = context->priv;
+
+  switch (prop_id) {
+    case PROP_DEVICE_ID:
+      g_value_set_uint (value, priv->device_id);
+      break;
+    case PROP_DXGI_ADAPTER_LUID:
+      g_value_set_int64 (value, priv->dxgi_adapter_luid);
+      break;
+    case PROP_VIRTUAL_MEMORY:
+      g_value_set_boolean (value, priv->virtual_memory_supported);
+      break;
+    case PROP_OS_HANDLE:
+      g_value_set_boolean (value, priv->os_handle_supported);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+#ifdef G_OS_WIN32
+static gint64
+gst_cuda_context_find_dxgi_adapter_luid (CUdevice cuda_device)
+{
+  gint64 ret = 0;
+  HRESULT hr;
+  ComPtr < IDXGIFactory1 > factory;
+  guint i;
+
+  hr = CreateDXGIFactory1 (IID_PPV_ARGS (&factory));
+  if (FAILED (hr))
+    return 0;
+
+  for (i = 0;; i++) {
+    ComPtr < IDXGIAdapter1 > adapter;
+    DXGI_ADAPTER_DESC desc;
+    CUdevice other_dev = 0;
+    CUresult cuda_ret;
+
+    hr = factory->EnumAdapters1 (i, &adapter);
+    if (FAILED (hr))
+      break;
+
+    hr = adapter->GetDesc (&desc);
+    if (FAILED (hr))
+      continue;
+
+    if (desc.VendorId != 0x10de)
+      continue;
+
+    cuda_ret = CuD3D11GetDevice (&other_dev, adapter.Get ());
+    if (cuda_ret == CUDA_SUCCESS && other_dev == cuda_device) {
+      ret = gst_d3d11_luid_to_int64 (&desc.AdapterLuid);
+      break;
+    }
+  }
+
+  return ret;
+}
+#endif
+static gboolean
+init_cuda_ctx (void)
+{
+  static gboolean ret = TRUE;
+
+  GST_CUDA_CALL_ONCE_BEGIN {
+    if (CuInit (0) != CUDA_SUCCESS) {
+      GST_ERROR ("Failed to cuInit");
+      ret = FALSE;
+    }
+    GST_DEBUG_CATEGORY_INIT (gst_cuda_context_debug,
+        "cudacontext", 0, "CUDA Context");
+  }
+  GST_CUDA_CALL_ONCE_END;
+
+  return ret;
+}
+
+/* *INDENT-OFF* */
+static gboolean
+gst_create_cucontext (guint * device_id, CUcontext * context)
+{
+  CUcontext cuda_ctx;
+  CUdevice cdev = 0, cuda_dev = -1;
+  gint dev_count = 0;
+  gchar name256;
+  gint min = 0, maj = 0;
+  gint i;
+
+  if (!init_cuda_ctx ())
+    return FALSE;
+
+  if (!gst_cuda_result (CuDeviceGetCount (&dev_count)) || dev_count == 0) {
+    GST_WARNING ("No CUDA devices detected");
+    return FALSE;
+  }
+
+  for (i = 0; i < dev_count; ++i) {
+    if (gst_cuda_result (CuDeviceGet (&cdev, i)) &&
+        gst_cuda_result (CuDeviceGetName (name, sizeof (name), cdev)) &&
+        gst_cuda_result (CuDeviceGetAttribute (&maj,
+                CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, cdev)) &&
+        gst_cuda_result (CuDeviceGetAttribute (&min,
+                CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, cdev))) {
+      GST_INFO ("GPU #%d supports NVENC: %s (%s) (Compute SM %d.%d)", i,
+          (((maj << 4) + min) >= 0x30) ? "yes" : "no", name, maj, min);
+      if (*device_id == (guint) -1 || *device_id == (guint) cdev) {
+        *device_id = cuda_dev = cdev;
+        break;
+      }
+    }
+  }
+
+  if (cuda_dev == -1) {
+    GST_WARNING ("Device with id %d does not exist", *device_id);
+    return FALSE;
+  }
+
+  if (!gst_cuda_result (CuDeviceGet (&cdev, *device_id))) {
+    GST_WARNING ("Failed to get device for id %d", *device_id);
+    return FALSE;
+  }
+
+  if (!gst_cuda_result (CuCtxCreate (&cuda_ctx, 0, cuda_dev))) {
+    GST_WARNING ("Failed to create CUDA context for cuda device %d", cuda_dev);
+    return FALSE;
+  }
+
+  GST_INFO ("Created CUDA context %p with device-id %d", cuda_ctx, *device_id);
+
+  *context = cuda_ctx;
+
+  return TRUE;
+}
+/* *INDENT-ON* */
+
+/* must be called with list_lock taken */
+static void
+gst_cuda_context_enable_peer_access (GstCudaContext * context,
+    GstCudaContext * peer)
+{
+  GstCudaContextPrivate *priv = context->priv;
+  GstCudaContextPrivate *peer_priv = peer->priv;
+  CUdevice device = priv->device;
+  CUdevice other_dev = peer_priv->device;
+  CUresult cuda_ret;
+  gint can_access = 0;
+
+  cuda_ret = CuDeviceCanAccessPeer (&can_access, device, other_dev);
+
+  if (!gst_cuda_result (cuda_ret) || !can_access) {
+    GST_DEBUG_OBJECT (context,
+        "Peer access to %" GST_PTR_FORMAT " is not allowed", peer);
+    return;
+  }
+
+  gst_cuda_context_push (context);
+  if (gst_cuda_result (CuCtxEnablePeerAccess (peer_priv->context, 0))) {
+    GST_DEBUG_OBJECT (context, "Enable peer access to %" GST_PTR_FORMAT, peer);
+    g_hash_table_add (priv->accessible_peer, peer);
+  }
+
+  gst_cuda_context_pop (nullptr);
+}
+
+static void
+gst_cuda_context_weak_ref_notify (gpointer data, GstCudaContext * context)
+{
+  GList *iter;
+
+  std::lock_guard < std::mutex > lk (list_lock);
+  context_list = g_list_remove (context_list, context);
+
+  /* disable self -> peer access */
+  if (context->priv->accessible_peer) {
+    GHashTableIter iter;
+    gpointer key;
+    g_hash_table_iter_init (&iter, context->priv->accessible_peer);
+    if (gst_cuda_context_push (context)) {
+      while (g_hash_table_iter_next (&iter, &key, nullptr)) {
+        GstCudaContext *peer = GST_CUDA_CONTEXT (key);
+        CUcontext peer_handle = gst_cuda_context_get_handle (peer);
+        GST_DEBUG_OBJECT (context,
+            "Disable peer access to %" GST_PTR_FORMAT, peer);
+        gst_cuda_result (CuCtxDisablePeerAccess (peer_handle));
+      }
+      gst_cuda_context_pop (nullptr);
+    }
+
+    g_hash_table_destroy (context->priv->accessible_peer);
+    context->priv->accessible_peer = nullptr;
+  }
+
+  /* disable peer -> self access */
+  for (iter = context_list; iter; iter = g_list_next (iter)) {
+    GstCudaContext *other = (GstCudaContext *) iter->data;
+    GstCudaContextPrivate *other_priv = other->priv;
+    CUcontext self_handle;
+
+    if (!other_priv->accessible_peer)
+      continue;
+
+    if (g_hash_table_lookup (other_priv->accessible_peer, context)) {
+      if (gst_cuda_context_push (other)) {
+        self_handle = gst_cuda_context_get_handle (context);
+        GST_DEBUG_OBJECT (other,
+            "Disable peer access to %" GST_PTR_FORMAT, context);
+        gst_cuda_result (CuCtxDisablePeerAccess (self_handle));
+        gst_cuda_context_pop (nullptr);
+      }
+
+      g_hash_table_remove (other_priv->accessible_peer, context);
+    }
+  }
+}
+
+static void
+gst_cuda_context_finalize (GObject * object)
+{
+  GstCudaContext *context = GST_CUDA_CONTEXT_CAST (object);
+  GstCudaContextPrivate *priv = context->priv;
+
+  if (priv->context && priv->owns_context) {
+    GST_DEBUG_OBJECT (context, "Destroying CUDA context %p", priv->context);
+    gst_cuda_result (CuCtxDestroy (priv->context));
+  }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+/**
+ * gst_cuda_context_new:
+ * @device_id: device-id for creating #GstCudaContext
+ *
+ * Create #GstCudaContext with given device_id
+ *
+ * Returns: (transfer full) (nullable): a new #GstCudaContext or %NULL on
+ * failure
+ *
+ * Since: 1.22
+ */
+GstCudaContext *
+gst_cuda_context_new (guint device_id)
+{
+  CUcontext old_ctx;
+  CUcontext ctx;
+  GstCudaContext *self;
+
+  if (!gst_create_cucontext (&device_id, &ctx)) {
+    return nullptr;
+  }
+
+  self = gst_cuda_context_new_wrapped (ctx, device_id);
+  if (!self) {
+    CuCtxDestroy (ctx);
+    return nullptr;
+  }
+
+  self->priv->owns_context = TRUE;
+
+  if (!gst_cuda_result (CuCtxPopCurrent (&old_ctx))) {
+    GST_ERROR ("Could not pop current context");
+    g_object_unref (self);
+
+    return nullptr;
+  }
+
+  return self;
+}
+
+/**
+ * gst_cuda_context_push:
+ * @ctx: a #GstCudaContext to push current thread
+ *
+ * Pushes the given @ctx onto the CPU thread's stack of current contexts.
+ * The specified context becomes the CPU thread's current context,
+ * so all CUDA functions that operate on the current context are affected.
+ *
+ * Returns: %TRUE if @ctx was pushed without error.
+ *
+ * Since: 1.22
+ */
+gboolean
+gst_cuda_context_push (GstCudaContext * ctx)
+{
+  g_return_val_if_fail (ctx, FALSE);
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (ctx), FALSE);
+
+  return gst_cuda_result (CuCtxPushCurrent (ctx->priv->context));
+}
+
+/**
+ * gst_cuda_context_pop:
+ *
+ * Pops the current CUDA context from CPU thread
+ *
+ * Returns: %TRUE if @ctx was pushed without error.
+ *
+ * Since: 1.22
+ */
+gboolean
+gst_cuda_context_pop (CUcontext * cuda_ctx)
+{
+  return gst_cuda_result (CuCtxPopCurrent (cuda_ctx));
+}
+
+/**
+ * gst_cuda_context_get_handle:
+ * @ctx: a #GstCudaContext
+ *
+ * Get CUDA device context. Caller must not modify and/or destroy
+ * returned device context.
+ *
+ * Returns: the `CUcontext` of @ctx
+ *
+ * Since: 1.22
+ */
+gpointer
+gst_cuda_context_get_handle (GstCudaContext * ctx)
+{
+  g_return_val_if_fail (ctx, nullptr);
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (ctx), nullptr);
+
+  return ctx->priv->context;
+}
+
+/**
+ * gst_cuda_context_get_texture_alignment:
+ * @ctx: a #GstCudaContext
+ *
+ * Get required texture alignment by device
+ *
+ * Returns: the `CUcontext` of @ctx
+ *
+ * Since: 1.22
+ */
+gint
+gst_cuda_context_get_texture_alignment (GstCudaContext * ctx)
+{
+  g_return_val_if_fail (ctx, 0);
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (ctx), 0);
+
+  return ctx->priv->tex_align;
+}
+
+/**
+ * gst_cuda_context_can_access_peer:
+ * @ctx: a #GstCudaContext
+ * @peer: a #GstCudaContext
+ *
+ * Query whether @ctx can access any memory which belongs to @peer directly.
+ *
+ * Returns: %TRUE if @ctx can access @peer directly
+ *
+ * Since: 1.22
+ */
+gboolean
+gst_cuda_context_can_access_peer (GstCudaContext * ctx, GstCudaContext * peer)
+{
+  gboolean ret = FALSE;
+
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (ctx), FALSE);
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (peer), FALSE);
+
+  std::lock_guard < std::mutex > lk (list_lock);
+  if (ctx->priv->accessible_peer &&
+      g_hash_table_lookup (ctx->priv->accessible_peer, peer)) {
+    ret = TRUE;
+  }
+
+  return ret;
+}
+
+/**
+ * gst_cuda_context_new_wrapped:
+ * @handler: A
+ * CUcontext(https://docs.nvidia.com/cuda/cuda-driver-api/group__CUDA__TYPES.html#group__CUDA__TYPES_1gf9f5bd81658f866613785b3a0bb7d7d9)
+ * to wrap
+ * @device: A
+ * CUDevice(https://docs.nvidia.com/cuda/cuda-driver-api/group__CUDA__TYPES.html#group__CUDA__TYPES_1gf9f5bd81658f866613785b3a0bb7d7d9)
+ * to wrap
+ *
+ * Note: The caller is responsible for ensuring that the CUcontext and CUdevice
+ * represented by @handle and @device stay alive while the returned
+ * #GstCudaContext is active.
+ *
+ * Returns: (transfer full) (nullable): A newly created #GstCudaContext
+ *
+ * Since: 1.22
+ */
+GstCudaContext *
+gst_cuda_context_new_wrapped (CUcontext handler, CUdevice device)
+{
+  GList *iter;
+  gint tex_align = 0;
+
+  GstCudaContext *self;
+
+  g_return_val_if_fail (handler, nullptr);
+  g_return_val_if_fail (device >= 0, nullptr);
+
+  if (!init_cuda_ctx ())
+    return nullptr;
+
+  if (!gst_cuda_result (CuDeviceGetAttribute (&tex_align,
+              CU_DEVICE_ATTRIBUTE_TEXTURE_ALIGNMENT, device))) {
+    GST_ERROR ("Could not get texture alignment for %d", device);
+
+    return nullptr;
+  }
+
+  self = (GstCudaContext *)
+      g_object_new (GST_TYPE_CUDA_CONTEXT, "cuda-device-id", device, nullptr);
+  self->priv->context = handler;
+  self->priv->device = device;
+  self->priv->tex_align = tex_align;
+  gst_object_ref_sink (self);
+
+#ifdef G_OS_WIN32
+  self->priv->dxgi_adapter_luid =
+      gst_cuda_context_find_dxgi_adapter_luid (self->priv->device);
+#endif
+
+  if (gst_cuda_virtual_memory_symbol_loaded ()) {
+    CUresult ret;
+    int supported = 0;
+    ret = CuDeviceGetAttribute (&supported,
+        CU_DEVICE_ATTRIBUTE_VIRTUAL_MEMORY_MANAGEMENT_SUPPORTED, device);
+    if (ret == CUDA_SUCCESS && supported)
+      self->priv->virtual_memory_supported = TRUE;
+
+#ifdef G_OS_WIN32
+    ret = CuDeviceGetAttribute (&supported,
+        CU_DEVICE_ATTRIBUTE_HANDLE_TYPE_WIN32_HANDLE_SUPPORTED, device);
+#else
+    ret = CuDeviceGetAttribute (&supported,
+        CU_DEVICE_ATTRIBUTE_HANDLE_TYPE_POSIX_FILE_DESCRIPTOR_SUPPORTED,
+        device);
+#endif
+    if (ret == CUDA_SUCCESS && supported)
+      self->priv->os_handle_supported = TRUE;
+  }
+
+  std::lock_guard < std::mutex > lk (list_lock);
+  g_object_weak_ref (G_OBJECT (self),
+      (GWeakNotify) gst_cuda_context_weak_ref_notify, nullptr);
+  for (iter = context_list; iter; iter = g_list_next (iter)) {
+    GstCudaContext *peer = (GstCudaContext *) iter->data;
+
+    /* EnablePeerAccess is unidirectional */
+    gst_cuda_context_enable_peer_access (self, peer);
+    gst_cuda_context_enable_peer_access (peer, self);
+  }
+
+  context_list = g_list_append (context_list, self);
+
+  return self;
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudacontext.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudacontext.h Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudaloader.cpp Added

@@ -0,0 +1,927 @@
+/* GStreamer
+ * Copyright (C) 2019 Seungha Yang <seungha.yang@navercorp.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "cuda-gst.h"
+#include "gstcudaloader.h"
+#include <gmodule.h>
+#include "gstcuda-private.h"
+
+GST_DEBUG_CATEGORY (gst_cudaloader_debug);
+#define GST_CAT_DEFAULT gst_cudaloader_debug
+
+#ifndef G_OS_WIN32
+#define CUDA_LIBNAME "libcuda.so.1"
+#else
+#define CUDA_LIBNAME "nvcuda.dll"
+#endif
+
+#define LOAD_SYMBOL(name,func) G_STMT_START { \
+  if (!g_module_symbol (module, G_STRINGIFY (name), (gpointer *) &vtable->func)) { \
+    GST_ERROR ("Failed to load '%s' from %s, %s", G_STRINGIFY (name), filename, g_module_error()); \
+    g_module_close (module); \
+    return; \
+  } \
+} G_STMT_END;
+
+#define LOAD_OPTIONAL_SYMBOL(name,func) G_STMT_START { \
+  if (!g_module_symbol (module, G_STRINGIFY (name), (gpointer *) &vtable->func)) { \
+    GST_WARNING ("Failed to load '%s', %s", G_STRINGIFY (name), g_module_error()); \
+    return; \
+  } \
+} G_STMT_END;
+
+/* *INDENT-OFF* */
+typedef struct _GstNvCodecCudaVTable
+{
+  gboolean loaded;
+  gboolean have_virtual_alloc;
+
+  CUresult (CUDAAPI * CuInit) (unsigned int Flags);
+  CUresult (CUDAAPI * CuGetErrorName) (CUresult error, const char **pStr);
+  CUresult (CUDAAPI * CuGetErrorString) (CUresult error, const char **pStr);
+
+  CUresult (CUDAAPI * CuCtxCreate) (CUcontext * pctx, unsigned int flags,
+      CUdevice dev);
+  CUresult (CUDAAPI * CuCtxDestroy) (CUcontext ctx);
+  CUresult (CUDAAPI * CuCtxPopCurrent) (CUcontext * pctx);
+  CUresult (CUDAAPI * CuCtxPushCurrent) (CUcontext ctx);
+
+  CUresult (CUDAAPI * CuCtxEnablePeerAccess) (CUcontext peerContext,
+      unsigned int Flags);
+  CUresult (CUDAAPI * CuCtxDisablePeerAccess) (CUcontext peerContext);
+  CUresult (CUDAAPI * CuGraphicsMapResources) (unsigned int count,
+      CUgraphicsResource * resources, CUstream hStream);
+  CUresult (CUDAAPI * CuGraphicsUnmapResources) (unsigned int count,
+      CUgraphicsResource * resources, CUstream hStream);
+  CUresult (CUDAAPI *
+      CuGraphicsResourceSetMapFlags) (CUgraphicsResource resource,
+      unsigned int flags);
+  CUresult (CUDAAPI * CuGraphicsSubResourceGetMappedArray) (CUarray * pArray,
+      CUgraphicsResource resource, unsigned int arrayIndex,
+      unsigned int mipLevel);
+  CUresult (CUDAAPI * CuGraphicsResourceGetMappedPointer) (CUdeviceptr *
+      pDevPtr, size_t * pSize, CUgraphicsResource resource);
+  CUresult (CUDAAPI *
+      CuGraphicsUnregisterResource) (CUgraphicsResource resource);
+
+  CUresult (CUDAAPI * CuMemAlloc) (CUdeviceptr * dptr, unsigned int bytesize);
+  CUresult (CUDAAPI * CuMemAllocPitch) (CUdeviceptr * dptr, size_t * pPitch,
+      size_t WidthInBytes, size_t Height, unsigned int ElementSizeBytes);
+  CUresult (CUDAAPI * CuMemAllocHost) (void **pp, unsigned int bytesize);
+  CUresult (CUDAAPI * CuMemcpy2D) (const CUDA_MEMCPY2D * pCopy);
+  CUresult (CUDAAPI * CuMemcpy2DAsync) (const CUDA_MEMCPY2D * pCopy,
+      CUstream hStream);
+
+  CUresult (CUDAAPI * CuMemFree) (CUdeviceptr dptr);
+  CUresult (CUDAAPI * CuMemFreeHost) (void *p);
+
+  CUresult (CUDAAPI * CuStreamCreate) (CUstream * phStream,
+      unsigned int Flags);
+  CUresult (CUDAAPI * CuStreamDestroy) (CUstream hStream);
+  CUresult (CUDAAPI * CuStreamSynchronize) (CUstream hStream);
+
+  CUresult (CUDAAPI * CuDeviceGet) (CUdevice * device, int ordinal);
+  CUresult (CUDAAPI * CuDeviceGetCount) (int *count);
+  CUresult (CUDAAPI * CuDeviceGetName) (char *name, int len, CUdevice dev);
+  CUresult (CUDAAPI * CuDeviceGetAttribute) (int *pi,
+      CUdevice_attribute attrib, CUdevice dev);
+  CUresult (CUDAAPI * CuDeviceCanAccessPeer) (int *canAccessPeer,
+      CUdevice dev, CUdevice peerDev);
+  CUresult (CUDAAPI * CuDriverGetVersion) (int *driverVersion);
+
+  CUresult (CUDAAPI * CuModuleLoadData) (CUmodule * module,
+      const void *image);
+  CUresult (CUDAAPI * CuModuleUnload) (CUmodule module);
+  CUresult (CUDAAPI * CuModuleGetFunction) (CUfunction * hfunc,
+      CUmodule hmod, const char *name);
+  CUresult (CUDAAPI * CuTexObjectCreate) (CUtexObject * pTexObject,
+      const CUDA_RESOURCE_DESC * pResDesc, const CUDA_TEXTURE_DESC * pTexDesc,
+      const CUDA_RESOURCE_VIEW_DESC * pResViewDesc);
+  CUresult (CUDAAPI * CuTexObjectDestroy) (CUtexObject texObject);
+  CUresult (CUDAAPI * CuLaunchKernel) (CUfunction f, unsigned int gridDimX,
+      unsigned int gridDimY, unsigned int gridDimZ,
+      unsigned int blockDimX, unsigned int blockDimY, unsigned int blockDimZ,
+      unsigned int sharedMemBytes, CUstream hStream, void **kernelParams,
+      void **extra);
+
+  CUresult (CUDAAPI * CuGraphicsGLRegisterImage) (CUgraphicsResource *
+      pCudaResource, unsigned int image, unsigned int target,
+      unsigned int Flags);
+  CUresult (CUDAAPI * CuGraphicsGLRegisterBuffer) (CUgraphicsResource *
+      pCudaResource, unsigned int buffer, unsigned int Flags);
+  CUresult (CUDAAPI * CuGLGetDevices) (unsigned int *pCudaDeviceCount,
+      CUdevice * pCudaDevices, unsigned int cudaDeviceCount,
+      CUGLDeviceList deviceList);
+
+  CUresult (CUDAAPI * CuEventCreate) (CUevent *phEvent, unsigned int Flags);
+  CUresult (CUDAAPI * CuEventDestroy) (CUevent hEvent);
+  CUresult (CUDAAPI * CuEventRecord) (CUevent hEvent, CUstream hStream);
+  CUresult (CUDAAPI * CuEventSynchronize) (CUevent hEvent);
+
+  CUresult (CUDAAPI * CuIpcGetEventHandle) (CUipcEventHandle *pHandle,
+      CUevent event);
+  CUresult (CUDAAPI * CuIpcOpenEventHandle) (CUevent* phEvent,
+      CUipcEventHandle handle);
+
+  CUresult (CUDAAPI * CuIpcGetMemHandle) (CUipcMemHandle *pHandle,
+      CUdeviceptr dptr);
+  CUresult (CUDAAPI * CuIpcOpenMemHandle) (CUdeviceptr *pdptr,
+      CUipcMemHandle handle, unsigned int Flags);
+  CUresult (CUDAAPI * CuIpcCloseMemHandle) (CUdeviceptr dptr);
+
+#ifdef G_OS_WIN32
+  CUresult (CUDAAPI * CuGraphicsD3D11RegisterResource) (CUgraphicsResource *
+      pCudaResource, ID3D11Resource * pD3DResource, unsigned int Flags);
+  CUresult (CUDAAPI * CuD3D11GetDevice) (CUdevice * device,
+      IDXGIAdapter * pAdapter);
+  CUresult (CUDAAPI * CuD3D11GetDevices) (unsigned int *pCudaDeviceCount,
+      CUdevice * pCudaDevices, unsigned int cudaDeviceCount,
+      ID3D11Device * pD3D11Device, CUd3d11DeviceList deviceList);
+#endif
+
+  CUresult (CUDAAPI * CuMemAddressReserve) (CUdeviceptr *ptr, size_t size,
+      size_t alignment, CUdeviceptr addr, unsigned long long flags);
+  CUresult (CUDAAPI * CuMemAddressFree) (CUdeviceptr ptr, size_t size);
+  CUresult (CUDAAPI * CuMemCreate) (CUmemGenericAllocationHandle *handle,
+      size_t size, const CUmemAllocationProp *prop, unsigned long long flags);
+  CUresult (CUDAAPI * CuMemRelease) (CUmemGenericAllocationHandle handle);
+  CUresult (CUDAAPI * CuMemExportToShareableHandle) (void *shareableHandle,
+      CUmemGenericAllocationHandle handle, CUmemAllocationHandleType handleType,
+      unsigned long long flags);
+  CUresult (CUDAAPI * CuMemImportFromShareableHandle)
+      (CUmemGenericAllocationHandle *handle, void *osHandle,
+       CUmemAllocationHandleType shHandleType);
+  CUresult (CUDAAPI * CuMemSetAccess) (CUdeviceptr ptr, size_t size,
+      const CUmemAccessDesc *desc, size_t count);
+  CUresult (CUDAAPI * CuMemGetAccess) (unsigned long long *flags,
+      const CUmemLocation *location, CUdeviceptr ptr);
+  CUresult (CUDAAPI * CuMemGetAllocationGranularity) (size_t *granularity,
+      const CUmemAllocationProp *prop, CUmemAllocationGranularity_flags option);
+  CUresult (CUDAAPI * CuMemGetAllocationPropertiesFromHandle)
+      (CUmemAllocationProp *prop, CUmemGenericAllocationHandle handle);
+  CUresult (CUDAAPI * CuMemMap) (CUdeviceptr ptr, size_t size, size_t offset,
+       CUmemGenericAllocationHandle handle, unsigned long long flags);
+  CUresult (CUDAAPI * CuMemUnmap) (CUdeviceptr ptr, size_t size);
+  CUresult (CUDAAPI * CuMemRetainAllocationHandle)
+      (CUmemGenericAllocationHandle *handle, void *addr);
+} GstNvCodecCudaVTable;
+/* *INDENT-ON* */
+
+static GstNvCodecCudaVTable gst_cuda_vtable = { 0, };
+
+static void
+gst_cuda_load_optional_symbols (GModule * module)
+{
+  GstNvCodecCudaVTable *vtable = &gst_cuda_vtable;
+
+  LOAD_OPTIONAL_SYMBOL (cuMemAddressReserve, CuMemAddressReserve);
+  LOAD_OPTIONAL_SYMBOL (cuMemAddressFree, CuMemAddressFree);
+  LOAD_OPTIONAL_SYMBOL (cuMemCreate, CuMemCreate);
+  LOAD_OPTIONAL_SYMBOL (cuMemRelease, CuMemRelease);
+  LOAD_OPTIONAL_SYMBOL (cuMemExportToShareableHandle,
+      CuMemExportToShareableHandle);
+  LOAD_OPTIONAL_SYMBOL (cuMemImportFromShareableHandle,
+      CuMemImportFromShareableHandle);
+  LOAD_OPTIONAL_SYMBOL (cuMemSetAccess, CuMemSetAccess);
+  LOAD_OPTIONAL_SYMBOL (cuMemGetAccess, CuMemGetAccess);
+  LOAD_OPTIONAL_SYMBOL (cuMemGetAllocationGranularity,
+      CuMemGetAllocationGranularity);
+  LOAD_OPTIONAL_SYMBOL (cuMemGetAllocationPropertiesFromHandle,
+      CuMemGetAllocationPropertiesFromHandle);
+  LOAD_OPTIONAL_SYMBOL (cuMemMap, CuMemMap);
+  LOAD_OPTIONAL_SYMBOL (cuMemUnmap, CuMemUnmap);
+  LOAD_OPTIONAL_SYMBOL (cuMemRetainAllocationHandle,
+      CuMemRetainAllocationHandle);
+
+  GST_INFO ("Virtual alloc symbols are loaded");
+
+  vtable->have_virtual_alloc = TRUE;
+}
+
+static void
+gst_cuda_load_library_once_func (void)
+{
+  GModule *module;
+  const gchar *filename = CUDA_LIBNAME;
+  GstNvCodecCudaVTable *vtable;
+
+  GST_DEBUG_CATEGORY_INIT (gst_cudaloader_debug, "cudaloader", 0,
+      "CUDA plugin loader");
+
+  module = g_module_open (filename, G_MODULE_BIND_LAZY);
+  if (module == nullptr) {
+    GST_WARNING ("Could not open library %s, %s", filename, g_module_error ());
+    return;
+  }
+
+  vtable = &gst_cuda_vtable;
+
+  /* cuda.h */
+  LOAD_SYMBOL (cuInit, CuInit);
+  LOAD_SYMBOL (cuGetErrorName, CuGetErrorName);
+  LOAD_SYMBOL (cuGetErrorString, CuGetErrorString);
+  LOAD_SYMBOL (cuCtxCreate, CuCtxCreate);
+  LOAD_SYMBOL (cuCtxDestroy, CuCtxDestroy);
+  LOAD_SYMBOL (cuCtxPopCurrent, CuCtxPopCurrent);
+  LOAD_SYMBOL (cuCtxPushCurrent, CuCtxPushCurrent);
+  LOAD_SYMBOL (cuCtxEnablePeerAccess, CuCtxEnablePeerAccess);
+  LOAD_SYMBOL (cuCtxDisablePeerAccess, CuCtxDisablePeerAccess);
+
+  LOAD_SYMBOL (cuGraphicsMapResources, CuGraphicsMapResources);
+  LOAD_SYMBOL (cuGraphicsUnmapResources, CuGraphicsUnmapResources);
+  LOAD_SYMBOL (cuGraphicsResourceSetMapFlags, CuGraphicsResourceSetMapFlags);
+  LOAD_SYMBOL (cuGraphicsSubResourceGetMappedArray,
+      CuGraphicsSubResourceGetMappedArray);
+  LOAD_SYMBOL (cuGraphicsResourceGetMappedPointer,
+      CuGraphicsResourceGetMappedPointer);
+  LOAD_SYMBOL (cuGraphicsUnregisterResource, CuGraphicsUnregisterResource);
+
+  LOAD_SYMBOL (cuMemAlloc, CuMemAlloc);
+  LOAD_SYMBOL (cuMemAllocPitch, CuMemAllocPitch);
+  LOAD_SYMBOL (cuMemAllocHost, CuMemAllocHost);
+  LOAD_SYMBOL (cuMemcpy2D, CuMemcpy2D);
+  LOAD_SYMBOL (cuMemcpy2DAsync, CuMemcpy2DAsync);
+
+  LOAD_SYMBOL (cuMemFree, CuMemFree);
+  LOAD_SYMBOL (cuMemFreeHost, CuMemFreeHost);
+
+  LOAD_SYMBOL (cuStreamCreate, CuStreamCreate);
+  LOAD_SYMBOL (cuStreamDestroy, CuStreamDestroy);
+  LOAD_SYMBOL (cuStreamSynchronize, CuStreamSynchronize);
+
+  LOAD_SYMBOL (cuDeviceGet, CuDeviceGet);
+  LOAD_SYMBOL (cuDeviceGetCount, CuDeviceGetCount);
+  LOAD_SYMBOL (cuDeviceGetName, CuDeviceGetName);
+  LOAD_SYMBOL (cuDeviceGetAttribute, CuDeviceGetAttribute);
+  LOAD_SYMBOL (cuDeviceCanAccessPeer, CuDeviceCanAccessPeer);
+
+  LOAD_SYMBOL (cuDriverGetVersion, CuDriverGetVersion);
+
+  LOAD_SYMBOL (cuModuleLoadData, CuModuleLoadData);
+  LOAD_SYMBOL (cuModuleUnload, CuModuleUnload);
+  LOAD_SYMBOL (cuModuleGetFunction, CuModuleGetFunction);
+  LOAD_SYMBOL (cuTexObjectCreate, CuTexObjectCreate);
+  LOAD_SYMBOL (cuTexObjectDestroy, CuTexObjectDestroy);
+  LOAD_SYMBOL (cuLaunchKernel, CuLaunchKernel);
+
+  LOAD_SYMBOL (cuEventCreate, CuEventCreate);
+  LOAD_SYMBOL (cuEventDestroy, CuEventDestroy);
+  LOAD_SYMBOL (cuEventRecord, CuEventRecord);
+  LOAD_SYMBOL (cuEventSynchronize, CuEventSynchronize);
+
+  LOAD_SYMBOL (cuIpcGetEventHandle, CuIpcGetEventHandle);
+  LOAD_SYMBOL (cuIpcOpenEventHandle, CuIpcOpenEventHandle);
+
+  LOAD_SYMBOL (cuIpcGetMemHandle, CuIpcGetMemHandle);
+  LOAD_SYMBOL (cuIpcOpenMemHandle, CuIpcOpenMemHandle);
+  LOAD_SYMBOL (cuIpcCloseMemHandle, CuIpcCloseMemHandle);
+
+  /* cudaGL.h */
+  LOAD_SYMBOL (cuGraphicsGLRegisterImage, CuGraphicsGLRegisterImage);
+  LOAD_SYMBOL (cuGraphicsGLRegisterBuffer, CuGraphicsGLRegisterBuffer);
+  LOAD_SYMBOL (cuGLGetDevices, CuGLGetDevices);
+
+#ifdef G_OS_WIN32
+  /* cudaD3D11.h */
+  LOAD_SYMBOL (cuGraphicsD3D11RegisterResource,
+      CuGraphicsD3D11RegisterResource);
+  LOAD_SYMBOL (cuD3D11GetDevice, CuD3D11GetDevice);
+  LOAD_SYMBOL (cuD3D11GetDevices, CuD3D11GetDevices);
+#endif
+
+  vtable->loaded = TRUE;
+
+  gst_cuda_load_optional_symbols (module);
+}
+
+/**
+ * gst_cuda_load_library:
+ *
+ * Loads the cuda library
+ *
+ * Returns: %TRUE if the libcuda could be loaded %FALSE otherwise
+ *
+ * Since: 1.22
+ */
+gboolean
+gst_cuda_load_library (void)
+{
+  GST_CUDA_CALL_ONCE_BEGIN {
+    gst_cuda_load_library_once_func ();
+  } GST_CUDA_CALL_ONCE_END;
+
+  return gst_cuda_vtable.loaded;
+}
+
+gboolean
+gst_cuda_virtual_memory_symbol_loaded (void)
+{
+  gst_cuda_load_library ();
+
+  return gst_cuda_vtable.have_virtual_alloc;
+}
+
+CUresult CUDAAPI
+CuInit (unsigned int Flags)
+{
+  g_assert (gst_cuda_vtable.CuInit != nullptr);
+
+  return gst_cuda_vtable.CuInit (Flags);
+}
+
+CUresult CUDAAPI
+CuGetErrorName (CUresult error, const char **pStr)
+{
+  g_assert (gst_cuda_vtable.CuGetErrorName != nullptr);
+
+  return gst_cuda_vtable.CuGetErrorName (error, pStr);
+}
+
+CUresult CUDAAPI
+CuGetErrorString (CUresult error, const char **pStr)
+{
+  g_assert (gst_cuda_vtable.CuGetErrorString != nullptr);
+
+  return gst_cuda_vtable.CuGetErrorString (error, pStr);
+}
+
+CUresult CUDAAPI
+CuCtxCreate (CUcontext * pctx, unsigned int flags, CUdevice dev)
+{
+  g_assert (gst_cuda_vtable.CuCtxCreate != nullptr);
+
+  return gst_cuda_vtable.CuCtxCreate (pctx, flags, dev);
+}
+
+CUresult CUDAAPI
+CuCtxDestroy (CUcontext ctx)
+{
+  g_assert (gst_cuda_vtable.CuCtxDestroy != nullptr);
+
+  return gst_cuda_vtable.CuCtxDestroy (ctx);
+}
+
+CUresult CUDAAPI
+CuCtxPopCurrent (CUcontext * pctx)
+{
+  g_assert (gst_cuda_vtable.CuCtxPopCurrent != nullptr);
+
+  return gst_cuda_vtable.CuCtxPopCurrent (pctx);
+}
+
+CUresult CUDAAPI
+CuCtxPushCurrent (CUcontext ctx)
+{
+  g_assert (gst_cuda_vtable.CuCtxPushCurrent != nullptr);
+
+  return gst_cuda_vtable.CuCtxPushCurrent (ctx);
+}
+
+CUresult CUDAAPI
+CuCtxEnablePeerAccess (CUcontext peerContext, unsigned int Flags)
+{
+  g_assert (gst_cuda_vtable.CuCtxEnablePeerAccess != nullptr);
+
+  return gst_cuda_vtable.CuCtxEnablePeerAccess (peerContext, Flags);
+}
+
+CUresult CUDAAPI
+CuCtxDisablePeerAccess (CUcontext peerContext)
+{
+  g_assert (gst_cuda_vtable.CuCtxDisablePeerAccess != nullptr);
+
+  return gst_cuda_vtable.CuCtxDisablePeerAccess (peerContext);
+}
+
+CUresult CUDAAPI
+CuGraphicsMapResources (unsigned int count, CUgraphicsResource * resources,
+    CUstream hStream)
+{
+  g_assert (gst_cuda_vtable.CuGraphicsMapResources != nullptr);
+
+  return gst_cuda_vtable.CuGraphicsMapResources (count, resources, hStream);
+}
+
+CUresult CUDAAPI
+CuGraphicsUnmapResources (unsigned int count, CUgraphicsResource * resources,
+    CUstream hStream)
+{
+  g_assert (gst_cuda_vtable.CuGraphicsUnmapResources != nullptr);
+
+  return gst_cuda_vtable.CuGraphicsUnmapResources (count, resources, hStream);
+}
+
+CUresult CUDAAPI
+CuGraphicsResourceSetMapFlags (CUgraphicsResource resource, unsigned int flags)
+{
+  g_assert (gst_cuda_vtable.CuGraphicsResourceSetMapFlags != nullptr);
+
+  return gst_cuda_vtable.CuGraphicsResourceSetMapFlags (resource, flags);
+}
+
+CUresult CUDAAPI
+CuGraphicsSubResourceGetMappedArray (CUarray * pArray,
+    CUgraphicsResource resource, unsigned int arrayIndex, unsigned int mipLevel)
+{
+  g_assert (gst_cuda_vtable.CuGraphicsSubResourceGetMappedArray != nullptr);
+
+  return gst_cuda_vtable.CuGraphicsSubResourceGetMappedArray (pArray, resource,
+      arrayIndex, mipLevel);
+}
+
+/* *INDENT-OFF* */
+CUresult CUDAAPI
+CuGraphicsResourceGetMappedPointer (CUdeviceptr * pDevPtr, size_t * pSize,
+    CUgraphicsResource resource)
+{
+  g_assert (gst_cuda_vtable.CuGraphicsResourceGetMappedPointer != nullptr);
+
+  return gst_cuda_vtable.CuGraphicsResourceGetMappedPointer (pDevPtr, pSize,
+      resource);
+}
+/* *INDENT-ON* */
+
+CUresult CUDAAPI
+CuGraphicsUnregisterResource (CUgraphicsResource resource)
+{
+  g_assert (gst_cuda_vtable.CuGraphicsUnregisterResource != nullptr);
+
+  return gst_cuda_vtable.CuGraphicsUnregisterResource (resource);
+}
+
+CUresult CUDAAPI
+CuMemAlloc (CUdeviceptr * dptr, unsigned int bytesize)
+{
+  g_assert (gst_cuda_vtable.CuMemAlloc != nullptr);
+
+  return gst_cuda_vtable.CuMemAlloc (dptr, bytesize);
+}
+
+/* *INDENT-OFF* */
+CUresult CUDAAPI
+CuMemAllocPitch (CUdeviceptr * dptr, size_t * pPitch, size_t WidthInBytes,
+    size_t Height, unsigned int ElementSizeBytes)
+{
+  g_assert (gst_cuda_vtable.CuMemAllocPitch != nullptr);
+
+  return gst_cuda_vtable.CuMemAllocPitch (dptr, pPitch, WidthInBytes, Height,
+      ElementSizeBytes);
+}
+/* *INDENT-ON* */
+
+CUresult CUDAAPI
+CuMemAllocHost (void **pp, unsigned int bytesize)
+{
+  g_assert (gst_cuda_vtable.CuMemAllocHost != nullptr);
+
+  return gst_cuda_vtable.CuMemAllocHost (pp, bytesize);
+}
+
+CUresult CUDAAPI
+CuMemcpy2D (const CUDA_MEMCPY2D * pCopy)
+{
+  g_assert (gst_cuda_vtable.CuMemcpy2D != nullptr);
+
+  return gst_cuda_vtable.CuMemcpy2D (pCopy);
+}
+
+CUresult CUDAAPI
+CuMemcpy2DAsync (const CUDA_MEMCPY2D * pCopy, CUstream hStream)
+{
+  g_assert (gst_cuda_vtable.CuMemcpy2DAsync != nullptr);
+
+  return gst_cuda_vtable.CuMemcpy2DAsync (pCopy, hStream);
+}
+
+CUresult CUDAAPI
+CuMemFree (CUdeviceptr dptr)
+{
+  g_assert (gst_cuda_vtable.CuMemFree != nullptr);
+
+  return gst_cuda_vtable.CuMemFree (dptr);
+}
+
+CUresult CUDAAPI
+CuMemFreeHost (void *p)
+{
+  g_assert (gst_cuda_vtable.CuMemFreeHost != nullptr);
+
+  return gst_cuda_vtable.CuMemFreeHost (p);
+}
+
+CUresult CUDAAPI
+CuStreamCreate (CUstream * phStream, unsigned int Flags)
+{
+  g_assert (gst_cuda_vtable.CuStreamCreate != nullptr);
+
+  return gst_cuda_vtable.CuStreamCreate (phStream, Flags);
+}
+
+CUresult CUDAAPI
+CuStreamDestroy (CUstream hStream)
+{
+  g_assert (gst_cuda_vtable.CuStreamDestroy != nullptr);
+
+  return gst_cuda_vtable.CuStreamDestroy (hStream);
+}
+
+CUresult CUDAAPI
+CuStreamSynchronize (CUstream hStream)
+{
+  g_assert (gst_cuda_vtable.CuStreamSynchronize != nullptr);
+
+  return gst_cuda_vtable.CuStreamSynchronize (hStream);
+}
+
+CUresult CUDAAPI
+CuDeviceGet (CUdevice * device, int ordinal)
+{
+  g_assert (gst_cuda_vtable.CuDeviceGet != nullptr);
+
+  return gst_cuda_vtable.CuDeviceGet (device, ordinal);
+}
+
+CUresult CUDAAPI
+CuDeviceGetCount (int *count)
+{
+  g_assert (gst_cuda_vtable.CuDeviceGetCount != nullptr);
+
+  return gst_cuda_vtable.CuDeviceGetCount (count);
+}
+
+CUresult CUDAAPI
+CuDeviceGetName (char *name, int len, CUdevice dev)
+{
+  g_assert (gst_cuda_vtable.CuDeviceGetName != nullptr);
+
+  return gst_cuda_vtable.CuDeviceGetName (name, len, dev);
+}
+
+CUresult CUDAAPI
+CuDeviceGetAttribute (int *pi, CUdevice_attribute attrib, CUdevice dev)
+{
+  g_assert (gst_cuda_vtable.CuDeviceGetAttribute != nullptr);
+
+  return gst_cuda_vtable.CuDeviceGetAttribute (pi, attrib, dev);
+}
+
+CUresult CUDAAPI
+CuDeviceCanAccessPeer (int *canAccessPeer, CUdevice dev, CUdevice peerDev)
+{
+  g_assert (gst_cuda_vtable.CuDeviceCanAccessPeer != nullptr);
+
+  return gst_cuda_vtable.CuDeviceCanAccessPeer (canAccessPeer, dev, peerDev);
+}
+
+CUresult CUDAAPI
+CuDriverGetVersion (int *driverVersion)
+{
+  g_assert (gst_cuda_vtable.CuDriverGetVersion != nullptr);
+
+  return gst_cuda_vtable.CuDriverGetVersion (driverVersion);
+}
+
+CUresult CUDAAPI
+CuModuleLoadData (CUmodule * module, const void *image)
+{
+  g_assert (gst_cuda_vtable.CuModuleLoadData != nullptr);
+
+  return gst_cuda_vtable.CuModuleLoadData (module, image);
+}
+
+CUresult CUDAAPI
+CuModuleUnload (CUmodule module)
+{
+  g_assert (gst_cuda_vtable.CuModuleUnload != nullptr);
+
+  return gst_cuda_vtable.CuModuleUnload (module);
+}
+
+CUresult CUDAAPI
+CuModuleGetFunction (CUfunction * hfunc, CUmodule hmod, const char *name)
+{
+  g_assert (gst_cuda_vtable.CuModuleGetFunction != nullptr);
+
+  return gst_cuda_vtable.CuModuleGetFunction (hfunc, hmod, name);
+}
+
+CUresult CUDAAPI
+CuTexObjectCreate (CUtexObject * pTexObject,
+    const CUDA_RESOURCE_DESC * pResDesc, const CUDA_TEXTURE_DESC * pTexDesc,
+    const CUDA_RESOURCE_VIEW_DESC * pResViewDesc)
+{
+  g_assert (gst_cuda_vtable.CuTexObjectCreate != nullptr);
+
+  return gst_cuda_vtable.CuTexObjectCreate (pTexObject, pResDesc, pTexDesc,
+      pResViewDesc);
+}
+
+CUresult CUDAAPI
+CuTexObjectDestroy (CUtexObject texObject)
+{
+  g_assert (gst_cuda_vtable.CuTexObjectDestroy != nullptr);
+
+  return gst_cuda_vtable.CuTexObjectDestroy (texObject);
+}
+
+CUresult CUDAAPI
+CuLaunchKernel (CUfunction f, unsigned int gridDimX,
+    unsigned int gridDimY, unsigned int gridDimZ,
+    unsigned int blockDimX, unsigned int blockDimY, unsigned int blockDimZ,
+    unsigned int sharedMemBytes, CUstream hStream, void **kernelParams,
+    void **extra)
+{
+  g_assert (gst_cuda_vtable.CuLaunchKernel != nullptr);
+
+  return gst_cuda_vtable.CuLaunchKernel (f, gridDimX, gridDimY, gridDimZ,
+      blockDimX, blockDimY, blockDimZ, sharedMemBytes, hStream, kernelParams,
+      extra);
+}
+
+CUresult CUDAAPI
+CuEventCreate (CUevent * phEvent, unsigned int Flags)
+{
+  g_assert (gst_cuda_vtable.CuEventCreate);
+
+  return gst_cuda_vtable.CuEventCreate (phEvent, Flags);
+}
+
+CUresult CUDAAPI
+CuEventDestroy (CUevent hEvent)
+{
+  g_assert (gst_cuda_vtable.CuEventDestroy);
+
+  return gst_cuda_vtable.CuEventDestroy (hEvent);
+}
+
+CUresult CUDAAPI
+CuEventRecord (CUevent hEvent, CUstream hStream)
+{
+  g_assert (gst_cuda_vtable.CuEventRecord);
+
+  return gst_cuda_vtable.CuEventRecord (hEvent, hStream);
+}
+
+CUresult CUDAAPI
+CuEventSynchronize (CUevent hEvent)
+{
+  g_assert (gst_cuda_vtable.CuEventSynchronize);
+
+  return gst_cuda_vtable.CuEventSynchronize (hEvent);
+}
+
+CUresult CUDAAPI
+CuIpcGetEventHandle (CUipcEventHandle * pHandle, CUevent event)
+{
+  g_assert (gst_cuda_vtable.CuIpcGetEventHandle);
+
+  return gst_cuda_vtable.CuIpcGetEventHandle (pHandle, event);
+}
+
+CUresult CUDAAPI
+CuIpcOpenEventHandle (CUevent * phEvent, CUipcEventHandle handle)
+{
+  g_assert (gst_cuda_vtable.CuIpcOpenEventHandle);
+
+  return gst_cuda_vtable.CuIpcOpenEventHandle (phEvent, handle);
+}
+
+CUresult CUDAAPI
+CuIpcGetMemHandle (CUipcMemHandle * pHandle, CUdeviceptr dptr)
+{
+  g_assert (gst_cuda_vtable.CuIpcGetMemHandle);
+
+  return gst_cuda_vtable.CuIpcGetMemHandle (pHandle, dptr);
+}
+
+CUresult CUDAAPI
+CuIpcOpenMemHandle (CUdeviceptr * pdptr, CUipcMemHandle handle,
+    unsigned int Flags)
+{
+  g_assert (gst_cuda_vtable.CuIpcOpenMemHandle);
+
+  return gst_cuda_vtable.CuIpcOpenMemHandle (pdptr, handle, Flags);
+}
+
+CUresult CUDAAPI
+CuIpcCloseMemHandle (CUdeviceptr dptr)
+{
+  g_assert (gst_cuda_vtable.CuIpcCloseMemHandle);
+
+  return gst_cuda_vtable.CuIpcCloseMemHandle (dptr);
+}
+
+CUresult CUDAAPI
+CuMemAddressReserve (CUdeviceptr * ptr, size_t size, size_t alignment,
+    CUdeviceptr addr, unsigned long long flags)
+{
+  if (!gst_cuda_vtable.CuMemAddressReserve)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemAddressReserve (ptr,
+      size, alignment, addr, flags);
+}
+
+CUresult CUDAAPI
+CuMemAddressFree (CUdeviceptr ptr, size_t size)
+{
+  if (!gst_cuda_vtable.CuMemAddressFree)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemAddressFree (ptr, size);
+}
+
+CUresult CUDAAPI
+CuMemCreate (CUmemGenericAllocationHandle * handle, size_t size,
+    const CUmemAllocationProp * prop, unsigned long long flags)
+{
+  if (!gst_cuda_vtable.CuMemCreate)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemCreate (handle, size, prop, flags);
+}
+
+CUresult CUDAAPI
+CuMemRelease (CUmemGenericAllocationHandle handle)
+{
+  if (!gst_cuda_vtable.CuMemRelease)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemRelease (handle);
+}
+
+CUresult CUDAAPI
+CuMemExportToShareableHandle (void *shareableHandle,
+    CUmemGenericAllocationHandle handle, CUmemAllocationHandleType handleType,
+    unsigned long long flags)
+{
+  if (!gst_cuda_vtable.CuMemExportToShareableHandle)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemExportToShareableHandle (shareableHandle,
+      handle, handleType, flags);
+}
+
+CUresult CUDAAPI
+CuMemImportFromShareableHandle (CUmemGenericAllocationHandle * handle,
+    void *osHandle, CUmemAllocationHandleType shHandleType)
+{
+  if (!gst_cuda_vtable.CuMemImportFromShareableHandle)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemImportFromShareableHandle (handle,
+      osHandle, shHandleType);
+}
+
+CUresult CUDAAPI
+CuMemSetAccess (CUdeviceptr ptr, size_t size, const CUmemAccessDesc * desc,
+    size_t count)
+{
+  if (!gst_cuda_vtable.CuMemSetAccess)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemSetAccess (ptr, size, desc, count);
+}
+
+CUresult CUDAAPI
+CuMemGetAccess (unsigned long long *flags, const CUmemLocation * location,
+    CUdeviceptr ptr)
+{
+  if (!gst_cuda_vtable.CuMemGetAccess)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemGetAccess (flags, location, ptr);
+}
+
+CUresult CUDAAPI
+CuMemGetAllocationGranularity (size_t *granularity,
+    const CUmemAllocationProp * prop, CUmemAllocationGranularity_flags option)
+{
+  if (!gst_cuda_vtable.CuMemGetAllocationGranularity)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemGetAllocationGranularity (granularity,
+      prop, option);
+}
+
+CUresult CUDAAPI
+CuMemGetAllocationPropertiesFromHandle (CUmemAllocationProp * prop,
+    CUmemGenericAllocationHandle handle)
+{
+  if (!gst_cuda_vtable.CuMemGetAllocationPropertiesFromHandle)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemGetAllocationPropertiesFromHandle (prop, handle);
+}
+
+
+CUresult CUDAAPI
+CuMemMap (CUdeviceptr ptr, size_t size, size_t offset,
+    CUmemGenericAllocationHandle handle, unsigned long long flags)
+{
+  if (!gst_cuda_vtable.CuMemMap)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemMap (ptr, size, offset, handle, flags);
+}
+
+CUresult CUDAAPI
+CuMemUnmap (CUdeviceptr ptr, size_t size)
+{
+  if (!gst_cuda_vtable.CuMemUnmap)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemUnmap (ptr, size);
+}
+
+CUresult CUDAAPI
+CuMemRetainAllocationHandle (CUmemGenericAllocationHandle * handle, void *addr)
+{
+  if (!gst_cuda_vtable.CuMemRetainAllocationHandle)
+    return CUDA_ERROR_NOT_SUPPORTED;
+
+  return gst_cuda_vtable.CuMemRetainAllocationHandle (handle, addr);
+}
+
+/* cudaGL.h */
+CUresult CUDAAPI
+CuGraphicsGLRegisterImage (CUgraphicsResource * pCudaResource,
+    unsigned int image, unsigned int target, unsigned int Flags)
+{
+  g_assert (gst_cuda_vtable.CuGraphicsGLRegisterImage != nullptr);
+
+  return gst_cuda_vtable.CuGraphicsGLRegisterImage (pCudaResource, image,
+      target, Flags);
+}
+
+CUresult CUDAAPI
+CuGraphicsGLRegisterBuffer (CUgraphicsResource * pCudaResource,
+    unsigned int buffer, unsigned int Flags)
+{
+  g_assert (gst_cuda_vtable.CuGraphicsGLRegisterBuffer != nullptr);
+
+  return gst_cuda_vtable.CuGraphicsGLRegisterBuffer (pCudaResource, buffer,
+      Flags);
+}
+
+CUresult CUDAAPI
+CuGLGetDevices (unsigned int *pCudaDeviceCount, CUdevice * pCudaDevices,
+    unsigned int cudaDeviceCount, CUGLDeviceList deviceList)
+{
+  g_assert (gst_cuda_vtable.CuGLGetDevices != nullptr);
+
+  return gst_cuda_vtable.CuGLGetDevices (pCudaDeviceCount, pCudaDevices,
+      cudaDeviceCount, deviceList);
+}
+
+/* cudaD3D11.h */
+#ifdef G_OS_WIN32
+CUresult CUDAAPI
+CuGraphicsD3D11RegisterResource (CUgraphicsResource * pCudaResource,
+    ID3D11Resource * pD3DResource, unsigned int Flags)
+{
+  g_assert (gst_cuda_vtable.CuGraphicsD3D11RegisterResource != nullptr);
+
+  return gst_cuda_vtable.CuGraphicsD3D11RegisterResource (pCudaResource,
+      pD3DResource, Flags);
+}
+
+CUresult CUDAAPI
+CuD3D11GetDevice (CUdevice * device, IDXGIAdapter * pAdapter)
+{
+  g_assert (gst_cuda_vtable.CuD3D11GetDevice != nullptr);
+
+  return gst_cuda_vtable.CuD3D11GetDevice (device, pAdapter);
+}
+
+CUresult CUDAAPI
+CuD3D11GetDevices (unsigned int *pCudaDeviceCount,
+    CUdevice * pCudaDevices, unsigned int cudaDeviceCount,
+    ID3D11Device * pD3D11Device, CUd3d11DeviceList deviceList)
+{
+  g_assert (gst_cuda_vtable.CuD3D11GetDevices != nullptr);
+
+  return gst_cuda_vtable.CuD3D11GetDevices (pCudaDeviceCount, pCudaDevices,
+      cudaDeviceCount, pD3D11Device, deviceList);
+}
+#endif

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudaloader.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudaloader.h Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudamemory.cpp Added

@@ -0,0 +1,1914 @@
+/* GStreamer
+ * Copyright (C) <2018-2019> Seungha Yang <seungha.yang@navercorp.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudamemory.h"
+#include "gstcudautils.h"
+#include "gstcuda-private.h"
+
+#include <string.h>
+#include <map>
+#include <memory>
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
+
+GST_DEBUG_CATEGORY_STATIC (cuda_allocator_debug);
+#define GST_CAT_DEFAULT cuda_allocator_debug
+
+static GstAllocator *_gst_cuda_allocator = nullptr;
+
+GType
+gst_cuda_memory_alloc_method_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue alloc_methods = {
+    {GST_CUDA_MEMORY_ALLOC_UNKNOWN, "GST_CUDA_MEMORY_ALLOC_UNKNOWN", "unknown"},
+    {GST_CUDA_MEMORY_ALLOC_MALLOC, "GST_CUDA_MEMORY_ALLOC_MALLOC", "malloc"},
+    {GST_CUDA_MEMORY_ALLOC_MMAP, "GST_CUDA_MEMORY_ALLOC_MMAP", "mmap"},
+    {0, nullptr, nullptr}
+  };
+
+  GST_CUDA_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstCudaMemoryAllocMethod", alloc_methods);
+  } GST_CUDA_CALL_ONCE_END;
+
+  return type;
+}
+
+/* *INDENT-OFF* */
+struct GstCudaMemoryTokenData
+{
+  GstCudaMemoryTokenData (gpointer data, GDestroyNotify notify_func)
+  :user_data (data), notify (notify_func)
+  {
+  }
+
+   ~GstCudaMemoryTokenData ()
+  {
+    if (notify)
+      notify (user_data);
+  }
+
+  gpointer user_data;
+  GDestroyNotify notify;
+};
+
+struct _GstCudaMemoryPrivate
+{
+  _GstCudaMemoryPrivate ()
+  {
+    memset (&texture, 0, sizeof (texture));
+  }
+
+  GstCudaMemoryAllocMethod alloc_method = GST_CUDA_MEMORY_ALLOC_MALLOC;
+
+  CUdeviceptr data = 0;
+  void *staging = nullptr;
+
+  /* virtual memory */
+  gsize max_size = 0;
+  CUmemGenericAllocationHandle handle = 0;
+  CUmemAllocationProp alloc_prop;
+  gboolean exported = FALSE;
+
+#ifdef G_OS_WIN32
+  HANDLE os_handle = nullptr;
+#else
+  int os_handle = 0;
+#endif
+
+  /* params used for cuMemAllocPitch */
+  gsize pitch = 0;
+  guint width_in_bytes = 0;
+  guint height = 0;
+
+  std::mutex lock;
+
+  GstCudaStream *stream = nullptr;
+
+  gint texture_align = 0;
+
+  /* Per plane, and point/linear sampling textures respectively  */
+  CUtexObject textureGST_VIDEO_MAX_PLANES2;
+
+  gboolean saw_io = FALSE;
+
+  gboolean from_fixed_pool = FALSE;
+
+  std::map < gint64, std::unique_ptr < GstCudaMemoryTokenData >> token_map;
+
+  gpointer user_data = nullptr;
+  GDestroyNotify notify = nullptr;
+};
+/* *INDENT-ON* */
+
+struct _GstCudaAllocatorPrivate
+{
+  GstMemoryCopyFunction fallback_copy;
+};
+
+#define gst_cuda_allocator_parent_class parent_class
+G_DEFINE_TYPE_WITH_PRIVATE (GstCudaAllocator, gst_cuda_allocator,
+    GST_TYPE_ALLOCATOR);
+
+static void gst_cuda_allocator_free (GstAllocator * allocator,
+    GstMemory * memory);
+
+static gpointer cuda_mem_map (GstMemory * mem, gsize maxsize,
+    GstMapFlags flags);
+static void cuda_mem_unmap_full (GstMemory * mem, GstMapInfo * info);
+static GstMemory *cuda_mem_copy (GstMemory * mem, gssize offset, gssize size);
+
+static GstMemory *
+gst_cuda_allocator_dummy_alloc (GstAllocator * allocator, gsize size,
+    GstAllocationParams * params)
+{
+  g_return_val_if_reached (nullptr);
+}
+
+static void
+gst_cuda_allocator_class_init (GstCudaAllocatorClass * klass)
+{
+  GstAllocatorClass *allocator_class = GST_ALLOCATOR_CLASS (klass);
+
+  allocator_class->alloc = GST_DEBUG_FUNCPTR (gst_cuda_allocator_dummy_alloc);
+  allocator_class->free = GST_DEBUG_FUNCPTR (gst_cuda_allocator_free);
+
+  GST_DEBUG_CATEGORY_INIT (cuda_allocator_debug, "cudaallocator", 0,
+      "CUDA Allocator");
+}
+
+static void
+gst_cuda_allocator_init (GstCudaAllocator * allocator)
+{
+  GstAllocator *alloc = GST_ALLOCATOR_CAST (allocator);
+  GstCudaAllocatorPrivate *priv;
+
+  priv = allocator->priv = (GstCudaAllocatorPrivate *)
+      gst_cuda_allocator_get_instance_private (allocator);
+
+  alloc->mem_type = GST_CUDA_MEMORY_TYPE_NAME;
+
+  alloc->mem_map = cuda_mem_map;
+  alloc->mem_unmap_full = cuda_mem_unmap_full;
+
+  /* Store pointer to default mem_copy method for fallback copy */
+  priv->fallback_copy = alloc->mem_copy;
+  alloc->mem_copy = cuda_mem_copy;
+
+  GST_OBJECT_FLAG_SET (allocator, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC);
+}
+
+static gboolean
+gst_cuda_allocator_update_info (const GstVideoInfo * reference,
+    gsize pitch, gsize alloc_height, GstVideoInfo * aligned)
+{
+  GstVideoInfo ret = *reference;
+  guint height = reference->height;
+
+  ret.size = pitch * alloc_height;
+
+  switch (GST_VIDEO_INFO_FORMAT (reference)) {
+    case GST_VIDEO_FORMAT_I420:
+    case GST_VIDEO_FORMAT_YV12:
+    case GST_VIDEO_FORMAT_I420_10LE:
+    case GST_VIDEO_FORMAT_I420_12LE:
+    {
+      guint chroma_height = GST_ROUND_UP_2 (height) / 2;
+      /* we are wasting space yes, but required so that this memory
+       * can be used in kernel function */
+      ret.stride0 = pitch;
+      ret.stride1 = pitch;
+      ret.stride2 = pitch;
+      ret.offset0 = 0;
+      ret.offset1 = ret.stride0 * height;
+      ret.offset2 = ret.offset1 + (ret.stride1 * chroma_height);
+      break;
+    }
+    case GST_VIDEO_FORMAT_Y42B:
+    case GST_VIDEO_FORMAT_I422_10LE:
+    case GST_VIDEO_FORMAT_I422_12LE:
+      ret.stride0 = pitch;
+      ret.stride1 = pitch;
+      ret.stride2 = pitch;
+      ret.offset0 = 0;
+      ret.offset1 = ret.stride0 * height;
+      ret.offset2 = ret.offset1 + (ret.stride1 * height);
+      break;
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_NV21:
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+    case GST_VIDEO_FORMAT_P016_LE:
+      ret.stride0 = pitch;
+      ret.stride1 = pitch;
+      ret.offset0 = 0;
+      ret.offset1 = ret.stride0 * height;
+      break;
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_Y444_10LE:
+    case GST_VIDEO_FORMAT_Y444_12LE:
+    case GST_VIDEO_FORMAT_Y444_16LE:
+    case GST_VIDEO_FORMAT_RGBP:
+    case GST_VIDEO_FORMAT_BGRP:
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBR_10LE:
+    case GST_VIDEO_FORMAT_GBR_12LE:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      ret.stride0 = pitch;
+      ret.stride1 = pitch;
+      ret.stride2 = pitch;
+      ret.offset0 = 0;
+      ret.offset1 = ret.stride0 * height;
+      ret.offset2 = ret.offset1 * 2;
+      break;
+    case GST_VIDEO_FORMAT_GBRA:
+      ret.stride0 = pitch;
+      ret.stride1 = pitch;
+      ret.stride2 = pitch;
+      ret.stride3 = pitch;
+      ret.offset0 = 0;
+      ret.offset1 = ret.stride0 * height;
+      ret.offset2 = ret.offset1 * 2;
+      ret.offset3 = ret.offset1 * 3;
+      break;
+    case GST_VIDEO_FORMAT_BGRA:
+    case GST_VIDEO_FORMAT_RGBA:
+    case GST_VIDEO_FORMAT_RGBx:
+    case GST_VIDEO_FORMAT_BGRx:
+    case GST_VIDEO_FORMAT_ARGB:
+    case GST_VIDEO_FORMAT_ABGR:
+    case GST_VIDEO_FORMAT_RGB:
+    case GST_VIDEO_FORMAT_BGR:
+    case GST_VIDEO_FORMAT_BGR10A2_LE:
+    case GST_VIDEO_FORMAT_RGB10A2_LE:
+    case GST_VIDEO_FORMAT_YUY2:
+    case GST_VIDEO_FORMAT_UYVY:
+      ret.stride0 = pitch;
+      ret.offset0 = 0;
+      break;
+    default:
+      return FALSE;
+  }
+
+  *aligned = ret;
+
+  return TRUE;
+}
+
+static GstMemory *
+gst_cuda_allocator_alloc_internal (GstCudaAllocator * self,
+    GstCudaContext * context, GstCudaStream * stream, const GstVideoInfo * info,
+    guint width_in_bytes, guint alloc_height)
+{
+  GstCudaMemoryPrivate *priv;
+  GstCudaMemory *mem;
+  CUdeviceptr data;
+  gboolean ret = FALSE;
+  gsize pitch;
+  GstVideoInfo alloc_info;
+
+  if (!gst_cuda_context_push (context))
+    return nullptr;
+
+  ret = gst_cuda_result (CuMemAllocPitch (&data, &pitch, width_in_bytes,
+          alloc_height, 16));
+  gst_cuda_context_pop (nullptr);
+
+  if (!ret) {
+    GST_ERROR_OBJECT (self, "Failed to allocate CUDA memory");
+    return nullptr;
+  }
+
+  if (!gst_cuda_allocator_update_info (info, pitch, alloc_height, &alloc_info)) {
+    GST_ERROR_OBJECT (self, "Couldn't calculate aligned info");
+    gst_cuda_context_push (context);
+    CuMemFree (data);
+    gst_cuda_context_pop (nullptr);
+    return nullptr;
+  }
+
+  mem = g_new0 (GstCudaMemory, 1);
+  mem->context = (GstCudaContext *) gst_object_ref (context);
+  mem->info = alloc_info;
+  mem->priv = priv = new GstCudaMemoryPrivate ();
+
+  priv->data = data;
+  priv->pitch = pitch;
+  priv->width_in_bytes = width_in_bytes;
+  priv->height = alloc_height;
+  priv->texture_align = gst_cuda_context_get_texture_alignment (context);
+  if (stream)
+    priv->stream = gst_cuda_stream_ref (stream);
+
+  gst_memory_init (GST_MEMORY_CAST (mem), (GstMemoryFlags) 0,
+      GST_ALLOCATOR_CAST (self), nullptr, alloc_info.size, 0, 0,
+      alloc_info.size);
+
+  return GST_MEMORY_CAST (mem);
+}
+
+static void
+gst_cuda_allocator_free (GstAllocator * allocator, GstMemory * memory)
+{
+  GstCudaMemory *mem = GST_CUDA_MEMORY_CAST (memory);
+  GstCudaMemoryPrivate *priv = mem->priv;
+
+  gst_cuda_context_push (mem->context);
+  /* Finish any pending operations before freeing */
+  if (priv->stream && priv->saw_io &&
+      GST_MEMORY_FLAG_IS_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC)) {
+    CuStreamSynchronize (gst_cuda_stream_get_handle (priv->stream));
+  }
+
+  priv->token_map.clear ();
+
+  for (guint i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
+    for (guint j = 0; j < 2; j++) {
+      if (priv->textureij) {
+        CuTexObjectDestroy (priv->textureij);
+      }
+    }
+  }
+
+  if (priv->notify) {
+    priv->notify (priv->user_data);
+  } else if (priv->data) {
+    if (priv->alloc_method == GST_CUDA_MEMORY_ALLOC_MMAP) {
+      gst_cuda_result (CuMemUnmap (priv->data, priv->max_size));
+      gst_cuda_result (CuMemAddressFree (priv->data, priv->max_size));
+      gst_cuda_result (CuMemRelease (priv->handle));
+      if (priv->exported) {
+#ifdef G_OS_WIN32
+        CloseHandle (priv->os_handle);
+#else
+        close (priv->os_handle);
+#endif
+      }
+    } else {
+      gst_cuda_result (CuMemFree (priv->data));
+    }
+  }
+
+  if (priv->staging)
+    gst_cuda_result (CuMemFreeHost (priv->staging));
+  gst_cuda_context_pop (nullptr);
+
+  gst_clear_cuda_stream (&priv->stream);
+  gst_object_unref (mem->context);
+
+  delete mem->priv;
+
+  g_free (mem);
+}
+
+static gboolean
+gst_cuda_memory_upload (GstCudaAllocator * self, GstCudaMemory * mem)
+{
+  GstCudaMemoryPrivate *priv = mem->priv;
+  gboolean ret = TRUE;
+  CUDA_MEMCPY2D param = { 0, };
+  CUstream stream = gst_cuda_stream_get_handle (priv->stream);
+
+  if (!priv->staging ||
+      !GST_MEMORY_FLAG_IS_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD)) {
+    return TRUE;
+  }
+
+  if (!gst_cuda_context_push (mem->context)) {
+    GST_ERROR_OBJECT (self, "Failed to push cuda context");
+    return FALSE;
+  }
+
+  param.srcMemoryType = CU_MEMORYTYPE_HOST;
+  param.srcHost = priv->staging;
+  param.srcPitch = priv->pitch;
+
+  param.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+  param.dstDevice = (CUdeviceptr) priv->data;
+  param.dstPitch = priv->pitch;
+  param.WidthInBytes = priv->width_in_bytes;
+  param.Height = priv->height;
+
+  ret = gst_cuda_result (CuMemcpy2DAsync (&param, stream));
+  /* Sync only if we use default stream.
+   * Otherwise (in case of non-default stream case) sync is caller's
+   * responsibility */
+  if (!priv->stream) {
+    CuStreamSynchronize (stream);
+    GST_MINI_OBJECT_FLAG_UNSET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+  } else {
+    GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+  }
+  gst_cuda_context_pop (nullptr);
+
+  if (!ret)
+    GST_ERROR_OBJECT (self, "Failed to upload memory");
+
+  return ret;
+}
+
+static gboolean
+gst_cuda_memory_download (GstCudaAllocator * self, GstCudaMemory * mem)
+{
+  GstCudaMemoryPrivate *priv = mem->priv;
+  gboolean ret = TRUE;
+  CUDA_MEMCPY2D param = { 0, };
+  CUstream stream = gst_cuda_stream_get_handle (priv->stream);
+
+  if (!GST_MEMORY_FLAG_IS_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD))
+    return TRUE;
+
+  if (!gst_cuda_context_push (mem->context)) {
+    GST_ERROR_OBJECT (self, "Failed to push cuda context");
+    return FALSE;
+  }
+
+  if (!priv->staging) {
+    ret = gst_cuda_result (CuMemAllocHost (&priv->staging,
+            GST_MEMORY_CAST (mem)->size));
+    if (!ret) {
+      GST_ERROR_OBJECT (self, "Failed to allocate staging memory");
+      gst_cuda_context_pop (nullptr);
+      return FALSE;
+    }
+  }
+
+  param.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+  param.srcDevice = (CUdeviceptr) priv->data;
+  param.srcPitch = priv->pitch;
+
+  param.dstMemoryType = CU_MEMORYTYPE_HOST;
+  param.dstHost = priv->staging;
+  param.dstPitch = priv->pitch;
+  param.WidthInBytes = priv->width_in_bytes;
+  param.Height = priv->height;
+
+  ret = gst_cuda_result (CuMemcpy2DAsync (&param, stream));
+  /* For CPU access, sync immediately */
+  CuStreamSynchronize (stream);
+  gst_cuda_context_pop (nullptr);
+  GST_MINI_OBJECT_FLAG_UNSET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+
+  if (!ret)
+    GST_ERROR_OBJECT (self, "Failed to upload memory");
+
+  return ret;
+}
+
+static gpointer
+cuda_mem_map (GstMemory * mem, gsize maxsize, GstMapFlags flags)
+{
+  GstCudaAllocator *self = GST_CUDA_ALLOCATOR (mem->allocator);
+  GstCudaMemory *cmem = GST_CUDA_MEMORY_CAST (mem);
+  GstCudaMemoryPrivate *priv = cmem->priv;
+  gpointer ret = nullptr;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  priv->saw_io = TRUE;
+
+  if ((flags & GST_MAP_CUDA) == GST_MAP_CUDA) {
+    if (!gst_cuda_memory_upload (self, cmem))
+      return nullptr;
+
+    GST_MEMORY_FLAG_UNSET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD);
+
+    if ((flags & GST_MAP_WRITE) == GST_MAP_WRITE) {
+      GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD);
+      /* Assume that memory needs sync if we are using non-default stream */
+      if (priv->stream)
+        GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+    }
+
+    return (gpointer) priv->data;
+  }
+
+  /* First CPU access, must be downloaded */
+  if (!priv->staging)
+    GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD);
+
+  if (!gst_cuda_memory_download (self, cmem))
+    return nullptr;
+
+  ret = priv->staging;
+
+  if ((flags & GST_MAP_WRITE) == GST_MAP_WRITE)
+    GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD);
+
+  GST_MEMORY_FLAG_UNSET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD);
+
+  return ret;
+}
+
+static void
+cuda_mem_unmap_full (GstMemory * mem, GstMapInfo * info)
+{
+  GstCudaMemory *cmem = GST_CUDA_MEMORY_CAST (mem);
+  GstCudaMemoryPrivate *priv = cmem->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if ((info->flags & GST_MAP_CUDA) == GST_MAP_CUDA) {
+    if ((info->flags & GST_MAP_WRITE) == GST_MAP_WRITE)
+      GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD);
+    return;
+  }
+
+  if ((info->flags & GST_MAP_WRITE) == GST_MAP_WRITE)
+    GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD);
+
+  return;
+}
+
+static GstMemory *
+cuda_mem_copy (GstMemory * mem, gssize offset, gssize size)
+{
+  GstCudaAllocator *self = GST_CUDA_ALLOCATOR (mem->allocator);
+  GstCudaMemory *src_mem = GST_CUDA_MEMORY_CAST (mem);
+  GstCudaContext *context = src_mem->context;
+  GstMapInfo src_info, dst_info;
+  CUDA_MEMCPY2D param = { 0, };
+  GstMemory *copy = nullptr;
+  gboolean ret;
+  GstCudaStream *stream = src_mem->priv->stream;
+  CUstream stream_handle = gst_cuda_stream_get_handle (stream);
+
+  /* non-zero offset or different size is not supported */
+  if (offset != 0 || (size != -1 && (gsize) size != mem->size)) {
+    GST_DEBUG_OBJECT (self, "Different size/offset, try fallback copy");
+    return self->priv->fallback_copy (mem, offset, size);
+  }
+
+  if (GST_IS_CUDA_POOL_ALLOCATOR (self)) {
+    gst_cuda_pool_allocator_acquire_memory (GST_CUDA_POOL_ALLOCATOR (self),
+        &copy);
+  }
+
+  if (!copy) {
+    copy = gst_cuda_allocator_alloc_internal (self, context, stream,
+        &src_mem->info, src_mem->priv->width_in_bytes, src_mem->priv->height);
+  }
+
+  if (!copy) {
+    GST_ERROR_OBJECT (self, "Failed to allocate memory for copying");
+    return nullptr;
+  }
+
+  if (!gst_memory_map (mem, &src_info,
+          (GstMapFlags) (GST_MAP_READ | GST_MAP_CUDA))) {
+    GST_ERROR_OBJECT (self, "Failed to map src memory");
+    gst_memory_unref (copy);
+    return nullptr;
+  }
+
+  if (!gst_memory_map (copy, &dst_info,
+          (GstMapFlags) (GST_MAP_WRITE | GST_MAP_CUDA))) {
+    GST_ERROR_OBJECT (self, "Failed to map dst memory");
+    gst_memory_unmap (mem, &src_info);
+    gst_memory_unref (copy);
+    return nullptr;
+  }
+
+  if (!gst_cuda_context_push (context)) {
+    GST_ERROR_OBJECT (self, "Failed to push cuda context");
+    gst_memory_unmap (mem, &src_info);
+    gst_memory_unmap (copy, &dst_info);
+
+    return nullptr;
+  }
+
+  param.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+  param.srcDevice = (CUdeviceptr) src_info.data;
+  param.srcPitch = src_mem->priv->pitch;
+
+  param.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+  param.dstDevice = (CUdeviceptr) dst_info.data;
+  param.dstPitch = src_mem->priv->pitch;
+  param.WidthInBytes = src_mem->priv->width_in_bytes;
+  param.Height = src_mem->priv->height;
+
+  ret = gst_cuda_result (CuMemcpy2DAsync (&param, stream_handle));
+  CuStreamSynchronize (stream_handle);
+  gst_cuda_context_pop (nullptr);
+
+  gst_memory_unmap (mem, &src_info);
+  gst_memory_unmap (copy, &dst_info);
+
+  if (!ret) {
+    GST_ERROR_OBJECT (self, "Failed to copy memory");
+    gst_memory_unref (copy);
+    return nullptr;
+  }
+
+  return copy;
+}
+
+/**
+ * gst_cuda_memory_init_once:
+ *
+ * Ensures that the #GstCudaAllocator is initialized and ready to be used.
+ *
+ * Since: 1.22
+ */
+void
+gst_cuda_memory_init_once (void)
+{
+  GST_CUDA_CALL_ONCE_BEGIN {
+    _gst_cuda_allocator =
+        (GstAllocator *) g_object_new (GST_TYPE_CUDA_ALLOCATOR, nullptr);
+    gst_object_ref_sink (_gst_cuda_allocator);
+    gst_object_ref (_gst_cuda_allocator);
+
+    gst_allocator_register (GST_CUDA_MEMORY_TYPE_NAME, _gst_cuda_allocator);
+  } GST_CUDA_CALL_ONCE_END;
+}
+
+/**
+ * gst_is_cuda_memory:
+ * @mem: A #GstMemory
+ *
+ * Check if @mem is a cuda memory
+ *
+ * Since: 1.22
+ */
+gboolean
+gst_is_cuda_memory (GstMemory * mem)
+{
+  return mem != nullptr && mem->allocator != nullptr &&
+      GST_IS_CUDA_ALLOCATOR (mem->allocator);
+}
+
+/**
+ * gst_cuda_memory_get_stream:
+ * @mem: A #GstCudaMemory
+ *
+ * Gets CUDA stream object associated with @mem
+ *
+ * Returns: (transfer none) (nullable): a #GstCudaStream or %NULL if default
+ * CUDA stream is in use
+ *
+ * Since: 1.24
+ */
+GstCudaStream *
+gst_cuda_memory_get_stream (GstCudaMemory * mem)
+{
+  g_return_val_if_fail (gst_is_cuda_memory ((GstMemory *) mem), nullptr);
+
+  return mem->priv->stream;
+}
+
+/**
+ * gst_cuda_memory_sync:
+ * @mem: A #GstCudaMemory
+ *
+ * Performs synchronization if needed
+ *
+ * Since: 1.24
+ */
+void
+gst_cuda_memory_sync (GstCudaMemory * mem)
+{
+  GstCudaMemoryPrivate *priv;
+
+  g_return_if_fail (gst_is_cuda_memory ((GstMemory *) mem));
+
+  priv = mem->priv;
+  if (!priv->stream)
+    return;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if (GST_MEMORY_FLAG_IS_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC)) {
+    GST_MEMORY_FLAG_UNSET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+    if (gst_cuda_context_push (mem->context)) {
+      CuStreamSynchronize (gst_cuda_stream_get_handle (priv->stream));
+      gst_cuda_context_pop (nullptr);
+    }
+  }
+}
+
+typedef struct _TextureFormat
+{
+  GstVideoFormat format;
+  CUarray_format array_formatGST_VIDEO_MAX_COMPONENTS;
+  guint channelsGST_VIDEO_MAX_COMPONENTS;
+} TextureFormat;
+
+#define CU_AD_FORMAT_NONE ((CUarray_format) 0)
+#define MAKE_FORMAT_YUV_PLANAR(f,cf) \
+  { GST_VIDEO_FORMAT_ ##f,  { CU_AD_FORMAT_ ##cf, CU_AD_FORMAT_ ##cf, \
+      CU_AD_FORMAT_ ##cf, CU_AD_FORMAT_NONE },  {1, 1, 1, 0} }
+#define MAKE_FORMAT_YUV_SEMI_PLANAR(f,cf) \
+  { GST_VIDEO_FORMAT_ ##f,  { CU_AD_FORMAT_ ##cf, CU_AD_FORMAT_ ##cf, \
+      CU_AD_FORMAT_NONE, CU_AD_FORMAT_NONE }, {1, 2, 0, 0} }
+#define MAKE_FORMAT_RGB(f,cf) \
+  { GST_VIDEO_FORMAT_ ##f,  { CU_AD_FORMAT_ ##cf, CU_AD_FORMAT_NONE, \
+      CU_AD_FORMAT_NONE, CU_AD_FORMAT_NONE }, {4, 0, 0, 0} }
+#define MAKE_FORMAT_RGBP(f,cf) \
+  { GST_VIDEO_FORMAT_ ##f,  { CU_AD_FORMAT_ ##cf, CU_AD_FORMAT_ ##cf, \
+      CU_AD_FORMAT_ ##cf, CU_AD_FORMAT_NONE }, {1, 1, 1, 0} }
+#define MAKE_FORMAT_RGBAP(f,cf) \
+  { GST_VIDEO_FORMAT_ ##f,  { CU_AD_FORMAT_ ##cf, CU_AD_FORMAT_ ##cf, \
+      CU_AD_FORMAT_ ##cf, CU_AD_FORMAT_ ##cf }, {1, 1, 1, 1} }
+
+static const TextureFormat format_map = {
+  MAKE_FORMAT_YUV_PLANAR (I420, UNSIGNED_INT8),
+  MAKE_FORMAT_YUV_PLANAR (YV12, UNSIGNED_INT8),
+  MAKE_FORMAT_YUV_SEMI_PLANAR (NV12, UNSIGNED_INT8),
+  MAKE_FORMAT_YUV_SEMI_PLANAR (NV21, UNSIGNED_INT8),
+  MAKE_FORMAT_YUV_SEMI_PLANAR (P010_10LE, UNSIGNED_INT16),
+  MAKE_FORMAT_YUV_SEMI_PLANAR (P012_LE, UNSIGNED_INT16),
+  MAKE_FORMAT_YUV_SEMI_PLANAR (P016_LE, UNSIGNED_INT16),
+  MAKE_FORMAT_YUV_PLANAR (I420_10LE, UNSIGNED_INT16),
+  MAKE_FORMAT_YUV_PLANAR (I420_12LE, UNSIGNED_INT16),
+  MAKE_FORMAT_YUV_PLANAR (Y444, UNSIGNED_INT8),
+  MAKE_FORMAT_YUV_PLANAR (Y444_10LE, UNSIGNED_INT16),
+  MAKE_FORMAT_YUV_PLANAR (Y444_12LE, UNSIGNED_INT16),
+  MAKE_FORMAT_YUV_PLANAR (Y444_16LE, UNSIGNED_INT16),
+  MAKE_FORMAT_RGB (RGBA, UNSIGNED_INT8),
+  MAKE_FORMAT_RGB (BGRA, UNSIGNED_INT8),
+  MAKE_FORMAT_RGB (RGBx, UNSIGNED_INT8),
+  MAKE_FORMAT_RGB (BGRx, UNSIGNED_INT8),
+  MAKE_FORMAT_RGB (ARGB, UNSIGNED_INT8),
+  MAKE_FORMAT_RGB (ARGB64, UNSIGNED_INT16),
+  MAKE_FORMAT_RGB (ABGR, UNSIGNED_INT8),
+  MAKE_FORMAT_YUV_PLANAR (Y42B, UNSIGNED_INT8),
+  MAKE_FORMAT_YUV_PLANAR (I422_10LE, UNSIGNED_INT16),
+  MAKE_FORMAT_YUV_PLANAR (I422_12LE, UNSIGNED_INT16),
+  MAKE_FORMAT_RGBP (RGBP, UNSIGNED_INT8),
+  MAKE_FORMAT_RGBP (BGRP, UNSIGNED_INT8),
+  MAKE_FORMAT_RGBP (GBR, UNSIGNED_INT8),
+  MAKE_FORMAT_RGBP (GBR_10LE, UNSIGNED_INT16),
+  MAKE_FORMAT_RGBP (GBR_12LE, UNSIGNED_INT16),
+  MAKE_FORMAT_RGBP (GBR_16LE, UNSIGNED_INT16),
+  MAKE_FORMAT_RGBAP (GBRA, UNSIGNED_INT8),
+};
+
+/**
+ * gst_cuda_memory_get_texture:
+ * @mem: A #GstCudaMemory
+ * @plane: the plane index
+ * @filter_mode: filter mode
+ * @texture: (out) (transfer none): a pointer to CUtexObject object
+ *
+ * Creates CUtexObject with given parameters
+ *
+ * Returns: %TRUE if successful
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_cuda_memory_get_texture (GstCudaMemory * mem, guint plane,
+    CUfilter_mode filter_mode, CUtexObject * texture)
+{
+  GstAllocator *alloc;
+  GstCudaMemoryPrivate *priv;
+  CUtexObject tex = 0;
+  CUdeviceptr src_ptr;
+  CUDA_RESOURCE_DESC resource_desc;
+  CUDA_TEXTURE_DESC texture_desc;
+  const TextureFormat *format = nullptr;
+  CUresult ret;
+
+  g_return_val_if_fail (gst_is_cuda_memory ((GstMemory *) mem), FALSE);
+  g_return_val_if_fail (plane < GST_VIDEO_INFO_N_PLANES (&mem->info), FALSE);
+  g_return_val_if_fail (filter_mode == CU_TR_FILTER_MODE_POINT ||
+      filter_mode == CU_TR_FILTER_MODE_LINEAR, FALSE);
+
+  alloc = mem->mem.allocator;
+  priv = mem->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if (priv->textureplanefilter_mode) {
+    *texture = priv->textureplanefilter_mode;
+    return TRUE;
+  }
+
+  src_ptr = (CUdeviceptr) (((guint8 *) priv->data) + mem->info.offsetplane);
+  if (priv->texture_align > 0 && (src_ptr % priv->texture_align) != 0) {
+    GST_INFO_OBJECT (alloc, "Plane %d data is not aligned", plane);
+    return FALSE;
+  }
+
+  for (guint i = 0; i < G_N_ELEMENTS (format_map); i++) {
+    if (format_mapi.format == GST_VIDEO_INFO_FORMAT (&mem->info)) {
+      format = &format_mapi;
+      break;
+    }
+  }
+
+  if (!format) {
+    GST_WARNING_OBJECT (alloc, "Not supported format %s",
+        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&mem->info)));
+    return FALSE;
+  }
+
+  memset (&resource_desc, 0, sizeof (CUDA_RESOURCE_DESC));
+  memset (&texture_desc, 0, sizeof (CUDA_TEXTURE_DESC));
+
+  resource_desc.resType = CU_RESOURCE_TYPE_PITCH2D;
+  resource_desc.res.pitch2D.format = format->array_formatplane;
+  resource_desc.res.pitch2D.numChannels = format->channelsplane;
+  resource_desc.res.pitch2D.width =
+      GST_VIDEO_INFO_COMP_WIDTH (&mem->info, plane);
+  resource_desc.res.pitch2D.height =
+      GST_VIDEO_INFO_COMP_HEIGHT (&mem->info, plane);
+  resource_desc.res.pitch2D.pitchInBytes =
+      GST_VIDEO_INFO_PLANE_STRIDE (&mem->info, plane);
+  resource_desc.res.pitch2D.devPtr = src_ptr;
+
+  texture_desc.filterMode = filter_mode;
+  /* Will read texture value as a normalized 0, 1 float value
+   * with 0, 1) coordinates */
+  /* CU_TRSF_NORMALIZED_COORDINATES */
+  texture_desc.flags = 0x2;
+  /* CU_TR_ADDRESS_MODE_CLAMP */
+  texture_desc.addressMode0 = (CUaddress_mode) 1;
+  texture_desc.addressMode1 = (CUaddress_mode) 1;
+  texture_desc.addressMode2 = (CUaddress_mode) 1;
+
+  if (!gst_cuda_context_push (mem->context))
+    return FALSE;
+
+  ret = CuTexObjectCreate (&tex, &resource_desc, &texture_desc, nullptr);
+  gst_cuda_context_pop (nullptr);
+
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (alloc, "Could not create texture");
+    return FALSE;
+  }
+
+  /* Cache this texture to reuse later */
+  priv->textureplanefilter_mode = tex;
+
+  *texture = tex;
+
+  return TRUE;
+}
+
+/**
+ * gst_cuda_memory_get_user_data:
+ * @mem: A #GstCudaMemory
+ *
+ * Gets user data pointer stored via gst_cuda_allocator_alloc_wrapped()
+ *
+ * Returns: (transfer none) (nullable): the user data pointer
+ *
+ * Since: 1.24
+ */
+gpointer
+gst_cuda_memory_get_user_data (GstCudaMemory * mem)
+{
+  g_return_val_if_fail (gst_is_cuda_memory ((GstMemory *) mem), nullptr);
+
+  return mem->priv->user_data;
+}
+
+/**
+ * gst_cuda_memory_set_token_data:
+ * @mem: a #GstCudaMemory
+ * @token: an user token
+ * @data: an user data
+ * @notify: function to invoke with @data as argument, when @data needs to be
+ *          freed
+ *
+ * Sets an opaque user data on a #GstCudaMemory
+ *
+ * Since: 1.24
+ */
+void
+gst_cuda_memory_set_token_data (GstCudaMemory * mem, gint64 token,
+    gpointer data, GDestroyNotify notify)
+{
+  GstCudaMemoryPrivate *priv;
+
+  g_return_if_fail (gst_is_cuda_memory (GST_MEMORY_CAST (mem)));
+
+  priv = mem->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+  auto old_token = priv->token_map.find (token);
+  if (old_token != priv->token_map.end ())
+    priv->token_map.erase (old_token);
+
+  if (data) {
+    priv->token_maptoken =
+        std::unique_ptr < GstCudaMemoryTokenData >
+        (new GstCudaMemoryTokenData (data, notify));
+  }
+}
+
+/**
+ * gst_cuda_memory_get_token_data:
+ * @mem: a #GstCudaMemory
+ * @token: an user token
+ *
+ * Gets back user data pointer stored via gst_cuda_memory_set_token_data()
+ *
+ * Returns: (transfer none) (nullable): user data pointer or %NULL
+ *
+ * Since: 1.24
+ */
+gpointer
+gst_cuda_memory_get_token_data (GstCudaMemory * mem, gint64 token)
+{
+  GstCudaMemoryPrivate *priv;
+  gpointer ret = nullptr;
+
+  g_return_val_if_fail (gst_is_cuda_memory (GST_MEMORY_CAST (mem)), nullptr);
+
+  priv = mem->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+  auto old_token = priv->token_map.find (token);
+  if (old_token != priv->token_map.end ())
+    ret = old_token->second->user_data;
+
+  return ret;
+}
+
+/**
+ * gst_cuda_memory_get_alloc_method:
+ * @mem: a #GstCudaMemory
+ *
+ * Query allocation method
+ *
+ * Since: 1.24
+ */
+GstCudaMemoryAllocMethod
+gst_cuda_memory_get_alloc_method (GstCudaMemory * mem)
+{
+  g_return_val_if_fail (gst_is_cuda_memory (GST_MEMORY_CAST (mem)),
+      GST_CUDA_MEMORY_ALLOC_UNKNOWN);
+
+  return mem->priv->alloc_method;
+}
+
+/**
+ * gst_cuda_memory_export:
+ * @mem: a #GstCudaMemory
+ * @os_handle: (out caller-allocates): a pointer to OS handle
+ *
+ * Exports virtual memory handle to OS specific handle.
+ *
+ * On Windows, @os_handle should be pointer to HANDLE (i.e., void **), and
+ * pointer to file descriptor (i.e., int *) on Linux.
+ *
+ * The returned @os_handle is owned by @mem and therefore caller shouldn't
+ * close the handle.
+ *
+ * returns: %TRUE if successful
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_cuda_memory_export (GstCudaMemory * mem, gpointer os_handle)
+{
+  GstCudaMemoryPrivate *priv;
+
+  g_return_val_if_fail (gst_is_cuda_memory (GST_MEMORY_CAST (mem)), FALSE);
+  g_return_val_if_fail (os_handle != nullptr, FALSE);
+
+  priv = mem->priv;
+
+  if (priv->alloc_method != GST_CUDA_MEMORY_ALLOC_MMAP)
+    return FALSE;
+
+  if (priv->alloc_prop.requestedHandleTypes == CU_MEM_HANDLE_TYPE_NONE)
+    return FALSE;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if (!priv->exported) {
+    CUresult ret;
+
+    ret = CuMemExportToShareableHandle ((void *) &priv->os_handle, priv->handle,
+        priv->alloc_prop.requestedHandleTypes, 0);
+    if (!gst_cuda_result (ret))
+      return FALSE;
+
+    priv->exported = TRUE;
+  }
+#ifdef G_OS_WIN32
+  *((HANDLE *) os_handle) = priv->os_handle;
+#else
+  *((int *) os_handle) = priv->os_handle;
+#endif
+
+  return TRUE;
+}
+
+static guint
+gst_cuda_allocator_calculate_alloc_height (const GstVideoInfo * info)
+{
+  guint alloc_height;
+
+  alloc_height = GST_VIDEO_INFO_HEIGHT (info);
+
+  /* make sure valid height for subsampled formats */
+  switch (GST_VIDEO_INFO_FORMAT (info)) {
+    case GST_VIDEO_FORMAT_I420:
+    case GST_VIDEO_FORMAT_YV12:
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+    case GST_VIDEO_FORMAT_P016_LE:
+    case GST_VIDEO_FORMAT_I420_10LE:
+    case GST_VIDEO_FORMAT_I420_12LE:
+      alloc_height = GST_ROUND_UP_2 (alloc_height);
+      break;
+    default:
+      break;
+  }
+
+  switch (GST_VIDEO_INFO_FORMAT (info)) {
+    case GST_VIDEO_FORMAT_I420:
+    case GST_VIDEO_FORMAT_YV12:
+    case GST_VIDEO_FORMAT_I420_10LE:
+    case GST_VIDEO_FORMAT_I420_12LE:
+      alloc_height *= 2;
+      break;
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_NV21:
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+    case GST_VIDEO_FORMAT_P016_LE:
+      alloc_height += alloc_height / 2;
+      break;
+    case GST_VIDEO_FORMAT_Y42B:
+    case GST_VIDEO_FORMAT_I422_10LE:
+    case GST_VIDEO_FORMAT_I422_12LE:
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_Y444_10LE:
+    case GST_VIDEO_FORMAT_Y444_12LE:
+    case GST_VIDEO_FORMAT_Y444_16LE:
+    case GST_VIDEO_FORMAT_RGBP:
+    case GST_VIDEO_FORMAT_BGRP:
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBR_10LE:
+    case GST_VIDEO_FORMAT_GBR_12LE:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      alloc_height *= 3;
+      break;
+    case GST_VIDEO_FORMAT_GBRA:
+      alloc_height *= 4;
+      break;
+    default:
+      break;
+  }
+
+  return alloc_height;
+}
+
+/**
+ * gst_cuda_allocator_alloc:
+ * @allocator: (transfer none) (allow-none): a #GstCudaAllocator
+ * @context: (transfer none): a #GstCudaContext
+ * @stream: (transfer none) (allow-none): a #GstCudaStream
+ * @info: a #GstVideoInfo
+ *
+ * Returns: (transfer full) (nullable): a newly allocated #GstCudaMemory
+ *
+ * Since: 1.22
+ */
+GstMemory *
+gst_cuda_allocator_alloc (GstCudaAllocator * allocator,
+    GstCudaContext * context, GstCudaStream * stream, const GstVideoInfo * info)
+{
+  guint alloc_height;
+
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+  g_return_val_if_fail (!stream || GST_IS_CUDA_STREAM (stream), nullptr);
+  g_return_val_if_fail (info != nullptr, nullptr);
+
+  if (stream && stream->context != context) {
+    GST_ERROR_OBJECT (context,
+        "stream object is holding different CUDA context");
+    return nullptr;
+  }
+
+  if (!allocator)
+    allocator = (GstCudaAllocator *) _gst_cuda_allocator;
+
+  alloc_height = gst_cuda_allocator_calculate_alloc_height (info);
+
+  return gst_cuda_allocator_alloc_internal (allocator, context, stream,
+      info, info->stride0, alloc_height);
+}
+
+/**
+ * gst_cuda_allocator_set_active:
+ * @allocator: a #GstCudaAllocator
+ * @active: the new active state
+ *
+ * Controls the active state of @allocator. Default #GstCudaAllocator is
+ * stateless and therefore active state is ignored, but subclass implementation
+ * (e.g., #GstCudaPoolAllocator) will require explicit active state control
+ * for its internal resource management.
+ *
+ * This method is conceptually identical to gst_buffer_pool_set_active method.
+ *
+ * Returns: %TRUE if active state of @allocator was successfully updated.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_cuda_allocator_set_active (GstCudaAllocator * allocator, gboolean active)
+{
+  GstCudaAllocatorClass *klass;
+
+  g_return_val_if_fail (GST_IS_CUDA_ALLOCATOR (allocator), FALSE);
+
+  klass = GST_CUDA_ALLOCATOR_GET_CLASS (allocator);
+  if (klass->set_active)
+    return klass->set_active (allocator, active);
+
+  return TRUE;
+}
+
+/**
+ * gst_cuda_allocator_alloc_wrapped:
+ * @allocator: (transfer none) (allow-none): a #GstCudaAllocator
+ * @context: (transfer none): a #GstCudaContext
+ * @stream: (transfer none) (allow-none): a #GstCudaStream
+ * @info: a #GstVideoInfo
+ * @dev_ptr: a CUdeviceptr CUDA device memory
+ * @user_data: (allow-none): user data
+ * @notify: (allow-none) (scope async) (closure user_data):
+ *   Called with @user_data when the memory is freed
+ *
+ * Allocates a new memory that wraps the given CUDA device memory.
+ *
+ * @info must represent actual memory layout, in other words, offset, stride
+ * and size fields of @info should be matched with memory layout of @dev_ptr
+ *
+ * By default, wrapped @dev_ptr will be freed at the time when #GstMemory
+ * is freed if @notify is %NULL. Otherwise, if caller sets @notify,
+ * freeing @dev_ptr is callers responsibility and default #GstCudaAllocator
+ * will not free it.
+ *
+ * Returns: (transfer full): a new #GstMemory
+ *
+ * Since: 1.24
+ */
+GstMemory *
+gst_cuda_allocator_alloc_wrapped (GstCudaAllocator * allocator,
+    GstCudaContext * context, GstCudaStream * stream, const GstVideoInfo * info,
+    CUdeviceptr dev_ptr, gpointer user_data, GDestroyNotify notify)
+{
+  GstCudaMemory *mem;
+  GstCudaMemoryPrivate *priv;
+
+  if (!allocator)
+    allocator = (GstCudaAllocator *) _gst_cuda_allocator;
+
+  g_return_val_if_fail (GST_IS_CUDA_ALLOCATOR (allocator), nullptr);
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+  g_return_val_if_fail (!stream || GST_IS_CUDA_STREAM (stream), nullptr);
+  g_return_val_if_fail (info, nullptr);
+  g_return_val_if_fail (dev_ptr, nullptr);
+
+  mem = g_new0 (GstCudaMemory, 1);
+  mem->priv = priv = new GstCudaMemoryPrivate ();
+
+  priv->data = dev_ptr;
+  priv->pitch = info->stride0;
+  priv->width_in_bytes = GST_VIDEO_INFO_COMP_WIDTH (info, 0) *
+      GST_VIDEO_INFO_COMP_PSTRIDE (info, 0);
+  priv->height = info->size / priv->pitch;
+  if (stream)
+    priv->stream = gst_cuda_stream_ref (stream);
+  priv->user_data = user_data;
+  priv->notify = notify;
+
+  mem->context = (GstCudaContext *) gst_object_ref (context);
+  mem->info = *info;
+
+  gst_memory_init (GST_MEMORY_CAST (mem), (GstMemoryFlags) 0,
+      GST_ALLOCATOR_CAST (allocator), nullptr, info->size, 0, 0, info->size);
+
+  return GST_MEMORY_CAST (mem);
+}
+
+void
+gst_cuda_memory_set_from_fixed_pool (GstMemory * mem)
+{
+  GstCudaMemory *cmem;
+
+  if (!gst_is_cuda_memory (mem))
+    return;
+
+  cmem = GST_CUDA_MEMORY_CAST (mem);
+  cmem->priv->from_fixed_pool = TRUE;
+}
+
+gboolean
+gst_cuda_memory_is_from_fixed_pool (GstMemory * mem)
+{
+  GstCudaMemory *cmem;
+
+  if (!gst_is_cuda_memory (mem))
+    return FALSE;
+
+  cmem = GST_CUDA_MEMORY_CAST (mem);
+
+  return cmem->priv->from_fixed_pool;
+}
+
+static size_t
+do_align (size_t value, size_t align)
+{
+  if (align == 0)
+    return value;
+
+  return ((value + align - 1) / align) * align;
+}
+
+/**
+ * gst_cuda_allocator_virtual_alloc:
+ * @allocator: a #GstCudaAllocator
+ * @context: a #GstCudaContext
+ * @stream: a #GstCudaStream
+ * @info: a #GstVideoInfo
+ * @prop: allocation property
+ * @granularity_flags: allocation flags
+ *
+ * Allocates new #GstMemory object with CUDA virtual memory.
+ *
+ * Returns: (transfer full) (nullable): a newly allocated memory object or
+ * %NULL if allocation is not supported
+ *
+ * Since: 1.24
+ */
+GstMemory *
+gst_cuda_allocator_virtual_alloc (GstCudaAllocator * allocator,
+    GstCudaContext * context, GstCudaStream * stream, const GstVideoInfo * info,
+    const CUmemAllocationProp * prop,
+    CUmemAllocationGranularity_flags granularity_flags)
+{
+  guint alloc_height;
+  guint id = 0;
+  size_t granularity;
+  size_t stride;
+  size_t size;
+  size_t max_size;
+  CUresult ret;
+  gint texture_alignment;
+  CUmemGenericAllocationHandle handle;
+  CUdeviceptr ptr;
+  CUmemAccessDesc access_desc;
+  GstCudaMemoryPrivate *priv;
+  GstCudaMemory *mem;
+  GstVideoInfo alloc_info;
+
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+  g_return_val_if_fail (!stream || GST_IS_CUDA_STREAM (stream), nullptr);
+  g_return_val_if_fail (info != nullptr, nullptr);
+  g_return_val_if_fail (prop != nullptr, nullptr);
+
+  if (stream && stream->context != context) {
+    GST_ERROR_OBJECT (context,
+        "stream object is holding different CUDA context");
+    return nullptr;
+  }
+
+  g_object_get (context, "cuda-device-id", &id, nullptr);
+  if ((gint) id != prop->location.id) {
+    GST_ERROR_OBJECT (context, "Different device id");
+    return nullptr;
+  }
+
+  if (!allocator)
+    allocator = (GstCudaAllocator *) _gst_cuda_allocator;
+
+  alloc_height = gst_cuda_allocator_calculate_alloc_height (info);
+  texture_alignment = gst_cuda_context_get_texture_alignment (context);
+
+  stride = do_align (info->stride0, texture_alignment);
+  if (!gst_cuda_allocator_update_info (info, stride, alloc_height, &alloc_info)) {
+    GST_ERROR_OBJECT (context, "Couldn't calculate aligned info");
+    return nullptr;
+  }
+
+  if (!gst_cuda_context_push (context))
+    return nullptr;
+
+  ret = CuMemGetAllocationGranularity (&granularity, prop, granularity_flags);
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (context, "Couldn't get granularity");
+    goto error;
+  }
+
+  size = stride * alloc_height;
+  max_size = do_align (size, granularity);
+
+  ret = CuMemCreate (&handle, max_size, prop, 0);
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (context, "Couldn't create memory");
+    goto error;
+  }
+
+  ret = CuMemAddressReserve (&ptr, max_size, 0, 0, 0);
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (context, "Couldn't reserve memory");
+    gst_cuda_result (CuMemRelease (handle));
+    goto error;
+  }
+
+  ret = CuMemMap (ptr, max_size, 0, handle, 0);
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (context, "Couldn't map memory");
+    CuMemAddressFree (ptr, max_size);
+    CuMemRelease (handle);
+    goto error;
+  }
+
+  memset (&access_desc, 0, sizeof (CUmemAccessDesc));
+  access_desc.location.id = (int) id;
+  access_desc.location.type = CU_MEM_LOCATION_TYPE_DEVICE;
+  access_desc.flags = CU_MEM_ACCESS_FLAGS_PROT_READWRITE;
+  ret = CuMemSetAccess (ptr, max_size, &access_desc, 1);
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (context, "Couldn't set access");
+    CuMemUnmap (ptr, max_size);
+    CuMemAddressFree (ptr, max_size);
+    CuMemRelease (handle);
+    goto error;
+  }
+
+  mem = g_new0 (GstCudaMemory, 1);
+  mem->context = (GstCudaContext *) gst_object_ref (context);
+  mem->info = alloc_info;
+  mem->priv = priv = new GstCudaMemoryPrivate ();
+
+  priv->data = ptr;
+  priv->pitch = stride;
+  priv->width_in_bytes = info->stride0;
+  priv->height = alloc_height;
+  priv->texture_align = texture_alignment;
+  if (stream)
+    priv->stream = gst_cuda_stream_ref (stream);
+  priv->alloc_method = GST_CUDA_MEMORY_ALLOC_MMAP;
+  priv->max_size = max_size;
+  priv->handle = handle;
+  priv->alloc_prop = *prop;
+
+  gst_memory_init (GST_MEMORY_CAST (mem), (GstMemoryFlags) 0,
+      GST_ALLOCATOR_CAST (allocator), nullptr, max_size, 0, 0, size);
+
+  return GST_MEMORY_CAST (mem);
+
+error:
+  gst_cuda_context_pop (nullptr);
+  return nullptr;
+}
+
+#define GST_CUDA_POOL_ALLOCATOR_IS_FLUSHING(alloc)  (g_atomic_int_get (&alloc->priv->flushing))
+
+struct _GstCudaPoolAllocatorPrivate
+{
+  GstAtomicQueue *queue;
+  GstPoll *poll;
+
+  GstCudaMemoryAllocMethod alloc_method;
+  CUmemAllocationProp prop;
+  CUmemAllocationGranularity_flags granularity_flags;
+
+  GRecMutex lock;
+  gboolean started;
+  gboolean active;
+
+  guint outstanding;
+  guint cur_mems;
+  gboolean flushing;
+};
+
+static void gst_cuda_pool_allocator_finalize (GObject * object);
+
+static gboolean
+gst_cuda_pool_allocator_set_active (GstCudaAllocator * allocator,
+    gboolean active);
+
+static gboolean gst_cuda_pool_allocator_start (GstCudaPoolAllocator * self);
+static gboolean gst_cuda_pool_allocator_stop (GstCudaPoolAllocator * self);
+static gboolean gst_cuda_memory_release (GstMiniObject * mini_object);
+
+#define gst_cuda_pool_allocator_parent_class pool_alloc_parent_class
+G_DEFINE_TYPE_WITH_PRIVATE (GstCudaPoolAllocator,
+    gst_cuda_pool_allocator, GST_TYPE_CUDA_ALLOCATOR);
+
+static void
+gst_cuda_pool_allocator_class_init (GstCudaPoolAllocatorClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstCudaAllocatorClass *cuda_alloc_class = GST_CUDA_ALLOCATOR_CLASS (klass);
+
+  gobject_class->finalize = gst_cuda_pool_allocator_finalize;
+
+  cuda_alloc_class->set_active = gst_cuda_pool_allocator_set_active;
+}
+
+static void
+gst_cuda_pool_allocator_init (GstCudaPoolAllocator * allocator)
+{
+  GstCudaPoolAllocatorPrivate *priv;
+
+  priv = allocator->priv = (GstCudaPoolAllocatorPrivate *)
+      gst_cuda_pool_allocator_get_instance_private (allocator);
+
+  g_rec_mutex_init (&priv->lock);
+
+  priv->poll = gst_poll_new_timer ();
+  priv->queue = gst_atomic_queue_new (16);
+  priv->flushing = 1;
+  priv->active = FALSE;
+  priv->started = FALSE;
+  priv->alloc_method = GST_CUDA_MEMORY_ALLOC_MALLOC;
+
+  /* 1 control write for flushing - the flush token */
+  gst_poll_write_control (priv->poll);
+  /* 1 control write for marking that we are not waiting for poll - the wait token */
+  gst_poll_write_control (priv->poll);
+}
+
+static void
+gst_cuda_pool_allocator_finalize (GObject * object)
+{
+  GstCudaPoolAllocator *self = GST_CUDA_POOL_ALLOCATOR (object);
+  GstCudaPoolAllocatorPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Finalize");
+
+  gst_cuda_pool_allocator_stop (self);
+  gst_atomic_queue_unref (priv->queue);
+  gst_poll_free (priv->poll);
+  g_rec_mutex_clear (&priv->lock);
+
+  gst_clear_cuda_stream (&self->stream);
+  gst_clear_object (&self->context);
+
+  G_OBJECT_CLASS (pool_alloc_parent_class)->finalize (object);
+}
+
+static gboolean
+gst_cuda_pool_allocator_start (GstCudaPoolAllocator * self)
+{
+  GstCudaPoolAllocatorPrivate *priv = self->priv;
+
+  priv->started = TRUE;
+
+  return TRUE;
+}
+
+static void
+gst_cuda_pool_allocator_do_set_flushing (GstCudaPoolAllocator * self,
+    gboolean flushing)
+{
+  GstCudaPoolAllocatorPrivate *priv = self->priv;
+
+  if (GST_CUDA_POOL_ALLOCATOR_IS_FLUSHING (self) == flushing)
+    return;
+
+  if (flushing) {
+    g_atomic_int_set (&priv->flushing, 1);
+    /* Write the flush token to wake up any waiters */
+    gst_poll_write_control (priv->poll);
+  } else {
+    while (!gst_poll_read_control (priv->poll)) {
+      if (errno == EWOULDBLOCK) {
+        /* This should not really happen unless flushing and unflushing
+         * happens on different threads. Let's wait a bit to get back flush
+         * token from the thread that was setting it to flushing */
+        g_thread_yield ();
+        continue;
+      } else {
+        /* Critical error but GstPoll already complained */
+        break;
+      }
+    }
+
+    g_atomic_int_set (&priv->flushing, 0);
+  }
+}
+
+static gboolean
+gst_cuda_pool_allocator_set_active (GstCudaAllocator * allocator,
+    gboolean active)
+{
+  GstCudaPoolAllocator *self = GST_CUDA_POOL_ALLOCATOR (allocator);
+  GstCudaPoolAllocatorPrivate *priv = self->priv;
+  gboolean ret = TRUE;
+
+  GST_LOG_OBJECT (self, "active %d", active);
+
+  g_rec_mutex_lock (&priv->lock);
+  /* just return if we are already in the right state */
+  if (priv->active == active)
+    goto done;
+
+  if (active) {
+    gst_cuda_pool_allocator_start (self);
+
+    /* flush_stop may release memory objects, setting to active to avoid running
+     * do_stop while activating the pool */
+    priv->active = TRUE;
+
+    gst_cuda_pool_allocator_do_set_flushing (self, FALSE);
+  } else {
+    gint outstanding;
+
+    /* set to flushing first */
+    gst_cuda_pool_allocator_do_set_flushing (self, TRUE);
+
+    /* when all memory objects are in the pool, free them. Else they will be
+     * freed when they are released */
+    outstanding = g_atomic_int_get (&priv->outstanding);
+    GST_LOG_OBJECT (self, "outstanding memories %d, (in queue %d)",
+        outstanding, gst_atomic_queue_length (priv->queue));
+    if (outstanding == 0) {
+      if (!gst_cuda_pool_allocator_stop (self)) {
+        GST_ERROR_OBJECT (self, "stop failed");
+        ret = FALSE;
+        goto done;
+      }
+    }
+
+    priv->active = FALSE;
+  }
+
+done:
+  g_rec_mutex_unlock (&priv->lock);
+
+  return ret;
+}
+
+static void
+gst_cuda_pool_allocator_free_memory (GstCudaPoolAllocator * self,
+    GstMemory * mem)
+{
+  GstCudaPoolAllocatorPrivate *priv = self->priv;
+
+  g_atomic_int_add (&priv->cur_mems, -1);
+  GST_LOG_OBJECT (self, "freeing memory %p (%u left)", mem, priv->cur_mems);
+
+  GST_MINI_OBJECT_CAST (mem)->dispose = nullptr;
+  gst_memory_unref (mem);
+}
+
+static gboolean
+gst_cuda_pool_allocator_clear_queue (GstCudaPoolAllocator * self)
+{
+  GstCudaPoolAllocatorPrivate *priv = self->priv;
+  GstMemory *memory;
+
+  GST_LOG_OBJECT (self, "Clearing queue");
+
+  if (self->stream) {
+    /* Wait for outstanding operations */
+    gst_cuda_context_push (self->context);
+    CuStreamSynchronize (gst_cuda_stream_get_handle (self->stream));
+    gst_cuda_context_pop (nullptr);
+  }
+
+  while ((memory = (GstMemory *) gst_atomic_queue_pop (priv->queue))) {
+    while (!gst_poll_read_control (priv->poll)) {
+      if (errno == EWOULDBLOCK) {
+        /* We put the memory into the queue but did not finish writing control
+         * yet, let's wait a bit and retry */
+        g_thread_yield ();
+        continue;
+      } else {
+        /* Critical error but GstPoll already complained */
+        break;
+      }
+    }
+
+    /* Already synchronized above */
+    GST_MEMORY_FLAG_UNSET (memory, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+    gst_cuda_pool_allocator_free_memory (self, memory);
+  }
+
+  GST_LOG_OBJECT (self, "Clear done");
+
+  return priv->cur_mems == 0;
+}
+
+/* must be called with the lock */
+static gboolean
+gst_cuda_pool_allocator_stop (GstCudaPoolAllocator * self)
+{
+  GstCudaPoolAllocatorPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  if (priv->started) {
+    if (!gst_cuda_pool_allocator_clear_queue (self))
+      return FALSE;
+
+    priv->started = FALSE;
+  }
+
+  return TRUE;
+}
+
+static inline void
+dec_outstanding (GstCudaPoolAllocator * self)
+{
+  if (g_atomic_int_dec_and_test (&self->priv->outstanding)) {
+    /* all memory objects are returned to the pool, see if we need to free them */
+    if (GST_CUDA_POOL_ALLOCATOR_IS_FLUSHING (self)) {
+      /* take the lock so that set_active is not run concurrently */
+      g_rec_mutex_lock (&self->priv->lock);
+      /* now that we have the lock, check if we have been de-activated with
+       * outstanding buffers */
+      if (!self->priv->active)
+        gst_cuda_pool_allocator_stop (self);
+      g_rec_mutex_unlock (&self->priv->lock);
+    }
+  }
+}
+
+static void
+gst_cuda_pool_allocator_release_memory (GstCudaPoolAllocator * self,
+    GstMemory * mem)
+{
+  GST_LOG_OBJECT (self, "Released memory %p", mem);
+
+  GST_MINI_OBJECT_CAST (mem)->dispose = nullptr;
+  mem->allocator = (GstAllocator *) gst_object_ref (_gst_cuda_allocator);
+
+  /* keep it around in our queue */
+  gst_atomic_queue_push (self->priv->queue, mem);
+  gst_poll_write_control (self->priv->poll);
+  dec_outstanding (self);
+
+  gst_object_unref (self);
+}
+
+static gboolean
+gst_cuda_memory_release (GstMiniObject * object)
+{
+  GstMemory *mem = GST_MEMORY_CAST (object);
+  GstCudaPoolAllocator *alloc;
+
+  g_assert (mem->allocator);
+
+  if (!GST_IS_CUDA_POOL_ALLOCATOR (mem->allocator)) {
+    GST_LOG_OBJECT (mem->allocator, "Not our memory, free");
+    return TRUE;
+  }
+
+  alloc = GST_CUDA_POOL_ALLOCATOR (mem->allocator);
+
+  /* return the memory to the allocator */
+  gst_memory_ref (mem);
+  gst_cuda_pool_allocator_release_memory (alloc, mem);
+
+  return FALSE;
+}
+
+/* must be called with the lock */
+static GstFlowReturn
+gst_cuda_pool_allocator_alloc (GstCudaPoolAllocator * self, GstMemory ** mem)
+{
+  GstCudaPoolAllocatorPrivate *priv = self->priv;
+  GstMemory *new_mem;
+
+  /* increment the allocation counter */
+  g_atomic_int_add (&priv->cur_mems, 1);
+  if (priv->alloc_method == GST_CUDA_MEMORY_ALLOC_MMAP) {
+    new_mem = gst_cuda_allocator_virtual_alloc (nullptr,
+        self->context, self->stream, &self->info, &priv->prop,
+        priv->granularity_flags);
+  } else {
+    new_mem = gst_cuda_allocator_alloc (nullptr,
+        self->context, self->stream, &self->info);
+  }
+  if (!new_mem) {
+    GST_ERROR_OBJECT (self, "Failed to allocate new memory");
+    g_atomic_int_add (&priv->cur_mems, -1);
+    return GST_FLOW_ERROR;
+  }
+
+  *mem = new_mem;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_cuda_pool_allocator_acquire_memory_internal (GstCudaPoolAllocator * self,
+    GstMemory ** memory)
+{
+  GstFlowReturn result;
+  GstCudaPoolAllocatorPrivate *priv = self->priv;
+
+  while (TRUE) {
+    if (G_UNLIKELY (GST_CUDA_POOL_ALLOCATOR_IS_FLUSHING (self)))
+      goto flushing;
+
+    /* try to get a memory from the queue */
+    *memory = (GstMemory *) gst_atomic_queue_pop (priv->queue);
+    if (G_LIKELY (*memory)) {
+      while (!gst_poll_read_control (priv->poll)) {
+        if (errno == EWOULDBLOCK) {
+          /* We put the memory into the queue but did not finish writing control
+           * yet, let's wait a bit and retry */
+          g_thread_yield ();
+          continue;
+        } else {
+          /* Critical error but GstPoll already complained */
+          break;
+        }
+      }
+      result = GST_FLOW_OK;
+      GST_LOG_OBJECT (self, "acquired memory %p", *memory);
+      break;
+    }
+
+    /* no memory, try to allocate some more */
+    GST_LOG_OBJECT (self, "no memory, trying to allocate");
+    result = gst_cuda_pool_allocator_alloc (self, memory);
+    if (G_LIKELY (result == GST_FLOW_OK))
+      /* we have a memory, return it */
+      break;
+
+    if (G_UNLIKELY (result != GST_FLOW_EOS))
+      /* something went wrong, return error */
+      break;
+
+    /* now we release the control socket, we wait for a memory release or
+     * flushing */
+    if (!gst_poll_read_control (priv->poll)) {
+      if (errno == EWOULDBLOCK) {
+        /* This means that we have two threads trying to allocate memory
+         * already, and the other one already got the wait token. This
+         * means that we only have to wait for the poll now and not write the
+         * token afterwards: we will be woken up once the other thread is
+         * woken up and that one will write the wait token it removed */
+        GST_LOG_OBJECT (self, "waiting for free memory or flushing");
+        gst_poll_wait (priv->poll, GST_CLOCK_TIME_NONE);
+      } else {
+        /* This is a critical error, GstPoll already gave a warning */
+        result = GST_FLOW_ERROR;
+        break;
+      }
+    } else {
+      /* We're the first thread waiting, we got the wait token and have to
+       * write it again later
+       * OR
+       * We're a second thread and just consumed the flush token and block all
+       * other threads, in which case we must not wait and give it back
+       * immediately */
+      if (!GST_CUDA_POOL_ALLOCATOR_IS_FLUSHING (self)) {
+        GST_LOG_OBJECT (self, "waiting for free memory or flushing");
+        gst_poll_wait (priv->poll, GST_CLOCK_TIME_NONE);
+      }
+      gst_poll_write_control (priv->poll);
+    }
+  }
+
+  return result;
+
+  /* ERRORS */
+flushing:
+  {
+    GST_DEBUG_OBJECT (self, "we are flushing");
+    return GST_FLOW_FLUSHING;
+  }
+}
+
+/**
+ * gst_cuda_pool_allocator_new:
+ * @context: a #GstCudaContext
+ * @stream: (allow-none): a #GstCudaStream
+ * @info: a #GstVideoInfo
+ *
+ * Creates a new #GstCudaPoolAllocator instance.
+ *
+ * Returns: (transfer full): a new #GstCudaPoolAllocator instance
+ *
+ * Since: 1.24
+ */
+GstCudaPoolAllocator *
+gst_cuda_pool_allocator_new (GstCudaContext * context, GstCudaStream * stream,
+    const GstVideoInfo * info)
+{
+  GstCudaPoolAllocator *self;
+
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+  g_return_val_if_fail (!stream || GST_IS_CUDA_STREAM (stream), nullptr);
+
+  self = (GstCudaPoolAllocator *)
+      g_object_new (GST_TYPE_CUDA_POOL_ALLOCATOR, nullptr);
+  gst_object_ref_sink (self);
+
+  self->context = (GstCudaContext *) gst_object_ref (context);
+  if (stream)
+    self->stream = gst_cuda_stream_ref (stream);
+  self->info = *info;
+
+  return self;
+}
+
+/**
+ * gst_cuda_pool_allocator_new_for_virtual_memory:
+ * @context: a #GstCudaContext
+ * @stream: (allow-none): a #GstCudaStream
+ * @info: a #GstVideoInfo
+ *
+ * Creates a new #GstCudaPoolAllocator instance for virtual memory allocation.
+ *
+ * Returns: (transfer full): a new #GstCudaPoolAllocator instance
+ *
+ * Since: 1.24
+ */
+GstCudaPoolAllocator *
+gst_cuda_pool_allocator_new_for_virtual_memory (GstCudaContext * context,
+    GstCudaStream * stream, const GstVideoInfo * info,
+    const CUmemAllocationProp * prop,
+    CUmemAllocationGranularity_flags granularity_flags)
+{
+  GstCudaPoolAllocator *self;
+
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+  g_return_val_if_fail (!stream || GST_IS_CUDA_STREAM (stream), nullptr);
+  g_return_val_if_fail (prop, nullptr);
+
+  self = (GstCudaPoolAllocator *)
+      g_object_new (GST_TYPE_CUDA_POOL_ALLOCATOR, nullptr);
+  gst_object_ref_sink (self);
+
+  self->context = (GstCudaContext *) gst_object_ref (context);
+  if (stream)
+    self->stream = gst_cuda_stream_ref (stream);
+  self->info = *info;
+
+  self->priv->prop = *prop;
+  self->priv->alloc_method = GST_CUDA_MEMORY_ALLOC_MMAP;
+  if (self->priv->prop.requestedHandleTypes == CU_MEM_HANDLE_TYPE_WIN32) {
+    self->priv->prop.win32HandleMetaData =
+        gst_cuda_get_win32_handle_metadata ();
+  }
+
+  return self;
+}
+
+/**
+ * gst_cuda_pool_allocator_acquire_memory:
+ * @allocator: a #GstCudaPoolAllocator
+ * @memory: (out): a #GstMemory
+ *
+ * Acquires a #GstMemory from @allocator. @memory should point to a memory
+ * location that can hold a pointer to the new #GstMemory.
+ *
+ * Returns: a #GstFlowReturn such as %GST_FLOW_FLUSHING when the allocator is
+ * inactive.
+ *
+ * Since: 1.24
+ */
+GstFlowReturn
+gst_cuda_pool_allocator_acquire_memory (GstCudaPoolAllocator * allocator,
+    GstMemory ** memory)
+{
+  GstFlowReturn result;
+  GstCudaPoolAllocatorPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_CUDA_POOL_ALLOCATOR (allocator), GST_FLOW_ERROR);
+  g_return_val_if_fail (memory, GST_FLOW_ERROR);
+
+  priv = allocator->priv;
+
+  g_atomic_int_inc (&priv->outstanding);
+  result = gst_cuda_pool_allocator_acquire_memory_internal (allocator, memory);
+
+  if (result == GST_FLOW_OK) {
+    GstMemory *mem = *memory;
+    /* Replace default allocator with ours */
+    gst_object_unref (mem->allocator);
+    mem->allocator = (GstAllocator *) gst_object_ref (allocator);
+    GST_MINI_OBJECT_CAST (mem)->dispose = gst_cuda_memory_release;
+  } else {
+    dec_outstanding (allocator);
+  }
+
+  return result;
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudamemory.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudamemory.h Changed

@@ -17,20 +17,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GST_CUDA_MEMORY_H__
-#define __GST_CUDA_MEMORY_H__
+#pragma once
 
-#ifndef GST_USE_UNSTABLE_API
-#warning "The Cuda library from gst-plugins-bad is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include "cuda-prelude.h"
 #include <gst/gst.h>
 #include <gst/gstallocator.h>
 #include <gst/video/video.h>
-#include "gstcudaloader.h"
-#include "gstcudacontext.h"
+#include <gst/cuda/cuda-prelude.h>
+#include <gst/cuda/gstcudacontext.h>
+#include <gst/cuda/gstcudastream.h>
 
 G_BEGIN_DECLS
 
@@ -40,6 +34,7 @@
 #define GST_CUDA_ALLOCATOR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_CUDA_ALLOCATOR,GstCudaAllocatorClass))
 #define GST_IS_CUDA_ALLOCATOR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CUDA_ALLOCATOR))
 #define GST_IS_CUDA_ALLOCATOR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_CUDA_ALLOCATOR))
+
 /**
  * GST_CUDA_ALLOCATOR_CAST:
  *
@@ -53,19 +48,24 @@
  */
 #define GST_CUDA_MEMORY_CAST(mem)           ((GstCudaMemory *) (mem))
 
-/**
- * GstCudaAllocator:
- *
- * A #GstAllocator subclass for cuda memory
- *
- * Since: 1.22
- */
-typedef struct _GstCudaAllocator GstCudaAllocator;
-typedef struct _GstCudaAllocatorClass GstCudaAllocatorClass;
+#define GST_TYPE_CUDA_POOL_ALLOCATOR             (gst_cuda_pool_allocator_get_type())
+#define GST_CUDA_POOL_ALLOCATOR(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CUDA_POOL_ALLOCATOR,GstCudaPoolAllocator))
+#define GST_CUDA_POOL_ALLOCATOR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CUDA_POOL_ALLOCATOR,GstCudaPoolAllocatorClass))
+#define GST_CUDA_POOL_ALLOCATOR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_CUDA_POOL_ALLOCATOR,GstCudaPoolAllocatorClass))
+#define GST_IS_CUDA_POOL_ALLOCATOR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CUDA_POOL_ALLOCATOR))
+#define GST_IS_CUDA_POOL_ALLOCATOR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_CUDA_POOL_ALLOCATOR))
 
 typedef struct _GstCudaMemory GstCudaMemory;
 typedef struct _GstCudaMemoryPrivate GstCudaMemoryPrivate;
 
+typedef struct _GstCudaAllocator GstCudaAllocator;
+typedef struct _GstCudaAllocatorClass GstCudaAllocatorClass;
+typedef struct _GstCudaAllocatorPrivate GstCudaAllocatorPrivate;
+
+typedef struct _GstCudaPoolAllocator GstCudaPoolAllocator;
+typedef struct _GstCudaPoolAllocatorClass GstCudaPoolAllocatorClass;
+typedef struct _GstCudaPoolAllocatorPrivate GstCudaPoolAllocatorPrivate;
+
 /**
  * GST_MAP_CUDA:
  *
@@ -102,20 +102,79 @@
 
 /**
  * GstCudaMemoryTransfer:
- * @GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD: the device memory needs downloading
- *                                          to the staging memory
- * @GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD:   the staging memory needs uploading
- *                                          to the device memory
  *
- * Since: 1.22
+ * CUDA memory transfer flags
  */
 typedef enum
 {
-  GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD   = (GST_MEMORY_FLAG_LAST << 0),
-  GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD     = (GST_MEMORY_FLAG_LAST << 1)
+  /**
+   * GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD:
+   *
+   * the device memory needs downloading to the staging memory
+   *
+   * Since: 1.22
+   */
+  GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD = (GST_MEMORY_FLAG_LAST << 0),
+
+  /**
+   * GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD:
+   *
+   * the staging memory needs uploading to the device memory
+   *
+   * Since: 1.22
+   */
+  GST_CUDA_MEMORY_TRANSFER_NEED_UPLOAD = (GST_MEMORY_FLAG_LAST << 1),
+
+  /**
+   * GST_CUDA_MEMORY_TRANSFER_NEED_SYNC:
+   *
+   * the device memory needs synchronization
+   *
+   * Since: 1.24
+   */
+  GST_CUDA_MEMORY_TRANSFER_NEED_SYNC = (GST_MEMORY_FLAG_LAST << 2),
 } GstCudaMemoryTransfer;
 
 /**
+ * GstCudaMemoryAllocMethod:
+ *
+ * CUDA memory allocation method
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  /**
+   * GST_CUDA_MEMORY_ALLOC_UNKNOWN:
+   *
+   * Since: 1.24
+   */
+  GST_CUDA_MEMORY_ALLOC_UNKNOWN,
+
+  /**
+   * GST_CUDA_MEMORY_ALLOC_MALLOC:
+   *
+   * Memory allocated via cuMemAlloc or cuMemAllocPitch
+   *
+   * Since: 1.24
+   */
+  GST_CUDA_MEMORY_ALLOC_MALLOC,
+
+  /**
+   * GST_CUDA_MEMORY_ALLOC_MMAP:
+   *
+   * Memory allocated via cuMemCreate and cuMemMap
+   *
+   * Since: 1.24
+   */
+  GST_CUDA_MEMORY_ALLOC_MMAP,
+} GstCudaMemoryAllocMethod;
+
+#define GST_TYPE_CUDA_MEMORY_ALLOC_METHOD (gst_cuda_memory_alloc_method_get_type())
+GST_CUDA_API
+GType gst_cuda_memory_alloc_method_get_type (void);
+
+/**
  * GstCudaMemory:
  *
  * Since: 1.22
@@ -133,30 +192,155 @@
   gpointer _gst_reservedGST_PADDING;
 };
 
+GST_CUDA_API
+void            gst_cuda_memory_init_once   (void);
+
+GST_CUDA_API
+gboolean        gst_is_cuda_memory          (GstMemory * mem);
+
+GST_CUDA_API
+GstCudaStream * gst_cuda_memory_get_stream  (GstCudaMemory * mem);
+
+GST_CUDA_API
+void            gst_cuda_memory_sync        (GstCudaMemory * mem);
+
+GST_CUDA_API
+gboolean        gst_cuda_memory_get_texture (GstCudaMemory * mem,
+                                             guint plane,
+                                             CUfilter_mode filter_mode,
+                                             CUtexObject * texture);
+
+GST_CUDA_API
+gpointer        gst_cuda_memory_get_user_data (GstCudaMemory * mem);
+
+GST_CUDA_API
+void            gst_cuda_memory_set_token_data (GstCudaMemory * mem,
+                                                gint64 token,
+                                                gpointer data,
+                                                GDestroyNotify notify);
+
+GST_CUDA_API
+gpointer        gst_cuda_memory_get_token_data (GstCudaMemory * mem,
+                                                gint64 token);
+
+GST_CUDA_API
+GstCudaMemoryAllocMethod gst_cuda_memory_get_alloc_method (GstCudaMemory * mem);
+
+GST_CUDA_API
+gboolean        gst_cuda_memory_export (GstCudaMemory * mem,
+                                        gpointer os_handle);
+
+/**
+ * GstCudaAllocator:
+ *
+ * A #GstAllocator subclass for cuda memory
+ *
+ * Since: 1.22
+ */
 struct _GstCudaAllocator
 {
   GstAllocator parent;
+
+  /*< private >*/
+  GstCudaAllocatorPrivate *priv;
+  gpointer _gst_reservedGST_PADDING;
 };
 
 struct _GstCudaAllocatorClass
 {
   GstAllocatorClass parent_class;
+
+  /**
+   * GstCudaAllocatorClass::set_active:
+   * @allocator: a #GstCudaAllocator
+   * @active: the new active state
+   *
+   * Since: 1.24
+   */
+  gboolean (*set_active) (GstCudaAllocator * allocator,
+                          gboolean active);
+
+  /*< private >*/
+  gpointer _gst_reservedGST_PADDING_LARGE;
+};
+
+GST_CUDA_API
+GType           gst_cuda_allocator_get_type (void);
+
+GST_CUDA_API
+GstMemory *     gst_cuda_allocator_alloc    (GstCudaAllocator * allocator,
+                                             GstCudaContext * context,
+                                             GstCudaStream * stream,
+                                             const GstVideoInfo * info);
+
+GST_CUDA_API
+gboolean        gst_cuda_allocator_set_active (GstCudaAllocator * allocator,
+                                               gboolean active);
+
+GST_CUDA_API
+GstMemory *     gst_cuda_allocator_alloc_wrapped (GstCudaAllocator * allocator,
+                                                  GstCudaContext * context,
+                                                  GstCudaStream * stream,
+                                                  const GstVideoInfo * info,
+                                                  CUdeviceptr dev_ptr,
+                                                  gpointer user_data,
+                                                  GDestroyNotify notify);
+
+GST_CUDA_API
+GstMemory *     gst_cuda_allocator_virtual_alloc (GstCudaAllocator * allocator,
+                                                  GstCudaContext * context,
+                                                  GstCudaStream * stream,
+                                                  const GstVideoInfo * info,
+                                                  const CUmemAllocationProp * prop,
+                                                  CUmemAllocationGranularity_flags granularity_flags);
+
+/**
+ * GstCudaPoolAllocator:
+ *
+ * A #GstCudaAllocator subclass for cuda memory pool
+ *
+ * Since: 1.24
+ */
+struct _GstCudaPoolAllocator
+{
+  GstCudaAllocator parent;
+
+  GstCudaContext *context;
+  GstCudaStream *stream;
+
+  GstVideoInfo info;
+
+  /*< private >*/
+  GstCudaPoolAllocatorPrivate *priv;
+  gpointer _gst_reservedGST_PADDING;
+};
+
+struct _GstCudaPoolAllocatorClass
+{
+  GstCudaAllocatorClass parent_class;
+
+  /*< private >*/
+  gpointer _gst_reservedGST_PADDING;
 };
 
 GST_CUDA_API
-void           gst_cuda_memory_init_once   (void);
+GType                  gst_cuda_pool_allocator_get_type (void);
 
 GST_CUDA_API
-gboolean       gst_is_cuda_memory          (GstMemory * mem);
+GstCudaPoolAllocator * gst_cuda_pool_allocator_new (GstCudaContext * context,
+                                                    GstCudaStream * stream,
+                                                    const GstVideoInfo * info);
 
 GST_CUDA_API
-GType          gst_cuda_allocator_get_type (void);
+GstCudaPoolAllocator * gst_cuda_pool_allocator_new_for_virtual_memory (GstCudaContext * context,
+                                                                       GstCudaStream * stream,
+                                                                       const GstVideoInfo * info,
+                                                                       const CUmemAllocationProp * prop,
+                                                                       CUmemAllocationGranularity_flags granularity_flags);
 
 GST_CUDA_API
-GstMemory    * gst_cuda_allocator_alloc    (GstCudaAllocator * allocator,
-                                            GstCudaContext * context,
-                                            const GstVideoInfo * info);
+GstFlowReturn          gst_cuda_pool_allocator_acquire_memory (GstCudaPoolAllocator * allocator,
+                                                               GstMemory ** memory);
 
 G_END_DECLS
 
-#endif /* __GST_CUDA_MEMORY_H__ */

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudanvrtc.cpp Added

@@ -0,0 +1,455 @@
+/* GStreamer
+ * Copyright (C) 2019 Seungha Yang <seungha.yang@navercorp.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "cuda-gst.h"
+#include "gstcudanvrtc.h"
+#include "gstcudaloader.h"
+#include <nvrtc.h>
+#include <gmodule.h>
+#include "gstcuda-private.h"
+#include <string>
+
+GST_DEBUG_CATEGORY_STATIC (gst_cuda_nvrtc_debug);
+#define GST_CAT_DEFAULT gst_cuda_nvrtc_debug
+
+#ifndef G_OS_WIN32
+#define NVRTC_LIBNAME "libnvrtc.so"
+#else
+#define NVRTC_LIBNAME "nvrtc64_%d%d_0.dll"
+#endif
+
+#define LOAD_SYMBOL(name,func) G_STMT_START { \
+  if (!g_module_symbol (module, G_STRINGIFY (name), (gpointer *) &vtable->func)) { \
+    GST_ERROR ("Failed to load '%s', %s", G_STRINGIFY (name), g_module_error()); \
+    goto error; \
+  } \
+} G_STMT_END;
+
+/* *INDENT-OFF* */
+typedef struct _GstCudaNvrtcVTable
+{
+  gboolean loaded;
+
+  nvrtcResult (*NvrtcCompileProgram) (nvrtcProgram prog, int numOptions,
+      const char **options);
+  nvrtcResult (*NvrtcCreateProgram) (nvrtcProgram * prog, const char *src,
+      const char *name, int numHeaders, const char **headers,
+      const char **includeNames);
+  nvrtcResult (*NvrtcDestroyProgram) (nvrtcProgram * prog);
+  nvrtcResult (*NvrtcGetPTX) (nvrtcProgram prog, char *ptx);
+  nvrtcResult (*NvrtcGetPTXSize) (nvrtcProgram prog, size_t * ptxSizeRet);
+  nvrtcResult (*NvrtcGetProgramLog) (nvrtcProgram prog, char *log);
+  nvrtcResult (*NvrtcGetProgramLogSize) (nvrtcProgram prog,
+      size_t * logSizeRet);
+  nvrtcResult (*NvrtcGetCUBINSize) (nvrtcProgram prog, size_t *cubinSizeRet);
+  nvrtcResult (*NvrtcGetCUBIN) (nvrtcProgram prog, char *cubin);
+} GstCudaNvrtcVTable;
+/* *INDENT-ON* */
+
+static GstCudaNvrtcVTable gst_cuda_nvrtc_vtable = { 0, };
+
+#ifdef G_OS_WIN32
+static GModule *
+gst_cuda_nvrtc_load_library_once_win32 (void)
+{
+  gchar *dll_name = nullptr;
+  GModule *module = nullptr;
+  gint cuda_version;
+  gint cuda_major_version;
+  gint cuda_minor_version;
+  gint major, minor;
+  CUresult rst;
+
+  rst = CuDriverGetVersion (&cuda_version);
+  if (rst != CUDA_SUCCESS) {
+    GST_WARNING ("Couldn't get driver version, 0x%x", (guint) rst);
+    return nullptr;
+  }
+
+  cuda_major_version = cuda_version / 1000;
+  cuda_minor_version = (cuda_version % 1000) / 10;
+
+  GST_INFO ("CUDA version %d / %d", cuda_major_version, cuda_minor_version);
+
+  /* First path for searching nvrtc library using system CUDA version */
+  for (minor = cuda_minor_version; minor >= 0; minor--) {
+    g_clear_pointer (&dll_name, g_free);
+    dll_name = g_strdup_printf (NVRTC_LIBNAME, cuda_major_version, minor);
+    module = g_module_open (dll_name, G_MODULE_BIND_LAZY);
+    if (module) {
+      GST_INFO ("%s is available", dll_name);
+      g_free (dll_name);
+      return module;
+    }
+
+    GST_DEBUG ("Couldn't open library %s", dll_name);
+  }
+
+  /* CUDA is a part for driever installation, but nvrtc library is a part of
+   * CUDA-toolkit. So CUDA-toolkit version may be lower than
+   * CUDA version. Do search the dll again */
+  for (major = cuda_major_version; major >= 9; major--) {
+    for (minor = 5; minor >= 0; minor--) {
+      g_clear_pointer (&dll_name, g_free);
+      dll_name = g_strdup_printf (NVRTC_LIBNAME, major, minor);
+      module = g_module_open (dll_name, G_MODULE_BIND_LAZY);
+      if (module) {
+        GST_INFO ("%s is available", dll_name);
+        g_free (dll_name);
+        return module;
+      }
+
+      GST_DEBUG ("Couldn't open library %s", dll_name);
+    }
+  }
+
+  g_free (dll_name);
+
+  return nullptr;
+}
+#endif
+
+static gboolean
+gst_cuda_nvrtc_load_library_once (void)
+{
+  GModule *module = nullptr;
+  const gchar *filename_env;
+  GstCudaNvrtcVTable *vtable;
+
+  filename_env = g_getenv ("GST_CUDA_NVRTC_LIBNAME");
+  if (filename_env)
+    module = g_module_open (filename_env, G_MODULE_BIND_LAZY);
+
+  if (!module) {
+#ifndef G_OS_WIN32
+    module = g_module_open (NVRTC_LIBNAME, G_MODULE_BIND_LAZY);
+#else
+    module = gst_cuda_nvrtc_load_library_once_win32 ();
+#endif
+  }
+
+  if (module == nullptr) {
+    GST_WARNING ("Could not open nvrtc library %s", g_module_error ());
+    return FALSE;
+  }
+
+  vtable = &gst_cuda_nvrtc_vtable;
+
+  LOAD_SYMBOL (nvrtcCompileProgram, NvrtcCompileProgram);
+  LOAD_SYMBOL (nvrtcCreateProgram, NvrtcCreateProgram);
+  LOAD_SYMBOL (nvrtcDestroyProgram, NvrtcDestroyProgram);
+  LOAD_SYMBOL (nvrtcGetPTX, NvrtcGetPTX);
+  LOAD_SYMBOL (nvrtcGetPTXSize, NvrtcGetPTXSize);
+  LOAD_SYMBOL (nvrtcGetProgramLog, NvrtcGetProgramLog);
+  LOAD_SYMBOL (nvrtcGetProgramLogSize, NvrtcGetProgramLogSize);
+  LOAD_SYMBOL (nvrtcGetCUBINSize, NvrtcGetCUBINSize);
+  LOAD_SYMBOL (nvrtcGetCUBIN, NvrtcGetCUBIN);
+
+  vtable->loaded = TRUE;
+
+  return TRUE;
+
+error:
+  g_module_close (module);
+
+  return FALSE;
+}
+
+/**
+ * gst_cuda_nvrtc_load_library:
+ *
+ * Loads the nvrtc library.
+ *
+ * Returns: %TRUE if the library could be loaded, %FALSE otherwise
+ *
+ * Since: 1.22
+ */
+gboolean
+gst_cuda_nvrtc_load_library (void)
+{
+  GST_CUDA_CALL_ONCE_BEGIN {
+    GST_DEBUG_CATEGORY_INIT (gst_cuda_nvrtc_debug, "cudanvrtc", 0,
+        "CUDA runtime compiler");
+    if (gst_cuda_load_library ())
+      gst_cuda_nvrtc_load_library_once ();
+  }
+  GST_CUDA_CALL_ONCE_END;
+
+  return gst_cuda_nvrtc_vtable.loaded;
+}
+
+/* *INDENT-OFF* */
+static nvrtcResult
+NvrtcCompileProgram (nvrtcProgram prog, int numOptions, const char **options)
+{
+  g_assert (gst_cuda_nvrtc_vtable.NvrtcCompileProgram != nullptr);
+
+  return gst_cuda_nvrtc_vtable.NvrtcCompileProgram (prog, numOptions, options);
+}
+
+static nvrtcResult
+NvrtcCreateProgram (nvrtcProgram * prog, const char *src, const char *name,
+    int numHeaders, const char **headers, const char **includeNames)
+{
+  g_assert (gst_cuda_nvrtc_vtable.NvrtcCreateProgram != nullptr);
+
+  return gst_cuda_nvrtc_vtable.NvrtcCreateProgram (prog, src, name, numHeaders,
+      headers, includeNames);
+}
+
+static nvrtcResult
+NvrtcDestroyProgram (nvrtcProgram * prog)
+{
+  g_assert (gst_cuda_nvrtc_vtable.NvrtcDestroyProgram != nullptr);
+
+  return gst_cuda_nvrtc_vtable.NvrtcDestroyProgram (prog);
+}
+
+static nvrtcResult
+NvrtcGetPTX (nvrtcProgram prog, char *ptx)
+{
+  g_assert (gst_cuda_nvrtc_vtable.NvrtcGetPTX != nullptr);
+
+  return gst_cuda_nvrtc_vtable.NvrtcGetPTX (prog, ptx);
+}
+
+static nvrtcResult
+NvrtcGetPTXSize (nvrtcProgram prog, size_t *ptxSizeRet)
+{
+  g_assert (gst_cuda_nvrtc_vtable.NvrtcGetPTXSize != nullptr);
+
+  return gst_cuda_nvrtc_vtable.NvrtcGetPTXSize (prog, ptxSizeRet);
+}
+
+static nvrtcResult
+NvrtcGetProgramLog (nvrtcProgram prog, char *log)
+{
+  g_assert (gst_cuda_nvrtc_vtable.NvrtcGetProgramLog != nullptr);
+
+  return gst_cuda_nvrtc_vtable.NvrtcGetProgramLog (prog, log);
+}
+
+static nvrtcResult
+NvrtcGetProgramLogSize (nvrtcProgram prog, size_t *logSizeRet)
+{
+  g_assert (gst_cuda_nvrtc_vtable.NvrtcGetProgramLogSize != nullptr);
+
+  return gst_cuda_nvrtc_vtable.NvrtcGetProgramLogSize (prog, logSizeRet);
+}
+
+static nvrtcResult
+NvrtcGetCUBINSize (nvrtcProgram prog, size_t *cubinSizeRet)
+{
+  g_assert (gst_cuda_nvrtc_vtable.NvrtcGetCUBINSize != nullptr);
+
+  return gst_cuda_nvrtc_vtable.NvrtcGetCUBINSize (prog, cubinSizeRet);
+}
+
+static nvrtcResult
+NvrtcGetCUBIN (nvrtcProgram prog, char *cubin)
+{
+  g_assert (gst_cuda_nvrtc_vtable.NvrtcGetCUBIN != nullptr);
+
+  return gst_cuda_nvrtc_vtable.NvrtcGetCUBIN (prog, cubin);
+}
+/* *INDENT-ON* */
+
+/**
+ * gst_cuda_nvrtc_compile:
+ * @source: Source code to compile
+ *
+ * Since: 1.22
+ */
+gchar *
+gst_cuda_nvrtc_compile (const gchar * source)
+{
+  nvrtcProgram prog;
+  nvrtcResult ret;
+  CUresult curet;
+  const gchar *opts = { "--gpu-architecture=compute_30" };
+  gsize ptx_size;
+  gchar *ptx = nullptr;
+  int driverVersion;
+
+  g_return_val_if_fail (source != nullptr, nullptr);
+
+  if (!gst_cuda_nvrtc_load_library ()) {
+    return nullptr;
+  }
+
+  GST_TRACE ("CUDA kernel source \n%s", source);
+
+  curet = CuDriverGetVersion (&driverVersion);
+  if (curet != CUDA_SUCCESS) {
+    GST_ERROR ("Failed to query CUDA Driver version, ret %d", curet);
+    return nullptr;
+  }
+
+  GST_DEBUG ("CUDA Driver Version %d.%d", driverVersion / 1000,
+      (driverVersion % 1000) / 10);
+
+  ret = NvrtcCreateProgram (&prog, source, nullptr, 0, nullptr, nullptr);
+  if (ret != NVRTC_SUCCESS) {
+    GST_ERROR ("couldn't create nvrtc program, ret %d", ret);
+    return nullptr;
+  }
+
+  /* Starting from CUDA 11, the lowest supported architecture is 5.2 */
+  if (driverVersion >= 11000)
+    opts0 = "--gpu-architecture=compute_52";
+
+  ret = NvrtcCompileProgram (prog, 1, opts);
+  if (ret != NVRTC_SUCCESS) {
+    gsize log_size;
+
+    GST_ERROR ("couldn't compile nvrtc program, ret %d", ret);
+    if (NvrtcGetProgramLogSize (prog, &log_size) == NVRTC_SUCCESS &&
+        log_size > 0) {
+      gchar *compile_log = (gchar *) g_alloca (log_size);
+      if (NvrtcGetProgramLog (prog, compile_log) == NVRTC_SUCCESS) {
+        GST_ERROR ("nvrtc compile log %s", compile_log);
+      }
+    }
+
+    goto error;
+  }
+
+  ret = NvrtcGetPTXSize (prog, &ptx_size);
+  if (ret != NVRTC_SUCCESS) {
+    GST_ERROR ("unknown ptx size, ret %d", ret);
+
+    goto error;
+  }
+
+  ptx = (gchar *) g_malloc0 (ptx_size);
+  ret = NvrtcGetPTX (prog, ptx);
+  if (ret != NVRTC_SUCCESS) {
+    GST_ERROR ("couldn't get ptx, ret %d", ret);
+    g_free (ptx);
+
+    goto error;
+  }
+
+  NvrtcDestroyProgram (&prog);
+
+  GST_TRACE ("compiled CUDA PTX %s\n", ptx);
+
+  return ptx;
+
+error:
+  NvrtcDestroyProgram (&prog);
+
+  return nullptr;
+}
+
+/**
+ * gst_cuda_nvrtc_compile_cubin:
+ * @source: Source code to compile
+ * @device: CUDA device
+ *
+ * Returns: (transfer full): Compiled CUDA assembly code if successful,
+ * otherwise %NULL
+ *
+ * Since: 1.24
+ */
+gchar *
+gst_cuda_nvrtc_compile_cubin (const gchar * source, gint device)
+{
+  nvrtcProgram prog;
+  nvrtcResult ret;
+  CUresult curet;
+  gsize cubin_size;
+  gchar *cubin = nullptr;
+  gint major, minor;
+
+  g_return_val_if_fail (source != nullptr, nullptr);
+
+  if (!gst_cuda_nvrtc_load_library ())
+    return nullptr;
+
+  GST_TRACE ("CUDA kernel source \n%s", source);
+
+  curet = CuDeviceGetAttribute (&major,
+      CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, device);
+  if (curet != CUDA_SUCCESS) {
+    GST_ERROR ("Unknown major compute caps");
+    return nullptr;
+  }
+
+  curet = CuDeviceGetAttribute (&minor,
+      CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR, device);
+  if (curet != CUDA_SUCCESS) {
+    GST_ERROR ("Unknown minor compute caps");
+    return nullptr;
+  }
+
+  std::string opt_str = "--gpu-architecture=sm_" +
+      std::to_string (major) + std::to_string (minor);
+
+  ret = NvrtcCreateProgram (&prog, source, nullptr, 0, nullptr, nullptr);
+  if (ret != NVRTC_SUCCESS) {
+    GST_ERROR ("couldn't create nvrtc program, ret %d", ret);
+    return nullptr;
+  }
+
+  const char *opts1 = { opt_str.c_str () };
+
+  ret = NvrtcCompileProgram (prog, 1, opts);
+  if (ret != NVRTC_SUCCESS) {
+    gsize log_size;
+
+    GST_ERROR ("couldn't compile nvrtc program, ret %d", ret);
+    if (NvrtcGetProgramLogSize (prog, &log_size) == NVRTC_SUCCESS &&
+        log_size > 0) {
+      gchar *compile_log = (gchar *) g_alloca (log_size);
+      if (NvrtcGetProgramLog (prog, compile_log) == NVRTC_SUCCESS) {
+        GST_ERROR ("nvrtc compile log %s", compile_log);
+      }
+    }
+
+    goto error;
+  }
+
+  ret = NvrtcGetCUBINSize (prog, &cubin_size);
+  if (ret != NVRTC_SUCCESS) {
+    GST_ERROR ("unknown ptx size, ret %d", ret);
+    goto error;
+  }
+
+  cubin = (gchar *) g_malloc0 (cubin_size);
+  ret = NvrtcGetCUBIN (prog, cubin);
+  if (ret != NVRTC_SUCCESS) {
+    GST_ERROR ("couldn't get ptx, ret %d", ret);
+    g_free (cubin);
+    goto error;
+  }
+
+  NvrtcDestroyProgram (&prog);
+
+  return cubin;
+
+error:
+  NvrtcDestroyProgram (&prog);
+
+  return nullptr;
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudanvrtc.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudanvrtc.h Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudastream.cpp Added

@@ -0,0 +1,207 @@
+/* GStreamer
+ * Copyright (C) 2022 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "cuda-gst.h"
+#include "gstcudastream.h"
+#include "gstcudautils.h"
+#include "gstcuda-private.h"
+
+#ifndef GST_DISABLE_GST_DEBUG
+#define GST_CAT_DEFAULT ensure_debug_category()
+static GstDebugCategory *
+ensure_debug_category (void)
+{
+  static GstDebugCategory *cat = nullptr;
+
+  GST_CUDA_CALL_ONCE_BEGIN {
+    cat = _gst_debug_category_new ("cudastream", 0, "cudastream");
+  } GST_CUDA_CALL_ONCE_END;
+
+  return cat;
+}
+#else
+#define ensure_debug_category() /* NOOP */
+#endif /* GST_DISABLE_GST_DEBUG */
+
+static gint
+gst_cuda_stream_compare_func (const GstCudaStream * a, const GstCudaStream * b)
+{
+  if (a == b)
+    return GST_VALUE_EQUAL;
+
+  return GST_VALUE_UNORDERED;
+}
+
+static void
+gst_cuda_stream_init_once (GType type)
+{
+  static GstValueTable table = {
+    0, (GstValueCompareFunc) gst_cuda_stream_compare_func,
+    nullptr, nullptr
+  };
+
+  table.type = type;
+  gst_value_register (&table);
+}
+
+G_DEFINE_BOXED_TYPE_WITH_CODE (GstCudaStream, gst_cuda_stream,
+    (GBoxedCopyFunc) gst_mini_object_ref,
+    (GBoxedFreeFunc) gst_mini_object_unref,
+    gst_cuda_stream_init_once (g_define_type_id));
+
+struct _GstCudaStreamPrivate
+{
+  CUstream handle;
+};
+
+static void
+_gst_cuda_stream_free (GstCudaStream * stream)
+{
+  GstCudaStreamPrivate *priv = stream->priv;
+
+  if (stream->context) {
+    if (priv->handle) {
+      gst_cuda_context_push (stream->context);
+      CuStreamDestroy (priv->handle);
+      gst_cuda_context_pop (nullptr);
+    }
+
+    gst_object_unref (stream->context);
+  }
+
+  g_free (priv);
+  g_free (stream);
+}
+
+/**
+ * gst_cuda_stream_new:
+ * @context: a #GstCudaContext
+ *
+ * Creates a new #GstCudaStream
+ *
+ * Returns: (transfer full) (nullable): a new #GstCudaStream or %NULL on
+ * failure
+ *
+ * Since: 1.24
+ */
+GstCudaStream *
+gst_cuda_stream_new (GstCudaContext * context)
+{
+  GstCudaStream *self;
+  CUresult cuda_ret;
+  CUstream stream;
+
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+
+  if (!gst_cuda_context_push (context)) {
+    GST_ERROR_OBJECT (context, "Couldn't push context");
+    return nullptr;
+  }
+
+  cuda_ret = CuStreamCreate (&stream, CU_STREAM_DEFAULT);
+  gst_cuda_context_pop (nullptr);
+
+  if (!gst_cuda_result (cuda_ret)) {
+    GST_ERROR_OBJECT (context, "Couldn't create stream");
+    return nullptr;
+  }
+
+  self = g_new0 (GstCudaStream, 1);
+  self->context = (GstCudaContext *) gst_object_ref (context);
+  self->priv = g_new0 (GstCudaStreamPrivate, 1);
+  self->priv->handle = stream;
+
+  gst_mini_object_init (GST_MINI_OBJECT_CAST (self), 0,
+      GST_TYPE_CUDA_STREAM, nullptr, nullptr,
+      (GstMiniObjectFreeFunction) _gst_cuda_stream_free);
+
+  return self;
+}
+
+/**
+ * gst_cuda_stream_get_handle:
+ * @stream: (allow-none): a #GstCudaStream
+ *
+ * Get CUDA stream handle
+ *
+ * Returns: a `CUstream` handle of @stream or %NULL if @stream is %NULL
+ *
+ * Since: 1.24
+ */
+CUstream
+gst_cuda_stream_get_handle (GstCudaStream * stream)
+{
+  g_return_val_if_fail (!stream || GST_IS_CUDA_STREAM (stream), nullptr);
+
+  if (!stream)
+    return nullptr;
+
+  return stream->priv->handle;
+}
+
+/**
+ * gst_cuda_stream_ref:
+ * @stream: a #GstCudaStream
+ *
+ * Increase the reference count of @stream.
+ *
+ * Returns: (transfer full): @stream
+ *
+ * Since: 1.24
+ */
+GstCudaStream *
+gst_cuda_stream_ref (GstCudaStream * stream)
+{
+  return (GstCudaStream *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (stream));
+}
+
+/**
+ * gst_cuda_stream_unref:
+ * @stream: a #GstCudaStream
+ *
+ * Decrease the reference count of @stream.
+ *
+ * Since: 1.24
+ */
+void
+gst_cuda_stream_unref (GstCudaStream * stream)
+{
+  gst_mini_object_unref (GST_MINI_OBJECT_CAST (stream));
+}
+
+/**
+ * gst_clear_cuda_stream: (skip)
+ * @stream: a pointer to a #GstCudaStream reference
+ *
+ * Clears a reference to a #GstCudaStream.
+ *
+ * Since: 1.24
+ */
+void
+gst_clear_cuda_stream (GstCudaStream ** stream)
+{
+  if (stream && *stream) {
+    gst_cuda_stream_unref (*stream);
+    *stream = nullptr;
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudastream.h Added

@@ -0,0 +1,69 @@
+/* GStreamer
+ * Copyright (C) 2022 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/cuda/cuda-prelude.h>
+#include <gst/cuda/gstcudacontext.h>
+#include <cuda.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_CUDA_STREAM              (gst_cuda_stream_get_type())
+#define GST_IS_CUDA_STREAM(obj)           (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_CUDA_STREAM))
+#define GST_CUDA_STREAM(obj)              ((GstCudaStream *)obj)
+
+typedef struct _GstCudaStream GstCudaStream;
+typedef struct _GstCudaStreamPrivate GstCudaStreamPrivate;
+
+/**
+ * GstCudaStream:
+ *
+ * Since: 1.24
+ */
+struct _GstCudaStream
+{
+  GstMiniObject parent;
+
+  GstCudaContext *context;
+
+  /*< private >*/
+  GstCudaStreamPrivate *priv;
+};
+
+GST_CUDA_API
+GType           gst_cuda_stream_get_type (void);
+
+GST_CUDA_API
+GstCudaStream * gst_cuda_stream_new (GstCudaContext * context);
+
+GST_CUDA_API
+CUstream        gst_cuda_stream_get_handle (GstCudaStream * stream);
+
+GST_CUDA_API
+GstCudaStream * gst_cuda_stream_ref (GstCudaStream * stream);
+
+GST_CUDA_API
+void            gst_cuda_stream_unref (GstCudaStream * stream);
+
+GST_CUDA_API
+void            gst_clear_cuda_stream (GstCudaStream ** stream);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudautils.cpp Added

@@ -0,0 +1,1837 @@
+/* GStreamer
+ * Copyright (C) <2018-2019> Seungha Yang <seungha.yang@navercorp.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudautils.h"
+#include "gstcudacontext.h"
+#include "gstcuda-private.h"
+#include <atomic>
+#include <set>
+#include <string>
+#include <mutex>
+
+#ifdef HAVE_CUDA_GST_GL
+#include <gst/gl/gl.h>
+#include <gst/gl/gstglfuncs.h>
+#endif
+
+#ifdef G_OS_WIN32
+#include <gst/d3d11/gstd3d11.h>
+#include <sddl.h>
+#endif
+
+#ifdef HAVE_NVCODEC_NVMM
+#include "gstcudanvmm.h"
+#endif
+
+#include "gstcudamemory.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_cuda_utils_debug);
+#define GST_CAT_DEFAULT gst_cuda_utils_debug
+GST_DEBUG_CATEGORY_STATIC (GST_CAT_CONTEXT);
+
+static void
+_init_debug (void)
+{
+  GST_CUDA_CALL_ONCE_BEGIN {
+    GST_DEBUG_CATEGORY_INIT (gst_cuda_utils_debug, "cudautils", 0,
+        "CUDA utils");
+    GST_DEBUG_CATEGORY_GET (GST_CAT_CONTEXT, "GST_CONTEXT");
+  } GST_CUDA_CALL_ONCE_END;
+}
+
+static gboolean
+pad_query (const GValue * item, GValue * value, gpointer user_data)
+{
+  GstPad *pad = (GstPad *) g_value_get_object (item);
+  GstQuery *query = (GstQuery *) user_data;
+  gboolean res;
+
+  res = gst_pad_peer_query (pad, query);
+
+  if (res) {
+    g_value_set_boolean (value, TRUE);
+    return FALSE;
+  }
+
+  GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, pad, "pad peer query failed");
+  return TRUE;
+}
+
+static gboolean
+run_query (GstElement * element, GstQuery * query, GstPadDirection direction)
+{
+  GstIterator *it;
+  GstIteratorFoldFunction func = pad_query;
+  GValue res = { 0 };
+
+  g_value_init (&res, G_TYPE_BOOLEAN);
+  g_value_set_boolean (&res, FALSE);
+
+  /* Ask neighbor */
+  if (direction == GST_PAD_SRC)
+    it = gst_element_iterate_src_pads (element);
+  else
+    it = gst_element_iterate_sink_pads (element);
+
+  while (gst_iterator_fold (it, func, &res, query) == GST_ITERATOR_RESYNC)
+    gst_iterator_resync (it);
+
+  gst_iterator_free (it);
+
+  return g_value_get_boolean (&res);
+}
+
+static void
+find_cuda_context (GstElement * element, GstCudaContext ** cuda_ctx)
+{
+  GstQuery *query;
+  GstContext *ctxt;
+
+  /*  1) Query downstream with GST_QUERY_CONTEXT for the context and
+   *      check if upstream already has a context of the specific type
+   *  2) Query upstream as above.
+   */
+  query = gst_query_new_context (GST_CUDA_CONTEXT_TYPE);
+  if (run_query (element, query, GST_PAD_SRC)) {
+    gst_query_parse_context (query, &ctxt);
+    if (ctxt) {
+      GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
+          "found context (%p) in downstream query", ctxt);
+      gst_element_set_context (element, ctxt);
+    }
+  }
+
+  /* although we found cuda context above, the element does not want
+   * to use the context. Then try to find from the other direction */
+  if (*cuda_ctx == nullptr && run_query (element, query, GST_PAD_SINK)) {
+    gst_query_parse_context (query, &ctxt);
+    if (ctxt) {
+      GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
+          "found context (%p) in upstream query", ctxt);
+      gst_element_set_context (element, ctxt);
+    }
+  }
+
+  if (*cuda_ctx == nullptr) {
+    /* 3) Post a GST_MESSAGE_NEED_CONTEXT message on the bus with
+     *    the required context type and afterwards check if a
+     *    usable context was set now. The message could
+     *    be handled by the parent bins of the element and the
+     *    application.
+     */
+    GstMessage *msg;
+
+    GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
+        "posting need context message");
+    msg = gst_message_new_need_context (GST_OBJECT_CAST (element),
+        GST_CUDA_CONTEXT_TYPE);
+    gst_element_post_message (element, msg);
+  }
+
+  /*
+   * Whomever responds to the need-context message performs a
+   * GstElement::set_context() with the required context in which the element
+   * is required to update the cuda_ctx or call gst_cuda_handle_set_context().
+   */
+
+  gst_query_unref (query);
+}
+
+static void
+context_set_cuda_context (GstContext * context, GstCudaContext * cuda_ctx)
+{
+  GstStructure *s;
+  guint device_id;
+
+  g_return_if_fail (context != nullptr);
+
+  g_object_get (G_OBJECT (cuda_ctx), "cuda-device-id", &device_id, nullptr);
+
+  GST_CAT_LOG (GST_CAT_CONTEXT,
+      "setting GstCudaContext(%" GST_PTR_FORMAT
+      ") with cuda-device-id %d on context(%" GST_PTR_FORMAT ")",
+      cuda_ctx, device_id, context);
+
+  s = gst_context_writable_structure (context);
+  gst_structure_set (s, GST_CUDA_CONTEXT_TYPE, GST_TYPE_CUDA_CONTEXT,
+      cuda_ctx, "cuda-device-id", G_TYPE_UINT, device_id, nullptr);
+}
+
+/**
+ * gst_cuda_ensure_element_context:
+ * @element: the #GstElement running the query
+ * @device_id: preferred device-id, pass device_id >=0 when
+ *             the device_id explicitly required. Otherwise, set -1.
+ * @cuda_ctx: (inout): the resulting #GstCudaContext
+ *
+ * Perform the steps necessary for retrieving a #GstCudaContext from the
+ * surrounding elements or from the application using the #GstContext mechanism.
+ *
+ * If the content of @cuda_ctx is not %NULL, then no #GstContext query is
+ * necessary for #GstCudaContext.
+ *
+ * Returns: whether a #GstCudaContext exists in @cuda_ctx
+ *
+ * Since: 1.22
+ */
+gboolean
+gst_cuda_ensure_element_context (GstElement * element, gint device_id,
+    GstCudaContext ** cuda_ctx)
+{
+  guint target_device_id = 0;
+  gboolean ret = TRUE;
+  static std::recursive_mutex lock;
+
+  g_return_val_if_fail (element != nullptr, FALSE);
+  g_return_val_if_fail (cuda_ctx != nullptr, FALSE);
+
+  _init_debug ();
+
+  std::lock_guard < std::recursive_mutex > lk (lock);
+
+  if (*cuda_ctx)
+    return TRUE;
+
+  find_cuda_context (element, cuda_ctx);
+  if (*cuda_ctx)
+    return TRUE;
+
+  if (device_id > 0)
+    target_device_id = device_id;
+
+  /* No available CUDA context in pipeline, create new one here */
+  *cuda_ctx = gst_cuda_context_new (target_device_id);
+
+  if (*cuda_ctx == nullptr) {
+    GST_CAT_ERROR_OBJECT (GST_CAT_CONTEXT, element,
+        "Failed to create CUDA context with device-id %d", device_id);
+    ret = FALSE;
+  } else {
+    GstContext *context;
+    GstMessage *msg;
+
+    /* Propagate new CUDA context */
+
+    context = gst_context_new (GST_CUDA_CONTEXT_TYPE, TRUE);
+    context_set_cuda_context (context, *cuda_ctx);
+
+    gst_element_set_context (element, context);
+
+    GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
+        "posting have context (%p) message with CUDA context (%p)",
+        context, *cuda_ctx);
+    msg = gst_message_new_have_context (GST_OBJECT_CAST (element), context);
+    gst_element_post_message (GST_ELEMENT_CAST (element), msg);
+  }
+
+  return ret;
+}
+
+/**
+ * gst_cuda_handle_set_context:
+ * @element: a #GstElement
+ * @context: a #GstContext
+ * @device_id: preferred device-id, pass device_id >=0 when
+ *             the device_id explicitly required. Otherwise, set -1.
+ * @cuda_ctx: (inout) (transfer full): location of a #GstCudaContext
+ *
+ * Helper function for implementing #GstElementClass.set_context() in
+ * CUDA capable elements.
+ *
+ * Retrieves the #GstCudaContext in @context and places the result in @cuda_ctx.
+ *
+ * Returns: whether the @cuda_ctx could be set successfully
+ *
+ * Since: 1.22
+ */
+gboolean
+gst_cuda_handle_set_context (GstElement * element,
+    GstContext * context, gint device_id, GstCudaContext ** cuda_ctx)
+{
+  const gchar *context_type;
+
+  g_return_val_if_fail (element != nullptr, FALSE);
+  g_return_val_if_fail (cuda_ctx != nullptr, FALSE);
+
+  _init_debug ();
+
+  if (!context)
+    return FALSE;
+
+  context_type = gst_context_get_context_type (context);
+  if (g_strcmp0 (context_type, GST_CUDA_CONTEXT_TYPE) == 0) {
+    const GstStructure *str;
+    GstCudaContext *other_ctx = nullptr;
+    guint other_device_id = 0;
+
+    /* If we had context already, will not replace it */
+    if (*cuda_ctx)
+      return TRUE;
+
+    str = gst_context_get_structure (context);
+    if (gst_structure_get (str, GST_CUDA_CONTEXT_TYPE, GST_TYPE_CUDA_CONTEXT,
+            &other_ctx, nullptr)) {
+      g_object_get (other_ctx, "cuda-device-id", &other_device_id, nullptr);
+
+      if (device_id == -1 || other_device_id == (guint) device_id) {
+        GST_CAT_DEBUG_OBJECT (GST_CAT_CONTEXT, element, "Found CUDA context");
+        *cuda_ctx = other_ctx;
+
+        return TRUE;
+      }
+
+      gst_object_unref (other_ctx);
+    }
+  }
+
+  return FALSE;
+}
+
+/**
+ * gst_cuda_handle_context_query:
+ * @element: a #GstElement
+ * @query: a #GstQuery of type %GST_QUERY_CONTEXT
+ * @cuda_ctx: (transfer none) (nullable): a #GstCudaContext
+ *
+ * Returns: Whether the @query was successfully responded to from the passed
+ *          @context.
+ *
+ * Since: 1.22
+ */
+gboolean
+gst_cuda_handle_context_query (GstElement * element,
+    GstQuery * query, GstCudaContext * cuda_ctx)
+{
+  const gchar *context_type;
+  GstContext *context, *old_context;
+
+  g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
+  g_return_val_if_fail (GST_IS_QUERY (query), FALSE);
+  g_return_val_if_fail (cuda_ctx == nullptr
+      || GST_IS_CUDA_CONTEXT (cuda_ctx), FALSE);
+
+  _init_debug ();
+
+  GST_CAT_LOG_OBJECT (GST_CAT_CONTEXT, element,
+      "handle context query %" GST_PTR_FORMAT, query);
+  gst_query_parse_context_type (query, &context_type);
+
+  if (cuda_ctx && g_strcmp0 (context_type, GST_CUDA_CONTEXT_TYPE) == 0) {
+    gst_query_parse_context (query, &old_context);
+
+    if (old_context)
+      context = gst_context_copy (old_context);
+    else
+      context = gst_context_new (GST_CUDA_CONTEXT_TYPE, TRUE);
+
+    context_set_cuda_context (context, cuda_ctx);
+    gst_query_set_context (query, context);
+    gst_context_unref (context);
+    GST_CAT_DEBUG_OBJECT (GST_CAT_CONTEXT, element,
+        "successfully set %" GST_PTR_FORMAT " on %" GST_PTR_FORMAT, cuda_ctx,
+        query);
+
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+/**
+ * gst_context_new_cuda_context:
+ * @cuda_ctx: (transfer none): a #GstCudaContext
+ *
+ * Returns: (transfer full): a new #GstContext embedding the @cuda_ctx
+ *
+ * Since: 1.22
+ */
+GstContext *
+gst_context_new_cuda_context (GstCudaContext * cuda_ctx)
+{
+  GstContext *context;
+
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (cuda_ctx), nullptr);
+
+  _init_debug ();
+
+  context = gst_context_new (GST_CUDA_CONTEXT_TYPE, TRUE);
+  context_set_cuda_context (context, cuda_ctx);
+
+  return context;
+}
+
+static const gchar *gst_cuda_quark_strings =
+    { "GstCudaQuarkGraphicsResource" };
+
+static GQuark gst_cuda_quark_tableGST_CUDA_QUARK_MAX;
+
+static void
+init_cuda_quark_once (void)
+{
+  GST_CUDA_CALL_ONCE_BEGIN {
+    for (guint i = 0; i < GST_CUDA_QUARK_MAX; i++) {
+      gst_cuda_quark_tablei =
+          g_quark_from_static_string (gst_cuda_quark_stringsi);
+    }
+  }
+  GST_CUDA_CALL_ONCE_END;
+}
+
+/**
+ * gst_cuda_quark_from_id: (skip)
+ * @id: a #GstCudaQuarkId
+ *
+ * Returns: the GQuark for given @id or 0 if @id is unknown value
+ *
+ * Since: 1.22
+ */
+GQuark
+gst_cuda_quark_from_id (GstCudaQuarkId id)
+{
+  g_return_val_if_fail (id < GST_CUDA_QUARK_MAX, 0);
+
+  init_cuda_quark_once ();
+  _init_debug ();
+
+  return gst_cuda_quark_tableid;
+}
+
+/**
+ * gst_cuda_graphics_resource_new: (skip)
+ * @context: (transfer none): a #GstCudaContext
+ * @graphics_context: (transfer none) (nullable): a graphics API specific context object
+ * @type: a #GstCudaGraphicsResourceType of resource registration
+ *
+ * Create new #GstCudaGraphicsResource with given @context and @type
+ *
+ * Returns: a new #GstCudaGraphicsResource.
+ * Free with gst_cuda_graphics_resource_free
+ *
+ * Since: 1.22
+ */
+GstCudaGraphicsResource *
+gst_cuda_graphics_resource_new (GstCudaContext *
+    context, GstObject * graphics_context, GstCudaGraphicsResourceType type)
+{
+  GstCudaGraphicsResource *resource;
+
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+
+  _init_debug ();
+
+  resource = g_new0 (GstCudaGraphicsResource, 1);
+  resource->cuda_context = (GstCudaContext *) gst_object_ref (context);
+  if (graphics_context) {
+    resource->graphics_context =
+        (GstObject *) gst_object_ref (graphics_context);
+  }
+
+  return resource;
+}
+
+/**
+ * gst_cuda_graphics_resource_register_gl_buffer: (skip)
+ * @resource a #GstCudaGraphicsResource
+ * @buffer: a GL buffer object
+ * @flags: a `CUgraphicsRegisterFlags`
+ *
+ * Register the @buffer for access by CUDA.
+ * Must be called from the gl context thread with current cuda context was
+ * pushed on the current thread
+ *
+ * Returns: whether @buffer was registered or not
+ *
+ * Since: 1.22
+ */
+gboolean
+gst_cuda_graphics_resource_register_gl_buffer (GstCudaGraphicsResource *
+    resource, guint buffer, CUgraphicsRegisterFlags flags)
+{
+  CUresult cuda_ret;
+
+  g_return_val_if_fail (resource != nullptr, FALSE);
+  g_return_val_if_fail (resource->registered == FALSE, FALSE);
+
+  _init_debug ();
+
+  cuda_ret = CuGraphicsGLRegisterBuffer (&resource->resource, buffer, flags);
+
+  if (!gst_cuda_result (cuda_ret))
+    return FALSE;
+
+  resource->registered = TRUE;
+  resource->type = GST_CUDA_GRAPHICS_RESOURCE_GL_BUFFER;
+  resource->flags = flags;
+
+  return TRUE;
+}
+
+#ifdef G_OS_WIN32
+/**
+ * gst_cuda_graphics_resource_register_d3d11_resource: (skip)
+ * @resource a #GstCudaGraphicsResource
+ * @d3d11_resource: a ID3D11Resource
+ * @flags: a CUgraphicsRegisterFlags
+ *
+ * Register the @d3d11_resource for accessing by CUDA.
+ * Must be called with d3d11 device lock with current cuda context was
+ * pushed on the current thread
+ *
+ * Returns: whether @d3d11_resource was registered or not
+ *
+ * Since: 1.22
+ */
+gboolean
+gst_cuda_graphics_resource_register_d3d11_resource (GstCudaGraphicsResource *
+    resource, ID3D11Resource * d3d11_resource, CUgraphicsRegisterFlags flags)
+{
+  CUresult cuda_ret;
+
+  g_return_val_if_fail (resource != nullptr, FALSE);
+  g_return_val_if_fail (resource->registered == FALSE, FALSE);
+
+  _init_debug ();
+
+  cuda_ret = CuGraphicsD3D11RegisterResource (&resource->resource,
+      d3d11_resource, flags);
+
+  if (!gst_cuda_result (cuda_ret))
+    return FALSE;
+
+  resource->registered = TRUE;
+  resource->type = GST_CUDA_GRAPHICS_RESOURCE_D3D11_RESOURCE;
+  resource->flags = flags;
+
+  return TRUE;
+}
+#endif
+
+/**
+ * gst_cuda_graphics_resource_unregister: (skip)
+ * @resource: a #GstCudaGraphicsResource
+ *
+ * Unregister previously registered resource.
+ * For GL resource, this method must be called from gl context thread.
+ * Also, current cuda context should be pushed on the current thread
+ * before calling this method.
+ *
+ * Since: 1.22
+ */
+void
+gst_cuda_graphics_resource_unregister (GstCudaGraphicsResource * resource)
+{
+  g_return_if_fail (resource != nullptr);
+
+  _init_debug ();
+
+  if (!resource->registered)
+    return;
+
+  gst_cuda_result (CuGraphicsUnregisterResource (resource->resource));
+  resource->resource = nullptr;
+  resource->registered = FALSE;
+
+  return;
+}
+
+/**
+ * gst_cuda_graphics_resource_map: (skip)
+ * @resource: a #GstCudaGraphicsResource
+ * @stream: a CUstream
+ * @flags: a CUgraphicsMapResourceFlags
+ *
+ * Map previously registered resource with map flags
+ *
+ * Returns: (nullable): the `CUgraphicsResource` if successful or %NULL when failed
+ *
+ * Since: 1.22
+ */
+CUgraphicsResource
+gst_cuda_graphics_resource_map (GstCudaGraphicsResource * resource,
+    CUstream stream, CUgraphicsMapResourceFlags flags)
+{
+  CUresult cuda_ret;
+
+  g_return_val_if_fail (resource != nullptr, nullptr);
+  g_return_val_if_fail (resource->registered != FALSE, nullptr);
+
+  _init_debug ();
+
+  cuda_ret = CuGraphicsResourceSetMapFlags (resource->resource, flags);
+  if (!gst_cuda_result (cuda_ret))
+    return nullptr;
+
+  cuda_ret = CuGraphicsMapResources (1, &resource->resource, stream);
+  if (!gst_cuda_result (cuda_ret))
+    return nullptr;
+
+  resource->mapped = TRUE;
+
+  return resource->resource;
+}
+
+/**
+ * gst_cuda_graphics_resource_unmap: (skip)
+ * @resource: a #GstCudaGraphicsResource
+ * @stream: a `CUstream`
+ *
+ * Unmap previously mapped resource
+ *
+ * Since: 1.22
+ */
+void
+gst_cuda_graphics_resource_unmap (GstCudaGraphicsResource * resource,
+    CUstream stream)
+{
+  g_return_if_fail (resource != nullptr);
+  g_return_if_fail (resource->registered != FALSE);
+
+  _init_debug ();
+
+  if (!resource->mapped)
+    return;
+
+  gst_cuda_result (CuGraphicsUnmapResources (1, &resource->resource, stream));
+
+  resource->mapped = FALSE;
+}
+
+#ifdef HAVE_CUDA_GST_GL
+static void
+unregister_resource_from_gl_thread (GstGLContext * gl_context,
+    GstCudaGraphicsResource * resource)
+{
+  GstCudaContext *cuda_context = resource->cuda_context;
+
+  if (!gst_cuda_context_push (cuda_context)) {
+    GST_WARNING_OBJECT (cuda_context, "failed to push CUDA context");
+    return;
+  }
+
+  gst_cuda_graphics_resource_unregister (resource);
+
+  if (!gst_cuda_context_pop (nullptr)) {
+    GST_WARNING_OBJECT (cuda_context, "failed to pop CUDA context");
+  }
+}
+#endif
+
+#ifdef G_OS_WIN32
+static void
+unregister_d3d11_resource (GstCudaGraphicsResource * resource)
+{
+  GstCudaContext *cuda_context = resource->cuda_context;
+  GstD3D11Device *device = GST_D3D11_DEVICE (resource->graphics_context);
+
+  if (!gst_cuda_context_push (cuda_context)) {
+    GST_WARNING_OBJECT (cuda_context, "failed to push CUDA context");
+    return;
+  }
+
+  gst_d3d11_device_lock (device);
+  gst_cuda_graphics_resource_unregister (resource);
+  gst_d3d11_device_unlock (device);
+
+  if (!gst_cuda_context_pop (nullptr)) {
+    GST_WARNING_OBJECT (cuda_context, "failed to pop CUDA context");
+  }
+}
+#endif
+
+/**
+ * gst_cuda_graphics_resource_free: (skip)
+ * @resource: a #GstCudaGraphicsResource
+ *
+ * Free @resource
+ *
+ * Since: 1.22
+ */
+void
+gst_cuda_graphics_resource_free (GstCudaGraphicsResource * resource)
+{
+  g_return_if_fail (resource != nullptr);
+
+  if (resource->registered) {
+#ifdef HAVE_CUDA_GST_GL
+    if (resource->type == GST_CUDA_GRAPHICS_RESOURCE_GL_BUFFER) {
+      gst_gl_context_thread_add ((GstGLContext *) resource->graphics_context,
+          (GstGLContextThreadFunc) unregister_resource_from_gl_thread,
+          resource);
+    } else
+#endif
+#ifdef G_OS_WIN32
+    if (resource->type == GST_CUDA_GRAPHICS_RESOURCE_D3D11_RESOURCE) {
+      unregister_d3d11_resource (resource);
+    } else
+#endif
+    {
+      /* FIXME: currently only opengl & d3d11 */
+      g_assert_not_reached ();
+    }
+  }
+
+  gst_object_unref (resource->cuda_context);
+  if (resource->graphics_context)
+    gst_object_unref (resource->graphics_context);
+  g_free (resource);
+}
+
+const gchar *
+gst_cuda_buffer_copy_type_to_string (GstCudaBufferCopyType type)
+{
+  switch (type) {
+    case GST_CUDA_BUFFER_COPY_SYSTEM:
+      return "SYSTEM";
+    case GST_CUDA_BUFFER_COPY_CUDA:
+      return "CUDA";
+    case GST_CUDA_BUFFER_COPY_GL:
+      return "GL";
+    case GST_CUDA_BUFFER_COPY_D3D11:
+      return "D3D11";
+    case GST_CUDA_BUFFER_COPY_NVMM:
+      return "NVMM";
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return "UNKNOWN";
+}
+
+static gboolean
+gst_cuda_buffer_fallback_copy (GstBuffer * dst, const GstVideoInfo * dst_info,
+    GstBuffer * src, const GstVideoInfo * src_info)
+{
+  GstVideoFrame dst_frame, src_frame;
+  guint i, j;
+
+  if (!gst_video_frame_map (&dst_frame, dst_info, dst, GST_MAP_WRITE)) {
+    GST_ERROR ("Failed to map dst buffer");
+    return FALSE;
+  }
+
+  if (!gst_video_frame_map (&src_frame, src_info, src, GST_MAP_READ)) {
+    gst_video_frame_unmap (&dst_frame);
+    GST_ERROR ("Failed to map src buffer");
+    return FALSE;
+  }
+
+  /* src and dst resolutions can be different, pick min value */
+  for (i = 0; i < GST_VIDEO_FRAME_N_PLANES (&dst_frame); i++) {
+    guint dst_width_in_bytes, src_width_in_bytes;
+    guint dst_height, src_height;
+    guint width_in_bytes, height;
+    guint dst_stride, src_stride;
+    guint8 *dst_data, *src_data;
+
+    dst_width_in_bytes = GST_VIDEO_FRAME_COMP_WIDTH (&dst_frame, i) *
+        GST_VIDEO_FRAME_COMP_PSTRIDE (&dst_frame, i);
+    src_width_in_bytes = GST_VIDEO_FRAME_COMP_WIDTH (&src_frame, i) *
+        GST_VIDEO_FRAME_COMP_PSTRIDE (&src_frame, i);
+
+    width_in_bytes = MIN (dst_width_in_bytes, src_width_in_bytes);
+
+    dst_height = GST_VIDEO_FRAME_COMP_HEIGHT (&dst_frame, i);
+    src_height = GST_VIDEO_FRAME_COMP_HEIGHT (&src_frame, i);
+
+    height = MIN (dst_height, src_height);
+
+    dst_stride = GST_VIDEO_FRAME_PLANE_STRIDE (&dst_frame, i);
+    src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (&src_frame, i);
+
+    dst_data = (guint8 *) GST_VIDEO_FRAME_PLANE_DATA (&dst_frame, i);
+    src_data = (guint8 *) GST_VIDEO_FRAME_PLANE_DATA (&src_frame, i);
+
+    for (j = 0; j < height; j++) {
+      memcpy (dst_data, src_data, width_in_bytes);
+      dst_data += dst_stride;
+      src_data += src_stride;
+    }
+  }
+
+  gst_video_frame_unmap (&src_frame);
+  gst_video_frame_unmap (&dst_frame);
+
+  return TRUE;
+}
+
+static gboolean
+map_buffer_and_fill_copy2d (GstBuffer * buf, const GstVideoInfo * info,
+    GstCudaBufferCopyType copy_type, GstVideoFrame * frame,
+    GstMapInfo * map_info, gboolean is_src,
+    CUDA_MEMCPY2D copy_paramsGST_VIDEO_MAX_PLANES)
+{
+  gboolean buffer_mapped = FALSE;
+  guint i;
+
+#ifdef HAVE_NVCODEC_NVMM
+  if (copy_type == GST_CUDA_BUFFER_COPY_NVMM) {
+    NvBufSurface *surface;
+    NvBufSurfaceParams *surface_params;
+    NvBufSurfacePlaneParams *plane_params;
+
+    if (!gst_buffer_map (buf, map_info, GST_MAP_READ)) {
+      GST_ERROR ("Failed to map input NVMM buffer");
+      memset (map_info, 0, sizeof (GstMapInfo));
+      return FALSE;
+    }
+
+    surface = (NvBufSurface *) map_info->data;
+
+    GST_TRACE ("batch-size %d, num-filled %d, memType %d",
+        surface->batchSize, surface->numFilled, surface->memType);
+
+    surface_params = surface->surfaceList;
+    buffer_mapped = TRUE;
+    if (!surface_params) {
+      GST_ERROR ("NVMM memory doesn't hold buffer");
+      goto error;
+    }
+
+    plane_params = &surface_params->planeParams;
+    if (plane_params->num_planes != GST_VIDEO_INFO_N_PLANES (info)) {
+      GST_ERROR ("num_planes mismatch, %d / %d",
+          plane_params->num_planes, GST_VIDEO_INFO_N_PLANES (info));
+      goto error;
+    }
+
+    switch (surface->memType) {
+        /* TODO: NVBUF_MEM_DEFAULT on jetson is SURFACE_ARRAY */
+      case NVBUF_MEM_DEFAULT:
+      case NVBUF_MEM_CUDA_DEVICE:
+      {
+        for (i = 0; i < plane_params->num_planes; i++) {
+          if (is_src) {
+            copy_paramsi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+            copy_paramsi.srcDevice = (CUdeviceptr)
+                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
+            copy_paramsi.srcPitch = plane_params->pitchi;
+          } else {
+            copy_paramsi.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+            copy_paramsi.dstDevice = (CUdeviceptr)
+                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
+            copy_paramsi.dstPitch = plane_params->pitchi;
+          }
+        }
+        break;
+      }
+      case NVBUF_MEM_CUDA_PINNED:
+      {
+        for (i = 0; i < plane_params->num_planes; i++) {
+          if (is_src) {
+            copy_paramsi.srcMemoryType = CU_MEMORYTYPE_HOST;
+            copy_paramsi.srcHost =
+                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
+            copy_paramsi.srcPitch = plane_params->pitchi;
+          } else {
+            copy_paramsi.dstMemoryType = CU_MEMORYTYPE_HOST;
+            copy_paramsi.dstHost =
+                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
+            copy_paramsi.dstPitch = plane_params->pitchi;
+          }
+        }
+        break;
+      }
+      case NVBUF_MEM_CUDA_UNIFIED:
+      {
+        for (i = 0; i < plane_params->num_planes; i++) {
+          if (is_src) {
+            copy_paramsi.srcMemoryType = CU_MEMORYTYPE_UNIFIED;
+            copy_paramsi.srcDevice = (CUdeviceptr)
+                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
+            copy_paramsi.srcPitch = plane_params->pitchi;
+          } else {
+            copy_paramsi.dstMemoryType = CU_MEMORYTYPE_UNIFIED;
+            copy_paramsi.dstDevice = (CUdeviceptr)
+                ((guint8 *) surface_params->dataPtr + plane_params->offseti);
+            copy_paramsi.dstPitch = plane_params->pitchi;
+          }
+        }
+        break;
+      }
+      default:
+        GST_ERROR ("Unexpected NVMM memory type %d", surface->memType);
+        goto error;
+    }
+
+    for (i = 0; i < plane_params->num_planes; i++) {
+      gsize width_in_bytes, height;
+
+      width_in_bytes = plane_params->widthi * plane_params->bytesPerPixi;
+      height = plane_params->heighti;
+
+      if (copy_paramsi.WidthInBytes == 0 ||
+          width_in_bytes < copy_paramsi.WidthInBytes) {
+        copy_paramsi.WidthInBytes = width_in_bytes;
+      }
+
+      if (copy_paramsi.Height == 0 || height < copy_paramsi.Height) {
+        copy_paramsi.Height = height;
+      }
+    }
+  } else
+#endif
+  {
+    GstMapFlags map_flags;
+
+    if (is_src)
+      map_flags = GST_MAP_READ;
+    else
+      map_flags = GST_MAP_WRITE;
+
+    if (copy_type == GST_CUDA_BUFFER_COPY_CUDA)
+      map_flags = (GstMapFlags) (map_flags | GST_MAP_CUDA);
+
+    if (!gst_video_frame_map (frame, info, buf, map_flags)) {
+      GST_ERROR ("Failed to map buffer");
+      goto error;
+    }
+
+    for (i = 0; i < GST_VIDEO_FRAME_N_PLANES (frame); i++) {
+      gsize width_in_bytes, height;
+
+      if (is_src) {
+        if (copy_type == GST_CUDA_BUFFER_COPY_CUDA) {
+          copy_paramsi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+          copy_paramsi.srcDevice =
+              (CUdeviceptr) GST_VIDEO_FRAME_PLANE_DATA (frame, i);
+        } else {
+          copy_paramsi.srcMemoryType = CU_MEMORYTYPE_HOST;
+          copy_paramsi.srcHost = GST_VIDEO_FRAME_PLANE_DATA (frame, i);
+        }
+        copy_paramsi.srcPitch = GST_VIDEO_FRAME_PLANE_STRIDE (frame, i);
+      } else {
+        if (copy_type == GST_CUDA_BUFFER_COPY_CUDA) {
+          copy_paramsi.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+          copy_paramsi.dstDevice =
+              (CUdeviceptr) GST_VIDEO_FRAME_PLANE_DATA (frame, i);
+        } else {
+          copy_paramsi.dstMemoryType = CU_MEMORYTYPE_HOST;
+          copy_paramsi.dstHost = GST_VIDEO_FRAME_PLANE_DATA (frame, i);
+        }
+        copy_paramsi.dstPitch = GST_VIDEO_FRAME_PLANE_STRIDE (frame, i);
+      }
+
+      width_in_bytes = GST_VIDEO_FRAME_COMP_WIDTH (frame, i) *
+          GST_VIDEO_FRAME_COMP_PSTRIDE (frame, i);
+      height = GST_VIDEO_FRAME_COMP_HEIGHT (frame, i);
+
+      if (copy_paramsi.WidthInBytes == 0 ||
+          width_in_bytes < copy_paramsi.WidthInBytes) {
+        copy_paramsi.WidthInBytes = width_in_bytes;
+      }
+
+      if (copy_paramsi.Height == 0 || height < copy_paramsi.Height) {
+        copy_paramsi.Height = height;
+      }
+    }
+  }
+
+  return TRUE;
+
+error:
+  if (buffer_mapped) {
+    gst_buffer_unmap (buf, map_info);
+    memset (map_info, 0, sizeof (GstMapInfo));
+  }
+
+  return FALSE;
+}
+
+static void
+unmap_buffer_or_frame (GstBuffer * buf, GstVideoFrame * frame,
+    GstMapInfo * map_info)
+{
+  if (frame->buffer)
+    gst_video_frame_unmap (frame);
+
+  if (map_info->data)
+    gst_buffer_unmap (buf, map_info);
+}
+
+static gboolean
+gst_cuda_buffer_copy_internal (GstBuffer * dst_buf,
+    GstCudaBufferCopyType dst_type, const GstVideoInfo * dst_info,
+    GstBuffer * src_buf, GstCudaBufferCopyType src_type,
+    const GstVideoInfo * src_info, GstCudaContext * context, CUstream stream)
+{
+  GstVideoFrame dst_frame, src_frame;
+  gboolean ret = FALSE;
+  GstMapInfo dst_map, src_map;
+  guint i;
+  CUDA_MEMCPY2D copy_paramsGST_VIDEO_MAX_PLANES;
+
+  memset (copy_params, 0, sizeof (copy_params));
+  memset (&dst_frame, 0, sizeof (GstVideoFrame));
+  memset (&src_frame, 0, sizeof (GstVideoFrame));
+  memset (&dst_map, 0, sizeof (GstMapInfo));
+  memset (&src_map, 0, sizeof (GstMapInfo));
+
+  if (!map_buffer_and_fill_copy2d (dst_buf, dst_info,
+          dst_type, &dst_frame, &dst_map, FALSE, copy_params)) {
+    GST_ERROR_OBJECT (context, "Failed to map output buffer");
+    return FALSE;
+  }
+
+  if (!map_buffer_and_fill_copy2d (src_buf, src_info,
+          src_type, &src_frame, &src_map, TRUE, copy_params)) {
+    GST_ERROR_OBJECT (context, "Failed to map input buffer");
+    unmap_buffer_or_frame (dst_buf, &dst_frame, &dst_map);
+    return FALSE;
+  }
+
+  if (!gst_cuda_context_push (context)) {
+    GST_ERROR_OBJECT (context, "Failed to push our context");
+    goto unmap_and_out;
+  }
+
+  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (dst_info); i++) {
+    ret = gst_cuda_result (CuMemcpy2DAsync (&copy_paramsi, stream));
+    if (!ret) {
+      GST_ERROR_OBJECT (context, "Failed to copy plane %d", i);
+      break;
+    }
+  }
+
+  gst_cuda_result (CuStreamSynchronize (stream));
+  gst_cuda_context_pop (nullptr);
+
+unmap_and_out:
+  unmap_buffer_or_frame (dst_buf, &src_frame, &src_map);
+  unmap_buffer_or_frame (src_buf, &dst_frame, &dst_map);
+
+  return ret;
+}
+
+#ifdef HAVE_CUDA_GST_GL
+static gboolean
+ensure_gl_interop (void)
+{
+  guint device_count = 0;
+  CUdevice device_list1 = { 0, };
+  CUresult cuda_ret;
+
+  cuda_ret = CuGLGetDevices (&device_count,
+      device_list, 1, CU_GL_DEVICE_LIST_ALL);
+
+  if (cuda_ret != CUDA_SUCCESS || device_count == 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+typedef struct _GLCopyData
+{
+  GstBuffer *src_buf;
+  const GstVideoInfo *src_info;
+  GstBuffer *dst_buf;
+  const GstVideoInfo *dst_info;
+
+  gboolean pbo_to_cuda;
+  GstCudaBufferCopyType copy_type;
+  GstCudaContext *context;
+  CUstream stream;
+  gboolean ret;
+} GLCopyData;
+
+static GstCudaGraphicsResource *
+ensure_cuda_gl_graphics_resource (GstCudaContext * context, GstMemory * mem)
+{
+  GQuark quark;
+  GstCudaGraphicsResource *ret = nullptr;
+
+  if (!gst_is_gl_memory_pbo (mem)) {
+    GST_WARNING_OBJECT (context, "memory is not GL PBO memory, %s",
+        mem->allocator->mem_type);
+    return nullptr;
+  }
+
+  quark = gst_cuda_quark_from_id (GST_CUDA_QUARK_GRAPHICS_RESOURCE);
+  ret = (GstCudaGraphicsResource *)
+      gst_mini_object_get_qdata (GST_MINI_OBJECT (mem), quark);
+
+  if (!ret) {
+    GstGLMemoryPBO *pbo;
+    GstGLBuffer *buf;
+    GstMapInfo info;
+
+    ret = gst_cuda_graphics_resource_new (context,
+        GST_OBJECT (GST_GL_BASE_MEMORY_CAST (mem)->context),
+        GST_CUDA_GRAPHICS_RESOURCE_GL_BUFFER);
+
+    if (!gst_memory_map (mem, &info, (GstMapFlags) (GST_MAP_READ | GST_MAP_GL))) {
+      GST_ERROR_OBJECT (context, "Failed to map gl memory");
+      gst_cuda_graphics_resource_free (ret);
+      return nullptr;
+    }
+
+    pbo = (GstGLMemoryPBO *) mem;
+    buf = pbo->pbo;
+
+    if (!gst_cuda_graphics_resource_register_gl_buffer (ret,
+            buf->id, CU_GRAPHICS_REGISTER_FLAGS_NONE)) {
+      GST_ERROR_OBJECT (context, "Failed to register gl buffer");
+      gst_memory_unmap (mem, &info);
+      gst_cuda_graphics_resource_free (ret);
+
+      return nullptr;
+    }
+
+    gst_memory_unmap (mem, &info);
+
+    gst_mini_object_set_qdata (GST_MINI_OBJECT (mem), quark, ret,
+        (GDestroyNotify) gst_cuda_graphics_resource_free);
+  }
+
+  return ret;
+}
+
+static void
+gl_copy_thread_func (GstGLContext * gl_context, GLCopyData * data)
+{
+  GstCudaGraphicsResource *resourcesGST_VIDEO_MAX_PLANES;
+  guint num_resources;
+  GstBuffer *gl_buf, *cuda_buf;
+  GstVideoFrame cuda_frame;
+  GstMapInfo cuda_map_info;
+  CUDA_MEMCPY2D copy_paramsGST_VIDEO_MAX_PLANES;
+  guint i;
+  GstCudaContext *context = data->context;
+  CUstream stream = data->stream;
+
+  memset (copy_params, 0, sizeof (copy_params));
+  memset (&cuda_frame, 0, sizeof (GstVideoFrame));
+  memset (&cuda_map_info, 0, sizeof (GstMapInfo));
+
+  data->ret = FALSE;
+
+  /* Incompatible gl context */
+  if (!ensure_gl_interop ())
+    return;
+
+  if (data->pbo_to_cuda) {
+    gl_buf = data->src_buf;
+    cuda_buf = data->dst_buf;
+
+    if (!map_buffer_and_fill_copy2d (cuda_buf,
+            data->dst_info, data->copy_type, &cuda_frame, &cuda_map_info,
+            FALSE, copy_params)) {
+      GST_ERROR_OBJECT (context, "Failed to map output CUDA buffer");
+      return;
+    }
+  } else {
+    gl_buf = data->dst_buf;
+    cuda_buf = data->src_buf;
+
+    if (!map_buffer_and_fill_copy2d (cuda_buf,
+            data->src_info, data->copy_type, &cuda_frame, &cuda_map_info,
+            TRUE, copy_params)) {
+      GST_ERROR_OBJECT (context, "Failed to map input CUDA buffer");
+      return;
+    }
+  }
+
+  num_resources = gst_buffer_n_memory (gl_buf);
+  g_assert (num_resources >= GST_VIDEO_INFO_N_PLANES (data->src_info));
+
+  if (!gst_cuda_context_push (context)) {
+    GST_ERROR_OBJECT (context, "Failed to push context");
+    unmap_buffer_or_frame (cuda_buf, &cuda_frame, &cuda_map_info);
+    return;
+  }
+
+  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (data->src_info); i++) {
+    GstMemory *mem = gst_buffer_peek_memory (gl_buf, i);
+    GstGLMemoryPBO *pbo;
+
+    resourcesi = ensure_cuda_gl_graphics_resource (context, mem);
+    if (!resourcesi)
+      goto out;
+
+    pbo = (GstGLMemoryPBO *) mem;
+    if (!data->pbo_to_cuda) {
+      /* Need PBO -> texture */
+      GST_MINI_OBJECT_FLAG_SET (mem, GST_GL_BASE_MEMORY_TRANSFER_NEED_UPLOAD);
+
+      /* PBO -> sysmem */
+      GST_MINI_OBJECT_FLAG_SET (pbo->pbo,
+          GST_GL_BASE_MEMORY_TRANSFER_NEED_DOWNLOAD);
+    } else {
+      /* get the texture into the PBO */
+      gst_gl_memory_pbo_upload_transfer (pbo);
+      gst_gl_memory_pbo_download_transfer (pbo);
+    }
+  }
+
+  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (data->src_info); i++) {
+    CUgraphicsResource cuda_resource;
+    CUdeviceptr dev_ptr;
+    size_t size;
+    gboolean copy_ret;
+    gsize width_in_bytes, height;
+
+    if (data->pbo_to_cuda) {
+      cuda_resource =
+          gst_cuda_graphics_resource_map (resourcesi, stream,
+          CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY);
+    } else {
+      cuda_resource =
+          gst_cuda_graphics_resource_map (resourcesi, stream,
+          CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD);
+    }
+
+    if (!cuda_resource) {
+      GST_ERROR_OBJECT (context, "Failed to map graphics resource %d", i);
+      goto out;
+    }
+
+    if (!gst_cuda_result (CuGraphicsResourceGetMappedPointer (&dev_ptr, &size,
+                cuda_resource))) {
+      gst_cuda_graphics_resource_unmap (resourcesi, stream);
+      GST_ERROR_OBJECT (context, "Failed to get mapped pointer");
+      goto out;
+    }
+
+    if (data->pbo_to_cuda) {
+      copy_paramsi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+      copy_paramsi.srcDevice = dev_ptr;
+      copy_paramsi.srcPitch = GST_VIDEO_INFO_PLANE_STRIDE (data->src_info, i);
+
+      width_in_bytes = GST_VIDEO_INFO_COMP_WIDTH (data->src_info, i) *
+          GST_VIDEO_INFO_COMP_PSTRIDE (data->src_info, i);
+      height = GST_VIDEO_INFO_COMP_HEIGHT (data->src_info, i);
+    } else {
+      copy_paramsi.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+      copy_paramsi.dstDevice = dev_ptr;
+      copy_paramsi.dstPitch = GST_VIDEO_INFO_PLANE_STRIDE (data->dst_info, i);
+
+      width_in_bytes = GST_VIDEO_INFO_COMP_WIDTH (data->dst_info, i) *
+          GST_VIDEO_INFO_COMP_PSTRIDE (data->dst_info, i);
+      height = GST_VIDEO_INFO_COMP_HEIGHT (data->dst_info, i);
+    }
+
+    if (width_in_bytes < copy_paramsi.WidthInBytes)
+      copy_paramsi.WidthInBytes = width_in_bytes;
+
+    if (height < copy_paramsi.Height)
+      copy_paramsi.Height = height;
+
+    copy_ret = gst_cuda_result (CuMemcpy2DAsync (&copy_paramsi, stream));
+    gst_cuda_graphics_resource_unmap (resourcesi, stream);
+
+    if (!copy_ret) {
+      GST_ERROR_OBJECT (context, "Failed to copy plane %d", i);
+      goto out;
+    }
+  }
+
+  data->ret = TRUE;
+
+out:
+  gst_cuda_result (CuStreamSynchronize (stream));
+  gst_cuda_context_pop (nullptr);
+  unmap_buffer_or_frame (cuda_buf, &cuda_frame, &cuda_map_info);
+}
+
+static gboolean
+cuda_copy_gl_interop (GstBuffer * dst_buf, const GstVideoInfo * dst_info,
+    GstBuffer * src_buf, const GstVideoInfo * src_info,
+    GstGLContext * gl_context, GstCudaContext * context, CUstream stream,
+    gboolean pbo_to_cuda, GstCudaBufferCopyType copy_type)
+{
+  GLCopyData data;
+
+  g_assert (copy_type == GST_CUDA_BUFFER_COPY_CUDA ||
+      copy_type == GST_CUDA_BUFFER_COPY_NVMM);
+
+  data.src_buf = src_buf;
+  data.src_info = src_info;
+  data.dst_buf = dst_buf;
+  data.dst_info = dst_info;
+  data.pbo_to_cuda = pbo_to_cuda;
+  data.copy_type = copy_type;
+  data.context = context;
+  data.stream = stream;
+  data.ret = FALSE;
+
+  gst_gl_context_thread_add (gl_context,
+      (GstGLContextThreadFunc) gl_copy_thread_func, &data);
+
+  return data.ret;
+}
+#endif
+
+#ifdef G_OS_WIN32
+static gboolean
+ensure_d3d11_interop (GstCudaContext * context, GstD3D11Device * device)
+{
+  guint device_count = 0;
+  guint cuda_device_id;
+  CUdevice device_list1 = { 0, };
+  CUresult cuda_ret;
+
+  g_object_get (context, "cuda-device-id", &cuda_device_id, nullptr);
+
+  cuda_ret = CuD3D11GetDevices (&device_count,
+      device_list, 1, gst_d3d11_device_get_device_handle (device),
+      CU_D3D11_DEVICE_LIST_ALL);
+
+  if (cuda_ret != CUDA_SUCCESS || device_count == 0)
+    return FALSE;
+
+  if (device_list0 != (CUdevice) cuda_device_id)
+    return FALSE;
+
+  return TRUE;
+}
+
+static GstCudaGraphicsResource *
+ensure_cuda_d3d11_graphics_resource (GstCudaContext * context, GstMemory * mem)
+{
+  static gint64 d3d11_interop_token = 0;
+  static std::once_flag once_flag;
+  GstCudaGraphicsResource *ret = nullptr;
+  GstD3D11Memory *dmem;
+
+  GST_CUDA_CALL_ONCE_BEGIN {
+    d3d11_interop_token = gst_d3d11_create_user_token ();
+  } GST_CUDA_CALL_ONCE_END;
+
+  if (!gst_is_d3d11_memory (mem)) {
+    GST_WARNING_OBJECT (context, "memory is not D3D11 memory, %s",
+        mem->allocator->mem_type);
+    return nullptr;
+  }
+
+  dmem = GST_D3D11_MEMORY_CAST (mem);
+  ret = (GstCudaGraphicsResource *)
+      gst_d3d11_memory_get_token_data (dmem, d3d11_interop_token);
+
+  if (!ret) {
+    ret = gst_cuda_graphics_resource_new (context,
+        GST_OBJECT (GST_D3D11_MEMORY_CAST (mem)->device),
+        GST_CUDA_GRAPHICS_RESOURCE_D3D11_RESOURCE);
+
+    if (!gst_cuda_graphics_resource_register_d3d11_resource (ret,
+            gst_d3d11_memory_get_resource_handle (GST_D3D11_MEMORY_CAST (mem)),
+            CU_GRAPHICS_REGISTER_FLAGS_SURFACE_LOAD_STORE)) {
+      GST_ERROR_OBJECT (context, "failed to register d3d11 resource");
+      gst_cuda_graphics_resource_free (ret);
+
+      ret = nullptr;
+    } else {
+      gst_d3d11_memory_set_token_data (dmem, d3d11_interop_token, ret,
+          (GDestroyNotify) gst_cuda_graphics_resource_free);
+    }
+  }
+
+  return ret;
+}
+
+static gboolean
+cuda_copy_d3d11_interop (GstBuffer * dst_buf, const GstVideoInfo * dst_info,
+    GstBuffer * src_buf, const GstVideoInfo * src_info, GstD3D11Device * device,
+    GstCudaContext * context, CUstream stream, gboolean d3d11_to_cuda)
+{
+  GstCudaGraphicsResource *resourcesGST_VIDEO_MAX_PLANES;
+  D3D11_TEXTURE2D_DESC descGST_VIDEO_MAX_PLANES;
+  guint num_resources;
+  GstBuffer *d3d11_buf, *cuda_buf;
+  GstVideoFrame d3d11_frame, cuda_frame;
+  GstMapInfo cuda_map_info;
+  CUDA_MEMCPY2D copy_paramsGST_VIDEO_MAX_PLANES;
+  guint i;
+  gboolean ret = FALSE;
+
+  memset (copy_params, 0, sizeof (copy_params));
+  memset (&cuda_frame, 0, sizeof (GstVideoFrame));
+  memset (&cuda_map_info, 0, sizeof (GstMapInfo));
+
+  /* Incompatible d3d11 device */
+  if (!ensure_d3d11_interop (context, device))
+    return FALSE;
+
+  if (d3d11_to_cuda) {
+    d3d11_buf = src_buf;
+    cuda_buf = dst_buf;
+    if (!gst_video_frame_map (&d3d11_frame, src_info, d3d11_buf,
+            (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D11))) {
+      GST_ERROR_OBJECT (context, "Failed to map input D3D11 buffer");
+      return FALSE;
+    }
+    if (!map_buffer_and_fill_copy2d (cuda_buf,
+            dst_info, GST_CUDA_BUFFER_COPY_CUDA, &cuda_frame, &cuda_map_info,
+            FALSE, copy_params)) {
+      GST_ERROR_OBJECT (context, "Failed to map output CUDA buffer");
+      gst_video_frame_unmap (&d3d11_frame);
+      return FALSE;
+    }
+  } else {
+    d3d11_buf = dst_buf;
+    cuda_buf = src_buf;
+    if (!gst_video_frame_map (&d3d11_frame, dst_info, d3d11_buf,
+            (GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D11))) {
+      GST_ERROR_OBJECT (context, "Failed to map output D3D11 buffer");
+      return FALSE;
+    }
+    if (!map_buffer_and_fill_copy2d (cuda_buf,
+            src_info, GST_CUDA_BUFFER_COPY_CUDA, &cuda_frame, &cuda_map_info,
+            TRUE, copy_params)) {
+      GST_ERROR_OBJECT (context, "Failed to map input CUDA buffer");
+      gst_video_frame_unmap (&d3d11_frame);
+      return FALSE;
+    }
+  }
+
+  num_resources = gst_buffer_n_memory (d3d11_buf);
+  g_assert (num_resources >= GST_VIDEO_FRAME_N_PLANES (&d3d11_frame));
+
+  if (!gst_cuda_context_push (context)) {
+    GST_ERROR_OBJECT (context, "Failed to push context");
+    gst_video_frame_unmap (&d3d11_frame);
+    unmap_buffer_or_frame (cuda_buf, &cuda_frame, &cuda_map_info);
+    return FALSE;
+  }
+
+  for (i = 0; i < GST_VIDEO_FRAME_N_PLANES (&d3d11_frame); i++) {
+    GstMemory *mem = gst_buffer_peek_memory (d3d11_buf, i);
+
+    resourcesi = ensure_cuda_d3d11_graphics_resource (context, mem);
+    if (!resourcesi
+        || !gst_d3d11_memory_get_texture_desc (GST_D3D11_MEMORY_CAST (mem),
+            &desci))
+      goto out;
+  }
+
+  for (i = 0; i < GST_VIDEO_FRAME_N_PLANES (&d3d11_frame); i++) {
+    CUgraphicsResource cuda_resource;
+    CUarray d3d11_array;
+    gboolean copy_ret;
+
+    if (d3d11_to_cuda) {
+      cuda_resource =
+          gst_cuda_graphics_resource_map (resourcesi, stream,
+          CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY);
+    } else {
+      cuda_resource =
+          gst_cuda_graphics_resource_map (resourcesi, stream,
+          CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD);
+    }
+
+    if (!cuda_resource) {
+      GST_ERROR_OBJECT (context, "Failed to map graphics resource %d", i);
+      goto out;
+    }
+
+    if (!gst_cuda_result (CuGraphicsSubResourceGetMappedArray (&d3d11_array,
+                cuda_resource, 0, 0))) {
+      gst_cuda_graphics_resource_unmap (resourcesi, stream);
+      GST_ERROR_OBJECT (context, "Failed to get mapped array");
+      goto out;
+    }
+
+    if (d3d11_to_cuda) {
+      copy_paramsi.srcMemoryType = CU_MEMORYTYPE_ARRAY;
+      copy_paramsi.srcArray = d3d11_array;
+      copy_paramsi.srcPitch =
+          desci.Width * GST_VIDEO_FRAME_COMP_PSTRIDE (&d3d11_frame, i);
+    } else {
+      copy_paramsi.dstMemoryType = CU_MEMORYTYPE_ARRAY;
+      copy_paramsi.dstArray = d3d11_array;
+      copy_paramsi.dstPitch =
+          desci.Width * GST_VIDEO_FRAME_COMP_PSTRIDE (&d3d11_frame, i);
+    }
+
+    copy_ret = gst_cuda_result (CuMemcpy2DAsync (&copy_paramsi, stream));
+    gst_cuda_graphics_resource_unmap (resourcesi, stream);
+
+    if (!copy_ret) {
+      GST_ERROR_OBJECT (context, "Failed to copy plane %d", i);
+      goto out;
+    }
+  }
+
+  ret = TRUE;
+
+out:
+  gst_cuda_result (CuStreamSynchronize (stream));
+  gst_cuda_context_pop (nullptr);
+  gst_video_frame_unmap (&d3d11_frame);
+  unmap_buffer_or_frame (cuda_buf, &cuda_frame, &cuda_map_info);
+
+  return ret;
+}
+#endif
+
+gboolean
+gst_cuda_buffer_copy (GstBuffer * dst, GstCudaBufferCopyType dst_type,
+    const GstVideoInfo * dst_info, GstBuffer * src,
+    GstCudaBufferCopyType src_type, const GstVideoInfo * src_info,
+    GstCudaContext * context, GstCudaStream * stream)
+{
+  gboolean use_copy_2d = FALSE;
+  GstMemory *dst_mem, *src_mem;
+#ifdef G_OS_WIN32
+  D3D11_TEXTURE2D_DESC desc;
+#endif
+  GstCudaContext *cuda_context = context;
+  GstCudaMemory *cmem = nullptr;
+  GstCudaStream *mem_stream = nullptr;
+  gboolean ret;
+
+  g_return_val_if_fail (GST_IS_BUFFER (dst), FALSE);
+  g_return_val_if_fail (dst_info != nullptr, FALSE);
+  g_return_val_if_fail (GST_IS_BUFFER (src), FALSE);
+  g_return_val_if_fail (src_info != nullptr, FALSE);
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), FALSE);
+
+  _init_debug ();
+
+  if (dst_type == GST_CUDA_BUFFER_COPY_NVMM &&
+      src_type == GST_CUDA_BUFFER_COPY_NVMM) {
+    GST_ERROR_OBJECT (context, "Not supported copy NVMM -> NVMM");
+    return FALSE;
+  }
+
+  if (GST_VIDEO_INFO_FORMAT (dst_info) != GST_VIDEO_INFO_FORMAT (src_info)) {
+    GST_ERROR_OBJECT (context,
+        "Copy between different format is not supported");
+    return FALSE;
+  }
+
+  if (dst_type == GST_CUDA_BUFFER_COPY_CUDA ||
+      dst_type == GST_CUDA_BUFFER_COPY_NVMM ||
+      src_type == GST_CUDA_BUFFER_COPY_CUDA ||
+      src_type == GST_CUDA_BUFFER_COPY_NVMM) {
+    use_copy_2d = TRUE;
+  }
+
+  if (!use_copy_2d) {
+    GST_TRACE_OBJECT (context, "Not a device memory, use system memory copy");
+    return gst_cuda_buffer_fallback_copy (dst, dst_info, src, src_info);
+  }
+
+  dst_mem = gst_buffer_peek_memory (dst, 0);
+  src_mem = gst_buffer_peek_memory (src, 0);
+
+#ifdef HAVE_CUDA_GST_GL
+  if (src_type == GST_CUDA_BUFFER_COPY_GL && gst_is_gl_memory_pbo (src_mem)) {
+    GstGLMemory *gl_mem = (GstGLMemory *) src_mem;
+    GstGLContext *gl_context = gl_mem->mem.context;
+
+    if (dst_type == GST_CUDA_BUFFER_COPY_CUDA && gst_is_cuda_memory (dst_mem)) {
+      cmem = GST_CUDA_MEMORY_CAST (dst_mem);
+      cuda_context = cmem->context;
+      mem_stream = gst_cuda_memory_get_stream (cmem);
+      if (mem_stream)
+        stream = mem_stream;
+    }
+
+    GST_TRACE_OBJECT (context, "GL -> %s",
+        gst_cuda_buffer_copy_type_to_string (dst_type));
+
+    ret = cuda_copy_gl_interop (dst, dst_info, src, src_info, gl_context,
+        cuda_context, gst_cuda_stream_get_handle (stream), TRUE, dst_type);
+
+    if (cmem)
+      GST_MEMORY_FLAG_UNSET (cmem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+
+    return ret;
+  }
+
+  if (dst_type == GST_CUDA_BUFFER_COPY_GL && gst_is_gl_memory_pbo (dst_mem)) {
+    GstGLMemory *gl_mem = (GstGLMemory *) dst_mem;
+    GstGLContext *gl_context = gl_mem->mem.context;
+
+    if (src_type == GST_CUDA_BUFFER_COPY_CUDA && gst_is_cuda_memory (src_mem)) {
+      cmem = GST_CUDA_MEMORY_CAST (src_mem);
+      cuda_context = cmem->context;
+
+      /* Use memory's stream object if available */
+      mem_stream = gst_cuda_memory_get_stream (cmem);
+      if (mem_stream)
+        stream = mem_stream;
+    }
+
+    GST_TRACE_OBJECT (context, "%s -> GL",
+        gst_cuda_buffer_copy_type_to_string (src_type));
+
+    return cuda_copy_gl_interop (dst, dst_info, src, src_info, gl_context,
+        cuda_context, gst_cuda_stream_get_handle (stream), FALSE, src_type);
+  }
+#endif
+
+#ifdef G_OS_WIN32
+  if (src_type == GST_CUDA_BUFFER_COPY_D3D11 && gst_is_d3d11_memory (src_mem) &&
+      gst_d3d11_memory_get_texture_desc (GST_D3D11_MEMORY_CAST (src_mem), &desc)
+      && desc.Usage == D3D11_USAGE_DEFAULT && gst_is_cuda_memory (dst_mem)) {
+    GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (src_mem);
+    GstD3D11Device *device = dmem->device;
+
+    cmem = GST_CUDA_MEMORY_CAST (dst_mem);
+    cuda_context = cmem->context;
+
+    /* Use memory's stream object if available */
+    mem_stream = gst_cuda_memory_get_stream (cmem);
+    if (mem_stream)
+      stream = mem_stream;
+
+    GST_TRACE_OBJECT (context, "D3D11 -> CUDA");
+
+    gst_d3d11_device_lock (device);
+    ret = cuda_copy_d3d11_interop (dst, dst_info, src, src_info, device,
+        cuda_context, gst_cuda_stream_get_handle (stream), TRUE);
+    gst_d3d11_device_unlock (device);
+
+    GST_MEMORY_FLAG_UNSET (cmem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+
+    return ret;
+  }
+
+  if (dst_type == GST_CUDA_BUFFER_COPY_D3D11 && gst_is_d3d11_memory (dst_mem) &&
+      gst_d3d11_memory_get_texture_desc (GST_D3D11_MEMORY_CAST (dst_mem), &desc)
+      && desc.Usage == D3D11_USAGE_DEFAULT && gst_is_cuda_memory (src_mem)) {
+    GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (dst_mem);
+    GstD3D11Device *device = dmem->device;
+
+    cmem = GST_CUDA_MEMORY_CAST (src_mem);
+    cuda_context = cmem->context;
+
+    /* Use memory's stream object if available */
+    mem_stream = gst_cuda_memory_get_stream (cmem);
+    if (mem_stream)
+      stream = mem_stream;
+
+    GST_TRACE_OBJECT (context, "CUDA -> D3D11");
+
+    gst_d3d11_device_lock (device);
+    ret = cuda_copy_d3d11_interop (dst, dst_info, src, src_info, device,
+        cuda_context, gst_cuda_stream_get_handle (stream), FALSE);
+    gst_d3d11_device_unlock (device);
+
+    return ret;
+  }
+#endif
+
+  if (gst_is_cuda_memory (dst_mem)) {
+    cmem = GST_CUDA_MEMORY_CAST (dst_mem);
+  } else if (gst_is_cuda_memory (src_mem)) {
+    cmem = GST_CUDA_MEMORY_CAST (src_mem);
+  } else {
+    cmem = nullptr;
+  }
+
+  if (cmem) {
+    context = cmem->context;
+    mem_stream = gst_cuda_memory_get_stream (cmem);
+    if (mem_stream)
+      stream = mem_stream;
+  }
+
+  GST_TRACE_OBJECT (context, "%s -> %s",
+      gst_cuda_buffer_copy_type_to_string (src_type),
+      gst_cuda_buffer_copy_type_to_string (dst_type));
+
+  ret = gst_cuda_buffer_copy_internal (dst, dst_type, dst_info,
+      src, src_type, src_info, cuda_context,
+      gst_cuda_stream_get_handle (stream));
+
+  /* Already synchronized */
+  if (gst_is_cuda_memory (src_mem))
+    GST_MEMORY_FLAG_UNSET (src_mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+
+  return ret;
+}
+
+/**
+ * gst_cuda_create_user_token:
+ *
+ * Creates new user token value
+ *
+ * Returns: user token value
+ *
+ * Since: 1.24
+ */
+gint64
+gst_cuda_create_user_token (void)
+{
+  /* *INDENT-OFF* */
+  static std::atomic < gint64 > user_token { 0 };
+  /* *INDENT-ON* */
+
+  return user_token.fetch_add (1);
+}
+
+static gboolean
+_abort_on_error (CUresult result)
+{
+  static std::set < CUresult > abort_list;
+  GST_CUDA_CALL_ONCE_BEGIN {
+    const gchar *env = g_getenv ("GST_CUDA_CRITICAL_ERRORS");
+    if (!env)
+      return;
+
+    gchar **split = g_strsplit (env, ",", 0);
+    gchar **iter;
+    for (iter = split; *iter; iter++) {
+      int error_code = 0;
+      try {
+        error_code = std::stoi (*iter);
+      } catch ( ...) {
+        GST_WARNING ("Invalid argument \"%s\"", *iter);
+        continue;
+      };
+
+      if (error_code > 0)
+        abort_list.insert ((CUresult) error_code);
+    }
+
+    g_strfreev (split);
+  }
+  GST_CUDA_CALL_ONCE_END;
+
+  if (abort_list.empty ())
+    return FALSE;
+
+  if (abort_list.find (result) != abort_list.end ())
+    return TRUE;
+
+  return FALSE;
+}
+
+/**
+ * _gst_cuda_debug:
+ * @result: CUDA result code
+ * @cat: a #GstDebugCategory
+ * @file: the file that checking the result code
+ * @function: the function that checking the result code
+ * @line: the line that checking the result code
+ *
+ * Returns: %TRUE if CUDA device API call result is CUDA_SUCCESS
+ *
+ * Since: 1.24
+ */
+gboolean
+_gst_cuda_debug (CUresult result, GstDebugCategory * cat,
+    const gchar * file, const gchar * function, gint line)
+{
+  if (result != CUDA_SUCCESS) {
+#ifndef GST_DISABLE_GST_DEBUG
+    const gchar *_error_name, *_error_text;
+    CuGetErrorName (result, &_error_name);
+    CuGetErrorString (result, &_error_text);
+    gst_debug_log (cat, GST_LEVEL_WARNING, file, function, line,
+        NULL, "CUDA call failed: %s, %s", _error_name, _error_text);
+#endif
+    if (_abort_on_error (result)) {
+      GST_ERROR ("Critical error %d, abort", (gint) result);
+      g_abort ();
+    }
+
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+#ifdef G_OS_WIN32
+/* Defined in ntdef.h */
+struct OBJECT_ATTRIBUTES
+{
+  ULONG Length;
+  HANDLE RootDirectory;
+  PVOID ObjectName;
+  ULONG Attributes;
+  PVOID SecurityDescriptor;
+  PVOID SecurityQualityOfService;
+};
+#endif
+
+gpointer
+gst_cuda_get_win32_handle_metadata (void)
+{
+#ifdef G_OS_WIN32
+  static const gchar sddl = "D:P(OA;;GARCSDWDWORPWPCCDCLCSWLODTCRFA;;;WD)";
+  static OBJECT_ATTRIBUTES attr;
+  static BOOL initialized = FALSE;
+
+  /*
+   * D:P(string_ace) -> DACL protected with "string_ace"
+   *
+   * ace_string format
+   * ace_type;ace_flags;rights;object_guid;inherit_object_guid;account_sid
+   *
+   * ace_type: OA (ACCESS_ALLOWED_OBJECT_ACE_TYPE)
+   *
+   * ace_flags: (empty)
+   *
+   * rights: GARCSDWDWOCCDCLCSWLODTWPRPCRFA (allow all)
+   * - Generic access rights
+   *   GA (GENERIC_ALL)
+   * - Standard access right
+   *   RC (READ_CONTROL) SD (DELETE) WD (WRITE_DAC) WO (WRITE_OWNER)
+   * - Directory service object access right
+   *   RP (ADS_RIGHT_DS_READ_PROP)
+   *   WP (ADS_RIGHT_DS_WRITE_PROP)
+   *   CC (ADS_RIGHT_DS_CREATE_CHILD)
+   *   DC (ADS_RIGHT_DS_DELETE_CHILD)
+   *   LC (ADS_RIGHT_ACTRL_DS_LIST)
+   *   SW (ADS_RIGHT_DS_SELF)
+   *   LO (ADS_RIGHT_DS_LIST_OBJECT)
+   *   DT (ADS_RIGHT_DS_DELETE_TREE)
+   *   CR (ADS_RIGHT_DS_CONTROL_ACCESS)
+   * - File access rights
+   *   FA (FILE_GENERIC_ALL)
+   *
+   * object_guid: (empty)
+   *
+   * inherit_object_guid (empty)
+   *
+   * account_sid: WD (SDDL_EVERYONE)
+   *
+   * See also
+   * https://learn.microsoft.com/en-us/windows/win32/secauthz/security-descriptor-string-format
+   */
+  GST_CUDA_CALL_ONCE_BEGIN {
+    PSECURITY_DESCRIPTOR desc;
+
+    memset (&attr, 0, sizeof (OBJECT_ATTRIBUTES));
+
+    initialized = ConvertStringSecurityDescriptorToSecurityDescriptorA (sddl,
+        SDDL_REVISION_1, &desc, nullptr);
+    if (!initialized)
+      return;
+
+    attr.Length = sizeof (OBJECT_ATTRIBUTES);
+    attr.SecurityDescriptor = desc;
+  }
+  GST_CUDA_CALL_ONCE_END;
+
+  if (!initialized)
+    return nullptr;
+
+  return &attr;
+#else
+  return nullptr;
+#endif
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/gstcudautils.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/gstcudautils.h Changed

@@ -17,70 +17,38 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __GST_CUDA_UTILS_H__
-#define __GST_CUDA_UTILS_H__
+#pragma once
 
-#ifndef GST_USE_UNSTABLE_API
-#warning "The Cuda library from gst-plugins-bad is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include "cuda-prelude.h"
 #include <gst/gst.h>
 #include <gst/video/video.h>
-#include "cuda-gst.h"
-#include "gstcudaloader.h"
-#include "gstcudacontext.h"
-#include "gstcudamemory.h"
+#include <gst/cuda/cuda-prelude.h>
+#include <gst/cuda/cuda-gst.h>
+#include <gst/cuda/gstcudacontext.h>
 
 G_BEGIN_DECLS
 
-#ifndef GST_DISABLE_GST_DEBUG
-static inline gboolean
-_gst_cuda_debug(CUresult result, GstDebugCategory * category,
-    const gchar * file, const gchar * function, gint line)
-{
-  const gchar *_error_name, *_error_text;
-  if (result != CUDA_SUCCESS) {
-    CuGetErrorName (result, &_error_name);
-    CuGetErrorString (result, &_error_text);
-    gst_debug_log (category, GST_LEVEL_WARNING, file, function, line,
-        NULL, "CUDA call failed: %s, %s", _error_name, _error_text);
-
-    return FALSE;
-  }
-
-  return TRUE;
-}
+GST_CUDA_API
+gboolean _gst_cuda_debug (CUresult result,
+                          GstDebugCategory * cat,
+                          const gchar * file,
+                          const gchar * function,
+                          gint line);
 
+#ifndef GST_DISABLE_GST_DEBUG
 /**
  * gst_cuda_result:
  * @result: CUDA device API return code `CUresult`
  *
  * Returns: %TRUE if CUDA device API call result is CUDA_SUCCESS
+ *
+ * Since: 1.22
  */
 #define gst_cuda_result(result) \
   _gst_cuda_debug(result, GST_CAT_DEFAULT, __FILE__, GST_FUNCTION, __LINE__)
 #else
-
-static inline gboolean
-_gst_cuda_debug(CUresult result, GstDebugCategory * category,
-    const gchar * file, const gchar * function, gint line)
-{
-  return result == CUDA_SUCCESS;
-}
-
-/**
- * gst_cuda_result:
- * @result: CUDA device API return code `CUresult`
- *
- * Returns: %TRUE if CUDA device API call result is CUDA_SUCCESS
- *
- * Since: 1.22
- */
 #define gst_cuda_result(result) \
   _gst_cuda_debug(result, NULL, __FILE__, GST_FUNCTION, __LINE__)
-#endif
+#endif /* GST_DISABLE_GST_DEBUG */
 
 /**
  * GstCudaQuarkId:
@@ -184,6 +152,8 @@
 GST_CUDA_API
 void            gst_cuda_graphics_resource_free (GstCudaGraphicsResource * resource);
 
+GST_CUDA_API
+gint64          gst_cuda_create_user_token (void);
+
 G_END_DECLS
 
-#endif /* __GST_CUDA_UTILS_H__ */

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/meson.build Changed

@@ -1,63 +1,97 @@
 cuda_sources = files(
-  'gstcudaloader.c',
-  'gstcudacontext.c',
-  'gstcudautils.c',
-  'gstcudamemory.c',
-  'gstcudabufferpool.c',
-  'gstcudanvrtc.c',
+  'gstcudabufferpool.cpp',
+  'gstcudacontext.cpp',
+  'gstcudaloader.cpp',
+  'gstcudamemory.cpp',
+  'gstcudanvrtc.cpp',
+  'gstcudastream.cpp',
+  'gstcudautils.cpp',
 )
 
 cuda_headers = files(
-    'cuda-prelude.h',
-    'gstcudabufferpool.h',
-    'gstcudacontext.h',
-    'gstcudaloader.h',
-    'gstcudamemory.h',
-    'gstcudanvrtc.h',
-    'gstcudautils.h',
+  'cuda-prelude.h',
+  'gstcuda.h',
+  'gstcudabufferpool.h',
+  'gstcudacontext.h',
+  'gstcudaloader.h',
+  'gstcudamemory.h',
+  'gstcudanvrtc.h',
+  'gstcudastream.h',
+  'gstcudautils.h',
 )
 
 gstcuda_dep = dependency('', required : false)
+cuda_stubinc = include_directories('./stub')
+gstcuda_stub_dep = declare_dependency(
+  include_directories: cuda_stubinc
+)
 
+gstcuda_platform_dep = 
 if host_system not in 'windows', 'linux'
   subdir_done()
 endif
 
+# Linux ARM would need -latomic for std::atomic<int64_t>
+if host_system == 'linux' and host_machine.cpu_family() not in 'x86', 'x86_64'
+  libatomic_dep = cxx.find_library('atomic', required: false)
+  if not libatomic_dep.found()
+    subdir_done()
+  endif
+
+  gstcuda_platform_dep += libatomic_dep
+endif
+
 cuda_win32_headers = 
   'initguid.h',
   'd3d11.h',
   'dxgi.h',
 
 
+extra_args = '-DGST_USE_UNSTABLE_API',
+              '-DBUILDING_GST_CUDA',
+              '-DG_LOG_DOMAIN="GStreamer-Cuda"'
+
+if gstgl_dep.found()
+  extra_args += '-DHAVE_CUDA_GST_GL'
+endif
+
 if host_system == 'windows'
   foreach h : cuda_win32_headers
     if not cc.has_header(h)
       subdir_done()
     endif
   endforeach
-endif
 
-cuda_stubinc = include_directories('./stub')
-extra_c_args = '-DGST_USE_UNSTABLE_API'
+  if not gstd3d11_dep.found()
+    subdir_done()
+  endif
 
-if gstgl_dep.found()
-  extra_c_args += '-DHAVE_NVCODEC_GST_GL=1'
-endif
+  # ConvertStringSecurityDescriptorToSecurityDescriptorA
+  advapi32_lib = cxx.find_library('advapi32', required: false)
+  if not advapi32_lib.found()
+    subdir_done()
+  endif
 
-if gstd3d11_dep.found()
-  extra_c_args += '-DGST_CUDA_HAS_D3D=1', '-DCOBJMACROS'
+  gstcuda_platform_dep += advapi32_lib
+
+  # MinGW 32bits build workaround
+  if cc.get_id() != 'msvc'
+    extra_args += cc.get_supported_arguments(
+      '-Wno-redundant-decls',
+    )
+  endif
 endif
 
 pkg_name = 'gstreamer-cuda-' + api_version
 gstcuda= library('gstcuda-' + api_version,
   cuda_sources,
-  c_args : gst_plugins_bad_args + extra_c_args + '-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_CUDA', '-DG_LOG_DOMAIN="GStreamer-Cuda"',
-  cpp_args : gst_plugins_bad_args,
+  c_args : gst_plugins_bad_args + extra_args,
+  cpp_args : gst_plugins_bad_args + extra_args,
   include_directories : configinc, libsinc, cuda_stubinc,
   version : libversion,
   soversion : soversion,
   install : true,
-  dependencies : gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep, gstd3d11_dep
+  dependencies : gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep, gstd3d11_dep, gstcuda_platform_dep
 )
 
 gen_sources = 
@@ -92,9 +126,11 @@
   }
   if not static_build
     cudagst_gir = gnome.generate_gir(gstcuda, kwargs: cuda_gir)
+    library_def += {'gir_targets':  library_def.get('gir_targets', ) + cudagst_gir}
 
     gir += {'includes': gir'includes' + cudagst_gir0}
     gst_cuda_gir = gnome.generate_gir(gstcuda, kwargs: gir)
+    library_def += {'gir_targets':  library_def.get('gir_targets', ) + gst_cuda_gir}
     gen_sources += gst_cuda_gir
   endif
 
@@ -103,17 +139,17 @@
 gst_libraries += pkg_name, library_def
 
 pkgconfig.generate(gstcuda,
-  libraries : gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep,
+  libraries : gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep, gstcuda_platform_dep,
   variables : pkgconfig_variables,
   subdirs : pkgconfig_subdirs,
   name : pkg_name,
   description : 'Unstable library to work with CUDA inside GStreamer',
 )
 
-install_headers(cuda_headers + 'cuda-gst.h', subdir : 'gstreamer-1.0/gst/cuda')
+install_headers(cuda_headers + 'cuda-gst.h', 'gstcuda.h', subdir : 'gstreamer-1.0/gst/cuda')
 gstcuda_dep = declare_dependency(link_with : gstcuda,
   include_directories : libsinc,
-  dependencies : gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep,
+  dependencies : gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep, gstcuda_platform_dep,
   sources: gen_sources)
 
 meson.override_dependency(pkg_name, gstcuda_dep)

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/cuda/stub/cuda.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/cuda/stub/cuda.h Changed

@@ -30,6 +30,7 @@
 typedef gpointer CUmodule;
 typedef gpointer CUfunction;
 typedef gpointer CUmipmappedArray;
+typedef gpointer CUevent;
 
 typedef guint64  CUtexObject;
 typedef guintptr CUdeviceptr;
@@ -38,6 +39,9 @@
 typedef enum
 {
   CUDA_SUCCESS = 0,
+  CUDA_ERROR_NO_DEVICE = 100,
+  CUDA_ERROR_ALREADY_MAPPED = 208,
+  CUDA_ERROR_NOT_SUPPORTED = 801,
 } CUresult;
 
 typedef enum
@@ -51,8 +55,13 @@
 typedef enum
 {
   CU_DEVICE_ATTRIBUTE_TEXTURE_ALIGNMENT = 14,
+  CU_DEVICE_ATTRIBUTE_UNIFIED_ADDRESSING = 41,
   CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR = 75,
   CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR = 76,
+  CU_DEVICE_ATTRIBUTE_VIRTUAL_MEMORY_MANAGEMENT_SUPPORTED = 102,
+  CU_DEVICE_ATTRIBUTE_HANDLE_TYPE_POSIX_FILE_DESCRIPTOR_SUPPORTED = 103,
+  CU_DEVICE_ATTRIBUTE_HANDLE_TYPE_WIN32_HANDLE_SUPPORTED = 104,
+  CU_DEVICE_ATTRIBUTE_HANDLE_TYPE_WIN32_KMT_HANDLE_SUPPORTED = 105,
 } CUdevice_attribute;
 
 typedef enum
@@ -110,6 +119,14 @@
   CU_RES_VIEW_FORMAT_NONE = 0,
 } CUresourceViewFormat;
 
+typedef enum
+{
+  CU_EVENT_DEFAULT = 0x0,
+  CU_EVENT_BLOCKING_SYNC = 0x1,
+  CU_EVENT_DISABLE_TIMING = 0x2,
+  CU_EVENT_INTERPROCESS = 0x4,
+} CUevent_flags;
+
 typedef struct
 {
   gsize srcXInBytes;
@@ -192,6 +209,89 @@
   guint reserved16;
 } CUDA_RESOURCE_VIEW_DESC;
 
+typedef enum
+{
+  CU_IPC_MEM_LAZY_ENABLE_PEER_ACCESS = 0x1
+} CUipcMem_flags;
+
+#define CU_IPC_HANDLE_SIZE 64
+typedef struct
+{
+  char reservedCU_IPC_HANDLE_SIZE;
+} CUipcMemHandle;
+
+typedef struct
+{
+  char reservedCU_IPC_HANDLE_SIZE;
+} CUipcEventHandle;
+
+typedef unsigned long long CUmemGenericAllocationHandle;
+
+typedef enum
+{
+  CU_MEM_HANDLE_TYPE_NONE = 0x0,
+  CU_MEM_HANDLE_TYPE_POSIX_FILE_DESCRIPTOR = 0x1,
+  CU_MEM_HANDLE_TYPE_WIN32 = 0x2,
+  CU_MEM_HANDLE_TYPE_WIN32_KMT = 0x4,
+  CU_MEM_HANDLE_TYPE_MAX = 0x7FFFFFFF
+} CUmemAllocationHandleType;
+
+typedef enum
+{
+  CU_MEM_ACCESS_FLAGS_PROT_NONE = 0x0,
+  CU_MEM_ACCESS_FLAGS_PROT_READ  = 0x1,
+  CU_MEM_ACCESS_FLAGS_PROT_READWRITE = 0x3,
+  CU_MEM_ACCESS_FLAGS_PROT_MAX = 0x7FFFFFFF
+} CUmemAccess_flags;
+
+typedef enum
+{
+  CU_MEM_LOCATION_TYPE_INVALID = 0x0,
+  CU_MEM_LOCATION_TYPE_DEVICE = 0x1,
+  CU_MEM_LOCATION_TYPE_MAX = 0x7FFFFFFF
+} CUmemLocationType;
+
+typedef enum CUmemAllocationType_enum {
+  CU_MEM_ALLOCATION_TYPE_INVALID = 0x0,
+  CU_MEM_ALLOCATION_TYPE_PINNED = 0x1,
+  CU_MEM_ALLOCATION_TYPE_MAX = 0x7FFFFFFF
+} CUmemAllocationType;
+
+typedef enum
+{
+  CU_MEM_ALLOC_GRANULARITY_MINIMUM = 0x0,
+  CU_MEM_ALLOC_GRANULARITY_RECOMMENDED = 0x1
+} CUmemAllocationGranularity_flags;
+
+typedef struct
+{
+  CUmemLocationType type;
+  int id;
+} CUmemLocation;
+
+typedef struct
+{
+  unsigned char compressionType;
+  unsigned char gpuDirectRDMACapable;
+  unsigned short usage;
+  unsigned char reserved4;
+} CUmemAllocationPropAllocFlags;
+
+typedef struct
+{
+  CUmemAllocationType type;
+  CUmemAllocationHandleType requestedHandleTypes;
+  CUmemLocation location;
+  void *win32HandleMetaData;
+  CUmemAllocationPropAllocFlags allocFlags;
+} CUmemAllocationProp;
+
+typedef struct
+{
+  CUmemLocation location;
+  CUmemAccess_flags flags;
+} CUmemAccessDesc;
+
 #define CUDA_VERSION 10000
 
 #ifdef _WIN32
@@ -207,6 +307,8 @@
 #define cuGraphicsResourceGetMappedPointer cuGraphicsResourceGetMappedPointer_v2
 #define cuGraphicsResourceSetMapFlags cuGraphicsResourceSetMapFlags_v2
 
+#define cuStreamDestroy cuStreamDestroy_v2
+
 #define cuMemAlloc cuMemAlloc_v2
 #define cuMemAllocPitch cuMemAllocPitch_v2
 #define cuMemAllocHost  cuMemAllocHost_v2
@@ -214,6 +316,8 @@
 #define cuMemcpy2DAsync cuMemcpy2DAsync_v2
 #define cuMemFree cuMemFree_v2
 
+#define cuEventDestroy cuEventDestroy_v2
+
 #define CU_TRSF_READ_AS_INTEGER 1
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/gstd3d11-private.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11-private.h Changed

@@ -29,24 +29,50 @@
 
 G_BEGIN_DECLS
 
-#define GST_D3D11_COMMON_FORMATS \
-    "RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, " \
-    "P010_10LE, P012_LE, P016_LE, I420, YV12, I420_10LE, I420_12LE, " \
-    "Y42B, I422_10LE, I422_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, " \
-    "GRAY8, GRAY16_LE, AYUV, AYUV64, RGBP, BGRP, GBR, GBR_10LE, GBR_12LE, " \
-    "GBRA, GBRA_10LE, GBRA_12LE"
+/*
+ * Preferred sorting order in a tier
+ *   - number of components
+ *   - depth
+ *   - subsampling
+ *   - supports both SRV and RTV
+ *   - prefer smaller number of planes
+ *   - prefer non-complex formats
+ *   - prefer YUV formats over RGB ones
+ *   - prefer I420 over YV12
+ *   - format name
+ */
+
+/* DXGI (semi) native formats */
+#define GST_D3D11_TIER_0_FORMATS \
+    "RGBA64_LE, BGRA64_LE, Y412_LE, RGB10A2_LE, Y410, BGR10A2_LE, Y212_LE, " \
+    "Y210, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, P010_10LE, RGBx, BGRx, " \
+    "YUY2, NV12"
+
+/* both SRV and RTV are supported */
+#define GST_D3D11_TIER_1_FORMATS \
+    "AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, " \
+    "GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, " \
+    "I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, " \
+    "I420, YV12, GRAY16_LE, GRAY8"
 
-#define GST_D3D11_EXTRA_IN_FORMATS \
-    "Y410, YUY2"
+/* pre/post processing required formats */
+#define GST_D3D11_TIER_LAST_FORMATS \
+    "v216, v210, r210, v308, IYU2, RGB, BGR, UYVY, VYUY, YVYU, RGB16, BGR16, " \
+    "RGB15, BGR15"
+
+#define GST_D3D11_COMMON_FORMATS \
+    GST_D3D11_TIER_0_FORMATS ", " \
+    GST_D3D11_TIER_1_FORMATS ", " \
+    GST_D3D11_TIER_LAST_FORMATS
 
 #define GST_D3D11_SINK_FORMATS \
-    "{ " GST_D3D11_COMMON_FORMATS " ," GST_D3D11_EXTRA_IN_FORMATS " }"
+    "{ " GST_D3D11_COMMON_FORMATS " }"
 
 #define GST_D3D11_SRC_FORMATS \
     "{ " GST_D3D11_COMMON_FORMATS " }"
 
 #define GST_D3D11_ALL_FORMATS \
-    "{ " GST_D3D11_COMMON_FORMATS " ," GST_D3D11_EXTRA_IN_FORMATS " }"
+    "{ " GST_D3D11_COMMON_FORMATS " }"
 
 #define GST_TYPE_D3D11_FORMAT_SUPPORT (gst_d3d11_format_support_get_type())
 GType gst_d3d11_format_support_get_type (void);
@@ -61,6 +87,11 @@
                                     const gchar * function,
                                     gint line);
 
+void  gst_d3d11_device_log_live_objects (GstD3D11Device * device,
+                                         const gchar * file,
+                                         const gchar * function,
+                                         gint line);
+
 #define GST_D3D11_CLEAR_COM(obj) G_STMT_START { \
     if (obj) { \
       (obj)->Release (); \
@@ -75,8 +106,8 @@
     { DXGI_FORMAT_ ##r0, DXGI_FORMAT_ ##r1, DXGI_FORMAT_ ##r2, DXGI_FORMAT_ ##r3 }, \
     (D3D11_FORMAT_SUPPORT) (D3D11_FORMAT_SUPPORT_RENDER_TARGET | D3D11_FORMAT_SUPPORT_SHADER_SAMPLE) }
 
-#define MAKE_FORMAT_MAP_YUV_FULL(g,d,r0,r1,r2,r3,f) \
-  { GST_VIDEO_FORMAT_ ##g, DXGI_FORMAT_ ##d, \
+#define MAKE_FORMAT_MAP_FULL(g,d,r0,r1,r2,r3,f) \
+  { g, DXGI_FORMAT_ ##d, \
     { DXGI_FORMAT_ ##r0, DXGI_FORMAT_ ##r1, DXGI_FORMAT_ ##r2, DXGI_FORMAT_ ##r3 }, \
     { DXGI_FORMAT_ ##r0, DXGI_FORMAT_ ##r1, DXGI_FORMAT_ ##r2, DXGI_FORMAT_ ##r3 }, \
     (D3D11_FORMAT_SUPPORT) (f) }
@@ -98,6 +129,10 @@
   MAKE_FORMAT_MAP_RGB (RGBA, R8G8B8A8_UNORM),
   MAKE_FORMAT_MAP_RGB (BGRx, B8G8R8A8_UNORM),
   MAKE_FORMAT_MAP_RGB (RGBx, R8G8B8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (ARGB, R8G8B8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (xRGB, R8G8B8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (ABGR, R8G8B8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (xBGR, R8G8B8A8_UNORM),
   MAKE_FORMAT_MAP_RGB (RGB10A2_LE, R10G10B10A2_UNORM),
   MAKE_FORMAT_MAP_RGB (RGBA64_LE, R16G16B16A16_UNORM),
   MAKE_FORMAT_MAP_YUV (AYUV, UNKNOWN, R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN),
@@ -119,6 +154,9 @@
   MAKE_FORMAT_MAP_YUV (Y444_10LE, UNKNOWN, R16_UNORM, R16_UNORM, R16_UNORM, UNKNOWN),
   MAKE_FORMAT_MAP_YUV (Y444_12LE, UNKNOWN, R16_UNORM, R16_UNORM, R16_UNORM, UNKNOWN),
   MAKE_FORMAT_MAP_YUV (Y444_16LE, UNKNOWN, R16_UNORM, R16_UNORM, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (UYVY, UNKNOWN, R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (VYUY, UNKNOWN, R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (YVYU, UNKNOWN, R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN),
   /* GRAY */
   /* NOTE: To support conversion by using video processor,
    * mark DXGI_FORMAT_{R8,R16}_UNORM formats as known dxgi_format.
@@ -126,23 +164,78 @@
    * those formats */
   MAKE_FORMAT_MAP_RGB (GRAY8, R8_UNORM),
   MAKE_FORMAT_MAP_RGB (GRAY16_LE, R16_UNORM),
-  MAKE_FORMAT_MAP_YUV_FULL (Y410, Y410, R10G10B10A2_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_Y410, Y410,
+      R10G10B10A2_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_BGR10A2_LE, Y410,
+      R10G10B10A2_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_YUY2, YUY2,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_Y210, Y210,
+      R16G16B16A16_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_Y212_LE, Y216,
+      R16G16B16A16_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_Y412_LE, Y416,
+      R16G16B16A16_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
       D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
-  MAKE_FORMAT_MAP_YUV_FULL (YUY2, YUY2, R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_BGRA64_LE, Y416,
+      R16G16B16A16_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_RGB, UNKNOWN,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_BGR, UNKNOWN,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_v210, UNKNOWN,
+      R10G10B10A2_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_v216, UNKNOWN,
+      R16G16B16A16_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_v308, UNKNOWN,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_IYU2, UNKNOWN,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_RGB16, UNKNOWN,
+      R16_UINT, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_BGR16, UNKNOWN,
+      R16_UINT, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_RGB15, UNKNOWN,
+      R16_UINT, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_BGR15, UNKNOWN,
+      R16_UINT, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_r210, UNKNOWN,
+      R32_UINT, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_RBGA, AYUV,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
       D3D11_FORMAT_SUPPORT_SHADER_SAMPLE),
   MAKE_FORMAT_MAP_RGBP (RGBP, R8_UNORM, UNKNOWN),
   MAKE_FORMAT_MAP_RGBP (BGRP, R8_UNORM, UNKNOWN),
   MAKE_FORMAT_MAP_RGBP (GBR, R8_UNORM, UNKNOWN),
   MAKE_FORMAT_MAP_RGBP (GBR_10LE, R16_UNORM, UNKNOWN),
   MAKE_FORMAT_MAP_RGBP (GBR_12LE, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_RGBP (GBR_16LE, R16_UNORM, UNKNOWN),
   MAKE_FORMAT_MAP_RGBP (GBRA, R8_UNORM, R8_UNORM),
   MAKE_FORMAT_MAP_RGBP (GBRA_10LE, R16_UNORM, R16_UNORM),
   MAKE_FORMAT_MAP_RGBP (GBRA_12LE, R16_UNORM, R16_UNORM),
 };
 
 #undef MAKE_FORMAT_MAP_YUV
-#undef MAKE_FORMAT_MAP_YUV_FULL
+#undef MAKE_FORMAT_MAP_FULL
 #undef MAKE_FORMAT_MAP_RGB
+#undef MAKE_FORMAT_MAP_RGBP
 
 #define GST_D3D11_N_FORMATS G_N_ELEMENTS(_gst_d3d11_default_format_map)
 
@@ -155,6 +248,9 @@
 } GstD3D11ColorMatrix;
 
 GST_D3D11_API
+void            gst_d3d11_color_matrix_init (GstD3D11ColorMatrix * matrix);
+
+GST_D3D11_API
 gchar *         gst_d3d11_dump_color_matrix (GstD3D11ColorMatrix * matrix);
 
 GST_D3D11_API

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/gstd3d11bufferpool.cpp -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11bufferpool.cpp Changed

@@ -24,6 +24,7 @@
 
 #include "gstd3d11bufferpool.h"
 #include "gstd3d11memory.h"
+#include "gstd3d11memory-private.h"
 #include "gstd3d11device.h"
 #include "gstd3d11utils.h"
 #include "gstd3d11-private.h"
@@ -138,11 +139,10 @@
   GstCaps *caps = NULL;
   guint min_buffers, max_buffers;
   gboolean ret = TRUE;
-  D3D11_TEXTURE2D_DESC *desc;
+  D3D11_TEXTURE2D_DESC descGST_VIDEO_MAX_PLANES;
   const GstD3D11Format *format;
+  GstD3D11AllocationParams *params;
   gsize offset = 0;
-  guint align = 0;
-  gint i;
 
   if (!gst_buffer_pool_config_get_params (config, &caps, NULL, &min_buffers,
           &max_buffers))
@@ -174,73 +174,55 @@
         &info, GST_D3D11_ALLOCATION_FLAG_DEFAULT, 0, 0);
   }
 
-  desc = priv->d3d11_params->desc;
-  align = gst_d3d11_dxgi_format_get_alignment (desc0.Format);
-
-  /* resolution of semi-planar formats must be multiple of 2 */
-  if (align != 0 && (desc0.Width % align || desc0.Height % align)) {
-    gint width, height;
-    GstVideoAlignment video_align;
-
-    GST_WARNING_OBJECT (self, "Resolution %dx%d is not mutiple of %d, fixing",
-        desc0.Width, desc0.Height, align);
-
-    width = GST_ROUND_UP_N (desc0.Width, align);
-    height = GST_ROUND_UP_N (desc0.Height, align);
-
-    gst_video_alignment_reset (&video_align);
-    video_align.padding_right = width - desc0.Width;
-    video_align.padding_bottom = height - desc0.Height;
-
-    gst_d3d11_allocation_params_alignment (priv->d3d11_params, &video_align);
-  }
-#ifndef GST_DISABLE_GST_DEBUG
-  {
-    GST_LOG_OBJECT (self, "Direct3D11 Allocation params");
-    GST_LOG_OBJECT (self, "\tD3D11AllocationFlags: 0x%x",
-        priv->d3d11_params->flags);
-    for (i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
-      if (desci.Format == DXGI_FORMAT_UNKNOWN)
+  params = priv->d3d11_params;
+  memset (desc, 0, sizeof (desc));
+  if (params->d3d11_format.dxgi_format != DXGI_FORMAT_UNKNOWN) {
+    desc0.Width = GST_VIDEO_INFO_WIDTH (&params->aligned_info);
+    desc0.Height = GST_VIDEO_INFO_HEIGHT (&params->aligned_info);
+    desc0.Format = params->d3d11_format.dxgi_format;
+    desc0.MipLevels = 1;
+    desc0.ArraySize = params->array_size;
+    desc0.SampleDesc.Count = params->sample_count;
+    desc0.SampleDesc.Quality = params->sample_quality;
+    desc0.BindFlags = params->bind_flags;
+    desc0.MiscFlags = params->misc_flags;
+
+    switch (params->d3d11_format.dxgi_format) {
+      case DXGI_FORMAT_NV12:
+      case DXGI_FORMAT_P010:
+      case DXGI_FORMAT_P016:
+        desc0.Width = GST_ROUND_UP_2 (desc0.Width);
+        desc0.Height = GST_ROUND_UP_2 (desc0.Height);
         break;
-      GST_LOG_OBJECT (self, "\tplane %d %dx%d, DXGI format %d",
-          i, desci.Width, desci.Height, desci.Format);
-      GST_LOG_OBJECT (self, "\tplane %d MipLevel %d, ArraySize %d",
-          i, desci.MipLevels, desci.ArraySize);
-      GST_LOG_OBJECT (self,
-          "\tplane %d SampleDesc.Count %d, SampleDesc.Quality %d",
-          i, desci.SampleDesc.Count, desci.SampleDesc.Quality);
-      GST_LOG_OBJECT (self, "\tplane %d Usage %d", i, desci.Usage);
-      GST_LOG_OBJECT (self,
-          "\tplane %d BindFlags 0x%x", i, desci.BindFlags);
-      GST_LOG_OBJECT (self,
-          "\tplane %d CPUAccessFlags 0x%x", i, desci.CPUAccessFlags);
-      GST_LOG_OBJECT (self,
-          "\tplane %d MiscFlags 0x%x", i, desci.MiscFlags);
-    }
-  }
-#endif
-
-  if ((priv->d3d11_params->flags & GST_D3D11_ALLOCATION_FLAG_TEXTURE_ARRAY)) {
-    guint max_array_size = 0;
-
-    for (i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
-      if (desci.Format == DXGI_FORMAT_UNKNOWN)
+      case DXGI_FORMAT_Y210:
+      case DXGI_FORMAT_Y216:
+        desc0.Width = GST_ROUND_UP_2 (desc0.Width);
+        break;
+      default:
         break;
-
-      if (desci.ArraySize > max_array_size)
-        max_array_size = desci.ArraySize;
     }
+  } else {
+    for (guint i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
+      if (params->d3d11_format.resource_formati == DXGI_FORMAT_UNKNOWN)
+        break;
 
-    if (max_buffers == 0 || max_buffers > max_array_size) {
-      GST_WARNING_OBJECT (pool,
-          "Array pool is requested but allowed pool size %d > ArraySize %d",
-          max_buffers, max_array_size);
-      max_buffers = max_array_size;
+      desci.Width = GST_VIDEO_INFO_COMP_WIDTH (&params->aligned_info, i);
+      desci.Height = GST_VIDEO_INFO_COMP_HEIGHT (&params->aligned_info, i);
+      desci.Format = params->d3d11_format.resource_formati;
+      desci.MipLevels = 1;
+      desci.ArraySize = params->array_size;
+      desci.SampleDesc.Count = params->sample_count;
+      desci.SampleDesc.Quality = params->sample_quality;
+      desci.BindFlags = params->bind_flags;
+      desci.MiscFlags = params->misc_flags;
     }
   }
 
+  if (params->array_size > 1)
+    max_buffers = params->array_size;
+
   offset = 0;
-  for (i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
+  for (guint i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
     GstD3D11Allocator *alloc;
     GstD3D11PoolAllocator *pool_alloc;
     GstFlowReturn flow_ret;
@@ -261,9 +243,9 @@
 
     pool_alloc = GST_D3D11_POOL_ALLOCATOR (alloc);
     flow_ret = gst_d3d11_pool_allocator_acquire_memory (pool_alloc, &mem);
+    gst_d3d11_allocator_set_active (alloc, FALSE);
     if (flow_ret != GST_FLOW_OK) {
       GST_ERROR_OBJECT (self, "Failed to allocate initial memory");
-      gst_d3d11_allocator_set_active (alloc, FALSE);
       gst_object_unref (alloc);
       return FALSE;
     }
@@ -272,7 +254,6 @@
             &stride) || stride < desci.Width) {
       GST_ERROR_OBJECT (self, "Failed to calculate stride");
 
-      gst_d3d11_allocator_set_active (alloc, FALSE);
       gst_object_unref (alloc);
       gst_memory_unref (mem);
 
@@ -288,7 +269,7 @@
     gst_memory_unref (mem);
   }
 
-  format = &priv->d3d11_params->d3d11_format;
+  format = &params->d3d11_format;
   /* single texture semi-planar formats */
   if (format->dxgi_format != DXGI_FORMAT_UNKNOWN &&
       GST_VIDEO_INFO_N_PLANES (&info) == 2) {
@@ -381,7 +362,6 @@
   GstD3D11BufferPool *self = GST_D3D11_BUFFER_POOL (pool);
   GstD3D11BufferPoolPrivate *priv = self->priv;
   guint i;
-  gboolean ret;
 
   GST_DEBUG_OBJECT (self, "Start");
 
@@ -397,22 +377,6 @@
     }
   }
 
-  ret = GST_BUFFER_POOL_CLASS (parent_class)->start (pool);
-  if (!ret) {
-    GST_ERROR_OBJECT (self, "Failed to start");
-
-    for (i = 0; i < G_N_ELEMENTS (priv->alloc); i++) {
-      GstD3D11Allocator *alloc = priv->alloci;
-
-      if (!alloc)
-        break;
-
-      gst_d3d11_allocator_set_active (alloc, FALSE);
-    }
-
-    return FALSE;
-  }
-
   return TRUE;
 }

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11converter-builder.cpp Added

@@ -0,0 +1,492 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d11converter-builder.h"
+#include "gstd3d11device-private.h"
+#include "gstd3d11-private.h"
+#include "gstd3d11utils.h"
+#include <map>
+#include <mutex>
+#include <string>
+#include <utility>
+#include <memory>
+
+GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_converter_debug);
+#define GST_CAT_DEFAULT gst_d3d11_converter_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+struct ConverterPSSource
+{
+  gint64 token;
+  std::string entry_point;
+  const BYTE *bytecode;
+  SIZE_T bytecode_size;
+  std::vector<std::pair<std::string, std::string>> macros;
+  guint num_rtv;
+};
+
+enum class PS_OUTPUT
+{
+  PACKED,
+  LUMA,
+  CHROMA,
+  CHROMA_PLANAR,
+  PLANAR,
+  PLANAR_FULL,
+};
+
+static std::map<std::string, std::shared_ptr<ConverterPSSource>> ps_source_cache;
+static std::mutex cache_lock;
+#ifdef HLSL_PRECOMPILED
+#include "PSMainConverter.h"
+#include "VSMain_converter.h"
+#else
+static const std::map<std::string, std::pair<const BYTE *, SIZE_T>> precompiled_bytecode;
+#endif
+
+#include "hlsl/PSMain_converter.hlsl"
+#include "hlsl/VSMain_converter.hlsl"
+
+static const std::string
+ps_output_to_string (PS_OUTPUT output)
+{
+  switch (output) {
+    case PS_OUTPUT::PACKED:
+      return "PS_OUTPUT_PACKED";
+    case PS_OUTPUT::LUMA:
+      return "PS_OUTPUT_LUMA";
+    case PS_OUTPUT::CHROMA:
+      return "PS_OUTPUT_CHROMA";
+    case PS_OUTPUT::CHROMA_PLANAR:
+      return "PS_OUTPUT_CHROMA_PLANAR";
+    case PS_OUTPUT::PLANAR:
+      return "PS_OUTPUT_PLANAR";
+    case PS_OUTPUT::PLANAR_FULL:
+      return "PS_OUTPUT_PLANAR_FULL";
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return "";
+}
+
+static guint
+ps_output_get_num_rtv (PS_OUTPUT output)
+{
+  switch (output) {
+    case PS_OUTPUT::PACKED:
+    case PS_OUTPUT::LUMA:
+    case PS_OUTPUT::CHROMA:
+      return 1;
+    case PS_OUTPUT::CHROMA_PLANAR:
+      return 2;
+    case PS_OUTPUT::PLANAR:
+      return 3;
+    case PS_OUTPUT::PLANAR_FULL:
+      return 4;
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return 0;
+}
+
+static std::string
+make_input (GstVideoFormat format, gboolean premul)
+{
+  switch (format) {
+    case GST_VIDEO_FORMAT_RGBA:
+    case GST_VIDEO_FORMAT_RGBA64_LE:
+    case GST_VIDEO_FORMAT_RGB10A2_LE:
+    case GST_VIDEO_FORMAT_BGRA:
+      if (premul)
+        return "RGBAPremul";
+      return "RGBA";
+    case GST_VIDEO_FORMAT_RGBx:
+    case GST_VIDEO_FORMAT_BGRx:
+      return "RGBx";
+    case GST_VIDEO_FORMAT_ARGB:
+      if (premul)
+        return "ARGBPremul";
+      return "ARGB";
+    case GST_VIDEO_FORMAT_xRGB:
+      return "xRGB";
+    case GST_VIDEO_FORMAT_ABGR:
+      if (premul)
+        return "ABGRPremul";
+      return "ABGR";
+    case GST_VIDEO_FORMAT_xBGR:
+      return "xBGR";
+    case GST_VIDEO_FORMAT_VUYA:
+      if (premul)
+        return "VUYAPremul";
+      return "VUYA";
+    case GST_VIDEO_FORMAT_AYUV:
+    case GST_VIDEO_FORMAT_AYUV64:
+      return "AYUV";
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+    case GST_VIDEO_FORMAT_P016_LE:
+      return "NV12";
+    case GST_VIDEO_FORMAT_NV21:
+      return "NV21";
+    case GST_VIDEO_FORMAT_I420:
+    case GST_VIDEO_FORMAT_Y42B:
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_Y444_16LE:
+      return "I420";
+    case GST_VIDEO_FORMAT_YV12:
+      return "YV12";
+    case GST_VIDEO_FORMAT_I420_10LE:
+    case GST_VIDEO_FORMAT_I422_10LE:
+    case GST_VIDEO_FORMAT_Y444_10LE:
+      return "I420_10";
+    case GST_VIDEO_FORMAT_I420_12LE:
+    case GST_VIDEO_FORMAT_I422_12LE:
+    case GST_VIDEO_FORMAT_Y444_12LE:
+      return "I420_12";
+    case GST_VIDEO_FORMAT_Y410:
+      return "Y410";
+    case GST_VIDEO_FORMAT_GRAY8:
+    case GST_VIDEO_FORMAT_GRAY16_LE:
+      return "GRAY";
+    case GST_VIDEO_FORMAT_RGBP:
+      return "RGBP";
+    case GST_VIDEO_FORMAT_BGRP:
+      return "BGRP";
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      return "GBR";
+    case GST_VIDEO_FORMAT_GBR_10LE:
+      return "GBR_10";
+    case GST_VIDEO_FORMAT_GBR_12LE:
+      return "GBR_12";
+    case GST_VIDEO_FORMAT_GBRA:
+      if (premul)
+        return "GBRAPremul";
+      return "GBRA";
+    case GST_VIDEO_FORMAT_GBRA_10LE:
+      if (premul)
+        return "GBRAPremul_10";
+      return "GBRA_10";
+    case GST_VIDEO_FORMAT_GBRA_12LE:
+      if (premul)
+        return "GBRAPremul_12";
+      return "GBRA_12";
+    case GST_VIDEO_FORMAT_Y412_LE:
+      if (premul)
+        return "Y412Premul";
+      return "Y412";
+    case GST_VIDEO_FORMAT_BGR10A2_LE:
+      return "BGR10A2";
+    case GST_VIDEO_FORMAT_BGRA64_LE:
+      if (premul)
+        return "BGRA64Premul";
+      return "BGRA64";
+    case GST_VIDEO_FORMAT_RBGA:
+      if (premul)
+        return "RBGAPremul";
+      return "RBGA";
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return "";
+}
+
+static std::vector<std::pair<PS_OUTPUT, std::string>>
+make_output (GstVideoFormat format, gboolean premul)
+{
+  std::vector<std::pair<PS_OUTPUT, std::string>> ret;
+
+  switch (format) {
+    case GST_VIDEO_FORMAT_RGBA:
+    case GST_VIDEO_FORMAT_RGBA64_LE:
+    case GST_VIDEO_FORMAT_RGB10A2_LE:
+    case GST_VIDEO_FORMAT_BGRA:
+      if (premul)
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "RGBAPremul"));
+      else
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "RGBA"));
+      break;
+    case GST_VIDEO_FORMAT_RGBx:
+    case GST_VIDEO_FORMAT_BGRx:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "RGBx"));
+      break;
+    case GST_VIDEO_FORMAT_ARGB:
+      if (premul)
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "ARGBPremul"));
+      else
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "ARGB"));
+      break;
+    case GST_VIDEO_FORMAT_xRGB:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "xRGB"));
+      break;
+    case GST_VIDEO_FORMAT_ABGR:
+      if (premul)
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "ABGRPremul"));
+      else
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "ABGR"));
+      break;
+    case GST_VIDEO_FORMAT_xBGR:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "xBGR"));
+      break;
+    case GST_VIDEO_FORMAT_VUYA:
+      if (premul)
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "VUYAPremul"));
+      else
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "VUYA"));
+      break;
+    case GST_VIDEO_FORMAT_AYUV:
+    case GST_VIDEO_FORMAT_AYUV64:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "AYUV"));
+      break;
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+    case GST_VIDEO_FORMAT_P016_LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA, "ChromaNV12"));
+      break;
+    case GST_VIDEO_FORMAT_NV21:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA, "ChromaNV21"));
+      break;
+    case GST_VIDEO_FORMAT_I420:
+    case GST_VIDEO_FORMAT_Y42B:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA_PLANAR, "ChromaI420"));
+      break;
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_Y444_16LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "Y444"));
+      break;
+    case GST_VIDEO_FORMAT_YV12:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA_PLANAR, "ChromaYV12"));
+      break;
+    case GST_VIDEO_FORMAT_I420_10LE:
+    case GST_VIDEO_FORMAT_I422_10LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma_10"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA_PLANAR, "ChromaI420_10"));
+      break;
+    case GST_VIDEO_FORMAT_Y444_10LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "Y444_10"));
+      break;
+    case GST_VIDEO_FORMAT_I420_12LE:
+    case GST_VIDEO_FORMAT_I422_12LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma_12"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA_PLANAR, "ChromaI420_12"));
+      break;
+    case GST_VIDEO_FORMAT_Y444_12LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "Y444_12"));
+      break;
+    case GST_VIDEO_FORMAT_GRAY8:
+    case GST_VIDEO_FORMAT_GRAY16_LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma"));
+      break;
+    case GST_VIDEO_FORMAT_RGBP:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "RGBP"));
+      break;
+    case GST_VIDEO_FORMAT_BGRP:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "BGRP"));
+      break;
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "GBR"));
+      break;
+    case GST_VIDEO_FORMAT_GBR_10LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "GBR_10"));
+      break;
+    case GST_VIDEO_FORMAT_GBR_12LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "GBR_12"));
+      break;
+    case GST_VIDEO_FORMAT_GBRA:
+      if (premul)
+        ret.push_back(std::make_pair(PS_OUTPUT::PLANAR_FULL, "GBRAPremul"));
+      else
+        ret.push_back(std::make_pair(PS_OUTPUT::PLANAR_FULL, "GBRA"));
+      break;
+    case GST_VIDEO_FORMAT_GBRA_10LE:
+      if (premul)
+        ret.push_back(std::make_pair(PS_OUTPUT::PLANAR_FULL, "GBRAPremul_10"));
+      else
+        ret.push_back(std::make_pair(PS_OUTPUT::PLANAR_FULL, "GBRA_10"));
+      break;
+    case GST_VIDEO_FORMAT_GBRA_12LE:
+      if (premul)
+        ret.push_back(std::make_pair(PS_OUTPUT::PLANAR_FULL, "GBRAPremul_12"));
+      else
+        ret.push_back(std::make_pair(PS_OUTPUT::PLANAR_FULL, "GBRA_12"));
+      break;
+    case GST_VIDEO_FORMAT_RBGA:
+      if (premul)
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "RBGAPremul"));
+      else
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "RBGA"));
+      break;
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return ret;
+}
+
+PixelShaderList
+gst_d3d11_get_converter_pixel_shader (GstD3D11Device * device,
+    GstVideoFormat in_format, GstVideoFormat out_format, gboolean in_premul,
+    gboolean out_premul, CONVERT_TYPE type)
+{
+  HRESULT hr;
+  auto input = make_input (in_format, in_premul);
+  auto output = make_output (out_format, out_premul);
+  std::string conv_type;
+  PixelShaderList ret;
+
+  switch (type) {
+    case CONVERT_TYPE::IDENTITY:
+      conv_type = "Identity";
+      break;
+    case CONVERT_TYPE::SIMPLE:
+      conv_type = "Simple";
+      break;
+    case CONVERT_TYPE::RANGE:
+      conv_type = "Range";
+      break;
+    case CONVERT_TYPE::GAMMA:
+      conv_type = "Gamma";
+      break;
+    case CONVERT_TYPE::PRIMARY:
+      conv_type = "Primary";
+      break;
+  }
+
+  for (const auto & it : output) {
+    std::string entry_point = "PSMain_" + input + "_" + conv_type + "_" +
+        it.second;
+    std::shared_ptr<ConverterPSSource> source;
+    std::vector<D3D_SHADER_MACRO> macros;
+    ComPtr<ID3D11PixelShader> shader;
+    cache_lock.lock ();
+    auto cached = ps_source_cache.find(entry_point);
+    if (cached != ps_source_cache.end()) {
+      source = cached->second;
+    } else {
+      source = std::make_shared<ConverterPSSource> ();
+      source->token = gst_d3d11_pixel_shader_token_new ();
+      source->entry_point = entry_point;
+      auto precompiled = precompiled_bytecode.find (entry_point);
+      if (precompiled != precompiled_bytecode.end ()) {
+        source->bytecode = precompiled->second.first;
+        source->bytecode_size = precompiled->second.second;
+      } else {
+        source->bytecode = nullptr;
+        source->bytecode_size = 0;
+      }
+
+      source->num_rtv = ps_output_get_num_rtv (it.first);
+
+      source->macros.push_back(std::make_pair("ENTRY_POINT", entry_point));
+      source->macros.push_back(std::make_pair("SAMPLER", "Sampler" + input));
+      source->macros.push_back(std::make_pair("CONVERTER",
+          "Converter" + conv_type));
+      source->macros.push_back(std::make_pair("OUTPUT_TYPE",
+          ps_output_to_string(it.first)));
+      source->macros.push_back(std::make_pair("OUTPUT_BUILDER",
+          "Output" + it.second));
+      ps_source_cacheentry_point = source;
+    }
+    cache_lock.unlock ();
+
+    for (const auto & defines : source->macros)
+      macros.push_back({defines.first.c_str (), defines.second.c_str ()});
+
+    macros.push_back({nullptr, nullptr});
+
+    hr = gst_d3d11_device_get_pixel_shader_uncached (device, source->token,
+          source->bytecode, source->bytecode_size, g_PSMain_converter_str,
+          sizeof (g_PSMain_converter_str), source->entry_point.c_str (),
+          &macros0, &shader);
+    if (!gst_d3d11_result (hr, device)) {
+      ret.clear ();
+      return ret;
+    }
+
+    auto ps = std::make_shared<PixelShader> ();
+    ps->shader = shader;
+    ps->num_rtv = source->num_rtv;
+
+    ret.push_back (ps);
+  }
+
+  return ret;
+}
+/* *INDENT-ON* */
+
+HRESULT
+gst_d3d11_get_converter_vertex_shader (GstD3D11Device * device,
+    ID3D11VertexShader ** vs, ID3D11InputLayout ** layout)
+{
+  static gint64 token = 0;
+  const void *bytecode = nullptr;
+  gsize bytecode_size = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_vertex_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+#ifdef HLSL_PRECOMPILED
+  bytecode = g_VSMain_converter;
+  bytecode_size = sizeof (g_VSMain_converter);
+#endif
+
+  D3D11_INPUT_ELEMENT_DESC input_desc2;
+
+  input_desc0.SemanticName = "POSITION";
+  input_desc0.SemanticIndex = 0;
+  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+  input_desc0.InputSlot = 0;
+  input_desc0.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
+  input_desc0.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+  input_desc0.InstanceDataStepRate = 0;
+
+  input_desc1.SemanticName = "TEXCOORD";
+  input_desc1.SemanticIndex = 0;
+  input_desc1.Format = DXGI_FORMAT_R32G32_FLOAT;
+  input_desc1.InputSlot = 0;
+  input_desc1.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
+  input_desc1.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+  input_desc1.InstanceDataStepRate = 0;
+
+  return gst_d3d11_device_get_vertex_shader (device, token,
+      bytecode, bytecode_size, g_VSMain_converter_str,
+      sizeof (g_VSMain_converter_str), "VSMain_converter", input_desc,
+      G_N_ELEMENTS (input_desc), vs, layout);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11converter-builder.h Added

@@ -0,0 +1,57 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/d3d11/gstd3d11_fwd.h>
+#include <vector>
+#include <wrl.h>
+#include <memory>
+#include <vector>
+
+enum class CONVERT_TYPE
+{
+  IDENTITY,
+  SIMPLE,
+  RANGE,
+  GAMMA,
+  PRIMARY,
+};
+
+struct PixelShader
+{
+  Microsoft::WRL::ComPtr<ID3D11PixelShader> shader;
+  guint num_rtv;
+};
+
+typedef std::vector<std::shared_ptr<PixelShader>> PixelShaderList;
+
+PixelShaderList
+gst_d3d11_get_converter_pixel_shader (GstD3D11Device * device,
+                                      GstVideoFormat in_format,
+                                      GstVideoFormat out_format,
+                                      gboolean in_premul,
+                                      gboolean out_premul,
+                                      CONVERT_TYPE type);
+
+HRESULT gst_d3d11_get_converter_vertex_shader (GstD3D11Device * device,
+                                               ID3D11VertexShader ** vs,
+                                               ID3D11InputLayout ** layout);

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11converter-helper.cpp Added

@@ -0,0 +1,966 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstd3d11-private.h"
+#include "gstd3d11converter-helper.h"
+#include "gstd3d11device.h"
+#include "gstd3d11device-private.h"
+#include "gstd3d11utils.h"
+#include "gstd3d11memory.h"
+#include "gstd3d11bufferpool.h"
+#include "gstd3d11shadercache.h"
+#include <wrl.h>
+#include <math.h>
+#include <map>
+#include <vector>
+#include <mutex>
+#include <string>
+#include <memory>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_converter_debug);
+#define GST_CAT_DEFAULT gst_d3d11_converter_debug
+
+/* *INDENT-OFF* */
+struct ConverterCSSource
+{
+  gint64 token;
+  std::string entry_point;
+  const BYTE *bytecode;
+  SIZE_T bytecode_size;
+  std::vector<std::pair<std::string, std::string>> macros;
+};
+
+static std::map<std::string, std::shared_ptr<ConverterCSSource>> cs_source_cache;
+static std::mutex cache_lock;
+#ifdef HLSL_PRECOMPILED
+#include "CSMainConverter.h"
+#else
+static const std::map<std::string, std::pair<const BYTE *, SIZE_T>> precompiled_bytecode;
+#endif
+/* *INDENT-ON* */
+
+#include "hlsl/CSMain_converter.hlsl"
+
+struct _GstD3D11ConverterHelper
+{
+  ~_GstD3D11ConverterHelper ()
+  {
+    if (sw_conv)
+      gst_video_converter_free (sw_conv);
+
+    gst_clear_buffer (&srv_buf);
+    gst_clear_buffer (&uav_buf);
+    gst_clear_object (&device);
+  }
+
+  GstD3D11Device *device = nullptr;
+  ComPtr < ID3D11ComputeShader > cs;
+
+  DXGI_FORMAT srv_format = DXGI_FORMAT_UNKNOWN;
+  DXGI_FORMAT uav_format = DXGI_FORMAT_UNKNOWN;
+
+  GstBuffer *srv_buf = nullptr;
+  GstBuffer *uav_buf = nullptr;
+
+  GstVideoConverter *sw_conv = nullptr;
+  GstVideoInfo in_info;
+  GstVideoInfo out_info;
+  GstVideoInfo in_alloc_info;
+  GstVideoInfo out_alloc_info;
+  guint tg_x;
+  guint tg_y;
+  guint x_unit;
+  guint y_unit;
+};
+
+/* *INDENT-OFF* */
+GstD3D11ConverterHelper *
+gst_d3d11_converter_helper_new (GstD3D11Device * device,
+    GstVideoFormat in_format, GstVideoFormat out_format, guint width,
+    guint height)
+{
+  GstD3D11ConverterHelper *self;
+  ComPtr < ID3D11ComputeShader > cs;
+  D3D_FEATURE_LEVEL feature_level;
+  DXGI_FORMAT srv_format = DXGI_FORMAT_UNKNOWN;
+  DXGI_FORMAT uav_format = DXGI_FORMAT_UNKNOWN;
+  guint x_unit = 8;
+  guint y_unit = 8;
+  std::string entry_point;
+  HRESULT hr;
+
+  if (in_format != out_format) {
+    std::string in_format_str;
+    std::string out_format_str;
+
+    switch (in_format) {
+      case GST_VIDEO_FORMAT_YUY2:
+        srv_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        in_format_str = "YUY2";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_UYVY:
+        srv_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        in_format_str = "UYVY";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_VYUY:
+        srv_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        in_format_str = "VYUY";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_YVYU:
+        srv_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        in_format_str = "YVYU";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_Y210:
+      case GST_VIDEO_FORMAT_Y212_LE:
+        srv_format = DXGI_FORMAT_R16G16B16A16_UNORM;
+        in_format_str = "YUY2";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_v210:
+        srv_format = DXGI_FORMAT_R10G10B10A2_UNORM;
+        in_format_str = "v210";
+        x_unit = 48;
+        break;
+      case GST_VIDEO_FORMAT_v216:
+        srv_format = DXGI_FORMAT_R16G16B16A16_UNORM;
+        in_format_str = "UYVY";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_v308:
+        srv_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        in_format_str = "v308";
+        x_unit = 32;
+        break;
+      case GST_VIDEO_FORMAT_IYU2:
+        srv_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        in_format_str = "IYU2";
+        x_unit = 32;
+        break;
+      case GST_VIDEO_FORMAT_RGB:
+        srv_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        in_format_str = "RGB";
+        x_unit = 32;
+        break;
+      case GST_VIDEO_FORMAT_BGR:
+        srv_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        in_format_str = "BGR";
+        x_unit = 32;
+        break;
+      case GST_VIDEO_FORMAT_RGB16:
+        srv_format = DXGI_FORMAT_R16_UINT;
+        in_format_str = "RGB16";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_BGR16:
+        srv_format = DXGI_FORMAT_R16_UINT;
+        in_format_str = "BGR16";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_RGB15:
+        srv_format = DXGI_FORMAT_R16_UINT;
+        in_format_str = "RGB15";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_BGR15:
+        srv_format = DXGI_FORMAT_R16_UINT;
+        in_format_str = "BGR15";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_r210:
+        srv_format = DXGI_FORMAT_R32_UINT;
+        in_format_str = "r210";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_AYUV:
+        srv_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        in_format_str = "AYUV";
+        break;
+      case GST_VIDEO_FORMAT_AYUV64:
+        srv_format = DXGI_FORMAT_R16G16B16A16_UNORM;
+        in_format_str = "AYUV";
+        break;
+      case GST_VIDEO_FORMAT_RGBA:
+        srv_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        in_format_str = "RGBA";
+        break;
+      case GST_VIDEO_FORMAT_RGB10A2_LE:
+        srv_format = DXGI_FORMAT_R10G10B10A2_UNORM;
+        in_format_str = "RGBA";
+        break;
+      case GST_VIDEO_FORMAT_RGBA64_LE:
+        srv_format = DXGI_FORMAT_R16G16B16A16_UNORM;
+        in_format_str = "RGBA";
+        break;
+      default:
+        g_assert_not_reached ();
+        return nullptr;
+    }
+
+    switch (out_format) {
+      case GST_VIDEO_FORMAT_YUY2:
+        uav_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        out_format_str = "YUY2";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_UYVY:
+        uav_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        out_format_str = "UYVY";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_VYUY:
+        uav_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        out_format_str = "VYUY";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_YVYU:
+        uav_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        out_format_str = "YVYU";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_Y210:
+      case GST_VIDEO_FORMAT_Y212_LE:
+        uav_format = DXGI_FORMAT_R16G16B16A16_UNORM;
+        out_format_str = "YUY2";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_v210:
+        uav_format = DXGI_FORMAT_R10G10B10A2_UNORM;
+        out_format_str = "v210";
+        x_unit = 48;
+        break;
+      case GST_VIDEO_FORMAT_v216:
+        uav_format = DXGI_FORMAT_R16G16B16A16_UNORM;
+        out_format_str = "UYVY";
+        x_unit = 16;
+        break;
+      case GST_VIDEO_FORMAT_v308:
+        uav_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        out_format_str = "v308";
+        x_unit = 32;
+        break;
+      case GST_VIDEO_FORMAT_IYU2:
+        uav_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        out_format_str = "IYU2";
+        x_unit = 32;
+        break;
+      case GST_VIDEO_FORMAT_Y410:
+        uav_format = DXGI_FORMAT_R10G10B10A2_UNORM;
+        out_format_str = "Y410";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_Y412_LE:
+        uav_format = DXGI_FORMAT_R16G16B16A16_UNORM;
+        out_format_str = "Y410";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_RGB:
+        uav_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        out_format_str = "RGB";
+        x_unit = 32;
+        break;
+      case GST_VIDEO_FORMAT_BGR:
+        uav_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        out_format_str = "BGR";
+        x_unit = 32;
+        break;
+      case GST_VIDEO_FORMAT_RGB16:
+        uav_format = DXGI_FORMAT_R16_UINT;
+        out_format_str = "RGB16";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_BGR16:
+        uav_format = DXGI_FORMAT_R16_UINT;
+        out_format_str = "BGR16";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_RGB15:
+        uav_format = DXGI_FORMAT_R16_UINT;
+        out_format_str = "RGB15";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_BGR15:
+        uav_format = DXGI_FORMAT_R16_UINT;
+        out_format_str = "BGR15";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_r210:
+        uav_format = DXGI_FORMAT_R32_UINT;
+        out_format_str = "r210";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_BGRA64_LE:
+        uav_format = DXGI_FORMAT_R16G16B16A16_UNORM;
+        out_format_str = "BGRA";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_BGR10A2_LE:
+        uav_format = DXGI_FORMAT_R10G10B10A2_UNORM;
+        out_format_str = "BGRA";
+        x_unit = 8;
+        break;
+      case GST_VIDEO_FORMAT_AYUV:
+        uav_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        out_format_str = "AYUV";
+        break;
+      case GST_VIDEO_FORMAT_AYUV64:
+        uav_format = DXGI_FORMAT_R16G16B16A16_UNORM;
+        out_format_str = "AYUV";
+        break;
+      case GST_VIDEO_FORMAT_RGBA:
+        uav_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        out_format_str = "RGBA";
+        break;
+      case GST_VIDEO_FORMAT_RGB10A2_LE:
+        uav_format = DXGI_FORMAT_R10G10B10A2_UNORM;
+        out_format_str = "RGBA";
+        break;
+      default:
+        g_assert_not_reached ();
+        return nullptr;
+    }
+
+    entry_point = "CSMain_" + in_format_str + "_to_" + out_format_str;
+  }
+
+  self = new GstD3D11ConverterHelper ();
+  self->device = (GstD3D11Device *) gst_object_ref (device);
+
+  gst_video_info_set_format (&self->in_info, in_format, width, height);
+  gst_video_info_set_format (&self->out_info, out_format, width, height);
+
+  self->in_alloc_info = self->in_info;
+  self->out_alloc_info = self->out_info;
+  self->srv_format = srv_format;
+  self->uav_format = uav_format;
+
+  if (!entry_point.empty ()) {
+    auto handle = gst_d3d11_device_get_device_handle (device);
+    gboolean try_cs = TRUE;
+    feature_level = handle->GetFeatureLevel ();
+    if (feature_level < D3D_FEATURE_LEVEL_11_0) {
+      try_cs = FALSE;
+      GST_DEBUG ("Device does not support typed UAV");
+    } else if (uav_format != DXGI_FORMAT_R32_UINT) {
+      D3D11_FEATURE_DATA_FORMAT_SUPPORT2 support2;
+      support2.InFormat = uav_format;
+      support2.OutFormatSupport2 = 0;
+      hr = handle->CheckFeatureSupport (D3D11_FEATURE_FORMAT_SUPPORT2,
+          &support2, sizeof (D3D11_FEATURE_DATA_FORMAT_SUPPORT2));
+      /* XXX: D3D11_FORMAT_SUPPORT2_UAV_TYPED_STORE (0x80)
+       * undefined in old MinGW toolchain */
+      if (FAILED (hr) || (support2.OutFormatSupport2 & 0x80) == 0) {
+        try_cs = FALSE;
+        GST_DEBUG ("Device does not support typed UAV store");
+      }
+    }
+
+    if (try_cs) {
+      std::lock_guard<std::mutex> lk (cache_lock);
+      std::shared_ptr<ConverterCSSource> source;
+      auto cached = cs_source_cache.find (entry_point);
+      if (cached != cs_source_cache.end ()) {
+        source = cached->second;
+      } else {
+        source = std::make_shared<ConverterCSSource> ();
+        source->token = gst_d3d11_compute_shader_token_new ();
+        source->entry_point = entry_point;
+        auto precompiled = precompiled_bytecode.find (entry_point);
+        if (precompiled != precompiled_bytecode.end ()) {
+          source->bytecode = precompiled->second.first;
+          source->bytecode_size = precompiled->second.second;
+        } else {
+          source->bytecode = nullptr;
+          source->bytecode_size = 0;
+          source->macros.push_back(std::make_pair("ENTRY_POINT", entry_point));
+          source->macros.push_back(std::make_pair("BUILDING_" + entry_point, "1"));
+        }
+
+        cs_source_cacheentry_point = source;
+      }
+
+      if (source->bytecode) {
+        hr = handle->CreateComputeShader (source->bytecode,
+            source->bytecode_size, nullptr, &cs);
+        if (!gst_d3d11_result (hr, device))
+          GST_WARNING ("Couldn't create compute shader from precompiled blob");
+      } else {
+        std::vector<D3D_SHADER_MACRO> macros;
+        ComPtr < ID3DBlob > blob;
+
+        for (const auto & defines : source->macros)
+          macros.push_back({defines.first.c_str (), defines.second.c_str ()});
+
+        macros.push_back({nullptr, nullptr});
+
+        gst_d3d11_shader_cache_get_compute_shader_blob (source->token,
+            g_CSMain_converter_str, sizeof (g_CSMain_converter_str),
+            source->entry_point.c_str (), &macros0, &blob);
+        if (blob) {
+          hr = handle->CreateComputeShader (blob->GetBufferPointer (),
+              blob->GetBufferSize (), nullptr, &cs);
+          if (!gst_d3d11_result (hr, device))
+            GST_WARNING ("Couldn't create compute shader from source");
+        }
+      }
+    }
+
+    if (cs) {
+      GST_DEBUG ("Compute shader \"%s\" available", entry_point.c_str ());
+
+      self->cs = cs;
+
+      self->x_unit = x_unit;
+      self->y_unit = y_unit;
+
+      if ((width % x_unit) == 0 && (height % y_unit) == 0) {
+        self->tg_x = width / x_unit;
+        self->tg_y = height / y_unit;
+      } else {
+        self->tg_x = (UINT) ceil (width / (float) x_unit);
+        self->tg_y = (UINT) ceil (height / (float) y_unit);
+      }
+    } else {
+      GST_DEBUG ("Creating software converter for \"%s\"",
+          entry_point.c_str ());
+
+      self->sw_conv =
+          gst_video_converter_new (&self->in_info, &self->out_info, nullptr);
+    }
+  }
+
+  return self;
+}
+/* *INDENT-ON* */
+
+void
+gst_d3d11_converter_helper_free (GstD3D11ConverterHelper * converter)
+{
+  delete converter;
+}
+
+void
+gst_d3d11_converter_helper_update_size (GstD3D11ConverterHelper * helper,
+    guint width, guint height)
+{
+  if (width != (guint) helper->in_alloc_info.width ||
+      height != (guint) helper->in_alloc_info.height) {
+    gst_clear_buffer (&helper->srv_buf);
+    gst_clear_buffer (&helper->uav_buf);
+
+    gst_video_info_set_format (&helper->in_alloc_info,
+        GST_VIDEO_INFO_FORMAT (&helper->in_info), width, height);
+    gst_video_info_set_format (&helper->out_alloc_info,
+        GST_VIDEO_INFO_FORMAT (&helper->out_info), width, height);
+
+    if (helper->cs) {
+      if ((width % helper->x_unit) == 0 && (height % helper->y_unit) == 0) {
+        helper->tg_x = width / helper->x_unit;
+        helper->tg_y = height / helper->y_unit;
+      } else {
+        helper->tg_x = (gint) ceil (width / (float) helper->x_unit);
+        helper->tg_y = (gint) ceil (height / (float) helper->y_unit);
+      }
+    }
+
+    if (helper->sw_conv) {
+      gst_video_converter_free (helper->sw_conv);
+      helper->sw_conv = gst_video_converter_new (&helper->in_alloc_info,
+          &helper->out_alloc_info, nullptr);
+    }
+  }
+}
+
+static GstBuffer *
+gst_d3d11_converter_helper_allocate_buffer (GstD3D11ConverterHelper * self,
+    const GstVideoInfo * info, UINT bind_flags)
+{
+  GstD3D11AllocationParams *params;
+  GstBufferPool *pool;
+  GstCaps *caps;
+  GstStructure *config;
+  GstBuffer *buf = nullptr;
+
+  params = gst_d3d11_allocation_params_new (self->device, info,
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags, 0);
+
+  caps = gst_video_info_to_caps (info);
+  pool = gst_d3d11_buffer_pool_new (self->device);
+
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_set_params (config, caps, info->size, 0, 0);
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_caps_unref (caps);
+  gst_d3d11_allocation_params_free (params);
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR ("Failed to set pool config");
+    gst_object_unref (pool);
+    return nullptr;
+  }
+
+  if (!gst_buffer_pool_set_active (pool, TRUE)) {
+    GST_ERROR ("Failed to set active");
+    gst_object_unref (pool);
+    return nullptr;
+  }
+
+  gst_buffer_pool_acquire_buffer (pool, &buf, nullptr);
+  gst_buffer_pool_set_active (pool, FALSE);
+  gst_object_unref (pool);
+
+  return buf;
+}
+
+static GstBuffer *
+gst_d3d11_converter_helper_upload (GstD3D11ConverterHelper * self,
+    GstBuffer * buffer)
+{
+  GstMemory *mem = gst_buffer_peek_memory (buffer, 0);
+  GstVideoFrame in_frame, out_frame;
+
+  if (gst_is_d3d11_memory (mem)) {
+    GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
+
+    D3D11_TEXTURE2D_DESC desc;
+    gst_d3d11_memory_get_texture_desc (dmem, &desc);
+
+    gst_d3d11_converter_helper_update_size (self, desc.Width, desc.Height);
+
+    if (dmem->device == self->device) {
+      if ((desc.BindFlags & D3D11_BIND_SHADER_RESOURCE) != 0)
+        return buffer;
+
+      if (!self->srv_buf) {
+        self->srv_buf = gst_d3d11_converter_helper_allocate_buffer (self,
+            &self->in_alloc_info, D3D11_BIND_SHADER_RESOURCE);
+      }
+
+      if (!self->srv_buf)
+        return nullptr;
+
+      auto ctx = gst_d3d11_device_get_device_context_handle (self->device);
+
+      for (guint i = 0; i < gst_buffer_n_memory (buffer); i++) {
+        GstMapInfo in_map, out_map;
+        GstMemory *in_mem, *out_mem;
+        guint subresource;
+        D3D11_TEXTURE2D_DESC in_desc;
+        D3D11_TEXTURE2D_DESC out_desc;
+        D3D11_BOX src_box = { 0, };
+
+        in_mem = gst_buffer_peek_memory (buffer, i);
+        out_mem = gst_buffer_peek_memory (self->srv_buf, i);
+
+        if (!gst_memory_map (in_mem, &in_map, (GstMapFlags)
+                (GST_MAP_READ | GST_MAP_D3D11))) {
+          GST_ERROR ("Couldn't map in memory");
+          return nullptr;
+        }
+
+        if (!gst_memory_map (out_mem, &out_map, (GstMapFlags)
+                (GST_MAP_WRITE | GST_MAP_D3D11))) {
+          GST_ERROR ("Couldn't map out memory");
+          gst_memory_unmap (in_mem, &in_map);
+          return nullptr;
+        }
+
+        dmem = GST_D3D11_MEMORY_CAST (in_mem);
+        gst_d3d11_memory_get_texture_desc (dmem, &in_desc);
+        subresource = gst_d3d11_memory_get_subresource_index (dmem);
+
+        dmem = GST_D3D11_MEMORY_CAST (out_mem);
+        gst_d3d11_memory_get_texture_desc (dmem, &out_desc);
+
+        src_box.left = 0;
+        src_box.top = 0;
+        src_box.front = 0;
+        src_box.back = 1;
+        src_box.right = MIN (in_desc.Width, out_desc.Width);
+        src_box.bottom = MIN (in_desc.Height, out_desc.Height);
+
+        ctx->CopySubresourceRegion ((ID3D11Resource *) out_map.data, 0, 0, 0, 0,
+            (ID3D11Resource *) in_map.data, subresource, &src_box);
+        gst_memory_unmap (in_mem, &in_map);
+        gst_memory_unmap (out_mem, &out_map);
+      }
+
+      return self->srv_buf;
+    }
+  }
+
+  if (!gst_video_frame_map (&in_frame, &self->in_info, buffer, GST_MAP_READ)) {
+    GST_ERROR ("Couldn't map in buffer");
+    return nullptr;
+  }
+
+  gst_d3d11_converter_helper_update_size (self,
+      in_frame.info.width, in_frame.info.height);
+
+  if (!self->srv_buf) {
+    self->srv_buf = gst_d3d11_converter_helper_allocate_buffer (self,
+        &self->in_info, D3D11_BIND_SHADER_RESOURCE);
+  }
+
+  if (!self->srv_buf) {
+    gst_video_frame_unmap (&in_frame);
+    return nullptr;
+  }
+
+  if (!gst_video_frame_map (&out_frame, &self->in_alloc_info, self->srv_buf,
+          GST_MAP_WRITE)) {
+    GST_ERROR ("Couldn't map out buffer");
+    gst_video_frame_unmap (&in_frame);
+    return nullptr;
+  }
+
+  gst_video_frame_copy (&out_frame, &in_frame);
+  gst_video_frame_unmap (&out_frame);
+  gst_video_frame_unmap (&in_frame);
+
+  return self->srv_buf;
+}
+
+static gboolean
+gst_d3d11_converter_helper_copy_buffer (GstD3D11ConverterHelper * self,
+    GstBuffer * dst, GstBuffer * src)
+{
+  if (dst == src)
+    return TRUE;
+
+  auto ctx = gst_d3d11_device_get_device_context_handle (self->device);
+
+  for (guint i = 0; i < gst_buffer_n_memory (dst); i++) {
+    GstMapInfo in_map, out_map;
+    GstMemory *in_mem, *out_mem;
+    GstD3D11Memory *dmem;
+    guint in_subresource;
+    guint out_subresource;
+    D3D11_TEXTURE2D_DESC in_desc;
+    D3D11_TEXTURE2D_DESC out_desc;
+    D3D11_BOX src_box = { 0, };
+
+    in_mem = gst_buffer_peek_memory (src, i);
+    out_mem = gst_buffer_peek_memory (dst, i);
+
+    if (!gst_memory_map (in_mem, &in_map, (GstMapFlags)
+            (GST_MAP_READ | GST_MAP_D3D11))) {
+      GST_ERROR ("Couldn't map in memory");
+      return FALSE;
+    }
+
+    if (!gst_memory_map (out_mem, &out_map, (GstMapFlags)
+            (GST_MAP_WRITE | GST_MAP_D3D11))) {
+      GST_ERROR ("Couldn't map out memory");
+      gst_memory_unmap (in_mem, &in_map);
+      return FALSE;
+    }
+
+    dmem = GST_D3D11_MEMORY_CAST (in_mem);
+    gst_d3d11_memory_get_texture_desc (dmem, &in_desc);
+    in_subresource = gst_d3d11_memory_get_subresource_index (dmem);
+
+    dmem = GST_D3D11_MEMORY_CAST (out_mem);
+    out_subresource = gst_d3d11_memory_get_subresource_index (dmem);
+    gst_d3d11_memory_get_texture_desc (dmem, &out_desc);
+
+    src_box.left = 0;
+    src_box.top = 0;
+    src_box.front = 0;
+    src_box.back = 1;
+    src_box.right = MIN (in_desc.Width, out_desc.Width);
+    src_box.bottom = MIN (in_desc.Height, out_desc.Height);
+
+    ctx->CopySubresourceRegion ((ID3D11Resource *) out_map.data,
+        out_subresource, 0, 0, 0,
+        (ID3D11Resource *) in_map.data, in_subresource, &src_box);
+    gst_memory_unmap (in_mem, &in_map);
+    gst_memory_unmap (out_mem, &out_map);
+  }
+
+  return TRUE;
+}
+
+static GstBuffer *
+gst_d3d11_converter_helper_get_uav_outbuf (GstD3D11ConverterHelper * self)
+{
+  if (self->uav_buf)
+    return self->uav_buf;
+
+  self->uav_buf = gst_d3d11_converter_helper_allocate_buffer (self,
+      &self->out_alloc_info,
+      D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS);
+
+  return self->uav_buf;
+}
+
+GstBuffer *
+gst_d3d11_converter_helper_preproc (GstD3D11ConverterHelper * helper,
+    GstBuffer * buffer)
+{
+  GstBuffer *outbuf = nullptr;
+
+  if (helper->cs) {
+    GstBuffer *inbuf;
+    ID3D11ShaderResourceView *srv1;
+    ID3D11ShaderResourceView *srv_unbind1 = { nullptr };
+    ID3D11UnorderedAccessView *uav1;
+    ID3D11UnorderedAccessView *uav_unbind1 = { nullptr };
+    GstMemory *in_mem;
+    GstMemory *out_mem;
+    GstMapInfo in_map;
+    GstMapInfo out_map;
+    ComPtr < ID3D11ShaderResourceView > in_srv;
+    ComPtr < ID3D11UnorderedAccessView > out_uav;
+    auto ctx = gst_d3d11_device_get_device_context_handle (helper->device);
+    auto device = gst_d3d11_device_get_device_handle (helper->device);
+    HRESULT hr;
+    D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc;
+    D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+
+    inbuf = gst_d3d11_converter_helper_upload (helper, buffer);
+    if (!inbuf)
+      return nullptr;
+
+    outbuf = gst_d3d11_converter_helper_get_uav_outbuf (helper);
+    if (!outbuf)
+      return nullptr;
+
+    in_mem = gst_buffer_peek_memory (inbuf, 0);
+    out_mem = gst_buffer_peek_memory (outbuf, 0);
+
+    if (!gst_memory_map (in_mem, &in_map,
+            (GstMapFlags) (GST_MAP_D3D11 | GST_MAP_READ))) {
+      GST_ERROR ("Couldn't map in memory");
+      return nullptr;
+    }
+
+    if (!gst_memory_map (out_mem, &out_map,
+            (GstMapFlags) (GST_MAP_D3D11 | GST_MAP_WRITE))) {
+      GST_ERROR ("Couldn't map out memory");
+      gst_memory_unmap (in_mem, &in_map);
+      return nullptr;
+    }
+
+    srv_desc.Format = helper->srv_format;
+    srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
+    srv_desc.Texture2D.MipLevels = 1;
+    srv_desc.Texture2D.MostDetailedMip = 0;
+
+    hr = device->CreateShaderResourceView ((ID3D11Resource *) in_map.data,
+        &srv_desc, &in_srv);
+    if (!gst_d3d11_result (hr, helper->device)) {
+      gst_memory_unmap (out_mem, &out_map);
+      gst_memory_unmap (in_mem, &in_map);
+      return nullptr;
+    }
+
+    uav_desc.Format = helper->uav_format;
+    uav_desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2D;
+    uav_desc.Texture2D.MipSlice = 0;
+
+    hr = device->CreateUnorderedAccessView ((ID3D11Resource *) out_map.data,
+        &uav_desc, &out_uav);
+    if (!gst_d3d11_result (hr, helper->device)) {
+      gst_memory_unmap (out_mem, &out_map);
+      gst_memory_unmap (in_mem, &in_map);
+      return nullptr;
+    }
+
+    srv0 = in_srv.Get ();
+    uav0 = out_uav.Get ();
+
+    ctx->CSSetShader (helper->cs.Get (), nullptr, 0);
+
+    ctx->CSSetShaderResources (0, 1, srv);
+    ctx->CSSetUnorderedAccessViews (0, 1, uav, nullptr);
+    ctx->Dispatch (helper->tg_x, helper->tg_y, 1);
+
+    ctx->CSSetUnorderedAccessViews (0, 1, uav_unbind, nullptr);
+    ctx->CSSetShaderResources (0, 1, srv_unbind);
+    ctx->CSSetShader (nullptr, nullptr, 0);
+
+    gst_memory_unmap (out_mem, &out_map);
+    gst_memory_unmap (in_mem, &in_map);
+  } else if (helper->sw_conv) {
+    GstVideoFrame in_frame, out_frame;
+    if (!gst_video_frame_map (&in_frame,
+            &helper->in_info, buffer, GST_MAP_READ)) {
+      GST_ERROR ("Couldn't map input buffer");
+      return nullptr;
+    }
+
+    gst_d3d11_converter_helper_update_size (helper, in_frame.info.width,
+        in_frame.info.height);
+
+    if (!helper->srv_buf) {
+      helper->srv_buf = gst_d3d11_converter_helper_allocate_buffer (helper,
+          &helper->out_alloc_info, D3D11_BIND_SHADER_RESOURCE);
+    }
+
+    if (!helper->srv_buf) {
+      gst_video_frame_unmap (&in_frame);
+      return nullptr;
+    }
+
+    if (!gst_video_frame_map (&out_frame,
+            &helper->out_alloc_info, helper->srv_buf, GST_MAP_WRITE)) {
+      GST_ERROR ("Couldn't map input buffer");
+      gst_video_frame_unmap (&in_frame);
+      return nullptr;
+    }
+
+    gst_video_converter_frame (helper->sw_conv, &in_frame, &out_frame);
+    gst_video_frame_unmap (&out_frame);
+    gst_video_frame_unmap (&in_frame);
+    outbuf = helper->srv_buf;
+  } else {
+    outbuf = gst_d3d11_converter_helper_upload (helper, buffer);
+  }
+
+  return outbuf;
+}
+
+gboolean
+gst_d3d11_converter_helper_postproc (GstD3D11ConverterHelper * helper,
+    GstBuffer * in_buf, GstBuffer * out_buf)
+{
+  gboolean ret = TRUE;
+
+  if (helper->cs) {
+    ID3D11ShaderResourceView *srv1;
+    ID3D11ShaderResourceView *srv_unbind1 = { nullptr };
+    ID3D11UnorderedAccessView *uav1;
+    ID3D11UnorderedAccessView *uav_unbind1 = { nullptr };
+    GstMemory *in_mem;
+    GstMemory *out_mem;
+    GstMapInfo in_map;
+    GstMapInfo out_map;
+    ComPtr < ID3D11ShaderResourceView > in_srv;
+    ComPtr < ID3D11UnorderedAccessView > out_uav;
+    auto ctx = gst_d3d11_device_get_device_context_handle (helper->device);
+    auto device = gst_d3d11_device_get_device_handle (helper->device);
+    HRESULT hr;
+    D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc;
+    D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc;
+    GstBuffer *uav_outbuf = out_buf;
+    D3D11_TEXTURE2D_DESC desc;
+
+    in_mem = gst_buffer_peek_memory (in_buf, 0);
+    out_mem = gst_buffer_peek_memory (out_buf, 0);
+
+    gst_d3d11_memory_get_texture_desc (GST_D3D11_MEMORY_CAST (out_mem), &desc);
+    if ((desc.BindFlags & D3D11_BIND_UNORDERED_ACCESS) == 0) {
+      uav_outbuf = gst_d3d11_converter_helper_get_uav_outbuf (helper);
+      if (!uav_outbuf)
+        return FALSE;
+
+      out_mem = gst_buffer_peek_memory (uav_outbuf, 0);
+    }
+
+    if (!gst_memory_map (in_mem, &in_map,
+            (GstMapFlags) (GST_MAP_D3D11 | GST_MAP_READ))) {
+      GST_ERROR ("Couldn't map in memory");
+      return FALSE;
+    }
+
+    if (!gst_memory_map (out_mem, &out_map,
+            (GstMapFlags) (GST_MAP_D3D11 | GST_MAP_WRITE))) {
+      GST_ERROR ("Couldn't map out memory");
+      gst_memory_unmap (in_mem, &in_map);
+      return FALSE;
+    }
+
+    srv_desc.Format = helper->srv_format;
+    srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
+    srv_desc.Texture2D.MipLevels = 1;
+    srv_desc.Texture2D.MostDetailedMip = 0;
+
+    hr = device->CreateShaderResourceView ((ID3D11Resource *) in_map.data,
+        &srv_desc, &in_srv);
+    if (!gst_d3d11_result (hr, helper->device)) {
+      gst_memory_unmap (out_mem, &out_map);
+      gst_memory_unmap (in_mem, &in_map);
+      return FALSE;
+    }
+
+    uav_desc.Format = helper->uav_format;
+    uav_desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2D;
+    uav_desc.Texture2D.MipSlice = 0;
+
+    hr = device->CreateUnorderedAccessView ((ID3D11Resource *) out_map.data,
+        &uav_desc, &out_uav);
+    if (!gst_d3d11_result (hr, helper->device)) {
+      gst_memory_unmap (out_mem, &out_map);
+      gst_memory_unmap (in_mem, &in_map);
+      return FALSE;
+    }
+
+    srv0 = in_srv.Get ();
+    uav0 = out_uav.Get ();
+
+    ctx->CSSetShader (helper->cs.Get (), nullptr, 0);
+
+    ctx->CSSetShaderResources (0, 1, srv);
+    ctx->CSSetUnorderedAccessViews (0, 1, uav, nullptr);
+    ctx->Dispatch (helper->tg_x, helper->tg_y, 1);
+
+    ctx->CSSetUnorderedAccessViews (0, 1, uav_unbind, nullptr);
+    ctx->CSSetShaderResources (0, 1, srv_unbind);
+    ctx->CSSetShader (nullptr, nullptr, 0);
+
+    gst_memory_unmap (out_mem, &out_map);
+    gst_memory_unmap (in_mem, &in_map);
+
+    ret = gst_d3d11_converter_helper_copy_buffer (helper, out_buf, uav_outbuf);
+  } else if (helper->sw_conv) {
+    GstVideoFrame in_frame, out_frame;
+    if (!gst_video_frame_map (&in_frame,
+            &helper->in_info, in_buf, GST_MAP_READ)) {
+      GST_ERROR ("Couldn't map input buffer");
+      return FALSE;
+    }
+
+    if (!gst_video_frame_map (&out_frame,
+            &helper->out_info, out_buf, GST_MAP_WRITE)) {
+      GST_ERROR ("Couldn't map input buffer");
+      gst_video_frame_unmap (&in_frame);
+      return FALSE;
+    }
+
+    gst_video_converter_frame (helper->sw_conv, &in_frame, &out_frame);
+    gst_video_frame_unmap (&out_frame);
+    gst_video_frame_unmap (&in_frame);
+  } else {
+    ret = gst_d3d11_converter_helper_copy_buffer (helper, out_buf, in_buf);
+  }
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11converter-helper.h Added

@@ -0,0 +1,49 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/d3d11/gstd3d11_fwd.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GstD3D11ConverterHelper GstD3D11ConverterHelper;
+
+GstD3D11ConverterHelper * gst_d3d11_converter_helper_new (GstD3D11Device * device,
+                                                          GstVideoFormat in_format,
+                                                          GstVideoFormat out_format,
+                                                          guint width,
+                                                          guint height);
+
+void                      gst_d3d11_converter_helper_free (GstD3D11ConverterHelper * helper);
+
+void                      gst_d3d11_converter_helper_update_size (GstD3D11ConverterHelper * helper,
+                                                                  guint width,
+                                                                  guint height);
+
+GstBuffer *               gst_d3d11_converter_helper_preproc (GstD3D11ConverterHelper * helper,
+                                                              GstBuffer * buffer);
+
+gboolean                  gst_d3d11_converter_helper_postproc (GstD3D11ConverterHelper * helper,
+                                                               GstBuffer * in_buf,
+                                                               GstBuffer * out_buf);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11converter-private.h Added

@@ -0,0 +1,41 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/d3d11/gstd3d11_fwd.h>
+
+G_BEGIN_DECLS
+
+GST_D3D11_API
+gboolean gst_d3d11_converter_apply_transform (GstD3D11Converter * converter,
+                                              GstVideoOrientationMethod method,
+                                              gfloat viewport_width,
+                                              gfloat viewport_height,
+                                              gfloat fov,
+                                              gboolean ortho,
+                                              gfloat rotation_x,
+                                              gfloat rotation_y,
+                                              gfloat rotation_z,
+                                              gfloat scale_x,
+                                              gfloat scale_y);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/gstd3d11converter.cpp -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11converter.cpp Changed

@@ -24,15 +24,26 @@
 #endif
 
 #include "gstd3d11-private.h"
+#include "gstd3d11device-private.h"
+#include "gstd3d11converter-private.h"
 #include "gstd3d11converter.h"
 #include "gstd3d11device.h"
 #include "gstd3d11utils.h"
 #include "gstd3d11memory.h"
 #include "gstd3d11compile.h"
 #include "gstd3d11bufferpool.h"
+#include "gstd3d11converter-builder.h"
+#include "gstd3d11converter-helper.h"
 #include <wrl.h>
 #include <string.h>
 #include <math.h>
+#include <map>
+#include <memory>
+
+#ifndef HAVE_DIRECTX_MATH_SIMD
+#define _XM_NO_INTRINSICS_
+#endif
+#include <DirectXMath.h>
 
 /**
  * SECTION:gstd3d11converter
@@ -45,7 +56,7 @@
  * Since: 1.22
  */
 
-GST_DEBUG_CATEGORY_STATIC (gst_d3d11_converter_debug);
+GST_DEBUG_CATEGORY (gst_d3d11_converter_debug);
 #define GST_CAT_DEFAULT gst_d3d11_converter_debug
 
 DEFINE_ENUM_FLAG_OPERATORS (GstD3D11ConverterBackend);
@@ -69,8 +80,53 @@
   return type;
 }
 
+GType
+gst_d3d11_converter_sampler_filter_get_type (void)
+{
+  static GType filter_type = 0;
+  static const GEnumValue filter_types = {
+    {D3D11_FILTER_MIN_MAG_MIP_POINT,
+        "D3D11_FILTER_MIN_MAG_MIP_POINT", "min-mag-mip-point"},
+    {D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT,
+        "D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT", "min-linear-mag-mip-point"},
+    {D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT,
+        "D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT", "min-mag-linear-mip-point"},
+    {D3D11_FILTER_ANISOTROPIC, "D3D11_FILTER_ANISOTROPIC", "anisotropic"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    filter_type = g_enum_register_static ("GstD3D11ConverterSamplerFilter",
+        filter_types);
+  } GST_D3D11_CALL_ONCE_END;
+
+  return filter_type;
+}
+
+GType
+gst_d3d11_converter_alpha_mode_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue alpha_mode = {
+    {GST_D3D11_CONVERTER_ALPHA_MODE_UNSPECIFIED,
+        "GST_D3D11_CONVERTER_ALPHA_MODE_UNSPECIFIED", "unspecified"},
+    {GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED,
+        "GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED", "premultiplied"},
+    {GST_D3D11_CONVERTER_ALPHA_MODE_STRAIGHT,
+        "GST_D3D11_CONVERTER_ALPHA_MODE_STRAIGHT", "straight"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstD3D11ConverterAlphaMode", alpha_mode);
+  } GST_D3D11_CALL_ONCE_END;
+
+  return type;
+}
+
 /* *INDENT-OFF* */
 using namespace Microsoft::WRL;
+using namespace DirectX;
 /* *INDENT-ON* */
 
 #define CONVERTER_MAX_QUADS 2
@@ -84,8 +140,7 @@
 /* D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_MIRROR */
 #define PROCESSOR_FEATURE_CAPS_MIRROR (0x200)
 
-/* *INDENT-OFF* */
-typedef struct
+struct PSColorSpace
 {
   /* + 1 for 16bytes alignment  */
   FLOAT coeffX4;
@@ -94,525 +149,89 @@
   FLOAT offset4;
   FLOAT min4;
   FLOAT max4;
-} PSColorSpace;
+};
 
-typedef struct
+struct PSConstBuffer
 {
-  PSColorSpace to_rgb_buf;
-  PSColorSpace to_yuv_buf;
-  PSColorSpace XYZ_convert_buf;
+  PSColorSpace preCoeff;
+  PSColorSpace postCoeff;
+  PSColorSpace primariesCoeff;
   FLOAT alpha;
   FLOAT padding3;
-} PSConstBuffer;
+};
 
-typedef struct
+struct VertexData
 {
-  struct {
+  struct
+  {
     FLOAT x;
     FLOAT y;
     FLOAT z;
   } position;
-  struct {
+  struct
+  {
     FLOAT u;
     FLOAT v;
   } texture;
-} VertexData;
-
-/* output struct */
-static const gchar templ_OUTPUT_SINGLE_PLANE =
-    "struct PS_OUTPUT\n"
-    "{\n"
-    "  float4 Plane_0: SV_TARGET0;\n"
-    "};";
-
-static const gchar templ_OUTPUT_TWO_PLANES =
-    "struct PS_OUTPUT\n"
-    "{\n"
-    "  float4 Plane_0: SV_TARGET0;\n"
-    "  float4 Plane_1: SV_TARGET1;\n"
-    "};";
-
-static const gchar templ_OUTPUT_THREE_PLANES =
-    "struct PS_OUTPUT\n"
-    "{\n"
-    "  float4 Plane_0: SV_TARGET0;\n"
-    "  float4 Plane_1: SV_TARGET1;\n"
-    "  float4 Plane_2: SV_TARGET2;\n"
-    "};";
-
-static const gchar templ_OUTPUT_FOUR_PLANES =
-    "struct PS_OUTPUT\n"
-    "{\n"
-    "  float4 Plane_0: SV_TARGET0;\n"
-    "  float4 Plane_1: SV_TARGET1;\n"
-    "  float4 Plane_2: SV_TARGET2;\n"
-    "  float4 Plane_3: SV_TARGET3;\n"
-    "};";
-
-typedef struct
-{
-  const gchar *output_template;
-  guint num_rtv;
-} PSOutputType;
+};
 
-enum
+struct GammaLut
 {
-  OUTPUT_SINGLE_PLANE = 0,
-  OUTPUT_TWO_PLANES,
-  OUTPUT_THREE_PLANES,
-  OUTPUT_FOUR_PLANES,
+  guint16 lutGAMMA_LUT_SIZE;
 };
 
-static const PSOutputType output_types = {
-  {templ_OUTPUT_SINGLE_PLANE, 1},
-  {templ_OUTPUT_TWO_PLANES, 2},
-  {templ_OUTPUT_THREE_PLANES, 3},
-  {templ_OUTPUT_FOUR_PLANES, 4},
-};
+/* *INDENT-OFF* */
+typedef std::shared_ptr<GammaLut> GammaLutPtr;
 
-/* colorspace conversion */
-static const gchar templ_COLOR_SPACE_IDENTITY =
-    "{\n"
-    "  return sample;\n"
-    "}";
-
-static const gchar templ_COLOR_SPACE_CONVERT =
-    "{\n"
-    "  float3 out_space;\n"
-    "  out_space.x = dot (coeff.CoeffX, sample);\n"
-    "  out_space.y = dot (coeff.CoeffY, sample);\n"
-    "  out_space.z = dot (coeff.CoeffZ, sample);\n"
-    "  out_space += coeff.Offset;\n"
-    "  return clamp (out_space, coeff.Min, coeff.Max);\n"
-    "}";
-
-static const gchar templ_COLOR_SPACE_CONVERT_LUMA =
-    "{\n"
-    "  float3 out_space;\n"
-    "  out_space.x = dot (coeff.CoeffX, sample) + coeff.Offset.x;\n"
-    "  out_space.x = clamp (out_space.x, coeff.Min.x, coeff.Max.x);\n"
-    "  out_space.y = 0.5;\n"
-    "  out_space.z = 0.5;\n"
-    "  return out_space;\n"
-    "}";
-
-static const gchar templ_COLOR_SPACE_CONVERT_CHROMA =
-    "{\n"
-    "  float3 out_space;\n"
-    "  out_space.x = 0.0;\n"
-    "  out_space.y = dot (coeff.CoeffY, sample) + coeff.Offset.y;\n"
-    "  out_space.z = dot (coeff.CoeffZ, sample) + coeff.Offset.z;\n"
-    "  return clamp (out_space, coeff.Min, coeff.Max);\n"
-    "}";
-
-static const gchar templ_COLOR_SPACE_GRAY_TO_RGB =
-    "{\n"
-    "  return float3 (sample.x, sample.x, sample.x);\n"
-    "}";
-
-static const gchar templ_COLOR_SPACE_GRAY_TO_RGB_RANGE_ADJUST =
-    "{\n"
-    "  float gray;\n"
-    "  gray = coeff.CoeffX.x * sample.x + coeff.Offset.x;\n"
-    "  gray = clamp (gray, coeff.Min.x, coeff.Max.x);\n"
-    "  return float3 (gray, gray, gray);\n"
-    "}";
-
-/* sampling */
-static const gchar templ_SAMPLE_DEFAULT =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  return shaderTexture0.Sample(samplerState, uv);\n"
-    "}";
-
-static const gchar templ_SAMPLE_VUYA =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  return shaderTexture0.Sample(samplerState, uv).%c%c%c%c;\n"
-    "}";
-
-static const gchar templ_SAMPLE_YUV_LUMA =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  float4 sample;\n"
-    "  sample.x = shaderTexture0.Sample(samplerState, uv).x;\n"
-    "  sample.y = 0.5;\n"
-    "  sample.z = 0.5;\n"
-    "  sample.a = 1.0;\n"
-    "  return sample;\n"
-    "}";
-
-static const gchar templ_SAMPLE_YUV_LUMA_SCALED =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  float4 sample;\n"
-    "  sample.x = saturate (shaderTexture0.Sample(samplerState, uv).x * %d);\n"
-    "  sample.y = 0.5;\n"
-    "  sample.z = 0.5;\n"
-    "  sample.a = 1.0;\n"
-    "  return sample;\n"
-    "}";
-
-static const gchar templ_SAMPLE_SEMI_PLANAR =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  float4 sample;\n"
-    "  sample.x  = shaderTexture0.Sample(samplerState, uv).x;\n"
-    "  sample.yz = shaderTexture1.Sample(samplerState, uv).%c%c;\n"
-    "  sample.a = 1.0;\n"
-    "  return sample;\n"
-    "}";
-
-static const gchar templ_SAMPLE_SEMI_PLANAR_CHROMA =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  float4 sample;\n"
-    "  sample.x = 0.0;\n"
-    "  sample.yz = shaderTexture1.Sample(samplerState, uv).%c%c;\n"
-    "  sample.a = 1.0;\n"
-    "  return sample;\n"
-    "}";
-
-static const gchar templ_SAMPLE_PLANAR =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  float3 sample;\n"
-    "  sample.%c = shaderTexture0.Sample(samplerState, uv).x;\n"
-    "  sample.%c = shaderTexture1.Sample(samplerState, uv).x;\n"
-    "  sample.%c = shaderTexture2.Sample(samplerState, uv).x;\n"
-    "  return float4 (saturate(sample * %d), 1.0);\n"
-    "}";
-
-static const gchar templ_SAMPLE_PLANAR_4 =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  float4 sample;\n"
-    "  sample.%c = shaderTexture0.Sample(samplerState, uv).x;\n"
-    "  sample.%c = shaderTexture1.Sample(samplerState, uv).x;\n"
-    "  sample.%c = shaderTexture2.Sample(samplerState, uv).x;\n"
-    "  sample.%c = shaderTexture3.Sample(samplerState, uv).x;\n"
-    "  return saturate(sample * %d);\n"
-    "}";
-
-static const gchar templ_SAMPLE_PLANAR_CHROMA =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  float3 sample;\n"
-    "  sample.x = 0.0;\n"
-    "  sample.%c = shaderTexture1.Sample(samplerState, uv).x;\n"
-    "  sample.%c = shaderTexture2.Sample(samplerState, uv).x;\n"
-    "  return float4 (saturate(sample * %d), 1.0);\n"
-    "}";
-
-static const gchar templ_SAMPLE_YUV_PACKED =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  float4 sample;\n"
-    "  sample.xyz = shaderTexture0.Sample(samplerState, uv).%c%c%c;\n"
-    "  sample.a = 1.0;\n"
-    "  return sample;\n"
-    "}";
-
-static const gchar templ_SAMPLE_GRAY =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  float4 sample;\n"
-    "  sample.x = shaderTexture0.Sample(samplerState, uv).x;\n"
-    "  sample.y = 0.5;\n"
-    "  sample.z = 0.5;\n"
-    "  sample.a = 1.0;\n"
-    "  return sample;\n"
-    "}";
-
-static const gchar templ_SAMPLE_GRAY_CHROMA =
-    "float4 sample_texture (float2 uv)\n"
-    "{\n"
-    "  return float4 (0.0, 0.5, 0.5, 1.0);\n"
-    "}";
-
-/* building output */
-static const gchar templ_OUTPUT_DEFAULT =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  output.Plane_0 = sample;\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_VUYA =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  float4 vuya;\n"
-    "  vuya.%c%c%c = sample.xyz;\n"
-    "  vuya.%c = sample.a;\n"
-    "  output.Plane_0 = vuya;\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_LUMA =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  output.Plane_0 = float4 (sample.x, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_CHROMA_SEMI_PLANAR =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  output.Plane_0 = float4 (sample.%c%c, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_LUMA_10 =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  output.Plane_0 = float4 (sample.x * 1023.0 / 65535.0, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_LUMA_12 =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  output.Plane_0 = float4 (sample.x * 4095.0 / 65535.0, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_CHROMA_PLANAR =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  output.Plane_0 = float4 (sample.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_1 = float4 (sample.%c, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_CHROMA_PLANAR_10 =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  output.Plane_0 = float4 (sample.y * 1023.0 / 65535.0, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_1 = float4 (sample.z * 1023.0 / 65535.0, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_CHROMA_PLANAR_12 =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  output.Plane_0 = float4 (sample.y * 4095.0 / 65535.0, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_1 = float4 (sample.z * 4095.0 / 65535.0, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_PLANAR =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  output.Plane_0 = float4 (sample.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_1 = float4 (sample.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_2 = float4 (sample.%c, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_PLANAR_10 =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  float3 scaled = sample.xyz * 1023.0 / 65535.0;\n"
-    "  output.Plane_0 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_1 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_2 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_PLANAR_12 =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  float3 scaled = sample.xyz * 4095.0 / 65535.0;\n"
-    "  output.Plane_0 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_1 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_2 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_PLANAR_4 =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  output.Plane_0 = float4 (sample.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_1 = float4 (sample.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_2 = float4 (sample.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_3 = float4 (sample.%c, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_PLANAR_4_10 =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  float4 scaled = sample * 1023.0 / 65535.0;\n"
-    "  output.Plane_0 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_1 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_2 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_3 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_OUTPUT_PLANAR_4_12 =
-    "PS_OUTPUT build_output (float4 sample)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  float4 scaled = sample * 4095.0 / 65535.0;\n"
-    "  output.Plane_0 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_1 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_2 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  output.Plane_3 = float4 (scaled.%c, 0.0, 0.0, 1.0);\n"
-    "  return output;\n"
-    "}";
-
-/* gamma and XYZ convert */
-static const gchar templ_GAMMA_DECODE_IDENTITY =
-    "float3 gamma_decode (float3 sample)\n"
-    "{\n"
-    "  return sample;\n"
-    "}";
-
-static const gchar templ_GAMMA_DECODE =
-    "float3 gamma_decode (float3 sample)\n"
-    "{\n"
-    "  float3 dec;\n"
-    "  dec.x = gammaDecLUT.Sample (samplerState, sample.x);\n"
-    "  dec.y = gammaDecLUT.Sample (samplerState, sample.y);\n"
-    "  dec.z = gammaDecLUT.Sample (samplerState, sample.z);\n"
-    "  return dec;\n"
-    "}";
-
-static const gchar templ_GAMMA_ENCODE_IDENTITY =
-    "float3 gamma_encode (float3 sample)\n"
-    "{\n"
-    "  return sample;\n"
-    "}";
-
-static const gchar templ_GAMMA_ENCODE =
-    "float3 gamma_encode (float3 sample)\n"
-    "{\n"
-    "  float3 enc;\n"
-    "  enc.x = gammaEncLUT.Sample (samplerState, sample.x);\n"
-    "  enc.y = gammaEncLUT.Sample (samplerState, sample.y);\n"
-    "  enc.z = gammaEncLUT.Sample (samplerState, sample.z);\n"
-    "  return enc;\n"
-    "}";
-
-static const gchar templ_XYZ_CONVERT_IDENTITY =
-    "float3 XYZ_convert (float3 sample)\n"
-    "{\n"
-    "  return sample;\n"
-    "}";
-
-static const gchar templ_XYZ_CONVERT =
-    "float3 XYZ_convert (float3 sample)\n"
-    "{\n"
-    "  float3 out_space;\n"
-    "  out_space.x = dot (primariesCoeff.CoeffX, sample);\n"
-    "  out_space.y = dot (primariesCoeff.CoeffY, sample);\n"
-    "  out_space.z = dot (primariesCoeff.CoeffZ, sample);\n"
-    "  return saturate (out_space);\n"
-    "}";
-
-static const gchar templ_pixel_shader =
-    "struct PSColorSpace\n"
-    "{\n"
-    "  float3 CoeffX;\n"
-    "  float3 CoeffY;\n"
-    "  float3 CoeffZ;\n"
-    "  float3 Offset;\n"
-    "  float3 Min;\n"
-    "  float3 Max;\n"
-    "  float padding;\n"
-    "};\n"
-    "cbuffer PsConstBuffer : register(b0)\n"
-    "{\n"
-    /* RGB <-> YUV conversion */
-    "  PSColorSpace toRGBCoeff;\n"
-    "  PSColorSpace toYUVCoeff;\n"
-    "  PSColorSpace primariesCoeff;\n"
-    "  float AlphaMul;\n"
-    "};\n"
-    "Texture2D shaderTexture4 : register(t0);\n"
-    "Texture1D<float> gammaDecLUT: register(t4);\n"
-    "Texture1D<float> gammaEncLUT: register(t5);\n"
-    "SamplerState samplerState : register(s0);\n"
-    "struct PS_INPUT\n"
-    "{\n"
-    "  float4 Position: SV_POSITION;\n"
-    "  float2 Texture: TEXCOORD;\n"
-    "};\n"
-    /* struct PS_OUTPUT */
-    "%s\n"
-    /* sample_texture() function */
-    "%s\n"
-    "float3 to_rgb (float3 sample, PSColorSpace coeff)\n"
-    "%s\n"
-    "float3 to_yuv (float3 sample, PSColorSpace coeff)\n"
-    "%s\n"
-    /* build_output() function */
-    "%s\n"
-    /* gamma_decode() function */
-    "%s\n"
-    /* gamma_encode() function */
-    "%s\n"
-    /* XYZ_convert() function */
-    "%s\n"
-    "PS_OUTPUT main(PS_INPUT input)\n"
-    "{\n"
-    "  float4 sample;\n"
-    "  sample = sample_texture (input.Texture);\n"
-    "  sample.a = saturate (sample.a * AlphaMul);\n"
-    "  sample.xyz = to_rgb (sample.xyz, toRGBCoeff);\n"
-    "  sample.xyz = gamma_decode (sample.xyz);\n"
-    "  sample.xyz = XYZ_convert (sample.xyz);\n"
-    "  sample.xyz = gamma_encode (sample.xyz);\n"
-    "  sample.xyz = to_yuv (sample.xyz, toYUVCoeff);\n"
-    "  return build_output (sample);\n"
-    "}\n";
-
-static const gchar templ_vertex_shader =
-    "struct VS_INPUT\n"
-    "{\n"
-    "  float4 Position : POSITION;\n"
-    "  float2 Texture : TEXCOORD;\n"
-    "};\n"
-    "\n"
-    "struct VS_OUTPUT\n"
-    "{\n"
-    "  float4 Position: SV_POSITION;\n"
-    "  float2 Texture: TEXCOORD;\n"
-    "};\n"
-    "\n"
-    "VS_OUTPUT main(VS_INPUT input)\n"
-    "{\n"
-    "  return input;\n"
-    "}\n";
+static const XMFLOAT4X4A g_matrix_identity = XMFLOAT4X4A (
+    1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 1.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_90r = XMFLOAT4X4A (
+    0.0f, -1.0f, 0.0f, 0.0f,
+    1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_180 = XMFLOAT4X4A (
+    -1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, -1.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_90l = XMFLOAT4X4A (
+    0.0f, 1.0f, 0.0f, 0.0f,
+    -1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_horiz = XMFLOAT4X4A (
+    -1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 1.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_vert = XMFLOAT4X4A (
+    1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, -1.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_ul_lr = XMFLOAT4X4A (
+    0.0f, -1.0f, 0.0f, 0.0f,
+    -1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_ur_ll = XMFLOAT4X4A (
+    0.0f, 1.0f, 0.0f, 0.0f,
+    1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
 /* *INDENT-ON* */
 
-typedef struct
-{
-  const PSOutputType *ps_outputCONVERTER_MAX_QUADS;
-  gchar *sample_texture_funcCONVERTER_MAX_QUADS;
-  const gchar *to_rgb_funcCONVERTER_MAX_QUADS;
-  const gchar *to_yuv_funcCONVERTER_MAX_QUADS;
-  gchar *build_output_funcCONVERTER_MAX_QUADS;
-  const gchar *gamma_decode_func;
-  const gchar *gamma_encode_func;
-  const gchar *XYZ_convert_func;
-} ConvertInfo;
-
 enum
 {
   PROP_0,
@@ -642,123 +261,155 @@
 
 struct _GstD3D11ConverterPrivate
 {
+  _GstD3D11ConverterPrivate ()
+  {
+    custom_transform = g_matrix_identity;
+  }
+
+   ~_GstD3D11ConverterPrivate ()
+  {
+    g_free (in_mdcv_str);
+    g_free (out_mdcv_str);
+    g_free (in_cll_str);
+    g_free (out_cll_str);
+
+    if (preproc)
+      gst_d3d11_converter_helper_free (preproc);
+
+    if (postproc)
+      gst_d3d11_converter_helper_free (postproc);
+
+    gst_clear_buffer (&postproc_buf);
+    gst_clear_buffer (&piv_inbuf);
+  }
+
   GstVideoInfo in_info;
   GstVideoInfo out_info;
 
   GstD3D11Format in_d3d11_format;
   GstD3D11Format out_d3d11_format;
 
-  guint num_input_view;
-  guint num_output_view;
+  guint num_input_view = 0;
+  guint num_output_view = 0;
 
-  GstD3D11ConverterBackend supported_backend;
+  GstD3D11ConverterBackend supported_backend = (GstD3D11ConverterBackend) 0;
+  CONVERT_TYPE convert_type = CONVERT_TYPE::IDENTITY;
 
-  ID3D11Buffer *vertex_buffer;
-  ID3D11Buffer *index_buffer;
-  ID3D11Buffer *const_buffer;
-  ID3D11VertexShader *vs;
-  ID3D11InputLayout *layout;
-  ID3D11SamplerState *linear_sampler;
-  ID3D11PixelShader *psCONVERTER_MAX_QUADS;
+  ComPtr < ID3D11Buffer > vertex_buffer;
+  ComPtr < ID3D11Buffer > index_buffer;
+  ComPtr < ID3D11Buffer > const_buffer;
+  ComPtr < ID3D11Buffer > vs_const_buffer;
+  ComPtr < ID3D11VertexShader > vs;
+  ComPtr < ID3D11InputLayout > layout;
+  ComPtr < ID3D11SamplerState > sampler;
+  ComPtr < ID3D11SamplerState > linear_sampler;
+  ComPtr < ID3D11RasterizerState > rasterizer;
+  ComPtr < ID3D11RasterizerState > msaa_rasterizer;
+  PixelShaderList ps;
   D3D11_VIEWPORT viewportGST_VIDEO_MAX_PLANES;
 
-  ID3D11Texture1D *gamma_dec_lut;
-  ID3D11Texture1D *gamma_enc_lut;
-  ID3D11ShaderResourceView *gamma_dec_srv;
-  ID3D11ShaderResourceView *gamma_enc_srv;
+  ComPtr < ID3D11Texture1D > gamma_dec_lut;
+  ComPtr < ID3D11Texture1D > gamma_enc_lut;
+  ComPtr < ID3D11ShaderResourceView > gamma_dec_srv;
+  ComPtr < ID3D11ShaderResourceView > gamma_enc_srv;
 
   D3D11_BLEND_DESC blend_desc;
-  ID3D11BlendState *blend;
-
-  gboolean fast_path;
-  gboolean do_primaries;
+  ComPtr < ID3D11BlendState > blend;
 
   gint input_texture_width;
   gint input_texture_height;
-  gboolean update_src_rect;
-  gboolean update_dest_rect;
-  gboolean update_alpha;
+  gboolean update_src_rect = FALSE;
+  gboolean update_dest_rect = FALSE;
+  gboolean update_alpha = FALSE;
+  gboolean update_transform = FALSE;
+  XMFLOAT4X4A custom_transform;
 
-  ConvertInfo convert_info;
   PSConstBuffer const_data;
 
-  gboolean clear_background;
+  gboolean clear_background = FALSE;
   FLOAT clear_color44;
   GstD3D11ColorMatrix clear_color_matrix;
 
-  GstVideoConverter *unpack_convert;
+  GstVideoInfo preproc_info;
+  gboolean need_preproc = FALSE;
+
+  GstVideoInfo postproc_info;
+  gboolean need_postproc = FALSE;
+
+  GstD3D11ConverterHelper *preproc = nullptr;
+  GstD3D11ConverterHelper *postproc = nullptr;
+  GstBuffer *postproc_buf = nullptr;
 
   /* video processor */
   D3D11_VIDEO_COLOR background_color;
-  ID3D11VideoDevice *video_device;
-  ID3D11VideoContext2 *video_context2;
-  ID3D11VideoContext1 *video_context;
-  ID3D11VideoProcessorEnumerator1 *enumerator;
-  ID3D11VideoProcessor *processor;
+  ComPtr < ID3D11VideoDevice > video_device;
+  ComPtr < ID3D11VideoContext2 > video_context2;
+  ComPtr < ID3D11VideoContext1 > video_context;
+  ComPtr < ID3D11VideoProcessorEnumerator1 > enumerator;
+  ComPtr < ID3D11VideoProcessor > processor;
   D3D11_VIDEO_PROCESSOR_CAPS processor_caps;
   RECT src_rect;
   RECT dest_rect;
   RECT dest_full_rect;
-  gboolean processor_in_use;
-  gboolean processor_direction_not_supported;
-  gboolean enable_mirror;
-  gboolean flip_h;
-  gboolean flip_v;
-  gboolean enable_rotation;
-  D3D11_VIDEO_PROCESSOR_ROTATION rotation;
+  gboolean processor_in_use = FALSE;
+  gboolean processor_direction_not_supported = FALSE;
+  gboolean enable_mirror = FALSE;
+  gboolean flip_h = FALSE;
+  gboolean flip_v = FALSE;
+  gboolean enable_rotation = FALSE;
+  D3D11_VIDEO_PROCESSOR_ROTATION rotation =
+      D3D11_VIDEO_PROCESSOR_ROTATION_IDENTITY;
 
   /* HDR10 */
-  gboolean have_in_hdr10;
-  gboolean have_out_hdr10;
-  gboolean in_hdr10_updated;
-  gboolean out_hdr10_updated;
+  gboolean have_in_hdr10 = FALSE;
+  gboolean have_out_hdr10 = FALSE;
+  gboolean in_hdr10_updated = FALSE;
+  gboolean out_hdr10_updated = FALSE;
   DXGI_HDR_METADATA_HDR10 in_hdr10_meta;
   DXGI_HDR_METADATA_HDR10 out_hdr10_meta;
-  gchar *in_mdcv_str;
-  gchar *out_mdcv_str;
-  gchar *in_cll_str;
-  gchar *out_cll_str;
-
-  /* Fallback buffer and info, for shader */
-  GstVideoInfo fallback_info;
-  GstBuffer *fallback_inbuf;
+  gchar *in_mdcv_str = nullptr;
+  gchar *out_mdcv_str = nullptr;
+  gchar *in_cll_str = nullptr;
+  gchar *out_cll_str = nullptr;
 
   /* Fallback buffer used for processor */
   GstVideoInfo piv_info;
-  GstBuffer *piv_inbuf;
+  GstBuffer *piv_inbuf = nullptr;
 
   GstVideoOrientationMethod video_direction;
 
-  SRWLOCK prop_lock;
+  std::mutex prop_lock;
 
   /* properties */
-  gint src_x;
-  gint src_y;
-  gint src_width;
-  gint src_height;
-  gint dest_x;
-  gint dest_y;
-  gint dest_width;
-  gint dest_height;
-  gdouble alpha;
+  gint src_x = 0;
+  gint src_y = 0;
+  gint src_width = 0;
+  gint src_height = 0;
+  gint dest_x = 0;
+  gint dest_y = 0;
+  gint dest_width = 0;
+  gint dest_height = 0;
+  gdouble alpha = 0;
   gfloat blend_factor4;
-  guint blend_sample_mask;
-  gboolean fill_border;
-  guint64 border_color;
+  guint blend_sample_mask = 0;
+  gboolean fill_border = FALSE;
+  guint64 border_color = 0;
+  GstD3D11ConverterAlphaMode src_alpha_mode =
+      GST_D3D11_CONVERTER_ALPHA_MODE_UNSPECIFIED;
+  GstD3D11ConverterAlphaMode dst_alpha_mode =
+      GST_D3D11_CONVERTER_ALPHA_MODE_UNSPECIFIED;
 };
 
 static void gst_d3d11_converter_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_d3d11_converter_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-static void gst_d3d11_converter_dispose (GObject * object);
 static void gst_d3d11_converter_finalize (GObject * object);
 static void
 gst_d3d11_converter_calculate_border_color (GstD3D11Converter * self);
 
 #define gst_d3d11_converter_parent_class parent_class
-G_DEFINE_TYPE_WITH_PRIVATE (GstD3D11Converter, gst_d3d11_converter,
-    GST_TYPE_OBJECT);
+G_DEFINE_TYPE (GstD3D11Converter, gst_d3d11_converter, GST_TYPE_OBJECT);
 
 static void
 gst_d3d11_converter_class_init (GstD3D11ConverterClass * klass)
@@ -769,7 +420,6 @@
 
   object_class->set_property = gst_d3d11_converter_set_property;
   object_class->get_property = gst_d3d11_converter_get_property;
-  object_class->dispose = gst_d3d11_converter_dispose;
   object_class->finalize = gst_d3d11_converter_finalize;
 
   g_object_class_install_property (object_class, PROP_SRC_X,
@@ -863,61 +513,18 @@
 static void
 gst_d3d11_converter_init (GstD3D11Converter * self)
 {
-  self->priv = (GstD3D11ConverterPrivate *)
-      gst_d3d11_converter_get_instance_private (self);
-}
-
-static void
-gst_d3d11_converter_dispose (GObject * object)
-{
-  GstD3D11Converter *self = GST_D3D11_CONVERTER (object);
-  GstD3D11ConverterPrivate *priv = self->priv;
-
-  GST_D3D11_CLEAR_COM (priv->vertex_buffer);
-  GST_D3D11_CLEAR_COM (priv->index_buffer);
-  GST_D3D11_CLEAR_COM (priv->const_buffer);
-  GST_D3D11_CLEAR_COM (priv->vs);
-  GST_D3D11_CLEAR_COM (priv->layout);
-  GST_D3D11_CLEAR_COM (priv->linear_sampler);
-  GST_D3D11_CLEAR_COM (priv->gamma_dec_lut);
-  GST_D3D11_CLEAR_COM (priv->gamma_dec_srv);
-  GST_D3D11_CLEAR_COM (priv->gamma_enc_lut);
-  GST_D3D11_CLEAR_COM (priv->gamma_enc_srv);
-  GST_D3D11_CLEAR_COM (priv->video_device);
-  GST_D3D11_CLEAR_COM (priv->video_context2);
-  GST_D3D11_CLEAR_COM (priv->video_context);
-  GST_D3D11_CLEAR_COM (priv->enumerator);
-  GST_D3D11_CLEAR_COM (priv->processor);
-  GST_D3D11_CLEAR_COM (priv->blend);
-
-  for (guint i = 0; i < CONVERTER_MAX_QUADS; i++)
-    GST_D3D11_CLEAR_COM (priv->psi);
-
-  gst_clear_buffer (&priv->fallback_inbuf);
-  gst_clear_buffer (&priv->piv_inbuf);
-  gst_clear_object (&self->device);
-
-  G_OBJECT_CLASS (parent_class)->dispose (object);
+  self->priv = new GstD3D11ConverterPrivate ();
 }
 
 static void
 gst_d3d11_converter_finalize (GObject * object)
 {
   GstD3D11Converter *self = GST_D3D11_CONVERTER (object);
-  GstD3D11ConverterPrivate *priv = self->priv;
 
-  for (guint i = 0; i < CONVERTER_MAX_QUADS; i++) {
-    g_free (priv->convert_info.sample_texture_funci);
-    g_free (priv->convert_info.build_output_funci);
-  }
-
-  g_free (priv->in_mdcv_str);
-  g_free (priv->out_mdcv_str);
-  g_free (priv->in_cll_str);
-  g_free (priv->out_cll_str);
+  delete self->priv;
 
-  if (priv->unpack_convert)
-    gst_video_converter_free (priv->unpack_convert);
+  if (self->device)
+    gst_object_unref (self->device);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -971,7 +578,7 @@
   GstD3D11Converter *self = GST_D3D11_CONVERTER (object);
   GstD3D11ConverterPrivate *priv = self->priv;
 
-  GstD3D11SRWLockGuard (&priv->prop_lock);
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
   switch (prop_id) {
     case PROP_SRC_X:
       update_src_rect (self, &priv->src_x, value);
@@ -1004,12 +611,10 @@
     case PROP_BLEND_STATE:{
       ID3D11BlendState *blend =
           (ID3D11BlendState *) g_value_get_pointer (value);
-      GST_D3D11_CLEAR_COM (priv->blend);
+      priv->blend = nullptr;
       priv->blend = blend;
-      if (priv->blend) {
-        priv->blend->AddRef ();
+      if (priv->blend)
         priv->blend->GetDesc (&priv->blend_desc);
-      }
       break;
     }
     case PROP_BLEND_FACTOR_RED:
@@ -1070,7 +675,7 @@
           (GstVideoOrientationMethod) g_value_get_enum (value);
       if (video_direction != priv->video_direction) {
         priv->video_direction = video_direction;
-        priv->update_src_rect = TRUE;
+        priv->update_transform = TRUE;
       }
       break;
     }
@@ -1087,7 +692,7 @@
   GstD3D11Converter *self = GST_D3D11_CONVERTER (object);
   GstD3D11ConverterPrivate *priv = self->priv;
 
-  GstD3D11SRWLockGuard (&priv->prop_lock);
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
   switch (prop_id) {
     case PROP_SRC_X:
       g_value_set_int (value, priv->src_x);
@@ -1117,7 +722,7 @@
       g_value_set_double (value, priv->alpha);
       break;
     case PROP_BLEND_STATE:
-      g_value_set_pointer (value, priv->blend);
+      g_value_set_pointer (value, priv->blend.Get ());
       break;
     case PROP_BLEND_FACTOR_RED:
       g_value_set_float (value, priv->blend_factor0);
@@ -1162,304 +767,124 @@
 }
 
 static gboolean
-get_packed_yuv_components (GstVideoFormat format, gchar * y, gchar * u,
-    gchar * v)
-{
-  switch (format) {
-    case GST_VIDEO_FORMAT_Y410:
-      *y = 'g';
-      *u = 'r';
-      *v = 'b';
-      break;
-    default:
-      g_assert_not_reached ();
-      return FALSE;
-  }
-
-  return TRUE;
-}
-
-static void
-get_planar_component (GstVideoFormat format, gchar * x, gchar * y, gchar * z,
-    gchar * w, guint * scale)
-{
-  if (scale) {
-    switch (format) {
-      case GST_VIDEO_FORMAT_I420_10LE:
-      case GST_VIDEO_FORMAT_I422_10LE:
-      case GST_VIDEO_FORMAT_Y444_10LE:
-      case GST_VIDEO_FORMAT_GBR_10LE:
-      case GST_VIDEO_FORMAT_GBRA_10LE:
-        *scale = (1 << 6);
-        break;
-      case GST_VIDEO_FORMAT_I420_12LE:
-      case GST_VIDEO_FORMAT_I422_12LE:
-      case GST_VIDEO_FORMAT_Y444_12LE:
-      case GST_VIDEO_FORMAT_GBR_12LE:
-      case GST_VIDEO_FORMAT_GBRA_12LE:
-        *scale = (1 << 4);
-        break;
-      default:
-        *scale = 1;
-        break;
-    }
-  }
-
-  switch (format) {
-    case GST_VIDEO_FORMAT_RGBP:
-      *x = 'x';
-      *y = 'y';
-      *z = 'z';
-      break;
-    case GST_VIDEO_FORMAT_BGRP:
-      *x = 'z';
-      *y = 'y';
-      *z = 'x';
-      break;
-    case GST_VIDEO_FORMAT_GBR:
-    case GST_VIDEO_FORMAT_GBR_10LE:
-    case GST_VIDEO_FORMAT_GBR_12LE:
-      *x = 'y';
-      *y = 'z';
-      *z = 'x';
-      break;
-    case GST_VIDEO_FORMAT_GBRA:
-    case GST_VIDEO_FORMAT_GBRA_10LE:
-    case GST_VIDEO_FORMAT_GBRA_12LE:
-      *x = 'y';
-      *y = 'z';
-      *z = 'x';
-      *w = 'w';
-      break;
-    case GST_VIDEO_FORMAT_YV12:
-      *x = 'x';
-      *y = 'z';
-      *z = 'y';
-      break;
-    default:
-      *x = 'x';
-      *y = 'y';
-      *z = 'z';
-      break;
-  }
-}
-
-static void
-get_semi_planar_component (GstVideoFormat format, gchar * u, gchar * v,
-    gboolean is_sampling)
-{
-  if (format == GST_VIDEO_FORMAT_NV21) {
-    if (is_sampling) {
-      *u = 'y';
-      *v = 'x';
-    } else {
-      *u = 'z';
-      *v = 'y';
-    }
-  } else {
-    if (is_sampling) {
-      *u = 'x';
-      *v = 'y';
-    } else {
-      *u = 'y';
-      *v = 'z';
-    }
-  }
-}
-
-static void
-get_vuya_component (GstVideoFormat format, gchar * y, gchar * u,
-    gchar * v, gchar * a)
-{
-  switch (format) {
-    case GST_VIDEO_FORMAT_VUYA:
-      if (y)
-        *y = 'z';
-      if (u)
-        *u = 'y';
-      if (v)
-        *v = 'x';
-      if (a)
-        *a = 'w';
-      break;
-    case GST_VIDEO_FORMAT_AYUV:
-    case GST_VIDEO_FORMAT_AYUV64:
-      if (y)
-        *y = 'g';
-      if (u)
-        *u = 'b';
-      if (v)
-        *v = 'a';
-      if (a)
-        *a = 'r';
-      break;
-    default:
-      g_assert_not_reached ();
-      break;
-  }
-}
-
-static gboolean
 gst_d3d11_color_convert_setup_shader (GstD3D11Converter * self,
-    const GstVideoInfo * in_info, const GstVideoInfo * out_info)
+    const GstVideoInfo * in_info, const GstVideoInfo * out_info,
+    D3D11_FILTER sampler_filter)
 {
   GstD3D11ConverterPrivate *priv = self->priv;
   GstD3D11Device *device = self->device;
   HRESULT hr;
-  D3D11_SAMPLER_DESC sampler_desc;
-  D3D11_INPUT_ELEMENT_DESC input_desc2;
   D3D11_BUFFER_DESC buffer_desc;
-  D3D11_MAPPED_SUBRESOURCE map;
-  VertexData *vertex_data;
-  WORD *indices;
+  VertexData vertex_data4;
+  const WORD indices6 = { 0, 1, 2, 3, 0, 2 };
   ID3D11Device *device_handle;
-  ID3D11DeviceContext *context_handle;
-  ConvertInfo *cinfo = &priv->convert_info;
-  ComPtr < ID3D11PixelShader > psCONVERTER_MAX_QUADS;
   ComPtr < ID3D11VertexShader > vs;
   ComPtr < ID3D11InputLayout > layout;
+  ComPtr < ID3D11SamplerState > sampler;
   ComPtr < ID3D11SamplerState > linear_sampler;
   ComPtr < ID3D11Buffer > const_buffer;
+  ComPtr < ID3D11Buffer > vs_const_buffer;
   ComPtr < ID3D11Buffer > vertex_buffer;
   ComPtr < ID3D11Buffer > index_buffer;
-  gint i;
+  ComPtr < ID3D11RasterizerState > rasterizer;
+  ComPtr < ID3D11RasterizerState > msaa_rasterizer;
+  D3D11_SUBRESOURCE_DATA subresource;
 
-  memset (&sampler_desc, 0, sizeof (sampler_desc));
-  memset (input_desc, 0, sizeof (input_desc));
+  memset (&subresource, 0, sizeof (subresource));
   memset (&buffer_desc, 0, sizeof (buffer_desc));
 
   device_handle = gst_d3d11_device_get_device_handle (device);
-  context_handle = gst_d3d11_device_get_device_context_handle (device);
 
-  /* bilinear filtering */
-  sampler_desc.Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;
-  sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
-  sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
-  sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
-  sampler_desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
-  sampler_desc.MinLOD = 0;
-  sampler_desc.MaxLOD = D3D11_FLOAT32_MAX;
-
-  hr = device_handle->CreateSamplerState (&sampler_desc, &linear_sampler);
+  hr = gst_d3d11_device_get_sampler (device, sampler_filter, &sampler);
   if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self,
-        "Couldn't create samplerState state, hr: 0x%x", (guint) hr);
-    return FALSE;
-  }
-
-  for (i = 0; i < CONVERTER_MAX_QUADS; i++) {
-    gchar *shader_code = nullptr;
-
-    if (cinfo->sample_texture_funci) {
-      g_assert (cinfo->ps_outputi != nullptr);
-
-      shader_code = g_strdup_printf (templ_pixel_shader,
-          cinfo->ps_outputi->output_template, cinfo->sample_texture_funci,
-          cinfo->to_rgb_funci, cinfo->to_yuv_funci,
-          cinfo->build_output_funci, cinfo->gamma_decode_func,
-          cinfo->gamma_encode_func, cinfo->XYZ_convert_func);
+    GST_WARNING_OBJECT (self, "Trying again with linear sampler");
 
-      hr = gst_d3d11_create_pixel_shader_simple (device,
-          shader_code, "main", &psi);
-      g_free (shader_code);
-      if (!gst_d3d11_result (hr, device)) {
-        return FALSE;
-      }
+    hr = gst_d3d11_device_get_sampler (device, D3D11_FILTER_MIN_MAG_MIP_LINEAR,
+        &sampler);
+    if (!gst_d3d11_result (hr, device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create sampler, hr: 0x%x", (guint) hr);
+      return FALSE;
     }
   }
 
-  input_desc0.SemanticName = "POSITION";
-  input_desc0.SemanticIndex = 0;
-  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
-  input_desc0.InputSlot = 0;
-  input_desc0.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-  input_desc0.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-  input_desc0.InstanceDataStepRate = 0;
-
-  input_desc1.SemanticName = "TEXCOORD";
-  input_desc1.SemanticIndex = 0;
-  input_desc1.Format = DXGI_FORMAT_R32G32_FLOAT;
-  input_desc1.InputSlot = 0;
-  input_desc1.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-  input_desc1.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-  input_desc1.InstanceDataStepRate = 0;
-
-  hr = gst_d3d11_create_vertex_shader_simple (device, templ_vertex_shader,
-      "main", input_desc, G_N_ELEMENTS (input_desc), &vs, &layout);
+  hr = gst_d3d11_device_get_sampler (device, D3D11_FILTER_MIN_MAG_MIP_LINEAR,
+      &linear_sampler);
   if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self, "Couldn't vertex pixel shader");
+    GST_ERROR_OBJECT (self,
+        "Couldn't create linear sampler, hr: 0x%x", (guint) hr);
     return FALSE;
   }
 
-  /* const buffer */
-  G_STATIC_ASSERT (sizeof (PSConstBuffer) % 16 == 0);
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (PSConstBuffer);
-  buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &const_buffer);
-  if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self,
-        "Couldn't create constant buffer, hr: 0x%x", (guint) hr);
+  auto ps_list = gst_d3d11_get_converter_pixel_shader (device,
+      GST_VIDEO_INFO_FORMAT (in_info), GST_VIDEO_INFO_FORMAT (out_info),
+      priv->src_alpha_mode == GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED,
+      priv->dst_alpha_mode == GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED,
+      priv->convert_type);
+  if (ps_list.empty ()) {
+    GST_ERROR_OBJECT (self, "Couldn't create pixel shader");
     return FALSE;
   }
 
-  /* setup vertext buffer and index buffer */
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (VertexData) * 4;
-  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &vertex_buffer);
+  hr = gst_d3d11_get_converter_vertex_shader (device, &vs, &layout);
   if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self,
-        "Couldn't create vertex buffer, hr: 0x%x", (guint) hr);
+    GST_ERROR_OBJECT (self, "Couldn't create vertex shader");
     return FALSE;
   }
 
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (WORD) * 6;
-  buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &index_buffer);
+  hr = gst_d3d11_device_get_rasterizer (device, &rasterizer);
   if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR ("Couldn't create index buffer, hr: 0x%x", (guint) hr);
+    GST_ERROR_OBJECT (self, "Couldn't create rasterizer state");
     return FALSE;
   }
 
-  GstD3D11DeviceLockGuard lk (device);
-  hr = context_handle->Map (const_buffer.Get (), 0, D3D11_MAP_WRITE_DISCARD, 0,
-      &map);
+  hr = gst_d3d11_device_get_rasterizer_msaa (device, &msaa_rasterizer);
   if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self,
-        "Couldn't map constant buffer, hr: 0x%x", (guint) hr);
+    GST_ERROR_OBJECT (self, "Couldn't create rasterizer state");
     return FALSE;
   }
 
-  memcpy (map.pData, &priv->const_data, sizeof (PSConstBuffer));
-  context_handle->Unmap (const_buffer.Get (), 0);
-
-  hr = context_handle->Map (vertex_buffer.Get (), 0, D3D11_MAP_WRITE_DISCARD, 0,
-      &map);
   if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self, "Couldn't map vertex buffer, hr: 0x%x", (guint) hr);
+    GST_ERROR_OBJECT (self, "Couldn't create MSAA rasterizer state");
     return FALSE;
   }
 
-  vertex_data = (VertexData *) map.pData;
+  /* const buffer */
+  if (priv->convert_type != CONVERT_TYPE::IDENTITY ||
+      GST_VIDEO_INFO_HAS_ALPHA (out_info)) {
+    G_STATIC_ASSERT (sizeof (PSConstBuffer) % 16 == 0);
+    buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+    buffer_desc.ByteWidth = sizeof (PSConstBuffer);
+    buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
+    buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+
+    subresource.pSysMem = &priv->const_data;
+    subresource.SysMemPitch = sizeof (PSConstBuffer);
+
+    hr = device_handle->CreateBuffer (&buffer_desc, &subresource,
+        &const_buffer);
+    if (!gst_d3d11_result (hr, device)) {
+      GST_ERROR_OBJECT (self,
+          "Couldn't create constant buffer, hr: 0x%x", (guint) hr);
+      return FALSE;
+    }
+  }
 
-  hr = context_handle->Map (index_buffer.Get (), 0, D3D11_MAP_WRITE_DISCARD, 0,
-      &map);
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (g_matrix_identity);
+  buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+
+  subresource.pSysMem = g_matrix_identity.m;
+  subresource.SysMemPitch = sizeof (FLOAT) * 16;
+
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource,
+      &vs_const_buffer);
   if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self, "Couldn't map index buffer, hr: 0x%x", (guint) hr);
-    context_handle->Unmap (vertex_buffer.Get (), 0);
+    GST_ERROR_OBJECT (self,
+        "Couldn't create constant buffer, hr: 0x%x", (guint) hr);
     return FALSE;
   }
 
-  indices = (WORD *) map.pData;
-
   /* bottom left */
   vertex_data0.position.x = -1.0f;
   vertex_data0.position.y = -1.0f;
@@ -1488,28 +913,47 @@
   vertex_data3.texture.u = 1.0f;
   vertex_data3.texture.v = 1.0f;
 
-  /* clockwise indexing */
-  indices0 = 0;               /* bottom left */
-  indices1 = 1;               /* top left */
-  indices2 = 2;               /* top right */
-
-  indices3 = 3;               /* bottom right */
-  indices4 = 0;               /* bottom left  */
-  indices5 = 2;               /* top right */
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (VertexData) * 4;
+  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
 
-  context_handle->Unmap (vertex_buffer.Get (), 0);
-  context_handle->Unmap (index_buffer.Get (), 0);
+  subresource.pSysMem = vertex_data;
+  subresource.SysMemPitch = sizeof (VertexData) * 4;
+
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &vertex_buffer);
+  if (!gst_d3d11_result (hr, device)) {
+    GST_ERROR_OBJECT (self,
+        "Couldn't create vertex buffer, hr: 0x%x", (guint) hr);
+    return FALSE;
+  }
+
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (WORD) * 6;
+  buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+
+  subresource.pSysMem = indices;
+  subresource.SysMemPitch = sizeof (WORD) * 6;
+
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &index_buffer);
+  if (!gst_d3d11_result (hr, device)) {
+    GST_ERROR ("Couldn't create index buffer, hr: 0x%x", (guint) hr);
+    return FALSE;
+  }
 
   /* holds vertex buffer for crop rect update */
-  priv->vertex_buffer = vertex_buffer.Detach ();
-  priv->index_buffer = index_buffer.Detach ();
-  priv->const_buffer = const_buffer.Detach ();
-  priv->vs = vs.Detach ();
-  priv->layout = layout.Detach ();
-  priv->linear_sampler = linear_sampler.Detach ();
-  priv->ps0 = ps0.Detach ();
-  if (ps1)
-    priv->ps1 = ps1.Detach ();
+  priv->vertex_buffer = vertex_buffer;
+  priv->index_buffer = index_buffer;
+  priv->const_buffer = const_buffer;
+  priv->vs_const_buffer = vs_const_buffer;
+  priv->vs = vs;
+  priv->layout = layout;
+  priv->sampler = sampler;
+  priv->linear_sampler = linear_sampler;
+  priv->ps = ps_list;
+  priv->rasterizer = rasterizer;
+  priv->msaa_rasterizer = msaa_rasterizer;
 
   priv->input_texture_width = GST_VIDEO_INFO_WIDTH (in_info);
   priv->input_texture_height = GST_VIDEO_INFO_HEIGHT (in_info);
@@ -1529,175 +973,89 @@
   return TRUE;
 }
 
-static void
-gst_d3d11_converter_apply_orientation (GstD3D11Converter * self,
-    VertexData * vertex_data, gfloat l, gfloat r, gfloat t, gfloat b)
+static gboolean
+gst_d3d11_converter_apply_orientation (GstD3D11Converter * self)
 {
   GstD3D11ConverterPrivate *priv = self->priv;
-  gfloat u4, v4;
-
-  /*
-   * 1 (l, t) -- 2 (r, t)
-   *     |            |
-   * 0 (l, b) -- 3 (r, b)
-   */
-  u0 = l;
-  u1 = l;
-  u2 = r;
-  u3 = r;
-
-  v0 = b;
-  v1 = t;
-  v2 = t;
-  v3 = b;
+  ID3D11DeviceContext *context_handle;
+  const XMFLOAT4X4A *matrix = &g_matrix_identity;
+  D3D11_MAPPED_SUBRESOURCE map;
+  HRESULT hr;
 
   switch (priv->video_direction) {
     case GST_VIDEO_ORIENTATION_IDENTITY:
     case GST_VIDEO_ORIENTATION_AUTO:
-    case GST_VIDEO_ORIENTATION_CUSTOM:
     default:
       break;
+    case GST_VIDEO_ORIENTATION_CUSTOM:
+      matrix = &priv->custom_transform;
+      break;
     case GST_VIDEO_ORIENTATION_90R:
-      /*
-       * 1 (l, t) -- 2 (r, t)    1 (l, b) -- 2 (l, t)
-       *     |           |    ->      |          |
-       * 0 (l, b) -- 3 (r, b)    0 (r, b) -- 3 (r, t)
-       */
-      u0 = r;
-      u1 = l;
-      u2 = l;
-      u3 = r;
-
-      v0 = b;
-      v1 = b;
-      v2 = t;
-      v3 = t;
+      matrix = &g_matrix_90r;
       break;
     case GST_VIDEO_ORIENTATION_180:
-      /*
-       * 1 (l, t) -- 2 (r, t)    1 (r, b) -- 2 (l, b)
-       *     |           |    ->      |          |
-       * 0 (l, b) -- 3 (r, b)    0 (r, t) -- 3 (l, t)
-       */
-      u0 = r;
-      u1 = r;
-      u2 = l;
-      u3 = l;
-
-      v0 = t;
-      v1 = b;
-      v2 = b;
-      v3 = t;
+      matrix = &g_matrix_180;
       break;
     case GST_VIDEO_ORIENTATION_90L:
-      /*
-       * 1 (l, t) -- 2 (r, t)    1 (r, t) -- 2 (r, b)
-       *     |           |    ->      |          |
-       * 0 (l, b) -- 3 (r, b)    0 (l, t) -- 3 (l, b)
-       */
-      u0 = l;
-      u1 = r;
-      u2 = r;
-      u3 = l;
-
-      v0 = t;
-      v1 = t;
-      v2 = b;
-      v3 = b;
+      matrix = &g_matrix_90l;
       break;
     case GST_VIDEO_ORIENTATION_HORIZ:
-      /*
-       * 1 (l, t) -- 2 (r, t)    1 (r, t) -- 2 (l, t)
-       *     |           |    ->      |          |
-       * 0 (l, b) -- 3 (r, b)    0 (r, b) -- 3 (l, b)
-       */
-      u0 = r;
-      u1 = r;
-      u2 = l;
-      u3 = l;
-
-      v0 = b;
-      v1 = t;
-      v2 = t;
-      v3 = b;
+      matrix = &g_matrix_horiz;
       break;
     case GST_VIDEO_ORIENTATION_VERT:
-      /*
-       * 1 (l, t) -- 2 (r, t)    1 (l, b) -- 2 (r, b)
-       *     |           |    ->      |          |
-       * 0 (l, b) -- 3 (r, b)    0 (l, t) -- 3 (r, t)
-       */
-      u0 = l;
-      u1 = l;
-      u2 = r;
-      u3 = r;
-
-      v0 = t;
-      v1 = b;
-      v2 = b;
-      v3 = t;
+      matrix = &g_matrix_vert;
       break;
     case GST_VIDEO_ORIENTATION_UL_LR:
-      /*
-       * 1 (l, t) -- 2 (r, t)    1 (l, t) -- 2 (l, b)
-       *     |           |    ->      |          |
-       * 0 (l, b) -- 3 (r, b)    0 (r, t) -- 3 (r, b)
-       */
-      u0 = r;
-      u1 = l;
-      u2 = l;
-      u3 = r;
-
-      v0 = t;
-      v1 = t;
-      v2 = b;
-      v3 = b;
+      matrix = &g_matrix_ul_lr;
       break;
     case GST_VIDEO_ORIENTATION_UR_LL:
-      /*
-       * 1 (l, t) -- 2 (r, t)    1 (r, b) -- 2 (r, t)
-       *     |           |    ->      |          |
-       * 0 (l, b) -- 3 (r, b)    0 (l, b) -- 3 (l, t)
-       */
-      u0 = l;
-      u1 = r;
-      u2 = r;
-      u3 = l;
-
-      v0 = b;
-      v1 = b;
-      v2 = t;
-      v3 = t;
+      matrix = &g_matrix_ur_ll;
       break;
   }
 
-  for (guint i = 0; i < 4; i++) {
-    vertex_datai.texture.u = ui;
-    vertex_datai.texture.v = vi;
+  context_handle = gst_d3d11_device_get_device_context_handle (self->device);
+
+  hr = context_handle->Map (priv->vs_const_buffer.Get (), 0,
+      D3D11_MAP_WRITE_DISCARD, 0, &map);
+  if (!gst_d3d11_result (hr, self->device))
+    return FALSE;
+
+  memcpy (map.pData, matrix->m, sizeof (FLOAT) * 16);
+
+  context_handle->Unmap (priv->vs_const_buffer.Get (), 0);
+
+  return TRUE;
+}
+
+static void
+gst_d3d11_converter_update_clear_background (GstD3D11Converter * self)
+{
+  GstD3D11ConverterPrivate *priv = self->priv;
+  const GstVideoInfo *out_info = &priv->out_info;
+
+  if (priv->fill_border && (priv->dest_x != 0 || priv->dest_y != 0 ||
+          priv->dest_width != out_info->width ||
+          priv->dest_height != out_info->height ||
+          priv->video_direction == GST_VIDEO_ORIENTATION_CUSTOM)) {
+    GST_DEBUG_OBJECT (self, "Enable background color");
+    priv->clear_background = TRUE;
+  } else {
+    GST_DEBUG_OBJECT (self, "Disable background color");
+    priv->clear_background = FALSE;
   }
 }
 
 static gboolean
-gst_d3d11_converter_update_src_rect (GstD3D11Converter * self)
+gst_d3d11_converter_update_transform (GstD3D11Converter * self)
 {
   GstD3D11ConverterPrivate *priv = self->priv;
-  D3D11_MAPPED_SUBRESOURCE map;
-  VertexData *vertex_data;
-  ID3D11DeviceContext *context_handle;
-  HRESULT hr;
-  FLOAT u0, u1, v0, v1, off_u, off_v;
-  gint texture_width = priv->input_texture_width;
-  gint texture_height = priv->input_texture_height;
 
-  if (!priv->update_src_rect)
+  if (!priv->update_transform)
     return TRUE;
 
-  priv->update_src_rect = FALSE;
+  priv->update_transform = FALSE;
 
-  priv->src_rect.left = priv->src_x;
-  priv->src_rect.top = priv->src_y;
-  priv->src_rect.right = priv->src_x + priv->src_width;
-  priv->src_rect.bottom = priv->src_y + priv->src_height;
+  gst_d3d11_converter_update_clear_background (self);
 
   if ((priv->supported_backend & GST_D3D11_CONVERTER_BACKEND_VIDEO_PROCESSOR)) {
     priv->processor_direction_not_supported = FALSE;
@@ -1748,27 +1106,57 @@
         break;
     }
 
-    if (priv->enable_rotation &&
-        (priv->processor_caps.FeatureCaps & FEATURE_CAPS_ROTATION) == 0) {
-      GST_WARNING_OBJECT (self, "Device does not support rotation");
-      priv->processor_direction_not_supported = TRUE;
-    }
+    if (priv->video_direction != GST_VIDEO_ORIENTATION_CUSTOM) {
+      if (priv->enable_rotation &&
+          (priv->processor_caps.FeatureCaps & FEATURE_CAPS_ROTATION) == 0) {
+        GST_WARNING_OBJECT (self, "Device does not support rotation");
+        priv->processor_direction_not_supported = TRUE;
+      }
 
-    if (priv->enable_mirror &&
-        (priv->processor_caps.FeatureCaps & PROCESSOR_FEATURE_CAPS_MIRROR) ==
-        0) {
-      GST_WARNING_OBJECT (self, "Device does not support mirror");
-      priv->processor_direction_not_supported = TRUE;
+      if (priv->enable_mirror &&
+          (priv->processor_caps.FeatureCaps & PROCESSOR_FEATURE_CAPS_MIRROR) ==
+          0) {
+        GST_WARNING_OBJECT (self, "Device does not support mirror");
+        priv->processor_direction_not_supported = TRUE;
+      }
     }
   }
 
   if ((priv->supported_backend & GST_D3D11_CONVERTER_BACKEND_SHADER) == 0)
     return TRUE;
 
+  return gst_d3d11_converter_apply_orientation (self);
+}
+
+static gboolean
+gst_d3d11_converter_update_src_rect (GstD3D11Converter * self)
+{
+  GstD3D11ConverterPrivate *priv = self->priv;
+  D3D11_MAPPED_SUBRESOURCE map;
+  VertexData *vertex_data;
+  ID3D11DeviceContext *context_handle;
+  HRESULT hr;
+  FLOAT u0, u1, v0, v1, off_u, off_v;
+  gint texture_width = priv->input_texture_width;
+  gint texture_height = priv->input_texture_height;
+
+  if (!priv->update_src_rect)
+    return TRUE;
+
+  priv->update_src_rect = FALSE;
+
+  priv->src_rect.left = priv->src_x;
+  priv->src_rect.top = priv->src_y;
+  priv->src_rect.right = priv->src_x + priv->src_width;
+  priv->src_rect.bottom = priv->src_y + priv->src_height;
+
+  if ((priv->supported_backend & GST_D3D11_CONVERTER_BACKEND_SHADER) == 0)
+    return TRUE;
+
   context_handle = gst_d3d11_device_get_device_context_handle (self->device);
 
-  hr = context_handle->Map (priv->vertex_buffer, 0, D3D11_MAP_WRITE_DISCARD,
-      0, &map);
+  hr = context_handle->Map (priv->vertex_buffer.Get (),
+      0, D3D11_MAP_WRITE_DISCARD, 0, &map);
 
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self, "Couldn't map vertex buffer, hr: 0x%x", (guint) hr);
@@ -1810,25 +1198,31 @@
   vertex_data0.position.x = -1.0f;
   vertex_data0.position.y = -1.0f;
   vertex_data0.position.z = 0.0f;
+  vertex_data0.texture.u = u0;
+  vertex_data0.texture.v = v1;
 
   /* top left */
   vertex_data1.position.x = -1.0f;
   vertex_data1.position.y = 1.0f;
   vertex_data1.position.z = 0.0f;
+  vertex_data1.texture.u = u0;
+  vertex_data1.texture.v = v0;
 
   /* top right */
   vertex_data2.position.x = 1.0f;
   vertex_data2.position.y = 1.0f;
   vertex_data2.position.z = 0.0f;
+  vertex_data2.texture.u = u1;
+  vertex_data2.texture.v = v0;
 
   /* bottom right */
   vertex_data3.position.x = 1.0f;
   vertex_data3.position.y = -1.0f;
   vertex_data3.position.z = 0.0f;
+  vertex_data3.texture.u = u1;
+  vertex_data3.texture.v = v1;
 
-  gst_d3d11_converter_apply_orientation (self, vertex_data, u0, u1, v0, v1);
-
-  context_handle->Unmap (priv->vertex_buffer, 0);
+  context_handle->Unmap (priv->vertex_buffer.Get (), 0);
 
   return TRUE;
 }
@@ -1837,7 +1231,6 @@
 gst_d3d11_converter_update_dest_rect (GstD3D11Converter * self)
 {
   GstD3D11ConverterPrivate *priv = self->priv;
-  const GstVideoInfo *out_info = &priv->out_info;
 
   if (!priv->update_dest_rect)
     return TRUE;
@@ -1857,17 +1250,9 @@
       priv->viewport0.TopLeftX, priv->viewport0.TopLeftY,
       priv->viewport0.Width, priv->viewport0.Height);
 
-  if (priv->fill_border && (priv->dest_x != 0 || priv->dest_y != 0 ||
-          priv->dest_width != out_info->width ||
-          priv->dest_height != out_info->height)) {
-    GST_DEBUG_OBJECT (self, "Enable background color");
-    priv->clear_background = TRUE;
-  } else {
-    GST_DEBUG_OBJECT (self, "Disable background color");
-    priv->clear_background = FALSE;
-  }
+  gst_d3d11_converter_update_clear_background (self);
 
-  switch (GST_VIDEO_INFO_FORMAT (&priv->out_info)) {
+  switch (GST_VIDEO_INFO_FORMAT (&priv->postproc_info)) {
     case GST_VIDEO_FORMAT_NV12:
     case GST_VIDEO_FORMAT_NV21:
     case GST_VIDEO_FORMAT_P010_10LE:
@@ -1882,7 +1267,7 @@
       priv->viewport1.Width = priv->viewport0.Width / 2;
       priv->viewport1.Height = priv->viewport0.Height / 2;
 
-      for (guint i = 2; i < GST_VIDEO_INFO_N_PLANES (&priv->out_info); i++)
+      for (guint i = 2; i < GST_VIDEO_INFO_N_PLANES (&priv->postproc_info); i++)
         priv->viewporti = priv->viewport1;
 
       break;
@@ -1894,7 +1279,7 @@
       priv->viewport1.Width = priv->viewport0.Width / 2;
       priv->viewport1.Height = priv->viewport0.Height;
 
-      for (guint i = 2; i < GST_VIDEO_INFO_N_PLANES (&priv->out_info); i++)
+      for (guint i = 2; i < GST_VIDEO_INFO_N_PLANES (&priv->postproc_info); i++)
         priv->viewporti = priv->viewport1;
       break;
     case GST_VIDEO_FORMAT_Y444:
@@ -1906,10 +1291,11 @@
     case GST_VIDEO_FORMAT_GBR:
     case GST_VIDEO_FORMAT_GBR_10LE:
     case GST_VIDEO_FORMAT_GBR_12LE:
+    case GST_VIDEO_FORMAT_GBR_16LE:
     case GST_VIDEO_FORMAT_GBRA:
     case GST_VIDEO_FORMAT_GBRA_10LE:
     case GST_VIDEO_FORMAT_GBRA_12LE:
-      for (guint i = 1; i < GST_VIDEO_INFO_N_PLANES (&priv->out_info); i++)
+      for (guint i = 1; i < GST_VIDEO_INFO_N_PLANES (&priv->postproc_info); i++)
         priv->viewporti = priv->viewport0;
       break;
     default:
@@ -1925,372 +1311,6 @@
   return TRUE;
 }
 
-static gboolean
-gst_d3d11_converter_prepare_output (GstD3D11Converter * self,
-    const GstVideoInfo * info)
-{
-  GstD3D11ConverterPrivate *priv = self->priv;
-  GstVideoFormat format = GST_VIDEO_INFO_FORMAT (info);
-  ConvertInfo *cinfo = &priv->convert_info;
-
-  switch (format) {
-      /* RGB */
-    case GST_VIDEO_FORMAT_RGBA64_LE:
-    case GST_VIDEO_FORMAT_RGB10A2_LE:
-    case GST_VIDEO_FORMAT_BGRA:
-    case GST_VIDEO_FORMAT_RGBA:
-    case GST_VIDEO_FORMAT_BGRx:
-    case GST_VIDEO_FORMAT_RGBx:
-      cinfo->ps_output0 = &output_typesOUTPUT_SINGLE_PLANE;
-      cinfo->build_output_func0 = g_strdup (templ_OUTPUT_DEFAULT);
-      break;
-      /* VUYA */
-    case GST_VIDEO_FORMAT_VUYA:
-    case GST_VIDEO_FORMAT_AYUV:
-    case GST_VIDEO_FORMAT_AYUV64:{
-      gchar y, u, v, a;
-
-      get_vuya_component (format, &y, &u, &v, &a);
-      cinfo->ps_output0 = &output_typesOUTPUT_SINGLE_PLANE;
-      cinfo->build_output_func0 =
-          g_strdup_printf (templ_OUTPUT_VUYA, y, u, v, a);
-      break;
-    }
-      /* semi-planar */
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_NV21:
-    case GST_VIDEO_FORMAT_P010_10LE:
-    case GST_VIDEO_FORMAT_P012_LE:
-    case GST_VIDEO_FORMAT_P016_LE:{
-      gchar u, v;
-
-      get_semi_planar_component (format, &u, &v, FALSE);
-      cinfo->ps_output0 = &output_typesOUTPUT_SINGLE_PLANE;
-      cinfo->build_output_func0 = g_strdup (templ_OUTPUT_LUMA);
-
-      cinfo->ps_output1 = &output_typesOUTPUT_SINGLE_PLANE;
-      cinfo->build_output_func1 =
-          g_strdup_printf (templ_OUTPUT_CHROMA_SEMI_PLANAR, u, v);
-      break;
-    }
-      /* planar */
-    case GST_VIDEO_FORMAT_I420:
-    case GST_VIDEO_FORMAT_YV12:
-    case GST_VIDEO_FORMAT_Y42B:
-    {
-      gchar y, u, v, w;
-
-      get_planar_component (format, &y, &u, &v, &w, nullptr);
-
-      cinfo->ps_output0 = &output_typesOUTPUT_SINGLE_PLANE;
-      cinfo->ps_output1 = &output_typesOUTPUT_TWO_PLANES;
-
-      cinfo->build_output_func0 = g_strdup (templ_OUTPUT_LUMA);
-      cinfo->build_output_func1 =
-          g_strdup_printf (templ_OUTPUT_CHROMA_PLANAR, u, v);
-      break;
-    }
-    case GST_VIDEO_FORMAT_I420_10LE:
-    case GST_VIDEO_FORMAT_I422_10LE:
-    {
-      cinfo->ps_output0 = &output_typesOUTPUT_SINGLE_PLANE;
-      cinfo->ps_output1 = &output_typesOUTPUT_TWO_PLANES;
-
-      cinfo->build_output_func0 = g_strdup (templ_OUTPUT_LUMA_10);
-      cinfo->build_output_func1 = g_strdup (templ_OUTPUT_CHROMA_PLANAR_10);
-      break;
-    }
-    case GST_VIDEO_FORMAT_I420_12LE:
-    case GST_VIDEO_FORMAT_I422_12LE:
-    {
-      cinfo->ps_output0 = &output_typesOUTPUT_SINGLE_PLANE;
-      cinfo->ps_output1 = &output_typesOUTPUT_TWO_PLANES;
-
-      cinfo->build_output_func0 = g_strdup (templ_OUTPUT_LUMA_12);
-      cinfo->build_output_func1 = g_strdup (templ_OUTPUT_CHROMA_PLANAR_12);
-      break;
-    }
-    case GST_VIDEO_FORMAT_Y444:
-    case GST_VIDEO_FORMAT_Y444_16LE:
-    case GST_VIDEO_FORMAT_RGBP:
-    case GST_VIDEO_FORMAT_BGRP:
-    case GST_VIDEO_FORMAT_GBR:
-    {
-      gchar x, y, z, w;
-
-      get_planar_component (format, &x, &y, &z, &w, nullptr);
-
-      cinfo->ps_output0 = &output_typesOUTPUT_THREE_PLANES;
-      cinfo->build_output_func0 = g_strdup_printf (templ_OUTPUT_PLANAR,
-          x, y, z);
-      break;
-    }
-    case GST_VIDEO_FORMAT_Y444_10LE:
-    case GST_VIDEO_FORMAT_GBR_10LE:
-    {
-      gchar x, y, z, w;
-
-      get_planar_component (format, &x, &y, &z, &w, nullptr);
-
-      cinfo->ps_output0 = &output_typesOUTPUT_THREE_PLANES;
-      cinfo->build_output_func0 =
-          g_strdup_printf (templ_OUTPUT_PLANAR_10, x, y, z);
-      break;
-    }
-    case GST_VIDEO_FORMAT_Y444_12LE:
-    case GST_VIDEO_FORMAT_GBR_12LE:
-    {
-      gchar x, y, z, w;
-
-      get_planar_component (format, &x, &y, &z, &w, nullptr);
-
-      cinfo->ps_output0 = &output_typesOUTPUT_THREE_PLANES;
-      cinfo->build_output_func0 =
-          g_strdup_printf (templ_OUTPUT_PLANAR_12, x, y, z);
-      break;
-    }
-    case GST_VIDEO_FORMAT_GBRA:
-    {
-      gchar x, y, z, w;
-
-      get_planar_component (format, &x, &y, &z, &w, nullptr);
-
-      cinfo->ps_output0 = &output_typesOUTPUT_FOUR_PLANES;
-      cinfo->build_output_func0 = g_strdup_printf (templ_OUTPUT_PLANAR_4,
-          x, y, z, w);
-      break;
-    }
-    case GST_VIDEO_FORMAT_GBRA_10LE:
-    {
-      gchar x, y, z, w;
-
-      get_planar_component (format, &x, &y, &z, &w, nullptr);
-
-      cinfo->ps_output0 = &output_typesOUTPUT_FOUR_PLANES;
-      cinfo->build_output_func0 = g_strdup_printf (templ_OUTPUT_PLANAR_4_10,
-          x, y, z, w);
-      break;
-    }
-    case GST_VIDEO_FORMAT_GBRA_12LE:
-    {
-      gchar x, y, z, w;
-
-      get_planar_component (format, &x, &y, &z, &w, nullptr);
-
-      cinfo->ps_output0 = &output_typesOUTPUT_FOUR_PLANES;
-      cinfo->build_output_func0 = g_strdup_printf (templ_OUTPUT_PLANAR_4_12,
-          x, y, z, w);
-      break;
-    }
-    case GST_VIDEO_FORMAT_GRAY8:
-    case GST_VIDEO_FORMAT_GRAY16_LE:
-      cinfo->ps_output0 = &output_typesOUTPUT_SINGLE_PLANE;
-      cinfo->build_output_func0 = g_strdup (templ_OUTPUT_LUMA);
-      break;
-    default:
-      g_assert_not_reached ();
-      return FALSE;
-  }
-
-  return TRUE;
-}
-
-static gboolean
-gst_d3d11_converter_prepare_sample_texture (GstD3D11Converter * self,
-    const GstVideoInfo * in_info, const GstVideoInfo * out_info)
-{
-  GstD3D11ConverterPrivate *priv = self->priv;
-  GstVideoFormat format = GST_VIDEO_INFO_FORMAT (in_info);
-  gboolean out_rgb = GST_VIDEO_INFO_IS_RGB (out_info);
-  gboolean out_yuv = GST_VIDEO_INFO_IS_YUV (out_info);
-  gboolean out_gray = GST_VIDEO_INFO_IS_GRAY (out_info);
-  ConvertInfo *cinfo = &priv->convert_info;
-
-  switch (format) {
-      /* RGB */
-    case GST_VIDEO_FORMAT_RGBA64_LE:
-    case GST_VIDEO_FORMAT_RGB10A2_LE:
-    case GST_VIDEO_FORMAT_BGRA:
-    case GST_VIDEO_FORMAT_RGBA:
-    case GST_VIDEO_FORMAT_BGRx:
-    case GST_VIDEO_FORMAT_RGBx:
-      cinfo->sample_texture_func0 = g_strdup (templ_SAMPLE_DEFAULT);
-      if (cinfo->ps_output1)
-        cinfo->sample_texture_func1 =
-            g_strdup (cinfo->sample_texture_func0);
-      break;
-      /* VUYA */
-    case GST_VIDEO_FORMAT_VUYA:
-    case GST_VIDEO_FORMAT_AYUV:
-    case GST_VIDEO_FORMAT_AYUV64:{
-      gchar y, u, v, a;
-
-      get_vuya_component (format, &y, &u, &v, &a);
-      cinfo->sample_texture_func0 = g_strdup_printf (templ_SAMPLE_VUYA,
-          y, u, v, a);
-      if (cinfo->ps_output1) {
-        cinfo->sample_texture_func1 =
-            g_strdup (cinfo->sample_texture_func0);
-      }
-      break;
-    }
-      /* semi-planar */
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_NV21:
-    case GST_VIDEO_FORMAT_P010_10LE:
-    case GST_VIDEO_FORMAT_P012_LE:
-    case GST_VIDEO_FORMAT_P016_LE:{
-      gchar u, v;
-
-      get_semi_planar_component (format, &u, &v, TRUE);
-      if (out_rgb) {
-        cinfo->sample_texture_func0 =
-            g_strdup_printf (templ_SAMPLE_SEMI_PLANAR, u, v);
-      } else if (out_gray) {
-        cinfo->sample_texture_func0 = g_strdup (templ_SAMPLE_YUV_LUMA);
-      } else if (out_yuv) {
-        if (GST_VIDEO_INFO_N_PLANES (out_info) == 1 ||
-            cinfo->ps_output0 == &output_typesOUTPUT_THREE_PLANES) {
-          /* YUV packed or Y444 */
-          cinfo->sample_texture_func0 =
-              g_strdup_printf (templ_SAMPLE_SEMI_PLANAR, u, v);
-        } else {
-          if (priv->fast_path) {
-            cinfo->sample_texture_func0 = g_strdup (templ_SAMPLE_YUV_LUMA);
-            cinfo->sample_texture_func1 =
-                g_strdup_printf (templ_SAMPLE_SEMI_PLANAR_CHROMA, u, v);
-          } else {
-            cinfo->sample_texture_func0 =
-                g_strdup_printf (templ_SAMPLE_SEMI_PLANAR, u, v);
-            cinfo->sample_texture_func1 =
-                g_strdup (cinfo->sample_texture_func0);
-          }
-        }
-      } else {
-        g_assert_not_reached ();
-        return FALSE;
-      }
-      break;
-    }
-      /* planar */
-    case GST_VIDEO_FORMAT_I420:
-    case GST_VIDEO_FORMAT_YV12:
-    case GST_VIDEO_FORMAT_I420_10LE:
-    case GST_VIDEO_FORMAT_I420_12LE:
-    case GST_VIDEO_FORMAT_Y42B:
-    case GST_VIDEO_FORMAT_I422_10LE:
-    case GST_VIDEO_FORMAT_I422_12LE:
-    case GST_VIDEO_FORMAT_Y444:
-    case GST_VIDEO_FORMAT_Y444_10LE:
-    case GST_VIDEO_FORMAT_Y444_12LE:
-    case GST_VIDEO_FORMAT_Y444_16LE:
-    {
-      gchar x, y, z, w;
-      guint scale;
-
-      get_planar_component (format, &x, &y, &z, &w, &scale);
-      if (out_rgb) {
-        cinfo->sample_texture_func0 = g_strdup_printf (templ_SAMPLE_PLANAR,
-            x, y, z, scale);
-      } else if (out_gray) {
-        cinfo->sample_texture_func0 =
-            g_strdup_printf (templ_SAMPLE_YUV_LUMA_SCALED, scale);
-      } else if (out_yuv) {
-        if (GST_VIDEO_INFO_N_PLANES (out_info) == 1 ||
-            cinfo->ps_output0 == &output_typesOUTPUT_THREE_PLANES) {
-          /* YUV packed or Y444 */
-          cinfo->sample_texture_func0 = g_strdup_printf (templ_SAMPLE_PLANAR,
-              x, y, z, scale);
-        } else {
-          if (priv->fast_path) {
-            cinfo->sample_texture_func0 =
-                g_strdup_printf (templ_SAMPLE_YUV_LUMA_SCALED, scale);
-            cinfo->sample_texture_func1 =
-                g_strdup_printf (templ_SAMPLE_PLANAR_CHROMA, y, z, scale);
-          } else {
-            cinfo->sample_texture_func0 =
-                g_strdup_printf (templ_SAMPLE_PLANAR, x, y, z, scale);
-            cinfo->sample_texture_func1 =
-                g_strdup (cinfo->sample_texture_func0);
-          }
-        }
-      } else {
-        g_assert_not_reached ();
-        return FALSE;
-      }
-      break;
-    }
-      /* RGB planar */
-    case GST_VIDEO_FORMAT_RGBP:
-    case GST_VIDEO_FORMAT_BGRP:
-    case GST_VIDEO_FORMAT_GBR:
-    case GST_VIDEO_FORMAT_GBR_10LE:
-    case GST_VIDEO_FORMAT_GBR_12LE:
-    case GST_VIDEO_FORMAT_GBRA:
-    case GST_VIDEO_FORMAT_GBRA_10LE:
-    case GST_VIDEO_FORMAT_GBRA_12LE:
-    {
-      gchar x, y, z, w;
-      guint scale;
-
-      get_planar_component (format, &x, &y, &z, &w, &scale);
-
-      if (GST_VIDEO_INFO_N_PLANES (in_info) == 4) {
-        cinfo->sample_texture_func0 = g_strdup_printf (templ_SAMPLE_PLANAR_4,
-            x, y, z, w, scale);
-      } else {
-        cinfo->sample_texture_func0 = g_strdup_printf (templ_SAMPLE_PLANAR,
-            x, y, z, scale);
-      }
-
-      if (cinfo->ps_output1) {
-        cinfo->sample_texture_func1 =
-            g_strdup (cinfo->sample_texture_func0);
-      }
-      break;
-    }
-      /* yuv packed */
-    case GST_VIDEO_FORMAT_Y410:{
-      gchar y, u, v;
-
-      get_packed_yuv_components (format, &y, &u, &v);
-      cinfo->sample_texture_func0 = g_strdup_printf (templ_SAMPLE_YUV_PACKED,
-          y, u, v);
-      if (cinfo->ps_output1) {
-        cinfo->sample_texture_func1 =
-            g_strdup (cinfo->sample_texture_func0);
-      }
-      break;
-    }
-    case GST_VIDEO_FORMAT_GRAY8:
-    case GST_VIDEO_FORMAT_GRAY16_LE:
-      cinfo->sample_texture_func0 = g_strdup (templ_SAMPLE_GRAY);
-      if (cinfo->ps_output1)
-        cinfo->sample_texture_func1 = g_strdup (templ_SAMPLE_GRAY_CHROMA);
-      break;
-    default:
-      g_assert_not_reached ();
-      return FALSE;
-  }
-
-  return TRUE;
-}
-
-static const gchar *
-get_color_range_name (GstVideoColorRange range)
-{
-  switch (range) {
-    case GST_VIDEO_COLOR_RANGE_0_255:
-      return "FULL";
-    case GST_VIDEO_COLOR_RANGE_16_235:
-      return "STUDIO";
-    default:
-      break;
-  }
-
-  return "UNKNOWN";
-}
-
 static void
 convert_info_gray_to_yuv (const GstVideoInfo * gray, GstVideoInfo * yuv)
 {
@@ -2328,427 +1348,174 @@
   *yuv = tmp;
 }
 
-static void
-convert_info_gray_to_rgb (const GstVideoInfo * gray, GstVideoInfo * rgb)
-{
-  GstVideoInfo tmp;
-
-  if (GST_VIDEO_INFO_IS_RGB (gray)) {
-    *rgb = *gray;
-    return;
-  }
-
-  if (gray->finfo->depth0 == 8) {
-    gst_video_info_set_format (&tmp,
-        GST_VIDEO_FORMAT_RGBA, gray->width, gray->height);
-  } else {
-    gst_video_info_set_format (&tmp,
-        GST_VIDEO_FORMAT_RGBA64_LE, gray->width, gray->height);
-  }
-
-  tmp.colorimetry.range = gray->colorimetry.range;
-  if (tmp.colorimetry.range == GST_VIDEO_COLOR_RANGE_UNKNOWN)
-    tmp.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
-
-  tmp.colorimetry.primaries = gray->colorimetry.primaries;
-  if (tmp.colorimetry.primaries == GST_VIDEO_COLOR_PRIMARIES_UNKNOWN)
-    tmp.colorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_BT709;
-
-  tmp.colorimetry.transfer = gray->colorimetry.transfer;
-  if (tmp.colorimetry.transfer == GST_VIDEO_TRANSFER_UNKNOWN)
-    tmp.colorimetry.transfer = GST_VIDEO_TRANSFER_BT709;
-
-  *rgb = tmp;
-}
-
 static gboolean
-gst_d3d11_converter_prepare_colorspace_fast (GstD3D11Converter * self,
+gst_d3d11_converter_calculate_matrix (GstD3D11Converter * self,
     const GstVideoInfo * in_info, const GstVideoInfo * out_info)
 {
   GstD3D11ConverterPrivate *priv = self->priv;
-  const GstVideoColorimetry *in_color = &in_info->colorimetry;
-  const GstVideoColorimetry *out_color = &out_info->colorimetry;
-  ConvertInfo *cinfo = &priv->convert_info;
-  PSColorSpace *to_rgb_buf = &priv->const_data.to_rgb_buf;
-  PSColorSpace *to_yuv_buf = &priv->const_data.to_yuv_buf;
-  GstD3D11ColorMatrix to_rgb_matrix;
-  GstD3D11ColorMatrix to_yuv_matrix;
-  gchar *matrix_dump;
-
-  memset (&to_rgb_matrix, 0, sizeof (GstD3D11ColorMatrix));
-  memset (&to_yuv_matrix, 0, sizeof (GstD3D11ColorMatrix));
-
-  for (guint i = 0; i < 2; i++) {
-    cinfo->to_rgb_funci = templ_COLOR_SPACE_IDENTITY;
-    cinfo->to_yuv_funci = templ_COLOR_SPACE_IDENTITY;
-  }
-
-  cinfo->gamma_decode_func = templ_GAMMA_DECODE_IDENTITY;
-  cinfo->gamma_encode_func = templ_GAMMA_ENCODE_IDENTITY;
-  cinfo->XYZ_convert_func = templ_XYZ_CONVERT_IDENTITY;
-
-  if (GST_VIDEO_INFO_IS_RGB (in_info)) {
-    if (GST_VIDEO_INFO_IS_RGB (out_info)) {
-      if (in_color->range == out_color->range) {
-        GST_DEBUG_OBJECT (self, "RGB -> RGB without colorspace conversion");
-      } else {
-        if (!gst_d3d11_color_range_adjust_matrix_unorm (in_info, out_info,
-                &to_rgb_matrix)) {
-          GST_ERROR_OBJECT (self, "Failed to get RGB range adjust matrix");
-          return FALSE;
-        }
-
-        matrix_dump = gst_d3d11_dump_color_matrix (&to_rgb_matrix);
-        GST_DEBUG_OBJECT (self, "RGB range adjust %s -> %s\n%s",
-            get_color_range_name (in_color->range),
-            get_color_range_name (out_color->range), matrix_dump);
-        g_free (matrix_dump);
-
-        cinfo->to_rgb_func0 = templ_COLOR_SPACE_CONVERT;
-      }
-    } else {
-      GstVideoInfo yuv_info;
-
-      convert_info_gray_to_yuv (out_info, &yuv_info);
-
-      if (yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN ||
-          yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_RGB) {
-        GST_WARNING_OBJECT (self, "Invalid matrix is detected");
-        yuv_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
-      }
-
-      if (!gst_d3d11_rgb_to_yuv_matrix_unorm (in_info,
-              &yuv_info, &to_yuv_matrix)) {
-        GST_ERROR_OBJECT (self, "Failed to get RGB -> YUV transform matrix");
-        return FALSE;
-      }
-
-      matrix_dump = gst_d3d11_dump_color_matrix (&to_yuv_matrix);
-      GST_DEBUG_OBJECT (self, "RGB -> YUV matrix:\n%s", matrix_dump);
-      g_free (matrix_dump);
-
-      if (GST_VIDEO_INFO_IS_GRAY (out_info)) {
-        cinfo->to_yuv_func0 = templ_COLOR_SPACE_CONVERT_LUMA;
-      } else if (GST_VIDEO_INFO_N_PLANES (out_info) == 1 ||
-          cinfo->ps_output0 == &output_typesOUTPUT_THREE_PLANES) {
-        /* YUV packed or Y444 */
-        cinfo->to_yuv_func0 = templ_COLOR_SPACE_CONVERT;
+  GstD3D11ColorMatrix pre_coeff;
+  GstD3D11ColorMatrix post_coeff;
+  GstD3D11ColorMatrix primaries_coeff;
+  GstVideoInfo rgb_info;
+
+  gst_d3d11_color_matrix_init (&pre_coeff);
+  gst_d3d11_color_matrix_init (&post_coeff);
+  gst_d3d11_color_matrix_init (&primaries_coeff);
+
+  switch (priv->convert_type) {
+    case CONVERT_TYPE::RANGE:
+      gst_d3d11_color_range_adjust_matrix_unorm (in_info, out_info,
+          &post_coeff);
+      break;
+    case CONVERT_TYPE::SIMPLE:
+      if (GST_VIDEO_INFO_IS_RGB (in_info)) {
+        gst_d3d11_rgb_to_yuv_matrix_unorm (in_info, out_info, &post_coeff);
       } else {
-        cinfo->to_yuv_func0 = templ_COLOR_SPACE_CONVERT_LUMA;
-        cinfo->to_yuv_func1 = templ_COLOR_SPACE_CONVERT_CHROMA;
+        gst_d3d11_yuv_to_rgb_matrix_unorm (in_info, out_info, &post_coeff);
       }
-    }
-  } else if (GST_VIDEO_INFO_IS_GRAY (in_info)) {
-    gboolean identity = TRUE;
-    GstD3D11ColorMatrix matrix;
-
-    memset (&matrix, 0, sizeof (GstD3D11ColorMatrix));
-
-    if (in_color->range != out_color->range) {
-      GstVideoInfo in_tmp, out_tmp;
+      break;
+    case CONVERT_TYPE::GAMMA:
+    case CONVERT_TYPE::PRIMARY:
+      if (GST_VIDEO_INFO_IS_RGB (in_info)) {
+        rgb_info = *in_info;
+        if (in_info->colorimetry.range == GST_VIDEO_COLOR_RANGE_16_235) {
+          rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
 
-      if (GST_VIDEO_INFO_IS_RGB (out_info)) {
-        convert_info_gray_to_rgb (in_info, &in_tmp);
-        out_tmp = *out_info;
+          gst_d3d11_color_range_adjust_matrix_unorm (in_info,
+              &rgb_info, &pre_coeff);
+        }
       } else {
-        convert_info_gray_to_yuv (in_info, &in_tmp);
-        convert_info_gray_to_yuv (out_info, &out_tmp);
-      }
+        gst_video_info_set_format (&rgb_info,
+            in_info->finfo->depth0 == 8 ? GST_VIDEO_FORMAT_RGBA :
+            GST_VIDEO_FORMAT_RGBA64_LE, in_info->width, in_info->height);
+        rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
+        rgb_info.colorimetry.transfer = in_info->colorimetry.transfer;
+        rgb_info.colorimetry.primaries = in_info->colorimetry.primaries;
+
+        gst_d3d11_yuv_to_rgb_matrix_unorm (in_info, &rgb_info, &pre_coeff);
+      }
+
+      if (priv->convert_type == CONVERT_TYPE::PRIMARY) {
+        const GstVideoColorPrimariesInfo *in_pinfo;
+        const GstVideoColorPrimariesInfo *out_pinfo;
+
+        in_pinfo =
+            gst_video_color_primaries_get_info (in_info->colorimetry.primaries);
+        out_pinfo =
+            gst_video_color_primaries_get_info (out_info->
+            colorimetry.primaries);
 
-      identity = FALSE;
-      if (!gst_d3d11_color_range_adjust_matrix_unorm (&in_tmp, &out_tmp,
-              &matrix)) {
-        GST_ERROR_OBJECT (self, "Failed to get GRAY range adjust matrix");
-        return FALSE;
+        gst_d3d11_color_primaries_matrix_unorm (in_pinfo, out_pinfo,
+            &primaries_coeff);
       }
 
-      matrix_dump = gst_d3d11_dump_color_matrix (&matrix);
-      GST_DEBUG_OBJECT (self, "GRAY range adjust matrix:\n%s", matrix_dump);
-      g_free (matrix_dump);
-    }
-
-    if (GST_VIDEO_INFO_IS_GRAY (out_info)) {
-      if (identity) {
-        GST_DEBUG_OBJECT (self, "GRAY to GRAY without range adjust");
-      } else {
-        cinfo->to_yuv_func0 = templ_COLOR_SPACE_CONVERT_LUMA;
-      }
-
-      to_yuv_matrix = matrix;
-    } else if (GST_VIDEO_INFO_IS_RGB (out_info)) {
-      if (identity) {
-        GST_DEBUG_OBJECT (self, "GRAY to RGB without range adjust");
-        cinfo->to_rgb_func0 = templ_COLOR_SPACE_GRAY_TO_RGB;
-      } else {
-        cinfo->to_rgb_func0 = templ_COLOR_SPACE_GRAY_TO_RGB_RANGE_ADJUST;
-      }
+      if (GST_VIDEO_INFO_IS_RGB (out_info)) {
+        if (out_info->colorimetry.range == GST_VIDEO_COLOR_RANGE_16_235) {
+          rgb_info = *out_info;
+          rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
 
-      to_rgb_matrix = matrix;
-    } else if (GST_VIDEO_INFO_IS_YUV (out_info)) {
-      if (identity) {
-        GST_DEBUG_OBJECT (self, "GRAY to YUV without range adjust");
+          gst_d3d11_color_range_adjust_matrix_unorm (&rgb_info,
+              out_info, &post_coeff);
+        }
       } else {
-        cinfo->to_yuv_func0 = templ_COLOR_SPACE_CONVERT_LUMA;
-        cinfo->to_yuv_func1 = templ_COLOR_SPACE_CONVERT_LUMA;
-      }
-
-      to_yuv_matrix = matrix;
-    } else {
-      g_assert_not_reached ();
-      return FALSE;
-    }
-  } else if (GST_VIDEO_INFO_IS_YUV (in_info)) {
-    if (GST_VIDEO_INFO_IS_RGB (out_info)) {
-      GstVideoInfo yuv_info = *in_info;
-
-      if (yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN ||
-          yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_RGB) {
-        GST_WARNING_OBJECT (self, "Invalid matrix is detected");
-        yuv_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
+        gst_d3d11_rgb_to_yuv_matrix_unorm (&rgb_info, out_info, &post_coeff);
       }
+      break;
+    default:
+      break;
+  }
 
-      if (!gst_d3d11_yuv_to_rgb_matrix_unorm (&yuv_info,
-              out_info, &to_rgb_matrix)) {
-        GST_ERROR_OBJECT (self, "Failed to get YUV -> RGB transform matrix");
-        return FALSE;
-      }
+  if (gst_debug_category_get_threshold (GST_CAT_DEFAULT) >= GST_LEVEL_DEBUG) {
+    gchar *matrix_dump;
+    matrix_dump = gst_d3d11_dump_color_matrix (&pre_coeff);
+    GST_DEBUG_OBJECT (self, "PreCoeff \n%s", matrix_dump);
+    g_free (matrix_dump);
 
-      matrix_dump = gst_d3d11_dump_color_matrix (&to_rgb_matrix);
-      GST_DEBUG_OBJECT (self, "YUV -> RGB matrix:\n%s", matrix_dump);
-      g_free (matrix_dump);
-
-      cinfo->to_rgb_func0 = templ_COLOR_SPACE_CONVERT;
-    } else if (in_color->range != out_color->range) {
-      if (!gst_d3d11_color_range_adjust_matrix_unorm (in_info, out_info,
-              &to_yuv_matrix)) {
-        GST_ERROR_OBJECT (self, "Failed to get GRAY range adjust matrix");
-        return FALSE;
-      }
+    matrix_dump = gst_d3d11_dump_color_matrix (&primaries_coeff);
+    GST_DEBUG_OBJECT (self, "PrimaryCoeff \n%s", matrix_dump);
+    g_free (matrix_dump);
 
-      matrix_dump = gst_d3d11_dump_color_matrix (&to_yuv_matrix);
-      GST_DEBUG_OBJECT (self, "YUV range adjust matrix:\n%s", matrix_dump);
-      g_free (matrix_dump);
-
-      if (GST_VIDEO_INFO_IS_GRAY (out_info)) {
-        cinfo->to_yuv_func0 = templ_COLOR_SPACE_CONVERT_LUMA;
-      } else if (GST_VIDEO_INFO_N_PLANES (out_info) == 1 ||
-          cinfo->ps_output0 == &output_typesOUTPUT_THREE_PLANES) {
-        /* YUV packed or Y444 */
-        cinfo->to_yuv_func0 = templ_COLOR_SPACE_CONVERT;
-      } else {
-        cinfo->to_yuv_func0 = templ_COLOR_SPACE_CONVERT_LUMA;
-        cinfo->to_yuv_func1 = templ_COLOR_SPACE_CONVERT_CHROMA;
-      }
-    }
-  } else {
-    g_assert_not_reached ();
-    return FALSE;
+    matrix_dump = gst_d3d11_dump_color_matrix (&post_coeff);
+    GST_DEBUG_OBJECT (self, "PostCoeff \n%s", matrix_dump);
+    g_free (matrix_dump);
   }
 
+  PSColorSpace *preCoeff = &priv->const_data.preCoeff;
+  PSColorSpace *postCoeff = &priv->const_data.postCoeff;
+  PSColorSpace *primariesCoeff = &priv->const_data.primariesCoeff;
+
   for (guint i = 0; i < 3; i++) {
-    to_rgb_buf->coeffXi = to_rgb_matrix.matrix0i;
-    to_rgb_buf->coeffYi = to_rgb_matrix.matrix1i;
-    to_rgb_buf->coeffZi = to_rgb_matrix.matrix2i;
-    to_rgb_buf->offseti = to_rgb_matrix.offseti;
-    to_rgb_buf->mini = to_rgb_matrix.mini;
-    to_rgb_buf->maxi = to_rgb_matrix.maxi;
-
-    to_yuv_buf->coeffXi = to_yuv_matrix.matrix0i;
-    to_yuv_buf->coeffYi = to_yuv_matrix.matrix1i;
-    to_yuv_buf->coeffZi = to_yuv_matrix.matrix2i;
-    to_yuv_buf->offseti = to_yuv_matrix.offseti;
-    to_yuv_buf->mini = to_yuv_matrix.mini;
-    to_yuv_buf->maxi = to_yuv_matrix.maxi;
+    preCoeff->coeffXi = pre_coeff.matrix0i;
+    preCoeff->coeffYi = pre_coeff.matrix1i;
+    preCoeff->coeffZi = pre_coeff.matrix2i;
+    preCoeff->offseti = pre_coeff.offseti;
+    preCoeff->mini = pre_coeff.mini;
+    preCoeff->maxi = pre_coeff.maxi;
+
+    postCoeff->coeffXi = post_coeff.matrix0i;
+    postCoeff->coeffYi = post_coeff.matrix1i;
+    postCoeff->coeffZi = post_coeff.matrix2i;
+    postCoeff->offseti = post_coeff.offseti;
+    postCoeff->mini = post_coeff.mini;
+    postCoeff->maxi = post_coeff.maxi;
+
+    primariesCoeff->coeffXi = primaries_coeff.matrix0i;
+    primariesCoeff->coeffYi = primaries_coeff.matrix1i;
+    primariesCoeff->coeffZi = primaries_coeff.matrix2i;
+    primariesCoeff->offseti = primaries_coeff.offseti;
+    primariesCoeff->mini = primaries_coeff.mini;
+    primariesCoeff->maxi = primaries_coeff.maxi;
   }
 
   return TRUE;
 }
 
-static gboolean
-gst_d3d11_converter_prepare_colorspace (GstD3D11Converter * self,
-    const GstVideoInfo * in_info, const GstVideoInfo * out_info)
+static GammaLutPtr
+gst_d3d11_converter_get_gamma_dec_table (GstVideoTransferFunction func)
 {
-  GstD3D11ConverterPrivate *priv = self->priv;
-  const GstVideoColorimetry *in_color = &in_info->colorimetry;
-  const GstVideoColorimetry *out_color = &out_info->colorimetry;
-  ConvertInfo *cinfo = &priv->convert_info;
-  PSColorSpace *to_rgb_buf = &priv->const_data.to_rgb_buf;
-  PSColorSpace *to_yuv_buf = &priv->const_data.to_yuv_buf;
-  PSColorSpace *XYZ_convert_buf = &priv->const_data.XYZ_convert_buf;
-  GstD3D11ColorMatrix to_rgb_matrix;
-  GstD3D11ColorMatrix to_yuv_matrix;
-  GstD3D11ColorMatrix XYZ_convert_matrix;
-  gchar *matrix_dump;
-  GstVideoInfo in_rgb_info = *in_info;
-  GstVideoInfo out_rgb_info = *out_info;
-
-  g_assert (GST_VIDEO_INFO_IS_RGB (in_info) || GST_VIDEO_INFO_IS_YUV (in_info));
-  g_assert (GST_VIDEO_INFO_IS_RGB (out_info)
-      || GST_VIDEO_INFO_IS_YUV (out_info));
-
-  memset (&to_rgb_matrix, 0, sizeof (GstD3D11ColorMatrix));
-  memset (&to_yuv_matrix, 0, sizeof (GstD3D11ColorMatrix));
-  memset (&XYZ_convert_matrix, 0, sizeof (GstD3D11ColorMatrix));
-
-  for (guint i = 0; i < 2; i++) {
-    cinfo->to_rgb_funci = templ_COLOR_SPACE_IDENTITY;
-    cinfo->to_yuv_funci = templ_COLOR_SPACE_IDENTITY;
-  }
-
-  cinfo->XYZ_convert_func = templ_XYZ_CONVERT_IDENTITY;
-  cinfo->gamma_decode_func = templ_GAMMA_DECODE;
-  cinfo->gamma_encode_func = templ_GAMMA_ENCODE;
-
-  /* 1) convert input to 0..255 range RGB */
-  if (GST_VIDEO_INFO_IS_RGB (in_info) &&
-      in_color->range == GST_VIDEO_COLOR_RANGE_16_235) {
-    in_rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
-
-    if (!gst_d3d11_color_range_adjust_matrix_unorm (in_info, &in_rgb_info,
-            &to_rgb_matrix)) {
-      GST_ERROR_OBJECT (self, "Failed to get RGB range adjust matrix");
-      return FALSE;
-    }
-
-    matrix_dump = gst_d3d11_dump_color_matrix (&to_rgb_matrix);
-    GST_DEBUG_OBJECT (self, "Input RGB range adjust matrix\n%s", matrix_dump);
-    g_free (matrix_dump);
-
-    cinfo->to_rgb_func0 = cinfo->to_rgb_func1 = templ_COLOR_SPACE_CONVERT;
-  } else if (GST_VIDEO_INFO_IS_YUV (in_info)) {
-    GstVideoInfo yuv_info;
-    GstVideoFormat rgb_format;
+  static std::mutex lut_lock;
+  static std::map < GstVideoTransferFunction, GammaLutPtr > g_gamma_dec_table;
 
-    yuv_info = *in_info;
-    if (yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN ||
-        yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_RGB) {
-      GST_WARNING_OBJECT (self, "Invalid matrix is detected");
-      yuv_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
-    }
+  std::lock_guard < std::mutex > lk (lut_lock);
+  auto lut = g_gamma_dec_table.find (func);
+  if (lut != g_gamma_dec_table.end ())
+    return lut->second;
 
-    if (in_info->finfo->depth0 == 8) {
-      rgb_format = GST_VIDEO_FORMAT_RGBA;
-    } else {
-      rgb_format = GST_VIDEO_FORMAT_RGBA64_LE;
-    }
-
-    gst_video_info_set_format (&in_rgb_info, rgb_format, in_info->width,
-        in_info->height);
-    in_rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
-    in_rgb_info.colorimetry.transfer = in_color->transfer;
-    in_rgb_info.colorimetry.primaries = in_color->primaries;
-
-    if (!gst_d3d11_yuv_to_rgb_matrix_unorm (&yuv_info, &in_rgb_info,
-            &to_rgb_matrix)) {
-      GST_ERROR_OBJECT (self, "Failed to get YUV -> RGB transform matrix");
-      return FALSE;
-    }
-
-    matrix_dump = gst_d3d11_dump_color_matrix (&to_rgb_matrix);
-    GST_DEBUG_OBJECT (self, "YUV -> RGB matrix:\n%s", matrix_dump);
-    g_free (matrix_dump);
-
-    cinfo->to_rgb_func0 = cinfo->to_rgb_func1 = templ_COLOR_SPACE_CONVERT;
-  }
-
-  /* 2) convert gamma/XYZ converted 0..255 RGB to output format */
-  if (GST_VIDEO_INFO_IS_RGB (out_info) &&
-      out_color->range == GST_VIDEO_COLOR_RANGE_16_235) {
-    out_rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
-
-    if (!gst_d3d11_color_range_adjust_matrix_unorm (&out_rgb_info, out_info,
-            &to_yuv_matrix)) {
-      GST_ERROR_OBJECT (self, "Failed to get RGB range adjust matrix");
-      return FALSE;
-    }
-
-    matrix_dump = gst_d3d11_dump_color_matrix (&to_yuv_matrix);
-    GST_DEBUG_OBJECT (self, "Output RGB range adjust matrix\n%s", matrix_dump);
-    g_free (matrix_dump);
-
-    cinfo->to_yuv_func0 = cinfo->to_yuv_func1 = templ_COLOR_SPACE_CONVERT;
-  } else if (GST_VIDEO_INFO_IS_YUV (out_info)) {
-    GstVideoInfo yuv_info;
-
-    yuv_info = *out_info;
-    if (yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN ||
-        yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_RGB) {
-      GST_WARNING_OBJECT (self, "Invalid matrix is detected");
-      yuv_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
-    }
-
-    gst_video_info_set_format (&out_rgb_info,
-        GST_VIDEO_INFO_FORMAT (&in_rgb_info), out_info->width,
-        out_info->height);
-    out_rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
-    out_rgb_info.colorimetry.transfer = out_color->transfer;
-    out_rgb_info.colorimetry.primaries = out_color->primaries;
-
-    if (!gst_d3d11_rgb_to_yuv_matrix_unorm (&out_rgb_info,
-            &yuv_info, &to_yuv_matrix)) {
-      GST_ERROR_OBJECT (self, "Failed to get RGB -> YUV transform matrix");
-      return FALSE;
-    }
-
-    matrix_dump = gst_d3d11_dump_color_matrix (&to_yuv_matrix);
-    GST_DEBUG_OBJECT (self, "RGB -> YUV matrix:\n%s", matrix_dump);
-    g_free (matrix_dump);
-
-    if (GST_VIDEO_INFO_N_PLANES (out_info) == 1 ||
-        cinfo->ps_output0 == &output_typesOUTPUT_THREE_PLANES) {
-      /* YUV packed or Y444 */
-      cinfo->to_yuv_func0 = templ_COLOR_SPACE_CONVERT;
-    } else {
-      cinfo->to_yuv_func0 = templ_COLOR_SPACE_CONVERT_LUMA;
-      cinfo->to_yuv_func1 = templ_COLOR_SPACE_CONVERT_CHROMA;
-    }
+  const gdouble scale = (gdouble) 1 / (GAMMA_LUT_SIZE - 1);
+  auto table = std::make_shared < GammaLut > ();
+  for (guint i = 0; i < GAMMA_LUT_SIZE; i++) {
+    gdouble val = gst_video_transfer_function_decode (func, i * scale);
+    val = rint (val * 65535);
+    val = CLAMP (val, 0, 65535);
+    table->luti = (guint16) val;
   }
 
-  /* TODO: handle HDR mastring display info */
-  if (priv->do_primaries) {
-    const GstVideoColorPrimariesInfo *in_pinfo;
-    const GstVideoColorPrimariesInfo *out_pinfo;
-
-    in_pinfo = gst_video_color_primaries_get_info (in_color->primaries);
-    out_pinfo = gst_video_color_primaries_get_info (out_color->primaries);
-
-    if (!gst_d3d11_color_primaries_matrix_unorm (in_pinfo, out_pinfo,
-            &XYZ_convert_matrix)) {
-      GST_ERROR_OBJECT (self, "Failed to get primaries conversion matrix");
-      return FALSE;
-    }
+  g_gamma_dec_tablefunc = table;
+  return table;
+}
 
-    matrix_dump = gst_d3d11_dump_color_matrix (&XYZ_convert_matrix);
-    GST_DEBUG_OBJECT (self, "Primaries conversion matrix:\n%s", matrix_dump);
-    g_free (matrix_dump);
+static GammaLutPtr
+gst_d3d11_converter_get_gamma_enc_table (GstVideoTransferFunction func)
+{
+  static std::mutex lut_lock;
+  static std::map < GstVideoTransferFunction, GammaLutPtr > g_gamma_enc_table;
 
-    cinfo->XYZ_convert_func = templ_XYZ_CONVERT;
-  }
+  std::lock_guard < std::mutex > lk (lut_lock);
+  auto lut = g_gamma_enc_table.find (func);
+  if (lut != g_gamma_enc_table.end ())
+    return lut->second;
 
-  for (guint i = 0; i < 3; i++) {
-    to_rgb_buf->coeffXi = to_rgb_matrix.matrix0i;
-    to_rgb_buf->coeffYi = to_rgb_matrix.matrix1i;
-    to_rgb_buf->coeffZi = to_rgb_matrix.matrix2i;
-    to_rgb_buf->offseti = to_rgb_matrix.offseti;
-    to_rgb_buf->mini = to_rgb_matrix.mini;
-    to_rgb_buf->maxi = to_rgb_matrix.maxi;
-
-    to_yuv_buf->coeffXi = to_yuv_matrix.matrix0i;
-    to_yuv_buf->coeffYi = to_yuv_matrix.matrix1i;
-    to_yuv_buf->coeffZi = to_yuv_matrix.matrix2i;
-    to_yuv_buf->offseti = to_yuv_matrix.offseti;
-    to_yuv_buf->mini = to_yuv_matrix.mini;
-    to_yuv_buf->maxi = to_yuv_matrix.maxi;
-
-    XYZ_convert_buf->coeffXi = XYZ_convert_matrix.matrix0i;
-    XYZ_convert_buf->coeffYi = XYZ_convert_matrix.matrix1i;
-    XYZ_convert_buf->coeffZi = XYZ_convert_matrix.matrix2i;
-    XYZ_convert_buf->offseti = XYZ_convert_matrix.offseti;
-    XYZ_convert_buf->mini = XYZ_convert_matrix.mini;
-    XYZ_convert_buf->maxi = XYZ_convert_matrix.maxi;
+  const gdouble scale = (gdouble) 1 / (GAMMA_LUT_SIZE - 1);
+  auto table = std::make_shared < GammaLut > ();
+  for (guint i = 0; i < GAMMA_LUT_SIZE; i++) {
+    gdouble val = gst_video_transfer_function_encode (func, i * scale);
+    val = rint (val * 65535);
+    val = CLAMP (val, 0, 65535);
+    table->luti = (guint16) val;
   }
 
-  return TRUE;
+  g_gamma_enc_tablefunc = table;
+  return table;
 }
 
 static gboolean
@@ -2766,36 +1533,26 @@
   ComPtr < ID3D11Texture1D > gamma_enc_lut;
   ComPtr < ID3D11ShaderResourceView > gamma_dec_srv;
   ComPtr < ID3D11ShaderResourceView > gamma_enc_srv;
-  guint16 gamma_dec_tableGAMMA_LUT_SIZE;
-  guint16 gamma_enc_tableGAMMA_LUT_SIZE;
+  GammaLutPtr gamma_dec_table;
+  GammaLutPtr gamma_enc_table;
   GstVideoTransferFunction in_trc = in_info->colorimetry.transfer;
   GstVideoTransferFunction out_trc = out_info->colorimetry.transfer;
-  gdouble scale = (gdouble) 1 / (GAMMA_LUT_SIZE - 1);
 
   memset (&desc, 0, sizeof (D3D11_TEXTURE1D_DESC));
   memset (&subresource, 0, sizeof (D3D11_SUBRESOURCE_DATA));
   memset (&srv_desc, 0, sizeof (D3D11_SHADER_RESOURCE_VIEW_DESC));
 
-  for (guint i = 0; i < GAMMA_LUT_SIZE; i++) {
-    gdouble val = gst_video_transfer_function_decode (in_trc, i * scale);
-    val = rint (val * 65535);
-    val = CLAMP (val, 0, 65535);
-    gamma_dec_tablei = (guint16) val;
-
-    val = gst_video_transfer_function_encode (out_trc, i * scale);
-    val = rint (val * 65535);
-    val = CLAMP (val, 0, 65535);
-    gamma_enc_tablei = (guint16) val;
-  }
+  gamma_dec_table = gst_d3d11_converter_get_gamma_dec_table (in_trc);
+  gamma_enc_table = gst_d3d11_converter_get_gamma_enc_table (out_trc);
 
   desc.Width = GAMMA_LUT_SIZE;
   desc.MipLevels = 1;
   desc.ArraySize = 1;
   desc.Format = DXGI_FORMAT_R16_UNORM;
-  desc.Usage = D3D11_USAGE_DEFAULT;
+  desc.Usage = D3D11_USAGE_IMMUTABLE;
   desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
 
-  subresource.pSysMem = gamma_dec_table;
+  subresource.pSysMem = gamma_dec_table->lut;
   subresource.SysMemPitch = GAMMA_LUT_SIZE * sizeof (guint16);
 
   srv_desc.Format = DXGI_FORMAT_R16_UNORM;
@@ -2815,7 +1572,7 @@
     return FALSE;
   }
 
-  subresource.pSysMem = gamma_enc_table;
+  subresource.pSysMem = gamma_enc_table->lut;
   hr = device_handle->CreateTexture1D (&desc, &subresource, &gamma_enc_lut);
   if (!gst_d3d11_result (hr, device)) {
     GST_ERROR_OBJECT (self, "Failed to create gamma encode LUT");
@@ -2829,20 +1586,39 @@
     return FALSE;
   }
 
-  priv->gamma_dec_lut = gamma_dec_lut.Detach ();
-  priv->gamma_enc_lut = gamma_enc_lut.Detach ();
-  priv->gamma_dec_srv = gamma_dec_srv.Detach ();
-  priv->gamma_enc_srv = gamma_enc_srv.Detach ();
+  priv->gamma_dec_lut = gamma_dec_lut;
+  priv->gamma_enc_lut = gamma_enc_lut;
+  priv->gamma_dec_srv = gamma_dec_srv;
+  priv->gamma_enc_srv = gamma_enc_srv;
 
   return TRUE;
 }
 
+static gboolean
+is_custom_format (GstVideoFormat format)
+{
+  switch (format) {
+    case GST_VIDEO_FORMAT_xRGB:
+    case GST_VIDEO_FORMAT_xBGR:
+    case GST_VIDEO_FORMAT_ARGB:
+    case GST_VIDEO_FORMAT_ABGR:
+    case GST_VIDEO_FORMAT_BGRA64_LE:
+    case GST_VIDEO_FORMAT_BGR10A2_LE:
+    case GST_VIDEO_FORMAT_RBGA:
+      return TRUE;
+    default:
+      break;
+  }
+
+  return FALSE;
+}
+
 static void
 gst_d3d11_converter_calculate_border_color (GstD3D11Converter * self)
 {
   GstD3D11ConverterPrivate *priv = self->priv;
   GstD3D11ColorMatrix *m = &priv->clear_color_matrix;
-  const GstVideoInfo *out_info = &priv->out_info;
+  const GstVideoInfo *out_info = &priv->postproc_info;
   gdouble a;
   gdouble rgb3;
   gdouble converted3;
@@ -2900,8 +1676,8 @@
   }
 
   if ((GST_VIDEO_INFO_IS_RGB (out_info) &&
-          GST_VIDEO_INFO_N_PLANES (out_info) == 1) ||
-      GST_VIDEO_INFO_IS_GRAY (out_info)) {
+          GST_VIDEO_INFO_N_PLANES (out_info) == 1 &&
+          !is_custom_format (format)) || GST_VIDEO_INFO_IS_GRAY (out_info)) {
     for (guint i = 0; i < 3; i++)
       priv->clear_color0i = convertedi;
     priv->clear_color03 = a;
@@ -2920,6 +1696,26 @@
         priv->clear_color02 = converted1;
         priv->clear_color03 = converted2;
         break;
+      case GST_VIDEO_FORMAT_ARGB:
+      case GST_VIDEO_FORMAT_xRGB:
+        priv->clear_color00 = a;
+        priv->clear_color01 = converted0;
+        priv->clear_color02 = converted1;
+        priv->clear_color03 = converted2;
+        break;
+      case GST_VIDEO_FORMAT_ABGR:
+      case GST_VIDEO_FORMAT_xBGR:
+        priv->clear_color00 = a;
+        priv->clear_color01 = converted2;
+        priv->clear_color02 = converted1;
+        priv->clear_color03 = converted0;
+        break;
+      case GST_VIDEO_FORMAT_RBGA:
+        priv->clear_color00 = converted0;
+        priv->clear_color01 = converted2;
+        priv->clear_color02 = converted1;
+        priv->clear_color03 = a;
+        break;
       case GST_VIDEO_FORMAT_NV12:
       case GST_VIDEO_FORMAT_NV21:
       case GST_VIDEO_FORMAT_P010_10LE:
@@ -2981,6 +1777,7 @@
       case GST_VIDEO_FORMAT_GBR:
       case GST_VIDEO_FORMAT_GBR_10LE:
       case GST_VIDEO_FORMAT_GBR_12LE:
+      case GST_VIDEO_FORMAT_GBR_16LE:
         priv->clear_color00 = converted1;
         priv->clear_color10 = converted2;
         priv->clear_color20 = converted0;
@@ -3033,6 +1830,11 @@
     return FALSE;
   }
 
+  if (is_custom_format (GST_VIDEO_INFO_FORMAT (&priv->in_info)) ||
+      is_custom_format (GST_VIDEO_INFO_FORMAT (&priv->out_info))) {
+    return FALSE;
+  }
+
   /* cannot bind to processor in/out view */
   if ((in_format_flags & D3D11_FORMAT_SUPPORT_VIDEO_PROCESSOR_INPUT) == 0 ||
       (out_format_flags & D3D11_FORMAT_SUPPORT_VIDEO_PROCESSOR_OUTPUT) == 0) {
@@ -3133,13 +1935,12 @@
       out_space);
 
   priv->video_device = video_device;
-  video_device->AddRef ();
-  priv->processor = processor.Detach ();
+  priv->processor = processor;
   hr = video_context1.As (&video_context2);
   if (SUCCEEDED (hr))
-    priv->video_context2 = video_context2.Detach ();
-  priv->video_context = video_context1.Detach ();
-  priv->enumerator = enumerator1.Detach ();
+    priv->video_context2 = video_context2;
+  priv->video_context = video_context1;
+  priv->enumerator = enumerator1;
 
   priv->src_rect.left = 0;
   priv->src_rect.top = 0;
@@ -3156,6 +1957,51 @@
   return TRUE;
 }
 
+static GstVideoFormat
+get_shader_format (GstVideoFormat format, gboolean is_input)
+{
+  switch (format) {
+    case GST_VIDEO_FORMAT_YUY2:
+    case GST_VIDEO_FORMAT_UYVY:
+    case GST_VIDEO_FORMAT_VYUY:
+    case GST_VIDEO_FORMAT_YVYU:
+    case GST_VIDEO_FORMAT_v308:
+    case GST_VIDEO_FORMAT_IYU2:
+      return GST_VIDEO_FORMAT_AYUV;
+    case GST_VIDEO_FORMAT_Y210:
+    case GST_VIDEO_FORMAT_Y212_LE:
+    case GST_VIDEO_FORMAT_v210:
+    case GST_VIDEO_FORMAT_v216:
+      return GST_VIDEO_FORMAT_AYUV64;
+    case GST_VIDEO_FORMAT_Y410:
+    case GST_VIDEO_FORMAT_Y412_LE:
+      if (!is_input)
+        return GST_VIDEO_FORMAT_AYUV64;
+      break;
+    case GST_VIDEO_FORMAT_RGB:
+    case GST_VIDEO_FORMAT_BGR:
+    case GST_VIDEO_FORMAT_RGB16:
+    case GST_VIDEO_FORMAT_BGR16:
+    case GST_VIDEO_FORMAT_RGB15:
+    case GST_VIDEO_FORMAT_BGR15:
+      return GST_VIDEO_FORMAT_RGBA;
+    case GST_VIDEO_FORMAT_r210:
+      return GST_VIDEO_FORMAT_RGB10A2_LE;
+    case GST_VIDEO_FORMAT_BGRA64_LE:
+      if (!is_input)
+        return GST_VIDEO_FORMAT_RGBA64_LE;
+      break;
+    case GST_VIDEO_FORMAT_BGR10A2_LE:
+      if (!is_input)
+        return GST_VIDEO_FORMAT_RGB10A2_LE;
+      break;
+    default:
+      break;
+  }
+
+  return format;
+}
+
 /**
  * gst_d3d11_converter_new:
  * @device: a #GstD3D11Device
@@ -3184,7 +2030,12 @@
   guint wanted_backend = 0;
   gboolean allow_gamma = FALSE;
   gboolean allow_primaries = FALSE;
+  D3D11_FILTER sampler_filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;
   gchar *backend_str;
+  GstVideoInfo matrix_in_info;
+  GstVideoInfo matrix_out_info;
+  GstVideoFormat org_format;
+  GstVideoFormat shader_format;
 
   g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), nullptr);
   g_return_val_if_fail (in_info != nullptr, nullptr);
@@ -3211,6 +2062,14 @@
       allow_primaries = TRUE;
     }
 
+    gst_structure_get_enum (config, GST_D3D11_CONVERTER_OPT_SAMPLER_FILTER,
+        GST_TYPE_D3D11_CONVERTER_SAMPLER_FILTER, (int *) &sampler_filter);
+
+    gst_structure_get_enum (config, GST_D3D11_CONVERTER_OPT_SRC_ALPHA_MODE,
+        GST_TYPE_D3D11_CONVERTER_ALPHA_MODE, (int *) &priv->src_alpha_mode);
+    gst_structure_get_enum (config, GST_D3D11_CONVERTER_OPT_DEST_ALPHA_MODE,
+        GST_TYPE_D3D11_CONVERTER_ALPHA_MODE, (int *) &priv->dst_alpha_mode);
+
     gst_structure_free (config);
   }
 
@@ -3236,7 +2095,6 @@
     GST_ERROR_OBJECT (self, "%s couldn't be converted to d3d11 format",
         gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (in_info)));
     gst_object_unref (self);
-
     return nullptr;
   }
 
@@ -3245,17 +2103,16 @@
     GST_ERROR_OBJECT (self, "%s couldn't be converted to d3d11 format",
         gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (in_info)));
     gst_object_unref (self);
-
     return nullptr;
   }
 
   self->device = (GstD3D11Device *) gst_object_ref (device);
-  priv->fast_path = TRUE;
   priv->const_data.alpha = 1.0;
   priv->in_info = *in_info;
-  priv->fallback_info = *in_info;
+  priv->preproc_info = *in_info;
   priv->piv_info = *in_info;
   priv->out_info = *out_info;
+  priv->postproc_info = *out_info;
   priv->in_d3d11_format = in_d3d11_format;
   priv->out_d3d11_format = out_d3d11_format;
 
@@ -3270,18 +2127,57 @@
   priv->blend_sample_mask = 0xffffffff;
   priv->border_color = 0xffff000000000000;
 
-  if (GST_VIDEO_INFO_IS_RGB (out_info)) {
-    GstVideoInfo rgb_info = *out_info;
+  /* Preprocess packed and subsampled texture */
+  org_format = GST_VIDEO_INFO_FORMAT (in_info);
+  shader_format = get_shader_format (org_format, TRUE);
+  if (org_format != shader_format) {
+    GstVideoInfo tmp_info;
+
+    gst_video_info_set_interlaced_format (&tmp_info, shader_format,
+        GST_VIDEO_INFO_INTERLACE_MODE (in_info),
+        GST_VIDEO_INFO_WIDTH (in_info), GST_VIDEO_INFO_HEIGHT (in_info));
+    tmp_info.chroma_site = in_info->chroma_site;
+    tmp_info.colorimetry = in_info->colorimetry;
+    tmp_info.fps_n = in_info->fps_n;
+    tmp_info.fps_d = in_info->fps_d;
+    tmp_info.par_n = in_info->par_n;
+    tmp_info.par_d = in_info->par_d;
+
+    priv->preproc_info = tmp_info;
+    priv->need_preproc = TRUE;
+  }
+
+  org_format = GST_VIDEO_INFO_FORMAT (out_info);
+  shader_format = get_shader_format (org_format, FALSE);
+  if (org_format != shader_format) {
+    GstVideoInfo tmp_info;
+
+    gst_video_info_set_interlaced_format (&tmp_info, shader_format,
+        GST_VIDEO_INFO_INTERLACE_MODE (out_info),
+        GST_VIDEO_INFO_WIDTH (out_info), GST_VIDEO_INFO_HEIGHT (out_info));
+    tmp_info.chroma_site = out_info->chroma_site;
+    tmp_info.colorimetry = out_info->colorimetry;
+    tmp_info.fps_n = out_info->fps_n;
+    tmp_info.fps_d = out_info->fps_d;
+    tmp_info.par_n = out_info->par_n;
+    tmp_info.par_d = out_info->par_d;
+
+    priv->postproc_info = tmp_info;
+    priv->need_postproc = TRUE;
+  }
+
+  if (GST_VIDEO_INFO_IS_RGB (&priv->postproc_info)) {
+    GstVideoInfo rgb_info = priv->postproc_info;
     rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
-    gst_d3d11_color_range_adjust_matrix_unorm (&rgb_info, out_info,
+    gst_d3d11_color_range_adjust_matrix_unorm (&rgb_info, &priv->postproc_info,
         &priv->clear_color_matrix);
   } else {
     GstVideoInfo rgb_info;
     GstVideoInfo yuv_info;
 
     gst_video_info_set_format (&rgb_info, GST_VIDEO_FORMAT_RGBA64_LE,
-        out_info->width, out_info->height);
-    convert_info_gray_to_yuv (out_info, &yuv_info);
+        priv->postproc_info.width, priv->postproc_info.height);
+    convert_info_gray_to_yuv (&priv->postproc_info, &yuv_info);
 
     if (yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN ||
         yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_RGB) {
@@ -3305,87 +2201,82 @@
   if ((wanted_backend & GST_D3D11_CONVERTER_BACKEND_SHADER) == 0)
     goto out;
 
-  if (!GST_VIDEO_INFO_IS_GRAY (in_info) && !GST_VIDEO_INFO_IS_GRAY (out_info)) {
-    if (in_info->colorimetry.transfer != GST_VIDEO_TRANSFER_UNKNOWN &&
-        out_info->colorimetry.transfer != GST_VIDEO_TRANSFER_UNKNOWN &&
-        !gst_video_transfer_function_is_equivalent (in_info->
-            colorimetry.transfer, GST_VIDEO_INFO_COMP_DEPTH (in_info, 0),
-            out_info->colorimetry.transfer, GST_VIDEO_INFO_COMP_DEPTH (out_info,
-                0))) {
-      if (allow_gamma) {
-        GST_DEBUG_OBJECT (self, "Different transfer function %d -> %d",
-            in_info->colorimetry.transfer, out_info->colorimetry.transfer);
-        priv->fast_path = FALSE;
-      } else {
-        GST_DEBUG_OBJECT (self,
-            "Different transfer function %d -> %d but gamma remap is disabled",
-            in_info->colorimetry.transfer, out_info->colorimetry.transfer);
-      }
-    }
+  priv->convert_type = CONVERT_TYPE::IDENTITY;
+  if (GST_VIDEO_INFO_IS_RGB (in_info) != GST_VIDEO_INFO_IS_RGB (out_info)) {
+    priv->convert_type = CONVERT_TYPE::SIMPLE;
+  } else if (in_info->colorimetry.range != GST_VIDEO_COLOR_RANGE_UNKNOWN &&
+      out_info->colorimetry.range != GST_VIDEO_COLOR_RANGE_UNKNOWN &&
+      in_info->colorimetry.range != out_info->colorimetry.range) {
+    priv->convert_type = CONVERT_TYPE::RANGE;
+  }
+
+  if (allow_gamma &&
+      in_info->colorimetry.transfer != GST_VIDEO_TRANSFER_UNKNOWN &&
+      out_info->colorimetry.transfer != GST_VIDEO_TRANSFER_UNKNOWN &&
+      !gst_video_transfer_function_is_equivalent (in_info->colorimetry.transfer,
+          GST_VIDEO_INFO_COMP_DEPTH (in_info, 0),
+          out_info->colorimetry.transfer, GST_VIDEO_INFO_COMP_DEPTH (out_info,
+              0))) {
+    GST_DEBUG_OBJECT (self, "Different transfer function %d -> %d",
+        in_info->colorimetry.transfer, out_info->colorimetry.transfer);
+    priv->convert_type = CONVERT_TYPE::GAMMA;
+  }
+
+  if (allow_primaries &&
+      in_info->colorimetry.primaries != GST_VIDEO_COLOR_PRIMARIES_UNKNOWN &&
+      out_info->colorimetry.primaries != GST_VIDEO_COLOR_PRIMARIES_UNKNOWN &&
+      !gst_video_color_primaries_is_equivalent (in_info->colorimetry.primaries,
+          out_info->colorimetry.primaries)) {
+    GST_DEBUG_OBJECT (self, "Different primaries %d -> %d",
+        in_info->colorimetry.primaries, out_info->colorimetry.primaries);
+    priv->convert_type = CONVERT_TYPE::PRIMARY;
+  }
+
+  if ((priv->convert_type == CONVERT_TYPE::GAMMA ||
+          priv->convert_type == CONVERT_TYPE::PRIMARY)) {
+    if (!gst_d3d11_converter_setup_lut (self, &priv->preproc_info,
+            &priv->postproc_info))
+      goto out;
+  }
 
-    if (in_info->colorimetry.primaries != GST_VIDEO_COLOR_PRIMARIES_UNKNOWN &&
-        out_info->colorimetry.primaries != GST_VIDEO_COLOR_PRIMARIES_UNKNOWN &&
-        !gst_video_color_primaries_is_equivalent (in_info->
-            colorimetry.primaries, out_info->colorimetry.primaries)) {
-      if (allow_primaries) {
-        GST_DEBUG_OBJECT (self, "Different primaries %d -> %d",
-            in_info->colorimetry.primaries, out_info->colorimetry.primaries);
-        priv->fast_path = FALSE;
-        priv->do_primaries = TRUE;
-      } else {
-        GST_DEBUG_OBJECT (self,
-            "Different primaries %d -> %d but chromatic adaptation is disabled",
-            in_info->colorimetry.primaries, out_info->colorimetry.primaries);
-      }
+  if (GST_VIDEO_INFO_IS_RGB (&priv->preproc_info)) {
+    matrix_in_info = priv->preproc_info;
+  } else {
+    convert_info_gray_to_yuv (&priv->preproc_info, &matrix_in_info);
+    if (matrix_in_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN ||
+        matrix_in_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_RGB) {
+      matrix_in_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
     }
   }
 
-  if (!gst_d3d11_converter_prepare_output (self, out_info))
-    goto out;
-
-  /* XXX: hard to make sampling of packed 4:2:2 format, use software
-   * converter to convert YUV2 to Y42B */
-  if (GST_VIDEO_INFO_FORMAT (in_info) == GST_VIDEO_FORMAT_YUY2) {
-    GstVideoInfo tmp_info;
-
-    gst_video_info_set_interlaced_format (&tmp_info, GST_VIDEO_FORMAT_Y42B,
-        GST_VIDEO_INFO_INTERLACE_MODE (in_info),
-        GST_VIDEO_INFO_WIDTH (in_info), GST_VIDEO_INFO_HEIGHT (in_info));
-    tmp_info.chroma_site = in_info->chroma_site;
-    tmp_info.colorimetry = in_info->colorimetry;
-    tmp_info.fps_n = in_info->fps_n;
-    tmp_info.fps_d = in_info->fps_d;
-    tmp_info.par_n = in_info->par_n;
-    tmp_info.par_d = in_info->par_d;
-
-    priv->unpack_convert =
-        gst_video_converter_new (in_info, &tmp_info, nullptr);
-    if (!priv->unpack_convert) {
-      GST_ERROR_OBJECT (self, "Couldn't create unpack convert");
-      priv->supported_backend = (GstD3D11ConverterBackend) 0;
-      goto out;
+  if (GST_VIDEO_INFO_IS_RGB (&priv->postproc_info)) {
+    matrix_out_info = priv->postproc_info;
+  } else {
+    convert_info_gray_to_yuv (&priv->postproc_info, &matrix_out_info);
+    if (matrix_out_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN ||
+        matrix_out_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_RGB) {
+      matrix_out_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
     }
-
-    priv->fallback_info = tmp_info;
-    in_info = &priv->fallback_info;
   }
 
-  if (!gst_d3d11_converter_prepare_sample_texture (self, in_info, out_info))
+  if (!gst_d3d11_converter_calculate_matrix (self,
+          &matrix_in_info, &matrix_out_info)) {
     goto out;
-
-  if (priv->fast_path) {
-    if (!gst_d3d11_converter_prepare_colorspace_fast (self, in_info, out_info))
-      goto out;
-  } else {
-    if (!gst_d3d11_converter_prepare_colorspace (self, in_info, out_info))
-      goto out;
-
-    if (!gst_d3d11_converter_setup_lut (self, in_info, out_info))
-      goto out;
   }
 
-  if (!gst_d3d11_color_convert_setup_shader (self, in_info, out_info))
+  if (!gst_d3d11_color_convert_setup_shader (self, &priv->preproc_info,
+          &priv->postproc_info, sampler_filter)) {
     goto out;
+  }
+
+  priv->preproc = gst_d3d11_converter_helper_new (self->device,
+      GST_VIDEO_INFO_FORMAT (in_info),
+      GST_VIDEO_INFO_FORMAT (&priv->preproc_info), in_info->width,
+      in_info->height);
+
+  priv->postproc = gst_d3d11_converter_helper_new (self->device,
+      GST_VIDEO_INFO_FORMAT (&priv->postproc_info),
+      GST_VIDEO_INFO_FORMAT (out_info), out_info->width, out_info->height);
 
   priv->supported_backend |= GST_D3D11_CONVERTER_BACKEND_SHADER;
 
@@ -3404,20 +2295,18 @@
 static gboolean
 gst_d3d11_converter_convert_internal (GstD3D11Converter * self,
     ID3D11ShaderResourceView * srvGST_VIDEO_MAX_PLANES,
-    ID3D11RenderTargetView * rtvGST_VIDEO_MAX_PLANES)
+    ID3D11RenderTargetView * rtvGST_VIDEO_MAX_PLANES, gboolean multisampled)
 {
   GstD3D11ConverterPrivate *priv;
   ComPtr < ID3D11Resource > resource;
   ComPtr < ID3D11Texture2D > texture;
   D3D11_TEXTURE2D_DESC desc;
-  ConvertInfo *cinfo;
   ID3D11DeviceContext *context;
   UINT offsets = 0;
   UINT vertex_stride = sizeof (VertexData);
   ID3D11ShaderResourceView *clear_viewGST_VIDEO_MAX_PLANES = { nullptr, };
 
   priv = self->priv;
-  cinfo = &priv->convert_info;
   context = gst_d3d11_device_get_device_context_handle (self->device);
 
   /* check texture resolution and update crop area */
@@ -3440,13 +2329,13 @@
     }
   }
 
-  if (priv->update_alpha) {
+  if (priv->const_buffer && priv->update_alpha) {
     D3D11_MAPPED_SUBRESOURCE map;
     PSConstBuffer *const_buffer;
     HRESULT hr;
 
-    hr = context->Map (priv->const_buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map);
-
+    hr = context->Map (priv->const_buffer.Get (),
+        0, D3D11_MAP_WRITE_DISCARD, 0, &map);
     if (!gst_d3d11_result (hr, self->device)) {
       GST_ERROR_OBJECT (self,
           "Couldn't map constant buffer, hr: 0x%x", (guint) hr);
@@ -3456,9 +2345,9 @@
     const_buffer = (PSConstBuffer *) map.pData;
     memcpy (const_buffer, &priv->const_data, sizeof (PSConstBuffer));
 
-    context->Unmap (priv->const_buffer, 0);
-    priv->update_alpha = FALSE;
+    context->Unmap (priv->const_buffer.Get (), 0);
   }
+  priv->update_alpha = FALSE;
 
   if (priv->clear_background) {
     for (guint i = 0; i < priv->num_output_view; i++)
@@ -3466,40 +2355,58 @@
   }
 
   context->IASetPrimitiveTopology (D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-  context->IASetInputLayout (priv->layout);
-  context->IASetVertexBuffers (0, 1, &priv->vertex_buffer, &vertex_stride,
-      &offsets);
-  context->IASetIndexBuffer (priv->index_buffer, DXGI_FORMAT_R16_UINT, 0);
-  context->PSSetSamplers (0, 1, &priv->linear_sampler);
-  context->VSSetShader (priv->vs, nullptr, 0);
-  context->PSSetConstantBuffers (0, 1, &priv->const_buffer);
+  ID3D11Buffer *vertex = { priv->vertex_buffer.Get () };
+  context->IASetVertexBuffers (0, 1, vertex, &vertex_stride, &offsets);
+  context->IASetIndexBuffer (priv->index_buffer.Get (),
+      DXGI_FORMAT_R16_UINT, 0);
+
+  ID3D11SamplerState *samplers = { priv->sampler.Get (),
+    priv->linear_sampler.Get ()
+  };
+  context->PSSetSamplers (0, 2, samplers);
+
+  ID3D11Buffer *vs_const_buffer = { priv->vs_const_buffer.Get () };
+  context->IASetInputLayout (priv->layout.Get ());
+  context->VSSetShader (priv->vs.Get (), nullptr, 0);
+  context->VSSetConstantBuffers (0, 1, vs_const_buffer);
+
+  if (priv->const_buffer) {
+    ID3D11Buffer *const_buffer = { priv->const_buffer.Get () };
+    context->PSSetConstantBuffers (0, 1, const_buffer);
+  }
+
   context->PSSetShaderResources (0, priv->num_input_view, srv);
-  if (!priv->fast_path) {
-    ID3D11ShaderResourceView *gamma_srv2;
-    gamma_srv0 = priv->gamma_dec_srv;
-    gamma_srv1 = priv->gamma_enc_srv;
+  if (priv->gamma_enc_srv) {
+    ID3D11ShaderResourceView *gamma_srv = { priv->gamma_dec_srv.Get (),
+      priv->gamma_enc_srv.Get ()
+    };
     context->PSSetShaderResources (4, 2, gamma_srv);
   }
 
-  context->PSSetShader (priv->ps0, nullptr, 0);
-  context->RSSetViewports (cinfo->ps_output0->num_rtv, priv->viewport);
-  context->OMSetRenderTargets (cinfo->ps_output0->num_rtv, rtv, nullptr);
+  auto ps = priv->ps0;
+  context->PSSetShader (ps->shader.Get (), nullptr, 0);
+  context->RSSetViewports (ps->num_rtv, priv->viewport);
+  if (multisampled)
+    context->RSSetState (priv->msaa_rasterizer.Get ());
+  else
+    context->RSSetState (priv->rasterizer.Get ());
+
+  context->OMSetRenderTargets (ps->num_rtv, rtv, nullptr);
   if (priv->blend) {
-    context->OMSetBlendState (priv->blend,
+    context->OMSetBlendState (priv->blend.Get (),
         priv->blend_factor, priv->blend_sample_mask);
   } else {
     context->OMSetBlendState (nullptr, nullptr, 0xffffffff);
   }
   context->DrawIndexed (6, 0, 0);
 
-  if (priv->ps1) {
-    guint view_offset = cinfo->ps_output0->num_rtv;
-
-    context->PSSetShader (priv->ps1, nullptr, 0);
-    context->RSSetViewports (cinfo->ps_output1->num_rtv,
-        &priv->viewportview_offset);
-    context->OMSetRenderTargets (cinfo->ps_output1->num_rtv,
-        &rtvview_offset, nullptr);
+  if (priv->ps.size () == 2) {
+    guint view_offset = ps->num_rtv;
+    ps = priv->ps1;
+
+    context->PSSetShader (ps->shader.Get (), nullptr, 0);
+    context->RSSetViewports (ps->num_rtv, &priv->viewportview_offset);
+    context->OMSetRenderTargets (ps->num_rtv, &rtvview_offset, nullptr);
     context->DrawIndexed (6, 0, 0);
   }
 
@@ -3554,125 +2461,6 @@
 }
 
 static gboolean
-gst_d3d11_converter_create_fallback_buffer (GstD3D11Converter * self)
-{
-  GstD3D11ConverterPrivate *priv = self->priv;
-  GstD3D11AllocationParams *params;
-  GstBufferPool *pool;
-  GstCaps *caps;
-  guint bind_flags = D3D11_BIND_SHADER_RESOURCE;
-  GstStructure *config;
-
-  gst_clear_buffer (&priv->fallback_inbuf);
-
-  params = gst_d3d11_allocation_params_new (self->device, &priv->fallback_info,
-      GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags, 0);
-
-  caps = gst_video_info_to_caps (&priv->fallback_info);
-  pool = gst_d3d11_buffer_pool_new (self->device);
-
-  config = gst_buffer_pool_get_config (pool);
-  gst_buffer_pool_config_set_params (config, caps, priv->fallback_info.size,
-      0, 0);
-  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
-  gst_caps_unref (caps);
-  gst_d3d11_allocation_params_free (params);
-
-  if (!gst_buffer_pool_set_config (pool, config)) {
-    GST_ERROR_OBJECT (self, "Failed to set pool config");
-    gst_object_unref (pool);
-    return FALSE;
-  }
-
-  if (!gst_buffer_pool_set_active (pool, TRUE)) {
-    GST_ERROR_OBJECT (self, "Failed to set active");
-    gst_object_unref (pool);
-    return FALSE;
-  }
-
-  gst_buffer_pool_acquire_buffer (pool, &priv->fallback_inbuf, nullptr);
-  gst_buffer_pool_set_active (pool, FALSE);
-  gst_object_unref (pool);
-
-  if (!priv->fallback_inbuf) {
-    GST_ERROR_OBJECT (self, "Failed to create fallback buffer");
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-static gboolean
-gst_d3d11_converter_upload_for_shader (GstD3D11Converter * self,
-    GstBuffer * in_buf)
-{
-  GstD3D11ConverterPrivate *priv = self->priv;
-  GstVideoFrame frame, fallback_frame;
-  GstVideoInfo *fallback_info = &priv->fallback_info;
-  gboolean ret = TRUE;
-
-  if (!gst_video_frame_map (&frame, &priv->in_info, in_buf, GST_MAP_READ)) {
-    GST_ERROR_OBJECT (self, "Failed to map input buffer");
-    return FALSE;
-  }
-
-  /* Probably cropped buffer */
-  if (fallback_info->width != GST_VIDEO_FRAME_WIDTH (&frame) ||
-      fallback_info->height != GST_VIDEO_FRAME_HEIGHT (&frame)) {
-    gst_clear_buffer (&priv->fallback_inbuf);
-
-    if (GST_VIDEO_INFO_FORMAT (&priv->in_info) == GST_VIDEO_FORMAT_YUY2 &&
-        priv->unpack_convert) {
-      gst_video_info_set_interlaced_format (fallback_info,
-          GST_VIDEO_FORMAT_Y42B, GST_VIDEO_INFO_INTERLACE_MODE (&frame.info),
-          GST_VIDEO_INFO_WIDTH (&frame.info),
-          GST_VIDEO_INFO_HEIGHT (&frame.info));
-      fallback_info->chroma_site = frame.info.chroma_site;
-      fallback_info->colorimetry = frame.info.colorimetry;
-      fallback_info->fps_n = frame.info.fps_n;
-      fallback_info->fps_d = frame.info.fps_d;
-      fallback_info->par_n = frame.info.par_n;
-      fallback_info->par_d = frame.info.par_d;
-
-      if (priv->unpack_convert)
-        gst_video_converter_free (priv->unpack_convert);
-
-      priv->unpack_convert =
-          gst_video_converter_new (&frame.info, fallback_info, nullptr);
-
-      g_assert (priv->unpack_convert);
-    } else {
-      *fallback_info = frame.info;
-    }
-  }
-
-  if (!priv->fallback_inbuf &&
-      !gst_d3d11_converter_create_fallback_buffer (self)) {
-    goto error;
-  }
-
-  if (!gst_video_frame_map (&fallback_frame,
-          &priv->fallback_info, priv->fallback_inbuf, GST_MAP_WRITE)) {
-    GST_ERROR_OBJECT (self, "Couldn't map fallback buffer");
-    goto error;
-  }
-
-  if (priv->unpack_convert) {
-    gst_video_converter_frame (priv->unpack_convert, &frame, &fallback_frame);
-  } else {
-    ret = gst_video_frame_copy (&fallback_frame, &frame);
-  }
-  gst_video_frame_unmap (&fallback_frame);
-  gst_video_frame_unmap (&frame);
-
-  return ret;
-
-error:
-  gst_video_frame_unmap (&frame);
-  return FALSE;
-}
-
-static gboolean
 gst_d3d11_converter_map_buffer (GstD3D11Converter * self, GstBuffer * buffer,
     GstMapInfo infoGST_VIDEO_MAX_PLANES, GstMapFlags flags)
 {
@@ -3768,83 +2556,6 @@
   return num_views;
 }
 
-static gboolean
-gst_d3d11_converter_ensure_fallback_inbuf (GstD3D11Converter * self,
-    GstBuffer * in_buf, GstMapInfo in_infoGST_VIDEO_MAX_PLANES)
-{
-  GstD3D11ConverterPrivate *priv = self->priv;
-  D3D11_TEXTURE2D_DESC descGST_VIDEO_MAX_PLANES;
-  gboolean same_size = TRUE;
-  ID3D11DeviceContext *context;
-
-  for (guint i = 0; i < gst_buffer_n_memory (in_buf); i++) {
-    GstD3D11Memory *in_mem =
-        (GstD3D11Memory *) gst_buffer_peek_memory (in_buf, i);
-
-    gst_d3d11_memory_get_texture_desc (in_mem, &desci);
-
-    if (same_size && priv->fallback_inbuf) {
-      D3D11_TEXTURE2D_DESC prev_desc;
-      GstD3D11Memory *prev_mem =
-          (GstD3D11Memory *) gst_buffer_peek_memory (priv->fallback_inbuf, i);
-
-      gst_d3d11_memory_get_texture_desc (prev_mem, &prev_desc);
-
-      if (prev_desc.Width != desci.Width ||
-          prev_desc.Height != desci.Height) {
-        same_size = FALSE;
-      }
-    }
-  }
-
-  priv->fallback_info.width = desc0.Width;
-  priv->fallback_info.height = desc0.Height;
-
-  if (priv->fallback_inbuf && !same_size) {
-    GST_DEBUG_OBJECT (self,
-        "Size of new buffer is different from previous fallback");
-    gst_clear_buffer (&priv->fallback_inbuf);
-  }
-
-  if (!priv->fallback_inbuf &&
-      !gst_d3d11_converter_create_fallback_buffer (self)) {
-    return FALSE;
-  }
-
-  context = gst_d3d11_device_get_device_context_handle (self->device);
-  for (guint i = 0; i < gst_buffer_n_memory (in_buf); i++) {
-    GstMemory *mem = gst_buffer_peek_memory (priv->fallback_inbuf, i);
-    GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
-    GstMapInfo info;
-    ID3D11Resource *src_tex = (ID3D11Resource *) in_infoi.data;
-    guint src_subresource = GPOINTER_TO_UINT (in_infoi.user_data0);
-    ID3D11Resource *fallback_tex;
-    D3D11_TEXTURE2D_DESC fallback_desc;
-    D3D11_BOX src_box = { 0, };
-
-    if (!gst_memory_map (mem, &info, (GstMapFlags)
-            (GST_MAP_WRITE | GST_MAP_D3D11))) {
-      GST_ERROR_OBJECT (self, "Couldn't map fallback memory");
-    }
-
-    fallback_tex = (ID3D11Resource *) info.data;
-    gst_d3d11_memory_get_texture_desc (dmem, &fallback_desc);
-
-    src_box.left = 0;
-    src_box.top = 0;
-    src_box.front = 0;
-    src_box.back = 1;
-    src_box.right = MIN (fallback_desc.Width, desci.Width);
-    src_box.bottom = MIN (fallback_desc.Height, desci.Height);
-
-    context->CopySubresourceRegion (fallback_tex, 0, 0, 0, 0,
-        src_tex, src_subresource, &src_box);
-    gst_memory_unmap (mem, &info);
-  }
-
-  return TRUE;
-}
-
 static void
 gst_d3d11_converter_fill_hdr10_meta (const GstVideoMasteringDisplayInfo * mdcv,
     const GstVideoContentLightLevel * cll, DXGI_HDR_METADATA_HDR10 * meta)
@@ -3945,9 +2656,11 @@
   if (gst_d3d11_converter_need_blend (self))
     return FALSE;
 
-  /* flip/rotate is not supported by processor */
-  if (priv->processor_direction_not_supported)
+  /* flip/rotate or affine transform is not supported by processor */
+  if (priv->processor_direction_not_supported ||
+      priv->video_direction == GST_VIDEO_ORIENTATION_CUSTOM) {
     return FALSE;
+  }
 
   return TRUE;
 }
@@ -3963,25 +2676,25 @@
   return gst_d3d11_converter_check_bind_flags_for_piv (desc.BindFlags);
 }
 
-static gboolean
-gst_d3d11_converter_create_piv_buffer (GstD3D11Converter * self)
+static GstBuffer *
+gst_d3d11_converter_create_buffer (GstD3D11Converter * self,
+    const GstVideoInfo * info, guint bind_flags)
 {
   GstD3D11ConverterPrivate *priv = self->priv;
   GstD3D11AllocationParams *params;
   GstBufferPool *pool;
   GstCaps *caps;
   GstStructure *config;
+  GstBuffer *buf = nullptr;
 
-  gst_clear_buffer (&priv->piv_inbuf);
-
-  params = gst_d3d11_allocation_params_new (self->device, &priv->piv_info,
-      GST_D3D11_ALLOCATION_FLAG_DEFAULT, 0, 0);
+  params = gst_d3d11_allocation_params_new (self->device, info,
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags, 0);
 
   caps = gst_video_info_to_caps (&priv->piv_info);
   pool = gst_d3d11_buffer_pool_new (self->device);
 
   config = gst_buffer_pool_get_config (pool);
-  gst_buffer_pool_config_set_params (config, caps, priv->piv_info.size, 0, 0);
+  gst_buffer_pool_config_set_params (config, caps, info->size, 0, 0);
   gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
   gst_caps_unref (caps);
   gst_d3d11_allocation_params_free (params);
@@ -3989,25 +2702,20 @@
   if (!gst_buffer_pool_set_config (pool, config)) {
     GST_ERROR_OBJECT (self, "Failed to set pool config");
     gst_object_unref (pool);
-    return FALSE;
+    return nullptr;
   }
 
   if (!gst_buffer_pool_set_active (pool, TRUE)) {
     GST_ERROR_OBJECT (self, "Failed to set active");
     gst_object_unref (pool);
-    return FALSE;
+    return nullptr;
   }
 
-  gst_buffer_pool_acquire_buffer (pool, &priv->piv_inbuf, nullptr);
+  gst_buffer_pool_acquire_buffer (pool, &buf, nullptr);
   gst_buffer_pool_set_active (pool, FALSE);
   gst_object_unref (pool);
 
-  if (!priv->piv_inbuf) {
-    GST_ERROR_OBJECT (self, "Failed to create PIV buffer");
-    return FALSE;
-  }
-
-  return TRUE;
+  return buf;
 }
 
 static gboolean
@@ -4032,9 +2740,11 @@
     *piv_info = frame.info;
   }
 
-  if (!priv->piv_inbuf && !gst_d3d11_converter_create_piv_buffer (self)) {
+  if (!priv->piv_inbuf)
+    priv->piv_inbuf = gst_d3d11_converter_create_buffer (self, piv_info, 0);
+
+  if (!priv->piv_inbuf)
     goto error;
-  }
 
   if (!gst_video_frame_map (&fallback_frame,
           &priv->piv_info, priv->piv_inbuf, GST_MAP_WRITE)) {
@@ -4060,8 +2770,8 @@
   GstD3D11ConverterPrivate *priv = self->priv;
   ID3D11VideoProcessorInputView *piv = nullptr;
   ID3D11VideoProcessorOutputView *pov = nullptr;
-  ID3D11VideoContext1 *video_ctx = priv->video_context;
-  ID3D11VideoProcessor *proc = priv->processor;
+  ID3D11VideoContext1 *video_ctx = priv->video_context.Get ();
+  ID3D11VideoProcessor *proc = priv->processor.Get ();
   D3D11_VIDEO_PROCESSOR_STREAM stream = { 0, };
   HRESULT hr;
   GstMemory *in_mem, *out_mem;
@@ -4093,14 +2803,14 @@
   out_dmem = GST_D3D11_MEMORY_CAST (out_mem);
 
   piv = gst_d3d11_memory_get_processor_input_view (in_dmem,
-      priv->video_device, priv->enumerator);
+      priv->video_device.Get (), priv->enumerator.Get ());
   if (!piv) {
     GST_ERROR_OBJECT (self, "PIV is unavailable");
     goto out;
   }
 
   pov = gst_d3d11_memory_get_processor_output_view (out_dmem,
-      priv->video_device, priv->enumerator);
+      priv->video_device.Get (), priv->enumerator.Get ());
   if (!pov) {
     GST_ERROR_OBJECT (self, "POV is unavailable");
     goto out;
@@ -4164,6 +2874,32 @@
 }
 
 static gboolean
+gst_d3d11_converter_ensure_postproc_buf (GstD3D11Converter * self,
+    const D3D11_TEXTURE2D_DESC * desc)
+{
+  GstD3D11ConverterPrivate *priv = self->priv;
+
+  if (desc->Width != (UINT) priv->postproc_info.width ||
+      desc->Height != (UINT) priv->postproc_info.height) {
+    gst_video_info_set_format (&priv->postproc_info,
+        GST_VIDEO_INFO_FORMAT (&priv->postproc_info),
+        desc->Width, desc->Height);
+    gst_clear_buffer (&priv->postproc_buf);
+  }
+
+  if (!priv->postproc_buf) {
+    priv->postproc_buf = gst_d3d11_converter_create_buffer (self,
+        &priv->postproc_info,
+        D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE);
+
+    if (!priv->postproc_buf)
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
 gst_d3d11_converter_convert_buffer_internal (GstD3D11Converter * self,
     GstBuffer * in_buf, GstBuffer * out_buf)
 {
@@ -4178,8 +2914,11 @@
   guint num_srv, num_rtv;
   gboolean ret = FALSE;
   gboolean in_d3d11;
+  gboolean multisampled = FALSE;
+  gboolean rtv_bound = TRUE;
+  GstBuffer *shader_output = out_buf;
 
-  GstD3D11SRWLockGuard (&priv->prop_lock);
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
 
   /* Output buffer must be valid D3D11 buffer */
   if (!gst_d3d11_converter_is_d3d11_buffer (self, out_buf)) {
@@ -4198,10 +2937,11 @@
     return FALSE;
   }
 
-  if ((desc.BindFlags & D3D11_BIND_RENDER_TARGET) == 0) {
-    GST_ERROR_OBJECT (self, "Output is not bound to render target");
-    return FALSE;
-  }
+  if ((desc.BindFlags & D3D11_BIND_RENDER_TARGET) == 0)
+    rtv_bound = FALSE;
+
+  if (desc.SampleDesc.Count > 1)
+    multisampled = TRUE;
 
   gst_d3d11_converter_update_hdr10_meta (self);
   /* Update in/out rect */
@@ -4215,8 +2955,14 @@
     return FALSE;
   }
 
+  if (!gst_d3d11_converter_update_transform (self)) {
+    GST_ERROR_OBJECT (self, "Failed to update transform matrix");
+    return FALSE;
+  }
+
   in_d3d11 = gst_d3d11_converter_is_d3d11_buffer (self, in_buf);
-  if (gst_d3d11_converter_processor_available (self)) {
+  if (!multisampled && rtv_bound &&
+      gst_d3d11_converter_processor_available (self)) {
     gboolean use_processor = FALSE;
     gboolean piv_available = FALSE;
 
@@ -4226,11 +2972,18 @@
     if ((priv->supported_backend & GST_D3D11_CONVERTER_BACKEND_SHADER) == 0) {
       /* processor only */
       use_processor = TRUE;
+    } else if ((priv->src_alpha_mode ==
+            GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED ||
+            priv->dst_alpha_mode ==
+            GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED)
+        && GST_VIDEO_INFO_HAS_ALPHA (&priv->in_info)) {
+      /* Needs alpha conversion */
+      use_processor = FALSE;
     } else if (piv_available) {
       in_dmem = (GstD3D11Memory *) gst_buffer_peek_memory (in_buf, 0);
 
-      if (GST_VIDEO_INFO_FORMAT (&priv->in_info) == GST_VIDEO_FORMAT_YUY2) {
-        /* Always use processor for packed YUV */
+      if (priv->need_preproc || priv->need_postproc) {
+        /* Prefer processor for packed YUV */
         use_processor = TRUE;
       } else if (!gst_d3d11_memory_get_shader_resource_view_size (in_dmem)) {
         /* SRV is unavailable, use processor */
@@ -4260,17 +3013,24 @@
 
   if ((priv->supported_backend & GST_D3D11_CONVERTER_BACKEND_SHADER) == 0) {
     GST_ERROR_OBJECT (self, "Conversion is not supported");
-    goto out;
+    return FALSE;
   }
 
-  if (!in_d3d11 ||
-      GST_VIDEO_INFO_FORMAT (&priv->in_info) == GST_VIDEO_FORMAT_YUY2) {
-    if (!gst_d3d11_converter_upload_for_shader (self, in_buf)) {
-      GST_ERROR_OBJECT (self, "Couldn't copy into fallback buffer");
+  in_buf = gst_d3d11_converter_helper_preproc (priv->preproc, in_buf);
+  if (!in_buf) {
+    GST_ERROR_OBJECT (self, "Preprocess failed");
+    return FALSE;
+  }
+
+  if (!rtv_bound || priv->need_postproc) {
+    if (!gst_d3d11_converter_ensure_postproc_buf (self, &desc)) {
+      GST_ERROR_OBJECT (self, "Postproc buffer failed");
       return FALSE;
     }
 
-    in_buf = priv->fallback_inbuf;
+    gst_d3d11_converter_helper_update_size (priv->postproc,
+        desc.Width, desc.Height);
+    shader_output = priv->postproc_buf;
   }
 
   if (!gst_d3d11_converter_map_buffer (self, in_buf, in_info,
@@ -4279,14 +3039,14 @@
     return FALSE;
   }
 
-  if (!gst_d3d11_converter_map_buffer (self, out_buf, out_info,
+  if (!gst_d3d11_converter_map_buffer (self, shader_output, out_info,
           (GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D11))) {
     GST_ERROR_OBJECT (self, "Couldn't map output buffer");
     gst_d3d11_converter_unmap_buffer (self, in_buf, in_info);
     return FALSE;
   }
 
-  num_rtv = gst_d3d11_converter_get_rtv (self, out_buf, rtv);
+  num_rtv = gst_d3d11_converter_get_rtv (self, shader_output, rtv);
   if (!num_rtv) {
     GST_ERROR_OBJECT (self, "RTV is unavailable");
     goto out;
@@ -4294,40 +3054,22 @@
 
   num_srv = gst_d3d11_converter_get_srv (self, in_buf, srv);
   if (!num_srv) {
-    if (in_buf == priv->fallback_inbuf) {
-      GST_ERROR_OBJECT (self, "Unable to get SRV from fallback buffer");
-      goto out;
-    } else if (!gst_d3d11_converter_ensure_fallback_inbuf (self,
-            in_buf, in_info)) {
-      GST_ERROR_OBJECT (self, "Couldn't copy into fallback texture");
-      goto out;
-    }
-
-    gst_d3d11_converter_unmap_buffer (self, in_buf, in_info);
-    in_buf = priv->fallback_inbuf;
-
-    if (!gst_d3d11_converter_map_buffer (self,
-            in_buf, in_info, (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D11))) {
-      GST_ERROR_OBJECT (self, "Couldn't map fallback buffer");
-      in_buf = nullptr;
-      goto out;
-    }
-
-    num_srv = gst_d3d11_converter_get_srv (self, in_buf, srv);
-    if (!num_srv) {
-      GST_ERROR_OBJECT (self, "Couldn't get SRV from fallback input");
-      goto out;
-    }
+    GST_ERROR_OBJECT (self, "SRV is unavailable");
+    goto out;
   }
 
   GST_TRACE_OBJECT (self, "Converting using shader");
 
-  ret = gst_d3d11_converter_convert_internal (self, srv, rtv);
+  ret = gst_d3d11_converter_convert_internal (self, srv, rtv, multisampled);
 
 out:
-  if (in_buf)
-    gst_d3d11_converter_unmap_buffer (self, in_buf, in_info);
-  gst_d3d11_converter_unmap_buffer (self, out_buf, out_info);
+  gst_d3d11_converter_unmap_buffer (self, in_buf, in_info);
+  gst_d3d11_converter_unmap_buffer (self, shader_output, out_info);
+
+  if (ret) {
+    ret = gst_d3d11_converter_helper_postproc (priv->postproc, shader_output,
+        out_buf);
+  }
 
   return ret;
 }
@@ -4372,7 +3114,6 @@
  *
  * Since: 1.22
  */
-
 gboolean
 gst_d3d11_converter_convert_buffer_unlocked (GstD3D11Converter * converter,
     GstBuffer * in_buf, GstBuffer * out_buf)
@@ -4384,3 +3125,123 @@
   return gst_d3d11_converter_convert_buffer_internal (converter,
       in_buf, out_buf);
 }
+
+/**
+ * gst_d3d11_converter_set_transform_matrix:
+ * @converter: a #GstD3D11Converter
+ * @matrix: the row-major 4x4 transform matrix
+ *
+ * Apply transform matrix
+ *
+ * Returns: %TRUE if successful
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_d3d11_converter_set_transform_matrix (GstD3D11Converter * converter,
+    const gfloat matrix16)
+{
+  GstD3D11ConverterPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_D3D11_CONVERTER (converter), FALSE);
+  g_return_val_if_fail (matrix, FALSE);
+
+  priv = converter->priv;
+  if ((priv->supported_backend & GST_D3D11_CONVERTER_BACKEND_SHADER) == 0) {
+    GST_ERROR_OBJECT (converter, "Shader backend is disabled");
+    return FALSE;
+  }
+
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+  priv->custom_transform = XMFLOAT4X4A (matrix);
+  priv->update_transform = TRUE;
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d11_converter_apply_transform (GstD3D11Converter * converter,
+    GstVideoOrientationMethod method, gfloat viewport_width,
+    gfloat viewport_height, gfloat fov, gboolean ortho, gfloat rotation_x,
+    gfloat rotation_y, gfloat rotation_z, gfloat scale_x, gfloat scale_y)
+{
+  GstD3D11ConverterPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_D3D11_CONVERTER (converter), FALSE);
+
+  priv = converter->priv;
+  if ((priv->supported_backend & GST_D3D11_CONVERTER_BACKEND_SHADER) == 0) {
+    GST_ERROR_OBJECT (converter, "Shader backend is disabled");
+    return FALSE;
+  }
+
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+  gfloat aspect_ratio;
+  gboolean rotated = FALSE;
+  XMMATRIX rotate_matrix = XMMatrixIdentity ();
+
+  switch (method) {
+    case GST_VIDEO_ORIENTATION_IDENTITY:
+    case GST_VIDEO_ORIENTATION_AUTO:
+    case GST_VIDEO_ORIENTATION_CUSTOM:
+    default:
+      break;
+    case GST_VIDEO_ORIENTATION_90R:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_90r);
+      rotated = TRUE;
+      break;
+    case GST_VIDEO_ORIENTATION_180:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_180);
+      break;
+    case GST_VIDEO_ORIENTATION_90L:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_90l);
+      rotated = TRUE;
+      break;
+    case GST_VIDEO_ORIENTATION_HORIZ:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_horiz);
+      break;
+    case GST_VIDEO_ORIENTATION_VERT:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_vert);
+      break;
+    case GST_VIDEO_ORIENTATION_UL_LR:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_ul_lr);
+      rotated = TRUE;
+      break;
+    case GST_VIDEO_ORIENTATION_UR_LL:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_ur_ll);
+      rotated = TRUE;
+      break;
+  }
+
+  if (rotated)
+    aspect_ratio = viewport_height / viewport_width;
+  else
+    aspect_ratio = viewport_width / viewport_height;
+
+  /* Apply user specified transform matrix first, then rotate-method */
+  XMMATRIX scale = XMMatrixScaling (scale_x * aspect_ratio, scale_y, 1.0);
+
+  XMMATRIX rotate =
+      XMMatrixRotationX (XMConvertToRadians (rotation_x)) *
+      XMMatrixRotationY (XMConvertToRadians (-rotation_y)) *
+      XMMatrixRotationZ (XMConvertToRadians (-rotation_z));
+
+  XMMATRIX view = XMMatrixLookAtLH (XMVectorSet (0.0, 0.0, -1.0, 0.0),
+      XMVectorSet (0.0, 0.0, 0.0, 0.0), XMVectorSet (0.0, 1.0, 0.0, 0.0));
+
+  XMMATRIX proj;
+  if (ortho) {
+    proj = XMMatrixOrthographicOffCenterLH (-aspect_ratio,
+        aspect_ratio, -1.0, 1.0, 0.1, 100.0);
+  } else {
+    proj = XMMatrixPerspectiveFovLH (XMConvertToRadians (fov),
+        aspect_ratio, 0.1, 100.0);
+  }
+
+  XMMATRIX mvp = scale * rotate * view * proj * rotate_matrix;
+  XMStoreFloat4x4A (&priv->custom_transform, mvp);
+  priv->update_transform = TRUE;
+  priv->video_direction = GST_VIDEO_ORIENTATION_CUSTOM;
+
+  return TRUE;
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/gstd3d11converter.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11converter.h Changed

@@ -81,6 +81,68 @@
  */
 #define GST_D3D11_CONVERTER_OPT_PRIMARIES_MODE "GstD3D11Converter.primaries-mode"
 
+ /**
+  * GST_D3D11_CONVERTER_OPT_SAMPLER_FILTER:
+  *
+  * #D3D11_FILTER, set sampler filter.
+  *
+  * Supported values are:
+  * @D3D11_FILTER_MIN_MAG_MIP_POINT
+  * @D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT
+  * @D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT
+  * @D3D11_FILTER_ANISOTROPIC
+  *
+  * Default is #D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT.
+  *
+  * Since: 1.24
+  */
+#define GST_D3D11_CONVERTER_OPT_SAMPLER_FILTER "GstD3D11Converter.sampler-filter"
+
+GST_D3D11_API
+GType gst_d3d11_converter_sampler_filter_get_type (void);
+#define GST_TYPE_D3D11_CONVERTER_SAMPLER_FILTER (gst_d3d11_converter_sampler_filter_get_type())
+
+/**
+ * GstD3D11ConverterAlphaMode:
+ * @GST_D3D11_CONVERTER_ALPHA_MODE_UNSPECIFIED: Unspecified alpha mode
+ * @GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED: Premultiplied alpha
+ * @GST_D3D11_CONVERTER_ALPHA_MODE_STRAIGHT: Straight alpha
+ *
+ * Alpha mode. Enum values are idnetical to DXGI_ALPHA_MODE
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_D3D11_CONVERTER_ALPHA_MODE_UNSPECIFIED = 0,
+  GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED = 1,
+  GST_D3D11_CONVERTER_ALPHA_MODE_STRAIGHT = 2,
+} GstD3D11ConverterAlphaMode;
+
+GST_D3D11_API
+GType gst_d3d11_converter_alpha_mode_get_type (void);
+#define GST_TYPE_D3D11_CONVERTER_ALPHA_MODE (gst_d3d11_converter_alpha_mode_get_type())
+
+/**
+ * GST_D3D11_CONVERTER_OPT_SRC_ALPHA_MODE:
+ *
+ * Set the source alpha mode.
+ * Default is #GST_D3D11_CONVERTER_ALPHA_MODE_UNSPECIFIED.
+ *
+ * Since: 1.24
+ */
+#define GST_D3D11_CONVERTER_OPT_SRC_ALPHA_MODE "GstD3D11Converter.src-alpha-mode"
+
+/**
+ * GST_D3D11_CONVERTER_OPT_DEST_ALPHA_MODE:
+ *
+ * Set the source alpha mode.
+ * Default is #GST_D3D11_CONVERTER_ALPHA_MODE_UNSPECIFIED.
+ *
+ * Since: 1.24
+ */
+#define GST_D3D11_CONVERTER_OPT_DEST_ALPHA_MODE "GstD3D11Converter.dest-alpha-mode"
+
 /**
  * GstD3D11Converter:
  *
@@ -133,4 +195,8 @@
                                                                  GstBuffer * in_buf,
                                                                  GstBuffer * out_buf);
 
+GST_D3D11_API
+gboolean            gst_d3d11_converter_set_transform_matrix (GstD3D11Converter * converter,
+                                                              const gfloat matrix16);
+
 G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11device-private.h Added

@@ -0,0 +1,85 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/d3d11/gstd3d11_fwd.h>
+
+G_BEGIN_DECLS
+
+GST_D3D11_API
+gint64  gst_d3d11_pixel_shader_token_new (void);
+
+GST_D3D11_API
+gint64  gst_d3d11_vertex_shader_token_new (void);
+
+GST_D3D11_API
+gint64  gst_d3d11_compute_shader_token_new (void);
+
+GST_D3D11_API
+HRESULT gst_d3d11_device_get_pixel_shader  (GstD3D11Device * device,
+                                            gint64 token,
+                                            const void * bytecode,
+                                            gsize bytecode_size,
+                                            const gchar * source,
+                                            gsize source_size,
+                                            const gchar * entry_point,
+                                            const D3D_SHADER_MACRO * defines,
+                                            ID3D11PixelShader ** ps);
+
+GST_D3D11_API
+HRESULT gst_d3d11_device_get_pixel_shader_uncached (GstD3D11Device * device,
+                                                    gint64 token,
+                                                    const void * bytecode,
+                                                    gsize bytecode_size,
+                                                    const gchar * source,
+                                                    gsize source_size,
+                                                    const gchar * entry_point,
+                                                    const D3D_SHADER_MACRO * defines,
+                                                    ID3D11PixelShader ** ps);
+
+GST_D3D11_API
+HRESULT gst_d3d11_device_get_vertex_shader (GstD3D11Device * device,
+                                            gint64 token,
+                                            const void * bytecode,
+                                            gsize bytecode_size,
+                                            const gchar * source,
+                                            gsize source_size,
+                                            const gchar * entry_point,
+                                            const D3D11_INPUT_ELEMENT_DESC * input_desc,
+                                            guint desc_len,
+                                            ID3D11VertexShader ** vs,
+                                            ID3D11InputLayout ** layout);
+
+GST_D3D11_API
+HRESULT gst_d3d11_device_get_sampler       (GstD3D11Device * device,
+                                            D3D11_FILTER filter,
+                                            ID3D11SamplerState ** sampler);
+
+GST_D3D11_API
+HRESULT gst_d3d11_device_get_rasterizer    (GstD3D11Device * device,
+                                            ID3D11RasterizerState ** rasterizer);
+
+GST_D3D11_API
+HRESULT gst_d3d11_device_get_rasterizer_msaa (GstD3D11Device * device,
+                                              ID3D11RasterizerState ** rasterizer);
+
+G_END_DECLS
+

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/gstd3d11device.cpp -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11device.cpp Changed

@@ -23,15 +23,24 @@
 #endif
 
 #include "gstd3d11device.h"
+#include "gstd3d11device-private.h"
 #include "gstd3d11utils.h"
 #include "gstd3d11format.h"
 #include "gstd3d11-private.h"
 #include "gstd3d11memory.h"
+#include "gstd3d11compile.h"
+#include "gstd3d11shadercache.h"
 #include <gmodule.h>
 #include <wrl.h>
 
 #include <windows.h>
 #include <versionhelpers.h>
+#include <map>
+#include <utility>
+#include <atomic>
+#include <mutex>
+#include <string.h>
+#include <unordered_map>
 
 /**
  * SECTION:gstd3d11device
@@ -92,42 +101,53 @@
 #define DEFAULT_ADAPTER 0
 #define DEFAULT_CREATE_FLAGS 0
 
+/* *INDENT-OFF* */
 struct _GstD3D11DevicePrivate
 {
-  guint adapter;
-  guint device_id;
-  guint vendor_id;
-  gboolean hardware;
-  gchar *description;
-  guint create_flags;
-  gint64 adapter_luid;
+  guint adapter = 0;
+  guint device_id = 0;
+  guint vendor_id = 0;
+  gboolean hardware = 0;
+  gchar *description = nullptr;
+  guint create_flags = 0;
+  gint64 adapter_luid = 0;
 
-  ID3D11Device *device;
-  ID3D11Device5 *device5;
-  ID3D11DeviceContext *device_context;
-  ID3D11DeviceContext4 *device_context4;
+  ID3D11Device *device = nullptr;
+  ID3D11Device5 *device5 = nullptr;
+  ID3D11DeviceContext *device_context = nullptr;
+  ID3D11DeviceContext4 *device_context4 = nullptr;
 
-  ID3D11VideoDevice *video_device;
-  ID3D11VideoContext *video_context;
+  ID3D11VideoDevice *video_device = nullptr;
+  ID3D11VideoContext *video_context = nullptr;
 
-  IDXGIFactory1 *factory;
-  GArray *format_table;
+  IDXGIFactory1 *factory = nullptr;
+  std::unordered_map<GstVideoFormat, GstD3D11Format> format_table;
 
-  CRITICAL_SECTION extern_lock;
-  SRWLOCK resource_lock;
+  std::recursive_mutex extern_lock;
+  std::mutex resource_lock;
 
   LARGE_INTEGER frequency;
 
+  D3D_FEATURE_LEVEL feature_level;
+  std::map <gint64, ComPtr<ID3D11PixelShader>> ps_cache;
+  std::map <gint64,
+      std::pair<ComPtr<ID3D11VertexShader>, ComPtr<ID3D11InputLayout>>> vs_cache;
+  std::map <D3D11_FILTER, ComPtr<ID3D11SamplerState>> sampler_cache;
+
+  ID3D11RasterizerState *rs = nullptr;
+  ID3D11RasterizerState *rs_msaa = nullptr;
+
 #if HAVE_D3D11SDKLAYERS_H
-  ID3D11Debug *d3d11_debug;
-  ID3D11InfoQueue *d3d11_info_queue;
+  ID3D11Debug *d3d11_debug = nullptr;
+  ID3D11InfoQueue *d3d11_info_queue = nullptr;
 #endif
 
 #if HAVE_DXGIDEBUG_H
-  IDXGIDebug *dxgi_debug;
-  IDXGIInfoQueue *dxgi_info_queue;
+  IDXGIDebug *dxgi_debug = nullptr;
+  IDXGIInfoQueue *dxgi_info_queue = nullptr;
 #endif
 };
+/* *INDENT-ON* */
 
 static void
 debug_init_once (void)
@@ -144,7 +164,7 @@
 
 #define gst_d3d11_device_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstD3D11Device, gst_d3d11_device, GST_TYPE_OBJECT,
-    G_ADD_PRIVATE (GstD3D11Device); debug_init_once ());
+    debug_init_once ());
 
 static void gst_d3d11_device_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
@@ -225,7 +245,7 @@
       return;
     }
 
-    msg = (D3D11_MESSAGE *) g_alloca (msg_len);
+    msg = (D3D11_MESSAGE *) g_malloc0 (msg_len);
     hr = info_queue->GetMessage (i, msg, &msg_len);
 
     level = d3d11_message_severity_to_gst (msg->Severity);
@@ -238,6 +258,7 @@
 
     gst_debug_log (gst_d3d11_debug_layer_debug, level, file, function, line,
         G_OBJECT (device), "D3D11InfoQueue: %s", msg->pDescription);
+    g_free (msg);
   }
 
   info_queue->ClearStoredMessages ();
@@ -336,12 +357,13 @@
       return;
     }
 
-    msg = (DXGI_INFO_QUEUE_MESSAGE *) g_alloca (msg_len);
+    msg = (DXGI_INFO_QUEUE_MESSAGE *) g_malloc0 (msg_len);
     hr = info_queue->GetMessage (DXGI_DEBUG_ALL, i, msg, &msg_len);
 
     level = dxgi_info_queue_message_severity_to_gst (msg->Severity);
     gst_debug_log (gst_d3d11_debug_layer_debug, level, file, function, line,
         G_OBJECT (device), "DXGIInfoQueue: %s", msg->pDescription);
+    g_free (msg);
   }
 
   info_queue->ClearStoredMessages (DXGI_DEBUG_ALL);
@@ -401,17 +423,7 @@
 static void
 gst_d3d11_device_init (GstD3D11Device * self)
 {
-  GstD3D11DevicePrivate *priv;
-
-  priv = (GstD3D11DevicePrivate *)
-      gst_d3d11_device_get_instance_private (self);
-  priv->adapter = DEFAULT_ADAPTER;
-  priv->format_table = g_array_sized_new (FALSE, FALSE,
-      sizeof (GstD3D11Format), GST_D3D11_N_FORMATS);
-
-  InitializeCriticalSection (&priv->extern_lock);
-
-  self->priv = priv;
+  self->priv = new GstD3D11DevicePrivate ();
 }
 
 static gboolean
@@ -509,6 +521,12 @@
       case GST_VIDEO_FORMAT_P012_LE:
       case GST_VIDEO_FORMAT_P016_LE:
       case GST_VIDEO_FORMAT_YUY2:
+      case GST_VIDEO_FORMAT_Y210:
+      case GST_VIDEO_FORMAT_Y212_LE:
+      case GST_VIDEO_FORMAT_Y412_LE:
+      case GST_VIDEO_FORMAT_BGRA64_LE:
+      case GST_VIDEO_FORMAT_BGR10A2_LE:
+      case GST_VIDEO_FORMAT_RBGA:
       {
         gboolean supported = TRUE;
 
@@ -558,12 +576,31 @@
       case GST_VIDEO_FORMAT_Y444_16LE:
       case GST_VIDEO_FORMAT_AYUV:
       case GST_VIDEO_FORMAT_AYUV64:
+      case GST_VIDEO_FORMAT_UYVY:
+      case GST_VIDEO_FORMAT_VYUY:
+      case GST_VIDEO_FORMAT_YVYU:
+      case GST_VIDEO_FORMAT_ARGB:
+      case GST_VIDEO_FORMAT_xRGB:
+      case GST_VIDEO_FORMAT_ABGR:
+      case GST_VIDEO_FORMAT_xBGR:
+      case GST_VIDEO_FORMAT_RGB:
+      case GST_VIDEO_FORMAT_BGR:
+      case GST_VIDEO_FORMAT_v210:
+      case GST_VIDEO_FORMAT_v216:
+      case GST_VIDEO_FORMAT_v308:
+      case GST_VIDEO_FORMAT_IYU2:
+      case GST_VIDEO_FORMAT_RGB16:
+      case GST_VIDEO_FORMAT_BGR16:
+      case GST_VIDEO_FORMAT_RGB15:
+      case GST_VIDEO_FORMAT_BGR15:
+      case GST_VIDEO_FORMAT_r210:
         /* RGB planar formats */
       case GST_VIDEO_FORMAT_RGBP:
       case GST_VIDEO_FORMAT_BGRP:
       case GST_VIDEO_FORMAT_GBR:
       case GST_VIDEO_FORMAT_GBR_10LE:
       case GST_VIDEO_FORMAT_GBR_12LE:
+      case GST_VIDEO_FORMAT_GBR_16LE:
       case GST_VIDEO_FORMAT_GBRA:
       case GST_VIDEO_FORMAT_GBRA_10LE:
       case GST_VIDEO_FORMAT_GBRA_12LE:
@@ -602,66 +639,13 @@
     for (guint j = 0; j < GST_VIDEO_MAX_PLANES; j++)
       format.format_supportj = supportj;
 
+#ifndef GST_DISABLE_GST_DEBUG
     if (gst_debug_category_get_threshold (GST_CAT_DEFAULT) >= GST_LEVEL_LOG)
       dump_format (self, &format);
+#endif
 
-    g_array_append_val (priv->format_table, format);
-  }
-
-  /* FIXME: d3d11 sampler doesn't support packed-and-subsampled formats
-   * very well (and it's really poorly documented).
-   * As per observation, d3d11 samplers seems to be dropping the second
-   * Y componet from "Y0-U0-Y1-V0" pair which results in bad visual quality
-   * than 4:2:0 subsampled formats. We should revisit this later */
-
-  /* TODO: The best would be using d3d11 compute shader to handle this kinds of
-   * samples but comute shader is not implemented yet by us.
-   *
-   * Another simple approach is using d3d11 video processor,
-   * but capability will be very device dependent because it depends on
-   * GPU vendor's driver implementation, moreover, software fallback does
-   * not support d3d11 video processor. So it's not reliable in this case */
-#if 0
-  /* NOTE: packted yuv 4:2:2 YUY2, UYVY, and VYUY formats are not natively
-   * supported render target view formats
-   * (i.e., cannot be output format of shader pipeline) */
-  priv->format_tablen_formats.format = GST_VIDEO_FORMAT_YUY2;
-  if (can_support_format (self, DXGI_FORMAT_YUY2,
-          D3D11_FORMAT_SUPPORT_SHADER_SAMPLE)) {
-    priv->format_tablen_formats.resource_format0 =
-        DXGI_FORMAT_R8G8B8A8_UNORM;
-    priv->format_tablen_formats.dxgi_format = DXGI_FORMAT_YUY2;
-  } else {
-    /* If DXGI_FORMAT_YUY2 format is not supported, use this format,
-     * it's analogous to YUY2 */
-    priv->format_tablen_formats.resource_format0 =
-        DXGI_FORMAT_G8R8_G8B8_UNORM;
+    priv->format_tableformat.format = format;
   }
-  n_formats++;
-
-  /* No native DXGI format available for UYVY */
-  priv->format_tablen_formats.format = GST_VIDEO_FORMAT_UYVY;
-  priv->format_tablen_formats.resource_format0 =
-      DXGI_FORMAT_R8G8_B8G8_UNORM;
-  n_formats++;
-
-  /* No native DXGI format available for VYUY */
-  priv->format_tablen_formats.format = GST_VIDEO_FORMAT_VYUY;
-  priv->format_tablen_formats.resource_format0 =
-      DXGI_FORMAT_R8G8_B8G8_UNORM;
-  n_formats++;
-
-  /* Y210 and Y410 formats cannot support rtv */
-  priv->format_tablen_formats.format = GST_VIDEO_FORMAT_Y210;
-  priv->format_tablen_formats.resource_format0 =
-      DXGI_FORMAT_R16G16B16A16_UNORM;
-  if (can_support_format (self, DXGI_FORMAT_Y210,
-          D3D11_FORMAT_SUPPORT_SHADER_SAMPLE))
-    priv->format_tablen_formats.dxgi_format = DXGI_FORMAT_Y210;
-  else
-    priv->format_tablen_formats.dxgi_format = DXGI_FORMAT_UNKNOWN;
-  n_formats++;
-#endif
 }
 
 static void
@@ -696,6 +680,31 @@
   }
 }
 
+void
+gst_d3d11_device_log_live_objects (GstD3D11Device * device,
+    const gchar * file, const gchar * function, gint line)
+{
+#if HAVE_D3D11SDKLAYERS_H
+  if (device->priv->d3d11_debug) {
+    device->priv->d3d11_debug->ReportLiveDeviceObjects ((D3D11_RLDO_FLAGS)
+        GST_D3D11_RLDO_FLAGS);
+  }
+
+  if (device->priv->d3d11_info_queue)
+    gst_d3d11_device_d3d11_debug (device, file, function, line);
+#endif
+
+#if HAVE_DXGIDEBUG_H
+  if (device->priv->dxgi_debug) {
+    device->priv->dxgi_debug->ReportLiveObjects (DXGI_DEBUG_ALL,
+        (DXGI_DEBUG_RLO_FLAGS) GST_D3D11_RLDO_FLAGS);
+  }
+
+  if (device->priv->dxgi_info_queue)
+    gst_d3d11_device_dxgi_debug (device, file, function, line);
+#endif
+}
+
 static void
 gst_d3d11_device_dispose (GObject * object)
 {
@@ -704,6 +713,12 @@
 
   GST_LOG_OBJECT (self, "dispose");
 
+  priv->ps_cache.clear ();
+  priv->vs_cache.clear ();
+  priv->sampler_cache.clear ();
+
+  GST_D3D11_CLEAR_COM (priv->rs);
+  GST_D3D11_CLEAR_COM (priv->rs_msaa);
   GST_D3D11_CLEAR_COM (priv->device5);
   GST_D3D11_CLEAR_COM (priv->device_context4);
   GST_D3D11_CLEAR_COM (priv->video_device);
@@ -711,29 +726,15 @@
   GST_D3D11_CLEAR_COM (priv->device);
   GST_D3D11_CLEAR_COM (priv->device_context);
   GST_D3D11_CLEAR_COM (priv->factory);
+  gst_d3d11_device_log_live_objects (self, __FILE__, GST_FUNCTION, __LINE__);
+
 #if HAVE_D3D11SDKLAYERS_H
-  if (priv->d3d11_debug) {
-    priv->d3d11_debug->ReportLiveDeviceObjects ((D3D11_RLDO_FLAGS)
-        GST_D3D11_RLDO_FLAGS);
-  }
   GST_D3D11_CLEAR_COM (priv->d3d11_debug);
-
-  if (priv->d3d11_info_queue)
-    gst_d3d11_device_d3d11_debug (self, __FILE__, GST_FUNCTION, __LINE__);
-
   GST_D3D11_CLEAR_COM (priv->d3d11_info_queue);
 #endif
 
 #if HAVE_DXGIDEBUG_H
-  if (priv->dxgi_debug) {
-    priv->dxgi_debug->ReportLiveObjects (DXGI_DEBUG_ALL,
-        (DXGI_DEBUG_RLO_FLAGS) GST_D3D11_RLDO_FLAGS);
-  }
   GST_D3D11_CLEAR_COM (priv->dxgi_debug);
-
-  if (priv->dxgi_info_queue)
-    gst_d3d11_device_dxgi_debug (self, __FILE__, GST_FUNCTION, __LINE__);
-
   GST_D3D11_CLEAR_COM (priv->dxgi_info_queue);
 #endif
 
@@ -748,10 +749,10 @@
 
   GST_LOG_OBJECT (self, "finalize");
 
-  g_array_unref (priv->format_table);
-  DeleteCriticalSection (&priv->extern_lock);
   g_free (priv->description);
 
+  delete priv;
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -833,7 +834,6 @@
       ComPtr < IDXGIDevice > dxgi_device;
       ComPtr < IDXGIAdapter > adapter;
       ID3D11Device *device = data->data.device;
-      guint luid;
 
       hr = device->QueryInterface (IID_PPV_ARGS (&dxgi_device));
       if (FAILED (hr))
@@ -851,7 +851,7 @@
       if (FAILED (hr))
         return hr;
 
-      luid = gst_d3d11_luid_to_int64 (&desc.AdapterLuid);
+      auto luid = gst_d3d11_luid_to_int64 (&desc.AdapterLuid);
 
       for (guint i = 0;; i++) {
         DXGI_ADAPTER_DESC tmp_desc;
@@ -965,9 +965,6 @@
     D3D_FEATURE_LEVEL_11_0,
     D3D_FEATURE_LEVEL_10_1,
     D3D_FEATURE_LEVEL_10_0,
-    D3D_FEATURE_LEVEL_9_3,
-    D3D_FEATURE_LEVEL_9_2,
-    D3D_FEATURE_LEVEL_9_1
   };
   D3D_FEATURE_LEVEL selected_level;
 
@@ -1008,6 +1005,12 @@
       return nullptr;
     }
 
+    selected_level = device->GetFeatureLevel ();
+    if (selected_level < D3D_FEATURE_LEVEL_10_0) {
+      GST_ERROR ("Feature level 0x%x is not supported", (guint) selected_level);
+      return nullptr;
+    }
+
     device->GetImmediateContext (&device_context);
   }
 
@@ -1099,6 +1102,7 @@
   priv->description = g_utf16_to_utf8 ((gunichar2 *) adapter_desc.Description,
       -1, nullptr, nullptr, nullptr);
   priv->adapter_luid = gst_d3d11_luid_to_int64 (&adapter_desc.AdapterLuid);
+  priv->feature_level = priv->device->GetFeatureLevel ();
 
   DXGI_ADAPTER_DESC1 desc1;
   hr = adapter->GetDesc1 (&desc1);
@@ -1262,7 +1266,7 @@
   g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), NULL);
 
   priv = device->priv;
-  GstD3D11SRWLockGuard lk (&priv->resource_lock);
+  std::lock_guard < std::mutex > lk (priv->resource_lock);
   if (!priv->video_device) {
     HRESULT hr;
     ID3D11VideoDevice *video_device = NULL;
@@ -1295,7 +1299,7 @@
   g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), NULL);
 
   priv = device->priv;
-  GstD3D11SRWLockGuard lk (&priv->resource_lock);
+  std::lock_guard < std::mutex > lk (priv->resource_lock);
   if (!priv->video_context) {
     HRESULT hr;
     ID3D11VideoContext *video_context = NULL;
@@ -1328,7 +1332,7 @@
   priv = device->priv;
 
   GST_TRACE_OBJECT (device, "device locking");
-  EnterCriticalSection (&priv->extern_lock);
+  priv->extern_lock.lock ();
   GST_TRACE_OBJECT (device, "device locked");
 }
 
@@ -1350,7 +1354,7 @@
 
   priv = device->priv;
 
-  LeaveCriticalSection (&priv->extern_lock);
+  priv->extern_lock.unlock ();
   GST_TRACE_OBJECT (device, "device unlocked");
 }
 
@@ -1377,23 +1381,18 @@
 
   priv = device->priv;
 
-  for (guint i = 0; i < priv->format_table->len; i++) {
-    const GstD3D11Format *d3d11_fmt =
-        &g_array_index (priv->format_table, GstD3D11Format, i);
-
-    if (d3d11_fmt->format != format)
-      continue;
-
+  const auto & target = priv->format_table.find (format);
+  if (target == priv->format_table.end ()) {
     if (device_format)
-      *device_format = *d3d11_fmt;
+      gst_d3d11_format_init (device_format);
 
-    return TRUE;
+    return FALSE;
   }
 
   if (device_format)
-    gst_d3d11_format_init (device_format);
+    *device_format = target->second;
 
-  return FALSE;
+  return TRUE;
 }
 
 GST_DEFINE_MINI_OBJECT_TYPE (GstD3D11Fence, gst_d3d11_fence);
@@ -1650,3 +1649,286 @@
 
   return TRUE;
 }
+
+gint64
+gst_d3d11_pixel_shader_token_new (void)
+{
+  /* *INDENT-OFF* */
+  static std::atomic < gint64 > token_ { 0 };
+  /* *INDENT-ON* */
+
+  return token_.fetch_add (1);
+}
+
+gint64
+gst_d3d11_vertex_shader_token_new (void)
+{
+  /* *INDENT-OFF* */
+  static std::atomic < gint64 > token_ { 0 };
+  /* *INDENT-ON* */
+
+  return token_.fetch_add (1);
+}
+
+gint64
+gst_d3d11_compute_shader_token_new (void)
+{
+  /* *INDENT-OFF* */
+  static std::atomic < gint64 > token_ { 0 };
+  /* *INDENT-ON* */
+
+  return token_.fetch_add (1);
+}
+
+HRESULT
+gst_d3d11_device_get_pixel_shader_uncached (GstD3D11Device * device,
+    gint64 token, const void *bytecode, gsize bytecode_size,
+    const gchar * source, gsize source_size, const gchar * entry_point,
+    const D3D_SHADER_MACRO * defines, ID3D11PixelShader ** ps)
+{
+  GstD3D11DevicePrivate *priv = device->priv;
+  HRESULT hr;
+  ComPtr < ID3D11PixelShader > shader;
+  ComPtr < ID3DBlob > blob;
+  const void *data;
+  gsize size;
+
+  GST_LOG_OBJECT (device,
+      "Creating pixel shader for token %" G_GINT64_FORMAT ", source:\n%s",
+      token, source);
+
+  if (bytecode && bytecode_size > 1) {
+    data = bytecode;
+    size = bytecode_size;
+    GST_DEBUG_OBJECT (device,
+        "Creating shader \"%s\" using precompiled bytecode", entry_point);
+  } else {
+    hr = gst_d3d11_shader_cache_get_pixel_shader_blob (token,
+        source, source_size, entry_point, defines, &blob);
+    if (!gst_d3d11_result (hr, device))
+      return hr;
+
+    data = blob->GetBufferPointer ();
+    size = blob->GetBufferSize ();
+  }
+
+  hr = priv->device->CreatePixelShader (data, size, nullptr, &shader);
+  if (!gst_d3d11_result (hr, device))
+    return hr;
+
+  GST_DEBUG_OBJECT (device,
+      "Created pixel shader \"%s\" for token %" G_GINT64_FORMAT,
+      entry_point, token);
+  *ps = shader.Detach ();
+
+  return S_OK;
+}
+
+HRESULT
+gst_d3d11_device_get_pixel_shader (GstD3D11Device * device, gint64 token,
+    const void *bytecode, gsize bytecode_size, const gchar * source,
+    gsize source_size, const gchar * entry_point,
+    const D3D_SHADER_MACRO * defines, ID3D11PixelShader ** ps)
+{
+  GstD3D11DevicePrivate *priv = device->priv;
+  HRESULT hr;
+  ComPtr < ID3D11PixelShader > shader;
+
+  GST_DEBUG_OBJECT (device, "Getting pixel shader \"%s\" for token %"
+      G_GINT64_FORMAT, entry_point, token);
+
+  std::lock_guard < std::mutex > lk (priv->resource_lock);
+  auto cached = priv->ps_cache.find (token);
+  if (cached != priv->ps_cache.end ()) {
+    GST_DEBUG_OBJECT (device,
+        "Found cached pixel shader \"%s\" for token %" G_GINT64_FORMAT,
+        entry_point, token);
+    *ps = cached->second.Get ();
+    (*ps)->AddRef ();
+    return S_OK;
+  }
+
+  hr = gst_d3d11_device_get_pixel_shader_uncached (device, token, bytecode,
+      bytecode_size, source, source_size, entry_point, defines, &shader);
+  if (!gst_d3d11_result (hr, device))
+    return hr;
+
+  priv->ps_cachetoken = shader;
+  *ps = shader.Detach ();
+
+  return S_OK;
+}
+
+HRESULT
+gst_d3d11_device_get_vertex_shader (GstD3D11Device * device, gint64 token,
+    const void *bytecode, gsize bytecode_size, const gchar * source,
+    gsize source_size, const gchar * entry_point,
+    const D3D11_INPUT_ELEMENT_DESC * input_desc, guint desc_len,
+    ID3D11VertexShader ** vs, ID3D11InputLayout ** layout)
+{
+  GstD3D11DevicePrivate *priv = device->priv;
+  HRESULT hr;
+  ComPtr < ID3D11VertexShader > shader;
+  ComPtr < ID3D11InputLayout > input_layout;
+  ComPtr < ID3DBlob > blob;
+  const void *data;
+  gsize size;
+
+  GST_DEBUG_OBJECT (device, "Getting vertext shader \"%s\" for token %"
+      G_GINT64_FORMAT, entry_point, token);
+
+  std::lock_guard < std::mutex > lk (priv->resource_lock);
+  auto cached = priv->vs_cache.find (token);
+  if (cached != priv->vs_cache.end ()) {
+    GST_DEBUG_OBJECT (device,
+        "Found cached vertex shader \"%s\" for token %" G_GINT64_FORMAT,
+        entry_point, token);
+    *vs = cached->second.first.Get ();
+    *layout = cached->second.second.Get ();
+    (*vs)->AddRef ();
+    (*layout)->AddRef ();
+    return S_OK;
+  }
+
+  GST_LOG_OBJECT (device,
+      "Creating vertex shader for token %" G_GINT64_FORMAT ", shader: \n%s",
+      token, source);
+
+  if (bytecode && bytecode_size > 1) {
+    data = bytecode;
+    size = bytecode_size;
+    GST_DEBUG_OBJECT (device,
+        "Creating shader \"%s\" using precompiled bytecode", entry_point);
+  } else {
+    hr = gst_d3d11_shader_cache_get_vertex_shader_blob (token,
+        source, source_size, entry_point, &blob);
+    if (!gst_d3d11_result (hr, device))
+      return hr;
+
+    data = blob->GetBufferPointer ();
+    size = blob->GetBufferSize ();
+  }
+
+  hr = priv->device->CreateVertexShader (data, size, nullptr, &shader);
+  if (!gst_d3d11_result (hr, device))
+    return hr;
+
+  hr = priv->device->CreateInputLayout (input_desc, desc_len, data,
+      size, &input_layout);
+  if (!gst_d3d11_result (hr, device))
+    return hr;
+
+  GST_DEBUG_OBJECT (device, "Created vertex shader \"%s\" for token %"
+      G_GINT64_FORMAT, entry_point, token);
+  priv->vs_cachetoken = std::make_pair (shader, input_layout);
+
+  *vs = shader.Detach ();
+  *layout = input_layout.Detach ();
+
+  return S_OK;
+}
+
+HRESULT
+gst_d3d11_device_get_sampler (GstD3D11Device * device, D3D11_FILTER filter,
+    ID3D11SamplerState ** sampler)
+{
+  GstD3D11DevicePrivate *priv = device->priv;
+  ComPtr < ID3D11SamplerState > state;
+  D3D11_SAMPLER_DESC desc;
+  HRESULT hr;
+
+  std::lock_guard < std::mutex > lk (priv->resource_lock);
+  auto cached = priv->sampler_cache.find (filter);
+  if (cached != priv->sampler_cache.end ()) {
+    *sampler = cached->second.Get ();
+    (*sampler)->AddRef ();
+    return S_OK;
+  }
+
+  memset (&desc, 0, sizeof (D3D11_SAMPLER_DESC));
+
+  desc.Filter = filter;
+  desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
+  desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
+  desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
+  desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
+  desc.MaxLOD = D3D11_FLOAT32_MAX;
+
+  if (filter == D3D11_FILTER_ANISOTROPIC) {
+    if (priv->feature_level > D3D_FEATURE_LEVEL_9_1)
+      desc.MaxAnisotropy = 16;
+    else
+      desc.MaxAnisotropy = 2;
+  }
+
+  hr = priv->device->CreateSamplerState (&desc, &state);
+  if (!gst_d3d11_result (hr, device))
+    return hr;
+
+  priv->sampler_cachefilter = state;
+  *sampler = state.Detach ();
+
+  return S_OK;
+}
+
+HRESULT
+gst_d3d11_device_get_rasterizer (GstD3D11Device * device,
+    ID3D11RasterizerState ** rasterizer)
+{
+  GstD3D11DevicePrivate *priv = device->priv;
+  D3D11_RASTERIZER_DESC desc;
+  HRESULT hr;
+
+  std::lock_guard < std::mutex > lk (priv->resource_lock);
+  if (priv->rs) {
+    *rasterizer = priv->rs;
+    priv->rs->AddRef ();
+    return S_OK;
+  }
+
+  memset (&desc, 0, sizeof (D3D11_RASTERIZER_DESC));
+  desc.FillMode = D3D11_FILL_SOLID;
+  desc.CullMode = D3D11_CULL_NONE;
+  desc.DepthClipEnable = TRUE;
+
+  hr = priv->device->CreateRasterizerState (&desc, rasterizer);
+  if (!gst_d3d11_result (hr, device))
+    return hr;
+
+  priv->rs = *rasterizer;
+  priv->rs->AddRef ();
+
+  return S_OK;
+}
+
+HRESULT
+gst_d3d11_device_get_rasterizer_msaa (GstD3D11Device * device,
+    ID3D11RasterizerState ** rasterizer)
+{
+  GstD3D11DevicePrivate *priv = device->priv;
+  D3D11_RASTERIZER_DESC desc;
+  HRESULT hr;
+
+  std::lock_guard < std::mutex > lk (priv->resource_lock);
+  if (priv->rs_msaa) {
+    *rasterizer = priv->rs_msaa;
+    priv->rs_msaa->AddRef ();
+    return S_OK;
+  }
+
+  memset (&desc, 0, sizeof (D3D11_RASTERIZER_DESC));
+  desc.FillMode = D3D11_FILL_SOLID;
+  desc.CullMode = D3D11_CULL_NONE;
+  desc.DepthClipEnable = TRUE;
+  desc.MultisampleEnable = TRUE;
+  desc.AntialiasedLineEnable = TRUE;
+
+  hr = priv->device->CreateRasterizerState (&desc, rasterizer);
+  if (!gst_d3d11_result (hr, device))
+    return hr;
+
+  priv->rs_msaa = *rasterizer;
+  priv->rs_msaa->AddRef ();
+
+  return S_OK;
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/gstd3d11format.cpp -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11format.cpp Changed

@@ -152,7 +152,11 @@
     case DXGI_FORMAT_R8G8_B8G8_UNORM:
     case DXGI_FORMAT_Y210:
     case DXGI_FORMAT_Y410:
+    case DXGI_FORMAT_Y216:
     case DXGI_FORMAT_R16G16B16A16_UNORM:
+    case DXGI_FORMAT_Y416:
+    case DXGI_FORMAT_R16_UINT:
+    case DXGI_FORMAT_R32_UINT:
       offset0 = 0;
       stride0 = pitch;
       *size = pitch * height;
@@ -211,6 +215,10 @@
       return GST_VIDEO_FORMAT_P010_10LE;
     case DXGI_FORMAT_P016:
       return GST_VIDEO_FORMAT_P016_LE;
+    case DXGI_FORMAT_Y216:
+      return GST_VIDEO_FORMAT_Y212_LE;
+    case DXGI_FORMAT_Y416:
+      return GST_VIDEO_FORMAT_Y412_LE;
     default:
       break;
   }
@@ -275,29 +283,6 @@
 }
 
 /**
- * gst_d3d11_dxgi_format_get_alignment:
- * @format: a DXGI_FORMAT
- *
- * Returns: Width and height Alignment requirement for given @format
- *
- * Since: 1.22
- */
-guint
-gst_d3d11_dxgi_format_get_alignment (DXGI_FORMAT format)
-{
-  switch (format) {
-    case DXGI_FORMAT_NV12:
-    case DXGI_FORMAT_P010:
-    case DXGI_FORMAT_P016:
-      return 2;
-    default:
-      break;
-  }
-
-  return 0;
-}
-
-/**
  * gst_d3d11_dxgi_format_to_string:
  * @format: a DXGI_FORMAT
  *
@@ -987,6 +972,19 @@
   }
 }
 
+void
+gst_d3d11_color_matrix_init (GstD3D11ColorMatrix * matrix)
+{
+  g_return_if_fail (matrix);
+
+  color_matrix_identity (matrix);
+  for (guint i = 0; i < 3; i++) {
+    matrix->mini = 0;
+    matrix->maxi = 1;
+    matrix->offseti = 0;
+  }
+}
+
 static gboolean
 color_matrix_invert (GstD3D11ColorMatrix * dst, GstD3D11ColorMatrix * src)
 {

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/gstd3d11format.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11format.h Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11memory-private.h Added

@@ -0,0 +1,44 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/d3d11/gstd3d11_fwd.h>
+#include <gst/d3d11/gstd3d11format.h>
+#include <gst/d3d11/gstd3d11memory.h>
+
+G_BEGIN_DECLS
+
+struct _GstD3D11AllocationParams
+{
+  GstVideoInfo info;
+  GstVideoInfo aligned_info;
+  GstD3D11Format d3d11_format;
+  GstD3D11AllocationFlags flags;
+  guint bind_flags;
+  guint misc_flags;
+  guint array_size;
+  guint sample_count;
+  guint sample_quality;
+};
+
+G_END_DECLS
+

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/gstd3d11memory.cpp -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11memory.cpp Changed

@@ -27,6 +27,12 @@
 #include "gstd3d11device.h"
 #include "gstd3d11utils.h"
 #include "gstd3d11-private.h"
+#include "gstd3d11memory-private.h"
+#include <map>
+#include <memory>
+#include <queue>
+#include <atomic>
+#include <wrl.h>
 
 /**
  * SECTION:gstd3d11memory
@@ -36,6 +42,10 @@
  * Since: 1.22
  */
 
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
 GST_DEBUG_CATEGORY_STATIC (gst_d3d11_allocator_debug);
 #define GST_CAT_DEFAULT gst_d3d11_allocator_debug
 
@@ -48,8 +58,6 @@
   static const GFlagsValue values = {
     {GST_D3D11_ALLOCATION_FLAG_DEFAULT, "GST_D3D11_ALLOCATION_FLAG_DEFAULT",
         "default"},
-    {GST_D3D11_ALLOCATION_FLAG_TEXTURE_ARRAY,
-        "GST_D3D11_ALLOCATION_FLAG_TEXTURE_ARRAY", "texture-array"},
     {0, nullptr, nullptr}
   };
 
@@ -131,14 +139,14 @@
 {
   GstD3D11AllocationParams *ret;
   GstD3D11Format d3d11_format;
-  guint i;
 
-  g_return_val_if_fail (info != NULL, NULL);
+  g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), nullptr);
+  g_return_val_if_fail (info, nullptr);
 
   if (!gst_d3d11_device_get_format (device, GST_VIDEO_INFO_FORMAT (info),
           &d3d11_format)) {
-    GST_WARNING ("Couldn't get d3d11 format");
-    return NULL;
+    GST_WARNING_OBJECT (device, "Couldn't get d3d11 format");
+    return nullptr;
   }
 
   ret = g_new0 (GstD3D11AllocationParams, 1);
@@ -146,49 +154,11 @@
   ret->info = *info;
   ret->aligned_info = *info;
   ret->d3d11_format = d3d11_format;
-
-  /* Usage Flag
-   * https://docs.microsoft.com/en-us/windows/win32/api/d3d11/ne-d3d11-d3d11_usage
-   *
-   * +----------------------------------------------------------+
-   * | Resource Usage | Default | Dynamic | Immutable | Staging |
-   * +----------------+---------+---------+-----------+---------+
-   * | GPU-Read       | Yes     | Yes     | Yes       | Yes     |
-   * | GPU-Write      | Yes     |         |           | Yes     |
-   * | CPU-Read       |         |         |           | Yes     |
-   * | CPU-Write      |         | Yes     |           | Yes     |
-   * +----------------------------------------------------------+
-   */
-
-  /* If corresponding dxgi format is undefined, use resource format instead */
-  if (d3d11_format.dxgi_format == DXGI_FORMAT_UNKNOWN) {
-    for (i = 0; i < GST_VIDEO_INFO_N_PLANES (info); i++) {
-      g_assert (d3d11_format.resource_formati != DXGI_FORMAT_UNKNOWN);
-
-      ret->desci.Width = GST_VIDEO_INFO_COMP_WIDTH (info, i);
-      ret->desci.Height = GST_VIDEO_INFO_COMP_HEIGHT (info, i);
-      ret->desci.MipLevels = 1;
-      ret->desci.ArraySize = 1;
-      ret->desci.Format = d3d11_format.resource_formati;
-      ret->desci.SampleDesc.Count = 1;
-      ret->desci.SampleDesc.Quality = 0;
-      ret->desci.Usage = D3D11_USAGE_DEFAULT;
-      ret->desci.BindFlags = bind_flags;
-      ret->desci.MiscFlags = misc_flags;
-    }
-  } else {
-    ret->desc0.Width = GST_VIDEO_INFO_WIDTH (info);
-    ret->desc0.Height = GST_VIDEO_INFO_HEIGHT (info);
-    ret->desc0.MipLevels = 1;
-    ret->desc0.ArraySize = 1;
-    ret->desc0.Format = d3d11_format.dxgi_format;
-    ret->desc0.SampleDesc.Count = 1;
-    ret->desc0.SampleDesc.Quality = 0;
-    ret->desc0.Usage = D3D11_USAGE_DEFAULT;
-    ret->desc0.BindFlags = bind_flags;
-    ret->desc0.MiscFlags = misc_flags;
-  }
-
+  ret->array_size = 1;
+  ret->bind_flags = bind_flags;
+  ret->misc_flags = misc_flags;
+  ret->sample_count = 1;
+  ret->sample_quality = 0;
   ret->flags = flags;
 
   return ret;
@@ -210,13 +180,12 @@
 gst_d3d11_allocation_params_alignment (GstD3D11AllocationParams * params,
     const GstVideoAlignment * align)
 {
-  guint i;
   guint padding_width, padding_height;
   GstVideoInfo *info;
   GstVideoInfo new_info;
 
-  g_return_val_if_fail (params != NULL, FALSE);
-  g_return_val_if_fail (align != NULL, FALSE);
+  g_return_val_if_fail (params, FALSE);
+  g_return_val_if_fail (align, FALSE);
 
   /* d3d11 does not support stride align. Consider padding only */
   padding_width = align->padding_left + align->padding_right;
@@ -233,11 +202,6 @@
 
   params->aligned_info = new_info;
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (info); i++) {
-    params->desci.Width = GST_VIDEO_INFO_COMP_WIDTH (&new_info, i);
-    params->desci.Height = GST_VIDEO_INFO_COMP_HEIGHT (&new_info, i);
-  }
-
   return TRUE;
 }
 
@@ -276,6 +240,75 @@
   g_free (params);
 }
 
+/**
+ * gst_d3d11_allocation_params_set_bind_flags:
+ * @params: a #GstD3D11AllocationParams
+ * @bind_flags: D3D11_BIND_FLAG
+ *
+ * Appends @bind_flags
+ *
+ * Returns: %TRUE if successful
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_d3d11_allocation_params_set_bind_flags (GstD3D11AllocationParams * params,
+    guint bind_flags)
+{
+  g_return_val_if_fail (params, FALSE);
+
+  params->bind_flags |= bind_flags;
+
+  return TRUE;
+}
+
+/**
+ * gst_d3d11_allocation_params_set_array_size:
+ * @params: a #GstD3D11AllocationParams
+ * @size: texture array size
+ *
+ * Set texture array size. @size must be non-zero value
+ *
+ * Returns: %TRUE if successful
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_d3d11_allocation_params_set_array_size (GstD3D11AllocationParams * params,
+    guint size)
+{
+  g_return_val_if_fail (params, FALSE);
+  g_return_val_if_fail (size > 0, FALSE);
+
+  params->array_size = size;
+
+  return TRUE;
+}
+
+/**
+ * gst_d3d11_allocation_params_set_sample_desc:
+ * @params: a #GstD3D11AllocationParams
+ * @sample_count: sample count
+ * @sample_quality: sample quality
+ *
+ * Set sample description
+ *
+ * Returns: %TRUE if successful
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_d3d11_allocation_params_set_sample_desc (GstD3D11AllocationParams * params,
+    guint sample_count, guint sample_quality)
+{
+  g_return_val_if_fail (params, FALSE);
+
+  params->sample_count = sample_count;
+  params->sample_quality = sample_quality;
+
+  return TRUE;
+}
+
 static gint
 gst_d3d11_allocation_params_compare (const GstD3D11AllocationParams * p1,
     const GstD3D11AllocationParams * p2)
@@ -304,39 +337,71 @@
 /* GstD3D11Memory */
 #define GST_D3D11_MEMORY_GET_LOCK(m) (&(GST_D3D11_MEMORY_CAST(m)->priv->lock))
 
+struct GstD3D11MemoryTokenData
+{
+  GstD3D11MemoryTokenData (gpointer data, GDestroyNotify notify_func)
+  :user_data (data), notify (notify_func)
+  {
+  }
+
+   ~GstD3D11MemoryTokenData ()
+  {
+    if (notify)
+      notify (user_data);
+  }
+
+  gpointer user_data;
+  GDestroyNotify notify;
+};
+
 struct _GstD3D11MemoryPrivate
 {
-  ID3D11Texture2D *texture;
-  ID3D11Buffer *buffer;
+  _GstD3D11MemoryPrivate ()
+  {
+    for (guint i = 0; i < GST_VIDEO_MAX_PLANES; i++)
+    {
+      shader_resource_viewi = nullptr;
+      render_target_viewi = nullptr;
+    }
+  }
+
+  ID3D11Texture2D *texture = nullptr;
+  ID3D11Buffer *buffer = nullptr;
+  IDXGIKeyedMutex *keyed_mutex = nullptr;
 
-  GstD3D11MemoryNativeType native_type;
+  GstD3D11MemoryNativeType native_type = GST_D3D11_MEMORY_NATIVE_TYPE_INVALID;
 
   D3D11_TEXTURE2D_DESC desc;
   D3D11_BUFFER_DESC buffer_desc;
 
-  guint subresource_index;
+  guint subresource_index = 0;
 
   /* protected by device lock */
-  ID3D11Resource *staging;
+  ID3D11Resource *staging = nullptr;
   D3D11_MAPPED_SUBRESOURCE map;
-  gint cpu_map_count;
+  guint64 cpu_map_count = 0;
+  guint64 gpu_map_count = 0;
 
   /* protects resource objects */
-  SRWLOCK lock;
+  SRWLOCK lock = SRWLOCK_INIT;
   ID3D11ShaderResourceView *shader_resource_viewGST_VIDEO_MAX_PLANES;
-  guint num_shader_resource_views;
+  guint num_shader_resource_views = 0;
 
   ID3D11RenderTargetView *render_target_viewGST_VIDEO_MAX_PLANES;
-  guint num_render_target_views;
+  guint num_render_target_views = 0;
 
-  ID3D11VideoDecoderOutputView *decoder_output_view;
-  ID3D11VideoDecoder *decoder_handle;
+  ID3D11VideoDecoderOutputView *decoder_output_view = nullptr;
+  ID3D11VideoDecoder *decoder_handle = nullptr;
 
-  ID3D11VideoProcessorInputView *processor_input_view;
-  ID3D11VideoProcessorOutputView *processor_output_view;
+  ID3D11VideoProcessorInputView *processor_input_view = nullptr;
+  ID3D11VideoProcessorOutputView *processor_output_view = nullptr;
 
-  GDestroyNotify notify;
-  gpointer user_data;
+  HANDLE nt_handle = nullptr;
+
+  std::map < gint64, std::unique_ptr < GstD3D11MemoryTokenData >> token_map;
+
+  GDestroyNotify notify = nullptr;
+  gpointer user_data = nullptr;
 };
 
 static inline D3D11_MAP
@@ -423,14 +488,31 @@
 {
   GstD3D11MemoryPrivate *priv = dmem->priv;
   ID3D11DeviceContext *device_context;
+  gboolean locked = FALSE;
 
   if (!priv->staging ||
       !GST_MEMORY_FLAG_IS_SET (dmem, GST_D3D11_MEMORY_TRANSFER_NEED_DOWNLOAD))
     return;
 
+  if (priv->keyed_mutex && priv->gpu_map_count == 0) {
+    HRESULT hr;
+
+    GST_LOG_OBJECT (GST_MEMORY_CAST (dmem)->allocator, "Acquiring sync");
+    hr = priv->keyed_mutex->AcquireSync (0, INFINITE);
+    if (hr != S_OK) {
+      GST_ERROR_OBJECT (GST_MEMORY_CAST (dmem)->allocator,
+          "Couldn't acquire sync, error 0x%x", (guint) hr);
+      return;
+    }
+    locked = TRUE;
+  }
+
   device_context = gst_d3d11_device_get_device_context_handle (dmem->device);
   device_context->CopySubresourceRegion (priv->staging, 0, 0, 0, 0,
       priv->texture, priv->subresource_index, NULL);
+
+  if (locked)
+    priv->keyed_mutex->ReleaseSync (0);
 }
 
 static gpointer
@@ -450,6 +532,19 @@
       g_assert (priv->buffer != nullptr);
       return priv->buffer;
     } else {
+      if (priv->keyed_mutex && priv->gpu_map_count == 0) {
+        HRESULT hr;
+
+        GST_LOG_OBJECT (mem->allocator, "Acquiring sync");
+        hr = priv->keyed_mutex->AcquireSync (0, INFINITE);
+        if (hr != S_OK) {
+          GST_ERROR_OBJECT (mem->allocator,
+              "Couldn't acquire sync, hr: 0x%x", (guint) hr);
+          return nullptr;
+        }
+      }
+
+      priv->gpu_map_count++;
       gst_d3d11_memory_upload (dmem);
       GST_MEMORY_FLAG_UNSET (dmem, GST_D3D11_MEMORY_TRANSFER_NEED_UPLOAD);
 
@@ -522,12 +617,21 @@
     if ((info->flags & GST_MAP_WRITE) == GST_MAP_WRITE)
       GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D11_MEMORY_TRANSFER_NEED_DOWNLOAD);
 
+    g_assert (priv->gpu_map_count != 0);
+    if (priv->keyed_mutex && priv->gpu_map_count == 1) {
+      GST_LOG_OBJECT (mem->allocator, "Release sync");
+      priv->keyed_mutex->ReleaseSync (0);
+    }
+
+    priv->gpu_map_count--;
+
     return;
   }
 
   if ((info->flags & GST_MAP_WRITE) == GST_MAP_WRITE)
     GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D11_MEMORY_TRANSFER_NEED_UPLOAD);
 
+  g_assert (priv->cpu_map_count != 0);
   priv->cpu_map_count--;
   if (priv->cpu_map_count > 0)
     return;
@@ -782,30 +886,26 @@
     return FALSE;
   }
 
-  if ((priv->desc.BindFlags & D3D11_BIND_SHADER_RESOURCE) != 0) {
-    resource_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-    resource_desc.Texture2D.MipLevels = 1;
-
-    for (i = 0; i < num_views; i++) {
-      resource_desc.Format = formatsi;
-      hr = device_handle->CreateShaderResourceView (priv->texture,
-          &resource_desc, &priv->shader_resource_viewi);
-
-      if (!gst_d3d11_result (hr, mem->device)) {
-        GST_ERROR_OBJECT (GST_MEMORY_CAST (mem)->allocator,
-            "Failed to create resource DXGI format %s (%d) for plane %d"
-            " view (0x%x)", gst_d3d11_dxgi_format_to_string (formatsi),
-            formatsi, i, (guint) hr);
-        goto error;
-      }
-    }
+  resource_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
+  resource_desc.Texture2D.MipLevels = 1;
 
-    priv->num_shader_resource_views = num_views;
+  for (i = 0; i < num_views; i++) {
+    resource_desc.Format = formatsi;
+    hr = device_handle->CreateShaderResourceView (priv->texture,
+        &resource_desc, &priv->shader_resource_viewi);
 
-    return TRUE;
+    if (!gst_d3d11_result (hr, mem->device)) {
+      GST_ERROR_OBJECT (GST_MEMORY_CAST (mem)->allocator,
+          "Failed to create resource DXGI format %s (%d) for plane %d"
+          " view (0x%x)", gst_d3d11_dxgi_format_to_string (formatsi),
+          formatsi, i, (guint) hr);
+      goto error;
+    }
   }
 
-  return FALSE;
+  priv->num_shader_resource_views = num_views;
+
+  return TRUE;
 
 error:
   for (i = 0; i < num_views; i++)
@@ -912,30 +1012,30 @@
     return FALSE;
   }
 
-  if ((priv->desc.BindFlags & D3D11_BIND_RENDER_TARGET) != 0) {
+  if (priv->desc.SampleDesc.Count > 1) {
+    render_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMS;
+  } else {
     render_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
     render_desc.Texture2D.MipSlice = 0;
+  }
 
-    for (i = 0; i < num_views; i++) {
-      render_desc.Format = formatsi;
-
-      hr = device_handle->CreateRenderTargetView (priv->texture, &render_desc,
-          &priv->render_target_viewi);
-      if (!gst_d3d11_result (hr, mem->device)) {
-        GST_ERROR_OBJECT (GST_MEMORY_CAST (mem)->allocator,
-            "Failed to create resource DXGI format %s (%d) for plane %d"
-            " view (0x%x)", gst_d3d11_dxgi_format_to_string (formatsi),
-            formatsi, i, (guint) hr);
-        goto error;
-      }
+  for (i = 0; i < num_views; i++) {
+    render_desc.Format = formatsi;
+
+    hr = device_handle->CreateRenderTargetView (priv->texture, &render_desc,
+        &priv->render_target_viewi);
+    if (!gst_d3d11_result (hr, mem->device)) {
+      GST_ERROR_OBJECT (GST_MEMORY_CAST (mem)->allocator,
+          "Failed to create resource DXGI format %s (%d) for plane %d"
+          " view (0x%x)", gst_d3d11_dxgi_format_to_string (formatsi),
+          formatsi, i, (guint) hr);
+      goto error;
     }
-
-    priv->num_render_target_views = num_views;
-
-    return TRUE;
   }
 
-  return FALSE;
+  priv->num_render_target_views = num_views;
+
+  return TRUE;
 
 error:
   for (i = 0; i < num_views; i++)
@@ -1266,6 +1366,124 @@
   return mem->priv->processor_output_view;
 }
 
+/**
+ * gst_d3d11_memory_set_token_data:
+ * @mem: a #GstD3D11Memory
+ * @token: an user token
+ * @data: an user data
+ * @notify: function to invoke with @data as argument, when @data needs to be
+ *          freed
+ *
+ * Sets an opaque user data on a #GstD3D11Memory
+ *
+ * Since: 1.24
+ */
+void
+gst_d3d11_memory_set_token_data (GstD3D11Memory * mem, gint64 token,
+    gpointer data, GDestroyNotify notify)
+{
+  GstD3D11MemoryPrivate *priv;
+
+  g_return_if_fail (gst_is_d3d11_memory (GST_MEMORY_CAST (mem)));
+
+  priv = mem->priv;
+  GstD3D11SRWLockGuard lk (GST_D3D11_MEMORY_GET_LOCK (mem));
+  auto old_token = priv->token_map.find (token);
+  if (old_token != priv->token_map.end ())
+    priv->token_map.erase (old_token);
+
+  if (data) {
+    priv->token_maptoken =
+        std::unique_ptr < GstD3D11MemoryTokenData >
+        (new GstD3D11MemoryTokenData (data, notify));
+  }
+}
+
+/**
+ * gst_d3d11_memory_get_token_data:
+ * @mem: a #GstD3D11Memory
+ * @token: an user token
+ *
+ * Gets back user data pointer stored via gst_d3d11_memory_set_token_data()
+ *
+ * Returns: (transfer none) (nullable): user data pointer or %NULL
+ *
+ * Since: 1.24
+ */
+gpointer
+gst_d3d11_memory_get_token_data (GstD3D11Memory * mem, gint64 token)
+{
+  GstD3D11MemoryPrivate *priv;
+  gpointer ret = nullptr;
+
+  g_return_val_if_fail (gst_is_d3d11_memory (GST_MEMORY_CAST (mem)), nullptr);
+
+  priv = mem->priv;
+  GstD3D11SRWLockGuard lk (GST_D3D11_MEMORY_GET_LOCK (mem));
+  auto old_token = priv->token_map.find (token);
+  if (old_token != priv->token_map.end ())
+    ret = old_token->second->user_data;
+
+  return ret;
+}
+
+/**
+ * gst_d3d11_memory_get_nt_handle:
+ * @mem: a #GstD3D11Memory
+ * @handle: (out) (transfer none): a sharable NT handle
+ *
+ * Creates unnamed sharable NT handle via IDXGIResource1::CreateSharedHandle
+ * or returns already created handle. The returned @handle is owned by
+ * @mem and therefore caller shouldn't close the handle.
+ *
+ * Returns: %TRUE if successful
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_d3d11_memory_get_nt_handle (GstD3D11Memory * mem, HANDLE * handle)
+{
+  GstD3D11MemoryPrivate *priv;
+  ComPtr < IDXGIResource1 > resource;
+  HRESULT hr;
+
+  g_return_val_if_fail (gst_is_d3d11_memory (GST_MEMORY_CAST (mem)), FALSE);
+  g_return_val_if_fail (handle, FALSE);
+
+  *handle = nullptr;
+
+  priv = mem->priv;
+  if (!priv->texture)
+    return FALSE;
+
+  GstD3D11SRWLockGuard lk (GST_D3D11_MEMORY_GET_LOCK (mem));
+
+  if (priv->nt_handle) {
+    *handle = priv->nt_handle;
+    return TRUE;
+  }
+
+  if ((priv->desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED_NTHANDLE) !=
+      D3D11_RESOURCE_MISC_SHARED_NTHANDLE) {
+    return FALSE;
+  }
+
+  hr = priv->texture->QueryInterface (IID_PPV_ARGS (&resource));
+  if (!gst_d3d11_result (hr, mem->device))
+    return FALSE;
+
+  gst_d3d11_device_lock (mem->device);
+  hr = resource->CreateSharedHandle (nullptr,
+      DXGI_SHARED_RESOURCE_READ | DXGI_SHARED_RESOURCE_WRITE, nullptr, handle);
+  gst_d3d11_device_unlock (mem->device);
+  if (!gst_d3d11_result (hr, mem->device))
+    return FALSE;
+
+  priv->nt_handle = *handle;
+
+  return TRUE;
+}
+
 /* GstD3D11Allocator */
 struct _GstD3D11AllocatorPrivate
 {
@@ -1397,6 +1615,13 @@
 
   GST_LOG_OBJECT (allocator, "Free memory %p", mem);
 
+  dmem_priv->token_map.clear ();
+
+  if (dmem_priv->nt_handle)
+    CloseHandle (dmem_priv->nt_handle);
+
+  GST_D3D11_CLEAR_COM (dmem_priv->keyed_mutex);
+
   for (i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
     GST_D3D11_CLEAR_COM (dmem_priv->render_target_viewi);
     GST_D3D11_CLEAR_COM (dmem_priv->shader_resource_viewi);
@@ -1416,7 +1641,8 @@
   if (dmem_priv->notify)
     dmem_priv->notify (dmem_priv->user_data);
 
-  g_free (dmem->priv);
+  delete dmem->priv;
+
   g_free (dmem);
 }
 
@@ -1428,11 +1654,13 @@
   GstD3D11Memory *mem;
 
   mem = g_new0 (GstD3D11Memory, 1);
-  mem->priv = g_new0 (GstD3D11MemoryPrivate, 1);
+  mem->priv = new GstD3D11MemoryPrivate ();
 
   gst_memory_init (GST_MEMORY_CAST (mem),
       (GstMemoryFlags) 0, GST_ALLOCATOR_CAST (self), NULL, 0, 0, 0, 0);
   mem->priv->texture = texture;
+  if ((desc->MiscFlags & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX) != 0)
+    texture->QueryInterface (IID_PPV_ARGS (&mem->priv->keyed_mutex));
   mem->priv->desc = *desc;
   mem->priv->native_type = GST_D3D11_MEMORY_NATIVE_TYPE_TEXTURE_2D;
   mem->device = (GstD3D11Device *) gst_object_ref (device);
@@ -1608,7 +1836,7 @@
   }
 
   mem = g_new0 (GstD3D11Memory, 1);
-  mem->priv = g_new0 (GstD3D11MemoryPrivate, 1);
+  mem->priv = new GstD3D11MemoryPrivate ();
 
   gst_memory_init (GST_MEMORY_CAST (mem),
       (GstMemoryFlags) 0, GST_ALLOCATOR_CAST (allocator), nullptr, 0, 0, 0, 0);
@@ -1730,37 +1958,41 @@
 }
 
 /* GstD3D11PoolAllocator */
-#define GST_D3D11_POOL_ALLOCATOR_GET_LOCK(alloc) \
-  (&(GST_D3D11_POOL_ALLOCATOR_CAST(alloc)->priv->lock))
-#define GST_D3D11_POOL_ALLOCATOR_IS_FLUSHING(alloc)  (g_atomic_int_get (&alloc->priv->flushing))
-
+/* *INDENT-OFF* */
 struct _GstD3D11PoolAllocatorPrivate
 {
+  _GstD3D11PoolAllocatorPrivate ()
+  {
+    outstanding = 0;
+  }
+
+  ~_GstD3D11PoolAllocatorPrivate ()
+  {
+    GST_D3D11_CLEAR_COM (texture);
+  }
+
   /* parent texture when array typed memory is used */
-  ID3D11Texture2D *texture;
+  ID3D11Texture2D *texture = nullptr;
   D3D11_TEXTURE2D_DESC desc;
 
-  /* All below member variables are analogous to that of GstBufferPool */
-  GstAtomicQueue *queue;
-  GstPoll *poll;
+  std::queue<GstMemory *> queue;
 
-  /* This lock will protect all below variables apart from atomic ones
-   * (identical to GstBufferPool::priv::rec_lock) */
-  CRITICAL_SECTION lock;
-  gboolean started;
-  gboolean active;
+  SRWLOCK lock = SRWLOCK_INIT;
+  CONDITION_VARIABLE cond = CONDITION_VARIABLE_INIT;
+  gboolean started = FALSE;
+  gboolean active = FALSE;
 
-  /* atomic */
-  gint outstanding;
-  guint max_mems;
-  guint cur_mems;
-  gboolean flushing;
+  std::atomic<guint> outstanding;
+  guint cur_mems = 0;
+  gboolean flushing = TRUE;
 
   /* Calculated memory size, based on Direct3D11 staging texture map.
    * Note that, we cannot know the actually staging texture memory size prior
    * to map the staging texture because driver will likely require padding */
-  gsize mem_size;
+  gsize mem_size = 0;
+  guint mem_pitch = 0;
 };
+/* *INDENT-ON* */
 
 static void gst_d3d11_pool_allocator_finalize (GObject * object);
 
@@ -1773,8 +2005,8 @@
 static gboolean gst_d3d11_memory_release (GstMiniObject * mini_object);
 
 #define gst_d3d11_pool_allocator_parent_class pool_alloc_parent_class
-G_DEFINE_TYPE_WITH_PRIVATE (GstD3D11PoolAllocator,
-    gst_d3d11_pool_allocator, GST_TYPE_D3D11_ALLOCATOR);
+G_DEFINE_TYPE (GstD3D11PoolAllocator, gst_d3d11_pool_allocator,
+    GST_TYPE_D3D11_ALLOCATOR);
 
 static void
 gst_d3d11_pool_allocator_class_init (GstD3D11PoolAllocatorClass * klass)
@@ -1788,47 +2020,27 @@
 }
 
 static void
-gst_d3d11_pool_allocator_init (GstD3D11PoolAllocator * allocator)
+gst_d3d11_pool_allocator_init (GstD3D11PoolAllocator * self)
 {
-  GstD3D11PoolAllocatorPrivate *priv;
-
-  priv = allocator->priv = (GstD3D11PoolAllocatorPrivate *)
-      gst_d3d11_pool_allocator_get_instance_private (allocator);
-
-  InitializeCriticalSection (&priv->lock);
-
-  priv->poll = gst_poll_new_timer ();
-  priv->queue = gst_atomic_queue_new (16);
-  priv->flushing = 1;
-  priv->active = FALSE;
-  priv->started = FALSE;
-
-  /* 1 control write for flushing - the flush token */
-  gst_poll_write_control (priv->poll);
-  /* 1 control write for marking that we are not waiting for poll - the wait token */
-  gst_poll_write_control (priv->poll);
+  self->priv = new GstD3D11PoolAllocatorPrivate ();
 }
 
 static void
 gst_d3d11_pool_allocator_finalize (GObject * object)
 {
   GstD3D11PoolAllocator *self = GST_D3D11_POOL_ALLOCATOR (object);
-  GstD3D11PoolAllocatorPrivate *priv = self->priv;
 
   GST_DEBUG_OBJECT (self, "Finalize");
 
   gst_d3d11_pool_allocator_stop (self);
-  gst_atomic_queue_unref (priv->queue);
-  gst_poll_free (priv->poll);
-  DeleteCriticalSection (&priv->lock);
-
-  GST_D3D11_CLEAR_COM (priv->texture);
+  delete self->priv;
 
   gst_clear_object (&self->device);
 
   G_OBJECT_CLASS (pool_alloc_parent_class)->finalize (object);
 }
 
+/* must be called with the lock */
 static gboolean
 gst_d3d11_pool_allocator_start (GstD3D11PoolAllocator * self)
 {
@@ -1872,15 +2084,16 @@
       }
 
       priv->mem_size = mem->size;
+      priv->mem_pitch = GST_D3D11_MEMORY_CAST (mem)->priv->map.RowPitch;
     } else {
       mem->size = mem->maxsize = priv->mem_size;
+      GST_D3D11_MEMORY_CAST (mem)->priv->map.RowPitch = priv->mem_pitch;
     }
 
     GST_D3D11_MEMORY_CAST (mem)->priv->subresource_index = i;
 
-    g_atomic_int_add (&priv->cur_mems, 1);
-    gst_atomic_queue_push (priv->queue, mem);
-    gst_poll_write_control (priv->poll);
+    priv->cur_mems++;
+    priv->queue.push (mem);
   }
 
   priv->started = TRUE;
@@ -1888,37 +2101,6 @@
   return TRUE;
 }
 
-static void
-gst_d3d11_pool_allocator_do_set_flushing (GstD3D11PoolAllocator * self,
-    gboolean flushing)
-{
-  GstD3D11PoolAllocatorPrivate *priv = self->priv;
-
-  if (GST_D3D11_POOL_ALLOCATOR_IS_FLUSHING (self) == flushing)
-    return;
-
-  if (flushing) {
-    g_atomic_int_set (&priv->flushing, 1);
-    /* Write the flush token to wake up any waiters */
-    gst_poll_write_control (priv->poll);
-  } else {
-    while (!gst_poll_read_control (priv->poll)) {
-      if (errno == EWOULDBLOCK) {
-        /* This should not really happen unless flushing and unflushing
-         * happens on different threads. Let's wait a bit to get back flush
-         * token from the thread that was setting it to flushing */
-        g_thread_yield ();
-        continue;
-      } else {
-        /* Critical error but GstPoll already complained */
-        break;
-      }
-    }
-
-    g_atomic_int_set (&priv->flushing, 0);
-  }
-}
-
 static gboolean
 gst_d3d11_pool_allocator_set_active (GstD3D11Allocator * allocator,
     gboolean active)
@@ -1928,7 +2110,7 @@
 
   GST_LOG_OBJECT (self, "active %d", active);
 
-  GstD3D11CSLockGuard lk (GST_D3D11_POOL_ALLOCATOR_GET_LOCK (self));
+  GstD3D11SRWLockGuard lk (&priv->lock);
   /* just return if we are already in the right state */
   if (priv->active == active)
     return TRUE;
@@ -1939,76 +2121,57 @@
       return FALSE;
     }
 
-    /* flush_stop may release memory objects, setting to active to avoid running
-     * do_stop while activating the pool */
     priv->active = TRUE;
-
-    gst_d3d11_pool_allocator_do_set_flushing (self, FALSE);
+    priv->flushing = FALSE;
   } else {
-    gint outstanding;
-
-    /* set to flushing first */
-    gst_d3d11_pool_allocator_do_set_flushing (self, TRUE);
+    priv->flushing = TRUE;
+    priv->active = FALSE;
+    WakeAllConditionVariable (&priv->cond);
 
     /* when all memory objects are in the pool, free them. Else they will be
      * freed when they are released */
-    outstanding = g_atomic_int_get (&priv->outstanding);
-    GST_LOG_OBJECT (self, "outstanding memories %d, (in queue %d)",
-        outstanding, gst_atomic_queue_length (priv->queue));
-    if (outstanding == 0) {
+    GST_LOG_OBJECT (self, "outstanding memories %d, (in queue %u)",
+        priv->outstanding.load (), (guint) priv->queue.size ());
+    if (priv->outstanding == 0) {
       if (!gst_d3d11_pool_allocator_stop (self)) {
         GST_ERROR_OBJECT (self, "stop failed");
         return FALSE;
       }
     }
-
-    priv->active = FALSE;
   }
 
   return TRUE;
 }
 
+/* must be called with the lock */
 static void
 gst_d3d11_pool_allocator_free_memory (GstD3D11PoolAllocator * self,
     GstMemory * mem)
 {
   GstD3D11PoolAllocatorPrivate *priv = self->priv;
 
-  g_atomic_int_add (&priv->cur_mems, -1);
+  priv->cur_mems--;
   GST_LOG_OBJECT (self, "freeing memory %p (%u left)", mem, priv->cur_mems);
 
-  GST_MINI_OBJECT_CAST (mem)->dispose = NULL;
+  GST_MINI_OBJECT_CAST (mem)->dispose = nullptr;
   gst_memory_unref (mem);
 }
 
 /* must be called with the lock */
-static gboolean
+static void
 gst_d3d11_pool_allocator_clear_queue (GstD3D11PoolAllocator * self)
 {
   GstD3D11PoolAllocatorPrivate *priv = self->priv;
-  GstMemory *memory;
 
   GST_LOG_OBJECT (self, "Clearing queue");
 
-  /* clear the pool */
-  while ((memory = (GstMemory *) gst_atomic_queue_pop (priv->queue))) {
-    while (!gst_poll_read_control (priv->poll)) {
-      if (errno == EWOULDBLOCK) {
-        /* We put the memory into the queue but did not finish writing control
-         * yet, let's wait a bit and retry */
-        g_thread_yield ();
-        continue;
-      } else {
-        /* Critical error but GstPoll already complained */
-        break;
-      }
-    }
-    gst_d3d11_pool_allocator_free_memory (self, memory);
+  while (!priv->queue.empty ()) {
+    GstMemory *mem = priv->queue.front ();
+    priv->queue.pop ();
+    gst_d3d11_pool_allocator_free_memory (self, mem);
   }
 
   GST_LOG_OBJECT (self, "Clear done");
-
-  return priv->cur_mems == 0;
 }
 
 /* must be called with the lock */
@@ -2020,8 +2183,7 @@
   GST_DEBUG_OBJECT (self, "Stop");
 
   if (priv->started) {
-    if (!gst_d3d11_pool_allocator_clear_queue (self))
-      return FALSE;
+    gst_d3d11_pool_allocator_clear_queue (self);
 
     priv->started = FALSE;
   } else {
@@ -2031,46 +2193,37 @@
   return TRUE;
 }
 
-static inline void
-dec_outstanding (GstD3D11PoolAllocator * self)
-{
-  if (g_atomic_int_dec_and_test (&self->priv->outstanding)) {
-    /* all memory objects are returned to the pool, see if we need to free them */
-    if (GST_D3D11_POOL_ALLOCATOR_IS_FLUSHING (self)) {
-      /* take the lock so that set_active is not run concurrently */
-      GstD3D11CSLockGuard lk (GST_D3D11_POOL_ALLOCATOR_GET_LOCK (self));
-      /* now that we have the lock, check if we have been de-activated with
-       * outstanding buffers */
-      if (!self->priv->active)
-        gst_d3d11_pool_allocator_stop (self);
-    }
-  }
-}
-
+/* Must be called with the lock and unlocked in this method */
 static void
 gst_d3d11_pool_allocator_release_memory (GstD3D11PoolAllocator * self,
     GstMemory * mem)
 {
+  GstD3D11PoolAllocatorPrivate *priv = self->priv;
+
   GST_LOG_OBJECT (self, "Released memory %p", mem);
 
-  GST_MINI_OBJECT_CAST (mem)->dispose = NULL;
+  GST_MINI_OBJECT_CAST (mem)->dispose = nullptr;
   mem->allocator = (GstAllocator *) gst_object_ref (_d3d11_memory_allocator);
 
   /* keep it around in our queue */
-  gst_atomic_queue_push (self->priv->queue, mem);
-  gst_poll_write_control (self->priv->poll);
-  dec_outstanding (self);
+  priv->queue.push (mem);
+  priv->outstanding--;
+  if (priv->outstanding == 0 && priv->flushing)
+    gst_d3d11_pool_allocator_stop (self);
+  WakeAllConditionVariable (&priv->cond);
+  ReleaseSRWLockExclusive (&priv->lock);
 
   gst_object_unref (self);
 }
 
 static gboolean
-gst_d3d11_memory_release (GstMiniObject * mini_object)
+gst_d3d11_memory_release (GstMiniObject * object)
 {
-  GstMemory *mem = GST_MEMORY_CAST (mini_object);
+  GstMemory *mem = GST_MEMORY_CAST (object);
   GstD3D11PoolAllocator *alloc;
+  GstD3D11PoolAllocatorPrivate *priv;
 
-  g_assert (mem->allocator != NULL);
+  g_assert (mem->allocator);
 
   if (!GST_IS_D3D11_POOL_ALLOCATOR (mem->allocator)) {
     GST_LOG_OBJECT (mem->allocator, "Not our memory, free");
@@ -2078,12 +2231,9 @@
   }
 
   alloc = GST_D3D11_POOL_ALLOCATOR (mem->allocator);
-  /* if flushing, free this memory */
-  if (GST_D3D11_POOL_ALLOCATOR_IS_FLUSHING (alloc)) {
-    GST_LOG_OBJECT (alloc, "allocator is flushing, free %p", mem);
-    return TRUE;
-  }
+  priv = alloc->priv;
 
+  AcquireSRWLockExclusive (&priv->lock);
   /* return the memory to the allocator */
   gst_memory_ref (mem);
   gst_d3d11_pool_allocator_release_memory (alloc, mem);
@@ -2091,6 +2241,7 @@
   return FALSE;
 }
 
+/* must be called with the lock */
 static GstFlowReturn
 gst_d3d11_pool_allocator_alloc (GstD3D11PoolAllocator * self, GstMemory ** mem)
 {
@@ -2101,13 +2252,10 @@
   if (priv->desc.ArraySize > 1)
     return GST_FLOW_EOS;
 
-  /* increment the allocation counter */
-  g_atomic_int_add (&priv->cur_mems, 1);
   new_mem = gst_d3d11_allocator_alloc_internal (_d3d11_memory_allocator,
       self->device, &priv->desc, nullptr);
   if (!new_mem) {
     GST_ERROR_OBJECT (self, "Failed to allocate new memory");
-    g_atomic_int_add (&priv->cur_mems, -1);
     return GST_FLOW_ERROR;
   }
 
@@ -2115,101 +2263,60 @@
     if (!gst_d3d11_memory_update_size (new_mem)) {
       GST_ERROR_OBJECT (self, "Failed to calculate size");
       gst_memory_unref (new_mem);
-      g_atomic_int_add (&priv->cur_mems, -1);
 
       return GST_FLOW_ERROR;
     }
 
     priv->mem_size = new_mem->size;
+    priv->mem_pitch = GST_D3D11_MEMORY_CAST (new_mem)->priv->map.RowPitch;
+  } else {
+    new_mem->size = new_mem->maxsize = priv->mem_size;
+    GST_D3D11_MEMORY_CAST (new_mem)->priv->map.RowPitch = priv->mem_pitch;
   }
 
-  new_mem->size = new_mem->maxsize = priv->mem_size;
+  priv->cur_mems++;
 
   *mem = new_mem;
 
   return GST_FLOW_OK;
 }
 
+/* must be called with the lock */
 static GstFlowReturn
 gst_d3d11_pool_allocator_acquire_memory_internal (GstD3D11PoolAllocator * self,
     GstMemory ** memory)
 {
-  GstFlowReturn result;
   GstD3D11PoolAllocatorPrivate *priv = self->priv;
+  GstFlowReturn ret = GST_FLOW_ERROR;
 
-  while (TRUE) {
-    if (G_UNLIKELY (GST_D3D11_POOL_ALLOCATOR_IS_FLUSHING (self)))
-      goto flushing;
-
-    /* try to get a memory from the queue */
-    *memory = (GstMemory *) gst_atomic_queue_pop (priv->queue);
-    if (G_LIKELY (*memory)) {
-      while (!gst_poll_read_control (priv->poll)) {
-        if (errno == EWOULDBLOCK) {
-          /* We put the memory into the queue but did not finish writing control
-           * yet, let's wait a bit and retry */
-          g_thread_yield ();
-          continue;
-        } else {
-          /* Critical error but GstPoll already complained */
-          break;
-        }
-      }
-      result = GST_FLOW_OK;
+  do {
+    if (priv->flushing) {
+      GST_DEBUG_OBJECT (self, "we are flushing");
+      return GST_FLOW_FLUSHING;
+    }
+
+    if (!priv->queue.empty ()) {
+      *memory = priv->queue.front ();
+      priv->queue.pop ();
       GST_LOG_OBJECT (self, "acquired memory %p", *memory);
-      break;
+      return GST_FLOW_OK;
     }
 
     /* no memory, try to allocate some more */
     GST_LOG_OBJECT (self, "no memory, trying to allocate");
-    result = gst_d3d11_pool_allocator_alloc (self, memory);
-    if (G_LIKELY (result == GST_FLOW_OK))
-      /* we have a memory, return it */
-      break;
+    ret = gst_d3d11_pool_allocator_alloc (self, memory);
+    if (ret == GST_FLOW_OK)
+      return ret;
 
-    if (G_UNLIKELY (result != GST_FLOW_EOS))
-      /* something went wrong, return error */
+    /* something went wrong, return error */
+    if (ret != GST_FLOW_EOS)
       break;
 
-    /* now we release the control socket, we wait for a memory release or
-     * flushing */
-    if (!gst_poll_read_control (priv->poll)) {
-      if (errno == EWOULDBLOCK) {
-        /* This means that we have two threads trying to allocate memory
-         * already, and the other one already got the wait token. This
-         * means that we only have to wait for the poll now and not write the
-         * token afterwards: we will be woken up once the other thread is
-         * woken up and that one will write the wait token it removed */
-        GST_LOG_OBJECT (self, "waiting for free memory or flushing");
-        gst_poll_wait (priv->poll, GST_CLOCK_TIME_NONE);
-      } else {
-        /* This is a critical error, GstPoll already gave a warning */
-        result = GST_FLOW_ERROR;
-        break;
-      }
-    } else {
-      /* We're the first thread waiting, we got the wait token and have to
-       * write it again later
-       * OR
-       * We're a second thread and just consumed the flush token and block all
-       * other threads, in which case we must not wait and give it back
-       * immediately */
-      if (!GST_D3D11_POOL_ALLOCATOR_IS_FLUSHING (self)) {
-        GST_LOG_OBJECT (self, "waiting for free memory or flushing");
-        gst_poll_wait (priv->poll, GST_CLOCK_TIME_NONE);
-      }
-      gst_poll_write_control (priv->poll);
-    }
-  }
-
-  return result;
+    GST_LOG_OBJECT (self, "waiting for free memory or flushing");
+    SleepConditionVariableSRW (&priv->cond, &priv->lock, INFINITE, 0);
+  } while (TRUE);
 
-  /* ERRORS */
-flushing:
-  {
-    GST_DEBUG_OBJECT (self, "we are flushing");
-    return GST_FLOW_FLUSHING;
-  }
+  return ret;
 }
 
 /**
@@ -2259,31 +2366,27 @@
 gst_d3d11_pool_allocator_acquire_memory (GstD3D11PoolAllocator * allocator,
     GstMemory ** memory)
 {
+  GstFlowReturn ret;
   GstD3D11PoolAllocatorPrivate *priv;
-  GstFlowReturn result;
 
   g_return_val_if_fail (GST_IS_D3D11_POOL_ALLOCATOR (allocator),
       GST_FLOW_ERROR);
-  g_return_val_if_fail (memory != NULL, GST_FLOW_ERROR);
+  g_return_val_if_fail (memory != nullptr, GST_FLOW_ERROR);
 
   priv = allocator->priv;
 
-  /* assume we'll have one more outstanding buffer we need to do that so
-   * that concurrent set_active doesn't clear the buffers */
-  g_atomic_int_inc (&priv->outstanding);
-  result = gst_d3d11_pool_allocator_acquire_memory_internal (allocator, memory);
-
-  if (result == GST_FLOW_OK) {
+  GstD3D11SRWLockGuard lk (&priv->lock);
+  ret = gst_d3d11_pool_allocator_acquire_memory_internal (allocator, memory);
+  if (ret == GST_FLOW_OK) {
     GstMemory *mem = *memory;
     /* Replace default allocator with ours */
     gst_object_unref (mem->allocator);
     mem->allocator = (GstAllocator *) gst_object_ref (allocator);
     GST_MINI_OBJECT_CAST (mem)->dispose = gst_d3d11_memory_release;
-  } else {
-    dec_outstanding (allocator);
+    allocator->priv->outstanding++;
   }
 
-  return result;
+  return ret;
 }
 
 /**
@@ -2316,7 +2419,7 @@
   }
 
   if (outstanding_size)
-    *outstanding_size = g_atomic_int_get (&priv->outstanding);
+    *outstanding_size = priv->outstanding;
 
   return TRUE;
 }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/gstd3d11memory.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11memory.h Changed

@@ -78,17 +78,12 @@
 /**
  * GstD3D11AllocationFlags:
  * @GST_D3D11_ALLOCATION_FLAG_DEFAULT: Default allocation behavior
- * @GST_D3D11_ALLOCATION_FLAG_TEXTURE_ARRAY: Indicates each allocated texture
- *                                           should be array type. This type of
- *                                           is used for D3D11/DXVA decoders
- *                                           in general.
  *
  * Since: 1.22
  */
 typedef enum
 {
   GST_D3D11_ALLOCATION_FLAG_DEFAULT = 0,
-  GST_D3D11_ALLOCATION_FLAG_TEXTURE_ARRAY = (1 << 0),
 } GstD3D11AllocationFlags;
 
 GST_D3D11_API
@@ -140,18 +135,6 @@
  *
  * Since: 1.22
  */
-struct _GstD3D11AllocationParams
-{
-  /* Texture description per plane */
-  D3D11_TEXTURE2D_DESC descGST_VIDEO_MAX_PLANES;
-  GstVideoInfo info;
-  GstVideoInfo aligned_info;
-  GstD3D11Format d3d11_format;
-  GstD3D11AllocationFlags flags;
-
-  /*< private >*/
-  gpointer _gst_reservedGST_PADDING;
-};
 
 GST_D3D11_API
 GType                      gst_d3d11_allocation_params_get_type (void);
@@ -173,6 +156,19 @@
 gboolean                   gst_d3d11_allocation_params_alignment (GstD3D11AllocationParams * parms,
                                                                   const GstVideoAlignment * align);
 
+GST_D3D11_API
+gboolean                   gst_d3d11_allocation_params_set_bind_flags (GstD3D11AllocationParams * params,
+                                                                       guint bind_flags);
+
+GST_D3D11_API
+gboolean                   gst_d3d11_allocation_params_set_array_size (GstD3D11AllocationParams * params,
+                                                                       guint size);
+
+GST_D3D11_API
+gboolean                   gst_d3d11_allocation_params_set_sample_desc (GstD3D11AllocationParams * params,
+                                                                        guint sample_count,
+                                                                        guint sample_quality);
+
 /**
  * GstD3D11Memory:
  *
@@ -249,6 +245,20 @@
                                                                               ID3D11VideoDevice * video_device,
                                                                               ID3D11VideoProcessorEnumerator * enumerator);
 
+GST_D3D11_API
+void                              gst_d3d11_memory_set_token_data (GstD3D11Memory * mem,
+                                                                   gint64 token,
+                                                                   gpointer data,
+                                                                   GDestroyNotify notify);
+
+GST_D3D11_API
+gpointer                          gst_d3d11_memory_get_token_data (GstD3D11Memory * mem,
+                                                                   gint64 token);
+
+GST_D3D11_API
+gboolean                          gst_d3d11_memory_get_nt_handle  (GstD3D11Memory * mem,
+                                                                   HANDLE * handle);
+
 /**
  * GstD3D11Allocator:
  *

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11shadercache.cpp Added

@@ -0,0 +1,110 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d11shadercache.h"
+#include "gstd3d11compile.h"
+#include <string.h>
+#include <mutex>
+#include <map>
+
+/* *INDENT-OFF* */
+static std::mutex cache_lock_;
+static std::map <gint64, ID3DBlob *> ps_blob_;
+static std::map <gint64, ID3DBlob *> vs_blob_;
+static std::map <gint64, ID3DBlob *> cs_blob_;
+/* *INDENT-ON* */
+
+HRESULT
+gst_d3d11_shader_cache_get_pixel_shader_blob (gint64 token,
+    const gchar * source, gsize source_size, const gchar * entry_point,
+    const D3D_SHADER_MACRO * defines, ID3DBlob ** blob)
+{
+  std::lock_guard < std::mutex > lk (cache_lock_);
+
+  auto cached = ps_blob_.find (token);
+  if (cached != ps_blob_.end ()) {
+    *blob = cached->second;
+    cached->second->AddRef ();
+    return S_OK;
+  }
+
+  HRESULT hr = gst_d3d11_compile (source, source_size, nullptr, defines,
+      nullptr, entry_point, "ps_4_0", 0, 0, blob, nullptr);
+  if (FAILED (hr))
+    return hr;
+
+  (*blob)->AddRef ();
+  ps_blob_token = *blob;
+
+  return S_OK;
+}
+
+HRESULT
+gst_d3d11_shader_cache_get_vertex_shader_blob (gint64 token,
+    const gchar * source, gsize source_size, const gchar * entry_point,
+    ID3DBlob ** blob)
+{
+  std::lock_guard < std::mutex > lk (cache_lock_);
+
+  auto cached = vs_blob_.find (token);
+  if (cached != vs_blob_.end ()) {
+    *blob = cached->second;
+    cached->second->AddRef ();
+    return S_OK;
+  }
+
+  HRESULT hr = gst_d3d11_compile (source, source_size, nullptr, nullptr,
+      nullptr, entry_point, "vs_4_0", 0, 0, blob, nullptr);
+  if (FAILED (hr))
+    return hr;
+
+  (*blob)->AddRef ();
+  vs_blob_token = *blob;
+
+  return S_OK;
+}
+
+HRESULT
+gst_d3d11_shader_cache_get_compute_shader_blob (gint64 token,
+    const gchar * source, gsize source_size, const gchar * entry_point,
+    const D3D_SHADER_MACRO * defines, ID3DBlob ** blob)
+{
+  std::lock_guard < std::mutex > lk (cache_lock_);
+
+  auto cached = cs_blob_.find (token);
+  if (cached != cs_blob_.end ()) {
+    *blob = cached->second;
+    cached->second->AddRef ();
+    return S_OK;
+  }
+
+  HRESULT hr = gst_d3d11_compile (source, source_size, nullptr, defines,
+      nullptr, entry_point, "cs_5_0", 0, 0, blob, nullptr);
+  if (FAILED (hr))
+    return hr;
+
+  (*blob)->AddRef ();
+  cs_blob_token = *blob;
+
+  return S_OK;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11shadercache.h Added

@@ -0,0 +1,48 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/d3d11/gstd3d11_fwd.h>
+
+G_BEGIN_DECLS
+
+HRESULT gst_d3d11_shader_cache_get_pixel_shader_blob (gint64 token,
+                                                      const gchar * source,
+                                                      gsize source_size,
+                                                      const gchar * entry_point,
+                                                      const D3D_SHADER_MACRO * defines,
+                                                      ID3DBlob ** blob);
+
+HRESULT gst_d3d11_shader_cache_get_vertex_shader_blob (gint64 token,
+                                                       const gchar * source,
+                                                       gsize source_size,
+                                                       const gchar * entry_point,
+                                                       ID3DBlob ** blob);
+
+HRESULT gst_d3d11_shader_cache_get_compute_shader_blob (gint64 token,
+                                                        const gchar * source,
+                                                        gsize source_size,
+                                                        const gchar * entry_point,
+                                                        const D3D_SHADER_MACRO * defines,
+                                                        ID3DBlob ** blob);
+
+G_END_DECLS
+

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/gstd3d11utils.cpp -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11utils.cpp Changed

@@ -28,6 +28,7 @@
 #include <windows.h>
 #include <versionhelpers.h>
 #include <mutex>
+#include <atomic>
 
 /**
  * SECTION:gstd3d11utils
@@ -549,6 +550,23 @@
   return val.QuadPart;
 }
 
+#ifndef GST_DISABLE_GST_DEBUG
+static void
+gst_d3d11_log_gpu_remove_reason (HRESULT hr, GstD3D11Device * device,
+    GstDebugCategory * cat, const gchar * file, const gchar * function,
+    gint line)
+{
+  gchar *error_text = g_win32_error_message ((guint) hr);
+
+  gst_debug_log (cat, GST_LEVEL_ERROR, file, function, line,
+      NULL, "DeviceRemovedReason: 0x%x, %s", (guint) hr,
+      GST_STR_NULL (error_text));
+  g_free (error_text);
+
+  gst_d3d11_device_log_live_objects (device, file, function, line);
+}
+#endif
+
 /**
  * _gst_d3d11_result:
  * @result: HRESULT D3D11 API return code
@@ -583,6 +601,14 @@
         GST_STR_NULL (error_text));
     g_free (error_text);
 
+    if (device) {
+      ID3D11Device *device_handle = gst_d3d11_device_get_device_handle (device);
+      hr = device_handle->GetDeviceRemovedReason ();
+      if (hr != S_OK) {
+        gst_d3d11_log_gpu_remove_reason (hr, device, cat, file, function, line);
+      }
+    }
+
     ret = FALSE;
   }
 #if (HAVE_D3D11SDKLAYERS_H || HAVE_DXGIDEBUG_H)
@@ -597,3 +623,22 @@
   return SUCCEEDED (hr);
 #endif
 }
+
+/**
+ * gst_d3d11_create_user_token:
+ *
+ * Creates new user token value
+ *
+ * Returns: user token value
+ *
+ * Since: 1.24
+ */
+gint64
+gst_d3d11_create_user_token (void)
+{
+  /* *INDENT-OFF* */
+  static std::atomic < gint64 > user_token { 0 };
+  /* *INDENT-ON* */
+
+  return user_token.fetch_add (1);
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/gstd3d11utils.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/gstd3d11utils.h Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/hlsl Added

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/hlsl/CSMain_converter.hlsl Added

@@ -0,0 +1,1169 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef BUILDING_HLSL
+#ifdef BUILDING_CSMain_YUY2_to_AYUV
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float4 val = inTex.Load (tid);
+  float Y0 = val.r;
+  float U = val.g;
+  float Y1 = val.b;
+  float V = val.a;
+
+  outTexuint2(tid.x * 2, tid.y) = float4 (1.0, Y0, U, V);
+  outTexuint2(tid.x * 2 + 1, tid.y) = float4 (1.0, Y1, U, V);
+}
+#endif
+
+#ifdef BUILDING_CSMain_UYVY_to_AYUV
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float4 val = inTex.Load (tid);
+  float Y0 = val.g;
+  float U = val.r;
+  float Y1 = val.a;
+  float V = val.b;
+
+  outTexuint2(tid.x * 2, tid.y) = float4 (1.0, Y0, U, V);
+  outTexuint2(tid.x * 2 + 1, tid.y) = float4 (1.0, Y1, U, V);
+}
+#endif
+
+#ifdef BUILDING_CSMain_VYUY_to_AYUV
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float4 val = inTex.Load (tid);
+  float Y0 = val.g;
+  float U = val.b;
+  float Y1 = val.a;
+  float V = val.r;
+
+  outTexuint2(tid.x * 2, tid.y) = float4 (1.0, Y0, U, V);
+  outTexuint2(tid.x * 2 + 1, tid.y) = float4 (1.0, Y1, U, V);
+}
+#endif
+
+#ifdef BUILDING_CSMain_YVYU_to_AYUV
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float4 val = inTex.Load (tid);
+  float Y0 = val.r;
+  float U = val.a;
+  float Y1 = val.b;
+  float V = val.g;
+
+  outTexuint2(tid.x * 2, tid.y) = float4 (1.0, Y0, U, V);
+  outTexuint2(tid.x * 2 + 1, tid.y) = float4 (1.0, Y1, U, V);
+}
+#endif
+
+#ifdef BUILDING_CSMain_v210_to_AYUV
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  uint xpos = tid.x * 4;
+  float3 val = inTex.Load (uint3 (xpos, tid.y, 0)).xyz;
+  float U0 = val.r;
+  float Y0 = val.g;
+  float V0 = val.b;
+
+  val = inTex.Load (uint3 (xpos + 1, tid.y, 0)).xyz;
+  float Y1 = val.r;
+  float U2 = val.g;
+  float Y2 = val.b;
+
+  val = inTex.Load (uint3 (xpos + 2, tid.y, 0)).xyz;
+  float V2 = val.r;
+  float Y3 = val.g;
+  float U4 = val.b;
+
+  val = inTex.Load (uint3 (xpos + 3, tid.y, 0)).xyz;
+  float Y4 = val.r;
+  float V4 = val.g;
+  float Y5 = val.b;
+
+  xpos = tid.x * 6;
+  outTexuint2(xpos, tid.y)     = float4 (1.0, Y0, U0, V0);
+  outTexuint2(xpos + 1, tid.y) = float4 (1.0, Y1, U0, V0);
+  outTexuint2(xpos + 2, tid.y) = float4 (1.0, Y2, U2, V2);
+  outTexuint2(xpos + 3, tid.y) = float4 (1.0, Y3, U2, V2);
+  outTexuint2(xpos + 4, tid.y) = float4 (1.0, Y4, U4, V4);
+  outTexuint2(xpos + 5, tid.y) = float4 (1.0, Y5, U4, V4);
+}
+#endif
+
+#ifdef BUILDING_CSMain_v308_to_AYUV
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float4 val = inTex.Load (uint3 (tid.x * 3, tid.y, 0));
+  float Y0 = val.x;
+  float U0 = val.y;
+  float V0 = val.z;
+  float Y1 = val.w;
+
+  val = inTex.Load (uint3 (tid.x * 3 + 1, tid.y, 0));
+  float U1 = val.x;
+  float V1 = val.y;
+  float Y2 = val.z;
+  float U2 = val.w;
+
+  val = inTex.Load (uint3 (tid.x * 3 + 2, tid.y, 0));
+  float V2 = val.x;
+  float Y3 = val.y;
+  float U3 = val.z;
+  float V3 = val.w;
+
+  outTexuint2(tid.x * 4, tid.y)     = float4 (1.0, Y0, U0, V0);
+  outTexuint2(tid.x * 4 + 1, tid.y) = float4 (1.0, Y1, U1, V1);
+  outTexuint2(tid.x * 4 + 2, tid.y) = float4 (1.0, Y2, U2, V2);
+  outTexuint2(tid.x * 4 + 3, tid.y) = float4 (1.0, Y3, U3, V3);
+}
+#endif
+
+#ifdef BUILDING_CSMain_IYU2_to_AYUV
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float4 val = inTex.Load (uint3 (tid.x * 3, tid.y, 0));
+  float U0 = val.x;
+  float Y0 = val.y;
+  float V0 = val.z;
+  float U1 = val.w;
+
+  val = inTex.Load (uint3 (tid.x * 3 + 1, tid.y, 0));
+  float Y1 = val.x;
+  float V1 = val.y;
+  float U2 = val.z;
+  float Y2 = val.w;
+
+  val = inTex.Load (uint3 (tid.x * 3 + 2, tid.y, 0));
+  float V2 = val.x;
+  float U3 = val.y;
+  float Y3 = val.z;
+  float V3 = val.w;
+
+  outTexuint2(tid.x * 4, tid.y)     = float4 (1.0, Y0, U0, V0);
+  outTexuint2(tid.x * 4 + 1, tid.y) = float4 (1.0, Y1, U1, V1);
+  outTexuint2(tid.x * 4 + 2, tid.y) = float4 (1.0, Y2, U2, V2);
+  outTexuint2(tid.x * 4 + 3, tid.y) = float4 (1.0, Y3, U3, V3);
+}
+#endif
+
+#ifdef BUILDING_CSMain_AYUV_to_YUY2
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float3 val = inTex.Load (uint3(tid.x * 2, tid.y, 0)).yzw;
+  float Y0 = val.x;
+  float U = val.y;
+  float V = val.z;
+  float Y1 = inTex.Load (uint3(tid.x * 2 + 1, tid.y, 0)).y;
+
+  outTextid.xy = float4 (Y0, U, Y1, V);
+}
+#endif
+
+#ifdef BUILDING_CSMain_AYUV_to_UYVY
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float3 val = inTex.Load (uint3(tid.x * 2, tid.y, 0)).yzw;
+  float Y0 = val.x;
+  float U = val.y;
+  float V = val.z;
+  float Y1 = inTex.Load (uint3(tid.x * 2 + 1, tid.y, 0)).y;
+
+  outTextid.xy = float4 (U, Y0, V, Y1);
+}
+#endif
+
+#ifdef BUILDING_CSMain_AYUV_to_VYUY
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float3 val = inTex.Load (uint3(tid.x * 2, tid.y, 0)).yzw;
+  float Y0 = val.x;
+  float U = val.y;
+  float V = val.z;
+  float Y1 = inTex.Load (uint3(tid.x * 2 + 1, tid.y, 0)).y;
+
+  outTextid.xy = float4 (V, Y0, U, Y1);
+}
+#endif
+
+#ifdef BUILDING_CSMain_AYUV_to_YVYU
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float3 val = inTex.Load (uint3(tid.x * 2, tid.y, 0)).yzw;
+  float Y0 = val.x;
+  float U = val.y;
+  float V = val.z;
+  float Y1 = inTex.Load (uint3(tid.x * 2 + 1, tid.y, 0)).y;
+
+  outTextid.xy = float4 (Y0, V, Y1, U);
+}
+#endif
+
+#ifdef BUILDING_CSMain_AYUV_to_v210
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  uint xpos = tid.x * 6;
+  float3 val = inTex.Load (uint3 (xpos, tid.y, 0)).yzw;
+  float Y0 = val.x;
+  float U0 = val.y;
+  float V0 = val.z;
+  float Y1 = inTex.Load (uint3 (xpos + 1, tid.y, 0)).y;
+
+  val = inTex.Load (uint3 (xpos + 2, tid.y, 0)).yzw;
+  float Y2 = val.x;
+  float U2 = val.y;
+  float V2 = val.z;
+  float Y3 = inTex.Load (uint3 (xpos + 3, tid.y, 0)).y;
+
+  val = inTex.Load (uint3 (xpos + 4, tid.y, 0)).yzw;
+  float Y4 = val.x;
+  float U4 = val.y;
+  float V4 = val.z;
+  float Y5 = inTex.Load (uint3 (xpos + 5, tid.y, 0)).y;
+
+  xpos = tid.x * 4;
+  outTexuint2(xpos, tid.y)     = float4 (U0, Y0, V0, 0);
+  outTexuint2(xpos + 1, tid.y) = float4 (Y1, U2, Y2, 0);
+  outTexuint2(xpos + 2, tid.y) = float4 (V2, Y3, U4, 0);
+  outTexuint2(xpos + 3, tid.y) = float4 (Y4, V4, Y5, 0);
+}
+#endif
+
+#ifdef BUILDING_CSMain_AYUV_to_v308
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float3 val0 = inTex.Load (uint3 (tid.x * 4, tid.y, 0)).yzw;
+  float3 val1 = inTex.Load (uint3 (tid.x * 4 + 1, tid.y, 0)).yzw;
+  float3 val2 = inTex.Load (uint3 (tid.x * 4 + 2, tid.y, 0)).yzw;
+  float3 val3 = inTex.Load (uint3 (tid.x * 4 + 3, tid.y, 0)).yzw;
+
+  outTexuint2(tid.x * 3, tid.y)     = float4 (val0.x, val0.y, val0.z, val1.x);
+  outTexuint2(tid.x * 3 + 1, tid.y) = float4 (val1.y, val1.z, val2.x, val2.y);
+  outTexuint2(tid.x * 3 + 2, tid.y) = float4 (val2.z, val3.x, val3.y, val3.z);
+}
+#endif
+
+#ifdef BUILDING_CSMain_AYUV_to_IYU2
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float3 val0 = inTex.Load (uint3 (tid.x * 4, tid.y, 0)).zyw;
+  float3 val1 = inTex.Load (uint3 (tid.x * 4 + 1, tid.y, 0)).zyw;
+  float3 val2 = inTex.Load (uint3 (tid.x * 4 + 2, tid.y, 0)).zyw;
+  float3 val3 = inTex.Load (uint3 (tid.x * 4 + 3, tid.y, 0)).zyw;
+
+  outTexuint2(tid.x * 3, tid.y)     = float4 (val0.x, val0.y, val0.z, val1.x);
+  outTexuint2(tid.x * 3 + 1, tid.y) = float4 (val1.y, val1.z, val2.x, val2.y);
+  outTexuint2(tid.x * 3 + 2, tid.y) = float4 (val2.z, val3.x, val3.y, val3.z);
+}
+#endif
+
+#ifdef BUILDING_CSMain_AYUV_to_Y410
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float4 val = inTex.Load (tid);
+  float Y = val.y;
+  float U = val.z;
+  float V = val.w;
+  float A = val.x;
+
+  outTextid.xy = float4 (U, Y, V, A);
+}
+#endif
+
+#ifdef BUILDING_CSMain_RGB_to_RGBA
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float4 val = inTex.Load (uint3 (tid.x * 3, tid.y, 0));
+  float R0 = val.r;
+  float G0 = val.g;
+  float B0 = val.b;
+  float R1 = val.a;
+
+  val = inTex.Load (uint3 (tid.x * 3 + 1, tid.y, 0));
+  float G1 = val.r;
+  float B1 = val.g;
+  float R2 = val.b;
+  float G2 = val.a;
+
+  val = inTex.Load (uint3 (tid.x * 3 + 2, tid.y, 0));
+  float B2 = val.r;
+  float R3 = val.g;
+  float G3 = val.b;
+  float B3 = val.a;
+
+  outTexuint2(tid.x * 4, tid.y)     = float4 (R0, G0, B0, 1.0);
+  outTexuint2(tid.x * 4 + 1, tid.y) = float4 (R1, G1, B1, 1.0);
+  outTexuint2(tid.x * 4 + 2, tid.y) = float4 (R2, G2, B2, 1.0);
+  outTexuint2(tid.x * 4 + 3, tid.y) = float4 (R3, G3, B3, 1.0);
+}
+#endif
+
+#ifdef BUILDING_CSMain_BGR_to_RGBA
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float4 val = inTex.Load (uint3 (tid.x * 3, tid.y, 0));
+  float B0 = val.r;
+  float G0 = val.g;
+  float R0 = val.b;
+  float B1 = val.a;
+
+  val = inTex.Load (uint3 (tid.x * 3 + 1, tid.y, 0));
+  float G1 = val.r;
+  float R1 = val.g;
+  float B2 = val.b;
+  float G2 = val.a;
+
+  val = inTex.Load (uint3 (tid.x * 3 + 2, tid.y, 0));
+  float R2 = val.r;
+  float B3 = val.g;
+  float G3 = val.b;
+  float R3 = val.a;
+
+  outTexuint2(tid.x * 4, tid.y)     = float4 (R0, G0, B0, 1.0);
+  outTexuint2(tid.x * 4 + 1, tid.y) = float4 (R1, G1, B1, 1.0);
+  outTexuint2(tid.x * 4 + 2, tid.y) = float4 (R2, G2, B2, 1.0);
+  outTexuint2(tid.x * 4 + 3, tid.y) = float4 (R3, G3, B3, 1.0);
+}
+#endif
+
+#ifdef BUILDING_CSMain_RGB16_to_RGBA
+Texture2D<uint> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  uint val = inTex.Load (tid);
+  float R = float ((val & 0xf800) >> 11) / 31;
+  float G = float ((val & 0x7e0) >> 5) / 63;
+  float B = float ((val & 0x1f)) / 31;
+
+  outTextid.xy = float4 (R, G, B, 1.0);
+}
+#endif
+
+#ifdef BUILDING_CSMain_BGR16_to_RGBA
+Texture2D<uint> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  uint val = inTex.Load (tid);
+  float B = float ((val & 0xf800) >> 11) / 31;
+  float G = float ((val & 0x7e0) >> 5) / 63;
+  float R = float ((val & 0x1f)) / 31;
+
+  outTextid.xy = float4 (R, G, B, 1.0);
+}
+#endif
+
+#ifdef BUILDING_CSMain_RGB15_to_RGBA
+Texture2D<uint> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  uint val = inTex.Load (tid);
+  uint R = (val & 0x7c00) >> 10;
+  uint G = (val & 0x3e0) >> 5;
+  uint B = (val & 0x1f);
+
+  outTextid.xy = float4 (float3 (R, G, B) / 31, 1.0);
+}
+#endif
+
+#ifdef BUILDING_CSMain_BGR15_to_RGBA
+Texture2D<uint> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  uint val = inTex.Load (tid);
+  uint B = (val & 0x7c00) >> 10;
+  uint G = (val & 0x3e0) >> 5;
+  uint R = (val & 0x1f);
+
+  outTextid.xy = float4 (float3 (R, G, B) / 31, 1.0);
+}
+#endif
+
+#ifdef BUILDING_CSMain_r210_to_RGBA
+Texture2D<uint> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  uint val = inTex.Load (tid);
+  uint val_be = ((val & 0xff) << 24) | ((val & 0xff00) << 8) |
+      ((val & 0xff0000) >> 8) | ((val & 0xff000000) >> 24);
+  uint R = (val_be >> 20) & 0x3ff;
+  uint G = (val_be >> 10) & 0x3ff;
+  uint B = val_be & 0x3ff;
+
+  outTextid.xy = float4 (float3 (R, G, B) / 1023, 1.0);
+}
+#endif
+
+#ifdef BUILDING_CSMain_RGBA_to_RGB
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float3 val0 = inTex.Load (uint3 (tid.x * 4, tid.y, 0)).rgb;
+  float3 val1 = inTex.Load (uint3 (tid.x * 4 + 1, tid.y, 0)).rgb;
+  float3 val2 = inTex.Load (uint3 (tid.x * 4 + 2, tid.y, 0)).rgb;
+  float3 val3 = inTex.Load (uint3 (tid.x * 4 + 3, tid.y, 0)).rgb;
+
+  outTexuint2(tid.x * 3, tid.y)     = float4 (val0.r, val0.g, val0.b, val1.r);
+  outTexuint2(tid.x * 3 + 1, tid.y) = float4 (val1.g, val1.b, val2.r, val2.g);
+  outTexuint2(tid.x * 3 + 2, tid.y) = float4 (val2.b, val3.r, val3.g, val3.b);
+}
+#endif
+
+#ifdef BUILDING_CSMain_RGBA_to_BGR
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float3 val0 = inTex.Load (uint3 (tid.x * 4, tid.y, 0)).rgb;
+  float3 val1 = inTex.Load (uint3 (tid.x * 4 + 1, tid.y, 0)).rgb;
+  float3 val2 = inTex.Load (uint3 (tid.x * 4 + 2, tid.y, 0)).rgb;
+  float3 val3 = inTex.Load (uint3 (tid.x * 4 + 3, tid.y, 0)).rgb;
+
+  outTexuint2(tid.x * 3, tid.y)     = float4 (val0.b, val0.g, val0.r, val1.b);
+  outTexuint2(tid.x * 3 + 1, tid.y) = float4 (val1.g, val1.r, val2.b, val2.g);
+  outTexuint2(tid.x * 3 + 2, tid.y) = float4 (val2.r, val3.b, val3.g, val3.r);
+}
+#endif
+
+#ifdef BUILDING_CSMain_RGBA_to_RGB16
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<uint> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float3 val = inTex.Load (tid).rgb;
+  uint R = val.r * 31;
+  uint G = val.g * 63;
+  uint B = val.b * 31;
+
+  outTextid.xy = (R << 11) | (G << 5) | B;
+}
+#endif
+
+#ifdef BUILDING_CSMain_RGBA_to_BGR16
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<uint> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float3 val = inTex.Load (tid).rgb;
+  uint R = val.r * 31;
+  uint G = val.g * 63;
+  uint B = val.b * 31;
+
+  outTextid.xy = (B << 11) | (G << 5) | R;
+}
+#endif
+
+#ifdef BUILDING_CSMain_RGBA_to_RGB15
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<uint> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  uint3 val = inTex.Load (tid).rgb * 31;
+
+  outTextid.xy = (val.r << 10) | (val.g << 5) | val.b;
+}
+#endif
+
+#ifdef BUILDING_CSMain_RGBA_to_BGR15
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<uint> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  uint3 val = inTex.Load (tid).rgb * 31;
+
+  outTextid.xy = (val.b << 10) | (val.g << 5) | val.r;
+}
+#endif
+
+#ifdef BUILDING_CSMain_RGBA_to_r210
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<uint> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  uint3 val = inTex.Load (tid).rgb * 1023;
+  uint packed = (val.r << 20) | (val.g << 10) | val.b;
+  uint packed_be = ((packed & 0xff) << 24) | ((packed & 0xff00) << 8) |
+      ((packed & 0xff0000) >> 8) | ((packed & 0xff000000) >> 24);
+
+  outTextid.xy = packed_be;
+}
+#endif
+
+#ifdef BUILDING_CSMain_RGBA_to_BGRA
+Texture2D<float4> inTex : register(t0);
+RWTexture2D<unorm float4> outTex : register(u0);
+
+void Execute (uint3 tid)
+{
+  float4 val = inTex.Load (tid);
+
+  outTextid.xy = val.bgra;
+}
+#endif
+
+numthreads(8, 8, 1)
+void ENTRY_POINT (uint3 tid : SV_DispatchThreadID)
+{
+  Execute (tid);
+}
+#else
+static const char g_CSMain_converter_str =
+"#ifdef BUILDING_CSMain_YUY2_to_AYUV\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float4 val = inTex.Load (tid);\n"
+"  float Y0 = val.r;\n"
+"  float U = val.g;\n"
+"  float Y1 = val.b;\n"
+"  float V = val.a;\n"
+"\n"
+"  outTexuint2(tid.x * 2, tid.y) = float4 (1.0, Y0, U, V);\n"
+"  outTexuint2(tid.x * 2 + 1, tid.y) = float4 (1.0, Y1, U, V);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_UYVY_to_AYUV\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float4 val = inTex.Load (tid);\n"
+"  float Y0 = val.g;\n"
+"  float U = val.r;\n"
+"  float Y1 = val.a;\n"
+"  float V = val.b;\n"
+"\n"
+"  outTexuint2(tid.x * 2, tid.y) = float4 (1.0, Y0, U, V);\n"
+"  outTexuint2(tid.x * 2 + 1, tid.y) = float4 (1.0, Y1, U, V);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_VYUY_to_AYUV\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float4 val = inTex.Load (tid);\n"
+"  float Y0 = val.g;\n"
+"  float U = val.b;\n"
+"  float Y1 = val.a;\n"
+"  float V = val.r;\n"
+"\n"
+"  outTexuint2(tid.x * 2, tid.y) = float4 (1.0, Y0, U, V);\n"
+"  outTexuint2(tid.x * 2 + 1, tid.y) = float4 (1.0, Y1, U, V);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_YVYU_to_AYUV\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float4 val = inTex.Load (tid);\n"
+"  float Y0 = val.r;\n"
+"  float U = val.a;\n"
+"  float Y1 = val.b;\n"
+"  float V = val.g;\n"
+"\n"
+"  outTexuint2(tid.x * 2, tid.y) = float4 (1.0, Y0, U, V);\n"
+"  outTexuint2(tid.x * 2 + 1, tid.y) = float4 (1.0, Y1, U, V);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_v210_to_AYUV\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  uint xpos = tid.x * 4;\n"
+"  float3 val = inTex.Load (uint3 (xpos, tid.y, 0)).xyz;\n"
+"  float U0 = val.r;\n"
+"  float Y0 = val.g;\n"
+"  float V0 = val.b;\n"
+"\n"
+"  val = inTex.Load (uint3 (xpos + 1, tid.y, 0)).xyz;\n"
+"  float Y1 = val.r;\n"
+"  float U2 = val.g;\n"
+"  float Y2 = val.b;\n"
+"\n"
+"  val = inTex.Load (uint3 (xpos + 2, tid.y, 0)).xyz;\n"
+"  float V2 = val.r;\n"
+"  float Y3 = val.g;\n"
+"  float U4 = val.b;\n"
+"\n"
+"  val = inTex.Load (uint3 (xpos + 3, tid.y, 0)).xyz;\n"
+"  float Y4 = val.r;\n"
+"  float V4 = val.g;\n"
+"  float Y5 = val.b;\n"
+"\n"
+"  xpos = tid.x * 6;\n"
+"  outTexuint2(xpos, tid.y)     = float4 (1.0, Y0, U0, V0);\n"
+"  outTexuint2(xpos + 1, tid.y) = float4 (1.0, Y1, U0, V0);\n"
+"  outTexuint2(xpos + 2, tid.y) = float4 (1.0, Y2, U2, V2);\n"
+"  outTexuint2(xpos + 3, tid.y) = float4 (1.0, Y3, U2, V2);\n"
+"  outTexuint2(xpos + 4, tid.y) = float4 (1.0, Y4, U4, V4);\n"
+"  outTexuint2(xpos + 5, tid.y) = float4 (1.0, Y5, U4, V4);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_v308_to_AYUV\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float4 val = inTex.Load (uint3 (tid.x * 3, tid.y, 0));\n"
+"  float Y0 = val.x;\n"
+"  float U0 = val.y;\n"
+"  float V0 = val.z;\n"
+"  float Y1 = val.w;\n"
+"\n"
+"  val = inTex.Load (uint3 (tid.x * 3 + 1, tid.y, 0));\n"
+"  float U1 = val.x;\n"
+"  float V1 = val.y;\n"
+"  float Y2 = val.z;\n"
+"  float U2 = val.w;\n"
+"\n"
+"  val = inTex.Load (uint3 (tid.x * 3 + 2, tid.y, 0));\n"
+"  float V2 = val.x;\n"
+"  float Y3 = val.y;\n"
+"  float U3 = val.z;\n"
+"  float V3 = val.w;\n"
+"\n"
+"  outTexuint2(tid.x * 4, tid.y)     = float4 (1.0, Y0, U0, V0);\n"
+"  outTexuint2(tid.x * 4 + 1, tid.y) = float4 (1.0, Y1, U1, V1);\n"
+"  outTexuint2(tid.x * 4 + 2, tid.y) = float4 (1.0, Y2, U2, V2);\n"
+"  outTexuint2(tid.x * 4 + 3, tid.y) = float4 (1.0, Y3, U3, V3);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_IYU2_to_AYUV\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float4 val = inTex.Load (uint3 (tid.x * 3, tid.y, 0));\n"
+"  float U0 = val.x;\n"
+"  float Y0 = val.y;\n"
+"  float V0 = val.z;\n"
+"  float U1 = val.w;\n"
+"\n"
+"  val = inTex.Load (uint3 (tid.x * 3 + 1, tid.y, 0));\n"
+"  float Y1 = val.x;\n"
+"  float V1 = val.y;\n"
+"  float U2 = val.z;\n"
+"  float Y2 = val.w;\n"
+"\n"
+"  val = inTex.Load (uint3 (tid.x * 3 + 2, tid.y, 0));\n"
+"  float V2 = val.x;\n"
+"  float U3 = val.y;\n"
+"  float Y3 = val.z;\n"
+"  float V3 = val.w;\n"
+"\n"
+"  outTexuint2(tid.x * 4, tid.y)     = float4 (1.0, Y0, U0, V0);\n"
+"  outTexuint2(tid.x * 4 + 1, tid.y) = float4 (1.0, Y1, U1, V1);\n"
+"  outTexuint2(tid.x * 4 + 2, tid.y) = float4 (1.0, Y2, U2, V2);\n"
+"  outTexuint2(tid.x * 4 + 3, tid.y) = float4 (1.0, Y3, U3, V3);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_AYUV_to_YUY2\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float3 val = inTex.Load (uint3(tid.x * 2, tid.y, 0)).yzw;\n"
+"  float Y0 = val.x;\n"
+"  float U = val.y;\n"
+"  float V = val.z;\n"
+"  float Y1 = inTex.Load (uint3(tid.x * 2 + 1, tid.y, 0)).y;\n"
+"\n"
+"  outTextid.xy = float4 (Y0, U, Y1, V);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_AYUV_to_UYVY\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float3 val = inTex.Load (uint3(tid.x * 2, tid.y, 0)).yzw;\n"
+"  float Y0 = val.x;\n"
+"  float U = val.y;\n"
+"  float V = val.z;\n"
+"  float Y1 = inTex.Load (uint3(tid.x * 2 + 1, tid.y, 0)).y;\n"
+"\n"
+"  outTextid.xy = float4 (U, Y0, V, Y1);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_AYUV_to_VYUY\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float3 val = inTex.Load (uint3(tid.x * 2, tid.y, 0)).yzw;\n"
+"  float Y0 = val.x;\n"
+"  float U = val.y;\n"
+"  float V = val.z;\n"
+"  float Y1 = inTex.Load (uint3(tid.x * 2 + 1, tid.y, 0)).y;\n"
+"\n"
+"  outTextid.xy = float4 (V, Y0, U, Y1);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_AYUV_to_YVYU\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float3 val = inTex.Load (uint3(tid.x * 2, tid.y, 0)).yzw;\n"
+"  float Y0 = val.x;\n"
+"  float U = val.y;\n"
+"  float V = val.z;\n"
+"  float Y1 = inTex.Load (uint3(tid.x * 2 + 1, tid.y, 0)).y;\n"
+"\n"
+"  outTextid.xy = float4 (Y0, V, Y1, U);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_AYUV_to_v210\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  uint xpos = tid.x * 6;\n"
+"  float3 val = inTex.Load (uint3 (xpos, tid.y, 0)).yzw;\n"
+"  float Y0 = val.x;\n"
+"  float U0 = val.y;\n"
+"  float V0 = val.z;\n"
+"  float Y1 = inTex.Load (uint3 (xpos + 1, tid.y, 0)).y;\n"
+"\n"
+"  val = inTex.Load (uint3 (xpos + 2, tid.y, 0)).yzw;\n"
+"  float Y2 = val.x;\n"
+"  float U2 = val.y;\n"
+"  float V2 = val.z;\n"
+"  float Y3 = inTex.Load (uint3 (xpos + 3, tid.y, 0)).y;\n"
+"\n"
+"  val = inTex.Load (uint3 (xpos + 4, tid.y, 0)).yzw;\n"
+"  float Y4 = val.x;\n"
+"  float U4 = val.y;\n"
+"  float V4 = val.z;\n"
+"  float Y5 = inTex.Load (uint3 (xpos + 5, tid.y, 0)).y;\n"
+"\n"
+"  xpos = tid.x * 4;\n"
+"  outTexuint2(xpos, tid.y)     = float4 (U0, Y0, V0, 0);\n"
+"  outTexuint2(xpos + 1, tid.y) = float4 (Y1, U2, Y2, 0);\n"
+"  outTexuint2(xpos + 2, tid.y) = float4 (V2, Y3, U4, 0);\n"
+"  outTexuint2(xpos + 3, tid.y) = float4 (Y4, V4, Y5, 0);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_AYUV_to_v308\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float3 val0 = inTex.Load (uint3 (tid.x * 4, tid.y, 0)).yzw;\n"
+"  float3 val1 = inTex.Load (uint3 (tid.x * 4 + 1, tid.y, 0)).yzw;\n"
+"  float3 val2 = inTex.Load (uint3 (tid.x * 4 + 2, tid.y, 0)).yzw;\n"
+"  float3 val3 = inTex.Load (uint3 (tid.x * 4 + 3, tid.y, 0)).yzw;\n"
+"\n"
+"  outTexuint2(tid.x * 3, tid.y)     = float4 (val0.x, val0.y, val0.z, val1.x);\n"
+"  outTexuint2(tid.x * 3 + 1, tid.y) = float4 (val1.y, val1.z, val2.x, val2.y);\n"
+"  outTexuint2(tid.x * 3 + 2, tid.y) = float4 (val2.z, val3.x, val3.y, val3.z);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_AYUV_to_IYU2\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float3 val0 = inTex.Load (uint3 (tid.x * 4, tid.y, 0)).zyw;\n"
+"  float3 val1 = inTex.Load (uint3 (tid.x * 4 + 1, tid.y, 0)).zyw;\n"
+"  float3 val2 = inTex.Load (uint3 (tid.x * 4 + 2, tid.y, 0)).zyw;\n"
+"  float3 val3 = inTex.Load (uint3 (tid.x * 4 + 3, tid.y, 0)).zyw;\n"
+"\n"
+"  outTexuint2(tid.x * 3, tid.y)     = float4 (val0.x, val0.y, val0.z, val1.x);\n"
+"  outTexuint2(tid.x * 3 + 1, tid.y) = float4 (val1.y, val1.z, val2.x, val2.y);\n"
+"  outTexuint2(tid.x * 3 + 2, tid.y) = float4 (val2.z, val3.x, val3.y, val3.z);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_AYUV_to_Y410\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float4 val = inTex.Load (tid);\n"
+"  float Y = val.y;\n"
+"  float U = val.z;\n"
+"  float V = val.w;\n"
+"  float A = val.x;\n"
+"\n"
+"  outTextid.xy = float4 (U, Y, V, A);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_RGB_to_RGBA\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float4 val = inTex.Load (uint3 (tid.x * 3, tid.y, 0));\n"
+"  float R0 = val.r;\n"
+"  float G0 = val.g;\n"
+"  float B0 = val.b;\n"
+"  float R1 = val.a;\n"
+"\n"
+"  val = inTex.Load (uint3 (tid.x * 3 + 1, tid.y, 0));\n"
+"  float G1 = val.r;\n"
+"  float B1 = val.g;\n"
+"  float R2 = val.b;\n"
+"  float G2 = val.a;\n"
+"\n"
+"  val = inTex.Load (uint3 (tid.x * 3 + 2, tid.y, 0));\n"
+"  float B2 = val.r;\n"
+"  float R3 = val.g;\n"
+"  float G3 = val.b;\n"
+"  float B3 = val.a;\n"
+"\n"
+"  outTexuint2(tid.x * 4, tid.y)     = float4 (R0, G0, B0, 1.0);\n"
+"  outTexuint2(tid.x * 4 + 1, tid.y) = float4 (R1, G1, B1, 1.0);\n"
+"  outTexuint2(tid.x * 4 + 2, tid.y) = float4 (R2, G2, B2, 1.0);\n"
+"  outTexuint2(tid.x * 4 + 3, tid.y) = float4 (R3, G3, B3, 1.0);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_BGR_to_RGBA\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float4 val = inTex.Load (uint3 (tid.x * 3, tid.y, 0));\n"
+"  float B0 = val.r;\n"
+"  float G0 = val.g;\n"
+"  float R0 = val.b;\n"
+"  float B1 = val.a;\n"
+"\n"
+"  val = inTex.Load (uint3 (tid.x * 3 + 1, tid.y, 0));\n"
+"  float G1 = val.r;\n"
+"  float R1 = val.g;\n"
+"  float B2 = val.b;\n"
+"  float G2 = val.a;\n"
+"\n"
+"  val = inTex.Load (uint3 (tid.x * 3 + 2, tid.y, 0));\n"
+"  float R2 = val.r;\n"
+"  float B3 = val.g;\n"
+"  float G3 = val.b;\n"
+"  float R3 = val.a;\n"
+"\n"
+"  outTexuint2(tid.x * 4, tid.y)     = float4 (R0, G0, B0, 1.0);\n"
+"  outTexuint2(tid.x * 4 + 1, tid.y) = float4 (R1, G1, B1, 1.0);\n"
+"  outTexuint2(tid.x * 4 + 2, tid.y) = float4 (R2, G2, B2, 1.0);\n"
+"  outTexuint2(tid.x * 4 + 3, tid.y) = float4 (R3, G3, B3, 1.0);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_RGB16_to_RGBA\n"
+"Texture2D<uint> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  uint val = inTex.Load (tid);\n"
+"  float R = float ((val & 0xf800) >> 11) / 31;\n"
+"  float G = float ((val & 0x7e0) >> 5) / 63;\n"
+"  float B = float ((val & 0x1f)) / 31;\n"
+"\n"
+"  outTextid.xy = float4 (R, G, B, 1.0);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_BGR16_to_RGBA\n"
+"Texture2D<uint> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  uint val = inTex.Load (tid);\n"
+"  float B = float ((val & 0xf800) >> 11) / 31;\n"
+"  float G = float ((val & 0x7e0) >> 5) / 63;\n"
+"  float R = float ((val & 0x1f)) / 31;\n"
+"\n"
+"  outTextid.xy = float4 (R, G, B, 1.0);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_RGB15_to_RGBA\n"
+"Texture2D<uint> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  uint val = inTex.Load (tid);\n"
+"  uint R = (val & 0x7c00) >> 10;\n"
+"  uint G = (val & 0x3e0) >> 5;\n"
+"  uint B = (val & 0x1f);\n"
+"\n"
+"  outTextid.xy = float4 (float3 (R, G, B) / 31, 1.0);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_BGR15_to_RGBA\n"
+"Texture2D<uint> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  uint val = inTex.Load (tid);\n"
+"  uint B = (val & 0x7c00) >> 10;\n"
+"  uint G = (val & 0x3e0) >> 5;\n"
+"  uint R = (val & 0x1f);\n"
+"\n"
+"  outTextid.xy = float4 (float3 (R, G, B) / 31, 1.0);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_r210_to_RGBA\n"
+"Texture2D<uint> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  uint val = inTex.Load (tid);\n"
+"  uint val_be = ((val & 0xff) << 24) | ((val & 0xff00) << 8) |\n"
+"      ((val & 0xff0000) >> 8) | ((val & 0xff000000) >> 24);\n"
+"  uint R = (val_be >> 20) & 0x3ff;\n"
+"  uint G = (val_be >> 10) & 0x3ff;\n"
+"  uint B = val_be & 0x3ff;\n"
+"\n"
+"  outTextid.xy = float4 (float3 (R, G, B) / 1023, 1.0);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_RGBA_to_RGB\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float3 val0 = inTex.Load (uint3 (tid.x * 4, tid.y, 0)).rgb;\n"
+"  float3 val1 = inTex.Load (uint3 (tid.x * 4 + 1, tid.y, 0)).rgb;\n"
+"  float3 val2 = inTex.Load (uint3 (tid.x * 4 + 2, tid.y, 0)).rgb;\n"
+"  float3 val3 = inTex.Load (uint3 (tid.x * 4 + 3, tid.y, 0)).rgb;\n"
+"\n"
+"  outTexuint2(tid.x * 3, tid.y)     = float4 (val0.r, val0.g, val0.b, val1.r);\n"
+"  outTexuint2(tid.x * 3 + 1, tid.y) = float4 (val1.g, val1.b, val2.r, val2.g);\n"
+"  outTexuint2(tid.x * 3 + 2, tid.y) = float4 (val2.b, val3.r, val3.g, val3.b);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_RGBA_to_BGR\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float3 val0 = inTex.Load (uint3 (tid.x * 4, tid.y, 0)).rgb;\n"
+"  float3 val1 = inTex.Load (uint3 (tid.x * 4 + 1, tid.y, 0)).rgb;\n"
+"  float3 val2 = inTex.Load (uint3 (tid.x * 4 + 2, tid.y, 0)).rgb;\n"
+"  float3 val3 = inTex.Load (uint3 (tid.x * 4 + 3, tid.y, 0)).rgb;\n"
+"\n"
+"  outTexuint2(tid.x * 3, tid.y)     = float4 (val0.b, val0.g, val0.r, val1.b);\n"
+"  outTexuint2(tid.x * 3 + 1, tid.y) = float4 (val1.g, val1.r, val2.b, val2.g);\n"
+"  outTexuint2(tid.x * 3 + 2, tid.y) = float4 (val2.r, val3.b, val3.g, val3.r);\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_RGBA_to_RGB16\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<uint> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float3 val = inTex.Load (tid).rgb;\n"
+"  uint R = val.r * 31;\n"
+"  uint G = val.g * 63;\n"
+"  uint B = val.b * 31;\n"
+"\n"
+"  outTextid.xy = (R << 11) | (G << 5) | B;\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_RGBA_to_BGR16\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<uint> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float3 val = inTex.Load (tid).rgb;\n"
+"  uint R = val.r * 31;\n"
+"  uint G = val.g * 63;\n"
+"  uint B = val.b * 31;\n"
+"\n"
+"  outTextid.xy = (B << 11) | (G << 5) | R;\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_RGBA_to_RGB15\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<uint> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  uint3 val = inTex.Load (tid).rgb * 31;\n"
+"\n"
+"  outTextid.xy = (val.r << 10) | (val.g << 5) | val.b;\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_RGBA_to_BGR15\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<uint> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  uint3 val = inTex.Load (tid).rgb * 31;\n"
+"\n"
+"  outTextid.xy = (val.b << 10) | (val.g << 5) | val.r;\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_RGBA_to_r210\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<uint> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  uint3 val = inTex.Load (tid).rgb * 1023;\n"
+"  uint packed = (val.r << 20) | (val.g << 10) | val.b;\n"
+"  uint packed_be = ((packed & 0xff) << 24) | ((packed & 0xff00) << 8) |\n"
+"      ((packed & 0xff0000) >> 8) | ((packed & 0xff000000) >> 24);\n"
+"\n"
+"  outTextid.xy = packed_be;\n"
+"}\n"
+"#endif\n"
+"\n"
+"#ifdef BUILDING_CSMain_RGBA_to_BGRA\n"
+"Texture2D<float4> inTex : register(t0);\n"
+"RWTexture2D<unorm float4> outTex : register(u0);\n"
+"\n"
+"void Execute (uint3 tid)\n"
+"{\n"
+"  float4 val = inTex.Load (tid);\n"
+"\n"
+"  outTextid.xy = val.bgra;\n"
+"}\n"
+"#endif\n"
+"\n"
+"numthreads(8, 8, 1)\n"
+"void ENTRY_POINT (uint3 tid : SV_DispatchThreadID)\n"
+"{\n"
+"  Execute (tid);\n"
+"}\n";
+#endif

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/hlsl/PSMain_converter.hlsl Added

@@ -0,0 +1,2217 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef BUILDING_HLSL
+struct PSColorSpace
+{
+  float3 CoeffX;
+  float3 CoeffY;
+  float3 CoeffZ;
+  float3 Offset;
+  float3 Min;
+  float3 Max;
+  float padding;
+};
+
+cbuffer PsConstBuffer : register(b0)
+{
+  PSColorSpace preCoeff;
+  PSColorSpace postCoeff;
+  PSColorSpace primariesCoeff;
+  float alphaFactor;
+};
+
+Texture2D shaderTexture4 : register(t0);
+Texture1D<float> gammaDecLUT : register(t4);
+Texture1D<float> gammaEncLUT: register(t5);
+SamplerState samplerState : register(s0);
+SamplerState linearSampler : register(s1);
+
+struct PS_INPUT
+{
+  float4 Position: SV_POSITION;
+  float2 Texture: TEXCOORD;
+};
+
+struct PS_OUTPUT_LUMA
+{
+  float4 Plane0: SV_TARGET0;
+};
+
+struct PS_OUTPUT_CHROMA
+{
+  float4 Plane0: SV_TARGET0;
+};
+
+struct PS_OUTPUT_CHROMA_PLANAR
+{
+  float4 Plane0: SV_TARGET0;
+  float4 Plane1: SV_TARGET1;
+};
+
+struct PS_OUTPUT_PLANAR
+{
+  float4 Plane0: SV_TARGET0;
+  float4 Plane1: SV_TARGET1;
+  float4 Plane2: SV_TARGET2;
+};
+
+struct PS_OUTPUT_PLANAR_FULL
+{
+  float4 Plane0: SV_TARGET0;
+  float4 Plane1: SV_TARGET1;
+  float4 Plane2: SV_TARGET2;
+  float4 Plane3: SV_TARGET3;
+};
+
+struct PS_OUTPUT_PACKED
+{
+  float4 Plane0: SV_TARGET0;
+};
+
+float4 DoAlphaPremul (float4 sample)
+{
+  float4 premul_tex;
+  premul_tex.rgb = sample.rgb * sample.a;
+  premul_tex.a = sample.a;
+  return premul_tex;
+}
+
+float4 DoAlphaUnpremul (float4 sample)
+{
+  float4 unpremul_tex;
+  if (sample.a == 0 || sample.a == 1)
+    return sample;
+
+  unpremul_tex.rgb = saturate (sample.rgb / sample.a);
+  unpremul_tex.a = sample.a;
+  return unpremul_tex;
+}
+
+interface ISampler
+{
+  float4 Execute (float2 uv);
+};
+
+class SamplerGRAY : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.x = shaderTexture0.Sample(samplerState, uv).x;
+    sample.y = 0.5;
+    sample.z = 0.5;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerNV12 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.x = shaderTexture0.Sample(samplerState, uv).x;
+    sample.yz = shaderTexture1.Sample(samplerState, uv).xy;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerNV21 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.x = shaderTexture0.Sample(samplerState, uv).x;
+    sample.yz = shaderTexture1.Sample(samplerState, uv).yx;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerI420 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.x = shaderTexture0.Sample(samplerState, uv).x;
+    sample.y = shaderTexture1.Sample(samplerState, uv).x;
+    sample.z = shaderTexture2.Sample(samplerState, uv).x;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerYV12 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.x = shaderTexture0.Sample(samplerState, uv).x;
+    sample.z = shaderTexture1.Sample(samplerState, uv).x;
+    sample.y = shaderTexture2.Sample(samplerState, uv).x;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerI420_10 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float3 sample;
+    sample.x = shaderTexture0.Sample(samplerState, uv).x;
+    sample.y = shaderTexture1.Sample(samplerState, uv).x;
+    sample.z = shaderTexture2.Sample(samplerState, uv).x;
+    return float4 (saturate (sample * 64.0), 1.0);
+  }
+};
+
+class SamplerI420_12 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float3 sample;
+    sample.x = shaderTexture0.Sample(samplerState, uv).x;
+    sample.y = shaderTexture1.Sample(samplerState, uv).x;
+    sample.z = shaderTexture2.Sample(samplerState, uv).x;
+    return float4 (saturate (sample * 16.0), 1.0);
+  }
+};
+
+class SamplerVUYA : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture0.Sample(samplerState, uv).zyxw;
+  }
+};
+
+class SamplerVUYAPremul : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).zyxw);
+  }
+};
+
+class SamplerY410 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return float4 (shaderTexture0.Sample(samplerState, uv).yxz, 1.0);
+  }
+};
+
+class SamplerY412 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture0.Sample(samplerState, uv).grba;
+  }
+};
+
+class SamplerY412Premul : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).grba);
+  }
+};
+
+class SamplerAYUV : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture0.Sample(samplerState, uv).yzwx;
+  }
+};
+
+class SamplerAYUVPremul : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).yzwx);
+  }
+};
+
+class SamplerRGBA : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture0.Sample(samplerState, uv);
+  }
+};
+
+class SamplerRGBAPremul : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv));
+  }
+};
+
+class SamplerRGBx : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return float4 (shaderTexture0.Sample(samplerState, uv).rgb, 1.0);
+  }
+};
+
+class SamplerxRGB : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return float4 (shaderTexture0.Sample(samplerState, uv).gba, 1.0);
+  }
+};
+
+class SamplerARGB : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture0.Sample(samplerState, uv).gbar;
+  }
+};
+
+class SamplerARGBPremul : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).gbar);
+  }
+};
+
+class SamplerxBGR : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return float4 (shaderTexture0.Sample(samplerState, uv).abg, 1.0);
+  }
+};
+
+class SamplerABGR : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture0.Sample(samplerState, uv).abgr;
+  }
+};
+
+class SamplerABGRPremul : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).abgr);
+  }
+};
+
+class SamplerBGR10A2 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return float4 (shaderTexture0.Sample(samplerState, uv).zyx, 1.0);
+  }
+};
+
+class SamplerBGRA64 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture0.Sample(samplerState, uv).bgra;
+  }
+};
+
+class SamplerBGRA64Premul : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).bgra);
+  }
+};
+
+class SamplerGBR : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.g = shaderTexture0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture2.Sample(samplerState, uv).x;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerGBR_10 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float3 sample;
+    sample.g = shaderTexture0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture2.Sample(samplerState, uv).x;
+    return float4 (saturate (sample * 64.0), 1.0);
+  }
+};
+
+class SamplerGBR_12 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float3 sample;
+    sample.g = shaderTexture0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture2.Sample(samplerState, uv).x;
+    return float4 (saturate (sample * 16.0), 1.0);
+  }
+};
+
+class SamplerGBRA : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.g = shaderTexture0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture2.Sample(samplerState, uv).x;
+    sample.a = shaderTexture3.Sample(samplerState, uv).x;
+    return sample;
+  }
+};
+
+class SamplerGBRAPremul : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.g = shaderTexture0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture2.Sample(samplerState, uv).x;
+    sample.a = shaderTexture3.Sample(samplerState, uv).x;
+    return DoAlphaUnpremul (sample);
+  }
+};
+
+class SamplerGBRA_10 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.g = shaderTexture0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture2.Sample(samplerState, uv).x;
+    sample.a = shaderTexture3.Sample(samplerState, uv).x;
+    return saturate (sample * 64.0);
+  }
+};
+
+class SamplerGBRAPremul_10 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.g = shaderTexture0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture2.Sample(samplerState, uv).x;
+    sample.a = shaderTexture3.Sample(samplerState, uv).x;
+    return DoAlphaUnpremul (saturate (sample * 64.0));
+  }
+};
+
+class SamplerGBRA_12 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.g = shaderTexture0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture2.Sample(samplerState, uv).x;
+    sample.a = shaderTexture3.Sample(samplerState, uv).x;
+    return saturate (sample * 16.0);
+  }
+};
+
+class SamplerGBRAPremul_12 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.g = shaderTexture0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture2.Sample(samplerState, uv).x;
+    sample.a = shaderTexture3.Sample(samplerState, uv).x;
+    return DoAlphaUnpremul (saturate (sample * 16.0));
+  }
+};
+
+class SamplerRGBP : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.r = shaderTexture0.Sample(samplerState, uv).x;
+    sample.g = shaderTexture1.Sample(samplerState, uv).x;
+    sample.b = shaderTexture2.Sample(samplerState, uv).x;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerBGRP : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.b = shaderTexture0.Sample(samplerState, uv).x;
+    sample.g = shaderTexture1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture2.Sample(samplerState, uv).x;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerRBGA : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture0.Sample(samplerState, uv).rbga;
+  }
+};
+
+class SamplerRBGAPremul : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).rbga);
+  }
+};
+
+interface IConverter
+{
+  float4 Execute (float4 sample);
+};
+
+class ConverterIdentity : IConverter
+{
+  float4 Execute (float4 sample)
+  {
+    return sample;
+  }
+};
+
+class ConverterRange : IConverter
+{
+  float4 Execute (float4 sample)
+  {
+    float3 out_space;
+    out_space.x = postCoeff.CoeffX.x * sample.x;
+    out_space.y = postCoeff.CoeffY.y * sample.y;
+    out_space.z = postCoeff.CoeffZ.z * sample.z;
+    out_space += postCoeff.Offset;
+    return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);
+  }
+};
+
+class ConverterSimple : IConverter
+{
+  float4 Execute (float4 sample)
+  {
+    float3 out_space;
+    out_space.x = dot (postCoeff.CoeffX, sample.xyz);
+    out_space.y = dot (postCoeff.CoeffY, sample.xyz);
+    out_space.z = dot (postCoeff.CoeffZ, sample.xyz);
+    out_space += postCoeff.Offset;
+    return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);
+  }
+};
+
+class ConverterGamma : IConverter
+{
+  float4 Execute (float4 sample)
+  {
+    float3 rgb_space;
+    float3 out_space;
+    rgb_space.x = dot (preCoeff.CoeffX, sample.xyz);
+    rgb_space.y = dot (preCoeff.CoeffY, sample.xyz);
+    rgb_space.z = dot (preCoeff.CoeffZ, sample.xyz);
+    rgb_space += preCoeff.Offset;
+    rgb_space = clamp (rgb_space, preCoeff.Min, preCoeff.Max);
+
+    rgb_space.x = gammaDecLUT.Sample (linearSampler, rgb_space.x);
+    rgb_space.y = gammaDecLUT.Sample (linearSampler, rgb_space.y);
+    rgb_space.z = gammaDecLUT.Sample (linearSampler, rgb_space.z);
+
+    rgb_space.x = gammaEncLUT.Sample (linearSampler, rgb_space.x);
+    rgb_space.y = gammaEncLUT.Sample (linearSampler, rgb_space.y);
+    rgb_space.z = gammaEncLUT.Sample (linearSampler, rgb_space.z);
+
+    out_space.x = dot (postCoeff.CoeffX, rgb_space);
+    out_space.y = dot (postCoeff.CoeffY, rgb_space);
+    out_space.z = dot (postCoeff.CoeffZ, rgb_space);
+    out_space += postCoeff.Offset;
+    return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);
+  }
+};
+
+class ConverterPrimary : IConverter
+{
+  float4 Execute (float4 sample)
+  {
+    float3 rgb_space;
+    float3 primary_converted;
+    float3 out_space;
+
+    rgb_space.x = dot (preCoeff.CoeffX, sample.xyz);
+    rgb_space.y = dot (preCoeff.CoeffY, sample.xyz);
+    rgb_space.z = dot (preCoeff.CoeffZ, sample.xyz);
+    rgb_space += preCoeff.Offset;
+    rgb_space = clamp (rgb_space, preCoeff.Min, preCoeff.Max);
+
+    rgb_space.x = gammaDecLUT.Sample (linearSampler, rgb_space.x);
+    rgb_space.y = gammaDecLUT.Sample (linearSampler, rgb_space.y);
+    rgb_space.z = gammaDecLUT.Sample (linearSampler, rgb_space.z);
+
+    primary_converted.x = dot (primariesCoeff.CoeffX, rgb_space);
+    primary_converted.y = dot (primariesCoeff.CoeffY, rgb_space);
+    primary_converted.z = dot (primariesCoeff.CoeffZ, rgb_space);
+
+    rgb_space.x = gammaEncLUT.Sample (linearSampler, primary_converted.x);
+    rgb_space.y = gammaEncLUT.Sample (linearSampler, primary_converted.y);
+    rgb_space.z = gammaEncLUT.Sample (linearSampler, primary_converted.z);
+
+    out_space.x = dot (postCoeff.CoeffX, rgb_space);
+    out_space.y = dot (postCoeff.CoeffY, rgb_space);
+    out_space.z = dot (postCoeff.CoeffZ, rgb_space);
+    out_space += postCoeff.Offset;
+    return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);
+  }
+};
+
+float UnormTo10bit (float sample)
+{
+  return sample * 1023.0 / 65535.0;
+}
+
+float2 UnormTo10bit (float2 sample)
+{
+  return sample * 1023.0 / 65535.0;
+}
+
+float3 UnormTo10bit (float3 sample)
+{
+  return sample * 1023.0 / 65535.0;
+}
+
+float4 UnormTo10bit (float4 sample)
+{
+  return sample * 1023.0 / 65535.0;
+}
+
+float UnormTo12bit (float sample)
+{
+  return sample * 4095.0 / 65535.0;
+}
+
+float2 UnormTo12bit (float2 sample)
+{
+  return sample * 4095.0 / 65535.0;
+}
+
+float3 UnormTo12bit (float3 sample)
+{
+  return sample * 4095.0 / 65535.0;
+}
+
+float4 UnormTo12bit (float4 sample)
+{
+  return sample * 4095.0 / 65535.0;
+}
+
+interface IOutputLuma
+{
+  PS_OUTPUT_LUMA Build (float4 sample);
+};
+
+class OutputLuma : IOutputLuma
+{
+  PS_OUTPUT_LUMA Build (float4 sample)
+  {
+    PS_OUTPUT_LUMA output;
+    output.Plane0 = float4 (sample.x, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputLuma_10 : IOutputLuma
+{
+  PS_OUTPUT_LUMA Build (float4 sample)
+  {
+    PS_OUTPUT_LUMA output;
+    output.Plane0 = float4 (UnormTo10bit (sample.x), 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputLuma_12 : IOutputLuma
+{
+  PS_OUTPUT_LUMA Build (float4 sample)
+  {
+    PS_OUTPUT_LUMA output;
+    output.Plane0 = float4 (UnormTo12bit (sample.x), 0, 0, 0);
+    return output;
+  }
+};
+
+interface IOutputChroma
+{
+  PS_OUTPUT_CHROMA Build (float4 sample);
+};
+
+class OutputChromaNV12 : IOutputChroma
+{
+  PS_OUTPUT_CHROMA Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA output;
+    output.Plane0 = float4 (sample.yz, 0, 0);
+    return output;
+  }
+};
+
+class OutputChromaNV21 : IOutputChroma
+{
+  PS_OUTPUT_CHROMA Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA output;
+    output.Plane0 = float4 (sample.zy, 0, 0);
+    return output;
+  }
+};
+
+interface IOutputChromaPlanar
+{ PS_OUTPUT_CHROMA_PLANAR Build (float4 sample);
+};
+
+class OutputChromaI420 : IOutputChromaPlanar
+{
+  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA_PLANAR output;
+    output.Plane0 = float4 (sample.y, 0, 0, 0);
+    output.Plane1 = float4 (sample.z, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputChromaYV12 : IOutputChromaPlanar
+{
+  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA_PLANAR output;
+    output.Plane0 = float4 (sample.z, 0, 0, 0);
+    output.Plane1 = float4 (sample.y, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputChromaI420_10 : IOutputChromaPlanar
+{
+  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA_PLANAR output;
+    float2 scaled = UnormTo10bit (sample.yz);
+    output.Plane0 = float4 (scaled.x, 0, 0, 0);
+    output.Plane1 = float4 (scaled.y, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputChromaI420_12 : IOutputChromaPlanar
+{
+  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA_PLANAR output;
+    float2 scaled = UnormTo12bit (sample.yz);
+    output.Plane0 = float4 (scaled.x, 0, 0, 0);
+    output.Plane1 = float4 (scaled.y, 0, 0, 0);
+    return output;
+  }
+};
+
+interface IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample);
+};
+
+class OutputY444 : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    output.Plane0 = float4 (sample.x, 0, 0, 0);
+    output.Plane1 = float4 (sample.y, 0, 0, 0);
+    output.Plane2 = float4 (sample.z, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputY444_10 : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    float3 scaled = UnormTo10bit (sample.xyz);
+    output.Plane0 = float4 (scaled.x, 0, 0, 0);
+    output.Plane1 = float4 (scaled.y, 0, 0, 0);
+    output.Plane2 = float4 (scaled.z, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputY444_12 : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    float3 scaled = UnormTo12bit (sample.xyz);
+    output.Plane0 = float4 (scaled.x, 0, 0, 0);
+    output.Plane1 = float4 (scaled.y, 0, 0, 0);
+    output.Plane2 = float4 (scaled.z, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBR : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    output.Plane0 = float4 (sample.g, 0, 0, 0);
+    output.Plane1 = float4 (sample.b, 0, 0, 0);
+    output.Plane2 = float4 (sample.r, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBR_10 : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    float3 scaled = UnormTo10bit (sample.rgb);
+    output.Plane0 = float4 (scaled.g, 0, 0, 0);
+    output.Plane1 = float4 (scaled.b, 0, 0, 0);
+    output.Plane2 = float4 (scaled.r, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBR_12 : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    float3 scaled = UnormTo12bit (sample.rgb);
+    output.Plane0 = float4 (scaled.g, 0, 0, 0);
+    output.Plane1 = float4 (scaled.b, 0, 0, 0);
+    output.Plane2 = float4 (scaled.r, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputRGBP : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    output.Plane0 = float4 (sample.r, 0, 0, 0);
+    output.Plane1 = float4 (sample.g, 0, 0, 0);
+    output.Plane2 = float4 (sample.b, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputBGRP : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    output.Plane0 = float4 (sample.b, 0, 0, 0);
+    output.Plane1 = float4 (sample.g, 0, 0, 0);
+    output.Plane2 = float4 (sample.r, 0, 0, 0);
+    return output;
+  }
+};
+
+interface IOutputPlanarFull
+{
+  PS_OUTPUT_PLANAR_FULL Build (float4 sample);
+};
+
+class OutputGBRA : IOutputPlanarFull
+{
+  PS_OUTPUT_PLANAR_FULL Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR_FULL output;
+    output.Plane0 = float4 (sample.g, 0, 0, 0);
+    output.Plane1 = float4 (sample.b, 0, 0, 0);
+    output.Plane2 = float4 (sample.r, 0, 0, 0);
+    output.Plane3 = float4 (sample.a * alphaFactor, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBRAPremul : IOutputPlanarFull
+{
+  PS_OUTPUT_PLANAR_FULL Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR_FULL output;
+    float4 premul;
+    sample.a *= alphaFactor;
+    premul = DoAlphaPremul (sample);
+    output.Plane0 = float4 (premul.g, 0, 0, 0);
+    output.Plane1 = float4 (premul.b, 0, 0, 0);
+    output.Plane2 = float4 (premul.r, 0, 0, 0);
+    output.Plane3 = float4 (premul.a, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBRA_10 : IOutputPlanarFull
+{
+  PS_OUTPUT_PLANAR_FULL Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR_FULL output;
+    float4 scaled;
+    sample.a *= alphaFactor;
+    scaled = UnormTo10bit (sample);
+    output.Plane0 = float4 (scaled.g, 0, 0, 0);
+    output.Plane1 = float4 (scaled.b, 0, 0, 0);
+    output.Plane2 = float4 (scaled.r, 0, 0, 0);
+    output.Plane3 = float4 (scaled.a, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBRAPremul_10 : IOutputPlanarFull
+{
+  PS_OUTPUT_PLANAR_FULL Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR_FULL output;
+    float4 scaled;
+    sample.a *= alphaFactor;
+    scaled = UnormTo10bit (DoAlphaPremul (sample));
+    output.Plane0 = float4 (scaled.g, 0, 0, 0);
+    output.Plane1 = float4 (scaled.b, 0, 0, 0);
+    output.Plane2 = float4 (scaled.r, 0, 0, 0);
+    output.Plane3 = float4 (scaled.a, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBRA_12 : IOutputPlanarFull
+{
+  PS_OUTPUT_PLANAR_FULL Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR_FULL output;
+    float4 scaled;
+    sample.a *= alphaFactor;
+    scaled = UnormTo12bit (sample);
+    output.Plane0 = float4 (scaled.g, 0, 0, 0);
+    output.Plane1 = float4 (scaled.b, 0, 0, 0);
+    output.Plane2 = float4 (scaled.r, 0, 0, 0);
+    output.Plane3 = float4 (scaled.a, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBRAPremul_12 : IOutputPlanarFull
+{
+  PS_OUTPUT_PLANAR_FULL Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR_FULL output;
+    float4 scaled;
+    sample.a *= alphaFactor;
+    scaled = UnormTo12bit (DoAlphaPremul (sample));
+    output.Plane0 = float4 (scaled.g, 0, 0, 0);
+    output.Plane1 = float4 (scaled.b, 0, 0, 0);
+    output.Plane2 = float4 (scaled.r, 0, 0, 0);
+    output.Plane3 = float4 (scaled.a, 0, 0, 0);
+    return output;
+  }
+};
+
+interface IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample);
+};
+
+class OutputRGBA : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = float4 (sample.rgb, sample.a * alphaFactor);
+    return output;
+  }
+};
+
+class OutputRGBAPremul : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    sample.a *= alphaFactor;
+    output.Plane0 = DoAlphaPremul (sample);
+    return output;
+  }
+};
+
+class OutputRGBx : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = float4 (sample.rgb, 1.0);
+    return output;
+  }
+};
+
+class OutputxRGB : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = float4 (0.0, sample.rgb);
+    return output;
+  }
+};
+
+class OutputARGB : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = sample.argb;
+    return output;
+  }
+};
+
+class OutputARGBPremul : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = DoAlphaPremul (sample).argb;
+    return output;
+  }
+};
+
+class OutputxBGR : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = float4 (0.0, sample.bgr);
+    return output;
+  }
+};
+
+class OutputABGR : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = sample.abgr;
+    return output;
+  }
+};
+
+class OutputABGRPremul : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = DoAlphaPremul (sample.abgr);
+    return output;
+  }
+};
+
+class OutputVUYA : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    sample.a *= alphaFactor;
+    output.Plane0 = sample.zyxw;
+    return output;
+  }
+};
+
+class OutputVUYAPremul : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    sample.a *= alphaFactor;
+    output.Plane0 = DoAlphaPremul (sample).zyxw;
+    return output;
+  }
+};
+
+class OutputAYUV : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    sample.a *= alphaFactor;
+    output.Plane0 = sample.wxyz;
+    return output;
+  }
+};
+
+class OutputAYUVPremul : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    sample.a *= alphaFactor;
+    output.Plane0 = DoAlphaPremul (sample).wxyz;
+    return output;
+  }
+};
+
+class OutputRBGA : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    sample.a *= alphaFactor;
+    output.Plane0 = sample.rbga;
+    return output;
+  }
+};
+
+class OutputRBGAPremul : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    sample.a *= alphaFactor;
+    output.Plane0 = DoAlphaPremul (sample).rbga;
+    return output;
+  }
+};
+
+OUTPUT_TYPE ENTRY_POINT (PS_INPUT input)
+{
+  SAMPLER g_sampler;
+  CONVERTER g_converter;
+  OUTPUT_BUILDER g_builder;
+  return g_builder.Build (g_converter.Execute (g_sampler.Execute (input.Texture)));
+}
+#else /* BUILDING_HLSL */
+static const char g_PSMain_converter_str =
+"struct PSColorSpace\n"
+"{\n"
+"  float3 CoeffX;\n"
+"  float3 CoeffY;\n"
+"  float3 CoeffZ;\n"
+"  float3 Offset;\n"
+"  float3 Min;\n"
+"  float3 Max;\n"
+"  float padding;\n"
+"};\n"
+"\n"
+"cbuffer PsConstBuffer : register(b0)\n"
+"{\n"
+"  PSColorSpace preCoeff;\n"
+"  PSColorSpace postCoeff;\n"
+"  PSColorSpace primariesCoeff;\n"
+"  float alphaFactor;\n"
+"};\n"
+"\n"
+"Texture2D shaderTexture4 : register(t0);\n"
+"Texture1D<float> gammaDecLUT : register(t4);\n"
+"Texture1D<float> gammaEncLUT: register(t5);\n"
+"SamplerState samplerState : register(s0);\n"
+"SamplerState linearSampler : register(s1);\n"
+"\n"
+"struct PS_INPUT\n"
+"{\n"
+"  float4 Position: SV_POSITION;\n"
+"  float2 Texture: TEXCOORD;\n"
+"};\n"
+"\n"
+"struct PS_OUTPUT_LUMA\n"
+"{\n"
+"  float4 Plane0: SV_TARGET0;\n"
+"};\n"
+"\n"
+"struct PS_OUTPUT_CHROMA\n"
+"{\n"
+"  float4 Plane0: SV_TARGET0;\n"
+"};\n"
+"\n"
+"struct PS_OUTPUT_CHROMA_PLANAR\n"
+"{\n"
+"  float4 Plane0: SV_TARGET0;\n"
+"  float4 Plane1: SV_TARGET1;\n"
+"};\n"
+"\n"
+"struct PS_OUTPUT_PLANAR\n"
+"{\n"
+"  float4 Plane0: SV_TARGET0;\n"
+"  float4 Plane1: SV_TARGET1;\n"
+"  float4 Plane2: SV_TARGET2;\n"
+"};\n"
+"\n"
+"struct PS_OUTPUT_PLANAR_FULL\n"
+"{\n"
+"  float4 Plane0: SV_TARGET0;\n"
+"  float4 Plane1: SV_TARGET1;\n"
+"  float4 Plane2: SV_TARGET2;\n"
+"  float4 Plane3: SV_TARGET3;\n"
+"};\n"
+"\n"
+"struct PS_OUTPUT_PACKED\n"
+"{\n"
+"  float4 Plane0: SV_TARGET0;\n"
+"};\n"
+"\n"
+"float4 DoAlphaPremul (float4 sample)\n"
+"{\n"
+"  float4 premul_tex;\n"
+"  premul_tex.rgb = sample.rgb * sample.a;\n"
+"  premul_tex.a = sample.a;\n"
+"  return premul_tex;\n"
+"}\n"
+"\n"
+"float4 DoAlphaUnpremul (float4 sample)\n"
+"{\n"
+"  float4 unpremul_tex;\n"
+"  if (sample.a == 0 || sample.a == 1)\n"
+"    return sample;\n"
+"\n"
+"  unpremul_tex.rgb = saturate (sample.rgb / sample.a);\n"
+"  unpremul_tex.a = sample.a;\n"
+"  return unpremul_tex;\n"
+"}\n"
+"\n"
+"interface ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv);\n"
+"};\n"
+"\n"
+"class SamplerGRAY : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.x = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.y = 0.5;\n"
+"    sample.z = 0.5;\n"
+"    sample.a = 1.0;\n"
+"    return sample;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerNV12 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.x = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.yz = shaderTexture1.Sample(samplerState, uv).xy;\n"
+"    sample.a = 1.0;\n"
+"    return sample;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerNV21 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.x = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.yz = shaderTexture1.Sample(samplerState, uv).yx;\n"
+"    sample.a = 1.0;\n"
+"    return sample;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerI420 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.x = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.y = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.z = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    sample.a = 1.0;\n"
+"    return sample;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerYV12 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.x = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.z = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.y = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    sample.a = 1.0;\n"
+"    return sample;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerI420_10 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float3 sample;\n"
+"    sample.x = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.y = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.z = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    return float4 (saturate (sample * 64.0), 1.0);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerI420_12 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float3 sample;\n"
+"    sample.x = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.y = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.z = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    return float4 (saturate (sample * 16.0), 1.0);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerVUYA : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return shaderTexture0.Sample(samplerState, uv).zyxw;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerVUYAPremul : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).zyxw);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerY410 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return float4 (shaderTexture0.Sample(samplerState, uv).yxz, 1.0);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerY412 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return shaderTexture0.Sample(samplerState, uv).grba;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerY412Premul : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).grba);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerAYUV : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return shaderTexture0.Sample(samplerState, uv).yzwx;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerAYUVPremul : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).yzwx);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerRGBA : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return shaderTexture0.Sample(samplerState, uv);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerRGBAPremul : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv));\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerRGBx : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return float4 (shaderTexture0.Sample(samplerState, uv).rgb, 1.0);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerxRGB : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return float4 (shaderTexture0.Sample(samplerState, uv).gba, 1.0);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerARGB : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return shaderTexture0.Sample(samplerState, uv).gbar;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerARGBPremul : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).gbar);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerxBGR : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return float4 (shaderTexture0.Sample(samplerState, uv).abg, 1.0);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerABGR : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return shaderTexture0.Sample(samplerState, uv).abgr;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerABGRPremul : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).abgr);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerBGR10A2 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return float4 (shaderTexture0.Sample(samplerState, uv).zyx, 1.0);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerBGRA64 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return shaderTexture0.Sample(samplerState, uv).bgra;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerBGRA64Premul : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).bgra);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerGBR : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.g = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.b = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.r = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    sample.a = 1.0;\n"
+"    return sample;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerGBR_10 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float3 sample;\n"
+"    sample.g = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.b = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.r = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    return float4 (saturate (sample * 64.0), 1.0);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerGBR_12 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float3 sample;\n"
+"    sample.g = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.b = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.r = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    return float4 (saturate (sample * 16.0), 1.0);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerGBRA : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.g = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.b = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.r = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    sample.a = shaderTexture3.Sample(samplerState, uv).x;\n"
+"    return sample;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerGBRAPremul : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.g = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.b = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.r = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    sample.a = shaderTexture3.Sample(samplerState, uv).x;\n"
+"    return DoAlphaUnpremul (sample);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerGBRA_10 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.g = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.b = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.r = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    sample.a = shaderTexture3.Sample(samplerState, uv).x;\n"
+"    return saturate (sample * 64.0);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerGBRAPremul_10 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.g = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.b = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.r = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    sample.a = shaderTexture3.Sample(samplerState, uv).x;\n"
+"    return DoAlphaUnpremul (saturate (sample * 64.0));\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerGBRA_12 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.g = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.b = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.r = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    sample.a = shaderTexture3.Sample(samplerState, uv).x;\n"
+"    return saturate (sample * 16.0);\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerGBRAPremul_12 : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.g = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.b = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.r = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    sample.a = shaderTexture3.Sample(samplerState, uv).x;\n"
+"    return DoAlphaUnpremul (saturate (sample * 16.0));\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerRGBP : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.r = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.g = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.b = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    sample.a = 1.0;\n"
+"    return sample;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerBGRP : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    float4 sample;\n"
+"    sample.b = shaderTexture0.Sample(samplerState, uv).x;\n"
+"    sample.g = shaderTexture1.Sample(samplerState, uv).x;\n"
+"    sample.r = shaderTexture2.Sample(samplerState, uv).x;\n"
+"    sample.a = 1.0;\n"
+"    return sample;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerRBGA : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return shaderTexture0.Sample(samplerState, uv).rbga;\n"
+"  }\n"
+"};\n"
+"\n"
+"class SamplerRBGAPremul : ISampler\n"
+"{\n"
+"  float4 Execute (float2 uv)\n"
+"  {\n"
+"    return DoAlphaUnpremul (shaderTexture0.Sample(samplerState, uv).rbga);\n"
+"  }\n"
+"};\n"
+"\n"
+"interface IConverter\n"
+"{\n"
+"  float4 Execute (float4 sample);\n"
+"};\n"
+"\n"
+"class ConverterIdentity : IConverter\n"
+"{\n"
+"  float4 Execute (float4 sample)\n"
+"  {\n"
+"    return sample;\n"
+"  }\n"
+"};\n"
+"\n"
+"class ConverterGamma : IConverter\n"
+"{\n"
+"  float4 Execute (float4 sample)\n"
+"  {\n"
+"    float3 rgb_space;\n"
+"    float3 out_space;\n"
+"    rgb_space.x = dot (preCoeff.CoeffX, sample.xyz);\n"
+"    rgb_space.y = dot (preCoeff.CoeffY, sample.xyz);\n"
+"    rgb_space.z = dot (preCoeff.CoeffZ, sample.xyz);\n"
+"    rgb_space += preCoeff.Offset;\n"
+"    rgb_space = clamp (rgb_space, preCoeff.Min, preCoeff.Max);\n"
+"\n"
+"    rgb_space.x = gammaDecLUT.Sample (linearSampler, rgb_space.x);\n"
+"    rgb_space.y = gammaDecLUT.Sample (linearSampler, rgb_space.y);\n"
+"    rgb_space.z = gammaDecLUT.Sample (linearSampler, rgb_space.z);\n"
+"\n"
+"    rgb_space.x = gammaEncLUT.Sample (linearSampler, rgb_space.x);\n"
+"    rgb_space.y = gammaEncLUT.Sample (linearSampler, rgb_space.y);\n"
+"    rgb_space.z = gammaEncLUT.Sample (linearSampler, rgb_space.z);\n"
+"\n"
+"    out_space.x = dot (postCoeff.CoeffX, rgb_space);\n"
+"    out_space.y = dot (postCoeff.CoeffY, rgb_space);\n"
+"    out_space.z = dot (postCoeff.CoeffZ, rgb_space);\n"
+"    out_space += postCoeff.Offset;\n"
+"    return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);\n"
+"  }\n"
+"};\n"
+"\n"
+"class ConverterPrimary : IConverter\n"
+"{\n"
+"  float4 Execute (float4 sample)\n"
+"  {\n"
+"    float3 rgb_space;\n"
+"    float3 primary_converted;\n"
+"    float3 out_space;\n"
+"\n"
+"    rgb_space.x = dot (preCoeff.CoeffX, sample.xyz);\n"
+"    rgb_space.y = dot (preCoeff.CoeffY, sample.xyz);\n"
+"    rgb_space.z = dot (preCoeff.CoeffZ, sample.xyz);\n"
+"    rgb_space += preCoeff.Offset;\n"
+"    rgb_space = clamp (rgb_space, preCoeff.Min, preCoeff.Max);\n"
+"\n"
+"    rgb_space.x = gammaDecLUT.Sample (linearSampler, rgb_space.x);\n"
+"    rgb_space.y = gammaDecLUT.Sample (linearSampler, rgb_space.y);\n"
+"    rgb_space.z = gammaDecLUT.Sample (linearSampler, rgb_space.z);\n"
+"\n"
+"    primary_converted.x = dot (primariesCoeff.CoeffX, rgb_space);\n"
+"    primary_converted.y = dot (primariesCoeff.CoeffY, rgb_space);\n"
+"    primary_converted.z = dot (primariesCoeff.CoeffZ, rgb_space);\n"
+"\n"
+"    rgb_space.x = gammaEncLUT.Sample (linearSampler, primary_converted.x);\n"
+"    rgb_space.y = gammaEncLUT.Sample (linearSampler, primary_converted.y);\n"
+"    rgb_space.z = gammaEncLUT.Sample (linearSampler, primary_converted.z);\n"
+"\n"
+"    out_space.x = dot (postCoeff.CoeffX, rgb_space);\n"
+"    out_space.y = dot (postCoeff.CoeffY, rgb_space);\n"
+"    out_space.z = dot (postCoeff.CoeffZ, rgb_space);\n"
+"    out_space += postCoeff.Offset;\n"
+"    return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);\n"
+"  }\n"
+"};\n"
+"\n"
+"float UnormTo10bit (float sample)\n"
+"{\n"
+"  return sample * 1023.0 / 65535.0;\n"
+"}\n"
+"\n"
+"float2 UnormTo10bit (float2 sample)\n"
+"{\n"
+"  return sample * 1023.0 / 65535.0;\n"
+"}\n"
+"\n"
+"float3 UnormTo10bit (float3 sample)\n"
+"{\n"
+"  return sample * 1023.0 / 65535.0;\n"
+"}\n"
+"\n"
+"float4 UnormTo10bit (float4 sample)\n"
+"{\n"
+"  return sample * 1023.0 / 65535.0;\n"
+"}\n"
+"\n"
+"float UnormTo12bit (float sample)\n"
+"{\n"
+"  return sample * 4095.0 / 65535.0;\n"
+"}\n"
+"\n"
+"float2 UnormTo12bit (float2 sample)\n"
+"{\n"
+"  return sample * 4095.0 / 65535.0;\n"
+"}\n"
+"\n"
+"float3 UnormTo12bit (float3 sample)\n"
+"{\n"
+"  return sample * 4095.0 / 65535.0;\n"
+"}\n"
+"\n"
+"float4 UnormTo12bit (float4 sample)\n"
+"{\n"
+"  return sample * 4095.0 / 65535.0;\n"
+"}\n"
+"\n"
+"interface IOutputLuma\n"
+"{\n"
+"  PS_OUTPUT_LUMA Build (float4 sample);\n"
+"};\n"
+"\n"
+"class OutputLuma : IOutputLuma\n"
+"{\n"
+"  PS_OUTPUT_LUMA Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_LUMA output;\n"
+"    output.Plane0 = float4 (sample.x, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputLuma_10 : IOutputLuma\n"
+"{\n"
+"  PS_OUTPUT_LUMA Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_LUMA output;\n"
+"    output.Plane0 = float4 (UnormTo10bit (sample.x), 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputLuma_12 : IOutputLuma\n"
+"{\n"
+"  PS_OUTPUT_LUMA Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_LUMA output;\n"
+"    output.Plane0 = float4 (UnormTo12bit (sample.x), 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"interface IOutputChroma\n"
+"{\n"
+"  PS_OUTPUT_CHROMA Build (float4 sample);\n"
+"};\n"
+"\n"
+"class OutputChromaNV12 : IOutputChroma\n"
+"{\n"
+"  PS_OUTPUT_CHROMA Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_CHROMA output;\n"
+"    output.Plane0 = float4 (sample.yz, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputChromaNV21 : IOutputChroma\n"
+"{\n"
+"  PS_OUTPUT_CHROMA Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_CHROMA output;\n"
+"    output.Plane0 = float4 (sample.zy, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"interface IOutputChromaPlanar\n"
+"{ PS_OUTPUT_CHROMA_PLANAR Build (float4 sample);\n"
+"};\n"
+"\n"
+"class OutputChromaI420 : IOutputChromaPlanar\n"
+"{\n"
+"  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_CHROMA_PLANAR output;\n"
+"    output.Plane0 = float4 (sample.y, 0, 0, 0);\n"
+"    output.Plane1 = float4 (sample.z, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputChromaYV12 : IOutputChromaPlanar\n"
+"{\n"
+"  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_CHROMA_PLANAR output;\n"
+"    output.Plane0 = float4 (sample.z, 0, 0, 0);\n"
+"    output.Plane1 = float4 (sample.y, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputChromaI420_10 : IOutputChromaPlanar\n"
+"{\n"
+"  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_CHROMA_PLANAR output;\n"
+"    float2 scaled = UnormTo10bit (sample.yz);\n"
+"    output.Plane0 = float4 (scaled.x, 0, 0, 0);\n"
+"    output.Plane1 = float4 (scaled.y, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputChromaI420_12 : IOutputChromaPlanar\n"
+"{\n"
+"  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_CHROMA_PLANAR output;\n"
+"    float2 scaled = UnormTo12bit (sample.yz);\n"
+"    output.Plane0 = float4 (scaled.x, 0, 0, 0);\n"
+"    output.Plane1 = float4 (scaled.y, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"interface IOutputPlanar\n"
+"{\n"
+"  PS_OUTPUT_PLANAR Build (float4 sample);\n"
+"};\n"
+"\n"
+"class OutputY444 : IOutputPlanar\n"
+"{\n"
+"  PS_OUTPUT_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR output;\n"
+"    output.Plane0 = float4 (sample.x, 0, 0, 0);\n"
+"    output.Plane1 = float4 (sample.y, 0, 0, 0);\n"
+"    output.Plane2 = float4 (sample.z, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputY444_10 : IOutputPlanar\n"
+"{\n"
+"  PS_OUTPUT_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR output;\n"
+"    float3 scaled = UnormTo10bit (sample.xyz);\n"
+"    output.Plane0 = float4 (scaled.x, 0, 0, 0);\n"
+"    output.Plane1 = float4 (scaled.y, 0, 0, 0);\n"
+"    output.Plane2 = float4 (scaled.z, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputY444_12 : IOutputPlanar\n"
+"{\n"
+"  PS_OUTPUT_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR output;\n"
+"    float3 scaled = UnormTo12bit (sample.xyz);\n"
+"    output.Plane0 = float4 (scaled.x, 0, 0, 0);\n"
+"    output.Plane1 = float4 (scaled.y, 0, 0, 0);\n"
+"    output.Plane2 = float4 (scaled.z, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputGBR : IOutputPlanar\n"
+"{\n"
+"  PS_OUTPUT_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR output;\n"
+"    output.Plane0 = float4 (sample.g, 0, 0, 0);\n"
+"    output.Plane1 = float4 (sample.b, 0, 0, 0);\n"
+"    output.Plane2 = float4 (sample.r, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputGBR_10 : IOutputPlanar\n"
+"{\n"
+"  PS_OUTPUT_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR output;\n"
+"    float3 scaled = UnormTo10bit (sample.rgb);\n"
+"    output.Plane0 = float4 (scaled.g, 0, 0, 0);\n"
+"    output.Plane1 = float4 (scaled.b, 0, 0, 0);\n"
+"    output.Plane2 = float4 (scaled.r, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputGBR_12 : IOutputPlanar\n"
+"{\n"
+"  PS_OUTPUT_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR output;\n"
+"    float3 scaled = UnormTo12bit (sample.rgb);\n"
+"    output.Plane0 = float4 (scaled.g, 0, 0, 0);\n"
+"    output.Plane1 = float4 (scaled.b, 0, 0, 0);\n"
+"    output.Plane2 = float4 (scaled.r, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputRGBP : IOutputPlanar\n"
+"{\n"
+"  PS_OUTPUT_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR output;\n"
+"    output.Plane0 = float4 (sample.r, 0, 0, 0);\n"
+"    output.Plane1 = float4 (sample.g, 0, 0, 0);\n"
+"    output.Plane2 = float4 (sample.b, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputBGRP : IOutputPlanar\n"
+"{\n"
+"  PS_OUTPUT_PLANAR Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR output;\n"
+"    output.Plane0 = float4 (sample.b, 0, 0, 0);\n"
+"    output.Plane1 = float4 (sample.g, 0, 0, 0);\n"
+"    output.Plane2 = float4 (sample.r, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"interface IOutputPlanarFull\n"
+"{\n"
+"  PS_OUTPUT_PLANAR_FULL Build (float4 sample);\n"
+"};\n"
+"\n"
+"class OutputGBRA : IOutputPlanarFull\n"
+"{\n"
+"  PS_OUTPUT_PLANAR_FULL Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR_FULL output;\n"
+"    output.Plane0 = float4 (sample.g, 0, 0, 0);\n"
+"    output.Plane1 = float4 (sample.b, 0, 0, 0);\n"
+"    output.Plane2 = float4 (sample.r, 0, 0, 0);\n"
+"    output.Plane3 = float4 (sample.a * alphaFactor, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputGBRAPremul : IOutputPlanarFull\n"
+"{\n"
+"  PS_OUTPUT_PLANAR_FULL Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR_FULL output;\n"
+"    float4 premul;\n"
+"    sample.a *= alphaFactor;\n"
+"    premul = DoAlphaPremul (sample);\n"
+"    output.Plane0 = float4 (premul.g, 0, 0, 0);\n"
+"    output.Plane1 = float4 (premul.b, 0, 0, 0);\n"
+"    output.Plane2 = float4 (premul.r, 0, 0, 0);\n"
+"    output.Plane3 = float4 (premul.a, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputGBRA_10 : IOutputPlanarFull\n"
+"{\n"
+"  PS_OUTPUT_PLANAR_FULL Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR_FULL output;\n"
+"    float4 scaled;\n"
+"    sample.a *= alphaFactor;\n"
+"    scaled = UnormTo10bit (sample);\n"
+"    output.Plane0 = float4 (scaled.g, 0, 0, 0);\n"
+"    output.Plane1 = float4 (scaled.b, 0, 0, 0);\n"
+"    output.Plane2 = float4 (scaled.r, 0, 0, 0);\n"
+"    output.Plane3 = float4 (scaled.a, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputGBRAPremul_10 : IOutputPlanarFull\n"
+"{\n"
+"  PS_OUTPUT_PLANAR_FULL Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR_FULL output;\n"
+"    float4 scaled;\n"
+"    sample.a *= alphaFactor;\n"
+"    scaled = UnormTo10bit (DoAlphaPremul (sample));\n"
+"    output.Plane0 = float4 (scaled.g, 0, 0, 0);\n"
+"    output.Plane1 = float4 (scaled.b, 0, 0, 0);\n"
+"    output.Plane2 = float4 (scaled.r, 0, 0, 0);\n"
+"    output.Plane3 = float4 (scaled.a, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputGBRA_12 : IOutputPlanarFull\n"
+"{\n"
+"  PS_OUTPUT_PLANAR_FULL Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR_FULL output;\n"
+"    float4 scaled;\n"
+"    sample.a *= alphaFactor;\n"
+"    scaled = UnormTo12bit (sample);\n"
+"    output.Plane0 = float4 (scaled.g, 0, 0, 0);\n"
+"    output.Plane1 = float4 (scaled.b, 0, 0, 0);\n"
+"    output.Plane2 = float4 (scaled.r, 0, 0, 0);\n"
+"    output.Plane3 = float4 (scaled.a, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputGBRAPremul_12 : IOutputPlanarFull\n"
+"{\n"
+"  PS_OUTPUT_PLANAR_FULL Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PLANAR_FULL output;\n"
+"    float4 scaled;\n"
+"    sample.a *= alphaFactor;\n"
+"    scaled = UnormTo12bit (DoAlphaPremul (sample));\n"
+"    output.Plane0 = float4 (scaled.g, 0, 0, 0);\n"
+"    output.Plane1 = float4 (scaled.b, 0, 0, 0);\n"
+"    output.Plane2 = float4 (scaled.r, 0, 0, 0);\n"
+"    output.Plane3 = float4 (scaled.a, 0, 0, 0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"interface IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample);\n"
+"};\n"
+"\n"
+"class OutputRGBA : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    output.Plane0 = float4 (sample.rgb, sample.a * alphaFactor);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputRGBAPremul : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    sample.a *= alphaFactor;\n"
+"    output.Plane0 = DoAlphaPremul (sample);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputRGBx : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    output.Plane0 = float4 (sample.rgb, 1.0);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputxRGB : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    output.Plane0 = float4 (0.0, sample.rgb);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputARGB : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    output.Plane0 = sample.argb;\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputARGBPremul : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    output.Plane0 = DoAlphaPremul (sample).argb;\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputxBGR : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    output.Plane0 = float4 (0.0, sample.bgr);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputABGR : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    output.Plane0 = sample.abgr;\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputABGRPremul : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    output.Plane0 = DoAlphaPremul (sample.abgr);\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputVUYA : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    sample.a *= alphaFactor;\n"
+"    output.Plane0 = sample.zyxw;\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputVUYAPremul : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    sample.a *= alphaFactor;\n"
+"    output.Plane0 = DoAlphaPremul (sample).zyxw;\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputAYUV : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    sample.a *= alphaFactor;\n"
+"    output.Plane0 = sample.wxyz;\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputAYUVPremul : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    sample.a *= alphaFactor;\n"
+"    output.Plane0 = DoAlphaPremul (sample).wxyz;\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputRBGA : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    sample.a *= alphaFactor;\n"
+"    output.Plane0 = sample.rbga;\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"class OutputRBGAPremul : IOutputPacked\n"
+"{\n"
+"  PS_OUTPUT_PACKED Build (float4 sample)\n"
+"  {\n"
+"    PS_OUTPUT_PACKED output;\n"
+"    sample.a *= alphaFactor;\n"
+"    output.Plane0 = DoAlphaPremul (sample).rbga;\n"
+"    return output;\n"
+"  }\n"
+"};\n"
+"\n"
+"OUTPUT_TYPE ENTRY_POINT (PS_INPUT input)\n"
+"{\n"
+"  SAMPLER g_sampler;\n"
+"  CONVERTER g_converter;\n"
+"  OUTPUT_BUILDER g_builder;\n"
+"  return g_builder.Build (g_converter.Execute (g_sampler.Execute (input.Texture)));\n"
+"}\n";
+#endif

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/hlsl/VSMain_converter.hlsl Added

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/hlsl/collect_hlsl_header.py Added

@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+# GStreamer
+# Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+#
+# 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., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+import sys
+import os
+import argparse
+
+start_header = """/*
+ * This file is autogenerated by collect_hlsl_header.py
+ */
+#pragma once
+
+"""
+
+start_map = """
+#define MAKE_BYTECODE(name) { G_STRINGIFY (name), { g_##name, sizeof (g_##name)} }
+static const std::map<std::string, std::pair<const BYTE *, SIZE_T>> precompiled_bytecode = {
+"""
+
+end_map = """};
+#undef MAKE_BYTECODE
+"""
+
+def main(args):
+    parser = argparse.ArgumentParser(description='Read precompiled HLSL headers from directory and make single header')
+    parser.add_argument("--input", help="the precompiled HLSL header directory")
+    parser.add_argument("--output", help="output header file location")
+    parser.add_argument("--prefix", help="HLSL header filename prefix")
+    args = parser.parse_args(args)
+
+    # Scan precompiled PSMain_*.h headers in build directory
+    # and generate single header
+    hlsl_headers = os.path.basename(file) for file in os.listdir(args.input) if file.startswith(args.prefix) and file.endswith(".h") 
+
+    with open(args.output, 'w', newline='\n', encoding='utf8') as f:
+        f.write(start_header)
+        for file in hlsl_headers:
+            f.write("#include \"")
+            f.write(file)
+            f.write("\"\n")
+        f.write(start_map)
+        for file in hlsl_headers:
+            f.write("  MAKE_BYTECODE ({}),\n".format(os.path.splitext(file)0))
+        f.write(end_map)
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv1:))

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/hlsl/meson.build Added

@@ -0,0 +1,211 @@
+hlsl_ps_source = files('PSMain_converter.hlsl')
+
+hlsl_ps_input_formats = 
+  'NV12', false,
+  'NV21', false,
+  'I420', false,
+  'YV12', false,
+  'I420_10', false,
+  'I420_12', false,
+  'VUYA', false,
+  'VUYAPremul', false,
+  'Y410', false,
+  'AYUV', false,
+  'AYUVPremul', false,
+  'Y412', false,
+  'Y412Premul', false,
+  'RGBA', true,
+  'RGBAPremul', true,
+  'RGBx', true,
+  'GBR', true,
+  'GBR_10', true,
+  'GBR_12', true,
+  'GBRA', true,
+  'GBRAPremul', true,
+  'GBRA_10', true,
+  'GBRAPremul_10', true,
+  'GBRA_12', true,
+  'GBRAPremul_12', true,
+  'RGBP', true,
+  'BGRP', true,
+  'xRGB', true,
+  'ARGB', true,
+  'ARGBPremul', true,
+  'xBGR', true,
+  'ABGR', true,
+  'ABGRPremul', true,
+  'BGR10A2', true,
+  'BGRA64', true,
+  'BGRA64Premul', true,
+  'RBGA', true,
+  'RBGAPremul', true,
+
+
+hlsl_ps_output_formats = 
+  'PS_OUTPUT_LUMA', 'Luma', false,
+  'PS_OUTPUT_LUMA', 'Luma_10', false,
+  'PS_OUTPUT_LUMA', 'Luma_12', false,
+  'PS_OUTPUT_CHROMA', 'ChromaNV12', false,
+  'PS_OUTPUT_CHROMA', 'ChromaNV21', false,
+  'PS_OUTPUT_CHROMA_PLANAR', 'ChromaI420', false,
+  'PS_OUTPUT_CHROMA_PLANAR', 'ChromaYV12', false,
+  'PS_OUTPUT_CHROMA_PLANAR', 'ChromaI420_10', false,
+  'PS_OUTPUT_CHROMA_PLANAR', 'ChromaI420_12', false,
+  'PS_OUTPUT_PLANAR', 'Y444', false,
+  'PS_OUTPUT_PLANAR', 'Y444_10', false,
+  'PS_OUTPUT_PLANAR', 'Y444_12', false,
+  'PS_OUTPUT_PLANAR', 'GBR', true,
+  'PS_OUTPUT_PLANAR', 'GBR_10', true,
+  'PS_OUTPUT_PLANAR', 'GBR_12', true,
+  'PS_OUTPUT_PLANAR', 'RGBP', true,
+  'PS_OUTPUT_PLANAR', 'BGRP', true,
+  'PS_OUTPUT_PLANAR_FULL', 'GBRA', true,
+  'PS_OUTPUT_PLANAR_FULL', 'GBRAPremul', true,
+  'PS_OUTPUT_PLANAR_FULL', 'GBRA_10', true,
+  'PS_OUTPUT_PLANAR_FULL', 'GBRAPremul_10', true,
+  'PS_OUTPUT_PLANAR_FULL', 'GBRA_12', true,
+  'PS_OUTPUT_PLANAR_FULL', 'GBRAPremul_12', true,
+  'PS_OUTPUT_PACKED', 'RGBA', true,
+  'PS_OUTPUT_PACKED', 'RGBAPremul', true,
+  'PS_OUTPUT_PACKED', 'RBGA', true,
+  'PS_OUTPUT_PACKED', 'RBGAPremul', true,
+  'PS_OUTPUT_PACKED', 'RGBx', true,
+  'PS_OUTPUT_PACKED', 'VUYA', false,
+  'PS_OUTPUT_PACKED', 'VUYAPremul', false,
+  'PS_OUTPUT_PACKED', 'AYUV', false,
+  'PS_OUTPUT_PACKED', 'AYUVPremul', false,
+  'PS_OUTPUT_PACKED', 'xRGB', true,
+  'PS_OUTPUT_PACKED', 'ARGB', true,
+  'PS_OUTPUT_PACKED', 'ARGBPremul', true,
+  'PS_OUTPUT_PACKED', 'xBGR', true,
+  'PS_OUTPUT_PACKED', 'ABGR', true,
+  'PS_OUTPUT_PACKED', 'ABGRPremul', true,
+
+
+header_collector = find_program('collect_hlsl_header.py')
+
+foreach input_format : hlsl_ps_input_formats
+  in_format = input_format.get(0)
+  foreach output_format : hlsl_ps_output_formats
+    converter = ''
+    if input_format.get(1) != output_format.get(2)
+      converter = 'Simple'
+    else
+      converter = 'Identity'
+    endif
+    output_type = output_format.get(0)
+    output_builder = output_format.get(1)
+    entry_point = 'PSMain_@0@_@1@_@2@'.format(in_format, converter, output_builder)
+    header = '@0@.h'.format(entry_point)
+    compiled_shader = custom_target(header,
+        input : hlsl_ps_source,
+        output : header,
+        command : fxc, '/Fh', '@OUTPUT@',
+                  '/E', entry_point,
+                  '/T', 'ps_4_0',
+                  '/D', 'BUILDING_HLSL=1',
+                  '/D', 'OUTPUT_TYPE=@0@'.format(output_type),
+                  '/D', 'ENTRY_POINT=@0@'.format(entry_point),
+                  '/D', 'SAMPLER=Sampler@0@'.format(in_format),
+                  '/D', 'CONVERTER=Converter@0@'.format(converter),
+                  '/D', 'OUTPUT_BUILDER=Output@0@'.format(output_builder),
+                  '/nologo',
+                  '@INPUT@')
+    hlsl_precompiled += compiled_shader
+  endforeach
+endforeach
+
+header_collection = 'PSMainConverter.h'
+generated_collection = custom_target(header_collection,
+    input : hlsl_precompiled,
+    output : header_collection,
+    command : header_collector,
+        '--input', meson.current_build_dir(),
+        '--prefix', 'PSMain_',
+        '--output', '@OUTPUT@'
+    )
+
+hlsl_precompiled += generated_collection
+
+hlsl_vs_sources = 
+  files('VSMain_converter.hlsl'), 'VSMain_converter', 'vs_4_0',
+
+
+foreach shader : hlsl_vs_sources
+  source = shader.get(0)
+  entry_point = shader.get(1)
+  header = '@0@.h'.format(entry_point)
+  compiled_shader = custom_target(header,
+      input : source,
+      output : header,
+      command : fxc, '/Fh', '@OUTPUT@',
+                '/E', entry_point,
+                '/T', shader.get(2),
+                '/D', 'BUILDING_HLSL=1',
+                '/nologo',
+                '@INPUT@')
+  hlsl_precompiled += compiled_shader
+endforeach
+
+hlsl_cs_source = files('CSMain_converter.hlsl')
+hlsl_cs_entry_points = 
+  'CSMain_YUY2_to_AYUV',
+  'CSMain_UYVY_to_AYUV',
+  'CSMain_VYUY_to_AYUV',
+  'CSMain_YVYU_to_AYUV',
+  'CSMain_v210_to_AYUV',
+  'CSMain_v308_to_AYUV',
+  'CSMain_IYU2_to_AYUV',
+  'CSMain_AYUV_to_YUY2',
+  'CSMain_AYUV_to_UYVY',
+  'CSMain_AYUV_to_VYUY',
+  'CSMain_AYUV_to_YVYU',
+  'CSMain_AYUV_to_v210',
+  'CSMain_AYUV_to_v308',
+  'CSMain_AYUV_to_IYU2',
+  'CSMain_AYUV_to_Y410',
+  'CSMain_RGB_to_RGBA',
+  'CSMain_BGR_to_RGBA',
+  'CSMain_RGB16_to_RGBA',
+  'CSMain_BGR16_to_RGBA',
+  'CSMain_RGB15_to_RGBA',
+  'CSMain_BGR15_to_RGBA',
+  'CSMain_r210_to_RGBA',
+  'CSMain_RGBA_to_RGB',
+  'CSMain_RGBA_to_BGR',
+  'CSMain_RGBA_to_RGB16',
+  'CSMain_RGBA_to_BGR16',
+  'CSMain_RGBA_to_RGB15',
+  'CSMain_RGBA_to_BGR15',
+  'CSMain_RGBA_to_r210',
+  'CSMain_RGBA_to_BGRA',
+
+
+foreach shader : hlsl_cs_entry_points
+  entry_point = shader
+  header = '@0@.h'.format(entry_point)
+  compiled_shader = custom_target(header,
+      input : hlsl_cs_source,
+      output : header,
+      command : fxc, '/Fh', '@OUTPUT@',
+                '/E', entry_point,
+                '/T', 'cs_5_0',
+                '/D', 'BUILDING_HLSL=1',
+                '/D', 'ENTRY_POINT=@0@'.format(entry_point),
+                '/D', 'BUILDING_@0@=1'.format(entry_point),
+                '/nologo',
+                '@INPUT@')
+  hlsl_precompiled += compiled_shader
+endforeach
+
+header_collection = 'CSMainConverter.h'
+generated_collection = custom_target(header_collection,
+    input : hlsl_precompiled,
+    output : header_collection,
+    command : header_collector,
+        '--input', meson.current_build_dir(),
+        '--prefix', 'CSMain_',
+        '--output', '@OUTPUT@'
+    )
+
+hlsl_precompiled += generated_collection
\ No newline at end of file

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/d3d11/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/d3d11/meson.build Changed

@@ -2,9 +2,12 @@
   'gstd3d11bufferpool.cpp',
   'gstd3d11compile.cpp',
   'gstd3d11converter.cpp',
+  'gstd3d11converter-builder.cpp',
+  'gstd3d11converter-helper.cpp',
   'gstd3d11device.cpp',
   'gstd3d11format.cpp',
   'gstd3d11memory.cpp',
+  'gstd3d11shadercache.cpp',
   'gstd3d11utils.cpp',
 
 
@@ -22,8 +25,10 @@
 
 
 gstd3d11_dep = dependency('', required : false)
+directxmath_dep = dependency('', required : false)
+d3d11_opt = get_option('d3d11')
 
-if host_system != 'windows'
+if host_system != 'windows' or d3d11_opt.disabled()
   subdir_done()
 endif
 
@@ -41,10 +46,10 @@
 d3d11_winapi_app = false
 d3d11_conf = configuration_data()
 
-d3d11_lib = cc.find_library('d3d11', required : false)
-dxgi_lib = cc.find_library('dxgi', required : false)
+d3d11_lib = cc.find_library('d3d11', required: d3d11_opt)
+dxgi_lib = cc.find_library('dxgi', required: d3d11_opt)
 d3dcompiler_lib = cc.find_library('d3dcompiler', required: false)
-runtimeobject_lib = cc.find_library('runtimeobject', required : false)
+runtimeobject_lib = cc.find_library('runtimeobject', required: false)
 
 if not d3d11_lib.found() or not dxgi_lib.found()
   subdir_done()
@@ -57,8 +62,8 @@
 
 
 foreach h : sdk_headers
-  if not cc.has_header (h)
-    subdir_done ()
+  if not cc.has_header(h, required: d3d11_opt)
+    subdir_done()
   endif
 endforeach
 
@@ -87,6 +92,9 @@
 endif
 
 if not d3d11_winapi_desktop and not d3d11_winapi_app
+  if d3d11_opt.enabled()
+    error('Not building for win32 or winRT?')
+  endif
   subdir_done()
 endif
 
@@ -116,7 +124,7 @@
 # is mentioning that DXGIGetDebugInterface1 is desktop app only.
 #
 # PLEASE LET US KNOW A CORRECT WAY TO OBTAIN IDXGIDebug1 ON UWP, MICROSOFT
-if get_option('debug') and not (d3d11_winapi_only_app and get_option('b_vscrt') == 'md')
+if not gst_debug_disabled and get_option('debug') and not (d3d11_winapi_only_app and get_option('b_vscrt') == 'md')
   d3d11_debug_libs = 
     'd3d11sdklayers.h', 'ID3D11Debug', 'ID3D11InfoQueue', 'have_d3d11sdk_h',
     'dxgidebug.h', 'IDXGIDebug', 'IDXGIInfoQueue', 'have_dxgidebug_h',
@@ -166,6 +174,59 @@
   extra_comm_args += extra_args
 endif
 
+hlsl_precompiled = 
+fxc = find_program ('fxc', required : get_option ('d3d11-hlsl-precompile'))
+if cc.get_id() == 'msvc' and fxc.found()
+  subdir('hlsl')
+  extra_comm_args += '-DHLSL_PRECOMPILED'
+endif
+
+have_dx_math = cxx.compiles('''
+    #include <windows.h>
+    #include <DirectXMath.h>
+    using namespace DirectX;
+    int main(int argc, char ** argv) {
+      XMMATRIX matrix;
+      XMFLOAT4X4 dump;
+      matrix = XMMatrixIdentity ();
+      XMStoreFloat4x4 (&dump, matrix);
+      return 0;
+    }
+    ''',
+    name: 'DirectXMath support in Windows SDK')
+
+if not have_dx_math
+  directxmath_dep = dependency('DirectXMath', 'directxmath',
+      allow_fallback: true,
+      version: '>= 3.1.9',
+      required: d3d11_opt)
+  if not directxmath_dep.found()
+    subdir_done()
+  endif
+  extra_deps += directxmath_dep
+endif
+
+# https://learn.microsoft.com/en-us/windows/win32/dxmath/pg-xnamath-internals#windows-sse-versus-sse2
+# x86 with Windows 7 or older may not support SSE2
+if host_machine.cpu_family() != 'x86'
+  have_dx_math_simd = cxx.compiles('''
+      #include <windows.h>
+      #include <DirectXMath.h>
+      using namespace DirectX;
+      int main(int argc, char ** argv) {
+        XMVerifyCPUSupport ();
+        return 0;
+      }
+      ''',
+      name: 'DirectXMath SIMD support',
+      dependencies: directxmath_dep)
+  if have_dx_math_simd
+    extra_comm_args += '-DHAVE_DIRECTX_MATH_SIMD'
+  elif get_option('d3d11-math').enabled()
+    error('Usable DirectXMath not found')
+  endif
+endif
+
 configure_file(
   input : 'gstd3d11config.h.meson',
   output : 'gstd3d11config.h',
@@ -176,7 +237,7 @@
 
 pkg_name = 'gstreamer-d3d11-' + api_version
 gstd3d11 = library('gstd3d11-' + api_version,
-  d3d11_sources,
+  d3d11_sources + hlsl_precompiled,
   c_args : gst_plugins_bad_args + extra_c_args + extra_comm_args,
   cpp_args : gst_plugins_bad_args + extra_comm_args,
   include_directories : configinc, libsinc,
@@ -212,6 +273,7 @@
   }
   if not static_build
     d3d11_gir = gnome.generate_gir(gstd3d11, kwargs: gir)
+    library_def += {'gir_targets':  library_def.get('gir_targets', ) + d3d11_gir}
     gen_sources += d3d11_gir
   endif

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva Added

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/dxva-prelude.h Added

@@ -0,0 +1,31 @@
+/* GStreamer
+ * Copyright (C) 2023 GStreamer developers
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+
+#ifndef GST_DXVA_API
+# ifdef BUILDING_GST_DXVA
+#  define GST_DXVA_API GST_API_EXPORT         /* from config.h */
+# else
+#  define GST_DXVA_API GST_API_IMPORT
+# endif
+#endif
+

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxva.h Added

@@ -0,0 +1,30 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#ifndef GST_USE_UNSTABLE_API
+#pragma message ("The dxva library from gst-plugins-bad is unstable API and may change in future.")
+#pragma message ("You can define GST_USE_UNSTABLE_API to avoid this warning.")
+#endif
+
+#include <gst/gst.h>
+#include <gst/dxva/dxva-prelude.h>
+#include <gst/dxva/gstdxvatypes.h>
+#include <gst/dxva/gstdxvautils.h>

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvaav1decoder.cpp Added

@@ -0,0 +1,691 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdxvaav1decoder.h"
+#include <string.h>
+#include <vector>
+
+#include "gstdxvatypedef.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_dxva_av1_decoder_debug);
+#define GST_CAT_DEFAULT gst_dxva_av1_decoder_debug
+
+/* *INDENT-OFF* */
+struct _GstDxvaAV1DecoderPrivate
+{
+  GstAV1SequenceHeaderOBU seq_hdr;
+  DXVA_PicParams_AV1 pic_params;
+
+  std::vector<DXVA_Tile_AV1> tile_list;
+  std::vector<guint8> bitstream_buffer;
+  GPtrArray *ref_pics = nullptr;
+
+  guint max_width = 0;
+  guint max_height = 0;
+  guint bitdepth = 0;
+
+  gboolean configured = FALSE;
+};
+/* *INDENT-ON* */
+
+static void gst_dxva_av1_decoder_finalize (GObject * object);
+
+static gboolean gst_dxva_av1_decoder_start (GstVideoDecoder * decoder);
+
+static GstFlowReturn gst_dxva_av1_decoder_new_sequence (GstAV1Decoder * decoder,
+    const GstAV1SequenceHeaderOBU * seq_hdr, gint max_dpb_size);
+static GstFlowReturn gst_dxva_av1_decoder_new_picture (GstAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstAV1Picture * picture);
+static GstAV1Picture *gst_dxva_av1_decoder_duplicate_picture (GstAV1Decoder *
+    decoder, GstVideoCodecFrame * frame, GstAV1Picture * picture);
+static GstFlowReturn
+gst_dxva_av1_decoder_start_picture (GstAV1Decoder * decoder,
+    GstAV1Picture * picture, GstAV1Dpb * dpb);
+static GstFlowReturn gst_dxva_av1_decoder_decode_tile (GstAV1Decoder * decoder,
+    GstAV1Picture * picture, GstAV1Tile * tile);
+static GstFlowReturn gst_dxva_av1_decoder_end_picture (GstAV1Decoder * decoder,
+    GstAV1Picture * picture);
+static GstFlowReturn gst_dxva_av1_decoder_output_picture (GstAV1Decoder *
+    decoder, GstVideoCodecFrame * frame, GstAV1Picture * picture);
+
+#define gst_dxva_av1_decoder_parent_class parent_class
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstDxvaAV1Decoder,
+    gst_dxva_av1_decoder, GST_TYPE_AV1_DECODER,
+    GST_DEBUG_CATEGORY_INIT (gst_dxva_av1_decoder_debug, "dxvaav1decoder",
+        0, "dxvaav1decoder"));
+
+static void
+gst_dxva_av1_decoder_class_init (GstDxvaAV1DecoderClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstAV1DecoderClass *av1decoder_class = GST_AV1_DECODER_CLASS (klass);
+
+  gobject_class->finalize = gst_dxva_av1_decoder_finalize;
+
+  decoder_class->start = GST_DEBUG_FUNCPTR (gst_dxva_av1_decoder_start);
+
+  av1decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_dxva_av1_decoder_new_sequence);
+  av1decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_av1_decoder_new_picture);
+  av1decoder_class->duplicate_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_av1_decoder_duplicate_picture);
+  av1decoder_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_av1_decoder_start_picture);
+  av1decoder_class->decode_tile =
+      GST_DEBUG_FUNCPTR (gst_dxva_av1_decoder_decode_tile);
+  av1decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_av1_decoder_end_picture);
+  av1decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_av1_decoder_output_picture);
+}
+
+static void
+gst_dxva_av1_decoder_init (GstDxvaAV1Decoder * self)
+{
+  self->priv = new GstDxvaAV1DecoderPrivate ();
+  self->priv->ref_pics = g_ptr_array_new ();
+}
+
+static void
+gst_dxva_av1_decoder_finalize (GObject * object)
+{
+  GstDxvaAV1Decoder *self = GST_DXVA_AV1_DECODER (object);
+  GstDxvaAV1DecoderPrivate *priv = self->priv;
+
+  g_ptr_array_unref (priv->ref_pics);
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_dxva_av1_decoder_reset (GstDxvaAV1Decoder * self)
+{
+  GstDxvaAV1DecoderPrivate *priv = self->priv;
+
+  priv->max_width = 0;
+  priv->max_height = 0;
+  priv->bitdepth = 0;
+  priv->configured = FALSE;
+}
+
+static gboolean
+gst_dxva_av1_decoder_start (GstVideoDecoder * decoder)
+{
+  GstDxvaAV1Decoder *self = GST_DXVA_AV1_DECODER (decoder);
+
+  gst_dxva_av1_decoder_reset (self);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->start (decoder);
+}
+
+static GstFlowReturn
+gst_dxva_av1_decoder_new_sequence (GstAV1Decoder * decoder,
+    const GstAV1SequenceHeaderOBU * seq_hdr, gint max_dpb_size)
+{
+  GstDxvaAV1Decoder *self = GST_DXVA_AV1_DECODER (decoder);
+  GstDxvaAV1DecoderPrivate *priv = self->priv;
+  GstDxvaAV1DecoderClass *klass = GST_DXVA_AV1_DECODER_GET_CLASS (self);
+  gboolean modified = FALSE;
+  guint max_width, max_height;
+  GstVideoInfo info;
+  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
+  GstFlowReturn ret;
+
+  GST_LOG_OBJECT (self, "new sequence");
+
+  if (seq_hdr->seq_profile != GST_AV1_PROFILE_0) {
+    GST_WARNING_OBJECT (self, "Unsupported profile %d", seq_hdr->seq_profile);
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  if (seq_hdr->num_planes != 3) {
+    GST_WARNING_OBJECT (self, "Monochrome is not supported");
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  priv->seq_hdr = *seq_hdr;
+
+  if (priv->bitdepth != seq_hdr->bit_depth) {
+    GST_INFO_OBJECT (self, "Bitdepth changed %d -> %d", priv->bitdepth,
+        seq_hdr->bit_depth);
+    priv->bitdepth = seq_hdr->bit_depth;
+    modified = TRUE;
+  }
+
+  max_width = seq_hdr->max_frame_width_minus_1 + 1;
+  max_height = seq_hdr->max_frame_height_minus_1 + 1;
+
+  if (priv->max_width != max_width || priv->max_height != max_height) {
+    GST_INFO_OBJECT (self, "Resolution changed %dx%d -> %dx%d",
+        priv->max_width, priv->max_height, max_width, max_height);
+    priv->max_width = max_width;
+    priv->max_height = max_height;
+    modified = TRUE;
+  }
+
+  if (!modified && priv->configured)
+    return GST_FLOW_OK;
+
+  if (priv->bitdepth == 8) {
+    out_format = GST_VIDEO_FORMAT_NV12;
+  } else if (priv->bitdepth == 10) {
+    out_format = GST_VIDEO_FORMAT_P010_10LE;
+  } else {
+    GST_WARNING_OBJECT (self, "Invalid bit-depth %d", seq_hdr->bit_depth);
+    priv->configured = FALSE;
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  gst_video_info_set_format (&info,
+      out_format, priv->max_width, priv->max_height);
+
+  g_assert (klass->configure);
+  ret = klass->configure (self, decoder->input_state, &info, 0, 0,
+      priv->max_width, priv->max_height, max_dpb_size);
+
+  if (ret == GST_FLOW_OK) {
+    priv->configured = TRUE;
+    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+      GST_WARNING_OBJECT (self, "Couldn't negotiate with new sequence");
+      ret = GST_FLOW_NOT_NEGOTIATED;
+    }
+  } else {
+    priv->configured = FALSE;
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_dxva_av1_decoder_new_picture (GstAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+{
+  GstDxvaAV1Decoder *self = GST_DXVA_AV1_DECODER (decoder);
+  GstDxvaAV1DecoderClass *klass = GST_DXVA_AV1_DECODER_GET_CLASS (self);
+
+  g_assert (klass->new_picture);
+
+  return klass->new_picture (self, GST_CODEC_PICTURE (picture));
+}
+
+static GstAV1Picture *
+gst_dxva_av1_decoder_duplicate_picture (GstAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+{
+  GstDxvaAV1Decoder *self = GST_DXVA_AV1_DECODER (decoder);
+  GstDxvaAV1DecoderClass *klass = GST_DXVA_AV1_DECODER_GET_CLASS (self);
+  GstAV1Picture *new_picture;
+
+  g_assert (klass->duplicate_picture);
+
+  new_picture = gst_av1_picture_new ();
+  if (klass->duplicate_picture (self, GST_CODEC_PICTURE (picture),
+          GST_CODEC_PICTURE (new_picture)) != GST_FLOW_OK) {
+    gst_av1_picture_unref (new_picture);
+    return nullptr;
+  }
+
+  return new_picture;
+}
+
+static GstFlowReturn
+gst_dxva_av1_decoder_start_picture (GstAV1Decoder * decoder,
+    GstAV1Picture * picture, GstAV1Dpb * dpb)
+{
+  GstDxvaAV1Decoder *self = GST_DXVA_AV1_DECODER (decoder);
+  GstDxvaAV1DecoderPrivate *priv = self->priv;
+  GstDxvaAV1DecoderClass *klass = GST_DXVA_AV1_DECODER_GET_CLASS (self);
+  const GstAV1SequenceHeaderOBU *seq_hdr = &priv->seq_hdr;
+  const GstAV1FrameHeaderOBU *frame_hdr = &picture->frame_hdr;
+  DXVA_PicParams_AV1 *pic_params = &priv->pic_params;
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
+  guint i, j;
+  GstFlowReturn ret;
+  guint8 picture_id;
+
+  g_assert (klass->start_picture);
+  g_assert (klass->get_picture_id);
+
+  ret = klass->start_picture (self, codec_picture, &picture_id);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  priv->bitstream_buffer.resize (0);
+  priv->tile_list.resize (0);
+  g_ptr_array_set_size (priv->ref_pics, 0);
+
+  memset (pic_params, 0, sizeof (DXVA_PicParams_AV1));
+
+  pic_params->width = frame_hdr->frame_width;
+  pic_params->height = frame_hdr->frame_height;
+
+  pic_params->max_width = seq_hdr->max_frame_width_minus_1 + 1;
+  pic_params->max_height = seq_hdr->max_frame_height_minus_1 + 1;
+
+  pic_params->CurrPicTextureIndex = picture_id;
+  pic_params->superres_denom = frame_hdr->superres_denom;
+  pic_params->bitdepth = seq_hdr->bit_depth;
+  pic_params->seq_profile = seq_hdr->seq_profile;
+
+  /* TILES */
+  pic_params->tiles.cols = frame_hdr->tile_info.tile_cols;
+  pic_params->tiles.rows = frame_hdr->tile_info.tile_rows;
+  pic_params->tiles.context_update_id =
+      frame_hdr->tile_info.context_update_tile_id;
+
+  for (i = 0; i < pic_params->tiles.cols; i++) {
+    pic_params->tiles.widthsi =
+        frame_hdr->tile_info.width_in_sbs_minus_1i + 1;
+  }
+
+  for (i = 0; i < pic_params->tiles.rows; i++) {
+    pic_params->tiles.heightsi =
+        frame_hdr->tile_info.height_in_sbs_minus_1i + 1;
+  }
+
+  /* CODING TOOLS */
+  pic_params->coding.use_128x128_superblock = seq_hdr->use_128x128_superblock;
+  pic_params->coding.intra_edge_filter = seq_hdr->enable_filter_intra;
+  pic_params->coding.interintra_compound = seq_hdr->enable_interintra_compound;
+  pic_params->coding.masked_compound = seq_hdr->enable_masked_compound;
+  pic_params->coding.warped_motion = frame_hdr->allow_warped_motion;
+  pic_params->coding.dual_filter = seq_hdr->enable_dual_filter;
+  pic_params->coding.jnt_comp = seq_hdr->enable_jnt_comp;
+  pic_params->coding.screen_content_tools =
+      frame_hdr->allow_screen_content_tools;
+  pic_params->coding.integer_mv = frame_hdr->force_integer_mv;
+  pic_params->coding.cdef = seq_hdr->enable_cdef;
+  pic_params->coding.restoration = seq_hdr->enable_restoration;
+  pic_params->coding.film_grain = seq_hdr->film_grain_params_present;
+  pic_params->coding.intrabc = frame_hdr->allow_intrabc;
+  pic_params->coding.high_precision_mv = frame_hdr->allow_high_precision_mv;
+  pic_params->coding.switchable_motion_mode =
+      frame_hdr->is_motion_mode_switchable;
+  pic_params->coding.filter_intra = seq_hdr->enable_filter_intra;
+  pic_params->coding.disable_frame_end_update_cdf =
+      frame_hdr->disable_frame_end_update_cdf;
+  pic_params->coding.disable_cdf_update = frame_hdr->disable_cdf_update;
+  pic_params->coding.reference_mode = frame_hdr->reference_select;
+  pic_params->coding.skip_mode = frame_hdr->skip_mode_present;
+  pic_params->coding.reduced_tx_set = frame_hdr->reduced_tx_set;
+  pic_params->coding.superres = frame_hdr->use_superres;
+  pic_params->coding.tx_mode = frame_hdr->tx_mode;
+  pic_params->coding.use_ref_frame_mvs = frame_hdr->use_ref_frame_mvs;
+  pic_params->coding.enable_ref_frame_mvs = seq_hdr->enable_ref_frame_mvs;
+  pic_params->coding.reference_frame_update = 1;
+
+  /* FORMAT */
+  pic_params->format.frame_type = frame_hdr->frame_type;
+  pic_params->format.show_frame = frame_hdr->show_frame;
+  pic_params->format.showable_frame = frame_hdr->showable_frame;
+  pic_params->format.subsampling_x = seq_hdr->color_config.subsampling_x;
+  pic_params->format.subsampling_y = seq_hdr->color_config.subsampling_y;
+  pic_params->format.mono_chrome = seq_hdr->color_config.mono_chrome;
+
+  /* REFERENCES */
+  pic_params->primary_ref_frame = frame_hdr->primary_ref_frame;
+  pic_params->order_hint = frame_hdr->order_hint;
+  if (seq_hdr->enable_order_hint) {
+    pic_params->order_hint_bits = seq_hdr->order_hint_bits_minus_1 + 1;
+  } else {
+    pic_params->order_hint_bits = 0;
+  }
+
+  for (i = 0; i < GST_AV1_REFS_PER_FRAME; i++) {
+    if (dpb->pic_listi) {
+      GstAV1Picture *other_pic = dpb->pic_listi;
+      const GstAV1GlobalMotionParams *gmp = &frame_hdr->global_motion_params;
+
+      pic_params->frame_refsi.width = other_pic->frame_hdr.frame_width;
+      pic_params->frame_refsi.height = other_pic->frame_hdr.frame_height;
+      for (j = 0; j < 6; j++) {
+        pic_params->frame_refsi.wmmatj =
+            gmp->gm_paramsGST_AV1_REF_LAST_FRAME + ij;
+      }
+      pic_params->frame_refsi.wminvalid =
+          (gmp->gm_typeGST_AV1_REF_LAST_FRAME + i ==
+          GST_AV1_WARP_MODEL_IDENTITY);
+      pic_params->frame_refsi.wmtype =
+          gmp->gm_typeGST_AV1_REF_LAST_FRAME + i;
+      pic_params->frame_refsi.Index = frame_hdr->ref_frame_idxi;
+    } else {
+      pic_params->frame_refsi.Index = 0xff;
+    }
+  }
+
+  for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
+    pic_params->RefFrameMapTextureIndexi = 0xff;
+
+    if (dpb->pic_listi) {
+      GstAV1Picture *other_pic = dpb->pic_listi;
+      guint8 id;
+
+      id = klass->get_picture_id (self, GST_CODEC_PICTURE (other_pic));
+      if (id != 0xff) {
+        pic_params->RefFrameMapTextureIndexi = id;
+        g_ptr_array_add (priv->ref_pics, other_pic);
+      }
+    }
+  }
+
+  /* LOOP FILTER PARAMS */
+  pic_params->loop_filter.filter_level0 =
+      frame_hdr->loop_filter_params.loop_filter_level0;
+  pic_params->loop_filter.filter_level1 =
+      frame_hdr->loop_filter_params.loop_filter_level1;
+  pic_params->loop_filter.filter_level_u =
+      frame_hdr->loop_filter_params.loop_filter_level2;
+  pic_params->loop_filter.filter_level_v =
+      frame_hdr->loop_filter_params.loop_filter_level3;
+  pic_params->loop_filter.sharpness_level =
+      frame_hdr->loop_filter_params.loop_filter_sharpness;
+  pic_params->loop_filter.mode_ref_delta_enabled =
+      frame_hdr->loop_filter_params.loop_filter_delta_enabled;
+  pic_params->loop_filter.mode_ref_delta_update =
+      frame_hdr->loop_filter_params.loop_filter_delta_update;
+  pic_params->loop_filter.delta_lf_multi =
+      frame_hdr->loop_filter_params.delta_lf_multi;
+  pic_params->loop_filter.delta_lf_present =
+      frame_hdr->loop_filter_params.delta_lf_present;
+
+  for (i = 0; i < GST_AV1_TOTAL_REFS_PER_FRAME; i++) {
+    pic_params->loop_filter.ref_deltasi =
+        frame_hdr->loop_filter_params.loop_filter_ref_deltasi;
+  }
+
+  for (i = 0; i < 2; i++) {
+    pic_params->loop_filter.mode_deltasi =
+        frame_hdr->loop_filter_params.loop_filter_mode_deltasi;
+  }
+
+  pic_params->loop_filter.delta_lf_res =
+      frame_hdr->loop_filter_params.delta_lf_res;
+
+  for (i = 0; i < GST_AV1_MAX_NUM_PLANES; i++) {
+    pic_params->loop_filter.frame_restoration_typei =
+        frame_hdr->loop_restoration_params.frame_restoration_typei;
+  }
+
+  if (frame_hdr->loop_restoration_params.uses_lr) {
+    pic_params->loop_filter.log2_restoration_unit_size0 =
+        (6 + frame_hdr->loop_restoration_params.lr_unit_shift);
+    pic_params->loop_filter.log2_restoration_unit_size1 =
+        pic_params->loop_filter.log2_restoration_unit_size2 =
+        (6 + frame_hdr->loop_restoration_params.lr_unit_shift -
+        frame_hdr->loop_restoration_params.lr_uv_shift);
+  } else {
+    pic_params->loop_filter.log2_restoration_unit_size0 =
+        pic_params->loop_filter.log2_restoration_unit_size1 =
+        pic_params->loop_filter.log2_restoration_unit_size2 = 8;
+  }
+
+  /* QUANTIZATION */
+  pic_params->quantization.delta_q_present =
+      frame_hdr->quantization_params.delta_q_present;
+  pic_params->quantization.delta_q_res =
+      frame_hdr->quantization_params.delta_q_res;
+  pic_params->quantization.base_qindex =
+      frame_hdr->quantization_params.base_q_idx;
+  pic_params->quantization.y_dc_delta_q =
+      frame_hdr->quantization_params.delta_q_y_dc;
+  pic_params->quantization.u_dc_delta_q =
+      frame_hdr->quantization_params.delta_q_u_dc;
+  pic_params->quantization.v_dc_delta_q =
+      frame_hdr->quantization_params.delta_q_v_dc;
+  pic_params->quantization.u_ac_delta_q =
+      frame_hdr->quantization_params.delta_q_u_ac;
+  pic_params->quantization.v_ac_delta_q =
+      frame_hdr->quantization_params.delta_q_v_ac;
+  if (frame_hdr->quantization_params.using_qmatrix) {
+    pic_params->quantization.qm_y = frame_hdr->quantization_params.qm_y;
+    pic_params->quantization.qm_u = frame_hdr->quantization_params.qm_u;
+    pic_params->quantization.qm_v = frame_hdr->quantization_params.qm_v;
+  } else {
+    pic_params->quantization.qm_y = 0xff;
+    pic_params->quantization.qm_u = 0xff;
+    pic_params->quantization.qm_v = 0xff;
+  }
+
+  /* Cdef params */
+  pic_params->cdef.damping = frame_hdr->cdef_params.cdef_damping - 3;
+  pic_params->cdef.bits = frame_hdr->cdef_params.cdef_bits;
+
+  for (i = 0; i < GST_AV1_CDEF_MAX; i++) {
+    guint8 secondary;
+
+    pic_params->cdef.y_strengthsi.primary =
+        frame_hdr->cdef_params.cdef_y_pri_strengthi;
+    secondary = frame_hdr->cdef_params.cdef_y_sec_strengthi;
+    if (secondary == 4)
+      secondary--;
+    pic_params->cdef.y_strengthsi.secondary = secondary;
+
+    pic_params->cdef.uv_strengthsi.primary =
+        frame_hdr->cdef_params.cdef_uv_pri_strengthi;
+    secondary = frame_hdr->cdef_params.cdef_uv_sec_strengthi;
+    if (secondary == 4)
+      secondary--;
+    pic_params->cdef.uv_strengthsi.secondary = secondary;
+  }
+
+  pic_params->interp_filter = frame_hdr->interpolation_filter;
+
+  /* SEGMENTATION */
+  pic_params->segmentation.enabled =
+      frame_hdr->segmentation_params.segmentation_enabled;
+  pic_params->segmentation.update_map =
+      frame_hdr->segmentation_params.segmentation_update_map;
+  pic_params->segmentation.update_data =
+      frame_hdr->segmentation_params.segmentation_update_data;
+  pic_params->segmentation.temporal_update =
+      frame_hdr->segmentation_params.segmentation_temporal_update;
+
+  for (i = 0; i < GST_AV1_MAX_SEGMENTS; i++) {
+    for (j = 0; j < GST_AV1_SEG_LVL_MAX; j++) {
+      pic_params->segmentation.feature_maski.mask |=
+          (frame_hdr->segmentation_params.feature_enabledij << j);
+      pic_params->segmentation.feature_dataij =
+          frame_hdr->segmentation_params.feature_dataij;
+    }
+  }
+
+  /* FILM GRAIN */
+  if (frame_hdr->film_grain_params.apply_grain) {
+    pic_params->film_grain.apply_grain = 1;
+    pic_params->film_grain.scaling_shift_minus8 =
+        frame_hdr->film_grain_params.grain_scaling_minus_8;
+    pic_params->film_grain.chroma_scaling_from_luma =
+        frame_hdr->film_grain_params.chroma_scaling_from_luma;
+    pic_params->film_grain.ar_coeff_lag =
+        frame_hdr->film_grain_params.ar_coeff_lag;
+    pic_params->film_grain.ar_coeff_shift_minus6 =
+        frame_hdr->film_grain_params.ar_coeff_shift_minus_6;
+    pic_params->film_grain.grain_scale_shift =
+        frame_hdr->film_grain_params.grain_scale_shift;
+    pic_params->film_grain.overlap_flag =
+        frame_hdr->film_grain_params.overlap_flag;
+    pic_params->film_grain.clip_to_restricted_range =
+        frame_hdr->film_grain_params.clip_to_restricted_range;
+    pic_params->film_grain.matrix_coeff_is_identity =
+        (seq_hdr->color_config.matrix_coefficients == GST_AV1_MC_IDENTITY);
+    pic_params->film_grain.grain_seed = frame_hdr->film_grain_params.grain_seed;
+    for (i = 0; i < frame_hdr->film_grain_params.num_y_points && i < 14; i++) {
+      pic_params->film_grain.scaling_points_yi0 =
+          frame_hdr->film_grain_params.point_y_valuei;
+      pic_params->film_grain.scaling_points_yi1 =
+          frame_hdr->film_grain_params.point_y_scalingi;
+    }
+    pic_params->film_grain.num_y_points =
+        frame_hdr->film_grain_params.num_y_points;
+
+    for (i = 0; i < frame_hdr->film_grain_params.num_cb_points && i < 10; i++) {
+      pic_params->film_grain.scaling_points_cbi0 =
+          frame_hdr->film_grain_params.point_cb_valuei;
+      pic_params->film_grain.scaling_points_cbi1 =
+          frame_hdr->film_grain_params.point_cb_scalingi;
+    }
+    pic_params->film_grain.num_cb_points =
+        frame_hdr->film_grain_params.num_cb_points;
+
+    for (i = 0; i < frame_hdr->film_grain_params.num_cr_points && i < 10; i++) {
+      pic_params->film_grain.scaling_points_cri0 =
+          frame_hdr->film_grain_params.point_cr_valuei;
+      pic_params->film_grain.scaling_points_cri1 =
+          frame_hdr->film_grain_params.point_cr_scalingi;
+    }
+    pic_params->film_grain.num_cr_points =
+        frame_hdr->film_grain_params.num_cr_points;
+
+    for (i = 0; i < 24; i++) {
+      pic_params->film_grain.ar_coeffs_yi =
+          frame_hdr->film_grain_params.ar_coeffs_y_plus_128i;
+    }
+
+    for (i = 0; i < 25; i++) {
+      pic_params->film_grain.ar_coeffs_cbi =
+          frame_hdr->film_grain_params.ar_coeffs_cb_plus_128i;
+      pic_params->film_grain.ar_coeffs_cri =
+          frame_hdr->film_grain_params.ar_coeffs_cr_plus_128i;
+    }
+
+    pic_params->film_grain.cb_mult = frame_hdr->film_grain_params.cb_mult;
+    pic_params->film_grain.cb_luma_mult =
+        frame_hdr->film_grain_params.cb_luma_mult;
+    pic_params->film_grain.cr_mult = frame_hdr->film_grain_params.cr_mult;
+    pic_params->film_grain.cr_luma_mult =
+        frame_hdr->film_grain_params.cr_luma_mult;
+    pic_params->film_grain.cb_offset = frame_hdr->film_grain_params.cb_offset;
+    pic_params->film_grain.cr_offset = frame_hdr->film_grain_params.cr_offset;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_dxva_av1_decoder_decode_tile (GstAV1Decoder * decoder,
+    GstAV1Picture * picture, GstAV1Tile * tile)
+{
+  GstDxvaAV1Decoder *self = GST_DXVA_AV1_DECODER (decoder);
+  GstDxvaAV1DecoderPrivate *priv = self->priv;
+  GstAV1TileGroupOBU *tile_group = &tile->tile_group;
+
+  if (tile_group->num_tiles > priv->tile_list.size ())
+    priv->tile_list.resize (tile_group->num_tiles);
+
+  g_assert (tile_group->tg_end < priv->tile_list.size ());
+
+  GST_LOG_OBJECT (self, "Decode tile, tile count %d (start: %d - end: %d)",
+      tile_group->num_tiles, tile_group->tg_start, tile_group->tg_end);
+
+  for (guint i = tile_group->tg_start; i <= tile_group->tg_end; i++) {
+    DXVA_Tile_AV1 *dxva_tile = &priv->tile_listi;
+
+    GST_TRACE_OBJECT (self,
+        "Tile offset %d, size %d, row %d, col %d",
+        tile_group->entryi.tile_offset, tile_group->entryi.tile_size,
+        tile_group->entryi.tile_row, tile_group->entryi.tile_col);
+
+    dxva_tile->DataOffset = priv->bitstream_buffer.size () +
+        tile_group->entryi.tile_offset;
+    dxva_tile->DataSize = tile_group->entryi.tile_size;
+    dxva_tile->row = tile_group->entryi.tile_row;
+    dxva_tile->column = tile_group->entryi.tile_col;
+    /* TODO: used for tile list OBU */
+    dxva_tile->anchor_frame = 0xff;
+  }
+
+  GST_TRACE_OBJECT (self, "OBU size %d", tile->obu.obu_size);
+
+  size_t pos = priv->bitstream_buffer.size ();
+  priv->bitstream_buffer.resize (pos + tile->obu.obu_size);
+
+  memcpy (&priv->bitstream_buffer0 + pos, tile->obu.data, tile->obu.obu_size);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_dxva_av1_decoder_end_picture (GstAV1Decoder * decoder,
+    GstAV1Picture * picture)
+{
+  GstDxvaAV1Decoder *self = GST_DXVA_AV1_DECODER (decoder);
+  GstDxvaAV1DecoderPrivate *priv = self->priv;
+  GstDxvaAV1DecoderClass *klass = GST_DXVA_AV1_DECODER_GET_CLASS (self);
+  size_t bitstream_buffer_size;
+  size_t bitstream_pos;
+  GstDxvaDecodingArgs args;
+
+  if (priv->bitstream_buffer.empty () || priv->tile_list.empty ()) {
+    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
+    return GST_FLOW_ERROR;
+  }
+
+  memset (&args, 0, sizeof (GstDxvaDecodingArgs));
+
+  bitstream_pos = priv->bitstream_buffer.size ();
+  bitstream_buffer_size = GST_ROUND_UP_128 (bitstream_pos);
+
+  if (bitstream_buffer_size > bitstream_pos) {
+    size_t padding = bitstream_buffer_size - bitstream_pos;
+
+    /* As per DXVA spec, total amount of bitstream buffer size should be
+     * 128 bytes aligned. If actual data is not multiple of 128 bytes,
+     * the last slice data needs to be zero-padded */
+    priv->bitstream_buffer.resize (bitstream_buffer_size, 0);
+
+    DXVA_Tile_AV1 & tile = priv->tile_list.back ();
+    tile.DataSize += padding;
+  }
+
+  args.picture_params = &priv->pic_params;
+  args.picture_params_size = sizeof (DXVA_PicParams_AV1);
+  args.slice_control = &priv->tile_list0;
+  args.slice_control_size = sizeof (DXVA_Tile_AV1) * priv->tile_list.size ();
+  args.bitstream = &priv->bitstream_buffer0;
+  args.bitstream_size = priv->bitstream_buffer.size ();
+
+  g_assert (klass->end_picture);
+
+  return klass->end_picture (self, GST_CODEC_PICTURE (picture),
+      priv->ref_pics, &args);
+}
+
+static GstFlowReturn
+gst_dxva_av1_decoder_output_picture (GstAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+{
+  GstDxvaAV1Decoder *self = GST_DXVA_AV1_DECODER (decoder);
+  GstDxvaAV1DecoderClass *klass = GST_DXVA_AV1_DECODER_GET_CLASS (self);
+
+  g_assert (klass->output_picture);
+
+  GST_LOG_OBJECT (self, "Outputting picture %p, %dx%d", picture,
+      picture->frame_hdr.render_width, picture->frame_hdr.render_height);
+
+  return klass->output_picture (self, frame, GST_CODEC_PICTURE (picture),
+      (GstVideoBufferFlags) 0, picture->frame_hdr.render_width,
+      picture->frame_hdr.render_height);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvaav1decoder.h Added

@@ -0,0 +1,103 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/dxva/dxva-prelude.h>
+#include <gst/dxva/gstdxvatypes.h>
+#include <gst/codecs/gstav1decoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DXVA_AV1_DECODER            (gst_dxva_av1_decoder_get_type())
+#define GST_DXVA_AV1_DECODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DXVA_AV1_DECODER,GstDxvaAV1Decoder))
+#define GST_DXVA_AV1_DECODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DXVA_AV1_DECODER,GstDxvaAV1DecoderClass))
+#define GST_DXVA_AV1_DECODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_DXVA_AV1_DECODER,GstDxvaAV1DecoderClass))
+#define GST_IS_DXVA_AV1_DECODER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DXVA_AV1_DECODER))
+#define GST_IS_DXVA_AV1_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DXVA_AV1_DECODER))
+
+typedef struct _GstDxvaAV1Decoder GstDxvaAV1Decoder;
+typedef struct _GstDxvaAV1DecoderClass GstDxvaAV1DecoderClass;
+typedef struct _GstDxvaAV1DecoderPrivate GstDxvaAV1DecoderPrivate;
+
+/**
+ * GstDxvaAV1Decoder:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaAV1Decoder
+{
+  GstAV1Decoder parent;
+
+  /*< private >*/
+  GstDxvaAV1DecoderPrivate *priv;
+};
+
+/**
+ * GstDxvaAV1DecoderClass:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaAV1DecoderClass
+{
+  GstAV1DecoderClass parent_class;
+
+  GstFlowReturn   (*configure)          (GstDxvaAV1Decoder * decoder,
+                                         GstVideoCodecState * input_state,
+                                         const GstVideoInfo * info,
+                                         gint crop_x,
+                                         gint crop_y,
+                                         gint coded_width,
+                                         gint coded_height,
+                                         gint max_dpb_size);
+
+  GstFlowReturn   (*new_picture)        (GstDxvaAV1Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  GstFlowReturn   (*duplicate_picture)  (GstDxvaAV1Decoder * decoder,
+                                         GstCodecPicture * src,
+                                         GstCodecPicture * dst);
+
+  guint8          (*get_picture_id)     (GstDxvaAV1Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  GstFlowReturn   (*start_picture)      (GstDxvaAV1Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         guint8 * picture_id);
+
+  GstFlowReturn   (*end_picture)        (GstDxvaAV1Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         GPtrArray * ref_pics,
+                                         const GstDxvaDecodingArgs * args);
+
+  GstFlowReturn   (*output_picture)     (GstDxvaAV1Decoder * decoder,
+                                         GstVideoCodecFrame * frame,
+                                         GstCodecPicture * picture,
+                                         GstVideoBufferFlags buffer_flags,
+                                         gint display_width,
+                                         gint display_height);
+};
+
+GST_DXVA_API
+GType gst_dxva_av1_decoder_get_type (void);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstDxvaAV1Decoder, gst_object_unref)
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvah264decoder.cpp Added

@@ -0,0 +1,636 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdxvah264decoder.h"
+#include <string.h>
+#include <vector>
+
+#include "gstdxvatypedef.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_dxva_h264_decoder_debug);
+#define GST_CAT_DEFAULT gst_dxva_h264_decoder_debug
+
+/* *INDENT-OFF* */
+struct _GstDxvaH264DecoderPrivate
+{
+  DXVA_PicParams_H264 pic_params;
+  DXVA_Qmatrix_H264 iq_matrix;
+
+  std::vector<DXVA_Slice_H264_Short> slice_list;
+  std::vector<guint8> bitstream_buffer;
+  GPtrArray *ref_pics = nullptr;
+
+  gint crop_x = 0;
+  gint crop_y = 0;
+  gint width = 0;
+  gint height = 0;
+  gint coded_width = 0;
+  gint coded_height = 0;
+  gint bitdepth = 0;
+  guint8 chroma_format_idc = 0;
+  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
+  gboolean interlaced = FALSE;
+  gint max_dpb_size = 0;
+
+  gboolean configured = FALSE;
+};
+/* *INDENT-ON* */
+
+static void gst_dxva_h264_decoder_finalize (GObject * object);
+
+static gboolean gst_dxva_h264_decoder_start (GstVideoDecoder * decoder);
+
+static GstFlowReturn
+gst_dxva_h264_decoder_new_sequence (GstH264Decoder * decoder,
+    const GstH264SPS * sps, gint max_dpb_size);
+static GstFlowReturn
+gst_dxva_h264_decoder_new_picture (GstH264Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH264Picture * picture);
+static GstFlowReturn
+gst_dxva_h264_decoder_new_field_picture (GstH264Decoder * decoder,
+    GstH264Picture * first_field, GstH264Picture * second_field);
+static GstFlowReturn
+gst_dxva_h264_decoder_start_picture (GstH264Decoder * decoder,
+    GstH264Picture * picture, GstH264Slice * slice, GstH264Dpb * dpb);
+static GstFlowReturn
+gst_dxva_h264_decoder_decode_slice (GstH264Decoder * decoder,
+    GstH264Picture * picture, GstH264Slice * slice, GArray * ref_pic_list0,
+    GArray * ref_pic_list1);
+static GstFlowReturn
+gst_dxva_h264_decoder_end_picture (GstH264Decoder * decoder,
+    GstH264Picture * picture);
+static GstFlowReturn
+gst_dxva_h264_decoder_output_picture (GstH264Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH264Picture * picture);
+
+#define gst_dxva_h264_decoder_parent_class parent_class
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstDxvaH264Decoder,
+    gst_dxva_h264_decoder, GST_TYPE_H264_DECODER,
+    GST_DEBUG_CATEGORY_INIT (gst_dxva_h264_decoder_debug, "dxvah264decoder",
+        0, "dxvah264decoder"));
+
+static void
+gst_dxva_h264_decoder_class_init (GstDxvaH264DecoderClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstH264DecoderClass *h264decoder_class = GST_H264_DECODER_CLASS (klass);
+
+  object_class->finalize = gst_dxva_h264_decoder_finalize;
+
+  decoder_class->start = GST_DEBUG_FUNCPTR (gst_dxva_h264_decoder_start);
+
+  h264decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_dxva_h264_decoder_new_sequence);
+  h264decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_h264_decoder_new_picture);
+  h264decoder_class->new_field_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_h264_decoder_new_field_picture);
+  h264decoder_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_h264_decoder_start_picture);
+  h264decoder_class->decode_slice =
+      GST_DEBUG_FUNCPTR (gst_dxva_h264_decoder_decode_slice);
+  h264decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_h264_decoder_end_picture);
+  h264decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_h264_decoder_output_picture);
+}
+
+static void
+gst_dxva_h264_decoder_init (GstDxvaH264Decoder * self)
+{
+  self->priv = new GstDxvaH264DecoderPrivate ();
+  self->priv->ref_pics = g_ptr_array_new ();
+}
+
+static void
+gst_dxva_h264_decoder_finalize (GObject * object)
+{
+  GstDxvaH264Decoder *self = GST_DXVA_H264_DECODER (object);
+  GstDxvaH264DecoderPrivate *priv = self->priv;
+
+  g_ptr_array_unref (priv->ref_pics);
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_dxva_h264_decoder_reset (GstDxvaH264Decoder * self)
+{
+  GstDxvaH264DecoderPrivate *priv = self->priv;
+
+  priv->crop_x = 0;
+  priv->crop_y = 0;
+  priv->width = 0;
+  priv->height = 0;
+  priv->coded_width = 0;
+  priv->coded_height = 0;
+  priv->bitdepth = 0;
+  priv->chroma_format_idc = 0;
+  priv->out_format = GST_VIDEO_FORMAT_UNKNOWN;
+  priv->interlaced = FALSE;
+  priv->max_dpb_size = 0;
+  priv->configured = FALSE;
+}
+
+static gboolean
+gst_dxva_h264_decoder_start (GstVideoDecoder * decoder)
+{
+  GstDxvaH264Decoder *self = GST_DXVA_H264_DECODER (decoder);
+
+  gst_dxva_h264_decoder_reset (self);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->start (decoder);
+}
+
+static GstFlowReturn
+gst_dxva_h264_decoder_new_sequence (GstH264Decoder * decoder,
+    const GstH264SPS * sps, gint max_dpb_size)
+{
+  GstDxvaH264Decoder *self = GST_DXVA_H264_DECODER (decoder);
+  GstDxvaH264DecoderPrivate *priv = self->priv;
+  GstDxvaH264DecoderClass *klass = GST_DXVA_H264_DECODER_GET_CLASS (self);
+  gint crop_width, crop_height;
+  gboolean interlaced;
+  gboolean modified = FALSE;
+  GstVideoInfo info;
+  GstFlowReturn ret;
+
+  GST_LOG_OBJECT (self, "new sequence");
+
+  if (sps->frame_cropping_flag) {
+    crop_width = sps->crop_rect_width;
+    crop_height = sps->crop_rect_height;
+  } else {
+    crop_width = sps->width;
+    crop_height = sps->height;
+  }
+
+  if (priv->width != crop_width || priv->height != crop_height ||
+      priv->coded_width != sps->width || priv->coded_height != sps->height ||
+      priv->crop_x != sps->crop_rect_x || priv->crop_y != sps->crop_rect_y) {
+    GST_INFO_OBJECT (self,
+        "resolution change, %dx%d (%dx%d) -> %dx%d (%dx%d)",
+        priv->width, priv->height, priv->coded_width, priv->coded_height,
+        crop_width, crop_height, sps->width, sps->height);
+    priv->crop_x = sps->crop_rect_x;
+    priv->crop_y = sps->crop_rect_y;
+    priv->width = crop_width;
+    priv->height = crop_height;
+    priv->coded_width = sps->width;
+    priv->coded_height = sps->height;
+    modified = TRUE;
+  }
+
+  if (priv->bitdepth != sps->bit_depth_luma_minus8 + 8) {
+    gint bitdepth = sps->bit_depth_luma_minus8 + 8;
+    GST_INFO_OBJECT (self,
+        "bitdepth change, %d -> %d", priv->bitdepth, bitdepth);
+    priv->bitdepth = bitdepth;
+    modified = TRUE;
+  }
+
+  if (priv->chroma_format_idc != sps->chroma_format_idc) {
+    GST_INFO_OBJECT (self, "chroma format change, %d -> %d",
+        priv->chroma_format_idc, sps->chroma_format_idc);
+    priv->chroma_format_idc = sps->chroma_format_idc;
+    modified = TRUE;
+  }
+
+  interlaced = !sps->frame_mbs_only_flag;
+  if (priv->interlaced != interlaced) {
+    GST_INFO_OBJECT (self, "interlaced sequence change, %d -> %d",
+        priv->interlaced, interlaced);
+    priv->interlaced = interlaced;
+    modified = TRUE;
+  }
+
+  if (priv->max_dpb_size < max_dpb_size) {
+    GST_INFO_OBJECT (self, "Requires larger DPB size (%d -> %d)",
+        priv->max_dpb_size, max_dpb_size);
+    modified = TRUE;
+  }
+
+  if (!modified && priv->configured)
+    return GST_FLOW_OK;
+
+  priv->out_format = GST_VIDEO_FORMAT_UNKNOWN;
+
+  if (priv->bitdepth == 8) {
+    if (priv->chroma_format_idc == 1) {
+      priv->out_format = GST_VIDEO_FORMAT_NV12;
+    } else {
+      GST_FIXME_OBJECT (self, "Could not support 8bits non-4:2:0 format");
+    }
+  }
+
+  if (priv->out_format == GST_VIDEO_FORMAT_UNKNOWN) {
+    GST_ERROR_OBJECT (self, "Could not support bitdepth/chroma format");
+    priv->configured = FALSE;
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  gst_video_info_set_interlaced_format (&info, priv->out_format,
+      priv->interlaced ? GST_VIDEO_INTERLACE_MODE_MIXED :
+      GST_VIDEO_INTERLACE_MODE_PROGRESSIVE, priv->width, priv->height);
+
+  priv->max_dpb_size = max_dpb_size;
+
+  g_assert (klass->configure);
+  ret = klass->configure (self, decoder->input_state, &info, priv->crop_x,
+      priv->crop_y, priv->coded_width, priv->coded_height, max_dpb_size);
+
+  if (ret == GST_FLOW_OK) {
+    priv->configured = TRUE;
+    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+      GST_WARNING_OBJECT (self, "Couldn't negotiate with new sequence");
+      ret = GST_FLOW_NOT_NEGOTIATED;
+    }
+  } else {
+    priv->configured = FALSE;
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_dxva_h264_decoder_new_picture (GstH264Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH264Picture * picture)
+{
+  GstDxvaH264Decoder *self = GST_DXVA_H264_DECODER (decoder);
+  GstDxvaH264DecoderClass *klass = GST_DXVA_H264_DECODER_GET_CLASS (self);
+
+  g_assert (klass->new_picture);
+
+  return klass->new_picture (self, GST_CODEC_PICTURE (picture));
+}
+
+static GstFlowReturn
+gst_dxva_h264_decoder_new_field_picture (GstH264Decoder * decoder,
+    GstH264Picture * first_field, GstH264Picture * second_field)
+{
+  GstDxvaH264Decoder *self = GST_DXVA_H264_DECODER (decoder);
+  GstDxvaH264DecoderClass *klass = GST_DXVA_H264_DECODER_GET_CLASS (self);
+
+  g_assert (klass->duplicate_picture);
+
+  return klass->duplicate_picture (self, GST_CODEC_PICTURE (first_field),
+      GST_CODEC_PICTURE (second_field));
+}
+
+static void
+gst_dxva_h264_decoder_picture_params_from_sps (GstDxvaH264Decoder * self,
+    const GstH264SPS * sps, gboolean field_pic, DXVA_PicParams_H264 * params)
+{
+#define COPY_FIELD(f) \
+  (params)->f = (sps)->f
+
+  params->wFrameWidthInMbsMinus1 = sps->pic_width_in_mbs_minus1;
+  if (!sps->frame_mbs_only_flag) {
+    params->wFrameHeightInMbsMinus1 =
+        ((sps->pic_height_in_map_units_minus1 + 1) << 1) - 1;
+  } else {
+    params->wFrameHeightInMbsMinus1 = sps->pic_height_in_map_units_minus1;
+  }
+  params->residual_colour_transform_flag = sps->separate_colour_plane_flag;
+  params->MbaffFrameFlag = (sps->mb_adaptive_frame_field_flag && !field_pic);
+  params->field_pic_flag = field_pic;
+  params->MinLumaBipredSize8x8Flag = sps->level_idc >= 31;
+
+  COPY_FIELD (num_ref_frames);
+  COPY_FIELD (chroma_format_idc);
+  COPY_FIELD (frame_mbs_only_flag);
+  COPY_FIELD (bit_depth_luma_minus8);
+  COPY_FIELD (bit_depth_chroma_minus8);
+  COPY_FIELD (log2_max_frame_num_minus4);
+  COPY_FIELD (pic_order_cnt_type);
+  COPY_FIELD (log2_max_pic_order_cnt_lsb_minus4);
+  COPY_FIELD (delta_pic_order_always_zero_flag);
+  COPY_FIELD (direct_8x8_inference_flag);
+
+#undef COPY_FIELD
+}
+
+static void
+gst_dxva_h264_decoder_picture_params_from_pps (GstDxvaH264Decoder * self,
+    const GstH264PPS * pps, DXVA_PicParams_H264 * params)
+{
+#define COPY_FIELD(f) \
+  (params)->f = (pps)->f
+
+  COPY_FIELD (constrained_intra_pred_flag);
+  COPY_FIELD (weighted_pred_flag);
+  COPY_FIELD (weighted_bipred_idc);
+  COPY_FIELD (transform_8x8_mode_flag);
+  COPY_FIELD (pic_init_qs_minus26);
+  COPY_FIELD (chroma_qp_index_offset);
+  COPY_FIELD (second_chroma_qp_index_offset);
+  COPY_FIELD (pic_init_qp_minus26);
+  COPY_FIELD (num_ref_idx_l0_active_minus1);
+  COPY_FIELD (num_ref_idx_l1_active_minus1);
+  COPY_FIELD (entropy_coding_mode_flag);
+  COPY_FIELD (pic_order_present_flag);
+  COPY_FIELD (deblocking_filter_control_present_flag);
+  COPY_FIELD (redundant_pic_cnt_present_flag);
+  COPY_FIELD (num_slice_groups_minus1);
+  COPY_FIELD (slice_group_map_type);
+
+#undef COPY_FIELD
+}
+
+static void
+gst_dxva_h264_decoder_picture_params_from_slice_header (GstDxvaH264Decoder *
+    self, const GstH264SliceHdr * slice_header, DXVA_PicParams_H264 * params)
+{
+  params->sp_for_switch_flag = slice_header->sp_for_switch_flag;
+  params->field_pic_flag = slice_header->field_pic_flag;
+  params->CurrPic.AssociatedFlag = slice_header->bottom_field_flag;
+  params->IntraPicFlag =
+      GST_H264_IS_I_SLICE (slice_header) || GST_H264_IS_SI_SLICE (slice_header);
+}
+
+static gboolean
+gst_dxva_h264_decoder_fill_picture_params (GstDxvaH264Decoder * self,
+    const GstH264SliceHdr * slice_header, DXVA_PicParams_H264 * params)
+{
+  const GstH264SPS *sps;
+  const GstH264PPS *pps;
+
+  g_return_val_if_fail (slice_header->pps != nullptr, FALSE);
+  g_return_val_if_fail (slice_header->pps->sequence != nullptr, FALSE);
+
+  pps = slice_header->pps;
+  sps = pps->sequence;
+
+  params->MbsConsecutiveFlag = 1;
+  params->Reserved16Bits = 3;
+  params->ContinuationFlag = 1;
+  params->Reserved8BitsA = 0;
+  params->Reserved8BitsB = 0;
+  params->StatusReportFeedbackNumber = 1;
+
+  gst_dxva_h264_decoder_picture_params_from_sps (self,
+      sps, slice_header->field_pic_flag, params);
+  gst_dxva_h264_decoder_picture_params_from_pps (self, pps, params);
+  gst_dxva_h264_decoder_picture_params_from_slice_header (self,
+      slice_header, params);
+
+  return TRUE;
+}
+
+static inline void
+init_pic_params (DXVA_PicParams_H264 * params)
+{
+  memset (params, 0, sizeof (DXVA_PicParams_H264));
+  for (guint i = 0; i < G_N_ELEMENTS (params->RefFrameList); i++)
+    params->RefFrameListi.bPicEntry = 0xff;
+}
+
+static GstFlowReturn
+gst_dxva_h264_decoder_start_picture (GstH264Decoder * decoder,
+    GstH264Picture * picture, GstH264Slice * slice, GstH264Dpb * dpb)
+{
+  GstDxvaH264Decoder *self = GST_DXVA_H264_DECODER (decoder);
+  GstDxvaH264DecoderClass *klass = GST_DXVA_H264_DECODER_GET_CLASS (self);
+  GstDxvaH264DecoderPrivate *priv = self->priv;
+  DXVA_PicParams_H264 *pic_params = &priv->pic_params;
+  DXVA_Qmatrix_H264 *iq_matrix = &priv->iq_matrix;
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
+  GArray *dpb_array;
+  GstH264PPS *pps;
+  guint i, j;
+  GstFlowReturn ret;
+  guint8 picture_id;
+
+  g_assert (klass->start_picture);
+  g_assert (klass->get_picture_id);
+
+  ret = klass->start_picture (self, codec_picture, &picture_id);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  pps = slice->header.pps;
+
+  priv->slice_list.resize (0);
+  priv->bitstream_buffer.resize (0);
+  g_ptr_array_set_size (priv->ref_pics, 0);
+
+  init_pic_params (pic_params);
+  gst_dxva_h264_decoder_fill_picture_params (self, &slice->header, pic_params);
+
+  pic_params->CurrPic.Index7Bits = picture_id;
+  pic_params->RefPicFlag = GST_H264_PICTURE_IS_REF (picture);
+  pic_params->frame_num = picture->frame_num;
+
+  if (picture->field == GST_H264_PICTURE_FIELD_TOP_FIELD) {
+    pic_params->CurrFieldOrderCnt0 = picture->top_field_order_cnt;
+    pic_params->CurrFieldOrderCnt1 = 0;
+  } else if (picture->field == GST_H264_PICTURE_FIELD_BOTTOM_FIELD) {
+    pic_params->CurrFieldOrderCnt0 = 0;
+    pic_params->CurrFieldOrderCnt1 = picture->bottom_field_order_cnt;
+  } else {
+    pic_params->CurrFieldOrderCnt0 = picture->top_field_order_cnt;
+    pic_params->CurrFieldOrderCnt1 = picture->bottom_field_order_cnt;
+  }
+
+  dpb_array = gst_h264_dpb_get_pictures_all (dpb);
+  for (i = 0, j = 0; i < dpb_array->len && j < 16; i++) {
+    GstH264Picture *other = g_array_index (dpb_array, GstH264Picture *, i);
+
+    if (!GST_H264_PICTURE_IS_REF (other))
+      continue;
+
+    /* Ignore nonexisting picture */
+    if (other->nonexisting)
+      continue;
+
+    /* The second field picture will be handled differently */
+    if (other->second_field)
+      continue;
+
+    pic_params->RefFrameListj.Index7Bits =
+        klass->get_picture_id (self, GST_CODEC_PICTURE (other));
+
+    if (GST_H264_PICTURE_IS_LONG_TERM_REF (other)) {
+      pic_params->RefFrameListj.AssociatedFlag = 1;
+      pic_params->FrameNumListj = other->long_term_frame_idx;
+    } else {
+      pic_params->RefFrameListj.AssociatedFlag = 0;
+      pic_params->FrameNumListj = other->frame_num;
+    }
+
+    switch (other->field) {
+      case GST_H264_PICTURE_FIELD_TOP_FIELD:
+        pic_params->FieldOrderCntListj0 = other->top_field_order_cnt;
+        pic_params->UsedForReferenceFlags |= 0x1 << (2 * j);
+        break;
+      case GST_H264_PICTURE_FIELD_BOTTOM_FIELD:
+        pic_params->FieldOrderCntListj1 = other->bottom_field_order_cnt;
+        pic_params->UsedForReferenceFlags |= 0x1 << (2 * j + 1);
+        break;
+      default:
+        pic_params->FieldOrderCntListj0 = other->top_field_order_cnt;
+        pic_params->FieldOrderCntListj1 = other->bottom_field_order_cnt;
+        pic_params->UsedForReferenceFlags |= 0x3 << (2 * j);
+        break;
+    }
+
+    if (other->other_field) {
+      GstH264Picture *other_field = other->other_field;
+
+      switch (other_field->field) {
+        case GST_H264_PICTURE_FIELD_TOP_FIELD:
+          pic_params->FieldOrderCntListj0 =
+              other_field->top_field_order_cnt;
+          pic_params->UsedForReferenceFlags |= 0x1 << (2 * j);
+          break;
+        case GST_H264_PICTURE_FIELD_BOTTOM_FIELD:
+          pic_params->FieldOrderCntListj1 =
+              other_field->bottom_field_order_cnt;
+          pic_params->UsedForReferenceFlags |= 0x1 << (2 * j + 1);
+          break;
+        default:
+          break;
+      }
+    }
+
+    g_ptr_array_add (priv->ref_pics, other);
+    j++;
+  }
+  g_array_unref (dpb_array);
+
+  G_STATIC_ASSERT (sizeof (iq_matrix->bScalingLists4x4) ==
+      sizeof (pps->scaling_lists_4x4));
+  memcpy (iq_matrix->bScalingLists4x4, pps->scaling_lists_4x4,
+      sizeof (pps->scaling_lists_4x4));
+
+  G_STATIC_ASSERT (sizeof (iq_matrix->bScalingLists8x80) ==
+      sizeof (pps->scaling_lists_8x80));
+  memcpy (iq_matrix->bScalingLists8x80, pps->scaling_lists_8x80,
+      sizeof (pps->scaling_lists_8x80));
+  memcpy (iq_matrix->bScalingLists8x81, pps->scaling_lists_8x81,
+      sizeof (pps->scaling_lists_8x81));
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_dxva_h264_decoder_decode_slice (GstH264Decoder * decoder,
+    GstH264Picture * picture, GstH264Slice * slice, GArray * ref_pic_list0,
+    GArray * ref_pic_list1)
+{
+  GstDxvaH264Decoder *self = GST_DXVA_H264_DECODER (decoder);
+  GstDxvaH264DecoderPrivate *priv = self->priv;
+  DXVA_Slice_H264_Short dxva_slice;
+  static const guint8 start_code = { 0, 0, 1 };
+  const size_t start_code_size = sizeof (start_code);
+
+  dxva_slice.BSNALunitDataLocation = priv->bitstream_buffer.size ();
+  /* Includes 3 bytes start code prefix */
+  dxva_slice.SliceBytesInBuffer = slice->nalu.size + start_code_size;
+  dxva_slice.wBadSliceChopping = 0;
+
+  priv->slice_list.push_back (dxva_slice);
+
+  size_t pos = priv->bitstream_buffer.size ();
+  priv->bitstream_buffer.resize (pos + start_code_size + slice->nalu.size);
+
+  /* Fill start code prefix */
+  memcpy (&priv->bitstream_buffer0 + pos, start_code, start_code_size);
+
+  /* Copy bitstream */
+  memcpy (&priv->bitstream_buffer0 + pos + start_code_size,
+      slice->nalu.data + slice->nalu.offset, slice->nalu.size);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_dxva_h264_decoder_end_picture (GstH264Decoder * decoder,
+    GstH264Picture * picture)
+{
+  GstDxvaH264Decoder *self = GST_DXVA_H264_DECODER (decoder);
+  GstDxvaH264DecoderPrivate *priv = self->priv;
+  GstDxvaH264DecoderClass *klass = GST_DXVA_H264_DECODER_GET_CLASS (self);
+  size_t bitstream_buffer_size;
+  size_t bitstream_pos;
+  GstDxvaDecodingArgs args;
+
+  GST_LOG_OBJECT (self, "end picture %p, (poc %d)",
+      picture, picture->pic_order_cnt);
+
+  if (priv->bitstream_buffer.empty () || priv->slice_list.empty ()) {
+    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
+    return GST_FLOW_ERROR;
+  }
+
+  memset (&args, 0, sizeof (GstDxvaDecodingArgs));
+
+  bitstream_pos = priv->bitstream_buffer.size ();
+  bitstream_buffer_size = GST_ROUND_UP_128 (bitstream_pos);
+
+  if (bitstream_buffer_size > bitstream_pos) {
+    size_t padding = bitstream_buffer_size - bitstream_pos;
+
+    /* As per DXVA spec, total amount of bitstream buffer size should be
+     * 128 bytes aligned. If actual data is not multiple of 128 bytes,
+     * the last slice data needs to be zero-padded */
+    priv->bitstream_buffer.resize (bitstream_buffer_size, 0);
+
+    DXVA_Slice_H264_Short & slice = priv->slice_list.back ();
+    slice.SliceBytesInBuffer += padding;
+  }
+
+  args.picture_params = &priv->pic_params;
+  args.picture_params_size = sizeof (DXVA_PicParams_H264);
+  args.slice_control = &priv->slice_list0;
+  args.slice_control_size =
+      sizeof (DXVA_Slice_H264_Short) * priv->slice_list.size ();
+  args.bitstream = &priv->bitstream_buffer0;
+  args.bitstream_size = priv->bitstream_buffer.size ();
+  args.inverse_quantization_matrix = &priv->iq_matrix;
+  args.inverse_quantization_matrix_size = sizeof (DXVA_Qmatrix_H264);
+
+  g_assert (klass->end_picture);
+
+  return klass->end_picture (self, GST_CODEC_PICTURE (picture),
+      priv->ref_pics, &args);
+}
+
+static GstFlowReturn
+gst_dxva_h264_decoder_output_picture (GstH264Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH264Picture * picture)
+{
+  GstDxvaH264Decoder *self = GST_DXVA_H264_DECODER (decoder);
+  GstDxvaH264DecoderClass *klass = GST_DXVA_H264_DECODER_GET_CLASS (self);
+  GstDxvaH264DecoderPrivate *priv = self->priv;
+
+  g_assert (klass->output_picture);
+
+  GST_LOG_OBJECT (self,
+      "Outputting picture %p (poc %d)", picture, picture->pic_order_cnt);
+
+  return klass->output_picture (self, frame, GST_CODEC_PICTURE (picture),
+      picture->buffer_flags, priv->width, priv->height);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvah264decoder.h Added

@@ -0,0 +1,103 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/dxva/dxva-prelude.h>
+#include <gst/dxva/gstdxvatypes.h>
+#include <gst/codecs/gsth264decoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DXVA_H264_DECODER            (gst_dxva_h264_decoder_get_type())
+#define GST_DXVA_H264_DECODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DXVA_H264_DECODER,GstDxvaH264Decoder))
+#define GST_DXVA_H264_DECODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DXVA_H264_DECODER,GstDxvaH264DecoderClass))
+#define GST_DXVA_H264_DECODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_DXVA_H264_DECODER,GstDxvaH264DecoderClass))
+#define GST_IS_DXVA_H264_DECODER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DXVA_H264_DECODER))
+#define GST_IS_DXVA_H264_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DXVA_H264_DECODER))
+
+typedef struct _GstDxvaH264Decoder GstDxvaH264Decoder;
+typedef struct _GstDxvaH264DecoderClass GstDxvaH264DecoderClass;
+typedef struct _GstDxvaH264DecoderPrivate GstDxvaH264DecoderPrivate;
+
+/**
+ * GstDxvaH264Decoder:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaH264Decoder
+{
+  GstH264Decoder parent;
+
+  /*< private >*/
+  GstDxvaH264DecoderPrivate *priv;
+};
+
+/**
+ * GstDxvaH264DecoderClass:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaH264DecoderClass
+{
+  GstH264DecoderClass parent_class;
+
+  GstFlowReturn   (*configure)          (GstDxvaH264Decoder * decoder,
+                                         GstVideoCodecState * input_state,
+                                         const GstVideoInfo * info,
+                                         gint crop_x,
+                                         gint crop_y,
+                                         gint coded_width,
+                                         gint coded_height,
+                                         gint max_dpb_size);
+
+  GstFlowReturn   (*new_picture)        (GstDxvaH264Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  GstFlowReturn   (*duplicate_picture)  (GstDxvaH264Decoder * decoder,
+                                         GstCodecPicture * src,
+                                         GstCodecPicture * dst);
+
+  guint8          (*get_picture_id)     (GstDxvaH264Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  GstFlowReturn   (*start_picture)      (GstDxvaH264Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         guint8 * picture_id);
+
+  GstFlowReturn   (*end_picture)        (GstDxvaH264Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         GPtrArray * ref_pics,
+                                         const GstDxvaDecodingArgs * args);
+
+  GstFlowReturn   (*output_picture)     (GstDxvaH264Decoder * decoder,
+                                         GstVideoCodecFrame * frame,
+                                         GstCodecPicture * picture,
+                                         GstVideoBufferFlags buffer_flags,
+                                         gint display_width,
+                                         gint display_height);
+};
+
+GST_DXVA_API
+GType gst_dxva_h264_decoder_get_type (void);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstDxvaH264Decoder, gst_object_unref)
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvah265decoder.cpp Added

@@ -0,0 +1,734 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdxvah265decoder.h"
+#include <string.h>
+#include <vector>
+
+#include "gstdxvatypedef.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_dxva_h265_decoder_debug);
+#define GST_CAT_DEFAULT gst_dxva_h265_decoder_debug
+
+/* *INDENT-OFF* */
+struct _GstDxvaH265DecoderPrivate
+{
+  DXVA_PicParams_HEVC pic_params;
+  DXVA_Qmatrix_HEVC iq_matrix;
+
+  std::vector<DXVA_Slice_HEVC_Short> slice_list;
+  std::vector<guint8> bitstream_buffer;
+  GPtrArray *ref_pics = nullptr;
+
+  gboolean submit_iq_data;
+
+  gint crop_x = 0;
+  gint crop_y = 0;
+  gint width = 0;
+  gint height = 0;
+  gint coded_width = 0;
+  gint coded_height = 0;
+  gint bitdepth = 0;
+  guint8 chroma_format_idc = 0;
+  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
+  GstVideoInterlaceMode interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
+  gint max_dpb_size = 0;
+
+  gboolean configured;
+};
+/* *INDENT-ON* */
+
+static void gst_dxva_h265_decoder_finalize (GObject * object);
+
+static gboolean gst_dxva_h265_decoder_start (GstVideoDecoder * decoder);
+
+static GstFlowReturn
+gst_dxva_h265_decoder_new_sequence (GstH265Decoder * decoder,
+    const GstH265SPS * sps, gint max_dpb_size);
+static GstFlowReturn
+gst_dxva_h265_decoder_new_picture (GstH265Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH265Picture * picture);
+static GstFlowReturn
+gst_dxva_h265_decoder_start_picture (GstH265Decoder * decoder,
+    GstH265Picture * picture, GstH265Slice * slice, GstH265Dpb * dpb);
+static GstFlowReturn
+gst_dxva_h265_decoder_decode_slice (GstH265Decoder * decoder,
+    GstH265Picture * picture, GstH265Slice * slice,
+    GArray * ref_pic_list0, GArray * ref_pic_list1);
+static GstFlowReturn
+gst_dxva_h265_decoder_end_picture (GstH265Decoder * decoder,
+    GstH265Picture * picture);
+static GstFlowReturn
+gst_dxva_h265_decoder_output_picture (GstH265Decoder *
+    decoder, GstVideoCodecFrame * frame, GstH265Picture * picture);
+
+#define gst_dxva_h265_decoder_parent_class parent_class
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstDxvaH265Decoder,
+    gst_dxva_h265_decoder, GST_TYPE_H265_DECODER,
+    GST_DEBUG_CATEGORY_INIT (gst_dxva_h265_decoder_debug, "dxvah265decoder",
+        0, "dxvah265decoder"));
+
+static void
+gst_dxva_h265_decoder_class_init (GstDxvaH265DecoderClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstH265DecoderClass *h265decoder_class = GST_H265_DECODER_CLASS (klass);
+
+  gobject_class->finalize = gst_dxva_h265_decoder_finalize;
+
+  decoder_class->start = GST_DEBUG_FUNCPTR (gst_dxva_h265_decoder_start);
+
+  h265decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_dxva_h265_decoder_new_sequence);
+  h265decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_h265_decoder_new_picture);
+  h265decoder_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_h265_decoder_start_picture);
+  h265decoder_class->decode_slice =
+      GST_DEBUG_FUNCPTR (gst_dxva_h265_decoder_decode_slice);
+  h265decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_h265_decoder_end_picture);
+  h265decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_h265_decoder_output_picture);
+}
+
+static void
+gst_dxva_h265_decoder_init (GstDxvaH265Decoder * self)
+{
+  self->priv = new GstDxvaH265DecoderPrivate ();
+  self->priv->ref_pics = g_ptr_array_new ();
+}
+
+static void
+gst_dxva_h265_decoder_finalize (GObject * object)
+{
+  GstDxvaH265Decoder *self = GST_DXVA_H265_DECODER (object);
+  GstDxvaH265DecoderPrivate *priv = self->priv;
+
+  g_ptr_array_unref (priv->ref_pics);
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_dxva_h265_decoder_reset (GstDxvaH265Decoder * self)
+{
+  GstDxvaH265DecoderPrivate *priv = self->priv;
+
+  priv->crop_x = 0;
+  priv->crop_y = 0;
+  priv->width = 0;
+  priv->height = 0;
+  priv->coded_width = 0;
+  priv->coded_height = 0;
+  priv->bitdepth = 0;
+  priv->chroma_format_idc = 0;
+  priv->out_format = GST_VIDEO_FORMAT_UNKNOWN;
+  priv->interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
+  priv->max_dpb_size = 0;
+  priv->configured = FALSE;
+}
+
+static gboolean
+gst_dxva_h265_decoder_start (GstVideoDecoder * decoder)
+{
+  GstDxvaH265Decoder *self = GST_DXVA_H265_DECODER (decoder);
+
+  gst_dxva_h265_decoder_reset (self);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->start (decoder);
+}
+
+static GstFlowReturn
+gst_dxva_h265_decoder_new_sequence (GstH265Decoder * decoder,
+    const GstH265SPS * sps, gint max_dpb_size)
+{
+  GstDxvaH265Decoder *self = GST_DXVA_H265_DECODER (decoder);
+  GstDxvaH265DecoderPrivate *priv = self->priv;
+  GstDxvaH265DecoderClass *klass = GST_DXVA_H265_DECODER_GET_CLASS (self);
+  gint crop_width, crop_height;
+  gboolean modified = FALSE;
+  GstVideoInterlaceMode interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
+  GstVideoInfo info;
+  GstFlowReturn ret;
+
+  GST_LOG_OBJECT (self, "new sequence");
+
+  if (sps->conformance_window_flag) {
+    crop_width = sps->crop_rect_width;
+    crop_height = sps->crop_rect_height;
+  } else {
+    crop_width = sps->width;
+    crop_height = sps->height;
+  }
+
+  if (priv->width != crop_width || priv->height != crop_height ||
+      priv->coded_width != sps->width || priv->coded_height != sps->height ||
+      priv->crop_x != sps->crop_rect_x || priv->crop_y != sps->crop_rect_y) {
+    GST_INFO_OBJECT (self, "resolution changed %dx%d (%dx%d) -> %dx%d (%dx%d)",
+        priv->width, priv->height, priv->coded_width, priv->coded_height,
+        crop_width, crop_height, sps->width, sps->height);
+    priv->crop_x = sps->crop_rect_x;
+    priv->crop_y = sps->crop_rect_y;
+    priv->width = crop_width;
+    priv->height = crop_height;
+    priv->coded_width = sps->width;
+    priv->coded_height = sps->height;
+    modified = TRUE;
+  }
+
+  if (priv->bitdepth != sps->bit_depth_luma_minus8 + 8) {
+    gint bitdepth = sps->bit_depth_luma_minus8 + 8;
+    GST_INFO_OBJECT (self,
+        "bitdepth change, %d -> %d", priv->bitdepth, bitdepth);
+    priv->bitdepth = bitdepth;
+    modified = TRUE;
+  }
+
+  if (sps->vui_parameters_present_flag && sps->vui_params.field_seq_flag) {
+    interlace_mode = GST_VIDEO_INTERLACE_MODE_ALTERNATE;
+  } else {
+    /* 7.4.4 Profile, tier and level sementics */
+    if (sps->profile_tier_level.progressive_source_flag &&
+        !sps->profile_tier_level.interlaced_source_flag) {
+      interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
+    } else {
+      interlace_mode = GST_VIDEO_INTERLACE_MODE_MIXED;
+    }
+  }
+
+  if (priv->interlace_mode != interlace_mode) {
+    GST_INFO_OBJECT (self, "Interlace mode change %d -> %d",
+        priv->interlace_mode, interlace_mode);
+    priv->interlace_mode = interlace_mode;
+    modified = TRUE;
+  }
+
+  if (priv->chroma_format_idc != sps->chroma_format_idc) {
+    GST_INFO_OBJECT (self, "chroma format changed");
+    priv->chroma_format_idc = sps->chroma_format_idc;
+    modified = TRUE;
+  }
+
+  if (priv->max_dpb_size < max_dpb_size) {
+    GST_INFO_OBJECT (self, "Requires larger DPB size (%d -> %d)",
+        priv->max_dpb_size, max_dpb_size);
+    modified = TRUE;
+  }
+
+  if (!modified && priv->configured)
+    return GST_FLOW_OK;
+
+  priv->out_format = GST_VIDEO_FORMAT_UNKNOWN;
+
+  if (priv->bitdepth == 8) {
+    if (priv->chroma_format_idc == 1) {
+      priv->out_format = GST_VIDEO_FORMAT_NV12;
+    } else {
+      GST_FIXME_OBJECT (self, "Could not support 8bits non-4:2:0 format");
+    }
+  } else if (priv->bitdepth == 10) {
+    if (priv->chroma_format_idc == 1) {
+      priv->out_format = GST_VIDEO_FORMAT_P010_10LE;
+    } else {
+      GST_FIXME_OBJECT (self, "Could not support 10bits non-4:2:0 format");
+    }
+  }
+
+  if (priv->out_format == GST_VIDEO_FORMAT_UNKNOWN) {
+    GST_ERROR_OBJECT (self, "Could not support bitdepth/chroma format");
+    priv->configured = FALSE;
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  gst_video_info_set_interlaced_format (&info, priv->out_format,
+      priv->interlace_mode, priv->width, priv->height);
+
+  priv->max_dpb_size = max_dpb_size;
+
+  g_assert (klass->configure);
+  ret = klass->configure (self, decoder->input_state, &info, priv->crop_x,
+      priv->crop_y, priv->coded_width, priv->coded_height, max_dpb_size);
+
+  if (ret == GST_FLOW_OK) {
+    priv->configured = TRUE;
+    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+      GST_WARNING_OBJECT (self, "Couldn't negotiate with new sequence");
+      ret = GST_FLOW_NOT_NEGOTIATED;
+    }
+  } else {
+    priv->configured = FALSE;
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_dxva_h265_decoder_new_picture (GstH265Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH265Picture * picture)
+{
+  GstDxvaH265Decoder *self = GST_DXVA_H265_DECODER (decoder);
+  GstDxvaH265DecoderClass *klass = GST_DXVA_H265_DECODER_GET_CLASS (self);
+
+  g_assert (klass->new_picture);
+
+  return klass->new_picture (self, GST_CODEC_PICTURE (picture));
+}
+
+static void
+gst_dxva_h265_decoder_picture_params_from_sps (GstDxvaH265Decoder * self,
+    const GstH265SPS * sps, DXVA_PicParams_HEVC * params)
+{
+#define COPY_FIELD(f) \
+  (params)->f = (sps)->f
+#define COPY_FIELD_WITH_PREFIX(f) \
+  (params)->G_PASTE(sps_,f) = (sps)->f
+
+  params->PicWidthInMinCbsY =
+      sps->width >> (sps->log2_min_luma_coding_block_size_minus3 + 3);
+  params->PicHeightInMinCbsY =
+      sps->height >> (sps->log2_min_luma_coding_block_size_minus3 + 3);
+  params->sps_max_dec_pic_buffering_minus1 =
+      sps->max_dec_pic_buffering_minus1sps->max_sub_layers_minus1;
+
+  COPY_FIELD (chroma_format_idc);
+  COPY_FIELD (separate_colour_plane_flag);
+  COPY_FIELD (bit_depth_luma_minus8);
+  COPY_FIELD (bit_depth_chroma_minus8);
+  COPY_FIELD (log2_max_pic_order_cnt_lsb_minus4);
+  COPY_FIELD (log2_min_luma_coding_block_size_minus3);
+  COPY_FIELD (log2_diff_max_min_luma_coding_block_size);
+  COPY_FIELD (log2_min_transform_block_size_minus2);
+  COPY_FIELD (log2_diff_max_min_transform_block_size);
+  COPY_FIELD (max_transform_hierarchy_depth_inter);
+  COPY_FIELD (max_transform_hierarchy_depth_intra);
+  COPY_FIELD (num_short_term_ref_pic_sets);
+  COPY_FIELD (num_long_term_ref_pics_sps);
+  COPY_FIELD (scaling_list_enabled_flag);
+  COPY_FIELD (amp_enabled_flag);
+  COPY_FIELD (sample_adaptive_offset_enabled_flag);
+  COPY_FIELD (pcm_enabled_flag);
+
+  if (sps->pcm_enabled_flag) {
+    COPY_FIELD (pcm_sample_bit_depth_luma_minus1);
+    COPY_FIELD (pcm_sample_bit_depth_chroma_minus1);
+    COPY_FIELD (log2_min_pcm_luma_coding_block_size_minus3);
+    COPY_FIELD (log2_diff_max_min_pcm_luma_coding_block_size);
+  }
+
+  COPY_FIELD (pcm_loop_filter_disabled_flag);
+  COPY_FIELD (long_term_ref_pics_present_flag);
+  COPY_FIELD_WITH_PREFIX (temporal_mvp_enabled_flag);
+  COPY_FIELD (strong_intra_smoothing_enabled_flag);
+
+#undef COPY_FIELD
+#undef COPY_FIELD_WITH_PREFIX
+}
+
+static void
+gst_dxva_h265_decoder_picture_params_from_pps (GstDxvaH265Decoder * self,
+    const GstH265PPS * pps, DXVA_PicParams_HEVC * params)
+{
+  guint i;
+
+#define COPY_FIELD(f) \
+  (params)->f = (pps)->f
+#define COPY_FIELD_WITH_PREFIX(f) \
+  (params)->G_PASTE(pps_,f) = (pps)->f
+
+  COPY_FIELD (num_ref_idx_l0_default_active_minus1);
+  COPY_FIELD (num_ref_idx_l1_default_active_minus1);
+  COPY_FIELD (init_qp_minus26);
+  COPY_FIELD (dependent_slice_segments_enabled_flag);
+  COPY_FIELD (output_flag_present_flag);
+  COPY_FIELD (num_extra_slice_header_bits);
+  COPY_FIELD (sign_data_hiding_enabled_flag);
+  COPY_FIELD (cabac_init_present_flag);
+  COPY_FIELD (constrained_intra_pred_flag);
+  COPY_FIELD (transform_skip_enabled_flag);
+  COPY_FIELD (cu_qp_delta_enabled_flag);
+  COPY_FIELD_WITH_PREFIX (slice_chroma_qp_offsets_present_flag);
+  COPY_FIELD (weighted_pred_flag);
+  COPY_FIELD (weighted_bipred_flag);
+  COPY_FIELD (transquant_bypass_enabled_flag);
+  COPY_FIELD (tiles_enabled_flag);
+  COPY_FIELD (entropy_coding_sync_enabled_flag);
+  COPY_FIELD (uniform_spacing_flag);
+
+  if (pps->tiles_enabled_flag)
+    COPY_FIELD (loop_filter_across_tiles_enabled_flag);
+
+  COPY_FIELD_WITH_PREFIX (loop_filter_across_slices_enabled_flag);
+  COPY_FIELD (deblocking_filter_override_enabled_flag);
+  COPY_FIELD_WITH_PREFIX (deblocking_filter_disabled_flag);
+  COPY_FIELD (lists_modification_present_flag);
+  COPY_FIELD (slice_segment_header_extension_present_flag);
+  COPY_FIELD_WITH_PREFIX (cb_qp_offset);
+  COPY_FIELD_WITH_PREFIX (cr_qp_offset);
+
+  if (pps->tiles_enabled_flag) {
+    COPY_FIELD (num_tile_columns_minus1);
+    COPY_FIELD (num_tile_rows_minus1);
+    if (!pps->uniform_spacing_flag) {
+      for (i = 0; i < pps->num_tile_columns_minus1 &&
+          i < G_N_ELEMENTS (params->column_width_minus1); i++)
+        COPY_FIELD (column_width_minus1i);
+
+      for (i = 0; i < pps->num_tile_rows_minus1 &&
+          i < G_N_ELEMENTS (params->row_height_minus1); i++)
+        COPY_FIELD (row_height_minus1i);
+    }
+  }
+
+  COPY_FIELD (diff_cu_qp_delta_depth);
+  COPY_FIELD_WITH_PREFIX (beta_offset_div2);
+  COPY_FIELD_WITH_PREFIX (tc_offset_div2);
+  COPY_FIELD (log2_parallel_merge_level_minus2);
+
+#undef COPY_FIELD
+#undef COPY_FIELD_WITH_PREFIX
+}
+
+static void
+gst_dxva_h265_decoder_picture_params_from_slice_header (GstDxvaH265Decoder *
+    self, const GstH265SliceHdr * slice_header, DXVA_PicParams_HEVC * params)
+{
+  if (slice_header->short_term_ref_pic_set_sps_flag == 0) {
+    params->ucNumDeltaPocsOfRefRpsIdx =
+        slice_header->short_term_ref_pic_sets.NumDeltaPocsOfRefRpsIdx;
+    params->wNumBitsForShortTermRPSInSlice =
+        slice_header->short_term_ref_pic_set_size;
+  }
+}
+
+static gboolean
+gst_dxva_h265_decoder_fill_picture_params (GstDxvaH265Decoder * self,
+    const GstH265SliceHdr * slice_header, DXVA_PicParams_HEVC * params)
+{
+  const GstH265SPS *sps;
+  const GstH265PPS *pps;
+
+  pps = slice_header->pps;
+  sps = pps->sps;
+
+  /* not related to hevc syntax */
+  params->NoPicReorderingFlag = 0;
+  params->NoBiPredFlag = 0;
+  params->ReservedBits1 = 0;
+  params->StatusReportFeedbackNumber = 1;
+
+  gst_dxva_h265_decoder_picture_params_from_sps (self, sps, params);
+  gst_dxva_h265_decoder_picture_params_from_pps (self, pps, params);
+  gst_dxva_h265_decoder_picture_params_from_slice_header (self,
+      slice_header, params);
+
+  return TRUE;
+}
+
+static UCHAR
+gst_dxva_h265_decoder_get_ref_index (const DXVA_PicParams_HEVC * pic_params,
+    guint8 picture_id)
+{
+  if (picture_id == 0xff)
+    return 0xff;
+
+  for (UCHAR i = 0; i < G_N_ELEMENTS (pic_params->RefPicList); i++) {
+    if (pic_params->RefPicListi.Index7Bits == picture_id)
+      return i;
+  }
+
+  return 0xff;
+}
+
+static inline void
+init_pic_params (DXVA_PicParams_HEVC * params)
+{
+  memset (params, 0, sizeof (DXVA_PicParams_HEVC));
+  for (guint i = 0; i < G_N_ELEMENTS (params->RefPicList); i++)
+    params->RefPicListi.bPicEntry = 0xff;
+
+  for (guint i = 0; i < G_N_ELEMENTS (params->RefPicSetStCurrBefore); i++) {
+    params->RefPicSetStCurrBeforei = 0xff;
+    params->RefPicSetStCurrAfteri = 0xff;
+    params->RefPicSetLtCurri = 0xff;
+  }
+}
+
+static GstFlowReturn
+gst_dxva_h265_decoder_start_picture (GstH265Decoder * decoder,
+    GstH265Picture * picture, GstH265Slice * slice, GstH265Dpb * dpb)
+{
+  GstDxvaH265Decoder *self = GST_DXVA_H265_DECODER (decoder);
+  GstDxvaH265DecoderPrivate *priv = self->priv;
+  GstDxvaH265DecoderClass *klass = GST_DXVA_H265_DECODER_GET_CLASS (self);
+  DXVA_PicParams_HEVC *pic_params = &priv->pic_params;
+  DXVA_Qmatrix_HEVC *iq_matrix = &priv->iq_matrix;
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
+  guint i, j;
+  GArray *dpb_array;
+  GstH265SPS *sps;
+  GstH265PPS *pps;
+  GstH265ScalingList *scaling_list = nullptr;
+  GstFlowReturn ret;
+  guint8 picture_id;
+
+  g_assert (klass->start_picture);
+  g_assert (klass->get_picture_id);
+
+  ret = klass->start_picture (self, codec_picture, &picture_id);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  pps = slice->header.pps;
+  g_assert (pps);
+
+  sps = pps->sps;
+  g_assert (sps);
+
+  priv->slice_list.resize (0);
+  priv->bitstream_buffer.resize (0);
+  g_ptr_array_set_size (priv->ref_pics, 0);
+
+  init_pic_params (pic_params);
+  gst_dxva_h265_decoder_fill_picture_params (self, &slice->header, pic_params);
+
+  pic_params->CurrPic.Index7Bits = picture_id;
+  pic_params->IrapPicFlag = GST_H265_IS_NAL_TYPE_IRAP (slice->nalu.type);
+  pic_params->IdrPicFlag = GST_H265_IS_NAL_TYPE_IDR (slice->nalu.type);
+  pic_params->IntraPicFlag = GST_H265_IS_NAL_TYPE_IRAP (slice->nalu.type);
+  pic_params->CurrPicOrderCntVal = picture->pic_order_cnt;
+
+  dpb_array = gst_h265_dpb_get_pictures_all (dpb);
+  for (i = 0, j = 0;
+      i < dpb_array->len && j < G_N_ELEMENTS (pic_params->RefPicList); i++) {
+    GstH265Picture *other = g_array_index (dpb_array, GstH265Picture *, i);
+    guint8 id;
+
+    if (!other->ref)
+      continue;
+
+    id = klass->get_picture_id (self, GST_CODEC_PICTURE (other));
+    if (id != 0xff) {
+      pic_params->RefPicListj.Index7Bits = id;
+      pic_params->RefPicListj.AssociatedFlag = other->long_term;
+      pic_params->PicOrderCntValListj = other->pic_order_cnt;
+      g_ptr_array_add (priv->ref_pics, other);
+    }
+
+    j++;
+  }
+  g_array_unref (dpb_array);
+
+  for (i = 0, j = 0; i < G_N_ELEMENTS (pic_params->RefPicSetStCurrBefore); i++) {
+    GstH265Picture *other = nullptr;
+    guint8 id = 0xff;
+
+    while (!other && j < decoder->NumPocStCurrBefore)
+      other = decoder->RefPicSetStCurrBeforej++;
+
+    if (other)
+      id = klass->get_picture_id (self, GST_CODEC_PICTURE (other));
+
+    pic_params->RefPicSetStCurrBeforei =
+        gst_dxva_h265_decoder_get_ref_index (pic_params, id);
+  }
+
+  for (i = 0, j = 0; i < G_N_ELEMENTS (pic_params->RefPicSetStCurrAfter); i++) {
+    GstH265Picture *other = nullptr;
+    guint8 id = 0xff;
+
+    while (!other && j < decoder->NumPocStCurrAfter)
+      other = decoder->RefPicSetStCurrAfterj++;
+
+    if (other)
+      id = klass->get_picture_id (self, GST_CODEC_PICTURE (other));
+
+    pic_params->RefPicSetStCurrAfteri =
+        gst_dxva_h265_decoder_get_ref_index (pic_params, id);
+  }
+
+  for (i = 0, j = 0; i < G_N_ELEMENTS (pic_params->RefPicSetLtCurr); i++) {
+    GstH265Picture *other = nullptr;
+    guint8 id = 0xff;
+
+    while (!other && j < decoder->NumPocLtCurr)
+      other = decoder->RefPicSetLtCurrj++;
+
+    if (other)
+      id = klass->get_picture_id (self, GST_CODEC_PICTURE (other));
+
+    pic_params->RefPicSetLtCurri =
+        gst_dxva_h265_decoder_get_ref_index (pic_params, id);
+  }
+
+  if (pps->scaling_list_data_present_flag ||
+      (sps->scaling_list_enabled_flag
+          && !sps->scaling_list_data_present_flag)) {
+    scaling_list = &pps->scaling_list;
+  } else if (sps->scaling_list_enabled_flag &&
+      sps->scaling_list_data_present_flag) {
+    scaling_list = &sps->scaling_list;
+  }
+
+  if (scaling_list) {
+    G_STATIC_ASSERT (sizeof (iq_matrix->ucScalingLists0) ==
+        sizeof (scaling_list->scaling_lists_4x4));
+    G_STATIC_ASSERT (sizeof (iq_matrix->ucScalingLists1) ==
+        sizeof (scaling_list->scaling_lists_8x8));
+    G_STATIC_ASSERT (sizeof (iq_matrix->ucScalingLists2) ==
+        sizeof (scaling_list->scaling_lists_16x16));
+    G_STATIC_ASSERT (sizeof (iq_matrix->ucScalingLists3) ==
+        sizeof (scaling_list->scaling_lists_32x32));
+
+    memcpy (iq_matrix->ucScalingLists0, scaling_list->scaling_lists_4x4,
+        sizeof (iq_matrix->ucScalingLists0));
+    memcpy (iq_matrix->ucScalingLists1, scaling_list->scaling_lists_8x8,
+        sizeof (iq_matrix->ucScalingLists1));
+    memcpy (iq_matrix->ucScalingLists2, scaling_list->scaling_lists_16x16,
+        sizeof (iq_matrix->ucScalingLists2));
+    memcpy (iq_matrix->ucScalingLists3, scaling_list->scaling_lists_32x32,
+        sizeof (iq_matrix->ucScalingLists3));
+
+    for (i = 0; i < G_N_ELEMENTS (iq_matrix->ucScalingListDCCoefSizeID2); i++) {
+      iq_matrix->ucScalingListDCCoefSizeID2i =
+          scaling_list->scaling_list_dc_coef_minus8_16x16i + 8;
+    }
+
+    for (i = 0; i < G_N_ELEMENTS (iq_matrix->ucScalingListDCCoefSizeID3); i++) {
+      iq_matrix->ucScalingListDCCoefSizeID3i =
+          scaling_list->scaling_list_dc_coef_minus8_32x32i + 8;
+    }
+
+    priv->submit_iq_data = TRUE;
+  } else {
+    priv->submit_iq_data = FALSE;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_dxva_h265_decoder_decode_slice (GstH265Decoder * decoder,
+    GstH265Picture * picture, GstH265Slice * slice,
+    GArray * ref_pic_list0, GArray * ref_pic_list1)
+{
+  GstDxvaH265Decoder *self = GST_DXVA_H265_DECODER (decoder);
+  GstDxvaH265DecoderPrivate *priv = self->priv;
+  DXVA_Slice_HEVC_Short dxva_slice;
+  static const guint8 start_code = { 0, 0, 1 };
+  const size_t start_code_size = sizeof (start_code);
+
+  dxva_slice.BSNALunitDataLocation = priv->bitstream_buffer.size ();
+  /* Includes 3 bytes start code prefix */
+  dxva_slice.SliceBytesInBuffer = slice->nalu.size + start_code_size;
+  dxva_slice.wBadSliceChopping = 0;
+
+  priv->slice_list.push_back (dxva_slice);
+
+  size_t pos = priv->bitstream_buffer.size ();
+  priv->bitstream_buffer.resize (pos + start_code_size + slice->nalu.size);
+
+  /* Fill start code prefix */
+  memcpy (&priv->bitstream_buffer0 + pos, start_code, start_code_size);
+
+  /* Copy bitstream */
+  memcpy (&priv->bitstream_buffer0 + pos + start_code_size,
+      slice->nalu.data + slice->nalu.offset, slice->nalu.size);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_dxva_h265_decoder_end_picture (GstH265Decoder * decoder,
+    GstH265Picture * picture)
+{
+  GstDxvaH265Decoder *self = GST_DXVA_H265_DECODER (decoder);
+  GstDxvaH265DecoderPrivate *priv = self->priv;
+  GstDxvaH265DecoderClass *klass = GST_DXVA_H265_DECODER_GET_CLASS (self);
+  size_t bitstream_buffer_size;
+  size_t bitstream_pos;
+  GstDxvaDecodingArgs args;
+
+  GST_LOG_OBJECT (self, "end picture %p, (poc %d)",
+      picture, picture->pic_order_cnt);
+
+  if (priv->bitstream_buffer.empty () || priv->slice_list.empty ()) {
+    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
+    return GST_FLOW_ERROR;
+  }
+
+  memset (&args, 0, sizeof (GstDxvaDecodingArgs));
+
+  bitstream_pos = priv->bitstream_buffer.size ();
+  bitstream_buffer_size = GST_ROUND_UP_128 (bitstream_pos);
+
+  if (bitstream_buffer_size > bitstream_pos) {
+    size_t padding = bitstream_buffer_size - bitstream_pos;
+
+    /* As per DXVA spec, total amount of bitstream buffer size should be
+     * 128 bytes aligned. If actual data is not multiple of 128 bytes,
+     * the last slice data needs to be zero-padded */
+    priv->bitstream_buffer.resize (bitstream_buffer_size, 0);
+
+    DXVA_Slice_HEVC_Short & slice = priv->slice_list.back ();
+    slice.SliceBytesInBuffer += padding;
+  }
+
+  args.picture_params = &priv->pic_params;
+  args.picture_params_size = sizeof (DXVA_PicParams_HEVC);
+  args.slice_control = &priv->slice_list0;
+  args.slice_control_size =
+      sizeof (DXVA_Slice_HEVC_Short) * priv->slice_list.size ();
+  args.bitstream = &priv->bitstream_buffer0;
+  args.bitstream_size = priv->bitstream_buffer.size ();
+
+  if (priv->submit_iq_data) {
+    args.inverse_quantization_matrix = &priv->iq_matrix;
+    args.inverse_quantization_matrix_size = sizeof (DXVA_Qmatrix_HEVC);
+  }
+
+  g_assert (klass->end_picture);
+
+  return klass->end_picture (self, GST_CODEC_PICTURE (picture),
+      priv->ref_pics, &args);
+}
+
+static GstFlowReturn
+gst_dxva_h265_decoder_output_picture (GstH265Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH265Picture * picture)
+{
+  GstDxvaH265Decoder *self = GST_DXVA_H265_DECODER (decoder);
+  GstDxvaH265DecoderPrivate *priv = self->priv;
+  GstDxvaH265DecoderClass *klass = GST_DXVA_H265_DECODER_GET_CLASS (self);
+
+  g_assert (klass->output_picture);
+
+  GST_LOG_OBJECT (self, "Outputting picture %p, poc %d, picture_struct %d, "
+      "buffer flags 0x%x", picture, picture->pic_order_cnt, picture->pic_struct,
+      picture->buffer_flags);
+
+  return klass->output_picture (self, frame, GST_CODEC_PICTURE (picture),
+      picture->buffer_flags, priv->width, priv->height);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvah265decoder.h Added

@@ -0,0 +1,99 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/dxva/dxva-prelude.h>
+#include <gst/dxva/gstdxvatypes.h>
+#include <gst/codecs/gsth265decoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DXVA_H265_DECODER            (gst_dxva_h265_decoder_get_type())
+#define GST_DXVA_H265_DECODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DXVA_H265_DECODER,GstDxvaH265Decoder))
+#define GST_DXVA_H265_DECODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DXVA_H265_DECODER,GstDxvaH265DecoderClass))
+#define GST_DXVA_H265_DECODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_DXVA_H265_DECODER,GstDxvaH265DecoderClass))
+#define GST_IS_DXVA_H265_DECODER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DXVA_H265_DECODER))
+#define GST_IS_DXVA_H265_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DXVA_H265_DECODER))
+
+typedef struct _GstDxvaH265Decoder GstDxvaH265Decoder;
+typedef struct _GstDxvaH265DecoderClass GstDxvaH265DecoderClass;
+typedef struct _GstDxvaH265DecoderPrivate GstDxvaH265DecoderPrivate;
+
+/**
+ * GstDxvaH265Decoder:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaH265Decoder
+{
+  GstH265Decoder parent;
+
+  /*< private >*/
+  GstDxvaH265DecoderPrivate *priv;
+};
+
+/**
+ * GstDxvaH265DecoderClass:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaH265DecoderClass
+{
+  GstH265DecoderClass parent_class;
+
+  GstFlowReturn   (*configure)          (GstDxvaH265Decoder * decoder,
+                                         GstVideoCodecState * input_state,
+                                         const GstVideoInfo * info,
+                                         gint crop_x,
+                                         gint crop_y,
+                                         gint coded_width,
+                                         gint coded_height,
+                                         gint max_dpb_size);
+
+  GstFlowReturn   (*new_picture)        (GstDxvaH265Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  guint8          (*get_picture_id)     (GstDxvaH265Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  GstFlowReturn   (*start_picture)      (GstDxvaH265Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         guint8 * picture_id);
+
+  GstFlowReturn   (*end_picture)        (GstDxvaH265Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         GPtrArray * ref_pics,
+                                         const GstDxvaDecodingArgs * args);
+
+  GstFlowReturn   (*output_picture)     (GstDxvaH265Decoder * decoder,
+                                         GstVideoCodecFrame * frame,
+                                         GstCodecPicture * picture,
+                                         GstVideoBufferFlags buffer_flags,
+                                         gint display_width,
+                                         gint display_height);
+};
+
+GST_DXVA_API
+GType gst_dxva_h265_decoder_get_type (void);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstDxvaH265Decoder, gst_object_unref)
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvampeg2decoder.cpp Added

@@ -0,0 +1,545 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdxvampeg2decoder.h"
+#include <string.h>
+#include <vector>
+
+#include "gstdxvatypedef.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_dxva_mpeg2_decoder_debug);
+#define GST_CAT_DEFAULT gst_dxva_mpeg2_decoder_debug
+
+/* *INDENT-OFF* */
+struct _GstDxvaMpeg2DecoderPrivate
+{
+  DXVA_PictureParameters pic_params;
+  DXVA_QmatrixData iq_matrix;
+
+  std::vector<DXVA_SliceInfo> slice_list;
+  std::vector<guint8> bitstream_buffer;
+  GPtrArray *ref_pics = nullptr;
+
+  gboolean disable_postproc = FALSE;
+
+  gboolean submit_iq_data;
+
+  gint width = 0;
+  gint height = 0;
+  guint width_in_mb = 0;
+  guint height_in_mb = 0;
+  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
+  GstMpegVideoSequenceHdr seq;
+  GstMpegVideoProfile profile = GST_MPEG_VIDEO_PROFILE_MAIN;
+  gboolean interlaced = FALSE;
+
+  gboolean configured = FALSE;
+};
+/* *INDENT-ON* */
+
+static void gst_dxva_mpeg2_decoder_finalize (GObject * object);
+
+static gboolean gst_dxva_mpeg2_decoder_start (GstVideoDecoder * decoder);
+
+static GstFlowReturn gst_dxva_mpeg2_decoder_new_sequence (GstMpeg2Decoder *
+    decoder, const GstMpegVideoSequenceHdr * seq,
+    const GstMpegVideoSequenceExt * seq_ext,
+    const GstMpegVideoSequenceDisplayExt * seq_display_ext,
+    const GstMpegVideoSequenceScalableExt * seq_scalable_ext,
+    gint max_dpb_size);
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_new_picture (GstMpeg2Decoder * decoder,
+    GstVideoCodecFrame * frame, GstMpeg2Picture * picture);
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_new_field_picture (GstMpeg2Decoder * decoder,
+    GstMpeg2Picture * first_field, GstMpeg2Picture * second_field);
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_start_picture (GstMpeg2Decoder * decoder,
+    GstMpeg2Picture * picture, GstMpeg2Slice * slice,
+    GstMpeg2Picture * prev_picture, GstMpeg2Picture * next_picture);
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_decode_slice (GstMpeg2Decoder * decoder,
+    GstMpeg2Picture * picture, GstMpeg2Slice * slice);
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_end_picture (GstMpeg2Decoder * decoder,
+    GstMpeg2Picture * picture);
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_output_picture (GstMpeg2Decoder * decoder,
+    GstVideoCodecFrame * frame, GstMpeg2Picture * picture);
+
+#define gst_dxva_mpeg2_decoder_parent_class parent_class
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstDxvaMpeg2Decoder,
+    gst_dxva_mpeg2_decoder, GST_TYPE_MPEG2_DECODER,
+    GST_DEBUG_CATEGORY_INIT (gst_dxva_mpeg2_decoder_debug, "dxvampeg2decoder",
+        0, "dxvampeg2decoder"));
+
+static void
+gst_dxva_mpeg2_decoder_class_init (GstDxvaMpeg2DecoderClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstMpeg2DecoderClass *mpeg2decoder_class = GST_MPEG2_DECODER_CLASS (klass);
+
+  gobject_class->finalize = gst_dxva_mpeg2_decoder_finalize;
+
+  decoder_class->start = GST_DEBUG_FUNCPTR (gst_dxva_mpeg2_decoder_start);
+
+  mpeg2decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_dxva_mpeg2_decoder_new_sequence);
+  mpeg2decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_mpeg2_decoder_new_picture);
+  mpeg2decoder_class->new_field_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_mpeg2_decoder_new_field_picture);
+  mpeg2decoder_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_mpeg2_decoder_start_picture);
+  mpeg2decoder_class->decode_slice =
+      GST_DEBUG_FUNCPTR (gst_dxva_mpeg2_decoder_decode_slice);
+  mpeg2decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_mpeg2_decoder_end_picture);
+  mpeg2decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_mpeg2_decoder_output_picture);
+}
+
+static void
+gst_dxva_mpeg2_decoder_init (GstDxvaMpeg2Decoder * self)
+{
+  self->priv = new GstDxvaMpeg2DecoderPrivate ();
+  self->priv->ref_pics = g_ptr_array_new ();
+}
+
+static void
+gst_dxva_mpeg2_decoder_finalize (GObject * object)
+{
+  GstDxvaMpeg2Decoder *self = GST_DXVA_MPEG2_DECODER (object);
+  GstDxvaMpeg2DecoderPrivate *priv = self->priv;
+
+  g_ptr_array_unref (priv->ref_pics);
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_dxva_mpeg2_decoder_reset (GstDxvaMpeg2Decoder * self)
+{
+  GstDxvaMpeg2DecoderPrivate *priv = self->priv;
+
+  priv->width = 0;
+  priv->height = 0;
+  priv->width_in_mb = 0;
+  priv->height_in_mb = 0;
+  priv->out_format = GST_VIDEO_FORMAT_UNKNOWN;
+  priv->profile = GST_MPEG_VIDEO_PROFILE_MAIN;
+  priv->interlaced = FALSE;
+  priv->configured = FALSE;
+}
+
+static gboolean
+gst_dxva_mpeg2_decoder_start (GstVideoDecoder * decoder)
+{
+  GstDxvaMpeg2Decoder *self = GST_DXVA_MPEG2_DECODER (decoder);
+
+  gst_dxva_mpeg2_decoder_reset (self);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->start (decoder);
+}
+
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_new_sequence (GstMpeg2Decoder * decoder,
+    const GstMpegVideoSequenceHdr * seq,
+    const GstMpegVideoSequenceExt * seq_ext,
+    const GstMpegVideoSequenceDisplayExt * seq_display_ext,
+    const GstMpegVideoSequenceScalableExt * seq_scalable_ext, gint max_dpb_size)
+{
+  GstDxvaMpeg2Decoder *self = GST_DXVA_MPEG2_DECODER (decoder);
+  GstDxvaMpeg2DecoderPrivate *priv = self->priv;
+  GstDxvaMpeg2DecoderClass *klass = GST_DXVA_MPEG2_DECODER_GET_CLASS (self);
+  gboolean interlaced;
+  gboolean modified = FALSE;
+  gint width, height;
+  GstMpegVideoProfile mpeg_profile;
+  GstVideoInfo info;
+  GstFlowReturn ret;
+
+  GST_LOG_OBJECT (self, "new sequence");
+
+  interlaced = seq_ext ? !seq_ext->progressive : FALSE;
+  if (priv->interlaced != interlaced) {
+    GST_INFO_OBJECT (self, "interlaced sequence change, %d -> %d",
+        priv->interlaced, interlaced);
+    priv->interlaced = interlaced;
+    modified = TRUE;
+  }
+
+  width = seq->width;
+  height = seq->height;
+  if (seq_ext) {
+    width = (width & 0x0fff) | ((guint32) seq_ext->horiz_size_ext << 12);
+    height = (height & 0x0fff) | ((guint32) seq_ext->vert_size_ext << 12);
+  }
+
+  if (priv->width != width || priv->height != height) {
+    GST_INFO_OBJECT (self, "resolution change %dx%d -> %dx%d",
+        priv->width, priv->height, width, height);
+    priv->width = width;
+    priv->height = height;
+    priv->width_in_mb = GST_ROUND_UP_16 (width) >> 4;
+    priv->height_in_mb = GST_ROUND_UP_16 (height) >> 4;
+    modified = TRUE;
+  }
+
+  mpeg_profile = GST_MPEG_VIDEO_PROFILE_MAIN;
+  if (seq_ext)
+    mpeg_profile = (GstMpegVideoProfile) seq_ext->profile;
+
+  if (mpeg_profile != GST_MPEG_VIDEO_PROFILE_MAIN &&
+      mpeg_profile != GST_MPEG_VIDEO_PROFILE_SIMPLE) {
+    GST_ERROR_OBJECT (self, "Cannot support profile %d", mpeg_profile);
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  if (priv->profile != mpeg_profile) {
+    GST_INFO_OBJECT (self, "Profile change %d -> %d",
+        priv->profile, mpeg_profile);
+    priv->profile = mpeg_profile;
+    modified = TRUE;
+  }
+
+  if (!modified && priv->configured)
+    return GST_FLOW_OK;
+
+  priv->out_format = GST_VIDEO_FORMAT_NV12;
+
+  gst_video_info_set_interlaced_format (&info,
+      priv->out_format, priv->interlaced ? GST_VIDEO_INTERLACE_MODE_MIXED :
+      GST_VIDEO_INTERLACE_MODE_PROGRESSIVE, priv->width, priv->height);
+
+  g_assert (klass->configure);
+  ret = klass->configure (self, decoder->input_state, &info, 0, 0, priv->width,
+      priv->height, max_dpb_size);
+
+  if (ret == GST_FLOW_OK) {
+    priv->configured = TRUE;
+    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+      GST_WARNING_OBJECT (self, "Couldn't negotiate with new sequence");
+      ret = GST_FLOW_NOT_NEGOTIATED;
+    }
+  } else {
+    priv->configured = FALSE;
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_new_picture (GstMpeg2Decoder * decoder,
+    GstVideoCodecFrame * frame, GstMpeg2Picture * picture)
+{
+  GstDxvaMpeg2Decoder *self = GST_DXVA_MPEG2_DECODER (decoder);
+  GstDxvaMpeg2DecoderClass *klass = GST_DXVA_MPEG2_DECODER_GET_CLASS (self);
+
+  g_assert (klass->new_picture);
+
+  return klass->new_picture (self, GST_CODEC_PICTURE (picture));
+}
+
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_new_field_picture (GstMpeg2Decoder * decoder,
+    GstMpeg2Picture * first_field, GstMpeg2Picture * second_field)
+{
+  GstDxvaMpeg2Decoder *self = GST_DXVA_MPEG2_DECODER (decoder);
+  GstDxvaMpeg2DecoderClass *klass = GST_DXVA_MPEG2_DECODER_GET_CLASS (self);
+
+  g_assert (klass->duplicate_picture);
+
+  return klass->duplicate_picture (self, GST_CODEC_PICTURE (first_field),
+      GST_CODEC_PICTURE (second_field));
+}
+
+static inline WORD
+_pack_f_codes (guint8 f_code22)
+{
+  return (((WORD) f_code00 << 12)
+      | ((WORD) f_code01 << 8)
+      | ((WORD) f_code10 << 4)
+      | (f_code11));
+}
+
+static inline WORD
+_pack_pce_elements (GstMpeg2Slice * slice)
+{
+  return (((WORD) slice->pic_ext->intra_dc_precision << 14)
+      | ((WORD) slice->pic_ext->picture_structure << 12)
+      | ((WORD) slice->pic_ext->top_field_first << 11)
+      | ((WORD) slice->pic_ext->frame_pred_frame_dct << 10)
+      | ((WORD) slice->pic_ext->concealment_motion_vectors << 9)
+      | ((WORD) slice->pic_ext->q_scale_type << 8)
+      | ((WORD) slice->pic_ext->intra_vlc_format << 7)
+      | ((WORD) slice->pic_ext->alternate_scan << 6)
+      | ((WORD) slice->pic_ext->repeat_first_field << 5)
+      | ((WORD) slice->pic_ext->chroma_420_type << 4)
+      | ((WORD) slice->pic_ext->progressive_frame << 3));
+}
+
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_start_picture (GstMpeg2Decoder * decoder,
+    GstMpeg2Picture * picture, GstMpeg2Slice * slice,
+    GstMpeg2Picture * prev_picture, GstMpeg2Picture * next_picture)
+{
+  GstDxvaMpeg2Decoder *self = GST_DXVA_MPEG2_DECODER (decoder);
+  GstDxvaMpeg2DecoderPrivate *priv = self->priv;
+  GstDxvaMpeg2DecoderClass *klass = GST_DXVA_MPEG2_DECODER_GET_CLASS (self);
+  DXVA_PictureParameters *pic_params = &priv->pic_params;
+  DXVA_QmatrixData *iq_matrix = &priv->iq_matrix;
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
+  gboolean is_field =
+      picture->structure != GST_MPEG_VIDEO_PICTURE_STRUCTURE_FRAME;
+  GstFlowReturn ret;
+  guint8 picture_id;
+
+  g_assert (klass->start_picture);
+  g_assert (klass->get_picture_id);
+
+  ret = klass->start_picture (self, codec_picture, &picture_id);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  priv->slice_list.resize (0);
+  priv->bitstream_buffer.resize (0);
+  g_ptr_array_set_size (priv->ref_pics, 0);
+
+  memset (pic_params, 0, sizeof (DXVA_PictureParameters));
+  memset (iq_matrix, 0, sizeof (DXVA_QmatrixData));
+
+  /* Fill DXVA_PictureParameters */
+  pic_params->wDecodedPictureIndex = picture_id;
+  pic_params->wForwardRefPictureIndex = 0xffff;
+  pic_params->wBackwardRefPictureIndex = 0xffff;
+
+  /* d3d12 does not support post processing */
+  if (priv->disable_postproc)
+    pic_params->wDeblockedPictureIndex = 0xffff;
+
+  switch (picture->type) {
+    case GST_MPEG_VIDEO_PICTURE_TYPE_B:
+    {
+      if (next_picture) {
+        picture_id = klass->get_picture_id (self,
+            GST_CODEC_PICTURE (next_picture));
+        if (picture_id != 0xff) {
+          pic_params->wBackwardRefPictureIndex = picture_id;
+          g_ptr_array_add (priv->ref_pics, next_picture);
+        }
+      }
+    }
+      /* fall-through */
+    case GST_MPEG_VIDEO_PICTURE_TYPE_P:
+    {
+      if (prev_picture) {
+        picture_id = klass->get_picture_id (self,
+            GST_CODEC_PICTURE (prev_picture));
+        if (picture_id != 0xff) {
+          pic_params->wForwardRefPictureIndex = picture_id;
+          g_ptr_array_add (priv->ref_pics, prev_picture);
+        }
+      }
+    }
+    default:
+      break;
+  }
+
+  pic_params->wPicWidthInMBminus1 = priv->width_in_mb - 1;
+  pic_params->wPicHeightInMBminus1 = (priv->height_in_mb >> is_field) - 1;
+  pic_params->bMacroblockWidthMinus1 = 15;
+  pic_params->bMacroblockHeightMinus1 = 15;
+  pic_params->bBlockWidthMinus1 = 7;
+  pic_params->bBlockHeightMinus1 = 7;
+  pic_params->bBPPminus1 = 7;
+  pic_params->bPicStructure = (BYTE) picture->structure;
+  if (picture->first_field && is_field) {
+    pic_params->bSecondField = TRUE;
+  }
+  pic_params->bPicIntra = picture->type == GST_MPEG_VIDEO_PICTURE_TYPE_I;
+  pic_params->bPicBackwardPrediction =
+      picture->type == GST_MPEG_VIDEO_PICTURE_TYPE_B;
+  /* FIXME: 1 -> 4:2:0, 2 -> 4:2:2, 3 -> 4:4:4 */
+  pic_params->bChromaFormat = 1;
+  pic_params->bPicScanFixed = 1;
+  pic_params->bPicScanMethod = slice->pic_ext->alternate_scan;
+  pic_params->wBitstreamFcodes = _pack_f_codes (slice->pic_ext->f_code);
+  pic_params->wBitstreamPCEelements = _pack_pce_elements (slice);
+
+  /* Fill DXVA_QmatrixData */
+  if (slice->quant_matrix &&
+      /* The value in bNewQmatrix0 and bNewQmatrix1 must not both be zero.
+       * https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/dxva/ns-dxva-_dxva_qmatrixdata
+       */
+      (slice->quant_matrix->load_intra_quantiser_matrix ||
+          slice->quant_matrix->load_non_intra_quantiser_matrix)) {
+    GstMpegVideoQuantMatrixExt *quant_matrix = slice->quant_matrix;
+
+    if (quant_matrix->load_intra_quantiser_matrix) {
+      iq_matrix->bNewQmatrix0 = 1;
+      for (guint i = 0; i < 64; i++) {
+        iq_matrix->Qmatrix0i = quant_matrix->intra_quantiser_matrixi;
+      }
+    }
+
+    if (quant_matrix->load_non_intra_quantiser_matrix) {
+      iq_matrix->bNewQmatrix1 = 1;
+      for (guint i = 0; i < 64; i++) {
+        iq_matrix->Qmatrix1i = quant_matrix->non_intra_quantiser_matrixi;
+      }
+    }
+
+    if (quant_matrix->load_chroma_intra_quantiser_matrix) {
+      iq_matrix->bNewQmatrix2 = 1;
+      for (guint i = 0; i < 64; i++) {
+        iq_matrix->Qmatrix2i =
+            quant_matrix->chroma_intra_quantiser_matrixi;
+      }
+    }
+
+    if (quant_matrix->load_chroma_non_intra_quantiser_matrix) {
+      iq_matrix->bNewQmatrix3 = 1;
+      for (guint i = 0; i < 64; i++) {
+        iq_matrix->Qmatrix3i =
+            quant_matrix->chroma_non_intra_quantiser_matrixi;
+      }
+    }
+
+    priv->submit_iq_data = TRUE;
+  } else {
+    priv->submit_iq_data = FALSE;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_decode_slice (GstMpeg2Decoder * decoder,
+    GstMpeg2Picture * picture, GstMpeg2Slice * slice)
+{
+  GstDxvaMpeg2Decoder *self = GST_DXVA_MPEG2_DECODER (decoder);
+  GstDxvaMpeg2DecoderPrivate *priv = self->priv;
+  GstMpegVideoSliceHdr *header = &slice->header;
+  GstMpegVideoPacket *packet = &slice->packet;
+  DXVA_SliceInfo slice_info = { 0, };
+
+  g_assert (packet->offset >= 4);
+
+  slice_info.wHorizontalPosition = header->mb_column;
+  slice_info.wVerticalPosition = header->mb_row;
+  /* including start code 4 bytes */
+  slice_info.dwSliceBitsInBuffer = 8 * (packet->size + 4);
+  slice_info.dwSliceDataLocation = priv->bitstream_buffer.size ();
+  /* XXX: We don't have information about the number of MBs in this slice.
+   * Just store offset here, and actual number will be calculated later */
+  slice_info.wNumberMBsInSlice =
+      (header->mb_row * priv->width_in_mb) + header->mb_column;
+  slice_info.wQuantizerScaleCode = header->quantiser_scale_code;
+  slice_info.wMBbitOffset = header->header_size + 32;
+
+  priv->slice_list.push_back (slice_info);
+
+  size_t pos = priv->bitstream_buffer.size ();
+  priv->bitstream_buffer.resize (pos + packet->size + 4);
+  memcpy (&priv->bitstream_buffer0 + pos, packet->data + packet->offset - 4,
+      packet->size + 4);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_end_picture (GstMpeg2Decoder * decoder,
+    GstMpeg2Picture * picture)
+{
+  GstDxvaMpeg2Decoder *self = GST_DXVA_MPEG2_DECODER (decoder);
+  GstDxvaMpeg2DecoderPrivate *priv = self->priv;
+  GstDxvaMpeg2DecoderClass *klass = GST_DXVA_MPEG2_DECODER_GET_CLASS (self);
+  GstDxvaDecodingArgs args;
+  gboolean is_field =
+      picture->structure != GST_MPEG_VIDEO_PICTURE_STRUCTURE_FRAME;
+  guint mb_count = priv->width_in_mb * (priv->height_in_mb >> is_field);
+
+  if (priv->bitstream_buffer.empty ()) {
+    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
+    return GST_FLOW_ERROR;
+  }
+
+  memset (&args, 0, sizeof (GstDxvaDecodingArgs));
+
+  DXVA_SliceInfo *first = &priv->slice_list0;
+  for (size_t i = 0; i < priv->slice_list.size (); i++) {
+    DXVA_SliceInfo *slice = first + i;
+
+    /* Update the number of MBs per slice */
+    if (i == priv->slice_list.size () - 1) {
+      slice->wNumberMBsInSlice = mb_count - slice->wNumberMBsInSlice;
+    } else {
+      DXVA_SliceInfo *next = first + i + 1;
+      slice->wNumberMBsInSlice =
+          next->wNumberMBsInSlice - slice->wNumberMBsInSlice;
+    }
+  }
+
+  args.picture_params = &priv->pic_params;
+  args.picture_params_size = sizeof (DXVA_PictureParameters);
+  args.slice_control = &priv->slice_list0;
+  args.slice_control_size = sizeof (DXVA_SliceInfo) * priv->slice_list.size ();
+  args.bitstream = &priv->bitstream_buffer0;
+  args.bitstream_size = priv->bitstream_buffer.size ();
+  if (priv->submit_iq_data) {
+    args.inverse_quantization_matrix = &priv->iq_matrix;
+    args.inverse_quantization_matrix_size = sizeof (DXVA_QmatrixData);
+  }
+
+  g_assert (klass->end_picture);
+
+  return klass->end_picture (self, GST_CODEC_PICTURE (picture),
+      priv->ref_pics, &args);
+}
+
+static GstFlowReturn
+gst_dxva_mpeg2_decoder_output_picture (GstMpeg2Decoder * decoder,
+    GstVideoCodecFrame * frame, GstMpeg2Picture * picture)
+{
+  GstDxvaMpeg2Decoder *self = GST_DXVA_MPEG2_DECODER (decoder);
+  GstDxvaMpeg2DecoderPrivate *priv = self->priv;
+  GstDxvaMpeg2DecoderClass *klass = GST_DXVA_MPEG2_DECODER_GET_CLASS (self);
+
+  g_assert (klass->output_picture);
+
+  GST_LOG_OBJECT (self, "Outputting picture %p", picture);
+
+  return klass->output_picture (self, frame, GST_CODEC_PICTURE (picture),
+      picture->buffer_flags, priv->width, priv->height);
+}
+
+void
+gst_dxva_mpeg2_decoder_disable_postproc (GstDxvaMpeg2Decoder * decoder)
+{
+  g_return_if_fail (GST_IS_DXVA_MPEG2_DECODER (decoder));
+
+  decoder->priv->disable_postproc = TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvampeg2decoder.h Added

@@ -0,0 +1,106 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/dxva/dxva-prelude.h>
+#include <gst/dxva/gstdxvatypes.h>
+#include <gst/codecs/gstmpeg2decoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DXVA_MPEG2_DECODER            (gst_dxva_mpeg2_decoder_get_type())
+#define GST_DXVA_MPEG2_DECODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DXVA_MPEG2_DECODER,GstDxvaMpeg2Decoder))
+#define GST_DXVA_MPEG2_DECODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DXVA_MPEG2_DECODER,GstDxvaMpeg2DecoderClass))
+#define GST_DXVA_MPEG2_DECODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_DXVA_MPEG2_DECODER,GstDxvaMpeg2DecoderClass))
+#define GST_IS_DXVA_MPEG2_DECODER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DXVA_MPEG2_DECODER))
+#define GST_IS_DXVA_MPEG2_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DXVA_MPEG2_DECODER))
+
+typedef struct _GstDxvaMpeg2Decoder GstDxvaMpeg2Decoder;
+typedef struct _GstDxvaMpeg2DecoderClass GstDxvaMpeg2DecoderClass;
+typedef struct _GstDxvaMpeg2DecoderPrivate GstDxvaMpeg2DecoderPrivate;
+
+/**
+ * GstDxvaMpeg2Decoder:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaMpeg2Decoder
+{
+  GstMpeg2Decoder parent;
+
+  /*< private >*/
+  GstDxvaMpeg2DecoderPrivate *priv;
+};
+
+/**
+ * GstDxvaMpeg2DecoderClass:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaMpeg2DecoderClass
+{
+  GstMpeg2DecoderClass parent_class;
+
+  GstFlowReturn   (*configure)          (GstDxvaMpeg2Decoder * decoder,
+                                         GstVideoCodecState * input_state,
+                                         const GstVideoInfo * info,
+                                         gint crop_x,
+                                         gint crop_y,
+                                         gint coded_width,
+                                         gint coded_height,
+                                         gint max_dpb_size);
+
+  GstFlowReturn   (*new_picture)        (GstDxvaMpeg2Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  GstFlowReturn   (*duplicate_picture)  (GstDxvaMpeg2Decoder * decoder,
+                                         GstCodecPicture * src,
+                                         GstCodecPicture * dst);
+
+  guint8          (*get_picture_id)     (GstDxvaMpeg2Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  GstFlowReturn   (*start_picture)      (GstDxvaMpeg2Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         guint8 * picture_id);
+
+  GstFlowReturn   (*end_picture)        (GstDxvaMpeg2Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         GPtrArray * ref_pics,
+                                         const GstDxvaDecodingArgs * args);
+
+  GstFlowReturn   (*output_picture)     (GstDxvaMpeg2Decoder * decoder,
+                                         GstVideoCodecFrame * frame,
+                                         GstCodecPicture * picture,
+                                         GstVideoBufferFlags buffer_flags,
+                                         gint display_width,
+                                         gint display_height);
+};
+
+GST_DXVA_API
+GType gst_dxva_mpeg2_decoder_get_type (void);
+
+GST_DXVA_API
+void  gst_dxva_mpeg2_decoder_disable_postproc (GstDxvaMpeg2Decoder * decoder);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstDxvaMpeg2Decoder, gst_object_unref)
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvatypedef.h Added

@@ -0,0 +1,834 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#else
+typedef int INT;
+typedef unsigned int UINT;
+typedef unsigned int UINT32;
+typedef unsigned char UCHAR;
+typedef unsigned char BYTE;
+typedef char CHAR;
+typedef unsigned short UINT16;
+typedef unsigned short USHORT;
+typedef unsigned short WORD;
+typedef unsigned long ULONG;
+typedef unsigned long DWORD;
+typedef short SHORT;
+#endif
+
+G_BEGIN_DECLS
+
+#pragma pack(push, BeforeDXVApacking, 1)
+typedef struct _DXVA_PicEntry_H264
+{
+  union
+  {
+    struct
+    {
+      UCHAR Index7Bits:7;
+      UCHAR AssociatedFlag:1;
+    };
+    UCHAR bPicEntry;
+  };
+} DXVA_PicEntry_H264, *LPDXVA_PicEntry_H264;    /* 1 byte */
+
+typedef struct _DXVA_PicParams_H264
+{
+  USHORT wFrameWidthInMbsMinus1;
+  USHORT wFrameHeightInMbsMinus1;
+  DXVA_PicEntry_H264 CurrPic;   /* flag is bot field flag */
+  UCHAR num_ref_frames;
+
+  union
+  {
+    struct
+    {
+      USHORT field_pic_flag:1;
+      USHORT MbaffFrameFlag:1;
+      USHORT residual_colour_transform_flag:1;
+      USHORT sp_for_switch_flag:1;
+      USHORT chroma_format_idc:2;
+      USHORT RefPicFlag:1;
+      USHORT constrained_intra_pred_flag:1;
+
+      USHORT weighted_pred_flag:1;
+      USHORT weighted_bipred_idc:2;
+      USHORT MbsConsecutiveFlag:1;
+      USHORT frame_mbs_only_flag:1;
+      USHORT transform_8x8_mode_flag:1;
+      USHORT MinLumaBipredSize8x8Flag:1;
+      USHORT IntraPicFlag:1;
+    };
+    USHORT wBitFields;
+  };
+  UCHAR bit_depth_luma_minus8;
+  UCHAR bit_depth_chroma_minus8;
+
+  USHORT Reserved16Bits;
+  UINT StatusReportFeedbackNumber;
+
+  DXVA_PicEntry_H264 RefFrameList16;  /* flag LT */
+  INT CurrFieldOrderCnt2;
+  INT FieldOrderCntList162;
+
+  CHAR pic_init_qs_minus26;
+  CHAR chroma_qp_index_offset;  /* also used for QScb */
+  CHAR second_chroma_qp_index_offset;   /* also for QScr */
+  UCHAR ContinuationFlag;
+
+/* remainder for parsing */
+  CHAR pic_init_qp_minus26;
+  UCHAR num_ref_idx_l0_active_minus1;
+  UCHAR num_ref_idx_l1_active_minus1;
+  UCHAR Reserved8BitsA;
+
+  USHORT FrameNumList16;
+  UINT UsedForReferenceFlags;
+  USHORT NonExistingFrameFlags;
+  USHORT frame_num;
+
+  UCHAR log2_max_frame_num_minus4;
+  UCHAR pic_order_cnt_type;
+  UCHAR log2_max_pic_order_cnt_lsb_minus4;
+  UCHAR delta_pic_order_always_zero_flag;
+
+  UCHAR direct_8x8_inference_flag;
+  UCHAR entropy_coding_mode_flag;
+  UCHAR pic_order_present_flag;
+  UCHAR num_slice_groups_minus1;
+
+  UCHAR slice_group_map_type;
+  UCHAR deblocking_filter_control_present_flag;
+  UCHAR redundant_pic_cnt_present_flag;
+  UCHAR Reserved8BitsB;
+
+  USHORT slice_group_change_rate_minus1;
+
+  UCHAR SliceGroupMap810;     /* 4b/sgmu, Size BT.601 */
+
+} DXVA_PicParams_H264, *LPDXVA_PicParams_H264;
+
+typedef struct _DXVA_Qmatrix_H264
+{
+  UCHAR bScalingLists4x4616;
+  UCHAR bScalingLists8x8264;
+
+} DXVA_Qmatrix_H264, *LPDXVA_Qmatrix_H264;
+
+typedef struct _DXVA_Slice_H264_Short
+{
+  UINT BSNALunitDataLocation;   /* type 1..5 */
+  UINT SliceBytesInBuffer;      /* for off-host parse */
+  USHORT wBadSliceChopping;     /* for off-host parse */
+} DXVA_Slice_H264_Short, *LPDXVA_Slice_H264_Short;
+
+typedef struct _DXVA_PicEntry_HEVC
+{
+  union
+  {
+    struct
+    {
+      UCHAR Index7Bits:7;
+      UCHAR AssociatedFlag:1;
+    };
+    UCHAR bPicEntry;
+  };
+} DXVA_PicEntry_HEVC, *LPDXVA_PicEntry_HEVC;
+
+typedef struct _DXVA_PicParams_HEVC
+{
+  USHORT PicWidthInMinCbsY;
+  USHORT PicHeightInMinCbsY;
+  union
+  {
+    struct
+    {
+      USHORT chroma_format_idc:2;
+      USHORT separate_colour_plane_flag:1;
+      USHORT bit_depth_luma_minus8:3;
+      USHORT bit_depth_chroma_minus8:3;
+      USHORT log2_max_pic_order_cnt_lsb_minus4:4;
+      USHORT NoPicReorderingFlag:1;
+      USHORT NoBiPredFlag:1;
+      USHORT ReservedBits1:1;
+    };
+    USHORT wFormatAndSequenceInfoFlags;
+  };
+  DXVA_PicEntry_HEVC CurrPic;
+  UCHAR sps_max_dec_pic_buffering_minus1;
+  UCHAR log2_min_luma_coding_block_size_minus3;
+  UCHAR log2_diff_max_min_luma_coding_block_size;
+  UCHAR log2_min_transform_block_size_minus2;
+  UCHAR log2_diff_max_min_transform_block_size;
+  UCHAR max_transform_hierarchy_depth_inter;
+  UCHAR max_transform_hierarchy_depth_intra;
+  UCHAR num_short_term_ref_pic_sets;
+  UCHAR num_long_term_ref_pics_sps;
+  UCHAR num_ref_idx_l0_default_active_minus1;
+  UCHAR num_ref_idx_l1_default_active_minus1;
+  CHAR init_qp_minus26;
+  UCHAR ucNumDeltaPocsOfRefRpsIdx;
+  USHORT wNumBitsForShortTermRPSInSlice;
+  USHORT ReservedBits2;
+
+  union
+  {
+    struct
+    {
+      UINT32 scaling_list_enabled_flag:1;
+      UINT32 amp_enabled_flag:1;
+      UINT32 sample_adaptive_offset_enabled_flag:1;
+      UINT32 pcm_enabled_flag:1;
+      UINT32 pcm_sample_bit_depth_luma_minus1:4;
+      UINT32 pcm_sample_bit_depth_chroma_minus1:4;
+      UINT32 log2_min_pcm_luma_coding_block_size_minus3:2;
+      UINT32 log2_diff_max_min_pcm_luma_coding_block_size:2;
+      UINT32 pcm_loop_filter_disabled_flag:1;
+      UINT32 long_term_ref_pics_present_flag:1;
+      UINT32 sps_temporal_mvp_enabled_flag:1;
+      UINT32 strong_intra_smoothing_enabled_flag:1;
+      UINT32 dependent_slice_segments_enabled_flag:1;
+      UINT32 output_flag_present_flag:1;
+      UINT32 num_extra_slice_header_bits:3;
+      UINT32 sign_data_hiding_enabled_flag:1;
+      UINT32 cabac_init_present_flag:1;
+      UINT32 ReservedBits3:5;
+    };
+    UINT32 dwCodingParamToolFlags;
+  };
+
+  union
+  {
+    struct
+    {
+      UINT32 constrained_intra_pred_flag:1;
+      UINT32 transform_skip_enabled_flag:1;
+      UINT32 cu_qp_delta_enabled_flag:1;
+      UINT32 pps_slice_chroma_qp_offsets_present_flag:1;
+      UINT32 weighted_pred_flag:1;
+      UINT32 weighted_bipred_flag:1;
+      UINT32 transquant_bypass_enabled_flag:1;
+      UINT32 tiles_enabled_flag:1;
+      UINT32 entropy_coding_sync_enabled_flag:1;
+      UINT32 uniform_spacing_flag:1;
+      UINT32 loop_filter_across_tiles_enabled_flag:1;
+      UINT32 pps_loop_filter_across_slices_enabled_flag:1;
+      UINT32 deblocking_filter_override_enabled_flag:1;
+      UINT32 pps_deblocking_filter_disabled_flag:1;
+      UINT32 lists_modification_present_flag:1;
+      UINT32 slice_segment_header_extension_present_flag:1;
+      UINT32 IrapPicFlag:1;
+      UINT32 IdrPicFlag:1;
+      UINT32 IntraPicFlag:1;
+      UINT32 ReservedBits4:13;
+    };
+    UINT32 dwCodingSettingPicturePropertyFlags;
+  };
+  CHAR pps_cb_qp_offset;
+  CHAR pps_cr_qp_offset;
+  UCHAR num_tile_columns_minus1;
+  UCHAR num_tile_rows_minus1;
+  USHORT column_width_minus119;
+  USHORT row_height_minus121;
+  UCHAR diff_cu_qp_delta_depth;
+  CHAR pps_beta_offset_div2;
+  CHAR pps_tc_offset_div2;
+  UCHAR log2_parallel_merge_level_minus2;
+  INT CurrPicOrderCntVal;
+  DXVA_PicEntry_HEVC RefPicList15;
+  UCHAR ReservedBits5;
+  INT PicOrderCntValList15;
+  UCHAR RefPicSetStCurrBefore8;
+  UCHAR RefPicSetStCurrAfter8;
+  UCHAR RefPicSetLtCurr8;
+  USHORT ReservedBits6;
+  USHORT ReservedBits7;
+  UINT StatusReportFeedbackNumber;
+} DXVA_PicParams_HEVC, *LPDXVA_PicParams_HEVC;
+
+typedef struct _DXVA_Qmatrix_HEVC
+{
+  UCHAR ucScalingLists0616;
+  UCHAR ucScalingLists1664;
+  UCHAR ucScalingLists2664;
+  UCHAR ucScalingLists3264;
+  UCHAR ucScalingListDCCoefSizeID26;
+  UCHAR ucScalingListDCCoefSizeID32;
+} DXVA_Qmatrix_HEVC, *LPDXVA_Qmatrix_HEVC;
+
+typedef struct _DXVA_Slice_HEVC_Short
+{
+  UINT BSNALunitDataLocation;
+  UINT SliceBytesInBuffer;
+  USHORT wBadSliceChopping;
+} DXVA_Slice_HEVC_Short, *LPDXVA_Slice_HEVC_Short;
+
+#define DXVA_USUAL_BLOCK_WIDTH   8
+#define DXVA_USUAL_BLOCK_HEIGHT  8
+#define DXVA_USUAL_BLOCK_SIZE   (DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT)
+
+typedef struct _DXVA_PictureParameters
+{
+
+  WORD wDecodedPictureIndex;
+  WORD wDeblockedPictureIndex;
+
+  WORD wForwardRefPictureIndex;
+  WORD wBackwardRefPictureIndex;
+
+  WORD wPicWidthInMBminus1;
+  WORD wPicHeightInMBminus1;
+
+  BYTE bMacroblockWidthMinus1;
+  BYTE bMacroblockHeightMinus1;
+
+  BYTE bBlockWidthMinus1;
+  BYTE bBlockHeightMinus1;
+
+  BYTE bBPPminus1;
+
+  BYTE bPicStructure;
+  BYTE bSecondField;
+  BYTE bPicIntra;
+  BYTE bPicBackwardPrediction;
+
+  BYTE bBidirectionalAveragingMode;
+  BYTE bMVprecisionAndChromaRelation;
+  BYTE bChromaFormat;
+
+  BYTE bPicScanFixed;
+  BYTE bPicScanMethod;
+  BYTE bPicReadbackRequests;
+
+  BYTE bRcontrol;
+  BYTE bPicSpatialResid8;
+  BYTE bPicOverflowBlocks;
+  BYTE bPicExtrapolation;
+
+  BYTE bPicDeblocked;
+  BYTE bPicDeblockConfined;
+  BYTE bPic4MVallowed;
+  BYTE bPicOBMC;
+  BYTE bPicBinPB;
+  BYTE bMV_RPS;
+
+  BYTE bReservedBits;
+
+  WORD wBitstreamFcodes;
+  WORD wBitstreamPCEelements;
+  BYTE bBitstreamConcealmentNeed;
+  BYTE bBitstreamConcealmentMethod;
+
+} DXVA_PictureParameters, *LPDXVA_PictureParameters;
+
+typedef struct _DXVA_QmatrixData
+{
+  BYTE bNewQmatrix4;          /* intra Y, inter Y, intra chroma, inter chroma */
+  WORD Qmatrix4DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT;
+} DXVA_QmatrixData, *LPDXVA_QmatrixData;
+
+typedef struct _DXVA_SliceInfo
+{
+  WORD wHorizontalPosition;
+  WORD wVerticalPosition;
+  DWORD dwSliceBitsInBuffer;
+  DWORD dwSliceDataLocation;
+  BYTE bStartCodeBitOffset;
+  BYTE bReservedBits;
+  WORD wMBbitOffset;
+  WORD wNumberMBsInSlice;
+  WORD wQuantizerScaleCode;
+  WORD wBadSliceChopping;
+} DXVA_SliceInfo, *LPDXVA_SliceInfo;
+
+typedef struct _DXVA_PicEntry_VPx
+{
+  union
+  {
+    struct
+    {
+      UCHAR Index7Bits:7;
+      UCHAR AssociatedFlag:1;
+    };
+    UCHAR bPicEntry;
+  };
+} DXVA_PicEntry_VPx, *LPDXVA_PicEntry_VPx;
+
+typedef struct _segmentation_VP8
+{
+  union
+  {
+    struct
+    {
+      UCHAR segmentation_enabled:1;
+      UCHAR update_mb_segmentation_map:1;
+      UCHAR update_mb_segmentation_data:1;
+      UCHAR mb_segement_abs_delta:1;
+      UCHAR ReservedSegmentFlags4Bits:4;
+    };
+    UCHAR wSegmentFlags;
+  };
+  CHAR segment_feature_data24;
+  UCHAR mb_segment_tree_probs3;
+} DXVA_segmentation_VP8;
+
+/* VP8 picture parameters structure */
+typedef struct _DXVA_PicParams_VP8
+{
+  UINT first_part_size;
+  UINT width;
+  UINT height;
+  DXVA_PicEntry_VPx CurrPic;
+  union
+  {
+    struct
+    {
+      UCHAR frame_type:1;
+      UCHAR version:3;
+      UCHAR show_frame:1;
+      UCHAR clamp_type:1;
+      UCHAR ReservedFrameTag3Bits:2;
+    };
+    UCHAR wFrameTagFlags;
+  };
+  DXVA_segmentation_VP8 stVP8Segments;
+  UCHAR filter_type;
+  UCHAR filter_level;
+  UCHAR sharpness_level;
+  UCHAR mode_ref_lf_delta_enabled;
+  UCHAR mode_ref_lf_delta_update;
+  CHAR ref_lf_deltas4;
+  CHAR mode_lf_deltas4;
+  UCHAR log2_nbr_of_dct_partitions;
+  UCHAR base_qindex;
+  CHAR y1dc_delta_q;
+  CHAR y2dc_delta_q;
+  CHAR y2ac_delta_q;
+  CHAR uvdc_delta_q;
+  CHAR uvac_delta_q;
+  DXVA_PicEntry_VPx alt_fb_idx;
+  DXVA_PicEntry_VPx gld_fb_idx;
+  DXVA_PicEntry_VPx lst_fb_idx;
+  UCHAR ref_frame_sign_bias_golden;
+  UCHAR ref_frame_sign_bias_altref;
+  UCHAR refresh_entropy_probs;
+  UCHAR vp8_coef_update_probs48311;
+  UCHAR mb_no_coeff_skip;
+  UCHAR prob_skip_false;
+  UCHAR prob_intra;
+  UCHAR prob_last;
+  UCHAR prob_golden;
+  UCHAR intra_16x16_prob4;
+  UCHAR intra_chroma_prob3;
+  UCHAR vp8_mv_update_probs219;
+  USHORT ReservedBits1;
+  USHORT ReservedBits2;
+  USHORT ReservedBits3;
+  UINT StatusReportFeedbackNumber;
+} DXVA_PicParams_VP8, *LPDXVA_PicParams_VP8;
+
+typedef struct _DXVA_Slice_VPx_Short
+{
+  UINT BSNALunitDataLocation;
+  UINT SliceBytesInBuffer;
+  USHORT wBadSliceChopping;
+} DXVA_Slice_VPx_Short, *LPDXVA_Slice_VPx_Short;
+
+typedef struct _segmentation_VP9
+{
+  union
+  {
+    struct
+    {
+      UCHAR enabled:1;
+      UCHAR update_map:1;
+      UCHAR temporal_update:1;
+      UCHAR abs_delta:1;
+      UCHAR ReservedSegmentFlags4Bits:4;
+    };
+    UCHAR wSegmentInfoFlags;
+  };
+  UCHAR tree_probs7;
+  UCHAR pred_probs3;
+  SHORT feature_data84;
+  UCHAR feature_mask8;
+} DXVA_segmentation_VP9;
+
+typedef struct _DXVA_PicParams_VP9
+{
+  DXVA_PicEntry_VPx CurrPic;
+  UCHAR profile;
+  union
+  {
+    struct
+    {
+      USHORT frame_type:1;
+      USHORT show_frame:1;
+      USHORT error_resilient_mode:1;
+      USHORT subsampling_x:1;
+      USHORT subsampling_y:1;
+      USHORT extra_plane:1;
+      USHORT refresh_frame_context:1;
+      USHORT frame_parallel_decoding_mode:1;
+      USHORT intra_only:1;
+      USHORT frame_context_idx:2;
+      USHORT reset_frame_context:2;
+      USHORT allow_high_precision_mv:1;
+      USHORT ReservedFormatInfo2Bits:2;
+    };
+    USHORT wFormatAndPictureInfoFlags;
+  };
+  UINT width;
+  UINT height;
+  UCHAR BitDepthMinus8Luma;
+  UCHAR BitDepthMinus8Chroma;
+  UCHAR interp_filter;
+  UCHAR Reserved8Bits;
+  DXVA_PicEntry_VPx ref_frame_map8;
+  UINT ref_frame_coded_width8;
+  UINT ref_frame_coded_height8;
+  DXVA_PicEntry_VPx frame_refs3;
+  CHAR ref_frame_sign_bias4;
+  CHAR filter_level;
+  CHAR sharpness_level;
+  union
+  {
+    struct
+    {
+      UCHAR mode_ref_delta_enabled:1;
+      UCHAR mode_ref_delta_update:1;
+      UCHAR use_prev_in_find_mv_refs:1;
+      UCHAR ReservedControlInfo5Bits:5;
+    };
+    UCHAR wControlInfoFlags;
+  };
+  CHAR ref_deltas4;
+  CHAR mode_deltas2;
+  SHORT base_qindex;
+  CHAR y_dc_delta_q;
+  CHAR uv_dc_delta_q;
+  CHAR uv_ac_delta_q;
+  DXVA_segmentation_VP9 stVP9Segments;
+  UCHAR log2_tile_cols;
+  UCHAR log2_tile_rows;
+  USHORT uncompressed_header_size_byte_aligned;
+  USHORT first_partition_size;
+  USHORT Reserved16Bits;
+  UINT Reserved32Bits;
+  UINT StatusReportFeedbackNumber;
+} DXVA_PicParams_VP9, *LPDXVA_PicParams_VP9;
+
+typedef struct _DXVA_PicEntry_AV1
+{
+
+  UINT width;
+  UINT height;
+
+  // Global motion parameters
+  INT wmmat6;
+  union
+  {
+    struct
+    {
+      UCHAR wminvalid:1;
+      UCHAR wmtype:2;
+      UCHAR Reserved:5;
+    };
+    UCHAR GlobalMotionFlags;
+  };
+
+  UCHAR Index;
+  UINT16 Reserved16Bits;
+
+} DXVA_PicEntry_AV1, *LPDXVA_PicEntry_AV1;
+
+typedef struct _DXVA_PicParams_AV1
+{
+  UINT width;
+  UINT height;
+
+  UINT max_width;
+  UINT max_height;
+
+  UCHAR CurrPicTextureIndex;
+  UCHAR superres_denom;
+  UCHAR bitdepth;
+  UCHAR seq_profile;
+
+  // Tiles:
+  struct
+  {
+    UCHAR cols;
+    UCHAR rows;
+    USHORT context_update_id;
+    USHORT widths64;
+    USHORT heights64;
+  } tiles;
+
+  // Coding Tools
+  union
+  {
+    struct
+    {
+      UINT use_128x128_superblock:1;
+      UINT intra_edge_filter:1;
+      UINT interintra_compound:1;
+      UINT masked_compound:1;
+      UINT warped_motion:1;
+      UINT dual_filter:1;
+      UINT jnt_comp:1;
+      UINT screen_content_tools:1;
+      UINT integer_mv:1;
+      UINT cdef:1;
+      UINT restoration:1;
+      UINT film_grain:1;
+      UINT intrabc:1;
+      UINT high_precision_mv:1;
+      UINT switchable_motion_mode:1;
+      UINT filter_intra:1;
+      UINT disable_frame_end_update_cdf:1;
+      UINT disable_cdf_update:1;
+      UINT reference_mode:1;
+      UINT skip_mode:1;
+      UINT reduced_tx_set:1;
+      UINT superres:1;
+      UINT tx_mode:2;
+      UINT use_ref_frame_mvs:1;
+      UINT enable_ref_frame_mvs:1;
+      UINT reference_frame_update:1;
+      UINT Reserved:5;
+    };
+    UINT32 CodingParamToolFlags;
+  } coding;
+
+  // Format & Picture Info flags
+  union
+  {
+    struct
+    {
+      UCHAR frame_type:2;
+      UCHAR show_frame:1;
+      UCHAR showable_frame:1;
+      UCHAR subsampling_x:1;
+      UCHAR subsampling_y:1;
+      UCHAR mono_chrome:1;
+      UCHAR Reserved:1;
+    };
+    UCHAR FormatAndPictureInfoFlags;
+  } format;
+
+  // References
+  UCHAR primary_ref_frame;
+  UCHAR order_hint;
+  UCHAR order_hint_bits;
+
+  DXVA_PicEntry_AV1 frame_refs7;
+  UCHAR RefFrameMapTextureIndex8;
+
+  // Loop filter parameters
+  struct
+  {
+    UCHAR filter_level2;
+    UCHAR filter_level_u;
+    UCHAR filter_level_v;
+
+    UCHAR sharpness_level;
+    union
+    {
+      struct
+      {
+        UCHAR mode_ref_delta_enabled:1;
+        UCHAR mode_ref_delta_update:1;
+        UCHAR delta_lf_multi:1;
+        UCHAR delta_lf_present:1;
+        UCHAR Reserved:4;
+      };
+      UCHAR ControlFlags;
+    };
+    CHAR ref_deltas8;
+    CHAR mode_deltas2;
+    UCHAR delta_lf_res;
+    UCHAR frame_restoration_type3;
+    USHORT log2_restoration_unit_size3;
+    UINT16 Reserved16Bits;
+  } loop_filter;
+
+  // Quantization
+  struct
+  {
+    union
+    {
+      struct
+      {
+        UCHAR delta_q_present:1;
+        UCHAR delta_q_res:2;
+        UCHAR Reserved:5;
+      };
+      UCHAR ControlFlags;
+    };
+
+    UCHAR base_qindex;
+    CHAR y_dc_delta_q;
+    CHAR u_dc_delta_q;
+    CHAR v_dc_delta_q;
+    CHAR u_ac_delta_q;
+    CHAR v_ac_delta_q;
+    // using_qmatrix:
+    UCHAR qm_y;
+    UCHAR qm_u;
+    UCHAR qm_v;
+    UINT16 Reserved16Bits;
+  } quantization;
+
+  // Cdef parameters
+  struct
+  {
+    union
+    {
+      struct
+      {
+        UCHAR damping:2;
+        UCHAR bits:2;
+        UCHAR Reserved:4;
+      };
+      UCHAR ControlFlags;
+    };
+
+    union
+    {
+      struct
+      {
+        UCHAR primary:6;
+        UCHAR secondary:2;
+      };
+      UCHAR combined;
+    } y_strengths8;
+
+    union
+    {
+      struct
+      {
+        UCHAR primary:6;
+        UCHAR secondary:2;
+      };
+      UCHAR combined;
+    } uv_strengths8;
+
+  } cdef;
+
+  UCHAR interp_filter;
+
+  // Segmentation
+  struct
+  {
+    union
+    {
+      struct
+      {
+        UCHAR enabled:1;
+        UCHAR update_map:1;
+        UCHAR update_data:1;
+        UCHAR temporal_update:1;
+        UCHAR Reserved:4;
+      };
+      UCHAR ControlFlags;
+    };
+    UCHAR Reserved24Bits3;
+
+    union
+    {
+      struct
+      {
+        UCHAR alt_q:1;
+        UCHAR alt_lf_y_v:1;
+        UCHAR alt_lf_y_h:1;
+        UCHAR alt_lf_u:1;
+        UCHAR alt_lf_v:1;
+        UCHAR ref_frame:1;
+        UCHAR skip:1;
+        UCHAR globalmv:1;
+      };
+      UCHAR mask;
+    } feature_mask8;
+
+    SHORT feature_data88;
+
+  } segmentation;
+
+  struct
+  {
+    union
+    {
+      struct
+      {
+        USHORT apply_grain:1;
+        USHORT scaling_shift_minus8:2;
+        USHORT chroma_scaling_from_luma:1;
+        USHORT ar_coeff_lag:2;
+        USHORT ar_coeff_shift_minus6:2;
+        USHORT grain_scale_shift:2;
+        USHORT overlap_flag:1;
+        USHORT clip_to_restricted_range:1;
+        USHORT matrix_coeff_is_identity:1;
+        USHORT Reserved:3;
+      };
+      USHORT ControlFlags;
+    };
+
+    USHORT grain_seed;
+    UCHAR scaling_points_y142;
+    UCHAR num_y_points;
+    UCHAR scaling_points_cb102;
+    UCHAR num_cb_points;
+    UCHAR scaling_points_cr102;
+    UCHAR num_cr_points;
+    UCHAR ar_coeffs_y24;
+    UCHAR ar_coeffs_cb25;
+    UCHAR ar_coeffs_cr25;
+    UCHAR cb_mult;
+    UCHAR cb_luma_mult;
+    UCHAR cr_mult;
+    UCHAR cr_luma_mult;
+    UCHAR Reserved8Bits;
+    SHORT cb_offset;
+    SHORT cr_offset;
+  } film_grain;
+
+  UINT Reserved32Bits;
+  UINT StatusReportFeedbackNumber;
+} DXVA_PicParams_AV1, *LPDXVA_PicParams_AV1;
+
+typedef struct _DXVA_Tile_AV1
+{
+  UINT DataOffset;
+  UINT DataSize;
+  USHORT row;
+  USHORT column;
+  UINT16 Reserved16Bits;
+  UCHAR anchor_frame;
+  UCHAR Reserved8Bits;
+} DXVA_Tile_AV1, *LPDXVA_Tile_AV1;
+
+#pragma pack(pop, BeforeDXVApacking)
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvatypes.h Added

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvautils.cpp Added

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvautils.h Added

@@ -0,0 +1,31 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/dxva/dxva-prelude.h>
+#include <gst/dxva/gstdxvatypes.h>
+
+G_BEGIN_DECLS
+
+GST_DXVA_API
+const gchar * gst_dxva_codec_to_string (GstDxvaCodec codec);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvavp8decoder.cpp Added

@@ -0,0 +1,407 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdxvavp8decoder.h"
+#include <string.h>
+#include <vector>
+
+#include "gstdxvatypedef.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_dxva_vp8_decoder_debug);
+#define GST_CAT_DEFAULT gst_dxva_vp8_decoder_debug
+
+/* *INDENT-OFF* */
+struct _GstDxvaVp8DecoderPrivate
+{
+  DXVA_PicParams_VP8 pic_params;
+  DXVA_Slice_VPx_Short slice;
+
+  std::vector<guint8> bitstream_buffer;
+  GPtrArray *ref_pics = nullptr;
+
+  gint width = 0;
+  gint height = 0;
+};
+/* *INDENT-ON* */
+
+static void gst_dxva_vp8_decoder_finalize (GObject * object);
+
+static gboolean gst_dxva_vp8_decoder_start (GstVideoDecoder * decoder);
+
+static GstFlowReturn gst_dxva_vp8_decoder_new_sequence (GstVp8Decoder * decoder,
+    const GstVp8FrameHdr * frame_hdr, gint max_dpb_size);
+static GstFlowReturn gst_dxva_vp8_decoder_new_picture (GstVp8Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp8Picture * picture);
+static GstFlowReturn
+gst_dxva_vp8_decoder_decode_picture (GstVp8Decoder * decoder,
+    GstVp8Picture * picture, GstVp8Parser * parser);
+static GstFlowReturn gst_dxva_vp8_decoder_end_picture (GstVp8Decoder * decoder,
+    GstVp8Picture * picture);
+static GstFlowReturn gst_dxva_vp8_decoder_output_picture (GstVp8Decoder *
+    decoder, GstVideoCodecFrame * frame, GstVp8Picture * picture);
+
+#define gst_dxva_vp8_decoder_parent_class parent_class
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstDxvaVp8Decoder,
+    gst_dxva_vp8_decoder, GST_TYPE_VP8_DECODER,
+    GST_DEBUG_CATEGORY_INIT (gst_dxva_vp8_decoder_debug, "dxvavp8decoder",
+        0, "dxvavp8decoder"));
+
+static void
+gst_dxva_vp8_decoder_class_init (GstDxvaVp8DecoderClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstVp8DecoderClass *vp8decoder_class = GST_VP8_DECODER_CLASS (klass);
+
+  object_class->finalize = gst_dxva_vp8_decoder_finalize;
+
+  decoder_class->start = GST_DEBUG_FUNCPTR (gst_dxva_vp8_decoder_start);
+
+  vp8decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_dxva_vp8_decoder_new_sequence);
+  vp8decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_vp8_decoder_new_picture);
+  vp8decoder_class->decode_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_vp8_decoder_decode_picture);
+  vp8decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_vp8_decoder_end_picture);
+  vp8decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_vp8_decoder_output_picture);
+}
+
+static void
+gst_dxva_vp8_decoder_init (GstDxvaVp8Decoder * self)
+{
+  self->priv = new GstDxvaVp8DecoderPrivate ();
+  self->priv->ref_pics = g_ptr_array_new ();
+}
+
+static void
+gst_dxva_vp8_decoder_finalize (GObject * object)
+{
+  GstDxvaVp8Decoder *self = GST_DXVA_VP8_DECODER (object);
+  GstDxvaVp8DecoderPrivate *priv = self->priv;
+
+  g_ptr_array_unref (priv->ref_pics);
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_dxva_vp8_decoder_reset (GstDxvaVp8Decoder * self)
+{
+  GstDxvaVp8DecoderPrivate *priv = self->priv;
+
+  priv->width = 0;
+  priv->height = 0;
+}
+
+static gboolean
+gst_dxva_vp8_decoder_start (GstVideoDecoder * decoder)
+{
+  GstDxvaVp8Decoder *self = GST_DXVA_VP8_DECODER (decoder);
+
+  gst_dxva_vp8_decoder_reset (self);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->start (decoder);
+}
+
+static GstFlowReturn
+gst_dxva_vp8_decoder_new_sequence (GstVp8Decoder * decoder,
+    const GstVp8FrameHdr * frame_hdr, gint max_dpb_size)
+{
+  GstDxvaVp8Decoder *self = GST_DXVA_VP8_DECODER (decoder);
+  GstDxvaVp8DecoderPrivate *priv = self->priv;
+  GstDxvaVp8DecoderClass *klass = GST_DXVA_VP8_DECODER_GET_CLASS (self);
+  GstVideoInfo info;
+  GstFlowReturn ret;
+
+  GST_LOG_OBJECT (self, "new sequence");
+
+  priv->width = frame_hdr->width;
+  priv->height = frame_hdr->height;
+
+  gst_video_info_set_format (&info,
+      GST_VIDEO_FORMAT_NV12, frame_hdr->width, frame_hdr->height);
+
+  g_assert (klass->configure);
+
+  ret = klass->configure (self, decoder->input_state, &info, 0, 0,
+      frame_hdr->width, frame_hdr->height, max_dpb_size);
+
+  if (ret == GST_FLOW_OK &&
+      !gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+    GST_WARNING_OBJECT (self, "Couldn't negotiate with new sequence");
+    ret = GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_dxva_vp8_decoder_new_picture (GstVp8Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp8Picture * picture)
+{
+  GstDxvaVp8Decoder *self = GST_DXVA_VP8_DECODER (decoder);
+  GstDxvaVp8DecoderClass *klass = GST_DXVA_VP8_DECODER_GET_CLASS (self);
+
+  g_assert (klass->new_picture);
+
+  return klass->new_picture (self, GST_CODEC_PICTURE (picture));
+}
+
+static void
+gst_dxva_vp8_decoder_copy_frame_params (GstDxvaVp8Decoder * self,
+    GstVp8Picture * picture, GstVp8Parser * parser, DXVA_PicParams_VP8 * params)
+{
+  const GstVp8FrameHdr *frame_hdr = &picture->frame_hdr;
+  gint i;
+
+  /* 0: keyframe, 1: inter */
+  params->frame_type = !frame_hdr->key_frame;
+  params->version = frame_hdr->version;
+  params->show_frame = frame_hdr->show_frame;
+  params->clamp_type = frame_hdr->clamping_type;
+
+  params->filter_type = frame_hdr->filter_type;
+  params->filter_level = frame_hdr->loop_filter_level;
+  params->sharpness_level = frame_hdr->sharpness_level;
+  params->mode_ref_lf_delta_enabled =
+      parser->mb_lf_adjust.loop_filter_adj_enable;
+  params->mode_ref_lf_delta_update =
+      parser->mb_lf_adjust.mode_ref_lf_delta_update;
+  for (i = 0; i < 4; i++) {
+    params->ref_lf_deltasi = parser->mb_lf_adjust.ref_frame_deltai;
+    params->mode_lf_deltasi = parser->mb_lf_adjust.mb_mode_deltai;
+  }
+  params->log2_nbr_of_dct_partitions = frame_hdr->log2_nbr_of_dct_partitions;
+  params->base_qindex = frame_hdr->quant_indices.y_ac_qi;
+  params->y1dc_delta_q = frame_hdr->quant_indices.y_dc_delta;
+  params->y2dc_delta_q = frame_hdr->quant_indices.y2_dc_delta;
+  params->y2ac_delta_q = frame_hdr->quant_indices.y2_ac_delta;
+  params->uvdc_delta_q = frame_hdr->quant_indices.uv_dc_delta;
+  params->uvac_delta_q = frame_hdr->quant_indices.uv_ac_delta;
+
+  params->ref_frame_sign_bias_golden = frame_hdr->sign_bias_golden;
+  params->ref_frame_sign_bias_altref = frame_hdr->sign_bias_alternate;
+
+  params->refresh_entropy_probs = frame_hdr->refresh_entropy_probs;
+
+  memcpy (params->vp8_coef_update_probs, frame_hdr->token_probs.prob,
+      sizeof (frame_hdr->token_probs.prob));
+
+  params->mb_no_coeff_skip = frame_hdr->mb_no_skip_coeff;
+  params->prob_skip_false = frame_hdr->prob_skip_false;
+  params->prob_intra = frame_hdr->prob_intra;
+  params->prob_last = frame_hdr->prob_last;
+  params->prob_golden = frame_hdr->prob_gf;
+
+  memcpy (params->intra_16x16_prob, frame_hdr->mode_probs.y_prob,
+      sizeof (frame_hdr->mode_probs.y_prob));
+  memcpy (params->intra_chroma_prob, frame_hdr->mode_probs.uv_prob,
+      sizeof (frame_hdr->mode_probs.uv_prob));
+  memcpy (params->vp8_mv_update_probs, frame_hdr->mv_probs.prob,
+      sizeof (frame_hdr->mv_probs.prob));
+}
+
+static gboolean
+gst_dxva_vp8_decoder_copy_reference_frames (GstDxvaVp8Decoder * self,
+    DXVA_PicParams_VP8 * params)
+{
+  GstVp8Decoder *decoder = GST_VP8_DECODER (self);
+  GstDxvaVp8DecoderPrivate *priv = self->priv;
+  GstDxvaVp8DecoderClass *klass = GST_DXVA_VP8_DECODER_GET_CLASS (self);
+  guint8 id;
+
+  params->alt_fb_idx.bPicEntry = 0xff;
+  if (decoder->alt_ref_picture) {
+    id = klass->get_picture_id (self,
+        GST_CODEC_PICTURE (decoder->alt_ref_picture));
+    if (id != 0xff) {
+      params->alt_fb_idx.Index7Bits = id;
+      g_ptr_array_add (priv->ref_pics, decoder->alt_ref_picture);
+    }
+  }
+
+  params->gld_fb_idx.bPicEntry = 0xff;
+  if (decoder->golden_ref_picture) {
+    id = klass->get_picture_id (self,
+        GST_CODEC_PICTURE (decoder->golden_ref_picture));
+
+    if (id != 0xff) {
+      params->gld_fb_idx.Index7Bits = id;
+      g_ptr_array_add (priv->ref_pics, decoder->golden_ref_picture);
+    }
+  }
+
+  params->lst_fb_idx.bPicEntry = 0xff;
+  if (decoder->last_picture) {
+    id = klass->get_picture_id (self,
+        GST_CODEC_PICTURE (decoder->last_picture));
+
+    if (id != 0xff) {
+      params->lst_fb_idx.Index7Bits = id;
+      g_ptr_array_add (priv->ref_pics, decoder->last_picture);
+    }
+  }
+
+  return TRUE;
+}
+
+static void
+gst_dxva_vp8_decoder_copy_segmentation_params (GstDxvaVp8Decoder * self,
+    GstVp8Parser * parser, DXVA_PicParams_VP8 * params)
+{
+  const GstVp8Segmentation *seg = &parser->segmentation;
+  gint i;
+
+  params->stVP8Segments.segmentation_enabled = seg->segmentation_enabled;
+  params->stVP8Segments.update_mb_segmentation_map =
+      seg->update_mb_segmentation_map;
+  params->stVP8Segments.update_mb_segmentation_data =
+      seg->update_segment_feature_data;
+  params->stVP8Segments.mb_segement_abs_delta = seg->segment_feature_mode;
+
+  for (i = 0; i < 4; i++) {
+    params->stVP8Segments.segment_feature_data0i =
+        seg->quantizer_update_valuei;
+  }
+
+  for (i = 0; i < 4; i++) {
+    params->stVP8Segments.segment_feature_data1i = seg->lf_update_valuei;
+  }
+
+  for (i = 0; i < 3; i++) {
+    params->stVP8Segments.mb_segment_tree_probsi = seg->segment_probi;
+  }
+}
+
+static GstFlowReturn
+gst_dxva_vp8_decoder_decode_picture (GstVp8Decoder * decoder,
+    GstVp8Picture * picture, GstVp8Parser * parser)
+{
+  GstDxvaVp8Decoder *self = GST_DXVA_VP8_DECODER (decoder);
+  GstDxvaVp8DecoderPrivate *priv = self->priv;
+  GstDxvaVp8DecoderClass *klass = GST_DXVA_VP8_DECODER_GET_CLASS (self);
+  DXVA_PicParams_VP8 *pic_params = &priv->pic_params;
+  DXVA_Slice_VPx_Short *slice = &priv->slice;
+  const GstVp8FrameHdr *frame_hdr = &picture->frame_hdr;
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
+  GstFlowReturn ret;
+  guint8 picture_id;
+
+  g_assert (klass->start_picture);
+  g_assert (klass->get_picture_id);
+
+  ret = klass->start_picture (self, codec_picture, &picture_id);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  priv->bitstream_buffer.resize (0);
+  g_ptr_array_set_size (priv->ref_pics, 0);
+
+  memset (pic_params, 0, sizeof (DXVA_PicParams_VP8));
+
+  pic_params->first_part_size = frame_hdr->first_part_size;
+  pic_params->width = priv->width;
+  pic_params->height = priv->height;
+  pic_params->CurrPic.Index7Bits = picture_id;
+  pic_params->StatusReportFeedbackNumber = 1;
+
+  if (!gst_dxva_vp8_decoder_copy_reference_frames (self, pic_params))
+    return GST_FLOW_ERROR;
+
+  gst_dxva_vp8_decoder_copy_frame_params (self, picture, parser, pic_params);
+  gst_dxva_vp8_decoder_copy_segmentation_params (self, parser, pic_params);
+
+  priv->bitstream_buffer.resize (picture->size);
+  memcpy (&priv->bitstream_buffer0, picture->data, picture->size);
+
+  slice->BSNALunitDataLocation = 0;
+  slice->SliceBytesInBuffer = priv->bitstream_buffer.size ();
+  slice->wBadSliceChopping = 0;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_dxva_vp8_decoder_end_picture (GstVp8Decoder * decoder,
+    GstVp8Picture * picture)
+{
+  GstDxvaVp8Decoder *self = GST_DXVA_VP8_DECODER (decoder);
+  GstDxvaVp8DecoderPrivate *priv = self->priv;
+  GstDxvaVp8DecoderClass *klass = GST_DXVA_VP8_DECODER_GET_CLASS (self);
+  size_t bitstream_buffer_size;
+  size_t bitstream_pos;
+  GstDxvaDecodingArgs args;
+
+  if (priv->bitstream_buffer.empty ()) {
+    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
+    return GST_FLOW_ERROR;
+  }
+
+  memset (&args, 0, sizeof (GstDxvaDecodingArgs));
+
+  bitstream_pos = priv->bitstream_buffer.size ();
+  bitstream_buffer_size = GST_ROUND_UP_128 (bitstream_pos);
+
+  if (bitstream_buffer_size > bitstream_pos) {
+    size_t padding = bitstream_buffer_size - bitstream_pos;
+
+    /* As per DXVA spec, total amount of bitstream buffer size should be
+     * 128 bytes aligned. If actual data is not multiple of 128 bytes,
+     * the last slice data needs to be zero-padded */
+    priv->bitstream_buffer.resize (bitstream_buffer_size, 0);
+
+    priv->slice.SliceBytesInBuffer += padding;
+  }
+
+  args.picture_params = &priv->pic_params;
+  args.picture_params_size = sizeof (DXVA_PicParams_VP8);
+  args.slice_control = &priv->slice;
+  args.slice_control_size = sizeof (DXVA_Slice_VPx_Short);
+  args.bitstream = &priv->bitstream_buffer0;
+  args.bitstream_size = priv->bitstream_buffer.size ();
+
+  g_assert (klass->end_picture);
+
+  return klass->end_picture (self, GST_CODEC_PICTURE (picture),
+      priv->ref_pics, &args);
+}
+
+static GstFlowReturn
+gst_dxva_vp8_decoder_output_picture (GstVp8Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp8Picture * picture)
+{
+  GstDxvaVp8Decoder *self = GST_DXVA_VP8_DECODER (decoder);
+  GstDxvaVp8DecoderPrivate *priv = self->priv;
+  GstDxvaVp8DecoderClass *klass = GST_DXVA_VP8_DECODER_GET_CLASS (self);
+
+  g_assert (klass->output_picture);
+
+  GST_LOG_OBJECT (self, "Outputting picture %p", picture);
+
+  return klass->output_picture (self, frame, GST_CODEC_PICTURE (picture),
+      (GstVideoBufferFlags) 0, priv->width, priv->height);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvavp8decoder.h Added

@@ -0,0 +1,99 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/dxva/dxva-prelude.h>
+#include <gst/dxva/gstdxvatypes.h>
+#include <gst/codecs/gstvp8decoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DXVA_VP8_DECODER            (gst_dxva_vp8_decoder_get_type())
+#define GST_DXVA_VP8_DECODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DXVA_VP8_DECODER,GstDxvaVp8Decoder))
+#define GST_DXVA_VP8_DECODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DXVA_VP8_DECODER,GstDxvaVp8DecoderClass))
+#define GST_DXVA_VP8_DECODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_DXVA_VP8_DECODER,GstDxvaVp8DecoderClass))
+#define GST_IS_DXVA_VP8_DECODER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DXVA_VP8_DECODER))
+#define GST_IS_DXVA_VP8_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DXVA_VP8_DECODER))
+
+typedef struct _GstDxvaVp8Decoder GstDxvaVp8Decoder;
+typedef struct _GstDxvaVp8DecoderClass GstDxvaVp8DecoderClass;
+typedef struct _GstDxvaVp8DecoderPrivate GstDxvaVp8DecoderPrivate;
+
+/**
+ * GstDxvaVp8Decoder:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaVp8Decoder
+{
+  GstVp8Decoder parent;
+
+  /*< private >*/
+  GstDxvaVp8DecoderPrivate *priv;
+};
+
+/**
+ * GstDxvaVp8DecoderClass:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaVp8DecoderClass
+{
+  GstVp8DecoderClass parent_class;
+
+  GstFlowReturn   (*configure)          (GstDxvaVp8Decoder * decoder,
+                                         GstVideoCodecState * input_state,
+                                         const GstVideoInfo * info,
+                                         gint crop_x,
+                                         gint crop_y,
+                                         gint coded_width,
+                                         gint coded_height,
+                                         gint max_dpb_size);
+
+  GstFlowReturn   (*new_picture)        (GstDxvaVp8Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  guint8          (*get_picture_id)     (GstDxvaVp8Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  GstFlowReturn   (*start_picture)      (GstDxvaVp8Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         guint8 * picture_id);
+
+  GstFlowReturn   (*end_picture)        (GstDxvaVp8Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         GPtrArray * ref_pics,
+                                         const GstDxvaDecodingArgs * args);
+
+  GstFlowReturn   (*output_picture)     (GstDxvaVp8Decoder * decoder,
+                                         GstVideoCodecFrame * frame,
+                                         GstCodecPicture * picture,
+                                         GstVideoBufferFlags buffer_flags,
+                                         gint display_width,
+                                         gint display_height);
+};
+
+GST_DXVA_API
+GType gst_dxva_vp8_decoder_get_type (void);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstDxvaVp8Decoder, gst_object_unref)
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvavp9decoder.cpp Added

@@ -0,0 +1,497 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdxvavp9decoder.h"
+#include <string.h>
+#include <vector>
+
+#include "gstdxvatypedef.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_dxva_vp9_decoder_debug);
+#define GST_CAT_DEFAULT gst_dxva_vp9_decoder_debug
+
+/* *INDENT-OFF* */
+struct _GstDxvaVp9DecoderPrivate
+{
+  DXVA_PicParams_VP9 pic_params;
+  DXVA_Slice_VPx_Short slice;
+
+  std::vector<guint8> bitstream_buffer;
+  GPtrArray *ref_pics = nullptr;
+
+  /* To calculate use_prev_in_find_mv_refs */
+  guint last_frame_width = 0;
+  guint last_frame_height = 0;
+  gboolean last_show_frame = FALSE;
+};
+/* *INDENT-ON* */
+
+static void gst_dxva_vp9_decoder_finalize (GObject * object);
+
+static gboolean gst_dxva_vp9_decoder_start (GstVideoDecoder * decoder);
+
+static GstFlowReturn gst_dxva_vp9_decoder_new_sequence (GstVp9Decoder * decoder,
+    const GstVp9FrameHeader * frame_hdr, gint max_dpb_size);
+static GstFlowReturn gst_dxva_vp9_decoder_new_picture (GstVp9Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp9Picture * picture);
+static GstVp9Picture *gst_dxva_vp9_decoder_duplicate_picture (GstVp9Decoder *
+    decoder, GstVideoCodecFrame * frame, GstVp9Picture * picture);
+static GstFlowReturn
+gst_dxva_vp9_decoder_decode_picture (GstVp9Decoder * decoder,
+    GstVp9Picture * picture, GstVp9Dpb * dpb);
+static GstFlowReturn gst_dxva_vp9_decoder_end_picture (GstVp9Decoder * decoder,
+    GstVp9Picture * picture);
+static GstFlowReturn gst_dxva_vp9_decoder_output_picture (GstVp9Decoder *
+    decoder, GstVideoCodecFrame * frame, GstVp9Picture * picture);
+
+#define gst_dxva_vp9_decoder_parent_class parent_class
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstDxvaVp9Decoder,
+    gst_dxva_vp9_decoder, GST_TYPE_VP9_DECODER,
+    GST_DEBUG_CATEGORY_INIT (gst_dxva_vp9_decoder_debug, "dxvavp9decoder",
+        0, "dxvavp9decoder"));
+
+static void
+gst_dxva_vp9_decoder_class_init (GstDxvaVp9DecoderClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstVp9DecoderClass *vp9decoder_class = GST_VP9_DECODER_CLASS (klass);
+
+  object_class->finalize = gst_dxva_vp9_decoder_finalize;
+
+  decoder_class->start = GST_DEBUG_FUNCPTR (gst_dxva_vp9_decoder_start);
+
+  vp9decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_dxva_vp9_decoder_new_sequence);
+  vp9decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_vp9_decoder_new_picture);
+  vp9decoder_class->duplicate_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_vp9_decoder_duplicate_picture);
+  vp9decoder_class->decode_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_vp9_decoder_decode_picture);
+  vp9decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_vp9_decoder_end_picture);
+  vp9decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_dxva_vp9_decoder_output_picture);
+}
+
+static void
+gst_dxva_vp9_decoder_init (GstDxvaVp9Decoder * self)
+{
+  self->priv = new GstDxvaVp9DecoderPrivate ();
+  self->priv->ref_pics = g_ptr_array_new ();
+}
+
+static void
+gst_dxva_vp9_decoder_finalize (GObject * object)
+{
+  GstDxvaVp9Decoder *self = GST_DXVA_VP9_DECODER (object);
+  GstDxvaVp9DecoderPrivate *priv = self->priv;
+
+  g_ptr_array_unref (priv->ref_pics);
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_dxva_vp9_decoder_reset (GstDxvaVp9Decoder * self)
+{
+  GstDxvaVp9DecoderPrivate *priv = self->priv;
+
+  priv->last_frame_width = 0;
+  priv->last_frame_height = 0;
+  priv->last_show_frame = FALSE;
+}
+
+static gboolean
+gst_dxva_vp9_decoder_start (GstVideoDecoder * decoder)
+{
+  GstDxvaVp9Decoder *self = GST_DXVA_VP9_DECODER (decoder);
+
+  gst_dxva_vp9_decoder_reset (self);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->start (decoder);
+}
+
+static GstFlowReturn
+gst_dxva_vp9_decoder_new_sequence (GstVp9Decoder * decoder,
+    const GstVp9FrameHeader * frame_hdr, gint max_dpb_size)
+{
+  GstDxvaVp9Decoder *self = GST_DXVA_VP9_DECODER (decoder);
+  GstDxvaVp9DecoderPrivate *priv = self->priv;
+  GstDxvaVp9DecoderClass *klass = GST_DXVA_VP9_DECODER_GET_CLASS (self);
+  GstVideoInfo info;
+  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
+  GstFlowReturn ret;
+
+  GST_LOG_OBJECT (self, "new sequence");
+
+  if (frame_hdr->profile == GST_VP9_PROFILE_0)
+    out_format = GST_VIDEO_FORMAT_NV12;
+  else if (frame_hdr->profile == GST_VP9_PROFILE_2)
+    out_format = GST_VIDEO_FORMAT_P010_10LE;
+
+  if (out_format == GST_VIDEO_FORMAT_UNKNOWN) {
+    GST_ERROR_OBJECT (self, "Could not support profile %d", frame_hdr->profile);
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  /* Will be updated per decode_picture */
+  priv->last_frame_width = priv->last_frame_height = 0;
+  priv->last_show_frame = FALSE;
+
+  gst_video_info_set_format (&info,
+      out_format, frame_hdr->width, frame_hdr->height);
+
+  g_assert (klass->configure);
+
+  ret = klass->configure (self, decoder->input_state, &info, 0, 0,
+      frame_hdr->width, frame_hdr->height, max_dpb_size);
+
+  if (ret == GST_FLOW_OK &&
+      !gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+    GST_WARNING_OBJECT (self, "Couldn't negotiate with new sequence");
+    ret = GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_dxva_vp9_decoder_new_picture (GstVp9Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp9Picture * picture)
+{
+  GstDxvaVp9Decoder *self = GST_DXVA_VP9_DECODER (decoder);
+  GstDxvaVp9DecoderClass *klass = GST_DXVA_VP9_DECODER_GET_CLASS (self);
+
+  g_assert (klass->new_picture);
+
+  return klass->new_picture (self, GST_CODEC_PICTURE (picture));
+}
+
+static GstVp9Picture *
+gst_dxva_vp9_decoder_duplicate_picture (GstVp9Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp9Picture * picture)
+{
+  GstDxvaVp9Decoder *self = GST_DXVA_VP9_DECODER (decoder);
+  GstDxvaVp9DecoderClass *klass = GST_DXVA_VP9_DECODER_GET_CLASS (self);
+  GstVp9Picture *new_picture;
+
+  g_assert (klass->duplicate_picture);
+
+  new_picture = gst_vp9_picture_new ();
+  new_picture->frame_hdr = picture->frame_hdr;
+
+  if (klass->duplicate_picture (self, GST_CODEC_PICTURE (picture),
+          GST_CODEC_PICTURE (new_picture)) != GST_FLOW_OK) {
+    gst_vp9_picture_unref (new_picture);
+    return nullptr;
+  }
+
+  return new_picture;
+}
+
+static void
+gst_dxva_vp9_decoder_copy_frame_params (GstDxvaVp9Decoder * self,
+    GstVp9Picture * picture, DXVA_PicParams_VP9 * params)
+{
+  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
+
+  params->profile = frame_hdr->profile;
+  params->frame_type = frame_hdr->frame_type;
+  params->show_frame = frame_hdr->show_frame;
+  params->error_resilient_mode = frame_hdr->error_resilient_mode;
+  params->subsampling_x = frame_hdr->subsampling_x;
+  params->subsampling_y = frame_hdr->subsampling_y;
+  params->refresh_frame_context = frame_hdr->refresh_frame_context;
+  params->frame_parallel_decoding_mode =
+      frame_hdr->frame_parallel_decoding_mode;
+  params->intra_only = frame_hdr->intra_only;
+  params->frame_context_idx = frame_hdr->frame_context_idx;
+  params->reset_frame_context = frame_hdr->reset_frame_context;
+  if (frame_hdr->frame_type == GST_VP9_KEY_FRAME)
+    params->allow_high_precision_mv = 0;
+  else
+    params->allow_high_precision_mv = frame_hdr->allow_high_precision_mv;
+
+  params->width = frame_hdr->width;
+  params->height = frame_hdr->height;
+  params->BitDepthMinus8Luma = frame_hdr->bit_depth - 8;
+  params->BitDepthMinus8Chroma = frame_hdr->bit_depth - 8;
+
+  params->interp_filter = frame_hdr->interpolation_filter;
+  params->log2_tile_cols = frame_hdr->tile_cols_log2;
+  params->log2_tile_rows = frame_hdr->tile_rows_log2;
+}
+
+static void
+gst_dxva_vp9_decoder_copy_reference_frames (GstDxvaVp9Decoder * self,
+    GstVp9Picture * picture, GstVp9Dpb * dpb, DXVA_PicParams_VP9 * params)
+{
+  GstDxvaVp9DecoderPrivate *priv = self->priv;
+  GstDxvaVp9DecoderClass *klass = GST_DXVA_VP9_DECODER_GET_CLASS (self);
+
+  for (guint i = 0; i < GST_VP9_REF_FRAMES; i++) {
+    params->ref_frame_mapi.bPicEntry = 0xff;
+    params->ref_frame_coded_widthi = 0;
+    params->ref_frame_coded_heighti = 0;
+
+    if (dpb->pic_listi) {
+      GstVp9Picture *other = dpb->pic_listi;
+      guint8 id = klass->get_picture_id (self, GST_CODEC_PICTURE (other));
+
+      if (id != 0xff) {
+        params->ref_frame_mapi.Index7Bits = id;
+        params->ref_frame_coded_widthi = other->frame_hdr.width;
+        params->ref_frame_coded_heighti = other->frame_hdr.height;
+        g_ptr_array_add (priv->ref_pics, other);
+      }
+    }
+  }
+}
+
+static void
+gst_dxva_vp9_decoder_copy_frame_refs (GstDxvaVp9Decoder * self,
+    GstVp9Picture * picture, DXVA_PicParams_VP9 * params)
+{
+  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
+  gint i;
+
+  for (i = 0; i < GST_VP9_REFS_PER_FRAME; i++)
+    params->frame_refsi = params->ref_frame_mapframe_hdr->ref_frame_idxi;
+
+  G_STATIC_ASSERT (G_N_ELEMENTS (params->ref_frame_sign_bias) ==
+      G_N_ELEMENTS (frame_hdr->ref_frame_sign_bias));
+  G_STATIC_ASSERT (sizeof (params->ref_frame_sign_bias) ==
+      sizeof (frame_hdr->ref_frame_sign_bias));
+  memcpy (params->ref_frame_sign_bias,
+      frame_hdr->ref_frame_sign_bias, sizeof (frame_hdr->ref_frame_sign_bias));
+}
+
+static void
+gst_dxva_vp9_decoder_copy_loop_filter_params (GstDxvaVp9Decoder * self,
+    GstVp9Picture * picture, DXVA_PicParams_VP9 * params)
+{
+  GstDxvaVp9DecoderPrivate *priv = self->priv;
+  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
+  const GstVp9LoopFilterParams *lfp = &frame_hdr->loop_filter_params;
+
+  params->filter_level = lfp->loop_filter_level;
+  params->sharpness_level = lfp->loop_filter_sharpness;
+  params->mode_ref_delta_enabled = lfp->loop_filter_delta_enabled;
+  params->mode_ref_delta_update = lfp->loop_filter_delta_update;
+  params->use_prev_in_find_mv_refs =
+      priv->last_show_frame && !frame_hdr->error_resilient_mode;
+
+  if (frame_hdr->frame_type != GST_VP9_KEY_FRAME && !frame_hdr->intra_only) {
+    params->use_prev_in_find_mv_refs &=
+        (frame_hdr->width == priv->last_frame_width &&
+        frame_hdr->height == priv->last_frame_height);
+  }
+
+  G_STATIC_ASSERT (G_N_ELEMENTS (params->ref_deltas) ==
+      G_N_ELEMENTS (lfp->loop_filter_ref_deltas));
+  G_STATIC_ASSERT (sizeof (params->ref_deltas) ==
+      sizeof (lfp->loop_filter_ref_deltas));
+  memcpy (params->ref_deltas, lfp->loop_filter_ref_deltas,
+      sizeof (lfp->loop_filter_ref_deltas));
+
+  G_STATIC_ASSERT (G_N_ELEMENTS (params->mode_deltas) ==
+      G_N_ELEMENTS (lfp->loop_filter_mode_deltas));
+  G_STATIC_ASSERT (sizeof (params->mode_deltas) ==
+      sizeof (lfp->loop_filter_mode_deltas));
+  memcpy (params->mode_deltas, lfp->loop_filter_mode_deltas,
+      sizeof (lfp->loop_filter_mode_deltas));
+}
+
+static void
+gst_dxva_vp9_decoder_copy_quant_params (GstDxvaVp9Decoder * self,
+    GstVp9Picture * picture, DXVA_PicParams_VP9 * params)
+{
+  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
+  const GstVp9QuantizationParams *qp = &frame_hdr->quantization_params;
+
+  params->base_qindex = qp->base_q_idx;
+  params->y_dc_delta_q = qp->delta_q_y_dc;
+  params->uv_dc_delta_q = qp->delta_q_uv_dc;
+  params->uv_ac_delta_q = qp->delta_q_uv_ac;
+}
+
+static void
+gst_dxva_vp9_decoder_copy_segmentation_params (GstDxvaVp9Decoder * self,
+    GstVp9Picture * picture, DXVA_PicParams_VP9 * params)
+{
+  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
+  const GstVp9SegmentationParams *sp = &frame_hdr->segmentation_params;
+
+  params->stVP9Segments.enabled = sp->segmentation_enabled;
+  params->stVP9Segments.update_map = sp->segmentation_update_map;
+  params->stVP9Segments.temporal_update = sp->segmentation_temporal_update;
+  params->stVP9Segments.abs_delta = sp->segmentation_abs_or_delta_update;
+
+  G_STATIC_ASSERT (G_N_ELEMENTS (params->stVP9Segments.tree_probs) ==
+      G_N_ELEMENTS (sp->segmentation_tree_probs));
+  G_STATIC_ASSERT (sizeof (params->stVP9Segments.tree_probs) ==
+      sizeof (sp->segmentation_tree_probs));
+  memcpy (params->stVP9Segments.tree_probs, sp->segmentation_tree_probs,
+      sizeof (sp->segmentation_tree_probs));
+
+  G_STATIC_ASSERT (G_N_ELEMENTS (params->stVP9Segments.pred_probs) ==
+      G_N_ELEMENTS (sp->segmentation_pred_prob));
+  G_STATIC_ASSERT (sizeof (params->stVP9Segments.pred_probs) ==
+      sizeof (sp->segmentation_pred_prob));
+
+  if (sp->segmentation_temporal_update) {
+    memcpy (params->stVP9Segments.pred_probs, sp->segmentation_pred_prob,
+        sizeof (params->stVP9Segments.pred_probs));
+  } else {
+    memset (params->stVP9Segments.pred_probs, 255,
+        sizeof (params->stVP9Segments.pred_probs));
+  }
+
+  for (guint i = 0; i < GST_VP9_MAX_SEGMENTS; i++) {
+    params->stVP9Segments.feature_maski =
+        (sp->feature_enablediGST_VP9_SEG_LVL_ALT_Q << 0) |
+        (sp->feature_enablediGST_VP9_SEG_LVL_ALT_L << 1) |
+        (sp->feature_enablediGST_VP9_SEG_LVL_REF_FRAME << 2) |
+        (sp->feature_enablediGST_VP9_SEG_SEG_LVL_SKIP << 3);
+
+    for (guint j = 0; j < 3; j++)
+      params->stVP9Segments.feature_dataij = sp->feature_dataij;
+    params->stVP9Segments.feature_datai3 = 0;
+  }
+}
+
+static GstFlowReturn
+gst_dxva_vp9_decoder_decode_picture (GstVp9Decoder * decoder,
+    GstVp9Picture * picture, GstVp9Dpb * dpb)
+{
+  GstDxvaVp9Decoder *self = GST_DXVA_VP9_DECODER (decoder);
+  GstDxvaVp9DecoderPrivate *priv = self->priv;
+  GstDxvaVp9DecoderClass *klass = GST_DXVA_VP9_DECODER_GET_CLASS (self);
+  DXVA_PicParams_VP9 *pic_params = &priv->pic_params;
+  DXVA_Slice_VPx_Short *slice = &priv->slice;
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
+  GstFlowReturn ret;
+  guint8 picture_id;
+
+  g_assert (klass->start_picture);
+  g_assert (klass->get_picture_id);
+
+  ret = klass->start_picture (self, codec_picture, &picture_id);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  priv->bitstream_buffer.resize (0);
+  g_ptr_array_set_size (priv->ref_pics, 0);
+
+  memset (pic_params, 0, sizeof (DXVA_PicParams_VP9));
+
+  pic_params->CurrPic.Index7Bits = picture_id;
+  pic_params->uncompressed_header_size_byte_aligned =
+      picture->frame_hdr.frame_header_length_in_bytes;
+  pic_params->first_partition_size = picture->frame_hdr.header_size_in_bytes;
+  pic_params->StatusReportFeedbackNumber = 1;
+
+  gst_dxva_vp9_decoder_copy_reference_frames (self, picture, dpb, pic_params);
+  gst_dxva_vp9_decoder_copy_frame_params (self, picture, pic_params);
+  gst_dxva_vp9_decoder_copy_frame_refs (self, picture, pic_params);
+  gst_dxva_vp9_decoder_copy_loop_filter_params (self, picture, pic_params);
+  gst_dxva_vp9_decoder_copy_quant_params (self, picture, pic_params);
+  gst_dxva_vp9_decoder_copy_segmentation_params (self, picture, pic_params);
+
+  priv->bitstream_buffer.resize (picture->size);
+  memcpy (&priv->bitstream_buffer0, picture->data, picture->size);
+
+  slice->BSNALunitDataLocation = 0;
+  slice->SliceBytesInBuffer = priv->bitstream_buffer.size ();
+  slice->wBadSliceChopping = 0;
+
+  priv->last_frame_width = pic_params->width;
+  priv->last_frame_height = pic_params->height;
+  priv->last_show_frame = pic_params->show_frame;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_dxva_vp9_decoder_end_picture (GstVp9Decoder * decoder,
+    GstVp9Picture * picture)
+{
+  GstDxvaVp9Decoder *self = GST_DXVA_VP9_DECODER (decoder);
+  GstDxvaVp9DecoderPrivate *priv = self->priv;
+  GstDxvaVp9DecoderClass *klass = GST_DXVA_VP9_DECODER_GET_CLASS (self);
+  size_t bitstream_buffer_size;
+  size_t bitstream_pos;
+  GstDxvaDecodingArgs args;
+
+  if (priv->bitstream_buffer.empty ()) {
+    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
+    return GST_FLOW_ERROR;
+  }
+
+  memset (&args, 0, sizeof (GstDxvaDecodingArgs));
+
+  bitstream_pos = priv->bitstream_buffer.size ();
+  bitstream_buffer_size = GST_ROUND_UP_128 (bitstream_pos);
+
+  if (bitstream_buffer_size > bitstream_pos) {
+    size_t padding = bitstream_buffer_size - bitstream_pos;
+
+    /* As per DXVA spec, total amount of bitstream buffer size should be
+     * 128 bytes aligned. If actual data is not multiple of 128 bytes,
+     * the last slice data needs to be zero-padded */
+    priv->bitstream_buffer.resize (bitstream_buffer_size, 0);
+
+    priv->slice.SliceBytesInBuffer += padding;
+  }
+
+  args.picture_params = &priv->pic_params;
+  args.picture_params_size = sizeof (DXVA_PicParams_VP9);
+  args.slice_control = &priv->slice;
+  args.slice_control_size = sizeof (DXVA_Slice_VPx_Short);
+  args.bitstream = &priv->bitstream_buffer0;
+  args.bitstream_size = priv->bitstream_buffer.size ();
+
+  g_assert (klass->end_picture);
+
+  return klass->end_picture (self, GST_CODEC_PICTURE (picture),
+      priv->ref_pics, &args);
+}
+
+static GstFlowReturn
+gst_dxva_vp9_decoder_output_picture (GstVp9Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp9Picture * picture)
+{
+  GstDxvaVp9Decoder *self = GST_DXVA_VP9_DECODER (decoder);
+  GstDxvaVp9DecoderClass *klass = GST_DXVA_VP9_DECODER_GET_CLASS (self);
+
+  g_assert (klass->output_picture);
+
+  GST_LOG_OBJECT (self, "Outputting picture %p", picture);
+
+  return klass->output_picture (self, frame, GST_CODEC_PICTURE (picture),
+      (GstVideoBufferFlags) 0, picture->frame_hdr.width,
+      picture->frame_hdr.height);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/gstdxvavp9decoder.h Added

@@ -0,0 +1,103 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/dxva/dxva-prelude.h>
+#include <gst/dxva/gstdxvatypes.h>
+#include <gst/codecs/gstvp9decoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DXVA_VP9_DECODER            (gst_dxva_vp9_decoder_get_type())
+#define GST_DXVA_VP9_DECODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DXVA_VP9_DECODER,GstDxvaVp9Decoder))
+#define GST_DXVA_VP9_DECODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DXVA_VP9_DECODER,GstDxvaVp9DecoderClass))
+#define GST_DXVA_VP9_DECODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_DXVA_VP9_DECODER,GstDxvaVp9DecoderClass))
+#define GST_IS_DXVA_VP9_DECODER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DXVA_VP9_DECODER))
+#define GST_IS_DXVA_VP9_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DXVA_VP9_DECODER))
+
+typedef struct _GstDxvaVp9Decoder GstDxvaVp9Decoder;
+typedef struct _GstDxvaVp9DecoderClass GstDxvaVp9DecoderClass;
+typedef struct _GstDxvaVp9DecoderPrivate GstDxvaVp9DecoderPrivate;
+
+/**
+ * GstDxvaVp9Decoder:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaVp9Decoder
+{
+  GstVp9Decoder parent;
+
+  /*< private >*/
+  GstDxvaVp9DecoderPrivate *priv;
+};
+
+/**
+ * GstDxvaVp9DecoderClass:
+ *
+ * Since: 1.24
+ */
+struct _GstDxvaVp9DecoderClass
+{
+  GstVp9DecoderClass parent_class;
+
+  GstFlowReturn   (*configure)          (GstDxvaVp9Decoder * decoder,
+                                         GstVideoCodecState * input_state,
+                                         const GstVideoInfo * info,
+                                         gint crop_x,
+                                         gint crop_y,
+                                         gint coded_width,
+                                         gint coded_height,
+                                         gint max_dpb_size);
+
+  GstFlowReturn   (*new_picture)        (GstDxvaVp9Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  GstFlowReturn   (*duplicate_picture)  (GstDxvaVp9Decoder * decoder,
+                                         GstCodecPicture * src,
+                                         GstCodecPicture * dst);
+
+  guint8          (*get_picture_id)     (GstDxvaVp9Decoder * decoder,
+                                         GstCodecPicture * picture);
+
+  GstFlowReturn   (*start_picture)      (GstDxvaVp9Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         guint8 * picture_id);
+
+  GstFlowReturn   (*end_picture)        (GstDxvaVp9Decoder * decoder,
+                                         GstCodecPicture * picture,
+                                         GPtrArray * ref_pics,
+                                         const GstDxvaDecodingArgs * args);
+
+  GstFlowReturn   (*output_picture)     (GstDxvaVp9Decoder * decoder,
+                                         GstVideoCodecFrame * frame,
+                                         GstCodecPicture * picture,
+                                         GstVideoBufferFlags buffer_flags,
+                                         gint display_width,
+                                         gint display_height);
+};
+
+GST_DXVA_API
+GType gst_dxva_vp9_decoder_get_type (void);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstDxvaVp9Decoder, gst_object_unref)
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/dxva/meson.build Added

@@ -0,0 +1,75 @@
+dxva_sources = files(
+  'gstdxvaav1decoder.cpp',
+  'gstdxvah264decoder.cpp',
+  'gstdxvah265decoder.cpp',
+  'gstdxvampeg2decoder.cpp',
+  'gstdxvautils.cpp',
+  'gstdxvavp8decoder.cpp',
+  'gstdxvavp9decoder.cpp',
+)
+
+dxva_headers = files(
+  'gstdxvaav1decoder.h',
+  'gstdxvah264decoder.h',
+  'gstdxvah265decoder.h',
+  'gstdxvampeg2decoder.h',
+  'gstdxvatypes.h',
+  'gstdxvautils.h',
+  'gstdxvavp8decoder.h',
+  'gstdxvavp9decoder.h',
+)
+
+extra_args = 
+  '-DGST_USE_UNSTABLE_API',
+  '-DBUILDING_GST_DXVA',
+  '-DG_LOG_DOMAIN="GStreamer-Dxva"',
+
+
+if host_system != 'windows' and not build_gir
+  subdir_done()
+endif
+
+pkg_name = 'gstreamer-dxva-' + api_version
+gstdxva = library('gstdxva-' + api_version,
+  dxva_sources,
+  c_args : gst_plugins_bad_args + extra_args,
+  cpp_args : gst_plugins_bad_args + extra_args,
+  include_directories : configinc, libsinc,
+  version : libversion,
+  soversion : soversion,
+  install : true,
+  dependencies : gstvideo_dep, gstcodecs_dep
+)
+
+library_def = {'lib': gstdxva}
+gen_sources = 
+if build_gir
+  gir = {
+    'sources' : dxva_sources + dxva_headers,
+    'namespace' : 'GstDxva',
+    'nsversion' : api_version,
+    'identifier_prefix' : 'Gst',
+    'symbol_prefix' : 'gst',
+    'export_packages' : pkg_name,
+    'includes' : 'Gst-1.0', 'GstVideo-1.0', 'GstCodecs-1.0',
+    'install' : true,
+    'extra_args' : gir_init_section + '-DGST_USE_UNSTABLE_API',
+    'dependencies' : gstvideo_dep, gstcodecs_dep
+  }
+  library_def += {'gir': gir}
+  if not static_build
+    dxva_gir = gnome.generate_gir(gstdxva, kwargs: gir)
+    library_def += {'gir_targets':  library_def.get('gir_targets', ) + dxva_gir}
+    gen_sources += dxva_gir
+  endif
+endif
+
+gst_libraries += pkg_name, library_def
+
+# Still non-public api, should not install headers
+gstdxva_dep = declare_dependency(link_with : gstdxva,
+  include_directories : libsinc,
+  sources: gen_sources,
+  dependencies : gstvideo_dep, gstcodecs_dep)
+
+meson.override_dependency(pkg_name, gstdxva_dep)

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/insertbin/gstinsertbin.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/insertbin/gstinsertbin.c Changed

@@ -37,6 +37,30 @@
  * returns or it could be called later from another thread. The signature of
  * this callback GstInsertBinCallback().
  *
+ * Apart from the library API, since 1.24 insertbin can also be found in the
+ * registry:
+ *
+ * ``` C
+ *   GstElement *pipeline, *insertbin, *videoflip;
+ *
+ *   gst_init (NULL, NULL);
+ *   pipeline =
+ *       gst_parse_launch ("videotestsrc ! insertbin name=i ! autovideosink",
+ *       NULL);
+ *
+ *   ...
+ *
+ *   insertbin = gst_bin_get_by_name (GST_BIN (pipeline), "i");
+ *   videoflip = gst_element_factory_make ("videoflip", NULL);
+ *
+ *   ...
+ *
+ *   g_object_set (videoflip, "method", 1, NULL);
+ *   g_signal_emit_by_name (insertbin, "append", videoflip, NULL, NULL);
+ *
+ *   ...
+ * ```
+ *
  * Since: 1.2
  */
 
@@ -152,6 +176,8 @@
    * in the bin.
    *
    * Same as gst_insert_bin_prepend()
+   *
+   * Since: 1.2
    */
   signalsSIG_PREPEND = g_signal_new_class_handler ("prepend",
       G_TYPE_FROM_CLASS (klass),
@@ -172,6 +198,8 @@
    * in the bin.
    *
    * Same as gst_insert_bin_append()
+   *
+   * Since: 1.2
    */
   signalsSIG_APPEND = g_signal_new_class_handler ("append",
       G_TYPE_FROM_CLASS (klass),
@@ -193,6 +221,8 @@
    * element in the bin.
    *
    * Same as gst_insert_bin_insert_before()
+   *
+   * Since: 1.2
    */
   signalsSIG_INSERT_BEFORE = g_signal_new_class_handler ("insert-before",
       G_TYPE_FROM_CLASS (klass),
@@ -216,6 +246,8 @@
    * element in the bin.
    *
    * Same as gst_insert_bin_insert_after()
+   *
+   * Since: 1.2
    */
   signalsSIG_INSERT_AFTER = g_signal_new_class_handler ("insert-after",
       G_TYPE_FROM_CLASS (klass),
@@ -225,7 +257,6 @@
       G_TYPE_NONE, 4, GST_TYPE_ELEMENT, GST_TYPE_ELEMENT,
       G_TYPE_POINTER, G_TYPE_POINTER);
 
-
   /**
    * GstInsertBin::remove:
    * @element: the #GstElement to remove
@@ -237,6 +268,8 @@
    * This action signal removed the filter like element from the bin.
    *
    * Same as gst_insert_bin_remove()
+   *
+   * Since: 1.2
    */
   signalsSIG_REMOVE = g_signal_new_class_handler ("remove",
       G_TYPE_FROM_CLASS (klass),
@@ -252,7 +285,7 @@
   gst_object_unref (data->element);
   if (data->sibling)
     gst_object_unref (data->sibling);
-  g_slice_free (struct ChangeData, data);
+  g_free (data);
 }
 
 
@@ -794,7 +827,7 @@
     GstInsertBinDirection direction, GstInsertBinCallback callback,
     gpointer user_data)
 {
-  struct ChangeData *data = g_slice_new (struct ChangeData);
+  struct ChangeData *data = g_new (struct ChangeData, 1);
   gboolean block_pad;
 
   data->element = element;

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/insertbin/gstinsertbin.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/insertbin/gstinsertbin.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/insertbin/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/insertbin/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/mpegts/gst-atsc-section.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/gst-atsc-section.c Changed

@@ -87,7 +87,7 @@
 {
   GstMpegtsAtscVCTSource *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscVCTSource, source);
+  copy = g_memdup2 (source, sizeof (GstMpegtsAtscVCTSource));
   copy->descriptors = g_ptr_array_ref (source->descriptors);
 
   return copy;
@@ -99,7 +99,7 @@
   g_free (source->short_name);
   if (source->descriptors)
     g_ptr_array_unref (source->descriptors);
-  g_slice_free (GstMpegtsAtscVCTSource, source);
+  g_free (source);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscVCTSource, gst_mpegts_atsc_vct_source,
@@ -111,7 +111,7 @@
 {
   GstMpegtsAtscVCT *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscVCT, vct);
+  copy = g_memdup2 (vct, sizeof (GstMpegtsAtscVCT));
   copy->sources = g_ptr_array_ref (vct->sources);
   copy->descriptors = g_ptr_array_ref (vct->descriptors);
 
@@ -125,7 +125,7 @@
     g_ptr_array_unref (vct->sources);
   if (vct->descriptors)
     g_ptr_array_unref (vct->descriptors);
-  g_slice_free (GstMpegtsAtscVCT, vct);
+  g_free (vct);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscVCT, gst_mpegts_atsc_vct,
@@ -142,7 +142,7 @@
   guint i;
   GError *err = NULL;
 
-  vct = g_slice_new0 (GstMpegtsAtscVCT);
+  vct = g_new0 (GstMpegtsAtscVCT, 1);
 
   data = section->data;
   end = data + section->section_length;
@@ -173,7 +173,7 @@
     if (end - data < 32 + 2 + 4)
       goto error;
 
-    source = g_slice_new0 (GstMpegtsAtscVCTSource);
+    source = g_new0 (GstMpegtsAtscVCTSource, 1);
     g_ptr_array_add (vct->sources, source);
 
     source->short_name =
@@ -304,7 +304,7 @@
 {
   GstMpegtsAtscMGTTable *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscMGTTable, mgt_table);
+  copy = g_memdup2 (mgt_table, sizeof (GstMpegtsAtscMGTTable));
   copy->descriptors = g_ptr_array_ref (mgt_table->descriptors);
 
   return copy;
@@ -314,7 +314,7 @@
 _gst_mpegts_atsc_mgt_table_free (GstMpegtsAtscMGTTable * mgt_table)
 {
   g_ptr_array_unref (mgt_table->descriptors);
-  g_slice_free (GstMpegtsAtscMGTTable, mgt_table);
+  g_free (mgt_table);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscMGTTable, gst_mpegts_atsc_mgt_table,
@@ -326,7 +326,7 @@
 {
   GstMpegtsAtscMGT *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscMGT, mgt);
+  copy = g_memdup2 (mgt, sizeof (GstMpegtsAtscMGT));
   copy->tables = g_ptr_array_ref (mgt->tables);
   copy->descriptors = g_ptr_array_ref (mgt->descriptors);
 
@@ -338,7 +338,7 @@
 {
   g_ptr_array_unref (mgt->tables);
   g_ptr_array_unref (mgt->descriptors);
-  g_slice_free (GstMpegtsAtscMGT, mgt);
+  g_free (mgt);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscMGT, gst_mpegts_atsc_mgt,
@@ -353,7 +353,7 @@
   guint8 *data, *end;
   guint16 descriptors_loop_length;
 
-  mgt = g_slice_new0 (GstMpegtsAtscMGT);
+  mgt = g_new0 (GstMpegtsAtscMGT, 1);
 
   data = section->data;
   end = data + section->section_length;
@@ -375,7 +375,7 @@
       goto error;
     }
 
-    mgt_table = g_slice_new0 (GstMpegtsAtscMGTTable);
+    mgt_table = g_new0 (GstMpegtsAtscMGTTable, 1);
     g_ptr_array_add (mgt->tables, mgt_table);
 
     mgt_table->table_type = GST_READ_UINT16_BE (data);
@@ -577,7 +577,7 @@
 {
   GstMpegtsAtscMGT *mgt;
 
-  mgt = g_slice_new0 (GstMpegtsAtscMGT);
+  mgt = g_new0 (GstMpegtsAtscMGT, 1);
 
   mgt->tables = g_ptr_array_new_with_free_func ((GDestroyNotify)
       _gst_mpegts_atsc_mgt_table_free);
@@ -595,7 +595,7 @@
 {
   GstMpegtsAtscStringSegment *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscStringSegment, seg);
+  copy = g_memdup2 (seg, sizeof (GstMpegtsAtscStringSegment));
 
   return copy;
 }
@@ -604,7 +604,7 @@
 _gst_mpegts_atsc_string_segment_free (GstMpegtsAtscStringSegment * seg)
 {
   g_free (seg->cached_string);
-  g_slice_free (GstMpegtsAtscStringSegment, seg);
+  g_free (seg);
 }
 
 static void
@@ -726,7 +726,7 @@
 {
   GstMpegtsAtscMultString *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscMultString, mstring);
+  copy = g_memdup2 (mstring, sizeof (GstMpegtsAtscMultString));
   copy->segments = g_ptr_array_ref (mstring->segments);
 
   return copy;
@@ -736,7 +736,7 @@
 _gst_mpegts_atsc_mult_string_free (GstMpegtsAtscMultString * mstring)
 {
   g_ptr_array_unref (mstring->segments);
-  g_slice_free (GstMpegtsAtscMultString, mstring);
+  g_free (mstring);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscMultString, gst_mpegts_atsc_mult_string,
@@ -765,7 +765,7 @@
       guint8 num_segments;
       gint j;
 
-      mstring = g_slice_new0 (GstMpegtsAtscMultString);
+      mstring = g_new0 (GstMpegtsAtscMultString, 1);
       g_ptr_array_add (res, mstring);
       mstring->segments =
           g_ptr_array_new_full (num_strings,
@@ -790,7 +790,7 @@
       for (j = 0; j < num_segments; j++) {
         GstMpegtsAtscStringSegment *seg;
 
-        seg = g_slice_new0 (GstMpegtsAtscStringSegment);
+        seg = g_new0 (GstMpegtsAtscStringSegment, 1);
         g_ptr_array_add (mstring->segments, seg);
 
         /* each entry needs at least 3 bytes */
@@ -909,7 +909,7 @@
 {
   GstMpegtsAtscEITEvent *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscEITEvent, event);
+  copy = g_memdup2 (event, sizeof (GstMpegtsAtscEITEvent));
   copy->titles = g_ptr_array_ref (event->titles);
   copy->descriptors = g_ptr_array_ref (event->descriptors);
 
@@ -923,7 +923,7 @@
     g_ptr_array_unref (event->titles);
   if (event->descriptors)
     g_ptr_array_unref (event->descriptors);
-  g_slice_free (GstMpegtsAtscEITEvent, event);
+  g_free (event);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscEITEvent, gst_mpegts_atsc_eit_event,
@@ -935,7 +935,7 @@
 {
   GstMpegtsAtscEIT *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscEIT, eit);
+  copy = g_memdup2 (eit, sizeof (GstMpegtsAtscEIT));
   copy->events = g_ptr_array_ref (eit->events);
 
   return copy;
@@ -946,7 +946,7 @@
 {
   if (eit->events)
     g_ptr_array_unref (eit->events);
-  g_slice_free (GstMpegtsAtscEIT, eit);
+  g_free (eit);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscEIT, gst_mpegts_atsc_eit,
@@ -961,7 +961,7 @@
   guint8 *data, *end;
   guint8 num_events;
 
-  eit = g_slice_new0 (GstMpegtsAtscEIT);
+  eit = g_new0 (GstMpegtsAtscEIT, 1);
 
   data = section->data;
   end = data + section->section_length;
@@ -991,7 +991,7 @@
       goto error;
     }
 
-    event = g_slice_new0 (GstMpegtsAtscEITEvent);
+    event = g_new0 (GstMpegtsAtscEITEvent, 1);
     g_ptr_array_add (eit->events, event);
 
     event->event_id = GST_READ_UINT16_BE (data) & 0x3FFF;
@@ -1072,7 +1072,7 @@
 {
   GstMpegtsAtscETT *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscETT, ett);
+  copy = g_memdup2 (ett, sizeof (GstMpegtsAtscETT));
   copy->messages = g_ptr_array_ref (ett->messages);
 
   return copy;
@@ -1083,7 +1083,7 @@
 {
   if (ett->messages)
     g_ptr_array_unref (ett->messages);
-  g_slice_free (GstMpegtsAtscETT, ett);
+  g_free (ett);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscETT, gst_mpegts_atsc_ett,
@@ -1096,7 +1096,7 @@
   GstMpegtsAtscETT *ett = NULL;
   guint8 *data, *end;
 
-  ett = g_slice_new0 (GstMpegtsAtscETT);
+  ett = g_new0 (GstMpegtsAtscETT, 1);
 
   data = section->data;
   end = data + section->section_length;
@@ -1159,7 +1159,7 @@
 {
   GstMpegtsAtscSTT *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscSTT, stt);
+  copy = g_memdup2 (stt, sizeof (GstMpegtsAtscSTT));
   copy->descriptors = g_ptr_array_ref (stt->descriptors);
 
   return copy;
@@ -1173,7 +1173,7 @@
   if (stt->utc_datetime)
     gst_date_time_unref (stt->utc_datetime);
 
-  g_slice_free (GstMpegtsAtscSTT, stt);
+  g_free (stt);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscSTT, gst_mpegts_atsc_stt,
@@ -1187,7 +1187,7 @@
   guint8 *data, *end;
   guint16 daylight_saving;
 
-  stt = g_slice_new0 (GstMpegtsAtscSTT);
+  stt = g_new0 (GstMpegtsAtscSTT, 1);
 
   data = section->data;
   end = data + section->section_length;
@@ -1334,7 +1334,7 @@
 {
   GstMpegtsAtscSTT *stt;
 
-  stt = g_slice_new0 (GstMpegtsAtscSTT);
+  stt = g_new0 (GstMpegtsAtscSTT, 1);
   stt->descriptors = g_ptr_array_new_with_free_func ((GDestroyNotify)
       gst_mpegts_descriptor_free);
 
@@ -1369,7 +1369,7 @@
 {
   GstMpegtsAtscRRTDimensionValue *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscRRTDimensionValue, value);
+  copy = g_memdup2 (value, sizeof (GstMpegtsAtscRRTDimensionValue));
   copy->abbrev_ratings = g_ptr_array_ref (value->abbrev_ratings);
   copy->ratings = g_ptr_array_ref (value->ratings);
 
@@ -1385,7 +1385,7 @@
   if (value->ratings)
     g_ptr_array_unref (value->ratings);
 
-  g_slice_free (GstMpegtsAtscRRTDimensionValue, value);
+  g_free (value);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscRRTDimensionValue,
@@ -1398,7 +1398,7 @@
 {
   GstMpegtsAtscRRTDimension *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscRRTDimension, dim);
+  copy = g_memdup2 (dim, sizeof (GstMpegtsAtscRRTDimension));
   copy->names = g_ptr_array_ref (dim->names);
   copy->values = g_ptr_array_ref (dim->values);
 
@@ -1413,7 +1413,7 @@
   if (dim->values)
     g_ptr_array_unref (dim->values);
 
-  g_slice_free (GstMpegtsAtscRRTDimension, dim);
+  g_free (dim);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscRRTDimension, gst_mpegts_atsc_rrt_dimension,
@@ -1425,7 +1425,7 @@
 {
   GstMpegtsAtscRRT *copy;
 
-  copy = g_slice_dup (GstMpegtsAtscRRT, rrt);
+  copy = g_memdup2 (rrt, sizeof (GstMpegtsAtscRRT));
   copy->names = g_ptr_array_ref (rrt->names);
   copy->dimensions = g_ptr_array_ref (rrt->dimensions);
   copy->descriptors = g_ptr_array_ref (rrt->descriptors);
@@ -1443,7 +1443,7 @@
   if (rrt->descriptors)
     g_ptr_array_unref (rrt->descriptors);
 
-  g_slice_free (GstMpegtsAtscRRT, rrt);
+  g_free (rrt);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsAtscRRT, gst_mpegts_atsc_rrt,
@@ -1459,7 +1459,7 @@
   guint16 descriptors_loop_length;
   guint8 text_length;
 
-  rrt = g_slice_new0 (GstMpegtsAtscRRT);
+  rrt = g_new0 (GstMpegtsAtscRRT, 1);
 
   data = section->data;
 
@@ -1485,7 +1485,7 @@
     guint8 tmp;
     guint j = 0;
 
-    dim = g_slice_new0 (GstMpegtsAtscRRTDimension);
+    dim = g_new0 (GstMpegtsAtscRRTDimension, 1);
     g_ptr_array_add (rrt->dimensions, dim);
 
     text_length = GST_READ_UINT8 (data);
@@ -1505,7 +1505,7 @@
     for (j = 0; j < dim->values_defined; j++) {
       GstMpegtsAtscRRTDimensionValue *val;
 
-      val = g_slice_new0 (GstMpegtsAtscRRTDimensionValue);
+      val = g_new0 (GstMpegtsAtscRRTDimensionValue, 1);
       g_ptr_array_add (dim->values, val);
 
       text_length = GST_READ_UINT8 (data);
@@ -1710,7 +1710,7 @@
 {
   GstMpegtsAtscRRTDimensionValue *val;
 
-  val = g_slice_new0 (GstMpegtsAtscRRTDimensionValue);
+  val = g_new0 (GstMpegtsAtscRRTDimensionValue, 1);
   val->abbrev_ratings = g_ptr_array_new_with_free_func ((GDestroyNotify)
       _gst_mpegts_atsc_mult_string_free);
   val->ratings = g_ptr_array_new_with_free_func ((GDestroyNotify)
@@ -1730,7 +1730,7 @@
 {
   GstMpegtsAtscRRTDimension *dim;
 
-  dim = g_slice_new0 (GstMpegtsAtscRRTDimension);
+  dim = g_new0 (GstMpegtsAtscRRTDimension, 1);
   dim->names = g_ptr_array_new_with_free_func ((GDestroyNotify)
       _gst_mpegts_atsc_mult_string_free);
   dim->values = g_ptr_array_new_with_free_func ((GDestroyNotify)
@@ -1750,7 +1750,7 @@
 {
   GstMpegtsAtscRRT *rrt;
 
-  rrt = g_slice_new0 (GstMpegtsAtscRRT);
+  rrt = g_new0 (GstMpegtsAtscRRT, 1);
   rrt->names = g_ptr_array_new_with_free_func ((GDestroyNotify)
       _gst_mpegts_atsc_mult_string_free);
   rrt->dimensions = g_ptr_array_new_with_free_func ((GDestroyNotify)

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/mpegts/gst-dvb-descriptor.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/gst-dvb-descriptor.c Changed

@@ -60,13 +60,13 @@
 #define DEFINE_STATIC_COPY_FUNCTION(type, name) \
 static type * _##name##_copy (type * source) \
 { \
-  return g_slice_dup (type, source); \
+  return g_memdup2 (source, sizeof (type)); \
 }
 
 #define DEFINE_STATIC_FREE_FUNCTION(type, name) \
 static void _##name##_free (type * source) \
 { \
-  g_slice_free (type, source); \
+  g_free (source); \
 }
 
 /* GST_MTS_DESC_DVB_NETWORK_NAME (0x40) */
@@ -169,8 +169,7 @@
       _gst_mpegts_dvb_service_list_item_free);
 
   for (i = 0; i < descriptor->length - 2; i += 3) {
-    GstMpegtsDVBServiceListItem *item =
-        g_slice_new0 (GstMpegtsDVBServiceListItem);
+    GstMpegtsDVBServiceListItem *item = g_new0 (GstMpegtsDVBServiceListItem, 1);
 
     g_ptr_array_add (*list, item);
     item->service_id = GST_READ_UINT16_BE (data);
@@ -331,7 +330,7 @@
 void gst_mpegts_dvb_cable_delivery_system_descriptor_free
     (GstMpegtsCableDeliverySystemDescriptor * source)
 {
-  g_slice_free (GstMpegtsCableDeliverySystemDescriptor, source);
+  g_free (source);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsCableDeliverySystemDescriptor,
@@ -582,16 +581,16 @@
 {
   GstMpegtsDVBLinkageDescriptor *copy;
 
-  copy = g_slice_dup (GstMpegtsDVBLinkageDescriptor, source);
+  copy = g_memdup2 (source, sizeof (GstMpegtsDVBLinkageDescriptor));
 
   switch (source->linkage_type) {
     case GST_MPEGTS_DVB_LINKAGE_MOBILE_HAND_OVER:
-      copy->linkage_data = g_slice_dup (GstMpegtsDVBLinkageMobileHandOver,
-          source->linkage_data);
+      copy->linkage_data = g_memdup2 (source->linkage_data,
+          sizeof (GstMpegtsDVBLinkageMobileHandOver));
       break;
     case GST_MPEGTS_DVB_LINKAGE_EVENT:
-      copy->linkage_data = g_slice_dup (GstMpegtsDVBLinkageEvent,
-          source->linkage_data);
+      copy->linkage_data = g_memdup2 (source->linkage_data,
+          sizeof (GstMpegtsDVBLinkageEvent));
       break;
     case GST_MPEGTS_DVB_LINKAGE_EXTENDED_EVENT:
       copy->linkage_data = g_ptr_array_ref (source->linkage_data);
@@ -612,10 +611,10 @@
   if (source->linkage_data)
     switch (source->linkage_type) {
       case GST_MPEGTS_DVB_LINKAGE_MOBILE_HAND_OVER:
-        g_slice_free (GstMpegtsDVBLinkageMobileHandOver, source->linkage_data);
+        g_free (source->linkage_data);
         break;
       case GST_MPEGTS_DVB_LINKAGE_EVENT:
-        g_slice_free (GstMpegtsDVBLinkageEvent, source->linkage_data);
+        g_free (source->linkage_data);
         break;
       case GST_MPEGTS_DVB_LINKAGE_EXTENDED_EVENT:
         g_ptr_array_unref (source->linkage_data);
@@ -625,7 +624,7 @@
     }
 
   g_free (source->private_data_bytes);
-  g_slice_free (GstMpegtsDVBLinkageDescriptor, source);
+  g_free (source);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsDVBLinkageDescriptor,
@@ -689,7 +688,7 @@
   data = (guint8 *) descriptor->data + 2;
   end = data + descriptor->length;
 
-  res = g_slice_new0 (GstMpegtsDVBLinkageDescriptor);
+  res = g_new0 (GstMpegtsDVBLinkageDescriptor, 1);
 
   res->transport_stream_id = GST_READ_UINT16_BE (data);
   data += 2;
@@ -710,7 +709,7 @@
       if (end - data < 1)
         goto fail;
 
-      hand_over = g_slice_new0 (GstMpegtsDVBLinkageMobileHandOver);
+      hand_over = g_new0 (GstMpegtsDVBLinkageMobileHandOver, 1);
       res->linkage_data = (gpointer) hand_over;
 
       hand_over->origin_type = (*data) & 0x01;
@@ -745,7 +744,7 @@
       if (end - data < 3)
         goto fail;
 
-      event = g_slice_new0 (GstMpegtsDVBLinkageEvent);
+      event = g_new0 (GstMpegtsDVBLinkageEvent, 1);
       res->linkage_data = (gpointer) event;
 
       event->target_event_id = GST_READ_UINT16_BE (data);
@@ -768,7 +767,7 @@
         if (end - data < 3)
           goto fail;
 
-        ext_event = g_slice_new0 (GstMpegtsDVBLinkageExtendedEvent);
+        ext_event = g_new0 (GstMpegtsDVBLinkageExtendedEvent, 1);
         g_ptr_array_add (res->linkage_data, ext_event);
 
         ext_event->target_event_id = GST_READ_UINT16_BE (data);
@@ -1092,7 +1091,7 @@
 {
   GstMpegtsExtendedEventDescriptor *copy;
 
-  copy = g_slice_dup (GstMpegtsExtendedEventDescriptor, source);
+  copy = g_memdup2 (source, sizeof (GstMpegtsExtendedEventDescriptor));
   copy->items = g_ptr_array_ref (source->items);
   copy->text = g_strdup (source->text);
 
@@ -1106,7 +1105,7 @@
   g_free (source->text);
   g_free (source->language_code);
   g_ptr_array_unref (source->items);
-  g_slice_free (GstMpegtsExtendedEventDescriptor, source);
+  g_free (source);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsExtendedEventDescriptor,
@@ -1118,7 +1117,7 @@
 _gst_mpegts_extended_event_item_copy (GstMpegtsExtendedEventItem * source)
 {
   GstMpegtsExtendedEventItem *copy =
-      g_slice_dup (GstMpegtsExtendedEventItem, source);
+      g_memdup2 (source, sizeof (GstMpegtsExtendedEventItem));
   copy->item_description = g_strdup (source->item_description);
   copy->item = g_strdup (source->item);
   return copy;
@@ -1129,7 +1128,7 @@
 {
   g_free (item->item);
   g_free (item->item_description);
-  g_slice_free (GstMpegtsExtendedEventItem, item);
+  g_free (item);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsExtendedEventItem,
@@ -1159,7 +1158,7 @@
   /* Need at least 6 bytes (1 for desc number, 3 for language code, 2 for the loop length) */
   __common_desc_checks (descriptor, GST_MTS_DESC_DVB_EXTENDED_EVENT, 6, FALSE);
 
-  res = g_slice_new0 (GstMpegtsExtendedEventDescriptor);
+  res = g_new0 (GstMpegtsExtendedEventDescriptor, 1);
 
   data = (guint8 *) descriptor->data + 2;
 
@@ -1185,7 +1184,7 @@
 
   pdata = data + len_item;
   while (data < pdata) {
-    item = g_slice_new0 (GstMpegtsExtendedEventItem);
+    item = g_new0 (GstMpegtsExtendedEventItem, 1);
     item->item_description =
         get_encoding_and_convert ((const gchar *) data + 1, *data);
 
@@ -1215,7 +1214,7 @@
 {
   GstMpegtsComponentDescriptor *copy;
 
-  copy = g_slice_dup (GstMpegtsComponentDescriptor, source);
+  copy = g_memdup2 (source, sizeof (GstMpegtsComponentDescriptor));
   copy->language_code = g_strdup (source->language_code);
   copy->text = g_strdup (source->text);
 
@@ -1227,7 +1226,7 @@
 {
   g_free (source->language_code);
   g_free (source->text);
-  g_slice_free (GstMpegtsComponentDescriptor, source);
+  g_free (source);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsComponentDescriptor,
@@ -1258,7 +1257,7 @@
 
   data = (guint8 *) descriptor->data + 2;
 
-  desc = g_slice_new0 (GstMpegtsComponentDescriptor);
+  desc = g_new0 (GstMpegtsComponentDescriptor, 1);
 
   desc->stream_content = *data & 0x0f;
   data += 1;
@@ -1382,7 +1381,7 @@
   *content = g_ptr_array_new_with_free_func ((GDestroyNotify)
       _gst_mpegts_content_free);
   for (i = 0; i < len;) {
-    GstMpegtsContent *cont = g_slice_new0 (GstMpegtsContent);
+    GstMpegtsContent *cont = g_new0 (GstMpegtsContent, 1);
     tmp = *data;
     cont->content_nibble_1 = (tmp & 0xf0) >> 4;
     cont->content_nibble_2 = tmp & 0x0f;
@@ -1403,7 +1402,7 @@
     source)
 {
   GstMpegtsDVBParentalRatingItem *copy =
-      g_slice_dup (GstMpegtsDVBParentalRatingItem, source);
+      g_memdup2 (source, sizeof (GstMpegtsDVBParentalRatingItem));
   copy->country_code = g_strdup (source->country_code);
   return copy;
 }
@@ -1413,7 +1412,7 @@
     item)
 {
   g_free (item->country_code);
-  g_slice_free (GstMpegtsDVBParentalRatingItem, item);
+  g_free (item);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsDVBParentalRatingItem,
@@ -1449,7 +1448,7 @@
 
   for (i = 0; i < descriptor->length - 3; i += 4) {
     GstMpegtsDVBParentalRatingItem *item =
-        g_slice_new0 (GstMpegtsDVBParentalRatingItem);
+        g_new0 (GstMpegtsDVBParentalRatingItem, 1);
     g_ptr_array_add (*rating, item);
 
     item->country_code = convert_lang_code (data);
@@ -1686,7 +1685,7 @@
     (GstMpegtsDvbMultilingualNetworkNameItem * source)
 {
   GstMpegtsDvbMultilingualNetworkNameItem *copy =
-      g_slice_dup (GstMpegtsDvbMultilingualNetworkNameItem, source);
+      g_memdup2 (source, sizeof (GstMpegtsDvbMultilingualNetworkNameItem));
   copy->language_code = g_strdup (source->language_code);
   copy->network_name = g_strdup (source->network_name);
   return copy;
@@ -1698,7 +1697,7 @@
 {
   g_free (item->network_name);
   g_free (item->language_code);
-  g_slice_free (GstMpegtsDvbMultilingualNetworkNameItem, item);
+  g_free (item);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsDvbMultilingualNetworkNameItem,
@@ -1735,7 +1734,7 @@
       _gst_mpegts_dvb_multilingual_network_name_item_free);
 
   for (i = 0; i < descriptor->length - 3;) {
-    item = g_slice_new0 (GstMpegtsDvbMultilingualNetworkNameItem);
+    item = g_new0 (GstMpegtsDvbMultilingualNetworkNameItem, 1);
     g_ptr_array_add (*network_name_items, item);
     item->language_code = convert_lang_code (data);
     data += 3;
@@ -1758,7 +1757,7 @@
     (GstMpegtsDvbMultilingualBouquetNameItem * source)
 {
   GstMpegtsDvbMultilingualBouquetNameItem *copy =
-      g_slice_dup (GstMpegtsDvbMultilingualBouquetNameItem, source);
+      g_memdup2 (source, sizeof (GstMpegtsDvbMultilingualBouquetNameItem));
   copy->bouquet_name = g_strdup (source->bouquet_name);
   copy->language_code = g_strdup (source->language_code);
   return copy;
@@ -1770,7 +1769,7 @@
 {
   g_free (item->language_code);
   g_free (item->bouquet_name);
-  g_slice_free (GstMpegtsDvbMultilingualBouquetNameItem, item);
+  g_free (item);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsDvbMultilingualBouquetNameItem,
@@ -1807,7 +1806,7 @@
       _gst_mpegts_dvb_multilingual_bouquet_name_item_free);
 
   for (i = 0; i < descriptor->length - 3;) {
-    item = g_slice_new0 (GstMpegtsDvbMultilingualBouquetNameItem);
+    item = g_new0 (GstMpegtsDvbMultilingualBouquetNameItem, 1);
     g_ptr_array_add (*bouquet_name_items, item);
     item->language_code = convert_lang_code (data);
     data += 3;
@@ -1830,7 +1829,7 @@
     (GstMpegtsDvbMultilingualServiceNameItem * source)
 {
   GstMpegtsDvbMultilingualServiceNameItem *copy =
-      g_slice_dup (GstMpegtsDvbMultilingualServiceNameItem, source);
+      g_memdup2 (source, sizeof (GstMpegtsDvbMultilingualServiceNameItem));
   copy->language_code = g_strdup (source->language_code);
   copy->service_name = g_strdup (source->service_name);
   copy->provider_name = g_strdup (source->provider_name);
@@ -1844,7 +1843,7 @@
   g_free (item->provider_name);
   g_free (item->service_name);
   g_free (item->language_code);
-  g_slice_free (GstMpegtsDvbMultilingualServiceNameItem, item);
+  g_free (item);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsDvbMultilingualServiceNameItem,
@@ -1881,7 +1880,7 @@
       _gst_mpegts_dvb_multilingual_service_name_item_free);
 
   for (i = 0; i < descriptor->length - 3;) {
-    item = g_slice_new0 (GstMpegtsDvbMultilingualServiceNameItem);
+    item = g_new0 (GstMpegtsDvbMultilingualServiceNameItem, 1);
     g_ptr_array_add (*service_name_items, item);
     item->language_code = convert_lang_code (data);
     data += 3;
@@ -1910,7 +1909,7 @@
     (GstMpegtsDvbMultilingualComponentItem * source)
 {
   GstMpegtsDvbMultilingualComponentItem *copy =
-      g_slice_dup (GstMpegtsDvbMultilingualComponentItem, source);
+      g_memdup2 (source, sizeof (GstMpegtsDvbMultilingualComponentItem));
   copy->description = g_strdup (source->description);
   copy->language_code = g_strdup (source->language_code);
   return copy;
@@ -1922,7 +1921,7 @@
 {
   g_free (item->language_code);
   g_free (item->description);
-  g_slice_free (GstMpegtsDvbMultilingualComponentItem, item);
+  g_free (item);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsDvbMultilingualComponentItem,
@@ -1965,7 +1964,7 @@
       _gst_mpegts_dvb_multilingual_component_item_free);
 
   for (i = 0; i < descriptor->length - 3;) {
-    item = g_slice_new0 (GstMpegtsDvbMultilingualComponentItem);
+    item = g_new0 (GstMpegtsDvbMultilingualComponentItem, 1);
     g_ptr_array_add (*component_description_items, item);
     item->language_code = convert_lang_code (data);
     data += 3;
@@ -2089,7 +2088,7 @@
 {
   GstMpegtsDataBroadcastDescriptor *copy;
 
-  copy = g_slice_dup (GstMpegtsDataBroadcastDescriptor, source);
+  copy = g_memdup2 (source, sizeof (GstMpegtsDataBroadcastDescriptor));
 
   copy->selector_bytes = g_memdup2 (source->selector_bytes, source->length);
   copy->language_code = g_strdup (source->language_code);
@@ -2105,7 +2104,7 @@
   g_free (source->selector_bytes);
   g_free (source->language_code);
   g_free (source->text);
-  g_slice_free (GstMpegtsDataBroadcastDescriptor, source);
+  g_free (source);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsDataBroadcastDescriptor,
@@ -2134,7 +2133,7 @@
 
   data = (guint8 *) descriptor->data + 2;
 
-  res = g_slice_new0 (GstMpegtsDataBroadcastDescriptor);
+  res = g_new0 (GstMpegtsDataBroadcastDescriptor, 1);
 
   res->data_broadcast_id = GST_READ_UINT16_BE (data);
   data += 2;
@@ -2232,7 +2231,7 @@
 {
   GstMpegtsT2DeliverySystemDescriptor *copy;
 
-  copy = g_slice_dup (GstMpegtsT2DeliverySystemDescriptor, source);
+  copy = g_memdup2 (source, sizeof (GstMpegtsT2DeliverySystemDescriptor));
   copy->cells = g_ptr_array_ref (source->cells);
 
   return copy;
@@ -2242,7 +2241,7 @@
     (GstMpegtsT2DeliverySystemDescriptor * source)
 {
   g_ptr_array_unref (source->cells);
-  g_slice_free (GstMpegtsT2DeliverySystemDescriptor, source);
+  g_free (source);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsT2DeliverySystemDescriptor,
@@ -2266,7 +2265,7 @@
     * source)
 {
   GstMpegtsT2DeliverySystemCell *copy =
-      g_slice_dup (GstMpegtsT2DeliverySystemCell, source);
+      g_memdup2 (source, sizeof (GstMpegtsT2DeliverySystemCell));
   copy->centre_frequencies = g_array_ref (source->centre_frequencies);
   copy->sub_cells = g_ptr_array_ref (source->sub_cells);
   return copy;
@@ -2277,7 +2276,7 @@
 {
   g_ptr_array_unref (cell->sub_cells);
   g_array_unref (cell->centre_frequencies);
-  g_slice_free (GstMpegtsT2DeliverySystemCell, cell);
+  g_free (cell);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsT2DeliverySystemCell,
@@ -2310,7 +2309,7 @@
 
   data = (guint8 *) descriptor->data + 3;
 
-  res = g_slice_new0 (GstMpegtsT2DeliverySystemDescriptor);
+  res = g_new0 (GstMpegtsT2DeliverySystemDescriptor, 1);
 
   res->plp_id = *data;
   data += 1;
@@ -2407,7 +2406,7 @@
       GstMpegtsT2DeliverySystemCell *cell;
       guint8 j, k;
 
-      cell = g_slice_new0 (GstMpegtsT2DeliverySystemCell);
+      cell = g_new0 (GstMpegtsT2DeliverySystemCell, 1);
       g_ptr_array_add (res->cells, cell);
 
       cell->cell_id = GST_READ_UINT16_BE (data);
@@ -2443,7 +2442,7 @@
 
       for (k = 0; k < sub_cell_len;) {
         GstMpegtsT2DeliverySystemCellExtension *cell_ext;
-        cell_ext = g_slice_new0 (GstMpegtsT2DeliverySystemCellExtension);
+        cell_ext = g_new0 (GstMpegtsT2DeliverySystemCellExtension, 1);
 
         g_ptr_array_add (cell->sub_cells, cell_ext);
         cell_ext->cell_id_extension = *data;
@@ -2493,7 +2492,7 @@
   data += 1;
 
   for (i = 0; i < num_preselections; i++) {
-    item = g_slice_new0 (GstMpegtsAudioPreselectionDescriptor);
+    item = g_new0 (GstMpegtsAudioPreselectionDescriptor, 1);
     g_ptr_array_add (*list, item);
 
     item->preselection_id = (*data & 0xF8) >> 3;
@@ -2546,7 +2545,7 @@
   if (source->language_code_present == 1) {
     g_free (source->language_code);
   }
-  g_slice_free (GstMpegtsAudioPreselectionDescriptor, source);
+  g_free (source);
 }
 
 void gst_mpegts_descriptor_parse_audio_preselection_dump

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/mpegts/gst-dvb-section.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/gst-dvb-section.c Changed

@@ -157,7 +157,7 @@
 {
   GstMpegtsEITEvent *copy;
 
-  copy = g_slice_dup (GstMpegtsEITEvent, eit);
+  copy = g_memdup2 (eit, sizeof (GstMpegtsEITEvent));
   copy->start_time = gst_date_time_ref (eit->start_time);
   copy->descriptors = g_ptr_array_ref (eit->descriptors);
 
@@ -171,7 +171,7 @@
     gst_date_time_unref (eit->start_time);
   if (eit->descriptors)
     g_ptr_array_unref (eit->descriptors);
-  g_slice_free (GstMpegtsEITEvent, eit);
+  g_free (eit);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsEITEvent, gst_mpegts_eit_event,
@@ -183,7 +183,7 @@
 {
   GstMpegtsEIT *copy;
 
-  copy = g_slice_dup (GstMpegtsEIT, eit);
+  copy = g_memdup2 (eit, sizeof (GstMpegtsEIT));
   copy->events = g_ptr_array_ref (eit->events);
 
   return copy;
@@ -193,7 +193,7 @@
 _gst_mpegts_eit_free (GstMpegtsEIT * eit)
 {
   g_ptr_array_unref (eit->events);
-  g_slice_free (GstMpegtsEIT, eit);
+  g_free (eit);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsEIT, gst_mpegts_eit,
@@ -207,7 +207,7 @@
   guint8 *data, *end, *duration_ptr;
   guint16 descriptors_loop_length;
 
-  eit = g_slice_new0 (GstMpegtsEIT);
+  eit = g_new0 (GstMpegtsEIT, 1);
 
   data = section->data;
   end = data + section->section_length;
@@ -241,7 +241,7 @@
       goto error;
     }
 
-    event = g_slice_new0 (GstMpegtsEITEvent);
+    event = g_new0 (GstMpegtsEITEvent, 1);
     g_ptr_array_add (eit->events, event);
 
     event->event_id = GST_READ_UINT16_BE (data);
@@ -313,7 +313,7 @@
 {
   GstMpegtsBATStream *copy;
 
-  copy = g_slice_dup (GstMpegtsBATStream, bat);
+  copy = g_memdup2 (bat, sizeof (GstMpegtsBATStream));
   copy->descriptors = g_ptr_array_ref (bat->descriptors);
 
   return copy;
@@ -324,7 +324,7 @@
 {
   if (bat->descriptors)
     g_ptr_array_unref (bat->descriptors);
-  g_slice_free (GstMpegtsBATStream, bat);
+  g_free (bat);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsBATStream, gst_mpegts_bat_stream,
@@ -336,7 +336,7 @@
 {
   GstMpegtsBAT *copy;
 
-  copy = g_slice_dup (GstMpegtsBAT, bat);
+  copy = g_memdup2 (bat, sizeof (GstMpegtsBAT));
   copy->descriptors = g_ptr_array_ref (bat->descriptors);
   copy->streams = g_ptr_array_ref (bat->streams);
 
@@ -350,7 +350,7 @@
     g_ptr_array_unref (bat->descriptors);
   if (bat->streams)
     g_ptr_array_unref (bat->streams);
-  g_slice_free (GstMpegtsBAT, bat);
+  g_free (bat);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsBAT, gst_mpegts_bat,
@@ -366,7 +366,7 @@
 
   GST_DEBUG ("BAT");
 
-  bat = g_slice_new0 (GstMpegtsBAT);
+  bat = g_new0 (GstMpegtsBAT, 1);
 
   data = section->data;
   end = data + section->section_length;
@@ -404,7 +404,7 @@
 
   /* read up to the CRC */
   while (transport_stream_loop_length - 4 > 0) {
-    GstMpegtsBATStream *stream = g_slice_new0 (GstMpegtsBATStream);
+    GstMpegtsBATStream *stream = g_new0 (GstMpegtsBATStream, 1);
 
     g_ptr_array_add (bat->streams, stream);
 
@@ -491,7 +491,7 @@
 {
   GstMpegtsNITStream *copy;
 
-  copy = g_slice_dup (GstMpegtsNITStream, nit);
+  copy = g_memdup2 (nit, sizeof (GstMpegtsNITStream));
   copy->descriptors = g_ptr_array_ref (nit->descriptors);
 
   return copy;
@@ -502,7 +502,7 @@
 {
   if (nit->descriptors)
     g_ptr_array_unref (nit->descriptors);
-  g_slice_free (GstMpegtsNITStream, nit);
+  g_free (nit);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsNITStream, gst_mpegts_nit_stream,
@@ -512,7 +512,7 @@
 static GstMpegtsNIT *
 _gst_mpegts_nit_copy (GstMpegtsNIT * nit)
 {
-  GstMpegtsNIT *copy = g_slice_dup (GstMpegtsNIT, nit);
+  GstMpegtsNIT *copy = g_memdup2 (nit, sizeof (GstMpegtsNIT));
 
   copy->descriptors = g_ptr_array_ref (nit->descriptors);
   copy->streams = g_ptr_array_ref (nit->streams);
@@ -526,7 +526,7 @@
   if (nit->descriptors)
     g_ptr_array_unref (nit->descriptors);
   g_ptr_array_unref (nit->streams);
-  g_slice_free (GstMpegtsNIT, nit);
+  g_free (nit);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsNIT, gst_mpegts_nit,
@@ -543,7 +543,7 @@
 
   GST_DEBUG ("NIT");
 
-  nit = g_slice_new0 (GstMpegtsNIT);
+  nit = g_new0 (GstMpegtsNIT, 1);
 
   data = section->data;
   end = data + section->section_length;
@@ -584,7 +584,7 @@
 
   /* read up to the CRC */
   while (transport_stream_loop_length - 4 > 0) {
-    GstMpegtsNITStream *stream = g_slice_new0 (GstMpegtsNITStream);
+    GstMpegtsNITStream *stream = g_new0 (GstMpegtsNITStream, 1);
 
     g_ptr_array_add (nit->streams, stream);
 
@@ -675,7 +675,7 @@
 {
   GstMpegtsNIT *nit;
 
-  nit = g_slice_new0 (GstMpegtsNIT);
+  nit = g_new0 (GstMpegtsNIT, 1);
 
   nit->descriptors = g_ptr_array_new_with_free_func ((GDestroyNotify)
       gst_mpegts_descriptor_free);
@@ -697,7 +697,7 @@
 {
   GstMpegtsNITStream *stream;
 
-  stream = g_slice_new0 (GstMpegtsNITStream);
+  stream = g_new0 (GstMpegtsNITStream, 1);
 
   stream->descriptors = g_ptr_array_new_with_free_func (
       (GDestroyNotify) gst_mpegts_descriptor_free);
@@ -834,7 +834,7 @@
 static GstMpegtsSDTService *
 _gst_mpegts_sdt_service_copy (GstMpegtsSDTService * sdt)
 {
-  GstMpegtsSDTService *copy = g_slice_dup (GstMpegtsSDTService, sdt);
+  GstMpegtsSDTService *copy = g_memdup2 (sdt, sizeof (GstMpegtsSDTService));
 
   copy->descriptors = g_ptr_array_ref (sdt->descriptors);
 
@@ -846,7 +846,7 @@
 {
   if (sdt->descriptors)
     g_ptr_array_unref (sdt->descriptors);
-  g_slice_free (GstMpegtsSDTService, sdt);
+  g_free (sdt);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsSDTService, gst_mpegts_sdt_service,
@@ -856,7 +856,7 @@
 static GstMpegtsSDT *
 _gst_mpegts_sdt_copy (GstMpegtsSDT * sdt)
 {
-  GstMpegtsSDT *copy = g_slice_dup (GstMpegtsSDT, sdt);
+  GstMpegtsSDT *copy = g_memdup2 (sdt, sizeof (GstMpegtsSDT));
 
   copy->services = g_ptr_array_ref (sdt->services);
 
@@ -867,7 +867,7 @@
 _gst_mpegts_sdt_free (GstMpegtsSDT * sdt)
 {
   g_ptr_array_unref (sdt->services);
-  g_slice_free (GstMpegtsSDT, sdt);
+  g_free (sdt);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsSDT, gst_mpegts_sdt,
@@ -886,7 +886,7 @@
 
   GST_DEBUG ("SDT");
 
-  sdt = g_slice_new0 (GstMpegtsSDT);
+  sdt = g_new0 (GstMpegtsSDT, 1);
 
   data = section->data;
   end = data + section->section_length;
@@ -911,7 +911,7 @@
 
   /* read up to the CRC */
   while (sdt_info_length - 4 > 0) {
-    GstMpegtsSDTService *service = g_slice_new0 (GstMpegtsSDTService);
+    GstMpegtsSDTService *service = g_new0 (GstMpegtsSDTService, 1);
     g_ptr_array_add (sdt->services, service);
 
     entry_begin = data;
@@ -1002,7 +1002,7 @@
 {
   GstMpegtsSDT *sdt;
 
-  sdt = g_slice_new0 (GstMpegtsSDT);
+  sdt = g_new0 (GstMpegtsSDT, 1);
 
   sdt->services = g_ptr_array_new_with_free_func ((GDestroyNotify)
       _gst_mpegts_sdt_service_free);
@@ -1022,7 +1022,7 @@
 {
   GstMpegtsSDTService *service;
 
-  service = g_slice_new0 (GstMpegtsSDTService);
+  service = g_new0 (GstMpegtsSDTService, 1);
 
   service->descriptors = g_ptr_array_new_with_free_func ((GDestroyNotify)
       gst_mpegts_descriptor_free);
@@ -1186,7 +1186,7 @@
 static GstMpegtsTOT *
 _gst_mpegts_tot_copy (GstMpegtsTOT * tot)
 {
-  GstMpegtsTOT *copy = g_slice_dup (GstMpegtsTOT, tot);
+  GstMpegtsTOT *copy = g_memdup2 (tot, sizeof (GstMpegtsTOT));
 
   if (tot->utc_time)
     copy->utc_time = gst_date_time_ref (tot->utc_time);
@@ -1202,7 +1202,7 @@
     gst_date_time_unref (tot->utc_time);
   if (tot->descriptors)
     g_ptr_array_unref (tot->descriptors);
-  g_slice_free (GstMpegtsTOT, tot);
+  g_free (tot);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsTOT, gst_mpegts_tot,
@@ -1217,7 +1217,7 @@
 
   GST_DEBUG ("TOT");
 
-  tot = g_slice_new0 (GstMpegtsTOT);
+  tot = g_new0 (GstMpegtsTOT, 1);
 
   tot->utc_time = _parse_utc_time (section->data + 3);
 
@@ -1260,7 +1260,7 @@
 static GstMpegtsSITService *
 _gst_mpegts_sit_service_copy (GstMpegtsSITService * sit)
 {
-  GstMpegtsSITService *copy = g_slice_dup (GstMpegtsSITService, sit);
+  GstMpegtsSITService *copy = g_memdup2 (sit, sizeof (GstMpegtsSITService));
 
   copy->service_id = sit->service_id;
   copy->running_status = sit->running_status;
@@ -1274,7 +1274,7 @@
 {
   if (sit->descriptors)
     g_ptr_array_unref (sit->descriptors);
-  g_slice_free (GstMpegtsSITService, sit);
+  g_free (sit);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsSITService, gst_mpegts_sit_service,
@@ -1284,7 +1284,7 @@
 static GstMpegtsSIT *
 _gst_mpegts_sit_copy (GstMpegtsSIT * sit)
 {
-  GstMpegtsSIT *copy = g_slice_dup (GstMpegtsSIT, sit);
+  GstMpegtsSIT *copy = g_memdup2 (sit, sizeof (GstMpegtsSIT));
 
   copy->services = g_ptr_array_ref (sit->services);
   copy->descriptors = g_ptr_array_ref (sit->descriptors);
@@ -1297,7 +1297,7 @@
 {
   g_ptr_array_unref (sit->services);
   g_ptr_array_unref (sit->descriptors);
-  g_slice_free (GstMpegtsSIT, sit);
+  g_free (sit);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsSIT, gst_mpegts_sit,
@@ -1315,7 +1315,7 @@
 
   GST_DEBUG ("SIT");
 
-  sit = g_slice_new0 (GstMpegtsSIT);
+  sit = g_new0 (GstMpegtsSIT, 1);
 
   data = section->data;
   end = data + section->section_length;
@@ -1337,7 +1337,7 @@
 
   /* read up to the CRC */
   while (sit_info_length - 4 > 0) {
-    GstMpegtsSITService *service = g_slice_new0 (GstMpegtsSITService);
+    GstMpegtsSITService *service = g_new0 (GstMpegtsSITService, 1);
     g_ptr_array_add (sit->services, service);
 
     entry_begin = data;

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/gst-metadata-descriptor.c Added

@@ -0,0 +1,137 @@
+/* Gstreamer
+ * Copyright 2023 Brad Hards <bradh@frogmouth.net>
+ *
+ * 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 "mpegts.h"
+#include "gstmpegts-private.h"
+
+#define GST_CAT_DEFAULT mpegts_debug
+
+static GstMpegtsMetadataDescriptor
+    * _gst_mpegts_metadata_descriptor_copy
+    (GstMpegtsMetadataDescriptor * source)
+{
+  GstMpegtsMetadataDescriptor *copy =
+      g_memdup2 (source, sizeof (GstMpegtsMetadataDescriptor));
+  return copy;
+}
+
+static void
+_gst_mpegts_metadata_descriptor_free (GstMpegtsMetadataDescriptor * desc)
+{
+  g_free (desc);
+}
+
+G_DEFINE_BOXED_TYPE (GstMpegtsMetadataDescriptor,
+    gst_mpegts_metadata_descriptor,
+    (GBoxedCopyFunc) _gst_mpegts_metadata_descriptor_copy,
+    (GFreeFunc) _gst_mpegts_metadata_descriptor_free);
+
+/**
+ * gst_mpegts_descriptor_parse_metadata:
+ * @descriptor: a %GST_TYPE_MPEGTS_METADATA_DESCRIPTOR #GstMpegtsDescriptor
+ * @res: (out) (transfer full): #GstMpegtsMetadataDescriptor
+ *
+ * Parses out the metadata descriptor from the @descriptor.
+ *
+ * See ISO/IEC 13818-1:2018 Section 2.6.60 and 2.6.61 for details.
+ * metadata_application_format is provided in Table 2-82. metadata_format is
+ * provided in Table 2-85.
+ *
+ * Returns: %TRUE if the parsing worked correctly, else %FALSE.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_mpegts_descriptor_parse_metadata (const GstMpegtsDescriptor * descriptor,
+    GstMpegtsMetadataDescriptor ** desc)
+{
+  guint8 *data;
+  guint8 flag;
+  GstMpegtsMetadataDescriptor *res;
+
+  g_return_val_if_fail (descriptor != NULL && desc != NULL, FALSE);
+  __common_desc_checks (descriptor, GST_MTS_DESC_METADATA, 5, FALSE);
+
+  data = (guint8 *) descriptor->data + 2;
+
+  res = g_new0 (GstMpegtsMetadataDescriptor, 1);
+
+  res->metadata_application_format = GST_READ_UINT16_BE (data);
+  data += 2;
+  if (res->metadata_application_format == 0xFFFF) {
+    // skip over metadata_application_format_identifier if it is provided
+    data += 4;
+  }
+  res->metadata_format = *data;
+  data += 1;
+  if (res->metadata_format == GST_MPEGTS_METADATA_FORMAT_IDENTIFIER_FIELD) {
+    res->metadata_format_identifier = GST_READ_UINT32_BE (data);
+    data += 4;
+  }
+  res->metadata_service_id = *data;
+  data += 1;
+  flag = *data;
+  res->decoder_config_flags = flag >> 5;
+  res->dsm_cc_flag = (flag & 0x10);
+
+  // There are more values if the dsm_cc_flag or decoder flags are set.
+
+  *desc = res;
+
+  return TRUE;
+}
+
+/**
+ * gst_mpegts_descriptor_parse_metadata_std:
+ * @descriptor: a %GST_MTS_DESC_METADATA_STD #GstMpegtsDescriptor
+ * @metadata_input_leak_rate (out): the input leak rate in units of 400bits/sec.
+ * @metadata_buffer_size (out): the buffer size in units of 1024 bytes
+ * @metadata_output_leak_rate (out): the output leak rate in units of 400bits/sec.
+ *
+ * Extracts the metadata STD descriptor from @descriptor.
+ *
+ * See ISO/IEC 13818-1:2018 Section 2.6.62 and 2.6.63 for details.
+ *
+ * Returns: %TRUE if parsing succeeded, else %FALSE.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_mpegts_descriptor_parse_metadata_std (const GstMpegtsDescriptor *
+    descriptor, guint32 * metadata_input_leak_rate,
+    guint32 * metadata_buffer_size, guint32 * metadata_output_leak_rate)
+{
+  guint8 *data;
+
+  g_return_val_if_fail (descriptor != NULL && metadata_input_leak_rate != NULL
+      && metadata_buffer_size != NULL
+      && metadata_output_leak_rate != NULL, FALSE);
+  __common_desc_checks (descriptor, GST_MTS_DESC_METADATA_STD, 9, FALSE);
+  data = (guint8 *) descriptor->data + 2;
+  *metadata_input_leak_rate = GST_READ_UINT24_BE (data) & 0x3FFFFF;
+  data += 3;
+  *metadata_buffer_size = GST_READ_UINT24_BE (data) & 0x3FFFFF;
+  data += 3;
+  *metadata_output_leak_rate = GST_READ_UINT24_BE (data) & 0x3FFFFF;
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/gst-metadata-descriptor.h Added

@@ -0,0 +1,116 @@
+/* Gstreamer
+ * Copyright 2023 Brad Hards <bradh@frogmouth.net>
+ *
+ * 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_MPEGTS_METADATA_DESCRIPTOR_H__
+#define __GST_MPEGTS_METADATA_DESCRIPTOR_H__
+
+#include <gst/gst.h>
+#include <gst/mpegts/mpegts-prelude.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GstMpegtsMetadataFormat:
+ *
+ * metadata_descriptor metadata_format valid values. See ISO/IEC 13818-1:2018(E) Table 2-85.
+ *
+ * Since: 1.24
+ */
+typedef enum {
+  /**
+   * GST_MPEGTS_METADATA_FORMAT_TEM:
+   *
+   * ISO/IEC 15938-1 TeM.
+   *
+   * Since: 1.24
+   */
+  GST_MPEGTS_METADATA_FORMAT_TEM = 0x10,
+  /**
+   * GST_MPEGTS_METADATA_FORMAT_BIM:
+   *
+   * ISO/IEC 15938-1 BiM.
+   *
+   * Since: 1.24
+   */
+  GST_MPEGTS_METADATA_FORMAT_BIM = 0x11,
+  /**
+   * GST_MPEGTS_METADATA_FORMAT_APPLICATION_FORMAT:
+   *
+   * Defined by metadata application format.
+   *
+   * Since: 1.24
+   */
+  GST_MPEGTS_METADATA_FORMAT_APPLICATION_FORMAT = 0x3f,
+  /**
+   * GST_MPEGTS_METADATA_FORMAT_IDENTIFIER_FIELD:
+   *
+   * Defined by metadata_format_identifier field.
+   *
+   * Since: 1.24
+   */
+  GST_MPEGTS_METADATA_FORMAT_IDENTIFIER_FIELD = 0xff
+} GstMpegtsMetadataFormat;
+
+
+/* MPEG-TS Metadata Descriptor (0x26) */
+typedef struct _GstMpegtsMetadataDescriptor GstMpegtsMetadataDescriptor;
+
+/**
+ * GstMpegtsMetadataDescriptor:
+ * @metadata_application_format: specifies the application responsible for defining usage, syntax and semantics
+ * @metadata_format: indicates the format and coding of the metadata
+ * @metadata_format_identifier: format identifier (equivalent to registration descriptor), for example 0x4B4C4641 ('KLVA') to indicate SMPTE 336 KLV.
+ * @metadata_service_id:  metadata service to which this metadata descriptor applies, typically 0x00
+ * @decoder_config_flags: decoder flags, see ISO/IEC 13818-1:2018 Table 2-88.
+ * @dsm_cc_flag: true if stream associated with this descriptor is in an ISO/IEC 13818-6 data or object carousel.
+ *
+ * The metadata descriptor specifies parameters of a metadata service carried in an MPEG-2 Transport Stream (or Program Stream). The descriptor is included in the PMT in the descriptor loop for the elementary stream that carries the
+metadata service. The descriptor specifies the format of the associated metadata, and contains the value of the
+metadata_service_id to identify the metadata service to which the metadata descriptor applies.
+ *
+ * Note that this structure does not include all of the metadata_descriptor items, and will need extension to support DSM-CC and private data.
+ * See ISO/IEC 13818-1:2018 Section 2.6.60 and Section 2.6.61 for more information.
+ *
+ * Since: 1.24
+ */
+struct _GstMpegtsMetadataDescriptor
+{
+  guint16 metadata_application_format;
+  GstMpegtsMetadataFormat metadata_format;
+  guint32 metadata_format_identifier;
+  guint8 metadata_service_id;
+  guint8 decoder_config_flags;
+  gboolean dsm_cc_flag;
+};
+
+/**
+ * GST_TYPE_MPEGTS_METADATA_DESCRIPTOR:
+ *
+ * metadata_descriptor type
+ *
+ * Since: 1.24
+ */
+#define GST_TYPE_MPEGTS_METADATA_DESCRIPTOR (gst_mpegts_metadata_descriptor_get_type ())
+
+GST_MPEGTS_API
+GType gst_mpegts_metadata_descriptor_get_type (void);
+
+G_END_DECLS
+
+#endif

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/gst-mpegtspesmetadatameta.c Added

@@ -0,0 +1,106 @@
+/* Gstreamer
+ * Copyright 2021 Brad Hards <bradh@frogmouth.net>
+ *
+ * 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 "gst-mpegtspesmetadatameta.h"
+
+#define GST_CAT_DEFAULT mpegts_debug
+
+static gboolean
+gst_mpegts_pes_metadata_meta_init (GstMpegtsPESMetadataMeta * meta,
+    gpointer params, GstBuffer * buffer)
+{
+  return TRUE;
+}
+
+static void
+gst_mpegts_pes_metadata_meta_free (GstMpegtsPESMetadataMeta * meta,
+    GstBuffer * buffer)
+{
+}
+
+static gboolean
+gst_mpegts_pes_metadata_meta_transform (GstBuffer * dest, GstMeta * meta,
+    GstBuffer * buffer, GQuark type, gpointer data)
+{
+  GstMpegtsPESMetadataMeta *source_meta, *dest_meta;
+
+  source_meta = (GstMpegtsPESMetadataMeta *) meta;
+
+  if (GST_META_TRANSFORM_IS_COPY (type)) {
+    GstMetaTransformCopy *copy = data;
+    if (!copy->region) {
+      dest_meta = gst_buffer_add_mpegts_pes_metadata_meta (dest);
+      if (!dest_meta)
+        return FALSE;
+      dest_meta->metadata_service_id = source_meta->metadata_service_id;
+      dest_meta->flags = source_meta->flags;
+    }
+  } else {
+    /* return FALSE, if transform type is not supported */
+    return FALSE;
+  }
+  return TRUE;
+}
+
+GType
+gst_mpegts_pes_metadata_meta_api_get_type (void)
+{
+  static GType type;
+  static const gchar *tags = { NULL };
+
+  if (g_once_init_enter (&type)) {
+    GType _type =
+        gst_meta_api_type_register ("GstMpegtsPESMetadataMetaAPI", tags);
+    g_once_init_leave (&type, _type);
+  }
+  return type;
+}
+
+const GstMetaInfo *
+gst_mpegts_pes_metadata_meta_get_info (void)
+{
+  static const GstMetaInfo *mpegts_pes_metadata_meta_info = NULL;
+
+  if (g_once_init_enter ((GstMetaInfo **) & mpegts_pes_metadata_meta_info)) {
+    const GstMetaInfo *meta =
+        gst_meta_register (GST_MPEGTS_PES_METADATA_META_API_TYPE,
+        "GstMpegtsPESMetadataMeta", sizeof (GstMpegtsPESMetadataMeta),
+        (GstMetaInitFunction) gst_mpegts_pes_metadata_meta_init,
+        (GstMetaFreeFunction) gst_mpegts_pes_metadata_meta_free,
+        (GstMetaTransformFunction) gst_mpegts_pes_metadata_meta_transform);
+    g_once_init_leave ((GstMetaInfo **) & mpegts_pes_metadata_meta_info,
+        (GstMetaInfo *) meta);
+  }
+
+  return mpegts_pes_metadata_meta_info;
+}
+
+GstMpegtsPESMetadataMeta *
+gst_buffer_add_mpegts_pes_metadata_meta (GstBuffer * buffer)
+{
+  GstMpegtsPESMetadataMeta *meta;
+  meta =
+      (GstMpegtsPESMetadataMeta *) gst_buffer_add_meta (buffer,
+      GST_MPEGTS_PES_METADATA_META_INFO, NULL);
+  return meta;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/gst-mpegtspesmetadatameta.h Added

@@ -0,0 +1,108 @@
+/* Gstreamer
+ * Copyright 2021,2023 Brad Hards <bradh@frogmouth.net>
+ *
+ * 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_MPEGTS_PES_METADATA_META_H__
+#define __GST_MPEGTS_PES_METADATA_META_H__
+
+#include <gst/gst.h>
+#include <gst/mpegts/mpegts-prelude.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GstMpegtsPESMetadataMeta GstMpegtsPESMetadataMeta;
+
+/**
+ * gst_mpegts_pes_metadata_meta_api_get_type
+ *
+ * Return the #GType associated with #GstMpegtsPESMetadataMeta
+ *
+ * Returns: a #GType
+ *
+ * Since: 1.24
+ */
+GST_MPEGTS_API
+GType gst_mpegts_pes_metadata_meta_api_get_type (void);
+
+/**
+ * GST_MPEGTS_PES_METADATA_META_API_TYPE:
+ *
+ * The #GType associated with #GstMpegtsPESMetadataMeta.
+ *
+ * Since: 1.24
+ */
+#define GST_MPEGTS_PES_METADATA_META_API_TYPE  (gst_mpegts_pes_metadata_meta_api_get_type())
+
+/**
+ * GST_MPEGTS_PES_METADATA_META_INFO:
+ *
+ * The #GstMetaInfo associated with #GstMpegtsPESMetadataMeta.
+ *
+ * Since: 1.24
+ */
+#define GST_MPEGTS_PES_METADATA_META_INFO  (gst_mpegts_pes_metadata_meta_get_info())
+
+/**
+ * gst_mpegts_pes_metadata_meta_get_info:
+ *
+ * Gets the global #GstMetaInfo describing the #GstMpegtsPESMetadataMeta meta.
+ *
+ * Returns: (transfer none): The #GstMetaInfo
+ *
+ * Since: 1.24
+ */
+GST_MPEGTS_API
+const GstMetaInfo * gst_mpegts_pes_metadata_meta_get_info (void);
+
+/**
+ * GstMpegtsPESMetadataMeta:
+ * @meta: parent #GstMeta
+ * @metadata_service_id: metadata service identifier
+ * @flags: bit flags, see spec for details
+ *
+ * Extra buffer metadata describing the PES Metadata context.
+ * This is based on the Metadata AU cell header in
+ * ISO/IEC 13818-1:2018 Section 2.12.4.
+ *
+ * AU_cell_data_length is not provided, since it matches the length of the buffer
+ *
+ * Since: 1.24
+ */
+struct _GstMpegtsPESMetadataMeta {
+  GstMeta            meta;
+  guint8             metadata_service_id;
+  guint8             flags;
+};
+
+/**
+ * gst_buffer_add_mpegts_pes_metadata_meta:
+ * @buffer: a #GstBuffer
+ *
+ * Creates and adds a #GstMpegtsPESMetadataMeta to a @buffer.
+ *
+ * Returns: (transfer none): a newly created #GstMpegtsPESMetadataMeta
+ *
+ * Since: 1.24
+ */
+GST_MPEGTS_API
+GstMpegtsPESMetadataMeta *
+gst_buffer_add_mpegts_pes_metadata_meta (GstBuffer * buffer);
+
+G_END_DECLS
+
+#endif

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/mpegts/gst-scte-section.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/gst-scte-section.c Changed

@@ -46,7 +46,7 @@
 _gst_mpegts_scte_splice_event_copy (GstMpegtsSCTESpliceEvent * event)
 {
   GstMpegtsSCTESpliceEvent *copy =
-      g_slice_dup (GstMpegtsSCTESpliceEvent, event);
+      g_memdup2 (event, sizeof (GstMpegtsSCTESpliceEvent));
 
   copy->components = g_ptr_array_ref (event->components);
 
@@ -57,7 +57,7 @@
 _gst_mpegts_scte_splice_event_free (GstMpegtsSCTESpliceEvent * event)
 {
   g_ptr_array_unref (event->components);
-  g_slice_free (GstMpegtsSCTESpliceEvent, event);
+  g_free (event);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsSCTESpliceEvent, gst_mpegts_scte_splice_event,
@@ -68,14 +68,14 @@
 _gst_mpegts_scte_splice_component_copy (GstMpegtsSCTESpliceComponent *
     component)
 {
-  return g_slice_dup (GstMpegtsSCTESpliceComponent, component);
+  return g_memdup2 (component, sizeof (GstMpegtsSCTESpliceComponent));
 }
 
 static void
 _gst_mpegts_scte_splice_component_free (GstMpegtsSCTESpliceComponent *
     component)
 {
-  g_slice_free (GstMpegtsSCTESpliceComponent, component);
+  g_free (component);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsSCTESpliceComponent,
@@ -88,7 +88,7 @@
     guint8 * end)
 {
   GstMpegtsSCTESpliceComponent *component =
-      g_slice_new0 (GstMpegtsSCTESpliceComponent);
+      g_new0 (GstMpegtsSCTESpliceComponent, 1);
   guint8 *data = *orig_data;
 
   if (data + 1 + 6 > end)
@@ -132,7 +132,7 @@
 static GstMpegtsSCTESpliceEvent *
 _parse_splice_event (guint8 ** orig_data, guint8 * end, gboolean insert_event)
 {
-  GstMpegtsSCTESpliceEvent *event = g_slice_new0 (GstMpegtsSCTESpliceEvent);
+  GstMpegtsSCTESpliceEvent *event = g_new0 (GstMpegtsSCTESpliceEvent, 1);
   guint8 *data = *orig_data;
 
   /* Note : +6 is because of the final descriptor_loop_length and CRC */
@@ -241,7 +241,7 @@
 static GstMpegtsSCTESIT *
 _gst_mpegts_scte_sit_copy (GstMpegtsSCTESIT * sit)
 {
-  GstMpegtsSCTESIT *copy = g_slice_dup (GstMpegtsSCTESIT, sit);
+  GstMpegtsSCTESIT *copy = g_memdup2 (sit, sizeof (GstMpegtsSCTESIT));
 
   copy->splices = g_ptr_array_ref (sit->splices);
   copy->descriptors = g_ptr_array_ref (sit->descriptors);
@@ -254,7 +254,7 @@
 {
   g_ptr_array_unref (sit->splices);
   g_ptr_array_unref (sit->descriptors);
-  g_slice_free (GstMpegtsSCTESIT, sit);
+  g_free (sit);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsSCTESIT, gst_mpegts_scte_sit,
@@ -278,7 +278,7 @@
     return NULL;
   }
 
-  sit = g_slice_new0 (GstMpegtsSCTESIT);
+  sit = g_new0 (GstMpegtsSCTESIT, 1);
 
   sit->fully_parsed = FALSE;
 
@@ -456,7 +456,7 @@
 {
   GstMpegtsSCTESIT *sit;
 
-  sit = g_slice_new0 (GstMpegtsSCTESIT);
+  sit = g_new0 (GstMpegtsSCTESIT, 1);
 
   /* Set all default values (which aren't already 0/NULL) */
   sit->tier = 0xfff;
@@ -606,7 +606,7 @@
 GstMpegtsSCTESpliceEvent *
 gst_mpegts_scte_splice_event_new (void)
 {
-  GstMpegtsSCTESpliceEvent *event = g_slice_new0 (GstMpegtsSCTESpliceEvent);
+  GstMpegtsSCTESpliceEvent *event = g_new0 (GstMpegtsSCTESpliceEvent, 1);
 
   /* Non-0 Default values */
   event->program_splice_flag = TRUE;
@@ -630,7 +630,7 @@
 gst_mpegts_scte_splice_component_new (guint8 tag)
 {
   GstMpegtsSCTESpliceComponent *component =
-      g_slice_new0 (GstMpegtsSCTESpliceComponent);
+      g_new0 (GstMpegtsSCTESpliceComponent, 1);
 
   component->tag = tag;

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/mpegts/gstmpegtsdescriptor.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/gstmpegtsdescriptor.c Changed

@@ -33,13 +33,13 @@
 #define DEFINE_STATIC_COPY_FUNCTION(type, name) \
 static type * _##name##_copy (type * source) \
 { \
-  return g_slice_dup (type, source); \
+  return g_memdup2 (source, sizeof (type)); \
 }
 
 #define DEFINE_STATIC_FREE_FUNCTION(type, name) \
 static void _##name##_free (type * source) \
 { \
-  g_slice_free (type, source); \
+  g_free (source); \
 }
 
 /**
@@ -656,7 +656,7 @@
   GstMpegtsDescriptor *descriptor;
   guint8 *data;
 
-  descriptor = g_slice_new (GstMpegtsDescriptor);
+  descriptor = g_new (GstMpegtsDescriptor, 1);
 
   descriptor->tag = tag;
   descriptor->tag_extension = 0;
@@ -678,7 +678,7 @@
   GstMpegtsDescriptor *descriptor;
   guint8 *data;
 
-  descriptor = g_slice_new (GstMpegtsDescriptor);
+  descriptor = g_new (GstMpegtsDescriptor, 1);
 
   descriptor->tag = tag;
   descriptor->tag_extension = tag_extension;
@@ -700,7 +700,7 @@
 {
   GstMpegtsDescriptor *copy;
 
-  copy = g_slice_dup (GstMpegtsDescriptor, desc);
+  copy = g_memdup2 (desc, sizeof (GstMpegtsDescriptor));
   copy->data = g_memdup2 (desc->data, desc->length + 2);
 
   return copy;
@@ -716,7 +716,7 @@
 gst_mpegts_descriptor_free (GstMpegtsDescriptor * desc)
 {
   g_free ((gpointer) desc->data);
-  g_slice_free (GstMpegtsDescriptor, desc);
+  g_free (desc);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsDescriptor, gst_mpegts_descriptor,
@@ -783,7 +783,7 @@
   data = buffer;
 
   for (i = 0; i < nb_desc; i++) {
-    GstMpegtsDescriptor *desc = g_slice_new0 (GstMpegtsDescriptor);
+    GstMpegtsDescriptor *desc = g_new0 (GstMpegtsDescriptor, 1);
 
     desc->data = data;
     desc->tag = *data++;
@@ -988,7 +988,7 @@
   GstMpegtsISO639LanguageDescriptor *copy;
   guint i;
 
-  copy = g_slice_dup (GstMpegtsISO639LanguageDescriptor, source);
+  copy = g_memdup2 (source, sizeof (GstMpegtsISO639LanguageDescriptor));
 
   for (i = 0; i < source->nb_language; i++) {
     copy->languagei = g_strdup (source->languagei);
@@ -1006,7 +1006,7 @@
   for (i = 0; i < desc->nb_language; i++) {
     g_free (desc->languagei);
   }
-  g_slice_free (GstMpegtsISO639LanguageDescriptor, desc);
+  g_free (desc);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsISO639LanguageDescriptor,
@@ -1040,7 +1040,7 @@
 
   data = (guint8 *) descriptor->data + 2;
 
-  res = g_slice_new0 (GstMpegtsISO639LanguageDescriptor);
+  res = g_new0 (GstMpegtsISO639LanguageDescriptor, 1);
 
   /* Each language is 3 + 1 bytes */
   res->nb_language = descriptor->length / 4;

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/mpegts/gstmpegtsdescriptor.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/gstmpegtsdescriptor.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/mpegts/gstmpegtssection.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/gstmpegtssection.c Changed

@@ -211,7 +211,7 @@
 
   g_free (section->data);
 
-  g_slice_free (GstMpegtsSection, section);
+  g_free (section);
 }
 
 static GstMpegtsSection *
@@ -219,7 +219,7 @@
 {
   GstMpegtsSection *copy;
 
-  copy = g_slice_new0 (GstMpegtsSection);
+  copy = g_new0 (GstMpegtsSection, 1);
   gst_mini_object_init (GST_MINI_OBJECT_CAST (copy), 0, MPEG_TYPE_TS_SECTION,
       (GstMiniObjectCopyFunction) _gst_mpegts_section_copy, NULL,
       (GstMiniObjectFreeFunction) _gst_mpegts_section_free);
@@ -437,13 +437,13 @@
 static GstMpegtsPatProgram *
 _mpegts_pat_program_copy (GstMpegtsPatProgram * orig)
 {
-  return g_slice_dup (GstMpegtsPatProgram, orig);
+  return g_memdup2 (orig, sizeof (GstMpegtsPatProgram));
 }
 
 static void
 _mpegts_pat_program_free (GstMpegtsPatProgram * orig)
 {
-  g_slice_free (GstMpegtsPatProgram, orig);
+  g_free (orig);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsPatProgram, gst_mpegts_pat_program,
@@ -474,7 +474,7 @@
   GST_LOG ("nb_programs %u", nb_programs);
 
   for (i = 0; i < nb_programs; i++) {
-    program = g_slice_new0 (GstMpegtsPatProgram);
+    program = g_new0 (GstMpegtsPatProgram, 1);
     program->program_number = GST_READ_UINT16_BE (data);
     data += 2;
 
@@ -558,7 +558,7 @@
 {
   GstMpegtsPatProgram *program;
 
-  program = g_slice_new0 (GstMpegtsPatProgram);
+  program = g_new0 (GstMpegtsPatProgram, 1);
 
   return program;
 }
@@ -639,7 +639,7 @@
 {
   GstMpegtsPMTStream *copy;
 
-  copy = g_slice_dup (GstMpegtsPMTStream, pmt);
+  copy = g_memdup2 (pmt, sizeof (GstMpegtsPMTStream));
   copy->descriptors = g_ptr_array_ref (pmt->descriptors);
 
   return copy;
@@ -650,7 +650,7 @@
 {
   if (pmt->descriptors)
     g_ptr_array_unref (pmt->descriptors);
-  g_slice_free (GstMpegtsPMTStream, pmt);
+  g_free (pmt);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsPMTStream, gst_mpegts_pmt_stream,
@@ -662,7 +662,7 @@
 {
   GstMpegtsPMT *copy;
 
-  copy = g_slice_dup (GstMpegtsPMT, pmt);
+  copy = g_memdup2 (pmt, sizeof (GstMpegtsPMT));
   if (pmt->descriptors)
     copy->descriptors = g_ptr_array_ref (pmt->descriptors);
   copy->streams = g_ptr_array_ref (pmt->streams);
@@ -677,7 +677,7 @@
     g_ptr_array_unref (pmt->descriptors);
   if (pmt->streams)
     g_ptr_array_unref (pmt->streams);
-  g_slice_free (GstMpegtsPMT, pmt);
+  g_free (pmt);
 }
 
 G_DEFINE_BOXED_TYPE (GstMpegtsPMT, gst_mpegts_pmt,
@@ -693,7 +693,7 @@
   guint program_info_length;
   guint stream_info_length;
 
-  pmt = g_slice_new0 (GstMpegtsPMT);
+  pmt = g_new0 (GstMpegtsPMT, 1);
 
   data = section->data;
   end = data + section->section_length;
@@ -730,7 +730,7 @@
   /* parse entries, cycle until there's space for another entry (at least 5
    * bytes) plus the CRC */
   while (data <= end - 4 - 5) {
-    GstMpegtsPMTStream *stream = g_slice_new0 (GstMpegtsPMTStream);
+    GstMpegtsPMTStream *stream = g_new0 (GstMpegtsPMTStream, 1);
 
     g_ptr_array_add (pmt->streams, stream);
 
@@ -811,7 +811,7 @@
 {
   GstMpegtsPMT *pmt;
 
-  pmt = g_slice_new0 (GstMpegtsPMT);
+  pmt = g_new0 (GstMpegtsPMT, 1);
 
   pmt->descriptors = g_ptr_array_new_with_free_func ((GDestroyNotify)
       gst_mpegts_descriptor_free);
@@ -833,7 +833,7 @@
 {
   GstMpegtsPMTStream *stream;
 
-  stream = g_slice_new0 (GstMpegtsPMTStream);
+  stream = g_new0 (GstMpegtsPMTStream, 1);
 
   stream->descriptors = g_ptr_array_new_with_free_func ((GDestroyNotify)
       gst_mpegts_descriptor_free);
@@ -1120,7 +1120,7 @@
 {
   GstMpegtsSection *section;
 
-  section = g_slice_new0 (GstMpegtsSection);
+  section = g_new0 (GstMpegtsSection, 1);
   gst_mini_object_init (GST_MINI_OBJECT_CAST (section), 0, MPEG_TYPE_TS_SECTION,
       (GstMiniObjectCopyFunction) _gst_mpegts_section_copy, NULL,
       (GstMiniObjectFreeFunction) _gst_mpegts_section_free);

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/mpegts/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/mpegts/mpegts.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mpegts/mpegts.h Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse Added

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstappendpipeline-private.h Added

@@ -0,0 +1,102 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2016, 2017 Metrological Group B.V.
+ * Copyright (C) 2016, 2017 Igalia S.L
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <glib-object.h>
+#include <gst/mse/mse-prelude.h>
+#include <gst/mse/gstmediasourcetrack-private.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_APPEND_PIPELINE (gst_append_pipeline_get_type())
+
+GST_MSE_PRIVATE
+G_DECLARE_FINAL_TYPE (GstAppendPipeline, gst_append_pipeline, GST,
+  APPEND_PIPELINE, GstObject);
+
+typedef struct
+{
+  void (*received_init_segment) (GstAppendPipeline   * self,
+                                 gpointer              user_data);
+  void (*duration_changed)      (GstAppendPipeline   * self,
+                                 gpointer              user_data);
+  void (*new_sample)            (GstAppendPipeline   * self,
+                                 GstMediaSourceTrack * track,
+                                 GstSample           * sample,
+                                 gpointer              user_data);
+  void (*eos)                   (GstAppendPipeline   * self,
+                                 GstMediaSourceTrack * track,
+                                 gpointer              user_data);
+  void (*error)                 (GstAppendPipeline   * self,
+                                 gpointer              user_data);
+} GstAppendPipelineCallbacks;
+
+GST_MSE_PRIVATE
+GstAppendPipeline * gst_append_pipeline_new (
+    GstAppendPipelineCallbacks * callbacks, gpointer user_data,
+    GError ** error);
+
+GST_MSE_PRIVATE
+GstFlowReturn gst_append_pipeline_append (GstAppendPipeline * self,
+    GstBuffer * buffer);
+
+GST_MSE_PRIVATE
+GstFlowReturn gst_append_pipeline_eos (GstAppendPipeline * self);
+
+GST_MSE_PRIVATE
+gboolean gst_append_pipeline_stop (GstAppendPipeline * self);
+
+GST_MSE_PRIVATE
+gboolean gst_append_pipeline_reset (GstAppendPipeline * self);
+
+GST_MSE_PRIVATE
+gsize gst_append_pipeline_n_tracks (GstAppendPipeline * self);
+
+GST_MSE_PRIVATE
+gboolean gst_append_pipeline_has_init_segment (GstAppendPipeline * self);
+
+GST_MSE_PRIVATE
+GstClockTime gst_append_pipeline_get_duration (GstAppendPipeline * self);
+
+GST_MSE_PRIVATE
+GPtrArray *gst_append_pipeline_get_audio_tracks (GstAppendPipeline * self);
+
+GST_MSE_PRIVATE
+GPtrArray *gst_append_pipeline_get_text_tracks (GstAppendPipeline * self);
+
+GST_MSE_PRIVATE
+GPtrArray *gst_append_pipeline_get_video_tracks (GstAppendPipeline * self);
+
+GST_MSE_PRIVATE
+gboolean gst_append_pipeline_get_eos (GstAppendPipeline * self);
+
+GST_MSE_PRIVATE
+void gst_append_pipeline_fail (GstAppendPipeline * self);
+
+GST_MSE_PRIVATE
+gboolean gst_append_pipeline_get_failed (GstAppendPipeline * self);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstappendpipeline.c Added

@@ -0,0 +1,978 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2016, 2017 Metrological Group B.V.
+ * Copyright (C) 2016, 2017 Igalia S.L
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstappendpipeline-private.h"
+
+#include "mse.h"
+
+#include "gstmselogging-private.h"
+#include "gstmsemediatype-private.h"
+#include "gstmediasourcetrack-private.h"
+
+#include <gst/gst.h>
+#include <gst/app/gstappsrc.h>
+#include <gst/app/gstappsink.h>
+
+typedef enum
+{
+  PARSE_ERROR,
+  IGNORED,
+  ADDED,
+} AddTrackResult;
+
+typedef struct
+{
+  GstAppendPipeline *pipeline;
+  GstTask *task;
+  GRecMutex mutex;
+  GstBus *bus;
+} BackgroundTask;
+
+typedef struct
+{
+  GstAppendPipelineCallbacks callbacks;
+  gpointer user_data;
+} Callbacks;
+
+typedef struct
+{
+  GstAppendPipeline *parent;
+  GstPad *src_pad;
+  GstAppSink *sink;
+  GstMediaSourceTrack *mse_track;
+  GstStream *stream;
+  GstClockTime previous_pts;
+} Track;
+
+typedef struct
+{
+  GstClockTime duration;
+  GPtrArray *video_tracks;
+  GPtrArray *audio_tracks;
+  GPtrArray *text_tracks;
+} InitSegment;
+
+struct _GstAppendPipeline
+{
+  GstObject parent_instance;
+
+  GstPipeline *pipeline;
+  GstAppSrc *src;
+  GstElement *parsebin;
+  GstBus *bus;
+
+  GstStreamCollection *streams;
+  GArray *tracks;
+
+  gboolean received_init_segment;
+  gboolean have_outstanding_samples;
+  InitSegment init_segment;
+
+  gboolean encountered_error;
+
+  BackgroundTask *task;
+
+  Callbacks callbacks;
+};
+
+G_DEFINE_TYPE (GstAppendPipeline, gst_append_pipeline, GST_TYPE_OBJECT);
+
+#define END_OF_APPEND "end-of-append"
+#define ABORT "abort"
+#define SHUTDOWN "shutdown"
+
+static void process_init_segment (GstAppendPipeline *);
+
+static gboolean
+send_abort (GstAppendPipeline * self)
+{
+  return gst_bus_post (self->bus, gst_message_new_application (NULL,
+          gst_structure_new_empty (ABORT)));
+}
+
+static gboolean
+send_shutdown (GstAppendPipeline * self)
+{
+  return gst_bus_post (self->bus, gst_message_new_application (NULL,
+          gst_structure_new_empty (SHUTDOWN)));
+}
+
+static GstEvent *
+new_end_of_append_event (void)
+{
+  GstStructure *structure = gst_structure_new_empty (END_OF_APPEND);
+  return gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, structure);
+}
+
+static gboolean
+is_end_of_append_event (GstEvent * event)
+{
+  return GST_EVENT_TYPE (event) == GST_EVENT_CUSTOM_DOWNSTREAM
+      && gst_event_has_name (event, END_OF_APPEND);
+}
+
+static inline guint
+n_tracks (GstAppendPipeline * self)
+{
+  return self->tracks->len;
+}
+
+static inline Track *
+index_track (GstAppendPipeline * self, guint i)
+{
+  return &g_array_index (self->tracks, Track, i);
+}
+
+static inline void
+call_parse_error (GstAppendPipeline * self)
+{
+  GstAppendPipelineCallbacks *callbacks = &self->callbacks.callbacks;
+  gpointer user_data = self->callbacks.user_data;
+
+  if (callbacks->error) {
+    callbacks->error (self, user_data);
+    GST_TRACE_OBJECT (self, "done");
+  } else {
+    GST_TRACE_OBJECT (self, "dropping");
+  }
+}
+
+static inline void
+call_received_init_segment (GstAppendPipeline * self)
+{
+  GstAppendPipelineCallbacks *callbacks = &self->callbacks.callbacks;
+  gpointer user_data = self->callbacks.user_data;
+
+  if (callbacks->received_init_segment) {
+    callbacks->received_init_segment (self, user_data);
+    GST_TRACE_OBJECT (self, "done");
+  } else {
+    GST_TRACE_OBJECT (self, "dropping");
+  }
+}
+
+static inline void
+call_new_sample (GstAppendPipeline * self, GstMediaSourceTrack * track,
+    GstSample * sample)
+{
+  GstAppendPipelineCallbacks *callbacks = &self->callbacks.callbacks;
+  gpointer user_data = self->callbacks.user_data;
+
+  if (callbacks->new_sample) {
+    callbacks->new_sample (self, track, sample, user_data);
+    GST_TRACE_OBJECT (self, "done");
+  } else {
+    GST_TRACE_OBJECT (self, "dropping");
+  }
+}
+
+static inline void
+call_duration_changed (GstAppendPipeline * self)
+{
+  GstAppendPipelineCallbacks *callbacks = &self->callbacks.callbacks;
+  gpointer user_data = self->callbacks.user_data;
+
+  if (callbacks->duration_changed) {
+    callbacks->duration_changed (self, user_data);
+    GST_TRACE_OBJECT (self, "done");
+  } else {
+    GST_TRACE_OBJECT (self, "dropping");
+  }
+}
+
+static inline void
+call_eos (GstAppendPipeline * self, GstMediaSourceTrack * track)
+{
+  GstAppendPipelineCallbacks *callbacks = &self->callbacks.callbacks;
+  gpointer user_data = self->callbacks.user_data;
+
+  if (callbacks->eos) {
+    callbacks->eos (self, track, user_data);
+    GST_TRACE_OBJECT (self, "done");
+  } else {
+    GST_TRACE_OBJECT (self, "dropping");
+  }
+}
+
+static inline GstSample *
+patch_missing_duration (GstAppendPipeline * self, GstSample * sample)
+{
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  if (!GST_BUFFER_DURATION_IS_VALID (buffer)) {
+    GST_BUFFER_DURATION (buffer) = GST_SECOND / 60;
+    GST_TRACE_OBJECT (self, "sample is missing duration, patched to %"
+        GST_TIMEP_FORMAT, &buffer->duration);
+  }
+  return sample;
+}
+
+static inline GstSample *
+patch_missing_pts (GstAppendPipeline * self, GstSample * sample, GstClockTime
+    fallback)
+{
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  if (!GST_BUFFER_PTS_IS_VALID (buffer) && GST_CLOCK_TIME_IS_VALID (fallback)) {
+    GST_TRACE_OBJECT (self, "sample is missing pts, patching with %"
+        GST_TIMEP_FORMAT, &fallback);
+    GST_BUFFER_PTS (buffer) = fallback;
+  }
+  return sample;
+}
+
+static inline GstSample *
+patch_missing_dts (GstAppendPipeline * self, GstSample * sample)
+{
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  if (!GST_BUFFER_DTS_IS_VALID (buffer) && GST_BUFFER_PTS_IS_VALID (buffer)) {
+    GST_TRACE_OBJECT (self, "sample is missing dts, patching with pts %"
+        GST_TIMEP_FORMAT, &buffer->pts);
+    GST_BUFFER_DTS (buffer) = GST_BUFFER_PTS (buffer);
+  }
+  return sample;
+}
+
+static gboolean
+consume_sample_from_track (GstAppendPipeline * self, Track * track)
+{
+  GstSample *sample = gst_app_sink_try_pull_sample (track->sink, 0);
+  if (sample == NULL) {
+    return FALSE;
+  }
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  if (!GST_IS_BUFFER (buffer)) {
+    GST_WARNING_OBJECT (self, "got null buffer in sample");
+    goto done;
+  }
+  sample = patch_missing_pts (self, sample, track->previous_pts);
+  sample = patch_missing_duration (self, sample);
+  sample = patch_missing_dts (self, sample);
+  track->previous_pts = GST_BUFFER_PTS (buffer);
+  call_new_sample (self, track->mse_track, sample);
+
+done:
+  gst_clear_sample (&sample);
+  return TRUE;
+}
+
+static void
+consume_all_samples (GstAppendPipeline * self)
+{
+  if (!self->received_init_segment) {
+    GST_DEBUG_OBJECT (self, "not all tracks are available, delaying");
+    self->have_outstanding_samples = TRUE;
+    return;
+  }
+  guint track_count = n_tracks (self);
+  while (TRUE) {
+    gboolean sample_consumed = FALSE;
+    for (guint i = 0; i < track_count; i++) {
+      Track *track = index_track (self, i);
+      sample_consumed |= consume_sample_from_track (self, track);
+    }
+    if (!sample_consumed) {
+      break;
+    }
+  }
+  call_duration_changed (self);
+  self->have_outstanding_samples = FALSE;
+}
+
+static void
+handle_shutdown (BackgroundTask * task)
+{
+  gst_task_stop (task->task);
+  GstAppendPipeline *self = task->pipeline;
+  guint track_count = n_tracks (self);
+  for (guint i = 0; i < track_count; i++) {
+    Track *track = index_track (self, i);
+    call_eos (self, track->mse_track);
+  }
+  call_eos (self, NULL);
+}
+
+static void
+handle_abort (BackgroundTask * task)
+{
+  gst_task_stop (task->task);
+}
+
+static void
+task_function (gpointer user_data)
+{
+  BackgroundTask *task = (BackgroundTask *) user_data;
+  GstAppendPipeline *self = task->pipeline;
+  GstMessage *message = gst_bus_timed_pop (task->bus, GST_CLOCK_TIME_NONE);
+  switch (GST_MESSAGE_TYPE (message)) {
+    case GST_MESSAGE_APPLICATION:{
+      if (gst_message_has_name (message, END_OF_APPEND)) {
+        GST_TRACE_OBJECT (self, "end of append");
+        consume_all_samples (self);
+        goto done;
+      }
+      if (gst_message_has_name (message, SHUTDOWN)) {
+        GST_DEBUG_OBJECT (self, "shutdown");
+        handle_shutdown (task);
+        goto done;
+      }
+      if (gst_message_has_name (message, ABORT)) {
+        GST_DEBUG_OBJECT (self, "abort");
+        handle_abort (task);
+        goto done;
+      }
+      g_error ("received unsupported application message");
+    }
+    case GST_MESSAGE_STREAM_COLLECTION:{
+      GST_DEBUG_OBJECT (self, "stream collection");
+      GstStreamCollection *streams;
+      gst_message_parse_stream_collection (message, &streams);
+      gst_clear_object (&self->streams);
+      self->streams = streams;
+      process_init_segment (self);
+      goto done;
+    }
+    case GST_MESSAGE_EOS:
+      GST_DEBUG_OBJECT (self, "end of stream");
+      if (self->have_outstanding_samples) {
+        GST_DEBUG_OBJECT (self, "consuming remaining samples before EOS");
+        consume_all_samples (self);
+      }
+      handle_shutdown (task);
+      goto done;
+    case GST_MESSAGE_ERROR:
+      GST_DEBUG_OBJECT (self, "error: %" GST_PTR_FORMAT, message);
+      self->encountered_error = TRUE;
+      call_parse_error (self);
+      handle_shutdown (task);
+      goto done;
+    default:
+      GST_TRACE_OBJECT (self, "ignoring message %" GST_PTR_FORMAT, message);
+      goto done;
+  }
+done:
+  gst_message_unref (message);
+}
+
+static inline GstAppSink *
+new_appsink (GstAppendPipeline * self, GstStreamType type)
+{
+  const gchar *type_name = gst_stream_type_get_name (type);
+  gchar *name = g_strdup_printf ("%s-%u", type_name, n_tracks (self));
+  GstAppSink *appsink =
+      GST_APP_SINK (gst_element_factory_make ("appsink", name));
+  gst_base_sink_set_sync (GST_BASE_SINK (appsink), FALSE);
+  gst_base_sink_set_async_enabled (GST_BASE_SINK (appsink), FALSE);
+  gst_base_sink_set_drop_out_of_segment (GST_BASE_SINK (appsink), FALSE);
+  gst_base_sink_set_last_sample_enabled (GST_BASE_SINK (appsink), FALSE);
+  g_free (name);
+  return appsink;
+}
+
+static GstPadProbeReturn
+black_hole_probe (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
+{
+  g_return_val_if_fail (GST_PAD_PROBE_INFO_TYPE (info) &
+      GST_PAD_PROBE_TYPE_BUFFER, GST_PAD_PROBE_DROP);
+  return GST_PAD_PROBE_DROP;
+}
+
+static GstPadProbeReturn
+event_probe (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
+{
+  GstAppendPipeline *self = GST_APPEND_PIPELINE (user_data);
+  GstEvent *event = GST_PAD_PROBE_INFO_EVENT (info);
+
+  if (is_end_of_append_event (event)) {
+    GST_TRACE_OBJECT (self, "end of append event");
+    if (gst_bus_post (self->bus, gst_message_new_application (NULL,
+                gst_structure_new_empty (END_OF_APPEND)))) {
+      return GST_PAD_PROBE_DROP;
+    } else {
+      GST_ERROR_OBJECT (self, "failed to post end of append");
+      goto error;
+    }
+  }
+
+  if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) {
+    GST_DEBUG_OBJECT (self, "eos event");
+    if (send_shutdown (self)) {
+      return GST_PAD_PROBE_OK;
+    } else {
+      GST_ERROR_OBJECT (self, "failed to post shutdown");
+      goto error;
+    }
+  }
+
+  return GST_PAD_PROBE_OK;
+
+error:
+  GST_PAD_PROBE_INFO_FLOW_RETURN (info) = GST_FLOW_ERROR;
+  gst_event_unref (event);
+  return GST_PAD_PROBE_HANDLED;
+}
+
+static AddTrackResult
+add_track (GstAppendPipeline * self, GstPad * pad, GstStream * stream,
+    GstCaps * caps, Track * added_track)
+{
+  GstStreamType type = gst_stream_get_stream_type (stream);
+  GstMediaSourceTrackType track_type =
+      gst_media_source_track_type_from_stream_type (type);
+
+  switch (type) {
+    case GST_STREAM_TYPE_AUDIO:
+    case GST_STREAM_TYPE_TEXT:
+    case GST_STREAM_TYPE_VIDEO:
+      break;
+    default:{
+      GST_DEBUG_OBJECT (self, "unexpected caps %" GST_PTR_FORMAT
+          ", using black hole probe", caps);
+      gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_BUFFER, black_hole_probe, self,
+          NULL);
+      return IGNORED;
+    }
+  }
+
+  if (type != GST_STREAM_TYPE_TEXT &&
+      !gst_media_source_media_type_is_caps_supported (caps)) {
+    GST_ERROR_OBJECT (self, "unsupported caps: %" GST_PTR_FORMAT, caps);
+    return PARSE_ERROR;
+  }
+
+  GstAppSink *appsink = new_appsink (self, type);
+  gst_bin_add (GST_BIN (self->pipeline), GST_ELEMENT (appsink));
+  gst_element_sync_state_with_parent (GST_ELEMENT (appsink));
+
+  GstPad *appsink_pad =
+      gst_element_get_static_pad (GST_ELEMENT (appsink), "sink");
+  GstPadLinkReturn link_result = gst_pad_link (pad, appsink_pad);
+  gst_clear_object (&appsink_pad);
+  if (GST_PAD_LINK_FAILED (link_result)) {
+    g_error ("failed to link parser to appsink: %s",
+        gst_pad_link_get_name (link_result));
+  }
+
+  Track track_template = {
+    .parent = self,
+    .sink = gst_object_ref (appsink),
+    .src_pad = gst_object_ref (pad),
+    .stream = gst_object_ref (stream),
+    .mse_track = gst_media_source_track_new_with_initial_caps (track_type,
+        GST_OBJECT_NAME (appsink), caps),
+    .previous_pts = GST_CLOCK_TIME_NONE,
+  };
+  g_array_append_val (self->tracks, track_template);
+
+  GST_TRACE_OBJECT (self, "added appsink %s to pad %s",
+      GST_OBJECT_NAME (appsink), GST_OBJECT_NAME (pad));
+
+  *added_track = track_template;
+
+  return ADDED;
+}
+
+static void
+clear_track (Track * track)
+{
+  gst_clear_object (&track->sink);
+  gst_clear_object (&track->src_pad);
+  gst_clear_object (&track->mse_track);
+  gst_clear_object (&track->stream);
+}
+
+static inline GPtrArray *
+init_segment_tracks_for (InitSegment * self, GstStreamType type)
+{
+  switch (type) {
+    case GST_STREAM_TYPE_AUDIO:
+      return self->audio_tracks;
+    case GST_STREAM_TYPE_TEXT:
+      return self->text_tracks;
+    case GST_STREAM_TYPE_VIDEO:
+      return self->video_tracks;
+    default:
+      g_assert_not_reached ();
+      return NULL;
+  }
+}
+
+static void
+process_init_segment_track (GstPad * pad, GstAppendPipeline * self)
+{
+  GST_OBJECT_LOCK (self);
+  InitSegment *init_segment = &self->init_segment;
+  GstStream *stream = gst_pad_get_stream (pad);
+  GstCaps *caps = gst_stream_get_caps (stream);
+  GST_DEBUG_OBJECT (self, "%" GST_PTR_FORMAT " got caps %" GST_PTR_FORMAT, pad,
+      caps);
+
+  if (gst_pad_is_linked (pad)) {
+    GST_TRACE_OBJECT (self, "%" GST_PTR_FORMAT " is already linked, skipping",
+        pad);
+    goto done;
+  }
+
+  if (!GST_IS_CAPS (caps)) {
+    GST_ERROR_OBJECT (self, "no caps on %" GST_PTR_FORMAT
+        " after stream collection", pad);
+    call_parse_error (self);
+    goto done;
+  }
+
+  Track track;
+  AddTrackResult result = add_track (self, pad, stream, caps, &track);
+  GstMediaSourceTrack *mse_track = track.mse_track;
+  switch (result) {
+    case ADDED:{
+      GstStreamType type = gst_stream_get_stream_type (stream);
+      GPtrArray *tracks = init_segment_tracks_for (init_segment, type);
+      if (tracks->len < 1) {
+        gst_media_source_track_set_active (mse_track, TRUE);
+      }
+      g_ptr_array_add (tracks, gst_object_ref (mse_track));
+      break;
+    }
+    case IGNORED:
+      break;
+    case PARSE_ERROR:
+      call_parse_error (self);
+      break;
+  }
+
+done:
+  gst_clear_object (&stream);
+  gst_clear_caps (&caps);
+  GST_OBJECT_UNLOCK (self);
+}
+
+static void
+on_pad_added (GstElement * parsebin, GstPad * pad, gpointer user_data)
+{
+  GstAppendPipeline *self = GST_APPEND_PIPELINE (user_data);
+  process_init_segment_track (pad, self);
+  process_init_segment (self);
+}
+
+static gboolean
+has_track_for_stream (GstAppendPipeline * self, GstStream * stream)
+{
+  guint track_count = n_tracks (self);
+  for (guint i = 0; i < track_count; i++) {
+    Track *track = index_track (self, i);
+    if (track->stream == stream) {
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+
+static gboolean
+has_all_tracks (GstAppendPipeline * self)
+{
+  if (!GST_IS_STREAM_COLLECTION (self->streams)) {
+    return FALSE;
+  }
+  for (guint i = 0; i < gst_stream_collection_get_size (self->streams); i++) {
+    GstStream *stream = gst_stream_collection_get_stream (self->streams, i);
+    switch (gst_stream_get_stream_type (stream)) {
+      case GST_STREAM_TYPE_AUDIO:
+      case GST_STREAM_TYPE_VIDEO:
+      case GST_STREAM_TYPE_TEXT:
+        break;
+      default:
+        continue;
+    }
+    if (!has_track_for_stream (self, stream)) {
+      return FALSE;
+    }
+  }
+  return TRUE;
+}
+
+static void
+process_init_segment (GstAppendPipeline * self)
+{
+  gint64 duration;
+  InitSegment *init_segment = &self->init_segment;
+
+  GST_OBJECT_LOCK (self);
+
+  if (!has_all_tracks (self)) {
+    goto done;
+  }
+
+  if (gst_element_query_duration (self->parsebin, GST_FORMAT_TIME, &duration)) {
+    init_segment->duration = MAX (0, duration);
+  } else {
+    init_segment->duration = GST_CLOCK_TIME_NONE;
+  }
+
+  GST_DEBUG_OBJECT (self, "init segment says duration=%" GST_TIME_FORMAT,
+      GST_TIME_ARGS ((GstClockTime) duration));
+
+  self->received_init_segment = TRUE;
+
+  call_received_init_segment (self);
+
+done:
+  GST_OBJECT_UNLOCK (self);
+}
+
+static inline void
+init_segment_init (InitSegment * self)
+{
+  self->audio_tracks = g_ptr_array_new_with_free_func (gst_object_unref);
+  self->text_tracks = g_ptr_array_new_with_free_func (gst_object_unref);
+  self->video_tracks = g_ptr_array_new_with_free_func (gst_object_unref);
+  self->duration = GST_CLOCK_TIME_NONE;
+}
+
+static inline void
+init_segment_finalize (InitSegment * self)
+{
+  g_ptr_array_free (self->audio_tracks, TRUE);
+  g_ptr_array_free (self->text_tracks, TRUE);
+  g_ptr_array_free (self->video_tracks, TRUE);
+}
+
+static GArray *
+new_tracks_array (void)
+{
+  GArray *tracks = g_array_new (TRUE, TRUE, sizeof (Track));
+  g_array_set_clear_func (tracks, (GDestroyNotify) clear_track);
+  return tracks;
+}
+
+static BackgroundTask *
+background_task_new (GstAppendPipeline * pipeline)
+{
+  BackgroundTask *task = g_new0 (BackgroundTask, 1);
+  g_rec_mutex_init (&task->mutex);
+  task->task = gst_task_new (task_function, task, NULL);
+  task->pipeline = pipeline;
+  task->bus = gst_object_ref (pipeline->bus);
+  gst_task_set_lock (task->task, &task->mutex);
+  return task;
+}
+
+static gboolean
+background_task_start (BackgroundTask * task)
+{
+  gst_bus_set_flushing (task->bus, FALSE);
+  return gst_task_start (task->task);
+}
+
+static gboolean
+background_task_stop (BackgroundTask * task)
+{
+  send_abort (task->pipeline);
+  gst_task_join (task->task);
+  gst_bus_set_flushing (task->bus, TRUE);
+  return TRUE;
+}
+
+static void
+background_task_cleanup (gpointer ptr)
+{
+  BackgroundTask *task = (BackgroundTask *) ptr;
+  background_task_stop (task);
+  task->pipeline = NULL;
+  gst_clear_object (&task->task);
+  gst_clear_object (&task->bus);
+  g_rec_mutex_clear (&task->mutex);
+  g_free (task);
+}
+
+static void
+gst_append_pipeline_init (GstAppendPipeline * self)
+{
+  GstElement *appsrc = GST_ELEMENT (gst_element_factory_make ("appsrc", "src"));
+  GstElement *parsebin =
+      GST_ELEMENT (gst_element_factory_make ("parsebin", "parse"));
+  GstElement *pipeline = gst_pipeline_new ("append-pipeline");
+
+  GstPad *appsrc_pad = GST_PAD (gst_element_get_static_pad (appsrc, "src"));
+  gst_pad_add_probe (appsrc_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
+      event_probe, self, NULL);
+  gst_object_unref (appsrc_pad);
+
+  gst_bin_add_many (GST_BIN (pipeline), appsrc, parsebin, NULL);
+  if (!gst_element_link (appsrc, parsebin)) {
+    g_error ("failed to link appsrc to parsebin");
+  }
+
+  self->bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
+  self->pipeline = gst_object_ref_sink (GST_PIPELINE (pipeline));
+  self->src = GST_APP_SRC (appsrc);
+  self->parsebin = parsebin;
+
+  self->task = background_task_new (self);
+
+  g_signal_connect_object (parsebin, "pad-added", G_CALLBACK (on_pad_added),
+      self, 0);
+
+  self->received_init_segment = FALSE;
+  self->encountered_error = FALSE;
+  self->tracks = new_tracks_array ();
+  init_segment_init (&self->init_segment);
+}
+
+static void
+gst_append_pipeline_dispose (GObject * object)
+{
+  GstAppendPipeline *self = (GstAppendPipeline *) object;
+
+  send_shutdown (self);
+  g_clear_pointer (&self->task, background_task_cleanup);
+
+  gst_element_set_state (GST_ELEMENT (self->pipeline), GST_STATE_NULL);
+
+  G_OBJECT_CLASS (gst_append_pipeline_parent_class)->dispose (object);
+}
+
+static void
+gst_append_pipeline_finalize (GObject * object)
+{
+  GstAppendPipeline *self = (GstAppendPipeline *) object;
+
+  gst_clear_object (&self->pipeline);
+  gst_clear_object (&self->bus);
+
+  init_segment_finalize (&self->init_segment);
+
+  g_array_free (self->tracks, TRUE);
+  gst_clear_object (&self->streams);
+
+  G_OBJECT_CLASS (gst_append_pipeline_parent_class)->finalize (object);
+}
+
+static void
+gst_append_pipeline_class_init (GstAppendPipelineClass * klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->dispose = GST_DEBUG_FUNCPTR (gst_append_pipeline_dispose);
+  oclass->finalize = GST_DEBUG_FUNCPTR (gst_append_pipeline_finalize);
+}
+
+GstAppendPipeline *
+gst_append_pipeline_new (GstAppendPipelineCallbacks * callbacks,
+    gpointer user_data, GError ** error)
+{
+  gst_mse_init_logging ();
+  GstAppendPipeline *self = g_object_new (GST_TYPE_APPEND_PIPELINE, NULL);
+  GstStateChangeReturn started =
+      gst_element_set_state (GST_ELEMENT (self->pipeline), GST_STATE_PLAYING);
+  if (started != GST_STATE_CHANGE_SUCCESS) {
+    GST_ERROR_OBJECT (self, "failed to start: %s",
+        gst_element_state_change_return_get_name (started));
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "failed to start append pipeline");
+    goto error;
+  }
+  if (callbacks) {
+    self->callbacks.callbacks = *callbacks;
+    self->callbacks.user_data = user_data;
+  }
+  if (!background_task_start (self->task)) {
+    GST_ERROR_OBJECT (self, "failed to start background task");
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "failed to start append pipeline's background task");
+    goto error;
+  }
+  return gst_object_ref_sink (self);
+error:
+  gst_clear_object (&self);
+  return NULL;
+}
+
+GstFlowReturn
+gst_append_pipeline_append (GstAppendPipeline * self, GstBuffer * buffer)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), GST_FLOW_ERROR);
+  GstFlowReturn push_result = gst_app_src_push_buffer (self->src, buffer);
+  if (push_result != GST_FLOW_OK)
+    return push_result;
+
+  if (!gst_element_send_event (GST_ELEMENT_CAST (self->src),
+          new_end_of_append_event ())) {
+    GST_ERROR_OBJECT (self, "failed to push end-of-append event");
+    return GST_FLOW_ERROR;
+  }
+  return GST_FLOW_OK;
+}
+
+GstFlowReturn
+gst_append_pipeline_eos (GstAppendPipeline * self)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), GST_FLOW_ERROR);
+  return gst_app_src_end_of_stream (self->src);
+}
+
+gboolean
+gst_append_pipeline_stop (GstAppendPipeline * self)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), FALSE);
+
+  GstElement *pipeline = GST_ELEMENT (self->pipeline);
+
+  GstStateChangeReturn stopped =
+      gst_element_set_state (pipeline, GST_STATE_NULL);
+  if (stopped != GST_STATE_CHANGE_SUCCESS) {
+    GST_ERROR_OBJECT (self, "failed to stop: %s",
+        gst_element_state_change_return_get_name (stopped));
+    return FALSE;
+  }
+  self->received_init_segment = FALSE;
+  self->encountered_error = FALSE;
+
+  return TRUE;
+}
+
+gboolean
+gst_append_pipeline_reset (GstAppendPipeline * self)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), FALSE);
+
+  GstElement *pipeline = GST_ELEMENT (self->pipeline);
+
+  GstStateChangeReturn stopped =
+      gst_element_set_state (pipeline, GST_STATE_READY);
+  if (stopped != GST_STATE_CHANGE_SUCCESS) {
+    GST_ERROR_OBJECT (self, "failed to stop: %s",
+        gst_element_state_change_return_get_name (stopped));
+    return FALSE;
+  }
+
+  background_task_stop (self->task);
+
+  init_segment_finalize (&self->init_segment);
+  gst_clear_object (&self->streams);
+  g_array_free (self->tracks, TRUE);
+
+  self->received_init_segment = FALSE;
+  self->have_outstanding_samples = FALSE;
+  self->encountered_error = FALSE;
+  self->tracks = new_tracks_array ();
+  init_segment_init (&self->init_segment);
+
+  if (!background_task_start (self->task)) {
+    GST_ERROR_OBJECT (self, "failed to start background task");
+    return FALSE;
+  }
+
+  GstStateChangeReturn started =
+      gst_element_set_state (pipeline, GST_STATE_PLAYING);
+  if (started == GST_STATE_CHANGE_SUCCESS) {
+    return TRUE;
+  } else {
+    GST_ERROR_OBJECT (self, "failed to start: %s",
+        gst_element_state_change_return_get_name (started));
+    return FALSE;
+  }
+}
+
+gsize
+gst_append_pipeline_n_tracks (GstAppendPipeline * self)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), 0);
+  return n_tracks (self);
+}
+
+gboolean
+gst_append_pipeline_has_init_segment (GstAppendPipeline * self)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), FALSE);
+  return self->received_init_segment;
+}
+
+GstClockTime
+gst_append_pipeline_get_duration (GstAppendPipeline * self)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), GST_CLOCK_TIME_NONE);
+  if (self->received_init_segment) {
+    return self->init_segment.duration;
+  } else {
+    return GST_CLOCK_TIME_NONE;
+  }
+}
+
+GPtrArray *
+gst_append_pipeline_get_audio_tracks (GstAppendPipeline * self)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), NULL);
+  if (self->received_init_segment) {
+    return self->init_segment.audio_tracks;
+  } else {
+    return NULL;
+  }
+}
+
+GPtrArray *
+gst_append_pipeline_get_text_tracks (GstAppendPipeline * self)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), NULL);
+  if (self->received_init_segment) {
+    return self->init_segment.text_tracks;
+  } else {
+    return NULL;
+  }
+}
+
+GPtrArray *
+gst_append_pipeline_get_video_tracks (GstAppendPipeline * self)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), NULL);
+  if (self->received_init_segment) {
+    return self->init_segment.video_tracks;
+  } else {
+    return NULL;
+  }
+}
+
+gboolean
+gst_append_pipeline_get_eos (GstAppendPipeline * self)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), FALSE);
+  return gst_task_get_state (self->task->task) != GST_TASK_STARTED;
+}
+
+void
+gst_append_pipeline_fail (GstAppendPipeline * self)
+{
+  g_return_if_fail (GST_IS_APPEND_PIPELINE (self));
+  gst_bus_post (self->bus, gst_message_new_error (NULL, NULL, NULL));
+}
+
+gboolean
+gst_append_pipeline_get_failed (GstAppendPipeline * self)
+{
+  g_return_val_if_fail (GST_IS_APPEND_PIPELINE (self), FALSE);
+  return self->encountered_error;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmediasource-private.h Added

@@ -0,0 +1,58 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstmediasource.h"
+#include "gstmseeventqueue-private.h"
+
+G_BEGIN_DECLS
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_is_attached (GstMediaSource * self);
+
+GST_MSE_PRIVATE
+void gst_media_source_open (GstMediaSource * self);
+
+GST_MSE_PRIVATE
+GstMseSrc * gst_media_source_get_source_element (GstMediaSource * self);
+
+GST_MSE_PRIVATE
+void gst_media_source_seek (GstMediaSource * self, GstClockTime time);
+
+struct _GstMediaSource
+{
+  GstObject parent_instance;
+
+  GstMseSrc *element;
+  GstMseEventQueue *event_queue;
+
+  GstSourceBufferList *buffers;
+  GstSourceBufferList *active_buffers;
+
+  GstMediaSourceRange live_seekable_range;
+
+  GstClockTime duration;
+  GstMediaSourceReadyState ready_state;
+};
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmediasource.c Added

@@ -0,0 +1,1063 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Orange
+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 Sebastian Dröge <sebastian@centricular.com>
+ * Copyright (C) 2015, 2016 Igalia, S.L
+ * Copyright (C) 2015, 2016 Metrological Group B.V.
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:gstmediasource
+ * @title: GstMediaSource
+ * @short_description: Media Source
+ * @symbols:
+ * - GstMediaSource
+ *
+ * #GstMediaSource is the entry point into the W3C Media Source API. It offers
+ * functionality similar to #GstAppSrc for client-side web or JavaScript
+ * applications decoupling the source of media from its processing and playback.
+ *
+ * To interact with a Media Source, connect it to a #GstMseSrc that is in some
+ * #GstPipeline using gst_media_source_attach(). Then create at least one
+ * #GstSourceBuffer using gst_media_source_add_source_buffer(). Finally, feed
+ * some media data to the Source Buffer(s) using
+ * gst_source_buffer_append_buffer() and play the pipeline.
+ *
+ * Since: 1.24
+ */
+
+/**
+ * GstMediaSource:
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/mse/mse-enumtypes.h>
+#include "gstmediasource.h"
+#include "gstmediasource-private.h"
+
+#include "gstmselogging-private.h"
+#include "gstmsemediatype-private.h"
+#include "gstsourcebuffer-private.h"
+#include "gstsourcebufferlist-private.h"
+
+#include "gstmsesrc.h"
+#include "gstmsesrc-private.h"
+
+G_DEFINE_TYPE (GstMediaSource, gst_media_source, GST_TYPE_OBJECT);
+G_DEFINE_QUARK (gst_media_source_error_quark, gst_media_source_error);
+
+enum
+{
+  PROP_0,
+
+  PROP_SOURCE_BUFFERS,
+  PROP_ACTIVE_SOURCE_BUFFERS,
+  PROP_READY_STATE,
+  PROP_POSITION,
+  PROP_DURATION,
+
+  N_PROPS,
+};
+
+typedef enum
+{
+  ON_SOURCE_OPEN,
+  ON_SOURCE_ENDED,
+  ON_SOURCE_CLOSE,
+
+  N_SIGNALS,
+} MediaSourceEvent;
+
+typedef struct
+{
+  GstDataQueueItem item;
+  MediaSourceEvent event;
+} MediaSourceEventItem;
+
+static GParamSpec *propertiesN_PROPS;
+static guint signalsN_SIGNALS;
+
+#define DEFAULT_READY_STATE GST_MEDIA_SOURCE_READY_STATE_CLOSED
+#define DEFAULT_POSITION    GST_CLOCK_TIME_NONE
+#define DEFAULT_DURATION    GST_CLOCK_TIME_NONE
+
+static void rebuild_active_source_buffers (GstMediaSource * self);
+
+/**
+ * gst_media_source_is_type_supported:
+ * @type: (transfer none): A MIME type value
+ *
+ * Determines whether the current Media Source configuration can process media
+ * of the supplied @type.
+ *
+ * Returns: `TRUE` when supported, `FALSE` otherwise
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_media_source_is_type_supported (const gchar * type)
+{
+  gst_mse_init_logging ();
+  g_return_val_if_fail (type != NULL, FALSE);
+
+  if (g_strcmp0 (type, "") == 0) {
+    return FALSE;
+  }
+
+  GstMediaSourceMediaType media_type = GST_MEDIA_SOURCE_MEDIA_TYPE_INIT;
+  if (!gst_media_source_media_type_parse (&media_type, type)) {
+    return FALSE;
+  }
+
+  gboolean supported = gst_media_source_media_type_is_supported (&media_type);
+
+  gst_media_source_media_type_reset (&media_type);
+
+  return supported;
+}
+
+/**
+ * gst_media_source_new:
+ *
+ * Creates a new #GstMediaSource instance. The instance is in the
+ * %GST_MEDIA_SOURCE_READY_STATE_CLOSED state and is not associated with any
+ * media player.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-constructor)
+ *
+ * Returns: (transfer full): a new #GstMediaSource instance
+ * Since: 1.24
+ */
+GstMediaSource *
+gst_media_source_new (void)
+{
+  gst_mse_init_logging ();
+  return g_object_ref_sink (g_object_new (GST_TYPE_MEDIA_SOURCE, NULL));
+}
+
+static inline void
+empty_buffers (GstMediaSource * self)
+{
+  for (guint i = 0;; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (self->buffers, i);
+    if (buf == NULL) {
+      break;
+    }
+    gst_object_unparent (GST_OBJECT_CAST (buf));
+    gst_object_unref (buf);
+  }
+  gst_source_buffer_list_remove_all (self->buffers);
+}
+
+static void
+gst_media_source_dispose (GObject * object)
+{
+  GstMediaSource *self = (GstMediaSource *) object;
+
+  gst_media_source_detach (self);
+
+  g_clear_object (&self->active_buffers);
+
+  if (self->buffers) {
+    empty_buffers (self);
+  }
+  gst_clear_object (&self->buffers);
+
+  gst_clear_object (&self->event_queue);
+
+  G_OBJECT_CLASS (gst_media_source_parent_class)->dispose (object);
+}
+
+static void
+gst_media_source_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstMediaSource *self = GST_MEDIA_SOURCE (object);
+
+  switch (prop_id) {
+    case PROP_SOURCE_BUFFERS:
+      g_value_take_object (value, gst_media_source_get_source_buffers (self));
+      break;
+    case PROP_ACTIVE_SOURCE_BUFFERS:
+      g_value_take_object (value,
+          gst_media_source_get_active_source_buffers (self));
+      break;
+    case PROP_READY_STATE:
+      g_value_set_enum (value, gst_media_source_get_ready_state (self));
+      break;
+    case PROP_POSITION:
+      g_value_set_uint64 (value, gst_media_source_get_position (self));
+      break;
+    case PROP_DURATION:
+      g_value_set_uint64 (value, gst_media_source_get_duration (self));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+  }
+}
+
+static void
+gst_media_source_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstMediaSource *self = GST_MEDIA_SOURCE (object);
+
+  switch (prop_id) {
+    case PROP_DURATION:{
+      GstClockTime duration = (GstClockTime) g_value_get_uint64 (value);
+      gst_media_source_set_duration (self, duration, NULL);
+      break;
+    }
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+  }
+}
+
+static void
+gst_media_source_class_init (GstMediaSourceClass * klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->dispose = GST_DEBUG_FUNCPTR (gst_media_source_dispose);
+  oclass->get_property = GST_DEBUG_FUNCPTR (gst_media_source_get_property);
+  oclass->set_property = GST_DEBUG_FUNCPTR (gst_media_source_set_property);
+
+  /**
+   * GstMediaSource:source-buffers:
+   *
+   * A #GstSourceBufferList of every #GstSourceBuffer in this Media Source
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-sourcebuffers)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_SOURCE_BUFFERS = g_param_spec_object ("source-buffers",
+      "Source Buffers",
+      "A SourceBufferList of all SourceBuffers in this Media Source",
+      GST_TYPE_SOURCE_BUFFER_LIST, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstMediaSource:active-source-buffers:
+   *
+   * A #GstSourceBufferList of every #GstSourceBuffer in this Media Source that
+   * is considered active
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-activesourcebuffers)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_ACTIVE_SOURCE_BUFFERS =
+      g_param_spec_object ("active-source-buffers", "Active Source Buffers",
+      "A SourceBufferList of all SourceBuffers that are active in this Media Source",
+      GST_TYPE_SOURCE_BUFFER_LIST, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstMediaSource:ready-state:
+   *
+   * The Ready State of the Media Source
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-readystate)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_READY_STATE = g_param_spec_enum ("ready-state",
+      "Ready State",
+      "The Ready State of the Media Source",
+      GST_TYPE_MEDIA_SOURCE_READY_STATE, DEFAULT_READY_STATE, G_PARAM_READABLE |
+      G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstMediaSource:position:
+   *
+   * The position of the player consuming from the Media Source
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_POSITION = g_param_spec_uint64 ("position",
+      "Position",
+      "The Position of the Media Source as a GstClockTime",
+      GST_CLOCK_TIME_NONE, G_MAXUINT64, DEFAULT_DURATION, G_PARAM_READWRITE |
+      G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstMediaSource:duration:
+   *
+   * The Duration of the Media Source as a #GstClockTime
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-duration)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_DURATION = g_param_spec_uint64 ("duration",
+      "Duration",
+      "The Duration of the Media Source as a GstClockTime",
+      GST_CLOCK_TIME_NONE, G_MAXUINT64, DEFAULT_DURATION, G_PARAM_READWRITE |
+      G_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_properties (oclass, N_PROPS, properties);
+
+  /**
+   * GstMediaSource::on-source-open:
+   * @self: The #GstMediaSource that has just opened
+   *
+   * Emitted when @self has been opened.
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-onsourceopen)
+   *
+   * Since: 1.24
+   */
+  signalsON_SOURCE_OPEN = g_signal_new ("on-source-open",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+  /**
+   * GstMediaSource::on-source-ended:
+   * @self: The #GstMediaSource that has just ended
+   *
+   * Emitted when @self has ended, normally through
+   * gst_media_source_end_of_stream().
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-onsourceended)
+   *
+   * Since: 1.24
+   */
+  signalsON_SOURCE_ENDED = g_signal_new ("on-source-ended",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+  /**
+   * GstMediaSource::on-source-closed:
+   * @self: The #GstMediaSource that has just closed
+   *
+   * Emitted when @self has closed, normally when detached from a #GstMseSrc.
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-onsourceclose)
+   *
+   * Since: 1.24
+   */
+  signalsON_SOURCE_CLOSE = g_signal_new ("on-source-close",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+}
+
+static inline void
+reset_live_seekable_range (GstMediaSource * self)
+{
+  self->live_seekable_range.start = 0;
+  self->live_seekable_range.end = 0;
+}
+
+static inline gboolean
+is_updating (GstMediaSource * self)
+{
+  for (guint i = 0;; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (self->buffers, i);
+    if (buf == NULL)
+      break;
+    gboolean updating = gst_source_buffer_get_updating (buf);
+    gst_object_unref (buf);
+    if (updating) {
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+
+static inline gboolean
+is_attached (GstMediaSource * self)
+{
+  return GST_IS_MSE_SRC (self->element);
+}
+
+static inline void
+network_error (GstMediaSource * self)
+{
+  if (is_attached (self)) {
+    gst_mse_src_network_error (self->element);
+  }
+}
+
+static inline void
+decode_error (GstMediaSource * self)
+{
+  if (is_attached (self)) {
+    gst_mse_src_decode_error (self->element);
+  }
+}
+
+static inline void
+update_duration (GstMediaSource * self)
+{
+  if (is_attached (self)) {
+    gst_mse_src_set_duration (self->element, self->duration);
+  }
+}
+
+static void
+schedule_event (GstMediaSource * self, MediaSourceEvent event)
+{
+  MediaSourceEventItem item = {
+    .item = {.destroy = g_free,.visible = TRUE,.size = 1,.object = NULL},
+    .event = event,
+  };
+
+  gst_mse_event_queue_push (self->event_queue, g_memdup2 (&item,
+          sizeof (MediaSourceEventItem)));
+}
+
+static void
+dispatch_event (MediaSourceEventItem * item, GstMediaSource * self)
+{
+  g_signal_emit (self, signalsitem->event, 0);
+}
+
+static void
+gst_media_source_init (GstMediaSource * self)
+{
+  self->buffers = gst_source_buffer_list_new ();
+  self->active_buffers = gst_source_buffer_list_new ();
+  self->ready_state = DEFAULT_READY_STATE;
+  self->duration = DEFAULT_DURATION;
+  reset_live_seekable_range (self);
+  self->element = NULL;
+  self->event_queue =
+      gst_mse_event_queue_new ((GstMseEventQueueCallback) dispatch_event, self);
+}
+
+/**
+ * gst_media_source_attach:
+ * @self: #GstMediaSource instance
+ * @element: (transfer none): #GstMseSrc source Element
+ *
+ * Associates @self with @element.
+ * Normally, the Element will be part of a #GstPipeline that plays back the data
+ * submitted to the Media Source's Source Buffers.
+ *
+ * #GstMseSrc is a special source element that is designed to consume media from
+ * a #GstMediaSource.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dfn-attaching-to-a-media-element)
+ *
+ * Since: 1.24
+ */
+void
+gst_media_source_attach (GstMediaSource * self, GstMseSrc * element)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE (self));
+  g_return_if_fail (GST_IS_MSE_SRC (element));
+
+  if (is_attached (self))
+    gst_media_source_detach (self);
+
+  self->element = gst_object_ref_sink (element);
+  gst_mse_src_attach (element, self);
+
+  self->ready_state = GST_MEDIA_SOURCE_READY_STATE_OPEN;
+  schedule_event (self, ON_SOURCE_OPEN);
+}
+
+/**
+ * gst_media_source_detach:
+ * @self: #GstMediaSource instance
+ *
+ * Detaches @self from any #GstMseSrc element that it may be associated with.
+ *
+ * Since: 1.24
+ */
+void
+gst_media_source_detach (GstMediaSource * self)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE (self));
+
+  self->ready_state = GST_MEDIA_SOURCE_READY_STATE_CLOSED;
+  gst_media_source_set_duration (self, GST_CLOCK_TIME_NONE, NULL);
+
+  gst_source_buffer_list_remove_all (self->active_buffers);
+  empty_buffers (self);
+
+  if (is_attached (self)) {
+    gst_mse_src_detach (self->element);
+    gst_clear_object (&self->element);
+  }
+
+  schedule_event (self, ON_SOURCE_CLOSE);
+}
+
+/**
+ * gst_media_source_get_source_element:
+ * @self: #GstMediaSource instance
+ *
+ * Gets the #GstMseSrc currently attached to @self or `NULL` if there is none.
+ *
+ * Returns: (transfer full) (nullable): a #GstMseSrc instance or `NULL`
+ */
+GstMseSrc *
+gst_media_source_get_source_element (GstMediaSource * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), NULL);
+  GST_OBJECT_LOCK (self);
+  GstMseSrc *element = self->element == NULL ? NULL
+      : gst_object_ref (self->element);
+  GST_OBJECT_UNLOCK (self);
+  return element;
+}
+
+void
+gst_media_source_open (GstMediaSource * self)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE (self));
+  if (self->ready_state != GST_MEDIA_SOURCE_READY_STATE_OPEN) {
+    self->ready_state = GST_MEDIA_SOURCE_READY_STATE_OPEN;
+    schedule_event (self, ON_SOURCE_OPEN);
+  }
+}
+
+/**
+ * gst_media_source_get_source_buffers:
+ * @self: #GstMediaSource instance
+ *
+ * Gets a #GstSourceBufferList containing all the Source Buffers currently
+ * associated with this Media Source. This object will reflect any future
+ * changes to the parent Media Source as well.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-sourcebuffers)
+ *
+ * Returns: (transfer full): a #GstSourceBufferList instance
+ * Since: 1.24
+ */
+GstSourceBufferList *
+gst_media_source_get_source_buffers (GstMediaSource * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), NULL);
+  return g_object_ref (self->buffers);
+}
+
+/**
+ * gst_media_source_get_active_source_buffers:
+ * @self: #GstMediaSource instance
+ *
+ * Gets a #GstSourceBufferList containing all the Source Buffers currently
+ * associated with this Media Source that are considered "active."
+ * For a Source Buffer to be considered active, either its video track is
+ * selected, its audio track is enabled, or its text track is visible or hidden.
+ * This object will reflect any future changes to the parent Media Source as
+ * well.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-activesourcebuffers)
+ *
+ * Returns: (transfer full): a new #GstSourceBufferList instance
+ * Since: 1.24
+ */
+GstSourceBufferList *
+gst_media_source_get_active_source_buffers (GstMediaSource * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), NULL);
+  return g_object_ref (self->active_buffers);
+}
+
+/**
+ * gst_media_source_get_ready_state:
+ * @self: #GstMediaSource instance
+ *
+ * Gets the current Ready State of the Media Source.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-readystate)
+ *
+ * Returns: the current #GstMediaSourceReadyState value
+ * Since: 1.24
+ */
+GstMediaSourceReadyState
+gst_media_source_get_ready_state (GstMediaSource * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), DEFAULT_READY_STATE);
+  return self->ready_state;
+}
+
+/**
+ * gst_media_source_get_position:
+ * @self: #GstMediaSource instance
+ *
+ * Gets the current playback position of the Media Source.
+ *
+ * Returns: the current playback position as a #GstClockTime
+ * Since: 1.24
+ */
+GstClockTime
+gst_media_source_get_position (GstMediaSource * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), DEFAULT_POSITION);
+  if (is_attached (self))
+    return gst_mse_src_get_position (self->element);
+  return DEFAULT_POSITION;
+}
+
+/**
+ * gst_media_source_get_duration:
+ * @self: #GstMediaSource instance
+ *
+ * Gets the current duration of @self.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-duration)
+ *
+ * Returns: the current duration as a #GstClockTime
+ * Since: 1.24
+ */
+GstClockTime
+gst_media_source_get_duration (GstMediaSource * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), DEFAULT_DURATION);
+  if (self->ready_state == GST_MEDIA_SOURCE_READY_STATE_CLOSED)
+    return GST_CLOCK_TIME_NONE;
+  return self->duration;
+}
+
+/**
+ * gst_media_source_set_duration:
+ * @self: #GstMediaSource instance
+ * @duration: The new duration to apply to @self.
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Sets the duration of @self.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-duration)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_media_source_set_duration (GstMediaSource * self, GstClockTime duration,
+    GError ** error)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), FALSE);
+  self->duration = duration;
+  update_duration (self);
+  g_object_notify_by_pspec (G_OBJECT (self), propertiesPROP_DURATION);
+  return TRUE;
+}
+
+static void
+on_received_init_segment (G_GNUC_UNUSED GstSourceBuffer * source_buffer,
+    gpointer user_data)
+{
+  GstMediaSource *self = GST_MEDIA_SOURCE (user_data);
+  if (!is_attached (self)) {
+    GST_DEBUG_OBJECT (self, "received init segment while detached, ignoring");
+    return;
+  }
+
+  GPtrArray *all_tracks = g_ptr_array_new ();
+
+  for (guint i = 0;; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (self->buffers, i);
+    if (buf == NULL) {
+      break;
+    }
+    GPtrArray *tracks = gst_source_buffer_get_all_tracks (buf);
+    g_ptr_array_extend (all_tracks, tracks, NULL, NULL);
+    g_ptr_array_unref (tracks);
+    gst_object_unref (buf);
+  }
+
+  gst_mse_src_emit_streams (self->element,
+      (GstMediaSourceTrack **) all_tracks->pdata, all_tracks->len);
+
+  g_ptr_array_unref (all_tracks);
+}
+
+static void
+on_duration_changed (G_GNUC_UNUSED GstSourceBuffer * source_buffer,
+    gpointer user_data)
+{
+  GstMediaSource *self = GST_MEDIA_SOURCE (user_data);
+  GstClockTime current = self->duration;
+  GstClockTime max = 0;
+  for (guint i = 0;; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (self->buffers, i);
+    if (buf == NULL) {
+      break;
+    }
+    GstClockTime duration = gst_source_buffer_get_duration (buf);
+    if (GST_CLOCK_TIME_IS_VALID (duration)) {
+      max = MAX (max, duration);
+    }
+    gst_object_unref (buf);
+  }
+  if (current == max) {
+    return;
+  }
+  GST_DEBUG_OBJECT (self, "updating %" GST_TIMEP_FORMAT "=>%" GST_TIMEP_FORMAT,
+      &current, &max);
+  gst_media_source_set_duration (self, max, NULL);
+}
+
+static GHashTable *
+source_buffer_list_as_set (GstSourceBufferList * list)
+{
+  GHashTable *buffers = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+      gst_object_unref, NULL);
+  for (guint i = 0;; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (list, i);
+    if (buf == NULL) {
+      break;
+    }
+    g_hash_table_add (buffers, buf);
+  }
+  return buffers;
+}
+
+static void
+rebuild_active_source_buffers (GstMediaSource * self)
+{
+  // TODO: Lock the source buffer lists
+  GST_DEBUG_OBJECT (self, "rebuilding active source buffers");
+  GHashTable *previously_active =
+      source_buffer_list_as_set (self->active_buffers);
+
+  gst_source_buffer_list_notify_freeze (self->active_buffers);
+  gst_source_buffer_list_remove_all (self->active_buffers);
+
+  gboolean added = FALSE;
+  gboolean removed = FALSE;
+
+  for (guint i = 0;; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (self->buffers, i);
+    if (buf == NULL) {
+      break;
+    }
+    if (gst_source_buffer_get_active (buf)) {
+      gst_source_buffer_list_append (self->active_buffers, buf);
+      added |= !g_hash_table_contains (previously_active, buf);
+    } else {
+      gst_source_buffer_list_append (self->active_buffers, buf);
+      removed |= g_hash_table_contains (previously_active, buf);
+    }
+    gst_object_unref (buf);
+  }
+  g_hash_table_unref (previously_active);
+
+  gst_source_buffer_list_notify_cancel (self->active_buffers);
+  gst_source_buffer_list_notify_thaw (self->active_buffers);
+
+  if (added) {
+    GST_DEBUG_OBJECT (self, "notifying active source buffer added");
+    gst_source_buffer_list_notify_added (self->active_buffers);
+  }
+  if (removed) {
+    GST_DEBUG_OBJECT (self, "notifying active source buffer removed");
+    gst_source_buffer_list_notify_removed (self->active_buffers);
+  }
+}
+
+static void
+on_active_state_changed (GstSourceBuffer * source_buffer, gpointer user_data)
+{
+  GstMediaSource *self = GST_MEDIA_SOURCE (user_data);
+  rebuild_active_source_buffers (self);
+}
+
+/**
+ * gst_media_source_add_source_buffer:
+ * @self: #GstMediaSource instance
+ * @type: (transfer none): A MIME type describing the format of the incoming media
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Add a #GstSourceBuffer to this #GstMediaSource of the specified media type.
+ * The Media Source must be in the #GstMediaSourceReadyState %GST_MEDIA_SOURCE_READY_STATE_OPEN.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-addsourcebuffer)
+ *
+ * Returns: (transfer full): a new #GstSourceBuffer instance on success, otherwise `NULL`
+ * Since: 1.24
+ */
+GstSourceBuffer *
+gst_media_source_add_source_buffer (GstMediaSource * self, const gchar * type,
+    GError ** error)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), NULL);
+  g_return_val_if_fail (type != NULL, NULL);
+
+  if (g_strcmp0 (type, "") == 0) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_TYPE,
+        "supplied content type is empty");
+    return NULL;
+  }
+
+  if (!gst_media_source_is_type_supported (type)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_NOT_SUPPORTED,
+        "unsupported content type");
+    return NULL;
+  }
+
+  if (self->ready_state != GST_MEDIA_SOURCE_READY_STATE_OPEN) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "media source is not open");
+    return NULL;
+  }
+
+  GstSourceBufferCallbacks callbacks = {
+    .duration_changed = on_duration_changed,
+    .received_init_segment = on_received_init_segment,
+    .active_state_changed = on_active_state_changed,
+  };
+
+  GError *source_buffer_error = NULL;
+  GstSourceBuffer *buf = gst_source_buffer_new_with_callbacks (type,
+      GST_OBJECT (self), &callbacks, self, &source_buffer_error);
+  if (source_buffer_error) {
+    g_propagate_prefixed_error (error, source_buffer_error,
+        "failed to create source buffer");
+    gst_clear_object (&buf);
+    return NULL;
+  }
+
+  gst_source_buffer_list_append (self->buffers, buf);
+
+  return buf;
+}
+
+/**
+ * gst_media_source_remove_source_buffer:
+ * @self: #GstMediaSource instance
+ * @buffer: (transfer none): #GstSourceBuffer instance
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Remove @buffer from @self.
+ *
+ * @buffer must have been created as a child of @self and @self must be in the
+ * #GstMediaSourceReadyState %GST_MEDIA_SOURCE_READY_STATE_OPEN.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-removesourcebuffer)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_media_source_remove_source_buffer (GstMediaSource * self,
+    GstSourceBuffer * buffer, GError ** error)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), FALSE);
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (buffer), FALSE);
+
+  if (!gst_source_buffer_list_contains (self->buffers, buffer)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_NOT_FOUND,
+        "the supplied source buffer was not found in this media source");
+    return FALSE;
+  }
+
+  if (gst_source_buffer_get_updating (buffer))
+    gst_source_buffer_teardown (buffer);
+
+  gst_source_buffer_list_remove (self->active_buffers, buffer);
+
+  gst_object_unparent (GST_OBJECT (buffer));
+  gst_source_buffer_list_remove (self->buffers, buffer);
+
+  return TRUE;
+}
+
+static void
+abort_all_source_buffers (GstMediaSource * self)
+{
+  for (guint i = 0;; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (self->buffers, i);
+    if (buf == NULL) {
+      return;
+    }
+    GST_LOG_OBJECT (self, "shutting down %" GST_PTR_FORMAT, buf);
+    gst_source_buffer_abort (buf, NULL);
+    gst_object_unref (buf);
+  }
+}
+
+/**
+ * gst_media_source_end_of_stream:
+ * @self: #GstMediaSource instance
+ * @eos_error: The error type, if any
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Mark @self as reaching the end of stream, disallowing new data inputs.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-endofstream)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_media_source_end_of_stream (GstMediaSource * self,
+    GstMediaSourceEOSError eos_error, GError ** error)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), FALSE);
+
+  if (self->ready_state != GST_MEDIA_SOURCE_READY_STATE_OPEN) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "media source is not open");
+    return FALSE;
+  }
+
+  if (is_updating (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "some buffers are still updating");
+    return FALSE;
+  }
+
+  self->ready_state = GST_MEDIA_SOURCE_READY_STATE_ENDED;
+  schedule_event (self, ON_SOURCE_ENDED);
+
+  switch (eos_error) {
+    case GST_MEDIA_SOURCE_EOS_ERROR_NETWORK:
+      network_error (self);
+      break;
+    case GST_MEDIA_SOURCE_EOS_ERROR_DECODE:
+      decode_error (self);
+      break;
+    default:
+      update_duration (self);
+      abort_all_source_buffers (self);
+      break;
+  }
+
+  return TRUE;
+}
+
+/**
+ * gst_media_source_set_live_seekable_range:
+ * @self: #GstMediaSource instance
+ * @start: The earliest point in the stream considered seekable
+ * @end: The latest point in the stream considered seekable
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Set the live seekable range for @self. This range informs the component
+ * playing this Media Source what it can allow the user to seek through.
+ *
+ * If the ready state is not %GST_MEDIA_SOURCE_READY_STATE_OPEN, or the supplied
+ * @start time is later than @end it will fail and set an error.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-setliveseekablerange)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_media_source_set_live_seekable_range (GstMediaSource * self,
+    GstClockTime start, GstClockTime end, GError ** error)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), FALSE);
+  if (self->ready_state != GST_MEDIA_SOURCE_READY_STATE_OPEN) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "media source is not open");
+    return FALSE;
+  }
+
+  if (start > end) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_TYPE,
+        "bad time range: start must be earlier than end");
+    return FALSE;
+  }
+
+  self->live_seekable_range.start = start;
+  self->live_seekable_range.end = end;
+
+  return TRUE;
+}
+
+/**
+ * gst_media_source_clear_live_seekable_range:
+ * @self: #GstMediaSource instance
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Clear the live seekable range for @self. This will inform the component
+ * playing this Media Source that there is no seekable time range.
+ *
+ * If the ready state is not %GST_MEDIA_SOURCE_READY_STATE_OPEN, it will fail
+ * and set an error.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-mediasource-clearliveseekablerange)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_media_source_clear_live_seekable_range (GstMediaSource * self,
+    GError ** error)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (self), FALSE);
+
+  if (self->ready_state != GST_MEDIA_SOURCE_READY_STATE_OPEN) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "media source is not open");
+    return FALSE;
+  }
+
+  reset_live_seekable_range (self);
+
+  return TRUE;
+}
+
+/**
+ * gst_media_source_get_live_seekable_range:
+ * @self: #GstMediaSource instance
+ * @range: (out) (transfer none): time range
+ *
+ * Get the live seekable range of @self. Will fill in the supplied @range with
+ * the current live seekable range.
+ *
+ * Since: 1.24
+ */
+void
+gst_media_source_get_live_seekable_range (GstMediaSource * self,
+    GstMediaSourceRange * range)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE (self));
+  g_return_if_fail (range != NULL);
+
+  range->start = self->live_seekable_range.start;
+  range->end = self->live_seekable_range.end;
+}
+
+void
+gst_media_source_seek (GstMediaSource * self, GstClockTime time)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE (self));
+  for (guint i = 0;; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (self->buffers, i);
+    if (buf == NULL) {
+      return;
+    }
+    gst_source_buffer_seek (buf, time);
+    gst_object_unref (buf);
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmediasource.h Added

@@ -0,0 +1,203 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Orange
+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 Sebastian Dröge <sebastian@centricular.com>
+ * Copyright (C) 2015, 2016 Igalia, S.L
+ * Copyright (C) 2015, 2016 Metrological Group B.V.
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/mse/mse-prelude.h>
+#include <gst/mse/gstmsesrc.h>
+
+#include "gstsourcebufferlist.h"
+
+G_BEGIN_DECLS
+
+/**
+ * GstMediaSourceReadyState:
+ * @GST_MEDIA_SOURCE_READY_STATE_CLOSED: The #GstMediaSource is not connected to
+ * any playback element.
+ * @GST_MEDIA_SOURCE_READY_STATE_OPEN: The #GstMediaSource is connected to a
+ * playback element and ready to append data to its #GstSourceBuffer (s).
+ * @GST_MEDIA_SOURCE_READY_STATE_ENDED: gst_media_source_end_of_stream() has
+ * been called on the current #GstMediaSource
+ *
+ * Describes the possible states of the Media Source.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-readystate)
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_MEDIA_SOURCE_READY_STATE_CLOSED,
+  GST_MEDIA_SOURCE_READY_STATE_OPEN,
+  GST_MEDIA_SOURCE_READY_STATE_ENDED,
+} GstMediaSourceReadyState;
+
+/**
+ * GstMediaSourceError:
+ * @GST_MEDIA_SOURCE_ERROR_INVALID_STATE:
+ * @GST_MEDIA_SOURCE_ERROR_TYPE:
+ * @GST_MEDIA_SOURCE_ERROR_NOT_SUPPORTED:
+ * @GST_MEDIA_SOURCE_ERROR_NOT_FOUND:
+ * @GST_MEDIA_SOURCE_ERROR_QUOTA_EXCEEDED:
+ *
+ * Any error that can occur within #GstMediaSource or #GstSourceBuffer APIs.
+ * These values correspond directly to those in the Web IDL specification.
+ *
+ * Specification(https://webidl.spec.whatwg.org/#idl-DOMException-error-names)
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+  GST_MEDIA_SOURCE_ERROR_TYPE,
+  GST_MEDIA_SOURCE_ERROR_NOT_SUPPORTED,
+  GST_MEDIA_SOURCE_ERROR_NOT_FOUND,
+  GST_MEDIA_SOURCE_ERROR_QUOTA_EXCEEDED,
+} GstMediaSourceError;
+
+/**
+ * GstMediaSourceEOSError:
+ * @GST_MEDIA_SOURCE_EOS_ERROR_NONE: End the stream successfully
+ * @GST_MEDIA_SOURCE_EOS_ERROR_NETWORK: End the stream due to a networking error
+ * @GST_MEDIA_SOURCE_EOS_ERROR_DECODE: End the stream due to a decoding error
+ *
+ * Reasons for ending a #GstMediaSource using gst_media_source_end_of_stream().
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-endofstreamerror)
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_MEDIA_SOURCE_EOS_ERROR_NONE,
+  GST_MEDIA_SOURCE_EOS_ERROR_NETWORK,
+  GST_MEDIA_SOURCE_EOS_ERROR_DECODE,
+} GstMediaSourceEOSError;
+
+/**
+ * GstMediaSourceRange:
+ * @start: The start of this range.
+ * @end: The end of this range.
+ *
+ * A structure describing a simplified version of the TimeRanges concept in the
+ * HTML specification, only representing a single @start and @end time.
+ *
+ * Specification(https://html.spec.whatwg.org/multipage/media.html#timeranges)
+ *
+ * Since: 1.24
+ */
+typedef struct
+{
+  GstClockTime start;
+  GstClockTime end;
+} GstMediaSourceRange;
+
+GST_MSE_API
+gboolean gst_media_source_is_type_supported (const gchar * type);
+
+#define GST_TYPE_MEDIA_SOURCE (gst_media_source_get_type())
+#define GST_MEDIA_SOURCE_ERROR (gst_media_source_error_quark())
+
+/**
+ * gst_media_source_error_quark:
+ *
+ * Any error type that can be reported by the Media Source API.
+ *
+ * Since: 1.24
+ */
+GST_MSE_API
+GQuark gst_media_source_error_quark (void);
+
+GST_MSE_API
+G_DECLARE_FINAL_TYPE (GstMediaSource, gst_media_source, GST, MEDIA_SOURCE,
+    GstObject);
+
+GST_MSE_API
+GstMediaSource *gst_media_source_new (void);
+
+GST_MSE_API
+void gst_media_source_attach (GstMediaSource * self, GstMseSrc * element);
+
+GST_MSE_API
+void gst_media_source_detach (GstMediaSource * self);
+
+GST_MSE_API
+GstSourceBufferList * gst_media_source_get_source_buffers (
+    GstMediaSource * self);
+
+GST_MSE_API
+GstSourceBufferList * gst_media_source_get_active_source_buffers (
+    GstMediaSource * self);
+
+GST_MSE_API
+GstMediaSourceReadyState gst_media_source_get_ready_state (
+    GstMediaSource * self);
+
+GST_MSE_API
+GstClockTime gst_media_source_get_position (GstMediaSource * self);
+
+GST_MSE_API
+GstClockTime gst_media_source_get_duration (GstMediaSource * self);
+
+GST_MSE_API
+gboolean gst_media_source_set_duration (GstMediaSource * self,
+                                        GstClockTime duration,
+                                        GError ** error);
+
+GST_MSE_API
+GstSourceBuffer * gst_media_source_add_source_buffer (GstMediaSource * self,
+                                                      const gchar * type,
+                                                      GError ** error);
+
+GST_MSE_API
+gboolean gst_media_source_remove_source_buffer (GstMediaSource * self,
+                                                GstSourceBuffer * buffer,
+                                                GError ** error);
+
+GST_MSE_API
+gboolean gst_media_source_end_of_stream (GstMediaSource * self,
+                                         GstMediaSourceEOSError eos_error,
+                                         GError ** error);
+
+GST_MSE_API
+gboolean gst_media_source_set_live_seekable_range (GstMediaSource * self,
+                                                   GstClockTime start,
+                                                   GstClockTime end,
+                                                   GError ** error);
+
+GST_MSE_API
+gboolean gst_media_source_clear_live_seekable_range (GstMediaSource * self,
+                                                     GError ** error);
+
+GST_MSE_API
+void gst_media_source_get_live_seekable_range (GstMediaSource * self,
+    GstMediaSourceRange * range);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmediasourcesamplemap-private.h Added

@@ -0,0 +1,94 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <glib-object.h>
+#include <gst/mse/mse-prelude.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_MEDIA_SOURCE_SAMPLE_MAP \
+    (gst_media_source_sample_map_get_type())
+
+GST_MSE_PRIVATE
+G_DECLARE_FINAL_TYPE (GstMediaSourceSampleMap, gst_media_source_sample_map, GST,
+    MEDIA_SOURCE_SAMPLE_MAP, GstObject);
+
+GST_MSE_PRIVATE
+GstMediaSourceSampleMap *gst_media_source_sample_map_new (void);
+
+GST_MSE_PRIVATE
+void gst_media_source_sample_map_add (GstMediaSourceSampleMap * self,
+    GstSample * sample);
+
+GST_MSE_PRIVATE
+void gst_media_source_sample_map_remove (GstMediaSourceSampleMap * self,
+    GstSample * sample);
+
+GST_MSE_PRIVATE
+gsize gst_media_source_sample_map_remove_range (GstMediaSourceSampleMap * self,
+    GstClockTime earliest, GstClockTime latest);
+
+GST_MSE_PRIVATE
+gsize
+gst_media_source_sample_map_remove_range_from_start (GstMediaSourceSampleMap
+    * self, GstClockTime latest_dts);
+
+GST_MSE_PRIVATE
+gsize
+gst_media_source_sample_map_remove_range_from_end (GstMediaSourceSampleMap
+    * self, GstClockTime earliest_dts);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_sample_map_contains (GstMediaSourceSampleMap * self,
+    GstSample * sample);
+
+GST_MSE_PRIVATE
+GSequenceIter * gst_media_source_sample_map_get_begin_iter_by_pts (
+    GstMediaSourceSampleMap * self);
+
+GST_MSE_PRIVATE
+GstClockTime gst_media_source_sample_map_get_highest_end_time (
+    GstMediaSourceSampleMap * self);
+
+GST_MSE_PRIVATE
+guint gst_media_source_sample_map_get_size (GstMediaSourceSampleMap * self);
+
+GST_MSE_PRIVATE
+gsize gst_media_source_sample_map_get_storage_size (
+    GstMediaSourceSampleMap * self);
+
+GST_MSE_PRIVATE
+GstIterator *
+gst_media_source_sample_map_iter_samples_by_dts (GstMediaSourceSampleMap * map,
+    GMutex * lock, guint32 * master_cookie, GstClockTime start_dts,
+    GstSample * start_sample);
+
+GST_MSE_PRIVATE
+GstIterator *
+gst_media_source_sample_map_iter_samples_by_pts (GstMediaSourceSampleMap * map,
+    GMutex * lock, guint32 * master_cookie, GstClockTime start_pts,
+    GstSample *start_sample);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmediasourcesamplemap.c Added

@@ -0,0 +1,552 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstmediasourcesamplemap-private.h"
+#include "gstmselogging-private.h"
+
+struct _GstMediaSourceSampleMap
+{
+  GstObject parent_instance;
+
+  GHashTable *samples;
+  GSequence *samples_by_dts;
+  GSequence *samples_by_pts;
+
+  gsize storage_size;
+};
+
+G_DEFINE_TYPE (GstMediaSourceSampleMap, gst_media_source_sample_map,
+    GST_TYPE_OBJECT);
+
+static gint compare_pts (GstSample * a, GstSample * b, gpointer user_data);
+static GSequenceIter *find_sample_containing_dts (GstMediaSourceSampleMap *
+    self, GstClockTime dts);
+static GSequenceIter *find_sample_containing_pts (GstMediaSourceSampleMap *
+    self, GstClockTime pts);
+static GSequenceIter *find_sequentially (GSequence * sequence, gpointer item);
+
+static inline GstClockTime
+sample_dts (GstSample * sample)
+{
+  return GST_BUFFER_DTS (gst_sample_get_buffer (sample));
+}
+
+static inline GstClockTime
+sample_pts (GstSample * sample)
+{
+  return GST_BUFFER_PTS (gst_sample_get_buffer (sample));
+}
+
+static gsize
+sample_buffer_size (GstSample * sample)
+{
+  return gst_buffer_get_size (gst_sample_get_buffer (sample));
+}
+
+static gboolean
+iter_is_delta_unit (GSequenceIter * iter)
+{
+  if (g_sequence_iter_is_end (iter)) {
+    return TRUE;
+  }
+  GstSample *sample = g_sequence_get (iter);
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  return GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+}
+
+static gint
+compare_dts (GstSample * a, GstSample * b, gpointer user_data)
+{
+  GstClockTime a_dts = sample_dts (a);
+  GstClockTime b_dts = sample_dts (b);
+  if (a_dts == b_dts) {
+    return compare_pts (a, b, user_data);
+  }
+  return a_dts > b_dts ? +1 : -1;
+}
+
+static gint
+compare_pts (GstSample * a, GstSample * b, gpointer user_data)
+{
+  GstClockTime a_pts = sample_pts (a);
+  GstClockTime b_pts = sample_pts (b);
+  if (a_pts == b_pts) {
+    return 0;
+  }
+  return a_pts > b_pts ? +1 : -1;
+}
+
+static inline void
+remove_sample (GSequence * sequence, GCompareDataFunc compare,
+    GstSample * sample, GstMediaSourceSampleMap * self)
+{
+  GSequenceIter *match = g_sequence_lookup (sequence, sample, compare, self);
+  if (match == NULL) {
+    return;
+  }
+  g_sequence_remove (match);
+}
+
+GstMediaSourceSampleMap *
+gst_media_source_sample_map_new (void)
+{
+  gst_mse_init_logging ();
+  return gst_object_ref_sink (g_object_new (GST_TYPE_MEDIA_SOURCE_SAMPLE_MAP,
+          NULL));
+}
+
+static void
+gst_media_source_sample_map_finalize (GObject * object)
+{
+  GstMediaSourceSampleMap *self = GST_MEDIA_SOURCE_SAMPLE_MAP (object);
+  g_sequence_free (self->samples_by_dts);
+  g_sequence_free (self->samples_by_pts);
+  g_hash_table_unref (self->samples);
+  G_OBJECT_CLASS (gst_media_source_sample_map_parent_class)->finalize (object);
+}
+
+static void
+gst_media_source_sample_map_class_init (GstMediaSourceSampleMapClass * klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->finalize = GST_DEBUG_FUNCPTR (gst_media_source_sample_map_finalize);
+}
+
+static void
+gst_media_source_sample_map_init (GstMediaSourceSampleMap * self)
+{
+  self->samples = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+      (GDestroyNotify) gst_sample_unref, NULL);
+  self->samples_by_dts = g_sequence_new ((GDestroyNotify) gst_sample_unref);
+  self->samples_by_pts = g_sequence_new ((GDestroyNotify) gst_sample_unref);
+}
+
+void
+gst_media_source_sample_map_add (GstMediaSourceSampleMap * self,
+    GstSample * sample)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE_SAMPLE_MAP (self));
+  g_return_if_fail (GST_IS_SAMPLE (sample));
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  g_return_if_fail (GST_BUFFER_DTS_IS_VALID (buffer));
+  g_return_if_fail (GST_BUFFER_PTS_IS_VALID (buffer));
+  g_return_if_fail (GST_BUFFER_DURATION_IS_VALID (buffer));
+
+  if (g_hash_table_contains (self->samples, sample)) {
+    return;
+  }
+
+  g_hash_table_add (self->samples, gst_sample_ref (sample));
+  g_sequence_insert_sorted (self->samples_by_dts, gst_sample_ref (sample),
+      (GCompareDataFunc) compare_dts, self);
+  g_sequence_insert_sorted (self->samples_by_pts, gst_sample_ref (sample),
+      (GCompareDataFunc) compare_pts, self);
+  self->storage_size += gst_buffer_get_size (buffer);
+  GST_TRACE_OBJECT (self, "new storage size=%" G_GSIZE_FORMAT,
+      self->storage_size);
+}
+
+void
+gst_media_source_sample_map_remove (GstMediaSourceSampleMap * self,
+    GstSample * sample)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE_SAMPLE_MAP (self));
+  g_return_if_fail (GST_IS_SAMPLE (sample));
+
+  if (!g_hash_table_contains (self->samples, sample)) {
+    return;
+  }
+
+  gsize buffer_size = sample_buffer_size (sample);
+  remove_sample (self->samples_by_dts, (GCompareDataFunc) compare_dts, sample,
+      self);
+  remove_sample (self->samples_by_pts, (GCompareDataFunc) compare_pts, sample,
+      self);
+  g_hash_table_remove (self->samples, sample);
+  self->storage_size -= MIN (buffer_size, self->storage_size);
+}
+
+gboolean
+gst_media_source_sample_map_contains (GstMediaSourceSampleMap * self,
+    GstSample * sample)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_SAMPLE_MAP (self), FALSE);
+  return g_hash_table_contains (self->samples, sample);
+}
+
+gsize
+gst_media_source_sample_map_remove_range (GstMediaSourceSampleMap * self,
+    GstClockTime earliest, GstClockTime latest)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_SAMPLE_MAP (self), 0);
+  g_return_val_if_fail (earliest <= latest, 0);
+
+  GSequenceIter *start_by_dts = find_sample_containing_dts (self, earliest);
+  GSequenceIter *end_by_dts = find_sample_containing_dts (self, latest);
+
+  GstSample *start = g_sequence_get (start_by_dts);
+  GstSample *end = g_sequence_get (end_by_dts);
+
+  GstClockTime start_time =
+      start == NULL ? GST_CLOCK_TIME_NONE : sample_dts (start);
+  GstClockTime end_time = end == NULL ? start_time : sample_dts (end);
+
+  GST_TRACE_OBJECT (self, "remove range %" GST_TIMEP_FORMAT ",%"
+      GST_TIMEP_FORMAT ")", &start_time, &end_time);
+
+  GList *to_remove = NULL;
+  while (g_sequence_iter_compare (start_by_dts, end_by_dts) < 1) {
+    GstSample *sample = g_sequence_get (start_by_dts);
+    to_remove = g_list_prepend (to_remove, sample);
+    start_by_dts = g_sequence_iter_next (start_by_dts);
+  }
+  gsize bytes_removed = 0;
+  for (GList * iter = to_remove; iter != NULL; iter = g_list_next (iter)) {
+    GstSample *sample = iter->data;
+    bytes_removed += sample_buffer_size (sample);
+    gst_media_source_sample_map_remove (self, sample);
+  }
+
+  g_list_free (to_remove);
+
+  GST_TRACE_OBJECT (self, "removed=%" G_GSIZE_FORMAT "B, latest=%"
+      GST_TIMEP_FORMAT, bytes_removed, &latest);
+  return bytes_removed;
+}
+
+gsize
+gst_media_source_sample_map_remove_range_from_start (GstMediaSourceSampleMap
+    * self, GstClockTime latest_dts)
+{
+  return gst_media_source_sample_map_remove_range (self, 0, latest_dts);
+}
+
+gsize
+gst_media_source_sample_map_remove_range_from_end (GstMediaSourceSampleMap
+    * self, GstClockTime earliest_dts)
+{
+  return gst_media_source_sample_map_remove_range (self, earliest_dts,
+      GST_CLOCK_TIME_NONE);
+}
+
+GstClockTime
+gst_media_source_sample_map_get_highest_end_time (GstMediaSourceSampleMap *
+    self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_SAMPLE_MAP (self),
+      GST_CLOCK_TIME_NONE);
+  GSequenceIter *iter = g_sequence_get_end_iter (self->samples_by_pts);
+  iter = g_sequence_iter_prev (iter);
+  if (g_sequence_iter_is_begin (iter)) {
+    return GST_CLOCK_TIME_NONE;
+  }
+  GstSample *sample = g_sequence_get (iter);
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  g_return_val_if_fail (GST_BUFFER_PTS_IS_VALID (buffer), GST_CLOCK_TIME_NONE);
+  g_return_val_if_fail (GST_BUFFER_DURATION_IS_VALID (buffer),
+      GST_CLOCK_TIME_NONE);
+  return GST_BUFFER_PTS (buffer) + GST_BUFFER_DURATION (buffer);
+}
+
+guint
+gst_media_source_sample_map_get_size (GstMediaSourceSampleMap * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_SAMPLE_MAP (self), 0);
+  return g_hash_table_size (self->samples);
+}
+
+gsize
+gst_media_source_sample_map_get_storage_size (GstMediaSourceSampleMap * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_SAMPLE_MAP (self), 0);
+  return self->storage_size;
+}
+
+static inline gboolean
+sample_contains_dts (GstSample * sample, GstClockTime dts)
+{
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  g_return_val_if_fail (GST_BUFFER_DURATION_IS_VALID (buffer), FALSE);
+  g_return_val_if_fail (GST_BUFFER_DTS_IS_VALID (buffer), FALSE);
+  g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (dts), FALSE);
+  GstClockTime end = GST_BUFFER_DTS (buffer) + GST_BUFFER_DURATION (buffer);
+  return dts <= end;
+}
+
+static inline gboolean
+sample_contains_pts (GstSample * sample, GstClockTime pts)
+{
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  g_return_val_if_fail (GST_BUFFER_DURATION_IS_VALID (buffer), FALSE);
+  g_return_val_if_fail (GST_BUFFER_PTS_IS_VALID (buffer), FALSE);
+  g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (pts), FALSE);
+  GstClockTime end = GST_BUFFER_PTS (buffer) + GST_BUFFER_DURATION (buffer);
+  return pts <= end;
+}
+
+static GSequenceIter *
+find_sequentially (GSequence * sequence, gpointer item)
+{
+  GSequenceIter *iter = g_sequence_get_begin_iter (sequence);
+  for (; !g_sequence_iter_is_end (iter); iter = g_sequence_iter_next (iter)) {
+    gpointer current = g_sequence_get (iter);
+    if (current == item) {
+      return iter;
+    }
+  }
+  return iter;
+}
+
+static GSequenceIter *
+find_sample_containing_dts (GstMediaSourceSampleMap * self, GstClockTime dts)
+{
+  if (dts == 0) {
+    return g_sequence_get_begin_iter (self->samples_by_dts);
+  }
+  if (dts == GST_CLOCK_TIME_NONE) {
+    return g_sequence_get_end_iter (self->samples_by_dts);
+  }
+  GSequenceIter *iter = g_sequence_get_begin_iter (self->samples_by_dts);
+  while (!g_sequence_iter_is_end (iter)) {
+    GstSample *sample = g_sequence_get (iter);
+    if (sample_contains_dts (sample, dts)) {
+      return iter;
+    }
+    iter = g_sequence_iter_next (iter);
+  }
+  return iter;
+}
+
+static GSequenceIter *
+find_sample_containing_pts (GstMediaSourceSampleMap * self, GstClockTime pts)
+{
+  if (pts == 0) {
+    return g_sequence_get_begin_iter (self->samples_by_pts);
+  }
+  if (pts == GST_CLOCK_TIME_NONE) {
+    return g_sequence_get_end_iter (self->samples_by_pts);
+  }
+  GSequenceIter *iter = g_sequence_get_begin_iter (self->samples_by_pts);
+  while (!g_sequence_iter_is_end (iter)) {
+    GstSample *sample = g_sequence_get (iter);
+    if (sample_contains_pts (sample, pts)) {
+      return iter;
+    }
+    iter = g_sequence_iter_next (iter);
+  }
+  return iter;
+}
+
+static GSequenceIter *
+find_previous_non_delta_unit (GstMediaSourceSampleMap * self,
+    GSequenceIter * iter)
+{
+  while (!g_sequence_iter_is_begin (iter)) {
+    if (!iter_is_delta_unit (iter)) {
+      GST_TRACE_OBJECT (self, "found valid sample");
+      return iter;
+    }
+    iter = g_sequence_iter_prev (iter);
+  }
+  GST_TRACE_OBJECT (self, "rolled back to the first sample");
+  return iter;
+}
+
+static GSequenceIter *
+gst_media_source_sample_map_iter_starting_dts (GstMediaSourceSampleMap * self,
+    GstClockTime start_dts)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_SAMPLE_MAP (self), NULL);
+  g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (start_dts), NULL);
+  GSequenceIter *iter = find_sample_containing_dts (self, start_dts);
+  return find_previous_non_delta_unit (self, iter);
+}
+
+static GSequenceIter *
+gst_media_source_sample_map_iter_starting_pts (GstMediaSourceSampleMap
+    * self, GstClockTime start_pts)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_SAMPLE_MAP (self), NULL);
+  g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (start_pts), NULL);
+  GSequenceIter *iter = find_sample_containing_pts (self, start_pts);
+  return find_previous_non_delta_unit (self, iter);
+}
+
+typedef struct _SampleMapIterator SampleMapIterator;
+
+struct _SampleMapIterator
+{
+  GstIterator iterator;
+  GstMediaSourceSampleMap *map;
+/* *INDENT-OFF* */
+  GstClockTime   (*timestamp_func)      (GstSample *);
+  GSequenceIter *(*resync_locator_func) (SampleMapIterator *);
+/* *INDENT-ON* */
+
+  GstClockTime start_time;
+  GstClockTime current_time;
+  GSequenceIter *current_iter;
+  GstSample *current_sample;
+};
+
+static void
+iter_copy (const SampleMapIterator * it, SampleMapIterator * copy)
+{
+  copy->map = gst_object_ref (it->map);
+  copy->timestamp_func = it->timestamp_func;
+  copy->resync_locator_func = it->resync_locator_func;
+
+  copy->current_time = it->current_time;
+  copy->start_time = it->start_time;
+  copy->current_iter = it->current_iter;
+  copy->current_sample = gst_sample_ref (it->current_sample);
+}
+
+static GSequenceIter *
+iter_find_resync_point_dts (SampleMapIterator * it)
+{
+  if (it->current_sample) {
+    GSequenceIter *iter =
+        find_sequentially (it->map->samples_by_dts, it->current_sample);
+    if (!g_sequence_iter_is_end (iter)) {
+      return g_sequence_iter_next (iter);
+    }
+  }
+
+  return gst_media_source_sample_map_iter_starting_dts (it->map,
+      it->current_time);
+}
+
+static GSequenceIter *
+iter_find_resync_point_pts (SampleMapIterator * it)
+{
+  if (it->current_sample) {
+    GSequenceIter *iter =
+        find_sequentially (it->map->samples_by_pts, it->current_sample);
+    if (!g_sequence_iter_is_end (iter)) {
+      return g_sequence_iter_next (iter);
+    }
+  }
+
+  return gst_media_source_sample_map_iter_starting_pts (it->map,
+      it->current_time);
+}
+
+static GstIteratorResult
+iter_next (SampleMapIterator * it, GValue * result)
+{
+
+  if (g_sequence_iter_is_end (it->current_iter)) {
+    return GST_ITERATOR_DONE;
+  }
+
+  GstSample *sample = g_sequence_get (it->current_iter);
+  gst_clear_sample (&it->current_sample);
+  it->current_sample = gst_sample_ref (sample);
+
+  it->current_time = it->timestamp_func (sample);
+  it->current_iter = g_sequence_iter_next (it->current_iter);
+
+  gst_value_set_sample (result, sample);
+
+  return GST_ITERATOR_OK;
+}
+
+static void
+iter_resync (SampleMapIterator * it)
+{
+  GST_TRACE_OBJECT (it->map, "resync");
+  it->current_time = it->start_time;
+  it->current_iter = it->resync_locator_func (it);
+}
+
+static void
+iter_free (SampleMapIterator * it)
+{
+  gst_clear_object (&it->map);
+  gst_clear_sample (&it->current_sample);
+}
+
+GstIterator *
+gst_media_source_sample_map_iter_samples_by_dts (GstMediaSourceSampleMap * map,
+    GMutex * lock, guint32 * master_cookie, GstClockTime start_dts,
+    GstSample * start_sample)
+{
+/* *INDENT-OFF* */
+  SampleMapIterator *it = (SampleMapIterator *) gst_iterator_new (
+      sizeof (SampleMapIterator),
+      GST_TYPE_SAMPLE,
+      lock,
+      master_cookie,
+      (GstIteratorCopyFunction) iter_copy,
+      (GstIteratorNextFunction) iter_next,
+      (GstIteratorItemFunction) NULL,
+      (GstIteratorResyncFunction) iter_resync,
+      (GstIteratorFreeFunction) iter_free
+  );
+/* *INDENT-ON* */
+
+  it->map = gst_object_ref (map);
+  it->timestamp_func = sample_dts;
+  it->resync_locator_func = iter_find_resync_point_dts;
+  it->start_time = start_dts;
+  it->current_time = start_dts;
+  it->current_sample = start_sample ? gst_sample_ref (start_sample) : NULL;
+  it->current_iter = iter_find_resync_point_dts (it);
+
+  return GST_ITERATOR (it);
+}
+
+GstIterator *
+gst_media_source_sample_map_iter_samples_by_pts (GstMediaSourceSampleMap * map,
+    GMutex * lock, guint32 * master_cookie, GstClockTime start_pts,
+    GstSample * start_sample)
+{
+/* *INDENT-OFF* */
+  SampleMapIterator *it = (SampleMapIterator *) gst_iterator_new (
+      sizeof (SampleMapIterator),
+      GST_TYPE_SAMPLE,
+      lock,
+      master_cookie,
+      (GstIteratorCopyFunction) iter_copy,
+      (GstIteratorNextFunction) iter_next,
+      (GstIteratorItemFunction) NULL,
+      (GstIteratorResyncFunction) iter_resync,
+      (GstIteratorFreeFunction) iter_free
+  );
+/* *INDENT-ON* */
+
+  it->map = gst_object_ref (map);
+  it->timestamp_func = sample_pts;
+  it->resync_locator_func = iter_find_resync_point_pts;
+  it->start_time = start_pts;
+  it->current_time = start_pts;
+  it->current_sample = start_sample ? gst_sample_ref (start_sample) : NULL;
+  it->current_iter = iter_find_resync_point_pts (it);
+
+  return GST_ITERATOR (it);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmediasourcetrack-private.h Added

@@ -0,0 +1,110 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/mse/mse-prelude.h>
+
+G_BEGIN_DECLS
+
+typedef enum
+{
+  GST_MEDIA_SOURCE_TRACK_TYPE_AUDIO,
+  GST_MEDIA_SOURCE_TRACK_TYPE_VIDEO,
+  GST_MEDIA_SOURCE_TRACK_TYPE_TEXT,
+  GST_MEDIA_SOURCE_TRACK_TYPE_OTHER,
+} GstMediaSourceTrackType;
+
+#define GST_TYPE_MEDIA_SOURCE_TRACK (gst_media_source_track_get_type())
+
+GST_MSE_PRIVATE
+G_DECLARE_FINAL_TYPE (GstMediaSourceTrack, gst_media_source_track, GST,
+    MEDIA_SOURCE_TRACK, GstObject);
+
+GST_MSE_PRIVATE
+GstMediaSourceTrackType gst_media_source_track_get_track_type (
+    GstMediaSourceTrack * self);
+
+GST_MSE_PRIVATE
+const gchar *
+gst_media_source_track_get_id (GstMediaSourceTrack * self);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_track_get_active (GstMediaSourceTrack * self);
+
+GST_MSE_PRIVATE
+GstMediaSourceTrack *gst_media_source_track_new (GstMediaSourceTrackType type,
+    const gchar * track_id);
+
+GST_MSE_PRIVATE
+GstMediaSourceTrack *
+gst_media_source_track_new_with_initial_caps (GstMediaSourceTrackType type,
+    const gchar * track_id, GstCaps * initial_caps);
+
+GST_MSE_PRIVATE
+GstMediaSourceTrack * gst_media_source_track_new_with_size (
+    GstMediaSourceTrackType type, const gchar * track_id, gsize size);
+
+GST_MSE_PRIVATE
+GstCaps *gst_media_source_track_get_initial_caps (GstMediaSourceTrack * self);
+
+GST_MSE_PRIVATE
+GstStreamType
+gst_media_source_track_get_stream_type (GstMediaSourceTrack * self);
+
+GST_MSE_API
+void gst_media_source_track_set_active (GstMediaSourceTrack * self,
+    gboolean active);
+
+GST_MSE_PRIVATE
+GstMiniObject *gst_media_source_track_pop (GstMediaSourceTrack * self);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_track_push (GstMediaSourceTrack * self,
+    GstSample * sample);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_track_try_push (GstMediaSourceTrack * self,
+    GstSample * sample);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_track_push_eos (GstMediaSourceTrack * self);
+
+GST_MSE_PRIVATE
+void gst_media_source_track_flush (GstMediaSourceTrack * self);
+
+GST_MSE_PRIVATE
+void gst_media_source_track_resume (GstMediaSourceTrack * self);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_track_is_empty (GstMediaSourceTrack * self);
+
+GST_MSE_PRIVATE
+GstStreamType gst_media_source_track_type_to_stream_type (
+    GstMediaSourceTrackType type);
+
+GST_MSE_PRIVATE
+GstMediaSourceTrackType gst_media_source_track_type_from_stream_type (
+    GstStreamType type);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmediasourcetrack.c Added

@@ -0,0 +1,458 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/mse/mse-enumtypes.h>
+#include <gst/mse/mse-enumtypes-private.h>
+#include "gstmediasourcetrack-private.h"
+
+#include "gstmselogging-private.h"
+
+#include <gst/base/gstdataqueue.h>
+
+struct _GstMediaSourceTrack
+{
+  GstObject parent_instance;
+
+  GstMediaSourceTrackType track_type;
+  gchar *track_id;
+  gboolean active;
+  GstCaps *initial_caps;
+
+  gsize queue_size;
+  GstDataQueue *samples;
+};
+
+G_DEFINE_TYPE (GstMediaSourceTrack, gst_media_source_track, GST_TYPE_OBJECT);
+
+#define DEFAULT_QUEUE_SIZE (1 << 10)
+
+enum
+{
+  PROP_0,
+
+  PROP_TRACK_TYPE,
+  PROP_TRACK_ID,
+  PROP_ACTIVE,
+  PROP_INITIAL_CAPS,
+  PROP_QUEUE_SIZE,
+
+  N_PROPS,
+};
+
+enum
+{
+  ON_NOT_EMPTY,
+
+  N_SIGNALS,
+};
+
+static GParamSpec *propertiesN_PROPS;
+static guint signalsN_SIGNALS;
+
+static GstMediaSourceTrack *
+_gst_media_source_track_new_full (GstMediaSourceTrackType type,
+    const gchar * track_id, gsize size, GstCaps * initial_caps)
+{
+  g_return_val_if_fail (type >= 0, NULL);
+  g_return_val_if_fail (type <= GST_MEDIA_SOURCE_TRACK_TYPE_OTHER, NULL);
+
+  gst_mse_init_logging ();
+
+  GstMediaSourceTrack *self = g_object_new (GST_TYPE_MEDIA_SOURCE_TRACK,
+      "track-type", type, "track-id", track_id, "queue-size", size,
+      "initial-caps", initial_caps, NULL);
+
+  return gst_object_ref_sink (self);
+}
+
+GstMediaSourceTrack *
+gst_media_source_track_new_with_size (GstMediaSourceTrackType type,
+    const gchar * track_id, gsize size)
+{
+  return _gst_media_source_track_new_full (type, track_id, size, NULL);
+}
+
+GstMediaSourceTrack *
+gst_media_source_track_new (GstMediaSourceTrackType type,
+    const gchar * track_id)
+{
+  return _gst_media_source_track_new_full (type, track_id, DEFAULT_QUEUE_SIZE,
+      NULL);
+}
+
+GstMediaSourceTrack *
+gst_media_source_track_new_with_initial_caps (GstMediaSourceTrackType type,
+    const gchar * track_id, GstCaps * initial_caps)
+{
+  g_return_val_if_fail (GST_IS_CAPS (initial_caps), NULL);
+  return _gst_media_source_track_new_full (type, track_id, DEFAULT_QUEUE_SIZE,
+      initial_caps);
+}
+
+static void
+gst_media_source_track_finalize (GObject * object)
+{
+  GstMediaSourceTrack *self = (GstMediaSourceTrack *) object;
+
+  g_free (self->track_id);
+  gst_clear_caps (&self->initial_caps);
+  g_object_unref (self->samples);
+
+  G_OBJECT_CLASS (gst_media_source_track_parent_class)->finalize (object);
+}
+
+static void
+gst_media_source_track_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstMediaSourceTrack *self = GST_MEDIA_SOURCE_TRACK (object);
+
+  switch (prop_id) {
+    case PROP_TRACK_TYPE:
+      g_value_set_enum (value, gst_media_source_track_get_track_type (self));
+      break;
+    case PROP_TRACK_ID:
+      g_value_set_static_string (value, gst_media_source_track_get_id (self));
+      break;
+    case PROP_ACTIVE:
+      g_value_set_boolean (value, gst_media_source_track_get_active (self));
+      break;
+    case PROP_INITIAL_CAPS:
+      g_value_take_boxed (value,
+          gst_media_source_track_get_initial_caps (self));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+  }
+}
+
+static void
+gst_media_source_track_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstMediaSourceTrack *self = GST_MEDIA_SOURCE_TRACK (object);
+
+  switch (prop_id) {
+    case PROP_TRACK_TYPE:
+      self->track_type = g_value_get_enum (value);
+      break;
+    case PROP_TRACK_ID:
+      self->track_id = g_value_dup_string (value);
+      break;
+    case PROP_ACTIVE:
+      gst_media_source_track_set_active (self, g_value_get_boolean (value));
+      break;
+    case PROP_INITIAL_CAPS:{
+      const GstCaps *caps = gst_value_get_caps (value);
+      self->initial_caps = caps == NULL ? NULL : gst_caps_copy (caps);
+      break;
+    }
+    case PROP_QUEUE_SIZE:{
+      self->queue_size = g_value_get_ulong (value);
+      break;
+    }
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+  }
+}
+
+static void
+gst_media_source_track_class_init (GstMediaSourceTrackClass * klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->finalize = GST_DEBUG_FUNCPTR (gst_media_source_track_finalize);
+  oclass->get_property =
+      GST_DEBUG_FUNCPTR (gst_media_source_track_get_property);
+  oclass->set_property =
+      GST_DEBUG_FUNCPTR (gst_media_source_track_set_property);
+
+  signalsON_NOT_EMPTY = g_signal_new ("on-not-empty",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+  propertiesPROP_TRACK_TYPE =
+      g_param_spec_enum ("track-type", "Track Type",
+      "Type of media in this Track, either Audio, Video, Text, or Other.",
+      GST_TYPE_MEDIA_SOURCE_TRACK_TYPE, GST_MEDIA_SOURCE_TRACK_TYPE_OTHER,
+      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+
+  propertiesPROP_TRACK_ID =
+      g_param_spec_string ("track-id", "Track ID",
+      "Identifier for this Track that must be unique within a Source Buffer.",
+      "", G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+
+  propertiesPROP_ACTIVE =
+      g_param_spec_boolean ("active", "Active",
+      "Whether this Track requires its parent Source Buffer to be in its "
+      "parent Media Source's Active Source Buffers list", FALSE,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  propertiesPROP_INITIAL_CAPS =
+      g_param_spec_boxed ("initial-caps", "Initial Caps",
+      "GstCaps discovered in the first Initialization Segment",
+      GST_TYPE_CAPS, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+      G_PARAM_STATIC_STRINGS);
+
+  propertiesPROP_QUEUE_SIZE =
+      g_param_spec_ulong ("queue-size", "Queue Size",
+      "Maximum Track Queue size",
+      0, G_MAXULONG, DEFAULT_QUEUE_SIZE,
+      G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_properties (oclass, N_PROPS, properties);
+}
+
+static gboolean
+check_queue_depth (GstDataQueue * queue, guint visible, guint bytes,
+    guint64 time, gpointer checkdata)
+{
+  GstMediaSourceTrack *self = GST_MEDIA_SOURCE_TRACK (checkdata);
+  return visible >= self->queue_size;
+}
+
+static void
+gst_media_source_track_init (GstMediaSourceTrack * self)
+{
+  self->samples = gst_data_queue_new (check_queue_depth, NULL, NULL, self);
+}
+
+GstMediaSourceTrackType
+gst_media_source_track_get_track_type (GstMediaSourceTrack * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self),
+      GST_MEDIA_SOURCE_TRACK_TYPE_OTHER);
+  return self->track_type;
+}
+
+GstStreamType
+gst_media_source_track_get_stream_type (GstMediaSourceTrack * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self),
+      GST_STREAM_TYPE_UNKNOWN);
+  return gst_media_source_track_type_to_stream_type (self->track_type);
+}
+
+const gchar *
+gst_media_source_track_get_id (GstMediaSourceTrack * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self), NULL);
+  return self->track_id;
+}
+
+GstCaps *
+gst_media_source_track_get_initial_caps (GstMediaSourceTrack * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self), NULL);
+  if (GST_IS_CAPS (self->initial_caps)) {
+    return self->initial_caps;
+  } else {
+    return NULL;
+  }
+}
+
+gboolean
+gst_media_source_track_get_active (GstMediaSourceTrack * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self), FALSE);
+  return self->active;
+}
+
+void
+gst_media_source_track_set_active (GstMediaSourceTrack * self, gboolean active)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self));
+  self->active = active;
+  g_object_notify_by_pspec (G_OBJECT (self), propertiesPROP_ACTIVE);
+}
+
+GstMiniObject *
+gst_media_source_track_pop (GstMediaSourceTrack * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self), NULL);
+  GstDataQueueItem *item = NULL;
+  if (!gst_data_queue_pop (self->samples, &item)) {
+    return NULL;
+  }
+  GstMiniObject *object = item->object;
+  item->object = NULL;
+  item->destroy (item);
+  return object;
+}
+
+static inline gsize
+sample_size (GstSample * sample)
+{
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  return gst_buffer_get_size (buffer);
+}
+
+static inline GstClockTime
+sample_duration (GstSample * sample)
+{
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  return GST_BUFFER_DURATION (buffer);
+}
+
+static void
+destroy_item (GstDataQueueItem * item)
+{
+  gst_clear_mini_object (&item->object);
+  g_free (item);
+}
+
+static inline GstDataQueueItem *
+wrap_sample (GstSample * sample)
+{
+  GstDataQueueItem item = {
+    .object = GST_MINI_OBJECT (sample),
+    .size = sample_size (sample),
+    .duration = sample_duration (sample),
+    .destroy = (GDestroyNotify) destroy_item,
+    .visible = TRUE,
+  };
+  return g_memdup2 (&item, sizeof (GstDataQueueItem));
+}
+
+gboolean
+gst_media_source_track_push (GstMediaSourceTrack * self, GstSample * sample)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self), FALSE);
+  g_return_val_if_fail (GST_IS_SAMPLE (sample), FALSE);
+
+  gboolean was_empty = gst_media_source_track_is_empty (self);
+
+  GstDataQueueItem *item = wrap_sample (sample);
+
+  gboolean result = gst_data_queue_push (self->samples, item);
+
+  if (result) {
+    if (was_empty) {
+      g_signal_emit (self, signalsON_NOT_EMPTY, 0);
+    }
+    return TRUE;
+  } else {
+    item->destroy (item);
+    return FALSE;
+  }
+}
+
+static inline GstDataQueueItem *
+wrap_eos (void)
+{
+  GstEvent *event = gst_event_ref (gst_event_new_eos ());
+
+  GstDataQueueItem item = {
+    .object = GST_MINI_OBJECT (event),
+    .size = 0,
+    .duration = 0,
+    .destroy = (GDestroyNotify) destroy_item,
+    .visible = TRUE,
+  };
+  return g_memdup2 (&item, sizeof (GstDataQueueItem));
+}
+
+gboolean
+gst_media_source_track_push_eos (GstMediaSourceTrack * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self), FALSE);
+
+  GstDataQueueItem *item = wrap_eos ();
+
+  gboolean result = gst_data_queue_push (self->samples, item);
+
+  if (result) {
+    return TRUE;
+  } else {
+    item->destroy (item);
+    return FALSE;
+  }
+}
+
+void
+gst_media_source_track_flush (GstMediaSourceTrack * self)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self));
+  gst_data_queue_set_flushing (self->samples, TRUE);
+  gst_data_queue_flush (self->samples);
+}
+
+void
+gst_media_source_track_resume (GstMediaSourceTrack * self)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self));
+  gst_data_queue_set_flushing (self->samples, FALSE);
+}
+
+gboolean
+gst_media_source_track_try_push (GstMediaSourceTrack * self, GstSample * sample)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self), FALSE);
+  g_return_val_if_fail (GST_IS_SAMPLE (sample), FALSE);
+
+  if (gst_data_queue_is_full (self->samples)) {
+    return FALSE;
+  }
+
+  return gst_media_source_track_push (self, sample);
+}
+
+gboolean
+gst_media_source_track_is_empty (GstMediaSourceTrack * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK (self), FALSE);
+  return gst_data_queue_is_empty (self->samples);
+}
+
+GstStreamType
+gst_media_source_track_type_to_stream_type (GstMediaSourceTrackType type)
+{
+  switch (type) {
+    case GST_MEDIA_SOURCE_TRACK_TYPE_AUDIO:
+      return GST_STREAM_TYPE_AUDIO;
+    case GST_MEDIA_SOURCE_TRACK_TYPE_TEXT:
+      return GST_STREAM_TYPE_TEXT;
+    case GST_MEDIA_SOURCE_TRACK_TYPE_VIDEO:
+      return GST_STREAM_TYPE_VIDEO;
+    default:
+      return GST_STREAM_TYPE_UNKNOWN;
+  }
+}
+
+GstMediaSourceTrackType
+gst_media_source_track_type_from_stream_type (GstStreamType type)
+{
+  switch (type) {
+    case GST_STREAM_TYPE_AUDIO:
+      return GST_MEDIA_SOURCE_TRACK_TYPE_AUDIO;
+    case GST_STREAM_TYPE_TEXT:
+      return GST_MEDIA_SOURCE_TRACK_TYPE_TEXT;
+    case GST_STREAM_TYPE_VIDEO:
+      return GST_MEDIA_SOURCE_TRACK_TYPE_VIDEO;
+    default:
+      return GST_MEDIA_SOURCE_TRACK_TYPE_OTHER;
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmediasourcetrackbuffer-private.h Added

@@ -0,0 +1,100 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <glib-object.h>
+#include <gst/mse/mse-prelude.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_MEDIA_SOURCE_TRACK_BUFFER \
+    (gst_media_source_track_buffer_get_type())
+
+GST_MSE_PRIVATE
+G_DECLARE_FINAL_TYPE (GstMediaSourceTrackBuffer, gst_media_source_track_buffer,
+    GST, MEDIA_SOURCE_TRACK_BUFFER, GstObject);
+
+GST_MSE_PRIVATE
+GstMediaSourceTrackBuffer *gst_media_source_track_buffer_new (void);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_track_buffer_is_empty (
+    GstMediaSourceTrackBuffer * self);
+
+GST_MSE_PRIVATE
+gint gst_media_source_track_buffer_get_size (GstMediaSourceTrackBuffer * self);
+
+GST_MSE_PRIVATE
+GstClockTime gst_media_source_track_buffer_get_highest_end_time (
+    GstMediaSourceTrackBuffer * self);
+
+GST_MSE_PRIVATE
+GArray * gst_media_source_track_buffer_get_ranges (
+    GstMediaSourceTrackBuffer * self);
+
+GST_MSE_PRIVATE
+void gst_media_source_track_buffer_set_group_start (GstMediaSourceTrackBuffer
+    * self, GstClockTime group_start);
+
+GST_MSE_PRIVATE
+void gst_media_source_track_buffer_process_init_segment (
+    GstMediaSourceTrackBuffer * self, gboolean sequence_mode);
+
+GST_MSE_PRIVATE
+void gst_media_source_track_buffer_add (GstMediaSourceTrackBuffer * self,
+    GstSample * sample);
+
+GST_MSE_PRIVATE
+void gst_media_source_track_buffer_remove (GstMediaSourceTrackBuffer * self,
+    GstSample * sample);
+
+GST_MSE_PRIVATE
+gsize
+gst_media_source_track_buffer_remove_range (GstMediaSourceTrackBuffer * self,
+    GstClockTime start, GstClockTime end);
+
+GST_MSE_PRIVATE
+void gst_media_source_track_buffer_clear (GstMediaSourceTrackBuffer * self);
+
+GST_MSE_PRIVATE
+void gst_media_source_track_buffer_eos (GstMediaSourceTrackBuffer * self);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_track_buffer_is_eos (
+    GstMediaSourceTrackBuffer * self);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_track_buffer_await_eos_until (
+    GstMediaSourceTrackBuffer * self, gint64 deadline);
+
+GST_MSE_PRIVATE
+gsize gst_media_source_track_buffer_get_storage_size (
+    GstMediaSourceTrackBuffer * self);
+
+GST_MSE_PRIVATE
+GstIterator * gst_media_source_track_buffer_iter_samples (
+    GstMediaSourceTrackBuffer * buffer, GstClockTime start_dts,
+    GstSample * start_sample);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmediasourcetrackbuffer.c Added

@@ -0,0 +1,377 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstmediasourcetrackbuffer-private.h"
+#include "gstmediasourcesamplemap-private.h"
+#include "gstmediasource.h"
+#include "gstmselogging-private.h"
+
+typedef struct
+{
+  gboolean enabled;
+  GstClockTime group_start;
+  GstClockTime group_end;
+  GstClockTimeDiff offset;
+
+  GstClockTime last_dts;
+  GstClockTime last_duration;
+} Timestamps;
+
+struct _GstMediaSourceTrackBuffer
+{
+  GstObject parent_instance;
+
+  GstMediaSourceSampleMap *samples;
+  Timestamps timestamps;
+  guint eos;
+
+  guint32 master_cookie;
+
+  GCond new_data_cond;
+  GMutex new_data_mutex;
+};
+
+#define g_array_new_ranges() \
+  (g_array_new (TRUE, FALSE, sizeof (GstMediaSourceRange)))
+
+#define NEW_DATA_LOCK(a) (g_mutex_lock (&a->new_data_mutex))
+#define NEW_DATA_UNLOCK(a) (g_mutex_unlock (&a->new_data_mutex))
+#define NEW_DATA_SIGNAL(a) (g_cond_signal (&a->new_data_cond))
+#define NEW_DATA_WAIT(a) (g_cond_wait (&a->new_data_cond, &a->new_data_mutex))
+#define NEW_DATA_WAIT_UNTIL(a, d) \
+    (g_cond_wait_until (&a->new_data_cond, &a->new_data_mutex, d))
+
+static void timestamps_init (Timestamps * self, gboolean enabled);
+static void timestamps_process (Timestamps * self, GstSample * sample);
+
+G_DEFINE_TYPE (GstMediaSourceTrackBuffer, gst_media_source_track_buffer,
+    GST_TYPE_OBJECT);
+
+static void
+invalidate_cookie (GstMediaSourceTrackBuffer * self)
+{
+  self->master_cookie++;
+}
+
+GstMediaSourceTrackBuffer *
+gst_media_source_track_buffer_new (void)
+{
+  return gst_object_ref_sink (g_object_new (GST_TYPE_MEDIA_SOURCE_TRACK_BUFFER,
+          NULL));
+}
+
+static void
+gst_media_source_track_buffer_finalize (GObject * object)
+{
+  GstMediaSourceTrackBuffer *self = GST_MEDIA_SOURCE_TRACK_BUFFER (object);
+  gst_object_unref (self->samples);
+  g_cond_clear (&self->new_data_cond);
+  g_mutex_clear (&self->new_data_mutex);
+  G_OBJECT_CLASS (gst_media_source_track_buffer_parent_class)->finalize
+      (object);
+}
+
+static void
+gst_media_source_track_buffer_class_init (GstMediaSourceTrackBufferClass *
+    klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->finalize = GST_DEBUG_FUNCPTR (gst_media_source_track_buffer_finalize);
+}
+
+static void
+gst_media_source_track_buffer_init (GstMediaSourceTrackBuffer * self)
+{
+  self->samples = gst_media_source_sample_map_new ();
+  self->eos = FALSE;
+  self->master_cookie = 0;
+  timestamps_init (&self->timestamps, FALSE);
+  g_cond_init (&self->new_data_cond);
+  g_mutex_init (&self->new_data_mutex);
+}
+
+void
+gst_media_source_track_buffer_process_init_segment (GstMediaSourceTrackBuffer
+    * self, gboolean sequence_mode)
+{
+  NEW_DATA_LOCK (self);
+
+  timestamps_init (&self->timestamps, sequence_mode);
+
+  NEW_DATA_UNLOCK (self);
+}
+
+void
+gst_media_source_track_buffer_set_group_start (GstMediaSourceTrackBuffer
+    * self, GstClockTime group_start)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE_TRACK_BUFFER (self));
+  if (self->timestamps.enabled) {
+    self->timestamps.group_start = group_start;
+  }
+}
+
+void
+gst_media_source_track_buffer_add (GstMediaSourceTrackBuffer * self,
+    GstSample * sample)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE_TRACK_BUFFER (self));
+  g_return_if_fail (GST_IS_SAMPLE (sample));
+
+  NEW_DATA_LOCK (self);
+
+  timestamps_process (&self->timestamps, sample);
+  gst_media_source_sample_map_add (self->samples, sample);
+  invalidate_cookie (self);
+
+  NEW_DATA_SIGNAL (self);
+  NEW_DATA_UNLOCK (self);
+}
+
+void
+gst_media_source_track_buffer_remove (GstMediaSourceTrackBuffer * self,
+    GstSample * sample)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE_TRACK_BUFFER (self));
+  g_return_if_fail (GST_IS_SAMPLE (sample));
+
+  NEW_DATA_LOCK (self);
+
+  gst_media_source_sample_map_remove (self->samples, sample);
+  invalidate_cookie (self);
+
+  NEW_DATA_SIGNAL (self);
+  NEW_DATA_UNLOCK (self);
+}
+
+gsize
+gst_media_source_track_buffer_remove_range (GstMediaSourceTrackBuffer * self,
+    GstClockTime earliest, GstClockTime latest)
+{
+  NEW_DATA_LOCK (self);
+  gsize size = gst_media_source_sample_map_remove_range (self->samples,
+      earliest, latest);
+  invalidate_cookie (self);
+  NEW_DATA_SIGNAL (self);
+  NEW_DATA_UNLOCK (self);
+  return size;
+}
+
+void
+gst_media_source_track_buffer_clear (GstMediaSourceTrackBuffer * self)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE_TRACK_BUFFER (self));
+
+  NEW_DATA_LOCK (self);
+
+  g_set_object (&self->samples, gst_media_source_sample_map_new ());
+
+  NEW_DATA_SIGNAL (self);
+  NEW_DATA_UNLOCK (self);
+}
+
+static gboolean
+is_eos (GstMediaSourceTrackBuffer * self)
+{
+  return g_atomic_int_get (&self->eos);
+}
+
+void
+gst_media_source_track_buffer_eos (GstMediaSourceTrackBuffer * self)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE_TRACK_BUFFER (self));
+  NEW_DATA_LOCK (self);
+  g_atomic_int_set (&self->eos, TRUE);
+  NEW_DATA_SIGNAL (self);
+  NEW_DATA_UNLOCK (self);
+}
+
+gboolean
+gst_media_source_track_buffer_is_eos (GstMediaSourceTrackBuffer * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK_BUFFER (self), FALSE);
+  return is_eos (self);
+}
+
+gboolean
+gst_media_source_track_buffer_await_eos_until (GstMediaSourceTrackBuffer * self,
+    gint64 deadline)
+{
+  NEW_DATA_LOCK (self);
+  while (!is_eos (self) && NEW_DATA_WAIT_UNTIL (self, deadline)) {
+    /* wait */
+  }
+  NEW_DATA_UNLOCK (self);
+  return is_eos (self);
+}
+
+gint
+gst_media_source_track_buffer_get_size (GstMediaSourceTrackBuffer * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK_BUFFER (self), 0);
+  return gst_media_source_sample_map_get_size (self->samples);
+}
+
+GstClockTime
+gst_media_source_track_buffer_get_highest_end_time (GstMediaSourceTrackBuffer
+    * self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK_BUFFER (self),
+      GST_CLOCK_TIME_NONE);
+  return gst_media_source_sample_map_get_highest_end_time (self->samples);
+}
+
+typedef struct
+{
+  GArray *ranges;
+  GstMediaSourceRange current_range;
+} GetRangesAccumulator;
+
+static gboolean
+get_ranges_fold (const GValue * item, GetRangesAccumulator * acc,
+    gpointer user_data)
+{
+  GstSample *sample = gst_value_get_sample (item);
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  GstClockTime start = GST_BUFFER_PTS (buffer);
+  GstClockTime end = start + GST_BUFFER_DURATION (buffer);
+
+  GstMediaSourceRange *range = &acc->current_range;
+
+  if (range->end == 0 || start <= (range->end + (GST_SECOND / 100))) {
+    range->end = end;
+    return TRUE;
+  }
+  g_array_append_val (acc->ranges, *range);
+
+  range->start = start;
+  range->end = end;
+
+  return TRUE;
+}
+
+GArray *
+gst_media_source_track_buffer_get_ranges (GstMediaSourceTrackBuffer * self)
+{
+  GetRangesAccumulator acc = {
+    .ranges = g_array_new_ranges (),
+    .current_range = {.start = 0,.end = 0},
+  };
+
+  /* *INDENT-OFF* */
+  GstIterator *iter = gst_media_source_sample_map_iter_samples_by_pts (
+      self->samples,
+      &self->new_data_mutex,
+      &self->master_cookie,
+      0,
+      NULL
+  );
+  /* *INDENT-ON* */
+  while (gst_iterator_fold (iter, (GstIteratorFoldFunction) get_ranges_fold,
+          (GValue *) & acc, NULL) == GST_ITERATOR_RESYNC) {
+    gst_iterator_resync (iter);
+  }
+  gst_iterator_free (iter);
+
+  if (acc.current_range.end > 0) {
+    g_array_append_val (acc.ranges, acc.current_range);
+  }
+
+  return acc.ranges;
+}
+
+static void
+timestamps_init (Timestamps * self, gboolean enabled)
+{
+  self->enabled = enabled;
+  self->group_start = GST_CLOCK_TIME_NONE;
+  self->group_end = GST_CLOCK_TIME_NONE;
+  self->offset = 0;
+  self->last_dts = 0;
+  self->last_duration = 0;
+}
+
+static void
+timestamps_process (Timestamps * self, GstSample * sample)
+{
+  if (!self->enabled) {
+    return;
+  }
+
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  GstClockTime duration = GST_BUFFER_DURATION (buffer);
+
+  GstClockTime pts = 0;
+  GstClockTime dts = 0;
+
+  if (GST_CLOCK_TIME_IS_VALID (self->group_start)) {
+    self->offset = self->group_start - pts;
+    self->group_end = self->group_start;
+    self->group_start = GST_CLOCK_TIME_NONE;
+  }
+
+  if (self->offset != 0) {
+    pts += self->offset;
+    dts += self->offset;
+  }
+
+  GstClockTime end_pts = pts + duration;
+
+  self->last_dts = dts;
+  self->last_duration = duration;
+
+  if (GST_CLOCK_TIME_IS_VALID (self->group_end)) {
+    self->group_end = MAX (self->group_end, end_pts);
+  }
+  self->offset = end_pts;
+
+  GST_BUFFER_PTS (buffer) = pts;
+  GST_BUFFER_DTS (buffer) = dts;
+}
+
+gsize
+gst_media_source_track_buffer_get_storage_size (GstMediaSourceTrackBuffer *
+    self)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE_TRACK_BUFFER (self), 0);
+  return gst_media_source_sample_map_get_storage_size (self->samples);
+}
+
+GstIterator *
+gst_media_source_track_buffer_iter_samples (GstMediaSourceTrackBuffer * self,
+    GstClockTime start_dts, GstSample * start_sample)
+{
+  /* *INDENT-OFF* */
+  return gst_media_source_sample_map_iter_samples_by_dts (
+      self->samples,
+      &self->new_data_mutex,
+      &self->master_cookie,
+      start_dts,
+      start_sample
+  );
+  /* *INDENT-ON* */
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmseeventqueue-private.h Added

@@ -0,0 +1,46 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/base/gstdataqueue.h>
+#include <gst/mse/mse-prelude.h>
+
+G_BEGIN_DECLS
+
+typedef void (*GstMseEventQueueCallback) (GstDataQueueItem *, gpointer);
+
+#define GST_TYPE_MSE_EVENT_QUEUE (gst_mse_event_queue_get_type())
+
+G_DECLARE_FINAL_TYPE (GstMseEventQueue, gst_mse_event_queue, GST,
+    MSE_EVENT_QUEUE, GstObject);
+
+GST_MSE_PRIVATE
+GstMseEventQueue * gst_mse_event_queue_new (GstMseEventQueueCallback callback,
+    gpointer user_data);
+
+GST_MSE_PRIVATE
+gboolean gst_mse_event_queue_push (GstMseEventQueue * self,
+    GstDataQueueItem * item);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmseeventqueue.c Added

@@ -0,0 +1,133 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/base/gstdataqueue.h>
+#include <gst/mse/mse-prelude.h>
+
+#include "gstmseeventqueue-private.h"
+
+struct _GstMseEventQueue
+{
+  GstObject parent_instance;
+
+  GstMseEventQueueCallback callback;
+  gpointer user_data;
+
+  GstTask *task;
+  GRecMutex lock;
+  GstDataQueue *queue;
+};
+
+G_DEFINE_TYPE (GstMseEventQueue, gst_mse_event_queue, GST_TYPE_OBJECT);
+
+GstMseEventQueue *
+gst_mse_event_queue_new (GstMseEventQueueCallback callback, gpointer user_data)
+{
+  g_return_val_if_fail (callback != NULL, NULL);
+
+  GstMseEventQueue *self = g_object_new (GST_TYPE_MSE_EVENT_QUEUE, NULL);
+
+  self->callback = callback;
+  self->user_data = user_data;
+
+  gst_task_start (self->task);
+
+  return g_object_ref_sink (self);
+}
+
+static void
+gst_mse_background_event_queue_dispose (GObject * obj)
+{
+  GstMseEventQueue *self = GST_MSE_EVENT_QUEUE (obj);
+
+  gst_data_queue_set_flushing (self->queue, TRUE);
+  gst_data_queue_flush (self->queue);
+
+  G_OBJECT_CLASS (gst_mse_event_queue_parent_class)->dispose (obj);
+}
+
+static void
+gst_mse_background_event_queue_finalize (GObject * obj)
+{
+  GstMseEventQueue *self = GST_MSE_EVENT_QUEUE (obj);
+
+  gst_task_join (self->task);
+  g_rec_mutex_clear (&self->lock);
+  gst_clear_object (&self->task);
+  gst_clear_object (&self->queue);
+
+  G_OBJECT_CLASS (gst_mse_event_queue_parent_class)->finalize (obj);
+}
+
+void
+gst_mse_event_queue_class_init (GstMseEventQueueClass * klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->dispose = GST_DEBUG_FUNCPTR (gst_mse_background_event_queue_dispose);
+  oclass->finalize =
+      GST_DEBUG_FUNCPTR (gst_mse_background_event_queue_finalize);
+}
+
+static void
+task_func (GstMseEventQueue * self)
+{
+  GstTask *task = self->task;
+  GstDataQueue *queue = self->queue;
+  GstDataQueueItem *item = NULL;
+  if (!gst_data_queue_pop (queue, &item)) {
+    gst_task_stop (task);
+    return;
+  }
+  self->callback (item, self->user_data);
+  if (item->destroy) {
+    item->destroy (item);
+  }
+}
+
+static gboolean
+never_full (GstDataQueue * queue, guint visible, guint bytes, guint64 time,
+    gpointer user_data)
+{
+  return FALSE;
+}
+
+void
+gst_mse_event_queue_init (GstMseEventQueue * self)
+{
+  self->queue = gst_data_queue_new (never_full, NULL, NULL, NULL);
+  self->task = gst_task_new ((GstTaskFunction) task_func, self, NULL);
+  g_rec_mutex_init (&self->lock);
+  gst_task_set_lock (self->task, &self->lock);
+}
+
+gboolean
+gst_mse_event_queue_push (GstMseEventQueue * self, GstDataQueueItem * item)
+{
+  g_return_val_if_fail (GST_IS_MSE_EVENT_QUEUE (self), FALSE);
+  g_return_val_if_fail (item != NULL, FALSE);
+  return gst_data_queue_push (self->queue, item);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmselogging-private.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+
+#define GST_CAT_DEFAULT gst_mse_debug
+
+G_GNUC_INTERNAL
+GST_DEBUG_CATEGORY_EXTERN (gst_mse_debug);
+
+G_GNUC_INTERNAL
+void gst_mse_init_logging (void);

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmselogging.c Added

@@ -0,0 +1,35 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstmselogging-private.h"
+
+GST_DEBUG_CATEGORY (gst_mse_debug);
+
+void
+gst_mse_init_logging (void)
+{
+  GST_DEBUG_CATEGORY_INIT (gst_mse_debug, "gst-mse", 0, "GstMse");
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmsemediatype-private.h Added

@@ -0,0 +1,60 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <glib.h>
+#include <gst/gst.h>
+#include <gst/mse/mse-prelude.h>
+
+G_BEGIN_DECLS
+
+typedef struct
+{
+  gchar *mime_type;
+  GStrv codecs;
+} GstMediaSourceMediaType;
+
+#define GST_MEDIA_SOURCE_MEDIA_TYPE_INIT { 0 }
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_media_type_parse (GstMediaSourceMediaType * self,
+    const gchar * type);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_media_type_is_caps_supported (const GstCaps * caps);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_media_type_is_supported (
+    GstMediaSourceMediaType * self);
+
+GST_MSE_PRIVATE
+gboolean gst_media_source_media_type_generates_timestamp (
+    GstMediaSourceMediaType * self);
+
+GST_MSE_PRIVATE
+void gst_media_source_media_type_reset (GstMediaSourceMediaType * self);
+
+GST_MSE_PRIVATE
+void gst_media_source_media_type_free (GstMediaSourceMediaType * self);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmsemediatype.c Added

@@ -0,0 +1,544 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2019 Igalia S.L.
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib.h>
+#include <gst/gst.h>
+
+#include "gstmsemediatype-private.h"
+
+static const gchar tspecials = {
+  '(', ')', '<', '>', '@', ',', ';', ':',
+  '\\', '"', '/', '', '', '?', '=',
+  0,
+};
+
+static gboolean
+is_tspecial (const gchar c)
+{
+  for (const gchar * tspecial = tspecials; *tspecial != 0; tspecial++) {
+    if (*tspecial == c) {
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+
+static gboolean
+is_token_character (const gchar c)
+{
+  if (g_ascii_iscntrl (c) || is_tspecial (c)) {
+    return FALSE;
+  }
+  return g_ascii_isgraph (c);
+}
+
+static gboolean
+is_ascii (const gchar c)
+{
+  return c > 0 && c <= G_MAXINT8;
+}
+
+static gboolean
+is_eos (const gchar c)
+{
+  return c == '\0';
+}
+
+static void
+ignore_whitespace (const gchar ** input)
+{
+  g_return_if_fail (input != NULL);
+
+  const gchar *output;
+  for (output = *input; g_ascii_isspace (*output); output++) {
+  }
+  *input = output;
+}
+
+static gboolean
+any_of (const gchar ** input, const gchar ** choices, gchar ** value)
+{
+  g_return_val_if_fail (input != NULL, FALSE);
+  g_return_val_if_fail (choices != NULL, FALSE);
+  g_return_val_if_fail (value != NULL, FALSE);
+
+  for (const gchar ** choice = choices; *choice != NULL; choice++) {
+    gulong prefix_length = strlen (*choice);
+    if (g_str_has_prefix (*input, *choice)) {
+      *value = g_strndup (*input, prefix_length);
+      *input += prefix_length;
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+
+static gboolean
+literal (const gchar ** input, const gchar * value)
+{
+  g_return_val_if_fail (input != NULL, FALSE);
+  g_return_val_if_fail (value != NULL, FALSE);
+
+  if (!g_str_has_prefix (*input, value)) {
+    return FALSE;
+  }
+  *input += strlen (value);
+  return TRUE;
+}
+
+static gboolean
+token (const gchar ** input, gchar ** value)
+{
+  g_return_val_if_fail (input != NULL, FALSE);
+  g_return_val_if_fail (value != NULL, FALSE);
+
+  const gchar *unparsed = *input;
+  for (; is_token_character (unparsed0); unparsed++) {
+  }
+  gsize length = unparsed - *input;
+  if (length < 1) {
+    return FALSE;
+  }
+  *value = g_strndup (*input, length);
+  *input = unparsed;
+  return TRUE;
+}
+
+static gboolean
+quoted_string_char (const gchar ** input, gchar * value)
+{
+  g_return_val_if_fail (input != NULL, FALSE);
+  g_return_val_if_fail (value != NULL, FALSE);
+
+  const gchar *unparsed = *input;
+  char c = unparsed0;
+  if (!is_ascii (c)) {
+    return FALSE;
+  }
+
+  if (c == '"' || c == '\\' || c == '\r') {
+    return FALSE;
+  }
+
+  *value = c;
+  (*input)++;
+  return TRUE;
+}
+
+static gboolean
+escaped_ascii_char (const gchar ** input, gchar * value)
+{
+  g_return_val_if_fail (input != NULL, FALSE);
+  g_return_val_if_fail (value != NULL, FALSE);
+
+  if (!literal (input, "\\")) {
+    return FALSE;
+  }
+
+  gchar c = (*input)0;
+  if (!is_ascii (c)) {
+    return FALSE;
+  }
+
+  *value = c;
+  (*input)++;
+  return TRUE;
+}
+
+static gboolean
+quoted_string (const gchar ** input, gchar ** value)
+{
+  g_return_val_if_fail (input != NULL, FALSE);
+  g_return_val_if_fail (value != NULL, FALSE);
+
+  const gchar *unparsed = *input;
+  if (!literal (&unparsed, "\"")) {
+    return FALSE;
+  }
+
+  GString *string_value = g_string_new (NULL);
+  for (;;) {
+    if (literal (&unparsed, "\"")) {
+      *input = unparsed;
+      *value = g_string_free (string_value, FALSE);
+      return TRUE;
+    }
+
+    if (is_eos (unparsed0)) {
+      goto error;
+    }
+
+    gchar c;
+
+    if (quoted_string_char (&unparsed, &c)) {
+      g_string_append_c (string_value, c);
+      continue;
+    }
+
+    if (escaped_ascii_char (&unparsed, &c)) {
+      g_string_append_c (string_value, c);
+      continue;
+    }
+
+    goto error;
+  }
+error:
+  g_string_free (string_value, TRUE);
+  return FALSE;
+}
+
+static const gchar *discrete_media_types = {
+  "text",
+  "image",
+  "audio",
+  "video",
+  "application",
+  NULL,
+};
+
+static gboolean
+discrete_media_type (const gchar ** input, gchar ** value)
+{
+  return any_of (input, discrete_media_types, value);
+}
+
+static gboolean
+composite_media_type (const gchar ** input, gchar ** value)
+{
+  return token (input, value);
+}
+
+static gboolean
+media_type_parameter (const gchar ** input, gchar ** param_name,
+    gchar ** param_value)
+{
+  g_return_val_if_fail (input != NULL, FALSE);
+  g_return_val_if_fail (param_name != NULL, FALSE);
+  g_return_val_if_fail (param_value != NULL, FALSE);
+
+  ignore_whitespace (input);
+  if (!token (input, param_name)) {
+    return FALSE;
+  }
+  if (!literal (input, "=")) {
+    return FALSE;
+  }
+  if (!token (input, param_value)) {
+    if (!quoted_string (input, param_value)) {
+      return FALSE;
+    }
+  }
+  ignore_whitespace (input);
+  return TRUE;
+}
+
+static gboolean
+media_type (const gchar ** input, gchar ** value)
+{
+  g_return_val_if_fail (input != NULL, FALSE);
+  g_return_val_if_fail (value != NULL, FALSE);
+
+  gchar *discrete = NULL;
+  gchar *composite = NULL;
+
+  if (!discrete_media_type (input, &discrete)) {
+    goto error;
+  }
+  if (!literal (input, "/")) {
+    goto error;
+  }
+  if (!composite_media_type (input, &composite)) {
+    goto error;
+  }
+
+  *value = g_strdup_printf ("%s/%s", discrete, composite);
+  g_clear_pointer (&discrete, g_free);
+  g_clear_pointer (&composite, g_free);
+  return TRUE;
+
+error:
+  g_clear_pointer (&discrete, g_free);
+  g_clear_pointer (&composite, g_free);
+  return FALSE;
+}
+
+static gboolean
+media_type_codecs (const gchar ** input, gchar *** codecs)
+{
+  g_return_val_if_fail (input != NULL, FALSE);
+  g_return_val_if_fail (codecs != NULL, FALSE);
+
+  gchar *param_name = NULL;
+  gchar *codecs_value = NULL;
+  while (!is_eos (*input0)
+      && media_type_parameter (input, &param_name, &codecs_value)) {
+    gboolean is_codecs = g_strcmp0 (param_name, "codecs") == 0;
+    g_clear_pointer (&param_name, g_free);
+    if (is_codecs) {
+      break;
+    }
+    g_clear_pointer (&codecs_value, g_free);
+  }
+  if (codecs_value == NULL) {
+    return TRUE;
+  }
+
+  gchar **codec_names = g_strsplit (codecs_value, ",", 0);
+  guint n_codecs = g_strv_length (codec_names);
+  GPtrArray *codecs_array = g_ptr_array_new_full (n_codecs, NULL);
+  for (guint i = 0; i < n_codecs; i++) {
+    gchar *codec = g_strstrip (g_strdup (codec_namesi));
+    if (g_strcmp0 (codec, "") != 0) {
+      g_ptr_array_add (codecs_array, g_strdup (codec));
+    }
+    g_clear_pointer (&codec, g_free);
+  }
+  g_ptr_array_add (codecs_array, NULL);
+  *codecs = (gchar **) g_ptr_array_free (codecs_array, FALSE);
+
+  g_clear_pointer (&codecs_value, g_free);
+  g_strfreev (codec_names);
+
+  return TRUE;
+}
+
+gboolean
+gst_media_source_media_type_parse (GstMediaSourceMediaType * self,
+    const gchar * type)
+{
+  g_return_val_if_fail (self != NULL, FALSE);
+  g_return_val_if_fail (type != NULL, FALSE);
+
+  gchar *lowercase = g_ascii_strdown (type, -1);
+  const gchar *input = lowercase;
+
+  ignore_whitespace (&input);
+  if (!media_type (&input, &self->mime_type)) {
+    g_free (lowercase);
+    return FALSE;
+  }
+  self->codecs = NULL;
+  ignore_whitespace (&input);
+  if (is_eos (input0)) {
+    g_free (lowercase);
+    return TRUE;
+  }
+  if (!literal (&input, ";")) {
+    g_free (lowercase);
+    return TRUE;
+  }
+  ignore_whitespace (&input);
+  media_type_codecs (&input, &self->codecs);
+  g_free (lowercase);
+  return TRUE;
+}
+
+static inline gboolean
+has_any_prefix (const gchar * str, const gchar * prefix, ...)
+{
+  if (g_str_has_prefix (str, prefix)) {
+    return TRUE;
+  }
+
+  va_list varargs;
+
+  va_start (varargs, prefix);
+  for (const gchar * arg = va_arg (varargs, const gchar *); arg != NULL;
+      arg = va_arg (varargs, const gchar *))
+  {
+    if (g_str_has_prefix (str, arg)) {
+      va_end (varargs);
+      return TRUE;
+    }
+  }
+  va_end (varargs);
+  return FALSE;
+}
+
+static const gchar *
+patch_media_type (const gchar * media_type)
+{
+  if (g_strcmp0 (media_type, "video/mp4") == 0) {
+    return "video/quicktime";
+  }
+  if (g_strcmp0 (media_type, "audio/mp4") == 0 ||
+      g_strcmp0 (media_type, "audio/aac") == 0) {
+    return "audio/x-m4a";
+  }
+  if (!has_any_prefix (media_type, "audio/", "video/", NULL)) {
+    return NULL;
+  }
+  return media_type;
+}
+
+static GstStaticCaps h264_caps = GST_STATIC_CAPS ("video/x-h264");
+static GstStaticCaps h265_caps = GST_STATIC_CAPS ("video/x-h265");
+static GstStaticCaps av1_caps = GST_STATIC_CAPS ("video/x-av1");
+static GstStaticCaps vp8_caps = GST_STATIC_CAPS ("video/x-vp8");
+static GstStaticCaps vp9_caps = GST_STATIC_CAPS ("video/x-vp9");
+
+static GstStaticCaps vorbis_caps = GST_STATIC_CAPS ("audio/x-vorbis");
+static GstStaticCaps opus_caps = GST_STATIC_CAPS ("audio/x-opus");
+static GstStaticCaps flac_caps = GST_STATIC_CAPS ("audio/x-flac");
+static GstStaticCaps mp3_caps =
+GST_STATIC_CAPS ("audio/mpeg, mpegversion=(int)1, layer=(int)3");
+static GstStaticCaps aac_caps =
+GST_STATIC_CAPS ("audio/mpeg, mpegversion=(int)4");
+
+static inline GstStaticCaps *
+mse_codec_id_to_static_caps (const gchar * codec_id)
+{
+  if (has_any_prefix (codec_id, "avc", "x-h264", "mp4v", NULL)) {
+    return &h264_caps;
+  }
+  if (has_any_prefix (codec_id, "hvc1", "hev1", "x-h265", NULL)) {
+    return &h265_caps;
+  }
+  if (has_any_prefix (codec_id, "av01", "av1", "x-av1", NULL)) {
+    return &av1_caps;
+  }
+  if (has_any_prefix (codec_id, "vp8", "x-vp8", NULL)) {
+    return &vp8_caps;
+  }
+  if (has_any_prefix (codec_id, "vp9", "vp09", "x-vp9", NULL)) {
+    return &vp9_caps;
+  }
+
+  if (has_any_prefix (codec_id, "mpeg", "mp4a", NULL)) {
+    return &aac_caps;
+  }
+  if (has_any_prefix (codec_id, "vorbis", "x-vorbis", NULL)) {
+    return &vorbis_caps;
+  }
+  if (has_any_prefix (codec_id, "opus", "x-opus", NULL)) {
+    return &opus_caps;
+  }
+  if (has_any_prefix (codec_id, "flac", "x-flac", NULL)) {
+    return &flac_caps;
+  }
+  if (has_any_prefix (codec_id, "mp3", "audio/mp3", NULL)) {
+    return &mp3_caps;
+  }
+
+  return NULL;
+}
+
+static gboolean
+is_supported (const GstCaps * caps, GList * elements)
+{
+  GList *supporting_elements = gst_element_factory_list_filter (elements, caps,
+      GST_PAD_SINK, FALSE);
+  gboolean supported = supporting_elements != NULL;
+  gst_plugin_feature_list_free (supporting_elements);
+  return supported;
+}
+
+static gboolean
+is_codec_supported (const gchar * codec_id, GList * elements)
+{
+  GstStaticCaps *static_caps = mse_codec_id_to_static_caps (codec_id);
+  if (static_caps == NULL) {
+    return FALSE;
+  }
+  GstCaps *codec_caps = gst_static_caps_get (static_caps);
+  gboolean supported = is_supported (codec_caps, elements);
+  gst_clear_caps (&codec_caps);
+  return supported;
+}
+
+static inline GList *
+get_srcpad_elements (void)
+{
+  return gst_element_factory_list_get_elements (GST_ELEMENT_FACTORY_TYPE_DEMUXER
+      | GST_ELEMENT_FACTORY_TYPE_DECODER | GST_ELEMENT_FACTORY_TYPE_DECRYPTOR |
+      GST_ELEMENT_FACTORY_TYPE_DEPAYLOADER | GST_ELEMENT_FACTORY_TYPE_SINK |
+      GST_ELEMENT_FACTORY_TYPE_PARSER, GST_RANK_MARGINAL);
+}
+
+gboolean
+gst_media_source_media_type_is_caps_supported (const GstCaps * caps)
+{
+  GList *elements = get_srcpad_elements ();
+  gboolean supported = is_supported (caps, elements);
+  gst_plugin_feature_list_free (elements);
+  return supported;
+}
+
+gboolean
+gst_media_source_media_type_is_supported (GstMediaSourceMediaType * self)
+{
+  g_return_val_if_fail (self != NULL, FALSE);
+  g_return_val_if_fail (self->mime_type != NULL, FALSE);
+
+  const gchar *mime_type = patch_media_type (self->mime_type);
+  if (mime_type == NULL) {
+    return FALSE;
+  }
+
+  GList *elements = get_srcpad_elements ();
+  GstCaps *caps = gst_caps_from_string (mime_type);
+
+  gboolean supported = is_supported (caps, elements);
+  for (gchar ** codec_id = self->codecs;
+      supported && codec_id && *codec_id; codec_id++) {
+    supported &= is_codec_supported (*codec_id, elements);
+  }
+
+  gst_plugin_feature_list_free (elements);
+  gst_clear_caps (&caps);
+
+  return supported;
+}
+
+static const gchar *generate_timestamps_formats = {
+  "audio/mpeg",
+  "audio/aac",
+  NULL,
+};
+
+gboolean
+gst_media_source_media_type_generates_timestamp (GstMediaSourceMediaType * self)
+{
+  g_return_val_if_fail (self != NULL, FALSE);
+  g_return_val_if_fail (self->mime_type != NULL, FALSE);
+  return g_strv_contains (generate_timestamps_formats, self->mime_type);
+}
+
+void
+gst_media_source_media_type_reset (GstMediaSourceMediaType * self)
+{
+  g_return_if_fail (self != NULL);
+  g_clear_pointer (&self->mime_type, g_free);
+  g_clear_pointer (&self->codecs, g_strfreev);
+}
+
+void
+gst_media_source_media_type_free (GstMediaSourceMediaType * self)
+{
+  gst_media_source_media_type_reset (self);
+  g_free (self);
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmsesrc-private.h Added

@@ -0,0 +1,55 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <glib.h>
+#include <gst/gst.h>
+#include "gstmsesrc.h"
+#include "gstmediasource.h"
+#include "gstmediasourcetrack-private.h"
+
+G_BEGIN_DECLS
+
+GST_MSE_PRIVATE
+void gst_mse_src_set_duration (GstMseSrc * self, GstClockTime duration);
+
+GST_MSE_PRIVATE
+void gst_mse_src_network_error (GstMseSrc * self);
+
+GST_MSE_PRIVATE
+void gst_mse_src_decode_error (GstMseSrc * self);
+
+GST_MSE_PRIVATE
+void gst_mse_src_emit_streams (GstMseSrc * self, GstMediaSourceTrack ** tracks,
+    gsize n_tracks);
+
+GST_MSE_PRIVATE
+void gst_mse_src_update_ready_state (GstMseSrc * self);
+
+GST_MSE_PRIVATE
+void gst_mse_src_attach (GstMseSrc * self, GstMediaSource * media_source);
+
+GST_MSE_PRIVATE
+void gst_mse_src_detach (GstMseSrc * self);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmsesrc.c Added

@@ -0,0 +1,1385 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2009, 2010 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * Copyright (C) 2013, 2022, 2023 Collabora Ltd.
+ * Copyright (C) 2013 Orange
+ * Copyright (C) 2014, 2015 Sebastian Dröge <sebastian@centricular.com>
+ * Copyright (C) 2015, 2016, 2018, 2019, 2020, 2021 Igalia, S.L
+ * Copyright (C) 2015, 2016, 2018, 2019, 2020, 2021 Metrological Group B.V.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:gstmsesrc
+ * @title: GstMseSrc
+ * @short_description: Source Element for Media Source playback
+ *
+ * #GstMseSrc is a source Element that interacts with a #GstMediaSource to
+ * consume #GstSamples processed by the Media Source and supplies them
+ * to the containing #GstPipeline. In the perspective of the Media Source API,
+ * this element fulfills the basis of the Media Element's role relating to
+ * working with a Media Source. The remaining responsibilities are meant to be
+ * fulfilled by the application and #GstPlay can be used to satisfy many of
+ * them.
+ *
+ * Once added to a Pipeline, this element should be attached to a Media Source
+ * using gst_media_source_attach().
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/base/base.h>
+
+#include <gst/mse/mse-enumtypes.h>
+#include "gstmsesrc.h"
+#include "gstmsesrc-private.h"
+
+#include "gstmselogging-private.h"
+
+#include "gstmediasource.h"
+#include "gstmediasource-private.h"
+#include "gstmediasourcetrack-private.h"
+#include "gstsourcebuffer.h"
+#include "gstsourcebuffer-private.h"
+
+#define DEFAULT_POSITION GST_CLOCK_TIME_NONE
+#define DEFAULT_DURATION GST_CLOCK_TIME_NONE
+#define DEFAULT_READY_STATE GST_MSE_SRC_READY_STATE_HAVE_NOTHING
+#define DECODE_ERROR "decode error"
+#define NETWORK_ERROR "network error"
+
+enum
+{
+  PROP_0,
+
+  PROP_POSITION,
+  PROP_DURATION,
+  PROP_READY_STATE,
+
+  PROP_N_AUDIO,
+  PROP_N_TEXT,
+  PROP_N_VIDEO,
+
+  N_PROPS,
+};
+
+enum
+{
+  THRESHOLD_FUTURE_DATA = GST_SECOND * 5,
+  THRESHOLD_ENOUGH_DATA = GST_SECOND * 50,
+};
+
+static GParamSpec *propertiesN_PROPS;
+
+static GstStaticPadTemplate gst_mse_src_template =
+GST_STATIC_PAD_TEMPLATE ("src_%s", GST_PAD_SRC, GST_PAD_SOMETIMES,
+    GST_STATIC_CAPS_ANY);
+
+/**
+ * GstMseSrcPad:
+ *
+ * Since: 1.24
+ */
+struct _GstMseSrcPad
+{
+  GstPad base;
+
+  GstStream *stream;
+  GstMediaSourceTrack *track;
+  GstCaps *most_recent_caps;
+  GstSegment segment;
+
+  GstClockTime position;
+
+  gboolean sent_stream_collection;
+  gboolean sent_stream_start;
+  gboolean sent_initial_caps;
+  gboolean does_need_segment;
+
+  GCond linked_or_flushing_cond;
+  GMutex linked_or_flushing_lock;
+  gboolean flushing;
+  gboolean eos;
+};
+
+#define STREAMS_LOCK(a) (g_mutex_lock (&a->streams_lock))
+#define STREAMS_UNLOCK(a) (g_mutex_unlock (&a->streams_lock))
+
+#define LINKED_OR_FLUSHING_LOCK(a) (g_mutex_lock (&a->linked_or_flushing_lock))
+#define LINKED_OR_FLUSHING_UNLOCK(a) (g_mutex_unlock (&a->linked_or_flushing_lock))
+#define LINKED_OR_FLUSHING_SIGNAL(a) (g_cond_signal (&a->linked_or_flushing_cond))
+#define LINKED_OR_FLUSHING_WAIT(a) \
+  (g_cond_wait (&a->linked_or_flushing_cond, &a->linked_or_flushing_lock))
+
+#define FLOW_COMBINER_LOCK(a) (g_mutex_lock (&a->flow_combiner_lock))
+#define FLOW_COMBINER_UNLOCK(a) (g_mutex_unlock (&a->flow_combiner_lock))
+
+G_DEFINE_TYPE (GstMseSrcPad, gst_mse_src_pad, GST_TYPE_PAD);
+
+static gboolean pad_activate_mode (GstMseSrcPad * pad, GstObject * parent,
+    GstPadMode mode, gboolean active);
+
+static GstPadLinkReturn pad_linked (GstMseSrcPad * pad, GstMseSrc * parent,
+    GstPad * sink);
+static gboolean pad_event (GstMseSrcPad * pad, GstMseSrc * parent,
+    GstEvent * event);
+static gboolean pad_query (GstMseSrcPad * pad, GstObject * parent,
+    GstQuery * query);
+static void pad_task (GstMseSrcPad * pad);
+
+static GstPad *
+gst_mse_src_pad_new (GstMediaSourceTrack * track, GstStream * stream,
+    guint id, GstClockTime start, gdouble rate)
+{
+  gchar *name = g_strdup_printf ("src_%u", id);
+  GstMseSrcPad *self = g_object_new (GST_TYPE_MSE_SRC_PAD, "name", name,
+      "direction", GST_PAD_SRC, NULL);
+  g_free (name);
+  self->stream = stream;
+  self->track = track;
+  self->segment.start = start;
+  self->segment.rate = rate;
+
+  return GST_PAD (self);
+}
+
+static void
+gst_mse_src_pad_init (GstMseSrcPad * self)
+{
+  gst_segment_init (&self->segment, GST_FORMAT_TIME);
+  self->sent_stream_collection = FALSE;
+  self->sent_stream_start = FALSE;
+  self->sent_initial_caps = FALSE;
+  self->does_need_segment = TRUE;
+  self->position = DEFAULT_POSITION;
+  self->flushing = FALSE;
+  self->eos = FALSE;
+  g_mutex_init (&self->linked_or_flushing_lock);
+  g_cond_init (&self->linked_or_flushing_cond);
+
+  gst_pad_set_activatemode_function (GST_PAD (self),
+      (GstPadActivateModeFunction) pad_activate_mode);
+  gst_pad_set_link_function (GST_PAD (self), (GstPadLinkFunction) pad_linked);
+  gst_pad_set_event_function (GST_PAD (self), (GstPadEventFunction) pad_event);
+  gst_pad_set_query_function (GST_PAD (self), (GstPadQueryFunction) pad_query);
+}
+
+static void
+gst_mse_src_pad_finalize (GObject * object)
+{
+  GstMseSrcPad *self = GST_MSE_SRC_PAD (object);
+
+  gst_clear_caps (&self->most_recent_caps);
+  g_mutex_clear (&self->linked_or_flushing_lock);
+  g_cond_clear (&self->linked_or_flushing_cond);
+
+  G_OBJECT_CLASS (gst_mse_src_pad_parent_class)->finalize (object);
+}
+
+static void
+gst_mse_src_pad_class_init (GstMseSrcPadClass * klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+  oclass->finalize = GST_DEBUG_FUNCPTR (gst_mse_src_pad_finalize);
+}
+
+// TODO: Check if this struct is even necessary.
+// The custom pad should be able to keep track of information for each track.
+typedef struct
+{
+  GstMediaSourceTrack *track;
+  GstPad *pad;
+  GstStream *info;
+} Stream;
+
+/**
+ * GstMseSrc:
+ *
+ * Since: 1.24
+ */
+struct _GstMseSrc
+{
+  GstElement base;
+
+  GstMediaSource *media_source;
+
+  guint group_id;
+  GstStreamCollection *collection;
+  GHashTable *streams;
+  GMutex streams_lock;
+
+  GstClockTime duration;
+  GstClockTime start_time;
+  gdouble rate;
+  GstMseSrcReadyState ready_state;
+
+  GstFlowCombiner *flow_combiner;
+  GMutex flow_combiner_lock;
+
+  GCond eos_cond;
+  GMutex eos_lock;
+
+  gchar *uri;
+};
+
+static void gst_mse_src_uri_handler_init (gpointer g_iface,
+    gpointer iface_data);
+static GstStateChangeReturn gst_mse_src_change_state (GstElement * element,
+    GstStateChange transition);
+static gboolean gst_mse_src_send_event (GstElement * element, GstEvent * event);
+static void update_ready_state_for_init_segment (GstMseSrc * self);
+static void update_ready_state_for_sample (GstMseSrc * self);
+
+G_DEFINE_TYPE_WITH_CODE (GstMseSrc, gst_mse_src, GST_TYPE_ELEMENT,
+    G_IMPLEMENT_INTERFACE (GST_TYPE_URI_HANDLER, gst_mse_src_uri_handler_init));
+
+static void
+gst_mse_src_constructed (GObject * object)
+{
+  GstMseSrc *self = GST_MSE_SRC (object);
+  GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_SOURCE);
+}
+
+static void
+gst_mse_src_dispose (GObject * object)
+{
+  GstMseSrc *self = GST_MSE_SRC (object);
+  gst_clear_object (&self->collection);
+  g_clear_pointer (&self->streams, g_hash_table_unref);
+  g_mutex_clear (&self->streams_lock);
+  g_clear_pointer (&self->flow_combiner, gst_flow_combiner_free);
+  g_mutex_clear (&self->flow_combiner_lock);
+  g_cond_clear (&self->eos_cond);
+  g_mutex_clear (&self->eos_lock);
+  G_OBJECT_CLASS (gst_mse_src_parent_class)->dispose (object);
+}
+
+static void
+gst_mse_src_finalize (GObject * object)
+{
+  GstMseSrc *self = GST_MSE_SRC (object);
+
+  g_clear_pointer (&self->uri, g_free);
+
+  G_OBJECT_CLASS (gst_mse_src_parent_class)->finalize (object);
+}
+
+static void
+gst_mse_src_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstMseSrc *self = GST_MSE_SRC (object);
+
+  switch (prop_id) {
+    case PROP_DURATION:
+      g_value_set_uint64 (value, gst_mse_src_get_duration (self));
+      break;
+    case PROP_POSITION:
+      g_value_set_uint64 (value, gst_mse_src_get_position (self));
+      break;
+    case PROP_READY_STATE:
+      g_value_set_enum (value, gst_mse_src_get_ready_state (self));
+      break;
+    case PROP_N_AUDIO:
+      g_value_set_uint (value, gst_mse_src_get_n_audio (self));
+      break;
+    case PROP_N_TEXT:
+      g_value_set_uint (value, gst_mse_src_get_n_text (self));
+      break;
+    case PROP_N_VIDEO:
+      g_value_set_uint (value, gst_mse_src_get_n_video (self));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_mse_src_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstMseSrc *self = GST_MSE_SRC (object);
+
+  switch (prop_id) {
+    case PROP_DURATION:
+      gst_mse_src_set_duration (self, g_value_get_uint64 (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_mse_src_class_init (GstMseSrcClass * klass)
+{
+  GObjectClass *oclass = (GObjectClass *) klass;
+  GstElementClass *eclass = (GstElementClass *) klass;
+
+  oclass->constructed = GST_DEBUG_FUNCPTR (gst_mse_src_constructed);
+  oclass->finalize = GST_DEBUG_FUNCPTR (gst_mse_src_finalize);
+  oclass->dispose = GST_DEBUG_FUNCPTR (gst_mse_src_dispose);
+  oclass->get_property = GST_DEBUG_FUNCPTR (gst_mse_src_get_property);
+  oclass->set_property = GST_DEBUG_FUNCPTR (gst_mse_src_set_property);
+
+  eclass->change_state = GST_DEBUG_FUNCPTR (gst_mse_src_change_state);
+  eclass->send_event = GST_DEBUG_FUNCPTR (gst_mse_src_send_event);
+
+  /**
+   * GstMseSrc:position:
+   *
+   * The playback position as a #GstClockTime
+   *
+   * Specification(https://html.spec.whatwg.org/multipage/media.html#current-playback-position)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_POSITION = g_param_spec_uint64 ("position",
+      "Position",
+      "The playback position as a GstClockTime",
+      0, G_MAXUINT64, DEFAULT_POSITION, G_PARAM_READABLE |
+      G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstMseSrc:duration:
+   *
+   * The duration of the stream as a #GstClockTime
+   *
+   * Specification(https://html.spec.whatwg.org/multipage/media.html#dom-media-duration)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_DURATION = g_param_spec_uint64 ("duration",
+      "Duration",
+      "The duration of the stream as a GstClockTime",
+      0, G_MAXUINT64, DEFAULT_DURATION, G_PARAM_READWRITE |
+      G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstMseSrc:ready-state:
+   *
+   * The Ready State of this element, describing to what level it can supply
+   * content for the current #GstMseSrc:position. This is a separate concept
+   * from #GstMediaSource:ready-state: and corresponds to the HTML Media
+   * Element's Ready State.
+   *
+   * Specification(https://html.spec.whatwg.org/multipage/media.html#ready-states)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_READY_STATE = g_param_spec_enum ("ready-state",
+      "Ready State",
+      "The Ready State of this Element",
+      GST_TYPE_MSE_SRC_READY_STATE,
+      DEFAULT_READY_STATE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstMseSrc:n-audio:
+   *
+   * The number of audio tracks in the Media Source
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_N_AUDIO = g_param_spec_uint ("n-audio",
+      "Number of Audio Tracks",
+      "The number of audio tracks in the Media Source",
+      0, G_MAXINT, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstMseSrc:n-text:
+   *
+   * The number of text tracks in the Media Source
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_N_TEXT = g_param_spec_uint ("n-text",
+      "Number of Text Tracks",
+      "The number of text tracks in the Media Source",
+      0, G_MAXINT, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstMseSrc:n-video:
+   *
+   * The number of video tracks in the Media Source
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_N_VIDEO = g_param_spec_uint ("n-video",
+      "Number of Video Tracks",
+      "The number of video tracks in the Media Source",
+      0, G_MAXINT, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_properties (oclass, N_PROPS, properties);
+
+  gst_element_class_set_static_metadata (eclass, "MseSrc",
+      "Generic/Source",
+      "Implements a GStreamer Source for the gstreamer-mse API", "Collabora");
+  gst_element_class_add_static_pad_template (eclass, &gst_mse_src_template);
+
+  gst_mse_init_logging ();
+}
+
+static void
+clear_stream (Stream * stream)
+{
+  gst_clear_object (&stream->track);
+  gst_clear_object (&stream->info);
+  g_free (stream);
+}
+
+static GHashTable *
+streams_init (const GstMseSrc * self)
+{
+  return g_hash_table_new_full (g_direct_hash, g_direct_equal,
+      NULL, (GDestroyNotify) clear_stream);
+}
+
+static GstStreamCollection *
+collection_init (const GstMseSrc * self)
+{
+  return gst_stream_collection_new (G_OBJECT_TYPE_NAME (self));
+}
+
+static void
+gst_mse_src_init (GstMseSrc * self)
+{
+  self->group_id = gst_util_group_id_next ();
+  self->streams = streams_init (self);
+  self->collection = collection_init (self);
+  self->uri = NULL;
+  self->start_time = 0;
+  self->rate = 1;
+  g_mutex_init (&self->streams_lock);
+  self->flow_combiner = gst_flow_combiner_new ();
+  g_mutex_init (&self->flow_combiner_lock);
+  g_cond_init (&self->eos_cond);
+  g_mutex_init (&self->eos_lock);
+}
+
+/**
+ * gst_mse_src_get_position:
+ * @self: #GstMseSrc instance
+ *
+ * Gets the current playback position of @self.
+ *
+ * Specification(https://html.spec.whatwg.org/multipage/media.html#current-playback-position)
+ *
+ * Returns: The playback position of this Element as a #GstClockTime
+ * Since: 1.24
+ */
+GstClockTime
+gst_mse_src_get_position (GstMseSrc * self)
+{
+  g_return_val_if_fail (GST_IS_MSE_SRC (self), GST_CLOCK_TIME_NONE);
+  gint64 position;
+  gboolean success = gst_element_query_position (GST_ELEMENT (self),
+      GST_FORMAT_TIME, &position);
+  if (success)
+    return (GstClockTime) position;
+  else
+    return DEFAULT_POSITION;
+}
+
+static void
+update_pad_duration (GstMseSrc * self, GstMseSrcPad * pad)
+{
+  pad->segment.duration = self->duration;
+  pad->does_need_segment = TRUE;
+}
+
+void
+gst_mse_src_set_duration (GstMseSrc * self, GstClockTime duration)
+{
+  g_return_if_fail (GST_IS_MSE_SRC (self));
+
+  self->duration = duration;
+
+  gst_element_foreach_src_pad (GST_ELEMENT (self),
+      (GstElementForeachPadFunc) update_pad_duration, NULL);
+
+  gst_element_post_message (GST_ELEMENT (self),
+      gst_message_new_duration_changed (GST_OBJECT (self)));
+}
+
+/**
+ * gst_mse_src_get_duration:
+ * @self: #GstMseSrc instance
+ *
+ * Gets the duration of @self.
+ *
+ * Specification(https://html.spec.whatwg.org/multipage/media.html#dom-media-duration)
+ *
+ * Returns: The duration of this stream as a #GstClockTime
+ * Since: 1.24
+ */
+GstClockTime
+gst_mse_src_get_duration (GstMseSrc * self)
+{
+  g_return_val_if_fail (GST_IS_MSE_SRC (self), DEFAULT_DURATION);
+  return self->duration;
+}
+
+/**
+ * gst_mse_src_get_ready_state:
+ * @self: #GstMseSrc instance
+ *
+ * The Ready State of @self, describing to what level it can supply content for
+ * the current #GstMseSrc:position. This is a separate concept from
+ * #GstMediaSource:ready-state: and corresponds to the HTML Media Element's
+ * Ready State.
+ *
+ * Specification(https://html.spec.whatwg.org/multipage/media.html#ready-states)
+ *
+ * Returns: the current #GstMseSrcReadyState
+ * Since: 1.24
+ */
+GstMseSrcReadyState
+gst_mse_src_get_ready_state (GstMseSrc * self)
+{
+  g_return_val_if_fail (GST_IS_MSE_SRC (self), DEFAULT_READY_STATE);
+  return self->ready_state;
+}
+
+static guint
+n_streams_by_type (GstMseSrc * self, GstMediaSourceTrackType type)
+{
+  guint count = 0;
+  GHashTableIter iter;
+  g_hash_table_iter_init (&iter, self->streams);
+  for (gpointer key; g_hash_table_iter_next (&iter, &key, NULL);) {
+    GstMediaSourceTrack *track = GST_MEDIA_SOURCE_TRACK (key);
+    GstMediaSourceTrackType stream_type =
+        gst_media_source_track_get_track_type (track);
+    if (type == stream_type) {
+      count++;
+    }
+  }
+  return count;
+}
+
+/**
+ * gst_mse_src_get_n_audio:
+ * @self: #GstMseSrc instance
+ *
+ * Returns: the number of audio tracks available from this source
+ * Since: 1.24
+ */
+guint
+gst_mse_src_get_n_audio (GstMseSrc * self)
+{
+  g_return_val_if_fail (GST_IS_MSE_SRC (self), 0);
+  return n_streams_by_type (self, GST_MEDIA_SOURCE_TRACK_TYPE_AUDIO);
+}
+
+/**
+ * gst_mse_src_get_n_text:
+ * @self: #GstMseSrc instance
+ *
+ * Returns: the number of text tracks available from this source
+ * Since: 1.24
+ */
+guint
+gst_mse_src_get_n_text (GstMseSrc * self)
+{
+  g_return_val_if_fail (GST_IS_MSE_SRC (self), 0);
+  return n_streams_by_type (self, GST_MEDIA_SOURCE_TRACK_TYPE_TEXT);
+}
+
+/**
+ * gst_mse_src_get_n_video:
+ * @self: #GstMseSrc instance
+ *
+ * Returns: the number of video tracks available from this source
+ * Since: 1.24
+ */
+guint
+gst_mse_src_get_n_video (GstMseSrc * self)
+{
+  g_return_val_if_fail (GST_IS_MSE_SRC (self), 0);
+  return n_streams_by_type (self, GST_MEDIA_SOURCE_TRACK_TYPE_VIDEO);
+}
+
+void
+gst_mse_src_decode_error (GstMseSrc * self)
+{
+  g_return_if_fail (GST_IS_MSE_SRC (self));
+  GstMseSrcReadyState ready_state = g_atomic_int_get (&self->ready_state);
+  if (ready_state == GST_MSE_SRC_READY_STATE_HAVE_NOTHING) {
+    GST_ELEMENT_ERROR (self, STREAM, DECODE, (DECODE_ERROR),
+        ("the necessary decoder may be missing from this installation"));
+  } else {
+    GST_ELEMENT_ERROR (self, STREAM, DECODE, (DECODE_ERROR),
+        ("the stream may be corrupt"));
+  }
+}
+
+void
+gst_mse_src_network_error (GstMseSrc * self)
+{
+  g_return_if_fail (GST_IS_MSE_SRC (self));
+  GstMseSrcReadyState ready_state = g_atomic_int_get (&self->ready_state);
+  if (ready_state == GST_MSE_SRC_READY_STATE_HAVE_NOTHING) {
+    GST_ELEMENT_ERROR (self, RESOURCE, OPEN_READ, (NETWORK_ERROR),
+        ("an error occurred before any media was read"));
+  } else {
+    GST_ELEMENT_ERROR (self, RESOURCE, READ, (NETWORK_ERROR),
+        ("an error occurred while reading media"));
+  }
+}
+
+static inline gboolean
+is_streamable (GstMediaSourceTrack * track)
+{
+  switch (gst_media_source_track_get_track_type (track)) {
+    case GST_MEDIA_SOURCE_TRACK_TYPE_AUDIO:
+    case GST_MEDIA_SOURCE_TRACK_TYPE_TEXT:
+    case GST_MEDIA_SOURCE_TRACK_TYPE_VIDEO:
+      return TRUE;
+    default:
+      return FALSE;
+  }
+}
+
+static GstStream *
+create_gst_stream (GstMediaSourceTrack * track)
+{
+  gchar *stream_id = g_strdup_printf ("%s-%s",
+      GST_OBJECT_NAME (track), gst_media_source_track_get_id (track));
+  GstStream *stream = gst_stream_new (stream_id,
+      gst_media_source_track_get_initial_caps (track),
+      gst_media_source_track_get_stream_type (track), GST_STREAM_FLAG_SELECT);
+  g_free (stream_id);
+  return stream;
+}
+
+static void
+set_flushing_and_signal (GstMseSrcPad * pad)
+{
+  GST_TRACE_OBJECT (pad, "locking");
+  LINKED_OR_FLUSHING_LOCK (pad);
+  g_atomic_int_set (&pad->flushing, TRUE);
+  LINKED_OR_FLUSHING_SIGNAL (pad);
+  LINKED_OR_FLUSHING_UNLOCK (pad);
+  GST_TRACE_OBJECT (pad, "done");
+}
+
+static void
+clear_flushing (GstMseSrcPad * pad)
+{
+  GST_TRACE_OBJECT (pad, "locking");
+  LINKED_OR_FLUSHING_LOCK (pad);
+  g_atomic_int_set (&pad->flushing, FALSE);
+  LINKED_OR_FLUSHING_UNLOCK (pad);
+  GST_TRACE_OBJECT (pad, "done");
+}
+
+static void
+flush_stream (GstMseSrc * self, Stream * stream, gboolean is_seek)
+{
+  GstMseSrcPad *pad = GST_MSE_SRC_PAD (stream->pad);
+  gst_pad_push_event (GST_PAD (pad), gst_event_new_flush_start ());
+
+  if (is_seek) {
+    GST_DEBUG_OBJECT (pad, "flushing for seek to %" GST_TIMEP_FORMAT,
+        &self->start_time);
+    set_flushing_and_signal (pad);
+    gst_media_source_track_flush (stream->track);
+    gst_pad_stop_task (GST_PAD (pad));
+    GST_DEBUG_OBJECT (pad, "stopped task");
+    GstSegment *segment = &(pad->segment);
+    segment->base = 0;
+    segment->start = self->start_time;
+    segment->time = self->start_time;
+    segment->rate = self->rate;
+  }
+
+  gst_media_source_track_flush (stream->track);
+  g_atomic_int_set (&pad->does_need_segment, TRUE);
+
+  gst_pad_push_event (GST_PAD (pad), gst_event_new_flush_stop (is_seek));
+}
+
+static void
+flush_all_streams (GstMseSrc * self, gboolean is_seek)
+{
+  GHashTableIter iter;
+  g_hash_table_iter_init (&iter, self->streams);
+  for (gpointer value; g_hash_table_iter_next (&iter, NULL, &value);) {
+    flush_stream (self, (Stream *) value, is_seek);
+  }
+}
+
+static void
+resume_all_streams (GstMseSrc * self)
+{
+  GstState state;
+  gst_element_get_state (GST_ELEMENT (self), &state, NULL, 0);
+  gboolean active = state > GST_STATE_READY;
+
+  GHashTableIter iter;
+  g_hash_table_iter_init (&iter, self->streams);
+  for (gpointer value; g_hash_table_iter_next (&iter, NULL, &value);) {
+    Stream *stream = value;
+    GstPad *pad = GST_PAD (stream->pad);
+    if (active) {
+      clear_flushing (GST_MSE_SRC_PAD (pad));
+      gst_pad_start_task (pad, (GstTaskFunction) pad_task, pad, NULL);
+    }
+  }
+}
+
+static void
+tear_down_stream (GstMseSrc * self, Stream * stream)
+{
+  GST_DEBUG_OBJECT (self, "tearing down stream %s",
+      gst_media_source_track_get_id (stream->track));
+
+  flush_stream (self, stream, FALSE);
+  gst_pad_set_active (stream->pad, FALSE);
+
+  if (gst_stream_collection_get_size (self->collection) > 0) {
+    gst_element_remove_pad (GST_ELEMENT (self), stream->pad);
+    FLOW_COMBINER_LOCK (self);
+    gst_flow_combiner_remove_pad (self->flow_combiner, stream->pad);
+    FLOW_COMBINER_UNLOCK (self);
+  }
+}
+
+
+static void
+tear_down_all_streams (GstMseSrc * self)
+{
+  GHashTableIter iter;
+  g_hash_table_iter_init (&iter, self->streams);
+  for (gpointer value; g_hash_table_iter_next (&iter, NULL, &value);) {
+    tear_down_stream (self, (Stream *) value);
+    g_hash_table_iter_remove (&iter);
+  }
+}
+
+static GstStateChangeReturn
+gst_mse_src_change_state (GstElement * element, GstStateChange transition)
+{
+  GstMseSrc *self = GST_MSE_SRC (element);
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      tear_down_all_streams (self);
+      break;
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      gst_mse_src_detach (self);
+      break;
+    default:
+      break;
+  }
+  return GST_ELEMENT_CLASS (gst_mse_src_parent_class)->change_state (element,
+      transition);
+}
+
+static void
+gst_mse_src_seek (GstMseSrc * self, GstClockTime start_time, gdouble rate)
+{
+  self->start_time = start_time;
+  self->rate = rate;
+
+  flush_all_streams (self, TRUE);
+  if (self->media_source) {
+    GST_DEBUG_OBJECT (self, "seeking on media source %" GST_PTR_FORMAT,
+        self->media_source);
+    gst_media_source_seek (self->media_source, start_time);
+  } else {
+    GST_DEBUG_OBJECT (self, "detached, not seeking on media source");
+  }
+  resume_all_streams (self);
+}
+
+static gboolean
+gst_mse_src_send_event (GstElement * element, GstEvent * event)
+{
+  if (GST_EVENT_TYPE (event) != GST_EVENT_SEEK) {
+    return GST_ELEMENT_CLASS (gst_mse_src_parent_class)->send_event (element,
+        event);
+  }
+
+  GstMseSrc *self = GST_MSE_SRC (element);
+
+  gdouble rate;
+  GstFormat format;
+  GstSeekType seek_type;
+  gint64 start;
+  gst_event_parse_seek (event, &rate, &format, NULL, &seek_type, &start, NULL,
+      NULL);
+
+  gst_event_unref (event);
+
+  if (format != GST_FORMAT_TIME || seek_type != GST_SEEK_TYPE_SET) {
+    GST_ERROR_OBJECT (self,
+        "Rejecting unsupported seek event: %" GST_PTR_FORMAT, event);
+    return FALSE;
+  }
+
+  GST_DEBUG_OBJECT (self, "handling %" GST_PTR_FORMAT, event);
+  gst_mse_src_seek (self, start, rate);
+  return TRUE;
+}
+
+static inline gboolean
+is_flushing (GstMseSrcPad * pad)
+{
+  return g_atomic_int_get (&pad->flushing) || GST_PAD_IS_FLUSHING (pad);
+}
+
+static void
+await_pad_linked_or_flushing (GstMseSrcPad * pad)
+{
+  GST_TRACE_OBJECT (pad, "waiting for link");
+  LINKED_OR_FLUSHING_LOCK (pad);
+  while (!gst_pad_is_linked (GST_PAD_CAST (pad)) && !is_flushing (pad)) {
+    LINKED_OR_FLUSHING_WAIT (pad);
+  }
+  LINKED_OR_FLUSHING_UNLOCK (pad);
+  GST_TRACE_OBJECT (pad, "linked");
+}
+
+static gboolean
+all_pads_eos_fold (const GValue * item, gboolean * all_eos, gpointer user_data)
+{
+  GstMseSrcPad *pad = g_value_get_object (item);
+  if (pad->eos) {
+    return TRUE;
+  } else {
+    *all_eos = FALSE;
+    return FALSE;
+  }
+}
+
+static gboolean
+all_pads_eos (GstMseSrc * self)
+{
+  GstIterator *iter = gst_element_iterate_src_pads (GST_ELEMENT_CAST (self));
+  gboolean all_eos = TRUE;
+  while (gst_iterator_fold (iter,
+          (GstIteratorFoldFunction) all_pads_eos_fold, (GValue *) & all_eos,
+          NULL) == GST_ITERATOR_RESYNC) {
+    gst_iterator_resync (iter);
+  }
+  gst_iterator_free (iter);
+  return all_eos;
+}
+
+static void
+pad_task (GstMseSrcPad * pad)
+{
+  await_pad_linked_or_flushing (pad);
+
+  if (is_flushing (pad)) {
+    GST_TRACE_OBJECT (pad, "pad is flushing");
+    goto pause;
+  }
+
+  GstMseSrc *self = GST_MSE_SRC (gst_pad_get_parent_element (GST_PAD (pad)));
+
+  GstMediaSourceTrack *track = pad->track;
+
+  GstMiniObject *object = gst_media_source_track_pop (track);
+
+  if (object == NULL) {
+    GST_DEBUG_OBJECT (pad, "nothing was popped from track, must be flushing");
+    gst_media_source_track_flush (track);
+    goto pause;
+  }
+
+  if (!g_atomic_int_get (&pad->sent_stream_start)) {
+    const gchar *track_id = gst_media_source_track_get_id (track);
+    GstEvent *event = gst_event_new_stream_start (track_id);
+    gst_event_set_group_id (event, self->group_id);
+    gst_event_set_stream (event, pad->stream);
+    if (!gst_pad_push_event (GST_PAD (pad), event)) {
+      GST_ERROR_OBJECT (pad, "failed to push stream start");
+      goto pause;
+    }
+    GST_TRACE_OBJECT (pad, "stream start");
+    g_atomic_int_set (&pad->sent_stream_start, TRUE);
+  }
+
+  GstCaps *caps = gst_media_source_track_get_initial_caps (track);
+  if (!g_atomic_int_get (&pad->sent_initial_caps) && GST_IS_CAPS (caps)) {
+    GST_DEBUG_OBJECT (pad, "sending initial caps");
+    gst_caps_replace (&pad->most_recent_caps, caps);
+    GstEvent *event = gst_event_new_caps (caps);
+    if (!gst_pad_push_event (GST_PAD (pad), event)) {
+      GST_ERROR_OBJECT (pad, "failed to push caps update");
+      goto pause;
+    }
+    GST_TRACE_OBJECT (pad, "initial caps %" GST_PTR_FORMAT, caps);
+    g_atomic_int_set (&pad->sent_initial_caps, TRUE);
+  }
+
+  if (g_atomic_int_get (&pad->does_need_segment)) {
+    GST_DEBUG_OBJECT (pad, "sending new segment starting@%" GST_TIMEP_FORMAT,
+        &pad->segment.time);
+    GstEvent *event = gst_event_new_segment (&pad->segment);
+    if (!gst_pad_push_event (GST_PAD (pad), event)) {
+      GST_ERROR_OBJECT (pad, "failed to push new segment");
+      goto pause;
+    }
+    GST_TRACE_OBJECT (pad, "segment");
+    g_atomic_int_set (&pad->does_need_segment, FALSE);
+  }
+
+  if (!g_atomic_int_get (&pad->sent_stream_collection)) {
+    GstEvent *event = gst_event_new_stream_collection (self->collection);
+    if (!gst_pad_push_event (GST_PAD (pad), event)) {
+      GST_ERROR_OBJECT (pad, "failed to push stream collection");
+      goto pause;
+    }
+    GST_TRACE_OBJECT (pad, "stream collection");
+    g_atomic_int_set (&pad->sent_stream_collection, TRUE);
+  }
+
+  if (GST_IS_SAMPLE (object)) {
+    GstSample *sample = GST_SAMPLE (object);
+    GstCaps *sample_caps = gst_sample_get_caps (sample);
+
+    if (!gst_caps_is_equal (pad->most_recent_caps, sample_caps)) {
+      gst_caps_replace (&pad->most_recent_caps, sample_caps);
+      GstEvent *event = gst_event_new_caps (gst_caps_ref (sample_caps));
+      if (!gst_pad_push_event (GST_PAD (pad), event)) {
+        GST_ERROR_OBJECT (pad, "failed to push new caps");
+        goto pause;
+      }
+      GST_TRACE_OBJECT (pad, "new caps %" GST_PTR_FORMAT, sample_caps);
+    }
+
+    GstBuffer *buffer = gst_buffer_copy (gst_sample_get_buffer (sample));
+    if (GST_BUFFER_DTS_IS_VALID (buffer)) {
+      pad->position = GST_BUFFER_DTS (buffer);
+    }
+
+    GstFlowReturn push_result = gst_pad_push (GST_PAD (pad), buffer);
+
+    FLOW_COMBINER_LOCK (self);
+    GstFlowReturn combined_result =
+        gst_flow_combiner_update_pad_flow (self->flow_combiner,
+        GST_PAD_CAST (pad), push_result);
+    FLOW_COMBINER_UNLOCK (self);
+
+    if (combined_result != GST_FLOW_OK) {
+      GST_DEBUG_OBJECT (pad, "push result: %s, combined result: %s",
+          gst_flow_get_name (push_result), gst_flow_get_name (combined_result));
+      goto pause;
+    }
+  } else if (GST_IS_EVENT (object)) {
+    if (GST_EVENT_TYPE (object) == GST_EVENT_EOS) {
+      g_mutex_lock (&self->eos_lock);
+      pad->eos = TRUE;
+      g_cond_broadcast (&self->eos_cond);
+      g_mutex_unlock (&self->eos_lock);
+      g_mutex_lock (&self->eos_lock);
+      while (!all_pads_eos (self)) {
+        GST_DEBUG_OBJECT (pad, "waiting for eos on all tracks");
+        g_cond_wait (&self->eos_cond, &self->eos_lock);
+      }
+      g_mutex_unlock (&self->eos_lock);
+      GST_DEBUG_OBJECT (pad, "have eos on all tracks");
+    }
+    if (!gst_pad_push_event (GST_PAD (pad), GST_EVENT (object))) {
+      GST_ERROR_OBJECT (self, "failed to push enqueued event");
+      goto pause;
+    }
+  } else {
+    GST_ERROR_OBJECT (self, "unexpected object on track queue"
+        ", only samples and events are supported");
+    g_assert_not_reached ();
+  }
+
+  return;
+
+pause:
+  if (!g_atomic_int_get (&pad->flushing)) {
+    gst_pad_pause_task (GST_PAD (pad));
+  }
+}
+
+static gboolean
+pad_activate_mode (GstMseSrcPad * pad, GstObject * parent, GstPadMode mode,
+    gboolean active)
+{
+  if (mode != GST_PAD_MODE_PUSH) {
+    GST_ERROR_OBJECT (parent, "msesrc only supports push mode");
+    return FALSE;
+  }
+
+  if (active) {
+    gst_pad_start_task (GST_PAD (pad), (GstTaskFunction) pad_task, pad, NULL);
+  } else {
+    set_flushing_and_signal (pad);
+    gst_media_source_track_flush (pad->track);
+    gst_pad_stop_task (GST_PAD (pad));
+    clear_flushing (pad);
+  }
+
+  return TRUE;
+}
+
+static GstPadLinkReturn
+pad_linked (GstMseSrcPad * pad, GstMseSrc * parent, GstPad * sink)
+{
+  GST_DEBUG_OBJECT (pad, "pad is linked to %" GST_PTR_FORMAT ", resuming task",
+      sink);
+  LINKED_OR_FLUSHING_LOCK (pad);
+  LINKED_OR_FLUSHING_SIGNAL (pad);
+  LINKED_OR_FLUSHING_UNLOCK (pad);
+  return GST_PAD_LINK_OK;
+}
+
+static gboolean
+pad_event (GstMseSrcPad * pad, GstMseSrc * parent, GstEvent * event)
+{
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_SEEK:
+      return gst_element_send_event (GST_ELEMENT (parent), event);
+    default:
+      return gst_pad_event_default (GST_PAD (pad), GST_OBJECT (parent), event);
+  }
+}
+
+static gboolean
+pad_query (GstMseSrcPad * pad, GstObject * parent, GstQuery * query)
+{
+  GstMseSrc *self = GST_MSE_SRC (parent);
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_POSITION:{
+      GstClockTime position = pad->position;
+      GstFormat fmt;
+      gst_query_parse_position (query, &fmt, NULL);
+      if (fmt == GST_FORMAT_TIME && GST_CLOCK_TIME_IS_VALID (position)) {
+        GST_TRACE_OBJECT (pad, "position query returning %" GST_TIMEP_FORMAT,
+            &position);
+        gst_query_set_position (query, GST_FORMAT_TIME, position);
+        return TRUE;
+      }
+      break;
+    }
+    case GST_QUERY_DURATION:{
+      GstFormat fmt;
+      gst_query_parse_duration (query, &fmt, NULL);
+      if (fmt == GST_FORMAT_TIME) {
+        gst_query_set_duration (query, GST_FORMAT_TIME, self->duration);
+        return TRUE;
+      } else {
+        return FALSE;
+      }
+    }
+    case GST_QUERY_SEEKING:{
+      GstFormat fmt;
+      gst_query_parse_seeking (query, &fmt, NULL, NULL, NULL);
+      if (fmt != GST_FORMAT_TIME) {
+        return FALSE;
+      }
+      gst_query_set_seeking (query, GST_FORMAT_TIME, TRUE, 0, self->duration);
+      return TRUE;
+    }
+    default:
+      break;
+  }
+  return gst_pad_query_default (GST_PAD (pad), parent, query);
+}
+
+static void
+append_stream (GstMseSrc * self, GstMediaSourceTrack * track)
+{
+  if (g_hash_table_contains (self->streams, track)) {
+    GST_DEBUG_OBJECT (self, "skipping processed %" GST_PTR_FORMAT, track);
+    return;
+  }
+  GST_DEBUG_OBJECT (self, "creating stream for %" GST_PTR_FORMAT, track);
+  guint pad_index = g_hash_table_size (self->streams);
+  GstStream *info = create_gst_stream (track);
+  Stream stream = {
+    .info = gst_object_ref (info),
+    .track = gst_object_ref (track),
+    .pad = gst_mse_src_pad_new (track, info, pad_index,
+        self->start_time, self->rate),
+  };
+  g_hash_table_insert (self->streams, track,
+      g_memdup2 (&stream, sizeof (Stream)));
+  gst_stream_collection_add_stream (self->collection, stream.info);
+}
+
+void
+gst_mse_src_emit_streams (GstMseSrc * self, GstMediaSourceTrack ** tracks,
+    gsize n_tracks)
+{
+  g_return_if_fail (GST_IS_MSE_SRC (self));
+
+  GstElement *element = GST_ELEMENT (self);
+  GstObject *object = GST_OBJECT (self);
+
+  update_ready_state_for_init_segment (self);
+
+  STREAMS_LOCK (self);
+
+  for (gsize i = 0; i < n_tracks; i++) {
+    GstMediaSourceTrack *track = tracksi;
+    if (!is_streamable (track)) {
+      continue;
+    }
+    append_stream (self, track);
+  }
+
+  GstState state;
+  gst_element_get_state (element, &state, NULL, 0);
+  gboolean active = state > GST_STATE_READY;
+
+  GHashTableIter iter;
+  g_hash_table_iter_init (&iter, self->streams);
+  for (gpointer value; g_hash_table_iter_next (&iter, NULL, &value);) {
+    Stream *stream = value;
+    GstPad *pad = stream->pad;
+    if (active) {
+      gst_pad_set_active (pad, TRUE);
+    }
+    GstElement *parent = gst_pad_get_parent_element (pad);
+    if (parent) {
+      GST_DEBUG_OBJECT (self, "skipping parented pad %" GST_PTR_FORMAT, pad);
+      gst_object_unref (parent);
+      continue;
+    }
+    gst_element_add_pad (element, pad);
+    FLOW_COMBINER_LOCK (self);
+    gst_flow_combiner_add_pad (self->flow_combiner, pad);
+    FLOW_COMBINER_UNLOCK (self);
+  }
+  STREAMS_UNLOCK (self);
+
+  gst_element_no_more_pads (element);
+  gst_element_post_message (element, gst_message_new_stream_collection (object,
+          self->collection));
+}
+
+void
+gst_mse_src_update_ready_state (GstMseSrc * self)
+{
+  g_return_if_fail (GST_IS_MSE_SRC (self));
+  update_ready_state_for_sample (self);
+}
+
+static GstURIType
+gst_mse_src_uri_get_type (GType type)
+{
+  return GST_URI_SRC;
+}
+
+static const gchar *const *
+gst_mse_src_uri_get_protocols (GType type)
+{
+  static const gchar *protocols = { "mse", NULL };
+  return protocols;
+}
+
+static gchar *
+gst_mse_src_uri_get_uri (GstURIHandler * handler)
+{
+  GstMseSrc *self = GST_MSE_SRC (handler);
+  return g_strdup (self->uri);
+}
+
+static gboolean
+gst_mse_src_uri_set_uri (GstURIHandler * handler, const gchar * uri,
+    GError ** error)
+{
+  GstMseSrc *self = GST_MSE_SRC (handler);
+  g_free (self->uri);
+  self->uri = g_strdup (uri);
+  return TRUE;
+}
+
+static void
+gst_mse_src_uri_handler_init (gpointer g_iface, gpointer iface_data)
+{
+  GstURIHandlerInterface *iface = (GstURIHandlerInterface *) g_iface;
+  iface->get_type = gst_mse_src_uri_get_type;
+  iface->get_protocols = gst_mse_src_uri_get_protocols;
+  iface->get_uri = gst_mse_src_uri_get_uri;
+  iface->set_uri = gst_mse_src_uri_set_uri;
+}
+
+void
+gst_mse_src_attach (GstMseSrc * self, GstMediaSource * media_source)
+{
+  g_return_if_fail (GST_IS_MSE_SRC (self));
+  g_return_if_fail (GST_IS_MEDIA_SOURCE (media_source));
+  g_set_object (&self->media_source, media_source);
+}
+
+void
+gst_mse_src_detach (GstMseSrc * self)
+{
+  g_return_if_fail (GST_IS_MSE_SRC (self));
+  gst_clear_object (&self->media_source);
+}
+
+static void
+set_ready_state (GstMseSrc * self, GstMseSrcReadyState ready_state)
+{
+  if (ready_state == self->ready_state) {
+    return;
+  }
+  GST_DEBUG_OBJECT (self, "ready state %d=>%d", self->ready_state, ready_state);
+  self->ready_state = ready_state;
+  g_object_notify_by_pspec (G_OBJECT (self), propertiesPROP_READY_STATE);
+}
+
+static void
+update_ready_state_for_init_segment (GstMseSrc * self)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE (self->media_source));
+  if (self->ready_state != GST_MSE_SRC_READY_STATE_HAVE_NOTHING) {
+    return;
+  }
+  GstSourceBufferList *buffers = gst_media_source_get_source_buffers
+      (self->media_source);
+  gboolean all_received_init_segment = TRUE;
+  for (guint i = 0; all_received_init_segment; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (buffers, i);
+    if (buf == NULL) {
+      break;
+    }
+    all_received_init_segment &= gst_source_buffer_has_init_segment (buf);
+    gst_object_unref (buf);
+  }
+  if (!all_received_init_segment) {
+    return;
+  }
+  set_ready_state (self, GST_MSE_SRC_READY_STATE_HAVE_METADATA);
+}
+
+static gboolean
+has_current_data (GstMseSrc * self)
+{
+  GstClockTime position = gst_mse_src_get_position (self);
+  if (!GST_CLOCK_TIME_IS_VALID (position)) {
+    return FALSE;
+  }
+  GstSourceBufferList *active =
+      gst_media_source_get_active_source_buffers (self->media_source);
+  gboolean has_data = TRUE;
+  for (guint i = 0; has_data; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (active, i);
+    if (buf == NULL) {
+      if (i == 0) {
+        has_data = FALSE;
+        GST_DEBUG_OBJECT (self,
+            "no active source buffers, nothing is buffered");
+      }
+      break;
+    }
+    has_data = gst_source_buffer_is_buffered (buf, position);
+    gst_object_unref (buf);
+  }
+  g_object_unref (active);
+  return has_data;
+}
+
+static gboolean
+has_future_data (GstMseSrc * self)
+{
+  GstClockTime position = gst_mse_src_get_position (self);
+  GstClockTime duration = self->duration;
+  if (!GST_CLOCK_TIME_IS_VALID (position)
+      || !GST_CLOCK_TIME_IS_VALID (duration)) {
+    return FALSE;
+  }
+  GstClockTime target_position = MIN (position + THRESHOLD_FUTURE_DATA,
+      duration);
+  GstSourceBufferList *active =
+      gst_media_source_get_active_source_buffers (self->media_source);
+  gboolean has_data = TRUE;
+  for (guint i = 0; has_data; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (active, i);
+    if (buf == NULL) {
+      if (i == 0) {
+        has_data = FALSE;
+        GST_DEBUG_OBJECT (self,
+            "no active source buffers, nothing is buffered");
+      }
+      break;
+    }
+    has_data = gst_source_buffer_is_range_buffered (buf, position,
+        target_position);
+    gst_object_unref (buf);
+  }
+  g_object_unref (active);
+  return has_data;
+}
+
+static gboolean
+has_enough_data (GstMseSrc * self)
+{
+  GstClockTime position = gst_mse_src_get_position (self);
+  GstClockTime duration = self->duration;
+  if (!GST_CLOCK_TIME_IS_VALID (position)
+      || !GST_CLOCK_TIME_IS_VALID (duration)) {
+    return FALSE;
+  }
+  GstClockTime target_position = MIN (position + THRESHOLD_ENOUGH_DATA,
+      duration);
+  GstSourceBufferList *active =
+      gst_media_source_get_active_source_buffers (self->media_source);
+  gboolean has_data = TRUE;
+  for (guint i = 0; has_data; i++) {
+    GstSourceBuffer *buf = gst_source_buffer_list_index (active, i);
+    if (buf == NULL) {
+      if (i == 0) {
+        has_data = FALSE;
+        GST_DEBUG_OBJECT (self,
+            "no active source buffers, nothing is buffered");
+      }
+      break;
+    }
+    has_data = gst_source_buffer_is_range_buffered (buf, position,
+        target_position);
+    gst_object_unref (buf);
+  }
+  g_object_unref (active);
+  return has_data;
+}
+
+static void
+update_ready_state_for_sample (GstMseSrc * self)
+{
+  g_return_if_fail (GST_IS_MEDIA_SOURCE (self->media_source));
+  g_return_if_fail (self->ready_state >= GST_MSE_SRC_READY_STATE_HAVE_METADATA);
+
+  if (has_enough_data (self)) {
+    set_ready_state (self, GST_MSE_SRC_READY_STATE_HAVE_ENOUGH_DATA);
+  } else if (has_future_data (self)) {
+    set_ready_state (self, GST_MSE_SRC_READY_STATE_HAVE_FUTURE_DATA);
+  } else if (has_current_data (self)) {
+    set_ready_state (self, GST_MSE_SRC_READY_STATE_HAVE_CURRENT_DATA);
+  } else {
+    set_ready_state (self, GST_MSE_SRC_READY_STATE_HAVE_METADATA);
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstmsesrc.h Added

@@ -0,0 +1,94 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2009, 2010 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * Copyright (C) 2013, 2022, 2023 Collabora Ltd.
+ * Copyright (C) 2013 Orange
+ * Copyright (C) 2014, 2015 Sebastian Dröge <sebastian@centricular.com>
+ * Copyright (C) 2015, 2016, 2018, 2019, 2020, 2021 Igalia, S.L
+ * Copyright (C) 2015, 2016, 2018, 2019, 2020, 2021 Metrological Group B.V.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/mse/mse-prelude.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GstMseSrcReadyState:
+ * @GST_MSE_SRC_READY_STATE_HAVE_NOTHING: No information is available about the
+ * stream
+ * @GST_MSE_SRC_READY_STATE_HAVE_METADATA: The duration is available and video
+ * dimensions are available if the stream contains video
+ * @GST_MSE_SRC_READY_STATE_HAVE_CURRENT_DATA: The current playback position can
+ * be presented but future information is not available
+ * @GST_MSE_SRC_READY_STATE_HAVE_FUTURE_DATA: There is data for the current
+ * position and some amount in the future and any text tracks are ready.
+ * @GST_MSE_SRC_READY_STATE_HAVE_ENOUGH_DATA: Either there is enough data to
+ * play the stream through at the current playback and input rate or the input
+ * buffer is full.
+ *
+ * Describes how much information a #GstMseSrc has about the media it is playing
+ * back at the current playback #GstMseSrc:position. This type corresponds
+ * directly to the ready state of a HTML Media Element and is a separate concept
+ * from #GstMediaSourceReadyState.
+ *
+ * Specification(https://html.spec.whatwg.org/multipage/media.html#ready-states)
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_MSE_SRC_READY_STATE_HAVE_NOTHING,
+  GST_MSE_SRC_READY_STATE_HAVE_METADATA,
+  GST_MSE_SRC_READY_STATE_HAVE_CURRENT_DATA,
+  GST_MSE_SRC_READY_STATE_HAVE_FUTURE_DATA,
+  GST_MSE_SRC_READY_STATE_HAVE_ENOUGH_DATA,
+} GstMseSrcReadyState;
+
+#define GST_TYPE_MSE_SRC (gst_mse_src_get_type())
+#define GST_TYPE_MSE_SRC_PAD (gst_mse_src_pad_get_type())
+
+GST_MSE_API
+G_DECLARE_FINAL_TYPE (GstMseSrc, gst_mse_src, GST, MSE_SRC, GstElement);
+
+GST_MSE_API
+G_DECLARE_FINAL_TYPE (GstMseSrcPad, gst_mse_src_pad, GST, MSE_SRC_PAD, GstPad);
+
+GST_MSE_API
+GstClockTime gst_mse_src_get_position (GstMseSrc * self);
+
+GST_MSE_API
+GstClockTime gst_mse_src_get_duration (GstMseSrc * self);
+
+GST_MSE_API
+GstMseSrcReadyState gst_mse_src_get_ready_state (GstMseSrc * self);
+
+GST_MSE_API
+guint gst_mse_src_get_n_audio (GstMseSrc * self);
+
+GST_MSE_API
+guint gst_mse_src_get_n_text (GstMseSrc * self);
+
+GST_MSE_API
+guint gst_mse_src_get_n_video (GstMseSrc * self);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstsourcebuffer-private.h Added

@@ -0,0 +1,72 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <glib.h>
+#include "gstsourcebuffer.h"
+
+G_BEGIN_DECLS
+
+typedef struct
+{
+  void (*duration_changed) (GstSourceBuffer * self, gpointer user_data);
+  void (*received_init_segment) (GstSourceBuffer * self, gpointer user_data);
+  void (*active_state_changed) (GstSourceBuffer * self, gpointer user_data);
+} GstSourceBufferCallbacks;
+
+GST_MSE_PRIVATE
+GstSourceBuffer * gst_source_buffer_new (const gchar * content_type,
+    GstObject * parent, GError ** error);
+
+GST_MSE_PRIVATE
+GstSourceBuffer * gst_source_buffer_new_with_callbacks (
+    const gchar * content_type, GstObject * parent,
+    GstSourceBufferCallbacks *callbacks, gpointer user_data, GError ** error);
+
+GST_MSE_PRIVATE
+void gst_source_buffer_teardown (GstSourceBuffer * self);
+
+GST_MSE_PRIVATE
+gboolean gst_source_buffer_has_init_segment (GstSourceBuffer * self);
+
+GST_MSE_PRIVATE
+gboolean gst_source_buffer_is_buffered (GstSourceBuffer * self, GstClockTime
+    time);
+
+GST_MSE_PRIVATE
+gboolean gst_source_buffer_is_range_buffered (GstSourceBuffer * self,
+    GstClockTime start, GstClockTime end);
+
+GST_MSE_PRIVATE
+GstClockTime gst_source_buffer_get_duration (GstSourceBuffer * self);
+
+GST_MSE_PRIVATE
+GPtrArray * gst_source_buffer_get_all_tracks (GstSourceBuffer * self);
+
+GST_MSE_PRIVATE
+void gst_source_buffer_seek (GstSourceBuffer * self, GstClockTime time);
+
+GST_MSE_PRIVATE
+gboolean gst_source_buffer_get_active (GstSourceBuffer * self);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstsourcebuffer.c Added

@@ -0,0 +1,2019 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Orange
+ * Copyright (C) 2013-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 Sebastian Dröge <sebastian@centricular.com>
+ * Copyright (C) 2015, 2016, 2017 Igalia, S.L
+ * Copyright (C) 2015, 2016, 2017 Metrological Group B.V.
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:gstsourcebuffer
+ * @title: GstSourceBuffer
+ * @short_description: Source Buffer
+ * @include: mse/mse.h
+ * @symbols:
+ * - GstSourceBuffer
+ *
+ * The Source Buffer is the primary means of data flow between an application
+ * and the Media Source API. It represents a single timeline of media,
+ * containing some combination of audio, video, and text tracks.
+ * An application is responsible for feeding raw data into the Source Buffer
+ * using gst_source_buffer_append_buffer() and the Source Buffer will
+ * asynchronously process the data into tracks of time-coded multimedia samples.
+ *
+ * The application as well as the associated playback component can then select
+ * to play media from any subset of tracks across all Source Buffers of a Media
+ * Source.
+ *
+ * A few control points are also provided to customize the behavior.
+ *
+ *  - #GstSourceBuffer:append-mode controls how timestamps of processed samples are
+ *  interpreted. They are either inserted in the timeline directly where the
+ *  decoded media states they should, or inserted directly after the previously
+ *  encountered sample.
+ *
+ *  - #GstSourceBuffer:append-window-start / #GstSourceBuffer:append-window-end
+ *  control the planned time window where media from appended data can be added
+ *  to the current timeline. Any samples outside that range may be ignored.
+ *
+ *  - #GstSourceBuffer:timestamp-offset is added to the start time of any sample
+ *  processed.
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/mse/mse-enumtypes.h>
+#include "gstsourcebuffer.h"
+#include "gstsourcebuffer-private.h"
+
+#include "gstmselogging-private.h"
+#include "gstmsemediatype-private.h"
+#include "gstmseeventqueue-private.h"
+
+#include "gstappendpipeline-private.h"
+#include "gstmediasource.h"
+#include "gstmediasource-private.h"
+#include "gstmediasourcetrack-private.h"
+#include "gstmediasourcetrackbuffer-private.h"
+#include "gstsourcebufferlist-private.h"
+#include "gstmsesrc.h"
+#include "gstmsesrc-private.h"
+
+#define g_array_new_ranges() \
+  (g_array_new (TRUE, FALSE, sizeof (GstMediaSourceRange)))
+
+typedef struct
+{
+  GstSourceBufferCallbacks callbacks;
+  gpointer user_data;
+} Callbacks;
+
+/**
+ * GstSourceBuffer:
+ * Since: 1.24
+ */
+typedef struct
+{
+  GstSourceBuffer *parent;
+
+  GstMediaSourceTrack *track;
+  GstMediaSourceTrackBuffer *buffer;
+
+  GstTask *task;
+  GRecMutex lock;
+
+  gboolean cancelled;
+} TrackFeedTask;
+
+typedef struct
+{
+  gsize n_samples;
+  GstSample *current_sample;
+  GstClockTime current_dts;
+} TrackFeedAccumulator;
+
+typedef struct
+{
+  const GstClockTime time;
+  gboolean buffered;
+} IsBufferedAccumulator;
+
+typedef struct
+{
+  const GstClockTime start;
+  const GstClockTime end;
+  gboolean start_buffered;
+  gboolean end_buffered;
+} IsRangeBufferedAccumulator;
+
+struct _GstSourceBuffer
+{
+  GstObject parent_instance;
+
+  GstSourceBufferAppendMode append_mode;
+  GstClockTime append_window_start;
+  GstClockTime append_window_end;
+  gchar *content_type;
+  gboolean generate_timestamps;
+  GstClockTime timestamp_offset;
+  gboolean updating;
+  gboolean errored;
+  gsize size_limit;
+  gsize size;
+  GstBuffer *pending_data;
+  GstTask *append_to_buffer_task;
+  GRecMutex append_to_buffer_lock;
+  GstClockTime seek_time;
+  GstAppendPipeline *append_pipeline;
+  GstMseEventQueue *event_queue;
+
+  gboolean processed_init_segment;
+
+  GHashTable *track_buffers;
+  GHashTable *track_feeds;
+
+  Callbacks callbacks;
+};
+
+G_DEFINE_TYPE (GstSourceBuffer, gst_source_buffer, GST_TYPE_OBJECT);
+
+enum
+{
+  PROP_0,
+
+  PROP_APPEND_MODE,
+  PROP_APPEND_WINDOW_START,
+  PROP_APPEND_WINDOW_END,
+  PROP_BUFFERED,
+  PROP_CONTENT_TYPE,
+  PROP_TIMESTAMP_OFFSET,
+  PROP_UDPATING,
+
+  N_PROPS,
+};
+
+typedef enum
+{
+  ON_UPDATE_START,
+  ON_UPDATE,
+  ON_UPDATE_END,
+  ON_ERROR,
+  ON_ABORT,
+
+  N_SIGNALS,
+} SourceBufferEvent;
+
+typedef struct
+{
+  GstDataQueueItem item;
+  SourceBufferEvent event;
+} SourceBufferEventItem;
+
+#define DEFAULT_BUFFER_SIZE 1 << 24
+#define DEFAULT_APPEND_MODE GST_SOURCE_BUFFER_APPEND_MODE_SEGMENTS
+
+static GParamSpec *propertiesN_PROPS;
+static guint signalsN_SIGNALS;
+
+static void call_received_init_segment (GstSourceBuffer * self);
+static void call_duration_changed (GstSourceBuffer * self);
+static void call_active_state_changed (GstSourceBuffer * self);
+
+static inline gboolean is_removed (GstSourceBuffer * self);
+static void reset_parser_state (GstSourceBuffer * self);
+static void append_error (GstSourceBuffer * self);
+
+static void seek_track_buffer (GstMediaSourceTrack * track,
+    GstMediaSourceTrackBuffer * buffer, GstSourceBuffer * self);
+static void dispatch_event (SourceBufferEventItem * item, GstSourceBuffer *
+    self);
+static void schedule_event (GstSourceBuffer * self, SourceBufferEvent event);
+static void append_to_buffer_task (GstSourceBuffer * self);
+static void track_feed_task (TrackFeedTask * feed);
+static void clear_track_feed (TrackFeedTask * feed);
+static void stop_track_feed (TrackFeedTask * feed);
+static void start_track_feed (TrackFeedTask * feed);
+static void reset_track_feed (TrackFeedTask * feed);
+static TrackFeedTask *get_track_feed (GstSourceBuffer * self,
+    GstMediaSourceTrack * track);
+static GstMediaSourceTrackBuffer *get_track_buffer (GstSourceBuffer * self,
+    GstMediaSourceTrack * track);
+static void add_track_feed (GstMediaSourceTrack * track,
+    GstMediaSourceTrackBuffer * track_buffer, GstSourceBuffer * self);
+static void add_track_buffer (GstMediaSourceTrack * track, GstSourceBuffer *
+    self);
+static void update_msesrc_ready_state (GstSourceBuffer * self);
+
+static void on_duration_changed (GstAppendPipeline * pipeline,
+    gpointer user_data);
+static void on_eos (GstAppendPipeline * pipeline, GstMediaSourceTrack * track,
+    gpointer user_data);
+static void on_error (GstAppendPipeline * pipeline, gpointer user_data);
+static void on_new_sample (GstAppendPipeline * pipeline,
+    GstMediaSourceTrack * track, GstSample * sample, gpointer user_data);
+static void on_received_init_segment (GstAppendPipeline * pipeline,
+    gpointer user_data);
+
+static inline GstMediaSource *
+get_media_source (GstSourceBuffer * self)
+{
+  return GST_MEDIA_SOURCE (gst_object_get_parent (GST_OBJECT (self)));
+}
+
+static GstMseSrc *
+get_msesrc (GstSourceBuffer * self)
+{
+  GstMediaSource *media_source = get_media_source (self);
+  if (media_source == NULL) {
+    return NULL;
+  }
+  return gst_media_source_get_source_element (media_source);
+}
+
+static void
+clear_pending_data (GstSourceBuffer * self)
+{
+  gst_clear_buffer (&self->pending_data);
+}
+
+static GstBuffer *
+take_pending_data (GstSourceBuffer * self)
+{
+  return g_steal_pointer (&self->pending_data);
+}
+
+static void
+set_pending_data (GstSourceBuffer * self, GstBuffer * buffer)
+{
+  clear_pending_data (self);
+  self->pending_data = buffer;
+}
+
+GstSourceBuffer *
+gst_source_buffer_new (const gchar * content_type, GstObject * parent,
+    GError ** error)
+{
+  g_return_val_if_fail (GST_IS_MEDIA_SOURCE (parent), NULL);
+  g_return_val_if_fail (content_type != NULL, NULL);
+
+  gst_mse_init_logging ();
+
+  GstMediaSourceMediaType media_type = GST_MEDIA_SOURCE_MEDIA_TYPE_INIT;
+  gst_media_source_media_type_parse (&media_type, content_type);
+
+  gboolean generate_timestamps = gst_media_source_media_type_generates_timestamp
+      (&media_type);
+  gst_media_source_media_type_reset (&media_type);
+
+  GstSourceBufferAppendMode append_mode = generate_timestamps
+      ? GST_SOURCE_BUFFER_APPEND_MODE_SEQUENCE
+      : GST_SOURCE_BUFFER_APPEND_MODE_SEGMENTS;
+
+  GstSourceBuffer *self = g_object_new (GST_TYPE_SOURCE_BUFFER,
+      "parent", parent, NULL);
+
+  self->generate_timestamps = generate_timestamps;
+  self->append_mode = append_mode;
+  self->content_type = g_strdup (content_type);
+
+  GstAppendPipelineCallbacks callbacks = {
+    .duration_changed = on_duration_changed,
+    .eos = on_eos,
+    .error = on_error,
+    .new_sample = on_new_sample,
+    .received_init_segment = on_received_init_segment,
+  };
+  GError *append_pipeline_error = NULL;
+  self->append_pipeline =
+      gst_append_pipeline_new (&callbacks, self, &append_pipeline_error);
+  if (append_pipeline_error) {
+    g_propagate_prefixed_error (error, append_pipeline_error,
+        "failed to create source buffer");
+    goto error;
+  }
+
+  return gst_object_ref_sink (self);
+error:
+  gst_clear_object (&self);
+  return NULL;
+}
+
+GstSourceBuffer *
+gst_source_buffer_new_with_callbacks (const gchar * content_type,
+    GstObject * parent, GstSourceBufferCallbacks * callbacks,
+    gpointer user_data, GError ** error)
+{
+  g_return_val_if_fail (callbacks, NULL);
+
+  GError *source_buffer_error = NULL;
+  GstSourceBuffer *self =
+      gst_source_buffer_new (content_type, parent, &source_buffer_error);
+  if (source_buffer_error) {
+    g_propagate_error (error, source_buffer_error);
+    gst_clear_object (&self);
+    return NULL;
+  }
+  self->callbacks.callbacks = *callbacks;
+  self->callbacks.user_data = user_data;
+
+  return self;
+}
+
+static void
+gst_source_buffer_dispose (GObject * object)
+{
+  GstSourceBuffer *self = (GstSourceBuffer *) object;
+
+  if (self->append_to_buffer_task) {
+    gst_task_join (self->append_to_buffer_task);
+  }
+  gst_clear_object (&self->append_to_buffer_task);
+
+  gst_clear_object (&self->append_pipeline);
+
+  g_hash_table_remove_all (self->track_feeds);
+
+  if (!is_removed (self)) {
+    GstMediaSource *parent = get_media_source (self);
+    gst_media_source_remove_source_buffer (parent, self, NULL);
+    gst_object_unref (parent);
+  }
+
+  gst_clear_object (&self->event_queue);
+
+  G_OBJECT_CLASS (gst_source_buffer_parent_class)->dispose (object);
+}
+
+static void
+gst_source_buffer_finalize (GObject * object)
+{
+  GstSourceBuffer *self = (GstSourceBuffer *) object;
+
+  g_clear_pointer (&self->content_type, g_free);
+  g_rec_mutex_clear (&self->append_to_buffer_lock);
+
+  g_hash_table_unref (self->track_buffers);
+  g_hash_table_unref (self->track_feeds);
+
+  G_OBJECT_CLASS (gst_source_buffer_parent_class)->finalize (object);
+}
+
+static void
+gst_source_buffer_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstSourceBuffer *self = GST_SOURCE_BUFFER (object);
+
+  switch (prop_id) {
+    case PROP_APPEND_MODE:
+      g_value_set_enum (value, gst_source_buffer_get_append_mode (self));
+      break;
+    case PROP_APPEND_WINDOW_START:
+      g_value_set_uint64 (value,
+          gst_source_buffer_get_append_window_start (self));
+      break;
+    case PROP_APPEND_WINDOW_END:
+      g_value_set_uint64 (value,
+          gst_source_buffer_get_append_window_end (self));
+      break;
+    case PROP_BUFFERED:
+      g_value_take_boxed (value, gst_source_buffer_get_buffered (self, NULL));
+      break;
+    case PROP_CONTENT_TYPE:
+      g_value_take_string (value, gst_source_buffer_get_content_type (self));
+      break;
+    case PROP_TIMESTAMP_OFFSET:
+      g_value_set_int64 (value, gst_source_buffer_get_timestamp_offset (self));
+      break;
+    case PROP_UDPATING:
+      g_value_set_boolean (value, gst_source_buffer_get_updating (self));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+  }
+}
+
+static void
+gst_source_buffer_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstSourceBuffer *self = GST_SOURCE_BUFFER (object);
+
+  switch (prop_id) {
+    case PROP_APPEND_MODE:
+      gst_source_buffer_set_append_mode (self, g_value_get_enum (value), NULL);
+      break;
+    case PROP_CONTENT_TYPE:
+      gst_source_buffer_change_content_type (self,
+          g_value_get_string (value), NULL);
+      break;
+    case PROP_TIMESTAMP_OFFSET:
+      gst_source_buffer_set_timestamp_offset (self,
+          g_value_get_int64 (value), NULL);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+  }
+}
+
+static void
+gst_source_buffer_class_init (GstSourceBufferClass * klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->dispose = GST_DEBUG_FUNCPTR (gst_source_buffer_dispose);
+  oclass->finalize = GST_DEBUG_FUNCPTR (gst_source_buffer_finalize);
+  oclass->get_property = GST_DEBUG_FUNCPTR (gst_source_buffer_get_property);
+  oclass->set_property = GST_DEBUG_FUNCPTR (gst_source_buffer_set_property);
+
+  /**
+   * GstSourceBuffer:append-mode:
+   *
+   * Affects how timestamps of processed media segments are interpreted.
+   * In %GST_SOURCE_BUFFER_APPEND_MODE_SEGMENTS, the start timestamp of a
+   * processed media segment is used directly along with
+   * #GstSourceBuffer:timestamp-offset .
+   * In %GST_SOURCE_BUFFER_APPEND_MODE_SEQUENCE, the timestamp of a
+   * processed media segment is ignored and replaced with the end time of the
+   * most recently appended segment.
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-mode)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_APPEND_MODE = g_param_spec_enum ("append-mode",
+      "Append Mode",
+      "Either Segments or Sequence",
+      GST_TYPE_SOURCE_BUFFER_APPEND_MODE, DEFAULT_APPEND_MODE,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstSourceBuffer:append-window-start:
+   *
+   * Any segments processed which end before this value will be ignored by this
+   * Source Buffer.
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-appendwindowstart)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_APPEND_WINDOW_START =
+      g_param_spec_uint64 ("append-window-start", "Append Window Start",
+      "The timestamp representing the start of the append window", 0,
+      GST_CLOCK_TIME_NONE, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstSourceBuffer:append-window-end:
+   *
+   * Any segments processed which have a start time greater than this value will
+   * be ignored by this Source Buffer.
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-appendwindowend)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_APPEND_WINDOW_END = g_param_spec_uint64 ("append-window-end",
+      "Append Window End",
+      "The timestamp representing the end of the append window",
+      0, GST_CLOCK_TIME_NONE, GST_CLOCK_TIME_NONE, G_PARAM_READABLE |
+      G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstSourceBuffer:buffered:
+   *
+   * The set of Time Intervals that have been loaded into the current Source
+   * Buffer
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-buffered)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_BUFFERED = g_param_spec_boxed ("buffered",
+      "Buffered Time Intervals",
+      "The set of Time Intervals that have been loaded into"
+      " the current Source Buffer", G_TYPE_ARRAY, G_PARAM_READABLE |
+      G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstSourceBuffer:content-type:
+   *
+   * The MIME content-type of the data stream
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_CONTENT_TYPE = g_param_spec_string ("content-type",
+      "Content Type",
+      "The MIME content-type of the data stream", NULL,
+      G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstSourceBuffer:timestamp-offset:
+   *
+   * The next media segment appended to the current Source Buffer will have its
+   * start timestamp increased by this amount.
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-timestampoffset)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_TIMESTAMP_OFFSET = g_param_spec_int64 ("timestamp-offset",
+      "Timestamp Offset",
+      "The next media segment appended to the current Source Buffer"
+      " will have its start timestamp increased by this amount",
+      0, G_MAXINT64, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  /**
+   * GstSourceBuffer:updating:
+   *
+   * Whether the current source buffer is still asynchronously processing
+   * previously issued commands.
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-updating)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_UDPATING = g_param_spec_boolean ("updating",
+      "Updating",
+      "Whether the current Source Buffer is still"
+      " asynchronously processing previously issued commands",
+      FALSE, G_PARAM_READABLE);
+
+  g_object_class_install_properties (oclass, N_PROPS, properties);
+
+  /**
+   * GstSourceBuffer::on-update-start:
+   * @self: The #GstSourceBuffer that has just started updating
+   *
+   * Emitted when @self has begun to process data after a call to
+   * gst_source_buffer_append_buffer().
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-onupdatestart)
+   *
+   * Since: 1.24
+   */
+  signalsON_UPDATE_START = g_signal_new ("on-update-start",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+  /**
+   * GstSourceBuffer::on-update:
+   * @self: The #GstSourceBuffer that has just updated
+   *
+   * Emitted when @self has successfully processed data after a call to
+   * gst_source_buffer_append_buffer().
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-onupdate)
+   *
+   * Since: 1.24
+   */
+  signalsON_UPDATE = g_signal_new ("on-update",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+  /**
+   * GstSourceBuffer::on-update-end:
+   * @self: The #GstSourceBuffer that is no longer updating
+   *
+   * Emitted when @self is no longer in the updating state after a call to
+   * gst_source_buffer_append_buffer(). This can happen after a successful or
+   * unsuccessful append.
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-onupdateend)
+   *
+   * Since: 1.24
+   */
+  signalsON_UPDATE_END = g_signal_new ("on-update-end",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+  /**
+   * GstSourceBuffer::on-error:
+   * @self: The #GstSourceBuffer that has encountered an error
+   *
+   * Emitted when @self has encountered an error after a call to
+   * gst_source_buffer_append_buffer().
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-onerror)
+   *
+   * Since: 1.24
+   */
+  signalsON_ERROR = g_signal_new ("on-error",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+  /**
+   * GstSourceBuffer::on-abort:
+   * @self: The #GstSourceBuffer that has been aborted.
+   *
+   * Emitted when @self was aborted after a call to gst_source_buffer_abort().
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-onabort)
+   *
+   * Since: 1.24
+   */
+  signalsON_ABORT = g_signal_new ("on-abort",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+}
+
+static void
+on_duration_changed (GstAppendPipeline * pipeline, gpointer user_data)
+{
+  GstSourceBuffer *self = GST_SOURCE_BUFFER (user_data);
+  if (is_removed (self)) {
+    return;
+  }
+  call_duration_changed (self);
+}
+
+static void
+on_eos (GstAppendPipeline * pipeline, GstMediaSourceTrack * track,
+    gpointer user_data)
+{
+  GstSourceBuffer *self = GST_SOURCE_BUFFER (user_data);
+  if (GST_IS_MEDIA_SOURCE_TRACK (track)) {
+    GST_DEBUG_OBJECT (self, "got EOS event on %" GST_PTR_FORMAT, track);
+    GstMediaSourceTrackBuffer *buffer = get_track_buffer (self, track);
+    gst_media_source_track_buffer_eos (buffer);
+  }
+  update_msesrc_ready_state (self);
+}
+
+static void
+on_error (GstAppendPipeline * pipeline, gpointer user_data)
+{
+  GstSourceBuffer *self = GST_SOURCE_BUFFER (user_data);
+  append_error (self);
+}
+
+static GstMediaSourceTrackBuffer *
+get_track_buffer (GstSourceBuffer * self, GstMediaSourceTrack * track)
+{
+  g_return_val_if_fail (g_hash_table_contains (self->track_buffers, track),
+      NULL);
+  return g_hash_table_lookup (self->track_buffers, track);
+}
+
+static inline TrackFeedTask *
+get_track_feed (GstSourceBuffer * self, GstMediaSourceTrack * track)
+{
+  g_return_val_if_fail (g_hash_table_contains (self->track_feeds, track), NULL);
+  return g_hash_table_lookup (self->track_feeds, track);
+}
+
+static void
+add_track_buffer (GstMediaSourceTrack * track, GstSourceBuffer * self)
+{
+  const gchar *id = gst_media_source_track_get_id (track);
+  if (g_hash_table_contains (self->track_buffers, track)) {
+    GST_DEBUG_OBJECT (self, "already have a track buffer for track %s", id);
+    return;
+  }
+  GstMediaSourceTrackBuffer *buf = gst_media_source_track_buffer_new ();
+  g_hash_table_insert (self->track_buffers, track, buf);
+  GST_DEBUG_OBJECT (self, "added track buffer for track %s", id);
+
+  add_track_feed (track, buf, self);
+}
+
+static void
+add_track_feed (GstMediaSourceTrack * track,
+    GstMediaSourceTrackBuffer * track_buffer, GstSourceBuffer * self)
+{
+  TrackFeedTask *feed = g_new0 (TrackFeedTask, 1);
+  GstTask *task = gst_task_new ((GstTaskFunction) track_feed_task, feed, NULL);
+  g_rec_mutex_init (&feed->lock);
+  gst_task_set_lock (task, &feed->lock);
+  feed->task = task;
+  feed->buffer = track_buffer;
+  feed->track = gst_object_ref (track);
+  feed->parent = self;
+  feed->cancelled = FALSE;
+  g_hash_table_insert (self->track_feeds, track, feed);
+}
+
+static void
+clear_track_feed (TrackFeedTask * feed)
+{
+  gst_object_unref (feed->task);
+  g_rec_mutex_clear (&feed->lock);
+  gst_object_unref (feed->track);
+  g_free (feed);
+}
+
+static void
+stop_track_feed (TrackFeedTask * feed)
+{
+  g_return_if_fail (feed != NULL);
+  gst_media_source_track_flush (feed->track);
+  g_atomic_int_set (&feed->cancelled, TRUE);
+  gst_task_join (feed->task);
+}
+
+static void
+start_track_feed (TrackFeedTask * feed)
+{
+  g_return_if_fail (feed != NULL);
+  g_atomic_int_set (&feed->cancelled, FALSE);
+  gst_media_source_track_resume (feed->track);
+  gst_task_start (feed->task);
+}
+
+static void
+reset_track_feed (TrackFeedTask * feed)
+{
+  stop_track_feed (feed);
+  start_track_feed (feed);
+}
+
+static gboolean
+is_within_append_window (GstSourceBuffer * self, GstSample * sample)
+{
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  GstClockTime start = GST_BUFFER_PTS (buffer);
+  GstClockTime end = start + GST_BUFFER_DURATION (buffer);
+
+  if (start < self->append_window_start) {
+    return FALSE;
+  }
+
+  if (!GST_CLOCK_TIME_IS_VALID (self->append_window_end)) {
+    return TRUE;
+  }
+
+  return end <= self->append_window_end;
+}
+
+static void
+on_new_sample (GstAppendPipeline * pipeline, GstMediaSourceTrack * track,
+    GstSample * sample, gpointer user_data)
+{
+  GstSourceBuffer *self = GST_SOURCE_BUFFER (user_data);
+
+  g_return_if_fail (self->processed_init_segment);
+
+  GST_OBJECT_LOCK (self);
+
+  if (is_within_append_window (self, sample)) {
+    GstMediaSourceTrackBuffer *track_buffer = get_track_buffer (self, track);
+    GST_TRACE_OBJECT (self, "new sample on %s with %" GST_PTR_FORMAT,
+        gst_media_source_track_get_id (track), gst_sample_get_buffer (sample));
+    gst_media_source_track_buffer_add (track_buffer, sample);
+    TrackFeedTask *feed = get_track_feed (self, track);
+    start_track_feed (feed);
+  }
+
+  GST_OBJECT_UNLOCK (self);
+
+  update_msesrc_ready_state (self);
+}
+
+static void
+call_received_init_segment (GstSourceBuffer * self)
+{
+  GstSourceBufferCallbacks *callbacks = &self->callbacks.callbacks;
+  if (callbacks->received_init_segment) {
+    callbacks->received_init_segment (self, self->callbacks.user_data);
+  }
+}
+
+static void
+call_duration_changed (GstSourceBuffer * self)
+{
+  GstSourceBufferCallbacks *callbacks = &self->callbacks.callbacks;
+  if (callbacks->duration_changed) {
+    callbacks->duration_changed (self, self->callbacks.user_data);
+  }
+}
+
+static void
+call_active_state_changed (GstSourceBuffer * self)
+{
+  GstSourceBufferCallbacks *callbacks = &self->callbacks.callbacks;
+  if (callbacks->active_state_changed) {
+    callbacks->active_state_changed (self, self->callbacks.user_data);
+  }
+}
+
+static void
+update_track_buffer_modes (GstSourceBuffer * self)
+{
+  GHashTableIter iter;
+  g_hash_table_iter_init (&iter, self->track_buffers);
+  gboolean enabled =
+      self->append_mode == GST_SOURCE_BUFFER_APPEND_MODE_SEQUENCE;
+  for (gpointer value; g_hash_table_iter_next (&iter, NULL, &value);) {
+    GstMediaSourceTrackBuffer *buffer = GST_MEDIA_SOURCE_TRACK_BUFFER (value);
+    gst_media_source_track_buffer_process_init_segment (buffer, enabled);
+    gst_media_source_track_buffer_set_group_start (buffer,
+        self->timestamp_offset);
+  }
+}
+
+static void
+on_received_init_segment (GstAppendPipeline * pipeline, gpointer user_data)
+{
+  GstSourceBuffer *self = GST_SOURCE_BUFFER (user_data);
+  GST_DEBUG_OBJECT (self, "got init segment, have duration %" GST_TIME_FORMAT,
+      GST_TIME_ARGS (gst_append_pipeline_get_duration (pipeline)));
+
+  GST_OBJECT_LOCK (self);
+
+  if (!self->processed_init_segment) {
+    GST_DEBUG_OBJECT (self, "processing first init segment");
+
+    GPtrArray *audio_tracks = gst_append_pipeline_get_audio_tracks (pipeline);
+    GPtrArray *text_tracks = gst_append_pipeline_get_text_tracks (pipeline);
+    GPtrArray *video_tracks = gst_append_pipeline_get_video_tracks (pipeline);
+
+    g_ptr_array_foreach (audio_tracks, (GFunc) add_track_buffer, self);
+    g_ptr_array_foreach (text_tracks, (GFunc) add_track_buffer, self);
+    g_ptr_array_foreach (video_tracks, (GFunc) add_track_buffer, self);
+  }
+
+  self->processed_init_segment = TRUE;
+
+  update_track_buffer_modes (self);
+
+  GST_OBJECT_UNLOCK (self);
+
+  call_received_init_segment (self);
+  call_active_state_changed (self);
+}
+
+static guint
+track_buffer_hash (GstMediaSourceTrack * track)
+{
+  return g_str_hash (gst_media_source_track_get_id (track));
+}
+
+static gboolean
+track_buffer_equal (GstMediaSourceTrack * a, GstMediaSourceTrack * b)
+{
+  return g_str_equal (gst_media_source_track_get_id (a),
+      gst_media_source_track_get_id (b));
+}
+
+static void
+gst_source_buffer_init (GstSourceBuffer * self)
+{
+
+  self->append_mode = DEFAULT_APPEND_MODE;
+  self->append_window_start = 0;
+  self->append_window_end = GST_CLOCK_TIME_NONE;
+  self->content_type = NULL;
+  self->timestamp_offset = 0;
+  self->updating = FALSE;
+  self->errored = FALSE;
+  self->size_limit = DEFAULT_BUFFER_SIZE;
+  self->size = 0;
+  self->pending_data = NULL;
+  self->processed_init_segment = FALSE;
+  self->event_queue =
+      gst_mse_event_queue_new ((GstMseEventQueueCallback) dispatch_event, self);
+
+  g_rec_mutex_init (&self->append_to_buffer_lock);
+  self->append_to_buffer_task = gst_task_new (
+      (GstTaskFunction) append_to_buffer_task, self, NULL);
+  gst_task_set_lock (self->append_to_buffer_task, &self->append_to_buffer_lock);
+  self->track_buffers = g_hash_table_new_full ((GHashFunc) track_buffer_hash,
+      (GEqualFunc) track_buffer_equal, NULL, gst_object_unref);
+
+  self->track_feeds = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+      NULL, (GDestroyNotify) clear_track_feed);
+  self->seek_time = 0;
+  self->callbacks.callbacks.duration_changed = NULL;
+  self->callbacks.user_data = NULL;
+}
+
+static inline gboolean
+is_removed (GstSourceBuffer * self)
+{
+  GstObject *parent = gst_object_get_parent (GST_OBJECT (self));
+  if (parent == NULL) {
+    return TRUE;
+  }
+  gst_object_unref (parent);
+
+  GstMediaSource *source = get_media_source (self);
+  GstSourceBufferList *buffers = gst_media_source_get_source_buffers (source);
+  gboolean removed = !gst_source_buffer_list_contains (buffers, self);
+
+  gst_object_unref (source);
+  gst_object_unref (buffers);
+
+  return removed;
+}
+
+static inline gboolean
+is_updating (GstSourceBuffer * self)
+{
+  return g_atomic_int_get (&self->updating);
+}
+
+static inline void
+set_updating (GstSourceBuffer * self)
+{
+  g_atomic_int_set (&self->updating, TRUE);
+}
+
+static inline void
+clear_updating (GstSourceBuffer * self)
+{
+  g_atomic_int_set (&self->updating, FALSE);
+}
+
+static inline gboolean
+is_errored (GstSourceBuffer * self)
+{
+  return g_atomic_int_get (&self->errored);
+}
+
+static inline void
+set_errored (GstSourceBuffer * self)
+{
+  g_atomic_int_set (&self->errored, TRUE);
+}
+
+static inline void
+clear_errored (GstSourceBuffer * self)
+{
+  g_atomic_int_set (&self->errored, FALSE);
+}
+
+static inline gboolean
+is_ended (GstSourceBuffer * self)
+{
+  if (is_removed (self)) {
+    return TRUE;
+  }
+
+  GstMediaSource *source = get_media_source (self);
+  gboolean ended = gst_media_source_get_ready_state (source) ==
+      GST_MEDIA_SOURCE_READY_STATE_ENDED;
+
+  gst_object_unref (source);
+
+  return ended;
+}
+
+static void
+open_parent (GstSourceBuffer * self)
+{
+  g_return_if_fail (!is_removed (self));
+  GstMediaSource *source = get_media_source (self);
+  gst_media_source_open (source);
+  gst_object_unref (source);
+}
+
+/**
+ * gst_source_buffer_get_append_mode:
+ * @self: #GstSourceBuffer instance
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-mode)
+ *
+ * Returns: The current #GstSourceBufferAppendMode
+ * Since: 1.24
+ */
+GstSourceBufferAppendMode
+gst_source_buffer_get_append_mode (GstSourceBuffer * self)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), DEFAULT_APPEND_MODE);
+  return self->append_mode;
+}
+
+/**
+ * gst_source_buffer_set_append_mode:
+ * @self: #GstSourceBuffer instance
+ * @mode: #GstSourceBufferAppendMode the desired Append Mode
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Changes the Append Mode of @self. This influences what timestamps will be
+ * assigned to media processed by this Source Buffer. In Segment mode, the
+ * timestamps in each segment determine the position of each sample after it
+ * is processed. In Sequence mode, the timestamp of each processed sample is
+ * generated based on the end of the most recently processed segment.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-mode)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_source_buffer_set_append_mode (GstSourceBuffer * self,
+    GstSourceBufferAppendMode mode, GError ** error)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), FALSE);
+
+  if (is_removed (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "buffer is removed");
+    return FALSE;
+  }
+
+  if (is_updating (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "buffer is still updating");
+    return FALSE;
+  }
+
+  if (self->generate_timestamps && mode ==
+      GST_SOURCE_BUFFER_APPEND_MODE_SEGMENTS) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_TYPE,
+        "cannot change to segments mode while generate timestamps is active");
+    return FALSE;
+  }
+
+  if (is_ended (self)) {
+    open_parent (self);
+  }
+
+  self->append_mode = mode;
+  g_object_notify_by_pspec (G_OBJECT (self), propertiesPROP_APPEND_MODE);
+  return TRUE;
+}
+
+/**
+ * gst_source_buffer_get_append_window_start:
+ * @self: #GstSourceBuffer instance
+ *
+ * Returns the current append window start time. Any segment processed that ends
+ * earlier than this value will be ignored.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-appendwindowstart)
+ *
+ * Returns: The current Append Window start time as a #GstClockTime
+ * Since: 1.24
+ */
+GstClockTime
+gst_source_buffer_get_append_window_start (GstSourceBuffer * self)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), GST_CLOCK_TIME_NONE);
+  return self->append_window_start;
+}
+
+/**
+ * gst_source_buffer_set_append_window_start:
+ * @self: #GstSourceBuffer instance
+ * @start: the append window end
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Modifies the current append window start of @self. If successful, samples
+ * processed after setting this value that end before this point will be
+ * ignored.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-appendwindowstart)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_source_buffer_set_append_window_start (GstSourceBuffer * self,
+    GstClockTime start, GError ** error)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), FALSE);
+
+  if (is_removed (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "append window start cannot be set on source buffer "
+        "with no media source");
+    return FALSE;
+  }
+
+  if (is_updating (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "append window start cannot be set on source buffer while updating");
+    return FALSE;
+  }
+
+  if (start < 0 || start <= self->append_window_end) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_TYPE,
+        "append window start must be between zero and append window end");
+    return FALSE;
+  }
+
+  self->append_window_start = start;
+  g_object_notify_by_pspec (G_OBJECT (self),
+      propertiesPROP_APPEND_WINDOW_START);
+  return TRUE;
+}
+
+/**
+ * gst_source_buffer_get_append_window_end:
+ * @self: #GstSourceBuffer instance
+ *
+ * Returns the current append window end time. Any segment processed that starts
+ * after this value will be ignored.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-appendwindowend)
+ *
+ * Returns: The current Append Window end time as a #GstClockTime
+ * Since: 1.24
+ */
+GstClockTime
+gst_source_buffer_get_append_window_end (GstSourceBuffer * self)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), GST_CLOCK_TIME_NONE);
+  return self->append_window_end;
+}
+
+/**
+ * gst_source_buffer_set_append_window_end:
+ * @self: #GstSourceBuffer instance
+ * @end: the append window end
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Modifies the current append window end of @self. If successful, samples
+ * processed after setting this value that start after this point will be
+ * ignored.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-appendwindowend)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_source_buffer_set_append_window_end (GstSourceBuffer * self,
+    GstClockTime end, GError ** error)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), FALSE);
+
+  if (is_removed (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "append window end cannot be set on source buffer "
+        "with no media source");
+    return FALSE;
+  }
+
+  if (is_updating (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "append window end cannot be set on source buffer while updating");
+    return FALSE;
+  }
+
+  if (end <= self->append_window_start) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_TYPE,
+        "append window end must be after append window start");
+    return FALSE;
+  }
+
+  self->append_window_end = end;
+  g_object_notify_by_pspec (G_OBJECT (self),
+      propertiesPROP_APPEND_WINDOW_END);
+  return TRUE;
+}
+
+static gboolean
+get_intersection (GstMediaSourceRange * a, GstMediaSourceRange * b,
+    GstMediaSourceRange * intersection)
+{
+  g_return_val_if_fail (a != NULL, FALSE);
+  g_return_val_if_fail (b != NULL, FALSE);
+  g_return_val_if_fail (intersection != NULL, FALSE);
+  GstMediaSourceRange range = {
+    .start = MAX (a->start, b->start),
+    .end = MIN (a->end, b->end),
+  };
+  if (range.start >= range.end) {
+    return FALSE;
+  }
+  *intersection = range;
+  return TRUE;
+}
+
+static GArray *
+intersect_ranges (GstMediaSourceRange * a, GstMediaSourceRange * a_end,
+    GstMediaSourceRange * b, GstMediaSourceRange * b_end)
+{
+  GArray *intersection = g_array_new_ranges ();
+  while (a < a_end && b < b_end) {
+    GstMediaSourceRange range;
+    if (!get_intersection (a, b, &range)) {
+      if (a->end < b->end) {
+        a++;
+      } else {
+        b++;
+      }
+      continue;
+    }
+
+    if (a->end < b->end) {
+      a++;
+    } else {
+      b++;
+    }
+
+    g_array_append_val (intersection, range);
+  }
+  return intersection;
+}
+
+static inline gboolean
+contributes_to_buffered (GstMediaSourceTrack * track)
+{
+  switch (gst_media_source_track_get_track_type (track)) {
+    case GST_MEDIA_SOURCE_TRACK_TYPE_AUDIO:
+    case GST_MEDIA_SOURCE_TRACK_TYPE_VIDEO:
+      return TRUE;
+    default:
+      return FALSE;
+  }
+}
+
+/**
+ * gst_source_buffer_get_buffered:
+ * @self: #GstSourceBuffer instance
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Returns a sequence of #GstMediaSourceRange values representing which segments
+ * of @self are buffered in memory.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-buffered)
+ *
+ * Returns: (transfer full) (element-type GstMediaSourceRange): a #GArray of #GstMediaSourceRange values.
+ * Since: 1.24
+ */
+GArray *
+gst_source_buffer_get_buffered (GstSourceBuffer * self, GError ** error)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), NULL);
+  GHashTableIter iter;
+  GArray *buffered = NULL;
+  g_hash_table_iter_init (&iter, self->track_buffers);
+  for (gpointer key, value; g_hash_table_iter_next (&iter, &key, &value);) {
+    GstMediaSourceTrack *track = GST_MEDIA_SOURCE_TRACK (key);
+    GstMediaSourceTrackBuffer *buffer = GST_MEDIA_SOURCE_TRACK_BUFFER (value);
+    if (!contributes_to_buffered (track)) {
+      continue;
+    }
+    GArray *current_ranges = gst_media_source_track_buffer_get_ranges (buffer);
+    if (buffered == NULL) {
+      buffered = current_ranges;
+      continue;
+    }
+    GArray *intersection = intersect_ranges (
+        (GstMediaSourceRange *) buffered->data,
+        ((GstMediaSourceRange *) buffered->data) + buffered->len,
+        (GstMediaSourceRange *) current_ranges->data,
+        ((GstMediaSourceRange *) current_ranges->data) + current_ranges->len);
+    g_array_unref (buffered);
+    buffered = intersection;
+  }
+  if (buffered == NULL) {
+    return g_array_new_ranges ();
+  } else {
+    return buffered;
+  }
+}
+
+/**
+ * gst_source_buffer_get_content_type:
+ * @self: #GstSourceBuffer instance
+ *
+ * Returns the current content type of @self.
+ *
+ * Returns: (transfer full): a string representing the content type
+ * Since: 1.24
+ */
+gchar *
+gst_source_buffer_get_content_type (GstSourceBuffer * self)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), NULL);
+
+  GST_OBJECT_LOCK (self);
+  gchar *content_type = g_strdup (self->content_type);
+  GST_OBJECT_UNLOCK (self);
+
+  return content_type;
+}
+
+/**
+ * gst_source_buffer_change_content_type:
+ * @self: #GstSourceBuffer instance
+ * @type: (transfer none): the desired content type
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Attempts to change the content type of @self to @type. Any new data appended
+ * to the Source Buffer must be of the supplied @type afterward.
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_source_buffer_change_content_type (GstSourceBuffer * self,
+    const gchar * type, GError ** error)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), FALSE);
+
+  if (type == NULL || g_strcmp0 (type, "") == 0) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_TYPE,
+        "content type must not be empty");
+    return FALSE;
+  }
+
+  if (is_removed (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "content type cannot be set on source buffer with no media source");
+    return FALSE;
+  }
+
+  if (is_updating (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "content type cannot be set on source buffer that is updating");
+    return FALSE;
+  }
+
+  g_set_error (error,
+      GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_NOT_SUPPORTED,
+      "content type cannot be changed");
+  return FALSE;
+}
+
+/**
+ * gst_source_buffer_remove:
+ * @self: #GstSourceBuffer instance
+ * @start: The beginning timestamp of data to remove
+ * @end: The end timestamp of data to remove
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Attempts to remove any parsed data between @start and @end from @self.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-remove)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_source_buffer_remove (GstSourceBuffer * self, GstClockTime start,
+    GstClockTime end, GError ** error)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), FALSE);
+  return TRUE;
+}
+
+/**
+ * gst_source_buffer_get_timestamp_offset:
+ * @self: #GstSourceBuffer instance
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-timestampoffset)
+ *
+ * Returns: The current timestamp offset as a #GstClockTime
+ * Since: 1.24
+ */
+GstClockTime
+gst_source_buffer_get_timestamp_offset (GstSourceBuffer * self)
+{
+  return self->timestamp_offset;
+}
+
+/**
+ * gst_source_buffer_set_timestamp_offset:
+ * @self: #GstSourceBuffer instance
+ * @offset: The new timestamp offset
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Attempt to set the timestamp offset of @self. Any media processed after this
+ * value is set will have this value added to its start time.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-timestampoffset)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_source_buffer_set_timestamp_offset (GstSourceBuffer * self, GstClockTime
+    offset, GError ** error)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), FALSE);
+  if (is_removed (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "source buffer is removed");
+    return FALSE;
+  }
+  if (is_updating (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "source buffer is still updating");
+    return FALSE;
+  }
+  if (is_ended (self)) {
+    GstMediaSource *parent = get_media_source (self);
+    gst_media_source_open (parent);
+    gst_clear_object (&parent);
+  }
+  GST_OBJECT_LOCK (self);
+  GHashTableIter iter;
+  g_hash_table_iter_init (&iter, self->track_buffers);
+  for (gpointer value; g_hash_table_iter_next (&iter, NULL, &value);) {
+    GstMediaSourceTrackBuffer *buffer = value;
+    gst_media_source_track_buffer_set_group_start (buffer, offset);
+  }
+  self->timestamp_offset = offset;
+  GST_OBJECT_UNLOCK (self);
+  g_object_notify_by_pspec (G_OBJECT (self), propertiesPROP_TIMESTAMP_OFFSET);
+  return TRUE;
+}
+
+/**
+ * gst_source_buffer_get_updating:
+ * @self: #GstSourceBuffer instance
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-updating)
+ *
+ * Returns: Whether @self is currently adding or removing media content.
+ * Since: 1.24
+ */
+gboolean
+gst_source_buffer_get_updating (GstSourceBuffer * self)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), FALSE);
+  return is_updating (self);
+}
+
+static gsize
+compute_total_size_unlocked (GstSourceBuffer * self)
+{
+  GHashTableIter iter;
+  g_hash_table_iter_init (&iter, self->track_buffers);
+  gsize total_size = 0;
+  for (gpointer value; g_hash_table_iter_next (&iter, NULL, &value);) {
+    GstMediaSourceTrackBuffer *buffer = value;
+    total_size += gst_media_source_track_buffer_get_storage_size (buffer);
+  }
+  return total_size;
+}
+
+static gboolean
+will_overflow (GstSourceBuffer * self, gsize bytes)
+{
+  GST_OBJECT_LOCK (self);
+  gsize total = compute_total_size_unlocked (self);
+  GST_OBJECT_UNLOCK (self);
+  return total + bytes > self->size_limit;
+}
+
+static void
+evict_coded_frames (GstSourceBuffer * self, gsize space_required,
+    gsize size_limit, GstClockTime position, GstClockTime duration)
+{
+  if (!will_overflow (self, space_required)) {
+    return;
+  }
+
+  if (!GST_CLOCK_TIME_IS_VALID (position)) {
+    GST_ERROR ("invalid position, cannot delete anything");
+    return;
+  }
+
+  GstClockTime min_distance_from_position = GST_SECOND * 5;
+  GstClockTime max_dts = position > min_distance_from_position ?
+      position - min_distance_from_position : 0;
+
+  GST_DEBUG_OBJECT (self, "position=%" GST_TIMEP_FORMAT
+      ", attempting removal from 0 to %" GST_TIMEP_FORMAT, &position, &max_dts);
+
+  GST_OBJECT_LOCK (self);
+  GHashTableIter iter;
+  g_hash_table_iter_init (&iter, self->track_buffers);
+  for (gpointer value; g_hash_table_iter_next (&iter, NULL, &value);) {
+    GstMediaSourceTrackBuffer *buffer = value;
+    gst_media_source_track_buffer_remove_range (buffer, 0, max_dts);
+  }
+  self->size = compute_total_size_unlocked (self);
+  GST_OBJECT_UNLOCK (self);
+
+  GST_DEBUG_OBJECT (self, "capacity=%" G_GSIZE_FORMAT "/%" G_GSIZE_FORMAT
+      "(%" G_GSIZE_FORMAT "%%)", self->size, self->size_limit,
+      self->size * 100 / size_limit);
+}
+
+static void
+reset_parser_state (GstSourceBuffer * self)
+{
+  clear_pending_data (self);
+  if (gst_append_pipeline_reset (self->append_pipeline)) {
+    clear_errored (self);
+  } else {
+    set_errored (self);
+  }
+}
+
+static void
+append_error (GstSourceBuffer * self)
+{
+  gst_task_stop (self->append_to_buffer_task);
+  reset_parser_state (self);
+  clear_updating (self);
+
+  if (is_removed (self)) {
+    return;
+  }
+
+  schedule_event (self, ON_ERROR);
+  schedule_event (self, ON_UPDATE_END);
+
+  GstMediaSource *source = get_media_source (self);
+  gst_media_source_end_of_stream (source, GST_MEDIA_SOURCE_EOS_ERROR_DECODE,
+      NULL);
+  gst_object_unref (source);
+}
+
+static void
+append_successful (GstSourceBuffer * self, gboolean ended)
+{
+  gst_task_stop (self->append_to_buffer_task);
+  clear_updating (self);
+  schedule_event (self, ON_UPDATE);
+  schedule_event (self, ON_UPDATE_END);
+}
+
+static gboolean
+encountered_bad_bytes (GstSourceBuffer * self)
+{
+  return gst_append_pipeline_get_failed (self->append_pipeline);
+}
+
+static void
+append_to_buffer_task (GstSourceBuffer * self)
+{
+  if (is_removed (self)) {
+    append_successful (self, TRUE);
+    return;
+  }
+
+  if (encountered_bad_bytes (self)) {
+    append_error (self);
+    return;
+  }
+
+  GstBuffer *pending_data = take_pending_data (self);
+
+  if (!GST_IS_BUFFER (pending_data)) {
+    GST_LOG_OBJECT (self, "no pending data");
+    append_successful (self, is_ended (self));
+    return;
+  }
+
+  GstFlowReturn result = gst_append_pipeline_append (self->append_pipeline,
+      pending_data);
+
+  if (result != GST_FLOW_OK) {
+    GST_ERROR_OBJECT (self, "failed to append: %s", gst_flow_get_name (result));
+    append_error (self);
+    return;
+  }
+
+  append_successful (self, is_ended (self));
+}
+
+static gboolean
+track_feed_fold (const GValue * item, TrackFeedAccumulator * acc,
+    TrackFeedTask * feed)
+{
+  GstSample *sample = gst_sample_ref (gst_value_get_sample (item));
+  GstClockTime dts = GST_BUFFER_DTS (gst_sample_get_buffer (sample));
+  acc->n_samples++;
+  acc->current_dts = dts;
+  gst_clear_sample (&acc->current_sample);
+  acc->current_sample = gst_sample_ref (sample);
+  if (gst_media_source_track_push (feed->track, sample)) {
+    return TRUE;
+  } else {
+    gst_sample_unref (sample);
+    return FALSE;
+  }
+}
+
+static void
+track_feed_task (TrackFeedTask * feed)
+{
+  GstSourceBuffer *self = feed->parent;
+  GstMediaSourceTrack *track = feed->track;
+  GstMediaSourceTrackBuffer *buffer = feed->buffer;
+  GstClockTime time = feed->parent->seek_time;
+  const gchar *track_id = gst_media_source_track_get_id (track);
+
+  GST_DEBUG_OBJECT (self, "%s: feed starting@%" GST_TIMEP_FORMAT, track_id,
+      &time);
+
+  TrackFeedAccumulator acc = {
+    .n_samples = 0,
+    .current_dts = time,
+    .current_sample = NULL,
+  };
+  while (TRUE) {
+    gboolean eos = gst_media_source_track_buffer_is_eos (buffer);
+    GstIterator *it = gst_media_source_track_buffer_iter_samples (buffer,
+        acc.current_dts, acc.current_sample);
+    while (TRUE) {
+      GstIteratorResult fold_result = gst_iterator_fold (it,
+          (GstIteratorFoldFunction) track_feed_fold, (GValue *) & acc, feed);
+      if (fold_result != GST_ITERATOR_RESYNC) {
+        break;
+      }
+      if (g_atomic_int_get (&feed->cancelled)) {
+        break;
+      }
+      gst_iterator_resync (it);
+    }
+    gst_iterator_free (it);
+
+    if (eos) {
+      GST_DEBUG_OBJECT (self, "%s: enqueued all %" G_GSIZE_FORMAT " samples",
+          track_id, acc.n_samples);
+      gst_media_source_track_push_eos (track);
+      GST_DEBUG_OBJECT (self, "%s: marked EOS", track_id);
+      gst_task_stop (feed->task);
+      break;
+    }
+
+    if (g_atomic_int_get (&feed->cancelled)) {
+      GST_DEBUG_OBJECT (self, "feed is cancelled, stopping task");
+      gst_task_stop (feed->task);
+      break;
+    }
+
+    GST_DEBUG_OBJECT (self, "%s: resume after %" G_GSIZE_FORMAT " samples",
+        track_id, acc.n_samples);
+    gint64 deadline = g_get_monotonic_time () + G_TIME_SPAN_SECOND;
+    gst_media_source_track_buffer_await_eos_until (buffer, deadline);
+  }
+
+  gst_clear_sample (&acc.current_sample);
+}
+
+static void
+dispatch_event (SourceBufferEventItem * item, GstSourceBuffer * self)
+{
+  g_signal_emit (self, signalsitem->event, 0);
+}
+
+static void
+schedule_event (GstSourceBuffer * self, SourceBufferEvent event)
+{
+  g_return_if_fail (event < N_SIGNALS);
+  if (is_removed (self)) {
+    return;
+  }
+  SourceBufferEventItem item = {
+    .item = {.destroy = g_free,.visible = TRUE,.size = 1,.object = NULL},
+    .event = event,
+  };
+  gst_mse_event_queue_push (self->event_queue, g_memdup2 (&item,
+          sizeof (SourceBufferEventItem)));
+}
+
+static void
+schedule_append_to_buffer_task (GstSourceBuffer * self)
+{
+  GstTask *task = self->append_to_buffer_task;
+  g_return_if_fail (GST_IS_TASK (task));
+  g_return_if_fail (gst_task_get_state (task) != GST_TASK_STARTED);
+  gst_task_start (task);
+}
+
+static void
+update_msesrc_ready_state (GstSourceBuffer * self)
+{
+  GstMseSrc *element = get_msesrc (self);
+  if (element == NULL) {
+    return;
+  }
+  gst_mse_src_update_ready_state (element);
+  gst_object_unref (element);
+}
+
+/**
+ * gst_source_buffer_append_buffer:
+ * @self: #GstSourceBuffer instance
+ * @buf: (transfer full):The media data to append
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Schedules the bytes inside @buf to be processed by @self. When it is possible
+ * to accept the supplied data, it will be processed asynchronously and fill in
+ * the track buffers for playback purposes.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-appendbuffer)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_source_buffer_append_buffer (GstSourceBuffer * self, GstBuffer * buf,
+    GError ** error)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), FALSE);
+  g_return_val_if_fail (GST_IS_BUFFER (buf), FALSE);
+
+  if (is_removed (self) || is_updating (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "source buffer is removed or still updating");
+    return FALSE;
+  }
+
+  if (is_errored (self)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "source buffer has encountered error");
+    return FALSE;
+  }
+
+  if (is_ended (self)) {
+    open_parent (self);
+  }
+
+  GstMediaSource *source = get_media_source (self);
+  gsize buffer_size = gst_buffer_get_size (buf);
+  GstClockTime position = gst_media_source_get_position (source);
+  GstClockTime duration = gst_media_source_get_duration (source);
+
+  gst_object_unref (source);
+
+  evict_coded_frames (self, buffer_size, self->size_limit, position, duration);
+
+  if (will_overflow (self, buffer_size)) {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_QUOTA_EXCEEDED,
+        "buffer is full");
+    return FALSE;
+  }
+
+  g_return_val_if_fail (self->pending_data == NULL, FALSE);
+
+  set_pending_data (self, buf);
+  set_updating (self);
+
+  schedule_event (self, ON_UPDATE_START);
+  schedule_append_to_buffer_task (self);
+
+  return TRUE;
+}
+
+/**
+ * gst_source_buffer_abort:
+ * @self: #GstSourceBuffer instance
+ * @error: (out) (optional) (nullable) (transfer full): the resulting error or `NULL`
+ *
+ * Attempts to end any processing of the currently pending data and reset the
+ * media parser.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebuffer-abort)
+ *
+ * Returns: `TRUE` on success, `FALSE` otherwise
+ * Since: 1.24
+ */
+gboolean
+gst_source_buffer_abort (GstSourceBuffer * self, GError ** error)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), FALSE);
+  if (gst_append_pipeline_eos (self->append_pipeline) == GST_FLOW_OK) {
+    return TRUE;
+  } else {
+    g_set_error (error,
+        GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_INVALID_STATE,
+        "failed to abort source buffer");
+    return FALSE;
+  }
+}
+
+gboolean
+gst_source_buffer_has_init_segment (GstSourceBuffer * self)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), FALSE);
+  return gst_append_pipeline_has_init_segment (self->append_pipeline);
+}
+
+static gboolean
+is_buffered_fold (const GValue * item, IsBufferedAccumulator * acc,
+    GstSourceBuffer * self)
+{
+  GstSample *sample = gst_value_get_sample (item);
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  GstClockTime buffer_start = GST_BUFFER_DTS (buffer);
+  GstClockTime buffer_end = buffer_start + GST_BUFFER_DURATION (buffer);
+  if (acc->time < buffer_start) {
+    GST_TRACE_OBJECT (self, "position precedes buffer start, done");
+    acc->buffered = FALSE;
+    return FALSE;
+  }
+  if (acc->time >= buffer_start && acc->time < buffer_end) {
+    GST_TRACE_OBJECT (self, "position is within buffer, done");
+    acc->buffered = TRUE;
+    return FALSE;
+  }
+  return TRUE;
+}
+
+gboolean
+gst_source_buffer_is_buffered (GstSourceBuffer * self, GstClockTime time)
+{
+  GHashTableIter iter;
+  gboolean buffered = TRUE;
+  g_hash_table_iter_init (&iter, self->track_buffers);
+  for (gpointer key, value;
+      buffered && g_hash_table_iter_next (&iter, &key, &value);) {
+    GstMediaSourceTrack *track = key;
+    if (!gst_media_source_track_get_active (track)) {
+      continue;
+    }
+    GstMediaSourceTrackBuffer *track_buffer = value;
+    IsBufferedAccumulator acc = {
+      .time = time,
+      .buffered = FALSE,
+    };
+    GstIterator *iter =
+        gst_media_source_track_buffer_iter_samples (track_buffer, time, NULL);
+    while (gst_iterator_fold (iter, (GstIteratorFoldFunction) is_buffered_fold,
+            (GValue *) & acc, self) == GST_ITERATOR_RESYNC) {
+      gst_iterator_resync (iter);
+    }
+    gst_iterator_free (iter);
+    buffered = acc.buffered;
+  }
+  return buffered;
+}
+
+static gboolean
+is_range_buffered_fold (const GValue * item, IsRangeBufferedAccumulator * acc,
+    GstSourceBuffer * self)
+{
+  GstSample *sample = gst_value_get_sample (item);
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  GstClockTime buffer_start = GST_BUFFER_DTS (buffer);
+  GstClockTime buffer_end = buffer_start + GST_BUFFER_DURATION (buffer);
+
+  GstClockTime start = acc->start;
+  GstClockTime end = acc->end;
+
+  if (!acc->start_buffered) {
+    if (start < buffer_start) {
+      GST_TRACE_OBJECT (self, "start position precedes buffer start, done");
+      return FALSE;
+    }
+    if (start >= buffer_start && start < buffer_end) {
+      GST_TRACE_OBJECT (self, "start position is within buffer, checking end");
+      acc->start_buffered = TRUE;
+      return TRUE;
+    }
+  } else {
+    if (end < buffer_start) {
+      GST_TRACE_OBJECT (self, "end position precedes buffer start, done");
+      return FALSE;
+    }
+    if (end <= buffer_end) {
+      GST_TRACE_OBJECT (self, "end position is within buffer, done");
+      acc->end_buffered = TRUE;
+      return FALSE;
+    }
+  }
+
+  return TRUE;
+}
+
+gboolean
+gst_source_buffer_is_range_buffered (GstSourceBuffer * self, GstClockTime start,
+    GstClockTime end)
+{
+  GHashTableIter iter;
+  gboolean buffered = TRUE;
+  g_hash_table_iter_init (&iter, self->track_buffers);
+  for (gpointer key, value;
+      buffered && g_hash_table_iter_next (&iter, &key, &value);) {
+    GstMediaSourceTrack *track = key;
+    if (!gst_media_source_track_get_active (track)) {
+      continue;
+    }
+    GstMediaSourceTrackBuffer *track_buffer = value;
+    IsRangeBufferedAccumulator acc = {
+      .start = start,
+      .end = end,
+      .start_buffered = FALSE,
+      .end_buffered = FALSE,
+    };
+    GstIterator *iter =
+        gst_media_source_track_buffer_iter_samples (track_buffer, start, NULL);
+    while (gst_iterator_fold (iter,
+            (GstIteratorFoldFunction) is_range_buffered_fold, (GValue *) & acc,
+            self) == GST_ITERATOR_RESYNC) {
+      gst_iterator_resync (iter);
+    }
+    buffered = acc.end_buffered;
+    gst_iterator_free (iter);
+  }
+  return buffered;
+}
+
+GstClockTime
+gst_source_buffer_get_duration (GstSourceBuffer * self)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), GST_CLOCK_TIME_NONE);
+  return gst_append_pipeline_get_duration (self->append_pipeline);
+}
+
+void
+gst_source_buffer_teardown (GstSourceBuffer * self)
+{
+  reset_parser_state (self);
+  clear_updating (self);
+}
+
+GPtrArray *
+gst_source_buffer_get_all_tracks (GstSourceBuffer * self)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (self), NULL);
+
+  GPtrArray *tracks = g_ptr_array_new ();
+
+  GPtrArray *audio_tracks = gst_append_pipeline_get_audio_tracks
+      (self->append_pipeline);
+  GPtrArray *text_tracks = gst_append_pipeline_get_text_tracks
+      (self->append_pipeline);
+  GPtrArray *video_tracks = gst_append_pipeline_get_video_tracks
+      (self->append_pipeline);
+
+  if (audio_tracks) {
+    g_ptr_array_extend (tracks, audio_tracks, NULL, NULL);
+  }
+  if (text_tracks) {
+    g_ptr_array_extend (tracks, text_tracks, NULL, NULL);
+  }
+  if (video_tracks) {
+    g_ptr_array_extend (tracks, video_tracks, NULL, NULL);
+  }
+
+  return tracks;
+}
+
+static void
+seek_track_buffer (GstMediaSourceTrack * track,
+    GstMediaSourceTrackBuffer * buffer, GstSourceBuffer * self)
+{
+  TrackFeedTask *feed = get_track_feed (self, track);
+
+  const gchar *track_id = gst_media_source_track_get_id (track);
+  GST_DEBUG_OBJECT (self, "%s: seeking", track_id);
+  reset_track_feed (feed);
+  GST_DEBUG_OBJECT (self, "%s: restarted track feed", track_id);
+}
+
+void
+gst_source_buffer_seek (GstSourceBuffer * self, GstClockTime time)
+{
+  g_return_if_fail (GST_IS_SOURCE_BUFFER (self));
+  g_return_if_fail (GST_CLOCK_TIME_IS_VALID (time));
+  self->seek_time = time;
+  g_hash_table_foreach (self->track_buffers, (GHFunc) seek_track_buffer, self);
+}
+
+gboolean
+gst_source_buffer_get_active (GstSourceBuffer * self)
+{
+  gboolean active = FALSE;
+  GHashTableIter iter;
+  GST_OBJECT_LOCK (self);
+  g_hash_table_iter_init (&iter, self->track_buffers);
+  for (gpointer key; !active && g_hash_table_iter_next (&iter, &key, NULL);) {
+    GstMediaSourceTrack *track = GST_MEDIA_SOURCE_TRACK (key);
+    active |= gst_media_source_track_get_active (track);
+  }
+  GST_OBJECT_UNLOCK (self);
+  return active;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstsourcebuffer.h Added

@@ -0,0 +1,127 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Orange
+ * Copyright (C) 2013-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 Sebastian Dröge <sebastian@centricular.com>
+ * Copyright (C) 2015, 2016, 2017 Igalia, S.L
+ * Copyright (C) 2015, 2016, 2017 Metrological Group B.V.
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <glib-object.h>
+#include <gst/mse/mse-prelude.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GstSourceBufferAppendMode:
+ * @GST_SOURCE_BUFFER_APPEND_MODE_SEGMENTS:
+ * @GST_SOURCE_BUFFER_APPEND_MODE_SEQUENCE:
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-appendmode)
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_SOURCE_BUFFER_APPEND_MODE_SEGMENTS,
+  GST_SOURCE_BUFFER_APPEND_MODE_SEQUENCE,
+} GstSourceBufferAppendMode;
+
+/**
+ * GstSourceBufferInterval:
+ *
+ * Since: 1.24
+ */
+typedef struct
+{
+  GstClockTime start;
+  GstClockTime end;
+} GstSourceBufferInterval;
+
+#define GST_TYPE_SOURCE_BUFFER (gst_source_buffer_get_type())
+
+GST_MSE_API
+G_DECLARE_FINAL_TYPE (GstSourceBuffer, gst_source_buffer, GST, SOURCE_BUFFER,
+    GstObject);
+
+GST_MSE_API
+GstSourceBufferAppendMode gst_source_buffer_get_append_mode (
+    GstSourceBuffer * self);
+
+GST_MSE_API
+gboolean gst_source_buffer_set_append_mode (GstSourceBuffer * self,
+    GstSourceBufferAppendMode mode, GError ** error);
+
+GST_MSE_API
+gchar *gst_source_buffer_get_content_type (GstSourceBuffer * self);
+
+GST_MSE_API
+gboolean gst_source_buffer_get_updating (GstSourceBuffer * self);
+
+GST_MSE_API
+GArray * gst_source_buffer_get_buffered (GstSourceBuffer * self,
+                                         GError ** error);
+
+GST_MSE_API
+gboolean gst_source_buffer_set_timestamp_offset (GstSourceBuffer * self,
+                                                 GstClockTime offset,
+                                                 GError ** error);
+
+GST_MSE_API
+GstClockTime gst_source_buffer_get_timestamp_offset (GstSourceBuffer * self);
+
+GST_MSE_API
+gboolean gst_source_buffer_set_append_window_start (GstSourceBuffer * self,
+                                                    GstClockTime start,
+                                                    GError ** error);
+
+GST_MSE_API
+GstClockTime gst_source_buffer_get_append_window_start (GstSourceBuffer * self);
+
+GST_MSE_API
+gboolean gst_source_buffer_set_append_window_end (GstSourceBuffer * self,
+                                                  GstClockTime end,
+                                                  GError ** error);
+
+GST_MSE_API
+GstClockTime gst_source_buffer_get_append_window_end (GstSourceBuffer * self);
+
+GST_MSE_API
+gboolean gst_source_buffer_append_buffer (GstSourceBuffer * self,
+    GstBuffer * buf, GError ** error);
+
+GST_MSE_API
+gboolean gst_source_buffer_abort (GstSourceBuffer * self, GError ** error);
+
+GST_MSE_API
+gboolean gst_source_buffer_change_content_type (GstSourceBuffer * self,
+                                                const gchar * type,
+                                                GError ** error);
+
+GST_MSE_API
+gboolean gst_source_buffer_remove (GstSourceBuffer * self, GstClockTime start,
+                                   GstClockTime end, GError ** error);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstsourcebufferlist-private.h Added

@@ -0,0 +1,64 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <glib.h>
+#include "gstsourcebufferlist.h"
+#include "gstsourcebuffer.h"
+
+G_BEGIN_DECLS
+
+GST_MSE_PRIVATE
+GstSourceBufferList *gst_source_buffer_list_new (void);
+
+GST_MSE_PRIVATE
+gboolean gst_source_buffer_list_contains (GstSourceBufferList * self,
+    GstSourceBuffer * buf);
+
+GST_MSE_PRIVATE
+void gst_source_buffer_list_append (GstSourceBufferList * self,
+    GstSourceBuffer * buf);
+
+GST_MSE_PRIVATE
+gboolean gst_source_buffer_list_remove (GstSourceBufferList * self,
+    GstSourceBuffer * buf);
+
+GST_MSE_PRIVATE
+void gst_source_buffer_list_remove_all (GstSourceBufferList * self);
+
+GST_MSE_PRIVATE
+void gst_source_buffer_list_notify_freeze (GstSourceBufferList * self);
+
+GST_MSE_PRIVATE
+void gst_source_buffer_list_notify_cancel (GstSourceBufferList * self);
+
+GST_MSE_PRIVATE
+void gst_source_buffer_list_notify_added (GstSourceBufferList * self);
+
+GST_MSE_PRIVATE
+void gst_source_buffer_list_notify_removed (GstSourceBufferList * self);
+
+GST_MSE_PRIVATE
+void gst_source_buffer_list_notify_thaw (GstSourceBufferList * self);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstsourcebufferlist.c Added

@@ -0,0 +1,461 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:gstsourcebufferlist
+ * @title: GstSourceBufferList
+ * @short_description: Source Buffer List
+ * @include: mse/mse.h
+ * @symbols:
+ * - GstSourceBufferList
+ *
+ * The Source Buffer List is a list of #GstSourceBuffers that can be
+ * indexed numerically and monitored for changes. The list itself cannot be
+ * modified through this interface, though the Source Buffers it holds can be
+ * modified after retrieval.
+ *
+ * It is used by #GstMediaSource to provide direct access to its child
+ * #GstSourceBuffers through #GstMediaSource:source-buffers as well as
+ * informing clients which of the Source Buffers are active through
+ * #GstMediaSource:active-source-buffers.
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstsourcebufferlist.h"
+#include "gstsourcebufferlist-private.h"
+
+#include "gstmseeventqueue-private.h"
+
+typedef struct
+{
+  gboolean frozen;
+  gboolean added;
+  gboolean removed;
+} PendingNotifications;
+
+/**
+ * GstSourceBufferList:
+ *
+ * Since: 1.24
+ */
+struct _GstSourceBufferList
+{
+  GstObject parent_instance;
+
+  GPtrArray *buffers;
+
+  GstMseEventQueue *event_queue;
+
+  PendingNotifications pending_notifications;
+};
+
+G_DEFINE_TYPE (GstSourceBufferList, gst_source_buffer_list, GST_TYPE_OBJECT);
+
+enum
+{
+  PROP_0,
+  PROP_LENGTH,
+  N_PROPS,
+};
+
+typedef enum
+{
+  ON_SOURCEBUFFER_ADDED,
+  ON_SOURCEBUFFER_REMOVED,
+  N_SIGNALS,
+} SourceBufferListEvent;
+
+typedef struct
+{
+  GstDataQueueItem item;
+  SourceBufferListEvent event;
+} SourceBufferListEventItem;
+
+static GParamSpec *propertiesN_PROPS;
+static guint signalsN_SIGNALS = { 0 };
+
+static gboolean
+is_frozen (GstSourceBufferList * self)
+{
+  return g_atomic_int_get (&self->pending_notifications.frozen);
+}
+
+static void
+set_frozen (GstSourceBufferList * self)
+{
+  g_atomic_int_set (&self->pending_notifications.frozen, TRUE);
+}
+
+static void
+clear_frozen (GstSourceBufferList * self)
+{
+  g_atomic_int_set (&self->pending_notifications.frozen, FALSE);
+}
+
+static void
+set_pending_added (GstSourceBufferList * self)
+{
+  g_atomic_int_set (&self->pending_notifications.added, TRUE);
+}
+
+static void
+set_pending_removed (GstSourceBufferList * self)
+{
+  g_atomic_int_set (&self->pending_notifications.removed, TRUE);
+}
+
+static gboolean
+clear_pending_added (GstSourceBufferList * self)
+{
+  return g_atomic_int_and (&self->pending_notifications.added, FALSE);
+}
+
+static gboolean
+clear_pending_removed (GstSourceBufferList * self)
+{
+  return g_atomic_int_and (&self->pending_notifications.removed, FALSE);
+}
+
+static void
+schedule_event (GstSourceBufferList * self, SourceBufferListEvent event)
+{
+  SourceBufferListEventItem item = {
+    .item = {.destroy = g_free,.visible = TRUE,.size = 1,.object = NULL},
+    .event = event,
+  };
+
+  gst_mse_event_queue_push (self->event_queue, g_memdup2 (&item,
+          sizeof (SourceBufferListEventItem)));
+}
+
+static void
+dispatch_event (SourceBufferListEventItem * item, GstSourceBufferList * self)
+{
+  g_signal_emit (self, signalsitem->event, 0);
+}
+
+static void
+call_source_buffer_added (GstSourceBufferList * self)
+{
+  if (is_frozen (self)) {
+    set_pending_added (self);
+  } else {
+    clear_pending_added (self);
+    schedule_event (self, ON_SOURCEBUFFER_ADDED);
+  }
+}
+
+static void
+call_source_buffer_removed (GstSourceBufferList * self)
+{
+  if (is_frozen (self)) {
+    set_pending_removed (self);
+  } else {
+    clear_pending_removed (self);
+    schedule_event (self, ON_SOURCEBUFFER_REMOVED);
+  }
+}
+
+GstSourceBufferList *
+gst_source_buffer_list_new (void)
+{
+  return gst_object_ref_sink (g_object_new (GST_TYPE_SOURCE_BUFFER_LIST, NULL));
+}
+
+static void
+gst_source_buffer_list_dispose (GObject * object)
+{
+  GstSourceBufferList *self = (GstSourceBufferList *) object;
+  gst_clear_object (&self->event_queue);
+
+  G_OBJECT_CLASS (gst_source_buffer_list_parent_class)->dispose (object);
+}
+
+static void
+gst_source_buffer_list_finalize (GObject * object)
+{
+  GstSourceBufferList *self = (GstSourceBufferList *) object;
+
+  g_clear_pointer (&self->buffers, g_ptr_array_unref);
+
+  G_OBJECT_CLASS (gst_source_buffer_list_parent_class)->finalize (object);
+}
+
+static void
+gst_source_buffer_list_get_property (GObject * object, guint prop_id, GValue
+    * value, GParamSpec * pspec)
+{
+  GstSourceBufferList *self = GST_SOURCE_BUFFER_LIST (object);
+
+  switch (prop_id) {
+    case PROP_LENGTH:
+      g_value_set_uint (value, gst_source_buffer_list_get_length (self));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+  }
+}
+
+static void
+gst_source_buffer_list_class_init (GstSourceBufferListClass * klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->dispose = GST_DEBUG_FUNCPTR (gst_source_buffer_list_dispose);
+  oclass->finalize = GST_DEBUG_FUNCPTR (gst_source_buffer_list_finalize);
+  oclass->get_property =
+      GST_DEBUG_FUNCPTR (gst_source_buffer_list_get_property);
+
+  /**
+   * GstSourceBufferList:length:
+   *
+   * The number of #GstSourceBuffers contained by this structure
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebufferlist-length)
+   *
+   * Since: 1.24
+   */
+  propertiesPROP_LENGTH = g_param_spec_ulong ("length",
+      "Length",
+      "The number of SourceBuffers contained by this structure",
+      0, G_MAXULONG, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_properties (oclass, N_PROPS, properties);
+
+  /**
+   * GstSourceBufferList::on-sourcebuffer-added:
+   * @self: The #GstSourceBufferList that has just added a
+   * #GstSourceBuffer
+   *
+   * Emitted when a #GstSourceBuffer has been added to this list.
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebufferlist-onaddsourcebuffer)
+   *
+   * Since: 1.24
+   */
+  signalsON_SOURCEBUFFER_ADDED = g_signal_new ("on-sourcebuffer-added",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+  /**
+   * GstSourceBufferList::on-sourcebuffer-removed:
+   * @self: The #GstSourceBufferList that has just removed a
+   * #GstSourceBuffer
+   *
+   * Emitted when a #GstSourceBuffer has been removed from this list.
+   *
+   * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebufferlist-onremovesourcebuffer)
+   *
+   * Since: 1.24
+   */
+  signalsON_SOURCEBUFFER_REMOVED = g_signal_new ("on-sourcebuffer-removed",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0);
+}
+
+static void
+gst_source_buffer_list_init (GstSourceBufferList * self)
+{
+  set_frozen (self);
+  self->buffers = g_ptr_array_new_with_free_func (gst_object_unref);
+  self->event_queue =
+      gst_mse_event_queue_new ((GstMseEventQueueCallback) dispatch_event, self);
+  clear_pending_added (self);
+  clear_pending_removed (self);
+  clear_frozen (self);
+}
+
+/**
+ * gst_source_buffer_list_index:
+ * @self: #GstSourceBufferList instance
+ * @index: index of requested Source Buffer
+ *
+ * Retrieves the #GstSourceBuffer at @index from @self. If @index is greater than
+ * the highest index in the list, it will return `NULL`.
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dfn-sourcebufferlist-getter)
+ *
+ * Returns: (transfer full) (nullable): The requested #GstSourceBuffer or `NULL`
+ * Since: 1.24
+ */
+GstSourceBuffer *
+gst_source_buffer_list_index (GstSourceBufferList * self, guint index)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER_LIST (self), NULL);
+  if (index >= gst_source_buffer_list_get_length (self))
+    return NULL;
+  return gst_object_ref (g_ptr_array_index (self->buffers, index));
+}
+
+/**
+ * gst_source_buffer_list_get_length:
+ * @self: #GstSourceBufferList instance
+ *
+ * Specification(https://www.w3.org/TR/media-source-2/#dom-sourcebufferlist-length)
+ *
+ * Returns: The number of #GstSourceBuffer objects in the list
+ * Since: 1.24
+ */
+guint
+gst_source_buffer_list_get_length (GstSourceBufferList * self)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER_LIST (self), 0);
+  return self->buffers->len;
+}
+
+gboolean
+gst_source_buffer_list_contains (GstSourceBufferList * self,
+    GstSourceBuffer * buf)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER_LIST (self), FALSE);
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER (buf), FALSE);
+  return g_ptr_array_find (self->buffers, buf, NULL);
+}
+
+void
+gst_source_buffer_list_append (GstSourceBufferList * self,
+    GstSourceBuffer * buf)
+{
+  g_return_if_fail (GST_IS_SOURCE_BUFFER_LIST (self));
+  g_ptr_array_add (self->buffers, gst_object_ref (buf));
+  call_source_buffer_added (self);
+}
+
+gboolean
+gst_source_buffer_list_remove (GstSourceBufferList * self,
+    GstSourceBuffer * buf)
+{
+  g_return_val_if_fail (GST_IS_SOURCE_BUFFER_LIST (self), FALSE);
+  gboolean removed = g_ptr_array_remove (self->buffers, buf);
+  if (removed) {
+    call_source_buffer_removed (self);
+    return TRUE;
+  } else {
+    return FALSE;
+  }
+}
+
+void
+gst_source_buffer_list_remove_all (GstSourceBufferList * self)
+{
+  g_return_if_fail (GST_IS_SOURCE_BUFFER_LIST (self));
+  if (self->buffers->len < 1) {
+    return;
+  }
+  g_ptr_array_set_size (self->buffers, 0);
+  call_source_buffer_removed (self);
+}
+
+/**
+ * gst_source_buffer_list_notify_freeze:
+ * @self: #GstSourceBufferList instance
+ *
+ * Prevents any notifications from being emitted by @self until the next call to
+ * gst_source_buffer_list_notify_thaw().
+ *
+ */
+void
+gst_source_buffer_list_notify_freeze (GstSourceBufferList * self)
+{
+  g_return_if_fail (GST_IS_SOURCE_BUFFER_LIST (self));
+  clear_pending_added (self);
+  clear_pending_removed (self);
+  set_frozen (self);
+}
+
+/**
+ * gst_source_buffer_list_notify_cancel:
+ * @self: #GstSourceBufferList instance
+ *
+ * Cancels any pending notifications that are waiting between calls to
+ * gst_source_buffer_list_notify_freeze() and
+ * gst_source_buffer_list_notify_thaw().
+ *
+ */
+void
+gst_source_buffer_list_notify_cancel (GstSourceBufferList * self)
+{
+  g_return_if_fail (GST_IS_SOURCE_BUFFER_LIST (self));
+  clear_pending_added (self);
+  clear_pending_removed (self);
+}
+
+/**
+ * gst_source_buffer_list_notify_added:
+ * @self: #GstSourceBufferList instance
+ *
+ * Explicitly notifies subscribers to the ::on-sourcebuffer-added signal that an
+ * item has been added to @self.
+ *
+ */
+void
+gst_source_buffer_list_notify_added (GstSourceBufferList * self)
+{
+  g_return_if_fail (GST_IS_SOURCE_BUFFER_LIST (self));
+  g_return_if_fail (!is_frozen (self));
+  call_source_buffer_added (self);
+}
+
+/**
+ * gst_source_buffer_list_notify_removed:
+ * @self: #GstSourceBufferList instance
+ *
+ * Explicitly notifies subscribers to the ::on-sourcebuffer-removed signal that
+ * an item has been removed from @self.
+ *
+ */
+void
+gst_source_buffer_list_notify_removed (GstSourceBufferList * self)
+{
+  g_return_if_fail (GST_IS_SOURCE_BUFFER_LIST (self));
+  g_return_if_fail (!is_frozen (self));
+  call_source_buffer_removed (self);
+}
+
+/**
+ * gst_source_buffer_list_notify_thaw:
+ * @self: #GstSourceBufferList instance
+ *
+ * Resumes notifications emitted from @self after a call to
+ * gst_source_buffer_list_notify_freeze(). If any notifications are pending,
+ * they will be emitted as a result of this call. To prevent pending
+ * notifications from being published, use
+ * gst_source_buffer_list_notify_cancel() before calling this method.
+ *
+ */
+void
+gst_source_buffer_list_notify_thaw (GstSourceBufferList * self)
+{
+  g_return_if_fail (GST_IS_SOURCE_BUFFER_LIST (self));
+  clear_frozen (self);
+  if (clear_pending_added (self)) {
+    g_signal_emit (self, signalsON_SOURCEBUFFER_ADDED, 0);
+  }
+  if (clear_pending_removed (self)) {
+    g_signal_emit (self, signalsON_SOURCEBUFFER_REMOVED, 0);
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/gstsourcebufferlist.h Added

@@ -0,0 +1,44 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/mse/mse-prelude.h>
+
+#include "gstsourcebuffer.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_SOURCE_BUFFER_LIST (gst_source_buffer_list_get_type())
+
+GST_MSE_API
+G_DECLARE_FINAL_TYPE (GstSourceBufferList, gst_source_buffer_list, GST,
+    SOURCE_BUFFER_LIST, GstObject);
+
+GST_MSE_API
+GstSourceBuffer *gst_source_buffer_list_index (GstSourceBufferList * self,
+                                               guint index);
+GST_MSE_API
+guint gst_source_buffer_list_get_length (GstSourceBufferList * self);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/meson.build Added

@@ -0,0 +1,150 @@
+gstmse_headers_private = files(
+  'gstappendpipeline-private.h',
+  'gstmediasourcesamplemap-private.h',
+  'gstmediasourcetrackbuffer-private.h',
+  'gstmediasourcetrack-private.h',
+  'gstmseeventqueue-private.h',
+  'gstmselogging-private.h',
+  'gstmsemediatype-private.h',
+)
+
+gstmse_sources_private = files(
+  'gstappendpipeline.c',
+  'gstmediasourcesamplemap.c',
+  'gstmediasourcetrackbuffer.c',
+  'gstmediasourcetrack.c',
+  'gstmseeventqueue.c',
+  'gstmselogging.c',
+  'gstmsemediatype.c',
+)
+
+gstmse_headers_public = files(
+  'gstmediasource.h',
+  'gstsourcebuffer.h',
+  'gstsourcebufferlist.h',
+  'gstmsesrc.h',
+  'mse.h',
+  'mse-prelude.h',
+)
+
+gstmse_sources_public = files(
+  'gstmediasource.c',
+  'gstmsesrc.c',
+  'gstsourcebuffer.c',
+  'gstsourcebufferlist.c',
+)
+
+gstmse_header_dir = 'gstreamer-' + api_version + '/gst/mse/'
+
+gstmse_enums_private = gnome.mkenums_simple('mse-enumtypes-private',
+  sources : gstmse_headers_private,
+  body_prefix : '#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif',
+  header_prefix : '#include <gst/mse/mse-prelude.h>',
+  decorator: 'GST_MSE_PRIVATE',
+  install_header: false,
+)
+
+gstmse_enums = gnome.mkenums_simple('mse-enumtypes',
+  sources : gstmse_headers_public,
+  body_prefix : '#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif',
+  header_prefix : '#include <gst/mse/mse-prelude.h>',
+  decorator: 'GST_MSE_API',
+  install_header: true,
+  install_dir : join_paths(get_option('includedir'), gstmse_header_dir),
+)
+
+gstmse_deps = gstbase_dep, gstapp_dep
+
+gstmse_enums_private_c = gstmse_enums_private0
+gstmse_enums_private_h = gstmse_enums_private1
+
+gstmse_enums_c = gstmse_enums0
+gstmse_enums_h = gstmse_enums1
+
+gstmse_c_args = gst_plugins_bad_args + 
+  '-DBUILDING_GST_MSE',
+  '-DGST_USE_UNSTABLE_API',
+  '-DG_LOG_DOMAIN="GStreamer-MSE"',
+
+
+gstmse_sources_all = 
+  gstmse_sources_private,
+  gstmse_sources_public,
+  gstmse_enums_c,
+  gstmse_enums_h,
+  gstmse_enums_private_c,
+  gstmse_enums_private_h,
+
+
+gstmse_private_test = library('gstmse-private-test',
+  gstmse_sources_all,
+  c_args : gstmse_c_args, '-DBUILDING_GST_MSE_TEST',
+  include_directories : configinc, libsinc,
+  dependencies : gstmse_deps,
+)
+
+gstmse_private_test_dep = declare_dependency(
+  compile_args : gstmse_c_args, '-DBUILDING_GST_MSE_TEST',
+  link_with : gstmse_private_test,
+  include_directories : libsinc,
+  sources: gstmse_headers_public + gstmse_enums_h,
+)
+
+gstmse = library('gstmse-' + api_version,
+  gstmse_sources_all,
+  c_args : gstmse_c_args,
+  include_directories : configinc, libsinc,
+  version : libversion,
+  soversion : soversion,
+  darwin_versions : osxversion,
+  install : true,
+  dependencies : gstmse_deps,
+)
+
+pkg_name = 'gstreamer-mse-' + api_version
+gst_libraries += pkg_name, {'lib': gstmse}
+pkgconfig.generate(gstmse,
+  libraries : gst_dep,
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : pkg_name,
+  description : 'GStreamer Support for W3C Media Source Extensions',
+)
+
+library_def = {'lib': gstmse}
+gen_sources = 
+if build_gir
+  gir = {
+    'sources' : 
+      gstmse_sources_public,
+      gstmse_headers_public,
+      gstmse_enums_h,
+      gstmse_enums_c,
+    ,
+    'namespace' : 'GstMse',
+    'nsversion' : api_version,
+    'identifier_prefix' : 'Gst',
+    'symbol_prefix' : 'gst',
+    'export_packages' : pkg_name,
+    'includes' : 'Gst-1.0',
+    'install' : true,
+    'extra_args' : gir_init_section + '-DGST_USE_UNSTABLE_API' + '--c-include=gst/mse/mse.h',
+    'dependencies' : gstmse_deps,
+  }
+  library_def += {'gir': gir}
+  if not static_build
+    mse_gir = gnome.generate_gir(gstmse, kwargs: gir)
+    library_def += {'gir_targets':  library_def.get('gir_targets', ) + mse_gir}
+    gen_sources += mse_gir
+  endif
+endif
+gst_libraries += pkg_name, library_def
+
+gstmse_dep = declare_dependency(
+  link_with : gstmse,
+  include_directories : libsinc,
+  dependencies : gstmse_deps,
+  sources: gstmse_headers_public + gstmse_enums_h,
+)
+install_headers(gstmse_headers_public, subdir: gstmse_header_dir)
+meson.override_dependency(pkg_name, gstmse_dep)

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/mse-prelude.h Added

@@ -0,0 +1,48 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+
+#ifndef GST_MSE_API
+# if defined(BUILDING_GST_MSE) && defined(GST_API_EXPORT)
+#  define GST_MSE_API GST_API_EXPORT
+# elif defined(GST_API_IMPORT)
+#  define GST_MSE_API GST_API_IMPORT
+# else
+#  define GST_MSE_API
+# endif
+#endif
+
+#ifndef GST_MSE_PRIVATE
+# if defined(BUILDING_GST_MSE_TEST)
+#  define GST_MSE_PRIVATE GST_MSE_API
+# else
+#  define GST_MSE_PRIVATE G_GNUC_INTERNAL
+# endif
+#endif
+
+#ifndef GST_USE_UNSTABLE_API
+#warning "The MSE library from gst-plugins-bad is an unstable API and may change in future."
+#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
+#endif

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/mse/mse.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+
+#include "mse-prelude.h"
+#include <gst/mse/mse-enumtypes.h>
+#include "gstmsesrc.h"
+#include "gstmediasource.h"
+#include "gstsourcebufferlist.h"
+#include "gstsourcebuffer.h"

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/opencv/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/opencv/meson.build Changed

@@ -1,3 +1,8 @@
+if get_option('opencv').disabled()
+  gstopencv_dep = disabler()
+  subdir_done()
+endif
+
 opencv_sources = 
   'gstopencvutils.cpp',
   'gstopencvvideofilter.cpp',
@@ -9,22 +14,66 @@
   'gstopencvvideofilter.h',
 
 
-if get_option('opencv').disabled()
-  gstopencv_dep = disabler()
-  subdir_done()
+libopencv_headers = 
+  'opencv2/bgsegm.hpp',
+  'opencv2/calib3d.hpp',
+  'opencv2/core.hpp',
+  'opencv2/imgproc.hpp',
+  'opencv2/objdetect.hpp',
+  'opencv2/opencv.hpp',
+  'opencv2/video.hpp',
+  'opencv2/tracking.hpp',
+
+
+gstopencv_cargs = '-DGST_HAAR_CASCADES_DIR="@0@"'
+
+opencv_dep = dependency('opencv', version : '>= 3.0.0', '< 3.5.0', required : false)
+opencv_found = opencv_dep.found()
+if not opencv_found
+  opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false)
+  opencv_found = opencv_dep.found()
 endif
 
-opencv_dep = dependency('opencv', version : '>= 3.0.0', required : false)
-if not opencv_dep.found()
-  opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false)
+if opencv_found
+  foreach h : libopencv_headers
+    if not cxx.has_header(h, dependencies: opencv_dep)
+      message('Needed header "' + h + '" not found')
+      opencv_found = false
+    endif
+  endforeach
 endif
-if opencv_dep.found()
+
+if opencv_found
+  opencv_prefix = opencv_dep.get_variable('prefix')
+  gstopencv_cargs += '-DOPENCV_PREFIX="' + opencv_prefix + '"'
   # opencv4 seems to ship with .pc file that references non-existent include dir
   # (/usr/include/opencv4/opencv instead of /usr/include/opencv4/opencv2)
   # clang 10 complains about the following header in opencv4
   # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal -Werror,-Wformat-nonliteral
-  gstopencv_cargs = cxx.get_supported_arguments('-Wno-missing-include-dirs', '-Wno-format-nonliteral')
+  gstopencv_cargs += cxx.get_supported_arguments('-Wno-missing-include-dirs', '-Wno-format-nonliteral')
+
+  # Check the data dir used by opencv for its xml data files
+  # Use prefix from pkg-config to be compatible with cross-compilation
+  r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false)
+  if r.returncode() == 0
+    gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"'
+  else
+    r = run_command('test', '-d', opencv_prefix + '/share/OpenCV', check: false)
+    if r.returncode() == 0
+      gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"'
+    else
+      r = run_command('test', '-d', opencv_prefix + '/share/opencv4', check: false)
+      if r.returncode() == 0
+        gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"'
+      else
+        message('Unable to detect OpenCV data directory')
+        opencv_found = false
+      endif
+    endif
+  endif
+endif
 
+if opencv_found
   pkg_name = 'gstreamer-opencv-1.0'
   gstopencv = library('gstopencv-' + api_version,
     opencv_sources,

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/play/gstplay-signal-adapter.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/play/gstplay-signal-adapter.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/play/gstplay.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/play/gstplay.c Changed

@@ -28,6 +28,40 @@
  * @symbols:
  * - GstPlay
  *
+ * The goal of the GstPlay library is to ease the integration of multimedia
+ * playback features in applications. Thus, if you need to build a media player
+ * from the ground-up, GstPlay provides the features you will most likely need.
+ *
+ * An example player is available in gst-examples/playback/player/gst-play/.
+ *
+ * Internally the GstPlay makes use of the `playbin3` element. The legacy
+ * `playbin2` can be selected if the `GST_PLAY_USE_PLAYBIN3=0` environment
+ * variable has been set.
+ *
+ * **Important note**: If your application relies on the GstBus to get
+ * notifications from GstPlay, you need to add some explicit clean-up code in
+ * order to prevent the GstPlay object from leaking. See below for the details.
+ * If you use the GstPlaySignalAdapter, no special clean-up is required.
+ *
+ * When the GstPlaySignalAdapter is not used, the GstBus owned by GstPlay should
+ * be set to flushing state before any attempt to drop the last reference of the
+ * GstPlay object. An example in C:
+ *
+ * ```c
+ * ...
+ * GstBus *bus = gst_play_get_message_bus (player);
+ * gst_bus_set_flushing (bus, TRUE);
+ * gst_object_unref (bus);
+ * gst_object_unref (player);
+ * ```
+ *
+ * The messages managed by the player contain a reference to itself, and if the
+ * bus watch is just removed together with dropping the player then the bus will
+ * simply keep them around forever (and the bus never goes away because the
+ * player has a strong reference to it, so there's a reference cycle as long as
+ * there are messages). Setting the bus to flushing state forces it to get rid
+ * of its queued messages, thus breaking any possible reference cycle.
+ *
  * Since: 1.20
  */
 
@@ -92,6 +126,7 @@
   CONFIG_QUARK_USER_AGENT = 0,
   CONFIG_QUARK_POSITION_INTERVAL_UPDATE,
   CONFIG_QUARK_ACCURATE_SEEK,
+  CONFIG_QUARK_PIPELINE_DUMP_IN_ERROR_DETAILS,
 
   CONFIG_QUARK_MAX
 } ConfigQuarkId;
@@ -100,6 +135,7 @@
   "user-agent",
   "position-interval-update",
   "accurate-seek",
+  "pipeline-dump-in-error-details",
 };
 
 static GQuark _config_quark_tableCONFIG_QUARK_MAX;
@@ -283,6 +319,7 @@
   self->config = gst_structure_new_id (QUARK_CONFIG,
       CONFIG_QUARK (POSITION_INTERVAL_UPDATE), G_TYPE_UINT, DEFAULT_POSITION_UPDATE_INTERVAL_MS,
       CONFIG_QUARK (ACCURATE_SEEK), G_TYPE_BOOLEAN, FALSE,
+      CONFIG_QUARK (PIPELINE_DUMP_IN_ERROR_DETAILS), G_TYPE_BOOLEAN, FALSE,
       NULL);
   /* *INDENT-ON* */
 
@@ -345,6 +382,9 @@
 {
   GObjectClass *gobject_class = (GObjectClass *) klass;
 
+  GST_DEBUG_CATEGORY_INIT (gst_play_debug, "gst-play", 0, "GstPlay");
+  gst_play_error_quark ();
+
   gobject_class->set_property = gst_play_set_property;
   gobject_class->get_property = gst_play_get_property;
   gobject_class->dispose = gst_play_dispose;
@@ -935,12 +975,41 @@
 static void
 on_error (GstPlay * self, GError * err, const GstStructure * details)
 {
+#ifndef GST_DISABLE_GST_DEBUG
+  GstStructure *extra_details = NULL;
+  gchar *dot_data = NULL;
+#endif
+
   GST_ERROR_OBJECT (self, "Error: %s (%s, %d)", err->message,
       g_quark_to_string (err->domain), err->code);
 
+#ifndef GST_DISABLE_GST_DEBUG
+  if (details != NULL) {
+    extra_details = gst_structure_copy (details);
+  } else {
+    extra_details = gst_structure_new_empty ("error-details");
+  }
+  if (gst_play_config_get_pipeline_dump_in_error_details (self->config)) {
+    dot_data = gst_debug_bin_to_dot_data (GST_BIN_CAST (self->playbin),
+        GST_DEBUG_GRAPH_SHOW_ALL);
+    gst_structure_set (extra_details, "pipeline-dump", G_TYPE_STRING, dot_data,
+        NULL);
+  }
+#endif
   api_bus_post_message (self, GST_PLAY_MESSAGE_ERROR,
       GST_PLAY_MESSAGE_DATA_ERROR, G_TYPE_ERROR, err,
-      GST_PLAY_MESSAGE_DATA_ERROR_DETAILS, GST_TYPE_STRUCTURE, details, NULL);
+      GST_PLAY_MESSAGE_DATA_ERROR_DETAILS, GST_TYPE_STRUCTURE,
+#ifndef GST_DISABLE_GST_DEBUG
+      extra_details
+#else
+      details
+#endif
+      , NULL);
+
+#ifndef GST_DISABLE_GST_DEBUG
+  g_free (dot_data);
+  gst_structure_free (extra_details);
+#endif
 
   g_error_free (err);
 
@@ -1377,6 +1446,15 @@
       }
     } else if (new_state == GST_STATE_PLAYING
         && pending_state == GST_STATE_VOID_PENDING) {
+      /* Try to query duration again if needed */
+      if (self->cached_duration == GST_CLOCK_TIME_NONE) {
+        gint64 duration = -1;
+
+        if (gst_element_query_duration (self->playbin, GST_FORMAT_TIME,
+                &duration)) {
+          on_duration_changed (self, duration);
+        }
+      }
       /* api_bus_post_message (self, GST_PLAY_MESSAGE_POSITION_UPDATED, */
       /*     GST_PLAY_MESSAGE_DATA_POSITION, GST_TYPE_CLOCK_TIME, 0, NULL); */
 
@@ -2517,7 +2595,9 @@
   g_source_unref (source);
 
   env = g_getenv ("GST_PLAY_USE_PLAYBIN3");
-  if (env && g_str_has_prefix (env, "1"))
+  if (env && g_str_has_prefix (env, "0"))
+    self->use_playbin3 = FALSE;
+  else
     self->use_playbin3 = TRUE;
 
   if (self->use_playbin3) {
@@ -2645,9 +2725,6 @@
 {
   gst_init (NULL, NULL);
 
-  GST_DEBUG_CATEGORY_INIT (gst_play_debug, "gst-play", 0, "GstPlay");
-  gst_play_error_quark ();
-
   return NULL;
 }
 
@@ -2661,6 +2738,9 @@
  * no special video set up will be done and some default handling will be
  * performed.
  *
+ * This also initializes GStreamer via `gst_init()` on the first call if this
+ * didn't happen before.
+ *
  * Returns: (transfer full): a new #GstPlay instance
  * Since: 1.20
  */
@@ -3186,7 +3266,7 @@
  * gst_play_get_subtitle_uri:
  * @play: #GstPlay instance
  *
- * current subtitle URI
+ * Current subtitle URI
  *
  * Returns: (transfer full) (nullable): URI of the current external subtitle.
  *   g_free() after usage.
@@ -3688,7 +3768,7 @@
  * @name: (nullable): visualization element obtained from
  * #gst_play_visualizations_get()
  *
- * Returns: %TRUE if the visualizations was set correctly. Otherwise,
+ * Returns: %TRUE if the visualization was set correctly. Otherwise,
  * %FALSE.
  * Since: 1.20
  */
@@ -4268,7 +4348,7 @@
  * @config: (transfer full): a #GstStructure
  *
  * Set the configuration of the play. If the play is already configured, and
- * the configuration haven't change, this function will return %TRUE. If the
+ * the configuration hasn't changed, this function will return %TRUE. If the
  * play is not in the GST_PLAY_STATE_STOPPED, this method will return %FALSE
  * and active configuration will remain.
  *
@@ -4379,8 +4459,8 @@
  * @config: a #GstPlay configuration
  * @interval: interval in ms
  *
- * set desired interval in milliseconds between two position-updated messages.
- * pass 0 to stop updating the position.
+ * Set desired interval in milliseconds between two position-updated messages.
+ * Pass 0 to stop updating the position.
  * Since: 1.20
  */
 void
@@ -4463,13 +4543,58 @@
 }
 
 /**
+ * gst_play_config_set_pipeline_dump_in_error_details:
+ * @config: a #GstPlay configuration
+ * @value: Include pipeline dumps in error details, or not.
+ *
+ * When enabled, the error message emitted by #GstPlay will include a pipeline
+ * dump (in Graphviz DOT format) in the error details #GstStructure. The field
+ * name is `pipeline-dump`.
+ *
+ * This option is disabled by default.
+ *
+ * Since: 1.24
+ */
+void
+gst_play_config_set_pipeline_dump_in_error_details (GstStructure * config,
+    gboolean value)
+{
+  g_return_if_fail (config != NULL);
+
+  gst_structure_id_set (config, CONFIG_QUARK (PIPELINE_DUMP_IN_ERROR_DETAILS),
+      G_TYPE_BOOLEAN, value, NULL);
+}
+
+/**
+ * gst_play_config_get_pipeline_dump_in_error_details:
+ * @config: a #GstPlay configuration
+ *
+ * Returns: %TRUE if pipeline dumps are included in #GstPlay error message
+ * details.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_play_config_get_pipeline_dump_in_error_details (const GstStructure * config)
+{
+  gboolean value = FALSE;
+
+  g_return_val_if_fail (config != NULL, FALSE);
+
+  gst_structure_id_get (config, CONFIG_QUARK (PIPELINE_DUMP_IN_ERROR_DETAILS),
+      G_TYPE_BOOLEAN, &value, NULL);
+
+  return value;
+}
+
+/**
  * gst_play_get_video_snapshot:
  * @play: #GstPlay instance
  * @format: output format of the video snapshot
  * @config: (allow-none): Additional configuration
  *
  * Get a snapshot of the currently selected video stream, if any. The format can be
- * selected with @format and optional configuration is possible with @config
+ * selected with @format and optional configuration is possible with @config.
  * Currently supported settings are:
  * - width, height of type G_TYPE_INT
  * - pixel-aspect-ratio of type GST_TYPE_FRACTION
@@ -4484,6 +4609,7 @@
     GstPlaySnapshotFormat format, const GstStructure * config)
 {
   gint video_tracks = 0;
+  GstPlayVideoInfo *video_info = NULL;
   GstSample *sample = NULL;
   GstCaps *caps = NULL;
   gint width = -1;
@@ -4492,10 +4618,20 @@
   gint par_d = 1;
   g_return_val_if_fail (GST_IS_PLAY (self), NULL);
 
-  g_object_get (self->playbin, "n-video", &video_tracks, NULL);
-  if (video_tracks == 0) {
-    GST_DEBUG_OBJECT (self, "total video track num is 0");
-    return NULL;
+  if (self->use_playbin3) {
+    video_info = gst_play_get_current_video_track (self);
+    if (video_info == NULL) {
+      GST_DEBUG_OBJECT (self, "no current video track");
+      return NULL;
+    } else {
+      g_object_unref (video_info);
+    }
+  } else {
+    g_object_get (self->playbin, "n-video", &video_tracks, NULL);
+    if (video_tracks == 0) {
+      GST_DEBUG_OBJECT (self, "total video track num is 0");
+      return NULL;
+    }
   }
 
   switch (format) {
@@ -4563,7 +4699,7 @@
  * gst_play_is_play_message:
  * @msg: A #GstMessage
  *
- * Returns: A #gboolean indicating wheter the passes message represents a #GstPlay message or not.
+ * Returns: A #gboolean indicating whether the passed message represents a #GstPlay message or not.
  *
  * Since: 1.20
  */
@@ -4683,8 +4819,8 @@
     GstStructure ** details)
 {
   PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_ERROR, G_TYPE_ERROR, error);
-  PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_ERROR, GST_TYPE_STRUCTURE,
-      details);
+  PARSE_MESSAGE_FIELD (msg, GST_PLAY_MESSAGE_DATA_ERROR_DETAILS,
+      GST_TYPE_STRUCTURE, details);
 }
 
 /**

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/play/gstplay.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/play/gstplay.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/play/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/play/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/player/gstplayer.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/player/gstplayer.c Changed

@@ -206,6 +206,9 @@
 {
   GObjectClass *gobject_class = (GObjectClass *) klass;
 
+  GST_DEBUG_CATEGORY_INIT (gst_player_debug, "gst-player", 0, "GstPlayer");
+  gst_player_error_quark ();
+
   gobject_class->set_property = gst_player_set_property;
   gobject_class->get_property = gst_player_get_property;
   gobject_class->finalize = gst_player_finalize;
@@ -444,9 +447,6 @@
 {
   gst_init (NULL, NULL);
 
-  GST_DEBUG_CATEGORY_INIT (gst_player_debug, "gst-player", 0, "GstPlayer");
-  gst_player_error_quark ();
-
   return NULL;
 }
 
@@ -582,7 +582,7 @@
         gst_play_signal_adapter_new_with_main_context (self->play, context);
     g_main_context_unref (context);
   } else {
-    self->signal_adapter = gst_play_signal_adapter_new (self->play);
+    self->signal_adapter = gst_play_signal_adapter_new_sync_emit (self->play);
   }
 
   g_signal_connect (self->signal_adapter, "uri-loaded",
@@ -625,6 +625,9 @@
  * no special video set up will be done and some default handling will be
  * performed.
  *
+ * This also initializes GStreamer via `gst_init()` on the first call if this
+ * didn't happen before.
+ *
  * Returns: (transfer full): a new #GstPlayer instance
  */
 GstPlayer *

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/player/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/player/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/transcoder/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/transcoder/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstva.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstva.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstvaallocator.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvaallocator.c Changed

@@ -37,13 +37,19 @@
 
 #include "gstvaallocator.h"
 
+#ifndef G_OS_WIN32
 #include <sys/types.h>
 #include <unistd.h>
+#endif
 
 #include "gstvasurfacecopy.h"
 #include "gstvavideoformat.h"
 #include "vasurfaceimage.h"
 
+#ifndef DRM_FORMAT_INVALID
+#define DRM_FORMAT_INVALID    0
+#endif
+
 #define GST_CAT_DEFAULT gst_va_memory_debug
 GST_DEBUG_CATEGORY (gst_va_memory_debug);
 
@@ -76,19 +82,6 @@
 }
 
 static GQuark
-gst_va_drm_mod_quark (void)
-{
-  static gsize drm_mod_quark = 0;
-
-  if (g_once_init_enter (&drm_mod_quark)) {
-    GQuark quark = g_quark_from_string ("DRMModifier");
-    g_once_init_leave (&drm_mod_quark, quark);
-  }
-
-  return drm_mod_quark;
-}
-
-static GQuark
 gst_va_buffer_aux_surface_quark (void)
 {
   static gsize surface_quark = 0;
@@ -125,15 +118,14 @@
     GST_LOG_OBJECT (buf->display, "Destroying surface %#x", buf->surface);
     va_destroy_surfaces (buf->display, &buf->surface, 1);
     gst_clear_object (&buf->display);
-    g_slice_free (GstVaBufferSurface, buf);
+    g_free (buf);
   }
 }
 
 static GstVaBufferSurface *
-gst_va_buffer_surface_new (VASurfaceID surface, GstVideoFormat format,
-    gint width, gint height)
+gst_va_buffer_surface_new (VASurfaceID surface)
 {
-  GstVaBufferSurface *buf = g_slice_new (GstVaBufferSurface);
+  GstVaBufferSurface *buf = g_new (GstVaBufferSurface, 1);
 
   g_atomic_int_set (&buf->ref_count, 0);
   g_atomic_int_set (&buf->ref_mems_count, 0);
@@ -194,7 +186,7 @@
         GST_LOG ("Destroying surface %#x", buf->surface);
         va_destroy_surfaces (display, &buf->surface, 1);
         self->surface_count -= 1;       /* GstVaDmabufAllocator */
-        g_slice_free (GstVaBufferSurface, buf);
+        g_free (buf);
       }
     } else {
       self->surface_count -= 1; /* GstVaAllocator */
@@ -270,7 +262,7 @@
   GstMemoryMapFunction parent_map;
   GstMemoryCopyFunction parent_copy;
 
-  GstVideoInfo info;
+  GstVideoInfoDmaDrm info;
   guint usage_hint;
 
   GstVaSurfaceCopy *copy;
@@ -318,19 +310,14 @@
 {
   GstVaDmabufAllocator *self = GST_VA_DMABUF_ALLOCATOR (gmem->allocator);
   GstVaBufferSurface *buf;
-  guint64 *drm_mod;
   gsize mem_size;
 
   buf = gst_mini_object_get_qdata (GST_MINI_OBJECT (gmem),
       gst_va_buffer_surface_quark ());
 
-  drm_mod = gst_mini_object_get_qdata (GST_MINI_OBJECT (gmem),
-      gst_va_drm_mod_quark ());
-
-  /* 0 is DRM_FORMAT_MOD_LINEAR, we do not include its header now. */
-  if (buf->n_mems > 1 && *drm_mod != 0) {
+  if (buf->n_mems > 1 && self->info.drm_modifier != DRM_FORMAT_MOD_LINEAR) {
     GST_ERROR_OBJECT (self, "Failed to copy multi-dmabuf because non-linear "
-        "modifier: %#" G_GINT64_MODIFIER "x.", *drm_mod);
+        "modifier: %#" G_GINT64_MODIFIER "x.", self->info.drm_modifier);
     return NULL;
   }
 
@@ -376,9 +363,10 @@
 
     g_assert (buf_copy->n_mems == 1);
 
-    copy_func = _ensure_surface_copy (&self->copy, self->display, &self->info);
-    if (copy_func && gst_va_surface_copy (copy_func, buf_copy->surface,
-            buf->surface))
+    copy_func =
+        _ensure_surface_copy (&self->copy, self->display, &self->info.vinfo);
+    if (copy_func
+        && gst_va_surface_copy (copy_func, buf_copy->surface, buf->surface))
       return copy;
 
     gst_memory_unref (copy);
@@ -386,9 +374,9 @@
     /* try system memory */
   }
 
-  if (*drm_mod != 0) {
+  if (self->info.drm_modifier != DRM_FORMAT_MOD_LINEAR) {
     GST_ERROR_OBJECT (self, "Failed to copy dmabuf because non-linear "
-        "modifier: %#" G_GINT64_MODIFIER "x.", *drm_mod);
+        "modifier: %#" G_GINT64_MODIFIER "x.", self->info.drm_modifier);
     return NULL;
   }
 
@@ -402,21 +390,19 @@
 {
   GstVaDmabufAllocator *self = GST_VA_DMABUF_ALLOCATOR (gmem->allocator);
   VASurfaceID surface = gst_va_memory_get_surface (gmem);
-  guint64 *drm_mod;
 
-  drm_mod = gst_mini_object_get_qdata (GST_MINI_OBJECT (gmem),
-      gst_va_drm_mod_quark ());
+  if (flags & GST_MAP_READWRITE) {
+    if (self->info.drm_modifier != DRM_FORMAT_MOD_LINEAR) {
+      GST_ERROR_OBJECT (self, "Failed to map the dmabuf because the modifier "
+          "is: %#" G_GINT64_MODIFIER "x, which is not linear.",
+          self->info.drm_modifier);
+      return NULL;
+    }
 
-  /* 0 is DRM_FORMAT_MOD_LINEAR, we do not include its header now. */
-  if (*drm_mod != 0) {
-    GST_ERROR_OBJECT (self, "Failed to map the dmabuf because the modifier "
-        "is: %#" G_GINT64_MODIFIER "x, which is not linear.", *drm_mod);
-    return NULL;
+    if (!va_sync_surface (self->display, surface))
+      return NULL;
   }
 
-  if (!va_sync_surface (self->display, surface))
-    return NULL;
-
   return self->parent_map (gmem, maxsize, flags);
 }
 
@@ -465,6 +451,8 @@
   self->parent_copy = allocator->mem_copy;
   allocator->mem_copy = gst_va_dmabuf_mem_copy;
 
+  gst_video_info_dma_drm_init (&self->info);
+
   gst_va_memory_pool_init (&self->pool);
 }
 
@@ -496,7 +484,11 @@
 static inline goffset
 _get_fd_size (gint fd)
 {
+#ifndef G_OS_WIN32
   return lseek (fd, 0, SEEK_END);
+#else
+  return 0;
+#endif
 }
 
 static gboolean
@@ -536,60 +528,49 @@
   return FALSE;
 }
 
-/* Creates an exported VASurfaceID and adds it as @buffer's memories
- * qdata
- *
- * If @info is not NULL, a dummy (non-pooled) buffer is created to
- * update offsets and strides, and it has to be unrefed immediately.
- */
 static gboolean
-gst_va_dmabuf_allocator_setup_buffer_full (GstAllocator * allocator,
-    GstBuffer * buffer, GstVideoInfo * info)
+_modifier_found (guint64 modifier, guint64 * modifiers, guint num_modifiers)
+{
+  guint i;
+
+  /* user doesn't care the returned modifier */
+  if (num_modifiers == 0)
+    return TRUE;
+
+  for (i = 0; i < num_modifiers; i++)
+    if (modifier == modifiersi)
+      return TRUE;
+  return FALSE;
+}
+
+static gboolean
+_va_create_surface_and_export_to_dmabuf (GstVaDisplay * display,
+    guint usage_hint, guint64 * modifiers, guint num_modifiers,
+    GstVideoInfo * info, VASurfaceID * ret_surface,
+    VADRMPRIMESurfaceDescriptor * ret_desc)
 {
-  GstVaBufferSurface *buf;
-  GstVaDmabufAllocator *self = GST_VA_DMABUF_ALLOCATOR (allocator);
-  GstVideoFormat format;
   VADRMPRIMESurfaceDescriptor desc = { 0, };
-  VASurfaceAttribExternalBuffers *extbuf = NULL, ext_buf;
-  VASurfaceID surface;
   guint32 i, fourcc, rt_format, export_flags;
-  GDestroyNotify buffer_destroy = NULL;
-  gsize object_offset4;
+  GstVideoFormat format;
+  VASurfaceID surface;
+  guint64 prev_modifier = DRM_FORMAT_MOD_INVALID;
 
-  g_return_val_if_fail (GST_IS_VA_DMABUF_ALLOCATOR (allocator), FALSE);
+  _init_debug_category ();
+
+  format = GST_VIDEO_INFO_FORMAT (info);
 
-  format = GST_VIDEO_INFO_FORMAT (&self->info);
   fourcc = gst_va_fourcc_from_video_format (format);
   rt_format = gst_va_chroma_from_video_format (format);
-  if (fourcc == 0 || rt_format == 0) {
-    GST_ERROR_OBJECT (allocator, "Unsupported format: %s",
-        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&self->info)));
+  if (fourcc == 0 || rt_format == 0)
     return FALSE;
-  }
-
-  /* HACK(victor): disable tiling for i965 driver for RGB formats */
-  if (GST_VA_DISPLAY_IS_IMPLEMENTATION (self->display, INTEL_I965)
-      && GST_VIDEO_INFO_IS_RGB (&self->info)) {
-    /* *INDENT-OFF* */
-    ext_buf = (VASurfaceAttribExternalBuffers) {
-      .width = GST_VIDEO_INFO_WIDTH (&self->info),
-      .height = GST_VIDEO_INFO_HEIGHT (&self->info),
-      .num_planes = GST_VIDEO_INFO_N_PLANES (&self->info),
-      .pixel_format = fourcc,
-    };
-    /* *INDENT-ON* */
-
-    extbuf = &ext_buf;
-  }
 
-  if (!va_create_surfaces (self->display, rt_format, fourcc,
-          GST_VIDEO_INFO_WIDTH (&self->info),
-          GST_VIDEO_INFO_HEIGHT (&self->info), self->usage_hint, extbuf,
-          &surface, 1))
+  if (!va_create_surfaces (display, rt_format, fourcc,
+          GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_HEIGHT (info),
+          usage_hint, modifiers, num_modifiers, NULL, &surface, 1))
     return FALSE;
 
   /* workaround for missing layered dmabuf formats in i965 */
-  if (GST_VA_DISPLAY_IS_IMPLEMENTATION (self->display, INTEL_I965)
+  if (GST_VA_DISPLAY_IS_IMPLEMENTATION (display, INTEL_I965)
       && (fourcc == VA_FOURCC_YUY2 || fourcc == VA_FOURCC_UYVY)) {
     /* These are not representable as separate planes */
     export_flags = VA_EXPORT_SURFACE_COMPOSED_LAYERS;
@@ -601,16 +582,19 @@
 
   export_flags |= VA_EXPORT_SURFACE_READ_WRITE;
 
-  if (!va_export_surface_to_dmabuf (self->display, surface, export_flags,
-          &desc))
+  if (!va_export_surface_to_dmabuf (display, surface, export_flags, &desc))
     goto failed;
 
-  g_assert (GST_VIDEO_INFO_N_PLANES (&self->info) == desc.num_layers);
+  if (GST_VIDEO_INFO_N_PLANES (info) != desc.num_layers)
+    goto failed;
 
+  /* YUY2 and YUYV are the same. radeonsi returns always YUYV.
+   * There's no reason to fail if the different fourcc if there're dups.
+   * https://fourcc.org/pixel-format/yuv-yuy2/ */
   if (fourcc != desc.fourcc) {
-    GST_ERROR ("Unsupported fourcc: %" GST_FOURCC_FORMAT,
+    GST_INFO ("Different fourcc: requested %" GST_FOURCC_FORMAT " - returned %"
+        GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc),
         GST_FOURCC_ARGS (desc.fourcc));
-    goto failed;
   }
 
   if (desc.num_objects == 0) {
@@ -618,25 +602,109 @@
     goto failed;
   }
 
-  buf = gst_va_buffer_surface_new (surface, format, desc.width, desc.height);
-  if (G_UNLIKELY (info)) {
-    *info = self->info;
-    GST_VIDEO_INFO_SIZE (info) = 0;
+  for (i = 0; i < desc.num_objects; i++) {
+    guint64 modifier = desc.objectsi.drm_format_modifier;
+
+    if (!_modifier_found (modifier, modifiers, num_modifiers)) {
+      GST_ERROR ("driver set a modifier different from allowed list: "
+          "0x%016" G_GINT64_MODIFIER "x", modifier);
+      goto failed;
+    }
+    /* XXX: all dmabufs in buffer have to have the same modifier, otherwise the
+     * drm-format field in caps is ill-designed */
+    if (i > 0 && modifier != prev_modifier) {
+      GST_ERROR ("Different objects have different modifier");
+      goto failed;
+    }
+
+    prev_modifier = modifier;
   }
 
+  *ret_surface = surface;
+  if (ret_desc)
+    *ret_desc = desc;
+
+  return TRUE;
+
+failed:
+  {
+    va_destroy_surfaces (display, &surface, 1);
+    return FALSE;
+  }
+}
+
+/**
+ * gst_va_dmabuf_get_modifier_for_format:
+ * @display: a #GstVaDisplay
+ * @format: a #GstVideoFormat
+ * @usage_hint: VA usage hint
+ *
+ * Get the underlying modifier for specified @format and @usage_hint.
+ *
+ * Returns: the underlying modifier.
+ *
+ * Since: 1.24
+ */
+guint64
+gst_va_dmabuf_get_modifier_for_format (GstVaDisplay * display,
+    GstVideoFormat format, guint usage_hint)
+{
+  VADRMPRIMESurfaceDescriptor desc = { 0, };
+  VASurfaceID surface;
+  GstVideoInfo info;
+
+  gst_video_info_init (&info);
+  gst_video_info_set_format (&info, format, 64, 64);
+
+  if (!_va_create_surface_and_export_to_dmabuf (display, usage_hint,
+          NULL, 0, &info, &surface, &desc))
+    return DRM_FORMAT_MOD_INVALID;
+
+  va_destroy_surfaces (display, &surface, 1);
+
+  return desc.objects0.drm_format_modifier;
+}
+
+/* Creates an exported VASurfaceID and adds it as @buffer's memories
+ * qdata
+ *
+ * If @info is not NULL, a dummy (non-pooled) buffer is created to
+ * update offsets and strides, and it has to be unrefed immediately.
+ */
+static gboolean
+gst_va_dmabuf_allocator_setup_buffer_full (GstAllocator * allocator,
+    GstBuffer * buffer, GstVideoInfoDmaDrm * info)
+{
+  GstVaBufferSurface *buf;
+  GstVaDmabufAllocator *self = GST_VA_DMABUF_ALLOCATOR (allocator);
+  VADRMPRIMESurfaceDescriptor desc = { 0, };
+  VASurfaceID surface;
+  guint32 i;
+  GDestroyNotify buffer_destroy = NULL;
+  gsize object_offset4;
+
+  g_return_val_if_fail (GST_IS_VA_DMABUF_ALLOCATOR (allocator), FALSE);
+
+  if (!_va_create_surface_and_export_to_dmabuf (self->display, self->usage_hint,
+          &self->info.drm_modifier, 1, &self->info.vinfo, &surface, &desc))
+    return FALSE;
+
+  buf = gst_va_buffer_surface_new (surface);
+  if (G_UNLIKELY (info))
+    *info = self->info;
+
   buf->n_mems = desc.num_objects;
 
   for (i = 0; i < desc.num_objects; i++) {
     gint fd = desc.objectsi.fd;
-    /* don't rely on prime descriptor reported size since gallium drivers report
-     * different values */
+    /* prime descriptor reports the total size of the object, including regions
+     * which aren't part surface's space. Let's just grab the surface's size: */
     gsize size = _get_fd_size (fd);
     GstMemory *mem = gst_dmabuf_allocator_alloc (allocator, fd, size);
-    guint64 *drm_mod = g_new (guint64, 1);
 
-    if (size != desc.objectsi.size) {
+    if (desc.objectsi.size < size) {
       GST_WARNING_OBJECT (self, "driver bug: fd size (%" G_GSIZE_FORMAT
-          ") differs from object descriptor size (%" G_GUINT32_FORMAT ")",
+          ") is bigger than object descriptor size (%" G_GUINT32_FORMAT ")",
           size, desc.objectsi.size);
     }
 
@@ -658,41 +726,40 @@
     gst_mini_object_set_qdata (GST_MINI_OBJECT (mem),
         gst_va_buffer_surface_quark (), buf, buffer_destroy);
 
-    *drm_mod = desc.objectsi.drm_format_modifier;
-    gst_mini_object_set_qdata (GST_MINI_OBJECT (mem), gst_va_drm_mod_quark (),
-        drm_mod, g_free);
-
-    if (G_UNLIKELY (info))
-      GST_VIDEO_INFO_PLANE_OFFSET (info, i) = GST_VIDEO_INFO_SIZE (info);
+    if (G_UNLIKELY (info)) {
+      GST_VIDEO_INFO_PLANE_OFFSET (&info->vinfo, i) =
+          GST_VIDEO_INFO_SIZE (&info->vinfo);
+    }
 
     GST_LOG_OBJECT (self, "buffer %p: new dmabuf %d / surface %#x %dx%d "
         "size %" G_GSIZE_FORMAT " drm mod %#" G_GINT64_MODIFIER "x",
-        buffer, fd, surface,
-        GST_VIDEO_INFO_WIDTH (&self->info), GST_VIDEO_INFO_HEIGHT (&self->info),
-        size, *drm_mod);
+        buffer, fd, surface, GST_VIDEO_INFO_WIDTH (&self->info.vinfo),
+        GST_VIDEO_INFO_HEIGHT (&self->info.vinfo), size,
+        self->info.drm_modifier);
   }
 
   if (G_UNLIKELY (info)) {
-    GST_VIDEO_INFO_SIZE (info) = gst_buffer_get_size (buffer);
+    if (desc.num_objects > 0) {
+      /* update drm modifier and format */
+      info->drm_modifier = desc.objects0.drm_format_modifier;
+      info->drm_fourcc = gst_va_drm_fourcc_from_video_format
+          (GST_VIDEO_INFO_FORMAT (&self->info.vinfo));
+    }
+
+    GST_VIDEO_INFO_SIZE (&info->vinfo) = gst_buffer_get_size (buffer);
 
     for (i = 0; i < desc.num_layers; i++) {
       g_assert (desc.layersi.num_planes == 1);
-      GST_VIDEO_INFO_PLANE_OFFSET (info, i) =
+      GST_VIDEO_INFO_PLANE_OFFSET (&info->vinfo, i) =
           object_offsetdesc.layersi.object_index0 +
           desc.layersi.offset0;
-      GST_VIDEO_INFO_PLANE_STRIDE (info, i) = desc.layersi.pitch0;
+      GST_VIDEO_INFO_PLANE_STRIDE (&info->vinfo, i) = desc.layersi.pitch0;
     }
   } else {
     gst_va_memory_pool_surface_inc (&self->pool);
   }
 
   return TRUE;
-
-failed:
-  {
-    va_destroy_surfaces (self->display, &surface, 1);
-    return FALSE;
-  }
 }
 
 /**
@@ -700,7 +767,7 @@
  * @allocator: a #GstAllocator
  * @buffer: an empty #GstBuffer
  *
- * This funciton creates a new VASurfaceID and exposes its DMABufs,
+ * This function creates a new VASurfaceID and exposes its DMABufs,
  * later it populates the @buffer with those DMABufs.
  *
  * Return: %TRUE if @buffer is populated correctly; %FALSE otherwise.
@@ -863,7 +930,7 @@
 {
   GstBuffer *buffer;
   GstVaDmabufAllocator *self;
-  GstVideoInfo info;
+  GstVideoInfoDmaDrm info;
   gboolean ret;
 
   g_return_val_if_fail (GST_IS_VA_DMABUF_ALLOCATOR (allocator), FALSE);
@@ -884,16 +951,16 @@
 /**
  * gst_va_dmabuf_allocator_set_format:
  * @allocator: a #GstAllocator
- * @info: a #GstVideoInfo
+ * @info: (in) (out caller-allocates) (not nullable): a #GstVideoInfoDmaDrm
  * @usage_hint: VA usage hint
  *
  * Sets the configuration defined by @info and @usage_hint for
  * @allocator, and it tries the configuration, if @allocator has not
  * allocated memories yet.
  *
- * If @allocator has memory allocated already, and frame size and
- * format in @info are the same as currently configured in @allocator,
- * the rest of @info parameters are updated internally.
+ * If @allocator has memory allocated already, and frame size, format
+ * and modifier in @info are the same as currently configured in
+ * @allocator, the rest of @info parameters are updated internally.
  *
  * Returns: %TRUE if the configuration is valid or updated; %FALSE if
  * configuration is not valid or not updated.
@@ -902,7 +969,7 @@
  */
 gboolean
 gst_va_dmabuf_allocator_set_format (GstAllocator * allocator,
-    GstVideoInfo * info, guint usage_hint)
+    GstVideoInfoDmaDrm * info, guint usage_hint)
 {
   GstVaDmabufAllocator *self;
   gboolean ret;
@@ -913,9 +980,13 @@
   self = GST_VA_DMABUF_ALLOCATOR (allocator);
 
   if (gst_va_memory_pool_surface_count (&self->pool) != 0) {
-    if (GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_INFO_FORMAT (&self->info)
-        && GST_VIDEO_INFO_WIDTH (info) == GST_VIDEO_INFO_WIDTH (&self->info)
-        && GST_VIDEO_INFO_HEIGHT (info) == GST_VIDEO_INFO_HEIGHT (&self->info)
+    if (info->drm_modifier == self->info.drm_modifier
+        && GST_VIDEO_INFO_FORMAT (&info->vinfo)
+        == GST_VIDEO_INFO_FORMAT (&self->info.vinfo)
+        && GST_VIDEO_INFO_WIDTH (&info->vinfo)
+        == GST_VIDEO_INFO_WIDTH (&self->info.vinfo)
+        && GST_VIDEO_INFO_HEIGHT (&info->vinfo)
+        == GST_VIDEO_INFO_HEIGHT (&self->info.vinfo)
         && usage_hint == self->usage_hint) {
       *info = self->info;       /* update callee info (offset & stride) */
       return TRUE;
@@ -939,7 +1010,7 @@
 /**
  * gst_va_dmabuf_allocator_get_format:
  * @allocator: a #GstAllocator
- * @info: (out) (optional): a #GstVideoInfo
+ * @info: (out) (optional): a #GstVideoInfoDmaDrm
  * @usage_hint: (out) (optional): VA usage hint
  *
  * Gets current internal configuration of @allocator.
@@ -951,11 +1022,11 @@
  */
 gboolean
 gst_va_dmabuf_allocator_get_format (GstAllocator * allocator,
-    GstVideoInfo * info, guint * usage_hint)
+    GstVideoInfoDmaDrm * info, guint * usage_hint)
 {
   GstVaDmabufAllocator *self = GST_VA_DMABUF_ALLOCATOR (allocator);
 
-  if (GST_VIDEO_INFO_FORMAT (&self->info) == GST_VIDEO_FORMAT_UNKNOWN)
+  if (GST_VIDEO_INFO_FORMAT (&self->info.vinfo) == GST_VIDEO_FORMAT_UNKNOWN)
     return FALSE;
 
   if (info)
@@ -966,14 +1037,33 @@
   return TRUE;
 }
 
+static gboolean
+_is_fd_repeated (uintptr_t fdsGST_VIDEO_MAX_PLANES, guint cur, guint * prev)
+{
+  guint i;
+
+  g_assert (cur <= GST_VIDEO_MAX_PLANES);
+
+  if (cur == 0)
+    return FALSE;
+
+  for (i = 0; i < cur; i++) {
+    if (fdsi == fdscur) {
+      if (prev)
+        *prev = i;
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+
 /**
  * gst_va_dmabuf_memories_setup:
  * @display: a #GstVaDisplay
- * @info: a #GstVideoInfo
- * @n_planes: number of planes
+ * @drm_info: a #GstVideoInfoDmaDrm
  * @mem: (array fixed-size=4) (element-type GstMemory): Memories. One
  *     per plane.
- * @fds: (array length=n_planes) (element-type uintptr_t): array of
+ * @fds: (array fixed-size=4) (element-type uintptr_t): array of
  *     DMABuf file descriptors.
  * @offset: (array fixed-size=4) (element-type gsize): array of memory
  *     offsets.
@@ -988,37 +1078,44 @@
  * Since: 1.22
  */
 /* XXX: use a surface pool to control the created surfaces */
-/* XXX: remove n_planes argument and use GST_VIDEO_INFO_N_PLANES (info) */
 gboolean
-gst_va_dmabuf_memories_setup (GstVaDisplay * display, GstVideoInfo * info,
-    guint n_planes, GstMemory * memGST_VIDEO_MAX_PLANES,
-    uintptr_t * fds, gsize offsetGST_VIDEO_MAX_PLANES, guint usage_hint)
+gst_va_dmabuf_memories_setup (GstVaDisplay * display,
+    GstVideoInfoDmaDrm * drm_info, GstMemory * memGST_VIDEO_MAX_PLANES,
+    uintptr_t fdsGST_VIDEO_MAX_PLANES, gsize offsetGST_VIDEO_MAX_PLANES,
+    guint usage_hint)
 {
   GstVideoFormat format;
   GstVaBufferSurface *buf;
+  GstVideoInfo *info = &drm_info->vinfo;
   /* *INDENT-OFF* */
-  VASurfaceAttribExternalBuffers ext_buf = {
+  VADRMPRIMESurfaceDescriptor desc = {
     .width = GST_VIDEO_INFO_WIDTH (info),
     .height = GST_VIDEO_INFO_HEIGHT (info),
-    .data_size = GST_VIDEO_INFO_SIZE (info),
-    .num_planes = GST_VIDEO_INFO_N_PLANES (info),
-    .buffers = fds,
-    .num_buffers = GST_VIDEO_INFO_N_PLANES (info),
+    /* GStreamer can only describe one PRIME layer */
+    .num_layers = 1,
   };
   /* *INDENT-ON* */
   VASurfaceID surface;
-  guint32 fourcc, rt_format;
-  guint i;
+  guint32 fourcc, rt_format, drm_fourcc;
+  guint64 drm_modifier;
+  guint i, j, prev, n_planes;
   gboolean ret;
 
   g_return_val_if_fail (GST_IS_VA_DISPLAY (display), FALSE);
-  g_return_val_if_fail (n_planes > 0
-      && n_planes <= GST_VIDEO_MAX_PLANES, FALSE);
 
-  format = GST_VIDEO_INFO_FORMAT (info);
+  n_planes = GST_VIDEO_INFO_N_PLANES (info);
+
+  format = (drm_info->drm_fourcc == DRM_FORMAT_INVALID) ?
+      GST_VIDEO_INFO_FORMAT (info) :
+      gst_va_video_format_from_drm_fourcc (drm_info->drm_fourcc);
   if (format == GST_VIDEO_FORMAT_UNKNOWN)
     return FALSE;
 
+  drm_fourcc = (drm_info->drm_fourcc == DRM_FORMAT_INVALID) ?
+      gst_va_drm_fourcc_from_video_format (format) : drm_info->drm_fourcc;
+  if (drm_fourcc == 0)
+    return FALSE;
+
   rt_format = gst_va_chroma_from_video_format (format);
   if (rt_format == 0)
     return FALSE;
@@ -1027,23 +1124,41 @@
   if (fourcc == 0)
     return FALSE;
 
-  ext_buf.pixel_format = fourcc;
+  drm_modifier = (drm_info->drm_modifier == DRM_FORMAT_MOD_INVALID) ?
+      DRM_FORMAT_MOD_LINEAR : drm_info->drm_modifier;
 
-  for (i = 0; i < n_planes; i++) {
-    ext_buf.pitchesi = GST_VIDEO_INFO_PLANE_STRIDE (info, i);
-    ext_buf.offsetsi = offseti;
+  desc.fourcc = fourcc;
+  desc.layers0.num_planes = n_planes;
+  desc.layers0.drm_format = drm_fourcc;
+
+  for (i = j = 0; i < n_planes; i++) {
+    desc.layers0.pitchi = GST_VIDEO_INFO_PLANE_STRIDE (info, i);
+    desc.layers0.offseti = offseti;
+
+    if (_is_fd_repeated (fds, i, &prev)) {
+      desc.layers0.object_indexi = prev;
+      continue;
+    }
+
+    desc.objectsj.fd = fdsi;
+    desc.objectsj.size = _get_fd_size (fdsi);
+    desc.objectsj.drm_format_modifier = drm_modifier;
+
+    desc.layers0.object_indexi = j;
+    j++;
   }
 
-  ret = va_create_surfaces (display, rt_format, ext_buf.pixel_format,
-      ext_buf.width, ext_buf.height, usage_hint, &ext_buf, &surface, 1);
+  desc.num_objects = j;
+
+  ret = va_create_surfaces (display, rt_format, fourcc, desc.width, desc.height,
+      usage_hint, NULL, 0, &desc, &surface, 1);
   if (!ret)
     return FALSE;
 
-  GST_LOG_OBJECT (display, "Created surface %#x %dx%d", surface,
-      ext_buf.width, ext_buf.height);
+  GST_LOG_OBJECT (display, "Created surface %#x %dx%d", surface, desc.width,
+      desc.height);
 
-  buf = gst_va_buffer_surface_new (surface, rt_format, ext_buf.width,
-      ext_buf.height);
+  buf = gst_va_buffer_surface_new (surface);
   buf->display = gst_object_ref (display);
   buf->n_mems = n_planes;
   memcpy (buf->mems, mem, sizeof (buf->mems));
@@ -1077,7 +1192,6 @@
 
   GstVaDisplay *display;
 
-  GstVaFeature feat_use_derived;
   gboolean use_derived;
   GArray *surface_formats;
 
@@ -1086,7 +1200,6 @@
   guint32 fourcc;
   guint32 rt_format;
 
-  GstVideoInfo derived_info;
   GstVideoInfo info;
   guint usage_hint;
 
@@ -1171,7 +1284,7 @@
 
   g_mutex_clear (&va_mem->lock);
 
-  g_slice_free (GstVaMemory, va_mem);
+  g_free (va_mem);
 }
 
 static void
@@ -1192,7 +1305,7 @@
   mem->image.image_id = VA_INVALID_ID;
   mem->image.buf = VA_INVALID_ID;
 
-  mem->is_derived = TRUE;
+  mem->is_derived = FALSE;
   mem->is_dirty = FALSE;
   mem->prev_mapflags = 0;
   mem->mapped_data = NULL;
@@ -1209,6 +1322,15 @@
       0 /* align */ , 0 /* offset */ , size);
 }
 
+#ifndef G_OS_WIN32
+static inline gboolean
+_is_old_mesa (GstVaAllocator * va_allocator)
+{
+  return GST_VA_DISPLAY_IS_IMPLEMENTATION (va_allocator->display, MESA_GALLIUM)
+      && !gst_va_display_check_version (va_allocator->display, 23, 3);
+}
+#endif /* G_OS_WIN32 */
+
 static inline void
 _update_info (GstVideoInfo * info, const VAImage * image)
 {
@@ -1219,11 +1341,16 @@
     GST_VIDEO_INFO_PLANE_STRIDE (info, i) = image->pitchesi;
   }
 
-  GST_VIDEO_INFO_SIZE (info) = image->data_size;
+  /* Don't update image size for one planed images since drivers might add extra
+   * bits which will drop wrong raw images with filesink, for example. Multiple
+   * plane images require video meta */
+  if (image->num_planes > 1)
+    GST_VIDEO_INFO_SIZE (info) = image->data_size;
 }
 
 static inline gboolean
-_update_image_info (GstVaAllocator * va_allocator)
+_update_image_info (GstVaAllocator * va_allocator,
+    GstVaFeature feat_use_derived)
 {
   VASurfaceID surface;
   VAImage image = {.image_id = VA_INVALID_ID, };
@@ -1232,7 +1359,7 @@
   if (!va_create_surfaces (va_allocator->display, va_allocator->rt_format,
           va_allocator->fourcc, GST_VIDEO_INFO_WIDTH (&va_allocator->info),
           GST_VIDEO_INFO_HEIGHT (&va_allocator->info), va_allocator->usage_hint,
-          NULL, &surface, 1)) {
+          NULL, 0, NULL, &surface, 1)) {
     GST_ERROR_OBJECT (va_allocator, "Failed to create a test surface");
     return FALSE;
   }
@@ -1241,23 +1368,40 @@
       GST_VIDEO_INFO_WIDTH (&va_allocator->info),
       GST_VIDEO_INFO_HEIGHT (&va_allocator->info));
 
+#ifdef G_OS_WIN32
+  /* XXX: Derived image is problematic for D3D backend */
+  if (feat_use_derived != GST_VA_FEATURE_DISABLED) {
+    GST_INFO_OBJECT (va_allocator, "Disable image derive on Windows.");
+    feat_use_derived = GST_VA_FEATURE_DISABLED;
+  }
+  va_allocator->use_derived = FALSE;
+#else
+  /* XXX: Derived in radeonsi Mesa <23.3 can't use derived images for several
+   * cases
+   * https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24381
+   * https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26174
+   */
+  if (_is_old_mesa (va_allocator)) {
+    if (feat_use_derived != GST_VA_FEATURE_DISABLED) {
+      GST_INFO_OBJECT (va_allocator,
+          "Disable image derive on old Mesa (< 23.3).");
+      feat_use_derived = GST_VA_FEATURE_DISABLED;
+    }
+    va_allocator->use_derived = FALSE;
+  }
+#endif
   /* Try derived first, but different formats can never derive */
-  if (va_allocator->feat_use_derived != GST_VA_FEATURE_DISABLED
+  if (feat_use_derived != GST_VA_FEATURE_DISABLED
       && va_allocator->surface_format == va_allocator->img_format) {
-    if (va_get_derive_image (va_allocator->display, surface, &image)) {
-      va_allocator->use_derived = TRUE;
-      va_allocator->derived_info = va_allocator->info;
-      _update_info (&va_allocator->derived_info, &image);
-      va_destroy_image (va_allocator->display, image.image_id);
-    }
+    va_allocator->use_derived =
+        va_get_derive_image (va_allocator->display, surface, &image);
+    if (va_allocator->use_derived)
+      goto done;
     image.image_id = VA_INVALID_ID;     /* reset it */
   }
 
-  if (va_allocator->feat_use_derived == GST_VA_FEATURE_ENABLED
-      && !va_allocator->use_derived) {
+  if (feat_use_derived == GST_VA_FEATURE_ENABLED && !va_allocator->use_derived)
     GST_WARNING_OBJECT (va_allocator, "Derived images are disabled.");
-    va_allocator->feat_use_derived = GST_VA_FEATURE_DISABLED;
-  }
 
   /* Then we try to create a image. */
   if (!va_create_image (va_allocator->display, va_allocator->img_format,
@@ -1267,7 +1411,13 @@
     return FALSE;
   }
 
+done:
   _update_info (&va_allocator->info, &image);
+  if (GST_VIDEO_INFO_SIZE (&va_allocator->info) > image.data_size) {
+    GST_WARNING_OBJECT (va_allocator,
+        "image size is lesser than the minimum required");
+  }
+
   va_destroy_image (va_allocator->display, image.image_id);
   va_destroy_surfaces (va_allocator->display, &surface, 1);
 
@@ -1278,10 +1428,8 @@
 _va_map_unlocked (GstVaMemory * mem, GstMapFlags flags)
 {
   GstAllocator *allocator = GST_MEMORY_CAST (mem)->allocator;
-  GstVideoInfo *info;
   GstVaAllocator *va_allocator;
   GstVaDisplay *display;
-  gboolean use_derived;
 
   g_return_val_if_fail (mem->surface != VA_INVALID_ID, NULL);
   g_return_val_if_fail (GST_IS_VA_ALLOCATOR (allocator), NULL);
@@ -1307,53 +1455,18 @@
     goto success;
   }
 
-  if (va_allocator->feat_use_derived == GST_VA_FEATURE_ENABLED) {
-    use_derived = TRUE;
-  } else if (va_allocator->feat_use_derived == GST_VA_FEATURE_DISABLED) {
-    use_derived = FALSE;
-  } else {
-    switch (gst_va_display_get_implementation (display)) {
-      case GST_VA_IMPLEMENTATION_INTEL_IHD:
-        /* On Gen7+ Intel graphics the memory is mappable but not
-         * cached, so normal memcpy() access is very slow to read, but
-         * it's ok for writing. So let's assume that users won't prefer
-         * direct-mapped memory if they request read access. */
-        use_derived = va_allocator->use_derived && !(flags & GST_MAP_READ);
-        break;
-      case GST_VA_IMPLEMENTATION_INTEL_I965:
-        /* YUV derived images are tiled, so writing them is also
-         * problematic */
-        use_derived = va_allocator->use_derived && !((flags & GST_MAP_READ)
-            || ((flags & GST_MAP_WRITE)
-                && GST_VIDEO_INFO_IS_YUV (&va_allocator->derived_info)));
-        break;
-      case GST_VA_IMPLEMENTATION_MESA_GALLIUM:
-        /* Reading RGB derived images, with non-standard resolutions,
-         * looks like tiled too. TODO(victor): fill a bug in Mesa. */
-        use_derived = va_allocator->use_derived && !((flags & GST_MAP_READ)
-            && GST_VIDEO_INFO_IS_RGB (&va_allocator->derived_info));
-        break;
-      default:
-        use_derived = va_allocator->use_derived;
-        break;
-    }
-  }
-  if (use_derived)
-    info = &va_allocator->derived_info;
-  else
-    info = &va_allocator->info;
+  mem->is_derived = va_allocator->use_derived;
 
-  if (!va_ensure_image (display, mem->surface, info, &mem->image, use_derived))
+  if (!va_ensure_image (display, mem->surface, &va_allocator->info, &mem->image,
+          va_allocator->use_derived))
     return NULL;
 
-  mem->is_derived = use_derived;
-
   if (!mem->is_derived) {
     if (!va_get_image (display, mem->surface, &mem->image))
       goto fail;
   }
 
-  if (!va_map_buffer (display, mem->image.buf, &mem->mapped_data))
+  if (!va_map_buffer (display, mem->image.buf, flags, &mem->mapped_data))
     goto fail;
 
 success:
@@ -1445,7 +1558,7 @@
   if (size == -1)
     size = mem->maxsize - offset;
 
-  sub = g_slice_new (GstVaMemory);
+  sub = g_new (GstVaMemory, 1);
 
   /* the shared memory is alwyas readonly */
   gst_memory_init (GST_MEMORY_CAST (sub), GST_MINI_OBJECT_FLAGS (parent) |
@@ -1540,8 +1653,6 @@
 
   gst_va_memory_pool_init (&self->pool);
 
-  self->feat_use_derived = GST_VA_FEATURE_AUTO;
-
   GST_OBJECT_FLAG_SET (self, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC);
 }
 
@@ -1590,11 +1701,11 @@
 
   if (!va_create_surfaces (self->display, self->rt_format, self->fourcc,
           GST_VIDEO_INFO_WIDTH (&self->info),
-          GST_VIDEO_INFO_HEIGHT (&self->info), self->usage_hint, NULL,
+          GST_VIDEO_INFO_HEIGHT (&self->info), self->usage_hint, NULL, 0, NULL,
           &surface, 1))
     return NULL;
 
-  mem = g_slice_new (GstVaMemory);
+  mem = g_new (GstVaMemory, 1);
 
   mem->surface = surface;
   mem->surface_format = self->surface_format;
@@ -1741,7 +1852,7 @@
  * Since: 1.22
  */
 static gboolean
-gst_va_allocator_try (GstAllocator * allocator)
+gst_va_allocator_try (GstAllocator * allocator, GstVaFeature feat_use_derived)
 {
   GstVaAllocator *self;
 
@@ -1773,7 +1884,7 @@
     return FALSE;
   }
 
-  if (!_update_image_info (self)) {
+  if (!_update_image_info (self, feat_use_derived)) {
     GST_ERROR_OBJECT (allocator, "Failed to update allocator info");
     return FALSE;
   }
@@ -1794,7 +1905,7 @@
  * @allocator: a #GstAllocator
  * @info: (inout): a #GstVideoInfo
  * @usage_hint: VA usage hint
- * @use_derived: a #GstVaFeature
+ * @feat_use_derived: a #GstVaFeature
  *
  * Sets the configuration defined by @info, @usage_hint and
  * @use_derived for @allocator, and it tries the configuration, if
@@ -1811,9 +1922,10 @@
  */
 gboolean
 gst_va_allocator_set_format (GstAllocator * allocator, GstVideoInfo * info,
-    guint usage_hint, GstVaFeature use_derived)
+    guint usage_hint, GstVaFeature feat_use_derived)
 {
   GstVaAllocator *self;
+  gboolean use_derived;
   gboolean ret;
 
   g_return_val_if_fail (GST_IS_VA_ALLOCATOR (allocator), FALSE);
@@ -1821,12 +1933,14 @@
 
   self = GST_VA_ALLOCATOR (allocator);
 
+  use_derived = feat_use_derived == GST_VA_FEATURE_AUTO ? self->use_derived
+      : feat_use_derived == GST_VA_FEATURE_DISABLED ? FALSE : TRUE;
+
   if (gst_va_memory_pool_surface_count (&self->pool) != 0) {
     if (GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_INFO_FORMAT (&self->info)
         && GST_VIDEO_INFO_WIDTH (info) == GST_VIDEO_INFO_WIDTH (&self->info)
         && GST_VIDEO_INFO_HEIGHT (info) == GST_VIDEO_INFO_HEIGHT (&self->info)
-        && usage_hint == self->usage_hint
-        && use_derived == self->feat_use_derived) {
+        && usage_hint == self->usage_hint && use_derived == self->use_derived) {
       *info = self->info;       /* update callee info (offset & stride) */
       return TRUE;
     }
@@ -1834,12 +1948,11 @@
   }
 
   self->usage_hint = usage_hint;
-  self->feat_use_derived = use_derived;
   self->info = *info;
 
   g_clear_pointer (&self->copy, gst_va_surface_copy_free);
 
-  ret = gst_va_allocator_try (allocator);
+  ret = gst_va_allocator_try (allocator, feat_use_derived);
   if (ret)
     *info = self->info;
 
@@ -1851,8 +1964,8 @@
  * @allocator: a #GstAllocator
  * @info: (out) (optional): a #GstVideoInfo
  * @usage_hint: (out) (optional): VA usage hint
- * @use_derived: (out) (optional): a #GstVaFeature if derived images
- *     are used for buffer mapping.
+ * @use_derived: (out) (optional): whether derived images are used for buffer
+ *     mapping.
  *
  * Gets current internal configuration of @allocator.
  *
@@ -1863,7 +1976,7 @@
  */
 gboolean
 gst_va_allocator_get_format (GstAllocator * allocator, GstVideoInfo * info,
-    guint * usage_hint, GstVaFeature * use_derived)
+    guint * usage_hint, gboolean * use_derived)
 {
   GstVaAllocator *self;
 
@@ -1878,7 +1991,7 @@
   if (usage_hint)
     *usage_hint = self->usage_hint;
   if (use_derived)
-    *use_derived = self->feat_use_derived;
+    *use_derived = self->use_derived;
 
   return TRUE;
 }
@@ -2026,7 +2139,6 @@
   VASurfaceID surface = VA_INVALID_ID;
   GstVaDisplay *display = NULL;
   GstVideoFormat format;
-  gint width, height;
   GstVaBufferSurface *surface_buffer;
 
   mem = gst_buffer_peek_memory (buffer, 0);
@@ -2046,22 +2158,20 @@
     GstVaDmabufAllocator *self = GST_VA_DMABUF_ALLOCATOR (mem->allocator);
     guint32 fourcc, rt_format;
 
-    format = GST_VIDEO_INFO_FORMAT (&self->info);
+    format = GST_VIDEO_INFO_FORMAT (&self->info.vinfo);
     fourcc = gst_va_fourcc_from_video_format (format);
     rt_format = gst_va_chroma_from_video_format (format);
     if (fourcc == 0 || rt_format == 0) {
       GST_ERROR_OBJECT (self, "Unsupported format: %s",
-          gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&self->info)));
+          gst_video_format_to_string (format));
       return FALSE;
     }
 
     display = self->display;
-    width = GST_VIDEO_INFO_WIDTH (&self->info);
-    height = GST_VIDEO_INFO_HEIGHT (&self->info);
     if (!va_create_surfaces (self->display, rt_format, fourcc,
-            GST_VIDEO_INFO_WIDTH (&self->info),
-            GST_VIDEO_INFO_HEIGHT (&self->info), self->usage_hint, NULL,
-            &surface, 1))
+            GST_VIDEO_INFO_WIDTH (&self->info.vinfo),
+            GST_VIDEO_INFO_HEIGHT (&self->info.vinfo), self->usage_hint, NULL,
+            0, NULL, &surface, 1))
       return FALSE;
   } else if (GST_IS_VA_ALLOCATOR (mem->allocator)) {
     GstVaAllocator *self = GST_VA_ALLOCATOR (mem->allocator);
@@ -2072,13 +2182,11 @@
     }
 
     display = self->display;
-    width = GST_VIDEO_INFO_WIDTH (&self->info);
-    height = GST_VIDEO_INFO_HEIGHT (&self->info);
     format = GST_VIDEO_INFO_FORMAT (&self->info);
     if (!va_create_surfaces (self->display, self->rt_format, self->fourcc,
             GST_VIDEO_INFO_WIDTH (&self->info),
-            GST_VIDEO_INFO_HEIGHT (&self->info), self->usage_hint, NULL,
-            &surface, 1))
+            GST_VIDEO_INFO_HEIGHT (&self->info), self->usage_hint, NULL, 0,
+            NULL, &surface, 1))
       return FALSE;
   } else {
     g_assert_not_reached ();
@@ -2087,7 +2195,7 @@
   if (!display || surface == VA_INVALID_ID)
     return FALSE;
 
-  surface_buffer = gst_va_buffer_surface_new (surface, format, width, height);
+  surface_buffer = gst_va_buffer_surface_new (surface);
   surface_buffer->display = gst_object_ref (display);
   g_atomic_int_add (&surface_buffer->ref_count, 1);

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstvaallocator.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvaallocator.h Changed

@@ -49,22 +49,26 @@
 void                  gst_va_dmabuf_allocator_flush       (GstAllocator * allocator);
 GST_VA_API
 gboolean              gst_va_dmabuf_allocator_set_format  (GstAllocator * allocator,
-                                                           GstVideoInfo * info,
+                                                           GstVideoInfoDmaDrm * info,
                                                            guint usage_hint);
 GST_VA_API
 gboolean              gst_va_dmabuf_allocator_get_format  (GstAllocator * allocator,
-                                                           GstVideoInfo * info,
+                                                           GstVideoInfoDmaDrm * info,
                                                            guint * usage_hint);
 
 GST_VA_API
 gboolean              gst_va_dmabuf_memories_setup        (GstVaDisplay * display,
-                                                           GstVideoInfo * info,
-                                                           guint n_planes,
+                                                           GstVideoInfoDmaDrm * drm_info,
                                                            GstMemory * memGST_VIDEO_MAX_PLANES,
-                                                           uintptr_t * fds,
+                                                           uintptr_t fdsGST_VIDEO_MAX_PLANES,
                                                            gsize offsetGST_VIDEO_MAX_PLANES,
                                                            guint usage_hint);
 
+GST_VA_API
+guint64               gst_va_dmabuf_get_modifier_for_format (GstVaDisplay * display,
+                                                             GstVideoFormat format,
+                                                             guint usage_hint);
+
 #define GST_TYPE_VA_ALLOCATOR (gst_va_allocator_get_type())
 #define GST_VA_ALLOCATOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_VA_ALLOCATOR, GstVaAllocator))
 #define GST_VA_ALLOCATOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_VA_ALLOCATOR, GstVaAllocatorClass))
@@ -109,12 +113,12 @@
 gboolean              gst_va_allocator_set_format         (GstAllocator * allocator,
                                                            GstVideoInfo * info,
                                                            guint usage_hint,
-                                                           GstVaFeature use_derived);
+                                                           GstVaFeature feat_use_derived);
 GST_VA_API
 gboolean              gst_va_allocator_get_format         (GstAllocator * allocator,
                                                            GstVideoInfo * info,
                                                            guint * usage_hint,
-                                                           GstVaFeature * use_derived);
+                                                           gboolean * use_derived);
 GST_VA_API
 void                  gst_va_allocator_set_hacks          (GstAllocator * allocator,
                                                            guint32 hacks);

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstvadisplay.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvadisplay.c Changed

@@ -43,6 +43,7 @@
 
 #include "gstvadisplay.h"
 
+#include <stdio.h>              /* sscanf */
 #include <va/va.h>
 
 GST_DEBUG_CATEGORY (gst_va_display_debug);
@@ -57,6 +58,9 @@
   gboolean init;
   GstVaImplementation impl;
   gchar *vendor_desc;
+
+  guint driver_major;
+  guint driver_minor;
 };
 
 #define gst_va_display_parent_class parent_class
@@ -88,12 +92,82 @@
   return GST_VA_IMPLEMENTATION_OTHER;
 }
 
+static char *
+_get_desc (const char *vendor, GstVaImplementation impl)
+{
+  char *end, *start;
+  char desc1024;
+  size_t size;
+
+  if (impl == GST_VA_IMPLEMENTATION_OTHER)
+    return g_strdup (vendor);
+
+  start = strstr (vendor, "for ");
+  if (!start)
+    return g_strdup (vendor);
+  start += 4;
+
+  switch (impl) {
+    case GST_VA_IMPLEMENTATION_MESA_GALLIUM:
+      end = strchr (start, '(');
+      break;
+    default:
+      end = strstr (start, "- ");
+      break;
+  }
+
+  if (!end)
+    return g_strdup (vendor);
+  end -= 1;
+
+  size = MIN (1024, end - start);
+  memcpy (desc, start, size);
+  descsize = '\0';
+  return g_strdup (desc);
+}
+
+static gboolean
+_get_driver_version (const char *vendor, GstVaImplementation impl,
+    guint * major, guint * minor)
+{
+  guint maj, min;
+
+  if (!vendor)
+    return FALSE;
+
+  switch (impl) {
+    case GST_VA_IMPLEMENTATION_MESA_GALLIUM:
+      if (sscanf (vendor, "Mesa Gallium driver %d.%d.", &maj, &min) == 2) {
+        *major = maj;
+        *minor = min;
+        return TRUE;
+      }
+      break;
+    case GST_VA_IMPLEMENTATION_INTEL_IHD:
+    case GST_VA_IMPLEMENTATION_INTEL_I965:{
+      char *end = strstr (vendor, " - ");
+      if (end && sscanf (end, " - %d.%d.", &maj, &min) == 2) {
+        *major = maj;
+        *minor = min;
+        return TRUE;
+      }
+      break;
+    }
+    default:
+      break;
+  }
+
+  return FALSE;
+}
+
 static gboolean
 _gst_va_display_filter_driver (GstVaDisplay * self, gpointer foreign_display)
 {
   GstVaDisplayPrivate *priv = GET_PRIV (self);
   VADisplay dpy;
   const char *vendor;
+  GstVaImplementation impl;
+  guint major, minor;
 
   g_assert ((foreign_display != NULL) ^ (priv->display != NULL));
   dpy = foreign_display ? foreign_display : priv->display;
@@ -101,14 +175,24 @@
   vendor = vaQueryVendorString (dpy);
   GST_INFO ("VA-API driver vendor: %s", vendor);
 
-  /* XXX(victor): driver allow list */
+  impl = _get_implementation (vendor);
 
   if (foreign_display) {
     priv->display = foreign_display;
     priv->foreign = TRUE;
+  } else {
+    if (g_getenv ("GST_VA_ALL_DRIVERS") == NULL
+        && impl == GST_VA_IMPLEMENTATION_OTHER) {
+      GST_WARNING_OBJECT (self, "Unsupported driver: %s", vendor);
+      return FALSE;
+    }
+  }
+  priv->impl = impl;
+  priv->vendor_desc = _get_desc (vendor, priv->impl);
+  if (_get_driver_version (vendor, priv->impl, &major, &minor)) {
+    priv->driver_major = major;
+    priv->driver_minor = minor;
   }
-  priv->impl = _get_implementation (vendor);
-  priv->vendor_desc = g_strdup (vendor);
 
   return TRUE;
 }
@@ -130,6 +214,7 @@
   /* assume driver is already initialized */
   priv->init = TRUE;
 
+  /* assumed that user knows what's doing so all drivers are allowed */
   _gst_va_display_filter_driver (self, display);
 }
 
@@ -369,3 +454,34 @@
   priv = GET_PRIV (self);
   return priv->impl;
 }
+
+/**
+ * gst_va_display_check_version:
+ * @self: a #GstVaDisplay
+ * @major: major version to check
+ * @minor: minor version to check
+ *
+ * Returns: whether driver version is equal or greater than @major.@minor
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_va_display_check_version (GstVaDisplay * self, guint major, guint minor)
+{
+  GstVaDisplayPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_VA_DISPLAY (self), FALSE);
+
+  priv = GET_PRIV (self);
+
+  /* if cannot parse the version, all it's valid */
+  if (priv->driver_major == 0 && priv->driver_minor == 0)
+    return TRUE;
+
+  if (priv->driver_major < major)
+    return FALSE;
+  if (priv->driver_minor < minor)
+    return FALSE;
+
+  return TRUE;
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstvadisplay.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvadisplay.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstvadisplay_drm.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvadisplay_drm.c Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvadisplay_win32.cpp Added

@@ -0,0 +1,326 @@
+/* GStreamer
+ * Copyright (C) 2020 Igalia, S.L.
+ *     Author: Víctor Jáquez <vjaquez@igalia.com>
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:gstvadisplaywin32
+ * @title: GstVaDisplayWin32
+ * @short_description: VADisplay from a Win32 Direct3D12 backend
+ * @sources:
+ * - gstvadisplay_win32.h
+ *
+ * This is a #GstVaDisplay subclass to instantiate for Win32 Direct3D12 backend.
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef INITGUID
+#include <initguid.h>
+#endif
+
+#include "gstvadisplay_win32.h"
+#include <wrl.h>
+#include <dxgi.h>
+#include <va/va_win32.h>
+#include <string>
+#include <vector>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+extern "C" {
+GST_DEBUG_CATEGORY_EXTERN (gst_va_display_debug);
+#define GST_CAT_DEFAULT gst_va_display_debug
+}
+/* *INDENT-ON* */
+
+/**
+ * GstVaDisplayWin32:
+ *
+ * Since: 1.24
+ */
+struct _GstVaDisplayWin32
+{
+  GstVaDisplay parent;
+
+  gchar *adapter_luid_str;
+  gint64 adapter_luid;
+  guint device_id;
+  guint vendor_id;
+  gchar *desc;
+};
+
+/**
+ * GstVaDisplayWin32Class:
+ *
+ * Since: 1.24
+ */
+struct _GstVaDisplayWin32Class
+{
+  GstVaDisplayClass parent_class;
+};
+
+enum
+{
+  PROP_0,
+  PROP_PATH,
+  PROP_ADAPTER_LUID,
+  PROP_DEVICE_ID,
+  PROP_VENDOR_ID,
+  PROP_DESC,
+};
+
+static void gst_va_display_win32_finalize (GObject * object);
+static void gst_va_display_win32_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+static void gst_va_display_win32_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static gpointer gst_va_display_win32_create_va_display (GstVaDisplay * display);
+
+#define gst_va_display_win32_parent_class parent_class
+G_DEFINE_TYPE (GstVaDisplayWin32, gst_va_display_win32, GST_TYPE_VA_DISPLAY);
+
+static void
+gst_va_display_win32_class_init (GstVaDisplayWin32Class * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstVaDisplayClass *display_class = GST_VA_DISPLAY_CLASS (klass);
+  GParamFlags construct_only_flags = (GParamFlags)
+      (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+
+  object_class->get_property = gst_va_display_win32_get_property;
+  object_class->set_property = gst_va_display_win32_set_property;
+  object_class->finalize = gst_va_display_win32_finalize;
+
+  g_object_class_install_property (object_class, PROP_PATH,
+      g_param_spec_string ("path", "Path",
+          "String representation of DXGI Adapter LUID",
+          nullptr, construct_only_flags));
+  g_object_class_install_property (object_class, PROP_ADAPTER_LUID,
+      g_param_spec_int64 ("adapter-luid", "Adapter LUID",
+          "DXGI Adapter LUID",
+          G_MININT64, G_MAXINT64, 0, construct_only_flags));
+  g_object_class_install_property (object_class, PROP_DEVICE_ID,
+      g_param_spec_uint ("device-id", "Device Id",
+          "DXGI Device ID", 0, G_MAXUINT32, 0, construct_only_flags));
+  g_object_class_install_property (object_class, PROP_VENDOR_ID,
+      g_param_spec_uint ("vendor-id", "Vendor Id",
+          "DXGI Vendor ID", 0, G_MAXUINT32, 0, construct_only_flags));
+  g_object_class_override_property (object_class, PROP_DESC, "description");
+
+  display_class->create_va_display =
+      GST_DEBUG_FUNCPTR (gst_va_display_win32_create_va_display);
+}
+
+static void
+gst_va_display_win32_init (GstVaDisplayWin32 * self)
+{
+}
+
+static void
+gst_va_display_win32_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstVaDisplayWin32 *self = GST_VA_DISPLAY_WIN32 (object);
+
+  switch (prop_id) {
+    case PROP_PATH:
+      g_value_set_string (value, self->adapter_luid_str);
+      break;
+    case PROP_ADAPTER_LUID:
+      g_value_set_int64 (value, self->adapter_luid);
+      break;
+    case PROP_DEVICE_ID:
+      g_value_set_uint (value, self->device_id);
+      break;
+    case PROP_VENDOR_ID:
+      g_value_set_uint (value, self->vendor_id);
+      break;
+    case PROP_DESC:
+      g_value_set_string (value, self->desc);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_va_display_win32_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstVaDisplayWin32 *self = GST_VA_DISPLAY_WIN32 (object);
+
+  switch (prop_id) {
+    case PROP_PATH:
+      self->adapter_luid_str = g_value_dup_string (value);
+      break;
+    case PROP_ADAPTER_LUID:
+      self->adapter_luid = g_value_get_int64 (value);
+      break;
+    case PROP_DEVICE_ID:
+      self->device_id = g_value_get_uint (value);
+      break;
+    case PROP_VENDOR_ID:
+      self->vendor_id = g_value_get_uint (value);
+      break;
+    case PROP_DESC:
+      self->desc = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_va_display_win32_finalize (GObject * object)
+{
+  GstVaDisplayWin32 *self = GST_VA_DISPLAY_WIN32 (object);
+
+  g_free (self->adapter_luid_str);
+  g_free (self->desc);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static gpointer
+gst_va_display_win32_create_va_display (GstVaDisplay * display)
+{
+  GstVaDisplayWin32 *self = GST_VA_DISPLAY_WIN32 (display);
+  LARGE_INTEGER val;
+  LUID luid;
+
+  val.QuadPart = self->adapter_luid;
+  luid.LowPart = val.LowPart;
+  luid.HighPart = val.HighPart;
+
+  return vaGetDisplayWin32 (&luid);
+}
+
+/**
+ * gst_va_display_win32_new:
+ * @adapter_luid: DXGI adapter luid
+ *
+ * Creates a new #GstVaDisplay from Win32 Direct3D backend
+ *
+ * Returns: (transfer full): a newly allocated #GstVaDisplay if the
+ *     specified Win32 backend could be opened and initialized;
+ *     otherwise %NULL is returned.
+ *
+ * Since: 1.24
+ */
+GstVaDisplay *
+gst_va_display_win32_new (const gchar * adapter_luid)
+{
+  GstVaDisplayWin32 *self;
+  HRESULT hr;
+  ComPtr < IDXGIFactory1 > factory;
+  DXGI_ADAPTER_DESC desc;
+  gint64 adapter_luid_i64;
+  gchar *desc_str;
+  gint max_profiles, max_entry_points;
+  gint num_profiles;
+  VAStatus status;
+  VADisplay dpy;
+  std::vector < VAEntrypoint > entry_points;
+  std::vector < VAProfile > profiles;
+
+  g_return_val_if_fail (adapter_luid != nullptr, nullptr);
+
+  /* *INDENT-OFF* */
+  try {
+    adapter_luid_i64 = std::stoll (adapter_luid);
+  } catch (...) {
+    return nullptr;
+  }
+  /* *INDENT-ON* */
+
+  hr = CreateDXGIFactory1 (IID_PPV_ARGS (&factory));
+  if (FAILED (hr))
+    return nullptr;
+
+  for (guint i = 0;; i++) {
+    ComPtr < IDXGIAdapter > adapter;
+    LARGE_INTEGER val;
+
+    hr = factory->EnumAdapters (i, &adapter);
+    if (FAILED (hr))
+      return nullptr;
+
+    hr = adapter->GetDesc (&desc);
+    if (FAILED (hr))
+      continue;
+
+    val.LowPart = desc.AdapterLuid.LowPart;
+    val.HighPart = desc.AdapterLuid.HighPart;
+
+    if (val.QuadPart == adapter_luid_i64)
+      break;
+  }
+
+  desc_str = g_utf16_to_utf8 ((gunichar2 *) desc.Description,
+      -1, nullptr, nullptr, nullptr);
+
+  self = (GstVaDisplayWin32 *) g_object_new (gst_va_display_win32_get_type (),
+      "path", adapter_luid, "adapter-luid", adapter_luid_i64, "device-id",
+      desc.DeviceId, "vendor-id", desc.VendorId, nullptr);
+  self->desc = desc_str;
+  if (!gst_va_display_initialize (GST_VA_DISPLAY (self)))
+    goto error;
+
+  /* Validate device */
+  dpy = gst_va_display_get_va_dpy (GST_VA_DISPLAY (self));
+
+  max_profiles = vaMaxNumProfiles (dpy);
+  if (max_profiles <= 0)
+    goto error;
+
+  max_entry_points = vaMaxNumEntrypoints (dpy);
+  if (max_entry_points <= 0)
+    goto error;
+
+  profiles.resize (max_profiles);
+
+  status = vaQueryConfigProfiles (dpy, &profiles0, &num_profiles);
+  if (status != VA_STATUS_SUCCESS || num_profiles <= 0)
+    goto error;
+
+  entry_points.resize (max_entry_points);
+  for (gint i = 0; i < num_profiles; i++) {
+    gint num_entry_poinits;
+    status = vaQueryConfigEntrypoints (dpy, profilesi, &entry_points0,
+        &num_entry_poinits);
+    if (status != VA_STATUS_SUCCESS)
+      goto error;
+  }
+
+  gst_object_ref_sink (self);
+
+  return GST_VA_DISPLAY (self);
+
+error:
+  gst_object_unref (self);
+  return nullptr;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvadisplay_win32.h Added

@@ -0,0 +1,35 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/va/va_fwd.h>
+#include <gst/va/va-prelude.h>
+#include <gst/va/gstvadisplay.h>
+
+G_BEGIN_DECLS
+
+GST_VA_API
+G_DECLARE_FINAL_TYPE (GstVaDisplayWin32, gst_va_display_win32,
+    GST, VA_DISPLAY_WIN32, GstVaDisplay);
+
+GST_VA_API
+GstVaDisplay * gst_va_display_win32_new	(const gchar * adapter_luid);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstvapool.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvapool.c Changed

@@ -35,6 +35,7 @@
 #endif
 
 #include "gstvapool.h"
+#include "gstvavideoformat.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_va_pool_debug);
 #define GST_CAT_DEFAULT gst_va_pool_debug
@@ -55,7 +56,12 @@
   GstBufferPool parent;
 
   GstVideoInfo alloc_info;
-  GstVideoInfo caps_info;
+  union
+  {
+    GstVideoInfo caps_info;
+    /* GstVideoInfoDmaDrm contains GstVideoInfo. */
+    GstVideoInfoDmaDrm caps_info_drm;
+  };
   GstAllocator *allocator;
   gboolean force_videometa;
   gboolean add_videometa;
@@ -116,7 +122,8 @@
   GstCaps *caps;
   GstVaPool *vpool = GST_VA_POOL (pool);
   GstVideoAlignment video_align = { 0, };
-  GstVideoInfo caps_info, alloc_info;
+  GstVideoInfo orginal_alloc_info;
+  GstVideoInfoDmaDrm alloc_info_drm;
   gint width, height;
   guint i, min_buffers, max_buffers;
   guint32 usage_hint;
@@ -130,22 +137,40 @@
   if (!caps)
     goto no_caps;
 
-  if (!gst_video_info_from_caps (&caps_info, caps))
-    goto wrong_caps;
-
   if (!gst_buffer_pool_config_get_allocator (config, &allocator, NULL))
     goto wrong_config;
 
-  if (!(allocator && (GST_IS_VA_DMABUF_ALLOCATOR (allocator)
-              || GST_IS_VA_ALLOCATOR (allocator))))
+  if (!allocator)
     goto wrong_config;
 
+  gst_video_info_dma_drm_init (&vpool->caps_info_drm);
+  if (gst_video_is_dma_drm_caps (caps)) {
+    GstVideoInfo info;
+
+    if (!GST_IS_VA_DMABUF_ALLOCATOR (allocator))
+      goto wrong_caps;
+
+    if (!gst_video_info_dma_drm_from_caps (&vpool->caps_info_drm, caps))
+      goto wrong_caps;
+
+    if (!gst_va_dma_drm_info_to_video_info (&vpool->caps_info_drm, &info))
+      goto wrong_caps;
+
+    vpool->caps_info_drm.vinfo = info;
+  } else {
+    if (!GST_IS_VA_ALLOCATOR (allocator))
+      goto wrong_caps;
+
+    if (!gst_video_info_from_caps (&vpool->caps_info, caps))
+      goto wrong_caps;
+  }
+
   if (!gst_buffer_pool_config_get_va_allocation_params (config, &usage_hint,
           &use_derived))
     goto wrong_config;
 
-  width = GST_VIDEO_INFO_WIDTH (&caps_info);
-  height = GST_VIDEO_INFO_HEIGHT (&caps_info);
+  width = GST_VIDEO_INFO_WIDTH (&vpool->caps_info);
+  height = GST_VIDEO_INFO_HEIGHT (&vpool->caps_info);
 
   GST_LOG_OBJECT (vpool, "%dx%d | %" GST_PTR_FORMAT, width, height, caps);
 
@@ -168,31 +193,36 @@
   }
 
   /* update allocation info with aligned size */
-  alloc_info = caps_info;
-  GST_VIDEO_INFO_WIDTH (&alloc_info) = width;
-  GST_VIDEO_INFO_HEIGHT (&alloc_info) = height;
+  alloc_info_drm = vpool->caps_info_drm;
+  g_assert (GST_VIDEO_INFO_FORMAT (&alloc_info_drm.vinfo) !=
+      GST_VIDEO_FORMAT_UNKNOWN
+      && GST_VIDEO_INFO_FORMAT (&alloc_info_drm.vinfo) !=
+      GST_VIDEO_FORMAT_DMA_DRM);
+  GST_VIDEO_INFO_WIDTH (&alloc_info_drm.vinfo) = width;
+  GST_VIDEO_INFO_HEIGHT (&alloc_info_drm.vinfo) = height;
+
+  orginal_alloc_info = alloc_info_drm.vinfo;
 
   if (GST_IS_VA_DMABUF_ALLOCATOR (allocator)) {
-    if (!gst_va_dmabuf_allocator_set_format (allocator, &alloc_info,
+    if (!gst_va_dmabuf_allocator_set_format (allocator, &alloc_info_drm,
             usage_hint))
       goto failed_allocator;
   } else if (GST_IS_VA_ALLOCATOR (allocator)) {
-    if (!gst_va_allocator_set_format (allocator, &alloc_info, usage_hint,
-            use_derived))
+    if (!gst_va_allocator_set_format (allocator, &alloc_info_drm.vinfo,
+            usage_hint, use_derived))
       goto failed_allocator;
   }
 
   gst_object_replace ((GstObject **) & vpool->allocator,
       GST_OBJECT (allocator));
 
-  vpool->caps_info = caps_info;
-  vpool->alloc_info = alloc_info;
+  vpool->alloc_info = alloc_info_drm.vinfo;
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&caps_info); i++) {
-    if (GST_VIDEO_INFO_PLANE_STRIDE (&caps_info, i) !=
-        GST_VIDEO_INFO_PLANE_STRIDE (&alloc_info, i) ||
-        GST_VIDEO_INFO_PLANE_OFFSET (&caps_info, i) !=
-        GST_VIDEO_INFO_PLANE_OFFSET (&alloc_info, i)) {
+  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&orginal_alloc_info); i++) {
+    if (GST_VIDEO_INFO_PLANE_STRIDE (&orginal_alloc_info, i) !=
+        GST_VIDEO_INFO_PLANE_STRIDE (&alloc_info_drm.vinfo, i) ||
+        GST_VIDEO_INFO_PLANE_OFFSET (&orginal_alloc_info, i) !=
+        GST_VIDEO_INFO_PLANE_OFFSET (&alloc_info_drm.vinfo, i)) {
       GST_INFO_OBJECT (vpool, "Video meta is required in buffer.");
       vpool->force_videometa = TRUE;
       break;
@@ -200,7 +230,7 @@
   }
 
   gst_buffer_pool_config_set_params (config, caps,
-      GST_VIDEO_INFO_SIZE (&alloc_info), min_buffers, max_buffers);
+      GST_VIDEO_INFO_SIZE (&alloc_info_drm.vinfo), min_buffers, max_buffers);
 
   return GST_BUFFER_POOL_CLASS (parent_class)->set_config (pool, config);
 
@@ -435,7 +465,6 @@
 gboolean
 gst_va_pool_requires_video_meta (GstBufferPool * pool)
 {
-
   g_return_val_if_fail (GST_IS_VA_POOL (pool), FALSE);
 
   return GST_VA_POOL (pool)->force_videometa;
@@ -444,7 +473,6 @@
 /**
  * gst_va_pool_new_with_config:
  * @caps: the #GstCaps of the buffers handled by the new pool.
- * @size: the size of the frames to hold.
  * @min_buffers: minimum number of frames to create.
  * @max_buffers: maximum number of frames to create.
  * @usage_hint: VA usage hint
@@ -460,7 +488,7 @@
  * Since: 1.22
  */
 GstBufferPool *
-gst_va_pool_new_with_config (GstCaps * caps, guint size, guint min_buffers,
+gst_va_pool_new_with_config (GstCaps * caps, guint min_buffers,
     guint max_buffers, guint usage_hint, GstVaFeature use_derived,
     GstAllocator * allocator, GstAllocationParams * alloc_params)
 {
@@ -470,8 +498,8 @@
   pool = gst_va_pool_new ();
 
   config = gst_buffer_pool_get_config (pool);
-  gst_buffer_pool_config_set_params (config, caps, size, min_buffers,
-      max_buffers);
+  /* ignore the size since it's calculated by the driver */
+  gst_buffer_pool_config_set_params (config, caps, 0, min_buffers, max_buffers);
   gst_buffer_pool_config_set_va_allocation_params (config, usage_hint,
       use_derived);
   gst_buffer_pool_config_set_allocator (config, allocator, alloc_params);
@@ -482,3 +510,28 @@
 
   return pool;
 }
+
+/**
+ * gst_va_pool_get_buffer_size:
+ * @pool: a #GstBufferPool
+ * @size: (out) (allow-none): the declared surface size
+ *
+ * Helper function to retrieve the VA surface size provided by @pool.
+ *
+ * Returns: whether the surface size was retrieved.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_va_pool_get_buffer_size (GstBufferPool * pool, guint * size)
+{
+  gboolean ret;
+  GstStructure *config;
+
+  g_return_val_if_fail (GST_IS_VA_POOL (pool), FALSE);
+
+  config = gst_buffer_pool_get_config (pool);
+  ret = gst_buffer_pool_config_get_params (config, NULL, size, NULL, NULL);
+  gst_structure_free (config);
+  return ret && *size > 0;
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstvapool.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvapool.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstvasurfacecopy.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvasurfacecopy.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstvautils.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvautils.c Changed

@@ -32,8 +32,12 @@
 
 #include "gstvautils.h"
 
-#include <gst/va/gstvadisplay_drm.h>
-#include <gst/va/gstvadisplay_wrapped.h>
+#ifdef G_OS_WIN32
+#include "gstvadisplay_win32.h"
+#else
+#include "gstvadisplay_drm.h"
+#endif
+#include "gstvadisplay_wrapped.h"
 
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_CONTEXT);
 
@@ -232,8 +236,12 @@
   if (gst_va_display_found (element, g_atomic_pointer_get (display_ptr)))
     goto done;
 
+#ifdef G_OS_WIN32
+  display = gst_va_display_win32_new (render_device_path);
+#else
   /* If no neighbor, or application not interested, use drm. */
   display = gst_va_display_drm_new_from_path (render_device_path);
+#endif
 
   gst_object_replace ((GstObject **) display_ptr, (GstObject *) display);
 
@@ -374,10 +382,13 @@
 
   s = gst_context_get_structure (context);
   if (gst_structure_get (s, "gst-display", GST_TYPE_OBJECT, &display, NULL)) {
-    gchar *device_path = NULL;
     gboolean ret;
-
+    gchar *device_path = NULL;
+#ifdef G_OS_WIN32
+    if (GST_IS_VA_DISPLAY_WIN32 (display)) {
+#else
     if (GST_IS_VA_DISPLAY_DRM (display)) {
+#endif
       g_object_get (display, "path", &device_path, NULL);
       ret = (g_strcmp0 (device_path, render_device_path) == 0);
       g_free (device_path);

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstvavideoformat.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvavideoformat.c Changed

@@ -175,6 +175,21 @@
   return NULL;
 }
 
+static const struct FormatMap *
+get_format_map_from_drm_fourcc (guint drm_fourcc)
+{
+  int i;
+  GstVideoFormat format;
+
+  format = gst_video_dma_drm_fourcc_to_format (drm_fourcc);
+  for (i = 0; i < G_N_ELEMENTS (format_map); i++) {
+    if (format_mapi.format == format)
+      return &format_mapi;
+  }
+
+  return NULL;
+}
+
 static struct FormatMap *
 get_format_map_from_video_format (GstVideoFormat format)
 {
@@ -228,6 +243,20 @@
   return NULL;
 }
 
+/**
+ * XXX: there are two potentially different fourcc: the VA and the DRM.
+ *
+ * Normally they should be the same, but there are a couple formats where VA's
+ * fourcc is different from the DRM's fourcc. One example is
+ * GST_VIDEO_FORMAT_I420, where VA's fourcc is ('I', '4', '2', '0') while DRM's
+ * is ('Y', 'U', '1', '2').
+ *
+ * That's the reason there are two functions:
+ * gst_va_video_format_from_va_fourcc() and
+ * gst_va_video_format_from_drm_fourcc() They should be used depending where the
+ * value is going to be used: for VA concerns the first should be used, for
+ * DMABuf exportation, the last.
+ */
 GstVideoFormat
 gst_va_video_format_from_va_fourcc (guint fourcc)
 {
@@ -244,6 +273,22 @@
   return map ? map->va_format.fourcc : 0;
 }
 
+GstVideoFormat
+gst_va_video_format_from_drm_fourcc (guint fourcc)
+{
+  const struct FormatMap *map = get_format_map_from_drm_fourcc (fourcc);
+
+  return map ? map->format : GST_VIDEO_FORMAT_UNKNOWN;
+}
+
+guint
+gst_va_drm_fourcc_from_video_format (GstVideoFormat format)
+{
+  const struct FormatMap *map = get_format_map_from_video_format (format);
+
+  return map ? gst_video_dma_drm_fourcc_from_format (format) : 0;
+}
+
 guint
 gst_va_chroma_from_video_format (GstVideoFormat format)
 {
@@ -311,6 +356,49 @@
   return GST_VIDEO_FORMAT_UNKNOWN;
 }
 
+/* Convert the GstVideoInfoDmaDrm into a traditional GstVideoInfo
+   with recognized format. */
+gboolean
+gst_va_dma_drm_info_to_video_info (const GstVideoInfoDmaDrm * drm_info,
+    GstVideoInfo * info)
+{
+  GstVideoFormat video_format;
+  GstVideoInfo tmp_info;
+  guint i;
+
+  g_return_val_if_fail (drm_info, FALSE);
+  g_return_val_if_fail (info, FALSE);
+
+  if (GST_VIDEO_INFO_FORMAT (&drm_info->vinfo) != GST_VIDEO_FORMAT_DMA_DRM) {
+    *info = drm_info->vinfo;
+    return TRUE;
+  }
+
+  /* The non linear DMA format will be recognized as FORMAT_ENCODED,
+     but we still need to know its real format to set the info such
+     as pitch and stride. Because va plugins have its internal mapping
+     between drm fourcc and video format, we do not use the standard
+     conversion API here. */
+  video_format = gst_va_video_format_from_drm_fourcc (drm_info->drm_fourcc);
+  if (video_format == GST_VIDEO_FORMAT_UNKNOWN)
+    return FALSE;
+
+  if (!gst_video_info_set_format (&tmp_info, video_format,
+          GST_VIDEO_INFO_WIDTH (&drm_info->vinfo),
+          GST_VIDEO_INFO_HEIGHT (&drm_info->vinfo)))
+    return FALSE;
+
+  *info = drm_info->vinfo;
+  info->finfo = tmp_info.finfo;
+  for (i = 0; i < GST_VIDEO_MAX_PLANES; i++)
+    info->stridei = tmp_info.stridei;
+  for (i = 0; i < GST_VIDEO_MAX_PLANES; i++)
+    info->offseti = tmp_info.offseti;
+  info->size = tmp_info.size;
+
+  return TRUE;
+}
+
 static GstVideoFormat
 find_gst_video_format_in_rgb32_map (VAImageFormat * image_format)
 {
@@ -318,8 +406,9 @@
 
   for (i = 0; i < G_N_ELEMENTS (rgb32_format_map); i++) {
     for (j = 0; j < G_N_ELEMENTS (rgb32_format_mapi.va_format); j++) {
-      if (va_format_is_same (&rgb32_format_mapi.va_formatj, image_format))
+      if (va_format_is_same (&rgb32_format_mapi.va_formatj, image_format)) {
         return rgb32_format_mapi.format;
+      }
     }
   }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/gstvavideoformat.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/gstvavideoformat.h Changed

@@ -25,6 +25,23 @@
 #include <gst/video/video.h>
 #include <va/va.h>
 
+#ifndef G_OS_WIN32
+#include <libdrm/drm_fourcc.h>
+#else
+/**
+ * DRM_FORMAT_INVALID: (skip) (attributes doc.skip=true)
+ */
+#define DRM_FORMAT_INVALID     0
+/**
+ * DRM_FORMAT_MOD_LINEAR: (skip) (attributes doc.skip=true)
+ */
+#define DRM_FORMAT_MOD_LINEAR  0ULL
+/**
+ * DRM_FORMAT_MOD_INVALID: (skip) (attributes doc.skip=true)
+ */
+#define DRM_FORMAT_MOD_INVALID 0xffffffffffffff
+#endif
+
 G_BEGIN_DECLS
 
 GST_VA_API
@@ -34,6 +51,12 @@
 guint                 gst_va_fourcc_from_video_format     (GstVideoFormat format);
 
 GST_VA_API
+GstVideoFormat        gst_va_video_format_from_drm_fourcc (guint fourcc);
+
+GST_VA_API
+guint                 gst_va_drm_fourcc_from_video_format (GstVideoFormat format);
+
+GST_VA_API
 guint                 gst_va_chroma_from_video_format     (GstVideoFormat format);
 
 GST_VA_API
@@ -48,6 +71,11 @@
 GST_VA_API
 GstVideoFormat        gst_va_video_surface_format_from_image_format (GstVideoFormat image_format,
                                                                      GArray * surface_formats);
+
+GST_VA_API
+gboolean              gst_va_dma_drm_info_to_video_info   (const GstVideoInfoDmaDrm * drm_info,
+                                                           GstVideoInfo * info);
+
 GST_VA_API
 void                  gst_va_video_format_fix_map         (VAImageFormat * image_formats,
                                                            gint num);

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/meson.build Changed

@@ -1,7 +1,6 @@
 va_sources = files(
   'gstvaallocator.c',
   'gstvadisplay.c',
-  'gstvadisplay_drm.c',
   'gstvadisplay_wrapped.c',
   'gstvapool.c',
   'gstvautils.c',
@@ -17,7 +16,6 @@
   'gstva.h',
   'gstvaallocator.h',
   'gstvadisplay.h',
-  'gstvadisplay_drm.h',
   'gstvadisplay_wrapped.h',
   'gstvapool.h',
   'gstvautils.h',
@@ -25,24 +23,91 @@
   'va_fwd.h',
 )
 
+va_linux_sources = files(
+  'gstvadisplay_drm.c',
+)
+
+va_linux_headers = files(
+  'gstvadisplay_drm.h',
+)
+
+va_win32_sources = files(
+  'gstvadisplay_win32.cpp',
+)
+
+va_win32_headers = files(
+  'gstvadisplay_win32.h',
+)
+
 gstva_dep = dependency('', required : false)
+platform_deps = 
+extra_args = '-DGST_USE_UNSTABLE_API',
+              '-DBUILDING_GST_VA',
+              '-DG_LOG_DOMAIN="GStreamer-VA"'
 
-if host_system != 'linux'
+if host_system not in 'linux', 'windows'
   subdir_done()
 endif
 
-libva_req = '>= 1.6'
-libva_dep = dependency('libva', version: libva_req, required: false,
-    fallback: 'libva', 'libva_dep')
-libva_drm_dep = dependency('libva-drm', version: libva_req, required: false,
-    fallback: 'libva', 'libva_drm_dep')
+va_opt = get_option('va')
+if host_system == 'linux'
+  msdk_opt = get_option('msdk')
+  qsv_opt = get_option('qsv')
+  if va_opt.disabled() and msdk_opt.disabled() and qsv_opt.disabled()
+    subdir_done()
+  endif
+  va_required = va_opt.enabled() or msdk_opt.enabled() or qsv_opt.enabled()
+else
+  if va_opt.disabled()
+    subdir_done()
+  endif
+  va_required = va_opt
+endif
+
+libva_req = '>= 1.12'
+if host_system == 'windows'
+  libva_req = '>= 1.18'
+endif
 
-if not (libva_dep.found() and libva_drm_dep.found())
+libva_dep = dependency('libva', version: libva_req, required: va_required,
+    fallback: 'libva', 'libva_dep')
+if not libva_dep.found()
   subdir_done()
 endif
 
-libdrm_dep = dependency('libdrm', required: false, fallback: 'libdrm', 'ext_libdrm')
-cdata.set10('HAVE_LIBDRM', libdrm_dep.found())
+if host_system == 'linux'
+  libva_drm_dep = dependency('libva-drm', version: libva_req, required: va_required,
+      fallback: 'libva', 'libva_drm_dep')
+  if not libva_drm_dep.found()
+    subdir_done()
+  endif
+  platform_deps += libva_drm_dep
+
+  libdrm_dep = dependency('libdrm', version: '>=2.4', required: get_option('drm'))
+  if libdrm_dep.found()
+    platform_deps += libdrm_dep
+    extra_args += '-DHAVE_LIBDRM'
+  endif
+
+  va_sources += va_linux_sources
+  va_headers += va_linux_headers
+else
+  libva_win32_dep = dependency('libva-win32', version: libva_req, required: va_required,
+      fallback: 'libva', 'libva_win32_dep')
+  if not libva_win32_dep.found()
+    subdir_done()
+  endif
+
+  dxgi_lib = cc.find_library('dxgi', required: va_required)
+  if not dxgi_lib.found()
+    subdir_done()
+  endif
+
+  platform_deps += libva_win32_dep, dxgi_lib
+
+  va_sources += va_win32_sources
+  va_headers += va_win32_headers
+endif
 
 va_enums = gnome.mkenums_simple('va-enumtypes',
   sources: 'gstva.h',
@@ -58,12 +123,13 @@
 
 gstva = library('gstva-' + api_version,
   va_sources, va_sources_priv, va_enums,
-  c_args : gst_plugins_bad_args + '-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_VA', '-DG_LOG_DOMAIN="GStreamer-VA"',
+  c_args : gst_plugins_bad_args + extra_args,
+  cpp_args : gst_plugins_bad_args + extra_args,
   include_directories : configinc, libsinc,
   version : libversion,
   soversion : soversion,
   install : true,
-  dependencies : gst_dep, gstbase_dep, gstvideo_dep, gstallocators_dep, libva_dep, libva_drm_dep, libdrm_dep,
+  dependencies : gst_dep, gstbase_dep, gstvideo_dep, gstallocators_dep, libva_dep + platform_deps,
 )
 
 library_def = {'lib': gstva}
@@ -88,11 +154,12 @@
     'includes' : 'Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0',
     'install' : true,
     'extra_args' : gir_init_section + '-DGST_USE_UNSTABLE_API',
-    'dependencies' : gst_dep, gstbase_dep, gstvideo_dep, gstallocators_dep, libva_dep, libva_drm_dep, libdrm_dep
+    'dependencies' : gst_dep, gstbase_dep, gstvideo_dep, gstallocators_dep, libva_dep + platform_deps
   }
   library_def = {'lib': library_def'lib', 'gir': gir}
   if not static_build
     va_gir = gnome.generate_gir(gstva, kwargs: gir)
+    library_def += {'gir_targets':  library_def.get('gir_targets', ) + va_gir}
     va_gen_sources += va_gir
   endif
 endif
@@ -102,7 +169,7 @@
 
 gstva_dep = declare_dependency(link_with : gstva,
   include_directories : libsinc,
-  dependencies : gst_dep, gstvideo_dep, gstallocators_dep, libva_dep, libva_drm_dep, libdrm_dep,
+  dependencies : gst_dep, gstvideo_dep, gstallocators_dep, libva_dep + platform_deps,
   sources : va_gen_sources)
 
 meson.override_dependency(pkg_name, gstva_dep)

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/vasurfaceimage.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/vasurfaceimage.c Changed

@@ -48,15 +48,30 @@
   return TRUE;
 }
 
+static gboolean
+_rt_format_is_rgb (guint rt_format)
+{
+  switch (rt_format) {
+    case VA_RT_FORMAT_RGB16:
+    case VA_RT_FORMAT_RGB32:
+    case VA_RT_FORMAT_RGB32_10:
+      return TRUE;
+    default:
+      break;
+  }
+
+  return FALSE;
+}
+
 gboolean
 va_create_surfaces (GstVaDisplay * display, guint rt_format, guint fourcc,
-    guint width, guint height, gint usage_hint,
-    VASurfaceAttribExternalBuffers * ext_buf, VASurfaceID * surfaces,
-    guint num_surfaces)
+    guint width, guint height, gint usage_hint, guint64 * modifiers,
+    guint num_modifiers, VADRMPRIMESurfaceDescriptor * desc,
+    VASurfaceID * surfaces, guint num_surfaces)
 {
   VADisplay dpy = gst_va_display_get_va_dpy (display);
   /* *INDENT-OFF* */
-  VASurfaceAttrib attrs5 = {
+  VASurfaceAttrib attrs6 = {
     {
       .type = VASurfaceAttribUsageHint,
       .flags = VA_SURFACE_ATTRIB_SETTABLE,
@@ -67,16 +82,28 @@
       .type = VASurfaceAttribMemoryType,
       .flags = VA_SURFACE_ATTRIB_SETTABLE,
       .value.type = VAGenericValueTypeInteger,
-      .value.value.i = (ext_buf && ext_buf->num_buffers > 0)
-                               ? VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME
+      .value.value.i = (desc && desc->num_objects > 0)
+                               ? VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2
                                : VA_SURFACE_ATTRIB_MEM_TYPE_VA,
     },
   };
+  VADRMFormatModifierList modifier_list = {
+    .num_modifiers = num_modifiers,
+    .modifiers = modifiers,
+  };
+  VASurfaceAttribExternalBuffers extbuf = {
+    .width = width,
+    .height = height,
+    .num_planes = 1,
+    .pixel_format = fourcc,
+  };
   /* *INDENT-ON* */
   VAStatus status;
   guint num_attrs = 2;
 
   g_return_val_if_fail (num_surfaces > 0, FALSE);
+  /* must have modifiers when num_modifiers > 0 */
+  g_return_val_if_fail (num_modifiers == 0 || modifiers, FALSE);
 
   if (fourcc > 0) {
     /* *INDENT-OFF* */
@@ -89,19 +116,57 @@
     /* *INDENT-ON* */
   }
 
-  if (ext_buf) {
+  if (desc && desc->num_objects > 0) {
     /* *INDENT-OFF* */
     attrsnum_attrs++ = (VASurfaceAttrib) {
       .type = VASurfaceAttribExternalBufferDescriptor,
       .flags = VA_SURFACE_ATTRIB_SETTABLE,
       .value.type = VAGenericValueTypePointer,
-      .value.value.p = ext_buf,
+      .value.value.p = desc,
+    };
+    /* *INDENT-ON* */
+  } else if (GST_VA_DISPLAY_IS_IMPLEMENTATION (display, INTEL_I965)
+      && _rt_format_is_rgb (rt_format)) {
+    /* HACK(victor): disable tiling for i965 driver for RGB formats */
+    /* *INDENT-OFF* */
+     attrsnum_attrs++ = (VASurfaceAttrib) {
+       .type = VASurfaceAttribExternalBufferDescriptor,
+       .flags = VA_SURFACE_ATTRIB_SETTABLE,
+       .value.type = VAGenericValueTypePointer,
+       .value.value.p = &extbuf,
+     };
+    /* *INDENT-ON* */
+  }
+
+  if (num_modifiers > 0 && modifiers) {
+    /* *INDENT-OFF* */
+    attrsnum_attrs++ = (VASurfaceAttrib) {
+      .type = VASurfaceAttribDRMFormatModifiers,
+      .flags = VA_SURFACE_ATTRIB_SETTABLE,
+      .value.type = VAGenericValueTypePointer,
+      .value.value.p = &modifier_list,
     };
     /* *INDENT-ON* */
   }
 
+retry:
   status = vaCreateSurfaces (dpy, rt_format, width, height, surfaces,
       num_surfaces, attrs, num_attrs);
+
+  if (status == VA_STATUS_ERROR_ATTR_NOT_SUPPORTED
+      && attrsnum_attrs - 1.type == VASurfaceAttribDRMFormatModifiers) {
+    int i;
+
+    /* if requested modifiers contain linear, let's remove the attribute and
+     * "hope" the driver will create linear dmabufs */
+    for (i = 0; i < num_modifiers; ++i) {
+      if (modifiersi == DRM_FORMAT_MOD_LINEAR) {
+        num_attrs--;
+        goto retry;
+      }
+    }
+  }
+
   if (status != VA_STATUS_SUCCESS) {
     GST_ERROR ("vaCreateSurfaces: %s", vaErrorStr (status));
     return FALSE;
@@ -120,7 +185,7 @@
   status = vaExportSurfaceHandle (dpy, surface,
       VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2, flags, desc);
   if (status != VA_STATUS_SUCCESS) {
-    GST_ERROR ("vaExportSurfaceHandle: %s", vaErrorStr (status));
+    GST_INFO ("vaExportSurfaceHandle: %s", vaErrorStr (status));
     return FALSE;
   }
 
@@ -147,6 +212,21 @@
 {
   VADisplay dpy = gst_va_display_get_va_dpy (display);
   VAStatus status;
+  VASurfaceStatus state;
+
+  /* When directly accessing a surface special care must be taken to insure sync
+   * proper synchronization with the graphics hardware. Clients should call
+   * vaQuerySurfaceStatus to insure that a surface is not the target of
+   * concurrent rendering or currently being displayed by an overlay. */
+  status = vaQuerySurfaceStatus (dpy, surface, &state);
+  if (status != VA_STATUS_SUCCESS) {
+    GST_WARNING ("vaQuerySurfaceStatus: %s", vaErrorStr (status));
+    return FALSE;
+  }
+  if (state != VASurfaceReady) {
+    GST_INFO ("Surface not ready");
+    return FALSE;
+  }
 
   status = vaDeriveImage (dpy, surface, image);
   if (status != VA_STATUS_SUCCESS) {
@@ -209,12 +289,22 @@
 }
 
 gboolean
-va_map_buffer (GstVaDisplay * display, VABufferID buffer, gpointer * data)
+va_map_buffer (GstVaDisplay * display, VABufferID buffer, GstMapFlags flags,
+    gpointer * data)
 {
   VADisplay dpy = gst_va_display_get_va_dpy (display);
   VAStatus status;
 
+#if VA_CHECK_VERSION(1, 21, 0)
+  uint32_t vaflags = 0;
+  if (flags & GST_MAP_READ)
+    vaflags |= VA_MAPBUFFER_FLAG_READ;
+  if (flags & GST_MAP_WRITE)
+    vaflags |= VA_MAPBUFFER_FLAG_WRITE;
+  status = vaMapBuffer2 (dpy, buffer, data, vaflags);
+#else
   status = vaMapBuffer (dpy, buffer, data);
+#endif
   if (status != VA_STATUS_SUCCESS) {
     GST_WARNING ("vaMapBuffer: %s", vaErrorStr (status));
     return FALSE;
@@ -296,7 +386,6 @@
 gboolean
 va_copy_surface (GstVaDisplay * display, VASurfaceID dst, VASurfaceID src)
 {
-#if VA_CHECK_VERSION (1, 12, 0)
   VADisplay dpy = gst_va_display_get_va_dpy (display);
   /* *INDENT-OFF* */
   VACopyObject obj_src = {
@@ -326,7 +415,38 @@
     return FALSE;
   }
   return TRUE;
-#else
-  return FALSE;
-#endif
+}
+
+guint
+va_get_surface_usage_hint (GstVaDisplay * display, VAEntrypoint entrypoint,
+    GstPadDirection dir, gboolean is_dma)
+{
+  switch (entrypoint) {
+    case VAEntrypointVideoProc:{
+      /* For DMA kind caps, we use VA_SURFACE_ATTRIB_USAGE_HINT_VPP_READ |
+         VA_SURFACE_ATTRIB_USAGE_HINT_VPP_WRITE to detect the modifiers.
+         And in runtime, we should use the same flags in order to keep
+         the same modifiers. */
+      if (is_dma)
+        return VA_SURFACE_ATTRIB_USAGE_HINT_VPP_READ |
+            VA_SURFACE_ATTRIB_USAGE_HINT_VPP_WRITE;
+
+      if (dir == GST_PAD_SINK)
+        return VA_SURFACE_ATTRIB_USAGE_HINT_VPP_READ;
+      else if (dir == GST_PAD_SRC)
+        return VA_SURFACE_ATTRIB_USAGE_HINT_VPP_WRITE;
+
+      break;
+    }
+    case VAEntrypointVLD:
+      return VA_SURFACE_ATTRIB_USAGE_HINT_DECODER;
+    case VAEntrypointEncSlice:
+    case VAEntrypointEncSliceLP:
+    case VAEntrypointEncPicture:
+      return VA_SURFACE_ATTRIB_USAGE_HINT_ENCODER;
+    default:
+      break;
+  }
+
+  return VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC;
 }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/va/vasurfaceimage.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/va/vasurfaceimage.h Changed

@@ -32,7 +32,9 @@
                                                            guint rt_format, guint fourcc,
                                                            guint width, guint height,
                                                            gint usage_hint,
-                                                           VASurfaceAttribExternalBuffers * ext_buf,
+                                                           guint64 * modifiers,
+                                                           guint num_modifiers,
+                                                           VADRMPRIMESurfaceDescriptor * desc,
                                                            VASurfaceID * surfaces,
                                                            guint num_surfaces);
 gboolean              va_destroy_surfaces                 (GstVaDisplay * display,
@@ -54,6 +56,12 @@
                                                            VASurfaceID dst,
                                                            VASurfaceID src);
 
+GST_VA_API
+guint                 va_get_surface_usage_hint           (GstVaDisplay * display,
+                                                           VAEntrypoint entrypoint,
+                                                           GstPadDirection dir,
+                                                           gboolean is_dma);
+
 /* images */
 gboolean              va_create_image                     (GstVaDisplay * display,
                                                            GstVideoFormat format,
@@ -80,6 +88,7 @@
 GST_VA_API
 gboolean              va_map_buffer                       (GstVaDisplay * display,
                                                            VABufferID buffer,
+                                                           GstMapFlags flags,
                                                            gpointer * data);
 GST_VA_API
 gboolean              va_unmap_buffer                     (GstVaDisplay * display,

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/cocoa/gstvkdisplay_cocoa.m -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/cocoa/gstvkdisplay_cocoa.m Changed

@@ -36,149 +36,8 @@
 static void gst_vulkan_display_cocoa_finalize (GObject * object);
 static gpointer gst_vulkan_display_cocoa_get_handle (GstVulkanDisplay * display);
 
-/* Define this if the GLib patch from
- * https://bugzilla.gnome.org/show_bug.cgi?id=741450
- * is used
- */
-#ifndef GSTREAMER_GLIB_COCOA_NSAPPLICATION
-
-static GstVulkanDisplayCocoa *singleton = NULL;
-static gint nsapp_source_id = 0;
-static GMutex nsapp_lock;
-static GCond nsapp_cond;
-
-static gboolean
-gst_vulkan_display_cocoa_nsapp_iteration (gpointer data)
-{
-  NSEvent *event = nil;
-
-  if (!NSThread isMainThread) {
-    GST_WARNING ("NSApp iteration not running in the main thread");
-    return FALSE;
-  }
-
-  while ((event = (NSApp nextEventMatchingMask:NSEventMaskAny
-      untilDate:NSDate dateWithTimeIntervalSinceNow:0.05
-      inMode:NSDefaultRunLoopMode dequeue:YES)) != nil) {
-    NSApp sendEvent:event;
-  }
-
-  return TRUE;
-}
 
 static void
-gst_vulkan_display_cocoa_open_and_attach_source (gpointer data)
-{
-  if (NSThread isMainThread) {
-    /* The sharedApplication class method initializes
-     * the display environment and connects your program
-     * to the window server and the display server.
-     * It has to be done in the main thread.
-     */
-    NSApplication sharedApplication;
-
-    GST_DEBUG ("Custom NSApp initialization done");
-
-    nsapp_source_id = g_timeout_add (60, gst_vulkan_display_cocoa_nsapp_iteration,
-        NULL);
-
-    GST_DEBUG ("NSApp iteration loop attached, id %d", nsapp_source_id);
-  }
-}
-
-static gboolean
-gst_vulkan_display_cocoa_init_nsapp (gpointer data)
-{
-  g_mutex_lock (&nsapp_lock);
-
-  gst_vulkan_display_cocoa_open_and_attach_source (data);
-
-  g_cond_signal (&nsapp_cond);
-  g_mutex_unlock (&nsapp_lock);
-
-  return FALSE;
-}
-
-static GstVulkanDisplayCocoa *
-gst_vulkan_display_cocoa_setup_nsapp (gpointer data)
-{
-  GMainContext *context = g_main_context_default ();
-  gint delta_ms = 0;
-
-  g_mutex_lock (&nsapp_lock);
-
-  if (singleton) {
-    GST_DEBUG ("Get existing display");
-    singleton = gst_object_ref (singleton);
-    g_mutex_unlock (&nsapp_lock);
-    return singleton;
-  }
-
-  if (NSApp != nil && !singleton) {
-    GstVulkanDisplayCocoa *ret = g_object_new (GST_TYPE_VULKAN_DISPLAY_COCOA, NULL);
-    gst_object_ref_sink (ret);
-    g_mutex_unlock (&nsapp_lock);
-    return ret;
-  }
-
-  /* All application have to start with NSApplication sharedApplication
-   * so if NSApp is nil here let's assume this is a debugging application
-   * that runs a glib main loop. */
-  g_assert (NSApp == nil);
-
-  GST_DEBUG ("The application has not initialized NSApp");
-
-  if (NSThread isMainThread) {
-
-    GST_DEBUG ("Setting up NSApp from the main thread");
-    if (g_main_context_is_owner (context)) {
-      GST_DEBUG ("The main thread own the context");
-      gst_vulkan_display_cocoa_open_and_attach_source (data);
-    } else if (g_main_context_acquire (context)) {
-      GST_DEBUG ("The main loop should be shortly running in the main thread");
-      gst_vulkan_display_cocoa_open_and_attach_source (data);
-      g_main_context_release (context);
-    } else {
-      GST_WARNING ("Main loop running in another thread");
-    }
-  } else {
-
-    GST_DEBUG ("Setting up NSApp not from the main thread");
-
-    if (g_main_context_is_owner (context)) {
-      GST_WARNING ("Default context not own by the main thread");
-      delta_ms = -1;
-    } else if (g_main_context_acquire (context)) {
-      GST_DEBUG ("The main loop should be shortly running in the main thread");
-      delta_ms = 1000;
-      g_main_context_release (context);
-    } else {
-      GST_DEBUG ("Main loop running in main thread");
-      delta_ms = 500;
-    }
-
-    if (delta_ms > 0) {
-      gint64 end_time = g_get_monotonic_time () + delta_ms * 1000;;
-      g_idle_add_full (G_PRIORITY_HIGH, gst_vulkan_display_cocoa_init_nsapp, data, NULL);
-      g_cond_wait_until (&nsapp_cond, &nsapp_lock, end_time);
-    }
-  }
-
-  if (NSApp == nil) {
-    GST_ERROR ("Custom NSApp initialization failed");
-  } else {
-    GST_DEBUG ("Create display");
-    singleton = g_object_new (GST_TYPE_VULKAN_DISPLAY_COCOA, NULL);
-    gst_object_ref_sink (singleton);
-  }
-
-  g_mutex_unlock (&nsapp_lock);
-
-  return singleton;
-}
-
-#endif
-static void
 gst_vulkan_display_cocoa_class_init (GstVulkanDisplayCocoaClass * klass)
 {
   GST_VULKAN_DISPLAY_CLASS (klass)->get_handle =
@@ -198,21 +57,6 @@
 static void
 gst_vulkan_display_cocoa_finalize (GObject * object)
 {
-#ifndef GSTREAMER_GLIB_COCOA_NSAPPLICATION
-  g_mutex_lock (&nsapp_lock);
-  if (singleton) {
-    GST_DEBUG ("Destroy display");
-    singleton = NULL;
-    if (nsapp_source_id) {
-      GST_DEBUG ("Remove NSApp loop iteration, id %d", nsapp_source_id);
-      g_source_remove (nsapp_source_id);
-    }
-    nsapp_source_id = 0;
-    g_mutex_unlock (&nsapp_lock);
-  }
-  g_mutex_unlock (&nsapp_lock);
-#endif
-
   G_OBJECT_CLASS (gst_vulkan_display_cocoa_parent_class)->finalize (object);
 }
 
@@ -230,12 +74,13 @@
 
   GST_DEBUG_CATEGORY_GET (gst_vulkan_display_debug, "vulkandisplay");
 
-#ifndef GSTREAMER_GLIB_COCOA_NSAPPLICATION
-  ret = gst_vulkan_display_cocoa_setup_nsapp (NULL);
-#else
+  if (NSApp == nil)
+    g_warning ("An NSApplication needs to be running on the main thread "
+        "to ensure correct behaviour on macOS. Use gst_macos_main() or call "
+        "NSApplication sharedApplication in your code before using this element.");
+
   ret = g_object_new (GST_TYPE_VULKAN_DISPLAY_COCOA, NULL);
   gst_object_ref_sink (ret);
-#endif
 
   return ret;
 }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkbarrier.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkbarrier.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkbuffermemory.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkbuffermemory.c Changed

@@ -96,25 +96,19 @@
 }
 
 static GstVulkanBufferMemory *
-_vk_buffer_mem_new_alloc (GstAllocator * allocator, GstMemory * parent,
-    GstVulkanDevice * device, gsize size, VkBufferUsageFlags usage,
-    VkMemoryPropertyFlags mem_prop_flags, gpointer user_data,
-    GDestroyNotify notify)
+_vk_buffer_mem_new_alloc_with_buffer_info (GstAllocator * allocator,
+    GstMemory * parent, GstVulkanDevice * device,
+    VkBufferCreateInfo * buffer_info, VkMemoryPropertyFlags mem_prop_flags,
+    gpointer user_data, GDestroyNotify notify)
 {
   GstVulkanBufferMemory *mem = NULL;
   GstAllocationParams params = { 0, };
-  VkBufferCreateInfo buffer_info;
   GError *error = NULL;
   guint32 type_idx;
   VkBuffer buffer;
   VkResult err;
 
-  if (!_create_info_from_args (&buffer_info, size, usage)) {
-    GST_CAT_ERROR (GST_CAT_VULKAN_BUFFER_MEMORY, "Incorrect buffer parameters");
-    goto error;
-  }
-
-  err = vkCreateBuffer (device->device, &buffer_info, NULL, &buffer);
+  err = vkCreateBuffer (device->device, buffer_info, NULL, &buffer);
   if (gst_vulkan_error_to_g_error (err, &error, "vkCreateBuffer") < 0)
     goto vk_error;
 
@@ -128,12 +122,12 @@
   }
 
   params.align = mem->requirements.alignment - 1;
-  _vk_buffer_mem_init (mem, allocator, parent, device, usage, &params, size,
-      user_data, notify);
+  _vk_buffer_mem_init (mem, allocator, parent, device, buffer_info->usage,
+      &params, buffer_info->size, user_data, notify);
   mem->buffer = buffer;
 
-  if (!gst_vulkan_memory_find_memory_type_index_with_type_properties (device,
-          mem->requirements.memoryTypeBits, mem_prop_flags, &type_idx))
+  if (!gst_vulkan_memory_find_memory_type_index_with_requirements (device,
+          &mem->requirements, mem_prop_flags, &type_idx))
     goto error;
 
   mem->vk_mem = (GstVulkanMemory *) gst_vulkan_memory_alloc (device, type_idx,
@@ -164,6 +158,23 @@
 }
 
 static GstVulkanBufferMemory *
+_vk_buffer_mem_new_alloc (GstAllocator * allocator, GstMemory * parent,
+    GstVulkanDevice * device, gsize size, VkBufferUsageFlags usage,
+    VkMemoryPropertyFlags mem_prop_flags, gpointer user_data,
+    GDestroyNotify notify)
+{
+  VkBufferCreateInfo buffer_info;
+
+  if (!_create_info_from_args (&buffer_info, size, usage)) {
+    GST_CAT_ERROR (GST_CAT_VULKAN_BUFFER_MEMORY, "Incorrect buffer parameters");
+    return NULL;
+  }
+
+  return _vk_buffer_mem_new_alloc_with_buffer_info (allocator, parent, device,
+      &buffer_info, mem_prop_flags, user_data, notify);
+}
+
+static GstVulkanBufferMemory *
 _vk_buffer_mem_new_wrapped (GstAllocator * allocator, GstMemory * parent,
     GstVulkanDevice * device, VkBuffer buffer, VkBufferUsageFlags usage,
     gpointer user_data, GDestroyNotify notify)
@@ -260,6 +271,8 @@
   if (mem->buffer && !mem->wrapped)
     vkDestroyBuffer (mem->device->device, mem->buffer, NULL);
 
+  gst_clear_object (&mem->barrier.parent.queue);
+
   if (mem->vk_mem)
     gst_memory_unref ((GstMemory *) mem->vk_mem);
 
@@ -272,6 +285,35 @@
 }
 
 /**
+ * gst_vulkan_buffer_memory_alloc_with_buffer_info:
+ * @device: a #GstVulkanDevice
+ * @buffer_info: the VkBufferCreateInfo structure
+ * @mem_prop_flags: memory properties flags for the backing memory
+ *
+ * Allocate a new #GstVulkanBufferMemory.
+ *
+ * Returns: (transfer full): a #GstMemory object backed by a vulkan buffer
+ *          backed by vulkan device memory
+ *
+ * Since: 1.24
+ */
+GstMemory *
+gst_vulkan_buffer_memory_alloc_with_buffer_info (GstVulkanDevice * device,
+    VkBufferCreateInfo * buffer_info, VkMemoryPropertyFlags mem_prop_flags)
+{
+  GstVulkanBufferMemory *mem;
+
+  g_return_val_if_fail (buffer_info
+      && buffer_info->sType == VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, NULL);
+
+  mem = _vk_buffer_mem_new_alloc_with_buffer_info
+      (_vulkan_buffer_memory_allocator, NULL, device, buffer_info,
+      mem_prop_flags, NULL, NULL);
+
+  return (GstMemory *) mem;
+}
+
+/**
  * gst_vulkan_buffer_memory_alloc:
  * @device: a #GstVulkanDevice
  * @size: size of the new buffer

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkbuffermemory.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkbuffermemory.h Changed

@@ -148,16 +148,22 @@
 
 GST_VULKAN_API
 GstMemory *     gst_vulkan_buffer_memory_alloc           (GstVulkanDevice * device,
-                                                         gsize size,
-                                                         VkBufferUsageFlags usage,
-                                                         VkMemoryPropertyFlags mem_prop_flags);
+                                                          gsize size,
+                                                          VkBufferUsageFlags usage,
+                                                          VkMemoryPropertyFlags mem_prop_flags);
+
+GST_VULKAN_API
+GstMemory *    gst_vulkan_buffer_memory_alloc_with_buffer_info
+                                                         (GstVulkanDevice * device,
+                                                          VkBufferCreateInfo * buffer_info,
+                                                          VkMemoryPropertyFlags mem_prop_flags);
 
 GST_VULKAN_API
 GstMemory *     gst_vulkan_buffer_memory_wrapped         (GstVulkanDevice * device,
-                                                         VkBuffer buffer,
-                                                         VkBufferUsageFlags usage,
-                                                         gpointer user_data,
-                                                         GDestroyNotify notify);
+                                                          VkBuffer buffer,
+                                                          VkBufferUsageFlags usage,
+                                                          gpointer user_data,
+                                                          GDestroyNotify notify);
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkbufferpool.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkbufferpool.c Changed

@@ -44,6 +44,8 @@
   GstCaps *caps;
   GstVideoInfo v_info;
   gboolean add_videometa;
+  VkBufferUsageFlags usage;
+  VkMemoryPropertyFlags mem_props;
   gsize alloc_sizesGST_VIDEO_MAX_PLANES;
 };
 
@@ -70,17 +72,50 @@
   return options;
 }
 
+static inline gboolean
+gst_vulkan_buffer_pool_config_get_allocation_params (GstStructure *
+    config, VkBufferUsageFlags * usage, VkMemoryPropertyFlags * mem_props)
+{
+  if (!gst_structure_get_uint (config, "usage", usage)) {
+    *usage =
+        VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+  }
+
+  if (!gst_structure_get_uint (config, "memory-properties", mem_props))
+    *mem_props = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_buffer_pool_config_set_allocation_params:
+ * @config: the #GstStructure with the pool's configuration.
+ * @usage: The Vulkan buffer usage flags.
+ *
+ * Sets the @usage of the buffers to setup.
+ *
+ * Since: 1.24
+ */
+void
+gst_vulkan_buffer_pool_config_set_allocation_params (GstStructure *
+    config, VkBufferUsageFlags usage, VkMemoryPropertyFlags mem_properties)
+{
+  /* assumption: G_TYPE_UINT is compatible with uint32_t (VkFlags) */
+  gst_structure_set (config, "usage", G_TYPE_UINT, usage, "memory-properties",
+      G_TYPE_UINT, mem_properties, NULL);
+}
+
 static gboolean
 gst_vulkan_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
 {
   GstVulkanBufferPool *vk_pool = GST_VULKAN_BUFFER_POOL_CAST (pool);
   GstVulkanBufferPoolPrivate *priv = GET_PRIV (vk_pool);
-  guint min_buffers, max_buffers;
+  guint min_buffers, max_buffers, size;
   GstCaps *caps = NULL;
   gboolean ret = TRUE;
   guint i;
 
-  if (!gst_buffer_pool_config_get_params (config, &caps, NULL, &min_buffers,
+  if (!gst_buffer_pool_config_get_params (config, &caps, &size, &min_buffers,
           &max_buffers))
     goto wrong_config;
 
@@ -96,20 +131,27 @@
 
   gst_caps_replace (&priv->caps, caps);
 
+  gst_vulkan_buffer_pool_config_get_allocation_params (config,
+      &priv->usage, &priv->mem_props);
+
   /* get the size of the buffer to allocate */
-  priv->v_info.size = 0;
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&priv->v_info); i++) {
-    priv->alloc_sizesi = GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i) *
-        GST_VIDEO_INFO_PLANE_STRIDE (&priv->v_info, i);
-    priv->v_info.offseti = priv->v_info.size;
-    priv->v_info.size += priv->alloc_sizesi;
-  }
+  if (GST_VIDEO_INFO_FORMAT (&priv->v_info) != GST_VIDEO_FORMAT_ENCODED) {
+    priv->v_info.size = 0;
+    for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&priv->v_info); i++) {
+      priv->alloc_sizesi = GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i) *
+          GST_VIDEO_INFO_PLANE_STRIDE (&priv->v_info, i);
+      priv->v_info.offseti = priv->v_info.size;
+      priv->v_info.size += priv->alloc_sizesi;
+    }
 
-  priv->add_videometa = gst_buffer_pool_config_has_option (config,
-      GST_BUFFER_POOL_OPTION_VIDEO_META);
+    priv->add_videometa = gst_buffer_pool_config_has_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
 
-  gst_buffer_pool_config_set_params (config, caps,
-      priv->v_info.size, min_buffers, max_buffers);
+    gst_buffer_pool_config_set_params (config, caps,
+        priv->v_info.size, min_buffers, max_buffers);
+  } else {
+    priv->alloc_sizes0 = size;
+  }
 
   return GST_BUFFER_POOL_CLASS (parent_class)->set_config (pool, config) && ret;
 
@@ -139,35 +181,38 @@
 {
   GstVulkanBufferPool *vk_pool = GST_VULKAN_BUFFER_POOL_CAST (pool);
   GstVulkanBufferPoolPrivate *priv = GET_PRIV (vk_pool);
+  GstMemory *mem;
   GstBuffer *buf;
-  guint i;
+  guint i, num_planes;
 
   if (!(buf = gst_buffer_new ())) {
     goto no_buffer;
   }
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&priv->v_info); i++) {
-    GstMemory *mem;
+  if (GST_VIDEO_INFO_FORMAT (&priv->v_info) != GST_VIDEO_FORMAT_ENCODED)
+    num_planes = GST_VIDEO_INFO_N_PLANES (&priv->v_info);
+  else
+    num_planes = 1;
 
-    mem = gst_vulkan_buffer_memory_alloc (vk_pool->device, priv->alloc_sizesi,
-        /* FIXME: choose from outside */
-        VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT,
-        /* FIXME: choose from outside */
-        VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
+  for (i = 0; i < num_planes; i++) {
+    mem =
+        gst_vulkan_buffer_memory_alloc (vk_pool->device, priv->alloc_sizesi,
+        priv->usage, priv->mem_props);
     if (!mem) {
       gst_buffer_unref (buf);
       goto mem_create_failed;
     }
-
     gst_buffer_append_memory (buf, mem);
   }
 
-  gst_buffer_add_video_meta_full (buf, 0,
-      GST_VIDEO_INFO_FORMAT (&priv->v_info),
-      GST_VIDEO_INFO_WIDTH (&priv->v_info),
-      GST_VIDEO_INFO_HEIGHT (&priv->v_info),
-      GST_VIDEO_INFO_N_PLANES (&priv->v_info), priv->v_info.offset,
-      priv->v_info.stride);
+  if (GST_VIDEO_INFO_FORMAT (&priv->v_info) != GST_VIDEO_FORMAT_ENCODED) {
+    gst_buffer_add_video_meta_full (buf, 0,
+        GST_VIDEO_INFO_FORMAT (&priv->v_info),
+        GST_VIDEO_INFO_WIDTH (&priv->v_info),
+        GST_VIDEO_INFO_HEIGHT (&priv->v_info),
+        GST_VIDEO_INFO_N_PLANES (&priv->v_info), priv->v_info.offset,
+        priv->v_info.stride);
+  }
 
   *buffer = buf;

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkbufferpool.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkbufferpool.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkconfig.h.meson -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkconfig.h.meson Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkdebug.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkdebug.c Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkdecoder.c Added

@@ -0,0 +1,1311 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstvkdecoder.h"
+
+#include "gstvkoperation.h"
+#include "gstvkphysicaldevice-private.h"
+#include "gstvkvideo-private.h"
+
+/**
+ * SECTION:vkdecoder
+ * @title: GstVulkanDecoder
+ * @short_description: Abstract Vulkan Video Decoder
+ * @see_also: #GstVulkanOperation
+ *
+ * #GstVulkanOperation abstracts a video decoding operation.
+ *
+ * Since: 1.24
+ */
+
+struct _GstVulkanDecoderPrivate
+{
+  GstVulkanHandle *empty_params;
+  GstVulkanHandle *session_params;
+  GstVulkanHandle *sampler;
+
+  GstCaps *profile_caps;
+  GstBufferPool *dpb_pool;
+
+  GstVulkanOperation *exec;
+
+  GstVulkanVideoSession session;
+  GstVulkanVideoCapabilities caps;
+  VkVideoFormatPropertiesKHR format;
+
+  gboolean vk_populated;
+  GstVulkanVideoFunctions vk;
+
+  gboolean started;
+};
+
+#define GST_CAT_DEFAULT gst_vulkan_decoder_debug
+GST_DEBUG_CATEGORY (GST_CAT_DEFAULT);
+
+#define gst_vulkan_decoder_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstVulkanDecoder, gst_vulkan_decoder,
+    GST_TYPE_OBJECT, G_ADD_PRIVATE (GstVulkanDecoder)
+    GST_DEBUG_CATEGORY_INIT (gst_vulkan_decoder_debug,
+        "vulkandecoder", 0, "Vulkan device decoder"));
+
+static GstVulkanHandle *gst_vulkan_decoder_new_video_session_parameters
+    (GstVulkanDecoder * self, GstVulkanDecoderParameters * params,
+    GError ** error);
+
+static gboolean
+_populate_function_table (GstVulkanDecoder * self)
+{
+  GstVulkanDecoderPrivate *priv =
+      gst_vulkan_decoder_get_instance_private (self);
+  GstVulkanInstance *instance;
+
+  if (priv->vk_populated)
+    return TRUE;
+
+  instance = gst_vulkan_device_get_instance (self->queue->device);
+  if (!instance) {
+    GST_ERROR_OBJECT (self, "Failed to get instance from the device");
+    return FALSE;
+  }
+
+  priv->vk_populated = gst_vulkan_video_get_vk_functions (instance, &priv->vk);
+  gst_object_unref (instance);
+  return priv->vk_populated;
+}
+
+static void
+gst_vulkan_decoder_finalize (GObject * object)
+{
+  GstVulkanDecoder *self = GST_VULKAN_DECODER (object);
+
+  gst_clear_object (&self->queue);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_vulkan_decoder_init (GstVulkanDecoder * self)
+{
+}
+
+static void
+gst_vulkan_decoder_class_init (GstVulkanDecoderClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->finalize = gst_vulkan_decoder_finalize;
+}
+
+/**
+ * gst_vulkan_decoder_start:
+ * @self: a #GstVulkanDecoder
+ * @profile: a #GstVulkanVideoProfile
+ * @error: a #GError
+ *
+ * It creates a Vulkan video session for the given @profile. If an error occurs,
+ * @error is filled.
+ *
+ * Returns: whether the video decoder has started correctly.
+ */
+gboolean
+gst_vulkan_decoder_start (GstVulkanDecoder * self,
+    GstVulkanVideoProfile * profile, GError ** error)
+{
+  GstVulkanDecoderPrivate *priv;
+  VkPhysicalDevice gpu;
+  VkResult res;
+  VkVideoDecodeCapabilitiesKHR dec_caps;
+  VkVideoFormatPropertiesKHR *fmts = NULL;
+  VkVideoProfileListInfoKHR profile_list = {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_LIST_INFO_KHR,
+    .profileCount = 1,
+  };
+  VkPhysicalDeviceVideoFormatInfoKHR fmt_info = {
+    .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_FORMAT_INFO_KHR,
+    .pNext = &profile_list,
+  };
+  VkVideoSessionCreateInfoKHR session_create;
+  GstVulkanDecoderParameters empty_params;
+  guint i, maxlevel, n_fmts, codec_idx;
+  GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
+  VkFormat vk_format = VK_FORMAT_UNDEFINED;
+  GstVulkanCommandPool *cmd_pool;
+  GError *query_err = NULL;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  if (priv->started)
+    return TRUE;
+
+  g_assert (self->codec == profile->profile.videoCodecOperation);
+
+  if (!_populate_function_table (self)) {
+    g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+        "Couldn't load Vulkan Video functions");
+    return FALSE;
+  }
+
+  switch (self->codec) {
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR:
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR:
+      if (!gst_vulkan_video_profile_is_valid (profile, self->codec)) {
+        g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+            "Invalid profile");
+        return FALSE;
+      }
+      break;
+    default:
+      g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+          "Invalid codec");
+      return FALSE;
+  }
+
+  self->profile = *profile;
+  self->profile.profile.pNext = &self->profile.usage.decode;
+  self->profile.usage.decode.pNext = &self->profile.codec;
+
+  switch (self->codec) {
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR:
+      /* *INDENT-OFF* */
+      priv->caps.codec.h264dec = (VkVideoDecodeH264CapabilitiesKHR) {
+          .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_KHR,
+      };
+      /* *INDENT-ON* */
+      codec_idx = GST_VK_VIDEO_EXTENSION_DECODE_H264;
+      break;
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR:
+      /* *INDENT-OFF* */
+      priv->caps.codec.h265dec = (VkVideoDecodeH265CapabilitiesKHR) {
+          .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR,
+      };
+      /* *INDENT-ON* */
+      codec_idx = GST_VK_VIDEO_EXTENSION_DECODE_H265;
+      break;
+    default:
+      g_assert_not_reached ();
+  }
+
+  /* *INDENT-OFF* */
+  dec_caps = (VkVideoDecodeCapabilitiesKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_CAPABILITIES_KHR,
+    .pNext = &priv->caps.codec,
+  };
+  priv->caps.caps =  (VkVideoCapabilitiesKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_CAPABILITIES_KHR,
+    .pNext = &dec_caps,
+  };
+  /* *INDENT-ON* */
+
+  gpu = gst_vulkan_device_get_physical_device (self->queue->device);
+  res = priv->vk.GetPhysicalDeviceVideoCapabilities (gpu,
+      &self->profile.profile, &priv->caps.caps);
+  if (gst_vulkan_error_to_g_error (res, error,
+          "vkGetPhysicalDeviceVideoCapabilitiesKHR") != VK_SUCCESS)
+    return FALSE;
+
+  switch (self->codec) {
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR:
+      maxlevel = priv->caps.codec.h264dec.maxLevelIdc;
+      break;
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR:
+      maxlevel = priv->caps.codec.h265dec.maxLevelIdc;
+      break;
+    default:
+      maxlevel = 0;
+  }
+
+  priv->profile_caps = gst_vulkan_video_profile_to_caps (&self->profile);
+  GST_LOG_OBJECT (self, "Capabilities for %" GST_PTR_FORMAT ":\n"
+      "     Maximum level: %d\n"
+      "     Width from %i to %i\n"
+      "     Height from %i to %i\n"
+      "     Width alignment: %i\n"
+      "     Height alignment: %i\n"
+      "     Buffer offset alignment: %" G_GUINT64_FORMAT "\n"
+      "     Buffer size alignment %" G_GUINT64_FORMAT "\n"
+      "     Maximum references: %u\n"
+      "     Maximum active references: %u\n"
+      "     Capabilities flags: %s%s%s\n"
+      "     Codec header version: %s %i.%i.%i (driver) %i.%i.%i (compiled) \n"
+      "     Decode modes:%s%s%s",
+      priv->profile_caps,
+      maxlevel,
+      priv->caps.caps.minCodedExtent.width,
+      priv->caps.caps.maxCodedExtent.width,
+      priv->caps.caps.minCodedExtent.height,
+      priv->caps.caps.maxCodedExtent.height,
+      priv->caps.caps.pictureAccessGranularity.width,
+      priv->caps.caps.pictureAccessGranularity.height,
+      priv->caps.caps.minBitstreamBufferOffsetAlignment,
+      priv->caps.caps.minBitstreamBufferSizeAlignment,
+      priv->caps.caps.maxDpbSlots, priv->caps.caps.maxActiveReferencePictures,
+      priv->caps.caps.flags ? "" : " none",
+      priv->caps.caps.flags &
+      VK_VIDEO_CAPABILITY_PROTECTED_CONTENT_BIT_KHR ?
+      " protected" : "",
+      priv->caps.caps.flags &
+      VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR ?
+      " separate_references" : "",
+      GST_STR_NULL (priv->caps.caps.stdHeaderVersion.extensionName),
+      VK_CODEC_VERSION (priv->caps.caps.stdHeaderVersion.specVersion),
+      VK_CODEC_VERSION (_vk_codec_extensionscodec_idx.specVersion),
+      dec_caps.flags ? "" : " invalid",
+      dec_caps.flags &
+      VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR ?
+      " reuse_output_DPB" : "",
+      dec_caps.flags &
+      VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR ?
+      " dedicated_DPB" : "");
+
+  /* VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR - reports the
+   * implementation supports using the same Video Picture Resource for decode
+   * DPB and decode output.
+   *
+   * VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR - reports the
+   * implementation supports using distinct Video Picture Resources for decode
+   * DPB and decode output. */
+  self->dedicated_dpb = ((dec_caps.flags &
+          VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR) == 0);
+
+  /* The DPB or Reconstructed Video Picture Resources for the video session may
+   * be created as a separate VkImage for each DPB picture. If not supported,
+   * the DPB must be created as single multi-layered image where each layer
+   * represents one of the DPB Video Picture Resources. */
+  self->layered_dpb = ((priv->caps.caps.flags &
+          VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR) == 0);
+
+  if (self->layered_dpb && !self->dedicated_dpb) {
+    g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INCOMPATIBLE_DRIVER,
+        "Buggy driver: "
+        "VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR set but "
+        "VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR is unset!");
+
+    goto failed;
+  }
+
+  priv->caps.caps.pNext = NULL;
+
+  /* Get output format */
+  profile_list.pProfiles = &self->profile.profile;
+
+  fmt_info.imageUsage = VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR
+      | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
+  if (!self->dedicated_dpb)
+    fmt_info.imageUsage |= VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR;
+
+  res = priv->vk.GetPhysicalDeviceVideoFormatProperties (gpu, &fmt_info,
+      &n_fmts, NULL);
+  if (gst_vulkan_error_to_g_error (res, error,
+          "vkGetPhysicalDeviceVideoFormatPropertiesKHR") != VK_SUCCESS)
+    goto failed;
+
+  if (n_fmts == 0) {
+    g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+        "Profile doesn't have an output format");
+    goto failed;
+  }
+
+  fmts = g_new0 (VkVideoFormatPropertiesKHR, n_fmts);
+  for (i = 0; i < n_fmts; i++)
+    fmtsi.sType = VK_STRUCTURE_TYPE_VIDEO_FORMAT_PROPERTIES_KHR;
+
+  res = priv->vk.GetPhysicalDeviceVideoFormatProperties (gpu, &fmt_info,
+      &n_fmts, fmts);
+  if (gst_vulkan_error_to_g_error (res, error,
+          "vkGetPhysicalDeviceVideoFormatPropertiesKHR") != VK_SUCCESS) {
+    goto failed;
+  }
+
+  if (n_fmts == 0) {
+    g_free (fmts);
+    g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+        "Profile doesn't have an output format");
+    goto failed;
+  }
+
+  /* find the best output format */
+  for (i = 0; i < n_fmts; i++) {
+    format = gst_vulkan_format_to_video_format (fmtsi.format);
+    if (format == GST_VIDEO_FORMAT_UNKNOWN) {
+      GST_WARNING_OBJECT (self, "Unknown Vulkan format %i", fmtsi.format);
+      continue;
+    } else {
+      vk_format = fmtsi.format;
+      priv->format = fmtsi;
+      priv->format.pNext = NULL;
+      break;
+    }
+  }
+  g_clear_pointer (&fmts, g_free);
+
+  if (vk_format == VK_FORMAT_UNDEFINED) {
+    g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+        "No valid output format found");
+    goto failed;
+  }
+
+  GST_INFO_OBJECT (self, "Using output format %s",
+      gst_video_format_to_string (format));
+
+  /* *INDENT-OFF* */
+  session_create = (VkVideoSessionCreateInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_CREATE_INFO_KHR,
+    .queueFamilyIndex = self->queue->family,
+    .pVideoProfile = &profile->profile,
+    .pictureFormat = vk_format,
+    .maxCodedExtent = priv->caps.caps.maxCodedExtent,
+    .referencePictureFormat = vk_format,
+    .maxDpbSlots = priv->caps.caps.maxDpbSlots,
+    .maxActiveReferencePictures = priv->caps.caps.maxActiveReferencePictures,
+    .pStdHeaderVersion = &_vk_codec_extensionscodec_idx,
+  };
+  /* *INDENT-ON* */
+
+  /* create video session */
+  if (!gst_vulkan_video_session_create (&priv->session, self->queue->device,
+          &priv->vk, &session_create, error))
+    goto failed;
+
+  /* create empty codec params */
+  switch (self->profile.profile.videoCodecOperation) {
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR:
+      /* *INDENT-OFF* */
+      empty_params.h264 = (VkVideoDecodeH264SessionParametersCreateInfoKHR) {
+        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR,
+      };
+      /* *INDENT-ON* */
+      break;
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR:
+      /* *INDENT-OFF* */
+      empty_params.h265 = (VkVideoDecodeH265SessionParametersCreateInfoKHR) {
+        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR,
+      };
+      /* *INDENT-ON* */
+      break;
+    default:
+      g_assert_not_reached ();
+  }
+
+  priv->empty_params = gst_vulkan_decoder_new_video_session_parameters (self,
+      &empty_params, error);
+  if (!priv->empty_params)
+    goto failed;
+  cmd_pool = gst_vulkan_queue_create_command_pool (self->queue, error);
+  if (!cmd_pool)
+    goto failed;
+  priv->exec = gst_vulkan_operation_new (cmd_pool);
+  gst_object_unref (cmd_pool);
+  if (!gst_vulkan_operation_enable_query (priv->exec,
+          VK_QUERY_TYPE_RESULT_STATUS_ONLY_KHR, 1, &profile->profile,
+          &query_err)) {
+    if (query_err->code != VK_ERROR_FEATURE_NOT_PRESENT) {
+      g_propagate_error (error, query_err);
+      goto failed;
+    }
+    g_clear_error (&query_err);
+  }
+
+  if (!gst_vulkan_decoder_flush (self, error))
+    goto failed;
+
+  priv->started = TRUE;
+
+  return TRUE;
+
+failed:
+  {
+    g_free (fmts);
+    gst_clear_caps (&priv->profile_caps);
+
+    if (priv->session.session)
+      gst_vulkan_video_session_destroy (&priv->session);
+
+    gst_clear_vulkan_handle (&priv->empty_params);
+
+    gst_clear_object (&priv->exec);
+
+    return FALSE;
+  }
+}
+
+/**
+ * gst_vulkan_decoder_stop:
+ * @self: a #GstVulkanDecoder
+ *
+ * Destroys the video session created at gst_vulkan_decoder_start() and clean up
+ * the internal objects.
+ *
+ * Returns: whether the decoder stopped correctly.
+ */
+gboolean
+gst_vulkan_decoder_stop (GstVulkanDecoder * self)
+{
+  GstVulkanDecoderPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  if (!priv->started)
+    return TRUE;
+
+  gst_vulkan_decoder_wait (self);
+
+  gst_clear_buffer (&self->input_buffer);
+
+  gst_clear_buffer (&self->layered_buffer);
+  gst_clear_object (&priv->dpb_pool);
+
+  gst_vulkan_video_session_destroy (&priv->session);
+
+  gst_clear_caps (&priv->profile_caps);
+
+  gst_clear_vulkan_handle (&priv->empty_params);
+  gst_clear_vulkan_handle (&priv->session_params);
+
+  gst_clear_vulkan_handle (&priv->sampler);
+
+  gst_clear_object (&priv->exec);
+
+  priv->started = FALSE;
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_decoder_flush:
+ * @self: a #GstVulkanDecoder
+ * @error: a #GError
+ *
+ * Initializes the decoder at driver level and set its DPB slots to the inactive
+ * state.
+ *
+ * Returns: whether flush was successful
+ */
+gboolean
+gst_vulkan_decoder_flush (GstVulkanDecoder * self, GError ** error)
+{
+  GstVulkanDecoderPrivate *priv;
+  VkVideoBeginCodingInfoKHR decode_start;
+  VkVideoCodingControlInfoKHR decode_ctrl = {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_CODING_CONTROL_INFO_KHR,
+    .flags = VK_VIDEO_CODING_CONTROL_RESET_BIT_KHR,
+  };
+  VkVideoEndCodingInfoKHR decode_end = {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_END_CODING_INFO_KHR,
+  };
+  gboolean ret;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  if (!(priv->empty_params && priv->exec))
+    return FALSE;
+
+  /* *INDENT-OFF* */
+  decode_start = (VkVideoBeginCodingInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_BEGIN_CODING_INFO_KHR,
+    .videoSession = priv->session.session->handle,
+    .videoSessionParameters = priv->empty_params->handle,
+  };
+  /* *INDENT-ON* */
+
+  if (!gst_vulkan_operation_begin (priv->exec, error))
+    return FALSE;
+
+  priv->vk.CmdBeginVideoCoding (priv->exec->cmd_buf->cmd, &decode_start);
+  priv->vk.CmdControlVideoCoding (priv->exec->cmd_buf->cmd, &decode_ctrl);
+  priv->vk.CmdEndVideoCoding (priv->exec->cmd_buf->cmd, &decode_end);
+
+  ret = gst_vulkan_operation_end (priv->exec, error);
+
+  return ret;
+}
+
+/**
+ * gst_vulkan_decoder_create_dpb_pool:
+ * @self: a #GstVulkanDecoder
+ * @caps: the #GstCaps of the DP
+ *
+ * Instantiates an internal Vulkan image pool for driver decoders whose output
+ * buffers cannot be used as DPB buffers.
+ *
+ * Returns: whether the pool was created.
+ */
+gboolean
+gst_vulkan_decoder_create_dpb_pool (GstVulkanDecoder * self, GstCaps * caps)
+{
+  GstVulkanDecoderPrivate *priv;
+  VkImageUsageFlags usage = VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR;
+  GstStructure *config;
+  guint min_buffers, max_buffers;
+  GstFlowReturn ret;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+  g_return_val_if_fail (GST_IS_CAPS (caps), FALSE);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  if (!priv->started)
+    return FALSE;
+
+  if (!self->dedicated_dpb)
+    return TRUE;
+
+  if (self->layered_dpb) {
+    min_buffers = max_buffers = 1;
+  } else {
+    min_buffers = priv->caps.caps.maxDpbSlots;
+    max_buffers = 0;
+  }
+
+  priv->dpb_pool = gst_vulkan_image_buffer_pool_new (self->queue->device);
+
+  config = gst_buffer_pool_get_config (priv->dpb_pool);
+  gst_buffer_pool_config_set_params (config, caps, 1024, min_buffers,
+      max_buffers);
+  gst_vulkan_image_buffer_pool_config_set_allocation_params (config, usage,
+      VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_IMAGE_LAYOUT_VIDEO_DECODE_DPB_KHR,
+      VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_TRANSFER_WRITE_BIT);
+
+  if (self->layered_dpb) {
+    gst_structure_set (config, "num-layers", G_TYPE_UINT,
+        priv->caps.caps.maxDpbSlots, NULL);
+  }
+
+  gst_vulkan_image_buffer_pool_config_set_decode_caps (config,
+      priv->profile_caps);
+
+  if (!gst_buffer_pool_set_config (priv->dpb_pool, config))
+    goto bail;
+  if (!gst_buffer_pool_set_active (priv->dpb_pool, TRUE))
+    goto bail;
+
+  if (self->layered_dpb) {
+    ret = gst_buffer_pool_acquire_buffer (priv->dpb_pool, &self->layered_buffer,
+        NULL);
+    if (ret != GST_FLOW_OK)
+      goto bail;
+  }
+
+  return TRUE;
+
+bail:
+  g_clear_object (&priv->dpb_pool);
+  return FALSE;
+}
+
+/**
+ * gst_vulkan_decoder_decode:
+ * @self: a #GstVulkanDecoder
+ * @pic: a #GstVulkanDecoderPicture
+ * @error:  a #GError
+ *
+ * Decodes @pic.
+ *
+ * Return: whether @pic was decoded correctly. It might fill @error.
+ */
+gboolean
+gst_vulkan_decoder_decode (GstVulkanDecoder * self,
+    GstVulkanDecoderPicture * pic, GError ** error)
+{
+  GstVulkanDecoderPrivate *priv;
+  VkVideoBeginCodingInfoKHR decode_start;
+  VkVideoEndCodingInfoKHR decode_end = {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_END_CODING_INFO_KHR,
+  };
+  GArray *barriers;
+  VkImageLayout new_layout;
+  GstVulkanCommandBuffer *cmd_buf;
+  gboolean ret;
+  VkVideoReferenceSlotInfoKHR *cur_slot;
+  gint32 i;
+  GstMemory *mem;
+  guint32 slices_size;
+
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+  g_return_val_if_fail (pic, FALSE);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  /* *INDENT-OFF* */
+  decode_start = (VkVideoBeginCodingInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_BEGIN_CODING_INFO_KHR,
+    .videoSession = priv->session.session->handle,
+    .videoSessionParameters = priv->session_params->handle,
+    .referenceSlotCount = pic->decode_info.referenceSlotCount,
+    .pReferenceSlots = pic->decode_info.pReferenceSlots,
+  };
+  /* *INDENT-ON* */
+
+  if (!(priv->started && priv->session_params)) {
+    g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+        "Vulkan Decoder has not started or no session parameters are set");
+    return FALSE;
+  }
+
+  /* The current decoding reference has to be bound as an inactive reference */
+  cur_slot = (VkVideoReferenceSlotInfoKHR *)
+      & decode_start.pReferenceSlotsdecode_start.referenceSlotCount;
+  *cur_slot = pic->slot;
+  cur_slot->slotIndex = -1;
+  decode_start.referenceSlotCount++;
+
+  /* set the input buffer */
+  mem = gst_buffer_peek_memory (self->input_buffer, 0);
+  slices_size = g_array_index (pic->slice_offs, guint32,
+      pic->slice_offs->len - 1);
+
+  pic->decode_info.srcBuffer = ((GstVulkanBufferMemory *) mem)->buffer;
+  pic->decode_info.srcBufferRange = GST_ROUND_UP_N (slices_size,
+      priv->caps.caps.minBitstreamBufferSizeAlignment);
+
+  if (!gst_vulkan_operation_begin (priv->exec, error))
+    return FALSE;
+
+  cmd_buf = priv->exec->cmd_buf;
+
+  if (!gst_vulkan_operation_add_dependency_frame (priv->exec, pic->out,
+          VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR,
+          VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR)) {
+    return FALSE;
+  }
+
+  new_layout = (self->layered_dpb || pic->dpb) ?
+      VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR :
+      VK_IMAGE_LAYOUT_VIDEO_DECODE_DPB_KHR;
+  gst_vulkan_operation_add_frame_barrier (priv->exec, pic->out,
+      VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR,
+      VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR, new_layout, NULL);
+
+  /* Reference for the current image, if existing and not layered */
+  if (pic->dpb) {
+    if (!gst_vulkan_operation_add_dependency_frame (priv->exec, pic->dpb,
+            VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR,
+            VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR)) {
+      return FALSE;
+    }
+  }
+
+  if (!self->layered_dpb) {
+    /* All references (apart from the current) for non-layered refs */
+
+    for (i = 0; i < pic->decode_info.referenceSlotCount; i++) {
+      GstVulkanDecoderPicture *ref_pic = pic->refsi;
+      GstBuffer *ref_buf = ref_pic->dpb ? ref_pic->dpb : ref_pic->out;
+
+      if (!gst_vulkan_operation_add_dependency_frame (priv->exec, ref_buf,
+              VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR,
+              VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR)) {
+        return FALSE;
+      }
+
+      if (!ref_pic->dpb) {
+        gst_vulkan_operation_add_frame_barrier (priv->exec, ref_buf,
+            VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR,
+            VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR
+            | VK_ACCESS_2_VIDEO_DECODE_READ_BIT_KHR,
+            VK_IMAGE_LAYOUT_VIDEO_DECODE_DPB_KHR, NULL);
+      }
+    }
+  } else if (pic->decode_info.referenceSlotCount > 1
+      || pic->img_view_out != pic->img_view_ref) {
+    /* Single barrier for a single layered ref */
+    if (!gst_vulkan_operation_add_dependency_frame (priv->exec,
+            self->layered_buffer, VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR,
+            VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR)) {
+      return FALSE;
+    }
+  }
+
+  /* change image layout */
+  barriers = gst_vulkan_operation_retrieve_image_barriers (priv->exec);
+  /* *INDENT-OFF* */
+  vkCmdPipelineBarrier2 (cmd_buf->cmd, &(VkDependencyInfo) {
+      .sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO,
+      .dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT,
+      .pImageMemoryBarriers = (VkImageMemoryBarrier2 *) barriers->data,
+      .imageMemoryBarrierCount = barriers->len,
+    });
+  /* *INDENT-ON* */
+  g_array_unref (barriers);
+
+  priv->vk.CmdBeginVideoCoding (cmd_buf->cmd, &decode_start);
+  gst_vulkan_operation_begin_query (priv->exec, 0);
+  priv->vk.CmdDecodeVideo (cmd_buf->cmd, &pic->decode_info);
+  gst_vulkan_operation_end_query (priv->exec, 0);
+  priv->vk.CmdEndVideoCoding (cmd_buf->cmd, &decode_end);
+
+  ret = gst_vulkan_operation_end (priv->exec, error);
+
+  return ret;
+}
+
+/**
+ * gst_vulkan_decoder_is_started:
+ * @self: a #GstVulkanDecoder
+ *
+ * Returns: whether gst_vulkan_decoder_start() was called correctly previously.
+ */
+gboolean
+gst_vulkan_decoder_is_started (GstVulkanDecoder * self)
+{
+  GstVulkanDecoderPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+  return priv->started;
+}
+
+/**
+ * gst_vulkan_decoder_caps:
+ * @self: a #GstVulkanDecoder
+ * @caps: (out): a #GstVulkanVideoCapabilities
+ *
+ * Gets the Vulkan decoding capabilities of the current video session.
+ *
+ * Returns: whether the capabilities were fetched correctly.
+ */
+gboolean
+gst_vulkan_decoder_caps (GstVulkanDecoder * self,
+    GstVulkanVideoCapabilities * caps)
+{
+  GstVulkanDecoderPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  if (!priv->started)
+    return FALSE;
+
+  if (caps) {
+    *caps = priv->caps;
+    caps->caps.pNext = &caps->codec;
+  }
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_decoder_out_format: (skip)
+ * @self: a #GstVulkanDecoder
+ * @format: the Vulkan output format properties
+ *
+ * Gets the Vulkan format properties of the output frames.
+ *
+ * Returns: whether the @format was fetched.
+ */
+gboolean
+gst_vulkan_decoder_out_format (GstVulkanDecoder * self,
+    VkVideoFormatPropertiesKHR * format)
+{
+  GstVulkanDecoderPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  if (!priv->started)
+    return FALSE;
+
+  if (format)
+    *format = priv->format;
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_decoder_profile_caps:
+ * @self: a #GstVulkanDecoder
+ *
+ * Returns: (transfer full): the #GstCaps of the profile defined at
+ *     gst_vulkan_decoder_start().
+ */
+GstCaps *
+gst_vulkan_decoder_profile_caps (GstVulkanDecoder * self)
+{
+  GstVulkanDecoderPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), NULL);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  if (!priv->started)
+    return NULL;
+
+  return gst_caps_ref (priv->profile_caps);
+}
+
+static void
+gst_vulkan_handle_free_video_session_parameters (GstVulkanHandle * handle,
+    gpointer data)
+{
+  PFN_vkDestroyVideoSessionParametersKHR vkDestroyVideoSessionParameters;
+
+  g_return_if_fail (handle != NULL);
+  g_return_if_fail (handle->handle != VK_NULL_HANDLE);
+  g_return_if_fail (handle->type ==
+      GST_VULKAN_HANDLE_TYPE_VIDEO_SESSION_PARAMETERS);
+  g_return_if_fail (handle->user_data);
+
+  vkDestroyVideoSessionParameters = handle->user_data;
+  vkDestroyVideoSessionParameters (handle->device->device,
+      (VkVideoSessionKHR) handle->handle, NULL);
+}
+
+static GstVulkanHandle *
+gst_vulkan_decoder_new_video_session_parameters (GstVulkanDecoder * self,
+    GstVulkanDecoderParameters * params, GError ** error)
+{
+  GstVulkanDecoderPrivate *priv;
+  VkVideoSessionParametersCreateInfoKHR session_params_info;
+  VkResult res;
+  VkVideoSessionParametersKHR session_params;
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  if (!priv->session.session)
+    return NULL;
+
+  /* *INDENT-OFF* */
+  session_params_info = (VkVideoSessionParametersCreateInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR,
+    .pNext = params,
+    .videoSession = priv->session.session->handle,
+  };
+  /* *INDENT-ON* */
+
+  res = priv->vk.CreateVideoSessionParameters (self->queue->device->device,
+      &session_params_info, NULL, &session_params);
+  if (gst_vulkan_error_to_g_error (res, error,
+          "vkCreateVideoSessionParametersKHR") != VK_SUCCESS)
+    return NULL;
+
+  return gst_vulkan_handle_new_wrapped (self->queue->device,
+      GST_VULKAN_HANDLE_TYPE_VIDEO_SESSION_PARAMETERS,
+      (GstVulkanHandleTypedef) session_params,
+      gst_vulkan_handle_free_video_session_parameters,
+      priv->vk.DestroyVideoSessionParameters);
+}
+
+/**
+ * gst_vulkan_decoder_update_video_session_parameters:
+ * @self: a #GstVulkanDecoder
+ * @params: a GstVulkanDecoderParameters union
+ * @error: a #GError
+ *
+ * Update the internal codec parameters for the current video session.
+ *
+ * Returns: whether the @params were updated internally. It might fill @error.
+ */
+gboolean
+gst_vulkan_decoder_update_video_session_parameters (GstVulkanDecoder * self,
+    GstVulkanDecoderParameters * params, GError ** error)
+{
+  GstVulkanDecoderPrivate *priv;
+  GstVulkanHandle *handle;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+  g_return_val_if_fail (params, FALSE);
+
+  handle =
+      gst_vulkan_decoder_new_video_session_parameters (self, params, error);
+  if (!handle)
+    return FALSE;
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  gst_clear_vulkan_handle (&priv->session_params);
+  priv->session_params = handle;
+
+  return TRUE;
+}
+
+static void
+gst_vulkan_handle_free_sampler_ycbcr_conversion (GstVulkanHandle * handle,
+    gpointer data)
+{
+  g_return_if_fail (handle != NULL);
+  g_return_if_fail (handle->handle != VK_NULL_HANDLE);
+  g_return_if_fail (handle->type ==
+      GST_VULKAN_HANDLE_TYPE_SAMPLER_YCBCR_CONVERSION);
+
+  vkDestroySamplerYcbcrConversion (handle->device->device,
+      (VkSamplerYcbcrConversion) handle->handle, NULL);
+}
+
+/**
+ * gst_vulkan_decoder_update_ycbcr_sampler:
+ * @self: a #GstVulkanDecoder
+ * @range: whether color components are encoded using the full range of
+ *     numerical values or whether values are reserved for headroom and foot
+ *     room.
+ * @xloc: x location of downsampled chroma component samples relative to the luma
+ *     samples.
+ * @yloc: y location of downsampled chroma component samples relative to the luma
+ *     samples.
+ *
+ * Update the internal Ycbcr sampler for the output images.
+ *
+ * Returns: whether the sampler was updated.
+ */
+gboolean
+gst_vulkan_decoder_update_ycbcr_sampler (GstVulkanDecoder * self,
+    VkSamplerYcbcrRange range, VkChromaLocation xloc,
+    VkChromaLocation yloc, GError ** error)
+{
+  const VkPhysicalDeviceFeatures2 *features;
+  const VkBaseOutStructure *iter;
+  GstVulkanDevice *device;
+  GstVulkanDecoderPrivate *priv;
+  GstVulkanHandle *handle;
+  VkSamplerYcbcrConversionCreateInfo create_info;
+  VkSamplerYcbcrConversion ycbr_conversion;
+  VkResult res;
+  gboolean found = FALSE;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+
+  device = self->queue->device;
+
+  if (!gst_vulkan_instance_check_version (device->instance, 1, 2, 0)) {
+    g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+        "Sampler Ycbcr conversion not available in API");
+    return FALSE;
+  }
+
+  features = gst_vulkan_physical_device_get_features (device->physical_device);
+  for (iter = (const VkBaseOutStructure *) features; iter; iter = iter->pNext) {
+    if (iter->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES) {
+      const VkPhysicalDeviceVulkan11Features *features11 =
+          (const VkPhysicalDeviceVulkan11Features *) iter;
+
+      if (!features11->samplerYcbcrConversion)
+        return FALSE;
+      found = TRUE;
+      break;
+    }
+  }
+
+  if (!found) {
+    g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+        "Sampler Ycbcr conversion not available in driver");
+    return FALSE;
+  }
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  /* *INDENT-OFF* */
+  create_info = (VkSamplerYcbcrConversionCreateInfo) {
+    .sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO,
+    .components = _vk_identity_component_map,
+    .ycbcrModel = VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY,
+    .ycbcrRange = range,
+    .xChromaOffset = xloc,
+    .yChromaOffset = yloc,
+    .format = priv->format.format,
+  };
+  /* *INDENT-ON* */
+
+  res = vkCreateSamplerYcbcrConversion (device->device, &create_info, NULL,
+      &ycbr_conversion);
+  if (gst_vulkan_error_to_g_error (res, error,
+          "vkCreateSamplerYcbcrConversion") != VK_SUCCESS)
+    return FALSE;
+
+  handle = gst_vulkan_handle_new_wrapped (device,
+      GST_VULKAN_HANDLE_TYPE_SAMPLER_YCBCR_CONVERSION,
+      (GstVulkanHandleTypedef) ycbr_conversion,
+      gst_vulkan_handle_free_sampler_ycbcr_conversion, NULL);
+
+  gst_clear_vulkan_handle (&priv->sampler);
+  priv->sampler = handle;
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_decoder_picture_create_view:
+ * @self: a #GstVulkanDecoder
+ * @buf: a #GstBuffer
+ * @is_out: if @buf is for output or for DPB
+ *
+ * Creates a #GstVulkanImageView for @buf for decoding, with the internal Ycbcr
+ * sampler, if available.
+ *
+ * Returns: (transfer full) (nullable): the #GstVulkanImageView.
+ */
+GstVulkanImageView *
+gst_vulkan_decoder_picture_create_view (GstVulkanDecoder * self,
+    GstBuffer * buf, gboolean is_out)
+{
+  GstVulkanDecoderPrivate *priv;
+  VkSamplerYcbcrConversionInfo yuv_sampler_info;
+  VkImageViewCreateInfo view_create_info;
+  GstVulkanImageMemory *vkmem;
+  GstMemory *mem;
+  gpointer pnext;
+  guint n_mems;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self) && GST_IS_BUFFER (buf),
+      NULL);
+
+  n_mems = gst_buffer_n_memory (buf);
+  if (n_mems != 1)
+    return NULL;
+
+  mem = gst_buffer_peek_memory (buf, 0);
+  if (!gst_is_vulkan_image_memory (mem))
+    return NULL;
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  pnext = NULL;
+  if (priv->sampler) {
+    /* *INDENT-OFF* */
+    yuv_sampler_info = (VkSamplerYcbcrConversionInfo) {
+      .sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO,
+      .conversion = priv->sampler->handle,
+    };
+    /* *INDENT-ON* */
+
+    pnext = &yuv_sampler_info;
+  }
+
+  vkmem = (GstVulkanImageMemory *) mem;
+
+  /* *INDENT-OFF* */
+  view_create_info = (VkImageViewCreateInfo) {
+    .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
+    .pNext = pnext,
+    .viewType = self->layered_dpb && !is_out ?
+        VK_IMAGE_VIEW_TYPE_2D_ARRAY: VK_IMAGE_VIEW_TYPE_2D,
+    .format = vkmem->create_info.format,
+    .image = vkmem->image,
+    .components = _vk_identity_component_map,
+    .subresourceRange = (VkImageSubresourceRange) {
+      .aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT,
+      .baseArrayLayer = 0,
+      .layerCount     = self->layered_dpb && !is_out ?
+          VK_REMAINING_ARRAY_LAYERS : 1,
+      .levelCount     = 1,
+    },
+  };
+  /* *INDENT-ON* */
+
+  return gst_vulkan_get_or_create_image_view_with_info (vkmem,
+      &view_create_info);
+}
+
+/**
+ * gst_vulkan_decoder_picture_init:
+ * @self: a #GstVulkanDecoder
+ * @pic: a #GstVulkanDecoderPicture
+ * @out: the #GstBuffer to use as output
+ *
+ * Initializes @pic with @out as output buffer.
+ *
+ * Returns: whether @pic was initialized.
+ */
+gboolean
+gst_vulkan_decoder_picture_init (GstVulkanDecoder * self,
+    GstVulkanDecoderPicture * pic, GstBuffer * out)
+{
+  GstVulkanDecoderPrivate *priv;
+  GstFlowReturn ret;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+  g_return_val_if_fail (pic, FALSE);
+  g_return_val_if_fail (GST_IS_BUFFER (out), FALSE);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  if (self->layered_dpb)
+    g_return_val_if_fail (GST_IS_BUFFER (self->layered_buffer), FALSE);
+  else if (self->dedicated_dpb)
+    g_return_val_if_fail (GST_IS_BUFFER_POOL (priv->dpb_pool), FALSE);
+
+  pic->out = gst_buffer_ref (out);
+  pic->img_view_out =
+      gst_vulkan_decoder_picture_create_view (self, pic->out, TRUE);
+  g_assert (pic->img_view_out);
+
+  pic->dpb = NULL;
+  pic->img_view_ref = NULL;
+
+  if (self->layered_dpb) {
+    pic->img_view_ref =
+        gst_vulkan_decoder_picture_create_view (self, self->layered_buffer,
+        FALSE);
+  } else if (self->dedicated_dpb) {
+    ret = gst_buffer_pool_acquire_buffer (priv->dpb_pool, &pic->dpb, NULL);
+    if (ret != GST_FLOW_OK)
+      return FALSE;
+    pic->img_view_ref =
+        gst_vulkan_decoder_picture_create_view (self, pic->dpb, FALSE);
+  } else {
+    pic->img_view_ref = gst_vulkan_image_view_ref (pic->img_view_out);
+  }
+
+  pic->slice_offs = NULL;
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_decoder_picture_release:
+ * @pic: a #GstVulkanDecoderPicture
+ *
+ * Releases the internal resource of @pic.
+ */
+void
+gst_vulkan_decoder_picture_release (GstVulkanDecoderPicture * pic)
+{
+  gst_clear_vulkan_image_view (&pic->img_view_ref);
+  gst_clear_vulkan_image_view (&pic->img_view_out);
+
+  gst_clear_buffer (&pic->out);
+  gst_clear_buffer (&pic->dpb);
+
+  g_clear_pointer (&pic->slice_offs, g_array_unref);
+}
+
+/**
+ * gst_vulkan_decoder_append_slice:
+ * @self: a #GstVulkanDecoder
+ * @pic: a #GstVulkanDecoderPicture
+ * @data: slice's bitstream data
+ * @size: the size of @data
+ * @add_startcode: whether add start code
+ *
+ * Appends slices's @data bitstream into @pic internal input buffer.
+ *
+ * Returns: whether the slice @data were added.
+ */
+gboolean
+gst_vulkan_decoder_append_slice (GstVulkanDecoder * self,
+    GstVulkanDecoderPicture * pic, const guint8 * data, size_t size,
+    gboolean add_startcode)
+{
+  GstVulkanDecoderPrivate *priv;
+  static const guint8 startcode3 = { 0x0, 0x0, 0x1 };
+  size_t new_size, cur_size, buf_size, startcode_len;
+  GstBuffer *new_buf = NULL;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  startcode_len = add_startcode ? sizeof (startcode) : 0;
+  buf_size = self->input_buffer ? gst_buffer_get_size (self->input_buffer) : 0;
+  cur_size = pic->slice_offs ?
+      g_array_index (pic->slice_offs, guint32, pic->slice_offs->len - 1) : 0;
+  new_size = cur_size + startcode_len + size;
+  new_size = GST_ROUND_UP_N (new_size,
+      priv->caps.caps.minBitstreamBufferSizeAlignment);
+
+  if (new_size > buf_size) {
+    new_buf = gst_vulkan_video_codec_buffer_new (self->queue->device,
+        &self->profile, VK_BUFFER_USAGE_VIDEO_DECODE_SRC_BIT_KHR, new_size);
+    if (!new_buf)
+      goto error;
+
+    if (self->input_buffer) {
+      if (!gst_buffer_copy_into (new_buf, self->input_buffer,
+              GST_BUFFER_COPY_MEMORY | GST_BUFFER_COPY_DEEP, 0, -1))
+        goto error;
+    }
+
+    gst_clear_buffer (&self->input_buffer);
+    self->input_buffer = new_buf;
+  }
+
+  /* append data */
+  {
+    GstBufferMapInfo mapinfo;
+    guint32 offset;
+
+    if (!gst_buffer_map (self->input_buffer, &mapinfo, GST_MAP_WRITE))
+      goto error;
+    memcpy (mapinfo.data + cur_size, startcode, startcode_len);
+    memcpy (mapinfo.data + cur_size + startcode_len, data, size);
+    gst_buffer_unmap (self->input_buffer, &mapinfo);
+
+    if (!pic->slice_offs) {
+      offset = 0;
+      pic->slice_offs = g_array_new (FALSE, FALSE, sizeof (guint32));
+      g_array_append_val (pic->slice_offs, offset);
+    }
+
+    offset = cur_size + startcode_len + size;
+    g_array_append_val (pic->slice_offs, offset);
+  }
+
+  return TRUE;
+
+error:
+  gst_clear_buffer (&new_buf);
+  return FALSE;
+}
+
+/**
+ * gst_vulkan_decoder_wait:
+ * @self: a #GstVulkanDecoder
+ *
+ * Waits indefinitely for decoding fences to signal, and queries the operation
+ * result if available.
+ *
+ * Returns: whether the wait succeeded in waiting for all the fences to be
+ *     freed.
+ */
+gboolean
+gst_vulkan_decoder_wait (GstVulkanDecoder * self)
+{
+  GstVulkanDecoderPrivate *priv;
+  gint32 *query = NULL;
+  GError *error = NULL;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DECODER (self), FALSE);
+
+  priv = gst_vulkan_decoder_get_instance_private (self);
+
+  if (!gst_vulkan_operation_wait (priv->exec))
+    return FALSE;
+
+  if (!gst_vulkan_operation_get_query (priv->exec, (gpointer *) & query,
+          &error)) {
+    GST_WARNING_OBJECT (self, "Operation query error: %s", error->message);
+    g_clear_error (&error);
+  } else if (query && query0 != 1) {
+    GST_WARNING_OBJECT (self, "query result: %d", query0);
+  }
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkdecoder.h Added

@@ -0,0 +1,194 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/vulkan/gstvkqueue.h>
+#include <gst/vulkan/gstvkvideoutils.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_VULKAN_DECODER         (gst_vulkan_decoder_get_type())
+#define GST_VULKAN_DECODER(o)           (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_VULKAN_DECODER, GstVulkanDecoder))
+#define GST_VULKAN_DECODER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GST_TYPE_VULKAN_DECODER, GstVulkanDecoderClass))
+#define GST_IS_VULKAN_DECODER(o)        (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_TYPE_VULKAN_DECODER))
+#define GST_IS_VULKAN_DECODER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE((k), GST_TYPE_VULKAN_DECODER))
+#define GST_VULKAN_DECODER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_TYPE_VULKAN_DECODER, GstVulkanDecoderClass))
+GST_VULKAN_API
+GType gst_vulkan_decoder_get_type       (void);
+
+/**
+ * GstVulkanDecoderPicture:
+ * @out: output buffer
+ * @dpb: DPB representation of @out if needed by driver
+ * @img_view_ref: image view for reference
+ * @img_view_out: image view for output
+ * @slice_offs: array of offsets of each uploaded slice
+ * @refs: references required to decode current pictures
+ *
+ * It contains the whole state for decoding a single picture.
+ *
+ * Since: 1.24
+ */
+struct _GstVulkanDecoderPicture
+{
+  GstBuffer *out;
+  GstBuffer *dpb; /* only used for out-of-place decoding */
+
+  GstVulkanImageView *img_view_ref; /* Image representation view (reference) */
+  GstVulkanImageView *img_view_out; /* Image representation view (output-only) */
+
+  GArray *slice_offs;
+
+  /* Picture refs. H264 has the maximum number of refs (36) of any supported
+   * codec. */
+  GstVulkanDecoderPicture *refs36;
+
+  /*< private >*/
+  VkVideoPictureResourceInfoKHR pics_res36;
+  VkVideoReferenceSlotInfoKHR slots36;
+
+  /* Current picture */
+  VkVideoPictureResourceInfoKHR pic_res;
+  VkVideoReferenceSlotInfoKHR slot;
+
+  /* Main decoding struct */
+  VkVideoDecodeInfoKHR decode_info;
+};
+
+/**
+ * GstVulkanDecoder:
+ * @parent: the parent #GstObject
+ * @queue: the #GstVulkanQueue to command buffers will be allocated from
+ * @codec: the configured video codec operation
+ * @profile: the configured #GstVulkanVideoProfile
+ * @input_buffer: the buffer to upload the bitstream to decode
+ * @dedicated_dpb: if decoder needs a dedicated DPB
+ * @layered_dpb: if decoder's dedicated DPB has to be a layered image
+ *
+ * Since: 1.24
+ **/
+struct _GstVulkanDecoder
+{
+  GstObject parent;
+
+  GstVulkanQueue *queue;
+
+  guint codec;
+  GstVulkanVideoProfile profile;
+  GstBuffer *input_buffer;
+  GstBuffer *layered_buffer;
+
+  gboolean dedicated_dpb;
+  gboolean layered_dpb;
+
+  /*< private >*/
+  gpointer _reserved        GST_PADDING;
+};
+
+/**
+ * GstVulkanDecoderClass:
+ * @parent_class: the parent #GstObjectClass
+ *
+ * Since: 1.24
+ */
+struct _GstVulkanDecoderClass
+{
+  GstObjectClass parent;
+  /*< private >*/
+  gpointer _reserved        GST_PADDING;
+};
+
+/**
+ * GstVulkanDecoderParameters:
+ *
+ * Codec specific parameters.
+ *
+ * Since: 1.24
+ */
+union _GstVulkanDecoderParameters
+{
+  /*< private >*/
+  VkVideoDecodeH264SessionParametersCreateInfoKHR h264;
+  VkVideoDecodeH265SessionParametersCreateInfoKHR h265;
+};
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanDecoder, gst_object_unref)
+
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_start                (GstVulkanDecoder * self,
+                                                                 GstVulkanVideoProfile * profile,
+                                                                 GError ** error);
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_stop                 (GstVulkanDecoder * self);
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_update_video_session_parameters
+                                                                (GstVulkanDecoder * self,
+                                                                 GstVulkanDecoderParameters * params,
+                                                                 GError ** error);
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_create_dpb_pool      (GstVulkanDecoder * self,
+                                                                 GstCaps * caps);
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_flush                (GstVulkanDecoder * self,
+                                                                 GError ** error);
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_decode               (GstVulkanDecoder * self,
+                                                                 GstVulkanDecoderPicture * pic,
+                                                                 GError ** error);
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_is_started           (GstVulkanDecoder * self);
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_caps                 (GstVulkanDecoder * self,
+                                                                 GstVulkanVideoCapabilities * caps);
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_out_format           (GstVulkanDecoder * self,
+                                                                 VkVideoFormatPropertiesKHR * format);
+GST_VULKAN_API
+GstCaps *               gst_vulkan_decoder_profile_caps         (GstVulkanDecoder * self);
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_update_ycbcr_sampler (GstVulkanDecoder * self,
+                                                                 VkSamplerYcbcrRange range,
+                                                                 VkChromaLocation xloc,
+                                                                 VkChromaLocation yloc,
+                                                                 GError ** error);
+
+GST_VULKAN_API
+GstVulkanImageView *    gst_vulkan_decoder_picture_create_view (GstVulkanDecoder * self,
+                                                                GstBuffer * buf,
+                                                                gboolean is_out);
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_picture_init         (GstVulkanDecoder * self,
+                                                                 GstVulkanDecoderPicture * pic,
+                                                                 GstBuffer * out);
+GST_VULKAN_API
+void                    gst_vulkan_decoder_picture_release      (GstVulkanDecoderPicture * pic);
+
+GST_VULKAN_API
+gboolean                gst_vulkan_decoder_append_slice         (GstVulkanDecoder * self,
+                                                                 GstVulkanDecoderPicture * pic,
+                                                                 const guint8 * data,
+                                                                 size_t size,
+                                                                 gboolean add_startcode);
+
+GST_VULKAN_API
+gboolean               gst_vulkan_decoder_wait                  (GstVulkanDecoder * self);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkdevice.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkdevice.c Changed

@@ -24,6 +24,7 @@
 
 #include "gstvkdevice.h"
 #include "gstvkdebug.h"
+#include "gstvkphysicaldevice-private.h"
 
 #include <string.h>
 
@@ -58,8 +59,8 @@
   GPtrArray *enabled_extensions;
 
   gboolean opened;
-  guint queue_family_id;
-  guint n_queues;
+  GArray *queues;
+  GArray *queue_family_indices;
 
   GstVulkanFenceCache *fence_cache;
 };
@@ -176,12 +177,38 @@
 gst_vulkan_device_constructed (GObject * object)
 {
   GstVulkanDevice *device = GST_VULKAN_DEVICE (object);
+  const char *optional_extensions = {
+    VK_KHR_SWAPCHAIN_EXTENSION_NAME,
+    VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME,
+#if defined(VK_KHR_timeline_semaphore)
+    VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME,
+#endif
+#if defined(VK_KHR_synchronization2)
+    VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME,
+#endif
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+    VK_KHR_VIDEO_QUEUE_EXTENSION_NAME,
+    VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME,
+    VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME,
+    VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME,
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+    VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME,
+    VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME,
+    VK_EXT_VIDEO_ENCODE_H265_EXTENSION_NAME,
+#endif
+#endif
+  };
+  int i;
 
   g_object_get (device->physical_device, "instance", &device->instance, NULL);
 
-  /* by default allow vkswapper to work for rendering to an output window.
-   * Ignore the failure if the extension does not exist. */
-  gst_vulkan_device_enable_extension (device, VK_KHR_SWAPCHAIN_EXTENSION_NAME);
+  /* Ignore the failure if the extension does not exist. */
+  for (i = 0; i < G_N_ELEMENTS (optional_extensions); i++) {
+    if (!gst_vulkan_device_enable_extension (device, optional_extensionsi)) {
+      GST_INFO_OBJECT (device, "Could not enable extension %s",
+          optional_extensionsi);
+    }
+  }
 
   G_OBJECT_CLASS (parent_class)->constructed (object);
 }
@@ -214,6 +241,16 @@
   GstVulkanDevice *device = GST_VULKAN_DEVICE (object);
   GstVulkanDevicePrivate *priv = GET_PRIV (device);
 
+  if (priv->queue_family_indices) {
+    g_array_unref (priv->queue_family_indices);
+    priv->queue_family_indices = NULL;
+  }
+
+  if (priv->queues) {
+    g_array_unref (priv->queues);
+    priv->queues = NULL;
+  }
+
   if (priv->fence_cache) {
     /* clear any outstanding fences */
     g_object_run_dispose (G_OBJECT (priv->fence_cache));
@@ -250,6 +287,132 @@
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
+/* https://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetParallel */
+/* TODO: add this function for general use and consider compiler builtins */
+static inline guint32
+_pop_count (guint32 n)
+{
+  n = n - ((n >> 1) & 0x55555555);
+  n = (n & 0x33333333) + ((n >> 2) & 0x33333333);
+  return (((n + (n >> 4)) & 0xF0F0F0F) * 0x1010101) >> 24;
+}
+
+/* look for the queue with more capabilities for the requested flag and also
+ * used by other flags, thus we could use the same queue for more ops. Though,
+ * perhaps it's not the best strategy for parallelism. */
+static inline int
+_pick_queue_family (VkQueueFamilyProperties * queue_family_props,
+    guint32 num_queue_families, VkQueueFlagBits flags, guint32 * family_scores)
+{
+  int i, index = -1;
+  guint32 score, max_score = 0;
+
+  for (i = 0; i < num_queue_families; i++) {
+    const VkQueueFlagBits queue_flags = queue_family_propsi.queueFlags;
+    if (queue_flags & flags) {
+      score = _pop_count (queue_flags) + family_scoresi;
+      if (score > max_score) {
+        index = i;
+        max_score = score;
+      }
+    }
+  }
+
+  if (index > -1)
+    family_scoresindex++;
+
+  return index;
+}
+
+static GArray *
+_append_queue_create_info (GArray * array, int family_index,
+    VkQueueFamilyProperties * queue_family_props)
+{
+  int i;
+  VkDeviceQueueCreateInfo queue_info;
+  gint queue_count;
+  gfloat *priorities;
+
+  if (family_index == -1)
+    return array;
+
+  for (i = 0; i < array->len; i++) {
+    VkDeviceQueueCreateInfo *qi =
+        &g_array_index (array, VkDeviceQueueCreateInfo, i);
+    if (qi->queueFamilyIndex == family_index)
+      return array;
+  }
+
+  /* shall we open all -- queue_family_propsfamily_index.queueCount ? */
+  queue_count = 1;
+
+  priorities = g_new (gfloat, queue_count);
+  for (i = 0; i < queue_count; i++)
+    prioritiesi = 1.0 / queue_count;
+
+  /* *INDENT-OFF* */
+  queue_info = (VkDeviceQueueCreateInfo) {
+      .sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
+      .queueFamilyIndex = family_index,
+      .queueCount = queue_count,
+      .pQueuePriorities = priorities,
+  };
+  /* *INDENT-ON* */
+
+  return g_array_append_val (array, queue_info);
+}
+
+
+/* Returns an array of VkDeviceQueueCreateInfo with the list of queues to
+ * create. The list will contain one or more queues which will support all the
+ * required families */
+static GArray *
+gst_vulkan_device_choose_queues (GstVulkanDevice * device)
+{
+  VkQueueFamilyProperties *queue_family_props;
+  GArray *array;
+  guint32 *family_scores, n_queue_families;
+  int graph_index, comp_index, tx_index;
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  int dec_index = -1;
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+  int enc_index = -1;
+#endif
+#endif
+
+  n_queue_families = device->physical_device->n_queue_families;
+  queue_family_props = device->physical_device->queue_family_props;
+
+  array = g_array_sized_new (FALSE, FALSE, sizeof (VkDeviceQueueCreateInfo),
+      n_queue_families);
+
+  family_scores = g_new0 (guint32, n_queue_families);
+
+  graph_index = _pick_queue_family (queue_family_props, n_queue_families,
+      VK_QUEUE_GRAPHICS_BIT, family_scores);
+  array = _append_queue_create_info (array, graph_index, queue_family_props);
+  comp_index = _pick_queue_family (queue_family_props, n_queue_families,
+      VK_QUEUE_COMPUTE_BIT, family_scores);
+  array = _append_queue_create_info (array, comp_index, queue_family_props);
+  tx_index = _pick_queue_family (queue_family_props, n_queue_families,
+      VK_QUEUE_TRANSFER_BIT, family_scores);
+  array = _append_queue_create_info (array, tx_index, queue_family_props);
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  dec_index = _pick_queue_family (queue_family_props, n_queue_families,
+      VK_QUEUE_VIDEO_DECODE_BIT_KHR, family_scores);
+  array = _append_queue_create_info (array, dec_index, queue_family_props);
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+  enc_index = _pick_queue_family (queue_family_props, n_queue_families,
+      VK_QUEUE_VIDEO_ENCODE_BIT_KHR, family_scores);
+  array = _append_queue_create_info (array, enc_index, queue_family_props);
+#endif
+#endif
+
+  g_free (family_scores);
+
+  return array;
+}
+
 /**
  * gst_vulkan_device_open:
  * @device: a #GstVulkanDevice
@@ -265,7 +428,6 @@
 gst_vulkan_device_open (GstVulkanDevice * device, GError ** error)
 {
   GstVulkanDevicePrivate *priv = GET_PRIV (device);
-  VkPhysicalDevice gpu;
   VkResult err;
   guint i;
 
@@ -278,21 +440,14 @@
     return TRUE;
   }
 
-  gpu = gst_vulkan_device_get_physical_device (device);
-
-  /* FIXME: allow overriding/selecting */
-  for (i = 0; i < device->physical_device->n_queue_families; i++) {
-    if (device->physical_device->
-        queue_family_propsi.queueFlags & VK_QUEUE_GRAPHICS_BIT)
-      break;
-  }
-  if (i >= device->physical_device->n_queue_families) {
+  priv->queues = gst_vulkan_device_choose_queues (device);
+  if (priv->queues->len == 0) {
+    g_array_unref (priv->queues);
+    priv->queues = NULL;
     g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
         "Failed to find a compatible queue family");
     goto error;
   }
-  priv->queue_family_id = i;
-  priv->n_queues = 1;
 
   GST_INFO_OBJECT (device, "Creating a device from physical %" GST_PTR_FORMAT
       " with %u layers and %u extensions", device->physical_device,
@@ -306,20 +461,15 @@
         (gchar *) g_ptr_array_index (priv->enabled_extensions, i));
 
   {
-    VkDeviceQueueCreateInfo queue_info = { 0, };
+    VkPhysicalDevice gpu;
     VkDeviceCreateInfo device_info = { 0, };
-    gfloat queue_priority = 0.5;
-
-    queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
-    queue_info.pNext = NULL;
-    queue_info.queueFamilyIndex = priv->queue_family_id;
-    queue_info.queueCount = priv->n_queues;
-    queue_info.pQueuePriorities = &queue_priority;
 
     device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
-    device_info.pNext = NULL;
-    device_info.queueCreateInfoCount = 1;
-    device_info.pQueueCreateInfos = &queue_info;
+    device_info.pNext =
+        gst_vulkan_physical_device_get_features (device->physical_device);
+    device_info.queueCreateInfoCount = priv->queues->len;
+    device_info.pQueueCreateInfos = (VkDeviceQueueCreateInfo *)
+        priv->queues->data;
     device_info.enabledLayerCount = priv->enabled_layers->len;
     device_info.ppEnabledLayerNames =
         (const char *const *) priv->enabled_layers->pdata;
@@ -328,6 +478,7 @@
         (const char *const *) priv->enabled_extensions->pdata;
     device_info.pEnabledFeatures = NULL;
 
+    gpu = gst_vulkan_device_get_physical_device (device);
     err = vkCreateDevice (gpu, &device_info, NULL, &device->device);
     if (gst_vulkan_error_to_g_error (err, error, "vkCreateDevice") < 0) {
       goto error;
@@ -338,6 +489,12 @@
   /* avoid reference loops between us and the fence cache */
   gst_object_unref (device);
 
+  for (i = 0; i < priv->queues->len; i++) {
+    VkDeviceQueueCreateInfo *qi =
+        &g_array_index (priv->queues, VkDeviceQueueCreateInfo, i);
+    g_free ((gpointer) qi->pQueuePriorities);
+  }
+
   priv->opened = TRUE;
   GST_OBJECT_UNLOCK (device);
   return TRUE;
@@ -365,14 +522,20 @@
 {
   GstVulkanDevicePrivate *priv = GET_PRIV (device);
   GstVulkanQueue *ret;
+  int i;
 
   g_return_val_if_fail (GST_IS_VULKAN_DEVICE (device), NULL);
   g_return_val_if_fail (device->device != NULL, NULL);
   g_return_val_if_fail (priv->opened, NULL);
-  g_return_val_if_fail (queue_family < priv->n_queues, NULL);
-  g_return_val_if_fail (queue_i <
-      device->physical_device->queue_family_propsqueue_family.queueCount,
-      NULL);
+
+  for (i = 0; i < priv->queues->len; i++) {
+    VkDeviceQueueCreateInfo *qi =
+        &g_array_index (priv->queues, VkDeviceQueueCreateInfo, i);
+    if (qi->queueFamilyIndex == queue_family && qi->queueCount >= queue_i)
+      break;
+  }
+
+  g_return_val_if_fail (i < priv->queues->len, NULL);
 
   ret = g_object_new (GST_TYPE_VULKAN_QUEUE, NULL);
   gst_object_ref_sink (ret);
@@ -401,23 +564,76 @@
 {
   GstVulkanDevicePrivate *priv = GET_PRIV (device);
   gboolean done = FALSE;
-  guint i;
+  guint i, j;
 
-  for (i = 0; i < priv->n_queues; i++) {
-    GstVulkanQueue *queue =
-        gst_vulkan_device_get_queue (device, priv->queue_family_id, i);
+  g_return_if_fail (GST_IS_VULKAN_DEVICE (device));
+  g_return_if_fail (priv->opened);
 
-    if (!func (device, queue, user_data))
-      done = TRUE;
+  for (i = 0; i < priv->queues->len; i++) {
+    VkDeviceQueueCreateInfo *qi =
+        &g_array_index (priv->queues, VkDeviceQueueCreateInfo, i);
 
-    gst_object_unref (queue);
+    for (j = 0; j < qi->queueCount; j++) {
+      GstVulkanQueue *queue =
+          gst_vulkan_device_get_queue (device, qi->queueFamilyIndex, j);
 
-    if (done)
-      break;
+      if (!func (device, queue, user_data))
+        done = TRUE;
+
+      gst_object_unref (queue);
+
+      if (done)
+        return;
+    }
   }
 }
 
 /**
+ * gst_vulkan_device_queue_family_indices:
+ * @device: a #GstVulkanDevice
+ *
+ * Returns: (element-type uint32_t) (transfer full): An array with the family
+ *     indexes of the created queues in @device
+ *
+ * Since: 1.24
+ */
+GArray *
+gst_vulkan_device_queue_family_indices (GstVulkanDevice * device)
+{
+  GstVulkanDevicePrivate *priv = GET_PRIV (device);
+  guint i, j;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DEVICE (device), NULL);
+  g_return_val_if_fail (priv->opened, NULL);
+
+  GST_OBJECT_LOCK (device);
+
+  if (priv->queue_family_indices)
+    goto beach;
+
+  priv->queue_family_indices =
+      g_array_sized_new (FALSE, FALSE, sizeof (uint32_t), priv->queues->len);
+
+  for (i = 0; i < priv->queues->len; i++) {
+    VkDeviceQueueCreateInfo *qi =
+        &g_array_index (priv->queues, VkDeviceQueueCreateInfo, i);
+
+    for (j = 0; j < priv->queue_family_indices->len; j++) {
+      uint32_t qfi = g_array_index (priv->queue_family_indices, uint32_t, j);
+      if (qfi == qi->queueFamilyIndex)
+        break;
+    }
+
+    if (j == priv->queue_family_indices->len)
+      g_array_append_val (priv->queue_family_indices, qi->queueFamilyIndex);
+  }
+
+beach:
+  GST_OBJECT_UNLOCK (device);
+  return g_array_ref (priv->queue_family_indices);
+}
+
+/**
  * gst_vulkan_device_get_proc_address:
  * @device: a #GstVulkanDevice
  * @name: name of the function to retrieve
@@ -644,32 +860,14 @@
   return gst_vulkan_fence_cache_acquire (priv->fence_cache, error);
 }
 
-/* reimplement a specfic case of g_ptr_array_find_with_equal_func as that
- * requires Glib 2.54 */
-static gboolean
-ptr_array_find_string (GPtrArray * array, const gchar * str, guint * index)
-{
-  guint i;
-
-  for (i = 0; i < array->len; i++) {
-    gchar *val = (gchar *) g_ptr_array_index (array, i);
-    if (g_strcmp0 (val, str) == 0) {
-      if (index)
-        *index = i;
-      return TRUE;
-    }
-  }
-
-  return FALSE;
-}
-
 static gboolean
 gst_vulkan_device_is_extension_enabled_unlocked (GstVulkanDevice * device,
     const gchar * name, guint * index)
 {
   GstVulkanDevicePrivate *priv = GET_PRIV (device);
 
-  return ptr_array_find_string (priv->enabled_extensions, name, index);
+  return g_ptr_array_find_with_equal_func (priv->enabled_extensions, name,
+      g_str_equal, index);
 }
 
 /**
@@ -798,7 +996,8 @@
 {
   GstVulkanDevicePrivate *priv = GET_PRIV (device);
 
-  return ptr_array_find_string (priv->enabled_layers, name, NULL);
+  return g_ptr_array_find_with_equal_func (priv->enabled_layers, name,
+      g_str_equal, NULL);
 }
 
 /**
@@ -871,3 +1070,58 @@
 
   return ret;
 }
+
+struct choose_queue
+{
+  guint expected_flags;
+  GstVulkanQueue *queue;
+};
+
+static gboolean
+_choose_queue (GstVulkanDevice * device, GstVulkanQueue * queue,
+    struct choose_queue *data)
+{
+  guint flags =
+      device->physical_device->queue_family_propsqueue->family.queueFlags;
+
+  if ((flags & data->expected_flags) != 0) {
+    if (data->queue)
+      gst_object_unref (data->queue);
+    data->queue = gst_object_ref (queue);
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_device_select_queue
+ * @device: a #GstVulkanDevice
+ * @expected_flags:  a VkQueueFlagBits
+ *
+ * Select a compatible queue from the @device supporting the @expected_flags.
+ *
+ * Returns: (transfer full): a #GstVulkanQueue for @queue matching the
+ *                           @expected_flags
+ *
+ * Since: 1.24
+ */
+GstVulkanQueue *
+gst_vulkan_device_select_queue (GstVulkanDevice * device,
+    VkQueueFlagBits expected_flags)
+{
+  struct choose_queue data;
+
+  data.expected_flags = expected_flags;
+  data.queue = NULL;
+
+  if (!gst_vulkan_device_open (device, NULL)) {
+    gst_object_unref (device);
+    goto beach;
+  }
+  gst_vulkan_device_foreach_queue (device,
+      (GstVulkanDeviceForEachQueueFunc) _choose_queue, &data);
+
+beach:
+  return data.queue;
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkdevice.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkdevice.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkfence.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkfence.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkformat.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkformat.c Changed

@@ -126,82 +126,55 @@
 #define SUB4204           { 0, 1, 1, 0 }, { 0, 1, 1, 0 }
 #define SUB4224           { 0, 1, 1, 0 }, { 0, 0, 0, 0 }
 
-static GstVulkanFormatInfo formats = {
-  {FORMAT (R8G8B8A8, UNORM), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444,
-      PLANE0, OFFS0123, SUB444},
-  {FORMAT (R8G8B8A8, SNORM), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444,
-      PLANE0, OFFS0123, SUB444},
-  {FORMAT (R8G8B8A8, USCALED), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888,
-      PSTR4444, PLANE0, OFFS0123, SUB444},
-  {FORMAT (R8G8B8A8, SSCALED), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888,
-      PSTR4444, PLANE0, OFFS0123, SUB444},
-  {FORMAT (R8G8B8A8, UINT), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444,
-      PLANE0, OFFS0123, SUB444},
-  {FORMAT (R8G8B8A8, SINT), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444,
-      PLANE0, OFFS0123, SUB444},
-  {FORMAT (R8G8B8A8, SRGB), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444,
-      PLANE0, OFFS0123, SUB444},
-  {FORMAT (B8G8R8A8, UNORM), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444,
-      PLANE0, OFFS2103, SUB444},
-  {FORMAT (B8G8R8A8, SNORM), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444,
-      PLANE0, OFFS2103, SUB444},
-  {FORMAT (B8G8R8A8, USCALED), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888,
-      PSTR4444, PLANE0, OFFS2103, SUB444},
-  {FORMAT (B8G8R8A8, SSCALED), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888,
-      PSTR4444, PLANE0, OFFS2103, SUB444},
-  {FORMAT (B8G8R8A8, UINT), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444,
-      PLANE0, OFFS2103, SUB444},
-  {FORMAT (B8G8R8A8, SINT), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444,
-      PLANE0, OFFS2103, SUB444},
-  {FORMAT (B8G8R8A8, SRGB), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444,
-      PLANE0, OFFS2103, SUB444},
-  {FORMAT (R8G8B8, UNORM), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012,
-      SUB444},
-  {FORMAT (R8G8B8, SNORM), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012,
-      SUB444},
-  {FORMAT (R8G8B8, USCALED), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012,
-      SUB444},
-  {FORMAT (R8G8B8, SSCALED), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012,
-      SUB444},
-  {FORMAT (R8G8B8, UINT), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012,
-      SUB444},
-  {FORMAT (R8G8B8, SINT), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012,
-      SUB444},
-  {FORMAT (R8G8B8, SRGB), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012,
-      SUB444},
-  {FORMAT (B8G8R8, UNORM), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210,
-      SUB444},
-  {FORMAT (B8G8R8, SNORM), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210,
-      SUB444},
-  {FORMAT (B8G8R8, USCALED), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210,
-      SUB444},
-  {FORMAT (B8G8R8, SSCALED), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210,
-      SUB444},
-  {FORMAT (B8G8R8, UINT), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210,
-      SUB444},
-  {FORMAT (B8G8R8, SINT), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210,
-      SUB444},
-  {FORMAT (B8G8R8, SRGB), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210,
-      SUB444},
-  {FORMAT (R8G8, UNORM), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01,
-      SUB44},
-  {FORMAT (R8G8, SNORM), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01,
-      SUB44},
-  {FORMAT (R8G8, USCALED), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01,
-      SUB44},
-  {FORMAT (R8G8, SSCALED), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01,
-      SUB44},
-  {FORMAT (R8G8, UINT), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01, SUB44},
-  {FORMAT (R8G8, SINT), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01, SUB44},
-  {FORMAT (R8G8, SRGB), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01, SUB44},
-  {FORMAT (R8, UNORM), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4},
-  {FORMAT (R8, SNORM), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4},
-  {FORMAT (R8, USCALED), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4},
-  {FORMAT (R8, SSCALED), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4},
-  {FORMAT (R8, UINT), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4},
-  {FORMAT (R8, SINT), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4},
-  {FORMAT (R8, SRGB), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4},
+#define ASPECT_2PLANE (VK_IMAGE_ASPECT_PLANE_0_BIT | VK_IMAGE_ASPECT_PLANE_1_BIT)
 
+/* *INDENT-OFF* */
+static GstVulkanFormatInfo formats = {
+  {FORMAT (R8G8B8A8, UNORM), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS0123, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8A8, SNORM), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS0123, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8A8, USCALED), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS0123, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8A8, SSCALED), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS0123, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8A8, UINT), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS0123, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8A8, SINT), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS0123, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8A8, SRGB), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS0123, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8A8, UNORM), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS2103, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8A8, SNORM), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS2103, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8A8, USCALED), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS2103, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8A8, SSCALED), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS2103, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8A8, UINT), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS2103, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8A8, SINT), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS2103, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8A8, SRGB), FLAG (RGB) | FLAG (ALPHA) | NE, DPTH8888, PSTR4444, PLANE0, OFFS2103, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8, UNORM), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8, SNORM), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8, USCALED), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8, SSCALED), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8, UINT), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8, SINT), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8B8, SRGB), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS012, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8, UNORM), FLAG (RGB) | NE,  DPTH888, PSTR444, PLANE0, OFFS210, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8, SNORM), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8, USCALED), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8, SSCALED), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8, UINT), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8, SINT), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (B8G8R8, SRGB), FLAG (RGB) | NE, DPTH888, PSTR444, PLANE0, OFFS210, SUB444, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8, UNORM), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01, SUB44, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8, SNORM), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01, SUB44, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8, USCALED), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01, SUB44, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8, SSCALED), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01, SUB44, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8, UINT), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01, SUB44, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8, SINT), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01, SUB44, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8G8, SRGB), FLAG (RGB) | NE, DPTH88, PSTR44, PLANE0, OFFS01, SUB44, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8, UNORM), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8, SNORM), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8, USCALED), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8, SSCALED), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8, UINT), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8, SINT), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4, VK_IMAGE_ASPECT_COLOR_BIT},
+  {FORMAT (R8, SRGB), FLAG (RGB) | NE, DPTH8, PSTR4, PLANE0, OFFS0, SUB4, VK_IMAGE_ASPECT_COLOR_BIT},
+#if (defined(VK_VERSION_1_3) || defined(VK_VERSION_1_2) && VK_HEADER_VERSION >= 199)
+  {FORMAT (G8_B8R8_2PLANE_420, UNORM), FLAG (YUV), DPTH888, PSTR122, PLANE011, OFFS001, SUB420, ASPECT_2PLANE},
+#endif
 #if 0
 FIXME: implement:
   {VK_FORMAT_R4G4_UNORM_PACK8, {0, 1, -1, -1}},
@@ -373,7 +346,6 @@
   VK_FORMAT_G8B8G8R8_422_UNORM = 1000156000,
   VK_FORMAT_B8G8R8G8_422_UNORM = 1000156001,
   VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM = 1000156002,
-  VK_FORMAT_G8_B8R8_2PLANE_420_UNORM = 1000156003,
   VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM = 1000156004,
   VK_FORMAT_G8_B8R8_2PLANE_422_UNORM = 1000156005,
   VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM = 1000156006,
@@ -414,6 +386,7 @@
   VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG = 1000054007,
 #endif
 };
+/* *INDENT-ON* */
 
 /**
  * gst_vulkan_format_get_info:
@@ -436,3 +409,334 @@
 
   return NULL;
 }
+
+/**
+ * gst_vulkan_format_get_aspect:
+ * @format: Vulkan Format
+ *
+ * Returns: the @format aspect
+ *
+ * Since: 1.24
+ */
+guint
+gst_vulkan_format_get_aspect (VkFormat format)
+{
+  int i;
+
+  for (i = 0; i < G_N_ELEMENTS (formats); i++) {
+    if (formatsi.format == format) {
+      return formatsi.aspect;
+    }
+  }
+
+  return 0;                     /* VK_IMAGE_ASPECT_NONE */
+}
+
+/* *INDENT-OFF* */
+const static struct {
+  GstVideoFormat format;
+  VkFormat vkfrmt;
+  VkFormat vkfrmtsGST_VIDEO_MAX_PLANES;
+} vk_formats_map = {
+  /* RGB                                                     transfer sRGB */
+  { GST_VIDEO_FORMAT_RGBA,  VK_FORMAT_R8G8B8A8_SRGB,       { VK_FORMAT_R8G8B8A8_UNORM, } },
+  { GST_VIDEO_FORMAT_RGBx,  VK_FORMAT_R8G8B8A8_SRGB,       { VK_FORMAT_R8G8B8A8_UNORM, } },
+  { GST_VIDEO_FORMAT_BGRA,  VK_FORMAT_B8G8R8A8_SRGB,       { VK_FORMAT_B8G8R8A8_UNORM, } },
+  { GST_VIDEO_FORMAT_BGRx,  VK_FORMAT_B8G8R8A8_SRGB,       { VK_FORMAT_B8G8R8A8_UNORM, } },
+  { GST_VIDEO_FORMAT_ARGB,  VK_FORMAT_UNDEFINED,           { VK_FORMAT_R8G8B8A8_UNORM, } },
+  { GST_VIDEO_FORMAT_xRGB,  VK_FORMAT_UNDEFINED,           { VK_FORMAT_R8G8B8A8_UNORM, } },
+  { GST_VIDEO_FORMAT_ABGR,  VK_FORMAT_UNDEFINED,           { VK_FORMAT_R8G8B8A8_UNORM, } },
+  { GST_VIDEO_FORMAT_xBGR,  VK_FORMAT_UNDEFINED,           { VK_FORMAT_R8G8B8A8_UNORM, } },
+  { GST_VIDEO_FORMAT_RGB,   VK_FORMAT_R8G8B8_UNORM,        { VK_FORMAT_UNDEFINED, } },
+  { GST_VIDEO_FORMAT_BGR,   VK_FORMAT_B8G8R8_UNORM,        { VK_FORMAT_UNDEFINED, } },
+  { GST_VIDEO_FORMAT_RGB16, VK_FORMAT_R5G6B5_UNORM_PACK16, { VK_FORMAT_UNDEFINED, } },
+  { GST_VIDEO_FORMAT_BGR16, VK_FORMAT_B5G6R5_UNORM_PACK16, { VK_FORMAT_UNDEFINED, } },
+  /* Gray */
+  { GST_VIDEO_FORMAT_GRAY16_BE, VK_FORMAT_R8G8_UNORM, { VK_FORMAT_UNDEFINED, } },
+  { GST_VIDEO_FORMAT_GRAY16_LE, VK_FORMAT_R8G8_UNORM, { VK_FORMAT_UNDEFINED, } },
+  { GST_VIDEO_FORMAT_GRAY8,     VK_FORMAT_R8_UNORM,   { VK_FORMAT_UNDEFINED, } },
+  /* YUV                                               planes */
+  { GST_VIDEO_FORMAT_AYUV, VK_FORMAT_UNDEFINED, { VK_FORMAT_R8G8B8A8_UNORM, } },
+  { GST_VIDEO_FORMAT_YUY2, VK_FORMAT_UNDEFINED, { VK_FORMAT_R8G8_UNORM, } },
+  { GST_VIDEO_FORMAT_UYVY, VK_FORMAT_UNDEFINED, { VK_FORMAT_R8G8_UNORM, } },
+  { GST_VIDEO_FORMAT_NV12,
+#if (defined(VK_VERSION_1_3) || defined(VK_VERSION_1_2) && VK_HEADER_VERSION >= 199)
+    VK_FORMAT_G8_B8R8_2PLANE_420_UNORM,
+#else
+    VK_FORMAT_UNDEFINED,
+#endif
+    { VK_FORMAT_R8_UNORM, VK_FORMAT_R8G8_UNORM } },
+  { GST_VIDEO_FORMAT_NV21, VK_FORMAT_UNDEFINED, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8G8_UNORM } },
+  { GST_VIDEO_FORMAT_Y444, VK_FORMAT_UNDEFINED, { VK_FORMAT_R8_UNORM,  } },
+  { GST_VIDEO_FORMAT_Y42B, VK_FORMAT_UNDEFINED, { VK_FORMAT_R8_UNORM, } },
+  { GST_VIDEO_FORMAT_Y41B, VK_FORMAT_UNDEFINED, { VK_FORMAT_R8_UNORM, } },
+  { GST_VIDEO_FORMAT_I420, VK_FORMAT_UNDEFINED, { VK_FORMAT_R8_UNORM, } },
+  { GST_VIDEO_FORMAT_YV12, VK_FORMAT_UNDEFINED, { VK_FORMAT_R8_UNORM, } },
+};
+/* *INDENT-ON* */
+
+/**
+ * gst_vulkan_format_from_video_info: (skip)
+ * @v_info: the #GstVideoInfo
+ * @plane: the plane
+ *
+ * Returns: the VkFormat to use for @v_format and @plane
+ *
+ * Since: 1.18
+ */
+VkFormat
+gst_vulkan_format_from_video_info (GstVideoInfo * v_info, guint plane)
+{
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS (vk_formats_map); i++) {
+    if (vk_formats_mapi.format != GST_VIDEO_INFO_FORMAT (v_info))
+      continue;
+
+    if (GST_VIDEO_INFO_IS_RGB (v_info)) {
+      if (GST_VIDEO_INFO_COLORIMETRY (v_info).transfer ==
+          GST_VIDEO_TRANSFER_SRGB) {
+        return vk_formats_mapi.vkfrmt;
+      } else {
+        return vk_formats_mapi.vkfrmts0;
+      }
+    } else if (GST_VIDEO_INFO_IS_YUV (v_info) &&
+        GST_VIDEO_INFO_N_PLANES (v_info) > plane) {
+      return vk_formats_mapi.vkfrmtsplane;
+    }
+
+    return vk_formats_mapi.vkfrmt;
+  }
+
+  return VK_FORMAT_UNDEFINED;
+}
+
+struct vkUsage
+{
+#if defined (VK_KHR_format_feature_flags2)
+  const VkFormatFeatureFlagBits2KHR feature;
+#else
+  const VkFormatFeatureFlagBits feature;
+#endif
+  VkImageUsageFlags usage;
+};
+
+static VkImageUsageFlags
+_get_usage (guint64 feature)
+{
+  int i;
+  VkImageUsageFlags usage = 0;
+  /* *INDENT-OFF* */
+  const struct vkUsage vk_usage_map = {
+    {VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT, VK_IMAGE_USAGE_SAMPLED_BIT},
+    {VK_FORMAT_FEATURE_TRANSFER_SRC_BIT, VK_IMAGE_USAGE_TRANSFER_SRC_BIT},
+    {VK_FORMAT_FEATURE_TRANSFER_DST_BIT, VK_IMAGE_USAGE_TRANSFER_DST_BIT},
+    {VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT, VK_IMAGE_USAGE_STORAGE_BIT},
+    {VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT,
+          VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT},
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+    {VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR,
+          VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR},
+    {VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR,
+          VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR},
+#ifdef VK_ENABLE_BETA_EXTENSIONS
+    {VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR,
+          VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR},
+    {VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR,
+          VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR},
+#endif
+#endif
+  };
+  /* *INDENT-ON* */
+
+  for (i = 0; i < G_N_ELEMENTS (vk_usage_map); i++) {
+    if (vk_usage_mapi.feature & feature)
+      usage |= vk_usage_mapi.usage;
+  }
+
+  return usage;
+}
+
+static guint64
+_get_feature_flags (VkPhysicalDevice gpu, gpointer func, VkFormat format,
+    VkImageTiling tiling)
+{
+  VkFormatProperties prop = { 0 };
+#if defined (VK_KHR_get_physical_device_properties2)
+#if defined (VK_KHR_format_feature_flags2)
+  VkFormatProperties3KHR prop3 = {
+    .sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR,
+  };
+#endif
+  VkFormatProperties2KHR prop2 = {
+    .sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR,
+#if defined (VK_KHR_format_feature_flags2)
+    .pNext = &prop3,
+#endif
+  };
+
+  if (func) {
+    PFN_vkGetPhysicalDeviceFormatProperties2KHR
+        gst_vkGetPhysicalDeviceFormatProperties2 = func;
+
+    gst_vkGetPhysicalDeviceFormatProperties2 (gpu, format, &prop2);
+#if defined (VK_KHR_format_feature_flags2)
+    return tiling == VK_IMAGE_TILING_LINEAR ?
+        prop3.linearTilingFeatures : prop3.optimalTilingFeatures;
+#else
+    return tiling == VK_IMAGE_TILING_LINEAR ?
+        prop2.formatProperties.linearTilingFeatures :
+        prop2.formatProperties.optimalTilingFeatures;
+#endif
+  }
+#endif /* defined (VK_KHR_get_physical_device_properties2) */
+
+  /* fallback */
+  vkGetPhysicalDeviceFormatProperties (gpu, format, &prop);
+  return tiling == VK_IMAGE_TILING_LINEAR ?
+      prop.linearTilingFeatures : prop.optimalTilingFeatures;
+}
+
+/**
+ * gst_vulkan_format_from_video_info_2: (skip)
+ * @physical_device: a #GstVulkanPhysicalDevice
+ * @info: the #GstVideoInfo
+ * @tiling: the tiling to use
+ * @no_multiplane: query for vulkan formats without multiple images
+ * @fmts: (out) (array fixed-size=4): Vulkan formats per image/plane
+ * @n_imgs: (out): number of images/planes used by the Vulkan format
+ * @usage: (out): The potential usage of the format
+ *
+ * Returns: %TRUE if requested GStreamer format maps to a Vulkan format and its
+ * properties.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_vulkan_format_from_video_info_2 (GstVulkanPhysicalDevice * physical_device,
+    GstVideoInfo * info, VkImageTiling tiling, gboolean no_multiplane,
+    VkImageUsageFlags requested_usage, VkFormat fmtsGST_VIDEO_MAX_PLANES,
+    int *n_imgs, VkImageUsageFlags * usage_ret)
+{
+  int i;
+  VkPhysicalDevice gpu;
+#if defined (VK_KHR_get_physical_device_properties2)
+  PFN_vkGetPhysicalDeviceFormatProperties2KHR
+      gst_vkGetPhysicalDeviceFormatProperties2 = NULL;
+
+  gst_vkGetPhysicalDeviceFormatProperties2 =
+      gst_vulkan_instance_get_proc_address (physical_device->instance,
+      "vkGetPhysicalDeviceFormatProperties2");
+  if (!gst_vkGetPhysicalDeviceFormatProperties2)
+    gst_vkGetPhysicalDeviceFormatProperties2 =
+        gst_vulkan_instance_get_proc_address (physical_device->instance,
+        "vkGetPhysicalDeviceFormatProperties2KHR");
+#else
+  gpointer gst_vkGetPhysicalDeviceFormatProperties2 = NULL;
+#endif
+
+  gpu = gst_vulkan_physical_device_get_handle (physical_device);
+
+  for (i = 0; i < G_N_ELEMENTS (vk_formats_map); i++) {
+    guint64 feats_primary, feats_secondary = 0;
+    VkImageUsageFlags usage = 0;
+
+    if (vk_formats_mapi.format != GST_VIDEO_INFO_FORMAT (info))
+      continue;
+
+    feats_primary = _get_feature_flags (gpu,
+        gst_vkGetPhysicalDeviceFormatProperties2, vk_formats_mapi.vkfrmt,
+        tiling);
+
+    if (vk_formats_mapi.vkfrmt != vk_formats_mapi.vkfrmts0) {
+      feats_secondary = _get_feature_flags (gpu,
+          gst_vkGetPhysicalDeviceFormatProperties2,
+          vk_formats_mapi.vkfrmts0, tiling);
+    }
+
+    if (GST_VIDEO_INFO_IS_RGB (info)) {
+      if ((GST_VIDEO_INFO_COLORIMETRY (info).transfer ==
+              GST_VIDEO_TRANSFER_SRGB
+              || GST_VIDEO_INFO_COLORIMETRY (info).transfer ==
+              GST_VIDEO_TRANSFER_UNKNOWN)) {
+        usage = _get_usage (feats_primary);
+        if ((requested_usage & usage) == requested_usage) {
+          if (fmts)
+            fmts0 = vk_formats_mapi.vkfrmt;
+          if (n_imgs)
+            *n_imgs = 1;
+          if (usage_ret)
+            *usage_ret = usage;
+          return TRUE;
+        }
+      }
+
+      if (GST_VIDEO_INFO_COLORIMETRY (info).transfer != GST_VIDEO_TRANSFER_SRGB) {
+        usage = _get_usage (feats_secondary);
+        if ((requested_usage & usage) == requested_usage) {
+          if (fmts)
+            fmts0 = vk_formats_mapi.vkfrmts0;
+          if (n_imgs)
+            *n_imgs = 1;
+          if (usage_ret)
+            *usage_ret = usage;
+          return TRUE;
+        }
+      }
+      return FALSE;
+    } else {
+      if (!no_multiplane && GST_VIDEO_INFO_N_PLANES (info) > 1) {
+        usage = _get_usage (feats_primary);
+        if ((requested_usage & usage) == requested_usage) {
+          if (fmts)
+            fmts0 = vk_formats_mapi.vkfrmt;
+          if (n_imgs)
+            *n_imgs = 1;
+          if (usage_ret)
+            *usage_ret = usage;
+          return TRUE;
+        }
+      }
+
+      usage = _get_usage (feats_secondary);
+      if ((requested_usage & usage) == requested_usage) {
+        if (fmts) {
+          memcpy (fmts, vk_formats_mapi.vkfrmts,
+              GST_VIDEO_MAX_PLANES * sizeof (VkFormat));
+        }
+        if (n_imgs)
+          *n_imgs = GST_VIDEO_INFO_N_PLANES (info);
+        if (usage_ret)
+          *usage_ret = usage;
+
+        return TRUE;
+      }
+      return FALSE;
+    }
+  }
+
+  return FALSE;
+}
+
+/**
+ * gst_vulkan_format_to_video_format:
+ * @vk_format: the Vulkan format to convert
+ *
+ * Returns: the #GstVideoFormat that maps to @vk_format
+ *
+ * Since: 1.24
+ */
+GstVideoFormat
+gst_vulkan_format_to_video_format (VkFormat vk_format)
+{
+  int i;
+
+  for (i = 0; i < G_N_ELEMENTS (vk_formats_map); i++) {
+    if (vk_formats_mapi.vkfrmt != vk_format)
+      continue;
+
+    return vk_formats_mapi.format;
+  }
+
+  return GST_VIDEO_FORMAT_UNKNOWN;
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkformat.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkformat.h Changed

@@ -22,6 +22,7 @@
 #define __GST_VULKAN_FORMAT_H__
 
 #include <gst/vulkan/vulkan.h>
+#include <gst/video/video.h>
 
 G_BEGIN_DECLS
 
@@ -118,11 +119,40 @@
   guint8 poffsetGST_VULKAN_MAX_COMPONENTS;
   guint8 w_subGST_VULKAN_MAX_COMPONENTS;
   guint8 h_subGST_VULKAN_MAX_COMPONENTS;
+
+  /**
+   * GstVulkanFormatInfo.aspect:
+   *
+   * image aspect of this format
+   *
+   * Since: 1.24
+   */
+  VkImageAspectFlags aspect;
 };
 
 GST_VULKAN_API
 const GstVulkanFormatInfo *     gst_vulkan_format_get_info                      (VkFormat format);
 
+GST_VULKAN_API
+guint                           gst_vulkan_format_get_aspect                    (VkFormat format);
+
+GST_VULKAN_API
+VkFormat                        gst_vulkan_format_from_video_info               (GstVideoInfo * v_info,
+                                                                                 guint plane);
+
+GST_VULKAN_API
+gboolean                        gst_vulkan_format_from_video_info_2            (GstVulkanPhysicalDevice * physical_device,
+                                                                                GstVideoInfo * info,
+                                                                                VkImageTiling tiling,
+                                                                                gboolean no_multiplane,
+                                                                                VkImageUsageFlags requested_usage,
+                                                                                VkFormat fmtsGST_VIDEO_MAX_PLANES,
+                                                                                int * n_imgs,
+                                                                                VkImageUsageFlags * usage);
+
+GST_VULKAN_API
+GstVideoFormat                  gst_vulkan_format_to_video_format              (VkFormat vk_format);
+
 G_END_DECLS
 
 #endif /* __GST_VULKAN_FORMAT_H__ */

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkfullscreenquad.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkfullscreenquad.c Changed

@@ -129,7 +129,7 @@
 
 static GstVulkanDescriptorSet *
 get_and_update_descriptor_set (GstVulkanFullScreenQuad * self,
-    GstVulkanImageView ** views, GError ** error)
+    GstVulkanImageView ** views, guint n_mems, GError ** error)
 {
   GstVulkanFullScreenQuadPrivate *priv = GET_PRIV (self);
   GstVulkanDescriptorSet *set;
@@ -169,7 +169,7 @@
       };
     }
 
-    for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&self->in_info); i++) {
+    for (i = 0; i < n_mems; i++) {
       image_infoi = (VkDescriptorImageInfo) {
           .imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
           .imageView = viewsi->view,
@@ -198,12 +198,13 @@
 static gboolean
 create_descriptor_set_layout (GstVulkanFullScreenQuad * self, GError ** error)
 {
+  GstVulkanFullScreenQuadPrivate *priv = GET_PRIV (self);
   VkDescriptorSetLayoutBinding bindingsGST_VIDEO_MAX_PLANES + 1 = { {0,} };
   VkDescriptorSetLayoutCreateInfo layout_info;
   VkDescriptorSetLayout descriptor_set_layout;
   int descriptor_n = 0;
   VkResult err;
-  int i;
+  int i, n_mems;
 
   /* *INDENT-OFF* */
   bindingsdescriptor_n++ = (VkDescriptorSetLayoutBinding) {
@@ -213,7 +214,8 @@
       .pImmutableSamplers = NULL,
       .stageFlags = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT
   };
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&self->in_info); i++) {
+  n_mems = gst_buffer_n_memory (priv->inbuf);
+  for (i = 0; i < n_mems; i++) {
     bindingsdescriptor_n++ = (VkDescriptorSetLayoutBinding) {
       .binding = i+1,
       .descriptorCount = 1,
@@ -295,9 +297,10 @@
   VkSubpassDescription subpass;
   VkRenderPass render_pass;
   VkResult err;
-  int i;
+  int i, n_mems;
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&self->out_info); i++) {
+  n_mems = gst_buffer_n_memory (priv->outbuf);
+  for (i = 0; i < n_mems; i++) {
     /* *INDENT-OFF* */
     color_attachmentsi = (VkAttachmentDescription) {
         .format = gst_vulkan_format_from_video_info (&self->out_info, i),
@@ -321,14 +324,14 @@
   /* *INDENT-OFF* */
   subpass = (VkSubpassDescription) {
       .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS,
-      .colorAttachmentCount = GST_VIDEO_INFO_N_PLANES (&self->out_info),
+      .colorAttachmentCount = n_mems,
       .pColorAttachments = color_attachment_refs
   };
 
   render_pass_info = (VkRenderPassCreateInfo) {
       .sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,
       .pNext = NULL,
-      .attachmentCount = GST_VIDEO_INFO_N_PLANES (&self->out_info),
+      .attachmentCount = n_mems,
       .pAttachments = color_attachments,
       .subpassCount = 1,
       .pSubpasses = &subpass
@@ -523,7 +526,7 @@
       .pNext = NULL,
       .logicOpEnable = VK_FALSE,
       .logicOp = VK_LOGIC_OP_COPY,
-      .attachmentCount = GST_VIDEO_INFO_N_PLANES (&self->out_info),   
+      .attachmentCount = gst_buffer_n_memory (priv->outbuf),
       .pAttachments = color_blend_attachments,
       .blendConstants = { 0.0f, 0.0f, 0.0f, 0.0f }
   };
@@ -575,7 +578,7 @@
   /* *INDENT-OFF* */
   pool_sizes0 = (VkDescriptorPoolSize) {
       .type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-      .descriptorCount = max_sets * GST_VIDEO_INFO_N_PLANES (&self->in_info),
+      .descriptorCount = max_sets * gst_buffer_n_memory (priv->inbuf),
   };
 
   if (priv->uniforms) {
@@ -615,7 +618,7 @@
 
 static gboolean
 create_framebuffer (GstVulkanFullScreenQuad * self, GstVulkanImageView ** views,
-    GError ** error)
+    guint n_mems, GError ** error)
 {
   VkImageView attachmentsGST_VIDEO_MAX_PLANES = { 0, };
   VkFramebufferCreateInfo framebuffer_info;
@@ -623,7 +626,7 @@
   VkResult err;
   int i;
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&self->out_info); i++) {
+  for (i = 0; i < n_mems; i++) {
     attachmentsi = viewsi->view;
   }
 
@@ -632,7 +635,7 @@
       .sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
       .pNext = NULL,
       .renderPass = (VkRenderPass) self->render_pass->handle,
-      .attachmentCount = GST_VIDEO_INFO_N_PLANES (&self->out_info),
+      .attachmentCount = n_mems,
       .pAttachments = attachments,
       .width = GST_VIDEO_INFO_WIDTH (&self->out_info),
       .height = GST_VIDEO_INFO_HEIGHT (&self->out_info),
@@ -1373,7 +1376,7 @@
   GstVulkanFullScreenQuadPrivate *priv;
   GstVulkanImageView *in_viewsGST_VIDEO_MAX_PLANES = { NULL, };
   GstVulkanImageView *out_viewsGST_VIDEO_MAX_PLANES = { NULL, };
-  int i;
+  int i, n_mems;
 
   g_return_val_if_fail (GST_IS_VULKAN_FULL_SCREEN_QUAD (self), FALSE);
   g_return_val_if_fail (fence != NULL, FALSE);
@@ -1392,7 +1395,8 @@
       goto error;
 
   if (!self->descriptor_set) {
-    for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&self->in_info); i++) {
+    n_mems = gst_buffer_n_memory (priv->inbuf);
+    for (i = 0; i < n_mems; i++) {
       GstVulkanImageMemory *img_mem = peek_image_from_buffer (priv->inbuf, i);
       if (!gst_is_vulkan_image_memory ((GstMemory *) img_mem)) {
         g_set_error_literal (error, GST_VULKAN_ERROR, GST_VULKAN_FAILED,
@@ -1406,12 +1410,13 @@
               (GstMiniObject *) in_viewsi));
     }
     if (!(self->descriptor_set =
-            get_and_update_descriptor_set (self, in_views, error)))
+            get_and_update_descriptor_set (self, in_views, n_mems, error)))
       goto error;
   }
 
   if (!self->framebuffer) {
-    for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&self->out_info); i++) {
+    n_mems = gst_buffer_n_memory (priv->outbuf);
+    for (i = 0; i < n_mems; i++) {
       GstVulkanImageMemory *img_mem = peek_image_from_buffer (priv->outbuf, i);
       if (!gst_is_vulkan_image_memory ((GstMemory *) img_mem)) {
         g_set_error_literal (error, GST_VULKAN_ERROR, GST_VULKAN_FAILED,
@@ -1424,7 +1429,7 @@
               gst_vulkan_trash_mini_object_unref,
               (GstMiniObject *) out_viewsi));
     }
-    if (!create_framebuffer (self, out_views, error))
+    if (!create_framebuffer (self, out_views, n_mems, error))
       goto error;
   }
 
@@ -1461,6 +1466,7 @@
   GstVulkanImageView *in_viewsGST_VIDEO_MAX_PLANES = { NULL, };
   GstVulkanImageView *out_viewsGST_VIDEO_MAX_PLANES = { NULL, };
   int i;
+  guint n_in_mems, n_out_mems;
 
   g_return_val_if_fail (GST_IS_VULKAN_FULL_SCREEN_QUAD (self), FALSE);
   g_return_val_if_fail (cmd != NULL, FALSE);
@@ -1468,7 +1474,8 @@
 
   priv = GET_PRIV (self);
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&self->in_info); i++) {
+  n_in_mems = gst_buffer_n_memory (priv->inbuf);
+  for (i = 0; i < n_in_mems; i++) {
     GstVulkanImageMemory *img_mem = peek_image_from_buffer (priv->inbuf, i);
     if (!gst_is_vulkan_image_memory ((GstMemory *) img_mem)) {
       g_set_error_literal (error, GST_VULKAN_ERROR, GST_VULKAN_FAILED,
@@ -1480,7 +1487,8 @@
         gst_vulkan_trash_list_acquire (self->trash_list, fence,
             gst_vulkan_trash_mini_object_unref, (GstMiniObject *) in_viewsi));
   }
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&self->out_info); i++) {
+  n_out_mems = gst_buffer_n_memory (priv->outbuf);
+  for (i = 0; i < n_out_mems; i++) {
     GstVulkanImageMemory *img_mem = peek_image_from_buffer (priv->outbuf, i);
     if (!gst_is_vulkan_image_memory ((GstMemory *) img_mem)) {
       g_set_error_literal (error, GST_VULKAN_ERROR, GST_VULKAN_FAILED,
@@ -1494,7 +1502,7 @@
             (GstMiniObject *) out_viewsi));
   }
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&self->in_info); i++) {
+  for (i = 0; i < n_in_mems; i++) {
     /* *INDENT-OFF* */
     VkImageMemoryBarrier in_image_memory_barrier = {
         .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
@@ -1504,8 +1512,8 @@
         .oldLayout = in_viewsi->image->barrier.image_layout,
         .newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
         /* FIXME: implement exclusive transfers */
-        .srcQueueFamilyIndex = 0,
-        .dstQueueFamilyIndex = 0,
+        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
         .image = in_viewsi->image->image,
         .subresourceRange = in_viewsi->image->barrier.subresource_range
     };
@@ -1524,7 +1532,7 @@
         in_image_memory_barrier.newLayout;
   }
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&self->out_info); i++) {
+  for (i = 0; i < n_out_mems; i++) {
     /* *INDENT-OFF* */
     VkImageMemoryBarrier out_image_memory_barrier = {
         .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
@@ -1534,8 +1542,8 @@
         .oldLayout = out_viewsi->image->barrier.image_layout,
         .newLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
         /* FIXME: implement exclusive transfers */
-        .srcQueueFamilyIndex = 0,
-        .dstQueueFamilyIndex = 0,
+        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
         .image = out_viewsi->image->image,
         .subresourceRange = out_viewsi->image->barrier.subresource_range
     };
@@ -1569,7 +1577,7 @@
             GST_VIDEO_INFO_WIDTH (&self->out_info),
             GST_VIDEO_INFO_HEIGHT (&self->out_info)
         },
-        .clearValueCount = GST_VIDEO_INFO_N_PLANES (&self->out_info),
+        .clearValueCount = n_out_mems,
         .pClearValues = clearColors,
     };
     /* *INDENT-ON* */

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkhandle.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkhandle.h Changed

@@ -85,6 +85,9 @@
  * @GST_VULKAN_HANDLE_TYPE_SAMPLER: sampler
  * @GST_VULKAN_HANDLE_TYPE_FRAMEBUFFER: framebuffer
  * @GST_VULKAN_HANDLE_TYPE_SHADER: shader
+ * @GST_VULKAN_HANDLE_TYPE_VIDEO_SESSION: video session
+ * @GST_VULKAN_HANDLE_TYPE_VIDEO_SESSION_PARAMETERS: video session parameters
+ * @GST_VULKAN_HANDLE_TYPE_SAMPLER_YCBCR_CONVERSION: sampler with YCBCR conversion
  *
  * Since: 1.18
  */
@@ -97,6 +100,30 @@
   GST_VULKAN_HANDLE_TYPE_SAMPLER                        = 5,
   GST_VULKAN_HANDLE_TYPE_FRAMEBUFFER                    = 6,
   GST_VULKAN_HANDLE_TYPE_SHADER                         = 7,
+  /**
+   * GST_VULKAN_HANDLE_TYPE_VIDEO_SESSION:
+   *
+   * video session
+   *
+   * Since: 1.24
+   */
+  GST_VULKAN_HANDLE_TYPE_VIDEO_SESSION                  = 8,
+  /**
+   * GST_VULKAN_HANDLE_TYPE_VIDEO_SESSION_PARAMETERS:
+   *
+   * video session parameters
+   *
+   * Since: 1.24
+   */
+  GST_VULKAN_HANDLE_TYPE_VIDEO_SESSION_PARAMETERS       = 9,
+  /**
+   * GST_VULKAN_HANDLE_TYPE_SAMPLER_YCBCR_CONVERSION:
+   *
+   * sampler with YCBCR conversion
+   *
+   * Since: 1.24
+   */
+  GST_VULKAN_HANDLE_TYPE_SAMPLER_YCBCR_CONVERSION      = 10,
 } GstVulkanHandleType;
 
 /**

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkimagebufferpool.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkimagebufferpool.c Changed

@@ -33,9 +33,6 @@
  * a #GstVulkanImageBufferPool is an object that allocates buffers with #GstVulkanImageMemory
  *
  * A #GstVulkanImageBufferPool is created with gst_vulkan_image_buffer_pool_new()
- *
- * #GstVulkanImageBufferPool implements the VideoMeta buffer pool option
- * #GST_BUFFER_POOL_OPTION_VIDEO_META
  */
 
 /* bufferpool */
@@ -44,7 +41,16 @@
   GstCaps *caps;
   gboolean raw_caps;
   GstVideoInfo v_info;
-  gboolean add_videometa;
+  VkImageUsageFlags usage;
+  VkMemoryPropertyFlags mem_props;
+  VkImageLayout initial_layout;
+  guint64 initial_access;
+  VkFormat vk_fmtsGST_VIDEO_MAX_PLANES;
+  int n_imgs;
+  guint32 n_layers;
+  gboolean has_profile;
+  GstVulkanVideoProfile profile;
+  GstVulkanOperation *exec;
 };
 
 static void gst_vulkan_image_buffer_pool_finalize (GObject * object);
@@ -60,14 +66,77 @@
     GST_DEBUG_CATEGORY_INIT (GST_CAT_VULKAN_IMAGE_BUFFER_POOL,
         "vulkanimagebufferpool", 0, "Vulkan Image Buffer Pool"));
 
-static const gchar **
-gst_vulkan_image_buffer_pool_get_options (GstBufferPool * pool)
+/**
+ * gst_vulkan_image_buffer_pool_config_set_allocation_params:
+ * @config: the #GstStructure with the pool's configuration.
+ * @usage: The Vulkan image usage flags.
+ * @mem_properties: Vulkan memory property flags.
+ * @initial_layout: Initial Vulkan image layout.
+ * @initial_access: Access flags for the layout transition if @initial_layout is
+ * not VK_IMAGE_LAYOUT_UNDEFINED or VK_IMAGE_LAYOUT_PREINITIALIZED.
+ *
+ * Sets the @usage and @mem_properties of the images to setup.
+ *
+ * Since: 1.24
+ */
+void
+gst_vulkan_image_buffer_pool_config_set_allocation_params (GstStructure *
+    config, VkImageUsageFlags usage, VkMemoryPropertyFlags mem_properties,
+    VkImageLayout initial_layout, guint64 initial_access)
 {
-  static const gchar *options = { GST_BUFFER_POOL_OPTION_VIDEO_META,
-    NULL
-  };
+  /* assumption: G_TYPE_UINT is compatible with uint32_t (VkFlags) */
+  gst_structure_set (config, "usage", G_TYPE_UINT, usage, "memory-properties",
+      G_TYPE_UINT, mem_properties, "initial-layout", G_TYPE_UINT,
+      initial_layout, "initial-access", G_TYPE_UINT64, initial_access, NULL);
+}
+
+/**
+ * gst_vulkan_image_buffer_pool_config_set_decode_caps:
+ * @config: the #GstStructure with the pool's configuration.
+ * @caps: Upstream decode caps.
+ *
+ * Decode @caps are used when the buffers are going to be used either as decoded
+ * dest or DPB images.
+ *
+ * Since: 1.24
+ */
+void
+gst_vulkan_image_buffer_pool_config_set_decode_caps (GstStructure * config,
+    GstCaps * caps)
+{
+  g_return_if_fail (GST_IS_CAPS (caps));
+
+  gst_structure_set (config, "decode-caps", GST_TYPE_CAPS, caps, NULL);
+}
+
+static inline gboolean
+gst_vulkan_image_buffer_pool_config_get_allocation_params (GstStructure *
+    config, VkImageUsageFlags * usage, VkMemoryPropertyFlags * mem_props,
+    VkImageLayout * initial_layout, guint64 * initial_access,
+    guint32 * n_layers, GstCaps ** decode_caps)
+{
+  if (!gst_structure_get_uint (config, "usage", usage)) {
+    *usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT
+        | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT
+        | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
+  }
 
-  return options;
+  if (!gst_structure_get_uint (config, "memory-properties", mem_props))
+    *mem_props = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+
+  if (!gst_structure_get_uint (config, "initial-layout", initial_layout))
+    *initial_layout = VK_IMAGE_LAYOUT_UNDEFINED;
+
+  if (!gst_structure_get_uint64 (config, "initial-access", initial_access))
+    *initial_access = 0;
+
+  if (!gst_structure_get_uint (config, "num-layers", n_layers))
+    *n_layers = 1;
+
+  if (decode_caps)
+    gst_structure_get (config, "decode-caps", GST_TYPE_CAPS, decode_caps, NULL);
+
+  return TRUE;
 }
 
 static gboolean
@@ -76,10 +145,13 @@
 {
   GstVulkanImageBufferPool *vk_pool = GST_VULKAN_IMAGE_BUFFER_POOL_CAST (pool);
   GstVulkanImageBufferPoolPrivate *priv = GET_PRIV (vk_pool);
+  VkImageTiling tiling;
+  VkImageUsageFlags requested_usage, supported_usage;
+  VkImageCreateInfo image_info;
   guint min_buffers, max_buffers;
-  GstCaps *caps = NULL;
+  GstCaps *caps = NULL, *decode_caps = NULL;
   GstCapsFeatures *features;
-  gboolean ret = TRUE;
+  gboolean found, no_multiplane, ret = TRUE;
   guint i;
 
   if (!gst_buffer_pool_config_get_params (config, &caps, NULL, &min_buffers,
@@ -102,27 +174,113 @@
   priv->raw_caps = features == NULL || gst_caps_features_is_equal (features,
       GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY);
 
+  gst_vulkan_image_buffer_pool_config_get_allocation_params (config,
+      &priv->usage, &priv->mem_props, &priv->initial_layout,
+      &priv->initial_access, &priv->n_layers, &decode_caps);
+
+  priv->has_profile = FALSE;
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  if (decode_caps && ((priv->usage
+              & (VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR
+                  | VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR)) != 0)) {
+    priv->has_profile =
+        gst_vulkan_video_profile_from_caps (&priv->profile, decode_caps,
+        GST_VULKAN_VIDEO_OPERATION_DECODE);
+  }
+#endif
+  gst_clear_caps (&decode_caps);
+
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  if (((priv->usage & (VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR
+                  | VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR)) != 0)
+      && !priv->has_profile)
+    goto missing_profile;
+
+  if (priv->has_profile) {
+    no_multiplane = FALSE;
+
+    /* HACK(victor): NVIDIA & RADV drivers don't report decoding features for
+     * color format. Setting usage to zero to short circuit validation. */
+    requested_usage = 0;
+  } else
+#endif
+  {
+    no_multiplane = TRUE;
+    requested_usage = priv->usage;
+  }
+
+  tiling = priv->raw_caps ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
+  found = gst_vulkan_format_from_video_info_2 (vk_pool->device->physical_device,
+      &priv->v_info, tiling, no_multiplane, requested_usage, priv->vk_fmts,
+      &priv->n_imgs, &supported_usage);
+  if (!found)
+    goto no_vk_format;
+
+  if (priv->usage == 0) {
+    priv->usage = supported_usage & (VK_BUFFER_USAGE_TRANSFER_DST_BIT
+        | VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_STORAGE_BIT
+        | VK_IMAGE_USAGE_SAMPLED_BIT);
+  }
+
   /* get the size of the buffer to allocate */
+  /* *INDENT-OFF* */
+  image_info = (VkImageCreateInfo) {
+    .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
+    .pNext = NULL,
+    .flags = 0,
+    .imageType = VK_IMAGE_TYPE_2D,
+    /* .format = fill per image,  */
+    /* .extent = fill per plane, */
+    .mipLevels = 1,
+    .arrayLayers = priv->n_layers,
+    .samples = VK_SAMPLE_COUNT_1_BIT,
+    .tiling = tiling,
+    .usage = priv->usage,
+    .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
+    .queueFamilyIndexCount = 0,
+    .pQueueFamilyIndices = NULL,
+    .initialLayout = priv->initial_layout == VK_IMAGE_LAYOUT_PREINITIALIZED
+                     ? VK_IMAGE_LAYOUT_PREINITIALIZED
+                     : VK_IMAGE_LAYOUT_UNDEFINED,
+  };
+  /* *INDENT-ON* */
   priv->v_info.size = 0;
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&priv->v_info); i++) {
+  for (i = 0; i < priv->n_imgs; i++) {
     GstVulkanImageMemory *img_mem;
-    VkImageTiling tiling = VK_IMAGE_TILING_OPTIMAL;
     guint width, height;
-    VkFormat vk_format;
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+    VkVideoProfileListInfoKHR profile_list = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_LIST_INFO_KHR,
+      .profileCount = 1,
+      .pProfiles = &priv->profile.profile,
+    };
+#endif
 
-    vk_format = gst_vulkan_format_from_video_info (&priv->v_info, i);
-    width = GST_VIDEO_INFO_COMP_WIDTH (&priv->v_info, i);
-    height = GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i);
-    if (priv->raw_caps)
-      tiling = VK_IMAGE_TILING_LINEAR;
+    if (GST_VIDEO_INFO_N_PLANES (&priv->v_info) != priv->n_imgs) {
+      width = GST_VIDEO_INFO_WIDTH (&priv->v_info);
+      height = GST_VIDEO_INFO_HEIGHT (&priv->v_info);
+    } else {
+      width = GST_VIDEO_INFO_COMP_WIDTH (&priv->v_info, i);
+      height = GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i);
+    }
+
+    image_info.format = priv->vk_fmtsi;
+    /* *INDENT-OFF* */
+    image_info.extent = (VkExtent3D) { width, height, 1 };
+    /* *INDENT-ON* */
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+    if (priv->has_profile)
+      image_info.pNext = &profile_list;
+#endif
 
     img_mem = (GstVulkanImageMemory *)
-        gst_vulkan_image_memory_alloc (vk_pool->device, vk_format, width,
-        height, tiling,
-        VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT |
-        VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT |
-        VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
-        VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+        gst_vulkan_image_memory_alloc_with_image_info (vk_pool->device,
+        &image_info, priv->mem_props);
+    if (!img_mem)
+      goto mem_create_failed;
+
+    if (!img_mem)
+      goto image_failed;
 
     priv->v_info.offseti = priv->v_info.size;
     priv->v_info.size += img_mem->requirements.size;
@@ -130,9 +288,6 @@
     gst_memory_unref (GST_MEMORY_CAST (img_mem));
   }
 
-  priv->add_videometa = gst_buffer_pool_config_has_option (config,
-      GST_BUFFER_POOL_OPTION_VIDEO_META);
-
   gst_buffer_pool_config_set_params (config, caps,
       priv->v_info.size, min_buffers, max_buffers);
 
@@ -155,6 +310,107 @@
         "failed getting geometry from caps %" GST_PTR_FORMAT, caps);
     return FALSE;
   }
+no_vk_format:
+  {
+    GST_WARNING_OBJECT (pool, "no Vulkan format available for %s",
+        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&priv->v_info)));
+    return FALSE;
+  }
+mem_create_failed:
+  {
+    GST_WARNING_OBJECT (pool, "Could not create Vulkan Memory");
+    return FALSE;
+  }
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+missing_profile:
+  {
+    GST_WARNING_OBJECT (pool, "missing or invalid decode-caps");
+    return FALSE;
+  }
+#endif
+image_failed:
+  {
+    GST_WARNING_OBJECT (pool, "Failed to allocate image");
+    return FALSE;
+  }
+}
+
+static gboolean
+prepare_buffer (GstVulkanImageBufferPool * vk_pool, GstBuffer * buffer)
+{
+#if defined(VK_KHR_synchronization2)
+  GstVulkanImageBufferPoolPrivate *priv = GET_PRIV (vk_pool);
+  GArray *barriers = NULL;
+  GError *error = NULL;
+
+  if (priv->initial_layout == VK_IMAGE_LAYOUT_UNDEFINED ||
+      priv->initial_layout == VK_IMAGE_LAYOUT_PREINITIALIZED)
+    return TRUE;
+
+  if (!priv->exec) {
+    GstVulkanCommandPool *cmd_pool;
+    GstVulkanQueue *queue = NULL;
+
+    queue =
+        gst_vulkan_device_select_queue (vk_pool->device,
+        VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT);
+    if (!queue)
+      return FALSE;
+    cmd_pool = gst_vulkan_queue_create_command_pool (queue, &error);
+    gst_object_unref (queue);
+    if (error)
+      goto error;
+    priv->exec = gst_vulkan_operation_new (cmd_pool);
+    gst_object_unref (cmd_pool);
+  }
+
+  if (!gst_vulkan_operation_add_dependency_frame (priv->exec, buffer,
+          VK_PIPELINE_STAGE_NONE_KHR, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT))
+    return FALSE;
+
+  if (!gst_vulkan_operation_begin (priv->exec, &error))
+    goto error;
+
+  if (!gst_vulkan_operation_add_frame_barrier (priv->exec, buffer,
+          VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, priv->initial_access,
+          priv->initial_layout, NULL))
+    goto error;
+
+  barriers = gst_vulkan_operation_retrieve_image_barriers (priv->exec);
+  if (barriers->len > 0) {
+    if (gst_vulkan_operation_use_sync2 (priv->exec)) {
+      VkDependencyInfoKHR dependency_info = {
+        .sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR,
+        .pImageMemoryBarriers = (gpointer) barriers->data,
+        .imageMemoryBarrierCount = barriers->len,
+      };
+
+      gst_vulkan_operation_pipeline_barrier2 (priv->exec, &dependency_info);
+    } else {
+      gst_vulkan_command_buffer_lock (priv->exec->cmd_buf);
+      vkCmdPipelineBarrier (priv->exec->cmd_buf->cmd,
+          VK_PIPELINE_STAGE_NONE_KHR, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0,
+          NULL, 0, NULL, barriers->len, (gpointer) barriers->data);
+      gst_vulkan_command_buffer_unlock (priv->exec->cmd_buf);
+    }
+  }
+  g_array_unref (barriers);
+
+  if (!gst_vulkan_operation_end (priv->exec, &error))
+    goto error;
+
+  return TRUE;
+
+error:
+  {
+    if (error) {
+      GST_WARNING_OBJECT (vk_pool, "Error: %s", error->message);
+      g_clear_error (&error);
+    }
+    return FALSE;
+  }
+#endif
+  return TRUE;
 }
 
 /* This function handles GstBuffer creation */
@@ -164,31 +420,68 @@
 {
   GstVulkanImageBufferPool *vk_pool = GST_VULKAN_IMAGE_BUFFER_POOL_CAST (pool);
   GstVulkanImageBufferPoolPrivate *priv = GET_PRIV (vk_pool);
+  VkImageTiling tiling =
+      priv->raw_caps ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
+  VkImageCreateInfo image_info;
   GstBuffer *buf;
   guint i;
 
+  /* *INDENT-OFF* */
+  image_info = (VkImageCreateInfo) {
+    .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
+    .pNext = NULL,
+    .flags = 0,
+    .imageType = VK_IMAGE_TYPE_2D,
+    /* .format = fill per image,  */
+    /* .extent = fill per plane, */
+    .mipLevels = 1,
+    .arrayLayers = priv->n_layers,
+    .samples = VK_SAMPLE_COUNT_1_BIT,
+    .tiling = tiling,
+    .usage = priv->usage,
+    .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
+    .queueFamilyIndexCount = 0,
+    .pQueueFamilyIndices = NULL,
+    .initialLayout = priv->initial_layout == VK_IMAGE_LAYOUT_PREINITIALIZED
+                     ? VK_IMAGE_LAYOUT_PREINITIALIZED
+                     : VK_IMAGE_LAYOUT_UNDEFINED,
+  };
+  /* *INDENT-ON* */
+
   if (!(buf = gst_buffer_new ())) {
     goto no_buffer;
   }
 
-  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&priv->v_info); i++) {
-    VkImageTiling tiling = VK_IMAGE_TILING_OPTIMAL;
-    VkFormat vk_format;
+  for (i = 0; i < priv->n_imgs; i++) {
     GstMemory *mem;
+    guint width, height;
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+    VkVideoProfileListInfoKHR profile_list = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_LIST_INFO_KHR,
+      .profileCount = 1,
+      .pProfiles = &priv->profile.profile,
+    };
+#endif
 
-    vk_format = gst_vulkan_format_from_video_info (&priv->v_info, i);
-    if (priv->raw_caps)
-      tiling = VK_IMAGE_TILING_LINEAR;
-
-    mem = gst_vulkan_image_memory_alloc (vk_pool->device,
-        vk_format, GST_VIDEO_INFO_COMP_WIDTH (&priv->v_info, i),
-        GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i), tiling,
-        /* FIXME: choose from outside */
-        VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT |
-        VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT |
-        VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
-        /* FIXME: choose from outside */
-        VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+    if (GST_VIDEO_INFO_N_PLANES (&priv->v_info) != priv->n_imgs) {
+      width = GST_VIDEO_INFO_WIDTH (&priv->v_info);
+      height = GST_VIDEO_INFO_HEIGHT (&priv->v_info);
+    } else {
+      width = GST_VIDEO_INFO_COMP_WIDTH (&priv->v_info, i);
+      height = GST_VIDEO_INFO_COMP_HEIGHT (&priv->v_info, i);
+    }
+
+    image_info.format = priv->vk_fmtsi;
+    /* *INDENT-OFF* */
+    image_info.extent = (VkExtent3D) { width, height, 1 };
+    /* *INDENT-ON* */
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+    if (priv->has_profile)
+      image_info.pNext = &profile_list;
+#endif
+
+    mem = gst_vulkan_image_memory_alloc_with_image_info (vk_pool->device,
+        &image_info, priv->mem_props);
     if (!mem) {
       gst_buffer_unref (buf);
       goto mem_create_failed;
@@ -197,6 +490,8 @@
     gst_buffer_append_memory (buf, mem);
   }
 
+  prepare_buffer (vk_pool, buf);
+
   *buffer = buf;
 
   return GST_FLOW_OK;
@@ -214,6 +509,19 @@
   }
 }
 
+static gboolean
+gst_vulkan_image_buffer_pool_stop (GstBufferPool * pool)
+{
+#if defined(VK_KHR_synchronization2)
+  GstVulkanImageBufferPool *vk_pool = GST_VULKAN_IMAGE_BUFFER_POOL_CAST (pool);
+  GstVulkanImageBufferPoolPrivate *priv = GET_PRIV (vk_pool);
+  if (priv->exec)
+    gst_vulkan_operation_wait (priv->exec);
+#endif
+
+  return GST_BUFFER_POOL_CLASS (parent_class)->stop (pool);
+}
+
 /**
  * gst_vulkan_image_buffer_pool_new:
  * @device: the #GstVulkanDevice to use
@@ -245,9 +553,9 @@
 
   gobject_class->finalize = gst_vulkan_image_buffer_pool_finalize;
 
-  gstbufferpool_class->get_options = gst_vulkan_image_buffer_pool_get_options;
   gstbufferpool_class->set_config = gst_vulkan_image_buffer_pool_set_config;
   gstbufferpool_class->alloc_buffer = gst_vulkan_image_buffer_pool_alloc;
+  gstbufferpool_class->stop = gst_vulkan_image_buffer_pool_stop;
 }
 
 static void
@@ -266,6 +574,8 @@
   if (priv->caps)
     gst_caps_unref (priv->caps);
 
+  gst_clear_object (&priv->exec);
+
   G_OBJECT_CLASS (gst_vulkan_image_buffer_pool_parent_class)->finalize (object);
 
   /* only release the context once all our memory have been deleted */

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkimagebufferpool.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkimagebufferpool.h Changed

@@ -78,7 +78,20 @@
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVulkanImageBufferPool, gst_object_unref);
 
 GST_VULKAN_API
-GstBufferPool *gst_vulkan_image_buffer_pool_new (GstVulkanDevice * device);
+GstBufferPool * gst_vulkan_image_buffer_pool_new        (GstVulkanDevice * device);
+
+GST_VULKAN_API
+void            gst_vulkan_image_buffer_pool_config_set_allocation_params
+                                                        (GstStructure * config,
+                                                         VkImageUsageFlags usage,
+                                                         VkMemoryPropertyFlags mem_properties,
+                                                         VkImageLayout initial_layout,
+                                                         guint64 initial_access);
+
+GST_VULKAN_API
+void            gst_vulkan_image_buffer_pool_config_set_decode_caps
+                                                        (GstStructure * config,
+                                                         GstCaps * caps);
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkimagememory.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkimagememory.c Changed

@@ -39,93 +39,6 @@
 
 static GstAllocator *_vulkan_image_memory_allocator;
 
-/**
- * gst_vulkan_format_from_video_info: (skip)
- * @v_info: the #GstVideoInfo
- * @plane: the plane
- *
- * Returns: the VkFormat to use for @v_format and @plane
- *
- * Since: 1.18
- */
-VkFormat
-gst_vulkan_format_from_video_info (GstVideoInfo * v_info, guint plane)
-{
-  guint n_plane_components;
-
-  switch (GST_VIDEO_INFO_FORMAT (v_info)) {
-    case GST_VIDEO_FORMAT_RGBx:
-    case GST_VIDEO_FORMAT_RGBA:
-      if (GST_VIDEO_INFO_COLORIMETRY (v_info).transfer ==
-          GST_VIDEO_TRANSFER_SRGB)
-        return VK_FORMAT_R8G8B8A8_UNORM;
-      else
-        return VK_FORMAT_R8G8B8A8_SRGB;
-    case GST_VIDEO_FORMAT_BGRx:
-    case GST_VIDEO_FORMAT_BGRA:
-      if (GST_VIDEO_INFO_COLORIMETRY (v_info).transfer ==
-          GST_VIDEO_TRANSFER_SRGB)
-        return VK_FORMAT_B8G8R8A8_UNORM;
-      else
-        return VK_FORMAT_B8G8R8A8_SRGB;
-    case GST_VIDEO_FORMAT_xRGB:
-    case GST_VIDEO_FORMAT_ARGB:
-    case GST_VIDEO_FORMAT_xBGR:
-    case GST_VIDEO_FORMAT_ABGR:
-      if (GST_VIDEO_INFO_COLORIMETRY (v_info).transfer ==
-          GST_VIDEO_TRANSFER_SRGB)
-        n_plane_components = 4;
-      else
-        return VK_FORMAT_UNDEFINED;
-    case GST_VIDEO_FORMAT_AYUV:
-      n_plane_components = 4;
-      break;
-    case GST_VIDEO_FORMAT_RGB:
-      return VK_FORMAT_R8G8B8_UNORM;
-    case GST_VIDEO_FORMAT_BGR:
-      return VK_FORMAT_B8G8R8_UNORM;
-      break;
-    case GST_VIDEO_FORMAT_RGB16:
-      return VK_FORMAT_R5G6B5_UNORM_PACK16;
-    case GST_VIDEO_FORMAT_BGR16:
-      return VK_FORMAT_B5G6R5_UNORM_PACK16;
-    case GST_VIDEO_FORMAT_GRAY16_BE:
-    case GST_VIDEO_FORMAT_GRAY16_LE:
-    case GST_VIDEO_FORMAT_YUY2:
-    case GST_VIDEO_FORMAT_UYVY:
-      n_plane_components = 2;
-      break;
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_NV21:
-      n_plane_components = plane == 0 ? 1 : 2;
-      break;
-    case GST_VIDEO_FORMAT_GRAY8:
-    case GST_VIDEO_FORMAT_Y444:
-    case GST_VIDEO_FORMAT_Y42B:
-    case GST_VIDEO_FORMAT_Y41B:
-    case GST_VIDEO_FORMAT_I420:
-    case GST_VIDEO_FORMAT_YV12:
-      n_plane_components = 1;
-      break;
-    default:
-      n_plane_components = 4;
-      g_assert_not_reached ();
-      break;
-  }
-
-  switch (n_plane_components) {
-    case 4:
-      return VK_FORMAT_R8G8B8A8_UNORM;
-    case 2:
-      return VK_FORMAT_R8G8_UNORM;
-    case 1:
-      return VK_FORMAT_R8_UNORM;
-    default:
-      g_assert_not_reached ();
-      return VK_FORMAT_R8G8B8A8_UNORM;
-  }
-}
-
 static gboolean
 _create_info_from_args (VkImageCreateInfo * info, VkFormat format, gsize width,
     gsize height, VkImageTiling tiling, VkImageUsageFlags usage)
@@ -158,8 +71,9 @@
 gboolean
 gst_vulkan_image_memory_init (GstVulkanImageMemory * mem,
     GstAllocator * allocator, GstMemory * parent, GstVulkanDevice * device,
-    VkImageUsageFlags usage, GstAllocationParams * params, gsize size,
-    gpointer user_data, GDestroyNotify notify)
+    VkFormat format, VkImageUsageFlags usage, VkImageLayout layout,
+    GstAllocationParams * params, gsize size, gpointer user_data,
+    GDestroyNotify notify)
 {
   gsize align = gst_memory_alignment, offset = 0, maxsize = size;
   GstMemoryFlags flags = 0;
@@ -178,10 +92,12 @@
   mem->barrier.parent.type = GST_VULKAN_BARRIER_TYPE_IMAGE;
   mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
   mem->barrier.parent.access_flags = 0;
-  mem->barrier.image_layout = VK_IMAGE_LAYOUT_UNDEFINED;
+  mem->barrier.parent.semaphore = VK_NULL_HANDLE;
+  mem->barrier.parent.semaphore_value = 0;
+  mem->barrier.image_layout = layout;
   /* *INDENT-OFF* */
   mem->barrier.subresource_range = (VkImageSubresourceRange) {
-          .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+          .aspectMask = gst_vulkan_format_get_aspect (format),
           .baseMipLevel = 0,
           .levelCount = 1,
           .baseArrayLayer = 0,
@@ -205,29 +121,36 @@
 }
 
 static GstVulkanImageMemory *
-_vk_image_mem_new_alloc (GstAllocator * allocator, GstMemory * parent,
-    GstVulkanDevice * device, VkFormat format, gsize width, gsize height,
-    VkImageTiling tiling, VkImageUsageFlags usage,
-    VkMemoryPropertyFlags mem_prop_flags, gpointer user_data,
-    GDestroyNotify notify)
+_vk_image_mem_new_alloc_with_image_info (GstAllocator * allocator,
+    GstMemory * parent, GstVulkanDevice * device,
+    VkImageCreateInfo * image_info, VkMemoryPropertyFlags mem_prop_flags,
+    gpointer user_data, GDestroyNotify notify)
 {
   GstVulkanImageMemory *mem = NULL;
   GstAllocationParams params = { 0, };
-  VkImageCreateInfo image_info;
   VkPhysicalDevice gpu;
   GError *error = NULL;
+  GArray *qfi = NULL;
   guint32 type_idx;
   VkImage image;
   VkResult err;
 
   gpu = gst_vulkan_device_get_physical_device (device);
-  if (!_create_info_from_args (&image_info, format, width, height, tiling,
-          usage)) {
-    GST_CAT_ERROR (GST_CAT_VULKAN_IMAGE_MEMORY, "Incorrect image parameters");
-    goto error;
+
+  if (!image_info->pQueueFamilyIndices) {
+    /* XXX: overwrite the queue indices part of the structure */
+    qfi = gst_vulkan_device_queue_family_indices (device);
+    image_info->pQueueFamilyIndices = (uint32_t *) qfi->data;
+    image_info->queueFamilyIndexCount = qfi->len;
+    image_info->sharingMode = qfi->len > 1 ? VK_SHARING_MODE_CONCURRENT :
+        VK_SHARING_MODE_EXCLUSIVE;
   }
 
-  err = vkCreateImage (device->device, &image_info, NULL, &image);
+  err = vkCreateImage (device->device, image_info, NULL, &image);
+
+  if (qfi)
+    g_array_unref (qfi);
+
   if (gst_vulkan_error_to_g_error (err, &error, "vkCreateImage") < 0)
     goto vk_error;
 
@@ -235,19 +158,44 @@
 
   vkGetImageMemoryRequirements (device->device, image, &mem->requirements);
 
-  gst_vulkan_image_memory_init (mem, allocator, parent, device, usage, &params,
+  gst_vulkan_image_memory_init (mem, allocator, parent, device,
+      image_info->format, image_info->usage, image_info->initialLayout, &params,
       mem->requirements.size, user_data, notify);
-  mem->create_info = image_info;
+  mem->create_info = *image_info;
+  /* XXX: to avoid handling pNext lifetime  */
+  mem->create_info.pNext = NULL;
   mem->image = image;
 
-  err = vkGetPhysicalDeviceImageFormatProperties (gpu, format, VK_IMAGE_TYPE_2D,
-      tiling, usage, 0, &mem->format_properties);
+#if defined(VK_KHR_timeline_semaphore)
+  if (gst_vulkan_device_is_extension_enabled (device,
+          VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME)) {
+    VkSemaphoreTypeCreateInfo semaphore_type_info = {
+      .sType = VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO,
+      .semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE,
+      .initialValue = 0,
+    };
+    VkSemaphoreCreateInfo semaphore_create_info = {
+      .sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
+      .pNext = &semaphore_type_info,
+    };
+
+    err = vkCreateSemaphore (device->device, &semaphore_create_info, NULL,
+        &mem->barrier.parent.semaphore);
+    if (gst_vulkan_error_to_g_error (err, &error, "vkCreateSemaphore") < 0)
+      goto vk_error;
+  }
+#endif
+
+
+  err = vkGetPhysicalDeviceImageFormatProperties (gpu, image_info->format,
+      VK_IMAGE_TYPE_2D, image_info->tiling, image_info->usage, 0,
+      &mem->format_properties);
   if (gst_vulkan_error_to_g_error (err, &error,
           "vkGetPhysicalDeviceImageFormatProperties") < 0)
     goto vk_error;
 
-  if (!gst_vulkan_memory_find_memory_type_index_with_type_properties (device,
-          mem->requirements.memoryTypeBits, mem_prop_flags, &type_idx))
+  if (!gst_vulkan_memory_find_memory_type_index_with_requirements (device,
+          &mem->requirements, mem_prop_flags, &type_idx))
     goto error;
 
   if ((mem->requirements.alignment & (mem->requirements.alignment - 1)) != 0) {
@@ -284,6 +232,25 @@
 }
 
 static GstVulkanImageMemory *
+_vk_image_mem_new_alloc (GstAllocator * allocator, GstMemory * parent,
+    GstVulkanDevice * device, VkFormat format, gsize width, gsize height,
+    VkImageTiling tiling, VkImageUsageFlags usage,
+    VkMemoryPropertyFlags mem_prop_flags, gpointer user_data,
+    GDestroyNotify notify)
+{
+  VkImageCreateInfo image_info;
+
+  if (!_create_info_from_args (&image_info, format, width, height, tiling,
+          usage)) {
+    GST_CAT_ERROR (GST_CAT_VULKAN_IMAGE_MEMORY, "Incorrect image parameters");
+    return NULL;
+  }
+
+  return _vk_image_mem_new_alloc_with_image_info (allocator, parent, device,
+      &image_info, mem_prop_flags, user_data, notify);
+}
+
+static GstVulkanImageMemory *
 _vk_image_mem_new_wrapped (GstAllocator * allocator, GstMemory * parent,
     GstVulkanDevice * device, VkImage image, VkFormat format, gsize width,
     gsize height, VkImageTiling tiling, VkImageUsageFlags usage,
@@ -303,8 +270,9 @@
   /* XXX: assumes alignment is a power of 2 */
   params.align = mem->requirements.alignment - 1;
   params.flags = GST_MEMORY_FLAG_NOT_MAPPABLE;
-  gst_vulkan_image_memory_init (mem, allocator, parent, device, usage, &params,
-      mem->requirements.size, user_data, notify);
+  gst_vulkan_image_memory_init (mem, allocator, parent, device, format, usage,
+      VK_IMAGE_LAYOUT_UNDEFINED, &params, mem->requirements.size, user_data,
+      notify);
   mem->wrapped = TRUE;
 
   if (!_create_info_from_args (&mem->create_info, format, width, height, tiling,
@@ -423,9 +391,16 @@
   if (mem->image && !mem->wrapped)
     vkDestroyImage (mem->device->device, mem->image, NULL);
 
+  gst_clear_object (&mem->barrier.parent.queue);
+
   if (mem->vk_mem)
     gst_memory_unref ((GstMemory *) mem->vk_mem);
 
+  if (mem->barrier.parent.semaphore) {
+    vkDestroySemaphore (mem->device->device, mem->barrier.parent.semaphore,
+        NULL);
+  }
+
   if (mem->notify)
     mem->notify (mem->user_data);
 
@@ -435,6 +410,31 @@
 }
 
 /**
+ * gst_vulkan_image_memory_alloc_with_image_info:
+ * @device: a #GstVulkanDevice
+ * @image_info: VkImageCreateInfo structure
+ * @mem_prop_flags: VkMemoryPropertyFlags flags
+ *
+ * Returns: a #GstMemory object backed by a vulkan device memory
+ *
+ * Since: 1.24
+ */
+GstMemory *
+gst_vulkan_image_memory_alloc_with_image_info (GstVulkanDevice * device,
+    VkImageCreateInfo * image_info, VkMemoryPropertyFlags mem_prop_flags)
+{
+  GstVulkanImageMemory *mem;
+
+  g_return_val_if_fail (image_info
+      && image_info->sType == VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, NULL);
+
+  mem = _vk_image_mem_new_alloc_with_image_info (_vulkan_image_memory_allocator,
+      NULL, device, image_info, mem_prop_flags, NULL, NULL);
+
+  return (GstMemory *) mem;
+}
+
+/**
  * gst_vulkan_image_memory_alloc:
  * @device: a #GstVulkanDevice
  * @format: the VkFormat for the new image
@@ -555,8 +555,7 @@
   GST_CAT_TRACE (GST_CAT_VULKAN_IMAGE_MEMORY, "image %p removing view %p",
       image, view);
   if (g_ptr_array_find (image->outstanding_views, view, &index)) {
-    /* really g_ptr_array_steal_index_fast() but that requires glib 2.58 */
-    g_ptr_array_remove_index_fast (image->outstanding_views, index);
+    g_ptr_array_steal_index_fast (image->outstanding_views, index);
     g_ptr_array_add (image->views, view);
   } else {
     g_warning ("GstVulkanImageMemory:%p attempt to remove a view %p "
@@ -654,8 +653,7 @@
             index));
   } else if (g_ptr_array_find_with_equal_func (image->views, &view,
           (GEqualFunc) find_view_func, &index)) {
-    /* really g_ptr_array_steal_index_fast() but that requires glib 2.58 */
-    ret = g_ptr_array_remove_index_fast (image->views, index);
+    ret = g_ptr_array_steal_index_fast (image->views, index);
     g_ptr_array_add (image->outstanding_views, ret);
     ret->image = (GstVulkanImageMemory *) gst_memory_ref ((GstMemory *) image);
   }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkimagememory.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkimagememory.h Changed

@@ -170,11 +170,20 @@
                                                          GstAllocator * allocator,
                                                          GstMemory * parent,
                                                          GstVulkanDevice * device,
+                                                         VkFormat format,
                                                          VkImageUsageFlags usage,
+                                                         VkImageLayout initial_layout,
                                                          GstAllocationParams * params,
                                                          gsize size,
                                                          gpointer user_data,
                                                          GDestroyNotify notify);
+
+GST_VULKAN_API
+GstMemory *     gst_vulkan_image_memory_alloc_with_image_info
+                                                       (GstVulkanDevice * device,
+                                                        VkImageCreateInfo * image_info,
+                                                        VkMemoryPropertyFlags mem_prop_flags);
+
 GST_VULKAN_API
 GstMemory *     gst_vulkan_image_memory_alloc           (GstVulkanDevice * device,
                                                          VkFormat format,
@@ -208,9 +217,6 @@
 void            gst_vulkan_image_memory_add_view        (GstVulkanImageMemory * image,
                                                          GstVulkanImageView * view);
 
-GST_VULKAN_API
-VkFormat gst_vulkan_format_from_video_info   (GstVideoInfo * v_info,
-                                              guint plane);
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkinstance.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkinstance.c Changed

@@ -456,32 +456,14 @@
   return ret;
 }
 
-/* reimplement a specfic case of g_ptr_array_find_with_equal_func as that
- * requires Glib 2.54 */
-static gboolean
-ptr_array_find_string (GPtrArray * array, const gchar * str, guint * index)
-{
-  guint i;
-
-  for (i = 0; i < array->len; i++) {
-    gchar *val = (gchar *) g_ptr_array_index (array, i);
-    if (g_strcmp0 (val, str) == 0) {
-      if (index)
-        *index = i;
-      return TRUE;
-    }
-  }
-
-  return FALSE;
-}
-
 static gboolean
 gst_vulkan_instance_is_extension_enabled_unlocked (GstVulkanInstance * instance,
     const gchar * name, guint * index)
 {
   GstVulkanInstancePrivate *priv = GET_PRIV (instance);
 
-  return ptr_array_find_string (priv->enabled_extensions, name, index);
+  return g_ptr_array_find_with_equal_func (priv->enabled_extensions, name,
+      g_str_equal, index);
 }
 
 /**
@@ -627,7 +609,8 @@
 {
   GstVulkanInstancePrivate *priv = GET_PRIV (instance);
 
-  return ptr_array_find_string (priv->enabled_layers, name, NULL);
+  return g_ptr_array_find_with_equal_func (priv->enabled_layers, name,
+      g_str_equal, NULL);
 }
 
 /**
@@ -940,6 +923,16 @@
   {
     VkApplicationInfo app = { 0, };
     VkInstanceCreateInfo inst_info = { 0, };
+#if !defined (GST_DISABLE_DEBUG) && defined (VK_API_VERSION_1_2)
+    VkValidationFeaturesEXT validation_features;
+    VkValidationFeatureEnableEXT feat_list = {
+      VK_VALIDATION_FEATURE_ENABLE_GPU_ASSISTED_EXT,
+      VK_VALIDATION_FEATURE_ENABLE_GPU_ASSISTED_RESERVE_BINDING_SLOT_EXT,
+#if defined (VK_API_VERSION_1_3)
+      VK_VALIDATION_FEATURE_ENABLE_SYNCHRONIZATION_VALIDATION_EXT,
+#endif
+    };
+#endif
 
     /* *INDENT-OFF* */
     app = (VkApplicationInfo) {
@@ -948,7 +941,8 @@
         .pApplicationName = APP_SHORT_NAME,
         .applicationVersion = 0,
         .pEngineName = APP_SHORT_NAME,
-        .engineVersion = 0,
+        .engineVersion = VK_MAKE_VERSION (GST_VERSION_MAJOR, GST_VERSION_MINOR,
+            GST_VERSION_MICRO),
         .apiVersion = requested_instance_api,
     };
 
@@ -963,6 +957,24 @@
     };
     /* *INDENT-ON* */
 
+#if !defined (GST_DISABLE_DEBUG)
+    vulkan_debug_level =
+        gst_debug_category_get_threshold (GST_VULKAN_DEBUG_CAT);
+
+#if defined (VK_API_VERSION_1_2)
+    if (vulkan_debug_level >= GST_LEVEL_ERROR) {
+      /* *INDENT-OFF* */
+      validation_features = (VkValidationFeaturesEXT) {
+          .sType = VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT,
+          .pEnabledValidationFeatures = feat_list,
+          .enabledValidationFeatureCount = G_N_ELEMENTS (feat_list),
+      };
+      inst_info.pNext = &validation_features;
+      /* *INDENT-ON* */
+    }
+#endif
+#endif
+
     err = vkCreateInstance (&inst_info, NULL, &instance->instance);
     if (gst_vulkan_error_to_g_error (err, error, "vkCreateInstance") < 0) {
       goto error;
@@ -994,8 +1006,6 @@
     goto error;
 
 #if !defined (GST_DISABLE_DEBUG)
-  vulkan_debug_level = gst_debug_category_get_threshold (GST_VULKAN_DEBUG_CAT);
-
   if (vulkan_debug_level >= GST_LEVEL_ERROR
       && gst_vulkan_instance_is_extension_enabled_unlocked (instance,
           VK_EXT_DEBUG_REPORT_EXTENSION_NAME, NULL)) {
@@ -1095,7 +1105,7 @@
 /**
  * gst_vulkan_instance_create_device:
  * @instance: a #GstVulkanInstance
- * @error: (optional): a #GError
+ * @error: (out) (optional): a #GError
  *
  * Returns: (transfer full): a new #GstVulkanDevice
  *

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkmemory.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkmemory.c Changed

@@ -77,6 +77,8 @@
   mem->notify = notify;
   mem->user_data = user_data;
   mem->vk_offset = 0;
+  mem->map_count = 0;
+  mem->mapping = NULL;
 
   g_mutex_init (&mem->lock);
 
@@ -122,20 +124,30 @@
   VkResult err;
   GError *error = NULL;
 
-  if ((mem->properties & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) {
-    GST_CAT_ERROR (GST_CAT_VULKAN_MEMORY, "Cannot map host-invisible memory");
-    return NULL;
-  }
+  g_mutex_lock (&mem->lock);
 
-  err = vkMapMemory (mem->device->device, mem->mem_ptr, mem->vk_offset,
-      size, 0, &data);
-  if (gst_vulkan_error_to_g_error (err, &error, "vkMapMemory") < 0) {
-    GST_CAT_ERROR (GST_CAT_VULKAN_MEMORY, "Failed to map device memory %s",
-        error->message);
-    g_clear_error (&error);
-    return NULL;
+  if (mem->map_count == 0) {
+    if ((mem->properties & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) {
+      GST_CAT_ERROR (GST_CAT_VULKAN_MEMORY, "Cannot map host-invisible memory");
+      g_mutex_unlock (&mem->lock);
+      return NULL;
+    }
+
+    err = vkMapMemory (mem->device->device, mem->mem_ptr, mem->vk_offset,
+        size, 0, &mem->mapping);
+    if (gst_vulkan_error_to_g_error (err, &error, "vkMapMemory") < 0) {
+      GST_CAT_ERROR (GST_CAT_VULKAN_MEMORY, "Failed to map device memory %s",
+          error->message);
+      g_clear_error (&error);
+      g_mutex_unlock (&mem->lock);
+      return NULL;
+    }
   }
 
+  mem->map_count++;
+  data = mem->mapping;
+  g_mutex_unlock (&mem->lock);
+
   return data;
 }
 
@@ -163,7 +175,16 @@
     }
   }
 
-  vkUnmapMemory (mem->device->device, mem->mem_ptr);
+  g_mutex_lock (&mem->lock);
+
+  g_assert (mem->map_count != 0);
+  mem->map_count--;
+  if (mem->map_count == 0) {
+    vkUnmapMemory (mem->device->device, mem->mem_ptr);
+    mem->mapping = NULL;
+  }
+
+  g_mutex_unlock (&mem->lock);
 }
 
 static GstMemory *
@@ -236,34 +257,40 @@
 }
 
 /**
- * gst_vulkan_memory_find_memory_type_index_with_type_properties:
+ * gst_vulkan_memory_find_memory_type_index_with_requirements:
  * @device: a #GstVulkanDevice
- * @type_bits: memory type bits to search for
+ * @req:  memory requirements to look for
  * @properties: memory properties to search for
- * @type_index: resulting index of the memory type
+ * @type_index: (out): resulting index of the memory type
  *
  * Returns: whether a valid memory type could be found
  *
- * Since: 1.18
+ * Since: 1.24
  */
 gboolean
-gst_vulkan_memory_find_memory_type_index_with_type_properties (GstVulkanDevice *
-    device, guint32 type_bits, VkMemoryPropertyFlags properties,
+gst_vulkan_memory_find_memory_type_index_with_requirements (GstVulkanDevice *
+    device, VkMemoryRequirements * req, VkMemoryPropertyFlags properties,
     guint32 * type_index)
 {
   guint32 i;
+  VkPhysicalDeviceMemoryProperties *props;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DEVICE (device), FALSE);
+
+  props = &device->physical_device->memory_properties;
 
   /* Search memtypes to find first index with those properties */
-  for (i = 0; i < 32; i++) {
-    if ((type_bits & 1) == 1) {
-      /* Type is available, does it match user properties? */
-      if ((device->physical_device->memory_properties.memoryTypesi.
-              propertyFlags & properties) == properties) {
-        *type_index = i;
-        return TRUE;
-      }
-    }
-    type_bits >>= 1;
+  for (i = 0; i < props->memoryTypeCount; i++) {
+    if (!(req->memoryTypeBits & (1 << i)))
+      continue;
+    if ((properties != G_MAXUINT32)
+        && (props->memoryTypesi.propertyFlags & properties) != properties)
+      continue;
+    if (req->size > props->memoryHeapsprops->memoryTypesi.heapIndex.size)
+      continue;
+
+    *type_index = i;
+    return TRUE;
   }
 
   return FALSE;

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkmemory.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkmemory.h Changed

@@ -53,12 +53,13 @@
 #define GST_VULKAN_MEMORY_ALLOCATOR_NAME "Vulkan"
 
 /**
- * GstVulkanMemory
+ * GstVulkanMemory:
  * @mem: the parent #GstMemory
  * @device: the #GstVulkanDevice this memory is allocated from
  * @mem_ptr: the vulkan memory handle
  * @lock: lock for accessing/changing memory informat
  * @map_count: number of times this memory is mapped
+ * @mapping: internal pointer to already mapped memory
  *
  * Since: 1.18
  */
@@ -73,6 +74,14 @@
   /* <protected> */
   GMutex                    lock;
   guint                     map_count;
+  /**
+   * GstVulkanMemory.mapping:
+   *
+   * internal pointer to already mapped memory
+   *
+   * Since: 1.24
+   */
+  gpointer                  mapping;
 
   /* <private> */
   GDestroyNotify            notify;
@@ -138,11 +147,12 @@
                                                  VkMemoryPropertyFlags mem_prop_flags);
 
 GST_VULKAN_API
-gboolean        gst_vulkan_memory_find_memory_type_index_with_type_properties   (GstVulkanDevice * device,
-                                                                                 guint32 type_bits,
+gboolean       gst_vulkan_memory_find_memory_type_index_with_requirements       (GstVulkanDevice * device,
+                                                                                 VkMemoryRequirements * req,
                                                                                  VkMemoryPropertyFlags properties,
                                                                                  guint32 * type_index);
 
+
 G_END_DECLS
 
 #endif /* _GST_VULKAN_BASE_BUFFER_H_ */

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkoperation.c Added

@@ -0,0 +1,1450 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstvkoperation.h"
+
+/**
+ * SECTION:vkoperation
+ * @title: GstVulkanOperation
+ * @short_description: Vulkan Operation
+ * @see_also: #GstVulkanCommandPool, #GstVulkanCommandBuffer
+ *
+ * A #GstVulkanOperation abstract a queue operation for images adding
+ * automatically semaphores and barriers. It uses Synchronization2 extension if
+ * available. Also it enables a VkQueryPool if it's possible and it's requested.
+ *
+ * Since: 1.24
+ */
+
+typedef struct _GstVulkanDependencyFrame GstVulkanDependencyFrame;
+
+struct _GstVulkanDependencyFrame
+{
+  GstVulkanImageMemory *memGST_VIDEO_MAX_PLANES;
+  gboolean updated;
+  gboolean semaphored;
+  guint64 dst_stage;
+  guint64 new_access;
+  VkImageLayout new_layout;
+  GstVulkanQueue *new_queue;
+};
+
+struct _GstVulkanOperationPrivate
+{
+  GstVulkanCommandPool *cmd_pool;
+  GstVulkanTrashList *trash_list;
+
+  VkQueryPool query_pool;
+  VkQueryType query_type;
+  guint n_queries;
+  gsize query_data_size;
+  gsize query_data_stride;
+  gpointer query_data;
+  gboolean op_submitted;
+
+  gboolean has_sync2;
+  gboolean has_video;
+  gboolean has_timeline;
+
+  GArray *barriers;
+
+  struct
+  {
+    GArray *frames;
+    GArray *wait_semaphores;
+    GArray *signal_semaphores;
+
+    /* if sync2 isn't supported but timeline is */
+    GArray *wait_dst_stage_mask;
+    GArray *wait_semaphore_values;
+    GArray *signal_semaphore_values;
+  } deps;
+
+#if defined(VK_KHR_synchronization2)
+  PFN_vkQueueSubmit2KHR QueueSubmit2;
+  PFN_vkCmdPipelineBarrier2KHR CmdPipelineBarrier2;
+#endif
+};
+
+enum
+{
+  PROP_COMMAND_POOL = 1,
+  N_PROPERTIES,
+};
+
+static GParamSpec *g_propertiesN_PROPERTIES;
+
+GST_DEBUG_CATEGORY_STATIC (GST_CAT_VULKAN_OPERATION);
+#define GST_CAT_DEFAULT GST_CAT_VULKAN_OPERATION
+
+#define GET_PRIV(operation) ((GstVulkanOperationPrivate *)              \
+  gst_vulkan_operation_get_instance_private (GST_VULKAN_OPERATION (operation)))
+
+#define gst_vulkan_operation_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstVulkanOperation, gst_vulkan_operation,
+    GST_TYPE_OBJECT, G_ADD_PRIVATE (GstVulkanOperation)
+    GST_DEBUG_CATEGORY_INIT (GST_CAT_VULKAN_OPERATION,
+        "vulkanoperation", 0, "Vulkan Operation"));
+
+static void
+gst_vulkan_operation_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstVulkanOperationPrivate *priv = GET_PRIV (object);
+
+  switch (prop_id) {
+    case PROP_COMMAND_POOL:
+      g_assert (!priv->cmd_pool);
+      priv->cmd_pool = g_value_dup_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_vulkan_operation_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstVulkanOperationPrivate *priv = GET_PRIV (object);
+
+  switch (prop_id) {
+    case PROP_COMMAND_POOL:
+      g_value_set_object (value, priv->cmd_pool);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_vulkan_operation_constructed (GObject * object)
+{
+#if defined(VK_KHR_timeline_semaphore) || defined(VK_KHR_synchronization2)
+  GstVulkanOperation *self = GST_VULKAN_OPERATION (object);
+  GstVulkanOperationPrivate *priv = GET_PRIV (self);
+  GstVulkanDevice *device = priv->cmd_pool->queue->device;
+
+#if defined(VK_KHR_synchronization2)
+  priv->has_sync2 = gst_vulkan_device_is_extension_enabled (device,
+      VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME);
+
+  if (priv->has_sync2) {
+    priv->QueueSubmit2 = gst_vulkan_instance_get_proc_address (device->instance,
+        "vkQueueSubmit2");
+    if (!priv->QueueSubmit2) {
+      priv->QueueSubmit2 =
+          gst_vulkan_instance_get_proc_address (device->instance,
+          "vkQueueSubmit2KHR");
+    }
+
+    if (!priv->CmdPipelineBarrier2) {
+      priv->CmdPipelineBarrier2 =
+          gst_vulkan_instance_get_proc_address (device->instance,
+          "vkCmdPipelineBarrier2");
+      if (!priv->CmdPipelineBarrier2) {
+        priv->CmdPipelineBarrier2 =
+            gst_vulkan_instance_get_proc_address (device->instance,
+            "vkCmdPipelineBarrier2KHR");
+      }
+    }
+
+    priv->has_sync2 = (priv->QueueSubmit2 && priv->CmdPipelineBarrier2);
+  }
+#endif
+
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  priv->has_video = gst_vulkan_device_is_extension_enabled (device,
+      VK_KHR_VIDEO_QUEUE_EXTENSION_NAME);
+#endif
+
+#if defined(VK_KHR_timeline_semaphore)
+  priv->has_timeline = gst_vulkan_device_is_extension_enabled (device,
+      VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME);
+#endif
+#endif
+
+  G_OBJECT_CLASS (parent_class)->constructed (object);
+}
+
+static void
+gst_vulkan_operation_finalize (GObject * object)
+{
+  GstVulkanOperationPrivate *priv = GET_PRIV (object);
+
+  gst_vulkan_operation_reset (GST_VULKAN_OPERATION (object));
+
+  g_clear_pointer (&priv->query_data, g_free);
+
+  if (priv->query_pool) {
+    vkDestroyQueryPool (priv->cmd_pool->queue->device->device, priv->query_pool,
+        NULL);
+    priv->query_pool = VK_NULL_HANDLE;
+  }
+
+  gst_clear_object (&priv->trash_list);
+  gst_clear_object (&priv->cmd_pool);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_vulkan_operation_init (GstVulkanOperation * self)
+{
+  GstVulkanOperationPrivate *priv = GET_PRIV (self);
+
+  priv->trash_list = gst_vulkan_trash_fence_list_new ();
+}
+
+static void
+gst_vulkan_operation_class_init (GstVulkanOperationClass * klass)
+{
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+
+  gobject_class->set_property = gst_vulkan_operation_set_property;
+  gobject_class->get_property = gst_vulkan_operation_get_property;
+  gobject_class->constructed = gst_vulkan_operation_constructed;
+  gobject_class->finalize = gst_vulkan_operation_finalize;
+
+  g_propertiesPROP_COMMAND_POOL =
+      g_param_spec_object ("command-pool", "GstVulkanCommandPool",
+      "Vulkan Command Pool", GST_TYPE_VULKAN_COMMAND_POOL,
+      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_properties (gobject_class, N_PROPERTIES, g_properties);
+}
+
+static void
+_dependency_frame_free (gpointer data)
+{
+  GstVulkanDependencyFrame *frame = data;
+  guint i;
+
+  for (i = 0; i < GST_VIDEO_MAX_PLANES && frame->memi != NULL; i++) {
+    gst_memory_unref (GST_MEMORY_CAST (frame->memi));
+    frame->memi = NULL;
+  }
+  gst_clear_object (&frame->new_queue);
+}
+
+static GArray *
+_get_dependency_frames (GstVulkanOperation * self)
+{
+  GstVulkanOperationPrivate *priv = GET_PRIV (self);
+
+  if (!priv->deps.frames) {
+    priv->deps.frames =
+        g_array_new (FALSE, FALSE, sizeof (GstVulkanDependencyFrame));
+    g_array_set_clear_func (priv->deps.frames, _dependency_frame_free);
+  }
+
+  return priv->deps.frames;
+}
+
+/**
+ * gst_vulkan_operation_reset:
+ * @self: a #GstVulkanOperation
+ *
+ * Resets the operation to a clean state.
+ */
+void
+gst_vulkan_operation_reset (GstVulkanOperation * self)
+{
+  GstVulkanOperationPrivate *priv;
+
+  g_return_if_fail (GST_IS_VULKAN_OPERATION (self));
+
+  priv = GET_PRIV (self);
+
+  gst_clear_vulkan_command_buffer (&self->cmd_buf);
+
+  gst_vulkan_operation_discard_dependencies (self);
+
+  gst_vulkan_trash_list_wait (priv->trash_list, G_MAXUINT64);
+  gst_vulkan_trash_list_gc (priv->trash_list);
+}
+
+/**
+ * gst_vulkan_operation_begin:
+ * @self: a #GstVulkanOperation
+ * @error: a #GError
+ *
+ * See also: gst_vulkan_operation_end() and gst_vulkan_operation_reset()
+ *
+ * Attempts to set the operation ready to work. It instantiates the common
+ * command buffer in @self and calls vkBeginCommandBuffer.
+ *
+ * After calling this function you can register commands in the command buffer,
+ * and finally call gst_vulkan_operation_end(). gst_vulkan_operation_reset() is
+ * called internally if something failed.
+ *
+ * Returns: whether the operation started. It might fill @error.
+ */
+gboolean
+gst_vulkan_operation_begin (GstVulkanOperation * self, GError ** error)
+{
+  GstVulkanOperationPrivate *priv;
+  VkCommandBufferBeginInfo cmd_buf_info = {
+    .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
+    .flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
+  };
+  VkResult err;
+
+  g_return_val_if_fail (GST_IS_VULKAN_OPERATION (self), FALSE);
+
+  priv = GET_PRIV (self);
+
+  GST_OBJECT_LOCK (self);
+  if (self->cmd_buf) {
+    GST_OBJECT_UNLOCK (self);
+    return TRUE;
+  }
+
+  if (!(self->cmd_buf = gst_vulkan_command_pool_create (priv->cmd_pool, error))) {
+    GST_OBJECT_UNLOCK (self);
+    g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+        "Instantiate of command buffer failed");
+    return FALSE;
+  }
+  GST_OBJECT_UNLOCK (self);
+
+  gst_vulkan_command_buffer_lock (self->cmd_buf);
+
+  err = vkBeginCommandBuffer (self->cmd_buf->cmd, &cmd_buf_info);
+  if (gst_vulkan_error_to_g_error (err, error, "vkBeginCommandBuffer") < 0)
+    goto error;
+
+  if (priv->query_pool)
+    vkCmdResetQueryPool (self->cmd_buf->cmd, priv->query_pool, 0, 1);
+
+  gst_vulkan_command_buffer_unlock (self->cmd_buf);
+
+  return TRUE;
+
+error:
+  {
+    gst_vulkan_command_buffer_unlock (self->cmd_buf);
+    gst_vulkan_operation_reset (self);
+    return FALSE;
+  }
+}
+
+static gboolean
+gst_vulkan_operation_submit2 (GstVulkanOperation * self, GstVulkanFence * fence,
+    GError ** error)
+{
+#if defined(VK_KHR_synchronization2)
+  GstVulkanOperationPrivate *priv = GET_PRIV (self);
+  VkCommandBufferSubmitInfoKHR cmd_buf_info;
+  VkSubmitInfo2KHR submit_info;
+  VkResult err;
+
+  GST_OBJECT_LOCK (self);
+
+  /* *INDENT-OFF* */
+  cmd_buf_info = (VkCommandBufferSubmitInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR,
+    .commandBuffer = self->cmd_buf->cmd,
+  };
+
+  submit_info = (VkSubmitInfo2KHR) {
+    .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR,
+    .pCommandBufferInfos = &cmd_buf_info,
+    .commandBufferInfoCount = 1,
+    .pWaitSemaphoreInfos = priv->deps.wait_semaphores ?
+        (const VkSemaphoreSubmitInfoKHR *) priv->deps.wait_semaphores->data : NULL,
+    .waitSemaphoreInfoCount = priv->deps.wait_semaphores ?
+        priv->deps.wait_semaphores->len : 0,
+    .pSignalSemaphoreInfos = priv->deps.signal_semaphores ?
+        (const VkSemaphoreSubmitInfoKHR *) priv->deps.signal_semaphores->data : NULL,
+    .signalSemaphoreInfoCount = priv->deps.signal_semaphores ?
+        priv->deps.signal_semaphores->len : 0,
+  };
+  /* *INDENT-ON* */
+
+  gst_vulkan_queue_submit_lock (priv->cmd_pool->queue);
+  err = priv->QueueSubmit2 (priv->cmd_pool->queue->queue, 1, &submit_info,
+      GST_VULKAN_FENCE_FENCE (fence));
+  gst_vulkan_queue_submit_unlock (priv->cmd_pool->queue);
+
+  GST_OBJECT_UNLOCK (self);
+
+  if (gst_vulkan_error_to_g_error (err, error, "vkQueueSubmit2KHR") < 0)
+    goto error;
+
+  return TRUE;
+
+error:
+#endif
+  return FALSE;
+}
+
+static gboolean
+gst_vulkan_operation_submit1 (GstVulkanOperation * self, GstVulkanFence * fence,
+    GError ** error)
+{
+  GstVulkanOperationPrivate *priv = GET_PRIV (self);
+#if defined(VK_KHR_timeline_semaphore)
+  VkTimelineSemaphoreSubmitInfoKHR semaphore_submit_info;
+#endif
+  gpointer pnext = NULL;
+  VkSubmitInfo submit_info;
+  VkResult err;
+
+  GST_OBJECT_LOCK (self);
+  /* *INDENT-OFF* */
+#if defined(VK_KHR_timeline_semaphore)
+  if (priv->has_timeline) {
+    semaphore_submit_info = (VkTimelineSemaphoreSubmitInfoKHR) {
+      .sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR,
+      .waitSemaphoreValueCount = priv->deps.wait_semaphore_values ?
+         priv->deps.wait_semaphore_values->len : 0,
+      .pWaitSemaphoreValues = priv->deps.wait_semaphore_values ?
+          (const guint64 *) priv->deps.wait_semaphore_values->data : NULL,
+      .signalSemaphoreValueCount = priv->deps.signal_semaphore_values ?
+          priv->deps.signal_semaphore_values->len : 0,
+      .pSignalSemaphoreValues = priv->deps.signal_semaphore_values ?
+          (const guint64 *) priv->deps.signal_semaphore_values->data : NULL,
+    };
+
+    pnext = &semaphore_submit_info;
+  }
+#endif
+
+  submit_info = (VkSubmitInfo) {
+    .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
+    .pNext = pnext,
+    .commandBufferCount = 1,
+    .pCommandBuffers = &self->cmd_buf->cmd,
+    .pWaitSemaphores = priv->deps.wait_semaphores ?
+        (const VkSemaphore *) priv->deps.wait_semaphores->data : NULL,
+    .waitSemaphoreCount = priv->deps.wait_semaphores ?
+        priv->deps.wait_semaphores->len : 0,
+    .pSignalSemaphores = priv->deps.signal_semaphores ?
+        (const VkSemaphore *) priv->deps.signal_semaphores->data : NULL,
+    .signalSemaphoreCount = priv->deps.signal_semaphores ?
+        priv->deps.signal_semaphores->len : 0,
+    .pWaitDstStageMask = priv->deps.wait_dst_stage_mask ?
+        (const VkPipelineStageFlags *)
+        priv->deps.wait_dst_stage_mask->data : NULL,
+  };
+  /* *INDENT-ON* */
+
+  gst_vulkan_queue_submit_lock (priv->cmd_pool->queue);
+  err = vkQueueSubmit (priv->cmd_pool->queue->queue, 1, &submit_info,
+      GST_VULKAN_FENCE_FENCE (fence));
+  gst_vulkan_queue_submit_unlock (priv->cmd_pool->queue);
+  GST_OBJECT_UNLOCK (self);
+
+  if (gst_vulkan_error_to_g_error (err, error, "vkQueueSubmit") < 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_operation_end:
+ * @self: a #GstVulkanOperation
+ * @error: a #GError
+ *
+ * See also: gst_vulkan_operation_begin() and gst_vulkan_operation_reset()
+ *
+ * It calls vkEndCommandBuffer, and later either vkQueueSubmit or
+ * vkQueueSubmit2KHR filling up the semaphores from images declared as
+ * dependencies.
+ *
+ * You have called gst_vulkan_operation_begin() before.
+ * gst_vulkan_operation_reset() is called internally if something fails
+ *
+ * Returns: whether the operation failed. It might fill @error.
+ */
+gboolean
+gst_vulkan_operation_end (GstVulkanOperation * self, GError ** error)
+{
+  GstVulkanOperationPrivate *priv;
+  GstVulkanFence *fence;
+  GstVulkanDevice *device;
+  VkResult err;
+  guint i, j;
+
+  g_return_val_if_fail (GST_IS_VULKAN_OPERATION (self), FALSE);
+
+  if (!self->cmd_buf) {
+    GST_INFO_OBJECT (self, "Cannot end operation without begin it");
+    return FALSE;
+  }
+
+  priv = GET_PRIV (self);
+
+  device = priv->cmd_pool->queue->device;
+  fence = gst_vulkan_device_create_fence (device, error);
+  if (!fence)
+    return FALSE;
+
+  gst_vulkan_command_buffer_lock (self->cmd_buf);
+  err = vkEndCommandBuffer (self->cmd_buf->cmd);
+  gst_vulkan_command_buffer_unlock (self->cmd_buf);
+  if (gst_vulkan_error_to_g_error (err, error, "vkEndCommandBuffer") < 0)
+    return FALSE;
+
+  if (priv->has_sync2) {
+    if (!gst_vulkan_operation_submit2 (self, fence, error))
+      goto bail;
+  } else if (!gst_vulkan_operation_submit1 (self, fence, error))
+    goto bail;
+
+  gst_vulkan_trash_list_add (priv->trash_list,
+      gst_vulkan_trash_list_acquire (priv->trash_list, fence,
+          gst_vulkan_trash_mini_object_unref,
+          GST_MINI_OBJECT_CAST (self->cmd_buf)));
+
+  gst_vulkan_fence_unref (fence);
+
+  gst_vulkan_trash_list_gc (priv->trash_list);
+
+  GST_OBJECT_LOCK (self);
+
+  for (i = 0; priv->deps.frames && i < priv->deps.frames->len; i++) {
+    GstVulkanDependencyFrame *frame =
+        &g_array_index (priv->deps.frames, GstVulkanDependencyFrame, i);
+
+    for (j = 0; j < GST_VIDEO_MAX_PLANES && frame->memj != NULL; j++) {
+      if (frame->updated) {
+        frame->memj->barrier.parent.pipeline_stages = frame->dst_stage;
+        frame->memj->barrier.parent.access_flags = frame->new_access;
+        frame->memj->barrier.parent.queue = frame->new_queue;
+        frame->memj->barrier.image_layout = frame->new_layout;
+      }
+
+      if (frame->semaphored)
+        frame->memj->barrier.parent.semaphore_value++;
+    }
+
+    frame->updated = FALSE;
+    frame->semaphored = FALSE;
+  }
+
+  g_clear_pointer (&priv->barriers, g_array_unref);
+  self->cmd_buf = NULL;
+
+  priv->op_submitted = TRUE;
+
+  GST_OBJECT_UNLOCK (self);
+
+  gst_vulkan_operation_discard_dependencies (self);
+
+  return TRUE;
+
+bail:
+  gst_vulkan_fence_unref (fence);
+  gst_vulkan_operation_reset (self);
+  return FALSE;
+}
+
+/**
+ * gst_vulkan_operation_wait:
+ * @self: a #GstVulkanOperation
+ *
+ * Waits for the operation's fence to signal.
+ *
+ * Returns: whether the operation succeed.
+ */
+gboolean
+gst_vulkan_operation_wait (GstVulkanOperation * self)
+{
+  GstVulkanOperationPrivate *priv;
+  gboolean ret;
+
+  g_return_val_if_fail (GST_IS_VULKAN_OPERATION (self), FALSE);
+
+  priv = GET_PRIV (self);
+  ret = gst_vulkan_trash_list_wait (priv->trash_list, G_MAXUINT64);
+
+  return ret;
+}
+
+static gboolean
+_dep_has_buffer (GstVulkanDependencyFrame * dep, GstBuffer * buffer)
+{
+  guint i, n_mems;
+  GstMemory *mem;
+
+  n_mems = gst_buffer_n_memory (buffer);
+  g_assert (n_mems <= GST_VIDEO_MAX_PLANES);
+
+  for (i = 0; i < n_mems; i++) {
+    mem = gst_buffer_peek_memory (buffer, i);
+    if (!(mem && gst_is_vulkan_image_memory (mem))) {
+      GST_ERROR ("Memory %" GST_PTR_FORMAT " is not a Vulkan Image", mem);
+      return FALSE;
+    }
+
+    if (dep->memi != (GstVulkanImageMemory *) mem)
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+static void
+_dep_set_buffer (GstVulkanDependencyFrame * dep, GstBuffer * buffer)
+{
+  guint i, n_mems;
+  GstMemory *mem;
+
+  n_mems = gst_buffer_n_memory (buffer);
+  g_assert (n_mems <= GST_VIDEO_MAX_PLANES);
+
+  for (i = 0; i < n_mems; i++) {
+    mem = gst_buffer_peek_memory (buffer, i);
+    if (!(mem && gst_is_vulkan_image_memory (mem))) {
+      GST_ERROR ("Memory %" GST_PTR_FORMAT " is not a Vulkan Image", mem);
+      return;
+    }
+
+    dep->memi = (GstVulkanImageMemory *) gst_memory_ref (mem);
+  }
+
+  for (; i < GST_VIDEO_MAX_PLANES; i++)
+    dep->memi = NULL;
+}
+
+static void
+gst_vulkan_operation_update_frame_unlocked (GstVulkanOperation * self,
+    GstBuffer * frame, guint64 dst_stage, guint64 new_access,
+    VkImageLayout new_layout, GstVulkanQueue * new_queue)
+{
+  GArray *frames;
+  guint i;
+  GstVulkanDependencyFrame *dep_frame = NULL;
+
+  frames = _get_dependency_frames (self);
+  for (i = 0; i < frames->len; i++) {
+    dep_frame = &g_array_index (frames, GstVulkanDependencyFrame, i);
+
+    if (_dep_has_buffer (dep_frame, frame))
+      break;
+  }
+
+  if (i >= frames->len) {
+    GstVulkanDependencyFrame dframe;
+
+    _dep_set_buffer (&dframe, frame);
+    g_array_append_val (frames, dframe);
+    dep_frame =
+        &g_array_index (frames, GstVulkanDependencyFrame, frames->len - 1);
+  }
+
+  dep_frame->updated = TRUE;
+  dep_frame->dst_stage = dst_stage;
+  dep_frame->new_access = new_access;
+  dep_frame->new_layout = new_layout;
+  dep_frame->new_queue = new_queue ? gst_object_ref (new_queue) : NULL;
+}
+
+/**
+ * gst_vulkan_operation_update_frame:
+ * @self: a #GstVulkanOperation
+ * @frame: a #GstBuffer to update after submit
+ * @dst_stage: destination pipeline stage (VkPipelineStageFlags or
+ *   VkPipelineStageFlags2)
+ * @new_access: the new access flags (VkAccessFlags2 or VkAccessFlags)
+ * @new_layout: the new VkImageLayout
+ * @new_queue: (nullable): destination #GstVulkanQueue for a transfer of @frame
+ *   ownership
+ *
+ * Add or update the internal list of the future state of @frame. This state
+ * will be set after gst_vulkan_operation_end().
+ *
+ * This method is useful when new barriers are added to the array without using
+ * gst_vulkan_operation_add_frame_barrier().
+ */
+void
+gst_vulkan_operation_update_frame (GstVulkanOperation * self, GstBuffer * frame,
+    guint64 dst_stage, guint64 new_access, VkImageLayout new_layout,
+    GstVulkanQueue * new_queue)
+{
+  g_return_if_fail (GST_IS_VULKAN_OPERATION (self));
+
+  GST_OBJECT_LOCK (self);
+  gst_vulkan_operation_update_frame_unlocked (self, frame, dst_stage,
+      new_access, new_layout, new_queue);
+  GST_OBJECT_UNLOCK (self);
+}
+
+static GArray *
+_new_image_barriers (GstVulkanOperation * self)
+{
+#if defined(VK_KHR_synchronization2)
+  GstVulkanOperationPrivate *priv;
+
+  priv = GET_PRIV (self);
+
+  if (priv->has_sync2) {
+    return g_array_sized_new (FALSE, FALSE, sizeof (VkImageMemoryBarrier2KHR),
+        GST_VIDEO_MAX_PLANES);
+  }
+#endif
+  return g_array_sized_new (FALSE, FALSE, sizeof (VkImageMemoryBarrier),
+      GST_VIDEO_MAX_PLANES);
+}
+
+static GArray *
+_get_image_barriers_unlocked (GstVulkanOperation * self)
+{
+  GstVulkanOperationPrivate *priv;
+  priv = GET_PRIV (self);
+
+  if (priv->barriers)
+    return priv->barriers;
+
+  priv->barriers = _new_image_barriers (self);
+  return priv->barriers;
+}
+
+/**
+ * gst_vulkan_operation_retrieve_image_barriers:
+ * @self: a #GstVulkanOperation
+ *
+ * Retrieves a copy of the current defined barriers internally, which will be
+ * used by vkCmdPipelineBarrier or vkCmdPipelineBarrier2KHR by the API user.
+ *
+ * The element type of the array might be, depending on if synchronization2
+ * extension is used, either VkImageMemoryBarrier or VkImageMemoryBarrier2KHR.
+ *
+ * Returns: (transfer full): Current barriers array. Call g_array_unref() after
+ *    the operation is using.
+ */
+GArray *
+gst_vulkan_operation_retrieve_image_barriers (GstVulkanOperation * self)
+{
+  GArray *barriers;
+
+  GST_OBJECT_LOCK (self);
+  barriers = g_array_copy (_get_image_barriers_unlocked (self));
+  GST_OBJECT_UNLOCK (self);
+
+  return barriers;
+}
+
+/**
+ * gst_vulkan_operation_new_extra_image_barriers:
+ * @self: a #GstVulkanOperation
+ *
+ * See also: gst_vulkan_operation_use_sync2(),
+ *     gst_vulkan_operation_add_extra_image_barriers() and
+ *     gst_vulkan_operation_update_frame()
+ *
+ * If it's required to add custom image memory barriers this function will
+ * allocate a new array to append in it the extra image memory barriers to
+ * handle.
+ *
+ * Remember to call gst_vulkan_operation_update_frame() after adding the barrier
+ * related with that frame.
+ *
+ * Returns: (transfer full): A new allocated array of barriers, either
+ *     VkImageMemoryBarrier or VkImageMemoryBarrier2KHR, depending whether
+ *     synchronization2 extension is used.
+ */
+GArray *
+gst_vulkan_operation_new_extra_image_barriers (GstVulkanOperation * self)
+{
+  return _new_image_barriers (self);
+}
+
+/**
+ * gst_vulkan_operation_add_extra_image_barriers:
+ * @self: a #GstVulkanOperation
+ * @extra_barriers: a #GArray of extra image memory barriers to handle
+ *
+ * See also: gst_vulkan_operation_use_sync2(),
+ *     gst_vulkan_operation_new_extra_image_barriers() and
+ *     gst_vulkan_operation_update_frame()
+ *
+ * Any non-repeated image barrier in @extra is appended to the internal barrier
+ * list.
+ *
+ * Remember to call gst_vulkan_operation_update_frame() on those frames with
+ * images in @extra_barriers.
+ */
+void
+gst_vulkan_operation_add_extra_image_barriers (GstVulkanOperation * self,
+    GArray * extra_barriers)
+{
+  guint i, j;
+  GArray *barriers;
+  gboolean found;
+#if defined(VK_KHR_synchronization2)
+  GstVulkanOperationPrivate *priv;
+#endif
+
+  g_return_if_fail (GST_IS_VULKAN_OPERATION (self));
+
+#if defined(VK_KHR_synchronization2)
+  priv = GET_PRIV (self);
+#endif
+
+  GST_OBJECT_LOCK (self);
+
+  barriers = _get_image_barriers_unlocked (self);
+
+#define FIND_BARRIER(Type) G_STMT_START {                   \
+    Type *barrier = &g_array_index (barriers, Type, j);     \
+    Type *extra = &g_array_index (extra_barriers, Type, i); \
+    found = (barrier->image == extra->image);               \
+  } G_STMT_END;
+
+#define APPEND_BARRIER(Type) G_STMT_START {                 \
+    Type extra = g_array_index (extra_barriers, Type, i);   \
+    g_array_append_val (barriers, extra);                   \
+  } G_STMT_END;
+
+  /* if barrier is already there, skip it */
+  for (i = 0; i < extra_barriers->len; i++) {
+    found = FALSE;
+
+    for (j = 0; !found && j < barriers->len; j++) {
+#if defined(VK_KHR_synchronization2)
+      if (priv->has_sync2) {
+        FIND_BARRIER (VkImageMemoryBarrier2KHR);
+      } else
+#endif
+      {
+        FIND_BARRIER (VkImageMemoryBarrier);
+      }
+    }
+
+    if (!found) {
+#if defined(VK_KHR_synchronization2)
+      if (priv->has_sync2) {
+        APPEND_BARRIER (VkImageMemoryBarrier2KHR);
+      } else
+#endif
+      {
+        APPEND_BARRIER (VkImageMemoryBarrier);
+      }
+    }
+  }
+
+#undef FIND_BARRIER
+#undef APPEND_BARRIER
+
+  GST_OBJECT_UNLOCK (self);
+}
+
+/**
+ * gst_vulkan_operation_add_frame_barrier:
+ * @self: a #GstVulkanOperation
+ * @frame: a Vulkan Image #GstBuffer
+ * @dst_stage: destination pipeline stage (VkPipelineStageFlags or
+ *   VkPipelineStageFlags2)
+ * @new_access: the new access flags (VkAccessFlags2 or VkAccessFlags)
+ * @new_layout: the new VkImageLayout
+ * @new_queue: (nullable): destination #GstVulkanQueue for a transfer of @frame
+ *   ownership
+ *
+ * See also: gst_vulkan_operation_update_frame()
+ *
+ * Adds an image memory barrier per memory in @frame with its future state. And
+ * it updates the @frame barrier state by calling internally
+ * gst_vulkan_operation_update_frame().
+ *
+ * Returns: whether the @frame barriers were appended
+ */
+gboolean
+gst_vulkan_operation_add_frame_barrier (GstVulkanOperation * self,
+    GstBuffer * frame, guint64 dst_stage, guint64 new_access,
+    VkImageLayout new_layout, GstVulkanQueue * new_queue)
+{
+  guint i, n_mems;
+#if defined(VK_KHR_synchronization2)
+  GstVulkanOperationPrivate *priv;
+#endif
+  GstVulkanDependencyFrame *dep_frame = NULL;
+  GArray *frames, *barriers;
+
+  g_return_val_if_fail (GST_IS_VULKAN_OPERATION (self), FALSE);
+  g_return_val_if_fail (GST_IS_BUFFER (frame), FALSE);
+
+#if defined(VK_KHR_synchronization2)
+  priv = GET_PRIV (self);
+#endif
+  n_mems = gst_buffer_n_memory (frame);
+
+  GST_OBJECT_LOCK (self);
+  barriers = _get_image_barriers_unlocked (self);
+
+  frames = _get_dependency_frames (self);
+  for (i = 0; i < frames->len; i++) {
+    dep_frame = &g_array_index (frames, GstVulkanDependencyFrame, i);
+    if (_dep_has_buffer (dep_frame, frame))
+      break;
+  }
+
+  if (i >= frames->len || !(dep_frame && dep_frame->updated))
+    dep_frame = NULL;
+
+  for (i = 0; i < n_mems; i++) {
+    guint32 queue_familiy_index = VK_QUEUE_FAMILY_IGNORED;
+    GstVulkanImageMemory *vkmem;
+    GstMemory *mem = gst_buffer_peek_memory (frame, i);
+
+    if (!gst_is_vulkan_image_memory (mem)) {
+      GST_OBJECT_UNLOCK (self);
+      GST_ERROR_OBJECT (self, "Memory %" GST_PTR_FORMAT
+          " is not a Vulkan Image", mem);
+      return FALSE;
+    }
+
+    vkmem = (GstVulkanImageMemory *) mem;
+
+    if (dep_frame && dep_frame->new_queue)
+      queue_familiy_index = dep_frame->new_queue->family;
+    else if (vkmem->barrier.parent.queue)
+      queue_familiy_index = vkmem->barrier.parent.queue->family;
+
+    /* *INDENT-OFF* */
+#if defined(VK_KHR_synchronization2)
+    if (priv->has_sync2) {
+      VkImageMemoryBarrier2KHR barrier2  = {
+        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2_KHR,
+        .pNext = NULL,
+        .srcStageMask = dep_frame ?
+            dep_frame->dst_stage : vkmem->barrier.parent.pipeline_stages,
+        .dstStageMask = dst_stage,
+        .srcAccessMask = dep_frame ?
+            dep_frame->new_access : vkmem->barrier.parent.access_flags,
+        .dstAccessMask = new_access,
+        .oldLayout = dep_frame ?
+            dep_frame->new_layout : vkmem->barrier.image_layout,
+        .newLayout = new_layout,
+        .srcQueueFamilyIndex = queue_familiy_index,
+        .dstQueueFamilyIndex = new_queue ?
+            new_queue->family : VK_QUEUE_FAMILY_IGNORED,
+        .image = vkmem->image,
+        .subresourceRange = vkmem->barrier.subresource_range,
+      };
+
+      g_array_append_val (barriers, barrier2);
+    } else
+#endif
+    {
+      VkImageMemoryBarrier barrier;
+
+      /* this might overflow */
+      if (new_access > VK_ACCESS_FLAG_BITS_MAX_ENUM) {
+        GST_OBJECT_UNLOCK (self);
+        GST_ERROR_OBJECT (self, "Invalid new access value: %" G_GUINT64_FORMAT,
+            new_access);
+        return FALSE;
+      }
+
+      barrier = (VkImageMemoryBarrier) {
+        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+        .pNext = NULL,
+        .srcAccessMask = vkmem->barrier.parent.access_flags,
+        .dstAccessMask = (VkAccessFlags) new_access,
+        .oldLayout = vkmem->barrier.image_layout,
+        .newLayout = new_layout,
+        .srcQueueFamilyIndex = queue_familiy_index,
+        .dstQueueFamilyIndex = new_queue ?
+            new_queue->family : VK_QUEUE_FAMILY_IGNORED,
+        .image = vkmem->image,
+        .subresourceRange = vkmem->barrier.subresource_range,
+      };
+
+      g_array_append_val (barriers, barrier);
+    }
+    /* *INDENT-ON* */
+  }
+
+  gst_vulkan_operation_update_frame_unlocked (self, frame, dst_stage,
+      new_access, new_layout, new_queue);
+  GST_OBJECT_UNLOCK (self);
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_operation_add_dependency_frame:
+ * @self: a #GstVulkanOperation
+ * @frame: a Vulkan Image #GstBuffer
+ * @wait_stage: pipeline stage to wait (VkPipelineStageFlags or
+ *   VkPipelineStageFlags2)
+ * @signal_stage: pipeline stage to signal (VkPipelineStageFlags or
+ *   VkPipelineStageFlags2)
+ *
+ * Add @frame as an operation dependency by adding the timeline semaphores in
+ * each memory of @frame into either the wait semaphore array. The signal array
+ * hold the same semaphores but increasing their current value.
+ *
+ * Returns: whether the @frame was added as dependency.
+ */
+gboolean
+gst_vulkan_operation_add_dependency_frame (GstVulkanOperation * self,
+    GstBuffer * frame, guint64 wait_stage, guint64 signal_stage)
+{
+  GstVulkanOperationPrivate *priv;
+  guint i, n_mems;
+  GArray *frames;
+  GstVulkanDependencyFrame *dep_frame = NULL;
+
+  g_return_val_if_fail (GST_IS_VULKAN_OPERATION (self), FALSE);
+  g_return_val_if_fail (GST_IS_BUFFER (frame), FALSE);
+
+#if defined(VK_KHR_timeline_semaphore)
+  priv = GET_PRIV (self);
+
+  GST_OBJECT_LOCK (self);
+  frames = _get_dependency_frames (self);
+
+  for (i = 0; i < frames->len; i++) {
+    dep_frame = &g_array_index (frames, GstVulkanDependencyFrame, i);
+    if (_dep_has_buffer (dep_frame, frame) && dep_frame->semaphored) {
+      GST_OBJECT_UNLOCK (self);
+      return TRUE;
+    }
+  }
+
+  if (i >= frames->len) {
+    GstVulkanDependencyFrame dframe = {
+      .semaphored = TRUE,
+    };
+    _dep_set_buffer (&dframe, frame);
+    g_array_append_val (frames, dframe);
+  } else if (dep_frame) {
+    dep_frame->semaphored = TRUE;
+  }
+#if defined(VK_KHR_synchronization2)
+  if (priv->has_sync2 && priv->has_timeline) {
+    if (!priv->deps.signal_semaphores) {
+      priv->deps.signal_semaphores =
+          g_array_new (FALSE, FALSE, sizeof (VkSemaphoreSubmitInfoKHR));
+    }
+
+    if (!priv->deps.wait_semaphores) {
+      priv->deps.wait_semaphores =
+          g_array_new (FALSE, FALSE, sizeof (VkSemaphoreSubmitInfoKHR));
+    }
+
+    n_mems = gst_buffer_n_memory (frame);
+    for (i = 0; i < n_mems; i++) {
+      GstVulkanImageMemory *vkmem;
+      GstMemory *mem = gst_buffer_peek_memory (frame, i);
+
+      if (!gst_is_vulkan_image_memory (mem)) {
+        GST_OBJECT_UNLOCK (self);
+        GST_ERROR_OBJECT (self, "Memory %" GST_PTR_FORMAT
+            " is not a Vulkan Image", mem);
+        return FALSE;
+      }
+
+      vkmem = (GstVulkanImageMemory *) mem;
+
+      if (vkmem->barrier.parent.semaphore == VK_NULL_HANDLE)
+        break;
+
+      /* *INDENT-OFF* */
+      g_array_append_vals (priv->deps.wait_semaphores, &(VkSemaphoreSubmitInfoKHR) {
+          .sType = VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO_KHR,
+          .semaphore = vkmem->barrier.parent.semaphore,
+          .value = vkmem->barrier.parent.semaphore_value,
+          .stageMask = wait_stage,
+        }, 1);
+      g_array_append_vals (priv->deps.signal_semaphores, &(VkSemaphoreSubmitInfoKHR) {
+          .sType = VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO_KHR,
+          .semaphore = vkmem->barrier.parent.semaphore,
+          .value = vkmem->barrier.parent.semaphore_value + 1,
+          .stageMask = signal_stage,
+        }, 1);
+      /* *INDENT-ON* */
+    }
+
+    GST_OBJECT_UNLOCK (self);
+    return TRUE;
+  }
+#else
+  if (priv->has_timeline && wait_stage <= G_MAXUINT32) {
+    if (!priv->deps.signal_semaphores) {
+      priv->deps.signal_semaphores =
+          g_array_new (FALSE, FALSE, sizeof (VkSemaphore));
+    }
+
+    if (!priv->deps.wait_semaphores) {
+      priv->deps.wait_semaphores =
+          g_array_new (FALSE, FALSE, sizeof (VkSemaphore));
+    }
+
+    if (!priv->deps.wait_dst_stage_mask) {
+      priv->deps.wait_dst_stage_mask =
+          g_array_new (FALSE, FALSE, sizeof (VkPipelineStageFlags));
+    }
+
+    if (!priv->deps.wait_semaphore_values) {
+      priv->deps.wait_semaphore_values =
+          g_array_new (FALSE, FALSE, sizeof (guint64));
+    }
+    if (!priv->deps.signal_semaphore_values) {
+      priv->deps.signal_semaphore_values =
+          g_array_new (FALSE, FALSE, sizeof (guint64));
+    }
+
+    n_mems = gst_buffer_n_memory (frame);
+    for (i = 0; i < n_mems; i++) {
+      GstVulkanImageMemory *vkmem;
+      GstMemory *mem = gst_buffer_peek_memory (frame, i);
+      VkPipelineStageFlags wait_stage1 = (VkPipelineStageFlags) wait_stage;
+      guint64 signal_value;
+
+      if (!gst_is_vulkan_image_memory (mem)) {
+        GST_OBJECT_UNLOCK (self);
+        GST_ERROR_OBJECT (self, "Memory %" GST_PTR_FORMAT
+            " is not a Vulkan Image", mem);
+        return FALSE;
+      }
+
+      vkmem = (GstVulkanImageMemory *) mem;
+
+      if (vkmem->barrier.parent.semaphore == VK_NULL_HANDLE)
+        break;
+
+      g_array_append_val (priv->deps.wait_semaphores,
+          vkmem->barrier.parent.semaphore);
+      g_array_append_val (priv->deps.signal_semaphores,
+          vkmem->barrier.parent.semaphore);
+      g_array_append_val (priv->deps.wait_semaphore_values,
+          vkmem->barrier.parent.semaphore_value);
+      signal_value = vkmem->barrier.parent.semaphore_value + 1;
+      g_array_append_val (priv->deps.signal_semaphore_values, signal_value);
+      g_array_append_val (priv->deps.wait_dst_stage_mask, wait_stage1);
+    }
+
+    GST_OBJECT_UNLOCK (self);
+    return TRUE;
+  }
+#endif /* synchronization2 */
+#endif /* timeline semaphore */
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_operation_discard_dependencies:
+ * @self: a #GstVulkanOperation
+ *
+ * Discards barriers, and all the semaphore arrays populated by
+ * gst_vulkan_operation_add_dependency_frame().
+ */
+void
+gst_vulkan_operation_discard_dependencies (GstVulkanOperation * self)
+{
+  GstVulkanOperationPrivate *priv;
+
+  g_return_if_fail (GST_IS_VULKAN_OPERATION (self));
+
+  priv = GET_PRIV (self);
+
+  GST_OBJECT_LOCK (self);
+  g_clear_pointer (&priv->barriers, g_array_unref);
+
+  g_clear_pointer (&priv->deps.frames, g_array_unref);
+  g_clear_pointer (&priv->deps.signal_semaphores, g_array_unref);
+  g_clear_pointer (&priv->deps.wait_semaphores, g_array_unref);
+
+  g_clear_pointer (&priv->deps.wait_dst_stage_mask, g_array_unref);
+  g_clear_pointer (&priv->deps.wait_semaphore_values, g_array_unref);
+  g_clear_pointer (&priv->deps.signal_semaphore_values, g_array_unref);
+
+  GST_OBJECT_UNLOCK (self);
+}
+
+/**
+ * gst_vulkan_operation_enable_query:
+ * @self: a #GstVulkanOperation
+ * @query_type: (type guint32): the VkQueryType to enable
+ * @n_queries: number of queries to enable
+ * @pnext: the structure pointer to use as pNext
+ * @error: a #GError
+ *
+ * Tries to enable the query pool for the current operation.
+ *
+ * Returns: whether the query pool was enabled. It might populate @error in case
+ *    of error.
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_vulkan_operation_enable_query (GstVulkanOperation * self,
+    VkQueryType query_type, guint n_queries, gpointer pnext, GError ** error)
+{
+  GstVulkanOperationPrivate *priv;
+  GstVulkanPhysicalDevice *device;
+  guint32 queue_family;
+  VkQueryPoolCreateInfo query_pool_info = {
+    .sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO,
+    .pNext = pnext,
+    .queryType = query_type,
+    .queryCount = n_queries,
+  };
+  VkResult res;
+  size_t stride = 0;
+
+  g_return_val_if_fail (GST_IS_VULKAN_OPERATION (self), FALSE);
+  g_return_val_if_fail (n_queries > 0, FALSE);
+
+  priv = GET_PRIV (self);
+
+  if (priv->query_pool)
+    return TRUE;
+
+  queue_family = priv->cmd_pool->queue->family;
+  device = priv->cmd_pool->queue->device->physical_device;
+  if (!device->queue_family_opsqueue_family.query) {
+    g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_FEATURE_NOT_PRESENT,
+        "Queue %" GST_PTR_FORMAT " doesn't support query operations",
+        priv->cmd_pool->queue);
+    return FALSE;
+  }
+
+  res = vkCreateQueryPool (priv->cmd_pool->queue->device->device,
+      &query_pool_info, NULL, &priv->query_pool);
+  if (gst_vulkan_error_to_g_error (res, error,
+          "vkCreateQueryPool") != VK_SUCCESS)
+    return FALSE;
+
+  priv->query_type = query_type;
+  priv->n_queries = n_queries;
+
+  /* @TODO:
+   * + support 64bit
+   * + result support other structures besides a guint32 array
+   */
+  switch (query_type) {
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+    case VK_QUERY_TYPE_RESULT_STATUS_ONLY_KHR:
+      if (priv->has_video)
+        stride = sizeof (guint32);
+      break;
+#endif
+    default:
+      break;
+  }
+
+  priv->query_data_size = n_queries * stride;
+  priv->query_data_stride = stride;
+  priv->query_data = g_malloc0 (priv->query_data_size);
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_operation_get_query:
+ * @self: a #GstVulkanOperation
+ * @data: (out callee-allocates) (transfer none): result of all queries
+ * @error: a #GError
+ *
+ * Gets the latest operation results of all the queries in @data. API users have
+ * to parse the binary array of @data according of their needs (usually is a
+ * guint32 array of size of n_query).
+ *
+ * Don't free @data.
+ *
+ * Returns: whether a status was fetched. If not, it might populate @error
+ */
+gboolean
+gst_vulkan_operation_get_query (GstVulkanOperation * self, gpointer * result,
+    GError ** error)
+{
+  GstVulkanOperationPrivate *priv;
+  VkResult res;
+  VkQueryResultFlagBits flags = 0;
+
+  g_return_val_if_fail (GST_IS_VULKAN_OPERATION (self), FALSE);
+
+  priv = GET_PRIV (self);
+  if (!priv->query_pool || !priv->query_data || !priv->op_submitted)
+    return TRUE;
+
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  if (priv->has_video
+      && (priv->query_type == VK_QUERY_TYPE_RESULT_STATUS_ONLY_KHR)) {
+    flags |= VK_QUERY_RESULT_WITH_STATUS_BIT_KHR;
+  }
+#endif
+
+  /* grab the results of all the queries */
+  res = vkGetQueryPoolResults (priv->cmd_pool->queue->device->device,
+      priv->query_pool, 0, priv->n_queries, priv->query_data_size,
+      priv->query_data, priv->query_data_stride, flags);
+  if (res != VK_SUCCESS && res != VK_NOT_READY) {
+    gst_vulkan_error_to_g_error (res, error, "vkGetQueryPoolResults");
+    return FALSE;
+  }
+
+  if (result)
+    *result = priv->query_data;
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_operation_begin_query:
+ * @self: a #GstVulkanOperation
+ *
+ * Begins a query operation in the current command buffer.
+ *
+ * Returns: whether the begin command was set
+ */
+gboolean
+gst_vulkan_operation_begin_query (GstVulkanOperation * self, guint32 id)
+{
+  GstVulkanOperationPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_VULKAN_OPERATION (self), FALSE);
+
+  priv = GET_PRIV (self);
+  if (!priv->query_pool)
+    return TRUE;
+
+  if (!self->cmd_buf) {
+    GST_INFO_OBJECT (self, "Cannot begin query without begin operation");
+    return FALSE;
+  }
+
+  gst_vulkan_command_buffer_lock (self->cmd_buf);
+  vkCmdBeginQuery (self->cmd_buf->cmd, priv->query_pool, id, 0);
+  gst_vulkan_command_buffer_unlock (self->cmd_buf);
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_operation_end_query:
+ * @self: a #GstVulkanOperation
+ *
+ * Ends a query operation in the current command buffer.
+ *
+ * Returns: whether the end command was set
+ */
+gboolean
+gst_vulkan_operation_end_query (GstVulkanOperation * self, guint32 id)
+{
+  GstVulkanOperationPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_VULKAN_OPERATION (self), FALSE);
+
+  priv = GET_PRIV (self);
+  if (!priv->query_pool)
+    return TRUE;
+
+  if (!self->cmd_buf) {
+    GST_INFO_OBJECT (self, "Cannot end query without begin operation");
+    return FALSE;
+  }
+
+  gst_vulkan_command_buffer_lock (self->cmd_buf);
+  vkCmdEndQuery (self->cmd_buf->cmd, priv->query_pool, id);
+  gst_vulkan_command_buffer_unlock (self->cmd_buf);
+
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_operation_use_sync2:
+ * @self: a #GstVulkanOperation
+ *
+ * Returns: whether the operations are using synchronization2 extension.
+ */
+gboolean
+gst_vulkan_operation_use_sync2 (GstVulkanOperation * self)
+{
+  g_return_val_if_fail (GST_IS_VULKAN_OPERATION (self), FALSE);
+
+  return GET_PRIV (self)->has_sync2;
+}
+
+/**
+ * gst_vulkan_operation_pipeline_barrier2:
+ * @self: a #GstVulkanOperation
+ * @dependency_info: a pointer to VkDependencyInfo
+ *
+ * It's a wrapper to vkCmdPipelineBarrier2{KHR} if it's available.
+ *
+ * Returns: %TRUE if vkCmdPipelineBarrier2{KHR} it's available. %FALSE,
+ *   otherwise.
+ */
+gboolean
+gst_vulkan_operation_pipeline_barrier2 (GstVulkanOperation * self,
+    gpointer dependency_info)
+{
+#if defined(VK_KHR_synchronization2)
+  GstVulkanOperationPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_VULKAN_OPERATION (self), FALSE);
+
+  priv = GET_PRIV (self);
+
+  if (priv->has_sync2) {
+    VkDependencyInfoKHR *info = dependency_info;
+
+    g_return_val_if_fail (info
+        && info->sType == VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR, FALSE);
+
+    if (!self->cmd_buf) {
+      GST_INFO_OBJECT (self, "Cannot record a barrier without begin operation");
+      return FALSE;
+    }
+
+    gst_vulkan_command_buffer_lock (self->cmd_buf);
+    priv->CmdPipelineBarrier2 (self->cmd_buf->cmd, info);
+    gst_vulkan_command_buffer_unlock (self->cmd_buf);
+    return TRUE;
+  }
+#endif
+  return FALSE;
+}
+
+
+/**
+ * gst_vulkan_operation_new:
+ * @cmd_pool: a #GstVulkanCommandPool
+ *
+ * Returns: (transfer full): a newly allocated #GstVulkanOperation
+ */
+GstVulkanOperation *
+gst_vulkan_operation_new (GstVulkanCommandPool * cmd_pool)
+{
+  GstVulkanOperation *self;
+
+  g_return_val_if_fail (GST_IS_VULKAN_COMMAND_POOL (cmd_pool), NULL);
+
+  self = g_object_new (GST_TYPE_VULKAN_OPERATION, "command-pool", cmd_pool,
+      NULL);
+
+  gst_object_ref_sink (self);
+
+  return self;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkoperation.h Added

@@ -0,0 +1,134 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/vulkan/gstvkqueue.h>
+
+#define GST_TYPE_VULKAN_OPERATION         (gst_vulkan_operation_get_type())
+#define GST_VULKAN_OPERATION(o)           (G_TYPE_CHECK_INSTANCE_CAST((o), GST_TYPE_VULKAN_OPERATION, GstVulkanOperation))
+#define GST_VULKAN_OPERATION_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GST_TYPE_VULKAN_OPERATION, GstVulkanOperationClass))
+#define GST_IS_VULKAN_OPERATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_TYPE_VULKAN_OPERATION))
+#define GST_IS_VULKAN_OPERATION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE((k), GST_TYPE_VULKAN_OPERATION))
+#define GST_VULKAN_OPERATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_TYPE_VULKAN_OPERATION, GstVulkanOperationClass))
+
+GST_VULKAN_API
+GType gst_vulkan_operation_get_type       (void);
+
+/**
+ * GstVulkanOperation:
+ * @parent: the parent #GstObject
+ * @cmd_buf: the current #GstVulkanCommandBuffer
+ *
+ * When using the operation @cmd_buf, you should lock it using
+ * gst_vulkan_command_buffer_lock(), but you have to unlock it, with
+ * gst_vulkan_command_buffer_unlock(), when calling any of #GstVulkanOperation
+ * methods.
+ *
+ * Since: 1.24
+ */
+struct _GstVulkanOperation
+{
+  GstObject parent;
+
+  GstVulkanCommandBuffer *cmd_buf;
+
+  /* <private> */
+  gpointer _reserved        GST_PADDING;
+};
+
+struct _GstVulkanOperationClass
+{
+  GstObjectClass parent_class;
+
+  /* <private> */
+  gpointer _reserved        GST_PADDING;
+
+};
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanOperation, gst_object_unref)
+
+GST_VULKAN_API
+GstVulkanOperation *    gst_vulkan_operation_new                (GstVulkanCommandPool * cmd_pool);
+GST_VULKAN_API
+gboolean                gst_vulkan_operation_begin              (GstVulkanOperation * self,
+                                                                 GError ** error);
+GST_VULKAN_API
+gboolean                gst_vulkan_operation_wait               (GstVulkanOperation * self);
+GST_VULKAN_API
+gboolean                gst_vulkan_operation_end                (GstVulkanOperation * self,
+                                                                 GError ** error);
+GST_VULKAN_API
+void                    gst_vulkan_operation_reset              (GstVulkanOperation * self);
+GST_VULKAN_API
+GArray *                gst_vulkan_operation_retrieve_image_barriers
+                                                                (GstVulkanOperation * self);
+GST_VULKAN_API
+GArray *                gst_vulkan_operation_new_extra_image_barriers
+                                                                (GstVulkanOperation * self);
+GST_VULKAN_API
+gboolean                gst_vulkan_operation_add_frame_barrier  (GstVulkanOperation * self,
+                                                                 GstBuffer * frame,
+                                                                 guint64 dst_stage,
+                                                                 guint64 new_access,
+                                                                 VkImageLayout new_layout,
+                                                                 GstVulkanQueue * new_queue);
+GST_VULKAN_API
+void                    gst_vulkan_operation_add_extra_image_barriers
+                                                                (GstVulkanOperation * self,
+                                                                 GArray * extra_barriers);
+GST_VULKAN_API
+void                    gst_vulkan_operation_update_frame       (GstVulkanOperation * self,
+                                                                 GstBuffer * frame,
+                                                                 guint64 dst_stage,
+                                                                 guint64 new_access,
+                                                                 VkImageLayout new_layout,
+                                                                 GstVulkanQueue * new_queue);
+GST_VULKAN_API
+gboolean                gst_vulkan_operation_add_dependency_frame
+                                                                (GstVulkanOperation * self,
+                                                                 GstBuffer * frame,
+                                                                 guint64 wait_stage,
+                                                                 guint64 signal_stage);
+GST_VULKAN_API
+void                    gst_vulkan_operation_discard_dependencies
+                                                                (GstVulkanOperation * self);
+GST_VULKAN_API
+gboolean                gst_vulkan_operation_enable_query       (GstVulkanOperation * self,
+                                                                 VkQueryType query_type,
+                                                                 guint n_queries,
+                                                                 gpointer pnext,
+                                                                 GError ** error);
+GST_VULKAN_API
+gboolean                gst_vulkan_operation_get_query          (GstVulkanOperation * self,
+                                                                 gpointer * data,
+                                                                 GError ** error);
+GST_VULKAN_API
+gboolean                gst_vulkan_operation_begin_query        (GstVulkanOperation * self,
+                                                                 guint32 id);
+GST_VULKAN_API
+gboolean                gst_vulkan_operation_end_query          (GstVulkanOperation * self,
+                                                                 guint32 id);
+
+GST_VULKAN_API
+gboolean                gst_vulkan_operation_use_sync2          (GstVulkanOperation * self);
+GST_VULKAN_API
+gboolean                gst_vulkan_operation_pipeline_barrier2  (GstVulkanOperation * self,
+                                                                 gpointer dependency_info);

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkphysicaldevice-private.h Added

@@ -0,0 +1,33 @@
+/*
+ * GStreamer
+ * Copyright (C) 2022 Igalia, S.L.
+  *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_VULKAN_PHYSICAL_DEVICE_PRIVATE_H__
+#define __GST_VULKAN_PHYSICAL_DEVICE_PRIVATE_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+const
+VkPhysicalDeviceFeatures2 * gst_vulkan_physical_device_get_features         (GstVulkanPhysicalDevice * device);
+
+G_END_DECLS
+
+#endif /* __GST_VULKAN_PHYSICAL_DEVICE_PRIVATE_H__ */

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkphysicaldevice.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkphysicaldevice.c Changed

@@ -24,6 +24,7 @@
 
 #include "gstvkphysicaldevice.h"
 
+#include "gstvkphysicaldevice-private.h"
 #include "gstvkdebug.h"
 
 #include <string.h>
@@ -66,6 +67,10 @@
   VkPhysicalDeviceVulkan12Features features12;
   VkPhysicalDeviceVulkan12Properties properties12;
 #endif
+#if defined (VK_API_VERSION_1_3)
+  VkPhysicalDeviceVulkan13Features features13;
+  VkPhysicalDeviceVulkan13Properties properties13;
+#endif
 };
 
 static void
@@ -187,6 +192,15 @@
   priv->features10.pNext = &priv->features11;
   priv->features11.pNext = &priv->features12;
 #endif
+#if defined (VK_API_VERSION_1_3)
+  priv->properties13.sType =
+      VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES;
+  priv->properties12.pNext = &priv->properties13;
+
+  priv->features13.sType =
+      VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES;
+  priv->features12.pNext = &priv->features13;
+#endif
 }
 
 static void
@@ -247,6 +261,7 @@
   g_free (priv->available_extensions);
   priv->available_extensions = NULL;
 
+  g_free (device->queue_family_ops);
   g_free (device->queue_family_props);
   device->queue_family_props = NULL;
 
@@ -437,6 +452,32 @@
   /* *INDENT-ON* */
 }
 #endif
+
+#if defined (VK_API_VERSION_1_3)
+static void
+dump_features13 (GstVulkanPhysicalDevice * device,
+    VkPhysicalDeviceVulkan13Features * features)
+{
+  /* *INDENT-OFF* */
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, robustImageAccess);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, inlineUniformBlock);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, descriptorBindingInlineUniformBlockUpdateAfterBind);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, pipelineCreationCacheControl);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, privateData);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, shaderDemoteToHelperInvocation);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, shaderTerminateInvocation);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, subgroupSizeControl);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, computeFullSubgroups);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, synchronization2);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, textureCompressionASTC_HDR);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, shaderZeroInitializeWorkgroupMemory);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, dynamicRendering);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, shaderIntegerDotProduct);
+  DEBUG_BOOL_STRUCT ("support for (1.3)", features, maintenance4);
+  /* *INDENT-ON* */
+}
+#endif
+
 static gboolean
 dump_features (GstVulkanPhysicalDevice * device, GError ** error)
 {
@@ -456,6 +497,12 @@
       else if (iter->sType ==
           VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES)
         dump_features12 (device, (VkPhysicalDeviceVulkan12Features *) iter);
+#if defined (VK_API_VERSION_1_3)
+      else if (gst_vulkan_instance_check_version (device->instance, 1, 3, 0)
+          && iter->sType ==
+          VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES)
+        dump_features13 (device, (VkPhysicalDeviceVulkan13Features *) iter);
+#endif
     }
   } else
 #endif
@@ -514,10 +561,11 @@
         queue_family_propsi.queueFlags);
     GST_LOG_OBJECT (device,
         "queue family at index %i supports %i queues "
-        "with flags (0x%x) \'%s\', %" G_GUINT32_FORMAT " timestamp bits and "
-        "a minimum image transfer granuality of %" GST_VULKAN_EXTENT3D_FORMAT,
-        i, device->queue_family_propsi.queueCount,
+        "with flags (0x%x) \'%s\', video operations (0x%x), %" G_GUINT32_FORMAT
+        " timestamp bits and a minimum image transfer granuality of %"
+        GST_VULKAN_EXTENT3D_FORMAT, i, device->queue_family_propsi.queueCount,
         device->queue_family_propsi.queueFlags, queue_flags_str,
+        device->queue_family_ops ? device->queue_family_opsi.video : 0,
         device->queue_family_propsi.timestampValidBits,
         GST_VULKAN_EXTENT3D_ARGS (device->
             queue_family_propsi.minImageTransferGranularity));
@@ -748,6 +796,61 @@
 }
 #endif
 
+#if defined(VK_API_VERSION_1_3)
+static void
+dump_properties13 (GstVulkanPhysicalDevice * device,
+    VkPhysicalDeviceVulkan13Properties * properties)
+{
+  /* *INDENT-OFF* */
+  DEBUG_UINT32 ("properties (1.3)", properties, minSubgroupSize);
+  DEBUG_UINT32 ("properties (1.3)", properties, maxSubgroupSize);
+  DEBUG_UINT32 ("properties (1.3)", properties, maxComputeWorkgroupSubgroups);
+  /* VkShaderStageFlags    requiredSubgroupSizeStages; */
+  DEBUG_UINT32 ("properties (1.3)", properties, maxInlineUniformBlockSize);
+  DEBUG_UINT32 ("properties (1.3)", properties, maxPerStageDescriptorInlineUniformBlocks);
+  DEBUG_UINT32 ("properties (1.3)", properties, maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks);
+  DEBUG_UINT32 ("properties (1.3)", properties, maxDescriptorSetInlineUniformBlocks);
+  DEBUG_UINT32 ("properties (1.3)", properties, maxDescriptorSetUpdateAfterBindInlineUniformBlocks);
+  DEBUG_UINT32 ("properties (1.3)", properties, maxInlineUniformTotalSize);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct8BitUnsignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct8BitSignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct8BitMixedSignednessAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct4x8BitPackedUnsignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct4x8BitPackedSignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct4x8BitPackedMixedSignednessAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct16BitUnsignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct16BitSignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct16BitMixedSignednessAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct32BitUnsignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct32BitSignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct32BitMixedSignednessAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct64BitUnsignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct64BitSignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProduct64BitMixedSignednessAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating8BitUnsignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating8BitSignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating16BitUnsignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating16BitSignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating32BitUnsignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating32BitSignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating64BitUnsignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating64BitSignedAccelerated);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated);
+  DEBUG_SIZE ("properties (1.3)", properties, storageTexelBufferOffsetAlignmentBytes);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, storageTexelBufferOffsetSingleTexelAlignment);
+  DEBUG_SIZE ("properties (1.3)", properties, uniformTexelBufferOffsetAlignmentBytes);
+  DEBUG_BOOL_STRUCT ("properties (1.3)", properties, uniformTexelBufferOffsetSingleTexelAlignment);
+  DEBUG_SIZE ("properties (1.3)", properties, maxBufferSize);
+  /* *INDENT-ON* */
+}
+#endif
+
 static gboolean
 physical_device_info (GstVulkanPhysicalDevice * device, GError ** error)
 {
@@ -789,6 +892,12 @@
       else if (iter->sType ==
           VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES)
         dump_properties12 (device, (VkPhysicalDeviceVulkan12Properties *) iter);
+#if defined (VK_API_VERSION_1_3)
+      else if (gst_vulkan_instance_check_version (device->instance, 1, 3, 0)
+          && iter->sType ==
+          VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES)
+        dump_properties13 (device, (VkPhysicalDeviceVulkan13Properties *) iter);
+#endif
     }
   }
 #endif
@@ -897,22 +1006,55 @@
     if (device->n_queue_families > 0) {
       VkQueueFamilyProperties2 *props;
       int i;
-
+      void *next = NULL;
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+      VkQueueFamilyVideoPropertiesKHR *queue_family_video_props;
+      VkQueueFamilyQueryResultStatusPropertiesKHR *queue_family_query_props;
+
+      queue_family_video_props =
+          g_new0 (VkQueueFamilyVideoPropertiesKHR, device->n_queue_families);
+      queue_family_query_props =
+          g_new0 (VkQueueFamilyQueryResultStatusPropertiesKHR,
+          device->n_queue_families);
+#endif
       props = g_new0 (VkQueueFamilyProperties2, device->n_queue_families);
       for (i = 0; i < device->n_queue_families; i++) {
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+        queue_family_query_propsi.sType =
+            VK_STRUCTURE_TYPE_QUEUE_FAMILY_QUERY_RESULT_STATUS_PROPERTIES_KHR;
+
+        queue_family_video_propsi.sType =
+            VK_STRUCTURE_TYPE_QUEUE_FAMILY_VIDEO_PROPERTIES_KHR;
+        queue_family_video_propsi.pNext = &queue_family_query_propsi;
+
+        next = &queue_family_video_propsi;
+#endif
         propsi.sType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2;
-        propsi.pNext = NULL;
+        propsi.pNext = next;
       }
 
       get_queue_props2 (device->device, &device->n_queue_families, props);
 
       device->queue_family_props =
           g_new0 (VkQueueFamilyProperties, device->n_queue_families);
+      device->queue_family_ops =
+          g_new0 (GstVulkanQueueFamilyOps, device->n_queue_families);
       for (i = 0; i < device->n_queue_families; i++) {
         memcpy (&device->queue_family_propsi, &propsi.queueFamilyProperties,
             sizeof (device->queue_family_propsi));
+
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+        device->queue_family_opsi.video =
+            queue_family_video_propsi.videoCodecOperations;
+        device->queue_family_opsi.query =
+            queue_family_query_propsi.queryResultStatusSupport;
+#endif
       }
       g_free (props);
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+      g_free (queue_family_video_props);
+      g_free (queue_family_query_props);
+#endif
     }
   } else
 #endif
@@ -1084,3 +1226,18 @@
 
   return ret;
 }
+
+const VkPhysicalDeviceFeatures2 *
+gst_vulkan_physical_device_get_features (GstVulkanPhysicalDevice * device)
+{
+#if defined (VK_API_VERSION_1_2)
+  GstVulkanPhysicalDevicePrivate *priv;
+
+  g_return_val_if_fail (GST_IS_VULKAN_PHYSICAL_DEVICE (device), FALSE);
+
+  priv = GET_PRIV (device);
+  if (gst_vulkan_instance_check_version (device->instance, 1, 2, 0))
+    return &priv->features10;
+#endif
+  return NULL;
+}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkphysicaldevice.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkphysicaldevice.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkqueue.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkqueue.c Changed

@@ -112,7 +112,7 @@
 /**
  * gst_vulkan_queue_create_command_pool:
  * @queue: a #GstVulkanQueue
- * @error: (optional): a #GError
+ * @error: (out) (optional): a #GError
  *
  * Returns: (transfer full): a new #GstVulkanCommandPool or %NULL
  *
@@ -155,6 +155,81 @@
 }
 
 /**
+ * gst_vulkan_queue_create_decoder:
+ * @queue: a #GstVulkanQueue
+ * @codec: (type guint): the VkVideoCodecOperationFlagBitsKHR to decode
+ *
+ * Creates a #GstVulkanDecoder object if @codec decoding is supported by @queue
+ *
+ * Returns: (transfer full) (nullable): the #GstVulkanDecoder object
+ *
+ * Since: 1.24
+ */
+GstVulkanDecoder *
+gst_vulkan_queue_create_decoder (GstVulkanQueue * queue, guint codec)
+{
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  GstVulkanPhysicalDevice *device;
+  GstVulkanDecoder *decoder;
+  guint flags, expected_flag, supported_video_ops;
+  const char *extension;
+
+  g_return_val_if_fail (GST_IS_VULKAN_QUEUE (queue), NULL);
+
+  device = queue->device->physical_device;
+  expected_flag = VK_QUEUE_VIDEO_DECODE_BIT_KHR;
+  flags = device->queue_family_propsqueue->family.queueFlags;
+  supported_video_ops = device->queue_family_opsqueue->family.video;
+
+  if (device->properties.apiVersion < VK_MAKE_VERSION (1, 3, 238)) {
+    GST_WARNING_OBJECT (queue,
+        "Driver API version %d.%d.%d doesn't support Video extensions",
+        VK_VERSION_MAJOR (device->properties.apiVersion),
+        VK_VERSION_MINOR (device->properties.apiVersion),
+        VK_VERSION_PATCH (device->properties.apiVersion));
+    return NULL;
+  }
+
+  switch (codec) {
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR:
+      extension = VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME;
+      break;
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR:
+      extension = VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME;
+      break;
+    default:
+      GST_WARNING_OBJECT (queue, "Unsupported codec %u", codec);
+      return NULL;
+  }
+  if ((flags & expected_flag) != expected_flag) {
+    GST_WARNING_OBJECT (queue, "Queue doesn't support decoding");
+    return NULL;
+  }
+  if ((supported_video_ops & codec) != codec) {
+    GST_WARNING_OBJECT (queue, "Queue doesn't support codec %u decoding",
+        codec);
+    return NULL;
+  }
+
+  if (!(gst_vulkan_device_is_extension_enabled (queue->device,
+              VK_KHR_VIDEO_QUEUE_EXTENSION_NAME)
+          && gst_vulkan_device_is_extension_enabled (queue->device,
+              VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME)
+          && gst_vulkan_device_is_extension_enabled (queue->device, extension)))
+    return NULL;
+
+  decoder = g_object_new (GST_TYPE_VULKAN_DECODER, NULL);
+  gst_object_ref_sink (decoder);
+  decoder->queue = gst_object_ref (queue);
+  decoder->codec = codec;
+
+  return decoder;
+#else
+  return NULL;
+#endif
+}
+
+/**
  * gst_context_set_vulkan_queue:
  * @context: a #GstContext
  * @queue: a #GstVulkanQueue

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkqueue.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkqueue.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkswapper.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkswapper.c Changed

@@ -177,24 +177,6 @@
 #undef GET_PROC_ADDRESS_REQUIRED
 }
 
-static GstVideoFormat
-_vk_format_to_video_format (VkFormat format)
-{
-  switch (format) {
-      /* double check endianness */
-    case VK_FORMAT_R8G8B8A8_UNORM:
-      return GST_VIDEO_FORMAT_RGBA;
-    case VK_FORMAT_R8G8B8_UNORM:
-      return GST_VIDEO_FORMAT_RGB;
-    case VK_FORMAT_B8G8R8A8_UNORM:
-      return GST_VIDEO_FORMAT_BGRA;
-    case VK_FORMAT_B8G8R8_UNORM:
-      return GST_VIDEO_FORMAT_BGR;
-    default:
-      return GST_VIDEO_FORMAT_UNKNOWN;
-  }
-}
-
 static VkColorSpaceKHR
 _vk_color_space_from_video_info (GstVideoInfo * v_info)
 {
@@ -206,7 +188,7 @@
 {
   GstVideoFormat v_format;
 
-  v_format = _vk_format_to_video_format (format);
+  v_format = gst_vulkan_format_to_video_format (format);
   if (v_format) {
     const gchar *format_str = gst_video_format_to_string (v_format);
     GValue item = G_VALUE_INIT;
@@ -1077,8 +1059,8 @@
         .oldLayout = swap_img->barrier.image_layout,
         .newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
         /* FIXME: implement exclusive transfers */
-        .srcQueueFamilyIndex = 0,
-        .dstQueueFamilyIndex = 0,
+        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
         .image = swap_img->image,
         .subresourceRange = swap_img->barrier.subresource_range
     };
@@ -1149,8 +1131,8 @@
         .oldLayout = img_mem->barrier.image_layout,
         .newLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
         /* FIXME: implement exclusive transfers */
-        .srcQueueFamilyIndex = 0,
-        .dstQueueFamilyIndex = 0,
+        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
         .image = img_mem->image,
         .subresourceRange = img_mem->barrier.subresource_range
     };
@@ -1174,6 +1156,32 @@
 
     vkCmdClearColorImage (cmd_buf->cmd, swap_img->image,
         swap_img->barrier.image_layout, &clear, 1, &clear_range);
+
+    /* *INDENT-OFF* */
+    image_memory_barrier = (VkImageMemoryBarrier) {
+        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+        .pNext = NULL,
+        .srcAccessMask = swap_img->barrier.parent.access_flags,
+        .dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
+        .oldLayout = swap_img->barrier.image_layout,
+        .newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+        /* FIXME: implement exclusive transfers */
+        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+        .image = swap_img->image,
+        .subresourceRange = swap_img->barrier.subresource_range
+    };
+    /* *INDENT-ON* */
+
+    vkCmdPipelineBarrier (cmd_buf->cmd,
+        swap_img->barrier.parent.pipeline_stages,
+        VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 0, NULL, 1,
+        &image_memory_barrier);
+
+    swap_img->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
+    swap_img->barrier.parent.access_flags = image_memory_barrier.dstAccessMask;
+    swap_img->barrier.image_layout = image_memory_barrier.newLayout;
+
     vkCmdBlitImage (cmd_buf->cmd, img_mem->image, img_mem->barrier.image_layout,
         swap_img->image, swap_img->barrier.image_layout, 1, &blit,
         VK_FILTER_LINEAR);
@@ -1188,8 +1196,8 @@
         .oldLayout = swap_img->barrier.image_layout,
         .newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
         /* FIXME: implement exclusive transfers */
-        .srcQueueFamilyIndex = 0,
-        .dstQueueFamilyIndex = 0,
+        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
         .image = swap_img->image,
         .subresourceRange = swap_img->barrier.subresource_range
     };

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvktrash.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvktrash.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkutils.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkutils.c Changed

@@ -465,16 +465,41 @@
 GstVulkanImageView *
 gst_vulkan_get_or_create_image_view (GstVulkanImageMemory * image)
 {
-  VkImageViewCreateInfo create_info;
-  GstVulkanImageView *ret = NULL;
+  return gst_vulkan_get_or_create_image_view_with_info (image, NULL);
+}
 
-  fill_vulkan_image_view_info (image->image, image->create_info.format,
-      &create_info);
+/**
+ * gst_vulkan_get_or_create_image_view_with_info
+ * @image: a #GstVulkanImageMemory
+ * @create_info: (nullable): a VkImageViewCreateInfo
+ *
+ * Create a new #GstVulkanImageView with a specific @create_info.
+ *
+ * Returns: (transfer full): a #GstVulkanImageView for @image matching the
+ *                           original layout and format of @image
+ *
+ * Since: 1.24
+ */
+GstVulkanImageView *
+gst_vulkan_get_or_create_image_view_with_info (GstVulkanImageMemory * image,
+    VkImageViewCreateInfo * create_info)
+{
+  VkImageViewCreateInfo _create_info;
+  GstVulkanImageView *ret;
+
+  if (!create_info) {
+    fill_vulkan_image_view_info (image->image, image->create_info.format,
+        &_create_info);
+    create_info = &_create_info;
+  } else if (!(create_info->format == image->create_info.format
+          && create_info->image == image->image)) {
+    return NULL;
+  }
 
   ret = gst_vulkan_image_memory_find_view (image,
-      (GstVulkanImageMemoryFindViewFunc) find_compatible_view, &create_info);
+      (GstVulkanImageMemoryFindViewFunc) find_compatible_view, create_info);
   if (!ret) {
-    ret = gst_vulkan_image_view_new (image, &create_info);
+    ret = gst_vulkan_image_view_new (image, create_info);
     gst_vulkan_image_memory_add_view (image, ret);
   }
 
@@ -489,7 +514,7 @@
  * @device: a #GstVulkanDevice
  * @code: the SPIR-V shader byte code
  * @size: length of @code.  Must be a multiple of 4
- * @error: (optional): a #GError to fill on failure
+ * @error: (out) (optional): a #GError to fill on failure
  *
  * Returns: (transfer full): a #GstVulkanHandle for @image matching the
  *                           original layout and format of @image or %NULL

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkutils.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkutils.h Changed

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkvideo-private.c Added

@@ -0,0 +1,235 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstvkvideo-private.h"
+#include "gstvkinstance.h"
+
+#include <vk_video/vulkan_video_codecs_common.h>
+
+/* *INDENT-OFF* */
+const VkExtensionProperties _vk_codec_extensions = {
+  GST_VK_VIDEO_EXTENSION_DECODE_H264 = {
+    .extensionName = VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_EXTENSION_NAME,
+    .specVersion = VK_STD_VULKAN_VIDEO_CODEC_H264_DECODE_SPEC_VERSION,
+  },
+  GST_VK_VIDEO_EXTENSION_DECODE_H265 = {
+    .extensionName = VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_EXTENSION_NAME,
+    .specVersion = VK_STD_VULKAN_VIDEO_CODEC_H265_DECODE_SPEC_VERSION,
+  },
+};
+
+const VkComponentMapping _vk_identity_component_map = {
+    .r = VK_COMPONENT_SWIZZLE_IDENTITY,
+    .g = VK_COMPONENT_SWIZZLE_IDENTITY,
+    .b = VK_COMPONENT_SWIZZLE_IDENTITY,
+    .a = VK_COMPONENT_SWIZZLE_IDENTITY,
+};
+/* *INDENT-ON* */
+
+gboolean
+gst_vulkan_video_get_vk_functions (GstVulkanInstance * instance,
+    GstVulkanVideoFunctions * vk_funcs)
+{
+  gboolean ret = FALSE;
+
+  g_return_val_if_fail (GST_IS_VULKAN_INSTANCE (instance), FALSE);
+  g_return_val_if_fail (vk_funcs, FALSE);
+
+#define GET_PROC_ADDRESS_REQUIRED(name)                                 \
+  G_STMT_START {                                                        \
+    const char *fname = "vk" G_STRINGIFY (name) "KHR";                  \
+    vk_funcs->G_PASTE (, name) = gst_vulkan_instance_get_proc_address (instance, fname); \
+    if (!vk_funcs->G_PASTE(, name)) {                                   \
+      GST_ERROR_OBJECT (instance, "Failed to find required function %s", fname); \
+      goto bail;                                                        \
+    }                                                                   \
+  } G_STMT_END;
+  GST_VULKAN_VIDEO_FN_LIST (GET_PROC_ADDRESS_REQUIRED)
+#undef GET_PROC_ADDRESS_REQUIRED
+      ret = TRUE;
+
+bail:
+  return ret;
+}
+
+static void
+gst_vulkan_handle_free_video_session (GstVulkanHandle * handle, gpointer data)
+{
+  PFN_vkDestroyVideoSessionKHR vkDestroyVideoSession;
+
+  g_return_if_fail (handle != NULL);
+  g_return_if_fail (handle->handle != VK_NULL_HANDLE);
+  g_return_if_fail (handle->type == GST_VULKAN_HANDLE_TYPE_VIDEO_SESSION);
+  g_return_if_fail (handle->user_data);
+
+  vkDestroyVideoSession = handle->user_data;
+  vkDestroyVideoSession (handle->device->device,
+      (VkVideoSessionKHR) handle->handle, NULL);
+}
+
+gboolean
+gst_vulkan_video_session_create (GstVulkanVideoSession * session,
+    GstVulkanDevice * device, GstVulkanVideoFunctions * vk,
+    VkVideoSessionCreateInfoKHR * session_create, GError ** error)
+{
+  VkVideoSessionKHR vk_session;
+  VkMemoryRequirements2 *mem_req = NULL;
+  VkVideoSessionMemoryRequirementsKHR *mem = NULL;
+  VkBindVideoSessionMemoryInfoKHR *bind_mem = NULL;
+  VkResult res;
+  guint32 i, n_mems, index;
+  gboolean ret = FALSE;
+
+  g_return_val_if_fail (session && !session->session, FALSE);
+  g_return_val_if_fail (GST_IS_VULKAN_DEVICE (device), FALSE);
+  g_return_val_if_fail (vk, FALSE);
+  g_return_val_if_fail (session_create, FALSE);
+
+  res = vk->CreateVideoSession (device->device, session_create, NULL,
+      &vk_session);
+  if (gst_vulkan_error_to_g_error (res, error, "vkCreateVideoSessionKHR")
+      != VK_SUCCESS)
+    return FALSE;
+
+  session->session = gst_vulkan_handle_new_wrapped (device,
+      GST_VULKAN_HANDLE_TYPE_VIDEO_SESSION, (GstVulkanHandleTypedef) vk_session,
+      gst_vulkan_handle_free_video_session, vk->DestroyVideoSession);
+
+  res = vk->GetVideoSessionMemoryRequirements (device->device, vk_session,
+      &n_mems, NULL);
+  if (gst_vulkan_error_to_g_error (res, error,
+          "vkGetVideoSessionMemoryRequirementsKHR") != VK_SUCCESS)
+    goto beach;
+
+  session->buffer = gst_buffer_new ();
+  mem_req = g_new (VkMemoryRequirements2, n_mems);
+  mem = g_new (VkVideoSessionMemoryRequirementsKHR, n_mems);
+  bind_mem = g_new (VkBindVideoSessionMemoryInfoKHR, n_mems);
+
+  for (i = 0; i < n_mems; i++) {
+    /* *INDENT-OFF* */
+    mem_reqi = (VkMemoryRequirements2) {
+      .sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
+    };
+    memi = (VkVideoSessionMemoryRequirementsKHR) {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_MEMORY_REQUIREMENTS_KHR,
+      .memoryRequirements = mem_reqi.memoryRequirements,
+    };
+    /* *INDENT-ON* */
+  }
+  res = vk->GetVideoSessionMemoryRequirements (device->device, vk_session,
+      &n_mems, mem);
+  if (gst_vulkan_error_to_g_error (res, error,
+          "vkGetVideoSessionMemoryRequirementsKHR") != VK_SUCCESS)
+    goto beach;
+
+  for (i = 0; i < n_mems; i++) {
+    GstMemory *vk_mem;
+    VkPhysicalDeviceMemoryProperties *props;
+    VkMemoryPropertyFlags prop_flags;
+
+    props = &device->physical_device->memory_properties;
+    prop_flags = props->memoryTypesi.propertyFlags;
+    if (!gst_vulkan_memory_find_memory_type_index_with_requirements (device,
+            &memi.memoryRequirements, G_MAXUINT32, &index)) {
+      g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+          "Cannot find memory type for video session");
+      goto beach;
+    }
+
+    vk_mem = gst_vulkan_memory_alloc (device, index, NULL,
+        memi.memoryRequirements.size, prop_flags);
+    if (!vk_mem) {
+      g_set_error (error, GST_VULKAN_ERROR, VK_ERROR_INITIALIZATION_FAILED,
+          "Cannot allocate memory for video sesson");
+      goto beach;
+    }
+    gst_buffer_append_memory (session->buffer, vk_mem);
+
+    /* *INDENT-OFF* */
+    bind_memi = (VkBindVideoSessionMemoryInfoKHR) {
+      .sType = VK_STRUCTURE_TYPE_BIND_VIDEO_SESSION_MEMORY_INFO_KHR,
+      .memory = ((GstVulkanMemory *) vk_mem)->mem_ptr,
+      .memoryBindIndex = memi.memoryBindIndex,
+      .memorySize = vk_mem->size,
+    };
+    /* *INDENT-ON* */
+  }
+
+  res =
+      vk->BindVideoSessionMemory (device->device, vk_session, n_mems, bind_mem);
+  if (gst_vulkan_error_to_g_error (res, error, "vkBindVideoSessionMemoryKHR")
+      != VK_SUCCESS)
+    goto beach;
+
+  ret = TRUE;
+
+beach:
+  g_free (mem_req);
+  g_free (mem);
+  g_free (bind_mem);
+
+  return ret;
+}
+
+void
+gst_vulkan_video_session_destroy (GstVulkanVideoSession * session)
+{
+  g_return_if_fail (session);
+
+  gst_clear_vulkan_handle (&session->session);
+  gst_clear_buffer (&session->buffer);
+}
+
+GstBuffer *
+gst_vulkan_video_codec_buffer_new (GstVulkanDevice * device,
+    const GstVulkanVideoProfile * profile, VkBufferUsageFlags usage, gsize size)
+{
+  GstMemory *mem;
+  GstBuffer *buf;
+  VkVideoProfileListInfoKHR profile_list = {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_LIST_INFO_KHR,
+    .profileCount = 1,
+    .pProfiles = &profile->profile,
+  };
+  VkBufferCreateInfo buf_info = {
+    .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
+    .pNext = &profile_list,
+    .usage = usage,
+    .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
+    .size = size,
+  };
+
+  buf_info.size = MAX (buf_info.size, 1024 * 1024);
+
+  mem = gst_vulkan_buffer_memory_alloc_with_buffer_info (device, &buf_info,
+      VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
+
+  if (!mem)
+    return NULL;
+
+  buf = gst_buffer_new ();
+  gst_buffer_append_memory (buf, mem);
+  return buf;
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkvideo-private.h Added

@@ -0,0 +1,90 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/vulkan/gstvkapi.h>
+#include <gst/vulkan/gstvkvideoutils.h>
+
+G_BEGIN_DECLS
+
+#define VK_CODEC_VER_MAJ(ver) (ver >> 22)
+#define VK_CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1))
+#define VK_CODEC_VER_REV(ver) (ver & ((1 << 12) - 1))
+#define VK_CODEC_VERSION(ver) VK_CODEC_VER_MAJ (ver), VK_CODEC_VER_MIN (ver), VK_CODEC_VER_REV (ver)
+
+typedef struct _GstVulkanVideoFunctions GstVulkanVideoFunctions;
+typedef struct _GstVulkanVideoSession GstVulkanVideoSession;
+
+struct _GstVulkanVideoSession
+{
+  GstVulkanHandle *session;
+  GstBuffer *buffer;
+};
+
+typedef enum {
+  GST_VK_VIDEO_EXTENSION_DECODE_H264,
+  GST_VK_VIDEO_EXTENSION_DECODE_H265,
+} GST_VK_VIDEO_EXTENSIONS;
+
+#define GST_VULKAN_VIDEO_FN_LIST(V)                                            \
+  V(GetPhysicalDeviceVideoFormatProperties)                                    \
+  V(GetPhysicalDeviceVideoCapabilities)                                        \
+  V(CreateVideoSession)                                                        \
+  V(DestroyVideoSession)                                                       \
+  V(GetVideoSessionMemoryRequirements)                                         \
+  V(DestroyVideoSessionParameters)                                             \
+  V(UpdateVideoSessionParameters)                                              \
+  V(CreateVideoSessionParameters)                                              \
+  V(BindVideoSessionMemory)                                                    \
+  V(CmdPipelineBarrier2)                                                       \
+  V(CmdBeginVideoCoding)                                                       \
+  V(CmdControlVideoCoding)                                                     \
+  V(CmdEndVideoCoding)                                                         \
+  V(CmdDecodeVideo)
+
+struct _GstVulkanVideoFunctions
+{
+#define DEFINE_FUNCTION(name) G_PASTE(G_PASTE(PFN_vk, name), KHR) name;
+    GST_VULKAN_VIDEO_FN_LIST (DEFINE_FUNCTION)
+#undef DEFINE_FUNCTION
+};
+
+extern const VkExtensionProperties _vk_codec_extensions2;
+extern const VkComponentMapping _vk_identity_component_map;
+
+gboolean                gst_vulkan_video_get_vk_functions       (GstVulkanInstance * instance,
+                                                                 GstVulkanVideoFunctions * vk_funcs);
+
+gboolean                gst_vulkan_video_session_create         (GstVulkanVideoSession * session,
+                                                                 GstVulkanDevice * device,
+                                                                 GstVulkanVideoFunctions * vk,
+                                                                 VkVideoSessionCreateInfoKHR * session_create,
+                                                                 GError ** error);
+
+void                    gst_vulkan_video_session_destroy        (GstVulkanVideoSession * session);
+
+GstBuffer *             gst_vulkan_video_codec_buffer_new       (GstVulkanDevice * device,
+                                                                 const GstVulkanVideoProfile *profile,
+                                                                 VkBufferUsageFlags usage,
+                                                                 gsize size);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/gstvkvideofilter.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkvideofilter.c Changed

@@ -165,37 +165,6 @@
   GstVulkanQueue *queue;
 };
 
-static gboolean
-_choose_queue (GstVulkanDevice * device, GstVulkanQueue * queue,
-    struct choose_data *data)
-{
-  guint flags =
-      device->physical_device->queue_family_propsqueue->family.queueFlags;
-
-  if ((flags & VK_QUEUE_GRAPHICS_BIT) != 0) {
-    if (data->queue)
-      gst_object_unref (data->queue);
-    data->queue = gst_object_ref (queue);
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-static GstVulkanQueue *
-_find_graphics_queue (GstVulkanVideoFilter * filter)
-{
-  struct choose_data data;
-
-  data.filter = filter;
-  data.queue = NULL;
-
-  gst_vulkan_device_foreach_queue (filter->device,
-      (GstVulkanDeviceForEachQueueFunc) _choose_queue, &data);
-
-  return data.queue;
-}
-
 static GstCaps *
 gst_vulkan_video_filter_transform_caps (GstBaseTransform * bt,
     GstPadDirection direction, GstCaps * caps, GstCaps * filter)
@@ -278,9 +247,11 @@
   config = gst_buffer_pool_get_config (pool);
 
   gst_buffer_pool_config_set_params (config, caps, size, min, max);
-  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
 
-  gst_buffer_pool_set_config (pool, config);
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    gst_object_unref (pool);
+    return FALSE;
+  }
 
   if (update_pool)
     gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
@@ -319,7 +290,8 @@
   if (!gst_vulkan_queue_run_context_query (GST_ELEMENT (render),
           &render->queue)) {
     GST_DEBUG_OBJECT (render, "No queue retrieved from peer elements");
-    render->queue = _find_graphics_queue (render);
+    render->queue =
+        gst_vulkan_device_select_queue (render->device, VK_QUEUE_GRAPHICS_BIT);
   }
   if (!render->queue)
     return FALSE;

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkvideoutils.c Added

@@ -0,0 +1,413 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstvkvideoutils.h"
+
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+/* *INDENT-OFF* */
+static const struct {
+  GstVulkanVideoOperation video_operation;
+  VkVideoCodecOperationFlagBitsKHR codec;
+  const char *mime;
+  VkStructureType stype;
+} video_codecs_map = {
+  { GST_VULKAN_VIDEO_OPERATION_DECODE, VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR, "video/x-h264",
+      VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR },
+  { GST_VULKAN_VIDEO_OPERATION_DECODE, VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR, "video/x-h265",
+      VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR },
+};
+
+static const struct {
+  VkVideoChromaSubsamplingFlagBitsKHR chroma;
+  const char *chroma_str;
+} video_chroma_map = {
+  { VK_VIDEO_CHROMA_SUBSAMPLING_420_BIT_KHR, "4:2:0" },
+  { VK_VIDEO_CHROMA_SUBSAMPLING_422_BIT_KHR, "4:2:2" },
+  { VK_VIDEO_CHROMA_SUBSAMPLING_444_BIT_KHR, "4:4:4" },
+};
+
+static const struct {
+  VkVideoComponentBitDepthFlagBitsKHR bitdepth;
+  int bit_depth;
+} bit_depth_map = {
+  {VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR, 8},
+  {VK_VIDEO_COMPONENT_BIT_DEPTH_10_BIT_KHR, 10},
+  {VK_VIDEO_COMPONENT_BIT_DEPTH_12_BIT_KHR, 12},
+};
+
+static const struct {
+  StdVideoH264ProfileIdc vk_profile;
+  const char *profile_str;
+} h264_profile_map = {
+  { STD_VIDEO_H264_PROFILE_IDC_BASELINE, "baseline" },
+  { STD_VIDEO_H264_PROFILE_IDC_MAIN, "main" },
+  { STD_VIDEO_H264_PROFILE_IDC_HIGH, "high" },
+  { STD_VIDEO_H264_PROFILE_IDC_HIGH_444_PREDICTIVE, "high-4:4:4" },
+};
+
+static const struct {
+  VkVideoDecodeH264PictureLayoutFlagBitsKHR layout;
+  const char *layout_str;
+} h264_layout_map = {
+  { VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_PROGRESSIVE_KHR, "progressive" },
+  { VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_INTERLACED_INTERLEAVED_LINES_BIT_KHR,
+      "interleaved" },
+  { VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_INTERLACED_SEPARATE_PLANES_BIT_KHR,
+      "fields" },
+};
+
+static const struct {
+  StdVideoH265ProfileIdc vk_profile;
+  const char *profile_str;
+} h265_profile_map = {
+  { STD_VIDEO_H265_PROFILE_IDC_MAIN, "main" },
+  { STD_VIDEO_H265_PROFILE_IDC_MAIN_10, "main-10" },
+  { STD_VIDEO_H265_PROFILE_IDC_MAIN_STILL_PICTURE, "main-still-picture" },
+  { STD_VIDEO_H265_PROFILE_IDC_FORMAT_RANGE_EXTENSIONS,
+      "format-range-extensions" },
+  { STD_VIDEO_H265_PROFILE_IDC_SCC_EXTENSIONS, "scc-extensions" },
+};
+
+/* *INDENT-ON* */
+#endif
+
+/**
+ * gst_vulkan_video_profile_to_caps: (skip)
+ * @profile: #GstVulkanVideoProfile to convert into a #GstCaps
+ *
+ * Returns: (transfer full): a #GstCaps from @profile
+ *
+ * Since: 1.24
+ */
+GstCaps *
+gst_vulkan_video_profile_to_caps (const GstVulkanVideoProfile * profile)
+{
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  const char *mime, *chroma_sub, *profile_str = NULL, *layout = NULL;
+  int i, luma, chroma;
+  GstCaps *caps;
+
+  g_return_val_if_fail (profile
+      && profile->profile.sType == VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR,
+      NULL);
+
+  for (i = 0; i < G_N_ELEMENTS (video_codecs_map); i++) {
+    if (profile->profile.videoCodecOperation == video_codecs_mapi.codec) {
+      mime = video_codecs_mapi.mime;
+
+      switch (profile->profile.videoCodecOperation) {
+        case VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR:
+          if (profile->codec.h264dec.sType == video_codecs_mapi.stype) {
+            int j;
+            for (j = 0; j < G_N_ELEMENTS (h264_profile_map); j++) {
+              if (profile->codec.h264dec.stdProfileIdc
+                  == h264_profile_mapj.vk_profile) {
+                profile_str = h264_profile_mapj.profile_str;
+                break;
+              }
+            }
+            for (j = 0; j < G_N_ELEMENTS (h264_layout_map); j++) {
+              if (profile->codec.h264dec.pictureLayout
+                  == h264_layout_mapj.layout) {
+                layout = h264_layout_mapj.layout_str;
+                break;
+              }
+            }
+          }
+          break;
+        case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR:
+          if (profile->codec.h265dec.sType == video_codecs_mapi.stype) {
+            int j;
+            for (j = 0; j < G_N_ELEMENTS (h265_profile_map); j++) {
+              if (profile->codec.h265dec.stdProfileIdc
+                  == h265_profile_mapj.vk_profile)
+                profile_str = h265_profile_mapj.profile_str;
+            }
+          }
+          break;
+        default:
+          break;
+      }
+
+      break;
+    }
+  }
+  if (i == G_N_ELEMENTS (video_codecs_map))
+    return NULL;
+
+  for (i = 0; i < G_N_ELEMENTS (video_chroma_map); i++) {
+    if (profile->profile.chromaSubsampling == video_chroma_mapi.chroma) {
+      chroma_sub = video_chroma_mapi.chroma_str;
+      break;
+    }
+  }
+  if (i == G_N_ELEMENTS (video_chroma_map))
+    return NULL;
+
+  for (i = 0; i < G_N_ELEMENTS (bit_depth_map); i++) {
+    if (profile->profile.chromaBitDepth == bit_depth_mapi.bitdepth) {
+      chroma = bit_depth_mapi.bit_depth;
+      break;
+    }
+  }
+  if (i == G_N_ELEMENTS (bit_depth_map))
+    return NULL;
+
+  for (i = 0; i < G_N_ELEMENTS (bit_depth_map); i++) {
+    if (profile->profile.lumaBitDepth == bit_depth_mapi.bitdepth) {
+      luma = bit_depth_mapi.bit_depth;
+      break;
+    }
+  }
+  if (i == G_N_ELEMENTS (bit_depth_map))
+    return NULL;
+
+  caps = gst_caps_new_simple (mime, "chroma-format", G_TYPE_STRING, chroma_sub,
+      "bit-depth-luma", G_TYPE_UINT, luma, "bit-depth-chroma", G_TYPE_UINT,
+      chroma, NULL);
+
+  if (profile_str)
+    gst_caps_set_simple (caps, "profile", G_TYPE_STRING, profile_str, NULL);
+  if (layout)
+    gst_caps_set_simple (caps, "interlace-mode", G_TYPE_STRING, layout, NULL);
+
+  return caps;
+
+#endif
+  return NULL;
+}
+
+/**
+ * gst_vulkan_video_profile_from_caps: (skip)
+ * @profile: (out): the output profile
+ * @caps: a #GstCaps to parse
+ * @video_operation: a supported video operation
+ *
+ * Returns: %TRUE if @caps was parsed correctly, otherwise %FALSE
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_vulkan_video_profile_from_caps (GstVulkanVideoProfile * profile,
+    GstCaps * caps, GstVulkanVideoOperation video_operation)
+{
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  const GstStructure *structure;
+  const gchar *mime, *chroma_sub, *profile_str = NULL, *layout = NULL;
+  gint i, luma, chroma;
+
+  g_return_val_if_fail (GST_IS_CAPS (caps), FALSE);
+  g_return_val_if_fail (profile, FALSE);
+  g_return_val_if_fail (video_operation < GST_VULKAN_VIDEO_OPERATION_UNKNOWN,
+      FALSE);
+
+  structure = gst_caps_get_structure (caps, 0);
+
+  profile->usage.decode.sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR;
+  profile->usage.decode.videoUsageHints = VK_VIDEO_DECODE_USAGE_DEFAULT_KHR;
+
+  profile->profile.sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR;
+  profile->profile.pNext = &profile->usage;
+
+  mime = gst_structure_get_name (structure);
+  for (i = 0; i < G_N_ELEMENTS (video_codecs_map); i++) {
+    if ((video_codecs_mapi.video_operation == video_operation)
+        && (g_strcmp0 (video_codecs_mapi.mime, mime) == 0)) {
+      profile->profile.videoCodecOperation = video_codecs_mapi.codec;
+
+      switch (profile->profile.videoCodecOperation) {
+        case VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR:{
+          int j;
+
+          profile->codec.h264dec.sType = video_codecs_mapi.stype;
+          profile->codec.h264dec.stdProfileIdc =
+              STD_VIDEO_H264_PROFILE_IDC_INVALID;
+          profile->codec.h264dec.pictureLayout =
+              VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_FLAG_BITS_MAX_ENUM_KHR;
+          profile->usage.decode.pNext = &profile->codec;
+
+          profile_str = gst_structure_get_string (structure, "profile");
+          for (j = 0; profile_str && j < G_N_ELEMENTS (h264_profile_map); j++) {
+            if (g_strcmp0 (profile_str, h264_profile_mapj.profile_str) == 0) {
+              profile->codec.h264dec.stdProfileIdc =
+                  h264_profile_mapj.vk_profile;
+              break;
+            }
+          }
+          layout = gst_structure_get_string (structure, "interlace-mode");
+          for (j = 0; layout && j < G_N_ELEMENTS (h264_layout_map); j++) {
+            if (g_strcmp0 (layout, h264_layout_mapj.layout_str) == 0) {
+              profile->codec.h264dec.pictureLayout = h264_layout_mapj.layout;
+              break;
+            }
+          }
+          break;
+        }
+        case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR:{
+          int j;
+
+          profile->codec.h265dec.sType = video_codecs_mapi.stype;
+          profile->codec.h265dec.stdProfileIdc =
+              STD_VIDEO_H265_PROFILE_IDC_INVALID;
+          profile->usage.decode.pNext = &profile->codec;
+
+          profile_str = gst_structure_get_string (structure, "profile");
+          for (j = 0; profile_str && j < G_N_ELEMENTS (h265_profile_map); j++) {
+            if (g_strcmp0 (profile_str, h265_profile_mapj.profile_str) == 0) {
+              profile->codec.h265dec.stdProfileIdc =
+                  h265_profile_mapj.vk_profile;
+              break;
+            }
+          }
+          break;
+        }
+        default:
+          profile->usage.decode.pNext = NULL;
+          break;
+      }
+
+      break;
+    }
+  }
+  if (i == G_N_ELEMENTS (video_codecs_map))
+    return FALSE;
+  chroma_sub = gst_structure_get_string (structure, "chroma-format");
+  if (!chroma_sub)
+    return FALSE;
+  if (!gst_structure_get (structure, "bit-depth-luma", G_TYPE_UINT, &luma,
+          "bit-depth-chroma", G_TYPE_UINT, &chroma, NULL))
+    return FALSE;
+
+  for (i = 0; i < G_N_ELEMENTS (video_chroma_map); i++) {
+    if (g_strcmp0 (chroma_sub, video_chroma_mapi.chroma_str) == 0) {
+      profile->profile.chromaSubsampling = video_chroma_mapi.chroma;
+      break;
+    }
+  }
+  if (i == G_N_ELEMENTS (video_chroma_map))
+    return FALSE;
+
+  for (i = 0; i < G_N_ELEMENTS (bit_depth_map); i++) {
+    if (luma == bit_depth_mapi.bit_depth) {
+      profile->profile.lumaBitDepth = bit_depth_mapi.bitdepth;
+      break;
+    }
+  }
+  if (i == G_N_ELEMENTS (bit_depth_map))
+    return FALSE;
+
+  for (i = 0; i < G_N_ELEMENTS (bit_depth_map); i++) {
+    if (chroma == bit_depth_mapi.bit_depth) {
+      profile->profile.chromaBitDepth = bit_depth_mapi.bitdepth;
+      break;
+    }
+  }
+  if (i == G_N_ELEMENTS (bit_depth_map))
+    return FALSE;
+#endif
+  return TRUE;
+}
+
+/**
+ * gst_vulkan_video_profile_is_valid: (skip)
+ * @profile: the output profile
+ * @codec: VkVideoCodecOperationFlagBitsKHR described by @profile
+ *
+ * Returns: %TRUE if @profile is correct and matches with @codec
+ *
+ * Since: 1.24
+ */
+gboolean
+gst_vulkan_video_profile_is_valid (GstVulkanVideoProfile * profile, guint codec)
+{
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  int i;
+  VkVideoCodecOperationFlagBitsKHR op = codec;
+  VkStructureType stype = VK_STRUCTURE_TYPE_MAX_ENUM;
+
+  if (op == VK_VIDEO_CODEC_OPERATION_NONE_KHR)
+    return FALSE;
+
+  if (profile->profile.videoCodecOperation != op)
+    return FALSE;
+
+  for (i = 0; i < G_N_ELEMENTS (video_codecs_map); i++) {
+    if (op == video_codecs_mapi.codec) {
+      stype = video_codecs_mapi.stype;
+      break;
+    }
+  }
+
+  if (stype == VK_STRUCTURE_TYPE_MAX_ENUM)
+    return FALSE;
+
+  if (profile->codec.base.sType != stype)
+    return FALSE;
+
+  return TRUE;
+
+#endif
+  return FALSE;
+}
+
+/**
+ * gst_vulkan_video_profile_is_equal:
+ * @a: a #GstVulkanVideoProfile
+ * @b: another #GstVulkanVideoProfile
+ *
+ * Returns: whether @a and @b contains the same information.
+ */
+gboolean
+gst_vulkan_video_profile_is_equal (const GstVulkanVideoProfile * a,
+    const GstVulkanVideoProfile * b)
+{
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  gboolean profile;
+
+  g_return_val_if_fail (a && b, FALSE);
+
+  profile = ((a->profile.videoCodecOperation == b->profile.videoCodecOperation)
+      && (a->profile.chromaSubsampling == b->profile.chromaSubsampling)
+      && (a->profile.chromaBitDepth == b->profile.chromaBitDepth)
+      && (a->profile.lumaBitDepth == b->profile.lumaBitDepth)
+      && (a->codec.base.sType == b->codec.base.sType));
+
+  if (!profile)
+    return FALSE;
+
+  switch (a->profile.videoCodecOperation) {
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR:
+      return ((a->codec.h264dec.stdProfileIdc == b->codec.h264dec.stdProfileIdc)
+          && a->codec.h264dec.pictureLayout == b->codec.h264dec.pictureLayout);
+    case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR:
+      return (a->codec.h265dec.stdProfileIdc == b->codec.h265dec.stdProfileIdc);
+    default:
+      return FALSE;
+  }
+
+  g_assert_not_reached ();
+#else
+  return FALSE;
+#endif
+}

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/gstvkvideoutils.h Added

@@ -0,0 +1,102 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/vulkan/gstvkapi.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GstVulkanVideoProfile:
+ * @profile: the generic vulkan video profile
+ * @codec: the specific codec profile
+ *
+ * Since: 1.24
+ */
+struct _GstVulkanVideoProfile
+{
+  /*< private >*/
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  VkVideoProfileInfoKHR profile;
+  union {
+    VkVideoDecodeUsageInfoKHR decode;
+  } usage;
+
+  union {
+    VkBaseInStructure base;
+    VkVideoDecodeH264ProfileInfoKHR h264dec;
+    VkVideoDecodeH265ProfileInfoKHR h265dec;
+  } codec;
+#endif
+  gpointer _reservedGST_PADDING;
+};
+
+/**
+ * GstVulkanVideoCapabilities:
+ *
+ * Since: 1.24
+ */
+struct _GstVulkanVideoCapabilities
+{
+  /*< private >*/
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+  VkVideoCapabilitiesKHR caps;
+  union
+  {
+    VkBaseInStructure base;
+    VkVideoDecodeH264CapabilitiesKHR h264dec;
+    VkVideoDecodeH265CapabilitiesKHR h265dec;
+  } codec;
+#endif
+  gpointer _reservedGST_PADDING;
+};
+
+/**
+ * GstVulkanVideoOperation:
+ * @GST_VULKAN_VIDEO_OPERATION_DECODE: decode operation
+ * @GST_VULKAN_VIDEO_OPERATION_ENCODE: encode operation
+ * @GST_VULKAN_VIDEO_OPERATION_UNKNOWN: unknown
+ *
+ * The type of video operation.
+ *
+ * Since: 1.24
+ */
+typedef enum  {
+  GST_VULKAN_VIDEO_OPERATION_DECODE = 0,
+  GST_VULKAN_VIDEO_OPERATION_ENCODE,
+  GST_VULKAN_VIDEO_OPERATION_UNKNOWN,
+} GstVulkanVideoOperation;
+
+GST_VULKAN_API
+GstCaps *               gst_vulkan_video_profile_to_caps        (const GstVulkanVideoProfile * profile);
+GST_VULKAN_API
+gboolean                gst_vulkan_video_profile_from_caps      (GstVulkanVideoProfile * profile,
+                                                                 GstCaps * caps,
+                                                                 GstVulkanVideoOperation video_operation);
+GST_VULKAN_API
+gboolean                gst_vulkan_video_profile_is_valid       (GstVulkanVideoProfile * profile,
+                                                                 guint codec);
+GST_VULKAN_API
+gboolean                gst_vulkan_video_profile_is_equal       (const GstVulkanVideoProfile * a,
+                                                                 const GstVulkanVideoProfile * b);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/meson.build Changed

@@ -27,11 +27,13 @@
   'gstvkimageview.c',
   'gstvkinstance.c',
   'gstvkmemory.c',
+  'gstvkoperation.c',
   'gstvkphysicaldevice.c',
   'gstvkqueue.c',
   'gstvkswapper.c',
   'gstvktrash.c',
   'gstvkvideofilter.c',
+  'gstvkvideoutils.c',
   'gstvkutils.c',
   'gstvkwindow.c',
 )
@@ -60,12 +62,14 @@
   'gstvkimageview.h',
   'gstvkinstance.h',
   'gstvkmemory.h',
+  'gstvkoperation.h',
   'gstvkphysicaldevice.h',
   'gstvkqueue.h',
   'gstvkswapper.h',
   'gstvktrash.h',
   'gstvkutils.h',
   'gstvkvideofilter.h',
+  'gstvkvideoutils.h',
   'gstvkwindow.h',
   'vulkan-prelude.h',
   'vulkan_fwd.h',
@@ -95,6 +99,7 @@
     'GST_VULKAN_HAVE_WINDOW_IOS',
     'GST_VULKAN_HAVE_WINDOW_WIN32',
     'GST_VULKAN_HAVE_WINDOW_ANDROID',
+    'GST_VULKAN_HAVE_VIDEO_EXTENSIONS',
 
 
 foreach option : vulkan_conf_options
@@ -173,12 +178,32 @@
 endif
 
 wayland_client_dep = dependency('wayland-client', version : '>=1.4', required : get_option('wayland'))
-if wayland_client_dep.found() and cc.has_header('vulkan/vulkan_wayland.h', dependencies : vulkan_dep)
+wayland_protocols_dep = dependency('wayland-protocols', version : '>= 1.15', required : get_option('wayland'))
+wayland_scanner = find_program('wayland-scanner', required: get_option('wayland'))
+if wayland_client_dep.found() and wayland_protocols_dep.found() and wayland_scanner.found() and cc.has_header('vulkan/vulkan_wayland.h', dependencies : vulkan_dep)
+  # Generate the XDG shell interface
+  wayland_protocols_basedir = wayland_protocols_dep.get_variable('pkgdatadir')
+  xdg_shell_xml_spec = join_paths(wayland_protocols_basedir, 'stable', 'xdg-shell', 'xdg-shell.xml')
+  xdg_shell_header = custom_target('xdg-shell-client-header',
+    command:  wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@' ,
+    input: xdg_shell_xml_spec,
+    output: 'xdg-shell-client-protocol.h',
+  )
+  xdg_shell_code = custom_target('xdg-shell-client-code',
+    command:  wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@' ,
+    input: xdg_shell_xml_spec,
+    output: 'xdg-shell-client-protocol.c',
+  )
+
   vulkan_priv_sources += files(
     'wayland/gstvkdisplay_wayland.c',
     'wayland/gstvkwindow_wayland.c',
     'wayland/wayland_event_source.c',
   )
+  vulkan_priv_sources += 
+    xdg_shell_header,
+    xdg_shell_code,
+  
   vulkan_wayland_sources += files(
     'wayland/gstvkdisplay_wayland.c',
   )
@@ -284,6 +309,42 @@
   endif
 endif
 
+if get_option('vulkan-video').allowed()
+  video_test = '''
+#include <vulkan/vulkan.h>
+
+#if !(defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 238))
+#error "Need at least Vulkan 1.3.238"
+#endif
+
+/* vk_video/vulkan_video_codec_h264std.h */
+static StdVideoH264SequenceParameterSet h264_sps;
+static StdVideoH264PictureParameterSet h264_pps;
+
+/* vk_video/vulkan_video_codec_h265std.h */
+static StdVideoH265SequenceParameterSet h265_sps;
+static StdVideoH265PictureParameterSet h265_pps;
+'''
+
+  if vulkan_inc_dir != ''
+    have_vk_video = cc.compiles(video_test, dependencies : vulkan_dep,  args: '-I' + vulkan_inc_dir)
+  else
+    have_vk_video = cc.compiles(video_test, dependencies : vulkan_dep)
+  endif
+  if have_vk_video
+    vulkan_conf.set('GST_VULKAN_HAVE_VIDEO_EXTENSIONS', 1)
+    vulkan_priv_sources += files('gstvkvideo-private.c')
+    vulkan_sources += files(
+      'gstvkdecoder.c',
+    )
+    vulkan_headers += files(
+      'gstvkdecoder.h'
+    )
+  elif get_option('vulkan-video').enabled()
+    error('Vulkan Video extensions headers not found')
+  endif
+endif
+
 gen_sources = 
 
 install_headers(vulkan_headers, subdir : 'gstreamer-1.0/gst/vulkan')
@@ -356,6 +417,7 @@
   library_def += {'gir': gir}
   if not static_build
     vulkan_gir = gnome.generate_gir(gstvulkan, kwargs: gir)
+    library_def += {'gir_targets':  library_def.get('gir_targets', ) + vulkan_gir}
     gen_sources += vulkan_gir
   endif
 endif
@@ -394,6 +456,7 @@
     if not static_build
       gir += {'includes' : 'Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0', vulkan_gir0 + extra_gir_includes}
       vulkan_xcb_gir = gnome.generate_gir(gstvulkan, kwargs: gir)
+      library_def += {'gir_targets':  library_def.get('gir_targets', ) + vulkan_xcb_gir}
     endif
 
     gir += {'includes' :'Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0', 'GstVulkan-1.0' + extra_gir_includes}
@@ -429,6 +492,7 @@
     if not static_build
       gir += {'includes' : 'Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0', vulkan_gir0 + extra_gir_includes}
       vulkan_wayland_gir += gnome.generate_gir(gstvulkan, kwargs: gir)
+      library_def += {'gir_targets':  library_def.get('gir_targets', ) + vulkan_wayland_gir}
     endif
     gir += {'includes' :'Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0', 'GstVulkan-1.0' + extra_gir_includes}
     library_def += {'gir':  library_def'gir' + gir}

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/vulkan.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/vulkan.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/vulkan_fwd.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/vulkan_fwd.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/wayland/gstvkdisplay_wayland.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/wayland/gstvkdisplay_wayland.c Changed

@@ -23,6 +23,7 @@
 #endif
 
 #include <gst/vulkan/wayland/gstvkdisplay_wayland.h>
+#include "gstvkdisplay_wayland_private.h"
 
 #include "wayland_event_source.h"
 
@@ -30,7 +31,8 @@
 #define GST_CAT_DEFAULT gst_vulkan_display_wayland_debug
 
 G_DEFINE_TYPE_WITH_CODE (GstVulkanDisplayWayland, gst_vulkan_display_wayland,
-    GST_TYPE_VULKAN_DISPLAY, GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT,
+    GST_TYPE_VULKAN_DISPLAY, G_ADD_PRIVATE (GstVulkanDisplayWayland);
+    GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT,
         "vulkandisplaywayland", 0, "Vulkan Wayland Display");
     );
 
@@ -39,10 +41,23 @@
     display);
 
 static void
+handle_xdg_wm_base_ping (void *user_data, struct xdg_wm_base *xdg_wm_base,
+    uint32_t serial)
+{
+  xdg_wm_base_pong (xdg_wm_base, serial);
+}
+
+static const struct xdg_wm_base_listener xdg_wm_base_listener = {
+  handle_xdg_wm_base_ping
+};
+
+static void
 registry_handle_global (void *data, struct wl_registry *registry,
     uint32_t name, const char *interface, uint32_t version)
 {
   GstVulkanDisplayWayland *display = data;
+  GstVulkanDisplayWaylandPrivate *priv =
+      gst_vulkan_display_wayland_get_instance_private (display);
 
   GST_TRACE_OBJECT (display, "registry_handle_global with registry %p, "
       "interface %s, version %u", registry, interface, version);
@@ -55,11 +70,28 @@
         wl_registry_bind (registry, name, &wl_subcompositor_interface, 1);
   } else if (g_strcmp0 (interface, "wl_shell") == 0) {
     display->shell = wl_registry_bind (registry, name, &wl_shell_interface, 1);
+  } else if (g_strcmp0 (interface, "xdg_wm_base") == 0) {
+    priv->xdg_wm_base =
+        wl_registry_bind (registry, name, &xdg_wm_base_interface, 1);
+    xdg_wm_base_add_listener (priv->xdg_wm_base, &xdg_wm_base_listener,
+        display);
   }
 }
 
+static void
+registry_handle_global_remove (void *data, struct wl_registry *registry,
+    uint32_t name)
+{
+  GstVulkanDisplayWayland *window_wayland = data;
+
+  /* TODO: deal with any registry objects that may be removed */
+  GST_TRACE_OBJECT (window_wayland, "wl_registry %p global_remove %"
+      G_GUINT32_FORMAT, registry, name);
+}
+
 static const struct wl_registry_listener registry_listener = {
-  registry_handle_global
+  registry_handle_global,
+  registry_handle_global_remove,
 };
 
 static void
@@ -71,6 +103,13 @@
   wl_display_roundtrip (display->display);
 }
 
+GstVulkanDisplayWaylandPrivate *
+gst_vulkan_display_wayland_get_private (GstVulkanDisplayWayland *
+    display_wayland)
+{
+  return gst_vulkan_display_wayland_get_instance_private (display_wayland);
+}
+
 static void
 gst_vulkan_display_wayland_class_init (GstVulkanDisplayWaylandClass * klass)
 {
@@ -156,7 +195,7 @@
  * Since: 1.18
  */
 GstVulkanDisplayWayland *
-gst_vulkan_display_wayland_new_with_display (struct wl_display * display)
+gst_vulkan_display_wayland_new_with_display (struct wl_display *display)
 {
   GstVulkanDisplayWayland *ret;

gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/wayland/gstvkdisplay_wayland_private.h Added

@@ -0,0 +1,39 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Matthew Waters <matthew@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gst/gst.h>
+#include "gstvkdisplay_wayland.h"
+#include <wayland-client.h>
+#include "gst/vulkan/xdg-shell-client-protocol.h"
+
+G_BEGIN_DECLS
+
+typedef struct _GstVulkanDisplayWaylandPrivate GstVulkanDisplayWaylandPrivate;
+
+struct _GstVulkanDisplayWaylandPrivate
+{
+  struct xdg_wm_base     *xdg_wm_base;
+};
+
+G_GNUC_INTERNAL
+GstVulkanDisplayWaylandPrivate *
+gst_vulkan_display_wayland_get_private (GstVulkanDisplayWayland * display_wayland);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c Changed

@@ -28,6 +28,7 @@
 
 #include <gst/vulkan/wayland/gstvkdisplay_wayland.h>
 #include "gstvkwindow_wayland.h"
+#include "gstvkdisplay_wayland_private.h"
 
 #include "wayland_event_source.h"
 
@@ -40,8 +41,8 @@
   static gsize _init = 0;
 
   if (g_once_init_enter (&_init)) {
-    GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkanwindowxcb", 0,
-        "Vulkan XCB Window");
+    GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkanwindowwayland", 0,
+        "Vulkan Wayland Window");
     g_once_init_leave (&_init, 1);
   }
 }
@@ -60,6 +61,84 @@
     window, GstVulkanDevice * device, guint32 queue_family_idx);
 
 static void
+handle_xdg_toplevel_close (void *data, struct xdg_toplevel *xdg_toplevel)
+{
+  GstVulkanWindow *window = data;
+
+  GST_DEBUG ("XDG toplevel got a \"close\" event.");
+
+  gst_vulkan_window_close (window);
+}
+
+static void
+handle_xdg_toplevel_configure (void *data, struct xdg_toplevel *xdg_toplevel,
+    int32_t width, int32_t height, struct wl_array *states)
+{
+#if 0
+  GstVulkanWindowWayland *window_wl = data;
+  const uint32_t *state;
+#endif
+  GST_DEBUG ("configure event on XDG toplevel %p, %ix%i", xdg_toplevel,
+      width, height);
+#if 0
+  // TODO: deal with resizes
+  if (width > 0 && height > 0)
+    window_resize (window_egl, width, height);
+#endif
+}
+
+static const struct xdg_toplevel_listener xdg_toplevel_listener = {
+  handle_xdg_toplevel_configure,
+  handle_xdg_toplevel_close,
+};
+
+static void
+handle_xdg_surface_configure (void *data, struct xdg_surface *xdg_surface,
+    uint32_t serial)
+{
+  xdg_surface_ack_configure (xdg_surface, serial);
+}
+
+static const struct xdg_surface_listener xdg_surface_listener = {
+  handle_xdg_surface_configure,
+};
+
+static void
+create_xdg_surface (GstVulkanWindowWayland * window_wl)
+{
+  GstVulkanDisplayWayland *display =
+      GST_VULKAN_DISPLAY_WAYLAND (GST_VULKAN_WINDOW (window_wl)->display);
+  GstVulkanDisplayWaylandPrivate *display_priv =
+      gst_vulkan_display_wayland_get_private (display);
+  struct xdg_surface *xdg_surface;
+  struct xdg_toplevel *xdg_toplevel;
+
+  GST_DEBUG ("Creating surfaces with XDG-shell");
+
+  /* First create the XDG surface */
+  xdg_surface = xdg_wm_base_get_xdg_surface (display_priv->xdg_wm_base,
+      window_wl->surface);
+  xdg_surface_add_listener (xdg_surface, &xdg_surface_listener, window_wl);
+
+  /* Then the XDG top-level */
+  xdg_toplevel = xdg_surface_get_toplevel (xdg_surface);
+  if (g_get_prgname ()) {
+    xdg_toplevel_set_app_id (xdg_toplevel, g_get_prgname ());
+  } else {
+    xdg_toplevel_set_app_id (xdg_toplevel, "org.gstreamer.wayland");
+  }
+  xdg_toplevel_set_title (xdg_toplevel, "Vulkan Renderer");
+  xdg_toplevel_add_listener (xdg_toplevel, &xdg_toplevel_listener, window_wl);
+
+  /* Commit the xdg_surface state */
+  wl_surface_commit (window_wl->surface);
+
+  /* And save them into the fields */
+  window_wl->xdg_surface = xdg_surface;
+  window_wl->xdg_toplevel = xdg_toplevel;
+}
+
+static void
 handle_ping (void *data, struct wl_shell_surface *shell_surface,
     uint32_t serial)
 {
@@ -98,18 +177,37 @@
 };
 
 static void
+create_wl_shell_surface (GstVulkanWindowWayland * window_wl)
+{
+  GstVulkanDisplayWayland *display =
+      GST_VULKAN_DISPLAY_WAYLAND (GST_VULKAN_WINDOW (window_wl)->display);
+
+  GST_DEBUG ("Creating surfaces with wl_shell");
+
+  window_wl->shell_surface =
+      wl_shell_get_shell_surface (display->shell, window_wl->surface);
+  if (window_wl->queue)
+    wl_proxy_set_queue ((struct wl_proxy *) window_wl->shell_surface,
+        window_wl->queue);
+
+  wl_shell_surface_add_listener (window_wl->shell_surface,
+      &shell_surface_listener, window_wl);
+
+  wl_shell_surface_set_title (window_wl->shell_surface, "Vulkan Renderer");
+  wl_shell_surface_set_toplevel (window_wl->shell_surface);
+  GST_DEBUG_OBJECT (window_wl, "Successfully created shell surface %p",
+      window_wl->shell_surface);
+}
+
+static void
 destroy_surfaces (GstVulkanWindowWayland * window_wl)
 {
   GST_DEBUG_OBJECT (window_wl, "destroying created surfaces");
 
-  if (window_wl->shell_surface) {
-    wl_shell_surface_destroy (window_wl->shell_surface);
-    window_wl->shell_surface = NULL;
-  }
-  if (window_wl->surface) {
-    wl_surface_destroy (window_wl->surface);
-    window_wl->surface = NULL;
-  }
+  g_clear_pointer (&window_wl->xdg_toplevel, xdg_toplevel_destroy);
+  g_clear_pointer (&window_wl->xdg_surface, xdg_surface_destroy);
+  g_clear_pointer (&window_wl->shell_surface, wl_shell_surface_destroy);
+  g_clear_pointer (&window_wl->surface, wl_surface_destroy);
 }
 
 static void
@@ -117,6 +215,8 @@
 {
   GstVulkanDisplayWayland *display =
       GST_VULKAN_DISPLAY_WAYLAND (GST_VULKAN_WINDOW (window_wl)->display);
+  GstVulkanDisplayWaylandPrivate *display_priv =
+      gst_vulkan_display_wayland_get_private (display);
   gint width, height;
 
   if (!window_wl->surface) {
@@ -126,20 +226,10 @@
           window_wl->queue);
   }
 
-  if (!window_wl->shell_surface) {
-    window_wl->shell_surface =
-        wl_shell_get_shell_surface (display->shell, window_wl->surface);
-    if (window_wl->queue)
-      wl_proxy_set_queue ((struct wl_proxy *) window_wl->shell_surface,
-          window_wl->queue);
-
-    wl_shell_surface_add_listener (window_wl->shell_surface,
-        &shell_surface_listener, window_wl);
-
-    wl_shell_surface_set_title (window_wl->shell_surface, "Vulkan Renderer");
-    wl_shell_surface_set_toplevel (window_wl->shell_surface);
-    GST_DEBUG_OBJECT (window_wl, "Successfully created shell surface %p",
-        window_wl->shell_surface);
+  if (display_priv->xdg_wm_base) {
+    create_xdg_surface (window_wl);
+  } else {
+    create_wl_shell_surface (window_wl);
   }
 
   if (window_wl->window_width > 0)

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/win32/gstvkwindow_win32.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/win32/gstvkwindow_win32.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwlbuffer.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwlbuffer.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwlbuffer.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwlbuffer.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwlcontext.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwlcontext.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwldisplay.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwldisplay.c Changed

@@ -26,10 +26,12 @@
 
 #include "fullscreen-shell-unstable-v1-client-protocol.h"
 #include "linux-dmabuf-unstable-v1-client-protocol.h"
+#include "single-pixel-buffer-v1-client-protocol.h"
 #include "viewporter-client-protocol.h"
 #include "xdg-shell-client-protocol.h"
 
 #include <errno.h>
+#include <drm_fourcc.h>
 
 #define GST_CAT_DEFAULT gst_wl_display_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
@@ -47,17 +49,21 @@
   struct wl_subcompositor *subcompositor;
   struct xdg_wm_base *xdg_wm_base;
   struct zwp_fullscreen_shell_v1 *fullscreen_shell;
+  struct wp_single_pixel_buffer_manager_v1 *single_pixel_buffer;
   struct wl_shm *shm;
   struct wp_viewporter *viewporter;
   struct zwp_linux_dmabuf_v1 *dmabuf;
   GArray *shm_formats;
   GArray *dmabuf_formats;
+  GArray *dmabuf_modifiers;
 
   /* private */
   gboolean own_display;
   GThread *thread;
   GstPoll *wl_fd_poll;
 
+  GRecMutex sync_mutex;
+
   GMutex buffers_mutex;
   GHashTable *buffers;
   gboolean shutting_down;
@@ -85,12 +91,14 @@
 
   priv->shm_formats = g_array_new (FALSE, FALSE, sizeof (uint32_t));
   priv->dmabuf_formats = g_array_new (FALSE, FALSE, sizeof (uint32_t));
+  priv->dmabuf_modifiers = g_array_new (FALSE, FALSE, sizeof (guint64));
   priv->wl_fd_poll = gst_poll_new (TRUE);
   priv->buffers = g_hash_table_new (g_direct_hash, g_direct_equal);
   g_mutex_init (&priv->buffers_mutex);
+  g_rec_mutex_init (&priv->sync_mutex);
 
   gst_wl_linux_dmabuf_init_once ();
-  gst_wl_shm_allocator_init_once ();
+  gst_shm_allocator_init_once ();
   gst_wl_videoformat_init_once ();
 }
 
@@ -123,9 +131,11 @@
 
   g_array_unref (priv->shm_formats);
   g_array_unref (priv->dmabuf_formats);
+  g_array_unref (priv->dmabuf_modifiers);
   gst_poll_free (priv->wl_fd_poll);
   g_hash_table_unref (priv->buffers);
   g_mutex_clear (&priv->buffers_mutex);
+  g_rec_mutex_clear (&priv->sync_mutex);
 
   if (priv->viewporter)
     wp_viewporter_destroy (priv->viewporter);
@@ -142,6 +152,9 @@
   if (priv->fullscreen_shell)
     zwp_fullscreen_shell_v1_release (priv->fullscreen_shell);
 
+  if (priv->single_pixel_buffer)
+    wp_single_pixel_buffer_manager_v1_destroy (priv->single_pixel_buffer);
+
   if (priv->compositor)
     wl_compositor_destroy (priv->compositor);
 
@@ -182,21 +195,59 @@
 dmabuf_format (void *data, struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf,
     uint32_t format)
 {
+}
+
+static void
+dmabuf_modifier (void *data, struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf,
+    uint32_t format, uint32_t modifier_hi, uint32_t modifier_lo)
+{
   GstWlDisplay *self = data;
+  guint64 modifier = (guint64) modifier_hi << 32 | modifier_lo;
+  static gboolean table_header = TRUE;
+
   GstWlDisplayPrivate *priv = gst_wl_display_get_instance_private (self);
 
-  if (gst_wl_dmabuf_format_to_video_format (format) != GST_VIDEO_FORMAT_UNKNOWN)
+  if (gst_wl_dmabuf_format_to_video_format (format) != GST_VIDEO_FORMAT_UNKNOWN) {
+    GstVideoFormat gst_format = gst_wl_dmabuf_format_to_video_format (format);
+    const guint32 fourcc = gst_video_dma_drm_fourcc_from_format (gst_format);
+
+    /*
+     * Ignore unsupported formats along with implicit modifiers. Implicit
+     * modifiers have been source of garbled output for many many years and it
+     * was decided that we prefer disabling zero-copy over risking a bad output.
+     */
+    if (fourcc == DRM_FORMAT_INVALID || modifier == DRM_FORMAT_MOD_INVALID)
+      return;
+
+    if (table_header == TRUE) {
+      GST_INFO ("===== All DMA Formats With Modifiers =====");
+      GST_INFO ("| Gst Format   | DRM Format              |");
+      table_header = FALSE;
+    }
+
+    if (modifier == 0)
+      GST_INFO ("|-----------------------------------------");
+
+    GST_INFO ("| %-12s | %-23s |",
+        (modifier == 0) ? gst_video_format_to_string (gst_format) : "",
+        gst_video_dma_drm_fourcc_to_string (fourcc, modifier));
+
     g_array_append_val (priv->dmabuf_formats, format);
+    g_array_append_val (priv->dmabuf_modifiers, modifier);
+  }
 }
 
 static const struct zwp_linux_dmabuf_v1_listener dmabuf_listener = {
   dmabuf_format,
+  dmabuf_modifier,
 };
 
 gboolean
-gst_wl_display_check_format_for_shm (GstWlDisplay * self, GstVideoFormat format)
+gst_wl_display_check_format_for_shm (GstWlDisplay * self,
+    const GstVideoInfo * video_info)
 {
   GstWlDisplayPrivate *priv = gst_wl_display_get_instance_private (self);
+  GstVideoFormat format = GST_VIDEO_INFO_FORMAT (video_info);
   enum wl_shm_format shm_fmt;
   GArray *formats;
   guint i;
@@ -216,23 +267,25 @@
 
 gboolean
 gst_wl_display_check_format_for_dmabuf (GstWlDisplay * self,
-    GstVideoFormat format)
+    const GstVideoInfoDmaDrm * drm_info)
 {
   GstWlDisplayPrivate *priv = gst_wl_display_get_instance_private (self);
-  GArray *formats;
-  guint i, dmabuf_fmt;
+  guint64 modifier = drm_info->drm_modifier;
+  guint fourcc = drm_info->drm_fourcc;
+  GArray *formats, *modifiers;
+  guint i;
 
   if (!priv->dmabuf)
     return FALSE;
 
-  dmabuf_fmt = gst_video_format_to_wl_dmabuf_format (format);
-  if (dmabuf_fmt == (guint) - 1)
-    return FALSE;
-
   formats = priv->dmabuf_formats;
+  modifiers = priv->dmabuf_modifiers;
   for (i = 0; i < formats->len; i++) {
-    if (g_array_index (formats, uint32_t, i) == dmabuf_fmt)
-      return TRUE;
+    if (g_array_index (formats, uint32_t, i) == fourcc) {
+      if (g_array_index (modifiers, guint64, i) == modifier) {
+        return TRUE;
+      }
+    }
   }
 
   return FALSE;
@@ -277,8 +330,12 @@
         wl_registry_bind (registry, id, &wp_viewporter_interface, 1);
   } else if (g_strcmp0 (interface, "zwp_linux_dmabuf_v1") == 0) {
     priv->dmabuf =
-        wl_registry_bind (registry, id, &zwp_linux_dmabuf_v1_interface, 1);
+        wl_registry_bind (registry, id, &zwp_linux_dmabuf_v1_interface, 3);
     zwp_linux_dmabuf_v1_add_listener (priv->dmabuf, &dmabuf_listener, self);
+  } else if (g_strcmp0 (interface, "wp_single_pixel_buffer_manager_v1") == 0) {
+    priv->single_pixel_buffer =
+        wl_registry_bind (registry, id,
+        &wp_single_pixel_buffer_manager_v1_interface, 1);
   }
 }
 
@@ -307,8 +364,10 @@
 
   /* main loop */
   while (1) {
+    g_rec_mutex_lock (&priv->sync_mutex);
     while (wl_display_prepare_read_queue (priv->display, priv->queue) != 0)
       wl_display_dispatch_queue_pending (priv->display, priv->queue);
+    g_rec_mutex_unlock (&priv->sync_mutex);
     wl_display_flush (priv->display);
 
     if (gst_poll_wait (priv->wl_fd_poll, GST_CLOCK_TIME_NONE) < 0) {
@@ -321,7 +380,10 @@
     }
     if (wl_display_read_events (priv->display) == -1)
       goto error;
+
+    g_rec_mutex_lock (&priv->sync_mutex);
     wl_display_dispatch_queue_pending (priv->display, priv->queue);
+    g_rec_mutex_unlock (&priv->sync_mutex);
   }
 
   return NULL;
@@ -349,7 +411,7 @@
 }
 
 GstWlDisplay *
-gst_wl_display_new_existing (struct wl_display * display,
+gst_wl_display_new_existing (struct wl_display *display,
     gboolean take_ownership, GError ** error)
 {
   GstWlDisplay *self;
@@ -365,7 +427,12 @@
   priv->display_wrapper = wl_proxy_create_wrapper (display);
   priv->own_display = take_ownership;
 
+#ifdef HAVE_WL_EVENT_QUEUE_NAME
+  priv->queue = wl_display_create_queue_with_name (priv->display,
+      "GStreamer display queue");
+#else
   priv->queue = wl_display_create_queue (priv->display);
+#endif
   wl_proxy_set_queue ((struct wl_proxy *) priv->display_wrapper, priv->queue);
   priv->registry = wl_display_get_registry (priv->display_wrapper);
   wl_registry_add_listener (priv->registry, &registry_listener, self);
@@ -470,6 +537,51 @@
   g_mutex_unlock (&priv->buffers_mutex);
 }
 
+/* gst_wl_display_sync
+ *
+ * A syncronized version of `wl_display_sink` that ensures that the
+ * callback will not be dispatched before the listener has been attached.
+ */
+struct wl_callback *
+gst_wl_display_sync (GstWlDisplay * self,
+    const struct wl_callback_listener *listener, gpointer data)
+{
+  GstWlDisplayPrivate *priv = gst_wl_display_get_instance_private (self);
+  struct wl_callback *callback;
+
+  g_rec_mutex_lock (&priv->sync_mutex);
+
+  callback = wl_display_sync (priv->display_wrapper);
+  if (callback && listener)
+    wl_callback_add_listener (callback, listener, data);
+
+  g_rec_mutex_unlock (&priv->sync_mutex);
+
+  return callback;
+}
+
+/* gst_wl_display_callback_destroy
+ *
+ * A syncronized version of `wl_callback_destroy` that ensures that the
+ * once this function returns, the callback will either have already completed,
+ * or will never be called.
+ */
+void
+gst_wl_display_callback_destroy (GstWlDisplay * self,
+    struct wl_callback **callback)
+{
+  GstWlDisplayPrivate *priv = gst_wl_display_get_instance_private (self);
+
+  g_rec_mutex_lock (&priv->sync_mutex);
+
+  if (*callback) {
+    wl_callback_destroy (*callback);
+    *callback = NULL;
+  }
+
+  g_rec_mutex_unlock (&priv->sync_mutex);
+}
+
 struct wl_display *
 gst_wl_display_get_display (GstWlDisplay * self)
 {
@@ -551,6 +663,14 @@
 }
 
 GArray *
+gst_wl_display_get_dmabuf_modifiers (GstWlDisplay * self)
+{
+  GstWlDisplayPrivate *priv = gst_wl_display_get_instance_private (self);
+
+  return priv->dmabuf_modifiers;
+}
+
+GArray *
 gst_wl_display_get_dmabuf_formats (GstWlDisplay * self)
 {
   GstWlDisplayPrivate *priv = gst_wl_display_get_instance_private (self);
@@ -558,6 +678,14 @@
   return priv->dmabuf_formats;
 }
 
+struct wp_single_pixel_buffer_manager_v1 *
+gst_wl_display_get_single_pixel_buffer_manager_v1 (GstWlDisplay * self)
+{
+  GstWlDisplayPrivate *priv = gst_wl_display_get_instance_private (self);
+
+  return priv->single_pixel_buffer;
+}
+
 gboolean
 gst_wl_display_has_own_display (GstWlDisplay * self)
 {

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwldisplay.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwldisplay.h Changed

@@ -28,6 +28,8 @@
 G_BEGIN_DECLS
 
 #define GST_TYPE_WL_DISPLAY (gst_wl_display_get_type ())
+
+GST_WL_API
 G_DECLARE_FINAL_TYPE (GstWlDisplay, gst_wl_display, GST, WL_DISPLAY, GObject);
 
 struct _GstWlDisplay
@@ -51,15 +53,22 @@
 void gst_wl_display_unregister_buffer (GstWlDisplay * self, gpointer gstmem);
 
 GST_WL_API
+struct wl_callback * gst_wl_display_sync(GstWlDisplay * self, const struct wl_callback_listener *listener,
+	gpointer data);
+
+GST_WL_API
+void gst_wl_display_callback_destroy(GstWlDisplay * self, struct wl_callback ** callback);
+
+GST_WL_API
 gpointer gst_wl_display_lookup_buffer (GstWlDisplay * self, gpointer gstmem);
 
 GST_WL_API
 gboolean gst_wl_display_check_format_for_shm (GstWlDisplay * self,
-    GstVideoFormat format);
+    const GstVideoInfo *video_info);
 
 GST_WL_API
 gboolean gst_wl_display_check_format_for_dmabuf (GstWlDisplay * self,
-    GstVideoFormat format);
+    const GstVideoInfoDmaDrm *drm_info);
 
 GST_WL_API
 struct wl_display *gst_wl_display_get_display (GstWlDisplay * self);
@@ -92,9 +101,15 @@
 GArray *gst_wl_display_get_dmabuf_formats (GstWlDisplay * self);
 
 GST_WL_API
+GArray *gst_wl_display_get_dmabuf_modifiers (GstWlDisplay * self);
+
+GST_WL_API
 struct zwp_linux_dmabuf_v1 *gst_wl_display_get_dmabuf_v1 (GstWlDisplay * self);
 
 GST_WL_API
+struct wp_single_pixel_buffer_manager_v1 * gst_wl_display_get_single_pixel_buffer_manager_v1 (GstWlDisplay * self);
+
+GST_WL_API
 gboolean gst_wl_display_has_own_display (GstWlDisplay * self);
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwllinuxdmabuf.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwllinuxdmabuf.c Changed

@@ -83,33 +83,55 @@
 
 struct wl_buffer *
 gst_wl_linux_dmabuf_construct_wl_buffer (GstBuffer * buf,
-    GstWlDisplay * display, const GstVideoInfo * info)
+    GstWlDisplay * display, const GstVideoInfoDmaDrm * drm_info)
 {
   GstMemory *mem;
-  int format;
-  guint i, width, height;
-  guint nplanes, flags = 0;
+  guint fourcc;
+  guint64 modifier;
+  guint i, width = 0, height = 0;
+  GstVideoInfo info;
+  const gsize *offsets = NULL;
+  const gint *strides = NULL;
+  GstVideoMeta *vmeta;
+  guint nplanes = 0, flags = 0;
   struct zwp_linux_buffer_params_v1 *params;
   gint64 timeout;
   ConstructBufferData data;
 
   g_return_val_if_fail (gst_wl_display_check_format_for_dmabuf (display,
-          GST_VIDEO_INFO_FORMAT (info)), NULL);
+          drm_info), NULL);
 
   mem = gst_buffer_peek_memory (buf, 0);
-  format = gst_video_format_to_wl_dmabuf_format (GST_VIDEO_INFO_FORMAT (info));
+  fourcc = drm_info->drm_fourcc;
+  modifier = drm_info->drm_modifier;
 
   g_cond_init (&data.cond);
   g_mutex_init (&data.lock);
   g_mutex_lock (&data.lock);
 
-  width = GST_VIDEO_INFO_WIDTH (info);
-  height = GST_VIDEO_INFO_HEIGHT (info);
-  nplanes = GST_VIDEO_INFO_N_PLANES (info);
+  vmeta = gst_buffer_get_video_meta (buf);
+  if (vmeta) {
+    width = vmeta->width;
+    height = vmeta->height;
+    nplanes = vmeta->n_planes;
+    offsets = vmeta->offset;
+    strides = vmeta->stride;
+  } else if (gst_video_info_dma_drm_to_video_info (drm_info, &info)) {
+    nplanes = GST_VIDEO_INFO_N_PLANES (&info);
+    width = info.width;
+    height = info.height;
+    offsets = info.offset;
+    strides = info.stride;
+  } else {
+    GST_ERROR_OBJECT (display, "GstVideoMeta is needed to carry DMABuf using "
+        "'memory:DMABuf' caps feature.");
+    goto out;
+  }
 
-  GST_DEBUG_OBJECT (display, "Creating wl_buffer from DMABuf of size %"
-      G_GSSIZE_FORMAT " (%d x %d), format %s", info->size, width, height,
-      gst_wl_dmabuf_format_to_string (format));
+  GST_DEBUG_OBJECT (display,
+      "Creating wl_buffer from DMABuf of size %" G_GSSIZE_FORMAT
+      " (%d x %d), DRM fourcc %" GST_FOURCC_FORMAT, gst_buffer_get_size (buf),
+      width, height, GST_FOURCC_ARGS (fourcc));
 
   /* Creation and configuration of planes  */
   params = zwp_linux_dmabuf_v1_create_params (gst_wl_display_get_dmabuf_v1
@@ -119,13 +141,13 @@
     guint offset, stride, mem_idx, length;
     gsize skip;
 
-    offset = GST_VIDEO_INFO_PLANE_OFFSET (info, i);
-    stride = GST_VIDEO_INFO_PLANE_STRIDE (info, i);
+    offset = offsetsi;
+    stride = stridesi;
     if (gst_buffer_find_memory (buf, offset, 1, &mem_idx, &length, &skip)) {
       GstMemory *m = gst_buffer_peek_memory (buf, mem_idx);
       gint fd = gst_dmabuf_memory_get_fd (m);
       zwp_linux_buffer_params_v1_add (params, fd, i, m->offset + skip,
-          stride, 0, 0);
+          stride, modifier >> 32, modifier & G_GUINT64_CONSTANT (0x0ffffffff));
     } else {
       GST_ERROR_OBJECT (mem->allocator, "memory does not seem to contain "
           "enough data for the specified format");
@@ -147,7 +169,7 @@
 
   /* Request buffer creation */
   zwp_linux_buffer_params_v1_add_listener (params, &params_listener, &data);
-  zwp_linux_buffer_params_v1_create (params, width, height, format, flags);
+  zwp_linux_buffer_params_v1_create (params, width, height, fourcc, flags);
 
   /* Wait for the request answer */
   wl_display_flush (gst_wl_display_get_display (display));
@@ -166,8 +188,8 @@
     GST_ERROR_OBJECT (mem->allocator, "can't create linux-dmabuf buffer");
   } else {
     GST_DEBUG_OBJECT (mem->allocator, "created linux_dmabuf wl_buffer (%p):"
-        "%dx%d, fmt=%.4s, %d planes",
-        data.wbuf, width, height, (char *) &format, nplanes);
+        "%dx%d, fmt=%" GST_FOURCC_FORMAT ", %d planes",
+        data.wbuf, width, height, GST_FOURCC_ARGS (fourcc), nplanes);
   }
 
   g_mutex_unlock (&data.lock);

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwllinuxdmabuf.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwllinuxdmabuf.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwlshmallocator.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwlshmallocator.c Changed

@@ -26,136 +26,6 @@
 
 #include "gstwlshmallocator.h"
 
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#define GST_CAT_DEFAULT gst_wl_shm_debug
-GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
-
-G_DEFINE_TYPE_WITH_CODE (GstWlShmAllocator, gst_wl_shm_allocator,
-    GST_TYPE_FD_ALLOCATOR,
-    GST_DEBUG_CATEGORY_INIT (gst_wl_shm_debug, "wlshm", 0, "wlshm library");
-    );
-
-static GstMemory *
-gst_wl_shm_allocator_alloc (GstAllocator * allocator, gsize size,
-    GstAllocationParams * params)
-{
-  GstWlShmAllocator *self = GST_WL_SHM_ALLOCATOR (allocator);
-  char filename1024;
-  static int init = 0;
-  int fd;
-  GstMemory *mem;
-  GstMapInfo info;
-
-  /* TODO: make use of the allocation params, if necessary */
-
-#ifdef HAVE_MEMFD_CREATE
-  fd = memfd_create ("gst-wayland-shm", MFD_CLOEXEC | MFD_ALLOW_SEALING);
-  if (fd >= 0) {
-    /* We can add this seal before calling posix_fallocate(), as
-     * the file is currently zero-sized anyway.
-     *
-     * There is also no need to check for the return value, we
-     * couldn't do anything with it anyway.
-     */
-    fcntl (fd, F_ADD_SEALS, F_SEAL_SHRINK);
-  } else
-#endif
-  {
-    /* allocate shm pool */
-    snprintf (filename, 1024, "%s/%s-%d-%s", g_get_user_runtime_dir (),
-        "wayland-shm", init++, "XXXXXX");
-
-    fd = g_mkstemp (filename);
-    if (fd < 0) {
-      GST_ERROR_OBJECT (self, "opening temp file %s failed: %s", filename,
-          strerror (errno));
-      return NULL;
-    }
-
-    unlink (filename);
-  }
-
-  if (ftruncate (fd, size) < 0) {
-    GST_ERROR_OBJECT (self, "ftruncate failed: %s", strerror (errno));
-    close (fd);
-    return NULL;
-  }
-
-  mem = gst_fd_allocator_alloc (allocator, fd, size,
-      GST_FD_MEMORY_FLAG_KEEP_MAPPED);
-  if (G_UNLIKELY (!mem)) {
-    GST_ERROR_OBJECT (self, "GstFdMemory allocation failed");
-    close (fd);
-    return NULL;
-  }
-
-  /* we need to map the memory in order to unlink the file without losing it */
-  if (!gst_memory_map (mem, &info, GST_MAP_READWRITE)) {
-    GST_ERROR_OBJECT (self, "GstFdMemory map failed");
-    close (fd);
-    return NULL;
-  }
-
-  /* unmap will not really munmap(), we just
-   * need it to release the miniobject lock */
-  gst_memory_unmap (mem, &info);
-
-  return mem;
-}
-
-static void
-gst_wl_shm_allocator_class_init (GstWlShmAllocatorClass * klass)
-{
-  GstAllocatorClass *alloc_class = (GstAllocatorClass *) klass;
-
-  alloc_class->alloc = GST_DEBUG_FUNCPTR (gst_wl_shm_allocator_alloc);
-}
-
-static void
-gst_wl_shm_allocator_init (GstWlShmAllocator * self)
-{
-  GstAllocator *alloc = GST_ALLOCATOR_CAST (self);
-
-  alloc->mem_type = GST_ALLOCATOR_WL_SHM;
-
-  GST_OBJECT_FLAG_UNSET (self, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC);
-}
-
-void
-gst_wl_shm_allocator_init_once (void)
-{
-  static gsize _init = 0;
-
-  if (g_once_init_enter (&_init)) {
-    GstAllocator *alloc;
-
-    alloc = g_object_new (GST_TYPE_WL_SHM_ALLOCATOR, NULL);
-    gst_object_ref_sink (alloc);
-    gst_allocator_register (GST_ALLOCATOR_WL_SHM, alloc);
-
-    g_once_init_leave (&_init, 1);
-  }
-}
-
-GstAllocator *
-gst_wl_shm_allocator_get (void)
-{
-  return gst_allocator_find (GST_ALLOCATOR_WL_SHM);
-}
-
-gboolean
-gst_is_wl_shm_memory (GstMemory * mem)
-{
-  return gst_memory_is_type (mem, GST_ALLOCATOR_WL_SHM);
-}
 
 static gboolean
 gst_wl_shm_validate_video_info (const GstVideoInfo * vinfo)
@@ -218,8 +88,8 @@
 
   g_return_val_if_fail (gst_is_fd_memory (mem), NULL);
   g_return_val_if_fail (size <= memsize, NULL);
-  g_return_val_if_fail (gst_wl_display_check_format_for_shm (display,
-          GST_VIDEO_INFO_FORMAT (info)), NULL);
+  g_return_val_if_fail (gst_wl_display_check_format_for_shm (display, info),
+      NULL);
 
   GST_DEBUG_OBJECT (display, "Creating wl_buffer from SHM of size %"
       G_GSSIZE_FORMAT " (%d x %d, stride %d), format %s", size, width, height,

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwlshmallocator.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwlshmallocator.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwlvideobufferpool.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwlvideobufferpool.c Changed

@@ -24,8 +24,198 @@
 
 #include "gstwlvideobufferpool.h"
 
-G_DEFINE_TYPE (GstWlVideoBufferPool, gst_wl_video_buffer_pool,
-    GST_TYPE_VIDEO_BUFFER_POOL);
+#include <gst/allocators/allocators.h>
+#include <drm_fourcc.h>
+
+GST_DEBUG_CATEGORY (gst_wl_videobufferpool_debug);
+#define GST_CAT_DEFAULT gst_wl_videobufferpool_debug
+
+struct _GstWlVideoBufferPool
+{
+  GstVideoBufferPool parent;
+  GstAllocator *allocator;
+  GstVideoInfo vinfo;
+};
+
+#define gst_wl_video_buffer_pool_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstWlVideoBufferPool, gst_wl_video_buffer_pool,
+    GST_TYPE_VIDEO_BUFFER_POOL,
+    GST_DEBUG_CATEGORY_INIT (gst_wl_videobufferpool_debug,
+        "wl_videobufferpool", 0, "wl_dmabuf library"));
+
+static void
+gst_wl_update_video_info_from_pitch (GstVideoInfo * vinfo, gint n_planes,
+    guint32 pitch)
+{
+  gint i;
+  gsize offs = 0;
+  guint32 height = GST_VIDEO_INFO_HEIGHT (vinfo);
+
+  if (!pitch)
+    return;
+
+  for (i = 0; i < n_planes; i++) {
+    guint32 plane_pitch;
+
+    /* Overwrite the video info's stride and offset using the pitch calculcated
+     * by the kms driver. */
+    plane_pitch = gst_video_format_info_extrapolate_stride (vinfo->finfo, i,
+        pitch);
+    GST_VIDEO_INFO_PLANE_STRIDE (vinfo, i) = plane_pitch;
+    GST_VIDEO_INFO_PLANE_OFFSET (vinfo, i) = offs;
+
+    /* Note that we cannot negotiate special padding betweem each planes,
+     * hence using the display height here. */
+    offs += plane_pitch
+        * GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT (vinfo->finfo, i, height);
+
+    GST_DEBUG ("Updated plane %i with stride %i and "
+        "offset %" G_GSIZE_FORMAT "(from pitch %u)", i,
+        GST_VIDEO_INFO_PLANE_STRIDE (vinfo, i),
+        GST_VIDEO_INFO_PLANE_OFFSET (vinfo, i), pitch);
+  }
+
+  /* Update with the size use for display, excluding any padding at the end */
+  GST_VIDEO_INFO_SIZE (vinfo) = offs;
+}
+
+static gboolean
+gst_wl_video_buffer_pool_start (GstBufferPool * pool)
+{
+  GstWlVideoBufferPool *self = GST_WL_VIDEO_BUFFER_POOL (pool);
+  GstStructure *config = gst_buffer_pool_get_config (pool);
+  GstCaps *caps;
+  GstAllocator *allocator;
+  gboolean ret = FALSE;
+  GstVideoFormat format;
+
+  if (!gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL))
+    goto wrong_config;
+
+  if (!gst_buffer_pool_config_get_allocator (config, &allocator, NULL))
+    goto wrong_config;
+
+  /* now parse the caps from the config */
+  if (!gst_video_info_from_caps (&self->vinfo, caps))
+    goto wrong_caps;
+
+  format = GST_VIDEO_INFO_FORMAT (&self->vinfo);
+  if (!gst_video_format_to_wl_dmabuf_format (format))
+    goto unsupported_pixel_format;
+
+  if (GST_IS_DRM_DUMB_ALLOCATOR (allocator)) {
+    if (!gst_drm_dumb_allocator_has_prime_export (allocator))
+      goto no_prime_export;
+
+    self->allocator = gst_object_ref (allocator);
+  }
+
+  /* all good */
+  ret = GST_BUFFER_POOL_CLASS (parent_class)->start (pool);
+
+done:
+  gst_structure_free (config);
+  return ret;
+
+wrong_config:
+  {
+    GST_WARNING_OBJECT (pool, "invalid config");
+    goto done;
+  }
+wrong_caps:
+  {
+    GST_WARNING_OBJECT (pool,
+        "failed getting geometry from caps %" GST_PTR_FORMAT, caps);
+    goto done;
+  }
+unsupported_pixel_format:
+  {
+    GST_WARNING_OBJECT (pool, "no support for %s pixel format",
+        gst_video_format_to_string (format));
+    goto done;
+  }
+no_prime_export:
+  {
+    GST_WARNING_OBJECT (self,
+        "not using DRM Dumb allocator as it can't export DMABuf.");
+    goto done;
+  }
+}
+
+static gboolean
+gst_wl_video_buffer_pool_stop (GstBufferPool * pool)
+{
+  GstWlVideoBufferPool *self = GST_WL_VIDEO_BUFFER_POOL (pool);
+  gst_clear_object (&self->allocator);
+  gst_video_info_init (&self->vinfo);
+  return GST_BUFFER_POOL_CLASS (parent_class)->stop (pool);
+}
+
+static GstFlowReturn
+gst_wl_video_buffer_pool_alloc_buffer (GstBufferPool * pool,
+    GstBuffer ** buffer, GstBufferPoolAcquireParams * params)
+{
+  GstWlVideoBufferPool *self = GST_WL_VIDEO_BUFFER_POOL (pool);
+  guint32 pitch;
+  GstBuffer *buf;
+  GstMemory *drm_mem, *dma_mem;
+  gsize dumbbuf_size;
+  GstVideoFormat format = GST_VIDEO_INFO_FORMAT (&self->vinfo);
+  guint32 drm_fourcc = gst_video_format_to_wl_dmabuf_format (format);
+
+  if (!self->allocator)
+    return GST_BUFFER_POOL_CLASS (parent_class)->alloc_buffer (pool, buffer,
+        params);
+
+  drm_mem = gst_drm_dumb_allocator_alloc (self->allocator,
+      drm_fourcc, GST_VIDEO_INFO_WIDTH (&self->vinfo),
+      GST_VIDEO_INFO_HEIGHT (&self->vinfo), &pitch);
+  if (!drm_mem)
+    goto alloc_failed;
+
+  dma_mem = gst_drm_dumb_memory_export_dmabuf (drm_mem);
+
+  gst_memory_unref (drm_mem);
+  drm_mem = NULL;
+
+  gst_wl_update_video_info_from_pitch (&self->vinfo,
+      GST_VIDEO_INFO_N_PLANES (&self->vinfo), pitch);
+
+  gst_memory_get_sizes (dma_mem, NULL, &dumbbuf_size);
+  if (dumbbuf_size < GST_VIDEO_INFO_SIZE (&self->vinfo)) {
+    GST_ERROR_OBJECT (self,
+        "DUMB buffer has a size of %" G_GSIZE_FORMAT
+        " but we require at least %" G_GSIZE_FORMAT " to hold a frame",
+        dumbbuf_size, GST_VIDEO_INFO_SIZE (&self->vinfo));
+    goto buffer_too_small;
+  }
+
+  gst_memory_resize (dma_mem, 0, GST_VIDEO_INFO_SIZE (&self->vinfo));
+
+  buf = gst_buffer_new ();
+  gst_buffer_append_memory (buf, dma_mem);
+  gst_buffer_add_video_meta_full (buf, GST_VIDEO_FRAME_FLAG_NONE,
+      GST_VIDEO_INFO_FORMAT (&self->vinfo), GST_VIDEO_INFO_WIDTH (&self->vinfo),
+      GST_VIDEO_INFO_HEIGHT (&self->vinfo),
+      GST_VIDEO_INFO_N_PLANES (&self->vinfo),
+      self->vinfo.offset, self->vinfo.stride);
+
+  *buffer = buf;
+
+  return GST_FLOW_OK;
+
+  /* ERRORS */
+alloc_failed:
+  {
+    GST_ERROR_OBJECT (self, "failed to allocate DRM Dumb buffer.");
+    return GST_FLOW_ERROR;
+  }
+buffer_too_small:
+  {
+    GST_ERROR_OBJECT (self, "dumb buffer too small to store an image.");
+    return GST_FLOW_ERROR;
+  }
+}
 
 static const gchar **
 gst_wl_video_buffer_pool_get_options (GstBufferPool * pool)
@@ -39,11 +229,15 @@
 {
   GstBufferPoolClass *pool_class = GST_BUFFER_POOL_CLASS (klass);
   pool_class->get_options = gst_wl_video_buffer_pool_get_options;
+  pool_class->start = gst_wl_video_buffer_pool_start;
+  pool_class->stop = gst_wl_video_buffer_pool_stop;
+  pool_class->alloc_buffer = gst_wl_video_buffer_pool_alloc_buffer;
 }
 
 static void
-gst_wl_video_buffer_pool_init (GstWlVideoBufferPool * pool)
+gst_wl_video_buffer_pool_init (GstWlVideoBufferPool * self)
 {
+  gst_video_info_init (&self->vinfo);
 }
 
 GstBufferPool *

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwlvideobufferpool.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwlvideobufferpool.h Changed

@@ -26,19 +26,17 @@
 
 G_BEGIN_DECLS
 
-/* A tiny GstVideoBufferPool subclass that modify the options to remove
+/* A GstVideoBufferPool subclass that modify the options to remove
  * VideoAlignment. To support VideoAlignment we would need to pass the padded
  * width/height + stride and use the viewporter interface to crop, a bit like
  * we use to do with XV. It would still be quite limited. It's a bit retro,
- * hopefully there will be a better Wayland interface in the future. */
+ * hopefully there will be a better Wayland interface in the future. This buffer
+ * pool also support GstDRMDumbAllocator. */
 
 #define GST_TYPE_WL_VIDEO_BUFFER_POOL (gst_wl_video_buffer_pool_get_type ())
-G_DECLARE_FINAL_TYPE (GstWlVideoBufferPool, gst_wl_video_buffer_pool, GST, WL_VIDEO_BUFFER_POOL, GstVideoBufferPool);
 
-struct _GstWlVideoBufferPool
-{
-  GstVideoBufferPool parent;
-};
+GST_WL_API
+G_DECLARE_FINAL_TYPE (GstWlVideoBufferPool, gst_wl_video_buffer_pool, GST, WL_VIDEO_BUFFER_POOL, GstVideoBufferPool);
 
 GST_WL_API
 GstBufferPool * gst_wl_video_buffer_pool_new (void);

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwlvideoformat.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwlvideoformat.c Changed

@@ -29,6 +29,14 @@
 
 #include <drm_fourcc.h>
 
+/* This can be removed once we can bump the required wl_client_dep,
+ * which again is blocked by a CI image update, see
+ * https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5275
+ */
+#ifndef WL_SHM_FORMAT_P010
+#define WL_SHM_FORMAT_P010 DRM_FORMAT_P010
+#endif
+
 #define GST_CAT_DEFAULT gst_wl_videoformat_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
@@ -48,7 +56,7 @@
 typedef struct
 {
   enum wl_shm_format wl_shm_format;
-  guint dma_format;
+  guint32 dma_format;
   GstVideoFormat gst_format;
 } wl_VideoFormat;
 
@@ -61,8 +69,8 @@
   {WL_SHM_FORMAT_ABGR8888, DRM_FORMAT_ABGR8888, GST_VIDEO_FORMAT_RGBA},
   {WL_SHM_FORMAT_RGBA8888, DRM_FORMAT_RGBA8888, GST_VIDEO_FORMAT_ABGR},
   {WL_SHM_FORMAT_BGRA8888, DRM_FORMAT_BGRA8888, GST_VIDEO_FORMAT_ARGB},
-  {WL_SHM_FORMAT_RGB888, DRM_FORMAT_RGB888, GST_VIDEO_FORMAT_RGB},
-  {WL_SHM_FORMAT_BGR888, DRM_FORMAT_BGR888, GST_VIDEO_FORMAT_BGR},
+  {WL_SHM_FORMAT_RGB888, DRM_FORMAT_RGB888, GST_VIDEO_FORMAT_BGR},
+  {WL_SHM_FORMAT_BGR888, DRM_FORMAT_BGR888, GST_VIDEO_FORMAT_RGB},
   {WL_SHM_FORMAT_RGB565, DRM_FORMAT_RGB565, GST_VIDEO_FORMAT_RGB16},
   {WL_SHM_FORMAT_BGR565, DRM_FORMAT_BGR565, GST_VIDEO_FORMAT_BGR16},
 
@@ -74,6 +82,7 @@
   {WL_SHM_FORMAT_NV21, DRM_FORMAT_NV21, GST_VIDEO_FORMAT_NV21},
   {WL_SHM_FORMAT_NV16, DRM_FORMAT_NV16, GST_VIDEO_FORMAT_NV16},
   {WL_SHM_FORMAT_NV61, DRM_FORMAT_NV61, GST_VIDEO_FORMAT_NV61},
+  {WL_SHM_FORMAT_P010, DRM_FORMAT_P010, GST_VIDEO_FORMAT_P010_10LE},
   {WL_SHM_FORMAT_YUV410, DRM_FORMAT_YUV410, GST_VIDEO_FORMAT_YUV9},
   {WL_SHM_FORMAT_YVU410, DRM_FORMAT_YVU410, GST_VIDEO_FORMAT_YVU9},
   {WL_SHM_FORMAT_YUV411, DRM_FORMAT_YUV411, GST_VIDEO_FORMAT_Y41B},
@@ -96,7 +105,7 @@
   return -1;
 }
 
-gint
+guint32
 gst_video_format_to_wl_dmabuf_format (GstVideoFormat format)
 {
   guint i;
@@ -106,7 +115,7 @@
       return wl_formatsi.dma_format;
 
   GST_WARNING ("wayland dmabuf video format not found");
-  return -1;
+  return 0;
 }
 
 GstVideoFormat
@@ -140,9 +149,11 @@
       (gst_wl_shm_format_to_video_format (wl_format));
 }
 
-const gchar *
-gst_wl_dmabuf_format_to_string (guint wl_format)
+gchar *
+gst_wl_dmabuf_format_to_string (guint wl_format, guint64 modifier)
 {
-  return gst_video_format_to_string
-      (gst_wl_dmabuf_format_to_video_format (wl_format));
+  GstVideoFormat gst_format = gst_wl_dmabuf_format_to_video_format (wl_format);
+  const guint32 fourcc = gst_video_dma_drm_fourcc_from_format (gst_format);
+
+  return gst_video_dma_drm_fourcc_to_string (fourcc, modifier);
 }

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwlvideoformat.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwlvideoformat.h Changed

@@ -29,6 +29,23 @@
 
 G_BEGIN_DECLS
 
+/**
+ * GST_WL_VIDEO_FORMATS:
+ *
+ * A list of supported video formats for use in cap templates.
+ *
+ * Since: 1.24
+ */
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+#define GST_WL_VIDEO_FORMATS "{ AYUV, RGBA, ARGB, BGRA, ABGR, P010_10LE, v308, " \
+    "RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, " \
+    "I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16 }"
+#elif G_BYTE_ORDER == G_LITTLE_ENDIAN
+#define GST_WL_VIDEO_FORMATS "{ AYUV, RGBA, ARGB, BGRA, ABGR, P010_10LE, v308, " \
+    "RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, " \
+    "I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16 }"
+#endif
+
 GST_WL_API
 void gst_wl_videoformat_init_once (void);
 
@@ -36,7 +53,7 @@
 enum wl_shm_format gst_video_format_to_wl_shm_format (GstVideoFormat format);
 
 GST_WL_API
-gint gst_video_format_to_wl_dmabuf_format (GstVideoFormat format);
+guint32 gst_video_format_to_wl_dmabuf_format (GstVideoFormat format);
 
 GST_WL_API
 GstVideoFormat gst_wl_shm_format_to_video_format (enum wl_shm_format wl_format);
@@ -48,6 +65,6 @@
 const gchar *gst_wl_shm_format_to_string (enum wl_shm_format wl_format);
 
 GST_WL_API
-const gchar *gst_wl_dmabuf_format_to_string (guint wl_format);
+gchar * gst_wl_dmabuf_format_to_string (guint wl_format, guint64 modifier);
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwlwindow.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwlwindow.c Changed

@@ -27,6 +27,7 @@
 #include "gstwlwindow.h"
 
 #include "fullscreen-shell-unstable-v1-client-protocol.h"
+#include "single-pixel-buffer-v1-client-protocol.h"
 #include "viewporter-client-protocol.h"
 #include "xdg-shell-client-protocol.h"
 
@@ -71,6 +72,14 @@
   /* when this is not set both the area_surface and the video_surface are not
    * visible and certain steps should be skipped */
   gboolean is_area_surface_mapped;
+
+  GMutex window_lock;
+  GstWlBuffer *next_buffer;
+  GstVideoInfo *next_video_info;
+  GstWlBuffer *staged_buffer;
+  gboolean clear_window;
+  struct wl_callback *frame_callback;
+  struct wl_callback *commit_callback;
 } GstWlWindowPrivate;
 
 G_DEFINE_TYPE_WITH_CODE (GstWlWindow, gst_wl_window, G_TYPE_OBJECT,
@@ -92,6 +101,9 @@
 
 static void gst_wl_window_update_borders (GstWlWindow * self);
 
+static void gst_wl_window_commit_buffer (GstWlWindow * self,
+    GstWlBuffer * buffer);
+
 static void
 handle_xdg_toplevel_close (void *data, struct xdg_toplevel *xdg_toplevel)
 {
@@ -172,6 +184,7 @@
   priv->configured = TRUE;
   g_cond_init (&priv->configure_cond);
   g_mutex_init (&priv->configure_mutex);
+  g_mutex_init (&priv->window_lock);
 }
 
 static void
@@ -180,6 +193,16 @@
   GstWlWindow *self = GST_WL_WINDOW (gobject);
   GstWlWindowPrivate *priv = gst_wl_window_get_instance_private (self);
 
+  gst_wl_display_callback_destroy (priv->display, &priv->frame_callback);
+  gst_wl_display_callback_destroy (priv->display, &priv->commit_callback);
+
+  if (priv->staged_buffer)
+    gst_wl_buffer_unref_buffer (priv->staged_buffer);
+
+  g_cond_clear (&priv->configure_cond);
+  g_mutex_clear (&priv->configure_mutex);
+  g_mutex_clear (&priv->window_lock);
+
   if (priv->xdg_toplevel)
     xdg_toplevel_destroy (priv->xdg_toplevel);
   if (priv->xdg_surface)
@@ -307,6 +330,11 @@
     }
     xdg_toplevel_add_listener (priv->xdg_toplevel,
         &xdg_toplevel_listener, self);
+    if (g_get_prgname ()) {
+      xdg_toplevel_set_app_id (priv->xdg_toplevel, g_get_prgname ());
+    } else {
+      xdg_toplevel_set_app_id (priv->xdg_toplevel, "org.gstreamer.wayland");
+    }
 
     gst_wl_window_ensure_fullscreen (self, fullscreen);
 
@@ -351,7 +379,7 @@
 
 GstWlWindow *
 gst_wl_window_new_in_surface (GstWlDisplay * display,
-    struct wl_surface * parent, GMutex * render_lock)
+    struct wl_surface *parent, GMutex * render_lock)
 {
   GstWlWindow *self;
   GstWlWindowPrivate *priv;
@@ -493,11 +521,40 @@
   }
 }
 
-void
-gst_wl_window_render (GstWlWindow * self, GstWlBuffer * buffer,
-    const GstVideoInfo * info)
+static void
+frame_redraw_callback (void *data, struct wl_callback *callback, uint32_t time)
 {
+  GstWlWindow *self = data;
   GstWlWindowPrivate *priv = gst_wl_window_get_instance_private (self);
+  GstWlBuffer *next_buffer;
+
+  GST_INFO ("frame_redraw_cb ");
+
+  wl_callback_destroy (callback);
+  priv->frame_callback = NULL;
+
+  g_mutex_lock (&priv->window_lock);
+  next_buffer = priv->next_buffer = priv->staged_buffer;
+  priv->staged_buffer = NULL;
+  g_mutex_unlock (&priv->window_lock);
+
+  if (next_buffer || priv->clear_window)
+    gst_wl_window_commit_buffer (self, next_buffer);
+
+  if (next_buffer)
+    gst_wl_buffer_unref_buffer (next_buffer);
+}
+
+static const struct wl_callback_listener frame_callback_listener = {
+  frame_redraw_callback
+};
+
+static void
+gst_wl_window_commit_buffer (GstWlWindow * self, GstWlBuffer * buffer)
+{
+  GstWlWindowPrivate *priv = gst_wl_window_get_instance_private (self);
+  GstVideoInfo *info = priv->next_video_info;
+  struct wl_callback *callback;
 
   if (G_UNLIKELY (info)) {
     priv->scaled_width =
@@ -511,6 +568,9 @@
   }
 
   if (G_LIKELY (buffer)) {
+    callback = wl_surface_frame (priv->video_surface_wrapper);
+    priv->frame_callback = callback;
+    wl_callback_add_listener (callback, &frame_callback_listener, self);
     gst_wl_buffer_attach (buffer, priv->video_surface_wrapper);
     wl_surface_damage_buffer (priv->video_surface_wrapper, 0, 0, G_MAXINT32,
         G_MAXINT32);
@@ -529,6 +589,7 @@
     wl_surface_attach (priv->area_surface_wrapper, NULL, 0, 0);
     wl_surface_commit (priv->area_surface_wrapper);
     priv->is_area_surface_mapped = FALSE;
+    priv->clear_window = FALSE;
   }
 
   if (G_UNLIKELY (info)) {
@@ -536,9 +597,70 @@
      * the position of the video_subsurface */
     wl_surface_commit (priv->area_surface_wrapper);
     wl_subsurface_set_desync (priv->video_subsurface);
+    gst_video_info_free (priv->next_video_info);
+    priv->next_video_info = NULL;
   }
 
-  wl_display_flush (gst_wl_display_get_display (priv->display));
+}
+
+static void
+commit_callback (void *data, struct wl_callback *callback, uint32_t serial)
+{
+  GstWlWindow *self = data;
+  GstWlWindowPrivate *priv = gst_wl_window_get_instance_private (self);
+  GstWlBuffer *next_buffer;
+
+  wl_callback_destroy (callback);
+  priv->commit_callback = NULL;
+
+  g_mutex_lock (&priv->window_lock);
+  next_buffer = priv->next_buffer;
+  g_mutex_unlock (&priv->window_lock);
+
+  gst_wl_window_commit_buffer (self, next_buffer);
+
+  if (next_buffer)
+    gst_wl_buffer_unref_buffer (next_buffer);
+}
+
+static const struct wl_callback_listener commit_listener = {
+  commit_callback
+};
+
+gboolean
+gst_wl_window_render (GstWlWindow * self, GstWlBuffer * buffer,
+    const GstVideoInfo * info)
+{
+  GstWlWindowPrivate *priv = gst_wl_window_get_instance_private (self);
+  gboolean ret = TRUE;
+
+  if (G_LIKELY (buffer))
+    gst_wl_buffer_ref_gst_buffer (buffer);
+
+  g_mutex_lock (&priv->window_lock);
+  if (G_UNLIKELY (info))
+    priv->next_video_info = gst_video_info_copy (info);
+
+  if (priv->next_buffer && priv->staged_buffer) {
+    GST_LOG_OBJECT (self, "buffer %p dropped (replaced)", priv->staged_buffer);
+    gst_wl_buffer_unref_buffer (priv->staged_buffer);
+    ret = FALSE;
+  }
+
+  if (!priv->next_buffer) {
+    priv->next_buffer = buffer;
+    priv->commit_callback =
+        gst_wl_display_sync (priv->display, &commit_listener, self);
+    wl_display_flush (gst_wl_display_get_display (priv->display));
+  } else {
+    priv->staged_buffer = buffer;
+  }
+  if (!buffer)
+    priv->clear_window = TRUE;
+
+  g_mutex_unlock (&priv->window_lock);
+
+  return ret;
 }
 
 /* Update the buffer used to draw black borders. When we have viewporter
@@ -548,13 +670,11 @@
 gst_wl_window_update_borders (GstWlWindow * self)
 {
   GstWlWindowPrivate *priv = gst_wl_window_get_instance_private (self);
-  GstVideoFormat format;
-  GstVideoInfo info;
   gint width, height;
   GstBuffer *buf;
   struct wl_buffer *wlbuf;
+  struct wp_single_pixel_buffer_manager_v1 *single_pixel;
   GstWlBuffer *gwlbuf;
-  GstAllocator *alloc;
 
   if (gst_wl_display_get_viewporter (priv->display)) {
     wp_viewport_set_destination (priv->area_viewport,
@@ -574,19 +694,34 @@
     height = priv->render_rectangle.h;
   }
 
-  /* we want WL_SHM_FORMAT_XRGB8888 */
-  format = GST_VIDEO_FORMAT_BGRx;
-
   /* draw the area_subsurface */
-  gst_video_info_set_format (&info, format, width, height);
+  single_pixel =
+      gst_wl_display_get_single_pixel_buffer_manager_v1 (priv->display);
+  if (width == 1 && height == 1 && single_pixel) {
+    buf = gst_buffer_new_allocate (NULL, 1, NULL);
+    wlbuf =
+        wp_single_pixel_buffer_manager_v1_create_u32_rgba_buffer (single_pixel,
+        0, 0, 0, 0xffffffffU);
+  } else {
+    GstVideoFormat format;
+    GstVideoInfo info;
+    GstAllocator *alloc;
+
+    /* we want WL_SHM_FORMAT_XRGB8888 */
+    format = GST_VIDEO_FORMAT_BGRx;
+    gst_video_info_set_format (&info, format, width, height);
+    alloc = gst_shm_allocator_get ();
 
-  alloc = gst_wl_shm_allocator_get ();
+    buf = gst_buffer_new_allocate (alloc, info.size, NULL);
+    gst_buffer_memset (buf, 0, 0, info.size);
+
+    wlbuf =
+        gst_wl_shm_memory_construct_wl_buffer (gst_buffer_peek_memory (buf, 0),
+        priv->display, &info);
+
+    g_object_unref (alloc);
+  }
 
-  buf = gst_buffer_new_allocate (alloc, info.size, NULL);
-  gst_buffer_memset (buf, 0, 0, info.size);
-  wlbuf =
-      gst_wl_shm_memory_construct_wl_buffer (gst_buffer_peek_memory (buf, 0),
-      priv->display, &info);
   gwlbuf = gst_buffer_add_wl_buffer (buf, wlbuf, priv->display);
   gst_wl_buffer_attach (gwlbuf, priv->area_surface_wrapper);
   wl_surface_damage_buffer (priv->area_surface_wrapper, 0, 0, G_MAXINT32,
@@ -595,7 +730,6 @@
   /* at this point, the GstWlBuffer keeps the buffer
    * alive and will free it on wl_buffer::release */
   gst_buffer_unref (buf);
-  g_object_unref (alloc);
 }
 
 static void

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/gstwlwindow.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/gstwlwindow.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/wayland/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/wayland/meson.build Changed

@@ -1,13 +1,14 @@
 wl_req = '>= 1.15'
 wl_client_dep = dependency('wayland-client', version: wl_req, required: get_option('wayland'))
-libdrm_dep = dependency('libdrm', version: '>= 2.4.55', required: get_option('wayland'))
-wl_protocol_dep = dependency('wayland-protocols', version: wl_req, required: get_option('wayland'))
+libdrm_dep = dependency('libdrm', version: '>= 2.4.98', required: get_option('wayland'))
+wl_proto_req = '>= 1.26'
+wl_protocol_dep = dependency('wayland-protocols', version: wl_proto_req, required: get_option('wayland'))
 wl_scanner = find_program('wayland-scanner', required: get_option('wayland'))
 # Also used in ext/wayland
 use_wayland = wl_protocol_dep.found() and wl_client_dep.found() and wl_scanner.found() and libdrm_dep.found()
 
 if use_wayland
-  wl_sources = 
+  wl_sources = files(
       'gstwlbuffer.c',
       'gstwlcontext.c',
       'gstwldisplay.c',
@@ -16,9 +17,9 @@
       'gstwlvideobufferpool.c',
       'gstwlvideoformat.c',
       'gstwlwindow.c',
-  
+  )
 
-    wl_headers = 
+  wl_headers = files(
       'gstwl_fwd.h',
       'gstwlbuffer.h',
       'gstwlcontext.h',
@@ -30,32 +31,52 @@
       'gstwlwindow.h',
       'wayland.h',
       'wayland-prelude.h',
-  
+  )
 
   protocols_datadir = wl_protocol_dep.get_variable('pkgdatadir')
 
   protocol_defs = 
-      '/stable/viewporter/viewporter.xml', 'viewporter-protocol.c', 'viewporter-client-protocol.h',
-      '/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
-       'linux-dmabuf-unstable-v1-protocol.c', 'linux-dmabuf-unstable-v1-client-protocol.h',
-      '/unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml',
-       'fullscreen-shell-unstable-v1-protocol.c', 'fullscreen-shell-unstable-v1-client-protocol.h',
-      '/stable/xdg-shell/xdg-shell.xml', 'xdg-shell-protocol.c', 'xdg-shell-client-protocol.h',
+    'viewporter', 'stable', ,
+    'linux-dmabuf', 'unstable', 'v1', ,
+    'fullscreen-shell', 'unstable', 'v1', ,
+    'xdg-shell', 'stable', ,
+    'single-pixel-buffer', 'staging', 'v1' ,
   
   protocols_files = 
 
   foreach protodef: protocol_defs
-      xmlfile = protocols_datadir + protodef.get(0)
+    proto_name = protodef.get(0)
+    proto_stability = protodef.get(1)
+    if proto_stability == 'stable'
+      output_base = proto_name
+    elif proto_stability == 'staging'
+      proto_version = protodef.get(2)
+      output_base = f'@proto_name@-@proto_version@'
+    else
+      proto_version = protodef.get(2)
+      output_base = f'@proto_name@-@proto_stability@-@proto_version@'
+    endif
+    input = protocols_datadir / proto_stability / proto_name / f'@output_base@.xml'
 
-      protocols_files += custom_target(protodef.get(1),
-        output : protodef.get(1),
-        input : xmlfile,
-        command : wl_scanner, 'code', '@INPUT@', '@OUTPUT@')
+    protocols_files += custom_target(f'@output_base@ client header',
+      input: input,
+      output: f'@output_base@-client-protocol.h',
+      command: 
+        wl_scanner,
+        'client-header',
+        '@INPUT@', '@OUTPUT@',
+      ,
+    )
 
-      protocols_files += custom_target(protodef.get(2),
-        output : protodef.get(2),
-        input : xmlfile,
-        command : wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@')
+    protocols_files += custom_target(f'@output_base@ source',
+      input: input,
+      output: f'@output_base@-protocol.c',
+      command: 
+        wl_scanner,
+        'private-code',
+        '@INPUT@', '@OUTPUT@',
+      ,
+    )
   endforeach
 
   extra_c_args = 
@@ -65,6 +86,10 @@
     '-D_GNU_SOURCE'
   
 
+  if wl_client_dep.version().version_compare('>= 1.22.91')
+    extra_c_args +=  '-DHAVE_WL_EVENT_QUEUE_NAME' 
+  endif
+
   gstwayland = library('gstwayland-' + api_version,
     wl_sources + protocols_files,
     c_args : gst_plugins_bad_args + extra_c_args,

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/webrtc/ice.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/webrtc/ice.c Changed

@@ -101,17 +101,19 @@
  * @ice: The #GstWebRTCICE
  * @stream: The #GstWebRTCICEStream
  * @candidate: The ICE candidate
+ * @promise: (nullable): A #GstPromise for task notifications (Since: 1.24)
  *
  * Since: 1.22
  */
 void
 gst_webrtc_ice_add_candidate (GstWebRTCICE * ice,
-    GstWebRTCICEStream * stream, const gchar * candidate)
+    GstWebRTCICEStream * stream, const gchar * candidate, GstPromise * promise)
 {
   g_return_if_fail (GST_IS_WEBRTC_ICE (ice));
   g_assert (GST_WEBRTC_ICE_GET_CLASS (ice)->add_candidate);
 
-  GST_WEBRTC_ICE_GET_CLASS (ice)->add_candidate (ice, stream, candidate);
+  GST_WEBRTC_ICE_GET_CLASS (ice)->add_candidate (ice, stream, candidate,
+      promise);
 }
 
 /**
@@ -456,7 +458,7 @@
  * gst_webrtc_ice_set_http_proxy:
  * @ice: The #GstWebRTCICE
  * @uri: (transfer none): URI of the HTTP proxy of the form
- *   http://username:password@hostname:port
+ *   http://username:password@hostname:port?alpn=<alpn>
  *
  * Set HTTP Proxy to be used when connecting to TURN server.
  *
@@ -476,7 +478,7 @@
  * @ice: The #GstWebRTCICE
  *
  * Returns: (transfer full): URI of the HTTP proxy of the form
- *   http://username:password@hostname:port
+ *   http://username:password@hostname:port?alpn=<alpn>
  *
  * Get HTTP Proxy to be used when connecting to TURN server.
  *

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/webrtc/ice.h -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/webrtc/ice.h Changed

@@ -84,7 +84,8 @@
                                                         GstWebRTCICEStream * stream);
   void (*add_candidate)                                (GstWebRTCICE * ice,
                                                         GstWebRTCICEStream * stream,
-                                                        const gchar * candidate);
+                                                        const gchar * candidate,
+                                                        GstPromise * promise);
   gboolean (*set_local_credentials)                    (GstWebRTCICE * ice,
                                                         GstWebRTCICEStream * stream,
                                                         const gchar * ufrag,
@@ -169,7 +170,8 @@
 GST_WEBRTC_API
 void                        gst_webrtc_ice_add_candidate            (GstWebRTCICE * ice,
                                                                      GstWebRTCICEStream * stream,
-                                                                     const gchar * candidate);
+                                                                     const gchar * candidate,
+                                                                     GstPromise * promise);
 
 GST_WEBRTC_API
 gboolean                    gst_webrtc_ice_set_local_credentials    (GstWebRTCICE * ice,

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/webrtc/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/webrtc/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/webrtc/nice/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/webrtc/nice/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst-libs/gst/webrtc/nice/nice.c -> gst-plugins-bad-1.24.5.tar.xz/gst-libs/gst/webrtc/nice/nice.c Changed

@@ -96,7 +96,9 @@
   g_main_context_invoke (ice->priv->main_context,
       (GSourceFunc) _unlock_pc_thread, &ice->priv->lock);
 
+  g_main_context_push_thread_default (ice->priv->main_context);
   g_main_loop_run (ice->priv->loop);
+  g_main_context_pop_thread_default (ice->priv->main_context);
 
   g_mutex_lock (&ice->priv->lock);
   g_main_context_unref (ice->priv->main_context);
@@ -271,125 +273,153 @@
   *pass = g_uri_unescape_string (&colon1, NULL);
 }
 
+typedef void (*GstResolvedCallback)
+  (GstWebRTCNice * nice, GList * addresses, GError * error, gpointer user_data);
+
 struct resolve_host_data
 {
-  GstWebRTCNice *ice;
+  GWeakRef nice_weak;
   char *host;
   gboolean main_context_handled;
+  GstResolvedCallback resolved_callback;
   gpointer user_data;
   GDestroyNotify notify;
 };
 
-static void
-on_resolve_host (GResolver * resolver, GAsyncResult * res, gpointer user_data)
+static struct resolve_host_data *
+resolve_host_data_new (GstWebRTCNice * ice, const char *host)
 {
-  GTask *task = user_data;
-  struct resolve_host_data *rh;
-  GError *error = NULL;
-  GList *addresses;
-
-  rh = g_task_get_task_data (task);
+  struct resolve_host_data *rh =
+      g_atomic_rc_box_new0 (struct resolve_host_data);
 
-  if (!(addresses = g_resolver_lookup_by_name_finish (resolver, res, &error))) {
-    GST_ERROR ("failed to resolve: %s", error->message);
-    g_task_return_error (task, error);
-    g_object_unref (task);
-    return;
-  }
+  g_weak_ref_init (&rh->nice_weak, ice);
+  rh->host = g_strdup (host);
 
-  GST_DEBUG_OBJECT (rh->ice, "Resolved %d addresses for host %s with data %p",
-      g_list_length (addresses), rh->host, rh);
+  return rh;
+}
 
-  g_task_return_pointer (task, addresses,
-      (GDestroyNotify) g_resolver_free_addresses);
-  g_object_unref (task);
+static struct resolve_host_data *
+resolve_host_data_ref (struct resolve_host_data *rh)
+{
+  return (struct resolve_host_data *) g_atomic_rc_box_acquire (rh);
 }
 
 static void
-free_resolve_host_data (struct resolve_host_data *rh)
+resolve_host_data_clear (struct resolve_host_data *rh)
 {
-  GST_TRACE_OBJECT (rh->ice, "Freeing data %p for resolving host %s", rh,
-      rh->host);
+  GST_TRACE ("Freeing data %p for resolving host %s", rh, rh->host);
 
   if (rh->notify)
     rh->notify (rh->user_data);
 
+  g_weak_ref_clear (&rh->nice_weak);
   g_free (rh->host);
-  g_free (rh);
 }
 
-static struct resolve_host_data *
-resolve_host_data_new (GstWebRTCNice * ice, const char *host)
+static void
+resolve_host_data_unref (struct resolve_host_data *rh)
 {
-  struct resolve_host_data *rh = g_new0 (struct resolve_host_data, 1);
+  g_atomic_rc_box_release_full (rh, (GDestroyNotify) resolve_host_data_clear);
+}
 
-  rh->ice = ice;
-  rh->host = g_strdup (host);
+static void
+on_resolve_host (GResolver * resolver, GAsyncResult * res, gpointer user_data)
+{
+  struct resolve_host_data *rh = user_data;
+  GstWebRTCNice *nice = g_weak_ref_get (&rh->nice_weak);
+  GError *error = NULL;
+  GList *addresses;
 
-  return rh;
+  if (!nice) {
+    error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_CANCELLED, "Cancelled");
+    rh->resolved_callback (NULL, NULL, error, rh->user_data);
+    resolve_host_data_unref (rh);
+    g_error_free (error);
+
+    return;
+  }
+
+  if (!(addresses = g_resolver_lookup_by_name_finish (resolver, res, &error))) {
+    GST_ERROR ("failed to resolve: %s", error->message);
+
+    rh->resolved_callback (nice, NULL, error, rh->user_data);
+    gst_object_unref (nice);
+    resolve_host_data_unref (rh);
+    g_error_free (error);
+
+    return;
+  }
+
+  GST_DEBUG_OBJECT (nice, "Resolved %d addresses for host %s with data %p",
+      g_list_length (addresses), rh->host, rh);
+
+  rh->resolved_callback (nice, addresses, error, rh->user_data);
+  gst_object_unref (nice);
+  resolve_host_data_unref (rh);
+  g_resolver_free_addresses (addresses);
 }
 
 static gboolean
 resolve_host_main_cb (gpointer user_data)
 {
   GResolver *resolver = g_resolver_get_default ();
-  GTask *task = user_data;
-  struct resolve_host_data *rh;
-
-  rh = g_task_get_task_data (task);
-  /* no need to error anymore if the main context disappears and this task is
-   * not run */
-  rh->main_context_handled = TRUE;
-
-  GST_DEBUG_OBJECT (rh->ice, "Resolving host %s", rh->host);
-  g_resolver_lookup_by_name_async (resolver, rh->host, NULL,
-      (GAsyncReadyCallback) on_resolve_host, g_object_ref (task));
+  struct resolve_host_data *rh = user_data;
+  GstWebRTCNice *nice = g_weak_ref_get (&rh->nice_weak);
+
+  if (nice) {
+    /* no need to error anymore if the main context disappears and this task is
+     * not run */
+    rh->main_context_handled = TRUE;
+
+    GST_DEBUG_OBJECT (nice, "Resolving host %s", rh->host);
+    g_resolver_lookup_by_name_async (resolver, rh->host, NULL,
+        (GAsyncReadyCallback) on_resolve_host, resolve_host_data_ref (rh));
+    gst_object_unref (nice);
+  }
 
   return G_SOURCE_REMOVE;
 }
 
 static void
-error_task_if_unhandled (GTask * task)
+error_resolve_if_unhandled (struct resolve_host_data *rh)
 {
-  struct resolve_host_data *rh;
-
-  rh = g_task_get_task_data (task);
+  GstWebRTCNice *nice = g_weak_ref_get (&rh->nice_weak);
 
   if (!rh->main_context_handled) {
-    GST_DEBUG_OBJECT (rh->ice, "host resolve for %s with data %p was never "
-        "executed, main context quit?", rh->host, rh);
-    g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_CANCELLED, "%s",
-        "Cancelled");
+    if (nice) {
+      GST_DEBUG_OBJECT (nice, "host resolve for %s with data %p was never "
+          "executed, main context quit?", rh->host, rh);
+    } else {
+      GST_DEBUG ("host resolve for %s with data %p was never "
+          "executed, main context quit?", rh->host, rh);
+    }
+
+    GError *error =
+        g_error_new_literal (G_IO_ERROR, G_IO_ERROR_CANCELLED, "Cancelled");
+    rh->resolved_callback (nice, NULL, error, rh->user_data);
+    g_error_free (error);
   }
 
-  g_object_unref (task);
+  if (nice)
+    gst_object_unref (nice);
+  resolve_host_data_unref (rh);
 }
 
 static void
-resolve_host_async (GstWebRTCNice * ice, const gchar * host,
-    GAsyncReadyCallback cb, gpointer user_data, GDestroyNotify notify)
+resolve_host_async (GstWebRTCNice * nice, const gchar * host,
+    GstResolvedCallback resolved_callback, gpointer user_data,
+    GDestroyNotify notify)
 {
-  struct resolve_host_data *rh = resolve_host_data_new (ice, host);
-  GTask *task;
+  struct resolve_host_data *rh = resolve_host_data_new (nice, host);
 
+  rh->resolved_callback = resolved_callback;
   rh->user_data = user_data;
   rh->notify = notify;
-  task = g_task_new (rh->ice, NULL, cb, user_data);
-
-  g_task_set_task_data (task, rh, (GDestroyNotify) free_resolve_host_data);
 
-  GST_TRACE_OBJECT (rh->ice, "invoking main context for resolving host %s "
+  GST_TRACE_OBJECT (nice, "invoking main context for resolving host %s "
       "with data %p", host, rh);
-  g_main_context_invoke_full (ice->priv->main_context, G_PRIORITY_DEFAULT,
-      resolve_host_main_cb, task, (GDestroyNotify) error_task_if_unhandled);
-}
-
-static GList *
-resolve_host_finish (GstWebRTCNice * ice, GAsyncResult * res, GError ** error)
-{
-  g_return_val_if_fail (g_task_is_valid (res, ice), NULL);
-
-  return g_task_propagate_pointer (G_TASK (res), error);
+  g_main_context_invoke_full (nice->priv->main_context, G_PRIORITY_DEFAULT,
+      resolve_host_main_cb, rh, (GDestroyNotify) error_resolve_if_unhandled);
 }
 
 static void
@@ -699,6 +729,7 @@
   guint nice_stream_id;
   char *prefix;
   char *postfix;
+  GstPromise *promise;
 };
 
 static void
@@ -706,6 +737,8 @@
 {
   g_free (rc->prefix);
   g_free (rc->postfix);
+  if (rc->promise)
+    gst_promise_unref (rc->promise);
   g_free (rc);
 }
 
@@ -731,27 +764,38 @@
 }
 
 static void
-on_candidate_resolved (GstWebRTCICE * ice, GAsyncResult * res,
-    gpointer user_data)
+on_candidate_resolved (GstWebRTCNice * nice, GList * addresses,
+    GError * error, gpointer user_data)
 {
   struct resolve_candidate_data *rc = user_data;
-  GError *error = NULL;
-  GList *addresses;
   char *new_candv4 = { NULL, };
   char *new_addr, *new_candidate;
   NiceCandidate *cand;
-  GstWebRTCNice *nice = GST_WEBRTC_NICE (ice);
 
-  if (!(addresses = resolve_host_finish (nice, res, &error))) {
-    GST_WARNING_OBJECT (ice, "Could not resolve candidate address: %s",
-        error->message);
-    g_clear_error (&error);
+  if (!nice)
+    error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_CANCELLED, "Cancelled");
+
+  if (error) {
+    if (rc->promise) {
+      GstStructure *s = gst_structure_new ("application/x-gst-promise", "error",
+          G_TYPE_ERROR, error, NULL);
+      gst_promise_reply (rc->promise, s);
+    } else if (nice) {
+      GST_WARNING_OBJECT (nice, "Could not resolve candidate address: %s",
+          error->message);
+    } else {
+      GST_WARNING ("Could not resolve candidate address: %s", error->message);
+    }
+
+    if (!nice)
+      g_clear_error (&error);
+
     return;
   }
 
+  GstWebRTCICE *ice = GST_WEBRTC_ICE (nice);
+
   new_addr = g_inet_address_to_string (addresses->data);
-  g_resolver_free_addresses (addresses);
-  addresses = NULL;
 
   new_candv0 = rc->prefix;
   new_candv1 = new_addr;
@@ -766,7 +810,18 @@
       rc->nice_stream_id, new_candidate);
   g_free (new_candidate);
   if (!cand) {
-    GST_WARNING_OBJECT (ice, "Could not parse candidate \'%s\'", new_candidate);
+    if (rc->promise) {
+      GError *error =
+          g_error_new (GST_WEBRTC_ERROR, GST_WEBRTC_ERROR_INTERNAL_FAILURE,
+          "Could not parse candidate \'%s\'", new_candidate);
+      GstStructure *s = gst_structure_new ("application/x-gst-promise", "error",
+          G_TYPE_ERROR, error, NULL);
+      gst_promise_reply (rc->promise, s);
+      g_clear_error (&error);
+    } else {
+      GST_WARNING_OBJECT (ice, "Could not parse candidate \'%s\'",
+          new_candidate);
+    }
     return;
   }
 
@@ -779,7 +834,7 @@
 /* candidate must start with "a=candidate:" or be NULL*/
 static void
 gst_webrtc_nice_add_candidate (GstWebRTCICE * ice, GstWebRTCICEStream * stream,
-    const gchar * candidate)
+    const gchar * candidate, GstPromise * promise)
 {
   struct NiceStreamItem *item;
   NiceCandidate *cand;
@@ -803,14 +858,37 @@
     struct resolve_candidate_data *rc;
 
     if (!get_candidate_address (candidate, &prefix, &address, &postfix)) {
-      GST_WARNING_OBJECT (nice, "Failed to retrieve address from candidate %s",
-          candidate);
+      if (promise) {
+        GError *error =
+            g_error_new (GST_WEBRTC_ERROR, GST_WEBRTC_ERROR_INTERNAL_FAILURE,
+            "Failed to retrieve address from candidate %s",
+            candidate);
+        GstStructure *s = gst_structure_new ("application/x-gst-promise",
+            "error", G_TYPE_ERROR, error, NULL);
+        gst_promise_reply (promise, s);
+        g_clear_error (&error);
+      } else {
+        GST_WARNING_OBJECT (nice,
+            "Failed to retrieve address from candidate %s", candidate);
+      }
       goto done;
     }
 
     if (!g_str_has_suffix (address, ".local")) {
-      GST_WARNING_OBJECT (nice, "candidate address \'%s\' does not end "
-          "with \'.local\'", address);
+      if (promise) {
+        GError *error =
+            g_error_new (GST_WEBRTC_ERROR, GST_WEBRTC_ERROR_INTERNAL_FAILURE,
+            "candidate address \'%s\' does not end " "with \'.local\'",
+            address);
+        GstStructure *s = gst_structure_new ("application/x-gst-promise",
+            "error", G_TYPE_ERROR, error, NULL);
+        gst_promise_reply (promise, s);
+        g_clear_error (&error);
+      } else {
+        GST_WARNING_OBJECT (nice,
+            "candidate address \'%s\' does not end "
+            "with \'.local\'", address);
+      }
       goto done;
     }
 
@@ -818,8 +896,9 @@
     rc->nice_stream_id = item->nice_stream_id;
     rc->prefix = prefix;
     rc->postfix = postfix;
+    rc->promise = promise ? gst_promise_ref (promise) : NULL;
     resolve_host_async (nice, address,
-        (GAsyncReadyCallback) on_candidate_resolved, rc,
+        on_candidate_resolved, rc,
         (GDestroyNotify) free_resolve_candidate_data);
 
     prefix = NULL;
@@ -1297,30 +1376,38 @@
 }
 
 static void
-on_http_proxy_resolved (GstWebRTCICE * ice, GAsyncResult * res,
-    gpointer user_data)
+on_http_proxy_resolved (GstWebRTCNice * nice, GList * addresses,
+    GError * error, gpointer user_data)
 {
-  GstWebRTCNice *nice = GST_WEBRTC_NICE (ice);
   GstUri *uri = user_data;
-  GList *addresses;
-  GError *error = NULL;
   const gchar *userinfo;
   gchar *user = NULL;
   gchar *pass = NULL;
+  const gchar *alpn = NULL;
   gchar *ip = NULL;
   guint port = GST_URI_NO_PORT;
+  GHashTable *extra_headers;
+
+  if (error) {
+    if (nice) {
+      GST_WARNING_OBJECT (nice, "Failed to resolve http proxy: %s",
+          error->message);
+    } else {
+      GST_WARNING ("Failed to resolve http proxy: %s", error->message);
+    }
 
-  if (!(addresses = resolve_host_finish (nice, res, &error))) {
-    GST_WARNING_OBJECT (ice, "Failed to resolve http proxy: %s",
-        error->message);
-    g_clear_error (&error);
     return;
   }
 
+  if (!nice) {
+    GST_WARNING ("Missing GstWebRTCNice instance");
+    return;
+  }
+
+  GstWebRTCICE *ice = GST_WEBRTC_ICE (nice);
+
   /* XXX: only the first IP is used */
   ip = g_inet_address_to_string (addresses->data);
-  g_resolver_free_addresses (addresses);
-  addresses = NULL;
 
   if (!ip) {
     GST_ERROR_OBJECT (ice, "failed to resolve host for proxy");
@@ -1338,13 +1425,23 @@
   userinfo = gst_uri_get_userinfo (uri);
   _parse_userinfo (userinfo, &user, &pass);
 
+  alpn = gst_uri_get_query_value (uri, "alpn");
+  if (!alpn) {
+    alpn = "webrtc";
+  }
+  extra_headers = g_hash_table_new_full (g_str_hash,
+      g_str_equal, g_free, g_free);
+  g_hash_table_insert (extra_headers, g_strdup ("ALPN"), g_strdup (alpn));
+
   g_object_set (nice->priv->nice_agent,
       "proxy-ip", ip, "proxy-port", port, "proxy-type", NICE_PROXY_TYPE_HTTP,
-      "proxy-username", user, "proxy-password", pass, NULL);
+      "proxy-username", user, "proxy-password", pass, "proxy-extra-headers",
+      extra_headers, NULL);
 
   g_free (ip);
   g_free (user);
   g_free (pass);
+  g_hash_table_unref (extra_headers);
 }
 
 static GstUri *
@@ -1388,7 +1485,7 @@
     goto out;
   }
 
-  resolve_host_async (nice, host, (GAsyncReadyCallback) on_http_proxy_resolved,
+  resolve_host_async (nice, host, on_http_proxy_resolved,
       gst_uri_ref (uri), (GDestroyNotify) gst_uri_unref);
 
 out:
@@ -1584,6 +1681,11 @@
   options |= NICE_AGENT_OPTION_ICE_TRICKLE;
   options |= NICE_AGENT_OPTION_REGULAR_NOMINATION;
 
+/*  https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/257 */
+#if HAVE_LIBNICE_CONSENT_FIX
+  options |= NICE_AGENT_OPTION_CONSENT_FRESHNESS;
+#endif
+
   ice->priv->nice_agent = nice_agent_new_full (ice->priv->main_context,
       NICE_COMPATIBILITY_RFC5245, options);
   g_signal_connect (ice->priv->nice_agent, "new-candidate-full",

gst-plugins-bad-1.22.7.tar.xz/gst-plugins-bad.doap -> gst-plugins-bad-1.24.5.tar.xz/gst-plugins-bad.doap Changed

@@ -35,71 +35,91 @@
 
  <release>
   <Version>
-   <revision>1.22.7</revision>
-   <branch>1.22</branch>
+   <revision>1.24.5</revision>
+   <branch>1.24</branch>
    <name></name>
-   <created>2023-11-13</created>
-   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.7.tar.xz" />
+   <created>2024-06-20</created>
+   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.24.5.tar.xz" />
   </Version>
  </release>
 
  <release>
   <Version>
-   <revision>1.22.6</revision>
-   <branch>1.22</branch>
+   <revision>1.24.4</revision>
+   <branch>1.24</branch>
    <name></name>
-   <created>2023-09-20</created>
-   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.6.tar.xz" />
+   <created>2024-05-29</created>
+   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.24.4.tar.xz" />
   </Version>
  </release>
 
  <release>
   <Version>
-   <revision>1.22.5</revision>
-   <branch>1.22</branch>
+   <revision>1.24.3</revision>
+   <branch>1.24</branch>
    <name></name>
-   <created>2023-07-20</created>
-   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.5.tar.xz" />
+   <created>2024-04-30</created>
+   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.24.3.tar.xz" />
   </Version>
  </release>
 
  <release>
   <Version>
-   <revision>1.22.4</revision>
-   <branch>1.22</branch>
+   <revision>1.24.2</revision>
+   <branch>1.24</branch>
    <name></name>
-   <created>2023-06-20</created>
-   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.4.tar.xz" />
+   <created>2024-04-09</created>
+   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.24.2.tar.xz" />
   </Version>
  </release>
 
  <release>
   <Version>
-   <revision>1.22.3</revision>
-   <branch>1.22</branch>
+   <revision>1.24.1</revision>
+   <branch>1.24</branch>
    <name></name>
-   <created>2023-05-19</created>
-   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.3.tar.xz" />
+   <created>2024-03-21</created>
+   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.24.1.tar.xz" />
   </Version>
  </release>
 
  <release>
   <Version>
-   <revision>1.22.2</revision>
-   <branch>1.22</branch>
+   <revision>1.24.0</revision>
+   <branch>main</branch>
+   <name></name>
+   <created>2024-03-04</created>
+   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.24.0.tar.xz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>1.23.90</revision>
+   <branch>main</branch>
    <name></name>
-   <created>2023-04-11</created>
-   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.2.tar.xz" />
+   <created>2024-02-23</created>
+   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.23.90.tar.xz" />
   </Version>
  </release>
 
  <release>
   <Version>
-   <revision>1.22.1</revision>
-   <branch>1.22</branch>
+   <revision>1.23.2</revision>
+   <branch>main</branch>
+   <name></name>
+   <created>2024-02-15</created>
+   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.23.2.tar.xz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>1.23.1</revision>
+   <branch>main</branch>
    <name></name>
-   <created>2023-03-04</created>
-   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.1.tar.xz" />
+   <created>2024-02-06</created>
+   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.23.1.tar.xz" />
   </Version>
  </release>

gst-plugins-bad-1.22.7.tar.xz/gst/autoconvert/gstautoconvert.c -> gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstautoconvert.c Changed

@@ -3,6 +3,8 @@
  *  Copyright 2007-2012 Collabora Ltd
  *   @author: Olivier Crete <olivier.crete@collabora.com>
  *  Copyright 2007-2008 Nokia
+ *  Copyright 2023-2024 Igalia S.L.
+ *   @author: Thibault Saunier <tsaunier@igalia.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -34,231 +36,85 @@
  * elements.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "gstautoconvert.h"
-
-#include <string.h>
+#include <gst/pbutils/pbutils.h>
 
 GST_DEBUG_CATEGORY (autoconvert_debug);
 #define GST_CAT_DEFAULT (autoconvert_debug)
-
-#define GST_AUTOCONVERT_LOCK(ac) GST_OBJECT_LOCK (ac)
-#define GST_AUTOCONVERT_UNLOCK(ac) GST_OBJECT_UNLOCK (ac)
-
-/* elementfactory information */
-static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS_ANY);
-
-static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS_ANY);
-
-static GstStaticPadTemplate sink_internal_template =
-GST_STATIC_PAD_TEMPLATE ("sink_internal",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS_ANY);
-
-static GstStaticPadTemplate src_internal_template =
-GST_STATIC_PAD_TEMPLATE ("src_internal",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS_ANY);
-
-/* GstAutoConvert signals and args */
-enum
+struct _GstAutoConvert
 {
-  /* FILL ME */
-  LAST_SIGNAL
+  GstBaseAutoConvert parent;
 };
 
+G_DEFINE_TYPE (GstAutoConvert, gst_auto_convert, GST_TYPE_BASE_AUTO_CONVERT);
+GST_ELEMENT_REGISTER_DEFINE (autoconvert, "autoconvert",
+    GST_RANK_NONE, gst_auto_convert_get_type ());
+
 enum
 {
   PROP_0,
-  PROP_FACTORIES
+  PROP_FACTORIES,
+  PROP_FACTORY_NAMES,
 };
 
-static void gst_auto_convert_set_property (GObject * object,
-    guint prop_id, const GValue * value, GParamSpec * pspec);
-static void gst_auto_convert_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_auto_convert_dispose (GObject * object);
-
-static GstElement *gst_auto_convert_get_subelement (GstAutoConvert *
-    autoconvert);
-static GstPad *gst_auto_convert_get_internal_sinkpad (GstAutoConvert *
-    autoconvert);
-static GstPad *gst_auto_convert_get_internal_srcpad (GstAutoConvert *
-    autoconvert);
-
-static GstIterator *gst_auto_convert_iterate_internal_links (GstPad * pad,
-    GstObject * parent);
-
-static gboolean gst_auto_convert_sink_setcaps (GstAutoConvert * autoconvert,
-    GstCaps * caps);
-static GstCaps *gst_auto_convert_getcaps (GstAutoConvert * autoconvert,
-    GstCaps * filter, GstPadDirection dir);
-static GstFlowReturn gst_auto_convert_sink_chain (GstPad * pad,
-    GstObject * parent, GstBuffer * buffer);
-static GstFlowReturn gst_auto_convert_sink_chain_list (GstPad * pad,
-    GstObject * parent, GstBufferList * list);
-static gboolean gst_auto_convert_sink_event (GstPad * pad, GstObject * parent,
-    GstEvent * event);
-static gboolean gst_auto_convert_sink_query (GstPad * pad, GstObject * parent,
-    GstQuery * query);
-
-static gboolean gst_auto_convert_src_event (GstPad * pad, GstObject * parent,
-    GstEvent * event);
-static gboolean gst_auto_convert_src_query (GstPad * pad, GstObject * parent,
-    GstQuery * query);
-
-static GstFlowReturn gst_auto_convert_internal_sink_chain (GstPad * pad,
-    GstObject * parent, GstBuffer * buffer);
-static GstFlowReturn gst_auto_convert_internal_sink_chain_list (GstPad * pad,
-    GstObject * parent, GstBufferList * list);
-static gboolean gst_auto_convert_internal_sink_event (GstPad * pad,
-    GstObject * parent, GstEvent * event);
-static gboolean gst_auto_convert_internal_sink_query (GstPad * pad,
-    GstObject * parent, GstQuery * query);
-
-static gboolean gst_auto_convert_internal_src_event (GstPad * pad,
-    GstObject * parent, GstEvent * event);
-static gboolean gst_auto_convert_internal_src_query (GstPad * pad,
-    GstObject * parent, GstQuery * query);
-
-static GList *gst_auto_convert_load_factories (GstAutoConvert * autoconvert);
-static GstElement
-    * gst_auto_convert_get_or_make_element_from_factory (GstAutoConvert *
-    autoconvert, GstElementFactory * factory);
-static gboolean gst_auto_convert_activate_element (GstAutoConvert * autoconvert,
-    GstElement * element, GstCaps * caps);
-
-static GQuark internal_srcpad_quark = 0;
-static GQuark internal_sinkpad_quark = 0;
-static GQuark parent_quark = 0;
-
-G_DEFINE_TYPE (GstAutoConvert, gst_auto_convert, GST_TYPE_BIN);
-GST_ELEMENT_REGISTER_DEFINE (autoconvert, "autoconvert",
-    GST_RANK_NONE, GST_TYPE_AUTO_CONVERT);
-
-static void
-gst_auto_convert_class_init (GstAutoConvertClass * klass)
-{
-  GObjectClass *gobject_class = (GObjectClass *) klass;
-  GstElementClass *gstelement_class = (GstElementClass *) klass;
-
-  GST_DEBUG_CATEGORY_INIT (autoconvert_debug, "autoconvert", 0,
-      "Auto convert based on caps");
-
-  internal_srcpad_quark = g_quark_from_static_string ("internal_srcpad");
-  internal_sinkpad_quark = g_quark_from_static_string ("internal_sinkpad");
-  parent_quark = g_quark_from_static_string ("parent");
-
-
-  gst_element_class_add_static_pad_template (gstelement_class, &srctemplate);
-  gst_element_class_add_static_pad_template (gstelement_class, &sinktemplate);
-
-  gst_element_class_set_static_metadata (gstelement_class,
-      "Select converter based on caps", "Generic/Bin",
-      "Selects the right transform element based on the caps",
-      "Olivier Crete <olivier.crete@collabora.com>");
-
-  gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_auto_convert_dispose);
-
-  gobject_class->set_property = gst_auto_convert_set_property;
-  gobject_class->get_property = gst_auto_convert_get_property;
-
-  g_object_class_install_property (gobject_class, PROP_FACTORIES,
-      g_param_spec_pointer ("factories",
-          "GList of GstElementFactory",
-          "GList of GstElementFactory objects to pick from (the element takes"
-          " ownership of the list (NULL means it will go through all possible"
-          " elements), can only be set once",
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-}
-
-static void
-gst_auto_convert_init (GstAutoConvert * autoconvert)
-{
-  autoconvert->sinkpad =
-      gst_pad_new_from_static_template (&sinktemplate, "sink");
-  autoconvert->srcpad = gst_pad_new_from_static_template (&srctemplate, "src");
-
-  gst_pad_set_chain_function (autoconvert->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_sink_chain));
-  gst_pad_set_chain_list_function (autoconvert->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_sink_chain_list));
-  gst_pad_set_event_function (autoconvert->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_sink_event));
-  gst_pad_set_query_function (autoconvert->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_sink_query));
-  gst_pad_set_iterate_internal_links_function (autoconvert->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_iterate_internal_links));
-
-  gst_pad_set_event_function (autoconvert->srcpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_src_event));
-  gst_pad_set_query_function (autoconvert->srcpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_src_query));
-  gst_pad_set_iterate_internal_links_function (autoconvert->sinkpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_iterate_internal_links));
-
-  gst_element_add_pad (GST_ELEMENT (autoconvert), autoconvert->sinkpad);
-  gst_element_add_pad (GST_ELEMENT (autoconvert), autoconvert->srcpad);
-}
-
-static void
-gst_auto_convert_dispose (GObject * object)
-{
-  GstAutoConvert *autoconvert = GST_AUTO_CONVERT (object);
-
-  g_clear_object (&autoconvert->current_subelement);
-  g_clear_object (&autoconvert->current_internal_sinkpad);
-  g_clear_object (&autoconvert->current_internal_srcpad);
-
-  for (;;) {
-    GList *factories = g_atomic_pointer_get (&autoconvert->factories);
-
-    if (g_atomic_pointer_compare_and_exchange (&autoconvert->factories,
-            factories, NULL)) {
-      gst_plugin_feature_list_free (factories);
-      break;
-    }
-  }
-
-  G_OBJECT_CLASS (gst_auto_convert_parent_class)->dispose (object);
-}
-
 static void
 gst_auto_convert_set_property (GObject * object,
     guint prop_id, const GValue * value, GParamSpec * pspec)
 {
-  GstAutoConvert *autoconvert = GST_AUTO_CONVERT (object);
+  GstBaseAutoConvert *baseautoconvert = GST_BASE_AUTO_CONVERT (object);
 
   switch (prop_id) {
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     case PROP_FACTORIES:
-      if (g_atomic_pointer_get (&autoconvert->factories) == NULL) {
-        GList *factories = g_value_get_pointer (value);
-        factories = g_list_copy (factories);
-        if (g_atomic_pointer_compare_and_exchange (&autoconvert->factories,
-                (GList *) NULL, factories))
-          g_list_foreach (factories, (GFunc) g_object_ref, NULL);
-        else
-          g_list_free (factories);
+    {
+      GList *factories;
+
+      factories = g_value_get_pointer (value);
+      GST_OBJECT_LOCK (object);
+      if (!baseautoconvert->factories)
+        baseautoconvert->factories =
+            g_list_copy_deep (factories, (GCopyFunc) gst_object_ref, NULL);
+      else
+        GST_WARNING_OBJECT (object, "Can not reset factories after they"
+            " have been set or auto-discovered");
+      GST_OBJECT_UNLOCK (object);
+      break;
+    }
+    case PROP_FACTORY_NAMES:
+    {
+      GST_OBJECT_LOCK (object);
+      if (!baseautoconvert->factories) {
+        gint i;
+
+        for (i = 0; i < gst_value_array_get_size (value); i++) {
+          const GValue *v = gst_value_array_get_value (value, i);
+          GstElementFactory *factory = (GstElementFactory *)
+              gst_registry_find_feature (gst_registry_get (),
+              g_value_get_string (v), GST_TYPE_ELEMENT_FACTORY);
+
+          if (!factory) {
+            gst_element_post_message (GST_ELEMENT_CAST (baseautoconvert),
+                gst_missing_element_message_new (GST_ELEMENT_CAST
+                    (baseautoconvert), g_value_get_string (v)));
+            continue;
+          }
+
+          baseautoconvert->factories =
+              g_list_append (baseautoconvert->factories, factory);
+        }
       } else {
         GST_WARNING_OBJECT (object, "Can not reset factories after they"
             " have been set or auto-discovered");
       }
+      GST_OBJECT_UNLOCK (object);
       break;
+    }
   }
 }
 
@@ -266,1085 +122,81 @@
 gst_auto_convert_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec)
 {
-  GstAutoConvert *autoconvert = GST_AUTO_CONVERT (object);
+  GstBaseAutoConvert *baseautoconvert = GST_BASE_AUTO_CONVERT (object);
 
   switch (prop_id) {
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     case PROP_FACTORIES:
-      g_value_set_pointer (value,
-          g_atomic_pointer_get (&autoconvert->factories));
-      break;
-  }
-}
-
-
-static GstElement *
-gst_auto_convert_get_element_by_type (GstAutoConvert * autoconvert, GType type)
-{
-  GList *item;
-  GstBin *bin = GST_BIN (autoconvert);
-  GstElement *element = NULL;
-
-  g_return_val_if_fail (type != 0, NULL);
-
-  GST_OBJECT_LOCK (autoconvert);
-
-  for (item = bin->children; item; item = item->next) {
-    if (G_TYPE_CHECK_INSTANCE_TYPE (item->data, type)) {
-      element = gst_object_ref (item->data);
+      GST_OBJECT_LOCK (object);
+      g_value_set_pointer (value, baseautoconvert->factories);
+      GST_OBJECT_UNLOCK (object);
       break;
-    }
-  }
-
-  GST_OBJECT_UNLOCK (autoconvert);
-
-  return element;
-}
-
-/**
- * get_pad_by_direction:
- * @element: The Element
- * @direction: The direction
- *
- * Gets a #GstPad that goes in the requested direction. I will return NULL
- * if there is no pad or if there is more than one pad in this direction
- */
-
-static GstPad *
-get_pad_by_direction (GstElement * element, GstPadDirection direction)
-{
-  GstIterator *iter = gst_element_iterate_pads (element);
-  GstPad *selected_pad = NULL;
-  gboolean done;
-  GValue item = { 0, };
-
-  if (!iter)
-    return NULL;
-
-  done = FALSE;
-  while (!done) {
-    switch (gst_iterator_next (iter, &item)) {
-      case GST_ITERATOR_OK:
-      {
-        GstPad *pad = g_value_get_object (&item);
-
-        if (gst_pad_get_direction (pad) == direction) {
-          /* We check if there is more than one pad in this direction,
-           * if there is, we return NULL so that the element is refused
-           */
-          if (selected_pad) {
-            done = TRUE;
-            gst_object_unref (selected_pad);
-            selected_pad = NULL;
-          } else {
-            selected_pad = g_object_ref (pad);
-          }
-        }
-        g_value_unset (&item);
-      }
-        break;
-      case GST_ITERATOR_RESYNC:
-        if (selected_pad) {
-          gst_object_unref (selected_pad);
-          selected_pad = NULL;
-        }
-        gst_iterator_resync (iter);
-        break;
-      case GST_ITERATOR_ERROR:
-        GST_ERROR ("Error iterating pads of element %s",
-            GST_OBJECT_NAME (element));
-        gst_object_unref (selected_pad);
-        selected_pad = NULL;
-        done = TRUE;
-        break;
-      case GST_ITERATOR_DONE:
-        done = TRUE;
-        break;
-    }
-  }
-  g_value_unset (&item);
-  gst_iterator_free (iter);
-
-  if (!selected_pad)
-    GST_ERROR ("Did not find pad of direction %d in %s",
-        direction, GST_OBJECT_NAME (element));
-
-  return selected_pad;
-}
-
-static GstElement *
-gst_auto_convert_get_subelement (GstAutoConvert * autoconvert)
-{
-  GstElement *element = NULL;
-
-  GST_AUTOCONVERT_LOCK (autoconvert);
-  if (autoconvert->current_subelement)
-    element = gst_object_ref (autoconvert->current_subelement);
-  GST_AUTOCONVERT_UNLOCK (autoconvert);
-
-  return element;
-}
-
-static GstPad *
-gst_auto_convert_get_internal_sinkpad (GstAutoConvert * autoconvert)
-{
-  GstPad *pad = NULL;
-
-  GST_AUTOCONVERT_LOCK (autoconvert);
-  if (autoconvert->current_internal_sinkpad)
-    pad = gst_object_ref (autoconvert->current_internal_sinkpad);
-  GST_AUTOCONVERT_UNLOCK (autoconvert);
-
-  return pad;
-}
-
-static GstPad *
-gst_auto_convert_get_internal_srcpad (GstAutoConvert * autoconvert)
-{
-  GstPad *pad = NULL;
-
-  GST_AUTOCONVERT_LOCK (autoconvert);
-  if (autoconvert->current_internal_srcpad)
-    pad = gst_object_ref (autoconvert->current_internal_srcpad);
-  GST_AUTOCONVERT_UNLOCK (autoconvert);
-
-  return pad;
-}
-
-/*
- * This function creates and adds an element to the GstAutoConvert
- * it then creates the internal pads and links them
- *
- */
-
-static GstElement *
-gst_auto_convert_add_element (GstAutoConvert * autoconvert,
-    GstElementFactory * factory)
-{
-  GstElement *element = NULL;
-  GstPad *internal_sinkpad = NULL;
-  GstPad *internal_srcpad = NULL;
-  GstPad *sinkpad = NULL;
-  GstPad *srcpad = NULL;
-  GstPadLinkReturn padlinkret;
-
-  GST_DEBUG_OBJECT (autoconvert, "Adding element %s to the autoconvert bin",
-      gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)));
-
-  element = gst_element_factory_create (factory, NULL);
-  if (!element)
-    return NULL;
-
-  if (!gst_bin_add (GST_BIN (autoconvert), element)) {
-    GST_ERROR_OBJECT (autoconvert, "Could not add element %s to the bin",
-        GST_OBJECT_NAME (element));
-    gst_object_unref (element);
-    return NULL;
-  }
-
-  srcpad = get_pad_by_direction (element, GST_PAD_SRC);
-  if (!srcpad) {
-    GST_ERROR_OBJECT (autoconvert, "Could not find source in %s",
-        GST_OBJECT_NAME (element));
-    goto error;
-  }
-
-  sinkpad = get_pad_by_direction (element, GST_PAD_SINK);
-  if (!sinkpad) {
-    GST_ERROR_OBJECT (autoconvert, "Could not find sink in %s",
-        GST_OBJECT_NAME (element));
-    goto error;
-  }
-
-  internal_sinkpad =
-      gst_pad_new_from_static_template (&sink_internal_template,
-      "sink_internal");
-  internal_srcpad =
-      gst_pad_new_from_static_template (&src_internal_template, "src_internal");
-
-  if (!internal_sinkpad || !internal_srcpad) {
-    GST_ERROR_OBJECT (autoconvert, "Could not create internal pads");
-    if (internal_srcpad)
-      gst_object_unref (internal_srcpad);
-    if (internal_sinkpad)
-      gst_object_unref (internal_sinkpad);
-    goto error;
-  }
-
-  g_object_weak_ref (G_OBJECT (element), (GWeakNotify) gst_object_unref,
-      internal_sinkpad);
-  g_object_weak_ref (G_OBJECT (element), (GWeakNotify) gst_object_unref,
-      internal_srcpad);
-
-  gst_pad_set_active (internal_sinkpad, TRUE);
-  gst_pad_set_active (internal_srcpad, TRUE);
-
-  g_object_set_qdata (G_OBJECT (internal_srcpad), parent_quark, autoconvert);
-  g_object_set_qdata (G_OBJECT (internal_sinkpad), parent_quark, autoconvert);
-
-  gst_pad_set_chain_function (internal_sinkpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_internal_sink_chain));
-  gst_pad_set_chain_list_function (internal_sinkpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_internal_sink_chain_list));
-  gst_pad_set_event_function (internal_sinkpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_internal_sink_event));
-  gst_pad_set_query_function (internal_sinkpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_internal_sink_query));
-
-  gst_pad_set_event_function (internal_srcpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_internal_src_event));
-  gst_pad_set_query_function (internal_srcpad,
-      GST_DEBUG_FUNCPTR (gst_auto_convert_internal_src_query));
-
-  padlinkret = gst_pad_link_full (internal_srcpad, sinkpad,
-      GST_PAD_LINK_CHECK_NOTHING);
-  if (GST_PAD_LINK_FAILED (padlinkret)) {
-    GST_WARNING_OBJECT (autoconvert, "Could not links pad %s:%s to %s:%s"
-        " for reason %d",
-        GST_DEBUG_PAD_NAME (internal_srcpad),
-        GST_DEBUG_PAD_NAME (sinkpad), padlinkret);
-    goto error;
-  }
-
-  padlinkret = gst_pad_link_full (srcpad, internal_sinkpad,
-      GST_PAD_LINK_CHECK_NOTHING);
-  if (GST_PAD_LINK_FAILED (padlinkret)) {
-    GST_WARNING_OBJECT (autoconvert, "Could not links pad %s:%s to %s:%s"
-        " for reason %d",
-        GST_DEBUG_PAD_NAME (internal_srcpad),
-        GST_DEBUG_PAD_NAME (sinkpad), padlinkret);
-    goto error;
-  }
-
-  g_object_set_qdata (G_OBJECT (element),
-      internal_srcpad_quark, internal_srcpad);
-  g_object_set_qdata (G_OBJECT (element),
-      internal_sinkpad_quark, internal_sinkpad);
-
-  /* Iffy */
-  gst_element_sync_state_with_parent (element);
-
-  /* Increment the reference count we will return to the caller */
-  gst_object_ref (element);
-
-  /* unref sink and src pad */
-  gst_object_unref (srcpad);
-  gst_object_unref (sinkpad);
-  return element;
-
-error:
-  gst_element_set_locked_state (element, TRUE);
-  gst_element_set_state (element, GST_STATE_NULL);
-  gst_bin_remove (GST_BIN (autoconvert), element);
-
-  if (srcpad)
-    gst_object_unref (srcpad);
-  if (sinkpad)
-    gst_object_unref (sinkpad);
-
-  return NULL;
-}
-
-static GstElement *
-gst_auto_convert_get_or_make_element_from_factory (GstAutoConvert * autoconvert,
-    GstElementFactory * factory)
-{
-  GstElement *element = NULL;
-  GstElementFactory *loaded_factory =
-      GST_ELEMENT_FACTORY (gst_plugin_feature_load (GST_PLUGIN_FEATURE
-          (factory)));
-
-  if (!loaded_factory)
-    return NULL;
-
-  element = gst_auto_convert_get_element_by_type (autoconvert,
-      gst_element_factory_get_element_type (loaded_factory));
-
-  if (!element) {
-    element = gst_auto_convert_add_element (autoconvert, loaded_factory);
-  }
-
-  gst_object_unref (loaded_factory);
-
-  return element;
-}
-
-/*
- * This function checks if there is one and only one pad template on the
- * factory that can accept the given caps. If there is one and only one,
- * it returns TRUE, otherwise, its FALSE
- */
-
-static gboolean
-factory_can_intersect (GstAutoConvert * autoconvert,
-    GstElementFactory * factory, GstPadDirection direction, GstCaps * caps)
-{
-  const GList *templates;
-  gint has_direction = FALSE;
-  gboolean ret = FALSE;
-
-  g_return_val_if_fail (factory != NULL, FALSE);
-  g_return_val_if_fail (caps != NULL, FALSE);
-
-  templates = gst_element_factory_get_static_pad_templates (factory);
-
-  while (templates) {
-    GstStaticPadTemplate *template = (GstStaticPadTemplate *) templates->data;
+    case PROP_FACTORY_NAMES:
+    {
+      GList *tmp;
 
-    if (template->direction == direction) {
-      GstCaps *tmpl_caps = NULL;
-      gboolean intersect;
+      GST_OBJECT_LOCK (object);
+      for (tmp = baseautoconvert->factories; tmp; tmp = tmp->next) {
+        GValue factory = G_VALUE_INIT;
 
-      /* If there is more than one pad in this direction, we return FALSE
-       * Only transform elements (with one sink and one source pad)
-       * are accepted
-       */
-      if (has_direction) {
-        GST_DEBUG_OBJECT (autoconvert, "Factory %p"
-            " has more than one static template with dir %d",
-            template, direction);
-        return FALSE;
+        g_value_init (&factory, G_TYPE_STRING);
+        g_value_take_string (&factory, gst_object_get_name (tmp->data));
+        gst_value_array_append_and_take_value (value, &factory);
       }
-      has_direction = TRUE;
-
-      tmpl_caps = gst_static_caps_get (&template->static_caps);
-      intersect = gst_caps_can_intersect (tmpl_caps, caps);
-      GST_DEBUG_OBJECT (autoconvert, "Factories %" GST_PTR_FORMAT
-          " static caps %" GST_PTR_FORMAT " and caps %" GST_PTR_FORMAT
-          " can%s intersect", factory, tmpl_caps, caps,
-          intersect ? "" : " not");
-      gst_caps_unref (tmpl_caps);
-
-      ret |= intersect;
-    }
-    templates = g_list_next (templates);
-  }
-
-  return ret;
-}
-
-static gboolean
-sticky_event_push (GstPad * pad, GstEvent ** event, gpointer user_data)
-{
-  GstAutoConvert *autoconvert = GST_AUTO_CONVERT (user_data);
-
-  gst_event_ref (*event);
-  gst_pad_push_event (autoconvert->current_internal_srcpad, *event);
-
-  return TRUE;
-}
-
-static gboolean
-gst_auto_convert_activate_element (GstAutoConvert * autoconvert,
-    GstElement * element, GstCaps * caps)
-{
-  GstPad *internal_srcpad = g_object_get_qdata (G_OBJECT (element),
-      internal_srcpad_quark);
-  GstPad *internal_sinkpad = g_object_get_qdata (G_OBJECT (element),
-      internal_sinkpad_quark);
-
-  if (caps) {
-    /* check if the element can really accept said caps */
-    if (!gst_pad_peer_query_accept_caps (internal_srcpad, caps)) {
-      GST_DEBUG_OBJECT (autoconvert, "Could not set %s:%s to %"
-          GST_PTR_FORMAT, GST_DEBUG_PAD_NAME (internal_srcpad), caps);
-      return FALSE;
-    }
-  }
-
-  GST_AUTOCONVERT_LOCK (autoconvert);
-  gst_object_replace ((GstObject **) & autoconvert->current_subelement,
-      GST_OBJECT (element));
-  gst_object_replace ((GstObject **) & autoconvert->current_internal_srcpad,
-      GST_OBJECT (internal_srcpad));
-  gst_object_replace ((GstObject **) & autoconvert->current_internal_sinkpad,
-      GST_OBJECT (internal_sinkpad));
-  GST_AUTOCONVERT_UNLOCK (autoconvert);
-
-  gst_pad_sticky_events_foreach (autoconvert->sinkpad, sticky_event_push,
-      autoconvert);
-
-  gst_pad_push_event (autoconvert->sinkpad, gst_event_new_reconfigure ());
-
-  GST_INFO_OBJECT (autoconvert, "Selected element %s",
-      GST_OBJECT_NAME (GST_OBJECT (element)));
-
-  gst_object_unref (element);
-
-  return TRUE;
-}
-
-static GstIterator *
-gst_auto_convert_iterate_internal_links (GstPad * pad, GstObject * parent)
-{
-  GstAutoConvert *autoconvert = GST_AUTO_CONVERT (parent);
-  GstIterator *it = NULL;
-  GstPad *internal;
-
-  if (pad == autoconvert->sinkpad)
-    internal = gst_auto_convert_get_internal_srcpad (autoconvert);
-  else
-    internal = gst_auto_convert_get_internal_sinkpad (autoconvert);
-
-  if (internal) {
-    GValue val = { 0, };
-
-    g_value_init (&val, GST_TYPE_PAD);
-    g_value_take_object (&val, internal);
-
-    it = gst_iterator_new_single (GST_TYPE_PAD, &val);
-    g_value_unset (&val);
-  }
-
-  return it;
-}
-
-/*
- * If there is already an internal element, it will try to call set_caps on it
- *
- * If there isn't an internal element or if the set_caps() on the internal
- * element failed, it will try to find another element where it would succeed
- * and will change the internal element.
- */
-
-static gboolean
-gst_auto_convert_sink_setcaps (GstAutoConvert * autoconvert, GstCaps * caps)
-{
-  GList *elem;
-  GstCaps *other_caps = NULL;
-  GList *factories;
-  GstCaps *current_caps;
-
-  g_return_val_if_fail (autoconvert != NULL, FALSE);
-
-  current_caps = gst_pad_get_current_caps (autoconvert->sinkpad);
-  if (current_caps) {
-    if (gst_caps_is_equal_fixed (caps, current_caps)) {
-      gst_caps_unref (current_caps);
-      return TRUE;
-    }
-    gst_caps_unref (current_caps);
-  }
-
-  if (autoconvert->current_subelement) {
-    if (gst_pad_peer_query_accept_caps (autoconvert->current_internal_srcpad,
-            caps)) {
-      /* If we can set the new caps on the current element,
-       * then we just get out
-       */
-      GST_DEBUG_OBJECT (autoconvert, "Could set %s:%s to %" GST_PTR_FORMAT,
-          GST_DEBUG_PAD_NAME (autoconvert->current_internal_srcpad), caps);
-      goto get_out;
-    } else {
-      /* If the current element doesn't work,
-       * then we remove the current element before finding a new one.
-       */
-      GST_AUTOCONVERT_LOCK (autoconvert);
-      g_clear_object (&autoconvert->current_subelement);
-      g_clear_object (&autoconvert->current_internal_sinkpad);
-      g_clear_object (&autoconvert->current_internal_srcpad);
-      GST_AUTOCONVERT_UNLOCK (autoconvert);
-    }
-  }
-
-  other_caps = gst_pad_peer_query_caps (autoconvert->srcpad, NULL);
-
-  factories = g_atomic_pointer_get (&autoconvert->factories);
-
-  if (!factories)
-    factories = gst_auto_convert_load_factories (autoconvert);
-
-  for (elem = factories; elem; elem = g_list_next (elem)) {
-    GstElementFactory *factory = GST_ELEMENT_FACTORY (elem->data);
-    GstElement *element;
-
-    /* Lets first check if according to the static pad templates on the factory
-     * these caps have any chance of success
-     */
-    if (!factory_can_intersect (autoconvert, factory, GST_PAD_SINK, caps)) {
-      GST_LOG_OBJECT (autoconvert, "Factory %s does not accept sink caps %"
-          GST_PTR_FORMAT,
-          gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)), caps);
-      continue;
-    }
-    if (other_caps != NULL) {
-      if (!factory_can_intersect (autoconvert, factory, GST_PAD_SRC,
-              other_caps)) {
-        GST_LOG_OBJECT (autoconvert,
-            "Factory %s does not accept src caps %" GST_PTR_FORMAT,
-            gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)),
-            other_caps);
-        continue;
-      }
-    }
-
-    /* The element had a chance of success, lets make it */
-    element =
-        gst_auto_convert_get_or_make_element_from_factory (autoconvert,
-        factory);
-    if (!element)
-      continue;
-
-    /* And make it the current child */
-    if (gst_auto_convert_activate_element (autoconvert, element, caps))
+      GST_OBJECT_UNLOCK (object);
       break;
-    else
-      gst_object_unref (element);
-  }
-
-get_out:
-  if (other_caps)
-    gst_caps_unref (other_caps);
-
-  if (autoconvert->current_subelement) {
-    return TRUE;
-  } else {
-    GST_WARNING_OBJECT (autoconvert,
-        "Could not find a matching element for caps");
-    return FALSE;
-  }
-}
-
-/*
- * This function filters the pad pad templates, taking only transform element
- * (with one sink and one src pad)
- */
-
-static gboolean
-gst_auto_convert_default_filter_func (GstPluginFeature * feature,
-    gpointer user_data)
-{
-  GstElementFactory *factory = NULL;
-  const GList *static_pad_templates, *tmp;
-  GstStaticPadTemplate *src = NULL, *sink = NULL;
-
-  if (!GST_IS_ELEMENT_FACTORY (feature))
-    return FALSE;
-
-  factory = GST_ELEMENT_FACTORY (feature);
-
-  static_pad_templates = gst_element_factory_get_static_pad_templates (factory);
-
-  for (tmp = static_pad_templates; tmp; tmp = g_list_next (tmp)) {
-    GstStaticPadTemplate *template = tmp->data;
-    GstCaps *caps;
-
-    if (template->presence == GST_PAD_SOMETIMES)
-      return FALSE;
-
-    if (template->presence != GST_PAD_ALWAYS)
-      continue;
-
-    switch (template->direction) {
-      case GST_PAD_SRC:
-        if (src)
-          return FALSE;
-        src = template;
-        break;
-      case GST_PAD_SINK:
-        if (sink)
-          return FALSE;
-        sink = template;
-        break;
-      default:
-        return FALSE;
-    }
-
-    caps = gst_static_pad_template_get_caps (template);
-
-    if (gst_caps_is_any (caps) || gst_caps_is_empty (caps))
-      return FALSE;
-  }
-
-  if (!src || !sink)
-    return FALSE;
-
-  return TRUE;
-}
-
-/* function used to sort element features
- * Copy-pasted from decodebin */
-static gint
-compare_ranks (GstPluginFeature * f1, GstPluginFeature * f2)
-{
-  gint diff;
-  const gchar *rname1, *rname2;
-
-  diff = gst_plugin_feature_get_rank (f2) - gst_plugin_feature_get_rank (f1);
-  if (diff != 0)
-    return diff;
-
-  rname1 = gst_plugin_feature_get_name (f1);
-  rname2 = gst_plugin_feature_get_name (f2);
-
-  diff = strcmp (rname2, rname1);
-
-  return diff;
-}
-
-static GList *
-gst_auto_convert_load_factories (GstAutoConvert * autoconvert)
-{
-  GList *all_factories;
-
-  all_factories =
-      gst_registry_feature_filter (gst_registry_get (),
-      gst_auto_convert_default_filter_func, FALSE, NULL);
-
-  all_factories = g_list_sort (all_factories, (GCompareFunc) compare_ranks);
-
-  g_assert (all_factories);
-
-  if (!g_atomic_pointer_compare_and_exchange (&autoconvert->factories,
-          (GList *) NULL, all_factories)) {
-    gst_plugin_feature_list_free (all_factories);
-  }
-
-  return g_atomic_pointer_get (&autoconvert->factories);
-}
-
-/* In this case, we should almost always have an internal element, because
- * set_caps() should have been called first
- */
-
-static GstFlowReturn
-gst_auto_convert_sink_chain (GstPad * pad, GstObject * parent,
-    GstBuffer * buffer)
-{
-  GstFlowReturn ret = GST_FLOW_NOT_NEGOTIATED;
-  GstAutoConvert *autoconvert = GST_AUTO_CONVERT (parent);
-
-  if (autoconvert->current_internal_srcpad) {
-    ret = gst_pad_push (autoconvert->current_internal_srcpad, buffer);
-    if (ret != GST_FLOW_OK)
-      GST_DEBUG_OBJECT (autoconvert,
-          "Child element %" GST_PTR_FORMAT "returned flow %s",
-          autoconvert->current_subelement, gst_flow_get_name (ret));
-  } else {
-    GST_ERROR_OBJECT (autoconvert, "Got buffer without an negotiated element,"
-        " returning not-negotiated");
-    gst_buffer_unref (buffer);
-  }
-
-  return ret;
-}
-
-static GstFlowReturn
-gst_auto_convert_sink_chain_list (GstPad * pad, GstObject * parent,
-    GstBufferList * list)
-{
-  GstFlowReturn ret = GST_FLOW_NOT_NEGOTIATED;
-  GstAutoConvert *autoconvert = GST_AUTO_CONVERT (parent);
-
-  if (autoconvert->current_internal_srcpad) {
-    ret = gst_pad_push_list (autoconvert->current_internal_srcpad, list);
-    if (ret != GST_FLOW_OK)
-      GST_DEBUG_OBJECT (autoconvert,
-          "Child element %" GST_PTR_FORMAT "returned flow %s",
-          autoconvert->current_subelement, gst_flow_get_name (ret));
-  } else {
-    GST_ERROR_OBJECT (autoconvert, "Got buffer without an negotiated element,"
-        " returning not-negotiated");
-    gst_buffer_list_unref (list);
-  }
-
-  return ret;
-}
-
-static gboolean
-gst_auto_convert_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
-{
-  gboolean ret = TRUE;
-  GstAutoConvert *autoconvert = GST_AUTO_CONVERT (parent);
-  GstPad *internal_srcpad;
-
-  if (GST_EVENT_TYPE (event) == GST_EVENT_CAPS) {
-    GstCaps *caps;
-
-    gst_event_parse_caps (event, &caps);
-    ret = gst_auto_convert_sink_setcaps (autoconvert, caps);
-    if (!ret) {
-      gst_event_unref (event);
-      return ret;
-    }
-  }
-
-  internal_srcpad = gst_auto_convert_get_internal_srcpad (autoconvert);
-  if (internal_srcpad) {
-    ret = gst_pad_push_event (internal_srcpad, event);
-    gst_object_unref (internal_srcpad);
-  } else {
-    switch (GST_EVENT_TYPE (event)) {
-      case GST_EVENT_FLUSH_STOP:
-      case GST_EVENT_FLUSH_START:
-        ret = gst_pad_push_event (autoconvert->srcpad, event);
-        break;
-      default:
-        gst_event_unref (event);
-        ret = TRUE;
-        break;
-    }
-  }
-
-  return ret;
-}
-
-/* TODO Properly test that this code works well for queries */
-static gboolean
-gst_auto_convert_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
-{
-  gboolean ret = TRUE;
-  GstAutoConvert *autoconvert = GST_AUTO_CONVERT (parent);
-  GstElement *subelement;
-
-  if (GST_QUERY_TYPE (query) == GST_QUERY_CAPS) {
-    GstCaps *filter, *caps;
-
-    gst_query_parse_caps (query, &filter);
-    caps = gst_auto_convert_getcaps (autoconvert, filter, GST_PAD_SINK);
-    gst_query_set_caps_result (query, caps);
-    gst_caps_unref (caps);
-
-    return TRUE;
-  }
-
-  subelement = gst_auto_convert_get_subelement (autoconvert);
-  if (subelement) {
-    GstPad *sub_sinkpad = get_pad_by_direction (subelement, GST_PAD_SINK);
-
-    ret = gst_pad_query (sub_sinkpad, query);
-
-    gst_object_unref (sub_sinkpad);
-    gst_object_unref (subelement);
-
-    if (ret && GST_QUERY_TYPE (query) == GST_QUERY_ACCEPT_CAPS) {
-      gboolean res;
-      gst_query_parse_accept_caps_result (query, &res);
-
-      if (!res)
-        goto ignore_acceptcaps_failure;
     }
-    return ret;
   }
-
-ignore_acceptcaps_failure:
-
-  if (GST_QUERY_TYPE (query) == GST_QUERY_ACCEPT_CAPS) {
-    GstCaps *caps;
-    GstCaps *accept_caps;
-
-    gst_query_parse_accept_caps (query, &accept_caps);
-
-    caps = gst_auto_convert_getcaps (autoconvert, accept_caps, GST_PAD_SINK);
-    gst_query_set_accept_caps_result (query,
-        gst_caps_can_intersect (caps, accept_caps));
-    gst_caps_unref (caps);
-
-    return TRUE;
-  }
-
-  GST_WARNING_OBJECT (autoconvert, "Got query %s while no element was"
-      " selected, letting through",
-      gst_query_type_get_name (GST_QUERY_TYPE (query)));
-  return gst_pad_peer_query (autoconvert->srcpad, query);
 }
 
-/**
- * gst_auto_convert_getcaps:
- * @pad: the sink #GstPad
- *
- * This function returns the union of the caps of all the possible element
- * factories, based on the static pad templates.
- * It also checks does a getcaps on the downstream element and ignores all
- * factories whose static caps can not satisfy it.
- *
- * It does not try to use each elements getcaps() function
- */
-
-static GstCaps *
-gst_auto_convert_getcaps (GstAutoConvert * autoconvert, GstCaps * filter,
-    GstPadDirection dir)
-{
-  GstCaps *caps = NULL, *other_caps = NULL;
-  GList *elem, *factories;
-
-  caps = gst_caps_new_empty ();
-
-  if (dir == GST_PAD_SINK)
-    other_caps = gst_pad_peer_query_caps (autoconvert->srcpad, NULL);
-  else
-    other_caps = gst_pad_peer_query_caps (autoconvert->sinkpad, NULL);
-
-  GST_DEBUG_OBJECT (autoconvert,
-      "Lets find all the element that can fit here with src caps %"
-      GST_PTR_FORMAT, other_caps);
-
-  if (other_caps && gst_caps_is_empty (other_caps)) {
-    goto out;
-  }
-
-  factories = g_atomic_pointer_get (&autoconvert->factories);
-
-  if (!factories)
-    factories = gst_auto_convert_load_factories (autoconvert);
-
-  for (elem = factories; elem; elem = g_list_next (elem)) {
-    GstElementFactory *factory = GST_ELEMENT_FACTORY (elem->data);
-    GstElement *element = NULL;
-    GstCaps *element_caps;
-    GstPad *internal_pad = NULL;
-
-    if (filter) {
-      if (!factory_can_intersect (autoconvert, factory, dir, filter)) {
-        GST_LOG_OBJECT (autoconvert,
-            "Factory %s does not accept src caps %" GST_PTR_FORMAT,
-            gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)),
-            other_caps);
-        continue;
-      }
-    }
-
-    if (other_caps != NULL) {
-      if (!factory_can_intersect (autoconvert, factory,
-              dir == GST_PAD_SINK ? GST_PAD_SRC : GST_PAD_SINK, other_caps)) {
-        GST_LOG_OBJECT (autoconvert,
-            "Factory %s does not accept src caps %" GST_PTR_FORMAT,
-            gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)),
-            other_caps);
-        continue;
-      }
-
-      element = gst_auto_convert_get_or_make_element_from_factory (autoconvert,
-          factory);
-      if (element == NULL)
-        continue;
-
-      if (dir == GST_PAD_SINK)
-        internal_pad = g_object_get_qdata (G_OBJECT (element),
-            internal_srcpad_quark);
-      else
-        internal_pad = g_object_get_qdata (G_OBJECT (element),
-            internal_sinkpad_quark);
-
-      element_caps = gst_pad_peer_query_caps (internal_pad, filter);
-
-      if (element_caps)
-        caps = gst_caps_merge (caps, element_caps);
-
-      gst_object_unref (element);
-
-      /* Early out, any is absorbing */
-      if (gst_caps_is_any (caps))
-        goto out;
-    } else {
-      const GList *tmp;
-
-      for (tmp = gst_element_factory_get_static_pad_templates (factory);
-          tmp; tmp = g_list_next (tmp)) {
-        GstStaticPadTemplate *template = tmp->data;
-
-        if (GST_PAD_TEMPLATE_DIRECTION (template) == dir) {
-          GstCaps *static_caps = gst_static_pad_template_get_caps (template);
-
-          if (static_caps) {
-            caps = gst_caps_merge (caps, static_caps);
-          }
-
-          /* Early out, any is absorbing */
-          if (gst_caps_is_any (caps))
-            goto out;
-        }
-      }
-    }
-  }
-
-  GST_DEBUG_OBJECT (autoconvert, "Returning unioned caps %" GST_PTR_FORMAT,
-      caps);
-
-out:
-
-  if (other_caps)
-    gst_caps_unref (other_caps);
-
-  return caps;
-}
-
-
-
-static gboolean
-gst_auto_convert_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
-{
-  gboolean ret = TRUE;
-  GstAutoConvert *autoconvert = GST_AUTO_CONVERT (parent);
-  GstPad *internal_sinkpad;
-
-  if (GST_EVENT_TYPE (event) == GST_EVENT_RECONFIGURE)
-    gst_pad_push_event (autoconvert->sinkpad, gst_event_ref (event));
-
-  internal_sinkpad = gst_auto_convert_get_internal_sinkpad (autoconvert);
-  if (internal_sinkpad) {
-    ret = gst_pad_push_event (internal_sinkpad, event);
-    gst_object_unref (internal_sinkpad);
-  } else if (GST_EVENT_TYPE (event) != GST_EVENT_RECONFIGURE) {
-    GST_WARNING_OBJECT (autoconvert,
-        "Got upstream event while no element was selected," "forwarding.");
-    ret = gst_pad_push_event (autoconvert->sinkpad, event);
-  } else
-    gst_event_unref (event);
-
-  return ret;
-}
-
-/* TODO Properly test that this code works well for queries */
-static gboolean
-gst_auto_convert_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
-{
-  gboolean ret = TRUE;
-  GstAutoConvert *autoconvert = GST_AUTO_CONVERT (parent);
-  GstElement *subelement;
-
-  if (GST_QUERY_TYPE (query) == GST_QUERY_CAPS) {
-    GstCaps *filter, *caps;
-
-    gst_query_parse_caps (query, &filter);
-    caps = gst_auto_convert_getcaps (autoconvert, filter, GST_PAD_SRC);
-    gst_query_set_caps_result (query, caps);
-    gst_caps_unref (caps);
-
-    return TRUE;
-  }
-
-  subelement = gst_auto_convert_get_subelement (autoconvert);
-  if (subelement) {
-    GstPad *sub_srcpad = get_pad_by_direction (subelement, GST_PAD_SRC);
-
-    ret = gst_pad_query (sub_srcpad, query);
-
-    gst_object_unref (sub_srcpad);
-    gst_object_unref (subelement);
-  } else {
-    GST_WARNING_OBJECT (autoconvert,
-        "Got upstream query of type %s while no element was selected,"
-        " forwarding.", gst_query_type_get_name (GST_QUERY_TYPE (query)));
-    ret = gst_pad_peer_query (autoconvert->sinkpad, query);
-  }
-
-  return ret;
-}
-
-static GstFlowReturn
-gst_auto_convert_internal_sink_chain (GstPad * pad, GstObject * parent,
-    GstBuffer * buffer)
-{
-  GstAutoConvert *autoconvert =
-      GST_AUTO_CONVERT (g_object_get_qdata (G_OBJECT (pad),
-          parent_quark));
-
-  return gst_pad_push (autoconvert->srcpad, buffer);
-}
-
-static GstFlowReturn
-gst_auto_convert_internal_sink_chain_list (GstPad * pad, GstObject * parent,
-    GstBufferList * list)
-{
-  GstAutoConvert *autoconvert =
-      GST_AUTO_CONVERT (g_object_get_qdata (G_OBJECT (pad),
-          parent_quark));
-
-  return gst_pad_push_list (autoconvert->srcpad, list);
-}
-
-static gboolean
-gst_auto_convert_internal_sink_event (GstPad * pad, GstObject * parent,
-    GstEvent * event)
-{
-  GstAutoConvert *autoconvert =
-      GST_AUTO_CONVERT (g_object_get_qdata (G_OBJECT (pad),
-          parent_quark));
-  gboolean drop = FALSE;
-
-  GST_AUTOCONVERT_LOCK (autoconvert);
-  if (autoconvert->current_internal_sinkpad != pad) {
-    drop = TRUE;
-  }
-  GST_AUTOCONVERT_UNLOCK (autoconvert);
-
-  if (drop) {
-    gst_event_unref (event);
-    return TRUE;
-  }
-
-  return gst_pad_push_event (autoconvert->srcpad, event);
-}
-
-static gboolean
-gst_auto_convert_internal_sink_query (GstPad * pad, GstObject * parent,
-    GstQuery * query)
+static void
+gst_auto_convert_class_init (GstAutoConvertClass * klass)
 {
-  GstAutoConvert *autoconvert =
-      GST_AUTO_CONVERT (g_object_get_qdata (G_OBJECT (pad),
-          parent_quark));
-
-  if (!gst_pad_peer_query (autoconvert->srcpad, query)) {
-    switch (GST_QUERY_TYPE (query)) {
-      case GST_QUERY_CAPS:
-      {
-        GstCaps *filter;
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
-        gst_query_parse_caps (query, &filter);
-        if (filter) {
-          gst_query_set_caps_result (query, filter);
-        } else {
-          filter = gst_caps_new_any ();
-          gst_query_set_caps_result (query, filter);
-          gst_caps_unref (filter);
-        }
-        return TRUE;
-      }
-      case GST_QUERY_ACCEPT_CAPS:
-        gst_query_set_accept_caps_result (query, TRUE);
-        return TRUE;
-      default:
-        return FALSE;
-    }
-  }
+  GST_DEBUG_CATEGORY_INIT (autoconvert_debug, "autoconvert", 0,
+      "Auto convert element");
 
-  return TRUE;
-}
+  gobject_class->set_property = gst_auto_convert_set_property;
+  gobject_class->get_property = gst_auto_convert_get_property;
 
-static gboolean
-gst_auto_convert_internal_src_event (GstPad * pad, GstObject * parent,
-    GstEvent * event)
-{
-  GstAutoConvert *autoconvert =
-      GST_AUTO_CONVERT (g_object_get_qdata (G_OBJECT (pad),
-          parent_quark));
-  gboolean drop = FALSE;
+  gst_element_class_set_static_metadata (element_class,
+      "Select converter based on caps", "Generic/Bin",
+      "Selects the right transform element based on the caps",
+      "Olivier Crete <olivier.crete@collabora.com>");
 
-  GST_AUTOCONVERT_LOCK (autoconvert);
-  if (autoconvert->current_internal_srcpad != pad) {
-    drop = TRUE;
-  }
-  GST_AUTOCONVERT_UNLOCK (autoconvert);
+  g_object_class_install_property (gobject_class, PROP_FACTORIES,
+      g_param_spec_pointer ("factories",
+          "GList of GstElementFactory",
+          "GList of GstElementFactory objects to pick from (the element takes"
+          " ownership of the list (NULL means it will go through all possible"
+          " elements), can only be set once",
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-  if (drop) {
-    GST_DEBUG_OBJECT (autoconvert, "Dropping event %" GST_PTR_FORMAT, event);
-    gst_event_unref (event);
-    return TRUE;
-  }
+  /**
+   * autoconvert:factory-names:
+   *
+   * A #GstValueArray of factory names to use
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_FACTORY_NAMES,
+      gst_param_spec_array ("factory-names", "Factory names"
+          "Names of the Factories to use",
+          "Names of the GstElementFactory to be used to automatically plug"
+          " elements.",
+          g_param_spec_string ("factory-name", "Factory name",
+              "An element factory name", NULL,
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS),
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-  return gst_pad_push_event (autoconvert->sinkpad, event);
+  GST_BASE_AUTO_CONVERT_CLASS (klass)->registers_filters = FALSE;
 }
 
-static gboolean
-gst_auto_convert_internal_src_query (GstPad * pad, GstObject * parent,
-    GstQuery * query)
+static void
+gst_auto_convert_init (GstAutoConvert * autoconvert)
 {
-  GstAutoConvert *autoconvert =
-      GST_AUTO_CONVERT (g_object_get_qdata (G_OBJECT (pad),
-          parent_quark));
-
-  return gst_pad_peer_query (autoconvert->sinkpad, query);
 }

gst-plugins-bad-1.22.7.tar.xz/gst/autoconvert/gstautoconvert.h -> gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstautoconvert.h Changed

@@ -1,8 +1,7 @@
 /* GStreamer
  *
- *  Copyright 2007 Collabora Ltd
- *   @author: Olivier Crete <olivier.crete@collabora.co.uk>
- *  Copyright 2007-2008 Nokia
+ *  Copyright 2023 Igalia S.L.
+ *   @author: Thibault Saunier <tsaunier@igalia.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,48 +19,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+ #pragma once
 
-#ifndef __GST_AUTO_CONVERT_H__
-#define __GST_AUTO_CONVERT_H__
+ #include "gstbaseautoconvert.h"
 
-#include <gst/gst.h>
-#include <gst/gstbin.h>
-
-G_BEGIN_DECLS
-#define GST_TYPE_AUTO_CONVERT 	        	(gst_auto_convert_get_type())
-#define GST_AUTO_CONVERT(obj)	                (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AUTO_CONVERT,GstAutoConvert))
-#define GST_AUTO_CONVERT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AUTO_CONVERT,GstAutoConvertClass))
-#define GST_IS_AUTO_CONVERT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AUTO_CONVERT))
-#define GST_IS_AUTO_CONVERT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AUTO_CONVERT))
-typedef struct _GstAutoConvert GstAutoConvert;
-typedef struct _GstAutoConvertClass GstAutoConvertClass;
-
-struct _GstAutoConvert
-{
-  /*< private >*/
-  GstBin bin;                   /* we extend GstBin */
-
-  GList *factories;
-
-  GstPad *sinkpad;
-  GstPad *srcpad;
-
-  /* Have to be set all at once
-   * Protected by the object lock and the stream lock
-   * Both must be held to modify these
-   */
-  GstElement *current_subelement;
-  GstPad *current_internal_srcpad;
-  GstPad *current_internal_sinkpad;
-};
-
-struct _GstAutoConvertClass
-{
-  GstBinClass parent_class;
-};
-
-GType gst_auto_convert_get_type (void);
+ G_DECLARE_FINAL_TYPE(GstAutoConvert, gst_auto_convert, GST, AUTO_CONVERT, GstBaseAutoConvert);
 GST_ELEMENT_REGISTER_DECLARE (autoconvert);
-
-G_END_DECLS
-#endif /* __GST_AUTO_CONVERT_H__ */

gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstautodeinterlace.c Added

@@ -0,0 +1,798 @@
+/* GStreamer
+ * Copyright 2023 Igalia S.L.
+ *  @author: Thibault Saunier <tsaunier@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+/**
+ * SECTION:element-autodeinterlace
+ * @title: autodeinterlace
+ *
+ * The #autodeinterlace element is used to automatically select the right
+ * deinterlacer based on the caps of the stream. It can plug several elements
+ * to download/upload to/from the GPU when required/best.
+ *
+ * Note: This element guarantees that caps negotiation works but when setting
+ * properties that are not available on the best underlying deinterlacer some
+ * upload/download might be required and performance are impacted.
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
+#include "gstautovideo.h"
+#include "gstautodeinterlace.h"
+
+GST_DEBUG_CATEGORY (autodeinterlace_debug);
+#define GST_CAT_DEFAULT (autodeinterlace_debug)
+
+#define DEFAULT_FIELDS          GST_AUTO_DEINTERLACE_FIELDS_ALL
+#define DEFAULT_LAYOUT          GST_AUTO_DEINTERLACE_LAYOUT_AUTO
+#define DEFAULT_MODE            GST_AUTO_DEINTERLACE_MODE_AUTO
+enum
+{
+  PROP_0,
+  PROP_FIELDS,
+  PROP_MODE,
+  PROP_LAYOUT,
+};
+
+/**
+ * GstAutoDeinterlaceFieldLayout:
+ * @GST_AUTO_DEINTERLACE_LAYOUT_AUTO: Auto detection
+ * @GST_AUTO_DEINTERLACE_LAYOUT_TFF: Top field first
+ * @GST_AUTO_DEINTERLACE_LAYOUT_BFF: Bottom field first
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_AUTO_DEINTERLACE_LAYOUT_AUTO,
+  GST_AUTO_DEINTERLACE_LAYOUT_TFF,
+  GST_AUTO_DEINTERLACE_LAYOUT_BFF,
+} GstAutoDeinterlaceFieldLayout;
+
+#define GST_TYPE_AUTO_DEINTERLACE_FIELD_LAYOUT (gst_auto_deinterlace_field_layout_get_type ())
+static GType
+gst_auto_deinterlace_field_layout_get_type (void)
+{
+  static GType auto_deinterlace_field_layout_type = 0;
+
+  static const GEnumValue field_layout_types = {
+    {GST_AUTO_DEINTERLACE_LAYOUT_AUTO, "Auto detection", "auto"},
+    {GST_AUTO_DEINTERLACE_LAYOUT_TFF, "Top field first", "tff"},
+    {GST_AUTO_DEINTERLACE_LAYOUT_BFF, "Bottom field first", "bff"},
+    {0, NULL, NULL},
+  };
+
+  if (!auto_deinterlace_field_layout_type) {
+    auto_deinterlace_field_layout_type =
+        g_enum_register_static ("GstAutoDeinterlaceFieldLayout",
+        field_layout_types);
+  }
+  return auto_deinterlace_field_layout_type;
+}
+
+/**
+ * GstAutoDeinterlaceFields:
+ * @GST_AUTO_DEINTERLACE_FIELDS_ALL: All fields (missing data is interpolated)
+ * @GST_AUTO_DEINTERLACE_FIELDS_TOP: Top Fields only
+ * @GST_AUTO_DEINTERLACE_FIELDS_BOTTOM: Bottom Fields Only
+ * @GST_AUTO_DEINTERLACE_FIELDS_AUTO: Automatically detect
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_AUTO_DEINTERLACE_FIELDS_ALL,      /* All (missing data is interp.) */
+  GST_AUTO_DEINTERLACE_FIELDS_TOP,      /* Top Fields Only */
+  GST_AUTO_DEINTERLACE_FIELDS_BOTTOM,   /* Bottom Fields Only */
+  GST_AUTO_DEINTERLACE_FIELDS_AUTO      /* Automatically detect */
+} GstAutoDeinterlaceFields;
+
+
+#define GST_TYPE_AUTO_DEINTERLACE_FIELDS (gst_auto_deinterlace_fields_get_type ())
+static GType
+gst_auto_deinterlace_fields_get_type (void)
+{
+  static GType deinterlace_fields_type = 0;
+
+  static const GEnumValue fields_types = {
+    {GST_AUTO_DEINTERLACE_FIELDS_ALL, "All fields", "all"},
+    {GST_AUTO_DEINTERLACE_FIELDS_TOP, "Top fields only", "top"},
+    {GST_AUTO_DEINTERLACE_FIELDS_BOTTOM, "Bottom fields only", "bottom"},
+    {GST_AUTO_DEINTERLACE_FIELDS_AUTO, "Automatically detect", "auto"},
+    {0, NULL, NULL},
+  };
+
+  if (!deinterlace_fields_type) {
+    deinterlace_fields_type =
+        g_enum_register_static ("GstAutoDeinterlaceFields", fields_types);
+  }
+  return deinterlace_fields_type;
+}
+
+/**
+ * GstAutoDeinterlaceModes:
+ * @GST_AUTO_DEINTERLACE_MODE_AUTO: Auto detection (best effort)
+ * @GST_AUTO_DEINTERLACE_MODE_INTERLACED: Force deinterlacing
+ * @GST_AUTO_DEINTERLACE_MODE_DISABLED: Run in passthrough modes_types
+ * @GST_AUTO_DEINTERLACE_MODE_AUTO_STRICT: Auto detection (strict)
+ *
+ * Since: 1.24
+ */
+typedef enum
+{
+  GST_AUTO_DEINTERLACE_MODE_AUTO,
+  GST_AUTO_DEINTERLACE_MODE_INTERLACED,
+  GST_AUTO_DEINTERLACE_MODE_DISABLED,
+  GST_AUTO_DEINTERLACE_MODE_AUTO_STRICT
+} GstAutoDeinterlaceModes;
+
+#define GST_TYPE_AUTO_DEINTERLACE_MODES (gst_auto_deinterlace_modes_get_type ())
+static GType
+gst_auto_deinterlace_modes_get_type (void)
+{
+  static GType deinterlace_modes_type = 0;
+
+  static const GEnumValue modes_types = {
+    {GST_AUTO_DEINTERLACE_MODE_AUTO, "Auto detection (best effort)", "auto"},
+    {GST_AUTO_DEINTERLACE_MODE_INTERLACED, "Force deinterlacing", "interlaced"},
+    {GST_AUTO_DEINTERLACE_MODE_DISABLED, "Run in passthrough mode", "disabled"},
+    {GST_AUTO_DEINTERLACE_MODE_AUTO_STRICT, "Auto detection (strict)",
+        "auto-strict"},
+    {0, NULL, NULL},
+  };
+
+  if (!deinterlace_modes_type) {
+    deinterlace_modes_type =
+        g_enum_register_static ("GstAutoDeinterlaceModes", modes_types);
+  }
+  return deinterlace_modes_type;
+}
+
+
+typedef struct
+{
+  const gchar *factory_name;
+  const gchar *our_name;
+  const gchar *their_name;
+  struct
+  {
+    gint our_value;
+    const gchar *their_value;
+  } values5;
+} EnumMap;
+
+static EnumMap ENUM_MAP = {
+  {
+        .factory_name = "deinterlace",
+        .our_name = "layout",
+        .their_name = "tff",
+        .values = {
+              {
+                    .our_value = GST_AUTO_DEINTERLACE_LAYOUT_AUTO,
+                    .their_value = "auto",
+                  },
+              {
+                    .our_value = GST_AUTO_DEINTERLACE_LAYOUT_TFF,
+                    .their_value = "tff",
+                  },
+              {
+                    .our_value = GST_AUTO_DEINTERLACE_LAYOUT_BFF,
+                    .their_value = "bff",
+                  },
+            },
+      },
+  {
+        .factory_name = "deinterlace",
+        .our_name = "fields",
+        .their_name = "fields",
+        .values = {
+              {
+                    .our_value = GST_AUTO_DEINTERLACE_FIELDS_ALL,
+                    .their_value = "all",
+                  },
+              {
+                    .our_value = GST_AUTO_DEINTERLACE_FIELDS_BOTTOM,
+                    .their_value = "bottom",
+                  },
+              {
+                    .our_value = GST_AUTO_DEINTERLACE_FIELDS_TOP,
+                    .their_value = "top",
+                  },
+              {
+                    .our_value = GST_AUTO_DEINTERLACE_FIELDS_AUTO,
+                    .their_value = "auto",
+                  },
+            },
+      },
+  {
+        .factory_name = "deinterlace",
+        .our_name = "mode",
+        .their_name = "mode",
+        .values = {
+              {
+                    .our_value = GST_AUTO_DEINTERLACE_MODE_AUTO,
+                    .their_value = "auto",
+                  },
+              {
+                    .our_value = GST_AUTO_DEINTERLACE_MODE_DISABLED,
+                    .their_value = "disabled",
+                  },
+              {
+                    .our_value = GST_AUTO_DEINTERLACE_MODE_INTERLACED,
+                    .their_value = "interlaced",
+                  },
+              {
+                    .our_value = GST_AUTO_DEINTERLACE_MODE_AUTO_STRICT,
+                    .their_value = "auto-strict",
+                  },
+            },
+      },
+  {
+        .factory_name = "gldeinterlace",
+        .our_name = "layout",
+        .their_name = NULL,
+      },
+  {
+        .factory_name = "gldeinterlace",
+        .our_name = "fields",
+        .their_name = NULL,
+      },
+  {
+        .factory_name = "gldeinterlace",
+        .our_name = "mode",
+        .their_name = NULL,
+      },
+  {
+        .factory_name = "d3d11deinterlaceelement",
+        .our_name = "layout",
+        .their_name = NULL,
+      },
+  {
+        .factory_name = "d3d11deinterlaceelement",
+        .our_name = "fields",
+        .their_name = NULL,
+      },
+  {
+        .factory_name = "d3d11deinterlaceelement",
+        .our_name = "mode",
+        .their_name = NULL,
+      }
+};
+
+#if !GLIB_CHECK_VERSION(2, 68, 0)
+static GObject *
+g_binding_dup_source (GBinding * binding)
+{
+  return g_object_ref (g_binding_get_source (binding));
+}
+
+static GObject *
+g_binding_dup_target (GBinding * binding)
+{
+  return g_object_ref (g_binding_get_target (binding));
+}
+#endif
+
+struct _GstAutoDeinterlace
+{
+  GstBaseAutoConvert parent;
+
+  GstAutoDeinterlaceFieldLayout field_layout;
+  GstAutoDeinterlaceFields fields;
+  GstAutoDeinterlaceModes mode;
+  GList *bindings;
+};
+
+G_DEFINE_TYPE (GstAutoDeinterlace, gst_auto_deinterlace,
+    GST_TYPE_BASE_AUTO_CONVERT);
+
+GST_ELEMENT_REGISTER_DEFINE (autodeinterlace, "autodeinterlace",
+    GST_RANK_NONE, gst_auto_deinterlace_get_type ());
+
+static void
+gst_auto_deinterlace_register_filters (GstAutoDeinterlace * self)
+{
+  const GstAutoVideoFilterGenerator *g;
+
+  /* Only the software deinterlacer supports all our properties so if we are using
+   * defaults values for all of them, use hw deinterlacer otherwise ensure to use
+   * our software one to respect what the user wants */
+  /* *INDENT-OFF* */
+  if (self->field_layout == DEFAULT_LAYOUT && self->fields == DEFAULT_FIELDS
+      && self->mode == DEFAULT_MODE) {
+    static const GstAutoVideoFilterGenerator gen = {
+      {
+        .first_elements = { "bayer2rgb", NULL},
+        .colorspace_converters = { "videoconvert", NULL },
+        .last_elements = { NULL } ,
+        .filters = { "deinterlace", NULL},
+        .rank = GST_RANK_SECONDARY,
+      },
+      {
+        .first_elements = { NULL, },
+        .colorspace_converters = { "videoconvert", NULL },
+        .last_elements = { "rgb2bayer", NULL },
+        .filters = { "deinterlace", NULL },
+        .rank = GST_RANK_SECONDARY,
+      },
+      {
+        .first_elements = { NULL, },
+        .colorspace_converters = { "videoconvert", NULL },
+        .last_elements = { NULL, },
+        .filters = { "deinterlace", NULL },
+        .rank = GST_RANK_SECONDARY,
+      },
+      {
+        .first_elements = { NULL, },
+        .colorspace_converters = { "glcolorconvert", "glcolorscale", "glcolorconvert", NULL },
+        .last_elements = { NULL, },
+        .filters = { "gldeinterlace", NULL },
+        .rank = GST_RANK_PRIMARY,
+      },
+      {
+        .first_elements = { "glupload", },
+        .colorspace_converters = { "glcolorconvert", "glcolorscale", "glcolorconvert", NULL },
+        .last_elements = { NULL, },
+        .filters = { "gldeinterlace", NULL },
+        .rank = GST_RANK_PRIMARY,
+      },
+      { /* Worst case we upload/download as required */
+        .first_elements = { "glupload", "gldownload", NULL },
+        .colorspace_converters = { "glcolorconvert",  "glcolorscale", "glcolorconvert", NULL },
+        .last_elements = { "glupload", "gldownload", NULL },
+        .filters = { "gldeinterlace", NULL },
+        .rank = GST_RANK_MARGINAL,
+      },
+      {
+        .first_elements = { NULL, },
+        .colorspace_converters = { "d3d11convert", NULL },
+        .last_elements = { NULL, },
+        .filters = { "d3d11deinterlaceelement" },
+        .rank = GST_RANK_PRIMARY,
+      },
+      {
+        .first_elements = { NULL},
+        .colorspace_converters = { "d3d11deinterlace", NULL },
+        .last_elements = { NULL },
+        .filters = { NULL },
+        .rank = GST_RANK_MARGINAL,
+      },
+      { /* CUDA -> GL */
+        .first_elements = { "capsfilter caps=video/x-raw(memory:CUDAMemory)", "cudadownload", NULL },
+        .colorspace_converters = { "glcolorconvert",  "glcolorscale", "glcolorconvert", NULL },
+        .last_elements = { NULL },
+        .filters = { "gldeinterlace", NULL },
+        .rank = GST_RANK_PRIMARY - 1,
+      },
+      { /* CUDA -> CUDA */
+        .first_elements = { "capsfilter caps=video/x-raw(memory:CUDAMemory)", "cudadownload", NULL },
+        .colorspace_converters = { "glcolorconvert",  "glcolorscale", "glcolorconvert", NULL },
+        .last_elements = { "cudaupload", "capsfilter caps=video/x-raw(memory:CUDAMemory)", NULL },
+        .filters = { "gldeinterlace", NULL },
+        .rank = GST_RANK_SECONDARY - 1,
+      },
+      { /* Software -> CUDA (uploading as soon as possible) */
+        .first_elements = { "glupload", NULL },
+        .colorspace_converters = { "glcoloconvert", NULL },
+        .last_elements = { "cudaupload", "capsfilter caps=video/x-raw(memory:CUDAMemory)", NULL },
+        .filters = { "gldeinterlace", NULL },
+        .rank = GST_RANK_MARGINAL,
+      },
+      { /* CUDA -> Software */
+        .first_elements = { "capsfilter caps=video/x-raw(memory:CUDAMemory)", "cudadownload", NULL },
+        .colorspace_converters = { "glcolorconvert",  "glcolorscale", "glcolorconvert", NULL },
+        .last_elements = { "gldownload", NULL },
+        .filters = { "gldeinterlace", NULL },
+        .rank = GST_RANK_MARGINAL,
+      },
+      {
+        .first_elements = { NULL},
+        .colorspace_converters = { NULL },
+        .last_elements = { NULL },
+        .filters = { NULL },
+        .rank = 0,
+      },
+    };
+
+    g = gen;
+  } else {
+      static const GstAutoVideoFilterGenerator gen = {
+        {
+          .first_elements = { "bayer2rgb", NULL},
+          .colorspace_converters = { "videoconvert", NULL },
+          .last_elements = { NULL } ,
+          .filters = { "deinterlace", NULL},
+          .rank = GST_RANK_SECONDARY,
+        },
+        {
+          .first_elements = { NULL, },
+          .colorspace_converters = { "videoconvert", NULL },
+          .last_elements = { "rgb2bayer", NULL },
+          .filters = { "deinterlace", NULL },
+          .rank = GST_RANK_SECONDARY,
+        },
+        {
+          .first_elements = { NULL, },
+          .colorspace_converters = { "videoconvertscale", NULL },
+          .last_elements = { NULL, },
+          .filters = { "deinterlace", NULL },
+          .rank = GST_RANK_SECONDARY,
+        },
+        { /* Worst case we upload/download as required */
+          .first_elements = { "gldownload", NULL },
+          .colorspace_converters = { "videoconvert", NULL },
+          .last_elements = { "glupload", NULL },
+          .filters = { "deinterlace", NULL },
+          .rank = GST_RANK_MARGINAL,
+        },
+        { /* Cuda -> Cuda */
+          .first_elements = { "capsfilter caps=video/x-raw(memory:CUDAMemory)", "cudadownload", NULL },
+          .colorspace_converters = { "videoconvert", NULL },
+          .last_elements = { "cudaupload", "capsfilter caps=video/x-raw(memory:CUDAMemory)", NULL },
+          .filters = { "deinterlace", NULL },
+          .rank = GST_RANK_SECONDARY + 1,
+        },
+        { /* Cuda -> software */
+          .first_elements = { "capsfilter caps=video/x-raw(memory:CUDAMemory)", "cudadownload", NULL },
+          .colorspace_converters = { "videoconvert", NULL },
+          .last_elements = { "glupload", NULL },
+          .filters = { "deinterlace", NULL },
+          .rank = GST_RANK_MARGINAL,
+        },
+        { /* Cuda -> software */
+          .first_elements = { "capsfilter caps=video/x-raw(memory:CUDAMemory)", "cudadownload", NULL },
+          .colorspace_converters = { "videoconvert", NULL },
+          .last_elements = { NULL },
+          .filters = { "deinterlace", NULL },
+          .rank = GST_RANK_MARGINAL,
+        },
+        { /* Software -> cuda */
+          .first_elements = { NULL },
+          .colorspace_converters = { "videoconvert", NULL },
+          .last_elements = { "cudaupload", "capsfilter caps=video/x-raw(memory:CUDAMemory)", NULL },
+          .filters = { "deinterlace", NULL },
+          .rank = GST_RANK_MARGINAL,
+        },
+        {
+          .first_elements = { "d3d11upload", "d3d11download" },
+          .colorspace_converters = { "videoconvert", NULL },
+          .last_elements = { "d3d11upload", "d3d11download" },
+          .filters = { "deinterlace" },
+          .rank = GST_RANK_MARGINAL,
+        },
+        { /* Worst case we upload/download as required */
+          .first_elements = { NULL},
+          .colorspace_converters = { NULL },
+          .last_elements = { NULL },
+          .filters = { NULL },
+          .rank = 0,
+        },
+      };
+
+    g = gen;
+  }
+  /* *INDENT-ON* */
+
+  gst_auto_video_register_well_known_bins (GST_BASE_AUTO_CONVERT (self), g);
+}
+
+static void
+gst_auto_deinterlace_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstAutoDeinterlace *autodeinterlace = GST_AUTO_DEINTERLACE (object);
+
+  GST_OBJECT_LOCK (object);
+  switch (prop_id) {
+    case PROP_LAYOUT:
+      g_value_set_enum (value, autodeinterlace->field_layout);
+      break;
+    case PROP_FIELDS:
+      g_value_set_enum (value, autodeinterlace->fields);
+      break;
+    case PROP_MODE:
+      g_value_set_enum (value, autodeinterlace->mode);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+  GST_OBJECT_UNLOCK (object);
+}
+
+static void
+gst_auto_deinterlace_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstAutoDeinterlace *autodeinterlace = GST_AUTO_DEINTERLACE (object);
+  gint v = g_value_get_enum (value);
+  gboolean changed = FALSE;
+
+  GST_OBJECT_LOCK (object);
+  switch (prop_id) {
+    case PROP_LAYOUT:
+      changed = (autodeinterlace->field_layout != v);
+      autodeinterlace->field_layout = v;
+      break;
+    case PROP_FIELDS:
+      changed = (autodeinterlace->fields != v);
+      autodeinterlace->fields = v;
+      break;
+    case PROP_MODE:
+      changed = (autodeinterlace->mode != v);
+      autodeinterlace->mode = v;
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+  GST_OBJECT_UNLOCK (object);
+
+  if (changed) {
+    gst_base_auto_convert_reset_filters (GST_BASE_AUTO_CONVERT (object));
+    gst_auto_deinterlace_register_filters (GST_AUTO_DEINTERLACE (object));
+
+    /* Force a reconfigure so the new property can be taken into account if necessary */
+    gst_pad_push_event (GST_BASE_AUTO_CONVERT (object)->sinkpad,
+        gst_event_new_reconfigure ());
+  }
+}
+
+static gboolean
+element_is_handled_deinterlace (GstElement * element)
+{
+  GstElementFactory *factory = gst_element_get_factory (element);
+
+  for (gint i = 0; i < G_N_ELEMENTS (ENUM_MAP); i++) {
+    if (g_strcmp0 (GST_OBJECT_NAME (factory), ENUM_MAPi.factory_name) == 0) {
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
+static gboolean
+gst_auto_deinterlace_transform_to (GBinding * binding, const GValue * from,
+    GValue * to_value, gpointer _udata)
+{
+  const gchar *value = NULL;
+  EnumMap *map = NULL;
+  gboolean res = FALSE;
+  GstAutoDeinterlace *self =
+      GST_AUTO_DEINTERLACE (g_binding_dup_source (binding));
+  GstElement *target = GST_ELEMENT (g_binding_dup_target (binding));
+  GstElementFactory *factory = gst_element_get_factory (target);
+
+  for (gint i = 0; i < G_N_ELEMENTS (ENUM_MAP); i++) {
+    if (g_strcmp0 (GST_OBJECT_NAME (factory), ENUM_MAPi.factory_name) == 0 &&
+        g_strcmp0 (g_binding_get_source_property (binding),
+            ENUM_MAPi.our_name) == 0) {
+      map = &ENUM_MAPi;
+      break;
+    }
+  }
+
+  if (!map) {
+    GST_WARNING_OBJECT (self, "Could not find mapping for %s"
+        " property won't be set on the deinterlacing element",
+        gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory))
+        );
+    goto done;
+  }
+
+
+  for (gint j = 0; map->valuesj.their_value; j++) {
+    if (map->valuesj.our_value == g_value_get_enum (from)) {
+      value = map->valuesj.their_value;
+      break;
+    }
+  }
+
+  if (value) {
+    GParamSpec *pspec =
+        g_object_class_find_property (G_OBJECT_GET_CLASS (target),
+        g_binding_get_target_property (binding));
+    GST_ERROR ("Setting %s - %s to %s", map->our_name,
+        g_binding_get_source_property (binding), value);
+    res = gst_value_deserialize_with_pspec (to_value, value, pspec);
+  } else {
+    GST_WARNING_OBJECT (self, "Could not transfer value for property %s to %s",
+        g_binding_get_source_property (binding),
+        g_binding_get_target_property (binding)
+        );
+  }
+
+done:
+  gst_clear_object (&self);
+  gst_clear_object (&target);
+
+  return res;
+}
+
+static void
+gst_auto_deinterlace_deep_element_added (GstBin * bin, GstBin * sub_bin,
+    GstElement * element)
+{
+  GstAutoDeinterlace *self = GST_AUTO_DEINTERLACE (bin);
+  GList *new_bindings = NULL;
+  if (!element_is_handled_deinterlace (element))
+    goto done;
+
+  GST_OBJECT_LOCK (bin);
+  for (GList * tmp = self->bindings; tmp; tmp = tmp->next) {
+    GBinding *binding = tmp->data;
+    GObject *target = g_binding_dup_target (binding);
+
+    if (GST_ELEMENT (target) == element) {
+      GST_INFO_OBJECT (self, "Newly added element %s already bound",
+          GST_OBJECT_NAME (gst_element_get_factory (element)));
+      GST_OBJECT_UNLOCK (bin);
+      gst_object_unref (target);
+      goto done;
+    }
+    gst_object_unref (target);
+  }
+  GST_OBJECT_UNLOCK (bin);
+
+  for (gint i = 0; i < G_N_ELEMENTS (ENUM_MAP); i++) {
+    if (g_strcmp0 (GST_OBJECT_NAME (gst_element_get_factory (element)),
+            ENUM_MAPi.factory_name))
+      continue;
+
+    if (!ENUM_MAPi.their_name) {
+      GST_WARNING_OBJECT (self, "No mapping for our property %s on %s",
+          ENUM_MAPi.our_name,
+          GST_OBJECT_NAME (gst_element_get_factory (element)));
+      continue;
+    }
+
+    new_bindings = g_list_prepend (new_bindings,
+        g_object_bind_property_full (bin, ENUM_MAPi.our_name,
+            element, ENUM_MAPi.their_name,
+            G_BINDING_SYNC_CREATE | G_BINDING_DEFAULT,
+            gst_auto_deinterlace_transform_to, NULL, NULL, NULL)
+        );
+  }
+  GST_OBJECT_LOCK (bin);
+  self->bindings = g_list_concat (self->bindings, new_bindings);
+  GST_OBJECT_UNLOCK (bin);
+
+done:
+  GST_BIN_CLASS (gst_auto_deinterlace_parent_class)->deep_element_added (bin,
+      sub_bin, element);
+}
+
+static void
+gst_auto_deinterlace_deep_element_removed (GstBin * bin, GstBin * sub_bin,
+    GstElement * element)
+{
+  GList *bindings = NULL;
+  GstAutoDeinterlace *self = GST_AUTO_DEINTERLACE (bin);
+
+  if (!element_is_handled_deinterlace (element))
+    goto done;
+
+  GST_OBJECT_LOCK (bin);
+  for (GList * tmp = self->bindings; tmp; tmp = tmp->next) {
+    GBinding *binding = tmp->data;
+    GObject *target = g_binding_dup_target (binding);
+
+    if (GST_ELEMENT (target) == element) {
+      GList *node = tmp;
+
+      bindings = g_list_prepend (bindings, binding);
+      tmp = tmp->prev;
+
+      self->bindings = g_list_delete_link (self->bindings, node);
+      if (!tmp)
+        break;
+    }
+    gst_object_unref (target);
+  }
+  GST_OBJECT_UNLOCK (bin);
+
+done:
+  GST_BIN_CLASS (gst_auto_deinterlace_parent_class)->deep_element_removed (bin,
+      sub_bin, element);
+}
+
+static void
+gst_auto_deinterlace_class_init (GstAutoDeinterlaceClass * klass)
+{
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GstElementClass *gstelement_class = (GstElementClass *) klass;
+  GstBinClass *gstbin_class = (GstBinClass *) klass;
+
+  GST_DEBUG_CATEGORY_INIT (autodeinterlace_debug, "autodeinterlace", 0,
+      "Auto color space converter");
+
+  gobject_class->set_property = gst_auto_deinterlace_set_property;
+  gobject_class->get_property = gst_auto_deinterlace_get_property;
+
+  /**
+   * GstAutoDeinterlace:layout:
+   *
+   * This selects which fields is the first in time.
+   *
+   */
+  g_object_class_install_property (gobject_class, PROP_LAYOUT,
+      g_param_spec_enum ("layout",
+          "layout",
+          "Layout to use"
+          " Note that if the underlying implementation doesn't support the property it will be ignored.",
+          GST_TYPE_AUTO_DEINTERLACE_FIELD_LAYOUT,
+          DEFAULT_LAYOUT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
+      );
+
+  /**
+   * GstAutoDeinterlace:fields:
+   *
+   * This selects which fields should be output. If "all" is selected
+   * the output framerate will be double.
+   */
+  g_object_class_install_property (gobject_class, PROP_FIELDS,
+      g_param_spec_enum ("fields",
+          "fields",
+          "Fields to use for deinterlacing."
+          " Note that if the underlying implementation doesn't support the property it will be ignored.",
+          GST_TYPE_AUTO_DEINTERLACE_FIELDS,
+          DEFAULT_FIELDS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
+      );
+
+  /**
+   * GstAutoDeinterlace:mode:
+   *
+   * This selects whether the deinterlacing methods should
+   * always be applied or if they should only be applied
+   * on content that has the "interlaced" flag on the caps.
+   */
+  g_object_class_install_property (gobject_class, PROP_MODE,
+      g_param_spec_enum ("mode",
+          "Mode",
+          "Deinterlace Mode",
+          GST_TYPE_AUTO_DEINTERLACE_MODES,
+          DEFAULT_MODE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
+      );
+
+  gst_type_mark_as_plugin_api (GST_TYPE_AUTO_DEINTERLACE_FIELDS, 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_AUTO_DEINTERLACE_MODES, 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_AUTO_DEINTERLACE_FIELD_LAYOUT, 0);
+
+  gst_element_class_set_static_metadata (gstelement_class,
+      "Select deinterlacer, and converters based on caps",
+      "Bin/Colorspace/Scale/Video/Converter/Deinterlace",
+      "Selects the right deinterlacer based on caps",
+      "Thibault Saunier <tsaunier@igalia.com>");
+
+  gstbin_class->deep_element_added = gst_auto_deinterlace_deep_element_added;
+  gstbin_class->deep_element_removed =
+      gst_auto_deinterlace_deep_element_removed;
+}
+
+static void
+gst_auto_deinterlace_init (GstAutoDeinterlace * self)
+{
+  gst_auto_deinterlace_register_filters (self);
+}

gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstautodeinterlace.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright 2023 Igalia S.L.
+ *  @author: Thibault Saunier <tsaunier@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/gstbin.h>
+#include "gstautoconvert.h"
+
+G_BEGIN_DECLS
+
+G_DECLARE_FINAL_TYPE(GstAutoDeinterlace, gst_auto_deinterlace, GST, AUTO_DEINTERLACE, GstBaseAutoConvert);
+GST_ELEMENT_REGISTER_DECLARE (autodeinterlace);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstautovideo.c Added

@@ -0,0 +1,117 @@
+/* GStreamer
+ * Copyright 2023 Igalia S.L.
+ *  @author: Thibault Saunier <tsaunier@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
+#include "gstautovideo.h"
+
+GST_DEBUG_CATEGORY (autovideo_debug);
+#define GST_CAT_DEFAULT (autovideo_debug)
+
+static gboolean
+append_elements (GString * name, GString * bindesc,
+    const gchar * const *elements)
+{
+  if (!elements) {
+    /* Nothing to do. */
+    return TRUE;
+  }
+
+  for (gint i = 0; elementsi; i++) {
+    gchar **e = g_strsplit (elementsi, " ", 2);
+    GstElementFactory *factory = gst_element_factory_find (g_strchomp (e0));
+
+    if (!factory) {
+      GST_DEBUG_OBJECT (NULL, "Factory %s not found: %s", e0, elementsi);
+
+      g_strfreev (e);
+      return FALSE;
+    }
+
+    if (name) {
+      g_string_append (name, e0);
+    }
+    g_strfreev (e);
+
+    if (bindesc->len > 0) {
+      g_string_append (bindesc, " ! ");
+    }
+    g_string_append (bindesc, elementsi);
+  }
+
+  return TRUE;
+}
+
+static void
+register_known_bin (GstBaseAutoConvert * self,
+    const gchar * const *first_elements,
+    const gchar * const *colorspace_converters,
+    const gchar * const *last_elements,
+    const gchar * const *filters, GstRank rank)
+{
+  GString *name = g_string_new ("autovideoconvert-");
+  GString *bindesc = g_string_new ("");
+
+  if (!append_elements (name, bindesc, first_elements))
+    goto abort;
+  if (!append_elements (name, bindesc, colorspace_converters))
+    goto abort;
+
+  for (gint i = 0; filters && filtersi; i++) {
+    const gchar *tmp2 = { filtersi, NULL };
+    if (!append_elements (name, bindesc, tmp))
+      goto abort;
+    if (!append_elements (NULL, bindesc, colorspace_converters))
+      goto abort;
+  }
+  if (!append_elements (name, bindesc, last_elements))
+    goto abort;
+
+  gst_base_auto_convert_register_filter (GST_BASE_AUTO_CONVERT (self),
+      g_string_free (name, FALSE), g_string_free (bindesc, FALSE), rank);
+  return;
+
+abort:
+  g_string_free (name, TRUE);
+  g_string_free (bindesc, TRUE);
+}
+
+
+void
+gst_auto_video_register_well_known_bins (GstBaseAutoConvert * self,
+    const GstAutoVideoFilterGenerator * gen)
+{
+  static gsize gst_auto_video_register_well_known_bins_once = 0;
+
+  if (g_once_init_enter (&gst_auto_video_register_well_known_bins_once)) {
+    GST_DEBUG_CATEGORY_INIT (autovideo_debug, "autovideo", 0, "Auto video");
+    g_once_init_leave (&gst_auto_video_register_well_known_bins_once, TRUE);
+  }
+
+  for (gint i = 0; geni.colorspace_converters0 || geni.first_elements0
+      || geni.last_elements0 || geni.filters0; i++) {
+    register_known_bin (self, geni.first_elements,
+        geni.colorspace_converters, geni.last_elements, geni.filters,
+        geni.rank);
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstautovideo.h Added

@@ -0,0 +1,40 @@
+/* GStreamer
+ * Copyright 2023 Igalia S.L.
+ *  @author: Thibault Saunier <tsaunier@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "gstautoconvert.h"
+
+G_BEGIN_DECLS
+
+typedef struct
+{
+  const gchar *first_elements4;
+  const gchar *colorspace_converters4;
+  const gchar *last_elements4;
+
+  const gchar *filters4;
+  GstRank rank;
+} GstAutoVideoFilterGenerator;
+
+void gst_auto_video_register_well_known_bins (GstBaseAutoConvert *self, const GstAutoVideoFilterGenerator *gen);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst/autoconvert/gstautovideoconvert.c -> gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstautovideoconvert.c Changed

@@ -1,7 +1,9 @@
 /* GStreamer
- * Copyright 2010 ST-Ericsson SA 
+ * Copyright 2010 ST-Ericsson SA
  *  @author: Benjamin Gaignard <benjamin.gaignard@stericsson.com>
- *  
+ * Copyright 2023 Igalia S.L.
+ *  @author: Thibault Saunier <tsaunier@igalia.com>
+ *
  * 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
@@ -33,106 +35,21 @@
 #include <string.h>
 
 #include "gstautovideoconvert.h"
+#include "gstautovideo.h"
 
 GST_DEBUG_CATEGORY (autovideoconvert_debug);
 #define GST_CAT_DEFAULT (autovideoconvert_debug)
 
-static GMutex factories_mutex;
-static guint32 factories_cookie = 0;    /* Cookie from last time when factories was updated */
-static GList *factories = NULL; /* factories we can use for selecting elements */
-
-/* element factory information */
-static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS_ANY);
-
-static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS_ANY);
-
-
-static GstStateChangeReturn gst_auto_video_convert_change_state (GstElement *
-    element, GstStateChange transition);
-
-void gst_auto_video_convert_update_factory_list (GstAutoVideoConvert *
-    autovideoconvert);
-
-static gboolean
-gst_auto_video_convert_element_filter (GstPluginFeature * feature,
-    GstAutoVideoConvert * autovideoconvert)
-{
-  const gchar *klass;
-
-  /* we only care about element factories */
-  if (G_UNLIKELY (!GST_IS_ELEMENT_FACTORY (feature)))
-    return FALSE;
-
-  klass = gst_element_factory_get_metadata (GST_ELEMENT_FACTORY_CAST (feature),
-      GST_ELEMENT_METADATA_KLASS);
-  /* only select color space converter */
-  if (strstr (klass, "Filter") &&
-      strstr (klass, "Converter") && strstr (klass, "Video")) {
-    GST_DEBUG_OBJECT (autovideoconvert,
-        "gst_auto_video_convert_element_filter found %s",
-        gst_plugin_feature_get_name (GST_PLUGIN_FEATURE_CAST (feature)));
-    return TRUE;
-  }
-  return FALSE;
-}
-
-
-static GList *
-gst_auto_video_convert_create_factory_list (GstAutoVideoConvert *
-    autovideoconvert)
-{
-  GList *result = NULL;
-
-  /* get the feature list using the filter */
-  result = gst_registry_feature_filter (gst_registry_get (),
-      (GstPluginFeatureFilter) gst_auto_video_convert_element_filter,
-      FALSE, autovideoconvert);
-
-  /* sort on rank and name */
-  result = g_list_sort (result, gst_plugin_feature_rank_compare_func);
-
-  return result;
-}
-
-void
-gst_auto_video_convert_update_factory_list (GstAutoVideoConvert *
-    autovideoconvert)
+struct _GstAutoVideoConvert
 {
-  /* use a static mutex to protect factories list and factories cookie */
-  g_mutex_lock (&factories_mutex);
-
-  /* test if a factories list already exist or not */
-  if (!factories) {
-    /* no factories list create it */
-    factories_cookie =
-        gst_registry_get_feature_list_cookie (gst_registry_get ());
-    factories = gst_auto_video_convert_create_factory_list (autovideoconvert);
-  } else {
-    /* a factories list exist but is it up to date? */
-    if (factories_cookie !=
-        gst_registry_get_feature_list_cookie (gst_registry_get ())) {
-      /* we need to update the factories list */
-      /* first free the old one */
-      gst_plugin_feature_list_free (factories);
-      /* then create an updated one */
-      factories_cookie =
-          gst_registry_get_feature_list_cookie (gst_registry_get ());
-      factories = gst_auto_video_convert_create_factory_list (autovideoconvert);
-    }
-  }
+  GstBaseAutoConvert parent;
+};
 
-  g_mutex_unlock (&factories_mutex);
-}
+G_DEFINE_TYPE (GstAutoVideoConvert, gst_auto_video_convert,
+    GST_TYPE_BASE_AUTO_CONVERT);
 
-G_DEFINE_TYPE (GstAutoVideoConvert, gst_auto_video_convert, GST_TYPE_BIN);
 GST_ELEMENT_REGISTER_DEFINE (autovideoconvert, "autovideoconvert",
-    GST_RANK_NONE, GST_TYPE_AUTO_VIDEO_CONVERT);
+    GST_RANK_NONE, gst_auto_video_convert_get_type ());
 
 static void
 gst_auto_video_convert_class_init (GstAutoVideoConvertClass * klass)
@@ -142,137 +59,134 @@
   GST_DEBUG_CATEGORY_INIT (autovideoconvert_debug, "autovideoconvert", 0,
       "Auto color space converter");
 
-  gst_element_class_add_static_pad_template (gstelement_class, &srctemplate);
-  gst_element_class_add_static_pad_template (gstelement_class, &sinktemplate);
-
   gst_element_class_set_static_metadata (gstelement_class,
-      "Select color space converter based on caps", "Generic/Bin",
+      "Select color space converter and scalers based on caps",
+      "Bin/Colorspace/Scale/Video/Converter",
       "Selects the right color space converter based on the caps",
-      "Benjamin Gaignard <benjamin.gaignard@stericsson.com>");
-
-  gstelement_class->change_state =
-      GST_DEBUG_FUNCPTR (gst_auto_video_convert_change_state);
-
-}
-
-static gboolean
-gst_auto_video_convert_add_autoconvert (GstAutoVideoConvert * autovideoconvert)
-{
-  GstPad *pad;
-
-  if (autovideoconvert->autoconvert)
-    return TRUE;
-
-  autovideoconvert->autoconvert =
-      gst_element_factory_make ("autoconvert", "autoconvertchild");
-  if (!autovideoconvert->autoconvert) {
-    GST_ERROR_OBJECT (autovideoconvert,
-        "Could not create autoconvert instance");
-    return FALSE;
-  }
-
-  /* first add autoconvert in bin */
-  gst_bin_add (GST_BIN (autovideoconvert),
-      gst_object_ref (autovideoconvert->autoconvert));
-
-  /* get sinkpad and link it to ghost sink pad */
-  pad = gst_element_get_static_pad (autovideoconvert->autoconvert, "sink");
-  gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (autovideoconvert->sinkpad),
-      pad);
-  gst_object_unref (pad);
-
-  /* get srcpad and link it to ghost src pad */
-  pad = gst_element_get_static_pad (autovideoconvert->autoconvert, "src");
-  gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (autovideoconvert->srcpad), pad);
-  gst_object_unref (pad);
-
-  return TRUE;
-}
-
-static void
-gst_auto_video_convert_remove_autoconvert (GstAutoVideoConvert *
-    autovideoconvert)
-{
-  if (!autovideoconvert->autoconvert)
-    return;
-
-  gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (autovideoconvert->srcpad),
-      NULL);
-  gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (autovideoconvert->sinkpad),
-      NULL);
-
-  gst_bin_remove (GST_BIN (autovideoconvert), autovideoconvert->autoconvert);
-  gst_object_unref (autovideoconvert->autoconvert);
-  autovideoconvert->autoconvert = NULL;
+      "Thibault Saunier <tsaunier@igalia.com>");
 }
 
 static void
 gst_auto_video_convert_init (GstAutoVideoConvert * autovideoconvert)
 {
-  GstPadTemplate *pad_tmpl;
-
-  /* get sink pad template */
-  pad_tmpl = gst_static_pad_template_get (&sinktemplate);
-  autovideoconvert->sinkpad =
-      gst_ghost_pad_new_no_target_from_template ("sink", pad_tmpl);
-  /* add sink ghost pad */
-  gst_element_add_pad (GST_ELEMENT (autovideoconvert),
-      autovideoconvert->sinkpad);
-  gst_object_unref (pad_tmpl);
-
-  /* get src pad template */
-  pad_tmpl = gst_static_pad_template_get (&srctemplate);
-  autovideoconvert->srcpad =
-      gst_ghost_pad_new_no_target_from_template ("src", pad_tmpl);
-  /* add src ghost pad */
-  gst_element_add_pad (GST_ELEMENT (autovideoconvert),
-      autovideoconvert->srcpad);
-  gst_object_unref (pad_tmpl);
-
-  return;
-}
-
-static GstStateChangeReturn
-gst_auto_video_convert_change_state (GstElement * element,
-    GstStateChange transition)
-{
-  GstAutoVideoConvert *autovideoconvert = GST_AUTO_VIDEO_CONVERT (element);
-  GstStateChangeReturn ret;
-
-  switch (transition) {
-    case GST_STATE_CHANGE_NULL_TO_READY:
+  /* *INDENT-OFF* */
+  static const GstAutoVideoFilterGenerator gen = {
     {
-      /* create and add autoconvert in bin */
-      if (!gst_auto_video_convert_add_autoconvert (autovideoconvert)) {
-        ret = GST_STATE_CHANGE_FAILURE;
-        return ret;
-      }
-      /* get an updated list of factories */
-      gst_auto_video_convert_update_factory_list (autovideoconvert);
-      GST_DEBUG_OBJECT (autovideoconvert, "set factories list");
-      /* give factory list to autoconvert */
-      g_object_set (GST_ELEMENT (autovideoconvert->autoconvert), "factories",
-          factories, NULL);
-      break;
-    }
-    default:
-      break;
-  }
-
-  ret = GST_ELEMENT_CLASS (gst_auto_video_convert_parent_class)->change_state
-      (element, transition);
-  if (ret == GST_STATE_CHANGE_FAILURE)
-    return ret;
-
-  switch (transition) {
-    case GST_STATE_CHANGE_READY_TO_NULL:
+      .first_elements = { "bayer2rgb", NULL},
+      .colorspace_converters = { "videoconvertscale", NULL },
+      .last_elements = { NULL } ,
+      .filters = {  NULL},
+      .rank = GST_RANK_SECONDARY,
+    },
     {
-      gst_auto_video_convert_remove_autoconvert (autovideoconvert);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return ret;
+      .first_elements = { "capsfilter caps=\"video/x-raw\"", NULL, },
+      .colorspace_converters = { "videoconvertscale", NULL },
+      .last_elements = { "rgb2bayer", NULL },
+      .filters = {  NULL },
+      .rank = GST_RANK_SECONDARY,
+    },
+    {
+      .first_elements = { "capsfilter caps=\"video/x-raw\"", NULL, },
+      .colorspace_converters = { "videoconvertscale", NULL },
+      .last_elements = { NULL, },
+      .filters = { NULL },
+      .rank = GST_RANK_SECONDARY,
+    },
+    {
+      .first_elements = { NULL, },
+      .colorspace_converters = { "glcolorconvert", "glcolorscale", "glcolorconvert", NULL },
+      .last_elements = { NULL, },
+      .filters = { NULL },
+      .rank = GST_RANK_PRIMARY,
+    },
+    {
+      .first_elements = { "glupload", },
+      .colorspace_converters = { "glcolorconvert", "glcolorscale", "glcolorconvert", NULL },
+      .last_elements = { NULL, },
+      .filters = { NULL },
+      .rank = GST_RANK_PRIMARY,
+    },
+    {
+      .first_elements = { "capsfilter caps=\"video/x-raw\"", "videoconvertscale", "glupload", NULL },
+      .colorspace_converters = { NULL },
+      .last_elements = { NULL },
+      .filters = { NULL },
+      .rank = GST_RANK_MARGINAL + 1,
+    },
+    {
+      .first_elements = { "glcolorconvert", "gldownload", NULL },
+      .colorspace_converters = { NULL },
+      .last_elements = { NULL },
+      .filters = { NULL },
+      .rank = GST_RANK_MARGINAL + 2,
+    },
+    { /* Worst case we upload/download as required */
+      .first_elements = { "glupload", "gldownload", NULL },
+      .colorspace_converters = { "glcolorconvert",  "glcolorscale", "glcolorconvert", NULL },
+      .last_elements = { "glupload", "gldownload", NULL },
+      .filters = { NULL },
+      .rank = GST_RANK_MARGINAL + 1,
+    },
+    { /* Pure cuda is preferred */
+      .first_elements = { NULL },
+      .colorspace_converters = { "cudaconvertscale", NULL },
+      .last_elements = { NULL },
+      .filters = { NULL },
+      .rank = GST_RANK_PRIMARY,
+    },
+    { /* FIXME: Generically make it so we go through cudaconvert for formats not supported by `glcolorconvert` */
+      .first_elements = { "capsfilter caps=video/x-raw(ANY),format={I420_10LE,I422_10LE,I422_12LE}", "cudaupload", NULL },
+      .colorspace_converters = { "cudaconvert", NULL },
+      .last_elements = { "cudadownload", "capsfilter caps=video/x-raw(memory:GLMemory)", NULL },
+      .filters = { NULL },
+      .rank = GST_RANK_SECONDARY + 2,
+    },
+    { /* CUDA -> GL */
+      .first_elements = { "capsfilter caps=video/x-raw(memory:CUDAMemory)", "cudadownload", NULL },
+      .colorspace_converters = { "glcolorconvert",  "glcolorscale", "glcolorconvert", NULL },
+      .last_elements = { "glupload", "gldownload", NULL },
+      .filters = { NULL },
+      .rank = GST_RANK_SECONDARY,
+    },
+    { /* GL memory to cuda */
+      .first_elements = { NULL },
+      .colorspace_converters = { "glcolorconvert",  "glcolorscale", "glcolorconvert", NULL },
+      .last_elements = { "cudaupload", "capsfilter caps=video/x-raw(memory:CUDAMemory)", NULL },
+      .filters = { NULL },
+      .rank = GST_RANK_MARGINAL,
+    },
+    { /* System memory to cuda */
+      .first_elements = { "capsfilter caps=\"video/x-raw\"", NULL },
+      .colorspace_converters = { "videoconvertscale", NULL },
+      .last_elements = { "cudaupload", "capsfilter caps=video/x-raw(memory:CUDAMemory)", NULL },
+      .filters = { NULL },
+      .rank = GST_RANK_MARGINAL,
+    },
+    {
+      .first_elements = { NULL, },
+      .colorspace_converters = { "d3d11convert", NULL },
+      .last_elements = { NULL, },
+      .filters = { NULL },
+      .rank = GST_RANK_PRIMARY,
+    },
+    {
+      .first_elements = { "d3d11download", "d3d11upload", NULL},
+      .colorspace_converters = { "glcolorconvert", "glcolorscale", "glcolorconvert", NULL },
+      .last_elements = { "d3d11download", "d3d11upload", NULL },
+      .filters = { NULL },
+      .rank = GST_RANK_MARGINAL,
+    },
+    { /* Worst case we upload/download as required */
+      .first_elements = { NULL},
+      .colorspace_converters = { NULL },
+      .last_elements = { NULL },
+      .filters = { NULL },
+      .rank = 0,
+    },
+  };
+  /* *INDENT-ON* */
+
+
+  gst_auto_video_register_well_known_bins (GST_BASE_AUTO_CONVERT
+      (autovideoconvert), gen);
 }

gst-plugins-bad-1.22.7.tar.xz/gst/autoconvert/gstautovideoconvert.h -> gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstautovideoconvert.h Changed

gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstautovideoflip.c Added

@@ -0,0 +1,326 @@
+/* GStreamer
+ * Copyright 2023 Igalia S.L.
+ *  @author: Thibault Saunier <tsaunier@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+/**
+ * SECTION:element-autovideoflip
+ * @title: autovideoflip
+ *
+ * The #autovideoflip element is used to flip the video plugging the right
+ * element depending on caps and underlying buffer memory.
+ *
+ * Since: 1.24
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
+#include <gst/video/video.h>
+
+#include "gstautovideo.h"
+#include "gstautovideoflip.h"
+
+GST_DEBUG_CATEGORY (autovideoflip_debug);
+#define GST_CAT_DEFAULT (autovideoflip_debug)
+
+#define PROP_DIRECTION_DEFAULT GST_VIDEO_ORIENTATION_IDENTITY
+
+/* GstVideoFlip properties */
+enum
+{
+  PROP_0,
+  PROP_VIDEO_DIRECTION
+};
+
+struct _GstAutoVideoFlip
+{
+  GstBaseAutoConvert parent;
+
+  GstVideoOrientationMethod direction;
+  GList *bindings;
+};
+
+G_DEFINE_TYPE (GstAutoVideoFlip, gst_auto_video_flip,
+    GST_TYPE_BASE_AUTO_CONVERT);
+
+GST_ELEMENT_REGISTER_DEFINE (autovideoflip, "autovideoflip",
+    GST_RANK_NONE, gst_auto_video_flip_get_type ());
+
+static void
+gst_auto_video_flip_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstAutoVideoFlip *self = GST_AUTO_VIDEO_FLIP (object);
+
+  switch (prop_id) {
+    case PROP_VIDEO_DIRECTION:
+      self->direction = g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_auto_video_flip_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstAutoVideoFlip *self = GST_AUTO_VIDEO_FLIP (object);
+
+  switch (prop_id) {
+    case PROP_VIDEO_DIRECTION:
+      g_value_set_enum (value, self->direction);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+#if !GLIB_CHECK_VERSION(2, 68, 0)
+static GObject *
+g_binding_dup_target (GBinding * binding)
+{
+  return g_object_ref (g_binding_get_target (binding));
+}
+#endif
+
+static gboolean
+element_is_handled_video_flip (GstElement * element)
+{
+  GstElementFactory *factory = gst_element_get_factory (element);
+
+  return !g_strcmp0 (GST_OBJECT_NAME (factory), "glvideoflip") ||
+      !g_strcmp0 (GST_OBJECT_NAME (factory), "videoflip");
+}
+
+static gboolean
+gst_auto_video_flip_transform_to (GBinding * binding, const GValue * from,
+    GValue * to_value, gpointer _udata)
+{
+  g_value_set_enum (to_value, g_value_get_enum (from));
+
+  return TRUE;
+}
+
+static void
+gst_auto_video_flip_deep_element_added (GstBin * bin, GstBin * sub_bin,
+    GstElement * element)
+{
+  GstAutoVideoFlip *self = GST_AUTO_VIDEO_FLIP (bin);
+  GList *new_bindings = NULL;
+
+  if (!element_is_handled_video_flip (element))
+    goto done;
+
+  GST_OBJECT_LOCK (bin);
+  for (GList * tmp = self->bindings; tmp; tmp = tmp->next) {
+    GBinding *binding = tmp->data;
+    GObject *target = g_binding_dup_target (binding);
+
+    if (GST_ELEMENT (target) == element) {
+      GST_INFO_OBJECT (self, "Newly added element %s already bound",
+          GST_OBJECT_NAME (gst_element_get_factory (element)));
+      GST_OBJECT_UNLOCK (bin);
+      gst_object_unref (target);
+      goto done;
+    }
+    gst_object_unref (target);
+  }
+  GST_OBJECT_UNLOCK (bin);
+
+  new_bindings = g_list_prepend (new_bindings,
+      g_object_bind_property_full (bin, "video-direction",
+          element, "video-direction",
+          G_BINDING_SYNC_CREATE | G_BINDING_DEFAULT,
+          gst_auto_video_flip_transform_to, NULL, NULL, NULL)
+      );
+
+  GST_OBJECT_LOCK (bin);
+  self->bindings = g_list_concat (self->bindings, new_bindings);
+  GST_OBJECT_UNLOCK (bin);
+
+done:
+  GST_BIN_CLASS (gst_auto_video_flip_parent_class)->deep_element_added (bin,
+      sub_bin, element);
+}
+
+static void
+gst_auto_video_flip_deep_element_removed (GstBin * bin, GstBin * sub_bin,
+    GstElement * element)
+{
+  GList *bindings = NULL;
+  GstAutoVideoFlip *self = GST_AUTO_VIDEO_FLIP (bin);
+
+  if (!element_is_handled_video_flip (element))
+    goto done;
+
+  GST_OBJECT_LOCK (bin);
+  for (GList * tmp = self->bindings; tmp; tmp = tmp->next) {
+    GBinding *binding = tmp->data;
+    GObject *target = g_binding_dup_target (binding);
+
+    if (GST_ELEMENT (target) == element) {
+      GList *node = tmp;
+
+      bindings = g_list_prepend (bindings, binding);
+      tmp = tmp->prev;
+
+      self->bindings = g_list_delete_link (self->bindings, node);
+      if (!tmp)
+        break;
+    }
+    gst_object_unref (target);
+  }
+  GST_OBJECT_UNLOCK (bin);
+
+done:
+  GST_BIN_CLASS (gst_auto_video_flip_parent_class)->deep_element_removed (bin,
+      sub_bin, element);
+}
+
+
+static void
+gst_auto_video_flip_class_init (GstAutoVideoFlipClass * klass)
+{
+  GstElementClass *gstelement_class = (GstElementClass *) klass;
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GstBinClass *gstbin_class = (GstBinClass *) klass;
+
+  GST_DEBUG_CATEGORY_INIT (autovideoflip_debug, "autovideoflip", 0,
+      "Auto video flipper");
+
+  gobject_class->set_property = gst_auto_video_flip_set_property;
+  gobject_class->get_property = gst_auto_video_flip_get_property;
+  g_object_class_install_property (gobject_class, PROP_VIDEO_DIRECTION,
+      g_param_spec_enum ("video-direction", "video-direction",
+          "Video direction: rotation and flipping",
+          GST_TYPE_VIDEO_ORIENTATION_METHOD, PROP_DIRECTION_DEFAULT,
+          GST_PARAM_CONTROLLABLE | GST_PARAM_MUTABLE_PLAYING |
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
+
+  gst_element_class_set_static_metadata (gstelement_class,
+      "Flip the video plugging the right element depending on caps",
+      "Bin/Filter/Effect/Video",
+      "Selects the right video flip element based on the caps",
+      "Thibault Saunier <tsaunier@igalia.com>");
+
+  gstbin_class->deep_element_added = gst_auto_video_flip_deep_element_added;
+  gstbin_class->deep_element_removed = gst_auto_video_flip_deep_element_removed;
+}
+
+static void
+gst_auto_video_flip_init (GstAutoVideoFlip * self)
+{
+  self->direction = PROP_DIRECTION_DEFAULT;
+
+  /* *INDENT-OFF* */
+  static const GstAutoVideoFilterGenerator gen = {
+    {
+      .first_elements = { "bayer2rgb", NULL},
+      .colorspace_converters = { "videoconvertscale", NULL },
+      .last_elements = { NULL } ,
+      .filters = { "videoflip", NULL },
+      .rank = GST_RANK_MARGINAL,
+    },
+    {
+      .first_elements = { NULL, },
+      .colorspace_converters = { "videoconvertscale", NULL },
+      .last_elements = { NULL },
+      .filters = {  "videoflip" },
+      .rank = GST_RANK_SECONDARY,
+    },
+    {
+      .first_elements = { NULL, },
+      .colorspace_converters = { "videoconvertscale", NULL },
+      .last_elements = { "rgb2bayer", NULL },
+      .filters = {  "videoflip" },
+      .rank = GST_RANK_MARGINAL,
+    },
+    {
+      .first_elements = { "glupload" },
+      .colorspace_converters = { "glcolorconvert", NULL },
+      .last_elements = { NULL, },
+      .filters = { "glvideoflip" },
+      .rank = GST_RANK_PRIMARY,
+    },
+    {
+      .first_elements = { NULL },
+      .colorspace_converters = { "glcolorconvert", NULL },
+      .last_elements = { NULL, },
+      .filters = { "glvideoflip" },
+      .rank = GST_RANK_PRIMARY,
+    },
+    {
+      .first_elements = { "videoconvertscale", "glupload", NULL },
+      .colorspace_converters = { NULL },
+      .last_elements = { NULL },
+      .filters = { "glvideoflip", NULL },
+      .rank = GST_RANK_MARGINAL + 1,
+    },
+    {
+      .first_elements = { NULL },
+      .colorspace_converters = { NULL },
+      .last_elements = { "gldownload", NULL },
+      .filters = { "glvideoflip", NULL },
+      .rank = GST_RANK_MARGINAL + 1,
+    },
+    { /* CUDA -> GL */
+      .first_elements = { "capsfilter caps=video/x-raw(memory:CUDAMemory)", "cudadownload", NULL },
+      .colorspace_converters = { "glcolorconvert",  "glcolorscale", "glcolorconvert", NULL },
+      .last_elements = { NULL },
+      .filters = { "glvideoflip", NULL },
+      .rank = GST_RANK_PRIMARY - 1,
+    },
+    { /* CUDA -> CUDA */
+      .first_elements = { "capsfilter caps=video/x-raw(memory:CUDAMemory)", "cudadownload", NULL },
+      .colorspace_converters = { "glcolorconvert",  "glcolorscale", "glcolorconvert", NULL },
+      .last_elements = { "cudaupload", "capsfilter caps=video/x-raw(memory:CUDAMemory)", NULL },
+      .filters = { "glvideoflip", NULL },
+      .rank = GST_RANK_SECONDARY - 1,
+    },
+    { /* Software -> CUDA (uploading as soon as possible) */
+      .first_elements = { "glupload", NULL },
+      .colorspace_converters = { "glcoloconvert", NULL },
+      .last_elements = { "cudaupload", "capsfilter caps=video/x-raw(memory:CUDAMemory)", NULL },
+      .filters = { "glvideoflip", NULL },
+      .rank = GST_RANK_MARGINAL,
+    },
+    { /* CUDA -> Software */
+      .first_elements = { "capsfilter caps=video/x-raw(memory:CUDAMemory)", "cudadownload", NULL },
+      .colorspace_converters = { "glcolorconvert",  "glcolorscale", "glcolorconvert", NULL },
+      .last_elements = { "gldownload", NULL },
+      .filters = { "glvideoflip", NULL },
+      .rank = GST_RANK_MARGINAL,
+    },
+    { /* Worst case we upload/download as required */
+      .first_elements = { NULL},
+      .colorspace_converters = { NULL },
+      .last_elements = { NULL },
+      .filters = { NULL },
+      .rank = 0,
+    },
+  };
+  /* *INDENT-ON* */
+
+
+  gst_auto_video_register_well_known_bins (GST_BASE_AUTO_CONVERT (self), gen);
+}

gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstautovideoflip.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright 2023 Igalia S.L.
+ *  @author: Thibault Saunier <tsaunier@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/gstbin.h>
+#include "gstautoconvert.h"
+
+G_BEGIN_DECLS
+
+G_DECLARE_FINAL_TYPE(GstAutoVideoFlip, gst_auto_video_flip, GST, AUTO_VIDEO_FLIP, GstBaseAutoConvert);
+GST_ELEMENT_REGISTER_DECLARE (autovideoflip);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstbaseautoconvert.c Added

@@ -0,0 +1,1457 @@
+/* GStreamer
+ *
+ *  Copyright 2007-2012 Collabora Ltd
+ *   @author: Olivier Crete <olivier.crete@collabora.com>
+ *  Copyright 2007-2008 Nokia
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * GstBaseAutoConvert:
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstbaseautoconvert.h"
+
+#include <string.h>
+
+GST_DEBUG_CATEGORY (baseautoconvert_debug);
+#define GST_CAT_DEFAULT (baseautoconvert_debug)
+
+#define GST_BASEAUTOCONVERT_LOCK(ac) GST_OBJECT_LOCK (ac)
+#define GST_BASEAUTOCONVERT_UNLOCK(ac) GST_OBJECT_UNLOCK (ac)
+
+#define SUPRESS_UNUSED_WARNING(a) (void)a
+
+/* elementfactory information */
+static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
+
+static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
+
+/* GstBaseAutoConvert signals and args */
+enum
+{
+  /* FILL ME */
+  LAST_SIGNAL
+};
+
+static void gst_base_auto_convert_dispose (GObject * object);
+static void gst_base_auto_convert_finalize (GObject * object);
+
+static GstElement *gst_base_auto_convert_get_subelement (GstBaseAutoConvert *
+    self);
+static GstPad *gst_base_auto_convert_get_internal_sinkpad (GstBaseAutoConvert *
+    self);
+static GstPad *gst_base_auto_convert_get_internal_srcpad (GstBaseAutoConvert *
+    self);
+
+static GstIterator *gst_base_auto_convert_iterate_internal_links (GstPad * pad,
+    GstObject * parent);
+
+static GstCaps *gst_base_auto_convert_getcaps (GstBaseAutoConvert * self,
+    GstCaps * filter, GstPadDirection dir);
+static GstFlowReturn gst_base_auto_convert_sink_chain (GstPad * pad,
+    GstObject * parent, GstBuffer * buffer);
+static GstFlowReturn gst_base_auto_convert_sink_chain_list (GstPad * pad,
+    GstObject * parent, GstBufferList * list);
+static gboolean gst_base_auto_convert_sink_event (GstPad * pad,
+    GstObject * parent, GstEvent * event);
+static gboolean gst_base_auto_convert_sink_query (GstPad * pad,
+    GstObject * parent, GstQuery * query);
+
+static gboolean gst_base_auto_convert_src_event (GstPad * pad,
+    GstObject * parent, GstEvent * event);
+static gboolean gst_base_auto_convert_src_query (GstPad * pad,
+    GstObject * parent, GstQuery * query);
+
+static GstFlowReturn gst_base_auto_convert_internal_sink_chain (GstPad * pad,
+    GstObject * parent, GstBuffer * buffer);
+static GstFlowReturn gst_base_auto_convert_internal_sink_chain_list (GstPad *
+    pad, GstObject * parent, GstBufferList * list);
+static gboolean gst_base_auto_convert_internal_sink_event (GstPad * pad,
+    GstObject * parent, GstEvent * event);
+static gboolean gst_base_auto_convert_internal_sink_query (GstPad * pad,
+    GstObject * parent, GstQuery * query);
+
+static gboolean gst_base_auto_convert_internal_src_event (GstPad * pad,
+    GstObject * parent, GstEvent * event);
+static gboolean gst_base_auto_convert_internal_src_query (GstPad * pad,
+    GstObject * parent, GstQuery * query);
+static GList *gst_base_auto_convert_get_or_load_filters_info (GstBaseAutoConvert
+    * self);
+
+G_DECLARE_FINAL_TYPE (GstBaseAutoConvertPad, gst_base_auto_convert_pad, GST,
+    BASE_AUTO_CONVERT_PAD, GstPad);
+struct _GstBaseAutoConvertPad
+{
+  GstPad parent;
+
+  GstBaseAutoConvert *obj;
+};
+G_DEFINE_TYPE (GstBaseAutoConvertPad, gst_base_auto_convert_pad, GST_TYPE_PAD);
+
+static void
+gst_base_auto_convert_pad_class_init (GstBaseAutoConvertPadClass * klass)
+{
+}
+
+static void
+gst_base_auto_convert_pad_init (GstBaseAutoConvertPad * self)
+{
+  SUPRESS_UNUSED_WARNING (GST_IS_BASE_AUTO_CONVERT_PAD);
+}
+
+G_DEFINE_TYPE (GstBaseAutoConvert, gst_base_auto_convert, GST_TYPE_BIN);
+
+typedef struct
+{
+  gint refcount;
+
+  GstPad *sink;
+  GstPad *src;
+} InternalPads;
+
+static InternalPads *
+internal_pads_new (GstBaseAutoConvert * self, const gchar * subelement_name)
+{
+  InternalPads *pads = g_new0 (InternalPads, 1);
+  gchar *name = g_strdup_printf ("internal_sink_%s", subelement_name);
+
+  pads->refcount = 1;
+  pads->sink = g_object_new (gst_base_auto_convert_pad_get_type (),
+      "name", name, "direction", GST_PAD_SINK, NULL);
+  g_free (name);
+  GST_BASE_AUTO_CONVERT_PAD (pads->sink)->obj = self;
+
+  name = g_strdup_printf ("internal_src_%s", subelement_name);
+  pads->src = g_object_new (gst_base_auto_convert_pad_get_type (),
+      "name", name, "direction", GST_PAD_SRC, NULL);
+  g_free (name);
+  GST_BASE_AUTO_CONVERT_PAD (pads->src)->obj = self;
+
+  return pads;
+}
+
+static void
+internal_pads_unref (InternalPads * pads)
+{
+  if (!g_atomic_int_dec_and_test (&pads->refcount))
+    return;
+
+  gst_clear_object (&pads->sink);
+  gst_clear_object (&pads->src);
+  g_free (pads);
+}
+
+static InternalPads *
+internal_pads_ref (InternalPads * pads)
+{
+  g_atomic_int_inc (&pads->refcount);
+
+  return pads;
+}
+
+static void
+gst_base_auto_convert_element_removed (GstBin * bin, GstElement * child)
+{
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT (bin);
+
+  g_hash_table_remove (self->elements, child);
+}
+
+static void
+gst_auto_convert_filter_info_free (GstAutoConvertFilterInfo * known_bin)
+{
+  g_free (known_bin->name);
+  g_free (known_bin->bindesc);
+  gst_caps_unref (known_bin->sink_caps);
+  gst_caps_unref (known_bin->src_caps);
+
+  gst_object_unref (known_bin->subbin);
+
+  g_free (known_bin);
+}
+
+static gint
+g_auto_convert_filter_info_compare (GstAutoConvertFilterInfo * b1,
+    GstAutoConvertFilterInfo * b2)
+{
+  gint diff;
+
+  diff = b2->rank - b1->rank;
+  if (diff != 0)
+    return diff;
+
+  diff = g_strcmp0 (b2->name, b1->name);
+
+  return diff;
+}
+
+static GstCaps *
+gst_base_auto_convert_get_template_caps_for (GstElement * subbin,
+    GstPadDirection dir)
+{
+  GstElement *element = NULL;
+  GstPad *pad = NULL;
+  GstCaps *res = NULL;
+
+  g_assert (g_list_length (subbin->sinkpads) == 1);
+  g_assert (g_list_length (subbin->srcpads) == 1);
+  if (GST_IS_BIN (subbin)) {
+    GstPad *ghostpad =
+        (dir == GST_PAD_SINK) ? subbin->sinkpads->data : subbin->srcpads->data;
+    GstPad *internal = gst_pad_get_single_internal_link (ghostpad);
+
+    pad = gst_pad_get_peer (internal);
+
+    gst_object_unref (internal);
+  } else {
+    pad =
+        (dir ==
+        GST_PAD_SINK) ? gst_object_ref (subbin->
+        sinkpads->data) : gst_object_ref (subbin->srcpads->data);
+  }
+
+  element = GST_ELEMENT (GST_OBJECT_PARENT (pad));
+  g_assert (element);
+
+  if (!g_strcmp0 (GST_OBJECT_NAME (gst_element_get_factory (element)),
+          "capsfilter")) {
+    g_object_get (G_OBJECT (element), "caps", &res, NULL);
+  } else {
+    res = gst_pad_get_pad_template_caps (pad);
+  }
+  gst_object_unref (pad);
+
+  return gst_caps_make_writable (res);
+}
+
+gboolean
+gst_base_auto_convert_register_filter (GstBaseAutoConvert * self, gchar * name,
+    gchar * bindesc, GstRank rank)
+{
+  g_assert (name);
+
+  for (GList * tmp = self->filters_info; tmp; tmp = tmp->next) {
+    g_return_val_if_fail (g_strcmp0 (name,
+            ((GstAutoConvertFilterInfo *) tmp->data)->name), FALSE);
+  }
+
+  GError *err = NULL;
+  bindesc = g_strchomp (bindesc);
+  GstElement *subbin = gst_parse_bin_from_description_full (bindesc, TRUE,
+      NULL, GST_PARSE_FLAG_NO_SINGLE_ELEMENT_BINS | GST_PARSE_FLAG_PLACE_IN_BIN,
+      &err);
+
+  if (!subbin) {
+    GST_INFO ("Could not create subbin for %s", name);
+    g_free (name);
+    g_free (bindesc);
+
+    return FALSE;
+  }
+
+  GstAutoConvertFilterInfo *filter_info = g_new0 (GstAutoConvertFilterInfo, 1);
+  filter_info->sink_caps =
+      gst_base_auto_convert_get_template_caps_for (subbin, GST_PAD_SINK);
+  filter_info->src_caps =
+      gst_base_auto_convert_get_template_caps_for (subbin, GST_PAD_SRC);
+  filter_info->name = name;
+  filter_info->bindesc = bindesc;
+  filter_info->rank = rank;
+  gst_object_set_name (GST_OBJECT (subbin), filter_info->name);
+  filter_info->subbin = gst_object_ref_sink (subbin);
+
+  GST_OBJECT_LOCK (self);
+  self->filters_info =
+      g_list_insert_sorted (self->filters_info, filter_info,
+      (GCompareFunc) g_auto_convert_filter_info_compare);
+  GST_OBJECT_UNLOCK (self);
+
+  return TRUE;
+}
+
+static void
+gst_base_auto_convert_class_init (GstBaseAutoConvertClass * klass)
+{
+  GstElementClass *gstelement_class = (GstElementClass *) klass;
+  GstBinClass *gstbin_class = (GstBinClass *) klass;
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+
+  GST_DEBUG_CATEGORY_INIT (baseautoconvert_debug, "baseautoconvert", 0,
+      "Auto convert based on caps");
+
+  gst_element_class_add_static_pad_template (gstelement_class, &srctemplate);
+  gst_element_class_add_static_pad_template (gstelement_class, &sinktemplate);
+
+  gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_base_auto_convert_dispose);
+  gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_base_auto_convert_finalize);
+
+  gstbin_class->element_removed = gst_base_auto_convert_element_removed;
+
+  klass->registers_filters = TRUE;
+}
+
+static void
+gst_base_auto_convert_init (GstBaseAutoConvert * self)
+{
+  self->sinkpad = gst_pad_new_from_static_template (&sinktemplate, "sink");
+  self->srcpad = gst_pad_new_from_static_template (&srctemplate, "src");
+  self->elements = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+      NULL, (GDestroyNotify) internal_pads_unref);
+
+  gst_pad_set_chain_function (self->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_sink_chain));
+  gst_pad_set_chain_list_function (self->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_sink_chain_list));
+  gst_pad_set_event_function (self->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_sink_event));
+  gst_pad_set_query_function (self->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_sink_query));
+  gst_pad_set_iterate_internal_links_function (self->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_iterate_internal_links));
+
+  gst_pad_set_event_function (self->srcpad,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_src_event));
+  gst_pad_set_query_function (self->srcpad,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_src_query));
+  gst_pad_set_iterate_internal_links_function (self->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_iterate_internal_links));
+
+  gst_element_add_pad (GST_ELEMENT (self), self->sinkpad);
+  gst_element_add_pad (GST_ELEMENT (self), self->srcpad);
+}
+
+static void
+gst_base_auto_convert_dispose (GObject * object)
+{
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT (object);
+
+  GST_BASEAUTOCONVERT_LOCK (self);
+  g_clear_object (&self->current_subelement);
+  g_clear_object (&self->current_internal_sinkpad);
+  g_clear_object (&self->current_internal_srcpad);
+  GST_BASEAUTOCONVERT_UNLOCK (self);
+
+  G_OBJECT_CLASS (gst_base_auto_convert_parent_class)->dispose (object);
+}
+
+static void
+gst_base_auto_convert_finalize (GObject * object)
+{
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT (object);
+
+  if (self->factories)
+    gst_plugin_feature_list_free (self->factories);
+  g_hash_table_unref (self->elements);
+  g_list_free_full (self->filters_info,
+      (GDestroyNotify) gst_auto_convert_filter_info_free);
+
+  G_OBJECT_CLASS (gst_base_auto_convert_parent_class)->finalize (object);
+}
+
+/**
+ * get_pad_by_direction:
+ * @element: The Element
+ * @direction: The direction
+ *
+ * Gets a #GstPad that goes in the requested direction. I will return NULL
+ * if there is no pad or if there is more than one pad in this direction
+ */
+
+static GstPad *
+get_pad_by_direction (GstElement * element, GstPadDirection direction)
+{
+  GstIterator *iter = gst_element_iterate_pads (element);
+  GstPad *selected_pad = NULL;
+  gboolean done;
+  GValue item = { 0, };
+
+  if (!iter)
+    return NULL;
+
+  done = FALSE;
+  while (!done) {
+    switch (gst_iterator_next (iter, &item)) {
+      case GST_ITERATOR_OK:
+      {
+        GstPad *pad = g_value_get_object (&item);
+
+        if (gst_pad_get_direction (pad) == direction) {
+          /* We check if there is more than one pad in this direction,
+           * if there is, we return NULL so that the element is refused
+           */
+          if (selected_pad) {
+            done = TRUE;
+            gst_object_unref (selected_pad);
+            selected_pad = NULL;
+          } else {
+            selected_pad = g_object_ref (pad);
+          }
+        }
+        g_value_unset (&item);
+      }
+        break;
+      case GST_ITERATOR_RESYNC:
+        if (selected_pad) {
+          gst_object_unref (selected_pad);
+          selected_pad = NULL;
+        }
+        gst_iterator_resync (iter);
+        break;
+      case GST_ITERATOR_ERROR:
+        GST_ERROR ("Error iterating pads of element %s",
+            GST_OBJECT_NAME (element));
+        gst_object_unref (selected_pad);
+        selected_pad = NULL;
+        done = TRUE;
+        break;
+      case GST_ITERATOR_DONE:
+        done = TRUE;
+        break;
+    }
+  }
+  g_value_unset (&item);
+  gst_iterator_free (iter);
+
+  if (!selected_pad)
+    GST_ERROR ("Did not find pad of direction %d in %s",
+        direction, GST_OBJECT_NAME (element));
+
+  return selected_pad;
+}
+
+static GstElement *
+gst_base_auto_convert_get_subelement (GstBaseAutoConvert * self)
+{
+  GstElement *element = NULL;
+
+  GST_BASEAUTOCONVERT_LOCK (self);
+  if (self->current_subelement)
+    element = gst_object_ref (self->current_subelement);
+  GST_BASEAUTOCONVERT_UNLOCK (self);
+
+  return element;
+}
+
+static GstPad *
+gst_base_auto_convert_get_internal_sinkpad (GstBaseAutoConvert * self)
+{
+  GstPad *pad = NULL;
+
+  GST_BASEAUTOCONVERT_LOCK (self);
+  if (self->current_internal_sinkpad)
+    pad = gst_object_ref (self->current_internal_sinkpad);
+  GST_BASEAUTOCONVERT_UNLOCK (self);
+
+  return pad;
+}
+
+static GstPad *
+gst_base_auto_convert_get_internal_srcpad (GstBaseAutoConvert * self)
+{
+  GstPad *pad = NULL;
+
+  GST_BASEAUTOCONVERT_LOCK (self);
+  if (self->current_internal_srcpad)
+    pad = gst_object_ref (self->current_internal_srcpad);
+  GST_BASEAUTOCONVERT_UNLOCK (self);
+
+  return pad;
+}
+
+/*
+ * This function creates and adds an element to the GstBaseAutoConvert
+ * it then creates the internal pads and links them
+ *
+ */
+
+static GstElement *
+gst_base_auto_convert_add_element (GstBaseAutoConvert * self,
+    GstAutoConvertFilterInfo * filter_info)
+{
+  GstElement *element = NULL;
+  InternalPads *pads;
+
+  g_assert (filter_info->subbin);
+
+
+  element = filter_info->subbin;
+  GST_DEBUG_OBJECT (self, "Adding element %s to the baseautoconvert bin",
+      filter_info->name);
+
+  pads = internal_pads_new (self, GST_OBJECT_NAME (element));
+  g_hash_table_insert (self->elements, element, pads);
+
+  gst_pad_set_chain_function (pads->sink,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_internal_sink_chain));
+  gst_pad_set_chain_list_function (pads->sink,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_internal_sink_chain_list));
+  gst_pad_set_event_function (pads->sink,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_internal_sink_event));
+  gst_pad_set_query_function (pads->sink,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_internal_sink_query));
+
+  gst_pad_set_event_function (pads->src,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_internal_src_event));
+  gst_pad_set_query_function (pads->src,
+      GST_DEBUG_FUNCPTR (gst_base_auto_convert_internal_src_query));
+
+  return gst_object_ref (element);
+}
+
+static GstElement *
+gst_base_auto_convert_get_or_make_element_from_filter_info (GstBaseAutoConvert *
+    self, GstAutoConvertFilterInfo * nb)
+{
+  GstElement *element = NULL;
+
+  element = gst_bin_get_by_name (GST_BIN (self), nb->name);
+
+  if (!element) {
+    element = gst_base_auto_convert_add_element (self, nb);
+  }
+
+  return element;
+}
+
+/*
+ * This function checks if there is one and only one pad template on the
+ * factory that can accept the given caps. If there is one and only one,
+ * it returns TRUE, FALSE otherwise
+ */
+
+static gboolean
+filter_info_can_intersect (GstBaseAutoConvert * self,
+    GstAutoConvertFilterInfo * filter_info, GstPadDirection direction,
+    GstCaps * caps)
+{
+  gboolean res;
+  GST_LOG_OBJECT (self, "Checking if %s (bin_desc=%s) supports %s caps:",
+      filter_info->name, filter_info->bindesc,
+      direction == GST_PAD_SINK ? "sink" : "src");
+  GST_LOG_OBJECT (self, "Supported caps: %" GST_PTR_FORMAT,
+      direction ==
+      GST_PAD_SINK ? filter_info->sink_caps : filter_info->src_caps);
+  GST_LOG_OBJECT (self, "Caps: %" GST_PTR_FORMAT, caps);
+
+  res =
+      gst_caps_can_intersect (direction ==
+      GST_PAD_SINK ? filter_info->sink_caps : filter_info->src_caps, caps);
+  GST_LOG_OBJECT (self, "Intersect result: %d", res);
+
+  return res;
+}
+
+static gboolean
+sticky_event_push (GstPad * pad, GstEvent ** event, gpointer user_data)
+{
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT (user_data);
+
+  gst_event_ref (*event);
+  gst_pad_push_event (self->current_internal_srcpad, *event);
+
+  return TRUE;
+}
+
+static InternalPads *
+gst_base_auto_convert_get_element_internal_pads (GstBaseAutoConvert * self,
+    GstElement * element)
+{
+  InternalPads *pads;
+
+  GST_OBJECT_LOCK (self);
+  pads = g_hash_table_lookup (self->elements, element);
+  if (pads)
+    pads = internal_pads_ref (pads);
+  GST_OBJECT_UNLOCK (self);
+
+
+  return pads;
+}
+
+static gboolean
+gst_base_auto_convert_activate_element (GstBaseAutoConvert * self,
+    GstElement * element, GstCaps * caps)
+{
+  gboolean res = TRUE;
+  GstPad *sinkpad = NULL, *srcpad = NULL;
+  GstPadLinkReturn padlinkret;
+  GstElement *current_subelement = NULL;
+  InternalPads *pads =
+      gst_base_auto_convert_get_element_internal_pads (self, element);
+
+  g_assert (pads);
+
+  if (caps) {
+    /* check if the element can really accept said caps */
+    if (!gst_pad_peer_query_accept_caps (pads->src, caps)) {
+      GST_DEBUG_OBJECT (self, "Could not set %s:%s to %"
+          GST_PTR_FORMAT, GST_DEBUG_PAD_NAME (pads->src), caps);
+      goto error;
+    }
+  }
+
+  current_subelement = gst_base_auto_convert_get_subelement (self);
+  gst_element_set_locked_state (element, FALSE);
+  if (!gst_bin_add (GST_BIN (self), element)) {
+    GST_ERROR_OBJECT (self, "Could not add element %s to the bin",
+        GST_OBJECT_NAME (element));
+    goto error;
+  }
+
+  if (!gst_element_sync_state_with_parent (element)) {
+    GST_WARNING_OBJECT (self, "Could sync %" GST_PTR_FORMAT " state", element);
+    goto error;
+  }
+
+  srcpad = get_pad_by_direction (element, GST_PAD_SRC);
+  if (!srcpad) {
+    GST_ERROR_OBJECT (self, "Could not find source in %s",
+        GST_OBJECT_NAME (element));
+    goto error;
+  }
+
+  sinkpad = get_pad_by_direction (element, GST_PAD_SINK);
+  if (!sinkpad) {
+    GST_ERROR_OBJECT (self, "Could not find sink in %s",
+        GST_OBJECT_NAME (element));
+    goto error;
+  }
+
+  gst_pad_set_active (pads->sink, TRUE);
+  gst_pad_set_active (pads->src, TRUE);
+
+  padlinkret = gst_pad_link_full (pads->src, sinkpad,
+      GST_PAD_LINK_CHECK_NOTHING);
+  if (GST_PAD_LINK_FAILED (padlinkret)) {
+    GST_WARNING_OBJECT (self, "Could not links pad %s:%s to %s:%s"
+        " for reason %d",
+        GST_DEBUG_PAD_NAME (pads->src),
+        GST_DEBUG_PAD_NAME (sinkpad), padlinkret);
+    goto error;
+  }
+
+  padlinkret = gst_pad_link_full (srcpad, pads->sink,
+      GST_PAD_LINK_CHECK_NOTHING);
+  if (GST_PAD_LINK_FAILED (padlinkret)) {
+    GST_WARNING_OBJECT (self, "Could not links pad %s:%s to %s:%s"
+        " for reason %d",
+        GST_DEBUG_PAD_NAME (pads->src),
+        GST_DEBUG_PAD_NAME (sinkpad), padlinkret);
+    goto error;
+  }
+
+  GST_BASEAUTOCONVERT_LOCK (self);
+  gst_object_replace ((GstObject **) & self->current_subelement,
+      GST_OBJECT (element));
+  gst_object_replace ((GstObject **) & self->current_internal_srcpad,
+      GST_OBJECT (pads->src));
+  gst_object_replace ((GstObject **) & self->current_internal_sinkpad,
+      GST_OBJECT (pads->sink));
+  GST_BASEAUTOCONVERT_UNLOCK (self);
+
+  if (current_subelement) {
+    gst_element_set_locked_state (current_subelement, TRUE);
+    gst_element_set_state (current_subelement, GST_STATE_NULL);
+    gst_bin_remove (GST_BIN (self), current_subelement);
+  }
+
+  gst_pad_sticky_events_foreach (self->sinkpad, sticky_event_push, self);
+
+  gst_pad_push_event (self->sinkpad, gst_event_new_reconfigure ());
+
+  GST_INFO_OBJECT (self, "Selected element %s",
+      GST_OBJECT_NAME (GST_OBJECT (element)));
+
+done:
+  GST_DEBUG_OBJECT (element, "Activating element %s",
+      res ? "succeeded" : "failed");
+
+  gst_object_unref (element);
+  internal_pads_unref (pads);
+  gst_clear_object (&srcpad);
+  gst_clear_object (&sinkpad);
+  gst_clear_object (&current_subelement);
+
+  return res;
+
+error:
+  gst_element_set_locked_state (element, TRUE);
+  gst_element_set_state (element, GST_STATE_NULL);
+
+  if (GST_OBJECT_PARENT (element))
+    gst_bin_remove (GST_BIN (self), element);
+
+  res = FALSE;
+  goto done;
+}
+
+static GstIterator *
+gst_base_auto_convert_iterate_internal_links (GstPad * pad, GstObject * parent)
+{
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT (parent);
+  GstIterator *it = NULL;
+  GstPad *internal;
+
+  if (pad == self->sinkpad)
+    internal = gst_base_auto_convert_get_internal_srcpad (self);
+  else
+    internal = gst_base_auto_convert_get_internal_sinkpad (self);
+
+  if (internal) {
+    GValue val = { 0, };
+
+    g_value_init (&val, GST_TYPE_PAD);
+    g_value_take_object (&val, internal);
+
+    it = gst_iterator_new_single (GST_TYPE_PAD, &val);
+    g_value_unset (&val);
+  }
+
+  return it;
+}
+
+static GstAutoConvertFilterInfo *
+gst_auto_convert_get_filter_info (GstBaseAutoConvert * self,
+    GstElement * element)
+{
+  GList *tmp;
+
+  for (tmp = self->filters_info; tmp; tmp = tmp->next) {
+    GstAutoConvertFilterInfo *filter_info = tmp->data;
+
+    if (!g_strcmp0 (filter_info->name, GST_OBJECT_NAME (element)))
+      return filter_info;
+  }
+
+  return NULL;
+}
+
+/*
+ * If there is already an internal element, it will try to call set_caps on it
+ *
+ * If there isn't an internal element or if the set_caps() on the internal
+ * element failed, it will try to find another element where it would succeed
+ * and will change the internal element.
+ */
+
+static gboolean
+gst_base_auto_convert_sink_setcaps (GstBaseAutoConvert * self, GstCaps * caps,
+    gboolean check_downstream)
+{
+  GList *tmp;
+  GstCaps *other_caps = NULL;
+  GList *filters_info = NULL;
+  GstCaps *current_caps = NULL;
+  gboolean res = FALSE;
+  GstElement *current_subelement = NULL;
+
+  g_return_val_if_fail (self != NULL, FALSE);
+
+  if (!check_downstream) {
+    current_caps = gst_pad_get_current_caps (self->sinkpad);
+
+    if (current_caps && gst_caps_is_equal_fixed (caps, current_caps)) {
+      res = TRUE;
+      goto get_out;
+    }
+  }
+
+  if (check_downstream)
+    other_caps = gst_pad_peer_query_caps (self->srcpad, NULL);
+
+  current_subelement = gst_base_auto_convert_get_subelement (self);
+  GST_DEBUG_OBJECT (self,
+      "'%" GST_PTR_FORMAT "' Setting caps to: %" GST_PTR_FORMAT
+      " - other caps: %" GST_PTR_FORMAT, current_subelement, caps, other_caps);
+  if (current_subelement) {
+    if (gst_pad_peer_query_accept_caps (self->current_internal_srcpad, caps)) {
+      GstAutoConvertFilterInfo *filter_info =
+          gst_auto_convert_get_filter_info (self, current_subelement);
+
+      res = TRUE;
+      if (other_caps) {
+        GST_DEBUG_OBJECT (self,
+            "Checking if known bin %s can intersect with %" GST_PTR_FORMAT,
+            filter_info->name, other_caps);
+        if (!filter_info_can_intersect (self, filter_info, GST_PAD_SRC,
+                other_caps)) {
+          GST_LOG_OBJECT (self,
+              "filter_info %s does not accept src caps %" GST_PTR_FORMAT,
+              filter_info->name, other_caps);
+          res = FALSE;
+        }
+        GST_DEBUG_OBJECT (self, "Filter %s can intersect", filter_info->name);
+      }
+
+      if (res) {
+        /* If we can set the new caps on the current element,
+         * then we just get out
+         */
+        GST_DEBUG_OBJECT (self,
+            "Could set %s:%s to %" GST_PTR_FORMAT " reusing %s",
+            GST_DEBUG_PAD_NAME (self->current_internal_srcpad), caps,
+            filter_info->name);
+        goto get_out;
+      } else {
+        GST_DEBUG_OBJECT (self,
+            "Can't reuse currently configured subelement: %s",
+            filter_info->name);
+      }
+    }
+  }
+
+  if (!check_downstream)
+    other_caps = gst_pad_peer_query_caps (self->srcpad, NULL);
+  /* We already queried downstream caps otherwise */
+
+  filters_info = gst_base_auto_convert_get_or_load_filters_info (self);
+  for (tmp = filters_info; tmp; tmp = g_list_next (tmp)) {
+    GstAutoConvertFilterInfo *filter_info = tmp->data;
+    GstElement *element;
+
+    GST_DEBUG_OBJECT (self, "Trying %s (bin_desc=%s)", filter_info->name,
+        filter_info->bindesc);
+    /* Lets first check if according to the static pad templates on the known bin
+     * these caps have any chance of success
+     */
+    if (!filter_info_can_intersect (self, filter_info, GST_PAD_SINK, caps)) {
+      GST_DEBUG_OBJECT (self, "Known bin %s does not accept sink caps %"
+          GST_PTR_FORMAT, filter_info->name, caps);
+      continue;
+    }
+    if (other_caps != NULL) {
+      if (!filter_info_can_intersect (self, filter_info, GST_PAD_SRC,
+              other_caps)) {
+        GST_DEBUG_OBJECT (self,
+            "Known bin %s does not accept src caps %" GST_PTR_FORMAT,
+            filter_info->name, other_caps);
+        continue;
+      }
+      GST_DEBUG_OBJECT (self, "Filter %s can intersect", filter_info->name);
+    }
+
+    /* The element had a chance of success, lets make it */
+    GST_DEBUG_OBJECT (self, "Trying bin %s", filter_info->name);
+    element =
+        gst_base_auto_convert_get_or_make_element_from_filter_info (self,
+        filter_info);
+    if (!element)
+      continue;
+
+    /* And make it the current child */
+    if (gst_base_auto_convert_activate_element (self, element, caps)) {
+      res = TRUE;
+      break;
+    } else {
+      gst_object_unref (element);
+    }
+  }
+
+get_out:
+  gst_clear_object (&current_subelement);
+  gst_clear_caps (&other_caps);
+  gst_clear_caps (&current_caps);
+
+  if (!res) {
+    GST_WARNING_OBJECT (self,
+        "Could not find a matching element for caps: %" GST_PTR_FORMAT, caps);
+  }
+
+  return res;
+}
+
+/*
+ * This function filters the pad pad templates, taking only transform element
+ * (with one sink and one src pad)
+ */
+static gboolean
+gst_base_auto_convert_default_filter_func (GstPluginFeature * feature,
+    gpointer user_data)
+{
+  GstElementFactory *factory = NULL;
+  const GList *static_pad_templates, *tmp;
+  GstStaticPadTemplate *src = NULL, *sink = NULL;
+
+  if (!GST_IS_ELEMENT_FACTORY (feature))
+    return FALSE;
+
+  factory = GST_ELEMENT_FACTORY (feature);
+
+  static_pad_templates = gst_element_factory_get_static_pad_templates (factory);
+
+  for (tmp = static_pad_templates; tmp; tmp = g_list_next (tmp)) {
+    GstStaticPadTemplate *template = tmp->data;
+    GstCaps *caps;
+
+    if (template->presence == GST_PAD_SOMETIMES)
+      return FALSE;
+
+    if (template->presence != GST_PAD_ALWAYS)
+      continue;
+
+    switch (template->direction) {
+      case GST_PAD_SRC:
+        if (src)
+          return FALSE;
+        src = template;
+        break;
+      case GST_PAD_SINK:
+        if (sink)
+          return FALSE;
+        sink = template;
+        break;
+      default:
+        return FALSE;
+    }
+
+    caps = gst_static_pad_template_get_caps (template);
+
+    if (gst_caps_is_any (caps) || gst_caps_is_empty (caps))
+      return FALSE;
+  }
+
+  if (!src || !sink)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* function used to sort element features
+ * Copy-pasted from decodebin */
+static gint
+compare_ranks (GstPluginFeature * f1, GstPluginFeature * f2)
+{
+  gint diff;
+  const gchar *rname1, *rname2;
+
+  diff = gst_plugin_feature_get_rank (f2) - gst_plugin_feature_get_rank (f1);
+  if (diff != 0)
+    return diff;
+
+  rname1 = gst_plugin_feature_get_name (f1);
+  rname2 = gst_plugin_feature_get_name (f2);
+
+  diff = strcmp (rname2, rname1);
+
+  return diff;
+}
+
+static GList *
+gst_base_auto_convert_get_or_load_filters_info (GstBaseAutoConvert * self)
+{
+  GList *all_factories;
+
+  GST_OBJECT_LOCK (self);
+  if (self->filters_info) {
+    GST_OBJECT_UNLOCK (self);
+    goto done;
+  }
+
+  if (GST_BASE_AUTO_CONVERT_GET_CLASS (self)->registers_filters) {
+    GST_ERROR_OBJECT (self,
+        "Filters should have been registered but none found");
+
+    GST_ELEMENT_ERROR (self, CORE, MISSING_PLUGIN, ("No known filter found."),
+        (NULL));
+
+    goto done;
+  }
+
+  if (!self->factories) {
+    GST_OBJECT_UNLOCK (self);
+
+    all_factories =
+        g_list_sort (gst_registry_feature_filter (gst_registry_get (),
+            gst_base_auto_convert_default_filter_func, FALSE, NULL),
+        (GCompareFunc) compare_ranks);
+
+    GST_OBJECT_LOCK (self);
+    self->factories = all_factories;
+  }
+  GST_OBJECT_UNLOCK (self);
+
+  for (GList * tmp = self->factories; tmp; tmp = g_list_next (tmp)) {
+    GstElementFactory *factory = tmp->data;
+
+    gst_base_auto_convert_register_filter (self,
+        gst_object_get_name (GST_OBJECT (factory)),
+        gst_object_get_name (GST_OBJECT (factory)),
+        gst_plugin_feature_get_rank (GST_PLUGIN_FEATURE (factory))
+        );
+  }
+
+done:
+  return self->filters_info;
+}
+
+/* In this case, we should almost always have an internal element, because
+ * set_caps() should have been called first
+ */
+
+static GstFlowReturn
+gst_base_auto_convert_sink_chain (GstPad * pad, GstObject * parent,
+    GstBuffer * buffer)
+{
+  GstFlowReturn ret = GST_FLOW_NOT_NEGOTIATED;
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT (parent);
+
+  if (gst_pad_check_reconfigure (self->srcpad)) {
+    GstCaps *sinkcaps = gst_pad_get_current_caps (pad);
+
+    GST_INFO_OBJECT (parent, "Needs reconfigure.");
+    /* if we need to reconfigure we pretend new caps arrived. This
+     * will reconfigure the transform with the new output format. */
+    if (sinkcaps && !gst_base_auto_convert_sink_setcaps (self, sinkcaps, TRUE)) {
+      gst_clear_caps (&sinkcaps);
+      GST_ERROR_OBJECT (self, "Could not reconfigure.");
+
+      return GST_FLOW_NOT_NEGOTIATED;
+    }
+    gst_clear_caps (&sinkcaps);
+  }
+
+  if (self->current_internal_srcpad) {
+    ret = gst_pad_push (self->current_internal_srcpad, buffer);
+    if (ret != GST_FLOW_OK)
+      GST_DEBUG_OBJECT (self,
+          "Child element %" GST_PTR_FORMAT "returned flow %s",
+          self->current_subelement, gst_flow_get_name (ret));
+  } else {
+    GST_ERROR_OBJECT (self, "Got buffer without an negotiated element,"
+        " returning not-negotiated");
+    gst_buffer_unref (buffer);
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_base_auto_convert_sink_chain_list (GstPad * pad, GstObject * parent,
+    GstBufferList * list)
+{
+  GstFlowReturn ret = GST_FLOW_NOT_NEGOTIATED;
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT (parent);
+
+  if (self->current_internal_srcpad) {
+    ret = gst_pad_push_list (self->current_internal_srcpad, list);
+    if (ret != GST_FLOW_OK)
+      GST_DEBUG_OBJECT (self,
+          "Child element %" GST_PTR_FORMAT "returned flow %s",
+          self->current_subelement, gst_flow_get_name (ret));
+  } else {
+    GST_ERROR_OBJECT (self, "Got buffer without an negotiated element,"
+        " returning not-negotiated");
+    gst_buffer_list_unref (list);
+  }
+
+  return ret;
+}
+
+static gboolean
+gst_base_auto_convert_sink_event (GstPad * pad, GstObject * parent,
+    GstEvent * event)
+{
+  gboolean ret = TRUE;
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT (parent);
+  GstPad *internal_srcpad;
+
+  if (GST_EVENT_TYPE (event) == GST_EVENT_CAPS) {
+    GstCaps *caps;
+
+    gst_event_parse_caps (event, &caps);
+    ret = gst_base_auto_convert_sink_setcaps (self, caps, FALSE);
+    if (!ret) {
+      gst_event_unref (event);
+      return ret;
+    }
+  }
+
+  internal_srcpad = gst_base_auto_convert_get_internal_srcpad (self);
+  if (internal_srcpad) {
+    ret = gst_pad_push_event (internal_srcpad, event);
+    gst_object_unref (internal_srcpad);
+  } else {
+    switch (GST_EVENT_TYPE (event)) {
+      case GST_EVENT_FLUSH_STOP:
+      case GST_EVENT_FLUSH_START:
+        ret = gst_pad_push_event (self->srcpad, event);
+        break;
+      default:
+        gst_event_unref (event);
+        ret = TRUE;
+        break;
+    }
+  }
+
+  return ret;
+}
+
+/* TODO Properly test that this code works well for queries */
+static gboolean
+gst_base_auto_convert_sink_query (GstPad * pad, GstObject * parent,
+    GstQuery * query)
+{
+  gboolean ret = TRUE;
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT (parent);
+  GstElement *subelement;
+
+  if (GST_QUERY_TYPE (query) == GST_QUERY_CAPS) {
+    GstCaps *filter, *caps;
+
+    gst_query_parse_caps (query, &filter);
+    caps = gst_base_auto_convert_getcaps (self, filter, GST_PAD_SINK);
+    gst_query_set_caps_result (query, caps);
+    gst_caps_unref (caps);
+
+    return TRUE;
+  }
+
+  subelement = gst_base_auto_convert_get_subelement (self);
+  if (subelement) {
+    GstPad *sub_sinkpad = get_pad_by_direction (subelement, GST_PAD_SINK);
+
+    ret = gst_pad_query (sub_sinkpad, query);
+
+    gst_object_unref (sub_sinkpad);
+    gst_object_unref (subelement);
+
+    if (ret && GST_QUERY_TYPE (query) == GST_QUERY_ACCEPT_CAPS) {
+      gboolean res;
+      gst_query_parse_accept_caps_result (query, &res);
+
+      if (!res)
+        goto ignore_acceptcaps_failure;
+    }
+    return ret;
+  }
+
+ignore_acceptcaps_failure:
+
+  if (GST_QUERY_TYPE (query) == GST_QUERY_ACCEPT_CAPS) {
+    GstCaps *caps;
+    GstCaps *accept_caps;
+
+    gst_query_parse_accept_caps (query, &accept_caps);
+
+    caps = gst_base_auto_convert_getcaps (self, accept_caps, GST_PAD_SINK);
+    gst_query_set_accept_caps_result (query,
+        gst_caps_can_intersect (caps, accept_caps));
+    gst_caps_unref (caps);
+
+    return TRUE;
+  }
+
+  GST_WARNING_OBJECT (self, "Got query %s while no element was"
+      " selected, letting through",
+      gst_query_type_get_name (GST_QUERY_TYPE (query)));
+  return gst_pad_peer_query (self->srcpad, query);
+}
+
+/**
+ * gst_base_auto_convert_getcaps:
+ * @pad: the sink #GstPad
+ *
+ * This function returns the union of the caps of all the possible element
+ * factories, based on the static pad templates.
+ * It also checks does a getcaps on the downstream element and ignores all
+ * factories whose static caps can not satisfy it.
+ *
+ * It does not try to use each elements getcaps() function
+ */
+
+static GstCaps *
+gst_base_auto_convert_getcaps (GstBaseAutoConvert * self, GstCaps * filter,
+    GstPadDirection dir)
+{
+  GstCaps *caps = NULL, *other_caps = NULL;
+  GList *kb, *filters_info;
+
+  caps = gst_caps_new_empty ();
+
+  if (dir == GST_PAD_SINK)
+    other_caps = gst_pad_peer_query_caps (self->srcpad, NULL);
+  else
+    other_caps = gst_pad_peer_query_caps (self->sinkpad, NULL);
+
+  GST_DEBUG_OBJECT (self,
+      "Finding elements that can fit with src caps %" GST_PTR_FORMAT,
+      other_caps);
+
+  if (other_caps && gst_caps_is_empty (other_caps)) {
+    goto out;
+  }
+
+  filters_info = gst_base_auto_convert_get_or_load_filters_info (self);
+  for (kb = filters_info; kb; kb = g_list_next (kb)) {
+    GstAutoConvertFilterInfo *filter_info = kb->data;
+    GstElement *element = NULL;
+    GstCaps *element_caps;
+    InternalPads *pads;
+
+    if (filter) {
+      if (!filter_info_can_intersect (self, filter_info, dir, filter)) {
+        GST_LOG_OBJECT (self,
+            "Bin %s does not accept %s caps %" GST_PTR_FORMAT,
+            filter_info->name, dir == GST_PAD_SRC ? "src" : "sink", other_caps);
+        continue;
+      }
+    }
+
+    if (other_caps != NULL) {
+      if (!filter_info_can_intersect (self, filter_info,
+              dir == GST_PAD_SINK ? GST_PAD_SRC : GST_PAD_SINK, other_caps)) {
+        GST_LOG_OBJECT (self,
+            "%s does not accept %s caps %" GST_PTR_FORMAT,
+            filter_info->name,
+            dir == GST_PAD_SINK ? "src" : "sink", other_caps);
+        continue;
+      }
+
+      element =
+          gst_base_auto_convert_get_or_make_element_from_filter_info (self,
+          filter_info);
+      if (element == NULL)
+        continue;
+
+      pads = gst_base_auto_convert_get_element_internal_pads (self, element);
+      element_caps =
+          gst_pad_peer_query_caps ((dir ==
+              GST_PAD_SINK) ? pads->src : pads->sink, filter);
+      internal_pads_unref (pads);
+      if (element_caps)
+        caps = gst_caps_merge (caps, element_caps);
+
+      gst_object_unref (element);
+
+      /* Early out, any is absorbing */
+      if (gst_caps_is_any (caps))
+        goto out;
+    } else {
+      GstCaps *static_caps =
+          dir == GST_PAD_SRC ? filter_info->src_caps : filter_info->sink_caps;
+
+      if (static_caps) {
+        caps = gst_caps_merge (caps, static_caps);
+      }
+
+      /* Early out, any is absorbing */
+      if (gst_caps_is_any (caps))
+        goto out;
+    }
+  }
+
+
+out:
+  GST_DEBUG_OBJECT (self, "Returning unioned caps %" GST_PTR_FORMAT, caps);
+
+  if (other_caps)
+    gst_caps_unref (other_caps);
+
+  return caps;
+}
+
+
+
+static gboolean
+gst_base_auto_convert_src_event (GstPad * pad, GstObject * parent,
+    GstEvent * event)
+{
+  gboolean ret = TRUE;
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT (parent);
+  GstPad *internal_sinkpad;
+
+  if (GST_EVENT_TYPE (event) == GST_EVENT_RECONFIGURE)
+    gst_pad_push_event (self->sinkpad, gst_event_ref (event));
+
+  internal_sinkpad = gst_base_auto_convert_get_internal_sinkpad (self);
+  if (internal_sinkpad) {
+    ret = gst_pad_push_event (internal_sinkpad, event);
+    gst_object_unref (internal_sinkpad);
+  } else if (GST_EVENT_TYPE (event) != GST_EVENT_RECONFIGURE) {
+    GST_WARNING_OBJECT (self,
+        "Got upstream event while no element was selected, forwarding.");
+    ret = gst_pad_push_event (self->sinkpad, event);
+  } else
+    gst_event_unref (event);
+
+  return ret;
+}
+
+/* TODO Properly test that this code works well for queries */
+static gboolean
+gst_base_auto_convert_src_query (GstPad * pad, GstObject * parent,
+    GstQuery * query)
+{
+  gboolean ret = TRUE;
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT (parent);
+  GstElement *subelement;
+
+  if (GST_QUERY_TYPE (query) == GST_QUERY_CAPS) {
+    GstCaps *filter, *caps;
+
+    gst_query_parse_caps (query, &filter);
+    caps = gst_base_auto_convert_getcaps (self, filter, GST_PAD_SRC);
+    gst_query_set_caps_result (query, caps);
+    gst_caps_unref (caps);
+
+    return TRUE;
+  }
+
+  subelement = gst_base_auto_convert_get_subelement (self);
+  if (subelement) {
+    GstPad *sub_srcpad = get_pad_by_direction (subelement, GST_PAD_SRC);
+
+    ret = gst_pad_query (sub_srcpad, query);
+
+    gst_object_unref (sub_srcpad);
+    gst_object_unref (subelement);
+  } else {
+    GST_WARNING_OBJECT (self,
+        "Got upstream query of type %s while no element was selected,"
+        " forwarding.", gst_query_type_get_name (GST_QUERY_TYPE (query)));
+    ret = gst_pad_peer_query (self->sinkpad, query);
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_base_auto_convert_internal_sink_chain (GstPad * pad, GstObject * parent,
+    GstBuffer * buffer)
+{
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT_PAD (pad)->obj;
+
+  return gst_pad_push (self->srcpad, buffer);
+}
+
+static GstFlowReturn
+gst_base_auto_convert_internal_sink_chain_list (GstPad * pad,
+    GstObject * parent, GstBufferList * list)
+{
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT_PAD (pad)->obj;
+
+  return gst_pad_push_list (self->srcpad, list);
+}
+
+static gboolean
+gst_base_auto_convert_internal_sink_event (GstPad * pad, GstObject * parent,
+    GstEvent * event)
+{
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT_PAD (pad)->obj;
+  gboolean drop = FALSE;
+
+  GST_BASEAUTOCONVERT_LOCK (self);
+  if (self->current_internal_sinkpad != pad) {
+    drop = TRUE;
+  }
+  GST_BASEAUTOCONVERT_UNLOCK (self);
+
+  if (drop) {
+    gst_event_unref (event);
+    return TRUE;
+  }
+
+  return gst_pad_push_event (self->srcpad, event);
+}
+
+static gboolean
+gst_base_auto_convert_internal_sink_query (GstPad * pad, GstObject * parent,
+    GstQuery * query)
+{
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT_PAD (pad)->obj;
+
+  if (!gst_pad_peer_query (self->srcpad, query)) {
+    switch (GST_QUERY_TYPE (query)) {
+      case GST_QUERY_CAPS:
+      {
+        GstCaps *filter;
+
+        gst_query_parse_caps (query, &filter);
+        if (filter) {
+          gst_query_set_caps_result (query, filter);
+        } else {
+          filter = gst_caps_new_any ();
+          gst_query_set_caps_result (query, filter);
+          gst_caps_unref (filter);
+        }
+        return TRUE;
+      }
+      case GST_QUERY_ACCEPT_CAPS:
+        gst_query_set_accept_caps_result (query, TRUE);
+        return TRUE;
+      default:
+        return FALSE;
+    }
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_base_auto_convert_internal_src_event (GstPad * pad, GstObject * parent,
+    GstEvent * event)
+{
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT_PAD (pad)->obj;
+  gboolean drop = FALSE;
+
+  GST_BASEAUTOCONVERT_LOCK (self);
+  if (self->current_internal_srcpad != pad) {
+    drop = TRUE;
+  }
+  GST_BASEAUTOCONVERT_UNLOCK (self);
+
+  if (drop) {
+    GST_DEBUG_OBJECT (self, "Dropping event %" GST_PTR_FORMAT, event);
+    gst_event_unref (event);
+    return TRUE;
+  }
+
+  return gst_pad_push_event (self->sinkpad, event);
+}
+
+static gboolean
+gst_base_auto_convert_internal_src_query (GstPad * pad, GstObject * parent,
+    GstQuery * query)
+{
+  GstBaseAutoConvert *self = GST_BASE_AUTO_CONVERT_PAD (pad)->obj;
+
+  return gst_pad_peer_query (self->sinkpad, query);
+}
+
+
+void
+gst_base_auto_convert_reset_filters (GstBaseAutoConvert * self)
+{
+  GST_OBJECT_LOCK (self);
+  g_list_free_full (self->filters_info,
+      (GDestroyNotify) gst_auto_convert_filter_info_free);
+  self->filters_info = NULL;
+  GST_OBJECT_UNLOCK (self);
+}

gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/gstbaseautoconvert.h Added

@@ -0,0 +1,91 @@
+/* GStreamer
+ *
+ *  Copyright 2007 Collabora Ltd
+ *   @author: Olivier Crete <olivier.crete@collabora.co.uk>
+ *  Copyright 2007-2008 Nokia
+ *  Copyright 2023 Igalia S.L.
+ *   @author: Thibault Saunier <tsaunier@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+#define GST_TYPE_BASE_AUTO_CONVERT         (gst_base_auto_convert_get_type())
+#define GST_BASE_AUTO_CONVERT(obj)                (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_BASE_AUTO_CONVERT,GstBaseAutoConvert))
+#define GST_BASE_AUTO_CONVERT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_BASE_AUTO_CONVERT,GstBaseAutoConvertClass))
+#define GST_BASE_AUTO_CONVERT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_AUTO_CONCERT, GstBaseAutoConvertClass))
+#define GST_IS_BASE_AUTO_CONVERT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_BASE_AUTO_CONVERT))
+#define GST_IS_BASE_AUTO_CONVERT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_BASE_AUTO_CONVERT))
+typedef struct _GstBaseAutoConvert GstBaseAutoConvert;
+typedef struct _GstBaseAutoConvertClass GstBaseAutoConvertClass;
+
+struct _GstBaseAutoConvert
+{
+  /*< private >*/
+  GstBin bin;                   /* we extend GstBin */
+
+  GList *factories;
+  GList *filters_info;
+
+  GstPad *sinkpad;
+  GstPad *srcpad;
+
+  /* Have to be set all at once
+   * Protected by the object lock and the stream lock
+   * Both must be held to modify these
+   */
+  GstElement *current_subelement;
+  GstPad *current_internal_srcpad;
+  GstPad *current_internal_sinkpad;
+
+  GHashTable *elements;
+};
+
+/* This structure is used to allow handling random bin from their description
+   without needing to register a factory. The data it contains is pretty similar
+   but is specific for filters (1sinkpad and 1 srcpad).
+*/
+typedef struct
+{
+  /* Name of the filter, each instance of should have that name */
+  gchar *name;
+  gchar *bindesc;
+  GstRank rank;
+  GstCaps *sink_caps;
+  GstCaps *src_caps;
+  GstElement *subbin;
+} GstAutoConvertFilterInfo;
+
+struct _GstBaseAutoConvertClass
+{
+  GstBinClass parent_class;
+
+  gboolean registers_filters;
+};
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstBaseAutoConvert, gst_object_unref)
+GType gst_base_auto_convert_get_type (void);
+
+gboolean
+gst_base_auto_convert_register_filter(GstBaseAutoConvert *self, gchar *name,
+    gchar * bindesc, GstRank rank);
+void gst_base_auto_convert_reset_filters (GstBaseAutoConvert * self);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/gst/autoconvert/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst/autoconvert/plugin.c -> gst-plugins-bad-1.24.5.tar.xz/gst/autoconvert/plugin.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/bayer/gstbayer2rgb.c -> gst-plugins-bad-1.24.5.tar.xz/gst/bayer/gstbayer2rgb.c Changed

@@ -89,6 +89,8 @@
 #include "gstbayerelements.h"
 #include "gstbayerorc.h"
 
+#define DIV_ROUND_UP(s,v) (((s) + ((v)-1)) / (v))
+
 #define GST_CAT_DEFAULT gst_bayer2rgb_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
@@ -124,6 +126,8 @@
   int g_off;                    /* offset for green */
   int b_off;                    /* offset for blue */
   int format;
+  int bpp;                      /* bits per pixel, 8/10/12/14/16 */
+  int bigendian;
 };
 
 struct _GstBayer2RGBClass
@@ -131,10 +135,32 @@
   GstBaseTransformClass parent;
 };
 
+#define BAYER_CAPS_GEN(mask, bits, endian)	\
+	" "#mask#bits#endian
+
+#define BAYER_CAPS_ORD(bits, endian)		\
+	BAYER_CAPS_GEN(bggr, bits, endian)","	\
+	BAYER_CAPS_GEN(rggb, bits, endian)","	\
+	BAYER_CAPS_GEN(grbg, bits, endian)","	\
+	BAYER_CAPS_GEN(gbrg, bits, endian)
+
+#define BAYER_CAPS_BITS(bits)			\
+	BAYER_CAPS_ORD(bits, le)","		\
+	BAYER_CAPS_ORD(bits, be)
+
+#define BAYER_CAPS_ALL				\
+	BAYER_CAPS_ORD(,)"," 			\
+	BAYER_CAPS_BITS(10)","			\
+	BAYER_CAPS_BITS(12)","			\
+	BAYER_CAPS_BITS(14)","			\
+	BAYER_CAPS_BITS(16)
+
 #define	SRC_CAPS                                 \
-  GST_VIDEO_CAPS_MAKE ("{ RGBx, xRGB, BGRx, xBGR, RGBA, ARGB, BGRA, ABGR }")
+  GST_VIDEO_CAPS_MAKE ("{ RGBx, xRGB, BGRx, xBGR, RGBA, ARGB, BGRA, ABGR, " \
+  "RGBA64_LE, ARGB64_LE, BGRA64_LE, ABGR64_LE, " \
+  "RGBA64_BE, ARGB64_BE, BGRA64_BE, ABGR64_BE }")
 
-#define SINK_CAPS "video/x-bayer,format=(string){bggr,grbg,gbrg,rggb}," \
+#define SINK_CAPS "video/x-bayer,format=(string){" BAYER_CAPS_ALL " }, "\
   "width=(int)1,MAX,height=(int)1,MAX,framerate=(fraction)0/1,MAX"
 
 enum
@@ -206,7 +232,7 @@
 gst_bayer2rgb_init (GstBayer2RGB * filter)
 {
   gst_bayer2rgb_reset (filter);
-  gst_base_transform_set_in_place (GST_BASE_TRANSFORM (filter), TRUE);
+  gst_base_transform_set_in_place (GST_BASE_TRANSFORM (filter), FALSE);
 }
 
 /* No properties are implemented, so only a warning is produced */
@@ -252,23 +278,47 @@
   gst_structure_get_int (structure, "height", &bayer2rgb->height);
 
   format = gst_structure_get_string (structure, "format");
-  if (g_str_equal (format, "bggr")) {
+  if (g_str_has_prefix (format, "bggr")) {
     bayer2rgb->format = GST_BAYER_2_RGB_FORMAT_BGGR;
-  } else if (g_str_equal (format, "gbrg")) {
+  } else if (g_str_has_prefix (format, "gbrg")) {
     bayer2rgb->format = GST_BAYER_2_RGB_FORMAT_GBRG;
-  } else if (g_str_equal (format, "grbg")) {
+  } else if (g_str_has_prefix (format, "grbg")) {
     bayer2rgb->format = GST_BAYER_2_RGB_FORMAT_GRBG;
-  } else if (g_str_equal (format, "rggb")) {
+  } else if (g_str_has_prefix (format, "rggb")) {
     bayer2rgb->format = GST_BAYER_2_RGB_FORMAT_RGGB;
   } else {
     return FALSE;
   }
 
+  if (strlen (format) == 4) {   /* 8bit bayer */
+    bayer2rgb->bpp = 8;
+  } else if (strlen (format) == 8) {    /* 10/12/14/16 le/be bayer */
+    bayer2rgb->bpp = (gint) g_ascii_strtoull (format + 4, NULL, 10);
+    if (bayer2rgb->bpp & 1)     /* odd bayer2rgb->bpp bayer formats not supported */
+      return FALSE;
+    if (bayer2rgb->bpp < 10 || bayer2rgb->bpp > 16)     /* bayer 10,12,14,16 only */
+      return FALSE;
+
+    if (g_str_has_suffix (format, "le"))
+      bayer2rgb->bigendian = 0;
+    else if (g_str_has_suffix (format, "be"))
+      bayer2rgb->bigendian = 1;
+    else
+      return FALSE;
+  } else
+    return FALSE;
+
   /* To cater for different RGB formats, we need to set params for later */
   gst_video_info_from_caps (&info, outcaps);
-  bayer2rgb->r_off = GST_VIDEO_INFO_COMP_OFFSET (&info, 0);
-  bayer2rgb->g_off = GST_VIDEO_INFO_COMP_OFFSET (&info, 1);
-  bayer2rgb->b_off = GST_VIDEO_INFO_COMP_OFFSET (&info, 2);
+  bayer2rgb->r_off =
+      GST_VIDEO_INFO_COMP_OFFSET (&info,
+      0) / DIV_ROUND_UP (GST_VIDEO_INFO_COMP_DEPTH (&info, 0), 8);
+  bayer2rgb->g_off =
+      GST_VIDEO_INFO_COMP_OFFSET (&info,
+      1) / DIV_ROUND_UP (GST_VIDEO_INFO_COMP_DEPTH (&info, 1), 8);
+  bayer2rgb->b_off =
+      GST_VIDEO_INFO_COMP_OFFSET (&info,
+      2) / DIV_ROUND_UP (GST_VIDEO_INFO_COMP_DEPTH (&info, 2), 8);
 
   bayer2rgb->info = info;
 
@@ -283,6 +333,8 @@
   filter->r_off = 0;
   filter->g_off = 0;
   filter->b_off = 0;
+  filter->bpp = 8;
+  filter->bigendian = 0;
   gst_video_info_init (&filter->info);
 }
 
@@ -326,22 +378,25 @@
     gsize * size)
 {
   GstStructure *structure;
+  GstBayer2RGB *bayer2rgb;
   int width;
   int height;
   const char *name;
 
   structure = gst_caps_get_structure (caps, 0);
+  bayer2rgb = GST_BAYER2RGB (base);
 
   if (gst_structure_get_int (structure, "width", &width) &&
       gst_structure_get_int (structure, "height", &height)) {
     name = gst_structure_get_name (structure);
     /* Our name must be either video/x-bayer video/x-raw */
     if (strcmp (name, "video/x-raw")) {
-      *size = GST_ROUND_UP_4 (width) * height;
+      *size =
+          GST_ROUND_UP_4 (width) * height * DIV_ROUND_UP (bayer2rgb->bpp, 8);
       return TRUE;
     } else {
-      /* For output, calculate according to format (always 32 bits) */
-      *size = width * height * 4;
+      /* For output, calculate according to format */
+      *size = width * height * DIV_ROUND_UP (bayer2rgb->bpp, 8);
       return TRUE;
     }
 
@@ -352,11 +407,64 @@
 }
 
 static void
-gst_bayer2rgb_split_and_upsample_horiz (guint8 * dest0, guint8 * dest1,
-    const guint8 * src, int n)
+gst_bayer2rgb8_split_and_upsample_horiz (guint8 * dest0, guint8 * dest1,
+    const guint8 * src, GstBayer2RGB * bayer2rgb)
 {
+  int n = bayer2rgb->width;
   int i;
 
+  /*
+   * Pre-process line of source data in 'src' into two neighboring
+   * lines of temporary data 'dest0' and 'dest1' as follows. Note
+   * that first two pixels of both 'dest0' and 'dest1' are special,
+   * and so are the last two pixels of both 'dest0' and 'dest1' .
+   *
+   * The gist of this transformation is this:
+   * - Assume the source data contain this BG bayer pattern on input
+   *   data line 0 (this is the same as src0, 1, 2, 3, 4, 5 ...):
+   *   src 0 : B0     G0          B1          G1          B2          G2
+   * - This gets transformed into two lines:
+   *   line 0: B0 avg(B0, B1)     B1      avg(B1, B2)     B2      avg(B2, B3)...
+   *   line 1: G0     G0      avg(G0, G1)     G1      avg(G1, G2)     G2...
+   * - Notice  ^^     ^^      ^^^^^^^^^^^     ^^      ^^^^^^^^^^^
+   *   These are interpolated BG pairs, one for each input bayer pixel.
+   *
+   * The immediatelly following call to this function operates on the next
+   * input data line 1 as follows:
+   * - Assume the source data contain this GR bayer pattern on line 1:
+   *   src 0 : G0     R0          G1          R1          G2          R2
+   * - This gets transformed into two lines:
+   *   line 2: G0 avg(G0, G1)     G1      avg(G1, G2)     G2      avg(G2, G3)...
+   *   line 3: R0     R0      avg(R0, R1)     R1      avg(R1, R2)     R2...
+   * - Notice  ^^     ^^      ^^^^^^^^^^^     ^^      ^^^^^^^^^^^
+   *   These are interpolated GR pairs, one for each input bayer pixel.
+   *
+   * First two pixels are special, two more pixels as an example of the rest:
+   *       ||   0    |       1        ||       2        |       3        ::
+   * ------||--------+----------------++----------------+----------------+:
+   * DEST0 || src0 | avg(src0, 2) ||     src2     | avg(src2, 4) ::
+   * ------||--------+----------------++----------------+----------------+:
+   * DEST1 || src1 |     src1     || avg(src1, 3) |     src3     ::
+   * ------||--------+----------------++----------------+----------------+:
+   *
+   * Inner block of pixels:
+   * :       |         n          |        n+1       :
+   * :-------+--------------------+------------------:
+   * : DEST0 |       srcn       | avg(srcn, n+2) :
+   * :-------+--------------------+------------------:
+   * : DEST1 | avg(srcn-1, n+1) |     srcn+1     :
+   * :-------+--------------------+------------------:
+   *
+   * Last two pixels:
+   *           w is EVEN                          w is ODD
+   * :       |    w-2   |    w-1   ||   :       |    w-2   |    w-1   ||
+   * :-------+----------+----------||   :-------+----------+----------||
+   * : DEST0 | srcw-2 | srcw-2 ||   : DEST0 | srcw-3 | srcw-1 ||
+   * :-------+----------+----------||   :-------+----------+----------||
+   * : DEST1 | srcw-3 | srcw-1 ||   : DEST1 | srcw-2 | srcw-2 ||
+   * :-------+----------+----------||   :-------+----------+----------||
+   */
+
   dest00 = src0;
   dest10 = src1;
   dest01 = (src0 + src2 + 1) >> 1;
@@ -380,19 +488,99 @@
   }
 }
 
+static guint16
+gswab16 (guint16 val, guint8 swap)
+{
+  if (swap) {
+    return GUINT16_FROM_BE (val);
+  } else {
+    return val;
+  }
+}
+
+static void
+gst_bayer2rgb16_split_and_upsample_horiz (guint16 * dest0, guint16 * dest1,
+    const guint16 * src, GstBayer2RGB * bayer2rgb)
+{
+  int swap = bayer2rgb->bigendian;
+  int n = bayer2rgb->width;
+  int i;
+
+  dest00 = gswab16 (src0, swap);
+  dest10 = gswab16 (src1, swap);
+  dest01 = (gswab16 (src0, swap) + gswab16 (src2, swap) + 1) >> 1;
+  dest11 = gswab16 (src1, swap);
+
+  if (swap) {
+    bayer16_orc_horiz_upsample_be (dest0 + 2, dest1 + 2, src + 1, (n - 4) >> 1);
+  } else {
+    bayer16_orc_horiz_upsample_le (dest0 + 2, dest1 + 2, src + 1, (n - 4) >> 1);
+  }
+
+  for (i = n - 2; i < n; i++) {
+    if ((i & 1) == 0) {
+      dest0i = gswab16 (srci, swap);
+      dest1i = gswab16 (srci - 1, swap);
+    } else {
+      dest0i = gswab16 (srci - 1, swap);
+      dest1i = gswab16 (srci, swap);
+    }
+  }
+}
+
+static void
+gst_bayer2rgb_split_and_upsample_horiz (guint8 * dest0, guint8 * dest1,
+    const guint8 * src, GstBayer2RGB * bayer2rgb)
+{
+  if (bayer2rgb->bpp == 8) {
+    gst_bayer2rgb8_split_and_upsample_horiz (dest0, dest1, src, bayer2rgb);
+  } else {
+    gst_bayer2rgb16_split_and_upsample_horiz ((guint16 *) dest0,
+        (guint16 *) dest1, (const guint16 *) src, bayer2rgb);
+  }
+}
+
 typedef void (*process_func) (guint8 * d0, const guint8 * s0, const guint8 * s1,
     const guint8 * s2, const guint8 * s3, const guint8 * s4, const guint8 * s5,
     int n);
 
+typedef void (*process_func16) (guint16 * d0, guint16 * d1, const guint8 * s0,
+    const guint8 * s1, const guint8 * s2, const guint8 * s3, const guint8 * s4,
+    const guint8 * s5, int n);
+
+#define LINE(t, x, b) ((t) + (((x) & 7) * ((b)->width * DIV_ROUND_UP((b)->bpp, 8))))
+
 static void
 gst_bayer2rgb_process (GstBayer2RGB * bayer2rgb, uint8_t * dest,
-    int dest_stride, uint8_t * src, int src_stride)
+    int dest_stride, uint8_t * src)
 {
+  const int src_stride =
+      GST_ROUND_UP_4 (bayer2rgb->width) * DIV_ROUND_UP (bayer2rgb->bpp, 8);
+  const int bayersrc16 = bayer2rgb->bpp > 8;
   int j;
   guint8 *tmp;
+  guint32 *dtmp;
   process_func merge2 = { NULL, NULL };
+  process_func16 merge162 = { NULL, NULL };
   int r_off, g_off, b_off;
 
+  /*
+   * Handle emission of either RGBA64 or RGBA (32bpp) . The default is
+   * emission of RGBA64 in case the input bayer data are >8 bit, since
+   * there is no loss of precision that way.
+   *
+   * The emission of RGBA (32bpp) as done here is done by shifting the
+   * debayered data by the bpp-8 bits right, to fit into the 8 bits per
+   * channel output buffer. This retains precision during calculation,
+   * and the calculation is a bit more expensive in terms of CPU cycles
+   * and memory. An alternative approach would be to downgrade the input
+   * bayer data in gst_bayer2rgb16_split_and_upsample_horiz() already,
+   * and then perform this second part of debayering as if those input
+   * data were 8bpp bayer data. This would increase speed, but decrease
+   * precision.
+   */
+  const int bayerdst16 = (dest_stride / bayer2rgb->width / 4) == 2;
+
   /* We exploit some symmetry in the functions here.  The base functions
    * are all named for the BGGR arrangement.  For RGGB, we swap the
    * red offset and blue offset in the output.  For GRBG, we swap the
@@ -409,44 +597,161 @@
   if (r_off == 2 && g_off == 1 && b_off == 0) {
     merge0 = bayer_orc_merge_bg_bgra;
     merge1 = bayer_orc_merge_gr_bgra;
+    merge160 = bayer16_orc_merge_bg_bgra;
+    merge161 = bayer16_orc_merge_gr_bgra;
   } else if (r_off == 3 && g_off == 2 && b_off == 1) {
     merge0 = bayer_orc_merge_bg_abgr;
     merge1 = bayer_orc_merge_gr_abgr;
+    merge160 = bayer16_orc_merge_bg_abgr;
+    merge161 = bayer16_orc_merge_gr_abgr;
   } else if (r_off == 1 && g_off == 2 && b_off == 3) {
     merge0 = bayer_orc_merge_bg_argb;
     merge1 = bayer_orc_merge_gr_argb;
+    merge160 = bayer16_orc_merge_bg_argb;
+    merge161 = bayer16_orc_merge_gr_argb;
   } else if (r_off == 0 && g_off == 1 && b_off == 2) {
     merge0 = bayer_orc_merge_bg_rgba;
     merge1 = bayer_orc_merge_gr_rgba;
+    merge160 = bayer16_orc_merge_bg_rgba;
+    merge161 = bayer16_orc_merge_gr_rgba;
   }
   if (bayer2rgb->format == GST_BAYER_2_RGB_FORMAT_GRBG ||
       bayer2rgb->format == GST_BAYER_2_RGB_FORMAT_GBRG) {
     process_func tmp = merge0;
     merge0 = merge1;
     merge1 = tmp;
+    process_func16 tmp16 = merge160;
+    merge160 = merge161;
+    merge161 = tmp16;
   }
 
-  tmp = g_malloc (2 * 4 * bayer2rgb->width);
-#define LINE(x) (tmp + ((x)&7) * bayer2rgb->width)
+  tmp = g_malloc (DIV_ROUND_UP (bayer2rgb->bpp, 8) * 2 * 4 * bayer2rgb->width);
+
+  if (bayersrc16 || bayerdst16)
+    dtmp = g_malloc (sizeof (*dtmp) * 2 * bayer2rgb->width);
+
+  /* Pre-process source line 1 into bottom two lines 6 and 7 as PREVIOUS line */
+  gst_bayer2rgb_split_and_upsample_horiz (      /* src line 1 */
+      LINE (tmp, 3 * 2 + 0, bayer2rgb), /* tmp buffer line 6 */
+      LINE (tmp, 3 * 2 + 1, bayer2rgb), /* tmp buffer line 7 */
+      src + 1 * src_stride, bayer2rgb);
 
-  gst_bayer2rgb_split_and_upsample_horiz (LINE (3 * 2 + 0), LINE (3 * 2 + 1),
-      src + 1 * src_stride, bayer2rgb->width);
-  j = 0;
-  gst_bayer2rgb_split_and_upsample_horiz (LINE (j * 2 + 0), LINE (j * 2 + 1),
-      src + j * src_stride, bayer2rgb->width);
+  /* Pre-process source line 0 into top two lines 0 and 1 as CURRENT line */
+  gst_bayer2rgb_split_and_upsample_horiz (      /* src line 0 */
+      LINE (tmp, 0 * 2 + 0, bayer2rgb), /* tmp buffer line 0 */
+      LINE (tmp, 0 * 2 + 1, bayer2rgb), /* tmp buffer line 1 */
+      src + 0 * src_stride, bayer2rgb);
 
   for (j = 0; j < bayer2rgb->height; j++) {
     if (j < bayer2rgb->height - 1) {
-      gst_bayer2rgb_split_and_upsample_horiz (LINE ((j + 1) * 2 + 0),
-          LINE ((j + 1) * 2 + 1), src + (j + 1) * src_stride, bayer2rgb->width);
+      /*
+       * Pre-process NEXT source line (j + 1) into two consecutive lines
+       * (2 * (j + 1) + 0) % 8
+       * and
+       * (2 * (j + 1) + 1) % 8
+       *
+       * This cycle here starts with j=0, and therefore
+       * - reads source line 1
+       * - writes tmp buffer lines 2,3
+       * The cycle continues with source line 2 and tmp buffer lines 4,5 etc.
+       */
+      gst_bayer2rgb_split_and_upsample_horiz (  /* src line (j + 1) */
+          LINE (tmp, (j + 1) * 2 + 0, bayer2rgb),       /* tmp buffer line 2/4/6/0 */
+          LINE (tmp, (j + 1) * 2 + 1, bayer2rgb),       /* tmp buffer line 3/5/7/1 */
+          src + (j + 1) * src_stride, bayer2rgb);
     }
 
-    mergej & 1 (dest + j * dest_stride,
-        LINE (j * 2 - 2), LINE (j * 2 - 1),
-        LINE (j * 2 + 0), LINE (j * 2 + 1),
-        LINE (j * 2 + 2), LINE (j * 2 + 3), bayer2rgb->width >> 1);
+    /*
+     * Use the pre-processed tmp buffer lines and construct resulting frame.
+     * Assume j=0, the tmp buffer content looks as follows:
+     *   line 0: B0 avg(B0, B1)     B1      avg(B1, B2)     B2      avg(B2, B3)...
+     *   line 1: G0     G0      avg(G0, G1)     G1      avg(G1, G2)     G2...
+     *   line 2: G0 avg(G0, G1)     G1      avg(G1, G2)     G2      avg(G2, G3)...
+     *   line 3: R0     R0      avg(R0, R1)     R1      avg(R1, R2)     R2...
+     *   line 4: empty
+     *   line 5: empty
+     *   line 6: G0 avg(G0, G1)     G1      avg(G1, G2)     G2      avg(G2, G3)...
+     *   line 7: R0     R0      avg(R0, R1)     R1      avg(R1, R2)     R2...
+     * Line 0,1 and 6,7 were populated in pre-process step outside of this loop.
+     * Line 2,3 was populated just above this comment.
+     * The code is currently processing source line 0 (not tmp buffer line 0)
+     * and uses the following tmp buffer lines in the process as inputs to the
+     * merge function:
+     * - tmp buffer line -2 => tmp buffer line 6 => orc g0 values
+     * - tmp buffer line -1 => tmp buffer line 7 => orc r0 values
+     * - tmp buffer line +0 => tmp buffer line 0 => orc b1 values
+     * - tmp buffer line +1 => tmp buffer line 1 => orc g1 values
+     * - tmp buffer line +2 => tmp buffer line 2 => orc g2 values
+     * - tmp buffer line +3 => tmp buffer line 3 => orc r2 values
+     * With j=0, the merge function used is one of bayer_orc_merge_bg_*
+     *
+     * A good material regarding the ORC functions below is
+     * https://www.siliconimaging.com/RGB%20Bayer.htm
+     * chapter
+     * "Interpolating the green component"
+     *
+     * The bayer_orc_merge_bg_* performs BG interpolation.
+     *   # average R from PREVIOUS line and NEXT line
+     *   r =  avg(r00, r20) , avg(r01, r21) 
+     *   # average G from PREVIOUS line and NEXT line
+     *   g =  avg(g00, g20) , avg(g01, g21) 
+     *   # copy CURRENT line G into variable t
+     *   t =  g10             , g11             
+     *   # average G from PREVIOUS, CURRENT, NEXT line
+     *   g =  avg(g0, g10)  , avg(g1, g11)  
+     *   # reorder the content of g and t variables using bit operations
+     *   # (the "g first, t second" order is here because the B pixel we
+     *   #  are now processing does not have its own G value, it only has
+     *   #  G value extrapolated from surrouding G pixels. The following
+     *   #  G pixel has its own G value, so we use it as-is, without any
+     *   #  extrapolation)
+     *   g =  g, 0 
+     *   t =  0, t 
+     *   g =  g, t 
+     *   # generate resulting (e.g. BGRx) data
+     *   bg =  b10 , g   , b11 , t   
+     *   ra =  r0  , 255 , r1  , 255 
+     *   d  =  b10 , g   , r0  , 255 , b11 , t , r1 , 255  
+     *
+     * In the next cycle, j=1, line 4,5 would be populated with BG values
+     * calculated from source line 2, merge function would use tmp buffer
+     * inputs from lines 0,1,2,3,4,5 i.e. b0,g0,g1,r1,b2,g2 and the merge
+     * function would be bayer_orc_merge_gr_* .
+     */
+    if (bayersrc16) {
+      merge16j & 1 ((guint16 *) dtmp, /* temporary buffer BG */
+          (guint16 *) (dtmp + bayer2rgb->width),        /* temporary buffer GR */
+          LINE (tmp, j * 2 - 2, bayer2rgb),     /* PREVIOUS: even: BG g0 , odd: GR b0 */
+          LINE (tmp, j * 2 - 1, bayer2rgb),     /* PREVIOUS: even: BG r0 , odd: GR g0 */
+          LINE (tmp, j * 2 + 0, bayer2rgb),     /* CURRENT: even: BG b1 , odd: GR g1 */
+          LINE (tmp, j * 2 + 1, bayer2rgb),     /* CURRENT: even: BG g1 , odd: GR r1 */
+          LINE (tmp, j * 2 + 2, bayer2rgb),     /* NEXT: even: BG g2 , odd: GR b2 */
+          LINE (tmp, j * 2 + 3, bayer2rgb),     /* NEXT: even: BG r2 , odd: GR g2 */
+          bayer2rgb->width >> 1);
+
+      if (bayerdst16)
+        bayer16to16_orc_reorder (dest + j * dest_stride,
+            dtmp, dtmp + bayer2rgb->width, bayer2rgb->bpp, bayer2rgb->width);
+      else
+        bayer16to8_orc_reorder (dest + j * dest_stride,
+            dtmp, dtmp + bayer2rgb->width, bayer2rgb->bpp - 8,
+            bayer2rgb->width);
+    } else {
+      mergej & 1 (bayerdst16 ? (guint8 *) dtmp : (dest + j * dest_stride),    /* output line j */
+          LINE (tmp, j * 2 - 2, bayer2rgb),     /* PREVIOUS: even: BG g0 , odd: GR b0 */
+          LINE (tmp, j * 2 - 1, bayer2rgb),     /* PREVIOUS: even: BG r0 , odd: GR g0 */
+          LINE (tmp, j * 2 + 0, bayer2rgb),     /* CURRENT: even: BG b1 , odd: GR g1 */
+          LINE (tmp, j * 2 + 1, bayer2rgb),     /* CURRENT: even: BG g1 , odd: GR r1 */
+          LINE (tmp, j * 2 + 2, bayer2rgb),     /* NEXT: even: BG g2 , odd: GR b2 */
+          LINE (tmp, j * 2 + 3, bayer2rgb),     /* NEXT: even: BG r2 , odd: GR g2 */
+          bayer2rgb->width >> 1);
+      if (bayerdst16)
+        bayer8to16_orc_reorder (dest + j * dest_stride, dtmp, bayer2rgb->width);
+    }
   }
 
+  if (bayersrc16)
+    g_free (dtmp);
   g_free (tmp);
 }
 
@@ -473,8 +778,7 @@
   }
 
   output = GST_VIDEO_FRAME_PLANE_DATA (&frame, 0);
-  gst_bayer2rgb_process (filter, output, frame.info.stride0,
-      map.data, GST_ROUND_UP_4 (filter->width));
+  gst_bayer2rgb_process (filter, output, frame.info.stride0, map.data);
 
   gst_video_frame_unmap (&frame);
   gst_buffer_unmap (inbuf, &map);

gst-plugins-bad-1.22.7.tar.xz/gst/bayer/gstbayerorc-dist.c -> gst-plugins-bad-1.24.5.tar.xz/gst/bayer/gstbayerorc-dist.c Changed

@@ -131,6 +131,58 @@
     const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
     const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
     const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
+void bayer16_orc_horiz_upsample_le (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint16 * ORC_RESTRICT s1, int n);
+void bayer16_orc_horiz_upsample_be (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint16 * ORC_RESTRICT s1, int n);
+void bayer16_orc_merge_bg_bgra (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+    const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+    const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+    const guint8 * ORC_RESTRICT s6, int n);
+void bayer16_orc_merge_gr_bgra (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+    const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+    const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+    const guint8 * ORC_RESTRICT s6, int n);
+void bayer16_orc_merge_bg_abgr (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+    const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+    const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+    const guint8 * ORC_RESTRICT s6, int n);
+void bayer16_orc_merge_gr_abgr (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+    const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+    const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+    const guint8 * ORC_RESTRICT s6, int n);
+void bayer16_orc_merge_bg_rgba (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+    const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+    const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+    const guint8 * ORC_RESTRICT s6, int n);
+void bayer16_orc_merge_gr_rgba (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+    const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+    const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+    const guint8 * ORC_RESTRICT s6, int n);
+void bayer16_orc_merge_bg_argb (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+    const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+    const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+    const guint8 * ORC_RESTRICT s6, int n);
+void bayer16_orc_merge_gr_argb (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+    const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+    const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+    const guint8 * ORC_RESTRICT s6, int n);
+void bayer16to16_orc_reorder (guint8 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, const guint32 * ORC_RESTRICT s2, int p1,
+    int n);
+void bayer16to8_orc_reorder (guint8 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, const guint32 * ORC_RESTRICT s2, int p1,
+    int n);
+void bayer8to16_orc_reorder (guint8 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, int n);
 
 
 /* begin Orc C target preamble */
@@ -3607,5 +3659,3886 @@
 
   func = c->exec;
   func (ex);
+}
+#endif
+
+
+/* bayer16_orc_horiz_upsample_le */
+#ifdef DISABLE_ORC
+void
+bayer16_orc_horiz_upsample_le (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint16 * ORC_RESTRICT s1, int n)
+{
+  int i;
+  orc_union32 *ORC_RESTRICT ptr0;
+  orc_union32 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+  orc_union16 var40;
+  orc_union16 var41;
+  orc_union32 var42;
+  orc_union16 var43;
+  orc_union16 var44;
+  orc_union16 var45;
+  orc_union16 var46;
+
+  ptr0 = (orc_union32 *) d1;
+  ptr1 = (orc_union32 *) d2;
+  ptr4 = (orc_union32 *) s1;
+
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var37 = ptr4i;
+    /* 1: splitlw */
+    {
+      orc_union32 _src;
+      _src.i = var37.i;
+      var40.i = _src.x21;
+      var41.i = _src.x20;
+    }
+    /* 2: loadoffl */
+    var42 = ptr4i + 1;
+    /* 3: splitlw */
+    {
+      orc_union32 _src;
+      _src.i = var42.i;
+      var43.i = _src.x21;
+      var44.i = _src.x20;
+    }
+    /* 4: avguw */
+    var45.i = ((orc_uint16) var40.i + (orc_uint16) var43.i + 1) >> 1;
+    /* 5: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var40.i;
+      _dest.x21 = var45.i;
+      var38.i = _dest.i;
+    }
+    /* 6: storel */
+    ptr0i = var38;
+    /* 7: avguw */
+    var46.i = ((orc_uint16) var41.i + (orc_uint16) var44.i + 1) >> 1;
+    /* 8: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.i;
+      _dest.x21 = var44.i;
+      var39.i = _dest.i;
+    }
+    /* 9: storel */
+    ptr1i = var39;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16_orc_horiz_upsample_le (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union32 *ORC_RESTRICT ptr0;
+  orc_union32 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+  orc_union16 var40;
+  orc_union16 var41;
+  orc_union32 var42;
+  orc_union16 var43;
+  orc_union16 var44;
+  orc_union16 var45;
+  orc_union16 var46;
+
+  ptr0 = (orc_union32 *) ex->arrays0;
+  ptr1 = (orc_union32 *) ex->arrays1;
+  ptr4 = (orc_union32 *) ex->arrays4;
+
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var37 = ptr4i;
+    /* 1: splitlw */
+    {
+      orc_union32 _src;
+      _src.i = var37.i;
+      var40.i = _src.x21;
+      var41.i = _src.x20;
+    }
+    /* 2: loadoffl */
+    var42 = ptr4i + 1;
+    /* 3: splitlw */
+    {
+      orc_union32 _src;
+      _src.i = var42.i;
+      var43.i = _src.x21;
+      var44.i = _src.x20;
+    }
+    /* 4: avguw */
+    var45.i = ((orc_uint16) var40.i + (orc_uint16) var43.i + 1) >> 1;
+    /* 5: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var40.i;
+      _dest.x21 = var45.i;
+      var38.i = _dest.i;
+    }
+    /* 6: storel */
+    ptr0i = var38;
+    /* 7: avguw */
+    var46.i = ((orc_uint16) var41.i + (orc_uint16) var44.i + 1) >> 1;
+    /* 8: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.i;
+      _dest.x21 = var44.i;
+      var39.i = _dest.i;
+    }
+    /* 9: storel */
+    ptr1i = var39;
+  }
+
+}
+
+void
+bayer16_orc_horiz_upsample_le (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint16 * ORC_RESTRICT s1, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 29, 98, 97, 121, 101, 114, 49, 54, 95, 111, 114, 99, 95, 104,
+        111, 114, 105, 122, 95, 117, 112, 115, 97, 109, 112, 108, 101, 95, 108,
+        101,
+        11, 4, 4, 11, 4, 4, 12, 4, 4, 14, 4, 1, 0, 0, 0, 20,
+        4, 20, 2, 20, 2, 20, 2, 20, 2, 198, 34, 33, 4, 114, 32, 4,
+        16, 198, 36, 35, 32, 76, 36, 34, 36, 195, 0, 34, 36, 76, 33, 33,
+        35, 195, 1, 33, 35, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p,
+          _backup_bayer16_orc_horiz_upsample_le);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16_orc_horiz_upsample_le");
+      orc_program_set_backup_function (p,
+          _backup_bayer16_orc_horiz_upsample_le);
+      orc_program_add_destination (p, 4, "d1");
+      orc_program_add_destination (p, 4, "d2");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_constant (p, 4, 0x00000001, "c1");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 2, "t2");
+      orc_program_add_temporary (p, 2, "t3");
+      orc_program_add_temporary (p, 2, "t4");
+      orc_program_add_temporary (p, 2, "t5");
+
+      orc_program_append_2 (p, "splitlw", 0, ORC_VAR_T3, ORC_VAR_T2, ORC_VAR_S1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "loadoffl", 0, ORC_VAR_T1, ORC_VAR_S1,
+          ORC_VAR_C1, ORC_VAR_D1);
+      orc_program_append_2 (p, "splitlw", 0, ORC_VAR_T5, ORC_VAR_T4, ORC_VAR_T1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 0, ORC_VAR_T5, ORC_VAR_T3, ORC_VAR_T5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 0, ORC_VAR_D1, ORC_VAR_T3, ORC_VAR_T5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T4,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 0, ORC_VAR_D2, ORC_VAR_T2, ORC_VAR_T4,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_D2 = d2;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer16_orc_horiz_upsample_be */
+#ifdef DISABLE_ORC
+void
+bayer16_orc_horiz_upsample_be (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint16 * ORC_RESTRICT s1, int n)
+{
+  int i;
+  orc_union32 *ORC_RESTRICT ptr0;
+  orc_union32 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+  orc_union16 var40;
+  orc_union16 var41;
+  orc_union16 var42;
+  orc_union16 var43;
+  orc_union32 var44;
+  orc_union16 var45;
+  orc_union16 var46;
+  orc_union16 var47;
+  orc_union16 var48;
+  orc_union16 var49;
+  orc_union16 var50;
+
+  ptr0 = (orc_union32 *) d1;
+  ptr1 = (orc_union32 *) d2;
+  ptr4 = (orc_union32 *) s1;
+
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var37 = ptr4i;
+    /* 1: splitlw */
+    {
+      orc_union32 _src;
+      _src.i = var37.i;
+      var40.i = _src.x21;
+      var41.i = _src.x20;
+    }
+    /* 2: swapw */
+    var42.i = ORC_SWAP_W (var41.i);
+    /* 3: swapw */
+    var43.i = ORC_SWAP_W (var40.i);
+    /* 4: loadoffl */
+    var44 = ptr4i + 1;
+    /* 5: splitlw */
+    {
+      orc_union32 _src;
+      _src.i = var44.i;
+      var45.i = _src.x21;
+      var46.i = _src.x20;
+    }
+    /* 6: swapw */
+    var47.i = ORC_SWAP_W (var46.i);
+    /* 7: swapw */
+    var48.i = ORC_SWAP_W (var45.i);
+    /* 8: avguw */
+    var49.i = ((orc_uint16) var43.i + (orc_uint16) var48.i + 1) >> 1;
+    /* 9: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var43.i;
+      _dest.x21 = var49.i;
+      var38.i = _dest.i;
+    }
+    /* 10: storel */
+    ptr0i = var38;
+    /* 11: avguw */
+    var50.i = ((orc_uint16) var42.i + (orc_uint16) var47.i + 1) >> 1;
+    /* 12: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var50.i;
+      _dest.x21 = var47.i;
+      var39.i = _dest.i;
+    }
+    /* 13: storel */
+    ptr1i = var39;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16_orc_horiz_upsample_be (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union32 *ORC_RESTRICT ptr0;
+  orc_union32 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+  orc_union16 var40;
+  orc_union16 var41;
+  orc_union16 var42;
+  orc_union16 var43;
+  orc_union32 var44;
+  orc_union16 var45;
+  orc_union16 var46;
+  orc_union16 var47;
+  orc_union16 var48;
+  orc_union16 var49;
+  orc_union16 var50;
+
+  ptr0 = (orc_union32 *) ex->arrays0;
+  ptr1 = (orc_union32 *) ex->arrays1;
+  ptr4 = (orc_union32 *) ex->arrays4;
+
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var37 = ptr4i;
+    /* 1: splitlw */
+    {
+      orc_union32 _src;
+      _src.i = var37.i;
+      var40.i = _src.x21;
+      var41.i = _src.x20;
+    }
+    /* 2: swapw */
+    var42.i = ORC_SWAP_W (var41.i);
+    /* 3: swapw */
+    var43.i = ORC_SWAP_W (var40.i);
+    /* 4: loadoffl */
+    var44 = ptr4i + 1;
+    /* 5: splitlw */
+    {
+      orc_union32 _src;
+      _src.i = var44.i;
+      var45.i = _src.x21;
+      var46.i = _src.x20;
+    }
+    /* 6: swapw */
+    var47.i = ORC_SWAP_W (var46.i);
+    /* 7: swapw */
+    var48.i = ORC_SWAP_W (var45.i);
+    /* 8: avguw */
+    var49.i = ((orc_uint16) var43.i + (orc_uint16) var48.i + 1) >> 1;
+    /* 9: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var43.i;
+      _dest.x21 = var49.i;
+      var38.i = _dest.i;
+    }
+    /* 10: storel */
+    ptr0i = var38;
+    /* 11: avguw */
+    var50.i = ((orc_uint16) var42.i + (orc_uint16) var47.i + 1) >> 1;
+    /* 12: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var50.i;
+      _dest.x21 = var47.i;
+      var39.i = _dest.i;
+    }
+    /* 13: storel */
+    ptr1i = var39;
+  }
+
+}
+
+void
+bayer16_orc_horiz_upsample_be (guint16 * ORC_RESTRICT d1,
+    guint16 * ORC_RESTRICT d2, const guint16 * ORC_RESTRICT s1, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 29, 98, 97, 121, 101, 114, 49, 54, 95, 111, 114, 99, 95, 104,
+        111, 114, 105, 122, 95, 117, 112, 115, 97, 109, 112, 108, 101, 95, 98,
+        101,
+        11, 4, 4, 11, 4, 4, 12, 4, 4, 14, 4, 1, 0, 0, 0, 20,
+        4, 20, 2, 20, 2, 20, 2, 20, 2, 198, 34, 33, 4, 183, 33, 33,
+        183, 34, 34, 114, 32, 4, 16, 198, 36, 35, 32, 183, 35, 35, 183, 36,
+        36, 76, 36, 34, 36, 195, 0, 34, 36, 76, 33, 33, 35, 195, 1, 33,
+        35, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p,
+          _backup_bayer16_orc_horiz_upsample_be);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16_orc_horiz_upsample_be");
+      orc_program_set_backup_function (p,
+          _backup_bayer16_orc_horiz_upsample_be);
+      orc_program_add_destination (p, 4, "d1");
+      orc_program_add_destination (p, 4, "d2");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_constant (p, 4, 0x00000001, "c1");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 2, "t2");
+      orc_program_add_temporary (p, 2, "t3");
+      orc_program_add_temporary (p, 2, "t4");
+      orc_program_add_temporary (p, 2, "t5");
+
+      orc_program_append_2 (p, "splitlw", 0, ORC_VAR_T3, ORC_VAR_T2, ORC_VAR_S1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "swapw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "swapw", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "loadoffl", 0, ORC_VAR_T1, ORC_VAR_S1,
+          ORC_VAR_C1, ORC_VAR_D1);
+      orc_program_append_2 (p, "splitlw", 0, ORC_VAR_T5, ORC_VAR_T4, ORC_VAR_T1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "swapw", 0, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "swapw", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 0, ORC_VAR_T5, ORC_VAR_T3, ORC_VAR_T5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 0, ORC_VAR_D1, ORC_VAR_T3, ORC_VAR_T5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T4,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 0, ORC_VAR_D2, ORC_VAR_T2, ORC_VAR_T4,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_D2 = d2;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer16_orc_merge_bg_bgra */
+#ifdef DISABLE_ORC
+void
+bayer16_orc_merge_bg_bgra (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  int i;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union64 var43;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var44;
+#else
+  orc_union32 var44;
+#endif
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) d1;
+  ptr1 = (orc_union64 *) d2;
+  ptr4 = (orc_union32 *) s1;
+  ptr5 = (orc_union32 *) s2;
+  ptr6 = (orc_union32 *) s3;
+  ptr7 = (orc_union32 *) s4;
+  ptr8 = (orc_union32 *) s5;
+  ptr9 = (orc_union32 *) s6;
+
+  /* 9: loadpl */
+  var40.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 11: loadpl */
+  var41.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 17: loadpw */
+  var44.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var44.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr5i;
+    /* 1: loadl */
+    var36 = ptr9i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr4i;
+    /* 4: loadl */
+    var38 = ptr8i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr7i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 14: loadl */
+    var42 = ptr6i;
+    /* 15: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var52.x20;
+      var43.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var52.x21;
+      var43.x21 = _dest.i;
+    }
+    /* 16: storeq */
+    ptr0i = var43;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union64 var43;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var44;
+#else
+  orc_union32 var44;
+#endif
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) ex->arrays0;
+  ptr1 = (orc_union64 *) ex->arrays1;
+  ptr4 = (orc_union32 *) ex->arrays4;
+  ptr5 = (orc_union32 *) ex->arrays5;
+  ptr6 = (orc_union32 *) ex->arrays6;
+  ptr7 = (orc_union32 *) ex->arrays7;
+  ptr8 = (orc_union32 *) ex->arrays8;
+  ptr9 = (orc_union32 *) ex->arrays9;
+
+  /* 9: loadpl */
+  var40.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 11: loadpl */
+  var41.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 17: loadpw */
+  var44.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var44.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr5i;
+    /* 1: loadl */
+    var36 = ptr9i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr4i;
+    /* 4: loadl */
+    var38 = ptr8i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr7i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 14: loadl */
+    var42 = ptr6i;
+    /* 15: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var52.x20;
+      var43.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var52.x21;
+      var43.x21 = _dest.i;
+    }
+    /* 16: storeq */
+    ptr0i = var43;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+void
+bayer16_orc_merge_bg_bgra (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 25, 98, 97, 121, 101, 114, 49, 54, 95, 111, 114, 99, 95, 109,
+        101, 114, 103, 101, 95, 98, 103, 95, 98, 103, 114, 97, 11, 8, 8, 11,
+        8, 8, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4,
+        4, 12, 4, 4, 14, 4, 255, 255, 0, 0, 14, 4, 0, 0, 255, 255,
+        14, 2, 255, 255, 0, 0, 20, 4, 20, 4, 20, 4, 21, 1, 76, 32,
+        5, 9, 21, 1, 76, 33, 4, 8, 112, 34, 7, 21, 1, 76, 33, 33,
+        34, 106, 33, 33, 16, 106, 34, 34, 17, 123, 33, 34, 33, 21, 1, 195,
+        0, 6, 33, 21, 1, 195, 1, 32, 18, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_bg_bgra);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16_orc_merge_bg_bgra");
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_bg_bgra);
+      orc_program_add_destination (p, 8, "d1");
+      orc_program_add_destination (p, 8, "d2");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_source (p, 4, "s2");
+      orc_program_add_source (p, 4, "s3");
+      orc_program_add_source (p, 4, "s4");
+      orc_program_add_source (p, 4, "s5");
+      orc_program_add_source (p, 4, "s6");
+      orc_program_add_constant (p, 4, 0x0000ffff, "c1");
+      orc_program_add_constant (p, 4, 0xffff0000, "c2");
+      orc_program_add_constant (p, 2, 0x0000ffff, "c3");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T1, ORC_VAR_S2, ORC_VAR_S6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_S1, ORC_VAR_S5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "copyl", 0, ORC_VAR_T3, ORC_VAR_S4, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_S3, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D2, ORC_VAR_T1, ORC_VAR_C3,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_D2 = d2;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+  ex->arraysORC_VAR_S2 = (void *) s2;
+  ex->arraysORC_VAR_S3 = (void *) s3;
+  ex->arraysORC_VAR_S4 = (void *) s4;
+  ex->arraysORC_VAR_S5 = (void *) s5;
+  ex->arraysORC_VAR_S6 = (void *) s6;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer16_orc_merge_gr_bgra */
+#ifdef DISABLE_ORC
+void
+bayer16_orc_merge_gr_bgra (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  int i;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union64 var42;
+  orc_union32 var43;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var44;
+#else
+  orc_union32 var44;
+#endif
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) d1;
+  ptr1 = (orc_union64 *) d2;
+  ptr4 = (orc_union32 *) s1;
+  ptr5 = (orc_union32 *) s2;
+  ptr6 = (orc_union32 *) s3;
+  ptr7 = (orc_union32 *) s4;
+  ptr8 = (orc_union32 *) s5;
+  ptr9 = (orc_union32 *) s6;
+
+  /* 9: loadpl */
+  var40.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 11: loadpl */
+  var41.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 17: loadpw */
+  var44.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var44.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 1: loadl */
+    var36 = ptr8i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr5i;
+    /* 4: loadl */
+    var38 = ptr9i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr6i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 14: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x20;
+      _dest.x21 = var52.x20;
+      var42.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x21;
+      _dest.x21 = var52.x21;
+      var42.x21 = _dest.i;
+    }
+    /* 15: storeq */
+    ptr0i = var42;
+    /* 16: loadl */
+    var43 = ptr7i;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var43.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var43.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union64 var42;
+  orc_union32 var43;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var44;
+#else
+  orc_union32 var44;
+#endif
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) ex->arrays0;
+  ptr1 = (orc_union64 *) ex->arrays1;
+  ptr4 = (orc_union32 *) ex->arrays4;
+  ptr5 = (orc_union32 *) ex->arrays5;
+  ptr6 = (orc_union32 *) ex->arrays6;
+  ptr7 = (orc_union32 *) ex->arrays7;
+  ptr8 = (orc_union32 *) ex->arrays8;
+  ptr9 = (orc_union32 *) ex->arrays9;
+
+  /* 9: loadpl */
+  var40.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 11: loadpl */
+  var41.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 17: loadpw */
+  var44.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var44.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 1: loadl */
+    var36 = ptr8i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr5i;
+    /* 4: loadl */
+    var38 = ptr9i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr6i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 14: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x20;
+      _dest.x21 = var52.x20;
+      var42.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x21;
+      _dest.x21 = var52.x21;
+      var42.x21 = _dest.i;
+    }
+    /* 15: storeq */
+    ptr0i = var42;
+    /* 16: loadl */
+    var43 = ptr7i;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var43.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var43.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+void
+bayer16_orc_merge_gr_bgra (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 25, 98, 97, 121, 101, 114, 49, 54, 95, 111, 114, 99, 95, 109,
+        101, 114, 103, 101, 95, 103, 114, 95, 98, 103, 114, 97, 11, 8, 8, 11,
+        8, 8, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4,
+        4, 12, 4, 4, 14, 4, 0, 0, 255, 255, 14, 4, 255, 255, 0, 0,
+        14, 2, 255, 255, 0, 0, 20, 4, 20, 4, 20, 4, 21, 1, 76, 32,
+        4, 8, 21, 1, 76, 33, 5, 9, 112, 34, 6, 21, 1, 76, 33, 33,
+        34, 106, 33, 33, 16, 106, 34, 34, 17, 123, 33, 34, 33, 21, 1, 195,
+        0, 32, 33, 21, 1, 195, 1, 7, 18, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_gr_bgra);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16_orc_merge_gr_bgra");
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_gr_bgra);
+      orc_program_add_destination (p, 8, "d1");
+      orc_program_add_destination (p, 8, "d2");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_source (p, 4, "s2");
+      orc_program_add_source (p, 4, "s3");
+      orc_program_add_source (p, 4, "s4");
+      orc_program_add_source (p, 4, "s5");
+      orc_program_add_source (p, 4, "s6");
+      orc_program_add_constant (p, 4, 0xffff0000, "c1");
+      orc_program_add_constant (p, 4, 0x0000ffff, "c2");
+      orc_program_add_constant (p, 2, 0x0000ffff, "c3");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_S5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_S6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "copyl", 0, ORC_VAR_T3, ORC_VAR_S3, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D2, ORC_VAR_S4, ORC_VAR_C3,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_D2 = d2;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+  ex->arraysORC_VAR_S2 = (void *) s2;
+  ex->arraysORC_VAR_S3 = (void *) s3;
+  ex->arraysORC_VAR_S4 = (void *) s4;
+  ex->arraysORC_VAR_S5 = (void *) s5;
+  ex->arraysORC_VAR_S6 = (void *) s6;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer16_orc_merge_bg_abgr */
+#ifdef DISABLE_ORC
+void
+bayer16_orc_merge_bg_abgr (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  int i;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var42;
+#else
+  orc_union32 var42;
+#endif
+  orc_union32 var43;
+  orc_union64 var44;
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) d1;
+  ptr1 = (orc_union64 *) d2;
+  ptr4 = (orc_union32 *) s1;
+  ptr5 = (orc_union32 *) s2;
+  ptr6 = (orc_union32 *) s3;
+  ptr7 = (orc_union32 *) s4;
+  ptr8 = (orc_union32 *) s5;
+  ptr9 = (orc_union32 *) s6;
+
+  /* 9: loadpl */
+  var40.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 11: loadpl */
+  var41.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 14: loadpw */
+  var42.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var42.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr5i;
+    /* 1: loadl */
+    var36 = ptr9i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr4i;
+    /* 4: loadl */
+    var38 = ptr8i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr7i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 15: loadl */
+    var43 = ptr6i;
+    /* 16: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var43.x20;
+      var44.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var43.x21;
+      var44.x21 = _dest.i;
+    }
+    /* 17: storeq */
+    ptr0i = var44;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x20;
+      _dest.x21 = var46.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x21;
+      _dest.x21 = var46.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16_orc_merge_bg_abgr (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var42;
+#else
+  orc_union32 var42;
+#endif
+  orc_union32 var43;
+  orc_union64 var44;
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) ex->arrays0;
+  ptr1 = (orc_union64 *) ex->arrays1;
+  ptr4 = (orc_union32 *) ex->arrays4;
+  ptr5 = (orc_union32 *) ex->arrays5;
+  ptr6 = (orc_union32 *) ex->arrays6;
+  ptr7 = (orc_union32 *) ex->arrays7;
+  ptr8 = (orc_union32 *) ex->arrays8;
+  ptr9 = (orc_union32 *) ex->arrays9;
+
+  /* 9: loadpl */
+  var40.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 11: loadpl */
+  var41.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 14: loadpw */
+  var42.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var42.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr5i;
+    /* 1: loadl */
+    var36 = ptr9i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr4i;
+    /* 4: loadl */
+    var38 = ptr8i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr7i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 15: loadl */
+    var43 = ptr6i;
+    /* 16: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var43.x20;
+      var44.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var43.x21;
+      var44.x21 = _dest.i;
+    }
+    /* 17: storeq */
+    ptr0i = var44;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x20;
+      _dest.x21 = var46.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x21;
+      _dest.x21 = var46.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+void
+bayer16_orc_merge_bg_abgr (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 25, 98, 97, 121, 101, 114, 49, 54, 95, 111, 114, 99, 95, 109,
+        101, 114, 103, 101, 95, 98, 103, 95, 97, 98, 103, 114, 11, 8, 8, 11,
+        8, 8, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4,
+        4, 12, 4, 4, 14, 4, 255, 255, 0, 0, 14, 4, 0, 0, 255, 255,
+        14, 2, 255, 255, 0, 0, 20, 4, 20, 4, 20, 4, 21, 1, 76, 32,
+        5, 9, 21, 1, 76, 33, 4, 8, 112, 34, 7, 21, 1, 76, 33, 33,
+        34, 106, 33, 33, 16, 106, 34, 34, 17, 123, 33, 34, 33, 21, 1, 195,
+        0, 18, 6, 21, 1, 195, 1, 33, 32, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_bg_abgr);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16_orc_merge_bg_abgr");
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_bg_abgr);
+      orc_program_add_destination (p, 8, "d1");
+      orc_program_add_destination (p, 8, "d2");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_source (p, 4, "s2");
+      orc_program_add_source (p, 4, "s3");
+      orc_program_add_source (p, 4, "s4");
+      orc_program_add_source (p, 4, "s5");
+      orc_program_add_source (p, 4, "s6");
+      orc_program_add_constant (p, 4, 0x0000ffff, "c1");
+      orc_program_add_constant (p, 4, 0xffff0000, "c2");
+      orc_program_add_constant (p, 2, 0x0000ffff, "c3");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T1, ORC_VAR_S2, ORC_VAR_S6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_S1, ORC_VAR_S5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "copyl", 0, ORC_VAR_T3, ORC_VAR_S4, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_C3, ORC_VAR_S3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D2, ORC_VAR_T2, ORC_VAR_T1,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_D2 = d2;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+  ex->arraysORC_VAR_S2 = (void *) s2;
+  ex->arraysORC_VAR_S3 = (void *) s3;
+  ex->arraysORC_VAR_S4 = (void *) s4;
+  ex->arraysORC_VAR_S5 = (void *) s5;
+  ex->arraysORC_VAR_S6 = (void *) s6;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer16_orc_merge_gr_abgr */
+#ifdef DISABLE_ORC
+void
+bayer16_orc_merge_gr_abgr (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  int i;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var42;
+#else
+  orc_union32 var42;
+#endif
+  orc_union64 var43;
+  orc_union32 var44;
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) d1;
+  ptr1 = (orc_union64 *) d2;
+  ptr4 = (orc_union32 *) s1;
+  ptr5 = (orc_union32 *) s2;
+  ptr6 = (orc_union32 *) s3;
+  ptr7 = (orc_union32 *) s4;
+  ptr8 = (orc_union32 *) s5;
+  ptr9 = (orc_union32 *) s6;
+
+  /* 9: loadpl */
+  var40.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 11: loadpl */
+  var41.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 14: loadpw */
+  var42.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var42.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 1: loadl */
+    var36 = ptr8i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr5i;
+    /* 4: loadl */
+    var38 = ptr9i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr6i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 15: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var46.x20;
+      var43.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var46.x21;
+      var43.x21 = _dest.i;
+    }
+    /* 16: storeq */
+    ptr0i = var43;
+    /* 17: loadl */
+    var44 = ptr7i;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16_orc_merge_gr_abgr (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var42;
+#else
+  orc_union32 var42;
+#endif
+  orc_union64 var43;
+  orc_union32 var44;
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) ex->arrays0;
+  ptr1 = (orc_union64 *) ex->arrays1;
+  ptr4 = (orc_union32 *) ex->arrays4;
+  ptr5 = (orc_union32 *) ex->arrays5;
+  ptr6 = (orc_union32 *) ex->arrays6;
+  ptr7 = (orc_union32 *) ex->arrays7;
+  ptr8 = (orc_union32 *) ex->arrays8;
+  ptr9 = (orc_union32 *) ex->arrays9;
+
+  /* 9: loadpl */
+  var40.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 11: loadpl */
+  var41.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 14: loadpw */
+  var42.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var42.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 1: loadl */
+    var36 = ptr8i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr5i;
+    /* 4: loadl */
+    var38 = ptr9i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr6i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 15: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var46.x20;
+      var43.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var46.x21;
+      var43.x21 = _dest.i;
+    }
+    /* 16: storeq */
+    ptr0i = var43;
+    /* 17: loadl */
+    var44 = ptr7i;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+void
+bayer16_orc_merge_gr_abgr (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 25, 98, 97, 121, 101, 114, 49, 54, 95, 111, 114, 99, 95, 109,
+        101, 114, 103, 101, 95, 103, 114, 95, 97, 98, 103, 114, 11, 8, 8, 11,
+        8, 8, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4,
+        4, 12, 4, 4, 14, 4, 0, 0, 255, 255, 14, 4, 255, 255, 0, 0,
+        14, 2, 255, 255, 0, 0, 20, 4, 20, 4, 20, 4, 21, 1, 76, 32,
+        4, 8, 21, 1, 76, 33, 5, 9, 112, 34, 6, 21, 1, 76, 33, 33,
+        34, 106, 33, 33, 16, 106, 34, 34, 17, 123, 33, 34, 33, 21, 1, 195,
+        0, 18, 32, 21, 1, 195, 1, 33, 7, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_gr_abgr);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16_orc_merge_gr_abgr");
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_gr_abgr);
+      orc_program_add_destination (p, 8, "d1");
+      orc_program_add_destination (p, 8, "d2");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_source (p, 4, "s2");
+      orc_program_add_source (p, 4, "s3");
+      orc_program_add_source (p, 4, "s4");
+      orc_program_add_source (p, 4, "s5");
+      orc_program_add_source (p, 4, "s6");
+      orc_program_add_constant (p, 4, 0xffff0000, "c1");
+      orc_program_add_constant (p, 4, 0x0000ffff, "c2");
+      orc_program_add_constant (p, 2, 0x0000ffff, "c3");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_S5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_S6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "copyl", 0, ORC_VAR_T3, ORC_VAR_S3, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_C3, ORC_VAR_T1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D2, ORC_VAR_T2, ORC_VAR_S4,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_D2 = d2;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+  ex->arraysORC_VAR_S2 = (void *) s2;
+  ex->arraysORC_VAR_S3 = (void *) s3;
+  ex->arraysORC_VAR_S4 = (void *) s4;
+  ex->arraysORC_VAR_S5 = (void *) s5;
+  ex->arraysORC_VAR_S6 = (void *) s6;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer16_orc_merge_bg_rgba */
+#ifdef DISABLE_ORC
+void
+bayer16_orc_merge_bg_rgba (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  int i;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union64 var42;
+  orc_union32 var43;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var44;
+#else
+  orc_union32 var44;
+#endif
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) d1;
+  ptr1 = (orc_union64 *) d2;
+  ptr4 = (orc_union32 *) s1;
+  ptr5 = (orc_union32 *) s2;
+  ptr6 = (orc_union32 *) s3;
+  ptr7 = (orc_union32 *) s4;
+  ptr8 = (orc_union32 *) s5;
+  ptr9 = (orc_union32 *) s6;
+
+  /* 9: loadpl */
+  var40.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 11: loadpl */
+  var41.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 17: loadpw */
+  var44.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var44.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr5i;
+    /* 1: loadl */
+    var36 = ptr9i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr4i;
+    /* 4: loadl */
+    var38 = ptr8i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr7i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 14: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x20;
+      _dest.x21 = var52.x20;
+      var42.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x21;
+      _dest.x21 = var52.x21;
+      var42.x21 = _dest.i;
+    }
+    /* 15: storeq */
+    ptr0i = var42;
+    /* 16: loadl */
+    var43 = ptr6i;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var43.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var43.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16_orc_merge_bg_rgba (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union64 var42;
+  orc_union32 var43;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var44;
+#else
+  orc_union32 var44;
+#endif
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) ex->arrays0;
+  ptr1 = (orc_union64 *) ex->arrays1;
+  ptr4 = (orc_union32 *) ex->arrays4;
+  ptr5 = (orc_union32 *) ex->arrays5;
+  ptr6 = (orc_union32 *) ex->arrays6;
+  ptr7 = (orc_union32 *) ex->arrays7;
+  ptr8 = (orc_union32 *) ex->arrays8;
+  ptr9 = (orc_union32 *) ex->arrays9;
+
+  /* 9: loadpl */
+  var40.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 11: loadpl */
+  var41.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 17: loadpw */
+  var44.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var44.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr5i;
+    /* 1: loadl */
+    var36 = ptr9i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr4i;
+    /* 4: loadl */
+    var38 = ptr8i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr7i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 14: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x20;
+      _dest.x21 = var52.x20;
+      var42.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x21;
+      _dest.x21 = var52.x21;
+      var42.x21 = _dest.i;
+    }
+    /* 15: storeq */
+    ptr0i = var42;
+    /* 16: loadl */
+    var43 = ptr6i;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var43.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var43.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+void
+bayer16_orc_merge_bg_rgba (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 25, 98, 97, 121, 101, 114, 49, 54, 95, 111, 114, 99, 95, 109,
+        101, 114, 103, 101, 95, 98, 103, 95, 114, 103, 98, 97, 11, 8, 8, 11,
+        8, 8, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4,
+        4, 12, 4, 4, 14, 4, 255, 255, 0, 0, 14, 4, 0, 0, 255, 255,
+        14, 2, 255, 255, 0, 0, 20, 4, 20, 4, 20, 4, 21, 1, 76, 32,
+        5, 9, 21, 1, 76, 33, 4, 8, 112, 34, 7, 21, 1, 76, 33, 33,
+        34, 106, 33, 33, 16, 106, 34, 34, 17, 123, 33, 34, 33, 21, 1, 195,
+        0, 32, 33, 21, 1, 195, 1, 6, 18, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_bg_rgba);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16_orc_merge_bg_rgba");
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_bg_rgba);
+      orc_program_add_destination (p, 8, "d1");
+      orc_program_add_destination (p, 8, "d2");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_source (p, 4, "s2");
+      orc_program_add_source (p, 4, "s3");
+      orc_program_add_source (p, 4, "s4");
+      orc_program_add_source (p, 4, "s5");
+      orc_program_add_source (p, 4, "s6");
+      orc_program_add_constant (p, 4, 0x0000ffff, "c1");
+      orc_program_add_constant (p, 4, 0xffff0000, "c2");
+      orc_program_add_constant (p, 2, 0x0000ffff, "c3");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T1, ORC_VAR_S2, ORC_VAR_S6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_S1, ORC_VAR_S5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "copyl", 0, ORC_VAR_T3, ORC_VAR_S4, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D2, ORC_VAR_S3, ORC_VAR_C3,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_D2 = d2;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+  ex->arraysORC_VAR_S2 = (void *) s2;
+  ex->arraysORC_VAR_S3 = (void *) s3;
+  ex->arraysORC_VAR_S4 = (void *) s4;
+  ex->arraysORC_VAR_S5 = (void *) s5;
+  ex->arraysORC_VAR_S6 = (void *) s6;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer16_orc_merge_gr_rgba */
+#ifdef DISABLE_ORC
+void
+bayer16_orc_merge_gr_rgba (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  int i;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union64 var43;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var44;
+#else
+  orc_union32 var44;
+#endif
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) d1;
+  ptr1 = (orc_union64 *) d2;
+  ptr4 = (orc_union32 *) s1;
+  ptr5 = (orc_union32 *) s2;
+  ptr6 = (orc_union32 *) s3;
+  ptr7 = (orc_union32 *) s4;
+  ptr8 = (orc_union32 *) s5;
+  ptr9 = (orc_union32 *) s6;
+
+  /* 9: loadpl */
+  var40.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 11: loadpl */
+  var41.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 17: loadpw */
+  var44.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var44.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 1: loadl */
+    var36 = ptr8i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr5i;
+    /* 4: loadl */
+    var38 = ptr9i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr6i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 14: loadl */
+    var42 = ptr7i;
+    /* 15: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var52.x20;
+      var43.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var52.x21;
+      var43.x21 = _dest.i;
+    }
+    /* 16: storeq */
+    ptr0i = var43;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16_orc_merge_gr_rgba (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+  orc_union32 var42;
+  orc_union64 var43;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var44;
+#else
+  orc_union32 var44;
+#endif
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) ex->arrays0;
+  ptr1 = (orc_union64 *) ex->arrays1;
+  ptr4 = (orc_union32 *) ex->arrays4;
+  ptr5 = (orc_union32 *) ex->arrays5;
+  ptr6 = (orc_union32 *) ex->arrays6;
+  ptr7 = (orc_union32 *) ex->arrays7;
+  ptr8 = (orc_union32 *) ex->arrays8;
+  ptr9 = (orc_union32 *) ex->arrays9;
+
+  /* 9: loadpl */
+  var40.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 11: loadpl */
+  var41.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 17: loadpw */
+  var44.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var44.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 1: loadl */
+    var36 = ptr8i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr5i;
+    /* 4: loadl */
+    var38 = ptr9i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr6i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 14: loadl */
+    var42 = ptr7i;
+    /* 15: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var52.x20;
+      var43.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var52.x21;
+      var43.x21 = _dest.i;
+    }
+    /* 16: storeq */
+    ptr0i = var43;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var46.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+void
+bayer16_orc_merge_gr_rgba (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 25, 98, 97, 121, 101, 114, 49, 54, 95, 111, 114, 99, 95, 109,
+        101, 114, 103, 101, 95, 103, 114, 95, 114, 103, 98, 97, 11, 8, 8, 11,
+        8, 8, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4,
+        4, 12, 4, 4, 14, 4, 0, 0, 255, 255, 14, 4, 255, 255, 0, 0,
+        14, 2, 255, 255, 0, 0, 20, 4, 20, 4, 20, 4, 21, 1, 76, 32,
+        4, 8, 21, 1, 76, 33, 5, 9, 112, 34, 6, 21, 1, 76, 33, 33,
+        34, 106, 33, 33, 16, 106, 34, 34, 17, 123, 33, 34, 33, 21, 1, 195,
+        0, 7, 33, 21, 1, 195, 1, 32, 18, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_gr_rgba);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16_orc_merge_gr_rgba");
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_gr_rgba);
+      orc_program_add_destination (p, 8, "d1");
+      orc_program_add_destination (p, 8, "d2");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_source (p, 4, "s2");
+      orc_program_add_source (p, 4, "s3");
+      orc_program_add_source (p, 4, "s4");
+      orc_program_add_source (p, 4, "s5");
+      orc_program_add_source (p, 4, "s6");
+      orc_program_add_constant (p, 4, 0xffff0000, "c1");
+      orc_program_add_constant (p, 4, 0x0000ffff, "c2");
+      orc_program_add_constant (p, 2, 0x0000ffff, "c3");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_S5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_S6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "copyl", 0, ORC_VAR_T3, ORC_VAR_S3, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_S4, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D2, ORC_VAR_T1, ORC_VAR_C3,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_D2 = d2;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+  ex->arraysORC_VAR_S2 = (void *) s2;
+  ex->arraysORC_VAR_S3 = (void *) s3;
+  ex->arraysORC_VAR_S4 = (void *) s4;
+  ex->arraysORC_VAR_S5 = (void *) s5;
+  ex->arraysORC_VAR_S6 = (void *) s6;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer16_orc_merge_bg_argb */
+#ifdef DISABLE_ORC
+void
+bayer16_orc_merge_bg_argb (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  int i;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var42;
+#else
+  orc_union32 var42;
+#endif
+  orc_union64 var43;
+  orc_union32 var44;
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) d1;
+  ptr1 = (orc_union64 *) d2;
+  ptr4 = (orc_union32 *) s1;
+  ptr5 = (orc_union32 *) s2;
+  ptr6 = (orc_union32 *) s3;
+  ptr7 = (orc_union32 *) s4;
+  ptr8 = (orc_union32 *) s5;
+  ptr9 = (orc_union32 *) s6;
+
+  /* 9: loadpl */
+  var40.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 11: loadpl */
+  var41.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 14: loadpw */
+  var42.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var42.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr5i;
+    /* 1: loadl */
+    var36 = ptr9i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr4i;
+    /* 4: loadl */
+    var38 = ptr8i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr7i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 15: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var46.x20;
+      var43.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var46.x21;
+      var43.x21 = _dest.i;
+    }
+    /* 16: storeq */
+    ptr0i = var43;
+    /* 17: loadl */
+    var44 = ptr6i;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16_orc_merge_bg_argb (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var42;
+#else
+  orc_union32 var42;
+#endif
+  orc_union64 var43;
+  orc_union32 var44;
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) ex->arrays0;
+  ptr1 = (orc_union64 *) ex->arrays1;
+  ptr4 = (orc_union32 *) ex->arrays4;
+  ptr5 = (orc_union32 *) ex->arrays5;
+  ptr6 = (orc_union32 *) ex->arrays6;
+  ptr7 = (orc_union32 *) ex->arrays7;
+  ptr8 = (orc_union32 *) ex->arrays8;
+  ptr9 = (orc_union32 *) ex->arrays9;
+
+  /* 9: loadpl */
+  var40.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 11: loadpl */
+  var41.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 14: loadpw */
+  var42.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var42.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr5i;
+    /* 1: loadl */
+    var36 = ptr9i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr4i;
+    /* 4: loadl */
+    var38 = ptr8i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr7i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 15: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var46.x20;
+      var43.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var46.x21;
+      var43.x21 = _dest.i;
+    }
+    /* 16: storeq */
+    ptr0i = var43;
+    /* 17: loadl */
+    var44 = ptr6i;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x20;
+      _dest.x21 = var44.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x21;
+      _dest.x21 = var44.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+void
+bayer16_orc_merge_bg_argb (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 25, 98, 97, 121, 101, 114, 49, 54, 95, 111, 114, 99, 95, 109,
+        101, 114, 103, 101, 95, 98, 103, 95, 97, 114, 103, 98, 11, 8, 8, 11,
+        8, 8, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4,
+        4, 12, 4, 4, 14, 4, 255, 255, 0, 0, 14, 4, 0, 0, 255, 255,
+        14, 2, 255, 255, 0, 0, 20, 4, 20, 4, 20, 4, 21, 1, 76, 32,
+        5, 9, 21, 1, 76, 33, 4, 8, 112, 34, 7, 21, 1, 76, 33, 33,
+        34, 106, 33, 33, 16, 106, 34, 34, 17, 123, 33, 34, 33, 21, 1, 195,
+        0, 18, 32, 21, 1, 195, 1, 33, 6, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_bg_argb);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16_orc_merge_bg_argb");
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_bg_argb);
+      orc_program_add_destination (p, 8, "d1");
+      orc_program_add_destination (p, 8, "d2");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_source (p, 4, "s2");
+      orc_program_add_source (p, 4, "s3");
+      orc_program_add_source (p, 4, "s4");
+      orc_program_add_source (p, 4, "s5");
+      orc_program_add_source (p, 4, "s6");
+      orc_program_add_constant (p, 4, 0x0000ffff, "c1");
+      orc_program_add_constant (p, 4, 0xffff0000, "c2");
+      orc_program_add_constant (p, 2, 0x0000ffff, "c3");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T1, ORC_VAR_S2, ORC_VAR_S6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_S1, ORC_VAR_S5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "copyl", 0, ORC_VAR_T3, ORC_VAR_S4, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_C3, ORC_VAR_T1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D2, ORC_VAR_T2, ORC_VAR_S3,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_D2 = d2;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+  ex->arraysORC_VAR_S2 = (void *) s2;
+  ex->arraysORC_VAR_S3 = (void *) s3;
+  ex->arraysORC_VAR_S4 = (void *) s4;
+  ex->arraysORC_VAR_S5 = (void *) s5;
+  ex->arraysORC_VAR_S6 = (void *) s6;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer16_orc_merge_gr_argb */
+#ifdef DISABLE_ORC
+void
+bayer16_orc_merge_gr_argb (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  int i;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var42;
+#else
+  orc_union32 var42;
+#endif
+  orc_union32 var43;
+  orc_union64 var44;
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) d1;
+  ptr1 = (orc_union64 *) d2;
+  ptr4 = (orc_union32 *) s1;
+  ptr5 = (orc_union32 *) s2;
+  ptr6 = (orc_union32 *) s3;
+  ptr7 = (orc_union32 *) s4;
+  ptr8 = (orc_union32 *) s5;
+  ptr9 = (orc_union32 *) s6;
+
+  /* 9: loadpl */
+  var40.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 11: loadpl */
+  var41.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 14: loadpw */
+  var42.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var42.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 1: loadl */
+    var36 = ptr8i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr5i;
+    /* 4: loadl */
+    var38 = ptr9i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr6i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 15: loadl */
+    var43 = ptr7i;
+    /* 16: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var43.x20;
+      var44.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var43.x21;
+      var44.x21 = _dest.i;
+    }
+    /* 17: storeq */
+    ptr0i = var44;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x20;
+      _dest.x21 = var46.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x21;
+      _dest.x21 = var46.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16_orc_merge_gr_argb (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union64 *ORC_RESTRICT ptr0;
+  orc_union64 *ORC_RESTRICT ptr1;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  const orc_union32 *ORC_RESTRICT ptr6;
+  const orc_union32 *ORC_RESTRICT ptr7;
+  const orc_union32 *ORC_RESTRICT ptr8;
+  const orc_union32 *ORC_RESTRICT ptr9;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union32 var39;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var40;
+#else
+  orc_union32 var40;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var41;
+#else
+  orc_union32 var41;
+#endif
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var42;
+#else
+  orc_union32 var42;
+#endif
+  orc_union32 var43;
+  orc_union64 var44;
+  orc_union64 var45;
+  orc_union32 var46;
+  orc_union32 var47;
+  orc_union32 var48;
+  orc_union32 var49;
+  orc_union32 var50;
+  orc_union32 var51;
+  orc_union32 var52;
+
+  ptr0 = (orc_union64 *) ex->arrays0;
+  ptr1 = (orc_union64 *) ex->arrays1;
+  ptr4 = (orc_union32 *) ex->arrays4;
+  ptr5 = (orc_union32 *) ex->arrays5;
+  ptr6 = (orc_union32 *) ex->arrays6;
+  ptr7 = (orc_union32 *) ex->arrays7;
+  ptr8 = (orc_union32 *) ex->arrays8;
+  ptr9 = (orc_union32 *) ex->arrays9;
+
+  /* 9: loadpl */
+  var40.i = 0xffff0000;         /* -65536 or 2.12196e-314f */
+  /* 11: loadpl */
+  var41.i = 0x0000ffff;         /* 65535 or 3.23786e-319f */
+  /* 14: loadpw */
+  var42.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var42.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 1: loadl */
+    var36 = ptr8i;
+    /* 2: avguw */
+    var46.x20 =
+        ((orc_uint16) var35.x20 + (orc_uint16) var36.x20 + 1) >> 1;
+    var46.x21 =
+        ((orc_uint16) var35.x21 + (orc_uint16) var36.x21 + 1) >> 1;
+    /* 3: loadl */
+    var37 = ptr5i;
+    /* 4: loadl */
+    var38 = ptr9i;
+    /* 5: avguw */
+    var47.x20 =
+        ((orc_uint16) var37.x20 + (orc_uint16) var38.x20 + 1) >> 1;
+    var47.x21 =
+        ((orc_uint16) var37.x21 + (orc_uint16) var38.x21 + 1) >> 1;
+    /* 6: loadl */
+    var39 = ptr6i;
+    /* 7: copyl */
+    var48.i = var39.i;
+    /* 8: avguw */
+    var49.x20 =
+        ((orc_uint16) var47.x20 + (orc_uint16) var48.x20 + 1) >> 1;
+    var49.x21 =
+        ((orc_uint16) var47.x21 + (orc_uint16) var48.x21 + 1) >> 1;
+    /* 10: andl */
+    var50.i = var49.i & var40.i;
+    /* 12: andl */
+    var51.i = var48.i & var41.i;
+    /* 13: orl */
+    var52.i = var51.i | var50.i;
+    /* 15: loadl */
+    var43 = ptr7i;
+    /* 16: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x20;
+      _dest.x21 = var43.x20;
+      var44.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var42.x21;
+      _dest.x21 = var43.x21;
+      var44.x21 = _dest.i;
+    }
+    /* 17: storeq */
+    ptr0i = var44;
+    /* 18: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x20;
+      _dest.x21 = var46.x20;
+      var45.x20 = _dest.i;
+    }
+    {
+      orc_union32 _dest;
+      _dest.x20 = var52.x21;
+      _dest.x21 = var46.x21;
+      var45.x21 = _dest.i;
+    }
+    /* 19: storeq */
+    ptr1i = var45;
+  }
+
+}
+
+void
+bayer16_orc_merge_gr_argb (guint16 * ORC_RESTRICT d1, guint16 * ORC_RESTRICT d2,
+    const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+    const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+    const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 25, 98, 97, 121, 101, 114, 49, 54, 95, 111, 114, 99, 95, 109,
+        101, 114, 103, 101, 95, 103, 114, 95, 97, 114, 103, 98, 11, 8, 8, 11,
+        8, 8, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4, 4, 12, 4,
+        4, 12, 4, 4, 14, 4, 0, 0, 255, 255, 14, 4, 255, 255, 0, 0,
+        14, 2, 255, 255, 0, 0, 20, 4, 20, 4, 20, 4, 21, 1, 76, 32,
+        4, 8, 21, 1, 76, 33, 5, 9, 112, 34, 6, 21, 1, 76, 33, 33,
+        34, 106, 33, 33, 16, 106, 34, 34, 17, 123, 33, 34, 33, 21, 1, 195,
+        0, 18, 7, 21, 1, 195, 1, 33, 32, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_gr_argb);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16_orc_merge_gr_argb");
+      orc_program_set_backup_function (p, _backup_bayer16_orc_merge_gr_argb);
+      orc_program_add_destination (p, 8, "d1");
+      orc_program_add_destination (p, 8, "d2");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_source (p, 4, "s2");
+      orc_program_add_source (p, 4, "s3");
+      orc_program_add_source (p, 4, "s4");
+      orc_program_add_source (p, 4, "s5");
+      orc_program_add_source (p, 4, "s6");
+      orc_program_add_constant (p, 4, 0xffff0000, "c1");
+      orc_program_add_constant (p, 4, 0x0000ffff, "c2");
+      orc_program_add_constant (p, 2, 0x0000ffff, "c3");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T1, ORC_VAR_S1, ORC_VAR_S5,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_S2, ORC_VAR_S6,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "copyl", 0, ORC_VAR_T3, ORC_VAR_S3, ORC_VAR_D1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "avguw", 1, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T2, ORC_VAR_T2, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "andl", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "orl", 0, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_T2,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_C3, ORC_VAR_S4,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D2, ORC_VAR_T2, ORC_VAR_T1,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_D2 = d2;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+  ex->arraysORC_VAR_S2 = (void *) s2;
+  ex->arraysORC_VAR_S3 = (void *) s3;
+  ex->arraysORC_VAR_S4 = (void *) s4;
+  ex->arraysORC_VAR_S5 = (void *) s5;
+  ex->arraysORC_VAR_S6 = (void *) s6;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer16to16_orc_reorder */
+#ifdef DISABLE_ORC
+void
+bayer16to16_orc_reorder (guint8 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, const guint32 * ORC_RESTRICT s2, int p1,
+    int n)
+{
+  int i;
+  orc_union64 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  orc_union32 var35;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var36;
+#else
+  orc_union32 var36;
+#endif
+  orc_union32 var37;
+  orc_union64 var38;
+  orc_union64 var39;
+  orc_union64 var40;
+  orc_union32 var41;
+  orc_union64 var42;
+  orc_union64 var43;
+  orc_union32 var44;
+
+  ptr0 = (orc_union64 *) d1;
+  ptr4 = (orc_union32 *) s1;
+  ptr5 = (orc_union32 *) s2;
+
+  /* 1: loadpw */
+  var36.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var36.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 2: muluwl */
+    var39.x20 =
+        ((orc_uint32) ((orc_uint16) var35.x20)) *
+        ((orc_uint32) ((orc_uint16) var36.x20));
+    var39.x21 =
+        ((orc_uint32) ((orc_uint16) var35.x21)) *
+        ((orc_uint32) ((orc_uint16) var36.x21));
+    /* 3: shrul */
+    var40.x20 = ((orc_uint32) var39.x20) >> p1;
+    var40.x21 = ((orc_uint32) var39.x21) >> p1;
+    /* 4: convuuslw */
+    var41.x20 = ORC_CLAMP_UW ((orc_uint32) var40.x20);
+    var41.x21 = ORC_CLAMP_UW ((orc_uint32) var40.x21);
+    /* 5: loadl */
+    var37 = ptr5i;
+    /* 6: muluwl */
+    var42.x20 =
+        ((orc_uint32) ((orc_uint16) var37.x20)) *
+        ((orc_uint32) ((orc_uint16) var36.x20));
+    var42.x21 =
+        ((orc_uint32) ((orc_uint16) var37.x21)) *
+        ((orc_uint32) ((orc_uint16) var36.x21));
+    /* 7: shrul */
+    var43.x20 = ((orc_uint32) var42.x20) >> p1;
+    var43.x21 = ((orc_uint32) var42.x21) >> p1;
+    /* 8: convuuslw */
+    var44.x20 = ORC_CLAMP_UW ((orc_uint32) var43.x20);
+    var44.x21 = ORC_CLAMP_UW ((orc_uint32) var43.x21);
+    /* 9: mergelq */
+    {
+      orc_union64 _dest;
+      _dest.x20 = var41.i;
+      _dest.x21 = var44.i;
+      var38.i = _dest.i;
+    }
+    /* 10: storeq */
+    ptr0i = var38;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16to16_orc_reorder (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union64 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  orc_union32 var35;
+#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__)
+  volatile orc_union32 var36;
+#else
+  orc_union32 var36;
+#endif
+  orc_union32 var37;
+  orc_union64 var38;
+  orc_union64 var39;
+  orc_union64 var40;
+  orc_union32 var41;
+  orc_union64 var42;
+  orc_union64 var43;
+  orc_union32 var44;
+
+  ptr0 = (orc_union64 *) ex->arrays0;
+  ptr4 = (orc_union32 *) ex->arrays4;
+  ptr5 = (orc_union32 *) ex->arrays5;
+
+  /* 1: loadpw */
+  var36.x20 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+  var36.x21 = 0x0000ffff;     /* 65535 or 3.23786e-319f */
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 2: muluwl */
+    var39.x20 =
+        ((orc_uint32) ((orc_uint16) var35.x20)) *
+        ((orc_uint32) ((orc_uint16) var36.x20));
+    var39.x21 =
+        ((orc_uint32) ((orc_uint16) var35.x21)) *
+        ((orc_uint32) ((orc_uint16) var36.x21));
+    /* 3: shrul */
+    var40.x20 = ((orc_uint32) var39.x20) >> ex->params24;
+    var40.x21 = ((orc_uint32) var39.x21) >> ex->params24;
+    /* 4: convuuslw */
+    var41.x20 = ORC_CLAMP_UW ((orc_uint32) var40.x20);
+    var41.x21 = ORC_CLAMP_UW ((orc_uint32) var40.x21);
+    /* 5: loadl */
+    var37 = ptr5i;
+    /* 6: muluwl */
+    var42.x20 =
+        ((orc_uint32) ((orc_uint16) var37.x20)) *
+        ((orc_uint32) ((orc_uint16) var36.x20));
+    var42.x21 =
+        ((orc_uint32) ((orc_uint16) var37.x21)) *
+        ((orc_uint32) ((orc_uint16) var36.x21));
+    /* 7: shrul */
+    var43.x20 = ((orc_uint32) var42.x20) >> ex->params24;
+    var43.x21 = ((orc_uint32) var42.x21) >> ex->params24;
+    /* 8: convuuslw */
+    var44.x20 = ORC_CLAMP_UW ((orc_uint32) var43.x20);
+    var44.x21 = ORC_CLAMP_UW ((orc_uint32) var43.x21);
+    /* 9: mergelq */
+    {
+      orc_union64 _dest;
+      _dest.x20 = var41.i;
+      _dest.x21 = var44.i;
+      var38.i = _dest.i;
+    }
+    /* 10: storeq */
+    ptr0i = var38;
+  }
+
+}
+
+void
+bayer16to16_orc_reorder (guint8 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, const guint32 * ORC_RESTRICT s2, int p1,
+    int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 23, 98, 97, 121, 101, 114, 49, 54, 116, 111, 49, 54, 95, 111,
+        114, 99, 95, 114, 101, 111, 114, 100, 101, 114, 11, 8, 8, 12, 4, 4,
+        12, 4, 4, 14, 2, 255, 255, 0, 0, 16, 4, 20, 4, 20, 4, 20,
+        8, 21, 1, 177, 34, 4, 16, 21, 1, 126, 34, 34, 24, 21, 1, 168,
+        32, 34, 21, 1, 177, 34, 5, 16, 21, 1, 126, 34, 34, 24, 21, 1,
+        168, 33, 34, 194, 0, 32, 33, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_bayer16to16_orc_reorder);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16to16_orc_reorder");
+      orc_program_set_backup_function (p, _backup_bayer16to16_orc_reorder);
+      orc_program_add_destination (p, 8, "d1");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_source (p, 4, "s2");
+      orc_program_add_constant (p, 2, 0x0000ffff, "c1");
+      orc_program_add_parameter (p, 4, "p1");
+      orc_program_add_temporary (p, 4, "t1");
+      orc_program_add_temporary (p, 4, "t2");
+      orc_program_add_temporary (p, 8, "t3");
+
+      orc_program_append_2 (p, "muluwl", 1, ORC_VAR_T3, ORC_VAR_S1, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shrul", 1, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_P1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "convuuslw", 1, ORC_VAR_T1, ORC_VAR_T3,
+          ORC_VAR_D1, ORC_VAR_D1);
+      orc_program_append_2 (p, "muluwl", 1, ORC_VAR_T3, ORC_VAR_S2, ORC_VAR_C1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "shrul", 1, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_P1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "convuuslw", 1, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1, ORC_VAR_D1);
+      orc_program_append_2 (p, "mergelq", 0, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+  ex->arraysORC_VAR_S2 = (void *) s2;
+  ex->paramsORC_VAR_P1 = p1;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer16to8_orc_reorder */
+#ifdef DISABLE_ORC
+void
+bayer16to8_orc_reorder (guint8 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, const guint32 * ORC_RESTRICT s2, int p1,
+    int n)
+{
+  int i;
+  orc_union32 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union16 var39;
+  orc_union32 var40;
+  orc_union16 var41;
+
+  ptr0 = (orc_union32 *) d1;
+  ptr4 = (orc_union32 *) s1;
+  ptr5 = (orc_union32 *) s2;
+
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 1: shruw */
+    var38.x20 = ((orc_uint16) var35.x20) >> p1;
+    var38.x21 = ((orc_uint16) var35.x21) >> p1;
+    /* 2: convuuswb */
+    var39.x20 = ORC_MIN ((orc_uint16) var38.x20, ORC_UB_MAX);
+    var39.x21 = ORC_MIN ((orc_uint16) var38.x21, ORC_UB_MAX);
+    /* 3: loadl */
+    var36 = ptr5i;
+    /* 4: shruw */
+    var40.x20 = ((orc_uint16) var36.x20) >> p1;
+    var40.x21 = ((orc_uint16) var36.x21) >> p1;
+    /* 5: convuuswb */
+    var41.x20 = ORC_MIN ((orc_uint16) var40.x20, ORC_UB_MAX);
+    var41.x21 = ORC_MIN ((orc_uint16) var40.x21, ORC_UB_MAX);
+    /* 6: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var39.i;
+      _dest.x21 = var41.i;
+      var37.i = _dest.i;
+    }
+    /* 7: storel */
+    ptr0i = var37;
+  }
+
+}
+
+#else
+static void
+_backup_bayer16to8_orc_reorder (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union32 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  const orc_union32 *ORC_RESTRICT ptr5;
+  orc_union32 var35;
+  orc_union32 var36;
+  orc_union32 var37;
+  orc_union32 var38;
+  orc_union16 var39;
+  orc_union32 var40;
+  orc_union16 var41;
+
+  ptr0 = (orc_union32 *) ex->arrays0;
+  ptr4 = (orc_union32 *) ex->arrays4;
+  ptr5 = (orc_union32 *) ex->arrays5;
+
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var35 = ptr4i;
+    /* 1: shruw */
+    var38.x20 = ((orc_uint16) var35.x20) >> ex->params24;
+    var38.x21 = ((orc_uint16) var35.x21) >> ex->params24;
+    /* 2: convuuswb */
+    var39.x20 = ORC_MIN ((orc_uint16) var38.x20, ORC_UB_MAX);
+    var39.x21 = ORC_MIN ((orc_uint16) var38.x21, ORC_UB_MAX);
+    /* 3: loadl */
+    var36 = ptr5i;
+    /* 4: shruw */
+    var40.x20 = ((orc_uint16) var36.x20) >> ex->params24;
+    var40.x21 = ((orc_uint16) var36.x21) >> ex->params24;
+    /* 5: convuuswb */
+    var41.x20 = ORC_MIN ((orc_uint16) var40.x20, ORC_UB_MAX);
+    var41.x21 = ORC_MIN ((orc_uint16) var40.x21, ORC_UB_MAX);
+    /* 6: mergewl */
+    {
+      orc_union32 _dest;
+      _dest.x20 = var39.i;
+      _dest.x21 = var41.i;
+      var37.i = _dest.i;
+    }
+    /* 7: storel */
+    ptr0i = var37;
+  }
+
+}
+
+void
+bayer16to8_orc_reorder (guint8 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, const guint32 * ORC_RESTRICT s2, int p1,
+    int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 22, 98, 97, 121, 101, 114, 49, 54, 116, 111, 56, 95, 111, 114,
+        99, 95, 114, 101, 111, 114, 100, 101, 114, 11, 4, 4, 12, 4, 4, 12,
+        4, 4, 16, 4, 20, 2, 20, 2, 20, 4, 21, 1, 95, 34, 4, 24,
+        21, 1, 162, 32, 34, 21, 1, 95, 34, 5, 24, 21, 1, 162, 33, 34,
+        195, 0, 32, 33, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_bayer16to8_orc_reorder);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer16to8_orc_reorder");
+      orc_program_set_backup_function (p, _backup_bayer16to8_orc_reorder);
+      orc_program_add_destination (p, 4, "d1");
+      orc_program_add_source (p, 4, "s1");
+      orc_program_add_source (p, 4, "s2");
+      orc_program_add_parameter (p, 4, "p1");
+      orc_program_add_temporary (p, 2, "t1");
+      orc_program_add_temporary (p, 2, "t2");
+      orc_program_add_temporary (p, 4, "t3");
+
+      orc_program_append_2 (p, "shruw", 1, ORC_VAR_T3, ORC_VAR_S1, ORC_VAR_P1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "convuuswb", 1, ORC_VAR_T1, ORC_VAR_T3,
+          ORC_VAR_D1, ORC_VAR_D1);
+      orc_program_append_2 (p, "shruw", 1, ORC_VAR_T3, ORC_VAR_S2, ORC_VAR_P1,
+          ORC_VAR_D1);
+      orc_program_append_2 (p, "convuuswb", 1, ORC_VAR_T2, ORC_VAR_T3,
+          ORC_VAR_D1, ORC_VAR_D1);
+      orc_program_append_2 (p, "mergewl", 0, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+  ex->arraysORC_VAR_S2 = (void *) s2;
+  ex->paramsORC_VAR_P1 = p1;
+
+  func = c->exec;
+  func (ex);
+}
+#endif
+
+
+/* bayer8to16_orc_reorder */
+#ifdef DISABLE_ORC
+void
+bayer8to16_orc_reorder (guint8 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, int n)
+{
+  int i;
+  orc_union64 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  orc_union32 var32;
+  orc_union64 var33;
+
+  ptr0 = (orc_union64 *) d1;
+  ptr4 = (orc_union32 *) s1;
+
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var32 = ptr4i;
+    /* 1: splatbw */
+    var33.x40 = ((var32.x40 & 0xff) << 8) | (var32.x40 & 0xff);
+    var33.x41 = ((var32.x41 & 0xff) << 8) | (var32.x41 & 0xff);
+    var33.x42 = ((var32.x42 & 0xff) << 8) | (var32.x42 & 0xff);
+    var33.x43 = ((var32.x43 & 0xff) << 8) | (var32.x43 & 0xff);
+    /* 2: storeq */
+    ptr0i = var33;
+  }
+
+}
+
+#else
+static void
+_backup_bayer8to16_orc_reorder (OrcExecutor * ORC_RESTRICT ex)
+{
+  int i;
+  int n = ex->n;
+  orc_union64 *ORC_RESTRICT ptr0;
+  const orc_union32 *ORC_RESTRICT ptr4;
+  orc_union32 var32;
+  orc_union64 var33;
+
+  ptr0 = (orc_union64 *) ex->arrays0;
+  ptr4 = (orc_union32 *) ex->arrays4;
+
+
+  for (i = 0; i < n; i++) {
+    /* 0: loadl */
+    var32 = ptr4i;
+    /* 1: splatbw */
+    var33.x40 = ((var32.x40 & 0xff) << 8) | (var32.x40 & 0xff);
+    var33.x41 = ((var32.x41 & 0xff) << 8) | (var32.x41 & 0xff);
+    var33.x42 = ((var32.x42 & 0xff) << 8) | (var32.x42 & 0xff);
+    var33.x43 = ((var32.x43 & 0xff) << 8) | (var32.x43 & 0xff);
+    /* 2: storeq */
+    ptr0i = var33;
+  }
+
+}
+
+void
+bayer8to16_orc_reorder (guint8 * ORC_RESTRICT d1,
+    const guint32 * ORC_RESTRICT s1, int n)
+{
+  OrcExecutor _ex, *ex = &_ex;
+  static volatile int p_inited = 0;
+  static OrcCode *c = 0;
+  void (*func) (OrcExecutor *);
+
+  if (!p_inited) {
+    orc_once_mutex_lock ();
+    if (!p_inited) {
+      OrcProgram *p;
+
+#if 1
+      static const orc_uint8 bc = {
+        1, 9, 22, 98, 97, 121, 101, 114, 56, 116, 111, 49, 54, 95, 111, 114,
+        99, 95, 114, 101, 111, 114, 100, 101, 114, 11, 8, 8, 12, 4, 4, 21,
+        2, 151, 0, 4, 2, 0,
+      };
+      p = orc_program_new_from_static_bytecode (bc);
+      orc_program_set_backup_function (p, _backup_bayer8to16_orc_reorder);
+#else
+      p = orc_program_new ();
+      orc_program_set_name (p, "bayer8to16_orc_reorder");
+      orc_program_set_backup_function (p, _backup_bayer8to16_orc_reorder);
+      orc_program_add_destination (p, 8, "d1");
+      orc_program_add_source (p, 4, "s1");
+
+      orc_program_append_2 (p, "splatbw", 2, ORC_VAR_D1, ORC_VAR_S1, ORC_VAR_D1,
+          ORC_VAR_D1);
+#endif
+
+      orc_program_compile (p);
+      c = orc_program_take_code (p);
+      orc_program_free (p);
+    }
+    p_inited = TRUE;
+    orc_once_mutex_unlock ();
+  }
+  ex->arraysORC_VAR_A2 = c;
+  ex->program = 0;
+
+  ex->n = n;
+  ex->arraysORC_VAR_D1 = d1;
+  ex->arraysORC_VAR_S1 = (void *) s1;
+
+  func = c->exec;
+  func (ex);
 }
 #endif

gst-plugins-bad-1.22.7.tar.xz/gst/bayer/gstbayerorc-dist.h -> gst-plugins-bad-1.24.5.tar.xz/gst/bayer/gstbayerorc-dist.h Changed

@@ -1,13 +1,13 @@
 
 /* autogenerated from gstbayerorc.orc */
 
-#ifndef _GSTBAYERORC_H_
-#define _GSTBAYERORC_H_
+#pragma once
 
 #include <glib.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 
@@ -16,47 +16,64 @@
 #define _ORC_INTEGER_TYPEDEFS_
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 #include <stdint.h>
-typedef int8_t orc_int8;
-typedef int16_t orc_int16;
-typedef int32_t orc_int32;
-typedef int64_t orc_int64;
-typedef uint8_t orc_uint8;
-typedef uint16_t orc_uint16;
-typedef uint32_t orc_uint32;
-typedef uint64_t orc_uint64;
+  typedef int8_t orc_int8;
+  typedef int16_t orc_int16;
+  typedef int32_t orc_int32;
+  typedef int64_t orc_int64;
+  typedef uint8_t orc_uint8;
+  typedef uint16_t orc_uint16;
+  typedef uint32_t orc_uint32;
+  typedef uint64_t orc_uint64;
 #define ORC_UINT64_C(x) UINT64_C(x)
 #elif defined(_MSC_VER)
-typedef signed __int8 orc_int8;
-typedef signed __int16 orc_int16;
-typedef signed __int32 orc_int32;
-typedef signed __int64 orc_int64;
-typedef unsigned __int8 orc_uint8;
-typedef unsigned __int16 orc_uint16;
-typedef unsigned __int32 orc_uint32;
-typedef unsigned __int64 orc_uint64;
+  typedef signed __int8 orc_int8;
+  typedef signed __int16 orc_int16;
+  typedef signed __int32 orc_int32;
+  typedef signed __int64 orc_int64;
+  typedef unsigned __int8 orc_uint8;
+  typedef unsigned __int16 orc_uint16;
+  typedef unsigned __int32 orc_uint32;
+  typedef unsigned __int64 orc_uint64;
 #define ORC_UINT64_C(x) (x##Ui64)
 #define inline __inline
 #else
 #include <limits.h>
-typedef signed char orc_int8;
-typedef short orc_int16;
-typedef int orc_int32;
-typedef unsigned char orc_uint8;
-typedef unsigned short orc_uint16;
-typedef unsigned int orc_uint32;
+  typedef signed char orc_int8;
+  typedef short orc_int16;
+  typedef int orc_int32;
+  typedef unsigned char orc_uint8;
+  typedef unsigned short orc_uint16;
+  typedef unsigned int orc_uint32;
 #if INT_MAX == LONG_MAX
-typedef long long orc_int64;
-typedef unsigned long long orc_uint64;
+  typedef long long orc_int64;
+  typedef unsigned long long orc_uint64;
 #define ORC_UINT64_C(x) (x##ULL)
 #else
-typedef long orc_int64;
-typedef unsigned long orc_uint64;
+  typedef long orc_int64;
+  typedef unsigned long orc_uint64;
 #define ORC_UINT64_C(x) (x##UL)
 #endif
 #endif
-typedef union { orc_int16 i; orc_int8 x22; } orc_union16;
-typedef union { orc_int32 i; float f; orc_int16 x22; orc_int8 x44; } orc_union32;
-typedef union { orc_int64 i; double f; orc_int32 x22; float x2f2; orc_int16 x44; } orc_union64;
+  typedef union
+  {
+    orc_int16 i;
+    orc_int8 x22;
+  } orc_union16;
+  typedef union
+  {
+    orc_int32 i;
+    float f;
+    orc_int16 x22;
+    orc_int8 x44;
+  } orc_union32;
+  typedef union
+  {
+    orc_int64 i;
+    double f;
+    orc_int32 x22;
+    float x2f2;
+    orc_int16 x44;
+  } orc_union64;
 #endif
 #ifndef ORC_RESTRICT
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
@@ -80,20 +97,95 @@
 #endif
 #endif
 
-void bayer_orc_horiz_upsample_unaligned (guint8 * ORC_RESTRICT d1, guint8 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1, int n);
-void bayer_orc_horiz_upsample (guint8 * ORC_RESTRICT d1, guint8 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1, int n);
-void bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
-void bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
-void bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
-void bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
-void bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
-void bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
-void bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
-void bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
+  void bayer_orc_horiz_upsample_unaligned (guint8 * ORC_RESTRICT d1,
+      guint8 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1, int n);
+  void bayer_orc_horiz_upsample (guint8 * ORC_RESTRICT d1,
+      guint8 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1, int n);
+  void bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1,
+      const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+      const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+      const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
+  void bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1,
+      const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+      const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+      const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
+  void bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1,
+      const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+      const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+      const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
+  void bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1,
+      const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+      const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+      const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
+  void bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1,
+      const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+      const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+      const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
+  void bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1,
+      const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+      const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+      const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
+  void bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1,
+      const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+      const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+      const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
+  void bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1,
+      const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2,
+      const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4,
+      const guint8 * ORC_RESTRICT s5, const guint8 * ORC_RESTRICT s6, int n);
+  void bayer16_orc_horiz_upsample_le (guint16 * ORC_RESTRICT d1,
+      guint16 * ORC_RESTRICT d2, const guint16 * ORC_RESTRICT s1, int n);
+  void bayer16_orc_horiz_upsample_be (guint16 * ORC_RESTRICT d1,
+      guint16 * ORC_RESTRICT d2, const guint16 * ORC_RESTRICT s1, int n);
+  void bayer16_orc_merge_bg_bgra (guint16 * ORC_RESTRICT d1,
+      guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+      const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+      const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+      const guint8 * ORC_RESTRICT s6, int n);
+  void bayer16_orc_merge_gr_bgra (guint16 * ORC_RESTRICT d1,
+      guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+      const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+      const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+      const guint8 * ORC_RESTRICT s6, int n);
+  void bayer16_orc_merge_bg_abgr (guint16 * ORC_RESTRICT d1,
+      guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+      const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+      const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+      const guint8 * ORC_RESTRICT s6, int n);
+  void bayer16_orc_merge_gr_abgr (guint16 * ORC_RESTRICT d1,
+      guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+      const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+      const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+      const guint8 * ORC_RESTRICT s6, int n);
+  void bayer16_orc_merge_bg_rgba (guint16 * ORC_RESTRICT d1,
+      guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+      const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+      const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+      const guint8 * ORC_RESTRICT s6, int n);
+  void bayer16_orc_merge_gr_rgba (guint16 * ORC_RESTRICT d1,
+      guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+      const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+      const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+      const guint8 * ORC_RESTRICT s6, int n);
+  void bayer16_orc_merge_bg_argb (guint16 * ORC_RESTRICT d1,
+      guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+      const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+      const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+      const guint8 * ORC_RESTRICT s6, int n);
+  void bayer16_orc_merge_gr_argb (guint16 * ORC_RESTRICT d1,
+      guint16 * ORC_RESTRICT d2, const guint8 * ORC_RESTRICT s1,
+      const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3,
+      const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5,
+      const guint8 * ORC_RESTRICT s6, int n);
+  void bayer16to16_orc_reorder (guint8 * ORC_RESTRICT d1,
+      const guint32 * ORC_RESTRICT s1, const guint32 * ORC_RESTRICT s2, int p1,
+      int n);
+  void bayer16to8_orc_reorder (guint8 * ORC_RESTRICT d1,
+      const guint32 * ORC_RESTRICT s1, const guint32 * ORC_RESTRICT s2, int p1,
+      int n);
+  void bayer8to16_orc_reorder (guint8 * ORC_RESTRICT d1,
+      const guint32 * ORC_RESTRICT s1, int n);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif
-

gst-plugins-bad-1.22.7.tar.xz/gst/bayer/gstbayerorc.orc -> gst-plugins-bad-1.24.5.tar.xz/gst/bayer/gstbayerorc.orc Changed

@@ -248,3 +248,283 @@
 x2 mergewl d, ar, gb
 
 
+# 10..16 bit bayer handling
+.function bayer16_orc_horiz_upsample_le
+.dest 4 d0 guint16
+.dest 4 d1 guint16
+.source 4 s guint16
+.temp 4 t
+
+.temp 2 b
+.temp 2 c
+.temp 2 d
+.temp 2 e
+
+splitlw c, b, s
+loadoffl t, s, 1
+splitlw e, d, t
+avguw e, c, e
+mergewl d0, c, e
+avguw b, b, d
+mergewl d1, b, d
+
+.function bayer16_orc_horiz_upsample_be
+.dest 4 d0 guint16
+.dest 4 d1 guint16
+.source 4 s guint16
+.temp 4 t
+
+.temp 2 b
+.temp 2 c
+.temp 2 d
+.temp 2 e
+
+splitlw c, b, s
+swapw b, b
+swapw c, c
+loadoffl t, s, 1
+splitlw e, d, t
+swapw d, d
+swapw e, e
+avguw e, c, e
+mergewl d0, c, e
+avguw b, b, d
+mergewl d1, b, d
+
+.function bayer16_orc_merge_bg_bgra
+.dest 8 d1 guint16
+.dest 8 d2 guint16
+.source 4 g0 guint8
+.source 4 r0 guint8
+.source 4 b1 guint8
+.source 4 g1 guint8
+.source 4 g2 guint8
+.source 4 r2 guint8
+.temp 4 r
+.temp 4 g
+.temp 4 t
+
+
+x2 avguw r, r0, r2
+x2 avguw g, g0, g2
+copyl t, g1
+x2 avguw g, g, t
+andl g, g, 65535
+andl t, t, 4294901760
+orl g, t, g
+x2 mergewl d1, b1, g
+x2 mergewl d2, r, 65535
+
+
+.function bayer16_orc_merge_gr_bgra
+.dest 8 d1 guint16
+.dest 8 d2 guint16
+.source 4 b0 guint8
+.source 4 g0 guint8
+.source 4 g1 guint8
+.source 4 r1 guint8
+.source 4 b2 guint8
+.source 4 g2 guint8
+.temp 4 b
+.temp 4 g
+.temp 4 t
+
+
+x2 avguw b, b0, b2
+x2 avguw g, g0, g2
+copyl t, g1
+x2 avguw g, g, t
+andl g, g, 4294901760
+andl t, t, 65535
+orl g, t, g
+x2 mergewl d1, b, g
+x2 mergewl d2, r1, 65535
+
+
+.function bayer16_orc_merge_bg_abgr
+.dest 8 d1 guint16
+.dest 8 d2 guint16
+.source 4 g0 guint8
+.source 4 r0 guint8
+.source 4 b1 guint8
+.source 4 g1 guint8
+.source 4 g2 guint8
+.source 4 r2 guint8
+.temp 4 r
+.temp 4 g
+.temp 4 t
+
+
+x2 avguw r, r0, r2
+x2 avguw g, g0, g2
+copyl t, g1
+x2 avguw g, g, t
+andl g, g, 65535
+andl t, t, 4294901760
+orl g, t, g
+x2 mergewl d1, 65535, b1
+x2 mergewl d2, g, r
+
+
+.function bayer16_orc_merge_gr_abgr
+.dest 8 d1 guint16
+.dest 8 d2 guint16
+.source 4 b0 guint8
+.source 4 g0 guint8
+.source 4 g1 guint8
+.source 4 r1 guint8
+.source 4 b2 guint8
+.source 4 g2 guint8
+.temp 4 b
+.temp 4 g
+.temp 4 t
+
+
+x2 avguw b, b0, b2
+x2 avguw g, g0, g2
+copyl t, g1
+x2 avguw g, g, t
+andl g, g, 4294901760
+andl t, t, 65535
+orl g, t, g
+x2 mergewl d1, 65535, b
+x2 mergewl d2, g, r1
+
+
+.function bayer16_orc_merge_bg_rgba
+.dest 8 d1 guint16
+.dest 8 d2 guint16
+.source 4 g0 guint8
+.source 4 r0 guint8
+.source 4 b1 guint8
+.source 4 g1 guint8
+.source 4 g2 guint8
+.source 4 r2 guint8
+.temp 4 r
+.temp 4 g
+.temp 4 t
+
+
+x2 avguw r, r0, r2
+x2 avguw g, g0, g2
+copyl t, g1
+x2 avguw g, g, t
+andl g, g, 65535
+andl t, t, 4294901760
+orl g, t, g
+x2 mergewl d1, r, g
+x2 mergewl d2, b1, 65535
+
+
+.function bayer16_orc_merge_gr_rgba
+.dest 8 d1 guint16
+.dest 8 d2 guint16
+.source 4 b0 guint8
+.source 4 g0 guint8
+.source 4 g1 guint8
+.source 4 r1 guint8
+.source 4 b2 guint8
+.source 4 g2 guint8
+.temp 4 b
+.temp 4 g
+.temp 4 t
+
+
+x2 avguw b, b0, b2
+x2 avguw g, g0, g2
+copyl t, g1
+x2 avguw g, g, t
+andl g, g, 4294901760
+andl t, t, 65535
+orl g, t, g
+x2 mergewl d1, r1, g
+x2 mergewl d2, b, 65535
+
+
+.function bayer16_orc_merge_bg_argb
+.dest 8 d1 guint16
+.dest 8 d2 guint16
+.source 4 g0 guint8
+.source 4 r0 guint8
+.source 4 b1 guint8
+.source 4 g1 guint8
+.source 4 g2 guint8
+.source 4 r2 guint8
+.temp 4 r
+.temp 4 g
+.temp 4 t
+
+
+x2 avguw r, r0, r2
+x2 avguw g, g0, g2
+copyl t, g1
+x2 avguw g, g, t
+andl g, g, 65535
+andl t, t, 4294901760
+orl g, t, g
+x2 mergewl d1, 65535, r
+x2 mergewl d2, g, b1
+
+
+.function bayer16_orc_merge_gr_argb
+.dest 8 d1 guint16
+.dest 8 d2 guint16
+.source 4 b0 guint8
+.source 4 g0 guint8
+.source 4 g1 guint8
+.source 4 r1 guint8
+.source 4 b2 guint8
+.source 4 g2 guint8
+.temp 4 b
+.temp 4 g
+.temp 4 t
+
+
+x2 avguw b, b0, b2
+x2 avguw g, g0, g2
+copyl t, g1
+x2 avguw g, g, t
+andl g, g, 4294901760
+andl t, t, 65535
+orl g, t, g
+x2 mergewl d1, 65535, r1
+x2 mergewl d2, g, b
+
+
+.function bayer16to16_orc_reorder
+.dest 8 d guint8
+.source 4 s1 guint32
+.source 4 s2 guint32
+.param 4 shift
+.temp 4 u
+.temp 4 v
+.temp 8 q
+
+x2 muluwl q, s1, 0xffff
+x2 shrul q, q, shift
+x2 convuuslw u, q
+x2 muluwl q, s2, 0xffff
+x2 shrul q, q, shift
+x2 convuuslw v, q
+mergelq d, u, v
+
+.function bayer16to8_orc_reorder
+.dest 4 d guint8
+.source 4 s1 guint32
+.source 4 s2 guint32
+.param 4 shift
+.temp 2 u
+.temp 2 v
+.temp 4 l
+
+x2 shruw l, s1, shift
+x2 convuuswb u, l
+x2 shruw l, s2, shift
+x2 convuuswb v, l
+mergewl d, u, v
+
+.function bayer8to16_orc_reorder
+.dest 8 d guint8
+.source 4 s guint32
+
+x4 splatbw d, s

gst-plugins-bad-1.22.7.tar.xz/gst/bayer/gstrgb2bayer.c -> gst-plugins-bad-1.24.5.tar.xz/gst/bayer/gstrgb2bayer.c Changed

@@ -28,6 +28,8 @@
 #include "gstbayerelements.h"
 #include "gstrgb2bayer.h"
 
+#define DIV_ROUND_UP(s,v) (((s) + ((v)-1)) / (v))
+
 #define GST_CAT_DEFAULT gst_rgb2bayer_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
@@ -64,12 +66,32 @@
     );
 #endif
 
+#define BAYER_CAPS_GEN(mask, bits, endian)	\
+	" "#mask#bits#endian
+
+#define BAYER_CAPS_ORD(bits, endian)		\
+	BAYER_CAPS_GEN(bggr, bits, endian)","	\
+	BAYER_CAPS_GEN(rggb, bits, endian)","	\
+	BAYER_CAPS_GEN(grbg, bits, endian)","	\
+	BAYER_CAPS_GEN(gbrg, bits, endian)
+
+#define BAYER_CAPS_BITS(bits)			\
+	BAYER_CAPS_ORD(bits, le)","		\
+	BAYER_CAPS_ORD(bits, be)
+
+#define BAYER_CAPS_ALL				\
+	BAYER_CAPS_ORD(,)"," 			\
+	BAYER_CAPS_BITS(10)","			\
+	BAYER_CAPS_BITS(12)","			\
+	BAYER_CAPS_BITS(14)","			\
+	BAYER_CAPS_BITS(16)
+
 static GstStaticPadTemplate gst_rgb2bayer_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("video/x-bayer,"
-        "format=(string){bggr,gbrg,grbg,rggb},"
+        "format=(string){" BAYER_CAPS_ALL " },"
         "width=1,MAX,height=1,MAX," "framerate=(fraction)0/1,MAX")
     );
 
@@ -164,6 +186,7 @@
 gst_rgb2bayer_get_unit_size (GstBaseTransform * trans, GstCaps * caps,
     gsize * size)
 {
+  GstRGB2Bayer *rgb2bayer = GST_RGB_2_BAYER (trans);
   GstStructure *structure;
   int width;
   int height;
@@ -176,7 +199,8 @@
     name = gst_structure_get_name (structure);
     /* Our name must be either video/x-bayer video/x-raw */
     if (g_str_equal (name, "video/x-bayer")) {
-      *size = GST_ROUND_UP_4 (width) * height;
+      *size =
+          GST_ROUND_UP_4 (width) * height * DIV_ROUND_UP (rgb2bayer->bpp, 8);
       return TRUE;
     } else {
       /* For output, calculate according to format */
@@ -212,21 +236,53 @@
   gst_structure_get_int (structure, "height", &rgb2bayer->height);
 
   format = gst_structure_get_string (structure, "format");
-  if (g_str_equal (format, "bggr")) {
+  if (g_str_has_prefix (format, "bggr")) {
     rgb2bayer->format = GST_RGB_2_BAYER_FORMAT_BGGR;
-  } else if (g_str_equal (format, "gbrg")) {
+  } else if (g_str_has_prefix (format, "gbrg")) {
     rgb2bayer->format = GST_RGB_2_BAYER_FORMAT_GBRG;
-  } else if (g_str_equal (format, "grbg")) {
+  } else if (g_str_has_prefix (format, "grbg")) {
     rgb2bayer->format = GST_RGB_2_BAYER_FORMAT_GRBG;
-  } else if (g_str_equal (format, "rggb")) {
+  } else if (g_str_has_prefix (format, "rggb")) {
     rgb2bayer->format = GST_RGB_2_BAYER_FORMAT_RGGB;
   } else {
     return FALSE;
   }
 
+  if (strlen (format) == 4) {   /* 8bit bayer */
+    rgb2bayer->bpp = 8;
+  } else if (strlen (format) == 8) {    /* 10/12/14/16 le/be bayer */
+    rgb2bayer->bpp = (gint) g_ascii_strtoull (format + 4, NULL, 10);
+    if (rgb2bayer->bpp & 1)     /* odd rgb2bayer->bpp bayer formats not supported */
+      return FALSE;
+    if (rgb2bayer->bpp < 10 || rgb2bayer->bpp > 16)     /* bayer 10,12,14,16 only */
+      return FALSE;
+
+    if (g_str_has_suffix (format, "le"))
+      rgb2bayer->bigendian = 0;
+    else if (g_str_has_suffix (format, "be"))
+      rgb2bayer->bigendian = 1;
+    else
+      return FALSE;
+  } else
+    return FALSE;
+
   return TRUE;
 }
 
+static guint16
+bayer_scale_and_swap (GstRGB2Bayer * rgb2bayer, guint8 r8)
+{
+  guint16 r16 = (r8 << (rgb2bayer->bpp - 8)) | (r8 >> (16 - rgb2bayer->bpp));
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+  if (rgb2bayer->bigendian)
+    r16 = GUINT16_SWAP_LE_BE (r16);
+#else
+  if (!rgb2bayer->bigendian)
+    r16 = GUINT16_SWAP_LE_BE (r16);
+#endif
+  return r16;
+}
+
 static GstFlowReturn
 gst_rgb2bayer_transform (GstBaseTransform * trans, GstBuffer * inbuf,
     GstBuffer * outbuf)
@@ -239,6 +295,7 @@
   int height = rgb2bayer->height;
   int width = rgb2bayer->width;
   GstVideoFrame frame;
+  int bayer16 = (rgb2bayer->bpp > 8);
 
   if (!gst_video_frame_map (&frame, &rgb2bayer->info, inbuf, GST_MAP_READ))
     goto map_failed;
@@ -251,18 +308,41 @@
   dest = map.data;
   src = GST_VIDEO_FRAME_PLANE_DATA (&frame, 0);
 
-  for (j = 0; j < height; j++) {
-    guint8 *dest_line = dest + GST_ROUND_UP_4 (width) * j;
-    guint8 *src_line = src + frame.info.stride0 * j;
-
-    for (i = 0; i < width; i++) {
-      int is_blue = ((j & 1) << 1) | (i & 1);
-      if (is_blue == rgb2bayer->format) {
-        dest_linei = src_linei * 4 + 3;
-      } else if ((is_blue ^ 3) == rgb2bayer->format) {
-        dest_linei = src_linei * 4 + 1;
-      } else {
-        dest_linei = src_linei * 4 + 2;
+  if (bayer16) {
+    for (j = 0; j < height; j++) {
+      guint16 *dest_line16 = (guint16 *)
+          (dest + GST_ROUND_UP_4 (width) * j * DIV_ROUND_UP (rgb2bayer->bpp,
+              8));
+      guint8 *src_line = src + frame.info.stride0 * j;
+
+      for (i = 0; i < width; i++) {
+        int is_blue = ((j & 1) << 1) | (i & 1);
+        if (is_blue == rgb2bayer->format) {
+          dest_line16i =
+              bayer_scale_and_swap (rgb2bayer, src_linei * 4 + 3);
+        } else if ((is_blue ^ 3) == rgb2bayer->format) {
+          dest_line16i =
+              bayer_scale_and_swap (rgb2bayer, src_linei * 4 + 1);
+        } else {
+          dest_line16i =
+              bayer_scale_and_swap (rgb2bayer, src_linei * 4 + 2);
+        }
+      }
+    }
+  } else {
+    for (j = 0; j < height; j++) {
+      guint8 *dest_line = dest + GST_ROUND_UP_4 (width) * j;
+      guint8 *src_line = src + frame.info.stride0 * j;
+
+      for (i = 0; i < width; i++) {
+        int is_blue = ((j & 1) << 1) | (i & 1);
+        if (is_blue == rgb2bayer->format) {
+          dest_linei = src_linei * 4 + 3;
+        } else if ((is_blue ^ 3) == rgb2bayer->format) {
+          dest_linei = src_linei * 4 + 1;
+        } else {
+          dest_linei = src_linei * 4 + 2;
+        }
       }
     }
   }

gst-plugins-bad-1.22.7.tar.xz/gst/bayer/gstrgb2bayer.h -> gst-plugins-bad-1.24.5.tar.xz/gst/bayer/gstrgb2bayer.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/camerabin2/gstcamerabin2.c -> gst-plugins-bad-1.24.5.tar.xz/gst/camerabin2/gstcamerabin2.c Changed

@@ -1758,17 +1758,36 @@
       goto fail;
     }
 
-    if (!gst_element_link_pads (camera->src, "imgsrc",
-            camera->imagebin_capsfilter, "sink")) {
-      GST_ERROR_OBJECT (camera,
-          "Failed to link camera source's imgsrc pad to image bin capsfilter");
-      goto fail;
+    if (camera->image_filter) {
+      if (!gst_element_link_pads (camera->src, "imgsrc",
+              camera->image_filter, NULL)) {
+        GST_ERROR_OBJECT (camera,
+            "Failed to link camera source's imgsrc pad to image filter");
+        goto fail;
+      }
+    } else {
+      if (!gst_element_link_pads (camera->src, "imgsrc",
+              camera->imagebin_capsfilter, "sink")) {
+        GST_ERROR_OBJECT (camera,
+            "Failed to link camera source's imgsrc pad to image bin capsfilter");
+        goto fail;
+      }
     }
-    if (!gst_element_link_pads (camera->src, "vidsrc",
-            camera->videobin_capsfilter, "sink")) {
-      GST_ERROR_OBJECT (camera,
-          "Failed to link camera source's vidsrc pad to video bin capsfilter");
-      goto fail;
+
+    if (camera->video_filter) {
+      if (!gst_element_link_pads (camera->src, "vidsrc",
+              camera->video_filter, NULL)) {
+        GST_ERROR_OBJECT (camera,
+            "Failed to link camera source's vidsrc pad to video filter");
+        goto fail;
+      }
+    } else {
+      if (!gst_element_link_pads (camera->src, "vidsrc",
+              camera->videobin_capsfilter, "sink")) {
+        GST_ERROR_OBJECT (camera,
+            "Failed to link camera source's vidsrc pad to video bin capsfilter");
+        goto fail;
+      }
     }
 
     gst_pad_add_probe (imgsrc, GST_PAD_PROBE_TYPE_BUFFER,

gst-plugins-bad-1.22.7.tar.xz/gst/codecalpha/gstalphacombine.c -> gst-plugins-bad-1.24.5.tar.xz/gst/codecalpha/gstalphacombine.c Changed

@@ -47,9 +47,9 @@
 #include "gstalphacombine.h"
 
 
-#define SUPPORTED_SINK_FORMATS "{ I420, NV12 }"
-#define SUPPORTED_ALPHA_FORMATS "{ GRAY8, I420, NV12 }"
-#define SUPPORTED_SRC_FORMATS "{ A420, AV12 }"
+#define SUPPORTED_SINK_FORMATS "{ I420, I420_10LE, NV12 }"
+#define SUPPORTED_ALPHA_FORMATS "{ GRAY8, I420, I420_10LE, NV12 }"
+#define SUPPORTED_SRC_FORMATS "{ A420, A420_10LE, AV12 }"
 
 /* *INDENT-OFF* */
 struct {
@@ -81,6 +81,10 @@
     .sink = GST_VIDEO_FORMAT_NV12,
     .alpha = GST_VIDEO_FORMAT_I420,
     .src = GST_VIDEO_FORMAT_AV12
+ },{
+    .sink = GST_VIDEO_FORMAT_I420_10LE,
+    .alpha = GST_VIDEO_FORMAT_I420_10LE,
+    .src = GST_VIDEO_FORMAT_A420_10LE
   },
 };
 /* *INDENT-ON* */
@@ -215,7 +219,7 @@
 
   if (GST_VIDEO_INFO_COLORIMETRY (&self->sink_vinfo).range !=
       GST_VIDEO_INFO_COLORIMETRY (&self->alpha_vinfo).range) {
-    GST_ELEMENT_ERROR (self, STREAM, FORMAT, ("Color range miss-match"),
+    GST_ELEMENT_ERROR (self, STREAM, FORMAT, ("Color range mismatch"),
         ("We can only combine buffers if they have the same color range."));
     return FALSE;
   }
@@ -401,7 +405,7 @@
 
   sink_format = GST_VIDEO_INFO_FORMAT (&self->sink_vinfo);
 
-  /* The sink format determin the src format, though we cannot fully validate
+  /* The sink format determines the src format, though we cannot fully validate
    * the negotiation here, since we don't have the alpha format yet. */
   for (i = 0; i < G_N_ELEMENTS (format_map); i++) {
     if (format_mapi.sink == sink_format) {

gst-plugins-bad-1.22.7.tar.xz/gst/codecalpha/gstalphadecodebin.c -> gst-plugins-bad-1.24.5.tar.xz/gst/codecalpha/gstalphadecodebin.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/codectimestamper/gstcodectimestamper.c -> gst-plugins-bad-1.24.5.tar.xz/gst/codectimestamper/gstcodectimestamper.c Changed

@@ -76,13 +76,16 @@
     GstObject * parent, GstBuffer * buffer);
 static gboolean gst_codec_timestamper_sink_event (GstPad * pad,
     GstObject * parent, GstEvent * event);
+static gboolean gst_codec_timestamper_sink_query (GstPad * pad,
+    GstObject * parent, GstQuery * query);
 static gboolean gst_codec_timestamper_src_query (GstPad * pad,
     GstObject * parent, GstQuery * query);
-static GstStateChangeReturn
-gst_codec_timestamper_change_state (GstElement * element,
-    GstStateChange transition);
-static void
-gst_codec_timestamper_clear_frame (GstCodecTimestamperFrame * frame);
+static GstCaps *gst_timestamper_get_caps (GstCodecTimestamper * self,
+    GstCaps * filter);
+static GstStateChangeReturn gst_codec_timestamper_change_state (GstElement *
+    element, GstStateChange transition);
+static void gst_codec_timestamper_clear_frame (GstCodecTimestamperFrame *
+    frame);
 static void gst_codec_timestamper_reset (GstCodecTimestamper * self);
 static void gst_codec_timestamper_drain (GstCodecTimestamper * self);
 
@@ -142,6 +145,9 @@
   element_class->change_state =
       GST_DEBUG_FUNCPTR (gst_codec_timestamper_change_state);
 
+  /* Default implementation is correct for both H264 and H265 */
+  klass->get_sink_caps = gst_timestamper_get_caps;
+
   GST_DEBUG_CATEGORY_INIT (gst_codec_timestamper_debug, "codectimestamper", 0,
       "codectimestamper");
 
@@ -169,7 +175,13 @@
       GST_DEBUG_FUNCPTR (gst_codec_timestamper_chain));
   gst_pad_set_event_function (self->sinkpad,
       GST_DEBUG_FUNCPTR (gst_codec_timestamper_sink_event));
+  gst_pad_set_query_function (self->sinkpad,
+      GST_DEBUG_FUNCPTR (gst_codec_timestamper_sink_query));
+
   GST_PAD_SET_PROXY_SCHEDULING (self->sinkpad);
+  GST_PAD_SET_ACCEPT_INTERSECT (self->sinkpad);
+  GST_PAD_SET_ACCEPT_TEMPLATE (self->sinkpad);
+
   gst_element_add_pad (GST_ELEMENT (self), self->sinkpad);
 
   template = gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass),
@@ -432,8 +444,11 @@
       if (dts > frame->pts) {
         if (frame->pts >= priv->last_dts)
           dts = frame->pts;
-        else
-          dts = GST_CLOCK_TIME_NONE;
+        else {
+          GST_WARNING_OBJECT (self,
+              "Setting DTS to last DTS to avoid PTS < DTS and backward DTS");
+          dts = priv->last_dts;
+        }
       }
 
       if (GST_CLOCK_TIME_IS_VALID (dts))
@@ -579,6 +594,76 @@
   return gst_codec_timestamper_process_output_frame (self);
 }
 
+static GstCaps *
+gst_timestamper_get_caps (GstCodecTimestamper * self, GstCaps * filter)
+{
+  GstCaps *peercaps, *templ;
+  GstCaps *res, *tmp, *pcopy;
+
+  templ = gst_pad_get_pad_template_caps (self->sinkpad);
+  if (filter) {
+    GstCaps *fcopy = gst_caps_copy (filter);
+
+    peercaps = gst_pad_peer_query_caps (self->srcpad, fcopy);
+    gst_caps_unref (fcopy);
+  } else {
+    peercaps = gst_pad_peer_query_caps (self->srcpad, NULL);
+  }
+
+  pcopy = gst_caps_copy (peercaps);
+
+  res = gst_caps_intersect_full (pcopy, templ, GST_CAPS_INTERSECT_FIRST);
+  gst_caps_unref (pcopy);
+  gst_caps_unref (templ);
+
+  if (filter) {
+    GstCaps *tmp = gst_caps_intersect_full (res, filter,
+        GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (res);
+    res = tmp;
+  }
+
+  /* Try if we can put the downstream caps first */
+  pcopy = gst_caps_copy (peercaps);
+  tmp = gst_caps_intersect_full (pcopy, res, GST_CAPS_INTERSECT_FIRST);
+  gst_caps_unref (pcopy);
+  if (!gst_caps_is_empty (tmp))
+    res = gst_caps_merge (tmp, res);
+  else
+    gst_caps_unref (tmp);
+
+  gst_caps_unref (peercaps);
+  return res;
+}
+
+static gboolean
+gst_codec_timestamper_sink_query (GstPad * pad, GstObject * parent,
+    GstQuery * query)
+{
+  GstCodecTimestamper *self = GST_CODEC_TIMESTAMPER (parent);
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CAPS:{
+      GstCaps *caps, *filter;
+      GstCodecTimestamperClass *klass = GST_CODEC_TIMESTAMPER_GET_CLASS (self);
+
+      gst_query_parse_caps (query, &filter);
+      g_assert (klass->get_sink_caps);
+      caps = klass->get_sink_caps (self, filter);
+      GST_LOG_OBJECT (self, "sink getcaps returning caps %" GST_PTR_FORMAT,
+          caps);
+      gst_query_set_caps_result (query, caps);
+      gst_caps_unref (caps);
+
+      return TRUE;
+    }
+    default:
+      break;
+  }
+
+  return gst_pad_query_default (pad, parent, query);
+}
+
 static gboolean
 gst_codec_timestamper_src_query (GstPad * pad, GstObject * parent,
     GstQuery * query)

gst-plugins-bad-1.22.7.tar.xz/gst/codectimestamper/gstcodectimestamper.h -> gst-plugins-bad-1.24.5.tar.xz/gst/codectimestamper/gstcodectimestamper.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/codectimestamper/gsth264timestamper.c -> gst-plugins-bad-1.24.5.tar.xz/gst/codectimestamper/gsth264timestamper.c Changed

@@ -98,7 +98,7 @@
     gst_h264_timestamper, GST_TYPE_CODEC_TIMESTAMPER);
 
 GST_ELEMENT_REGISTER_DEFINE (h264timestamper, "h264timestamper",
-    GST_RANK_NONE, GST_TYPE_H264_TIMESTAMPER);
+    GST_RANK_MARGINAL, GST_TYPE_H264_TIMESTAMPER);
 
 static void
 gst_h264_timestamper_class_init (GstH264TimestamperClass * klass)
@@ -111,7 +111,7 @@
   gst_element_class_add_static_pad_template (element_class, &srctemplate);
 
   gst_element_class_set_static_metadata (element_class, "H.264 timestamper",
-      "Codec/Video", "Timestamp H.264 streams",
+      "Codec/Video/Timestamper", "Timestamp H.264 streams",
       "Seungha Yang <seungha@centricular.com>");
 
   timestamper_class->start = GST_DEBUG_FUNCPTR (gst_h264_timestamper_start);
@@ -194,33 +194,9 @@
   return TRUE;
 }
 
-typedef enum
-{
-  GST_H264_LEVEL_L1 = 10,
-  GST_H264_LEVEL_L1B = 9,
-  GST_H264_LEVEL_L1_1 = 11,
-  GST_H264_LEVEL_L1_2 = 12,
-  GST_H264_LEVEL_L1_3 = 13,
-  GST_H264_LEVEL_L2_0 = 20,
-  GST_H264_LEVEL_L2_1 = 21,
-  GST_H264_LEVEL_L2_2 = 22,
-  GST_H264_LEVEL_L3 = 30,
-  GST_H264_LEVEL_L3_1 = 31,
-  GST_H264_LEVEL_L3_2 = 32,
-  GST_H264_LEVEL_L4 = 40,
-  GST_H264_LEVEL_L4_1 = 41,
-  GST_H264_LEVEL_L4_2 = 42,
-  GST_H264_LEVEL_L5 = 50,
-  GST_H264_LEVEL_L5_1 = 51,
-  GST_H264_LEVEL_L5_2 = 52,
-  GST_H264_LEVEL_L6 = 60,
-  GST_H264_LEVEL_L6_1 = 61,
-  GST_H264_LEVEL_L6_2 = 62,
-} GstH264DecoderLevel;
-
 typedef struct
 {
-  GstH264DecoderLevel level;
+  GstH264Level level;
 
   guint32 max_mbps;
   guint32 max_fs;
@@ -234,7 +210,7 @@
   {GST_H264_LEVEL_L1_1, 3000, 396, 900, 192},
   {GST_H264_LEVEL_L1_2, 6000, 396, 2376, 384},
   {GST_H264_LEVEL_L1_3, 11800, 396, 2376, 768},
-  {GST_H264_LEVEL_L2_0, 11880, 396, 2376, 2000},
+  {GST_H264_LEVEL_L2, 11880, 396, 2376, 2000},
   {GST_H264_LEVEL_L2_1, 19800, 792, 4752, 4000},
   {GST_H264_LEVEL_L2_2, 20250, 1620, 8100, 4000},
   {GST_H264_LEVEL_L3, 40500, 1620, 8100, 10000},
@@ -252,7 +228,7 @@
 };
 
 static guint
-h264_level_to_max_dpb_mbs (GstH264DecoderLevel level)
+h264_level_to_max_dpb_mbs (GstH264Level level)
 {
   gint i;
   for (i = 0; i < G_N_ELEMENTS (level_limits_map); i++) {
@@ -283,7 +259,7 @@
     level = 9;
   }
 
-  max_dpb_mbs = h264_level_to_max_dpb_mbs ((GstH264DecoderLevel) level);
+  max_dpb_mbs = h264_level_to_max_dpb_mbs ((GstH264Level) level);
   if (sps->vui_parameters_present_flag
       && sps->vui_parameters.bitstream_restriction_flag) {
     max_dpb_frames = MAX (1, sps->vui_parameters.max_dec_frame_buffering);

gst-plugins-bad-1.22.7.tar.xz/gst/codectimestamper/gsth265timestamper.c -> gst-plugins-bad-1.24.5.tar.xz/gst/codectimestamper/gsth265timestamper.c Changed

@@ -98,7 +98,7 @@
     gst_h265_timestamper, GST_TYPE_CODEC_TIMESTAMPER);
 
 GST_ELEMENT_REGISTER_DEFINE (h265timestamper, "h265timestamper",
-    GST_RANK_NONE, GST_TYPE_H265_TIMESTAMPER);
+    GST_RANK_MARGINAL, GST_TYPE_H265_TIMESTAMPER);
 
 static void
 gst_h265_timestamper_class_init (GstH265TimestamperClass * klass)
@@ -111,7 +111,7 @@
   gst_element_class_add_static_pad_template (element_class, &srctemplate);
 
   gst_element_class_set_static_metadata (element_class, "H.265 timestamper",
-      "Codec/Video", "Timestamp H.265 streams",
+      "Codec/Video/Timestamper", "Timestamp H.265 streams",
       "Seungha Yang <seungha@centricular.com>");
 
   timestamper_class->start = GST_DEBUG_FUNCPTR (gst_h265_timestamper_start);
@@ -139,6 +139,7 @@
   const gchar *str;
   gboolean found_format = FALSE;
   const GValue *codec_data_val;
+  gboolean ret = TRUE;
 
   self->packetized = FALSE;
   self->nal_length_size = 4;
@@ -155,70 +156,47 @@
     GstBuffer *codec_data = gst_value_get_buffer (codec_data_val);
     GstH265Parser *parser = self->parser;
     GstMapInfo map;
-    GstH265NalUnit nalu;
     GstH265ParserResult pres;
-    guint num_nal_arrays;
-    guint off;
-    guint num_nals, i, j;
-    guint8 *data;
-    gsize size;
+    GstH265DecoderConfigRecord *config = NULL;
+    guint i, j;
 
     if (!gst_buffer_map (codec_data, &map, GST_MAP_READ)) {
       GST_ERROR_OBJECT (self, "Unable to map codec-data buffer");
       return FALSE;
     }
 
-    data = map.data;
-    size = map.size;
-
-    /* parse the hvcC data */
-    if (size < 23) {
-      GST_WARNING_OBJECT (self, "hvcC too small");
+    pres = gst_h265_parser_parse_decoder_config_record (parser,
+        map.data, map.size, &config);
+    if (pres != GST_H265_PARSER_OK) {
+      GST_WARNING_OBJECT (self, "Failed to parse hvcC data");
+      ret = FALSE;
       goto unmap;
     }
 
-    /* wrong hvcC version */
-    if (data0 != 0 && data0 != 1) {
-      goto unmap;
-    }
-
-    self->nal_length_size = (data21 & 0x03) + 1;
+    self->nal_length_size = config->length_size_minus_one + 1;
     GST_DEBUG_OBJECT (self, "nal length size %u", self->nal_length_size);
 
-    num_nal_arrays = data22;
-    off = 23;
+    for (i = 0; i < config->nalu_array->len; i++) {
+      GstH265DecoderConfigRecordNalUnitArray *array =
+          &g_array_index (config->nalu_array,
+          GstH265DecoderConfigRecordNalUnitArray, i);
 
-    for (i = 0; i < num_nal_arrays; i++) {
-      if (off + 3 >= size) {
-        GST_WARNING_OBJECT (self, "hvcC too small");
-        goto unmap;
-      }
-
-      num_nals = GST_READ_UINT16_BE (data + off + 1);
-      off += 3;
-      for (j = 0; j < num_nals; j++) {
-        pres = gst_h265_parser_identify_nalu_hevc (parser,
-            data, off, size, 2, &nalu);
-
-        if (pres != GST_H265_PARSER_OK) {
-          GST_WARNING_OBJECT (self, "hvcC too small");
-          goto unmap;
-        }
-
-        gst_h265_timestamper_process_nal (self, &nalu);
-
-        off = nalu.offset + nalu.size;
+      for (j = 0; j < array->nalu->len; j++) {
+        GstH265NalUnit *nalu = &g_array_index (array->nalu, GstH265NalUnit, j);
+        gst_h265_timestamper_process_nal (self, nalu);
       }
     }
+
     /* codec_data would mean packetized format */
     if (!found_format)
       self->packetized = TRUE;
 
   unmap:
     gst_buffer_unmap (codec_data, &map);
+    gst_h265_decoder_config_record_free (config);
   }
 
-  return TRUE;
+  return ret;
 }
 
 static void

gst-plugins-bad-1.22.7.tar.xz/gst/debugutils/fpsdisplaysink.c -> gst-plugins-bad-1.24.5.tar.xz/gst/debugutils/fpsdisplaysink.c Changed

@@ -10,7 +10,7 @@
  * This program 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
@@ -360,9 +360,19 @@
     return TRUE;
   }
 
+  if (frames_rendered < self->last_frames_rendered ||
+      frames_dropped < self->last_frames_dropped) {
+    /* avoid negative drop rates on reset */
+    GST_DEBUG_OBJECT (self, "Frame counters have been reset, skipping update");
+    goto update_last_values;
+  }
+
   time_diff = (gdouble) (current_ts - self->last_ts) / GST_SECOND;
   time_elapsed = (gdouble) (current_ts - self->start_ts) / GST_SECOND;
 
+  if (G_UNLIKELY (time_diff <= 0 && time_elapsed <= 0))
+    return TRUE;
+
   rr = (gdouble) (frames_rendered - self->last_frames_rendered) / time_diff;
   dr = (gdouble) (frames_dropped - self->last_frames_dropped) / time_diff;
 
@@ -415,6 +425,7 @@
     g_object_notify_by_pspec ((GObject *) self, pspec_last_message);
   }
 
+update_last_values:
   self->last_frames_rendered = frames_rendered;
   self->last_frames_dropped = frames_dropped;
   self->last_ts = current_ts;
@@ -476,6 +487,22 @@
 static void
 fps_display_sink_stop (GstFPSDisplaySink * self)
 {
+  gchar *fps_message;
+  gdouble time_elapsed, average_fps;
+  time_elapsed = (gdouble) (self->last_ts - self->start_ts) / GST_SECOND;
+
+  if (G_LIKELY (time_elapsed > 0))
+    average_fps = (gdouble) self->frames_rendered / time_elapsed;
+  else
+    average_fps = 0;
+
+  /* print the max and minimum fps values */
+  fps_message =
+      g_strdup_printf ("Max-fps: %0.2f, Min-fps: %0.2f, Average-fps: %0.2f",
+      self->max_fps, self->min_fps, average_fps);
+
+  GST_DEBUG_OBJECT (self, "%s", fps_message);
+
   if (self->text_overlay) {
     gst_element_unlink (self->text_overlay, self->video_sink);
     gst_bin_remove (GST_BIN (self), self->text_overlay);
@@ -484,17 +511,13 @@
   }
 
   if (!self->silent) {
-    gchar *str;
-
-    /* print the max and minimum fps values */
-    str =
-        g_strdup_printf ("Max-fps: %0.2f, Min-fps: %0.2f", self->max_fps,
-        self->min_fps);
     GST_OBJECT_LOCK (self);
     g_free (self->last_message);
-    self->last_message = str;
+    self->last_message = fps_message;
     GST_OBJECT_UNLOCK (self);
     g_object_notify_by_pspec ((GObject *) self, pspec_last_message);
+  } else {
+    g_free (fps_message);
   }
 
   GST_OBJECT_LOCK (self);

gst-plugins-bad-1.22.7.tar.xz/gst/debugutils/fpsdisplaysink.h -> gst-plugins-bad-1.24.5.tar.xz/gst/debugutils/fpsdisplaysink.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/debugutils/gstfakeaudiosink.c -> gst-plugins-bad-1.24.5.tar.xz/gst/debugutils/gstfakeaudiosink.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/debugutils/gstfakevideosink.c -> gst-plugins-bad-1.24.5.tar.xz/gst/debugutils/gstfakevideosink.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/dvbsubenc/gstdvbsubenc-util.c -> gst-plugins-bad-1.24.5.tar.xz/gst/dvbsubenc/gstdvbsubenc-util.c Changed

@@ -551,7 +551,7 @@
 dvbenc_write_object_data (GstByteWriter * b, int object_version, int page_id,
     int object_id, SubpictureRect * s)
 {
-  guint seg_size_pos, end_pos;
+  guint seg_size_pos, end_pos, bottom_end_pos;
   guint pixel_fields_size_pos, top_start_pos, bottom_start_pos;
   EncodeRLEFunc encode_rle_func;
   const gint stride = GST_VIDEO_INFO_PLANE_STRIDE (&s->frame->info, 0);
@@ -588,13 +588,15 @@
   if (h > 1)
     encode_rle_func (b, pixels + stride, stride * 2, w, h >> 1);
 
-  end_pos = gst_byte_writer_get_pos (b);
+  bottom_end_pos = gst_byte_writer_get_pos (b);
 
   /* If the encoded size of the top+bottom field data blocks is even,
    * add a stuffing byte */
-  if (((end_pos - top_start_pos) & 1) == 0) {
+  if (((bottom_end_pos - top_start_pos) & 1) == 0) {
     gst_byte_writer_put_uint8 (b, 0);
     end_pos = gst_byte_writer_get_pos (b);
+  } else {
+    end_pos = bottom_end_pos;
   }
 
   /* Re-write the size fields */
@@ -605,12 +607,12 @@
 
   if (bottom_start_pos - top_start_pos > G_MAXUINT16)
     return FALSE;               /* Data too big */
-  if (end_pos - bottom_start_pos > G_MAXUINT16)
+  if (bottom_end_pos - bottom_start_pos > G_MAXUINT16)
     return FALSE;               /* Data too big */
 
   gst_byte_writer_set_pos (b, pixel_fields_size_pos);
   gst_byte_writer_put_uint16_be (b, bottom_start_pos - top_start_pos);
-  gst_byte_writer_put_uint16_be (b, end_pos - bottom_start_pos);
+  gst_byte_writer_put_uint16_be (b, bottom_end_pos - bottom_start_pos);
   gst_byte_writer_set_pos (b, end_pos);
 
   GST_LOG ("Object seg size %u top_size %u bottom_size %u",

gst-plugins-bad-1.22.7.tar.xz/gst/dvbsubenc/gstdvbsubenc.c -> gst-plugins-bad-1.24.5.tar.xz/gst/dvbsubenc/gstdvbsubenc.c Changed

@@ -309,14 +309,14 @@
     y++;
   }
 
-  /* By mapping the video frame no ref, it takes ownership of the buffer and it will be released
-   * on unmap (if the map call succeeds) */
+  /* Remap the video frame as read-only, and then drop our ref to the
+   * underlying buffer so the video frame holds the only remaining ref */
   gst_video_frame_unmap (out);
-  if (!gst_video_frame_map (out, &cropped_info, cropped_buffer,
-          GST_MAP_READ | GST_VIDEO_FRAME_MAP_FLAG_NO_REF)) {
+  if (!gst_video_frame_map (out, &cropped_info, cropped_buffer, GST_MAP_READ)) {
     gst_buffer_unref (cropped_buffer);
     return FALSE;
   }
+  gst_buffer_unref (cropped_buffer);
   return TRUE;
 }
 
@@ -338,6 +338,10 @@
   find_largest_subregion (pixels, stride, pixel_stride, enc->in_info.width,
       enc->in_info.height, &left, &right, &top, &bottom);
 
+  /* Don't crash if subtitle is empty */
+  if (right < left || bottom < top)
+    goto skip;
+
   GST_LOG_OBJECT (enc, "Found subregion %u,%u -> %u,%u w %u, %u", left, top,
       right, bottom, right - left + 1, bottom - top + 1);
 
@@ -354,14 +358,15 @@
   ayuv8p_buffer =
       gst_buffer_new_allocate (NULL, GST_VIDEO_INFO_SIZE (&ayuv8p_info), NULL);
 
-  /* Mapped without extra ref - the frame now owns the only ref */
+  /* Pass buffer ref to the frame, and remove the ref that we have - now frame owns the only ref */
   if (!gst_video_frame_map (&ayuv8p_frame, &ayuv8p_info, ayuv8p_buffer,
-          GST_MAP_WRITE | GST_VIDEO_FRAME_MAP_FLAG_NO_REF)) {
+          GST_MAP_WRITE)) {
     GST_WARNING_OBJECT (enc, "Failed to map frame conversion output buffer");
     gst_video_frame_unmap (&cropped_frame);
     gst_buffer_unref (ayuv8p_buffer);
     goto fail;
   }
+  gst_buffer_unref (ayuv8p_buffer);
 
   if (!gst_dvbsubenc_ayuv_to_ayuv8p (&cropped_frame, &ayuv8p_frame,
           enc->max_colours, &num_colours)) {

gst-plugins-bad-1.22.7.tar.xz/gst/dvbsubenc/libimagequant/libimagequant.c -> gst-plugins-bad-1.24.5.tar.xz/gst/dvbsubenc/libimagequant/libimagequant.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/dvbsubenc/libimagequant/mempool.c -> gst-plugins-bad-1.24.5.tar.xz/gst/dvbsubenc/libimagequant/mempool.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/dvbsubenc/libimagequant/pam.c -> gst-plugins-bad-1.24.5.tar.xz/gst/dvbsubenc/libimagequant/pam.c Changed

@@ -104,7 +104,8 @@
           // the array was allocated with spare items
           if (i < achl->capacity) {
             other_itemsi = (struct acolorhist_arr_item) {
-            .color = px,.perceptual_weight = boost,};
+              .color = px,.perceptual_weight = boost,
+            };
             achl->used++;
             ++colors;
             continue;
@@ -155,7 +156,8 @@
           achl->other_items = new_items;
           achl->capacity = capacity;
           new_itemsi = (struct acolorhist_arr_item) {
-          .color = px,.perceptual_weight = boost,};
+            .color = px,.perceptual_weight = boost,
+          };
           achl->used++;
         } else {
           // these are elses for first checks whether first and second inline-stored colors are used
@@ -204,8 +206,9 @@
   if (!t)
     return NULL;
   *t = (struct acolorhash_table) {
-  .mempool = m,.hash_size = hash_size,.maxcolors = maxcolors,.ignorebits =
-        ignorebits,};
+    .mempool = m,.hash_size = hash_size,.maxcolors = maxcolors,.ignorebits =
+        ignorebits,
+  };
   memset (t->buckets, 0, hash_size * sizeof (struct acolorhist_arr_head));
   return t;
 }
@@ -217,7 +220,7 @@
 }
 
 LIQ_PRIVATE histogram *
-pam_acolorhashtoacolorhist (const struct acolorhash_table * acht,
+pam_acolorhashtoacolorhist (const struct acolorhash_table *acht,
     const double gamma, void *(*malloc) (size_t), void (*free) (void *))
 {
   histogram *hist = malloc (sizeof (hist0));

gst-plugins-bad-1.22.7.tar.xz/gst/dvbsuboverlay/dvb-sub.c -> gst-plugins-bad-1.24.5.tar.xz/gst/dvbsuboverlay/dvb-sub.c Changed

@@ -256,14 +256,26 @@
 
           *obj2_ptr = obj2->next;
 
-          g_slice_free (DVBSubObject, obj2);
+          g_free (obj2);
         }
       }
     }
 
     region->display_list = display->region_list_next;
 
-    g_slice_free (DVBSubObjectDisplay, display);
+    g_free (display);
+  }
+}
+
+static void
+dvb_sub_free_clut_list (DVBSubCLUT * list)
+{
+  DVBSubCLUT *next;
+
+  while (list != NULL) {
+    next = list->next;
+    g_free (list);
+    list = next;
   }
 }
 
@@ -280,10 +292,10 @@
     delete_region_display_list (dvb_sub, region);
     g_free (region->pbuf);
 
-    g_slice_free (DVBSubRegion, region);
+    g_free (region);
   }
 
-  g_slice_free_chain (DVBSubCLUT, dvb_sub->clut_list, next);
+  dvb_sub_free_clut_list (dvb_sub->clut_list);
   dvb_sub->clut_list = NULL;
 
   /* Should already be NULL */
@@ -410,7 +422,7 @@
     }
 
     if (!display)
-      display = g_slice_new0 (DVBSubRegionDisplay);
+      display = g_new0 (DVBSubRegionDisplay, 1);
 
     display->region_id = region_id;
 
@@ -434,7 +446,7 @@
 
     tmp_display_list = display->next;
 
-    g_slice_free (DVBSubRegionDisplay, display);
+    g_free (display);
   }
 }
 
@@ -458,7 +470,7 @@
   region = get_region (dvb_sub, region_id);
 
   if (!region) {                /* Create a new region */
-    region = g_slice_new0 (DVBSubRegion);
+    region = g_new0 (DVBSubRegion, 1);
     region->id = region_id;
     region->next = dvb_sub->region_list;
     dvb_sub->region_list = region;
@@ -476,7 +488,7 @@
 
     region->buf_size = region->width * region->height;
 
-    region->pbuf = g_malloc (region->buf_size); /* TODO: We can probably use GSlice here if careful about freeing while buf_size still records the correct size */
+    region->pbuf = g_malloc (region->buf_size);
 
     fill = 1;                   /* FIXME: Validate from spec that fill is forced on (in the following codes context) when dimensions change */
   }
@@ -519,7 +531,7 @@
     object = get_object (dvb_sub, object_id);
 
     if (!object) {
-      object = g_slice_new0 (DVBSubObject);
+      object = g_new0 (DVBSubObject, 1);
 
       object->id = object_id;
 
@@ -529,7 +541,7 @@
 
     object->type = (*buf) >> 6;
 
-    object_display = g_slice_new0 (DVBSubObjectDisplay);
+    object_display = g_new0 (DVBSubObjectDisplay, 1);
 
     object_display->object_id = object_id;
     object_display->region_id = region_id;
@@ -579,7 +591,7 @@
   clut = get_clut (dvb_sub, clut_id);
 
   if (!clut) {
-    clut = g_slice_new (DVBSubCLUT);
+    clut = g_new (DVBSubCLUT, 1);
 
     memcpy (clut, &default_clut, sizeof (DVBSubCLUT));
 
@@ -1194,7 +1206,7 @@
 
   GST_DEBUG ("DISPLAY SET END: page_id = %u", page_id);
 
-  sub = g_slice_new0 (DVBSubtitles);
+  sub = g_new0 (DVBSubtitles, 1);
 
 #if 0                           /* FIXME: PTS stuff not figured out yet */
   sub->start_display_time = 0;
@@ -1254,14 +1266,14 @@
 
     /* FIXME: Tweak this to be saved in a format most suitable for Qt and GStreamer instead.
      * Currently kept in AVPicture for quick save_display_set testing */
-    rect->pict.palette = g_malloc ((1 << region->depth) * sizeof (guint32));    /* FIXME: Can we use GSlice here? */
+    rect->pict.palette = g_new (guint32, (1 << region->depth));
     memcpy (rect->pict.palette, clut_table,
         (1 << region->depth) * sizeof (guint32));
 
     GST_MEMDUMP ("rect->pict.data.palette content",
         (guint8 *) rect->pict.palette, (1 << region->depth) * sizeof (guint32));
 
-    rect->pict.data = g_malloc (region->buf_size);      /* FIXME: Can we use GSlice here? */
+    rect->pict.data = g_malloc (region->buf_size);
     memcpy (rect->pict.data, region->pbuf, region->buf_size);
 
     GST_DEBUG ("DISPLAY: an object rect created: iteration %u, "
@@ -1301,7 +1313,7 @@
     g_free (sub->rectsi.pict.data);
   }
   g_free (sub->rects);
-  g_slice_free (DVBSubtitles, sub);
+  g_free (sub);
 }
 
 DvbSub *
@@ -1315,7 +1327,7 @@
     g_once_init_leave (&inited, TRUE);
   }
 
-  sub = g_slice_new0 (DvbSub);
+  sub = g_new0 (DvbSub, 1);
 
   /* TODO: Add initialization code here */
   /* FIXME: Do we have a reason to initiate the members to zero, or are we guaranteed that anyway? */
@@ -1341,11 +1353,11 @@
   delete_state (sub);
   while (sub->display_list) {
     DVBSubRegionDisplay *tmp = sub->display_list->next;
-    g_slice_free (DVBSubRegionDisplay, sub->display_list);
+    g_free (sub->display_list);
     sub->display_list = tmp;
   }
   g_string_free (sub->pes_buffer, TRUE);
-  g_slice_free (DvbSub, sub);
+  g_free (sub);
 }
 
 #define DVB_SUB_SEGMENT_PAGE_COMPOSITION 0x10

gst-plugins-bad-1.22.7.tar.xz/gst/dvbsuboverlay/gstdvbsuboverlay.c -> gst-plugins-bad-1.24.5.tar.xz/gst/dvbsuboverlay/gstdvbsuboverlay.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/dvdspu/gstdvdspu.c -> gst-plugins-bad-1.24.5.tar.xz/gst/dvdspu/gstdvdspu.c Changed

@@ -34,6 +34,9 @@
 
 #include <glib/gi18n-lib.h>
 #include <gst/video/video.h>
+#include <gst/video/video-overlay-composition.h>
+#include <gst/video/gstvideometa.h>
+#include <gst/video/gstvideosink.h>
 
 #include <string.h>
 
@@ -53,19 +56,25 @@
   LAST_SIGNAL
 };
 
+#define VIDEO_FORMATS GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS
+
+#define DVDSPU_CAPS GST_VIDEO_CAPS_MAKE (VIDEO_FORMATS)
+#define DVDSPU_ALL_CAPS DVDSPU_CAPS ";" \
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("ANY", GST_VIDEO_FORMATS_ANY)
+
+static GstStaticCaps sw_template_caps = GST_STATIC_CAPS (DVDSPU_CAPS);
+
 static GstStaticPadTemplate video_sink_factory =
 GST_STATIC_PAD_TEMPLATE ("video",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-raw, " "format = (string) { I420, NV12, YV12 }, "
-        "width = (int)  16, 4096 , " "height = (int)  16, 4096 ")
+    GST_STATIC_CAPS (DVDSPU_ALL_CAPS)
     );
 
 static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-raw, " "format = (string) { I420, NV12, YV12 }, "
-        "width = (int)  16, 4096 , " "height = (int)  16, 4096 ")
+    GST_STATIC_CAPS (DVDSPU_ALL_CAPS)
     );
 
 static GstStaticPadTemplate subpic_sink_factory =
@@ -90,8 +99,10 @@
     GstEvent * event);
 static gboolean gst_dvd_spu_src_query (GstPad * pad, GstObject * parent,
     GstQuery * query);
+static GstCaps *gst_dvd_spu_src_get_caps (GstDVDSpu * dvdspu, GstPad * pad,
+    GstCaps * filter);
 
-static GstCaps *gst_dvd_spu_video_proxy_getcaps (GstPad * pad,
+static GstCaps *gst_dvd_spu_video_get_caps (GstDVDSpu * dvdspu, GstPad * pad,
     GstCaps * filter);
 static gboolean gst_dvd_spu_video_set_caps (GstDVDSpu * dvdspu, GstPad * pad,
     GstCaps * caps);
@@ -110,6 +121,7 @@
     GstEvent * event);
 static gboolean gst_dvd_spu_subpic_set_caps (GstDVDSpu * dvdspu, GstPad * pad,
     GstCaps * caps);
+static gboolean gst_dvd_spu_negotiate (GstDVDSpu * dvdspu, GstCaps * caps);
 
 static void gst_dvd_spu_clear (GstDVDSpu * dvdspu);
 static void gst_dvd_spu_flush_spu_info (GstDVDSpu * dvdspu,
@@ -178,6 +190,15 @@
 }
 
 static void
+gst_dvd_spu_reset_composition (GstDVDSpu * dvdspu)
+{
+  if (dvdspu->composition) {
+    gst_video_overlay_composition_unref (dvdspu->composition);
+    dvdspu->composition = NULL;
+  }
+}
+
+static void
 gst_dvd_spu_clear (GstDVDSpu * dvdspu)
 {
   gst_dvd_spu_flush_spu_info (dvdspu, FALSE);
@@ -211,14 +232,7 @@
 gst_dvd_spu_finalize (GObject * object)
 {
   GstDVDSpu *dvdspu = GST_DVD_SPU (object);
-  gint i;
 
-  for (i = 0; i < 3; i++) {
-    if (dvdspu->spu_state.comp_bufsi != NULL) {
-      g_free (dvdspu->spu_state.comp_bufsi);
-      dvdspu->spu_state.comp_bufsi = NULL;
-    }
-  }
   g_queue_free (dvdspu->pending_spus);
   g_mutex_clear (&dvdspu->spu_lock);
 
@@ -274,6 +288,8 @@
     default:
       break;
   }
+
+  gst_dvd_spu_reset_composition (dvdspu);
 }
 
 static gboolean
@@ -296,6 +312,7 @@
 static gboolean
 gst_dvd_spu_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
 {
+  GstDVDSpu *dvdspu = GST_DVD_SPU (parent);
   gboolean res = FALSE;
 
   switch (GST_QUERY_TYPE (query)) {
@@ -304,7 +321,7 @@
       GstCaps *filter, *caps;
 
       gst_query_parse_caps (query, &filter);
-      caps = gst_dvd_spu_video_proxy_getcaps (pad, filter);
+      caps = gst_dvd_spu_src_get_caps (dvdspu, pad, filter);
       gst_query_set_caps_result (query, caps);
       gst_caps_unref (caps);
       res = TRUE;
@@ -319,57 +336,238 @@
 }
 
 static gboolean
+gst_dvd_spu_can_handle_caps (GstCaps * caps)
+{
+  GstCaps *sw_caps;
+  gboolean ret;
+
+  sw_caps = gst_static_caps_get (&sw_template_caps);
+  ret = gst_caps_is_subset (caps, sw_caps);
+  gst_caps_unref (sw_caps);
+
+  return ret;
+}
+
+static gboolean
 gst_dvd_spu_video_set_caps (GstDVDSpu * dvdspu, GstPad * pad, GstCaps * caps)
 {
-  gboolean res = FALSE;
   GstVideoInfo info;
-  gint i;
-  SpuState *state;
+  gboolean ret = FALSE;
 
   if (!gst_video_info_from_caps (&info, caps))
-    goto done;
+    goto invalid_caps;
 
-  DVD_SPU_LOCK (dvdspu);
+  dvdspu->spu_state.info = info;
 
-  state = &dvdspu->spu_state;
+  ret = gst_dvd_spu_negotiate (dvdspu, caps);
 
-  state->info = info;
-  for (i = 0; i < 3; i++) {
-    state->comp_bufsi = g_realloc (state->comp_bufsi,
-        sizeof (guint32) * info.width);
+  DVD_SPU_LOCK (dvdspu);
+  if (!dvdspu->attach_compo_to_buffer && !gst_dvd_spu_can_handle_caps (caps)) {
+    GST_DEBUG_OBJECT (dvdspu, "unsupported caps %" GST_PTR_FORMAT, caps);
+    ret = FALSE;
   }
+
   DVD_SPU_UNLOCK (dvdspu);
 
-  res = TRUE;
-done:
-  return res;
+  return ret;
+
+  /* ERRORS */
+invalid_caps:
+  {
+    GST_DEBUG_OBJECT (dvdspu, "could not parse caps");
+    return FALSE;
+  }
 }
 
+
+/**
+ * gst_dvd_spu_add_feature_and_intersect:
+ *
+ * Creates a new #GstCaps containing the (given caps +
+ * given caps feature) + (given caps intersected by the
+ * given filter).
+ *
+ * Returns: the new #GstCaps
+ */
 static GstCaps *
-gst_dvd_spu_video_proxy_getcaps (GstPad * pad, GstCaps * filter)
+gst_dvd_spu_add_feature_and_intersect (GstCaps * caps,
+    const gchar * feature, GstCaps * filter)
 {
-  GstDVDSpu *dvdspu = GST_DVD_SPU (gst_pad_get_parent (pad));
-  GstCaps *caps;
-  GstPad *otherpad;
+  int i, caps_size;
+  GstCaps *new_caps;
 
-  /* Proxy the getcaps between videosink and the srcpad, ignoring the 
-   * subpicture sink pad */
-  otherpad = (pad == dvdspu->srcpad) ? dvdspu->videosinkpad : dvdspu->srcpad;
+  new_caps = gst_caps_copy (caps);
 
-  caps = gst_pad_peer_query_caps (otherpad, filter);
-  if (caps) {
-    GstCaps *temp, *templ;
+  caps_size = gst_caps_get_size (new_caps);
+  for (i = 0; i < caps_size; i++) {
+    GstCapsFeatures *features = gst_caps_get_features (new_caps, i);
+    if (!gst_caps_features_is_any (features)) {
+      gst_caps_features_add (features, feature);
+    }
+  }
+
+  gst_caps_append (new_caps, gst_caps_intersect_full (caps,
+          filter, GST_CAPS_INTERSECT_FIRST));
+
+  return new_caps;
+}
 
-    templ = gst_pad_get_pad_template_caps (otherpad);
-    temp = gst_caps_intersect (caps, templ);
-    gst_caps_unref (templ);
+/**
+ * gst_dvd_spu_intersect_by_feature:
+ *
+ * Creates a new #GstCaps based on the following filtering rule.
+ *
+ * For each individual caps contained in given caps, if the
+ * caps uses the given caps feature, keep a version of the caps
+ * with the feature and an another one without. Otherwise, intersect
+ * the caps with the given filter.
+ *
+ * Returns: the new #GstCaps
+ */
+static GstCaps *
+gst_dvd_spu_intersect_by_feature (GstCaps * caps,
+    const gchar * feature, GstCaps * filter)
+{
+  int i, caps_size;
+  GstCaps *new_caps;
+
+  new_caps = gst_caps_new_empty ();
+
+  caps_size = gst_caps_get_size (caps);
+  for (i = 0; i < caps_size; i++) {
+    GstStructure *caps_structure = gst_caps_get_structure (caps, i);
+    GstCapsFeatures *caps_features =
+        gst_caps_features_copy (gst_caps_get_features (caps, i));
+    GstCaps *filtered_caps;
+    GstCaps *simple_caps =
+        gst_caps_new_full (gst_structure_copy (caps_structure), NULL);
+    gst_caps_set_features (simple_caps, 0, caps_features);
+
+    if (gst_caps_features_contains (caps_features, feature)) {
+      gst_caps_append (new_caps, gst_caps_copy (simple_caps));
+
+      gst_caps_features_remove (caps_features, feature);
+      filtered_caps = gst_caps_ref (simple_caps);
+    } else {
+      filtered_caps = gst_caps_intersect_full (simple_caps, filter,
+          GST_CAPS_INTERSECT_FIRST);
+    }
+
+    gst_caps_unref (simple_caps);
+    gst_caps_append (new_caps, filtered_caps);
+  }
+
+  return new_caps;
+}
+
+static GstCaps *
+gst_dvd_spu_video_get_caps (GstDVDSpu * dvdspu, GstPad * pad, GstCaps * filter)
+{
+  GstPad *srcpad = dvdspu->srcpad;
+  GstCaps *peer_caps = NULL, *caps = NULL, *dvdspu_filter = NULL;
+
+  if (filter) {
+    /* filter caps + composition feature + filter caps
+     * filtered by the software caps. */
+    GstCaps *sw_caps = gst_static_caps_get (&sw_template_caps);
+    dvdspu_filter = gst_dvd_spu_add_feature_and_intersect (filter,
+        GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION, sw_caps);
+    gst_caps_unref (sw_caps);
+
+    GST_DEBUG_OBJECT (dvdspu, "dvdspu filter %" GST_PTR_FORMAT, dvdspu_filter);
+  }
+
+  peer_caps = gst_pad_peer_query_caps (srcpad, dvdspu_filter);
+
+  if (dvdspu_filter)
+    gst_caps_unref (dvdspu_filter);
+
+  if (peer_caps) {
+    GST_DEBUG_OBJECT (pad, "peer caps %" GST_PTR_FORMAT, peer_caps);
+
+    if (gst_caps_is_any (peer_caps)) {
+      /* if peer returns ANY caps, return filtered src pad template caps */
+      caps = gst_caps_copy (gst_pad_get_pad_template_caps (srcpad));
+    } else {
+      /* duplicate caps which contains the composition into one version with
+       * the meta and one without. Filter the other caps by the software caps */
+      GstCaps *sw_caps = gst_static_caps_get (&sw_template_caps);
+      caps = gst_dvd_spu_intersect_by_feature (peer_caps,
+          GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION, sw_caps);
+      gst_caps_unref (sw_caps);
+    }
+
+    gst_caps_unref (peer_caps);
+
+  } else {
+    /* no peer, our padtemplate is enough then */
+    caps = gst_pad_get_pad_template_caps (pad);
+  }
+
+  if (filter) {
+    GstCaps *intersection = gst_caps_intersect_full (filter, caps,
+        GST_CAPS_INTERSECT_FIRST);
     gst_caps_unref (caps);
-    caps = temp;
+    caps = intersection;
+  }
+
+  GST_DEBUG_OBJECT (dvdspu, "returning %" GST_PTR_FORMAT, caps);
+
+  return caps;
+}
+
+static GstCaps *
+gst_dvd_spu_src_get_caps (GstDVDSpu * dvdspu, GstPad * pad, GstCaps * filter)
+{
+  GstPad *sinkpad = dvdspu->videosinkpad;
+  GstCaps *peer_caps = NULL, *caps = NULL, *dvdspu_filter = NULL;
+
+  if (filter) {
+    /* duplicate filter caps which contains the composition into one version
+     * with the meta and one without. Filter the other caps by the software
+     * caps */
+    GstCaps *sw_caps = gst_static_caps_get (&sw_template_caps);
+    dvdspu_filter = gst_dvd_spu_intersect_by_feature (filter,
+        GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION, sw_caps);
+    gst_caps_unref (sw_caps);
+  }
+
+  peer_caps = gst_pad_peer_query_caps (sinkpad, dvdspu_filter);
+
+  if (dvdspu_filter)
+    gst_caps_unref (dvdspu_filter);
+
+  if (peer_caps) {
+    GST_DEBUG_OBJECT (pad, "peer caps %" GST_PTR_FORMAT, peer_caps);
+
+    if (gst_caps_is_any (peer_caps)) {
+      /* if peer returns ANY caps, return filtered sink pad template caps */
+      caps = gst_caps_copy (gst_pad_get_pad_template_caps (sinkpad));
+    } else {
+      /* return upstream caps + composition feature + upstream caps
+       * filtered by the software caps. */
+      GstCaps *sw_caps = gst_static_caps_get (&sw_template_caps);
+      caps = gst_dvd_spu_add_feature_and_intersect (peer_caps,
+          GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION, sw_caps);
+      gst_caps_unref (sw_caps);
+    }
+
+    gst_caps_unref (peer_caps);
+
   } else {
+    /* no peer, our padtemplate is enough then */
     caps = gst_pad_get_pad_template_caps (pad);
   }
 
-  gst_object_unref (dvdspu);
+  if (filter) {
+    GstCaps *intersection = gst_caps_intersect_full (filter, caps,
+        GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (caps);
+    caps = intersection;
+  }
+
+  GST_DEBUG_OBJECT (dvdspu, "returning %" GST_PTR_FORMAT, caps);
+
   return caps;
 }
 
@@ -498,12 +696,16 @@
       break;
     }
     case GST_EVENT_FLUSH_START:
+      DVD_SPU_LOCK (dvdspu);
+      dvdspu->video_flushing = TRUE;
+      DVD_SPU_UNLOCK (dvdspu);
       res = gst_pad_event_default (pad, parent, event);
       goto done;
     case GST_EVENT_FLUSH_STOP:
       res = gst_pad_event_default (pad, parent, event);
 
       DVD_SPU_LOCK (dvdspu);
+      dvdspu->video_flushing = FALSE;
       gst_segment_init (&dvdspu->video_seg, GST_FORMAT_UNDEFINED);
       gst_buffer_replace (&dvdspu->ref_frame, NULL);
       gst_buffer_replace (&dvdspu->pending_frame, NULL);
@@ -527,6 +729,7 @@
 static gboolean
 gst_dvd_spu_video_query (GstPad * pad, GstObject * parent, GstQuery * query)
 {
+  GstDVDSpu *dvdspu = GST_DVD_SPU (parent);
   gboolean res = FALSE;
 
   switch (GST_QUERY_TYPE (query)) {
@@ -535,7 +738,7 @@
       GstCaps *filter, *caps;
 
       gst_query_parse_caps (query, &filter);
-      caps = gst_dvd_spu_video_proxy_getcaps (pad, filter);
+      caps = gst_dvd_spu_video_get_caps (dvdspu, pad, filter);
       gst_query_set_caps_result (query, caps);
       gst_caps_unref (caps);
       res = TRUE;
@@ -557,6 +760,9 @@
 
   g_return_val_if_fail (dvdspu != NULL, GST_FLOW_ERROR);
 
+  if (gst_pad_check_reconfigure (dvdspu->srcpad))
+    gst_dvd_spu_negotiate (dvdspu, NULL);
+
   GST_LOG_OBJECT (dvdspu, "video buffer %p with TS %" GST_TIME_FORMAT,
       buf, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
 
@@ -662,14 +868,131 @@
 }
 
 
-static void
-gstspu_render (GstDVDSpu * dvdspu, GstBuffer * buf)
+/*
+ * Transform the overlay composition rectangle to fit completely in the video.
+ * This is needed to work with ripped videos, which might be cropped and scaled
+ * compared to the original (for example to remove black borders). The same
+ * transformations were probably not applied to the SPU data, so we need to fit
+ * the rendered SPU to the video.
+ */
+static gboolean
+gstspu_fit_overlay_rectangle (GstDVDSpu * dvdspu, GstVideoRectangle * rect,
+    gint spu_width, gint spu_height, gboolean keep_aspect)
 {
+  gint video_width = GST_VIDEO_INFO_WIDTH (&dvdspu->spu_state.info);
+  gint video_height = GST_VIDEO_INFO_HEIGHT (&dvdspu->spu_state.info);
+  GstVideoRectangle r;
+
+  r = *rect;
+
+  /*
+   * Compute scale first, so that the SPU window size matches the video size.
+   * If @keep_aspect is %TRUE, the overlay rectangle aspect is kept and
+   * centered around the video.
+   */
+  if (spu_width != video_width || spu_height != video_height) {
+    gdouble hscale, vscale;
+
+    hscale = (gdouble) video_width / (gdouble) spu_width;
+    vscale = (gdouble) video_height / (gdouble) spu_height;
+
+    if (keep_aspect) {
+      if (vscale < hscale)
+        vscale = hscale;
+      else if (hscale < vscale)
+        hscale = vscale;
+    }
+
+    r.x *= hscale;
+    r.y *= vscale;
+    r.w *= hscale;
+    r.h *= vscale;
+
+    if (keep_aspect) {
+      r.x += (video_width - (spu_width * hscale)) / 2;
+      r.y += (video_height - (spu_height * vscale)) / 2;
+    }
+  }
+
+  /*
+   * Next fit the overlay rectangle inside the video, to avoid cropping.
+   */
+  if (r.x + r.w > video_width)
+    r.x = video_width - r.w;
+
+  if (r.x < 0) {
+    r.x = 0;
+    if (r.w > video_width)
+      r.w = video_width;
+  }
+
+  if (r.y + r.h > video_height)
+    r.y = video_height - r.h;
+
+  if (r.y < 0) {
+    r.y = 0;
+    if (r.h > video_height)
+      r.h = video_height;
+  }
+
+  if (r.x != rect->x || r.y != rect->y || r.w != rect->w || r.h != rect->h) {
+    *rect = r;
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+static GstVideoOverlayComposition *
+gstspu_render_composition (GstDVDSpu * dvdspu)
+{
+  GstBuffer *buffer;
+  GstVideoInfo overlay_info;
+  GstVideoFormat format;
   GstVideoFrame frame;
+  GstVideoOverlayRectangle *rectangle;
+  GstVideoOverlayComposition *composition;
+  GstVideoRectangle win;
+  gint spu_w, spu_h;
+  gsize size;
 
-  if (!gst_video_frame_map (&frame, &dvdspu->spu_state.info, buf,
-          GST_MAP_READWRITE))
-    return;
+  format = GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_RGB;
+
+  switch (dvdspu->spu_input_type) {
+    case SPU_INPUT_TYPE_PGS:
+      gstspu_pgs_get_render_geometry (dvdspu, &spu_w, &spu_h, &win);
+      break;
+    case SPU_INPUT_TYPE_VOBSUB:
+      gstspu_vobsub_get_render_geometry (dvdspu, &spu_w, &spu_h, &win);
+      break;
+    default:
+      return NULL;
+  }
+
+  if (win.w <= 0 || win.h <= 0 || spu_w <= 0 || spu_h <= 0) {
+    GST_DEBUG_OBJECT (dvdspu, "skip render of empty window");
+    return NULL;
+  }
+
+  gst_video_info_init (&overlay_info);
+  gst_video_info_set_format (&overlay_info, format, win.w, win.h);
+  size = GST_VIDEO_INFO_SIZE (&overlay_info);
+
+  buffer = gst_buffer_new_and_alloc (size);
+  if (!buffer) {
+    GST_WARNING_OBJECT (dvdspu, "failed to allocate overlay buffer");
+    return NULL;
+  }
+
+  gst_buffer_add_video_meta (buffer, GST_VIDEO_FRAME_FLAG_NONE,
+      format, win.w, win.h);
+
+  if (!gst_video_frame_map (&frame, &overlay_info, buffer, GST_MAP_READWRITE))
+    goto map_failed;
+
+  memset (GST_VIDEO_FRAME_PLANE_DATA (&frame, 0), 0,
+      GST_VIDEO_FRAME_PLANE_STRIDE (&frame, 0) *
+      GST_VIDEO_FRAME_HEIGHT (&frame));
 
   switch (dvdspu->spu_input_type) {
     case SPU_INPUT_TYPE_VOBSUB:
@@ -681,6 +1004,62 @@
     default:
       break;
   }
+
+  gst_video_frame_unmap (&frame);
+
+  GST_DEBUG_OBJECT (dvdspu, "Overlay rendered for video size %dx%d, "
+      "spu display size %dx%d, window geometry %dx%d+%d%+d",
+      GST_VIDEO_INFO_WIDTH (&dvdspu->spu_state.info),
+      GST_VIDEO_INFO_HEIGHT (&dvdspu->spu_state.info),
+      spu_w, spu_h, win.w, win.h, win.x, win.y);
+
+  if (gstspu_fit_overlay_rectangle (dvdspu, &win, spu_w, spu_h,
+          dvdspu->spu_input_type == SPU_INPUT_TYPE_PGS))
+    GST_DEBUG_OBJECT (dvdspu, "Adjusted window to fit video: %dx%d%+d%+d",
+        win.w, win.h, win.x, win.y);
+
+  rectangle = gst_video_overlay_rectangle_new_raw (buffer, win.x, win.y,
+      win.w, win.h, GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA);
+
+  gst_buffer_unref (buffer);
+
+  composition = gst_video_overlay_composition_new (rectangle);
+  gst_video_overlay_rectangle_unref (rectangle);
+
+  return composition;
+
+map_failed:
+  GST_ERROR_OBJECT (dvdspu, "failed to map buffer");
+  gst_buffer_unref (buffer);
+  return NULL;
+}
+
+static void
+gstspu_render (GstDVDSpu * dvdspu, GstBuffer * buf)
+{
+  GstVideoOverlayComposition *composition;
+  GstVideoFrame frame;
+
+  if (!dvdspu->composition) {
+    dvdspu->composition = gstspu_render_composition (dvdspu);
+    if (!dvdspu->composition)
+      return;
+  }
+
+  composition = dvdspu->composition;
+
+  if (dvdspu->attach_compo_to_buffer) {
+    gst_buffer_add_video_overlay_composition_meta (buf, composition);
+    return;
+  }
+
+  if (!gst_video_frame_map (&frame, &dvdspu->spu_state.info, buf,
+          GST_MAP_READWRITE)) {
+    GST_WARNING_OBJECT (dvdspu, "failed to map video frame for blending");
+    return;
+  }
+
+  gst_video_overlay_composition_blend (composition, &frame);
   gst_video_frame_unmap (&frame);
 }
 
@@ -750,6 +1129,9 @@
       break;
   }
 
+  if (hl_change)
+    gst_dvd_spu_reset_composition (dvdspu);
+
   if (hl_change && (dvdspu->spu_state.flags & SPU_STATE_STILL_FRAME)) {
     gst_dvd_spu_redraw_still (dvdspu, FALSE);
   }
@@ -803,6 +1185,8 @@
           GST_TIME_ARGS (dvdspu->video_seg.position),
           packet->buf ? "buffer" : "event");
 
+      gst_dvd_spu_reset_composition (dvdspu);
+
       if (packet->buf) {
         switch (dvdspu->spu_input_type) {
           case SPU_INPUT_TYPE_VOBSUB:
@@ -907,6 +1291,137 @@
   }
 }
 
+static gboolean
+gst_dvd_spu_negotiate (GstDVDSpu * dvdspu, GstCaps * caps)
+{
+  gboolean upstream_has_meta = FALSE;
+  gboolean caps_has_meta = FALSE;
+  gboolean alloc_has_meta = FALSE;
+  gboolean attach = FALSE;
+  gboolean ret = TRUE;
+  GstCapsFeatures *f;
+  GstCaps *overlay_caps;
+  GstQuery *query;
+
+  GST_DEBUG_OBJECT (dvdspu, "performing negotiation");
+
+  /* Clear the cached composition */
+  gst_dvd_spu_reset_composition (dvdspu);
+
+  /* Clear any pending reconfigure to avoid negotiating twice */
+  gst_pad_check_reconfigure (dvdspu->srcpad);
+
+  if (!caps)
+    caps = gst_pad_get_current_caps (dvdspu->videosinkpad);
+  else
+    gst_caps_ref (caps);
+
+  if (!caps || gst_caps_is_empty (caps))
+    goto no_format;
+
+  /* Check if upstream caps have meta */
+  if ((f = gst_caps_get_features (caps, 0))) {
+    upstream_has_meta = gst_caps_features_contains (f,
+        GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
+  }
+
+  if (upstream_has_meta) {
+    overlay_caps = gst_caps_ref (caps);
+  } else {
+    GstCaps *peercaps;
+
+    /* BaseTransform requires caps for the allocation query to work */
+    overlay_caps = gst_caps_copy (caps);
+    f = gst_caps_get_features (overlay_caps, 0);
+    gst_caps_features_add (f,
+        GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
+
+    /* Then check if downstream accept dvdspu composition in caps */
+    /* FIXME: We should probably check if downstream *prefers* the
+     * dvdspu meta, and only enforce usage of it if we can't handle
+     * the format ourselves and thus would have to drop the overlays.
+     * Otherwise we should prefer what downstream wants here.
+     */
+    peercaps = gst_pad_peer_query_caps (dvdspu->srcpad, NULL);
+    caps_has_meta = gst_caps_can_intersect (peercaps, overlay_caps);
+    gst_caps_unref (peercaps);
+
+    GST_DEBUG ("caps have dvdspu meta %d", caps_has_meta);
+  }
+
+  if (upstream_has_meta || caps_has_meta) {
+    /* Send caps immediatly, it's needed by GstBaseTransform to get a reply
+     * from allocation query */
+    ret = gst_pad_set_caps (dvdspu->srcpad, overlay_caps);
+
+    /* First check if the allocation meta has compositon */
+    query = gst_query_new_allocation (overlay_caps, FALSE);
+
+    if (!gst_pad_peer_query (dvdspu->srcpad, query)) {
+      /* no problem, we use the query defaults */
+      GST_DEBUG_OBJECT (dvdspu, "ALLOCATION query failed");
+
+      /* In case we were flushing, mark reconfigure and fail this method,
+       * will make it retry */
+      if (dvdspu->video_flushing)
+        ret = FALSE;
+    }
+
+    alloc_has_meta = gst_query_find_allocation_meta (query,
+        GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE, NULL);
+
+    GST_DEBUG ("sink alloc has dvdspu meta %d", alloc_has_meta);
+
+    gst_query_unref (query);
+  }
+
+  /* For backward compatbility, we will prefer bliting if downstream
+   * allocation does not support the meta. In other case we will prefer
+   * attaching, and will fail the negotiation in the unlikely case we are
+   * force to blit, but format isn't supported. */
+
+  if (upstream_has_meta) {
+    attach = TRUE;
+  } else if (caps_has_meta) {
+    if (alloc_has_meta) {
+      attach = TRUE;
+    } else {
+      /* Don't attach unless we cannot handle the format */
+      attach = !gst_dvd_spu_can_handle_caps (caps);
+    }
+  } else {
+    ret = gst_dvd_spu_can_handle_caps (caps);
+  }
+
+  /* If we attach, then pick the dvdspu caps */
+  if (attach) {
+    GST_DEBUG_OBJECT (dvdspu, "Using caps %" GST_PTR_FORMAT, overlay_caps);
+    /* Caps where already sent */
+  } else if (ret) {
+    GST_DEBUG_OBJECT (dvdspu, "Using caps %" GST_PTR_FORMAT, caps);
+    ret = gst_pad_set_caps (dvdspu->srcpad, caps);
+  }
+
+  dvdspu->attach_compo_to_buffer = attach;
+
+  if (!ret) {
+    GST_DEBUG_OBJECT (dvdspu, "negotiation failed, schedule reconfigure");
+    gst_pad_mark_reconfigure (dvdspu->srcpad);
+  }
+
+  gst_caps_unref (overlay_caps);
+  gst_caps_unref (caps);
+
+  return ret;
+
+no_format:
+  {
+    if (caps)
+      gst_caps_unref (caps);
+    return FALSE;
+  }
+}
+
 static GstFlowReturn
 gst_dvd_spu_subpic_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
 {

gst-plugins-bad-1.22.7.tar.xz/gst/dvdspu/gstdvdspu.h -> gst-plugins-bad-1.24.5.tar.xz/gst/dvdspu/gstdvdspu.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/dvdspu/gstspu-common.h -> gst-plugins-bad-1.24.5.tar.xz/gst/dvdspu/gstspu-common.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/dvdspu/gstspu-pgs.c -> gst-plugins-bad-1.24.5.tar.xz/gst/dvdspu/gstspu-pgs.c Changed

@@ -33,7 +33,7 @@
   guint fps_d;
 } PgsFrameRates = {
   {
-  64, 30000, 1001}              /* 29.97 FPS */
+      64, 30000, 1001}          /* 29.97 FPS */
 };
 
 typedef enum PgsCommandType PgsCommandType;
@@ -171,15 +171,19 @@
 
 static void
 pgs_composition_object_render (PgsCompositionObject * obj, SpuState * state,
-    GstVideoFrame * frame)
+    GstVideoFrame * window)
 {
   SpuColour *colour;
-  guint8 *planes3;            /* YUV frame pointers */
-  gint strides3;
+  guint8 *pixels, *p;
+  gint stride;
+  gint win_w;
+  gint win_h;
   guint8 *data, *end;
-  guint16 obj_w;
-  guint16 obj_h G_GNUC_UNUSED;
-  guint x, y, i, min_x, max_x;
+  guint16 obj_w, obj_h;
+  gint obj_x, obj_y;
+  gint min_x, max_x;
+  gint min_y, max_y;
+  gint x, y, i;
 
   if (G_UNLIKELY (obj->rle_data == NULL || obj->rle_data_size == 0
           || obj->rle_data_used != obj->rle_data_size))
@@ -191,37 +195,47 @@
   if (data + 4 > end)
     return;
 
-  /* FIXME: Calculate and use the cropping window for the output, as the
-   * intersection of the crop rectangle for this object (if any) and the
-   * window specified by the object's window_id */
-
-  /* Store the start of each plane */
-  planes0 = GST_VIDEO_FRAME_COMP_DATA (frame, 0);
-  planes1 = GST_VIDEO_FRAME_COMP_DATA (frame, 1);
-  planes2 = GST_VIDEO_FRAME_COMP_DATA (frame, 2);
-
-  strides0 = GST_VIDEO_FRAME_COMP_STRIDE (frame, 0);
-  strides1 = GST_VIDEO_FRAME_COMP_STRIDE (frame, 1);
-  strides2 = GST_VIDEO_FRAME_COMP_STRIDE (frame, 2);
+  pixels = GST_VIDEO_FRAME_PLANE_DATA (window, 0);
+  stride = GST_VIDEO_FRAME_PLANE_STRIDE (window, 0);
+  win_w = GST_VIDEO_FRAME_WIDTH (window);
+  win_h = GST_VIDEO_FRAME_HEIGHT (window);
 
-  y = MIN (obj->y, state->info.height);
-
-  planes0 += strides0 * y;
-  planes1 += strides1 * (y / 2);
-  planes2 += strides2 * (y / 2);
-
-  /* RLE data: */
   obj_w = GST_READ_UINT16_BE (data);
   obj_h = GST_READ_UINT16_BE (data + 2);
   data += 4;
 
-  min_x = MIN (obj->x, strides0);
-  max_x = MIN (obj->x + obj_w, strides0);
+  /* Calculate object coordinates relative to the window */
+  min_x = obj_x = (gint) obj->x - (gint) state->pgs.win_x;
+  min_y = obj_y = (gint) obj->y - (gint) state->pgs.win_y;
 
-  state->comp_left = x = min_x;
-  state->comp_right = max_x;
+  if (obj->flags & PGS_COMPOSITION_OBJECT_FLAG_CROPPED) {
+    obj_x -= obj->crop_x;
+    obj_y -= obj->crop_y;
+    obj_w = MIN (obj_w, obj->crop_w);
+    obj_h = MIN (obj_h, obj->crop_h);
+  }
+
+  max_x = min_x + obj_w;
+  max_y = min_y + obj_h;
+
+  /* Early out if object is out of the window */
+  if (max_x <= 0 || max_y < 0 || min_x >= win_w || min_y >= win_h)
+    return;
 
-  gstspu_clear_comp_buffers (state);
+  /* Crop inside window */
+  if (min_x < 0)
+    min_x = 0;
+  if (max_x > win_w)
+    max_x = win_w;
+  if (min_y < 0)
+    min_y = 0;
+  if (max_y > win_h)
+    max_y = win_h;
+
+  /* Write RLE data to the plane */
+  x = obj_x;
+  y = obj_y;
+  p = pixels + y * stride;
 
   while (data < end) {
     guint8 pal_id;
@@ -264,43 +278,56 @@
       }
     }
 
-    colour = &state->pgs.palettepal_id;
-    if (colour->A) {
-      guint32 inv_A = 0xff - colour->A;
-      if (G_UNLIKELY (x + run_len > max_x))
-        run_len = (max_x - x);
+    if (!run_len) {
+      x = obj_x;
+      y++;
+      if (y >= max_y)
+        break;
 
-      for (i = 0; i < run_len; i++) {
-        planes0x = (inv_A * planes0x + colour->Y) / 0xff;
+      p = pixels + y * stride;
+      continue;
+    }
+
+    if (y < min_y)
+      continue;
+
+    if (x >= max_x)
+      continue;
 
-        state->comp_bufs0x / 2 += colour->U;
-        state->comp_bufs1x / 2 += colour->V;
-        state->comp_bufs2x / 2 += colour->A;
-        x++;
+    if (x < min_x) {
+      if (x + run_len <= min_x) {
+        x += run_len;
+        continue;
+      } else {
+        run_len -= min_x - x;
+        x = min_x;
       }
-    } else {
-      x += run_len;
     }
 
-    if (!run_len || x > max_x) {
-      x = min_x;
-      planes0 += strides0;
+    colour = &state->pgs.palettepal_id;
+
+    if (colour->A > 0) {
+      guint8 inv_A = 255 - colour->A;
 
-      if (y % 2) {
-        gstspu_blend_comp_buffers (state, planes);
-        gstspu_clear_comp_buffers (state);
+      if (G_UNLIKELY (x + run_len > max_x))
+        run_len = max_x - x;
 
-        planes1 += strides1;
-        planes2 += strides2;
+      for (i = 0; i < run_len; i++) {
+        SpuColour *pix = &((SpuColour *) p)x++;
+
+        if (pix->A == 0) {
+          memcpy (pix, colour, sizeof (*pix));
+        } else {
+          pix->A = colour->A;
+          pix->R = colour->R + pix->R * inv_A / 255;
+          pix->G = colour->G + pix->G * inv_A / 255;
+          pix->B = colour->B + pix->B * inv_A / 255;
+        }
       }
-      y++;
-      if (y >= state->info.height)
-        return;                 /* Hit the bottom */
+    } else {
+      x += run_len;
     }
   }
-
-  if (y % 2)
-    gstspu_blend_comp_buffers (state, planes);
 }
 
 static void
@@ -429,8 +456,10 @@
         "x %u y %u\n", i, obj->id, obj->win_id, obj->flags, obj->x, obj->y);
 
     if (obj->flags & PGS_COMPOSITION_OBJECT_FLAG_CROPPED) {
-      if (payload + 8 > end)
+      if (payload + 8 > end) {
+        obj->flags &= ~PGS_COMPOSITION_OBJECT_FLAG_CROPPED;
         break;
+      }
 
       obj->crop_x = GST_READ_UINT16_BE (payload);
       obj->crop_y = GST_READ_UINT16_BE (payload + 2);
@@ -484,6 +513,7 @@
     state->pgs.palettei.A = 0;
   for (i = 0; i < n_entries; i++) {
     guint8 n, Y, U, V, A;
+    gint R, G, B;
     n = payload0;
     Y = payload1;
     V = payload2;
@@ -492,15 +522,26 @@
 
 #if DUMP_FULL_PALETTE
     PGS_DUMP ("Entry %3d: Y %3d U %3d V %3d A %3d  ", n, Y, U, V, A);
-    if (((i + 1) % 2) == 0)
-      PGS_DUMP ("\n");
+#endif
+
+    /* Convert to ARGB */
+    R = (298 * Y + 459 * V - 63514) >> 8;
+    G = (298 * Y - 55 * U - 136 * V + 19681) >> 8;
+    B = (298 * Y + 541 * U - 73988) >> 8;
+
+    R = CLAMP (R, 0, 255);
+    G = CLAMP (G, 0, 255);
+    B = CLAMP (B, 0, 255);
+
+#if DUMP_FULL_PALETTE
+    PGS_DUMP ("Entry %3d: A %3d R %3d G %3d B %3d\n", n, A, R, G, B);
 #endif
 
     /* Premultiply the palette entries by the alpha */
-    state->pgs.paletten.Y = Y * A;
-    state->pgs.paletten.U = U * A;
-    state->pgs.paletten.V = V * A;
     state->pgs.paletten.A = A;
+    state->pgs.paletten.R = R * A / 255;
+    state->pgs.paletten.G = G * A / 255;
+    state->pgs.paletten.B = B * A / 255;
 
     payload += PGS_PALETTE_ENTRY_SIZE;
   }
@@ -584,6 +625,11 @@
 
   PGS_DUMP ("Object ID %d ver %u flags 0x%02x\n", obj_id, obj_ver, flags);
 
+  if (!obj) {
+    GST_ERROR ("unknown Object ID %d", obj_id);
+    return 0;
+  }
+
   if (flags & PGS_OBJECT_UPDATE_FLAG_START_RLE) {
     obj->rle_data_ver = obj_ver;
 
@@ -767,7 +813,7 @@
 }
 
 void
-gstspu_pgs_render (GstDVDSpu * dvdspu, GstVideoFrame * frame)
+gstspu_pgs_render (GstDVDSpu * dvdspu, GstVideoFrame * window)
 {
   SpuState *state = &dvdspu->spu_state;
   PgsPresentationSegment *ps = &state->pgs.pres_seg;
@@ -779,7 +825,7 @@
   for (i = 0; i < ps->objects->len; i++) {
     PgsCompositionObject *cur =
         &g_array_index (ps->objects, PgsCompositionObject, i);
-    pgs_composition_object_render (cur, state, frame);
+    pgs_composition_object_render (cur, state, window);
   }
 }
 
@@ -791,6 +837,27 @@
 }
 
 void
+gstspu_pgs_get_render_geometry (GstDVDSpu * dvdspu,
+    gint * display_width, gint * display_height,
+    GstVideoRectangle * window_rect)
+{
+  SpuPgsState *pgs_state = &dvdspu->spu_state.pgs;
+
+  if (window_rect) {
+    window_rect->x = pgs_state->win_x;
+    window_rect->y = pgs_state->win_y;
+    window_rect->w = pgs_state->win_w;
+    window_rect->h = pgs_state->win_h;
+  }
+
+  if (display_width)
+    *display_width = pgs_state->pres_seg.vid_w;
+
+  if (display_height)
+    *display_height = pgs_state->pres_seg.vid_h;
+}
+
+void
 gstspu_pgs_flush (GstDVDSpu * dvdspu)
 {
   SpuPgsState *pgs_state = &dvdspu->spu_state.pgs;

gst-plugins-bad-1.22.7.tar.xz/gst/dvdspu/gstspu-pgs.h -> gst-plugins-bad-1.24.5.tar.xz/gst/dvdspu/gstspu-pgs.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/dvdspu/gstspu-vobsub-render.c -> gst-plugins-bad-1.24.5.tar.xz/gst/dvdspu/gstspu-vobsub-render.c Changed

@@ -40,29 +40,42 @@
   if (state->vobsub.current_clutidx0 != 0) {
     for (i = 0; i < 4; i++, dest++) {
       guint32 col = state->vobsub.current_clutidxi;
+      gint A, Y, U, V;
+      gint R, G, B;
 
       /* Convert incoming 4-bit alpha to 8 bit for blending */
-      dest->A = (alphai << 4) | alphai;
-      dest->Y = ((guint16) ((col >> 16) & 0xff)) * dest->A;
+      A = (alphai << 4) | alphai;
+      Y = ((col >> 16) & 0xff);
       /* U/V are stored as V/U in the clut words, so switch them */
-      dest->V = ((guint16) ((col >> 8) & 0xff)) * dest->A;
-      dest->U = ((guint16) (col & 0xff)) * dest->A;
+      V = ((col >> 8) & 0xff);
+      U = (col & 0xff);
+
+      R = (298 * Y + 459 * V - 63514) >> 8;
+      G = (298 * Y - 55 * U - 136 * V + 19681) >> 8;
+      B = (298 * Y + 541 * U - 73988) >> 8;
+
+      R = CLAMP (R, 0, 255);
+      G = CLAMP (G, 0, 255);
+      B = CLAMP (B, 0, 255);
+
+      dest->A = A;
+      dest->R = R * A / 255;
+      dest->G = G * A / 255;
+      dest->B = B * A / 255;
     }
   } else {
-    int y = 240;
+    int c = 255;
 
     /* The CLUT presumably hasn't been set, so we'll just guess some
      * values for the non-transparent colors (white, grey, black) */
     for (i = 0; i < 4; i++, dest++) {
       dest->A = (alphai << 4) | alphai;
       if (alphai != 0) {
-        dest0.Y = y * dest0.A;
-        y -= 112;
-        if (y < 0)
-          y = 0;
+        dest->R = dest->G = dest->B = c * dest->A / 255;
+        c -= 128;
+        if (c < 0)
+          c = 0;
       }
-      dest0.U = 128 * dest0.A;
-      dest0.V = 128 * dest0.A;
     }
   }
 }
@@ -169,28 +182,36 @@
 }
 
 static inline gboolean
-gstspu_vobsub_draw_rle_run (SpuState * state, gint16 x, gint16 end,
-    SpuColour * colour)
+gstspu_vobsub_draw_rle_run (SpuState * state, GstVideoFrame * frame,
+    gint16 x, gint16 end, SpuColour * colour)
 {
-#if 0
-  GST_LOG ("Y: %d x: %d end %d col %d %d %d %d",
-      state->vobsub.cur_Y, x, end, colour->Y, colour->U, colour->V, colour->A);
-#endif
-
-  if (colour->A != 0) {
-    guint32 inv_A = 0xff - colour->A;
-
-    /* FIXME: This could be more efficient */
-    while (x < end) {
-      state->vobsub.out_Yx =
-          (inv_A * state->vobsub.out_Yx + colour->Y) / 0xff;
-      state->vobsub.out_Ux / 2 += colour->U;
-      state->vobsub.out_Vx / 2 += colour->V;
-      state->vobsub.out_Ax / 2 += colour->A;
-      x++;
+  GST_TRACE ("Y: %d x: %d end %d %d %d %d %d",
+      state->vobsub.cur_Y, x, end, colour->R, colour->G, colour->B, colour->A);
+
+  if (colour->A > 0) {
+    gint i;
+    guint8 *data;
+    guint8 inv_A = 255 - colour->A;
+
+    data = GST_VIDEO_FRAME_PLANE_DATA (frame, 0);
+    data += GST_VIDEO_FRAME_PLANE_STRIDE (frame, 0) *
+        (state->vobsub.cur_Y - state->vobsub.disp_rect.top);
+
+    x -= state->vobsub.disp_rect.left;
+    end -= state->vobsub.disp_rect.left;
+
+    for (i = x; i < end; i++) {
+      SpuColour *pix = &((SpuColour *) data)x++;
+
+      if (pix->A == 0) {
+        memcpy (pix, colour, sizeof (*pix));
+      } else {
+        pix->A = colour->A;
+        pix->R = colour->R + pix->R * inv_A / 255;
+        pix->G = colour->G + pix->G * inv_A / 255;
+        pix->B = colour->B + pix->B * inv_A / 255;
+      }
     }
-    /* Update the compositing buffer so we know how much to blend later */
-    *(state->vobsub.comp_last_x_ptr) = end - 1; /* end is the start of the *next* run */
 
     return TRUE;
   }
@@ -208,11 +229,11 @@
 }
 
 static gboolean gstspu_vobsub_render_line_with_chgcol (SpuState * state,
-    guint8 * planes3, guint16 * rle_offset);
+    GstVideoFrame * frame, guint16 * rle_offset);
 static gboolean gstspu_vobsub_update_chgcol (SpuState * state);
 
 static gboolean
-gstspu_vobsub_render_line (SpuState * state, guint8 * planes3,
+gstspu_vobsub_render_line (SpuState * state, GstVideoFrame * frame,
     guint16 * rle_offset)
 {
   gint16 x, next_x, end, rle_code, next_draw_x;
@@ -226,19 +247,13 @@
       /* Check the top & bottom, because we might not be within the region yet */
       if (state->vobsub.cur_Y >= state->vobsub.cur_chg_col->top &&
           state->vobsub.cur_Y <= state->vobsub.cur_chg_col->bottom) {
-        return gstspu_vobsub_render_line_with_chgcol (state, planes,
-            rle_offset);
+        return gstspu_vobsub_render_line_with_chgcol (state, frame, rle_offset);
       }
     }
   }
 
   /* No special case. Render as normal */
 
-  /* Set up our output pointers */
-  state->vobsub.out_Y = planes0;
-  state->vobsub.out_U = state->comp_bufs0;
-  state->vobsub.out_V = state->comp_bufs1;
-  state->vobsub.out_A = state->comp_bufs2;
   /* We always need to start our RLE decoding byte_aligned */
   *rle_offset = GST_ROUND_UP_2 (*rle_offset);
 
@@ -249,12 +264,11 @@
     colour = &state->vobsub.main_palrle_code & 3;
     next_x = rle_end_x (rle_code, x, end);
     next_draw_x = next_x;
-    if (next_draw_x > state->vobsub.clip_rect.right)
-      next_draw_x = state->vobsub.clip_rect.right;      /* ensure no overflow */
+    if (next_draw_x > state->vobsub.disp_rect.right)
+      next_draw_x = state->vobsub.disp_rect.right;      /* ensure no overflow */
     /* Now draw the run between x,next_x) */
-    if (state->vobsub.cur_Y >= state->vobsub.clip_rect.top &&
-        state->vobsub.cur_Y <= state->vobsub.clip_rect.bottom)
-      visible |= gstspu_vobsub_draw_rle_run (state, x, next_draw_x, colour);
+    visible |=
+        gstspu_vobsub_draw_rle_run (state, frame, x, next_draw_x, colour);
     x = next_x;
   }
 
@@ -289,7 +303,7 @@
 }
 
 static gboolean
-gstspu_vobsub_render_line_with_chgcol (SpuState * state, guint8 * planes3,
+gstspu_vobsub_render_line_with_chgcol (SpuState * state, GstVideoFrame * frame,
     guint16 * rle_offset)
 {
   SpuVobsubLineCtrlI *chg_col = state->vobsub.cur_chg_col;
@@ -304,11 +318,6 @@
   gint16 cur_reg_end;
   gint i;
 
-  state->vobsub.out_Y = planes0;
-  state->vobsub.out_U = state->comp_bufs0;
-  state->vobsub.out_V = state->comp_bufs1;
-  state->vobsub.out_A = state->comp_bufs2;
-
   /* We always need to start our RLE decoding byte_aligned */
   *rle_offset = GST_ROUND_UP_2 (*rle_offset);
 
@@ -344,12 +353,13 @@
       run_end = MIN (next_x, cur_reg_end);
 
       run_draw_end = run_end;
-      if (run_draw_end > state->vobsub.clip_rect.right)
-        run_draw_end = state->vobsub.clip_rect.right;   /* ensure no overflow */
+      if (run_draw_end > state->vobsub.disp_rect.right)
+        run_draw_end = state->vobsub.disp_rect.right;   /* ensure no overflow */
 
       if (G_LIKELY (x < run_end)) {
         colour = &cur_pix_ctrl->pal_cacherle_code & 3;
-        visible |= gstspu_vobsub_draw_rle_run (state, x, run_draw_end, colour);
+        visible |= gstspu_vobsub_draw_rle_run (state, frame, x,
+            run_draw_end, colour);
         x = run_end;
       }
 
@@ -370,51 +380,36 @@
 }
 
 static void
-gstspu_vobsub_blend_comp_buffers (SpuState * state, guint8 * planes3)
+gstspu_vobsub_draw_highlight (SpuState * state,
+    GstVideoFrame * frame, SpuRect * rect)
 {
-  state->comp_left = state->vobsub.disp_rect.left;
-  state->comp_right =
-      MAX (state->vobsub.comp_last_x0, state->vobsub.comp_last_x1);
+  SpuColour *cur;
+  SpuRect r;
+  guint8 *data;
+  guint stride;
+  gint16 pos;
 
-  state->comp_left = MAX (state->comp_left, state->vobsub.clip_rect.left);
-  state->comp_right = MIN (state->comp_right, state->vobsub.clip_rect.right);
+  r.left = rect->left - state->vobsub.disp_rect.left;
+  r.right = rect->right - state->vobsub.disp_rect.left;
+  r.top = rect->top - state->vobsub.disp_rect.top;
+  r.bottom = rect->bottom - state->vobsub.disp_rect.top;
+  rect = &r;
 
-  gstspu_blend_comp_buffers (state, planes);
-}
+  data = GST_VIDEO_FRAME_PLANE_DATA (frame, 0);
+  stride = GST_VIDEO_FRAME_PLANE_STRIDE (frame, 0);
 
-static void
-gstspu_vobsub_clear_comp_buffers (SpuState * state)
-{
-  state->comp_left = state->vobsub.clip_rect.left;
-  state->comp_right = state->vobsub.clip_rect.right;
+  cur = (SpuColour *) (data + stride * rect->top);
+  for (pos = rect->left; pos < rect->right; pos++)
+    curpos.A = 0x80;
 
-  gstspu_clear_comp_buffers (state);
+  cur = (SpuColour *) (data + stride * (rect->bottom - 1));
+  for (pos = rect->left; pos < rect->right; pos++)
+    curpos.A = 0x80;
 
-  state->vobsub.comp_last_x0 = -1;
-  state->vobsub.comp_last_x1 = -1;
-}
-
-static void
-gstspu_vobsub_draw_highlight (SpuState * state,
-    GstVideoFrame * frame, SpuRect * rect)
-{
-  guint8 *cur;
-  gint16 pos;
-  gint ystride;
-
-  ystride = GST_VIDEO_FRAME_COMP_STRIDE (frame, 0);
-
-  cur = GST_VIDEO_FRAME_COMP_DATA (frame, 0) + ystride * rect->top;
-  for (pos = rect->left + 1; pos < rect->right; pos++)
-    curpos = (curpos / 2) + 0x8;
-  cur = GST_VIDEO_FRAME_COMP_DATA (frame, 0) + ystride * rect->bottom;
-  for (pos = rect->left + 1; pos < rect->right; pos++)
-    curpos = (curpos / 2) + 0x8;
-  cur = GST_VIDEO_FRAME_COMP_DATA (frame, 0) + ystride * rect->top;
-  for (pos = rect->top; pos <= rect->bottom; pos++) {
-    currect->left = (currect->left / 2) + 0x8;
-    currect->right = (currect->right / 2) + 0x8;
-    cur += ystride;
+  for (pos = rect->top; pos < rect->bottom; pos++) {
+    cur = (SpuColour *) (data + stride * pos);
+    currect->left.A = 0x80;
+    currect->right - 1.A = 0x80;
   }
 }
 
@@ -422,11 +417,8 @@
 gstspu_vobsub_render (GstDVDSpu * dvdspu, GstVideoFrame * frame)
 {
   SpuState *state = &dvdspu->spu_state;
-  guint8 *planes3;            /* YUV frame pointers */
   gint y, last_y;
-  gint width, height;
-  gint strides3;
-  gint offset_index = 0;
+  guint16 cur_offsets2;
 
   /* Set up our initial state */
   if (G_UNLIKELY (state->vobsub.pix_buf == NULL))
@@ -436,18 +428,6 @@
           GST_MAP_READ))
     return;
 
-  /* Store the start of each plane */
-  planes0 = GST_VIDEO_FRAME_COMP_DATA (frame, 0);
-  planes1 = GST_VIDEO_FRAME_COMP_DATA (frame, 1);
-  planes2 = GST_VIDEO_FRAME_COMP_DATA (frame, 2);
-
-  strides0 = GST_VIDEO_FRAME_COMP_STRIDE (frame, 0);
-  strides1 = GST_VIDEO_FRAME_COMP_STRIDE (frame, 1);
-  strides2 = GST_VIDEO_FRAME_COMP_STRIDE (frame, 2);
-
-  width = GST_VIDEO_FRAME_WIDTH (frame);
-  height = GST_VIDEO_FRAME_HEIGHT (frame);
-
   GST_DEBUG_OBJECT (dvdspu,
       "Rendering SPU. disp_rect %d,%d to %d,%d. hl_rect %d,%d to %d,%d",
       state->vobsub.disp_rect.left, state->vobsub.disp_rect.top,
@@ -455,13 +435,6 @@
       state->vobsub.hl_rect.left, state->vobsub.hl_rect.top,
       state->vobsub.hl_rect.right, state->vobsub.hl_rect.bottom);
 
-  GST_DEBUG_OBJECT (dvdspu, "video size %d,%d", width, height);
-
-  /* When reading RLE data, we track the offset in nibbles... */
-  state->vobsub.cur_offsets0 = state->vobsub.pix_data0 * 2;
-  state->vobsub.cur_offsets1 = state->vobsub.pix_data1 * 2;
-  state->vobsub.max_offset = state->vobsub.pix_buf_map.size * 2;
-
   /* Update all the palette caches */
   gstspu_vobsub_update_palettes (dvdspu, state);
 
@@ -476,175 +449,25 @@
   } else
     state->vobsub.cur_chg_col = NULL;
 
-  state->vobsub.clip_rect.left = state->vobsub.disp_rect.left;
-  state->vobsub.clip_rect.right = state->vobsub.disp_rect.right;
-
-  /* center the image when display rectangle exceeds the video width */
-  if (width <= state->vobsub.disp_rect.right) {
-    gint left, disp_width;
-
-    disp_width = state->vobsub.disp_rect.right - state->vobsub.disp_rect.left
-        + 1;
-    left = (width - disp_width) / 2;
-    state->vobsub.disp_rect.left = left;
-    state->vobsub.disp_rect.right = left + disp_width - 1;
-
-    /* if it clips to the right, shift it left, but only till zero */
-    if (state->vobsub.disp_rect.right >= width) {
-      gint shift = state->vobsub.disp_rect.right - width - 1;
-      if (shift > state->vobsub.disp_rect.left)
-        shift = state->vobsub.disp_rect.left;
-      state->vobsub.disp_rect.left -= shift;
-      state->vobsub.disp_rect.right -= shift;
-    }
-
-    /* init clip to disp */
-    state->vobsub.clip_rect.left = state->vobsub.disp_rect.left;
-    state->vobsub.clip_rect.right = state->vobsub.disp_rect.right;
-
-    /* clip right after the shift */
-    if (state->vobsub.clip_rect.right >= width)
-      state->vobsub.clip_rect.right = width - 1;
-
-    GST_DEBUG_OBJECT (dvdspu,
-        "clipping width to %d,%d", state->vobsub.clip_rect.left,
-        state->vobsub.clip_rect.right);
-  }
-
-  /* for the height, bring it up till it fits as well as it can. We
-   * assume the picture is in the lower part. We should better check where it
-   * is and do something more clever. */
-  state->vobsub.clip_rect.top = state->vobsub.disp_rect.top;
-  state->vobsub.clip_rect.bottom = state->vobsub.disp_rect.bottom;
-  if (height <= state->vobsub.disp_rect.bottom) {
-
-    /* shift it up, but only till zero */
-    gint shift = state->vobsub.disp_rect.bottom - height - 1;
-    if (shift > state->vobsub.disp_rect.top)
-      shift = state->vobsub.disp_rect.top;
-    state->vobsub.disp_rect.top -= shift;
-    state->vobsub.disp_rect.bottom -= shift;
-
-    /* start on even line */
-    if (state->vobsub.disp_rect.top & 1) {
-      state->vobsub.disp_rect.top--;
-      state->vobsub.disp_rect.bottom--;
-    }
-
-    /* init clip to disp */
-    state->vobsub.clip_rect.top = state->vobsub.disp_rect.top;
-    state->vobsub.clip_rect.bottom = state->vobsub.disp_rect.bottom;
-
-    /* clip bottom after the shift */
-    if (state->vobsub.clip_rect.bottom >= height)
-      state->vobsub.clip_rect.bottom = height - 1;
-
-    GST_DEBUG_OBJECT (dvdspu,
-        "clipping height to %d,%d", state->vobsub.clip_rect.top,
-        state->vobsub.clip_rect.bottom);
-  }
-
   /* We start rendering from the first line of the display rect */
   y = state->vobsub.disp_rect.top;
-  /* We render most lines in pairs starting from an even y,
-   * accumulating 2 lines of chroma then blending it. We might need to render a
-   * single line at the start and end if the display rect starts on an odd line
-   * or ends on an even one */
-  if (y > state->vobsub.disp_rect.bottom)
-    return;                     /* Empty clip rect, nothing to do */
-
-  /* Update our plane references to the first line of the disp_rect */
-  planes0 += strides0 * y;
-  planes1 += strides1 * (y / 2);
-  planes2 += strides2 * (y / 2);
-
-  /* If the render rect starts on an odd line, render that only to start */
-  state->vobsub.cur_Y = y;
-  if (state->vobsub.cur_Y & 0x1) {
-    gboolean clip, visible = FALSE;
-
-    clip = (state->vobsub.cur_Y < state->vobsub.clip_rect.top
-        || state->vobsub.cur_Y > state->vobsub.clip_rect.bottom);
-
-    if (!clip) {
-      /* Render a first odd line. */
-      gstspu_vobsub_clear_comp_buffers (state);
-      state->vobsub.comp_last_x_ptr = state->vobsub.comp_last_x + 1;
-      visible |=
-          gstspu_vobsub_render_line (state, planes,
-          &state->vobsub.cur_offsetsoffset_index);
-      if (visible)
-        gstspu_vobsub_blend_comp_buffers (state, planes);
-    }
-
-    /* Update all the output pointers */
-    state->vobsub.cur_Y++;
-    planes0 += strides0;
-    planes1 += strides1;
-    planes2 += strides2;
-    /* Switch the offset index 0 <=> 1 */
-    offset_index ^= 0x1;
-  }
-
-  last_y = (state->vobsub.disp_rect.bottom - 1) & ~(0x01);
-  for (; state->vobsub.cur_Y <= last_y; state->vobsub.cur_Y++) {
-    gboolean clip, visible = FALSE;
+  last_y = state->vobsub.disp_rect.bottom;
 
-    clip = (state->vobsub.cur_Y < state->vobsub.clip_rect.top
-        || state->vobsub.cur_Y > state->vobsub.clip_rect.bottom);
-
-    /* Reset the compositing buffer */
-    gstspu_vobsub_clear_comp_buffers (state);
-    /* Render even line */
-    state->vobsub.comp_last_x_ptr = state->vobsub.comp_last_x;
-    gstspu_vobsub_render_line (state, planes,
-        &state->vobsub.cur_offsetsoffset_index);
-
-    /* Advance the luminance output pointer */
-    planes0 += strides0;
-    /* Switch the offset index 0 <=> 1 */
-    offset_index ^= 0x1;
-
-    state->vobsub.cur_Y++;
-
-    /* Render odd line */
-    state->vobsub.comp_last_x_ptr = state->vobsub.comp_last_x + 1;
-    visible |=
-        gstspu_vobsub_render_line (state, planes,
-        &state->vobsub.cur_offsetsoffset_index);
-
-    if (visible && !clip) {
-      /* Blend the accumulated UV compositing buffers onto the output */
-      gstspu_vobsub_blend_comp_buffers (state, planes);
-    }
-
-    /* Update all the output pointers */
-    planes0 += strides0;
-    planes1 += strides1;
-    planes2 += strides2;
-    /* Switch the offset index 0 <=> 1 */
-    offset_index ^= 0x1;
+  /* When reading RLE data, we track the offset in nibbles... */
+  state->vobsub.max_offset = state->vobsub.pix_buf_map.size * 2;
+  if (y & 1) {
+    cur_offsets1 = state->vobsub.pix_data0 * 2;
+    cur_offsets0 = state->vobsub.pix_data1 * 2;
+  } else {
+    cur_offsets0 = state->vobsub.pix_data0 * 2;
+    cur_offsets1 = state->vobsub.pix_data1 * 2;
   }
 
-  if (state->vobsub.cur_Y == state->vobsub.disp_rect.bottom) {
-    gboolean clip, visible = FALSE;
-
-    clip = (state->vobsub.cur_Y < state->vobsub.clip_rect.top
-        || state->vobsub.cur_Y > state->vobsub.clip_rect.bottom);
-
-    g_return_if_fail ((state->vobsub.disp_rect.bottom & 0x01) == 0);
-
-    if (!clip) {
-      /* Render a remaining lone last even line. y already has the correct value
-       * after the above loop exited. */
-      gstspu_vobsub_clear_comp_buffers (state);
-      state->vobsub.comp_last_x_ptr = state->vobsub.comp_last_x;
-      visible |=
-          gstspu_vobsub_render_line (state, planes,
-          &state->vobsub.cur_offsetsoffset_index);
-      if (visible)
-        gstspu_vobsub_blend_comp_buffers (state, planes);
-    }
+  /* Render line by line */
+  for (state->vobsub.cur_Y = y; state->vobsub.cur_Y <= last_y;
+      state->vobsub.cur_Y++) {
+    gstspu_vobsub_render_line (state, frame,
+        &cur_offsetsstate->vobsub.cur_Y & 1);
   }
 
   /* for debugging purposes, draw a faint rectangle at the edges of the disp_rect */

gst-plugins-bad-1.22.7.tar.xz/gst/dvdspu/gstspu-vobsub.c -> gst-plugins-bad-1.24.5.tar.xz/gst/dvdspu/gstspu-vobsub.c Changed

@@ -485,6 +485,11 @@
       if (was_forced != forced_only)
         hl_change = TRUE;
     }
+  } else if (strcmp (event_type, "dvd-set-frame-size") == 0) {
+    gst_structure_get_int (structure, "width", &state->vobsub.frame_w);
+    gst_structure_get_int (structure, "height", &state->vobsub.frame_h);
+    GST_INFO_OBJECT (dvdspu, "Frame size is now %dx%d",
+        state->vobsub.frame_w, state->vobsub.frame_h);
   }
 
   gst_event_unref (event);
@@ -493,6 +498,31 @@
 }
 
 void
+gstspu_vobsub_get_render_geometry (GstDVDSpu * dvdspu,
+    gint * display_width, gint * display_height,
+    GstVideoRectangle * window_rect)
+{
+  SpuState *state = &dvdspu->spu_state;
+
+  if (window_rect) {
+    window_rect->x = state->vobsub.disp_rect.left;
+    window_rect->y = state->vobsub.disp_rect.top;
+    window_rect->w = state->vobsub.disp_rect.right -
+        state->vobsub.disp_rect.left + 1;
+    window_rect->h = state->vobsub.disp_rect.bottom -
+        state->vobsub.disp_rect.top + 1;
+  }
+
+  if (display_width)
+    *display_width = state->vobsub.frame_w > 0 ?
+        state->vobsub.frame_w : state->info.width;
+
+  if (display_height)
+    *display_height = state->vobsub.frame_h > 0 ?
+        state->vobsub.frame_h : state->info.height;
+}
+
+void
 gstspu_vobsub_flush (GstDVDSpu * dvdspu)
 {
   SpuState *state = &dvdspu->spu_state;

gst-plugins-bad-1.22.7.tar.xz/gst/dvdspu/gstspu-vobsub.h -> gst-plugins-bad-1.24.5.tar.xz/gst/dvdspu/gstspu-vobsub.h Changed

@@ -55,8 +55,8 @@
   GstMapInfo pix_buf_map; /* Mapped buffer info */
   
   SpuRect disp_rect;
-  SpuRect clip_rect;
   SpuRect hl_rect;
+  gint frame_w, frame_h;
 
   guint32 current_clut16; /* Colour lookup table from incoming events */
 
@@ -81,31 +81,25 @@
                                    * need recalculating */
 
   /* Rendering state vars below */
-  gint16 comp_last_x2; /* Maximum X values we rendered into the comp buffer (odd & even) */
-  gint16 *comp_last_x_ptr; /* Ptr to the current comp_last_x value to be updated by the render */
 
   /* Current Y Position */
   gint16 cur_Y;
 
   /* Current offset in nibbles into the pix_data */
-  guint16 cur_offsets2;
   guint16 max_offset;
 
   /* current ChgColCon Line Info */
   SpuVobsubLineCtrlI *cur_chg_col;
   SpuVobsubLineCtrlI *cur_chg_col_end;
-
-  /* Output position tracking */
-  guint8  *out_Y;
-  guint32 *out_U;
-  guint32 *out_V;
-  guint32 *out_A;
 };
 
 void gstspu_vobsub_handle_new_buf (GstDVDSpu * dvdspu, GstClockTime event_ts, GstBuffer *buf);
 gboolean gstspu_vobsub_execute_event (GstDVDSpu *dvdspu);
 void gstspu_vobsub_render (GstDVDSpu *dvdspu, GstVideoFrame *frame);
 gboolean gstspu_vobsub_handle_dvd_event (GstDVDSpu *dvdspu, GstEvent *event);
+void gstspu_vobsub_get_render_geometry (GstDVDSpu *dvdspu,
+    gint *display_width, gint *display_height,
+    GstVideoRectangle *window_rect);
 void gstspu_vobsub_flush (GstDVDSpu *dvdspu);
 
 #endif

gst-plugins-bad-1.22.7.tar.xz/gst/dvdspu/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst/dvdspu/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst/fieldanalysis/gstfieldanalysis.c -> gst-plugins-bad-1.24.5.tar.xz/gst/fieldanalysis/gstfieldanalysis.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/gaudieffects/gstgaussblur.c -> gst-plugins-bad-1.24.5.tar.xz/gst/gaudieffects/gstgaussblur.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/id3tag/id3tag.c -> gst-plugins-bad-1.24.5.tar.xz/gst/id3tag/id3tag.c Changed

@@ -606,10 +606,10 @@
     const gchar *corr_num;      /* corresponding NUMBER tag (if count) */
   } corr = {
     {
-    GST_TAG_TRACK_NUMBER, GST_TAG_TRACK_COUNT, NULL}, {
-    GST_TAG_TRACK_COUNT, NULL, GST_TAG_TRACK_NUMBER}, {
-    GST_TAG_ALBUM_VOLUME_NUMBER, GST_TAG_ALBUM_VOLUME_COUNT, NULL}, {
-    GST_TAG_ALBUM_VOLUME_COUNT, NULL, GST_TAG_ALBUM_VOLUME_NUMBER}
+        GST_TAG_TRACK_NUMBER, GST_TAG_TRACK_COUNT, NULL}, {
+        GST_TAG_TRACK_COUNT, NULL, GST_TAG_TRACK_NUMBER}, {
+        GST_TAG_ALBUM_VOLUME_NUMBER, GST_TAG_ALBUM_VOLUME_COUNT, NULL}, {
+        GST_TAG_ALBUM_VOLUME_COUNT, NULL, GST_TAG_ALBUM_VOLUME_NUMBER}
   };
   guint idx;
 
@@ -846,23 +846,24 @@
     const gchar realworld_id32;
   } mb_ids = {
     {
-    GST_TAG_MUSICBRAINZ_ARTISTID, "MusicBrainz Artist Id",
-          "musicbrainz_artistid"}, {
-    GST_TAG_MUSICBRAINZ_ALBUMID, "MusicBrainz Album Id", "musicbrainz_albumid"}, {
-    GST_TAG_MUSICBRAINZ_ALBUMARTISTID, "MusicBrainz Album Artist Id",
-          "musicbrainz_albumartistid"}, {
-    GST_TAG_MUSICBRAINZ_RELEASEGROUPID, "MusicBrainz Release Group Id",
-          "musicbrainz_releasegroupid"}, {
-    GST_TAG_MUSICBRAINZ_TRMID, "MusicBrainz TRM Id", "musicbrainz_trmid"}, {
-    GST_TAG_CDDA_MUSICBRAINZ_DISCID, "MusicBrainz DiscID",
-          "musicbrainz_discid"}, {
-      /* the following one is more or less made up, there seems to be little
-       * evidence that any popular application is actually putting this info
-       * into TXXX frames; the first one comes from a musicbrainz wiki 'proposed
-       * tags' page, the second one is analogue to the vorbis/ape/flac tag. */
-    GST_TAG_CDDA_CDDB_DISCID, "CDDB DiscID", "discid"}, {
-    GST_TAG_MUSICBRAINZ_RELEASETRACKID, "MusicBrainz Track Id",
-          "musicbrainz_trackid"}
+          GST_TAG_MUSICBRAINZ_ARTISTID, "MusicBrainz Artist Id",
+        "musicbrainz_artistid"}, {
+          GST_TAG_MUSICBRAINZ_ALBUMID, "MusicBrainz Album Id",
+        "musicbrainz_albumid"}, {
+          GST_TAG_MUSICBRAINZ_ALBUMARTISTID, "MusicBrainz Album Artist Id",
+        "musicbrainz_albumartistid"}, {
+          GST_TAG_MUSICBRAINZ_RELEASEGROUPID, "MusicBrainz Release Group Id",
+        "musicbrainz_releasegroupid"}, {
+        GST_TAG_MUSICBRAINZ_TRMID, "MusicBrainz TRM Id", "musicbrainz_trmid"}, {
+          GST_TAG_CDDA_MUSICBRAINZ_DISCID, "MusicBrainz DiscID",
+        "musicbrainz_discid"}, {
+          /* the following one is more or less made up, there seems to be little
+           * evidence that any popular application is actually putting this info
+           * into TXXX frames; the first one comes from a musicbrainz wiki 'proposed
+           * tags' page, the second one is analogue to the vorbis/ape/flac tag. */
+        GST_TAG_CDDA_CDDB_DISCID, "CDDB DiscID", "discid"}, {
+          GST_TAG_MUSICBRAINZ_RELEASETRACKID, "MusicBrainz Track Id",
+        "musicbrainz_trackid"}
   };
   guint i, idx;
 
@@ -1136,75 +1137,75 @@
   const gchar *data;
 } add_funcs = {
   {
-    /* Simple text tags */
-  GST_TAG_ARTIST, add_text_tag, "TPE1"}, {
-  GST_TAG_ALBUM_ARTIST, add_text_tag, "TPE2"}, {
-  GST_TAG_TITLE, add_text_tag, "TIT2"}, {
-  GST_TAG_ALBUM, add_text_tag, "TALB"}, {
-  GST_TAG_COPYRIGHT, add_text_tag, "TCOP"}, {
-  GST_TAG_COMPOSER, add_text_tag, "TCOM"}, {
-  GST_TAG_GENRE, add_text_tag, "TCON"}, {
-  GST_TAG_ENCODED_BY, add_text_tag, "TENC"}, {
-  GST_TAG_PUBLISHER, add_text_tag, "TPUB"}, {
-  GST_TAG_INTERPRETED_BY, add_text_tag, "TPE4"}, {
-  GST_TAG_MUSICAL_KEY, add_text_tag, "TKEY"}, {
-
-    /* Private frames */
-  GST_TAG_PRIVATE_DATA, add_private_data_tag, "PRIV"}, {
-  GST_ID3_DEMUX_TAG_ID3V2_FRAME, add_id3v2frame_tag, NULL}, {
-
-    /* Track and album numbers */
-  GST_TAG_TRACK_NUMBER, add_count_or_num_tag, "TRCK"}, {
-  GST_TAG_TRACK_COUNT, add_count_or_num_tag, "TRCK"}, {
-  GST_TAG_ALBUM_VOLUME_NUMBER, add_count_or_num_tag, "TPOS"}, {
-  GST_TAG_ALBUM_VOLUME_COUNT, add_count_or_num_tag, "TPOS"}, {
-
-    /* Comment tags */
-  GST_TAG_COMMENT, add_comment_tag, NULL}, {
-  GST_TAG_EXTENDED_COMMENT, add_comment_tag, NULL}, {
-
-    /* BPM tag */
-  GST_TAG_BEATS_PER_MINUTE, add_bpm_tag, NULL}, {
-
-    /* Images */
-  GST_TAG_IMAGE, add_image_tag, NULL}, {
-  GST_TAG_PREVIEW_IMAGE, add_image_tag, NULL}, {
-
-    /* Misc user-defined text tags for IDs (and UFID frame) */
-  GST_TAG_MUSICBRAINZ_ARTISTID, add_musicbrainz_tag, "\000"}, {
-  GST_TAG_MUSICBRAINZ_ALBUMID, add_musicbrainz_tag, "\001"}, {
-  GST_TAG_MUSICBRAINZ_ALBUMARTISTID, add_musicbrainz_tag, "\002"}, {
-  GST_TAG_MUSICBRAINZ_RELEASEGROUPID, add_musicbrainz_tag, "\003"}, {
-  GST_TAG_MUSICBRAINZ_TRMID, add_musicbrainz_tag, "\004"}, {
-  GST_TAG_CDDA_MUSICBRAINZ_DISCID, add_musicbrainz_tag, "\005"}, {
-  GST_TAG_CDDA_CDDB_DISCID, add_musicbrainz_tag, "\006"}, {
-  GST_TAG_MUSICBRAINZ_RELEASETRACKID, add_musicbrainz_tag, "\007"}, {
-  GST_TAG_MUSICBRAINZ_TRACKID, add_unique_file_id_tag, NULL}, {
-
-    /* Info about encoder */
-  GST_TAG_ENCODER, add_encoder_tag, NULL}, {
-  GST_TAG_ENCODER_VERSION, add_encoder_tag, NULL}, {
-
-    /* URIs */
-  GST_TAG_COPYRIGHT_URI, add_uri_tag, "WCOP"}, {
-  GST_TAG_LICENSE_URI, add_uri_tag, "WCOP"}, {
-
-    /* Up to here, all the frame ids and contents have been the same between
-       versions 2.3 and 2.4. The rest of them differ... */
-    /* Date (in ID3v2.3, this is a TYER tag. In v2.4, it's a TDRC tag */
-  GST_TAG_DATE_TIME, add_date_tag, NULL}, {
-
-    /* Replaygain data (not really supported in 2.3, we use an experimental
-       tag there) */
-  GST_TAG_TRACK_PEAK, add_relative_volume_tag, NULL}, {
-  GST_TAG_TRACK_GAIN, add_relative_volume_tag, NULL}, {
-  GST_TAG_ALBUM_PEAK, add_relative_volume_tag, NULL}, {
-  GST_TAG_ALBUM_GAIN, add_relative_volume_tag, NULL}, {
-
-    /* Sortable version of various tags. These are all v2.4 ONLY */
-  GST_TAG_ARTIST_SORTNAME, add_text_tag_v4, "TSOP"}, {
-  GST_TAG_ALBUM_SORTNAME, add_text_tag_v4, "TSOA"}, {
-  GST_TAG_TITLE_SORTNAME, add_text_tag_v4, "TSOT"}
+        /* Simple text tags */
+      GST_TAG_ARTIST, add_text_tag, "TPE1"}, {
+      GST_TAG_ALBUM_ARTIST, add_text_tag, "TPE2"}, {
+      GST_TAG_TITLE, add_text_tag, "TIT2"}, {
+      GST_TAG_ALBUM, add_text_tag, "TALB"}, {
+      GST_TAG_COPYRIGHT, add_text_tag, "TCOP"}, {
+      GST_TAG_COMPOSER, add_text_tag, "TCOM"}, {
+      GST_TAG_GENRE, add_text_tag, "TCON"}, {
+      GST_TAG_ENCODED_BY, add_text_tag, "TENC"}, {
+      GST_TAG_PUBLISHER, add_text_tag, "TPUB"}, {
+      GST_TAG_INTERPRETED_BY, add_text_tag, "TPE4"}, {
+      GST_TAG_MUSICAL_KEY, add_text_tag, "TKEY"}, {
+
+        /* Private frames */
+      GST_TAG_PRIVATE_DATA, add_private_data_tag, "PRIV"}, {
+      GST_ID3_DEMUX_TAG_ID3V2_FRAME, add_id3v2frame_tag, NULL}, {
+
+        /* Track and album numbers */
+      GST_TAG_TRACK_NUMBER, add_count_or_num_tag, "TRCK"}, {
+      GST_TAG_TRACK_COUNT, add_count_or_num_tag, "TRCK"}, {
+      GST_TAG_ALBUM_VOLUME_NUMBER, add_count_or_num_tag, "TPOS"}, {
+      GST_TAG_ALBUM_VOLUME_COUNT, add_count_or_num_tag, "TPOS"}, {
+
+        /* Comment tags */
+      GST_TAG_COMMENT, add_comment_tag, NULL}, {
+      GST_TAG_EXTENDED_COMMENT, add_comment_tag, NULL}, {
+
+        /* BPM tag */
+      GST_TAG_BEATS_PER_MINUTE, add_bpm_tag, NULL}, {
+
+        /* Images */
+      GST_TAG_IMAGE, add_image_tag, NULL}, {
+      GST_TAG_PREVIEW_IMAGE, add_image_tag, NULL}, {
+
+        /* Misc user-defined text tags for IDs (and UFID frame) */
+      GST_TAG_MUSICBRAINZ_ARTISTID, add_musicbrainz_tag, "\000"}, {
+      GST_TAG_MUSICBRAINZ_ALBUMID, add_musicbrainz_tag, "\001"}, {
+      GST_TAG_MUSICBRAINZ_ALBUMARTISTID, add_musicbrainz_tag, "\002"}, {
+      GST_TAG_MUSICBRAINZ_RELEASEGROUPID, add_musicbrainz_tag, "\003"}, {
+      GST_TAG_MUSICBRAINZ_TRMID, add_musicbrainz_tag, "\004"}, {
+      GST_TAG_CDDA_MUSICBRAINZ_DISCID, add_musicbrainz_tag, "\005"}, {
+      GST_TAG_CDDA_CDDB_DISCID, add_musicbrainz_tag, "\006"}, {
+      GST_TAG_MUSICBRAINZ_RELEASETRACKID, add_musicbrainz_tag, "\007"}, {
+      GST_TAG_MUSICBRAINZ_TRACKID, add_unique_file_id_tag, NULL}, {
+
+        /* Info about encoder */
+      GST_TAG_ENCODER, add_encoder_tag, NULL}, {
+      GST_TAG_ENCODER_VERSION, add_encoder_tag, NULL}, {
+
+        /* URIs */
+      GST_TAG_COPYRIGHT_URI, add_uri_tag, "WCOP"}, {
+      GST_TAG_LICENSE_URI, add_uri_tag, "WCOP"}, {
+
+        /* Up to here, all the frame ids and contents have been the same between
+           versions 2.3 and 2.4. The rest of them differ... */
+        /* Date (in ID3v2.3, this is a TYER tag. In v2.4, it's a TDRC tag */
+      GST_TAG_DATE_TIME, add_date_tag, NULL}, {
+
+        /* Replaygain data (not really supported in 2.3, we use an experimental
+           tag there) */
+      GST_TAG_TRACK_PEAK, add_relative_volume_tag, NULL}, {
+      GST_TAG_TRACK_GAIN, add_relative_volume_tag, NULL}, {
+      GST_TAG_ALBUM_PEAK, add_relative_volume_tag, NULL}, {
+      GST_TAG_ALBUM_GAIN, add_relative_volume_tag, NULL}, {
+
+        /* Sortable version of various tags. These are all v2.4 ONLY */
+      GST_TAG_ARTIST_SORTNAME, add_text_tag_v4, "TSOP"}, {
+      GST_TAG_ALBUM_SORTNAME, add_text_tag_v4, "TSOA"}, {
+      GST_TAG_TITLE_SORTNAME, add_text_tag_v4, "TSOT"}
 };
 
 static void
@@ -1377,14 +1378,14 @@
   const GstId3v1WriteFunc func;
 } v1_funcs = {
   {
-  GST_TAG_TITLE, 3, 30, latin1_convert}, {
-  GST_TAG_ARTIST, 33, 30, latin1_convert}, {
-  GST_TAG_ALBUM, 63, 30, latin1_convert}, {
-  GST_TAG_DATE_TIME, 93, 4, date_v1_convert}, {
-  GST_TAG_COMMENT, 97, 28, latin1_convert}, {
-    /* Note: one-byte gap here */
-  GST_TAG_TRACK_NUMBER, 126, 1, track_number_convert}, {
-  GST_TAG_GENRE, 127, 1, genre_v1_convert}
+      GST_TAG_TITLE, 3, 30, latin1_convert}, {
+      GST_TAG_ARTIST, 33, 30, latin1_convert}, {
+      GST_TAG_ALBUM, 63, 30, latin1_convert}, {
+      GST_TAG_DATE_TIME, 93, 4, date_v1_convert}, {
+      GST_TAG_COMMENT, 97, 28, latin1_convert}, {
+        /* Note: one-byte gap here */
+      GST_TAG_TRACK_NUMBER, 126, 1, track_number_convert}, {
+      GST_TAG_GENRE, 127, 1, genre_v1_convert}
 };
 
 GstBuffer *

gst-plugins-bad-1.24.5.tar.xz/gst/insertbin Added

gst-plugins-bad-1.24.5.tar.xz/gst/insertbin/meson.build Added

gst-plugins-bad-1.24.5.tar.xz/gst/insertbin/plugin.c Added

@@ -0,0 +1,49 @@
+/* GStreamer
+ *
+ * Copyright (C) 2023 Alexander Slobodeniuk <aslobodeniuk@fluendo.com>
+ *
+ * insertbin: a GstBin to insertally link filter-like elements.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * plugin-insertbin:
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gst/insertbin/gstinsertbin.h>
+
+GST_ELEMENT_REGISTER_DECLARE (insertbin);
+GST_ELEMENT_REGISTER_DEFINE (insertbin, "insertbin", GST_RANK_NONE,
+    GST_TYPE_INSERT_BIN);
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  return GST_ELEMENT_REGISTER (insertbin, plugin);
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    insertbin,
+    "insertbin",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

gst-plugins-bad-1.22.7.tar.xz/gst/inter/gstintersubsrc.c -> gst-plugins-bad-1.24.5.tar.xz/gst/inter/gstintersubsrc.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/interlace/gstinterlace.c -> gst-plugins-bad-1.24.5.tar.xz/gst/interlace/gstinterlace.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/jp2kdecimator/jp2kcodestream.c -> gst-plugins-bad-1.24.5.tar.xz/gst/jp2kdecimator/jp2kcodestream.c Changed

@@ -504,7 +504,7 @@
     return GST_FLOW_ERROR;
   }
 
-  siz->components = g_slice_alloc (sizeof (ComponentSize) * siz->n_components);
+  siz->components = g_new (ComponentSize, siz->n_components);
   for (i = 0; i < siz->n_components; i++) {
     siz->componentsi.s = gst_byte_reader_get_uint8_unchecked (reader);
     siz->componentsi.xr = gst_byte_reader_get_uint8_unchecked (reader);
@@ -524,7 +524,7 @@
 reset_siz (GstJP2kDecimator * self, ImageSize * siz)
 {
   if (siz->components)
-    g_slice_free1 (sizeof (ComponentSize) * siz->n_components, siz->components);
+    g_free (siz->components);
   memset (siz, 0, sizeof (ImageSize));
 }
 
@@ -574,8 +574,8 @@
   }
 
   Scod = gst_byte_reader_get_uint8_unchecked (reader);
-  cod->sop = ! !(Scod & 0x02);
-  cod->eph = ! !(Scod & 0x04);
+  cod->sop = !!(Scod & 0x02);
+  cod->eph = !!(Scod & 0x04);
 
   /* SGcod */
   cod->progression_order = gst_byte_reader_get_uint8_unchecked (reader);
@@ -598,7 +598,7 @@
       return GST_FLOW_ERROR;
     }
 
-    cod->PPx = g_slice_alloc (sizeof (guint8) * (cod->n_decompositions + 1));
+    cod->PPx = g_new (guint8, (cod->n_decompositions + 1));
     for (i = 0; i < cod->n_decompositions + 1; i++) {
       guint8 v = gst_byte_reader_get_uint8_unchecked (reader);
       cod->PPxi = (v & 0x0f);
@@ -618,10 +618,8 @@
 static void
 reset_cod (GstJP2kDecimator * self, CodingStyleDefault * cod)
 {
-  if (cod->PPx)
-    g_slice_free1 (sizeof (guint8) * (cod->n_decompositions + 1), cod->PPx);
-  if (cod->PPy)
-    g_slice_free1 (sizeof (guint8) * (cod->n_decompositions + 1), cod->PPy);
+  g_free (cod->PPx);
+  g_free (cod->PPy);
   memset (cod, 0, sizeof (CodingStyleDefault));
 }
 
@@ -880,14 +878,14 @@
       goto done;
     }
 
-    p = g_slice_new0 (Packet);
+    p = g_new0 (Packet, 1);
 
     /* If there is a SOP keep the seqno */
     if (sop && length > 6) {
       if (!gst_byte_reader_peek_uint16_be (reader, &marker)) {
         GST_ERROR_OBJECT (self, "Truncated file");
         ret = GST_FLOW_ERROR;
-        g_slice_free (Packet, p);
+        g_free (p);
         goto done;
       }
 
@@ -899,14 +897,14 @@
         if (!gst_byte_reader_get_uint16_be (reader, &dummy)) {
           GST_ERROR_OBJECT (self, "Truncated file");
           ret = GST_FLOW_ERROR;
-          g_slice_free (Packet, p);
+          g_free (p);
           goto done;
         }
 
         if (!gst_byte_reader_get_uint16_be (reader, &seqno)) {
           GST_ERROR_OBJECT (self, "Truncated file");
           ret = GST_FLOW_ERROR;
-          g_slice_free (Packet, p);
+          g_free (p);
           goto done;
         }
         p->data = gst_byte_reader_peek_data_unchecked (reader);
@@ -966,7 +964,7 @@
       }
 
       if (marker == MARKER_SOP || marker == MARKER_EOC || marker == MARKER_SOT) {
-        Packet *p = g_slice_new (Packet);
+        Packet *p = g_new (Packet, 1);
 
         p->sop = TRUE;
         p->eph = eph;
@@ -1143,7 +1141,7 @@
           goto done;
         }
 
-        tile->cod = g_slice_new0 (CodingStyleDefault);
+        tile->cod = g_new0 (CodingStyleDefault, 1);
         ret = parse_cod (self, reader, tile->cod, length);
         if (ret != GST_FLOW_OK)
           goto done;
@@ -1165,11 +1163,11 @@
         ret = GST_FLOW_ERROR;
         goto done;
       case MARKER_PLT:{
-        PacketLengthTilePart *plt = g_slice_new (PacketLengthTilePart);
+        PacketLengthTilePart *plt = g_new (PacketLengthTilePart, 1);
 
         ret = parse_plt (self, reader, plt, length);
         if (ret != GST_FLOW_OK) {
-          g_slice_free (PacketLengthTilePart, plt);
+          g_free (plt);
           goto done;
         }
 
@@ -1182,13 +1180,13 @@
           ret = GST_FLOW_ERROR;
           goto done;
         }
-        tile->qcd = g_slice_new (Buffer);
+        tile->qcd = g_new (Buffer, 1);
         tile->qcd->data = gst_byte_reader_peek_data_unchecked (reader);
         tile->qcd->length = length - 2;
         gst_byte_reader_skip_unchecked (reader, length - 2);
         break;
       case MARKER_QCC:{
-        Buffer *p = g_slice_new (Buffer);
+        Buffer *p = g_new (Buffer, 1);
         p->data = gst_byte_reader_peek_data_unchecked (reader);
         p->length = length - 2;
         tile->qcc = g_list_append (tile->qcc, p);
@@ -1196,7 +1194,7 @@
         break;
       }
       case MARKER_COM:{
-        Buffer *p = g_slice_new (Buffer);
+        Buffer *p = g_new (Buffer, 1);
         p->data = gst_byte_reader_peek_data_unchecked (reader);
         p->length = length - 2;
         tile->com = g_list_append (tile->com, p);
@@ -1265,7 +1263,7 @@
 
   if (tile->cod) {
     reset_cod (self, tile->cod);
-    g_slice_free (CodingStyleDefault, tile->cod);
+    g_free (tile->cod);
   }
 
   for (l = tile->plt; l; l = l->next) {
@@ -1273,27 +1271,27 @@
 
     reset_plt (self, plt);
 
-    g_slice_free (PacketLengthTilePart, plt);
+    g_free (plt);
   }
   g_list_free (tile->plt);
 
   if (tile->qcd)
-    g_slice_free (Buffer, tile->qcd);
+    g_free (tile->qcd);
 
   for (l = tile->qcc; l; l = l->next) {
-    g_slice_free (Buffer, l->data);
+    g_free (l->data);
   }
   g_list_free (tile->qcc);
 
   for (l = tile->com; l; l = l->next) {
-    g_slice_free (Buffer, l->data);
+    g_free (l->data);
   }
   g_list_free (tile->com);
 
   for (l = tile->packets; l; l = l->next) {
     Packet *p = l->data;
 
-    g_slice_free (Packet, p);
+    g_free (p);
   }
   g_list_free (tile->packets);
 
@@ -1548,7 +1546,7 @@
         gst_byte_reader_skip_unchecked (reader, length - 2);
         break;
       case MARKER_QCC:{
-        Buffer *p = g_slice_new (Buffer);
+        Buffer *p = g_new (Buffer, 1);
         p->data = gst_byte_reader_peek_data_unchecked (reader);
         p->length = length - 2;
         header->qcc = g_list_append (header->qcc, p);
@@ -1556,7 +1554,7 @@
         break;
       }
       case MARKER_COM:{
-        Buffer *p = g_slice_new (Buffer);
+        Buffer *p = g_new (Buffer, 1);
         p->data = gst_byte_reader_peek_data_unchecked (reader);
         p->length = length - 2;
         header->com = g_list_append (header->com, p);
@@ -1564,7 +1562,7 @@
         break;
       }
       case MARKER_CRG:{
-        Buffer *p = g_slice_new (Buffer);
+        Buffer *p = g_new (Buffer, 1);
         p->data = gst_byte_reader_peek_data_unchecked (reader);
         p->length = length - 2;
         header->crg = g_list_append (header->crg, p);
@@ -1589,7 +1587,7 @@
       (header->siz.y - header->siz.yto + header->siz.yt - 1) / header->siz.yt;
   header->n_tiles = header->n_tiles_x * header->n_tiles_y;
 
-  header->tiles = g_slice_alloc0 (sizeof (Tile) * header->n_tiles);
+  header->tiles = g_malloc0 (sizeof (Tile) * header->n_tiles);
 
   /* now at SOT marker, read the tiles */
   {
@@ -1661,19 +1659,19 @@
     for (i = 0; i < header->n_tiles; i++) {
       reset_tile (self, header, &header->tilesi);
     }
-    g_slice_free1 (sizeof (Tile) * header->n_tiles, header->tiles);
+    g_free (header->tiles);
   }
 
   for (l = header->qcc; l; l = l->next)
-    g_slice_free (Buffer, l->data);
+    g_free (l->data);
   g_list_free (header->qcc);
 
   for (l = header->com; l; l = l->next)
-    g_slice_free (Buffer, l->data);
+    g_free (l->data);
   g_list_free (header->com);
 
   for (l = header->crg; l; l = l->next)
-    g_slice_free (Buffer, l->data);
+    g_free (l->data);
   g_list_free (header->crg);
 
   reset_cod (self, &header->cod);
@@ -1768,7 +1766,7 @@
         ret = GST_FLOW_ERROR;
         goto done;
       }
-      plt = g_slice_new (PacketLengthTilePart);
+      plt = g_new (PacketLengthTilePart, 1);
       plt->index = 0;
       plt->packet_lengths = g_array_new (FALSE, FALSE, sizeof (guint32));
     }
@@ -1783,7 +1781,7 @@
         GST_ERROR_OBJECT (self, "Not enough packets");
         ret = GST_FLOW_ERROR;
         g_array_free (plt->packet_lengths, TRUE);
-        g_slice_free (PacketLengthTilePart, plt);
+        g_free (plt);
         goto done;
       }
 
@@ -1806,7 +1804,7 @@
 
     if (plt) {
       reset_plt (self, tile->plt->data);
-      g_slice_free (PacketLengthTilePart, tile->plt->data);
+      g_free (tile->plt->data);
       tile->plt->data = plt;
     }

gst-plugins-bad-1.22.7.tar.xz/gst/jpegformat/gstjifmux.c -> gst-plugins-bad-1.24.5.tar.xz/gst/jpegformat/gstjifmux.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/jpegformat/gstjpegparse.c -> gst-plugins-bad-1.24.5.tar.xz/gst/jpegformat/gstjpegparse.c Changed

@@ -61,7 +61,6 @@
 #include <gst/base/gstbytereader.h>
 #include <gst/codecparsers/gstjpegparser.h>
 #include <gst/tag/tag.h>
-#include <gst/video/video.h>
 
 #include "gstjpegparse.h"
 
@@ -107,7 +106,7 @@
 
 #define gst_jpeg_parse_parent_class parent_class
 G_DEFINE_TYPE (GstJpegParse, gst_jpeg_parse, GST_TYPE_BASE_PARSE);
-GST_ELEMENT_REGISTER_DEFINE (jpegparse, "jpegparse", GST_RANK_NONE,
+GST_ELEMENT_REGISTER_DEFINE (jpegparse, "jpegparse", GST_RANK_PRIMARY,
     GST_TYPE_JPEG_PARSE);
 
 enum GstJPEGColorspace
@@ -191,17 +190,66 @@
   parse->sof = -1;
 }
 
+static void
+parse_avid (GstJpegParse * parse, const guint8 * data, guint16 len)
+{
+  parse->avid = 1;
+  if (len > 14 && data12 == 1)        /* 1 - NTSC */
+    parse->field_order = GST_VIDEO_FIELD_ORDER_BOTTOM_FIELD_FIRST;
+  if (len > 14 && data12 == 2)        /* 2 - PAL */
+    parse->field_order = GST_VIDEO_FIELD_ORDER_TOP_FIELD_FIRST;
+  GST_INFO_OBJECT (parse, "AVID: %s",
+      gst_video_field_order_to_string (parse->field_order));
+}
+
 static gboolean
 gst_jpeg_parse_set_sink_caps (GstBaseParse * bparse, GstCaps * caps)
 {
   GstJpegParse *parse = GST_JPEG_PARSE_CAST (bparse);
   GstStructure *s = gst_caps_get_structure (caps, 0);
+  const GValue *codec_data;
+  const char *interlace_mode, *field_order;
 
   GST_DEBUG_OBJECT (parse, "get sink caps %" GST_PTR_FORMAT, caps);
 
   gst_structure_get_fraction (s, "framerate",
       &parse->framerate_numerator, &parse->framerate_denominator);
 
+  gst_structure_get_int (s, "height", &parse->orig_height);
+  gst_structure_get_int (s, "width", &parse->orig_width);
+
+  gst_structure_get_fraction (s, "pixel-aspect-ration", &parse->par_num,
+      &parse->par_den);
+
+  codec_data = gst_structure_get_value (s, "codec_data");
+  if (codec_data && G_VALUE_TYPE (codec_data) == GST_TYPE_BUFFER) {
+    GstMapInfo map;
+
+    gst_clear_buffer (&parse->codec_data);
+
+    parse->codec_data = GST_BUFFER (g_value_dup_boxed (codec_data));
+    if (gst_buffer_map (parse->codec_data, &map, GST_MAP_READ)) {
+      if (map.size > 8 && map.data0 == 0x2c && map.data4 == 0x18)
+        parse_avid (parse, map.data, map.size);
+      gst_buffer_unmap (parse->codec_data, &map);
+    }
+  }
+
+  interlace_mode = gst_structure_get_string (s, "interlace-mode");
+  if (interlace_mode) {
+    parse->interlace_mode =
+        gst_video_interlace_mode_from_string (interlace_mode);
+  }
+
+  if (parse->interlace_mode != GST_VIDEO_INTERLACE_MODE_PROGRESSIVE) {
+    field_order = gst_structure_get_string (s, "field-order");
+    if (field_order)
+      parse->field_order = gst_video_field_order_from_string (field_order);
+  }
+
+  g_clear_pointer (&parse->colorimetry, g_free);
+  parse->colorimetry = g_strdup (gst_structure_get_string (s, "colorimetry"));
+
   return TRUE;
 }
 
@@ -273,38 +321,37 @@
 gst_jpeg_parse_sof (GstJpegParse * parse, GstJpegSegment * seg)
 {
   GstJpegFrameHdr hdr = { 0, };
+  guint colorspace;
+  guint sampling;
 
   if (!gst_jpeg_segment_parse_frame_header (seg, &hdr)) {
     return FALSE;
   }
 
-  parse->width = hdr.width;
-  parse->height = hdr.height;
-
-  parse->colorspace = GST_JPEG_COLORSPACE_NONE;
-  parse->sampling = GST_JPEG_SAMPLING_NONE;
+  colorspace = GST_JPEG_COLORSPACE_NONE;
+  sampling = GST_JPEG_SAMPLING_NONE;
 
   switch (hdr.num_components) {
     case 1:
-      parse->colorspace = GST_JPEG_COLORSPACE_GRAY;
-      parse->sampling = GST_JPEG_SAMPLING_GRAYSCALE;
+      colorspace = GST_JPEG_COLORSPACE_GRAY;
+      sampling = GST_JPEG_SAMPLING_GRAYSCALE;
       break;
     case 3:
       if (valid_state (parse->state, GST_JPEG_PARSER_STATE_GOT_JFIF)) {
-        parse->colorspace = GST_JPEG_COLORSPACE_YUV;
-        parse->sampling = yuv_sampling (&hdr);
+        colorspace = GST_JPEG_COLORSPACE_YUV;
+        sampling = yuv_sampling (&hdr);
       } else {
         if (valid_state (parse->state, GST_JPEG_PARSER_STATE_GOT_ADOBE)) {
           if (parse->adobe_transform == 0) {
-            parse->colorspace = GST_JPEG_COLORSPACE_RGB;
-            parse->sampling = GST_JPEG_SAMPLING_RGB;
+            colorspace = GST_JPEG_COLORSPACE_RGB;
+            sampling = GST_JPEG_SAMPLING_RGB;
           } else if (parse->adobe_transform == 1) {
-            parse->colorspace = GST_JPEG_COLORSPACE_YUV;;
-            parse->sampling = yuv_sampling (&hdr);
+            colorspace = GST_JPEG_COLORSPACE_YUV;;
+            sampling = yuv_sampling (&hdr);
           } else {
             GST_DEBUG_OBJECT (parse, "Unknown Adobe color transform code");
-            parse->colorspace = GST_JPEG_COLORSPACE_YUV;;
-            parse->sampling = yuv_sampling (&hdr);
+            colorspace = GST_JPEG_COLORSPACE_YUV;;
+            sampling = yuv_sampling (&hdr);
           }
         } else {
           int cid0, cid1, cid2;
@@ -314,15 +361,15 @@
           cid2 = hdr.components2.identifier;
 
           if (cid0 == 1 && cid1 == 2 && cid2 == 3) {
-            parse->colorspace = GST_JPEG_COLORSPACE_YUV;
-            parse->sampling = yuv_sampling (&hdr);
+            colorspace = GST_JPEG_COLORSPACE_YUV;
+            sampling = yuv_sampling (&hdr);
           } else if (cid0 == 'R' && cid1 == 'G' && cid2 == 'B') {
-            parse->colorspace = GST_JPEG_COLORSPACE_RGB;
-            parse->sampling = GST_JPEG_SAMPLING_RGB;
+            colorspace = GST_JPEG_COLORSPACE_RGB;
+            sampling = GST_JPEG_SAMPLING_RGB;
           } else {
             GST_DEBUG_OBJECT (parse, "Unrecognized component IDs");
-            parse->colorspace = GST_JPEG_COLORSPACE_YUV;
-            parse->sampling = yuv_sampling (&hdr);
+            colorspace = GST_JPEG_COLORSPACE_YUV;
+            sampling = yuv_sampling (&hdr);
           }
         }
       }
@@ -330,15 +377,15 @@
     case 4:
       if (valid_state (parse->state, GST_JPEG_PARSER_STATE_GOT_ADOBE)) {
         if (parse->adobe_transform == 0) {
-          parse->colorspace = GST_JPEG_COLORSPACE_CMYK;
+          colorspace = GST_JPEG_COLORSPACE_CMYK;
         } else if (parse->adobe_transform == 2) {
-          parse->colorspace = GST_JPEG_COLORSPACE_YCCK;
+          colorspace = GST_JPEG_COLORSPACE_YCCK;
         } else {
           GST_DEBUG_OBJECT (parse, "Unknown Adobe color transform code");
-          parse->colorspace = GST_JPEG_COLORSPACE_YCCK;
+          colorspace = GST_JPEG_COLORSPACE_YCCK;
         }
       } else {
-        parse->colorspace = GST_JPEG_COLORSPACE_CMYK;
+        colorspace = GST_JPEG_COLORSPACE_CMYK;
       }
       break;
     default:
@@ -346,6 +393,29 @@
       break;
   }
 
+  if (hdr.width != parse->width || hdr.height != parse->height
+      || colorspace != parse->colorspace || sampling != parse->sampling) {
+    parse->width = hdr.width;
+    parse->height = hdr.height;
+    parse->colorspace = colorspace;
+    parse->sampling = sampling;
+
+    if (parse->first_picture && !parse->multiscope) {
+      if (parse->orig_height > 0
+          && parse->height < ((parse->orig_height * 3) / 4)) {
+        parse->interlace_mode = GST_VIDEO_INTERLACE_MODE_INTERLEAVED;
+      } else if (parse->avid) {
+        /* if no container info, let's suppose it doubles its height */
+        if (parse->orig_height == 0)
+          parse->orig_height = 2 * hdr.height;
+        parse->interlace_mode = GST_VIDEO_INTERLACE_MODE_INTERLEAVED;
+      }
+    }
+
+    parse->first_picture = FALSE;
+    parse->renegotiate = TRUE;
+  }
+
   GST_INFO_OBJECT (parse, "SOF %dx%d %d comp - %s", parse->width,
       parse->height, hdr.num_components,
       GST_STR_NULL (colorspace_to_string (parse->colorspace)));
@@ -364,9 +434,9 @@
 gst_jpeg_parse_app0 (GstJpegParse * parse, GstJpegSegment * seg)
 {
   GstByteReader reader;
-  const gchar *id_str;
   guint16 xd, yd;
   guint8 unit, xt, yt;
+  guint32 id;
 
   if (seg->size < 6)            /* less than 6 means no id string */
     return FALSE;
@@ -374,14 +444,22 @@
   gst_byte_reader_init (&reader, seg->data + seg->offset, seg->size);
   gst_byte_reader_skip_unchecked (&reader, 2);
 
-  if (!gst_byte_reader_get_string_utf8 (&reader, &id_str))
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+  if (!gst_byte_reader_get_uint32_le (&reader, &id))
     return FALSE;
+#else
+  if (!gst_byte_reader_get_uint32_be (&reader, &id))
+    return FALSE;
+#endif
 
   if (!valid_state (parse->state, GST_JPEG_PARSER_STATE_GOT_JFIF)
-      && g_strcmp0 (id_str, "JFIF") == 0) {
+      && GST_MAKE_FOURCC ('J', 'F', 'I', 'F') == id) {
 
     parse->state |= GST_JPEG_PARSER_STATE_GOT_JFIF;
 
+    /* trailing zero-byte */
+    gst_byte_reader_skip_unchecked (&reader, 1);
+
     /* version */
     gst_byte_reader_skip_unchecked (&reader, 2);
 
@@ -390,11 +468,19 @@
       return FALSE;
 
     /* x density */
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+    if (!gst_byte_reader_get_uint16_le (&reader, &xd))
+      return FALSE;
+    /* y density */
+    if (!gst_byte_reader_get_uint16_le (&reader, &yd))
+      return FALSE;
+#else
     if (!gst_byte_reader_get_uint16_be (&reader, &xd))
       return FALSE;
     /* y density */
     if (!gst_byte_reader_get_uint16_be (&reader, &yd))
       return FALSE;
+#endif
 
     /* x thumbnail */
     if (!gst_byte_reader_get_uint8 (&reader, &xt))
@@ -405,8 +491,11 @@
 
     if (unit == 0) {
       /* no units, X and Y specify the pixel aspect ratio */
-      parse->x_density = xd;
-      parse->y_density = yd;
+      if (parse->par_num != xd || parse->par_den != yd) {
+        parse->renegotiate = TRUE;
+        parse->par_num = xd;
+        parse->par_den = yd;
+      }
     } else if (unit == 1 || unit == 2) {
       /* tag pixel per inches */
       double hppi = xd, vppi = yd;
@@ -430,7 +519,7 @@
   }
 
   /* JFIF  Extension  */
-  if (g_strcmp0 (id_str, "JFXX") == 0) {
+  if (GST_MAKE_FOURCC ('J', 'F', 'X', 'X') == id) {
     if (!valid_state (parse->state, GST_JPEG_PARSER_STATE_GOT_JFIF))
       return FALSE;
 
@@ -438,18 +527,22 @@
   }
 
   /* https://exiftool.org/TagNames/JPEG.html#AVI1 */
-  if (g_strcmp0 (id_str, "AVI1") == 0) {
+  if (GST_MAKE_FOURCC ('A', 'V', 'I', '1') == id) {
     /* polarity */
     if (!gst_byte_reader_get_uint8 (&reader, &unit))
       return FALSE;
 
+    parse->avid = (unit > 0);   /* otherwise is not interleaved */
+
     /* TODO: update caps for interlaced MJPEG */
-    GST_DEBUG_OBJECT (parse, "MJPEG interleaved field: %d", unit);
+    GST_DEBUG_OBJECT (parse, "MJPEG interleaved field: %s", unit == 0 ?
+        "not interleaved" : unit % 2 ? "Odd" : "Even");
 
     return TRUE;
   }
 
-  GST_DEBUG_OBJECT (parse, "Unhandled app0: %s", id_str);
+  GST_MEMDUMP_OBJECT (parse, "Unhandled app0", seg->data + seg->offset,
+      seg->size);
 
   return TRUE;
 }
@@ -522,7 +615,8 @@
     return TRUE;
   }
 
-  GST_DEBUG_OBJECT (parse, "Unhandled app1: %s", id_str);
+  GST_MEMDUMP_OBJECT (parse, "Unhandled app1", seg->data + seg->offset,
+      seg->size);
 
   return TRUE;
 }
@@ -569,8 +663,13 @@
     "GST_TAG_ENCODING", NULL
   };
   const char *str = (gchar *) data;
+  char *ret;
 
-  return gst_tag_freeform_string_to_utf8 (str, size, env_vars);
+  ret = gst_tag_freeform_string_to_utf8 (str, size, env_vars);
+  if (!ret)
+    GST_MEMDUMP ("non-parsed marker data", data, size);
+
+  return ret;
 }
 
 /* read comment and post as tag */
@@ -580,39 +679,47 @@
   GstByteReader reader;
   const guint8 *data = NULL;
   guint16 size;
-  gchar *comment;
+  const gchar *buf;
 
   gst_byte_reader_init (&reader, seg->data + seg->offset, seg->size);
   gst_byte_reader_skip_unchecked (&reader, 2);
 
   size = gst_byte_reader_get_remaining (&reader);
-
   if (!gst_byte_reader_get_data (&reader, size, &data))
     return FALSE;
 
-  comment = get_utf8_from_data (data, size);
-  if (!comment)
-    return FALSE;
+  buf = (const gchar *) data;
+  /* buggy avid, it puts EOI only at every 10th frame */
+  if (g_str_has_prefix (buf, "AVID")) {
+    parse_avid (parse, data, size);
+  } else if (g_str_has_prefix (buf, "MULTISCOPE II")) {
+    parse->par_num = 1;
+    parse->par_den = 2;
+    parse->multiscope = TRUE;
+  } else {
+    gchar *comment;
+
+    comment = get_utf8_from_data (data, size);
+    if (!comment)
+      return FALSE;
 
-  GST_INFO_OBJECT (parse, "comment found: %s", comment);
-  gst_tag_list_add (get_tag_list (parse), GST_TAG_MERGE_REPLACE,
-      GST_TAG_COMMENT, comment, NULL);
-  g_free (comment);
+    GST_INFO_OBJECT (parse, "comment found: %s", comment);
+    gst_tag_list_add (get_tag_list (parse), GST_TAG_MERGE_REPLACE,
+        GST_TAG_COMMENT, comment, NULL);
+    g_free (comment);
+  }
 
   return TRUE;
 }
 
+/* reset per image */
 static void
 gst_jpeg_parse_reset (GstJpegParse * parse)
 {
-  parse->width = 0;
-  parse->height = 0;
   parse->last_offset = 0;
   parse->state = 0;
-  parse->sof = -1;
   parse->adobe_transform = 0;
-  parse->x_density = 0;
-  parse->y_density = 0;
+  parse->field = 0;
 
   if (parse->tags) {
     gst_tag_list_unref (parse->tags);
@@ -630,14 +737,20 @@
 gst_jpeg_parse_set_new_caps (GstJpegParse * parse)
 {
   GstCaps *caps;
+  GstEvent *event;
   gboolean res;
 
+  if (!parse->renegotiate)
+    return TRUE;
+
   caps = gst_caps_new_simple ("image/jpeg", "parsed", G_TYPE_BOOLEAN, TRUE,
       NULL);
 
   if (parse->width > 0)
     gst_caps_set_simple (caps, "width", G_TYPE_INT, parse->width, NULL);
-  if (parse->width > 0)
+  if (parse->orig_height > 0 && parse->orig_height > parse->height)
+    gst_caps_set_simple (caps, "height", G_TYPE_INT, parse->orig_height, NULL);
+  else if (parse->height > 0)
     gst_caps_set_simple (caps, "height", G_TYPE_INT, parse->height, NULL);
   if (parse->sof >= 0)
     gst_caps_set_simple (caps, "sof-marker", G_TYPE_INT, parse->sof, NULL);
@@ -650,29 +763,43 @@
         sampling_to_string (parse->sampling), NULL);
   }
 
+  if (parse->colorimetry) {
+    gst_caps_set_simple (caps, "colorimetry", G_TYPE_STRING, parse->colorimetry,
+        NULL);
+  }
+
+  gst_caps_set_simple (caps, "interlace-mode", G_TYPE_STRING,
+      gst_video_interlace_mode_to_string (parse->interlace_mode), NULL);
+
+  if (parse->interlace_mode == GST_VIDEO_INTERLACE_MODE_INTERLEAVED) {
+    gst_caps_set_simple (caps, "field-order", G_TYPE_STRING,
+        gst_video_field_order_to_string (parse->field_order), NULL);
+  }
+
   gst_caps_set_simple (caps, "framerate", GST_TYPE_FRACTION,
       parse->framerate_numerator, parse->framerate_denominator, NULL);
 
-  if (parse->x_density > 0 && parse->y_density > 0) {
+  if (parse->par_num > 0 && parse->par_den > 0) {
     gst_caps_set_simple (caps, "pixel-aspect-ratio", GST_TYPE_FRACTION,
-        parse->x_density, parse->y_density, NULL);
+        parse->par_num, parse->par_den, NULL);
   }
 
-  if (parse->prev_caps && gst_caps_is_equal_fixed (caps, parse->prev_caps)) {
-    gst_caps_unref (caps);
-    return TRUE;
+  if (parse->codec_data) {
+    gst_caps_set_simple (caps, "codec_data", GST_TYPE_BUFFER, parse->codec_data,
+        NULL);
   }
 
+  parse->renegotiate = FALSE;
+
   GST_DEBUG_OBJECT (parse,
       "setting downstream caps on %s:%s to %" GST_PTR_FORMAT,
       GST_DEBUG_PAD_NAME (GST_BASE_PARSE_SRC_PAD (parse)), caps);
-  res = gst_pad_set_caps (GST_BASE_PARSE_SRC_PAD (parse), caps);
 
-  gst_caps_replace (&parse->prev_caps, caps);
+  event = gst_event_new_caps (caps);
+  res = gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (parse), event);
   gst_caps_unref (caps);
 
   return res;
-
 }
 
 static GstFlowReturn
@@ -694,6 +821,7 @@
     GST_WARNING_OBJECT (parse, "Potentially invalid picture");
   }
 
+  GST_TRACE_OBJECT (parse, "Finish frame %" GST_PTR_FORMAT, frame->buffer);
   ret = gst_base_parse_finish_frame (bparse, frame, size);
 
   gst_jpeg_parse_reset (parse);
@@ -711,6 +839,8 @@
   GstJpegSegment seg;
   guint offset;
 
+  GST_TRACE_OBJECT (parse, "frame %" GST_PTR_FORMAT, frame->buffer);
+
   if (!gst_buffer_map (frame->buffer, &mapinfo, GST_MAP_READ))
     return GST_FLOW_ERROR;
 
@@ -754,7 +884,9 @@
     switch (marker) {
       case GST_JPEG_MARKER_SOI:
         /* This means that new SOI comes without an previous EOI. */
-        if (offset > 2) {
+        if (offset > 2
+            && (parse->interlace_mode == GST_VIDEO_INTERLACE_MODE_PROGRESSIVE
+                || parse->field == 0)) {
           /* If already some data segment parsed, push it as a frame. */
           if (valid_state (parse->state, GST_JPEG_PARSER_STATE_GOT_SOS)) {
             gst_buffer_unmap (frame->buffer, &mapinfo);
@@ -785,8 +917,15 @@
         parse->state |= GST_JPEG_PARSER_STATE_GOT_SOI;
         break;
       case GST_JPEG_MARKER_EOI:
-        gst_buffer_unmap (frame->buffer, &mapinfo);
-        return gst_jpeg_parse_finish_frame (parse, frame, seg.offset);
+        if (parse->interlace_mode == GST_VIDEO_INTERLACE_MODE_PROGRESSIVE
+            || parse->field == 1) {
+          gst_buffer_unmap (frame->buffer, &mapinfo);
+          return gst_jpeg_parse_finish_frame (parse, frame, seg.offset);
+        } else if (parse->interlace_mode == GST_VIDEO_INTERLACE_MODE_INTERLEAVED
+            && parse->field == 0) {
+          parse->field = 1;
+          parse->state = 0;
+        }
         break;
       case GST_JPEG_MARKER_SOS:
         if (!valid_state (parse->state, GST_JPEG_PARSER_STATE_GOT_SOF))
@@ -794,28 +933,20 @@
         parse->state |= GST_JPEG_PARSER_STATE_GOT_SOS;
         break;
       case GST_JPEG_MARKER_COM:
-        if (!gst_jpeg_parse_com (parse, &seg)) {
-          GST_ELEMENT_WARNING (parse, STREAM, FORMAT,
-              ("Failed to parse com segment"), ("Invalid data"));
-        }
+        if (!gst_jpeg_parse_com (parse, &seg))
+          GST_WARNING_OBJECT (parse, "Failed to parse com segment");
         break;
       case GST_JPEG_MARKER_APP0:
-        if (!gst_jpeg_parse_app0 (parse, &seg)) {
-          GST_ELEMENT_WARNING (parse, STREAM, FORMAT,
-              ("Failed to parse app0 segment"), ("Invalid data"));
-        }
+        if (!gst_jpeg_parse_app0 (parse, &seg))
+          GST_WARNING_OBJECT (parse, "Failed to parse app0 segment");
         break;
       case GST_JPEG_MARKER_APP1:
-        if (!gst_jpeg_parse_app1 (parse, &seg)) {
-          GST_ELEMENT_WARNING (parse, STREAM, FORMAT,
-              ("Failed to parse app1 segment"), ("Invalid data"));
-        }
+        if (!gst_jpeg_parse_app1 (parse, &seg))
+          GST_WARNING_OBJECT (parse, "Failed to parse app1 segment");
         break;
       case GST_JPEG_MARKER_APP14:
-        if (!gst_jpeg_parse_app14 (parse, &seg)) {
-          GST_ELEMENT_WARNING (parse, STREAM, FORMAT,
-              ("Failed to parse app14 segment"), ("Invalid data"));
-        }
+        if (!gst_jpeg_parse_app14 (parse, &seg))
+          GST_WARNING_OBJECT (parse, "Failed to parse app14 segment");
         break;
       case GST_JPEG_MARKER_DHT:
       case GST_JPEG_MARKER_DAC:
@@ -827,11 +958,17 @@
             marker <= GST_JPEG_MARKER_SOF_MAX) {
           if (!valid_state (parse->state, GST_JPEG_PARSER_STATE_GOT_SOF)
               && gst_jpeg_parse_sof (parse, &seg)) {
+            gint8 sof;
+
             parse->state |= GST_JPEG_PARSER_STATE_GOT_SOF;
-            parse->sof = marker - 0xc0;
+            sof = marker - 0xc0;
+            if (parse->sof != sof) {
+              parse->sof = sof;
+              parse->renegotiate = TRUE;
+            }
           } else {
             GST_ELEMENT_ERROR (parse, STREAM, FORMAT,
-                ("Duplicated or bad SOF marker"), (NULL));
+                ("Invalid data"), ("Duplicated or bad SOF marker"));
             gst_buffer_unmap (frame->buffer, &mapinfo);
             gst_jpeg_parse_reset (parse);
             return GST_FLOW_ERROR;
@@ -874,6 +1011,14 @@
   parse->framerate_numerator = 0;
   parse->framerate_denominator = 1;
 
+  parse->first_picture = TRUE;
+  parse->renegotiate = TRUE;
+
+  parse->par_num = parse->par_den = 1;
+
+  parse->interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
+  parse->field_order = GST_VIDEO_FIELD_ORDER_TOP_FIELD_FIRST;
+
   gst_jpeg_parse_reset (parse);
 
   gst_base_parse_set_min_frame_size (bparse, 2);
@@ -890,7 +1035,9 @@
     gst_tag_list_unref (parse->tags);
     parse->tags = NULL;
   }
+  gst_clear_buffer (&parse->codec_data);
   gst_clear_caps (&parse->prev_caps);
+  g_clear_pointer (&parse->colorimetry, g_free);
 
   return TRUE;
 }

gst-plugins-bad-1.22.7.tar.xz/gst/jpegformat/gstjpegparse.h -> gst-plugins-bad-1.24.5.tar.xz/gst/jpegformat/gstjpegparse.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst/meson.build Changed

@@ -5,13 +5,13 @@
                   'debugutils', 'dvbsubenc',
                   'dvbsuboverlay', 'dvdspu', 'faceoverlay', 'festival',
                   'fieldanalysis', 'freeverb', 'frei0r', 'gaudieffects', 'gdp',
-                  'geometrictransform', 'id3tag', 'inter', 'interlace',
+                  'geometrictransform', 'id3tag', 'insertbin', 'inter', 'interlace',
                   'ivfparse', 'ivtc', 'jp2kdecimator', 'jpegformat', 'librfb',
                   'midi', 'mpegdemux', 'mpegpsmux', 'mpegtsdemux', 'mpegtsmux',
-                  'mxf', 'netsim', 'onvif', 'pcapparse', 'pnm', 'proxy',
+                  'mse', 'mxf', 'netsim', 'onvif', 'pcapparse', 'pnm', 'proxy',
                   'rawparse', 'removesilence', 'rist', 'rtmp2', 'rtp', 'sdp',
                   'segmentclip', 'siren', 'smooth', 'speed', 'subenc', 'switchbin',
-                  'timecode', 'transcode', 'videofilters',
+                  'timecode', 'transcode', 'unixfd', 'videofilters',
                   'videoframe_audiolevel', 'videoparsers', 'videosignal',
                   'vmnc', 'y4m'
   if not get_option(plugin).disabled()

gst-plugins-bad-1.22.7.tar.xz/gst/midi/midiparse.c -> gst-plugins-bad-1.24.5.tar.xz/gst/midi/midiparse.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mpegpsmux/bits.h -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegpsmux/bits.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mpegpsmux/psmux.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegpsmux/psmux.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mpegpsmux/psmuxstream.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegpsmux/psmuxstream.c Changed

@@ -67,7 +67,7 @@
 PsMuxStream *
 psmux_stream_new (PsMux * mux, PsMuxStreamType stream_type)
 {
-  PsMuxStream *stream = g_slice_new0 (PsMuxStream);
+  PsMuxStream *stream = g_new0 (PsMuxStream, 1);
   PsMuxStreamIdInfo *info = &(mux->id_info);
 
   stream->stream_type = stream_type;
@@ -147,7 +147,7 @@
   if (stream->stream_id == 0) {
     g_critical ("Number of elementary streams of type %04x exceeds maximum",
         stream->stream_type);
-    g_slice_free (PsMuxStream, stream);
+    g_free (stream);
     return NULL;
   }
 
@@ -211,7 +211,7 @@
   if (psmux_stream_bytes_in_buffer (stream)) {
     g_warning ("Freeing stream with data not yet processed");
   }
-  g_slice_free (PsMuxStream, stream);
+  g_free (stream);
 }
 
 /* Advance the current packet stream position by len bytes.
@@ -237,7 +237,7 @@
 
     gst_buffer_unmap (stream->cur_buffer->buf, &stream->cur_buffer->map);
     gst_buffer_unref (stream->cur_buffer->buf);
-    g_slice_free (PsMuxStreamBuffer, stream->cur_buffer);
+    g_free (stream->cur_buffer);
     stream->cur_buffer = NULL;
   }
 }
@@ -494,13 +494,13 @@
 
   g_return_if_fail (stream != NULL);
 
-  packet = g_slice_new (PsMuxStreamBuffer);
+  packet = g_new (PsMuxStreamBuffer, 1);
   packet->buf = buffer;
 
   if (!gst_buffer_map (packet->buf, &packet->map, GST_MAP_READ)) {
     GST_ERROR ("Failed to map buffer for reading");
     gst_buffer_unref (packet->buf);
-    g_slice_free (PsMuxStreamBuffer, packet);
+    g_free (packet);
     return;
   }

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsdemux/gstmpegdesc.h -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsdemux/gstmpegdesc.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsdemux/mpegtsbase.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsdemux/mpegtsbase.c Changed

@@ -684,6 +684,7 @@
   program->streamspid = NULL;
 }
 
+#if 0                           /* Smart-update disabled */
 /* Check if pmtstream is already present in the program */
 static inline gboolean
 _stream_in_pmt (const GstMpegtsPMT * pmt, MpegTSBaseStream * stream)
@@ -768,7 +769,7 @@
   g_list_free (toremove);
   return TRUE;
 }
-
+#endif
 
 static gboolean
 _stream_is_private_section (const GstMpegtsPMT * pmt,
@@ -814,7 +815,6 @@
 {
   guint i, nbstreams;
   MpegTSBaseStream *oldstream;
-  gboolean sawpcrpid = FALSE;
 
   if (oldprogram->pmt_pid != new_pmt_pid) {
     GST_DEBUG ("Different pmt_pid (new:0x%04x, old:0x%04x)", new_pmt_pid,
@@ -828,7 +828,6 @@
     return FALSE;
   }
 
-  /* Check the streams */
   nbstreams = new_pmt->streams->len;
   for (i = 0; i < nbstreams; ++i) {
     GstMpegtsPMTStream *stream = g_ptr_array_index (new_pmt->streams, i);
@@ -844,17 +843,14 @@
           stream->pid, stream->stream_type, oldstream->stream_type);
       return FALSE;
     }
-    if (stream->pid == oldprogram->pcr_pid)
-      sawpcrpid = TRUE;
   }
 
-  /* If we have a PCR PID and the pcr is not shared with an existing stream, we'll have one extra stream */
-  if (!sawpcrpid && !base->ignore_pcr)
-    nbstreams += 1;
+  /* We can now just check the number of streams from each PMT. The check for
+   * PCR was already done previously */
 
-  if (nbstreams != g_list_length (oldprogram->stream_list)) {
-    GST_DEBUG ("Different number of streams (new:%d, old:%d)",
-        nbstreams, g_list_length (oldprogram->stream_list));
+  if (nbstreams != oldprogram->pmt->streams->len) {
+    GST_DEBUG ("Different number of streams (new:%d, old:%u)",
+        nbstreams, oldprogram->pmt->streams->len);
     return FALSE;
   }
 
@@ -862,6 +858,7 @@
   return TRUE;
 }
 
+#if 0                           /* Smart-update disabled */
 /* Return TRUE if program is an update
  *
  * A program is equal if:
@@ -923,6 +920,7 @@
   GST_DEBUG ("Program is not an update of the previous one");
   return FALSE;
 }
+#endif
 
 static void
 mpegts_base_deactivate_program (MpegTSBase * base, MpegTSBaseProgram * program)
@@ -1208,6 +1206,8 @@
               pmt)))
     goto same_program;
 
+#if 0
+  /* parsebin doesn't support program update properly. Disable this feature for now */
   if (base->streams_aware
       && mpegts_base_is_program_update (base, old_program, section->pid, pmt)) {
     GST_FIXME ("We are streams_aware and new program is an update");
@@ -1215,6 +1215,7 @@
     mpegts_base_update_program (base, old_program, section, pmt);
     goto beach;
   }
+#endif
 
   /* If the current program is active, this means we have a new program */
   if (old_program->active) {
@@ -1247,7 +1248,9 @@
   mpegts_base_activate_program (base, program, section->pid, section, pmt,
       initial_program);
 
+#if 0                           /* Smart-update disabled */
 beach:
+#endif
   GST_DEBUG ("Done activating program");
   return TRUE;
 
@@ -1750,11 +1753,30 @@
   {
     GST_DEBUG_OBJECT (base, "Pausing task, reason %s", gst_flow_get_name (ret));
     if (ret == GST_FLOW_EOS) {
-      if (!GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base,
-              gst_event_new_eos ()))
+      GstEvent *e;
+      if (base->out_segment.flags & GST_SEEK_FLAG_SEGMENT) {
+        gint64 stop;
+        if ((stop = base->out_segment.stop) == -1) {
+          stop = base->out_segment.position;
+        }
+        e = gst_event_new_segment_done (GST_FORMAT_TIME, stop);
+
+        GstMessage *msg = gst_message_new_segment_done (GST_OBJECT (base),
+            GST_FORMAT_TIME, stop);
+
+        if (base->last_seek_seqnum != GST_SEQNUM_INVALID) {
+          gst_message_set_seqnum (msg, base->last_seek_seqnum);
+        }
+        gst_element_post_message (GST_ELEMENT (base), msg);
+      } else {
+        e = gst_event_new_eos ();
+      }
+      GST_DEBUG_OBJECT (base, "Pushing event %" GST_PTR_FORMAT, e);
+      if (!GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, e)) {
         GST_ELEMENT_ERROR (base, STREAM, FAILED,
             (_("Internal data stream error.")),
             ("No program activated before EOS"));
+      }
     } else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS) {
       GST_ELEMENT_FLOW_ERROR (base, ret);
       GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, gst_event_new_eos ());
@@ -1837,8 +1859,8 @@
       " stop: %" GST_TIME_FORMAT, rate, GST_TIME_ARGS (start),
       GST_TIME_ARGS (stop));
 
-  flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
-  instant_rate_change = ! !(flags & GST_SEEK_FLAG_INSTANT_RATE_CHANGE);
+  flush = !!(flags & GST_SEEK_FLAG_FLUSH);
+  instant_rate_change = !!(flags & GST_SEEK_FLAG_INSTANT_RATE_CHANGE);
 
   /* Directly send the instant-rate-change event here before taking the
    * stream-lock so that it can be applied as soon as possible */
@@ -1887,17 +1909,12 @@
 
     /* ref for it to be reused later */
     gst_pad_push_event (base->sinkpad, gst_event_ref (flush_event));
-    /* And actually flush our pending data but allow to preserve some info
-     * to perform the seek */
-    mpegts_base_flush (base, FALSE);
-    mpegts_packetizer_flush (base->packetizer, FALSE);
-  }
-
-  if (flags & (GST_SEEK_FLAG_SEGMENT)) {
-    GST_WARNING ("seek flags 0x%x are not supported", (int) flags);
-    goto done;
   }
 
+  /* And actually flush our pending data but allow to preserve some info
+   * to perform the seek */
+  mpegts_base_flush (base, FALSE);
+  mpegts_packetizer_flush (base->packetizer, FALSE);
 
   /* If the subclass can seek, do that */
   ret = klass->seek (base, event);
@@ -1912,7 +1929,7 @@
     GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, flush_event);
     flush_event = NULL;
   }
-done:
+
   if (flush_event)
     gst_event_unref (flush_event);
   gst_pad_start_task (base->sinkpad, (GstTaskFunction) mpegts_base_loop, base,

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsdemux/mpegtspacketizer.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsdemux/mpegtspacketizer.c Changed

@@ -31,10 +31,12 @@
 /* Skew calculation pameters */
 #define MAX_TIME	(2 * GST_SECOND)
 
-/* maximal PCR time */
-#define PCR_MAX_VALUE (((((guint64)1)<<33) * 300) + 298)
+/* 90kHz maximum values, coded in 33bits */
+#define MAX_33BIT (((guint64)1) << 33)
+#define PTS_DTS_MAX_VALUE (MAX_33BIT - 1)
+/* maximal PCR time, 27Mhz, coded with additional 9bits */
+#define PCR_MAX_VALUE (MAX_33BIT * 300 - 1)
 #define PCR_GST_MAX_VALUE (PCR_MAX_VALUE * GST_MSECOND / (PCR_MSECOND))
-#define PTS_DTS_MAX_VALUE (((guint64)1) << 33)
 
 #include "mpegtspacketizer.h"
 #include "gstmpegdesc.h"
@@ -94,7 +96,7 @@
     res->prev_out_time = GST_CLOCK_TIME_NONE;
     res->pcroffset = 0;
 
-    res->current = g_slice_new0 (PCROffsetCurrent);
+    res->current = g_new0 (PCROffsetCurrent, 1);
   }
 
   return res;
@@ -104,7 +106,7 @@
 pcr_offset_group_free (PCROffsetGroup * group)
 {
   g_free (group->values);
-  g_slice_free (PCROffsetGroup, group);
+  g_free (group);
 }
 
 static void
@@ -115,8 +117,7 @@
   for (i = 0; i < packetizer->lastobsid; i++) {
     g_list_free_full (packetizer->observationsi->groups,
         (GDestroyNotify) pcr_offset_group_free);
-    if (packetizer->observationsi->current)
-      g_slice_free (PCROffsetCurrent, packetizer->observationsi->current);
+    g_free (packetizer->observationsi->current);
     g_free (packetizer->observationsi);
     packetizer->observationsi = NULL;
   }
@@ -1281,7 +1282,7 @@
  *
  * The idea is that the jitter is composed of:
  *
- *  J = N + n
+ *  J = D + n
  *
  *   D   : a constant network delay.
  *   n   : random added noise. The noise is concentrated around 0
@@ -1788,7 +1789,7 @@
 static PCROffsetGroup *
 _new_group (guint64 pcr, guint64 offset, guint64 pcr_offset, guint flags)
 {
-  PCROffsetGroup *group = g_slice_new0 (PCROffsetGroup);
+  PCROffsetGroup *group = g_new0 (PCROffsetGroup, 1);
 
   GST_DEBUG ("Input PCR %" GST_TIME_FORMAT " offset:%" G_GUINT64_FORMAT
       " pcr_offset:%" G_GUINT64_FORMAT " flags:%d",

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsdemux/tsdemux.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsdemux/tsdemux.c Changed

@@ -52,8 +52,6 @@
 
 #include <math.h>
 
-#define _gst_log2(x) (log(x)/log(2))
-
 /*
  * tsdemux
  *
@@ -63,6 +61,9 @@
 #define CONTINUITY_UNSET 255
 #define MAX_CONTINUITY 15
 
+/* Length of metadata_AU_cell header, see ISO/IEC 13818-1:2018 Section 2.12.4 */
+#define PES_PACKET_METADATA_AU_HEADER_LEN 5
+
 /* Seeking/Scanning related variables */
 
 /* seek to SEEK_TIMESTAMP_OFFSET before the desired offset and search then
@@ -449,7 +450,7 @@
       "MPEG transport stream demuxer",
       "Codec/Demuxer",
       "Demuxes MPEG2 transport streams",
-      "Zaheer Abbas Merali <zaheerabbas at merali dot org>\n"
+      "Zaheer Abbas Merali <zaheerabbas at merali dot org>, "
       "Edward Hervey <edward.hervey@collabora.co.uk>");
 
   ts_class = GST_MPEGTS_BASE_CLASS (klass);
@@ -942,12 +943,6 @@
     goto done;
   }
 
-  if (flags & (GST_SEEK_FLAG_SEGMENT)) {
-    GST_WARNING_OBJECT (demux, "seek flags 0x%x are not supported",
-        (int) flags);
-    goto done;
-  }
-
   /* configure the segment with the seek variables */
   memcpy (&seeksegment, &base->out_segment, sizeof (GstSegment));
   GST_LOG_OBJECT (demux, "Before seek, output segment %" GST_SEGMENT_FORMAT,
@@ -1019,6 +1014,8 @@
 
   /* Commit the new segment */
   memcpy (&base->out_segment, &seeksegment, sizeof (GstSegment));
+  /* And prepare to restart */
+  gst_flow_combiner_reset (demux->flowcombiner);
   res = GST_FLOW_OK;
 
 done:
@@ -1111,10 +1108,12 @@
   for (tmp = demux->program->stream_list; tmp; tmp = tmp->next) {
     TSDemuxStream *stream = (TSDemuxStream *) tmp->data;
     if (stream->pad) {
-      /* If we are pushing out EOS, flush out pending data first */
-      if (GST_EVENT_TYPE (event) == GST_EVENT_EOS &&
-          gst_pad_is_active (stream->pad))
+      /* If we are pushing out EOS or segment-done, flush out pending data first */
+      if ((GST_EVENT_TYPE (event) == GST_EVENT_EOS ||
+              GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT_DONE) &&
+          gst_pad_is_active (stream->pad)) {
         gst_ts_demux_push_pending_data (demux, stream, NULL);
+      }
 
       gst_event_ref (event);
       gst_pad_push_event (stream->pad, event);
@@ -1268,6 +1267,21 @@
   const GstMpegtsDescriptor *desc = NULL;
   int i, nb;
 
+  if (bstream->stream_type == ST_PS_AUDIO_AC3 &&
+      !mpegts_get_descriptor_from_stream (bstream,
+          GST_MTS_DESC_DVB_ENHANCED_AC3)) {
+    const GstMpegtsDescriptor *ac3_desc =
+        mpegts_get_descriptor_from_stream (bstream,
+        GST_MTS_DESC_AC3_AUDIO_STREAM);
+    if (ac3_desc && DESC_AC_AUDIO_STREAM_has_lang1 (ac3_desc->data)) {
+      gchar lang_code4;
+
+      memcpy (lang_code, DESC_AC_AUDIO_STREAM_lang1_code (ac3_desc->data), 3);
+      lang_code3 = '\0';
+      add_iso639_language_to_tags (stream, lang_code);
+    }
+  }
+
   desc =
       mpegts_get_descriptor_from_stream (bstream,
       GST_MTS_DESC_ISO_639_LANGUAGE);
@@ -1514,7 +1528,7 @@
             gst_byte_reader_init (&br, desc->data + 3, desc->length - 1);
             channel_config_code = gst_byte_reader_get_uint8_unchecked (&br);
 
-            if ((channel_config_code & 0x8f) <= 8) {
+            if (channel_config_code < 0x89) {
               static const guint8 coupled_stream_counts9 = {
                 1, 0, 1, 1, 2, 2, 2, 3, 3
               };
@@ -1540,7 +1554,7 @@
               };
 
               gint channels = -1, stream_count, coupled_count, mapping_family;
-              guint8 *channel_mapping = NULL;
+              guint8 channel_mapping255 = { 0, };
 
               channels = channel_config_code ? (channel_config_code & 0x0f) : 2;
               if (channel_config_code == 0 || channel_config_code == 0x80) {
@@ -1554,7 +1568,6 @@
                   stream_count = 2;
                   coupled_count = 0;
                 }
-                channel_mapping = g_new0 (guint8, channels);
                 memcpy (channel_mapping, &channel_map_a1, channels);
               } else if (channel_config_code <= 8) {
                 mapping_family = (channels > 2) ? 1 : 0;
@@ -1563,7 +1576,6 @@
                     coupled_stream_countschannel_config_code;
                 coupled_count = coupled_stream_countschannel_config_code;
                 if (mapping_family != 0) {
-                  channel_mapping = g_new0 (guint8, channels);
                   memcpy (channel_mapping, &channel_map_achannels - 1,
                       channels);
                 }
@@ -1572,7 +1584,6 @@
                 mapping_family = 1;
                 stream_count = channels;
                 coupled_count = 0;
-                channel_mapping = g_new0 (guint8, channels);
                 memcpy (channel_mapping, &channel_map_bchannels - 1,
                     channels);
               } else if (channel_config_code == 0x81) {
@@ -1609,7 +1620,7 @@
                       gst_byte_reader_get_data_unchecked
                       (&br, remaining_bytes), remaining_bytes);
 
-                  stream_count_minus_one_len = ceil (_gst_log2 (channels));
+                  stream_count_minus_one_len = g_bit_storage (channels);
                   if (!gst_bit_reader_get_bits_uint8 (&breader,
                           &stream_count_minus_one,
                           stream_count_minus_one_len)) {
@@ -1620,8 +1631,7 @@
                   }
 
                   stream_count = stream_count_minus_one + 1;
-                  coupled_stream_count_len =
-                      ceil (_gst_log2 (stream_count_minus_one + 2));
+                  coupled_stream_count_len = g_bit_storage (stream_count + 1);
 
                   if (!gst_bit_reader_get_bits_uint8 (&breader,
                           &coupled_stream_count, coupled_stream_count_len)) {
@@ -1634,9 +1644,7 @@
                   coupled_count = coupled_stream_count;
 
                   channel_mapping_len =
-                      ceil (_gst_log2 (stream_count_minus_one + 1 +
-                          coupled_stream_count + 1));
-                  channel_mapping = g_new0 (guint8, channels);
+                      g_bit_storage (stream_count + coupled_stream_count + 1);
                   for (i = 0; i < channels; i++) {
                     if (!gst_bit_reader_get_bits_uint8 (&breader,
                             &channel_mappingi, channel_mapping_len)) {
@@ -1649,8 +1657,6 @@
                   /* error above */
                   if (i != channels) {
                     channels = -1;
-                    g_free (channel_mapping);
-                    channel_mapping = NULL;
                     break;
                   }
                 }
@@ -1664,8 +1670,6 @@
                     gst_codec_utils_opus_create_caps (48000, channels,
                     mapping_family, stream_count, coupled_count,
                     channel_mapping);
-
-                g_free (channel_mapping);
               }
             } else {
               GST_WARNING_OBJECT (demux,
@@ -1736,6 +1740,27 @@
           "mpegversion", G_TYPE_INT, 4,
           "systemstream", G_TYPE_BOOLEAN, FALSE, NULL);
       break;
+    case GST_MPEGTS_STREAM_TYPE_METADATA_PES_PACKETS:
+      desc = mpegts_get_descriptor_from_stream (bstream, GST_MTS_DESC_METADATA);
+      if (desc) {
+        GstMpegtsMetadataDescriptor *metadataDescriptor;
+        if (gst_mpegts_descriptor_parse_metadata (desc, &metadataDescriptor)) {
+          if ((metadataDescriptor->metadata_format ==
+                  GST_MPEGTS_METADATA_FORMAT_IDENTIFIER_FIELD)
+              && (metadataDescriptor->metadata_format_identifier ==
+                  DRF_ID_KLVA)) {
+            sparse = TRUE;
+            is_private = TRUE;
+            /* registration_id is not correctly set or parsed for some streams */
+            bstream->registration_id = DRF_ID_KLVA;
+
+            caps = gst_caps_new_simple ("meta/x-klv",
+                "parsed", G_TYPE_BOOLEAN, TRUE, NULL);
+          }
+          g_free (metadataDescriptor);
+        }
+      }
+      break;
     case GST_MPEGTS_STREAM_TYPE_VIDEO_H264:
       is_video = TRUE;
       caps = gst_caps_new_simple ("video/x-h264",
@@ -2167,7 +2192,7 @@
     for (tmp = stream->pending; tmp; tmp = tmp->next) {
       PendingBuffer *pend = (PendingBuffer *) tmp->data;
       gst_buffer_unref (pend->buffer);
-      g_slice_free (PendingBuffer, pend);
+      g_free (pend);
     }
     g_list_free (stream->pending);
     stream->pending = NULL;
@@ -2983,6 +3008,13 @@
 
       /* Now send gap event */
       gst_pad_push_event (ps->pad, gst_event_new_gap (time, 0));
+
+      /* And do an EOS check */
+      MpegTSBase *base = GST_MPEGTS_BASE (demux);
+      if (base->out_segment.stop != -1 && time >= base->out_segment.stop) {
+        gst_flow_combiner_update_pad_flow (demux->flowcombiner, ps->pad,
+            GST_FLOW_EOS);
+      }
     }
 
     /* Update GAP tracking vars so we don't re-check this stream for a while */
@@ -3318,6 +3350,74 @@
   return gst_buffer_new_wrapped (stream->data, stream->current_size);
 }
 
+static GstBufferList *
+parse_pes_metadata_frame (TSDemuxStream * stream)
+{
+  GstByteReader reader;
+  GstBufferList *buffer_list = NULL;
+
+  buffer_list = gst_buffer_list_new ();
+  gst_byte_reader_init (&reader, stream->data, stream->current_size);
+
+  do {
+    GstBuffer *buffer;
+    GstMpegtsPESMetadataMeta *meta;
+    guint8 *au_data;
+    guint16 au_size;
+    guint8 service_id;
+    guint8 sequence_number;
+    guint8 flags;
+
+    if (gst_byte_reader_get_remaining (&reader) <
+        PES_PACKET_METADATA_AU_HEADER_LEN)
+      goto error;
+
+    if (!gst_byte_reader_get_uint8 (&reader, &service_id))
+      goto error;
+
+    if (!gst_byte_reader_get_uint8 (&reader, &sequence_number))
+      goto error;
+
+    if (!gst_byte_reader_get_uint8 (&reader, &flags))
+      goto error;
+
+    if (!gst_byte_reader_get_uint16_be (&reader, &au_size))
+      goto error;
+
+    if (gst_byte_reader_get_remaining (&reader) < au_size)
+      goto error;
+
+    if (!gst_byte_reader_dup_data (&reader, au_size, &au_data))
+      goto error;
+
+    buffer = gst_buffer_new_wrapped (au_data, au_size);
+    meta = gst_buffer_add_mpegts_pes_metadata_meta (buffer);
+    meta->metadata_service_id = service_id;
+    meta->flags = flags;
+    GST_DEBUG_OBJECT (stream->pad,
+        "metadata_service_id: 0x%02x, flags: 0x%02x, cell_data_length: 0x%04x",
+        meta->metadata_service_id, meta->flags, au_size);
+
+    gst_buffer_list_add (buffer_list, buffer);
+  } while (gst_byte_reader_get_remaining (&reader) > 0);
+
+  g_free (stream->data);
+  stream->data = NULL;
+  stream->current_size = 0;
+
+  return buffer_list;
+
+error:
+  {
+    GST_ERROR ("Failed to parse PES metadata access units");
+    g_free (stream->data);
+    stream->data = NULL;
+    stream->current_size = 0;
+    if (buffer_list)
+      gst_buffer_list_unref (buffer_list);
+    return NULL;
+  }
+}
 
 static GstFlowReturn
 gst_ts_demux_push_pending_data (GstTSDemux * demux, TSDemuxStream * stream,
@@ -3367,26 +3467,20 @@
       if (bs->stream_type == GST_MPEGTS_STREAM_TYPE_PRIVATE_PES_PACKETS &&
           bs->registration_id == DRF_ID_OPUS) {
         buffer_list = parse_opus_access_unit (stream);
-        if (!buffer_list) {
-          res = GST_FLOW_ERROR;
-          goto beach;
-        }
-
-        if (gst_buffer_list_length (buffer_list) == 1) {
-          buffer = gst_buffer_ref (gst_buffer_list_get (buffer_list, 0));
-          gst_buffer_list_unref (buffer_list);
-          buffer_list = NULL;
-        }
       } else if (bs->stream_type == GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K) {
         buffer = parse_jp2k_access_unit (stream);
-        if (!buffer) {
-          res = GST_FLOW_ERROR;
-          goto beach;
-        }
+      } else if (bs->stream_type == GST_MPEGTS_STREAM_TYPE_METADATA_PES_PACKETS
+          && bs->registration_id == DRF_ID_KLVA) {
+        buffer_list = parse_pes_metadata_frame (stream);
       } else {
         buffer = gst_buffer_new_wrapped (stream->data, stream->current_size);
       }
 
+      if (buffer == NULL && buffer_list == NULL) {
+        res = GST_FLOW_ERROR;
+        goto beach;
+      }
+
       stream->seeked_pts = stream->pts;
       stream->seeked_dts = stream->dts;
       stream->needs_keyframe = FALSE;
@@ -3421,36 +3515,25 @@
     if (bs->stream_type == GST_MPEGTS_STREAM_TYPE_PRIVATE_PES_PACKETS &&
         bs->registration_id == DRF_ID_OPUS) {
       buffer_list = parse_opus_access_unit (stream);
-      if (!buffer_list) {
-        res = GST_FLOW_ERROR;
-        goto beach;
-      }
-
-      if (gst_buffer_list_length (buffer_list) == 1) {
-        buffer = gst_buffer_ref (gst_buffer_list_get (buffer_list, 0));
-        gst_buffer_list_unref (buffer_list);
-        buffer_list = NULL;
-      }
     } else if (bs->stream_type == GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K) {
       buffer = parse_jp2k_access_unit (stream);
-      if (!buffer) {
-        res = GST_FLOW_ERROR;
-        goto beach;
-      }
     } else if (bs->stream_type == GST_MPEGTS_STREAM_TYPE_AUDIO_AAC_ADTS) {
       buffer = parse_aac_adts_frame (stream);
-      if (!buffer) {
-        res = GST_FLOW_ERROR;
-        goto beach;
-      }
+    } else if (bs->stream_type == GST_MPEGTS_STREAM_TYPE_METADATA_PES_PACKETS
+        && bs->registration_id == DRF_ID_KLVA) {
+      buffer_list = parse_pes_metadata_frame (stream);
     } else {
       buffer = gst_buffer_new_wrapped (stream->data, stream->current_size);
     }
+    if (buffer == NULL && buffer_list == NULL) {
+      res = GST_FLOW_ERROR;
+      goto beach;
+    }
 
     if (G_UNLIKELY (stream->pending_ts && !check_pending_buffers (demux))) {
       if (buffer) {
         PendingBuffer *pend;
-        pend = g_slice_new0 (PendingBuffer);
+        pend = g_new0 (PendingBuffer, 1);
         pend->buffer = buffer;
         pend->pts = stream->raw_pts;
         pend->dts = stream->raw_dts;
@@ -3461,7 +3544,7 @@
         n = gst_buffer_list_length (buffer_list);
         for (i = 0; i < n; i++) {
           PendingBuffer *pend;
-          pend = g_slice_new0 (PendingBuffer);
+          pend = g_new0 (PendingBuffer, 1);
           pend->buffer = gst_buffer_ref (gst_buffer_list_get (buffer_list, i));
           pend->pts = i == 0 ? stream->raw_pts : -1;
           pend->dts = i == 0 ? stream->raw_dts : -1;
@@ -3475,6 +3558,13 @@
     }
   }
 
+
+  if (buffer_list != NULL && gst_buffer_list_length (buffer_list) == 1) {
+    buffer = gst_buffer_ref (gst_buffer_list_get (buffer_list, 0));
+    gst_buffer_list_unref (buffer_list);
+    buffer_list = NULL;
+  }
+
   if (G_UNLIKELY (stream->need_newsegment))
     calculate_and_push_newsegment (demux, stream, target_program);
 
@@ -3495,7 +3585,7 @@
 
       res = gst_pad_push (stream->pad, pend->buffer);
       stream->nb_out_buffers += 1;
-      g_slice_free (PendingBuffer, pend);
+      g_free (pend);
     }
     g_list_free (stream->pending);
     stream->pending = NULL;
@@ -3561,8 +3651,26 @@
     /* Record that a buffer was pushed */
     stream->nb_out_buffers += n;
   }
+
+  /* If this proceeded past the end of the configured segment, mark it as EOS */
+  if (res == GST_FLOW_OK) {
+    /* If the pad returned anything other than GST_FLOW_OK, the flow combiner
+     * will already handle that, we only need to check for EOS */
+    GstClockTime ts = stream->dts;
+    if (!GST_CLOCK_TIME_IS_VALID (ts))
+      ts = stream->pts;
+
+    if (base->out_segment.stop != -1 &&
+        GST_CLOCK_TIME_IS_VALID (ts) && ts >= base->out_segment.stop) {
+      GST_DEBUG_OBJECT (stream->pad, "DTS %" GST_TIMEP_FORMAT
+          " is past the segment stop %" GST_TIMEP_FORMAT ". Marking pad as EOS",
+          &ts, &base->out_segment.stop);
+      res = GST_FLOW_EOS;
+    }
+  }
   GST_DEBUG_OBJECT (stream->pad, "Returned %s", gst_flow_get_name (res));
-  res = gst_flow_combiner_update_flow (demux->flowcombiner, res);
+  res =
+      gst_flow_combiner_update_pad_flow (demux->flowcombiner, stream->pad, res);
   GST_DEBUG_OBJECT (stream->pad, "combined %s", gst_flow_get_name (res));
 
   /* GAP / sparse stream tracking */

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsmux/gstatscmux.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsmux/gstatscmux.c Changed

@@ -65,8 +65,6 @@
 {
   GstMpegtsDescriptor *descriptor;
 
-  tsmux_stream_default_get_es_descrs (stream, pmt_stream);
-
   if (stream->stream_type == ATSCMUX_ST_PS_AUDIO_EAC3) {
     guint8 add_info4;
     guint8 *pos;
@@ -126,14 +124,177 @@
     descriptor =
         gst_mpegts_descriptor_from_custom (GST_MTS_DESC_ATSC_EAC3, add_info, 4);
     g_ptr_array_add (pmt_stream->descriptors, descriptor);
+  } else if (stream->stream_type == TSMUX_ST_PS_AUDIO_AC3) {
+    int wr_size = 0;
+    guint8 *add_info = NULL;
+    guint8 data;
+    guint bitrate;
+    gboolean has_language;
+    guint bitrates202 = {
+      {32000, 0x00}
+      ,
+      {40000, 0x01}
+      ,
+      {48000, 0x02}
+      ,
+      {56000, 0x03}
+      ,
+      {64000, 0x04}
+      ,
+      {80000, 0x05}
+      ,
+      {96000, 0x06}
+      ,
+      {112000, 0x07}
+      ,
+      {128000, 0x08}
+      ,
+      {160000, 0x09}
+      ,
+      {192000, 0x0A}
+      ,
+      {224000, 0x0B}
+      ,
+      {256000, 0x0C}
+      ,
+      {320000, 0x0D}
+      ,
+      {384000, 0x0E}
+      ,
+      {448000, 0x0F}
+      ,
+      {512000, 0x10}
+      ,
+      {576000, 0x11}
+      ,
+      {640000, 0x12}
+    };
+    gint i;
+    guint bitrate_code = 0x12;
+    GstByteWriter writer;
+    gst_byte_writer_init_with_size (&writer, 7, FALSE);
+
+    /* audio_stream_descriptor () | ATSC A/52-2001 Annex A
+     *
+     * descriptor_tag       8 uimsbf
+     * descriptor_length    8 uimsbf
+     * sample_rate_code     3 bslbf
+     * bsid                 5 bslbf
+     * bit_rate_code        6 bslbf
+     * surround_mode        2 bslbf
+     * bsmod                3 bslbf
+     * num_channels         4 bslbf
+     * full_svc             1 bslbf
+     * langcod              8 bslbf
+     * mainid               3 uimsbf
+     * priority             2 bslbf
+     * reserved             3 '111'
+     * textlen              7 uimsbf
+     * text_code            1 bslbf
+     * text                 8*textlen bslbf
+     * language_flag        1 bslbf
+     * language_flag_2      1 bslbf
+     * reserved             6 '111111'
+     * language if flag     3*8 uimbsf
+     * language_2 if flag_2 3*8 uimsbf
+     */
+
+    /* 3 bits sample_rate_code, 5 bits hardcoded bsid (default ver 8) */
+    switch (stream->audio_sampling) {
+      case 48000:
+        data = 0x08;
+        break;
+      case 44100:
+        data = 0x28;
+        break;
+      case 32000:
+        data = 0x48;
+        break;
+      default:
+        data = 0xE8;
+        break;                  /* 48, 44.1 or 32 Khz */
+    }
+    gst_byte_writer_put_uint8 (&writer, data);
+
+    /* 1 bit bit_rate_limit, 5 bits bit_rate_code, 2 bits suround_mode */
+    bitrate = MAX (stream->audio_bitrate, stream->max_bitrate);
+    for (i = 0; i < G_N_ELEMENTS (bitrates); i++) {
+      if (bitrate < bitratesi0) {
+        break;
+      }
+      bitrate_code = bitratesi1;
+    }
+    data = bitrate_code << 2;
+    data |= 0x80;               /* This is a maximum bitrate */
+    gst_byte_writer_put_uint8 (&writer, data);
+
+    /* 3 bits bsmod, 4 bits num_channels, 1 bit full_svc */
+    switch (stream->audio_channels) {
+      case 1:
+        data = 0x01 << 1;
+        break;                  /* 1/0 */
+      case 2:
+        data = 0x02 << 1;
+        break;                  /* 2/0 */
+      case 3:
+        data = 0x0A << 1;
+        break;                  /* <= 3 */
+      case 4:
+        data = 0x0B << 1;
+        break;                  /* <= 4 */
+      case 5:
+        data = 0x0C << 1;
+        break;                  /* <= 5 */
+      case 6:
+      default:
+        data = 0x0D << 1;
+        break;                  /* <= 6 */
+    }
+    data |= 0x01;               /* full_svc is hardcoded to 1 for now */
+    gst_byte_writer_put_uint8 (&writer, data);
+
+    /* deprecated langcod */
+    data = 0xff;
+    gst_byte_writer_put_uint8 (&writer, data);
+    /* langcod2 skipped because num_channels > 0 (no dual mono) */
+    /* 3 bits mainid, 2 bits priority, 3 bits reserved */
+    data = 0x0f;
+    gst_byte_writer_put_uint8 (&writer, data);
+    /* 7 bits textlen, 1 bit text_code */
+    data = 0x00;
+    gst_byte_writer_put_uint8 (&writer, data);
+    /* no text provided, jumping directly to language */
+
+    has_language = (stream->language0 != '\0');
+    if (has_language) {
+      data = 0xbf;
+      gst_byte_writer_put_uint8 (&writer, data);
+      gst_byte_writer_put_data (&writer, (guint8 *) stream->language, 3);
+    } else {
+      data = 0x3f;
+      gst_byte_writer_put_uint8 (&writer, data);
+    }
+
+    descriptor = gst_mpegts_descriptor_from_registration ("AC-3", NULL, 0);
+    g_ptr_array_add (pmt_stream->descriptors, descriptor);
+
+    wr_size = gst_byte_writer_get_size (&writer);
+    add_info = gst_byte_writer_reset_and_get_data (&writer);
+
+    descriptor =
+        gst_mpegts_descriptor_from_custom (GST_MTS_DESC_AC3_AUDIO_STREAM,
+        add_info, wr_size);
+    g_ptr_array_add (pmt_stream->descriptors, descriptor);
+  } else {
+    tsmux_stream_default_get_es_descrs (stream, pmt_stream);
   }
 }
 
 static TsMuxStream *
 gst_atsc_mux_create_new_stream (guint16 new_pid, TsMuxStreamType stream_type,
-    gpointer user_data)
+    guint stream_number, gpointer user_data)
 {
-  TsMuxStream *ret = tsmux_stream_new (new_pid, stream_type);
+  TsMuxStream *ret = tsmux_stream_new (new_pid, stream_type, stream_number);
 
   if (stream_type == ATSCMUX_ST_PS_AUDIO_EAC3) {
     ret->id = 0xBD;

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsmux/gstatscmux.h -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsmux/gstatscmux.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsmux/gstbasetsmux.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsmux/gstbasetsmux.c Changed

@@ -78,6 +78,7 @@
 #include <gst/pbutils/pbutils.h>
 #include <gst/videoparsers/gstjpeg2000parse.h>
 #include <gst/video/video-color.h>
+#include <gst/base/base.h>
 
 #include "gstbasetsmux.h"
 #include "gstbasetsmuxaac.h"
@@ -92,6 +93,15 @@
 
 G_DEFINE_TYPE (GstBaseTsMuxPad, gst_base_ts_mux_pad, GST_TYPE_AGGREGATOR_PAD);
 
+#define DEFAULT_PAD_STREAM_NUMBER 0
+
+enum
+{
+  PAD_PROP_0,
+  PAD_PROP_STREAM_NUMBER,
+};
+
+
 /* Internals */
 
 static void
@@ -117,6 +127,9 @@
     g_free (pad->language);
     pad->language = NULL;
   }
+
+  pad->bitrate = 0;
+  pad->max_bitrate = 0;
 }
 
 /* GstAggregatorPad implementation */
@@ -160,15 +173,68 @@
 }
 
 static void
+gst_base_ts_mux_pad_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstBaseTsMuxPad *ts_pad = GST_BASE_TS_MUX_PAD (object);
+
+  switch (prop_id) {
+    case PAD_PROP_STREAM_NUMBER:
+      ts_pad->stream_number = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_base_ts_mux_pad_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstBaseTsMuxPad *ts_pad = GST_BASE_TS_MUX_PAD (object);
+
+  switch (prop_id) {
+    case PAD_PROP_STREAM_NUMBER:
+      g_value_set_int (value, ts_pad->stream_number);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
 gst_base_ts_mux_pad_class_init (GstBaseTsMuxPadClass * klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstAggregatorPadClass *gstaggpad_class = GST_AGGREGATOR_PAD_CLASS (klass);
 
   gobject_class->dispose = gst_base_ts_mux_pad_dispose;
+  gobject_class->set_property = gst_base_ts_mux_pad_set_property;
+  gobject_class->get_property = gst_base_ts_mux_pad_get_property;
+
   gstaggpad_class->flush = gst_base_ts_mux_pad_flush;
 
   gst_type_mark_as_plugin_api (GST_TYPE_BASE_TS_MUX, 0);
+
+  /**
+   * GstBaseTsMuxPad:stream-number:
+   *
+   * Set stream number for AVC video stream
+   * or AAC audio streams.
+   *
+   * video stream number is stored in 4 bits
+   * audio stream number is stored in 5 bits.
+   * See Table 2-22 of ITU-T H222.0 for details on AAC and AVC stream numbers
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PAD_PROP_STREAM_NUMBER,
+      g_param_spec_int ("stream-number", "stream number",
+          "stream number", 0x0, 0x1F, DEFAULT_PAD_STREAM_NUMBER,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
 }
 
 static void
@@ -384,7 +450,8 @@
   const gchar *mt;
   const GValue *value = NULL;
   GstBuffer *codec_data = NULL;
-  guint8 opus_channel_config_code = 0;
+  guint8 opus_channel_config1 + 2 + 1 + 1 + 255 = { 0, };
+  gsize opus_channel_config_len = 0;
   guint16 profile = GST_JPEG2000_PARSE_PROFILE_NONE;
   guint8 main_level = 0;
   guint32 max_rate = 0;
@@ -524,11 +591,14 @@
     }
 
     if (channels <= 2 && mapping_family == 0) {
-      opus_channel_config_code = channels;
-    } else if (channels == 2 && mapping_family == 255 && stream_count == 1
-        && coupled_count == 1) {
+      opus_channel_config0 = channels;
+      opus_channel_config_len = 1;
+    } else if (channels == 2 && mapping_family == 255 && ((stream_count == 1
+                && coupled_count == 1) || (stream_count == 2
+                && coupled_count == 0))) {
       /* Dual mono */
-      opus_channel_config_code = 0;
+      opus_channel_config0 = coupled_count == 0 ? 0x80 : 0x00;
+      opus_channel_config_len = 1;
     } else if (channels >= 2 && channels <= 8 && mapping_family == 1) {
       static const guint8 coupled_stream_counts9 = {
         1, 0, 1, 1, 2, 2, 2, 3, 3
@@ -559,16 +629,45 @@
           coupled_count == coupled_stream_countschannels &&
           memcmp (channel_mapping, channel_map_achannels - 1,
               channels) == 0) {
-        opus_channel_config_code = channels;
+        opus_channel_config0 = channels;
+        opus_channel_config_len = 1;
       } else if (stream_count == channels - coupled_stream_countschannels &&
           coupled_count == coupled_stream_countschannels &&
           memcmp (channel_mapping, channel_map_bchannels - 1,
               channels) == 0) {
-        opus_channel_config_code = channels | 0x80;
+        opus_channel_config0 = channels | 0x80;
+        opus_channel_config_len = 1;
       } else {
         GST_FIXME_OBJECT (ts_pad, "Opus channel mapping not handled");
         goto not_negotiated;
       }
+    } else {
+      GstBitWriter writer;
+      guint i;
+      guint n_bits;
+
+      gst_bit_writer_init_with_data (&writer, opus_channel_config,
+          sizeof (opus_channel_config), FALSE);
+      gst_bit_writer_put_bits_uint8_unchecked (&writer, 0x81, 8);
+      gst_bit_writer_put_bits_uint8_unchecked (&writer, channels, 8);
+      gst_bit_writer_put_bits_uint8_unchecked (&writer, mapping_family, 8);
+
+      n_bits = g_bit_storage (channels);
+      gst_bit_writer_put_bits_uint8_unchecked (&writer, stream_count - 1,
+          n_bits);
+      n_bits = g_bit_storage (stream_count + 1);
+      gst_bit_writer_put_bits_uint8_unchecked (&writer, coupled_count, n_bits);
+
+      n_bits = g_bit_storage (stream_count + coupled_count + 1);
+      for (i = 0; i < channels; i++) {
+        gst_bit_writer_put_bits_uint8_unchecked (&writer, channel_mappingi,
+            n_bits);
+      }
+
+      gst_bit_writer_align_bytes_unchecked (&writer, 0);
+      g_assert (writer.bit_size % 8 == 0);
+
+      opus_channel_config_len = writer.bit_size / 8;
     }
 
     st = TSMUX_ST_PS_OPUS;
@@ -691,8 +790,12 @@
   }
 
   if (ts_pad->stream == NULL) {
+    gint stream_number = DEFAULT_PAD_STREAM_NUMBER;
+
+    g_object_get (ts_pad, "stream-number", &stream_number, NULL);
     ts_pad->stream =
-        tsmux_create_stream (mux->tsmux, st, ts_pad->pid, ts_pad->language);
+        tsmux_create_stream (mux->tsmux, st, stream_number, ts_pad->pid,
+        ts_pad->language, ts_pad->bitrate, ts_pad->max_bitrate);
     if (ts_pad->stream == NULL)
       goto error;
   }
@@ -727,7 +830,9 @@
   ts_pad->stream->max_bitrate = max_rate;
   ts_pad->stream->profile_and_level = profile | main_level;
 
-  ts_pad->stream->opus_channel_config_code = opus_channel_config_code;
+  memcpy (ts_pad->stream->opus_channel_config, opus_channel_config,
+      sizeof (opus_channel_config));
+  ts_pad->stream->opus_channel_config_len = opus_channel_config_len;
 
   tsmux_stream_set_buffer_release_func (ts_pad->stream, release_buffer_cb);
 
@@ -751,18 +856,12 @@
 
 /* Must be called with mux->lock held */
 static GstFlowReturn
-gst_base_ts_mux_create_stream (GstBaseTsMux * mux, GstBaseTsMuxPad * ts_pad)
+gst_base_ts_mux_create_stream (GstBaseTsMux * mux, GstBaseTsMuxPad * ts_pad,
+    GstCaps * caps)
 {
-  GstCaps *caps = gst_pad_get_current_caps (GST_PAD (ts_pad));
   GstFlowReturn ret;
 
-  if (caps == NULL) {
-    GST_DEBUG_OBJECT (ts_pad, "Sink pad caps were not set before pushing");
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
   ret = gst_base_ts_mux_create_or_update_stream (mux, ts_pad, caps);
-  gst_caps_unref (caps);
 
   if (ret == GST_FLOW_OK) {
     tsmux_program_add_stream (ts_pad->prog, ts_pad->stream);
@@ -771,14 +870,50 @@
   return ret;
 }
 
+static guint16
+get_pmt_pcr_pid (GstBaseTsMux * mux, const gchar * prop_name)
+{
+  if (mux->prog_map == NULL)
+    return 0;
+  gint pcr_pid = 0;
+  if (!gst_structure_get (mux->prog_map, prop_name, G_TYPE_INT, &pcr_pid, NULL))
+    return 0;
+  if (pcr_pid < 1 || pcr_pid > G_MAXUINT16)
+    return 0;
+  return (guint16) pcr_pid;
+}
+
+static gchar *
+get_pmt_pcr_sink (GstBaseTsMux * mux, const gchar * prop_name)
+{
+  if (mux->prog_map == NULL)
+    return 0;
+  gchar *pcr_sink = NULL;
+  if (!gst_structure_get (mux->prog_map, prop_name, G_TYPE_STRING, &pcr_sink,
+          NULL)) {
+    return NULL;
+  }
+  return pcr_sink;
+}
+
 /* Must be called with mux->lock held */
 static GstFlowReturn
-gst_base_ts_mux_create_pad_stream (GstBaseTsMux * mux, GstPad * pad)
+gst_base_ts_mux_create_pad_stream (GstBaseTsMux * mux, GstPad * pad,
+    gboolean allow_no_caps)
 {
   GstBaseTsMuxPad *ts_pad = GST_BASE_TS_MUX_PAD (pad);
   gchar *name = NULL;
   gchar *prop_name;
   GstFlowReturn ret = GST_FLOW_OK;
+  GstCaps *caps = gst_pad_get_current_caps (pad);
+
+  if (caps == NULL) {
+    GST_DEBUG_OBJECT (ts_pad, "Sink pad caps were not set yet");
+    /* Try again later once the first buffer is pushed */
+    if (allow_no_caps)
+      return GST_FLOW_OK;
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
 
   if (ts_pad->prog_id == -1) {
     name = GST_PAD_NAME (pad);
@@ -836,10 +971,11 @@
   }
 
   if (ts_pad->stream == NULL) {
-    ret = gst_base_ts_mux_create_stream (mux, ts_pad);
+    ret = gst_base_ts_mux_create_stream (mux, ts_pad, caps);
     if (ret != GST_FLOW_OK)
       goto no_stream;
   }
+  ts_pad->stream->program = ts_pad->prog;
 
   if (ts_pad->prog->pcr_stream == NULL) {
     /* Take the first stream of the program for the PCR */
@@ -852,17 +988,25 @@
 
   /* Check for user-specified PCR PID */
   prop_name = g_strdup_printf ("PCR_%d", ts_pad->prog->pgm_number);
-  if (mux->prog_map && gst_structure_has_field (mux->prog_map, prop_name)) {
-    const gchar *sink_name =
-        gst_structure_get_string (mux->prog_map, prop_name);
-
-    if (!g_strcmp0 (name, sink_name)) {
-      GST_DEBUG_OBJECT (mux, "User specified stream (pid=%d) as PCR for "
-          "program (prog_id = %d)", ts_pad->pid, ts_pad->prog->pgm_number);
-      tsmux_program_set_pcr_stream (ts_pad->prog, ts_pad->stream);
-    }
+  guint16 pcr_pid = get_pmt_pcr_pid (mux, prop_name);
+  if (pcr_pid) {
+    GST_DEBUG_OBJECT (mux, "User specified PID %d as PCR for "
+        "program (prog_id = %d)", pcr_pid, ts_pad->prog->pgm_number);
+    tsmux_program_set_pcr_pid (ts_pad->prog, pcr_pid);
+    goto have_pcr_pid;
+  }
+
+  gchar *pcr_sink_name = get_pmt_pcr_sink (mux, prop_name);
+  if (!g_strcmp0 (GST_PAD_NAME (pad), pcr_sink_name)) {
+    GST_DEBUG_OBJECT (mux, "User specified stream (pid=%d) as PCR for "
+        "program (prog_id = %d)", ts_pad->pid, ts_pad->prog->pgm_number);
+    tsmux_program_set_pcr_stream (ts_pad->prog, ts_pad->stream);
   }
-  g_free (prop_name);
+  g_clear_pointer (&pcr_sink_name, g_free);
+
+have_pcr_pid:
+  g_clear_pointer (&prop_name, g_free);
+  gst_clear_caps (&caps);
 
   return ret;
 
@@ -871,12 +1015,14 @@
   {
     GST_ELEMENT_ERROR (mux, STREAM, MUX,
         ("Could not create new program"), (NULL));
+    gst_clear_caps (&caps);
     return GST_FLOW_ERROR;
   }
 no_stream:
   {
     GST_ELEMENT_ERROR (mux, STREAM, MUX,
         ("Could not create handler for stream"), (NULL));
+    gst_clear_caps (&caps);
     return ret;
   }
 }
@@ -888,7 +1034,8 @@
 {
   GstFlowReturn *ret = user_data;
 
-  *ret = gst_base_ts_mux_create_pad_stream (GST_BASE_TS_MUX (element), pad);
+  *ret =
+      gst_base_ts_mux_create_pad_stream (GST_BASE_TS_MUX (element), pad, TRUE);
 
   return *ret == GST_FLOW_OK;
 }
@@ -952,9 +1099,13 @@
 static GstFlowReturn
 gst_base_ts_mux_push_packets (GstBaseTsMux * mux, gboolean force)
 {
+  GstSegment *segment =
+      &GST_AGGREGATOR_PAD (GST_AGGREGATOR_SRC_PAD (mux))->segment;
   GstBufferList *buffer_list;
   gint align = mux->alignment;
   gint av, packet_size;
+  GstFlowReturn flow_ret;
+  GstClockTime pts;
 
   packet_size = mux->packet_size;
 
@@ -970,8 +1121,16 @@
   /* no alignment, just push all available data */
   if (align == 0) {
     buffer_list = gst_adapter_take_buffer_list (mux->out_adapter, av);
-    return gst_aggregator_finish_buffer_list (GST_AGGREGATOR (mux),
+    flow_ret = gst_aggregator_finish_buffer_list (GST_AGGREGATOR (mux),
         buffer_list);
+
+    pts = gst_adapter_prev_pts (mux->out_adapter, NULL);
+    if (GST_CLOCK_TIME_IS_VALID (pts)
+        && (!GST_CLOCK_TIME_IS_VALID (segment->position)
+            || segment->position < pts))
+      segment->position = pts;
+
+    return flow_ret;
   }
 
   align *= packet_size;
@@ -984,7 +1143,6 @@
   GST_LOG_OBJECT (mux, "aligning to %d bytes", align);
   while (align <= av) {
     GstBuffer *buf;
-    GstClockTime pts;
 
     pts = gst_adapter_prev_pts (mux->out_adapter, NULL);
     buf = gst_adapter_take_buffer (mux->out_adapter, align);
@@ -997,7 +1155,6 @@
 
   if (av > 0 && force) {
     GstBuffer *buf;
-    GstClockTime pts;
     guint8 *data;
     guint32 header;
     gint dummy;
@@ -1047,7 +1204,16 @@
     gst_buffer_list_add (buffer_list, buf);
   }
 
-  return gst_aggregator_finish_buffer_list (GST_AGGREGATOR (mux), buffer_list);
+  flow_ret =
+      gst_aggregator_finish_buffer_list (GST_AGGREGATOR (mux), buffer_list);
+
+  pts = gst_adapter_prev_pts (mux->out_adapter, NULL);
+  if (GST_CLOCK_TIME_IS_VALID (pts)
+      && (!GST_CLOCK_TIME_IS_VALID (segment->position)
+          || segment->position < pts))
+    segment->position = pts;
+
+  return flow_ret;
 }
 
 static GstFlowReturn
@@ -1214,7 +1380,13 @@
   if (prog == NULL) {
     GList *cur;
 
-    gst_base_ts_mux_create_pad_stream (mux, GST_PAD (best));
+    ret = gst_base_ts_mux_create_pad_stream (mux, GST_PAD (best), FALSE);
+    if (G_UNLIKELY (ret != GST_FLOW_OK)) {
+      if (buf)
+        gst_buffer_unref (buf);
+      g_mutex_unlock (&mux->lock);
+      return ret;
+    }
     tsmux_resend_pat (mux->tsmux);
     tsmux_resend_si (mux->tsmux);
     prog = best->prog;
@@ -1278,7 +1450,7 @@
     }
   }
 
-  if (G_UNLIKELY (prog->pcr_stream == NULL)) {
+  if (!prog->pcr_pid && G_UNLIKELY (prog->pcr_stream == NULL)) {
     /* Take the first data stream for the PCR */
     GST_DEBUG_OBJECT (best,
         "Use stream (pid=%d) from pad as PCR for program (prog_id = %d)",
@@ -1913,6 +2085,21 @@
   return GST_ELEMENT_CLASS (parent_class)->send_event (element, event);
 }
 
+/* Must be called with mux->lock held */
+static void
+gst_base_ts_mux_resend_all_pmts (GstBaseTsMux * mux)
+{
+  GList *cur;
+
+  /* output PMT for each program */
+  for (cur = mux->tsmux->programs; cur; cur = cur->next) {
+    TsMuxProgram *program = (TsMuxProgram *) cur->data;
+
+    program->pmt_changed = TRUE;
+    tsmux_resend_pmt (program);
+  }
+}
+
 /* GstAggregator implementation */
 
 static gboolean
@@ -1930,7 +2117,6 @@
     {
       GstCaps *caps;
       GstFlowReturn ret;
-      GList *cur;
 
       g_mutex_lock (&mux->lock);
       if (ts_pad->stream == NULL) {
@@ -1956,14 +2142,8 @@
       mux->tsmux->si_changed = TRUE;
       tsmux_resend_pat (mux->tsmux);
       tsmux_resend_si (mux->tsmux);
+      gst_base_ts_mux_resend_all_pmts (mux);
 
-      /* output PMT for each program */
-      for (cur = mux->tsmux->programs; cur; cur = cur->next) {
-        TsMuxProgram *program = (TsMuxProgram *) cur->data;
-
-        program->pmt_changed = TRUE;
-        tsmux_resend_pmt (program);
-      }
       g_mutex_unlock (&mux->lock);
 
       res = TRUE;
@@ -2044,20 +2224,32 @@
     case GST_EVENT_TAG:{
       GstTagList *list;
       gchar *lang = NULL;
+      guint bitrate = 0;
+      guint max_bitrate = 0;
 
       GST_DEBUG_OBJECT (mux, "received tag event");
       gst_event_parse_tag (event, &list);
 
-      /* Matroska wants ISO 639-2B code, taglist most likely contains 639-1 */
+      /* MPEG wants ISO 639-2T code, taglist most likely contains 639-1 */
       if (gst_tag_list_get_string (list, GST_TAG_LANGUAGE_CODE, &lang)) {
         const gchar *lang_code;
 
-        lang_code = gst_tag_get_language_code_iso_639_2B (lang);
+        lang_code = gst_tag_get_language_code_iso_639_2T (lang);
         if (lang_code) {
-          GST_DEBUG_OBJECT (ts_pad, "Setting language to '%s'", lang_code);
 
-          g_free (ts_pad->language);
-          ts_pad->language = g_strdup (lang_code);
+          g_mutex_lock (&mux->lock);
+          if (g_strcmp0 (ts_pad->language, lang_code) != 0) {
+            GST_DEBUG_OBJECT (ts_pad, "Setting language to '%s'", lang_code);
+
+            g_free (ts_pad->language);
+            ts_pad->language = g_strdup (lang_code);
+            if (ts_pad->stream) {
+              strncpy (ts_pad->stream->language, lang_code, 3);
+              ts_pad->stream->language3 = 0;
+              gst_base_ts_mux_resend_all_pmts (mux);
+            }
+          }
+          g_mutex_unlock (&mux->lock);
         } else {
           GST_WARNING_OBJECT (ts_pad, "Did not get language code for '%s'",
               lang);
@@ -2065,6 +2257,14 @@
         g_free (lang);
       }
 
+      if (gst_tag_list_get_uint (list, GST_TAG_BITRATE, &bitrate)) {
+        ts_pad->bitrate = bitrate;
+      }
+
+      if (gst_tag_list_get_uint (list, GST_TAG_MAXIMUM_BITRATE, &max_bitrate)) {
+        ts_pad->max_bitrate = bitrate;
+      }
+
       /* handled this, don't want collectpads to forward it downstream */
       res = TRUE;
       forward = gst_tag_list_get_scope (list) == GST_TAG_SCOPE_GLOBAL;
@@ -2636,6 +2836,7 @@
   gstagg_class->src_event = gst_base_ts_mux_src_event;
   gstagg_class->start = gst_base_ts_mux_start;
   gstagg_class->stop = gst_base_ts_mux_stop;
+  gstagg_class->get_next_time = gst_aggregator_simple_get_next_time;
 
   klass->create_ts_mux = gst_base_ts_mux_default_create_ts_mux;
   klass->allocate_packet = gst_base_ts_mux_default_allocate_packet;

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsmux/gstbasetsmux.h -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsmux/gstbasetsmux.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsmux/gstmpegtsmux.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsmux/gstmpegtsmux.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsmux/tsmux/tsmux.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsmux/tsmux/tsmux.c Changed

@@ -113,13 +113,14 @@
 tsmux_section_free (TsMuxSection * section)
 {
   gst_mpegts_section_unref (section->section);
-  g_slice_free (TsMuxSection, section);
+  g_free (section);
 }
 
 static TsMuxStream *
-tsmux_new_stream_default (guint16 pid, guint stream_type, gpointer user_data)
+tsmux_new_stream_default (guint16 pid, guint stream_type, guint stream_number,
+    gpointer user_data)
 {
-  return tsmux_stream_new (pid, stream_type);
+  return tsmux_stream_new (pid, stream_type, stream_number);
 }
 
 /**
@@ -134,7 +135,7 @@
 {
   TsMux *mux;
 
-  mux = g_slice_new0 (TsMux);
+  mux = g_new0 (TsMux, 1);
 
   mux->transport_id = TSMUX_DEFAULT_TS_ID;
 
@@ -350,7 +351,7 @@
   g_return_val_if_fail (section != NULL, FALSE);
   g_return_val_if_fail (mux->si_sections != NULL, FALSE);
 
-  tsmux_section = g_slice_new0 (TsMuxSection);
+  tsmux_section = g_new0 (TsMuxSection, 1);
 
   GST_DEBUG ("Adding mpegts section with type %d to mux",
       section->section_type);
@@ -404,7 +405,7 @@
   /* Free SI table sections */
   g_hash_table_unref (mux->si_sections);
 
-  g_slice_free (TsMux, mux);
+  g_free (mux);
 }
 
 static gint
@@ -433,12 +434,13 @@
   if (mux->nb_programs == TSMUX_MAX_PROGRAMS)
     return NULL;
 
-  program = g_slice_new0 (TsMuxProgram);
+  program = g_new0 (TsMuxProgram, 1);
 
   program->pmt_changed = TRUE;
   program->pmt_interval = TSMUX_DEFAULT_PMT_INTERVAL;
 
   program->next_pmt_pcr = -1;
+  program->next_pcr = -1;
 
   if (prog_id == 0) {
     program->pgm_number = mux->next_pgm_no++;
@@ -456,6 +458,7 @@
 
   program->pmt_pid = mux->next_pmt_pid++;
   program->pcr_stream = NULL;
+  program->pcr_pid = 0;
 
   /* SCTE35 is disabled by default */
   program->scte35_pid = 0;
@@ -582,7 +585,7 @@
     program->scte35_null_section = NULL;
   }
   if (pid != 0) {
-    program->scte35_null_section = section = g_slice_new0 (TsMuxSection);
+    program->scte35_null_section = section = g_new0 (TsMuxSection, 1);
     section->pi.pid = pid;
     sit = gst_mpegts_scte_null_new ();
     section->section = gst_mpegts_section_from_scte_sit (sit, pid);
@@ -674,6 +677,7 @@
   if (program->pcr_stream == stream)
     return;
 
+  program->pcr_pid = 0;
   if (program->pcr_stream != NULL)
     tsmux_stream_pcr_unref (program->pcr_stream);
   if (stream)
@@ -684,6 +688,23 @@
 }
 
 /**
+ * tsmux_program_set_pcr_pid:
+ * @program: a #TsMuxProgram
+ * @pid: a PID
+ *
+ * Set @pid as the PCR PID for @program, overwriting the previously
+ * configured PCR PID. When pid == 0, program will have no PCR PID configured.
+ */
+void
+tsmux_program_set_pcr_pid (TsMuxProgram * program, guint16 pid)
+{
+  g_return_if_fail (program != NULL);
+
+  program->pcr_pid = pid;
+  program->pmt_changed = TRUE;
+}
+
+/**
  * tsmux_get_new_pid:
  * @mux: a #TsMux
  *
@@ -709,9 +730,10 @@
  * tsmux_create_stream:
  * @mux: a #TsMux
  * @stream_type: the stream type
+ * @stream_number: stream number
  * @pid: the PID of the new stream.
  *
- * Create a new stream of @stream_type in the muxer session @mux.
+ * Create a new stream of @stream_type with @stream_number in the muxer session @mux.
  *
  * When @pid is set to #TSMUX_PID_AUTO, a new free PID will automatically
  * be allocated for the new stream.
@@ -719,8 +741,8 @@
  * Returns: a new #TsMuxStream.
  */
 TsMuxStream *
-tsmux_create_stream (TsMux * mux, guint stream_type, guint16 pid,
-    gchar * language)
+tsmux_create_stream (TsMux * mux, guint stream_type, guint stream_number,
+    guint16 pid, gchar * language, guint bitrate, guint max_bitrate)
 {
   TsMuxStream *stream;
   guint16 new_pid;
@@ -738,7 +760,9 @@
   if (tsmux_find_stream (mux, new_pid))
     return NULL;
 
-  stream = mux->new_stream_func (new_pid, stream_type, mux->new_stream_data);
+  stream =
+      mux->new_stream_func (new_pid, stream_type, stream_number,
+      mux->new_stream_data);
 
   mux->streams = g_list_prepend (mux->streams, stream);
   mux->nb_streams++;
@@ -750,6 +774,10 @@
     stream->language0 = 0;
   }
 
+  stream->max_bitrate = max_bitrate;
+  /* ignored if it's not audio */
+  stream->audio_bitrate = bitrate;
+
   return stream;
 }
 
@@ -1544,6 +1572,25 @@
   return ret;
 }
 
+static gint64
+write_new_prog_pcr (TsMux * mux, TsMuxProgram * prog, gint64 cur_pcr)
+{
+  if (prog->next_pcr == -1 || cur_pcr > prog->next_pcr) {
+    prog->pi.flags |=
+        TSMUX_PACKET_FLAG_ADAPTATION | TSMUX_PACKET_FLAG_WRITE_PCR;
+    prog->pi.pcr = cur_pcr;
+
+    if (prog->next_pcr == -1)
+      prog->next_pcr = cur_pcr + mux->pcr_interval * 300;
+    else
+      prog->next_pcr += mux->pcr_interval * 300;
+  } else {
+    cur_pcr = -1;
+  }
+
+  return cur_pcr;
+}
+
 /**
  * tsmux_write_stream_packet:
  * @mux: a #TsMux
@@ -1566,7 +1613,7 @@
   g_return_val_if_fail (mux != NULL, FALSE);
   g_return_val_if_fail (stream != NULL, FALSE);
 
-  if (tsmux_stream_is_pcr (stream)) {
+  if (tsmux_stream_is_pcr (stream) || stream->program->pcr_pid) {
     gint64 cur_ts = CLOCK_BASE;
     if (tsmux_stream_get_dts (stream) != G_MININT64)
       cur_ts += tsmux_stream_get_dts (stream);
@@ -1582,6 +1629,29 @@
     new_pcr =
         write_new_pcr (mux, stream, get_current_pcr (mux, cur_ts),
         get_next_pcr (mux, cur_ts));
+
+    if (stream->program->pcr_pid) {
+      /* this should only enter block when time to send a PCR packet */
+      new_pcr = write_new_prog_pcr (mux, stream->program, get_current_pcr (mux,
+              cur_ts));
+      if (new_pcr != -1) {
+        if (!tsmux_get_buffer (mux, &buf))
+          return FALSE;
+
+        if (!gst_buffer_map (buf, &map, GST_MAP_WRITE))
+          goto fail_unmapped;
+
+        if (!tsmux_write_ts_header (mux, map.data, &stream->program->pi, 0,
+                NULL, NULL))
+          goto fail;
+
+        gst_buffer_unmap (buf, &map);
+        stream->program->pi.pid = stream->program->pcr_pid;
+        stream->program->pi.flags &= TSMUX_PACKET_FLAG_PES_FULL_HEADER;
+        if (!tsmux_packet_out (mux, buf, new_pcr))
+          return FALSE;
+      }
+    }
   }
 
   pi->packet_start_unit_indicator = tsmux_stream_at_pes_start (stream);
@@ -1627,6 +1697,9 @@
     }
     return FALSE;
   }
+fail_unmapped:
+  gst_clear_buffer (&buf);
+  return FALSE;
 }
 
 /**
@@ -1648,7 +1721,7 @@
     tsmux_section_free (program->scte35_null_section);
 
   g_ptr_array_free (program->streams, TRUE);
-  g_slice_free (TsMuxProgram, program);
+  g_free (program);
 }
 
 /**
@@ -1659,7 +1732,10 @@
 void
 tsmux_program_set_pmt_pid (TsMuxProgram * program, guint16 pmt_pid)
 {
+  g_return_if_fail (program != NULL);
+
   program->pmt_pid = pmt_pid;
+  program->pmt_changed = TRUE;
 }
 
 static gint
@@ -1751,8 +1827,10 @@
 
     pmt = gst_mpegts_pmt_new ();
 
-    if (program->pcr_stream == NULL)
+    if ((program->pcr_stream == NULL) && (program->pcr_pid == 0))
       pmt->pcr_pid = 0x1FFF;
+    else if (program->pcr_pid != 0)
+      pmt->pcr_pid = program->pcr_pid;
     else
       pmt->pcr_pid = tsmux_stream_get_pid (program->pcr_stream);

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsmux/tsmux/tsmux.h -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsmux/tsmux/tsmux.h Changed

@@ -73,8 +73,6 @@
 
 G_BEGIN_DECLS
 
-#define TSMUX_MAX_ES_INFO_LENGTH ((1 << 12) - 1)
-
 #define TSMUX_PID_AUTO ((guint16)-1)
 
 #define TSMUX_START_PROGRAM_ID 0x0001
@@ -86,7 +84,7 @@
 
 typedef gboolean (*TsMuxWriteFunc) (GstBuffer * buf, void *user_data, gint64 new_pcr);
 typedef void (*TsMuxAllocFunc) (GstBuffer ** buf, void *user_data);
-typedef TsMuxStream * (*TsMuxNewStreamFunc) (guint16 new_pid, guint stream_type, gpointer user_data);
+typedef TsMuxStream * (*TsMuxNewStreamFunc) (guint16 new_pid, guint stream_type, guint stream_number, gpointer user_data);
 
 struct TsMuxSection {
   TsMuxPacketInfo pi;
@@ -99,6 +97,8 @@
   gboolean wrote_si;
 
   TsMuxSection pmt;
+  TsMuxPacketInfo pi;
+
   /* PMT version */
   guint8   pmt_version;
   /* trigger for writing PMT */
@@ -109,6 +109,7 @@
 
   /* Next PMT position, 27 MHz */
   gint64   next_pmt_pcr;
+  gint64   next_pcr;
 
   /* program ID for the PAT */
   guint16 pgm_number;
@@ -125,6 +126,7 @@
 
   /* stream which carries the PCR */
   TsMuxStream *pcr_stream;
+  guint16 pcr_pid;
 
   /* programs TsMuxStream's */
   GPtrArray *streams;
@@ -179,9 +181,6 @@
   TsMuxNewStreamFunc new_stream_func;
   void *new_stream_data;
 
-  /* scratch space for writing ES_info descriptors */
-  guint8 es_info_bufTSMUX_MAX_ES_INFO_LENGTH;
-
   guint64 bitrate;
   guint64 n_bytes;
 
@@ -228,12 +227,13 @@
 gboolean        tsmux_send_section              (TsMux *mux, GstMpegtsSection *section);
 
 /* stream management */
-TsMuxStream *	tsmux_create_stream 		(TsMux *mux, guint stream_type, guint16 pid, gchar *language);
+TsMuxStream *	tsmux_create_stream 		(TsMux *mux, guint stream_type, guint stream_number, guint16 pid, gchar *language, guint bitrate, guint max_bitrate);
 TsMuxStream *	tsmux_find_stream 		(TsMux *mux, guint16 pid);
 gboolean        tsmux_remove_stream             (TsMux *mux, guint16 pid, TsMuxProgram *program);
 
 void 		tsmux_program_add_stream 	(TsMuxProgram *program, TsMuxStream *stream);
 void 		tsmux_program_set_pcr_stream 	(TsMuxProgram *program, TsMuxStream *stream);
+void           tsmux_program_set_pcr_pid       (TsMuxProgram *program, guint16 pid);
 void    tsmux_set_pcr_interval (TsMux * mux, guint freq);
 
 /* writing stuff */

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsmux/tsmux/tsmuxstream.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsmux/tsmux/tsmuxstream.c Changed

@@ -107,15 +107,18 @@
  * tsmux_stream_new:
  * @pid: a PID
  * @stream_type: the stream type
+ * @stream_number: stream number
  *
- * Create a new stream with PID of @pid and @stream_type.
+ * Create a new stream with PID of @pid and @stream_type,
+ * with stream number @stream_number.
  *
  * Returns: a new #TsMuxStream.
  */
 TsMuxStream *
-tsmux_stream_new (guint16 pid, guint stream_type)
+tsmux_stream_new (guint16 pid, guint stream_type, guint stream_number)
 {
-  TsMuxStream *stream = g_slice_new0 (TsMuxStream);
+  TsMuxStream *stream = g_new0 (TsMuxStream, 1);
+  gboolean supports_user_specified_stream_number = FALSE;
 
   stream->state = TSMUX_STREAM_STATE_HEADER;
   stream->pi.pid = pid;
@@ -132,10 +135,16 @@
     case TSMUX_ST_VIDEO_MPEG4:
     case TSMUX_ST_VIDEO_H264:
     case TSMUX_ST_VIDEO_HEVC:
-      /* FIXME: Assign sequential IDs? */
-      stream->id = 0xE0;
+      if (stream_number > 0xF) {
+        GST_WARNING
+            ("video stream number %d is greater than 0xF. Setting to 0.",
+            stream_number);
+        stream_number = 0;
+      }
+      stream->id = 0xE0 | stream_number;
       stream->pi.flags |= TSMUX_PACKET_FLAG_PES_FULL_HEADER;
       stream->is_video_stream = TRUE;
+      supports_user_specified_stream_number = TRUE;
       break;
     case TSMUX_ST_VIDEO_JP2K:
       stream->id = 0xBD;
@@ -145,10 +154,16 @@
     case TSMUX_ST_AUDIO_AAC:
     case TSMUX_ST_AUDIO_MPEG1:
     case TSMUX_ST_AUDIO_MPEG2:
-      /* FIXME: Assign sequential IDs? */
+      if (stream_number > 0x1F) {
+        GST_WARNING
+            ("audio stream number %d is greater than 0x1F. Setting to 0.",
+            stream_number);
+        stream_number = 0;
+      }
       stream->is_audio = TRUE;
-      stream->id = 0xC0;
+      stream->id = 0xC0 | stream_number;
       stream->pi.flags |= TSMUX_PACKET_FLAG_PES_FULL_HEADER;
+      supports_user_specified_stream_number = TRUE;
       break;
     case TSMUX_ST_VIDEO_DIRAC:
     case TSMUX_ST_PS_AUDIO_LPCM:
@@ -216,6 +231,12 @@
       break;
   }
 
+  if (!supports_user_specified_stream_number && stream_number != 0) {
+    GST_WARNING
+        ("Attempt to set stream number %d for unsupported stream type %d",
+        stream_number, stream_type);
+  }
+
   stream->first_ts = GST_CLOCK_STIME_NONE;
 
   stream->last_pts = GST_CLOCK_STIME_NONE;
@@ -265,11 +286,11 @@
 
     if (stream->buffer_release)
       stream->buffer_release (tmbuf->data, tmbuf->user_data);
-    g_slice_free (TsMuxStreamBuffer, tmbuf);
+    g_free (tmbuf);
   }
   g_list_free (stream->buffers);
 
-  g_slice_free (TsMuxStream, stream);
+  g_free (stream);
 }
 
 /**
@@ -337,7 +358,7 @@
           stream->cur_buffer->user_data);
     }
 
-    g_slice_free (TsMuxStreamBuffer, stream->cur_buffer);
+    g_free (stream->cur_buffer);
     stream->cur_buffer = NULL;
     /* FIXME: As a hack, for unbounded streams, start a new PES packet for each
      * incoming packet we receive. This assumes that incoming data is
@@ -722,7 +743,7 @@
 
   g_return_if_fail (stream != NULL);
 
-  packet = g_slice_new (TsMuxStreamBuffer);
+  packet = g_new (TsMuxStreamBuffer, 1);
   packet->data = data;
   packet->size = len;
   packet->user_data = user_data;
@@ -862,142 +883,17 @@
       break;
     case TSMUX_ST_PS_AUDIO_AC3:
     {
-      guint8 add_info6;
-      guint8 *pos;
-
-      pos = add_info;
-
-      /* audio_stream_descriptor () | ATSC A/52-2001 Annex A
-       *
-       * descriptor_tag       8 uimsbf
-       * descriptor_length    8 uimsbf
-       * sample_rate_code     3 bslbf
-       * bsid                 5 bslbf
-       * bit_rate_code        6 bslbf
-       * surround_mode        2 bslbf
-       * bsmod                3 bslbf
-       * num_channels         4 bslbf
-       * full_svc             1 bslbf
-       * langcod              8 bslbf
-       * ...
-       */
-      *pos++ = 0x81;
-      *pos++ = 0x04;
-
-      /* 3 bits sample_rate_code, 5 bits hardcoded bsid (default ver 8) */
-      switch (stream->audio_sampling) {
-        case 48000:
-          *pos++ = 0x08;
-          break;
-        case 44100:
-          *pos++ = 0x28;
-          break;
-        case 32000:
-          *pos++ = 0x48;
-          break;
-        default:
-          *pos++ = 0xE8;
-          break;                /* 48, 44.1 or 32 Khz */
-      }
-
-      /* 1 bit bit_rate_limit, 5 bits bit_rate_code, 2 bits suround_mode */
-      switch (stream->audio_bitrate) {
-        case 32:
-          *pos++ = 0x00 << 2;
-          break;
-        case 40:
-          *pos++ = 0x01 << 2;
-          break;
-        case 48:
-          *pos++ = 0x02 << 2;
-          break;
-        case 56:
-          *pos++ = 0x03 << 2;
-          break;
-        case 64:
-          *pos++ = 0x04 << 2;
-          break;
-        case 80:
-          *pos++ = 0x05 << 2;
-          break;
-        case 96:
-          *pos++ = 0x06 << 2;
-          break;
-        case 112:
-          *pos++ = 0x07 << 2;
-          break;
-        case 128:
-          *pos++ = 0x08 << 2;
-          break;
-        case 160:
-          *pos++ = 0x09 << 2;
-          break;
-        case 192:
-          *pos++ = 0x0A << 2;
-          break;
-        case 224:
-          *pos++ = 0x0B << 2;
-          break;
-        case 256:
-          *pos++ = 0x0C << 2;
-          break;
-        case 320:
-          *pos++ = 0x0D << 2;
-          break;
-        case 384:
-          *pos++ = 0x0E << 2;
-          break;
-        case 448:
-          *pos++ = 0x0F << 2;
-          break;
-        case 512:
-          *pos++ = 0x10 << 2;
-          break;
-        case 576:
-          *pos++ = 0x11 << 2;
-          break;
-        case 640:
-          *pos++ = 0x12 << 2;
-          break;
-        default:
-          *pos++ = 0x32 << 2;
-          break;                /* 640 Kb/s upper limit */
-      }
+      /* This is only called for DVB, ATSC ignores this case in favour of its
+       * special handling for the 0x81 descriptor */
+      /* We choose to provide no optional information */
+      guint8 add_info1 = { 0x00 };
 
-      /* 3 bits bsmod, 4 bits num_channels, 1 bit full_svc */
-      switch (stream->audio_channels) {
-        case 1:
-          *pos++ = 0x01 << 1;
-          break;                /* 1/0 */
-        case 2:
-          *pos++ = 0x02 << 1;
-          break;                /* 2/0 */
-        case 3:
-          *pos++ = 0x0A << 1;
-          break;                /* <= 3 */
-        case 4:
-          *pos++ = 0x0B << 1;
-          break;                /* <= 4 */
-        case 5:
-          *pos++ = 0x0C << 1;
-          break;                /* <= 5 */
-        case 6:
-        default:
-          *pos++ = 0x0D << 1;
-          break;                /* <= 6 */
-      }
-
-      *pos++ = 0x00;
-
-      descriptor = gst_mpegts_descriptor_from_registration ("AC-3",
-          add_info, 6);
+      descriptor = gst_mpegts_descriptor_from_registration ("AC-3", NULL, 0);
       g_ptr_array_add (pmt_stream->descriptors, descriptor);
 
       descriptor =
-          gst_mpegts_descriptor_from_custom (GST_MTS_DESC_AC3_AUDIO_STREAM,
-          add_info, 6);
+          gst_mpegts_descriptor_from_custom (GST_MTS_DESC_DVB_AC3, add_info, 1);
       g_ptr_array_add (pmt_stream->descriptors, descriptor);
-
       break;
     }
     case TSMUX_ST_PS_AUDIO_DTS:
@@ -1039,7 +935,7 @@
         descriptor =
             gst_mpegts_descriptor_from_custom_with_extension
             (GST_MTS_DESC_DVB_EXTENSION, 0x80,
-            &stream->opus_channel_config_code, 1);
+            stream->opus_channel_config, stream->opus_channel_config_len);
 
         g_ptr_array_add (pmt_stream->descriptors, descriptor);
       }

gst-plugins-bad-1.22.7.tar.xz/gst/mpegtsmux/tsmux/tsmuxstream.h -> gst-plugins-bad-1.24.5.tar.xz/gst/mpegtsmux/tsmux/tsmuxstream.h Changed

gst-plugins-bad-1.24.5.tar.xz/gst/mse Added

gst-plugins-bad-1.24.5.tar.xz/gst/mse/gstmse.c Added

@@ -0,0 +1,49 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * plugin-mse:
+ *
+ * Since: 1.24
+ */
+
+#include "gstmse.h"
+
+/**
+ * SECTION:element-msesrc
+ * @title: msesrc
+ *
+ * Since: 1.24
+ */
+GST_ELEMENT_REGISTER_DEFINE (msesrc, "msesrc", GST_RANK_NONE, GST_TYPE_MSE_SRC);
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  return GST_ELEMENT_REGISTER (msesrc, plugin);
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    mse,
+    "W3C Media Source Extensions Support",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

gst-plugins-bad-1.24.5.tar.xz/gst/mse/gstmse.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/mse/mse.h>
+#include <gst/mse/gstmsesrc.h>
+
+GST_ELEMENT_REGISTER_DECLARE (msesrc);

gst-plugins-bad-1.24.5.tar.xz/gst/mse/meson.build Added

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/gstmxfelement.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/gstmxfelement.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/meson.build -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfaes-bwf.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfaes-bwf.c Changed

@@ -375,136 +375,124 @@
     0x04, 0x02, 0x03, 0x01, 0x0E, 0x00, 0x00, 0x00
   };
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, &block_align_ul, 16);
   t->size = 2;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT16_BE (t->data, self->block_align);
   mxf_primer_pack_add_mapping (primer, 0x3d0a, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->sequence_offset) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &sequence_offset_ul, 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->sequence_offset);
     mxf_primer_pack_add_mapping (primer, 0x3d0b, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, &avg_bps_ul, 16);
   t->size = 4;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->avg_bps);
   mxf_primer_pack_add_mapping (primer, 0x3d09, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (!mxf_ul_is_zero (&self->channel_assignment)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &channel_assignment_ul, 16);
     t->size = 16;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     memcpy (t->data, &self->channel_assignment, 16);
     mxf_primer_pack_add_mapping (primer, 0x3d32, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->peak_envelope_version) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &peak_envelope_version_ul, 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->peak_envelope_version);
     mxf_primer_pack_add_mapping (primer, 0x3d29, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->peak_envelope_format) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &peak_envelope_format_ul, 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->peak_envelope_format);
     mxf_primer_pack_add_mapping (primer, 0x3d2a, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->points_per_peak_value) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &points_per_peak_value_ul, 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->points_per_peak_value);
     mxf_primer_pack_add_mapping (primer, 0x3d2b, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->peak_envelope_block_size) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &peak_envelope_block_size_ul, 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->peak_envelope_block_size);
     mxf_primer_pack_add_mapping (primer, 0x3d2c, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->peak_channels) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &peak_channels_ul, 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->peak_channels);
     mxf_primer_pack_add_mapping (primer, 0x3d2d, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->peak_frames) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &peak_frames_ul, 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->peak_frames);
     mxf_primer_pack_add_mapping (primer, 0x3d2e, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->peak_of_peaks_position) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &peak_of_peaks_position_ul, 16);
     t->size = 8;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT64_BE (t->data, self->peak_of_peaks_position);
     mxf_primer_pack_add_mapping (primer, 0x3d2f, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (!mxf_timestamp_is_unknown (&self->peak_envelope_timestamp)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &peak_envelope_timestamp_ul, 16);
     t->size = 8;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     mxf_timestamp_write (&self->peak_envelope_timestamp, t->data);
     mxf_primer_pack_add_mapping (primer, 0x3d30, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->peak_envelope_data) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &peak_envelope_data_ul, 16);
     t->size = self->peak_envelope_data_length;
     t->data = g_memdup2 (self->peak_envelope_data, t->size);
@@ -858,7 +846,8 @@
     guint i;
     GValue va = { 0, }
     , v = {
-    0,};
+      0,
+    };
     GstBuffer *buf;
     GstMapInfo map;
 
@@ -900,7 +889,8 @@
     guint i;
     GValue va = { 0, }
     , v = {
-    0,};
+      0,
+    };
     GstBuffer *buf;
     GstMapInfo map;
 
@@ -976,44 +966,40 @@
   };
 
   if (self->emphasis) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &emphasis_ul, 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->emphasis);
     mxf_primer_pack_add_mapping (primer, 0x3d0d, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->block_start_offset) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &block_start_offset_ul, 16);
     t->size = 2;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT16_BE (t->data, self->block_start_offset);
     mxf_primer_pack_add_mapping (primer, 0x3d0f, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->auxiliary_bits_mode) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &auxiliary_bits_mode_ul, 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->auxiliary_bits_mode);
     mxf_primer_pack_add_mapping (primer, 0x3d08, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->channel_status_mode) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &channel_status_mode_ul, 16);
     t->size = 8 + self->n_channel_status_mode;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->n_channel_status_mode);
     GST_WRITE_UINT32_BE (t->data + 4, 1);
     memcpy (t->data + 8, self->channel_status_mode, t->size);
@@ -1024,11 +1010,10 @@
   if (self->fixed_channel_status_data) {
     guint i;
 
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &fixed_channel_status_data_ul, 16);
     t->size = 8 + 24 * self->n_fixed_channel_status_data;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->n_fixed_channel_status_data);
     GST_WRITE_UINT32_BE (t->data + 4, 24);
     for (i = 0; i < self->n_fixed_channel_status_data; i++)
@@ -1038,11 +1023,10 @@
   }
 
   if (self->user_data_mode) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &user_data_mode_ul, 16);
     t->size = 8 + self->n_user_data_mode;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->n_user_data_mode);
     GST_WRITE_UINT32_BE (t->data + 4, 1);
     memcpy (t->data + 8, self->user_data_mode, t->size);
@@ -1053,11 +1037,10 @@
   if (self->fixed_user_data) {
     guint i;
 
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &fixed_user_data_ul, 16);
     t->size = 8 + 24 * self->n_fixed_user_data;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->n_fixed_user_data);
     GST_WRITE_UINT32_BE (t->data + 4, 24);
     for (i = 0; i < self->n_fixed_user_data; i++)
@@ -1096,39 +1079,19 @@
 }
 
 static gboolean
-mxf_is_aes_bwf_essence_track (const MXFMetadataTimelineTrack * track)
+mxf_is_aes_bwf_essence_track (const MXFMetadataFileDescriptor * d)
 {
-  guint i;
-
-  g_return_val_if_fail (track != NULL, FALSE);
-
-  if (track->parent.descriptor == NULL) {
-    GST_ERROR ("No descriptor for this track");
-    return FALSE;
-  }
-
-  for (i = 0; i < track->parent.n_descriptor; i++) {
-    MXFMetadataFileDescriptor *d = track->parent.descriptori;
-    MXFUL *key;
-
-    if (!d)
-      continue;
-
-    key = &d->essence_container;
-    /* SMPTE 382M 9 */
-    if (mxf_is_generic_container_essence_container_label (key) &&
-        key->u12 == 0x02 &&
-        key->u13 == 0x06 &&
-        (key->u14 == 0x01 ||
-            key->u14 == 0x02 ||
-            key->u14 == 0x03 ||
-            key->u14 == 0x04 || key->u14 == 0x08 || key->u14 == 0x09 ||
-            key->u14 == 0x0a || key->u14 == 0x0b))
-      return TRUE;
-  }
-
-
-  return FALSE;
+  const MXFUL *key = &d->essence_container;
+
+  /* SMPTE 382M 9 */
+  return (mxf_is_generic_container_essence_container_label (key) &&
+      key->u12 == 0x02 &&
+      key->u13 == 0x06 &&
+      (key->u14 == 0x01 ||
+          key->u14 == 0x02 ||
+          key->u14 == 0x03 ||
+          key->u14 == 0x04 || key->u14 == 0x08 || key->u14 == 0x09 ||
+          key->u14 == 0x0a || key->u14 == 0x0b));
 }
 
 static MXFEssenceWrapping

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfalaw.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfalaw.c Changed

@@ -35,31 +35,13 @@
 #define GST_CAT_DEFAULT mxf_debug
 
 static gboolean
-mxf_is_alaw_essence_track (const MXFMetadataTimelineTrack * track)
+mxf_is_alaw_essence_track (const MXFMetadataFileDescriptor * d)
 {
-  guint i;
-
-  g_return_val_if_fail (track != NULL, FALSE);
-
-  if (track->parent.descriptor == NULL)
-    return FALSE;
-
-  for (i = 0; i < track->parent.n_descriptor; i++) {
-    MXFMetadataFileDescriptor *d = track->parent.descriptori;
-    MXFUL *key;
-
-    if (!d)
-      continue;
-
-    key = &d->essence_container;
-    /* SMPTE 388M 6.1 */
-    if (mxf_is_generic_container_essence_container_label (key) &&
-        key->u12 == 0x02 && key->u13 == 0x0a &&
-        (key->u14 == 0x01 || key->u14 == 0x02 || key->u14 == 0x03))
-      return TRUE;
-  }
-
-  return FALSE;
+  const MXFUL *key = &d->essence_container;
+  /* SMPTE 388M 6.1 */
+  return (mxf_is_generic_container_essence_container_label (key) &&
+      key->u12 == 0x02 && key->u13 == 0x0a &&
+      (key->u14 == 0x01 || key->u14 == 0x02 || key->u14 == 0x03));
 }
 
 static GstFlowReturn

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfcustom.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfcustom.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfd10.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfd10.c Changed

@@ -43,32 +43,14 @@
 } MXFD10AudioMappingData;
 
 static gboolean
-mxf_is_d10_essence_track (const MXFMetadataTimelineTrack * track)
+mxf_is_d10_essence_track (const MXFMetadataFileDescriptor * d)
 {
-  guint i;
-
-  g_return_val_if_fail (track != NULL, FALSE);
-
-  if (track->parent.descriptor == NULL)
-    return FALSE;
-
-  for (i = 0; i < track->parent.n_descriptor; i++) {
-    MXFMetadataFileDescriptor *d = track->parent.descriptori;
-    MXFUL *key;
-
-    if (!d)
-      continue;
-
-    key = &d->essence_container;
-    /* SMPTE 386M 5.1 */
-    if (mxf_is_generic_container_essence_container_label (key) &&
-        key->u12 == 0x02 && key->u13 == 0x01 &&
-        (key->u14 >= 0x01 && key->u14 <= 0x06) &&
-        (key->u15 == 0x01 || key->u15 == 0x02 || key->u15 == 0x7f))
-      return TRUE;
-  }
-
-  return FALSE;
+  const MXFUL *key = &d->essence_container;
+  /* SMPTE 386M 5.1 */
+  return (mxf_is_generic_container_essence_container_label (key) &&
+      key->u12 == 0x02 && key->u13 == 0x01 &&
+      (key->u14 >= 0x01 && key->u14 <= 0x06) &&
+      (key->u15 == 0x01 || key->u15 == 0x02 || key->u15 == 0x7f));
 }
 
 static GstFlowReturn

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfdemux.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfdemux.c Changed

@@ -813,13 +813,8 @@
       gboolean new = FALSE;
 
       if (!package->parent.tracksj
-          || !MXF_IS_METADATA_TIMELINE_TRACK (package->parent.tracksj)) {
-        GST_DEBUG_OBJECT (demux,
-            "Skipping non-timeline track (id:%d number:0x%08x)",
-            package->parent.tracksj->track_id,
-            package->parent.tracksj->track_number);
+          || !MXF_IS_METADATA_TIMELINE_TRACK (package->parent.tracksj))
         continue;
-      }
 
       track = MXF_METADATA_TIMELINE_TRACK (package->parent.tracksj);
       if ((track->parent.type & 0xf0) != 0x30) {
@@ -1165,16 +1160,21 @@
   for (tmp = file_packages; tmp; tmp = tmp->next) {
     MXFMetadataMaterialPackage *pack = (MXFMetadataMaterialPackage *) tmp->data;
     MXFMetadataSourcePackage *src = (MXFMetadataSourcePackage *) pack;
+#ifndef GST_DISABLE_GST_DEBUG
     MXFMetadataEssenceContainerData *econt =
         essence_container_for_source_package (storage, src);
     GST_DEBUG_OBJECT (demux,
         "  Package (body_sid:%d index_sid:%d top_level:%d) with %d tracks , UID:%s",
-        econt->body_sid, econt->index_sid, src->top_level, pack->n_tracks,
-        mxf_umid_to_string (&pack->package_uid, str));
+        econt ? econt->body_sid : 0, econt ? econt->index_sid : 0,
+        src->top_level, pack->n_tracks, mxf_umid_to_string (&pack->package_uid,
+            str));
+#endif
     GST_DEBUG_OBJECT (demux, "    Package descriptor : %s",
         g_type_name (G_OBJECT_TYPE (src->descriptor)));
     for (i = 0; i < pack->n_tracks; i++) {
       MXFMetadataTrack *track = pack->tracksi;
+      if (!track)
+        continue;
       MXFMetadataSequence *sequence = track->sequence;
       guint di, si;
       if (MXF_IS_METADATA_TIMELINE_TRACK (track)) {
@@ -1192,9 +1192,21 @@
       }
       for (di = 0; di < track->n_descriptor; di++) {
         MXFMetadataFileDescriptor *desc = track->descriptordi;
+        MXFMetadataGenericDescriptor *generic =
+            (MXFMetadataGenericDescriptor *) desc;
+        guint subdi;
+
         GST_DEBUG_OBJECT (demux, "      Descriptor %s %s",
             g_type_name (G_OBJECT_TYPE (desc)),
             mxf_ul_to_string (&desc->essence_container, str));
+        for (subdi = 0; subdi < generic->n_sub_descriptors; subdi++) {
+          MXFMetadataGenericDescriptor *subdesc =
+              generic->sub_descriptorssubdi;
+          if (subdesc) {
+            GST_DEBUG_OBJECT (demux, "        Sub-Descriptor %s",
+                g_type_name (G_OBJECT_TYPE (subdesc)));
+          }
+        }
       }
       GST_DEBUG_OBJECT (demux,
           "      Sequence duration:%" G_GINT64_FORMAT
@@ -4819,8 +4831,8 @@
   if (format != GST_FORMAT_TIME)
     goto wrong_format;
 
-  flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
-  keyframe = ! !(flags & GST_SEEK_FLAG_KEY_UNIT);
+  flush = !!(flags & GST_SEEK_FLAG_FLUSH);
+  keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT);
 
   /* Work on a copy until we are sure the seek succeeded. */
   memcpy (&seeksegment, &demux->segment, sizeof (GstSegment));
@@ -5109,8 +5121,8 @@
   if (rate <= 0.0)
     goto wrong_rate;
 
-  flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
-  keyframe = ! !(flags & GST_SEEK_FLAG_KEY_UNIT);
+  flush = !!(flags & GST_SEEK_FLAG_FLUSH);
+  keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT);
 
   if (!demux->index_table_segments_collected) {
     collect_index_table_segments (demux);

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfdv-dif.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfdv-dif.c Changed

@@ -48,38 +48,24 @@
 };
 
 static gboolean
-mxf_is_dv_dif_essence_track (const MXFMetadataTimelineTrack * track)
+mxf_is_dv_dif_essence_track (const MXFMetadataFileDescriptor * d)
 {
-  guint i;
-
-  g_return_val_if_fail (track != NULL, FALSE);
-
-  if (track->parent.descriptor == NULL)
-    return FALSE;
-
-  for (i = 0; i < track->parent.n_descriptor; i++) {
-    MXFMetadataFileDescriptor *d = track->parent.descriptori;
-    MXFUL *key;
+  const MXFUL *key = &d->essence_container;
+  /* SMPTE 383M 8 */
+  if (mxf_is_generic_container_essence_container_label (key) &&
+      key->u12 == 0x02 && key->u13 == 0x02) {
+    return TRUE;
+  }
+  if (mxf_is_avid_essence_container_label (key)) {
+    MXFMetadataGenericPictureEssenceDescriptor *p;
 
-    if (!d)
-      continue;
+    if (!MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (d))
+      return FALSE;
+    p = MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (d);
 
-    key = &d->essence_container;
-    /* SMPTE 383M 8 */
-    if (mxf_is_generic_container_essence_container_label (key) &&
-        key->u12 == 0x02 && key->u13 == 0x02) {
+    key = &p->picture_essence_coding;
+    if (mxf_ul_is_subclass (&picture_essence_coding_dv, key))
       return TRUE;
-    } else if (mxf_is_avid_essence_container_label (key)) {
-      MXFMetadataGenericPictureEssenceDescriptor *p;
-
-      if (!MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (d))
-        return FALSE;
-      p = MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (d);
-
-      key = &p->picture_essence_coding;
-      if (mxf_ul_is_subclass (&picture_essence_coding_dv, key))
-        return TRUE;
-    }
   }
 
   return FALSE;

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfessence.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfessence.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfessence.h -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfessence.h Changed

gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfffv1.c Added

@@ -0,0 +1,273 @@
+/* GStreamer
+ * Copyright (C) 2023 Edward Hervey <edward@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/* Implementation of RDD48 Amd1 - mapping of RFC 9043 FFV1 Video Coding Format
+ * Versions 0, 1, and 3 to RDD 48 and the MXF Generic Container
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <string.h>
+
+#include "mxfffv1.h"
+#include "mxfessence.h"
+#include "mxfquark.h"
+
+GST_DEBUG_CATEGORY_EXTERN (mxf_debug);
+#define GST_CAT_DEFAULT mxf_debug
+
+/* RRD 48 Amd 1 */
+
+static const MXFUL _ffv1_picture_descriptor_ul = { {
+        0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, 0x04, 0x01, 0x06, 0x0c,
+    }
+};
+
+
+
+#define MXF_TYPE_METADATA_FFV1_PICTURE_DESCRIPTOR \
+  (mxf_metadata_ffv1_picture_descriptor_get_type())
+#define MXF_METADATA_FFV1_PICTURE_DESCRIPTOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),MXF_TYPE_METADATA_FFV1_PICTURE_DESCRIPTOR, MXFMetadataFFV1PictureDescriptor))
+#define MXF_IS_METADATA_FFV1_PICTURE_DESCRIPTOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),MXF_TYPE_METADATA_FFV1_PICTURE_DESCRIPTOR))
+typedef struct _MXFMetadataFFV1PictureDescriptor
+    MXFMetadataFFV1PictureDescriptor;
+typedef MXFMetadataClass MXFMetadataFFV1PictureDescriptorClass;
+GType mxf_metadata_ffv1_picture_descriptor_get_type (void);
+
+struct _MXFMetadataFFV1PictureDescriptor
+{
+  MXFMetadataCDCIPictureEssenceDescriptor parent;
+
+  gchar *initialization_data;
+  gsize id_size;
+};
+
+G_DEFINE_TYPE (MXFMetadataFFV1PictureDescriptor,
+    mxf_metadata_ffv1_picture_descriptor,
+    MXF_TYPE_METADATA_CDCI_PICTURE_ESSENCE_DESCRIPTOR);
+
+static gboolean
+mxf_is_ffv1_essence_track (const MXFMetadataFileDescriptor * d)
+{
+  const MXFUL *key = &d->essence_container;
+
+  return (mxf_is_generic_container_essence_container_label (key) &&
+      key->u12 == 0x02 && key->u13 == 0x23);
+}
+
+static GstFlowReturn
+mxf_ffv1_handle_essence_element (const MXFUL * key, GstBuffer * buffer,
+    GstCaps * caps,
+    MXFMetadataTimelineTrack * track,
+    gpointer mapping_data, GstBuffer ** outbuf)
+{
+  *outbuf = buffer;
+
+  if (key->u12 != 0x15 || (key->u14 != 0x1d && key->u14 != 0x1e)) {
+    GST_ERROR ("Invalid FFV1 essence element");
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static MXFEssenceWrapping
+mxf_ffv1_get_track_wrapping (const MXFMetadataTimelineTrack * track)
+{
+  MXFMetadataTrack *p = (MXFMetadataTrack *) track;
+  guint i;
+
+  g_return_val_if_fail (track != NULL, MXF_ESSENCE_WRAPPING_CUSTOM_WRAPPING);
+
+  if (p->descriptor == NULL) {
+    GST_ERROR ("No descriptor found for this track");
+    return MXF_ESSENCE_WRAPPING_CUSTOM_WRAPPING;
+  }
+
+  for (i = 0; i < p->n_descriptor; i++) {
+    MXFMetadataFileDescriptor *desc = p->descriptori;
+    if (!desc)
+      continue;
+
+    switch (desc->essence_container.u14) {
+      case 0x01:
+        return MXF_ESSENCE_WRAPPING_FRAME_WRAPPING;
+        break;
+      case 0x02:
+        return MXF_ESSENCE_WRAPPING_CLIP_WRAPPING;
+        break;
+      default:
+        return MXF_ESSENCE_WRAPPING_CUSTOM_WRAPPING;
+        break;
+    }
+  }
+
+  return MXF_ESSENCE_WRAPPING_CUSTOM_WRAPPING;
+}
+
+static GstCaps *
+mxf_ffv1_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
+    gboolean * intra_only, MXFEssenceElementHandleFunc * handler,
+    gpointer * mapping_data)
+{
+  MXFMetadataTrack *p = (MXFMetadataTrack *) track;
+  MXFMetadataGenericDescriptor *generic = NULL;
+  guint i;
+  GstCaps *caps = NULL;
+
+  g_return_val_if_fail (track != NULL, NULL);
+
+  if (p->descriptor == NULL) {
+    GST_ERROR ("No descriptor found for this track");
+    return NULL;
+  }
+
+  for (i = 0; i < p->n_descriptor; i++) {
+    MXFMetadataFileDescriptor *desc = p->descriptori;
+    if (!p)
+      continue;
+
+    if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (desc) &&
+        desc->essence_container.u13 == 0x23) {
+      generic = (MXFMetadataGenericDescriptor *) desc;
+      break;
+    }
+  }
+
+  if (generic) {
+    GST_DEBUG ("Found FFV1 byte-stream stream");
+
+    *handler = mxf_ffv1_handle_essence_element;
+    caps =
+        gst_caps_new_simple ("video/x-ffv", "ffvversion", G_TYPE_INT, 1, NULL);
+
+    for (i = 0; i < generic->n_sub_descriptors; i++) {
+      if (generic->sub_descriptorsi
+          &&
+          MXF_IS_METADATA_FFV1_PICTURE_DESCRIPTOR (generic->sub_descriptorsi))
+      {
+        MXFMetadataFFV1PictureDescriptor *ffv1 =
+            (MXFMetadataFFV1PictureDescriptor *) generic->sub_descriptorsi;
+        GstBuffer *codec_data;
+        g_assert (ffv1->initialization_data);
+        codec_data =
+            gst_buffer_new_wrapped (g_memdup2 (ffv1->initialization_data,
+                ffv1->id_size), ffv1->id_size);
+        gst_caps_set_simple (caps, "codec_data", GST_TYPE_BUFFER, codec_data,
+            NULL);
+        gst_buffer_unref (codec_data);
+        break;
+      }
+    }
+
+    if (!*tags)
+      *tags = gst_tag_list_new_empty ();
+    gst_tag_list_add (*tags, GST_TAG_MERGE_APPEND, GST_TAG_VIDEO_CODEC,
+        "FFV1 Video", NULL);
+    *intra_only = TRUE;
+    mxf_metadata_generic_picture_essence_descriptor_set_caps (
+        (MXFMetadataGenericPictureEssenceDescriptor *) generic, caps);
+  }
+
+  return caps;
+}
+
+static const MXFEssenceElementHandler mxf_ffv1_essence_element_handler = {
+  mxf_is_ffv1_essence_track,
+  mxf_ffv1_get_track_wrapping,
+  mxf_ffv1_create_caps
+};
+
+static gboolean
+mxf_metadata_ffv1_picture_descriptor_handle_tag (MXFMetadataBase * metadata,
+    MXFPrimerPack * primer, guint16 tag, const guint8 * tag_data,
+    guint tag_size)
+{
+  MXFMetadataFFV1PictureDescriptor *self =
+      MXF_METADATA_FFV1_PICTURE_DESCRIPTOR (metadata);
+  gboolean ret = TRUE;
+  MXFUL *tag_ul = NULL;
+#ifndef GST_DISABLE_GST_DEBUG
+  gchar str48;
+#endif
+
+  tag_ul = mxf_primer_tag_to_ul (primer, tag);
+  if (!tag_ul)
+    return FALSE;
+
+  GST_DEBUG ("%s", mxf_ul_to_string (tag_ul, str));
+
+  if (mxf_ul_is_subclass (&_ffv1_picture_descriptor_ul, tag_ul)) {
+    switch (tag_ul->u12) {
+      case 0x01:
+      {
+        GST_MEMDUMP ("Initialization data", tag_data, tag_size);
+        self->initialization_data = g_memdup2 (tag_data, tag_size);
+        self->id_size = tag_size;
+        break;
+      }
+      default:
+        GST_DEBUG ("Tag 0x%02x", tag_ul->u12);
+        break;
+    }
+    ret = TRUE;
+  } else {
+
+    ret =
+        MXF_METADATA_BASE_CLASS
+        (mxf_metadata_ffv1_picture_descriptor_parent_class)->handle_tag
+        (metadata, primer, tag, tag_data, tag_size);
+  }
+  return ret;
+}
+
+static void
+mxf_metadata_ffv1_picture_descriptor_init (MXFMetadataFFV1PictureDescriptor *
+    self)
+{
+
+}
+
+static void
+    mxf_metadata_ffv1_picture_descriptor_class_init
+    (MXFMetadataFFV1PictureDescriptorClass * klass)
+{
+  MXFMetadataBaseClass *metadata_base_class = (MXFMetadataBaseClass *) klass;
+  MXFMetadataClass *metadata_class = (MXFMetadataClass *) klass;
+
+  metadata_base_class->handle_tag =
+      mxf_metadata_ffv1_picture_descriptor_handle_tag;
+  metadata_base_class->name_quark = MXF_QUARK (FFV1_PICTURE_DESCRIPTOR);
+
+  metadata_class->type = 0x0181;
+}
+
+void
+mxf_ffv1_init (void)
+{
+  mxf_essence_element_handler_register (&mxf_ffv1_essence_element_handler);
+
+  mxf_metadata_register (MXF_TYPE_METADATA_FFV1_PICTURE_DESCRIPTOR);
+}

gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfffv1.h Added

@@ -0,0 +1,31 @@
+/* GStreamer
+ * Copyright (C) 2023 Edward Hervey <edward@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/* Implementation of RDD48 Amd1 - mapping of RFC 9043 FFV1 Video Coding Format
+ * Versions 0, 1, and 3 to RDD 48 and the MXF Generic Container
+ */
+
+#ifndef __MXF_FFV1_H__
+#define __MXF_FFV1_H__
+
+#include <gst/gst.h>
+
+void mxf_ffv1_init (void);
+
+#endif /* __MXF_FFV1_H__ */

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfjpeg2000.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfjpeg2000.c Changed

@@ -41,31 +41,13 @@
 #define GST_CAT_DEFAULT mxf_debug
 
 static gboolean
-mxf_is_jpeg2000_essence_track (const MXFMetadataTimelineTrack * track)
+mxf_is_jpeg2000_essence_track (const MXFMetadataFileDescriptor * d)
 {
-  guint i;
-
-  g_return_val_if_fail (track != NULL, FALSE);
-
-  if (track->parent.descriptor == NULL)
-    return FALSE;
-
-  for (i = 0; i < track->parent.n_descriptor; i++) {
-    MXFMetadataFileDescriptor *d = track->parent.descriptori;
-    MXFUL *key;
-
-    if (!d)
-      continue;
-
-    key = &d->essence_container;
-    /* SMPTE 422M 5.4 */
-    if (mxf_is_generic_container_essence_container_label (key) &&
-        key->u12 == 0x02 && key->u13 == 0x0c &&
-        (key->u14 == 0x01 || key->u14 == 0x02))
-      return TRUE;
-  }
-
-  return FALSE;
+  const MXFUL *key = &d->essence_container;
+  /* SMPTE 422M 5.4 */
+  return (mxf_is_generic_container_essence_container_label (key) &&
+      key->u12 == 0x02 && key->u13 == 0x0c &&
+      (key->u14 == 0x01 || key->u14 == 0x02));
 }
 
 static GstFlowReturn

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfmetadata.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfmetadata.c Changed

@@ -247,13 +247,8 @@
 
     while (g_hash_table_iter_next (&iter, NULL, (gpointer) & t)) {
       mxf_primer_pack_add_mapping (primer, 0x0000, &t->ul);
-      tmp = g_slice_dup (MXFLocalTag, t);
-      if (t->g_slice) {
-        tmp->data = g_slice_alloc (t->size);
-        memcpy (tmp->data, t->data, t->size);
-      } else {
-        tmp->data = g_memdup2 (t->data, t->size);
-      }
+      tmp = g_memdup2 (t, sizeof (MXFLocalTag));
+      tmp->data = g_memdup2 (t->data, t->size);
       tags = g_list_prepend (tags, tmp);
     }
   }
@@ -370,26 +365,24 @@
   klass = MXF_METADATA_GET_CLASS (self);
 
   /* Last element contains the metadata key */
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (METADATA), 16);
   GST_WRITE_UINT16_BE (&t->ul.u13, klass->type);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (INSTANCE_UID), 16);
   t->size = 16;
-  t->data = g_slice_alloc (16);
-  t->g_slice = TRUE;
+  t->data = g_malloc (16);
   memcpy (t->data, &self->parent.instance_uid, 16);
   mxf_primer_pack_add_mapping (primer, 0x3c0a, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (!mxf_uuid_is_zero (&self->parent.generation_uid)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (GENERATION_UID), 16);
     t->size = 16;
-    t->data = g_slice_alloc (16);
-    t->g_slice = TRUE;
+    t->data = g_malloc (16);
     memcpy (t->data, &self->parent.generation_uid, 16);
     mxf_primer_pack_add_mapping (primer, 0x0102, &t->ul);
     ret = g_list_prepend (ret, t);
@@ -741,7 +734,8 @@
   if (self->n_identifications > 0) {
     GValue arr = { 0, }
     , val = {
-    0,};
+      0,
+    };
 
     g_value_init (&arr, GST_TYPE_ARRAY);
 
@@ -785,7 +779,8 @@
   if (self->n_essence_containers > 0) {
     GValue arr = { 0, }
     , val = {
-    0,};
+      0,
+    };
 
     g_value_init (&arr, GST_TYPE_ARRAY);
 
@@ -811,7 +806,8 @@
   if (self->n_dm_schemes > 0) {
     GValue arr = { 0, }
     , val = {
-    0,};
+      0,
+    };
 
     g_value_init (&arr, GST_TYPE_ARRAY);
 
@@ -847,51 +843,46 @@
   MXFLocalTag *t;
   guint i;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (LAST_MODIFIED_DATE), 16);
   t->size = 8;
-  t->data = g_slice_alloc (8);
-  t->g_slice = TRUE;
+  t->data = g_malloc (8);
   mxf_timestamp_write (&self->last_modified_date, t->data);
   mxf_primer_pack_add_mapping (primer, 0x3b02, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (VERSION), 16);
   t->size = 2;
-  t->data = g_slice_alloc (2);
-  t->g_slice = TRUE;
+  t->data = g_malloc (2);
   GST_WRITE_UINT16_BE (t->data, self->version);
   mxf_primer_pack_add_mapping (primer, 0x3b05, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->object_model_version) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (OBJECT_MODEL_VERSION), 16);
     t->size = 4;
-    t->data = g_slice_alloc (4);
-    t->g_slice = TRUE;
+    t->data = g_malloc (4);
     GST_WRITE_UINT32_BE (t->data, self->object_model_version);
     mxf_primer_pack_add_mapping (primer, 0x3b07, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (!mxf_uuid_is_zero (&self->primary_package_uid)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (PRIMARY_PACKAGE), 16);
     t->size = 16;
-    t->data = g_slice_alloc (16);
-    t->g_slice = TRUE;
+    t->data = g_malloc (16);
     memcpy (t->data, &self->primary_package_uid, 16);
     mxf_primer_pack_add_mapping (primer, 0x3b08, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (IDENTIFICATIONS), 16);
   t->size = 8 + 16 * self->n_identifications;
-  t->data = g_slice_alloc0 (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc0 (t->size);
   mxf_primer_pack_add_mapping (primer, 0x3b06, &t->ul);
   GST_WRITE_UINT32_BE (t->data, self->n_identifications);
   GST_WRITE_UINT32_BE (t->data + 4, 16);
@@ -904,30 +895,27 @@
   }
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (CONTENT_STORAGE), 16);
   t->size = 16;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   mxf_primer_pack_add_mapping (primer, 0x3b03, &t->ul);
   memcpy (t->data, &MXF_METADATA_BASE (self->content_storage)->instance_uid,
       16);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (OPERATIONAL_PATTERN), 16);
   t->size = 16;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   mxf_primer_pack_add_mapping (primer, 0x3b09, &t->ul);
   memcpy (t->data, &self->operational_pattern, 16);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (ESSENCE_CONTAINERS), 16);
   t->size = 8 + 16 * self->n_essence_containers;
-  t->data = g_slice_alloc0 (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc0 (t->size);
   mxf_primer_pack_add_mapping (primer, 0x3b0a, &t->ul);
   GST_WRITE_UINT32_BE (t->data, self->n_essence_containers);
   GST_WRITE_UINT32_BE (t->data + 4, 16);
@@ -936,11 +924,10 @@
   }
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (DM_SCHEMES), 16);
   t->size = 8 + 16 * self->n_dm_schemes;
-  t->data = g_slice_alloc0 (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc0 (t->size);
   mxf_primer_pack_add_mapping (primer, 0x3b0b, &t->ul);
   GST_WRITE_UINT32_BE (t->data, self->n_dm_schemes);
   GST_WRITE_UINT32_BE (t->data + 4, 16);
@@ -1163,7 +1150,7 @@
   MXFLocalTag *t;
 
   if (self->company_name) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (COMPANY_NAME), 16);
     t->data = mxf_utf8_to_utf16 (self->company_name, &t->size);
     mxf_primer_pack_add_mapping (primer, 0x3c01, &t->ul);
@@ -1171,7 +1158,7 @@
   }
 
   if (self->product_name) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (PRODUCT_NAME), 16);
     t->data = mxf_utf8_to_utf16 (self->product_name, &t->size);
     mxf_primer_pack_add_mapping (primer, 0x3c02, &t->ul);
@@ -1179,18 +1166,17 @@
   }
 
   if (!mxf_product_version_is_valid (&self->product_version)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (PRODUCT_VERSION), 16);
     t->size = 10;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     mxf_product_version_write (&self->product_version, t->data);
     mxf_primer_pack_add_mapping (primer, 0x3c03, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->version_string) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (VERSION_STRING), 16);
     t->data = mxf_utf8_to_utf16 (self->version_string, &t->size);
     mxf_primer_pack_add_mapping (primer, 0x3c04, &t->ul);
@@ -1198,40 +1184,37 @@
   }
 
   if (!mxf_uuid_is_zero (&self->product_uid)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (PRODUCT_UID), 16);
     t->size = 16;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     memcpy (t->data, &self->product_uid, 16);
     mxf_primer_pack_add_mapping (primer, 0x3c05, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (!mxf_timestamp_is_unknown (&self->modification_date)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (MODIFICATION_DATE), 16);
     t->size = 8;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     mxf_timestamp_write (&self->modification_date, t->data);
     mxf_primer_pack_add_mapping (primer, 0x3c06, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (!mxf_product_version_is_valid (&self->toolkit_version)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (TOOLKIT_VERSION), 16);
     t->size = 10;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     mxf_product_version_write (&self->toolkit_version, t->data);
     mxf_primer_pack_add_mapping (primer, 0x3c07, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->platform) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (PLATFORM), 16);
     t->data = mxf_utf8_to_utf16 (self->platform, &t->size);
     mxf_primer_pack_add_mapping (primer, 0x3c08, &t->ul);
@@ -1239,11 +1222,10 @@
   }
 
   if (!mxf_uuid_is_zero (&self->this_generation_uid)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (THIS_GENERATION_UID), 16);
     t->size = 16;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     memcpy (t->data, &self->this_generation_uid, 16);
     mxf_primer_pack_add_mapping (primer, 0x3c09, &t->ul);
     ret = g_list_prepend (ret, t);
@@ -1439,7 +1421,8 @@
   if (self->n_packages > 0) {
     GValue arr = { 0, }
     , val = {
-    0,};
+      0,
+    };
 
     g_value_init (&arr, GST_TYPE_ARRAY);
 
@@ -1468,7 +1451,8 @@
   if (self->n_essence_container_data > 0) {
     GValue arr = { 0, }
     , val = {
-    0,};
+      0,
+    };
 
     g_value_init (&arr, GST_TYPE_ARRAY);
 
@@ -1510,11 +1494,10 @@
   guint i;
 
   if (self->packages) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (PACKAGES), 16);
     t->size = 8 + 16 * self->n_packages;
-    t->data = g_slice_alloc0 (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc0 (t->size);
     GST_WRITE_UINT32_BE (t->data, self->n_packages);
     GST_WRITE_UINT32_BE (t->data + 4, 16);
     for (i = 0; i < self->n_packages; i++) {
@@ -1530,11 +1513,10 @@
   }
 
   if (self->essence_container_data) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (ESSENCE_CONTAINER_DATA), 16);
     t->size = 8 + 16 * self->n_essence_container_data;
-    t->data = g_slice_alloc0 (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc0 (t->size);
     GST_WRITE_UINT32_BE (t->data, self->n_essence_container_data);
     GST_WRITE_UINT32_BE (t->data + 4, 16);
     for (i = 0; i < self->n_essence_container_data; i++) {
@@ -1705,31 +1687,28 @@
       primer);
   MXFLocalTag *t;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (LINKED_PACKAGE_UID), 16);
   t->size = 32;
-  t->data = g_slice_alloc0 (32);
-  t->g_slice = TRUE;
+  t->data = g_malloc0 (32);
   if (self->linked_package)
     memcpy (t->data, &self->linked_package->parent.package_uid, 32);
   mxf_primer_pack_add_mapping (primer, 0x2701, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (BODY_SID), 16);
   t->size = 4;
-  t->data = g_slice_alloc (4);
-  t->g_slice = TRUE;
+  t->data = g_malloc (4);
   GST_WRITE_UINT32_BE (t->data, self->body_sid);
   mxf_primer_pack_add_mapping (primer, 0x3f07, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->index_sid) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (INDEX_SID), 16);
     t->size = 4;
-    t->data = g_slice_alloc (4);
-    t->g_slice = TRUE;
+    t->data = g_malloc (4);
     GST_WRITE_UINT32_BE (t->data, self->index_sid);
     mxf_primer_pack_add_mapping (primer, 0x3f06, &t->ul);
     ret = g_list_prepend (ret, t);
@@ -1936,7 +1915,8 @@
   if (self->n_tracks > 0) {
     GValue arr = { 0, }
     , val = {
-    0,};
+      0,
+    };
 
     g_value_init (&arr, GST_TYPE_ARRAY);
 
@@ -1974,37 +1954,34 @@
       (mxf_metadata_generic_package_parent_class)->write_tags (m, primer);
   MXFLocalTag *t;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (PACKAGE_UID), 16);
   t->size = 32;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   memcpy (t->data, &self->package_uid, 32);
   mxf_primer_pack_add_mapping (primer, 0x4401, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->name) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (PACKAGE_NAME), 16);
     t->data = mxf_utf8_to_utf16 (self->name, &t->size);
     mxf_primer_pack_add_mapping (primer, 0x4402, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (PACKAGE_CREATION_DATE), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   mxf_timestamp_write (&self->package_creation_date, t->data);
   mxf_primer_pack_add_mapping (primer, 0x4405, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (PACKAGE_MODIFIED_DATE), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   mxf_timestamp_write (&self->package_modified_date, t->data);
   mxf_primer_pack_add_mapping (primer, 0x4404, &t->ul);
   ret = g_list_prepend (ret, t);
@@ -2012,11 +1989,10 @@
   if (self->tracks) {
     guint i;
 
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (TRACKS), 16);
     t->size = 8 + 16 * self->n_tracks;
-    t->data = g_slice_alloc0 (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc0 (t->size);
     GST_WRITE_UINT32_BE (t->data, self->n_tracks);
     GST_WRITE_UINT32_BE (t->data + 4, 16);
     for (i = 0; i < self->n_tracks; i++) {
@@ -2341,11 +2317,10 @@
   MXFLocalTag *t;
 
   if (self->descriptor) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (DESCRIPTOR), 16);
     t->size = 16;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     memcpy (t->data, &MXF_METADATA_BASE (self->descriptor)->instance_uid, 16);
     mxf_primer_pack_add_mapping (primer, 0x4701, &t->ul);
     ret = g_list_prepend (ret, t);
@@ -2526,37 +2501,34 @@
       primer);
   MXFLocalTag *t;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (TRACK_ID), 16);
   t->size = 4;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->track_id);
   mxf_primer_pack_add_mapping (primer, 0x4801, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (TRACK_NUMBER), 16);
   t->size = 4;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->track_number);
   mxf_primer_pack_add_mapping (primer, 0x4804, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->track_name) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (TRACK_NAME), 16);
     t->data = mxf_utf8_to_utf16 (self->track_name, &t->size);
     mxf_primer_pack_add_mapping (primer, 0x4802, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (SEQUENCE), 16);
   t->size = 16;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   memcpy (t->data, &MXF_METADATA_BASE (self->sequence)->instance_uid, 16);
   mxf_primer_pack_add_mapping (primer, 0x4803, &t->ul);
   ret = g_list_prepend (ret, t);
@@ -2590,19 +2562,20 @@
   const MXFMetadataTrackType type;
 } mxf_metadata_track_identifier = {
   {
-  MXF_UL (TRACK_TIMECODE_12M_INACTIVE),
-        MXF_METADATA_TRACK_TIMECODE_12M_INACTIVE}, {
-  MXF_UL (TRACK_TIMECODE_12M_ACTIVE), MXF_METADATA_TRACK_TIMECODE_12M_ACTIVE}, {
-  MXF_UL (TRACK_TIMECODE_309M), MXF_METADATA_TRACK_TIMECODE_309M}, {
-  MXF_UL (TRACK_METADATA), MXF_METADATA_TRACK_METADATA}, {
-  MXF_UL (TRACK_PICTURE_ESSENCE), MXF_METADATA_TRACK_PICTURE_ESSENCE}, {
-  MXF_UL (TRACK_SOUND_ESSENCE), MXF_METADATA_TRACK_SOUND_ESSENCE}, {
-  MXF_UL (TRACK_DATA_ESSENCE), MXF_METADATA_TRACK_DATA_ESSENCE}, {
-  MXF_UL (TRACK_AUXILIARY_DATA), MXF_METADATA_TRACK_AUXILIARY_DATA}, {
-  MXF_UL (TRACK_PARSED_TEXT), MXF_METADATA_TRACK_PARSED_TEXT},
-      /* Avid video? */
+        MXF_UL (TRACK_TIMECODE_12M_INACTIVE),
+      MXF_METADATA_TRACK_TIMECODE_12M_INACTIVE}, {
+        MXF_UL (TRACK_TIMECODE_12M_ACTIVE),
+      MXF_METADATA_TRACK_TIMECODE_12M_ACTIVE}, {
+      MXF_UL (TRACK_TIMECODE_309M), MXF_METADATA_TRACK_TIMECODE_309M}, {
+      MXF_UL (TRACK_METADATA), MXF_METADATA_TRACK_METADATA}, {
+      MXF_UL (TRACK_PICTURE_ESSENCE), MXF_METADATA_TRACK_PICTURE_ESSENCE}, {
+      MXF_UL (TRACK_SOUND_ESSENCE), MXF_METADATA_TRACK_SOUND_ESSENCE}, {
+      MXF_UL (TRACK_DATA_ESSENCE), MXF_METADATA_TRACK_DATA_ESSENCE}, {
+      MXF_UL (TRACK_AUXILIARY_DATA), MXF_METADATA_TRACK_AUXILIARY_DATA}, {
+      MXF_UL (TRACK_PARSED_TEXT), MXF_METADATA_TRACK_PARSED_TEXT},
+  /* Avid video? */
   {
-  MXF_UL (TRACK_AVID_PICTURE_ESSENCE), MXF_METADATA_TRACK_PICTURE_ESSENCE}
+      MXF_UL (TRACK_AVID_PICTURE_ESSENCE), MXF_METADATA_TRACK_PICTURE_ESSENCE}
 };
 
 MXFMetadataTrackType
@@ -2695,21 +2668,19 @@
       (mxf_metadata_timeline_track_parent_class)->write_tags (m, primer);
   MXFLocalTag *t;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (EDIT_RATE), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->edit_rate.n);
   GST_WRITE_UINT32_BE (t->data + 4, self->edit_rate.d);
   mxf_primer_pack_add_mapping (primer, 0x4b01, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (ORIGIN), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT64_BE (t->data, self->origin);
   mxf_primer_pack_add_mapping (primer, 0x4b02, &t->ul);
   ret = g_list_prepend (ret, t);
@@ -2802,21 +2773,19 @@
       (mxf_metadata_event_track_parent_class)->write_tags (m, primer);
   MXFLocalTag *t;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (EVENT_EDIT_RATE), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->event_edit_rate.n);
   GST_WRITE_UINT32_BE (t->data + 4, self->event_edit_rate.d);
   mxf_primer_pack_add_mapping (primer, 0x4901, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (EVENT_ORIGIN), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT64_BE (t->data, self->event_origin);
   mxf_primer_pack_add_mapping (primer, 0x4902, &t->ul);
   ret = g_list_prepend (ret, t);
@@ -2994,7 +2963,8 @@
   if (self->n_structural_components > 0) {
     GValue arr = { 0, }
     , val = {
-    0,};
+      0,
+    };
 
     g_value_init (&arr, GST_TYPE_ARRAY);
 
@@ -3032,31 +3002,28 @@
       (m, primer);
   MXFLocalTag *t;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (DATA_DEFINITION), 16);
   t->size = 16;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   memcpy (t->data, &self->data_definition, 16);
   mxf_primer_pack_add_mapping (primer, 0x0201, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (DURATION), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT64_BE (t->data, self->duration);
   mxf_primer_pack_add_mapping (primer, 0x0202, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->structural_components) {
     guint i;
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (STRUCTURAL_COMPONENTS), 16);
     t->size = 8 + 16 * self->n_structural_components;
-    t->data = g_slice_alloc0 (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc0 (t->size);
 
     GST_WRITE_UINT32_BE (t->data, self->n_structural_components);
     GST_WRITE_UINT32_BE (t->data + 4, 16);
@@ -3171,20 +3138,18 @@
       (mxf_metadata_structural_component_parent_class)->write_tags (m, primer);
   MXFLocalTag *t;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (DATA_DEFINITION), 16);
   t->size = 16;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   memcpy (t->data, &self->data_definition, 16);
   mxf_primer_pack_add_mapping (primer, 0x0201, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (DURATION), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT64_BE (t->data, self->duration);
   mxf_primer_pack_add_mapping (primer, 0x0202, &t->ul);
   ret = g_list_prepend (ret, t);
@@ -3287,29 +3252,26 @@
       (mxf_metadata_timecode_component_parent_class)->write_tags (m, primer);
   MXFLocalTag *t;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (ROUNDED_TIMECODE_BASE), 16);
   t->size = 2;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT16_BE (t->data, self->rounded_timecode_base);
   mxf_primer_pack_add_mapping (primer, 0x1502, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (START_TIMECODE), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT64_BE (t->data, self->start_timecode);
   mxf_primer_pack_add_mapping (primer, 0x1501, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (DROP_FRAME), 16);
   t->size = 1;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT8 (t->data, (self->drop_frame) ? 1 : 0);
   mxf_primer_pack_add_mapping (primer, 0x1503, &t->ul);
   ret = g_list_prepend (ret, t);
@@ -3463,29 +3425,26 @@
       (mxf_metadata_source_clip_parent_class)->write_tags (m, primer);
   MXFLocalTag *t;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (START_POSITION), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT64_BE (t->data, self->start_position);
   mxf_primer_pack_add_mapping (primer, 0x1201, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (SOURCE_PACKAGE_ID), 16);
   t->size = 32;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   memcpy (t->data, &self->source_package_id, 32);
   mxf_primer_pack_add_mapping (primer, 0x1101, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (SOURCE_TRACK_ID), 16);
   t->size = 4;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->source_track_id);
   mxf_primer_pack_add_mapping (primer, 0x1102, &t->ul);
   ret = g_list_prepend (ret, t);
@@ -3619,7 +3578,8 @@
   if (self->n_track_ids > 0) {
     GValue arr = { 0, }
     , val = {
-    0,};
+      0,
+    };
 
     g_value_init (&arr, GST_TYPE_ARRAY);
 
@@ -3653,11 +3613,10 @@
   if (self->track_ids) {
     guint i;
 
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (DM_SOURCECLIP_TRACK_IDS), 16);
     t->size = 8 + 4 * self->n_track_ids;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->n_track_ids);
     GST_WRITE_UINT32_BE (t->data + 4, 4);
     for (i = 0; i < self->n_track_ids; i++)
@@ -3850,7 +3809,8 @@
   if (self->n_track_ids > 0) {
     GValue arr = { 0, }
     , val = {
-    0,};
+      0,
+    };
 
     g_value_init (&arr, GST_TYPE_ARRAY);
 
@@ -3881,18 +3841,17 @@
   MXFLocalTag *t;
 
   if (self->event_start_position != -1) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (EVENT_START_POSITION), 16);
     t->size = 8;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT64_BE (t->data, self->event_start_position);
     mxf_primer_pack_add_mapping (primer, 0x0601, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->event_comment) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (EVENT_COMMENT), 16);
     t->data = mxf_utf8_to_utf16 (self->event_comment, &t->size);
     mxf_primer_pack_add_mapping (primer, 0x0602, &t->ul);
@@ -3902,11 +3861,10 @@
   if (self->track_ids) {
     guint i;
 
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (DM_SEGMENT_TRACK_IDS), 16);
     t->size = 8 + 4 * self->n_track_ids;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->n_track_ids);
     GST_WRITE_UINT32_BE (t->data + 4, 4);
     for (i = 0; i < self->n_track_ids; i++)
@@ -3916,11 +3874,10 @@
   }
 
   if (self->dm_framework) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (DM_FRAMEWORK), 16);
     t->size = 16;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     memcpy (t->data, &MXF_METADATA_BASE (self->dm_framework)->instance_uid, 16);
     mxf_primer_pack_add_mapping (primer, 0x6101, &t->ul);
     ret = g_list_prepend (ret, t);
@@ -3965,6 +3922,11 @@
   g_free (self->locators);
   self->locators = NULL;
 
+  g_free (self->sub_descriptors_uids);
+  self->sub_descriptors_uids = NULL;
+  g_free (self->sub_descriptors);
+  self->sub_descriptors = NULL;
+
   G_OBJECT_CLASS (mxf_metadata_generic_descriptor_parent_class)->finalize
       (object);
 }
@@ -3999,11 +3961,31 @@
 #endif
       break;
     default:
-      ret =
-          MXF_METADATA_BASE_CLASS
-          (mxf_metadata_generic_descriptor_parent_class)->handle_tag (metadata,
-          primer, tag, tag_data, tag_size);
+    {
+      MXFUL *tag_ul = mxf_primer_tag_to_ul (primer, tag);
+      if (tag_ul && mxf_ul_is_equal (tag_ul, MXF_UL (SUB_DESCRIPTORS_ARRAY))) {
+        if (!mxf_uuid_array_parse (&self->sub_descriptors_uids,
+                &self->n_sub_descriptors, tag_data, tag_size))
+          goto error;
+
+        GST_DEBUG ("  number of sub_descriptors = %u", self->n_sub_descriptors);
+#ifndef GST_DISABLE_GST_DEBUG
+        {
+          guint i;
+          for (i = 0; i < self->n_sub_descriptors; i++) {
+            GST_DEBUG ("  sub descriptor %u = %s", i,
+                mxf_uuid_to_string (&self->sub_descriptors_uidsi, str));
+          }
+        }
+#endif
+      } else {
+        ret =
+            MXF_METADATA_BASE_CLASS
+            (mxf_metadata_generic_descriptor_parent_class)->handle_tag
+            (metadata, primer, tag, tag_data, tag_size);
+      }
       break;
+    }
   }
 
   return ret;
@@ -4053,6 +4035,29 @@
     return FALSE;
   }
 
+  /* this memory reuse is done in the same way as for locators, but the reason
+   * isn't 100% clear. This might not be needed anymore */
+  if (self->sub_descriptors)
+    memset (self->sub_descriptors, 0,
+        sizeof (gpointer) * self->n_sub_descriptors);
+  else
+    self->sub_descriptors =
+        g_new0 (MXFMetadataGenericDescriptor *, self->n_sub_descriptors);
+  for (i = 0; i < self->n_sub_descriptors; i++) {
+    current = g_hash_table_lookup (metadata, &self->sub_descriptors_uidsi);
+    if (current && MXF_IS_METADATA_GENERIC_DESCRIPTOR (current)) {
+      if (mxf_metadata_base_resolve (current, metadata)) {
+        self->sub_descriptorsi = MXF_METADATA_GENERIC_DESCRIPTOR (current);
+      } else {
+        GST_WARNING ("Couldn't resolve sub_descriptor %s",
+            mxf_uuid_to_string (&self->sub_descriptors_uidsi, str));
+      }
+    } else {
+      GST_WARNING ("Sub_Descriptor %s not found",
+          mxf_uuid_to_string (&self->sub_descriptors_uidsi, str));
+    }
+  }
+
   return
       MXF_METADATA_BASE_CLASS
       (mxf_metadata_generic_descriptor_parent_class)->resolve (m, metadata);
@@ -4070,7 +4075,8 @@
   if (self->n_locators > 0) {
     GValue arr = { 0, }
     , val = {
-    0,};
+      0,
+    };
 
     g_value_init (&arr, GST_TYPE_ARRAY);
 
@@ -4112,11 +4118,10 @@
   if (self->locators) {
     guint i;
 
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (LOCATORS), 16);
     t->size = 8 + 16 * self->n_locators;
-    t->data = g_slice_alloc0 (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc0 (t->size);
     GST_WRITE_UINT32_BE (t->data, self->n_locators);
     GST_WRITE_UINT32_BE (t->data + 4, 16);
     for (i = 0; i < self->n_locators; i++) {
@@ -4262,52 +4267,47 @@
   MXFLocalTag *t;
 
   if (self->linked_track_id) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (LINKED_TRACK_ID), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->linked_track_id);
     mxf_primer_pack_add_mapping (primer, 0x3006, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (SAMPLE_RATE), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->sample_rate.n);
   GST_WRITE_UINT32_BE (t->data + 4, self->sample_rate.d);
   mxf_primer_pack_add_mapping (primer, 0x3001, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->container_duration > 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (CONTAINER_DURATION), 16);
     t->size = 8;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT64_BE (t->data, self->container_duration);
     mxf_primer_pack_add_mapping (primer, 0x3002, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (ESSENCE_CONTAINER), 16);
   t->size = 16;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   memcpy (t->data, &self->essence_container, 16);
   mxf_primer_pack_add_mapping (primer, 0x3004, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (!mxf_ul_is_zero (&self->codec)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (CODEC), 16);
     t->size = 16;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     memcpy (t->data, &self->codec, 16);
     mxf_primer_pack_add_mapping (primer, 0x3005, &t->ul);
     ret = g_list_prepend (ret, t);
@@ -4657,179 +4657,162 @@
   MXFLocalTag *t;
 
   if (self->signal_standard != 1) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (SIGNAL_STANDARD), 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->signal_standard);
     mxf_primer_pack_add_mapping (primer, 0x3215, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (FRAME_LAYOUT), 16);
   t->size = 1;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT8 (t->data, self->frame_layout);
   mxf_primer_pack_add_mapping (primer, 0x320c, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (STORED_WIDTH), 16);
   t->size = 4;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->stored_width);
   mxf_primer_pack_add_mapping (primer, 0x3203, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (STORED_HEIGHT), 16);
   t->size = 4;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->stored_height);
   mxf_primer_pack_add_mapping (primer, 0x3202, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->stored_f2_offset != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (STORED_F2_OFFSET), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->stored_f2_offset);
     mxf_primer_pack_add_mapping (primer, 0x3216, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->sampled_width != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (SAMPLED_WIDTH), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->sampled_width);
     mxf_primer_pack_add_mapping (primer, 0x3205, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->sampled_height != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (SAMPLED_HEIGHT), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->sampled_height);
     mxf_primer_pack_add_mapping (primer, 0x3204, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->sampled_x_offset != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (SAMPLED_X_OFFSET), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->sampled_x_offset);
     mxf_primer_pack_add_mapping (primer, 0x3206, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->sampled_y_offset != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (SAMPLED_Y_OFFSET), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->sampled_y_offset);
     mxf_primer_pack_add_mapping (primer, 0x3207, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->display_height != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (DISPLAY_HEIGHT), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->display_height);
     mxf_primer_pack_add_mapping (primer, 0x3208, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->display_width != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (DISPLAY_WIDTH), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->display_width);
     mxf_primer_pack_add_mapping (primer, 0x3209, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->display_x_offset != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (DISPLAY_X_OFFSET), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->display_x_offset);
     mxf_primer_pack_add_mapping (primer, 0x320a, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->display_y_offset != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (DISPLAY_Y_OFFSET), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->display_y_offset);
     mxf_primer_pack_add_mapping (primer, 0x320b, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->display_f2_offset != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (DISPLAY_F2_OFFSET), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->display_f2_offset);
     mxf_primer_pack_add_mapping (primer, 0x3217, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (ASPECT_RATIO), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->aspect_ratio.n);
   GST_WRITE_UINT32_BE (t->data + 4, self->aspect_ratio.d);
   mxf_primer_pack_add_mapping (primer, 0x320e, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->active_format_descriptor != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (ACTIVE_FORMAT_DESCRIPTOR), 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->active_format_descriptor);
     mxf_primer_pack_add_mapping (primer, 0x3218, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (VIDEO_LINE_MAP), 16);
   t->size = 16;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, 2);
   GST_WRITE_UINT32_BE (t->data + 4, 4);
   GST_WRITE_UINT32_BE (t->data + 8, self->video_line_map0);
@@ -4838,77 +4821,70 @@
   ret = g_list_prepend (ret, t);
 
   if (self->alpha_transparency != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (ALPHA_TRANSPARENCY), 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->alpha_transparency);
     mxf_primer_pack_add_mapping (primer, 0x320f, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (!mxf_ul_is_zero (&self->capture_gamma)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (CAPTURE_GAMMA), 16);
     t->size = 16;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     memcpy (t->data, &self->capture_gamma, 16);
     mxf_primer_pack_add_mapping (primer, 0x3210, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->image_alignment_offset != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (IMAGE_ALIGNMENT_OFFSET), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->image_alignment_offset);
     mxf_primer_pack_add_mapping (primer, 0x3211, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->image_start_offset != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (IMAGE_START_OFFSET), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->image_start_offset);
     mxf_primer_pack_add_mapping (primer, 0x3213, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->image_end_offset != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (IMAGE_END_OFFSET), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->image_end_offset);
     mxf_primer_pack_add_mapping (primer, 0x3214, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->field_dominance != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (FIELD_DOMINANCE), 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->field_dominance);
     mxf_primer_pack_add_mapping (primer, 0x3212, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (!mxf_ul_is_zero (&self->picture_essence_coding)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (PICTURE_ESSENCE_CODING), 16);
     t->size = 16;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     memcpy (t->data, &self->picture_essence_coding, 16);
     mxf_primer_pack_add_mapping (primer, 0x3201, &t->ul);
     ret = g_list_prepend (ret, t);
@@ -5225,82 +5201,74 @@
       (m, primer);
   MXFLocalTag *t;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (AUDIO_SAMPLING_RATE), 16);
   t->size = 8;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->audio_sampling_rate.n);
   GST_WRITE_UINT32_BE (t->data + 4, self->audio_sampling_rate.d);
   mxf_primer_pack_add_mapping (primer, 0x3d03, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (LOCKED), 16);
   t->size = 1;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT8 (t->data, (self->locked) ? 1 : 0);
   mxf_primer_pack_add_mapping (primer, 0x3d02, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->audio_ref_level) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (AUDIO_REF_LEVEL), 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->audio_ref_level);
     mxf_primer_pack_add_mapping (primer, 0x3d04, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->electro_spatial_formulation != 255) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (ELECTRO_SPATIAL_FORMULATION), 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->electro_spatial_formulation);
     mxf_primer_pack_add_mapping (primer, 0x3d05, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (CHANNEL_COUNT), 16);
   t->size = 4;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->channel_count);
   mxf_primer_pack_add_mapping (primer, 0x3d07, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (QUANTIZATION_BITS), 16);
   t->size = 4;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->quantization_bits);
   mxf_primer_pack_add_mapping (primer, 0x3d01, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->dial_norm != 0) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (DIAL_NORM), 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->dial_norm);
     mxf_primer_pack_add_mapping (primer, 0x3d0c, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (!mxf_ul_is_zero (&self->sound_essence_compression)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (SOUND_ESSENCE_COMPRESSION), 16);
     t->size = 16;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     memcpy (t->data, &self->sound_essence_compression, 16);
     mxf_primer_pack_add_mapping (primer, 0x3d06, &t->ul);
     ret = g_list_prepend (ret, t);
@@ -5576,107 +5544,97 @@
       (m, primer);
   MXFLocalTag *t;
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (COMPONENT_DEPTH), 16);
   t->size = 4;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->component_depth);
   mxf_primer_pack_add_mapping (primer, 0x3301, &t->ul);
   ret = g_list_prepend (ret, t);
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (HORIZONTAL_SUBSAMPLING), 16);
   t->size = 4;
-  t->data = g_slice_alloc (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc (t->size);
   GST_WRITE_UINT32_BE (t->data, self->horizontal_subsampling);
   mxf_primer_pack_add_mapping (primer, 0x3302, &t->ul);
   ret = g_list_prepend (ret, t);
 
   if (self->vertical_subsampling) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (VERTICAL_SUBSAMPLING), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->vertical_subsampling);
     mxf_primer_pack_add_mapping (primer, 0x3308, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->color_siting != 0xff) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (COLOR_SITING), 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->color_siting);
     mxf_primer_pack_add_mapping (primer, 0x3303, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->reversed_byte_order) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (REVERSED_BYTE_ORDER), 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, (self->reversed_byte_order) ? 1 : 0);
     mxf_primer_pack_add_mapping (primer, 0x330b, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->padding_bits) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (PADDING_BITS), 16);
     t->size = 2;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT16_BE (t->data, self->padding_bits);
     mxf_primer_pack_add_mapping (primer, 0x3307, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->alpha_sample_depth) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (ALPHA_SAMPLE_DEPTH), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->alpha_sample_depth);
     mxf_primer_pack_add_mapping (primer, 0x3309, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->black_ref_level) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (BLACK_REF_LEVEL), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->black_ref_level);
     mxf_primer_pack_add_mapping (primer, 0x3304, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->white_ref_level) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (WHITE_REF_LEVEL), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->white_ref_level);
     mxf_primer_pack_add_mapping (primer, 0x3305, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->color_range) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (COLOR_RANGE), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->color_range);
     mxf_primer_pack_add_mapping (primer, 0x3306, &t->ul);
     ret = g_list_prepend (ret, t);
@@ -5875,65 +5833,59 @@
   MXFLocalTag *t;
 
   if (self->component_max_ref != 255) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (COMPONENT_MAX_REF), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->component_max_ref);
     mxf_primer_pack_add_mapping (primer, 0x3406, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->component_min_ref) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (COMPONENT_MIN_REF), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->component_min_ref);
     mxf_primer_pack_add_mapping (primer, 0x3407, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->alpha_max_ref != 255) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (ALPHA_MAX_REF), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->alpha_max_ref);
     mxf_primer_pack_add_mapping (primer, 0x3408, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->alpha_min_ref) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (ALPHA_MIN_REF), 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->alpha_min_ref);
     mxf_primer_pack_add_mapping (primer, 0x3409, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->scanning_direction) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (SCANNING_DIRECTION), 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->scanning_direction);
     mxf_primer_pack_add_mapping (primer, 0x3405, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
-  t = g_slice_new0 (MXFLocalTag);
+  t = g_new0 (MXFLocalTag, 1);
   memcpy (&t->ul, MXF_UL (PIXEL_LAYOUT), 16);
   t->size = 16;
-  t->data = g_slice_alloc0 (t->size);
-  t->g_slice = TRUE;
+  t->data = g_malloc0 (t->size);
   if (self->pixel_layout)
     memcpy (t->data, self->pixel_layout, self->n_pixel_layout * 2);
   mxf_primer_pack_add_mapping (primer, 0x3401, &t->ul);
@@ -6046,11 +5998,10 @@
   MXFLocalTag *t;
 
   if (!mxf_ul_is_zero (&self->data_essence_coding)) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (DATA_ESSENCE_CODING), 16);
     t->size = 16;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     memcpy (t->data, &self->data_essence_coding, 16);
     mxf_primer_pack_add_mapping (primer, 0x3e01, &t->ul);
     ret = g_list_prepend (ret, t);
@@ -6199,7 +6150,8 @@
   if (self->n_sub_descriptors > 0) {
     GValue arr = { 0, }
     , val = {
-    0,};
+      0,
+    };
 
     g_value_init (&arr, GST_TYPE_ARRAY);
 
@@ -6241,11 +6193,10 @@
   if (self->sub_descriptors) {
     guint i;
 
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (SUB_DESCRIPTORS), 16);
     t->size = 8 + 16 * self->n_sub_descriptors;
-    t->data = g_slice_alloc0 (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc0 (t->size);
     GST_WRITE_UINT32_BE (t->data, self->n_sub_descriptors);
     GST_WRITE_UINT32_BE (t->data + 4, 16);
     for (i = 0; i < self->n_sub_descriptors; i++) {
@@ -6362,7 +6313,7 @@
   MXFLocalTag *t;
 
   if (self->locator_name) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (LOCATOR_NAME), 16);
     t->data = mxf_utf8_to_utf16 (self->locator_name, &t->size);
     mxf_primer_pack_add_mapping (primer, 0x4101, &t->ul);
@@ -6456,7 +6407,7 @@
   MXFLocalTag *t;
 
   if (self->url_string) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, MXF_UL (URL_STRING), 16);
     t->data = mxf_utf8_to_utf16 (self->url_string, &t->size);
     mxf_primer_pack_add_mapping (primer, 0x4001, &t->ul);

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfmetadata.h -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfmetadata.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfmpeg.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfmpeg.c Changed

@@ -141,9 +141,8 @@
   gboolean ret = TRUE;
   MXFUL *tag_ul = NULL;
 
-  if (!(tag_ul =
-          (MXFUL *) g_hash_table_lookup (primer->mappings,
-              GUINT_TO_POINTER (((guint) tag)))))
+  tag_ul = mxf_primer_tag_to_ul (primer, tag);
+  if (!tag_ul)
     return FALSE;
 
   if (memcmp (tag_ul, &_single_sequence_ul, 16) == 0) {
@@ -258,110 +257,100 @@
   MXFLocalTag *t;
 
   if (self->single_sequence != -1) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &_single_sequence_ul, 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, (self->single_sequence) ? 1 : 0);
     mxf_primer_pack_add_mapping (primer, 0, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->const_b_frames) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &_constant_b_frames_ul, 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, (self->const_b_frames) ? 1 : 0);
     mxf_primer_pack_add_mapping (primer, 0, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->coded_content_type) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &_coded_content_type_ul, 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->coded_content_type);
     mxf_primer_pack_add_mapping (primer, 0, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->low_delay) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &_low_delay_ul, 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, (self->low_delay) ? 1 : 0);
     mxf_primer_pack_add_mapping (primer, 0, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->closed_gop) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &_closed_gop_ul, 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, (self->closed_gop) ? 1 : 0);
     mxf_primer_pack_add_mapping (primer, 0, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->identical_gop) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &_identical_gop_ul, 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, (self->identical_gop) ? 1 : 0);
     mxf_primer_pack_add_mapping (primer, 0, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->max_gop) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &_identical_gop_ul, 16);
     t->size = 2;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT16_BE (t->data, self->max_gop);
     mxf_primer_pack_add_mapping (primer, 0, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->b_picture_count) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &_b_picture_count_ul, 16);
     t->size = 2;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT16_BE (t->data, self->b_picture_count);
     mxf_primer_pack_add_mapping (primer, 0, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->bitrate) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &_bitrate_ul, 16);
     t->size = 4;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT32_BE (t->data, self->bitrate);
     mxf_primer_pack_add_mapping (primer, 0, &t->ul);
     ret = g_list_prepend (ret, t);
   }
 
   if (self->profile_and_level) {
-    t = g_slice_new0 (MXFLocalTag);
+    t = g_new0 (MXFLocalTag, 1);
     memcpy (&t->ul, &_profile_and_level_ul, 16);
     t->size = 1;
-    t->data = g_slice_alloc (t->size);
-    t->g_slice = TRUE;
+    t->data = g_malloc (t->size);
     GST_WRITE_UINT8 (t->data, self->profile_and_level);
     mxf_primer_pack_add_mapping (primer, 0, &t->ul);
     ret = g_list_prepend (ret, t);
@@ -403,34 +392,16 @@
 } MXFMPEGEssenceType;
 
 static gboolean
-mxf_is_mpeg_essence_track (const MXFMetadataTimelineTrack * track)
+mxf_is_mpeg_essence_track (const MXFMetadataFileDescriptor * d)
 {
-  guint i;
-
-  g_return_val_if_fail (track != NULL, FALSE);
-
-  if (track->parent.descriptor == NULL)
-    return FALSE;
-
-  for (i = 0; i < track->parent.n_descriptor; i++) {
-    MXFMetadataFileDescriptor *d = track->parent.descriptori;
-    MXFUL *key;
-
-    if (!d)
-      continue;
-
-    key = &d->essence_container;
-    /* SMPTE 381M 7 */
-    /* SMPTE RP2008 8.1 */
-    if (mxf_is_generic_container_essence_container_label (key) &&
-        key->u12 == 0x02 &&
-        (key->u13 == 0x04 ||
-            key->u13 == 0x07 || key->u13 == 0x08 || key->u13 == 0x09 ||
-            key->u13 == 0x0f || key->u13 == 0x10))
-      return TRUE;
-  }
-
-  return FALSE;
+  const MXFUL *key = &d->essence_container;
+  /* SMPTE 381M 7 */
+  /* SMPTE RP2008 8.1 */
+  return (mxf_is_generic_container_essence_container_label (key) &&
+      key->u12 == 0x02 &&
+      (key->u13 == 0x04 ||
+          key->u13 == 0x07 || key->u13 == 0x08 || key->u13 == 0x09 ||
+          key->u13 == 0x0f || key->u13 == 0x10));
 }
 
 /* See ISO/IEC 13818-2 for MPEG ES format */
@@ -1315,7 +1286,7 @@
       ret->parent.parent.parent.essence_container.u13 = 0x04;
       ret->parent.parent.parent.essence_container.u14 = 0x60;
       if ((v = gst_structure_get_value (s, "codec_data"))) {
-        MXFLocalTag *t = g_slice_new0 (MXFLocalTag);
+        MXFLocalTag *t = g_new0 (MXFLocalTag, 1);
         GstMapInfo map;
 
         codec_data = gst_value_get_buffer (v);

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfprores.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfprores.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfquark.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfquark.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfquark.h -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfquark.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxftypes.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxftypes.c Changed

@@ -1452,7 +1452,7 @@
 static void
 _mxf_mapping_ul_free (MXFUL * ul)
 {
-  g_slice_free (MXFUL, ul);
+  g_free (ul);
 }
 
 gboolean
@@ -1502,7 +1502,7 @@
     if (g_hash_table_lookup (pack->mappings, GUINT_TO_POINTER (local_tag)))
       continue;
 
-    uid = g_slice_new (MXFUL);
+    uid = g_new (MXFUL, 1);
     memcpy (uid, data, 16);
     data += 16;
 
@@ -1575,13 +1575,13 @@
 
   g_assert (ltag_tmp != 0);
 
-  uid = g_slice_new (MXFUL);
+  uid = g_new (MXFUL, 1);
   memcpy (uid, ul, 16);
 
   GST_DEBUG ("Adding mapping = 0x%04x -> %s", ltag_tmp,
       mxf_ul_to_string (uid, str));
   g_hash_table_insert (primer->mappings, GUINT_TO_POINTER (ltag_tmp), uid);
-  uid = g_slice_dup (MXFUL, uid);
+  uid = g_memdup2 (uid, sizeof (MXFUL));
   g_hash_table_insert (primer->reverse_mappings, uid,
       GUINT_TO_POINTER (ltag_tmp));
 
@@ -1664,11 +1664,15 @@
 void
 mxf_local_tag_free (MXFLocalTag * tag)
 {
-  if (tag->g_slice)
-    g_slice_free1 (tag->size, tag->data);
-  else
-    g_free (tag->data);
-  g_slice_free (MXFLocalTag, tag);
+  g_free (tag->data);
+  g_free (tag);
+}
+
+MXFUL *
+mxf_primer_tag_to_ul (const MXFPrimerPack * primer, guint16 tag)
+{
+  return (MXFUL *) g_hash_table_lookup (primer->mappings,
+      GUINT_TO_POINTER (((guint) tag)));
 }
 
 gboolean
@@ -1692,8 +1696,7 @@
 
   g_return_val_if_fail (*hash_table != NULL, FALSE);
 
-  ul = (MXFUL *) g_hash_table_lookup (primer->mappings,
-      GUINT_TO_POINTER (((guint) tag)));
+  ul = mxf_primer_tag_to_ul (primer, tag);
 
   if (ul) {
 #ifndef GST_DISABLE_GST_DEBUG
@@ -1703,11 +1706,10 @@
     GST_DEBUG ("Adding local tag 0x%04x with UL %s and size %u", tag,
         mxf_ul_to_string (ul, str), tag_size);
 
-    local_tag = g_slice_new0 (MXFLocalTag);
+    local_tag = g_new0 (MXFLocalTag, 1);
     memcpy (&local_tag->ul, ul, sizeof (MXFUL));
     local_tag->size = tag_size;
     local_tag->data = tag_size == 0 ? NULL : g_memdup2 (tag_data, tag_size);
-    local_tag->g_slice = FALSE;
 
     g_hash_table_insert (*hash_table, &local_tag->ul, local_tag);
   } else {

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxftypes.h -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxftypes.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxful.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxful.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxful.h -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxful.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfup.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfup.c Changed

@@ -52,30 +52,30 @@
   const gchar *caps_string;
 } _rgba_mapping_table = {
   {
-    "RGB", 3, {
-  'R', 8, 'G', 8, 'B', 8}, GST_VIDEO_CAPS_MAKE ("RGB")}, {
-    "BGR", 3, {
-  'B', 8, 'G', 8, 'R', 8}, GST_VIDEO_CAPS_MAKE ("BGR")}, {
-    "v308", 3, {
-  'Y', 8, 'U', 8, 'V', 8}, GST_VIDEO_CAPS_MAKE ("v308")}, {
-    "xRGB", 4, {
-  'F', 8, 'R', 8, 'G', 8, 'B', 8}, GST_VIDEO_CAPS_MAKE ("xRGB")}, {
-    "RGBx", 4, {
-  'R', 8, 'G', 8, 'B', 8, 'F', 8}, GST_VIDEO_CAPS_MAKE ("RGBx")}, {
-    "xBGR", 4, {
-  'F', 8, 'B', 8, 'G', 8, 'R', 8}, GST_VIDEO_CAPS_MAKE ("xBGR")}, {
-    "BGRx", 4, {
-  'B', 8, 'G', 8, 'R', 8, 'F', 8}, GST_VIDEO_CAPS_MAKE ("BGRx")}, {
-    "RGBA", 4, {
-  'R', 8, 'G', 8, 'B', 8, 'A', 8}, GST_VIDEO_CAPS_MAKE ("RGBA")}, {
-    "ARGB", 4, {
-  'A', 8, 'R', 8, 'G', 8, 'B', 8}, GST_VIDEO_CAPS_MAKE ("RGBA")}, {
-    "BGRA", 4, {
-  'B', 8, 'G', 8, 'R', 8, 'A', 8}, GST_VIDEO_CAPS_MAKE ("BGRA")}, {
-    "ABGR", 4, {
-  'A', 8, 'B', 8, 'G', 8, 'R', 8}, GST_VIDEO_CAPS_MAKE ("ABGR")}, {
-    "AYUV", 4, {
-  'A', 8, 'Y', 8, 'U', 8, 'V', 8}, GST_VIDEO_CAPS_MAKE ("AYUV")}
+        "RGB", 3, {
+          'R', 8, 'G', 8, 'B', 8}, GST_VIDEO_CAPS_MAKE ("RGB")}, {
+        "BGR", 3, {
+          'B', 8, 'G', 8, 'R', 8}, GST_VIDEO_CAPS_MAKE ("BGR")}, {
+        "v308", 3, {
+          'Y', 8, 'U', 8, 'V', 8}, GST_VIDEO_CAPS_MAKE ("v308")}, {
+        "xRGB", 4, {
+          'F', 8, 'R', 8, 'G', 8, 'B', 8}, GST_VIDEO_CAPS_MAKE ("xRGB")}, {
+        "RGBx", 4, {
+          'R', 8, 'G', 8, 'B', 8, 'F', 8}, GST_VIDEO_CAPS_MAKE ("RGBx")}, {
+        "xBGR", 4, {
+          'F', 8, 'B', 8, 'G', 8, 'R', 8}, GST_VIDEO_CAPS_MAKE ("xBGR")}, {
+        "BGRx", 4, {
+          'B', 8, 'G', 8, 'R', 8, 'F', 8}, GST_VIDEO_CAPS_MAKE ("BGRx")}, {
+        "RGBA", 4, {
+          'R', 8, 'G', 8, 'B', 8, 'A', 8}, GST_VIDEO_CAPS_MAKE ("RGBA")}, {
+        "ARGB", 4, {
+          'A', 8, 'R', 8, 'G', 8, 'B', 8}, GST_VIDEO_CAPS_MAKE ("RGBA")}, {
+        "BGRA", 4, {
+          'B', 8, 'G', 8, 'R', 8, 'A', 8}, GST_VIDEO_CAPS_MAKE ("BGRA")}, {
+        "ABGR", 4, {
+          'A', 8, 'B', 8, 'G', 8, 'R', 8}, GST_VIDEO_CAPS_MAKE ("ABGR")}, {
+        "AYUV", 4, {
+          'A', 8, 'Y', 8, 'U', 8, 'V', 8}, GST_VIDEO_CAPS_MAKE ("AYUV")}
 };
 
 static const struct
@@ -88,8 +88,9 @@
   const gchar *caps_string;
 } _cdci_mapping_table = {
   {
-  "YUY2", 2, 1, 0, TRUE, GST_VIDEO_CAPS_MAKE ("YUY2")}, {
-"UYVY", 2, 1, 0, FALSE, GST_VIDEO_CAPS_MAKE ("UYVY")},};
+      "YUY2", 2, 1, 0, TRUE, GST_VIDEO_CAPS_MAKE ("YUY2")}, {
+      "UYVY", 2, 1, 0, FALSE, GST_VIDEO_CAPS_MAKE ("UYVY")},
+};
 
 typedef struct
 {
@@ -101,30 +102,13 @@
 } MXFUPMappingData;
 
 static gboolean
-mxf_is_up_essence_track (const MXFMetadataTimelineTrack * track)
+mxf_is_up_essence_track (const MXFMetadataFileDescriptor * d)
 {
-  guint i;
-
-  g_return_val_if_fail (track != NULL, FALSE);
-
-  if (track->parent.descriptor == NULL)
-    return FALSE;
-
-  for (i = 0; i < track->parent.n_descriptor; i++) {
-    MXFMetadataFileDescriptor *d = track->parent.descriptori;
-    MXFUL *key;
-
-    if (!d)
-      continue;
-
-    key = &d->essence_container;
-    /* SMPTE 384M 8 */
-    if (mxf_is_generic_container_essence_container_label (key) &&
-        key->u12 == 0x02 && key->u13 == 0x05 && key->u15 <= 0x03)
-      return TRUE;
-  }
+  const MXFUL *key = &d->essence_container;
 
-  return FALSE;
+  /* SMPTE 384M 8 */
+  return (mxf_is_generic_container_essence_container_label (key) &&
+      key->u12 == 0x02 && key->u13 == 0x05 && key->u15 <= 0x03);
 }
 
 static GstFlowReturn

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfvanc.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfvanc.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/mxf/mxfvc3.c -> gst-plugins-bad-1.24.5.tar.xz/gst/mxf/mxfvc3.c Changed

@@ -42,39 +42,27 @@
 };
 
 static gboolean
-mxf_is_vc3_essence_track (const MXFMetadataTimelineTrack * track)
+mxf_is_vc3_essence_track (const MXFMetadataFileDescriptor * d)
 {
-  guint i;
-
-  g_return_val_if_fail (track != NULL, FALSE);
+  const MXFUL *key = &d->essence_container;
 
-  if (track->parent.descriptor == NULL)
-    return FALSE;
+  /* SMPTE S2019-4 7 */
+  if (mxf_is_generic_container_essence_container_label (key) &&
+      key->u12 == 0x02 && key->u13 == 0x11 &&
+      (key->u14 == 0x01 || key->u14 == 0x02)) {
+    return TRUE;
+  }
 
-  for (i = 0; i < track->parent.n_descriptor; i++) {
-    MXFMetadataFileDescriptor *d = track->parent.descriptori;
-    MXFUL *key;
+  if (mxf_is_avid_essence_container_label (key)) {
+    MXFMetadataGenericPictureEssenceDescriptor *p;
 
-    if (!d)
-      continue;
+    if (!MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (d))
+      return FALSE;
+    p = MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (d);
 
-    key = &d->essence_container;
-    /* SMPTE S2019-4 7 */
-    if (mxf_is_generic_container_essence_container_label (key) &&
-        key->u12 == 0x02 && key->u13 == 0x11 &&
-        (key->u14 == 0x01 || key->u14 == 0x02)) {
+    key = &p->picture_essence_coding;
+    if (mxf_ul_is_subclass (&picture_essence_coding_vc3_avid, key))
       return TRUE;
-    } else if (mxf_is_avid_essence_container_label (key)) {
-      MXFMetadataGenericPictureEssenceDescriptor *p;
-
-      if (!MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (d))
-        return FALSE;
-      p = MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (d);
-
-      key = &p->picture_essence_coding;
-      if (mxf_ul_is_subclass (&picture_essence_coding_vc3_avid, key))
-        return TRUE;
-    }
   }
 
   return FALSE;

gst-plugins-bad-1.22.7.tar.xz/gst/netsim/gstnetsim.c -> gst-plugins-bad-1.24.5.tar.xz/gst/netsim/gstnetsim.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/onvif/gstrtponviftimestamp.c -> gst-plugins-bad-1.24.5.tar.xz/gst/onvif/gstrtponviftimestamp.c Changed

@@ -538,11 +538,15 @@
   guint64 time = GST_CLOCK_TIME_NONE;
 
   if (GST_BUFFER_PTS_IS_VALID (buf)) {
-    time = gst_segment_to_stream_time (&self->segment, GST_FORMAT_TIME,
-        GST_BUFFER_PTS (buf));
+    if (gst_segment_to_stream_time_full (&self->segment, GST_FORMAT_TIME,
+            GST_BUFFER_PTS (buf), &time) < 0) {
+      time = GST_CLOCK_TIME_NONE;
+    }
   } else if (GST_BUFFER_DTS_IS_VALID (buf)) {
-    time = gst_segment_to_stream_time (&self->segment, GST_FORMAT_TIME,
-        GST_BUFFER_DTS (buf));
+    if (gst_segment_to_stream_time_full (&self->segment, GST_FORMAT_TIME,
+            GST_BUFFER_DTS (buf), &time) < 0) {
+      time = GST_CLOCK_TIME_NONE;
+    }
   } else {
     g_assert_not_reached ();
   }
@@ -556,7 +560,7 @@
 }
 
 static gboolean
-handle_buffer (GstRtpOnvifTimestamp * self, GstBuffer * buf)
+handle_buffer (GstRtpOnvifTimestamp * self, GstBuffer * buf, gboolean last)
 {
   GstRTPBuffer rtp = GST_RTP_BUFFER_INIT;
   guint8 *data;
@@ -632,27 +636,24 @@
     }
   } else if (GST_BUFFER_PTS_IS_VALID (buf) || GST_BUFFER_DTS_IS_VALID (buf)) {
     time = get_utc_from_offset (self, buf);
-    if (self->prop_drop_out_of_segment && time == GST_CLOCK_TIME_NONE) {
-      GST_ERROR_OBJECT (self, "Failed to get stream time");
-      gst_rtp_buffer_unmap (&rtp);
-      return FALSE;
-    }
   } else {
     GST_INFO_OBJECT (self,
         "Buffer doesn't contain any valid DTS or PTS timestamp");
     goto done;
   }
 
-  if (time == GST_CLOCK_TIME_NONE) {
-    GST_ERROR_OBJECT (self, "failed calculating timestamp");
+  if (self->prop_drop_out_of_segment && !GST_CLOCK_TIME_IS_VALID (time)) {
+    GST_ERROR_OBJECT (self, "Failed to get stream time");
     gst_rtp_buffer_unmap (&rtp);
     return FALSE;
   }
 
   /* convert to NTP time. upper 32 bits should contain the seconds
    * and the lower 32 bits, the fractions of a second. */
-  time = gst_util_uint64_scale (time, (G_GINT64_CONSTANT (1) << 32),
-      GST_SECOND);
+  if (GST_CLOCK_TIME_IS_VALID (time)) {
+    time = gst_util_uint64_scale (time, (G_GINT64_CONSTANT (1) << 32),
+        GST_SECOND);
+  }
 
   GST_DEBUG_OBJECT (self, "timestamp: %" G_GUINT64_FORMAT, time);
 
@@ -668,7 +669,7 @@
   }
 
   /* Set E if this the last buffer of a contiguous section of recording */
-  if (self->set_e_bit) {
+  if (last && self->set_e_bit) {
     GST_DEBUG_OBJECT (self, "set E flag");
     field |= (1 << 6);
     self->set_e_bit = FALSE;
@@ -682,7 +683,7 @@
   }
 
   /* Set T if we have received EOS */
-  if (self->set_t_bit) {
+  if (last && self->set_t_bit) {
     GST_DEBUG_OBJECT (self, "set T flag");
     field |= (1 << 4);
     self->set_t_bit = FALSE;
@@ -704,7 +705,7 @@
 static GstFlowReturn
 handle_and_push_buffer (GstRtpOnvifTimestamp * self, GstBuffer * buf)
 {
-  if (!handle_buffer (self, buf)) {
+  if (!handle_buffer (self, buf, TRUE)) {
     gst_buffer_unref (buf);
     return GST_FLOW_ERROR;
   }
@@ -735,13 +736,15 @@
 static gboolean
 do_handle_buffer (GstBuffer ** buffer, guint idx, GstRtpOnvifTimestamp * self)
 {
-  return handle_buffer (self, *buffer);
+  return handle_buffer (self, *buffer, idx + 1 == self->current_list_size);
 }
 
 /* @buf: (transfer full) */
 static GstFlowReturn
 handle_and_push_buffer_list (GstRtpOnvifTimestamp * self, GstBufferList * list)
 {
+  self->current_list_size = gst_buffer_list_length (list);
+
   if (!gst_buffer_list_foreach (list, (GstBufferListFunc) do_handle_buffer,
           self)) {
     gst_buffer_list_unref (list);

gst-plugins-bad-1.22.7.tar.xz/gst/onvif/gstrtponviftimestamp.h -> gst-plugins-bad-1.24.5.tar.xz/gst/onvif/gstrtponviftimestamp.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/pcapparse/gstpcapparse.c -> gst-plugins-bad-1.24.5.tar.xz/gst/pcapparse/gstpcapparse.c Changed

@@ -351,6 +351,7 @@
 #define ETH_HEADER_LEN    14
 #define ETH_VLAN_HEADER_LEN    4
 #define SLL_HEADER_LEN    16
+#define SLL2_HEADER_LEN    20
 #define IP_HEADER_MIN_LEN 20
 #define UDP_HEADER_LEN     8
 
@@ -404,6 +405,13 @@
       eth_type = GUINT16_FROM_BE (*((guint16 *) (buf + 14)));
       buf_ip = buf + SLL_HEADER_LEN;
       break;
+    case LINKTYPE_SLL2:
+      if (buf_size < SLL2_HEADER_LEN + IP_HEADER_MIN_LEN + UDP_HEADER_LEN)
+        return FALSE;
+
+      eth_type = GUINT16_FROM_BE (*((guint16 *) (buf)));
+      buf_ip = buf + SLL2_HEADER_LEN;
+      break;
     case LINKTYPE_RAW:
       if (buf_size < IP_HEADER_MIN_LEN + UDP_HEADER_LEN)
         return FALSE;
@@ -448,8 +456,8 @@
     return FALSE;
 
   /* ip info */
-  ip_src_addr = *((guint32 *) (buf_ip + 12));
-  ip_dst_addr = *((guint32 *) (buf_ip + 16));
+  memcpy (&ip_src_addr, buf_ip + 12, sizeof (ip_src_addr));
+  memcpy (&ip_dst_addr, buf_ip + 16, sizeof (ip_dst_addr));
   buf_proto = buf_ip + ip_header_size;
   ip_packet_len = GUINT16_FROM_BE (*(guint16 *) (buf_ip + 2));
 
@@ -641,9 +649,9 @@
       }
 
       if (linktype != LINKTYPE_ETHER && linktype != LINKTYPE_SLL &&
-          linktype != LINKTYPE_RAW) {
+          linktype != LINKTYPE_RAW && linktype != LINKTYPE_SLL2) {
         GST_ELEMENT_ERROR (self, STREAM, WRONG_TYPE, (NULL),
-            ("Only dumps of type Ethernet, raw IP or Linux Cooked (SLL) "
+            ("Only dumps of type Ethernet, raw IP or Linux Cooked (SLL/SLL2) "
                 "understood; type %d unknown", linktype));
         ret = GST_FLOW_ERROR;
         goto out;

gst-plugins-bad-1.22.7.tar.xz/gst/pcapparse/gstpcapparse.h -> gst-plugins-bad-1.24.5.tar.xz/gst/pcapparse/gstpcapparse.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/removesilence/gstremovesilence.c -> gst-plugins-bad-1.24.5.tar.xz/gst/removesilence/gstremovesilence.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/removesilence/vad_private.c -> gst-plugins-bad-1.24.5.tar.xz/gst/removesilence/vad_private.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/rist/gstristrtxsend.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rist/gstristrtxsend.c Changed

@@ -136,7 +136,7 @@
 buffer_queue_item_free (BufferQueueItem * item)
 {
   gst_buffer_unref (item->buffer);
-  g_slice_free (BufferQueueItem, item);
+  g_free (item);
 }
 
 typedef struct
@@ -157,7 +157,7 @@
 static SSRCRtxData *
 ssrc_rtx_data_new (guint32 rtx_ssrc)
 {
-  SSRCRtxData *data = g_slice_new0 (SSRCRtxData);
+  SSRCRtxData *data = g_new0 (SSRCRtxData, 1);
 
   data->rtx_ssrc = rtx_ssrc;
   data->next_seqnum = data->seqnum_base = g_random_int_range (0, G_MAXUINT16);
@@ -171,7 +171,7 @@
 ssrc_rtx_data_free (SSRCRtxData * data)
 {
   g_sequence_free (data->queue);
-  g_slice_free (SSRCRtxData, data);
+  g_free (data);
 }
 
 static void
@@ -305,7 +305,7 @@
   GstDataQueueItem *data = item;
   if (data->object)
     gst_mini_object_unref (data->object);
-  g_slice_free (GstDataQueueItem, data);
+  g_free (data);
 }
 
 static gboolean
@@ -314,7 +314,7 @@
   GstDataQueueItem *data;
   gboolean success;
 
-  data = g_slice_new0 (GstDataQueueItem);
+  data = g_new0 (GstDataQueueItem, 1);
   data->object = GST_MINI_OBJECT (object);
   data->size = 1;
   data->duration = 1;
@@ -616,7 +616,7 @@
     extseqnum = gst_rist_rtp_ext_seq (&data->max_extseqnum, seqnum);
 
   /* add current rtp buffer to queue history */
-  item = g_slice_new0 (BufferQueueItem);
+  item = g_new0 (BufferQueueItem, 1);
   item->extseqnum = extseqnum;
   item->timestamp = rtptime;
   item->buffer = gst_buffer_ref (buffer);

gst-plugins-bad-1.22.7.tar.xz/gst/rist/gstristsink.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rist/gstristsink.c Changed

@@ -196,7 +196,7 @@
 static RistSenderBond *
 gst_rist_sink_add_bond (GstRistSink * sink)
 {
-  RistSenderBond *bond = g_slice_new0 (RistSenderBond);
+  RistSenderBond *bond = g_new0 (RistSenderBond, 1);
   GstPad *pad, *gpad;
   gchar name32;
 
@@ -206,7 +206,7 @@
   g_snprintf (name, 32, "rist_rtp_udpsink%u", bond->session);
   bond->rtp_sink = gst_element_factory_make ("udpsink", name);
   if (!bond->rtp_sink) {
-    g_slice_free (RistSenderBond, bond);
+    g_free (bond);
     sink->missing_plugin = "udp";
     return NULL;
   }
@@ -231,7 +231,7 @@
   bond->rtx_send = gst_element_factory_make ("ristrtxsend", name);
   if (!bond->rtx_send) {
     sink->missing_plugin = "rtpmanager";
-    g_slice_free (RistSenderBond, bond);
+    g_free (bond);
     return NULL;
   }
   gst_bin_add (GST_BIN (sink->rtxbin), bond->rtx_send);
@@ -1314,7 +1314,7 @@
     RistSenderBond *bond = g_ptr_array_index (sink->bonds, i);
     g_free (bond->address);
     g_free (bond->multicast_iface);
-    g_slice_free (RistSenderBond, bond);
+    g_free (bond);
   }
   g_ptr_array_free (sink->bonds, TRUE);

gst-plugins-bad-1.22.7.tar.xz/gst/rist/gstristsrc.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rist/gstristsrc.c Changed

@@ -41,6 +41,22 @@
  * gst-play-1.0 "rist://0.0.0.0:5004?receiver-buffer=700"
  * |
  *
+ * In order to use a dynamic payload type the element needs to be able
+ * to set the correct caps. It can be done through setting the #GstRistSrc:caps
+ * property or one can use the #GstRistSrc:encoding-name property and the
+ * element can work out the caps from it.
+ *
+ * ## Example pipelines for sending and receiving dynamic payload
+ * |
+ * gst-launch-1.0 videotestsrc ! videoconvert ! x264enc ! h264parse ! \
+ *     rtph264pay ! ristsink address=127.0.0.1 port=5000
+ * | Encode and payload H264 video from videotestsrc. The H264 RTP packets are
+ * sent on port 5000.
+ * |
+ * gst-launch-1.0 ristsrc address=0.0.0.0 port=5000 encoding-name="h264" ! \
+ *     rtph264depay ! h264parse ! matroskamux ! filesink location=h264.mkv
+ *  Receive and depayload the H264 video via RIST.
+ *
  * Additionally, this element supports link bonding, which means it
  * can receive the same stream from multiple addresses. Each address
  * will be mapped to its own RTP session. In order to enable bonding
@@ -92,7 +108,9 @@
   PROP_MULTICAST_LOOPBACK,
   PROP_MULTICAST_IFACE,
   PROP_MULTICAST_TTL,
-  PROP_BONDING_ADDRESSES
+  PROP_BONDING_ADDRESSES,
+  PROP_CAPS,
+  PROP_ENCODING_NAME
 };
 
 static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
@@ -156,6 +174,10 @@
    * to fail state changes later */
   gboolean construct_failed;
   const gchar *missing_plugin;
+
+  /* For handling dynamic payload */
+  GstCaps *caps;
+  gchar *encoding_name;
 };
 
 static void gst_rist_src_uri_init (gpointer g_iface, gpointer iface_data);
@@ -170,7 +192,7 @@
 static RistReceiverBond *
 gst_rist_src_add_bond (GstRistSrc * src)
 {
-  RistReceiverBond *bond = g_slice_new0 (RistReceiverBond);
+  RistReceiverBond *bond = g_new0 (RistReceiverBond, 1);
   GstPad *pad, *gpad;
   gchar name32;
 
@@ -200,7 +222,7 @@
     g_clear_object (&bond->rtp_src);
     g_clear_object (&bond->rtcp_src);
     g_clear_object (&bond->rtcp_sink);
-    g_slice_free (RistReceiverBond, bond);
+    g_free (bond);
     src->missing_plugin = "udp";
     return NULL;
   }
@@ -236,22 +258,52 @@
 gst_rist_src_request_pt_map (GstRistSrc * src, guint session_id, guint pt,
     GstElement * rtpbin)
 {
-  const GstRTPPayloadInfo *pt_info;
+  const GstRTPPayloadInfo *pt_info = NULL;
   GstCaps *ret;
 
-  pt_info = gst_rtp_payload_info_for_pt (pt);
-  if (!pt_info || !pt_info->clock_rate)
-    return NULL;
+  GST_DEBUG_OBJECT (src,
+      "Requesting caps for session-id 0x%x and pt %u.", session_id, pt);
 
-  ret = gst_caps_new_simple ("application/x-rtp",
-      "media", G_TYPE_STRING, pt_info->media,
-      "encoding_name", G_TYPE_STRING, pt_info->encoding_name,
-      "clock-rate", G_TYPE_INT, (gint) pt_info->clock_rate, NULL);
+  if (G_UNLIKELY (src->caps)) {
+    GST_DEBUG_OBJECT (src,
+        "Full caps were set, no need for lookup %" GST_PTR_FORMAT, src->caps);
+    return gst_caps_copy (src->caps);
+  }
 
-  /* FIXME add sprop-parameter-set if any */
-  g_warn_if_fail (pt_info->encoding_parameters == NULL);
+  if (src->encoding_name != NULL) {
+    /* Unfortunately, the media needs to be passed in the function. Since
+     * it is not known, try for video if video not found. */
+    pt_info = gst_rtp_payload_info_for_name ("video", src->encoding_name);
+    if (pt_info == NULL)
+      pt_info = gst_rtp_payload_info_for_name ("audio", src->encoding_name);
 
-  return ret;
+  }
+
+  /* If we have not found any info from encoding-name we will try with a
+   * static one. We need to check that is not a dynamic, since some encoders
+   * do not use dynamic values. */
+  if (pt_info == NULL) {
+    if (!GST_RTP_PAYLOAD_IS_DYNAMIC (pt))
+      pt_info = gst_rtp_payload_info_for_pt (pt);
+  }
+
+  if (pt_info != NULL) {
+    ret = gst_caps_new_simple ("application/x-rtp",
+        "media", G_TYPE_STRING, pt_info->media,
+        "encoding-name", G_TYPE_STRING, pt_info->encoding_name,
+        "clock-rate", G_TYPE_INT, (gint) pt_info->clock_rate, NULL);
+
+    GST_DEBUG_OBJECT (src, "Decided on caps %" GST_PTR_FORMAT, ret);
+
+    /* FIXME add sprop-parameter-set if any */
+    g_warn_if_fail (pt_info->encoding_parameters == NULL);
+
+    return ret;
+  }
+
+  GST_DEBUG_OBJECT (src,
+      "Could not determine caps based on pt or encoding name.");
+  return NULL;
 }
 
 static GstElement *
@@ -407,6 +459,9 @@
   g_mutex_init (&src->bonds_lock);
   src->bonds = g_ptr_array_new ();
 
+  src->encoding_name = NULL;
+  src->caps = NULL;
+
   /* Construct the RIST RTP receiver pipeline.
    *
    * udpsrc -> recv_rtp_sink_%u  --------  recv_rtp_src_%u_%u_%u
@@ -1118,6 +1173,14 @@
       g_value_take_string (value, gst_rist_src_get_bonds (src));
       break;
 
+    case PROP_CAPS:
+      gst_value_set_caps (value, src->caps);
+      break;
+
+    case PROP_ENCODING_NAME:
+      g_value_set_string (value, src->encoding_name);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1218,6 +1281,31 @@
       gst_rist_src_set_bonds (src, g_value_get_string (value));
       break;
 
+    case PROP_CAPS:
+    {
+      const GstCaps *new_caps_val = gst_value_get_caps (value);
+      GstCaps *new_caps = NULL;
+
+      if (new_caps_val != NULL)
+        new_caps = gst_caps_copy (new_caps_val);
+
+      gst_caps_replace (&src->caps, new_caps);
+
+      break;
+    }
+
+    case PROP_ENCODING_NAME:
+    {
+      g_free (src->encoding_name);
+      src->encoding_name = g_value_dup_string (value);
+      if (bond->rtp_src) {
+        GstCaps *caps = gst_rist_src_request_pt_map (src, 0, 96, NULL);
+        g_object_set (G_OBJECT (bond->rtp_src), "caps", caps, NULL);
+        gst_caps_unref (caps);
+      }
+      break;
+    }
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1239,13 +1327,16 @@
     g_free (bond->address);
     g_free (bond->multicast_iface);
     g_clear_object (&bond->rtcp_send_addr);
-    g_slice_free (RistReceiverBond, bond);
+    g_free (bond);
   }
   g_ptr_array_free (src->bonds, TRUE);
 
   g_clear_object (&src->jitterbuffer);
   g_clear_object (&src->rtxbin);
 
+  gst_clear_caps (&src->caps);
+  g_free (src->encoding_name);
+
   g_mutex_unlock (&src->bonds_lock);
   g_mutex_clear (&src->bonds_lock);
 
@@ -1350,6 +1441,31 @@
           "Comma (,) separated list of <address>:<port> to receive from. "
           "Only used if 'enable-bonding' is set.", NULL,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+/**
+ * GstRistSrc:encoding-name:
+ *
+ * Set the encoding name of the stream to use. This is a short-hand for
+ * the full caps and maps typically to the encoding-name in the RTP caps.
+ *
+ * Since: 1.24
+ */
+  g_object_class_install_property (object_class, PROP_ENCODING_NAME,
+      g_param_spec_string ("encoding-name", "Caps encoding name",
+          "Encoding name use to determine caps parameters",
+          NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+/**
+ * GstRistSrc:caps:
+ *
+ * The RTP caps of the incoming RIST stream.
+ *
+ * Since: 1.24
+ */
+  g_object_class_install_property (object_class, PROP_CAPS,
+      g_param_spec_boxed ("caps", "Caps",
+          "The caps of the incoming stream", GST_TYPE_CAPS,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 static GstURIType

gst-plugins-bad-1.22.7.tar.xz/gst/rtmp2/TODO -> gst-plugins-bad-1.24.5.tar.xz/gst/rtmp2/TODO Changed

gst-plugins-bad-1.22.7.tar.xz/gst/rtmp2/gstrtmp2locationhandler.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rtmp2/gstrtmp2locationhandler.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/rtmp2/gstrtmp2src.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rtmp2/gstrtmp2src.c Changed

@@ -62,6 +62,7 @@
   gboolean async_connect;
   GstStructure *stats;
   guint idle_timeout;
+  gboolean no_eof_is_error;
 
   /* If both self->lock and OBJECT_LOCK are needed,
    * self->lock must be taken first */
@@ -71,6 +72,8 @@
   gboolean running, flushing;
   gboolean timeout;
   gboolean started;
+  /* TRUE if there was an error with the connection to the RTMP server */
+  gboolean connection_error;
 
   GstTask *task;
   GRecMutex task_lock;
@@ -139,6 +142,7 @@
   PROP_ASYNC_CONNECT,
   PROP_STATS,
   PROP_IDLE_TIMEOUT,
+  PROP_NO_EOF_IS_ERROR,
 };
 
 #define DEFAULT_IDLE_TIMEOUT 0
@@ -218,6 +222,21 @@
           0, G_MAXUINT, DEFAULT_IDLE_TIMEOUT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstRtmp2Src:no-eof-is-error:
+   *
+   * If set, an error is raised if the connection is closed without receiving an EOF RTMP message first.
+   " If not set, those are reported using EOS.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_NO_EOF_IS_ERROR,
+      g_param_spec_boolean ("no-eof-is-error",
+          "No EOF is error",
+          "If set, an error is raised if the connection is closed without receiving an EOF RTMP message first. "
+          "If not set, those are reported using EOS", FALSE,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
   GST_DEBUG_CATEGORY_INIT (gst_rtmp2_src_debug_category, "rtmp2src", 0,
       "debug category for rtmp2src element");
 }
@@ -330,6 +349,11 @@
       self->idle_timeout = g_value_get_uint (value);
       GST_OBJECT_UNLOCK (self);
       break;
+    case PROP_NO_EOF_IS_ERROR:
+      GST_OBJECT_LOCK (self);
+      self->no_eof_is_error = g_value_get_boolean (value);
+      GST_OBJECT_UNLOCK (self);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -422,6 +446,11 @@
       g_value_set_uint (value, self->idle_timeout);
       GST_OBJECT_UNLOCK (self);
       break;
+    case PROP_NO_EOF_IS_ERROR:
+      GST_OBJECT_LOCK (self);
+      g_value_set_boolean (value, self->no_eof_is_error);
+      GST_OBJECT_UNLOCK (self);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -471,6 +500,7 @@
   self->last_ts = GST_CLOCK_TIME_NONE;
   self->timeout = FALSE;
   self->started = FALSE;
+  self->connection_error = FALSE;
 
   if (async) {
     gst_task_start (self->task);
@@ -607,7 +637,15 @@
 
   while (!self->message) {
     if (!self->running) {
-      ret = GST_FLOW_EOS;
+      if (self->no_eof_is_error && self->connection_error) {
+        GST_DEBUG_OBJECT (self,
+            "stopped because of connection error, return ERROR");
+        ret = GST_FLOW_ERROR;
+      } else {
+        GST_DEBUG_OBJECT (self, "stopped, return EOS");
+        ret = GST_FLOW_EOS;
+      }
+
       goto out;
     }
     if (self->flushing) {
@@ -926,6 +964,7 @@
   } else if (self->loop) {
     GST_INFO_OBJECT (self, "Connection error: %s %d %s",
         g_quark_to_string (error->domain), error->code, error->message);
+    self->connection_error = TRUE;
     stop_task (self);
   }
   g_mutex_unlock (&self->lock);
@@ -999,6 +1038,7 @@
         G_CALLBACK (control_callback), self, 0);
   } else {
     send_connect_error (self, error);
+    self->connection_error = TRUE;
     stop_task (self);
     g_error_free (error);
   }

gst-plugins-bad-1.22.7.tar.xz/gst/rtmp2/rtmp/amf.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rtmp2/rtmp/amf.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/rtmp2/rtmp/rtmpchunkstream.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rtmp2/rtmp/rtmpchunkstream.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/rtmp2/rtmp/rtmpclient.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rtmp2/rtmp/rtmpclient.c Changed

@@ -336,7 +336,7 @@
 static ConnectTaskData *
 connect_task_data_new (const GstRtmpLocation * location)
 {
-  ConnectTaskData *data = g_slice_new0 (ConnectTaskData);
+  ConnectTaskData *data = g_new0 (ConnectTaskData, 1);
   gst_rtmp_location_copy (&data->location, location);
   return data;
 }
@@ -351,7 +351,7 @@
     g_signal_handler_disconnect (data->connection, data->error_handler_id);
   }
   g_clear_object (&data->connection);
-  g_slice_free (ConnectTaskData, data);
+  g_free (data);
 }
 
 static GRegex *auth_regex = NULL;
@@ -1069,7 +1069,7 @@
 stream_task_data_new (GstRtmpConnection * connection, const gchar * stream,
     gboolean publish)
 {
-  StreamTaskData *data = g_slice_new0 (StreamTaskData);
+  StreamTaskData *data = g_new0 (StreamTaskData, 1);
   data->connection = g_object_ref (connection);
   data->stream = g_strdup (stream);
   data->publish = publish;
@@ -1085,7 +1085,7 @@
     g_signal_handler_disconnect (data->connection, data->error_handler_id);
   }
   g_clear_object (&data->connection);
-  g_slice_free (StreamTaskData, data);
+  g_free (data);
 }
 
 static void

gst-plugins-bad-1.22.7.tar.xz/gst/rtmp2/rtmp/rtmpconnection.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rtmp2/rtmp/rtmpconnection.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/rtmp2/rtmp/rtmphandshake.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rtmp2/rtmp/rtmphandshake.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/rtmp2/rtmp/rtmputils.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rtmp2/rtmp/rtmputils.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/rtp/gstrtpsrc.c -> gst-plugins-bad-1.24.5.tar.xz/gst/rtp/gstrtpsrc.c Changed

@@ -358,6 +358,46 @@
 }
 
 static void
+gst_rtp_src_constructed (GObject * object)
+{
+  gchar name48;
+  GstRtpSrc *self = GST_RTP_SRC (object);
+  gchar *tmpname;
+
+  if (!self->rtp_src || !self->rtcp_src || !self->rtcp_sink)
+    return;
+
+  tmpname = g_strdup_printf ("%s_rtp_udpsrc", GST_OBJECT_NAME (self));
+  gst_object_set_name (GST_OBJECT (self->rtp_src), tmpname);
+  g_free (tmpname);
+
+  tmpname = g_strdup_printf ("%s_rtcp_udpsrc", GST_OBJECT_NAME (self));
+  gst_object_set_name (GST_OBJECT (self->rtcp_src), tmpname);
+  g_free (tmpname);
+
+  tmpname = g_strdup_printf ("%s_rtcp_udpsink", GST_OBJECT_NAME (self));
+  gst_object_set_name (GST_OBJECT (self->rtcp_sink), tmpname);
+  g_free (tmpname);
+
+  /* Add elements as needed, since udpsrc/udpsink for RTCP share a socket,
+   * not all at the same moment */
+  gst_bin_add (GST_BIN (self), self->rtp_src);
+  gst_bin_add (GST_BIN (self), self->rtcp_src);
+  gst_bin_add (GST_BIN (self), self->rtcp_sink);
+
+  g_object_set (self->rtcp_sink, "sync", FALSE, "async", FALSE, NULL);
+  gst_element_set_locked_state (self->rtcp_sink, TRUE);
+
+  /* pads are all named */
+  g_snprintf (name, 48, "recv_rtp_sink_%u", GST_ELEMENT (self)->numpads);
+  gst_element_link_pads (self->rtp_src, "src", self->rtpbin, name);
+  g_snprintf (name, 48, "recv_rtcp_sink_%u", GST_ELEMENT (self)->numpads);
+  gst_element_link_pads (self->rtcp_src, "src", self->rtpbin, name);
+  g_snprintf (name, 48, "send_rtcp_src_%u", GST_ELEMENT (self)->numpads);
+  gst_element_link_pads (self->rtpbin, name, self->rtcp_sink, "sink");
+}
+
+static void
 gst_rtp_src_class_init (GstRtpSrcClass * klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@@ -366,6 +406,7 @@
 
   gobject_class->set_property = gst_rtp_src_set_property;
   gobject_class->get_property = gst_rtp_src_get_property;
+  gobject_class->constructed = gst_rtp_src_constructed;
   gobject_class->finalize = gst_rtp_src_finalize;
   gstelement_class->change_state = gst_rtp_src_change_state;
   gstbin_class->handle_message = gst_rtp_src_handle_message;
@@ -798,7 +839,6 @@
 static void
 gst_rtp_src_init (GstRtpSrc * self)
 {
-  gchar name48;
   const gchar *missing_plugin = NULL;
 
   self->rtpbin = NULL;
@@ -869,23 +909,6 @@
     goto missing_plugin;
   }
 
-  /* Add elements as needed, since udpsrc/udpsink for RTCP share a socket,
-   * not all at the same moment */
-  gst_bin_add (GST_BIN (self), self->rtp_src);
-  gst_bin_add (GST_BIN (self), self->rtcp_src);
-  gst_bin_add (GST_BIN (self), self->rtcp_sink);
-
-  g_object_set (self->rtcp_sink, "sync", FALSE, "async", FALSE, NULL);
-  gst_element_set_locked_state (self->rtcp_sink, TRUE);
-
-  /* pads are all named */
-  g_snprintf (name, 48, "recv_rtp_sink_%u", GST_ELEMENT (self)->numpads);
-  gst_element_link_pads (self->rtp_src, "src", self->rtpbin, name);
-  g_snprintf (name, 48, "recv_rtcp_sink_%u", GST_ELEMENT (self)->numpads);
-  gst_element_link_pads (self->rtcp_src, "src", self->rtpbin, name);
-  g_snprintf (name, 48, "send_rtcp_src_%u", GST_ELEMENT (self)->numpads);
-  gst_element_link_pads (self->rtpbin, name, self->rtcp_sink, "sink");
-
   if (missing_plugin == NULL)
     return;

gst-plugins-bad-1.22.7.tar.xz/gst/sdp/gstsdpdemux.c -> gst-plugins-bad-1.24.5.tar.xz/gst/sdp/gstsdpdemux.c Changed

@@ -77,6 +77,9 @@
 #define DEFAULT_TIMEOUT          10000000
 #define DEFAULT_LATENCY_MS       200
 #define DEFAULT_REDIRECT         TRUE
+#define DEFAULT_RTCP_MODE        GST_SDP_DEMUX_RTCP_MODE_SENDRECV
+#define DEFAULT_MEDIA            NULL
+#define DEFAULT_TIMEOUT_INACTIVE_RTP_SOURCES TRUE
 
 enum
 {
@@ -84,7 +87,10 @@
   PROP_DEBUG,
   PROP_TIMEOUT,
   PROP_LATENCY,
-  PROP_REDIRECT
+  PROP_REDIRECT,
+  PROP_RTCP_MODE,
+  PROP_MEDIA,
+  PROP_TIMEOUT_INACTIVE_RTP_SOURCES,
 };
 
 static void gst_sdp_demux_finalize (GObject * object);
@@ -106,7 +112,26 @@
 static GstFlowReturn gst_sdp_demux_sink_chain (GstPad * pad, GstObject * parent,
     GstBuffer * buffer);
 
-/*static guint gst_sdp_demux_signalsLAST_SIGNAL = { 0 }; */
+#define GST_TYPE_SDP_DEMUX_RTCP_MODE gst_sdp_demux_rtcp_mode_get_type()
+static GType
+gst_sdp_demux_rtcp_mode_get_type (void)
+{
+  static GType rtcp_mode_type = 0;
+  static const GEnumValue enums = {
+    {GST_SDP_DEMUX_RTCP_MODE_SENDRECV, "sendrecv", "Send + Receive RTCP"},
+    {GST_SDP_DEMUX_RTCP_MODE_RECVONLY, "recvonly",
+        "Receive RTCP sender reports"},
+    {GST_SDP_DEMUX_RTCP_MODE_SENDONLY, "sendonly",
+        "Send RTCP receiver reports"},
+    {GST_SDP_DEMUX_RTCP_MODE_INACTIVE, "inactivate", "Disable RTCP"},
+    {0, NULL, NULL},
+  };
+
+  if (!rtcp_mode_type) {
+    rtcp_mode_type = g_enum_register_static ("GstSDPDemuxRTCPMode", enums);
+  }
+  return rtcp_mode_type;
+}
 
 #define gst_sdp_demux_parent_class parent_class
 G_DEFINE_TYPE (GstSDPDemux, gst_sdp_demux, GST_TYPE_BIN);
@@ -152,6 +177,50 @@
           DEFAULT_REDIRECT,
           G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstSDPDemux:rtcp-mode:
+   *
+   * RTCP mode: enable or disable receiving of Sender Reports and
+   * sending of Receiver Reports.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_RTCP_MODE,
+      g_param_spec_enum ("rtcp-mode", "RTCP Mode",
+          "Enable or disable receiving of RTCP sender reports and sending of "
+          "RTCP receiver reports", GST_TYPE_SDP_DEMUX_RTCP_MODE,
+          DEFAULT_RTCP_MODE,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstSDPDemux:media:
+   *
+   * Media to use, e.g. audio or video (NULL=allow all).
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MEDIA,
+      g_param_spec_string ("media", "Media",
+          "Media to use, e.g. audio or video (NULL = all)", DEFAULT_MEDIA,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstSDPDemux:timeout-inactive-rtp-sources:
+   *
+   * Whether inactive RTP sources in the underlying RTP session
+   * should be timed out.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class,
+      PROP_TIMEOUT_INACTIVE_RTP_SOURCES,
+      g_param_spec_boolean ("timeout-inactive-rtp-sources",
+          "Time out inactive sources",
+          "Whether RTP sources that don't receive RTP or RTCP packets for longer "
+          "than 5x RTCP interval should be removed",
+          DEFAULT_TIMEOUT_INACTIVE_RTP_SOURCES,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
+
   gst_element_class_add_static_pad_template (gstelement_class, &sinktemplate);
   gst_element_class_add_static_pad_template (gstelement_class, &rtptemplate);
 
@@ -165,6 +234,8 @@
   gstbin_class->handle_message = gst_sdp_demux_handle_message;
 
   GST_DEBUG_CATEGORY_INIT (sdpdemux_debug, "sdpdemux", 0, "SDP demux");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_SDP_DEMUX_RTCP_MODE, 0);
 }
 
 static void
@@ -182,6 +253,9 @@
   g_rec_mutex_init (&demux->stream_rec_lock);
 
   demux->adapter = gst_adapter_new ();
+
+  demux->rtcp_mode = DEFAULT_RTCP_MODE;
+  demux->media = DEFAULT_MEDIA;
 }
 
 static void
@@ -220,6 +294,18 @@
     case PROP_REDIRECT:
       demux->redirect = g_value_get_boolean (value);
       break;
+    case PROP_RTCP_MODE:
+      demux->rtcp_mode = g_value_get_enum (value);
+      break;
+    case PROP_MEDIA:
+      GST_OBJECT_LOCK (demux);
+      /* g_intern_string() is NULL-safe */
+      demux->media = g_intern_string (g_value_get_string (value));
+      GST_OBJECT_UNLOCK (demux);
+      break;
+    case PROP_TIMEOUT_INACTIVE_RTP_SOURCES:
+      demux->timeout_inactive_rtp_sources = g_value_get_boolean (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -247,6 +333,17 @@
     case PROP_REDIRECT:
       g_value_set_boolean (value, demux->redirect);
       break;
+    case PROP_RTCP_MODE:
+      g_value_set_enum (value, demux->rtcp_mode);
+      break;
+    case PROP_MEDIA:
+      GST_OBJECT_LOCK (demux);
+      g_value_set_string (value, demux->media);
+      GST_OBJECT_UNLOCK (demux);
+      break;
+    case PROP_TIMEOUT_INACTIVE_RTP_SOURCES:
+      g_value_set_boolean (value, demux->timeout_inactive_rtp_sources);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -349,6 +446,9 @@
     }
     stream->srcpad = NULL;
   }
+
+  g_free (stream->src_list);
+  g_free (stream->src_incl_list);
   g_free (stream);
 }
 
@@ -383,10 +483,154 @@
   return ret;
 }
 
+/* RTC 4570 Session Description Protocol (SDP) Source Filters
+ * syntax:
+ * a=source-filter: <filter-mode> <filter-spec>
+ *
+ * where
+ * <filter-mode>: "incl" or "excl"
+ *
+ * <filter-spec>:
+ * <nettype> <address-types> <dest-address> <src-list>
+ *
+ */
+static gboolean
+gst_sdp_demux_parse_source_filter (GstSDPDemux * self,
+    const gchar * source_filter, const gchar * dst_addr, GString * source_list,
+    GString * source_incl_list)
+{
+  const gchar *str;
+  guint remaining;
+  gchar *del;
+  gsize size;
+  guint min_size;
+  gboolean is_incl;
+  gchar *dst;
+
+  if (!source_filter || !dst_addr)
+    return FALSE;
+
+  str = source_filter;
+  remaining = strlen (str);
+  min_size = strlen ("incl IN IP4 * *");
+  if (remaining < min_size)
+    return FALSE;
+
+#define LSTRIP(s) G_STMT_START { \
+  while (g_ascii_isspace (*(s))) { \
+    (s)++; \
+    remaining--; \
+  } \
+  if (*(s) == '\0') \
+    return FALSE; \
+} G_STMT_END
+
+#define SKIP_N_LSTRIP(s, n) G_STMT_START { \
+  if (remaining < n) \
+    return FALSE; \
+  (s) += n; \
+  if (*(s) == '\0') \
+    return FALSE; \
+  remaining -= n; \
+  LSTRIP(s); \
+} G_STMT_END
+
+  LSTRIP (str);
+  if (remaining < min_size)
+    return FALSE;
+
+  if (g_str_has_prefix (str, "incl ")) {
+    is_incl = TRUE;
+  } else if (g_str_has_prefix (str, "excl ")) {
+    is_incl = FALSE;
+  } else {
+    GST_WARNING_OBJECT (self, "Unexpected filter type");
+    return FALSE;
+  }
+
+  SKIP_N_LSTRIP (str, 4);
+  /* XXX: <nettype>, internet only for now */
+  if (!g_str_has_prefix (str, "IN "))
+    return FALSE;
+
+  SKIP_N_LSTRIP (str, 3);
+  /* Should care the address type here? */
+  if (g_str_has_prefix (str, "* ")) {
+    /* dest and src are both FQDN */
+    SKIP_N_LSTRIP (str, 2);
+  } else if (g_str_has_prefix (str, "IP4 ")) {
+    SKIP_N_LSTRIP (str, 4);
+  } else if (g_str_has_prefix (str, "IP6 ")) {
+    SKIP_N_LSTRIP (str, 4);
+  } else {
+    return FALSE;
+  }
+
+  del = strchr (str, ' ');
+  if (!del) {
+    GST_WARNING_OBJECT (self, "Unexpected dest-address format");
+    return FALSE;
+  }
+
+  size = del - str;
+  dst = g_strndup (str, size);
+  if (g_strcmp0 (dst, dst_addr) != 0 && g_strcmp0 (dst, "*") != 0) {
+    g_free (dst);
+    return FALSE;
+  }
+  g_free (dst);
+
+  SKIP_N_LSTRIP (str, size);
+
+  do {
+    del = strchr (str, ' ');
+    if (del) {
+      size = del - str;
+      if (is_incl) {
+        g_string_append_c (source_list, '+');
+        g_string_append_len (source_list, str, size);
+
+        g_string_append_c (source_incl_list, '+');
+        g_string_append_len (source_incl_list, str, size);
+      } else {
+        g_string_append_c (source_list, '-');
+        g_string_append_len (source_list, str, size);
+      }
+
+      str += size;
+      while (g_ascii_isspace (*str)) {
+        str++;
+      }
+
+      /* this was the last source but with trailing space */
+      if (*str == '\0')
+        return TRUE;
+    } else {
+      if (is_incl) {
+        g_string_append_c (source_list, '+');
+        g_string_append (source_list, str);
+
+        g_string_append_c (source_incl_list, '+');
+        g_string_append (source_incl_list, str);
+      } else {
+        g_string_append_c (source_list, '-');
+        g_string_append (source_list, str);
+      }
+
+      return TRUE;
+    }
+  } while (TRUE);
+
+#undef LSTRIP
+#undef SKIP_N
+  return TRUE;
+}
+
 static GstSDPStream *
 gst_sdp_demux_create_stream (GstSDPDemux * demux, GstSDPMessage * sdp, gint idx)
 {
   GstSDPStream *stream;
+  const gchar *media_filter;
   const gchar *payload;
   const GstSDPMedia *media;
   const GstSDPConnection *conn;
@@ -396,6 +640,16 @@
   if (media == NULL)
     return NULL;
 
+  GST_OBJECT_LOCK (demux);
+  media_filter = demux->media;
+  GST_OBJECT_UNLOCK (demux);
+
+  if (media_filter != NULL && !g_str_equal (media_filter, media->media)) {
+    GST_INFO_OBJECT (demux, "Skipping media %s (filter: %s)", media->media,
+        media_filter);
+    return NULL;
+  }
+
   stream = g_new0 (GstSDPStream, 1);
   stream->parent = demux;
   /* we mark the pad as not linked, we will mark it as OK when we add the pad to
@@ -418,6 +672,7 @@
     s = gst_caps_get_structure (stream->caps, 0);
     gst_structure_set_name (s, "application/x-rtp");
 
+    gst_sdp_message_attributes_to_caps (sdp, stream->caps);
     gst_sdp_media_attributes_to_caps (media, stream->caps);
 
     if (stream->pt >= 96) {
@@ -448,9 +703,55 @@
   stream->destination = conn->address;
   stream->ttl = conn->ttl;
   stream->multicast = is_multicast_address (stream->destination);
+  if (stream->multicast) {
+    GString *source_list = g_string_new (NULL);
+    GString *source_incl_list = g_string_new (NULL);
+    guint i;
+    gboolean source_filter_in_media = FALSE;
+
+    for (i = 0; i < media->attributes->len; i++) {
+      GstSDPAttribute *attr = &g_array_index (media->attributes,
+          GstSDPAttribute, i);
+
+      if (g_strcmp0 (attr->key, "source-filter") == 0) {
+        source_filter_in_media = TRUE;
+        gst_sdp_demux_parse_source_filter (demux, attr->value,
+            stream->destination, source_list, source_incl_list);
+      }
+    }
+
+    /* Try session level source filter if media level filter is unspecified */
+    if (source_list->len == 0 && !source_filter_in_media) {
+      for (i = 0; i < sdp->attributes->len; i++) {
+        GstSDPAttribute *attr = &g_array_index (sdp->attributes,
+            GstSDPAttribute, i);
+
+        if (g_strcmp0 (attr->key, "source-filter") == 0) {
+          gst_sdp_demux_parse_source_filter (demux, attr->value,
+              stream->destination, source_list, source_incl_list);
+        }
+      }
+    }
+
+    if (source_list->len > 0) {
+      stream->src_list = g_string_free (source_list, FALSE);
+      stream->src_incl_list = g_string_free (source_incl_list, FALSE);
+
+      GST_DEBUG_OBJECT (demux,
+          "Have source-filter: \"%s\", positive-only: \"%s\"",
+          stream->src_list, GST_STR_NULL (stream->src_incl_list));
+    } else {
+      g_string_free (source_list, TRUE);
+      g_string_free (source_incl_list, TRUE);
+    }
+  }
 
   stream->rtp_port = gst_sdp_media_get_port (media);
-  if (gst_sdp_media_get_attribute_val (media, "rtcp")) {
+
+  if (demux->rtcp_mode == GST_SDP_DEMUX_RTCP_MODE_INACTIVE) {
+    GST_INFO_OBJECT (demux, "RTCP disabled");
+    stream->rtcp_port = -1;
+  } else if (gst_sdp_media_get_attribute_val (media, "rtcp")) {
     /* FIXME, RFC 3605 */
     stream->rtcp_port = stream->rtp_port + 1;
   } else {
@@ -746,6 +1047,9 @@
         demux);
     g_signal_connect (demux->session, "on-timeout", (GCallback) on_timeout,
         demux);
+
+    g_object_set (demux->session, "timeout-inactive-sources",
+        demux->timeout_inactive_rtp_sources, NULL);
   }
 
   g_object_set (demux->session, "latency", demux->latency, NULL);
@@ -789,7 +1093,13 @@
     GST_DEBUG_OBJECT (demux, "receiving RTP from %s:%d", destination,
         stream->rtp_port);
 
-    uri = g_strdup_printf ("udp://%s:%d", destination, stream->rtp_port);
+    if (stream->src_list) {
+      uri = g_strdup_printf ("udp://%s:%d?multicast-source=%s",
+          destination, stream->rtp_port, stream->src_list);
+    } else {
+      uri = g_strdup_printf ("udp://%s:%d", destination, stream->rtp_port);
+    }
+
     stream->udpsrc0 =
         gst_element_make_from_uri (GST_URI_SRC, uri, NULL, NULL);
     g_free (uri);
@@ -827,10 +1137,18 @@
   }
 
   /* creating another UDP source */
-  if (stream->rtcp_port != -1) {
+  if (stream->rtcp_port != -1
+      && (demux->rtcp_mode == GST_SDP_DEMUX_RTCP_MODE_SENDRECV
+          || demux->rtcp_mode == GST_SDP_DEMUX_RTCP_MODE_RECVONLY)) {
     GST_DEBUG_OBJECT (demux, "receiving RTCP from %s:%d", destination,
         stream->rtcp_port);
-    uri = g_strdup_printf ("udp://%s:%d", destination, stream->rtcp_port);
+    /* rfc4570 3.2.1. Source-Specific Multicast Example */
+    if (stream->src_incl_list) {
+      uri = g_strdup_printf ("udp://%s:%d?multicast-source=%s",
+          destination, stream->rtcp_port, stream->src_incl_list);
+    } else {
+      uri = g_strdup_printf ("udp://%s:%d", destination, stream->rtcp_port);
+    }
     stream->udpsrc1 =
         gst_element_make_from_uri (GST_URI_SRC, uri, NULL, NULL);
     g_free (uri);
@@ -873,6 +1191,12 @@
   GSocket *socket;
   gchar *destination, *uri, *name;
 
+  if (demux->rtcp_mode == GST_SDP_DEMUX_RTCP_MODE_INACTIVE
+      || demux->rtcp_mode == GST_SDP_DEMUX_RTCP_MODE_RECVONLY) {
+    GST_INFO_OBJECT (demux, "RTCP feedback disabled, not sending RRs");
+    return TRUE;
+  }
+
   /* get destination and port */
   port = stream->rtcp_port;
   destination = stream->destination;
@@ -1214,7 +1538,8 @@
 
       /* configure target state on udp sources */
       gst_element_set_state (stream->udpsrc0, demux->target);
-      gst_element_set_state (stream->udpsrc1, demux->target);
+      if (stream->udpsrc1 != NULL)
+        gst_element_set_state (stream->udpsrc1, demux->target);
     }
   }
   GST_SDP_STREAM_UNLOCK (demux);

gst-plugins-bad-1.22.7.tar.xz/gst/sdp/gstsdpdemux.h -> gst-plugins-bad-1.24.5.tar.xz/gst/sdp/gstsdpdemux.h Changed

@@ -72,6 +72,10 @@
   guint         ttl;
   gboolean      multicast;
 
+  /* source-filter */
+  gchar        *src_list;
+  gchar        *src_incl_list;
+
   /* our udp sink back to the server */
   GstElement   *udpsink;
   GstPad       *rtcppad;
@@ -81,6 +85,24 @@
   gboolean      container;
 };
 
+/**
+ * GstSDPDemuxRTCPMode:
+ * @GST_SDP_DEMUX_RTCP_MODE_INACTIVE: Don't send or receive RTCP packets
+ * @GST_SDP_DEMUX_RTCP_MODE_RECVONLY: Only receive RTCP packets
+ * @GST_SDP_DEMUX_RTCP_MODE_SENDONLY: Only send RTCP packets
+ * @GST_SDP_DEMUX_RTCP_MODE_SENDRECV: Send and receive RTCP packets
+ *
+ * RTCP configuration.
+ *
+ * Since: 1.24
+ */
+typedef enum {
+  GST_SDP_DEMUX_RTCP_MODE_INACTIVE = 0,
+  GST_SDP_DEMUX_RTCP_MODE_RECVONLY = 1,
+  GST_SDP_DEMUX_RTCP_MODE_SENDONLY = 2,
+  GST_SDP_DEMUX_RTCP_MODE_SENDRECV = 3,
+} GstSDPDemuxRTCPMode;
+
 struct _GstSDPDemux {
   GstBin           parent;
 
@@ -100,6 +122,9 @@
   guint64           udp_timeout;
   guint             latency;
   gboolean          redirect;
+  const gchar      *media; /* if non-NULL only hook up these kinds of media (video/audio) */ /* interned string */
+  GstSDPDemuxRTCPMode rtcp_mode;
+  gboolean          timeout_inactive_rtp_sources;
 
   /* session management */
   GstElement      *session;

gst-plugins-bad-1.22.7.tar.xz/gst/switchbin/gstswitchbin.c -> gst-plugins-bad-1.24.5.tar.xz/gst/switchbin/gstswitchbin.c Changed

@@ -23,37 +23,108 @@
  * SECTION:element-switchbin
  * @title: switchbin
  *
- * switchbin is a helper element which chooses between a set of
- * processing chains (paths) based on input caps, and changes if new caps
- * arrive. Paths are child objects, which are accessed by the
- * #GstChildProxy interface.
+ * switchbin is a helper element that chooses between a set of processing
+ * chains (called "paths") based on incoming caps, the caps of the paths,
+ * and the result of caps queries issued to the elements within the paths.
+ * It switches between these paths based on thes caps. Paths are child objects,
+ * which are accessed by the #GstChildProxy interface.
+ *
+ * The intent is to allow for easy construction of dynamic pipelines that
+ * automatically switches between paths based on the caps, which is useful
+ * for cases when certain elements are only to be used for certain types
+ * of dataflow. One common example is a switchbin that inserts postprocessing
+ * elements only if the incoming caps are of a type that allows for such
+ * postprocessing, like when a video dataflow could be raw frames in some
+ * cases and encoded MPEG video in others - postprocessing plugins for
+ * color space conversion, scaling and such then should only be inserted
+ * if the data consists of raw frames, while encoded video is passed
+ * through unchanged.
+ *
+ * Each path has an "element" property. If a #GstElement is passed to this,
+ * switchbin takes ownership over that element. (Any previously set element
+ * is removed and unref'd before the new one is set.) The element property
+ * can also be NULL for a special passthrough mode (see below). In addition,
+ * each path has a "caps" property, which is used for finding matching
+ * paths. These caps are referred to as the "path caps".
+ *
+ * NOTE: Currently, switchbin has a limitation that path elements must
+ * have exactly one "sink" and one "src" pad, both of which need to be
+ * always available, so no request and no sometimes pads.
  *
  * Whenever new input caps are encountered at the switchbin's sinkpad,
- * the * first path with matching caps is picked. The paths are looked at
+ * the first path with matching caps is picked. A "match" means that the
+ * result of gst_caps_can_intersect() is TRUE. The paths are looked at
  * in order: path \#0's caps are looked at first, checked against the new
- * input caps with gst_caps_can_intersect(), and if its return value
+ * input caps with gst_caps_can_intersect(), and if the return value
  * is TRUE, path \#0 is picked. Otherwise, path \#1's caps are looked at etc.
- * If no path matches, an error is reported.
+ * If no path matches, a GST_STREAM_ERROR_WRONG_TYPE error is reported.
+ *
+ * For queries, the concept of "allowed caps" is important. These are the
+ * caps that are possible to use with this switchbin. They are computed
+ * differently for sink- and for srcpads.
+ *
+ * Allowed sinkpad caps are computed by visiting each path, issuing an
+ * internal caps query to the path element's sink pad, intersecting the
+ * result from that query with the path caps, and appending that intersection
+ * to the overall allowed sinkpad caps. Allowed srcpad caps are similar,
+ * except that the result of the internal query is directly attached to the
+ * overall allowed srcpad caps (no intersection with path caps takes place):
+ * The intuition behind this is that in sinkpad direction, only caps that
+ * are compatible with both the path caps and whatever the internal element
+ * can handle are really usable - other caps will be rejected. In srcpad
+ * direction, path caps do not exert an influence.
+ *
+ * The switchbin responds to caps and accept-caps queries in a particular
+ * way. They involve the aforementioned "allowed caps".
+ *
+ * Caps queries are responded to by first checking if there are any paths.
+ * If num-paths is 0, the query always fails. If there is no current path
+ * selected, or if the path has no element, the allowed sink/srcpad caps
+ * (depending on whether the query comes from the sink- or srcpad direction)
+ * is directly used as the response. If a current path is selected, and it
+ * has an element, the query is forwarded to that element instead.
+ *
+ * Accept-caps queries are handled by checking if the switchbin can find
+ * a path whose caps match the caps from that query. If there is one, the
+ * response to that query is TRUE, otherwise FALSE.
+ *
+ * As mentioned before, path caps can in theory be any kind of caps. However,
+ * they always only affect the input side (= the sink pad side of the switchbin).
+ * Path elements can produce output of any type, so their srcpad caps can be
+ * anything, even caps that are entirely different. For example, it is perfectly
+ * valid if the path caps are "video/x-raw", the path element sink pad template
+ * caps also are "video/x-raw", and the src pad caps of the elements are
+ * "application/x-rtp".
+ *
+ * Path elements can be set to NULL. Such paths perform dataflow passthrough.
+ * The path then just forwards data. This includes caps and accept-caps queries.
+ * Since there is no element, the internal caps queries go to the switchbin
+ * peers instead (to the upstream peer when the query is at the switchbin's
+ * srcpad, and to the downstream peer if the query is at the sinkpad).
  *
  * <refsect2>
  * <title>Example launch line</title>
  *
  * In this example, if the data is raw PCM audio with 44.1 kHz, a volume
  * element is used for reducing the audio volume to 10%. Otherwise, it is
- * just passed through. So, a 44.1 kHz MP3 will sound quiet, a 48 kHz MP3
- * will be at full volume.
+ * just passed through. So, 44.1 kHz PCM audio will sound quiet, while
+ * 48 kHz PCM and any non-PCM data will be passed through unmodified.
  *
  * |
  *   gst-launch-1.0 uridecodebin uri=<URI> ! switchbin num-paths=2 \
  *     path0::element="audioconvert ! volume volume=0.1" path0::caps="audio/x-raw, rate=44100" \
- *     path1::element="identity" path1::caps="ANY" ! \
+ *     path1::caps="ANY" ! \
  *     autoaudiosink
  * |
  *
- * This example's path \#1 is a fallback "catch-all" path. Its caps are "ANY" caps,
- * so any input caps will match against this. A catch-all path with an identity element
- * is useful for cases where certain kinds of processing should only be done for specific
- * formats, like the example above (it applies volume only to 44.1 kHz PCM audio).
+ * This example's path \#1 is a passthrough path. Its caps are "ANY" caps,
+ * and its element is NULL (the default value). Dataflow is passed through,
+ * and caps and accept-caps queries are forwarded to the switchbin peers.
+ *
+ * NOTE: Setting the caps to NULL instead of ANY would have accomplíshed
+ * the same in this example, since NULL path caps are internally
+ * interpreted as ANY caps.
+ *
  * </refsect2>
  *
  */
@@ -273,9 +344,7 @@
   switch_bin->num_paths = DEFAULT_NUM_PATHS;
   switch_bin->paths = NULL;
   switch_bin->current_path = NULL;
-  switch_bin->last_stream_start = NULL;
   switch_bin->blocking_probe_id = 0;
-  switch_bin->drop_probe_id = 0;
   switch_bin->last_caps = NULL;
 
   switch_bin->sinkpad = gst_ghost_pad_new_no_target_from_template ("sink",
@@ -329,8 +398,6 @@
 
   if (switch_bin->last_caps != NULL)
     gst_caps_unref (switch_bin->last_caps);
-  if (switch_bin->last_stream_start != NULL)
-    gst_event_unref (switch_bin->last_stream_start);
 
   for (i = 0; i < switch_bin->num_paths; ++i) {
     gst_object_unparent (GST_OBJECT (switch_bin->pathsi));
@@ -400,15 +467,6 @@
   GstSwitchBin *switch_bin = GST_SWITCH_BIN (parent);
 
   switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_STREAM_START:
-    {
-      GST_DEBUG_OBJECT (switch_bin,
-          "stream-start event observed; copying it for later use");
-      gst_event_replace (&(switch_bin->last_stream_start), event);
-
-      return gst_pad_event_default (pad, parent, event);
-    }
-
     case GST_EVENT_CAPS:
     {
       /* Intercept the caps event to switch to an appropriate path, then
@@ -454,39 +512,11 @@
 
       gst_query_parse_caps (query, &filter);
 
-      PATH_LOCK (switch_bin);
+      GST_DEBUG_OBJECT (switch_bin, "new caps query; filter: %" GST_PTR_FORMAT,
+          filter);
 
-      if (switch_bin->num_paths == 0) {
-        /* No paths exist - cannot return any caps */
-        caps = NULL;
-      } else if ((switch_bin->current_path == NULL)
-          || (switch_bin->current_path->element == NULL)) {
-        /* Paths exist, but there is no current path (or the path is a dropping path,
-         * so no element exists) - just return all allowed caps */
-        caps =
-            gst_switch_bin_get_allowed_caps (switch_bin, pad, pad_name, filter);
-      } else {
-        /* Paths exist and there is a current path
-         * Forward the query to its element */
-
-        GstQuery *caps_query = gst_query_new_caps (NULL);
-        GstPad *element_pad =
-            gst_element_get_static_pad (switch_bin->current_path->element,
-            pad_name);
-
-        caps = NULL;
-        if (gst_pad_query (element_pad, caps_query)) {
-          GstCaps *query_caps;
-          gst_query_parse_caps_result (caps_query, &query_caps);
-          caps = gst_caps_copy (query_caps);
-        }
-
-        gst_query_unref (caps_query);
-        gst_object_unref (GST_OBJECT (element_pad));
-      }
-
-
-      PATH_UNLOCK (switch_bin);
+      caps =
+          gst_switch_bin_get_allowed_caps (switch_bin, pad, pad_name, filter);
 
       if (caps != NULL) {
         GST_DEBUG_OBJECT (switch_bin, "%s caps query:  caps: %" GST_PTR_FORMAT,
@@ -762,9 +792,8 @@
     } else {
       GstPad *srcpad;
 
-      /* There is no path element. This will probably yield an error
-       * into the pipeline unless we're shutting down */
-      GST_DEBUG_OBJECT (switch_bin, "path has no element ; will drop data");
+      /* There is no path element. Just forward data. */
+      GST_DEBUG_OBJECT (switch_bin, "path has no element ; will forward data");
 
       srcpad = gst_element_get_static_pad (switch_bin->input_identity, "src");
 
@@ -777,11 +806,6 @@
         ret = FALSE;
       }
 
-      GST_DEBUG_OBJECT (switch_bin,
-          "pushing stream-start downstream before disabling");
-      gst_element_send_event (switch_bin->input_identity,
-          gst_event_ref (switch_bin->last_stream_start));
-
       gst_object_unref (GST_OBJECT (srcpad));
     }
   }
@@ -808,6 +832,12 @@
 
   for (i = 0; i < switch_bin->num_paths; ++i) {
     GstSwitchBinPath *path = switch_bin->pathsi;
+
+    /* Path caps are never supposed to be NULL. Even if the user
+     * specifies NULL as caps in the path properties, the code in
+     * gst_switch_bin_path_set_property () turns them into ANY caps. */
+    g_assert (path->caps != NULL);
+
     if (gst_caps_can_intersect (caps, path->caps))
       return path;
   }
@@ -820,83 +850,188 @@
 gst_switch_bin_get_allowed_caps (GstSwitchBin * switch_bin,
     GstPad * switch_bin_pad, gchar const *pad_name, GstCaps * filter)
 {
-  /* must be called with path lock held */
-
   guint i;
+  guint num_paths;
+  GstSwitchBinPath **paths;
   GstCaps *total_path_caps;
+  gboolean peer_caps_queried = FALSE;
+  gboolean peer_caps_query_successful;
+  GstCaps *peer_caps = NULL;
   gboolean is_sink_pad =
       (gst_pad_get_direction (switch_bin_pad) == GST_PAD_SINK);
 
-  /* The allowed caps are a combination of the caps of all paths, the
-   * filter caps, and the allowed caps as indicated by the result
-   * of the CAPS query on the current path's element.
-   * Since the CAPS query result can be influenced by an element's
-   * current state and link to other elements, the non-current
-   * path elements are not queried.
-   *
-   * In theory, it would be enough to just append all path caps. However,
-   * to refine this a bit further, in case of the current path, the
-   * path caps are first intersected with the result of the CAPS query.
-   * This narrows down the acceptable caps for this current path,
-   * hopefully providing better quality caps. */
+  /* Acquire references to the paths, path elements, and path caps, then
+   * operate on those references instead of on the actual paths. That way,
+   * we do not need to keep the path lock acquired for the entirety of the
+   * function, which is important, since we need to issue caps queries to
+   * other elements here. Doing that while the path lock is acquired can
+   * cause deadlocks. And since we operate on references here, concurrent
+   * changes to the paths won't cause race conditions. */
+
+  PATH_LOCK (switch_bin);
 
   if (switch_bin->num_paths == 0) {
-    /* No paths exist, so nothing can be returned */
-    GST_ELEMENT_ERROR (switch_bin, STREAM, FAILED, ("no paths defined"),
-        ("there must be at least one path in order for switchbin to do anything"));
+    PATH_UNLOCK (switch_bin);
+
+    /* No paths exist, so nothing can be returned. This is not
+     * necessarily an error - it can happen that caps queries take
+     * place before the caller had a chance to set up paths for example. */
+    GST_DEBUG_OBJECT (switch_bin, "no paths exist; "
+        "cannot return any allowed caps");
     return NULL;
   }
 
+  num_paths = switch_bin->num_paths;
+  paths = g_malloc0_n (num_paths, sizeof (GstSwitchBinPath *));
+  for (i = 0; i < num_paths; ++i)
+    pathsi = gst_object_ref (switch_bin->pathsi);
+
+  PATH_UNLOCK (switch_bin);
+
+  /* From this moment on, the original paths are no longer accessed,
+   * so we can release the path lock. */
+
+  /* The allowed caps are a combination of the caps of all paths, the filter
+   * caps, and the result of issuing caps queries to the path elements
+   * (or to the switchbin sink/srcpads when paths have no elements). */
+
   total_path_caps = gst_caps_new_empty ();
 
-  for (i = 0; i < switch_bin->num_paths; ++i) {
-    GstSwitchBinPath *path = switch_bin->pathsi;
+  for (i = 0; i < num_paths; ++i) {
+    GstSwitchBinPath *path = pathsi;
+    GstCaps *queried_caps = NULL;
+    GstCaps *intersected_caps;
+    GstCaps *path_caps;
+    GstElement *path_element;
+    gboolean query_successful;
+    GstPad *pad;
+    GstQuery *caps_query;
+
+    GST_OBJECT_LOCK (path);
+
+    /* Path caps are never supposed to be NULL. Even if the user
+     * specifies NULL as caps in the path properties, the code in
+     * gst_switch_bin_path_set_property () turns them into ANY caps. */
+    g_assert (path->caps != NULL);
+    path_caps = gst_caps_ref (path->caps);
+
+    path_element =
+        (path->element != NULL) ? gst_object_ref (path->element) : NULL;
+
+    GST_OBJECT_UNLOCK (path);
+
+    /* We need to check what caps are handled by up/downstream, relative
+     * to the switchbin src/sinkcaps. If there is an element, issue a
+     * caps query to it to get that information. If there is no element,
+     * then this path is a passthrough path, so the logical step is to
+     * query peers instead. */
+
+    if (path_element != NULL) {
+      pad = gst_element_get_static_pad (path_element, pad_name);
+      caps_query = gst_query_new_caps (filter);
+
+      query_successful = gst_pad_query (pad, caps_query);
+      if (query_successful) {
+        gst_query_parse_caps_result (caps_query, &queried_caps);
+        /* Ref the caps, otherwise they will be gone when the query is unref'd. */
+        gst_caps_ref (queried_caps);
+        GST_DEBUG_OBJECT (switch_bin, "queried element of path #%u "
+            "(with filter applied if one is present), and query succeeded; "
+            "result: %" GST_PTR_FORMAT, i, (gpointer) queried_caps);
+      } else {
+        GST_DEBUG_OBJECT (switch_bin, "queried element of path #%u "
+            "(with filter applied if one is present), but query failed", i);
+      }
 
-    if (path->element != NULL) {
-      GstPad *pad;
-      GstCaps *caps, *intersected_caps;
-      GstQuery *caps_query = NULL;
-
-      pad = gst_element_get_static_pad (path->element, pad_name);
-      caps_query = gst_query_new_caps (NULL);
-
-      /* Query the path element for allowed caps. If this is
-       * successful, intersect the returned caps with the path caps for the sink pad,
-       * and append the result of the intersection to the total_path_caps,
-       * or just append the result to the total_path_caps if collecting srcpad caps. */
-      if (gst_pad_query (pad, caps_query)) {
-        gst_query_parse_caps_result (caps_query, &caps);
-        if (is_sink_pad) {
-          intersected_caps = gst_caps_intersect (caps, path->caps);
+      gst_query_unref (caps_query);
+      gst_object_unref (GST_OBJECT (pad));
+
+      gst_object_unref (GST_OBJECT (path_element));
+    } else {
+      /* Unlike in the non-NULL element case above, we issue a query
+       * only once. We need to query the peer, and that peer does not
+       * differ between paths, so querying more than once is redundant. */
+      if (!peer_caps_queried) {
+        pad = is_sink_pad ? switch_bin->srcpad : switch_bin->sinkpad;
+        caps_query = gst_query_new_caps (filter);
+
+        peer_caps_query_successful = gst_pad_peer_query (pad, caps_query);
+        if (peer_caps_query_successful) {
+          gst_query_parse_caps_result (caps_query, &peer_caps);
+          /* Ref the caps, otherwise they will be gone when the query is unref'd. */
+          gst_caps_ref (peer_caps);
+          GST_DEBUG_OBJECT (switch_bin, "queried peer of %s pad (with filter "
+              "applied if one is present), and query succeeded; result: %"
+              GST_PTR_FORMAT, is_sink_pad ? "sink" : "src", (gpointer)
+              peer_caps);
         } else {
-          intersected_caps = gst_caps_copy (caps);
+          GST_DEBUG_OBJECT (switch_bin, "queried peer of %s pad "
+              "(with filter applied if one is present), but query failed",
+              is_sink_pad ? "sink" : "src");
         }
-        gst_caps_append (total_path_caps, intersected_caps);
-      } else if (is_sink_pad) {
-        /* Just assume the sink pad has the path caps if the query failed */
-        gst_caps_append (total_path_caps, gst_caps_ref (path->caps));
+
+        gst_query_unref (caps_query);
+
+        peer_caps_queried = TRUE;
       }
 
-      gst_object_unref (GST_OBJECT (pad));
-      gst_query_unref (caps_query);
+      /* Ref the caps here again because they are unref'd further below and
+       * we want to keep the peer_caps around until all paths are handled. */
+      if (peer_caps != NULL)
+        queried_caps = gst_caps_ref (peer_caps);
+      query_successful = peer_caps_query_successful;
+    }
+
+    if (query_successful) {
+      /* If the caps query above succeeded, we know what up/downstream can
+       * handle. In the sinkpad direction, the path caps further restrict
+       * what caps can be used in this path, so intersect them with the
+       * queried caps. In the srcpad direction, no such restriction exists. */
+
+      if (is_sink_pad)
+        intersected_caps = gst_caps_intersect (queried_caps, path_caps);
+      else
+        intersected_caps = gst_caps_copy (queried_caps);
+
+      gst_caps_append (total_path_caps, intersected_caps);
+
+      gst_caps_unref (path_caps);
     } else {
-      /* This is a path with no element (= is a dropping path),
-       * If querying the sink caps, append the path
-       * input caps, otherwise the output caps can be ANY */
+      /* If the query failed (for example, because the pad is not yet linked),
+       * we have to make assumptions. In the sinkpad direction, the safest
+       * bet is to use the path caps, since no matter what, only caps that
+       * are a match with them can pass through this path. In the srcpad
+       * direction, there are no restriction, so use ANY caps. */
+
       if (is_sink_pad)
-        gst_caps_append (total_path_caps, gst_caps_ref (path->caps));
+        gst_caps_append (total_path_caps, path_caps);
       else
         gst_caps_append (total_path_caps, gst_caps_new_any ());
     }
+
+    gst_caps_replace (&queried_caps, NULL);
   }
 
   /* Apply filter caps if present */
   if (filter != NULL) {
     GstCaps *tmp_caps = total_path_caps;
-    total_path_caps = gst_caps_intersect (tmp_caps, filter);
+    /* Use filter caps as first caps in intersection along with the
+     * GST_CAPS_INTERSECT_FIRST mode. This makes it possible to
+     * define the order of the resulting caps by making it follow
+     * the order of the filter caps. */
+    total_path_caps = gst_caps_intersect_full (filter, tmp_caps,
+        GST_CAPS_INTERSECT_FIRST);
     gst_caps_unref (tmp_caps);
   }
 
+  gst_caps_replace (&peer_caps, NULL);
+
+  /* Clear up the path references we acquired while holding
+   * the path lock earlier. */
+  for (i = 0; i < num_paths; ++i)
+    gst_object_unref (pathsi);
+  g_free (paths);
+
   return total_path_caps;
 }
 
@@ -1012,7 +1147,7 @@
       PROP_ELEMENT,
       g_param_spec_object ("element",
           "Element",
-          "The path's element (if set to NULL, this path will drop any incoming data)",
+          "The path's element (if set to NULL, this path passes through dataflow)",
           GST_TYPE_ELEMENT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
       );
   g_object_class_install_property (object_class,
@@ -1158,9 +1293,14 @@
     switch_bin_path->element = NULL;
   }
 
-  /* If there *is* a new element, use it. new_element == NULL is a valid case;
-   * a NULL element is used in dropping paths, which will just use the drop probe
-   * to drop buffers if they become the current path. */
+  /* If new_element is non-NULL, use it as the path's new element.
+   * If it is NULL, store that NULL pointer. Setting the path element
+   * to NULL is useful if the caller wants to manually remove the
+   * element from the path. (Setting it to NULL unparents & unrefs
+   * the path element.) It is also useful if the caller just wants
+   * to forward data unaltered in that path (switchbin's input_identity
+   * element will then have its srcpad be directly exposed as a ghost
+   * pad on the bin). */
   if (new_element != NULL) {
     gst_bin_add (GST_BIN (switch_bin_path->bin), new_element);
     switch_bin_path->element = new_element;

gst-plugins-bad-1.22.7.tar.xz/gst/switchbin/gstswitchbin.h -> gst-plugins-bad-1.24.5.tar.xz/gst/switchbin/gstswitchbin.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/timecode/gsttimecodestamper.c -> gst-plugins-bad-1.24.5.tar.xz/gst/timecode/gsttimecodestamper.c Changed

@@ -78,7 +78,7 @@
 #define DEFAULT_SET GST_TIME_CODE_STAMPER_SET_KEEP
 #define DEFAULT_AUTO_RESYNC TRUE
 #define DEFAULT_TIMEOUT GST_CLOCK_TIME_NONE
-#define DEFAULT_DROP_FRAME FALSE
+#define DEFAULT_DROP_FRAME TRUE
 #define DEFAULT_POST_MESSAGES FALSE
 #define DEFAULT_SET_INTERNAL_TIMECODE NULL
 #define DEFAULT_LTC_DAILY_JAM NULL
@@ -116,6 +116,7 @@
     GST_STATIC_CAPS ("audio/x-raw,format=U8,rate=1,max,channels=1")
     );
 
+static void gst_timecodestamper_finalize (GObject * object);
 static void gst_timecodestamper_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_timecodestamper_get_property (GObject * object, guint prop_id,
@@ -232,6 +233,7 @@
 
   gobject_class->set_property = gst_timecodestamper_set_property;
   gobject_class->get_property = gst_timecodestamper_get_property;
+  gobject_class->finalize = gst_timecodestamper_finalize;
   gobject_class->dispose = gst_timecodestamper_dispose;
 
   g_object_class_install_property (gobject_class, PROP_SOURCE,
@@ -403,6 +405,20 @@
 }
 
 static void
+gst_timecodestamper_finalize (GObject * object)
+{
+#if HAVE_LTC
+  GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (object);
+
+  g_cond_clear (&timecodestamper->ltc_cond_video);
+  g_cond_clear (&timecodestamper->ltc_cond_audio);
+  g_mutex_clear (&timecodestamper->mutex);
+#endif
+
+  G_OBJECT_CLASS (gst_timecodestamper_parent_class)->finalize (object);
+}
+
+static void
 gst_timecodestamper_dispose (GObject * object)
 {
   GstTimeCodeStamper *timecodestamper = GST_TIME_CODE_STAMPER (object);
@@ -433,9 +449,7 @@
     timecodestamper->rtc_tc = NULL;
   }
 #if HAVE_LTC
-  g_cond_clear (&timecodestamper->ltc_cond_video);
-  g_cond_clear (&timecodestamper->ltc_cond_audio);
-  g_mutex_clear (&timecodestamper->mutex);
+  g_mutex_lock (&timecodestamper->mutex);
   {
     TimestampedTimecode *tc;
     while ((tc = g_queue_pop_tail (&timecodestamper->ltc_current_tcs))) {
@@ -458,6 +472,7 @@
     gst_audio_stream_align_free (timecodestamper->stream_align);
     timecodestamper->stream_align = NULL;
   }
+  g_mutex_unlock (&timecodestamper->mutex);
 #endif
 
   G_OBJECT_CLASS (gst_timecodestamper_parent_class)->dispose (object);
@@ -1104,10 +1119,19 @@
   GstFlowReturn flow_ret = GST_FLOW_OK;
   GstVideoTimeCodeFlags tc_flags = 0;
 
-  if (timecodestamper->fps_n == 0 || timecodestamper->fps_d == 0
-      || !GST_BUFFER_PTS_IS_VALID (buffer)) {
-    gst_buffer_unref (buffer);
-    return GST_FLOW_NOT_NEGOTIATED;
+  if (timecodestamper->fps_n == 0 || timecodestamper->fps_d == 0) {
+    /* This can't actually happen I think - the caps template requires a framerate,
+     * so we'd have to receive a buffer without prior caps */
+    GST_ELEMENT_ERROR (timecodestamper, STREAM, FAILED,
+        ("Can't process without a framerate"),
+        ("Received a video buffer without framerate"));
+    return GST_FLOW_ERROR;
+  }
+  if (!GST_BUFFER_PTS_IS_VALID (buffer)) {
+    GST_ELEMENT_ERROR (timecodestamper, STREAM, FAILED,
+        ("Input video buffer has no timestamp"),
+        ("Video buffers must have timestamps"));
+    return GST_FLOW_ERROR;
   }
 #if HAVE_LTC
   if (timecodestamper->video_latency == -1

gst-plugins-bad-1.24.5.tar.xz/gst/unixfd Added

gst-plugins-bad-1.24.5.tar.xz/gst/unixfd/gstunixfd.c Added

@@ -0,0 +1,228 @@
+/* GStreamer unix file-descriptor source/sink
+ *
+ * Copyright (C) 2023 Netflix Inc.
+ *  Author: Xavier Claessens <xavier.claessens@collabora.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * plugin-unixfd:
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstunixfd.h"
+
+#include <gio/gunixfdmessage.h>
+#include <gio/gunixsocketaddress.h>
+
+typedef struct
+{
+  guint32 type;
+  guint32 payload_size;
+} Command;
+
+/* For backward compatibility, do not change the size of Command. It should have
+ * same size on 32bits and 64bits arches. */
+G_STATIC_ASSERT (sizeof (Command) == 8);
+G_STATIC_ASSERT (sizeof (MemoryPayload) == 16);
+G_STATIC_ASSERT (sizeof (NewBufferPayload) == 56);
+G_STATIC_ASSERT (sizeof (ReleaseBufferPayload) == 8);
+
+gboolean
+gst_unix_fd_send_command (GSocket * socket, CommandType type, GUnixFDList * fds,
+    const guint8 * payload, gsize payload_size, GError ** error)
+{
+  Command command = { type, payload_size };
+  GOutputVector vect = {
+    {&command, sizeof (Command)},
+    {payload, payload_size},
+  };
+  GSocketControlMessage *msg = NULL;
+  gint num_msg = 0;
+  gboolean ret = TRUE;
+
+  if (fds != NULL) {
+    msg = g_unix_fd_message_new_with_fd_list (fds);
+    num_msg++;
+  }
+
+  if (g_socket_send_message (socket, NULL, vect, G_N_ELEMENTS (vect),
+          &msg, num_msg, G_SOCKET_MSG_NONE, NULL, error) < 0) {
+    ret = FALSE;
+  }
+
+  g_clear_object (&msg);
+  return ret;
+}
+
+gboolean
+gst_unix_fd_receive_command (GSocket * socket, GCancellable * cancellable,
+    CommandType * type, GUnixFDList ** fds, guint8 ** payload,
+    gsize * payload_size, GError ** error)
+{
+  Command command;
+  GInputVector vect = { &command, sizeof (Command) };
+  GSocketControlMessage **msg = NULL;
+  gint num_msg = 0;
+  gint flags = G_SOCKET_MSG_NONE;
+  gboolean ret = TRUE;
+
+  if (g_socket_receive_message (socket, NULL, &vect, 1, &msg, &num_msg, &flags,
+          cancellable, error) <= 0) {
+    return FALSE;
+  }
+
+  *type = command.type;
+  *payload = NULL;
+  *payload_size = 0;
+
+  if (command.payload_size > 0) {
+    *payload = g_malloc (command.payload_size);
+    *payload_size = command.payload_size;
+    if (g_socket_receive (socket, (gchar *) * payload, command.payload_size,
+            cancellable, error) < (gssize) command.payload_size) {
+      g_clear_pointer (payload, g_free);
+      ret = FALSE;
+      goto out;
+    }
+  }
+
+  if (fds != NULL) {
+    *fds = NULL;
+    for (int i = 0; i < num_msg; i++) {
+      if (G_IS_UNIX_FD_MESSAGE (msgi)) {
+        if (*fds != NULL) {
+          g_set_error (error, GST_STREAM_ERROR, GST_STREAM_ERROR_FAILED,
+              "Received more than one fd message");
+          g_clear_pointer (payload, g_free);
+          g_clear_object (fds);
+          ret = FALSE;
+          goto out;
+        }
+        *fds = g_object_ref (g_unix_fd_message_get_fd_list ((GUnixFDMessage *)
+                msgi));
+      }
+    }
+  }
+
+out:
+  for (int i = 0; i < num_msg; i++)
+    g_object_unref (msgi);
+  g_free (msg);
+
+  return ret;
+}
+
+gboolean
+gst_unix_fd_parse_new_buffer (guint8 * payload, gsize payload_size,
+    NewBufferPayload ** new_buffer, guint32 * consumed)
+{
+  if (payload == NULL || payload_size < sizeof (NewBufferPayload))
+    return FALSE;
+
+  *new_buffer = (NewBufferPayload *) payload;
+  gsize struct_size =
+      sizeof (NewBufferPayload) +
+      sizeof (MemoryPayload) * (*new_buffer)->n_memory;
+  if (payload_size < struct_size)
+    return FALSE;
+
+  *consumed = struct_size;
+
+  return TRUE;
+}
+
+gboolean
+gst_unix_fd_parse_release_buffer (guint8 * payload, gsize payload_size,
+    ReleaseBufferPayload ** release_buffer)
+{
+  if (payload == NULL || payload_size < sizeof (ReleaseBufferPayload))
+    return FALSE;
+
+  *release_buffer = (ReleaseBufferPayload *) payload;
+
+  return TRUE;
+}
+
+gboolean
+gst_unix_fd_parse_caps (guint8 * payload, gsize payload_size, gchar ** caps_str)
+{
+  if (payload == NULL || payload_size < 1 || payloadpayload_size - 1 != '\0')
+    return FALSE;
+
+  *caps_str = (gchar *) payload;
+
+  return TRUE;
+}
+
+GSocket *
+gst_unix_fd_socket_new (const gchar * socket_path,
+    GUnixSocketAddressType socket_type, GSocketAddress ** address,
+    GError ** error)
+{
+  if (socket_path == NULL) {
+    g_set_error_literal (error, GST_STREAM_ERROR, GST_STREAM_ERROR_FAILED,
+        "Socket path is NULL");
+    return NULL;
+  }
+
+  switch (socket_type) {
+    case G_UNIX_SOCKET_ADDRESS_PATH:
+    case G_UNIX_SOCKET_ADDRESS_ABSTRACT:
+    case G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED:
+      *address =
+          g_unix_socket_address_new_with_type (socket_path, -1, socket_type);
+      break;
+    default:
+    {
+      gchar *str =
+          g_enum_to_string (G_TYPE_UNIX_SOCKET_ADDRESS_TYPE, socket_type);
+      g_set_error (error, GST_STREAM_ERROR, GST_STREAM_ERROR_FAILED,
+          "Unsupported UNIX socket type %s", str);
+      g_free (str);
+      return NULL;
+    }
+  }
+
+  GSocket *socket = g_socket_new (G_SOCKET_FAMILY_UNIX, G_SOCKET_TYPE_STREAM,
+      G_SOCKET_PROTOCOL_DEFAULT, error);
+  if (socket == NULL)
+    g_clear_object (address);
+  return socket;
+}
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  gboolean ret = FALSE;
+
+  ret |= GST_ELEMENT_REGISTER (unixfdsrc, plugin);
+  ret |= GST_ELEMENT_REGISTER (unixfdsink, plugin);
+
+  return ret;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    unixfd,
+    "Unix file descriptor sink and source",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

gst-plugins-bad-1.24.5.tar.xz/gst/unixfd/gstunixfd.h Added

@@ -0,0 +1,89 @@
+/* GStreamer unix file-descriptor source/sink
+ *
+ * Copyright (C) 2023 Netflix Inc.
+ *  Author: Xavier Claessens <xavier.claessens@collabora.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gio/gio.h>
+#include <gio/gunixfdlist.h>
+
+G_BEGIN_DECLS
+
+typedef enum
+{
+  COMMAND_TYPE_NEW_BUFFER = 0,
+  COMMAND_TYPE_RELEASE_BUFFER = 1,
+  COMMAND_TYPE_CAPS = 2,
+  COMMAND_TYPE_EOS = 3,
+} CommandType;
+
+typedef enum
+{
+  MEMORY_TYPE_DEFAULT = 0,
+  MEMORY_TYPE_DMABUF = 1,
+  MEMORY_TYPE_LAST,
+} MemoryType;
+
+typedef struct {
+  guint64 size;
+  guint64 offset;
+} MemoryPayload;
+
+typedef struct {
+  guint64 id;
+  guint64 pts;
+  guint64 dts;
+  guint64 duration;
+  guint64 offset;
+  guint64 offset_end;
+  guint32 flags;
+  guint8 type;
+  guint8 n_memory;
+  guint16 n_meta;
+  MemoryPayload memories;
+} NewBufferPayload;
+
+typedef struct {
+  guint64 id;
+} ReleaseBufferPayload;
+
+gboolean gst_unix_fd_send_command(GSocket * socket, CommandType type,
+    GUnixFDList * fds, const guint8 * payload, gsize payload_size,
+    GError ** error);
+gboolean gst_unix_fd_receive_command (GSocket *socket,
+    GCancellable *cancellable, CommandType *type, GUnixFDList **fds,
+    guint8 **payload, gsize *payload_size, GError **error);
+
+gboolean gst_unix_fd_parse_new_buffer (guint8 *payload, gsize payload_size,
+    NewBufferPayload **new_buffer, guint32 *consumed);
+gboolean gst_unix_fd_parse_release_buffer(guint8 *payload, gsize payload_size,
+    ReleaseBufferPayload **release_buffer);
+gboolean gst_unix_fd_parse_caps (guint8 *payload, gsize payload_size,
+    gchar **caps_str);
+
+GSocket *gst_unix_fd_socket_new(const gchar *socket_path,
+    GUnixSocketAddressType socket_type, GSocketAddress **address,
+    GError **error);
+
+GST_ELEMENT_REGISTER_DECLARE (unixfdsrc);
+GST_ELEMENT_REGISTER_DECLARE (unixfdsink);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/gst/unixfd/gstunixfdsink.c Added

@@ -0,0 +1,669 @@
+/* GStreamer unix file-descriptor source/sink
+ *
+ * Copyright (C) 2023 Netflix Inc.
+ *  Author: Xavier Claessens <xavier.claessens@collabora.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-unixfdsink
+ * @title: unixfdsink
+ *
+ * Send file-descriptor backed buffers (e.g. memfd, dmabuf) over unix socket to
+ * matching unixfdsrc. There can be any number of clients, if none are connected
+ * buffers are dropped.
+ *
+ * Buffers can have any number of #GstMemory, but it is an error if any one of
+ * them lacks a file-descriptor.
+ *
+ * #GstShmAllocator is added into the allocation proposition, which makes
+ * most sources write their data into shared memory automatically.
+ *
+ * ## Example launch lines
+ * |
+ * gst-launch-1.0 -v videotestsrc ! unixfdsink socket-path=/tmp/blah
+ * gst-launch-1.0 -v unixfdsrc socket-path=/tmp/blah ! autovideosink
+ * |
+ *
+ * Since: 1.24
+ */
+
+#include "gstunixfd.h"
+
+#include <gst/base/base.h>
+#include <gst/allocators/allocators.h>
+
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+#include <gio/gunixsocketaddress.h>
+
+GST_DEBUG_CATEGORY (unixfdsink_debug);
+#define GST_CAT_DEFAULT (unixfdsink_debug)
+
+static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
+
+#define GST_TYPE_UNIX_FD_SINK gst_unix_fd_sink_get_type()
+G_DECLARE_FINAL_TYPE (GstUnixFdSink, gst_unix_fd_sink, GST, UNIX_FD_SINK,
+    GstBaseSink);
+
+typedef struct
+{
+  GHashTable *buffers;
+  GSource *source;
+} Client;
+
+struct _GstUnixFdSink
+{
+  GstBaseSink parent;
+
+  GThread *thread;
+  GMainContext *context;
+  GMainLoop *loop;
+
+  gchar *socket_path;
+  GUnixSocketAddressType socket_type;
+  GSocket *socket;
+  GSource *source;
+
+  /* GSocket -> Client */
+  GHashTable *clients;
+  GstCaps *caps;
+  gboolean uses_monotonic_clock;
+  GByteArray *payload;
+};
+
+G_DEFINE_TYPE (GstUnixFdSink, gst_unix_fd_sink, GST_TYPE_BASE_SINK);
+GST_ELEMENT_REGISTER_DEFINE (unixfdsink, "unixfdsink", GST_RANK_NONE,
+    GST_TYPE_UNIX_FD_SINK);
+
+#define DEFAULT_SOCKET_TYPE G_UNIX_SOCKET_ADDRESS_PATH
+
+enum
+{
+  PROP_0,
+  PROP_SOCKET_PATH,
+  PROP_SOCKET_TYPE,
+};
+
+
+static void
+client_free (Client * client)
+{
+  g_hash_table_unref (client->buffers);
+  g_source_destroy (client->source);
+  g_source_unref (client->source);
+  g_free (client);
+}
+
+static void
+gst_unix_fd_sink_init (GstUnixFdSink * self)
+{
+  g_return_if_fail (GST_IS_UNIX_FD_SINK (self));
+
+  self->context = g_main_context_new ();
+  self->loop = g_main_loop_new (self->context, FALSE);
+  self->clients =
+      g_hash_table_new_full (NULL, NULL, g_object_unref,
+      (GDestroyNotify) client_free);
+}
+
+static void
+gst_unix_fd_sink_finalize (GObject * object)
+{
+  GstUnixFdSink *self = GST_UNIX_FD_SINK (object);
+
+  g_free (self->socket_path);
+  g_main_context_unref (self->context);
+  g_main_loop_unref (self->loop);
+  g_hash_table_unref (self->clients);
+
+  G_OBJECT_CLASS (gst_unix_fd_sink_parent_class)->finalize (object);
+}
+
+static void
+gst_unix_fd_sink_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstUnixFdSink *self = GST_UNIX_FD_SINK (object);
+
+  GST_OBJECT_LOCK (self);
+
+  switch (prop_id) {
+    case PROP_SOCKET_PATH:
+      if (self->socket) {
+        GST_WARNING_OBJECT (self,
+            "Can only change socket path in NULL or READY state");
+        break;
+      }
+      g_free (self->socket_path);
+      self->socket_path = g_value_dup_string (value);
+      break;
+    case PROP_SOCKET_TYPE:
+      if (self->socket) {
+        GST_WARNING_OBJECT (self,
+            "Can only change socket type in NULL or READY state");
+        break;
+      }
+      self->socket_type = g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+
+  GST_OBJECT_UNLOCK (self);
+}
+
+static void
+gst_unix_fd_sink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstUnixFdSink *self = GST_UNIX_FD_SINK (object);
+
+  GST_OBJECT_LOCK (self);
+
+  switch (prop_id) {
+    case PROP_SOCKET_PATH:
+      g_value_set_string (value, self->socket_path);
+      break;
+    case PROP_SOCKET_TYPE:
+      g_value_set_enum (value, self->socket_type);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+
+  GST_OBJECT_UNLOCK (self);
+}
+
+static gboolean
+incoming_command_cb (GSocket * socket, GIOCondition cond, gpointer user_data)
+{
+  GstUnixFdSink *self = user_data;
+  Client *client;
+  CommandType command;
+  guint8 *payload = NULL;
+  gsize payload_size;
+  GError *error = NULL;
+
+  GST_OBJECT_LOCK (self);
+
+  client = g_hash_table_lookup (self->clients, socket);
+
+  if (client == NULL) {
+    GST_ERROR_OBJECT (self, "Received data from unknown client");
+    goto on_error;
+  }
+
+  if (!gst_unix_fd_receive_command (socket, NULL, &command, NULL, &payload,
+          &payload_size, &error)) {
+    GST_DEBUG_OBJECT (self, "Failed to receive message from client %p: %s",
+        client, error != NULL ? error->message : "Connection closed by peer");
+    goto on_error;
+  }
+
+  switch (command) {
+    case COMMAND_TYPE_NEW_BUFFER:
+    case COMMAND_TYPE_CAPS:
+      GST_ERROR_OBJECT (self, "Received wrong command %d from client %p",
+          command, client);
+      goto on_error;
+    case COMMAND_TYPE_RELEASE_BUFFER:{
+      ReleaseBufferPayload *release_buffer;
+      if (!gst_unix_fd_parse_release_buffer (payload, payload_size,
+              &release_buffer)) {
+        GST_ERROR_OBJECT (self,
+            "Received release-buffer with wrong payload size from client %p",
+            client);
+        goto on_error;
+      }
+      /* id is actually the GstBuffer pointer casted to guint64.
+       * We can now drop its reference kept for this client. */
+      if (!g_hash_table_remove (client->buffers, (gpointer) release_buffer->id)) {
+        GST_ERROR_OBJECT (self,
+            "Received wrong id %" G_GUINT64_FORMAT
+            " in release-buffer command from client %p", release_buffer->id,
+            client);
+        goto on_error;
+      }
+      break;
+    }
+    default:
+      /* Protocol could have been extended with new command */
+      GST_DEBUG_OBJECT (self, "Ignoring unknown command %d", command);
+      break;
+  }
+
+  g_free (payload);
+  GST_OBJECT_UNLOCK (self);
+
+  return G_SOURCE_CONTINUE;
+
+on_error:
+  g_hash_table_remove (self->clients, socket);
+  g_clear_error (&error);
+  g_free (payload);
+  GST_OBJECT_UNLOCK (self);
+  return G_SOURCE_REMOVE;
+}
+
+static guint8 *
+caps_to_payload (GstCaps * caps, gsize * payload_size)
+{
+  gchar *payload = gst_caps_to_string (caps);
+  *payload_size = strlen (payload) + 1;
+  return (guint8 *) payload;
+}
+
+static gboolean
+new_client_cb (GSocket * socket, GIOCondition cond, gpointer user_data)
+{
+  GstUnixFdSink *self = user_data;
+  Client *client;
+  GError *error = NULL;
+
+  GSocket *client_socket = g_socket_accept (self->socket, NULL, &error);
+  if (client_socket == NULL) {
+    GST_ERROR_OBJECT (self, "Failed to accept connection: %s", error->message);
+    return G_SOURCE_CONTINUE;
+  }
+
+  client = g_new0 (Client, 1);
+  client->buffers =
+      g_hash_table_new_full (NULL, NULL, (GDestroyNotify) gst_buffer_unref,
+      NULL);
+  client->source = g_socket_create_source (client_socket, G_IO_IN, NULL);
+  g_source_set_callback (client->source, (GSourceFunc) incoming_command_cb,
+      self, NULL);
+  g_source_attach (client->source, self->context);
+
+  GST_OBJECT_LOCK (self);
+
+  GST_DEBUG_OBJECT (self, "New client %p", client);
+  g_hash_table_insert (self->clients, client_socket, client);
+
+  /* Start by sending our current caps. Keep the lock while doing that because
+   * we don't want this client to miss a caps event or receive a buffer while we
+   * send initial caps. */
+  gsize payload_size;
+  guint8 *payload = caps_to_payload (self->caps, &payload_size);
+  if (!gst_unix_fd_send_command (client_socket, COMMAND_TYPE_CAPS, NULL,
+          payload, payload_size, &error)) {
+    GST_ERROR_OBJECT (self, "Failed to send caps to new client %p: %s", client,
+        error->message);
+    g_hash_table_remove (self->clients, client_socket);
+    g_clear_error (&error);
+  }
+  g_free (payload);
+
+  GST_OBJECT_UNLOCK (self);
+
+  return G_SOURCE_CONTINUE;
+}
+
+static gpointer
+thread_cb (gpointer user_data)
+{
+  GstUnixFdSink *self = user_data;
+  g_main_loop_run (self->loop);
+  return NULL;
+}
+
+static gboolean
+gst_unix_fd_sink_start (GstBaseSink * bsink)
+{
+  GstUnixFdSink *self = (GstUnixFdSink *) bsink;
+  GSocketAddress *addr = NULL;
+  GError *error = NULL;
+  gboolean ret = TRUE;
+
+  GST_OBJECT_LOCK (self);
+
+  self->socket =
+      gst_unix_fd_socket_new (self->socket_path, self->socket_type, &addr,
+      &error);
+  if (self->socket == NULL) {
+    GST_ERROR_OBJECT (self, "Failed to create UNIX socket: %s", error->message);
+    ret = FALSE;
+    goto out;
+  }
+
+  if (!g_socket_bind (self->socket, addr, TRUE, &error)) {
+    GST_ERROR_OBJECT (self, "Failed to bind socket: %s", error->message);
+    g_clear_object (&self->socket);
+    ret = FALSE;
+    goto out;
+  }
+
+  if (!g_socket_listen (self->socket, &error)) {
+    GST_ERROR_OBJECT (self, "Failed to listen socket: %s", error->message);
+    g_clear_object (&self->socket);
+    ret = FALSE;
+    goto out;
+  }
+
+  self->source = g_socket_create_source (self->socket, G_IO_IN, NULL);
+  g_source_set_callback (self->source, (GSourceFunc) new_client_cb, self, NULL);
+  g_source_attach (self->source, self->context);
+
+  self->thread = g_thread_new ("unixfdsink", thread_cb, self);
+
+  /* Preallocate the minimum payload size for a buffer with a single memory and
+   * no metas. Chances are that every buffer will require roughly the same
+   * payload size, by reusing the same GByteArray we avoid reallocations. */
+  self->payload =
+      g_byte_array_sized_new (sizeof (NewBufferPayload) +
+      sizeof (MemoryPayload));
+
+out:
+  GST_OBJECT_UNLOCK (self);
+  g_clear_error (&error);
+  g_clear_object (&addr);
+  return ret;
+}
+
+static gboolean
+gst_unix_fd_sink_stop (GstBaseSink * bsink)
+{
+  GstUnixFdSink *self = (GstUnixFdSink *) bsink;
+
+  g_main_loop_quit (self->loop);
+  g_thread_join (self->thread);
+
+  g_source_destroy (self->source);
+  g_clear_pointer (&self->source, g_source_unref);
+  g_clear_object (&self->socket);
+  gst_clear_caps (&self->caps);
+  g_hash_table_remove_all (self->clients);
+  g_clear_pointer (&self->payload, g_byte_array_unref);
+
+  if (self->socket_type == G_UNIX_SOCKET_ADDRESS_PATH)
+    g_unlink (self->socket_path);
+
+  return TRUE;
+}
+
+static void
+send_command_to_all (GstUnixFdSink * self, CommandType type, GUnixFDList * fds,
+    const guint8 * payload, gsize payload_size, GstBuffer * buffer)
+{
+  GHashTableIter iter;
+  GSocket *socket;
+  Client *client;
+  GError *error = NULL;
+
+  g_hash_table_iter_init (&iter, self->clients);
+  while (g_hash_table_iter_next (&iter, (gpointer) & socket,
+          (gpointer) & client)) {
+    if (!gst_unix_fd_send_command (socket, type, fds, payload, payload_size,
+            &error)) {
+      GST_ERROR_OBJECT (self, "Failed to send command %d to client %p: %s",
+          type, client, error->message);
+      g_clear_error (&error);
+      g_hash_table_iter_remove (&iter);
+      continue;
+    }
+    /* Keep a ref on this buffer until all clients released it. */
+    if (buffer != NULL)
+      g_hash_table_add (client->buffers, gst_buffer_ref (buffer));
+  }
+}
+
+static GstClockTime
+to_monotonic (GstClockTime timestamp, const GstSegment * segment,
+    GstClockTime base_time, GstClockTime latency, GstClockTimeDiff clock_diff)
+{
+  if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
+    /* Convert running time to pipeline clock time */
+    gint res =
+        gst_segment_to_running_time_full (segment, GST_FORMAT_TIME, timestamp,
+        &timestamp);
+    if (res == 0)
+      return GST_CLOCK_TIME_NONE;
+    else if (res > 0)
+      timestamp += base_time;
+    else if (base_time > timestamp)
+      timestamp = base_time - timestamp;
+    else
+      timestamp = 0;
+    if (GST_CLOCK_TIME_IS_VALID (latency))
+      timestamp += latency;
+    /* Convert to system monotonic clock time */
+    if (clock_diff < 0 && -clock_diff > timestamp)
+      return 0;
+    timestamp += clock_diff;
+  }
+  return timestamp;
+}
+
+static guint16
+serialize_metas (GstBuffer * buffer, GByteArray * payload)
+{
+  gpointer state = NULL;
+  GstMeta *meta;
+  guint16 n_meta = 0;
+
+  while ((meta = gst_buffer_iterate_meta (buffer, &state)) != NULL) {
+    if (gst_meta_serialize_simple (meta, payload))
+      n_meta++;
+  }
+
+  return n_meta;
+}
+
+static GstFlowReturn
+gst_unix_fd_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
+{
+  GstUnixFdSink *self = (GstUnixFdSink *) bsink;
+  GstFlowReturn ret = GST_FLOW_OK;
+  GError *error = NULL;
+
+  guint n_memory = gst_buffer_n_memory (buffer);
+  gsize struct_size =
+      sizeof (NewBufferPayload) + sizeof (MemoryPayload) * n_memory;
+  g_byte_array_set_size (self->payload, struct_size);
+  guint32 n_meta = serialize_metas (buffer, self->payload);
+
+  GstClockTime latency = gst_base_sink_get_latency (GST_BASE_SINK_CAST (self));
+  GstClockTime base_time = gst_element_get_base_time (GST_ELEMENT_CAST (self));
+  GstClockTimeDiff clock_diff = 0;
+  if (!self->uses_monotonic_clock) {
+    clock_diff = GST_CLOCK_DIFF (g_get_monotonic_time () * GST_USECOND,
+        gst_clock_get_time (GST_ELEMENT_CLOCK (self)));
+  }
+
+  NewBufferPayload *new_buffer = (NewBufferPayload *) self->payload->data;
+  /* Cast buffer pointer to guint64 identifier. Client will send us back that
+   * id so we know which buffer to unref. */
+  new_buffer->id = (guint64) buffer;
+  new_buffer->pts =
+      to_monotonic (GST_BUFFER_PTS (buffer),
+      &GST_BASE_SINK_CAST (self)->segment, base_time, latency, clock_diff);
+  new_buffer->dts =
+      to_monotonic (GST_BUFFER_DTS (buffer),
+      &GST_BASE_SINK_CAST (self)->segment, base_time, latency, clock_diff);
+  new_buffer->duration = GST_BUFFER_DURATION (buffer);
+  new_buffer->offset = GST_BUFFER_OFFSET (buffer);
+  new_buffer->offset_end = GST_BUFFER_OFFSET_END (buffer);
+  new_buffer->flags = GST_BUFFER_FLAGS (buffer);
+  new_buffer->type = MEMORY_TYPE_DEFAULT;
+  new_buffer->n_memory = n_memory;
+  new_buffer->n_meta = n_meta;
+
+  if ((GST_BUFFER_PTS_IS_VALID (buffer)
+          && !GST_CLOCK_TIME_IS_VALID (new_buffer->pts))
+      || (GST_BUFFER_DTS_IS_VALID (buffer)
+          && !GST_CLOCK_TIME_IS_VALID (new_buffer->dts))) {
+    GST_ERROR_OBJECT (self,
+        "Could not convert buffer timestamp to running time");
+    return GST_FLOW_ERROR;
+  }
+
+  gboolean dmabuf_count = 0;
+  GUnixFDList *fds = g_unix_fd_list_new ();
+  for (int i = 0; i < n_memory; i++) {
+    GstMemory *mem = gst_buffer_peek_memory (buffer, i);
+    if (!gst_is_fd_memory (mem)) {
+      GST_ERROR_OBJECT (self, "Expecting buffers with FD memories");
+      ret = GST_FLOW_ERROR;
+      goto out;
+    }
+
+    if (gst_is_dmabuf_memory (mem))
+      dmabuf_count++;
+
+    if (g_unix_fd_list_append (fds, gst_fd_memory_get_fd (mem), &error) < 0) {
+      GST_ERROR_OBJECT (self, "Failed to append FD: %s", error->message);
+      ret = GST_FLOW_ERROR;
+      goto out;
+    }
+
+    gsize offset;
+    new_buffer->memoriesi.size = gst_memory_get_sizes (mem, &offset, NULL);
+    new_buffer->memoriesi.offset = offset;
+  }
+
+  if (dmabuf_count > 0 && dmabuf_count != n_memory) {
+    GST_ERROR_OBJECT (self, "Some but not all memories are DMABuf");
+    ret = GST_FLOW_ERROR;
+    goto out;
+  }
+
+  if (dmabuf_count > 0)
+    new_buffer->type = MEMORY_TYPE_DMABUF;
+
+  GST_OBJECT_LOCK (self);
+  send_command_to_all (self, COMMAND_TYPE_NEW_BUFFER, fds,
+      self->payload->data, self->payload->len, buffer);
+  GST_OBJECT_UNLOCK (self);
+
+out:
+  g_clear_object (&fds);
+  g_clear_error (&error);
+  return ret;
+}
+
+static gboolean
+gst_unix_fd_sink_event (GstBaseSink * bsink, GstEvent * event)
+{
+  GstUnixFdSink *self = (GstUnixFdSink *) bsink;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CAPS:{
+      GST_OBJECT_LOCK (self);
+      gst_clear_caps (&self->caps);
+      gst_event_parse_caps (event, &self->caps);
+      gst_caps_ref (self->caps);
+      GST_DEBUG_OBJECT (self, "Send new caps to all clients: %" GST_PTR_FORMAT,
+          self->caps);
+      gsize payload_size;
+      guint8 *payload = caps_to_payload (self->caps, &payload_size);
+      send_command_to_all (self, COMMAND_TYPE_CAPS, NULL, payload, payload_size,
+          NULL);
+      g_free (payload);
+      GST_OBJECT_UNLOCK (self);
+      break;
+    }
+    case GST_EVENT_EOS:{
+      GST_OBJECT_LOCK (self);
+      send_command_to_all (self, COMMAND_TYPE_EOS, NULL, NULL, 0, NULL);
+      GST_OBJECT_UNLOCK (self);
+      break;
+    }
+    default:
+      break;
+  }
+
+  return GST_BASE_SINK_CLASS (gst_unix_fd_sink_parent_class)->event (bsink,
+      event);
+}
+
+static gboolean
+gst_unix_fd_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
+{
+  GstAllocator *allocator = gst_shm_allocator_get ();
+  gst_query_add_allocation_param (query, allocator, NULL);
+  gst_object_unref (allocator);
+
+  return TRUE;
+}
+
+static gboolean
+gst_unix_fd_sink_set_clock (GstElement * element, GstClock * clock)
+{
+  GstUnixFdSink *self = (GstUnixFdSink *) element;
+
+  self->uses_monotonic_clock = FALSE;
+  if (clock != NULL && G_OBJECT_TYPE (clock) == GST_TYPE_SYSTEM_CLOCK) {
+    GstClockType clock_type;
+    g_object_get (clock, "clock-type", &clock_type, NULL);
+    self->uses_monotonic_clock = clock_type == GST_CLOCK_TYPE_MONOTONIC;
+  }
+
+  return GST_ELEMENT_CLASS (gst_unix_fd_sink_parent_class)->set_clock (element,
+      clock);
+}
+
+static void
+gst_unix_fd_sink_class_init (GstUnixFdSinkClass * klass)
+{
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GstElementClass *gstelement_class = (GstElementClass *) klass;
+  GstBaseSinkClass *gstbasesink_class = (GstBaseSinkClass *) klass;
+
+  GST_DEBUG_CATEGORY_INIT (unixfdsink_debug, "unixfdsink", 0,
+      "Unix file descriptor sink");
+  gst_element_class_set_static_metadata (gstelement_class,
+      "Unix file descriptor sink", "Sink", "Unix file descriptor sink",
+      "Xavier Claessens <xavier.claessens@collabora.com>");
+  gst_element_class_add_static_pad_template (gstelement_class, &sinktemplate);
+
+  gst_shm_allocator_init_once ();
+
+  gobject_class->finalize = gst_unix_fd_sink_finalize;
+  gobject_class->set_property = gst_unix_fd_sink_set_property;
+  gobject_class->get_property = gst_unix_fd_sink_get_property;
+
+  gstelement_class->set_clock = GST_DEBUG_FUNCPTR (gst_unix_fd_sink_set_clock);
+
+  gstbasesink_class->start = GST_DEBUG_FUNCPTR (gst_unix_fd_sink_start);
+  gstbasesink_class->stop = GST_DEBUG_FUNCPTR (gst_unix_fd_sink_stop);
+  gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_unix_fd_sink_render);
+  gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_unix_fd_sink_event);
+  gstbasesink_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_unix_fd_sink_propose_allocation);
+
+  g_object_class_install_property (gobject_class, PROP_SOCKET_PATH,
+      g_param_spec_string ("socket-path",
+          "Path to the control socket",
+          "The path to the control socket used to control the shared memory "
+          "transport. This may be modified during the NULL->READY transition",
+          NULL,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+          GST_PARAM_MUTABLE_READY));
+
+  g_object_class_install_property (gobject_class, PROP_SOCKET_TYPE,
+      g_param_spec_enum ("socket-type", "Socket type",
+          "The type of underlying socket",
+          G_TYPE_UNIX_SOCKET_ADDRESS_TYPE, DEFAULT_SOCKET_TYPE,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT |
+          GST_PARAM_MUTABLE_READY));
+}

gst-plugins-bad-1.24.5.tar.xz/gst/unixfd/gstunixfdsrc.c Added

@@ -0,0 +1,528 @@
+/* GStreamer unix file-descriptor source/sink
+ *
+ * Copyright (C) 2023 Netflix Inc.
+ *  Author: Xavier Claessens <xavier.claessens@collabora.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-unixfdsrc
+ * @title: unixfdsrc
+ *
+ * Receive file-descriptor backed buffers (e.g. memfd, dmabuf) over unix socket
+ * from matching unixfdsink.
+ *
+ * ## Example launch lines
+ * |
+ * gst-launch-1.0 -v videotestsrc ! unixfdsink socket-path=/tmp/blah
+ * gst-launch-1.0 -v unixfdsrc socket-path=/tmp/blah ! autovideosink
+ * |
+ *
+ * Since: 1.24
+ */
+
+#include "gstunixfd.h"
+
+#include <gst/base/base.h>
+#include <gst/allocators/allocators.h>
+
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+#include <gio/gunixsocketaddress.h>
+
+GST_DEBUG_CATEGORY (unixfdsrc_debug);
+#define GST_CAT_DEFAULT (unixfdsrc_debug)
+
+static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS_ANY);
+
+#define GST_TYPE_UNIX_FD_SRC gst_unix_fd_src_get_type()
+G_DECLARE_FINAL_TYPE (GstUnixFdSrc, gst_unix_fd_src, GST, UNIX_FD_SRC,
+    GstPushSrc);
+
+struct _GstUnixFdSrc
+{
+  GstPushSrc parent;
+
+  gchar *socket_path;
+  GUnixSocketAddressType socket_type;
+  GSocket *socket;
+  GCancellable *cancellable;
+
+  GstAllocator *allocatorsMEMORY_TYPE_LAST;
+  GHashTable *memories;
+  gboolean uses_monotonic_clock;
+};
+
+G_DEFINE_TYPE (GstUnixFdSrc, gst_unix_fd_src, GST_TYPE_PUSH_SRC);
+GST_ELEMENT_REGISTER_DEFINE (unixfdsrc, "unixfdsrc", GST_RANK_NONE,
+    GST_TYPE_UNIX_FD_SRC);
+
+#define DEFAULT_SOCKET_TYPE G_UNIX_SOCKET_ADDRESS_PATH
+
+enum
+{
+  PROP_0,
+  PROP_SOCKET_PATH,
+  PROP_SOCKET_TYPE,
+};
+
+typedef struct
+{
+  guint64 id;
+  guint n_memory;
+} BufferContext;
+
+static void
+release_buffer (GstUnixFdSrc * self, guint64 id)
+{
+  /* Notify that we are not using this buffer anymore */
+  ReleaseBufferPayload payload = { id };
+  GError *error = NULL;
+  if (!gst_unix_fd_send_command (self->socket, COMMAND_TYPE_RELEASE_BUFFER,
+          NULL, (guint8 *) & payload, sizeof (payload), &error)) {
+    GST_WARNING_OBJECT (self, "Failed to send release-buffer command: %s",
+        error->message);
+    g_clear_error (&error);
+  }
+}
+
+static void
+memory_weak_ref_cb (GstUnixFdSrc * self, GstMemory * mem)
+{
+  GST_OBJECT_LOCK (self);
+
+  BufferContext *ctx = g_hash_table_lookup (self->memories, mem);
+  if (ctx != NULL) {
+    if (--ctx->n_memory == 0) {
+      release_buffer (self, ctx->id);
+      g_free (ctx);
+    }
+    g_hash_table_remove (self->memories, mem);
+  }
+
+  GST_OBJECT_UNLOCK (self);
+}
+
+static void
+gst_unix_fd_src_init (GstUnixFdSrc * self)
+{
+  g_return_if_fail (GST_IS_UNIX_FD_SRC (self));
+
+  self->cancellable = g_cancellable_new ();
+  self->memories = g_hash_table_new (NULL, NULL);
+  self->allocators0 = gst_fd_allocator_new ();
+  self->allocators1 = gst_dmabuf_allocator_new ();
+  gst_base_src_set_live (GST_BASE_SRC (self), TRUE);
+}
+
+static void
+gst_unix_fd_src_finalize (GObject * object)
+{
+  GstUnixFdSrc *self = GST_UNIX_FD_SRC (object);
+
+  g_free (self->socket_path);
+  g_object_unref (self->cancellable);
+  g_hash_table_unref (self->memories);
+  for (int i = 0; i < MEMORY_TYPE_LAST; i++)
+    gst_object_unref (self->allocatorsi);
+
+  G_OBJECT_CLASS (gst_unix_fd_src_parent_class)->finalize (object);
+}
+
+static void
+gst_unix_fd_src_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstUnixFdSrc *self = GST_UNIX_FD_SRC (object);
+
+  GST_OBJECT_LOCK (self);
+
+  switch (prop_id) {
+    case PROP_SOCKET_PATH:
+      if (self->socket) {
+        GST_WARNING_OBJECT (self,
+            "Can only change socket path in NULL or READY state");
+        break;
+      }
+      g_free (self->socket_path);
+      self->socket_path = g_value_dup_string (value);
+      break;
+    case PROP_SOCKET_TYPE:
+      if (self->socket) {
+        GST_WARNING_OBJECT (self,
+            "Can only change socket type in NULL or READY state");
+        break;
+      }
+      self->socket_type = g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+
+  GST_OBJECT_UNLOCK (self);
+}
+
+static void
+gst_unix_fd_src_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstUnixFdSrc *self = GST_UNIX_FD_SRC (object);
+
+  GST_OBJECT_LOCK (self);
+
+  switch (prop_id) {
+    case PROP_SOCKET_PATH:
+      g_value_set_string (value, self->socket_path);
+      break;
+    case PROP_SOCKET_TYPE:
+      g_value_set_enum (value, self->socket_type);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+
+  GST_OBJECT_UNLOCK (self);
+}
+
+static gboolean
+gst_unix_fd_src_start (GstBaseSrc * bsrc)
+{
+  GstUnixFdSrc *self = (GstUnixFdSrc *) bsrc;
+  GSocketAddress *addr = NULL;
+  GError *error = NULL;
+  gboolean ret = TRUE;
+
+  gst_base_src_set_format (bsrc, GST_FORMAT_TIME);
+
+  GST_OBJECT_LOCK (self);
+
+  self->socket =
+      gst_unix_fd_socket_new (self->socket_path, self->socket_type, &addr,
+      &error);
+  if (self->socket == NULL) {
+    GST_ERROR_OBJECT (self, "Failed to create UNIX socket: %s", error->message);
+    ret = FALSE;
+    goto out;
+  }
+
+  if (!g_socket_connect (self->socket, addr, NULL, &error)) {
+    GST_ERROR_OBJECT (self, "Failed to connect socket: %s", error->message);
+    g_clear_object (&self->socket);
+    ret = FALSE;
+    goto out;
+  }
+
+out:
+  GST_OBJECT_UNLOCK (self);
+  g_clear_error (&error);
+  g_clear_object (&addr);
+  return ret;
+}
+
+static gboolean
+gst_unix_fd_src_stop (GstBaseSrc * bsrc)
+{
+  GstUnixFdSrc *self = (GstUnixFdSrc *) bsrc;
+
+  GST_OBJECT_LOCK (self);
+
+  /* Remove all weak refs we could still have to not be called back later.
+   * Service side will cleanup pending buffers when socket gets closed. */
+  GstMemory *mem;
+  BufferContext *ctx;
+  GHashTableIter iter;
+  g_hash_table_iter_init (&iter, self->memories);
+  while (g_hash_table_iter_next (&iter, (gpointer *) & mem, (gpointer *) & ctx)) {
+    gst_mini_object_weak_unref (GST_MINI_OBJECT_CAST (mem),
+        (GstMiniObjectNotify) memory_weak_ref_cb, self);
+    if (--ctx->n_memory == 0)
+      g_free (ctx);
+  }
+  g_hash_table_remove_all (self->memories);
+  g_clear_object (&self->socket);
+
+  GST_OBJECT_UNLOCK (self);
+
+  return TRUE;
+}
+
+static gboolean
+gst_unix_fd_src_unlock (GstBaseSrc * bsrc)
+{
+  GstUnixFdSrc *self = GST_UNIX_FD_SRC (bsrc);
+  g_cancellable_cancel (self->cancellable);
+  return TRUE;
+}
+
+static gboolean
+gst_unix_fd_src_unlock_stop (GstBaseSrc * bsrc)
+{
+  GstUnixFdSrc *self = GST_UNIX_FD_SRC (bsrc);
+  g_cancellable_reset (self->cancellable);
+  return TRUE;
+}
+
+static GstClockTime
+from_monotonic (GstClockTime timestamp, GstClockTime base_time,
+    GstClockTimeDiff clock_diff)
+{
+  if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
+    /* Convert from system monotonic clock time to pipeline clock time */
+    if (clock_diff > 0 && clock_diff > timestamp)
+      return 0;
+    timestamp -= clock_diff;
+    /* Convert to running time */
+    if (base_time > timestamp)
+      return 0;
+    timestamp -= base_time;
+  }
+  return timestamp;
+}
+
+static void
+close_and_free_fds (gint * fds, gint fds_len)
+{
+  for (int i = 0; i < fds_len; i++)
+    g_close (fdsi, NULL);
+  g_free (fds);
+}
+
+static GstFlowReturn
+gst_unix_fd_src_create (GstPushSrc * psrc, GstBuffer ** outbuf)
+{
+  GstUnixFdSrc *self = GST_UNIX_FD_SRC (psrc);
+  CommandType command;
+  GUnixFDList *fds = NULL;
+  guint8 *payload = NULL;
+  gsize payload_size;
+  GError *error = NULL;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+again:
+  /* Block until we receive a command */
+  if (!gst_unix_fd_receive_command (self->socket, self->cancellable, &command,
+          &fds, &payload, &payload_size, &error)) {
+    if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+      ret = GST_FLOW_FLUSHING;
+      goto on_error;
+    }
+    GST_ERROR_OBJECT (self, "Failed to read from sink element: %s",
+        error != NULL ? error->message : "Connection closed by peer");
+    ret = GST_FLOW_ERROR;
+    goto on_error;
+  }
+
+  switch (command) {
+    case COMMAND_TYPE_RELEASE_BUFFER:
+      GST_ERROR_OBJECT (self, "Received wrong command %d", command);
+      ret = GST_FLOW_ERROR;
+      goto on_error;
+    case COMMAND_TYPE_NEW_BUFFER:{
+      NewBufferPayload *new_buffer;
+      guint32 payload_off = 0;
+      if (!gst_unix_fd_parse_new_buffer (payload, payload_size, &new_buffer,
+              &payload_off)) {
+        GST_ERROR_OBJECT (self, "Received new-buffer with wrong payload size");
+        ret = GST_FLOW_ERROR;
+        goto on_error;
+      }
+
+      gint fds_arr_len = 0;
+      gint *fds_arr =
+          (fds != NULL) ? g_unix_fd_list_steal_fds (fds, &fds_arr_len) : NULL;
+      if (fds_arr_len != new_buffer->n_memory) {
+        GST_ERROR_OBJECT (self,
+            "Received new buffer command with %d file descriptors instead of "
+            "%d", fds_arr_len, new_buffer->n_memory);
+        ret = GST_FLOW_ERROR;
+        close_and_free_fds (fds_arr, fds_arr_len);
+        goto on_error;
+      }
+
+      if (new_buffer->type >= MEMORY_TYPE_LAST) {
+        GST_ERROR_OBJECT (self, "Unknown buffer type %d", new_buffer->type);
+        ret = GST_FLOW_ERROR;
+        close_and_free_fds (fds_arr, fds_arr_len);
+        goto on_error;
+      }
+      GstAllocator *allocator = self->allocatorsnew_buffer->type;
+
+      *outbuf = gst_buffer_new ();
+
+      GstClockTime base_time =
+          gst_element_get_base_time (GST_ELEMENT_CAST (self));
+      GstClockTimeDiff clock_diff = 0;
+      if (!self->uses_monotonic_clock) {
+        clock_diff = GST_CLOCK_DIFF (g_get_monotonic_time () * GST_USECOND,
+            gst_clock_get_time (GST_ELEMENT_CLOCK (self)));
+      }
+
+      GST_BUFFER_PTS (*outbuf) =
+          from_monotonic (new_buffer->pts, base_time, clock_diff);
+      GST_BUFFER_DTS (*outbuf) =
+          from_monotonic (new_buffer->dts, base_time, clock_diff);
+      GST_BUFFER_DURATION (*outbuf) = new_buffer->duration;
+      GST_BUFFER_OFFSET (*outbuf) = new_buffer->offset;
+      GST_BUFFER_OFFSET_END (*outbuf) = new_buffer->offset_end;
+      GST_BUFFER_FLAGS (*outbuf) = new_buffer->flags;
+
+      for (int i = 0; i < new_buffer->n_meta; i++) {
+        guint32 consumed = 0;
+        gst_meta_deserialize (*outbuf, (guint8 *) payload + payload_off,
+            payload_size - payload_off, &consumed);
+        if (consumed == 0) {
+          GST_ERROR_OBJECT (self, "Malformed meta serialization");
+          ret = GST_FLOW_ERROR;
+          close_and_free_fds (fds_arr, fds_arr_len);
+          gst_clear_buffer (outbuf);
+          goto on_error;
+        }
+        payload_off += consumed;
+      }
+
+      GST_OBJECT_LOCK (self);
+      if (new_buffer->n_memory > 0) {
+        BufferContext *ctx = g_new0 (BufferContext, 1);
+        ctx->id = new_buffer->id;
+        ctx->n_memory = new_buffer->n_memory;
+        for (int i = 0; i < new_buffer->n_memory; i++) {
+          GstMemory *mem = gst_fd_allocator_alloc (allocator, fds_arri,
+              new_buffer->memoriesi.size, GST_FD_MEMORY_FLAG_NONE);
+          gst_memory_resize (mem, new_buffer->memoriesi.offset,
+              new_buffer->memoriesi.size);
+          GST_MINI_OBJECT_FLAG_SET (mem, GST_MEMORY_FLAG_READONLY);
+
+          g_hash_table_insert (self->memories, mem, ctx);
+          gst_mini_object_weak_ref (GST_MINI_OBJECT_CAST (mem),
+              (GstMiniObjectNotify) memory_weak_ref_cb, self);
+
+          gst_buffer_append_memory (*outbuf, mem);
+        }
+      } else {
+        /* This buffer has no memories, we can release it immediately otherwise
+         * it gets leaked. */
+        release_buffer (self, new_buffer->id);
+      }
+      GST_OBJECT_UNLOCK (self);
+
+      g_free (fds_arr);
+
+      break;
+    }
+    case COMMAND_TYPE_CAPS:{
+      gchar *caps_str;
+      if (!gst_unix_fd_parse_caps (payload, payload_size, &caps_str)) {
+        GST_ERROR_OBJECT (self, "Received caps string is not nul-terminated");
+        ret = GST_FLOW_ERROR;
+        goto on_error;
+      }
+      GstCaps *caps = gst_caps_from_string (caps_str);
+      GST_DEBUG_OBJECT (self, "Received caps %" GST_PTR_FORMAT, caps);
+      gst_base_src_set_caps (GST_BASE_SRC_CAST (self), caps);
+      gst_caps_unref (caps);
+      break;
+    }
+    case COMMAND_TYPE_EOS:{
+      GST_DEBUG_OBJECT (self, "Received EOS");
+      ret = GST_FLOW_EOS;
+      break;
+    }
+    default:
+      /* Protocol could have been extended with new command */
+      GST_DEBUG_OBJECT (self, "Ignoring unknown command %d", command);
+      break;
+  }
+
+  if (*outbuf == NULL && ret == GST_FLOW_OK) {
+    g_clear_object (&fds);
+    g_clear_pointer (&payload, g_free);
+    goto again;
+  }
+
+on_error:
+  g_clear_error (&error);
+  g_clear_object (&fds);
+  g_free (payload);
+  return ret;
+}
+
+static gboolean
+gst_unix_fd_src_set_clock (GstElement * element, GstClock * clock)
+{
+  GstUnixFdSrc *self = (GstUnixFdSrc *) element;
+
+  self->uses_monotonic_clock = FALSE;
+  if (clock != NULL && G_OBJECT_TYPE (clock) == GST_TYPE_SYSTEM_CLOCK) {
+    GstClockType clock_type;
+    g_object_get (clock, "clock-type", &clock_type, NULL);
+    self->uses_monotonic_clock = clock_type == GST_CLOCK_TYPE_MONOTONIC;
+  }
+
+  return GST_ELEMENT_CLASS (gst_unix_fd_src_parent_class)->set_clock (element,
+      clock);
+}
+
+static void
+gst_unix_fd_src_class_init (GstUnixFdSrcClass * klass)
+{
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GstElementClass *gstelement_class = (GstElementClass *) klass;
+  GstBaseSrcClass *gstbasesrc_class = (GstBaseSrcClass *) klass;
+  GstPushSrcClass *gstpushsrc_class = (GstPushSrcClass *) klass;
+
+  GST_DEBUG_CATEGORY_INIT (unixfdsrc_debug, "unixfdsrc", 0,
+      "Unix file descriptor source");
+  gst_element_class_set_static_metadata (gstelement_class,
+      "Unix file descriptor source", "Src", "Unix file descriptor source",
+      "Xavier Claessens <xavier.claessens@collabora.com>");
+  gst_element_class_add_static_pad_template (gstelement_class, &srctemplate);
+
+  gobject_class->finalize = gst_unix_fd_src_finalize;
+  gobject_class->set_property = gst_unix_fd_src_set_property;
+  gobject_class->get_property = gst_unix_fd_src_get_property;
+
+  gstelement_class->set_clock = GST_DEBUG_FUNCPTR (gst_unix_fd_src_set_clock);
+
+  gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_unix_fd_src_start);
+  gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_unix_fd_src_stop);
+  gstbasesrc_class->unlock = GST_DEBUG_FUNCPTR (gst_unix_fd_src_unlock);
+  gstbasesrc_class->unlock_stop =
+      GST_DEBUG_FUNCPTR (gst_unix_fd_src_unlock_stop);
+
+  gstpushsrc_class->create = gst_unix_fd_src_create;
+
+  g_object_class_install_property (gobject_class, PROP_SOCKET_PATH,
+      g_param_spec_string ("socket-path",
+          "Path to the control socket",
+          "The path to the control socket used to control the shared memory "
+          "transport. This may be modified during the NULL->READY transition",
+          NULL,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+          GST_PARAM_MUTABLE_READY));
+
+  g_object_class_install_property (gobject_class, PROP_SOCKET_TYPE,
+      g_param_spec_enum ("socket-type", "Socket type",
+          "The type of underlying socket",
+          G_TYPE_UNIX_SOCKET_ADDRESS_TYPE, DEFAULT_SOCKET_TYPE,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT |
+          GST_PARAM_MUTABLE_READY));
+}

gst-plugins-bad-1.24.5.tar.xz/gst/unixfd/meson.build Added

gst-plugins-bad-1.22.7.tar.xz/gst/videoparsers/gstav1parse.c -> gst-plugins-bad-1.24.5.tar.xz/gst/videoparsers/gstav1parse.c Changed

@@ -110,6 +110,11 @@
   gchar *colorimetry;
   GstAV1Profile profile;
 
+  gint fps_n;
+  gint fps_d;
+  /* incaps framerate overwrites the AV1 time info */
+  gboolean has_input_fps;
+
   GstAV1ParseAligment in_align;
   gboolean detect_annex_b;
   GstAV1ParseAligment align;
@@ -641,7 +646,6 @@
   GstStructure *s = NULL;
   gint width, height;
   gint par_n = 0, par_d = 0;
-  gint fps_n = 0, fps_d = 0;
   const gchar *profile = NULL;
 
   if (G_UNLIKELY (!gst_pad_has_current_caps (GST_BASE_PARSE_SRC_PAD (self))))
@@ -685,14 +689,11 @@
     }
   }
 
-  if (s && gst_structure_has_field (s, "framerate")) {
-    gst_structure_get_fraction (s, "framerate", &fps_n, &fps_d);
-  }
-
-  if (fps_n > 0 && fps_d > 0) {
+  if (self->fps_n > 0 && self->fps_d > 0) {
     gst_caps_set_simple (final_caps, "framerate",
-        GST_TYPE_FRACTION, fps_n, fps_d, NULL);
-    gst_base_parse_set_frame_rate (GST_BASE_PARSE (self), fps_n, fps_d, 0, 0);
+        GST_TYPE_FRACTION, self->fps_n, self->fps_d, NULL);
+    gst_base_parse_set_frame_rate (GST_BASE_PARSE (self),
+        self->fps_n, self->fps_d, 0, 0);
   }
 
   /* When not RGB, the chroma format is needed. */
@@ -878,6 +879,15 @@
   if (profile)
     self->profile = gst_av1_parse_profile_from_string (profile);
 
+  if (gst_structure_has_field (str, "framerate")) {
+    gst_structure_get_fraction (str, "framerate", &self->fps_n, &self->fps_d);
+    self->has_input_fps = TRUE;
+  } else {
+    self->fps_n = 0;
+    self->fps_d = 1;
+    self->has_input_fps = FALSE;
+  }
+
   /* get upstream align from caps */
   align = gst_av1_parse_alignment_from_caps (caps);
   if (align == GST_AV1_PARSE_ALIGN_ERROR) {
@@ -1195,6 +1205,34 @@
   }
 }
 
+static void
+gst_av1_parse_calculate_framerate (GstAV1TimingInfo * ti,
+    gint * fps_n, gint * fps_d)
+{
+  /* To calculate framerate, we use this formula:
+   *
+   *              time_scale                             1
+   * fps = -------------------------  x  ---------------------------------
+   *       num_units_in_display_tick     num_ticks_per_picture_minus_1 + 1
+   */
+  if (ti->equal_picture_interval) {
+    gint gcd;
+
+    *fps_n = ti->time_scale;
+    *fps_d = ti->num_units_in_display_tick *
+        (ti->num_ticks_per_picture_minus_1 + 1);
+
+    gcd = gst_util_greatest_common_divisor (*fps_n, *fps_d);
+    if (gcd) {
+      *fps_n /= gcd;
+      *fps_d /= gcd;
+    }
+  } else {
+    *fps_n = 0;
+    *fps_d = 1;
+  }
+}
+
 static GstAV1ParserResult
 gst_av1_parse_handle_sequence_obu (GstAV1Parse * self, GstAV1OBU * obu)
 {
@@ -1270,8 +1308,20 @@
     self->update_caps = TRUE;
   }
 
+  if (!self->has_input_fps) {
+    gint fps_n, fps_d;
+
+    gst_av1_parse_calculate_framerate (&seq_header.timing_info, &fps_n, &fps_d);
+
+    if (self->fps_n != fps_n || self->fps_d != fps_d) {
+      self->fps_n = fps_n;
+      self->fps_d = fps_d;
+      self->update_caps = TRUE;
+    }
+  }
+
   val = (self->parser->state.operating_point_idc >> 8) & 0x0f;
-  for (i = 0; i < (1 << GST_AV1_MAX_SPATIAL_LAYERS); i++) {
+  for (i = 0; i < GST_AV1_MAX_NUM_SPATIAL_LAYERS; i++) {
     if (val & (1 << i))
       self->highest_spatial_id = i;
   }

gst-plugins-bad-1.22.7.tar.xz/gst/videoparsers/gsth264parse.c -> gst-plugins-bad-1.24.5.tar.xz/gst/videoparsers/gsth264parse.c Changed

@@ -212,7 +212,8 @@
 {
   GstH264Parse *h264parse = GST_H264_PARSE (object);
 
-  gst_video_user_data_unregistered_clear (&h264parse->user_data_unregistered);
+  gst_video_clear_user_data_unregistered (&h264parse->user_data_unregistered,
+      TRUE);
 
   g_object_unref (h264parse->frame_out);
 
@@ -241,6 +242,9 @@
   h264parse->have_pps_in_frame = FALSE;
   h264parse->have_aud_in_frame = FALSE;
   gst_adapter_clear (h264parse->frame_out);
+  gst_video_clear_user_data (&h264parse->user_data);
+  gst_video_clear_user_data_unregistered (&h264parse->user_data_unregistered,
+      FALSE);
 }
 
 static void
@@ -803,7 +807,7 @@
               if (sei.payload.frame_packing.spatial_flipping_flag) {
                 /* One of the views is flopped. */
                 if (sei.payload.frame_packing.frame0_flipped_flag !=
-                    ! !(mview_flags &
+                    !!(mview_flags &
                         GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST))
                   /* the left view is flopped */
                   mview_flags |= GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLOPPED;
@@ -816,7 +820,7 @@
               if (sei.payload.frame_packing.spatial_flipping_flag) {
                 /* One of the views is flipped, */
                 if (sei.payload.frame_packing.frame0_flipped_flag !=
-                    ! !(mview_flags &
+                    !!(mview_flags &
                         GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST))
                   /* the left view is flipped */
                   mview_flags |= GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLIPPED;
@@ -1417,9 +1421,8 @@
         }
         break;
       case GST_H264_PARSER_NO_NAL:
-        /* Start code may have up to 4 bytes */
-        *skipsize = size - 4;
-        goto skip;
+        /* we don't have enough bytes to make any decisions yet */
+        goto more;
         break;
       default:
         /* should not really occur either */
@@ -1443,6 +1446,13 @@
         GST_DEBUG_OBJECT (h264parse, "complete nal (offset, size): (%u, %u) ",
             nalu.offset, nalu.size);
         break;
+      case GST_H264_PARSER_NO_NAL:
+        /* In NAL alignment, assume the NAL is broken */
+        if (h264parse->in_align == GST_H264_PARSE_ALIGN_NAL ||
+            h264parse->in_align == GST_H264_PARSE_ALIGN_AU) {
+          goto broken;
+        }
+        goto more;
       case GST_H264_PARSER_NO_NAL_END:
         /* In NAL alignment, assume the NAL is complete */
         if (h264parse->in_align == GST_H264_PARSE_ALIGN_NAL ||
@@ -1476,10 +1486,6 @@
         GST_ELEMENT_ERROR (h264parse, STREAM, FORMAT,
             ("Error parsing H.264 stream"), ("Invalid H.264 stream"));
         goto invalid_stream;
-      case GST_H264_PARSER_NO_NAL:
-        GST_ELEMENT_ERROR (h264parse, STREAM, FORMAT,
-            ("Error parsing H.264 stream"), ("No H.264 NAL unit found"));
-        goto invalid_stream;
       case GST_H264_PARSER_BROKEN_DATA:
         GST_WARNING_OBJECT (h264parse, "input stream is corrupt; "
             "it contains a NAL unit of length %u", nalu.size);
@@ -2040,30 +2046,6 @@
   }
 }
 
-typedef enum
-{
-  GST_H264_LEVEL_L1 = 10,
-  GST_H264_LEVEL_L1B = 9,
-  GST_H264_LEVEL_L1_1 = 11,
-  GST_H264_LEVEL_L1_2 = 12,
-  GST_H264_LEVEL_L1_3 = 13,
-  GST_H264_LEVEL_L2_0 = 20,
-  GST_H264_LEVEL_L2_1 = 21,
-  GST_H264_LEVEL_L2_2 = 22,
-  GST_H264_LEVEL_L3 = 30,
-  GST_H264_LEVEL_L3_1 = 31,
-  GST_H264_LEVEL_L3_2 = 32,
-  GST_H264_LEVEL_L4 = 40,
-  GST_H264_LEVEL_L4_1 = 41,
-  GST_H264_LEVEL_L4_2 = 42,
-  GST_H264_LEVEL_L5 = 50,
-  GST_H264_LEVEL_L5_1 = 51,
-  GST_H264_LEVEL_L5_2 = 52,
-  GST_H264_LEVEL_L6 = 60,
-  GST_H264_LEVEL_L6_1 = 61,
-  GST_H264_LEVEL_L6_2 = 62,
-} GstH264Level;
-
 typedef struct
 {
   GstH264Level level;
@@ -2076,7 +2058,7 @@
   {GST_H264_LEVEL_L1_1, 768000},
   {GST_H264_LEVEL_L1_2, 1536000},
   {GST_H264_LEVEL_L1_3, 3041280},
-  {GST_H264_LEVEL_L2_0, 3041280},
+  {GST_H264_LEVEL_L2, 3041280},
   {GST_H264_LEVEL_L2_1, 5068800},
   {GST_H264_LEVEL_L2_2, 5184000},
   {GST_H264_LEVEL_L3, 10368000},
@@ -3230,6 +3212,7 @@
   GstEvent *event;
   GstBuffer *parse_buffer = NULL;
   gboolean is_interlaced = FALSE;
+  GstH264SPS *sps;
 
   h264parse = GST_H264_PARSE (parse);
 
@@ -3391,15 +3374,24 @@
     parse_buffer = frame->buffer = gst_buffer_make_writable (frame->buffer);
   }
 
-  if (!gst_buffer_get_video_time_code_meta (parse_buffer)) {
+  sps = h264parse->nalparser->last_sps;
+  if (sps && sps->vui_parameters_present_flag &&
+      sps->vui_parameters.timing_info_present_flag &&
+      sps->vui_parameters.time_scale > 0 &&
+      sps->vui_parameters.num_units_in_tick > 0 &&
+      h264parse->parsed_fps_n > 0 && h264parse->parsed_fps_d > 0 &&
+      !gst_buffer_get_video_time_code_meta (parse_buffer)) {
     guint i = 0;
+    GstH264VUIParams *vui = &sps->vui_parameters;
 
     for (i = 0; i < 3 && h264parse->num_clock_timestamp; i++) {
       GstH264ClockTimestamp *tim =
           &h264parse->pic_timing_sei.clock_timestampi;
       gint field_count = -1;
-      guint n_frames;
+      guint64 n_frames_tmp;
+      guint n_frames = G_MAXUINT32;
       GstVideoTimeCodeFlags flags = 0;
+      guint64 scale_n, scale_d;
 
       if (!h264parse->pic_timing_sei.clock_timestamp_flagi)
         continue;
@@ -3446,22 +3438,58 @@
         is_interlaced = TRUE;
       }
 
-      n_frames =
-          gst_util_uint64_scale_int (tim->n_frames, 1,
-          2 - tim->nuit_field_based_flag);
+      /* Equation D-1 (without and tOffset)
+       *
+       * clockTimestamp = ( ( hH * 60 + mM ) * 60 + sS ) * time_scale +
+       *                  nFrames * ( num_units_in_tick * ( 1 + nuit_field_based_flag ) )
+       * => timestamp = clockTimestamp / time_scale
+       *
+       * <taking only frame part>
+       * timestamp = nFrames * ( num_units_in_tick * ( 1 + nuit_field_based_flag ) ) / time_scale
+       *
+       * <timecode's timestamp of frame part>
+       * timecode_timestamp = n_frames * fps_d / fps_n
+       *
+       * <Scaling Equation>
+       * n_frames = nFrames * ( num_units_in_tick * ( 1 + nuit_field_based_flag ) ) / time_scale
+       *            * fps_n / fps_d
+       *
+       *                       fps_n * ( num_units_in_tick * ( 1 + nuit_field_based_flag ) )
+       *          = nFrames * --------------------------------------------------------------
+       *                       fps_d * time_scale
+       *
+       * NOTE: "time_scale / num_units_in_tick" value is expected field rate
+       * (i.e., framerate = time_scale / (2 * num_units_in_tick)), so the above
+       * equation can be simplified if the bitstream is conveying field rate
+       * using time_scale / num_units_in_tick
+       * => "n_frames = nFrames * (1 + nuit_field_based_flag) / 2".
+       */
+      scale_n = (guint64) h264parse->parsed_fps_n * vui->num_units_in_tick;
+      scale_d = (guint64) h264parse->parsed_fps_d * vui->time_scale;
+
+      n_frames_tmp = gst_util_uint64_scale (tim->n_frames, scale_n, scale_d);
+      if (n_frames_tmp <= G_MAXUINT32) {
+        if (tim->nuit_field_based_flag)
+          n_frames_tmp *= 2;
 
-      GST_LOG_OBJECT (h264parse,
-          "Add time code meta %02u:%02u:%02u:%02u",
-          tim->hours_value, tim->minutes_value, tim->seconds_value, n_frames);
+        if (n_frames_tmp <= G_MAXUINT32)
+          n_frames = (guint) n_frames_tmp;
+      }
+
+      if (n_frames != G_MAXUINT32) {
+        GST_LOG_OBJECT (h264parse,
+            "Add time code meta %02u:%02u:%02u:%02u",
+            tim->hours_value, tim->minutes_value, tim->seconds_value, n_frames);
 
-      gst_buffer_add_video_time_code_meta_full (parse_buffer,
-          h264parse->parsed_fps_n,
-          h264parse->parsed_fps_d,
-          NULL,
-          flags,
-          tim->hours_flag ? tim->hours_value : 0,
-          tim->minutes_flag ? tim->minutes_value : 0,
-          tim->seconds_flag ? tim->seconds_value : 0, n_frames, field_count);
+        gst_buffer_add_video_time_code_meta_full (parse_buffer,
+            h264parse->parsed_fps_n,
+            h264parse->parsed_fps_d,
+            NULL,
+            flags,
+            tim->hours_flag ? tim->hours_value : 0,
+            tim->minutes_flag ? tim->minutes_value : 0,
+            tim->seconds_flag ? tim->seconds_value : 0, n_frames, field_count);
+      }
     }
 
     h264parse->num_clock_timestamp = 0;
@@ -3528,11 +3556,13 @@
   if (format == GST_H264_PARSE_FORMAT_NONE) {
     /* codec_data implies avc */
     if (codec_data_value != NULL) {
-      GST_ERROR ("video/x-h264 caps with codec_data but no stream-format=avc");
+      GST_WARNING_OBJECT (h264parse, "video/x-h264 caps with codec_data "
+          "but no stream-format=avc");
       format = GST_H264_PARSE_FORMAT_AVC;
     } else {
       /* otherwise assume bytestream input */
-      GST_ERROR ("video/x-h264 caps without codec_data or stream-format");
+      GST_WARNING_OBJECT (h264parse, "video/x-h264 caps without codec_data "
+          "or stream-format");
       format = GST_H264_PARSE_FORMAT_BYTE;
     }
   }

gst-plugins-bad-1.22.7.tar.xz/gst/videoparsers/gsth265parse.c -> gst-plugins-bad-1.24.5.tar.xz/gst/videoparsers/gsth265parse.c Changed

@@ -121,6 +121,9 @@
 static void
 gst_h265_parse_process_sei_user_data (GstH265Parse * h265parse,
     GstH265RegisteredUserData * rud);
+static void
+gst_h265_parse_process_sei_user_data_unregistered (GstH265Parse * h265parse,
+    GstH265UserDataUnregistered * urud);
 
 static void
 gst_h265_parse_class_init (GstH265ParseClass * klass)
@@ -179,6 +182,9 @@
 {
   GstH265Parse *h265parse = GST_H265_PARSE (object);
 
+  gst_video_clear_user_data_unregistered (&h265parse->user_data_unregistered,
+      TRUE);
+
   g_object_unref (h265parse->frame_out);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -203,6 +209,9 @@
   h265parse->have_sps_in_frame = FALSE;
   h265parse->have_pps_in_frame = FALSE;
   gst_adapter_clear (h265parse->frame_out);
+  gst_video_clear_user_data (&h265parse->user_data);
+  gst_video_clear_user_data_unregistered (&h265parse->user_data_unregistered,
+      FALSE);
 }
 
 static void
@@ -581,6 +590,10 @@
         gst_h265_parse_process_sei_user_data (h265parse,
             &sei.payload.registered_user_data);
         break;
+      case GST_H265_SEI_USER_DATA_UNREGISTERED:
+        gst_h265_parse_process_sei_user_data_unregistered (h265parse,
+            &sei.payload.user_data_unregistered);
+        break;
       case GST_H265_SEI_BUF_PERIOD:
         /* FIXME */
         break;
@@ -709,6 +722,21 @@
 
 }
 
+static void
+gst_h265_parse_process_sei_user_data_unregistered (GstH265Parse * h265parse,
+    GstH265UserDataUnregistered * urud)
+{
+  GstByteReader br;
+
+  if (urud->data == NULL || urud->size < 1)
+    return;
+
+  gst_byte_reader_init (&br, urud->data, urud->size);
+
+  gst_video_parse_user_data_unregistered ((GstElement *) h265parse,
+      &h265parse->user_data_unregistered, &br, urud->uuid);
+}
+
 /* caller guarantees 2 bytes of nal payload */
 static gboolean
 gst_h265_parse_process_nal (GstH265Parse * h265parse, GstH265NalUnit * nalu)
@@ -1622,25 +1650,25 @@
     return digit_to_string (level_idc / 30);
   else {
     switch (level_idc) {
-      case 63:
+      case GST_H265_LEVEL_L2_1:
         return "2.1";
         break;
-      case 93:
+      case GST_H265_LEVEL_L3_1:
         return "3.1";
         break;
-      case 123:
+      case GST_H265_LEVEL_L4_1:
         return "4.1";
         break;
-      case 153:
+      case GST_H265_LEVEL_L5_1:
         return "5.1";
         break;
-      case 156:
+      case GST_H265_LEVEL_L5_2:
         return "5.2";
         break;
-      case 183:
+      case GST_H265_LEVEL_L6_1:
         return "6.1";
         break;
-      case 186:
+      case GST_H265_LEVEL_L6_2:
         return "6.2";
         break;
       default:
@@ -2887,6 +2915,7 @@
   GstBuffer *buffer;
   GstEvent *event;
   GstBuffer *parse_buffer = NULL;
+  GstH265SPS *sps;
 
   h265parse = GST_H265_PARSE (parse);
 
@@ -3020,13 +3049,21 @@
       break;
   }
 
-  {
+  sps = h265parse->nalparser->last_sps;
+  if (sps && sps->vui_parameters_present_flag &&
+      sps->vui_params.timing_info_present_flag &&
+      sps->vui_params.time_scale > 0 &&
+      sps->vui_params.num_units_in_tick > 0 &&
+      !gst_buffer_get_video_time_code_meta (parse_buffer)) {
     guint i = 0;
+    GstH265VUIParams *vui = &sps->vui_params;
 
     for (i = 0; i < h265parse->time_code.num_clock_ts; i++) {
       gint field_count = -1;
-      guint n_frames;
+      guint64 n_frames_tmp;
+      guint n_frames = G_MAXUINT32;
       GstVideoTimeCodeFlags flags = 0;
+      guint64 scale_n, scale_d;
 
       if (!h265parse->time_code.clock_timestamp_flagi)
         break;
@@ -3077,27 +3114,62 @@
       if (h265parse->sei_pic_struct != GST_H265_SEI_PIC_STRUCT_FRAME)
         flags |= GST_VIDEO_TIME_CODE_FLAGS_INTERLACED;
 
-      n_frames =
-          gst_util_uint64_scale_int (h265parse->time_code.n_framesi, 1,
-          2 - h265parse->time_code.units_field_based_flagi);
-
-      gst_buffer_add_video_time_code_meta_full (parse_buffer,
-          h265parse->parsed_fps_n,
-          h265parse->parsed_fps_d,
-          NULL,
-          flags,
-          h265parse->time_code.hours_flagi ? h265parse->time_code.
-          hours_valuei : 0,
-          h265parse->time_code.minutes_flagi ? h265parse->time_code.
-          minutes_valuei : 0,
-          h265parse->time_code.seconds_flagi ? h265parse->time_code.
-          seconds_valuei : 0, n_frames, field_count);
+      /* Equation D-26 (without and tOffset)
+       *
+       * clockTimestampi = ( ( hH * 60 + mM ) * 60 + sS ) * vui_time_scale +
+       *                  nFrames * ( vui_num_units_in_tick * ( 1 + unit_field_based_flagi ) )
+       * => timestamp = clockTimestamp / time_scale
+       *
+       * <taking only frame part>
+       * timestamp = nFrames * ( vui_num_units_in_tick * ( 1 + unit_field_based_flag ) ) / vui_time_scale
+       *
+       * <timecode's timestamp of frame part>
+       * timecode_timestamp = n_frames * fps_d / fps_n
+       *
+       * <Scaling Equation>
+       * n_frames = nFrames * ( vui_num_units_in_tick * ( 1 + unit_field_based_flag ) ) / vui_time_scale
+       *            * fps_n / fps_d
+       *
+       *                       fps_n * ( vui_num_units_in_tick * ( 1 + unit_field_based_flag ) )
+       *          = nFrames * ------------------------------------------------------------------
+       *                       fps_d * vui_time_scale
+       */
+      scale_n = (guint64) h265parse->parsed_fps_n * vui->num_units_in_tick;
+      scale_d = (guint64) h265parse->parsed_fps_d * vui->time_scale;
+
+      n_frames_tmp =
+          gst_util_uint64_scale_int (h265parse->time_code.n_framesi, scale_n,
+          scale_d);
+      if (n_frames_tmp <= G_MAXUINT32) {
+        if (h265parse->time_code.units_field_based_flagi)
+          n_frames_tmp *= 2;
+
+        if (n_frames_tmp <= G_MAXUINT32)
+          n_frames = (guint) n_frames_tmp;
+      }
+
+      if (n_frames != G_MAXUINT32) {
+        gst_buffer_add_video_time_code_meta_full (parse_buffer,
+            h265parse->parsed_fps_n,
+            h265parse->parsed_fps_d,
+            NULL,
+            flags,
+            h265parse->time_code.hours_flagi ? h265parse->time_code.
+            hours_valuei : 0,
+            h265parse->time_code.minutes_flagi ? h265parse->time_code.
+            minutes_valuei : 0,
+            h265parse->time_code.seconds_flagi ? h265parse->time_code.
+            seconds_valuei : 0, n_frames, field_count);
+      }
     }
   }
 
   gst_video_push_user_data ((GstElement *) h265parse, &h265parse->user_data,
       parse_buffer);
 
+  gst_video_push_user_data_unregistered ((GstElement *) h265parse,
+      &h265parse->user_data_unregistered, parse_buffer);
+
   gst_h265_parse_reset_frame (h265parse);
 
   return GST_FLOW_OK;
@@ -3110,12 +3182,10 @@
   GstStructure *str;
   const GValue *value;
   GstBuffer *codec_data = NULL;
-  gsize off, size;
   guint format, align;
-  guint num_nals, i, j;
-  GstH265NalUnit nalu;
   GstH265ParserResult parseres;
   GstCaps *old_caps;
+  GstH265DecoderConfigRecord *config = NULL;
 
   h265parse = GST_H265_PARSE (parse);
 
@@ -3146,8 +3216,7 @@
   if (format != GST_H265_PARSE_FORMAT_BYTE &&
       (value = gst_structure_get_value (str, "codec_data"))) {
     GstMapInfo map;
-    guint8 *data;
-    guint num_nal_arrays;
+    guint i, j;
 
     GST_DEBUG_OBJECT (h265parse, "have packetized h265");
     /* make note for optional split processing */
@@ -3157,62 +3226,32 @@
     if (!codec_data)
       goto wrong_type;
     gst_buffer_map (codec_data, &map, GST_MAP_READ);
-    data = map.data;
-    size = map.size;
 
-    /* parse the hvcC data */
-    if (size < 23) {
-      gst_buffer_unmap (codec_data, &map);
-      goto hvcc_too_small;
-    }
-    /* parse the version, this must be one but
-     * is zero until the spec is finalized */
-    if (data0 != 0 && data0 != 1) {
+    parseres =
+        gst_h265_parser_parse_decoder_config_record (h265parse->nalparser,
+        map.data, map.size, &config);
+    if (parseres != GST_H265_PARSER_OK) {
       gst_buffer_unmap (codec_data, &map);
-      goto wrong_version;
+      goto hvcc_failed;
     }
 
-    h265parse->nal_length_size = (data21 & 0x03) + 1;
+    h265parse->nal_length_size = config->length_size_minus_one + 1;
     GST_DEBUG_OBJECT (h265parse, "nal length size %u",
         h265parse->nal_length_size);
 
-    num_nal_arrays = data22;
-    off = 23;
+    for (i = 0; i < config->nalu_array->len; i++) {
+      GstH265DecoderConfigRecordNalUnitArray *array =
+          &g_array_index (config->nalu_array,
+          GstH265DecoderConfigRecordNalUnitArray, i);
 
-    for (i = 0; i < num_nal_arrays; i++) {
-      guint8 nalu_type;
+      for (j = 0; j < array->nalu->len; j++) {
+        GstH265NalUnit *nalu = &g_array_index (array->nalu, GstH265NalUnit, j);
 
-      if (off + 3 >= size) {
-        gst_buffer_unmap (codec_data, &map);
-        goto hvcc_too_small;
-      }
-
-      nalu_type = dataoff & 0x3f;
-      num_nals = GST_READ_UINT16_BE (data + off + 1);
-      off += 3;
-      for (j = 0; j < num_nals; j++) {
-        parseres = gst_h265_parser_identify_nalu_hevc (h265parse->nalparser,
-            data, off, size, 2, &nalu);
-
-        if (parseres != GST_H265_PARSER_OK) {
-          if (i + 1 == num_nal_arrays && j + 1 == num_nals &&
-              nalu_type != GST_H265_NAL_VPS && nalu_type != GST_H265_NAL_SPS &&
-              nalu_type != GST_H265_NAL_PPS) {
-            GST_WARNING_OBJECT (h265parse,
-                "Couldn't parse the last nalu, type %d at array %d / %d",
-                nalu_type, i, j);
-            goto codec_data_done;
-          }
-          GST_ERROR ("aaa, %d", nalu_type);
-          gst_buffer_unmap (codec_data, &map);
-          goto hvcc_too_small;
-        }
-
-        gst_h265_parse_process_nal (h265parse, &nalu);
-        off = nalu.offset + nalu.size;
+        gst_h265_parse_process_nal (h265parse, nalu);
       }
     }
-  codec_data_done:
+
+    gst_h265_decoder_config_record_free (config);
     gst_buffer_unmap (codec_data, &map);
 
     /* don't confuse codec_data with inband vps/sps/pps */
@@ -3280,14 +3319,9 @@
   return TRUE;
 
   /* ERRORS */
-hvcc_too_small:
-  {
-    GST_DEBUG_OBJECT (h265parse, "hvcC size %" G_GSIZE_FORMAT " < 23", size);
-    goto refuse_caps;
-  }
-wrong_version:
+hvcc_failed:
   {
-    GST_DEBUG_OBJECT (h265parse, "wrong hvcC version");
+    GST_DEBUG_OBJECT (h265parse, "Failed to parse hvcC data");
     goto refuse_caps;
   }
 wrong_type:

gst-plugins-bad-1.22.7.tar.xz/gst/videoparsers/gsth265parse.h -> gst-plugins-bad-1.24.5.tar.xz/gst/videoparsers/gsth265parse.h Changed

gst-plugins-bad-1.22.7.tar.xz/gst/videoparsers/gstmpegvideoparse.c -> gst-plugins-bad-1.24.5.tar.xz/gst/videoparsers/gstmpegvideoparse.c Changed

@@ -196,6 +196,7 @@
   mpvparse->ext_count = 0;
   mpvparse->slice_count = 0;
   mpvparse->slice_offset = 0;
+  gst_video_clear_user_data (&mpvparse->user_data);
 }
 
 static void
@@ -390,17 +391,17 @@
     const gchar *name;
   } psc_names = {
     {
-    0x00, "Picture Start"}, {
-    0xb0, "Reserved"}, {
-    0xb1, "Reserved"}, {
-    0xb2, "User Data Start"}, {
-    0xb3, "Sequence Header Start"}, {
-    0xb4, "Sequence Error"}, {
-    0xb5, "Extension Start"}, {
-    0xb6, "Reserved"}, {
-    0xb7, "Sequence End"}, {
-    0xb8, "Group Start"}, {
-    0xb9, "Program End"}
+        0x00, "Picture Start"}, {
+        0xb0, "Reserved"}, {
+        0xb1, "Reserved"}, {
+        0xb2, "User Data Start"}, {
+        0xb3, "Sequence Header Start"}, {
+        0xb4, "Sequence Error"}, {
+        0xb5, "Extension Start"}, {
+        0xb6, "Reserved"}, {
+        0xb7, "Sequence End"}, {
+        0xb8, "Group Start"}, {
+        0xb9, "Program End"}
   };
   if (psc < 0xB0 && psc > 0)
     return "Slice Start";
@@ -422,11 +423,11 @@
     const gchar *name;
   } pct_names = {
     {
-    0, "Forbidden"}, {
-    1, "I Frame"}, {
-    2, "P Frame"}, {
-    3, "B Frame"}, {
-    4, "DC Intra Coded (Shall Not Be Used!)"}
+        0, "Forbidden"}, {
+        1, "I Frame"}, {
+        2, "P Frame"}, {
+        3, "B Frame"}, {
+        4, "DC Intra Coded (Shall Not Be Used!)"}
   };
 
   for (i = 0; i < G_N_ELEMENTS (pct_names); i++)

gst-plugins-bad-1.22.7.tar.xz/gst/videoparsers/gstvc1parse.c -> gst-plugins-bad-1.24.5.tar.xz/gst/videoparsers/gstvc1parse.c Changed

@@ -95,9 +95,9 @@
   VC1HeaderFormat en;
 } header_formats = {
   {
-  "none", VC1_HEADER_FORMAT_NONE}, {
-  "asf", VC1_HEADER_FORMAT_ASF}, {
-  "sequence-layer", VC1_HEADER_FORMAT_SEQUENCE_LAYER}
+      "none", VC1_HEADER_FORMAT_NONE}, {
+      "asf", VC1_HEADER_FORMAT_ASF}, {
+      "sequence-layer", VC1_HEADER_FORMAT_SEQUENCE_LAYER}
 };
 
 static const struct
@@ -106,14 +106,15 @@
   VC1StreamFormat en;
 } stream_formats = {
   {
-  "bdu", VC1_STREAM_FORMAT_BDU}, {
-  "bdu-frame", VC1_STREAM_FORMAT_BDU_FRAME}, {
-  "sequence-layer-bdu", VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU}, {
-  "sequence-layer-bdu-frame", VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME}, {
-  "sequence-layer-raw-frame", VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME}, {
-  "sequence-layer-frame-layer", VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER}, {
-  "asf", VC1_STREAM_FORMAT_ASF}, {
-  "frame-layer", VC1_STREAM_FORMAT_FRAME_LAYER}
+      "bdu", VC1_STREAM_FORMAT_BDU}, {
+      "bdu-frame", VC1_STREAM_FORMAT_BDU_FRAME}, {
+      "sequence-layer-bdu", VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU}, {
+      "sequence-layer-bdu-frame", VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME}, {
+      "sequence-layer-raw-frame", VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME}, {
+        "sequence-layer-frame-layer",
+      VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER}, {
+      "asf", VC1_STREAM_FORMAT_ASF}, {
+      "frame-layer", VC1_STREAM_FORMAT_FRAME_LAYER}
 };
 
 static const struct
@@ -122,8 +123,8 @@
   GstVC1ParseFormat en;
 } parse_formats = {
   {
-  "WMV3", GST_VC1_PARSE_FORMAT_WMV3}, {
-  "WVC1", GST_VC1_PARSE_FORMAT_WVC1}
+      "WMV3", GST_VC1_PARSE_FORMAT_WMV3}, {
+      "WVC1", GST_VC1_PARSE_FORMAT_WVC1}
 };
 
 static const gchar *
@@ -2032,22 +2033,22 @@
   gint par_n, par_d;
 } aspect_ratios = {
   {
-  0, 0}, {
-  1, 1}, {
-  12, 11}, {
-  10, 11}, {
-  16, 11}, {
-  40, 33}, {
-  24, 11}, {
-  20, 11}, {
-  32, 11}, {
-  80, 33}, {
-  18, 11}, {
-  15, 11}, {
-  64, 33}, {
-  160, 99}, {
-  0, 0}, {
-  0, 0}
+      0, 0}, {
+      1, 1}, {
+      12, 11}, {
+      10, 11}, {
+      16, 11}, {
+      40, 33}, {
+      24, 11}, {
+      20, 11}, {
+      32, 11}, {
+      80, 33}, {
+      18, 11}, {
+      15, 11}, {
+      64, 33}, {
+      160, 99}, {
+      0, 0}, {
+      0, 0}
 };
 
 /* SMPTE 421M Table 8 */

gst-plugins-bad-1.22.7.tar.xz/gst/videoparsers/gstvideoparseutils.c -> gst-plugins-bad-1.24.5.tar.xz/gst/videoparsers/gstvideoparseutils.c Changed

@@ -34,10 +34,13 @@
 #define GST_CAT_DEFAULT videoparseutils_debug
 
 static gboolean gst_video_parse_utils_parse_bar (const guint8 * data,
-    gsize size, guint field, GstVideoBarData * bar);
+    gsize size, GstVideoParseUtilsField field, GstVideoBarData * bar);
 
 static gboolean gst_video_parse_utils_parse_afd (const guint8 data,
-    GstVideoAFD * afd, GstVideoAFDSpec spec);
+    GstVideoAFDSpec spec, GstVideoParseUtilsField field, GstVideoAFD * afd);
+
+static void gst_video_clear_unregistered_message
+    (GstVideoUnregisteredMessage * msg);
 
 
 /*
@@ -123,10 +126,7 @@
         user_data->afd_spec = GST_VIDEO_AFD_SPEC_ATSC_A53;
         user_data->afd = temp;
         user_data->active_format_flag = TRUE;
-      } else {
-        user_data->active_format_flag = FALSE;
       }
-      user_data->has_afd = TRUE;
       user_data->field = field;
       break;
     case USER_DATA_ID_DIRECTV_CC:
@@ -161,13 +161,13 @@
           a53_process_708_cc_data =
               (cc_count & CEA_708_PROCESS_CC_DATA_FLAG) != 0;
           if (!a53_process_708_cc_data) {
-            GST_WARNING_OBJECT (elt,
+            GST_DEBUG_OBJECT (elt,
                 "ignoring closed captions as CEA_708_PROCESS_CC_DATA_FLAG is not set");
           }
 
           process_708_em_data = (cc_count & CEA_708_PROCESS_EM_DATA_FLAG) != 0;
           if (!process_708_em_data) {
-            GST_WARNING_OBJECT (elt,
+            GST_DEBUG_OBJECT (elt,
                 "CEA_708_PROCESS_EM_DATA_FLAG flag is not set");
           }
           if (!gst_byte_reader_get_uint8 (br, &temp)) {
@@ -175,7 +175,7 @@
             break;
           }
           if (temp != 0xff) {
-            GST_WARNING_OBJECT (elt, "em data does not equal 0xFF");
+            GST_DEBUG_OBJECT (elt, "em data does not equal 0xFF");
           }
           process_708_em_data = process_708_em_data && (temp == 0xff);
           /* ignore process_708_em_data as there is content that doesn't follow spec for this field */
@@ -223,7 +223,6 @@
             break;
           memcpy (user_data->bar_data, data, bar_size);
           user_data->bar_data_size = bar_size;
-          user_data->has_bar_data = TRUE;
           user_data->field = field;
           GST_DEBUG_OBJECT (elt, "Bar data, %u bytes", bar_size);
           break;
@@ -254,66 +253,48 @@
 gst_video_push_user_data (GstElement * elt, GstVideoParseUserData * user_data,
     GstBuffer * buf)
 {
+  GstVideoAFD afd;
+  GstVideoBarData bar;
 
-  /* 1. handle closed captions */
-  if (user_data->closedcaptions_size > 0) {
-    if (!gst_buffer_get_meta (buf, GST_VIDEO_CAPTION_META_API_TYPE)) {
-      gst_buffer_add_video_caption_meta (buf,
-          user_data->closedcaptions_type, user_data->closedcaptions,
-          user_data->closedcaptions_size);
-    } else {
-      GST_DEBUG_OBJECT (elt, "Closed caption data already found on buffer, "
-          "discarding to avoid duplication");
-    }
-
-    user_data->closedcaptions_type = GST_VIDEO_CAPTION_TYPE_UNKNOWN;
-    user_data->closedcaptions_size = 0;
+  if (user_data->closedcaptions_size == 0) {
+    GST_TRACE_OBJECT (elt, "No closed caption data to attach");
+  } else if (gst_buffer_get_meta (buf, GST_VIDEO_CAPTION_META_API_TYPE)) {
+    GST_DEBUG_OBJECT (elt, "Buffer already has closed caption meta");
+  } else {
+    gst_buffer_add_video_caption_meta (buf,
+        user_data->closedcaptions_type, user_data->closedcaptions,
+        user_data->closedcaptions_size);
   }
 
-  /* 2. handle AFD */
-  if (user_data->has_afd) {
-    GstVideoAFD afd;
-    afd.field = 0;
-    afd.aspect_ratio = GST_VIDEO_AFD_ASPECT_RATIO_UNDEFINED;
-    afd.spec = GST_VIDEO_AFD_SPEC_ATSC_A53;
-    afd.afd = GST_VIDEO_AFD_UNAVAILABLE;
-    if (gst_video_parse_utils_parse_afd (user_data->afd, &afd, afd.spec)) {
-      gst_buffer_add_video_afd_meta (buf, afd.field, afd.spec, afd.afd);
-    } else {
-      GST_WARNING_OBJECT (elt, "Invalid AFD value %d", user_data->afd);
-    }
-  } else if (user_data->active_format_flag) {
-    /* AFD was present, but now it is no longer present */
-    GST_DEBUG_OBJECT (elt,
-        "AFD was present in previous frame, now no longer present");
-    user_data->active_format_flag = 0;
+  if (!user_data->active_format_flag) {
+    GST_TRACE_OBJECT (elt, "No AFD to attach");
+  } else if (gst_buffer_get_meta (buf, GST_VIDEO_AFD_META_API_TYPE)) {
+    GST_DEBUG_OBJECT (elt, "Buffer already has AFD meta");
+  } else if (!gst_video_parse_utils_parse_afd (user_data->afd,
+          user_data->afd_spec, user_data->field, &afd)) {
+    GST_WARNING_OBJECT (elt, "Invalid AFD value %d", user_data->afd);
+  } else {
+    gst_buffer_add_video_afd_meta (buf, afd.field, afd.spec, afd.afd);
   }
-  user_data->has_afd = FALSE;
-
-  /* 3. handle Bar data */
-  if (user_data->has_bar_data) {
-    GstVideoBarData data;
-    if (gst_video_parse_utils_parse_bar (user_data->bar_data,
-            user_data->bar_data_size, user_data->field, &data)) {
-      gst_buffer_add_video_bar_meta (buf, data.field, data.is_letterbox,
-          data.bar_data0, data.bar_data1);
-    } else {
-      GST_WARNING_OBJECT (elt, "Invalid Bar data");
-    }
-  } else if (user_data->bar_data_size) {
-    /* bar data was present, but now it is no longer present */
-    GST_DEBUG_OBJECT (elt,
-        "Bar data was present in previous frame, now no longer present");
-    user_data->bar_data_size = 0;
+
+  if (!user_data->bar_data_size) {
+    GST_TRACE_OBJECT (elt, "No Bar data to attach");
+  } else if (gst_buffer_get_meta (buf, GST_VIDEO_BAR_META_API_TYPE)) {
+    GST_DEBUG_OBJECT (elt, "Buffer already has Bar meta");
+  } else if (!gst_video_parse_utils_parse_bar (user_data->bar_data,
+          user_data->bar_data_size, user_data->field, &bar)) {
+    GST_WARNING_OBJECT (elt, "Invalid Bar data");
+  } else {
+    gst_buffer_add_video_bar_meta (buf, bar.field, bar.is_letterbox,
+        bar.bar_data0, bar.bar_data1);
   }
-  user_data->has_bar_data = FALSE;
 }
 
-
 /*
  * gst_video_parse_utils_parse_bar:
  * @data: bar data array
- * @size:size of bar data array
+ * @size: size of bar data array
+ * @field: #GstVideoParseUtilsField we're parsing for
  * @bar: #GstVideoBarData structure
  *
  * Parse bar data bytes into #GstVideoBarData structure
@@ -324,7 +305,7 @@
  */
 static gboolean
 gst_video_parse_utils_parse_bar (const guint8 * data, gsize size,
-    guint field, GstVideoBarData * bar)
+    GstVideoParseUtilsField field, GstVideoBarData * bar)
 {
   guint8 temp;
   int i = 0;
@@ -332,13 +313,13 @@
   guint16 bar_vals4 = { 0, 0, 0, 0 };
   GstBitReader bar_tender;
 
-  /* there must be at least one byte, and not more than GST_VIDEO_BAR_MAX_BYTES bytes */
-  if (!bar || size == 0 || size > GST_VIDEO_BAR_MAX_BYTES)
+  g_return_val_if_fail (bar != NULL, FALSE);
+
+  if (size == 0 || size > GST_VIDEO_BAR_MAX_BYTES)
     return FALSE;
 
   gst_bit_reader_init (&bar_tender, data, size);
 
-
   /* parse bar flags */
   for (i = 0; i < 4; ++i) {
     if (!gst_bit_reader_get_bits_uint8 (&bar_tender, bar_flags + i, 1))
@@ -367,6 +348,7 @@
   if (bar_flags0 && bar_flags2)
     return FALSE;
 
+  bar->field = field;
   bar->is_letterbox = bar_flags0;
   if (bar->is_letterbox) {
     bar->bar_data0 = bar_vals0;
@@ -375,16 +357,15 @@
     bar->bar_data0 = bar_vals2;
     bar->bar_data1 = bar_vals3;
   }
-  bar->field = field;
-
   return TRUE;
 }
 
 /*
  * gst_video_parse_utils_parse_afd:
  * @data: bar byte
+ * @spec: #GstVideoAFDSpec indicating specification that applies to AFD byte
+ * @field: #GstVideoParseUtilsField
  * @afd: pointer to #GstVideoAFD struct
- * @spec : #GstVideoAFDSpec indicating specification that applies to AFD byte
  *
  * Parse afd byte into #GstVideoAFD struct
  *
@@ -401,94 +382,173 @@
  * Returns: TRUE if parsing was successful, otherwise FALSE
  */
 static gboolean
-gst_video_parse_utils_parse_afd (const guint8 data, GstVideoAFD * afd,
-    GstVideoAFDSpec spec)
+gst_video_parse_utils_parse_afd (const guint8 data, GstVideoAFDSpec spec,
+    GstVideoParseUtilsField field, GstVideoAFD * afd)
 {
-  guint8 afd_data;
+  GstVideoAFDAspectRatio aspect_ratio = GST_VIDEO_AFD_ASPECT_RATIO_UNDEFINED;
+  GstVideoAFDValue afd_data;
+
   g_return_val_if_fail (afd != NULL, FALSE);
-  g_return_val_if_fail ((guint8) spec <= 2, FALSE);
+
   switch (spec) {
     case GST_VIDEO_AFD_SPEC_DVB_ETSI:
     case GST_VIDEO_AFD_SPEC_ATSC_A53:
       if ((data & 0x40) == 0)
         return FALSE;
+
       afd_data = data & 0xF;
       break;
     case GST_VIDEO_AFD_SPEC_SMPTE_ST2016_1:
       if ((data & 0x80) || (data & 0x3))
         return FALSE;
-      afd_data = data >> 3;
-      afd->aspect_ratio = (GstVideoAFDAspectRatio) (((data >> 2) & 1) + 1);
+
+      afd_data = (data >> 3) & 0xF;
+      aspect_ratio = (GstVideoAFDAspectRatio) (((data >> 2) & 1) + 1);
       break;
     default:
-      return FALSE;
+      g_return_val_if_reached (FALSE);
   }
 
-  /* AFD is stored in a nybble */
-  g_return_val_if_fail (afd_data <= 0xF, FALSE);
-  /* reserved values for all specifications */
-  g_return_val_if_fail (afd_data != 1 && (afd_data < 5 || afd_data > 7)
-      && afd_data != 12, FALSE);
-  /* reserved for DVB/ETSI */
-  g_return_val_if_fail ((spec != GST_VIDEO_AFD_SPEC_DVB_ETSI)
-      || (afd_data != 0), FALSE);
+  switch (afd_data) {
+    case GST_VIDEO_AFD_UNAVAILABLE:
+      if (spec == GST_VIDEO_AFD_SPEC_DVB_ETSI) {
+        /* reserved for DVB/ETSI */
+        return FALSE;
+      }
+      break;
+
+    case GST_VIDEO_AFD_16_9_TOP_ALIGNED:
+    case GST_VIDEO_AFD_14_9_TOP_ALIGNED:
+    case GST_VIDEO_AFD_GREATER_THAN_16_9:
+    case GST_VIDEO_AFD_4_3_FULL_16_9_FULL:
+    case GST_VIDEO_AFD_4_3_FULL_4_3_PILLAR:
+    case GST_VIDEO_AFD_16_9_LETTER_16_9_FULL:
+    case GST_VIDEO_AFD_14_9_LETTER_14_9_PILLAR:
+    case GST_VIDEO_AFD_4_3_FULL_14_9_CENTER:
+    case GST_VIDEO_AFD_16_9_LETTER_14_9_CENTER:
+    case GST_VIDEO_AFD_16_9_LETTER_4_3_CENTER:
+      break;
 
+    default:
+      return FALSE;
+  }
+
+  afd->field = field;
+  afd->aspect_ratio = aspect_ratio;
   afd->spec = spec;
-  afd->afd = (GstVideoAFDValue) afd_data;
+  afd->afd = afd_data;
   return TRUE;
 }
 
 /*
+ * gst_video_clear_user_data:
+ * @user_data: #GstVideoParseUserData struct to hold parsed closed caption, bar and AFD data
+ *
+ * Clears the user data, resetting it for the next frame
+ */
+void
+gst_video_clear_user_data (GstVideoParseUserData * user_data)
+{
+  user_data->closedcaptions_size = 0;
+  user_data->bar_data_size = 0;
+  user_data->active_format_flag = 0;
+}
+
+/*
  * gst_video_parse_user_data_unregistered:
  * @elt: #GstElement that is parsing user data
- * @user_data: #GstVideoParseUserDataUnregistered struct to hold parsed data
+ * @user_data: #GstVideoParseUserDataUnregistered to hold SEI User Data Unregistered
  * @br: #GstByteReader attached to buffer of user data
  * @uuid: User Data Unregistered UUID
  *
- * Parse user data and store in @user_data
+ * Copy remaining bytes in @br and store in @user_data
  */
 void
 gst_video_parse_user_data_unregistered (GstElement * elt,
     GstVideoParseUserDataUnregistered * user_data,
     GstByteReader * br, guint8 uuid16)
 {
-  gst_video_user_data_unregistered_clear (user_data);
+  GstVideoUnregisteredMessage msg;
+
+  memcpy (&msg.uuid, uuid, 16);
+
+  msg.size = gst_byte_reader_get_size (br);
+  if (!gst_byte_reader_dup_data (br, msg.size, &msg.data)) {
+    g_return_if_reached ();
+  }
+
+  if (user_data->messages == NULL) {
+    user_data->messages = g_array_sized_new (FALSE, TRUE,
+        sizeof (GstVideoUnregisteredMessage), 3);
+    g_array_set_clear_func (user_data->messages,
+        (GDestroyNotify) gst_video_clear_unregistered_message);
+  }
 
-  memcpy (&user_data->uuid, uuid, 16);
-  user_data->size = gst_byte_reader_get_size (br);
-  gst_byte_reader_dup_data (br, user_data->size, &user_data->data);
+  g_array_append_val (user_data->messages, msg);
 }
 
 /*
- * gst_video_user_data_unregistered_clear:
+ * gst_video_push_user_data_unregistered:
+ * @elt: #GstElement that is pushing user data
  * @user_data: #GstVideoParseUserDataUnregistered holding SEI User Data Unregistered
+ * @buf: (transfer none): #GstBuffer that receives the unregistered data
  *
- * Clears the user data unregistered
+ * Attach unregistered messages from @user_data to @buf as
+ * GstVideoSEIUserDataUnregisteredMeta
  */
 void
-gst_video_user_data_unregistered_clear (GstVideoParseUserDataUnregistered *
-    user_data)
+gst_video_push_user_data_unregistered (GstElement * elt,
+    GstVideoParseUserDataUnregistered * user_data, GstBuffer * buf)
 {
-  g_free (user_data->data);
-  user_data->data = NULL;
-  user_data->size = 0;
+  GArray *messages = user_data->messages;
+  guint i;
+
+  if (messages == NULL || messages->len == 0) {
+    GST_TRACE_OBJECT (elt, "No unregistered user data to attach");
+    return;
+  }
+
+  if (gst_buffer_get_meta (buf,
+          GST_VIDEO_SEI_USER_DATA_UNREGISTERED_META_API_TYPE)) {
+    GST_DEBUG_OBJECT (elt, "Buffer already has unregistered meta");
+    return;
+  }
+
+  for (i = 0; i < messages->len; i++) {
+    GstVideoUnregisteredMessage *msg =
+        &g_array_index (messages, GstVideoUnregisteredMessage, i);
+
+    gst_buffer_add_video_sei_user_data_unregistered_meta (buf, msg->uuid,
+        msg->data, msg->size);
+  }
 }
 
 /*
- * gst_video_push_user_data_unregistered:
- * @elt: #GstElement that is pushing user data
+ * gst_video_clear_user_data_unregistered:
  * @user_data: #GstVideoParseUserDataUnregistered holding SEI User Data Unregistered
- * @buf: #GstBuffer that receives the parsed data
+ * @free: Whether to deallocate memory resources
  *
- * After user data has been parsed, add the data to @buf
+ * Clears the user data unregistered, resetting it for the next frame
  */
-void
-gst_video_push_user_data_unregistered (GstElement * elt,
-    GstVideoParseUserDataUnregistered * user_data, GstBuffer * buf)
+void gst_video_clear_user_data_unregistered
+    (GstVideoParseUserDataUnregistered * user_data, gboolean free)
 {
-  if (user_data->data != NULL) {
-    gst_buffer_add_video_sei_user_data_unregistered_meta (buf, user_data->uuid,
-        user_data->data, user_data->size);
-    gst_video_user_data_unregistered_clear (user_data);
-  }
+  if (free)
+    g_clear_pointer (&user_data->messages, g_array_unref);
+  else if (user_data->messages != NULL)
+    g_array_set_size (user_data->messages, 0);
+}
+
+/*
+ * gst_video_clear_unregistered_message:
+ * @msg: #GstVideoUnregisteredMessage holding a single SEI User Data Unregistered
+ *
+ * Clears the message, freeing the data
+ */
+static void
+gst_video_clear_unregistered_message (GstVideoUnregisteredMessage * msg)
+{
+  memset (&msg->uuid, 0, sizeof msg->uuid);
+  g_clear_pointer (&msg->data, g_free);
+  msg->size = 0;
 }

gst-plugins-bad-1.22.7.tar.xz/gst/videoparsers/gstvideoparseutils.h -> gst-plugins-bad-1.24.5.tar.xz/gst/videoparsers/gstvideoparseutils.h Changed

@@ -158,49 +158,63 @@
   /* pending bar data */
   guint8 bar_dataGST_VIDEO_BAR_MAX_BYTES;
   guint bar_data_size;
-  gboolean has_bar_data;
-
-  /* parsed bar data */
-  GstVideoBarData bar_parsed;
 
   /* pending AFD data */
   guint8 afd;
   gboolean active_format_flag;
   GstVideoAFDSpec afd_spec;
-  gboolean has_afd;
-
-  /* parsed afd data */
-  GstVideoAFD afd_parsed;
 
 } GstVideoParseUserData;
 
 /*
  * GstVideoParseUserDataUnregistered
  *
- * Holds unparsed User Data Unregistered.
+ * Holds unparsed, unregistered user data.
  */
 typedef struct
 {
+  /* item type: GstVideoUnregisteredMessage */
+  GArray *messages;
+} GstVideoParseUserDataUnregistered;
+
+/*
+ * GstVideoUnregisteredMessage
+ *
+ * Item type for the unregistered user data.
+ */
+typedef struct {
   guint8 uuid16;
   guint8 *data;
   gsize size;
-} GstVideoParseUserDataUnregistered;
+} GstVideoUnregisteredMessage;
 
 G_BEGIN_DECLS
 
-void gst_video_parse_user_data(GstElement * elt, GstVideoParseUserData * user_data,
-			GstByteReader * br, guint8 field, guint16 provider_code);
+void gst_video_parse_user_data (GstElement            * elt,
+                                GstVideoParseUserData * user_data,
+                                GstByteReader         * br,
+                                guint8                  field,
+                                guint16                 provider_code);
+
+void gst_video_push_user_data (GstElement            * elt,
+                               GstVideoParseUserData * user_data,
+                               GstBuffer             * buf);
+
+void gst_video_clear_user_data (GstVideoParseUserData * user_data);
+
 
-void gst_video_parse_user_data_unregistered(GstElement * elt, GstVideoParseUserDataUnregistered * user_data,
-			GstByteReader * br, guint8 uuid16);
+void gst_video_parse_user_data_unregistered (GstElement                        * elt,
+                                             GstVideoParseUserDataUnregistered * user_data,
+                                             GstByteReader                     * br,
+                                             guint8                              uuid16);
 
-void gst_video_user_data_unregistered_clear(GstVideoParseUserDataUnregistered * user_data);
+void gst_video_push_user_data_unregistered (GstElement                        * elt,
+                                            GstVideoParseUserDataUnregistered * user_data,
+                                            GstBuffer                         * buf);
 
-void gst_video_push_user_data(GstElement * elt, GstVideoParseUserData * user_data,
-			 GstBuffer * buf);
+void gst_video_clear_user_data_unregistered (GstVideoParseUserDataUnregistered * user_data,
+                                             gboolean                            free);
 
-void gst_video_push_user_data_unregistered(GstElement * elt, GstVideoParseUserDataUnregistered * user_data,
-			 GstBuffer * buf);
 
 G_END_DECLS
 #endif /* __VIDEO_PARSE_UTILS_H__ */

gst-plugins-bad-1.22.7.tar.xz/gst/videoparsers/gstvp9parse.c -> gst-plugins-bad-1.24.5.tar.xz/gst/videoparsers/gstvp9parse.c Changed

gst-plugins-bad-1.22.7.tar.xz/gst/y4m/gsty4mdec.c -> gst-plugins-bad-1.24.5.tar.xz/gst/y4m/gsty4mdec.c Changed

@@ -86,8 +86,12 @@
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{I420,Y42B,Y444}"))
-    );
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ \
+        I420,Y41B,Y42B,Y444,                 \
+        I420_10LE,I422_10LE,Y444_10LE,       \
+        I420_12LE,I422_12LE,Y444_12LE,       \
+        Y444_16LE,GRAY8,GRAY16_LE            \
+    }")));
 
 /* class initialization */
 #define gst_y4m_dec_parent_class parent_class
@@ -287,117 +291,173 @@
       gst_y4m_dec_bytes_to_frames (y4mdec, bytes));
 }
 
+static GstVideoFormat
+parse_colorspace (const char *param)
+{
+  char *end;
+  guint iformat = g_ascii_strtoull (param, &end, 10);
+
+  if (*end == '\0') {
+    switch (iformat) {
+      case 420:
+        return GST_VIDEO_FORMAT_I420;
+      case 411:
+        return GST_VIDEO_FORMAT_Y41B;
+      case 422:
+        return GST_VIDEO_FORMAT_Y42B;
+      case 444:
+        return GST_VIDEO_FORMAT_Y444;
+    }
+  }
+
+  /*
+   * Parse non-standard (i.e., unknown to mjpegtools) streams that are
+   * generated by FFmpeg:
+   * https://wiki.multimedia.cx/index.php/YUV4MPEG2
+   * https://github.com/FFmpeg/FFmpeg/blob/eee3b7e2/libavformat/yuv4mpegenc.c#L74-L166
+   * Will assume little-endian because this is an on-disk serialization format.
+   */
+
+  // TODO: Differentiate between:
+  // * C420jpeg: biaxially-displaced chroma planes
+  // * C420paldv: coincident R and vertically-displaced B
+  // * C420mpeg2: vertically-displaced chroma planes
+  if (iformat == 420 && (g_strcmp0 (end, "jpeg") == 0 ||
+          g_strcmp0 (end, "paldv") == 0 || g_strcmp0 (end, "mpeg2") == 0))
+    return GST_VIDEO_FORMAT_I420;
+
+  if (iformat == 0 && strncmp (end, "mono", 4) == 0) {
+    char *type = end + 4;
+    if (*type == '\0')
+      return GST_VIDEO_FORMAT_GRAY8;
+    if (g_strcmp0 (type, "16") == 0)
+      return GST_VIDEO_FORMAT_GRAY16_LE;
+  }
+
+  if (*end == 'p') {
+    guint depth = g_ascii_strtoull (end + 1, NULL, 10);
+    if (depth == 10) {
+      switch (iformat) {
+        case 420:
+          return GST_VIDEO_FORMAT_I420_10LE;
+        case 422:
+          return GST_VIDEO_FORMAT_I422_10LE;
+        case 444:
+          return GST_VIDEO_FORMAT_Y444_10LE;
+      }
+    } else if (depth == 12) {
+      switch (iformat) {
+        case 420:
+          return GST_VIDEO_FORMAT_I420_12LE;
+        case 422:
+          return GST_VIDEO_FORMAT_I422_12LE;
+        case 444:
+          return GST_VIDEO_FORMAT_Y444_12LE;
+      }
+    } else if (depth == 16 && iformat == 444) {
+      return GST_VIDEO_FORMAT_Y444_16LE;
+    }
+  }
+
+  GST_WARNING ("%s is not a supported format", param);
+  return GST_VIDEO_FORMAT_UNKNOWN;
+}
 
 static gboolean
-gst_y4m_dec_parse_header (GstY4mDec * y4mdec, char *header)
+parse_ratio (const char *param, gulong * n, gulong * d)
 {
   char *end;
-  int iformat = 420;
-  int interlaced_char = 0;
-  gint fps_n = 0, fps_d = 0;
-  gint par_n = 0, par_d = 0;
-  gint width = 0, height = 0;
-  GstVideoFormat format;
+  *n = g_ascii_strtoull (param, &end, 10);
+  if (end == param)
+    return FALSE;
+  param = end;
+  if (param0 != ':')
+    return FALSE;
+  param++;
+  *d = g_ascii_strtoull (param, &end, 10);
+  if (end == param)
+    return FALSE;
+  return TRUE;
+}
+
+static gboolean
+gst_y4m_dec_parse_header (GstY4mDec * y4mdec, char *header)
+{
+  guint len;
+  char **params;
+  guint interlaced_char = 0;
+  gulong fps_n = 0, fps_d = 0;
+  gulong par_n = 0, par_d = 0;
+  gulong width = 0, height = 0;
+  GstVideoFormat format = GST_VIDEO_FORMAT_I420;
 
   if (memcmp (header, "YUV4MPEG2 ", 10) != 0) {
+    GST_ERROR_OBJECT (y4mdec, "y4m start code not found");
     return FALSE;
   }
 
   header += 10;
-  while (*header) {
-    GST_DEBUG_OBJECT (y4mdec, "parsing at '%s'", header);
-    switch (*header) {
-      case ' ':
-        header++;
-        break;
+  if (!g_str_is_ascii (header)) {
+    GST_ERROR_OBJECT (y4mdec, "Invalid non-ASCII y4m header: %s", header);
+    return FALSE;
+  }
+
+  GST_INFO_OBJECT (y4mdec, "Found header: %s", header);
+  params = g_strsplit (header, " ", -1);
+  len = g_strv_length (params);
+
+  for (int i = 0; i < len; i++) {
+    const char *param = paramsi;
+    char param_type = *param;
+    const char *param_value = param + 1;
+    switch (param_type) {
       case 'C':
-        header++;
-        iformat = strtoul (header, &end, 10);
-        if (end == header)
-          goto error;
-        header = end;
-        break;
+        format = parse_colorspace (param_value);
+        if (format == GST_VIDEO_FORMAT_UNKNOWN) {
+          GST_ERROR_OBJECT (y4mdec, "Failed to parse colorspace: %s", param);
+          return FALSE;
+        }
+        GST_INFO_OBJECT (y4mdec, "Parsed format as %s",
+            gst_video_format_to_string (format));
+        continue;
       case 'W':
-        header++;
-        width = strtoul (header, &end, 10);
-        if (end == header)
-          goto error;
-        header = end;
-        break;
+        if ((width = g_ascii_strtoull (param_value, NULL, 10)) == 0) {
+          GST_ERROR_OBJECT (y4mdec, "Failed to parse width: %s", param);
+          return FALSE;
+        }
+        continue;
       case 'H':
-        header++;
-        height = strtoul (header, &end, 10);
-        if (end == header)
-          goto error;
-        header = end;
-        break;
+        if ((height = g_ascii_strtoull (param_value, NULL, 10)) == 0) {
+          GST_ERROR_OBJECT (y4mdec, "Failed to parse height: %s", param);
+          return FALSE;
+        }
+        continue;
       case 'I':
-        header++;
-        if (header0 == 0) {
-          GST_WARNING_OBJECT (y4mdec, "Expecting interlaced flag");
+        if ((interlaced_char = param_value0) == 0) {
+          GST_ERROR_OBJECT (y4mdec, "Expecting interlaced flag: %s", param);
           return FALSE;
         }
-        interlaced_char = header0;
-        header++;
-        break;
+        continue;
       case 'F':
-        header++;
-        fps_n = strtoul (header, &end, 10);
-        if (end == header)
-          goto error;
-        header = end;
-        if (header0 != ':') {
-          GST_WARNING_OBJECT (y4mdec, "Expecting :");
+        if (!parse_ratio (param_value, &fps_n, &fps_d)) {
+          GST_ERROR_OBJECT (y4mdec, "Failed to parse framerate: %s", param);
           return FALSE;
         }
-        header++;
-        fps_d = strtoul (header, &end, 10);
-        if (end == header)
-          goto error;
-        header = end;
-        break;
+        continue;
       case 'A':
-        header++;
-        par_n = strtoul (header, &end, 10);
-        if (end == header)
-          goto error;
-        header = end;
-        if (header0 != ':') {
-          GST_WARNING_OBJECT (y4mdec, "Expecting :");
+        if (!parse_ratio (param_value, &par_n, &par_d)) {
+          GST_ERROR_OBJECT (y4mdec, "Failed to parse PAR: %s", param);
           return FALSE;
         }
-        header++;
-        par_d = strtoul (header, &end, 10);
-        if (end == header)
-          goto error;
-        header = end;
-        break;
-      default:
-        GST_WARNING_OBJECT (y4mdec, "Unknown y4m header field '%c', ignoring",
-            *header);
-        while (*header && *header != ' ')
-          header++;
-        break;
+        continue;
     }
+    GST_WARNING_OBJECT (y4mdec, "Unknown y4m param field '%s', ignoring",
+        param);
   }
+  g_strfreev (params);
 
-  switch (iformat) {
-    case 420:
-      format = GST_VIDEO_FORMAT_I420;
-      break;
-    case 422:
-      format = GST_VIDEO_FORMAT_Y42B;
-      break;
-    case 444:
-      format = GST_VIDEO_FORMAT_Y444;
-      break;
-    default:
-      GST_WARNING_OBJECT (y4mdec, "unknown y4m format %d", iformat);
-      return FALSE;
-  }
-
-  if (width <= 0 || width > MAX_SIZE || height <= 0 || height > MAX_SIZE) {
-    GST_WARNING_OBJECT (y4mdec, "Dimensions %dx%d out of range", width, height);
+  if (width > MAX_SIZE || height > MAX_SIZE) {
+    GST_ERROR_OBJECT (y4mdec, "Dimensions %lux%lu out of range", width, height);
     return FALSE;
   }
 
@@ -442,7 +502,6 @@
           y4mdec->info.offset2 + y4mdec->info.stride2 * height;
       break;
     default:
-      g_assert_not_reached ();
       break;
   }
 
@@ -457,7 +516,7 @@
       y4mdec->info.interlace_mode = GST_VIDEO_INTERLACE_MODE_INTERLEAVED;
       break;
     default:
-      GST_WARNING_OBJECT (y4mdec, "Unknown interlaced char '%c'",
+      GST_ERROR_OBJECT (y4mdec, "Unknown interlaced char '%c'",
           interlaced_char);
       return FALSE;
       break;
@@ -478,9 +537,6 @@
   y4mdec->info.par_d = par_d;
 
   return TRUE;
-error:
-  GST_WARNING_OBJECT (y4mdec, "Expecting number y4m header at '%s'", header);
-  return FALSE;
 }
 
 static GstFlowReturn
@@ -661,7 +717,7 @@
     len = strlen (header);
     if (n_avail < y4mdec->info.size + len + 1) {
       /* not enough data */
-      GST_DEBUG ("not enough data for frame %d < %" G_GSIZE_FORMAT,
+      GST_TRACE ("not enough data for frame %d < %" G_GSIZE_FORMAT,
           n_avail, y4mdec->info.size + len + 1);
       break;
     }

gst-plugins-bad-1.22.7.tar.xz/meson.build -> gst-plugins-bad-1.24.5.tar.xz/meson.build Changed

@@ -1,6 +1,6 @@
 project('gst-plugins-bad', 'c', 'cpp',
-  version : '1.22.7',
-  meson_version : '>= 0.62',
+  version : '1.24.5',
+  meson_version : '>= 1.1',
   default_options :  'warning_level=1',
                       'buildtype=debugoptimized' )
 
@@ -17,7 +17,7 @@
 gst_version_is_stable = gst_version_minor.is_even()
 gst_version_is_dev = gst_version_minor.is_odd() and gst_version_micro < 90
 
-glib_req = '>= 2.62.0'
+glib_req = '>= 2.64.0'
 orc_req = '>= 0.4.17'
 
 if gst_version_is_stable
@@ -83,8 +83,6 @@
       '/we4053', # one void operand for '?:'
       '/we4062', # enumerator 'identifier' in switch of enum 'enumeration' is not handled
       '/we4098', # 'function' : void function returning a value
-      '/we4101', # 'identifier' : unreferenced local variable
-      '/we4189', # 'identifier' : local variable is initialized but not referenced
     )
   endif
   add_project_arguments(msvc_args, language: 'c', 'cpp')
@@ -213,7 +211,7 @@
 cdata.set_quoted('VERSION', gst_version)
 cdata.set_quoted('PACKAGE', 'gst-plugins-bad')
 cdata.set_quoted('PACKAGE_VERSION', gst_version)
-cdata.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/new')
+cdata.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/new')
 cdata.set_quoted('PACKAGE_NAME', 'GStreamer Bad Plug-ins')
 cdata.set_quoted('GETTEXT_PACKAGE', 'gst-plugins-bad-1.0')
 cdata.set_quoted('GST_API_VERSION', api_version)
@@ -478,11 +476,6 @@
 endif
 cdata.set('GST_ENABLE_EXTRA_CHECKS', not get_option('extra-checks').disabled())
 
-gnustl_dep = declare_dependency()
-if host_system == 'android'
-  gnustl_dep = dependency('gnustl', required : false)
-endif
-
 # Disable compiler warnings for unused variables and args if gst debug system is disabled
 if gst_dep.type_name() == 'internal'
   gst_debug_disabled = not subproject('gstreamer').get_variable('gst_debug')
@@ -494,13 +487,28 @@
 
 if gst_debug_disabled
   message('GStreamer debug system is disabled')
-  if cc.has_argument('-Wno-unused')
-    add_project_arguments('-Wno-unused', language: 'c')
-  endif
-  if cxx.has_argument ('-Wno-unused')
-    add_project_arguments('-Wno-unused', language: 'cpp')
+  if cc.get_argument_syntax() == 'msvc'
+    msvc_args = cc.get_supported_arguments(
+      '/wd4101', # 'identifier' : unreferenced local variable
+      '/wd4189', # 'identifier' : local variable is initialized but not referenced
+    )
+    add_project_arguments(msvc_args, language: 'c', 'cpp')
+  else
+    if cc.has_argument('-Wno-unused')
+      add_project_arguments('-Wno-unused', language: 'c')
+    endif
+    if cxx.has_argument ('-Wno-unused')
+      add_project_arguments('-Wno-unused', language: 'cpp')
+    endif
   endif
 else
+  if cc.get_argument_syntax() == 'msvc' and gst_version_is_dev
+    msvc_args = cc.get_supported_arguments(
+      '/we4101', # 'identifier' : unreferenced local variable
+      '/we4189', # 'identifier' : local variable is initialized but not referenced
+    )
+    add_project_arguments(msvc_args, language: 'c', 'cpp')
+  endif
   message('GStreamer debug system is enabled')
 endif
 
@@ -600,7 +608,7 @@
 
 configure_file(output : 'config.h', configuration : cdata)
 
-meson.add_dist_script('scripts/gen-changelog.py', meson.project_name(), '1.20.0', meson.project_version())
+meson.add_dist_script('scripts/gen-changelog.py', meson.project_name(), '1.22.0', meson.project_version())
 
 subdir('docs')

gst-plugins-bad-1.22.7.tar.xz/meson_options.txt -> gst-plugins-bad-1.24.5.tar.xz/meson_options.txt Changed

@@ -6,6 +6,7 @@
 option('adpcmdec', type : 'feature', value : 'auto')
 option('adpcmenc', type : 'feature', value : 'auto')
 option('aiff', type : 'feature', value : 'auto')
+option('analyticsoverlay', type:'feature', value : 'auto')
 option('asfmux', type : 'feature', value : 'auto')
 option('audiobuffersplit', type : 'feature', value : 'auto')
 option('audiofxbad', type : 'feature', value : 'auto')
@@ -15,6 +16,7 @@
 option('autoconvert', type : 'feature', value : 'auto')
 option('bayer', type : 'feature', value : 'auto')
 option('camerabin2', type : 'feature', value : 'auto')
+option('codec2json', type : 'feature', value : 'auto')
 option('codecalpha', type : 'feature', value : 'auto')
 option('codectimestamper', type : 'feature', value : 'auto')
 option('coloreffects', type : 'feature', value : 'auto')
@@ -31,6 +33,7 @@
 option('gdp', type : 'feature', value : 'auto')
 option('geometrictransform', type : 'feature', value : 'auto')
 option('id3tag', type : 'feature', value : 'auto')
+option('insertbin', type : 'feature', value : 'auto')
 option('inter', type : 'feature', value : 'auto')
 option('interlace', type : 'feature', value : 'auto')
 option('ivfparse', type : 'feature', value : 'auto')
@@ -43,6 +46,7 @@
 option('mpegpsmux', type : 'feature', value : 'auto')
 option('mpegtsdemux', type : 'feature', value : 'auto')
 option('mpegtsmux', type : 'feature', value : 'auto')
+option('mse', type : 'feature', value : 'auto')
 option('mxf', type : 'feature', value : 'auto')
 option('netsim', type : 'feature', value : 'auto')
 option('onvif', type : 'feature', value : 'auto')
@@ -62,6 +66,7 @@
 option('subenc', type : 'feature', value : 'auto')
 option('switchbin', type : 'feature', value : 'auto')
 option('timecode', type : 'feature', value : 'auto')
+option('unixfd', type : 'feature', value : 'auto')
 option('videofilters', type : 'feature', value : 'auto')
 option('videoframe_audiolevel', type : 'feature', value : 'auto')
 option('videoparsers', type : 'feature', value : 'auto')
@@ -73,11 +78,14 @@
 option('opencv', type : 'feature', value : 'auto', description : 'OpenCV computer vision library support')
 
 # Feature options for optional deps in plugins
+option('drm', type : 'feature', value : 'auto', description: 'libdrm support in the GstVA library')
+option('udev', type : 'feature', value : 'auto', description: 'gudev support in the new VA-API plugin')
 option('wayland', type : 'feature', value : 'auto', description : 'Wayland plugin/library, support in the Vulkan plugin')
 option('x11', type : 'feature', value : 'auto', description : 'X11 support in Vulkan, GL and rfb plugins')
 
 # Feature options for plugins that need external deps
 option('aes', type : 'feature', value : 'auto', description : 'AES encryption/decryption plugin')
+option('aja', type : 'feature', value : 'auto', description : 'AJA audio/video source/sink plugin')
 option('aom', type : 'feature', value : 'auto', description : 'AOM AV1 video codec plugin')
 option('avtp', type : 'feature', value : 'auto', description : 'Audio/Video Transport Protocol (AVTP) plugin')
 option('amfcodec', type : 'feature', value : 'auto', description : 'AMD AMF codec plugin')
@@ -96,6 +104,7 @@
 option('curl-ssh2', type : 'feature', value : 'auto', description : 'cURL network source and sink plugin libssh2 support')
 option('d3dvideosink', type : 'feature', value : 'auto', description : 'Direct3D video sink plugin')
 option('d3d11', type : 'feature', value : 'auto', description : 'Direct3D11 plugin')
+option('d3d12', type : 'feature', value : 'auto', description : 'Direct3D12 plugin')
 option('dash', type : 'feature', value : 'auto', description : 'DASH demuxer plugin')
 option('dc1394', type : 'feature', value : 'auto', description : 'libdc1394 IIDC camera source plugin')
 option('decklink', type : 'feature', value : 'auto', description : 'DeckLink audio/video source/sink plugin')
@@ -105,6 +114,7 @@
 option('dtls', type : 'feature', value : 'auto', description : 'DTLS encoder and decoder plugin')
 option('dts', type : 'feature', value : 'auto', description : 'DTS audio decoder plugin (GPL - only built if gpl option is also enabled!)')
 option('dvb', type : 'feature', value : 'auto', description : 'DVB video bin and source plugin')
+option('dwrite', type : 'feature', value : 'auto', description : 'DirectWrite plugin')
 option('faac', type : 'feature', value : 'auto', description : 'Free AAC audio encoder plugin')
 option('faad', type : 'feature', value : 'auto', description : 'Free AAC audio decoder plugin (GPL - only built if gpl option is also enabled!)')
 option('fbdev', type : 'feature', value : 'auto', description : 'Framebuffer video sink plugin')
@@ -118,9 +128,10 @@
 option('gtk3', type : 'feature', value : 'auto', description : 'GTK+ video sink plugin')
 option('ipcpipeline', type : 'feature', value : 'auto', description : 'Inter-process communication plugin')
 option('iqa', type : 'feature', value : 'auto', description : 'Image quality assessment plugin (AGPL - only built if gpl option is also enabled!)')
-option('kate', type : 'feature', value : 'auto', description : 'Kate subtitle parser, tagger, and codec plugin')
 option('kms', type : 'feature', value : 'auto', description : 'KMS video sink plugin')
 option('ladspa', type : 'feature', value : 'auto', description : 'LADSPA plugin bridge')
+option('ladspa-rdf', type : 'feature', value : 'auto', description : 'LADSPA plugin bridge RDF support')
+option('lc3', type : 'feature', value : 'auto', description : 'LC3 (Bluetooth) LE audio codec plugin')
 option('ldac', type : 'feature', value : 'auto', description : 'LDAC bluetooth audio codec plugin')
 option('libde265', type : 'feature', value : 'auto', description : 'HEVC/H.265 video decoder plugin')
 option('openaptx', type : 'feature', value : 'auto', description : 'Open Source implementation of Audio Processing Technology codec (aptX) plugin')
@@ -145,6 +156,7 @@
 option('opus', type : 'feature', value : 'auto', description : 'OPUS audio parser plugin')
 option('qroverlay', type : 'feature', value : 'auto', description : 'Element to set random data on a qroverlay')
 option('qsv', type : 'feature', value : 'auto', description : 'Intel Quick Sync Video plugin')
+option('qt6d3d11', type : 'feature', value : 'auto', description : 'Qt6 Direct3D11 plugin')
 option('resindvd', type : 'feature', value : 'auto', description : 'Resin DVD playback plugin (GPL - only built if gpl option is also enabled!)')
 option('rsvg', type : 'feature', value : 'auto', description : 'SVG overlayer and image decoder plugin')
 option('rtmp', type : 'feature', value : 'auto', description : 'RTMP video network source and sink plugin')
@@ -157,6 +169,7 @@
 option('spandsp', type : 'feature', value : 'auto', description : 'Packet loss concealment audio plugin')
 option('srt', type : 'feature', value : 'auto', description : 'Secure, Reliable, Transport client/server network source/sink plugin')
 option('srtp', type : 'feature', value : 'auto', description : 'Secure RTP codec plugin')
+option('svtav1', type : 'feature', value : 'auto', description : 'Scalable Video Technology for AV1 plugin')
 option('svthevcenc', type : 'feature', value : 'auto', description : 'Scalable Video Technology for HEVC encoder plugin')
 option('teletext', type : 'feature', value : 'auto', description : 'Teletext plugin')
 option('tinyalsa', type : 'feature', value : 'auto', description : 'TinyALSA plugin')
@@ -170,7 +183,7 @@
 option('wasapi', type : 'feature', value : 'auto', description : 'Windows Audio Session API source/sink plugin')
 option('wasapi2', type : 'feature', value : 'auto', description : 'Windows Audio Session API source/sink plugin with WinRT API')
 option('webp', type : 'feature', value : 'auto', description : 'WebP image codec plugin')
-option('webrtc', type : 'feature', value : 'auto', description : 'WebRTC audio/video network bin plugin')
+option('webrtc', type : 'feature', value : 'auto', yield: true, description : 'WebRTC audio/video network bin plugin')
 option('webrtcdsp', type : 'feature', value : 'auto', description : 'Plugin with various audio filters provided by the WebRTC audio processing library')
 option('wildmidi', type : 'feature', value : 'auto', description : 'WildMidi midi soft synth plugin')
 option('wic', type : 'feature', value : 'auto', description : 'Windows Imaging Component plugin')
@@ -181,10 +194,28 @@
 option('zbar', type : 'feature', value : 'auto', description : 'Barcode image scanner plugin using zbar library')
 option('zxing', type : 'feature', value : 'auto', description : 'Barcode image scanner plugin using zxing-cpp library')
 option('wpe', type : 'feature', value : 'auto', description : 'WPE Web browser plugin')
+option(
+  'wpe_api',
+  type: 'combo',
+  value: 'auto',
+  choices: 'auto', '1.0', '1.1', '2.0',
+  description: 'WPE WebKit API to target (1.0 = soup2, 1.1/2.0 = soup3)'
+)
+
 option('magicleap', type : 'feature', value : 'auto', description : 'Magic Leap platform support')
 option('v4l2codecs', type : 'feature', value : 'auto', description : 'Video4Linux Stateless CODECs support')
+option('uvcgadget', type : 'feature', value : 'auto', description : 'uvc video gadget plugin')
 option('isac', type : 'feature', value : 'auto', description : 'iSAC plugin')
 
+# AJA plugin options
+option('aja-sdk-dir', type : 'string', value : '',
+  description : 'Directory with AJA SDK, e.g. ntv2sdklinux_16.0.0.4')
+
+# D3D11 plugin options
+option('d3d11-math', type : 'feature', value : 'auto', description : 'Enable DirectX SIMD Math support')
+option('d3d11-hlsl-precompile', type : 'feature', value : 'auto', description : 'Enable buildtime HLSL compile for d3d11 library/plugin')
+option('d3d11-wgc', type : 'feature', value : 'auto', description : 'Windows Graphics Capture API support in d3d11 plugin')
+
 # HLS plugin options
 option('hls', type : 'feature', value : 'auto', description : 'HTTP Live Streaming plugin')
 option('hls-crypto', type : 'combo', value : 'auto', choices : 'auto', 'nettle', 'libgcrypt', 'openssl',
@@ -202,12 +233,17 @@
 option('mfx-modules-dir', type: 'string', value : '',
        description : 'libmfx runtime module dir, linux only')
 
+# Vulkan plugin options
+option('vulkan-video', type: 'feature', value: 'auto',
+       description: 'Whether to use Vulkan Video Extensions')
+
 # License-related feature options
 option('gpl', type: 'feature', value: 'disabled', yield: true,
   description: 'Allow build plugins that have (A)GPL-licensed dependencies')
 
 # Common feature options
 option('examples', type : 'feature', value : 'auto', yield : true)
+option('tools', type : 'feature', value : 'auto', yield : true)
 option('tests', type : 'feature', value : 'auto', yield : true)
 option('introspection', type : 'feature', value : 'auto', yield : true, description : 'Generate gobject-introspection bindings')
 option('nls', type : 'feature', value : 'auto', yield: true, description : 'Enable native language support (translations)')

gst-plugins-bad-1.22.7.tar.xz/po/gst-plugins-bad-1.0.pot -> gst-plugins-bad-1.24.5.tar.xz/po/gst-plugins-bad-1.0.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gst-plugins-bad-1.22.7\n"
+"Project-Id-Version: gst-plugins-bad-1.24.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-13 11:10+0000\n"
+"POT-Creation-Date: 2024-06-20 12:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,7 +61,7 @@
 msgid "Generated file has a larger preroll time than its streams duration"
 msgstr ""
 
-#: gst/camerabin2/camerabingeneral.c:167 gst/camerabin2/gstcamerabin2.c:1866
+#: gst/camerabin2/camerabingeneral.c:167 gst/camerabin2/gstcamerabin2.c:1885
 #: gst/camerabin2/gstdigitalzoom.c:283 gst/camerabin2/gstviewfinderbin.c:275
 #, c-format
 msgid "Missing element '%s' - check your GStreamer installation."
@@ -75,7 +75,7 @@
 msgid "Digitalzoom element couldn't be created"
 msgstr ""
 
-#: gst/dvdspu/gstdvdspu.c:1044
+#: gst/dvdspu/gstdvdspu.c:1559
 msgid "Subpicture format was not configured before data flow"
 msgstr ""
 
@@ -89,7 +89,7 @@
 msgstr ""
 
 #: gst-libs/gst/adaptivedemux/gstadaptivedemux.c:4102
-#: gst/mpegtsdemux/mpegtsbase.c:1756
+#: gst/mpegtsdemux/mpegtsbase.c:1777
 msgid "Internal data stream error."
 msgstr ""

gst-plugins-bad-1.22.7.tar.xz/po/gst-plugins-bad.pot -> gst-plugins-bad-1.24.5.tar.xz/po/gst-plugins-bad.pot Changed

gst-plugins-bad-1.22.7.tar.xz/po/lv.po -> gst-plugins-bad-1.24.5.tar.xz/po/lv.po Changed

@@ -4,584 +4,130 @@
 # Arvis Lācis <arvis.lacis@inbox.lv>, 2009.
 # Rihards Priedītis <rprieditis@gmail.com>, 2011.
 # Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2014.
+# Rihards Priedītis <rprieditis@gmail.com>, 2023.
 msgid ""
 msgstr ""
-"Project-Id-Version: gst-plugins-bad 1.2.1\n"
+"Project-Id-Version: gst-plugins-bad 1.21.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-25 01:02+0100\n"
-"PO-Revision-Date: 2014-04-20 15:52+0300\n"
-"Last-Translator: Rihards Prieditis <rprieditis@gmail.com>\n"
+"POT-Creation-Date: 2023-01-13 19:12+0000\n"
+"PO-Revision-Date: 2023-12-24 18:28+0000\n"
+"Last-Translator: Rihards Priedītis <rprieditis@gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
 "Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
-"X-Poedit-Language: Latvian\n"
-"X-Poedit-Country: LATVIA\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 3.4.2\n"
 
 msgid "No URL set."
-msgstr ""
+msgstr "URL nav iestatīts."
 
 msgid "OpenCV failed to load template image"
-msgstr ""
+msgstr "OpenCV neizdevās ielādēt veidnes attēlu"
 
 msgid "Could not read title information for DVD."
-msgstr "Nevarēja nolasīt virsrakstu informāciju no DVD."
+msgstr "Nevar nolasīt DVD sadaļas informāciju."
 
 #, c-format
 msgid "Failed to open DVD device '%s'."
-msgstr "Neizdevās atvērt DVD ierīci “%s”."
+msgstr "Neizdevās atvērt DVD ierīci '%s'."
 
 msgid "Failed to set PGC based seeking."
-msgstr "Neizdevās iestatīt uz PGC balstīto meklēšanu."
+msgstr "Neizdevās iestatīt PGC balstītu meklēšanu."
 
 msgid ""
 "Could not read DVD. This may be because the DVD is encrypted and a DVD "
 "decryption library is not installed."
 msgstr ""
-"Nevarēja nolasīt DVD. Iespējams, ka DVD ir šifrēts un DVD atšifrēšanas "
-"bibliotēka nav uzinstalēta."
+"Nevar nolasīt DVD. Tas var būt tāpēc, ka DVD ir šifrēts un nav instalēta DVD "
+"atšifrēšanas bibliotēka."
 
 msgid "Could not read DVD."
-msgstr "Nevarēja nolasīt DVD."
+msgstr "Nevar nolasīt DVD."
 
 msgid "This file contains no playable streams."
-msgstr "Šī datne nesatur atskaņojamas straumes."
+msgstr "Šajā failā nav atskaņojamu plūsmu."
 
-#, fuzzy
 msgid "Could not open sndfile stream for reading."
-msgstr "Nevarēja atvērt datni “%s” lasīšanai."
+msgstr "Nevarēja atvērt sndfile plūsmu lasīšanai."
 
 msgid "Generated file has a larger preroll time than its streams duration"
 msgstr ""
-"Izveidotajai datnei ir lielāks pirms-atskaņojuma laiks, kā straumes garums"
+"Izveidotā faila priekšatvēršanas laiks ir lielāks nekā tā plūsmas ilgums"
 
 #, c-format
 msgid "Missing element '%s' - check your GStreamer installation."
-msgstr "Trūkst elementa “%s” — pārbaudiet savu GStreamer instalāciju."
+msgstr "Trūkst elements '%s' - pārbaudiet GStreamer instalāciju."
 
 msgid "File location is set to NULL, please set it to a valid filename"
 msgstr ""
-"Datnes vieta ir iestatīta uz NULL, lūdzu, iestatiet derīgu datnes nosaukumu"
+"Faila atrašanās vieta ir iestatīta uz NULL, lūdzu, iestatiet to uz derīgu "
+"faila nosaukumu"
 
 msgid "Digitalzoom element couldn't be created"
-msgstr ""
+msgstr "Nebija iespējams izveidot Digitalzoom elementu"
 
 msgid "Subpicture format was not configured before data flow"
-msgstr "Apakšattēla formāts netika konfigurēts pirms datu plūsmas"
+msgstr "Pirms datu plūsmas netika konfigurēts apakšattēla formāts"
 
 msgid "Failed to get fragment URL."
-msgstr "Neizdevās saņemt fragmenta URL."
+msgstr "Neizdevās iegūt fragmenta URL."
 
 #, c-format
 msgid "Couldn't download fragments"
 msgstr "Nevarēja lejupielādēt fragmentus"
 
 msgid "Internal data stream error."
-msgstr "Iekšējās datu plūsmas kļūda."
+msgstr "Iekšējā datu plūsmas kļūda."
 
 #, c-format
 msgid "Device \"%s\" does not exist."
-msgstr "Ierīce “%s” neeksistē."
+msgstr "Ierīce \"%s\" neeksistē."
 
 #, c-format
 msgid "Could not open frontend device \"%s\"."
-msgstr "Nevarēja atvērt priekšējo ierīci “%s”."
+msgstr "Nevar atvērt priekšējo ierīci \"%s\"."
 
 #, c-format
 msgid "Could not get settings from frontend device \"%s\"."
-msgstr "Nevarēja saņemt iestatījumus no priekšējās ierīces “%s”."
+msgstr "Nevar iegūt iestatījumus no priekšējās ierīces \"%s\"."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot enumerate delivery systems from frontend device \"%s\"."
-msgstr "Nevarēja saņemt iestatījumus no priekšējās ierīces “%s”."
+msgstr ""
+"Nav iespējams uzskaitīt piegādes sistēmas no priekšējās ierīces \"%s\"."
 
 #, c-format
 msgid "Could not open file \"%s\" for reading."
-msgstr "Nevarēja atvērt datni “%s” lasīšanai."
+msgstr "Nevar atvērt failu \"%s\" lasīšanai."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find channel configuration file"
-msgstr "Nevarēja atrast DVB kanāla konfigurācijas datni"
+msgstr "Nevar atrast kanāla konfigurācijas failu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't load channel configuration file: '%s'"
-msgstr "Nevarēja ielādēt DVB kanāla konfigurācijas datni: %s"
+msgstr "Nevar ielādēt kanāla konfigurācijas failu: '%s'"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find details for channel '%s'"
-msgstr "Nevarēja atrast sīkāku informāciju par DVB kanālu %s"
+msgstr "Nebija iespējams atrast informāciju par kanālu '%s'"
 
-#, fuzzy, c-format
+#, c-format
 msgid "No properties for channel '%s'"
-msgstr "Nevarēja atrast sīkāku informāciju par DVB kanālu %s"
-
-#, fuzzy, c-format
-msgid "Failed to set properties for channel '%s'"
-msgstr "Neizdevās atvērt DVD ierīci “%s”."
-
-#, fuzzy, c-format
-msgid "Couldn't find channel configuration file: '%s'"
-msgstr "Nevarēja atrast DVB kanāla konfigurācijas datni"
-
-#, fuzzy, c-format
-msgid "Channel configuration file doesn't contain any channels"
-msgstr "DVB kanāla konfigurācijas datne nesatur nevienu kanālu"
-
-#~ msgid "Couldn't get the Manifest's URI"
-#~ msgstr "Nevarēja saņemt manifesta URI"
-
-#~ msgid "No file name specified for writing."
-#~ msgstr "Ierakstīšanai nav norādīts neviens datnes nosaukums."
+msgstr "Kanālam '%s' nav īpašības"
 
 #, c-format
-#~ msgid "Could not open file \"%s\" for writing."
-#~ msgstr "Nav iespējams atvērt datni “%s” ierakstīšanai."
+msgid "Failed to set properties for channel '%s'"
+msgstr "Neizdevās iestatīt īpašības kanālam '%s'"
 
 #, c-format
-#~ msgid "Could not write to file \"%s\"."
-#~ msgstr "Nevarēja ierakstīt datnē “%s”."
-
-#~ msgid "Could not establish connection to sndio"
-#~ msgstr "Nevarēja izveidot savienojumu ar sndio"
-
-#~ msgid "Failed to query sndio capabilities"
-#~ msgstr "Neizdevās apvaicāt sndio iespējas"
-
-#~ msgid "Could not configure sndio"
-#~ msgstr "Nevarēja konfigurēt sndio"
-
-#~ msgid "Could not start sndio"
-#~ msgstr "Nevarēja palaist sndio"
-
-#~ msgid "Internal data flow error."
-#~ msgstr "Iekšēja datu plūsmas kļūda."
+msgid "Couldn't find channel configuration file: '%s'"
+msgstr "Nevar atrast kanāla konfigurācijas failu: '%s'"
 
 #, c-format
-#~ msgid ""
-#~ "Given file name \"%s\" can't be converted to local file name encoding."
-#~ msgstr ""
-#~ "Doto datnes nosaukumu “%s” nevar pārveidot uz lokālo datnes nosaukuma "
-#~ "kodējumu."
-
-#~ msgid "Internal clock error."
-#~ msgstr "Iekšējā pulksteņa kļūda."
-
-#~ msgid "Could not open audio device for mixer control handling."
-#~ msgstr "Nav iespējams atvērt audio ierīci jaucēja kontroles vadīšanai."
-
-#~ msgid ""
-#~ "Could not open audio device for mixer control handling. This version of "
-#~ "the Open Sound System is not supported by this element."
-#~ msgstr ""
-#~ "Nav iespējams atvērt audio ierīci jaucēja kontroles vadīšanai. Šis "
-#~ "elements neatbalsta šo Open Sound System versiju."
-
-#~ msgid "Volume"
-#~ msgstr "Skaļums"
-
-#~ msgid "Master"
-#~ msgstr "Galvenais"
-
-#~ msgid "Front"
-#~ msgstr "Priekšpuse"
-
-#~ msgid "Rear"
-#~ msgstr "Aizmugure"
-
-#~ msgid "Headphones"
-#~ msgstr "Austiņas"
-
-#~ msgid "Center"
-#~ msgstr "Centrāls"
-
-#~ msgid "LFE"
-#~ msgstr "LFE"
-
-#~ msgid "Surround"
-#~ msgstr "Ieskaujošs"
-
-#~ msgid "Side"
-#~ msgstr "Puse"
-
-#~ msgid "Built-in Speaker"
-#~ msgstr "Iebūvētais skaļrunis"
-
-#~ msgid "AUX 1 Out"
-#~ msgstr "AUX 1 izeja"
-
-#~ msgid "AUX 2 Out"
-#~ msgstr "AUX 2 izeja"
-
-#~ msgid "AUX Out"
-#~ msgstr "AUX izeja"
-
-#~ msgid "Bass"
-#~ msgstr "Basi"
-
-#~ msgid "Treble"
-#~ msgstr "Diskants"
-
-#~ msgid "3D Depth"
-#~ msgstr "3D dziļums"
-
-#~ msgid "3D Center"
-#~ msgstr "3D centrēts"
-
-#~ msgid "3D Enhance"
-#~ msgstr "3D aptverošs"
-
-#~ msgid "Telephone"
-#~ msgstr "Telefons"
-
-#~ msgid "Microphone"
-#~ msgstr "Mikrofons"
-
-#~ msgid "Line Out"
-#~ msgstr "Skaņas izeja"
-
-#~ msgid "Line In"
-#~ msgstr "Skaņas ieeja"
-
-#~ msgid "Internal CD"
-#~ msgstr "Iekšējais CD"
-
-#~ msgid "Video In"
-#~ msgstr "Video ieeja"
-
-#~ msgid "AUX 1 In"
-#~ msgstr "AUX 1 ieeja"
-
-#~ msgid "AUX 2 In"
-#~ msgstr "AUX 2 ieeja"
-
-#~ msgid "AUX In"
-#~ msgstr "AUX ieeja"
-
-#~ msgid "PCM"
-#~ msgstr "PCM"
-
-#~ msgid "Record Gain"
-#~ msgstr "Ierakstīšanas pieaugums"
-
-#~ msgid "Output Gain"
-#~ msgstr "Izvades pieaugums"
-
-#~ msgid "Microphone Boost"
-#~ msgstr "Mikrofona pastiprinājums"
-
-#~ msgid "Loopback"
-#~ msgstr "Atkārtošana"
-
-#~ msgid "Diagnostic"
-#~ msgstr "Diagnostika"
-
-#~ msgid "Bass Boost"
-#~ msgstr "Basu pastiprinājums"
-
-#~ msgid "Playback Ports"
-#~ msgstr "Atskaņošanas porti"
-
-#~ msgid "Input"
-#~ msgstr "Ievade"
-
-#~ msgid "Record Source"
-#~ msgstr "Ierakstīšanas avots"
-
-#~ msgid "Monitor Source"
-#~ msgstr "Monitora avots"
-
-#~ msgid "Keyboard Beep"
-#~ msgstr "Klaviatūras pīkstiens"
-
-#~ msgid "Monitor"
-#~ msgstr "Monitors"
-
-#~ msgid "Simulate Stereo"
-#~ msgstr "Simulēt stereo"
-
-#~ msgid "Stereo"
-#~ msgstr "Stereo"
-
-#~ msgid "Surround Sound"
-#~ msgstr "Ieskaujoša skaņa"
-
-#~ msgid "Microphone Gain"
-#~ msgstr "Mikrofona pieaugums"
-
-#~ msgid "Speaker Source"
-#~ msgstr "Skaļruņa avots"
-
-#~ msgid "Microphone Source"
-#~ msgstr "Mikrofona avots"
-
-#~ msgid "Jack"
-#~ msgstr "Ligzda"
-
-#~ msgid "Center / LFE"
-#~ msgstr "Centrālais / LFE"
-
-#~ msgid "Stereo Mix"
-#~ msgstr "Stereo jaukšana"
-
-#~ msgid "Mono Mix"
-#~ msgstr "Mono jaukšana"
-
-#~ msgid "Input Mix"
-#~ msgstr "Ievades jaukšana"
-
-#~ msgid "SPDIF In"
-#~ msgstr "SPDIF ieeja"
-
-#~ msgid "SPDIF Out"
-#~ msgstr "SPDIF izeja"
-
-#~ msgid "Microphone 1"
-#~ msgstr "Mikrofons 1"
-
-#~ msgid "Microphone 2"
-#~ msgstr "Mikrofons 2"
-
-#~ msgid "Digital Out"
-#~ msgstr "Digitālā izeja"
-
-#~ msgid "Digital In"
-#~ msgstr "Digitālā ieeja"
-
-#~ msgid "HDMI"
-#~ msgstr "HDMI"
-
-#~ msgid "Modem"
-#~ msgstr "Modems"
-
-#~ msgid "Handset"
-#~ msgstr "Papildierīce"
-
-#~ msgid "Other"
-#~ msgstr "Cits"
-
-#~ msgid "None"
-#~ msgstr "Nav"
-
-#~ msgid "On"
-#~ msgstr "Ieslēgts"
-
-#~ msgid "Off"
-#~ msgstr "Izslēgts"
-
-#~ msgid "Mute"
-#~ msgstr "Klusums"
-
-#~ msgid "Fast"
-#~ msgstr "Ātrs"
-
-#~ msgid "Very Low"
-#~ msgstr "Ļoti zems"
-
-#~ msgid "Low"
-#~ msgstr "Zems"
-
-#~ msgid "Medium"
-#~ msgstr "Vidējs"
-
-#~ msgid "High"
-#~ msgstr "Augsts"
-
-#~ msgid "Very High"
-#~ msgstr "Ļoti augsts"
-
-#~ msgid "Production"
-#~ msgstr "Izstrāde"
-
-#~ msgid "Front Panel Microphone"
-#~ msgstr "Priekšējā paneļa nikrofons"
-
-#~ msgid "Front Panel Line In"
-#~ msgstr "Priekšējā paneļa skaņas ieeja"
-
-#~ msgid "Front Panel Headphones"
-#~ msgstr "Priekšējā paneļa austiņas"
-
-#~ msgid "Front Panel Line Out"
-#~ msgstr "Priekšējā paneļa skaņas izeja"
-
-#~ msgid "Green Connector"
-#~ msgstr "Zaļais savienotājs"
-
-#~ msgid "Pink Connector"
-#~ msgstr "Rozā savienotājs"
-
-#~ msgid "Blue Connector"
-#~ msgstr "Zilais savienotājs"
-
-#~ msgid "White Connector"
-#~ msgstr "Baltais savienotājs"
-
-#~ msgid "Black Connector"
-#~ msgstr "Melnais savienotājs"
-
-#~ msgid "Gray Connector"
-#~ msgstr "Pelēkais savienotājs"
-
-#~ msgid "Orange Connector"
-#~ msgstr "Oranžais savienotājs"
-
-#~ msgid "Red Connector"
-#~ msgstr "Sarkanais savienotājs"
-
-#~ msgid "Yellow Connector"
-#~ msgstr "Dzeltenais savienotājs"
-
-#~ msgid "Green Front Panel Connector"
-#~ msgstr "Zaļais priekšējā paneļa savienotājs"
-
-#~ msgid "Pink Front Panel Connector"
-#~ msgstr "Rozā priekšējā paneļa savienotājs"
-
-#~ msgid "Blue Front Panel Connector"
-#~ msgstr "Zilais priekšējā paneļa savienotājs"
-
-#~ msgid "White Front Panel Connector"
-#~ msgstr "Baltais priekšējā paneļa savienotājs"
-
-#~ msgid "Black Front Panel Connector"
-#~ msgstr "Melnais priekšējā paneļa savienotājs"
-
-#~ msgid "Gray Front Panel Connector"
-#~ msgstr "Pelēkais priekšējā paneļa savienotājs"
-
-#~ msgid "Orange Front Panel Connector"
-#~ msgstr "Oranžais priekšējā paneļa savienotājs"
-
-#~ msgid "Red Front Panel Connector"
-#~ msgstr "Sarkanais priekšējā paneļa savienotājs"
-
-#~ msgid "Yellow Front Panel Connector"
-#~ msgstr "Dzeltenais priekšējā paneļa savienotājs"
-
-#~ msgid "Spread Output"
-#~ msgstr "Sadalīt izvadi"
-
-#~ msgid "Downmix"
-#~ msgstr "Pazeminātā jaukšana"
-
-#~ msgid "Virtual Mixer Input"
-#~ msgstr "Virtuālā jaucēja ievads"
-
-#~ msgid "Virtual Mixer Output"
-#~ msgstr "Virtuālā jaucēja izvads"
-
-#~ msgid "Virtual Mixer Channels"
-#~ msgstr "Virtuālā jaucēja kanāli"
-
-#~ msgid "%s Function"
-#~ msgstr "%s funkcija"
-
-#~ msgid "%s %d"
-#~ msgstr "%s %d"
-
-#~ msgid ""
-#~ "Could not open audio device for playback. Device is being used by another "
-#~ "application."
-#~ msgstr ""
-#~ "Nav iespējams atvērt audio ierīci atskaņošanai. Ierīci pašlaik izmanto "
-#~ "cita programma."
-
-#~ msgid ""
-#~ "Could not open audio device for playback. You don't have permission to "
-#~ "open the device."
-#~ msgstr ""
-#~ "Nav iespējams atvērt audio ierīci atskaņošanai. Jums nav nepieciešamās "
-#~ "atļaujas, lai atvērtu ierīci."
-
-#~ msgid "Could not open audio device for playback."
-#~ msgstr "Nav iespējams atvērt audio ierīci atskaņošanai."
-
-#~ msgid ""
-#~ "Could not open audio device for playback. This version of the Open Sound "
-#~ "System is not supported by this element."
-#~ msgstr ""
-#~ "Nav iespējams atvērt audio ierīci atskaņošanai. Šis elements neatbalsta "
-#~ "šo Open Sound System versiju."
-
-#~ msgid "Playback is not supported by this audio device."
-#~ msgstr "Šī audio ierīce neatbalsta atskaņošanu."
-
-#~ msgid "Audio playback error."
-#~ msgstr "Audio atskaņošanas kļūda."
-
-#~ msgid "Recording is not supported by this audio device."
-#~ msgstr "Šī audio ierīce neatbalsta ierakstīšanu."
-
-#~ msgid "Error recording from audio device."
-#~ msgstr "Radās kļūda ierakstot no audio ierīces."
-
-#~ msgid "PCM 1"
-#~ msgstr "PCM 1"
-
-#~ msgid "PCM 2"
-#~ msgstr "PCM 2"
-
-#~ msgid "PCM 3"
-#~ msgstr "PCM 3"
-
-#~ msgid "PCM 4"
-#~ msgstr "PCM 4"
-
-#~ msgid "Green connector function"
-#~ msgstr "Zaļā savienotāja funkcija"
-
-#~ msgid "Green front panel connector function"
-#~ msgstr "Zaļā priekšējā paneļa savienotāja funkcija"
-
-#~ msgid "Pink connector function"
-#~ msgstr "Rozā savienotāja funkcija"
-
-#~ msgid "Pink front panel connector function"
-#~ msgstr "Rozā priekšējā paneļa savienotāja funkcija"
-
-#~ msgid "Blue connector function"
-#~ msgstr "Zilā savienotāja funkcija"
-
-#~ msgid "Blue front panel connector function"
-#~ msgstr "Zilā priekšējā paneļa savienotāja funkcija"
-
-#~ msgid "Orange connector function"
-#~ msgstr "Oranžā savienotāja funkcija"
-
-#~ msgid "Orange front panel connector function"
-#~ msgstr "Oranžā priekšējā paneļa savienotāja funkcija"
-
-#~ msgid "Black connector function"
-#~ msgstr "Melnā savienotāja funkcija"
-
-#~ msgid "Black front panel connector function"
-#~ msgstr "Melnā priekšējā paneļa savienotāja funkcija"
-
-#~ msgid "Gray connector function"
-#~ msgstr "Pelēkā savienotāja funkcija"
-
-#~ msgid "Gray front panel connector function"
-#~ msgstr "Pelēkā priekšējā paneļa savienotāja funkcija"
-
-#~ msgid "White connector function"
-#~ msgstr "Baltā savienotāja funkcija"
-
-#~ msgid "White front panel connector function"
-#~ msgstr "Baltā priekšējā paneļa savienotāja funkcija"
-
-#~ msgid "Red connector function"
-#~ msgstr "Sarkanā savienotāja funkcija"
-
-#~ msgid "Red front panel connector function"
-#~ msgstr "Sarkanā priekšējā paneļa savienotāja funkcija"
-
-#~ msgid "Yellow connector function"
-#~ msgstr "Dzeltenā savienotāja funkcija"
-
-#~ msgid "Yellow front panel connector function"
-#~ msgstr "Dzeltenā priekšējā paneļa savienotāja funkcija"
+msgid "Channel configuration file doesn't contain any channels"
+msgstr "Kanālu konfigurācijas failā nav neviena kanāla"

gst-plugins-bad-1.22.7.tar.xz/scripts/gen-changelog.py -> gst-plugins-bad-1.24.5.tar.xz/scripts/gen-changelog.py Changed

gst-plugins-bad-1.24.5.tar.xz/sys/aja Added

gst-plugins-bad-1.24.5.tar.xz/sys/aja/.clang-format Added

gst-plugins-bad-1.24.5.tar.xz/sys/aja/README.md Added

@@ -0,0 +1,38 @@
+# GStreamer AJA source/sink plugin
+
+GStreamer(https://gstreamer.freedesktop.org/) plugin for
+AJA(https://www.aja.com) capture and output cards.
+
+This plugin requires the AJA NTV2 SDK version 16 or newer.
+
+The location of the SDK can be configured via the `aja-sdk-dir` meson option.
+If no location is given then the NTV2 SDK from
+GitHub(https://github.com/aja-video/ntv2.git) is compiled as a meson
+subproject as part of the plugin.
+
+## Example usage
+
+Capture 1080p30 audio/video and display it locally
+
+```sh
+gst-launch-1.0 ajasrc video-format=1080p-3000 ! ajasrcdemux name=d \
+    d.video ! queue max-size-bytes=0 max-size-buffers=0 max-size-time=1000000000 ! videoconvert ! autovideosink \
+    d.audio ! queue max-size-bytes=0 max-size-buffers=0 max-size-time=1000000000 ! audioconvert ! audioresample ! autoaudiosink
+```
+
+Output a 1080p2997 test audio/video stream
+
+```sh
+gst-launch-1.0 videotestsrc pattern=ball ! video/x-raw,format=v210,width=1920,height=1080,framerate=30000/1001,interlace-mode=progressive ! timeoverlay ! timecodestamper ! combiner.video \
+    audiotestsrc freq=440 ! audio/x-raw,format=S32LE,rate=48000,channels=16 ! audiobuffersplit output-buffer-duration=1/30 ! combiner.audio \
+    ajasinkcombiner name=combiner ! ajasink channel=0
+```
+
+Capture 1080p30 audio/video and directly output it again on the same card
+
+```sh
+gst-launch-1.0 ajasrc video-format=1080p-3000 channel=1 input-source=sdi-1 audio-system=2 ! ajasrcdemux name=d \
+    d.video ! queue max-size-bytes=0 max-size-buffers=0 max-size-time=1000000000 ! c.video \
+    d.audio ! queue max-size-bytes=0 max-size-buffers=0 max-size-time=1000000000 ! c.audio \
+    ajasinkcombiner name=c ! ajasink channel=0 reference-source=input-1
+```

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajacommon.cpp Added

@@ -0,0 +1,1192 @@
+/* GStreamer
+ * Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <fcntl.h>
+#include <sys/file.h>
+
+#include "gstajacommon.h"
+
+GST_DEBUG_CATEGORY_STATIC(gst_aja_debug);
+
+#define GST_CAT_DEFAULT gst_aja_debug
+
+typedef struct {
+  GstAjaVideoFormat gst_format;
+  NTV2VideoFormat aja_format;
+  NTV2VideoFormat quad_format;
+} FormatMapEntry;
+
+static const FormatMapEntry format_map = {
+    {GST_AJA_VIDEO_FORMAT_1080i_5000, NTV2_FORMAT_1080i_5000,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080i_5994, NTV2_FORMAT_1080i_5994,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080i_6000, NTV2_FORMAT_1080i_6000,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_720p_5994, NTV2_FORMAT_720p_5994,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_720p_6000, NTV2_FORMAT_720p_6000,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080psf_2398, NTV2_FORMAT_1080psf_2398,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080psf_2400, NTV2_FORMAT_1080psf_2400,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_2997, NTV2_FORMAT_1080p_2997,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_3000, NTV2_FORMAT_1080p_3000,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_2500, NTV2_FORMAT_1080p_2500,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_2398, NTV2_FORMAT_1080p_2398,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_2400, NTV2_FORMAT_1080p_2400,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_720p_5000, NTV2_FORMAT_720p_5000,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_5000_A, NTV2_FORMAT_1080p_5000_A,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_5994_A, NTV2_FORMAT_1080p_5994_A,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_6000_A, NTV2_FORMAT_1080p_6000_A,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_720p_2398, NTV2_FORMAT_720p_2398,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_720p_5000, NTV2_FORMAT_720p_2500,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080psf_2500_2, NTV2_FORMAT_1080psf_2500_2,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080psf_2997_2, NTV2_FORMAT_1080psf_2997_2,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080psf_3000_2, NTV2_FORMAT_1080psf_3000_2,
+     NTV2_FORMAT_UNKNOWN},
+
+    {GST_AJA_VIDEO_FORMAT_625_5000, NTV2_FORMAT_625_5000, NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_525_5994, NTV2_FORMAT_525_5994, NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_525_2398, NTV2_FORMAT_525_2398, NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_525_2400, NTV2_FORMAT_525_2400, NTV2_FORMAT_UNKNOWN},
+
+    {GST_AJA_VIDEO_FORMAT_1080p_DCI_2398, NTV2_FORMAT_1080p_2K_2398,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_DCI_2400, NTV2_FORMAT_1080p_2K_2400,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_DCI_2500, NTV2_FORMAT_1080p_2K_2500,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_DCI_2997, NTV2_FORMAT_1080p_2K_2997,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_DCI_3000, NTV2_FORMAT_1080p_2K_3000,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_DCI_5000_A, NTV2_FORMAT_1080p_2K_5000_A,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_DCI_5994_A, NTV2_FORMAT_1080p_2K_5994_A,
+     NTV2_FORMAT_UNKNOWN},
+    {GST_AJA_VIDEO_FORMAT_1080p_DCI_6000_A, NTV2_FORMAT_1080p_2K_6000_A,
+     NTV2_FORMAT_UNKNOWN},
+
+    {GST_AJA_VIDEO_FORMAT_2160p_2398, NTV2_FORMAT_3840x2160p_2398,
+     NTV2_FORMAT_4x1920x1080p_2398},
+    {GST_AJA_VIDEO_FORMAT_2160p_2400, NTV2_FORMAT_3840x2160p_2400,
+     NTV2_FORMAT_4x1920x1080p_2400},
+    {GST_AJA_VIDEO_FORMAT_2160p_2500, NTV2_FORMAT_3840x2160p_2500,
+     NTV2_FORMAT_4x1920x1080p_2500},
+    {GST_AJA_VIDEO_FORMAT_2160p_2997, NTV2_FORMAT_3840x2160p_2997,
+     NTV2_FORMAT_4x1920x1080p_2997},
+    {GST_AJA_VIDEO_FORMAT_2160p_3000, NTV2_FORMAT_3840x2160p_3000,
+     NTV2_FORMAT_4x1920x1080p_3000},
+    {GST_AJA_VIDEO_FORMAT_2160p_5000, NTV2_FORMAT_3840x2160p_5000,
+     NTV2_FORMAT_4x1920x1080p_5000},
+    {GST_AJA_VIDEO_FORMAT_2160p_5994, NTV2_FORMAT_3840x2160p_5994,
+     NTV2_FORMAT_4x1920x1080p_5994},
+    {GST_AJA_VIDEO_FORMAT_2160p_6000, NTV2_FORMAT_3840x2160p_6000,
+     NTV2_FORMAT_4x1920x1080p_6000},
+
+    {GST_AJA_VIDEO_FORMAT_2160p_DCI_2398, NTV2_FORMAT_4096x2160p_2398,
+     NTV2_FORMAT_4x2048x1080p_2398},
+    {GST_AJA_VIDEO_FORMAT_2160p_DCI_2400, NTV2_FORMAT_4096x2160p_2400,
+     NTV2_FORMAT_4x2048x1080p_2400},
+    {GST_AJA_VIDEO_FORMAT_2160p_DCI_2500, NTV2_FORMAT_4096x2160p_2500,
+     NTV2_FORMAT_4x2048x1080p_2500},
+    {GST_AJA_VIDEO_FORMAT_2160p_DCI_2997, NTV2_FORMAT_4096x2160p_2997,
+     NTV2_FORMAT_4x2048x1080p_2997},
+    {GST_AJA_VIDEO_FORMAT_2160p_DCI_3000, NTV2_FORMAT_4096x2160p_3000,
+     NTV2_FORMAT_4x2048x1080p_3000},
+    {GST_AJA_VIDEO_FORMAT_2160p_DCI_5000, NTV2_FORMAT_4096x2160p_5000,
+     NTV2_FORMAT_4x2048x1080p_5000},
+    {GST_AJA_VIDEO_FORMAT_2160p_DCI_5994, NTV2_FORMAT_4096x2160p_5994,
+     NTV2_FORMAT_4x2048x1080p_5994},
+    {GST_AJA_VIDEO_FORMAT_2160p_DCI_6000, NTV2_FORMAT_4096x2160p_6000,
+     NTV2_FORMAT_4x2048x1080p_6000},
+
+    {GST_AJA_VIDEO_FORMAT_4320p_2398, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x3840x2160p_2398},
+    {GST_AJA_VIDEO_FORMAT_4320p_2400, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x3840x2160p_2400},
+    {GST_AJA_VIDEO_FORMAT_4320p_2500, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x3840x2160p_2500},
+    {GST_AJA_VIDEO_FORMAT_4320p_2997, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x3840x2160p_2997},
+    {GST_AJA_VIDEO_FORMAT_4320p_3000, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x3840x2160p_3000},
+    {GST_AJA_VIDEO_FORMAT_4320p_5000, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x3840x2160p_5000},
+    {GST_AJA_VIDEO_FORMAT_4320p_5994, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x3840x2160p_5994},
+    {GST_AJA_VIDEO_FORMAT_4320p_6000, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x3840x2160p_6000},
+
+    {GST_AJA_VIDEO_FORMAT_4320p_DCI_2398, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x4096x2160p_2398},
+    {GST_AJA_VIDEO_FORMAT_4320p_DCI_2400, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x4096x2160p_2400},
+    {GST_AJA_VIDEO_FORMAT_4320p_DCI_2500, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x4096x2160p_2500},
+    {GST_AJA_VIDEO_FORMAT_4320p_DCI_2997, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x4096x2160p_2997},
+    {GST_AJA_VIDEO_FORMAT_4320p_DCI_3000, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x4096x2160p_3000},
+    {GST_AJA_VIDEO_FORMAT_4320p_DCI_5000, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x4096x2160p_5000},
+    {GST_AJA_VIDEO_FORMAT_4320p_DCI_5994, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x4096x2160p_5994},
+    {GST_AJA_VIDEO_FORMAT_4320p_DCI_6000, NTV2_FORMAT_UNKNOWN,
+     NTV2_FORMAT_4x4096x2160p_6000},
+};
+
+GstCaps *gst_ntv2_supported_caps(NTV2DeviceID device_id) {
+  GstCaps *caps = gst_caps_new_empty();
+
+  for (gsize i = 0; i < G_N_ELEMENTS(format_map); i++) {
+    const FormatMapEntry &format = format_mapi;
+    GstCaps *tmp = NULL;
+
+    if (device_id == DEVICE_ID_INVALID) {
+      tmp = gst_aja_video_format_to_caps(format.gst_format);
+    } else if ((format.aja_format != NTV2_FORMAT_UNKNOWN &&
+                ::NTV2DeviceCanDoVideoFormat(device_id, format.aja_format)) ||
+               (format.quad_format != NTV2_FORMAT_UNKNOWN &&
+                ::NTV2DeviceCanDoVideoFormat(device_id, format.quad_format))) {
+      tmp = gst_aja_video_format_to_caps(format.gst_format);
+    }
+
+    if (tmp) {
+      // Widescreen PAL/NTSC
+      if (format.gst_format == GST_AJA_VIDEO_FORMAT_525_2398 ||
+          format.gst_format == GST_AJA_VIDEO_FORMAT_525_2400 ||
+          format.gst_format == GST_AJA_VIDEO_FORMAT_525_5994) {
+        GstCaps *tmp2 = gst_caps_copy(tmp);
+        gst_caps_set_simple(tmp2, "pixel-aspect-ratio", GST_TYPE_FRACTION, 40,
+                            33, NULL);
+        gst_caps_append(tmp, tmp2);
+      } else if (format.gst_format == GST_AJA_VIDEO_FORMAT_625_5000) {
+        GstCaps *tmp2 = gst_caps_copy(tmp);
+        gst_caps_set_simple(tmp2, "pixel-aspect-ratio", GST_TYPE_FRACTION, 16,
+                            11, NULL);
+        gst_caps_append(tmp, tmp2);
+      }
+
+      gst_caps_append(caps, tmp);
+    }
+  }
+
+  return caps;
+}
+
+GstCaps *gst_aja_video_format_to_caps(GstAjaVideoFormat format) {
+  const FormatMapEntry *entry = NULL;
+
+  for (gsize i = 0; i < G_N_ELEMENTS(format_map); i++) {
+    const FormatMapEntry &tmp = format_mapi;
+
+    if (tmp.gst_format == format) {
+      entry = &tmp;
+      break;
+    }
+  }
+  g_assert(entry != NULL);
+
+  if (entry->aja_format != NTV2_FORMAT_UNKNOWN)
+    return gst_ntv2_video_format_to_caps(entry->aja_format);
+  if (entry->quad_format != NTV2_FORMAT_UNKNOWN)
+    return gst_ntv2_video_format_to_caps(entry->quad_format);
+
+  g_assert_not_reached();
+}
+
+bool gst_video_info_from_aja_video_format(GstVideoInfo *info,
+                                          GstAjaVideoFormat format) {
+  const FormatMapEntry *entry = NULL;
+
+  for (gsize i = 0; i < G_N_ELEMENTS(format_map); i++) {
+    const FormatMapEntry &tmp = format_mapi;
+
+    if (tmp.gst_format == format) {
+      entry = &tmp;
+      break;
+    }
+  }
+  g_assert(entry != NULL);
+
+  if (entry->aja_format != NTV2_FORMAT_UNKNOWN)
+    return gst_video_info_from_ntv2_video_format(info, entry->aja_format);
+  if (entry->quad_format != NTV2_FORMAT_UNKNOWN)
+    return gst_video_info_from_ntv2_video_format(info, entry->quad_format);
+
+  g_assert_not_reached();
+}
+
+GstCaps *gst_ntv2_video_format_to_caps(NTV2VideoFormat format) {
+  GstVideoInfo info;
+  GstCaps *caps;
+
+  if (!gst_video_info_from_ntv2_video_format(&info, format)) return NULL;
+
+  caps = gst_video_info_to_caps(&info);
+  if (!caps) return caps;
+
+  guint n = gst_caps_get_size(caps);
+  for (guint i = 0; i < n; i++) {
+    GstStructure *s = gst_caps_get_structure(caps, i);
+
+    gst_structure_remove_fields(s, "chroma-site", "colorimetry", NULL);
+  }
+
+  return caps;
+}
+
+bool gst_video_info_from_ntv2_video_format(GstVideoInfo *info,
+                                           NTV2VideoFormat format) {
+  if (format == NTV2_FORMAT_UNKNOWN) return false;
+
+  NTV2Standard standard = ::GetNTV2StandardFromVideoFormat(format);
+  guint width = ::GetDisplayWidth(format);
+  guint height = ::GetDisplayHeight(format);
+  NTV2FrameRate fps = ::GetNTV2FrameRateFromVideoFormat(format);
+  guint fps_n, fps_d;
+  ::GetFramesPerSecond(fps, fps_n, fps_d);
+
+  gst_video_info_set_format(info, GST_VIDEO_FORMAT_v210, width, height);
+  info->fps_n = fps_n;
+  info->fps_d = fps_d;
+  if (NTV2_IS_525_FORMAT(format)) {
+    info->par_n = 10;
+    info->par_d = 11;
+  } else if (NTV2_IS_625_FORMAT(format)) {
+    info->par_n = 12;
+    info->par_d = 11;
+  }
+  info->interlace_mode =
+      (!::IsProgressivePicture(format) && !NTV2_IS_PSF_VIDEO_FORMAT(format))
+          ? GST_VIDEO_INTERLACE_MODE_INTERLEAVED
+          : GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
+
+  if (!::IsProgressiveTransport(format) && !NTV2_IS_PSF_VIDEO_FORMAT(format)) {
+    NTV2SmpteLineNumber line_number = ::GetSmpteLineNumber(standard);
+
+    if (line_number.firstFieldTop) {
+      GST_VIDEO_INFO_FIELD_ORDER(info) = GST_VIDEO_FIELD_ORDER_TOP_FIELD_FIRST;
+    } else {
+      GST_VIDEO_INFO_FIELD_ORDER(info) =
+          GST_VIDEO_FIELD_ORDER_BOTTOM_FIELD_FIRST;
+    }
+  }
+
+  return true;
+}
+
+NTV2VideoFormat gst_ntv2_video_format_from_caps(const GstCaps *caps,
+                                                bool quad) {
+  GstVideoInfo info;
+
+  if (!gst_video_info_from_caps(&info, caps)) return NTV2_FORMAT_UNKNOWN;
+
+  for (gsize i = 0; i < G_N_ELEMENTS(format_map); i++) {
+    const FormatMapEntry &format = format_mapi;
+    NTV2VideoFormat f = !quad ? format.aja_format : format.quad_format;
+
+    if (f == NTV2_FORMAT_UNKNOWN) continue;
+
+    guint width = ::GetDisplayWidth(f);
+    guint height = ::GetDisplayHeight(f);
+    NTV2FrameRate fps = ::GetNTV2FrameRateFromVideoFormat(f);
+    guint fps_n, fps_d;
+    ::GetFramesPerSecond(fps, fps_n, fps_d);
+
+    if (width == (guint)info.width && height == (guint)info.height &&
+        (guint)info.fps_n == fps_n && (guint)info.fps_d == fps_d &&
+        ((!::IsProgressiveTransport(f) &&
+          info.interlace_mode == GST_VIDEO_INTERLACE_MODE_INTERLEAVED) ||
+         (::IsProgressiveTransport(f) &&
+          info.interlace_mode == GST_VIDEO_INTERLACE_MODE_PROGRESSIVE)))
+      return f;
+  }
+
+  return NTV2_FORMAT_UNKNOWN;
+}
+
+GstAjaVideoFormat gst_aja_video_format_from_caps(const GstCaps *caps) {
+  GstVideoInfo info;
+
+  if (!gst_video_info_from_caps(&info, caps))
+    return GST_AJA_VIDEO_FORMAT_INVALID;
+
+  for (gsize i = 0; i < G_N_ELEMENTS(format_map); i++) {
+    const FormatMapEntry &format = format_mapi;
+    NTV2VideoFormat f = (format.aja_format != NTV2_FORMAT_UNKNOWN)
+                            ? format.aja_format
+                            : format.quad_format;
+
+    if (f == NTV2_FORMAT_UNKNOWN) continue;
+
+    guint width = ::GetDisplayWidth(f);
+    guint height = ::GetDisplayHeight(f);
+    NTV2FrameRate fps = ::GetNTV2FrameRateFromVideoFormat(f);
+    guint fps_n, fps_d;
+    ::GetFramesPerSecond(fps, fps_n, fps_d);
+
+    if (width == (guint)info.width && height == (guint)info.height &&
+        (guint)info.fps_n == fps_n && (guint)info.fps_d == fps_d &&
+        ((!::IsProgressiveTransport(f) &&
+          info.interlace_mode == GST_VIDEO_INTERLACE_MODE_INTERLEAVED) ||
+         (::IsProgressiveTransport(f) &&
+          info.interlace_mode == GST_VIDEO_INTERLACE_MODE_PROGRESSIVE)))
+      return format.gst_format;
+  }
+
+  return GST_AJA_VIDEO_FORMAT_INVALID;
+}
+
+GstAjaVideoFormat gst_aja_video_format_from_ntv2_format(
+    NTV2VideoFormat format) {
+  if (format == NTV2_FORMAT_UNKNOWN) return GST_AJA_VIDEO_FORMAT_INVALID;
+
+  for (gsize i = 0; i < G_N_ELEMENTS(format_map); i++) {
+    const FormatMapEntry &entry = format_mapi;
+    if (entry.aja_format == format || entry.quad_format == format)
+      return entry.gst_format;
+  }
+
+  return GST_AJA_VIDEO_FORMAT_INVALID;
+}
+
+NTV2VideoFormat gst_ntv2_video_format_from_aja_format(GstAjaVideoFormat format,
+                                                      bool quad) {
+  if (format == GST_AJA_VIDEO_FORMAT_INVALID) return NTV2_FORMAT_UNKNOWN;
+
+  for (gsize i = 0; i < G_N_ELEMENTS(format_map); i++) {
+    const FormatMapEntry &entry = format_mapi;
+    if (entry.gst_format == format) {
+      if (!quad && entry.aja_format != NTV2_FORMAT_UNKNOWN)
+        return entry.aja_format;
+      if (quad && entry.quad_format != NTV2_FORMAT_UNKNOWN)
+        return entry.quad_format;
+    }
+  }
+
+  return NTV2_FORMAT_UNKNOWN;
+}
+
+bool gst_ntv2_video_format_is_quad(NTV2VideoFormat format) {
+  return (format >= NTV2_FORMAT_FIRST_4K_DEF_FORMAT &&
+          format < NTV2_FORMAT_END_4K_DEF_FORMATS) ||
+         (format >= NTV2_FORMAT_FIRST_4K_DEF_FORMAT2 &&
+          format < NTV2_FORMAT_END_4K_DEF_FORMATS2) ||
+         (format >= NTV2_FORMAT_FIRST_UHD2_DEF_FORMAT &&
+          format < NTV2_FORMAT_END_UHD2_DEF_FORMATS) ||
+         (format >= NTV2_FORMAT_FIRST_UHD2_FULL_DEF_FORMAT &&
+          format < NTV2_FORMAT_END_UHD2_FULL_DEF_FORMATS);
+}
+
+GType gst_aja_audio_meta_api_get_type(void) {
+  static GType type;
+
+  if (g_once_init_enter(&type)) {
+    static const gchar *tags = {NULL};
+    GType _type = gst_meta_api_type_register("GstAjaAudioMetaAPI", tags);
+    GST_INFO("registering");
+    g_once_init_leave(&type, _type);
+  }
+  return type;
+}
+
+static gboolean gst_aja_audio_meta_transform(GstBuffer *dest, GstMeta *meta,
+                                             GstBuffer *buffer, GQuark type,
+                                             gpointer data) {
+  GstAjaAudioMeta *dmeta, *smeta;
+
+  if (GST_META_TRANSFORM_IS_COPY(type)) {
+    smeta = (GstAjaAudioMeta *)meta;
+
+    GST_TRACE("copy AJA audio metadata");
+    dmeta = gst_buffer_add_aja_audio_meta(dest, smeta->buffer);
+    if (!dmeta) return FALSE;
+  } else {
+    /* return FALSE, if transform type is not supported */
+    return FALSE;
+  }
+  return TRUE;
+}
+
+static gboolean gst_aja_audio_meta_init(GstMeta *meta, gpointer params,
+                                        GstBuffer *buffer) {
+  GstAjaAudioMeta *emeta = (GstAjaAudioMeta *)meta;
+
+  emeta->buffer = NULL;
+
+  return TRUE;
+}
+
+static void gst_aja_audio_meta_free(GstMeta *meta, GstBuffer *buffer) {
+  GstAjaAudioMeta *emeta = (GstAjaAudioMeta *)meta;
+
+  gst_buffer_replace(&emeta->buffer, NULL);
+}
+
+const GstMetaInfo *gst_aja_audio_meta_get_info(void) {
+  static const GstMetaInfo *meta_info = NULL;
+
+  if (g_once_init_enter((GstMetaInfo **)&meta_info)) {
+    const GstMetaInfo *mi = gst_meta_register(
+        GST_AJA_AUDIO_META_API_TYPE, "GstAjaAudioMeta", sizeof(GstAjaAudioMeta),
+        gst_aja_audio_meta_init, gst_aja_audio_meta_free,
+        gst_aja_audio_meta_transform);
+    g_once_init_leave((GstMetaInfo **)&meta_info, (GstMetaInfo *)mi);
+  }
+  return meta_info;
+}
+
+GstAjaAudioMeta *gst_buffer_add_aja_audio_meta(GstBuffer *buffer,
+                                               GstBuffer *audio_buffer) {
+  GstAjaAudioMeta *meta;
+
+  g_return_val_if_fail(buffer != NULL, NULL);
+  g_return_val_if_fail(audio_buffer != NULL, NULL);
+
+  meta = (GstAjaAudioMeta *)gst_buffer_add_meta(buffer, GST_AJA_AUDIO_META_INFO,
+                                                NULL);
+
+  meta->buffer = gst_buffer_ref(audio_buffer);
+
+  return meta;
+}
+
+typedef struct {
+  GstMemory mem;
+
+  guint8 *data;
+} GstAjaMemory;
+
+typedef struct {
+  guint8 *data;
+  gsize size;
+} FreedMemory;
+
+G_DEFINE_TYPE(GstAjaAllocator, gst_aja_allocator, GST_TYPE_ALLOCATOR);
+
+static inline void _aja_memory_init(GstAjaAllocator *alloc, GstAjaMemory *mem,
+                                    GstMemoryFlags flags, GstMemory *parent,
+                                    gpointer data, gsize maxsize, gsize offset,
+                                    gsize size) {
+  gst_memory_init(GST_MEMORY_CAST(mem), flags, GST_ALLOCATOR(alloc), parent,
+                  maxsize, 4095, offset, size);
+
+  mem->data = (guint8 *)data;
+}
+
+static inline GstAjaMemory *_aja_memory_new(GstAjaAllocator *alloc,
+                                            GstMemoryFlags flags,
+                                            GstAjaMemory *parent, gpointer data,
+                                            gsize maxsize, gsize offset,
+                                            gsize size) {
+  GstAjaMemory *mem;
+
+  mem = (GstAjaMemory *)g_new0(GstAjaMemory, 1);
+  _aja_memory_init(alloc, mem, flags, (GstMemory *)parent, data, maxsize,
+                   offset, size);
+
+  return mem;
+}
+
+static GstAjaMemory *_aja_memory_new_block(GstAjaAllocator *alloc,
+                                           GstMemoryFlags flags, gsize maxsize,
+                                           gsize offset, gsize size) {
+  GstAjaMemory *mem;
+  guint8 *data = NULL;
+
+  mem = (GstAjaMemory *)g_new0(GstAjaMemory, 1);
+
+  GST_OBJECT_LOCK(alloc);
+  guint n = gst_queue_array_get_length(alloc->freed_mems);
+  for (guint i = 0; i < n; i++) {
+    FreedMemory *fmem =
+        (FreedMemory *)gst_queue_array_peek_nth_struct(alloc->freed_mems, i);
+
+    if (fmem->size == size) {
+      data = fmem->data;
+      GST_TRACE_OBJECT(
+          alloc, "Using cached freed memory of size %" G_GSIZE_FORMAT " at %p",
+          fmem->size, fmem->data);
+      gst_queue_array_drop_struct(alloc->freed_mems, i, NULL);
+      break;
+    }
+  }
+  GST_OBJECT_UNLOCK(alloc);
+
+  if (!data) {
+    data = (guint8 *)AJAMemory::AllocateAligned(maxsize, 4096);
+    GST_TRACE_OBJECT(alloc,
+                     "Allocated memory of size %" G_GSIZE_FORMAT " at %p",
+                     maxsize, data);
+    if (!alloc->device->device->DMABufferLock((ULWord *)data, maxsize, true)) {
+      GST_WARNING_OBJECT(alloc, "Failed to pre-lock memory");
+    }
+  }
+
+  _aja_memory_init(alloc, mem, flags, NULL, data, maxsize, offset, size);
+
+  return mem;
+}
+
+static gpointer _aja_memory_map(GstAjaMemory *mem, gsize maxsize,
+                                GstMapFlags flags) {
+  return mem->data;
+}
+
+static gboolean _aja_memory_unmap(GstAjaMemory *mem) { return TRUE; }
+
+static GstMemory *_aja_memory_copy(GstAjaMemory *mem, gssize offset,
+                                   gsize size) {
+  GstMemory *copy;
+  GstMapInfo map;
+
+  if (size == (gsize)-1)
+    size = mem->mem.size > (gsize)offset ? mem->mem.size - offset : 0;
+
+  copy = gst_allocator_alloc(mem->mem.allocator, size, NULL);
+  gst_memory_map(copy, &map, GST_MAP_READ);
+  GST_DEBUG("memcpy %" G_GSIZE_FORMAT " memory %p -> %p", size, mem, copy);
+  memcpy(map.data, mem->data + mem->mem.offset + offset, size);
+  gst_memory_unmap(copy, &map);
+
+  return copy;
+}
+
+static GstAjaMemory *_aja_memory_share(GstAjaMemory *mem, gssize offset,
+                                       gsize size) {
+  GstAjaMemory *sub;
+  GstAjaMemory *parent;
+
+  /* find the real parent */
+  if ((parent = (GstAjaMemory *)mem->mem.parent) == NULL)
+    parent = (GstAjaMemory *)mem;
+
+  if (size == (gsize)-1) size = mem->mem.size - offset;
+
+  sub = _aja_memory_new(GST_AJA_ALLOCATOR(parent->mem.allocator),
+                        (GstMemoryFlags)(GST_MINI_OBJECT_FLAGS(parent) |
+                                         GST_MINI_OBJECT_FLAG_LOCK_READONLY),
+                        parent, parent->data, mem->mem.maxsize,
+                        mem->mem.offset + offset, size);
+
+  return sub;
+}
+
+static GstMemory *gst_aja_allocator_alloc(GstAllocator *alloc, gsize size,
+                                          GstAllocationParams *params) {
+  g_warn_if_fail(params->prefix == 0);
+  g_warn_if_fail(params->padding == 0);
+
+  return (GstMemory *)_aja_memory_new_block(GST_AJA_ALLOCATOR(alloc),
+                                            params->flags, size, 0, size);
+}
+
+static void gst_aja_allocator_free(GstAllocator *alloc, GstMemory *mem) {
+  GstAjaMemory *dmem = (GstAjaMemory *)mem;
+
+  if (!mem->parent) {
+    GstAjaAllocator *aja_alloc = GST_AJA_ALLOCATOR(alloc);
+
+    GST_OBJECT_LOCK(aja_alloc);
+    while (gst_queue_array_get_length(aja_alloc->freed_mems) > 8) {
+      FreedMemory *fmem =
+          (FreedMemory *)gst_queue_array_pop_head_struct(aja_alloc->freed_mems);
+
+      GST_TRACE_OBJECT(
+          alloc, "Freeing cached memory of size %" G_GSIZE_FORMAT " at %p",
+          fmem->size, fmem->data);
+      aja_alloc->device->device->DMABufferUnlock((ULWord *)fmem->data,
+                                                 fmem->size);
+      AJAMemory::FreeAligned(fmem->data);
+    }
+
+    FreedMemory fmem;
+    GST_TRACE_OBJECT(alloc,
+                     "Caching freed memory of size %" G_GSIZE_FORMAT " at %p",
+                     mem->maxsize, dmem->data);
+    fmem.data = dmem->data;
+    fmem.size = mem->size;
+    gst_queue_array_push_tail_struct(aja_alloc->freed_mems, &fmem);
+    GST_OBJECT_UNLOCK(aja_alloc);
+  }
+
+  g_free(dmem);
+}
+
+static void gst_aja_allocator_finalize(GObject *alloc) {
+  GstAjaAllocator *aja_alloc = GST_AJA_ALLOCATOR(alloc);
+
+  GST_DEBUG_OBJECT(alloc, "Freeing allocator");
+
+  FreedMemory *mem;
+  while ((mem = (FreedMemory *)gst_queue_array_pop_head_struct(
+              aja_alloc->freed_mems))) {
+    GST_TRACE_OBJECT(alloc, "Freeing cached memory at %p", mem->data);
+    aja_alloc->device->device->DMABufferUnlock((ULWord *)mem->data, mem->size);
+    AJAMemory::FreeAligned(mem->data);
+  }
+
+  gst_aja_ntv2_device_unref(aja_alloc->device);
+
+  G_OBJECT_CLASS(gst_aja_allocator_parent_class)->finalize(alloc);
+}
+
+static void gst_aja_allocator_class_init(GstAjaAllocatorClass *klass) {
+  GObjectClass *gobject_class;
+  GstAllocatorClass *allocator_class;
+
+  gobject_class = (GObjectClass *)klass;
+  allocator_class = (GstAllocatorClass *)klass;
+
+  gobject_class->finalize = gst_aja_allocator_finalize;
+
+  allocator_class->alloc = gst_aja_allocator_alloc;
+  allocator_class->free = gst_aja_allocator_free;
+}
+
+static void gst_aja_allocator_init(GstAjaAllocator *aja_alloc) {
+  GstAllocator *alloc = GST_ALLOCATOR_CAST(aja_alloc);
+
+  alloc->mem_type = GST_AJA_ALLOCATOR_MEMTYPE;
+  alloc->mem_map = (GstMemoryMapFunction)_aja_memory_map;
+  alloc->mem_unmap = (GstMemoryUnmapFunction)_aja_memory_unmap;
+  alloc->mem_copy = (GstMemoryCopyFunction)_aja_memory_copy;
+  alloc->mem_share = (GstMemoryShareFunction)_aja_memory_share;
+}
+
+GstAllocator *gst_aja_allocator_new(GstAjaNtv2Device *device) {
+  GstAjaAllocator *alloc =
+      (GstAjaAllocator *)g_object_new(GST_TYPE_AJA_ALLOCATOR, NULL);
+
+  alloc->device = gst_aja_ntv2_device_ref(device);
+  alloc->freed_mems = gst_queue_array_new_for_struct(sizeof(FreedMemory), 16);
+
+  GST_DEBUG_OBJECT(alloc, "Creating allocator for device %d",
+                   device->device->GetIndexNumber());
+
+  return GST_ALLOCATOR(alloc);
+}
+
+GstAjaNtv2Device *gst_aja_ntv2_device_obtain(const gchar *device_identifier) {
+  CNTV2Device *device = new CNTV2Device();
+
+  if (!CNTV2DeviceScanner::GetFirstDeviceFromArgument(device_identifier,
+                                                      *device)) {
+    delete device;
+    return NULL;
+  }
+
+  gchar *path = g_strdup_printf("/dev/ajantv2%d", device->GetIndexNumber());
+  int fd = open(path, O_RDONLY);
+  if (fd < 0) {
+    GST_ERROR("Failed to open device node %s: %s", path, g_strerror(errno));
+    delete device;
+    g_free(path);
+    return NULL;
+  }
+
+  GstAjaNtv2Device *dev = g_atomic_rc_box_new0(GstAjaNtv2Device);
+  dev->device = device;
+  dev->fd = fd;
+
+  g_free(path);
+
+  return dev;
+}
+
+GstAjaNtv2Device *gst_aja_ntv2_device_ref(GstAjaNtv2Device *device) {
+  return (GstAjaNtv2Device *)g_atomic_rc_box_acquire(device);
+}
+
+void gst_aja_ntv2_device_unref(GstAjaNtv2Device *device) {
+  g_atomic_rc_box_release_full(device, (gpointer data) {
+    GstAjaNtv2Device *dev = (GstAjaNtv2Device *)data;
+
+    delete dev->device;
+    close(dev->fd);
+  });
+}
+
+GstAjaNtv2DeviceLocker::GstAjaNtv2DeviceLocker(GstAjaNtv2Device *device) {
+  _device = gst_aja_ntv2_device_ref(device);
+  flock(_device->fd, LOCK_EX);
+}
+
+GstAjaNtv2DeviceLocker::~GstAjaNtv2DeviceLocker() {
+  flock(_device->fd, LOCK_UN);
+  gst_aja_ntv2_device_unref(_device);
+}
+
+static guint gst_aja_device_get_frame_multiplier(GstAjaNtv2Device *device,
+                                                 NTV2Channel channel) {
+  // quad formats use 4x as many frames, quad-quad formats 8x
+  bool quad_enabled = false;
+  device->device->GetQuadFrameEnable(quad_enabled, channel);
+  bool quad_quad_enabled = false;
+  device->device->GetQuadQuadFrameEnable(quad_quad_enabled, channel);
+
+  NTV2VideoFormat format = NTV2_FORMAT_UNKNOWN;
+  device->device->GetVideoFormat(format, channel);
+
+  GST_TRACE("Channel %d uses mode %d (quad: %d, quad quad: %d)", (gint)channel,
+            (gint)format, quad_enabled, quad_quad_enabled);
+
+  // Similarly, 2k/UHD use 4x as many frames and 4k/UHD2 use 8x as many
+  // frames
+  if (format != NTV2_FORMAT_UNKNOWN) {
+    guint width = ::GetDisplayWidth(format);
+    guint height = ::GetDisplayHeight(format);
+
+    if (height <= 1080 && width <= 1920) {
+      // SD and HD but not 2k!
+    } else if (height <= 2160 && width <= 3840) {
+      // 2k and UHD but not 4k
+      quad_enabled = true;
+    } else if (height <= 4320 && width <= 7680) {
+      // 4k and UHD2 but not 8k
+      quad_quad_enabled = true;
+    } else {
+      // 8k FIXME
+      quad_quad_enabled = true;
+    }
+  }
+
+  if (quad_enabled) {
+    g_assert(!quad_quad_enabled);
+
+    return 4;
+  } else if (quad_quad_enabled) {
+    g_assert(!quad_enabled);
+
+    return 8;
+  }
+
+  return 1;
+}
+
+// Returns -1 on failure or otherwise the start_frame.
+// end_frame would be start_frame + frame_count - 1
+gint gst_aja_ntv2_device_find_unallocated_frames(GstAjaNtv2Device *device,
+                                                 NTV2Channel channel,
+                                                 guint frame_count) {
+  g_assert(frame_count != 0);
+  g_assert(device != NULL);
+  g_assert(device->device->IsOpen());
+
+  // Adapted from CNTV2Card::FindUnallocatedFrames() with
+  // quad/quad-quad/UHD/UHD2 support
+  std::set<guint16> used_frames;
+
+  for (NTV2Channel c = ::NTV2_CHANNEL1; c < NTV2_MAX_NUM_CHANNELS;
+       c = (NTV2Channel)(c + 1)) {
+    AUTOCIRCULATE_STATUS ac_status;
+
+    if (device->device->AutoCirculateGetStatus(c, ac_status) &&
+        !ac_status.IsStopped()) {
+      guint16 start_frame = ac_status.GetStartFrame();
+      guint16 end_frame = ac_status.GetEndFrame();
+
+      guint multiplier = gst_aja_device_get_frame_multiplier(device, c);
+
+      GST_TRACE("Channel %d uses frames %u-%u (multiplier: %u)", c, start_frame,
+                end_frame, multiplier);
+
+      start_frame *= multiplier;
+      end_frame *= multiplier;
+      end_frame += (multiplier - 1);
+
+      GST_TRACE("Channel %d uses HD frames %u-%u", c, start_frame, end_frame);
+      for (guint16 i = start_frame; i <= end_frame; i++) {
+        used_frames.insert(i);
+      }
+    }
+  }
+
+  guint multiplier = gst_aja_device_get_frame_multiplier(device, channel);
+  frame_count *= multiplier;
+
+  const guint16 last_frame =
+      ::NTV2DeviceGetNumberFrameBuffers(device->device->GetDeviceID()) - 1;
+  guint16 start_frame = 0;
+  guint16 end_frame = start_frame + frame_count - 1;
+
+  auto iter = used_frames.cbegin();
+  while (iter != used_frames.cend()) {
+    guint16 allocated_start_frame = *iter;
+    guint16 allocated_end_frame = allocated_start_frame;
+
+    // Find end of the allocation
+    while (++iter != used_frames.cend() && *iter == (allocated_end_frame + 1))
+      allocated_end_frame++;
+
+    // Free block before this allocation
+    if (start_frame < allocated_start_frame &&
+        end_frame < allocated_start_frame)
+      break;
+
+    // Move after this allocation and check if there is enough space before
+    // the next allocation
+    start_frame = GST_ROUND_UP_N(allocated_end_frame + 1, multiplier);
+    end_frame = start_frame + frame_count - 1;
+  }
+
+  // If above we moved after the end of the available frames error out
+  if (start_frame > last_frame || end_frame > last_frame) {
+    GST_WARNING("Did not find a contiguous unused range of %u frames",
+                frame_count);
+    return -1;
+  }
+
+  // Otherwise we have enough space after the last allocation
+  GST_INFO("Using HD frames %u-%u", start_frame, end_frame);
+  GST_INFO("Using frames %u-%u", start_frame / multiplier,
+           start_frame / multiplier + frame_count / multiplier - 1);
+
+  return start_frame / multiplier;
+}
+
+GType gst_aja_audio_system_get_type(void) {
+  static gsize id = 0;
+  static const GEnumValue modes = {
+      {GST_AJA_AUDIO_SYSTEM_AUTO, "auto", "Auto (based on selected channel)"},
+      {GST_AJA_AUDIO_SYSTEM_1, "1", "Audio system 1"},
+      {GST_AJA_AUDIO_SYSTEM_2, "2", "Audio system 2"},
+      {GST_AJA_AUDIO_SYSTEM_3, "3", "Audio system 3"},
+      {GST_AJA_AUDIO_SYSTEM_4, "4", "Audio system 4"},
+      {GST_AJA_AUDIO_SYSTEM_5, "5", "Audio system 5"},
+      {GST_AJA_AUDIO_SYSTEM_6, "6", "Audio system 6"},
+      {GST_AJA_AUDIO_SYSTEM_7, "7", "Audio system 7"},
+      {GST_AJA_AUDIO_SYSTEM_8, "8", "Audio system 8"},
+      {0, NULL, NULL}};
+
+  if (g_once_init_enter(&id)) {
+    GType tmp = g_enum_register_static("GstAjaAudioSystem", modes);
+    g_once_init_leave(&id, tmp);
+  }
+
+  return (GType)id;
+}
+
+GType gst_aja_output_destination_get_type(void) {
+  static gsize id = 0;
+  static const GEnumValue modes = {
+      {GST_AJA_OUTPUT_DESTINATION_AUTO, "auto",
+       "Auto (based on selected channel)"},
+      {GST_AJA_OUTPUT_DESTINATION_ANALOG, "analog", "Analog Output"},
+      {GST_AJA_OUTPUT_DESTINATION_SDI1, "sdi-1", "SDI Output 1"},
+      {GST_AJA_OUTPUT_DESTINATION_SDI2, "sdi-2", "SDI Output 2"},
+      {GST_AJA_OUTPUT_DESTINATION_SDI3, "sdi-3", "SDI Output 3"},
+      {GST_AJA_OUTPUT_DESTINATION_SDI4, "sdi-4", "SDI Output 4"},
+      {GST_AJA_OUTPUT_DESTINATION_SDI5, "sdi-5", "SDI Output 5"},
+      {GST_AJA_OUTPUT_DESTINATION_SDI6, "sdi-6", "SDI Output 6"},
+      {GST_AJA_OUTPUT_DESTINATION_SDI7, "sdi-7", "SDI Output 7"},
+      {GST_AJA_OUTPUT_DESTINATION_SDI8, "sdi-8", "SDI Output 8"},
+      {GST_AJA_OUTPUT_DESTINATION_HDMI, "hdmi", "HDMI Output"},
+      {0, NULL, NULL}};
+
+  if (g_once_init_enter(&id)) {
+    GType tmp = g_enum_register_static("GstAjaOutputDestination", modes);
+    g_once_init_leave(&id, tmp);
+  }
+
+  return (GType)id;
+}
+
+GType gst_aja_reference_source_get_type(void) {
+  static gsize id = 0;
+  static const GEnumValue modes = {
+      {GST_AJA_REFERENCE_SOURCE_AUTO, "auto", "Auto"},
+      {GST_AJA_REFERENCE_SOURCE_FREERUN, "freerun", "Freerun"},
+      {GST_AJA_REFERENCE_SOURCE_EXTERNAL, "external", "External"},
+      {GST_AJA_REFERENCE_SOURCE_INPUT_1, "input-1", "SDI Input 1"},
+      {GST_AJA_REFERENCE_SOURCE_INPUT_2, "input-2", "SDI Input 2"},
+      {GST_AJA_REFERENCE_SOURCE_INPUT_3, "input-3", "SDI Input 3"},
+      {GST_AJA_REFERENCE_SOURCE_INPUT_4, "input-4", "SDI Input 4"},
+      {GST_AJA_REFERENCE_SOURCE_INPUT_5, "input-5", "SDI Input 5"},
+      {GST_AJA_REFERENCE_SOURCE_INPUT_6, "input-6", "SDI Input 6"},
+      {GST_AJA_REFERENCE_SOURCE_INPUT_7, "input-7", "SDI Input 7"},
+      {GST_AJA_REFERENCE_SOURCE_INPUT_8, "input-8", "SDI Input 8"},
+      {0, NULL, NULL}};
+
+  if (g_once_init_enter(&id)) {
+    GType tmp = g_enum_register_static("GstAjaReferenceSource", modes);
+    g_once_init_leave(&id, tmp);
+  }
+
+  return (GType)id;
+}
+
+GType gst_aja_input_source_get_type(void) {
+  static gsize id = 0;
+  static const GEnumValue modes = {
+      {GST_AJA_INPUT_SOURCE_AUTO, "auto", "Auto (based on selected channel)"},
+      {GST_AJA_INPUT_SOURCE_ANALOG1, "analog-1", "Analog Input 1"},
+      {GST_AJA_INPUT_SOURCE_SDI1, "sdi-1", "SDI Input 1"},
+      {GST_AJA_INPUT_SOURCE_SDI2, "sdi-2", "SDI Input 2"},
+      {GST_AJA_INPUT_SOURCE_SDI3, "sdi-3", "SDI Input 3"},
+      {GST_AJA_INPUT_SOURCE_SDI4, "sdi-4", "SDI Input 4"},
+      {GST_AJA_INPUT_SOURCE_SDI5, "sdi-5", "SDI Input 5"},
+      {GST_AJA_INPUT_SOURCE_SDI6, "sdi-6", "SDI Input 6"},
+      {GST_AJA_INPUT_SOURCE_SDI7, "sdi-7", "SDI Input 7"},
+      {GST_AJA_INPUT_SOURCE_SDI8, "sdi-8", "SDI Input 8"},
+      {GST_AJA_INPUT_SOURCE_HDMI1, "hdmi-1", "HDMI Input 1"},
+      {GST_AJA_INPUT_SOURCE_HDMI2, "hdmi-2", "HDMI Input 2"},
+      {GST_AJA_INPUT_SOURCE_HDMI3, "hdmi-3", "HDMI Input 3"},
+      {GST_AJA_INPUT_SOURCE_HDMI4, "hdmi-4", "HDMI Input 4"},
+      {0, NULL, NULL}};
+
+  if (g_once_init_enter(&id)) {
+    GType tmp = g_enum_register_static("GstAjaInputSource", modes);
+    g_once_init_leave(&id, tmp);
+  }
+
+  return (GType)id;
+}
+
+GType gst_aja_sdi_mode_get_type(void) {
+  static gsize id = 0;
+  static const GEnumValue modes = {
+      {GST_AJA_SDI_MODE_SINGLE_LINK, "single-link", "Single Link"},
+      {GST_AJA_SDI_MODE_QUAD_LINK_SQD, "quad-link-sqd", "Quad Link SQD"},
+      {GST_AJA_SDI_MODE_QUAD_LINK_TSI, "quad-link-tsi", "Quad Link TSI"},
+      {0, NULL, NULL}};
+
+  if (g_once_init_enter(&id)) {
+    GType tmp = g_enum_register_static("GstAjaSdiMode", modes);
+    g_once_init_leave(&id, tmp);
+  }
+
+  return (GType)id;
+}
+
+GType gst_aja_video_format_get_type(void) {
+  static gsize id = 0;
+  static const GEnumValue modes = {
+      {GST_AJA_VIDEO_FORMAT_AUTO, "auto", "Auto detect format"},
+      {GST_AJA_VIDEO_FORMAT_1080i_5000, "1080i-5000", "1080i 5000"},
+      {GST_AJA_VIDEO_FORMAT_1080i_5994, "1080i-5994", "1080i 5994"},
+      {GST_AJA_VIDEO_FORMAT_1080i_6000, "1080i-6000", "1080i 6000"},
+      {GST_AJA_VIDEO_FORMAT_720p_5994, "720p-5994", "720p 5994"},
+      {GST_AJA_VIDEO_FORMAT_720p_6000, "720p-6000", "720p 6000"},
+      {GST_AJA_VIDEO_FORMAT_1080psf_2398, "1080psf-2398", "1080psf 2398"},
+      {GST_AJA_VIDEO_FORMAT_1080psf_2400, "1080psf-2400", "1080psf 2400"},
+      {GST_AJA_VIDEO_FORMAT_1080p_2997, "1080p-2997", "1080p 2997"},
+      {GST_AJA_VIDEO_FORMAT_1080p_3000, "1080p-3000", "1080p 3000"},
+      {GST_AJA_VIDEO_FORMAT_1080p_2500, "1080p-2500", "1080p 2500"},
+      {GST_AJA_VIDEO_FORMAT_1080p_2398, "1080p-2398", "1080p 2398"},
+      {GST_AJA_VIDEO_FORMAT_1080p_2400, "1080p-2400", "1080p 2400"},
+      {GST_AJA_VIDEO_FORMAT_720p_5000, "720p-5000", "720p 5000"},
+      {GST_AJA_VIDEO_FORMAT_1080p_5000_A, "1080p-5000-a", "1080p 5000 A"},
+      {GST_AJA_VIDEO_FORMAT_1080p_5994_A, "1080p-5994-a", "1080p 5994 A"},
+      {GST_AJA_VIDEO_FORMAT_1080p_6000_A, "1080p-6000-a", "1080p 6000 A"},
+      {GST_AJA_VIDEO_FORMAT_720p_2398, "720p-2398", "720p 2398"},
+      {GST_AJA_VIDEO_FORMAT_720p_2500, "720p-2500", "720p 2500"},
+      {GST_AJA_VIDEO_FORMAT_1080psf_2500_2, "1080psf-2500-2", "1080psf 2500 2"},
+      {GST_AJA_VIDEO_FORMAT_1080psf_2997_2, "1080psf-2997-2", "1080psf 2997 2"},
+      {GST_AJA_VIDEO_FORMAT_1080psf_3000_2, "1080psf-3000-2", "1080psf 3000 2"},
+
+      {GST_AJA_VIDEO_FORMAT_625_5000, "625-5000", "625 5000"},
+      {GST_AJA_VIDEO_FORMAT_525_5994, "525-5994", "525 5994"},
+      {GST_AJA_VIDEO_FORMAT_525_2398, "525-2398", "525 2398"},
+      {GST_AJA_VIDEO_FORMAT_525_2400, "525-2400", "525 2400"},
+
+      {GST_AJA_VIDEO_FORMAT_1080p_DCI_2398, "1080p-dci-2398", "1080p DCI 2398"},
+      {GST_AJA_VIDEO_FORMAT_1080p_DCI_2400, "1080p-dci-2400", "1080p DCI 2400"},
+      {GST_AJA_VIDEO_FORMAT_1080p_DCI_2500, "1080p-dci-2500", "1080p DCI 2500"},
+      {GST_AJA_VIDEO_FORMAT_1080p_DCI_2997, "1080p-dci-2997", "1080p DCI 2997"},
+      {GST_AJA_VIDEO_FORMAT_1080p_DCI_3000, "1080p-dci-3000", "1080p DCI 3000"},
+      {GST_AJA_VIDEO_FORMAT_1080p_DCI_5000_A, "1080p-dci-5000-a",
+       "1080p DCI 5000 A"},
+      {GST_AJA_VIDEO_FORMAT_1080p_DCI_5994_A, "1080p-dci-5994-a",
+       "1080p DCI 5994 A"},
+      {GST_AJA_VIDEO_FORMAT_1080p_DCI_6000_A, "1080p-dci-6000-a",
+       "1080p DCI 6000 A"},
+
+      {GST_AJA_VIDEO_FORMAT_2160p_2398, "2160p-2398", "2160p 2398"},
+      {GST_AJA_VIDEO_FORMAT_2160p_2400, "2160p-2400", "2160p 2400"},
+      {GST_AJA_VIDEO_FORMAT_2160p_2500, "2160p-2500", "2160p 2500"},
+      {GST_AJA_VIDEO_FORMAT_2160p_2997, "2160p-2997", "2160p 2997"},
+      {GST_AJA_VIDEO_FORMAT_2160p_3000, "2160p-3000", "2160p 3000"},
+      {GST_AJA_VIDEO_FORMAT_2160p_5000, "2160p-5000", "2160p 5000"},
+      {GST_AJA_VIDEO_FORMAT_2160p_5994, "2160p-5994", "2160p 5994"},
+      {GST_AJA_VIDEO_FORMAT_2160p_6000, "2160p-6000", "2160p 6000"},
+
+      {GST_AJA_VIDEO_FORMAT_2160p_DCI_2398, "2160p-dci-2398", "2160p DCI 2398"},
+      {GST_AJA_VIDEO_FORMAT_2160p_DCI_2400, "2160p-dci-2400", "2160p DCI 2400"},
+      {GST_AJA_VIDEO_FORMAT_2160p_DCI_2500, "2160p-dci-2500", "2160p DCI 2500"},
+      {GST_AJA_VIDEO_FORMAT_2160p_DCI_2997, "2160p-dci-2997", "2160p DCI 2997"},
+      {GST_AJA_VIDEO_FORMAT_2160p_DCI_3000, "2160p-dci-3000", "2160p DCI 3000"},
+      {GST_AJA_VIDEO_FORMAT_2160p_DCI_5000, "2160p-dci-5000", "2160p DCI 5000"},
+      {GST_AJA_VIDEO_FORMAT_2160p_DCI_5994, "2160p-dci-5994", "2160p DCI 5994"},
+      {GST_AJA_VIDEO_FORMAT_2160p_DCI_6000, "2160p-dci-6000", "2160p DCI 6000"},
+
+      {GST_AJA_VIDEO_FORMAT_4320p_2398, "4320p-2398", "4320p 2398"},
+      {GST_AJA_VIDEO_FORMAT_4320p_2400, "4320p-2400", "4320p 2400"},
+      {GST_AJA_VIDEO_FORMAT_4320p_2500, "4320p-2500", "4320p 2500"},
+      {GST_AJA_VIDEO_FORMAT_4320p_2997, "4320p-2997", "4320p 2997"},
+      {GST_AJA_VIDEO_FORMAT_4320p_3000, "4320p-3000", "4320p 3000"},
+      {GST_AJA_VIDEO_FORMAT_4320p_5000, "4320p-5000", "4320p 5000"},
+      {GST_AJA_VIDEO_FORMAT_4320p_5994, "4320p-5994", "4320p 5994"},
+      {GST_AJA_VIDEO_FORMAT_4320p_6000, "4320p-6000", "4320p 6000"},
+
+      {GST_AJA_VIDEO_FORMAT_4320p_DCI_2398, "4320p-dci-2398", "4320p DCI 2398"},
+      {GST_AJA_VIDEO_FORMAT_4320p_DCI_2400, "4320p-dci-2400", "4320p DCI 2400"},
+      {GST_AJA_VIDEO_FORMAT_4320p_DCI_2500, "4320p-dci-2500", "4320p DCI 2500"},
+      {GST_AJA_VIDEO_FORMAT_4320p_DCI_2997, "4320p-dci-2997", "4320p DCI 2997"},
+      {GST_AJA_VIDEO_FORMAT_4320p_DCI_3000, "4320p-dci-3000", "4320p DCI 3000"},
+      {GST_AJA_VIDEO_FORMAT_4320p_DCI_5000, "4320p-dci-5000", "4320p DCI 5000"},
+      {GST_AJA_VIDEO_FORMAT_4320p_DCI_5994, "4320p-dci-5994", "4320p DCI 5994"},
+      {GST_AJA_VIDEO_FORMAT_4320p_DCI_6000, "4320p-dci-6000", "4320p DCI 6000"},
+
+      {0, NULL, NULL}};
+
+  if (g_once_init_enter(&id)) {
+    GType tmp = g_enum_register_static("GstAjaVideoFormat", modes);
+    g_once_init_leave(&id, tmp);
+  }
+
+  return (GType)id;
+}
+
+GType gst_aja_audio_source_get_type(void) {
+  static gsize id = 0;
+  static const GEnumValue modes = {
+      {GST_AJA_AUDIO_SOURCE_EMBEDDED, "embedded", "Embedded"},
+      {GST_AJA_AUDIO_SOURCE_AES, "aes", "AES"},
+      {GST_AJA_AUDIO_SOURCE_ANALOG, "analog", "Analog"},
+      {GST_AJA_AUDIO_SOURCE_HDMI, "hdmi", "HDMI"},
+      {GST_AJA_AUDIO_SOURCE_MIC, "mic", "Microphone"},
+      {0, NULL, NULL}};
+
+  if (g_once_init_enter(&id)) {
+    GType tmp = g_enum_register_static("GstAjaAudioSource", modes);
+    g_once_init_leave(&id, tmp);
+  }
+
+  return (GType)id;
+}
+
+GType gst_aja_embedded_audio_input_get_type(void) {
+  static gsize id = 0;
+  static const GEnumValue modes = {
+      {GST_AJA_EMBEDDED_AUDIO_INPUT_AUTO, "auto", "auto"},
+      {GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO1, "video-1", "Video 1"},
+      {GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO2, "video-2", "Video 2"},
+      {GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO3, "video-3", "Video 3"},
+      {GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO4, "video-4", "Video 4"},
+      {GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO5, "video-5", "Video 5"},
+      {GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO6, "video-6", "Video 6"},
+      {GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO7, "video-7", "Video 7"},
+      {GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO8, "video-8", "Video 8"},
+      {0, NULL, NULL}};
+
+  if (g_once_init_enter(&id)) {
+    GType tmp = g_enum_register_static("GstAjaEmbeddedAudioInput", modes);
+    g_once_init_leave(&id, tmp);
+  }
+
+  return (GType)id;
+}
+
+GType gst_aja_timecode_index_get_type(void) {
+  static gsize id = 0;
+  static const GEnumValue modes = {
+      {GST_AJA_TIMECODE_INDEX_VITC, "vitc", "Embedded SDI VITC"},
+      {GST_AJA_TIMECODE_INDEX_ATC_LTC, "atc-ltc", "Embedded SDI ATC LTC"},
+      {GST_AJA_TIMECODE_INDEX_LTC1, "ltc-1", "Analog LTC 1"},
+      {GST_AJA_TIMECODE_INDEX_LTC2, "ltc-2", "Analog LTC 2"},
+      {0, NULL, NULL}};
+
+  if (g_once_init_enter(&id)) {
+    GType tmp = g_enum_register_static("GstAjaTimecodeIndex", modes);
+    g_once_init_leave(&id, tmp);
+  }
+
+  return (GType)id;
+}
+
+GType gst_aja_closed_caption_capture_mode_get_type(void) {
+  static gsize id = 0;
+  static const GEnumValue modes = {
+      {GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_AND_CEA608,
+       "cea708-and-cea608",
+       "CEA708 S334-2 and CEA608 S334-1 Annex A Closed Captions"},
+      {GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_OR_CEA608, "cea708-or-cea608",
+       "CEA708 S334-2 or if not existing CEA608 S334-1 Annex A Closed "
+       "Captions"},
+      {GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA608_OR_CEA708, "cea608-or-cea708",
+       "CEA608 S334-1 Annex A or if not existing CEA708 S334-2 Closed "
+       "Captions"},
+      {GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_ONLY, "cea708-only",
+       "CEA708 S334-2 Closed Captions only"},
+      {GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA608_ONLY, "cea608-only",
+       "CEA608 S334-1 Annex A Closed Captions only"},
+      {GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_NONE, "none",
+       "Don't capture Closed Captions"},
+      {0, NULL, NULL}};
+
+  if (g_once_init_enter(&id)) {
+    GType tmp = g_enum_register_static("GstAjaClosedCaptionCaptureMode", modes);
+    g_once_init_leave(&id, tmp);
+  }
+
+  return (GType)id;
+}
+
+void gst_aja_common_init(void) {
+  GST_DEBUG_CATEGORY_INIT(gst_aja_debug, "aja", 0,
+                          "Debug category for AJA plugin");
+
+  gst_type_mark_as_plugin_api(GST_TYPE_AJA_AUDIO_SYSTEM, (GstPluginAPIFlags)0);
+  gst_type_mark_as_plugin_api(GST_TYPE_AJA_OUTPUT_DESTINATION,
+                              (GstPluginAPIFlags)0);
+  gst_type_mark_as_plugin_api(GST_TYPE_AJA_REFERENCE_SOURCE,
+                              (GstPluginAPIFlags)0);
+  gst_type_mark_as_plugin_api(GST_TYPE_AJA_INPUT_SOURCE, (GstPluginAPIFlags)0);
+  gst_type_mark_as_plugin_api(GST_TYPE_AJA_SDI_MODE, (GstPluginAPIFlags)0);
+  gst_type_mark_as_plugin_api(GST_TYPE_AJA_VIDEO_FORMAT, (GstPluginAPIFlags)0);
+  gst_type_mark_as_plugin_api(GST_TYPE_AJA_AUDIO_SOURCE, (GstPluginAPIFlags)0);
+  gst_type_mark_as_plugin_api(GST_TYPE_AJA_EMBEDDED_AUDIO_INPUT,
+                              (GstPluginAPIFlags)0);
+  gst_type_mark_as_plugin_api(GST_TYPE_AJA_TIMECODE_INDEX,
+                              (GstPluginAPIFlags)0);
+  gst_type_mark_as_plugin_api(GST_TYPE_AJA_CLOSED_CAPTION_CAPTURE_MODE,
+                              (GstPluginAPIFlags)0);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajacommon.h Added

@@ -0,0 +1,357 @@
+/* GStreamer
+ * Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <ajabase/common/types.h>
+#include <ajabase/system/memory.h>
+#include <ajabase/system/thread.h>
+#include <ajantv2/includes/ntv2card.h>
+#include <ajantv2/includes/ntv2devicefeatures.h>
+#include <ajantv2/includes/ntv2devicescanner.h>
+#include <ajantv2/includes/ntv2enums.h>
+#include <ajantv2/includes/ntv2signalrouter.h>
+#include <gst/base/base.h>
+#include <gst/gst.h>
+#include <gst/video/video.h>
+
+G_BEGIN_DECLS
+
+typedef struct {
+  GstMeta meta;
+
+  GstBuffer *buffer;
+} GstAjaAudioMeta;
+
+G_GNUC_INTERNAL
+GType gst_aja_audio_meta_api_get_type(void);
+#define GST_AJA_AUDIO_META_API_TYPE (gst_aja_audio_meta_api_get_type())
+
+G_GNUC_INTERNAL
+const GstMetaInfo *gst_aja_audio_meta_get_info(void);
+#define GST_AJA_AUDIO_META_INFO (gst_aja_audio_meta_get_info())
+
+#define gst_buffer_get_aja_audio_meta(b) \
+  ((GstAjaAudioMeta *)gst_buffer_get_meta((b), GST_AJA_AUDIO_META_API_TYPE))
+
+G_GNUC_INTERNAL
+GstAjaAudioMeta *gst_buffer_add_aja_audio_meta(GstBuffer *buffer,
+                                               GstBuffer *audio_buffer);
+
+typedef struct {
+  CNTV2Card *device;
+  int fd;
+} GstAjaNtv2Device;
+
+G_GNUC_INTERNAL
+GstAjaNtv2Device *gst_aja_ntv2_device_obtain(const gchar *device_identifier);
+G_GNUC_INTERNAL
+GstAjaNtv2Device *gst_aja_ntv2_device_ref(GstAjaNtv2Device *device);
+G_GNUC_INTERNAL
+void gst_aja_ntv2_device_unref(GstAjaNtv2Device *device);
+
+G_GNUC_INTERNAL
+gint gst_aja_ntv2_device_find_unallocated_frames(GstAjaNtv2Device *device,
+                                                 NTV2Channel channel,
+                                                 guint frame_count);
+
+#define GST_AJA_ALLOCATOR_MEMTYPE "aja"
+
+#define GST_TYPE_AJA_ALLOCATOR (gst_aja_allocator_get_type())
+#define GST_AJA_ALLOCATOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AJA_ALLOCATOR, GstAjaAllocator))
+#define GST_AJA_ALLOCATOR_CLASS(klass)                      \
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AJA_ALLOCATOR, \
+                           GstAjaAllocatorClass))
+#define GST_IS_Aja_ALLOCATOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AJA_ALLOCATOR))
+#define GST_IS_Aja_ALLOCATOR_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AJA_ALLOCATOR))
+#define GST_AJA_ALLOCATOR_CAST(obj) ((GstAjaAllocator *)(obj))
+
+typedef struct _GstAjaAllocator GstAjaAllocator;
+typedef struct _GstAjaAllocatorClass GstAjaAllocatorClass;
+
+struct _GstAjaAllocator {
+  GstAllocator allocator;
+
+  GstAjaNtv2Device *device;
+  GstQueueArray *freed_mems;
+};
+
+struct _GstAjaAllocatorClass {
+  GstAllocatorClass parent_class;
+};
+
+G_GNUC_INTERNAL
+GType gst_aja_allocator_get_type(void);
+G_GNUC_INTERNAL
+GstAllocator *gst_aja_allocator_new(GstAjaNtv2Device *device);
+
+typedef enum {
+  GST_AJA_AUDIO_SYSTEM_AUTO,
+  GST_AJA_AUDIO_SYSTEM_1,
+  GST_AJA_AUDIO_SYSTEM_2,
+  GST_AJA_AUDIO_SYSTEM_3,
+  GST_AJA_AUDIO_SYSTEM_4,
+  GST_AJA_AUDIO_SYSTEM_5,
+  GST_AJA_AUDIO_SYSTEM_6,
+  GST_AJA_AUDIO_SYSTEM_7,
+  GST_AJA_AUDIO_SYSTEM_8,
+} GstAjaAudioSystem;
+
+#define GST_TYPE_AJA_AUDIO_SYSTEM (gst_aja_audio_system_get_type())
+G_GNUC_INTERNAL
+GType gst_aja_audio_system_get_type(void);
+
+typedef enum {
+  GST_AJA_OUTPUT_DESTINATION_AUTO,
+  GST_AJA_OUTPUT_DESTINATION_ANALOG,
+  GST_AJA_OUTPUT_DESTINATION_SDI1,
+  GST_AJA_OUTPUT_DESTINATION_SDI2,
+  GST_AJA_OUTPUT_DESTINATION_SDI3,
+  GST_AJA_OUTPUT_DESTINATION_SDI4,
+  GST_AJA_OUTPUT_DESTINATION_SDI5,
+  GST_AJA_OUTPUT_DESTINATION_SDI6,
+  GST_AJA_OUTPUT_DESTINATION_SDI7,
+  GST_AJA_OUTPUT_DESTINATION_SDI8,
+  GST_AJA_OUTPUT_DESTINATION_HDMI,
+} GstAjaOutputDestination;
+
+#define GST_TYPE_AJA_OUTPUT_DESTINATION (gst_aja_output_destination_get_type())
+G_GNUC_INTERNAL
+GType gst_aja_output_destination_get_type(void);
+
+typedef enum {
+  GST_AJA_REFERENCE_SOURCE_AUTO,
+  GST_AJA_REFERENCE_SOURCE_FREERUN,
+  GST_AJA_REFERENCE_SOURCE_EXTERNAL,
+  GST_AJA_REFERENCE_SOURCE_INPUT_1,
+  GST_AJA_REFERENCE_SOURCE_INPUT_2,
+  GST_AJA_REFERENCE_SOURCE_INPUT_3,
+  GST_AJA_REFERENCE_SOURCE_INPUT_4,
+  GST_AJA_REFERENCE_SOURCE_INPUT_5,
+  GST_AJA_REFERENCE_SOURCE_INPUT_6,
+  GST_AJA_REFERENCE_SOURCE_INPUT_7,
+  GST_AJA_REFERENCE_SOURCE_INPUT_8,
+} GstAjaReferenceSource;
+
+#define GST_TYPE_AJA_REFERENCE_SOURCE (gst_aja_reference_source_get_type())
+G_GNUC_INTERNAL
+GType gst_aja_reference_source_get_type(void);
+
+typedef enum {
+  GST_AJA_INPUT_SOURCE_AUTO,
+  GST_AJA_INPUT_SOURCE_ANALOG1,
+  GST_AJA_INPUT_SOURCE_HDMI1,
+  GST_AJA_INPUT_SOURCE_HDMI2,
+  GST_AJA_INPUT_SOURCE_HDMI3,
+  GST_AJA_INPUT_SOURCE_HDMI4,
+  GST_AJA_INPUT_SOURCE_SDI1,
+  GST_AJA_INPUT_SOURCE_SDI2,
+  GST_AJA_INPUT_SOURCE_SDI3,
+  GST_AJA_INPUT_SOURCE_SDI4,
+  GST_AJA_INPUT_SOURCE_SDI5,
+  GST_AJA_INPUT_SOURCE_SDI6,
+  GST_AJA_INPUT_SOURCE_SDI7,
+  GST_AJA_INPUT_SOURCE_SDI8,
+} GstAjaInputSource;
+
+#define GST_TYPE_AJA_INPUT_SOURCE (gst_aja_input_source_get_type())
+G_GNUC_INTERNAL
+GType gst_aja_input_source_get_type(void);
+
+typedef enum {
+  GST_AJA_SDI_MODE_SINGLE_LINK,
+  GST_AJA_SDI_MODE_QUAD_LINK_SQD,
+  GST_AJA_SDI_MODE_QUAD_LINK_TSI,
+} GstAjaSdiMode;
+
+#define GST_TYPE_AJA_SDI_MODE (gst_aja_sdi_mode_get_type())
+G_GNUC_INTERNAL
+GType gst_aja_sdi_mode_get_type(void);
+
+typedef enum {
+  GST_AJA_VIDEO_FORMAT_INVALID = -1,
+  GST_AJA_VIDEO_FORMAT_AUTO,
+  GST_AJA_VIDEO_FORMAT_1080i_5000,
+  GST_AJA_VIDEO_FORMAT_1080i_5994,
+  GST_AJA_VIDEO_FORMAT_1080i_6000,
+  GST_AJA_VIDEO_FORMAT_720p_5994,
+  GST_AJA_VIDEO_FORMAT_720p_6000,
+  GST_AJA_VIDEO_FORMAT_1080psf_2398,
+  GST_AJA_VIDEO_FORMAT_1080psf_2400,
+  GST_AJA_VIDEO_FORMAT_1080p_2997,
+  GST_AJA_VIDEO_FORMAT_1080p_3000,
+  GST_AJA_VIDEO_FORMAT_1080p_2500,
+  GST_AJA_VIDEO_FORMAT_1080p_2398,
+  GST_AJA_VIDEO_FORMAT_1080p_2400,
+  GST_AJA_VIDEO_FORMAT_720p_5000,
+  GST_AJA_VIDEO_FORMAT_1080p_5000_A,
+  GST_AJA_VIDEO_FORMAT_1080p_5994_A,
+  GST_AJA_VIDEO_FORMAT_1080p_6000_A,
+  GST_AJA_VIDEO_FORMAT_720p_2398,
+  GST_AJA_VIDEO_FORMAT_720p_2500,
+  GST_AJA_VIDEO_FORMAT_1080psf_2500_2,
+  GST_AJA_VIDEO_FORMAT_1080psf_2997_2,
+  GST_AJA_VIDEO_FORMAT_1080psf_3000_2,
+  GST_AJA_VIDEO_FORMAT_625_5000,
+  GST_AJA_VIDEO_FORMAT_525_5994,
+  GST_AJA_VIDEO_FORMAT_525_2398,
+  GST_AJA_VIDEO_FORMAT_525_2400,
+  GST_AJA_VIDEO_FORMAT_1080p_DCI_2398,
+  GST_AJA_VIDEO_FORMAT_1080p_DCI_2400,
+  GST_AJA_VIDEO_FORMAT_1080p_DCI_2500,
+  GST_AJA_VIDEO_FORMAT_1080p_DCI_2997,
+  GST_AJA_VIDEO_FORMAT_1080p_DCI_3000,
+  GST_AJA_VIDEO_FORMAT_1080p_DCI_5000_A,
+  GST_AJA_VIDEO_FORMAT_1080p_DCI_5994_A,
+  GST_AJA_VIDEO_FORMAT_1080p_DCI_6000_A,
+  GST_AJA_VIDEO_FORMAT_2160p_2398,
+  GST_AJA_VIDEO_FORMAT_2160p_2400,
+  GST_AJA_VIDEO_FORMAT_2160p_2500,
+  GST_AJA_VIDEO_FORMAT_2160p_2997,
+  GST_AJA_VIDEO_FORMAT_2160p_3000,
+  GST_AJA_VIDEO_FORMAT_2160p_5000,
+  GST_AJA_VIDEO_FORMAT_2160p_5994,
+  GST_AJA_VIDEO_FORMAT_2160p_6000,
+  GST_AJA_VIDEO_FORMAT_2160p_DCI_2398,
+  GST_AJA_VIDEO_FORMAT_2160p_DCI_2400,
+  GST_AJA_VIDEO_FORMAT_2160p_DCI_2500,
+  GST_AJA_VIDEO_FORMAT_2160p_DCI_2997,
+  GST_AJA_VIDEO_FORMAT_2160p_DCI_3000,
+  GST_AJA_VIDEO_FORMAT_2160p_DCI_5000,
+  GST_AJA_VIDEO_FORMAT_2160p_DCI_5994,
+  GST_AJA_VIDEO_FORMAT_2160p_DCI_6000,
+  GST_AJA_VIDEO_FORMAT_4320p_2398,
+  GST_AJA_VIDEO_FORMAT_4320p_2400,
+  GST_AJA_VIDEO_FORMAT_4320p_2500,
+  GST_AJA_VIDEO_FORMAT_4320p_2997,
+  GST_AJA_VIDEO_FORMAT_4320p_3000,
+  GST_AJA_VIDEO_FORMAT_4320p_5000,
+  GST_AJA_VIDEO_FORMAT_4320p_5994,
+  GST_AJA_VIDEO_FORMAT_4320p_6000,
+  GST_AJA_VIDEO_FORMAT_4320p_DCI_2398,
+  GST_AJA_VIDEO_FORMAT_4320p_DCI_2400,
+  GST_AJA_VIDEO_FORMAT_4320p_DCI_2500,
+  GST_AJA_VIDEO_FORMAT_4320p_DCI_2997,
+  GST_AJA_VIDEO_FORMAT_4320p_DCI_3000,
+  GST_AJA_VIDEO_FORMAT_4320p_DCI_5000,
+  GST_AJA_VIDEO_FORMAT_4320p_DCI_5994,
+  GST_AJA_VIDEO_FORMAT_4320p_DCI_6000,
+} GstAjaVideoFormat;
+
+#define GST_TYPE_AJA_VIDEO_FORMAT (gst_aja_video_format_get_type())
+G_GNUC_INTERNAL
+GType gst_aja_video_format_get_type(void);
+
+typedef enum {
+  GST_AJA_AUDIO_SOURCE_EMBEDDED,
+  GST_AJA_AUDIO_SOURCE_AES,
+  GST_AJA_AUDIO_SOURCE_ANALOG,
+  GST_AJA_AUDIO_SOURCE_HDMI,
+  GST_AJA_AUDIO_SOURCE_MIC,
+} GstAjaAudioSource;
+
+#define GST_TYPE_AJA_AUDIO_SOURCE (gst_aja_audio_source_get_type())
+G_GNUC_INTERNAL
+GType gst_aja_audio_source_get_type(void);
+
+typedef enum {
+  GST_AJA_EMBEDDED_AUDIO_INPUT_AUTO,
+  GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO1,
+  GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO2,
+  GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO3,
+  GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO4,
+  GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO5,
+  GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO6,
+  GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO7,
+  GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO8,
+} GstAjaEmbeddedAudioInput;
+
+#define GST_TYPE_AJA_EMBEDDED_AUDIO_INPUT \
+  (gst_aja_embedded_audio_input_get_type())
+G_GNUC_INTERNAL
+GType gst_aja_embedded_audio_input_get_type(void);
+
+typedef enum {
+  GST_AJA_TIMECODE_INDEX_VITC,
+  GST_AJA_TIMECODE_INDEX_ATC_LTC,
+  GST_AJA_TIMECODE_INDEX_LTC1,
+  GST_AJA_TIMECODE_INDEX_LTC2,
+} GstAjaTimecodeIndex;
+
+#define GST_TYPE_AJA_TIMECODE_INDEX (gst_aja_timecode_index_get_type())
+G_GNUC_INTERNAL
+GType gst_aja_timecode_index_get_type(void);
+
+typedef enum {
+  GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_AND_CEA608,
+  GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_OR_CEA608,
+  GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA608_OR_CEA708,
+  GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_ONLY,
+  GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA608_ONLY,
+  GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_NONE,
+} GstAjaClosedCaptionCaptureMode;
+
+#define GST_TYPE_AJA_CLOSED_CAPTION_CAPTURE_MODE \
+  (gst_aja_closed_caption_capture_mode_get_type())
+G_GNUC_INTERNAL
+GType gst_aja_closed_caption_capture_mode_get_type(void);
+
+G_GNUC_INTERNAL
+void gst_aja_common_init(void);
+
+G_END_DECLS
+
+class GstAjaNtv2DeviceLocker {
+ public:
+  GstAjaNtv2DeviceLocker(GstAjaNtv2Device *device);
+  ~GstAjaNtv2DeviceLocker();
+ private:
+  GstAjaNtv2Device *_device;
+};
+
+G_GNUC_INTERNAL
+GstCaps *gst_ntv2_supported_caps(NTV2DeviceID device_id);
+
+G_GNUC_INTERNAL
+GstCaps *gst_ntv2_video_format_to_caps(NTV2VideoFormat format);
+G_GNUC_INTERNAL
+bool gst_video_info_from_ntv2_video_format(GstVideoInfo *info,
+                                           NTV2VideoFormat format);
+G_GNUC_INTERNAL
+NTV2VideoFormat gst_ntv2_video_format_from_caps(const GstCaps *caps, bool quad);
+
+G_GNUC_INTERNAL
+GstCaps *gst_aja_video_format_to_caps(GstAjaVideoFormat format);
+G_GNUC_INTERNAL
+bool gst_video_info_from_aja_video_format(GstVideoInfo *info,
+                                          GstAjaVideoFormat format);
+G_GNUC_INTERNAL
+GstAjaVideoFormat gst_aja_video_format_from_caps(const GstCaps *caps);
+
+G_GNUC_INTERNAL
+GstAjaVideoFormat gst_aja_video_format_from_ntv2_format(NTV2VideoFormat format);
+G_GNUC_INTERNAL
+NTV2VideoFormat gst_ntv2_video_format_from_aja_format(GstAjaVideoFormat format,
+                                                      bool quad);
+
+G_GNUC_INTERNAL
+bool gst_ntv2_video_format_is_quad(NTV2VideoFormat format);

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajadeviceprovider.cpp Added

@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2019 Mathieu Duponchelle <mathieu@centricular.com>
+ * Copyright (C) 2019,2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstajacommon.h"
+#include "gstajadeviceprovider.h"
+
+static GstDevice *gst_aja_device_new(NTV2DeviceInfo &device, gboolean video);
+
+G_DEFINE_TYPE(GstAjaDeviceProvider, gst_aja_device_provider,
+              GST_TYPE_DEVICE_PROVIDER);
+
+static void gst_aja_device_provider_init(GstAjaDeviceProvider *self) {}
+
+static GList *gst_aja_device_provider_probe(GstDeviceProvider *provider) {
+  GList *ret = NULL;
+
+  CNTV2DeviceScanner scanner;
+
+  NTV2DeviceInfoList devices = scanner.GetDeviceInfoList();
+  for (NTV2DeviceInfoList::iterator it = devices.begin(); it != devices.end();
+       it++) {
+    // Skip non-input / non-output devices
+    if (it->numVidInputs == 0 && it->numVidOutputs == 0) continue;
+
+    if (it->numVidInputs > 0)
+      ret = g_list_prepend(ret, gst_aja_device_new(*it, TRUE));
+    if (it->numVidOutputs > 0)
+      ret = g_list_prepend(ret, gst_aja_device_new(*it, FALSE));
+  }
+
+  ret = g_list_reverse(ret);
+
+  return ret;
+}
+
+static void gst_aja_device_provider_class_init(
+    GstAjaDeviceProviderClass *klass) {
+  GstDeviceProviderClass *dm_class = GST_DEVICE_PROVIDER_CLASS(klass);
+
+  dm_class->probe = GST_DEBUG_FUNCPTR(gst_aja_device_provider_probe);
+
+  gst_device_provider_class_set_static_metadata(
+      dm_class, "AJA Device Provider", "Source/Audio/Video",
+      "List and provides AJA capture devices",
+      "Sebastian Dröge <sebastian@centricular.com>");
+}
+
+G_DEFINE_TYPE(GstAjaDevice, gst_aja_device, GST_TYPE_DEVICE);
+
+static void gst_aja_device_init(GstAjaDevice *self) {}
+
+static GstElement *gst_aja_device_create_element(GstDevice *device,
+                                                 const gchar *name) {
+  GstAjaDevice *self = GST_AJA_DEVICE(device);
+  GstElement *ret = NULL;
+
+  if (self->is_capture) {
+    ret = gst_element_factory_make("ajasrc", name);
+  } else {
+    ret = gst_element_factory_make("ajasink", name);
+  }
+
+  if (ret) {
+    gchar *device_identifier = g_strdup_printf("%u", self->device_index);
+
+    g_object_set(ret, "device-identifier", device_identifier, NULL);
+    g_free(device_identifier);
+  }
+
+  return ret;
+}
+
+static void gst_aja_device_class_init(GstAjaDeviceClass *klass) {
+  GstDeviceClass *gst_device_class = GST_DEVICE_CLASS(klass);
+
+  gst_device_class->create_element =
+      GST_DEBUG_FUNCPTR(gst_aja_device_create_element);
+}
+
+static GstDevice *gst_aja_device_new(NTV2DeviceInfo &device,
+                                     gboolean is_capture) {
+  GstDevice *ret;
+  gchar *display_name;
+  const gchar *device_class;
+  GstCaps *caps = NULL;
+  GstStructure *properties;
+
+  device_class = is_capture ? "Audio/Video/Source" : "Audio/Video/Sink";
+  display_name = g_strdup_printf("AJA %s (%s)", device.deviceIdentifier.c_str(),
+                                 is_capture ? "Source" : "Sink");
+
+  caps = gst_ntv2_supported_caps(device.deviceID);
+
+  properties = gst_structure_new_empty("properties");
+
+  gst_structure_set(
+      properties, "device-id", G_TYPE_UINT, device.deviceID, "device-index",
+      G_TYPE_UINT, device.deviceIndex, "pci-slot", G_TYPE_UINT, device.pciSlot,
+      "serial-number", G_TYPE_UINT64, device.deviceSerialNumber,
+      "device-identifier", G_TYPE_STRING, device.deviceIdentifier.c_str(),
+      "num-audio-streams", G_TYPE_UINT, device.numAudioStreams,
+      "dual-link-support", G_TYPE_BOOLEAN, device.dualLinkSupport,
+      "sdi-3g-support", G_TYPE_BOOLEAN, device.sdi3GSupport, "sdi-12g-support",
+      G_TYPE_BOOLEAN, device.sdi12GSupport, "ip-support", G_TYPE_BOOLEAN,
+      device.ipSupport, "bi-directional-sdi", G_TYPE_BOOLEAN,
+      device.biDirectionalSDI, "ltc-in-support", G_TYPE_BOOLEAN,
+      device.ltcInSupport, "ltc-in-on-ref-port", G_TYPE_BOOLEAN,
+      device.ltcInOnRefPort, "2k-support", G_TYPE_BOOLEAN, device.has2KSupport,
+      "4k-support", G_TYPE_BOOLEAN, device.has4KSupport, "8k-support",
+      G_TYPE_BOOLEAN, device.has8KSupport, "multiformat-support",
+      G_TYPE_BOOLEAN, device.multiFormat, NULL);
+
+  if (is_capture) {
+    gst_structure_set(
+        properties, "num-vid-inputs", G_TYPE_UINT, device.numVidInputs,
+        "num-anlg-vid-inputs", G_TYPE_UINT, device.numAnlgVidInputs,
+        "num-hdmi-vid-inputs", G_TYPE_UINT, device.numHDMIVidInputs,
+        "num-analog-audio-input-channels", G_TYPE_UINT,
+        device.numAnalogAudioInputChannels, "num-aes-audio-input-channels",
+        G_TYPE_UINT, device.numAESAudioInputChannels,
+        "num-embedded-audio-input-channels", G_TYPE_UINT,
+        device.numEmbeddedAudioInputChannels, "num-hdmi-audio-input-channels",
+        G_TYPE_UINT, device.numHDMIAudioInputChannels, NULL);
+  } else {
+    gst_structure_set(
+        properties, "num-vid-outputs", G_TYPE_UINT, device.numVidOutputs,
+        "num-anlg-vid-outputs", G_TYPE_UINT, device.numAnlgVidOutputs,
+        "num-hdmi-vid-outputs", G_TYPE_UINT, device.numHDMIVidOutputs,
+        "num-analog-audio-output-channels", G_TYPE_UINT,
+        device.numAnalogAudioOutputChannels, "num-aes-audio-output-channels",
+        G_TYPE_UINT, device.numAESAudioOutputChannels,
+        "num-embedded-audio-output-channels", G_TYPE_UINT,
+        device.numEmbeddedAudioOutputChannels, "num-hdmi-audio-output-channels",
+        G_TYPE_UINT, device.numHDMIAudioOutputChannels, NULL);
+  }
+
+  ret = GST_DEVICE(g_object_new(GST_TYPE_AJA_DEVICE, "display-name",
+                                display_name, "device-class", device_class,
+                                "caps", caps, "properties", properties, NULL));
+
+  g_free(display_name);
+  gst_caps_unref(caps);
+  gst_structure_free(properties);
+
+  GST_AJA_DEVICE(ret)->is_capture = is_capture;
+  GST_AJA_DEVICE(ret)->device_index = device.deviceIndex;
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajadeviceprovider.h Added

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2019 Mathieu Duponchelle <mathieu@centricular.com>
+ * Copyright (C) 2019,2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef _GST_AJA_DEVICE_PROVIDER_H_
+#define _GST_AJA_DEVICE_PROVIDER_H_
+
+#include <ajantv2/includes/ntv2devicescanner.h>
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_AJA_DEVICE_PROVIDER gst_aja_device_provider_get_type()
+#define GST_AJA_DEVICE_PROVIDER(obj)                               \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AJA_DEVICE_PROVIDER, \
+                              GstAjaDeviceProvider))
+
+typedef struct _GstAjaDeviceProvider GstAjaDeviceProvider;
+typedef struct _GstAjaDeviceProviderClass GstAjaDeviceProviderClass;
+
+struct _GstAjaDeviceProviderClass {
+  GstDeviceProviderClass parent_class;
+};
+
+struct _GstAjaDeviceProvider {
+  GstDeviceProvider parent;
+};
+
+G_GNUC_INTERNAL
+GType gst_aja_device_provider_get_type(void);
+
+#define GST_TYPE_AJA_DEVICE gst_aja_device_get_type()
+#define GST_AJA_DEVICE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AJA_DEVICE, GstAjaDevice))
+
+typedef struct _GstAjaDevice GstAjaDevice;
+typedef struct _GstAjaDeviceClass GstAjaDeviceClass;
+
+struct _GstAjaDeviceClass {
+  GstDeviceClass parent_class;
+};
+
+struct _GstAjaDevice {
+  GstDevice parent;
+  gboolean is_capture;
+  guint device_index;
+};
+
+G_GNUC_INTERNAL
+GType gst_aja_device_get_type(void);
+
+G_END_DECLS
+
+#endif /* _GST_AJA_DEVICE_PROVIDER_H_ */

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajasink.cpp Added

@@ -0,0 +1,2261 @@
+/* GStreamer
+ * Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+
+/**
+ * SECTION:element-ajasrc
+ *
+ * Source element for AJA(https://www.aja.com) output cards.
+ *
+ * ## Example usage
+ *
+ * Output a 1080p2997 test audio/video stream
+ *
+ * ```sh
+ * gst-launch-1.0 videotestsrc pattern=ball ! video/x-raw,format=v210,width=1920,height=1080,framerate=30000/1001,interlace-mode=progressive ! timeoverlay ! timecodestamper ! combiner.video \
+ *     audiotestsrc freq=440 ! audio/x-raw,format=S32LE,rate=48000,channels=16 ! audiobuffersplit output-buffer-duration=1/30 ! combiner.audio \
+ *     ajasinkcombiner name=combiner ! ajasink channel=0
+ * ```
+ *
+ * Capture 1080p30 audio/video and directly output it again on the same card
+ *
+ * ```sh
+ * gst-launch-1.0 ajasrc video-format=1080p-3000 channel=1 input-source=sdi-1 audio-system=2 ! ajasrcdemux name=d \
+ *     d.video ! queue max-size-bytes=0 max-size-buffers=0 max-size-time=1000000000 ! c.video \
+ *     d.audio ! queue max-size-bytes=0 max-size-buffers=0 max-size-time=1000000000 ! c.audio \
+ *     ajasinkcombiner name=c ! ajasink channel=0 reference-source=input-1
+ * ```
+ *
+ * Since: 1.24
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <ajaanc/includes/ancillarydata_cea608_vanc.h>
+#include <ajaanc/includes/ancillarydata_cea708.h>
+#include <ajaanc/includes/ancillarylist.h>
+#include <ajantv2/includes/ntv2rp188.h>
+
+#include "gstajacommon.h"
+#include "gstajasink.h"
+
+GST_DEBUG_CATEGORY_STATIC(gst_aja_sink_debug);
+#define GST_CAT_DEFAULT gst_aja_sink_debug
+
+#define DEFAULT_DEVICE_IDENTIFIER ("0")
+#define DEFAULT_CHANNEL (::NTV2_CHANNEL1)
+#define DEFAULT_AUDIO_SYSTEM (GST_AJA_AUDIO_SYSTEM_AUTO)
+#define DEFAULT_OUTPUT_DESTINATION (GST_AJA_OUTPUT_DESTINATION_AUTO)
+#define DEFAULT_SDI_MODE (GST_AJA_SDI_MODE_SINGLE_LINK)
+#define DEFAULT_TIMECODE_INDEX (GST_AJA_TIMECODE_INDEX_VITC)
+#define DEFAULT_RP188 (TRUE)
+#define DEFAULT_REFERENCE_SOURCE (GST_AJA_REFERENCE_SOURCE_AUTO)
+#define DEFAULT_CEA608_LINE_NUMBER (12)
+#define DEFAULT_CEA708_LINE_NUMBER (12)
+#define DEFAULT_QUEUE_SIZE (16)
+#define DEFAULT_START_FRAME (0)
+#define DEFAULT_END_FRAME (0)
+#define DEFAULT_OUTPUT_CPU_CORE (G_MAXUINT)
+#define DEFAULT_HANDLE_ANCILLARY_META (FALSE)
+
+enum {
+  PROP_0,
+  PROP_DEVICE_IDENTIFIER,
+  PROP_CHANNEL,
+  PROP_AUDIO_SYSTEM,
+  PROP_OUTPUT_DESTINATION,
+  PROP_SDI_MODE,
+  PROP_TIMECODE_INDEX,
+  PROP_RP188,
+  PROP_REFERENCE_SOURCE,
+  PROP_CEA608_LINE_NUMBER,
+  PROP_CEA708_LINE_NUMBER,
+  PROP_QUEUE_SIZE,
+  PROP_START_FRAME,
+  PROP_END_FRAME,
+  PROP_OUTPUT_CPU_CORE,
+  PROP_HANDLE_ANCILLARY_META,
+};
+
+typedef enum {
+  QUEUE_ITEM_TYPE_FRAME,
+} QueueItemType;
+
+typedef struct {
+  QueueItemType type;
+
+  // For FRAME
+  GstBuffer *video_buffer;
+  GstMapInfo video_map;
+  GstBuffer *audio_buffer;
+  GstMapInfo audio_map;
+  NTV2_RP188 tc;
+  GstBuffer *anc_buffer;
+  GstMapInfo anc_map;
+  GstBuffer *anc_buffer2;
+  GstMapInfo anc_map2;
+} QueueItem;
+
+static void gst_aja_sink_set_property(GObject *object, guint property_id,
+                                      const GValue *value, GParamSpec *pspec);
+static void gst_aja_sink_get_property(GObject *object, guint property_id,
+                                      GValue *value, GParamSpec *pspec);
+static void gst_aja_sink_finalize(GObject *object);
+
+static gboolean gst_aja_sink_set_caps(GstBaseSink *bsink, GstCaps *caps);
+static GstCaps *gst_aja_sink_get_caps(GstBaseSink *bsink, GstCaps *filter);
+static gboolean gst_aja_sink_event(GstBaseSink *bsink, GstEvent *event);
+static gboolean gst_aja_sink_propose_allocation(GstBaseSink *bsink,
+                                                GstQuery *query);
+static GstFlowReturn gst_aja_sink_render(GstBaseSink *bsink, GstBuffer *buffer);
+
+static gboolean gst_aja_sink_open(GstAjaSink *sink);
+static gboolean gst_aja_sink_close(GstAjaSink *sink);
+static gboolean gst_aja_sink_start(GstAjaSink *sink);
+static gboolean gst_aja_sink_stop(GstAjaSink *sink);
+
+static GstStateChangeReturn gst_aja_sink_change_state(
+    GstElement *element, GstStateChange transition);
+
+static void output_thread_func(AJAThread *thread, void *data);
+
+#define parent_class gst_aja_sink_parent_class
+G_DEFINE_TYPE(GstAjaSink, gst_aja_sink, GST_TYPE_BASE_SINK);
+
+static void gst_aja_sink_class_init(GstAjaSinkClass *klass) {
+  GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
+  GstBaseSinkClass *basesink_class = GST_BASE_SINK_CLASS(klass);
+  GstCaps *templ_caps;
+
+  gobject_class->set_property = gst_aja_sink_set_property;
+  gobject_class->get_property = gst_aja_sink_get_property;
+  gobject_class->finalize = gst_aja_sink_finalize;
+
+  g_object_class_install_property(
+      gobject_class, PROP_DEVICE_IDENTIFIER,
+      g_param_spec_string(
+          "device-identifier", "Device identifier",
+          "Input device instance to use", DEFAULT_DEVICE_IDENTIFIER,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_CHANNEL,
+      g_param_spec_uint(
+          "channel", "Channel", "Channel to use", 0, NTV2_MAX_NUM_CHANNELS - 1,
+          DEFAULT_CHANNEL,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_QUEUE_SIZE,
+      g_param_spec_uint(
+          "queue-size", "Queue Size",
+          "Size of internal queue in number of video frames. "
+          "Half of this is allocated as device buffers and equal to the "
+          "latency.",
+          1, G_MAXINT, DEFAULT_QUEUE_SIZE,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_START_FRAME,
+      g_param_spec_uint(
+          "start-frame", "Start Frame",
+          "Start frame buffer to be used for output (auto if same number as "
+          "end-frame).",
+          0, G_MAXINT, DEFAULT_START_FRAME,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_END_FRAME,
+      g_param_spec_uint(
+          "end-frame", "End Frame",
+          "End frame buffer to be used for output (auto if same number as "
+          "start-frame).",
+          0, G_MAXINT, DEFAULT_END_FRAME,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_AUDIO_SYSTEM,
+      g_param_spec_enum(
+          "audio-system", "Audio System", "Audio system to use",
+          GST_TYPE_AJA_AUDIO_SYSTEM, DEFAULT_AUDIO_SYSTEM,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_OUTPUT_DESTINATION,
+      g_param_spec_enum(
+          "output-destination", "Output Destination",
+          "Output destination to use", GST_TYPE_AJA_OUTPUT_DESTINATION,
+          DEFAULT_OUTPUT_DESTINATION,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_SDI_MODE,
+      g_param_spec_enum(
+          "sdi-mode", "SDI Mode", "SDI mode to use", GST_TYPE_AJA_SDI_MODE,
+          DEFAULT_SDI_MODE,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_TIMECODE_INDEX,
+      g_param_spec_enum(
+          "timecode-index", "Timecode Index", "Timecode index to use",
+          GST_TYPE_AJA_TIMECODE_INDEX, DEFAULT_TIMECODE_INDEX,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_RP188,
+      g_param_spec_boolean(
+          "rp188", "RP188", "Enable RP188 timecode transmission", DEFAULT_RP188,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_REFERENCE_SOURCE,
+      g_param_spec_enum(
+          "reference-source", "Reference Source", "Reference source to use",
+          GST_TYPE_AJA_REFERENCE_SOURCE, DEFAULT_REFERENCE_SOURCE,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_CEA608_LINE_NUMBER,
+      g_param_spec_uint(
+          "cea608-line-number", "CEA608 Line Number",
+          "Sets the line number to use for CEA608 S334-1 Annex A Closed "
+          "Captions "
+          "(-1=disabled)",
+          0, G_MAXUINT, DEFAULT_CEA608_LINE_NUMBER,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_CEA708_LINE_NUMBER,
+      g_param_spec_uint(
+          "cea708-line-number", "CEA708 Line Number",
+          "Sets the line number to use for CEA708 S334-2 Closed Captions "
+          "(-1=disabled)",
+          0, G_MAXUINT, DEFAULT_CEA608_LINE_NUMBER,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_OUTPUT_CPU_CORE,
+      g_param_spec_uint(
+          "output-cpu-core", "Output CPU Core",
+          "Sets the affinity of the output thread to this CPU core "
+          "(-1=disabled)",
+          0, G_MAXUINT, DEFAULT_OUTPUT_CPU_CORE,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  /**
+   * GstAjaSink:handle-ancillary-meta:
+   *
+   * If set to %TRUE handle any #GstAncillaryMeta present on buffers
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property(
+      gobject_class, PROP_HANDLE_ANCILLARY_META,
+      g_param_spec_boolean(
+          "handle-ancillary-meta", "Handle Ancillary Meta",
+          "Handle ancillary meta on video frames",
+          DEFAULT_HANDLE_ANCILLARY_META,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  element_class->change_state = GST_DEBUG_FUNCPTR(gst_aja_sink_change_state);
+
+  basesink_class->set_caps = GST_DEBUG_FUNCPTR(gst_aja_sink_set_caps);
+  basesink_class->get_caps = GST_DEBUG_FUNCPTR(gst_aja_sink_get_caps);
+  basesink_class->event = GST_DEBUG_FUNCPTR(gst_aja_sink_event);
+  basesink_class->propose_allocation =
+      GST_DEBUG_FUNCPTR(gst_aja_sink_propose_allocation);
+  basesink_class->render = GST_DEBUG_FUNCPTR(gst_aja_sink_render);
+
+  templ_caps = gst_ntv2_supported_caps(DEVICE_ID_INVALID);
+  gst_element_class_add_pad_template(
+      element_class,
+      gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, templ_caps));
+  gst_caps_unref(templ_caps);
+
+  gst_element_class_set_static_metadata(
+      element_class, "AJA audio/video sink", "Audio/Video/Sink",
+      "Outputs audio/video frames with AJA devices",
+      "Sebastian Dröge <sebastian@centricular.com>");
+
+  GST_DEBUG_CATEGORY_INIT(gst_aja_sink_debug, "ajasink", 0, "AJA sink");
+}
+
+static void gst_aja_sink_init(GstAjaSink *self) {
+  g_mutex_init(&self->queue_lock);
+  g_cond_init(&self->queue_cond);
+  g_cond_init(&self->drain_cond);
+
+  self->device_identifier = g_strdup(DEFAULT_DEVICE_IDENTIFIER);
+  self->channel = DEFAULT_CHANNEL;
+  self->queue_size = DEFAULT_QUEUE_SIZE;
+  self->start_frame = DEFAULT_START_FRAME;
+  self->end_frame = DEFAULT_END_FRAME;
+  self->audio_system_setting = DEFAULT_AUDIO_SYSTEM;
+  self->output_destination = DEFAULT_OUTPUT_DESTINATION;
+  self->timecode_index = DEFAULT_TIMECODE_INDEX;
+  self->reference_source = DEFAULT_REFERENCE_SOURCE;
+  self->output_cpu_core = DEFAULT_OUTPUT_CPU_CORE;
+  self->handle_ancillary_meta = DEFAULT_HANDLE_ANCILLARY_META;
+
+  self->queue =
+      gst_queue_array_new_for_struct(sizeof(QueueItem), self->queue_size);
+}
+
+void gst_aja_sink_set_property(GObject *object, guint property_id,
+                               const GValue *value, GParamSpec *pspec) {
+  GstAjaSink *self = GST_AJA_SINK(object);
+
+  switch (property_id) {
+    case PROP_DEVICE_IDENTIFIER:
+      g_free(self->device_identifier);
+      self->device_identifier = g_value_dup_string(value);
+      break;
+    case PROP_CHANNEL:
+      self->channel = (NTV2Channel)g_value_get_uint(value);
+      break;
+    case PROP_QUEUE_SIZE:
+      self->queue_size = g_value_get_uint(value);
+      break;
+    case PROP_START_FRAME:
+      self->start_frame = g_value_get_uint(value);
+      break;
+    case PROP_END_FRAME:
+      self->end_frame = g_value_get_uint(value);
+      break;
+    case PROP_AUDIO_SYSTEM:
+      self->audio_system_setting = (GstAjaAudioSystem)g_value_get_enum(value);
+      break;
+    case PROP_OUTPUT_DESTINATION:
+      self->output_destination =
+          (GstAjaOutputDestination)g_value_get_enum(value);
+      break;
+    case PROP_SDI_MODE:
+      self->sdi_mode = (GstAjaSdiMode)g_value_get_enum(value);
+      break;
+    case PROP_TIMECODE_INDEX:
+      self->timecode_index = (GstAjaTimecodeIndex)g_value_get_enum(value);
+      break;
+    case PROP_RP188:
+      self->rp188 = g_value_get_boolean(value);
+      break;
+    case PROP_REFERENCE_SOURCE:
+      self->reference_source = (GstAjaReferenceSource)g_value_get_enum(value);
+      break;
+    case PROP_CEA608_LINE_NUMBER:
+      self->cea608_line_number = g_value_get_uint(value);
+      break;
+    case PROP_CEA708_LINE_NUMBER:
+      self->cea708_line_number = g_value_get_uint(value);
+      break;
+    case PROP_OUTPUT_CPU_CORE:
+      self->output_cpu_core = g_value_get_uint(value);
+      break;
+    case PROP_HANDLE_ANCILLARY_META:
+      self->handle_ancillary_meta = g_value_get_boolean(value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+      break;
+  }
+}
+
+void gst_aja_sink_get_property(GObject *object, guint property_id,
+                               GValue *value, GParamSpec *pspec) {
+  GstAjaSink *self = GST_AJA_SINK(object);
+
+  switch (property_id) {
+    case PROP_DEVICE_IDENTIFIER:
+      g_value_set_string(value, self->device_identifier);
+      break;
+    case PROP_CHANNEL:
+      g_value_set_uint(value, self->channel);
+      break;
+    case PROP_QUEUE_SIZE:
+      g_value_set_uint(value, self->queue_size);
+      break;
+    case PROP_START_FRAME:
+      g_value_set_uint(value, self->start_frame);
+      break;
+    case PROP_END_FRAME:
+      g_value_set_uint(value, self->end_frame);
+      break;
+    case PROP_AUDIO_SYSTEM:
+      g_value_set_enum(value, self->audio_system_setting);
+      break;
+    case PROP_OUTPUT_DESTINATION:
+      g_value_set_enum(value, self->output_destination);
+      break;
+    case PROP_SDI_MODE:
+      g_value_set_enum(value, self->sdi_mode);
+      break;
+    case PROP_TIMECODE_INDEX:
+      g_value_set_enum(value, self->timecode_index);
+      break;
+    case PROP_RP188:
+      g_value_set_boolean(value, self->rp188);
+      break;
+    case PROP_REFERENCE_SOURCE:
+      g_value_set_enum(value, self->reference_source);
+      break;
+    case PROP_CEA608_LINE_NUMBER:
+      g_value_set_uint(value, self->cea608_line_number);
+      break;
+    case PROP_CEA708_LINE_NUMBER:
+      g_value_set_uint(value, self->cea708_line_number);
+      break;
+    case PROP_OUTPUT_CPU_CORE:
+      g_value_set_uint(value, self->output_cpu_core);
+      break;
+    case PROP_HANDLE_ANCILLARY_META:
+      g_value_set_boolean(value, self->handle_ancillary_meta);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+      break;
+  }
+}
+
+void gst_aja_sink_finalize(GObject *object) {
+  GstAjaSink *self = GST_AJA_SINK(object);
+
+  g_assert(self->device == NULL);
+  g_assert(gst_queue_array_get_length(self->queue) == 0);
+  g_clear_pointer(&self->queue, gst_queue_array_free);
+
+  g_mutex_clear(&self->queue_lock);
+  g_cond_clear(&self->queue_cond);
+  g_cond_clear(&self->drain_cond);
+
+  G_OBJECT_CLASS(parent_class)->finalize(object);
+}
+
+static gboolean gst_aja_sink_open(GstAjaSink *self) {
+  GST_DEBUG_OBJECT(self, "Opening device");
+
+  g_assert(self->device == NULL);
+
+  self->device = gst_aja_ntv2_device_obtain(self->device_identifier);
+  if (!self->device) {
+    GST_ERROR_OBJECT(self, "Failed to open device");
+    return FALSE;
+  }
+
+  if (!self->device->device->IsDeviceReady(false)) {
+    g_clear_pointer(&self->device, gst_aja_ntv2_device_unref);
+    return FALSE;
+  }
+
+  self->device->device->SetEveryFrameServices(::NTV2_OEM_TASKS);
+  self->device_id = self->device->device->GetDeviceID();
+
+  std::string serial_number;
+  if (!self->device->device->GetSerialNumberString(serial_number))
+    serial_number = "none";
+
+  GST_DEBUG_OBJECT(self,
+                   "Opened device with ID %d at index %d (%s, version %s, "
+                   "serial number %s, can do VANC %d)",
+                   self->device_id, self->device->device->GetIndexNumber(),
+                   self->device->device->GetDisplayName().c_str(),
+                   self->device->device->GetDeviceVersionString().c_str(),
+                   serial_number.c_str(),
+                   ::NTV2DeviceCanDoCustomAnc(self->device_id));
+
+  GST_DEBUG_OBJECT(self,
+                   "Using SDK version %d.%d.%d.%d (%s) and driver version %s",
+                   AJA_NTV2_SDK_VERSION_MAJOR, AJA_NTV2_SDK_VERSION_MINOR,
+                   AJA_NTV2_SDK_VERSION_POINT, AJA_NTV2_SDK_BUILD_NUMBER,
+                   AJA_NTV2_SDK_BUILD_DATETIME,
+                   self->device->device->GetDriverVersionString().c_str());
+
+  self->device->device->SetMultiFormatMode(true);
+
+  self->allocator = gst_aja_allocator_new(self->device);
+
+  GST_DEBUG_OBJECT(self, "Opened device");
+
+  return TRUE;
+}
+
+static gboolean gst_aja_sink_close(GstAjaSink *self) {
+  gst_clear_object(&self->allocator);
+  g_clear_pointer(&self->device, gst_aja_ntv2_device_unref);
+  self->device_id = DEVICE_ID_INVALID;
+
+  GST_DEBUG_OBJECT(self, "Closed device");
+
+  return TRUE;
+}
+
+static gboolean gst_aja_sink_start(GstAjaSink *self) {
+  GST_DEBUG_OBJECT(self, "Starting");
+  self->output_thread = new AJAThread();
+  self->output_thread->Attach(output_thread_func, self);
+  self->output_thread->SetPriority(AJA_ThreadPriority_High);
+  self->output_thread->Start();
+  g_mutex_lock(&self->queue_lock);
+  self->shutdown = FALSE;
+  self->playing = FALSE;
+  self->eos = FALSE;
+  g_cond_signal(&self->queue_cond);
+  g_mutex_unlock(&self->queue_lock);
+
+  return TRUE;
+}
+
+static gboolean gst_aja_sink_stop(GstAjaSink *self) {
+  QueueItem *item;
+
+  GST_DEBUG_OBJECT(self, "Stopping");
+
+  g_mutex_lock(&self->queue_lock);
+  self->shutdown = TRUE;
+  self->playing = FALSE;
+  g_cond_signal(&self->queue_cond);
+  g_mutex_unlock(&self->queue_lock);
+
+  if (self->output_thread) {
+    self->output_thread->Stop();
+    delete self->output_thread;
+    self->output_thread = NULL;
+  }
+
+  GST_OBJECT_LOCK(self);
+  gst_clear_caps(&self->configured_caps);
+  self->configured_audio_channels = 0;
+  GST_OBJECT_UNLOCK(self);
+
+  while ((item = (QueueItem *)gst_queue_array_pop_head_struct(self->queue))) {
+    if (item->type == QUEUE_ITEM_TYPE_FRAME) {
+      gst_buffer_unmap(item->video_buffer, &item->video_map);
+      gst_buffer_unref(item->video_buffer);
+
+      if (item->audio_buffer) {
+        gst_buffer_unmap(item->audio_buffer, &item->audio_map);
+        gst_buffer_unref(item->audio_buffer);
+      }
+      if (item->anc_buffer) {
+        gst_buffer_unmap(item->anc_buffer, &item->anc_map);
+        gst_buffer_unref(item->anc_buffer);
+      }
+      if (item->anc_buffer2) {
+        gst_buffer_unmap(item->anc_buffer2, &item->anc_map2);
+        gst_buffer_unref(item->anc_buffer2);
+      }
+    }
+  }
+
+  if (self->buffer_pool) {
+    gst_buffer_pool_set_active(self->buffer_pool, FALSE);
+    gst_clear_object(&self->buffer_pool);
+  }
+
+  if (self->audio_buffer_pool) {
+    gst_buffer_pool_set_active(self->audio_buffer_pool, FALSE);
+    gst_clear_object(&self->audio_buffer_pool);
+  }
+
+  if (self->anc_buffer_pool) {
+    gst_buffer_pool_set_active(self->anc_buffer_pool, FALSE);
+    gst_clear_object(&self->anc_buffer_pool);
+  }
+
+  if (self->tc_indexes) {
+    delete self->tc_indexes;
+    self->tc_indexes = NULL;
+  }
+
+  GST_DEBUG_OBJECT(self, "Stopped");
+
+  return TRUE;
+}
+
+static GstStateChangeReturn gst_aja_sink_change_state(
+    GstElement *element, GstStateChange transition) {
+  GstAjaSink *self = GST_AJA_SINK(element);
+  GstStateChangeReturn ret;
+
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+      if (!gst_aja_sink_open(self)) return GST_STATE_CHANGE_FAILURE;
+      break;
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      if (!gst_aja_sink_start(self)) return GST_STATE_CHANGE_FAILURE;
+      break;
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+      break;
+    default:
+      break;
+  }
+
+  ret = GST_ELEMENT_CLASS(parent_class)->change_state(element, transition);
+  if (ret == GST_STATE_CHANGE_FAILURE) return ret;
+
+  switch (transition) {
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+      g_mutex_lock(&self->queue_lock);
+      self->playing = FALSE;
+      g_cond_signal(&self->queue_cond);
+      g_mutex_unlock(&self->queue_lock);
+      break;
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+      g_mutex_lock(&self->queue_lock);
+      self->playing = TRUE;
+      g_cond_signal(&self->queue_cond);
+      g_mutex_unlock(&self->queue_lock);
+      break;
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      if (!gst_aja_sink_stop(self)) return GST_STATE_CHANGE_FAILURE;
+      break;
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      if (!gst_aja_sink_close(self)) return GST_STATE_CHANGE_FAILURE;
+      break;
+    default:
+      break;
+  }
+
+  return ret;
+}
+
+static gboolean gst_aja_sink_set_caps(GstBaseSink *bsink, GstCaps *caps) {
+  GstAjaSink *self = GST_AJA_SINK(bsink);
+  const GstStructure *s;
+  NTV2VideoFormat video_format = ::NTV2_FORMAT_UNKNOWN;
+
+  GST_DEBUG_OBJECT(self, "Configuring caps %" GST_PTR_FORMAT, caps);
+
+  GST_OBJECT_LOCK(self);
+  if (self->configured_caps) {
+    if (!gst_caps_can_intersect(self->configured_caps, caps)) {
+      GST_DEBUG_OBJECT(self, "Need to reconfigure, waiting for draining");
+      GST_OBJECT_UNLOCK(self);
+      g_mutex_lock(&self->queue_lock);
+      self->draining = TRUE;
+      g_cond_signal(&self->queue_cond);
+      while (self->draining && !self->flushing && !self->shutdown) {
+        g_cond_wait(&self->drain_cond, &self->queue_lock);
+      }
+
+      if (self->flushing || self->shutdown) {
+        g_mutex_unlock(&self->queue_lock);
+        GST_DEBUG_OBJECT(self, "Flushing");
+        return FALSE;
+      }
+      g_mutex_unlock(&self->queue_lock);
+      GST_OBJECT_LOCK(self);
+    } else {
+      GST_OBJECT_UNLOCK(self);
+      GST_DEBUG_OBJECT(self,
+                       "Compatible caps with previous caps, not reconfiguring");
+      return TRUE;
+    }
+  }
+
+  if (!gst_video_info_from_caps(&self->configured_info, caps)) {
+    GST_OBJECT_UNLOCK(self);
+    GST_FIXME_OBJECT(self, "Failed to parse caps");
+    return FALSE;
+  }
+
+  self->configured_audio_channels = 0;
+  s = gst_caps_get_structure(caps, 0);
+  gst_structure_get_int(s, "audio-channels", &self->configured_audio_channels);
+
+  gst_caps_replace(&self->configured_caps, caps);
+  GST_OBJECT_UNLOCK(self);
+
+  bool quad_mode = (self->sdi_mode != GST_AJA_SDI_MODE_SINGLE_LINK);
+  video_format = gst_ntv2_video_format_from_caps(caps, quad_mode);
+  if (video_format == NTV2_FORMAT_UNKNOWN) {
+    GST_ERROR_OBJECT(self, "Unsupported caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+
+  if (quad_mode) {
+    if (self->output_destination != GST_AJA_OUTPUT_DESTINATION_AUTO) {
+      GST_ERROR_OBJECT(self,
+                       "Quad modes require usage of the channel's default "
+                       "output destination");
+      return FALSE;
+    }
+
+    if (self->channel != ::NTV2_CHANNEL1 && self->channel != ::NTV2_CHANNEL5) {
+      GST_ERROR_OBJECT(self, "Quad modes require channels 1 or 5");
+      return FALSE;
+    }
+  }
+
+  self->quad_mode = quad_mode;
+  self->video_format = video_format;
+
+  g_assert(self->device != NULL);
+
+  // Make sure to globally lock here as the routing settings and others are
+  // global shared state
+  GstAjaNtv2DeviceLocker locker(self->device);
+
+  if (!::NTV2DeviceCanDoVideoFormat(self->device_id, video_format)) {
+    GST_ERROR_OBJECT(self, "Device does not support mode %d",
+                     (int)video_format);
+    return FALSE;
+  }
+
+  self->device->device->SetMode(self->channel, NTV2_MODE_DISPLAY, false);
+  if (self->quad_mode) {
+    for (int i = 1; i < 4; i++)
+      self->device->device->SetMode((NTV2Channel)(self->channel + i),
+                                    NTV2_MODE_DISPLAY, false);
+  }
+
+  GST_DEBUG_OBJECT(self, "Configuring video format %d on channel %d",
+                   (int)video_format, (int)self->channel);
+  self->device->device->SetVideoFormat(video_format, false, false,
+                                       self->channel);
+  if (self->quad_mode) {
+    for (int i = 1; i < 4; i++)
+      self->device->device->SetVideoFormat(video_format, false, false,
+                                           (NTV2Channel)(self->channel + i));
+  }
+
+  if (!::NTV2DeviceCanDoFrameBufferFormat(self->device_id,
+                                          ::NTV2_FBF_10BIT_YCBCR)) {
+    GST_ERROR_OBJECT(self, "Device does not support frame buffer format %d",
+                     (int)::NTV2_FBF_10BIT_YCBCR);
+    return FALSE;
+  }
+  self->device->device->SetFrameBufferFormat(self->channel,
+                                             ::NTV2_FBF_10BIT_YCBCR);
+  if (self->quad_mode) {
+    for (int i = 1; i < 4; i++)
+      self->device->device->SetFrameBufferFormat(
+          (NTV2Channel)(self->channel + i), ::NTV2_FBF_10BIT_YCBCR);
+  }
+
+  NTV2ReferenceSource reference_source;
+  switch (self->reference_source) {
+    case GST_AJA_REFERENCE_SOURCE_EXTERNAL:
+      reference_source = ::NTV2_REFERENCE_EXTERNAL;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_FREERUN:
+    case GST_AJA_REFERENCE_SOURCE_AUTO:
+      reference_source = ::NTV2_REFERENCE_FREERUN;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_1:
+      reference_source = ::NTV2_REFERENCE_INPUT1;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_2:
+      reference_source = ::NTV2_REFERENCE_INPUT2;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_3:
+      reference_source = ::NTV2_REFERENCE_INPUT3;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_4:
+      reference_source = ::NTV2_REFERENCE_INPUT4;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_5:
+      reference_source = ::NTV2_REFERENCE_INPUT5;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_6:
+      reference_source = ::NTV2_REFERENCE_INPUT6;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_7:
+      reference_source = ::NTV2_REFERENCE_INPUT7;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_8:
+      reference_source = ::NTV2_REFERENCE_INPUT8;
+      break;
+    default:
+      g_assert_not_reached();
+      break;
+  }
+  GST_DEBUG_OBJECT(self, "Configuring reference source %d",
+                   (int)reference_source);
+  self->device->device->SetFramePulseReference(reference_source);
+
+  self->device->device->DMABufferAutoLock(false, true, 0);
+
+  if (::NTV2DeviceHasBiDirectionalSDI(self->device_id))
+    self->device->device->SetSDITransmitEnable(self->channel, true);
+  if (self->quad_mode) {
+    for (int i = 1; i < 4; i++)
+      self->device->device->SetSDITransmitEnable(
+          (NTV2Channel)(self->channel + i), true);
+  }
+
+  if (self->configured_audio_channels) {
+    switch (self->audio_system_setting) {
+      case GST_AJA_AUDIO_SYSTEM_1:
+        self->audio_system = ::NTV2_AUDIOSYSTEM_1;
+        break;
+      case GST_AJA_AUDIO_SYSTEM_2:
+        self->audio_system = ::NTV2_AUDIOSYSTEM_2;
+        break;
+      case GST_AJA_AUDIO_SYSTEM_3:
+        self->audio_system = ::NTV2_AUDIOSYSTEM_3;
+        break;
+      case GST_AJA_AUDIO_SYSTEM_4:
+        self->audio_system = ::NTV2_AUDIOSYSTEM_4;
+        break;
+      case GST_AJA_AUDIO_SYSTEM_5:
+        self->audio_system = ::NTV2_AUDIOSYSTEM_5;
+        break;
+      case GST_AJA_AUDIO_SYSTEM_6:
+        self->audio_system = ::NTV2_AUDIOSYSTEM_6;
+        break;
+      case GST_AJA_AUDIO_SYSTEM_7:
+        self->audio_system = ::NTV2_AUDIOSYSTEM_7;
+        break;
+      case GST_AJA_AUDIO_SYSTEM_8:
+        self->audio_system = ::NTV2_AUDIOSYSTEM_8;
+        break;
+      case GST_AJA_AUDIO_SYSTEM_AUTO:
+        self->audio_system = ::NTV2_AUDIOSYSTEM_1;
+        if (::NTV2DeviceGetNumAudioSystems(self->device_id) > 1)
+          self->audio_system = ::NTV2ChannelToAudioSystem(self->channel);
+        if (!::NTV2DeviceCanDoFrameStore1Display(self->device_id))
+          self->audio_system = ::NTV2_AUDIOSYSTEM_1;
+        break;
+      default:
+        g_assert_not_reached();
+        break;
+    }
+
+    GST_DEBUG_OBJECT(self, "Using audio system %d", self->audio_system);
+
+    self->device->device->SetNumberAudioChannels(
+        self->configured_audio_channels, self->audio_system);
+    self->device->device->SetAudioRate(::NTV2_AUDIO_48K, self->audio_system);
+    self->device->device->SetAudioBufferSize(::NTV2_AUDIO_BUFFER_BIG,
+                                             self->audio_system);
+    self->device->device->SetSDIOutputAudioSystem(self->channel,
+                                                  self->audio_system);
+    self->device->device->SetSDIOutputDS2AudioSystem(self->channel,
+                                                     self->audio_system);
+    if (self->quad_mode) {
+      for (int i = 1; i < 4; i++) {
+        self->device->device->SetSDIOutputAudioSystem(
+            (NTV2Channel)(self->channel + i), self->audio_system);
+        self->device->device->SetSDIOutputDS2AudioSystem(
+            (NTV2Channel)(self->channel + i), self->audio_system);
+      }
+    }
+    self->device->device->SetAudioLoopBack(::NTV2_AUDIO_LOOPBACK_OFF,
+                                           self->audio_system);
+  } else {
+    self->audio_system = ::NTV2_AUDIOSYSTEM_INVALID;
+  }
+
+  // Always use the framebuffer associated with the channel
+  NTV2OutputCrosspointID framebuffer_id =
+      ::GetFrameBufferOutputXptFromChannel(self->channel, false, false);
+
+  NTV2VANCMode vanc_mode;
+  NTV2TCIndex tc_indexes_vitc2 = {::NTV2_TCINDEX_INVALID,
+                                    ::NTV2_TCINDEX_INVALID};
+  NTV2TCIndex tc_index_atc_ltc = ::NTV2_TCINDEX_INVALID;
+  NTV2InputCrosspointID output_destination_id;
+  switch (self->output_destination) {
+    case GST_AJA_OUTPUT_DESTINATION_AUTO:
+      tc_indexes_vitc0 =
+          ::NTV2ChannelToTimecodeIndex(self->channel, false, false);
+      tc_indexes_vitc1 =
+          ::NTV2ChannelToTimecodeIndex(self->channel, false, true);
+      tc_index_atc_ltc =
+          ::NTV2ChannelToTimecodeIndex(self->channel, false, true);
+      output_destination_id = ::GetSDIOutputInputXpt(self->channel, false);
+      vanc_mode = ::NTV2DeviceCanDoCustomAnc(self->device_id)
+                      ? ::NTV2_VANCMODE_OFF
+                      : ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_OUTPUT_DESTINATION_SDI1:
+      tc_indexes_vitc0 = ::NTV2_TCINDEX_SDI1;
+      tc_indexes_vitc1 = ::NTV2_TCINDEX_SDI1_2;
+      tc_index_atc_ltc = ::NTV2_TCINDEX_SDI1_LTC;
+      output_destination_id = ::NTV2_XptSDIOut1Input;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_OUTPUT_DESTINATION_SDI2:
+      tc_indexes_vitc0 = ::NTV2_TCINDEX_SDI2;
+      tc_indexes_vitc1 = ::NTV2_TCINDEX_SDI2_2;
+      tc_index_atc_ltc = ::NTV2_TCINDEX_SDI2_LTC;
+      output_destination_id = ::NTV2_XptSDIOut2Input;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_OUTPUT_DESTINATION_SDI3:
+      tc_indexes_vitc0 = ::NTV2_TCINDEX_SDI3;
+      tc_indexes_vitc1 = ::NTV2_TCINDEX_SDI3_2;
+      tc_index_atc_ltc = ::NTV2_TCINDEX_SDI3_LTC;
+      output_destination_id = ::NTV2_XptSDIOut3Input;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_OUTPUT_DESTINATION_SDI4:
+      tc_indexes_vitc0 = ::NTV2_TCINDEX_SDI4;
+      tc_indexes_vitc1 = ::NTV2_TCINDEX_SDI4_2;
+      tc_index_atc_ltc = ::NTV2_TCINDEX_SDI4_LTC;
+      output_destination_id = ::NTV2_XptSDIOut4Input;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_OUTPUT_DESTINATION_SDI5:
+      tc_indexes_vitc0 = ::NTV2_TCINDEX_SDI5;
+      tc_indexes_vitc1 = ::NTV2_TCINDEX_SDI5_2;
+      tc_index_atc_ltc = ::NTV2_TCINDEX_SDI5_LTC;
+      output_destination_id = ::NTV2_XptSDIOut5Input;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_OUTPUT_DESTINATION_SDI6:
+      tc_indexes_vitc0 = ::NTV2_TCINDEX_SDI6;
+      tc_indexes_vitc1 = ::NTV2_TCINDEX_SDI6_2;
+      tc_index_atc_ltc = ::NTV2_TCINDEX_SDI6_LTC;
+      output_destination_id = ::NTV2_XptSDIOut6Input;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_OUTPUT_DESTINATION_SDI7:
+      tc_indexes_vitc0 = ::NTV2_TCINDEX_SDI7;
+      tc_indexes_vitc1 = ::NTV2_TCINDEX_SDI7_2;
+      tc_index_atc_ltc = ::NTV2_TCINDEX_SDI7_LTC;
+      output_destination_id = ::NTV2_XptSDIOut7Input;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_OUTPUT_DESTINATION_SDI8:
+      tc_indexes_vitc0 = ::NTV2_TCINDEX_SDI8;
+      tc_indexes_vitc1 = ::NTV2_TCINDEX_SDI8_2;
+      tc_index_atc_ltc = ::NTV2_TCINDEX_SDI8_LTC;
+      output_destination_id = ::NTV2_XptSDIOut8Input;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_OUTPUT_DESTINATION_ANALOG:
+      output_destination_id = ::NTV2_XptAnalogOutInput;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_OUTPUT_DESTINATION_HDMI:
+      output_destination_id = ::NTV2_XptHDMIOutInput;
+      vanc_mode = ::NTV2_VANCMODE_OFF;
+      break;
+    default:
+      g_assert_not_reached();
+      break;
+  }
+
+  if (!self->tc_indexes) self->tc_indexes = new NTV2TCIndexes;
+
+  switch (self->timecode_index) {
+    case GST_AJA_TIMECODE_INDEX_VITC:
+      self->tc_indexes->insert(tc_indexes_vitc0);
+      if (self->configured_info.interlace_mode !=
+          GST_VIDEO_INTERLACE_MODE_PROGRESSIVE)
+        self->tc_indexes->insert(tc_indexes_vitc1);
+      break;
+    case GST_AJA_TIMECODE_INDEX_ATC_LTC:
+      self->tc_indexes->insert(tc_index_atc_ltc);
+      break;
+    case GST_AJA_TIMECODE_INDEX_LTC1:
+      self->tc_indexes->insert(::NTV2_TCINDEX_LTC1);
+      break;
+    case GST_AJA_TIMECODE_INDEX_LTC2:
+      self->tc_indexes->insert(::NTV2_TCINDEX_LTC2);
+      break;
+    default:
+      g_assert_not_reached();
+      break;
+  }
+
+  const NTV2Standard standard(::GetNTV2StandardFromVideoFormat(video_format));
+  self->device->device->SetSDIOutputStandard(self->channel, standard);
+  if (self->quad_mode) {
+    for (int i = 1; i < 4; i++)
+      self->device->device->SetSDIOutputStandard(
+          (NTV2Channel)(self->channel + i), standard);
+  }
+  const NTV2FrameGeometry geometry =
+      ::GetNTV2FrameGeometryFromVideoFormat(video_format);
+
+  self->vanc_mode =
+      ::HasVANCGeometries(geometry) ? vanc_mode : ::NTV2_VANCMODE_OFF;
+  if (self->vanc_mode == ::NTV2_VANCMODE_OFF) {
+    self->device->device->SetFrameGeometry(geometry, false, self->channel);
+    self->device->device->SetVANCMode(self->vanc_mode, self->channel);
+    if (self->quad_mode) {
+      for (int i = 1; i < 4; i++) {
+        self->device->device->SetFrameGeometry(
+            geometry, false, (NTV2Channel)(self->channel + i));
+        self->device->device->SetVANCMode(self->vanc_mode,
+                                          (NTV2Channel)(self->channel + i));
+      }
+    }
+  } else {
+    const NTV2FrameGeometry vanc_geometry =
+        ::GetVANCFrameGeometry(geometry, self->vanc_mode);
+
+    self->device->device->SetFrameGeometry(vanc_geometry, false, self->channel);
+    self->device->device->SetVANCMode(self->vanc_mode, self->channel);
+    if (self->quad_mode) {
+      for (int i = 1; i < 4; i++) {
+        self->device->device->SetFrameGeometry(
+            vanc_geometry, false, (NTV2Channel)(self->channel + i));
+        self->device->device->SetVANCMode(self->vanc_mode,
+                                          (NTV2Channel)(self->channel + i));
+      }
+    }
+  }
+
+  bool had_quad_enabled = false, had_quad_quad_enabled = false;
+
+  if (self->channel < ::NTV2_CHANNEL5) {
+    self->device->device->GetQuadFrameEnable(had_quad_enabled, ::NTV2_CHANNEL1);
+    self->device->device->GetQuadQuadFrameEnable(had_quad_quad_enabled,
+                                                 ::NTV2_CHANNEL1);
+  } else {
+    self->device->device->GetQuadFrameEnable(had_quad_enabled, ::NTV2_CHANNEL5);
+    self->device->device->GetQuadQuadFrameEnable(had_quad_quad_enabled,
+                                                 ::NTV2_CHANNEL5);
+  }
+
+  if (self->quad_mode) {
+    switch (self->sdi_mode) {
+      case GST_AJA_SDI_MODE_SINGLE_LINK:
+        g_assert_not_reached();
+        break;
+      case GST_AJA_SDI_MODE_QUAD_LINK_SQD:
+        if (self->configured_info.height > 2160) {
+          self->device->device->Set4kSquaresEnable(false, self->channel);
+          self->device->device->SetTsiFrameEnable(false, self->channel);
+          self->device->device->SetQuadQuadFrameEnable(true, self->channel);
+          self->device->device->SetQuadQuadSquaresEnable(true, self->channel);
+        } else {
+          self->device->device->SetQuadQuadFrameEnable(false, self->channel);
+          self->device->device->SetQuadQuadSquaresEnable(false, self->channel);
+          self->device->device->Set4kSquaresEnable(true, self->channel);
+          self->device->device->SetTsiFrameEnable(false, self->channel);
+        }
+        break;
+      case GST_AJA_SDI_MODE_QUAD_LINK_TSI:
+        if (self->configured_info.height > 2160) {
+          self->device->device->Set4kSquaresEnable(false, self->channel);
+          self->device->device->SetTsiFrameEnable(false, self->channel);
+          self->device->device->SetQuadQuadFrameEnable(true, self->channel);
+          self->device->device->SetQuadQuadSquaresEnable(false, self->channel);
+        } else {
+          self->device->device->SetQuadQuadFrameEnable(false, self->channel);
+          self->device->device->SetQuadQuadSquaresEnable(false, self->channel);
+          self->device->device->Set4kSquaresEnable(false, self->channel);
+          self->device->device->SetTsiFrameEnable(true, self->channel);
+        }
+        break;
+    }
+  } else {
+    NTV2Channel quad_channel;
+
+    if (self->channel < ::NTV2_CHANNEL5)
+      quad_channel = ::NTV2_CHANNEL1;
+    else
+      quad_channel = ::NTV2_CHANNEL5;
+
+    self->device->device->Set4kSquaresEnable(false, quad_channel);
+    self->device->device->SetTsiFrameEnable(false, quad_channel);
+    self->device->device->SetQuadQuadFrameEnable(false, quad_channel);
+    self->device->device->SetQuadQuadSquaresEnable(false, quad_channel);
+  }
+
+  NTV2SmpteLineNumber smpte_line_num_info = ::GetSmpteLineNumber(standard);
+  self->f2_start_line =
+      (smpte_line_num_info.GetLastLine(
+           smpte_line_num_info.firstFieldTop ? NTV2_FIELD0 : NTV2_FIELD1) +
+       1);
+
+  CNTV2SignalRouter router;
+
+  // If any channels are currently running, initialize the router with the
+  // existing routing setup. Otherwise overwrite the whole routing table.
+  {
+    bool have_channels_running = false;
+
+    for (NTV2Channel c = ::NTV2_CHANNEL1; c < NTV2_MAX_NUM_CHANNELS;
+         c = (NTV2Channel)(c + 1)) {
+      AUTOCIRCULATE_STATUS ac_status;
+
+      if (c == self->channel) continue;
+
+      if (self->device->device->AutoCirculateGetStatus(c, ac_status) &&
+          !ac_status.IsStopped()) {
+        have_channels_running = true;
+        break;
+      }
+    }
+
+    if (have_channels_running) self->device->device->GetRouting(router);
+  }
+
+  // Need to remove old routes for the output and framebuffer we're going to use
+  NTV2ActualConnections connections = router.GetConnections();
+
+  if (self->quad_mode) {
+    if (self->channel == NTV2_CHANNEL1) {
+      for (auto iter = connections.begin(); iter != connections.end(); iter++) {
+        if (iter->first == NTV2_XptSDIOut1Input ||
+            iter->first == NTV2_XptSDIOut1InputDS2 ||
+            iter->first == NTV2_XptSDIOut2Input ||
+            iter->first == NTV2_XptSDIOut2InputDS2 ||
+            iter->first == NTV2_XptSDIOut3Input ||
+            iter->first == NTV2_XptSDIOut4Input ||
+            iter->second == NTV2_Xpt425Mux1AYUV ||
+            iter->second == NTV2_Xpt425Mux1BYUV ||
+            iter->second == NTV2_Xpt425Mux2AYUV ||
+            iter->second == NTV2_Xpt425Mux2BYUV ||
+            iter->first == NTV2_Xpt425Mux1AInput ||
+            iter->first == NTV2_Xpt425Mux1BInput ||
+            iter->first == NTV2_Xpt425Mux2AInput ||
+            iter->first == NTV2_Xpt425Mux2BInput ||
+            iter->second == NTV2_XptFrameBuffer1YUV ||
+            iter->second == NTV2_XptFrameBuffer2YUV ||
+            iter->second == NTV2_XptFrameBuffer3YUV ||
+            iter->second == NTV2_XptFrameBuffer4YUV ||
+            iter->second == NTV2_XptFrameBuffer1_DS2YUV ||
+            iter->second == NTV2_XptFrameBuffer2_DS2YUV ||
+            iter->first == NTV2_XptSDIOut1Input ||
+            iter->first == NTV2_XptSDIOut2Input ||
+            iter->first == NTV2_XptSDIOut3Input ||
+            iter->first == NTV2_XptSDIOut4Input)
+          router.RemoveConnection(iter->first, iter->second);
+      }
+    } else if (self->channel == NTV2_CHANNEL5) {
+      for (auto iter = connections.begin(); iter != connections.end(); iter++) {
+        if (iter->first == NTV2_XptSDIOut5Input ||
+            iter->first == NTV2_XptSDIOut5InputDS2 ||
+            iter->first == NTV2_XptSDIOut6Input ||
+            iter->first == NTV2_XptSDIOut6InputDS2 ||
+            iter->first == NTV2_XptSDIOut7Input ||
+            iter->first == NTV2_XptSDIOut8Input ||
+            iter->second == NTV2_Xpt425Mux3AYUV ||
+            iter->second == NTV2_Xpt425Mux3BYUV ||
+            iter->second == NTV2_Xpt425Mux4AYUV ||
+            iter->second == NTV2_Xpt425Mux4BYUV ||
+            iter->first == NTV2_Xpt425Mux3AInput ||
+            iter->first == NTV2_Xpt425Mux3BInput ||
+            iter->first == NTV2_Xpt425Mux4AInput ||
+            iter->first == NTV2_Xpt425Mux4BInput ||
+            iter->second == NTV2_XptFrameBuffer5YUV ||
+            iter->second == NTV2_XptFrameBuffer6YUV ||
+            iter->second == NTV2_XptFrameBuffer7YUV ||
+            iter->second == NTV2_XptFrameBuffer8YUV ||
+            iter->second == NTV2_XptFrameBuffer3_DS2YUV ||
+            iter->second == NTV2_XptFrameBuffer4_DS2YUV ||
+            iter->second == NTV2_XptFrameBuffer5_DS2YUV ||
+            iter->second == NTV2_XptFrameBuffer6_DS2YUV ||
+            iter->first == NTV2_XptSDIOut5Input ||
+            iter->first == NTV2_XptSDIOut6Input ||
+            iter->first == NTV2_XptSDIOut7Input ||
+            iter->first == NTV2_XptSDIOut8Input)
+          router.RemoveConnection(iter->first, iter->second);
+      }
+    } else {
+      g_assert_not_reached();
+    }
+  } else {
+    // This also removes all connections for any previous quad mode on the
+    // corresponding channels.
+
+    NTV2InputCrosspointID quad_output_source_ids10;
+
+    if (output_destination_id == NTV2_XptSDIOut1Input ||
+        output_destination_id == NTV2_XptSDIOut2Input ||
+        output_destination_id == NTV2_XptSDIOut3Input ||
+        output_destination_id == NTV2_XptSDIOut4Input) {
+      quad_output_source_ids0 = NTV2_XptSDIOut1Input;
+      quad_output_source_ids1 = NTV2_XptSDIOut2Input;
+      quad_output_source_ids2 = NTV2_XptSDIOut3Input;
+      quad_output_source_ids3 = NTV2_XptSDIOut4Input;
+      quad_output_source_ids4 = NTV2_XptSDIOut1InputDS2;
+      quad_output_source_ids5 = NTV2_XptSDIOut2InputDS2;
+      quad_output_source_ids6 = NTV2_Xpt425Mux1AInput;
+      quad_output_source_ids7 = NTV2_Xpt425Mux1BInput;
+      quad_output_source_ids8 = NTV2_Xpt425Mux2AInput;
+      quad_output_source_ids9 = NTV2_Xpt425Mux2BInput;
+    } else if (output_destination_id == NTV2_XptSDIOut5Input ||
+               output_destination_id == NTV2_XptSDIOut6Input ||
+               output_destination_id == NTV2_XptSDIOut7Input ||
+               output_destination_id == NTV2_XptSDIOut8Input) {
+      quad_output_source_ids0 = NTV2_XptSDIOut5Input;
+      quad_output_source_ids1 = NTV2_XptSDIOut6Input;
+      quad_output_source_ids2 = NTV2_XptSDIOut7Input;
+      quad_output_source_ids3 = NTV2_XptSDIOut8Input;
+      quad_output_source_ids4 = NTV2_XptSDIOut5InputDS2;
+      quad_output_source_ids5 = NTV2_XptSDIOut6InputDS2;
+      quad_output_source_ids6 = NTV2_Xpt425Mux3AInput;
+      quad_output_source_ids7 = NTV2_Xpt425Mux3BInput;
+      quad_output_source_ids8 = NTV2_Xpt425Mux4AInput;
+      quad_output_source_ids9 = NTV2_Xpt425Mux4BInput;
+    }
+
+    for (auto iter = connections.begin(); iter != connections.end(); iter++) {
+      if (had_quad_enabled || had_quad_quad_enabled) {
+        for (auto quad_output_source_id : quad_output_source_ids) {
+          if (iter->first == quad_output_source_id)
+            router.RemoveConnection(iter->first, iter->second);
+        }
+      } else {
+        if (iter->first == output_destination_id ||
+            iter->second == framebuffer_id)
+          router.RemoveConnection(iter->first, iter->second);
+      }
+    }
+  }
+
+  if (self->quad_mode) {
+    if (self->sdi_mode == GST_AJA_SDI_MODE_QUAD_LINK_TSI &&
+        !NTV2_IS_QUAD_QUAD_HFR_VIDEO_FORMAT(self->video_format) &&
+        !NTV2_IS_QUAD_QUAD_FORMAT(self->video_format)) {
+      if (self->channel == NTV2_CHANNEL1)
+        framebuffer_id = NTV2_Xpt425Mux1AYUV;
+      else if (self->channel == NTV2_CHANNEL5)
+        framebuffer_id = NTV2_Xpt425Mux3AYUV;
+      else
+        g_assert_not_reached();
+    }
+  }
+
+  GST_DEBUG_OBJECT(self, "Creating connection %d - %d", output_destination_id,
+                   framebuffer_id);
+  router.AddConnection(output_destination_id, framebuffer_id);
+
+  if (self->quad_mode) {
+    if (self->sdi_mode == GST_AJA_SDI_MODE_QUAD_LINK_TSI) {
+      if (NTV2_IS_QUAD_QUAD_HFR_VIDEO_FORMAT(self->video_format)) {
+        if (self->channel == NTV2_CHANNEL1) {
+          router.AddConnection(NTV2_XptSDIOut2Input,
+                               NTV2_XptFrameBuffer1_DS2YUV);
+          router.AddConnection(NTV2_XptSDIOut3Input, NTV2_XptFrameBuffer2YUV);
+          router.AddConnection(NTV2_XptSDIOut4Input,
+                               NTV2_XptFrameBuffer2_DS2YUV);
+        } else if (self->channel == NTV2_CHANNEL5) {
+          router.AddConnection(NTV2_XptSDIOut6Input,
+                               NTV2_XptFrameBuffer3_DS2YUV);
+          router.AddConnection(NTV2_XptSDIOut7Input, NTV2_XptFrameBuffer4YUV);
+          router.AddConnection(NTV2_XptSDIOut8Input,
+                               NTV2_XptFrameBuffer4_DS2YUV);
+        } else {
+          g_assert_not_reached();
+        }
+      } else if (NTV2_IS_QUAD_QUAD_FORMAT(self->video_format)) {
+        if (self->channel == NTV2_CHANNEL1) {
+          router.AddConnection(NTV2_XptSDIOut1InputDS2,
+                               NTV2_XptFrameBuffer1_DS2YUV);
+          router.AddConnection(NTV2_XptSDIOut2Input, NTV2_XptFrameBuffer2YUV);
+          router.AddConnection(NTV2_XptSDIOut2InputDS2,
+                               NTV2_XptFrameBuffer2_DS2YUV);
+        } else if (self->channel == NTV2_CHANNEL5) {
+          router.AddConnection(NTV2_XptSDIOut5InputDS2,
+                               NTV2_XptFrameBuffer3_DS2YUV);
+          router.AddConnection(NTV2_XptSDIOut6Input, NTV2_XptFrameBuffer4YUV);
+          router.AddConnection(NTV2_XptSDIOut6InputDS2,
+                               NTV2_XptFrameBuffer4_DS2YUV);
+        } else {
+          g_assert_not_reached();
+        }
+      } else if (NTV2_IS_4K_HFR_VIDEO_FORMAT(self->video_format)) {
+        if (self->channel == NTV2_CHANNEL1) {
+          router.AddConnection(NTV2_XptSDIOut2Input, NTV2_Xpt425Mux1BYUV);
+          router.AddConnection(NTV2_XptSDIOut3Input, NTV2_Xpt425Mux2AYUV);
+          router.AddConnection(NTV2_XptSDIOut4Input, NTV2_Xpt425Mux2BYUV);
+
+          router.AddConnection(NTV2_Xpt425Mux1AInput, NTV2_XptFrameBuffer1YUV);
+          router.AddConnection(NTV2_Xpt425Mux1BInput,
+                               NTV2_XptFrameBuffer1_DS2YUV);
+          router.AddConnection(NTV2_Xpt425Mux2AInput, NTV2_XptFrameBuffer2YUV);
+          router.AddConnection(NTV2_Xpt425Mux2BInput,
+                               NTV2_XptFrameBuffer2_DS2YUV);
+        } else if (self->channel == NTV2_CHANNEL5) {
+          router.AddConnection(NTV2_XptSDIOut6Input, NTV2_Xpt425Mux3BYUV);
+          router.AddConnection(NTV2_XptSDIOut7Input, NTV2_Xpt425Mux4AYUV);
+          router.AddConnection(NTV2_XptSDIOut8Input, NTV2_Xpt425Mux4BYUV);
+
+          router.AddConnection(NTV2_Xpt425Mux3AInput, NTV2_XptFrameBuffer5YUV);
+          router.AddConnection(NTV2_Xpt425Mux3BInput,
+                               NTV2_XptFrameBuffer5_DS2YUV);
+          router.AddConnection(NTV2_Xpt425Mux4AInput, NTV2_XptFrameBuffer6YUV);
+          router.AddConnection(NTV2_Xpt425Mux4BInput,
+                               NTV2_XptFrameBuffer6_DS2YUV);
+        } else {
+          g_assert_not_reached();
+        }
+      } else {
+        if (self->channel == NTV2_CHANNEL1) {
+          router.AddConnection(NTV2_XptSDIOut1InputDS2, NTV2_Xpt425Mux1BYUV);
+          router.AddConnection(NTV2_XptSDIOut2Input, NTV2_Xpt425Mux2AYUV);
+          router.AddConnection(NTV2_XptSDIOut2InputDS2, NTV2_Xpt425Mux2BYUV);
+
+          router.AddConnection(NTV2_Xpt425Mux1AInput, NTV2_XptFrameBuffer1YUV);
+          router.AddConnection(NTV2_Xpt425Mux1BInput,
+                               NTV2_XptFrameBuffer1_DS2YUV);
+          router.AddConnection(NTV2_Xpt425Mux2AInput, NTV2_XptFrameBuffer2YUV);
+          router.AddConnection(NTV2_Xpt425Mux2BInput,
+                               NTV2_XptFrameBuffer2_DS2YUV);
+        } else if (self->channel == NTV2_CHANNEL5) {
+          router.AddConnection(NTV2_XptSDIOut5InputDS2, NTV2_Xpt425Mux3BYUV);
+          router.AddConnection(NTV2_XptSDIOut6Input, NTV2_Xpt425Mux4AYUV);
+          router.AddConnection(NTV2_XptSDIOut6InputDS2, NTV2_Xpt425Mux4BYUV);
+
+          router.AddConnection(NTV2_Xpt425Mux3AInput, NTV2_XptFrameBuffer5YUV);
+          router.AddConnection(NTV2_Xpt425Mux3BInput,
+                               NTV2_XptFrameBuffer5_DS2YUV);
+          router.AddConnection(NTV2_Xpt425Mux4AInput, NTV2_XptFrameBuffer6YUV);
+          router.AddConnection(NTV2_Xpt425Mux4BInput,
+                               NTV2_XptFrameBuffer6_DS2YUV);
+        } else {
+          g_assert_not_reached();
+        }
+      }
+    } else if (self->sdi_mode == GST_AJA_SDI_MODE_QUAD_LINK_SQD) {
+      if (self->channel == NTV2_CHANNEL1) {
+        router.AddConnection(NTV2_XptSDIOut2Input, NTV2_XptFrameBuffer2YUV);
+        router.AddConnection(NTV2_XptSDIOut3Input, NTV2_XptFrameBuffer3YUV);
+        router.AddConnection(NTV2_XptSDIOut4Input, NTV2_XptFrameBuffer4YUV);
+      } else if (self->channel == NTV2_CHANNEL5) {
+        router.AddConnection(NTV2_XptSDIOut6Input, NTV2_XptFrameBuffer6YUV);
+        router.AddConnection(NTV2_XptSDIOut7Input, NTV2_XptFrameBuffer7YUV);
+        router.AddConnection(NTV2_XptSDIOut8Input, NTV2_XptFrameBuffer8YUV);
+      } else {
+        g_assert_not_reached();
+      }
+    }
+  }
+
+  {
+    std::stringstream os;
+    CNTV2SignalRouter oldRouter;
+    self->device->device->GetRouting(oldRouter);
+    oldRouter.Print(os);
+    GST_DEBUG_OBJECT(self, "Previous routing:\n%s", os.str().c_str());
+  }
+  self->device->device->ApplySignalRoute(router, true);
+  {
+    std::stringstream os;
+    CNTV2SignalRouter currentRouter;
+    self->device->device->GetRouting(currentRouter);
+    currentRouter.Print(os);
+    GST_DEBUG_OBJECT(self, "New routing:\n%s", os.str().c_str());
+  }
+
+  return TRUE;
+}
+
+static GstCaps *gst_aja_sink_get_caps(GstBaseSink *bsink, GstCaps *filter) {
+  GstAjaSink *self = GST_AJA_SINK(bsink);
+  GstCaps *caps;
+
+  if (self->device) {
+    caps = gst_ntv2_supported_caps(self->device_id);
+  } else {
+    caps = gst_pad_get_pad_template_caps(GST_BASE_SINK_PAD(self));
+  }
+
+  if (filter) {
+    GstCaps *tmp =
+        gst_caps_intersect_full(filter, caps, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref(caps);
+    caps = tmp;
+  }
+
+  return caps;
+}
+
+static gboolean gst_aja_sink_event(GstBaseSink *bsink, GstEvent *event) {
+  GstAjaSink *self = GST_AJA_SINK(bsink);
+
+  switch (GST_EVENT_TYPE(event)) {
+    case GST_EVENT_EOS: {
+      GST_DEBUG_OBJECT(self, "Signalling EOS");
+
+      g_mutex_lock(&self->queue_lock);
+      self->eos = TRUE;
+      g_cond_signal(&self->queue_cond);
+      g_mutex_unlock(&self->queue_lock);
+
+      break;
+    }
+    case GST_EVENT_FLUSH_START: {
+      g_mutex_lock(&self->queue_lock);
+      self->flushing = TRUE;
+      self->draining = FALSE;
+      g_cond_signal(&self->drain_cond);
+      g_mutex_unlock(&self->queue_lock);
+      break;
+    }
+    case GST_EVENT_FLUSH_STOP: {
+      QueueItem *item;
+
+      g_mutex_lock(&self->queue_lock);
+      while (
+          (item = (QueueItem *)gst_queue_array_pop_head_struct(self->queue))) {
+        if (item->type == QUEUE_ITEM_TYPE_FRAME) {
+          gst_buffer_unmap(item->video_buffer, &item->video_map);
+          gst_buffer_unref(item->video_buffer);
+
+          if (item->audio_buffer) {
+            gst_buffer_unmap(item->audio_buffer, &item->audio_map);
+            gst_buffer_unref(item->audio_buffer);
+          }
+
+          if (item->anc_buffer) {
+            gst_buffer_unmap(item->anc_buffer, &item->anc_map);
+            gst_buffer_unref(item->anc_buffer);
+          }
+          if (item->anc_buffer2) {
+            gst_buffer_unmap(item->anc_buffer2, &item->anc_map2);
+            gst_buffer_unref(item->anc_buffer2);
+          }
+        }
+      }
+      g_cond_signal(&self->queue_cond);
+
+      self->flushing = FALSE;
+      g_cond_signal(&self->drain_cond);
+      g_mutex_unlock(&self->queue_lock);
+      break;
+    }
+    default:
+      break;
+  }
+
+  return GST_BASE_SINK_CLASS(parent_class)->event(bsink, event);
+}
+
+static gboolean gst_aja_sink_propose_allocation(GstBaseSink *bsink,
+                                                GstQuery *query) {
+  GstAjaSink *self = GST_AJA_SINK(bsink);
+
+  if (self->allocator && self->vanc_mode == ::NTV2_VANCMODE_OFF) {
+    GstAllocationParams params;
+
+    gst_allocation_params_init(&params);
+    params.prefix = 0;
+    params.padding = 0;
+    params.align = 4095;
+
+    gst_query_add_allocation_param(query, self->allocator, &params);
+  }
+
+  return TRUE;
+}
+
+static GstFlowReturn gst_aja_sink_render(GstBaseSink *bsink,
+                                         GstBuffer *buffer) {
+  GstAjaSink *self = GST_AJA_SINK(bsink);
+  GstFlowReturn flow_ret = GST_FLOW_OK;
+  GstAjaAudioMeta *meta;
+  GstBuffer *item_buffer = NULL, *item_audio_buffer = NULL;
+  GstVideoTimeCodeMeta *tc_meta;
+  QueueItem item = {
+      .type = QUEUE_ITEM_TYPE_FRAME,
+      .video_buffer = NULL,
+      .video_map = GST_MAP_INFO_INIT,
+      .audio_buffer = NULL,
+      .audio_map = GST_MAP_INFO_INIT,
+      .tc = NTV2_RP188(),
+      .anc_buffer = NULL,
+      .anc_map = GST_MAP_INFO_INIT,
+      .anc_buffer2 = NULL,
+      .anc_map2 = GST_MAP_INFO_INIT,
+  };
+
+  guint video_buffer_size = ::GetVideoActiveSize(
+      self->video_format, ::NTV2_FBF_10BIT_YCBCR, self->vanc_mode);
+  NTV2FormatDescriptor format_desc(self->video_format, ::NTV2_FBF_10BIT_YCBCR,
+                                   self->vanc_mode);
+
+  meta = gst_buffer_get_aja_audio_meta(buffer);
+  tc_meta = gst_buffer_get_video_time_code_meta(buffer);
+
+  if (self->vanc_mode == ::NTV2_VANCMODE_OFF &&
+      gst_buffer_n_memory(buffer) == 1) {
+    GstMemory *mem = gst_buffer_peek_memory(buffer, 0);
+    gsize offset;
+
+    if (gst_memory_get_sizes(mem, &offset, NULL) == video_buffer_size &&
+        offset == 0 &&
+        strcmp(mem->allocator->mem_type, GST_AJA_ALLOCATOR_MEMTYPE) == 0 &&
+        GST_AJA_ALLOCATOR(mem->allocator)->device->device->GetIndexNumber() ==
+            self->device->device->GetIndexNumber()) {
+      item_buffer = gst_buffer_ref(buffer);
+    }
+  }
+
+  if (!item_buffer) {
+    GstVideoFrame in_frame;
+
+    GST_DEBUG_OBJECT(self, "Allocating new video buffer");
+
+    if (!self->buffer_pool) {
+      self->buffer_pool = gst_buffer_pool_new();
+      GstStructure *config = gst_buffer_pool_get_config(self->buffer_pool);
+      gst_buffer_pool_config_set_params(config, NULL, video_buffer_size,
+                                        self->queue_size, 0);
+      gst_buffer_pool_config_set_allocator(config, self->allocator, NULL);
+      gst_buffer_pool_set_config(self->buffer_pool, config);
+      gst_buffer_pool_set_active(self->buffer_pool, TRUE);
+    }
+
+    if (!gst_video_frame_map(&in_frame, &self->configured_info, buffer,
+                             GST_MAP_READ)) {
+      GST_ERROR_OBJECT(self, "Failed to map buffer");
+      return GST_FLOW_ERROR;
+    }
+
+    flow_ret =
+        gst_buffer_pool_acquire_buffer(self->buffer_pool, &item_buffer, NULL);
+    if (flow_ret != GST_FLOW_OK) {
+      gst_video_frame_unmap(&in_frame);
+      return flow_ret;
+    }
+
+    item.type = QUEUE_ITEM_TYPE_FRAME;
+
+    item.video_buffer = item_buffer;
+    gst_buffer_map(item.video_buffer, &item.video_map, GST_MAP_WRITE);
+
+    guint offset =
+        format_desc.RasterLineToByteOffset(format_desc.GetFirstActiveLine());
+    guint size = format_desc.GetVisibleRasterBytes();
+
+    if (offset != 0)
+      ::SetRasterLinesBlack(::NTV2_FBF_10BIT_YCBCR, item.video_map.data,
+                            format_desc.GetBytesPerRow(),
+                            format_desc.GetFirstActiveLine());
+    memcpy(item.video_map.data + offset,
+           GST_VIDEO_FRAME_PLANE_DATA(&in_frame, 0), size);
+
+    gst_video_frame_unmap(&in_frame);
+  } else {
+    item.type = QUEUE_ITEM_TYPE_FRAME;
+
+    item.video_buffer = item_buffer;
+    gst_buffer_map(item.video_buffer, &item.video_map, GST_MAP_READ);
+  }
+
+  if (meta) {
+    if (gst_buffer_n_memory(meta->buffer) == 1) {
+      GstMemory *mem = gst_buffer_peek_memory(meta->buffer, 0);
+
+      if (strcmp(mem->allocator->mem_type, GST_AJA_ALLOCATOR_MEMTYPE) == 0 &&
+          GST_AJA_ALLOCATOR(mem->allocator)->device->device->GetIndexNumber() ==
+              self->device->device->GetIndexNumber()) {
+        item_audio_buffer = gst_buffer_ref(meta->buffer);
+      }
+    }
+
+    if (!item_audio_buffer) {
+      GstMapInfo audio_map;
+
+      GST_DEBUG_OBJECT(self, "Allocating new audio buffer");
+
+      if (!self->audio_buffer_pool) {
+        guint audio_buffer_size = 1UL * 1024UL * 1024UL;
+
+        self->audio_buffer_pool = gst_buffer_pool_new();
+        GstStructure *config =
+            gst_buffer_pool_get_config(self->audio_buffer_pool);
+        gst_buffer_pool_config_set_params(config, NULL, audio_buffer_size,
+                                          self->queue_size, 0);
+        gst_buffer_pool_config_set_allocator(config, self->allocator, NULL);
+        gst_buffer_pool_set_config(self->audio_buffer_pool, config);
+        gst_buffer_pool_set_active(self->audio_buffer_pool, TRUE);
+      }
+
+      flow_ret = gst_buffer_pool_acquire_buffer(self->audio_buffer_pool,
+                                                &item_audio_buffer, NULL);
+      if (flow_ret != GST_FLOW_OK) {
+        gst_buffer_unmap(item.video_buffer, &item.video_map);
+        gst_buffer_unref(item.video_buffer);
+        return flow_ret;
+      }
+
+      gst_buffer_set_size(item_audio_buffer, gst_buffer_get_size(meta->buffer));
+
+      gst_buffer_map(meta->buffer, &audio_map, GST_MAP_READ);
+      gst_buffer_map(item_audio_buffer, &item.audio_map, GST_MAP_READWRITE);
+      memcpy(item.audio_map.data, audio_map.data, audio_map.size);
+      gst_buffer_unmap(meta->buffer, &audio_map);
+      item.audio_buffer = item_audio_buffer;
+    } else {
+      gst_buffer_map(item_audio_buffer, &item.audio_map, GST_MAP_READ);
+      item.audio_buffer = item_audio_buffer;
+    }
+  } else {
+    item.audio_buffer = NULL;
+  }
+
+  if (tc_meta) {
+    TimecodeFormat tc_format = ::kTCFormatUnknown;
+
+    if (tc_meta->tc.config.fps_n == 24 && tc_meta->tc.config.fps_d == 1) {
+      tc_format = kTCFormat24fps;
+    } else if (tc_meta->tc.config.fps_n == 25 &&
+               tc_meta->tc.config.fps_d == 1) {
+      tc_format = kTCFormat25fps;
+    } else if (tc_meta->tc.config.fps_n == 30 &&
+               tc_meta->tc.config.fps_d == 1) {
+      tc_format = kTCFormat30fps;
+    } else if (tc_meta->tc.config.fps_n == 30000 &&
+               tc_meta->tc.config.fps_d == 1001) {
+      tc_format = kTCFormat30fpsDF;
+    } else if (tc_meta->tc.config.fps_n == 48 &&
+               tc_meta->tc.config.fps_d == 1) {
+      tc_format = kTCFormat48fps;
+    } else if (tc_meta->tc.config.fps_n == 50 &&
+               tc_meta->tc.config.fps_d == 1) {
+      tc_format = kTCFormat50fps;
+    } else if (tc_meta->tc.config.fps_n == 60 &&
+               tc_meta->tc.config.fps_d == 1) {
+      tc_format = kTCFormat60fps;
+    } else if (tc_meta->tc.config.fps_n == 60000 &&
+               tc_meta->tc.config.fps_d == 1001) {
+      tc_format = kTCFormat60fpsDF;
+    }
+
+    const CRP188 rp188(tc_meta->tc.frames, tc_meta->tc.seconds,
+                       tc_meta->tc.minutes, tc_meta->tc.hours, tc_format);
+    rp188.GetRP188Reg(item.tc);
+  } else {
+    item.tc.fDBB = 0xffffffff;
+  }
+
+  AJAAncillaryList anc_packet_list;
+
+  // TODO: Handle AFD/Bar meta
+#if 0
+    if (bar_meta || afd_meta) {
+      const uint16_t kF1PktLineNumAFDBAR(11);
+      const AJAAncillaryDataLocation kAFDBARLocF1(
+          AJAAncillaryDataLink_A, AJAAncillaryDataVideoStream_Y,
+          AJAAncillaryDataSpace_VANC, kF1PktLineNumAFDBAR,
+          AJAAncDataHorizOffset_AnyVanc);
+      const uint16_t kF2PktLineNumAFDBAR(self->f2_start_line + 11);
+      const AJAAncillaryDataLocation kAFDBARLocF2(
+          AJAAncillaryDataLink_A, AJAAncillaryDataVideoStream_Y,
+          AJAAncillaryDataSpace_VANC, kF2PktLineNumAFDBAR,
+          AJAAncDataHorizOffset_AnyVanc);
+
+      AJAAncillaryData pkt;
+      pkt.SetFromSMPTE334(NULL, 0, kAFDBARLocF1);
+      anc_packet_list.AddAncillaryData(pkt);
+
+      if (self->configured_info.interlace_mode != GST_VIDEO_INTERLACE_MODE_PROGRESSIVE) {
+        AJAAncillaryData pkt2;
+        pkt.SetFromSMPTE334(NULL, 0, kAFDBARLocF2);
+        anc_packet_list.AddAncillaryData(pkt);
+      }
+    }
+#endif
+
+  GstVideoCaptionMeta *caption_meta;
+  gpointer iter = NULL;
+  while (
+      (caption_meta = (GstVideoCaptionMeta *)gst_buffer_iterate_meta_filtered(
+           buffer, &iter, GST_VIDEO_CAPTION_META_API_TYPE))) {
+    if (caption_meta->caption_type == GST_VIDEO_CAPTION_TYPE_CEA708_CDP) {
+      if (self->cea708_line_number != -1) {
+        const AJAAncillaryDataLocation kCEA708LocF1(
+            AJAAncillaryDataLink_A, AJAAncillaryDataVideoStream_Y,
+            AJAAncillaryDataSpace_VANC, self->cea708_line_number,
+            AJAAncDataHorizOffset_AnyVanc);
+
+        AJAAncillaryData_Cea708 pkt;
+
+        pkt.SetDID(AJAAncillaryData_CEA708_DID);
+        pkt.SetSID(AJAAncillaryData_CEA708_SID);
+        pkt.SetDataLocation(kCEA708LocF1);
+        pkt.SetDataCoding(AJAAncillaryDataCoding_Digital);
+        pkt.SetPayloadData(caption_meta->data, caption_meta->size);
+
+        GST_TRACE_OBJECT(
+            self,
+            "Adding CEA708 CDP VANC of %" G_GSIZE_FORMAT " bytes at line %u",
+            pkt.GetPayloadByteCount(), pkt.GetLocationLineNumber());
+
+        anc_packet_list.AddAncillaryData(pkt);
+      }
+    } else if (caption_meta->caption_type ==
+               GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A) {
+      if (self->cea608_line_number != -1) {
+        const AJAAncillaryDataLocation kCEA608LocF1(
+            AJAAncillaryDataLink_A, AJAAncillaryDataVideoStream_Y,
+            AJAAncillaryDataSpace_VANC, self->cea608_line_number,
+            AJAAncDataHorizOffset_AnyVanc);
+
+        AJAAncillaryData_Cea608_Vanc pkt;
+
+        pkt.SetDID(AJAAncillaryData_Cea608_Vanc_DID);
+        pkt.SetSID(AJAAncillaryData_Cea608_Vanc_SID);
+        pkt.SetDataLocation(kCEA608LocF1);
+        pkt.SetDataCoding(AJAAncillaryDataCoding_Digital);
+        pkt.SetPayloadData(caption_meta->data, caption_meta->size);
+        pkt.ParsePayloadData();
+
+        GST_TRACE_OBJECT(
+            self, "Adding CEA608 VANC of %" G_GSIZE_FORMAT " bytes at line %u",
+            pkt.GetPayloadByteCount(), pkt.GetLocationLineNumber());
+
+        anc_packet_list.AddAncillaryData(pkt);
+      }
+    } else {
+      GST_WARNING_OBJECT(self, "Unhandled caption type %d",
+                         caption_meta->caption_type);
+    }
+  }
+
+  if (self->handle_ancillary_meta) {
+    GstAncillaryMeta *anc_meta;
+    iter = NULL;
+    while ((anc_meta = (GstAncillaryMeta *)gst_buffer_iterate_meta_filtered(
+                buffer, &iter, GST_ANCILLARY_META_API_TYPE))) {
+      const AJAAncillaryDataLocation loc(
+          AJAAncillaryDataLink_A,
+          anc_meta->c_not_y_channel ? AJAAncillaryDataChannel_C
+                                    : AJAAncillaryDataVideoStream_Y,
+          AJAAncillaryDataSpace_VANC, anc_meta->line, anc_meta->offset);
+
+      AJAAncillaryData pkt;
+      guint8 data256;
+
+      pkt.SetDID(anc_meta->DID);
+      pkt.SetSID(anc_meta->SDID_block_number);
+      pkt.SetDataLocation(loc);
+      pkt.SetDataCoding(AJAAncillaryDataCoding_Digital);
+
+      for (gsize i = 0; i < (anc_meta->data_count & 0xff); i++) {
+        datai = anc_meta->datai & 0xff;
+      }
+      pkt.SetPayloadData(data, anc_meta->data_count & 0xff);
+
+      GST_TRACE_OBJECT(self,
+                       "Adding ANC of %" G_GSIZE_FORMAT " bytes at (%u,%u)",
+                       pkt.GetPayloadByteCount(), pkt.GetLocationLineNumber(),
+                       pkt.GetLocationHorizOffset());
+
+      anc_packet_list.AddAncillaryData(pkt);
+    }
+  }
+
+  if (!anc_packet_list.IsEmpty()) {
+    if (self->vanc_mode == ::NTV2_VANCMODE_OFF &&
+        ::NTV2DeviceCanDoCustomAnc(self->device_id)) {
+      if (!self->anc_buffer_pool) {
+        self->anc_buffer_pool = gst_buffer_pool_new();
+        GstStructure *config =
+            gst_buffer_pool_get_config(self->anc_buffer_pool);
+        gst_buffer_pool_config_set_params(
+            config, NULL, 8 * 1024,
+            (self->configured_info.interlace_mode ==
+                     GST_VIDEO_INTERLACE_MODE_PROGRESSIVE
+                 ? 1
+                 : 2) *
+                self->queue_size,
+            0);
+        gst_buffer_pool_config_set_allocator(config, self->allocator, NULL);
+        gst_buffer_pool_set_config(self->anc_buffer_pool, config);
+        gst_buffer_pool_set_active(self->anc_buffer_pool, TRUE);
+      }
+
+      flow_ret = gst_buffer_pool_acquire_buffer(self->anc_buffer_pool,
+                                                &item.anc_buffer, NULL);
+      if (flow_ret != GST_FLOW_OK) {
+        gst_buffer_unmap(item.video_buffer, &item.video_map);
+        gst_buffer_unref(item.video_buffer);
+
+        if (item.audio_buffer) {
+          gst_buffer_unmap(item.audio_buffer, &item.audio_map);
+          gst_buffer_unref(item.audio_buffer);
+        }
+
+        return flow_ret;
+      }
+      gst_buffer_map(item.anc_buffer, &item.anc_map, GST_MAP_READWRITE);
+
+      if (self->configured_info.interlace_mode !=
+          GST_VIDEO_INTERLACE_MODE_PROGRESSIVE) {
+        flow_ret = gst_buffer_pool_acquire_buffer(self->anc_buffer_pool,
+                                                  &item.anc_buffer2, NULL);
+        if (flow_ret != GST_FLOW_OK) {
+          gst_buffer_unmap(item.video_buffer, &item.video_map);
+          gst_buffer_unref(item.video_buffer);
+
+          if (item.audio_buffer) {
+            gst_buffer_unmap(item.audio_buffer, &item.audio_map);
+            gst_buffer_unref(item.audio_buffer);
+          }
+
+          if (item.anc_buffer) {
+            gst_buffer_unmap(item.anc_buffer, &item.anc_map);
+            gst_buffer_unref(item.anc_buffer);
+          }
+
+          return flow_ret;
+        }
+        gst_buffer_map(item.anc_buffer2, &item.anc_map2, GST_MAP_READWRITE);
+      }
+
+      NTV2_POINTER anc_ptr1(item.anc_map.data, item.anc_map.size);
+      NTV2_POINTER anc_ptr2(item.anc_map2.data, item.anc_map2.size);
+
+      anc_ptr1.Fill(ULWord(0));
+      anc_ptr2.Fill(ULWord(0));
+      anc_packet_list.GetTransmitData(anc_ptr1, anc_ptr2,
+                                      self->configured_info.interlace_mode !=
+                                          GST_VIDEO_INTERLACE_MODE_PROGRESSIVE,
+                                      self->f2_start_line);
+    } else {
+      NTV2_POINTER ptr(item.video_map.data, item.video_map.size);
+
+      anc_packet_list.GetVANCTransmitData(ptr, format_desc);
+    }
+  }
+
+  g_mutex_lock(&self->queue_lock);
+  while (gst_queue_array_get_length(self->queue) >= self->queue_size) {
+    QueueItem *tmp = (QueueItem *)gst_queue_array_pop_head_struct(self->queue);
+
+    if (tmp->type == QUEUE_ITEM_TYPE_FRAME) {
+      GST_WARNING_OBJECT(self, "Element queue overrun, dropping old frame");
+
+      GstMessage *msg = gst_message_new_qos(
+          GST_OBJECT_CAST(self), TRUE, GST_CLOCK_TIME_NONE, GST_CLOCK_TIME_NONE,
+          GST_BUFFER_PTS(tmp->video_buffer),
+          gst_util_uint64_scale(GST_SECOND, self->configured_info.fps_d,
+                                self->configured_info.fps_n));
+      gst_element_post_message(GST_ELEMENT_CAST(self), msg);
+
+      gst_buffer_unmap(tmp->video_buffer, &tmp->video_map);
+      gst_buffer_unref(tmp->video_buffer);
+      if (tmp->audio_buffer) {
+        gst_buffer_unmap(tmp->audio_buffer, &tmp->audio_map);
+        gst_buffer_unref(tmp->audio_buffer);
+      }
+      if (tmp->anc_buffer) {
+        gst_buffer_unmap(tmp->anc_buffer, &tmp->anc_map);
+        gst_buffer_unref(tmp->anc_buffer);
+      }
+      if (tmp->anc_buffer2) {
+        gst_buffer_unmap(tmp->anc_buffer2, &tmp->anc_map2);
+        gst_buffer_unref(tmp->anc_buffer2);
+      }
+    }
+  }
+
+  GST_TRACE_OBJECT(self, "Queuing frame video %p audio %p", item.video_map.data,
+                   item.audio_buffer ? item.audio_map.data : NULL);
+  gst_queue_array_push_tail_struct(self->queue, &item);
+  GST_TRACE_OBJECT(self, "%u frames queued",
+                   gst_queue_array_get_length(self->queue));
+  g_cond_signal(&self->queue_cond);
+  g_mutex_unlock(&self->queue_lock);
+
+  return flow_ret;
+}
+
+static void output_thread_func(AJAThread *thread, void *data) {
+  GstAjaSink *self = GST_AJA_SINK(data);
+  GstClock *clock = NULL;
+  guint64 frames_rendered_start = G_MAXUINT64;
+  GstClockTime frames_rendered_start_time = GST_CLOCK_TIME_NONE;
+  guint64 frames_dropped_last = G_MAXUINT64;
+  AUTOCIRCULATE_TRANSFER transfer;
+
+  if (self->output_cpu_core != G_MAXUINT) {
+    cpu_set_t mask;
+    pthread_t current_thread = pthread_self();
+
+    CPU_ZERO(&mask);
+    CPU_SET(self->output_cpu_core, &mask);
+
+    if (pthread_setaffinity_np(current_thread, sizeof(mask), &mask) != 0) {
+      GST_ERROR_OBJECT(self,
+                       "Failed to set affinity for current thread to core %u",
+                       self->output_cpu_core);
+    }
+  }
+
+  g_mutex_lock(&self->queue_lock);
+restart:
+  if (self->draining && gst_queue_array_get_length(self->queue) == 0) {
+    GST_DEBUG_OBJECT(self, "Drained");
+    self->draining = FALSE;
+    g_cond_signal(&self->drain_cond);
+  }
+
+  GST_DEBUG_OBJECT(self, "Waiting for playing or shutdown");
+  while ((!self->playing && !self->shutdown) ||
+         (self->playing &&
+          gst_queue_array_get_length(self->queue) < self->queue_size / 2 &&
+          !self->eos))
+    g_cond_wait(&self->queue_cond, &self->queue_lock);
+  if (self->shutdown) {
+    GST_DEBUG_OBJECT(self, "Shutting down");
+    g_mutex_unlock(&self->queue_lock);
+    return;
+  }
+
+  GST_DEBUG_OBJECT(self, "Starting playing");
+  g_mutex_unlock(&self->queue_lock);
+
+  {
+    // Make sure to globally lock here as the routing settings and others are
+    // global shared state
+    GstAjaNtv2DeviceLocker locker(self->device);
+
+    self->device->device->AutoCirculateStop(self->channel);
+
+    if (!self->device->device->EnableChannel(self->channel)) {
+      GST_ERROR_OBJECT(self, "Failed to enable channel");
+      g_mutex_lock(&self->queue_lock);
+      GST_ELEMENT_ERROR(self, STREAM, FAILED, (NULL),
+                        ("Failed to configure device"));
+      goto out;
+    }
+    if (self->quad_mode) {
+      for (int i = 1; i < 4; i++) {
+        if (!self->device->device->EnableChannel(
+                (NTV2Channel)(self->channel + i))) {
+          GST_ERROR_OBJECT(self, "Failed to enable channel");
+          g_mutex_lock(&self->queue_lock);
+          GST_ELEMENT_ERROR(self, STREAM, FAILED, (NULL),
+                            ("Failed to configure device"));
+          goto out;
+        }
+      }
+    }
+
+    self->device->device->EnableOutputInterrupt(self->channel);
+    self->device->device->SubscribeOutputVerticalEvent(self->channel);
+
+    guint16 start_frame = self->start_frame;
+    guint16 end_frame = self->end_frame;
+
+    // If both are the same, try to find queue_size/2 unallocated frames and
+    // use those.
+    if (start_frame == end_frame) {
+      guint16 num_frames = self->queue_size / 2;
+
+      gint assigned_start_frame = gst_aja_ntv2_device_find_unallocated_frames(
+          self->device, self->channel, num_frames);
+
+      if (assigned_start_frame == -1) {
+        GST_ELEMENT_ERROR(self, STREAM, FAILED, (NULL),
+                          ("Failed to allocate %u frames", num_frames));
+        goto out;
+      }
+
+      start_frame = assigned_start_frame;
+      end_frame = start_frame + num_frames - 1;
+    }
+
+    GST_DEBUG_OBJECT(
+        self, "Configuring channel %u with start frame %u and end frame %u",
+        self->channel, start_frame, end_frame);
+
+    // Configure render delay based on the framerate and queue size
+    gst_base_sink_set_render_delay(
+        GST_BASE_SINK(self),
+        gst_util_uint64_scale(end_frame - start_frame + 1,
+                              self->configured_info.fps_d * GST_SECOND,
+                              self->configured_info.fps_n));
+
+    if (!self->device->device->AutoCirculateInitForOutput(
+            self->channel, 0, self->audio_system,
+            (self->rp188 ? AUTOCIRCULATE_WITH_RP188 : 0) |
+                (self->vanc_mode == ::NTV2_VANCMODE_OFF ? AUTOCIRCULATE_WITH_ANC
+                                                        : 0),
+            1, start_frame, end_frame)) {
+      GST_ELEMENT_ERROR(self, STREAM, FAILED, (NULL),
+                        ("Failed to initialize autocirculate"));
+      goto out;
+    }
+    self->device->device->AutoCirculateStart(self->channel);
+  }
+
+  gst_clear_object(&clock);
+  clock = gst_element_get_clock(GST_ELEMENT_CAST(self));
+  frames_rendered_start = G_MAXUINT64;
+  frames_rendered_start_time = GST_CLOCK_TIME_NONE;
+  frames_dropped_last = G_MAXUINT64;
+
+  g_mutex_lock(&self->queue_lock);
+  while (self->playing && !self->shutdown &&
+         !(self->draining && gst_queue_array_get_length(self->queue) == 0)) {
+    AUTOCIRCULATE_STATUS status;
+
+    self->device->device->AutoCirculateGetStatus(self->channel, status);
+
+    GST_TRACE_OBJECT(self,
+                     "Start frame %d "
+                     "end frame %d "
+                     "active frame %d "
+                     "start time %" G_GUINT64_FORMAT
+                     " "
+                     "current time %" G_GUINT64_FORMAT
+                     " "
+                     "frames processed %u "
+                     "frames dropped %u "
+                     "buffer level %u",
+                     status.acStartFrame, status.acEndFrame,
+                     status.acActiveFrame, status.acRDTSCStartTime,
+                     status.acRDTSCCurrentTime, status.acFramesProcessed,
+                     status.acFramesDropped, status.acBufferLevel);
+
+    // Detect if we were too slow with providing frames and report if that was
+    // the case together with the amount of frames dropped
+    if (frames_dropped_last == G_MAXUINT64) {
+      frames_dropped_last = status.acFramesDropped;
+    } else if (frames_dropped_last < status.acFramesDropped) {
+      GST_WARNING_OBJECT(self, "Dropped %" G_GUINT64_FORMAT " frames",
+                         status.acFramesDropped - frames_dropped_last);
+
+      GstClockTime timestamp =
+          gst_util_uint64_scale(status.acFramesProcessed + frames_dropped_last,
+                                self->configured_info.fps_n,
+                                self->configured_info.fps_d * GST_SECOND);
+      GstClockTime timestamp_end = gst_util_uint64_scale(
+          status.acFramesProcessed + status.acFramesDropped,
+          self->configured_info.fps_n,
+          self->configured_info.fps_d * GST_SECOND);
+      GstMessage *msg = gst_message_new_qos(
+          GST_OBJECT_CAST(self), TRUE, GST_CLOCK_TIME_NONE, GST_CLOCK_TIME_NONE,
+          timestamp, timestamp_end - timestamp);
+      gst_element_post_message(GST_ELEMENT_CAST(self), msg);
+
+      frames_dropped_last = status.acFramesDropped;
+    }
+
+    if (status.GetNumAvailableOutputFrames() > 1) {
+      QueueItem item, *item_p;
+
+      while ((item_p = (QueueItem *)gst_queue_array_pop_head_struct(
+                  self->queue)) == NULL &&
+             self->playing && !self->shutdown && !self->draining) {
+        GST_DEBUG_OBJECT(
+            self,
+            "Element queue underrun, waiting for more frames or shutdown");
+        g_cond_wait(&self->queue_cond, &self->queue_lock);
+      }
+
+      if (!self->playing || self->shutdown || (!item_p && self->draining)) {
+        if (item_p && item_p->type == QUEUE_ITEM_TYPE_FRAME) {
+          gst_buffer_unmap(item_p->video_buffer, &item_p->video_map);
+          gst_buffer_unref(item_p->video_buffer);
+
+          if (item_p->audio_buffer) {
+            gst_buffer_unmap(item_p->audio_buffer, &item_p->audio_map);
+            gst_buffer_unref(item_p->audio_buffer);
+          }
+
+          if (item_p->anc_buffer) {
+            gst_buffer_unmap(item_p->anc_buffer, &item_p->anc_map);
+            gst_buffer_unref(item_p->anc_buffer);
+          }
+          if (item_p->anc_buffer2) {
+            gst_buffer_unmap(item_p->anc_buffer2, &item_p->anc_map2);
+            gst_buffer_unref(item_p->anc_buffer2);
+          }
+        }
+        break;
+      }
+
+      if (item_p && item_p->type != QUEUE_ITEM_TYPE_FRAME) {
+        continue;
+      }
+
+      GST_TRACE_OBJECT(self, "%u frames queued",
+                       gst_queue_array_get_length(self->queue));
+
+      item = *item_p;
+      g_mutex_unlock(&self->queue_lock);
+
+      GST_TRACE_OBJECT(self,
+                       "Transferring frame: "
+                       "Video %p %" G_GSIZE_FORMAT
+                       " "
+                       "Audio %p %" G_GSIZE_FORMAT,
+                       item.video_map.data, item.video_map.size,
+                       item.audio_buffer ? item.audio_map.data : NULL,
+                       item.audio_buffer ? item.audio_map.size : 0);
+
+      // Set timecodes if provided by upstream
+      if (item.tc.IsValid() && item.tc.fDBB != 0xffffffff && self->tc_indexes) {
+        NTV2TimeCodes timecodes;
+
+        for (const auto &tc_index : *self->tc_indexes) {
+          timecodestc_index = item.tc;
+        }
+        transfer.SetOutputTimeCodes(timecodes);
+      }
+
+      transfer.SetVideoBuffer((ULWord *)item.video_map.data,
+                              item.video_map.size);
+      transfer.SetAudioBuffer((ULWord *)item.audio_map.data,
+                              item.audio_map.size);
+      transfer.SetAncBuffers((ULWord *)item.anc_map.data, item.anc_map.size,
+                             (ULWord *)item.anc_map2.data, item.anc_map2.size);
+
+      if (!self->device->device->AutoCirculateTransfer(self->channel,
+                                                       transfer)) {
+        GST_WARNING_OBJECT(self, "Failed to transfer frame");
+      }
+
+      gst_buffer_unmap(item.video_buffer, &item.video_map);
+      gst_buffer_unref(item.video_buffer);
+
+      if (item.audio_buffer) {
+        gst_buffer_unmap(item.audio_buffer, &item.audio_map);
+        gst_buffer_unref(item.audio_buffer);
+      }
+
+      if (item.anc_buffer) {
+        gst_buffer_unmap(item.anc_buffer, &item.anc_map);
+        gst_buffer_unref(item.anc_buffer);
+      }
+
+      if (item.anc_buffer2) {
+        gst_buffer_unmap(item.anc_buffer2, &item.anc_map2);
+        gst_buffer_unref(item.anc_buffer2);
+      }
+
+      GST_TRACE_OBJECT(
+          self,
+          "Transferred frame. "
+          "frame time %" GST_TIME_FORMAT
+          " "
+          "current frame %u "
+          "current frame time %" GST_TIME_FORMAT
+          " "
+          "frames processed %u "
+          "frames dropped %u "
+          "buffer level %u",
+          GST_TIME_ARGS(transfer.acTransferStatus.acFrameStamp.acFrameTime *
+                        100),
+          transfer.acTransferStatus.acFrameStamp.acCurrentFrame,
+          GST_TIME_ARGS(
+              transfer.acTransferStatus.acFrameStamp.acCurrentFrameTime * 100),
+          transfer.acTransferStatus.acFramesProcessed,
+          transfer.acTransferStatus.acFramesDropped,
+          transfer.acTransferStatus.acBufferLevel);
+
+      // Trivial drift calculation
+      //
+      // TODO: Should probably take averages over a timespan (say 1 minute)
+      // into a ringbuffer and calculate a linear regression over them
+      // FIXME: Add some compensation by dropping/duplicating frames as needed
+      // but make this configurable
+      if (frames_rendered_start_time == GST_CLOCK_TIME_NONE &&
+          transfer.acTransferStatus.acFrameStamp.acCurrentFrameTime != 0 &&
+          transfer.acTransferStatus.acFramesProcessed +
+                  transfer.acTransferStatus.acFramesDropped >
+              self->queue_size &&
+          clock) {
+        frames_rendered_start = transfer.acTransferStatus.acFramesProcessed +
+                                transfer.acTransferStatus.acFramesDropped;
+
+        GstClockTime now_gst = gst_clock_get_time(clock);
+        GstClockTime now_sys = g_get_real_time() * 1000;
+        GstClockTime render_time =
+            transfer.acTransferStatus.acFrameStamp.acCurrentFrameTime * 100;
+
+        if (render_time < now_sys) {
+          frames_rendered_start_time = now_gst - (now_sys - render_time);
+        }
+      }
+
+      if (clock && frames_rendered_start_time != GST_CLOCK_TIME_NONE) {
+        GstClockTime now_gst = gst_clock_get_time(clock);
+        GstClockTime now_sys = g_get_real_time() * 1000;
+        GstClockTime render_time =
+            transfer.acTransferStatus.acFrameStamp.acCurrentFrameTime * 100;
+
+        GstClockTime sys_diff;
+        if (now_sys > render_time) {
+          sys_diff = now_sys - render_time;
+        } else {
+          sys_diff = 0;
+        }
+
+        GstClockTime diff = now_gst - frames_rendered_start_time;
+        if (sys_diff < diff) diff -= sys_diff;
+
+        guint64 frames_rendered = (transfer.acTransferStatus.acFramesProcessed +
+                                   transfer.acTransferStatus.acFramesDropped) -
+                                  frames_rendered_start;
+        guint64 frames_produced =
+            gst_util_uint64_scale(diff, self->configured_info.fps_n,
+                                  self->configured_info.fps_d * GST_SECOND);
+        gdouble fps_rendered = ((gdouble)frames_rendered * GST_SECOND) / diff;
+
+        GST_TRACE_OBJECT(self,
+                         "Frames rendered %" G_GUINT64_FORMAT
+                         ", frames produced %" G_GUINT64_FORMAT
+                         ", FPS rendered %lf",
+                         frames_rendered, frames_produced, fps_rendered);
+      }
+
+      g_mutex_lock(&self->queue_lock);
+    } else {
+      g_mutex_unlock(&self->queue_lock);
+
+      self->device->device->WaitForOutputVerticalInterrupt(self->channel);
+
+      g_mutex_lock(&self->queue_lock);
+    }
+  }
+
+out: {
+  // Make sure to globally lock here as the routing settings and others are
+  // global shared state
+  GstAjaNtv2DeviceLocker locker(self->device);
+
+  self->device->device->AutoCirculateStop(self->channel);
+  self->device->device->UnsubscribeOutputVerticalEvent(self->channel);
+  self->device->device->DisableOutputInterrupt(self->channel);
+
+  self->device->device->DisableChannel(self->channel);
+  if (self->quad_mode) {
+    for (int i = 1; i < 4; i++) {
+      self->device->device->DisableChannel((NTV2Channel)(self->channel + i));
+    }
+  }
+}
+
+  if ((!self->playing || self->draining) && !self->shutdown) goto restart;
+  g_mutex_unlock(&self->queue_lock);
+
+  gst_clear_object(&clock);
+
+  GST_DEBUG_OBJECT(self, "Stopped");
+}

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajasink.h Added

@@ -0,0 +1,107 @@
+/* GStreamer
+ * Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/base/base.h>
+#include <gst/gst.h>
+#include <gst/video/video.h>
+
+#include "gstajacommon.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_AJA_SINK (gst_aja_sink_get_type())
+#define GST_AJA_SINK(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AJA_SINK, GstAjaSink))
+#define GST_AJA_SINK_CAST(obj) ((GstAjaSink *)obj)
+#define GST_AJA_SINK_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AJA_SINK, GstAjaSinkClass))
+#define GST_IS_AJA_SINK(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AJA_SINK))
+#define GST_IS_AJA_SINK_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AJA_SINK))
+
+typedef struct _GstAjaSink GstAjaSink;
+typedef struct _GstAjaSinkClass GstAjaSinkClass;
+
+struct _GstAjaSink {
+  GstBaseSink parent;
+
+  // Everything below protected by queue lock
+  GMutex queue_lock;
+  GCond queue_cond;
+  GstQueueArray *queue;
+  gboolean eos;
+  gboolean playing;
+  gboolean shutdown;
+  gboolean draining;
+  // Hold by set_caps() to wait until drained
+  GCond drain_cond;
+  gboolean flushing;
+
+  GstAjaNtv2Device *device;
+  NTV2DeviceID device_id;
+  GstAllocator *allocator;
+
+  // Only allocated on demand
+  GstBufferPool *buffer_pool;
+  GstBufferPool *audio_buffer_pool;
+  GstBufferPool *anc_buffer_pool;
+
+  // Properties
+  gchar *device_identifier;
+  NTV2Channel channel;
+  guint queue_size;
+  guint start_frame, end_frame;
+  guint output_cpu_core;
+
+  GstAjaAudioSystem audio_system_setting;
+  GstAjaOutputDestination output_destination;
+  GstAjaSdiMode sdi_mode;
+  GstAjaTimecodeIndex timecode_index;
+  gboolean rp188;
+  GstAjaReferenceSource reference_source;
+  gboolean handle_ancillary_meta;
+
+  gint cea608_line_number;
+  gint cea708_line_number;
+
+  NTV2AudioSystem audio_system;
+  NTV2VideoFormat video_format;
+  bool quad_mode;
+  NTV2VANCMode vanc_mode;
+  guint32 f2_start_line;
+  NTV2TCIndexes *tc_indexes;
+
+  GstCaps *configured_caps;
+  GstVideoInfo configured_info;
+  gint configured_audio_channels;
+
+  AJAThread *output_thread;
+};
+
+struct _GstAjaSinkClass {
+  GstBaseSinkClass parent_class;
+};
+
+G_GNUC_INTERNAL
+GType gst_aja_sink_get_type(void);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajasinkcombiner.cpp Added

@@ -0,0 +1,294 @@
+/* GStreamer
+ * Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstajacommon.h"
+#include "gstajasinkcombiner.h"
+
+GST_DEBUG_CATEGORY_STATIC(gst_aja_sink_combiner_debug);
+#define GST_CAT_DEFAULT gst_aja_sink_combiner_debug
+
+static GstStaticPadTemplate video_sink_template = GST_STATIC_PAD_TEMPLATE(
+    "video", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS("video/x-raw"));
+
+static GstStaticPadTemplate audio_sink_template =
+    GST_STATIC_PAD_TEMPLATE("audio", GST_PAD_SINK, GST_PAD_REQUEST,
+                            GST_STATIC_CAPS("audio/x-raw, "
+                                            "format = (string) S32LE, "
+                                            "rate = (int) 48000, "
+                                            "channels = (int)  1, 16 , "
+                                            "layout = (string) interleaved"));
+
+static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE(
+    "src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS("video/x-raw"));
+
+G_DEFINE_TYPE(GstAjaSinkCombiner, gst_aja_sink_combiner, GST_TYPE_AGGREGATOR);
+#define parent_class gst_aja_sink_combiner_parent_class
+
+static void gst_aja_sink_combiner_finalize(GObject *object) {
+  GstAjaSinkCombiner *self = GST_AJA_SINK_COMBINER(object);
+
+  GST_OBJECT_LOCK(self);
+  gst_caps_replace(&self->audio_caps, NULL);
+  gst_caps_replace(&self->video_caps, NULL);
+  GST_OBJECT_UNLOCK(self);
+
+  G_OBJECT_CLASS(parent_class)->finalize(object);
+}
+
+static GstFlowReturn gst_aja_sink_combiner_aggregate(GstAggregator *aggregator,
+                                                     gboolean timeout) {
+  GstAjaSinkCombiner *self = GST_AJA_SINK_COMBINER(aggregator);
+  GstBuffer *video_buffer, *audio_buffer;
+
+  if (gst_aggregator_pad_is_eos(GST_AGGREGATOR_PAD_CAST(self->audio_sinkpad)) &&
+      gst_aggregator_pad_is_eos(GST_AGGREGATOR_PAD_CAST(self->video_sinkpad))) {
+    GST_DEBUG_OBJECT(self, "All pads EOS");
+    return GST_FLOW_EOS;
+  }
+
+  // FIXME: We currently assume that upstream provides
+  // - properly chunked buffers (1 buffer = 1 video frame)
+  // - properly synchronized buffers (audio/video starting at the same time)
+  // - no gaps
+  //
+  // This can be achieved externally with elements like audiobuffersplit and
+  // videorate.
+
+  video_buffer = gst_aggregator_pad_peek_buffer(
+      GST_AGGREGATOR_PAD_CAST(self->video_sinkpad));
+  if (!video_buffer) return GST_AGGREGATOR_FLOW_NEED_DATA;
+
+  audio_buffer = gst_aggregator_pad_peek_buffer(
+      GST_AGGREGATOR_PAD_CAST(self->audio_sinkpad));
+  if (!audio_buffer && !gst_aggregator_pad_is_eos(
+                           GST_AGGREGATOR_PAD_CAST(self->audio_sinkpad))) {
+    gst_buffer_unref(video_buffer);
+    GST_TRACE_OBJECT(self, "Audio not ready yet, waiting");
+    return GST_AGGREGATOR_FLOW_NEED_DATA;
+  }
+
+  gst_aggregator_pad_drop_buffer(GST_AGGREGATOR_PAD_CAST(self->video_sinkpad));
+  video_buffer = gst_buffer_make_writable(video_buffer);
+  GST_TRACE_OBJECT(self,
+                   "Outputting buffer with video %" GST_PTR_FORMAT
+                   " and audio %" GST_PTR_FORMAT,
+                   video_buffer, audio_buffer);
+  if (audio_buffer) {
+    gst_buffer_add_aja_audio_meta(video_buffer, audio_buffer);
+    gst_buffer_unref(audio_buffer);
+    gst_aggregator_pad_drop_buffer(
+        GST_AGGREGATOR_PAD_CAST(self->audio_sinkpad));
+  }
+
+  if (!gst_pad_has_current_caps(GST_AGGREGATOR_SRC_PAD(self)) ||
+      self->caps_changed) {
+    GstCaps *caps = gst_caps_copy(self->video_caps);
+    GstStructure *s;
+
+    s = gst_caps_get_structure(caps, 0);
+    if (self->audio_caps) {
+      const GstStructure *s2;
+      gint audio_channels;
+
+      s2 = gst_caps_get_structure(self->audio_caps, 0);
+
+      gst_structure_get_int(s2, "channels", &audio_channels);
+      gst_structure_set(s, "audio-channels", G_TYPE_INT, audio_channels, NULL);
+    } else {
+      gst_structure_set(s, "audio-channels", G_TYPE_INT, 0, NULL);
+    }
+
+    GST_DEBUG_OBJECT(self, "Configuring caps %" GST_PTR_FORMAT, caps);
+
+    gst_aggregator_set_src_caps(GST_AGGREGATOR(self), caps);
+    gst_caps_unref(caps);
+    self->caps_changed = FALSE;
+  }
+
+  // Update the position for synchronization purposes
+  GST_AGGREGATOR_PAD_CAST(GST_AGGREGATOR_SRC_PAD(self))->segment.position =
+      GST_BUFFER_PTS(video_buffer);
+  if (GST_BUFFER_DURATION_IS_VALID(video_buffer))
+    GST_AGGREGATOR_PAD_CAST(GST_AGGREGATOR_SRC_PAD(self))->segment.position +=
+        GST_BUFFER_DURATION(video_buffer);
+
+  return gst_aggregator_finish_buffer(GST_AGGREGATOR_CAST(self), video_buffer);
+}
+
+static gboolean gst_aja_sink_combiner_sink_event(GstAggregator *aggregator,
+                                                 GstAggregatorPad *agg_pad,
+                                                 GstEvent *event) {
+  GstAjaSinkCombiner *self = GST_AJA_SINK_COMBINER(aggregator);
+
+  switch (GST_EVENT_TYPE(event)) {
+    case GST_EVENT_SEGMENT: {
+      const GstSegment *segment;
+
+      gst_event_parse_segment(event, &segment);
+      gst_aggregator_update_segment(GST_AGGREGATOR(self), segment);
+      break;
+    }
+    case GST_EVENT_CAPS: {
+      GstCaps *caps;
+
+      gst_event_parse_caps(event, &caps);
+
+      if (agg_pad == GST_AGGREGATOR_PAD_CAST(self->audio_sinkpad)) {
+        GST_OBJECT_LOCK(self);
+        gst_caps_replace(&self->audio_caps, caps);
+        self->caps_changed = TRUE;
+        GST_OBJECT_UNLOCK(self);
+      } else if (agg_pad == GST_AGGREGATOR_PAD_CAST(self->video_sinkpad)) {
+        GST_OBJECT_LOCK(self);
+        gst_caps_replace(&self->video_caps, caps);
+        self->caps_changed = TRUE;
+        GST_OBJECT_UNLOCK(self);
+      }
+
+      break;
+    }
+    default:
+      break;
+  }
+
+  return GST_AGGREGATOR_CLASS(parent_class)
+      ->sink_event(aggregator, agg_pad, event);
+}
+
+static gboolean gst_aja_sink_combiner_sink_query(GstAggregator *aggregator,
+                                                 GstAggregatorPad *agg_pad,
+                                                 GstQuery *query) {
+  GstAjaSinkCombiner *self = GST_AJA_SINK_COMBINER(aggregator);
+
+  switch (GST_QUERY_TYPE(query)) {
+    case GST_QUERY_CAPS: {
+      GstCaps *filter, *caps;
+
+      gst_query_parse_caps(query, &filter);
+
+      if (agg_pad == GST_AGGREGATOR_PAD_CAST(self->audio_sinkpad)) {
+        caps = gst_pad_get_pad_template_caps(GST_PAD(agg_pad));
+      } else if (agg_pad == GST_AGGREGATOR_PAD_CAST(self->video_sinkpad)) {
+        caps = gst_pad_peer_query_caps(GST_AGGREGATOR_SRC_PAD(self), NULL);
+        caps = gst_caps_make_writable(caps);
+        guint caps_size = gst_caps_get_size(caps);
+        for (guint i = 0; i < caps_size; i++) {
+          GstStructure *s = gst_caps_get_structure(caps, i);
+          gst_structure_remove_field(s, "audio-channels");
+        }
+      } else {
+        g_assert_not_reached();
+      }
+
+      if (filter) {
+        GstCaps *tmp = gst_caps_intersect(filter, caps);
+        gst_caps_unref(caps);
+        caps = tmp;
+      }
+
+      gst_query_set_caps_result(query, caps);
+
+      return TRUE;
+    }
+    case GST_QUERY_ALLOCATION: {
+      // Proxy to the sink for both pads so that the AJA allocator can be
+      // used upstream as needed.
+      return gst_pad_peer_query(GST_AGGREGATOR_SRC_PAD(self), query);
+    }
+    default:
+      break;
+  }
+
+  return GST_AGGREGATOR_CLASS(parent_class)
+      ->sink_query(aggregator, agg_pad, query);
+}
+
+static gboolean gst_aja_sink_combiner_negotiate(GstAggregator *aggregator) {
+  return TRUE;
+}
+
+static gboolean gst_aja_sink_combiner_stop(GstAggregator *aggregator) {
+  GstAjaSinkCombiner *self = GST_AJA_SINK_COMBINER(aggregator);
+
+  GST_OBJECT_LOCK(self);
+  gst_caps_replace(&self->audio_caps, NULL);
+  gst_caps_replace(&self->video_caps, NULL);
+  GST_OBJECT_UNLOCK(self);
+
+  return TRUE;
+}
+
+static void gst_aja_sink_combiner_class_init(GstAjaSinkCombinerClass *klass) {
+  GObjectClass *gobject_class;
+  GstElementClass *gstelement_class;
+  GstAggregatorClass *aggregator_class;
+
+  gobject_class = (GObjectClass *)klass;
+  gstelement_class = (GstElementClass *)klass;
+  aggregator_class = (GstAggregatorClass *)klass;
+
+  gobject_class->finalize = gst_aja_sink_combiner_finalize;
+
+  gst_element_class_set_static_metadata(
+      gstelement_class, "AJA sink audio/video combiner", "Audio/Video/Combiner",
+      "Combines corresponding audio/video frames",
+      "Sebastian Dröge <sebastian@centricular.com>");
+
+  gst_element_class_add_static_pad_template_with_gtype(
+      gstelement_class, &video_sink_template, GST_TYPE_AGGREGATOR_PAD);
+  gst_element_class_add_static_pad_template_with_gtype(
+      gstelement_class, &audio_sink_template, GST_TYPE_AGGREGATOR_PAD);
+  gst_element_class_add_static_pad_template_with_gtype(
+      gstelement_class, &src_template, GST_TYPE_AGGREGATOR_PAD);
+
+  aggregator_class->aggregate = gst_aja_sink_combiner_aggregate;
+  aggregator_class->stop = gst_aja_sink_combiner_stop;
+  aggregator_class->sink_event = gst_aja_sink_combiner_sink_event;
+  aggregator_class->sink_query = gst_aja_sink_combiner_sink_query;
+  aggregator_class->negotiate = gst_aja_sink_combiner_negotiate;
+  aggregator_class->get_next_time = gst_aggregator_simple_get_next_time;
+
+  // We don't support requesting new pads
+  gstelement_class->request_new_pad = NULL;
+
+  GST_DEBUG_CATEGORY_INIT(gst_aja_sink_combiner_debug, "ajasinkcombiner", 0,
+                          "AJA sink combiner");
+}
+
+static void gst_aja_sink_combiner_init(GstAjaSinkCombiner *self) {
+  GstPadTemplate *templ;
+
+  templ = gst_static_pad_template_get(&video_sink_template);
+  self->video_sinkpad =
+      GST_PAD(g_object_new(GST_TYPE_AGGREGATOR_PAD, "name", "video",
+                           "direction", GST_PAD_SINK, "template", templ, NULL));
+  gst_object_unref(templ);
+  gst_element_add_pad(GST_ELEMENT_CAST(self), self->video_sinkpad);
+
+  templ = gst_static_pad_template_get(&audio_sink_template);
+  self->audio_sinkpad =
+      GST_PAD(g_object_new(GST_TYPE_AGGREGATOR_PAD, "name", "audio",
+                           "direction", GST_PAD_SINK, "template", templ, NULL));
+  gst_object_unref(templ);
+  gst_element_add_pad(GST_ELEMENT_CAST(self), self->audio_sinkpad);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajasinkcombiner.h Added

@@ -0,0 +1,60 @@
+/* GStreamer
+ * Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/base/base.h>
+#include <gst/gst.h>
+#include <gst/video/video.h>
+
+#include "gstajacommon.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_AJA_SINK_COMBINER (gst_aja_sink_combiner_get_type())
+#define GST_AJA_SINK_COMBINER(obj)                               \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AJA_SINK_COMBINER, \
+                              GstAjaSinkCombiner))
+#define GST_AJA_SINK_COMBINER_CLASS(klass)                      \
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AJA_SINK_COMBINER, \
+                           GstAjaSinkCombinerClass))
+#define IS_GST_AJA_SINK_COMBINER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AJA_SINK_COMBINER))
+#define IS_GST_AJA_SINK_COMBINER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AJA_SINK_COMBINER))
+
+typedef struct _GstAjaSinkCombiner GstAjaSinkCombiner;
+typedef struct _GstAjaSinkCombinerClass GstAjaSinkCombinerClass;
+
+struct _GstAjaSinkCombiner {
+  GstAggregator parent;
+
+  GstPad *audio_sinkpad, *video_sinkpad;
+  GstCaps *audio_caps, *video_caps;
+  gboolean caps_changed;
+};
+
+struct _GstAjaSinkCombinerClass {
+  GstAggregatorClass parent_class;
+};
+
+G_GNUC_INTERNAL
+GType gst_aja_sink_combiner_get_type(void);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajasrc.cpp Added

@@ -0,0 +1,2811 @@
+/* GStreamer
+ * Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+
+/**
+ * SECTION:element-ajasrc
+ *
+ * Source element for AJA(https://www.aja.com) capture cards.
+ *
+ * ## Example usage
+ *
+ * Capture 1080p30 audio/video and display it locally
+ *
+ * ```sh
+ * gst-launch-1.0 ajasrc video-format=1080p-3000 ! ajasrcdemux name=d \
+ *     d.video ! queue max-size-bytes=0 max-size-buffers=0 max-size-time=1000000000 ! videoconvert ! autovideosink \
+ *     d.audio ! queue max-size-bytes=0 max-size-buffers=0 max-size-time=1000000000 ! audioconvert ! audioresample ! autoaudiosink
+ * ```
+ *
+ * Capture 1080p30 audio/video and directly output it again on the same card
+ *
+ * ```sh
+ * gst-launch-1.0 ajasrc video-format=1080p-3000 channel=1 input-source=sdi-1 audio-system=2 ! ajasrcdemux name=d \
+ *     d.video ! queue max-size-bytes=0 max-size-buffers=0 max-size-time=1000000000 ! c.video \
+ *     d.audio ! queue max-size-bytes=0 max-size-buffers=0 max-size-time=1000000000 ! c.audio \
+ *     ajasinkcombiner name=c ! ajasink channel=0 reference-source=input-1
+ * ```
+ *
+ * Since: 1.24
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <ajaanc/includes/ancillarydata_cea608_vanc.h>
+#include <ajaanc/includes/ancillarydata_cea708.h>
+#include <ajaanc/includes/ancillarylist.h>
+#include <ajantv2/includes/ntv2rp188.h>
+#include <ajantv2/includes/ntv2vpid.h>
+
+#include "gstajacommon.h"
+#include "gstajasrc.h"
+
+GST_DEBUG_CATEGORY_STATIC(gst_aja_src_debug);
+#define GST_CAT_DEFAULT gst_aja_src_debug
+
+#define DEFAULT_DEVICE_IDENTIFIER ("0")
+#define DEFAULT_CHANNEL (::NTV2_CHANNEL1)
+#define DEFAULT_VIDEO_FORMAT (GST_AJA_VIDEO_FORMAT_AUTO)
+#define DEFAULT_AUDIO_SYSTEM (GST_AJA_AUDIO_SYSTEM_AUTO)
+#define DEFAULT_INPUT_SOURCE (GST_AJA_INPUT_SOURCE_AUTO)
+#define DEFAULT_SDI_MODE (GST_AJA_SDI_MODE_SINGLE_LINK)
+#define DEFAULT_AUDIO_SOURCE (GST_AJA_AUDIO_SOURCE_EMBEDDED)
+#define DEFAULT_EMBEDDED_AUDIO_INPUT (GST_AJA_EMBEDDED_AUDIO_INPUT_AUTO)
+#define DEFAULT_TIMECODE_INDEX (GST_AJA_TIMECODE_INDEX_VITC)
+#define DEFAULT_RP188 (TRUE)
+#define DEFAULT_REFERENCE_SOURCE (GST_AJA_REFERENCE_SOURCE_FREERUN)
+#define DEFAULT_CLOSED_CAPTION_CAPTURE_MODE \
+  (GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_AND_CEA608)
+#define DEFAULT_QUEUE_SIZE (16)
+#define DEFAULT_START_FRAME (8)
+#define DEFAULT_END_FRAME (8)
+#define DEFAULT_CAPTURE_CPU_CORE (G_MAXUINT)
+#define DEFAULT_ATTACH_ANCILLARY_META (FALSE)
+
+enum {
+  PROP_0,
+  PROP_DEVICE_IDENTIFIER,
+  PROP_CHANNEL,
+  PROP_VIDEO_FORMAT,
+  PROP_AUDIO_SYSTEM,
+  PROP_INPUT_SOURCE,
+  PROP_SDI_MODE,
+  PROP_AUDIO_SOURCE,
+  PROP_EMBEDDED_AUDIO_INPUT,
+  PROP_TIMECODE_INDEX,
+  PROP_RP188,
+  PROP_REFERENCE_SOURCE,
+  PROP_CLOSED_CAPTION_CAPTURE_MODE,
+  PROP_START_FRAME,
+  PROP_END_FRAME,
+  PROP_QUEUE_SIZE,
+  PROP_CAPTURE_CPU_CORE,
+  PROP_SIGNAL,
+  PROP_ATTACH_ANCILLARY_META,
+};
+
+// Make these plain C structs for usage in GstQueueArray
+G_BEGIN_DECLS
+
+typedef enum {
+  QUEUE_ITEM_TYPE_DUMMY,
+  QUEUE_ITEM_TYPE_FRAME,
+  QUEUE_ITEM_TYPE_SIGNAL_CHANGE,
+  QUEUE_ITEM_TYPE_ERROR,
+  QUEUE_ITEM_TYPE_FRAMES_DROPPED,
+} QueueItemType;
+
+typedef struct {
+  QueueItemType type;
+
+  union {
+    // For DUMMY
+    struct {
+      gchar dummy;
+    } dummy;
+    // For FRAME
+    struct {
+      GstClockTime capture_time;
+      GstBuffer *video_buffer;
+      GstBuffer *audio_buffer;
+      GstBuffer *anc_buffer, *anc_buffer2;
+      NTV2_RP188 tc;
+
+      NTV2VideoFormat detected_format;
+      guint32 vpid;
+    } frame;
+    // For SIGNAL_CHANGE
+    struct {
+      gboolean have_signal;
+      NTV2VideoFormat detected_format;
+      guint32 vpid;
+    } signal_change;
+    // For ERROR
+    struct {
+      GstMessage *msg;
+    } error;
+    // For FRAMES_DROPPED
+    struct {
+      gboolean driver_side;
+      GstClockTime timestamp_start, timestamp_end;
+    } frames_dropped;
+  };
+} QueueItem;
+
+G_END_DECLS
+
+static void queue_item_clear(QueueItem *item) {
+  switch (item->type) {
+    case QUEUE_ITEM_TYPE_DUMMY:
+      break;
+    case QUEUE_ITEM_TYPE_FRAME:
+      gst_clear_buffer(&item->frame.video_buffer);
+      gst_clear_buffer(&item->frame.audio_buffer);
+      gst_clear_buffer(&item->frame.anc_buffer);
+      gst_clear_buffer(&item->frame.anc_buffer2);
+      item->frame.tc.~NTV2_RP188();
+      break;
+    case QUEUE_ITEM_TYPE_SIGNAL_CHANGE:
+      break;
+    case QUEUE_ITEM_TYPE_ERROR:
+      gst_clear_message(&item->error.msg);
+      break;
+    case QUEUE_ITEM_TYPE_FRAMES_DROPPED:
+      break;
+  }
+
+  item->type = QUEUE_ITEM_TYPE_DUMMY;
+}
+
+static void gst_aja_src_set_property(GObject *object, guint property_id,
+                                     const GValue *value, GParamSpec *pspec);
+static void gst_aja_src_get_property(GObject *object, guint property_id,
+                                     GValue *value, GParamSpec *pspec);
+static void gst_aja_src_finalize(GObject *object);
+
+static GstCaps *gst_aja_src_get_caps(GstBaseSrc *bsrc, GstCaps *filter);
+static gboolean gst_aja_src_query(GstBaseSrc *bsrc, GstQuery *query);
+static gboolean gst_aja_src_unlock(GstBaseSrc *bsrc);
+static gboolean gst_aja_src_unlock_stop(GstBaseSrc *bsrc);
+
+static GstFlowReturn gst_aja_src_create(GstPushSrc *psrc, GstBuffer **buffer);
+
+static gboolean gst_aja_src_open(GstAjaSrc *src);
+static gboolean gst_aja_src_close(GstAjaSrc *src);
+static gboolean gst_aja_src_stop(GstAjaSrc *src);
+
+static GstStateChangeReturn gst_aja_src_change_state(GstElement *element,
+                                                     GstStateChange transition);
+
+static void capture_thread_func(AJAThread *thread, void *data);
+
+#define parent_class gst_aja_src_parent_class
+G_DEFINE_TYPE(GstAjaSrc, gst_aja_src, GST_TYPE_PUSH_SRC);
+
+static void gst_aja_src_class_init(GstAjaSrcClass *klass) {
+  GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
+  GstBaseSrcClass *basesrc_class = GST_BASE_SRC_CLASS(klass);
+  GstPushSrcClass *pushsrc_class = GST_PUSH_SRC_CLASS(klass);
+  GstCaps *templ_caps;
+
+  gobject_class->set_property = gst_aja_src_set_property;
+  gobject_class->get_property = gst_aja_src_get_property;
+  gobject_class->finalize = gst_aja_src_finalize;
+
+  g_object_class_install_property(
+      gobject_class, PROP_DEVICE_IDENTIFIER,
+      g_param_spec_string(
+          "device-identifier", "Device identifier",
+          "Input device instance to use", DEFAULT_DEVICE_IDENTIFIER,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_CHANNEL,
+      g_param_spec_uint(
+          "channel", "Channel", "Channel to use", 0, NTV2_MAX_NUM_CHANNELS - 1,
+          DEFAULT_CHANNEL,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_VIDEO_FORMAT,
+      g_param_spec_enum(
+          "video-format", "Video Format", "Video format to use",
+          GST_TYPE_AJA_VIDEO_FORMAT, DEFAULT_VIDEO_FORMAT,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_QUEUE_SIZE,
+      g_param_spec_uint(
+          "queue-size", "Queue Size",
+          "Size of internal queue in number of video frames. "
+          "Half of this is allocated as device buffers and equal to the "
+          "latency.",
+          1, G_MAXINT, DEFAULT_QUEUE_SIZE,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_START_FRAME,
+      g_param_spec_uint(
+          "start-frame", "Start Frame",
+          "Start frame buffer to be used for capturing (automatically assign "
+          "that many frames if same number as end-frame).",
+          0, G_MAXINT, DEFAULT_START_FRAME,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_END_FRAME,
+      g_param_spec_uint(
+          "end-frame", "End Frame",
+          "End frame buffer to be used for capturing (automatically assign "
+          "that many frames if same number as start-frame).",
+          0, G_MAXINT, DEFAULT_END_FRAME,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_AUDIO_SYSTEM,
+      g_param_spec_enum(
+          "audio-system", "Audio System", "Audio system to use",
+          GST_TYPE_AJA_AUDIO_SYSTEM, DEFAULT_AUDIO_SYSTEM,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_INPUT_SOURCE,
+      g_param_spec_enum(
+          "input-source", "Input Source", "Input source to use",
+          GST_TYPE_AJA_INPUT_SOURCE, DEFAULT_INPUT_SOURCE,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_SDI_MODE,
+      g_param_spec_enum(
+          "sdi-input-mode", "SDI Input Mode", "SDI input mode to use",
+          GST_TYPE_AJA_SDI_MODE, DEFAULT_SDI_MODE,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_AUDIO_SOURCE,
+      g_param_spec_enum(
+          "audio-source", "Audio Source", "Audio source to use",
+          GST_TYPE_AJA_AUDIO_SOURCE, DEFAULT_AUDIO_SOURCE,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_EMBEDDED_AUDIO_INPUT,
+      g_param_spec_enum(
+          "embedded-audio-input", "Embedded Audio Input",
+          "Embedded Audio Input to use", GST_TYPE_AJA_EMBEDDED_AUDIO_INPUT,
+          DEFAULT_EMBEDDED_AUDIO_INPUT,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_TIMECODE_INDEX,
+      g_param_spec_enum(
+          "timecode-index", "Timecode Index", "Timecode index to use",
+          GST_TYPE_AJA_TIMECODE_INDEX, DEFAULT_TIMECODE_INDEX,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_RP188,
+      g_param_spec_boolean(
+          "rp188", "RP188", "Enable RP188 timecode retrieval", DEFAULT_RP188,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_REFERENCE_SOURCE,
+      g_param_spec_enum(
+          "reference-source", "Reference Source", "Reference source to use",
+          GST_TYPE_AJA_REFERENCE_SOURCE, DEFAULT_REFERENCE_SOURCE,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_CLOSED_CAPTION_CAPTURE_MODE,
+      g_param_spec_enum(
+          "closed-caption-capture-mode", "Closed Caption Capture Mode",
+          "Closed Caption Capture Mode",
+          GST_TYPE_AJA_CLOSED_CAPTION_CAPTURE_MODE,
+          DEFAULT_CLOSED_CAPTION_CAPTURE_MODE,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_CAPTURE_CPU_CORE,
+      g_param_spec_uint(
+          "capture-cpu-core", "Capture CPU Core",
+          "Sets the affinity of the capture thread to this CPU core "
+          "(-1=disabled)",
+          0, G_MAXUINT, DEFAULT_CAPTURE_CPU_CORE,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  g_object_class_install_property(
+      gobject_class, PROP_SIGNAL,
+      g_param_spec_boolean(
+          "signal", "Input signal available",
+          "True if there is a valid input signal available", FALSE,
+          (GParamFlags)(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstAjaSrc:attach-ancillary-meta:
+   *
+   * If set to %TRUE attach any ancillary data as #GstAncillaryMeta on buffers
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property(
+      gobject_class, PROP_ATTACH_ANCILLARY_META,
+      g_param_spec_boolean(
+          "attach-ancillary-meta", "Attach Ancillary Meta",
+          "Attach ancillary meta to video frames",
+          DEFAULT_ATTACH_ANCILLARY_META,
+          (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+                        G_PARAM_CONSTRUCT)));
+
+  element_class->change_state = GST_DEBUG_FUNCPTR(gst_aja_src_change_state);
+
+  basesrc_class->get_caps = GST_DEBUG_FUNCPTR(gst_aja_src_get_caps);
+  basesrc_class->negotiate = NULL;
+  basesrc_class->query = GST_DEBUG_FUNCPTR(gst_aja_src_query);
+  basesrc_class->unlock = GST_DEBUG_FUNCPTR(gst_aja_src_unlock);
+  basesrc_class->unlock_stop = GST_DEBUG_FUNCPTR(gst_aja_src_unlock_stop);
+
+  pushsrc_class->create = GST_DEBUG_FUNCPTR(gst_aja_src_create);
+
+  templ_caps = gst_ntv2_supported_caps(DEVICE_ID_INVALID);
+  gst_element_class_add_pad_template(
+      element_class,
+      gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, templ_caps));
+  gst_caps_unref(templ_caps);
+
+  gst_element_class_set_static_metadata(
+      element_class, "AJA audio/video src", "Audio/Video/Source",
+      "Captures audio/video frames with AJA devices",
+      "Sebastian Dröge <sebastian@centricular.com>");
+
+  GST_DEBUG_CATEGORY_INIT(gst_aja_src_debug, "ajasrc", 0, "AJA src");
+}
+
+static void gst_aja_src_init(GstAjaSrc *self) {
+  g_mutex_init(&self->queue_lock);
+  g_cond_init(&self->queue_cond);
+
+  self->device_identifier = g_strdup(DEFAULT_DEVICE_IDENTIFIER);
+  self->channel = DEFAULT_CHANNEL;
+  self->queue_size = DEFAULT_QUEUE_SIZE;
+  self->start_frame = DEFAULT_START_FRAME;
+  self->end_frame = DEFAULT_END_FRAME;
+  self->video_format_setting = DEFAULT_VIDEO_FORMAT;
+  self->audio_system_setting = DEFAULT_AUDIO_SYSTEM;
+  self->input_source = DEFAULT_INPUT_SOURCE;
+  self->audio_source = DEFAULT_AUDIO_SOURCE;
+  self->embedded_audio_input = DEFAULT_EMBEDDED_AUDIO_INPUT;
+  self->timecode_index = DEFAULT_TIMECODE_INDEX;
+  self->reference_source = DEFAULT_REFERENCE_SOURCE;
+  self->closed_caption_capture_mode = DEFAULT_CLOSED_CAPTION_CAPTURE_MODE;
+  self->capture_cpu_core = DEFAULT_CAPTURE_CPU_CORE;
+  self->attach_ancillary_meta = DEFAULT_ATTACH_ANCILLARY_META;
+
+  self->queue =
+      gst_queue_array_new_for_struct(sizeof(QueueItem), self->queue_size);
+  gst_base_src_set_live(GST_BASE_SRC_CAST(self), TRUE);
+  gst_base_src_set_format(GST_BASE_SRC_CAST(self), GST_FORMAT_TIME);
+
+  self->video_format = NTV2_FORMAT_UNKNOWN;
+}
+
+void gst_aja_src_set_property(GObject *object, guint property_id,
+                              const GValue *value, GParamSpec *pspec) {
+  GstAjaSrc *self = GST_AJA_SRC(object);
+
+  switch (property_id) {
+    case PROP_DEVICE_IDENTIFIER:
+      g_free(self->device_identifier);
+      self->device_identifier = g_value_dup_string(value);
+      break;
+    case PROP_CHANNEL:
+      self->channel = (NTV2Channel)g_value_get_uint(value);
+      break;
+    case PROP_QUEUE_SIZE:
+      self->queue_size = g_value_get_uint(value);
+      break;
+    case PROP_START_FRAME:
+      self->start_frame = g_value_get_uint(value);
+      break;
+    case PROP_END_FRAME:
+      self->end_frame = g_value_get_uint(value);
+      break;
+    case PROP_VIDEO_FORMAT:
+      self->video_format_setting = (GstAjaVideoFormat)g_value_get_enum(value);
+      break;
+    case PROP_AUDIO_SYSTEM:
+      self->audio_system_setting = (GstAjaAudioSystem)g_value_get_enum(value);
+      break;
+    case PROP_INPUT_SOURCE:
+      self->input_source = (GstAjaInputSource)g_value_get_enum(value);
+      break;
+    case PROP_SDI_MODE:
+      self->sdi_mode = (GstAjaSdiMode)g_value_get_enum(value);
+      break;
+    case PROP_AUDIO_SOURCE:
+      self->audio_source = (GstAjaAudioSource)g_value_get_enum(value);
+      break;
+    case PROP_EMBEDDED_AUDIO_INPUT:
+      self->embedded_audio_input =
+          (GstAjaEmbeddedAudioInput)g_value_get_enum(value);
+      break;
+    case PROP_TIMECODE_INDEX:
+      self->timecode_index = (GstAjaTimecodeIndex)g_value_get_enum(value);
+      break;
+    case PROP_RP188:
+      self->rp188 = g_value_get_boolean(value);
+      break;
+    case PROP_REFERENCE_SOURCE:
+      self->reference_source = (GstAjaReferenceSource)g_value_get_enum(value);
+      break;
+    case PROP_CLOSED_CAPTION_CAPTURE_MODE:
+      self->closed_caption_capture_mode =
+          (GstAjaClosedCaptionCaptureMode)g_value_get_enum(value);
+      break;
+    case PROP_CAPTURE_CPU_CORE:
+      self->capture_cpu_core = g_value_get_uint(value);
+      break;
+    case PROP_ATTACH_ANCILLARY_META:
+      self->attach_ancillary_meta = g_value_get_boolean(value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+      break;
+  }
+}
+
+void gst_aja_src_get_property(GObject *object, guint property_id, GValue *value,
+                              GParamSpec *pspec) {
+  GstAjaSrc *self = GST_AJA_SRC(object);
+
+  switch (property_id) {
+    case PROP_DEVICE_IDENTIFIER:
+      g_value_set_string(value, self->device_identifier);
+      break;
+    case PROP_CHANNEL:
+      g_value_set_uint(value, self->channel);
+      break;
+    case PROP_QUEUE_SIZE:
+      g_value_set_uint(value, self->queue_size);
+      break;
+    case PROP_START_FRAME:
+      g_value_set_uint(value, self->start_frame);
+      break;
+    case PROP_END_FRAME:
+      g_value_set_uint(value, self->end_frame);
+      break;
+    case PROP_VIDEO_FORMAT:
+      g_value_set_enum(value, self->video_format_setting);
+      break;
+    case PROP_AUDIO_SYSTEM:
+      g_value_set_enum(value, self->audio_system_setting);
+      break;
+    case PROP_INPUT_SOURCE:
+      g_value_set_enum(value, self->input_source);
+      break;
+    case PROP_SDI_MODE:
+      g_value_set_enum(value, self->sdi_mode);
+      break;
+    case PROP_AUDIO_SOURCE:
+      g_value_set_enum(value, self->audio_source);
+      break;
+    case PROP_EMBEDDED_AUDIO_INPUT:
+      g_value_set_enum(value, self->embedded_audio_input);
+      break;
+    case PROP_TIMECODE_INDEX:
+      g_value_set_enum(value, self->timecode_index);
+      break;
+    case PROP_RP188:
+      g_value_set_boolean(value, self->rp188);
+      break;
+    case PROP_REFERENCE_SOURCE:
+      g_value_set_enum(value, self->reference_source);
+      break;
+    case PROP_CLOSED_CAPTION_CAPTURE_MODE:
+      g_value_set_enum(value, self->closed_caption_capture_mode);
+      break;
+    case PROP_CAPTURE_CPU_CORE:
+      g_value_set_uint(value, self->capture_cpu_core);
+      break;
+    case PROP_SIGNAL:
+      g_value_set_boolean(value, self->signal);
+      break;
+    case PROP_ATTACH_ANCILLARY_META:
+      g_value_set_boolean(value, self->attach_ancillary_meta);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+      break;
+  }
+}
+
+void gst_aja_src_finalize(GObject *object) {
+  GstAjaSrc *self = GST_AJA_SRC(object);
+
+  g_assert(self->device == NULL);
+  g_assert(gst_queue_array_get_length(self->queue) == 0);
+  g_clear_pointer(&self->queue, gst_queue_array_free);
+
+  g_mutex_clear(&self->queue_lock);
+  g_cond_clear(&self->queue_cond);
+
+  G_OBJECT_CLASS(parent_class)->finalize(object);
+}
+
+static gboolean gst_aja_src_open(GstAjaSrc *self) {
+  GST_DEBUG_OBJECT(self, "Opening device");
+
+  g_assert(self->device == NULL);
+
+  self->device = gst_aja_ntv2_device_obtain(self->device_identifier);
+  if (!self->device) {
+    GST_ERROR_OBJECT(self, "Failed to open device");
+    return FALSE;
+  }
+
+  if (!self->device->device->IsDeviceReady(false)) {
+    g_clear_pointer(&self->device, gst_aja_ntv2_device_unref);
+    return FALSE;
+  }
+
+  self->device->device->SetEveryFrameServices(::NTV2_OEM_TASKS);
+  self->device_id = self->device->device->GetDeviceID();
+
+  std::string serial_number;
+  if (!self->device->device->GetSerialNumberString(serial_number))
+    serial_number = "none";
+
+  GST_DEBUG_OBJECT(self,
+                   "Opened device with ID %d at index %d (%s, version %s, "
+                   "serial number %s, can do VANC %d)",
+                   self->device_id, self->device->device->GetIndexNumber(),
+                   self->device->device->GetDisplayName().c_str(),
+                   self->device->device->GetDeviceVersionString().c_str(),
+                   serial_number.c_str(),
+                   ::NTV2DeviceCanDoCustomAnc(self->device_id));
+
+  GST_DEBUG_OBJECT(self,
+                   "Using SDK version %d.%d.%d.%d (%s) and driver version %s",
+                   AJA_NTV2_SDK_VERSION_MAJOR, AJA_NTV2_SDK_VERSION_MINOR,
+                   AJA_NTV2_SDK_VERSION_POINT, AJA_NTV2_SDK_BUILD_NUMBER,
+                   AJA_NTV2_SDK_BUILD_DATETIME,
+                   self->device->device->GetDriverVersionString().c_str());
+
+  self->device->device->SetMultiFormatMode(true);
+
+  self->allocator = gst_aja_allocator_new(self->device);
+
+  GST_DEBUG_OBJECT(self, "Opened device");
+
+  return TRUE;
+}
+
+static gboolean gst_aja_src_close(GstAjaSrc *self) {
+  gst_clear_object(&self->allocator);
+  g_clear_pointer(&self->device, gst_aja_ntv2_device_unref);
+  self->device_id = DEVICE_ID_INVALID;
+
+  GST_DEBUG_OBJECT(self, "Closed device");
+
+  return TRUE;
+}
+
+// Must be called with GstAjaNtv2DeviceLocker
+static gboolean gst_aja_src_configure(GstAjaSrc *self) {
+  GST_DEBUG_OBJECT(self, "Starting");
+
+#define NEEDS_QUAD_MODE(self)                           \
+  (self->sdi_mode == GST_AJA_SDI_MODE_QUAD_LINK_SQD ||  \
+   self->sdi_mode == GST_AJA_SDI_MODE_QUAD_LINK_TSI ||  \
+   (self->input_source >= GST_AJA_INPUT_SOURCE_HDMI1 && \
+    self->input_source <= GST_AJA_INPUT_SOURCE_HDMI4))
+
+  self->quad_mode = NEEDS_QUAD_MODE(self);
+
+#undef NEEDS_QUAD_MODE
+
+  if (self->quad_mode) {
+    if (self->input_source != GST_AJA_INPUT_SOURCE_AUTO &&
+        !(self->input_source >= GST_AJA_INPUT_SOURCE_HDMI1 &&
+          self->input_source <= GST_AJA_INPUT_SOURCE_HDMI4)) {
+      GST_ERROR_OBJECT(
+          self,
+          "Quad modes require usage of the channel's default input source");
+      return FALSE;
+    }
+
+    if (self->channel != ::NTV2_CHANNEL1 && self->channel != ::NTV2_CHANNEL5) {
+      GST_ERROR_OBJECT(self, "Quad modes require channels 1 or 5");
+      return FALSE;
+    }
+  }
+
+  bool had_quad_enabled = false, had_quad_quad_enabled = false;
+
+  // HDMI can also be internally quad mode but it runs on a single channel.
+  if (!(self->input_source >= GST_AJA_INPUT_SOURCE_HDMI1 &&
+        self->input_source <= GST_AJA_INPUT_SOURCE_HDMI4)) {
+    if (self->channel < ::NTV2_CHANNEL5) {
+      self->device->device->GetQuadFrameEnable(had_quad_enabled,
+                                               ::NTV2_CHANNEL1);
+
+      // 12G UHD is also internally considered quad modes but they run on a
+      // single channel.
+      if (had_quad_enabled && ::NTV2DeviceCanDo12gRouting(self->device_id)) {
+        NTV2VideoFormat fmt =
+            self->device->device->GetInputVideoFormat(::NTV2_INPUTSOURCE_SDI1);
+        if (fmt >= NTV2_FORMAT_FIRST_UHD_TSI_DEF_FORMAT &&
+            fmt < NTV2_FORMAT_END_4K_TSI_DEF_FORMATS)
+          had_quad_enabled = false;
+      }
+
+      self->device->device->GetQuadQuadFrameEnable(had_quad_quad_enabled,
+                                                   ::NTV2_CHANNEL1);
+    } else {
+      self->device->device->GetQuadFrameEnable(had_quad_enabled,
+                                               ::NTV2_CHANNEL5);
+
+      // 12G UHD is also internally considered quad modes but they run on a
+      // single channel.
+      if (had_quad_enabled && ::NTV2DeviceCanDo12gRouting(self->device_id)) {
+        NTV2VideoFormat fmt =
+            self->device->device->GetInputVideoFormat(::NTV2_INPUTSOURCE_SDI5);
+        if (fmt >= NTV2_FORMAT_FIRST_UHD_TSI_DEF_FORMAT &&
+            fmt < NTV2_FORMAT_END_4K_TSI_DEF_FORMATS)
+          had_quad_enabled = false;
+      }
+
+      self->device->device->GetQuadQuadFrameEnable(had_quad_quad_enabled,
+                                                   ::NTV2_CHANNEL5);
+    }
+  }
+
+  // Stop any previously running quad mode, or other configurations on the
+  // quad channels
+  self->device->device->AutoCirculateStop(self->channel);
+  if (self->quad_mode || had_quad_enabled || had_quad_enabled) {
+    NTV2Channel quad_channel;
+
+    if (self->channel < ::NTV2_CHANNEL5)
+      quad_channel = ::NTV2_CHANNEL1;
+    else
+      quad_channel = ::NTV2_CHANNEL5;
+
+    for (int i = 0; i < 4; i++) {
+      self->device->device->AutoCirculateStop((NTV2Channel)(quad_channel + i));
+    }
+  }
+
+  if (self->buffer_pool) {
+    gst_buffer_pool_set_active(self->buffer_pool, FALSE);
+    gst_clear_object(&self->buffer_pool);
+  }
+
+  if (self->audio_buffer_pool) {
+    gst_buffer_pool_set_active(self->audio_buffer_pool, FALSE);
+    gst_clear_object(&self->audio_buffer_pool);
+  }
+
+  if (self->anc_buffer_pool) {
+    gst_buffer_pool_set_active(self->anc_buffer_pool, FALSE);
+    gst_clear_object(&self->anc_buffer_pool);
+  }
+
+  NTV2VANCMode vanc_mode;
+  NTV2InputSource input_source;
+  NTV2OutputCrosspointID input_source_id;
+  switch (self->input_source) {
+    case GST_AJA_INPUT_SOURCE_AUTO:
+      input_source = ::NTV2ChannelToInputSource(self->channel);
+      input_source_id = ::GetSDIInputOutputXptFromChannel(self->channel, false);
+      vanc_mode = ::NTV2DeviceCanDoCustomAnc(self->device_id)
+                      ? ::NTV2_VANCMODE_OFF
+                      : ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_INPUT_SOURCE_ANALOG1:
+      input_source = ::NTV2_INPUTSOURCE_ANALOG1;
+      input_source_id = ::NTV2_XptAnalogIn;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_INPUT_SOURCE_HDMI1:
+      input_source = ::NTV2_INPUTSOURCE_HDMI1;
+      input_source_id = ::NTV2_XptHDMIIn1;
+      vanc_mode = ::NTV2_VANCMODE_OFF;
+      break;
+    case GST_AJA_INPUT_SOURCE_HDMI2:
+      input_source = ::NTV2_INPUTSOURCE_HDMI2;
+      input_source_id = ::NTV2_XptHDMIIn2;
+      vanc_mode = ::NTV2_VANCMODE_OFF;
+      break;
+    case GST_AJA_INPUT_SOURCE_HDMI3:
+      input_source = ::NTV2_INPUTSOURCE_HDMI3;
+      input_source_id = ::NTV2_XptHDMIIn3;
+      vanc_mode = ::NTV2_VANCMODE_OFF;
+      break;
+    case GST_AJA_INPUT_SOURCE_HDMI4:
+      input_source = ::NTV2_INPUTSOURCE_HDMI4;
+      input_source_id = ::NTV2_XptHDMIIn4;
+      vanc_mode = ::NTV2_VANCMODE_OFF;
+      break;
+    case GST_AJA_INPUT_SOURCE_SDI1:
+      input_source = ::NTV2_INPUTSOURCE_SDI1;
+      input_source_id = ::NTV2_XptSDIIn1;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_INPUT_SOURCE_SDI2:
+      input_source = ::NTV2_INPUTSOURCE_SDI2;
+      input_source_id = ::NTV2_XptSDIIn2;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_INPUT_SOURCE_SDI3:
+      input_source = ::NTV2_INPUTSOURCE_SDI3;
+      input_source_id = ::NTV2_XptSDIIn3;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_INPUT_SOURCE_SDI4:
+      input_source = ::NTV2_INPUTSOURCE_SDI4;
+      input_source_id = ::NTV2_XptSDIIn4;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_INPUT_SOURCE_SDI5:
+      input_source = ::NTV2_INPUTSOURCE_SDI5;
+      input_source_id = ::NTV2_XptSDIIn5;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_INPUT_SOURCE_SDI6:
+      input_source = ::NTV2_INPUTSOURCE_SDI6;
+      input_source_id = ::NTV2_XptSDIIn6;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_INPUT_SOURCE_SDI7:
+      input_source = ::NTV2_INPUTSOURCE_SDI7;
+      input_source_id = ::NTV2_XptSDIIn7;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    case GST_AJA_INPUT_SOURCE_SDI8:
+      input_source = ::NTV2_INPUTSOURCE_SDI8;
+      input_source_id = ::NTV2_XptSDIIn8;
+      vanc_mode = ::NTV2_VANCMODE_TALL;
+      break;
+    default:
+      g_assert_not_reached();
+      break;
+  }
+
+  self->configured_input_source = input_source;
+
+  self->vanc_mode = vanc_mode;
+
+  if (!self->device->device->EnableChannel(self->channel)) {
+    GST_ERROR_OBJECT(self, "Failed to enable channel");
+    return FALSE;
+  }
+
+  if (self->quad_mode) {
+    for (int i = 1; i < 4; i++) {
+      if (!self->device->device->EnableChannel(
+              (NTV2Channel)(self->channel + i))) {
+        GST_ERROR_OBJECT(self, "Failed to enable channel");
+        return FALSE;
+      }
+    }
+  }
+
+  self->device->device->EnableInputInterrupt(self->channel);
+  self->device->device->SubscribeInputVerticalEvent(self->channel);
+
+  if (self->video_format_setting == GST_AJA_VIDEO_FORMAT_AUTO) {
+    self->device->device->WaitForInputVerticalInterrupt(self->channel, 10);
+    self->video_format = self->device->device->GetInputVideoFormat(
+        self->configured_input_source);
+    if (self->video_format == NTV2_FORMAT_UNKNOWN) {
+      GST_ERROR_OBJECT(self, "Input video format not detected");
+      return TRUE;
+    }
+    std::string configured_string = NTV2VideoFormatToString(self->video_format);
+    GST_DEBUG_OBJECT(self, "Detected input video format %s (%d)",
+                     configured_string.c_str(), (int)self->video_format);
+  } else {
+    self->video_format = gst_ntv2_video_format_from_aja_format(
+        self->video_format_setting, self->quad_mode);
+  }
+
+  if (self->video_format == NTV2_FORMAT_UNKNOWN) {
+    GST_ERROR_OBJECT(self, "Unsupported mode");
+    return FALSE;
+  }
+
+  if (!::NTV2DeviceCanDoVideoFormat(self->device_id, self->video_format)) {
+    GST_ERROR_OBJECT(self, "Device does not support mode %d",
+                     (int)self->video_format);
+    return FALSE;
+  }
+
+  gst_video_info_from_ntv2_video_format(&self->configured_info,
+                                        self->video_format);
+
+  if (self->quad_mode) {
+    if (self->input_source >= GST_AJA_INPUT_SOURCE_HDMI1 &&
+        self->input_source <= GST_AJA_INPUT_SOURCE_HDMI4) {
+      self->device->device->SetQuadQuadFrameEnable(false, self->channel);
+      self->device->device->SetQuadQuadSquaresEnable(false, self->channel);
+      self->device->device->Set4kSquaresEnable(true, self->channel);
+      self->device->device->SetTsiFrameEnable(true, self->channel);
+    } else {
+      switch (self->sdi_mode) {
+        case GST_AJA_SDI_MODE_SINGLE_LINK:
+          g_assert_not_reached();
+          break;
+        case GST_AJA_SDI_MODE_QUAD_LINK_SQD:
+          if (self->configured_info.height > 2160) {
+            self->device->device->Set4kSquaresEnable(false, self->channel);
+            self->device->device->SetTsiFrameEnable(false, self->channel);
+            self->device->device->SetQuadQuadFrameEnable(true, self->channel);
+            self->device->device->SetQuadQuadSquaresEnable(true, self->channel);
+          } else {
+            self->device->device->SetQuadQuadFrameEnable(false, self->channel);
+            self->device->device->SetQuadQuadSquaresEnable(false,
+                                                           self->channel);
+            self->device->device->Set4kSquaresEnable(true, self->channel);
+            self->device->device->SetTsiFrameEnable(false, self->channel);
+          }
+          break;
+        case GST_AJA_SDI_MODE_QUAD_LINK_TSI:
+          if (self->configured_info.height > 2160) {
+            self->device->device->Set4kSquaresEnable(false, self->channel);
+            self->device->device->SetTsiFrameEnable(false, self->channel);
+            self->device->device->SetQuadQuadFrameEnable(true, self->channel);
+            self->device->device->SetQuadQuadSquaresEnable(false,
+                                                           self->channel);
+          } else {
+            self->device->device->SetQuadQuadFrameEnable(false, self->channel);
+            self->device->device->SetQuadQuadSquaresEnable(false,
+                                                           self->channel);
+            self->device->device->Set4kSquaresEnable(false, self->channel);
+            self->device->device->SetTsiFrameEnable(true, self->channel);
+          }
+          break;
+      }
+    }
+  } else if (had_quad_enabled || had_quad_quad_enabled) {
+    NTV2Channel quad_channel;
+
+    if (self->channel < ::NTV2_CHANNEL5)
+      quad_channel = ::NTV2_CHANNEL1;
+    else
+      quad_channel = ::NTV2_CHANNEL5;
+
+    self->device->device->Set4kSquaresEnable(false, quad_channel);
+    self->device->device->SetTsiFrameEnable(false, quad_channel);
+    self->device->device->SetQuadQuadFrameEnable(false, quad_channel);
+    self->device->device->SetQuadQuadSquaresEnable(false, quad_channel);
+  }
+
+  self->device->device->SetMode(self->channel, NTV2_MODE_CAPTURE, false);
+  if (self->quad_mode) {
+    for (int i = 1; i < 4; i++)
+      self->device->device->SetMode((NTV2Channel)(self->channel + i),
+                                    NTV2_MODE_CAPTURE, false);
+  }
+
+  std::string configured_string = NTV2VideoFormatToString(self->video_format);
+  GST_DEBUG_OBJECT(self, "Configuring video format %s (%d) on channel %d",
+                   configured_string.c_str(), (int)self->video_format,
+                   (int)self->channel);
+  if (!self->device->device->SetVideoFormat(self->video_format, false, false,
+                                            self->channel)) {
+    GST_DEBUG_OBJECT(
+        self, "Failed configuring video format %s (%d) on channel %d",
+        configured_string.c_str(), (int)self->video_format, (int)self->channel);
+    return FALSE;
+  }
+
+  if (!::NTV2DeviceCanDoFrameBufferFormat(self->device_id,
+                                          ::NTV2_FBF_10BIT_YCBCR)) {
+    GST_ERROR_OBJECT(self, "Device does not support frame buffer format %d",
+                     (int)::NTV2_FBF_10BIT_YCBCR);
+    return FALSE;
+  }
+
+  if (!self->device->device->SetFrameBufferFormat(self->channel,
+                                                  ::NTV2_FBF_10BIT_YCBCR)) {
+    GST_ERROR_OBJECT(self, "Failed configuring frame buffer format %d",
+                     (int)::NTV2_FBF_10BIT_YCBCR);
+    return FALSE;
+  }
+
+  // FIXME: Workaround for sometimes setting the video format not actually
+  // changing the register values. Let's just try again.
+  {
+    NTV2VideoFormat fmt;
+    self->device->device->GetVideoFormat(fmt, self->channel);
+
+    if (fmt != self->video_format) {
+      std::string actual_string = NTV2VideoFormatToString(fmt);
+
+      GST_ERROR_OBJECT(self,
+                       "Configured video format %s (%d) on channel %d but %s "
+                       "(%d) is configured instead, trying again",
+                       configured_string.c_str(), (int)self->video_format,
+                       (int)self->channel, actual_string.c_str(), (int)fmt);
+      self->video_format = ::NTV2_FORMAT_UNKNOWN;
+      return TRUE;
+    }
+  }
+
+  if (self->quad_mode) {
+    for (int i = 1; i < 4; i++)
+      self->device->device->SetFrameBufferFormat(
+          (NTV2Channel)(self->channel + i), ::NTV2_FBF_10BIT_YCBCR);
+  }
+
+  self->device->device->DMABufferAutoLock(false, true, 0);
+
+  if (::NTV2DeviceHasBiDirectionalSDI(self->device_id)) {
+    self->device->device->SetSDITransmitEnable(self->channel, false);
+    if (self->quad_mode) {
+      for (int i = 1; i < 4; i++)
+        self->device->device->SetSDITransmitEnable(
+            (NTV2Channel)(self->channel + i), false);
+    }
+  }
+
+  // Always use the framebuffer associated with the channel
+  NTV2InputCrosspointID framebuffer_id =
+      ::GetFrameBufferInputXptFromChannel(self->channel, false);
+
+  const NTV2Standard standard(
+      ::GetNTV2StandardFromVideoFormat(self->video_format));
+  self->device->device->SetStandard(standard, self->channel);
+  if (self->quad_mode) {
+    for (int i = 1; i < 4; i++)
+      self->device->device->SetStandard(standard,
+                                        (NTV2Channel)(self->channel + i));
+  }
+
+  const NTV2FrameGeometry geometry =
+      ::GetNTV2FrameGeometryFromVideoFormat(self->video_format);
+
+  self->vanc_mode =
+      ::HasVANCGeometries(geometry) ? vanc_mode : ::NTV2_VANCMODE_OFF;
+  if (self->vanc_mode == ::NTV2_VANCMODE_OFF) {
+    self->device->device->SetFrameGeometry(geometry, false, self->channel);
+
+    if (self->quad_mode) {
+      for (int i = 1; i < 4; i++) {
+        self->device->device->SetFrameGeometry(
+            geometry, false, (NTV2Channel)(self->channel + i));
+      }
+    }
+  } else {
+    const NTV2FrameGeometry vanc_geometry =
+        ::GetVANCFrameGeometry(geometry, self->vanc_mode);
+
+    self->device->device->SetFrameGeometry(vanc_geometry, false, self->channel);
+
+    if (self->quad_mode) {
+      for (int i = 1; i < 4; i++) {
+        self->device->device->SetFrameGeometry(
+            vanc_geometry, false, (NTV2Channel)(self->channel + i));
+      }
+    }
+  }
+
+  CNTV2SignalRouter router;
+
+  // If any channels are currently running, initialize the router with the
+  // existing routing setup. Otherwise overwrite the whole routing table.
+  {
+    bool have_channels_running = false;
+
+    for (NTV2Channel c = ::NTV2_CHANNEL1; c < NTV2_MAX_NUM_CHANNELS;
+         c = (NTV2Channel)(c + 1)) {
+      AUTOCIRCULATE_STATUS ac_status;
+
+      if (c == self->channel) continue;
+
+      if (self->device->device->AutoCirculateGetStatus(c, ac_status) &&
+          !ac_status.IsStopped()) {
+        have_channels_running = true;
+        break;
+      }
+    }
+
+    if (have_channels_running) self->device->device->GetRouting(router);
+  }
+
+  // Need to remove old routes for the output and framebuffer we're going to
+  // use
+  NTV2ActualConnections connections = router.GetConnections();
+
+  if (self->quad_mode) {
+    if (self->input_source >= GST_AJA_INPUT_SOURCE_HDMI1 &&
+        self->input_source <= GST_AJA_INPUT_SOURCE_HDMI4) {
+      // Need to disconnect the 4 inputs corresponding to this channel from
+      // their framebuffers/muxers, and muxers from their framebuffers
+      for (auto iter = connections.begin(); iter != connections.end(); iter++) {
+        if (iter->first == NTV2_XptFrameBuffer1Input ||
+            iter->first == NTV2_XptFrameBuffer1BInput ||
+            iter->first == NTV2_XptFrameBuffer2Input ||
+            iter->first == NTV2_XptFrameBuffer2BInput ||
+            iter->second == NTV2_Xpt425Mux1AYUV ||
+            iter->second == NTV2_Xpt425Mux1BYUV ||
+            iter->second == NTV2_Xpt425Mux2AYUV ||
+            iter->second == NTV2_Xpt425Mux2BYUV ||
+            iter->first == NTV2_Xpt425Mux1AInput ||
+            iter->first == NTV2_Xpt425Mux1BInput ||
+            iter->first == NTV2_Xpt425Mux2AInput ||
+            iter->first == NTV2_Xpt425Mux2BInput ||
+            iter->second == NTV2_XptHDMIIn1 ||
+            iter->second == NTV2_XptHDMIIn1Q2 ||
+            iter->second == NTV2_XptHDMIIn1Q3 ||
+            iter->second == NTV2_XptHDMIIn1Q4)
+          router.RemoveConnection(iter->first, iter->second);
+      }
+    } else if (self->channel == NTV2_CHANNEL1) {
+      for (auto iter = connections.begin(); iter != connections.end(); iter++) {
+        if (iter->first == NTV2_XptFrameBuffer1Input ||
+            iter->first == NTV2_XptFrameBuffer1BInput ||
+            iter->first == NTV2_XptFrameBuffer1DS2Input ||
+            iter->first == NTV2_XptFrameBuffer2Input ||
+            iter->first == NTV2_XptFrameBuffer2BInput ||
+            iter->first == NTV2_XptFrameBuffer2DS2Input ||
+            iter->second == NTV2_Xpt425Mux1AYUV ||
+            iter->second == NTV2_Xpt425Mux1BYUV ||
+            iter->second == NTV2_Xpt425Mux2AYUV ||
+            iter->second == NTV2_Xpt425Mux2BYUV ||
+            iter->first == NTV2_Xpt425Mux1AInput ||
+            iter->first == NTV2_Xpt425Mux1BInput ||
+            iter->first == NTV2_Xpt425Mux2AInput ||
+            iter->first == NTV2_Xpt425Mux2BInput ||
+            iter->second == NTV2_XptSDIIn1 || iter->second == NTV2_XptSDIIn2 ||
+            iter->second == NTV2_XptSDIIn3 || iter->second == NTV2_XptSDIIn4 ||
+            iter->second == NTV2_XptSDIIn1DS2 ||
+            iter->second == NTV2_XptSDIIn2DS2 ||
+            iter->first == NTV2_XptFrameBuffer1Input ||
+            iter->first == NTV2_XptFrameBuffer2Input ||
+            iter->first == NTV2_XptFrameBuffer3Input ||
+            iter->first == NTV2_XptFrameBuffer4Input)
+          router.RemoveConnection(iter->first, iter->second);
+      }
+    } else if (self->channel == NTV2_CHANNEL5) {
+      for (auto iter = connections.begin(); iter != connections.end(); iter++) {
+        if (iter->first == NTV2_XptFrameBuffer5Input ||
+            iter->first == NTV2_XptFrameBuffer5BInput ||
+            iter->first == NTV2_XptFrameBuffer5DS2Input ||
+            iter->first == NTV2_XptFrameBuffer6Input ||
+            iter->first == NTV2_XptFrameBuffer6BInput ||
+            iter->first == NTV2_XptFrameBuffer6DS2Input ||
+            iter->second == NTV2_Xpt425Mux3AYUV ||
+            iter->second == NTV2_Xpt425Mux3BYUV ||
+            iter->second == NTV2_Xpt425Mux4AYUV ||
+            iter->second == NTV2_Xpt425Mux4BYUV ||
+            iter->first == NTV2_Xpt425Mux3AInput ||
+            iter->first == NTV2_Xpt425Mux3BInput ||
+            iter->first == NTV2_Xpt425Mux4AInput ||
+            iter->first == NTV2_Xpt425Mux4BInput ||
+            iter->second == NTV2_XptSDIIn5 || iter->second == NTV2_XptSDIIn6 ||
+            iter->second == NTV2_XptSDIIn7 || iter->second == NTV2_XptSDIIn8 ||
+            iter->second == NTV2_XptSDIIn5DS2 ||
+            iter->second == NTV2_XptSDIIn6DS2 ||
+            iter->first == NTV2_XptFrameBuffer5Input ||
+            iter->first == NTV2_XptFrameBuffer6Input ||
+            iter->first == NTV2_XptFrameBuffer7Input ||
+            iter->first == NTV2_XptFrameBuffer8Input)
+          router.RemoveConnection(iter->first, iter->second);
+      }
+    } else {
+      g_assert_not_reached();
+    }
+  } else {
+    // This also removes all connections for any previous quad mode on the
+    // corresponding channels.
+
+    NTV2OutputCrosspointID quad_input_source_ids10;
+
+    if (input_source_id == NTV2_XptSDIIn1 ||
+        input_source_id == NTV2_XptSDIIn2 ||
+        input_source_id == NTV2_XptSDIIn3 ||
+        input_source_id == NTV2_XptSDIIn4) {
+      if (had_quad_enabled || had_quad_quad_enabled) {
+        quad_input_source_ids0 = NTV2_XptSDIIn1;
+        quad_input_source_ids1 = NTV2_XptSDIIn2;
+        quad_input_source_ids2 = NTV2_XptSDIIn3;
+        quad_input_source_ids3 = NTV2_XptSDIIn4;
+        quad_input_source_ids4 = NTV2_XptSDIIn1DS2;
+        quad_input_source_ids5 = NTV2_XptSDIIn2DS2;
+        quad_input_source_ids6 = NTV2_Xpt425Mux1AYUV;
+        quad_input_source_ids7 = NTV2_Xpt425Mux1BYUV;
+        quad_input_source_ids8 = NTV2_Xpt425Mux2AYUV;
+        quad_input_source_ids9 = NTV2_Xpt425Mux2BYUV;
+      }
+    } else if (input_source_id == NTV2_XptSDIIn5 ||
+               input_source_id == NTV2_XptSDIIn6 ||
+               input_source_id == NTV2_XptSDIIn7 ||
+               input_source_id == NTV2_XptSDIIn8) {
+      if (had_quad_enabled || had_quad_quad_enabled) {
+        quad_input_source_ids0 = NTV2_XptSDIIn5;
+        quad_input_source_ids1 = NTV2_XptSDIIn6;
+        quad_input_source_ids2 = NTV2_XptSDIIn7;
+        quad_input_source_ids3 = NTV2_XptSDIIn8;
+        quad_input_source_ids4 = NTV2_XptSDIIn5DS2;
+        quad_input_source_ids5 = NTV2_XptSDIIn6DS2;
+        quad_input_source_ids6 = NTV2_Xpt425Mux3AYUV;
+        quad_input_source_ids7 = NTV2_Xpt425Mux3BYUV;
+        quad_input_source_ids8 = NTV2_Xpt425Mux4AYUV;
+        quad_input_source_ids9 = NTV2_Xpt425Mux4BYUV;
+      }
+    } else {
+      g_assert_not_reached();
+    }
+
+    for (auto iter = connections.begin(); iter != connections.end(); iter++) {
+      if (had_quad_enabled || had_quad_quad_enabled) {
+        for (auto quad_input_source_id : quad_input_source_ids) {
+          if (iter->second == quad_input_source_id)
+            router.RemoveConnection(iter->first, iter->second);
+        }
+      } else {
+        if (iter->first == framebuffer_id || iter->second == input_source_id)
+          router.RemoveConnection(iter->first, iter->second);
+      }
+    }
+  }
+
+  if (self->quad_mode) {
+    if (self->input_source >= GST_AJA_INPUT_SOURCE_HDMI1 &&
+        self->input_source <= GST_AJA_INPUT_SOURCE_HDMI4) {
+      input_source_id = NTV2_Xpt425Mux1AYUV;
+    } else if (self->sdi_mode == GST_AJA_SDI_MODE_QUAD_LINK_TSI &&
+               !NTV2_IS_QUAD_QUAD_HFR_VIDEO_FORMAT(self->video_format) &&
+               !NTV2_IS_QUAD_QUAD_FORMAT(self->video_format)) {
+      if (self->channel == NTV2_CHANNEL1)
+        input_source_id = NTV2_Xpt425Mux1AYUV;
+      else if (self->channel == NTV2_CHANNEL5)
+        input_source_id = NTV2_Xpt425Mux3AYUV;
+      else
+        g_assert_not_reached();
+    }
+  }
+
+  GST_DEBUG_OBJECT(self, "Creating connection %d - %d", framebuffer_id,
+                   input_source_id);
+  router.AddConnection(framebuffer_id, input_source_id);
+
+  if (self->quad_mode) {
+    if (self->input_source >= GST_AJA_INPUT_SOURCE_HDMI1 &&
+        self->input_source <= GST_AJA_INPUT_SOURCE_HDMI4) {
+      router.AddConnection(NTV2_XptFrameBuffer1BInput, NTV2_Xpt425Mux1BYUV);
+      router.AddConnection(NTV2_XptFrameBuffer2Input, NTV2_Xpt425Mux2AYUV);
+      router.AddConnection(NTV2_XptFrameBuffer2BInput, NTV2_Xpt425Mux2BYUV);
+
+      router.AddConnection(NTV2_Xpt425Mux1AInput, NTV2_XptHDMIIn1);
+      router.AddConnection(NTV2_Xpt425Mux1BInput, NTV2_XptHDMIIn1Q2);
+      router.AddConnection(NTV2_Xpt425Mux2AInput, NTV2_XptHDMIIn1Q3);
+      router.AddConnection(NTV2_Xpt425Mux2BInput, NTV2_XptHDMIIn1Q4);
+    } else {
+      if (self->sdi_mode == GST_AJA_SDI_MODE_QUAD_LINK_TSI) {
+        if (NTV2_IS_QUAD_QUAD_HFR_VIDEO_FORMAT(self->video_format)) {
+          if (self->channel == NTV2_CHANNEL1) {
+            router.AddConnection(NTV2_XptFrameBuffer1DS2Input, NTV2_XptSDIIn2);
+            router.AddConnection(NTV2_XptFrameBuffer2Input, NTV2_XptSDIIn3);
+            router.AddConnection(NTV2_XptFrameBuffer2DS2Input, NTV2_XptSDIIn4);
+          } else if (self->channel == NTV2_CHANNEL5) {
+            router.AddConnection(NTV2_XptFrameBuffer5DS2Input, NTV2_XptSDIIn6);
+            router.AddConnection(NTV2_XptFrameBuffer5Input, NTV2_XptSDIIn7);
+            router.AddConnection(NTV2_XptFrameBuffer6DS2Input, NTV2_XptSDIIn8);
+          } else {
+            g_assert_not_reached();
+          }
+        } else if (NTV2_IS_QUAD_QUAD_FORMAT(self->video_format)) {
+          if (self->channel == NTV2_CHANNEL1) {
+            router.AddConnection(NTV2_XptFrameBuffer1DS2Input,
+                                 NTV2_XptSDIIn1DS2);
+            router.AddConnection(NTV2_XptFrameBuffer2Input, NTV2_XptSDIIn2);
+            router.AddConnection(NTV2_XptFrameBuffer2DS2Input,
+                                 NTV2_XptSDIIn2DS2);
+          } else if (self->channel == NTV2_CHANNEL5) {
+            router.AddConnection(NTV2_XptFrameBuffer5DS2Input,
+                                 NTV2_XptSDIIn5DS2);
+            router.AddConnection(NTV2_XptFrameBuffer5Input, NTV2_XptSDIIn6);
+            router.AddConnection(NTV2_XptFrameBuffer6DS2Input,
+                                 NTV2_XptSDIIn6DS2);
+          } else {
+            g_assert_not_reached();
+          }
+          // FIXME: Need special handling of NTV2_IS_4K_HFR_VIDEO_FORMAT for
+          // TSI?
+        } else {
+          if (self->channel == NTV2_CHANNEL1) {
+            router.AddConnection(NTV2_XptFrameBuffer1BInput,
+                                 NTV2_Xpt425Mux1BYUV);
+            router.AddConnection(NTV2_XptFrameBuffer2Input,
+                                 NTV2_Xpt425Mux2AYUV);
+            router.AddConnection(NTV2_XptFrameBuffer2BInput,
+                                 NTV2_Xpt425Mux2BYUV);
+
+            router.AddConnection(NTV2_Xpt425Mux1AInput, NTV2_XptSDIIn1);
+            router.AddConnection(NTV2_Xpt425Mux1BInput, NTV2_XptSDIIn2);
+            router.AddConnection(NTV2_Xpt425Mux2AInput, NTV2_XptSDIIn3);
+            router.AddConnection(NTV2_Xpt425Mux2BInput, NTV2_XptSDIIn4);
+          } else if (self->channel == NTV2_CHANNEL5) {
+            router.AddConnection(NTV2_XptFrameBuffer5BInput,
+                                 NTV2_Xpt425Mux3BYUV);
+            router.AddConnection(NTV2_XptFrameBuffer6Input,
+                                 NTV2_Xpt425Mux4AYUV);
+            router.AddConnection(NTV2_XptFrameBuffer6BInput,
+                                 NTV2_Xpt425Mux4BYUV);
+
+            router.AddConnection(NTV2_Xpt425Mux3AInput, NTV2_XptSDIIn5);
+            router.AddConnection(NTV2_Xpt425Mux3BInput, NTV2_XptSDIIn6);
+            router.AddConnection(NTV2_Xpt425Mux4AInput, NTV2_XptSDIIn7);
+            router.AddConnection(NTV2_Xpt425Mux4BInput, NTV2_XptSDIIn8);
+          } else {
+            g_assert_not_reached();
+          }
+        }
+      } else {
+        if (self->channel == NTV2_CHANNEL1) {
+          router.AddConnection(NTV2_XptFrameBuffer2Input, NTV2_XptSDIIn2);
+          router.AddConnection(NTV2_XptFrameBuffer3Input, NTV2_XptSDIIn3);
+          router.AddConnection(NTV2_XptFrameBuffer4Input, NTV2_XptSDIIn4);
+        } else if (self->channel == NTV2_CHANNEL5) {
+          router.AddConnection(NTV2_XptFrameBuffer6Input, NTV2_XptSDIIn6);
+          router.AddConnection(NTV2_XptFrameBuffer7Input, NTV2_XptSDIIn7);
+          router.AddConnection(NTV2_XptFrameBuffer8Input, NTV2_XptSDIIn8);
+        } else {
+          g_assert_not_reached();
+        }
+      }
+    }
+  }
+
+  {
+    std::stringstream os;
+    CNTV2SignalRouter oldRouter;
+    self->device->device->GetRouting(oldRouter);
+    oldRouter.Print(os);
+    GST_DEBUG_OBJECT(self, "Previous routing:\n%s", os.str().c_str());
+  }
+  self->device->device->ApplySignalRoute(router, true);
+  {
+    std::stringstream os;
+    CNTV2SignalRouter currentRouter;
+    self->device->device->GetRouting(currentRouter);
+    currentRouter.Print(os);
+    GST_DEBUG_OBJECT(self, "New routing:\n%s", os.str().c_str());
+  }
+
+  switch (self->audio_system_setting) {
+    case GST_AJA_AUDIO_SYSTEM_1:
+      self->audio_system = ::NTV2_AUDIOSYSTEM_1;
+      break;
+    case GST_AJA_AUDIO_SYSTEM_2:
+      self->audio_system = ::NTV2_AUDIOSYSTEM_2;
+      break;
+    case GST_AJA_AUDIO_SYSTEM_3:
+      self->audio_system = ::NTV2_AUDIOSYSTEM_3;
+      break;
+    case GST_AJA_AUDIO_SYSTEM_4:
+      self->audio_system = ::NTV2_AUDIOSYSTEM_4;
+      break;
+    case GST_AJA_AUDIO_SYSTEM_5:
+      self->audio_system = ::NTV2_AUDIOSYSTEM_5;
+      break;
+    case GST_AJA_AUDIO_SYSTEM_6:
+      self->audio_system = ::NTV2_AUDIOSYSTEM_6;
+      break;
+    case GST_AJA_AUDIO_SYSTEM_7:
+      self->audio_system = ::NTV2_AUDIOSYSTEM_7;
+      break;
+    case GST_AJA_AUDIO_SYSTEM_8:
+      self->audio_system = ::NTV2_AUDIOSYSTEM_8;
+      break;
+    case GST_AJA_AUDIO_SYSTEM_AUTO:
+      self->audio_system = ::NTV2_AUDIOSYSTEM_1;
+      if (::NTV2DeviceGetNumAudioSystems(self->device_id) > 1)
+        self->audio_system = ::NTV2ChannelToAudioSystem(self->channel);
+      if (!::NTV2DeviceCanDoFrameStore1Display(self->device_id))
+        self->audio_system = ::NTV2_AUDIOSYSTEM_1;
+      break;
+    default:
+      g_assert_not_reached();
+      break;
+  }
+
+  GST_DEBUG_OBJECT(self, "Using audio system %d", self->audio_system);
+
+  NTV2AudioSource audio_source;
+  switch (self->audio_source) {
+    case GST_AJA_AUDIO_SOURCE_EMBEDDED:
+      audio_source = ::NTV2_AUDIO_EMBEDDED;
+      break;
+    case GST_AJA_AUDIO_SOURCE_AES:
+      audio_source = ::NTV2_AUDIO_AES;
+      break;
+    case GST_AJA_AUDIO_SOURCE_ANALOG:
+      audio_source = ::NTV2_AUDIO_ANALOG;
+      break;
+    case GST_AJA_AUDIO_SOURCE_HDMI:
+      audio_source = ::NTV2_AUDIO_HDMI;
+      break;
+    case GST_AJA_AUDIO_SOURCE_MIC:
+      audio_source = ::NTV2_AUDIO_MIC;
+      break;
+    default:
+      g_assert_not_reached();
+      break;
+  }
+
+  NTV2EmbeddedAudioInput embedded_audio_input;
+  switch (self->embedded_audio_input) {
+    case GST_AJA_EMBEDDED_AUDIO_INPUT_AUTO:
+      embedded_audio_input =
+          ::NTV2InputSourceToEmbeddedAudioInput(input_source);
+      break;
+    case GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO1:
+      embedded_audio_input = ::NTV2_EMBEDDED_AUDIO_INPUT_VIDEO_1;
+      break;
+    case GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO2:
+      embedded_audio_input = ::NTV2_EMBEDDED_AUDIO_INPUT_VIDEO_2;
+      break;
+    case GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO3:
+      embedded_audio_input = ::NTV2_EMBEDDED_AUDIO_INPUT_VIDEO_3;
+      break;
+    case GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO4:
+      embedded_audio_input = ::NTV2_EMBEDDED_AUDIO_INPUT_VIDEO_4;
+      break;
+    case GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO5:
+      embedded_audio_input = ::NTV2_EMBEDDED_AUDIO_INPUT_VIDEO_5;
+      break;
+    case GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO6:
+      embedded_audio_input = ::NTV2_EMBEDDED_AUDIO_INPUT_VIDEO_6;
+      break;
+    case GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO7:
+      embedded_audio_input = ::NTV2_EMBEDDED_AUDIO_INPUT_VIDEO_7;
+      break;
+    case GST_AJA_EMBEDDED_AUDIO_INPUT_VIDEO8:
+      embedded_audio_input = ::NTV2_EMBEDDED_AUDIO_INPUT_VIDEO_8;
+      break;
+    default:
+      g_assert_not_reached();
+      break;
+  }
+
+  self->device->device->SetAudioSystemInputSource(
+      self->audio_system, audio_source, embedded_audio_input);
+  self->configured_audio_channels =
+      ::NTV2DeviceGetMaxAudioChannels(self->device_id);
+  self->device->device->SetNumberAudioChannels(self->configured_audio_channels,
+                                               self->audio_system);
+  self->device->device->SetAudioRate(::NTV2_AUDIO_48K, self->audio_system);
+  self->device->device->SetAudioBufferSize(::NTV2_AUDIO_BUFFER_BIG,
+                                           self->audio_system);
+  self->device->device->SetAudioLoopBack(::NTV2_AUDIO_LOOPBACK_OFF,
+                                         self->audio_system);
+  self->device->device->SetEmbeddedAudioClock(
+      ::NTV2_EMBEDDED_AUDIO_CLOCK_VIDEO_INPUT, self->audio_system);
+
+  NTV2ReferenceSource reference_source;
+  switch (self->reference_source) {
+    case GST_AJA_REFERENCE_SOURCE_AUTO:
+      reference_source = ::NTV2InputSourceToReferenceSource(input_source);
+      break;
+    case GST_AJA_REFERENCE_SOURCE_EXTERNAL:
+      reference_source = ::NTV2_REFERENCE_EXTERNAL;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_FREERUN:
+      reference_source = ::NTV2_REFERENCE_FREERUN;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_1:
+      reference_source = ::NTV2_REFERENCE_INPUT1;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_2:
+      reference_source = ::NTV2_REFERENCE_INPUT2;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_3:
+      reference_source = ::NTV2_REFERENCE_INPUT3;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_4:
+      reference_source = ::NTV2_REFERENCE_INPUT4;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_5:
+      reference_source = ::NTV2_REFERENCE_INPUT5;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_6:
+      reference_source = ::NTV2_REFERENCE_INPUT6;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_7:
+      reference_source = ::NTV2_REFERENCE_INPUT7;
+      break;
+    case GST_AJA_REFERENCE_SOURCE_INPUT_8:
+      reference_source = ::NTV2_REFERENCE_INPUT8;
+      break;
+    default:
+      g_assert_not_reached();
+      break;
+  }
+  GST_DEBUG_OBJECT(self, "Configuring reference source %d",
+                   (int)reference_source);
+
+  self->device->device->SetReference(reference_source);
+  self->device->device->SetLTCInputEnable(true);
+  self->device->device->SetRP188SourceFilter(self->channel, 0xff);
+
+  guint video_buffer_size = ::GetVideoActiveSize(
+      self->video_format, ::NTV2_FBF_10BIT_YCBCR, self->vanc_mode);
+
+  self->buffer_pool = gst_buffer_pool_new();
+  GstStructure *config = gst_buffer_pool_get_config(self->buffer_pool);
+  gst_buffer_pool_config_set_params(config, NULL, video_buffer_size,
+                                    2 * self->queue_size, 0);
+  gst_buffer_pool_config_set_allocator(config, self->allocator, NULL);
+  gst_buffer_pool_set_config(self->buffer_pool, config);
+  gst_buffer_pool_set_active(self->buffer_pool, TRUE);
+
+  guint audio_buffer_size = 401 * 1024;
+
+  self->audio_buffer_pool = gst_buffer_pool_new();
+  config = gst_buffer_pool_get_config(self->audio_buffer_pool);
+  gst_buffer_pool_config_set_params(config, NULL, audio_buffer_size,
+                                    2 * self->queue_size, 0);
+  gst_buffer_pool_config_set_allocator(config, self->allocator, NULL);
+  gst_buffer_pool_set_config(self->audio_buffer_pool, config);
+  gst_buffer_pool_set_active(self->audio_buffer_pool, TRUE);
+
+  guint anc_buffer_size = 8 * 1024;
+
+  if (self->vanc_mode == ::NTV2_VANCMODE_OFF &&
+      ::NTV2DeviceCanDoCustomAnc(self->device_id)) {
+    self->anc_buffer_pool = gst_buffer_pool_new();
+    config = gst_buffer_pool_get_config(self->anc_buffer_pool);
+    gst_buffer_pool_config_set_params(
+        config, NULL, anc_buffer_size,
+        (self->configured_info.interlace_mode ==
+                 GST_VIDEO_INTERLACE_MODE_PROGRESSIVE
+             ? 1
+             : 2) *
+            self->queue_size,
+        0);
+    gst_buffer_pool_config_set_allocator(config, self->allocator, NULL);
+    gst_buffer_pool_set_config(self->anc_buffer_pool, config);
+    gst_buffer_pool_set_active(self->anc_buffer_pool, TRUE);
+  }
+
+  gst_element_post_message(GST_ELEMENT_CAST(self),
+                           gst_message_new_latency(GST_OBJECT_CAST(self)));
+
+  return TRUE;
+}
+
+static gboolean gst_aja_src_start(GstAjaSrc *self) {
+  GST_DEBUG_OBJECT(self, "Starting");
+
+  self->video_format = NTV2_FORMAT_UNKNOWN;
+  self->signal = FALSE;
+
+  self->capture_thread = new AJAThread();
+  self->capture_thread->Attach(capture_thread_func, self);
+  self->capture_thread->SetPriority(AJA_ThreadPriority_High);
+  self->capture_thread->Start();
+  g_mutex_lock(&self->queue_lock);
+  self->shutdown = FALSE;
+  self->playing = FALSE;
+  self->flushing = FALSE;
+  g_cond_signal(&self->queue_cond);
+  g_mutex_unlock(&self->queue_lock);
+
+  return TRUE;
+}
+
+static gboolean gst_aja_src_stop(GstAjaSrc *self) {
+  QueueItem *item;
+
+  GST_DEBUG_OBJECT(self, "Stopping");
+
+  g_mutex_lock(&self->queue_lock);
+  self->shutdown = TRUE;
+  self->flushing = TRUE;
+  self->playing = FALSE;
+  g_cond_signal(&self->queue_cond);
+  g_mutex_unlock(&self->queue_lock);
+
+  if (self->capture_thread) {
+    self->capture_thread->Stop();
+    delete self->capture_thread;
+    self->capture_thread = NULL;
+  }
+
+  GST_OBJECT_LOCK(self);
+  memset(&self->current_info, 0, sizeof(self->current_info));
+  memset(&self->configured_info, 0, sizeof(self->configured_info));
+  self->configured_audio_channels = 0;
+  GST_OBJECT_UNLOCK(self);
+
+  while ((item = (QueueItem *)gst_queue_array_pop_head_struct(self->queue))) {
+    queue_item_clear(item);
+  }
+  self->queue_num_frames = 0;
+
+  if (self->buffer_pool) {
+    gst_buffer_pool_set_active(self->buffer_pool, FALSE);
+    gst_clear_object(&self->buffer_pool);
+  }
+
+  if (self->audio_buffer_pool) {
+    gst_buffer_pool_set_active(self->audio_buffer_pool, FALSE);
+    gst_clear_object(&self->audio_buffer_pool);
+  }
+
+  if (self->anc_buffer_pool) {
+    gst_buffer_pool_set_active(self->anc_buffer_pool, FALSE);
+    gst_clear_object(&self->anc_buffer_pool);
+  }
+
+  self->video_format = NTV2_FORMAT_UNKNOWN;
+
+  if (self->signal) {
+    self->signal = FALSE;
+    g_object_notify(G_OBJECT(self), "signal");
+  }
+
+  GST_DEBUG_OBJECT(self, "Stopped");
+
+  return TRUE;
+}
+
+static GstStateChangeReturn gst_aja_src_change_state(
+    GstElement *element, GstStateChange transition) {
+  GstAjaSrc *self = GST_AJA_SRC(element);
+  GstStateChangeReturn ret;
+
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+      if (!gst_aja_src_open(self)) return GST_STATE_CHANGE_FAILURE;
+      break;
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      if (!gst_aja_src_start(self)) return GST_STATE_CHANGE_FAILURE;
+      break;
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+      break;
+    default:
+      break;
+  }
+
+  ret = GST_ELEMENT_CLASS(parent_class)->change_state(element, transition);
+  if (ret == GST_STATE_CHANGE_FAILURE) return ret;
+
+  switch (transition) {
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+      g_mutex_lock(&self->queue_lock);
+      self->playing = FALSE;
+      g_cond_signal(&self->queue_cond);
+      g_mutex_unlock(&self->queue_lock);
+      break;
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+      g_mutex_lock(&self->queue_lock);
+      self->playing = TRUE;
+      g_cond_signal(&self->queue_cond);
+      g_mutex_unlock(&self->queue_lock);
+      break;
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      if (!gst_aja_src_stop(self)) return GST_STATE_CHANGE_FAILURE;
+      break;
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      if (!gst_aja_src_close(self)) return GST_STATE_CHANGE_FAILURE;
+      break;
+    default:
+      break;
+  }
+
+  return ret;
+}
+
+static GstCaps *gst_aja_src_get_caps(GstBaseSrc *bsrc, GstCaps *filter) {
+  GstAjaSrc *self = GST_AJA_SRC(bsrc);
+  GstCaps *caps;
+
+  if (self->device) {
+    caps = gst_ntv2_supported_caps(self->device_id);
+  } else {
+    caps = gst_pad_get_pad_template_caps(GST_BASE_SRC_PAD(self));
+  }
+
+  // Intersect with the configured video format if any to constrain the caps
+  // further.
+  if (self->video_format_setting != GST_AJA_VIDEO_FORMAT_AUTO) {
+    GstCaps *configured_caps =
+        gst_aja_video_format_to_caps(self->video_format_setting);
+
+    if (configured_caps) {
+      GstCaps *tmp;
+
+      // Remove pixel-aspect-ratio from the configured caps to allow for both
+      // widescreen and non-widescreen PAL/NTSC. It's added back by the
+      // template caps above when intersecting.
+      guint n = gst_caps_get_size(configured_caps);
+      for (guint i = 0; i < n; i++) {
+        GstStructure *s = gst_caps_get_structure(configured_caps, i);
+
+        gst_structure_remove_fields(s, "pixel-aspect-ratio", NULL);
+      }
+
+      tmp = gst_caps_intersect(caps, configured_caps);
+      gst_caps_unref(caps);
+      gst_caps_unref(configured_caps);
+      caps = tmp;
+    }
+  }
+
+  if (filter) {
+    GstCaps *tmp =
+        gst_caps_intersect_full(filter, caps, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref(caps);
+    caps = tmp;
+  }
+
+  return caps;
+}
+
+static gboolean gst_aja_src_query(GstBaseSrc *bsrc, GstQuery *query) {
+  GstAjaSrc *self = GST_AJA_SRC(bsrc);
+  gboolean ret = TRUE;
+
+  switch (GST_QUERY_TYPE(query)) {
+    case GST_QUERY_LATENCY: {
+      if (self->current_info.finfo &&
+          self->current_info.finfo->format != GST_VIDEO_FORMAT_UNKNOWN) {
+        GstClockTime min, max;
+
+        min = gst_util_uint64_scale_ceil(
+            GST_SECOND, 3 * self->current_info.fps_d, self->current_info.fps_n);
+        max = self->queue_size * min;
+
+        gst_query_set_latency(query, TRUE, min, max);
+        ret = TRUE;
+      } else {
+        ret = FALSE;
+      }
+
+      return ret;
+    }
+
+    default:
+      return GST_BASE_SRC_CLASS(parent_class)->query(bsrc, query);
+      break;
+  }
+}
+
+static gboolean gst_aja_src_unlock(GstBaseSrc *bsrc) {
+  GstAjaSrc *self = GST_AJA_SRC(bsrc);
+
+  g_mutex_lock(&self->queue_lock);
+  self->flushing = TRUE;
+  g_cond_signal(&self->queue_cond);
+  g_mutex_unlock(&self->queue_lock);
+
+  return TRUE;
+}
+
+static gboolean gst_aja_src_unlock_stop(GstBaseSrc *bsrc) {
+  GstAjaSrc *self = GST_AJA_SRC(bsrc);
+
+  g_mutex_lock(&self->queue_lock);
+  self->flushing = FALSE;
+  g_mutex_unlock(&self->queue_lock);
+
+  return TRUE;
+}
+
+static GstFlowReturn gst_aja_src_create(GstPushSrc *psrc, GstBuffer **buffer) {
+  GstAjaSrc *self = GST_AJA_SRC(psrc);
+  GstFlowReturn flow_ret = GST_FLOW_OK;
+  QueueItem item = {
+      .type = QUEUE_ITEM_TYPE_DUMMY,
+  };
+
+next_item:
+  item.type = QUEUE_ITEM_TYPE_DUMMY;
+
+  g_mutex_lock(&self->queue_lock);
+  while (gst_queue_array_is_empty(self->queue) && !self->flushing) {
+    g_cond_wait(&self->queue_cond, &self->queue_lock);
+  }
+
+  if (self->flushing) {
+    g_mutex_unlock(&self->queue_lock);
+    GST_DEBUG_OBJECT(self, "Flushing");
+    return GST_FLOW_FLUSHING;
+  }
+
+  item = *(QueueItem *)gst_queue_array_pop_head_struct(self->queue);
+  if (item.type == QUEUE_ITEM_TYPE_FRAME) {
+    self->queue_num_frames -= 1;
+  }
+  g_mutex_unlock(&self->queue_lock);
+
+  switch (item.type) {
+    case QUEUE_ITEM_TYPE_DUMMY:
+      queue_item_clear(&item);
+      goto next_item;
+    case QUEUE_ITEM_TYPE_SIGNAL_CHANGE:
+      // These are already only produced when signal status is changing
+      if (item.signal_change.have_signal) {
+        GST_ELEMENT_INFO(GST_ELEMENT(self), RESOURCE, READ,
+                         ("Signal recovered"), ("Input source detected"));
+        self->signal = TRUE;
+        g_object_notify(G_OBJECT(self), "signal");
+      } else if (!item.signal_change.have_signal) {
+        if (item.signal_change.detected_format != ::NTV2_FORMAT_UNKNOWN) {
+          std::string format_string =
+              NTV2VideoFormatToString(item.signal_change.detected_format);
+
+          GST_ELEMENT_WARNING_WITH_DETAILS(
+              GST_ELEMENT(self), RESOURCE, READ, ("Signal lost"),
+              ("Input source with different mode %s was detected",
+               format_string.c_str()),
+              ("detected-format", G_TYPE_STRING, format_string.c_str(), "vpid",
+               G_TYPE_UINT, item.signal_change.vpid, NULL));
+        } else {
+          GST_ELEMENT_WARNING(GST_ELEMENT(self), RESOURCE, READ,
+                              ("Signal lost"),
+                              ("No input source was detected"));
+        }
+        self->signal = FALSE;
+        g_object_notify(G_OBJECT(self), "signal");
+      }
+      queue_item_clear(&item);
+      goto next_item;
+    case QUEUE_ITEM_TYPE_ERROR:
+      GST_ERROR_OBJECT(self, "Stopping because of error on capture thread");
+      gst_element_post_message(GST_ELEMENT(self),
+                               (GstMessage *)g_steal_pointer(&item.error.msg));
+      queue_item_clear(&item);
+      return GST_FLOW_ERROR;
+    case QUEUE_ITEM_TYPE_FRAMES_DROPPED:
+      GST_WARNING_OBJECT(
+          self, "Dropped frames from %" GST_TIME_FORMAT " to %" GST_TIME_FORMAT,
+          GST_TIME_ARGS(item.frames_dropped.timestamp_start),
+          GST_TIME_ARGS(item.frames_dropped.timestamp_end));
+      gst_element_post_message(
+          GST_ELEMENT(self),
+          gst_message_new_qos(GST_OBJECT_CAST(self), TRUE, GST_CLOCK_TIME_NONE,
+                              GST_CLOCK_TIME_NONE,
+                              item.frames_dropped.timestamp_start,
+                              item.frames_dropped.timestamp_end -
+                                  item.frames_dropped.timestamp_start));
+      queue_item_clear(&item);
+      goto next_item;
+    case QUEUE_ITEM_TYPE_FRAME:
+      // fall through below
+      break;
+  }
+
+  g_assert(item.type == QUEUE_ITEM_TYPE_FRAME);
+
+  if (!self->signal) {
+    self->signal = TRUE;
+    g_object_notify(G_OBJECT(self), "signal");
+  }
+
+  *buffer = (GstBuffer *)g_steal_pointer(&item.frame.video_buffer);
+  gst_buffer_add_aja_audio_meta(*buffer, item.frame.audio_buffer);
+  gst_clear_buffer(&item.frame.audio_buffer);
+
+  if (item.frame.tc.IsValid()) {
+    TimecodeFormat tc_format = ::kTCFormatUnknown;
+    GstVideoTimeCodeFlags flags = GST_VIDEO_TIME_CODE_FLAGS_NONE;
+
+    if (self->configured_info.fps_n == 24 && self->configured_info.fps_d == 1) {
+      tc_format = kTCFormat24fps;
+    } else if (self->configured_info.fps_n == 25 &&
+               self->configured_info.fps_d == 1) {
+      tc_format = kTCFormat25fps;
+    } else if (self->configured_info.fps_n == 30 &&
+               self->configured_info.fps_d == 1) {
+      tc_format = kTCFormat30fps;
+    } else if (self->configured_info.fps_n == 30000 &&
+               self->configured_info.fps_d == 1001) {
+      tc_format = kTCFormat30fpsDF;
+      flags =
+          (GstVideoTimeCodeFlags)(flags | GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME);
+    } else if (self->configured_info.fps_n == 48 &&
+               self->configured_info.fps_d == 1) {
+      tc_format = kTCFormat48fps;
+    } else if (self->configured_info.fps_n == 50 &&
+               self->configured_info.fps_d == 1) {
+      tc_format = kTCFormat50fps;
+    } else if (self->configured_info.fps_n == 60 &&
+               self->configured_info.fps_d == 1) {
+      tc_format = kTCFormat60fps;
+    } else if (self->configured_info.fps_n == 60000 &&
+               self->configured_info.fps_d == 1001) {
+      tc_format = kTCFormat60fpsDF;
+      flags =
+          (GstVideoTimeCodeFlags)(flags | GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME);
+    }
+
+    if (self->configured_info.interlace_mode !=
+        GST_VIDEO_INTERLACE_MODE_PROGRESSIVE)
+      flags =
+          (GstVideoTimeCodeFlags)(flags | GST_VIDEO_TIME_CODE_FLAGS_INTERLACED);
+
+    CRP188 rp188(item.frame.tc, tc_format);
+
+    {
+      std::stringstream os;
+      os << rp188;
+      GST_TRACE_OBJECT(self, "Adding timecode %s", os.str().c_str());
+    }
+
+    guint hours, minutes, seconds, frames;
+    rp188.GetRP188Hrs(hours);
+    rp188.GetRP188Mins(minutes);
+    rp188.GetRP188Secs(seconds);
+    rp188.GetRP188Frms(frames);
+
+    GstVideoTimeCode tc;
+    gst_video_time_code_init(&tc, self->configured_info.fps_n,
+                             self->configured_info.fps_d, NULL, flags, hours,
+                             minutes, seconds, frames, 0);
+    gst_buffer_add_video_time_code_meta(*buffer, &tc);
+  }
+
+  AJAAncillaryList anc_packets;
+
+  if (item.frame.anc_buffer) {
+    GstMapInfo map = GST_MAP_INFO_INIT;
+    GstMapInfo map2 = GST_MAP_INFO_INIT;
+
+    gst_buffer_map(item.frame.anc_buffer, &map, GST_MAP_READ);
+    if (item.frame.anc_buffer2)
+      gst_buffer_map(item.frame.anc_buffer2, &map2, GST_MAP_READ);
+
+    NTV2_POINTER ptr1(map.data, map.size);
+    NTV2_POINTER ptr2(map2.data, map2.size);
+
+    AJAAncillaryList::SetFromDeviceAncBuffers(ptr1, ptr2, anc_packets);
+
+    if (item.frame.anc_buffer2) gst_buffer_unmap(item.frame.anc_buffer2, &map2);
+    gst_buffer_unmap(item.frame.anc_buffer, &map);
+  } else if (self->vanc_mode != ::NTV2_VANCMODE_OFF) {
+    GstMapInfo map;
+
+    NTV2FormatDescriptor format_desc(self->video_format, ::NTV2_FBF_10BIT_YCBCR,
+                                     self->vanc_mode);
+
+    gst_buffer_map(*buffer, &map, GST_MAP_READ);
+    NTV2_POINTER ptr(map.data, map.size);
+    AJAAncillaryList::SetFromVANCData(ptr, format_desc, anc_packets);
+    gst_buffer_unmap(*buffer, &map);
+
+    guint offset =
+        format_desc.RasterLineToByteOffset(format_desc.GetFirstActiveLine());
+    guint size = format_desc.GetVisibleRasterBytes();
+
+    gst_buffer_resize(*buffer, offset, size);
+  }
+
+  gst_clear_buffer(&item.frame.anc_buffer);
+  gst_clear_buffer(&item.frame.anc_buffer2);
+
+  // Not using CountAncillaryDataWithType(AJAAncillaryDataType_Cea708) etc
+  // here because for SD it doesn't recognize the packets. It assumes they
+  // would only be received on AJAAncillaryDataChannel_Y but for SD it is
+  // actually AJAAncillaryDataChannel_Both.
+  //
+  // See AJA SDK support ticket #4844.
+  guint32 n_vanc_packets = anc_packets.CountAncillaryData();
+
+  // Check if we have either CEA608 or CEA708 packets, or both.
+  bool have_cea608 = false;
+  bool have_cea708 = false;
+  for (guint32 i = 0; i < n_vanc_packets; i++) {
+    AJAAncillaryData *packet = anc_packets.GetAncillaryDataAtIndex(i);
+
+    if (packet->GetDID() == AJAAncillaryData_Cea608_Vanc_DID &&
+        packet->GetSID() == AJAAncillaryData_Cea608_Vanc_SID &&
+        packet->GetPayloadData() && packet->GetPayloadByteCount() &&
+        AJA_SUCCESS(packet->ParsePayloadData())) {
+      GST_TRACE_OBJECT(
+          self, "Found CEA608 VANC of %" G_GSIZE_FORMAT " bytes at line %u",
+          packet->GetPayloadByteCount(), packet->GetLocationLineNumber());
+      have_cea608 = true;
+    } else if (packet->GetDID() == AJAAncillaryData_CEA708_DID &&
+               packet->GetSID() == AJAAncillaryData_CEA708_SID &&
+               packet->GetPayloadData() && packet->GetPayloadByteCount() &&
+               AJA_SUCCESS(packet->ParsePayloadData())) {
+      GST_TRACE_OBJECT(
+          self, "Found CEA708 CDP VANC of %" G_GSIZE_FORMAT " bytes at line %u",
+          packet->GetPayloadByteCount(), packet->GetLocationLineNumber());
+      have_cea708 = true;
+    }
+  }
+
+  // Decide based on the closed-caption-capture-mode property and closed
+  // caption availability which ones to add as metadata to the output buffer.
+  bool want_cea608 =
+      have_cea608 &&
+      (self->closed_caption_capture_mode ==
+           GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_AND_CEA608 ||
+       self->closed_caption_capture_mode ==
+           GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA608_OR_CEA708 ||
+       self->closed_caption_capture_mode ==
+           GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA608_ONLY ||
+       (!have_cea708 &&
+        self->closed_caption_capture_mode ==
+            GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_OR_CEA608));
+
+  bool want_cea708 =
+      have_cea708 &&
+      (self->closed_caption_capture_mode ==
+           GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_AND_CEA608 ||
+       self->closed_caption_capture_mode ==
+           GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_OR_CEA608 ||
+       self->closed_caption_capture_mode ==
+           GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA708_ONLY ||
+       (!have_cea608 &&
+        self->closed_caption_capture_mode ==
+            GST_AJA_CLOSED_CAPTION_CAPTURE_MODE_CEA608_OR_CEA708));
+
+  bool aspect_ratio_flag = false;
+  bool have_afd_bar = false;
+  for (guint32 i = 0; i < n_vanc_packets; i++) {
+    AJAAncillaryData *packet = anc_packets.GetAncillaryDataAtIndex(i);
+
+    if (want_cea608 && packet->GetDID() == AJAAncillaryData_Cea608_Vanc_DID &&
+        packet->GetSID() == AJAAncillaryData_Cea608_Vanc_SID &&
+        packet->GetPayloadData() && packet->GetPayloadByteCount() &&
+        AJA_SUCCESS(packet->ParsePayloadData())) {
+      GST_TRACE_OBJECT(
+          self, "Adding CEA608 VANC of %" G_GSIZE_FORMAT " bytes at line %u",
+          packet->GetPayloadByteCount(), packet->GetLocationLineNumber());
+      gst_buffer_add_video_caption_meta(
+          *buffer, GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A,
+          packet->GetPayloadData(), packet->GetPayloadByteCount());
+    } else if (want_cea708 && packet->GetDID() == AJAAncillaryData_CEA708_DID &&
+               packet->GetSID() == AJAAncillaryData_CEA708_SID &&
+               packet->GetPayloadData() && packet->GetPayloadByteCount() &&
+               AJA_SUCCESS(packet->ParsePayloadData())) {
+      GST_TRACE_OBJECT(
+          self,
+          "Adding CEA708 CDP VANC of %" G_GSIZE_FORMAT " bytes at line %u",
+          packet->GetPayloadByteCount(), packet->GetLocationLineNumber());
+      gst_buffer_add_video_caption_meta(
+          *buffer, GST_VIDEO_CAPTION_TYPE_CEA708_CDP, packet->GetPayloadData(),
+          packet->GetPayloadByteCount());
+    } else if (packet->GetDID() == 0x41 && packet->GetSID() == 0x05 &&
+               packet->GetPayloadData() && packet->GetPayloadByteCount() == 8) {
+      const guint8 *data = packet->GetPayloadData();
+
+      have_afd_bar = true;
+      aspect_ratio_flag = (data0 >> 2) & 0x1;
+
+      GstVideoAFDValue afd = (GstVideoAFDValue)((data0 >> 3) & 0xf);
+      gboolean is_letterbox = ((data3 >> 4) & 0x3) == 0;
+      guint16 bar1 = GST_READ_UINT16_BE(&data4);
+      guint16 bar2 = GST_READ_UINT16_BE(&data6);
+
+      GST_TRACE_OBJECT(self,
+                       "Found AFD/Bar VANC at line %u: AR %u, AFD %u, "
+                       "letterbox %u, bar1 %u, bar2 %u",
+                       packet->GetLocationLineNumber(), aspect_ratio_flag, afd,
+                       is_letterbox, bar1, bar2);
+
+      const NTV2Standard standard(
+          ::GetNTV2StandardFromVideoFormat(item.frame.detected_format));
+      const NTV2SmpteLineNumber smpte_line_num_info =
+          ::GetSmpteLineNumber(standard);
+      bool field2 =
+          packet->GetLocationLineNumber() >
+          smpte_line_num_info.GetLastLine(
+              smpte_line_num_info.firstFieldTop ? NTV2_FIELD0 : NTV2_FIELD1);
+
+      gst_buffer_add_video_afd_meta(*buffer, field2 ? 1 : 0,
+                                    GST_VIDEO_AFD_SPEC_SMPTE_ST2016_1, afd);
+      gst_buffer_add_video_bar_meta(*buffer, field2 ? 1 : 0, is_letterbox, bar1,
+                                    bar2);
+    }
+
+    // Don't attach other ANC as ancillary meta if not requested to do so.
+    if (!self->attach_ancillary_meta) continue;
+
+    // Skip non-SMPTE 291M ancillary data
+    if (packet->GetDataCoding() != AJAAncillaryDataCoding_Digital) continue;
+
+    const guint8 *in_data = packet->GetPayloadData();
+    guint data_count = packet->GetDC();
+
+    guint16 line_number = packet->GetLocationLineNumber();
+    guint16 horiz_offset = packet->GetLocationHorizOffset();
+
+    if (!in_data || data_count == 0) {
+      GST_TRACE_OBJECT(self, "ANC %s (%04x) at (%u,%u) has no payload data",
+                       packet->IDAsString().c_str(), packet->GetDIDSID(),
+                       line_number, horiz_offset);
+      continue;
+    }
+
+    GST_TRACE_OBJECT(self,
+                     "Adding ANC meta for %s (%04x) at (%u,%u) of size %u",
+                     packet->IDAsString().c_str(), packet->GetDIDSID(),
+                     line_number, horiz_offset, data_count);
+    GstAncillaryMeta *anc_meta = gst_buffer_add_ancillary_meta(*buffer);
+
+    anc_meta->c_not_y_channel = packet->IsChromaChannel();
+    anc_meta->line = line_number;
+    anc_meta->offset = horiz_offset;
+
+    packet->GeneratePayloadData();
+    anc_meta->DID = AJAAncillaryData::AddEvenParity(packet->GetDID());
+    anc_meta->SDID_block_number =
+        AJAAncillaryData::AddEvenParity(packet->GetSID());
+
+    anc_meta->data_count = AJAAncillaryData::AddEvenParity(data_count);
+
+    guint16 *data = g_new(guint16, packet->GetDC());
+    for (guint i = 0; i < data_count; i++) {
+      datai = AJAAncillaryData::AddEvenParity(in_datai);
+    }
+    anc_meta->data = data;
+
+    anc_meta->checksum = packet->Calculate9BitChecksum();
+  }
+
+  bool caps_changed = false;
+
+  CNTV2VPID vpid(item.frame.vpid);
+  if (vpid.IsValid()) {
+    GstVideoInfo info;
+
+    {
+      std::stringstream os;
+      vpid.Print(os);
+      GST_TRACE_OBJECT(self, "Got valid VPID %s", os.str().c_str());
+    }
+
+    if (gst_video_info_from_ntv2_video_format(&info,
+                                              item.frame.detected_format)) {
+      switch (vpid.GetTransferCharacteristics()) {
+        default:
+        case NTV2_VPID_TC_SDR_TV:
+          if (info.height < 720) {
+            info.colorimetry.transfer = GST_VIDEO_TRANSFER_BT601;
+          } else {
+            info.colorimetry.transfer = GST_VIDEO_TRANSFER_BT709;
+          }
+          break;
+        case NTV2_VPID_TC_HLG:
+          info.colorimetry.transfer = GST_VIDEO_TRANSFER_ARIB_STD_B67;
+          break;
+        case NTV2_VPID_TC_PQ:
+          info.colorimetry.transfer = GST_VIDEO_TRANSFER_SMPTE2084;
+          break;
+      }
+
+      switch (vpid.GetColorimetry()) {
+        case NTV2_VPID_Color_Rec709:
+          info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
+          info.colorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_BT709;
+          break;
+        case NTV2_VPID_Color_UHDTV:
+          info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT2020;
+          info.colorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_BT2020;
+          break;
+        default:
+          // Default handling
+          break;
+      }
+
+      switch (vpid.GetRGBRange()) {
+        case NTV2_VPID_Range_Full:
+          info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
+          break;
+        case NTV2_VPID_Range_Narrow:
+          info.colorimetry.range = GST_VIDEO_COLOR_RANGE_16_235;
+          break;
+      }
+
+      if (!have_afd_bar && vpid.GetImageAspect16x9()) aspect_ratio_flag = true;
+
+      // Widescreen PAL/NTSC
+      if (aspect_ratio_flag && info.height == 486) {
+        info.par_n = 40;
+        info.par_d = 33;
+      } else if (aspect_ratio_flag && info.height == 576) {
+        info.par_n = 16;
+        info.par_d = 11;
+      }
+
+      if (!gst_pad_has_current_caps(GST_BASE_SRC_PAD(self)) ||
+          !gst_video_info_is_equal(&info, &self->current_info)) {
+        self->current_info = info;
+        caps_changed = true;
+      }
+    }
+  } else {
+    GstVideoInfo info;
+
+    if (gst_video_info_from_ntv2_video_format(&info,
+                                              item.frame.detected_format)) {
+      // Widescreen PAL/NTSC
+      if (aspect_ratio_flag && info.height == 486) {
+        info.par_n = 40;
+        info.par_d = 33;
+      } else if (aspect_ratio_flag && info.height == 576) {
+        info.par_n = 16;
+        info.par_d = 11;
+      }
+
+      if (!gst_pad_has_current_caps(GST_BASE_SRC_PAD(self)) ||
+          !gst_video_info_is_equal(&info, &self->current_info)) {
+        self->current_info = info;
+        caps_changed = true;
+      }
+    } else if (!gst_pad_has_current_caps(GST_BASE_SRC_PAD(self))) {
+      self->current_info = self->configured_info;
+
+      // Widescreen PAL/NTSC
+      if (aspect_ratio_flag && self->current_info.height == 486) {
+        self->current_info.par_n = 40;
+        self->current_info.par_d = 33;
+      } else if (aspect_ratio_flag && self->current_info.height == 576) {
+        self->current_info.par_n = 16;
+        self->current_info.par_d = 11;
+      }
+
+      caps_changed = true;
+    }
+  }
+
+  if (caps_changed) {
+    GstCaps *caps = gst_video_info_to_caps(&self->current_info);
+    gst_caps_set_simple(caps, "audio-channels", G_TYPE_INT,
+                        self->configured_audio_channels, NULL);
+    GST_DEBUG_OBJECT(self, "Configuring caps %" GST_PTR_FORMAT, caps);
+    gst_base_src_set_caps(GST_BASE_SRC_CAST(self), caps);
+    gst_caps_unref(caps);
+  }
+
+  if (self->configured_info.interlace_mode !=
+      GST_VIDEO_INTERLACE_MODE_PROGRESSIVE) {
+    GST_BUFFER_FLAG_SET(*buffer, GST_VIDEO_BUFFER_FLAG_INTERLACED);
+    switch (GST_VIDEO_INFO_FIELD_ORDER(&self->configured_info)) {
+      case GST_VIDEO_FIELD_ORDER_TOP_FIELD_FIRST:
+        GST_BUFFER_FLAG_SET(*buffer, GST_VIDEO_BUFFER_FLAG_TFF);
+      default:
+        break;
+    }
+  }
+
+  queue_item_clear(&item);
+
+  GST_TRACE_OBJECT(self, "Outputting buffer %" GST_PTR_FORMAT, *buffer);
+
+  return flow_ret;
+}
+
+#define AJA_SRC_ERROR(el, domain, code, text, debug)                        \
+  G_STMT_START {                                                            \
+    gchar *__txt = _gst_element_error_printf text;                          \
+    gchar *__dbg = _gst_element_error_printf debug;                         \
+    GstMessage *__msg;                                                      \
+    GError *__err;                                                          \
+    gchar *__name, *__fmt_dbg;                                              \
+    if (__txt) GST_WARNING_OBJECT(el, "error: %s", __txt);                  \
+    if (__dbg) GST_WARNING_OBJECT(el, "error: %s", __dbg);                  \
+    if (!__txt)                                                             \
+      __txt = gst_error_get_message(GST_##domain##_ERROR,                   \
+                                    GST_##domain##_ERROR_##code);           \
+    __err = g_error_new_literal(GST_##domain##_ERROR,                       \
+                                GST_##domain##_ERROR_##code, __txt);        \
+    __name = gst_object_get_path_string(GST_OBJECT_CAST(el));               \
+    if (__dbg)                                                              \
+      __fmt_dbg = g_strdup_printf("%s(%d): %s (): %s:\n%s", __FILE__,       \
+                                  __LINE__, GST_FUNCTION, __name, __dbg);   \
+    else                                                                    \
+      __fmt_dbg = g_strdup_printf("%s(%d): %s (): %s", __FILE__, __LINE__,  \
+                                  GST_FUNCTION, __name);                    \
+    g_free(__name);                                                         \
+    g_free(__dbg);                                                          \
+    __msg = gst_message_new_error(GST_OBJECT(el), __err, __fmt_dbg);        \
+    QueueItem item = {.type = QUEUE_ITEM_TYPE_ERROR, .error{.msg = __msg}}; \
+    gst_queue_array_push_tail_struct(el->queue, &item);                     \
+    g_cond_signal(&el->queue_cond);                                         \
+  }                                                                         \
+  G_STMT_END;
+
+static void capture_thread_func(AJAThread *thread, void *data) {
+  GstAjaSrc *self = GST_AJA_SRC(data);
+  GstClock *clock = NULL;
+  AUTOCIRCULATE_TRANSFER transfer;
+  guint64 frames_dropped_last = G_MAXUINT64;
+  gboolean have_signal = TRUE, discont = TRUE;
+  guint iterations_without_frame = 0;
+  NTV2VideoFormat last_detected_video_format = ::NTV2_FORMAT_UNKNOWN;
+
+  if (self->capture_cpu_core != G_MAXUINT) {
+    cpu_set_t mask;
+    pthread_t current_thread = pthread_self();
+
+    CPU_ZERO(&mask);
+    CPU_SET(self->capture_cpu_core, &mask);
+
+    if (pthread_setaffinity_np(current_thread, sizeof(mask), &mask) != 0) {
+      GST_ERROR_OBJECT(self,
+                       "Failed to set affinity for current thread to core %u",
+                       self->capture_cpu_core);
+    }
+  }
+
+  g_mutex_lock(&self->queue_lock);
+restart:
+  GST_DEBUG_OBJECT(self, "Waiting for playing or shutdown");
+  while (!self->playing && !self->shutdown)
+    g_cond_wait(&self->queue_cond, &self->queue_lock);
+  if (self->shutdown) {
+    GST_DEBUG_OBJECT(self, "Shutting down");
+    g_mutex_unlock(&self->queue_lock);
+    return;
+  }
+
+  GST_DEBUG_OBJECT(self, "Starting capture");
+  g_mutex_unlock(&self->queue_lock);
+
+  gst_clear_object(&clock);
+  clock = gst_element_get_clock(GST_ELEMENT_CAST(self));
+
+  frames_dropped_last = G_MAXUINT64;
+  have_signal = TRUE;
+
+  g_mutex_lock(&self->queue_lock);
+  while (self->playing && !self->shutdown) {
+    // If we don't have a video format configured, configure the device now
+    // and potentially auto-detect the video format
+    if (self->video_format == NTV2_FORMAT_UNKNOWN) {
+      // Don't keep queue locked while configuring as this might take a while
+      g_mutex_unlock(&self->queue_lock);
+
+      // Make sure to globally lock here as the routing settings and others are
+      // global shared state
+      GstAjaNtv2DeviceLocker locker(self->device);
+
+      if (!gst_aja_src_configure(self)) {
+        g_mutex_lock(&self->queue_lock);
+        AJA_SRC_ERROR(self, STREAM, FAILED, (NULL),
+                      ("Failed to configure device"));
+        goto out;
+      }
+      g_mutex_lock(&self->queue_lock);
+
+      if (!self->playing || self->shutdown) goto restart;
+
+      if (self->video_format == ::NTV2_FORMAT_UNKNOWN) {
+        GST_DEBUG_OBJECT(self, "No signal, waiting");
+        frames_dropped_last = G_MAXUINT64;
+        if (have_signal) {
+          QueueItem item = {
+              .type = QUEUE_ITEM_TYPE_SIGNAL_CHANGE,
+              .signal_change = {.have_signal = FALSE,
+                                .detected_format = ::NTV2_FORMAT_UNKNOWN,
+                                .vpid = 0}};
+          gst_queue_array_push_tail_struct(self->queue, &item);
+          g_cond_signal(&self->queue_cond);
+          have_signal = FALSE;
+          discont = TRUE;
+        }
+        self->device->device->WaitForInputVerticalInterrupt(self->channel);
+        continue;
+      }
+
+      guint16 start_frame = self->start_frame;
+      guint16 end_frame = self->end_frame;
+
+      // If both are set to the same value, try to find that many unallocated
+      // frames and use those.
+      if (start_frame == end_frame) {
+        gint assigned_start_frame = gst_aja_ntv2_device_find_unallocated_frames(
+            self->device, self->channel, self->start_frame);
+
+        if (assigned_start_frame == -1) {
+          AJA_SRC_ERROR(self, STREAM, FAILED, (NULL),
+                        ("Failed to allocate %u frames", start_frame));
+          goto out;
+        }
+
+        start_frame = assigned_start_frame;
+        end_frame = start_frame + self->start_frame - 1;
+      }
+
+      GST_DEBUG_OBJECT(
+          self, "Configuring channel %u with start frame %u and end frame %u",
+          self->channel, start_frame, end_frame);
+
+      if (!self->device->device->AutoCirculateInitForInput(
+              self->channel, 0, self->audio_system,
+              (self->rp188 ? AUTOCIRCULATE_WITH_RP188 : 0) |
+                  (self->vanc_mode == ::NTV2_VANCMODE_OFF
+                       ? AUTOCIRCULATE_WITH_ANC
+                       : 0),
+              1, start_frame, end_frame)) {
+        AJA_SRC_ERROR(self, STREAM, FAILED, (NULL),
+                      ("Failed to initialize autocirculate"));
+        goto out;
+      }
+
+      self->device->device->AutoCirculateStart(self->channel);
+    }
+
+    // Check for valid signal first
+    NTV2VideoFormat current_video_format =
+        self->device->device->GetInputVideoFormat(
+            self->configured_input_source);
+
+    bool all_quads_equal = true;
+    if (self->quad_mode) {
+      for (int i = 1; i < 4; i++) {
+        NTV2VideoFormat other_video_format =
+            self->device->device->GetInputVideoFormat(
+                (NTV2InputSource)(self->configured_input_source + i));
+        if (other_video_format != current_video_format) {
+          std::string current_string =
+              NTV2VideoFormatToString(current_video_format);
+          std::string other_string =
+              NTV2VideoFormatToString(other_video_format);
+          GST_DEBUG_OBJECT(
+              self,
+              "Not all quadrants had the same format in "
+              "quad-link-mode: %s (%d) on input 1 vs. %s (%d) on input %d",
+              current_string.c_str(), current_video_format,
+              other_string.c_str(), other_video_format, i + 1);
+          all_quads_equal = false;
+          break;
+        }
+      }
+    }
+
+    ULWord vpid_a = 0;
+    ULWord vpid_b = 0;
+    self->device->device->ReadSDIInVPID(self->channel, vpid_a, vpid_b);
+
+    {
+      std::string current_string =
+          NTV2VideoFormatToString(current_video_format);
+      GST_TRACE_OBJECT(
+          self, "Detected input video format %s (%d) with VPID %08x / %08x",
+          current_string.c_str(), (int)current_video_format, vpid_a, vpid_b);
+    }
+
+    NTV2VideoFormat effective_video_format = self->video_format;
+    // Can't call this unconditionally as it also maps e.g. 3840x2160p to 1080p
+    if (self->quad_mode) {
+      effective_video_format =
+          ::GetQuarterSizedVideoFormat(effective_video_format);
+    }
+    switch (self->video_format) {
+      case NTV2_FORMAT_1080psf_2500_2:
+        if (current_video_format == NTV2_FORMAT_1080i_5000)
+          current_video_format = NTV2_FORMAT_1080psf_2500_2;
+        break;
+      case NTV2_FORMAT_1080psf_2997_2:
+        if (current_video_format == NTV2_FORMAT_1080i_5994)
+          current_video_format = NTV2_FORMAT_1080psf_2997_2;
+        break;
+      case NTV2_FORMAT_1080psf_3000_2:
+        if (current_video_format == NTV2_FORMAT_1080i_6000)
+          current_video_format = NTV2_FORMAT_1080psf_3000_2;
+        break;
+      default:
+        break;
+    }
+
+    if (current_video_format == ::NTV2_FORMAT_UNKNOWN || !all_quads_equal) {
+      if (self->video_format_setting == GST_AJA_VIDEO_FORMAT_AUTO)
+        self->video_format = NTV2_FORMAT_UNKNOWN;
+
+      GST_DEBUG_OBJECT(self, "No signal, waiting");
+      g_mutex_unlock(&self->queue_lock);
+      frames_dropped_last = G_MAXUINT64;
+      if (have_signal) {
+        QueueItem item = {
+            .type = QUEUE_ITEM_TYPE_SIGNAL_CHANGE,
+            .signal_change = {.have_signal = FALSE,
+                              .detected_format = ::NTV2_FORMAT_UNKNOWN,
+                              .vpid = 0}};
+        last_detected_video_format = ::NTV2_FORMAT_UNKNOWN;
+        gst_queue_array_push_tail_struct(self->queue, &item);
+        g_cond_signal(&self->queue_cond);
+        have_signal = FALSE;
+        discont = TRUE;
+      }
+      self->device->device->WaitForInputVerticalInterrupt(self->channel);
+      g_mutex_lock(&self->queue_lock);
+      continue;
+    } else if (current_video_format != effective_video_format &&
+               current_video_format != self->video_format) {
+      // Try reconfiguring with the newly detected video format
+      if (self->video_format_setting == GST_AJA_VIDEO_FORMAT_AUTO) {
+        self->video_format = NTV2_FORMAT_UNKNOWN;
+        continue;
+      }
+
+      std::string current_string =
+          NTV2VideoFormatToString(current_video_format);
+      std::string configured_string =
+          NTV2VideoFormatToString(self->video_format);
+      std::string effective_string =
+          NTV2VideoFormatToString(effective_video_format);
+
+      GST_DEBUG_OBJECT(self,
+                       "Different input format %s than configured %s "
+                       "(effective %s), waiting",
+                       current_string.c_str(), configured_string.c_str(),
+                       effective_string.c_str());
+      g_mutex_unlock(&self->queue_lock);
+      frames_dropped_last = G_MAXUINT64;
+      if (have_signal || current_video_format != last_detected_video_format) {
+        QueueItem item = {
+            .type = QUEUE_ITEM_TYPE_SIGNAL_CHANGE,
+            .signal_change = {.have_signal = FALSE,
+                              .detected_format = current_video_format,
+                              .vpid = vpid_a}};
+        last_detected_video_format = current_video_format;
+        gst_queue_array_push_tail_struct(self->queue, &item);
+        g_cond_signal(&self->queue_cond);
+        have_signal = FALSE;
+        discont = TRUE;
+      }
+      self->device->device->WaitForInputVerticalInterrupt(self->channel);
+      g_mutex_lock(&self->queue_lock);
+      continue;
+    }
+
+    AUTOCIRCULATE_STATUS status;
+
+    self->device->device->AutoCirculateGetStatus(self->channel, status);
+
+    GST_TRACE_OBJECT(self,
+                     "Start frame %d "
+                     "end frame %d "
+                     "active frame %d "
+                     "start time %" G_GUINT64_FORMAT
+                     " "
+                     "current time %" G_GUINT64_FORMAT
+                     " "
+                     "frames processed %u "
+                     "frames dropped %u "
+                     "buffer level %u",
+                     status.acStartFrame, status.acEndFrame,
+                     status.acActiveFrame, status.acRDTSCStartTime,
+                     status.acRDTSCCurrentTime, status.acFramesProcessed,
+                     status.acFramesDropped, status.acBufferLevel);
+
+    if (frames_dropped_last == G_MAXUINT64) {
+      frames_dropped_last = status.acFramesDropped;
+    } else if (frames_dropped_last < status.acFramesDropped) {
+      GST_WARNING_OBJECT(self, "Dropped %" G_GUINT64_FORMAT " frames",
+                         status.acFramesDropped - frames_dropped_last);
+
+      GstClockTime timestamp =
+          gst_util_uint64_scale(status.acFramesProcessed + frames_dropped_last,
+                                self->configured_info.fps_n,
+                                self->configured_info.fps_d * GST_SECOND);
+      GstClockTime timestamp_end = gst_util_uint64_scale(
+          status.acFramesProcessed + status.acFramesDropped,
+          self->configured_info.fps_n,
+          self->configured_info.fps_d * GST_SECOND);
+
+      QueueItem item = {.type = QUEUE_ITEM_TYPE_FRAMES_DROPPED,
+                        .frames_dropped = {.driver_side = TRUE,
+                                           .timestamp_start = timestamp,
+                                           .timestamp_end = timestamp_end}};
+      gst_queue_array_push_tail_struct(self->queue, &item);
+      g_cond_signal(&self->queue_cond);
+
+      frames_dropped_last = status.acFramesDropped;
+      discont = TRUE;
+    }
+
+    if (status.IsRunning() && status.acBufferLevel > 1) {
+      GstBuffer *video_buffer = NULL;
+      GstBuffer *audio_buffer = NULL;
+      GstBuffer *anc_buffer = NULL, *anc_buffer2 = NULL;
+      GstMapInfo video_map = GST_MAP_INFO_INIT;
+      GstMapInfo audio_map = GST_MAP_INFO_INIT;
+      GstMapInfo anc_map = GST_MAP_INFO_INIT;
+      GstMapInfo anc_map2 = GST_MAP_INFO_INIT;
+      AUTOCIRCULATE_TRANSFER transfer;
+
+      if (!have_signal) {
+        QueueItem item = {
+            .type = QUEUE_ITEM_TYPE_SIGNAL_CHANGE,
+            .signal_change = {.have_signal = TRUE,
+                              .detected_format = current_video_format,
+                              .vpid = vpid_a}};
+        gst_queue_array_push_tail_struct(self->queue, &item);
+        g_cond_signal(&self->queue_cond);
+        have_signal = TRUE;
+      }
+
+      iterations_without_frame = 0;
+
+      if (gst_buffer_pool_acquire_buffer(self->buffer_pool, &video_buffer,
+                                         NULL) != GST_FLOW_OK) {
+        AJA_SRC_ERROR(self, STREAM, FAILED, (NULL),
+                      ("Failed to acquire video buffer"));
+        break;
+      }
+
+      if (gst_buffer_pool_acquire_buffer(self->audio_buffer_pool, &audio_buffer,
+                                         NULL) != GST_FLOW_OK) {
+        gst_buffer_unref(video_buffer);
+        AJA_SRC_ERROR(self, STREAM, FAILED, (NULL),
+                      ("Failed to acquire audio buffer"));
+        break;
+      }
+
+      if (self->vanc_mode == ::NTV2_VANCMODE_OFF &&
+          ::NTV2DeviceCanDoCustomAnc(self->device_id)) {
+        if (gst_buffer_pool_acquire_buffer(self->anc_buffer_pool, &anc_buffer,
+                                           NULL) != GST_FLOW_OK) {
+          gst_buffer_unref(audio_buffer);
+          gst_buffer_unref(video_buffer);
+          AJA_SRC_ERROR(self, STREAM, FAILED, (NULL),
+                        ("Failed to acquire anc buffer"));
+          break;
+        }
+
+        if (self->configured_info.interlace_mode !=
+            GST_VIDEO_INTERLACE_MODE_PROGRESSIVE) {
+          if (gst_buffer_pool_acquire_buffer(
+                  self->anc_buffer_pool, &anc_buffer2, NULL) != GST_FLOW_OK) {
+            gst_buffer_unref(anc_buffer);
+            gst_buffer_unref(audio_buffer);
+            gst_buffer_unref(video_buffer);
+            AJA_SRC_ERROR(self, STREAM, FAILED, (NULL),
+                          ("Failed to acquire anc buffer"));
+            break;
+          }
+        }
+      }
+
+      gst_buffer_map(video_buffer, &video_map, GST_MAP_READWRITE);
+      gst_buffer_map(audio_buffer, &audio_map, GST_MAP_READWRITE);
+      if (anc_buffer) gst_buffer_map(anc_buffer, &anc_map, GST_MAP_READWRITE);
+      if (anc_buffer2)
+        gst_buffer_map(anc_buffer2, &anc_map2, GST_MAP_READWRITE);
+
+      transfer.acFrameBufferFormat = ::NTV2_FBF_10BIT_YCBCR;
+
+      transfer.SetVideoBuffer((ULWord *)video_map.data, video_map.size);
+      transfer.SetAudioBuffer((ULWord *)audio_map.data, audio_map.size);
+      transfer.SetAncBuffers((ULWord *)anc_map.data, anc_map.size,
+                             (ULWord *)anc_map2.data, anc_map2.size);
+
+      g_mutex_unlock(&self->queue_lock);
+
+      bool transfered = true;
+      if (!self->device->device->AutoCirculateTransfer(self->channel,
+                                                       transfer)) {
+        GST_WARNING_OBJECT(self, "Failed to transfer frame");
+        transfered = false;
+      }
+
+      if (anc_buffer2) gst_buffer_unmap(anc_buffer2, &anc_map2);
+      if (anc_buffer) gst_buffer_unmap(anc_buffer, &anc_map);
+      gst_buffer_unmap(audio_buffer, &audio_map);
+      gst_buffer_unmap(video_buffer, &video_map);
+
+      g_mutex_lock(&self->queue_lock);
+
+      if (!transfered) {
+        gst_clear_buffer(&anc_buffer2);
+        gst_clear_buffer(&anc_buffer);
+        gst_clear_buffer(&audio_buffer);
+        gst_clear_buffer(&video_buffer);
+        continue;
+      }
+
+      gst_buffer_set_size(audio_buffer, transfer.GetCapturedAudioByteCount());
+      if (anc_buffer)
+        gst_buffer_set_size(anc_buffer,
+                            transfer.GetCapturedAncByteCount(false));
+      if (anc_buffer2)
+        gst_buffer_set_size(anc_buffer2,
+                            transfer.GetCapturedAncByteCount(true));
+
+      NTV2TCIndex tc_index;
+      switch (self->timecode_index) {
+        case GST_AJA_TIMECODE_INDEX_VITC:
+          tc_index = ::NTV2InputSourceToTimecodeIndex(
+              self->configured_input_source, true);
+          break;
+        case GST_AJA_TIMECODE_INDEX_ATC_LTC:
+          tc_index = ::NTV2InputSourceToTimecodeIndex(
+              self->configured_input_source, false);
+          break;
+        case GST_AJA_TIMECODE_INDEX_LTC1:
+          tc_index = ::NTV2_TCINDEX_LTC1;
+          break;
+        case GST_AJA_TIMECODE_INDEX_LTC2:
+          tc_index = ::NTV2_TCINDEX_LTC2;
+          break;
+        default:
+          g_assert_not_reached();
+          break;
+      }
+
+      NTV2_RP188 time_code;
+      transfer.acTransferStatus.acFrameStamp.GetInputTimeCode(time_code,
+                                                              tc_index);
+
+      gint64 frame_time = transfer.acTransferStatus.acFrameStamp.acFrameTime;
+      gint64 now_sys = g_get_real_time();
+      GstClockTime now_gst = gst_clock_get_time(clock);
+      if (now_sys * 10 > frame_time) {
+        GstClockTime diff = now_sys * 1000 - frame_time * 100;
+        if (now_gst > diff)
+          now_gst -= diff;
+        else
+          now_gst = 0;
+      }
+
+      GstClockTime base_time =
+          gst_element_get_base_time(GST_ELEMENT_CAST(self));
+      if (now_gst > base_time)
+        now_gst -= base_time;
+      else
+        now_gst = 0;
+
+      // TODO: Drift detection and compensation
+      GST_BUFFER_PTS(video_buffer) = now_gst;
+      GST_BUFFER_DURATION(video_buffer) = gst_util_uint64_scale(
+          GST_SECOND, self->configured_info.fps_d, self->configured_info.fps_n);
+      GST_BUFFER_PTS(audio_buffer) = now_gst;
+      GST_BUFFER_DURATION(audio_buffer) = gst_util_uint64_scale(
+          GST_SECOND, self->configured_info.fps_d, self->configured_info.fps_n);
+
+      while (self->queue_num_frames >= self->queue_size) {
+        guint n = gst_queue_array_get_length(self->queue);
+
+        for (guint i = 0; i < n; i++) {
+          QueueItem *tmp =
+              (QueueItem *)gst_queue_array_peek_nth_struct(self->queue, i);
+          if (tmp->type == QUEUE_ITEM_TYPE_FRAME) {
+            GST_WARNING_OBJECT(self,
+                               "Element queue overrun, dropping old frame");
+
+            QueueItem item = {
+                .type = QUEUE_ITEM_TYPE_FRAMES_DROPPED,
+                .frames_dropped = {
+                    .driver_side = FALSE,
+                    .timestamp_start = tmp->frame.capture_time,
+                    .timestamp_end =
+                        tmp->frame.capture_time +
+                        gst_util_uint64_scale(GST_SECOND,
+                                              self->configured_info.fps_d,
+                                              self->configured_info.fps_n)}};
+            queue_item_clear(tmp);
+            gst_queue_array_drop_struct(self->queue, i, NULL);
+            gst_queue_array_push_tail_struct(self->queue, &item);
+            self->queue_num_frames -= 1;
+            discont = TRUE;
+            g_cond_signal(&self->queue_cond);
+            break;
+          }
+        }
+      }
+
+      if (discont) {
+        GST_BUFFER_FLAG_SET(video_buffer, GST_BUFFER_FLAG_DISCONT);
+        GST_BUFFER_FLAG_SET(audio_buffer, GST_BUFFER_FLAG_DISCONT);
+        discont = FALSE;
+      }
+
+      QueueItem item = {
+          .type = QUEUE_ITEM_TYPE_FRAME,
+          .frame = {.capture_time = now_gst,
+                    .video_buffer = video_buffer,
+                    .audio_buffer = audio_buffer,
+                    .anc_buffer = anc_buffer,
+                    .anc_buffer2 = anc_buffer2,
+                    .tc = time_code,
+                    .detected_format =
+                        (self->quad_mode
+                             ? ::GetQuadSizedVideoFormat(current_video_format)
+                             : current_video_format),
+                    .vpid = vpid_a}};
+
+      GST_TRACE_OBJECT(self, "Queuing frame %" GST_TIME_FORMAT,
+                       GST_TIME_ARGS(now_gst));
+      gst_queue_array_push_tail_struct(self->queue, &item);
+      self->queue_num_frames += 1;
+      GST_TRACE_OBJECT(self, "%u frames queued", self->queue_num_frames);
+      g_cond_signal(&self->queue_cond);
+    } else {
+      g_mutex_unlock(&self->queue_lock);
+
+      // If we don't have a frame for 32 iterations (512ms) then consider
+      // this as signal loss too even if the driver still reports the
+      // expected mode above
+      if (have_signal && iterations_without_frame < 32) {
+        iterations_without_frame++;
+      } else {
+        frames_dropped_last = G_MAXUINT64;
+        if (have_signal || last_detected_video_format != current_video_format) {
+          QueueItem item = {
+              .type = QUEUE_ITEM_TYPE_SIGNAL_CHANGE,
+              .signal_change = {.have_signal = TRUE,
+                                .detected_format = current_video_format,
+                                .vpid = vpid_a}};
+          last_detected_video_format = current_video_format;
+          gst_queue_array_push_tail_struct(self->queue, &item);
+          g_cond_signal(&self->queue_cond);
+          have_signal = FALSE;
+          discont = TRUE;
+        }
+      }
+
+      self->device->device->WaitForInputVerticalInterrupt(self->channel);
+
+      g_mutex_lock(&self->queue_lock);
+    }
+  }
+
+out: {
+  // Make sure to globally lock here as the routing settings and others are
+  // global shared state
+  GstAjaNtv2DeviceLocker locker(self->device);
+
+  self->device->device->AutoCirculateStop(self->channel);
+  self->device->device->UnsubscribeInputVerticalEvent(self->channel);
+  self->device->device->DisableInputInterrupt(self->channel);
+
+  self->device->device->DisableChannel(self->channel);
+  if (self->quad_mode) {
+    for (int i = 1; i < 4; i++) {
+      self->device->device->DisableChannel((NTV2Channel)(self->channel + i));
+    }
+  }
+}
+
+  if (!self->playing && !self->shutdown) goto restart;
+  g_mutex_unlock(&self->queue_lock);
+
+  gst_clear_object(&clock);
+
+  GST_DEBUG_OBJECT(self, "Stopped");
+}

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajasrc.h Added

@@ -0,0 +1,103 @@
+/* GStreamer
+ * Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/base/base.h>
+#include <gst/gst.h>
+#include <gst/video/video.h>
+
+#include "gstajacommon.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_AJA_SRC (gst_aja_src_get_type())
+#define GST_AJA_SRC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AJA_SRC, GstAjaSrc))
+#define GST_AJA_SRC_CAST(obj) ((GstAjaSrc *)obj)
+#define GST_AJA_SRC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AJA_SRC, GstAjaSrcClass))
+#define GST_IS_AJA_SRC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AJA_SRC))
+#define GST_IS_AJA_SRC_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AJA_SRC))
+
+typedef struct _GstAjaSrc GstAjaSrc;
+typedef struct _GstAjaSrcClass GstAjaSrcClass;
+
+struct _GstAjaSrc {
+  GstPushSrc parent;
+
+  // Everything below protected by queue lock
+  GMutex queue_lock;
+  GCond queue_cond;
+  GstQueueArray *queue;
+  guint queue_num_frames;
+  gboolean playing;
+  gboolean shutdown;
+  gboolean flushing;
+
+  GstAjaNtv2Device *device;
+  NTV2DeviceID device_id;
+  GstAllocator *allocator;
+  GstBufferPool *buffer_pool;
+  GstBufferPool *audio_buffer_pool;
+  GstBufferPool *anc_buffer_pool;
+
+  // Properties
+  gchar *device_identifier;
+  NTV2Channel channel;
+  GstAjaAudioSystem audio_system_setting;
+  GstAjaVideoFormat video_format_setting;
+  GstAjaSdiMode sdi_mode;
+  GstAjaInputSource input_source;
+  GstAjaAudioSource audio_source;
+  GstAjaEmbeddedAudioInput embedded_audio_input;
+  GstAjaTimecodeIndex timecode_index;
+  gboolean rp188;
+  GstAjaReferenceSource reference_source;
+  GstAjaClosedCaptionCaptureMode closed_caption_capture_mode;
+  guint queue_size;
+  guint start_frame, end_frame;
+  guint capture_cpu_core;
+  gboolean signal;
+  gboolean attach_ancillary_meta;
+
+  NTV2AudioSystem audio_system;
+  NTV2VideoFormat video_format;
+  bool quad_mode;
+  NTV2VANCMode vanc_mode;
+  NTV2InputSource configured_input_source;
+
+  GstVideoInfo configured_info;  // Based on properties
+  GstVideoInfo current_info;     // Based on properties + stream metadata
+
+  gint configured_audio_channels;
+
+  AJAThread *capture_thread;
+};
+
+struct _GstAjaSrcClass {
+  GstPushSrcClass parent_class;
+};
+
+G_GNUC_INTERNAL
+GType gst_aja_src_get_type(void);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajasrcdemux.cpp Added

@@ -0,0 +1,292 @@
+/* GStreamer
+ * Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/audio/audio.h>
+
+#include "gstajacommon.h"
+#include "gstajasrcdemux.h"
+
+GST_DEBUG_CATEGORY_STATIC(gst_aja_src_demux_debug);
+#define GST_CAT_DEFAULT gst_aja_src_demux_debug
+
+static GstStaticPadTemplate video_src_template = GST_STATIC_PAD_TEMPLATE(
+    "video", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS("video/x-raw"));
+
+static GstStaticPadTemplate audio_src_template = GST_STATIC_PAD_TEMPLATE(
+    "audio", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS("audio/x-raw"));
+
+static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE(
+    "sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS("video/x-raw"));
+
+static GstFlowReturn gst_aja_src_demux_sink_chain(GstPad *pad,
+                                                  GstObject *parent,
+                                                  GstBuffer *buffer);
+static gboolean gst_aja_src_demux_sink_event(GstPad *pad, GstObject *parent,
+                                             GstEvent *event);
+static gboolean gst_aja_src_demux_audio_src_query(GstPad *pad,
+                                                  GstObject *parent,
+                                                  GstQuery *query);
+static gboolean gst_aja_src_demux_video_src_query(GstPad *pad,
+                                                  GstObject *parent,
+                                                  GstQuery *query);
+
+#define parent_class gst_aja_src_demux_parent_class
+G_DEFINE_TYPE(GstAjaSrcDemux, gst_aja_src_demux, GST_TYPE_ELEMENT);
+
+static void gst_aja_src_demux_class_init(GstAjaSrcDemuxClass *klass) {
+  GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
+
+  gst_element_class_add_static_pad_template(element_class, &sink_template);
+  gst_element_class_add_static_pad_template(element_class, &video_src_template);
+  gst_element_class_add_static_pad_template(element_class, &audio_src_template);
+
+  gst_element_class_set_static_metadata(
+      element_class, "AJA audio/video source demuxer", "Audio/Video/Demux",
+      "Demuxes audio/video from video buffers",
+      "Sebastian Dröge <sebastian@centricular.com>");
+
+  GST_DEBUG_CATEGORY_INIT(gst_aja_src_demux_debug, "ajasrcdemux", 0,
+                          "AJA source demuxer");
+}
+
+static void gst_aja_src_demux_init(GstAjaSrcDemux *self) {
+  self->sink = gst_pad_new_from_static_template(&sink_template, "sink");
+  gst_pad_set_chain_function(self->sink,
+                             GST_DEBUG_FUNCPTR(gst_aja_src_demux_sink_chain));
+  gst_pad_set_event_function(self->sink,
+                             GST_DEBUG_FUNCPTR(gst_aja_src_demux_sink_event));
+  gst_element_add_pad(GST_ELEMENT(self), self->sink);
+
+  self->audio_src =
+      gst_pad_new_from_static_template(&audio_src_template, "audio");
+  gst_pad_set_query_function(
+      self->audio_src, GST_DEBUG_FUNCPTR(gst_aja_src_demux_audio_src_query));
+  gst_element_add_pad(GST_ELEMENT(self), self->audio_src);
+
+  self->video_src =
+      gst_pad_new_from_static_template(&video_src_template, "video");
+  gst_pad_set_query_function(
+      self->video_src, GST_DEBUG_FUNCPTR(gst_aja_src_demux_video_src_query));
+  gst_element_add_pad(GST_ELEMENT(self), self->video_src);
+}
+
+static GstFlowReturn gst_aja_src_demux_sink_chain(GstPad *pad,
+                                                  GstObject *parent,
+                                                  GstBuffer *buffer) {
+  GstAjaSrcDemux *self = GST_AJA_SRC_DEMUX(parent);
+  GstAjaAudioMeta *meta = gst_buffer_get_aja_audio_meta(buffer);
+  GstFlowReturn audio_flow_ret = GST_FLOW_OK;
+  GstFlowReturn video_flow_ret = GST_FLOW_OK;
+
+  if (meta) {
+    GstBuffer *audio_buffer;
+    buffer = gst_buffer_make_writable(buffer);
+    meta = gst_buffer_get_aja_audio_meta(buffer);
+    audio_buffer = gst_buffer_ref(meta->buffer);
+    gst_buffer_remove_meta(buffer, GST_META_CAST(meta));
+
+    audio_flow_ret = gst_pad_push(self->audio_src, audio_buffer);
+  } else {
+    GstEvent *event =
+        gst_event_new_gap(GST_BUFFER_PTS(buffer), GST_BUFFER_DURATION(buffer));
+    gst_pad_push_event(self->audio_src, event);
+  }
+
+  video_flow_ret = gst_pad_push(self->video_src, buffer);
+
+  // Combine flows the way it makes sense
+  if (video_flow_ret == GST_FLOW_NOT_LINKED &&
+      audio_flow_ret == GST_FLOW_NOT_LINKED)
+    return GST_FLOW_NOT_LINKED;
+  if (video_flow_ret == GST_FLOW_EOS && audio_flow_ret == GST_FLOW_EOS)
+    return GST_FLOW_EOS;
+  if (video_flow_ret == GST_FLOW_FLUSHING ||
+      video_flow_ret <= GST_FLOW_NOT_NEGOTIATED)
+    return video_flow_ret;
+  if (audio_flow_ret == GST_FLOW_FLUSHING ||
+      audio_flow_ret <= GST_FLOW_NOT_NEGOTIATED)
+    return audio_flow_ret;
+  return GST_FLOW_OK;
+}
+
+static gboolean gst_aja_src_demux_sink_event(GstPad *pad, GstObject *parent,
+                                             GstEvent *event) {
+  GstAjaSrcDemux *self = GST_AJA_SRC_DEMUX(parent);
+
+  switch (GST_EVENT_TYPE(event)) {
+    case GST_EVENT_CAPS: {
+      GstCaps *caps;
+      GstStructure *s;
+      GstAudioInfo audio_info;
+      gint audio_channels = 0;
+
+      gst_event_parse_caps(event, &caps);
+      s = gst_caps_get_structure(caps, 0);
+
+      gst_structure_get_int(s, "audio-channels", &audio_channels);
+
+      GstCaps *audio_caps, *video_caps;
+
+      gst_audio_info_init(&audio_info);
+      gst_audio_info_set_format(&audio_info, GST_AUDIO_FORMAT_S32LE, 48000,
+                                audio_channels ? audio_channels : 1, NULL);
+      audio_caps = gst_audio_info_to_caps(&audio_info);
+      gst_pad_set_caps(self->audio_src, audio_caps);
+      gst_caps_unref(audio_caps);
+
+      video_caps = gst_caps_ref(caps);
+      gst_event_unref(event);
+      video_caps = gst_caps_make_writable(video_caps);
+      s = gst_caps_get_structure(video_caps, 0);
+      gst_structure_remove_field(s, "audio-channels");
+      gst_pad_set_caps(self->video_src, video_caps);
+      gst_caps_unref(video_caps);
+
+      return TRUE;
+    }
+    default:
+      return gst_pad_event_default(pad, parent, event);
+  }
+}
+
+static gboolean gst_aja_src_demux_audio_src_query(GstPad *pad,
+                                                  GstObject *parent,
+                                                  GstQuery *query) {
+  GstAjaSrcDemux *self = GST_AJA_SRC_DEMUX(parent);
+
+  switch (GST_QUERY_TYPE(query)) {
+    case GST_QUERY_CAPS: {
+      GstCaps *filter, *caps;
+
+      gst_query_parse_caps(query, &filter);
+      if ((caps = gst_pad_get_current_caps(pad))) {
+        GST_DEBUG_OBJECT(
+            pad, "Returning currently negotiated caps %" GST_PTR_FORMAT, caps);
+      } else if ((caps = gst_pad_peer_query_caps(self->sink, NULL))) {
+        guint n;
+        GstAudioInfo audio_info;
+        gint audio_channels = 0;
+        GstCaps *tmp;
+
+        GST_DEBUG_OBJECT(pad, "Got upstream caps %" GST_PTR_FORMAT, caps);
+
+        n = gst_caps_get_size(caps);
+        for (guint i = 0; i < n; i++) {
+          GstStructure *s = gst_caps_get_structure(caps, i);
+          gint tmp;
+
+          if (!gst_structure_get_int(s, "audio-channels", &tmp)) {
+            tmp = 0;
+          }
+
+          // No audio channels in all caps
+          if (tmp == 0 || (audio_channels != 0 && audio_channels != tmp)) {
+            audio_channels = 0;
+            break;
+          }
+
+          audio_channels = tmp;
+        }
+
+        gst_audio_info_init(&audio_info);
+        gst_audio_info_set_format(&audio_info, GST_AUDIO_FORMAT_S32LE, 48000,
+                                  audio_channels ? audio_channels : 1, NULL);
+        tmp = gst_audio_info_to_caps(&audio_info);
+        gst_caps_unref(caps);
+        caps = tmp;
+
+        if (!audio_channels) {
+          gst_caps_set_simple(caps, "channels", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+                              NULL);
+        }
+
+        GST_DEBUG_OBJECT(pad, "Returning caps %" GST_PTR_FORMAT, caps);
+      } else {
+        caps = gst_pad_get_pad_template_caps(pad);
+
+        GST_DEBUG_OBJECT(pad, "Returning template caps %" GST_PTR_FORMAT, caps);
+      }
+
+      if (filter) {
+        GstCaps *tmp =
+            gst_caps_intersect_full(filter, caps, GST_CAPS_INTERSECT_FIRST);
+        gst_caps_unref(caps);
+        caps = tmp;
+      }
+
+      gst_query_set_caps_result(query, caps);
+      gst_caps_unref(caps);
+
+      return TRUE;
+    }
+    default:
+      return gst_pad_query_default(pad, parent, query);
+  }
+}
+
+static gboolean gst_aja_src_demux_video_src_query(GstPad *pad,
+                                                  GstObject *parent,
+                                                  GstQuery *query) {
+  GstAjaSrcDemux *self = GST_AJA_SRC_DEMUX(parent);
+
+  switch (GST_QUERY_TYPE(query)) {
+    case GST_QUERY_CAPS: {
+      GstCaps *filter, *caps;
+
+      gst_query_parse_caps(query, &filter);
+      if ((caps = gst_pad_get_current_caps(pad))) {
+        GST_DEBUG_OBJECT(
+            pad, "Returning currently negotiated caps %" GST_PTR_FORMAT, caps);
+      } else if ((caps = gst_pad_peer_query_caps(self->sink, NULL))) {
+        guint n;
+
+        GST_DEBUG_OBJECT(pad, "Returning upstream caps %" GST_PTR_FORMAT, caps);
+
+        caps = gst_caps_make_writable(caps);
+        n = gst_caps_get_size(caps);
+        for (guint i = 0; i < n; i++) {
+          GstStructure *s = gst_caps_get_structure(caps, i);
+          gst_structure_remove_field(s, "audio-channels");
+        }
+      } else {
+        caps = gst_pad_get_pad_template_caps(pad);
+
+        GST_DEBUG_OBJECT(pad, "Returning template caps %" GST_PTR_FORMAT, caps);
+      }
+
+      if (filter) {
+        GstCaps *tmp =
+            gst_caps_intersect_full(filter, caps, GST_CAPS_INTERSECT_FIRST);
+        gst_caps_unref(caps);
+        caps = tmp;
+      }
+
+      gst_query_set_caps_result(query, caps);
+      gst_caps_unref(caps);
+
+      return TRUE;
+    }
+    default:
+      return gst_pad_query_default(pad, parent, query);
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/sys/aja/gstajasrcdemux.h Added

@@ -0,0 +1,59 @@
+/* GStreamer
+ * Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/base/base.h>
+#include <gst/gst.h>
+#include <gst/video/video.h>
+
+#include "gstajacommon.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_AJA_SRC_DEMUX (gst_aja_src_demux_get_type())
+#define GST_AJA_SRC_DEMUX(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AJA_SRC_DEMUX, GstAjaSrcDemux))
+#define GST_AJA_SRC_DEMUX_CAST(obj) ((GstAjaSrcDemux *)obj)
+#define GST_AJA_SRC_DEMUX_CLASS(klass)                      \
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AJA_SRC_DEMUX, \
+                           GstAjaSrcDemuxClass))
+#define GST_IS_AJA_SRC_DEMUX(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AJA_SRC_DEMUX))
+#define GST_IS_AJA_SRC_DEMUX_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AJA_SRC_DEMUX))
+
+typedef struct _GstAjaSrcDemux GstAjaSrcDemux;
+typedef struct _GstAjaSrcDemuxClass GstAjaSrcDemuxClass;
+
+struct _GstAjaSrcDemux {
+  GstElement parent;
+
+  GstPad *sink;
+  GstPad *video_src, *audio_src;
+};
+
+struct _GstAjaSrcDemuxClass {
+  GstElementClass parent_class;
+};
+
+G_GNUC_INTERNAL
+GType gst_aja_src_demux_get_type(void);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/aja/meson.build Added

@@ -0,0 +1,70 @@
+aja_option = get_option('aja') \
+    .require(host_system == 'linux',
+             error_message: 'AJA plugin is currently only available on Linux')
+if aja_option.disabled()
+  subdir_done()
+endif
+
+common_flags = 
+  '-DAJALinux=1',
+  '-DAJA_LINUX=1',
+
+
+thread_dep = dependency('threads')
+rt_dep = cxx.find_library('rt', required : false)
+
+aja_sdk_dir = get_option('aja-sdk-dir')
+if aja_sdk_dir == ''
+  ajantv2_dep = dependency('libajantv2',
+                           include_type: 'system',
+                           required: aja_option,
+                           allow_fallback: true,
+                           default_options: 'warning_level=0')
+  if not ajantv2_dep.found()
+    subdir_done()
+  endif
+  aja_includedirs = 
+else
+  aja_includedirs = include_directories(
+    f'@aja_sdk_dir@/ajalibraries',
+    f'@aja_sdk_dir@/ajalibraries/ajantv2/includes',
+    f'@aja_sdk_dir@/ajalibraries/ajantv2/src/lin',
+    is_system: true,
+  )
+
+  message(f'Looking for AJA SDK in @aja_sdk_dir@')
+  if not cxx.has_header('ajabase/common/videotypes.h',
+                        include_directories: aja_includedirs,
+                        required: aja_option)
+    subdir_done()
+  endif
+
+  ajantv2_lib = cxx.find_library('ajantv2',
+    # If the header is found, this should also be
+    required : true,
+    dirs : f'@aja_sdk_dir@/lib',
+  )
+  ajantv2_dep = declare_dependency(
+    dependencies: ajantv2_lib,
+    include_directories: aja_includedirs)
+endif
+
+gstaja = library('gstaja',
+  'plugin.cpp',
+   'gstajacommon.cpp',
+   'gstajasink.cpp',
+   'gstajasinkcombiner.cpp',
+   'gstajasrc.cpp',
+   'gstajasrcdemux.cpp',
+   'gstajadeviceprovider.cpp',
+  ,
+  override_options : 'cpp_std=c++11',
+  cpp_args : gst_plugins_bad_args + common_flags,
+  include_directories : configinc,
+  link_args : noseh_link_args,
+  dependencies : gstvideo_dep, gstaudio_dep, gstbase_dep, gst_dep, ajantv2_dep, thread_dep, rt_dep,
+  install : true,
+  install_dir : plugins_install_dir,
+)
+
+plugins += gstaja

gst-plugins-bad-1.24.5.tar.xz/sys/aja/plugin.cpp Added

@@ -0,0 +1,67 @@
+/* GStreamer
+ * Copyright (C) 2021 Sebastian Dröge <sebastian@centricular.com>
+ *
+ * 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., 51 Franklin Street, Suite 500,
+ * Boston, MA 02110-1335, USA.
+ */
+
+/**
+ * SECTION:plugin-aja
+ *
+ * Plugin for AJA(https://www.aja.com) capture and output cards.
+ *
+ * This plugin requires the AJA NTV2 SDK version 16 or newer and works with
+ * both the Open Source(https://github.com/aja-video/ntv2.git) and
+ * proprietary(https://www.aja.com/family/developer) version.
+ *
+ * Since: 1.24
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <ajabase/system/debug.h>
+#include <gst/gst.h>
+
+#include "gstajacommon.h"
+#include "gstajadeviceprovider.h"
+#include "gstajasink.h"
+#include "gstajasinkcombiner.h"
+#include "gstajasrc.h"
+#include "gstajasrcdemux.h"
+
+static gboolean plugin_init(GstPlugin* plugin) {
+  AJADebug::Open();
+
+  gst_aja_common_init();
+
+  gst_element_register(plugin, "ajasrc", GST_RANK_NONE, GST_TYPE_AJA_SRC);
+  gst_element_register(plugin, "ajasrcdemux", GST_RANK_NONE,
+                       GST_TYPE_AJA_SRC_DEMUX);
+  gst_element_register(plugin, "ajasink", GST_RANK_NONE, GST_TYPE_AJA_SINK);
+  gst_element_register(plugin, "ajasinkcombiner", GST_RANK_NONE,
+                       GST_TYPE_AJA_SINK_COMBINER);
+
+  gst_device_provider_register(plugin, "ajadeviceprovider", GST_RANK_PRIMARY,
+                               GST_TYPE_AJA_DEVICE_PROVIDER);
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, aja,
+                  "GStreamer AJA plugin", plugin_init, VERSION, "LGPL",
+                  PACKAGE_NAME, GST_PACKAGE_ORIGIN)

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/gstamfav1enc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/gstamfav1enc.cpp Changed

@@ -43,6 +43,7 @@
 #include <components/Component.h>
 #include <components/VideoEncoderAV1.h>
 #include <core/Factory.h>
+#include <set>
 #include <string>
 #include <vector>
 #include <string.h>
@@ -72,6 +73,9 @@
   amf_int64 max_gop_size;
   amf_int64 default_gop_size;
   guint valign;
+  gboolean pre_encode_supported;
+  gboolean smart_access_supported;
+  GstAmfEncoderPASupportedOptions pa_supported;
 } GstAmfAv1EncDeviceCaps;
 
 /**
@@ -263,6 +267,23 @@
   PROP_QP_I,
   PROP_QP_P,
   PROP_REF_FRAMES,
+  PROP_SMART_ACCESS,
+  PROP_PRE_ENCODE,
+  PROP_PRE_ANALYSIS,
+  PROP_PA_ACTIVITY_TYPE,
+  PROP_PA_SCENE_CHANGE_DETECTION,
+  PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY,
+  PROP_PA_STATIC_SCENE_DETECTION,
+  PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY,
+  PROP_PA_INITIAL_QP,
+  PROP_PA_MAX_QP,
+  PROP_PA_CAQ_STRENGTH,
+  PROP_PA_FRAME_SAD,
+  PROP_PA_LTR,
+  PROP_PA_LOOKAHEAD_BUFFER_DEPTH,
+  PROP_PA_PAQ_MODE,
+  PROP_PA_TAQ_MODE,
+  PROP_PA_HQMB_MODE,
 };
 
 #define DEFAULT_USAGE AMF_VIDEO_ENCODER_AV1_USAGE_TRANSCODING
@@ -272,9 +293,11 @@
 #define DEFAULT_MAX_BITRATE 0
 #define DEFAULT_MIN_MAX_QP -1
 #define DEFAULT_REF_FRAMES 1
+#define DEFAULT_SMART_ACCESS FALSE
+#define DEFAULT_PRE_ENCODE FALSE
 
 #define DOC_SINK_CAPS_COMM \
-    "format = (string) NV12, " \
+    "format = (string) {NV12, P010_10LE}, " \
     "width = (int)  128, 4096 , height = (int)  128, 4096 "
 
 #define DOC_SINK_CAPS \
@@ -304,6 +327,9 @@
   guint qp_i;
   guint qp_p;
   guint ref_frames;
+  gboolean smart_access;
+  gboolean pre_encode;
+  GstAmfEncoderPreAnalysis pa;
 } GstAmfAv1Enc;
 
 typedef struct _GstAmfAv1EncClass
@@ -324,7 +350,7 @@
 static void gst_amf_av1_enc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 static gboolean gst_amf_av1_enc_set_format (GstAmfEncoder * encoder,
-    GstVideoCodecState * state, gpointer component);
+    GstVideoCodecState * state, gpointer component, guint * num_reorder_frames);
 static gboolean gst_amf_av1_enc_set_output_state (GstAmfEncoder * encoder,
     GstVideoCodecState * state, gpointer component);
 static gboolean gst_amf_av1_enc_set_surface_prop (GstAmfEncoder * encoder,
@@ -341,8 +367,11 @@
   GstAmfEncoderClass *amf_class = GST_AMF_ENCODER_CLASS (klass);
   GstAmfAv1EncClassData *cdata = (GstAmfAv1EncClassData *) data;
   GstAmfAv1EncDeviceCaps *dev_caps = &cdata->dev_caps;
+  GstAmfEncoderPASupportedOptions *pa_supported = &dev_caps->pa_supported;
   GParamFlags param_flags = (GParamFlags) (G_PARAM_READWRITE |
       GST_PARAM_MUTABLE_PLAYING | G_PARAM_STATIC_STRINGS);
+  GParamFlags pa_param_flags = (GParamFlags) (G_PARAM_READWRITE |
+      G_PARAM_STATIC_STRINGS | GST_PARAM_CONDITIONALLY_AVAILABLE);
   GstPadTemplate *pad_templ;
   GstCaps *doc_caps;
 
@@ -409,6 +438,263 @@
       g_param_spec_uint ("ref-frames", "Reference Frames",
           "Number of reference frames", 0, 8, DEFAULT_REF_FRAMES, param_flags));
 
+  if (cdata->dev_caps.pre_encode_supported) {
+    /**
+     * GstAmfAv1Enc:pre-encode:
+     *
+     * Enable pre-encode assisted rate control
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_PRE_ENCODE,
+        g_param_spec_boolean ("pre-encode", "Pre-encode",
+            "Enable pre-encode", DEFAULT_PRE_ENCODE,
+            (GParamFlags) (param_flags | GST_PARAM_CONDITIONALLY_AVAILABLE)));
+  }
+
+  if (cdata->dev_caps.smart_access_supported) {
+    /**
+     * GstAmfAv1Enc:smart-access-video:
+     *
+     * Enable AMF SmartAccess Video feature
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_SMART_ACCESS,
+        g_param_spec_boolean ("smart-access-video", "Smart Access Video",
+            "Enable AMF SmartAccess Video feature for optimal distribution"
+            " between multiple AMD hardware instances", DEFAULT_SMART_ACCESS,
+            (GParamFlags) (G_PARAM_READWRITE |
+                GST_PARAM_CONDITIONALLY_AVAILABLE |
+                GST_PARAM_MUTABLE_PLAYING | G_PARAM_STATIC_STRINGS)));
+  }
+
+  if (dev_caps->pre_analysis) {
+    /**
+     * GstAmfAv1Enc:pre-analysis:
+     *
+     * Enable the pre-analysis module
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_PRE_ANALYSIS,
+        g_param_spec_boolean ("pre-analysis", "Pre-analysis",
+            "Enable pre-analysis", DEFAULT_PRE_ANALYSIS, param_flags));
+
+    if (pa_supported->activity_type) {
+      /**
+       * GstAmfAv1Enc:pa-activity-type:
+       *
+       * Set the type of activity analysis for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_ACTIVITY_TYPE,
+          g_param_spec_enum ("pa-activity-type", "Pre-analysis activity type",
+              "Set the type of activity analysis for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_ACTIVITY_TYPE, DEFAULT_PA_ACTIVITY_TYPE,
+              pa_param_flags));
+    }
+
+    if (pa_supported->scene_change_detection) {
+      /**
+       * GstAmfAv1Enc:pa-scene-change-detection:
+       *
+       * Enable scene change detection for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_SCENE_CHANGE_DETECTION,
+          g_param_spec_boolean ("pa-scene-change-detection",
+              "Pre-analysis scene change detection",
+              "Enable scene change detection for pre-analysis",
+              DEFAULT_PA_SCENE_CHANGE_DETECTION, pa_param_flags));
+    }
+
+    if (pa_supported->scene_change_detection_sensitivity) {
+      /**
+       * GstAmfAv1Enc:pa-scene-change-detection-sensitivity:
+       *
+       * Pre-analysis scene change detection sensitivity
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY,
+          g_param_spec_enum ("pa-scene-change-detection-sensitivity",
+              "Pre-analysis scene change detection sensitivity",
+              "Set the sensitivity of scene change detection for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_SCENE_CHANGE_DETECTION_SENSITIVITY,
+              DEFAULT_PA_SCENE_CHANGE_DETECTION_SENSITIVITY, pa_param_flags));
+    }
+
+    if (pa_supported->static_scene_detection) {
+      /**
+       * GstAmfAv1Enc:pa-static-scene-detection:
+       *
+       * Enable static scene detection for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_STATIC_SCENE_DETECTION,
+          g_param_spec_boolean ("pa-static-scene-detection",
+              "Pre-analysis static scene detection",
+              "Enable static scene detection for pre-analysis",
+              DEFAULT_PA_STATIC_SCENE_DETECTION, pa_param_flags));
+    }
+
+    if (pa_supported->static_scene_detection_sensitivity) {
+      /**
+       * GstAmfAv1Enc:pa-static-scene-detection-sensitivity:
+       *
+       * Pre-analysis static scene detection sensitivity
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY,
+          g_param_spec_enum ("pa-static-scene-detection-sensitivity",
+              "Pre-analysis static scene detection sensitivity",
+              "Set the sensitivity of static scene detection for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_STATIC_SCENE_DETECTION_SENSITIVITY,
+              DEFAULT_PA_STATIC_SCENE_DETECTION_SENSITIVITY, pa_param_flags));
+    }
+
+    if (pa_supported->initial_qp) {
+      /**
+       * GstAmfAv1Enc:pa-initial-qp:
+       *
+       * Pre-analysis initial QP
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_INITIAL_QP,
+          g_param_spec_uint ("pa-initial-qp", "Pre-analysis initial QP",
+              "The QP value that is used immediately after a scene change", 0,
+              51, DEFAULT_PA_INITIAL_QP, pa_param_flags));
+    }
+
+    if (pa_supported->max_qp) {
+      /**
+       * GstAmfAv1Enc:pa-max-qp:
+       *
+       * Pre-analysis max QP
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_MAX_QP,
+          g_param_spec_uint ("pa-max-qp", "Pre-analysis max QP",
+              "The QP threshold to allow a skip frame", 0, 51,
+              DEFAULT_PA_MAX_QP, pa_param_flags));
+    }
+
+    if (pa_supported->caq_strength) {
+      /**
+       * GstAmfAv1Enc:pa-caq-strength:
+       *
+       * Content Adaptive Quantization strength for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_CAQ_STRENGTH,
+          g_param_spec_enum ("pa-caq-strength", "Pre-analysis CAQ strength",
+              "Content Adaptive Quantization strength for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_CAQ_STRENGTH, DEFAULT_PA_CAQ_STRENGTH,
+              pa_param_flags));
+    }
+
+    if (pa_supported->frame_sad) {
+      /**
+       * GstAmfAv1Enc:pa-frame-sad:
+       *
+       * Enable Frame SAD algorithm
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_FRAME_SAD,
+          g_param_spec_boolean ("pa-frame-sad", "Pre-analysis SAD algorithm",
+              "Enable Frame SAD algorithm", DEFAULT_PA_FRAME_SAD,
+              pa_param_flags));
+    }
+
+    if (pa_supported->ltr) {
+      /**
+       * GstAmfAv1Enc:pa-ltr:
+       *
+       * Enable long term reference frame management
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_LTR,
+          g_param_spec_boolean ("pa-ltr", "Pre-analysis LTR",
+              "Enable long term reference frame management", DEFAULT_PA_LTR,
+              pa_param_flags));
+    }
+
+    if (pa_supported->lookahead_buffer_depth) {
+      /**
+       * GstAmfAv1Enc:pa-lookahead-buffer-depth:
+       *
+       * Pre-analysis lookahead buffer depth
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_LOOKAHEAD_BUFFER_DEPTH,
+          g_param_spec_uint ("pa-lookahead-buffer-depth",
+              "Pre-analysis lookahead buffer depth",
+              "Set the PA lookahead buffer size", 0, 41,
+              DEFAULT_PA_LOOKAHEAD_BUFFER_DEPTH, pa_param_flags));
+    }
+
+    if (pa_supported->paq_mode) {
+      /**
+       * GstAmfAv1Enc:pa-paq-mode:
+       *
+       * Set the perceptual adaptive quantization mode
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_PAQ_MODE,
+          g_param_spec_enum ("pa-paq-mode", "Pre-analysis PAQ mode",
+              "Set the perceptual adaptive quantization mode",
+              GST_TYPE_AMF_ENC_PA_PAQ_MODE, DEFAULT_PA_PAQ_MODE,
+              pa_param_flags));
+    }
+
+    if (pa_supported->taq_mode) {
+      /**
+       * GstAmfAv1Enc:pa-taq-mode:
+       *
+       * Set the temporal adaptive quantization mode
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_TAQ_MODE,
+          g_param_spec_enum ("pa-taq-mode", "Pre-analysis TAQ mode",
+              "Set the temporal adaptive quantization mode",
+              GST_TYPE_AMF_ENC_PA_TAQ_MODE, DEFAULT_PA_TAQ_MODE,
+              pa_param_flags));
+    }
+
+    if (pa_supported->hmqb_mode) {
+      /**
+       * GstAmfAv1Enc:pa-hqmb-mode:
+       *
+       * Set the PA high motion quality boost mode
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_HQMB_MODE,
+          g_param_spec_enum ("pa-hqmb-mode", "Pre-analysis HQMB mode",
+              "Set the PA high motion quality boost mode",
+              GST_TYPE_AMF_ENC_PA_HQMB_MODE, DEFAULT_PA_HQMB_MODE,
+              pa_param_flags));
+    }
+  }
+
   gst_element_class_set_metadata (element_class,
       "AMD AMF AV1 Video Encoder",
       "Codec/Encoder/Video/Hardware",
@@ -479,6 +765,26 @@
   self->qp_i = (guint) dev_caps->default_qp_i;
   self->qp_p = (guint) dev_caps->default_qp_p;
   self->ref_frames = DEFAULT_REF_FRAMES;
+  self->smart_access = DEFAULT_SMART_ACCESS;
+  self->pre_encode = DEFAULT_PRE_ENCODE;
+  // Init pre-analysis options
+  self->pa.pre_analysis = DEFAULT_PRE_ANALYSIS;
+  self->pa.activity_type = DEFAULT_PA_ACTIVITY_TYPE;
+  self->pa.scene_change_detection = DEFAULT_PA_SCENE_CHANGE_DETECTION;
+  self->pa.scene_change_detection_sensitivity =
+      DEFAULT_PA_SCENE_CHANGE_DETECTION_SENSITIVITY;
+  self->pa.static_scene_detection = DEFAULT_PA_STATIC_SCENE_DETECTION;
+  self->pa.static_scene_detection_sensitivity =
+      DEFAULT_PA_STATIC_SCENE_DETECTION_SENSITIVITY;
+  self->pa.initial_qp = DEFAULT_PA_INITIAL_QP;
+  self->pa.max_qp = DEFAULT_PA_MAX_QP;
+  self->pa.caq_strength = DEFAULT_PA_CAQ_STRENGTH;
+  self->pa.frame_sad = DEFAULT_PA_FRAME_SAD;
+  self->pa.ltr = DEFAULT_PA_LTR;
+  self->pa.lookahead_buffer_depth = DEFAULT_PA_LOOKAHEAD_BUFFER_DEPTH;
+  self->pa.paq_mode = DEFAULT_PA_PAQ_MODE;
+  self->pa.taq_mode = DEFAULT_PA_TAQ_MODE;
+  self->pa.hmqb_mode = DEFAULT_PA_HQMB_MODE;
 }
 
 static void
@@ -528,6 +834,18 @@
 }
 
 static void
+update_bool (GstAmfAv1Enc * self, gboolean * old_val, const GValue * new_val)
+{
+  gboolean val = g_value_get_boolean (new_val);
+
+  if (*old_val == val)
+    return;
+
+  *old_val = val;
+  self->property_updated = TRUE;
+}
+
+static void
 gst_amf_av1_enc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
@@ -574,6 +892,56 @@
     case PROP_REF_FRAMES:
       update_uint (self, &self->ref_frames, value);
       break;
+    case PROP_SMART_ACCESS:
+      update_bool (self, &self->smart_access, value);
+      break;
+    case PROP_PRE_ENCODE:
+      update_bool (self, &self->pre_encode, value);
+      break;
+    case PROP_PRE_ANALYSIS:
+      update_bool (self, &self->pa.pre_analysis, value);
+      break;
+    case PROP_PA_ACTIVITY_TYPE:
+      update_enum (self, &self->pa.activity_type, value);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION:
+      update_bool (self, &self->pa.scene_change_detection, value);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY:
+      update_enum (self, &self->pa.scene_change_detection_sensitivity, value);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION:
+      update_bool (self, &self->pa.static_scene_detection, value);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY:
+      update_enum (self, &self->pa.static_scene_detection_sensitivity, value);
+      break;
+    case PROP_PA_INITIAL_QP:
+      update_uint (self, &self->pa.initial_qp, value);
+      break;
+    case PROP_PA_MAX_QP:
+      update_uint (self, &self->pa.max_qp, value);
+      break;
+    case PROP_PA_CAQ_STRENGTH:
+      update_enum (self, &self->pa.caq_strength, value);
+      break;
+    case PROP_PA_FRAME_SAD:
+      update_bool (self, &self->pa.frame_sad, value);
+    case PROP_PA_LTR:
+      update_bool (self, &self->pa.ltr, value);
+      break;
+    case PROP_PA_LOOKAHEAD_BUFFER_DEPTH:
+      update_uint (self, &self->pa.lookahead_buffer_depth, value);
+      break;
+    case PROP_PA_PAQ_MODE:
+      update_enum (self, &self->pa.paq_mode, value);
+      break;
+    case PROP_PA_TAQ_MODE:
+      update_enum (self, &self->pa.taq_mode, value);
+      break;
+    case PROP_PA_HQMB_MODE:
+      update_enum (self, &self->pa.hmqb_mode, value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -631,6 +999,57 @@
     case PROP_REF_FRAMES:
       g_value_set_uint (value, self->ref_frames);
       break;
+    case PROP_SMART_ACCESS:
+      g_value_set_boolean (value, self->smart_access);
+      break;
+    case PROP_PRE_ENCODE:
+      g_value_set_boolean (value, self->pre_encode);
+      break;
+    case PROP_PRE_ANALYSIS:
+      g_value_set_boolean (value, self->pa.pre_analysis);
+      break;
+    case PROP_PA_ACTIVITY_TYPE:
+      g_value_set_enum (value, self->pa.activity_type);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION:
+      g_value_set_boolean (value, self->pa.scene_change_detection);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY:
+      g_value_set_enum (value, self->pa.scene_change_detection_sensitivity);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION:
+      g_value_set_boolean (value, self->pa.static_scene_detection);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY:
+      g_value_set_enum (value, self->pa.static_scene_detection_sensitivity);
+      break;
+    case PROP_PA_INITIAL_QP:
+      g_value_set_uint (value, self->pa.initial_qp);
+      break;
+    case PROP_PA_MAX_QP:
+      g_value_set_uint (value, self->pa.max_qp);
+      break;
+    case PROP_PA_CAQ_STRENGTH:
+      g_value_set_enum (value, self->pa.caq_strength);
+      break;
+    case PROP_PA_FRAME_SAD:
+      g_value_set_boolean (value, self->pa.frame_sad);
+      break;
+    case PROP_PA_LTR:
+      g_value_set_boolean (value, self->pa.ltr);
+      break;
+    case PROP_PA_LOOKAHEAD_BUFFER_DEPTH:
+      g_value_set_uint (value, self->pa.lookahead_buffer_depth);
+      break;
+    case PROP_PA_PAQ_MODE:
+      g_value_set_enum (value, self->pa.paq_mode);
+      break;
+    case PROP_PA_TAQ_MODE:
+      g_value_set_enum (value, self->pa.taq_mode);
+      break;
+    case PROP_PA_HQMB_MODE:
+      g_value_set_enum (value, self->pa.hmqb_mode);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -639,15 +1058,21 @@
 
 static gboolean
 gst_amf_av1_enc_set_format (GstAmfEncoder * encoder,
-    GstVideoCodecState * state, gpointer component)
+    GstVideoCodecState * state, gpointer component, guint * num_reorder_frames)
 {
   GstAmfAv1Enc *self = GST_AMF_AV1_ENC (encoder);
+  GstAmfAv1EncClass *klass = GST_AMF_AV1_ENC_GET_CLASS (self);
+  GstAmfAv1EncDeviceCaps *dev_caps = &klass->dev_caps;
   AMFComponent *comp = (AMFComponent *) component;
   GstVideoInfo *info = &state->info;
   AMF_RESULT result;
   AMFRate framerate;
   amf_int64 int64_val = 0;
   AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_ENUM rc_mode;
+  amf_int64 color_depth;
+  AMF_SURFACE_FORMAT surface_format;
+  const GstVideoColorimetry *cinfo = &info->colorimetry;
+  amf_int64 color_profile;
 
   g_mutex_lock (&self->prop_lock);
   result = comp->SetProperty (AMF_VIDEO_ENCODER_AV1_FRAMESIZE,
@@ -684,6 +1109,27 @@
     goto error;
   }
 
+  if (GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_FORMAT_NV12) {
+    color_depth = AMF_COLOR_BIT_DEPTH_8;
+    surface_format = AMF_SURFACE_NV12;
+  } else if (GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_FORMAT_P010_10LE) {
+    color_depth = AMF_COLOR_BIT_DEPTH_10;
+    surface_format = AMF_SURFACE_P010;
+  } else {
+    GST_ERROR_OBJECT (self, "Unexpected format %s",
+        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (info)));
+    g_assert_not_reached ();
+    goto error;
+  }
+
+  result =
+      comp->SetProperty (AMF_VIDEO_ENCODER_AV1_COLOR_BIT_DEPTH, color_depth);
+  if (result != AMF_OK) {
+    GST_ERROR_OBJECT (self, "Failed to set bit depth, result %"
+        GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+    goto error;
+  }
+
   result = comp->SetProperty (AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE,
       (amf_int64) AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_NO_RESTRICTIONS);
   if (result != AMF_OK) {
@@ -700,7 +1146,148 @@
     goto error;
   }
 
-  result = comp->Init (AMF_SURFACE_NV12, info->width, info->height);
+  if (dev_caps->smart_access_supported) {
+    result = comp->SetProperty (AMF_VIDEO_ENCODER_AV1_ENABLE_SMART_ACCESS_VIDEO,
+        (amf_bool) self->smart_access);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (self, "Failed to set smart access video, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+    }
+  }
+  color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN;
+  switch (cinfo->matrix) {
+      /* XXX: There's a driver bug that BT601 color matrix here results in
+       * identity matrix specified */
+#if 0
+    case GST_VIDEO_COLOR_MATRIX_BT601:
+      if (cinfo->range == GST_VIDEO_COLOR_RANGE_0_255) {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_601;
+      } else {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_601;
+      }
+      break;
+#endif
+    case GST_VIDEO_COLOR_MATRIX_BT709:
+      if (cinfo->range == GST_VIDEO_COLOR_RANGE_0_255) {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_709;
+      } else {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_709;
+      }
+      break;
+    case GST_VIDEO_COLOR_MATRIX_BT2020:
+      if (cinfo->range == GST_VIDEO_COLOR_RANGE_0_255) {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_2020;
+      } else {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_2020;
+      }
+      break;
+    default:
+      break;
+  }
+
+  result =
+      comp->SetProperty (AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PROFILE,
+      color_profile);
+  if (result != AMF_OK) {
+    GST_ERROR_OBJECT (self, "Failed to set output color profile, result %"
+        GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+    goto error;
+  }
+
+  result =
+      comp->SetProperty (AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC,
+      gst_video_transfer_function_to_iso (cinfo->transfer));
+  if (result != AMF_OK) {
+    GST_ERROR_OBJECT (self,
+        "Failed to set output transfer characteristic, result %"
+        GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+    goto error;
+  }
+
+  result = comp->SetProperty (AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES,
+      gst_video_color_primaries_to_iso (cinfo->primaries));
+  if (result != AMF_OK) {
+    GST_ERROR_OBJECT (self, "Failed to set output color primaries, result %"
+        GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+    goto error;
+  }
+
+  if (cinfo->transfer == GST_VIDEO_TRANSFER_SMPTE2084 &&
+      state->mastering_display_info && state->content_light_level) {
+    AMFBuffer *hdrmeta_buffer = NULL;
+    result =
+        comp->GetContext ()->AllocBuffer (AMF_MEMORY_HOST,
+        sizeof (AMFHDRMetadata), &hdrmeta_buffer);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to allocate HDR metadata buffer, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+    AMFHDRMetadata *hdrmeta = (AMFHDRMetadata *) hdrmeta_buffer->GetNative ();
+    GstVideoMasteringDisplayInfo *minfo = state->mastering_display_info;
+    GstVideoContentLightLevel *cllinfo = state->content_light_level;
+    hdrmeta->maxMasteringLuminance =
+        (amf_uint32) minfo->max_display_mastering_luminance;
+    hdrmeta->minMasteringLuminance =
+        (amf_uint32) minfo->min_display_mastering_luminance;
+
+    hdrmeta->redPrimary0 = minfo->display_primaries0.x;
+    hdrmeta->redPrimary1 = minfo->display_primaries0.y;
+
+    hdrmeta->greenPrimary0 = minfo->display_primaries1.x;
+    hdrmeta->greenPrimary1 = minfo->display_primaries1.y;
+
+    hdrmeta->bluePrimary0 = minfo->display_primaries2.x;
+    hdrmeta->bluePrimary1 = minfo->display_primaries2.y;
+
+    hdrmeta->whitePoint0 = minfo->white_point.x;
+    hdrmeta->whitePoint1 = minfo->white_point.y;
+
+    hdrmeta->maxContentLightLevel =
+        (amf_uint16) cllinfo->max_content_light_level;
+    hdrmeta->maxFrameAverageLightLevel =
+        (amf_uint16) cllinfo->max_frame_average_light_level;
+
+    result =
+        comp->SetProperty (AMF_VIDEO_ENCODER_AV1_INPUT_HDR_METADATA,
+        hdrmeta_buffer);
+
+    hdrmeta_buffer->Release ();
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set HDR metadata, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+  }
+
+  if (dev_caps->pre_encode_supported) {
+    result = comp->SetProperty (AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_PREENCODE,
+        (amf_bool) self->pre_encode);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set pre-encode, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+  }
+
+  if (dev_caps->pre_analysis) {
+    result = comp->SetProperty (AMF_VIDEO_ENCODER_AV1_PRE_ANALYSIS_ENABLE,
+        (amf_bool) self->pa.pre_analysis);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set pre-analysis, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+    if (self->pa.pre_analysis) {
+      result =
+          gst_amf_encoder_set_pre_analysis_options (encoder, comp, &self->pa,
+          &dev_caps->pa_supported);
+      if (result != AMF_OK)
+        goto error;
+    }
+  }
+
+  result = comp->Init (surface_format, info->width, info->height);
   if (result != AMF_OK) {
     GST_ERROR_OBJECT (self, "Failed to init component, result %"
         GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
@@ -922,7 +1509,11 @@
   amf_int32 in_min_height = 0, in_max_height = 0;
   amf_int32 out_min_width = 0, out_max_width = 0;
   amf_int32 out_min_height = 0, out_max_height = 0;
+  amf_bool pre_encode_supported;
+  amf_bool smart_access_supported;
   amf_int32 num_val;
+  std::set < std::string > formats;
+  std::string format_str;
   gboolean have_nv12 = FALSE;
   gboolean d3d11_supported = FALSE;
   gint min_width, max_width, min_height, max_height;
@@ -953,27 +1544,56 @@
   GST_LOG_OBJECT (device, "Input format count: %d", num_val);
   for (amf_int32 i = 0; i < num_val; i++) {
     AMF_SURFACE_FORMAT format;
-    amf_bool native;
+    amf_bool native = false;
 
     result = in_iocaps->GetFormatAt (i, &format, &native);
     if (result != AMF_OK)
       continue;
 
     GST_INFO_OBJECT (device, "Format %d supported, native %d", format, native);
-    if (format == AMF_SURFACE_NV12)
+    if (format == AMF_SURFACE_NV12) {
       have_nv12 = TRUE;
+      formats.insert ("NV12");
+    }
+    if (format == AMF_SURFACE_P010 && native) {
+      formats.insert ("P010_10LE");
+    }
+  }
+
+  if (formats.empty ()) {
+    GST_WARNING_OBJECT (device, "Empty supported input formats");
+    return nullptr;
   }
 
   if (!have_nv12) {
     GST_WARNING_OBJECT (device, "NV12 is not supported");
     return nullptr;
   }
+#define APPEND_STRING(dst,set,str) G_STMT_START { \
+  if (set.find(str) != set.end()) { \
+    if (!first) \
+      dst += ", "; \
+    dst += str; \
+    first = FALSE; \
+  } \
+} G_STMT_END
+
+  if (formats.size () == 1) {
+    format_str = "format = (string) " + *(formats.begin ());
+  } else {
+    gboolean first = TRUE;
+    format_str = "format = (string) { ";
+    APPEND_STRING (format_str, formats, "NV12");
+    APPEND_STRING (format_str, formats, "P010_10LE");
+    format_str += " } ";
+  }
+#undef APPEND_STRING
 
   num_val = in_iocaps->GetNumOfMemoryTypes ();
   GST_LOG_OBJECT (device, "Input memory type count: %d", num_val);
   for (amf_int32 i = 0; i < num_val; i++) {
     AMF_MEMORY_TYPE type;
-    amf_bool native;
+    amf_bool native = false;
 
     result = in_iocaps->GetMemoryTypeAt (i, &type, &native);
     if (result != AMF_OK)
@@ -1044,6 +1664,41 @@
   QUERY_DEFAULT_PROP (AMF_VIDEO_ENCODER_AV1_Q_INDEX_INTER, default_qp_p, 26);
 #undef QUERY_DEFAULT_PROP
 
+  result = comp->GetProperty (AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_PREENCODE,
+      &pre_encode_supported);
+  if (result == AMF_OK)
+    dev_caps.pre_encode_supported = TRUE;
+
+  result = comp->GetProperty (AMF_VIDEO_ENCODER_AV1_ENABLE_SMART_ACCESS_VIDEO,
+      &smart_access_supported);
+  if (result == AMF_OK)
+    dev_caps.smart_access_supported = TRUE;
+
+  if (dev_caps.pre_analysis) {
+    amf_bool pre_analysis = FALSE;
+    // Store initial pre-analysis value
+    result =
+        comp->GetProperty (AMF_VIDEO_ENCODER_AV1_PRE_ANALYSIS_ENABLE,
+        &pre_analysis);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (device, "Failed to get pre-analysis option");
+    }
+    // We need to enable pre-analysis for checking options availability
+    result =
+        comp->SetProperty (AMF_VIDEO_ENCODER_AV1_PRE_ANALYSIS_ENABLE,
+        (amf_bool) TRUE);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (device, "Failed to set pre-analysis option");
+    }
+    gst_amf_encoder_check_pa_supported_options (&dev_caps.pa_supported, comp);
+    result =
+        comp->SetProperty (AMF_VIDEO_ENCODER_AV1_PRE_ANALYSIS_ENABLE,
+        pre_analysis);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (device, "Failed to set pre-analysis option");
+    }
+  }
+
   {
     const AMFPropertyInfo *pinfo = nullptr;
     result = comp->GetPropertyInfo (AMF_VIDEO_ENCODER_AV1_GOP_SIZE, &pinfo);
@@ -1080,7 +1735,7 @@
   resolution_str += ", height = (int)  " + std::to_string (min_height)
       + ", " + std::to_string (max_height) + " ";
 
-  sink_caps_str = "video/x-raw, format = (string) NV12, " + resolution_str;
+  sink_caps_str = "video/x-raw, " + format_str + ", " + resolution_str;
   src_caps_str = "video/x-av1, " + resolution_str + ", profile = (string) main"
       ", stream-format = (string) obu-stream, alignment = (string) tu";

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/gstamfencoder.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/gstamfencoder.cpp Changed

@@ -29,12 +29,308 @@
 #include <wrl.h>
 #include <string.h>
 #include <mmsystem.h>
+#include <queue>
+#include <algorithm>
 
 /* *INDENT-OFF* */
 using namespace Microsoft::WRL;
 using namespace amf;
 /* *INDENT-ON* */
 
+/**
+ * GstAmfEncPAActivityType:
+ *
+ * Determines whether activity analysis is performed on the Luma component
+ * only (Y) or on both Luma and Chroma (YUV).
+ *
+ * Since: 1.24
+ */
+GType
+gst_amf_enc_pa_activity_get_type (void)
+{
+  static GType pa_activity_type = 0;
+  static const GEnumValue activity_types = {
+    /**
+     * GstAmfEncPAActivityType::y:
+     *
+     * Activity analysis is performed on the Luma component only (Y)
+     */
+    {AMF_PA_ACTIVITY_Y, "Luma (Y) component only",
+        "y"},
+
+    /**
+     * GstAmfEncPAActivityType::yuv:
+     *
+     * Activity analysis is performed on both Luma and Chroma components (YUV)
+     */
+    {AMF_PA_ACTIVITY_YUV, "Luma and Chroma components (YUV)", "yuv"},
+    {0, nullptr, nullptr}
+  };
+
+  if (g_once_init_enter (&pa_activity_type)) {
+    GType type =
+        g_enum_register_static ("GstAmfEncPAActivityType", activity_types);
+    g_once_init_leave (&pa_activity_type, type);
+  }
+
+  return pa_activity_type;
+}
+
+/**
+ * GstAmfEncPASceneChangeDetectionSensitivity:
+ *
+ * Sensitivity of scene change detection. The higher the sensitivity, the more
+ * restrictive it is to detect a scene change. This parameter takes effect
+ * only when AMF_PA_LOOKAHEAH_BUFFER_DEPTH is set to 0.
+ *
+ * Since: 1.24
+ */
+GType
+gst_amf_enc_pa_scene_change_detection_sensitivity_get_type (void)
+{
+  static GType pa_scene_change_detection_sensitivity = 0;
+  static const GEnumValue sensitivity_types = {
+    /**
+     * GstAmfEncPASceneChangeDetectionSensitivity::low:
+     *
+     * Low sensitivity
+     */
+    {AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_LOW, "Low", "low"},
+
+    /**
+     * GstAmfEncPASceneChangeDetectionSensitivity::medium:
+     *
+     * Medium sensitivity
+     */
+    {AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_MEDIUM, "Medium", "medium"},
+
+    /**
+     * GstAmfEncPASceneChangeDetectionSensitivity::high:
+     *
+     * High sensitivity
+     */
+    {AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH, "High", "high"},
+    {0, nullptr, nullptr}
+  };
+
+  if (g_once_init_enter (&pa_scene_change_detection_sensitivity)) {
+    GType type =
+        g_enum_register_static
+        ("GstAmfEncPASceneChangeDetectionSensitivity", sensitivity_types);
+    g_once_init_leave (&pa_scene_change_detection_sensitivity, type);
+  }
+
+  return pa_scene_change_detection_sensitivity;
+}
+
+/**
+ * GstAmfEncPAStaticSceneDetectionSensitivity:
+ *
+ * Sensitivity of static scene detection. The higher the sensitivity, the more
+ * restrictive it is to detect a static scene.
+ *
+ * Since: 1.24
+ */
+GType
+gst_amf_enc_pa_static_scene_detection_sensitivity_get_type (void)
+{
+  static GType pa_static_scene_detection_sensitivity = 0;
+  static const GEnumValue sensitivity_types = {
+    /**
+     * GstAmfEncPAStaticSceneDetectionSensitivity::low:
+     *
+     * Low sensitivity
+     */
+    {AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_LOW, "Low", "low"},
+
+    /**
+     * GstAmfEncPAStaticSceneDetectionSensitivity::medium:
+     *
+     * Medium sensitivity
+     */
+    {AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_MEDIUM, "Medium", "medium"},
+
+    /**
+     * GstAmfEncPAStaticSceneDetectionSensitivity::high:
+     *
+     * High sensitivity
+     */
+    {AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH, "High", "high"},
+    {0, nullptr, nullptr}
+  };
+
+  if (g_once_init_enter (&pa_static_scene_detection_sensitivity)) {
+    GType type =
+        g_enum_register_static
+        ("GstAmfEncPAStaticSceneDetectionSensitivity", sensitivity_types);
+    g_once_init_leave (&pa_static_scene_detection_sensitivity, type);
+  }
+
+  return pa_static_scene_detection_sensitivity;
+}
+
+/**
+ * GstAmfEncPACAQStrength:
+ *
+ * Content Adaptive Quantization strength. Stronger CAQ strength means larger
+ * variation in block level QP assignment.
+ *
+ * Since: 1.24
+ */
+GType
+gst_amf_enc_pa_caq_strength_get_type (void)
+{
+  static GType pa_caq_strength = 0;
+  static const GEnumValue strength_types = {
+    /**
+     * GstAmfEncPACAQStrength::low:
+     *
+     * Low strength
+     */
+    {AMF_PA_CAQ_STRENGTH_LOW, "Low", "low"},
+
+    /**
+     * GstAmfEncPACAQStrength::medium:
+     *
+     * Medium strength
+     */
+    {AMF_PA_CAQ_STRENGTH_MEDIUM, "Medium", "medium"},
+
+    /**
+     * GstAmfEncPACAQStrength::high:
+     *
+     * High strength
+     */
+    {AMF_PA_CAQ_STRENGTH_HIGH, "High", "high"},
+    {0, nullptr, nullptr}
+  };
+
+  if (g_once_init_enter (&pa_caq_strength)) {
+    GType type =
+        g_enum_register_static ("GstAmfEncPACAQStrength", strength_types);
+    g_once_init_leave (&pa_caq_strength, type);
+  }
+
+  return pa_caq_strength;
+}
+
+/**
+ * GstAmfEncPAPAQMode:
+ *
+ * Sets the perceptual adaptive quantization mode.
+ *
+ * Since: 1.24
+ */
+GType
+gst_amf_enc_pa_paq_mode_get_type (void)
+{
+  static GType pa_paq_mode = 0;
+  static const GEnumValue paq_modes = {
+    /**
+     * GstAmfEncPAPAQMode::none:
+     *
+     * No perceptual adaptive quantization
+     */
+    {AMF_PA_PAQ_MODE_NONE, "None", "none"},
+
+    /**
+     * GstAmfEncPAPAQMode::caq:
+     *
+     * Content Adaptive Quantization (CAQ) mode
+     */
+    {AMF_PA_PAQ_MODE_CAQ, "Content Adaptive Quantization (CAQ) mode", "caq"},
+    {0, nullptr, nullptr}
+  };
+
+  if (g_once_init_enter (&pa_paq_mode)) {
+    GType type = g_enum_register_static ("GstAmfEncPAPAQMode", paq_modes);
+    g_once_init_leave (&pa_paq_mode, type);
+  }
+
+  return pa_paq_mode;
+}
+
+/**
+ * GstAmfEncPATAQMode:
+ *
+ * Sets the temporal adaptive quantization mode. MODE_1 is suitable for non-gaming
+ * applications whereas MODE_2 is suitable for gaming applications.
+ *
+ * Since: 1.24
+ */
+GType
+gst_amf_enc_pa_taq_mode_get_type (void)
+{
+  static GType pa_taq_mode = 0;
+  static const GEnumValue taq_modes = {
+    /**
+     * GstAmfEncPATAQMode::none:
+     *
+     * No temporal adaptive quantization
+     */
+    {AMF_PA_TAQ_MODE_NONE, "None", "none"},
+
+    /**
+     * GstAmfEncPATAQMode::mode1:
+     *
+     * MODE_1 is suitable for non-gaming applications
+     */
+    {AMF_PA_TAQ_MODE_1, "Mode_1 is suitable for non-gaming applications",
+        "mode1"},
+
+    /**
+     * GstAmfEncPATAQMode::mode2:
+     *
+     * MODE_2 is suitable for for gaming applications
+     */
+    {AMF_PA_TAQ_MODE_2, "Mode_2 is suitable for gaming applications", "mode2"},
+    {0, nullptr, nullptr}
+  };
+
+  if (g_once_init_enter (&pa_taq_mode)) {
+    GType type = g_enum_register_static ("GstAmfEncPATAQMode", taq_modes);
+    g_once_init_leave (&pa_taq_mode, type);
+  }
+
+  return pa_taq_mode;
+}
+
+/**
+ * GstAmfEncPAHQMBMode:
+ *
+ * Sets the PA high motion quality boost (HQMB) mode to help the encoder in motion search.
+ *
+ * Since: 1.24
+ */
+GType
+gst_amf_enc_pa_hmbq_mode_get_type (void)
+{
+  static GType pa_hmbq_mode = 0;
+  static const GEnumValue hmbq_modes = {
+    /**
+     * GstAmfEncPAHQMBMode::none:
+     *
+     * No high motion quality boost
+     */
+    {AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_NONE, "None", "none"},
+
+    /**
+     * GstAmfEncPAHQMBMode::auto:
+     *
+     * Automatic mode
+     */
+    {AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_AUTO, "Auto", "auto"},
+    {0, nullptr, nullptr}
+  };
+
+  if (g_once_init_enter (&pa_hmbq_mode)) {
+    GType type = g_enum_register_static ("GstAmfEncPAHQMBMode", hmbq_modes);
+    g_once_init_leave (&pa_hmbq_mode, type);
+  }
+
+  return pa_hmbq_mode;
+}
+
 GST_DEBUG_CATEGORY_STATIC (gst_amf_encoder_debug);
 #define GST_CAT_DEFAULT gst_amf_encoder_debug
 
@@ -52,26 +348,32 @@
   GstMapInfo info;
 } GstAmfEncoderFrameData;
 
+
+/* *INDENT-OFF* */
 struct _GstAmfEncoderPrivate
 {
-  gint64 adapter_luid;
-  const wchar_t *codec_id;
+  gint64 adapter_luid = 0;
+  const wchar_t *codec_id = nullptr;
 
-  GstD3D11Device *device;
-  GstD3D11Fence *fence;
-  AMFContext *context;
-  AMFComponent *comp;
-  GstBufferPool *internal_pool;
+  GstD3D11Device *device = nullptr;
+  GstD3D11Fence *fence = nullptr;
+  AMFContext *context = nullptr;
+  AMFComponent *comp = nullptr;
+  GstBufferPool *internal_pool = nullptr;
 
-  GstVideoCodecState *input_state;
+  GstVideoCodecState *input_state = nullptr;
 
   /* High precision clock */
-  guint timer_resolution;
+  guint timer_resolution = 0;
+
+  std::queue <GstClockTime> timestamp_queue;
+  GstClockTime dts_offset = 0;
+  GstClockTime last_dts = GST_CLOCK_TIME_NONE;
 };
+/* *INDENT-ON* */
 
 #define gst_amf_encoder_parent_class parent_class
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GstAmfEncoder, gst_amf_encoder,
-    GST_TYPE_VIDEO_ENCODER);
+G_DEFINE_ABSTRACT_TYPE (GstAmfEncoder, gst_amf_encoder, GST_TYPE_VIDEO_ENCODER);
 
 static void gst_amf_encoder_dispose (GObject * object);
 static void gst_amf_encoder_finalize (GObject * object);
@@ -122,6 +424,22 @@
       "amfencoder", 0, "amfencoder");
 
   gst_type_mark_as_plugin_api (GST_TYPE_AMF_ENCODER, (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_AMF_ENC_PA_ACTIVITY_TYPE,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api
+      (GST_TYPE_AMF_ENC_PA_SCENE_CHANGE_DETECTION_SENSITIVITY,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api
+      (GST_TYPE_AMF_ENC_PA_STATIC_SCENE_DETECTION_SENSITIVITY,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_AMF_ENC_PA_CAQ_STRENGTH,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_AMF_ENC_PA_PAQ_MODE,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_AMF_ENC_PA_TAQ_MODE,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_AMF_ENC_PA_HQMB_MODE,
+      (GstPluginAPIFlags) 0);
 }
 
 static void
@@ -130,8 +448,7 @@
   GstAmfEncoderPrivate *priv;
   TIMECAPS time_caps;
 
-  priv = self->priv =
-      (GstAmfEncoderPrivate *) gst_amf_encoder_get_instance_private (self);
+  priv = self->priv = new GstAmfEncoderPrivate ();
 
   gst_video_encoder_set_min_pts (GST_VIDEO_ENCODER (self),
       GST_SECOND * 60 * 60 * 1000);
@@ -167,6 +484,8 @@
   if (priv->timer_resolution)
     timeEndPeriod (priv->timer_resolution);
 
+  delete priv;
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -257,12 +576,19 @@
     priv->comp = nullptr;
   }
 
+  std::queue < GstClockTime > empty_queue;
+  std::swap (priv->timestamp_queue, empty_queue);
+
+  priv->dts_offset = 0;
+  priv->last_dts = GST_CLOCK_TIME_NONE;
+
   return TRUE;
 }
 
 static GstFlowReturn
 gst_amf_encoder_process_output (GstAmfEncoder * self, AMFBuffer * buffer)
 {
+  GstAmfEncoderPrivate *priv = self->priv;
   GstAmfEncoderClass *klass = GST_AMF_ENCODER_GET_CLASS (self);
   GstVideoEncoder *venc = GST_VIDEO_ENCODER_CAST (self);
   AMF_RESULT result;
@@ -304,11 +630,35 @@
   GST_BUFFER_FLAG_SET (output_buffer, GST_BUFFER_FLAG_MARKER);
 
   if (frame) {
+    GstClockTime dts = GST_CLOCK_TIME_NONE;
+
+    if (GST_CLOCK_TIME_IS_VALID (frame->pts) && !priv->timestamp_queue.empty ()) {
+      dts = priv->timestamp_queue.front ();
+      priv->timestamp_queue.pop ();
+
+      if (priv->dts_offset > 0)
+        dts -= priv->dts_offset;
+
+      if (!GST_CLOCK_TIME_IS_VALID (priv->last_dts)) {
+        dts = MIN (dts, frame->pts);
+        priv->last_dts = dts;
+      } else {
+        dts = MAX (priv->last_dts, dts);
+        dts = MIN (dts, frame->pts);
+        priv->last_dts = dts;
+      }
+    }
+
+    frame->dts = dts;
     frame->output_buffer = output_buffer;
 
     if (sync_point)
       GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
   } else {
+    GstClockTime pts = buffer->GetPts () * 100;
+
+    GST_BUFFER_PTS (output_buffer) = pts;
+
     if (!sync_point)
       GST_BUFFER_FLAG_SET (output_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
 
@@ -466,8 +816,8 @@
       GST_VIDEO_INFO_SIZE (info), 0, 0);
 
   params = gst_d3d11_allocation_params_new (priv->device, info,
-      GST_D3D11_ALLOCATION_FLAG_DEFAULT, 0, 0);
-  params->desc0.MiscFlags = D3D11_RESOURCE_MISC_SHARED;
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT, D3D11_BIND_SHADER_RESOURCE,
+      D3D11_RESOURCE_MISC_SHARED);
 
   gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
   gst_d3d11_allocation_params_free (params);
@@ -495,6 +845,7 @@
   AMFFactory *factory = (AMFFactory *) gst_amf_get_factory ();
   AMFComponentPtr comp;
   AMF_RESULT result;
+  guint num_reorder_frames = 0;
 
   gst_amf_encoder_drain (self, FALSE);
 
@@ -508,7 +859,8 @@
     return FALSE;
   }
 
-  if (!klass->set_format (self, priv->input_state, comp.GetPtr ())) {
+  if (!klass->set_format (self, priv->input_state, comp.GetPtr (),
+          &num_reorder_frames)) {
     GST_ERROR_OBJECT (self, "Failed to set format");
     return FALSE;
   }
@@ -520,6 +872,19 @@
 
   priv->comp = comp.Detach ();
 
+  if (num_reorder_frames > 0) {
+    gint fps_n = 25;
+    gint fps_d = 1;
+
+    if (priv->input_state->info.fps_n > 0 && priv->input_state->info.fps_d > 0) {
+      fps_n = priv->input_state->info.fps_n;
+      fps_d = priv->input_state->info.fps_d;
+    }
+
+    priv->dts_offset = gst_util_uint64_scale (GST_SECOND, fps_d, fps_n) *
+        num_reorder_frames;
+  }
+
   return TRUE;
 }
 
@@ -775,7 +1140,8 @@
   }
 
   gst_d3d11_memory_get_texture_desc (dmem, &desc);
-  if (desc.Usage != D3D11_USAGE_DEFAULT) {
+  if (desc.Usage != D3D11_USAGE_DEFAULT
+      || (desc.BindFlags & D3D11_BIND_SHADER_RESOURCE) == 0) {
     GST_TRACE_OBJECT (self, "Not a default usage texture, d3d11 copy");
     gst_d3d11_device_lock (priv->device);
     ret = gst_amf_encoder_copy_d3d11 (self, buffer, FALSE);
@@ -799,7 +1165,8 @@
 }
 
 static GstFlowReturn
-gst_amf_encoder_submit_input (GstAmfEncoder * self, AMFSurface * surface)
+gst_amf_encoder_submit_input (GstAmfEncoder * self, GstVideoCodecFrame * frame,
+    AMFSurface * surface)
 {
   GstAmfEncoderPrivate *priv = self->priv;
   AMF_RESULT result;
@@ -811,6 +1178,8 @@
       GST_TRACE_OBJECT (self, "SubmitInput returned %" GST_AMF_RESULT_FORMAT,
           GST_AMF_RESULT_ARGS (result));
       ret = GST_FLOW_OK;
+      if (GST_CLOCK_TIME_IS_VALID (frame->pts))
+        priv->timestamp_queue.push (frame->pts);
       break;
     }
 
@@ -917,7 +1286,7 @@
   klass->set_surface_prop (self, frame, surface.GetPtr ());
   gst_video_codec_frame_unref (frame);
 
-  ret = gst_amf_encoder_submit_input (self, surface.GetPtr ());
+  ret = gst_amf_encoder_submit_input (self, frame, surface.GetPtr ());
   if (ret == GST_FLOW_OK)
     ret = gst_amf_encoder_try_output (self, FALSE);
   if (ret == GST_AMF_ENCODER_FLOW_TRY_AGAIN)
@@ -1012,6 +1381,7 @@
   GstCapsFeatures *features;
   gboolean is_d3d11 = FALSE;
   guint min_buffers = 0;
+  GstD3D11AllocationParams *params;
 
   gst_query_parse_allocation (query, &caps, nullptr);
   if (!caps) {
@@ -1048,6 +1418,11 @@
   size = GST_VIDEO_INFO_SIZE (&info);
   gst_buffer_pool_config_set_params (config, caps, size, min_buffers, 0);
 
+  params = gst_d3d11_allocation_params_new (device, &info,
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0);
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_d3d11_allocation_params_free (params);
+
   if (!gst_buffer_pool_set_config (pool, config)) {
     GST_WARNING_OBJECT (self, "Failed to set pool config");
     gst_object_unref (pool);
@@ -1068,9 +1443,10 @@
   return TRUE;
 }
 
+/* *INDENT-OFF* */
 void
 gst_amf_encoder_set_subclass_data (GstAmfEncoder * encoder, gint64 adapter_luid,
-    const wchar_t *codec_id)
+    const wchar_t * codec_id)
 {
   GstAmfEncoderPrivate *priv;
 
@@ -1080,3 +1456,182 @@
   priv->adapter_luid = adapter_luid;
   priv->codec_id = codec_id;
 }
+/* *INDENT-ON* */
+
+AMF_RESULT
+gst_amf_encoder_set_pre_analysis_options (GstAmfEncoder * self,
+    AMFComponent * comp, const GstAmfEncoderPreAnalysis * pa,
+    GstAmfEncoderPASupportedOptions * pa_supported)
+{
+  AMF_RESULT result;
+  if (pa_supported->activity_type) {
+    result = comp->SetProperty (AMF_PA_ACTIVITY_TYPE,
+        (AMF_PA_ACTIVITY_TYPE_ENUM) pa->activity_type);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self,
+          "Failed to set pre-analysis activity type, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->scene_change_detection) {
+    result = comp->SetProperty (AMF_PA_SCENE_CHANGE_DETECTION_ENABLE,
+        (amf_bool) pa->scene_change_detection);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self,
+          "Failed to set pre-analysis scene change detection, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->scene_change_detection_sensitivity) {
+    result = comp->SetProperty (AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY,
+        (AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_ENUM)
+        pa->scene_change_detection_sensitivity);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self,
+          "Failed to set pre-analysis scene change detection sensitivity, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->static_scene_detection) {
+    result = comp->SetProperty (AMF_PA_STATIC_SCENE_DETECTION_ENABLE,
+        (amf_bool) pa->static_scene_detection);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self,
+          "Failed to set pre-analysis static scene detection, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->static_scene_detection_sensitivity) {
+    result = comp->SetProperty (AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY,
+        (AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_ENUM)
+        pa->static_scene_detection_sensitivity);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self,
+          "Failed to set pre-analysis static scene detection sensitivity, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->initial_qp) {
+    result = comp->SetProperty (AMF_PA_INITIAL_QP_AFTER_SCENE_CHANGE,
+        (amf_int64) pa->initial_qp);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set pre-analysis initial QP, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->max_qp) {
+    result = comp->SetProperty (AMF_PA_MAX_QP_BEFORE_FORCE_SKIP,
+        (amf_int64) pa->max_qp);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set pre-analysis max QP, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->caq_strength) {
+    result = comp->SetProperty (AMF_PA_CAQ_STRENGTH,
+        (amf_int64) pa->caq_strength);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self,
+          "Failed to set pre-analysis CAQ strength, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->frame_sad) {
+    result = comp->SetProperty (AMF_PA_FRAME_SAD_ENABLE,
+        (amf_bool) pa->frame_sad);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self,
+          "Failed to set pre-analysis frame SAD algorithm, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->ltr) {
+    result = comp->SetProperty (AMF_PA_LTR_ENABLE, (amf_bool) pa->ltr);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self,
+          "Failed to set pre-analysis automatic Long Term Reference frame management, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->lookahead_buffer_depth) {
+    result = comp->SetProperty (AMF_PA_LOOKAHEAD_BUFFER_DEPTH,
+        (amf_int64) pa->lookahead_buffer_depth);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self,
+          "Failed to set pre-analysis lookahead buffer depth, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->paq_mode) {
+    result = comp->SetProperty (AMF_PA_PAQ_MODE, (amf_int64) pa->paq_mode);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set pre-analysis PAQ mode, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->taq_mode) {
+    result = comp->SetProperty (AMF_PA_TAQ_MODE, (amf_int64) pa->taq_mode);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set pre-analysis TAQ mode, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  if (pa_supported->hmqb_mode) {
+    result = comp->SetProperty (AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE,
+        (amf_int64) pa->hmqb_mode);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self,
+          "Failed to set pre-analysis high motion quality boost mode, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      return result;
+    }
+  }
+  return AMF_OK;
+}
+
+void
+gst_amf_encoder_check_pa_supported_options (GstAmfEncoderPASupportedOptions *
+    pa_supported, AMFComponent * comp)
+{
+  if (comp->HasProperty (AMF_PA_ACTIVITY_TYPE))
+    pa_supported->activity_type = TRUE;
+  if (comp->HasProperty (AMF_PA_SCENE_CHANGE_DETECTION_ENABLE))
+    pa_supported->scene_change_detection = TRUE;
+  if (comp->HasProperty (AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY))
+    pa_supported->scene_change_detection_sensitivity = TRUE;
+  if (comp->HasProperty (AMF_PA_STATIC_SCENE_DETECTION_ENABLE))
+    pa_supported->static_scene_detection = TRUE;
+  if (comp->HasProperty (AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY))
+    pa_supported->static_scene_detection_sensitivity = TRUE;
+  if (comp->HasProperty (AMF_PA_INITIAL_QP_AFTER_SCENE_CHANGE))
+    pa_supported->initial_qp = TRUE;
+  if (comp->HasProperty (AMF_PA_MAX_QP_BEFORE_FORCE_SKIP))
+    pa_supported->max_qp = TRUE;
+  if (comp->HasProperty (AMF_PA_CAQ_STRENGTH))
+    pa_supported->caq_strength = TRUE;
+  if (comp->HasProperty (AMF_PA_FRAME_SAD_ENABLE))
+    pa_supported->frame_sad = TRUE;
+  if (comp->HasProperty (AMF_PA_LTR_ENABLE))
+    pa_supported->ltr = TRUE;
+  if (comp->HasProperty (AMF_PA_LOOKAHEAD_BUFFER_DEPTH))
+    pa_supported->lookahead_buffer_depth = TRUE;
+  if (comp->HasProperty (AMF_PA_PAQ_MODE))
+    pa_supported->paq_mode = TRUE;
+  if (comp->HasProperty (AMF_PA_TAQ_MODE))
+    pa_supported->taq_mode = TRUE;
+  if (comp->HasProperty (AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE))
+    pa_supported->hmqb_mode = TRUE;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/gstamfencoder.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/gstamfencoder.h Changed

@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <components/Component.h>
+#include <components/PreAnalysis.h>
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include "gstamfutils.h"
@@ -37,6 +39,42 @@
 typedef struct _GstAmfEncoderClass GstAmfEncoderClass;
 typedef struct _GstAmfEncoderPrivate GstAmfEncoderPrivate;
 
+typedef struct _GstAmfEncoderPASupportedOptions {
+  gboolean activity_type;
+  gboolean scene_change_detection;
+  gboolean scene_change_detection_sensitivity;
+  gboolean static_scene_detection;
+  gboolean static_scene_detection_sensitivity;
+  gboolean initial_qp;
+  gboolean max_qp;
+  gboolean caq_strength;
+  gboolean frame_sad;
+  gboolean ltr;
+  gboolean lookahead_buffer_depth;
+  gboolean paq_mode;
+  gboolean taq_mode;
+  gboolean hmqb_mode;
+} GstAmfEncoderPASupportedOptions;
+
+typedef struct _GstAmfEncoderPreAnalysis
+{
+  gboolean pre_analysis;
+  gint activity_type;
+  gboolean scene_change_detection;
+  gint scene_change_detection_sensitivity;
+  gboolean static_scene_detection;
+  gint static_scene_detection_sensitivity;
+  guint initial_qp;
+  guint max_qp;
+  gint caq_strength;
+  gboolean frame_sad;
+  gboolean ltr;
+  guint lookahead_buffer_depth;
+  gint paq_mode;
+  gint taq_mode;
+  gint hmqb_mode;
+} GstAmfEncoderPreAnalysis;
+
 struct _GstAmfEncoder
 {
   GstVideoEncoder parent;
@@ -47,10 +85,11 @@
 struct _GstAmfEncoderClass
 {
   GstVideoEncoderClass parent_class;
-
+  GstAmfEncoderPASupportedOptions pa_supported;
   gboolean    (*set_format)           (GstAmfEncoder * encoder,
                                        GstVideoCodecState * state,
-                                       gpointer component);
+                                       gpointer component,
+                                       guint * num_reorder_frames);
 
   gboolean    (*set_output_state)     (GstAmfEncoder * encoder,
                                        GstVideoCodecState * state,
@@ -73,6 +112,53 @@
                                          gint64 adapter_luid,
                                          const wchar_t * codec_id);
 
+AMF_RESULT gst_amf_encoder_set_pre_analysis_options (GstAmfEncoder * self,
+                                                     amf::AMFComponent * comp,
+                                                     const GstAmfEncoderPreAnalysis * pa,
+                                                     GstAmfEncoderPASupportedOptions * pa_supported);
+
+void gst_amf_encoder_check_pa_supported_options (GstAmfEncoderPASupportedOptions * pa_supported,
+                                                 amf::AMFComponent * comp);
+
+// Pre-analysis settings
+#define DEFAULT_PRE_ANALYSIS FALSE
+#define DEFAULT_PA_ACTIVITY_TYPE AMF_PA_ACTIVITY_Y
+#define DEFAULT_PA_SCENE_CHANGE_DETECTION TRUE
+#define DEFAULT_PA_SCENE_CHANGE_DETECTION_SENSITIVITY AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_MEDIUM
+#define DEFAULT_PA_STATIC_SCENE_DETECTION FALSE
+#define DEFAULT_PA_STATIC_SCENE_DETECTION_SENSITIVITY AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH
+
+#define DEFAULT_PA_INITIAL_QP 0
+#define DEFAULT_PA_MAX_QP 35
+#define DEFAULT_PA_CAQ_STRENGTH AMF_PA_CAQ_STRENGTH_MEDIUM
+#define DEFAULT_PA_FRAME_SAD TRUE
+#define DEFAULT_PA_LTR FALSE
+#define DEFAULT_PA_LOOKAHEAD_BUFFER_DEPTH 0
+#define DEFAULT_PA_PAQ_MODE AMF_PA_PAQ_MODE_NONE
+#define DEFAULT_PA_TAQ_MODE AMF_PA_TAQ_MODE_NONE
+#define DEFAULT_PA_HQMB_MODE AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_NONE
+
+#define GST_TYPE_AMF_ENC_PA_ACTIVITY_TYPE (gst_amf_enc_pa_activity_get_type ())
+GType gst_amf_enc_pa_activity_get_type (void);
+
+#define GST_TYPE_AMF_ENC_PA_SCENE_CHANGE_DETECTION_SENSITIVITY (gst_amf_enc_pa_scene_change_detection_sensitivity_get_type ())
+GType gst_amf_enc_pa_scene_change_detection_sensitivity_get_type (void);
+
+#define GST_TYPE_AMF_ENC_PA_STATIC_SCENE_DETECTION_SENSITIVITY (gst_amf_enc_pa_static_scene_detection_sensitivity_get_type ())
+GType gst_amf_enc_pa_static_scene_detection_sensitivity_get_type (void);
+
+#define GST_TYPE_AMF_ENC_PA_CAQ_STRENGTH (gst_amf_enc_pa_caq_strength_get_type ())
+GType gst_amf_enc_pa_caq_strength_get_type (void);
+
+#define GST_TYPE_AMF_ENC_PA_PAQ_MODE (gst_amf_enc_pa_paq_mode_get_type ())
+GType gst_amf_enc_pa_paq_mode_get_type (void);
+
+#define GST_TYPE_AMF_ENC_PA_TAQ_MODE (gst_amf_enc_pa_taq_mode_get_type ())
+GType gst_amf_enc_pa_taq_mode_get_type (void);
+
+#define GST_TYPE_AMF_ENC_PA_HQMB_MODE (gst_amf_enc_pa_hmbq_mode_get_type ())
+GType gst_amf_enc_pa_hmbq_mode_get_type (void);
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstAmfEncoder, gst_object_unref)
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/gstamfh264enc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/gstamfh264enc.cpp Changed

@@ -77,6 +77,11 @@
   amf_int64 default_qp_b;
   gboolean interlace_supported;
   guint valign;
+  gboolean pre_encode_supported;
+  gboolean smart_access_supported;
+  gboolean mini_gop_supported;
+  gboolean b_frames_delta_qp_supported;
+  GstAmfEncoderPASupportedOptions pa_supported;
 } GstAmfH264EncDeviceCaps;
 
 /**
@@ -273,6 +278,29 @@
   PROP_REF_FRAMES,
   PROP_AUD,
   PROP_CABAC,
+  PROP_ADAPT_MINI_GOP,
+  PROP_MAX_B_FRAMES,
+  PROP_B_FRAMES,
+  PROP_B_REFERENCE,
+  PROP_B_FRAMES_DELTA_QP,
+  PROP_REF_B_FRAMES_DELTA_QP,
+  PROP_SMART_ACCESS,
+  PROP_PRE_ENCODE,
+  PROP_PRE_ANALYSIS,
+  PROP_PA_ACTIVITY_TYPE,
+  PROP_PA_SCENE_CHANGE_DETECTION,
+  PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY,
+  PROP_PA_STATIC_SCENE_DETECTION,
+  PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY,
+  PROP_PA_INITIAL_QP,
+  PROP_PA_MAX_QP,
+  PROP_PA_CAQ_STRENGTH,
+  PROP_PA_FRAME_SAD,
+  PROP_PA_LTR,
+  PROP_PA_LOOKAHEAD_BUFFER_DEPTH,
+  PROP_PA_PAQ_MODE,
+  PROP_PA_TAQ_MODE,
+  PROP_PA_HQMB_MODE,
 };
 
 #define DEFAULT_USAGE AMF_VIDEO_ENCODER_USAGE_TRANSCODING
@@ -284,6 +312,17 @@
 #define DEFAULT_MIN_MAX_QP -1
 #define DEFAULT_AUD TRUE
 #define DEFAULT_CABAC TRUE
+#define DEFAULT_ADAPT_MINI_GOP FALSE
+
+// B-frames settings
+#define DEFAULT_MAX_B_FRAMES 0
+#define DEFAULT_B_FRAMES 0
+#define DEFAULT_B_REFERENCE TRUE
+#define DEFAULT_B_FRAMES_DELTA_QP 4
+#define DEFAULT_REF_B_FRAMES_DELTA_QP 4
+
+#define DEFAULT_SMART_ACCESS FALSE
+#define DEFAULT_PRE_ENCODE FALSE
 
 #define DOC_SINK_CAPS_COMM \
     "format = (string) NV12, " \
@@ -298,6 +337,7 @@
     "profile = (string) { main, high, constrained-baseline, baseline }, " \
     "stream-format = (string) { avc, byte-stream }, alignment = (string) au"
 
+
 typedef struct _GstAmfH264Enc
 {
   GstAmfEncoder parent;
@@ -322,6 +362,17 @@
 
   gboolean aud;
   gboolean cabac;
+  gboolean adaptive_mini_gop;
+
+  guint max_b_frames;
+  gint b_frames;
+  gboolean b_reference;
+  gint b_frames_delta_qp;
+  gint ref_b_frames_delta_qp;
+
+  gboolean smart_access;
+  gboolean pre_encode;
+  GstAmfEncoderPreAnalysis pa;
 } GstAmfH264Enc;
 
 typedef struct _GstAmfH264EncClass
@@ -344,7 +395,7 @@
 static GstCaps *gst_amf_h264_enc_getcaps (GstVideoEncoder * encoder,
     GstCaps * filter);
 static gboolean gst_amf_h264_enc_set_format (GstAmfEncoder * encoder,
-    GstVideoCodecState * state, gpointer component);
+    GstVideoCodecState * state, gpointer component, guint * num_reorder_frames);
 static gboolean gst_amf_h264_enc_set_output_state (GstAmfEncoder * encoder,
     GstVideoCodecState * state, gpointer component);
 static gboolean gst_amf_h264_enc_set_surface_prop (GstAmfEncoder * encoder,
@@ -362,8 +413,11 @@
   GstAmfEncoderClass *amf_class = GST_AMF_ENCODER_CLASS (klass);
   GstAmfH264EncClassData *cdata = (GstAmfH264EncClassData *) data;
   GstAmfH264EncDeviceCaps *dev_caps = &cdata->dev_caps;
+  GstAmfEncoderPASupportedOptions *pa_supported = &dev_caps->pa_supported;
   GParamFlags param_flags = (GParamFlags) (G_PARAM_READWRITE |
       GST_PARAM_MUTABLE_PLAYING | G_PARAM_STATIC_STRINGS);
+  GParamFlags pa_param_flags = (GParamFlags) (G_PARAM_READWRITE |
+      G_PARAM_STATIC_STRINGS | GST_PARAM_CONDITIONALLY_AVAILABLE);
   GstPadTemplate *pad_templ;
   GstCaps *doc_caps;
 
@@ -429,6 +483,343 @@
       g_param_spec_boolean ("cabac", "CABAC",
           "Enable CABAC entropy coding", TRUE, param_flags));
 
+  if (cdata->dev_caps.pre_encode_supported) {
+    /**
+     * GstAmfH264Enc:pre-encode:
+     *
+     * Enable pre-encode assisted rate control
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_PRE_ENCODE,
+        g_param_spec_boolean ("pre-encode", "Pre-encode",
+            "Enable pre-encode", DEFAULT_PRE_ENCODE,
+            (GParamFlags) (param_flags | GST_PARAM_CONDITIONALLY_AVAILABLE)));
+  }
+
+  if (dev_caps->bframes) {
+    /**
+     * GstAmfH264Enc:max-b-frames:
+     *
+     * Maximum number of consecutive B pictures
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_MAX_B_FRAMES,
+        g_param_spec_uint ("max-b-frames", "Maximum number of B-frames",
+            "Maximum number of consecutive B Pictures. "
+            "Suggestion set to 3 if b-frames is not 0", 0, 3,
+            DEFAULT_MAX_B_FRAMES, param_flags));
+
+    /**
+     * GstAmfH264Enc:b-frames:
+     *
+     * Number of consecutive B pictures in a GOP
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_B_FRAMES,
+        g_param_spec_int ("b-frames", "B-Frames",
+            "Number of consecutive B-frames in a GOP. "
+            "If b-frames > max-b-frames, then b-frames set to max-b-frames "
+            "(-1: USAGE default)", -1, 3, DEFAULT_B_FRAMES, param_flags));
+
+    /**
+     * GstAmfH264Enc:b-reference:
+     *
+     * Enable using B-pictures as references
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_B_REFERENCE,
+        g_param_spec_boolean ("b-reference", "B-Frames as reference",
+            "Enables or disables using B-pictures as references",
+            DEFAULT_B_REFERENCE, param_flags));
+
+    if (dev_caps->b_frames_delta_qp_supported) {
+      /**
+       * GstAmfH264Enc:b-frames-delta-qp:
+       *
+       * delta QP of non-reference B pictures with respect to I pictures
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_B_FRAMES_DELTA_QP,
+          g_param_spec_int ("b-frames-delta-qp", "B-Frames delta QP",
+              "Selects the delta QP of non-reference B pictures with respect to I pictures",
+              -10, 10, DEFAULT_B_FRAMES_DELTA_QP, param_flags));
+
+      /**
+       * GstAmfH264Enc:ref-b-frames-delta-qp:
+       *
+       * delta QP of reference B pictures with respect to I pictures
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_REF_B_FRAMES_DELTA_QP,
+          g_param_spec_int ("ref-b-frames-delta-qp",
+              "Reference B-Frames delta QP",
+              "Selects delta QP of reference B pictures with respect to I pictures",
+              -10, 10, DEFAULT_REF_B_FRAMES_DELTA_QP, param_flags));
+    }
+  }
+
+  if (cdata->dev_caps.smart_access_supported) {
+    /**
+     * GstAmfH264Enc:smart-access-video:
+     *
+     * Enable AMF SmartAccess Video feature
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_SMART_ACCESS,
+        g_param_spec_boolean ("smart-access-video", "Smart Access Video",
+            "Enable AMF SmartAccess Video feature for optimal distribution"
+            " between multiple AMD hardware instances", DEFAULT_SMART_ACCESS,
+            (GParamFlags) (G_PARAM_READWRITE |
+                GST_PARAM_CONDITIONALLY_AVAILABLE |
+                GST_PARAM_MUTABLE_PLAYING | G_PARAM_STATIC_STRINGS)));
+  }
+
+  if (dev_caps->pre_analysis) {
+    /**
+     * GstAmfH264Enc:pre-analysis:
+     *
+     * Enable the pre-analysis module
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_PRE_ANALYSIS,
+        g_param_spec_boolean ("pre-analysis", "Pre Analysis",
+            "Enable pre-analysis", DEFAULT_PRE_ANALYSIS, param_flags));
+
+    if (cdata->dev_caps.mini_gop_supported) {
+      /**
+       * GstAmfH264Enc:adaptive-mini-gop:
+       *
+       * Enable Adaptive MiniGOP
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_ADAPT_MINI_GOP,
+          g_param_spec_boolean ("adaptive-mini-gop", "Adaptive MiniGOP",
+              "Enable Adaptive MiniGOP. Determines the number of B-frames to be "
+              "inserted between I and P frames, or between two consecutive P-frames",
+              DEFAULT_ADAPT_MINI_GOP,
+              (GParamFlags) (param_flags | GST_PARAM_CONDITIONALLY_AVAILABLE)));
+    }
+    if (pa_supported->activity_type) {
+      /**
+       * GstAmfH264Enc:pa-activity-type:
+       *
+       * Set the type of activity analysis for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_ACTIVITY_TYPE,
+          g_param_spec_enum ("pa-activity-type", "Pre-analysis activity type",
+              "Set the type of activity analysis for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_ACTIVITY_TYPE, DEFAULT_PA_ACTIVITY_TYPE,
+              pa_param_flags));
+    }
+
+    if (pa_supported->scene_change_detection) {
+      /**
+       * GstAmfH264Enc:pa-scene-change-detection:
+       *
+       * Enable scene change detection for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_SCENE_CHANGE_DETECTION,
+          g_param_spec_boolean ("pa-scene-change-detection",
+              "Pre-analysis scene change detection",
+              "Enable scene change detection for pre-analysis",
+              DEFAULT_PA_SCENE_CHANGE_DETECTION, pa_param_flags));
+    }
+
+    if (pa_supported->scene_change_detection_sensitivity) {
+      /**
+       * GstAmfH264Enc:pa-scene-change-detection-sensitivity:
+       *
+       * Pre-analysis scene change detection sensitivity
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY,
+          g_param_spec_enum ("pa-scene-change-detection-sensitivity",
+              "Pre-analysis scene change detection sensitivity",
+              "Set the sensitivity of scene change detection for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_SCENE_CHANGE_DETECTION_SENSITIVITY,
+              DEFAULT_PA_SCENE_CHANGE_DETECTION_SENSITIVITY, pa_param_flags));
+    }
+    if (pa_supported->static_scene_detection) {
+      /**
+       * GstAmfH264Enc:pa-static-scene-detection:
+       *
+       * Enable static scene detection for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_STATIC_SCENE_DETECTION,
+          g_param_spec_boolean ("pa-static-scene-detection",
+              "Pre-analysis static scene detection",
+              "Enable static scene detection for pre-analysis",
+              DEFAULT_PA_STATIC_SCENE_DETECTION, pa_param_flags));
+    }
+
+    if (pa_supported->static_scene_detection_sensitivity) {
+      /**
+       * GstAmfH264Enc:pa-static-scene-detection-sensitivity:
+       *
+       * Pre-analysis static scene detection sensitivity
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY,
+          g_param_spec_enum ("pa-static-scene-detection-sensitivity",
+              "Pre-analysis static scene detection sensitivity",
+              "Set the sensitivity of static scene detection for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_STATIC_SCENE_DETECTION_SENSITIVITY,
+              DEFAULT_PA_STATIC_SCENE_DETECTION_SENSITIVITY, pa_param_flags));
+    }
+
+    if (pa_supported->initial_qp) {
+      /**
+       * GstAmfH264Enc:pa-initial-qp:
+       *
+       * Pre-analysis initial QP
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_INITIAL_QP,
+          g_param_spec_uint ("pa-initial-qp", "Pre-analysis initial QP",
+              "The QP value that is used immediately after a scene change", 0,
+              51, DEFAULT_PA_INITIAL_QP, pa_param_flags));
+    }
+
+    if (pa_supported->max_qp) {
+      /**
+       * GstAmfH264Enc:pa-max-qp:
+       *
+       * Pre-analysis max QP
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_MAX_QP,
+          g_param_spec_uint ("pa-max-qp", "Pre-analysis max QP",
+              "The QP threshold to allow a skip frame", 0, 51,
+              DEFAULT_PA_MAX_QP, pa_param_flags));
+    }
+
+    if (pa_supported->caq_strength) {
+      /**
+       * GstAmfH264Enc:pa-caq-strength:
+       *
+       * Content Adaptive Quantization strength for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_CAQ_STRENGTH,
+          g_param_spec_enum ("pa-caq-strength", "Pre-analysis CAQ strength",
+              "Content Adaptive Quantization strength for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_CAQ_STRENGTH, DEFAULT_PA_CAQ_STRENGTH,
+              pa_param_flags));
+    }
+
+    if (pa_supported->frame_sad) {
+      /**
+       * GstAmfH264Enc:pa-frame-sad:
+       *
+       * Enable Frame SAD algorithm
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_FRAME_SAD,
+          g_param_spec_boolean ("pa-frame-sad", "Pre-analysis SAD algorithm",
+              "Enable Frame SAD algorithm", DEFAULT_PA_FRAME_SAD,
+              pa_param_flags));
+    }
+
+    if (pa_supported->ltr) {
+      /**
+       * GstAmfH264Enc:pa-ltr:
+       *
+       * Enable long term reference frame management
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_LTR,
+          g_param_spec_boolean ("pa-ltr", "Pre-analysis LTR",
+              "Enable long term reference frame management", DEFAULT_PA_LTR,
+              pa_param_flags));
+    }
+
+    if (pa_supported->lookahead_buffer_depth) {
+      /**
+       * GstAmfH264Enc:pa-lookahead-buffer-depth:
+       *
+       * Pre-analysis lookahead buffer depth
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_LOOKAHEAD_BUFFER_DEPTH,
+          g_param_spec_uint ("pa-lookahead-buffer-depth",
+              "Pre-analysis lookahead buffer depth",
+              "Set the PA lookahead buffer size", 0, 41,
+              DEFAULT_PA_LOOKAHEAD_BUFFER_DEPTH, pa_param_flags));
+    }
+
+    if (pa_supported->paq_mode) {
+      /**
+       * GstAmfH264Enc:pa-paq-mode:
+       *
+       * Set the perceptual adaptive quantization mode
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_PAQ_MODE,
+          g_param_spec_enum ("pa-paq-mode", "Pre-analysis PAQ mode",
+              "Set the perceptual adaptive quantization mode",
+              GST_TYPE_AMF_ENC_PA_PAQ_MODE, DEFAULT_PA_PAQ_MODE,
+              pa_param_flags));
+    }
+
+    if (pa_supported->taq_mode) {
+      /**
+       * GstAmfH264Enc:pa-taq-mode:
+       *
+       * Set the temporal adaptive quantization mode
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_TAQ_MODE,
+          g_param_spec_enum ("pa-taq-mode", "Pre-analysis TAQ mode",
+              "Set the temporal adaptive quantization mode",
+              GST_TYPE_AMF_ENC_PA_TAQ_MODE, DEFAULT_PA_TAQ_MODE,
+              pa_param_flags));
+    }
+
+    if (pa_supported->hmqb_mode) {
+      /**
+       * GstAmfH264Enc:pa-hqmb-mode:
+       *
+       * Set the PA high motion quality boost mode
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_HQMB_MODE,
+          g_param_spec_enum ("pa-hqmb-mode", "Pre-analysis HQMB mode",
+              "Set the PA high motion quality boost mode",
+              GST_TYPE_AMF_ENC_PA_HQMB_MODE, DEFAULT_PA_HQMB_MODE,
+              pa_param_flags));
+    }
+  }
   gst_element_class_set_metadata (element_class,
       "AMD AMF H.264 Video Encoder",
       "Codec/Encoder/Video/Hardware",
@@ -502,6 +893,33 @@
   self->ref_frames = (guint) dev_caps->min_ref_frames;
   self->aud = DEFAULT_AUD;
   self->cabac = DEFAULT_CABAC;
+  self->adaptive_mini_gop = DEFAULT_ADAPT_MINI_GOP;
+  self->smart_access = DEFAULT_SMART_ACCESS;
+  self->pre_encode = DEFAULT_PRE_ENCODE;
+  // b-frames settings
+  self->max_b_frames = DEFAULT_MAX_B_FRAMES;
+  self->b_frames = DEFAULT_B_FRAMES;
+  self->b_reference = DEFAULT_B_REFERENCE;
+  self->b_frames_delta_qp = DEFAULT_B_FRAMES_DELTA_QP;
+  self->ref_b_frames_delta_qp = DEFAULT_REF_B_FRAMES_DELTA_QP;
+  // Init pre-analysis options
+  self->pa.pre_analysis = DEFAULT_PRE_ANALYSIS;
+  self->pa.activity_type = DEFAULT_PA_ACTIVITY_TYPE;
+  self->pa.scene_change_detection = DEFAULT_PA_SCENE_CHANGE_DETECTION;
+  self->pa.scene_change_detection_sensitivity =
+      DEFAULT_PA_SCENE_CHANGE_DETECTION_SENSITIVITY;
+  self->pa.static_scene_detection = DEFAULT_PA_STATIC_SCENE_DETECTION;
+  self->pa.static_scene_detection_sensitivity =
+      DEFAULT_PA_STATIC_SCENE_DETECTION_SENSITIVITY;
+  self->pa.initial_qp = DEFAULT_PA_INITIAL_QP;
+  self->pa.max_qp = DEFAULT_PA_MAX_QP;
+  self->pa.caq_strength = DEFAULT_PA_CAQ_STRENGTH;
+  self->pa.frame_sad = DEFAULT_PA_FRAME_SAD;
+  self->pa.ltr = DEFAULT_PA_LTR;
+  self->pa.lookahead_buffer_depth = DEFAULT_PA_LOOKAHEAD_BUFFER_DEPTH;
+  self->pa.paq_mode = DEFAULT_PA_PAQ_MODE;
+  self->pa.taq_mode = DEFAULT_PA_TAQ_MODE;
+  self->pa.hmqb_mode = DEFAULT_PA_HQMB_MODE;
 }
 
 static void
@@ -611,6 +1029,74 @@
     case PROP_CABAC:
       update_bool (self, &self->cabac, value);
       break;
+    case PROP_ADAPT_MINI_GOP:
+      update_bool (self, &self->adaptive_mini_gop, value);
+      break;
+    case PROP_MAX_B_FRAMES:
+      update_uint (self, &self->max_b_frames, value);
+      break;
+    case PROP_B_FRAMES:
+      update_int (self, &self->b_frames, value);
+      break;
+    case PROP_B_REFERENCE:
+      update_bool (self, &self->b_reference, value);
+      break;
+    case PROP_B_FRAMES_DELTA_QP:
+      update_int (self, &self->b_frames_delta_qp, value);
+      break;
+    case PROP_REF_B_FRAMES_DELTA_QP:
+      update_int (self, &self->ref_b_frames_delta_qp, value);
+      break;
+    case PROP_SMART_ACCESS:
+      update_bool (self, &self->smart_access, value);
+      break;
+    case PROP_PRE_ENCODE:
+      update_bool (self, &self->pre_encode, value);
+      break;
+    case PROP_PRE_ANALYSIS:
+      update_bool (self, &self->pa.pre_analysis, value);
+      break;
+    case PROP_PA_ACTIVITY_TYPE:
+      update_enum (self, &self->pa.activity_type, value);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION:
+      update_bool (self, &self->pa.scene_change_detection, value);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY:
+      update_enum (self, &self->pa.scene_change_detection_sensitivity, value);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION:
+      update_bool (self, &self->pa.static_scene_detection, value);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY:
+      update_enum (self, &self->pa.static_scene_detection_sensitivity, value);
+      break;
+    case PROP_PA_INITIAL_QP:
+      update_uint (self, &self->pa.initial_qp, value);
+      break;
+    case PROP_PA_MAX_QP:
+      update_uint (self, &self->pa.max_qp, value);
+      break;
+    case PROP_PA_CAQ_STRENGTH:
+      update_enum (self, &self->pa.caq_strength, value);
+      break;
+    case PROP_PA_FRAME_SAD:
+      update_bool (self, &self->pa.frame_sad, value);
+    case PROP_PA_LTR:
+      update_bool (self, &self->pa.ltr, value);
+      break;
+    case PROP_PA_LOOKAHEAD_BUFFER_DEPTH:
+      update_uint (self, &self->pa.lookahead_buffer_depth, value);
+      break;
+    case PROP_PA_PAQ_MODE:
+      update_enum (self, &self->pa.paq_mode, value);
+      break;
+    case PROP_PA_TAQ_MODE:
+      update_enum (self, &self->pa.taq_mode, value);
+      break;
+    case PROP_PA_HQMB_MODE:
+      update_enum (self, &self->pa.hmqb_mode, value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -668,6 +1154,75 @@
     case PROP_CABAC:
       g_value_set_boolean (value, self->cabac);
       break;
+    case PROP_ADAPT_MINI_GOP:
+      g_value_set_boolean (value, self->adaptive_mini_gop);
+      break;
+    case PROP_MAX_B_FRAMES:
+      g_value_set_uint (value, self->max_b_frames);
+      break;
+    case PROP_B_FRAMES:
+      g_value_set_int (value, self->b_frames);
+      break;
+    case PROP_B_REFERENCE:
+      g_value_set_boolean (value, self->b_reference);
+      break;
+    case PROP_B_FRAMES_DELTA_QP:
+      g_value_set_int (value, self->b_frames_delta_qp);
+      break;
+    case PROP_REF_B_FRAMES_DELTA_QP:
+      g_value_set_int (value, self->ref_b_frames_delta_qp);
+      break;
+    case PROP_SMART_ACCESS:
+      g_value_set_boolean (value, self->smart_access);
+      break;
+    case PROP_PRE_ENCODE:
+      g_value_set_boolean (value, self->pre_encode);
+      break;
+    case PROP_PRE_ANALYSIS:
+      g_value_set_boolean (value, self->pa.pre_analysis);
+      break;
+    case PROP_PA_ACTIVITY_TYPE:
+      g_value_set_enum (value, self->pa.activity_type);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION:
+      g_value_set_boolean (value, self->pa.scene_change_detection);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY:
+      g_value_set_enum (value, self->pa.scene_change_detection_sensitivity);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION:
+      g_value_set_boolean (value, self->pa.static_scene_detection);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY:
+      g_value_set_enum (value, self->pa.static_scene_detection_sensitivity);
+      break;
+    case PROP_PA_INITIAL_QP:
+      g_value_set_uint (value, self->pa.initial_qp);
+      break;
+    case PROP_PA_MAX_QP:
+      g_value_set_uint (value, self->pa.max_qp);
+      break;
+    case PROP_PA_CAQ_STRENGTH:
+      g_value_set_enum (value, self->pa.caq_strength);
+      break;
+    case PROP_PA_FRAME_SAD:
+      g_value_set_boolean (value, self->pa.frame_sad);
+      break;
+    case PROP_PA_LTR:
+      g_value_set_boolean (value, self->pa.ltr);
+      break;
+    case PROP_PA_LOOKAHEAD_BUFFER_DEPTH:
+      g_value_set_uint (value, self->pa.lookahead_buffer_depth);
+      break;
+    case PROP_PA_PAQ_MODE:
+      g_value_set_enum (value, self->pa.paq_mode);
+      break;
+    case PROP_PA_TAQ_MODE:
+      g_value_set_enum (value, self->pa.taq_mode);
+      break;
+    case PROP_PA_HQMB_MODE:
+      g_value_set_enum (value, self->pa.hmqb_mode);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -788,7 +1343,7 @@
 
 static gboolean
 gst_amf_h264_enc_set_format (GstAmfEncoder * encoder,
-    GstVideoCodecState * state, gpointer component)
+    GstVideoCodecState * state, gpointer component, guint * num_reorder_frames)
 {
   GstAmfH264Enc *self = GST_AMF_H264_ENC (encoder);
   GstAmfH264EncClass *klass = GST_AMF_H264_ENC_GET_CLASS (self);
@@ -927,6 +1482,109 @@
     }
   }
 
+  if (dev_caps->bframes && (profile == AMF_VIDEO_ENCODER_PROFILE_MAIN ||
+          profile == AMF_VIDEO_ENCODER_PROFILE_HIGH)) {
+    result = comp->SetProperty (AMF_VIDEO_ENCODER_MAX_CONSECUTIVE_BPICTURES,
+        (amf_int64) self->max_b_frames);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self,
+          "Failed to set maximum number of consecutive B Pictures, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+
+    if (self->max_b_frames > 0) {
+      gint b_frames = self->b_frames;
+      if (b_frames != -1 && (guint) b_frames > self->max_b_frames) {
+        GST_WARNING_OBJECT (self,
+            "Limited b-frames option to max-b-frames value");
+        b_frames = self->max_b_frames;
+      }
+
+      if (b_frames != -1) {
+        result = comp->SetProperty (AMF_VIDEO_ENCODER_B_PIC_PATTERN,
+            (amf_int64) b_frames);
+        if (result != AMF_OK) {
+          GST_ERROR_OBJECT (self, "Failed to set B-picture pattern, result %"
+              GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+          goto error;
+        }
+      }
+
+      result = comp->SetProperty (AMF_VIDEO_ENCODER_B_REFERENCE_ENABLE,
+          (amf_bool) self->b_reference);
+      if (result != AMF_OK) {
+        GST_ERROR_OBJECT (self,
+            "Failed to set using B-frames as reference, result %"
+            GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+        goto error;
+      }
+
+      if (dev_caps->b_frames_delta_qp_supported) {
+        result = comp->SetProperty (AMF_VIDEO_ENCODER_B_PIC_DELTA_QP,
+            (amf_int64) self->b_frames_delta_qp);
+        if (result != AMF_OK) {
+          GST_ERROR_OBJECT (self, "Failed to set B-frames delta QP, result %"
+              GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+          goto error;
+        }
+
+        result = comp->SetProperty (AMF_VIDEO_ENCODER_REF_B_PIC_DELTA_QP,
+            (amf_int64) self->ref_b_frames_delta_qp);
+        if (result != AMF_OK) {
+          GST_ERROR_OBJECT (self,
+              "Failed to set reference B-frames delta QP, result %"
+              GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+          goto error;
+        }
+      }
+    }
+  }
+
+  if (dev_caps->smart_access_supported) {
+    result = comp->SetProperty (AMF_VIDEO_ENCODER_ENABLE_SMART_ACCESS_VIDEO,
+        (amf_bool) self->smart_access);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (self, "Failed to set smart access video, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+    }
+  }
+  if (dev_caps->pre_encode_supported) {
+    result = comp->SetProperty (AMF_VIDEO_ENCODER_PREENCODE_ENABLE,
+        (amf_bool) self->pre_encode);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set pre-encode, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+  }
+
+  if (dev_caps->pre_analysis) {
+    result = comp->SetProperty (AMF_VIDEO_ENCODER_PRE_ANALYSIS_ENABLE,
+        (amf_bool) self->pa.pre_analysis);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set pre-analysis, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+    if (dev_caps->mini_gop_supported) {
+      result = comp->SetProperty (AMF_VIDEO_ENCODER_ADAPTIVE_MINIGOP,
+          (amf_int64) self->adaptive_mini_gop);
+      if (result != AMF_OK) {
+        GST_ERROR_OBJECT (self, "Failed to set adaptive mini GOP, result %"
+            GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+        goto error;
+      }
+    }
+
+    if (self->pa.pre_analysis) {
+      result =
+          gst_amf_encoder_set_pre_analysis_options (encoder, comp, &self->pa,
+          &dev_caps->pa_supported);
+      if (result != AMF_OK)
+        goto error;
+    }
+  }
   result = comp->Init (AMF_SURFACE_NV12, info->width, info->height);
   if (result != AMF_OK) {
     GST_ERROR_OBJECT (self, "Failed to init component, result %"
@@ -1024,6 +1682,21 @@
     goto error;
   }
 
+  if (dev_caps->bframes && (profile == AMF_VIDEO_ENCODER_PROFILE_MAIN ||
+          profile == AMF_VIDEO_ENCODER_PROFILE_HIGH)) {
+    int64_val = 0;
+    result = comp->GetProperty (AMF_VIDEO_ENCODER_B_PIC_PATTERN, &int64_val);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Couldn't get b-frame setting, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+
+    if (int64_val > 0) {
+      *num_reorder_frames = (guint) int64_val;
+    }
+  }
+
   self->property_updated = FALSE;
   g_mutex_unlock (&self->prop_lock);
 
@@ -1330,6 +2003,10 @@
   amf_int32 out_min_width = 0, out_max_width = 0;
   amf_int32 out_min_height = 0, out_max_height = 0;
   amf_bool interlace_supported;
+  amf_bool pre_encode_supported;
+  amf_bool smart_access_supported;
+  amf_bool mini_gop_supported;
+  amf_bool b_frames_delta_qp_supported;
   amf_int32 num_val;
   gboolean have_nv12 = FALSE;
   gboolean d3d11_supported = FALSE;
@@ -1461,6 +2138,52 @@
   QUERY_DEFAULT_PROP (AMF_VIDEO_ENCODER_QP_I, default_qp_b, 22);
 #undef QUERY_DEFAULT_PROP
 
+  result = comp->GetProperty (AMF_VIDEO_ENCODER_PREENCODE_ENABLE,
+      &pre_encode_supported);
+  if (result == AMF_OK)
+    dev_caps.pre_encode_supported = TRUE;
+
+  result = comp->GetProperty (AMF_VIDEO_ENCODER_ENABLE_SMART_ACCESS_VIDEO,
+      &smart_access_supported);
+  if (result == AMF_OK)
+    dev_caps.smart_access_supported = TRUE;
+
+  result = comp->GetProperty (AMF_VIDEO_ENCODER_B_PIC_DELTA_QP,
+      &b_frames_delta_qp_supported);
+  if (result == AMF_OK)
+    dev_caps.b_frames_delta_qp_supported = TRUE;
+
+
+  if (dev_caps.pre_analysis) {
+    amf_bool pre_analysis = FALSE;
+
+    result = comp->GetProperty (AMF_VIDEO_ENCODER_ADAPTIVE_MINIGOP,
+        &mini_gop_supported);
+    if (result == AMF_OK)
+      dev_caps.mini_gop_supported = TRUE;
+
+    // Store initial pre-analysis value
+    result =
+        comp->GetProperty (AMF_VIDEO_ENCODER_PRE_ANALYSIS_ENABLE,
+        &pre_analysis);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (device, "Failed to get pre-analysis option");
+    }
+    // We need to enable pre-analysis for checking options availability
+    result =
+        comp->SetProperty (AMF_VIDEO_ENCODER_PRE_ANALYSIS_ENABLE,
+        (amf_bool) TRUE);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (device, "Failed to set pre-analysis option");
+    }
+    gst_amf_encoder_check_pa_supported_options (&dev_caps.pa_supported, comp);
+    result =
+        comp->SetProperty (AMF_VIDEO_ENCODER_PRE_ANALYSIS_ENABLE, pre_analysis);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (device, "Failed to set pre-analysis options");
+    }
+  }
+
   min_width = MAX (in_min_width, 1);
   max_width = in_max_width;
   if (max_width == 0) {

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/gstamfh265enc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/gstamfh265enc.cpp Changed

@@ -42,6 +42,7 @@
 #include <components/Component.h>
 #include <components/VideoEncoderHEVC.h>
 #include <core/Factory.h>
+#include <set>
 #include <string>
 #include <vector>
 #include <string.h>
@@ -74,6 +75,9 @@
   amf_int64 max_gop_size;
   amf_int64 default_gop_size;
   guint valign;
+  gboolean pre_encode_supported;
+  gboolean smart_access_supported;
+  GstAmfEncoderPASupportedOptions pa_supported;
 } GstAmfH265EncDeviceCaps;
 
 /**
@@ -272,6 +276,23 @@
   PROP_QP_P,
   PROP_REF_FRAMES,
   PROP_AUD,
+  PROP_SMART_ACCESS,
+  PROP_PRE_ENCODE,
+  PROP_PRE_ANALYSIS,
+  PROP_PA_ACTIVITY_TYPE,
+  PROP_PA_SCENE_CHANGE_DETECTION,
+  PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY,
+  PROP_PA_STATIC_SCENE_DETECTION,
+  PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY,
+  PROP_PA_INITIAL_QP,
+  PROP_PA_MAX_QP,
+  PROP_PA_CAQ_STRENGTH,
+  PROP_PA_FRAME_SAD,
+  PROP_PA_LTR,
+  PROP_PA_LOOKAHEAD_BUFFER_DEPTH,
+  PROP_PA_PAQ_MODE,
+  PROP_PA_TAQ_MODE,
+  PROP_PA_HQMB_MODE,
 };
 
 #define DEFAULT_USAGE AMF_VIDEO_ENCODER_HEVC_USAGE_TRANSCODING
@@ -281,9 +302,11 @@
 #define DEFAULT_MAX_BITRATE 0
 #define DEFAULT_MIN_MAX_QP -1
 #define DEFAULT_AUD TRUE
+#define DEFAULT_SMART_ACCESS FALSE
+#define DEFAULT_PRE_ENCODE FALSE
 
 #define DOC_SINK_CAPS_COMM \
-    "format = (string) NV12, " \
+    "format = (string) {NV12, P010_10LE}, " \
     "width = (int)  128, 4096 , height = (int)  128, 4096 "
 
 #define DOC_SINK_CAPS \
@@ -292,7 +315,7 @@
 
 #define DOC_SRC_CAPS \
     "video/x-h265, width = (int)  128, 4096 , height = (int)  128, 4096 , " \
-    "profile = (string) main, stream-format = (string) byte-stream, " \
+    "profile = (string) {main, main-10}, stream-format = (string) byte-stream, " \
     "alignment = (string) au"
 
 typedef struct _GstAmfH265Enc
@@ -317,6 +340,9 @@
   guint ref_frames;
 
   gboolean aud;
+  gboolean smart_access;
+  gboolean pre_encode;
+  GstAmfEncoderPreAnalysis pa;
 } GstAmfH265Enc;
 
 typedef struct _GstAmfH265EncClass
@@ -336,8 +362,10 @@
     const GValue * value, GParamSpec * pspec);
 static void gst_amf_h265_enc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
+static GstCaps *gst_amf_h265_enc_getcaps (GstVideoEncoder * encoder,
+    GstCaps * filter);
 static gboolean gst_amf_h265_enc_set_format (GstAmfEncoder * encoder,
-    GstVideoCodecState * state, gpointer component);
+    GstVideoCodecState * state, gpointer component, guint * num_reorder_frames);
 static gboolean gst_amf_h265_enc_set_output_state (GstAmfEncoder * encoder,
     GstVideoCodecState * state, gpointer component);
 static gboolean gst_amf_h265_enc_set_surface_prop (GstAmfEncoder * encoder,
@@ -351,11 +379,15 @@
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoEncoderClass *videoenc_class = GST_VIDEO_ENCODER_CLASS (klass);
   GstAmfEncoderClass *amf_class = GST_AMF_ENCODER_CLASS (klass);
   GstAmfH265EncClassData *cdata = (GstAmfH265EncClassData *) data;
   GstAmfH265EncDeviceCaps *dev_caps = &cdata->dev_caps;
+  GstAmfEncoderPASupportedOptions *pa_supported = &dev_caps->pa_supported;
   GParamFlags param_flags = (GParamFlags) (G_PARAM_READWRITE |
       GST_PARAM_MUTABLE_PLAYING | G_PARAM_STATIC_STRINGS);
+  GParamFlags pa_param_flags = (GParamFlags) (G_PARAM_READWRITE |
+      G_PARAM_STATIC_STRINGS | GST_PARAM_CONDITIONALLY_AVAILABLE);
   GstPadTemplate *pad_templ;
   GstCaps *doc_caps;
 
@@ -427,6 +459,263 @@
       g_param_spec_boolean ("aud", "AUD",
           "Use AU (Access Unit) delimiter", DEFAULT_AUD, param_flags));
 
+  if (cdata->dev_caps.pre_encode_supported) {
+    /**
+     * GstAmfH265Enc:pre-encode:
+     *
+     * Enable pre-encode assisted rate control
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_PRE_ENCODE,
+        g_param_spec_boolean ("pre-encode", "Pre-encode",
+            "Enable pre-encode", DEFAULT_PRE_ENCODE,
+            (GParamFlags) (param_flags | GST_PARAM_CONDITIONALLY_AVAILABLE)));
+  }
+
+  if (cdata->dev_caps.smart_access_supported) {
+    /**
+     * GstAmfH265Enc:smart-access-video:
+     *
+     * Enable AMF SmartAccess Video feature
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_SMART_ACCESS,
+        g_param_spec_boolean ("smart-access-video", "Smart Access Video",
+            "Enable AMF SmartAccess Video feature for optimal distribution"
+            " between multiple AMD hardware instances", DEFAULT_SMART_ACCESS,
+            (GParamFlags) (G_PARAM_READWRITE |
+                GST_PARAM_CONDITIONALLY_AVAILABLE |
+                GST_PARAM_MUTABLE_PLAYING | G_PARAM_STATIC_STRINGS)));
+  }
+
+  if (dev_caps->pre_analysis) {
+    /**
+     * GstAmfH265Enc:pre-analysis:
+     *
+     * Enable the pre-analysis module
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (object_class, PROP_PRE_ANALYSIS,
+        g_param_spec_boolean ("pre-analysis", "Pre-analysis",
+            "Enable pre-analysis", DEFAULT_PRE_ANALYSIS, param_flags));
+
+    if (pa_supported->activity_type) {
+      /**
+       * GstAmfH265Enc:pa-activity-type:
+       *
+       * Set the type of activity analysis for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_ACTIVITY_TYPE,
+          g_param_spec_enum ("pa-activity-type", "Pre-analysis activity type",
+              "Set the type of activity analysis for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_ACTIVITY_TYPE, DEFAULT_PA_ACTIVITY_TYPE,
+              pa_param_flags));
+    }
+
+    if (pa_supported->scene_change_detection) {
+      /**
+       * GstAmfH265Enc:pa-scene-change-detection:
+       *
+       * Enable scene change detection for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_SCENE_CHANGE_DETECTION,
+          g_param_spec_boolean ("pa-scene-change-detection",
+              "Pre-analysis scene change detection",
+              "Enable scene change detection for pre-analysis",
+              DEFAULT_PA_SCENE_CHANGE_DETECTION, pa_param_flags));
+    }
+
+    if (pa_supported->scene_change_detection_sensitivity) {
+      /**
+       * GstAmfH265Enc:pa-scene-change-detection-sensitivity:
+       *
+       * Pre-analysis scene change detection sensitivity
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY,
+          g_param_spec_enum ("pa-scene-change-detection-sensitivity",
+              "Pre-analysis scene change detection sensitivity",
+              "Set the sensitivity of scene change detection for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_SCENE_CHANGE_DETECTION_SENSITIVITY,
+              DEFAULT_PA_SCENE_CHANGE_DETECTION_SENSITIVITY, pa_param_flags));
+    }
+
+    if (pa_supported->static_scene_detection) {
+      /**
+       * GstAmfH265Enc:pa-static-scene-detection:
+       *
+       * Enable static scene detection for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_STATIC_SCENE_DETECTION,
+          g_param_spec_boolean ("pa-static-scene-detection",
+              "Pre-analysis static scene detection",
+              "Enable static scene detection for pre-analysis",
+              DEFAULT_PA_STATIC_SCENE_DETECTION, pa_param_flags));
+    }
+
+    if (pa_supported->static_scene_detection_sensitivity) {
+      /**
+       * GstAmfH265Enc:pa-static-scene-detection-sensitivity:
+       *
+       * Pre-analysis static scene detection sensitivity
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY,
+          g_param_spec_enum ("pa-static-scene-detection-sensitivity",
+              "Pre-analysis static scene detection sensitivity",
+              "Set the sensitivity of static scene detection for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_STATIC_SCENE_DETECTION_SENSITIVITY,
+              DEFAULT_PA_STATIC_SCENE_DETECTION_SENSITIVITY, pa_param_flags));
+    }
+
+    if (pa_supported->initial_qp) {
+      /**
+       * GstAmfH265Enc:pa-initial-qp:
+       *
+       * Pre-analysis initial QP
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_INITIAL_QP,
+          g_param_spec_uint ("pa-initial-qp", "Pre-analysis initial QP",
+              "The QP value that is used immediately after a scene change", 0,
+              51, DEFAULT_PA_INITIAL_QP, pa_param_flags));
+    }
+
+    if (pa_supported->max_qp) {
+      /**
+       * GstAmfH265Enc:pa-max-qp:
+       *
+       * Pre-analysis max QP
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_MAX_QP,
+          g_param_spec_uint ("pa-max-qp", "Pre-analysis max QP",
+              "The QP threshold to allow a skip frame", 0, 51,
+              DEFAULT_PA_MAX_QP, pa_param_flags));
+    }
+
+    if (pa_supported->caq_strength) {
+      /**
+       * GstAmfH265Enc:pa-caq-strength:
+       *
+       * Content Adaptive Quantization strength for pre-analysis
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_CAQ_STRENGTH,
+          g_param_spec_enum ("pa-caq-strength", "Pre-analysis CAQ strength",
+              "Content Adaptive Quantization strength for pre-analysis",
+              GST_TYPE_AMF_ENC_PA_CAQ_STRENGTH, DEFAULT_PA_CAQ_STRENGTH,
+              pa_param_flags));
+    }
+
+    if (pa_supported->frame_sad) {
+      /**
+       * GstAmfH265Enc:pa-frame-sad:
+       *
+       * Enable Frame SAD algorithm
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_FRAME_SAD,
+          g_param_spec_boolean ("pa-frame-sad", "Pre-analysis SAD algorithm",
+              "Enable Frame SAD algorithm", DEFAULT_PA_FRAME_SAD,
+              pa_param_flags));
+    }
+
+    if (pa_supported->ltr) {
+      /**
+       * GstAmfH265Enc:pa-ltr:
+       *
+       * Enable long term reference frame management
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_LTR,
+          g_param_spec_boolean ("pa-ltr", "Pre-analysis LTR",
+              "Enable long term reference frame management", DEFAULT_PA_LTR,
+              pa_param_flags));
+    }
+
+    if (pa_supported->lookahead_buffer_depth) {
+      /**
+       * GstAmfH265Enc:pa-lookahead-buffer-depth:
+       *
+       * Pre-analysis lookahead buffer depth
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class,
+          PROP_PA_LOOKAHEAD_BUFFER_DEPTH,
+          g_param_spec_uint ("pa-lookahead-buffer-depth",
+              "Pre-analysis lookahead buffer depth",
+              "Set the PA lookahead buffer size", 0, 41,
+              DEFAULT_PA_LOOKAHEAD_BUFFER_DEPTH, pa_param_flags));
+    }
+
+    if (pa_supported->paq_mode) {
+      /**
+       * GstAmfH265Enc:pa-paq-mode:
+       *
+       * Set the perceptual adaptive quantization mode
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_PAQ_MODE,
+          g_param_spec_enum ("pa-paq-mode", "Pre-analysis PAQ mode",
+              "Set the perceptual adaptive quantization mode",
+              GST_TYPE_AMF_ENC_PA_PAQ_MODE, DEFAULT_PA_PAQ_MODE,
+              pa_param_flags));
+    }
+
+    if (pa_supported->taq_mode) {
+      /**
+       * GstAmfH265Enc:pa-taq-mode:
+       *
+       * Set the temporal adaptive quantization mode
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_TAQ_MODE,
+          g_param_spec_enum ("pa-taq-mode", "Pre-analysis TAQ mode",
+              "Set the temporal adaptive quantization mode",
+              GST_TYPE_AMF_ENC_PA_TAQ_MODE, DEFAULT_PA_TAQ_MODE,
+              pa_param_flags));
+    }
+
+    if (pa_supported->hmqb_mode) {
+      /**
+       * GstAmfH265Enc:pa-hqmb-mode:
+       *
+       * Set the PA high motion quality boost mode
+       *
+       * Since: 1.24
+       */
+      g_object_class_install_property (object_class, PROP_PA_HQMB_MODE,
+          g_param_spec_enum ("pa-hqmb-mode", "Pre-analysis HQMB mode",
+              "Set the PA high motion quality boost mode",
+              GST_TYPE_AMF_ENC_PA_HQMB_MODE, DEFAULT_PA_HQMB_MODE,
+              pa_param_flags));
+    }
+  }
+
   gst_element_class_set_metadata (element_class,
       "AMD AMF H.265 Video Encoder",
       "Codec/Encoder/Video/Hardware",
@@ -447,6 +736,8 @@
   gst_caps_unref (doc_caps);
   gst_element_class_add_pad_template (element_class, pad_templ);
 
+  videoenc_class->getcaps = GST_DEBUG_FUNCPTR (gst_amf_h265_enc_getcaps);
+
   amf_class->set_format = GST_DEBUG_FUNCPTR (gst_amf_h265_enc_set_format);
   amf_class->set_output_state =
       GST_DEBUG_FUNCPTR (gst_amf_h265_enc_set_output_state);
@@ -497,6 +788,26 @@
   self->qp_p = (guint) dev_caps->default_qp_p;
   self->ref_frames = (guint) dev_caps->min_ref_frames;
   self->aud = DEFAULT_AUD;
+  self->smart_access = DEFAULT_SMART_ACCESS;
+  self->pre_encode = DEFAULT_PRE_ENCODE;
+  // Init pre-analysis options
+  self->pa.pre_analysis = DEFAULT_PRE_ANALYSIS;
+  self->pa.activity_type = DEFAULT_PA_ACTIVITY_TYPE;
+  self->pa.scene_change_detection = DEFAULT_PA_SCENE_CHANGE_DETECTION;
+  self->pa.scene_change_detection_sensitivity =
+      DEFAULT_PA_SCENE_CHANGE_DETECTION_SENSITIVITY;
+  self->pa.static_scene_detection = DEFAULT_PA_STATIC_SCENE_DETECTION;
+  self->pa.static_scene_detection_sensitivity =
+      DEFAULT_PA_STATIC_SCENE_DETECTION_SENSITIVITY;
+  self->pa.initial_qp = DEFAULT_PA_INITIAL_QP;
+  self->pa.max_qp = DEFAULT_PA_MAX_QP;
+  self->pa.caq_strength = DEFAULT_PA_CAQ_STRENGTH;
+  self->pa.frame_sad = DEFAULT_PA_FRAME_SAD;
+  self->pa.ltr = DEFAULT_PA_LTR;
+  self->pa.lookahead_buffer_depth = DEFAULT_PA_LOOKAHEAD_BUFFER_DEPTH;
+  self->pa.paq_mode = DEFAULT_PA_PAQ_MODE;
+  self->pa.taq_mode = DEFAULT_PA_TAQ_MODE;
+  self->pa.hmqb_mode = DEFAULT_PA_HQMB_MODE;
 }
 
 static void
@@ -546,6 +857,18 @@
 }
 
 static void
+update_bool (GstAmfH265Enc * self, gboolean * old_val, const GValue * new_val)
+{
+  gboolean val = g_value_get_boolean (new_val);
+
+  if (*old_val == val)
+    return;
+
+  *old_val = val;
+  self->property_updated = TRUE;
+}
+
+static void
 gst_amf_h265_enc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
@@ -596,6 +919,56 @@
       /* This is per frame property, don't need to reset encoder */
       self->aud = g_value_get_boolean (value);
       break;
+    case PROP_SMART_ACCESS:
+      update_bool (self, &self->smart_access, value);
+      break;
+    case PROP_PRE_ENCODE:
+      update_bool (self, &self->pre_encode, value);
+      break;
+    case PROP_PRE_ANALYSIS:
+      update_bool (self, &self->pa.pre_analysis, value);
+      break;
+    case PROP_PA_ACTIVITY_TYPE:
+      update_enum (self, &self->pa.activity_type, value);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION:
+      update_bool (self, &self->pa.scene_change_detection, value);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY:
+      update_enum (self, &self->pa.scene_change_detection_sensitivity, value);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION:
+      update_bool (self, &self->pa.static_scene_detection, value);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY:
+      update_enum (self, &self->pa.static_scene_detection_sensitivity, value);
+      break;
+    case PROP_PA_INITIAL_QP:
+      update_uint (self, &self->pa.initial_qp, value);
+      break;
+    case PROP_PA_MAX_QP:
+      update_uint (self, &self->pa.max_qp, value);
+      break;
+    case PROP_PA_CAQ_STRENGTH:
+      update_enum (self, &self->pa.caq_strength, value);
+      break;
+    case PROP_PA_FRAME_SAD:
+      update_bool (self, &self->pa.frame_sad, value);
+    case PROP_PA_LTR:
+      update_bool (self, &self->pa.ltr, value);
+      break;
+    case PROP_PA_LOOKAHEAD_BUFFER_DEPTH:
+      update_uint (self, &self->pa.lookahead_buffer_depth, value);
+      break;
+    case PROP_PA_PAQ_MODE:
+      update_enum (self, &self->pa.paq_mode, value);
+      break;
+    case PROP_PA_TAQ_MODE:
+      update_enum (self, &self->pa.taq_mode, value);
+      break;
+    case PROP_PA_HQMB_MODE:
+      update_enum (self, &self->pa.hmqb_mode, value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -656,23 +1029,183 @@
     case PROP_AUD:
       g_value_set_boolean (value, self->aud);
       break;
+    case PROP_SMART_ACCESS:
+      g_value_set_boolean (value, self->smart_access);
+      break;
+    case PROP_PRE_ENCODE:
+      g_value_set_boolean (value, self->pre_encode);
+      break;
+    case PROP_PRE_ANALYSIS:
+      g_value_set_boolean (value, self->pa.pre_analysis);
+      break;
+    case PROP_PA_ACTIVITY_TYPE:
+      g_value_set_enum (value, self->pa.activity_type);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION:
+      g_value_set_boolean (value, self->pa.scene_change_detection);
+      break;
+    case PROP_PA_SCENE_CHANGE_DETECTION_SENSITIVITY:
+      g_value_set_enum (value, self->pa.scene_change_detection_sensitivity);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION:
+      g_value_set_boolean (value, self->pa.static_scene_detection);
+      break;
+    case PROP_PA_STATIC_SCENE_DETECTION_SENSITIVITY:
+      g_value_set_enum (value, self->pa.static_scene_detection_sensitivity);
+      break;
+    case PROP_PA_INITIAL_QP:
+      g_value_set_uint (value, self->pa.initial_qp);
+      break;
+    case PROP_PA_MAX_QP:
+      g_value_set_uint (value, self->pa.max_qp);
+      break;
+    case PROP_PA_CAQ_STRENGTH:
+      g_value_set_enum (value, self->pa.caq_strength);
+      break;
+    case PROP_PA_FRAME_SAD:
+      g_value_set_boolean (value, self->pa.frame_sad);
+      break;
+    case PROP_PA_LTR:
+      g_value_set_boolean (value, self->pa.ltr);
+      break;
+    case PROP_PA_LOOKAHEAD_BUFFER_DEPTH:
+      g_value_set_uint (value, self->pa.lookahead_buffer_depth);
+      break;
+    case PROP_PA_PAQ_MODE:
+      g_value_set_enum (value, self->pa.paq_mode);
+      break;
+    case PROP_PA_TAQ_MODE:
+      g_value_set_enum (value, self->pa.taq_mode);
+      break;
+    case PROP_PA_HQMB_MODE:
+      g_value_set_enum (value, self->pa.hmqb_mode);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
 }
 
+static void
+gst_amf_h265_enc_get_downstream_profiles (GstAmfH265Enc * self,
+    std::set < std::string > &downstream_profiles)
+{
+  GstCaps *allowed_caps;
+  GstStructure *s;
+
+  allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (self));
+
+  if (!allowed_caps || gst_caps_is_empty (allowed_caps) ||
+      gst_caps_is_any (allowed_caps)) {
+    gst_clear_caps (&allowed_caps);
+
+    return;
+  }
+
+  for (guint i = 0; i < gst_caps_get_size (allowed_caps); i++) {
+    const GValue *profile_value;
+    const gchar *profile;
+
+    s = gst_caps_get_structure (allowed_caps, i);
+    profile_value = gst_structure_get_value (s, "profile");
+    if (!profile_value)
+      continue;
+
+    if (GST_VALUE_HOLDS_LIST (profile_value)) {
+      for (guint j = 0; j < gst_value_list_get_size (profile_value); j++) {
+        const GValue *p = gst_value_list_get_value (profile_value, j);
+
+        if (!G_VALUE_HOLDS_STRING (p))
+          continue;
+
+        profile = g_value_get_string (p);
+        if (profile)
+          downstream_profiles.insert (profile);
+      }
+    } else if (G_VALUE_HOLDS_STRING (profile_value)) {
+      profile = g_value_get_string (profile_value);
+      if (profile)
+        downstream_profiles.insert (profile);
+    }
+  }
+
+  gst_clear_caps (&allowed_caps);
+}
+
+static GstCaps *
+gst_amf_h265_enc_getcaps (GstVideoEncoder * encoder, GstCaps * filter)
+{
+  GstAmfH265Enc *self = GST_AMF_H265_ENC (encoder);
+  GstCaps *template_caps;
+  GstCaps *supported_caps;
+  std::set < std::string > downstream_profiles;
+  std::set < std::string > allowed_formats;
+
+  gst_amf_h265_enc_get_downstream_profiles (self, downstream_profiles);
+
+  GST_DEBUG_OBJECT (self, "Downstream specified %" G_GSIZE_FORMAT " profiles",
+      downstream_profiles.size ());
+
+  if (downstream_profiles.size () == 0)
+    return gst_video_encoder_proxy_getcaps (encoder, NULL, filter);
+
+  /* *INDENT-OFF* */
+  for (const auto &iter : downstream_profiles) {
+    if (iter == "main") {
+      allowed_formats.insert("NV12");
+    } else if (iter == "main-10") {
+      allowed_formats.insert("P010_10LE");
+    }
+  }
+  /* *INDENT-ON* */
+  template_caps = gst_pad_get_pad_template_caps (encoder->sinkpad);
+  template_caps = gst_caps_make_writable (template_caps);
+
+  GValue formats = G_VALUE_INIT;
+
+  g_value_init (&formats, GST_TYPE_LIST);
+
+  /* *INDENT-OFF* */
+  for (const auto &iter: allowed_formats) {
+    GValue val = G_VALUE_INIT;
+    g_value_init (&val, G_TYPE_STRING);
+
+    g_value_set_string (&val, iter.c_str());
+    gst_value_list_append_and_take_value (&formats, &val);
+  }
+  /* *INDENT-ON* */
+
+  gst_caps_set_value (template_caps, "format", &formats);
+  g_value_unset (&formats);
+  supported_caps = gst_video_encoder_proxy_getcaps (encoder,
+      template_caps, filter);
+  gst_caps_unref (template_caps);
+
+  GST_DEBUG_OBJECT (self, "Returning %" GST_PTR_FORMAT, supported_caps);
+
+  return supported_caps;
+}
+
 static gboolean
 gst_amf_h265_enc_set_format (GstAmfEncoder * encoder,
-    GstVideoCodecState * state, gpointer component)
+    GstVideoCodecState * state, gpointer component, guint * num_reorder_frames)
 {
   GstAmfH265Enc *self = GST_AMF_H265_ENC (encoder);
+  GstAmfH265EncClass *klass = GST_AMF_H265_ENC_GET_CLASS (self);
+  GstAmfH265EncDeviceCaps *dev_caps = &klass->dev_caps;
   AMFComponent *comp = (AMFComponent *) component;
   GstVideoInfo *info = &state->info;
+  const GstVideoColorimetry *cinfo = &info->colorimetry;
+  amf_int64 color_profile;
   AMF_RESULT result;
   AMFRate framerate;
   AMFRatio aspect_ratio;
   amf_int64 int64_val;
+  amf_int64 profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN;
+  amf_int64 color_depth;
+  AMF_SURFACE_FORMAT surface_format;
+  std::set < std::string > downstream_profiles;
+
   AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM rc_mode;
 
   g_mutex_lock (&self->prop_lock);
@@ -702,14 +1235,54 @@
     }
   }
 
+  gst_amf_h265_enc_get_downstream_profiles (self, downstream_profiles);
+
+  if (downstream_profiles.empty ()) {
+    GST_ERROR_OBJECT (self, "Unable to get downstream profile");
+    goto error;
+  }
+
+  if (GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_FORMAT_P010_10LE) {
+    if (downstream_profiles.find ("main-10") == downstream_profiles.end ()) {
+      GST_ERROR_OBJECT (self, "Downstream does not support main-10 profile");
+      goto error;
+    } else {
+      color_depth = AMF_COLOR_BIT_DEPTH_10;
+      surface_format = AMF_SURFACE_P010;
+      profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10;
+    }
+  } else if (GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_FORMAT_NV12) {
+    if (downstream_profiles.find ("main") == downstream_profiles.end ()) {
+      GST_ERROR_OBJECT (self, "Downstream does not support main profile");
+      goto error;
+    } else {
+      color_depth = AMF_COLOR_BIT_DEPTH_8;
+      surface_format = AMF_SURFACE_NV12;
+      profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN;
+    }
+  } else {
+    GST_ERROR_OBJECT (self, "Unexpected format %s",
+        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (info)));
+    g_assert_not_reached ();
+    goto error;
+  }
+
   result = comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_PROFILE,
-      (amf_int64) AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN);
+      (amf_int64) profile);
   if (result != AMF_OK) {
     GST_ERROR_OBJECT (self, "Failed to set profile, result %"
         GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
     goto error;
   }
 
+  result =
+      comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_COLOR_BIT_DEPTH, color_depth);
+  if (result != AMF_OK) {
+    GST_ERROR_OBJECT (self, "Failed to set bit depth, result %"
+        GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+    goto error;
+  }
+
   result = comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_MAX_NUM_REFRAMES,
       (amf_int64) self->ref_frames);
   if (result != AMF_OK) {
@@ -728,7 +1301,7 @@
     goto error;
   }
 
-  if (info->colorimetry.range == GST_VIDEO_COLOR_RANGE_0_255)
+  if (cinfo->range == GST_VIDEO_COLOR_RANGE_0_255)
     int64_val = AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE_FULL;
   else
     int64_val = AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE_STUDIO;
@@ -740,7 +1313,144 @@
     goto error;
   }
 
-  result = comp->Init (AMF_SURFACE_NV12, info->width, info->height);
+  if (dev_caps->smart_access_supported) {
+    result =
+        comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_ENABLE_SMART_ACCESS_VIDEO,
+        (amf_bool) self->smart_access);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (self, "Failed to set smart access video, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+    }
+  }
+  color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN;
+  switch (cinfo->matrix) {
+    case GST_VIDEO_COLOR_MATRIX_BT601:
+      if (cinfo->range == GST_VIDEO_COLOR_RANGE_0_255) {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_601;
+      } else {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_601;
+      }
+      break;
+    case GST_VIDEO_COLOR_MATRIX_BT709:
+      if (cinfo->range == GST_VIDEO_COLOR_RANGE_0_255) {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_709;
+      } else {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_709;
+      }
+      break;
+    case GST_VIDEO_COLOR_MATRIX_BT2020:
+      if (cinfo->range == GST_VIDEO_COLOR_RANGE_0_255) {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_2020;
+      } else {
+        color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_2020;
+      }
+      break;
+    default:
+      break;
+  }
+
+  result =
+      comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PROFILE,
+      color_profile);
+  if (result != AMF_OK) {
+    GST_ERROR_OBJECT (self, "Failed to set output color profile, result %"
+        GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+    goto error;
+  }
+
+  result =
+      comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_OUTPUT_TRANSFER_CHARACTERISTIC,
+      gst_video_transfer_function_to_iso (cinfo->transfer));
+  if (result != AMF_OK) {
+    GST_ERROR_OBJECT (self,
+        "Failed to set output transfer characteristic, result %"
+        GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+    goto error;
+  }
+
+  result = comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PRIMARIES,
+      gst_video_color_primaries_to_iso (cinfo->primaries));
+  if (result != AMF_OK) {
+    GST_ERROR_OBJECT (self, "Failed to set output color primaries, result %"
+        GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+    goto error;
+  }
+
+  if (cinfo->transfer == GST_VIDEO_TRANSFER_SMPTE2084 &&
+      state->mastering_display_info && state->content_light_level) {
+    AMFBuffer *hdrmeta_buffer = NULL;
+    result =
+        comp->GetContext ()->AllocBuffer (AMF_MEMORY_HOST,
+        sizeof (AMFHDRMetadata), &hdrmeta_buffer);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to allocate HDR metadata buffer, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+    AMFHDRMetadata *hdrmeta = (AMFHDRMetadata *) hdrmeta_buffer->GetNative ();
+    GstVideoMasteringDisplayInfo *minfo = state->mastering_display_info;
+    GstVideoContentLightLevel *cllinfo = state->content_light_level;
+    hdrmeta->maxMasteringLuminance =
+        (amf_uint32) minfo->max_display_mastering_luminance;
+    hdrmeta->minMasteringLuminance =
+        (amf_uint32) minfo->min_display_mastering_luminance;
+
+    hdrmeta->redPrimary0 = minfo->display_primaries0.x;
+    hdrmeta->redPrimary1 = minfo->display_primaries0.y;
+
+    hdrmeta->greenPrimary0 = minfo->display_primaries1.x;
+    hdrmeta->greenPrimary1 = minfo->display_primaries1.y;
+
+    hdrmeta->bluePrimary0 = minfo->display_primaries2.x;
+    hdrmeta->bluePrimary1 = minfo->display_primaries2.y;
+
+    hdrmeta->whitePoint0 = minfo->white_point.x;
+    hdrmeta->whitePoint1 = minfo->white_point.y;
+    hdrmeta->maxContentLightLevel =
+        (amf_uint16) cllinfo->max_content_light_level;
+    hdrmeta->maxFrameAverageLightLevel =
+        (amf_uint16) cllinfo->max_frame_average_light_level;
+
+    result =
+        comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_INPUT_HDR_METADATA,
+        hdrmeta_buffer);
+
+    hdrmeta_buffer->Release ();
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set HDR metadata, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+  }
+
+  if (dev_caps->pre_encode_supported) {
+    result = comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_PREENCODE_ENABLE,
+        (amf_bool) self->pre_encode);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set pre-encode, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+  }
+
+  if (dev_caps->pre_analysis) {
+    result = comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_PRE_ANALYSIS_ENABLE,
+        (amf_bool) self->pa.pre_analysis);
+    if (result != AMF_OK) {
+      GST_ERROR_OBJECT (self, "Failed to set pre-analysis, result %"
+          GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
+      goto error;
+    }
+    if (self->pa.pre_analysis) {
+      result =
+          gst_amf_encoder_set_pre_analysis_options (encoder, comp, &self->pa,
+          &dev_caps->pa_supported);
+      if (result != AMF_OK)
+        goto error;
+    }
+  }
+
+  result = comp->Init (surface_format, info->width, info->height);
   if (result != AMF_OK) {
     GST_ERROR_OBJECT (self, "Failed to init component, result %"
         GST_AMF_RESULT_FORMAT, GST_AMF_RESULT_ARGS (result));
@@ -857,12 +1567,19 @@
     GstVideoCodecState * state, gpointer component)
 {
   GstAmfH265Enc *self = GST_AMF_H265_ENC (encoder);
+  GstVideoInfo *info = &state->info;
   GstVideoCodecState *output_state;
   GstCaps *caps;
   GstTagList *tags;
+  std::string caps_str = "video/x-h265, alignment = (string) au"
+      ", stream-format = (string) byte-stream, profile = (string) ";
 
-  caps = gst_caps_from_string ("video/x-h265, alignment = (string) au"
-      ", stream-format = (string) byte-stream, profile = (string) main");
+  if (GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_FORMAT_P010_10LE) {
+    caps_str += "main-10";
+  } else {
+    caps_str += "main";
+  }
+  caps = gst_caps_from_string (caps_str.c_str ());
   output_state = gst_video_encoder_set_output_state (GST_VIDEO_ENCODER (self),
       caps, state);
 
@@ -961,7 +1678,8 @@
   GstAmfH265EncDeviceCaps dev_caps = { 0, };
   std::string sink_caps_str;
   std::string src_caps_str;
-  std::vector < std::string > profiles;
+  std::set < std::string > profiles;
+  std::string profile_str;
   std::string resolution_str;
   GstAmfH265EncClassData *cdata;
   AMFCapsPtr amf_caps;
@@ -971,8 +1689,13 @@
   amf_int32 in_min_height = 0, in_max_height = 0;
   amf_int32 out_min_width = 0, out_max_width = 0;
   amf_int32 out_min_height = 0, out_max_height = 0;
+  amf_bool pre_encode_supported;
+  amf_bool smart_access_supported;
   amf_int32 num_val;
+  std::set < std::string > formats;
+  std::string format_str;
   gboolean have_nv12 = FALSE;
+  gboolean have_p010 = FALSE;
   gboolean d3d11_supported = FALSE;
   gint min_width, max_width, min_height, max_height;
   GstCaps *sink_caps;
@@ -1002,15 +1725,24 @@
   GST_LOG_OBJECT (device, "Input format count: %d", num_val);
   for (amf_int32 i = 0; i < num_val; i++) {
     AMF_SURFACE_FORMAT format;
-    amf_bool native;
+    amf_bool native = false;
 
     result = in_iocaps->GetFormatAt (i, &format, &native);
     if (result != AMF_OK)
       continue;
 
     GST_INFO_OBJECT (device, "Format %d supported, native %d", format, native);
-    if (format == AMF_SURFACE_NV12)
+    if (format == AMF_SURFACE_NV12) {
       have_nv12 = TRUE;
+      formats.insert ("NV12");
+    }
+    if (format == AMF_SURFACE_P010 && native) {
+      have_p010 = TRUE;
+    }
+  }
+  if (formats.empty ()) {
+    GST_WARNING_OBJECT (device, "Empty supported input formats");
+    return nullptr;
   }
 
   if (!have_nv12) {
@@ -1096,6 +1828,41 @@
   QUERY_DEFAULT_PROP (AMF_VIDEO_ENCODER_HEVC_QP_P, default_qp_p, 26);
 #undef QUERY_DEFAULT_PROP
 
+  result = comp->GetProperty (AMF_VIDEO_ENCODER_HEVC_PREENCODE_ENABLE,
+      &pre_encode_supported);
+  if (result == AMF_OK)
+    dev_caps.pre_encode_supported = TRUE;
+
+  result = comp->GetProperty (AMF_VIDEO_ENCODER_HEVC_ENABLE_SMART_ACCESS_VIDEO,
+      &smart_access_supported);
+  if (result == AMF_OK)
+    dev_caps.smart_access_supported = TRUE;
+
+  if (dev_caps.pre_analysis) {
+    amf_bool pre_analysis = FALSE;
+    // Store initial pre-analysis value
+    result =
+        comp->GetProperty (AMF_VIDEO_ENCODER_HEVC_PRE_ANALYSIS_ENABLE,
+        &pre_analysis);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (device, "Failed to get pre-analysis option");
+    }
+    // We need to enable pre-analysis for checking options availability
+    result =
+        comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_PRE_ANALYSIS_ENABLE,
+        (amf_bool) TRUE);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (device, "Failed to set pre-analysis option");
+    }
+    gst_amf_encoder_check_pa_supported_options (&dev_caps.pa_supported, comp);
+    result =
+        comp->SetProperty (AMF_VIDEO_ENCODER_HEVC_PRE_ANALYSIS_ENABLE,
+        pre_analysis);
+    if (result != AMF_OK) {
+      GST_WARNING_OBJECT (device, "Failed to set pre-analysis option");
+    }
+  }
+
   {
     const AMFPropertyInfo *pinfo = nullptr;
     result = comp->GetPropertyInfo (AMF_VIDEO_ENCODER_HEVC_GOP_SIZE, &pinfo);
@@ -1113,6 +1880,50 @@
     }
   }
 
+  if (formats.find ("NV12") != formats.end ())
+    profiles.insert ("main");
+
+  if (dev_caps.max_profile >= (amf_int64) AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10
+      && have_p010) {
+    formats.insert ("P010_10LE");
+    profiles.insert ("main-10");
+  }
+
+  if (profiles.empty ()) {
+    GST_WARNING_OBJECT (device, "Failed to determine profile support");
+    return nullptr;
+  }
+#define APPEND_STRING(dst,set,str) G_STMT_START { \
+  if (set.find(str) != set.end()) { \
+    if (!first) \
+      dst += ", "; \
+    dst += str; \
+    first = FALSE; \
+  } \
+} G_STMT_END
+
+  if (formats.size () == 1) {
+    format_str = "format = (string) " + *(formats.begin ());
+  } else {
+    gboolean first = TRUE;
+    format_str = "format = (string) { ";
+    APPEND_STRING (format_str, formats, "NV12");
+    APPEND_STRING (format_str, formats, "P010_10LE");
+    format_str += " } ";
+  }
+  if (profiles.size () == 1) {
+    profile_str = "profile = (string) " + *(profiles.begin ());
+  } else {
+    gboolean first = TRUE;
+
+    profile_str = "profile = (string) { ";
+    APPEND_STRING (profile_str, profiles, "main");
+    APPEND_STRING (profile_str, profiles, "main-10");
+    profile_str += " } ";
+  }
+
+#undef APPEND_STRING
+
   min_width = MAX (in_min_width, 1);
   max_width = in_max_width;
   if (max_width == 0) {
@@ -1132,9 +1943,12 @@
   resolution_str += ", height = (int)  " + std::to_string (min_height)
       + ", " + std::to_string (max_height) + " ";
 
-  sink_caps_str = "video/x-raw, format = (string) NV12, " + resolution_str +
+  sink_caps_str =
+      "video/x-raw, " + format_str + ", " + resolution_str +
       ", interlace-mode = (string) progressive";
-  src_caps_str = "video/x-h265, " + resolution_str + ", profile = (string) main"
+  src_caps_str =
+      "video/x-h265, " + resolution_str +
+      ", " + profile_str +
       ", stream-format = (string) byte-stream, alignment = (string) au";
 
   system_caps = gst_caps_from_string (sink_caps_str.c_str ());

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/components/ColorSpace.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/components/ColorSpace.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/components/Component.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/components/Component.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/components/PreAnalysis.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/components/PreAnalysis.h Changed

@@ -1,4 +1,4 @@
-// 
+//
 // Notice Regarding Standards.  AMD does not provide a license or sublicense to
 // any Intellectual Property Rights relating to any standards, including but not
 // limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
@@ -6,9 +6,9 @@
 // (collectively, the "Media Technologies"). For clarity, you will pay any
 // royalties due for such third party technologies, which may include the Media
 // Technologies that are owed as a result of AMD providing the Software to you.
-// 
-// MIT license 
-// 
+//
+// MIT license
+//
 // Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -48,7 +48,7 @@
 
 
 enum  AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_ENUM
-{	
+{
 	AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_LOW    = 0,
 	AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_MEDIUM = 1,
 	AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH   = 2
@@ -69,6 +69,26 @@
     AMF_PA_CAQ_STRENGTH_HIGH   = 2
 };
 
+// Perceptual adaptive quantization mode
+enum AMF_PA_PAQ_MODE_ENUM
+{
+    AMF_PA_PAQ_MODE_NONE = 0,
+    AMF_PA_PAQ_MODE_CAQ = 1
+};
+
+// Temporal adaptive quantization mode
+enum  AMF_PA_TAQ_MODE_ENUM
+{
+    AMF_PA_TAQ_MODE_NONE = 0,
+    AMF_PA_TAQ_MODE_1 = 1,
+    AMF_PA_TAQ_MODE_2 = 2
+};
+
+enum AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_ENUM
+{
+    AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_NONE = 0, //default
+    AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_AUTO = 1
+};
 
 
 // PA object properties
@@ -77,17 +97,19 @@
 
 #define AMF_PA_SCENE_CHANGE_DETECTION_ENABLE        L"PASceneChangeDetectionEnable"         // bool       (default : True)                                          - Enable Scene Change Detection GPU algorithm
 #define AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY   L"PASceneChangeDetectionSensitivity"	// AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_ENUM (default : Medium)    - Scene Change Detection Sensitivity
-#define AMF_PA_STATIC_SCENE_DETECTION_ENABLE        L"PAStaticSceneDetectionEnable"         // bool       (default : True)                                          - Enable Skip Detection GPU algorithm
+#define AMF_PA_STATIC_SCENE_DETECTION_ENABLE        L"PAStaticSceneDetectionEnable"         // bool       (default : False)                                         - Enable Skip Detection GPU algorithm
 #define AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY   L"PAStaticSceneDetectionSensitivity"	// AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_ENUM (default : High)      - Allowable absolute difference between pixels (sample counts)
 #define AMF_PA_FRAME_SAD_ENABLE                     L"PAFrameSadEnable"	                    // bool       (default : True)                                          - Enable Frame SAD algorithm
 #define AMF_PA_ACTIVITY_TYPE                        L"PAActivityType"                       // AMF_PA_ACTIVITY_TYPE_ENUM (default : Calculate on Y)                 - Block activity calculation mode
-#define AMF_PA_LTR_ENABLE                           L"PALongTermReferenceEnable"            // bool       (default : True)                                          - Enable Automatic Long Term Reference frame management
-
-
+#define AMF_PA_LTR_ENABLE                           L"PALongTermReferenceEnable"            // bool       (default : False)                                         - Enable Automatic Long Term Reference frame management
+#define AMF_PA_LOOKAHEAD_BUFFER_DEPTH               L"PALookAheadBufferDepth"               // amf_uint64 (default : 0)           Values: 0, MAX_LOOKAHEAD_DEPTH  - PA lookahead buffer size
+#define AMF_PA_PAQ_MODE                             L"PAPerceptualAQMode"                   // AMF_PA_PAQ_MODE_ENUM     (default : AMF_PA_PAQ_MODE_NONE)            - Perceptual AQ mode
+#define AMF_PA_TAQ_MODE                             L"PATemporalAQMode"                     // AMF_PA_TAQ_MODE_ENUM (default: AMF_PA_TAQ_MODE_NONE)                 - Temporal AQ mode
+#define AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE       L"PAHighMotionQualityBoostMode"         // AMF_PA_HIGH_MOTION_QUALITY_BOOST_MODE_ENUM (default: None)           - High motion quality boost mode
 
 ///////////////////////////////////////////
-// the following properties are available 
-// only through the Encoder - trying to 
+// the following properties are available
+// only through the Encoder - trying to
 // access/set them when PA is standalone
 // will fail
 
@@ -107,4 +129,5 @@
 #define AMF_PA_SCENE_CHANGE_DETECT                  L"PASceneChangeDetect"                  // bool                                                                 - True/False - available if AMF_PA_SCENE_CHANGE_DETECTION_ENABLE was set to True
 #define AMF_PA_STATIC_SCENE_DETECT                  L"PAStaticSceneDetect"                  // bool                                                                 - True/False - available if AMF_PA_STATIC_SCENE_DETECTION_ENABLE was set to True
 
+
 #endif //#ifndef AMFPreAnalysis_h

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/components/VideoDecoderUVD.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/components/VideoDecoderUVD.h Changed

@@ -53,6 +53,7 @@
 #define AMFVideoDecoderHW_VP9                        L"AMFVideoDecoderHW_VP9"
 #define AMFVideoDecoderHW_VP9_10BIT                  L"AMFVideoDecoderHW_VP9_10BIT"
 #define AMFVideoDecoderHW_AV1                        L"AMFVideoDecoderHW_AV1"
+#define AMFVideoDecoderHW_AV1_12BIT                  L"AMFVideoDecoderHW_AV1_12BIT"
 
 enum AMF_VIDEO_DECODER_MODE_ENUM
 {
@@ -105,9 +106,10 @@
 
 // properties to be set on decoder if internal converter is used
 #define AMF_VIDEO_DECODER_OUTPUT_TRANSFER_CHARACTERISTIC        L"OutColorTransferChar"     // amf_int64(AMF_COLOR_TRANSFER_CHARACTERISTIC_ENUM); default = AMF_COLOR_TRANSFER_CHARACTERISTIC_UNDEFINED, ISO/IEC 23001-8_2013   7.2 See VideoDecoderUVD.h for enum 
-#define AMF_VIDEO_DECODER_OUTPUT_COLOR_PRIMARIES                L"OutputColorPrimaries"       // amf_int64(AMF_COLOR_PRIMARIES_ENUM); default = AMF_COLOR_PRIMARIES_UNDEFINED, ISO/IEC 23001-8_2013   7.1 See ColorSpace.h for enum 
+#define AMF_VIDEO_DECODER_OUTPUT_COLOR_PRIMARIES                L"OutputColorPrimaries"     // amf_int64(AMF_COLOR_PRIMARIES_ENUM); default = AMF_COLOR_PRIMARIES_UNDEFINED, ISO/IEC 23001-8_2013   7.1 See ColorSpace.h for enum 
 #define AMF_VIDEO_DECODER_OUTPUT_HDR_METADATA                   L"OutHDRMetadata"           // AMFBuffer containing AMFHDRMetadata; default NULL
 
+#define AMF_VIDEO_DECODER_LOW_LATENCY                           L"LowLatencyDecode"         // amf_bool; default = false; true = low latency decode, false = regular decode
 
 #if defined(__ANDROID__)
 #define AMF_VIDEO_DECODER_NATIVEWINDOW                  L"AndroidNativeWindow"  // amf_int64; default = 0; pointer to native window
@@ -118,5 +120,7 @@
 #define AMF_VIDEO_DECODER_NATIVEWINDOW                  L"AppleNativeWindow"  // amf_int64; default = 0; pointer to native window
 #endif //__APPLE__
 
+#define AMF_VIDEO_DECODER_ENABLE_SMART_ACCESS_VIDEO             L"EnableDecoderSmartAccessVideo"     // amf_bool; default = false; true = enables smart access video feature
+#define AMF_VIDEO_DECODER_SKIP_TRANSFER_SMART_ACCESS_VIDEO      L"SkipTransferSmartAccessVideo"      // amf_bool; default = false; true = keeps output on GPU where it ran
 
 #endif //#ifndef AMF_VideoDecoderUVD_h

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/components/VideoEncoderAV1.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/components/VideoEncoderAV1.h Changed

@@ -163,6 +163,11 @@
     AMF_VIDEO_ENCODER_AV1_INTRA_REFRESH_MODE__GOP_ALIGNED = 1,
     AMF_VIDEO_ENCODER_AV1_INTRA_REFRESH_MODE__CONTINUOUS = 2
 };
+enum AMF_VIDEO_ENCODER_AV1_LTR_MODE_ENUM
+{
+    AMF_VIDEO_ENCODER_AV1_LTR_MODE_RESET_UNUSED     = 0,
+    AMF_VIDEO_ENCODER_AV1_LTR_MODE_KEEP_UNUSED      = 1
+};
 
 
 // *** Static properties - can be set only before Init() *** 
@@ -207,6 +212,7 @@
 // Picture Management Configuration
 #define AMF_VIDEO_ENCODER_AV1_MAX_NUM_TEMPORAL_LAYERS               L"Av1MaxNumOfTemporalLayers"        // amf_int64; default = depends on USAGE; Max number of temporal layers might be enabled. The maximum value can be queried from AMF_VIDEO_ENCODER_AV1_CAP_MAX_NUM_TEMPORAL_LAYERS
 #define AMF_VIDEO_ENCODER_AV1_MAX_LTR_FRAMES                        L"Av1MaxNumLTRFrames"               // amf_int64; default = depends on USAGE; Max number of LTR frames. The maximum value can be queried from AMF_VIDEO_ENCODER_AV1_CAP_MAX_NUM_LTR_FRAMES
+#define AMF_VIDEO_ENCODER_AV1_LTR_MODE                              L"Av1LTRMode"                       // amf_int64(AMF_VIDEO_ENCODER_AV1_LTR_MODE_ENUM); default = AMF_VIDEO_ENCODER_AV1_LTR_MODE_RESET_UNUSED; remove/keep unused LTRs (not specified in property AMF_VIDEO_ENCODER_AV1_FORCE_LTR_REFERENCE_BITFIELD)
 #define AMF_VIDEO_ENCODER_AV1_MAX_NUM_REFRAMES                      L"Av1MaxNumRefFrames"               // amf_int64; default = 1; Maximum number of reference frames
 
 // color conversion
@@ -281,7 +287,7 @@
 #define AMF_VIDEO_ENCODER_AV1_CAP_NUM_OF_HW_INSTANCES               L"Av1CapNumOfHwInstances"           // amf_int64; default = N/A; number of HW encoder instances
 #define AMF_VIDEO_ENCODER_AV1_CAP_MAX_THROUGHPUT                    L"Av1CapMaxThroughput"              // amf_int64; default = N/A; MAX throughput for AV1 encoder in MB (16 x 16 pixel)
 #define AMF_VIDEO_ENCODER_AV1_CAP_REQUESTED_THROUGHPUT              L"Av1CapRequestedThroughput"        // amf_int64; default = N/A; Currently total requested throughput for AV1 encode in MB (16 x 16 pixel)
-#define AMF_VIDEO_ENCODER_AV1_CAP_COLOR_CONVERSION                  L"Av1CapColorConversion"            // amf_int64(AMF_ACCELERATION_TYPE); default = N/A; type of supported color conversion.
+#define AMF_VIDEO_ENCODER_AV1_CAP_COLOR_CONVERSION                  L"Av1CapColorConversion"            // amf_int64(AMF_ACCELERATION_TYPE); default = N/A; type of supported color conversion. default AMF_ACCEL_GPU
 #define AMF_VIDEO_ENCODER_AV1_CAP_PRE_ANALYSIS                      L"Av1PreAnalysis"                    // amf_bool - pre analysis module is available for AV1 UVE encoder, n/a for the other encoders
 #define AMF_VIDEO_ENCODER_AV1_CAP_MAX_BITRATE                       L"Av1MaxBitrate"                    // amf_int64; default = N/A; Maximum bit rate in bits
 #define AMF_VIDEO_ENCODER_AV1_CAP_MAX_PROFILE                       L"Av1MaxProfile"                    // amf_int64(AMF_VIDEO_ENCODER_AV1_PROFILE_ENUM); default = N/A; max value of code profile
@@ -289,4 +295,6 @@
 #define AMF_VIDEO_ENCODER_AV1_CAP_MAX_NUM_TEMPORAL_LAYERS           L"Av1CapMaxNumTemporalLayers"       // amf_int64; default = N/A; The cap of maximum number of temporal layers
 #define AMF_VIDEO_ENCODER_AV1_CAP_MAX_NUM_LTR_FRAMES                L"Av1CapMaxNumLTRFrames"            // amf_int64; default = N/A; The cap of maximum number of LTR frames. This value is calculated based on current value of AMF_VIDEO_ENCODER_AV1_MAX_NUM_TEMPORAL_LAYERS.
 
+#define AMF_VIDEO_ENCODER_AV1_ENABLE_SMART_ACCESS_VIDEO             L"Av1EnableEncoderSmartAccessVideo" // amf_bool; default = false; true = enables smart access video feature
+
 #endif //#ifndef AMF_VideoEncoderAV1_h

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/components/VideoEncoderHEVC.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/components/VideoEncoderHEVC.h Changed

@@ -80,7 +80,10 @@
     AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CONSTANT_QP = 0,
     AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR,
     AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR,
-    AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CBR
+    AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CBR,
+    AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_QUALITY_VBR,
+    AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_HIGH_QUALITY_VBR,
+    AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_HIGH_QUALITY_CBR
 };
 
 enum AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_ENUM
@@ -145,9 +148,10 @@
 #define AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET                       L"HevcQualityPreset"            // amf_int64(AMF_VIDEO_ENCODER_HEVC_QUALITY_PRESET_ENUM); default = depends on USAGE; Quality Preset
 #define AMF_VIDEO_ENCODER_HEVC_EXTRADATA                            L"HevcExtraData"                // AMFInterface* - > AMFBuffer*; SPS/PPS buffer - read-only
 #define AMF_VIDEO_ENCODER_HEVC_ASPECT_RATIO                         L"HevcAspectRatio"              // AMFRatio; default = 1, 1
-#define AMF_VIDEO_ENCODER_HEVC_LOWLATENCY_MODE					    L"LowLatencyInternal"           // bool; default = false, enables low latency mode
+#define AMF_VIDEO_ENCODER_HEVC_LOWLATENCY_MODE                      L"LowLatencyInternal"           // bool; default = false, enables low latency mode
 #define AMF_VIDEO_ENCODER_HEVC_PRE_ANALYSIS_ENABLE                  L"HevcEnablePreAnalysis"        // bool; default = false; enables the pre-analysis module. Currently only works in AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR mode. Refer to AMF Video PreAnalysis API reference for more details.
-#define AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE						L"HevcNominalRange"				// amf_int64(AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE); default = amf_int64(AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE_STUDIO); property is bool but amf_int64 also works for backward compatibility.
+#define AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE                        L"HevcNominalRange"				// amf_int64(AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE); default = amf_int64(AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE_STUDIO); property is bool but amf_int64 also works for backward compatibility.
+#define AMF_VIDEO_ENCODER_HEVC_MAX_NUM_TEMPORAL_LAYERS              L"HevcMaxNumOfTemporalLayers"   // amf_int64; default = 1; Max number of temporal layers.
 
 // Picture control properties
 #define AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR                     L"HevcGOPSPerIDR"               // amf_int64; default = 1; The frequency to insert IDR as start of a GOP. 0 means no IDR will be inserted.
@@ -159,6 +163,7 @@
 
 // Rate control properties
 #define AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD                  L"HevcRateControlMethod"        // amf_int64(AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_ENUM); default = depends on USAGE; Rate Control Method
+#define AMF_VIDEO_ENCODER_HEVC_QVBR_QUALITY_LEVEL                   L"HevcQvbrQualityLevel"         // amf_int64; default = 23; QVBR quality level; range = 1-51
 #define AMF_VIDEO_ENCODER_HEVC_VBV_BUFFER_SIZE                      L"HevcVBVBufferSize"            // amf_int64; default = depends on USAGE; VBV Buffer Size in bits
 #define AMF_VIDEO_ENCODER_HEVC_INITIAL_VBV_BUFFER_FULLNESS          L"HevcInitialVBVBufferFullness" // amf_int64; default =  64; Initial VBV Buffer Fullness 0=0% 64=100%
 #define AMF_VIDEO_ENCODER_HEVC_ENABLE_VBAQ                          L"HevcEnableVBAQ"               // // bool; default = depends on USAGE; Enable auto VBAQ
@@ -213,6 +218,9 @@
 #define AMF_VIDEO_ENCODER_HEVC_INPUT_HDR_METADATA                   L"HevcInHDRMetadata"            // AMFBuffer containing AMFHDRMetadata; default NULL
 //#define AMF_VIDEO_ENCODER_HEVC_OUTPUT_HDR_METADATA                  L"HevcOutHDRMetadata"            // AMFBuffer containing AMFHDRMetadata; default NULL
 
+// SVC
+#define AMF_VIDEO_ENCODER_HEVC_NUM_TEMPORAL_LAYERS                  L"HevcNumOfTemporalLayers"      // amf_int64; default = 1; Number of temporal layers. Can be changed at any time but the change is only applied when encoding next base layer frame.
+
 // DPB management
 #define AMF_VIDEO_ENCODER_HEVC_PICTURE_TRANSFER_MODE                L"HevcPicTransferMode"          // amf_int64(AMF_VIDEO_ENCODER_HEVC_PICTURE_TRANSFER_MODE_ENUM); default = AMF_VIDEO_ENCODER_HEVC_PICTURE_TRANSFER_MODE_OFF - whether to exchange reference/reconstructed pic between encoder and application
 
@@ -282,6 +290,7 @@
 #define AMF_VIDEO_ENCODER_HEVC_CAP_MAX_LEVEL                        L"HevcMaxLevel"                 // amf_int64 maximum profile level
 #define AMF_VIDEO_ENCODER_HEVC_CAP_MIN_REFERENCE_FRAMES             L"HevcMinReferenceFrames"       // amf_int64 minimum number of reference frames
 #define AMF_VIDEO_ENCODER_HEVC_CAP_MAX_REFERENCE_FRAMES             L"HevcMaxReferenceFrames"       // amf_int64 maximum number of reference frames
+#define AMF_VIDEO_ENCODER_HEVC_CAP_MAX_TEMPORAL_LAYERS              L"HevcMaxTemporalLayers"        // amf_int64 maximum number of temporal layers
 #define AMF_VIDEO_ENCODER_HEVC_CAP_NUM_OF_HW_INSTANCES              L"HevcNumOfHwInstances"         // amf_int64 number of HW encoder instances
 #define AMF_VIDEO_ENCODER_HEVC_CAP_COLOR_CONVERSION                 L"HevcColorConversion"          // amf_int64(AMF_ACCELERATION_TYPE) - type of supported color conversion. default AMF_ACCEL_GPU
 #define AMF_VIDEO_ENCODER_HEVC_CAP_PRE_ANALYSIS                     L"HevcPreAnalysis"              // amf_bool - pre analysis module is available for HEVC UVE encoder, n/a for the other encoders
@@ -293,4 +302,6 @@
 // properties set on AMFComponent to control component creation
 #define AMF_VIDEO_ENCODER_HEVC_MEMORY_TYPE                          L"HevcEncoderMemoryType"        // amf_int64(AMF_MEMORY_TYPE) , default is AMF_MEMORY_UNKNOWN, Values : AMF_MEMORY_DX11, AMF_MEMORY_DX9, AMF_MEMORY_UNKNOWN (auto)
 
+#define AMF_VIDEO_ENCODER_HEVC_ENABLE_SMART_ACCESS_VIDEO            L"HevcEnableEncoderSmartAccessVideo"         // amf_bool; default = false; true = enables smart access video feature
+
 #endif //#ifndef AMF_VideoEncoderHEVC_h

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/components/VideoEncoderVCE.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/components/VideoEncoderVCE.h Changed

@@ -66,6 +66,29 @@
     AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_HIGH = 257
 };
 
+enum AMF_VIDEO_ENCODER_H264_LEVEL_ENUM
+{
+    AMF_H264_LEVEL__1   = 10,
+    AMF_H264_LEVEL__1_1 = 11,
+    AMF_H264_LEVEL__1_2 = 12,
+    AMF_H264_LEVEL__1_3 = 13,
+    AMF_H264_LEVEL__2   = 20,
+    AMF_H264_LEVEL__2_1 = 21,
+    AMF_H264_LEVEL__2_2 = 22,
+    AMF_H264_LEVEL__3   = 30,
+    AMF_H264_LEVEL__3_1 = 31,
+    AMF_H264_LEVEL__3_2 = 32,
+    AMF_H264_LEVEL__4   = 40,
+    AMF_H264_LEVEL__4_1 = 41,
+    AMF_H264_LEVEL__4_2 = 42,
+    AMF_H264_LEVEL__5   = 50,
+    AMF_H264_LEVEL__5_1 = 51,
+    AMF_H264_LEVEL__5_2 = 52,
+    AMF_H264_LEVEL__6   = 60,
+    AMF_H264_LEVEL__6_1 = 61,
+    AMF_H264_LEVEL__6_2 = 62
+};
+
 enum AMF_VIDEO_ENCODER_SCANTYPE_ENUM
 {
     AMF_VIDEO_ENCODER_SCANTYPE_PROGRESSIVE = 0,
@@ -79,7 +102,9 @@
     AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CBR,
     AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR,
     AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR,
-    AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_QUALITY_VBR
+    AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_QUALITY_VBR,
+    AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_HIGH_QUALITY_VBR,
+    AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_HIGH_QUALITY_CBR
 };
 
 enum AMF_VIDEO_ENCODER_QUALITY_PRESET_ENUM
@@ -149,7 +174,7 @@
 #define AMF_VIDEO_ENCODER_EXTRADATA                             L"ExtraData"                // AMFInterface* - > AMFBuffer*; SPS/PPS buffer in Annex B format - read-only
 #define AMF_VIDEO_ENCODER_USAGE                                 L"Usage"                    // amf_int64(AMF_VIDEO_ENCODER_USAGE_ENUM); default = N/A; Encoder usage type. fully configures parameter set.
 #define AMF_VIDEO_ENCODER_PROFILE                               L"Profile"                  // amf_int64(AMF_VIDEO_ENCODER_PROFILE_ENUM) ; default = AMF_VIDEO_ENCODER_PROFILE_MAIN;  H264 profile
-#define AMF_VIDEO_ENCODER_PROFILE_LEVEL                         L"ProfileLevel"             // amf_int64; default = 42; H264 profile level
+#define AMF_VIDEO_ENCODER_PROFILE_LEVEL                         L"ProfileLevel"             // amf_int64(AMF_VIDEO_ENCODER_H264_LEVEL_ENUM); default = AMF_H264_LEVEL__4_2; H264 level
 #define AMF_VIDEO_ENCODER_MAX_LTR_FRAMES                        L"MaxOfLTRFrames"           // amf_int64; default = 0; Max number of LTR frames
 #define AMF_VIDEO_ENCODER_LTR_MODE                              L"LTRMode"                  // amf_int64(AMF_VIDEO_ENCODER_LTR_MODE_ENUM); default = AMF_VIDEO_ENCODER_LTR_MODE_RESET_UNUSED; remove/keep unused LTRs (not specified in property AMF_VIDEO_ENCODER_FORCE_LTR_REFERENCE_BITFIELD)
 #define AMF_VIDEO_ENCODER_SCANTYPE                              L"ScanType"                 // amf_int64(AMF_VIDEO_ENCODER_SCANTYPE_ENUM); default = AMF_VIDEO_ENCODER_SCANTYPE_PROGRESSIVE; indicates input stream type
@@ -164,6 +189,7 @@
 #define AMF_VIDEO_ENCODER_RATE_CONTROL_PREANALYSIS_ENABLE       L"RateControlPreanalysisEnable"     // amf_int64(AMF_VIDEO_ENCODER_PREENCODE_MODE_ENUM); default =  AMF_VIDEO_ENCODER_PREENCODE_DISABLED; enables pre-encode assisted rate control. Deprecated, please use AMF_VIDEO_ENCODER_PREENCODE_ENABLE instead.
 #define AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD                   L"RateControlMethod"        // amf_int64(AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_ENUM); default = depends on USAGE; Rate Control Method
 #define AMF_VIDEO_ENCODER_QVBR_QUALITY_LEVEL                    L"QvbrQualityLevel"         // amf_int64; default = 23; QVBR quality level; range = 1-51
+#define AMF_VIDEO_ENCODER_MAX_NUM_TEMPORAL_LAYERS               L"MaxNumOfTemporalLayers"   // amf_int64; default = 1; Max number of temporal layers.
 #if !defined(__GNUC__) && !defined(__clang__)
     #pragma deprecated("AMF_VIDEO_ENCODER_RATE_CONTROL_PREANALYSIS_ENABLE")
 #endif
@@ -323,4 +349,6 @@
 // properties set on AMFComponent to control component creation
 #define AMF_VIDEO_ENCODER_MEMORY_TYPE                           L"EncoderMemoryType"        // amf_int64(AMF_MEMORY_TYPE) , default is AMF_MEMORY_UNKNOWN, Values : AMF_MEMORY_DX11, AMF_MEMORY_DX9, AMF_MEMORY_VULKAN or AMF_MEMORY_UNKNOWN (auto)
 
+#define AMF_VIDEO_ENCODER_ENABLE_SMART_ACCESS_VIDEO             L"EnableEncoderSmartAccessVideo"         // amf_bool; default = false; true = enables smart access video feature
+
 #endif //#ifndef AMF_VideoEncoderVCE_h

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/core/D3D12AMF.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/core/D3D12AMF.h Changed

@@ -39,6 +39,11 @@
 AMF_WEAK GUID  AMFResourceStateGUID = { 0x452da9bf, 0x4ad7, 0x47a5, { 0xa6, 0x9b, 0x96, 0xd3, 0x23, 0x76, 0xf2, 0xf3 } };   // Current resource state value (D3D12_RESOURCE_STATES ), sizeof(UINT), set on ID3D12Resource 
 AMF_WEAK GUID  AMFFenceGUID         = { 0x910a7928, 0x57bd, 0x4b04, { 0x91, 0xa3, 0xe7, 0xb8, 0x04, 0x12, 0xcd, 0xa5 } };   // IUnknown (ID3D12Fence), set on ID3D12Resource  syncronization fence for this resource
 AMF_WEAK GUID  AMFFenceValueGUID    = { 0x62a693d3, 0xbb4a, 0x46c9, { 0xa5, 0x04, 0x9a, 0x8e, 0x97, 0xbf, 0xf0, 0x56 } };   // The last value to wait on the fence from AMFFenceGUID; sizeof(UINT64), set on ID3D12Fence 
+
+AMF_WEAK GUID  AMFFenceD3D11GUID    = { 0xdffdf6e0, 0x85e0, 0x4645, { 0x9d, 0x7, 0xe6, 0x4a, 0x19, 0x6b, 0xc9, 0xbf } };   // IUnknown (ID3D11Fence) OpenSharedFence for interop
+AMF_WEAK GUID  AMFFenceValueD3D11GUID    = { 0x86581b71, 0x699f, 0x484b, { 0xb8, 0x75, 0x24, 0xda, 0x49, 0x8a, 0x74, 0xcf } };   // last value to wait on in d3d11
+AMF_WEAK GUID  AMFSharedHandleFenceGUID = { 0xca60dcc8, 0x76d1, 0x4088, 0xad, 0xd, 0x97, 0x71, 0xe7, 0xb0, 0x92, 0x49 };   // ID3D12Fence shared handle for D3D11 interop
+
 #endif
 
 #endif // __D3D12AMF_h__
\ No newline at end of file

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/core/Factory.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/core/Factory.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/core/Platform.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/core/Platform.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/core/Surface.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/core/Surface.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/core/Variant.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/core/Variant.h Changed

@@ -366,6 +366,8 @@
         }
 
 #if (__cplusplus == 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X) || (_MSC_VER >= 1600)
+#pragma warning (push)
+#pragma warning (disable : 26439) //This kind of function may not throw. Declare it 'noexcept'.
         String(String&& p_other) : m_Str(NULL)
         {
             operator=(p_other);
@@ -498,6 +500,7 @@
             p_other.m_Str = NULL;    //    Transfer the ownership
             return *this;
         }
+#pragma warning (pop)
 #endif
         wchar_t& operator(size_t index)
         {
@@ -755,7 +758,7 @@
             switch(AMFVariantGetType(pSrc))
             {
             case AMF_VARIANT_EMPTY:
-                errRet = AMFVariantClear(pDest);
+                errRet = AMFVariantInit(pDest);
                 break;
             case AMF_VARIANT_BOOL:
                 errRet = AMFVariantAssignBool(pDest, AMFVariantBool(pSrc));
@@ -1201,21 +1204,21 @@
     {
         res = AMF_OK;
         char buff0xFF;
-        sprintf(buff, "%d,%d", value.num, value.den);
+        sprintf(buff, "%u,%u", value.num, value.den);
         return buff;
     }
     static AMF_INLINE AMFVariant::String AMF_STD_CALL AMFConvertRatioToString(const AMFRatio& value, AMF_RESULT& res)
     {
         res = AMF_OK;
         char buff0xFF;
-        sprintf(buff, "%d,%d", value.num, value.den);
+        sprintf(buff, "%u,%u", value.num, value.den);
         return buff;
     }
     static AMF_INLINE AMFVariant::String AMF_STD_CALL AMFConvertColorToString(const AMFColor& value, AMF_RESULT& res)
     {
         res = AMF_OK;
         char buff0xFF;
-        sprintf(buff, "%d,%d,%d,%d", value.r, value.g, value.b, value.a);
+        sprintf(buff, "%u,%u,%u,%u", value.r, value.g, value.b, value.a);
         return buff;
     }
 
@@ -1346,7 +1349,7 @@
         int readElements = 0;
         if(value.size() > 0)
         {
-            readElements = sscanf(value.c_str(), "%d,%d", &tmp.num, &tmp.den);
+            readElements = sscanf(value.c_str(), "%u,%u", &tmp.num, &tmp.den);
         }
         if(readElements)
         {
@@ -1362,7 +1365,7 @@
         int readElements = 0;
         if(value.size() > 0)
         {
-            readElements = sscanf(value.c_str(), "%d,%d", &tmp.num, &tmp.den);
+            readElements = sscanf(value.c_str(), "%u,%u", &tmp.num, &tmp.den);
         }
         if(readElements)
         {
@@ -1581,7 +1584,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_BOOL;
@@ -1595,7 +1598,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_INT64;
@@ -1609,7 +1612,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_DOUBLE;
@@ -1623,7 +1626,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if (errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_FLOAT;
@@ -1638,7 +1641,7 @@
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pValue);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             const size_t size = (strlen(pValue) + 1);
@@ -1662,7 +1665,7 @@
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pValue);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             const size_t size = (wcslen(pValue) + 1);
@@ -1686,7 +1689,7 @@
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
         //AMF_VARIANT_RETURN_IF_INVALID_POINTER(pValue);//can be NULL
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_INTERFACE;
@@ -1715,7 +1718,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_RECT;
@@ -1736,7 +1739,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_SIZE;
@@ -1773,7 +1776,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_POINT;
@@ -1787,7 +1790,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if (errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_FLOAT_SIZE;
@@ -1801,7 +1804,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if (errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_FLOAT_POINT2D;
@@ -1815,7 +1818,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if (errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_FLOAT_POINT3D;
@@ -1829,7 +1832,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if (errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_FLOAT_VECTOR4D;
@@ -1850,7 +1853,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_RATE;
@@ -1871,7 +1874,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_RATIO;
@@ -1892,7 +1895,7 @@
         AMF_RESULT errRet = AMF_OK;
         AMF_VARIANT_RETURN_IF_INVALID_POINTER(pDest);
 
-        errRet = AMFVariantClear(pDest);
+        errRet = AMFVariantInit(pDest);
         if(errRet == AMF_OK)
         {
             pDest->type = AMF_VARIANT_COLOR;
@@ -1980,6 +1983,7 @@
     //-------------------------------------------------------------------------------------------------
     AMF_INLINE AMFVariant& AMFVariant::operator=(const AMFVariantStruct& other)
     {
+        AMFVariantClear(this);
         AMFVariantCopy(this, const_cast<AMFVariantStruct*>(&other));
         return *this;
     }
@@ -1988,6 +1992,7 @@
     {
         if(pOther != NULL)
         {
+            AMFVariantClear(this);
             AMFVariantCopy(this, const_cast<AMFVariantStruct*>(pOther));
         }
         return *this;
@@ -1995,6 +2000,7 @@
     //-------------------------------------------------------------------------------------------------
     AMF_INLINE AMFVariant& AMFVariant::operator=(const AMFVariant& other)
     {
+        AMFVariantClear(this);
         AMFVariantCopy(this,
                 const_cast<AMFVariantStruct*>(static_cast<const AMFVariantStruct*>(&other)));
         return *this;
@@ -2003,6 +2009,7 @@
     template<typename T>
     AMFVariant& AMFVariant::operator=(const AMFInterfacePtr_T<T>& value)
     {
+        AMFVariantClear(this);
         AMFVariantAssignInterface(this, value);
         return *this;
     }

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/core/Version.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/core/Version.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/include/core/VulkanAMF.h -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/include/core/VulkanAMF.h Changed

@@ -52,9 +52,9 @@
 
     typedef struct AMFVulkanSync
     {
-        amf_size            cbSizeof;           // sizeof(AMFVulkanSemaphore)
+        amf_size            cbSizeof;           // sizeof(AMFVulkanSync)
         void*               pNext;              // reserved for extensions
-        VkSemaphore         hSemaphore;
+        VkSemaphore         hSemaphore;         // VkSemaphore; can be nullptr
         bool                bSubmitted;         // if true - wait for hSemaphore. re-submit hSemaphore if not synced by other ways and set to true
         VkFence             hFence;             // To sync on CPU; can be nullptr. Submitted in vkQueueSubmit. If waited for hFence, null it, do not delete or reset.
     } AMFVulkanSync;
@@ -78,12 +78,12 @@
         amf_size            cbSizeof;           // sizeof(AMFVulkanSurface)
         void*               pNext;              // reserved for extensions
         // surface properties
-        VkImage             hImage;
-        VkDeviceMemory      hMemory;
+        VkImage             hImage;             // vulkan native image for which the surface is created
+        VkDeviceMemory      hMemory;            // memory for hImage, can be nullptr
         amf_int64           iSize;              // memory size
         amf_uint32          eFormat;            // VkFormat
-        amf_int32           iWidth;
-        amf_int32           iHeight;
+        amf_int32           iWidth;             // image width
+        amf_int32           iHeight;            // image height
         amf_uint32          eCurrentLayout;     // VkImageLayout
         amf_uint32          eUsage;             // AMF_SURFACE_USAGE
         amf_uint32          eAccess;            // AMF_MEMORY_CPU_ACCESS
@@ -92,7 +92,7 @@
 
     typedef struct AMFVulkanView
     {
-        amf_size            cbSizeof;           // sizeof(AMFVulkanSurface)
+        amf_size            cbSizeof;           // sizeof(AMFVulkanView)
         void*               pNext;              // reserved for extensions
         // surface properties
         AMFVulkanSurface    *pSurface;
@@ -102,6 +102,9 @@
         amf_int32           iPlaneWidthPitch;
         amf_int32           iPlaneHeightPitch;
     } AMFVulkanView;
+
+#define AMF_CONTEXT_VULKAN_COMPUTE_QUEUE  L"VulkanComputeQueue" // amf_int64; default=0; Compute queue index in range 0, (VkQueueFamilyProperties.queueCount-1) of the compute queue family.
+
 #if defined(__cplusplus)
 } // namespace amf
 #endif

gst-plugins-bad-1.22.7.tar.xz/sys/amfcodec/plugin.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/amfcodec/plugin.cpp Changed

@@ -37,6 +37,8 @@
 #include "gstamfh265enc.h"
 #include "gstamfav1enc.h"
 
+#include <glib/gi18n-lib.h>
+
 /* *INDENT-OFF* */
 using namespace Microsoft::WRL;
 using namespace amf;
@@ -48,20 +50,28 @@
   AMFFactory *amf_factory;
   ComPtr < IDXGIFactory1 > factory;
   HRESULT hr;
+  bool have_amd_gpu = false;
 
-  if (!IsWindows8OrGreater ())
+  if (!IsWindows8OrGreater ()) {
+    gst_plugin_add_status_warning (plugin,
+        N_("This plugin requires at least Windows 8 or newer."));
     return TRUE;
+  }
 
-  if (!gst_amf_init_once ())
+  if (!gst_amf_init_once () || !gst_amf_get_factory ()) {
+    gst_plugin_add_status_warning (plugin,
+        "AMF runtime library \"" AMF_DLL_NAMEA "\" was not found.");
     return TRUE;
+  }
 
   amf_factory = (AMFFactory *) gst_amf_get_factory ();
-  if (!amf_factory)
-    return TRUE;
 
   hr = CreateDXGIFactory1 (IID_PPV_ARGS (&factory));
-  if (FAILED (hr))
+  if (FAILED (hr)) {
+    /* Shouldn't happen, this means all DirectX bits would not be functional */
+    gst_plugin_add_status_error (plugin, N_("Unable to enumerate GPUs."));
     return TRUE;
+  }
 
   /* Enumerate AMD GPUs */
   for (guint idx = 0;; idx++) {
@@ -86,6 +96,7 @@
     if (desc.VendorId != 0x1002 && desc.VendorId != 0x1022)
       continue;
 
+    have_amd_gpu = true;
     luid = gst_d3d11_luid_to_int64 (&desc.AdapterLuid);
     device = gst_d3d11_device_new_for_adapter_luid (luid,
         D3D11_CREATE_DEVICE_BGRA_SUPPORT);
@@ -116,6 +127,13 @@
     gst_clear_object (&device);
   }
 
+  if (!have_amd_gpu) {
+    /* A little unexpected case. AMF runtime (part of driver) is installed
+     * but AMD GPU is not detected */
+    gst_plugin_add_status_warning (plugin,
+        N_("No AMD graphics cards detected!"));
+  }
+
   return TRUE;
 }

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gst-android-graphics-imageformat.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gst-android-graphics-imageformat.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gst-android-hardware-camera.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gst-android-hardware-camera.c Changed

@@ -56,7 +56,8 @@
   jmethodID stopSmoothZoom;
   jmethodID unlock;
 } android_hardware_camera = {
-0};
+  0
+};
 
 static struct
 {
@@ -67,7 +68,8 @@
   jint CAMERA_FACING_BACK;
   jint CAMERA_FACING_FRONT;
 } android_hardware_camera_camerainfo = {
-0};
+  0
+};
 
 gint CameraInfo_CAMERA_FACING_BACK;
 gint CameraInfo_CAMERA_FACING_FRONT;
@@ -78,7 +80,8 @@
   jfieldID width;
   jfieldID height;
 } android_hardware_camera_size = {
-0};
+  0
+};
 
 static struct
 {
@@ -186,7 +189,8 @@
   jstring FOCUS_MODE_CONTINUOUS_VIDEO;
   jstring FOCUS_MODE_CONTINUOUS_PICTURE;
 } android_hardware_camera_parameters = {
-0};
+  0
+};
 
 const gchar *Parameters_WHITE_BALANCE_AUTO;
 const gchar *Parameters_WHITE_BALANCE_INCANDESCENT;
@@ -250,7 +254,8 @@
   jclass klass;
   jmethodID iterator;
 } java_util_list = {
-0};
+  0
+};
 
 static struct
 {
@@ -258,28 +263,32 @@
   jmethodID hasNext;
   jmethodID next;
 } java_util_iterator = {
-0};
+  0
+};
 
 static struct
 {
   jclass klass;
   jmethodID intValue;
 } java_lang_integer = {
-0};
+  0
+};
 
 static struct
 {
   jclass klass;
   jmethodID equals;
 } java_lang_string = {
-0};
+  0
+};
 
 static struct
 {
   jclass klass;
   jmethodID constructor;
 } org_freedesktop_gstreamer_androidmedia_gstahccallback = {
-0};
+  0
+};
 
 static void
 gst_ah_camera_on_preview_frame (JNIEnv * env, jclass klass, jbyteArray data,

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gst-android-hardware-sensor.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gst-android-hardware-sensor.c Changed

@@ -62,7 +62,8 @@
   jstring SENSOR_SERVICE;
   jmethodID getSystemService;
 } android_content_context = {
-0};
+  0
+};
 
 static struct
 {
@@ -70,7 +71,8 @@
   jfieldID accuracy;
   jfieldID values;
 } android_hardware_sensor_event = {
-0};
+  0
+};
 
 static struct
 {
@@ -79,14 +81,16 @@
   jmethodID registerListener;
   jmethodID unregisterListener;
 } android_hardware_sensor_manager = {
-0};
+  0
+};
 
 static struct
 {
   jclass klass;
   jmethodID constructor;
 } org_freedesktop_gstreamer_androidmedia_gstahscallback = {
-0};
+  0
+};
 
 GHashTable *sensor_sizes = NULL;
 static void
@@ -99,50 +103,52 @@
     gsize size;
   } types = {
     {
-    AHS_SENSOR_TYPE_ACCELEROMETER, sizeof (GstAHSAccelerometerValues)}
+        AHS_SENSOR_TYPE_ACCELEROMETER, sizeof (GstAHSAccelerometerValues)}
     , {
-    AHS_SENSOR_TYPE_AMBIENT_TEMPERATURE,
-          sizeof (GstAHSAmbientTemperatureValues)}
+          AHS_SENSOR_TYPE_AMBIENT_TEMPERATURE,
+        sizeof (GstAHSAmbientTemperatureValues)}
     , {
-    AHS_SENSOR_TYPE_GAME_ROTATION_VECTOR,
-          sizeof (GstAHSGameRotationVectorValues)}
+          AHS_SENSOR_TYPE_GAME_ROTATION_VECTOR,
+        sizeof (GstAHSGameRotationVectorValues)}
     , {
-    AHS_SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR,
-          sizeof (GstAHSGeomagneticRotationVectorValues)}
+          AHS_SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR,
+        sizeof (GstAHSGeomagneticRotationVectorValues)}
     , {
-    AHS_SENSOR_TYPE_GRAVITY, sizeof (GstAHSGravityValues)}
+        AHS_SENSOR_TYPE_GRAVITY, sizeof (GstAHSGravityValues)}
     , {
-    AHS_SENSOR_TYPE_GYROSCOPE, sizeof (GstAHSGyroscopeValues)}
+        AHS_SENSOR_TYPE_GYROSCOPE, sizeof (GstAHSGyroscopeValues)}
     , {
-    AHS_SENSOR_TYPE_GYROSCOPE_UNCALIBRATED,
-          sizeof (GstAHSGyroscopeUncalibratedValues)}
+          AHS_SENSOR_TYPE_GYROSCOPE_UNCALIBRATED,
+        sizeof (GstAHSGyroscopeUncalibratedValues)}
     , {
-    AHS_SENSOR_TYPE_HEART_RATE, sizeof (GstAHSHeartRateValues)}
+        AHS_SENSOR_TYPE_HEART_RATE, sizeof (GstAHSHeartRateValues)}
     , {
-    AHS_SENSOR_TYPE_LIGHT, sizeof (GstAHSLightValues)}
+        AHS_SENSOR_TYPE_LIGHT, sizeof (GstAHSLightValues)}
     , {
-    AHS_SENSOR_TYPE_LINEAR_ACCELERATION,
-          sizeof (GstAHSLinearAccelerationValues)}
+          AHS_SENSOR_TYPE_LINEAR_ACCELERATION,
+        sizeof (GstAHSLinearAccelerationValues)}
     , {
-    AHS_SENSOR_TYPE_MAGNETIC_FIELD, sizeof (GstAHSMagneticFieldValues)}
+        AHS_SENSOR_TYPE_MAGNETIC_FIELD, sizeof (GstAHSMagneticFieldValues)}
     , {
-    AHS_SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED,
-          sizeof (GstAHSMagneticFieldUncalibratedValues)}
+          AHS_SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED,
+        sizeof (GstAHSMagneticFieldUncalibratedValues)}
     , {
-    AHS_SENSOR_TYPE_ORIENTATION, sizeof (GstAHSOrientationValues)}
+        AHS_SENSOR_TYPE_ORIENTATION, sizeof (GstAHSOrientationValues)}
     , {
-    AHS_SENSOR_TYPE_PRESSURE, sizeof (GstAHSPressureValues)}
+        AHS_SENSOR_TYPE_PRESSURE, sizeof (GstAHSPressureValues)}
     , {
-    AHS_SENSOR_TYPE_PROXIMITY, sizeof (GstAHSProximityValues)}
+        AHS_SENSOR_TYPE_PROXIMITY, sizeof (GstAHSProximityValues)}
     , {
-    AHS_SENSOR_TYPE_RELATIVE_HUMIDITY, sizeof (GstAHSRelativeHumidityValues)}
+          AHS_SENSOR_TYPE_RELATIVE_HUMIDITY,
+        sizeof (GstAHSRelativeHumidityValues)}
     , {
-    AHS_SENSOR_TYPE_ROTATION_VECTOR, sizeof (GstAHSRotationVectorValues)}
+        AHS_SENSOR_TYPE_ROTATION_VECTOR, sizeof (GstAHSRotationVectorValues)}
     , {
-    AHS_SENSOR_TYPE_STEP_COUNTER, sizeof (GstAHSStepCounterValues)}
+        AHS_SENSOR_TYPE_STEP_COUNTER, sizeof (GstAHSStepCounterValues)}
     , {
-    AHS_SENSOR_TYPE_STEP_DETECTOR, sizeof (GstAHSStepDetectorValues)}
-  ,};
+        AHS_SENSOR_TYPE_STEP_DETECTOR, sizeof (GstAHSStepDetectorValues)}
+    ,
+  };
 
   g_assert_null (sensor_sizes);

gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gstamc-codec.c Added

@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2012,2018 Collabora Ltd.
+ *   Author: Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * Copyright (C) 2022 Ratchanan Srirattanamet <peathot@hotmail.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
+ * version 2.1 of the License.
+ *
+ * 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
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include "gstamc-codec.h"
+
+GstAmcCodecVTable *gst_amc_codec_vtable = NULL;
+
+void
+gst_amc_buffer_free (GstAmcBuffer * buffer)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->buffer_free (buffer);
+}
+
+gboolean
+gst_amc_buffer_set_position_and_limit (GstAmcBuffer * buffer, GError ** err,
+    gint position, gint limit)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->buffer_set_position_and_limit (buffer, err,
+      position, limit);
+}
+
+GstAmcCodec *
+gst_amc_codec_new (const gchar * name, gboolean is_encoder, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->create (name, is_encoder, err);
+}
+
+void
+gst_amc_codec_free (GstAmcCodec * codec)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->free (codec);
+}
+
+gboolean
+gst_amc_codec_configure (GstAmcCodec * codec, GstAmcFormat * format,
+    GstAmcSurfaceTexture * surface_texture, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->configure (codec, format, surface_texture, err);
+}
+
+GstAmcFormat *
+gst_amc_codec_get_output_format (GstAmcCodec * codec, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->get_output_format (codec, err);
+}
+
+gboolean
+gst_amc_codec_start (GstAmcCodec * codec, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->start (codec, err);
+}
+
+gboolean
+gst_amc_codec_stop (GstAmcCodec * codec, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->stop (codec, err);
+}
+
+gboolean
+gst_amc_codec_flush (GstAmcCodec * codec, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->flush (codec, err);
+}
+
+gboolean
+gst_amc_codec_release (GstAmcCodec * codec, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->release (codec, err);
+}
+
+gboolean
+gst_amc_codec_request_key_frame (GstAmcCodec * codec, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->request_key_frame (codec, err);
+}
+
+gboolean
+gst_amc_codec_have_dynamic_bitrate (void)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->have_dynamic_bitrate ();
+}
+
+gboolean
+gst_amc_codec_set_dynamic_bitrate (GstAmcCodec * codec, GError ** err,
+    gint bitrate)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->set_dynamic_bitrate (codec, err, bitrate);
+}
+
+GstAmcBuffer *
+gst_amc_codec_get_output_buffer (GstAmcCodec * codec, gint index, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->get_output_buffer (codec, index, err);
+}
+
+GstAmcBuffer *
+gst_amc_codec_get_input_buffer (GstAmcCodec * codec, gint index, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->get_input_buffer (codec, index, err);
+}
+
+gint
+gst_amc_codec_dequeue_input_buffer (GstAmcCodec * codec, gint64 timeoutUs,
+    GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->dequeue_input_buffer (codec, timeoutUs, err);
+}
+
+gint
+gst_amc_codec_dequeue_output_buffer (GstAmcCodec * codec,
+    GstAmcBufferInfo * info, gint64 timeoutUs, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->dequeue_output_buffer (codec, info, timeoutUs,
+      err);
+}
+
+gboolean
+gst_amc_codec_queue_input_buffer (GstAmcCodec * codec, gint index,
+    const GstAmcBufferInfo * info, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->queue_input_buffer (codec, index, info, err);
+}
+
+gboolean
+gst_amc_codec_release_output_buffer (GstAmcCodec * codec, gint index,
+    gboolean render, GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->release_output_buffer (codec, index, render,
+      err);
+}
+
+GstAmcSurfaceTexture *
+gst_amc_codec_new_surface_texture (GError ** err)
+{
+  g_assert (gst_amc_codec_vtable != NULL);
+  return gst_amc_codec_vtable->new_surface_texture (err);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gstamc-codec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gstamc-codec.h Changed

@@ -30,6 +30,7 @@
 
 typedef struct _GstAmcBuffer GstAmcBuffer;
 typedef struct _GstAmcBufferInfo GstAmcBufferInfo;
+typedef struct _GstAmcCodecVTable GstAmcCodecVTable;
 typedef struct _GstAmcCodec GstAmcCodec;
 
 struct _GstAmcBuffer {
@@ -44,7 +45,81 @@
   gint size;
 };
 
-gboolean gst_amc_codec_static_init (void);
+struct _GstAmcCodecVTable
+{
+  void           (* buffer_free)                   (GstAmcBuffer * buffer);
+
+  gboolean       (* buffer_set_position_and_limit) (GstAmcBuffer * buffer,
+                                                    GError ** err,
+                                                    gint position,
+                                                    gint limit);
+
+  GstAmcCodec *  (* create)                        (const gchar * name,
+                                                    gboolean is_encoder,
+                                                    GError ** err);
+
+  void           (* free)                          (GstAmcCodec * codec);
+
+  gboolean       (* configure)                     (GstAmcCodec * codec,
+                                                    GstAmcFormat * format,
+                                                    GstAmcSurfaceTexture * surface_texture,
+                                                    GError **err);
+
+  GstAmcFormat * (* get_output_format)             (GstAmcCodec * codec,
+                                                    GError **err);
+
+  gboolean       (* start)                         (GstAmcCodec * codec,
+                                                    GError **err);
+
+  gboolean       (* stop)                          (GstAmcCodec * codec,
+                                                    GError **err);
+
+  gboolean       (* flush)                         (GstAmcCodec * codec,
+                                                    GError **err);
+
+  gboolean       (* release)                       (GstAmcCodec * codec,
+                                                    GError **err);
+
+  gboolean       (* request_key_frame)             (GstAmcCodec * codec,
+                                                    GError **err);
+
+  gboolean       (* have_dynamic_bitrate)          (void);
+
+  gboolean       (* set_dynamic_bitrate)           (GstAmcCodec * codec,
+                                                    GError **err,
+                                                    gint bitrate);
+
+  GstAmcBuffer * (* get_output_buffer)             (GstAmcCodec * codec,
+                                                    gint index,
+                                                    GError **err);
+
+  GstAmcBuffer * (* get_input_buffer)              (GstAmcCodec * codec,
+                                                    gint index,
+                                                    GError **err);
+
+  gint           (* dequeue_input_buffer)          (GstAmcCodec * codec,
+                                                    gint64 timeoutUs,
+                                                    GError **err);
+
+  gint           (* dequeue_output_buffer)         (GstAmcCodec * codec,
+                                                    GstAmcBufferInfo *info,
+                                                    gint64 timeoutUs,
+                                                    GError **err);
+
+  gboolean       (* queue_input_buffer)            (GstAmcCodec * codec,
+                                                    gint index,
+                                                    const GstAmcBufferInfo *info,
+                                                    GError **err);
+
+  gboolean       (* release_output_buffer)         (GstAmcCodec * codec,
+                                                    gint index,
+                                                    gboolean render,
+                                                    GError **err);
+
+  GstAmcSurfaceTexture * (* new_surface_texture)   (GError ** err);
+};
+
+extern GstAmcCodecVTable *gst_amc_codec_vtable;
 
 void gst_amc_buffer_free (GstAmcBuffer * buffer);
 gboolean gst_amc_buffer_set_position_and_limit (GstAmcBuffer * buffer, GError ** err,

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gstamc-codeclist.h -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gstamc-codeclist.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gstamc-format.c Added

@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2012,2018 Collabora Ltd.
+ *   Author: Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * Copyright (C) 2023 Ratchanan Srirattanamet <peathot@hotmail.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
+ * version 2.1 of the License.
+ *
+ * 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
+ *
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include "gstamc-format.h"
+
+GstAmcFormatVTable *gst_amc_format_vtable = NULL;
+
+GstAmcFormat *
+gst_amc_format_new_audio (const gchar * mime, gint sample_rate, gint channels,
+    GError ** err)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  return gst_amc_format_vtable->new_audio (mime, sample_rate, channels, err);
+}
+
+GstAmcFormat *
+gst_amc_format_new_video (const gchar * mime, gint width, gint height,
+    GError ** err)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  return gst_amc_format_vtable->new_video (mime, width, height, err);
+}
+
+void
+gst_amc_format_free (GstAmcFormat * format)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  gst_amc_format_vtable->free (format);
+}
+
+gchar *
+gst_amc_format_to_string (GstAmcFormat * format, GError ** err)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  return gst_amc_format_vtable->to_string (format, err);
+}
+
+gboolean
+gst_amc_format_get_float (GstAmcFormat * format, const gchar * key,
+    gfloat * value, GError ** err)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  return gst_amc_format_vtable->get_float (format, key, value, err);
+}
+
+gboolean
+gst_amc_format_set_float (GstAmcFormat * format, const gchar * key,
+    gfloat value, GError ** err)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  return gst_amc_format_vtable->set_float (format, key, value, err);
+}
+
+gboolean
+gst_amc_format_get_int (GstAmcFormat * format, const gchar * key, gint * value,
+    GError ** err)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  return gst_amc_format_vtable->get_int (format, key, value, err);
+}
+
+gboolean
+gst_amc_format_set_int (GstAmcFormat * format, const gchar * key, gint value,
+    GError ** err)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  return gst_amc_format_vtable->set_int (format, key, value, err);
+}
+
+gboolean
+gst_amc_format_get_string (GstAmcFormat * format, const gchar * key,
+    gchar ** value, GError ** err)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  return gst_amc_format_vtable->get_string (format, key, value, err);
+}
+
+gboolean
+gst_amc_format_set_string (GstAmcFormat * format, const gchar * key,
+    const gchar * value, GError ** err)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  return gst_amc_format_vtable->set_string (format, key, value, err);
+}
+
+gboolean
+gst_amc_format_get_buffer (GstAmcFormat * format, const gchar * key,
+    guint8 ** data, gsize * size, GError ** err)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  return gst_amc_format_vtable->get_buffer (format, key, data, size, err);
+}
+
+gboolean
+gst_amc_format_set_buffer (GstAmcFormat * format, const gchar * key,
+    guint8 * data, gsize size, GError ** err)
+{
+  g_assert (gst_amc_format_vtable != NULL);
+  return gst_amc_format_vtable->set_buffer (format, key, data, size, err);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gstamc-format.h -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gstamc-format.h Changed

@@ -25,10 +25,70 @@
 
 G_BEGIN_DECLS
 
+typedef struct _GstAmcFormatVTable GstAmcFormatVTable;
 typedef struct _GstAmcFormat GstAmcFormat;
 typedef struct _GstAmcColorFormatInfo GstAmcColorFormatInfo;
 
-gboolean gst_amc_format_static_init (void);
+struct _GstAmcFormatVTable {
+  GstAmcFormat * (* new_audio)  (const gchar *mime,
+                                 gint sample_rate,
+                                 gint channels,
+                                 GError **err);
+
+  GstAmcFormat * (* new_video)  (const gchar *mime,
+                                 gint width,
+                                 gint height,
+                                 GError **err);
+
+  void           (* free)       (GstAmcFormat * format);
+
+  gchar *        (* to_string)  (GstAmcFormat * format,
+                                 GError **err);
+
+  gboolean       (* get_float)  (GstAmcFormat *format,
+                                 const gchar *key,
+                                 gfloat *value,
+                                 GError **err);
+
+  gboolean       (* set_float)  (GstAmcFormat *format,
+                                 const gchar *key,
+                                 gfloat value,
+                                 GError **err);
+
+  gboolean       (* get_int)    (GstAmcFormat *format,
+                                 const gchar *key,
+                                 gint *value,
+                                 GError **err);
+
+  gboolean       (* set_int)    (GstAmcFormat *format,
+                                 const gchar *key,
+                                 gint value,
+                                 GError **err);
+
+  gboolean       (* get_string) (GstAmcFormat *format,
+                                 const gchar *key,
+                                 gchar **value,
+                                 GError **err);
+
+  gboolean       (* set_string) (GstAmcFormat *format,
+                                 const gchar *key,
+                                 const gchar *value,
+                                GError **err);
+
+  gboolean       (* get_buffer) (GstAmcFormat *format,
+                                 const gchar *key,
+                                 guint8 **data,
+                                 gsize *size,
+                                 GError **err);
+
+  gboolean       (* set_buffer) (GstAmcFormat *format,
+                                 const gchar *key,
+                                 guint8 *data,
+                                 gsize size,
+                                 GError **err);
+};
+
+extern GstAmcFormatVTable *gst_amc_format_vtable;
 
 GstAmcFormat * gst_amc_format_new_audio (const gchar *mime, gint sample_rate, gint channels, GError **err);
 GstAmcFormat * gst_amc_format_new_video (const gchar *mime, gint width, gint height, GError **err);

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gstamc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gstamc.c Changed

@@ -346,7 +346,7 @@
         GstAmcCodecInfo *tmp = l->data;
 
         if (strcmp (tmp->name, gst_codec_info->name) == 0
-            && ! !tmp->is_encoder == ! !gst_codec_info->is_encoder) {
+            && !!tmp->is_encoder == !!gst_codec_info->is_encoder) {
           gint m = tmp->n_supported_types, n;
 
           GST_LOG ("Successfully scanned codec '%s', appending to existing",
@@ -509,20 +509,21 @@
   GstVideoFormat video_format;
 } color_format_mapping_table = {
   {
-  COLOR_FormatYUV420Planar, GST_VIDEO_FORMAT_I420}, {
-  COLOR_FormatYUV420Flexible, GST_VIDEO_FORMAT_I420}, {
-  COLOR_FormatYUV420SemiPlanar, GST_VIDEO_FORMAT_NV12}, {
-  COLOR_TI_FormatYUV420PackedSemiPlanar, GST_VIDEO_FORMAT_NV12}, {
-  COLOR_TI_FormatYUV420PackedSemiPlanarInterlaced, GST_VIDEO_FORMAT_NV12}, {
-  COLOR_INTEL_FormatYUV420PackedSemiPlanar, GST_VIDEO_FORMAT_NV12}, {
-  COLOR_INTEL_FormatYUV420PackedSemiPlanar_Tiled, GST_VIDEO_FORMAT_NV12}, {
-  COLOR_QCOM_FormatYUV420SemiPlanar, GST_VIDEO_FORMAT_NV12}, {
-  COLOR_QCOM_FormatYUV420PackedSemiPlanar64x32Tile2m8ka, GST_VIDEO_FORMAT_NV12}, {
-  COLOR_QCOM_FormatYVU420SemiPlanar32m, GST_VIDEO_FORMAT_NV12}, {
-  COLOR_QCOM_FormatYVU420SemiPlanar32mMultiView, GST_VIDEO_FORMAT_NV12}, {
-  COLOR_OMX_SEC_FormatNV12Tiled, GST_VIDEO_FORMAT_NV12}, {
-  COLOR_FormatYCbYCr, GST_VIDEO_FORMAT_YUY2}, {
-  COLOR_FormatYV12, GST_VIDEO_FORMAT_YV12}
+      COLOR_FormatYUV420Planar, GST_VIDEO_FORMAT_I420}, {
+      COLOR_FormatYUV420Flexible, GST_VIDEO_FORMAT_I420}, {
+      COLOR_FormatYUV420SemiPlanar, GST_VIDEO_FORMAT_NV12}, {
+      COLOR_TI_FormatYUV420PackedSemiPlanar, GST_VIDEO_FORMAT_NV12}, {
+      COLOR_TI_FormatYUV420PackedSemiPlanarInterlaced, GST_VIDEO_FORMAT_NV12}, {
+      COLOR_INTEL_FormatYUV420PackedSemiPlanar, GST_VIDEO_FORMAT_NV12}, {
+      COLOR_INTEL_FormatYUV420PackedSemiPlanar_Tiled, GST_VIDEO_FORMAT_NV12}, {
+      COLOR_QCOM_FormatYUV420SemiPlanar, GST_VIDEO_FORMAT_NV12}, {
+        COLOR_QCOM_FormatYUV420PackedSemiPlanar64x32Tile2m8ka,
+      GST_VIDEO_FORMAT_NV12}, {
+      COLOR_QCOM_FormatYVU420SemiPlanar32m, GST_VIDEO_FORMAT_NV12}, {
+      COLOR_QCOM_FormatYVU420SemiPlanar32mMultiView, GST_VIDEO_FORMAT_NV12}, {
+      COLOR_OMX_SEC_FormatNV12Tiled, GST_VIDEO_FORMAT_NV12}, {
+      COLOR_FormatYCbYCr, GST_VIDEO_FORMAT_YUY2}, {
+      COLOR_FormatYV12, GST_VIDEO_FORMAT_YV12}
 };
 
 static gboolean
@@ -1091,8 +1092,8 @@
   const gchar *str;
 } hevc_profile_mapping_table = {
   {
-  HEVCProfileMain, "main"}, {
-  HEVCProfileMain10, "main-10"}
+      HEVCProfileMain, "main"}, {
+      HEVCProfileMain10, "main-10"}
 };
 
 const gchar *
@@ -1131,32 +1132,32 @@
   const gchar *level_str;
 } hevc_tier_level_mapping_table = {
   {
-  HEVCMainTierLevel1, "main", "1"}, {
-  HEVCMainTierLevel2, "main", "2"}, {
-  HEVCMainTierLevel21, "main", "2.1"}, {
-  HEVCMainTierLevel3, "main", "3"}, {
-  HEVCMainTierLevel31, "main", "3.1"}, {
-  HEVCMainTierLevel4, "main", "4"}, {
-  HEVCMainTierLevel41, "main", "4.1"}, {
-  HEVCMainTierLevel5, "main", "5"}, {
-  HEVCMainTierLevel51, "main", "5.1"}, {
-  HEVCMainTierLevel52, "main", "5.2"}, {
-  HEVCMainTierLevel6, "main", "6"}, {
-  HEVCMainTierLevel61, "main", "6.1"}, {
-  HEVCMainTierLevel62, "main", "6.2"}, {
-  HEVCHighTierLevel1, "high", "1"}, {
-  HEVCHighTierLevel2, "high", "2"}, {
-  HEVCHighTierLevel21, "high", "2.1"}, {
-  HEVCHighTierLevel3, "high", "3"}, {
-  HEVCHighTierLevel31, "high", "3.1"}, {
-  HEVCHighTierLevel4, "high", "4"}, {
-  HEVCHighTierLevel41, "high", "4.1"}, {
-  HEVCHighTierLevel5, "high", "5"}, {
-  HEVCHighTierLevel51, "high", "5.1"}, {
-  HEVCHighTierLevel52, "high", "5.2"}, {
-  HEVCHighTierLevel6, "high", "6"}, {
-  HEVCHighTierLevel61, "high", "6.1"}, {
-  HEVCHighTierLevel62, "high", "6.2"}
+      HEVCMainTierLevel1, "main", "1"}, {
+      HEVCMainTierLevel2, "main", "2"}, {
+      HEVCMainTierLevel21, "main", "2.1"}, {
+      HEVCMainTierLevel3, "main", "3"}, {
+      HEVCMainTierLevel31, "main", "3.1"}, {
+      HEVCMainTierLevel4, "main", "4"}, {
+      HEVCMainTierLevel41, "main", "4.1"}, {
+      HEVCMainTierLevel5, "main", "5"}, {
+      HEVCMainTierLevel51, "main", "5.1"}, {
+      HEVCMainTierLevel52, "main", "5.2"}, {
+      HEVCMainTierLevel6, "main", "6"}, {
+      HEVCMainTierLevel61, "main", "6.1"}, {
+      HEVCMainTierLevel62, "main", "6.2"}, {
+      HEVCHighTierLevel1, "high", "1"}, {
+      HEVCHighTierLevel2, "high", "2"}, {
+      HEVCHighTierLevel21, "high", "2.1"}, {
+      HEVCHighTierLevel3, "high", "3"}, {
+      HEVCHighTierLevel31, "high", "3.1"}, {
+      HEVCHighTierLevel4, "high", "4"}, {
+      HEVCHighTierLevel41, "high", "4.1"}, {
+      HEVCHighTierLevel5, "high", "5"}, {
+      HEVCHighTierLevel51, "high", "5.1"}, {
+      HEVCHighTierLevel52, "high", "5.2"}, {
+      HEVCHighTierLevel6, "high", "6"}, {
+      HEVCHighTierLevel61, "high", "6.1"}, {
+      HEVCHighTierLevel62, "high", "6.2"}
 };
 
 const gchar *
@@ -1196,13 +1197,13 @@
   const gchar *alt_str;
 } avc_profile_mapping_table = {
   {
-  AVCProfileBaseline, "baseline", "constrained-baseline"}, {
-  AVCProfileMain, "main", NULL}, {
-  AVCProfileExtended, "extended", NULL}, {
-  AVCProfileHigh, "high"}, {
-  AVCProfileHigh10, "high-10", "high-10-intra"}, {
-  AVCProfileHigh422, "high-4:2:2", "high-4:2:2-intra"}, {
-  AVCProfileHigh444, "high-4:4:4", "high-4:4:4-intra"}
+      AVCProfileBaseline, "baseline", "constrained-baseline"}, {
+      AVCProfileMain, "main", NULL}, {
+      AVCProfileExtended, "extended", NULL}, {
+      AVCProfileHigh, "high"}, {
+      AVCProfileHigh10, "high-10", "high-10-intra"}, {
+      AVCProfileHigh422, "high-4:2:2", "high-4:2:2-intra"}, {
+      AVCProfileHigh444, "high-4:4:4", "high-4:4:4-intra"}
 };
 
 const gchar *
@@ -1244,22 +1245,22 @@
   const gchar *str;
 } avc_level_mapping_table = {
   {
-  AVCLevel1, "1"}, {
-  AVCLevel1b, "1b"}, {
-  AVCLevel11, "1.1"}, {
-  AVCLevel12, "1.2"}, {
-  AVCLevel13, "1.3"}, {
-  AVCLevel2, "2"}, {
-  AVCLevel21, "2.1"}, {
-  AVCLevel22, "2.2"}, {
-  AVCLevel3, "3"}, {
-  AVCLevel31, "3.1"}, {
-  AVCLevel32, "3.2"}, {
-  AVCLevel4, "4"}, {
-  AVCLevel41, "4.1"}, {
-  AVCLevel42, "4.2"}, {
-  AVCLevel5, "5"}, {
-  AVCLevel51, "5.1"}
+      AVCLevel1, "1"}, {
+      AVCLevel1b, "1b"}, {
+      AVCLevel11, "1.1"}, {
+      AVCLevel12, "1.2"}, {
+      AVCLevel13, "1.3"}, {
+      AVCLevel2, "2"}, {
+      AVCLevel21, "2.1"}, {
+      AVCLevel22, "2.2"}, {
+      AVCLevel3, "3"}, {
+      AVCLevel31, "3.1"}, {
+      AVCLevel32, "3.2"}, {
+      AVCLevel4, "4"}, {
+      AVCLevel41, "4.1"}, {
+      AVCLevel42, "4.2"}, {
+      AVCLevel5, "5"}, {
+      AVCLevel51, "5.1"}
 };
 
 const gchar *
@@ -1296,15 +1297,15 @@
   gint gst_id;
 } h263_profile_mapping_table = {
   {
-  H263ProfileBaseline, 0}, {
-  H263ProfileH320Coding, 1}, {
-  H263ProfileBackwardCompatible, 2}, {
-  H263ProfileISWV2, 3}, {
-  H263ProfileISWV3, 4}, {
-  H263ProfileHighCompression, 5}, {
-  H263ProfileInternet, 6}, {
-  H263ProfileInterlace, 7}, {
-  H263ProfileHighLatency, 8}
+      H263ProfileBaseline, 0}, {
+      H263ProfileH320Coding, 1}, {
+      H263ProfileBackwardCompatible, 2}, {
+      H263ProfileISWV2, 3}, {
+      H263ProfileISWV3, 4}, {
+      H263ProfileHighCompression, 5}, {
+      H263ProfileInternet, 6}, {
+      H263ProfileInterlace, 7}, {
+      H263ProfileHighLatency, 8}
 };
 
 gint
@@ -1339,13 +1340,13 @@
   gint gst_id;
 } h263_level_mapping_table = {
   {
-  H263Level10, 10}, {
-  H263Level20, 20}, {
-  H263Level30, 30}, {
-  H263Level40, 40}, {
-  H263Level50, 50}, {
-  H263Level60, 60}, {
-  H263Level70, 70}
+      H263Level10, 10}, {
+      H263Level20, 20}, {
+      H263Level30, 30}, {
+      H263Level40, 40}, {
+      H263Level50, 50}, {
+      H263Level60, 60}, {
+      H263Level70, 70}
 };
 
 gint
@@ -1380,22 +1381,22 @@
   const gchar *str;
 } mpeg4_profile_mapping_table = {
   {
-  MPEG4ProfileSimple, "simple"}, {
-  MPEG4ProfileSimpleScalable, "simple-scalable"}, {
-  MPEG4ProfileCore, "core"}, {
-  MPEG4ProfileMain, "main"}, {
-  MPEG4ProfileNbit, "n-bit"}, {
-  MPEG4ProfileScalableTexture, "scalable"}, {
-  MPEG4ProfileSimpleFace, "simple-face"}, {
-  MPEG4ProfileSimpleFBA, "simple-fba"}, {
-  MPEG4ProfileBasicAnimated, "basic-animated-texture"}, {
-  MPEG4ProfileHybrid, "hybrid"}, {
-  MPEG4ProfileAdvancedRealTime, "advanced-real-time"}, {
-  MPEG4ProfileCoreScalable, "core-scalable"}, {
-  MPEG4ProfileAdvancedCoding, "advanced-coding-efficiency"}, {
-  MPEG4ProfileAdvancedCore, "advanced-core"}, {
-  MPEG4ProfileAdvancedScalable, "advanced-scalable-texture"}, {
-  MPEG4ProfileAdvancedSimple, "advanced-simple"}
+      MPEG4ProfileSimple, "simple"}, {
+      MPEG4ProfileSimpleScalable, "simple-scalable"}, {
+      MPEG4ProfileCore, "core"}, {
+      MPEG4ProfileMain, "main"}, {
+      MPEG4ProfileNbit, "n-bit"}, {
+      MPEG4ProfileScalableTexture, "scalable"}, {
+      MPEG4ProfileSimpleFace, "simple-face"}, {
+      MPEG4ProfileSimpleFBA, "simple-fba"}, {
+      MPEG4ProfileBasicAnimated, "basic-animated-texture"}, {
+      MPEG4ProfileHybrid, "hybrid"}, {
+      MPEG4ProfileAdvancedRealTime, "advanced-real-time"}, {
+      MPEG4ProfileCoreScalable, "core-scalable"}, {
+      MPEG4ProfileAdvancedCoding, "advanced-coding-efficiency"}, {
+      MPEG4ProfileAdvancedCore, "advanced-core"}, {
+      MPEG4ProfileAdvancedScalable, "advanced-scalable-texture"}, {
+      MPEG4ProfileAdvancedSimple, "advanced-simple"}
 };
 
 const gchar *
@@ -1432,14 +1433,15 @@
   const gchar *str;
 } mpeg4_level_mapping_table = {
   {
-  MPEG4Level0, "0"}, {
-  MPEG4Level0b, "0b"}, {
-  MPEG4Level1, "1"}, {
-  MPEG4Level2, "2"}, {
-  MPEG4Level3, "3"}, {
-  MPEG4Level4, "4"}, {
-  MPEG4Level4a, "4a"}, {
-MPEG4Level5, "5"},};
+      MPEG4Level0, "0"}, {
+      MPEG4Level0b, "0b"}, {
+      MPEG4Level1, "1"}, {
+      MPEG4Level2, "2"}, {
+      MPEG4Level3, "3"}, {
+      MPEG4Level4, "4"}, {
+      MPEG4Level4a, "4a"}, {
+      MPEG4Level5, "5"},
+};
 
 const gchar *
 gst_amc_mpeg4_level_to_string (gint level)
@@ -1475,10 +1477,10 @@
   const gchar *str;
 } aac_profile_mapping_table = {
   {
-  AACObjectMain, "main"}, {
-  AACObjectLC, "lc"}, {
-  AACObjectSSR, "ssr"}, {
-  AACObjectLTP, "ltp"}
+      AACObjectMain, "main"}, {
+      AACObjectLC, "lc"}, {
+      AACObjectSSR, "ssr"}, {
+      AACObjectLTP, "ltp"}
 };
 
 const gchar *
@@ -1515,26 +1517,26 @@
   GstAudioChannelPosition pos;
 } channel_mapping_table = {
   {
-  CHANNEL_OUT_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT}, {
-  CHANNEL_OUT_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, {
-  CHANNEL_OUT_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}, {
-  CHANNEL_OUT_LOW_FREQUENCY, GST_AUDIO_CHANNEL_POSITION_LFE1}, {
-  CHANNEL_OUT_BACK_LEFT, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT}, {
-  CHANNEL_OUT_BACK_RIGHT, GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, {
-  CHANNEL_OUT_FRONT_LEFT_OF_CENTER,
-        GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER}, {
-  CHANNEL_OUT_FRONT_RIGHT_OF_CENTER,
-        GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, {
-  CHANNEL_OUT_BACK_CENTER, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}, {
-  CHANNEL_OUT_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT}, {
-  CHANNEL_OUT_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}, {
-  CHANNEL_OUT_TOP_CENTER, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
-  CHANNEL_OUT_TOP_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
-  CHANNEL_OUT_TOP_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
-  CHANNEL_OUT_TOP_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
-  CHANNEL_OUT_TOP_BACK_LEFT, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
-  CHANNEL_OUT_TOP_BACK_CENTER, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
-  CHANNEL_OUT_TOP_BACK_RIGHT, GST_AUDIO_CHANNEL_POSITION_INVALID}
+      CHANNEL_OUT_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT}, {
+      CHANNEL_OUT_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, {
+      CHANNEL_OUT_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER}, {
+      CHANNEL_OUT_LOW_FREQUENCY, GST_AUDIO_CHANNEL_POSITION_LFE1}, {
+      CHANNEL_OUT_BACK_LEFT, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT}, {
+      CHANNEL_OUT_BACK_RIGHT, GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT}, {
+        CHANNEL_OUT_FRONT_LEFT_OF_CENTER,
+      GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER}, {
+        CHANNEL_OUT_FRONT_RIGHT_OF_CENTER,
+      GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER}, {
+      CHANNEL_OUT_BACK_CENTER, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER}, {
+      CHANNEL_OUT_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT}, {
+      CHANNEL_OUT_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT}, {
+      CHANNEL_OUT_TOP_CENTER, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
+      CHANNEL_OUT_TOP_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
+      CHANNEL_OUT_TOP_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
+      CHANNEL_OUT_TOP_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
+      CHANNEL_OUT_TOP_BACK_LEFT, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
+      CHANNEL_OUT_TOP_BACK_CENTER, GST_AUDIO_CHANNEL_POSITION_INVALID}, {
+      CHANNEL_OUT_TOP_BACK_RIGHT, GST_AUDIO_CHANNEL_POSITION_INVALID}
 };
 
 gboolean
@@ -1838,16 +1840,7 @@
 
   gst_amc_codec_info_quark = g_quark_from_static_string ("gst-amc-codec-info");
 
-  if (!gst_amc_codeclist_static_init ())
-    return FALSE;
-
-  if (!gst_amc_codec_static_init ())
-    return FALSE;
-
-  if (!gst_amc_format_static_init ())
-    return FALSE;
-
-  if (!gst_amc_surface_texture_static_init ())
+  if (!gst_amc_static_init ())
     return FALSE;
 
   /* Set this to TRUE to allow registering decoders that have
@@ -2401,6 +2394,15 @@
               "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
 
           encoded_ret = gst_caps_merge_structure (encoded_ret, tmp);
+        } else if (strcmp (type->mime, "video/av01") == 0) {
+          tmp = gst_structure_new ("video/x-av1",
+              "stream-format", G_TYPE_STRING, "obu-stream",
+              "alignment", G_TYPE_STRING, "tu",
+              "width", GST_TYPE_INT_RANGE, 16, 4096,
+              "height", GST_TYPE_INT_RANGE, 16, 4096,
+              "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
+
+          encoded_ret = gst_caps_merge_structure (encoded_ret, tmp);
         } else if (strcmp (type->mime, "video/mpeg2") == 0) {
           tmp = gst_structure_new ("video/mpeg",
               "width", GST_TYPE_INT_RANGE, 16, 4096,

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gstamc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gstamc.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gstamcaudiodec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gstamcaudiodec.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gstamcsurfacetexture.h -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gstamcsurfacetexture.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gstamcvideodec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gstamcvideodec.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/gstamcvideoenc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/gstamcvideoenc.c Changed

@@ -157,13 +157,15 @@
     const gchar *key;
     gint id;
   } amc_profile = {
-  NULL, -1};
+    NULL, -1
+  };
   struct
   {
     const gchar *key;
     gint id;
   } amc_level = {
-  NULL, -1};
+    NULL, -1
+  };
   gint color_format;
   gint stride, slice_height;
   GstAmcFormat *format = NULL;
@@ -232,6 +234,8 @@
     mime = "video/x-vnd.on2.vp8";
   } else if (strcmp (name, "video/x-vp9") == 0) {
     mime = "video/x-vnd.on2.vp9";
+  } else if (strcmp (name, "video/x-av1") == 0) {
+    mime = "video/av01";
   } else {
     GST_ERROR_OBJECT (encoder, "Failed to convert caps(%s/...) to any mime",
         name);
@@ -459,6 +463,10 @@
     caps = gst_caps_new_empty_simple ("video/x-vp8");
   } else if (strcmp (mime, "video/x-vnd.on2.vp9") == 0) {
     caps = gst_caps_new_empty_simple ("video/x-vp9");
+  } else if (strcmp (mime, "video/av01") == 0) {
+    caps = gst_caps_new_simple ("video/x-av1",
+        "stream-format", G_TYPE_STRING, "obu-stream",
+        "alignment", G_TYPE_STRING, "tu", NULL);
   }
 
   gst_caps_set_simple (caps, "width", G_TYPE_INT, width,
@@ -1165,7 +1173,7 @@
     }
   }
 
-  is_eos = ! !(buffer_info.flags & BUFFER_FLAG_END_OF_STREAM);
+  is_eos = !!(buffer_info.flags & BUFFER_FLAG_END_OF_STREAM);
 
   if (flow_ret == GST_FLOW_OK && !is_codec_data) {
     frame =

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/jni/gstamc-codec-jni.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/jni/gstamc-codec-jni.c Changed

@@ -26,6 +26,7 @@
 #include "../gstjniutils.h"
 #include "../gstamc-codec.h"
 #include "../gstamc-constants.h"
+#include "gstamc-jni.h"
 #include "gstamc-internal-jni.h"
 #include "gstamcsurfacetexture-jni.h"
 #include "gstamcsurface.h"
@@ -90,7 +91,7 @@
 } java_nio_buffer;
 
 gboolean
-gst_amc_codec_static_init (void)
+gst_amc_codec_jni_static_init (void)
 {
   gboolean ret = TRUE;
   JNIEnv *env;
@@ -412,8 +413,8 @@
   return FALSE;
 }
 
-void
-gst_amc_buffer_free (GstAmcBuffer * buffer_)
+static void
+gst_amc_buffer_jni_free (GstAmcBuffer * buffer_)
 {
   RealBuffer *buffer = (RealBuffer *) buffer_;
   JNIEnv *env;
@@ -469,9 +470,9 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_buffer_set_position_and_limit (GstAmcBuffer * buffer_, GError ** err,
-    gint position, gint limit)
+static gboolean
+gst_amc_buffer_jni_set_position_and_limit (GstAmcBuffer * buffer_,
+    GError ** err, gint position, gint limit)
 {
   RealBuffer *buffer = (RealBuffer *) buffer_;
   JNIEnv *env;
@@ -497,8 +498,8 @@
   return TRUE;
 }
 
-GstAmcCodec *
-gst_amc_codec_new (const gchar * name, gboolean is_encoder, GError ** err)
+static GstAmcCodec *
+gst_amc_codec_jni_new (const gchar * name, gboolean is_encoder, GError ** err)
 {
   JNIEnv *env;
   GstAmcCodec *codec = NULL;
@@ -544,8 +545,8 @@
   goto done;
 }
 
-void
-gst_amc_codec_free (GstAmcCodec * codec)
+static void
+gst_amc_codec_jni_free (GstAmcCodec * codec)
 {
   JNIEnv *env;
 
@@ -571,8 +572,8 @@
   g_slice_free (GstAmcCodec, codec);
 }
 
-gboolean
-gst_amc_codec_configure (GstAmcCodec * codec, GstAmcFormat * format,
+static gboolean
+gst_amc_codec_jni_configure (GstAmcCodec * codec, GstAmcFormat * format,
     GstAmcSurfaceTexture * surface, GError ** err)
 {
   JNIEnv *env;
@@ -601,8 +602,8 @@
       codec->surface ? codec->surface->jobject : NULL, NULL, flags);
 }
 
-GstAmcFormat *
-gst_amc_codec_get_output_format (GstAmcCodec * codec, GError ** err)
+static GstAmcFormat *
+gst_amc_codec_jni_get_output_format (GstAmcCodec * codec, GError ** err)
 {
   JNIEnv *env;
   GstAmcFormat *ret = NULL;
@@ -632,8 +633,8 @@
 }
 
 static RealBuffer *
-gst_amc_codec_get_input_buffers (GstAmcCodec * codec, gsize * n_buffers,
-    GError ** err)
+gst_amc_codec_jni_get_input_buffers (GstAmcCodec * codec,
+    gsize * n_buffers, GError ** err)
 {
   JNIEnv *env;
   jobject input_buffers = NULL;
@@ -659,8 +660,8 @@
 }
 
 static RealBuffer *
-gst_amc_codec_get_output_buffers (GstAmcCodec * codec, gsize * n_buffers,
-    GError ** err)
+gst_amc_codec_jni_get_output_buffers (GstAmcCodec * codec,
+    gsize * n_buffers, GError ** err)
 {
   JNIEnv *env;
   jobject output_buffers = NULL;
@@ -685,8 +686,8 @@
   return ret;
 }
 
-gboolean
-gst_amc_codec_start (GstAmcCodec * codec, GError ** err)
+static gboolean
+gst_amc_codec_jni_start (GstAmcCodec * codec, GError ** err)
 {
   JNIEnv *env;
   gboolean ret;
@@ -704,7 +705,8 @@
       gst_amc_jni_free_buffer_array (env, codec->input_buffers,
           codec->n_input_buffers);
     codec->input_buffers =
-        gst_amc_codec_get_input_buffers (codec, &codec->n_input_buffers, err);
+        gst_amc_codec_jni_get_input_buffers (codec, &codec->n_input_buffers,
+        err);
     if (!codec->input_buffers) {
       gst_amc_codec_stop (codec, NULL);
       return FALSE;
@@ -714,8 +716,8 @@
   return ret;
 }
 
-gboolean
-gst_amc_codec_stop (GstAmcCodec * codec, GError ** err)
+static gboolean
+gst_amc_codec_jni_stop (GstAmcCodec * codec, GError ** err)
 {
   JNIEnv *env;
 
@@ -739,8 +741,8 @@
       media_codec.stop);
 }
 
-gboolean
-gst_amc_codec_flush (GstAmcCodec * codec, GError ** err)
+static gboolean
+gst_amc_codec_jni_flush (GstAmcCodec * codec, GError ** err)
 {
   JNIEnv *env;
 
@@ -752,7 +754,7 @@
 }
 
 static gboolean
-gst_amc_codec_set_parameter (GstAmcCodec * codec, JNIEnv * env,
+gst_amc_codec_jni_set_parameter (GstAmcCodec * codec, JNIEnv * env,
     GError ** err, const gchar * key, int value)
 {
   gboolean ret = FALSE;
@@ -785,28 +787,28 @@
   return ret;
 }
 
-gboolean
-gst_amc_codec_request_key_frame (GstAmcCodec * codec, GError ** err)
+static gboolean
+gst_amc_codec_jni_request_key_frame (GstAmcCodec * codec, GError ** err)
 {
   JNIEnv *env;
 
   g_return_val_if_fail (codec != NULL, FALSE);
 
   env = gst_amc_jni_get_env ();
-  return gst_amc_codec_set_parameter (codec, env, err,
+  return gst_amc_codec_jni_set_parameter (codec, env, err,
       PARAMETER_KEY_REQUEST_SYNC_FRAME, 0);
 }
 
-gboolean
-gst_amc_codec_have_dynamic_bitrate ()
+static gboolean
+gst_amc_codec_jni_have_dynamic_bitrate ()
 {
   /* Dynamic bitrate scaling is supported on Android >= 19,
    * where the setParameters() call is available */
   return (media_codec.setParameters != NULL);
 }
 
-gboolean
-gst_amc_codec_set_dynamic_bitrate (GstAmcCodec * codec, GError ** err,
+static gboolean
+gst_amc_codec_jni_set_dynamic_bitrate (GstAmcCodec * codec, GError ** err,
     gint bitrate)
 {
   JNIEnv *env;
@@ -814,12 +816,12 @@
   g_return_val_if_fail (codec != NULL, FALSE);
 
   env = gst_amc_jni_get_env ();
-  return gst_amc_codec_set_parameter (codec, env, err,
+  return gst_amc_codec_jni_set_parameter (codec, env, err,
       PARAMETER_KEY_VIDEO_BITRATE, bitrate);
 }
 
-gboolean
-gst_amc_codec_release (GstAmcCodec * codec, GError ** err)
+static gboolean
+gst_amc_codec_jni_release (GstAmcCodec * codec, GError ** err)
 {
   JNIEnv *env;
 
@@ -843,8 +845,9 @@
       media_codec.release);
 }
 
-GstAmcBuffer *
-gst_amc_codec_get_output_buffer (GstAmcCodec * codec, gint index, GError ** err)
+static GstAmcBuffer *
+gst_amc_codec_jni_get_output_buffer (GstAmcCodec * codec, gint index,
+    GError ** err)
 {
   JNIEnv *env;
   jobject buffer = NULL;
@@ -897,8 +900,9 @@
   return NULL;
 }
 
-GstAmcBuffer *
-gst_amc_codec_get_input_buffer (GstAmcCodec * codec, gint index, GError ** err)
+static GstAmcBuffer *
+gst_amc_codec_jni_get_input_buffer (GstAmcCodec * codec, gint index,
+    GError ** err)
 {
   JNIEnv *env;
   jobject buffer = NULL;
@@ -951,8 +955,8 @@
   return NULL;
 }
 
-gint
-gst_amc_codec_dequeue_input_buffer (GstAmcCodec * codec, gint64 timeoutUs,
+static gint
+gst_amc_codec_jni_dequeue_input_buffer (GstAmcCodec * codec, gint64 timeoutUs,
     GError ** err)
 {
   JNIEnv *env;
@@ -969,8 +973,8 @@
 }
 
 static gboolean
-gst_amc_codec_fill_buffer_info (JNIEnv * env, jobject buffer_info,
-    GstAmcBufferInfo * info, GError ** err)
+gst_amc_codec_jni_fill_buffer_info (JNIEnv * env,
+    jobject buffer_info, GstAmcBufferInfo * info, GError ** err)
 {
   g_return_val_if_fail (buffer_info != NULL, FALSE);
 
@@ -994,8 +998,8 @@
   return TRUE;
 }
 
-gint
-gst_amc_codec_dequeue_output_buffer (GstAmcCodec * codec,
+static gint
+gst_amc_codec_jni_dequeue_output_buffer (GstAmcCodec * codec,
     GstAmcBufferInfo * info, gint64 timeoutUs, GError ** err)
 {
   JNIEnv *env;
@@ -1026,8 +1030,8 @@
         gst_amc_jni_free_buffer_array (env, codec->output_buffers,
             codec->n_output_buffers);
       codec->output_buffers =
-          gst_amc_codec_get_output_buffers (codec,
-          &codec->n_output_buffers, err);
+          gst_amc_codec_jni_get_output_buffers (codec, &codec->n_output_buffers,
+          err);
       if (!codec->output_buffers) {
         ret = G_MININT;
         goto done;
@@ -1041,7 +1045,7 @@
     goto done;
   }
 
-  if (ret >= 0 && !gst_amc_codec_fill_buffer_info (env, info_o, info, err)) {
+  if (ret >= 0 && !gst_amc_codec_jni_fill_buffer_info (env, info_o, info, err)) {
     ret = G_MININT;
     goto done;
   }
@@ -1054,8 +1058,8 @@
   return ret;
 }
 
-gboolean
-gst_amc_codec_queue_input_buffer (GstAmcCodec * codec, gint index,
+static gboolean
+gst_amc_codec_jni_queue_input_buffer (GstAmcCodec * codec, gint index,
     const GstAmcBufferInfo * info, GError ** err)
 {
   JNIEnv *env;
@@ -1069,8 +1073,8 @@
       info->presentation_time_us, info->flags);
 }
 
-gboolean
-gst_amc_codec_release_output_buffer (GstAmcCodec * codec, gint index,
+static gboolean
+gst_amc_codec_jni_release_output_buffer (GstAmcCodec * codec, gint index,
     gboolean render, GError ** err)
 {
   JNIEnv *env;
@@ -1082,8 +1086,40 @@
       media_codec.release_output_buffer, index, render);
 }
 
-GstAmcSurfaceTexture *
-gst_amc_codec_new_surface_texture (GError ** err)
+static GstAmcSurfaceTexture *
+gst_amc_codec_jni_new_surface_texture (GError ** err)
 {
   return (GstAmcSurfaceTexture *) gst_amc_surface_texture_jni_new (err);
 }
+
+GstAmcCodecVTable gst_amc_codec_jni_vtable = {
+  .buffer_free = gst_amc_buffer_jni_free,
+  .buffer_set_position_and_limit = gst_amc_buffer_jni_set_position_and_limit,
+
+  .create = gst_amc_codec_jni_new,
+  .free = gst_amc_codec_jni_free,
+
+  .configure = gst_amc_codec_jni_configure,
+  .get_output_format = gst_amc_codec_jni_get_output_format,
+
+  .start = gst_amc_codec_jni_start,
+  .stop = gst_amc_codec_jni_stop,
+  .flush = gst_amc_codec_jni_flush,
+  .request_key_frame = gst_amc_codec_jni_request_key_frame,
+
+  .have_dynamic_bitrate = gst_amc_codec_jni_have_dynamic_bitrate,
+  .set_dynamic_bitrate = gst_amc_codec_jni_set_dynamic_bitrate,
+
+  .release = gst_amc_codec_jni_release,
+
+  .get_output_buffer = gst_amc_codec_jni_get_output_buffer,
+  .get_input_buffer = gst_amc_codec_jni_get_input_buffer,
+
+  .dequeue_input_buffer = gst_amc_codec_jni_dequeue_input_buffer,
+  .dequeue_output_buffer = gst_amc_codec_jni_dequeue_output_buffer,
+
+  .queue_input_buffer = gst_amc_codec_jni_queue_input_buffer,
+  .release_output_buffer = gst_amc_codec_jni_release_output_buffer,
+
+  .new_surface_texture = gst_amc_codec_jni_new_surface_texture,
+};

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/jni/gstamc-codeclist-jni.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/jni/gstamc-codeclist-jni.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/jni/gstamc-format-jni.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/jni/gstamc-format-jni.c Changed

@@ -25,6 +25,7 @@
 
 #include "../gstjniutils.h"
 #include "../gstamc-format.h"
+#include "gstamc-jni.h"
 #include "gstamc-internal-jni.h"
 
 static struct
@@ -44,7 +45,7 @@
 } media_format;
 
 gboolean
-gst_amc_format_static_init (void)
+gst_amc_format_jni_static_init (void)
 {
   gboolean ret = TRUE;
   JNIEnv *env;
@@ -130,9 +131,9 @@
   return ret;
 }
 
-GstAmcFormat *
-gst_amc_format_new_audio (const gchar * mime, gint sample_rate, gint channels,
-    GError ** err)
+static GstAmcFormat *
+gst_amc_format_jni_new_audio (const gchar * mime, gint sample_rate,
+    gint channels, GError ** err)
 {
   JNIEnv *env;
   GstAmcFormat *format = NULL;
@@ -167,8 +168,8 @@
   goto done;
 }
 
-GstAmcFormat *
-gst_amc_format_new_video (const gchar * mime, gint width, gint height,
+static GstAmcFormat *
+gst_amc_format_jni_new_video (const gchar * mime, gint width, gint height,
     GError ** err)
 {
   JNIEnv *env;
@@ -204,8 +205,8 @@
   goto done;
 }
 
-void
-gst_amc_format_free (GstAmcFormat * format)
+static void
+gst_amc_format_jni_free (GstAmcFormat * format)
 {
   JNIEnv *env;
 
@@ -216,8 +217,8 @@
   g_slice_free (GstAmcFormat, format);
 }
 
-gchar *
-gst_amc_format_to_string (GstAmcFormat * format, GError ** err)
+static gchar *
+gst_amc_format_jni_to_string (GstAmcFormat * format, GError ** err)
 {
   JNIEnv *env;
   jstring v_str = NULL;
@@ -237,8 +238,8 @@
   return ret;
 }
 
-gboolean
-gst_amc_format_get_float (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_jni_get_float (GstAmcFormat * format, const gchar * key,
     gfloat * value, GError ** err)
 {
   JNIEnv *env;
@@ -268,8 +269,8 @@
   return ret;
 }
 
-gboolean
-gst_amc_format_set_float (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_jni_set_float (GstAmcFormat * format, const gchar * key,
     gfloat value, GError ** err)
 {
   JNIEnv *env;
@@ -298,9 +299,9 @@
   return ret;
 }
 
-gboolean
-gst_amc_format_get_int (GstAmcFormat * format, const gchar * key, gint * value,
-    GError ** err)
+static gboolean
+gst_amc_format_jni_get_int (GstAmcFormat * format, const gchar * key,
+    gint * value, GError ** err)
 {
   JNIEnv *env;
   gboolean ret = FALSE;
@@ -330,9 +331,9 @@
 
 }
 
-gboolean
-gst_amc_format_set_int (GstAmcFormat * format, const gchar * key, gint value,
-    GError ** err)
+static gboolean
+gst_amc_format_jni_set_int (GstAmcFormat * format, const gchar * key,
+    gint value, GError ** err)
 {
   JNIEnv *env;
   jstring key_str = NULL;
@@ -360,8 +361,8 @@
   return ret;
 }
 
-gboolean
-gst_amc_format_get_string (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_jni_get_string (GstAmcFormat * format, const gchar * key,
     gchar ** value, GError ** err)
 {
   JNIEnv *env;
@@ -395,8 +396,8 @@
   return ret;
 }
 
-gboolean
-gst_amc_format_set_string (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_jni_set_string (GstAmcFormat * format, const gchar * key,
     const gchar * value, GError ** err)
 {
   JNIEnv *env;
@@ -433,8 +434,8 @@
   return ret;
 }
 
-gboolean
-gst_amc_format_get_buffer (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_jni_get_buffer (GstAmcFormat * format, const gchar * key,
     guint8 ** data, gsize * size, GError ** err)
 {
   JNIEnv *env;
@@ -488,8 +489,8 @@
   return ret;
 }
 
-gboolean
-gst_amc_format_set_buffer (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_jni_set_buffer (GstAmcFormat * format, const gchar * key,
     guint8 * data, gsize size, GError ** err)
 {
   JNIEnv *env;
@@ -536,3 +537,20 @@
 
   return ret;
 }
+
+GstAmcFormatVTable gst_amc_format_jni_vtable = {
+  .new_audio = gst_amc_format_jni_new_audio,
+  .new_video = gst_amc_format_jni_new_video,
+  .free = gst_amc_format_jni_free,
+
+  .to_string = gst_amc_format_jni_to_string,
+
+  .get_float = gst_amc_format_jni_get_float,
+  .set_float = gst_amc_format_jni_set_float,
+  .get_int = gst_amc_format_jni_get_int,
+  .set_int = gst_amc_format_jni_set_int,
+  .get_string = gst_amc_format_jni_get_string,
+  .set_string = gst_amc_format_jni_set_string,
+  .get_buffer = gst_amc_format_jni_get_buffer,
+  .set_buffer = gst_amc_format_jni_set_buffer,
+};

gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/jni/gstamc-jni.c Added

@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2023, Ratchanan Srirattanamet <peathot@hotmail.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
+ * version 2.1 of the License.
+ *
+ * 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 <android/api-level.h>
+
+#include "../gstamc.h"
+#include "gstamc-jni.h"
+
+#define GST_CAT_DEFAULT gst_amc_debug
+
+#ifdef HAVE_NDKMEDIA
+
+#include "../ndk/gstamc-ndk.h"
+
+static gboolean
+should_prefer_ndk ()
+{
+  int device_api_level = android_get_device_api_level ();
+  const gchar *impl_env = g_getenv ("GST_AMC_PREFERED_IMPL");
+
+  if (device_api_level < 21) {
+    /* NDK media APIs are added in API level 21 (Android 5). Don't bother
+     * trying. It'll fail anyway. */
+    return FALSE;
+  }
+
+  if (impl_env) {
+    if (g_str_equal (impl_env, "ndk"))
+      return TRUE;
+    else if (g_str_equal (impl_env, "jni"))
+      return FALSE;
+    else
+      GST_WARNING ("Unknown value '%s' for GST_AMC_PREFERED_IMPL, ignored.",
+          impl_env);
+  }
+
+  /* NDK's AMediaCodec_setParameters() is available since API level 26, while
+   * Java's MediaCodec.setParameters() is available since API level 19. Prefers
+   * JNI version for 21 <= API level < 26 to avoid feature regression.
+   */
+  return (device_api_level >= 26);
+}
+#endif /* HAVE_NDKMEDIA */
+
+gboolean
+gst_amc_static_init (void)
+{
+  if (!gst_amc_codeclist_jni_static_init ())
+    return FALSE;
+
+  if (!gst_amc_surface_texture_jni_static_init ())
+    return FALSE;
+
+#ifdef HAVE_NDKMEDIA
+
+  if (!should_prefer_ndk ())
+    goto init_jni;
+
+  if (!gst_amc_codec_ndk_static_init ())
+    goto init_jni;
+
+  if (!gst_amc_format_ndk_static_init ())
+    goto init_jni;
+
+  GST_INFO ("Use NDK implementation for GstAmc.");
+
+  gst_amc_format_vtable = &gst_amc_format_ndk_vtable;
+  gst_amc_codec_vtable = &gst_amc_codec_ndk_vtable;
+
+  return TRUE;
+
+#endif /* HAVE_NDKMEDIA */
+
+init_jni:
+  if (!gst_amc_codec_jni_static_init ())
+    return FALSE;
+
+  if (!gst_amc_format_jni_static_init ())
+    return FALSE;
+
+  GST_INFO ("Use JNI implementation for GstAmc.");
+
+  gst_amc_format_vtable = &gst_amc_format_jni_vtable;
+  gst_amc_codec_vtable = &gst_amc_codec_jni_vtable;
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/jni/gstamc-jni.h Added

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2023, Ratchanan Srirattanamet <peathot@hotmail.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
+ * version 2.1 of the License.
+ *
+ * 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 <glib.h>
+
+#include "../gstamc-format.h"
+#include "../gstamc-codec.h"
+
+extern GstAmcFormatVTable gst_amc_format_jni_vtable;
+extern GstAmcCodecVTable gst_amc_codec_jni_vtable;
+
+gboolean gst_amc_codeclist_jni_static_init (void);
+gboolean gst_amc_format_jni_static_init (void);
+gboolean gst_amc_codec_jni_static_init (void);
+gboolean gst_amc_surface_texture_jni_static_init (void);

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/jni/gstamcsurfacetexture-jni.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/jni/gstamcsurfacetexture-jni.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/magicleap/gstamc-codec-ml.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/magicleap/gstamc-codec-ml.c Changed

@@ -35,20 +35,14 @@
   GstAmcSurfaceTexture *surface_texture;
 };
 
-gboolean
-gst_amc_codec_static_init (void)
-{
-  return TRUE;
-}
-
-void
-gst_amc_buffer_free (GstAmcBuffer * buffer)
+static void
+gst_amc_buffer_ml_free (GstAmcBuffer * buffer)
 {
   g_free (buffer);
 }
 
-gboolean
-gst_amc_buffer_set_position_and_limit (GstAmcBuffer * buffer, GError ** err,
+static gboolean
+gst_amc_buffer_ml_set_position_and_limit (GstAmcBuffer * buffer, GError ** err,
     gint position, gint limit)
 {
 /* FIXME: Do we need to do something?
@@ -58,8 +52,8 @@
   return TRUE;
 }
 
-GstAmcCodec *
-gst_amc_codec_new (const gchar * name, gboolean is_encoder, GError ** err)
+static GstAmcCodec *
+gst_amc_codec_ml_new (const gchar * name, gboolean is_encoder, GError ** err)
 {
   GstAmcCodec *codec = NULL;
   MLResult result;
@@ -83,8 +77,8 @@
   return codec;
 }
 
-void
-gst_amc_codec_free (GstAmcCodec * codec)
+static void
+gst_amc_codec_ml_free (GstAmcCodec * codec)
 {
   g_return_if_fail (codec != NULL);
 
@@ -94,8 +88,8 @@
   g_slice_free (GstAmcCodec, codec);
 }
 
-gboolean
-gst_amc_codec_configure (GstAmcCodec * codec, GstAmcFormat * format,
+static gboolean
+gst_amc_codec_ml_configure (GstAmcCodec * codec, GstAmcFormat * format,
     GstAmcSurfaceTexture * surface_texture, GError ** err)
 {
   MLResult result;
@@ -113,7 +107,7 @@
         surface_texture);
 
   result = MLMediaCodecConfigureWithSurface (codec->handle,
-      gst_amc_format_get_handle (format), surface_handle, 0);
+      gst_amc_format_ml_get_handle (format), surface_handle, 0);
   if (result != MLResult_Ok) {
     g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
         "Failed to configure codec %d", result);
@@ -123,8 +117,8 @@
   return TRUE;
 }
 
-GstAmcFormat *
-gst_amc_codec_get_output_format (GstAmcCodec * codec, GError ** err)
+static GstAmcFormat *
+gst_amc_codec_ml_get_output_format (GstAmcCodec * codec, GError ** err)
 {
   MLHandle format_handle;
   MLResult result;
@@ -138,11 +132,11 @@
     return NULL;
   }
 
-  return gst_amc_format_new_handle (format_handle);
+  return gst_amc_format_ml_new_handle (format_handle);
 }
 
-gboolean
-gst_amc_codec_start (GstAmcCodec * codec, GError ** err)
+static gboolean
+gst_amc_codec_ml_start (GstAmcCodec * codec, GError ** err)
 {
   MLResult result;
 
@@ -158,8 +152,8 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_codec_stop (GstAmcCodec * codec, GError ** err)
+static gboolean
+gst_amc_codec_ml_stop (GstAmcCodec * codec, GError ** err)
 {
   MLResult result;
 
@@ -175,8 +169,8 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_codec_flush (GstAmcCodec * codec, GError ** err)
+static gboolean
+gst_amc_codec_ml_flush (GstAmcCodec * codec, GError ** err)
 {
   MLResult result;
 
@@ -192,8 +186,8 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_codec_request_key_frame (GstAmcCodec * codec, GError ** err)
+static gboolean
+gst_amc_codec_ml_request_key_frame (GstAmcCodec * codec, GError ** err)
 {
   /* If MagicLeap adds an API for requesting a keyframe, call it here */
   g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
@@ -201,8 +195,8 @@
   return FALSE;
 }
 
-gboolean
-gst_amc_codec_set_dynamic_bitrate (GstAmcCodec * codec, GError ** err,
+static gboolean
+gst_amc_codec_ml_set_dynamic_bitrate (GstAmcCodec * codec, GError ** err,
     gint bitrate)
 {
   g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
@@ -210,22 +204,23 @@
   return FALSE;
 }
 
-gboolean
-gst_amc_codec_have_dynamic_bitrate ()
+static gboolean
+gst_amc_codec_ml_have_dynamic_bitrate ()
 {
   /* If MagicLeap ever provides an API for scaling bitrate, change this to TRUE */
   return FALSE;
 }
 
-gboolean
-gst_amc_codec_release (GstAmcCodec * codec, GError ** err)
+static gboolean
+gst_amc_codec_ml_release (GstAmcCodec * codec, GError ** err)
 {
   g_return_val_if_fail (codec != NULL, FALSE);
   return TRUE;
 }
 
-GstAmcBuffer *
-gst_amc_codec_get_output_buffer (GstAmcCodec * codec, gint index, GError ** err)
+static GstAmcBuffer *
+gst_amc_codec_ml_get_output_buffer (GstAmcCodec * codec, gint index,
+    GError ** err)
 {
   MLResult result;
   GstAmcBuffer *ret;
@@ -255,8 +250,9 @@
   return ret;
 }
 
-GstAmcBuffer *
-gst_amc_codec_get_input_buffer (GstAmcCodec * codec, gint index, GError ** err)
+static GstAmcBuffer *
+gst_amc_codec_ml_get_input_buffer (GstAmcCodec * codec, gint index,
+    GError ** err)
 {
   MLResult result;
   GstAmcBuffer *ret;
@@ -279,8 +275,8 @@
   return ret;
 }
 
-gint
-gst_amc_codec_dequeue_input_buffer (GstAmcCodec * codec, gint64 timeoutUs,
+static gint
+gst_amc_codec_ml_dequeue_input_buffer (GstAmcCodec * codec, gint64 timeoutUs,
     GError ** err)
 {
   MLResult result;
@@ -301,8 +297,8 @@
   return index;
 }
 
-gint
-gst_amc_codec_dequeue_output_buffer (GstAmcCodec * codec,
+static gint
+gst_amc_codec_ml_dequeue_output_buffer (GstAmcCodec * codec,
     GstAmcBufferInfo * info, gint64 timeoutUs, GError ** err)
 {
   MLMediaCodecBufferInfo info_;
@@ -337,8 +333,8 @@
   return index;
 }
 
-gboolean
-gst_amc_codec_queue_input_buffer (GstAmcCodec * codec, gint index,
+static gboolean
+gst_amc_codec_ml_queue_input_buffer (GstAmcCodec * codec, gint index,
     const GstAmcBufferInfo * info, GError ** err)
 {
   MLResult result;
@@ -357,8 +353,8 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_codec_release_output_buffer (GstAmcCodec * codec, gint index,
+static gboolean
+gst_amc_codec_ml_release_output_buffer (GstAmcCodec * codec, gint index,
     gboolean render, GError ** err)
 {
   MLResult result;
@@ -375,8 +371,40 @@
   return TRUE;
 }
 
-GstAmcSurfaceTexture *
-gst_amc_codec_new_surface_texture (GError ** err)
+static GstAmcSurfaceTexture *
+gst_amc_codec_ml_new_surface_texture (GError ** err)
 {
   return (GstAmcSurfaceTexture *) gst_amc_surface_texture_ml_new (err);
 }
+
+GstAmcCodecVTable gst_amc_codec_ml_vtable = {
+  .buffer_free = gst_amc_buffer_ml_free,
+  .buffer_set_position_and_limit = gst_amc_buffer_ml_set_position_and_limit,
+
+  .create = gst_amc_codec_ml_new,
+  .free = gst_amc_codec_ml_free,
+
+  .configure = gst_amc_codec_ml_configure,
+  .get_output_format = gst_amc_codec_ml_get_output_format,
+
+  .start = gst_amc_codec_ml_start,
+  .stop = gst_amc_codec_ml_stop,
+  .flush = gst_amc_codec_ml_flush,
+  .request_key_frame = gst_amc_codec_ml_request_key_frame,
+
+  .have_dynamic_bitrate = gst_amc_codec_ml_have_dynamic_bitrate,
+  .set_dynamic_bitrate = gst_amc_codec_ml_set_dynamic_bitrate,
+
+  .release = gst_amc_codec_ml_release,
+
+  .get_output_buffer = gst_amc_codec_ml_get_output_buffer,
+  .get_input_buffer = gst_amc_codec_ml_get_input_buffer,
+
+  .dequeue_input_buffer = gst_amc_codec_ml_dequeue_input_buffer,
+  .dequeue_output_buffer = gst_amc_codec_ml_dequeue_output_buffer,
+
+  .queue_input_buffer = gst_amc_codec_ml_queue_input_buffer,
+  .release_output_buffer = gst_amc_codec_ml_release_output_buffer,
+
+  .new_surface_texture = gst_amc_codec_ml_new_surface_texture,
+};

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/magicleap/gstamc-codeclist-ml.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/magicleap/gstamc-codeclist-ml.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/magicleap/gstamc-format-ml.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/magicleap/gstamc-format-ml.c Changed

@@ -32,15 +32,9 @@
   MLHandle handle;
 };
 
-gboolean
-gst_amc_format_static_init (void)
-{
-  return TRUE;
-}
-
-GstAmcFormat *
-gst_amc_format_new_audio (const gchar * mime, gint sample_rate, gint channels,
-    GError ** err)
+static GstAmcFormat *
+gst_amc_format_ml_new_audio (const gchar * mime, gint sample_rate,
+    gint channels, GError ** err)
 {
   GstAmcFormat *format = g_slice_new0 (GstAmcFormat);
   MLResult result;
@@ -57,8 +51,8 @@
   return format;
 }
 
-GstAmcFormat *
-gst_amc_format_new_video (const gchar * mime, gint width, gint height,
+static GstAmcFormat *
+gst_amc_format_ml_new_video (const gchar * mime, gint width, gint height,
     GError ** err)
 {
   GstAmcFormat *format = g_slice_new0 (GstAmcFormat);
@@ -76,7 +70,7 @@
 }
 
 GstAmcFormat *
-gst_amc_format_new_handle (MLHandle handle)
+gst_amc_format_ml_new_handle (MLHandle handle)
 {
   GstAmcFormat *format = g_slice_new0 (GstAmcFormat);
   format->handle = handle;
@@ -84,20 +78,20 @@
 }
 
 MLHandle
-gst_amc_format_get_handle (GstAmcFormat * format)
+gst_amc_format_ml_get_handle (GstAmcFormat * format)
 {
   return format->handle;
 }
 
-void
-gst_amc_format_free (GstAmcFormat * format)
+static void
+gst_amc_format_ml_free (GstAmcFormat * format)
 {
   g_return_if_fail (format != NULL);
   g_slice_free (GstAmcFormat, format);
 }
 
-gchar *
-gst_amc_format_to_string (GstAmcFormat * format, GError ** err)
+static gchar *
+gst_amc_format_ml_to_string (GstAmcFormat * format, GError ** err)
 {
   MLResult result;
   gchar *str;
@@ -114,8 +108,8 @@
   return str;
 }
 
-gboolean
-gst_amc_format_get_float (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_ml_get_float (GstAmcFormat * format, const gchar * key,
     gfloat * value, GError ** err)
 {
   MLResult result;
@@ -134,8 +128,8 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_format_set_float (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_ml_set_float (GstAmcFormat * format, const gchar * key,
     gfloat value, GError ** err)
 {
   MLResult result;
@@ -153,9 +147,9 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_format_get_int (GstAmcFormat * format, const gchar * key, gint * value,
-    GError ** err)
+static gboolean
+gst_amc_format_ml_get_int (GstAmcFormat * format, const gchar * key,
+    gint * value, GError ** err)
 {
   MLResult result;
 
@@ -173,8 +167,8 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_format_set_int (GstAmcFormat * format, const gchar * key, gint value,
+static gboolean
+gst_amc_format_ml_set_int (GstAmcFormat * format, const gchar * key, gint value,
     GError ** err)
 {
   MLResult result;
@@ -191,8 +185,8 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_format_get_string (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_ml_get_string (GstAmcFormat * format, const gchar * key,
     gchar ** value, GError ** err)
 {
   MLResult result;
@@ -213,8 +207,8 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_format_set_string (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_ml_set_string (GstAmcFormat * format, const gchar * key,
     const gchar * value, GError ** err)
 {
   MLResult result;
@@ -231,8 +225,8 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_format_get_buffer (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_ml_get_buffer (GstAmcFormat * format, const gchar * key,
     guint8 ** data, gsize * size, GError ** err)
 {
   MLResult result;
@@ -257,8 +251,8 @@
   return TRUE;
 }
 
-gboolean
-gst_amc_format_set_buffer (GstAmcFormat * format, const gchar * key,
+static gboolean
+gst_amc_format_ml_set_buffer (GstAmcFormat * format, const gchar * key,
     guint8 * data, gsize size, GError ** err)
 {
   MLResult result;
@@ -278,3 +272,20 @@
   }
   return TRUE;
 }
+
+GstAmcFormatVTable gst_amc_format_ml_vtable = {
+  .new_audio = gst_amc_format_ml_new_audio,
+  .new_video = gst_amc_format_ml_new_video,
+  .free = gst_amc_format_ml_free,
+
+  .to_string = gst_amc_format_ml_to_string,
+
+  .get_float = gst_amc_format_ml_get_float,
+  .set_float = gst_amc_format_ml_set_float,
+  .get_int = gst_amc_format_ml_get_int,
+  .set_int = gst_amc_format_ml_set_int,
+  .get_string = gst_amc_format_ml_get_string,
+  .set_string = gst_amc_format_ml_set_string,
+  .get_buffer = gst_amc_format_ml_get_buffer,
+  .set_buffer = gst_amc_format_ml_set_buffer,
+};

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/magicleap/gstamc-internal-ml.h -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/magicleap/gstamc-internal-ml.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/magicleap/gstamc-ml.c Added

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2023, Ratchanan Srirattanamet <peathot@hotmail.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
+ * version 2.1 of the License.
+ *
+ * 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 "../gstamc.h"
+#include "gstamc-internal-ml.h"
+
+gboolean
+gst_amc_static_init (void)
+{
+  /*
+   * MagicLeap doesn't require any static initialization. All required
+   * functions are in C and are linked into the plugin directly.
+   */
+
+  gst_amc_codec_vtable = &gst_amc_codec_ml_vtable;
+  gst_amc_format_vtable = &gst_amc_format_ml_vtable;
+
+  return TRUE;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/magicleap/gstamc-surfacetexture-ml.c -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/magicleap/gstamc-surfacetexture-ml.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/androidmedia/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/meson.build Changed

@@ -1,6 +1,8 @@
 androidmedia_sources = 
   'gstamcaudiodec.c',
   'gstamc.c',
+  'gstamc-codec.c',
+  'gstamc-format.c',
   'gstamcsurfacetexture.c',
   'gstamcvideodec.c',
   'gstamcvideoenc.c',
@@ -39,6 +41,7 @@
 extra_cargs = 
 if have_mlsdk
   androidmedia_sources += 
+    'magicleap/gstamc-ml.c',
     'magicleap/gstamc-codec-ml.c',
     'magicleap/gstamc-codeclist-ml.c',
     'magicleap/gstamc-format-ml.c',
@@ -65,12 +68,26 @@
     'gst-android-hardware-camera.c',
     'gst-android-hardware-sensor.c',
     'gstjniutils.c',
+    'jni/gstamc-jni.c',
     'jni/gstamc-codec-jni.c',
     'jni/gstamc-codeclist-jni.c',
     'jni/gstamc-format-jni.c',
     'jni/gstamcsurface.c',
     'jni/gstamcsurfacetexture-jni.c',
   
+
+  # Build an Ndk support if its headers exists. We don't actually link into it
+  # but use only type definations (and then rely on dlopen and dlsym), so this
+  # doesn't affect compatibility with older Android versions.
+  if cc.check_header('media/NdkMediaCodec.h')
+    androidmedia_sources += 
+      'ndk/gstamc-codec-ndk.c',
+      'ndk/gstamc-format-ndk.c',
+    
+    extra_cargs +=  '-DHAVE_NDKMEDIA' 
+    extra_deps +=  cc.find_library('android', required : true) 
+  endif
+
   plugin_name = 'gstandroidmedia'
 endif

gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/ndk Added

gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/ndk/gstamc-codec-ndk.c Added

@@ -0,0 +1,584 @@
+/*
+ * Copyright (C) 2012,2018 Collabora Ltd.
+ *   Author: Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * Copyright (C) 2015, Sebastian Dröge <sebastian@centricular.com>
+ * Copyright (C) 2023, Ratchanan Srirattanamet <peathot@hotmail.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
+ * version 2.1 of the License.
+ *
+ * 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
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstamc-ndk.h"
+#include "gstamc-internal-ndk.h"
+#include "../gstamc-codec.h"
+#include "../gstamc-constants.h"
+
+#include "gstjniutils.h"
+#include "../jni/gstamcsurface.h"
+
+#include <android/native_window.h>
+#include <android/native_window_jni.h>
+#include <media/NdkMediaError.h>
+#include <media/NdkMediaCodec.h>
+
+#include <dlfcn.h>
+
+struct _GstAmcCodec
+{
+  AMediaCodec *ndk_media_codec;
+  gboolean is_encoder;
+
+  /* For JNI-based SurfaceTexture. */
+  GstAmcSurface *surface;
+};
+
+/* The defines are from NdkMediaCodec.h. See the reasoning in the same file. */
+#if defined(__USE_FILE_OFFSET64) && !defined(__LP64__)
+#define _off_t_compat int32_t
+#else
+#define _off_t_compat off_t
+#endif /* defined(__USE_FILE_OFFSET64) && !defined(__LP64__) */
+
+static struct
+{
+  void *mediandk_handle;
+
+  AMediaCodec *(*create_codec_by_name) (const char *name);
+    media_status_t (*delete) (AMediaCodec *);
+
+    media_status_t (*configure) (AMediaCodec *,
+      const AMediaFormat * format,
+      ANativeWindow * surface, AMediaCrypto * crypto, uint32_t flags);
+
+    media_status_t (*start) (AMediaCodec *);
+    media_status_t (*stop) (AMediaCodec *);
+    media_status_t (*flush) (AMediaCodec *);
+
+  uint8_t *(*get_input_buffer) (AMediaCodec *, size_t idx, size_t *out_size);
+  uint8_t *(*get_output_buffer) (AMediaCodec *, size_t idx, size_t *out_size);
+    ssize_t (*dequeue_input_buffer) (AMediaCodec *, int64_t timeoutUs);
+
+    media_status_t (*queue_input_buffer) (AMediaCodec *,
+      size_t idx,
+      _off_t_compat offset, size_t size, uint64_t time, uint32_t flags);
+
+    ssize_t (*dequeue_output_buffer) (AMediaCodec *,
+      AMediaCodecBufferInfo * info, int64_t timeoutUs);
+
+  AMediaFormat *(*get_output_format) (AMediaCodec *);
+
+    media_status_t (*release_output_buffer) (AMediaCodec *,
+      size_t idx, bool render);
+
+  /* optional */
+    media_status_t (*set_parameters) (AMediaCodec * mData,
+      const AMediaFormat * params);
+} a_media_codec;
+
+#undef _off_t_compat
+
+gboolean
+gst_amc_codec_ndk_static_init (void)
+{
+  a_media_codec.mediandk_handle = dlopen ("libmediandk.so", RTLD_NOW);
+
+  if (!a_media_codec.mediandk_handle)
+    return FALSE;
+
+  a_media_codec.create_codec_by_name =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_createCodecByName");
+  a_media_codec.delete =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_delete");
+  a_media_codec.configure =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_configure");
+  a_media_codec.start =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_start");
+  a_media_codec.stop =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_stop");
+  a_media_codec.flush =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_flush");
+  a_media_codec.get_input_buffer =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_getInputBuffer");
+  a_media_codec.get_output_buffer =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_getOutputBuffer");
+  a_media_codec.dequeue_input_buffer =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_dequeueInputBuffer");
+  a_media_codec.queue_input_buffer =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_queueInputBuffer");
+  a_media_codec.dequeue_output_buffer =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_dequeueOutputBuffer");
+  a_media_codec.get_output_format =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_getOutputFormat");
+  a_media_codec.release_output_buffer =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_releaseOutputBuffer");
+
+  if (!a_media_codec.create_codec_by_name || !a_media_codec.delete
+      || !a_media_codec.configure || !a_media_codec.start || !a_media_codec.stop
+      || !a_media_codec.flush || !a_media_codec.get_input_buffer
+      || !a_media_codec.get_output_buffer || !a_media_codec.dequeue_input_buffer
+      || !a_media_codec.queue_input_buffer
+      || !a_media_codec.dequeue_output_buffer
+      || !a_media_codec.get_output_format
+      || !a_media_codec.release_output_buffer) {
+    GST_WARNING ("Failed to get AMediaCodec functions");
+    dlclose (a_media_codec.mediandk_handle);
+    return FALSE;
+  }
+
+  /* Optional. */
+  a_media_codec.set_parameters =
+      dlsym (a_media_codec.mediandk_handle, "AMediaCodec_setParameters");
+
+  return TRUE;
+}
+
+static void
+gst_amc_buffer_ndk_free (GstAmcBuffer * buffer)
+{
+  g_free (buffer);
+}
+
+static gboolean
+gst_amc_buffer_ndk_set_position_and_limit (GstAmcBuffer * buffer_,
+    GError ** err, gint position, gint limit)
+{
+/* FIXME: Do we need to do something?
+  buffer->data = buffer->data + position;
+  buffer->size = limit;
+*/
+  return TRUE;
+}
+
+static GstAmcCodec *
+gst_amc_codec_ndk_new (const gchar * name, gboolean is_encoder, GError ** err)
+{
+  GstAmcCodec *codec = NULL;
+
+  g_return_val_if_fail (name != NULL, NULL);
+
+  codec = g_new0 (GstAmcCodec, 1);
+  codec->ndk_media_codec = a_media_codec.create_codec_by_name (name);
+  codec->is_encoder = is_encoder;
+
+  if (!codec->ndk_media_codec) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to create codec by name %s", name);
+    g_free (codec);
+    return NULL;
+  }
+
+  return codec;
+}
+
+static void
+gst_amc_codec_ndk_free (GstAmcCodec * codec)
+{
+  media_status_t result;
+
+  result = a_media_codec.delete (codec->ndk_media_codec);
+
+  if (result != AMEDIA_OK) {
+    GST_WARNING
+        ("Unable to delete an AMediaCodec: %d, a leak might have occured.",
+        result);
+  }
+
+  if (codec->surface)
+    g_object_unref (codec->surface);
+
+  g_free (codec);
+}
+
+static gboolean
+gst_amc_codec_ndk_configure (GstAmcCodec * codec, GstAmcFormat * format,
+    GstAmcSurfaceTexture * surface_texture, GError ** err)
+{
+  gboolean ret;
+  media_status_t result;
+  ANativeWindow *native_window = NULL;
+  uint32_t flags = 0;
+
+  g_return_val_if_fail (codec != NULL, FALSE);
+  g_return_val_if_fail (format != NULL, FALSE);
+  g_return_val_if_fail (surface_texture == NULL
+      || GST_IS_AMC_SURFACE_TEXTURE_JNI (surface_texture), FALSE);
+
+  if (surface_texture) {
+    if (codec->surface)
+      g_object_unref (codec->surface);
+
+    if (GST_IS_AMC_SURFACE_TEXTURE_JNI (surface_texture)) {
+      JNIEnv *env;
+
+      codec->surface = gst_amc_surface_new (
+          (GstAmcSurfaceTextureJNI *) surface_texture, err);
+      if (!codec->surface)
+        return FALSE;
+
+      env = gst_amc_jni_get_env ();
+      native_window = ANativeWindow_fromSurface (env, codec->surface->jobject);
+
+      if (!native_window)
+        return FALSE;
+      /* TODO: support NDK-based ASurfaceTexture. */
+    } else {
+      g_assert_not_reached ();
+    }
+  }
+
+  if (codec->is_encoder)
+    flags = AMEDIACODEC_CONFIGURE_FLAG_ENCODE;
+
+  result = a_media_codec.configure (codec->ndk_media_codec,
+      format->ndk_media_format, native_window, NULL, flags);
+
+  if (result != AMEDIA_OK) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to configure codec: %d", result);
+    ret = FALSE;
+    goto out;
+  }
+
+  ret = TRUE;
+
+out:
+  if (native_window)
+    ANativeWindow_release (native_window);
+
+  return ret;
+}
+
+static GstAmcFormat *
+gst_amc_codec_ndk_get_output_format (GstAmcCodec * codec, GError ** err)
+{
+  AMediaFormat *ndk_media_format;
+
+  g_return_val_if_fail (codec != NULL, NULL);
+
+  ndk_media_format = a_media_codec.get_output_format (codec->ndk_media_codec);
+  if (!ndk_media_format) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to get output format");
+    return NULL;
+  }
+
+  return gst_amc_format_ndk_from_a_media_format (ndk_media_format);
+}
+
+static gboolean
+gst_amc_codec_ndk_start (GstAmcCodec * codec, GError ** err)
+{
+  media_status_t result;
+
+  g_return_val_if_fail (codec != NULL, FALSE);
+
+  result = a_media_codec.start (codec->ndk_media_codec);
+
+  if (result != AMEDIA_OK) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to start codec: %d", result);
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_amc_codec_ndk_stop (GstAmcCodec * codec, GError ** err)
+{
+  media_status_t result;
+
+  g_return_val_if_fail (codec != NULL, FALSE);
+
+  result = a_media_codec.stop (codec->ndk_media_codec);
+
+  if (result != AMEDIA_OK) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to stop codec: %d", result);
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_amc_codec_ndk_flush (GstAmcCodec * codec, GError ** err)
+{
+  media_status_t result;
+
+  g_return_val_if_fail (codec != NULL, FALSE);
+
+  result = a_media_codec.flush (codec->ndk_media_codec);
+
+  if (result != AMEDIA_OK) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to flush codec: %d", result);
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_amc_codec_ndk_set_parameter (GstAmcCodec * codec, GError ** err,
+    const gchar * key, int value)
+{
+  GstAmcFormat *format;
+  media_status_t result;
+  gboolean ret = TRUE;
+
+  if (!a_media_codec.set_parameters) {
+    /* Not available means we're on Android < 26
+     * Note: this is a degradation in feature compared to JNI counterpart. */
+    return FALSE;
+  }
+
+  format = gst_amc_format_ndk_new (err);
+  if (!format)
+    return FALSE;
+
+  if (!gst_amc_format_set_int (format, key, value, err)) {
+    ret = FALSE;
+    goto done;
+  }
+
+  result =
+      a_media_codec.set_parameters (codec->ndk_media_codec,
+      format->ndk_media_format);
+
+  if (result != AMEDIA_OK) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to set a parameter: %d", result);
+    ret = FALSE;
+  }
+
+done:
+  gst_amc_format_free (format);
+
+  return ret;
+}
+
+#define PARAMETER_KEY_REQUEST_SYNC_FRAME "request-sync"
+
+static gboolean
+gst_amc_codec_ndk_request_key_frame (GstAmcCodec * codec, GError ** err)
+{
+  g_return_val_if_fail (codec != NULL, FALSE);
+
+  return gst_amc_codec_ndk_set_parameter (codec, err,
+      PARAMETER_KEY_REQUEST_SYNC_FRAME, 0);
+}
+
+static gboolean
+gst_amc_codec_ndk_have_dynamic_bitrate ()
+{
+  /* Dynamic bitrate scaling is supported on Android >= 26,
+   * where the setParameters() call is available
+   * Note: this is a degradation in feature compared to JNI counterpart. */
+  return (a_media_codec.set_parameters != NULL);
+}
+
+#define PARAMETER_KEY_VIDEO_BITRATE "video-bitrate"
+
+static gboolean
+gst_amc_codec_ndk_set_dynamic_bitrate (GstAmcCodec * codec, GError ** err,
+    gint bitrate)
+{
+  g_return_val_if_fail (codec != NULL, FALSE);
+
+  return gst_amc_codec_ndk_set_parameter (codec, err,
+      PARAMETER_KEY_VIDEO_BITRATE, bitrate);
+}
+
+static gboolean
+gst_amc_codec_ndk_release (GstAmcCodec * codec, GError ** err)
+{
+  g_return_val_if_fail (codec != NULL, FALSE);
+
+  /* Do nothing. AMediaCodec_delete() already covers this. */
+  return TRUE;
+}
+
+static GstAmcBuffer *
+gst_amc_codec_ndk_get_output_buffer (GstAmcCodec * codec, gint index,
+    GError ** err)
+{
+  GstAmcBuffer *ret;
+
+  g_return_val_if_fail (codec != NULL, NULL);
+
+  ret = g_new0 (GstAmcBuffer, 1);
+  ret->data = a_media_codec.get_output_buffer (codec->ndk_media_codec,
+      index, &ret->size);
+
+  if (!ret->data) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to get output buffer for idx %d.", index);
+    g_free (ret);
+    return NULL;
+  }
+
+  return ret;
+}
+
+static GstAmcBuffer *
+gst_amc_codec_ndk_get_input_buffer (GstAmcCodec * codec, gint index,
+    GError ** err)
+{
+  GstAmcBuffer *ret;
+
+  g_return_val_if_fail (codec != NULL, NULL);
+
+  ret = g_new0 (GstAmcBuffer, 1);
+  ret->data = a_media_codec.get_input_buffer (codec->ndk_media_codec,
+      index, &ret->size);
+
+  if (!ret->data) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to get input buffer for idx %d.", index);
+    g_free (ret);
+    return NULL;
+  }
+
+  return ret;
+}
+
+static gint
+gst_amc_codec_ndk_dequeue_input_buffer (GstAmcCodec * codec, gint64 timeoutUs,
+    GError ** err)
+{
+  gint ret;
+
+  g_return_val_if_fail (codec != NULL, G_MININT);
+
+  ret = a_media_codec.dequeue_input_buffer (codec->ndk_media_codec, timeoutUs);
+
+  /* AMediaCodec's error code is the same as Java's MediaCodec, thus no
+   * translation is required. */
+
+  return ret;
+}
+
+static gint
+gst_amc_codec_ndk_dequeue_output_buffer (GstAmcCodec * codec,
+    GstAmcBufferInfo * info, gint64 timeoutUs, GError ** err)
+{
+  gint ret;
+  AMediaCodecBufferInfo a_info;
+
+  g_return_val_if_fail (codec != NULL, G_MININT);
+
+  ret = a_media_codec.dequeue_output_buffer (codec->ndk_media_codec,
+      &a_info, timeoutUs);
+
+  if (ret == AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED) {
+    return gst_amc_codec_ndk_dequeue_output_buffer (codec, info, timeoutUs,
+        err);
+  } else if (ret < 0) {
+    /* AMediaCodec's error code is the same as Java's MediaCodec, thus no
+     * translation is required. */
+    return ret;
+  }
+
+  info->flags = a_info.flags;
+  info->offset = a_info.offset;
+  info->presentation_time_us = a_info.presentationTimeUs;
+  info->size = a_info.size;
+
+  return ret;
+}
+
+static gboolean
+gst_amc_codec_ndk_queue_input_buffer (GstAmcCodec * codec, gint index,
+    const GstAmcBufferInfo * info, GError ** err)
+{
+  media_status_t result;
+
+  g_return_val_if_fail (codec != NULL, FALSE);
+
+  result = a_media_codec.queue_input_buffer (codec->ndk_media_codec,
+      index, info->offset, info->size, info->presentation_time_us, info->flags);
+
+  if (result != AMEDIA_OK) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to queue input buffer: %d", result);
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_amc_codec_ndk_release_output_buffer (GstAmcCodec * codec, gint index,
+    gboolean render, GError ** err)
+{
+  media_status_t result;
+
+  g_return_val_if_fail (codec != NULL, FALSE);
+
+  result = a_media_codec.release_output_buffer (codec->ndk_media_codec,
+      index, render);
+
+  if (result != AMEDIA_OK) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to release input buffer: %d", result);
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static GstAmcSurfaceTexture *
+gst_amc_codec_ndk_new_surface_texture (GError ** err)
+{
+  /* TODO: support NDK-based ASurfaceTexture. */
+  return (GstAmcSurfaceTexture *) gst_amc_surface_texture_jni_new (err);
+}
+
+GstAmcCodecVTable gst_amc_codec_ndk_vtable = {
+  .buffer_free = gst_amc_buffer_ndk_free,
+  .buffer_set_position_and_limit = gst_amc_buffer_ndk_set_position_and_limit,
+
+  .create = gst_amc_codec_ndk_new,
+  .free = gst_amc_codec_ndk_free,
+
+  .configure = gst_amc_codec_ndk_configure,
+  .get_output_format = gst_amc_codec_ndk_get_output_format,
+
+  .start = gst_amc_codec_ndk_start,
+  .stop = gst_amc_codec_ndk_stop,
+  .flush = gst_amc_codec_ndk_flush,
+  .request_key_frame = gst_amc_codec_ndk_request_key_frame,
+
+  .have_dynamic_bitrate = gst_amc_codec_ndk_have_dynamic_bitrate,
+  .set_dynamic_bitrate = gst_amc_codec_ndk_set_dynamic_bitrate,
+
+  .release = gst_amc_codec_ndk_release,
+
+  .get_output_buffer = gst_amc_codec_ndk_get_output_buffer,
+  .get_input_buffer = gst_amc_codec_ndk_get_input_buffer,
+
+  .dequeue_input_buffer = gst_amc_codec_ndk_dequeue_input_buffer,
+  .dequeue_output_buffer = gst_amc_codec_ndk_dequeue_output_buffer,
+
+  .queue_input_buffer = gst_amc_codec_ndk_queue_input_buffer,
+  .release_output_buffer = gst_amc_codec_ndk_release_output_buffer,
+
+  .new_surface_texture = gst_amc_codec_ndk_new_surface_texture,
+};

gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/ndk/gstamc-format-ndk.c Added

@@ -0,0 +1,310 @@
+/*
+ * Copyright (C) 2012,2018 Collabora Ltd.
+ *   Author: Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * Copyright (C) 2015, Sebastian Dröge <sebastian@centricular.com>
+ * Copyright (C) 2023, Ratchanan Srirattanamet <peathot@hotmail.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
+ * version 2.1 of the License.
+ *
+ * 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
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "../gstamc-format.h"
+#include "gstamc-ndk.h"
+#include "gstamc-internal-ndk.h"
+
+#include <media/NdkMediaFormat.h>
+
+#include <dlfcn.h>
+#include <stdbool.h>
+
+static struct
+{
+  void *mediandk_handle;
+
+  AMediaFormat *(*new) ();
+    media_status_t (*delete) (AMediaFormat *);
+
+  const char *(*to_string) (AMediaFormat *);
+
+  bool (*get_int32) (AMediaFormat *, const char *name, int32_t * out);
+  bool (*get_float) (AMediaFormat *, const char *name, float *out);
+  bool (*get_buffer) (AMediaFormat *, const char *name, void **data,
+      size_t *size);
+  bool (*get_string) (AMediaFormat *, const char *name, const char **out);
+
+  void (*set_int32) (AMediaFormat *, const char *name, int32_t value);
+  void (*set_float) (AMediaFormat *, const char *name, float value);
+  void (*set_string) (AMediaFormat *, const char *name, const char *value);
+  void (*set_buffer) (AMediaFormat *, const char *name, const void *data,
+      size_t size);
+} a_media_format;
+
+gboolean
+gst_amc_format_ndk_static_init (void)
+{
+  a_media_format.mediandk_handle = dlopen ("libmediandk.so", RTLD_NOW);
+
+  if (!a_media_format.mediandk_handle)
+    return FALSE;
+
+  a_media_format.new =
+      dlsym (a_media_format.mediandk_handle, "AMediaFormat_new");
+  a_media_format.delete =
+      dlsym (a_media_format.mediandk_handle, "AMediaFormat_delete");
+  a_media_format.to_string =
+      dlsym (a_media_format.mediandk_handle, "AMediaFormat_toString");
+  a_media_format.get_int32 =
+      dlsym (a_media_format.mediandk_handle, "AMediaFormat_getInt32");
+  a_media_format.get_float =
+      dlsym (a_media_format.mediandk_handle, "AMediaFormat_getFloat");
+  a_media_format.get_buffer =
+      dlsym (a_media_format.mediandk_handle, "AMediaFormat_getBuffer");
+  a_media_format.get_string =
+      dlsym (a_media_format.mediandk_handle, "AMediaFormat_getString");
+  a_media_format.set_int32 =
+      dlsym (a_media_format.mediandk_handle, "AMediaFormat_setInt32");
+  a_media_format.set_float =
+      dlsym (a_media_format.mediandk_handle, "AMediaFormat_setFloat");
+  a_media_format.set_string =
+      dlsym (a_media_format.mediandk_handle, "AMediaFormat_setString");
+  a_media_format.set_buffer =
+      dlsym (a_media_format.mediandk_handle, "AMediaFormat_setBuffer");
+
+  if (!a_media_format.new || !a_media_format.delete || !a_media_format.to_string
+      || !a_media_format.get_int32 || !a_media_format.get_float
+      || !a_media_format.get_buffer || !a_media_format.get_string
+      || !a_media_format.set_int32 || !a_media_format.set_float
+      || !a_media_format.set_string || !a_media_format.set_buffer) {
+    GST_WARNING ("Failed to get AMediaFormat functions");
+    dlclose (a_media_format.mediandk_handle);
+    a_media_format.mediandk_handle = NULL;
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+GstAmcFormat *
+gst_amc_format_ndk_new (GError ** err)
+{
+  GstAmcFormat *ret = g_new0 (GstAmcFormat, 1);
+
+  ret->ndk_media_format = a_media_format.new ();
+
+  if (!ret->ndk_media_format) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to allocate AMediaFormat");
+
+    g_free (ret);
+    return NULL;
+  }
+
+  return ret;
+}
+
+#define MEDIAFORMAT_KEY_MIME "mime"
+#define MEDIAFORMAT_SAMPLE_RATE "sample-rate"
+#define MEDIAFORMAT_CHANNEL_COUNT "channel-count"
+
+static GstAmcFormat *
+gst_amc_format_ndk_new_audio (const gchar * mime, gint sample_rate,
+    gint channels, GError ** err)
+{
+  GstAmcFormat *ret = gst_amc_format_ndk_new (err);
+
+  if (!ret)
+    return ret;
+
+  a_media_format.set_string (ret->ndk_media_format, MEDIAFORMAT_KEY_MIME, mime);
+  a_media_format.set_int32 (ret->ndk_media_format, MEDIAFORMAT_SAMPLE_RATE,
+      sample_rate);
+  a_media_format.set_int32 (ret->ndk_media_format, MEDIAFORMAT_CHANNEL_COUNT,
+      channels);
+
+  return ret;
+}
+
+#define MEDIAFORMAT_KEY_WIDTH "width"
+#define MEDIAFORMAT_KEY_HEIGHT "height"
+
+static GstAmcFormat *
+gst_amc_format_ndk_new_video (const gchar * mime, gint width, gint height,
+    GError ** err)
+{
+  GstAmcFormat *ret = gst_amc_format_ndk_new (err);
+
+  if (!ret)
+    return ret;
+
+  a_media_format.set_string (ret->ndk_media_format, MEDIAFORMAT_KEY_MIME, mime);
+  a_media_format.set_int32 (ret->ndk_media_format, MEDIAFORMAT_KEY_WIDTH,
+      width);
+  a_media_format.set_int32 (ret->ndk_media_format, MEDIAFORMAT_KEY_HEIGHT,
+      height);
+
+  return ret;
+}
+
+GstAmcFormat *
+gst_amc_format_ndk_from_a_media_format (AMediaFormat * ndk_media_format)
+{
+  GstAmcFormat *ret = g_new0 (GstAmcFormat, 1);
+  ret->ndk_media_format = ndk_media_format;
+  return ret;
+}
+
+static void
+gst_amc_format_ndk_free (GstAmcFormat * format)
+{
+  a_media_format.delete (format->ndk_media_format);
+  g_free (format);
+}
+
+static gchar *
+gst_amc_format_ndk_to_string (GstAmcFormat * format, GError ** err)
+{
+  const char *str = a_media_format.to_string (format->ndk_media_format);
+
+  if (!str) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to call AMediaFormat_toString()");
+    return NULL;
+  }
+
+  return g_strdup (str);
+}
+
+static gboolean
+gst_amc_format_ndk_get_float (GstAmcFormat * format, const gchar * key,
+    gfloat * value, GError ** err)
+{
+  float val;
+
+  if (!a_media_format.get_float (format->ndk_media_format, key, &val)) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to call AMediaFormat_getFloat()");
+
+    return FALSE;
+  }
+
+  *value = val;
+  return TRUE;
+}
+
+static gboolean
+gst_amc_format_ndk_set_float (GstAmcFormat * format, const gchar * key,
+    gfloat value, GError ** err)
+{
+  a_media_format.set_float (format->ndk_media_format, key, value);
+  return TRUE;
+}
+
+static gboolean
+gst_amc_format_ndk_get_int (GstAmcFormat * format, const gchar * key,
+    gint * value, GError ** err)
+{
+  int32_t val;
+
+  if (!a_media_format.get_int32 (format->ndk_media_format, key, &val)) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to call AMediaFormat_getInt32()");
+
+    return FALSE;
+  }
+
+  *value = val;
+  return TRUE;
+}
+
+static gboolean
+gst_amc_format_ndk_set_int (GstAmcFormat * format, const gchar * key,
+    gint value, GError ** err)
+{
+  a_media_format.set_int32 (format->ndk_media_format, key, value);
+  return TRUE;
+}
+
+static gboolean
+gst_amc_format_ndk_get_string (GstAmcFormat * format, const gchar * key,
+    gchar ** value, GError ** err)
+{
+  const char *val;
+
+  if (!a_media_format.get_string (format->ndk_media_format, key, &val)) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to call AMediaFormat_getString()");
+
+    return FALSE;
+  }
+
+  *value = g_strdup (val);
+  return TRUE;
+}
+
+static gboolean
+gst_amc_format_ndk_set_string (GstAmcFormat * format, const gchar * key,
+    const gchar * value, GError ** err)
+{
+  a_media_format.set_string (format->ndk_media_format, key, value);
+  return TRUE;
+}
+
+static gboolean
+gst_amc_format_ndk_get_buffer (GstAmcFormat * format, const gchar * key,
+    guint8 ** out_data, gsize * out_size, GError ** err)
+{
+  void *data;
+  size_t size;
+
+  if (!a_media_format.get_buffer (format->ndk_media_format, key, &data, &size)) {
+    g_set_error (err, GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED,
+        "Failed to call AMediaFormat_getBuffer()");
+
+    return FALSE;
+  }
+
+  *out_size = size;
+  *out_data = g_memdup2 (data, size);
+  return TRUE;
+}
+
+static gboolean
+gst_amc_format_ndk_set_buffer (GstAmcFormat * format, const gchar * key,
+    guint8 * data, gsize size, GError ** err)
+{
+  a_media_format.set_buffer (format->ndk_media_format, key, data, size);
+  return TRUE;
+}
+
+GstAmcFormatVTable gst_amc_format_ndk_vtable = {
+  .new_audio = gst_amc_format_ndk_new_audio,
+  .new_video = gst_amc_format_ndk_new_video,
+  .free = gst_amc_format_ndk_free,
+
+  .to_string = gst_amc_format_ndk_to_string,
+
+  .get_float = gst_amc_format_ndk_get_float,
+  .set_float = gst_amc_format_ndk_set_float,
+  .get_int = gst_amc_format_ndk_get_int,
+  .set_int = gst_amc_format_ndk_set_int,
+  .get_string = gst_amc_format_ndk_get_string,
+  .set_string = gst_amc_format_ndk_set_string,
+  .get_buffer = gst_amc_format_ndk_get_buffer,
+  .set_buffer = gst_amc_format_ndk_set_buffer,
+};

gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/ndk/gstamc-internal-ndk.h Added

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2012,2018 Collabora Ltd.
+ *   Author: Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * Copyright (C) 2015, Sebastian Dröge <sebastian@centricular.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
+ * version 2.1 of the License.
+ *
+ * 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 "../gstamc-format.h"
+
+#include <stdbool.h>
+#include <media/NdkMediaFormat.h>
+
+struct _GstAmcFormat
+{
+    AMediaFormat * ndk_media_format;
+};
+
+GstAmcFormat *
+gst_amc_format_ndk_new(GError **err);
+GstAmcFormat *
+gst_amc_format_ndk_from_a_media_format (AMediaFormat * ndk_media_format);

gst-plugins-bad-1.24.5.tar.xz/sys/androidmedia/ndk/gstamc-ndk.h Added

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2023, Ratchanan Srirattanamet <peathot@hotmail.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
+ * version 2.1 of the License.
+ *
+ * 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 "../gstamc-codec.h"
+#include "../gstamc-format.h"
+
+extern GstAmcCodecVTable gst_amc_codec_ndk_vtable;
+extern GstAmcFormatVTable gst_amc_format_ndk_vtable;
+
+gboolean gst_amc_format_ndk_static_init (void);
+gboolean gst_amc_codec_ndk_static_init (void);

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/atdec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/atdec.c Changed

@@ -286,6 +286,74 @@
   return TRUE;
 }
 
+/* These are the position orders that AudioToolbox outputs,
+ * derived experimentally.
+ */
+/* *INDENT-OFF* */
+static const struct
+{
+  gint channels;
+  GstAudioChannelPosition positions8;
+}
+channel_layouts = {
+  {3, {
+    GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+  }},
+  {4, {
+    GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+    GST_AUDIO_CHANNEL_POSITION_REAR_CENTER,
+  }},
+  {5, {
+    GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+    GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
+    GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
+  }},
+  {6, {
+    GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+    GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
+    GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
+    GST_AUDIO_CHANNEL_POSITION_LFE1,
+  }},
+  {8, {
+    GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+    GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+    GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
+    GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
+    GST_AUDIO_CHANNEL_POSITION_LFE1,
+  }},
+};
+/* *INDENT-ON* */
+
+static void
+gst_atdec_get_channel_positions (GstATDec * atdec, gint channels,
+    GstAudioChannelPosition * positions)
+{
+  guint64 mask;
+
+  for (guint i = 0; i < G_N_ELEMENTS (channel_layouts); ++i) {
+    if (channel_layoutsi.channels == channels) {
+      memcpy (positions, channel_layoutsi.positions,
+          channels * sizeof (*positions));
+      return;
+    }
+  }
+
+  GST_WARNING_OBJECT (atdec, "Unknown channel count %u", channels);
+  mask = gst_audio_channel_get_fallback_mask (channels);
+  gst_audio_channel_positions_from_mask (channels, mask, positions);
+}
+
 static gboolean
 gst_atdec_set_format (GstAudioDecoder * decoder, GstCaps * caps)
 {
@@ -320,16 +388,32 @@
       "rate", G_TYPE_INT, (int) input_format.mSampleRate,
       "channels", G_TYPE_INT, input_format.mChannelsPerFrame, NULL);
 
+  /* The layout passed to AudioQueueSetOfflineRenderFormat() is ignored, and
+   * setting kAudioQueueProperty_ChannelLayout has no effect either.
+   * The actual layout is derived experimentally here.
+   * It's not in a valid order for GStreamer, so we have to reorder in
+   * gst_atdec_handle_frame().
+   */
+
+  if (input_format.mChannelsPerFrame > 2) {
+    guint64 mask;
+
+    gst_atdec_get_channel_positions (atdec, input_format.mChannelsPerFrame,
+        atdec->at_channel_positions);
+    gst_audio_channel_positions_to_mask (atdec->at_channel_positions,
+        input_format.mChannelsPerFrame, FALSE, &mask);
+    /* gst_audio_info_from_caps() below will convert the mask back into a
+     * valid order, which we will use when reordering. */
+    gst_caps_set_simple (output_caps, "channel-mask", GST_TYPE_BITMASK, mask,
+        NULL);
+  }
+
   /* configure output_format from caps */
   gst_caps_to_at_format (output_caps, &output_format);
 
   /* set the format we want to negotiate downstream */
   gst_audio_info_from_caps (&output_info, output_caps);
-  gst_audio_info_set_format (&output_info,
-      output_format.mFormatFlags & kLinearPCMFormatFlagIsSignedInteger ?
-      GST_AUDIO_FORMAT_S16LE : GST_AUDIO_FORMAT_F32LE,
-      output_format.mSampleRate, output_format.mChannelsPerFrame, NULL);
-  gst_audio_decoder_set_output_format (decoder, &output_info);
+  gst_audio_decoder_set_output_caps (decoder, output_caps);
   gst_caps_unref (output_caps);
 
   status = AudioQueueNewOutput (&input_format, gst_atdec_buffer_emptied,
@@ -337,12 +421,7 @@
   if (status)
     goto create_queue_error;
 
-  /* FIXME: figure out how to map this properly */
-  if (output_format.mChannelsPerFrame == 1)
-    output_layout.mChannelLayoutTag = kAudioChannelLayoutTag_Mono;
-  else
-    output_layout.mChannelLayoutTag = kAudioChannelLayoutTag_Stereo;
-
+  output_layout.mChannelLayoutTag = kAudioChannelLayoutTag_Unknown;
   status = AudioQueueSetOfflineRenderFormat (atdec->queue,
       &output_format, &output_layout);
   if (status)
@@ -452,6 +531,12 @@
     gst_buffer_fill (out, 0, output_buffer->mAudioData,
         output_buffer->mAudioDataByteSize);
 
+    if (GST_AUDIO_INFO_CHANNELS (audio_info) > 2)
+      gst_audio_buffer_reorder_channels (out,
+          GST_AUDIO_INFO_FORMAT (audio_info),
+          GST_AUDIO_INFO_CHANNELS (audio_info),
+          atdec->at_channel_positions, audio_info->position);
+
     flow_ret =
         gst_audio_decoder_finish_frame (GST_AUDIO_DECODER (atdec), out, 1);
     GST_DEBUG_OBJECT (atdec, "Finished buffer: %s",

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/atdec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/atdec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/avfdeviceprovider.m -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/avfdeviceprovider.m Changed

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/avfvideosrc.m -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/avfvideosrc.m Changed

@@ -26,6 +26,7 @@
 #include "glcontexthelper.h"
 
 #import <AVFoundation/AVFoundation.h>
+#import <CoreMedia/CoreMedia.h>
 #if !HAVE_IOS
 #import <AppKit/AppKit.h>
 #endif
@@ -33,6 +34,7 @@
 #include <gst/gl/gstglcontext.h>
 #include "coremediabuffer.h"
 #include "videotexturecache-gl.h"
+#include "helpers.h"
 
 #define DEFAULT_DEVICE_INDEX  -1
 #define DEFAULT_POSITION      GST_AVF_VIDEO_SOURCE_POSITION_DEFAULT
@@ -48,7 +50,6 @@
 GST_DEBUG_CATEGORY (gst_avf_video_src_debug);
 #define GST_CAT_DEFAULT gst_avf_video_src_debug
 
-static GstVideoFormat get_gst_video_format(NSNumber *pixel_format);
 static CMVideoDimensions
 get_oriented_dimensions(GstAVFVideoSourceOrientation orientation, CMVideoDimensions dimensions);
 
@@ -237,9 +238,7 @@
 - (float)getScaleFactorFromDeviceIndex;
 #endif
 - (GstCaps *)getDeviceCaps;
-- (BOOL)setDeviceCaps:(GstVideoInfo *)info;
-- (BOOL)getSessionPresetCaps:(GstCaps *)result;
-- (BOOL)setSessionPresetCaps:(GstVideoInfo *)info;
+- (BOOL)setDeviceCaps:(const GstVideoInfo *)info;
 - (GstCaps *)getCaps;
 - (BOOL)setCaps:(GstCaps *)new_caps;
 - (BOOL)start;
@@ -267,7 +266,7 @@
     case GST_AVF_VIDEO_SOURCE_DEVICE_TYPE_BUILT_IN_TELEPHOTO_CAMERA:
       return AVCaptureDeviceTypeBuiltInTelephotoCamera;
     case GST_AVF_VIDEO_SOURCE_DEVICE_TYPE_BUILT_IN_DUAL_CAMERA:
-      return AVCaptureDeviceTypeBuiltInDuoCamera;
+      return AVCaptureDeviceTypeBuiltInDualCamera;
     case GST_AVF_VIDEO_SOURCE_DEVICE_TYPE_DEFAULT:
       g_assert_not_reached();
   }
@@ -422,7 +421,9 @@
       return NO;
     }
   } else { // deviceIndex takes priority over position and deviceType
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     NSArray *devices = AVCaptureDevice devicesWithMediaType:mediaType;
+G_GNUC_END_IGNORE_DEPRECATIONS
     if (deviceIndex >= devices count) {
       GST_ELEMENT_ERROR (element, RESOURCE, NOT_FOUND,
                           ("Invalid video capture device index"), (NULL));
@@ -589,7 +590,7 @@
 
 - (GstVideoFormat)getGstVideoFormat:(NSNumber *)pixel_format
 {
-  GstVideoFormat gst_format = get_gst_video_format(pixel_format);
+  GstVideoFormat gst_format = gst_video_format_from_cvpixelformat (pixel_format integerValue);
   if (gst_format == GST_VIDEO_FORMAT_UNKNOWN) {
     GST_LOG_OBJECT (element, "Pixel format %s is not handled by avfvideosrc",
         pixel_format stringValue UTF8String);
@@ -646,59 +647,29 @@
   return device_caps;
 }
 
-- (BOOL)setDeviceCaps:(GstVideoInfo *)info
+- (BOOL)setDeviceCaps:(const GstVideoInfo *)info
 {
-  double framerate;
   gboolean found_format = FALSE, found_framerate = FALSE;
-  NSArray *formats = device valueForKey:@"formats";
-  gst_util_fraction_to_double (info->fps_n, info->fps_d, &framerate);
 
   GST_DEBUG_OBJECT (element, "Setting device caps");
 
   if (device lockForConfiguration:NULL == YES) {
-    for (NSObject *f in formats) {
-      CMFormatDescriptionRef formatDescription = (__bridge CMFormatDescriptionRef) f performSelector:@selector(formatDescription);
-      CMVideoDimensions dimensions = CMVideoFormatDescriptionGetDimensions(formatDescription);
+    for (AVCaptureDeviceFormat *fmt in device.formats.reverseObjectEnumerator) {
+      CMVideoDimensions dimensions = CMVideoFormatDescriptionGetDimensions (fmt.formatDescription);
       dimensions = self orientedDimensions:dimensions;
       if (dimensions.width == info->width && dimensions.height == info->height) {
         found_format = TRUE;
-        device setValue:f forKey:@"activeFormat";
-        for (NSObject *rate in f valueForKey:@"videoSupportedFrameRateRanges") {
-          gdouble min_frame_rate, max_frame_rate;
-
-          rate valueForKey:@"minFrameRate" getValue:&min_frame_rate;
-          rate valueForKey:@"maxFrameRate" getValue:&max_frame_rate;
-          if ((framerate >= min_frame_rate - 0.00001) &&
-              (framerate <= max_frame_rate + 0.00001)) {
-            NSValue *frame_duration_value;
+        device.activeFormat = fmt;
+        for (AVFrameRateRange *range in fmt.videoSupportedFrameRateRanges) {
+          CMTime dur = CMTimeMake (info->fps_d, info->fps_n);
+          if (CMTIME_COMPARE_INLINE (range.minFrameDuration, <=, dur) &&
+              CMTIME_COMPARE_INLINE (range.maxFrameDuration, >=, dur)) {
+            device.activeVideoMinFrameDuration = dur;
+            device.activeVideoMaxFrameDuration = dur;
             found_framerate = TRUE;
-            if (min_frame_rate == max_frame_rate) {
-              /* on mac we get tight ranges and an exception is raised if the
-               * frame duration doesn't match the one reported in the range to
-               * the last decimal point
-               */
-              frame_duration_value = rate valueForKey:@"minFrameDuration";
-            } else {
-              // Invert fps_n and fps_d to get frame duration value and timescale (or numerator and denominator)
-              frame_duration_value = NSValue valueWithCMTime:CMTimeMake (info->fps_d, info->fps_n);
-            }
-            device setValue:frame_duration_value forKey:@"activeVideoMinFrameDuration";
-            @try {
-              /* Only available on OSX >= 10.8 and iOS >= 7.0 */
-              device setValue:frame_duration_value forKey:@"activeVideoMaxFrameDuration";
-            } @catch (NSException *exception) {
-              if (!exception name isEqualToString:NSUndefinedKeyException) {
-                GST_WARNING ("An unexcepted error occurred: %s",
-                              exception.reason UTF8String);
-              }
-            }
             break;
           }
         }
-
-        if (found_framerate) {
-          break;
-        }
       }
     }
     if (!found_format) {
@@ -716,72 +687,6 @@
   return YES;
 }
 
-- (BOOL)getSessionPresetCaps:(GstCaps *)result
-{
-  NSArray *pixel_formats = output.availableVideoCVPixelFormatTypes;
-  for (NSNumber *pixel_format in pixel_formats) {
-    GstVideoFormat gst_format = self getGstVideoFormat:pixel_format;
-    if (gst_format == GST_VIDEO_FORMAT_UNKNOWN)
-      continue;
-
-#if HAVE_IOS
-    if (session canSetSessionPreset:AVCaptureSessionPreset1920x1080)
-      gst_caps_append (result, GST_AVF_CAPS_NEW (gst_format, 1920, 1080, DEVICE_FPS_N, DEVICE_FPS_D));
-#endif
-    if (session canSetSessionPreset:AVCaptureSessionPreset1280x720)
-      gst_caps_append (result, GST_AVF_CAPS_NEW (gst_format, 1280, 720, DEVICE_FPS_N, DEVICE_FPS_D));
-    if (session canSetSessionPreset:AVCaptureSessionPreset640x480)
-      gst_caps_append (result, GST_AVF_CAPS_NEW (gst_format, 640, 480, DEVICE_FPS_N, DEVICE_FPS_D));
-    if (session canSetSessionPreset:AVCaptureSessionPresetMedium)
-      gst_caps_append (result, GST_AVF_CAPS_NEW (gst_format, 480, 360, DEVICE_FPS_N, DEVICE_FPS_D));
-    if (session canSetSessionPreset:AVCaptureSessionPreset352x288)
-      gst_caps_append (result, GST_AVF_CAPS_NEW (gst_format, 352, 288, DEVICE_FPS_N, DEVICE_FPS_D));
-    if (session canSetSessionPreset:AVCaptureSessionPresetLow)
-      gst_caps_append (result, GST_AVF_CAPS_NEW (gst_format, 192, 144, DEVICE_FPS_N, DEVICE_FPS_D));
-  }
-
-  GST_LOG_OBJECT (element, "Session presets returned the following caps %" GST_PTR_FORMAT, result);
-
-  return YES;
-}
-
-- (BOOL)setSessionPresetCaps:(GstVideoInfo *)info;
-{
-  GST_DEBUG_OBJECT (element, "Setting session presset caps");
-
-  if (device lockForConfiguration:NULL != YES) {
-    GST_WARNING ("Couldn't lock device for configuration");
-    return NO;
-  }
-
-  switch (info->width) {
-  case 192:
-    session.sessionPreset = AVCaptureSessionPresetLow;
-    break;
-  case 352:
-    session.sessionPreset = AVCaptureSessionPreset352x288;
-    break;
-  case 480:
-    session.sessionPreset = AVCaptureSessionPresetMedium;
-    break;
-  case 640:
-    session.sessionPreset = AVCaptureSessionPreset640x480;
-    break;
-  case 1280:
-    session.sessionPreset = AVCaptureSessionPreset1280x720;
-    break;
-#if HAVE_IOS
-  case 1920:
-    session.sessionPreset = AVCaptureSessionPreset1920x1080;
-    break;
-#endif
-  default:
-    GST_WARNING ("Unsupported capture dimensions %dx%d", info->width, info->height);
-    return NO;
-  }
-  return YES;
-}
-
 - (GstCaps *)getCaps
 {
   GstCaps *result;
@@ -814,24 +719,13 @@
             NULL));
     }
 #else
+    (void) pixel_formats;
     GST_WARNING ("Screen capture is not supported by iOS");
 #endif
     return result;
   }
 
-  @try {
-    result = gst_caps_merge (result, self getDeviceCaps);
-  } @catch (NSException *exception) {
-    if (!exception name isEqualToString:NSUndefinedKeyException) {
-      GST_WARNING ("An unexcepted error occurred: %s", exception.reason UTF8String);
-      return result;
-    }
-
-    /* Fallback on session presets API for iOS < 7.0 */
-    self getSessionPresetCaps:result;
-  }
-
-  return result;
+  return gst_caps_merge (result, self getDeviceCaps);
 }
 
 - (BOOL)setCaps:(GstCaps *)new_caps
@@ -848,7 +742,13 @@
   latency = gst_util_uint64_scale (GST_SECOND, info.fps_d, info.fps_n);
 
   dispatch_sync (mainQueue, ^{
-    int newformat;
+    GST_INFO_OBJECT (element,
+        "width: %d height: %d format: %s", width, height,
+        gst_video_format_to_string (format));
+    int video_format = gst_video_format_to_cvpixelformat (format);
+    output.videoSettings = NSDictionary
+        dictionaryWithObject:NSNumber numberWithInt:video_format
+        forKey:(NSString*)kCVPixelBufferPixelFormatTypeKey;
 
     if (captureScreen) {
 #if !HAVE_IOS
@@ -860,56 +760,12 @@
       return;
 #endif
     } else {
-      @try {
-
-        /* formats and activeFormat keys are only available on OSX >= 10.7 and iOS >= 7.0 */
-        *successPtr = self setDeviceCaps:(GstVideoInfo *)&info;
-        if (*successPtr != YES)
-          return;
-
-      } @catch (NSException *exception) {
-
-        if (!exception name isEqualToString:NSUndefinedKeyException) {
-          GST_WARNING ("An unexcepted error occurred: %s", exception.reason UTF8String);
-          *successPtr = NO;
-          return;
-        }
-
-        /* Fallback on session presets API for iOS < 7.0 */
-        *successPtr = self setSessionPresetCaps:(GstVideoInfo *)&info;
-        if (*successPtr != YES)
-          return;
-      }
-    }
-
-    switch (format) {
-      case GST_VIDEO_FORMAT_NV12:
-        newformat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
-        break;
-      case GST_VIDEO_FORMAT_UYVY:
-        newformat = kCVPixelFormatType_422YpCbCr8;
-        break;
-      case GST_VIDEO_FORMAT_YUY2:
-        newformat = kCVPixelFormatType_422YpCbCr8_yuvs;
-        break;
-      case GST_VIDEO_FORMAT_BGRA:
-        newformat = kCVPixelFormatType_32BGRA;
-        break;
-      default:
+      if (!self setDeviceCaps:&info) {
         *successPtr = NO;
-        GST_WARNING ("Unsupported output format %s",
-            gst_video_format_to_string (format));
         return;
+      }
     }
 
-    GST_INFO_OBJECT (element,
-        "width: %d height: %d format: %s", width, height,
-        gst_video_format_to_string (format));
-
-    output.videoSettings = NSDictionary
-        dictionaryWithObject:NSNumber numberWithInt:newformat
-        forKey:(NSString*)kCVPixelBufferPixelFormatTypeKey;
-
     gst_caps_replace (&caps, new_caps);
     GST_INFO_OBJECT (element, "configured caps %"GST_PTR_FORMAT, caps);
 
@@ -1664,63 +1520,71 @@
 GstCaps*
 gst_av_capture_device_get_caps (AVCaptureDevice *device, AVCaptureVideoDataOutput *output, GstAVFVideoSourceOrientation orientation)
 {
-  NSArray *formats = device valueForKey:@"formats";
-  NSArray *pixel_formats = output.availableVideoCVPixelFormatTypes;
   GstCaps *result_caps, *result_gl_caps;
+  gboolean is_gl_format;
 #if !HAVE_IOS
-  GstVideoFormat gl_format = GST_VIDEO_FORMAT_UYVY;
+  GstVideoFormat gl_formats = { GST_VIDEO_FORMAT_UYVY, GST_VIDEO_FORMAT_YUY2, 0 };
 #else
-  GstVideoFormat gl_format = GST_VIDEO_FORMAT_NV12;
+  GstVideoFormat gl_formats = { GST_VIDEO_FORMAT_NV12, 0 };
 #endif
 
   result_caps = gst_caps_new_empty ();
   result_gl_caps = gst_caps_new_empty ();
 
-  /* Do not use AVCaptureDeviceFormat or AVFrameRateRange only
-   * available in iOS >= 7.0. We use a dynamic approach with key-value
-   * coding or performSelector */
-  for (NSObject *f in formats reverseObjectEnumerator) {
-    /* formatDescription can't be retrieved with valueForKey so use a selector here */
-    CMFormatDescriptionRef formatDescription = (__bridge CMFormatDescriptionRef) f performSelector:@selector(formatDescription);
-    CMVideoDimensions dimensions = CMVideoFormatDescriptionGetDimensions (formatDescription);
+  /* Iterate in reverse order so UYVY is first and BGRA is last */
+  for (AVCaptureDeviceFormat *format in device.formats.reverseObjectEnumerator) {
+    CMVideoDimensions dimensions = CMVideoFormatDescriptionGetDimensions (format.formatDescription);
     dimensions = get_oriented_dimensions (orientation, dimensions);
 
-    for (NSObject *rate in f valueForKey:@"videoSupportedFrameRateRanges") {
+    for (AVFrameRateRange *range in format.videoSupportedFrameRateRanges) {
       int min_fps_n, min_fps_d, max_fps_n, max_fps_d;
-      gdouble min_fps, max_fps;
 
-      rate valueForKey:@"minFrameRate" getValue:&min_fps;
-      gst_util_double_to_fraction (min_fps, &min_fps_n, &min_fps_d);
+      /* CMTime duration is the inverse of fps*/
+      min_fps_n = range.maxFrameDuration.timescale;
+      min_fps_d = range.maxFrameDuration.value;
+      max_fps_n = range.minFrameDuration.timescale;
+      max_fps_d = range.minFrameDuration.value;
+
+      GST_DEBUG ("dimensions %ix%i fps range is %i/%i, %i/%i",
+          dimensions.width, dimensions.height, min_fps_n, min_fps_d, max_fps_n,
+          max_fps_d);
+
+      for (NSNumber *pixel_format in output.availableVideoCVPixelFormatTypes) {
+        GstCaps *caps;
+        unsigned int f = pixel_format integerValue;
+        GstVideoFormat gst_format = gst_video_format_from_cvpixelformat (f);
+
+        if (gst_format == GST_VIDEO_FORMAT_UNKNOWN) {
+          GST_WARNING ("Unknown pixel format %" GST_FOURCC_FORMAT " (0x%x)",
+              GST_CVPIXELFORMAT_FOURCC_ARGS (f), f);
+          continue;
+        }
 
-      rate valueForKey:@"maxFrameRate" getValue:&max_fps;
-      gst_util_double_to_fraction (max_fps, &max_fps_n, &max_fps_d);
 
-      for (NSNumber *pixel_format in pixel_formats) {
-        GstVideoFormat gst_format = get_gst_video_format (pixel_format);
+        if (CMTIME_COMPARE_INLINE (range.minFrameDuration, ==, range.maxFrameDuration))
+          caps = GST_AVF_CAPS_NEW (gst_format, dimensions.width,
+              dimensions.height, max_fps_n, max_fps_d);
+        else
+          caps = GST_AVF_FPS_RANGE_CAPS_NEW (gst_format, dimensions.width,
+              dimensions.height, min_fps_n, min_fps_d, max_fps_n, max_fps_d);
 
-        if (gst_format != GST_VIDEO_FORMAT_UNKNOWN) {
-          if (min_fps != max_fps)
-            gst_caps_append (result_caps, GST_AVF_FPS_RANGE_CAPS_NEW (gst_format, dimensions.width, dimensions.height, min_fps_n, min_fps_d, max_fps_n, max_fps_d));
-          else
-            gst_caps_append (result_caps, GST_AVF_CAPS_NEW (gst_format, dimensions.width, dimensions.height, max_fps_n, max_fps_d));
+        is_gl_format = FALSE;
+        for (int i = 0; i < G_N_ELEMENTS (gl_formats); i++) {
+          if (gst_format == gl_formatsi) {
+            is_gl_format = TRUE;
+            break;
+          }
         }
 
-        if (gst_format == gl_format) {
-          GstCaps *gl_caps;
-          if (min_fps != max_fps) {
-            gl_caps = GST_AVF_FPS_RANGE_CAPS_NEW (gl_format,
-                                                  dimensions.width, dimensions.height,
-                                                  min_fps_n, min_fps_d,
-                                                  max_fps_n, max_fps_d);
-          } else {
-            gl_caps = GST_AVF_CAPS_NEW (gl_format,
-                                        dimensions.width, dimensions.height,
-                                        max_fps_n, max_fps_d);
-          }
-          gst_caps_set_features (gl_caps, 0,
+        if (!is_gl_format) {
+          gst_caps_append (result_caps, caps);
+        } else {
+          gst_caps_append (result_caps, gst_caps_copy (caps));
+          /* Set GLMemory features on caps */
+          gst_caps_set_features (caps, 0,
                                  gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_GL_MEMORY,
                                                         NULL));
-          gst_caps_set_simple (gl_caps,
+          gst_caps_set_simple (caps,
                                "texture-target", G_TYPE_STRING,
 #if !HAVE_IOS
                                GST_GL_TEXTURE_TARGET_RECTANGLE_STR,
@@ -1728,7 +1592,7 @@
                                GST_GL_TEXTURE_TARGET_2D_STR,
 #endif
                                NULL);
-          gst_caps_append (result_gl_caps, gl_caps);
+          gst_caps_append (result_gl_caps, caps);
         }
       }
     }
@@ -1739,31 +1603,6 @@
   return result_gl_caps;
 }
 
-static GstVideoFormat
-get_gst_video_format (NSNumber *pixel_format)
-{
-  GstVideoFormat gst_format = GST_VIDEO_FORMAT_UNKNOWN;
-
-  switch (pixel_format integerValue) {
-    case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange: /* 420v */
-      gst_format = GST_VIDEO_FORMAT_NV12;
-      break;
-    case kCVPixelFormatType_422YpCbCr8: /* 2vuy */
-      gst_format = GST_VIDEO_FORMAT_UYVY;
-      break;
-    case kCVPixelFormatType_32BGRA: /* BGRA */
-      gst_format = GST_VIDEO_FORMAT_BGRA;
-      break;
-    case kCVPixelFormatType_422YpCbCr8_yuvs: /* yuvs */
-      gst_format = GST_VIDEO_FORMAT_YUY2;
-      break;
-    default:
-      break;
-  }
-
-  return gst_format;
-}
-
 static CMVideoDimensions
 get_oriented_dimensions (GstAVFVideoSourceOrientation orientation, CMVideoDimensions dimensions)
 {

gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/helpers.c Added

@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2023 Nirbheek Chauhan <nirbheek@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <CoreVideo/CVPixelBuffer.h>
+#include "helpers.h"
+
+GstVideoFormat
+gst_video_format_from_cvpixelformat (int fmt)
+{
+  /* Note that video and full-range color values map to the same format */
+  switch (fmt) {
+      /* YUV */
+    case kCVPixelFormatType_420YpCbCr8Planar:
+    case kCVPixelFormatType_420YpCbCr8PlanarFullRange:
+      return GST_VIDEO_FORMAT_I420;
+    case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange:
+    case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange:
+      return GST_VIDEO_FORMAT_NV12;
+    case kCVPixelFormatType_422YpCbCr8:
+      return GST_VIDEO_FORMAT_UYVY;
+    case kCVPixelFormatType_422YpCbCr8_yuvs:
+      return GST_VIDEO_FORMAT_YUY2;
+      /* Alpha YUV */
+    case kCVPixelFormatType_4444AYpCbCr16:
+      return GST_VIDEO_FORMAT_AYUV64;
+      /* RGB formats */
+    case kCVPixelFormatType_32ARGB:
+      return GST_VIDEO_FORMAT_ARGB;
+    case kCVPixelFormatType_32BGRA:
+      return GST_VIDEO_FORMAT_BGRA;
+    case kCVPixelFormatType_64ARGB:
+      return GST_VIDEO_FORMAT_ARGB64_BE;
+    case kCVPixelFormatType_64RGBALE:
+      return GST_VIDEO_FORMAT_RGBA64_LE;
+    default:
+      return GST_VIDEO_FORMAT_UNKNOWN;
+  }
+}
+
+int
+gst_video_format_to_cvpixelformat (GstVideoFormat fmt)
+{
+  switch (fmt) {
+      /* YUV */
+    case GST_VIDEO_FORMAT_I420:
+      return kCVPixelFormatType_420YpCbCr8Planar;
+    case GST_VIDEO_FORMAT_NV12:
+      return kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
+    case GST_VIDEO_FORMAT_UYVY:
+      return kCVPixelFormatType_422YpCbCr8;
+    case GST_VIDEO_FORMAT_YUY2:
+      return kCVPixelFormatType_422YpCbCr8_yuvs;
+      /* Alpha YUV */
+    case GST_VIDEO_FORMAT_AYUV64:
+/* This is fine for now because Apple only ships LE devices */
+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
+#error "AYUV64 is NE but kCVPixelFormatType_4444AYpCbCr16 is LE"
+#endif
+      return kCVPixelFormatType_4444AYpCbCr16;
+      /* RGB formats */
+    case GST_VIDEO_FORMAT_ARGB:
+      return kCVPixelFormatType_32ARGB;
+    case GST_VIDEO_FORMAT_BGRA:
+      return kCVPixelFormatType_32BGRA;
+    case GST_VIDEO_FORMAT_ARGB64_BE:
+      return kCVPixelFormatType_64ARGB;
+    case GST_VIDEO_FORMAT_RGBA64_LE:
+      return kCVPixelFormatType_64RGBALE;
+    default:
+      g_assert_not_reached ();
+      return -1;
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/helpers.h Added

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023 Nirbheek Chauhan <nirbheek@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _APPLEMEDIA_HELPERS_H_
+#define _APPLEMEDIA_HELPERS_H_
+
+#include <gst/video/video.h>
+
+G_BEGIN_DECLS
+
+// kCVPixelFormatType_64RGBALE is only available for 11.3 +.
+// See https://developer.apple.com/documentation/corevideo/1563591-pixel_format_identifiers/kcvpixelformattype_64rgbale
+#if defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < 110300
+#define kCVPixelFormatType_64RGBALE 'l64r'
+#endif
+#define GST_APPLEMEDIA_HAVE_64RGBALE __builtin_available(macOS 11.3, *)
+
+#define GST_CVPIXELFORMAT_FOURCC_ARGS(fourcc) \
+  __GST_PRINT_CHAR(((fourcc) >> 24) & 0xff),  \
+  __GST_PRINT_CHAR(((fourcc) >> 16) & 0xff),  \
+  __GST_PRINT_CHAR(((fourcc) >> 8) & 0xff),   \
+  __GST_PRINT_CHAR((fourcc) & 0xff)
+
+GstVideoFormat          gst_video_format_from_cvpixelformat         (int fmt);
+int                     gst_video_format_to_cvpixelformat           (GstVideoFormat fmt);
+
+G_END_DECLS
+#endif /* _APPLEMEDIA_HELPERS_H_ */

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/iosassetsrc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/iosassetsrc.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/iosassetsrc.m -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/iosassetsrc.m Changed

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/iosurfacevulkanmemory.c -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/iosurfacevulkanmemory.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/videotexturecache-gl.m -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/videotexturecache-gl.m Changed

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/vtdec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/vtdec.c Changed

@@ -57,6 +57,7 @@
 #include <gst/gl/gstglcontext.h>
 #include "vtdec.h"
 #include "vtutil.h"
+#include "helpers.h"
 #include "corevideobuffer.h"
 #include "coremediabuffer.h"
 #include "videotexturecache-gl.h"
@@ -79,11 +80,16 @@
 
 static gboolean gst_vtdec_start (GstVideoDecoder * decoder);
 static gboolean gst_vtdec_stop (GstVideoDecoder * decoder);
+static void gst_vtdec_output_loop (GstVtdec * self);
 static gboolean gst_vtdec_negotiate (GstVideoDecoder * decoder);
 static gboolean gst_vtdec_set_format (GstVideoDecoder * decoder,
     GstVideoCodecState * state);
 static gboolean gst_vtdec_flush (GstVideoDecoder * decoder);
 static GstFlowReturn gst_vtdec_finish (GstVideoDecoder * decoder);
+static gboolean gst_vtdec_sink_event (GstVideoDecoder * decoder,
+    GstEvent * event);
+static GstStateChangeReturn gst_vtdec_change_state (GstElement * element,
+    GstStateChange transition);
 static GstFlowReturn gst_vtdec_handle_frame (GstVideoDecoder * decoder,
     GstVideoCodecFrame * frame);
 
@@ -92,8 +98,8 @@
 static void gst_vtdec_invalidate_session (GstVtdec * vtdec);
 static CMSampleBufferRef cm_sample_buffer_from_gst_buffer (GstVtdec * vtdec,
     GstBuffer * buf);
-static GstFlowReturn gst_vtdec_push_frames_if_needed (GstVtdec * vtdec,
-    gboolean drain, gboolean flush);
+static GstFlowReturn gst_vtdec_drain_decoder (GstVideoDecoder * decoder,
+    gboolean flush);
 static CMFormatDescriptionRef create_format_description (GstVtdec * vtdec,
     CMVideoCodecType cm_format);
 static CMFormatDescriptionRef
@@ -103,11 +109,11 @@
     *decompression_output_ref_con, void *source_frame_ref_con, OSStatus status,
     VTDecodeInfoFlags info_flags, CVImageBufferRef image_buffer, CMTime pts,
     CMTime duration);
-static gboolean compute_h264_decode_picture_buffer_length (GstVtdec * vtdec,
+static gboolean compute_h264_decode_picture_buffer_size (GstVtdec * vtdec,
     GstBuffer * codec_data, int *length);
-static gboolean compute_hevc_decode_picture_buffer_length (GstVtdec * vtdec,
+static gboolean compute_hevc_decode_picture_buffer_size (GstVtdec * vtdec,
     GstBuffer * codec_data, int *length);
-static gboolean gst_vtdec_compute_reorder_queue_length (GstVtdec * vtdec,
+static gboolean gst_vtdec_compute_dpb_size (GstVtdec * vtdec,
     CMVideoCodecType cm_format, GstBuffer * codec_data);
 static void gst_vtdec_set_latency (GstVtdec * vtdec);
 static void gst_vtdec_set_context (GstElement * element, GstContext * context);
@@ -169,7 +175,7 @@
   {
     GstCaps *caps = gst_caps_from_string (VIDEO_SRC_CAPS);
     /* RGBA64_LE is kCVPixelFormatType_64RGBALE, only available on macOS 11.3+ */
-    if (GST_VTUTIL_HAVE_64RGBALE)
+    if (GST_APPLEMEDIA_HAVE_64RGBALE)
       caps = gst_vtutil_caps_append_video_format (caps, "RGBA64_LE");
     gst_element_class_add_pad_template (element_class,
         gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, caps));
@@ -184,6 +190,7 @@
 
   gobject_class->finalize = gst_vtdec_finalize;
   element_class->set_context = gst_vtdec_set_context;
+  element_class->change_state = gst_vtdec_change_state;
   video_decoder_class->start = GST_DEBUG_FUNCPTR (gst_vtdec_start);
   video_decoder_class->stop = GST_DEBUG_FUNCPTR (gst_vtdec_stop);
   video_decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_vtdec_negotiate);
@@ -192,12 +199,14 @@
   video_decoder_class->finish = GST_DEBUG_FUNCPTR (gst_vtdec_finish);
   video_decoder_class->handle_frame =
       GST_DEBUG_FUNCPTR (gst_vtdec_handle_frame);
+  video_decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_vtdec_sink_event);
 }
 
 static void
 gst_vtdec_init (GstVtdec * vtdec)
 {
-  vtdec->reorder_queue = g_async_queue_new ();
+  g_mutex_init (&vtdec->queue_mutex);
+  g_cond_init (&vtdec->queue_cond);
 }
 
 void
@@ -207,7 +216,8 @@
 
   GST_DEBUG_OBJECT (vtdec, "finalize");
 
-  g_async_queue_unref (vtdec->reorder_queue);
+  g_mutex_clear (&vtdec->queue_mutex);
+  g_cond_clear (&vtdec->queue_cond);
 
   G_OBJECT_CLASS (gst_vtdec_parent_class)->finalize (object);
 }
@@ -219,6 +229,22 @@
 
   GST_DEBUG_OBJECT (vtdec, "start");
 
+  vtdec->is_flushing = FALSE;
+  vtdec->is_draining = FALSE;
+  vtdec->downstream_ret = GST_FLOW_OK;
+  vtdec->reorder_queue = gst_queue_array_new (0);
+
+  /* Create the output task, but pause it immediately */
+  vtdec->pause_task = TRUE;
+  if (!gst_pad_start_task (GST_VIDEO_DECODER_SRC_PAD (decoder),
+          (GstTaskFunction) gst_vtdec_output_loop, vtdec, NULL)) {
+    GST_ERROR_OBJECT (vtdec, "failed to start output thread");
+    return FALSE;
+  }
+  /* This blocks until the loop actually pauses */
+  gst_pad_pause_task (GST_VIDEO_DECODER_SRC_PAD (decoder));
+  vtdec->pause_task = FALSE;
+
   if (!vtdec->ctxh)
     vtdec->ctxh = gst_gl_context_helper_new (GST_ELEMENT (decoder));
 
@@ -228,9 +254,21 @@
 static gboolean
 gst_vtdec_stop (GstVideoDecoder * decoder)
 {
+  GstVideoCodecFrame *frame;
   GstVtdec *vtdec = GST_VTDEC (decoder);
 
-  gst_vtdec_push_frames_if_needed (vtdec, TRUE, TRUE);
+  GST_DEBUG_OBJECT (vtdec, "stop");
+
+  gst_vtdec_drain_decoder (GST_VIDEO_DECODER_CAST (vtdec), TRUE);
+  vtdec->downstream_ret = GST_FLOW_FLUSHING;
+
+  while ((frame = gst_queue_array_pop_head (vtdec->reorder_queue))) {
+    gst_video_decoder_release_frame (decoder, frame);
+  }
+  gst_queue_array_free (vtdec->reorder_queue);
+  vtdec->reorder_queue = NULL;
+
+  gst_pad_stop_task (GST_VIDEO_DECODER_SRC_PAD (decoder));
 
   if (vtdec->input_state)
     gst_video_codec_state_unref (vtdec->input_state);
@@ -256,12 +294,121 @@
   gst_clear_object (&vtdec->instance);
 #endif
 
-  GST_DEBUG_OBJECT (vtdec, "stop");
-
   return TRUE;
 }
 
 static void
+gst_vtdec_output_loop (GstVtdec * vtdec)
+{
+  GstVideoCodecFrame *frame;
+  GstFlowReturn ret = GST_FLOW_OK;
+  GstVideoDecoder *decoder = GST_VIDEO_DECODER (vtdec);
+  gboolean is_flushing;
+
+  g_mutex_lock (&vtdec->queue_mutex);
+  while (gst_queue_array_is_empty (vtdec->reorder_queue)
+      && !vtdec->pause_task && !vtdec->is_flushing && !vtdec->is_draining) {
+    g_cond_wait (&vtdec->queue_cond, &vtdec->queue_mutex);
+  }
+
+  if (vtdec->pause_task) {
+    g_mutex_unlock (&vtdec->queue_mutex);
+    gst_pad_pause_task (GST_VIDEO_DECODER_SRC_PAD (decoder));
+    return;
+  }
+
+  /* push a buffer if there are enough frames to guarantee 
+   * that we push in PTS order, or if we're draining/flushing */
+  while ((gst_queue_array_get_length (vtdec->reorder_queue) >=
+          vtdec->dbp_size) || vtdec->is_flushing || vtdec->is_draining) {
+    frame = gst_queue_array_pop_head (vtdec->reorder_queue);
+    is_flushing = vtdec->is_flushing;
+    g_cond_signal (&vtdec->queue_cond);
+    g_mutex_unlock (&vtdec->queue_mutex);
+
+    /* we need to check this in case dpb_size=0 (jpeg for
+     * example) or we're draining/flushing */
+    if (frame) {
+      GST_VIDEO_DECODER_STREAM_LOCK (vtdec);
+
+      if (frame->flags & VTDEC_FRAME_FLAG_ERROR) {
+        GST_VIDEO_DECODER_ERROR (vtdec, 1, STREAM, DECODE,
+            ("Got frame %d with an error flag", frame->system_frame_number),
+            (NULL), ret);
+        gst_video_decoder_release_frame (decoder, frame);
+      } else if (is_flushing || (frame->flags & VTDEC_FRAME_FLAG_SKIP)) {
+        GST_LOG_OBJECT (vtdec, "flushing frame %d", frame->system_frame_number);
+        gst_video_decoder_release_frame (decoder, frame);
+      } else if (frame->flags & VTDEC_FRAME_FLAG_DROP) {
+        GST_LOG_OBJECT (vtdec, "dropping frame %d", frame->system_frame_number);
+        gst_video_decoder_drop_frame (decoder, frame);
+      } else {
+        GST_TRACE_OBJECT (vtdec, "pushing frame %d",
+            frame->system_frame_number);
+        ret = gst_video_decoder_finish_frame (decoder, frame);
+      }
+
+      GST_VIDEO_DECODER_STREAM_UNLOCK (vtdec);
+    }
+
+    g_mutex_lock (&vtdec->queue_mutex);
+    if (!frame || ret != GST_FLOW_OK)
+      break;
+  }
+
+  g_mutex_unlock (&vtdec->queue_mutex);
+  GST_VIDEO_DECODER_STREAM_LOCK (vtdec);
+  vtdec->downstream_ret = ret;
+
+  /* We need to empty the queue immediately so that session_output_callback() 
+   * can push out the current buffer, otherwise it can deadlock */
+  if (ret != GST_FLOW_OK) {
+    g_mutex_lock (&vtdec->queue_mutex);
+
+    while ((frame = gst_queue_array_pop_head (vtdec->reorder_queue))) {
+      GST_LOG_OBJECT (vtdec, "flushing frame %d", frame->system_frame_number);
+      gst_video_decoder_release_frame (decoder, frame);
+    }
+
+    g_cond_signal (&vtdec->queue_cond);
+    g_mutex_unlock (&vtdec->queue_mutex);
+  }
+
+  GST_VIDEO_DECODER_STREAM_UNLOCK (vtdec);
+
+  if (ret != GST_FLOW_OK) {
+    GST_DEBUG_OBJECT (vtdec, "pausing output task: %s",
+        gst_flow_get_name (ret));
+    gst_pad_pause_task (GST_VIDEO_DECODER_SRC_PAD (decoder));
+  }
+}
+
+static gboolean
+gst_vtdec_ensure_output_loop (GstVtdec * vtdec)
+{
+  GstPad *pad = GST_VIDEO_DECODER_SRC_PAD (vtdec);
+  GstTask *task = GST_PAD_TASK (pad);
+
+  return gst_task_resume (task);
+}
+
+static void
+gst_vtdec_pause_output_loop (GstVtdec * vtdec)
+{
+  g_mutex_lock (&vtdec->queue_mutex);
+  vtdec->pause_task = TRUE;
+  g_cond_signal (&vtdec->queue_cond);
+  g_mutex_unlock (&vtdec->queue_mutex);
+
+  gst_pad_pause_task (GST_VIDEO_DECODER_SRC_PAD (vtdec));
+  GST_DEBUG_OBJECT (vtdec, "paused output thread");
+
+  g_mutex_lock (&vtdec->queue_mutex);
+  vtdec->pause_task = FALSE;
+  g_mutex_unlock (&vtdec->queue_mutex);
+}
+
+static void
 setup_texture_cache (GstVtdec * vtdec, GstVideoFormat format)
 {
   GstVideoCodecState *output_state;
@@ -299,7 +446,7 @@
           return vfmt;
         break;
       case GST_VIDEO_FORMAT_RGBA64_LE:
-        if (GST_VTUTIL_HAVE_64RGBALE) {
+        if (GST_APPLEMEDIA_HAVE_64RGBALE) {
           if (prores)
             return vfmt;
         } else {
@@ -330,7 +477,7 @@
 
   vtdec = GST_VTDEC (decoder);
   if (vtdec->session)
-    gst_vtdec_push_frames_if_needed (vtdec, TRUE, FALSE);
+    gst_vtdec_drain_decoder (GST_VIDEO_DECODER_CAST (vtdec), FALSE);
 
   output_state = gst_video_decoder_get_output_state (GST_VIDEO_DECODER (vtdec));
   if (output_state) {
@@ -338,7 +485,22 @@
     gst_video_codec_state_unref (output_state);
   }
 
-  peercaps = gst_pad_peer_query_caps (GST_VIDEO_DECODER_SRC_PAD (vtdec), NULL);
+  templcaps =
+      gst_pad_get_pad_template_caps (GST_VIDEO_DECODER_SRC_PAD (decoder));
+  peercaps =
+      gst_pad_peer_query_caps (GST_VIDEO_DECODER_SRC_PAD (vtdec), templcaps);
+  gst_caps_unref (templcaps);
+
+  if (gst_caps_is_empty (peercaps)) {
+    GST_INFO_OBJECT (vtdec, "empty peer caps, can't negotiate");
+
+    gst_caps_unref (peercaps);
+    if (prevcaps)
+      gst_caps_unref (prevcaps);
+
+    return FALSE;
+  }
+
   if (prevcaps && gst_caps_can_intersect (prevcaps, peercaps)) {
     /* The hardware decoder can become (temporarily) unavailable across
      * VTDecompressionSessionCreate/Destroy calls. So if the currently configured
@@ -348,14 +510,10 @@
     GST_INFO_OBJECT (vtdec,
         "current and peer caps are compatible, keeping current caps");
     caps = gst_caps_ref (prevcaps);
+    gst_caps_unref (peercaps);
   } else {
-    templcaps =
-        gst_pad_get_pad_template_caps (GST_VIDEO_DECODER_SRC_PAD (decoder));
-    caps =
-        gst_caps_intersect_full (peercaps, templcaps, GST_CAPS_INTERSECT_FIRST);
-    gst_caps_unref (templcaps);
+    caps = peercaps;
   }
-  gst_caps_unref (peercaps);
 
   caps = gst_caps_truncate (gst_caps_make_writable (caps));
 
@@ -566,8 +724,7 @@
 
   gst_video_info_from_caps (&vtdec->video_info, state->caps);
 
-  if (!gst_vtdec_compute_reorder_queue_length (vtdec, cm_format,
-          state->codec_data))
+  if (!gst_vtdec_compute_dpb_size (vtdec, cm_format, state->codec_data))
     return FALSE;
   gst_vtdec_set_latency (vtdec);
 
@@ -586,7 +743,7 @@
     gst_video_codec_state_unref (vtdec->input_state);
   vtdec->input_state = gst_video_codec_state_ref (state);
 
-  return gst_video_decoder_negotiate (decoder);
+  return gst_vtdec_negotiate (decoder);
 }
 
 static gboolean
@@ -596,9 +753,8 @@
 
   GST_DEBUG_OBJECT (vtdec, "flush");
 
-  gst_vtdec_push_frames_if_needed (vtdec, FALSE, TRUE);
-
-  return TRUE;
+  return gst_vtdec_drain_decoder (GST_VIDEO_DECODER_CAST (vtdec),
+      TRUE) == GST_FLOW_OK;
 }
 
 static GstFlowReturn
@@ -608,7 +764,62 @@
 
   GST_DEBUG_OBJECT (vtdec, "finish");
 
-  return gst_vtdec_push_frames_if_needed (vtdec, TRUE, FALSE);
+  return gst_vtdec_drain_decoder (GST_VIDEO_DECODER_CAST (vtdec), FALSE);
+}
+
+static gboolean
+gst_vtdec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  GstVtdec *vtdec = GST_VTDEC (decoder);
+  GstEventType type = GST_EVENT_TYPE (event);
+  gboolean ret;
+
+  switch (type) {
+    case GST_EVENT_FLUSH_START:
+      GST_DEBUG_OBJECT (vtdec, "flush start received, setting flushing flag");
+
+      g_mutex_lock (&vtdec->queue_mutex);
+      vtdec->is_flushing = TRUE;
+      g_cond_signal (&vtdec->queue_cond);
+      g_mutex_unlock (&vtdec->queue_mutex);
+      break;
+    default:
+      break;
+  }
+
+  ret =
+      GST_VIDEO_DECODER_CLASS (gst_vtdec_parent_class)->sink_event (decoder,
+      event);
+
+  switch (type) {
+    case GST_EVENT_FLUSH_STOP:
+      /* The base class handles this event and calls _flush().
+       * We can then safely reset the flushing flag. */
+      GST_DEBUG_OBJECT (vtdec, "flush stop received, removing flushing flag");
+
+      g_mutex_lock (&vtdec->queue_mutex);
+      vtdec->is_flushing = FALSE;
+      g_mutex_unlock (&vtdec->queue_mutex);
+      break;
+    default:
+      break;
+  }
+
+  return ret;
+}
+
+static GstStateChangeReturn
+gst_vtdec_change_state (GstElement * element, GstStateChange transition)
+{
+  GstVtdec *self = GST_VTDEC (element);
+
+  if (transition == GST_STATE_CHANGE_PAUSED_TO_READY) {
+    GST_DEBUG_OBJECT (self, "pausing output loop on PAUSED->READY");
+    gst_vtdec_pause_output_loop (self);
+  }
+
+  return GST_ELEMENT_CLASS (gst_vtdec_parent_class)->change_state (element,
+      transition);
 }
 
 static GstFlowReturn
@@ -620,43 +831,95 @@
   GstVtdec *vtdec = GST_VTDEC (decoder);
   GstFlowReturn ret = GST_FLOW_OK;
   int decode_frame_number = frame->decode_frame_number;
+  GstTaskState task_state;
+  gboolean is_flushing;
 
   if (vtdec->format_description == NULL) {
     ret = GST_FLOW_NOT_NEGOTIATED;
-    goto out;
+    goto drop;
   }
 
-  GST_LOG_OBJECT (vtdec, "got input frame %d", decode_frame_number);
+  /* Negotiate now so that we know whether we need to use the GL upload meta or not. 
+   * gst_vtenc_negotiate() will drain before attempting to negotiate. */
+  if (gst_pad_check_reconfigure (decoder->srcpad)) {
+    if (!gst_vtdec_negotiate (decoder)) {
+      gst_pad_mark_reconfigure (decoder->srcpad);
+      if (GST_PAD_IS_FLUSHING (decoder->srcpad))
+        ret = GST_FLOW_FLUSHING;
+      else
+        ret = GST_FLOW_NOT_NEGOTIATED;
+      goto drop;
+    }
+  }
+
+  task_state = gst_pad_get_task_state (GST_VIDEO_DECODER_SRC_PAD (vtdec));
+  if (task_state == GST_TASK_STOPPED || task_state == GST_TASK_PAUSED) {
+    /* Abort if our loop failed to push frames downstream... */
+    if (vtdec->downstream_ret != GST_FLOW_OK) {
+      GST_DEBUG_OBJECT (vtdec,
+          "Output loop stopped because of %s, ignoring frame",
+          gst_flow_get_name (vtdec->downstream_ret));
+
+      ret = vtdec->downstream_ret;
+      goto drop;
+    }
+
+    /* ...or if it stopped because of the flushing flag while the queue
+     * was empty, in which case we didn't get GST_FLOW_FLUSHING... */
+    g_mutex_lock (&vtdec->queue_mutex);
+    is_flushing = vtdec->is_flushing;
+    g_mutex_unlock (&vtdec->queue_mutex);
+    if (is_flushing) {
+      GST_DEBUG_OBJECT (vtdec, "Flushing flag set, ignoring frame");
+      ret = GST_FLOW_FLUSHING;
+      goto drop;
+    }
 
-  ret = gst_vtdec_push_frames_if_needed (vtdec, FALSE, FALSE);
-  if (ret != GST_FLOW_OK)
-    return ret;
+    /* .. or if it refuses to resume - e.g. it was stopped instead of paused */
+    if (!gst_vtdec_ensure_output_loop (vtdec)) {
+      GST_ERROR_OBJECT (vtdec, "Output loop failed to resume");
+      ret = GST_FLOW_ERROR;
+      goto drop;
+    }
+  }
+
+  GST_LOG_OBJECT (vtdec, "got input frame %d", decode_frame_number);
 
   /* don't bother enabling kVTDecodeFrame_EnableTemporalProcessing at all since
    * it's not mandatory for the underlying VT codec to respect it. KISS and do
-   * reordering ourselves.
-   */
+   * reordering ourselves. */
   input_flags = kVTDecodeFrame_EnableAsynchronousDecompression;
 
   cm_sample_buffer =
       cm_sample_buffer_from_gst_buffer (vtdec, frame->input_buffer);
-  status =
-      VTDecompressionSessionDecodeFrame (vtdec->session, cm_sample_buffer,
+
+  /* We need to unlock the stream lock here because
+   * the decode call can wait until gst_vtdec_session_output_callback()
+   * is finished, which in turn can wait until there's space in the 
+   * output queue, which is being handled by the output loop, 
+   * which also uses the stream lock... */
+  GST_VIDEO_DECODER_STREAM_UNLOCK (vtdec);
+  status = VTDecompressionSessionDecodeFrame (vtdec->session, cm_sample_buffer,
       input_flags, frame, NULL);
-  if (status != noErr && FALSE)
-    goto error;
+  GST_VIDEO_DECODER_STREAM_LOCK (vtdec);
+
+  if (status != noErr) {
+    GST_VIDEO_DECODER_ERROR (vtdec, 1, STREAM, DECODE,
+        ("Failed to decode frame"),
+        ("VTDecompressionSessionDecodeFrame returned %d", (int) status), ret);
+    goto out;
+  }
 
   GST_LOG_OBJECT (vtdec, "submitted input frame %d", decode_frame_number);
+  frame = NULL;
 
 out:
   if (cm_sample_buffer)
     CFRelease (cm_sample_buffer);
   return ret;
 
-error:
-  GST_ELEMENT_ERROR (vtdec, STREAM, DECODE, (NULL),
-      ("VTDecompressionSessionDecodeFrame returned %d", (int) status));
-  ret = GST_FLOW_ERROR;
+drop:
+  gst_video_decoder_release_frame (decoder, frame);
   goto out;
 }
 
@@ -678,36 +941,10 @@
   VTDecompressionOutputCallbackRecord callback;
   CFMutableDictionaryRef videoDecoderSpecification;
   OSStatus status;
-  guint32 cv_format = 0;
+  guint32 cv_format = gst_video_format_to_cvpixelformat (format);
 
   g_return_val_if_fail (vtdec->session == NULL, FALSE);
 
-  switch (format) {
-    case GST_VIDEO_FORMAT_NV12:
-      cv_format = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
-      break;
-    case GST_VIDEO_FORMAT_AYUV64:
-/* This is fine for now because Apple only ships LE devices */
-#if G_BYTE_ORDER != G_LITTLE_ENDIAN
-#error "AYUV64 is NE but kCVPixelFormatType_4444AYpCbCr16 is LE"
-#endif
-      cv_format = kCVPixelFormatType_4444AYpCbCr16;
-      break;
-    case GST_VIDEO_FORMAT_ARGB64_BE:
-      cv_format = kCVPixelFormatType_64ARGB;
-      break;
-    case GST_VIDEO_FORMAT_RGBA64_LE:
-      if (GST_VTUTIL_HAVE_64RGBALE)
-        cv_format = kCVPixelFormatType_64RGBALE;
-      else
-        /* Codepath will never be hit on macOS older than Big Sur (11.3) */
-        g_warn_if_reached ();
-      break;
-    default:
-      g_warn_if_reached ();
-      break;
-  }
-
   videoDecoderSpecification =
       CFDictionaryCreateMutable (NULL, 0, &kCFTypeDictionaryKeyCallBacks,
       &kCFTypeDictionaryValueCallBacks);
@@ -970,6 +1207,7 @@
   GstVtdec *vtdec = (GstVtdec *) decompression_output_ref_con;
   GstVideoCodecFrame *frame = (GstVideoCodecFrame *) source_frame_ref_con;
   GstVideoCodecState *state;
+  gboolean push_anyway = FALSE;
 
   GST_LOG_OBJECT (vtdec, "got output frame %p %d and VT buffer %p", frame,
       frame->decode_frame_number, image_buffer);
@@ -977,7 +1215,30 @@
   frame->output_buffer = NULL;
 
   if (status != noErr) {
-    GST_ERROR_OBJECT (vtdec, "Error decoding frame %d", (int) status);
+    switch (status) {
+      case kVTVideoDecoderReferenceMissingErr:
+        /* ReferenceMissingErr is not critical, when it occurs the frame
+         * usually has the kVTDecodeInfo_FrameDropped flag set. Log only for debugging purposes. */
+        GST_DEBUG_OBJECT (vtdec, "ReferenceMissingErr when decoding frame %d",
+            frame->decode_frame_number);
+        break;
+#ifndef HAVE_IOS
+      case codecBadDataErr:    /* SW decoder on macOS uses a different code from the hardware one... */
+#endif
+      case kVTVideoDecoderBadDataErr:
+        /* BadDataErr also shouldn't cause an error to be displayed immediately.
+         * Set the error flag so the output loop will log a warning
+         * and only error out if this happens too many times. */
+        GST_DEBUG_OBJECT (vtdec, "BadDataErr when decoding frame %d",
+            frame->decode_frame_number);
+        frame->flags |= VTDEC_FRAME_FLAG_ERROR;
+        break;
+      default:
+        GST_ERROR_OBJECT (vtdec, "Error decoding frame %d: %d",
+            frame->decode_frame_number, (int) status);
+        frame->flags |= VTDEC_FRAME_FLAG_ERROR;
+        break;
+    }
   }
 
   if (image_buffer) {
@@ -999,8 +1260,8 @@
     }
   } else {
     if (info_flags & kVTDecodeInfo_FrameDropped) {
-      GST_DEBUG_OBJECT (vtdec, "Frame dropped by video toolbox %p %d",
-          frame, frame->decode_frame_number);
+      GST_DEBUG_OBJECT (vtdec, "Frame %d dropped by VideoToolbox (%p)",
+          frame->decode_frame_number, frame);
       frame->flags |= VTDEC_FRAME_FLAG_DROP;
     } else {
       GST_DEBUG_OBJECT (vtdec, "Decoded frame is NULL");
@@ -1008,62 +1269,87 @@
     }
   }
 
-  g_async_queue_push_sorted (vtdec->reorder_queue, frame,
-      sort_frames_by_pts, NULL);
+  /* Limit the amount of frames in our output queue
+   * to avoid processing too many frames ahead.
+   * The DPB * 2 size limit is completely arbitrary. */
+  g_mutex_lock (&vtdec->queue_mutex);
+  /* If negotiate() gets called from the output loop (via finish_frame()),
+   * it can attempt to drain and call VTDecompressionSessionWaitForAsynchronousFrames,
+   * which will lock up if we decide to wait in this callback, creating a deadlock. */
+  push_anyway = vtdec->is_flushing || vtdec->is_draining;
+  while (!push_anyway
+      && gst_queue_array_get_length (vtdec->reorder_queue) >
+      vtdec->dbp_size * 2 + 1) {
+    g_cond_wait (&vtdec->queue_cond, &vtdec->queue_mutex);
+    push_anyway = vtdec->is_flushing || vtdec->is_draining;
+  }
+
+  gst_queue_array_push_sorted (vtdec->reorder_queue, frame, sort_frames_by_pts,
+      NULL);
+  GST_LOG ("pushed frame %d, queue length %d", frame->decode_frame_number,
+      gst_queue_array_get_length (vtdec->reorder_queue));
+  g_cond_signal (&vtdec->queue_cond);
+  g_mutex_unlock (&vtdec->queue_mutex);
 }
 
 static GstFlowReturn
-gst_vtdec_push_frames_if_needed (GstVtdec * vtdec, gboolean drain,
-    gboolean flush)
+gst_vtdec_drain_decoder (GstVideoDecoder * decoder, gboolean flush)
 {
-  GstVideoCodecFrame *frame;
-  GstFlowReturn ret = GST_FLOW_OK;
-  GstVideoDecoder *decoder = GST_VIDEO_DECODER (vtdec);
+  GstVtdec *vtdec = GST_VTDEC (decoder);
+  OSStatus vt_status;
 
-  /* negotiate now so that we know whether we need to use the GL upload meta or
-   * not */
-  if (gst_pad_check_reconfigure (decoder->srcpad)) {
-    if (!gst_video_decoder_negotiate (decoder)) {
-      gst_pad_mark_reconfigure (decoder->srcpad);
-      if (GST_PAD_IS_FLUSHING (decoder->srcpad))
-        ret = GST_FLOW_FLUSHING;
-      else
-        ret = GST_FLOW_NOT_NEGOTIATED;
-      return ret;
-    }
-  }
+  GST_DEBUG_OBJECT (vtdec, "drain_decoder, flushing: %d", flush);
 
-  if (drain || flush)
-    VTDecompressionSessionWaitForAsynchronousFrames (vtdec->session);
+  /* In case of EOS before the first buffer/caps */
+  if (vtdec->session == NULL)
+    return GST_FLOW_OK;
 
-  /* push a buffer if there are enough frames to guarantee that we push in PTS
-   * order
-   */
-  while ((g_async_queue_length (vtdec->reorder_queue) >=
-          vtdec->reorder_queue_length) || drain || flush) {
-    frame = (GstVideoCodecFrame *) g_async_queue_try_pop (vtdec->reorder_queue);
+  /* Only early-return here if we're draining (as that needs to output frames).
+   * Flushing doesn't care about errors from downstream. */
+  if (!flush && vtdec->downstream_ret != GST_FLOW_OK
+      && vtdec->downstream_ret != GST_FLOW_FLUSHING) {
+    GST_WARNING_OBJECT (vtdec, "Output loop stopped with error (%s), leaving",
+        gst_flow_get_name (vtdec->downstream_ret));
+    return vtdec->downstream_ret;
+  }
 
-    /* we need to check this in case reorder_queue_length=0 (jpeg for
-     * example) or we're draining/flushing
-     */
-    if (frame) {
-      if (frame->flags & VTDEC_FRAME_FLAG_ERROR) {
-        gst_video_decoder_release_frame (decoder, frame);
-        ret = GST_FLOW_ERROR;
-      } else if (flush || frame->flags & VTDEC_FRAME_FLAG_SKIP) {
-        gst_video_decoder_release_frame (decoder, frame);
-      } else if (frame->flags & VTDEC_FRAME_FLAG_DROP) {
-        gst_video_decoder_drop_frame (decoder, frame);
-      } else {
-        ret = gst_video_decoder_finish_frame (decoder, frame);
-      }
-    }
+  g_mutex_lock (&vtdec->queue_mutex);
+  if (flush)
+    vtdec->is_flushing = TRUE;
+  else
+    vtdec->is_draining = TRUE;
+  g_cond_signal (&vtdec->queue_cond);
+  g_mutex_unlock (&vtdec->queue_mutex);
 
-    if (!frame || ret != GST_FLOW_OK)
-      break;
+  if (!gst_vtdec_ensure_output_loop (vtdec)) {
+    GST_ERROR_OBJECT (vtdec, "Output loop failed to resume");
+    return GST_FLOW_ERROR;
   }
 
-  return ret;
+  GST_VIDEO_DECODER_STREAM_UNLOCK (vtdec);
+  vt_status = VTDecompressionSessionWaitForAsynchronousFrames (vtdec->session);
+  if (vt_status != noErr) {
+    GST_WARNING_OBJECT (vtdec,
+        "VTDecompressionSessionWaitForAsynchronousFrames returned %d",
+        (int) vt_status);
+  }
+
+  gst_vtdec_pause_output_loop (vtdec);
+  GST_VIDEO_DECODER_STREAM_LOCK (vtdec);
+
+  /* Only reset the draining flag here,
+   * is_flushing will be reset in sink_event() */
+  if (vtdec->is_draining)
+    vtdec->is_draining = FALSE;
+
+  if (vtdec->downstream_ret == GST_FLOW_OK)
+    GST_DEBUG_OBJECT (vtdec, "buffer queue cleaned");
+  else
+    GST_DEBUG_OBJECT (vtdec,
+        "buffer queue not cleaned, output thread returned %s",
+        gst_flow_get_name (vtdec->downstream_ret));
+
+  return vtdec->downstream_ret;
 }
 
 static int
@@ -1105,25 +1391,24 @@
 }
 
 static gboolean
-gst_vtdec_compute_reorder_queue_length (GstVtdec * vtdec,
+gst_vtdec_compute_dpb_size (GstVtdec * vtdec,
     CMVideoCodecType cm_format, GstBuffer * codec_data)
 {
   if (cm_format == kCMVideoCodecType_H264) {
-    if (!compute_h264_decode_picture_buffer_length (vtdec, codec_data,
-            &vtdec->reorder_queue_length)) {
+    if (!compute_h264_decode_picture_buffer_size (vtdec, codec_data,
+            &vtdec->dbp_size)) {
       return FALSE;
     }
   } else if (cm_format == kCMVideoCodecType_HEVC) {
-    if (!compute_hevc_decode_picture_buffer_length (vtdec, codec_data,
-            &vtdec->reorder_queue_length)) {
+    if (!compute_hevc_decode_picture_buffer_size (vtdec, codec_data,
+            &vtdec->dbp_size)) {
       return FALSE;
     }
   } else {
-    vtdec->reorder_queue_length = 0;
+    vtdec->dbp_size = 0;
   }
 
-  GST_DEBUG_OBJECT (vtdec, "Reorder queue length: %d",
-      vtdec->reorder_queue_length);
+  GST_DEBUG_OBJECT (vtdec, "Calculated DPB size: %d", vtdec->dbp_size);
   return TRUE;
 }
 
@@ -1200,7 +1485,7 @@
 }
 
 static gboolean
-compute_h264_decode_picture_buffer_length (GstVtdec * vtdec,
+compute_h264_decode_picture_buffer_size (GstVtdec * vtdec,
     GstBuffer * codec_data, gint * length)
 {
   GstH264DecoderConfigRecord *config = NULL;
@@ -1245,7 +1530,7 @@
 }
 
 static gboolean
-compute_hevc_decode_picture_buffer_length (GstVtdec * vtdec,
+compute_hevc_decode_picture_buffer_size (GstVtdec * vtdec,
     GstBuffer * codec_data, int *length)
 {
   /* This value should be level dependent (table A.8)
@@ -1285,10 +1570,10 @@
 
   frame_duration = gst_util_uint64_scale (GST_SECOND,
       vtdec->video_info.fps_d, vtdec->video_info.fps_n);
-  latency = frame_duration * vtdec->reorder_queue_length;
+  latency = frame_duration * vtdec->dbp_size;
 
   GST_INFO_OBJECT (vtdec, "setting latency frames:%d time:%" GST_TIME_FORMAT,
-      vtdec->reorder_queue_length, GST_TIME_ARGS (latency));
+      vtdec->dbp_size, GST_TIME_ARGS (latency));
   gst_video_decoder_set_latency (GST_VIDEO_DECODER (vtdec), latency, latency);
 }

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/vtdec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/vtdec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/vtenc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/vtenc.c Changed

@@ -69,6 +69,7 @@
 #include "coremediabuffer.h"
 #include "corevideobuffer.h"
 #include "vtutil.h"
+#include "helpers.h"
 #include <gst/pbutils/codec-utils.h>
 #include <sys/sysctl.h>
 
@@ -79,6 +80,7 @@
 #define VTENC_DEFAULT_MAX_KEYFRAME_INTERVAL 0
 #define VTENC_DEFAULT_MAX_KEYFRAME_INTERVAL_DURATION 0
 #define VTENC_DEFAULT_PRESERVE_ALPHA TRUE
+#define VTENC_OUTPUT_QUEUE_SIZE 3
 
 GST_DEBUG_CATEGORY (gst_vtenc_debug);
 #define GST_CAT_DEFAULT (gst_vtenc_debug)
@@ -109,7 +111,7 @@
 #ifdef HAVE_VIDEOTOOLBOX_10_9_6
 extern OSStatus
 VTCompressionSessionPrepareToEncodeFrames (VTCompressionSessionRef session)
-    __attribute__ ((weak_import));
+    __attribute__((weak_import));
 #endif
 
 /* This property key is currently completely undocumented. The only way you can
@@ -149,15 +151,16 @@
 
 static gboolean gst_vtenc_start (GstVideoEncoder * enc);
 static gboolean gst_vtenc_stop (GstVideoEncoder * enc);
+static void gst_vtenc_loop (GstVTEnc * self);
 static gboolean gst_vtenc_set_format (GstVideoEncoder * enc,
     GstVideoCodecState * input_state);
 static GstFlowReturn gst_vtenc_handle_frame (GstVideoEncoder * enc,
     GstVideoCodecFrame * frame);
+static GstStateChangeReturn gst_vtenc_change_state (GstElement * element,
+    GstStateChange transition);
 static GstFlowReturn gst_vtenc_finish (GstVideoEncoder * enc);
 static gboolean gst_vtenc_flush (GstVideoEncoder * enc);
-
-static void gst_vtenc_clear_cached_caps_downstream (GstVTEnc * self);
-
+static gboolean gst_vtenc_sink_event (GstVideoEncoder * enc, GstEvent * event);
 static VTCompressionSessionRef gst_vtenc_create_session (GstVTEnc * self);
 static void gst_vtenc_destroy_session (GstVTEnc * self,
     VTCompressionSessionRef * session);
@@ -260,7 +263,7 @@
     if (enable_argb) {
       caps = gst_vtutil_caps_append_video_format (caps, "ARGB64_BE");
       /* RGBA64_LE is kCVPixelFormatType_64RGBALE, only available on macOS 11.3+ */
-      if (GST_VTUTIL_HAVE_64RGBALE)
+      if (GST_APPLEMEDIA_HAVE_64RGBALE)
         caps = gst_vtutil_caps_append_video_format (caps, "RGBA64_LE");
     }
 #endif
@@ -341,9 +344,11 @@
 gst_vtenc_class_init (GstVTEncClass * klass)
 {
   GObjectClass *gobject_class;
+  GstElementClass *element_class;
   GstVideoEncoderClass *gstvideoencoder_class;
 
   gobject_class = (GObjectClass *) klass;
+  element_class = (GstElementClass *) klass;
   gstvideoencoder_class = (GstVideoEncoderClass *) klass;
 
   parent_class = g_type_class_peek_parent (klass);
@@ -352,12 +357,15 @@
   gobject_class->set_property = gst_vtenc_set_property;
   gobject_class->finalize = gst_vtenc_finalize;
 
+  element_class->change_state = GST_DEBUG_FUNCPTR (gst_vtenc_change_state);
+
   gstvideoencoder_class->start = gst_vtenc_start;
   gstvideoencoder_class->stop = gst_vtenc_stop;
   gstvideoencoder_class->set_format = gst_vtenc_set_format;
   gstvideoencoder_class->handle_frame = gst_vtenc_handle_frame;
   gstvideoencoder_class->finish = gst_vtenc_finish;
   gstvideoencoder_class->flush = gst_vtenc_flush;
+  gstvideoencoder_class->sink_event = gst_vtenc_sink_event;
 
   g_object_class_install_property (gobject_class, PROP_BITRATE,
       g_param_spec_uint ("bitrate", "Bitrate",
@@ -438,6 +446,9 @@
       CFDictionaryCreate (NULL, (const void **) keyframe_props_keys,
       (const void **) keyframe_props_values, G_N_ELEMENTS (keyframe_props_keys),
       &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+
+  g_mutex_init (&self->queue_mutex);
+  g_cond_init (&self->queue_cond);
 }
 
 static void
@@ -446,6 +457,8 @@
   GstVTEnc *self = GST_VTENC_CAST (obj);
 
   CFRelease (self->keyframe_props);
+  g_mutex_clear (&self->queue_mutex);
+  g_cond_clear (&self->queue_cond);
 
   G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
@@ -666,15 +679,69 @@
   }
 }
 
+static gboolean
+gst_vtenc_ensure_output_loop (GstVTEnc * self)
+{
+  GstPad *pad = GST_VIDEO_ENCODER_SRC_PAD (self);
+  GstTask *task = GST_PAD_TASK (pad);
+
+  return gst_task_resume (task);
+}
+
+static void
+gst_vtenc_pause_output_loop (GstVTEnc * self)
+{
+  g_mutex_lock (&self->queue_mutex);
+  self->pause_task = TRUE;
+  g_cond_signal (&self->queue_cond);
+  g_mutex_unlock (&self->queue_mutex);
+
+  gst_pad_pause_task (GST_VIDEO_ENCODER_SRC_PAD (self));
+  GST_DEBUG_OBJECT (self, "paused output thread");
+
+  g_mutex_lock (&self->queue_mutex);
+  self->pause_task = FALSE;
+  g_mutex_unlock (&self->queue_mutex);
+}
+
+static void
+gst_vtenc_set_flushing_flag (GstVTEnc * self)
+{
+  g_mutex_lock (&self->queue_mutex);
+  self->is_flushing = TRUE;
+  g_cond_signal (&self->queue_cond);
+  g_mutex_unlock (&self->queue_mutex);
+}
+
 static GstFlowReturn
 gst_vtenc_finish_encoding (GstVTEnc * self, gboolean is_flushing)
 {
   GST_DEBUG_OBJECT (self,
       "complete encoding and clean buffer queue, is flushing %d", is_flushing);
-  GstVideoCodecFrame *outframe;
-  GstFlowReturn ret = GST_FLOW_OK;
   OSStatus vt_status;
 
+  /* In case of EOS before the first buffer/caps */
+  if (self->session == NULL)
+    return GST_FLOW_OK;
+
+  /* If output loop failed to push things downstream */
+  if (self->downstream_ret != GST_FLOW_OK
+      && self->downstream_ret != GST_FLOW_FLUSHING) {
+    /* Tells enqueue_buffer() to instantly discard any new encoded frames */
+    gst_vtenc_set_flushing_flag (self);
+    GST_WARNING_OBJECT (self, "Output loop stopped with error (%s), leaving",
+        gst_flow_get_name (self->downstream_ret));
+    return self->downstream_ret;
+  }
+
+  if (is_flushing)
+    gst_vtenc_set_flushing_flag (self);
+
+  if (!gst_vtenc_ensure_output_loop (self)) {
+    GST_ERROR_OBJECT (self, "Output loop failed to resume");
+    return GST_FLOW_ERROR;
+  }
+
   /* We need to unlock the stream lock here because
    * it can wait for gst_vtenc_enqueue_buffer() to
    * handle a buffer... which will take the stream
@@ -685,29 +752,22 @@
       VTCompressionSessionCompleteFrames (self->session,
       kCMTimePositiveInfinity);
   GST_DEBUG_OBJECT (self, "VTCompressionSessionCompleteFrames ended");
-  GST_VIDEO_ENCODER_STREAM_LOCK (self);
   if (vt_status != noErr) {
     GST_WARNING_OBJECT (self, "VTCompressionSessionCompleteFrames returned %d",
         (int) vt_status);
   }
 
-  while ((outframe = g_async_queue_try_pop (self->cur_outframes))) {
-    if (is_flushing) {
-      GST_DEBUG_OBJECT (self, "flushing frame number %d",
-          outframe->system_frame_number);
-      gst_video_codec_frame_unref (outframe);
-    } else {
-      GST_DEBUG_OBJECT (self, "finish frame number %d",
-          outframe->system_frame_number);
-      ret =
-          gst_video_encoder_finish_frame (GST_VIDEO_ENCODER_CAST (self),
-          outframe);
-    }
-  }
+  gst_vtenc_pause_output_loop (self);
+  GST_VIDEO_ENCODER_STREAM_LOCK (self);
 
-  GST_DEBUG_OBJECT (self, "buffer queue cleaned");
+  if (self->downstream_ret == GST_FLOW_OK)
+    GST_DEBUG_OBJECT (self, "buffer queue cleaned");
+  else
+    GST_DEBUG_OBJECT (self,
+        "buffer queue not cleaned, output thread returned %s",
+        gst_flow_get_name (self->downstream_ret));
 
-  return ret;
+  return self->downstream_ret;
 }
 
 static gboolean
@@ -718,7 +778,24 @@
   /* DTS can be negative if b-frames are enabled */
   gst_video_encoder_set_min_pts (enc, GST_SECOND * 60 * 60 * 1000);
 
-  self->cur_outframes = g_async_queue_new ();
+  self->is_flushing = FALSE;
+  self->downstream_ret = GST_FLOW_OK;
+
+  self->output_queue = gst_queue_array_new (VTENC_OUTPUT_QUEUE_SIZE);
+  /* Set clear_func to unref all remaining frames in gst_queue_array_free() */
+  gst_queue_array_set_clear_func (self->output_queue,
+      (GDestroyNotify) gst_video_codec_frame_unref);
+
+  /* Create the output task, but pause it immediately */
+  self->pause_task = TRUE;
+  if (!gst_pad_start_task (GST_VIDEO_ENCODER_SRC_PAD (enc),
+          (GstTaskFunction) gst_vtenc_loop, self, NULL)) {
+    GST_ERROR_OBJECT (self, "failed to start output thread");
+    return FALSE;
+  }
+  /* This blocks until the loop actually pauses */
+  gst_pad_pause_task (GST_VIDEO_ENCODER_SRC_PAD (enc));
+  self->pause_task = FALSE;
 
   return TRUE;
 }
@@ -730,12 +807,18 @@
 
   GST_VIDEO_ENCODER_STREAM_LOCK (self);
   gst_vtenc_flush (enc);
+  self->downstream_ret = GST_FLOW_FLUSHING;
   GST_VIDEO_ENCODER_STREAM_UNLOCK (self);
 
+  gst_pad_stop_task (GST_VIDEO_ENCODER_SRC_PAD (enc));
+
   GST_OBJECT_LOCK (self);
   gst_vtenc_destroy_session (self, &self->session);
   GST_OBJECT_UNLOCK (self);
 
+  self->negotiate_downstream = TRUE;
+  self->is_flushing = TRUE;
+
   if (self->profile_level)
     CFRelease (self->profile_level);
   self->profile_level = NULL;
@@ -747,10 +830,8 @@
   self->video_info.width = self->video_info.height = 0;
   self->video_info.fps_n = self->video_info.fps_d = 0;
 
-  gst_vtenc_clear_cached_caps_downstream (self);
-
-  g_async_queue_unref (self->cur_outframes);
-  self->cur_outframes = NULL;
+  gst_queue_array_free (self->output_queue);
+  self->output_queue = NULL;
 
   return TRUE;
 }
@@ -924,17 +1005,22 @@
   GstVTEnc *self = GST_VTENC_CAST (enc);
   VTCompressionSessionRef session;
 
-  if (self->input_state)
+  if (self->input_state) {
+    gst_vtenc_finish_encoding (self, FALSE);
     gst_video_codec_state_unref (self->input_state);
-  self->input_state = gst_video_codec_state_ref (state);
-
-  self->video_info = state->info;
+  }
 
   GST_OBJECT_LOCK (self);
   gst_vtenc_destroy_session (self, &self->session);
   GST_OBJECT_UNLOCK (self);
 
-  gst_vtenc_negotiate_specific_format_details (enc);
+  self->input_state = gst_video_codec_state_ref (state);
+  self->video_info = state->info;
+
+  if (!gst_vtenc_negotiate_specific_format_details (enc))
+    return FALSE;
+
+  self->negotiate_downstream = TRUE;
 
   session = gst_vtenc_create_session (self);
   GST_OBJECT_LOCK (self);
@@ -947,7 +1033,7 @@
 static gboolean
 gst_vtenc_is_negotiated (GstVTEnc * self)
 {
-  return self->video_info.width != 0;
+  return self->session && self->video_info.width != 0;
 }
 
 /*
@@ -980,13 +1066,6 @@
   GstStructure *s;
   GstVideoCodecState *state;
 
-  if (self->caps_width == self->video_info.width &&
-      self->caps_height == self->video_info.height &&
-      self->caps_fps_n == self->video_info.fps_n &&
-      self->caps_fps_d == self->video_info.fps_d) {
-    return TRUE;
-  }
-
   caps = gst_pad_get_pad_template_caps (GST_VIDEO_ENCODER_SRC_PAD (self));
   caps = gst_caps_make_writable (caps);
   s = gst_caps_get_structure (caps, 0);
@@ -1061,21 +1140,9 @@
   gst_video_codec_state_unref (state);
   result = gst_video_encoder_negotiate (GST_VIDEO_ENCODER_CAST (self));
 
-  self->caps_width = self->video_info.width;
-  self->caps_height = self->video_info.height;
-  self->caps_fps_n = self->video_info.fps_n;
-  self->caps_fps_d = self->video_info.fps_d;
-
   return result;
 }
 
-static void
-gst_vtenc_clear_cached_caps_downstream (GstVTEnc * self)
-{
-  self->caps_width = self->caps_height = 0;
-  self->caps_fps_n = self->caps_fps_d = 0;
-}
-
 static GstFlowReturn
 gst_vtenc_handle_frame (GstVideoEncoder * enc, GstVideoCodecFrame * frame)
 {
@@ -1091,6 +1158,58 @@
   return GST_FLOW_NOT_NEGOTIATED;
 }
 
+static gboolean
+gst_vtenc_sink_event (GstVideoEncoder * enc, GstEvent * event)
+{
+  GstVTEnc *self = GST_VTENC_CAST (enc);
+  GstEventType type = GST_EVENT_TYPE (event);
+  gboolean ret;
+
+  switch (type) {
+    case GST_EVENT_FLUSH_START:
+      GST_DEBUG_OBJECT (self, "flush start received, setting flushing flag");
+
+      g_mutex_lock (&self->queue_mutex);
+      self->is_flushing = TRUE;
+      g_cond_signal (&self->queue_cond);
+      g_mutex_unlock (&self->queue_mutex);
+      break;
+    default:
+      break;
+  }
+
+  ret = GST_VIDEO_ENCODER_CLASS (parent_class)->sink_event (enc, event);
+
+  switch (type) {
+    case GST_EVENT_FLUSH_STOP:
+      /* The base class handles this event and calls _flush().
+       * We can then safely reset the flushing flag. */
+      GST_DEBUG_OBJECT (self, "flush stop received, removing flushing flag");
+
+      g_mutex_lock (&self->queue_mutex);
+      self->is_flushing = FALSE;
+      g_mutex_unlock (&self->queue_mutex);
+      break;
+    default:
+      break;
+  }
+
+  return ret;
+}
+
+static GstStateChangeReturn
+gst_vtenc_change_state (GstElement * element, GstStateChange transition)
+{
+  GstVTEnc *self = GST_VTENC_CAST (element);
+
+  if (transition == GST_STATE_CHANGE_PAUSED_TO_READY) {
+    GST_DEBUG_OBJECT (self, "pausing output loop on PAUSED->READY");
+    gst_vtenc_pause_output_loop (self);
+  }
+
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+}
+
 static GstFlowReturn
 gst_vtenc_finish (GstVideoEncoder * enc)
 {
@@ -1218,7 +1337,6 @@
   }
 }
 
-
 static gboolean
 gst_vtenc_compute_dts_offset (GstVTEnc * self, gint fps_n, gint fps_d)
 {
@@ -1641,11 +1759,48 @@
   CMTime ts, duration;
   GstCoreMediaMeta *meta;
   CVPixelBufferRef pbuf = NULL;
-  GstVideoCodecFrame *outframe;
   OSStatus vt_status;
   GstFlowReturn ret = GST_FLOW_OK;
-  gboolean renegotiated;
   CFDictionaryRef frame_props = NULL;
+  GstTaskState task_state;
+  gboolean is_flushing;
+
+  /* If this condition changes later while we're still in this function,
+   * it'll just fail on next frame encode or in _finish() */
+  task_state = gst_pad_get_task_state (GST_VIDEO_ENCODER_SRC_PAD (self));
+  if (task_state == GST_TASK_STOPPED || task_state == GST_TASK_PAUSED) {
+    /* Abort if our loop failed to push frames downstream... */
+    if (self->downstream_ret != GST_FLOW_OK) {
+      if (self->downstream_ret == GST_FLOW_FLUSHING)
+        GST_DEBUG_OBJECT (self,
+            "Output loop stopped because of flushing, ignoring frame");
+      else
+        GST_WARNING_OBJECT (self,
+            "Output loop stopped with error (%s), leaving",
+            gst_flow_get_name (self->downstream_ret));
+
+      ret = self->downstream_ret;
+      goto drop;
+    }
+
+    /* ...or if it stopped because of the flushing flag while the queue
+     * was empty, in which case we didn't get GST_FLOW_FLUSHING... */
+    g_mutex_lock (&self->queue_mutex);
+    is_flushing = self->is_flushing;
+    g_mutex_unlock (&self->queue_mutex);
+    if (is_flushing) {
+      GST_DEBUG_OBJECT (self, "Flushing flag set, ignoring frame");
+      ret = GST_FLOW_FLUSHING;
+      goto drop;
+    }
+
+    /* .. or if it refuses to resume - e.g. it was stopped instead of paused */
+    if (!gst_vtenc_ensure_output_loop (self)) {
+      GST_ERROR_OBJECT (self, "Output loop failed to resume");
+      ret = GST_FLOW_ERROR;
+      goto drop;
+    }
+  }
 
   if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame)) {
     GST_INFO_OBJECT (self, "received force-keyframe-event, will force intra");
@@ -1693,25 +1848,15 @@
   if (pbuf == NULL) {
     GstVideoFrame inframe, outframe;
     GstBuffer *outbuf;
-    OSType pixel_format_type;
     CVReturn cv_ret;
+    OSType pixel_format_type =
+        gst_video_format_to_cvpixelformat (GST_VIDEO_INFO_FORMAT
+        (&self->video_info));
 
     /* FIXME: iOS has special stride requirements that we don't know yet.
      * Copy into a newly allocated pixelbuffer for now. Probably makes
      * sense to create a buffer pool around these at some point.
      */
-
-    switch (GST_VIDEO_INFO_FORMAT (&self->video_info)) {
-      case GST_VIDEO_FORMAT_I420:
-        pixel_format_type = kCVPixelFormatType_420YpCbCr8Planar;
-        break;
-      case GST_VIDEO_FORMAT_NV12:
-        pixel_format_type = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
-        break;
-      default:
-        g_assert_not_reached ();
-    }
-
     if (!gst_video_frame_map (&inframe, &self->video_info, frame->input_buffer,
             GST_MAP_READ)) {
       GST_ERROR_OBJECT (self, "failed to map input buffer");
@@ -1763,12 +1908,14 @@
     }
 
     {
+      OSType pixel_format_type =
+          gst_video_format_to_cvpixelformat (GST_VIDEO_INFO_FORMAT
+          (&self->video_info));
       const size_t num_planes = GST_VIDEO_FRAME_N_PLANES (&vframe->videoframe);
       void *plane_base_addressesGST_VIDEO_MAX_PLANES;
       size_t plane_widthsGST_VIDEO_MAX_PLANES;
       size_t plane_heightsGST_VIDEO_MAX_PLANES;
       size_t plane_bytes_per_rowGST_VIDEO_MAX_PLANES;
-      OSType pixel_format_type;
       size_t i;
 
       for (i = 0; i < num_planes; i++) {
@@ -1782,37 +1929,6 @@
             GST_VIDEO_FRAME_COMP_STRIDE (&vframe->videoframe, i);
       }
 
-      switch (GST_VIDEO_INFO_FORMAT (&self->video_info)) {
-        case GST_VIDEO_FORMAT_ARGB64_BE:
-          pixel_format_type = kCVPixelFormatType_64ARGB;
-          break;
-        case GST_VIDEO_FORMAT_AYUV64:
-/* This is fine for now because Apple only ships LE devices */
-#if G_BYTE_ORDER != G_LITTLE_ENDIAN
-#error "AYUV64 is NE but kCVPixelFormatType_4444AYpCbCr16 is LE"
-#endif
-          pixel_format_type = kCVPixelFormatType_4444AYpCbCr16;
-          break;
-        case GST_VIDEO_FORMAT_RGBA64_LE:
-          if (GST_VTUTIL_HAVE_64RGBALE)
-            pixel_format_type = kCVPixelFormatType_64RGBALE;
-          else
-            /* Codepath will never be hit on macOS older than Big Sur (11.3) */
-            g_assert_not_reached ();
-          break;
-        case GST_VIDEO_FORMAT_I420:
-          pixel_format_type = kCVPixelFormatType_420YpCbCr8Planar;
-          break;
-        case GST_VIDEO_FORMAT_NV12:
-          pixel_format_type = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
-          break;
-        case GST_VIDEO_FORMAT_UYVY:
-          pixel_format_type = kCVPixelFormatType_422YpCbCr8;
-          break;
-        default:
-          g_assert_not_reached ();
-      }
-
       cv_ret = CVPixelBufferCreateWithPlanarBytes (NULL,
           self->video_info.width, self->video_info.height,
           pixel_format_type,
@@ -1850,38 +1966,16 @@
   }
 
   gst_video_codec_frame_unref (frame);
-
   CVPixelBufferRelease (pbuf);
 
-  renegotiated = FALSE;
-  while ((outframe = g_async_queue_try_pop (self->cur_outframes))) {
-    if (outframe->output_buffer) {
-      if (!renegotiated) {
-        meta = gst_buffer_get_core_media_meta (outframe->output_buffer);
-        /* Try to renegotiate once */
-        if (meta) {
-          if (gst_vtenc_negotiate_downstream (self, meta->sample_buf)) {
-            renegotiated = TRUE;
-          } else {
-            ret = GST_FLOW_NOT_NEGOTIATED;
-            gst_video_codec_frame_unref (outframe);
-            /* the rest of the frames will be pop'd and unref'd later */
-            break;
-          }
-        }
-      }
-
-      gst_vtenc_update_latency (self);
-    }
+  return ret;
 
-    /* releases frame, even if it has no output buffer (i.e. failed to encode) */
-    ret =
-        gst_video_encoder_finish_frame (GST_VIDEO_ENCODER_CAST (self),
-        outframe);
+drop:
+  {
+    gst_video_codec_frame_unref (frame);
+    return ret;
   }
 
-  return ret;
-
 cv_error:
   {
     gst_video_codec_frame_unref (frame);
@@ -1896,8 +1990,8 @@
     VTEncodeInfoFlags infoFlags, CMSampleBufferRef sampleBuffer)
 {
   GstVTEnc *self = outputCallbackRefCon;
-  gboolean is_keyframe;
   GstVideoCodecFrame *frame;
+  gboolean is_flushing;
 
   frame =
       gst_video_encoder_get_frame (GST_VIDEO_ENCODER_CAST (self),
@@ -1920,16 +2014,21 @@
     goto beach;
   }
 
+  g_mutex_lock (&self->queue_mutex);
+  is_flushing = self->is_flushing;
+  g_mutex_unlock (&self->queue_mutex);
+  if (is_flushing) {
+    GST_DEBUG_OBJECT (self, "Ignoring frame %d because we're flushing",
+        frame->system_frame_number);
+    goto beach;
+  }
+
   /* This may happen if we don't have enough bitrate */
   if (sampleBuffer == NULL)
     goto beach;
 
-  is_keyframe = gst_vtenc_buffer_is_keyframe (self, sampleBuffer);
-
-  if (is_keyframe) {
+  if (gst_vtenc_buffer_is_keyframe (self, sampleBuffer))
     GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
-    gst_vtenc_clear_cached_caps_downstream (self);
-  }
 
   /* We are dealing with block buffers here, so we don't need
    * to enable the use of the video meta API on the core media buffer */
@@ -1937,10 +2036,128 @@
 
   gst_vtenc_update_timestamps (self, frame, sampleBuffer);
 
+  /* Limit the amount of frames in our output queue
+   * to avoid processing too many frames ahead */
+  g_mutex_lock (&self->queue_mutex);
+  while (gst_queue_array_get_length (self->output_queue) >
+      VTENC_OUTPUT_QUEUE_SIZE) {
+    g_cond_wait (&self->queue_cond, &self->queue_mutex);
+  }
+  g_mutex_unlock (&self->queue_mutex);
+
 beach:
-  /* needed anyway so the frame will be released */
-  if (frame)
-    g_async_queue_push (self->cur_outframes, frame);
+  if (!frame)
+    return;
+
+  g_mutex_lock (&self->queue_mutex);
+  if (self->is_flushing) {
+    /* We can discard the frame here, no need to have the output loop do that */
+    gst_video_codec_frame_unref (frame);
+    g_mutex_unlock (&self->queue_mutex);
+    return;
+  }
+
+  /* Buffer-less frames will be discarded in the output loop */
+  gst_queue_array_push_tail (self->output_queue, frame);
+  g_cond_signal (&self->queue_cond);
+  g_mutex_unlock (&self->queue_mutex);
+}
+
+static void
+gst_vtenc_loop (GstVTEnc * self)
+{
+  GstVideoCodecFrame *outframe;
+  GstCoreMediaMeta *meta;
+  GstFlowReturn ret = GST_FLOW_OK;
+  gboolean should_pause;
+
+  g_mutex_lock (&self->queue_mutex);
+  while (gst_queue_array_is_empty (self->output_queue) && !self->pause_task
+      && !self->is_flushing) {
+    g_cond_wait (&self->queue_cond, &self->queue_mutex);
+  }
+
+  if (self->pause_task) {
+    g_mutex_unlock (&self->queue_mutex);
+    gst_pad_pause_task (GST_VIDEO_ENCODER_CAST (self)->srcpad);
+    return;
+  }
+
+  while ((outframe = gst_queue_array_pop_head (self->output_queue))) {
+    g_cond_signal (&self->queue_cond);
+    g_mutex_unlock (&self->queue_mutex);
+
+    /* Keep the stream lock -> queue lock order */
+    GST_VIDEO_ENCODER_STREAM_LOCK (self);
+
+    g_mutex_lock (&self->queue_mutex);
+    if (self->is_flushing) {
+      GST_LOG_OBJECT (self, "flushing frame %d", outframe->system_frame_number);
+      gst_video_codec_frame_unref (outframe);
+      GST_VIDEO_ENCODER_STREAM_UNLOCK (self);
+      continue;
+    }
+    g_mutex_unlock (&self->queue_mutex);
+
+    if (self->negotiate_downstream &&
+        (meta = gst_buffer_get_core_media_meta (outframe->output_buffer))) {
+      if (!gst_vtenc_negotiate_downstream (self, meta->sample_buf)) {
+        ret = GST_FLOW_NOT_NEGOTIATED;
+        gst_video_codec_frame_unref (outframe);
+        g_mutex_lock (&self->queue_mutex);
+        /* the rest of the frames will be pop'd and unref'd later */
+        break;
+      }
+
+      self->negotiate_downstream = FALSE;
+    }
+
+    gst_vtenc_update_latency (self);
+
+    GST_LOG_OBJECT (self, "finishing frame %d", outframe->system_frame_number);
+    GST_VIDEO_ENCODER_STREAM_UNLOCK (self);
+    /* releases frame, even if it has no output buffer (i.e. failed to encode) */
+    ret =
+        gst_video_encoder_finish_frame (GST_VIDEO_ENCODER_CAST (self),
+        outframe);
+    g_mutex_lock (&self->queue_mutex);
+
+    if (ret != GST_FLOW_OK)
+      break;
+  }
+
+  g_mutex_unlock (&self->queue_mutex);
+  GST_VIDEO_ENCODER_STREAM_LOCK (self);
+  self->downstream_ret = ret;
+
+  /* We need to empty the queue immediately so that enqueue_buffer() 
+   * can push out the current buffer, otherwise it can block other
+   * encoder callbacks completely */
+  if (ret != GST_FLOW_OK) {
+    g_mutex_lock (&self->queue_mutex);
+
+    while ((outframe = gst_queue_array_pop_head (self->output_queue))) {
+      GST_LOG_OBJECT (self, "flushing frame %d", outframe->system_frame_number);
+      gst_video_codec_frame_unref (outframe);
+    }
+
+    g_cond_signal (&self->queue_cond);
+    g_mutex_unlock (&self->queue_mutex);
+  }
+
+  GST_VIDEO_ENCODER_STREAM_UNLOCK (self);
+
+  /* Check is_flushing here in case we had an empty queue.
+   * In that scenario we also want to pause, as the encoder callback
+   * will discard any frames that are output while flushing */
+  g_mutex_lock (&self->queue_mutex);
+  should_pause = ret != GST_FLOW_OK || self->is_flushing;
+  g_mutex_unlock (&self->queue_mutex);
+  if (should_pause) {
+    GST_DEBUG_OBJECT (self, "pausing output task: %s",
+        ret != GST_FLOW_OK ? gst_flow_get_name (ret) : "flushing");
+    gst_pad_pause_task (GST_VIDEO_ENCODER_CAST (self)->srcpad);
+  }
 }
 
 static gboolean

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/vtenc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/vtenc.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/applemedia/vtutil.h -> gst-plugins-bad-1.24.5.tar.xz/sys/applemedia/vtutil.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/asio/gstasioobject.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/asio/gstasioobject.cpp Changed

gst-plugins-bad-1.22.7.tar.xz/sys/asio/gstasiosink.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/asio/gstasiosink.cpp Changed

@@ -27,6 +27,7 @@
 #include <atlconv.h>
 #include <string.h>
 #include <set>
+#include <vector>
 
 GST_DEBUG_CATEGORY_STATIC (gst_asio_sink_debug);
 #define GST_CAT_DEFAULT gst_asio_sink_debug
@@ -234,9 +235,8 @@
   GstAsioObject *asio_object = nullptr;
   glong max_input_ch = 0;
   glong max_output_ch = 0;
-  guint *channel_indices = nullptr;
-  guint num_capture_channels = 0;
   std::set < guint > channel_list;
+  std::vector < guint > channel_indices;
   guint i;
   gchar *ringbuffer_name;
 
@@ -286,27 +286,27 @@
 
   /* Configure channels to use */
   if (!gst_asio_object_get_max_num_channels (asio_object, &max_input_ch,
-          &max_output_ch) || max_input_ch <= 0) {
-    GST_WARNING_OBJECT (self, "No available input channels");
+          &max_output_ch) || max_output_ch <= 0) {
+    GST_WARNING_OBJECT (self, "No available output channels");
     goto out;
   }
 
-  /* Check if user requested specific channle(s) */
+  /* Check if user requested specific channel(s) */
   if (self->output_channels) {
     gchar **ch;
 
     ch = g_strsplit (self->output_channels, ",", 0);
 
-    num_capture_channels = g_strv_length (ch);
-    if (num_capture_channels > max_input_ch) {
+    auto num_channels = g_strv_length (ch);
+    if (num_channels > max_output_ch) {
       GST_WARNING_OBJECT (self, "To many channels %d were requested",
-          num_capture_channels);
+          num_channels);
     } else {
-      for (i = 0; i < num_capture_channels; i++) {
+      for (i = 0; i < num_channels; i++) {
         guint64 c = g_ascii_strtoull (chi, nullptr, 0);
-        if (c >= (guint64) max_input_ch) {
+        if (c >= (guint64) max_output_ch) {
           GST_WARNING_OBJECT (self, "Invalid channel index");
-          num_capture_channels = 0;
+          channel_list.clear ();
           break;
         }
 
@@ -317,18 +317,12 @@
     g_strfreev (ch);
   }
 
-  channel_indices = (guint *) g_alloca (sizeof (guint) * max_input_ch);
   if (channel_list.size () == 0) {
-    for (i = 0; i < max_input_ch; i++)
-      channel_indicesi = i;
-
-    num_capture_channels = max_input_ch;
+    for (i = 0; i < max_output_ch; i++)
+      channel_indices.push_back (i);
   } else {
-    num_capture_channels = (guint) channel_list.size ();
-    i = 0;
-  for (auto iter:channel_list) {
-      channel_indicesi++ = iter;
-    }
+    for (auto iter : channel_list)
+      channel_indices.push_back (iter);
   }
 
   ringbuffer_name = g_strdup_printf ("%s-asioringbuffer",
@@ -344,8 +338,8 @@
     goto out;
   }
 
-  if (!gst_asio_ring_buffer_configure (ringbuffer, channel_indices,
-          num_capture_channels, self->buffer_size)) {
+  if (!gst_asio_ring_buffer_configure (ringbuffer, channel_indices.data (),
+          channel_indices.size (), self->buffer_size)) {
     GST_WARNING_OBJECT (self, "Failed to configure ringbuffer");
     gst_clear_object (&ringbuffer);
     goto out;

gst-plugins-bad-1.22.7.tar.xz/sys/asio/gstasiosrc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/asio/gstasiosrc.cpp Changed

@@ -27,6 +27,7 @@
 #include <atlconv.h>
 #include <string.h>
 #include <set>
+#include <vector>
 
 GST_DEBUG_CATEGORY_STATIC (gst_asio_src_debug);
 #define GST_CAT_DEFAULT gst_asio_src_debug
@@ -247,9 +248,8 @@
   GstAsioObject *asio_object = nullptr;
   glong max_input_ch = 0;
   glong max_output_ch = 0;
-  guint *channel_indices = nullptr;
-  guint num_capture_channels = 0;
   std::set < guint > channel_list;
+  std::vector < guint > channel_indices;
   guint i;
   gchar *ringbuffer_name;
 
@@ -310,16 +310,16 @@
 
     ch = g_strsplit (self->capture_channles, ",", 0);
 
-    num_capture_channels = g_strv_length (ch);
-    if (num_capture_channels > max_input_ch) {
+    auto num_channels = g_strv_length (ch);
+    if (num_channels > max_input_ch) {
       GST_WARNING_OBJECT (self, "To many channels %d were requested",
-          num_capture_channels);
+          num_channels);
     } else {
-      for (i = 0; i < num_capture_channels; i++) {
+      for (i = 0; i < num_channels; i++) {
         guint64 c = g_ascii_strtoull (chi, nullptr, 0);
         if (c >= (guint64) max_input_ch) {
           GST_WARNING_OBJECT (self, "Invalid channel index");
-          num_capture_channels = 0;
+          channel_list.clear ();
           break;
         }
 
@@ -330,18 +330,12 @@
     g_strfreev (ch);
   }
 
-  channel_indices = (guint *) g_alloca (sizeof (guint) * max_input_ch);
   if (channel_list.size () == 0) {
     for (i = 0; i < max_input_ch; i++)
-      channel_indicesi = i;
-
-    num_capture_channels = max_input_ch;
+      channel_indices.push_back (i);
   } else {
-    num_capture_channels = (guint) channel_list.size ();
-    i = 0;
-  for (auto iter:channel_list) {
-      channel_indicesi++ = iter;
-    }
+    for (auto iter : channel_list)
+      channel_indices.push_back (iter);
   }
 
   ringbuffer_name = g_strdup_printf ("%s-asioringbuffer",
@@ -358,8 +352,8 @@
     goto out;
   }
 
-  if (!gst_asio_ring_buffer_configure (ringbuffer, channel_indices,
-          num_capture_channels, self->buffer_size)) {
+  if (!gst_asio_ring_buffer_configure (ringbuffer, channel_indices.data (),
+          channel_indices.size (), self->buffer_size)) {
     GST_WARNING_OBJECT (self, "Failed to configure ringbuffer");
     gst_clear_object (&ringbuffer);
     goto out;

gst-plugins-bad-1.22.7.tar.xz/sys/bluez/gstavdtpsink.c -> gst-plugins-bad-1.24.5.tar.xz/sys/bluez/gstavdtpsink.c Changed

@@ -262,16 +262,24 @@
   self->mp3_using_crc = -1;
   self->channel_mode = -1;
 
-  if (self->conn.transport == NULL)
+  if (self->conn.transport == NULL) {
+    GST_ERROR_OBJECT (self, "'transport' property not set");
+    GST_ELEMENT_ERROR (self, LIBRARY, SETTINGS,
+        ("'transport' property not set"), (NULL));
     return FALSE;
+  }
 
   if (!gst_avdtp_connection_acquire (&self->conn, FALSE)) {
     GST_ERROR_OBJECT (self, "Failed to acquire connection");
+    GST_ELEMENT_ERROR (self, LIBRARY, FAILED, ("Failed to acquire connection"),
+        (NULL));
     return FALSE;
   }
 
   if (!gst_avdtp_connection_get_properties (&self->conn)) {
     GST_ERROR_OBJECT (self, "Failed to get transport properties");
+    GST_ELEMENT_ERROR (self, LIBRARY, FAILED,
+        ("Failed to get transport properties"), (NULL));
     return FALSE;
   }
 
@@ -282,6 +290,8 @@
 
   if (!self->dev_caps) {
     GST_ERROR_OBJECT (self, "Failed to get device caps");
+    GST_ELEMENT_ERROR (self, LIBRARY, FAILED, ("Failed to get device caps"),
+        (NULL));
     return FALSE;
   }

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11av1dec.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11av1dec.cpp Changed

@@ -37,402 +37,13 @@
 #endif
 
 #include "gstd3d11av1dec.h"
-
-#include <gst/codecs/gstav1decoder.h>
-#include <string.h>
-#include <vector>
-
-/* HACK: to expose dxva data structure on UWP */
-#ifdef WINAPI_PARTITION_DESKTOP
-#undef WINAPI_PARTITION_DESKTOP
-#endif
-#define WINAPI_PARTITION_DESKTOP 1
-#include <d3d9.h>
-#include <dxva.h>
+#include <gst/dxva/gstdxvaav1decoder.h>
 
 GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_av1_dec_debug);
 #define GST_CAT_DEFAULT gst_d3d11_av1_dec_debug
 
-/* Might not be defined in dxva.h, copied from DXVA AV1 spec available at
- * https://www.microsoft.com/en-us/download/confirmation.aspx?id=101577
- * and modified with "GST_" prefix
- */
-#pragma pack(push, 1)
-
-/* AV1 picture entry data structure */
-typedef struct _GST_DXVA_PicEntry_AV1
-{
-  UINT width;
-  UINT height;
-
-  // Global motion parameters
-  INT wmmat6;
-  union
-  {
-    struct
-    {
-      UCHAR wminvalid:1;
-      UCHAR wmtype:2;
-      UCHAR Reserved:5;
-    };
-    UCHAR GlobalMotionFlags;
-  } DUMMYUNIONNAME;
-
-  UCHAR Index;
-  UINT16 Reserved16Bits;
-
-} GST_DXVA_PicEntry_AV1;
-
-/* AV1 picture parameters structure */
-typedef struct _GST_DXVA_PicParams_AV1
-{
-  UINT width;
-  UINT height;
-
-  UINT max_width;
-  UINT max_height;
-
-  UCHAR CurrPicTextureIndex;
-  UCHAR superres_denom;
-  UCHAR bitdepth;
-  UCHAR seq_profile;
-
-  // Tiles:
-  struct
-  {
-    UCHAR cols;
-    UCHAR rows;
-    USHORT context_update_id;
-    USHORT widths64;
-    USHORT heights64;
-  } tiles;
-
-  // Coding Tools
-  union
-  {
-    struct
-    {
-      UINT use_128x128_superblock:1;
-      UINT intra_edge_filter:1;
-      UINT interintra_compound:1;
-      UINT masked_compound:1;
-      UINT warped_motion:1;
-      UINT dual_filter:1;
-      UINT jnt_comp:1;
-      UINT screen_content_tools:1;
-      UINT integer_mv:1;
-      UINT cdef:1;
-      UINT restoration:1;
-      UINT film_grain:1;
-      UINT intrabc:1;
-      UINT high_precision_mv:1;
-      UINT switchable_motion_mode:1;
-      UINT filter_intra:1;
-      UINT disable_frame_end_update_cdf:1;
-      UINT disable_cdf_update:1;
-      UINT reference_mode:1;
-      UINT skip_mode:1;
-      UINT reduced_tx_set:1;
-      UINT superres:1;
-      UINT tx_mode:2;
-      UINT use_ref_frame_mvs:1;
-      UINT enable_ref_frame_mvs:1;
-      UINT reference_frame_update:1;
-      UINT Reserved:5;
-    };
-    UINT32 CodingParamToolFlags;
-  } coding;
-
-  // Format & Picture Info flags
-  union
-  {
-    struct
-    {
-      UCHAR frame_type:2;
-      UCHAR show_frame:1;
-      UCHAR showable_frame:1;
-      UCHAR subsampling_x:1;
-      UCHAR subsampling_y:1;
-      UCHAR mono_chrome:1;
-      UCHAR Reserved:1;
-    };
-    UCHAR FormatAndPictureInfoFlags;
-  } format;
-
-  // References
-  UCHAR primary_ref_frame;
-  UCHAR order_hint;
-  UCHAR order_hint_bits;
-
-  GST_DXVA_PicEntry_AV1 frame_refs7;
-  UCHAR RefFrameMapTextureIndex8;
-
-  // Loop filter parameters
-  struct
-  {
-    UCHAR filter_level2;
-    UCHAR filter_level_u;
-    UCHAR filter_level_v;
-
-    UCHAR sharpness_level;
-    union
-    {
-      struct
-      {
-        UCHAR mode_ref_delta_enabled:1;
-        UCHAR mode_ref_delta_update:1;
-        UCHAR delta_lf_multi:1;
-        UCHAR delta_lf_present:1;
-        UCHAR Reserved:4;
-      };
-      UCHAR ControlFlags;
-    } DUMMYUNIONNAME;
-    CHAR ref_deltas8;
-    CHAR mode_deltas2;
-    UCHAR delta_lf_res;
-    UCHAR frame_restoration_type3;
-    USHORT log2_restoration_unit_size3;
-    UINT16 Reserved16Bits;
-  } loop_filter;
-
-  // Quantization
-  struct
-  {
-    union
-    {
-      struct
-      {
-        UCHAR delta_q_present:1;
-        UCHAR delta_q_res:2;
-        UCHAR Reserved:5;
-      };
-      UCHAR ControlFlags;
-    } DUMMYUNIONNAME;
-
-    UCHAR base_qindex;
-    CHAR y_dc_delta_q;
-    CHAR u_dc_delta_q;
-    CHAR v_dc_delta_q;
-    CHAR u_ac_delta_q;
-    CHAR v_ac_delta_q;
-    // using_qmatrix:
-    UCHAR qm_y;
-    UCHAR qm_u;
-    UCHAR qm_v;
-    UINT16 Reserved16Bits;
-  } quantization;
-
-  // Cdef parameters
-  struct
-  {
-    union
-    {
-      struct
-      {
-        UCHAR damping:2;
-        UCHAR bits:2;
-        UCHAR Reserved:4;
-      };
-      UCHAR ControlFlags;
-    } DUMMYUNIONNAME;
-
-    union
-    {
-      struct
-      {
-        UCHAR primary:6;
-        UCHAR secondary:2;
-      };
-      UCHAR combined;
-    } y_strengths8;
-
-    union
-    {
-      struct
-      {
-        UCHAR primary:6;
-        UCHAR secondary:2;
-      };
-      UCHAR combined;
-    } uv_strengths8;
-
-  } cdef;
-
-  UCHAR interp_filter;
-
-  // Segmentation
-  struct
-  {
-    union
-    {
-      struct
-      {
-        UCHAR enabled:1;
-        UCHAR update_map:1;
-        UCHAR update_data:1;
-        UCHAR temporal_update:1;
-        UCHAR Reserved:4;
-      };
-      UCHAR ControlFlags;
-    } DUMMYUNIONNAME;
-    UCHAR Reserved24Bits3;
-
-    union
-    {
-      struct
-      {
-        UCHAR alt_q:1;
-        UCHAR alt_lf_y_v:1;
-        UCHAR alt_lf_y_h:1;
-        UCHAR alt_lf_u:1;
-        UCHAR alt_lf_v:1;
-        UCHAR ref_frame:1;
-        UCHAR skip:1;
-        UCHAR globalmv:1;
-      };
-      UCHAR mask;
-    } feature_mask8;
-
-    SHORT feature_data88;
-
-  } segmentation;
-
-  struct
-  {
-    union
-    {
-      struct
-      {
-        USHORT apply_grain:1;
-        USHORT scaling_shift_minus8:2;
-        USHORT chroma_scaling_from_luma:1;
-        USHORT ar_coeff_lag:2;
-        USHORT ar_coeff_shift_minus6:2;
-        USHORT grain_scale_shift:2;
-        USHORT overlap_flag:1;
-        USHORT clip_to_restricted_range:1;
-        USHORT matrix_coeff_is_identity:1;
-        USHORT Reserved:3;
-      };
-      USHORT ControlFlags;
-    } DUMMYUNIONNAME;
-
-    USHORT grain_seed;
-    UCHAR scaling_points_y142;
-    UCHAR num_y_points;
-    UCHAR scaling_points_cb102;
-    UCHAR num_cb_points;
-    UCHAR scaling_points_cr102;
-    UCHAR num_cr_points;
-    UCHAR ar_coeffs_y24;
-    UCHAR ar_coeffs_cb25;
-    UCHAR ar_coeffs_cr25;
-    UCHAR cb_mult;
-    UCHAR cb_luma_mult;
-    UCHAR cr_mult;
-    UCHAR cr_luma_mult;
-    UCHAR Reserved8Bits;
-    SHORT cb_offset;
-    SHORT cr_offset;
-  } film_grain;
-
-  UINT Reserved32Bits;
-  UINT StatusReportFeedbackNumber;
-} GST_DXVA_PicParams_AV1;
-
-/* AV1 tile structure */
-typedef struct _GST_DXVA_Tile_AV1
-{
-  UINT DataOffset;
-  UINT DataSize;
-  USHORT row;
-  USHORT column;
-  UINT16 Reserved16Bits;
-  UCHAR anchor_frame;
-  UCHAR Reserved8Bits;
-} GST_DXVA_Tile_AV1;
-
-/* AV1 status reporting data structure */
-typedef struct _GST_DXVA_Status_AV1
-{
-  UINT StatusReportFeedbackNumber;
-  GST_DXVA_PicEntry_AV1 CurrPic;
-  UCHAR BufType;
-  UCHAR Status;
-  UCHAR Reserved8Bits;
-  USHORT NumMbsAffected;
-} GST_DXVA_Status_AV1;
-
-#pragma pack(pop)
-
-/* *INDENT-OFF* */
-typedef struct _GstD3D11AV1DecInner
-{
-  GstD3D11Device *device = nullptr;
-  GstD3D11Decoder *d3d11_decoder = nullptr;
-
-  GstAV1SequenceHeaderOBU seq_hdr;
-  GST_DXVA_PicParams_AV1 pic_params;
-
-  std::vector<GST_DXVA_Tile_AV1> tile_list;
-  std::vector<guint8> bitstream_buffer;
-
-  guint max_width = 0;
-  guint max_height = 0;
-  guint bitdepth = 0;
-} GstD3D11AV1DecInner;
-/* *INDENT-ON* */
-
-typedef struct _GstD3D11AV1Dec
-{
-  GstAV1Decoder parent;
-  GstD3D11AV1DecInner *inner;
-} GstD3D11AV1Dec;
-
-typedef struct _GstD3D11AV1DecClass
-{
-  GstAV1DecoderClass parent_class;
-  GstD3D11DecoderSubClassData class_data;
-} GstD3D11AV1DecClass;
-
-static GstElementClass *parent_class = NULL;
-
-#define GST_D3D11_AV1_DEC(object) ((GstD3D11AV1Dec *) (object))
-#define GST_D3D11_AV1_DEC_GET_CLASS(object) \
-    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstD3D11AV1DecClass))
-
-static void gst_d3d11_av1_dec_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_d3d11_av1_dec_finalize (GObject * object);
-
-static void gst_d3d11_av1_dec_set_context (GstElement * element,
-    GstContext * context);
-
-static gboolean gst_d3d11_av1_dec_open (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_av1_dec_close (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_av1_dec_negotiate (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_av1_dec_decide_allocation (GstVideoDecoder *
-    decoder, GstQuery * query);
-static gboolean gst_d3d11_av1_dec_src_query (GstVideoDecoder * decoder,
-    GstQuery * query);
-static gboolean gst_d3d11_av1_dec_sink_event (GstVideoDecoder * decoder,
-    GstEvent * event);
-
-/* GstAV1Decoder */
-static GstFlowReturn gst_d3d11_av1_dec_new_sequence (GstAV1Decoder * decoder,
-    const GstAV1SequenceHeaderOBU * seq_hdr, gint max_dpb_size);
-static GstFlowReturn gst_d3d11_av1_dec_new_picture (GstAV1Decoder * decoder,
-    GstVideoCodecFrame * frame, GstAV1Picture * picture);
-static GstAV1Picture *gst_d3d11_av1_dec_duplicate_picture (GstAV1Decoder *
-    decoder, GstVideoCodecFrame * frame, GstAV1Picture * picture);
-static GstFlowReturn gst_d3d11_av1_dec_start_picture (GstAV1Decoder * decoder,
-    GstAV1Picture * picture, GstAV1Dpb * dpb);
-static GstFlowReturn gst_d3d11_av1_dec_decode_tile (GstAV1Decoder * decoder,
-    GstAV1Picture * picture, GstAV1Tile * tile);
-static GstFlowReturn gst_d3d11_av1_dec_end_picture (GstAV1Decoder * decoder,
-    GstAV1Picture * picture);
-static GstFlowReturn gst_d3d11_av1_dec_output_picture (GstAV1Decoder *
-    decoder, GstVideoCodecFrame * frame, GstAV1Picture * picture);
+GST_D3D11_DECODER_DEFINE_TYPE_FULL (GstD3D11AV1Dec, gst_d3d11_av1_dec,
+    GST, D3D11_AV1_DEC, GstDxvaAV1Decoder);
 
 static void
 gst_d3d11_av1_dec_class_init (GstD3D11AV1DecClass * klass, gpointer data)
@@ -440,11 +51,10 @@
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
-  GstAV1DecoderClass *av1decoder_class = GST_AV1_DECODER_CLASS (klass);
+  GstDxvaAV1DecoderClass *dxva_class = GST_DXVA_AV1_DECODER_CLASS (klass);
   GstD3D11DecoderClassData *cdata = (GstD3D11DecoderClassData *) data;
 
   gobject_class->get_property = gst_d3d11_av1_dec_get_property;
-  gobject_class->finalize = gst_d3d11_av1_dec_finalize;
 
   element_class->set_context =
       GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_set_context);
@@ -467,29 +77,26 @@
   decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_negotiate);
   decoder_class->decide_allocation =
       GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_sink_query);
   decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_src_query);
   decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_sink_event);
 
-  av1decoder_class->new_sequence =
-      GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_new_sequence);
-  av1decoder_class->new_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_new_picture);
-  av1decoder_class->duplicate_picture =
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_new_picture);
+  dxva_class->duplicate_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_duplicate_picture);
-  av1decoder_class->start_picture =
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_get_picture_id);
+  dxva_class->start_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_start_picture);
-  av1decoder_class->decode_tile =
-      GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_decode_tile);
-  av1decoder_class->end_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_end_picture);
-  av1decoder_class->output_picture =
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_end_picture);
+  dxva_class->output_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_av1_dec_output_picture);
 }
 
 static void
 gst_d3d11_av1_dec_init (GstD3D11AV1Dec * self)
 {
-  self->inner = new GstD3D11AV1DecInner ();
 }
 
 static void
@@ -503,25 +110,14 @@
 }
 
 static void
-gst_d3d11_av1_dec_finalize (GObject * object)
-{
-  GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (object);
-
-  delete self->inner;
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
 gst_d3d11_av1_dec_set_context (GstElement * element, GstContext * context)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (element);
-  GstD3D11AV1DecInner *inner = self->inner;
   GstD3D11AV1DecClass *klass = GST_D3D11_AV1_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
   gst_d3d11_handle_set_context_for_adapter_luid (element,
-      context, cdata->adapter_luid, &inner->device);
+      context, cdata->adapter_luid, &self->device);
 
   GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
 }
@@ -530,27 +126,20 @@
 gst_d3d11_av1_dec_open (GstVideoDecoder * decoder)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
   GstD3D11AV1DecClass *klass = GST_D3D11_AV1_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
-  if (!gst_d3d11_decoder_proxy_open (decoder,
-          cdata, &inner->device, &inner->d3d11_decoder)) {
-    GST_ERROR_OBJECT (self, "Failed to open decoder");
-    return FALSE;
-  }
-
-  return TRUE;
+  return gst_d3d11_decoder_proxy_open (decoder,
+      cdata, &self->device, &self->decoder);
 }
 
 static gboolean
 gst_d3d11_av1_dec_close (GstVideoDecoder * decoder)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
 
-  gst_clear_object (&inner->d3d11_decoder);
-  gst_clear_object (&inner->device);
+  gst_clear_object (&self->decoder);
+  gst_clear_object (&self->device);
 
   return TRUE;
 }
@@ -559,9 +148,8 @@
 gst_d3d11_av1_dec_negotiate (GstVideoDecoder * decoder)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_negotiate (inner->d3d11_decoder, decoder))
+  if (!gst_d3d11_decoder_negotiate (self->decoder, decoder))
     return FALSE;
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
@@ -572,27 +160,23 @@
     GstQuery * query)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_decide_allocation (inner->d3d11_decoder,
-          decoder, query)) {
+  if (!gst_d3d11_decoder_decide_allocation (self->decoder, decoder, query))
     return FALSE;
-  }
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
       (decoder, query);
 }
 
 static gboolean
-gst_d3d11_av1_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+gst_d3d11_av1_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
 
   switch (GST_QUERY_TYPE (query)) {
     case GST_QUERY_CONTEXT:
       if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
-              query, inner->device)) {
+              query, self->device)) {
         return TRUE;
       }
       break;
@@ -600,647 +184,108 @@
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
 }
 
 static gboolean
-gst_d3d11_av1_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+gst_d3d11_av1_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
 
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_FLUSH_START:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, TRUE);
-      break;
-    case GST_EVENT_FLUSH_STOP:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, FALSE);
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
+              query, self->device)) {
+        return TRUE;
+      }
       break;
     default:
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
 }
 
-static GstFlowReturn
-gst_d3d11_av1_dec_new_sequence (GstAV1Decoder * decoder,
-    const GstAV1SequenceHeaderOBU * seq_hdr, gint max_dpb_size)
+static gboolean
+gst_d3d11_av1_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
-  gboolean modified = FALSE;
-  guint max_width, max_height;
-
-  GST_LOG_OBJECT (self, "new sequence");
-
-  if (seq_hdr->seq_profile != GST_AV1_PROFILE_0) {
-    GST_WARNING_OBJECT (self, "Unsupported profile %d", seq_hdr->seq_profile);
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  if (seq_hdr->num_planes != 3) {
-    GST_WARNING_OBJECT (self, "Monochrome is not supported");
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  inner->seq_hdr = *seq_hdr;
-
-  if (inner->bitdepth != seq_hdr->bit_depth) {
-    GST_INFO_OBJECT (self, "Bitdepth changed %d -> %d", inner->bitdepth,
-        seq_hdr->bit_depth);
-    inner->bitdepth = seq_hdr->bit_depth;
-    modified = TRUE;
-  }
 
-  max_width = seq_hdr->max_frame_width_minus_1 + 1;
-  max_height = seq_hdr->max_frame_height_minus_1 + 1;
+  if (self->decoder)
+    gst_d3d11_decoder_sink_event (self->decoder, event);
 
-  if (inner->max_width != max_width || inner->max_height != max_height) {
-    GST_INFO_OBJECT (self, "Resolution changed %dx%d -> %dx%d",
-        inner->max_width, inner->max_height, max_width, max_height);
-    inner->max_width = max_width;
-    inner->max_height = max_height;
-    modified = TRUE;
-  }
-
-  if (modified || !gst_d3d11_decoder_is_configured (inner->d3d11_decoder)) {
-    GstVideoInfo info;
-    GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
-
-    if (inner->bitdepth == 8) {
-      out_format = GST_VIDEO_FORMAT_NV12;
-    } else if (inner->bitdepth == 10) {
-      out_format = GST_VIDEO_FORMAT_P010_10LE;
-    } else {
-      GST_WARNING_OBJECT (self, "Invalid bit-depth %d", seq_hdr->bit_depth);
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    gst_video_info_set_format (&info,
-        out_format, inner->max_width, inner->max_height);
-
-    if (!gst_d3d11_decoder_configure (inner->d3d11_decoder,
-            decoder->input_state, &info, 0, 0, (gint) inner->max_width,
-            (gint) inner->max_height, max_dpb_size)) {
-      GST_ERROR_OBJECT (self, "Failed to create decoder");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
-      GST_WARNING_OBJECT (self, "Failed to negotiate with downstream");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-  }
-
-  return GST_FLOW_OK;
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
 }
 
 static GstFlowReturn
-gst_d3d11_av1_dec_new_picture (GstAV1Decoder * decoder,
-    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+gst_d3d11_av1_dec_configure (GstDxvaAV1Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-
-  view_buffer = gst_d3d11_decoder_get_output_view_buffer (inner->d3d11_decoder,
-      GST_VIDEO_DECODER (decoder));
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "No available output view buffer");
-    return GST_FLOW_FLUSHING;
-  }
-
-  GST_LOG_OBJECT (self, "New output view buffer %" GST_PTR_FORMAT, view_buffer);
 
-  gst_av1_picture_set_user_data (picture,
-      view_buffer, (GDestroyNotify) gst_buffer_unref);
-
-  GST_LOG_OBJECT (self, "New AV1 picture %p", picture);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_configure (self->decoder, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
 }
 
-static GstAV1Picture *
-gst_d3d11_av1_dec_duplicate_picture (GstAV1Decoder * decoder,
-    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+static GstFlowReturn
+gst_d3d11_av1_dec_new_picture (GstDxvaAV1Decoder * decoder,
+    GstCodecPicture * picture)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstBuffer *view_buffer;
-  GstAV1Picture *new_picture;
-
-  view_buffer = (GstBuffer *) gst_av1_picture_get_user_data (picture);
-
-  if (!view_buffer) {
-    GST_ERROR_OBJECT (self, "Parent picture does not have output view buffer");
-    return NULL;
-  }
-
-  new_picture = gst_av1_picture_new ();
-
-  GST_LOG_OBJECT (self, "Duplicate output with buffer %" GST_PTR_FORMAT,
-      view_buffer);
 
-  gst_av1_picture_set_user_data (new_picture,
-      gst_buffer_ref (view_buffer), (GDestroyNotify) gst_buffer_unref);
-
-  return new_picture;
+  return gst_d3d11_decoder_new_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture);
 }
 
-static ID3D11VideoDecoderOutputView *
-gst_d3d11_av1_dec_get_output_view_from_picture (GstD3D11AV1Dec * self,
-    GstAV1Picture * picture, guint8 * view_id)
+static GstFlowReturn
+gst_d3d11_av1_dec_duplicate_picture (GstDxvaAV1Decoder * decoder,
+    GstCodecPicture * src, GstCodecPicture * dst)
 {
-  GstD3D11AV1DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-  ID3D11VideoDecoderOutputView *view;
-
-  view_buffer = (GstBuffer *) gst_av1_picture_get_user_data (picture);
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view buffer");
-    return NULL;
-  }
-
-  view =
-      gst_d3d11_decoder_get_output_view_from_buffer (inner->d3d11_decoder,
-      view_buffer, view_id);
-  if (!view) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view handle");
-    return NULL;
-  }
+  GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
 
-  return view;
+  return gst_d3d11_decoder_duplicate_picture (self->decoder, src, dst);
 }
 
-static GstFlowReturn
-gst_d3d11_av1_dec_start_picture (GstAV1Decoder * decoder,
-    GstAV1Picture * picture, GstAV1Dpb * dpb)
+static guint8
+gst_d3d11_av1_dec_get_picture_id (GstDxvaAV1Decoder * decoder,
+    GstCodecPicture * picture)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
-  const GstAV1SequenceHeaderOBU *seq_hdr = &inner->seq_hdr;
-  const GstAV1FrameHeaderOBU *frame_hdr = &picture->frame_hdr;
-  ID3D11VideoDecoderOutputView *view;
-  GST_DXVA_PicParams_AV1 *pic_params = &inner->pic_params;
-  guint8 view_id = 0xff;
-  guint i, j;
-
-  view = gst_d3d11_av1_dec_get_output_view_from_picture (self, picture,
-      &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_OK;
-  }
-
-  memset (pic_params, 0, sizeof (GST_DXVA_PicParams_AV1));
-
-  pic_params->width = frame_hdr->frame_width;
-  pic_params->height = frame_hdr->frame_height;
-
-  pic_params->max_width = seq_hdr->max_frame_width_minus_1 + 1;
-  pic_params->max_height = seq_hdr->max_frame_height_minus_1 + 1;
-
-  pic_params->CurrPicTextureIndex = view_id;
-  pic_params->superres_denom = frame_hdr->superres_denom;
-  pic_params->bitdepth = seq_hdr->bit_depth;
-  pic_params->seq_profile = seq_hdr->seq_profile;
-
-  /* TILES */
-  pic_params->tiles.cols = frame_hdr->tile_info.tile_cols;
-  pic_params->tiles.rows = frame_hdr->tile_info.tile_rows;
-  pic_params->tiles.context_update_id =
-      frame_hdr->tile_info.context_update_tile_id;
-
-  for (i = 0; i < pic_params->tiles.cols; i++) {
-    pic_params->tiles.widthsi =
-        frame_hdr->tile_info.width_in_sbs_minus_1i + 1;
-  }
-
-  for (i = 0; i < pic_params->tiles.rows; i++) {
-    pic_params->tiles.heightsi =
-        frame_hdr->tile_info.height_in_sbs_minus_1i + 1;
-  }
-
-  /* CODING TOOLS */
-  pic_params->coding.use_128x128_superblock = seq_hdr->use_128x128_superblock;
-  pic_params->coding.intra_edge_filter = seq_hdr->enable_filter_intra;
-  pic_params->coding.interintra_compound = seq_hdr->enable_interintra_compound;
-  pic_params->coding.masked_compound = seq_hdr->enable_masked_compound;
-  pic_params->coding.warped_motion = frame_hdr->allow_warped_motion;
-  pic_params->coding.dual_filter = seq_hdr->enable_dual_filter;
-  pic_params->coding.jnt_comp = seq_hdr->enable_jnt_comp;
-  pic_params->coding.screen_content_tools =
-      frame_hdr->allow_screen_content_tools;
-  pic_params->coding.integer_mv = frame_hdr->force_integer_mv;
-  pic_params->coding.cdef = seq_hdr->enable_cdef;
-  pic_params->coding.restoration = seq_hdr->enable_restoration;
-  pic_params->coding.film_grain = seq_hdr->film_grain_params_present;
-  pic_params->coding.intrabc = frame_hdr->allow_intrabc;
-  pic_params->coding.high_precision_mv = frame_hdr->allow_high_precision_mv;
-  pic_params->coding.switchable_motion_mode =
-      frame_hdr->is_motion_mode_switchable;
-  pic_params->coding.filter_intra = seq_hdr->enable_filter_intra;
-  pic_params->coding.disable_frame_end_update_cdf =
-      frame_hdr->disable_frame_end_update_cdf;
-  pic_params->coding.disable_cdf_update = frame_hdr->disable_cdf_update;
-  pic_params->coding.reference_mode = frame_hdr->reference_select;
-  pic_params->coding.skip_mode = frame_hdr->skip_mode_present;
-  pic_params->coding.reduced_tx_set = frame_hdr->reduced_tx_set;
-  pic_params->coding.superres = frame_hdr->use_superres;
-  pic_params->coding.tx_mode = frame_hdr->tx_mode;
-  pic_params->coding.use_ref_frame_mvs = frame_hdr->use_ref_frame_mvs;
-  pic_params->coding.enable_ref_frame_mvs = seq_hdr->enable_ref_frame_mvs;
-  pic_params->coding.reference_frame_update = 1;
-
-  /* FORMAT */
-  pic_params->format.frame_type = frame_hdr->frame_type;
-  pic_params->format.show_frame = frame_hdr->show_frame;
-  pic_params->format.showable_frame = frame_hdr->showable_frame;
-  pic_params->format.subsampling_x = seq_hdr->color_config.subsampling_x;
-  pic_params->format.subsampling_y = seq_hdr->color_config.subsampling_y;
-  pic_params->format.mono_chrome = seq_hdr->color_config.mono_chrome;
-
-  /* REFERENCES */
-  pic_params->primary_ref_frame = frame_hdr->primary_ref_frame;
-  pic_params->order_hint = frame_hdr->order_hint;
-  if (seq_hdr->enable_order_hint) {
-    pic_params->order_hint_bits = seq_hdr->order_hint_bits_minus_1 + 1;
-  } else {
-    pic_params->order_hint_bits = 0;
-  }
-
-  for (i = 0; i < GST_AV1_REFS_PER_FRAME; i++) {
-    if (dpb->pic_listi) {
-      GstAV1Picture *other_pic = dpb->pic_listi;
-      const GstAV1GlobalMotionParams *gmp = &frame_hdr->global_motion_params;
-
-      pic_params->frame_refsi.width = other_pic->frame_hdr.frame_width;
-      pic_params->frame_refsi.height = other_pic->frame_hdr.frame_height;
-      for (j = 0; j < 6; j++) {
-        pic_params->frame_refsi.wmmatj =
-            gmp->gm_paramsGST_AV1_REF_LAST_FRAME + ij;
-      }
-      pic_params->frame_refsi.wminvalid =
-          (gmp->gm_typeGST_AV1_REF_LAST_FRAME + i ==
-          GST_AV1_WARP_MODEL_IDENTITY);
-      pic_params->frame_refsi.wmtype =
-          gmp->gm_typeGST_AV1_REF_LAST_FRAME + i;
-      pic_params->frame_refsi.Index = frame_hdr->ref_frame_idxi;
-    } else {
-      pic_params->frame_refsi.Index = 0xff;
-    }
-  }
-
-  for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
-    if (dpb->pic_listi) {
-      GstAV1Picture *other_pic = dpb->pic_listi;
-      ID3D11VideoDecoderOutputView *other_view;
-      guint8 other_view_id = 0xff;
-
-      other_view = gst_d3d11_av1_dec_get_output_view_from_picture (self,
-          other_pic, &other_view_id);
-      if (!other_view) {
-        GST_ERROR_OBJECT (self,
-            "current picture does not have output view handle");
-        return GST_FLOW_ERROR;
-      }
 
-      pic_params->RefFrameMapTextureIndexi = other_view_id;
-    } else {
-      pic_params->RefFrameMapTextureIndexi = 0xff;
-    }
-  }
-
-  /* LOOP FILTER PARAMS */
-  pic_params->loop_filter.filter_level0 =
-      frame_hdr->loop_filter_params.loop_filter_level0;
-  pic_params->loop_filter.filter_level1 =
-      frame_hdr->loop_filter_params.loop_filter_level1;
-  pic_params->loop_filter.filter_level_u =
-      frame_hdr->loop_filter_params.loop_filter_level2;
-  pic_params->loop_filter.filter_level_v =
-      frame_hdr->loop_filter_params.loop_filter_level3;
-  pic_params->loop_filter.sharpness_level =
-      frame_hdr->loop_filter_params.loop_filter_sharpness;
-  pic_params->loop_filter.mode_ref_delta_enabled =
-      frame_hdr->loop_filter_params.loop_filter_delta_enabled;
-  pic_params->loop_filter.mode_ref_delta_update =
-      frame_hdr->loop_filter_params.loop_filter_delta_update;
-  pic_params->loop_filter.delta_lf_multi =
-      frame_hdr->loop_filter_params.delta_lf_multi;
-  pic_params->loop_filter.delta_lf_present =
-      frame_hdr->loop_filter_params.delta_lf_present;
-
-  for (i = 0; i < GST_AV1_TOTAL_REFS_PER_FRAME; i++) {
-    pic_params->loop_filter.ref_deltasi =
-        frame_hdr->loop_filter_params.loop_filter_ref_deltasi;
-  }
-
-  for (i = 0; i < 2; i++) {
-    pic_params->loop_filter.mode_deltasi =
-        frame_hdr->loop_filter_params.loop_filter_mode_deltasi;
-  }
-
-  pic_params->loop_filter.delta_lf_res =
-      frame_hdr->loop_filter_params.delta_lf_res;
-
-  for (i = 0; i < GST_AV1_MAX_NUM_PLANES; i++) {
-    pic_params->loop_filter.frame_restoration_typei =
-        frame_hdr->loop_restoration_params.frame_restoration_typei;
-  }
-
-  if (frame_hdr->loop_restoration_params.uses_lr) {
-    pic_params->loop_filter.log2_restoration_unit_size0 =
-        (6 + frame_hdr->loop_restoration_params.lr_unit_shift);
-    pic_params->loop_filter.log2_restoration_unit_size1 =
-        pic_params->loop_filter.log2_restoration_unit_size2 =
-        (6 + frame_hdr->loop_restoration_params.lr_unit_shift -
-        frame_hdr->loop_restoration_params.lr_uv_shift);
-  } else {
-    pic_params->loop_filter.log2_restoration_unit_size0 =
-        pic_params->loop_filter.log2_restoration_unit_size1 =
-        pic_params->loop_filter.log2_restoration_unit_size2 = 8;
-  }
-
-  /* QUANTIZATION */
-  pic_params->quantization.delta_q_present =
-      frame_hdr->quantization_params.delta_q_present;
-  pic_params->quantization.delta_q_res =
-      frame_hdr->quantization_params.delta_q_res;
-  pic_params->quantization.base_qindex =
-      frame_hdr->quantization_params.base_q_idx;
-  pic_params->quantization.y_dc_delta_q =
-      frame_hdr->quantization_params.delta_q_y_dc;
-  pic_params->quantization.u_dc_delta_q =
-      frame_hdr->quantization_params.delta_q_u_dc;
-  pic_params->quantization.v_dc_delta_q =
-      frame_hdr->quantization_params.delta_q_v_dc;
-  pic_params->quantization.u_ac_delta_q =
-      frame_hdr->quantization_params.delta_q_u_ac;
-  pic_params->quantization.v_ac_delta_q =
-      frame_hdr->quantization_params.delta_q_v_ac;
-  if (frame_hdr->quantization_params.using_qmatrix) {
-    pic_params->quantization.qm_y = frame_hdr->quantization_params.qm_y;
-    pic_params->quantization.qm_u = frame_hdr->quantization_params.qm_u;
-    pic_params->quantization.qm_v = frame_hdr->quantization_params.qm_v;
-  } else {
-    pic_params->quantization.qm_y = 0xff;
-    pic_params->quantization.qm_u = 0xff;
-    pic_params->quantization.qm_v = 0xff;
-  }
-
-  /* Cdef params */
-  pic_params->cdef.damping = frame_hdr->cdef_params.cdef_damping - 3;
-  pic_params->cdef.bits = frame_hdr->cdef_params.cdef_bits;
-
-  for (i = 0; i < GST_AV1_CDEF_MAX; i++) {
-    guint8 secondary;
-
-    pic_params->cdef.y_strengthsi.primary =
-        frame_hdr->cdef_params.cdef_y_pri_strengthi;
-    secondary = frame_hdr->cdef_params.cdef_y_sec_strengthi;
-    if (secondary == 4)
-      secondary--;
-    pic_params->cdef.y_strengthsi.secondary = secondary;
-
-    pic_params->cdef.uv_strengthsi.primary =
-        frame_hdr->cdef_params.cdef_uv_pri_strengthi;
-    secondary = frame_hdr->cdef_params.cdef_uv_sec_strengthi;
-    if (secondary == 4)
-      secondary--;
-    pic_params->cdef.uv_strengthsi.secondary = secondary;
-  }
-
-  pic_params->interp_filter = frame_hdr->interpolation_filter;
-
-  /* SEGMENTATION */
-  pic_params->segmentation.enabled =
-      frame_hdr->segmentation_params.segmentation_enabled;
-  pic_params->segmentation.update_map =
-      frame_hdr->segmentation_params.segmentation_update_map;
-  pic_params->segmentation.update_data =
-      frame_hdr->segmentation_params.segmentation_update_data;
-  pic_params->segmentation.temporal_update =
-      frame_hdr->segmentation_params.segmentation_temporal_update;
-
-  for (i = 0; i < GST_AV1_MAX_SEGMENTS; i++) {
-    for (j = 0; j < GST_AV1_SEG_LVL_MAX; j++) {
-      pic_params->segmentation.feature_maski.mask |=
-          (frame_hdr->segmentation_params.feature_enabledij << j);
-      pic_params->segmentation.feature_dataij =
-          frame_hdr->segmentation_params.feature_dataij;
-    }
-  }
-
-  /* FILM GRAIN */
-  if (frame_hdr->film_grain_params.apply_grain) {
-    pic_params->film_grain.apply_grain = 1;
-    pic_params->film_grain.scaling_shift_minus8 =
-        frame_hdr->film_grain_params.grain_scaling_minus_8;
-    pic_params->film_grain.chroma_scaling_from_luma =
-        frame_hdr->film_grain_params.chroma_scaling_from_luma;
-    pic_params->film_grain.ar_coeff_lag =
-        frame_hdr->film_grain_params.ar_coeff_lag;
-    pic_params->film_grain.ar_coeff_shift_minus6 =
-        frame_hdr->film_grain_params.ar_coeff_shift_minus_6;
-    pic_params->film_grain.grain_scale_shift =
-        frame_hdr->film_grain_params.grain_scale_shift;
-    pic_params->film_grain.overlap_flag =
-        frame_hdr->film_grain_params.overlap_flag;
-    pic_params->film_grain.clip_to_restricted_range =
-        frame_hdr->film_grain_params.clip_to_restricted_range;
-    pic_params->film_grain.matrix_coeff_is_identity =
-        (seq_hdr->color_config.matrix_coefficients == GST_AV1_MC_IDENTITY);
-    pic_params->film_grain.grain_seed = frame_hdr->film_grain_params.grain_seed;
-    for (i = 0; i < frame_hdr->film_grain_params.num_y_points && i < 14; i++) {
-      pic_params->film_grain.scaling_points_yi0 =
-          frame_hdr->film_grain_params.point_y_valuei;
-      pic_params->film_grain.scaling_points_yi1 =
-          frame_hdr->film_grain_params.point_y_scalingi;
-    }
-    pic_params->film_grain.num_y_points =
-        frame_hdr->film_grain_params.num_y_points;
-
-    for (i = 0; i < frame_hdr->film_grain_params.num_cb_points && i < 10; i++) {
-      pic_params->film_grain.scaling_points_cbi0 =
-          frame_hdr->film_grain_params.point_cb_valuei;
-      pic_params->film_grain.scaling_points_cbi1 =
-          frame_hdr->film_grain_params.point_cb_scalingi;
-    }
-    pic_params->film_grain.num_cb_points =
-        frame_hdr->film_grain_params.num_cb_points;
-
-    for (i = 0; i < frame_hdr->film_grain_params.num_cr_points && i < 10; i++) {
-      pic_params->film_grain.scaling_points_cri0 =
-          frame_hdr->film_grain_params.point_cr_valuei;
-      pic_params->film_grain.scaling_points_cri1 =
-          frame_hdr->film_grain_params.point_cr_scalingi;
-    }
-    pic_params->film_grain.num_cr_points =
-        frame_hdr->film_grain_params.num_cr_points;
-
-    for (i = 0; i < 24; i++) {
-      pic_params->film_grain.ar_coeffs_yi =
-          frame_hdr->film_grain_params.ar_coeffs_y_plus_128i;
-    }
-
-    for (i = 0; i < 25; i++) {
-      pic_params->film_grain.ar_coeffs_cbi =
-          frame_hdr->film_grain_params.ar_coeffs_cb_plus_128i;
-      pic_params->film_grain.ar_coeffs_cri =
-          frame_hdr->film_grain_params.ar_coeffs_cr_plus_128i;
-    }
-
-    pic_params->film_grain.cb_mult = frame_hdr->film_grain_params.cb_mult;
-    pic_params->film_grain.cb_luma_mult =
-        frame_hdr->film_grain_params.cb_luma_mult;
-    pic_params->film_grain.cr_mult = frame_hdr->film_grain_params.cr_mult;
-    pic_params->film_grain.cr_luma_mult =
-        frame_hdr->film_grain_params.cr_luma_mult;
-    pic_params->film_grain.cb_offset = frame_hdr->film_grain_params.cb_offset;
-    pic_params->film_grain.cr_offset = frame_hdr->film_grain_params.cr_offset;
-  }
-
-  inner->bitstream_buffer.resize (0);
-  inner->tile_list.resize (0);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_get_picture_id (self->decoder, picture);
 }
 
 static GstFlowReturn
-gst_d3d11_av1_dec_decode_tile (GstAV1Decoder * decoder,
-    GstAV1Picture * picture, GstAV1Tile * tile)
+gst_d3d11_av1_dec_start_picture (GstDxvaAV1Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
-  GstAV1TileGroupOBU *tile_group = &tile->tile_group;
-
-  if (tile_group->num_tiles > inner->tile_list.size ())
-    inner->tile_list.resize (tile_group->num_tiles);
-
-  g_assert (tile_group->tg_end < inner->tile_list.size ());
-
-  GST_LOG_OBJECT (self, "Decode tile, tile count %d (start: %d - end: %d)",
-      tile_group->num_tiles, tile_group->tg_start, tile_group->tg_end);
-
-  for (guint i = tile_group->tg_start; i <= tile_group->tg_end; i++) {
-    GST_DXVA_Tile_AV1 *dxva_tile = &inner->tile_listi;
-
-    GST_TRACE_OBJECT (self,
-        "Tile offset %d, size %d, row %d, col %d",
-        tile_group->entryi.tile_offset, tile_group->entryi.tile_size,
-        tile_group->entryi.tile_row, tile_group->entryi.tile_col);
-
-    dxva_tile->DataOffset = inner->bitstream_buffer.size () +
-        tile_group->entryi.tile_offset;
-    dxva_tile->DataSize = tile_group->entryi.tile_size;
-    dxva_tile->row = tile_group->entryi.tile_row;
-    dxva_tile->column = tile_group->entryi.tile_col;
-    /* TODO: used for tile list OBU */
-    dxva_tile->anchor_frame = 0xff;
-  }
-
-  GST_TRACE_OBJECT (self, "OBU size %d", tile->obu.obu_size);
-
-  size_t pos = inner->bitstream_buffer.size ();
-  inner->bitstream_buffer.resize (pos + tile->obu.obu_size);
 
-  memcpy (&inner->bitstream_buffer0 + pos,
-      tile->obu.data, tile->obu.obu_size);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_start_picture (self->decoder, picture, picture_id);
 }
 
 static GstFlowReturn
-gst_d3d11_av1_dec_end_picture (GstAV1Decoder * decoder, GstAV1Picture * picture)
+gst_d3d11_av1_dec_end_picture (GstDxvaAV1Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
-  ID3D11VideoDecoderOutputView *view;
-  guint8 view_id = 0xff;
-  size_t bitstream_buffer_size;
-  size_t bitstream_pos;
-  GstD3D11DecodeInputStreamArgs input_args;
-
-  if (inner->bitstream_buffer.empty () || inner->tile_list.empty ()) {
-    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
-    return GST_FLOW_ERROR;
-  }
-
-  view = gst_d3d11_av1_dec_get_output_view_from_picture (self, picture,
-      &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_ERROR;
-  }
-
-  memset (&input_args, 0, sizeof (GstD3D11DecodeInputStreamArgs));
-
-  bitstream_pos = inner->bitstream_buffer.size ();
-  bitstream_buffer_size = GST_ROUND_UP_128 (bitstream_pos);
-
-  if (bitstream_buffer_size > bitstream_pos) {
-    size_t padding = bitstream_buffer_size - bitstream_pos;
-
-    /* As per DXVA spec, total amount of bitstream buffer size should be
-     * 128 bytes aligned. If actual data is not multiple of 128 bytes,
-     * the last slice data needs to be zero-padded */
-    inner->bitstream_buffer.resize (bitstream_buffer_size, 0);
-
-    GST_DXVA_Tile_AV1 & tile = inner->tile_list.back ();
-    tile.DataSize += padding;
-  }
 
-  input_args.picture_params = &inner->pic_params;
-  input_args.picture_params_size = sizeof (GST_DXVA_PicParams_AV1);
-  input_args.slice_control = &inner->tile_list0;
-  input_args.slice_control_size =
-      sizeof (GST_DXVA_Tile_AV1) * inner->tile_list.size ();
-  input_args.bitstream = &inner->bitstream_buffer0;
-  input_args.bitstream_size = inner->bitstream_buffer.size ();
-
-  return gst_d3d11_decoder_decode_frame (inner->d3d11_decoder,
-      view, &input_args);
+  return gst_d3d11_decoder_end_picture (self->decoder, picture, args);
 }
 
 static GstFlowReturn
-gst_d3d11_av1_dec_output_picture (GstAV1Decoder * decoder,
-    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+gst_d3d11_av1_dec_output_picture (GstDxvaAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
 {
   GstD3D11AV1Dec *self = GST_D3D11_AV1_DEC (decoder);
-  GstD3D11AV1DecInner *inner = self->inner;
-  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
-  GstBuffer *view_buffer;
-
-  GST_LOG_OBJECT (self, "Outputting picture %p, %dx%d", picture,
-      picture->frame_hdr.render_width, picture->frame_hdr.render_height);
-
-  view_buffer = (GstBuffer *) gst_av1_picture_get_user_data (picture);
-
-  if (!view_buffer) {
-    GST_ERROR_OBJECT (self, "Could not get output view");
-    goto error;
-  }
-
-  if (!gst_d3d11_decoder_process_output (inner->d3d11_decoder, vdec,
-          picture->discont_state, picture->frame_hdr.render_width,
-          picture->frame_hdr.render_height, view_buffer,
-          &frame->output_buffer)) {
-    GST_ERROR_OBJECT (self, "Failed to copy buffer");
-    goto error;
-  }
-
-  gst_av1_picture_unref (picture);
-
-  return gst_video_decoder_finish_frame (vdec, frame);
-
-error:
-  gst_av1_picture_unref (picture);
-  gst_video_decoder_release_frame (vdec, frame);
 
-  return GST_FLOW_ERROR;
+  return gst_d3d11_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
 }
 
 void
@@ -1254,18 +299,18 @@
   guint i;
   GTypeInfo type_info = {
     sizeof (GstD3D11AV1DecClass),
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     (GClassInitFunc) gst_d3d11_av1_dec_class_init,
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     sizeof (GstD3D11AV1Dec),
     0,
     (GInstanceInitFunc) gst_d3d11_av1_dec_init,
   };
-  const GUID *profile_guid = NULL;
-  GstCaps *sink_caps = NULL;
-  GstCaps *src_caps = NULL;
+  const GUID *profile_guid = nullptr;
+  GstCaps *sink_caps = nullptr;
+  GstCaps *src_caps = nullptr;
   guint max_width = 0;
   guint max_height = 0;
   guint resolution;
@@ -1332,7 +377,7 @@
     gst_caps_set_value (src_caps, "format", &format_list);
     g_value_unset (&format_list);
   } else {
-    gst_caps_set_simple (src_caps, "format", G_TYPE_STRING, "NV12", NULL);
+    gst_caps_set_simple (src_caps, "format", G_TYPE_STRING, "NV12", nullptr);
   }
 
   /* To cover both landscape and portrait, select max value */
@@ -1353,7 +398,7 @@
     feature_name = g_strdup_printf ("d3d11av1device%ddec", index);
   }
 
-  type = g_type_register_static (GST_TYPE_AV1_DECODER,
+  type = g_type_register_static (GST_TYPE_DXVA_AV1_DECODER,
       type_name, &type_info, (GTypeFlags) 0);
 
   /* make lower rank than default device */

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11av1dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11av1dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11basefilter.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11basefilter.cpp Changed

@@ -26,6 +26,9 @@
 GST_DEBUG_CATEGORY_STATIC (gst_d3d11_base_filter_debug);
 #define GST_CAT_DEFAULT gst_d3d11_base_filter_debug
 
+#define META_TAG_VIDEO meta_tag_video_quark
+static GQuark meta_tag_video_quark;
+
 enum
 {
   PROP_0,
@@ -57,6 +60,8 @@
     GstPadDirection direction, GstQuery * query);
 static void gst_d3d11_base_filter_before_transform (GstBaseTransform * trans,
     GstBuffer * buffer);
+static gboolean gst_d3d11_base_filter_transform_meta (GstBaseTransform * trans,
+    GstBuffer * outbuf, GstMeta * meta, GstBuffer * inbuf);
 
 static void
 gst_d3d11_base_filter_class_init (GstD3D11BaseFilterClass * klass)
@@ -96,9 +101,12 @@
   trans_class->query = GST_DEBUG_FUNCPTR (gst_d3d11_base_filter_query);
   trans_class->before_transform =
       GST_DEBUG_FUNCPTR (gst_d3d11_base_filter_before_transform);
+  trans_class->transform_meta =
+      GST_DEBUG_FUNCPTR (gst_d3d11_base_filter_transform_meta);
 
   gst_type_mark_as_plugin_api (GST_TYPE_D3D11_BASE_FILTER,
       (GstPluginAPIFlags) 0);
+  meta_tag_video_quark = g_quark_from_static_string (GST_META_TAG_VIDEO_STR);
 }
 
 static void
@@ -341,3 +349,21 @@
 
   return;
 }
+
+static gboolean
+gst_d3d11_base_filter_transform_meta (GstBaseTransform * trans,
+    GstBuffer * outbuf, GstMeta * meta, GstBuffer * inbuf)
+{
+  const GstMetaInfo *info = meta->info;
+  const gchar *const *tags;
+
+  tags = gst_meta_api_type_get_tags (info->api);
+
+  if (!tags || (g_strv_length ((gchar **) tags) == 1
+          && gst_meta_api_type_has_tag (info->api, META_TAG_VIDEO))) {
+    return TRUE;
+  }
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->transform_meta (trans, outbuf,
+      meta, inbuf);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11compositor.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11compositor.cpp Changed

@@ -134,7 +134,7 @@
           "padding or keeping the aspect ratio", "none"},
     {GST_D3D11_COMPOSITOR_SIZING_POLICY_KEEP_ASPECT_RATIO,
           "Keep Aspect Ratio: Image is scaled to fit destination rectangle "
-          "specified by GstCompositorPad:{xpos, ypos, width, height} "
+          "specified by GstD3D11CompositorPad:{xpos, ypos, width, height} "
           "with preserved aspect ratio. Resulting image will be centered in "
           "the destination rectangle with padding if necessary",
         "keep-aspect-ratio"},
@@ -150,109 +150,6 @@
 }
 
 /* *INDENT-OFF* */
-static const gchar checker_vs_src =
-    "struct VS_INPUT\n"
-    "{\n"
-    "  float4 Position : POSITION;\n"
-    "};\n"
-    "\n"
-    "struct VS_OUTPUT\n"
-    "{\n"
-    "  float4 Position: SV_POSITION;\n"
-    "};\n"
-    "\n"
-    "VS_OUTPUT main(VS_INPUT input)\n"
-    "{\n"
-    "  return input;\n"
-    "}\n";
-
-static const gchar checker_ps_src_rgb =
-    "static const float blocksize = 8.0;\n"
-    "static const float4 high = float4(0.667, 0.667, 0.667, 1.0);\n"
-    "static const float4 low = float4(0.333, 0.333, 0.333, 1.0);\n"
-    "struct PS_INPUT\n"
-    "{\n"
-    "  float4 Position: SV_POSITION;\n"
-    "};\n"
-    "struct PS_OUTPUT\n"
-    "{\n"
-    "  float4 Plane: SV_TARGET;\n"
-    "};\n"
-    "PS_OUTPUT main(PS_INPUT input)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  if ((input.Position.x % (blocksize * 2.0)) >= blocksize) {\n"
-    "    if ((input.Position.y % (blocksize * 2.0)) >= blocksize)\n"
-    "      output.Plane = low;\n"
-    "    else\n"
-    "      output.Plane = high;\n"
-    "  } else {\n"
-    "    if ((input.Position.y % (blocksize * 2.0)) < blocksize)\n"
-    "      output.Plane = low;\n"
-    "    else\n"
-    "      output.Plane = high;\n"
-    "  }\n"
-    "  return output;\n"
-    "}\n";
-
-static const gchar checker_ps_src_vuya =
-    "static const float blocksize = 8.0;\n"
-    "static const float4 high = float4(0.5, 0.5, 0.667, 1.0);\n"
-    "static const float4 low = float4(0.5, 0.5, 0.333, 1.0);\n"
-    "struct PS_INPUT\n"
-    "{\n"
-    "  float4 Position: SV_POSITION;\n"
-    "};\n"
-    "struct PS_OUTPUT\n"
-    "{\n"
-    "  float4 Plane: SV_TARGET;\n"
-    "};\n"
-    "PS_OUTPUT main(PS_INPUT input)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  if ((input.Position.x % (blocksize * 2.0)) >= blocksize) {\n"
-    "    if ((input.Position.y % (blocksize * 2.0)) >= blocksize)\n"
-    "      output.Plane = low;\n"
-    "    else\n"
-    "      output.Plane = high;\n"
-    "  } else {\n"
-    "    if ((input.Position.y % (blocksize * 2.0)) < blocksize)\n"
-    "      output.Plane = low;\n"
-    "    else\n"
-    "      output.Plane = high;\n"
-    "  }\n"
-    "  return output;\n"
-    "}\n";
-
-static const gchar checker_ps_src_luma =
-    "static const float blocksize = 8.0;\n"
-    "static const float4 high = float4(0.667, 0.0, 0.0, 1.0);\n"
-    "static const float4 low = float4(0.333, 0.0, 0.0, 1.0);\n"
-    "struct PS_INPUT\n"
-    "{\n"
-    "  float4 Position: SV_POSITION;\n"
-    "};\n"
-    "struct PS_OUTPUT\n"
-    "{\n"
-    "  float4 Plane: SV_TARGET;\n"
-    "};\n"
-    "PS_OUTPUT main(PS_INPUT input)\n"
-    "{\n"
-    "  PS_OUTPUT output;\n"
-    "  if ((input.Position.x % (blocksize * 2.0)) >= blocksize) {\n"
-    "    if ((input.Position.y % (blocksize * 2.0)) >= blocksize)\n"
-    "      output.Plane = low;\n"
-    "    else\n"
-    "      output.Plane = high;\n"
-    "  } else {\n"
-    "    if ((input.Position.y % (blocksize * 2.0)) < blocksize)\n"
-    "      output.Plane = low;\n"
-    "    else\n"
-    "      output.Plane = high;\n"
-    "  }\n"
-    "  return output;\n"
-    "}\n";
-
 static D3D11_RENDER_TARGET_BLEND_DESC blend_templ = {
   /* SOURCE */
   {
@@ -302,6 +199,7 @@
   ID3D11PixelShader *ps;
   ID3D11VertexShader *vs;
   ID3D11InputLayout *layout;
+  ID3D11RasterizerState *rs;
   ID3D11Buffer *vertex_buffer;
   ID3D11Buffer *index_buffer;
   D3D11_VIEWPORT viewport;
@@ -966,6 +864,7 @@
   PROP_0,
   PROP_ADAPTER,
   PROP_BACKGROUND,
+  PROP_IGNORE_INACTIVE_PADS,
 };
 
 #define DEFAULT_ADAPTER -1
@@ -1040,6 +939,26 @@
           DEFAULT_BACKGROUND,
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
+  /**
+   * GstD3D11Compositor:ignore-inactive-pads:
+   *
+   * Don't wait for inactive pads when live. An inactive pad
+   * is a pad that hasn't yet received a buffer, but that has
+   * been waited on at least once.
+   *
+   * The purpose of this property is to avoid aggregating on
+   * timeout when new pads are requested in advance of receiving
+   * data flow, for example the user may decide to connect it later,
+   * but wants to configure it already.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class,
+      PROP_IGNORE_INACTIVE_PADS, g_param_spec_boolean ("ignore-inactive-pads",
+          "Ignore inactive pads",
+          "Avoid timing out waiting for inactive pads", FALSE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
   element_class->request_new_pad =
       GST_DEBUG_FUNCPTR (gst_d3d11_compositor_request_new_pad);
   element_class->release_pad =
@@ -1123,6 +1042,10 @@
       self->background =
           (GstD3D11CompositorBackground) g_value_get_enum (value);
       break;
+    case PROP_IGNORE_INACTIVE_PADS:
+      gst_aggregator_set_ignore_inactive_pads (GST_AGGREGATOR (object),
+          g_value_get_boolean (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1142,6 +1065,10 @@
     case PROP_BACKGROUND:
       g_value_set_enum (value, self->background);
       break;
+    case PROP_IGNORE_INACTIVE_PADS:
+      g_value_set_boolean (value,
+          gst_aggregator_get_ignore_inactive_pads (GST_AGGREGATOR (object)));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1849,14 +1776,11 @@
     d3d11_params = gst_buffer_pool_config_get_d3d11_allocation_params (config);
     if (!d3d11_params) {
       d3d11_params = gst_d3d11_allocation_params_new (self->device,
-          &info, GST_D3D11_ALLOCATION_FLAG_DEFAULT, D3D11_BIND_RENDER_TARGET,
-          0);
+          &info, GST_D3D11_ALLOCATION_FLAG_DEFAULT,
+          D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET, 0);
     } else {
-      guint i;
-
-      for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&info); i++) {
-        d3d11_params->desci.BindFlags |= D3D11_BIND_RENDER_TARGET;
-      }
+      gst_d3d11_allocation_params_set_bind_flags (d3d11_params,
+          D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET);
     }
 
     gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
@@ -1900,76 +1824,46 @@
     const GstVideoInfo * info)
 {
   GstD3D11CompositorQuad *quad = nullptr;
-  VertexData *vertex_data;
-  WORD *indices;
+  VertexData vertex_data4;
+  const WORD indices6 = { 0, 1, 2, 3, 0, 2 };
   ID3D11Device *device_handle;
-  ID3D11DeviceContext *context_handle;
-  D3D11_MAPPED_SUBRESOURCE map;
-  D3D11_INPUT_ELEMENT_DESC input_desc;
   D3D11_BUFFER_DESC buffer_desc;
+  D3D11_SUBRESOURCE_DATA subresource;
   ComPtr < ID3D11Buffer > vertex_buffer;
   ComPtr < ID3D11Buffer > index_buffer;
   ComPtr < ID3D11PixelShader > ps;
   ComPtr < ID3D11VertexShader > vs;
   ComPtr < ID3D11InputLayout > layout;
+  ComPtr < ID3D11RasterizerState > rs;
   HRESULT hr;
-  const gchar *ps_src;
 
   device_handle = gst_d3d11_device_get_device_handle (self->device);
-  context_handle = gst_d3d11_device_get_device_context_handle (self->device);
 
   if (GST_VIDEO_INFO_IS_RGB (info)) {
-    ps_src = checker_ps_src_rgb;
+    hr = gst_d3d11_get_pixel_shader_checker_rgb (self->device, &ps);
   } else if (GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_FORMAT_VUYA) {
-    ps_src = checker_ps_src_vuya;
+    hr = gst_d3d11_get_pixel_shader_checker_vuya (self->device, &ps);
   } else {
-    ps_src = checker_ps_src_luma;
+    hr = gst_d3d11_get_pixel_shader_checker_luma (self->device, &ps);
   }
 
-  hr = gst_d3d11_create_pixel_shader_simple (self->device, ps_src, "main", &ps);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self, "Couldn't setup pixel shader");
     return nullptr;
   }
 
-  memset (&input_desc, 0, sizeof (D3D11_INPUT_ELEMENT_DESC));
-  input_desc.SemanticName = "POSITION";
-  input_desc.SemanticIndex = 0;
-  input_desc.Format = DXGI_FORMAT_R32G32B32_FLOAT;
-  input_desc.InputSlot = 0;
-  input_desc.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-  input_desc.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-  input_desc.InstanceDataStepRate = 0;
-
-  hr = gst_d3d11_create_vertex_shader_simple (self->device, checker_vs_src,
-      "main", &input_desc, 1, &vs, &layout);
+  hr = gst_d3d11_get_vertex_shader_pos (self->device, &vs, &layout);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self, "Couldn't setup vertex shader");
     return nullptr;
   }
 
-  memset (&buffer_desc, 0, sizeof (D3D11_BUFFER_DESC));
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (VertexData) * 4;
-  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &vertex_buffer);
+  hr = gst_d3d11_device_get_rasterizer (self->device, &rs);
   if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self,
-        "Couldn't create vertex buffer, hr: 0x%x", (guint) hr);
+    GST_ERROR_OBJECT (self, "Couldn't setup rasterizer state");
     return nullptr;
   }
 
-  hr = context_handle->Map (vertex_buffer.Get (),
-      0, D3D11_MAP_WRITE_DISCARD, 0, &map);
-
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Couldn't map vertex buffer, hr: 0x%x", (guint) hr);
-    return nullptr;
-  }
-
-  vertex_data = (VertexData *) map.pData;
   /* bottom left */
   vertex_data0.position.x = -1.0f;
   vertex_data0.position.y = -1.0f;
@@ -1998,44 +1892,45 @@
   vertex_data3.texture.u = 1.0f;
   vertex_data3.texture.v = 1.0f;
 
-  context_handle->Unmap (vertex_buffer.Get (), 0);
+  memset (&subresource, 0, sizeof (D3D11_SUBRESOURCE_DATA));
+  memset (&buffer_desc, 0, sizeof (D3D11_BUFFER_DESC));
 
   buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (WORD) * 6;
-  buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
+  buffer_desc.ByteWidth = sizeof (VertexData) * 4;
+  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
   buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
 
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &index_buffer);
+  subresource.pSysMem = vertex_data;
+  subresource.SysMemPitch = sizeof (VertexData) * 4;
+
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &vertex_buffer);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self,
-        "Couldn't create index buffer, hr: 0x%x", (guint) hr);
+        "Couldn't create vertex buffer, hr: 0x%x", (guint) hr);
     return nullptr;
   }
 
-  hr = context_handle->Map (index_buffer.Get (),
-      0, D3D11_MAP_WRITE_DISCARD, 0, &map);
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (WORD) * 6;
+  buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+
+  subresource.pSysMem = indices;
+  subresource.SysMemPitch = sizeof (WORD) * 6;
 
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &index_buffer);
   if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Couldn't map index buffer, hr: 0x%x", (guint) hr);
+    GST_ERROR_OBJECT (self,
+        "Couldn't create index buffer, hr: 0x%x", (guint) hr);
     return nullptr;
   }
 
-  indices = (WORD *) map.pData;
-
-  /* clockwise indexing */
-  indices0 = 0;               /* bottom left */
-  indices1 = 1;               /* top left */
-  indices2 = 2;               /* top right */
-
-  indices3 = 3;               /* bottom right */
-  indices4 = 0;               /* bottom left  */
-  indices5 = 2;               /* top right */
-
-  context_handle->Unmap (index_buffer.Get (), 0);
   quad = g_new0 (GstD3D11CompositorQuad, 1);
   quad->ps = ps.Detach ();
   quad->vs = vs.Detach ();
+  quad->rs = rs.Detach ();
   quad->layout = layout.Detach ();
+
   quad->vertex_buffer = vertex_buffer.Detach ();
   quad->index_buffer = index_buffer.Detach ();
 
@@ -2058,6 +1953,7 @@
   GST_D3D11_CLEAR_COM (quad->ps);
   GST_D3D11_CLEAR_COM (quad->vs);
   GST_D3D11_CLEAR_COM (quad->layout);
+  GST_D3D11_CLEAR_COM (quad->rs);
   GST_D3D11_CLEAR_COM (quad->vertex_buffer);
   GST_D3D11_CLEAR_COM (quad->index_buffer);
 
@@ -2091,6 +1987,7 @@
   context->VSSetShader (quad->vs, nullptr, 0);
   context->PSSetShader (quad->ps, nullptr, 0);
   context->RSSetViewports (1, &quad->viewport);
+  context->RSSetState (quad->rs);
   context->OMSetRenderTargets (1, &rtv, nullptr);
   context->OMSetBlendState (nullptr, nullptr, 0xffffffff);
   context->DrawIndexed (6, 0, 0);

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11convert.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11convert.cpp Changed

@@ -52,6 +52,13 @@
 #define DEFAULT_BORDER_COLOR G_GUINT64_CONSTANT(0xffff000000000000)
 #define DEFAULT_GAMMA_MODE GST_VIDEO_GAMMA_MODE_NONE
 #define DEFAULT_PRIMARIES_MODE GST_VIDEO_PRIMARIES_MODE_NONE
+#define DEFAULT_SAMPLING_METHOD GST_D3D11_SAMPLING_METHOD_BILINEAR
+#define DEFAULT_ALPHA_MODE GST_D3D11_ALPHA_MODE_UNSPECIFIED
+#define DEFAULT_ROTATION 0.0f
+#define DEFAULT_SCALE 1.0f
+#define DEFAULT_FOV 90.0f
+#define DEFAULT_ORTHO FALSE
+#define DEFAULT_MSAA GST_D3D11_MSAA_DISABLED
 
 struct _GstD3D11BaseConvert
 {
@@ -69,6 +76,9 @@
   gint borders_h;
   gint borders_w;
 
+  GstBuffer *msaa_buf;
+  GstBufferPool *msaa_pool;
+
   /* Updated by subclass */
   gboolean add_borders;
   gboolean active_add_borders;
@@ -81,6 +91,10 @@
   GstVideoPrimariesMode primaries_mode;
   GstVideoPrimariesMode active_primaries_mode;
 
+  /* sampling method, configured via property */
+  GstD3D11SamplingMethod sampling_method;
+  GstD3D11SamplingMethod active_sampling_method;
+
   /* orientation */
   /* method configured via property */
   GstVideoOrientationMethod method;
@@ -91,6 +105,22 @@
   /* method previously selected and used for negotiation */
   GstVideoOrientationMethod active_method;
 
+  GstD3D11AlphaMode src_alpha_mode;
+  GstD3D11AlphaMode dst_alpha_mode;
+
+  /* transform */
+  gfloat fov;
+  gboolean ortho;
+  gfloat rotation_x;
+  gfloat rotation_y;
+  gfloat rotation_z;
+  gfloat scale_x;
+  gfloat scale_y;
+  gboolean transform_updated;
+
+  GstD3D11MSAAMode msaa;
+  gboolean msaa_updated;
+
   SRWLOCK lock;
 };
 
@@ -107,6 +137,18 @@
     GST_DEBUG_CATEGORY_INIT (gst_d3d11_convert_debug, "d3d11convert", 0,
         "d3d11convert"));
 
+enum
+{
+  PROP_BASE_CONVERT_0,
+  PROP_BASE_CONVERT_SAMPLING_METHOD,
+};
+
+static void
+gst_d3d11_base_convert_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void
+gst_d3d11_base_convert_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
 static void gst_d3d11_base_convert_dispose (GObject * object);
 static GstCaps *gst_d3d11_base_convert_transform_caps (GstBaseTransform *
     trans, GstPadDirection direction, GstCaps * caps, GstCaps * filter);
@@ -130,6 +172,9 @@
 static gboolean gst_d3d11_base_convert_set_info (GstD3D11BaseFilter * filter,
     GstCaps * incaps, GstVideoInfo * in_info, GstCaps * outcaps,
     GstVideoInfo * out_info);
+static void
+gst_d3d11_base_convert_set_sampling_method (GstD3D11BaseConvert * self,
+    GstD3D11SamplingMethod method);
 
 /* copies the given caps */
 static GstCaps *
@@ -265,8 +310,25 @@
   GstD3D11BaseFilterClass *bfilter_class = GST_D3D11_BASE_FILTER_CLASS (klass);
   GstCaps *caps;
 
+  gobject_class->set_property = gst_d3d11_base_convert_set_property;
+  gobject_class->get_property = gst_d3d11_base_convert_get_property;
   gobject_class->dispose = gst_d3d11_base_convert_dispose;
 
+  /**
+   * GstD3D11BaseConvert:method:
+   *
+   * Method used for sampling
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class,
+      PROP_BASE_CONVERT_SAMPLING_METHOD,
+      g_param_spec_enum ("method", "Method",
+          "Method used for sampling",
+          GST_TYPE_D3D11_SAMPLING_METHOD, DEFAULT_SAMPLING_METHOD,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
   caps = gst_d3d11_get_updated_template_caps (&sink_template_caps);
   gst_element_class_add_pad_template (element_class,
       gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, caps));
@@ -299,6 +361,11 @@
 
   gst_type_mark_as_plugin_api (GST_TYPE_D3D11_BASE_CONVERT,
       (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D11_SAMPLING_METHOD,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D11_ALPHA_MODE,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D11_MSAA_MODE, (GstPluginAPIFlags) 0);
 }
 
 static void
@@ -308,6 +375,17 @@
   self->border_color = DEFAULT_BORDER_COLOR;
   self->gamma_mode = self->active_gamma_mode = DEFAULT_GAMMA_MODE;
   self->primaries_mode = self->active_primaries_mode = DEFAULT_PRIMARIES_MODE;
+  self->sampling_method = self->active_sampling_method =
+      DEFAULT_SAMPLING_METHOD;
+  self->src_alpha_mode = self->dst_alpha_mode = DEFAULT_ALPHA_MODE;
+  self->fov = DEFAULT_FOV;
+  self->ortho = DEFAULT_ORTHO;
+  self->rotation_x = DEFAULT_ROTATION;
+  self->rotation_y = DEFAULT_ROTATION;
+  self->rotation_z = DEFAULT_ROTATION;
+  self->scale_x = DEFAULT_SCALE;
+  self->scale_y = DEFAULT_SCALE;
+  self->msaa = DEFAULT_MSAA;
 }
 
 static void
@@ -316,10 +394,48 @@
   GstD3D11BaseConvert *self = GST_D3D11_BASE_CONVERT (object);
 
   gst_clear_object (&self->converter);
+  gst_clear_buffer (&self->msaa_buf);
+  if (self->msaa_pool) {
+    gst_buffer_pool_set_active (self->msaa_pool, FALSE);
+    gst_clear_object (&self->msaa_pool);
+  }
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
+static void
+gst_d3d11_base_convert_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstD3D11BaseConvert *base = GST_D3D11_BASE_CONVERT (object);
+
+  switch (prop_id) {
+    case PROP_BASE_CONVERT_SAMPLING_METHOD:
+      gst_d3d11_base_convert_set_sampling_method (base,
+          (GstD3D11SamplingMethod) g_value_get_enum (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d11_base_convert_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstD3D11BaseConvert *base = GST_D3D11_BASE_CONVERT (object);
+
+  switch (prop_id) {
+    case PROP_BASE_CONVERT_SAMPLING_METHOD:
+      g_value_set_enum (value, base->sampling_method);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
 static GstCaps *
 gst_d3d11_base_convert_transform_caps (GstBaseTransform *
     trans, GstPadDirection direction, GstCaps * caps, GstCaps * filter)
@@ -1274,10 +1390,7 @@
     d3d11_params = gst_d3d11_allocation_params_new (filter->device, &info,
         GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags, 0);
   } else {
-    /* Set bind flag */
-    for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&info); i++) {
-      d3d11_params->desci.BindFlags |= bind_flags;
-    }
+    gst_d3d11_allocation_params_set_bind_flags (d3d11_params, bind_flags);
   }
 
   gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
@@ -1328,9 +1441,8 @@
   GstD3D11AllocationParams *d3d11_params;
   gboolean update_pool = FALSE;
   GstVideoInfo info;
-  guint i;
   GstD3D11Format d3d11_format;
-  guint bind_flags = D3D11_BIND_RENDER_TARGET;
+  guint bind_flags = 0;
   DXGI_FORMAT dxgi_format = DXGI_FORMAT_UNKNOWN;
   UINT supported = 0;
   HRESULT hr;
@@ -1365,12 +1477,30 @@
 
   device_handle = gst_d3d11_device_get_device_handle (filter->device);
   hr = device_handle->CheckFormatSupport (dxgi_format, &supported);
-  if (gst_d3d11_result (hr, filter->device) &&
-      (supported & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE) ==
-      D3D11_FORMAT_SUPPORT_SHADER_SAMPLE) {
-    bind_flags |= D3D11_BIND_SHADER_RESOURCE;
+  if (!gst_d3d11_result (hr, filter->device)) {
+    GST_ERROR_OBJECT (self, "CheckFormatSupport failed");
+    return FALSE;
+  }
+
+  if ((supported & D3D11_FORMAT_SUPPORT_RENDER_TARGET) != 0) {
+    bind_flags |= D3D11_BIND_RENDER_TARGET;
+    if (d3d11_format.dxgi_format == DXGI_FORMAT_UNKNOWN &&
+        (supported & D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW) != 0) {
+      bind_flags |= D3D11_BIND_UNORDERED_ACCESS;
+    }
+  } else {
+    if (d3d11_format.dxgi_format != DXGI_FORMAT_UNKNOWN &&
+        (supported & D3D11_FORMAT_SUPPORT_VIDEO_PROCESSOR_OUTPUT) != 0) {
+      bind_flags |= D3D11_BIND_RENDER_TARGET;
+    }
+
+    if ((supported & D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW) != 0)
+      bind_flags |= D3D11_BIND_UNORDERED_ACCESS;
   }
 
+  if ((supported & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE) != 0)
+    bind_flags |= D3D11_BIND_SHADER_RESOURCE;
+
   size = GST_VIDEO_INFO_SIZE (&info);
 
   if (gst_query_get_n_allocation_pools (query) > 0) {
@@ -1399,10 +1529,7 @@
     d3d11_params = gst_d3d11_allocation_params_new (filter->device, &info,
         GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags, 0);
   } else {
-    /* Set bind flag */
-    for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&info); i++) {
-      d3d11_params->desci.BindFlags |= bind_flags;
-    }
+    gst_d3d11_allocation_params_set_bind_flags (d3d11_params, bind_flags);
   }
 
   gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
@@ -1456,6 +1583,106 @@
   return FALSE;
 }
 
+static void
+gst_d3d11_base_convert_setup_msaa_texture (GstD3D11BaseConvert * self,
+    GstD3D11Device * device, const GstVideoInfo * info, GstCaps * caps)
+{
+  ID3D11Device *device_handle;
+  UINT quality_levels = 0;
+  UINT sample_count = 1;
+  GstD3D11Format device_format;
+  DXGI_FORMAT dxgi_format;
+  GstD3D11AllocationParams *params;
+  GstStructure *config;
+  HRESULT hr;
+
+  gst_clear_buffer (&self->msaa_buf);
+  if (self->msaa_pool) {
+    gst_buffer_pool_set_active (self->msaa_pool, FALSE);
+    gst_clear_object (&self->msaa_pool);
+  }
+
+  switch (self->msaa) {
+    case GST_D3D11_MSAA_2X:
+      sample_count = 2;
+      break;
+    case GST_D3D11_MSAA_4X:
+      sample_count = 4;
+      break;
+    case GST_D3D11_MSAA_8X:
+      sample_count = 8;
+      break;
+    default:
+      return;
+  }
+
+  if (!gst_d3d11_device_get_format (device, GST_VIDEO_INFO_FORMAT (info),
+          &device_format)) {
+    GST_WARNING_OBJECT (self, "Couldn't get device format");
+    return;
+  }
+
+  if (device_format.dxgi_format == DXGI_FORMAT_UNKNOWN ||
+      (device_format.format_support0 &
+          D3D11_FORMAT_SUPPORT_RENDER_TARGET) == 0) {
+    GST_DEBUG_OBJECT (self,
+        "MSAA supported only for native and RTV available formats");;
+    return;
+  } else {
+    dxgi_format = device_format.dxgi_format;
+  }
+
+  device_handle = gst_d3d11_device_get_device_handle (device);
+  while (sample_count > 1) {
+    hr = device_handle->CheckMultisampleQualityLevels (dxgi_format,
+        sample_count, &quality_levels);
+    if (gst_d3d11_result (hr, device) && quality_levels > 0)
+      break;
+
+    sample_count = sample_count / 2;
+  };
+
+  if (sample_count <= 1 || quality_levels == 0) {
+    GST_DEBUG_OBJECT (self, "Device does not support MSAA for DXGI format %d",
+        dxgi_format);
+    return;
+  }
+
+  self->msaa_pool = gst_d3d11_buffer_pool_new (device);
+  config = gst_buffer_pool_get_config (self->msaa_pool);
+
+  params = gst_d3d11_allocation_params_new (device, info,
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT, D3D11_BIND_RENDER_TARGET, 0);
+  gst_d3d11_allocation_params_set_sample_desc (params,
+      sample_count, quality_levels - 1);
+
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_d3d11_allocation_params_free (params);
+
+  gst_buffer_pool_config_set_params (config, caps, info->size, 0, 0);
+  if (!gst_buffer_pool_set_config (self->msaa_pool, config)) {
+    GST_ERROR_OBJECT (self, "Couldn't set pool config");
+    gst_clear_object (&self->msaa_pool);
+    return;
+  }
+
+  if (!gst_buffer_pool_set_active (self->msaa_pool, TRUE)) {
+    GST_ERROR_OBJECT (self, "Pool active failed");
+    gst_clear_object (&self->msaa_pool);
+    return;
+  }
+
+  gst_buffer_pool_acquire_buffer (self->msaa_pool, &self->msaa_buf, nullptr);
+  if (!self->msaa_buf) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire MSAA buffer");
+    gst_buffer_pool_set_active (self->msaa_pool, FALSE);
+    gst_clear_object (&self->msaa_pool);
+    return;
+  }
+
+  GST_DEBUG_OBJECT (self, "MSAA %dx buffer is configured", sample_count);
+}
+
 static gboolean
 gst_d3d11_base_convert_set_info (GstD3D11BaseFilter * filter,
     GstCaps * incaps, GstVideoInfo * in_info, GstCaps * outcaps,
@@ -1466,7 +1693,9 @@
   gint border_offset_x = 0;
   gint border_offset_y = 0;
   gboolean need_flip = FALSE;
+  gboolean need_transform = FALSE;
   gint in_width, in_height, in_par_n, in_par_d;
+  gint out_width, out_height;
   GstStructure *config;
 
   GstD3D11SRWLockGuard lk (&self->lock);
@@ -1474,18 +1703,24 @@
   self->active_add_borders = self->add_borders;
   self->active_gamma_mode = self->gamma_mode;
   self->active_primaries_mode = self->primaries_mode;
+  self->active_sampling_method = self->sampling_method;
+
+  self->transform_updated = FALSE;
+  self->msaa_updated = FALSE;
 
   GST_DEBUG_OBJECT (self, "method %d, add-borders %d, gamma-mode %d, "
-      "primaries-mode %d", self->active_method,
+      "primaries-mode %d, sampling %d", self->active_method,
       self->active_add_borders, self->active_gamma_mode,
-      self->active_primaries_mode);
+      self->active_primaries_mode, self->active_sampling_method);
 
   if (self->active_method != GST_VIDEO_ORIENTATION_IDENTITY)
     need_flip = TRUE;
 
-  if (!need_flip && gst_caps_is_equal (incaps, outcaps)) {
+  need_transform = gst_d3d11_need_transform (self->rotation_x, self->rotation_y,
+      self->rotation_z, self->scale_x, self->scale_y);
+
+  if (!need_flip && !need_transform && gst_caps_is_equal (incaps, outcaps)) {
     self->same_caps = TRUE;
-    return TRUE;
   } else {
     self->same_caps = FALSE;
   }
@@ -1560,17 +1795,25 @@
 
   if (in_width == out_info->width && in_height == out_info->height
       && in_info->finfo == out_info->finfo && self->borders_w == 0 &&
-      self->borders_h == 0 && !need_flip &&
+      self->borders_h == 0 && !need_flip && !need_transform &&
       !gst_d3d11_base_convert_needs_color_convert (self, in_info, out_info)) {
     self->same_caps = TRUE;
-    return TRUE;
   }
 
   config = gst_structure_new ("convert-config",
       GST_D3D11_CONVERTER_OPT_GAMMA_MODE,
       GST_TYPE_VIDEO_GAMMA_MODE, self->active_gamma_mode,
       GST_D3D11_CONVERTER_OPT_PRIMARIES_MODE,
-      GST_TYPE_VIDEO_PRIMARIES_MODE, self->active_primaries_mode, nullptr);
+      GST_TYPE_VIDEO_PRIMARIES_MODE, self->active_primaries_mode,
+      GST_D3D11_CONVERTER_OPT_SAMPLER_FILTER,
+      GST_TYPE_D3D11_CONVERTER_SAMPLER_FILTER,
+      gst_d3d11_sampling_method_to_native
+      (self->active_sampling_method),
+      GST_D3D11_CONVERTER_OPT_SRC_ALPHA_MODE,
+      GST_TYPE_D3D11_CONVERTER_ALPHA_MODE,
+      self->src_alpha_mode,
+      GST_D3D11_CONVERTER_OPT_DEST_ALPHA_MODE,
+      GST_TYPE_D3D11_CONVERTER_ALPHA_MODE, self->dst_alpha_mode, nullptr);
 
   self->converter = gst_d3d11_converter_new (filter->device, in_info, out_info,
       config);
@@ -1611,17 +1854,33 @@
     self->out_rect.bottom = GST_VIDEO_INFO_HEIGHT (out_info);
   }
 
+  out_width = self->out_rect.right - self->out_rect.left;
+  out_height = self->out_rect.bottom - self->out_rect.top;
+
   g_object_set (self->converter, "dest-x", (gint) self->out_rect.left,
       "dest-y", (gint) self->out_rect.top,
-      "dest-width", (gint) (self->out_rect.right - self->out_rect.left),
-      "dest-height", (gint) (self->out_rect.bottom - self->out_rect.top),
-      "video-direction", self->active_method, nullptr);
+      "dest-width", out_width, "dest-height", out_height, nullptr);
+
+  if (need_transform) {
+    GST_DEBUG_OBJECT (self, "Applying custom transform");
+
+    gst_d3d11_converter_apply_transform (self->converter, self->active_method,
+        (gfloat) out_width, (gfloat) out_height, self->fov,
+        self->ortho, self->rotation_x, self->rotation_y,
+        self->rotation_z, self->scale_x, self->scale_y);
+  } else {
+    g_object_set (self->converter,
+        "video-direction", self->active_method, nullptr);
+  }
 
-  if (self->borders_w > 0 || self->borders_h > 0) {
+  if (self->borders_w > 0 || self->borders_h > 0 || need_transform) {
     g_object_set (self->converter, "fill-border", TRUE, "border-color",
         self->border_color, nullptr);
   }
 
+  gst_d3d11_base_convert_setup_msaa_texture (self, filter->device,
+      out_info, outcaps);
+
   return TRUE;
 }
 
@@ -1796,6 +2055,20 @@
   return TRUE;
 }
 
+static gboolean
+gst_d3d11_base_convert_need_convert (GstD3D11BaseConvert * self)
+{
+  if (!self->same_caps)
+    return TRUE;
+
+  if (self->src_alpha_mode == GST_D3D11_ALPHA_MODE_PREMULTIPLIED ||
+      self->dst_alpha_mode == GST_D3D11_ALPHA_MODE_PREMULTIPLIED) {
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
 static GstFlowReturn
 gst_d3d11_base_convert_generate_output (GstBaseTransform * trans,
     GstBuffer ** buffer)
@@ -1805,7 +2078,7 @@
   GstVideoCropMeta *crop_meta;
   GstFlowReturn ret;
 
-  if (!self->same_caps) {
+  if (gst_d3d11_base_convert_need_convert (self)) {
     return GST_BASE_TRANSFORM_CLASS (parent_class)->generate_output (trans,
         buffer);
   }
@@ -1889,7 +2162,9 @@
   if (self->selected_method != self->active_method ||
       self->add_borders != self->active_add_borders ||
       self->gamma_mode != self->active_gamma_mode ||
-      self->primaries_mode != self->active_primaries_mode) {
+      self->primaries_mode != self->active_primaries_mode ||
+      self->sampling_method != self->active_sampling_method ||
+      self->transform_updated || self->msaa_updated) {
     update = TRUE;
   }
   ReleaseSRWLockExclusive (&self->lock);
@@ -1925,8 +2200,12 @@
     GstBuffer * inbuf, GstBuffer * outbuf)
 {
   GstD3D11BaseConvert *self = GST_D3D11_BASE_CONVERT (trans);
+  GstD3D11BaseFilter *filter = GST_D3D11_BASE_FILTER (trans);
   RECT in_rect;
   GstVideoCropMeta *crop_meta;
+  GstD3D11Device *device = filter->device;
+  GstBuffer *target_buf;
+  GstFlowReturn ret = GST_FLOW_OK;
 
   crop_meta = gst_buffer_get_video_crop_meta (inbuf);
   if (crop_meta) {
@@ -1952,13 +2231,64 @@
         "src-height", (gint) in_rect.bottom - in_rect.top, nullptr);
   }
 
-  if (!gst_d3d11_converter_convert_buffer (self->converter, inbuf, outbuf)) {
+  target_buf = self->msaa_buf ? self->msaa_buf : outbuf;
+
+  gst_d3d11_device_lock (device);
+  if (!gst_d3d11_converter_convert_buffer_unlocked (self->converter,
+          inbuf, target_buf)) {
+    ret = GST_FLOW_ERROR;
+  }
+
+  if (ret == GST_FLOW_OK && target_buf == self->msaa_buf) {
+    guint num_memory = gst_buffer_n_memory (self->msaa_buf);
+    ID3D11DeviceContext *context =
+        gst_d3d11_device_get_device_context_handle (device);
+
+    for (guint i = 0; i < num_memory; i++) {
+      GstMemory *src_mem;
+      GstMemory *dst_mem;
+      GstD3D11Memory *dst_dmem;
+      GstMapInfo src_map, dst_map;
+      guint subresource_idx;
+      D3D11_TEXTURE2D_DESC desc;
+
+      src_mem = gst_buffer_peek_memory (self->msaa_buf, i);
+      dst_mem = gst_buffer_peek_memory (outbuf, i);
+      dst_dmem = GST_D3D11_MEMORY_CAST (dst_mem);
+
+      subresource_idx = gst_d3d11_memory_get_subresource_index (dst_dmem);
+      gst_d3d11_memory_get_texture_desc (dst_dmem, &desc);
+
+      if (!gst_memory_map (src_mem, &src_map,
+              (GstMapFlags) (GST_MAP_D3D11 | GST_MAP_READ))) {
+        GST_ERROR_OBJECT (self, "Couldn't map src mem");
+        ret = GST_FLOW_ERROR;
+        break;
+      }
+
+      if (!gst_memory_map (dst_mem, &dst_map,
+              (GstMapFlags) (GST_MAP_D3D11 | GST_MAP_WRITE))) {
+        GST_ERROR_OBJECT (self, "Couldn't map dst mem");
+        gst_memory_unmap (src_mem, &src_map);
+        ret = GST_FLOW_ERROR;
+        break;
+      }
+
+      context->ResolveSubresource ((ID3D11Resource *) dst_map.data,
+          subresource_idx, (ID3D11Resource *) src_map.data, 0, desc.Format);
+
+      gst_memory_unmap (dst_mem, &dst_map);
+      gst_memory_unmap (src_mem, &src_map);
+    }
+  }
+  gst_d3d11_device_unlock (device);
+
+  if (ret != GST_FLOW_OK) {
     GST_ELEMENT_ERROR (self, CORE, FAILED, (nullptr),
         ("Couldn't convert texture"));
-    return GST_FLOW_ERROR;
   }
 
-  return GST_FLOW_OK;
+  return ret;
 }
 
 static void
@@ -2053,6 +2383,144 @@
   }
 }
 
+static void
+gst_d3d11_base_convert_set_sampling_method (GstD3D11BaseConvert * self,
+    GstD3D11SamplingMethod method)
+{
+  GstD3D11SRWLockGuard lk (&self->lock);
+
+  GST_DEBUG_OBJECT (self,
+      "Sampling method %d -> %d", self->sampling_method, method);
+
+  self->sampling_method = method;
+  if (self->sampling_method != self->active_sampling_method)
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+}
+
+static void
+gst_d3d11_base_convert_set_src_alpha_mode (GstD3D11BaseConvert * self,
+    GstD3D11AlphaMode mode)
+{
+  GstD3D11SRWLockGuard lk (&self->lock);
+
+  if (self->src_alpha_mode != mode) {
+    self->src_alpha_mode = mode;
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+  }
+}
+
+static void
+gst_d3d11_base_convert_set_dst_alpha_mode (GstD3D11BaseConvert * self,
+    GstD3D11AlphaMode mode)
+{
+  GstD3D11SRWLockGuard lk (&self->lock);
+
+  if (self->dst_alpha_mode != mode) {
+    self->dst_alpha_mode = mode;
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+  }
+}
+
+static void
+gst_d3d11_base_convert_set_fov (GstD3D11BaseConvert * self, gfloat fov)
+{
+  GstD3D11SRWLockGuard lk (&self->lock);
+
+  if (self->fov != fov) {
+    self->fov = fov;
+    self->transform_updated = TRUE;
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+  }
+}
+
+static void
+gst_d3d11_base_convert_set_ortho (GstD3D11BaseConvert * self, gboolean ortho)
+{
+  GstD3D11SRWLockGuard lk (&self->lock);
+
+  if (self->ortho != ortho) {
+    self->ortho = ortho;
+    self->transform_updated = TRUE;
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+  }
+}
+
+static void
+gst_d3d11_base_convert_set_rotation_x (GstD3D11BaseConvert * self,
+    gfloat rotation_x)
+{
+  GstD3D11SRWLockGuard lk (&self->lock);
+
+  if (self->rotation_x != rotation_x) {
+    self->rotation_x = rotation_x;
+    self->transform_updated = TRUE;
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+  }
+}
+
+static void
+gst_d3d11_base_convert_set_rotation_y (GstD3D11BaseConvert * self,
+    gfloat rotation_y)
+{
+  GstD3D11SRWLockGuard lk (&self->lock);
+
+  if (self->rotation_y != rotation_y) {
+    self->rotation_y = rotation_y;
+    self->transform_updated = TRUE;
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+  }
+}
+
+static void
+gst_d3d11_base_convert_set_rotation_z (GstD3D11BaseConvert * self,
+    gfloat rotation_z)
+{
+  GstD3D11SRWLockGuard lk (&self->lock);
+
+  if (self->rotation_z != rotation_z) {
+    self->rotation_z = rotation_z;
+    self->transform_updated = TRUE;
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+  }
+}
+
+static void
+gst_d3d11_base_convert_set_scale_x (GstD3D11BaseConvert * self, gfloat scale_x)
+{
+  GstD3D11SRWLockGuard lk (&self->lock);
+
+  if (self->scale_x != scale_x) {
+    self->scale_x = scale_x;
+    self->transform_updated = TRUE;
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+  }
+}
+
+static void
+gst_d3d11_base_convert_set_scale_y (GstD3D11BaseConvert * self, gfloat scale_y)
+{
+  GstD3D11SRWLockGuard lk (&self->lock);
+
+  if (self->scale_y != scale_y) {
+    self->scale_y = scale_y;
+    self->transform_updated = TRUE;
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+  }
+}
+
+static void
+gst_d3d11_base_convert_set_msaa (GstD3D11BaseConvert * self,
+    GstD3D11MSAAMode msaa)
+{
+  GstD3D11SRWLockGuard lk (&self->lock);
+
+  if (self->msaa != msaa) {
+    self->msaa = msaa;
+    self->msaa_updated = TRUE;
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+  }
+}
+
 /**
  * SECTION:element-d3d11convert
  * @title: d3d11convert
@@ -2085,6 +2553,16 @@
   PROP_CONVERT_VIDEO_DIRECTION,
   PROP_CONVERT_GAMMA_MODE,
   PROP_CONVERT_PRIMARIES_MODE,
+  PROP_CONVERT_SRC_ALPHA_MODE,
+  PROP_CONVERT_DEST_ALPHA_MODE,
+  PROP_CONVERT_FOV,
+  PROP_CONVERT_ORTHO,
+  PROP_CONVERT_ROTATION_X,
+  PROP_CONVERT_ROTATION_Y,
+  PROP_CONVERT_ROTATION_Z,
+  PROP_CONVERT_SCALE_X,
+  PROP_CONVERT_SCALE_Y,
+  PROP_CONVERT_MSAA,
 };
 
 struct _GstD3D11Convert
@@ -2182,10 +2660,153 @@
           DEFAULT_PRIMARIES_MODE, (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
+  /**
+   * GstD3D11Convert:src-alpha-mode:
+   *
+   * Input stream's applied alpha mode. In case of "premultiplied",
+   * premultiplied to straight alpha conversion will be performed
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_CONVERT_SRC_ALPHA_MODE,
+      g_param_spec_enum ("src-alpha-mode", "Src Alpha Mode",
+          "Applied input alpha mode",
+          GST_TYPE_D3D11_ALPHA_MODE, DEFAULT_ALPHA_MODE,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11Convert:dest-alpha-mode:
+   *
+   * Alpha mode to be applied to output stream. In case of "premultiplied",
+   * straight to premultiplied alpha conversion will be performed
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_CONVERT_DEST_ALPHA_MODE,
+      g_param_spec_enum ("dest-alpha-mode", "Dest Alpha Mode",
+          "Output alpha mode to be applied",
+          GST_TYPE_D3D11_ALPHA_MODE, DEFAULT_ALPHA_MODE,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11Convert:fov:
+   *
+   * Field of view angle in degrees
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_CONVERT_FOV,
+      g_param_spec_float ("fov", "Fov",
+          "Field of view angle in degrees",
+          0, G_MAXFLOAT, DEFAULT_FOV,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11Convert:ortho:
+   *
+   * Use orthographic projection
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_CONVERT_ORTHO,
+      g_param_spec_boolean ("ortho", "Orthographic",
+          "Use orthographic projection", DEFAULT_ORTHO,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11Convert:rotation-x:
+   *
+   * x-axis rotation angle to be applied prior to "video-direction"
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_CONVERT_ROTATION_X,
+      g_param_spec_float ("rotation-x", "Rotation X",
+          "x-axis rotation angle in degrees",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_ROTATION,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11Convert:rotation-y:
+   *
+   * y-axis rotation angle to be applied prior to "video-direction"
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_CONVERT_ROTATION_Y,
+      g_param_spec_float ("rotation-y", "Rotation Y",
+          "y-axis rotation angle in degrees",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_ROTATION,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11Convert:rotation-z:
+   *
+   * z-axis rotation angle to be applied prior to "video-direction"
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_CONVERT_ROTATION_Z,
+      g_param_spec_float ("rotation-z", "Rotation Z",
+          "z-axis rotation angle in degrees",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_ROTATION,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11Convert:scale-x:
+   *
+   * Scale multiplier for x-axis
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_CONVERT_SCALE_X,
+      g_param_spec_float ("scale-x", "Scale X",
+          "Scale multiplier for x-axis",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_SCALE,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11Convert:scale-y:
+   *
+   * Scale multiplier for y-axis
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_CONVERT_SCALE_Y,
+      g_param_spec_float ("scale-y", "Scale Y",
+          "Scale multiplier for y-axis",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_SCALE,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11Convert:msaa:
+   *
+   * MSAA (Multi-Sampling Anti-Aliasing) level
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_CONVERT_MSAA,
+      g_param_spec_enum ("msaa", "MSAA",
+          "MSAA (Multi-Sampling Anti-Aliasing) level. "
+          "This value will be ignored if device does not support the specified "
+          "level for negotiated output format",
+          GST_TYPE_D3D11_MSAA_MODE, DEFAULT_MSAA,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
   gst_element_class_set_static_metadata (element_class,
-      "Direct3D11 colorspace converter and scaler",
+      "Direct3D11 Converter",
       "Filter/Converter/Scaler/Effect/Video/Hardware",
-      "Resizes video and allow color conversion using Direct3D11",
+      "Performs resizing, colorspace conversion, cropping, and flipping/rotating using Direct3D11",
       "Seungha Yang <seungha.yang@navercorp.com>, "
       "Jeongki Kim <jeongki.kim@jeongki.kim>");
 
@@ -2223,6 +2844,39 @@
       gst_d3d11_base_convert_set_primaries_mode (base,
           (GstVideoPrimariesMode) g_value_get_enum (value));
       break;
+    case PROP_CONVERT_SRC_ALPHA_MODE:
+      gst_d3d11_base_convert_set_src_alpha_mode (base,
+          (GstD3D11AlphaMode) g_value_get_enum (value));
+      break;
+    case PROP_CONVERT_DEST_ALPHA_MODE:
+      gst_d3d11_base_convert_set_dst_alpha_mode (base,
+          (GstD3D11AlphaMode) g_value_get_enum (value));
+      break;
+    case PROP_CONVERT_FOV:
+      gst_d3d11_base_convert_set_fov (base, g_value_get_float (value));
+      break;
+    case PROP_CONVERT_ORTHO:
+      gst_d3d11_base_convert_set_ortho (base, g_value_get_boolean (value));
+      break;
+    case PROP_CONVERT_ROTATION_X:
+      gst_d3d11_base_convert_set_rotation_x (base, g_value_get_float (value));
+      break;
+    case PROP_CONVERT_ROTATION_Y:
+      gst_d3d11_base_convert_set_rotation_y (base, g_value_get_float (value));
+      break;
+    case PROP_CONVERT_ROTATION_Z:
+      gst_d3d11_base_convert_set_rotation_z (base, g_value_get_float (value));
+      break;
+    case PROP_CONVERT_SCALE_X:
+      gst_d3d11_base_convert_set_scale_x (base, g_value_get_float (value));
+      break;
+    case PROP_CONVERT_SCALE_Y:
+      gst_d3d11_base_convert_set_scale_y (base, g_value_get_float (value));
+      break;
+    case PROP_CONVERT_MSAA:
+      gst_d3d11_base_convert_set_msaa (base,
+          (GstD3D11MSAAMode) g_value_get_enum (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -2251,6 +2905,36 @@
     case PROP_CONVERT_PRIMARIES_MODE:
       g_value_set_enum (value, base->primaries_mode);
       break;
+    case PROP_CONVERT_SRC_ALPHA_MODE:
+      g_value_set_enum (value, base->src_alpha_mode);
+      break;
+    case PROP_CONVERT_DEST_ALPHA_MODE:
+      g_value_set_enum (value, base->dst_alpha_mode);
+      break;
+    case PROP_CONVERT_FOV:
+      g_value_set_float (value, base->fov);
+      break;
+    case PROP_CONVERT_ORTHO:
+      g_value_set_boolean (value, base->ortho);
+      break;
+    case PROP_CONVERT_ROTATION_X:
+      g_value_set_float (value, base->rotation_x);
+      break;
+    case PROP_CONVERT_ROTATION_Y:
+      g_value_set_float (value, base->rotation_y);
+      break;
+    case PROP_CONVERT_ROTATION_Z:
+      g_value_set_float (value, base->rotation_z);
+      break;
+    case PROP_CONVERT_SCALE_X:
+      g_value_set_float (value, base->scale_x);
+      break;
+    case PROP_CONVERT_SCALE_Y:
+      g_value_set_float (value, base->scale_y);
+      break;
+    case PROP_CONVERT_MSAA:
+      g_value_set_enum (value, base->msaa);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -2303,6 +2987,8 @@
   PROP_COLOR_CONVERT_0,
   PROP_COLOR_CONVERT_GAMMA_MODE,
   PROP_COLOR_CONVERT_PRIMARIES_MODE,
+  PROP_COLOR_CONVERT_SRC_ALPHA_MODE,
+  PROP_COLOR_CONVERT_DEST_ALPHA_MODE,
 };
 
 struct _GstD3D11ColorConvert
@@ -2359,8 +3045,40 @@
           DEFAULT_PRIMARIES_MODE, (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
+  /**
+   * GstD3D11ColorConvert:src-alpha-mode:
+   *
+   * Input stream's applied alpha mode. In case of "premultiplied",
+   * premultiplied to straight alpha conversion will be performed
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class,
+      PROP_COLOR_CONVERT_SRC_ALPHA_MODE,
+      g_param_spec_enum ("src-alpha-mode", "Src Alpha Mode",
+          "Applied input alpha mode",
+          GST_TYPE_D3D11_ALPHA_MODE, DEFAULT_ALPHA_MODE,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11ColorConvert:dest-alpha-mode:
+   *
+   * Alpha mode to be applied to output stream. In case of "premultiplied",
+   * straight to premultiplied alpha conversion will be performed
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class,
+      PROP_COLOR_CONVERT_DEST_ALPHA_MODE,
+      g_param_spec_enum ("dest-alpha-mode", "Dest Alpha Mode",
+          "Output alpha mode to be applied",
+          GST_TYPE_D3D11_ALPHA_MODE, DEFAULT_ALPHA_MODE,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
   gst_element_class_set_static_metadata (element_class,
-      "Direct3D11 colorspace converter",
+      "Direct3D11 Colorspace Converter",
       "Filter/Converter/Video/Hardware",
       "Color conversion using Direct3D11",
       "Seungha Yang <seungha@centricular.com>");
@@ -2391,6 +3109,14 @@
       gst_d3d11_base_convert_set_primaries_mode (base,
           (GstVideoPrimariesMode) g_value_get_enum (value));
       break;
+    case PROP_COLOR_CONVERT_SRC_ALPHA_MODE:
+      gst_d3d11_base_convert_set_src_alpha_mode (base,
+          (GstD3D11AlphaMode) g_value_get_enum (value));
+      break;
+    case PROP_COLOR_CONVERT_DEST_ALPHA_MODE:
+      gst_d3d11_base_convert_set_dst_alpha_mode (base,
+          (GstD3D11AlphaMode) g_value_get_enum (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -2410,6 +3136,12 @@
     case PROP_COLOR_CONVERT_PRIMARIES_MODE:
       g_value_set_enum (value, base->primaries_mode);
       break;
+    case PROP_COLOR_CONVERT_SRC_ALPHA_MODE:
+      g_value_set_enum (value, base->src_alpha_mode);
+      break;
+    case PROP_COLOR_CONVERT_DEST_ALPHA_MODE:
+      g_value_set_enum (value, base->dst_alpha_mode);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -2541,7 +3273,7 @@
               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
   gst_element_class_set_static_metadata (element_class,
-      "Direct3D11 scaler",
+      "Direct3D11 Scaler",
       "Filter/Converter/Video/Scaler/Hardware",
       "Resizes video using Direct3D11",
       "Seungha Yang <seungha@centricular.com>");

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11decoder.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11decoder.cpp Changed

@@ -207,12 +207,6 @@
 };
 /* *INDENT-ON* */
 
-enum
-{
-  PROP_0,
-  PROP_DEVICE,
-};
-
 struct _GstD3D11Decoder
 {
   GstObject parent;
@@ -229,7 +223,7 @@
 
   GstVideoInfo info;
   GstVideoInfo output_info;
-  GstDXVACodec codec;
+  GstDxvaCodec codec;
   gint offset_x;
   gint offset_y;
   gint coded_width;
@@ -272,11 +266,6 @@
   guint timer_resolution;
 };
 
-static void gst_d3d11_decoder_constructed (GObject * object);
-static void gst_d3d11_decoder_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_d3d11_decoder_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
 static void gst_d3d11_decoder_dispose (GObject * obj);
 static void gst_d3d11_decoder_finalize (GObject * obj);
 static gboolean gst_d3d11_decoder_can_direct_render (GstD3D11Decoder * decoder,
@@ -291,90 +280,14 @@
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  gobject_class->constructed = gst_d3d11_decoder_constructed;
-  gobject_class->set_property = gst_d3d11_decoder_set_property;
-  gobject_class->get_property = gst_d3d11_decoder_get_property;
   gobject_class->dispose = gst_d3d11_decoder_dispose;
   gobject_class->finalize = gst_d3d11_decoder_finalize;
-
-  g_object_class_install_property (gobject_class, PROP_DEVICE,
-      g_param_spec_object ("device", "Device",
-          "D3D11 Devicd to use", GST_TYPE_D3D11_DEVICE,
-          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
-              G_PARAM_STATIC_STRINGS)));
 }
 
 static void
 gst_d3d11_decoder_init (GstD3D11Decoder * self)
 {
-}
-
-static void
-gst_d3d11_decoder_constructed (GObject * object)
-{
-  GstD3D11Decoder *self = GST_D3D11_DECODER (object);
-  ID3D11VideoDevice *video_device;
-  ID3D11VideoContext *video_context;
-
-  if (!self->device) {
-    GST_ERROR_OBJECT (self, "No D3D11Device available");
-    return;
-  }
-
-  video_device = gst_d3d11_device_get_video_device_handle (self->device);
-  if (!video_device) {
-    GST_WARNING_OBJECT (self, "ID3D11VideoDevice is not available");
-    return;
-  }
-
-  video_context = gst_d3d11_device_get_video_context_handle (self->device);
-  if (!video_context) {
-    GST_WARNING_OBJECT (self, "ID3D11VideoContext is not available");
-    return;
-  }
-
-  self->video_device = video_device;
-  video_device->AddRef ();
-
-  self->video_context = video_context;
-  video_context->AddRef ();
-
-  BOOL ret = QueryPerformanceFrequency (&self->frequency);
-  g_assert (ret);
-
-  return;
-}
-
-static void
-gst_d3d11_decoder_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstD3D11Decoder *self = GST_D3D11_DECODER (object);
-
-  switch (prop_id) {
-    case PROP_DEVICE:
-      self->device = (GstD3D11Device *) g_value_dup_object (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-gst_d3d11_decoder_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstD3D11Decoder *self = GST_D3D11_DECODER (object);
-
-  switch (prop_id) {
-    case PROP_DEVICE:
-      g_value_set_object (value, self->device);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
+  QueryPerformanceFrequency (&self->frequency);
 }
 
 static void
@@ -439,37 +352,43 @@
 }
 
 GstD3D11Decoder *
-gst_d3d11_decoder_new (GstD3D11Device * device, GstDXVACodec codec)
+gst_d3d11_decoder_new (GstD3D11Device * device, GstDxvaCodec codec)
 {
   GstD3D11Decoder *self;
+  ID3D11VideoDevice *video_device;
+  ID3D11VideoContext *video_context;
 
   g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), nullptr);
   g_return_val_if_fail (codec > GST_DXVA_CODEC_NONE, nullptr);
   g_return_val_if_fail (codec < GST_DXVA_CODEC_LAST, nullptr);
 
-  self = (GstD3D11Decoder *)
-      g_object_new (GST_TYPE_D3D11_DECODER, "device", device, NULL);
+  video_device = gst_d3d11_device_get_video_device_handle (device);
+  if (!video_device) {
+    GST_WARNING_OBJECT (device, "ID3D11VideoDevice is not available");
+    return nullptr;
+  }
 
-  if (!self->video_device || !self->video_context) {
-    gst_object_unref (self);
-    return NULL;
+  video_context = gst_d3d11_device_get_video_context_handle (device);
+  if (!video_context) {
+    GST_WARNING_OBJECT (device, "ID3D11VideoContext is not available");
+    return nullptr;
   }
 
+  self = (GstD3D11Decoder *) g_object_new (GST_TYPE_D3D11_DECODER, nullptr);
+
+  self->device = (GstD3D11Device *) gst_object_ref (device);
   self->codec = codec;
+  self->video_device = video_device;
+  video_device->AddRef ();
+
+  self->video_context = video_context;
+  video_context->AddRef ();
 
   gst_object_ref_sink (self);
 
   return self;
 }
 
-gboolean
-gst_d3d11_decoder_is_configured (GstD3D11Decoder * decoder)
-{
-  g_return_val_if_fail (GST_IS_D3D11_DECODER (decoder), FALSE);
-
-  return decoder->configured;
-}
-
 static gboolean
 gst_d3d11_decoder_ensure_output_view (GstD3D11Decoder * self,
     GstBuffer * buffer)
@@ -531,9 +450,7 @@
     gst_clear_object (&self->internal_pool);
   }
 
-  if (!self->use_array_of_texture) {
-    alloc_flags = GST_D3D11_ALLOCATION_FLAG_TEXTURE_ARRAY;
-  } else {
+  if (self->use_array_of_texture) {
     /* array of texture can have shader resource view */
     bind_flags |= D3D11_BIND_SHADER_RESOURCE;
   }
@@ -553,7 +470,7 @@
       self->downstream_min_buffers);
 
   if (!self->use_array_of_texture) {
-    alloc_params->desc0.ArraySize = pool_size;
+    gst_d3d11_allocation_params_set_array_size (alloc_params, pool_size);
   } else {
     self->next_view_id = 0;
 
@@ -606,35 +523,9 @@
   return FALSE;
 }
 
-static const gchar *
-gst_dxva_codec_to_string (GstDXVACodec codec)
-{
-  switch (codec) {
-    case GST_DXVA_CODEC_NONE:
-      return "none";
-    case GST_DXVA_CODEC_H264:
-      return "H.264";
-    case GST_DXVA_CODEC_VP9:
-      return "VP9";
-    case GST_DXVA_CODEC_H265:
-      return "H.265";
-    case GST_DXVA_CODEC_VP8:
-      return "VP8";
-    case GST_DXVA_CODEC_MPEG2:
-      return "MPEG2";
-    case GST_DXVA_CODEC_AV1:
-      return "AV1";
-    default:
-      g_assert_not_reached ();
-      break;
-  }
-
-  return "Unknown";
-}
-
 gboolean
 gst_d3d11_decoder_get_supported_decoder_profile (GstD3D11Device * device,
-    GstDXVACodec codec, GstVideoFormat format, const GUID ** selected_profile)
+    GstDxvaCodec codec, GstVideoFormat format, const GUID ** selected_profile)
 {
   GUID *guid_list = nullptr;
   const GUID *profile = nullptr;
@@ -644,6 +535,7 @@
   ID3D11VideoDevice *video_device;
   const GUID **profile_list = nullptr;
   guint profile_size = 0;
+  gboolean ret = FALSE;
 
   g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), FALSE);
   g_return_val_if_fail (selected_profile != nullptr, FALSE);
@@ -713,13 +605,13 @@
 
   GST_DEBUG_OBJECT (device,
       "Have %u available decoder profiles", available_profile_count);
-  guid_list = (GUID *) g_alloca (sizeof (GUID) * available_profile_count);
+  guid_list = g_new0 (GUID, available_profile_count);
 
   for (i = 0; i < available_profile_count; i++) {
     hr = video_device->GetVideoDecoderProfile (i, &guid_listi);
     if (!gst_d3d11_result (hr, device)) {
       GST_WARNING_OBJECT (device, "Failed to get %d th decoder profile", i);
-      return FALSE;
+      goto out;
     }
   }
 
@@ -759,7 +651,7 @@
   if (!profile) {
     GST_INFO_OBJECT (device, "No supported decoder profile for %s codec",
         gst_dxva_codec_to_string (codec));
-    return FALSE;
+    goto out;
   }
 
   *selected_profile = profile;
@@ -772,10 +664,14 @@
       profile->Data43, profile->Data44, profile->Data45,
       profile->Data46, profile->Data47);
 
-  return TRUE;
+  ret = TRUE;
+
+out:
+  g_free (guid_list);
+  return ret;
 }
 
-gboolean
+GstFlowReturn
 gst_d3d11_decoder_configure (GstD3D11Decoder * decoder,
     GstVideoCodecState * input_state, const GstVideoInfo * out_info,
     gint offset_x, gint offset_y, gint coded_width, gint coded_height,
@@ -783,13 +679,14 @@
 {
   GstD3D11Format d3d11_format;
 
-  g_return_val_if_fail (GST_IS_D3D11_DECODER (decoder), FALSE);
-  g_return_val_if_fail (out_info != NULL, FALSE);
-  g_return_val_if_fail (input_state != NULL, FALSE);
-  g_return_val_if_fail (coded_width >= GST_VIDEO_INFO_WIDTH (out_info), FALSE);
+  g_return_val_if_fail (GST_IS_D3D11_DECODER (decoder), GST_FLOW_ERROR);
+  g_return_val_if_fail (out_info != NULL, GST_FLOW_ERROR);
+  g_return_val_if_fail (input_state != NULL, GST_FLOW_ERROR);
+  g_return_val_if_fail (coded_width >= GST_VIDEO_INFO_WIDTH (out_info),
+      GST_FLOW_ERROR);
   g_return_val_if_fail (coded_height >= GST_VIDEO_INFO_HEIGHT (out_info),
-      FALSE);
-  g_return_val_if_fail (dpb_size > 0, FALSE);
+      GST_FLOW_ERROR);
+  g_return_val_if_fail (dpb_size > 0, GST_FLOW_ERROR);
 
   gst_d3d11_decoder_reset (decoder);
 
@@ -798,11 +695,11 @@
       d3d11_format.dxgi_format == DXGI_FORMAT_UNKNOWN) {
     GST_ERROR_OBJECT (decoder, "Could not determine dxgi format from %s",
         gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (out_info)));
-    return FALSE;
+    return GST_FLOW_ERROR;
   }
 
-  /* Additional 4 frames to help zero-copying */
-  dpb_size += 4;
+  /* Additional 2 frames to help zero-copying */
+  dpb_size += 2;
 
   decoder->input_state = gst_video_codec_state_ref (input_state);
   decoder->info = decoder->output_info = *out_info;
@@ -820,7 +717,7 @@
   else
     decoder->need_crop = FALSE;
 
-  return TRUE;
+  return GST_FLOW_OK;
 }
 
 static gboolean
@@ -894,7 +791,7 @@
   HRESULT hr;
   BOOL can_support = FALSE;
   guint config_count;
-  D3D11_VIDEO_DECODER_CONFIG *config_list;
+  D3D11_VIDEO_DECODER_CONFIG *config_list = NULL;
   D3D11_VIDEO_DECODER_CONFIG *best_config = NULL;
   D3D11_VIDEO_DECODER_DESC decoder_desc = { 0, };
   const GUID *selected_profile = NULL;
@@ -995,9 +892,7 @@
 
   GST_DEBUG_OBJECT (self, "Total %d config available", config_count);
 
-  config_list = (D3D11_VIDEO_DECODER_CONFIG *)
-      g_alloca (sizeof (D3D11_VIDEO_DECODER_CONFIG) * config_count);
-
+  config_list = g_new0 (D3D11_VIDEO_DECODER_CONFIG, config_count);
   for (i = 0; i < config_count; i++) {
     hr = video_device->GetVideoDecoderConfig (&decoder_desc, i,
         &config_listi);
@@ -1074,10 +969,12 @@
   self->opened = TRUE;
 
   gst_d3d11_decoder_enable_high_precision_timer (self);
+  g_free (config_list);
 
   return TRUE;
 
 error:
+  g_free (config_list);
   gst_d3d11_decoder_reset (self);
 
   return FALSE;
@@ -1220,11 +1117,97 @@
   return TRUE;
 }
 
+static ID3D11VideoDecoderOutputView *
+gst_d3d11_decoder_get_output_view_from_picture (GstD3D11Decoder * self,
+    GstCodecPicture * picture, guint8 * index)
+{
+  GstMemory *mem;
+  GstD3D11Memory *dmem;
+  ID3D11VideoDecoderOutputView *view;
+  GstBuffer *buffer;
+
+  if (index)
+    *index = 0xff;
+
+  buffer = (GstBuffer *) gst_codec_picture_get_user_data (picture);
+  if (!buffer) {
+    GST_DEBUG_OBJECT (self, "picture without attached user data");
+    return nullptr;
+  }
+
+  mem = gst_buffer_peek_memory (buffer, 0);
+  if (!gst_is_d3d11_memory (mem)) {
+    GST_WARNING_OBJECT (self, "Not a d3d11 memory");
+    return nullptr;
+  }
+
+  dmem = (GstD3D11Memory *) mem;
+  view = gst_d3d11_memory_get_decoder_output_view (dmem, self->video_device,
+      self->decoder_handle, &self->decoder_profile);
+
+  if (!view) {
+    GST_ERROR_OBJECT (self, "Decoder output view is unavailable");
+    return nullptr;
+  }
+
+  if (index) {
+    if (self->use_array_of_texture) {
+      ID3D11Resource *texture;
+      ComPtr < IGstD3D11DecoderViewData > data;
+      UINT size;
+
+      texture = gst_d3d11_memory_get_resource_handle (dmem);
+      size = sizeof (IGstD3D11DecoderViewData *);
+
+      texture->GetPrivateData (IID_GST_D3D11_DECODER_VIEW_DATA,
+          &size, data.GetAddressOf ());
+
+      if (!data) {
+        GST_ERROR_OBJECT (self, "memory has no private data");
+        return nullptr;
+      }
+
+      *index = data->GetViewIndex ();
+    } else {
+      *index = gst_d3d11_memory_get_subresource_index (dmem);
+    }
+  }
+
+  return view;
+}
+
+guint8
+gst_d3d11_decoder_get_picture_id (GstD3D11Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  guint8 id = 0xff;
+
+  if (!picture)
+    return 0xff;
+
+  if (!gst_d3d11_decoder_get_output_view_from_picture (decoder, picture, &id))
+    return 0xff;
+
+  return id;
+}
+
+GstFlowReturn
+gst_d3d11_decoder_start_picture (GstD3D11Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
+{
+  if (!gst_d3d11_decoder_get_output_view_from_picture (decoder,
+          picture, picture_id)) {
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
 GstFlowReturn
-gst_d3d11_decoder_decode_frame (GstD3D11Decoder * decoder,
-    ID3D11VideoDecoderOutputView * output_view,
-    GstD3D11DecodeInputStreamArgs * input_args)
+gst_d3d11_decoder_end_picture (GstD3D11Decoder * decoder,
+    GstCodecPicture * picture, const GstDxvaDecodingArgs * args)
 {
+  ID3D11VideoDecoderOutputView *output_view;
   guint d3d11_buffer_size;
   gpointer d3d11_buffer;
   D3D11_VIDEO_DECODER_BUFFER_DESC buffer_desc4;
@@ -1232,27 +1215,34 @@
   GstFlowReturn ret = GST_FLOW_OK;
 
   g_return_val_if_fail (GST_IS_D3D11_DECODER (decoder), GST_FLOW_ERROR);
-  g_return_val_if_fail (output_view != nullptr, GST_FLOW_ERROR);
-  g_return_val_if_fail (input_args != nullptr, GST_FLOW_ERROR);
+  g_return_val_if_fail (picture != nullptr, GST_FLOW_ERROR);
+  g_return_val_if_fail (args != nullptr, GST_FLOW_ERROR);
+
+  output_view = gst_d3d11_decoder_get_output_view_from_picture (decoder,
+      picture, nullptr);
+  if (!output_view) {
+    GST_ERROR_OBJECT (decoder, "No output view attached");
+    return GST_FLOW_ERROR;
+  }
 
   memset (buffer_desc, 0, sizeof (buffer_desc));
 
   buffer_desc0.BufferType = D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS;
-  buffer_desc0.DataSize = input_args->picture_params_size;
+  buffer_desc0.DataSize = args->picture_params_size;
 
   buffer_desc1.BufferType = D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL;
-  buffer_desc1.DataSize = input_args->slice_control_size;
+  buffer_desc1.DataSize = args->slice_control_size;
 
   buffer_desc2.BufferType = D3D11_VIDEO_DECODER_BUFFER_BITSTREAM;
   buffer_desc2.DataOffset = 0;
-  buffer_desc2.DataSize = input_args->bitstream_size;
+  buffer_desc2.DataSize = args->bitstream_size;
 
   buffer_desc_size = 3;
-  if (input_args->inverse_quantization_matrix &&
-      input_args->inverse_quantization_matrix_size > 0) {
+  if (args->inverse_quantization_matrix &&
+      args->inverse_quantization_matrix_size > 0) {
     buffer_desc3.BufferType =
         D3D11_VIDEO_DECODER_BUFFER_INVERSE_QUANTIZATION_MATRIX;
-    buffer_desc3.DataSize = input_args->inverse_quantization_matrix_size;
+    buffer_desc3.DataSize = args->inverse_quantization_matrix_size;
     buffer_desc_size++;
   }
 
@@ -1269,7 +1259,7 @@
     goto error;
   }
 
-  if (d3d11_buffer_size < input_args->picture_params_size) {
+  if (d3d11_buffer_size < args->picture_params_size) {
     GST_ERROR_OBJECT (decoder,
         "Too small picture param buffer size %d", d3d11_buffer_size);
 
@@ -1278,8 +1268,7 @@
     goto error;
   }
 
-  memcpy (d3d11_buffer, input_args->picture_params,
-      input_args->picture_params_size);
+  memcpy (d3d11_buffer, args->picture_params, args->picture_params_size);
 
   if (!gst_d3d11_decoder_release_decoder_buffer (decoder,
           D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS)) {
@@ -1294,7 +1283,7 @@
     goto error;
   }
 
-  if (d3d11_buffer_size < input_args->slice_control_size) {
+  if (d3d11_buffer_size < args->slice_control_size) {
     GST_ERROR_OBJECT (decoder,
         "Too small slice control buffer size %d", d3d11_buffer_size);
 
@@ -1303,8 +1292,7 @@
     goto error;
   }
 
-  memcpy (d3d11_buffer,
-      input_args->slice_control, input_args->slice_control_size);
+  memcpy (d3d11_buffer, args->slice_control, args->slice_control_size);
 
   if (!gst_d3d11_decoder_release_decoder_buffer (decoder,
           D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL)) {
@@ -1319,7 +1307,7 @@
     goto error;
   }
 
-  if (d3d11_buffer_size < input_args->bitstream_size) {
+  if (d3d11_buffer_size < args->bitstream_size) {
     GST_ERROR_OBJECT (decoder, "Too small bitstream buffer size %d",
         d3d11_buffer_size);
 
@@ -1328,7 +1316,7 @@
     goto error;
   }
 
-  memcpy (d3d11_buffer, input_args->bitstream, input_args->bitstream_size);
+  memcpy (d3d11_buffer, args->bitstream, args->bitstream_size);
 
   if (!gst_d3d11_decoder_release_decoder_buffer (decoder,
           D3D11_VIDEO_DECODER_BUFFER_BITSTREAM)) {
@@ -1336,7 +1324,7 @@
     goto error;
   }
 
-  if (input_args->inverse_quantization_matrix_size > 0) {
+  if (args->inverse_quantization_matrix_size > 0) {
     if (!gst_d3d11_decoder_get_decoder_buffer (decoder,
             D3D11_VIDEO_DECODER_BUFFER_INVERSE_QUANTIZATION_MATRIX,
             &d3d11_buffer_size, &d3d11_buffer)) {
@@ -1345,7 +1333,7 @@
       goto error;
     }
 
-    if (d3d11_buffer_size < input_args->inverse_quantization_matrix_size) {
+    if (d3d11_buffer_size < args->inverse_quantization_matrix_size) {
       GST_ERROR_OBJECT (decoder,
           "Too small inverse quantization matrix buffer buffer %d",
           d3d11_buffer_size);
@@ -1355,8 +1343,8 @@
       goto error;
     }
 
-    memcpy (d3d11_buffer, input_args->inverse_quantization_matrix,
-        input_args->inverse_quantization_matrix_size);
+    memcpy (d3d11_buffer, args->inverse_quantization_matrix,
+        args->inverse_quantization_matrix_size);
 
     if (!gst_d3d11_decoder_release_decoder_buffer (decoder,
             D3D11_VIDEO_DECODER_BUFFER_INVERSE_QUANTIZATION_MATRIX)) {
@@ -1382,14 +1370,14 @@
   return GST_FLOW_ERROR;
 }
 
-GstBuffer *
-gst_d3d11_decoder_get_output_view_buffer (GstD3D11Decoder * decoder,
-    GstVideoDecoder * videodec)
+GstFlowReturn
+gst_d3d11_decoder_new_picture (GstD3D11Decoder * decoder,
+    GstVideoDecoder * videodec, GstCodecPicture * picture)
 {
   GstBuffer *buf = NULL;
   GstFlowReturn ret;
 
-  g_return_val_if_fail (GST_IS_D3D11_DECODER (decoder), FALSE);
+  g_return_val_if_fail (GST_IS_D3D11_DECODER (decoder), GST_FLOW_ERROR);
 
   if (!decoder->internal_pool) {
     /* Try negotiate again whatever the previous negotiation result was.
@@ -1402,15 +1390,14 @@
 
     if (!gst_d3d11_decoder_prepare_output_view_pool (decoder)) {
       GST_ERROR_OBJECT (videodec, "Failed to setup internal pool");
-      return NULL;
+      return GST_FLOW_ERROR;
     }
   } else if (!gst_buffer_pool_set_active (decoder->internal_pool, TRUE)) {
     GST_ERROR_OBJECT (videodec, "Couldn't set active internal pool");
-    return NULL;
+    return GST_FLOW_ERROR;
   }
 
   ret = gst_buffer_pool_acquire_buffer (decoder->internal_pool, &buf, NULL);
-
   if (ret != GST_FLOW_OK || !buf) {
     if (ret != GST_FLOW_FLUSHING) {
       GST_ERROR_OBJECT (videodec, "Couldn't get buffer from pool, ret %s",
@@ -1419,69 +1406,35 @@
       GST_DEBUG_OBJECT (videodec, "We are flusing");
     }
 
-    return NULL;
+    return ret;
   }
 
   if (!gst_d3d11_decoder_ensure_output_view (decoder, buf)) {
     GST_ERROR_OBJECT (videodec, "Output view unavailable");
     gst_buffer_unref (buf);
 
-    return NULL;
+    return GST_FLOW_ERROR;
   }
 
-  return buf;
+  gst_codec_picture_set_user_data (picture,
+      buf, (GDestroyNotify) gst_buffer_unref);
+
+  return GST_FLOW_OK;
 }
 
-ID3D11VideoDecoderOutputView *
-gst_d3d11_decoder_get_output_view_from_buffer (GstD3D11Decoder * decoder,
-    GstBuffer * buffer, guint8 * index)
+GstFlowReturn
+gst_d3d11_decoder_duplicate_picture (GstD3D11Decoder * decoder,
+    GstCodecPicture * src, GstCodecPicture * dst)
 {
-  GstMemory *mem;
-  GstD3D11Memory *dmem;
-  ID3D11VideoDecoderOutputView *view;
-
-  g_return_val_if_fail (GST_IS_D3D11_DECODER (decoder), NULL);
-  g_return_val_if_fail (GST_IS_BUFFER (buffer), NULL);
-
-  mem = gst_buffer_peek_memory (buffer, 0);
-  if (!gst_is_d3d11_memory (mem)) {
-    GST_WARNING_OBJECT (decoder, "Not a d3d11 memory");
-    return NULL;
-  }
+  GstBuffer *buf = (GstBuffer *) gst_codec_picture_get_user_data (src);
 
-  dmem = (GstD3D11Memory *) mem;
-  view = gst_d3d11_memory_get_decoder_output_view (dmem, decoder->video_device,
-      decoder->decoder_handle, &decoder->decoder_profile);
-
-  if (!view) {
-    GST_ERROR_OBJECT (decoder, "Decoder output view is unavailable");
-    return NULL;
-  }
-
-  if (index) {
-    if (decoder->use_array_of_texture) {
-      ID3D11Resource *texture;
-      ComPtr < IGstD3D11DecoderViewData > data;
-      UINT size;
-
-      texture = gst_d3d11_memory_get_resource_handle (dmem);
-      size = sizeof (IGstD3D11DecoderViewData *);
-
-      texture->GetPrivateData (IID_GST_D3D11_DECODER_VIEW_DATA,
-          &size, data.GetAddressOf ());
+  if (!buf)
+    return GST_FLOW_ERROR;
 
-      if (!data) {
-        GST_ERROR_OBJECT (decoder, "memory has no private data");
-        return nullptr;
-      }
+  gst_codec_picture_set_user_data (dst, gst_buffer_ref (buf),
+      (GDestroyNotify) gst_buffer_unref);
 
-      *index = data->GetViewIndex ();
-    } else {
-      *index = gst_d3d11_memory_get_subresource_index (dmem);
-    }
-  }
-
-  return view;
+  return GST_FLOW_OK;
 }
 
 static void
@@ -1590,20 +1543,26 @@
   return TRUE;
 }
 
-gboolean
-gst_d3d11_decoder_process_output (GstD3D11Decoder * decoder,
-    GstVideoDecoder * videodec, GstVideoCodecState * input_state,
-    gint display_width, gint display_height,
-    GstBuffer * decoder_buffer, GstBuffer ** output)
+GstFlowReturn
+gst_d3d11_decoder_output_picture (GstD3D11Decoder * decoder,
+    GstVideoDecoder * videodec, GstVideoCodecFrame * frame,
+    GstCodecPicture * picture, GstVideoBufferFlags buffer_flags,
+    gint display_width, gint display_height)
 {
-  g_return_val_if_fail (GST_IS_D3D11_DECODER (decoder), FALSE);
-  g_return_val_if_fail (GST_IS_VIDEO_DECODER (videodec), FALSE);
-  g_return_val_if_fail (GST_IS_BUFFER (decoder_buffer), FALSE);
-  g_return_val_if_fail (output != NULL, FALSE);
+  GstFlowReturn ret = GST_FLOW_OK;
+  GstBuffer *view_buffer;
+  bool attach_crop_meta = false;
 
-  if (input_state) {
+  if (picture->discont_state) {
     g_clear_pointer (&decoder->input_state, gst_video_codec_state_unref);
-    decoder->input_state = gst_video_codec_state_ref (input_state);
+    decoder->input_state = gst_video_codec_state_ref (picture->discont_state);
+  }
+
+  view_buffer = (GstBuffer *) gst_codec_picture_get_user_data (picture);
+  if (!view_buffer) {
+    GST_ERROR_OBJECT (decoder, "Could not get output view");
+    ret = GST_FLOW_ERROR;
+    goto error;
   }
 
   if (display_width != GST_VIDEO_INFO_WIDTH (&decoder->output_info) ||
@@ -1617,51 +1576,65 @@
 
     if (!gst_video_decoder_negotiate (videodec)) {
       GST_ERROR_OBJECT (videodec, "Failed to re-negotiate with new frame size");
-      return FALSE;
+      ret = GST_FLOW_NOT_NEGOTIATED;
+      goto error;
     }
-  } else if (input_state) {
+  } else if (picture->discont_state) {
     if (!gst_video_decoder_negotiate (videodec)) {
       GST_ERROR_OBJECT (videodec, "Could not re-negotiate with updated state");
-      return FALSE;
+      ret = GST_FLOW_NOT_NEGOTIATED;
+      goto error;
     }
   }
 
-  if (gst_d3d11_decoder_can_direct_render (decoder, videodec, decoder_buffer,
+  if (gst_d3d11_decoder_can_direct_render (decoder, videodec, view_buffer,
           display_width, display_height)) {
     GstMemory *mem;
 
-    mem = gst_buffer_peek_memory (decoder_buffer, 0);
+    mem = gst_buffer_peek_memory (view_buffer, 0);
     GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D11_MEMORY_TRANSFER_NEED_DOWNLOAD);
 
-    if (decoder->need_crop) {
-      GstVideoCropMeta *crop_meta;
+    if (decoder->need_crop)
+      attach_crop_meta = true;
 
-      decoder_buffer = gst_buffer_make_writable (decoder_buffer);
-      crop_meta = gst_buffer_get_video_crop_meta (decoder_buffer);
-      if (!crop_meta)
-        crop_meta = gst_buffer_add_video_crop_meta (decoder_buffer);
-
-      crop_meta->x = decoder->offset_x;
-      crop_meta->y = decoder->offset_y;
-      crop_meta->width = decoder->info.width;
-      crop_meta->height = decoder->info.height;
+    frame->output_buffer = gst_buffer_ref (view_buffer);
+  } else {
+    frame->output_buffer = gst_video_decoder_allocate_output_buffer (videodec);
+    if (!frame->output_buffer) {
+      GST_ERROR_OBJECT (videodec, "Couldn't allocate output buffer");
+      ret = GST_FLOW_ERROR;
+      goto error;
+    }
 
-      GST_TRACE_OBJECT (decoder, "Attatching crop meta");
+    if (!gst_d3d11_decoder_crop_and_copy_buffer (decoder, view_buffer,
+            frame->output_buffer)) {
+      ret = GST_FLOW_ERROR;
+      goto error;
     }
+  }
 
-    *output = gst_buffer_ref (decoder_buffer);
+  GST_BUFFER_FLAG_SET (frame->output_buffer, buffer_flags);
+  gst_codec_picture_unref (picture);
 
-    return TRUE;
-  }
+  if (attach_crop_meta) {
+    frame->output_buffer = gst_buffer_make_writable (frame->output_buffer);
 
-  *output = gst_video_decoder_allocate_output_buffer (videodec);
-  if (*output == NULL) {
-    GST_ERROR_OBJECT (videodec, "Couldn't allocate output buffer");
-    return FALSE;
+    auto crop_meta = gst_buffer_add_video_crop_meta (frame->output_buffer);
+    crop_meta->x = decoder->offset_x;
+    crop_meta->y = decoder->offset_y;
+    crop_meta->width = decoder->info.width;
+    crop_meta->height = decoder->info.height;
+
+    GST_TRACE_OBJECT (decoder, "Attatching crop meta");
   }
 
-  return gst_d3d11_decoder_crop_and_copy_buffer (decoder, decoder_buffer,
-      *output);
+  return gst_video_decoder_finish_frame (videodec, frame);
+
+error:
+  gst_codec_picture_unref (picture);
+  gst_video_decoder_release_frame (videodec, frame);
+
+  return ret;
 }
 
 gboolean
@@ -1902,7 +1875,8 @@
      * output of shader pipeline if internal resizing is required.
      * Also, downstream can keep using video processor even if we copy
      * some decoded textures into downstream buffer */
-    d3d11_params->desc0.BindFlags |= D3D11_BIND_RENDER_TARGET;
+    gst_d3d11_allocation_params_set_bind_flags (d3d11_params,
+        D3D11_BIND_RENDER_TARGET);
 
     gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
     gst_d3d11_allocation_params_free (d3d11_params);
@@ -1962,18 +1936,28 @@
   return TRUE;
 }
 
-gboolean
-gst_d3d11_decoder_set_flushing (GstD3D11Decoder * decoder,
-    GstVideoDecoder * videodec, gboolean flushing)
+static void
+gst_d3d11_decoder_set_flushing (GstD3D11Decoder * self, gboolean flushing)
 {
-  g_return_val_if_fail (GST_IS_D3D11_DECODER (decoder), FALSE);
-
-  GstD3D11SRWLockGuard lk (&decoder->lock);
-  if (decoder->internal_pool)
-    gst_buffer_pool_set_flushing (decoder->internal_pool, flushing);
-  decoder->flushing = flushing;
+  GstD3D11SRWLockGuard lk (&self->lock);
+  if (self->internal_pool)
+    gst_buffer_pool_set_flushing (self->internal_pool, flushing);
+  self->flushing = flushing;
+}
 
-  return TRUE;
+void
+gst_d3d11_decoder_sink_event (GstD3D11Decoder * decoder, GstEvent * event)
+{
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_FLUSH_START:
+      gst_d3d11_decoder_set_flushing (decoder, TRUE);
+      break;
+    case GST_EVENT_FLUSH_STOP:
+      gst_d3d11_decoder_set_flushing (decoder, FALSE);
+      break;
+    default:
+      break;
+  }
 }
 
 static gboolean
@@ -2218,7 +2202,7 @@
  * Returns: (transfer full): the new #GstD3D11DecoderClassData
  */
 GstD3D11DecoderClassData *
-gst_d3d11_decoder_class_data_new (GstD3D11Device * device, GstDXVACodec codec,
+gst_d3d11_decoder_class_data_new (GstD3D11Device * device, GstDxvaCodec codec,
     GstCaps * sink_caps, GstCaps * src_caps, guint max_resolution)
 {
   GstD3D11DecoderClassData *ret;
@@ -2303,7 +2287,7 @@
 
 typedef struct _GstD3D11DecoderDocCaps
 {
-  GstDXVACodec codec;
+  GstDxvaCodec codec;
   const gchar *sink_caps;
   const gchar *src_caps;
 } GstD3D11DecoderDocCaps;

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11decoder.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11decoder.h Changed

@@ -23,6 +23,8 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/d3d11/gstd3d11.h>
+#include <gst/codecs/gstcodecpicture.h>
+#include <gst/dxva/gstdxva.h>
 
 G_BEGIN_DECLS
 
@@ -32,49 +34,73 @@
 
 typedef struct _GstD3D11DecoderClassData GstD3D11DecoderClassData;
 
-typedef enum
+struct GstD3D11DecoderSubClassData
 {
-  GST_DXVA_CODEC_NONE,
-  GST_DXVA_CODEC_MPEG2,
-  GST_DXVA_CODEC_H264,
-  GST_DXVA_CODEC_H265,
-  GST_DXVA_CODEC_VP8,
-  GST_DXVA_CODEC_VP9,
-  GST_DXVA_CODEC_AV1,
-
-  /* the last of supported codec */
-  GST_DXVA_CODEC_LAST
-} GstDXVACodec;
-
-typedef struct
-{
-  GstDXVACodec codec;
+  GstDxvaCodec codec;
   gint64 adapter_luid;
   guint device_id;
   guint vendor_id;
-} GstD3D11DecoderSubClassData;
-
-typedef struct _GstD3D11DecodeInputStreamArgs
-{
-  gpointer picture_params;
-  gsize picture_params_size;
-
-  gpointer slice_control;
-  gsize slice_control_size;
-
-  gpointer bitstream;
-  gsize bitstream_size;
+};
 
-  gpointer inverse_quantization_matrix;
-  gsize inverse_quantization_matrix_size;
-} GstD3D11DecodeInputStreamArgs;
+#define GST_D3D11_DECODER_DEFINE_TYPE(ModuleObjName,module_obj_name,MODULE,OBJ_NAME,ParentName) \
+  static GstElementClass *parent_class = NULL; \
+  typedef struct _##ModuleObjName { \
+    ParentName parent; \
+    GstD3D11Device *device; \
+    GstD3D11Decoder *decoder; \
+  } ModuleObjName;\
+  typedef struct _##ModuleObjName##Class { \
+    ParentName##Class parent_class; \
+    GstD3D11DecoderSubClassData class_data; \
+  } ModuleObjName##Class; \
+  static inline ModuleObjName * MODULE##_##OBJ_NAME (gpointer ptr) { \
+    return (ModuleObjName *) (ptr); \
+  } \
+  static inline ModuleObjName##Class * MODULE##_##OBJ_NAME##_GET_CLASS (gpointer ptr) { \
+    return G_TYPE_INSTANCE_GET_CLASS ((ptr),G_TYPE_FROM_INSTANCE(ptr),ModuleObjName##Class); \
+  } \
+  static void module_obj_name##_get_property (GObject * object, \
+      guint prop_id, GValue * value, GParamSpec * pspec); \
+  static void module_obj_name##_set_context (GstElement * element, \
+      GstContext * context); \
+  static gboolean module_obj_name##_open (GstVideoDecoder * decoder); \
+  static gboolean module_obj_name##_close (GstVideoDecoder * decoder); \
+  static gboolean module_obj_name##_negotiate (GstVideoDecoder * decoder); \
+  static gboolean module_obj_name##_decide_allocation (GstVideoDecoder * decoder, \
+      GstQuery * query); \
+  static gboolean module_obj_name##_sink_query (GstVideoDecoder * decoder, \
+      GstQuery * query); \
+  static gboolean module_obj_name##_src_query (GstVideoDecoder * decoder, \
+      GstQuery * query); \
+  static gboolean module_obj_name##_sink_event (GstVideoDecoder * decoder, \
+      GstEvent * event); \
+  static GstFlowReturn module_obj_name##_configure (ParentName * decoder, \
+      GstVideoCodecState * input_state, const GstVideoInfo * info, \
+      gint crop_x, gint crop_y, \
+      gint coded_width, gint coded_height, gint max_dpb_size); \
+  static GstFlowReturn  module_obj_name##_new_picture (ParentName * decoder, \
+      GstCodecPicture * picture); \
+  static guint8 module_obj_name##_get_picture_id (ParentName * decoder, \
+      GstCodecPicture * picture); \
+  static GstFlowReturn  module_obj_name##_start_picture (ParentName * decoder, \
+      GstCodecPicture * picture, guint8 * picture_id); \
+  static GstFlowReturn module_obj_name##_end_picture (ParentName * decoder, \
+      GstCodecPicture * picture, GPtrArray * ref_pics, \
+      const GstDxvaDecodingArgs * args); \
+  static GstFlowReturn module_obj_name##_output_picture (ParentName * decoder, \
+      GstVideoCodecFrame * frame, GstCodecPicture * picture, \
+      GstVideoBufferFlags buffer_flags, \
+      gint display_width, gint display_height);
+
+#define GST_D3D11_DECODER_DEFINE_TYPE_FULL(ModuleObjName,module_obj_name,MODULE,OBJ_NAME,ParentName) \
+  GST_D3D11_DECODER_DEFINE_TYPE(ModuleObjName,module_obj_name,MODULE,OBJ_NAME,ParentName); \
+  static GstFlowReturn  module_obj_name##_duplicate_picture (ParentName * decoder, \
+      GstCodecPicture * src, GstCodecPicture * dst);
 
 GstD3D11Decoder * gst_d3d11_decoder_new (GstD3D11Device * device,
-                                         GstDXVACodec codec);
-
-gboolean          gst_d3d11_decoder_is_configured (GstD3D11Decoder * decoder);
+                                         GstDxvaCodec codec);
 
-gboolean          gst_d3d11_decoder_configure     (GstD3D11Decoder * decoder,
+GstFlowReturn     gst_d3d11_decoder_configure     (GstD3D11Decoder * decoder,
                                                    GstVideoCodecState * input_state,
                                                    const GstVideoInfo * out_info,
                                                    gint offset_x,
@@ -83,25 +109,32 @@
                                                    gint coded_height,
                                                    guint dpb_size);
 
-GstFlowReturn     gst_d3d11_decoder_decode_frame  (GstD3D11Decoder * decoder,
-                                                   ID3D11VideoDecoderOutputView * output_view,
-                                                   GstD3D11DecodeInputStreamArgs * input_args);
+GstFlowReturn     gst_d3d11_decoder_new_picture   (GstD3D11Decoder * decoder,
+                                                   GstVideoDecoder * videodec,
+                                                   GstCodecPicture * picture);
 
+GstFlowReturn     gst_d3d11_decoder_duplicate_picture (GstD3D11Decoder * decoder,
+                                                       GstCodecPicture * src,
+                                                       GstCodecPicture * dst);
 
-GstBuffer *       gst_d3d11_decoder_get_output_view_buffer (GstD3D11Decoder * decoder,
-                                                            GstVideoDecoder * videodec);
+guint8            gst_d3d11_decoder_get_picture_id    (GstD3D11Decoder * decoder,
+                                                       GstCodecPicture * picture);
 
-ID3D11VideoDecoderOutputView * gst_d3d11_decoder_get_output_view_from_buffer (GstD3D11Decoder * decoder,
-                                                                              GstBuffer * buffer,
-                                                                              guint8 * view_id);
+GstFlowReturn     gst_d3d11_decoder_start_picture     (GstD3D11Decoder * decoder,
+                                                       GstCodecPicture * picture,
+                                                       guint8 * picture_id);
 
-gboolean          gst_d3d11_decoder_process_output      (GstD3D11Decoder * decoder,
+GstFlowReturn     gst_d3d11_decoder_end_picture       (GstD3D11Decoder * decoder,
+                                                       GstCodecPicture * picture,
+                                                       const GstDxvaDecodingArgs * args);
+
+GstFlowReturn     gst_d3d11_decoder_output_picture      (GstD3D11Decoder * decoder,
                                                          GstVideoDecoder * videodec,
-                                                         GstVideoCodecState * in_state,
+                                                         GstVideoCodecFrame * frame,
+                                                         GstCodecPicture * picture,
+                                                         GstVideoBufferFlags buffer_flags,
                                                          gint display_width,
-                                                         gint display_height,
-                                                         GstBuffer * decoder_buffer,
-                                                         GstBuffer ** output);
+                                                         gint display_height);
 
 gboolean          gst_d3d11_decoder_negotiate           (GstD3D11Decoder * decoder,
                                                          GstVideoDecoder * videodec);
@@ -110,26 +143,13 @@
                                                          GstVideoDecoder * videodec,
                                                          GstQuery * query);
 
-gboolean          gst_d3d11_decoder_set_flushing        (GstD3D11Decoder * decoder,
-                                                         GstVideoDecoder * videodec,
-                                                         gboolean flushing);
-
-/* Utils for class registration */
-typedef struct _GstDXVAResolution
-{
-  guint width;
-  guint height;
-} GstDXVAResolution;
-
-static const GstDXVAResolution gst_dxva_resolutions = {
-  {1920, 1088}, {2560, 1440}, {3840, 2160}, {4096, 2160},
-  {7680, 4320}, {8192, 4320}, {15360, 8640}, {16384, 8640}
-};
+void              gst_d3d11_decoder_sink_event          (GstD3D11Decoder * decoder,
+                                                         GstEvent * event);
 
 gboolean          gst_d3d11_decoder_util_is_legacy_device (GstD3D11Device * device);
 
 gboolean          gst_d3d11_decoder_get_supported_decoder_profile (GstD3D11Device * device,
-                                                                   GstDXVACodec codec,
+                                                                   GstDxvaCodec codec,
                                                                    GstVideoFormat format,
                                                                    const GUID ** selected_profile);
 
@@ -144,7 +164,7 @@
                                                          guint height);
 
 GstD3D11DecoderClassData *  gst_d3d11_decoder_class_data_new  (GstD3D11Device * device,
-                                                               GstDXVACodec codec,
+                                                               GstDxvaCodec codec,
                                                                GstCaps * sink_caps,
                                                                GstCaps * src_caps,
                                                                guint max_resolution);

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11deinterlace.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11deinterlace.cpp Changed

@@ -86,7 +86,7 @@
       D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BLEND,
   GST_D3D11_DEINTERLACE_METHOD_BOB =
       D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BOB,
-  GST_D3D11_DEINTERLACE_METHOD_ADAPTVIE =
+  GST_D3D11_DEINTERLACE_METHOD_ADAPTIVE =
       D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_ADAPTIVE,
   GST_D3D11_DEINTERLACE_METHOD_MOTION_COMPENSATION =
       D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_MOTION_COMPENSATION,
@@ -99,7 +99,7 @@
 #define DEINTERLACE_METHOD_ALL \
     ((GstD3D11DeinterlaceMethod) (GST_D3D11_DEINTERLACE_METHOD_BLEND | \
         GST_D3D11_DEINTERLACE_METHOD_BOB | \
-        GST_D3D11_DEINTERLACE_METHOD_ADAPTVIE | \
+        GST_D3D11_DEINTERLACE_METHOD_ADAPTIVE | \
         GST_D3D11_DEINTERLACE_METHOD_MOTION_COMPENSATION))
 
 /**
@@ -124,7 +124,7 @@
       {GST_D3D11_DEINTERLACE_METHOD_BOB,
           "Bob: Interpolating missing lines by using the adjacent lines. "
             "Framerate will be doubled (e,g, 60i -> 60p)", "bob"},
-      {GST_D3D11_DEINTERLACE_METHOD_ADAPTVIE,
+      {GST_D3D11_DEINTERLACE_METHOD_ADAPTIVE,
             "Adaptive: Interpolating missing lines by using spatial/temporal references. "
             "Framerate will be doubled (e,g, 60i -> 60p)",
           "adaptive"},
@@ -511,7 +511,7 @@
   /* Single method was requested? */
   if (self->method == GST_D3D11_DEINTERLACE_METHOD_BLEND ||
       self->method == GST_D3D11_DEINTERLACE_METHOD_BOB ||
-      self->method == GST_D3D11_DEINTERLACE_METHOD_ADAPTVIE ||
+      self->method == GST_D3D11_DEINTERLACE_METHOD_ADAPTIVE ||
       self->method == GST_D3D11_DEINTERLACE_METHOD_MOTION_COMPENSATION) {
     if (self->method == requested_method)
       updated = FALSE;
@@ -520,9 +520,9 @@
     if ((self->method & GST_D3D11_DEINTERLACE_METHOD_BOB) ==
         GST_D3D11_DEINTERLACE_METHOD_BOB) {
       self->method = GST_D3D11_DEINTERLACE_METHOD_BOB;
-    } else if ((self->method & GST_D3D11_DEINTERLACE_METHOD_ADAPTVIE) ==
-        GST_D3D11_DEINTERLACE_METHOD_ADAPTVIE) {
-      self->method = GST_D3D11_DEINTERLACE_METHOD_ADAPTVIE;
+    } else if ((self->method & GST_D3D11_DEINTERLACE_METHOD_ADAPTIVE) ==
+        GST_D3D11_DEINTERLACE_METHOD_ADAPTIVE) {
+      self->method = GST_D3D11_DEINTERLACE_METHOD_ADAPTIVE;
     } else if ((self->method & GST_D3D11_DEINTERLACE_METHOD_MOTION_COMPENSATION)
         == GST_D3D11_DEINTERLACE_METHOD_MOTION_COMPENSATION) {
       self->method = GST_D3D11_DEINTERLACE_METHOD_MOTION_COMPENSATION;
@@ -914,7 +914,8 @@
     d3d11_params = gst_d3d11_allocation_params_new (self->device, &info,
         GST_D3D11_ALLOCATION_FLAG_DEFAULT, D3D11_BIND_RENDER_TARGET, 0);
   } else {
-    d3d11_params->desc0.BindFlags |= D3D11_BIND_RENDER_TARGET;
+    gst_d3d11_allocation_params_set_bind_flags (d3d11_params,
+        D3D11_BIND_RENDER_TARGET);
   }
 
   gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
@@ -925,7 +926,7 @@
      * a single interlaced frame. To determine timestamp and duration,
      * we might need to hold one past frame if buffer duration is unknown */
     min_buffers = 2;
-  } else if (self->method == GST_D3D11_DEINTERLACE_METHOD_ADAPTVIE ||
+  } else if (self->method == GST_D3D11_DEINTERLACE_METHOD_ADAPTIVE ||
       self->method == GST_D3D11_DEINTERLACE_METHOD_MOTION_COMPENSATION) {
     /* For advanced deinterlacing methods, we will hold more frame so that
      * device can use them as reference frames */
@@ -1019,7 +1020,8 @@
     d3d11_params = gst_d3d11_allocation_params_new (self->device, &info,
         GST_D3D11_ALLOCATION_FLAG_DEFAULT, D3D11_BIND_RENDER_TARGET, 0);
   } else {
-    d3d11_params->desc0.BindFlags |= D3D11_BIND_RENDER_TARGET;
+    gst_d3d11_allocation_params_set_bind_flags (d3d11_params,
+        D3D11_BIND_RENDER_TARGET);
   }
 
   gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
@@ -2306,7 +2308,7 @@
   bob = IS_SUPPORTED_METHOD (supported_methods,
       GST_D3D11_DEINTERLACE_METHOD_BOB);
   adaptive = IS_SUPPORTED_METHOD (supported_methods,
-      GST_D3D11_DEINTERLACE_METHOD_ADAPTVIE);
+      GST_D3D11_DEINTERLACE_METHOD_ADAPTIVE);
   mocomp = IS_SUPPORTED_METHOD (supported_methods,
       GST_D3D11_DEINTERLACE_METHOD_MOTION_COMPENSATION);
 #undef IS_SUPPORTED_METHOD
@@ -2317,7 +2319,7 @@
   /* Drop all not supported methods from flags */
   supported_methods = supported_methods &
       (GST_D3D11_DEINTERLACE_METHOD_BLEND | GST_D3D11_DEINTERLACE_METHOD_BOB |
-      GST_D3D11_DEINTERLACE_METHOD_ADAPTVIE |
+      GST_D3D11_DEINTERLACE_METHOD_ADAPTIVE |
       GST_D3D11_DEINTERLACE_METHOD_MOTION_COMPENSATION);
 
   /* Prefer bob, it's equivalent to "linear" which is default mode of
@@ -2328,7 +2330,7 @@
   if (bob) {
     default_method = GST_D3D11_DEINTERLACE_METHOD_BOB;
   } else if (adaptive) {
-    default_method = GST_D3D11_DEINTERLACE_METHOD_ADAPTVIE;
+    default_method = GST_D3D11_DEINTERLACE_METHOD_ADAPTIVE;
   } else if (mocomp) {
     default_method = GST_D3D11_DEINTERLACE_METHOD_MOTION_COMPENSATION;
   } else if (blend) {

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11download.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11download.cpp Changed

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11dxgicapture.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11dxgicapture.cpp Changed

@@ -49,72 +49,39 @@
 #include "gstd3d11dxgicapture.h"
 #include "gstd3d11pluginutils.h"
 #include <string.h>
+#include <mutex>
 
 #include <wrl.h>
 
+#define _XM_NO_INTRINSICS_
+#include <DirectXMath.h>
+
 GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_screen_capture_debug);
 #define GST_CAT_DEFAULT gst_d3d11_screen_capture_debug
 
 /* *INDENT-OFF* */
 using namespace Microsoft::WRL;
+using namespace DirectX;
 
 /* List of GstD3D11DxgiCapture weakref */
-G_LOCK_DEFINE_STATIC (dupl_list_lock);
+static std::mutex dupl_list_lock;
 static GList *dupl_list = nullptr;
 
-/* Below implemenation were taken from Microsoft sample
+/* Below implementation were taken from Microsoft sample
  * https://github.com/microsoft/Windows-classic-samples/tree/master/Samples/DXGIDesktopDuplication
  */
 #define NUMVERTICES 6
 #define BPP 4
 
-/* Define our own MyFLOAT3 and MyFLOAT2 struct, since MinGW doesn't support
- * DirectXMath.h
- */
-struct MyFLOAT3
-{
-  float x;
-  float y;
-  float z;
-
-  MyFLOAT3() = default;
-
-  MyFLOAT3(const MyFLOAT3&) = default;
-  MyFLOAT3& operator=(const MyFLOAT3&) = default;
-
-  MyFLOAT3(MyFLOAT3&&) = default;
-  MyFLOAT3& operator=(MyFLOAT3&&) = default;
-
-  constexpr MyFLOAT3(float _x, float _y, float _z) : x(_x), y(_y), z(_z) {}
-  explicit MyFLOAT3(const float *pArray) : x(pArray0), y(pArray1), z(pArray2) {}
-};
-
-struct MyFLOAT2
+struct VERTEX
 {
-  float x;
-  float y;
-
-  MyFLOAT2() = default;
-
-  MyFLOAT2(const MyFLOAT2&) = default;
-  MyFLOAT2& operator=(const MyFLOAT2&) = default;
-
-  MyFLOAT2(MyFLOAT2&&) = default;
-  MyFLOAT2& operator=(MyFLOAT2&&) = default;
-
-  constexpr MyFLOAT2(float _x, float _y) : x(_x), y(_y) {}
-  explicit MyFLOAT2(const float *pArray) : x(pArray0), y(pArray1) {}
+  XMFLOAT3 Pos;
+  XMFLOAT2 TexCoord;
 };
 
-typedef struct
-{
-  MyFLOAT3 Pos;
-  MyFLOAT2 TexCoord;
-} VERTEX;
-
 /* List of expected error cases */
 /* These are the errors we expect from general Dxgi API due to a transition */
-HRESULT SystemTransitionsExpectedErrors = {
+static HRESULT SystemTransitionsExpectedErrors = {
   DXGI_ERROR_DEVICE_REMOVED,
   DXGI_ERROR_ACCESS_LOST,
   static_cast<HRESULT>(WAIT_ABANDONED),
@@ -123,7 +90,7 @@
 
 /* These are the errors we expect from IDXGIOutput1::DuplicateOutput
  * due to a transition */
-HRESULT CreateDuplicationExpectedErrors = {
+static HRESULT CreateDuplicationExpectedErrors = {
   DXGI_ERROR_DEVICE_REMOVED,
   static_cast<HRESULT>(E_ACCESSDENIED),
   DXGI_ERROR_SESSION_DISCONNECTED,
@@ -132,19 +99,12 @@
 
 /* These are the errors we expect from IDXGIOutputDuplication methods
  * due to a transition */
-HRESULT FrameInfoExpectedErrors = {
+static HRESULT FrameInfoExpectedErrors = {
   DXGI_ERROR_DEVICE_REMOVED,
   DXGI_ERROR_ACCESS_LOST,
   S_OK
 };
 
-/* These are the errors we expect from IDXGIAdapter::EnumOutputs methods
- * due to outputs becoming stale during a transition */
-HRESULT EnumOutputsExpectedErrors = {
-  DXGI_ERROR_NOT_FOUND,
-  S_OK
-};
-
 static GstFlowReturn
 gst_d3d11_dxgi_capture_return_from_hr (ID3D11Device * device,
     HRESULT hr, HRESULT * expected_errors = nullptr)
@@ -231,7 +191,6 @@
 public:
   D3D11DesktopDupObject ()
     : device_(nullptr)
-    , fence_(nullptr)
     , metadata_buffer_(nullptr)
     , metadata_buffer_size_(0)
     , vertex_buffer_(nullptr)
@@ -247,7 +206,11 @@
     if (vertex_buffer_)
       delete vertex_buffer_;
 
-    gst_clear_d3d11_fence (&fence_);
+    if (keyed_mutex_) {
+      keyed_mutex_->ReleaseSync (0);
+      keyed_mutex_ = nullptr;
+    }
+
     gst_clear_object (&device_);
   }
 
@@ -282,7 +245,7 @@
         D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
     texture_desc.CPUAccessFlags = 0;
     /* source element may hold different d3d11 device object */
-    texture_desc.MiscFlags = D3D11_RESOURCE_MISC_SHARED;
+    texture_desc.MiscFlags = D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX;
 
     hr = device_handle->CreateTexture2D (&texture_desc,
         nullptr, &shared_texture_);
@@ -291,6 +254,21 @@
       return GST_FLOW_ERROR;
     }
 
+    hr = shared_texture_.As (&keyed_mutex_);
+    if (!gst_d3d11_result (hr, device)) {
+      GST_ERROR_OBJECT (device, "Couldn't get keyed mutex interface");
+      shared_texture_ = nullptr;
+      return GST_FLOW_ERROR;
+    }
+
+    hr = keyed_mutex_->AcquireSync (0, INFINITE);
+    if (hr != S_OK) {
+      GST_ERROR_OBJECT (device, "Couldn't acquire sync");
+      keyed_mutex_ = nullptr;
+      shared_texture_ = nullptr;
+      return GST_FLOW_ERROR;
+    }
+
     device_ = (GstD3D11Device *) gst_object_ref (device);
 
     return GST_FLOW_OK;
@@ -346,9 +324,7 @@
 
   bool
   DrawMouse (GstD3D11Device * device, ID3D11RenderTargetView * rtv,
-      ID3D11VertexShader * vs, ID3D11PixelShader * ps,
-      ID3D11InputLayout * layout, ID3D11SamplerState * sampler,
-      ID3D11BlendState * blend, D3D11_BOX * cropBox)
+      ShaderResource * resource, D3D11_BOX * cropBox)
   {
     GST_TRACE ("Drawing mouse");
 
@@ -369,12 +345,12 @@
 
     VERTEX VerticesNUMVERTICES =
     {
-      {MyFLOAT3(-1.0f, -1.0f, 0), MyFLOAT2(0.0f, 1.0f)},
-      {MyFLOAT3(-1.0f, 1.0f, 0), MyFLOAT2(0.0f, 0.0f)},
-      {MyFLOAT3(1.0f, -1.0f, 0), MyFLOAT2(1.0f, 1.0f)},
-      {MyFLOAT3(1.0f, -1.0f, 0), MyFLOAT2(1.0f, 1.0f)},
-      {MyFLOAT3(-1.0f, 1.0f, 0), MyFLOAT2(0.0f, 0.0f)},
-      {MyFLOAT3(1.0f, 1.0f, 0), MyFLOAT2(1.0f, 0.0f)},
+      {XMFLOAT3(-1.0f, -1.0f, 0), XMFLOAT2(0.0f, 1.0f)},
+      {XMFLOAT3(-1.0f, 1.0f, 0), XMFLOAT2(0.0f, 0.0f)},
+      {XMFLOAT3(1.0f, -1.0f, 0), XMFLOAT2(1.0f, 1.0f)},
+      {XMFLOAT3(1.0f, -1.0f, 0), XMFLOAT2(1.0f, 1.0f)},
+      {XMFLOAT3(-1.0f, 1.0f, 0), XMFLOAT2(0.0f, 0.0f)},
+      {XMFLOAT3(1.0f, 1.0f, 0), XMFLOAT2(1.0f, 0.0f)},
     };
 
     D3D11_TEXTURE2D_DESC FullDesc;
@@ -510,14 +486,14 @@
     ID3D11Buffer *vert_buf = VertexBufferMouse.Get();
 
     context_handle->IASetVertexBuffers(0, 1, &vert_buf, &Stride, &Offset);
-    context_handle->OMSetBlendState(blend, BlendFactor, 0xFFFFFFFF);
+    context_handle->OMSetBlendState(resource->blend, BlendFactor, 0xFFFFFFFF);
     context_handle->OMSetRenderTargets(1, &rtv, nullptr);
-    context_handle->VSSetShader(vs, nullptr, 0);
-    context_handle->PSSetShader(ps, nullptr, 0);
+    context_handle->VSSetShader(resource->vs, nullptr, 0);
+    context_handle->PSSetShader(resource->ps, nullptr, 0);
     context_handle->PSSetShaderResources(0, 1, &srv);
-    context_handle->PSSetSamplers(0, 1, &sampler);
+    context_handle->PSSetSamplers(0, 1, &resource->sampler);
     context_handle->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-    context_handle->IASetInputLayout(layout);
+    context_handle->IASetInputLayout(resource->layout);
 
     D3D11_VIEWPORT VP;
     VP.Width = static_cast<FLOAT>(FullDesc.Width);
@@ -527,6 +503,7 @@
     VP.TopLeftX = 0.0f;
     VP.TopLeftY = 0.0f;
     context_handle->RSSetViewports(1, &VP);
+    context_handle->RSSetState (resource->rs);
 
     context_handle->Draw(NUMVERTICES, 0);
 
@@ -547,8 +524,8 @@
   {
     ID3D11DeviceContext *context_handle = nullptr;
     ComPtr <ID3D11Texture2D> tex;
+    ComPtr < IDXGIKeyedMutex > other_keyed_mutex;
     HRESULT hr;
-    gboolean is_shared = FALSE;
 
     context_handle = gst_d3d11_device_get_device_context_handle (device);
 
@@ -574,24 +551,21 @@
       if (!gst_d3d11_result (hr, device))
         return GST_FLOW_ERROR;
 
-      if (fence_ && fence_->device != device)
-        gst_clear_d3d11_fence (&fence_);
-
-      if (!fence_)
-        fence_ = gst_d3d11_device_create_fence (device);
-
-      if (!fence_)
+      hr = tex.As (&other_keyed_mutex);
+      if (!gst_d3d11_result (hr, device))
         return GST_FLOW_ERROR;
 
-      is_shared = TRUE;
+      /* release sync from our device, and acquire for other device */
+      keyed_mutex_->ReleaseSync (0);
+      other_keyed_mutex->AcquireSync (0, INFINITE);
     }
 
     context_handle->CopySubresourceRegion (texture, 0, 0, 0, 0,
         tex.Get(), 0, cropBox);
 
-    if (is_shared) {
-      if (!gst_d3d11_fence_signal (fence_) || !gst_d3d11_fence_wait (fence_))
-        return GST_FLOW_ERROR;
+    if (other_keyed_mutex) {
+      other_keyed_mutex->ReleaseSync (0);
+      keyed_mutex_->AcquireSync (0, INFINITE);
     }
 
     return GST_FLOW_OK;
@@ -609,90 +583,44 @@
   bool
   InitShader (GstD3D11Device * device)
   {
-    static const gchar vs_str =
-        "struct VS_INPUT {\n"
-        "  float4 Position: POSITION;\n"
-        "  float2 Texture: TEXCOORD;\n"
-        "};\n"
-        "\n"
-        "struct VS_OUTPUT {\n"
-        "  float4 Position: SV_POSITION;\n"
-        "  float2 Texture: TEXCOORD;\n"
-        "};\n"
-        "\n"
-        "VS_OUTPUT main (VS_INPUT input)\n"
-        "{\n"
-        "  return input;\n"
-        "}";
-
-    static const gchar ps_str =
-        "Texture2D shaderTexture;\n"
-        "SamplerState samplerState;\n"
-        "\n"
-        "struct PS_INPUT {\n"
-        "  float4 Position: SV_POSITION;\n"
-        "  float2 Texture: TEXCOORD;\n"
-        "};\n"
-        "\n"
-        "struct PS_OUTPUT {\n"
-        "  float4 Plane: SV_Target;\n"
-        "};\n"
-        "\n"
-        "PS_OUTPUT main(PS_INPUT input)\n"
-        "{\n"
-        "  PS_OUTPUT output;\n"
-        "  output.Plane = shaderTexture.Sample(samplerState, input.Texture);\n"
-        "  return output;\n"
-        "}";
-
-    D3D11_INPUT_ELEMENT_DESC input_desc = {
-      {"POSITION",
-          0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0},
-      {"TEXCOORD",
-          0, DXGI_FORMAT_R32G32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0}
-    };
-
     ComPtr<ID3D11VertexShader> vs;
+    ComPtr<ID3D11PixelShader> ps;
     ComPtr<ID3D11InputLayout> layout;
+    ComPtr<ID3D11RasterizerState> rs;
     HRESULT hr;
 
-    hr = gst_d3d11_create_vertex_shader_simple (device,
-        vs_str, "main", input_desc, G_N_ELEMENTS (input_desc), &vs, &layout);
+    hr = gst_d3d11_get_vertex_shader_coord (device, &vs, &layout);
     if (!gst_d3d11_result (hr, device)) {
       GST_ERROR ("Failed to create vertex shader");
       return false;
     }
 
-    ComPtr<ID3D11PixelShader> ps;
-    hr = gst_d3d11_create_pixel_shader_simple (device, ps_str, "main", &ps);
+    hr = gst_d3d11_get_pixel_shader_sample (device, &ps);
     if (!gst_d3d11_result (hr, device)) {
       GST_ERROR ("Failed to create pixel shader");
       return false;
     }
 
-    D3D11_SAMPLER_DESC sampler_desc;
-    memset (&sampler_desc, 0, sizeof (D3D11_SAMPLER_DESC));
-    sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-    sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
-    sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
-    sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
-    sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER;
-    sampler_desc.MinLOD = 0;
-    sampler_desc.MaxLOD = D3D11_FLOAT32_MAX;
-
-    ID3D11Device *device_handle = gst_d3d11_device_get_device_handle (device);
     ComPtr<ID3D11SamplerState> sampler;
-    hr = device_handle->CreateSamplerState (&sampler_desc, &sampler);
+    hr = gst_d3d11_device_get_sampler (device, D3D11_FILTER_MIN_MAG_MIP_LINEAR,
+        &sampler);
     if (!gst_d3d11_result (hr, device)) {
       GST_ERROR ("Failed to create sampler state, hr 0x%x", (guint) hr);
       return false;
     }
 
+    hr = gst_d3d11_device_get_rasterizer (device, &rs);
+    if (!gst_d3d11_result (hr, device)) {
+      GST_ERROR ("Couldn't get rasterizer state");
+      return false;
+    }
+
     /* Everything is prepared now */
     vs_ = vs;
     ps_ = ps;
     layout_ = layout;
     sampler_ = sampler;
+    rs_ = rs;
 
     return true;
   }
@@ -1069,16 +997,16 @@
         DestDirty.bottom = Dirty->right;
 
         Vertices0.TexCoord =
-            MyFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->bottom / static_cast<FLOAT>(ThisDesc->Height));
         Vertices1.TexCoord =
-            MyFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->bottom / static_cast<FLOAT>(ThisDesc->Height));
         Vertices2.TexCoord =
-            MyFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->top / static_cast<FLOAT>(ThisDesc->Height));
         Vertices5.TexCoord =
-            MyFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->top / static_cast<FLOAT>(ThisDesc->Height));
         break;
       case DXGI_MODE_ROTATION_ROTATE180:
@@ -1088,16 +1016,16 @@
         DestDirty.bottom = Height - Dirty->top;
 
         Vertices0.TexCoord =
-            MyFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->top / static_cast<FLOAT>(ThisDesc->Height));
         Vertices1.TexCoord =
-            MyFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->bottom / static_cast<FLOAT>(ThisDesc->Height));
         Vertices2.TexCoord =
-            MyFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->top / static_cast<FLOAT>(ThisDesc->Height));
         Vertices5.TexCoord =
-            MyFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->bottom / static_cast<FLOAT>(ThisDesc->Height));
         break;
       case DXGI_MODE_ROTATION_ROTATE270:
@@ -1107,56 +1035,56 @@
         DestDirty.bottom = Height - Dirty->left;
 
         Vertices0.TexCoord =
-            MyFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->top / static_cast<FLOAT>(ThisDesc->Height));
         Vertices1.TexCoord =
-            MyFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->top / static_cast<FLOAT>(ThisDesc->Height));
         Vertices2.TexCoord =
-            MyFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->bottom / static_cast<FLOAT>(ThisDesc->Height));
         Vertices5.TexCoord =
-            MyFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->bottom / static_cast<FLOAT>(ThisDesc->Height));
         break;
       case DXGI_MODE_ROTATION_UNSPECIFIED:
       case DXGI_MODE_ROTATION_IDENTITY:
       default:
         Vertices0.TexCoord =
-            MyFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->bottom / static_cast<FLOAT>(ThisDesc->Height));
         Vertices1.TexCoord =
-            MyFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->left / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->top / static_cast<FLOAT>(ThisDesc->Height));
         Vertices2.TexCoord =
-            MyFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->bottom / static_cast<FLOAT>(ThisDesc->Height));
         Vertices5.TexCoord =
-            MyFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
+            XMFLOAT2(Dirty->right / static_cast<FLOAT>(ThisDesc->Width),
                      Dirty->top / static_cast<FLOAT>(ThisDesc->Height));
         break;
     }
 
     /* Set positions */
     Vertices0.Pos =
-        MyFLOAT3(
+        XMFLOAT3(
           (DestDirty.left - CenterX) / static_cast<FLOAT>(CenterX),
           -1 * (DestDirty.bottom - CenterY) / static_cast<FLOAT>(CenterY),
           0.0f);
     Vertices1.Pos =
-        MyFLOAT3(
+        XMFLOAT3(
           (DestDirty.left - CenterX) / static_cast<FLOAT>(CenterX),
           -1 * (DestDirty.top - CenterY) / static_cast<FLOAT>(CenterY),
           0.0f);
     Vertices2.Pos =
-        MyFLOAT3(
+        XMFLOAT3(
           (DestDirty.right - CenterX) / static_cast<FLOAT>(CenterX),
           -1 * (DestDirty.bottom - CenterY) / static_cast<FLOAT>(CenterY),
           0.0f);
     Vertices3.Pos = Vertices2.Pos;
     Vertices4.Pos = Vertices1.Pos;
     Vertices5.Pos =
-        MyFLOAT3(
+        XMFLOAT3(
           (DestDirty.right - CenterX) / static_cast<FLOAT>(CenterX),
           -1 * (DestDirty.top - CenterY) / static_cast<FLOAT>(CenterY),
           0.0f);
@@ -1272,6 +1200,7 @@
     VP.TopLeftX = 0.0f;
     VP.TopLeftY = 0.0f;
     device_context->RSSetViewports(1, &VP);
+    device_context->RSSetState (rs_.Get ());
 
     device_context->Draw(NUMVERTICES * DirtyCount, 0);
 
@@ -1472,15 +1401,16 @@
   PTR_INFO ptr_info_;
   DXGI_OUTDUPL_DESC output_desc_;
   GstD3D11Device * device_;
-  GstD3D11Fence * fence_;
 
   ComPtr<ID3D11Texture2D> shared_texture_;
+  ComPtr<IDXGIKeyedMutex> keyed_mutex_;
   ComPtr<ID3D11RenderTargetView> rtv_;
   ComPtr<ID3D11Texture2D> move_texture_;
   ComPtr<ID3D11VertexShader> vs_;
   ComPtr<ID3D11PixelShader> ps_;
   ComPtr<ID3D11InputLayout> layout_;
   ComPtr<ID3D11SamplerState> sampler_;
+  ComPtr<ID3D11RasterizerState> rs_;
   ComPtr<IDXGIOutputDuplication> dupl_;
 
   /* frame metadata */
@@ -1529,15 +1459,10 @@
 static gboolean
 gst_d3d11_dxgi_capture_get_size (GstD3D11ScreenCapture * capture,
     guint * width, guint * height);
-static gboolean
-gst_d3d11_dxgi_capture_get_colorimetry (GstD3D11ScreenCapture * capture,
-    GstVideoColorimetry * colorimetry);
 static GstFlowReturn
 gst_d3d11_dxgi_capture_do_capture (GstD3D11ScreenCapture * capture,
     GstD3D11Device * device, ID3D11Texture2D * texture,
-    ID3D11RenderTargetView * rtv, ID3D11VertexShader * vs,
-    ID3D11PixelShader * ps, ID3D11InputLayout * layout,
-    ID3D11SamplerState * sampler, ID3D11BlendState * blend,
+    ID3D11RenderTargetView * rtv, ShaderResource * resource,
     D3D11_BOX * crop_box, gboolean draw_mouse);
 
 #define gst_d3d11_dxgi_capture_parent_class parent_class
@@ -1570,8 +1495,6 @@
 
   capture_class->prepare = GST_DEBUG_FUNCPTR (gst_d3d11_dxgi_capture_prepare);
   capture_class->get_size = GST_DEBUG_FUNCPTR (gst_d3d11_dxgi_capture_get_size);
-  capture_class->get_colorimetry =
-      GST_DEBUG_FUNCPTR (gst_d3d11_dxgi_capture_get_colorimetry);
   capture_class->do_capture =
       GST_DEBUG_FUNCPTR (gst_d3d11_dxgi_capture_do_capture);
 }
@@ -1746,9 +1669,8 @@
 gst_d3d11_dxgi_capture_weak_ref_notify (gpointer data,
     GstD3D11DxgiCapture * dupl)
 {
-  G_LOCK (dupl_list_lock);
+  std::lock_guard < std::mutex > lk (dupl_list_lock);
   dupl_list = g_list_remove (dupl_list, dupl);
-  G_UNLOCK (dupl_list_lock);
 }
 
 GstD3D11ScreenCapture *
@@ -1766,30 +1688,24 @@
    * See also
    * https://docs.microsoft.com/en-us/windows/win32/api/dxgi1_2/nf-dxgi1_2-idxgioutput1-duplicateoutput#remarks
    */
-  G_LOCK (dupl_list_lock);
+  std::lock_guard < std::mutex > lk (dupl_list_lock);
   for (iter = dupl_list; iter; iter = g_list_next (iter)) {
     GstD3D11DxgiCapture *dupl = (GstD3D11DxgiCapture *) iter->data;
 
     if (dupl->monitor_handle == monitor_handle) {
       GST_DEBUG ("Found configured desktop dup object for monitor handle %p",
           monitor_handle);
-      self = (GstD3D11DxgiCapture *) gst_object_ref (dupl);
-      break;
+      gst_object_ref (dupl);
+      return GST_D3D11_SCREEN_CAPTURE_CAST (dupl);
     }
   }
 
-  if (self) {
-    G_UNLOCK (dupl_list_lock);
-    return GST_D3D11_SCREEN_CAPTURE_CAST (self);
-  }
-
   self = (GstD3D11DxgiCapture *) g_object_new (GST_TYPE_D3D11_DXGI_CAPTURE,
       "d3d11device", device, "monitor-handle", monitor_handle, nullptr);
 
   if (!self->device) {
     GST_WARNING_OBJECT (self, "Couldn't configure desktop dup object");
     gst_object_unref (self);
-    G_UNLOCK (dupl_list_lock);
 
     return nullptr;
   }
@@ -1798,8 +1714,6 @@
       (GWeakNotify) gst_d3d11_dxgi_capture_weak_ref_notify, nullptr);
   dupl_list = g_list_append (dupl_list, self);
 
-  G_UNLOCK (dupl_list_lock);
-
   return GST_D3D11_SCREEN_CAPTURE_CAST (self);
 }
 
@@ -1862,44 +1776,10 @@
   return gst_d3d11_dxgi_capture_get_size_unlocked (self, width, height);
 }
 
-static gboolean
-gst_d3d11_dxgi_capture_get_colorimetry (GstD3D11ScreenCapture * capture,
-    GstVideoColorimetry * colorimetry)
-{
-  GstD3D11DxgiCapture *self = GST_D3D11_DXGI_CAPTURE (capture);
-  DXGI_COLOR_SPACE_TYPE dxgi_cs;
-  GstVideoInfo info;
-
-  dxgi_cs = DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709;
-
-  if (self->output) {
-    ComPtr < IDXGIOutput6 > output;
-    HRESULT hr;
-    DXGI_OUTPUT_DESC1 desc;
-
-    hr = self->output->QueryInterface (IID_PPV_ARGS (&output));
-    if (SUCCEEDED (hr))
-      hr = output->GetDesc1 (&desc);
-
-    if (SUCCEEDED (hr))
-      dxgi_cs = desc.ColorSpace;
-  }
-
-  gst_video_info_set_format (&info, GST_VIDEO_FORMAT_BGRA, 16, 16);
-  if (gst_video_info_apply_dxgi_color_space (dxgi_cs, &info)) {
-    *colorimetry = info.colorimetry;
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
 static GstFlowReturn
 gst_d3d11_dxgi_capture_do_capture (GstD3D11ScreenCapture * capture,
     GstD3D11Device * device, ID3D11Texture2D * texture,
-    ID3D11RenderTargetView * rtv, ID3D11VertexShader * vs,
-    ID3D11PixelShader * ps, ID3D11InputLayout * layout,
-    ID3D11SamplerState * sampler, ID3D11BlendState * blend,
+    ID3D11RenderTargetView * rtv, ShaderResource * resource,
     D3D11_BOX * crop_box, gboolean draw_mouse)
 {
   GstD3D11DxgiCapture *self = GST_D3D11_DXGI_CAPTURE (capture);
@@ -1968,10 +1848,8 @@
   if (ret != GST_FLOW_OK)
     goto out;
 
-  if (draw_mouse) {
-    self->dupl_obj->DrawMouse (device,
-        rtv, vs, ps, layout, sampler, blend, crop_box);
-  }
+  if (draw_mouse)
+    self->dupl_obj->DrawMouse (device, rtv, resource, crop_box);
 
 out:
   if (shared_device)

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11h264dec.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11h264dec.cpp Changed

@@ -15,36 +15,6 @@
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
- *
- * NOTE: some of implementations are copied/modified from Chromium code
- *
- * Copyright 2015 The Chromium Authors. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *    * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *    * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
@@ -67,99 +37,13 @@
 #endif
 
 #include "gstd3d11h264dec.h"
-
-#include <gst/codecs/gsth264decoder.h>
-#include <string.h>
-#include <vector>
-
-/* HACK: to expose dxva data structure on UWP */
-#ifdef WINAPI_PARTITION_DESKTOP
-#undef WINAPI_PARTITION_DESKTOP
-#endif
-#define WINAPI_PARTITION_DESKTOP 1
-#include <d3d9.h>
-#include <dxva.h>
+#include <gst/dxva/gstdxvah264decoder.h>
 
 GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_h264_dec_debug);
 #define GST_CAT_DEFAULT gst_d3d11_h264_dec_debug
 
-/* *INDENT-OFF* */
-typedef struct _GstD3D11H264DecInner
-{
-  GstD3D11Device *device = nullptr;
-  GstD3D11Decoder *d3d11_decoder = nullptr;
-
-  DXVA_PicParams_H264 pic_params;
-  DXVA_Qmatrix_H264 iq_matrix;
-
-  std::vector<DXVA_Slice_H264_Short> slice_list;
-  std::vector<guint8> bitstream_buffer;
-
-  gint crop_x = 0;
-  gint crop_y = 0;
-  gint width = 0;
-  gint height = 0;
-  gint coded_width = 0;
-  gint coded_height = 0;
-  gint bitdepth = 0;
-  guint8 chroma_format_idc = 0;
-  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
-  gboolean interlaced = FALSE;
-  gint max_dpb_size = 0;
-} GstD3D11H264DecInner;
-
-/* *INDENT-ON* */
-typedef struct _GstD3D11H264Dec
-{
-  GstH264Decoder parent;
-  GstD3D11H264DecInner *inner;
-} GstD3D11H264Dec;
-
-typedef struct _GstD3D11H264DecClass
-{
-  GstH264DecoderClass parent_class;
-  GstD3D11DecoderSubClassData class_data;
-} GstD3D11H264DecClass;
-
-static GstElementClass *parent_class = NULL;
-
-#define GST_D3D11_H264_DEC(object) ((GstD3D11H264Dec *) (object))
-#define GST_D3D11_H264_DEC_GET_CLASS(object) \
-    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstD3D11H264DecClass))
-
-static void gst_d3d11_h264_dec_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_d3d11_h264_dec_finalize (GObject * object);
-static void gst_d3d11_h264_dec_set_context (GstElement * element,
-    GstContext * context);
-
-static gboolean gst_d3d11_h264_dec_open (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_h264_dec_close (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_h264_dec_negotiate (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_h264_dec_decide_allocation (GstVideoDecoder *
-    decoder, GstQuery * query);
-static gboolean gst_d3d11_h264_dec_src_query (GstVideoDecoder * decoder,
-    GstQuery * query);
-static gboolean gst_d3d11_h264_dec_sink_event (GstVideoDecoder * decoder,
-    GstEvent * event);
-
-/* GstH264Decoder */
-static GstFlowReturn gst_d3d11_h264_dec_new_sequence (GstH264Decoder * decoder,
-    const GstH264SPS * sps, gint max_dpb_size);
-static GstFlowReturn gst_d3d11_h264_dec_new_picture (GstH264Decoder * decoder,
-    GstVideoCodecFrame * frame, GstH264Picture * picture);
-static GstFlowReturn
-gst_d3d11_h264_dec_new_field_picture (GstH264Decoder * decoder,
-    GstH264Picture * first_field, GstH264Picture * second_field);
-static GstFlowReturn gst_d3d11_h264_dec_start_picture (GstH264Decoder * decoder,
-    GstH264Picture * picture, GstH264Slice * slice, GstH264Dpb * dpb);
-static GstFlowReturn gst_d3d11_h264_dec_decode_slice (GstH264Decoder * decoder,
-    GstH264Picture * picture, GstH264Slice * slice, GArray * ref_pic_list0,
-    GArray * ref_pic_list1);
-static GstFlowReturn gst_d3d11_h264_dec_end_picture (GstH264Decoder * decoder,
-    GstH264Picture * picture);
-static GstFlowReturn gst_d3d11_h264_dec_output_picture (GstH264Decoder *
-    decoder, GstVideoCodecFrame * frame, GstH264Picture * picture);
+GST_D3D11_DECODER_DEFINE_TYPE_FULL (GstD3D11H264Dec, gst_d3d11_h264_dec,
+    GST, D3D11_H264_DEC, GstDxvaH264Decoder);
 
 static void
 gst_d3d11_h264_dec_class_init (GstD3D11H264DecClass * klass, gpointer data)
@@ -167,11 +51,10 @@
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
-  GstH264DecoderClass *h264decoder_class = GST_H264_DECODER_CLASS (klass);
+  GstDxvaH264DecoderClass *dxva_class = GST_DXVA_H264_DECODER_CLASS (klass);
   GstD3D11DecoderClassData *cdata = (GstD3D11DecoderClassData *) data;
 
   gobject_class->get_property = gst_d3d11_h264_dec_get_property;
-  gobject_class->finalize = gst_d3d11_h264_dec_finalize;
 
   element_class->set_context =
       GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_set_context);
@@ -194,29 +77,26 @@
   decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_negotiate);
   decoder_class->decide_allocation =
       GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_sink_query);
   decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_src_query);
   decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_sink_event);
 
-  h264decoder_class->new_sequence =
-      GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_new_sequence);
-  h264decoder_class->new_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_new_picture);
-  h264decoder_class->new_field_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_new_field_picture);
-  h264decoder_class->start_picture =
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_new_picture);
+  dxva_class->duplicate_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_duplicate_picture);
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_get_picture_id);
+  dxva_class->start_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_start_picture);
-  h264decoder_class->decode_slice =
-      GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_decode_slice);
-  h264decoder_class->end_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_end_picture);
-  h264decoder_class->output_picture =
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_end_picture);
+  dxva_class->output_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_h264_dec_output_picture);
 }
 
 static void
 gst_d3d11_h264_dec_init (GstD3D11H264Dec * self)
 {
-  self->inner = new GstD3D11H264DecInner ();
 }
 
 static void
@@ -230,73 +110,36 @@
 }
 
 static void
-gst_d3d11_h264_dec_finalize (GObject * object)
-{
-  GstD3D11H264Dec *self = GST_D3D11_H264_DEC (object);
-
-  delete self->inner;
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
 gst_d3d11_h264_dec_set_context (GstElement * element, GstContext * context)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (element);
-  GstD3D11H264DecInner *inner = self->inner;
   GstD3D11H264DecClass *klass = GST_D3D11_H264_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
   gst_d3d11_handle_set_context_for_adapter_luid (element,
-      context, cdata->adapter_luid, &inner->device);
+      context, cdata->adapter_luid, &self->device);
 
   GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
 }
 
-/* Clear all codec specific (e.g., SPS) data */
-static void
-gst_d3d11_h264_dec_reset (GstD3D11H264Dec * self)
-{
-  GstD3D11H264DecInner *inner = self->inner;
-
-  inner->width = 0;
-  inner->height = 0;
-  inner->coded_width = 0;
-  inner->coded_height = 0;
-  inner->bitdepth = 0;
-  inner->chroma_format_idc = 0;
-  inner->out_format = GST_VIDEO_FORMAT_UNKNOWN;
-  inner->interlaced = FALSE;
-  inner->max_dpb_size = 0;
-}
-
 static gboolean
 gst_d3d11_h264_dec_open (GstVideoDecoder * decoder)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
   GstD3D11H264DecClass *klass = GST_D3D11_H264_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
-  if (!gst_d3d11_decoder_proxy_open (decoder,
-          cdata, &inner->device, &inner->d3d11_decoder)) {
-    GST_ERROR_OBJECT (self, "Failed to open decoder");
-    return FALSE;
-  }
-
-  gst_d3d11_h264_dec_reset (self);
-
-  return TRUE;
+  return gst_d3d11_decoder_proxy_open (decoder,
+      cdata, &self->device, &self->decoder);
 }
 
 static gboolean
 gst_d3d11_h264_dec_close (GstVideoDecoder * decoder)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
 
-  gst_clear_object (&inner->d3d11_decoder);
-  gst_clear_object (&inner->device);
+  gst_clear_object (&self->decoder);
+  gst_clear_object (&self->device);
 
   return TRUE;
 }
@@ -305,9 +148,8 @@
 gst_d3d11_h264_dec_negotiate (GstVideoDecoder * decoder)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_negotiate (inner->d3d11_decoder, decoder))
+  if (!gst_d3d11_decoder_negotiate (self->decoder, decoder))
     return FALSE;
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
@@ -318,27 +160,23 @@
     GstQuery * query)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_decide_allocation (inner->d3d11_decoder,
-          decoder, query)) {
+  if (!gst_d3d11_decoder_decide_allocation (self->decoder, decoder, query))
     return FALSE;
-  }
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
       (decoder, query);
 }
 
 static gboolean
-gst_d3d11_h264_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+gst_d3d11_h264_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
 
   switch (GST_QUERY_TYPE (query)) {
     case GST_QUERY_CONTEXT:
       if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
-              query, inner->device)) {
+              query, self->device)) {
         return TRUE;
       }
       break;
@@ -346,571 +184,108 @@
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
 }
 
 static gboolean
-gst_d3d11_h264_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+gst_d3d11_h264_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
 
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_FLUSH_START:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, TRUE);
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
+              query, self->device)) {
+        return TRUE;
+      }
       break;
-    case GST_EVENT_FLUSH_STOP:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, FALSE);
     default:
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
 }
 
-static GstFlowReturn
-gst_d3d11_h264_dec_new_sequence (GstH264Decoder * decoder,
-    const GstH264SPS * sps, gint max_dpb_size)
+static gboolean
+gst_d3d11_h264_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
-  gint crop_width, crop_height;
-  gboolean interlaced;
-  gboolean modified = FALSE;
-
-  GST_LOG_OBJECT (self, "new sequence");
-
-  if (sps->frame_cropping_flag) {
-    crop_width = sps->crop_rect_width;
-    crop_height = sps->crop_rect_height;
-  } else {
-    crop_width = sps->width;
-    crop_height = sps->height;
-  }
 
-  if (inner->width != crop_width || inner->height != crop_height ||
-      inner->coded_width != sps->width || inner->coded_height != sps->height ||
-      inner->crop_x != sps->crop_rect_x || inner->crop_y != sps->crop_rect_y) {
-    GST_INFO_OBJECT (self, "resolution changed %dx%d (%dx%d)",
-        crop_width, crop_height, sps->width, sps->height);
-    inner->crop_x = sps->crop_rect_x;
-    inner->crop_y = sps->crop_rect_y;
-    inner->width = crop_width;
-    inner->height = crop_height;
-    inner->coded_width = sps->width;
-    inner->coded_height = sps->height;
-    modified = TRUE;
-  }
-
-  if (inner->bitdepth != sps->bit_depth_luma_minus8 + 8) {
-    GST_INFO_OBJECT (self, "bitdepth changed");
-    inner->bitdepth = (guint) sps->bit_depth_luma_minus8 + 8;
-    modified = TRUE;
-  }
-
-  if (inner->chroma_format_idc != sps->chroma_format_idc) {
-    GST_INFO_OBJECT (self, "chroma format changed");
-    inner->chroma_format_idc = sps->chroma_format_idc;
-    modified = TRUE;
-  }
+  if (self->decoder)
+    gst_d3d11_decoder_sink_event (self->decoder, event);
 
-  interlaced = !sps->frame_mbs_only_flag;
-  if (inner->interlaced != interlaced) {
-    GST_INFO_OBJECT (self, "interlaced sequence changed");
-    inner->interlaced = interlaced;
-    modified = TRUE;
-  }
-
-  if (inner->max_dpb_size < max_dpb_size) {
-    GST_INFO_OBJECT (self, "Requires larger DPB size (%d -> %d)",
-        inner->max_dpb_size, max_dpb_size);
-    modified = TRUE;
-  }
-
-  if (modified || !gst_d3d11_decoder_is_configured (inner->d3d11_decoder)) {
-    GstVideoInfo info;
-
-    inner->out_format = GST_VIDEO_FORMAT_UNKNOWN;
-
-    if (inner->bitdepth == 8) {
-      if (inner->chroma_format_idc == 1)
-        inner->out_format = GST_VIDEO_FORMAT_NV12;
-      else {
-        GST_FIXME_OBJECT (self, "Could not support 8bits non-4:2:0 format");
-      }
-    }
-
-    if (inner->out_format == GST_VIDEO_FORMAT_UNKNOWN) {
-      GST_ERROR_OBJECT (self, "Could not support bitdepth/chroma format");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    gst_video_info_set_format (&info,
-        inner->out_format, inner->width, inner->height);
-    if (inner->interlaced)
-      GST_VIDEO_INFO_INTERLACE_MODE (&info) = GST_VIDEO_INTERLACE_MODE_MIXED;
-
-    /* Store configured DPB size here. Then, it will be referenced later
-     * to decide whether we need to re-open decoder object or not.
-     * For instance, if every configuration is same apart from DPB size and
-     * new DPB size is decreased, we can reuse existing decoder object.
-     */
-    inner->max_dpb_size = max_dpb_size;
-    if (!gst_d3d11_decoder_configure (inner->d3d11_decoder,
-            decoder->input_state, &info, inner->crop_x, inner->crop_y,
-            inner->coded_width, inner->coded_height, max_dpb_size)) {
-      GST_ERROR_OBJECT (self, "Failed to create decoder");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
-      GST_WARNING_OBJECT (self, "Failed to negotiate with downstream");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-  }
-
-  return GST_FLOW_OK;
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
 }
 
 static GstFlowReturn
-gst_d3d11_h264_dec_new_picture (GstH264Decoder * decoder,
-    GstVideoCodecFrame * frame, GstH264Picture * picture)
+gst_d3d11_h264_dec_configure (GstDxvaH264Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-
-  view_buffer = gst_d3d11_decoder_get_output_view_buffer (inner->d3d11_decoder,
-      GST_VIDEO_DECODER (decoder));
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "No available output view buffer");
-    return GST_FLOW_FLUSHING;
-  }
-
-  GST_LOG_OBJECT (self, "New output view buffer %" GST_PTR_FORMAT, view_buffer);
-
-  gst_h264_picture_set_user_data (picture,
-      view_buffer, (GDestroyNotify) gst_buffer_unref);
 
-  GST_LOG_OBJECT (self, "New h264picture %p", picture);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_configure (self->decoder, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
 }
 
 static GstFlowReturn
-gst_d3d11_h264_dec_new_field_picture (GstH264Decoder * decoder,
-    GstH264Picture * first_field, GstH264Picture * second_field)
+gst_d3d11_h264_dec_new_picture (GstDxvaH264Decoder * decoder,
+    GstCodecPicture * picture)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstBuffer *view_buffer;
-
-  view_buffer = (GstBuffer *) gst_h264_picture_get_user_data (first_field);
-
-  if (!view_buffer) {
-    GST_WARNING_OBJECT (self, "First picture does not have output view buffer");
-    return GST_FLOW_OK;
-  }
-
-  GST_LOG_OBJECT (self, "New field picture with buffer %" GST_PTR_FORMAT,
-      view_buffer);
 
-  gst_h264_picture_set_user_data (second_field,
-      gst_buffer_ref (view_buffer), (GDestroyNotify) gst_buffer_unref);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_new_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture);
 }
 
-static ID3D11VideoDecoderOutputView *
-gst_d3d11_h264_dec_get_output_view_from_picture (GstD3D11H264Dec * self,
-    GstH264Picture * picture, guint8 * view_id)
-{
-  GstD3D11H264DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-  ID3D11VideoDecoderOutputView *view;
-
-  view_buffer = (GstBuffer *) gst_h264_picture_get_user_data (picture);
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view buffer");
-    return NULL;
-  }
-
-  view = gst_d3d11_decoder_get_output_view_from_buffer (inner->d3d11_decoder,
-      view_buffer, view_id);
-  if (!view) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view handle");
-    return NULL;
-  }
-
-  return view;
-}
-
-static void
-gst_d3d11_h264_dec_picture_params_from_sps (GstD3D11H264Dec * self,
-    const GstH264SPS * sps, gboolean field_pic, DXVA_PicParams_H264 * params)
-{
-#define COPY_FIELD(f) \
-  (params)->f = (sps)->f
-
-  params->wFrameWidthInMbsMinus1 = sps->pic_width_in_mbs_minus1;
-  if (!sps->frame_mbs_only_flag) {
-    params->wFrameHeightInMbsMinus1 =
-        ((sps->pic_height_in_map_units_minus1 + 1) << 1) - 1;
-  } else {
-    params->wFrameHeightInMbsMinus1 = sps->pic_height_in_map_units_minus1;
-  }
-  params->residual_colour_transform_flag = sps->separate_colour_plane_flag;
-  params->MbaffFrameFlag = (sps->mb_adaptive_frame_field_flag && !field_pic);
-  params->field_pic_flag = field_pic;
-  params->MinLumaBipredSize8x8Flag = sps->level_idc >= 31;
-
-  COPY_FIELD (num_ref_frames);
-  COPY_FIELD (chroma_format_idc);
-  COPY_FIELD (frame_mbs_only_flag);
-  COPY_FIELD (bit_depth_luma_minus8);
-  COPY_FIELD (bit_depth_chroma_minus8);
-  COPY_FIELD (log2_max_frame_num_minus4);
-  COPY_FIELD (pic_order_cnt_type);
-  COPY_FIELD (log2_max_pic_order_cnt_lsb_minus4);
-  COPY_FIELD (delta_pic_order_always_zero_flag);
-  COPY_FIELD (direct_8x8_inference_flag);
-
-#undef COPY_FIELD
-}
-
-static void
-gst_d3d11_h264_dec_picture_params_from_pps (GstD3D11H264Dec * self,
-    const GstH264PPS * pps, DXVA_PicParams_H264 * params)
-{
-#define COPY_FIELD(f) \
-  (params)->f = (pps)->f
-
-  COPY_FIELD (constrained_intra_pred_flag);
-  COPY_FIELD (weighted_pred_flag);
-  COPY_FIELD (weighted_bipred_idc);
-  COPY_FIELD (transform_8x8_mode_flag);
-  COPY_FIELD (pic_init_qs_minus26);
-  COPY_FIELD (chroma_qp_index_offset);
-  COPY_FIELD (second_chroma_qp_index_offset);
-  COPY_FIELD (pic_init_qp_minus26);
-  COPY_FIELD (num_ref_idx_l0_active_minus1);
-  COPY_FIELD (num_ref_idx_l1_active_minus1);
-  COPY_FIELD (entropy_coding_mode_flag);
-  COPY_FIELD (pic_order_present_flag);
-  COPY_FIELD (deblocking_filter_control_present_flag);
-  COPY_FIELD (redundant_pic_cnt_present_flag);
-  COPY_FIELD (num_slice_groups_minus1);
-  COPY_FIELD (slice_group_map_type);
-
-#undef COPY_FIELD
-}
-
-static void
-gst_d3d11_h264_dec_picture_params_from_slice_header (GstD3D11H264Dec *
-    self, const GstH264SliceHdr * slice_header, DXVA_PicParams_H264 * params)
-{
-  params->sp_for_switch_flag = slice_header->sp_for_switch_flag;
-  params->field_pic_flag = slice_header->field_pic_flag;
-  params->CurrPic.AssociatedFlag = slice_header->bottom_field_flag;
-  params->IntraPicFlag =
-      GST_H264_IS_I_SLICE (slice_header) || GST_H264_IS_SI_SLICE (slice_header);
-}
-
-static gboolean
-gst_d3d11_h264_dec_fill_picture_params (GstD3D11H264Dec * self,
-    const GstH264SliceHdr * slice_header, DXVA_PicParams_H264 * params)
+static GstFlowReturn
+gst_d3d11_h264_dec_duplicate_picture (GstDxvaH264Decoder * decoder,
+    GstCodecPicture * src, GstCodecPicture * dst)
 {
-  const GstH264SPS *sps;
-  const GstH264PPS *pps;
-
-  g_return_val_if_fail (slice_header->pps != NULL, FALSE);
-  g_return_val_if_fail (slice_header->pps->sequence != NULL, FALSE);
-
-  pps = slice_header->pps;
-  sps = pps->sequence;
-
-  params->MbsConsecutiveFlag = 1;
-  params->Reserved16Bits = 3;
-  params->ContinuationFlag = 1;
-  params->Reserved8BitsA = 0;
-  params->Reserved8BitsB = 0;
-  params->StatusReportFeedbackNumber = 1;
-
-  gst_d3d11_h264_dec_picture_params_from_sps (self,
-      sps, slice_header->field_pic_flag, params);
-  gst_d3d11_h264_dec_picture_params_from_pps (self, pps, params);
-  gst_d3d11_h264_dec_picture_params_from_slice_header (self,
-      slice_header, params);
-
-  return TRUE;
-}
+  GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
 
-static inline void
-init_pic_params (DXVA_PicParams_H264 * params)
-{
-  memset (params, 0, sizeof (DXVA_PicParams_H264));
-  for (guint i = 0; i < G_N_ELEMENTS (params->RefFrameList); i++)
-    params->RefFrameListi.bPicEntry = 0xff;
+  return gst_d3d11_decoder_duplicate_picture (self->decoder, src, dst);
 }
 
-static GstFlowReturn
-gst_d3d11_h264_dec_start_picture (GstH264Decoder * decoder,
-    GstH264Picture * picture, GstH264Slice * slice, GstH264Dpb * dpb)
+static guint8
+gst_d3d11_h264_dec_get_picture_id (GstDxvaH264Decoder * decoder,
+    GstCodecPicture * picture)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
-  DXVA_PicParams_H264 *pic_params = &inner->pic_params;
-  DXVA_Qmatrix_H264 *iq_matrix = &inner->iq_matrix;
-  ID3D11VideoDecoderOutputView *view;
-  guint8 view_id = 0xff;
-  GArray *dpb_array;
-  GstH264PPS *pps;
-  guint i, j;
-
-  pps = slice->header.pps;
-
-  view = gst_d3d11_h264_dec_get_output_view_from_picture (self, picture,
-      &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_ERROR;
-  }
 
-  init_pic_params (pic_params);
-  gst_d3d11_h264_dec_fill_picture_params (self, &slice->header, pic_params);
-
-  pic_params->CurrPic.Index7Bits = view_id;
-  pic_params->RefPicFlag = GST_H264_PICTURE_IS_REF (picture);
-  pic_params->frame_num = picture->frame_num;
-
-  if (picture->field == GST_H264_PICTURE_FIELD_TOP_FIELD) {
-    pic_params->CurrFieldOrderCnt0 = picture->top_field_order_cnt;
-    pic_params->CurrFieldOrderCnt1 = 0;
-  } else if (picture->field == GST_H264_PICTURE_FIELD_BOTTOM_FIELD) {
-    pic_params->CurrFieldOrderCnt0 = 0;
-    pic_params->CurrFieldOrderCnt1 = picture->bottom_field_order_cnt;
-  } else {
-    pic_params->CurrFieldOrderCnt0 = picture->top_field_order_cnt;
-    pic_params->CurrFieldOrderCnt1 = picture->bottom_field_order_cnt;
-  }
-
-  dpb_array = gst_h264_dpb_get_pictures_all (dpb);
-  for (i = 0, j = 0; i < dpb_array->len && j < 16; i++) {
-    GstH264Picture *other = g_array_index (dpb_array, GstH264Picture *, i);
-    guint8 id = 0xff;
-
-    if (!GST_H264_PICTURE_IS_REF (other))
-      continue;
-
-    /* The second field picture will be handled differently */
-    if (other->second_field)
-      continue;
-
-    gst_d3d11_h264_dec_get_output_view_from_picture (self, other, &id);
-    pic_params->RefFrameListj.Index7Bits = id;
-
-    if (GST_H264_PICTURE_IS_LONG_TERM_REF (other)) {
-      pic_params->RefFrameListj.AssociatedFlag = 1;
-      pic_params->FrameNumListj = other->long_term_frame_idx;
-    } else {
-      pic_params->RefFrameListj.AssociatedFlag = 0;
-      pic_params->FrameNumListj = other->frame_num;
-    }
-
-    switch (other->field) {
-      case GST_H264_PICTURE_FIELD_TOP_FIELD:
-        pic_params->FieldOrderCntListj0 = other->top_field_order_cnt;
-        pic_params->UsedForReferenceFlags |= 0x1 << (2 * j);
-        break;
-      case GST_H264_PICTURE_FIELD_BOTTOM_FIELD:
-        pic_params->FieldOrderCntListj1 = other->bottom_field_order_cnt;
-        pic_params->UsedForReferenceFlags |= 0x1 << (2 * j + 1);
-        break;
-      default:
-        pic_params->FieldOrderCntListj0 = other->top_field_order_cnt;
-        pic_params->FieldOrderCntListj1 = other->bottom_field_order_cnt;
-        pic_params->UsedForReferenceFlags |= 0x3 << (2 * j);
-        break;
-    }
-
-    if (other->other_field) {
-      GstH264Picture *other_field = other->other_field;
-
-      switch (other_field->field) {
-        case GST_H264_PICTURE_FIELD_TOP_FIELD:
-          pic_params->FieldOrderCntListj0 =
-              other_field->top_field_order_cnt;
-          pic_params->UsedForReferenceFlags |= 0x1 << (2 * j);
-          break;
-        case GST_H264_PICTURE_FIELD_BOTTOM_FIELD:
-          pic_params->FieldOrderCntListj1 =
-              other_field->bottom_field_order_cnt;
-          pic_params->UsedForReferenceFlags |= 0x1 << (2 * j + 1);
-          break;
-        default:
-          break;
-      }
-    }
-
-    pic_params->NonExistingFrameFlags |= (other->nonexisting) << j;
-    j++;
-  }
-  g_array_unref (dpb_array);
-
-  G_STATIC_ASSERT (sizeof (iq_matrix->bScalingLists4x4) ==
-      sizeof (pps->scaling_lists_4x4));
-  memcpy (iq_matrix->bScalingLists4x4, pps->scaling_lists_4x4,
-      sizeof (pps->scaling_lists_4x4));
-
-  G_STATIC_ASSERT (sizeof (iq_matrix->bScalingLists8x80) ==
-      sizeof (pps->scaling_lists_8x80));
-  memcpy (iq_matrix->bScalingLists8x80, pps->scaling_lists_8x80,
-      sizeof (pps->scaling_lists_8x80));
-  memcpy (iq_matrix->bScalingLists8x81, pps->scaling_lists_8x81,
-      sizeof (pps->scaling_lists_8x81));
-
-  inner->slice_list.resize (0);
-  inner->bitstream_buffer.resize (0);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_get_picture_id (self->decoder, picture);
 }
 
 static GstFlowReturn
-gst_d3d11_h264_dec_decode_slice (GstH264Decoder * decoder,
-    GstH264Picture * picture, GstH264Slice * slice, GArray * ref_pic_list0,
-    GArray * ref_pic_list1)
+gst_d3d11_h264_dec_start_picture (GstDxvaH264Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
-  DXVA_Slice_H264_Short dxva_slice;
-  static const guint8 start_code = { 0, 0, 1 };
-  const size_t start_code_size = sizeof (start_code);
-
-  dxva_slice.BSNALunitDataLocation = inner->bitstream_buffer.size ();
-  /* Includes 3 bytes start code prefix */
-  dxva_slice.SliceBytesInBuffer = slice->nalu.size + start_code_size;
-  dxva_slice.wBadSliceChopping = 0;
 
-  inner->slice_list.push_back (dxva_slice);
-
-  size_t pos = inner->bitstream_buffer.size ();
-  inner->bitstream_buffer.resize (pos + start_code_size + slice->nalu.size);
-
-  /* Fill start code prefix */
-  memcpy (&inner->bitstream_buffer0 + pos, start_code, start_code_size);
-
-  /* Copy bitstream */
-  memcpy (&inner->bitstream_buffer0 + pos + start_code_size,
-      slice->nalu.data + slice->nalu.offset, slice->nalu.size);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_start_picture (self->decoder, picture, picture_id);
 }
 
 static GstFlowReturn
-gst_d3d11_h264_dec_end_picture (GstH264Decoder * decoder,
-    GstH264Picture * picture)
+gst_d3d11_h264_dec_end_picture (GstDxvaH264Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
-  ID3D11VideoDecoderOutputView *view;
-  guint8 view_id = 0xff;
-  size_t bitstream_buffer_size;
-  size_t bitstream_pos;
-  GstD3D11DecodeInputStreamArgs input_args;
-
-  GST_LOG_OBJECT (self, "end picture %p, (poc %d)",
-      picture, picture->pic_order_cnt);
-
-  if (inner->bitstream_buffer.empty () || inner->slice_list.empty ()) {
-    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
-    return GST_FLOW_ERROR;
-  }
 
-  view = gst_d3d11_h264_dec_get_output_view_from_picture (self, picture,
-      &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_ERROR;
-  }
-
-  memset (&input_args, 0, sizeof (GstD3D11DecodeInputStreamArgs));
-
-  bitstream_pos = inner->bitstream_buffer.size ();
-  bitstream_buffer_size = GST_ROUND_UP_128 (bitstream_pos);
-
-  if (bitstream_buffer_size > bitstream_pos) {
-    size_t padding = bitstream_buffer_size - bitstream_pos;
-
-    /* As per DXVA spec, total amount of bitstream buffer size should be
-     * 128 bytes aligned. If actual data is not multiple of 128 bytes,
-     * the last slice data needs to be zero-padded */
-    inner->bitstream_buffer.resize (bitstream_buffer_size, 0);
-
-    DXVA_Slice_H264_Short & slice = inner->slice_list.back ();
-    slice.SliceBytesInBuffer += padding;
-  }
-
-  input_args.picture_params = &inner->pic_params;
-  input_args.picture_params_size = sizeof (DXVA_PicParams_H264);
-  input_args.slice_control = &inner->slice_list0;
-  input_args.slice_control_size =
-      sizeof (DXVA_Slice_H264_Short) * inner->slice_list.size ();
-  input_args.bitstream = &inner->bitstream_buffer0;
-  input_args.bitstream_size = inner->bitstream_buffer.size ();
-  input_args.inverse_quantization_matrix = &inner->iq_matrix;
-  input_args.inverse_quantization_matrix_size = sizeof (DXVA_Qmatrix_H264);
-
-  return gst_d3d11_decoder_decode_frame (inner->d3d11_decoder,
-      view, &input_args);
+  return gst_d3d11_decoder_end_picture (self->decoder, picture, args);
 }
 
 static GstFlowReturn
-gst_d3d11_h264_dec_output_picture (GstH264Decoder * decoder,
-    GstVideoCodecFrame * frame, GstH264Picture * picture)
+gst_d3d11_h264_dec_output_picture (GstDxvaH264Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
 {
   GstD3D11H264Dec *self = GST_D3D11_H264_DEC (decoder);
-  GstD3D11H264DecInner *inner = self->inner;
-  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
-  GstBuffer *view_buffer;
-
-  GST_LOG_OBJECT (self,
-      "Outputting picture %p (poc %d)", picture, picture->pic_order_cnt);
-
-  view_buffer = (GstBuffer *) gst_h264_picture_get_user_data (picture);
-
-  if (!view_buffer) {
-    GST_ERROR_OBJECT (self, "Could not get output view");
-    goto error;
-  }
-
-  if (!gst_d3d11_decoder_process_output (inner->d3d11_decoder, vdec,
-          picture->discont_state, inner->width, inner->height, view_buffer,
-          &frame->output_buffer)) {
-    GST_ERROR_OBJECT (self, "Failed to copy buffer");
-    goto error;
-  }
-
-  if (picture->buffer_flags != 0) {
-    gboolean interlaced =
-        (picture->buffer_flags & GST_VIDEO_BUFFER_FLAG_INTERLACED) != 0;
-    gboolean tff = (picture->buffer_flags & GST_VIDEO_BUFFER_FLAG_TFF) != 0;
-
-    GST_TRACE_OBJECT (self,
-        "apply buffer flags 0x%x (interlaced %d, top-field-first %d)",
-        picture->buffer_flags, interlaced, tff);
-    GST_BUFFER_FLAG_SET (frame->output_buffer, picture->buffer_flags);
-  }
-
-  gst_h264_picture_unref (picture);
-
-  return gst_video_decoder_finish_frame (vdec, frame);
-
-error:
-  gst_h264_picture_unref (picture);
-  gst_video_decoder_release_frame (vdec, frame);
 
-  return GST_FLOW_ERROR;
+  return gst_d3d11_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
 }
 
 void
@@ -925,18 +300,18 @@
   gboolean ret;
   GTypeInfo type_info = {
     sizeof (GstD3D11H264DecClass),
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     (GClassInitFunc) gst_d3d11_h264_dec_class_init,
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     sizeof (GstD3D11H264Dec),
     0,
     (GInstanceInitFunc) gst_d3d11_h264_dec_init,
   };
-  const GUID *supported_profile = NULL;
-  GstCaps *sink_caps = NULL;
-  GstCaps *src_caps = NULL;
+  const GUID *supported_profile = nullptr;
+  GstCaps *sink_caps = nullptr;
+  GstCaps *src_caps = nullptr;
   guint max_width = 0;
   guint max_height = 0;
   guint resolution;
@@ -949,8 +324,7 @@
     return;
   }
 
-  ret =
-      gst_d3d11_decoder_supports_format (device, supported_profile,
+  ret = gst_d3d11_decoder_supports_format (device, supported_profile,
       DXGI_FORMAT_NV12);
   if (!ret) {
     GST_FIXME_OBJECT (device, "device does not support NV12 format");
@@ -1009,7 +383,7 @@
     feature_name = g_strdup_printf ("d3d11h264device%ddec", index);
   }
 
-  type = g_type_register_static (GST_TYPE_H264_DECODER,
+  type = g_type_register_static (GST_TYPE_DXVA_H264_DECODER,
       type_name, &type_info, (GTypeFlags) 0);
 
   /* make lower rank than default device */

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11h264dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11h264dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11h265dec.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11h265dec.cpp Changed

@@ -37,97 +37,13 @@
 #endif
 
 #include "gstd3d11h265dec.h"
-
-#include <gst/codecs/gsth265decoder.h>
-#include <string.h>
-#include <vector>
-
-/* HACK: to expose dxva data structure on UWP */
-#ifdef WINAPI_PARTITION_DESKTOP
-#undef WINAPI_PARTITION_DESKTOP
-#endif
-#define WINAPI_PARTITION_DESKTOP 1
-#include <d3d9.h>
-#include <dxva.h>
+#include <gst/dxva/gstdxvah265decoder.h>
 
 GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_h265_dec_debug);
 #define GST_CAT_DEFAULT gst_d3d11_h265_dec_debug
 
-/* *INDENT-OFF* */
-typedef struct _GstD3D11H265DecInner
-{
-  GstD3D11Device *device = nullptr;
-  GstD3D11Decoder *d3d11_decoder = nullptr;
-
-  DXVA_PicParams_HEVC pic_params;
-  DXVA_Qmatrix_HEVC iq_matrix;
-
-  std::vector<DXVA_Slice_HEVC_Short> slice_list;
-  std::vector<guint8> bitstream_buffer;
-
-  gboolean submit_iq_data;
-
-  gint crop_x = 0;
-  gint crop_y = 0;
-  gint width = 0;
-  gint height = 0;
-  gint coded_width = 0;
-  gint coded_height = 0;
-  guint bitdepth = 0;
-  guint8 chroma_format_idc = 0;
-  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
-  GstVideoInterlaceMode interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
-} GstD3D11H265DecInner;
-/* *INDENT-ON* */
-
-typedef struct _GstD3D11H265Dec
-{
-  GstH265Decoder parent;
-  GstD3D11H265DecInner *inner;
-} GstD3D11H265Dec;
-
-typedef struct _GstD3D11H265DecClass
-{
-  GstH265DecoderClass parent_class;
-  GstD3D11DecoderSubClassData class_data;
-} GstD3D11H265DecClass;
-
-static GstElementClass *parent_class = NULL;
-
-#define GST_D3D11_H265_DEC(object) ((GstD3D11H265Dec *) (object))
-#define GST_D3D11_H265_DEC_GET_CLASS(object) \
-    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstD3D11H265DecClass))
-
-static void gst_d3d11_h265_dec_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_d3d11_h265_dec_finalize (GObject * object);
-static void gst_d3d11_h265_dec_set_context (GstElement * element,
-    GstContext * context);
-
-static gboolean gst_d3d11_h265_dec_open (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_h265_dec_close (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_h265_dec_negotiate (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_h265_dec_decide_allocation (GstVideoDecoder *
-    decoder, GstQuery * query);
-static gboolean gst_d3d11_h265_dec_src_query (GstVideoDecoder * decoder,
-    GstQuery * query);
-static gboolean gst_d3d11_h265_dec_sink_event (GstVideoDecoder * decoder,
-    GstEvent * event);
-
-/* GstH265Decoder */
-static GstFlowReturn gst_d3d11_h265_dec_new_sequence (GstH265Decoder * decoder,
-    const GstH265SPS * sps, gint max_dpb_size);
-static GstFlowReturn gst_d3d11_h265_dec_new_picture (GstH265Decoder * decoder,
-    GstVideoCodecFrame * cframe, GstH265Picture * picture);
-static GstFlowReturn gst_d3d11_h265_dec_start_picture (GstH265Decoder * decoder,
-    GstH265Picture * picture, GstH265Slice * slice, GstH265Dpb * dpb);
-static GstFlowReturn gst_d3d11_h265_dec_decode_slice (GstH265Decoder * decoder,
-    GstH265Picture * picture, GstH265Slice * slice,
-    GArray * ref_pic_list0, GArray * ref_pic_list1);
-static GstFlowReturn gst_d3d11_h265_dec_end_picture (GstH265Decoder * decoder,
-    GstH265Picture * picture);
-static GstFlowReturn gst_d3d11_h265_dec_output_picture (GstH265Decoder *
-    decoder, GstVideoCodecFrame * frame, GstH265Picture * picture);
+GST_D3D11_DECODER_DEFINE_TYPE (GstD3D11H265Dec, gst_d3d11_h265_dec,
+    GST, D3D11_H265_DEC, GstDxvaH265Decoder);
 
 static void
 gst_d3d11_h265_dec_class_init (GstD3D11H265DecClass * klass, gpointer data)
@@ -135,11 +51,10 @@
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
-  GstH265DecoderClass *h265decoder_class = GST_H265_DECODER_CLASS (klass);
+  GstDxvaH265DecoderClass *dxva_class = GST_DXVA_H265_DECODER_CLASS (klass);
   GstD3D11DecoderClassData *cdata = (GstD3D11DecoderClassData *) data;
 
   gobject_class->get_property = gst_d3d11_h265_dec_get_property;
-  gobject_class->finalize = gst_d3d11_h265_dec_finalize;
 
   element_class->set_context =
       GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_set_context);
@@ -162,27 +77,24 @@
   decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_negotiate);
   decoder_class->decide_allocation =
       GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_sink_query);
   decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_src_query);
   decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_sink_event);
 
-  h265decoder_class->new_sequence =
-      GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_new_sequence);
-  h265decoder_class->new_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_new_picture);
-  h265decoder_class->start_picture =
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_new_picture);
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_get_picture_id);
+  dxva_class->start_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_start_picture);
-  h265decoder_class->decode_slice =
-      GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_decode_slice);
-  h265decoder_class->end_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_end_picture);
-  h265decoder_class->output_picture =
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_end_picture);
+  dxva_class->output_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_h265_dec_output_picture);
 }
 
 static void
 gst_d3d11_h265_dec_init (GstD3D11H265Dec * self)
 {
-  self->inner = new GstD3D11H265DecInner ();
 }
 
 static void
@@ -196,25 +108,14 @@
 }
 
 static void
-gst_d3d11_h265_dec_finalize (GObject * object)
-{
-  GstD3D11H265Dec *self = GST_D3D11_H265_DEC (object);
-
-  delete self->inner;
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
 gst_d3d11_h265_dec_set_context (GstElement * element, GstContext * context)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (element);
-  GstD3D11H265DecInner *inner = self->inner;
   GstD3D11H265DecClass *klass = GST_D3D11_H265_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
   gst_d3d11_handle_set_context_for_adapter_luid (element,
-      context, cdata->adapter_luid, &inner->device);
+      context, cdata->adapter_luid, &self->device);
 
   GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
 }
@@ -223,27 +124,20 @@
 gst_d3d11_h265_dec_open (GstVideoDecoder * decoder)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
   GstD3D11H265DecClass *klass = GST_D3D11_H265_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
-  if (!gst_d3d11_decoder_proxy_open (decoder,
-          cdata, &inner->device, &inner->d3d11_decoder)) {
-    GST_ERROR_OBJECT (self, "Failed to open decoder");
-    return FALSE;
-  }
-
-  return TRUE;
+  return gst_d3d11_decoder_proxy_open (decoder,
+      cdata, &self->device, &self->decoder);
 }
 
 static gboolean
 gst_d3d11_h265_dec_close (GstVideoDecoder * decoder)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
 
-  gst_clear_object (&inner->d3d11_decoder);
-  gst_clear_object (&inner->device);
+  gst_clear_object (&self->decoder);
+  gst_clear_object (&self->device);
 
   return TRUE;
 }
@@ -252,9 +146,8 @@
 gst_d3d11_h265_dec_negotiate (GstVideoDecoder * decoder)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_negotiate (inner->d3d11_decoder, decoder))
+  if (!gst_d3d11_decoder_negotiate (self->decoder, decoder))
     return FALSE;
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
@@ -265,27 +158,23 @@
     GstQuery * query)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_decide_allocation (inner->d3d11_decoder,
-          decoder, query)) {
+  if (!gst_d3d11_decoder_decide_allocation (self->decoder, decoder, query))
     return FALSE;
-  }
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
       (decoder, query);
 }
 
 static gboolean
-gst_d3d11_h265_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+gst_d3d11_h265_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
 
   switch (GST_QUERY_TYPE (query)) {
     case GST_QUERY_CONTEXT:
       if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
-              query, inner->device)) {
+              query, self->device)) {
         return TRUE;
       }
       break;
@@ -293,662 +182,99 @@
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
 }
 
 static gboolean
-gst_d3d11_h265_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+gst_d3d11_h265_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
 
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_FLUSH_START:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, TRUE);
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
+              query, self->device)) {
+        return TRUE;
+      }
       break;
-    case GST_EVENT_FLUSH_STOP:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, FALSE);
     default:
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
 }
 
-static GstFlowReturn
-gst_d3d11_h265_dec_new_sequence (GstH265Decoder * decoder,
-    const GstH265SPS * sps, gint max_dpb_size)
+static gboolean
+gst_d3d11_h265_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
-  gint crop_width, crop_height;
-  gboolean modified = FALSE;
-  GstVideoInterlaceMode interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
 
-  GST_LOG_OBJECT (self, "new sequence");
-
-  if (sps->conformance_window_flag) {
-    crop_width = sps->crop_rect_width;
-    crop_height = sps->crop_rect_height;
-  } else {
-    crop_width = sps->width;
-    crop_height = sps->height;
-  }
-
-  if (inner->width != crop_width || inner->height != crop_height ||
-      inner->coded_width != sps->width || inner->coded_height != sps->height ||
-      inner->crop_x != sps->crop_rect_x || inner->crop_y != sps->crop_rect_y) {
-    GST_INFO_OBJECT (self, "resolution changed %dx%d -> %dx%d",
-        crop_width, crop_height, sps->width, sps->height);
-    inner->crop_x = sps->crop_rect_x;
-    inner->crop_y = sps->crop_rect_y;
-    inner->width = crop_width;
-    inner->height = crop_height;
-    inner->coded_width = sps->width;
-    inner->coded_height = sps->height;
-    modified = TRUE;
-  }
-
-  if (inner->bitdepth != (guint) sps->bit_depth_luma_minus8 + 8) {
-    GST_INFO_OBJECT (self, "bitdepth changed");
-    inner->bitdepth = sps->bit_depth_luma_minus8 + 8;
-    modified = TRUE;
-  }
-
-  if (sps->vui_parameters_present_flag && sps->vui_params.field_seq_flag) {
-    interlace_mode = GST_VIDEO_INTERLACE_MODE_ALTERNATE;
-  } else {
-    /* 7.4.4 Profile, tier and level sementics */
-    if (sps->profile_tier_level.progressive_source_flag &&
-        !sps->profile_tier_level.interlaced_source_flag) {
-      interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
-    } else {
-      interlace_mode = GST_VIDEO_INTERLACE_MODE_MIXED;
-    }
-  }
-
-  if (inner->interlace_mode != interlace_mode) {
-    GST_INFO_OBJECT (self, "Interlace mode change %d -> %d",
-        inner->interlace_mode, interlace_mode);
-    inner->interlace_mode = interlace_mode;
-    modified = TRUE;
-  }
+  if (self->decoder)
+    gst_d3d11_decoder_sink_event (self->decoder, event);
 
-  if (inner->chroma_format_idc != sps->chroma_format_idc) {
-    GST_INFO_OBJECT (self, "chroma format changed");
-    inner->chroma_format_idc = sps->chroma_format_idc;
-    modified = TRUE;
-  }
-
-  if (modified || !gst_d3d11_decoder_is_configured (inner->d3d11_decoder)) {
-    GstVideoInfo info;
-
-    inner->out_format = GST_VIDEO_FORMAT_UNKNOWN;
-
-    if (inner->bitdepth == 8) {
-      if (inner->chroma_format_idc == 1) {
-        inner->out_format = GST_VIDEO_FORMAT_NV12;
-      } else {
-        GST_FIXME_OBJECT (self, "Could not support 8bits non-4:2:0 format");
-      }
-    } else if (inner->bitdepth == 10) {
-      if (inner->chroma_format_idc == 1) {
-        inner->out_format = GST_VIDEO_FORMAT_P010_10LE;
-      } else {
-        GST_FIXME_OBJECT (self, "Could not support 10bits non-4:2:0 format");
-      }
-    }
-
-    if (inner->out_format == GST_VIDEO_FORMAT_UNKNOWN) {
-      GST_ERROR_OBJECT (self, "Could not support bitdepth/chroma format");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    gst_video_info_set_format (&info,
-        inner->out_format, inner->width, inner->height);
-    GST_VIDEO_INFO_INTERLACE_MODE (&info) = inner->interlace_mode;
-
-    if (!gst_d3d11_decoder_configure (inner->d3d11_decoder,
-            decoder->input_state, &info, inner->crop_x, inner->crop_y,
-            inner->coded_width, inner->coded_height, max_dpb_size)) {
-      GST_ERROR_OBJECT (self, "Failed to create decoder");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
-      GST_WARNING_OBJECT (self, "Failed to negotiate with downstream");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-  }
-
-  return GST_FLOW_OK;
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
 }
 
 static GstFlowReturn
-gst_d3d11_h265_dec_new_picture (GstH265Decoder * decoder,
-    GstVideoCodecFrame * cframe, GstH265Picture * picture)
+gst_d3d11_h265_dec_configure (GstDxvaH265Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-
-  view_buffer = gst_d3d11_decoder_get_output_view_buffer (inner->d3d11_decoder,
-      GST_VIDEO_DECODER (decoder));
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "No available output view buffer");
-    return GST_FLOW_FLUSHING;
-  }
 
-  GST_LOG_OBJECT (self, "New output view buffer %" GST_PTR_FORMAT, view_buffer);
-
-  gst_h265_picture_set_user_data (picture,
-      view_buffer, (GDestroyNotify) gst_buffer_unref);
-
-  GST_LOG_OBJECT (self, "New h265picture %p", picture);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_configure (self->decoder, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
 }
 
-static void
-gst_d3d11_h265_dec_picture_params_from_sps (GstD3D11H265Dec * self,
-    const GstH265SPS * sps, DXVA_PicParams_HEVC * params)
-{
-#define COPY_FIELD(f) \
-  (params)->f = (sps)->f
-#define COPY_FIELD_WITH_PREFIX(f) \
-  (params)->G_PASTE(sps_,f) = (sps)->f
-
-  params->PicWidthInMinCbsY =
-      sps->width >> (sps->log2_min_luma_coding_block_size_minus3 + 3);
-  params->PicHeightInMinCbsY =
-      sps->height >> (sps->log2_min_luma_coding_block_size_minus3 + 3);
-  params->sps_max_dec_pic_buffering_minus1 =
-      sps->max_dec_pic_buffering_minus1sps->max_sub_layers_minus1;
-
-  COPY_FIELD (chroma_format_idc);
-  COPY_FIELD (separate_colour_plane_flag);
-  COPY_FIELD (bit_depth_luma_minus8);
-  COPY_FIELD (bit_depth_chroma_minus8);
-  COPY_FIELD (log2_max_pic_order_cnt_lsb_minus4);
-  COPY_FIELD (log2_min_luma_coding_block_size_minus3);
-  COPY_FIELD (log2_diff_max_min_luma_coding_block_size);
-  COPY_FIELD (log2_min_transform_block_size_minus2);
-  COPY_FIELD (log2_diff_max_min_transform_block_size);
-  COPY_FIELD (max_transform_hierarchy_depth_inter);
-  COPY_FIELD (max_transform_hierarchy_depth_intra);
-  COPY_FIELD (num_short_term_ref_pic_sets);
-  COPY_FIELD (num_long_term_ref_pics_sps);
-  COPY_FIELD (scaling_list_enabled_flag);
-  COPY_FIELD (amp_enabled_flag);
-  COPY_FIELD (sample_adaptive_offset_enabled_flag);
-  COPY_FIELD (pcm_enabled_flag);
-
-  if (sps->pcm_enabled_flag) {
-    COPY_FIELD (pcm_sample_bit_depth_luma_minus1);
-    COPY_FIELD (pcm_sample_bit_depth_chroma_minus1);
-    COPY_FIELD (log2_min_pcm_luma_coding_block_size_minus3);
-    COPY_FIELD (log2_diff_max_min_pcm_luma_coding_block_size);
-  }
-
-  COPY_FIELD (pcm_loop_filter_disabled_flag);
-  COPY_FIELD (long_term_ref_pics_present_flag);
-  COPY_FIELD_WITH_PREFIX (temporal_mvp_enabled_flag);
-  COPY_FIELD (strong_intra_smoothing_enabled_flag);
-
-#undef COPY_FIELD
-#undef COPY_FIELD_WITH_PREFIX
-}
-
-static void
-gst_d3d11_h265_dec_picture_params_from_pps (GstD3D11H265Dec * self,
-    const GstH265PPS * pps, DXVA_PicParams_HEVC * params)
-{
-  guint i;
-
-#define COPY_FIELD(f) \
-  (params)->f = (pps)->f
-#define COPY_FIELD_WITH_PREFIX(f) \
-  (params)->G_PASTE(pps_,f) = (pps)->f
-
-  COPY_FIELD (num_ref_idx_l0_default_active_minus1);
-  COPY_FIELD (num_ref_idx_l1_default_active_minus1);
-  COPY_FIELD (init_qp_minus26);
-  COPY_FIELD (dependent_slice_segments_enabled_flag);
-  COPY_FIELD (output_flag_present_flag);
-  COPY_FIELD (num_extra_slice_header_bits);
-  COPY_FIELD (sign_data_hiding_enabled_flag);
-  COPY_FIELD (cabac_init_present_flag);
-  COPY_FIELD (constrained_intra_pred_flag);
-  COPY_FIELD (transform_skip_enabled_flag);
-  COPY_FIELD (cu_qp_delta_enabled_flag);
-  COPY_FIELD_WITH_PREFIX (slice_chroma_qp_offsets_present_flag);
-  COPY_FIELD (weighted_pred_flag);
-  COPY_FIELD (weighted_bipred_flag);
-  COPY_FIELD (transquant_bypass_enabled_flag);
-  COPY_FIELD (tiles_enabled_flag);
-  COPY_FIELD (entropy_coding_sync_enabled_flag);
-  COPY_FIELD (uniform_spacing_flag);
-
-  if (pps->tiles_enabled_flag)
-    COPY_FIELD (loop_filter_across_tiles_enabled_flag);
-
-  COPY_FIELD_WITH_PREFIX (loop_filter_across_slices_enabled_flag);
-  COPY_FIELD (deblocking_filter_override_enabled_flag);
-  COPY_FIELD_WITH_PREFIX (deblocking_filter_disabled_flag);
-  COPY_FIELD (lists_modification_present_flag);
-  COPY_FIELD (slice_segment_header_extension_present_flag);
-  COPY_FIELD_WITH_PREFIX (cb_qp_offset);
-  COPY_FIELD_WITH_PREFIX (cr_qp_offset);
-
-  if (pps->tiles_enabled_flag) {
-    COPY_FIELD (num_tile_columns_minus1);
-    COPY_FIELD (num_tile_rows_minus1);
-    if (!pps->uniform_spacing_flag) {
-      for (i = 0; i < pps->num_tile_columns_minus1 &&
-          i < G_N_ELEMENTS (params->column_width_minus1); i++)
-        COPY_FIELD (column_width_minus1i);
-
-      for (i = 0; i < pps->num_tile_rows_minus1 &&
-          i < G_N_ELEMENTS (params->row_height_minus1); i++)
-        COPY_FIELD (row_height_minus1i);
-    }
-  }
-
-  COPY_FIELD (diff_cu_qp_delta_depth);
-  COPY_FIELD_WITH_PREFIX (beta_offset_div2);
-  COPY_FIELD_WITH_PREFIX (tc_offset_div2);
-  COPY_FIELD (log2_parallel_merge_level_minus2);
-
-#undef COPY_FIELD
-#undef COPY_FIELD_WITH_PREFIX
-}
-
-static void
-gst_d3d11_h265_dec_picture_params_from_slice_header (GstD3D11H265Dec *
-    self, const GstH265SliceHdr * slice_header, DXVA_PicParams_HEVC * params)
-{
-  if (slice_header->short_term_ref_pic_set_sps_flag == 0) {
-    params->ucNumDeltaPocsOfRefRpsIdx =
-        slice_header->short_term_ref_pic_sets.NumDeltaPocsOfRefRpsIdx;
-    params->wNumBitsForShortTermRPSInSlice =
-        slice_header->short_term_ref_pic_set_size;
-  }
-}
-
-static gboolean
-gst_d3d11_h265_dec_fill_picture_params (GstD3D11H265Dec * self,
-    const GstH265SliceHdr * slice_header, DXVA_PicParams_HEVC * params)
-{
-  const GstH265SPS *sps;
-  const GstH265PPS *pps;
-
-  g_return_val_if_fail (slice_header->pps != NULL, FALSE);
-  g_return_val_if_fail (slice_header->pps->sps != NULL, FALSE);
-
-  pps = slice_header->pps;
-  sps = pps->sps;
-
-  /* not related to hevc syntax */
-  params->NoPicReorderingFlag = 0;
-  params->NoBiPredFlag = 0;
-  params->ReservedBits1 = 0;
-  params->StatusReportFeedbackNumber = 1;
-
-  gst_d3d11_h265_dec_picture_params_from_sps (self, sps, params);
-  gst_d3d11_h265_dec_picture_params_from_pps (self, pps, params);
-  gst_d3d11_h265_dec_picture_params_from_slice_header (self,
-      slice_header, params);
-
-  return TRUE;
-}
-
-static ID3D11VideoDecoderOutputView *
-gst_d3d11_h265_dec_get_output_view_from_picture (GstD3D11H265Dec * self,
-    GstH265Picture * picture, guint8 * view_id)
-{
-  GstD3D11H265DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-  ID3D11VideoDecoderOutputView *view;
-
-  view_buffer = (GstBuffer *) gst_h265_picture_get_user_data (picture);
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view buffer");
-    return NULL;
-  }
-
-  view = gst_d3d11_decoder_get_output_view_from_buffer (inner->d3d11_decoder,
-      view_buffer, view_id);
-  if (!view) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view handle");
-    return NULL;
-  }
-
-  return view;
-}
-
-static UCHAR
-gst_d3d11_h265_dec_get_ref_index (const DXVA_PicParams_HEVC * pic_params,
-    guint8 view_id)
+static GstFlowReturn
+gst_d3d11_h265_dec_new_picture (GstDxvaH265Decoder * decoder,
+    GstCodecPicture * picture)
 {
-  for (UCHAR i = 0; i < G_N_ELEMENTS (pic_params->RefPicList); i++) {
-    if (pic_params->RefPicListi.Index7Bits == view_id)
-      return i;
-  }
-
-  return 0xff;
-}
+  GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
 
-static inline void
-init_pic_params (DXVA_PicParams_HEVC * params)
-{
-  memset (params, 0, sizeof (DXVA_PicParams_HEVC));
-  for (guint i = 0; i < G_N_ELEMENTS (params->RefPicList); i++)
-    params->RefPicListi.bPicEntry = 0xff;
-
-  for (guint i = 0; i < G_N_ELEMENTS (params->RefPicSetStCurrBefore); i++) {
-    params->RefPicSetStCurrBeforei = 0xff;
-    params->RefPicSetStCurrAfteri = 0xff;
-    params->RefPicSetLtCurri = 0xff;
-  }
+  return gst_d3d11_decoder_new_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture);
 }
 
-static GstFlowReturn
-gst_d3d11_h265_dec_start_picture (GstH265Decoder * decoder,
-    GstH265Picture * picture, GstH265Slice * slice, GstH265Dpb * dpb)
+static guint8
+gst_d3d11_h265_dec_get_picture_id (GstDxvaH265Decoder * decoder,
+    GstCodecPicture * picture)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
-  DXVA_PicParams_HEVC *pic_params = &inner->pic_params;
-  DXVA_Qmatrix_HEVC *iq_matrix = &inner->iq_matrix;
-  ID3D11VideoDecoderOutputView *view;
-  guint8 view_id = 0xff;
-  guint i, j;
-  GArray *dpb_array;
-  GstH265SPS *sps;
-  GstH265PPS *pps;
-  GstH265ScalingList *scaling_list = nullptr;
-
-  pps = slice->header.pps;
-  sps = pps->sps;
-
-  view = gst_d3d11_h265_dec_get_output_view_from_picture (self, picture,
-      &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_ERROR;
-  }
-
-  init_pic_params (pic_params);
-  gst_d3d11_h265_dec_fill_picture_params (self, &slice->header, pic_params);
-
-  pic_params->CurrPic.Index7Bits = view_id;
-  pic_params->IrapPicFlag = GST_H265_IS_NAL_TYPE_IRAP (slice->nalu.type);
-  pic_params->IdrPicFlag = GST_H265_IS_NAL_TYPE_IDR (slice->nalu.type);
-  pic_params->IntraPicFlag = GST_H265_IS_NAL_TYPE_IRAP (slice->nalu.type);
-  pic_params->CurrPicOrderCntVal = picture->pic_order_cnt;
-
-  dpb_array = gst_h265_dpb_get_pictures_all (dpb);
-  for (i = 0, j = 0;
-      i < dpb_array->len && j < G_N_ELEMENTS (pic_params->RefPicList); i++) {
-    GstH265Picture *other = g_array_index (dpb_array, GstH265Picture *, i);
-    guint8 id = 0xff;
-
-    if (!other->ref) {
-      GST_LOG_OBJECT (self, "%dth picture in dpb is not reference, skip", i);
-      continue;
-    }
-
-    gst_d3d11_h265_dec_get_output_view_from_picture (self, other, &id);
-    pic_params->RefPicListj.Index7Bits = id;
-    pic_params->RefPicListj.AssociatedFlag = other->long_term;
-    pic_params->PicOrderCntValListj = other->pic_order_cnt;
-    j++;
-  }
-  g_array_unref (dpb_array);
-
-  for (i = 0, j = 0; i < G_N_ELEMENTS (pic_params->RefPicSetStCurrBefore); i++) {
-    GstH265Picture *other = nullptr;
-    guint8 other_view_id = 0xff;
-    guint8 id = 0xff;
-
-    while (!other && j < decoder->NumPocStCurrBefore)
-      other = decoder->RefPicSetStCurrBeforej++;
-
-    if (other) {
-      ID3D11VideoDecoderOutputView *other_view;
-
-      other_view = gst_d3d11_h265_dec_get_output_view_from_picture (self,
-          other, &other_view_id);
-
-      if (other_view)
-        id = gst_d3d11_h265_dec_get_ref_index (pic_params, other_view_id);
-    }
-
-    pic_params->RefPicSetStCurrBeforei = id;
-  }
-
-  for (i = 0, j = 0; i < G_N_ELEMENTS (pic_params->RefPicSetStCurrAfter); i++) {
-    GstH265Picture *other = nullptr;
-    guint8 other_view_id = 0xff;
-    guint8 id = 0xff;
-
-    while (!other && j < decoder->NumPocStCurrAfter)
-      other = decoder->RefPicSetStCurrAfterj++;
-
-    if (other) {
-      ID3D11VideoDecoderOutputView *other_view;
-
-      other_view = gst_d3d11_h265_dec_get_output_view_from_picture (self,
-          other, &other_view_id);
-
-      if (other_view)
-        id = gst_d3d11_h265_dec_get_ref_index (pic_params, other_view_id);
-    }
 
-    pic_params->RefPicSetStCurrAfteri = id;
-  }
-
-  for (i = 0, j = 0; i < G_N_ELEMENTS (pic_params->RefPicSetLtCurr); i++) {
-    GstH265Picture *other = nullptr;
-    guint8 other_view_id = 0xff;
-    guint8 id = 0xff;
-
-    while (!other && j < decoder->NumPocLtCurr)
-      other = decoder->RefPicSetLtCurrj++;
-
-    if (other) {
-      ID3D11VideoDecoderOutputView *other_view;
-
-      other_view = gst_d3d11_h265_dec_get_output_view_from_picture (self,
-          other, &other_view_id);
-
-      if (other_view)
-        id = gst_d3d11_h265_dec_get_ref_index (pic_params, other_view_id);
-    }
-
-    pic_params->RefPicSetLtCurri = id;
-  }
-
-  if (pps->scaling_list_data_present_flag ||
-      (sps->scaling_list_enabled_flag
-          && !sps->scaling_list_data_present_flag)) {
-    scaling_list = &pps->scaling_list;
-  } else if (sps->scaling_list_enabled_flag &&
-      sps->scaling_list_data_present_flag) {
-    scaling_list = &sps->scaling_list;
-  }
-
-  if (scaling_list) {
-    G_STATIC_ASSERT (sizeof (iq_matrix->ucScalingLists0) ==
-        sizeof (scaling_list->scaling_lists_4x4));
-    G_STATIC_ASSERT (sizeof (iq_matrix->ucScalingLists1) ==
-        sizeof (scaling_list->scaling_lists_8x8));
-    G_STATIC_ASSERT (sizeof (iq_matrix->ucScalingLists2) ==
-        sizeof (scaling_list->scaling_lists_16x16));
-    G_STATIC_ASSERT (sizeof (iq_matrix->ucScalingLists3) ==
-        sizeof (scaling_list->scaling_lists_32x32));
-
-    memcpy (iq_matrix->ucScalingLists0, scaling_list->scaling_lists_4x4,
-        sizeof (iq_matrix->ucScalingLists0));
-    memcpy (iq_matrix->ucScalingLists1, scaling_list->scaling_lists_8x8,
-        sizeof (iq_matrix->ucScalingLists1));
-    memcpy (iq_matrix->ucScalingLists2, scaling_list->scaling_lists_16x16,
-        sizeof (iq_matrix->ucScalingLists2));
-    memcpy (iq_matrix->ucScalingLists3, scaling_list->scaling_lists_32x32,
-        sizeof (iq_matrix->ucScalingLists3));
-
-    for (i = 0; i < G_N_ELEMENTS (iq_matrix->ucScalingListDCCoefSizeID2); i++) {
-      iq_matrix->ucScalingListDCCoefSizeID2i =
-          scaling_list->scaling_list_dc_coef_minus8_16x16i + 8;
-    }
-
-    for (i = 0; i < G_N_ELEMENTS (iq_matrix->ucScalingListDCCoefSizeID3); i++) {
-      iq_matrix->ucScalingListDCCoefSizeID3i =
-          scaling_list->scaling_list_dc_coef_minus8_32x32i + 8;
-    }
-
-    inner->submit_iq_data = TRUE;
-  } else {
-    inner->submit_iq_data = FALSE;
-  }
-
-  inner->slice_list.resize (0);
-  inner->bitstream_buffer.resize (0);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_get_picture_id (self->decoder, picture);
 }
 
 static GstFlowReturn
-gst_d3d11_h265_dec_decode_slice (GstH265Decoder * decoder,
-    GstH265Picture * picture, GstH265Slice * slice,
-    GArray * ref_pic_list0, GArray * ref_pic_list1)
+gst_d3d11_h265_dec_start_picture (GstDxvaH265Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
-  DXVA_Slice_HEVC_Short dxva_slice;
-  static const guint8 start_code = { 0, 0, 1 };
-  const size_t start_code_size = sizeof (start_code);
-
-  dxva_slice.BSNALunitDataLocation = inner->bitstream_buffer.size ();
-  /* Includes 3 bytes start code prefix */
-  dxva_slice.SliceBytesInBuffer = slice->nalu.size + start_code_size;
-  dxva_slice.wBadSliceChopping = 0;
-
-  inner->slice_list.push_back (dxva_slice);
-
-  size_t pos = inner->bitstream_buffer.size ();
-  inner->bitstream_buffer.resize (pos + start_code_size + slice->nalu.size);
 
-  /* Fill start code prefix */
-  memcpy (&inner->bitstream_buffer0 + pos, start_code, start_code_size);
-
-  /* Copy bitstream */
-  memcpy (&inner->bitstream_buffer0 + pos + start_code_size,
-      slice->nalu.data + slice->nalu.offset, slice->nalu.size);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_start_picture (self->decoder, picture, picture_id);
 }
 
 static GstFlowReturn
-gst_d3d11_h265_dec_end_picture (GstH265Decoder * decoder,
-    GstH265Picture * picture)
+gst_d3d11_h265_dec_end_picture (GstDxvaH265Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
-  ID3D11VideoDecoderOutputView *view;
-  guint8 view_id = 0xff;
-  size_t bitstream_buffer_size;
-  size_t bitstream_pos;
-  GstD3D11DecodeInputStreamArgs input_args;
-
-  GST_LOG_OBJECT (self, "end picture %p, (poc %d)",
-      picture, picture->pic_order_cnt);
-
-  if (inner->bitstream_buffer.empty () || inner->slice_list.empty ()) {
-    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
-    return GST_FLOW_ERROR;
-  }
-
-  view = gst_d3d11_h265_dec_get_output_view_from_picture (self, picture,
-      &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_ERROR;
-  }
-
-  memset (&input_args, 0, sizeof (GstD3D11DecodeInputStreamArgs));
-
-  bitstream_pos = inner->bitstream_buffer.size ();
-  bitstream_buffer_size = GST_ROUND_UP_128 (bitstream_pos);
-
-  if (bitstream_buffer_size > bitstream_pos) {
-    size_t padding = bitstream_buffer_size - bitstream_pos;
-
-    /* As per DXVA spec, total amount of bitstream buffer size should be
-     * 128 bytes aligned. If actual data is not multiple of 128 bytes,
-     * the last slice data needs to be zero-padded */
-    inner->bitstream_buffer.resize (bitstream_buffer_size, 0);
-
-    DXVA_Slice_HEVC_Short & slice = inner->slice_list.back ();
-    slice.SliceBytesInBuffer += padding;
-  }
 
-  input_args.picture_params = &inner->pic_params;
-  input_args.picture_params_size = sizeof (DXVA_PicParams_HEVC);
-  input_args.slice_control = &inner->slice_list0;
-  input_args.slice_control_size =
-      sizeof (DXVA_Slice_HEVC_Short) * inner->slice_list.size ();
-  input_args.bitstream = &inner->bitstream_buffer0;
-  input_args.bitstream_size = inner->bitstream_buffer.size ();
-
-  if (inner->submit_iq_data) {
-    input_args.inverse_quantization_matrix = &inner->iq_matrix;
-    input_args.inverse_quantization_matrix_size = sizeof (DXVA_Qmatrix_HEVC);
-  }
-
-  return gst_d3d11_decoder_decode_frame (inner->d3d11_decoder,
-      view, &input_args);
+  return gst_d3d11_decoder_end_picture (self->decoder, picture, args);
 }
 
 static GstFlowReturn
-gst_d3d11_h265_dec_output_picture (GstH265Decoder * decoder,
-    GstVideoCodecFrame * frame, GstH265Picture * picture)
+gst_d3d11_h265_dec_output_picture (GstDxvaH265Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
 {
   GstD3D11H265Dec *self = GST_D3D11_H265_DEC (decoder);
-  GstD3D11H265DecInner *inner = self->inner;
-  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
-  GstBuffer *view_buffer;
-
-  GST_LOG_OBJECT (self, "Outputting picture %p, poc %d, picture_struct %d, "
-      "buffer flags 0x%x", picture, picture->pic_order_cnt, picture->pic_struct,
-      picture->buffer_flags);
-
-  view_buffer = (GstBuffer *) gst_h265_picture_get_user_data (picture);
-
-  if (!view_buffer) {
-    GST_ERROR_OBJECT (self, "Could not get output view");
-    goto error;
-  }
-
-  if (!gst_d3d11_decoder_process_output (inner->d3d11_decoder, vdec,
-          picture->discont_state, inner->width, inner->height, view_buffer,
-          &frame->output_buffer)) {
-    GST_ERROR_OBJECT (self, "Failed to copy buffer");
-    goto error;
-  }
-
-  GST_BUFFER_FLAG_SET (frame->output_buffer, picture->buffer_flags);
-  gst_h265_picture_unref (picture);
-
-  return gst_video_decoder_finish_frame (GST_VIDEO_DECODER (self), frame);
-
-error:
-  gst_h265_picture_unref (picture);
-  gst_video_decoder_release_frame (vdec, frame);
 
-  return GST_FLOW_ERROR;
+  return gst_d3d11_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
 }
 
 void
@@ -960,22 +286,22 @@
   gchar *feature_name;
   guint index = 0;
   guint i;
-  const GUID *profile = NULL;
+  const GUID *profile = nullptr;
   GTypeInfo type_info = {
     sizeof (GstD3D11H265DecClass),
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     (GClassInitFunc) gst_d3d11_h265_dec_class_init,
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     sizeof (GstD3D11H265Dec),
     0,
     (GInstanceInitFunc) gst_d3d11_h265_dec_init,
   };
-  const GUID *main_10_guid = NULL;
-  const GUID *main_guid = NULL;
-  GstCaps *sink_caps = NULL;
-  GstCaps *src_caps = NULL;
+  const GUID *main_10_guid = nullptr;
+  const GUID *main_guid = nullptr;
+  GstCaps *sink_caps = nullptr;
+  GstCaps *src_caps = nullptr;
   GstCaps *src_caps_copy;
   GstCaps *tmp;
   GstCapsFeatures *caps_features;
@@ -1081,8 +407,8 @@
     g_value_unset (&profile_list);
     g_value_unset (&format_list);
   } else {
-    gst_caps_set_simple (sink_caps, "profile", G_TYPE_STRING, "main", NULL);
-    gst_caps_set_simple (src_caps, "format", G_TYPE_STRING, "NV12", NULL);
+    gst_caps_set_simple (sink_caps, "profile", G_TYPE_STRING, "main", nullptr);
+    gst_caps_set_simple (src_caps, "format", G_TYPE_STRING, "NV12", nullptr);
   }
 
   /* To cover both landscape and portrait, select max value */
@@ -1094,15 +420,16 @@
   /* System memory with alternate interlace-mode */
   tmp = gst_caps_copy (src_caps_copy);
   caps_features = gst_caps_features_new (GST_CAPS_FEATURE_FORMAT_INTERLACED,
-      NULL);
+      nullptr);
   gst_caps_set_features_simple (tmp, caps_features);
-  gst_caps_set_simple (tmp, "interlace-mode", G_TYPE_STRING, "alternate", NULL);
+  gst_caps_set_simple (tmp, "interlace-mode", G_TYPE_STRING, "alternate",
+      nullptr);
   gst_caps_append (src_caps, tmp);
 
   /* D3D11 memory feature */
   tmp = gst_caps_copy (src_caps_copy);
   caps_features = gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY,
-      NULL);
+      nullptr);
   gst_caps_set_features_simple (tmp, caps_features);
   gst_caps_append (src_caps, tmp);
 
@@ -1112,9 +439,10 @@
   /* D3D11 memory with alternate interlace-mode */
   tmp = gst_caps_copy (src_caps_copy);
   caps_features = gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY,
-      GST_CAPS_FEATURE_FORMAT_INTERLACED, NULL);
+      GST_CAPS_FEATURE_FORMAT_INTERLACED, nullptr);
   gst_caps_set_features_simple (tmp, caps_features);
-  gst_caps_set_simple (tmp, "interlace-mode", G_TYPE_STRING, "alternate", NULL);
+  gst_caps_set_simple (tmp, "interlace-mode", G_TYPE_STRING, "alternate",
+      nullptr);
   gst_caps_append (src_caps, tmp);
 #endif
 
@@ -1135,7 +463,7 @@
     feature_name = g_strdup_printf ("d3d11h265device%ddec", index);
   }
 
-  type = g_type_register_static (GST_TYPE_H265_DECODER,
+  type = g_type_register_static (GST_TYPE_DXVA_H265_DECODER,
       type_name, &type_info, (GTypeFlags) 0);
 
   /* make lower rank than default device */

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11h265dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11h265dec.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11ipc.cpp Added

@@ -0,0 +1,384 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d11ipc.h"
+#include <gst/d3d11/gstd3d11-private.h>
+#include <string.h>
+#include <cctype>
+#include <locale>
+#include <codecvt>
+#include <algorithm>
+
+#define GST_D3D11_IPC_MAGIC_NUMBER 0xD3D1110C
+
+bool
+gst_d3d11_ipc_pkt_identify (std::vector < guint8 > &buf,
+    GstD3D11IpcPacketHeader & header)
+{
+  g_return_val_if_fail (buf.size () >= GST_D3D11_IPC_PKT_HEADER_SIZE, false);
+
+  memcpy (&header, &buf0, GST_D3D11_IPC_PKT_HEADER_SIZE);
+
+  if (header.magic != GST_D3D11_IPC_MAGIC_NUMBER)
+    return false;
+
+  buf.resize (GST_D3D11_IPC_PKT_HEADER_SIZE + header.payload_size);
+
+  return true;
+}
+
+bool
+gst_d3d11_ipc_pkt_build_config (std::vector < guint8 > &buf,
+    DWORD pid, gint64 adapter_luid, GstCaps * caps)
+{
+  GstD3D11IpcPacketHeader header;
+  guint8 *ptr;
+  gchar *caps_str = nullptr;
+  guint caps_size = 0;
+
+  g_return_val_if_fail (GST_IS_CAPS (caps), false);
+
+  caps_str = gst_caps_serialize (caps, GST_SERIALIZE_FLAG_NONE);
+  if (!caps_str)
+    return false;
+
+  caps_size = strlen (caps_str) + 1;
+
+  header.type = GstD3D11IpcPktType::CONFIG;
+  header.magic = GST_D3D11_IPC_MAGIC_NUMBER;
+  header.payload_size = sizeof (DWORD) + sizeof (gint64) + caps_size;
+
+  buf.resize (GST_D3D11_IPC_PKT_HEADER_SIZE + header.payload_size);
+
+  ptr = &buf0;
+
+  memcpy (ptr, &header, GST_D3D11_IPC_PKT_HEADER_SIZE);
+  ptr += GST_D3D11_IPC_PKT_HEADER_SIZE;
+
+  memcpy (ptr, &pid, sizeof (DWORD));
+  ptr += sizeof (DWORD);
+
+  memcpy (ptr, &adapter_luid, sizeof (gint64));
+  ptr += sizeof (gint64);
+
+  strcpy ((char *) ptr, caps_str);
+  g_free (caps_str);
+
+  return true;
+}
+
+bool
+gst_d3d11_ipc_pkt_parse_config (std::vector < guint8 > &buf,
+    DWORD & pid, gint64 & adapter_luid, GstCaps ** caps)
+{
+  GstD3D11IpcPacketHeader header;
+  const guint8 *ptr;
+  std::string str;
+
+  g_return_val_if_fail (buf.size () >
+      GST_D3D11_IPC_PKT_HEADER_SIZE + sizeof (gint64), false);
+  g_return_val_if_fail (caps, false);
+
+  ptr = &buf0;
+  memcpy (&header, ptr, GST_D3D11_IPC_PKT_HEADER_SIZE);
+
+  if (header.type != GstD3D11IpcPktType::CONFIG ||
+      header.magic != GST_D3D11_IPC_MAGIC_NUMBER ||
+      header.payload_size <= sizeof (gint64)) {
+    return false;
+  }
+
+  ptr += GST_D3D11_IPC_PKT_HEADER_SIZE;
+
+  memcpy (&pid, ptr, sizeof (DWORD));
+  ptr += sizeof (DWORD);
+
+  memcpy (&adapter_luid, ptr, sizeof (gint64));
+  ptr += sizeof (gint64);
+
+  *caps = gst_caps_from_string ((const gchar *) ptr);
+  if (*caps == nullptr)
+    return false;
+
+  return true;
+}
+
+void
+gst_d3d11_ipc_pkt_build_need_data (std::vector < guint8 > &buf)
+{
+  GstD3D11IpcPacketHeader header;
+
+  header.type = GstD3D11IpcPktType::NEED_DATA;
+  header.magic = GST_D3D11_IPC_MAGIC_NUMBER;
+  header.payload_size = 0;
+
+  buf.resize (GST_D3D11_IPC_PKT_HEADER_SIZE);
+
+  memcpy (&buf0, &header, GST_D3D11_IPC_PKT_HEADER_SIZE);
+}
+
+/* *INDENT-OFF* */
+bool
+gst_d3d11_ipc_pkt_build_have_data (std::vector < guint8 > &buf,
+    GstClockTime pts, const GstD3D11IpcMemLayout & layout,
+    const HANDLE handle, GstCaps * caps)
+{
+  GstD3D11IpcPacketHeader header;
+  guint8 *ptr;
+  gchar *caps_str = nullptr;
+  guint caps_size = 1;
+
+  if (caps) {
+    caps_str = gst_caps_serialize (caps, GST_SERIALIZE_FLAG_NONE);
+    if (!caps_str)
+      return false;
+
+    caps_size += strlen (caps_str) + 1;
+  }
+
+  header.type = GstD3D11IpcPktType::HAVE_DATA;
+  header.magic = GST_D3D11_IPC_MAGIC_NUMBER;
+  header.payload_size = sizeof (GstClockTime) + sizeof (GstD3D11IpcMemLayout) +
+      sizeof (HANDLE) + caps_size;
+
+  buf.resize (GST_D3D11_IPC_PKT_HEADER_SIZE + header.payload_size);
+
+  ptr = &buf0;
+  memcpy (ptr, &header, GST_D3D11_IPC_PKT_HEADER_SIZE);
+  ptr += GST_D3D11_IPC_PKT_HEADER_SIZE;
+
+  memcpy (ptr, &pts, sizeof (GstClockTime));
+  ptr += sizeof (GstClockTime);
+
+  memcpy (ptr, &layout, sizeof (GstD3D11IpcMemLayout));
+  ptr += sizeof (GstD3D11IpcMemLayout);
+
+  memcpy (ptr, &handle, sizeof (HANDLE));
+  ptr += sizeof (HANDLE);
+
+  if (caps) {
+    *ptr = 1;
+    ptr++;
+
+    strcpy ((char *) ptr, caps_str);
+  } else {
+    *ptr = 0;
+  }
+
+  g_free (caps_str);
+
+  return true;
+}
+/* *INDENT-ON* */
+
+bool
+gst_d3d11_ipc_pkt_parse_have_data (const std::vector < guint8 > &buf,
+    GstClockTime & pts, GstD3D11IpcMemLayout & layout,
+    HANDLE & handle, GstCaps ** caps)
+{
+  GstD3D11IpcPacketHeader header;
+  const guint8 *ptr;
+  std::string str;
+
+  g_return_val_if_fail (buf.size () >
+      GST_D3D11_IPC_PKT_HEADER_SIZE + sizeof (GstClockTime) +
+      sizeof (GstD3D11IpcMemLayout), false);
+  g_return_val_if_fail (caps, false);
+
+  ptr = &buf0;
+  memcpy (&header, ptr, GST_D3D11_IPC_PKT_HEADER_SIZE);
+
+  if (header.type != GstD3D11IpcPktType::HAVE_DATA ||
+      header.magic != GST_D3D11_IPC_MAGIC_NUMBER ||
+      header.payload_size <= sizeof (GstClockTime) +
+      sizeof (GstD3D11IpcMemLayout)) {
+    return false;
+  }
+  ptr += GST_D3D11_IPC_PKT_HEADER_SIZE;
+
+  memcpy (&pts, ptr, sizeof (GstClockTime));
+  ptr += sizeof (GstClockTime);
+
+  memcpy (&layout, ptr, sizeof (GstD3D11IpcMemLayout));
+  ptr += sizeof (GstD3D11IpcMemLayout);
+
+  memcpy (&handle, ptr, sizeof (HANDLE));
+  ptr += sizeof (HANDLE);
+
+  if (*ptr) {
+    ptr++;
+
+    *caps = gst_caps_from_string ((const gchar *) ptr);
+    if (*caps == nullptr)
+      return false;
+  }
+
+  return true;
+}
+
+void
+gst_d3d11_ipc_pkt_build_read_done (std::vector < guint8 > &buf)
+{
+  GstD3D11IpcPacketHeader header;
+
+  header.type = GstD3D11IpcPktType::READ_DONE;
+  header.magic = GST_D3D11_IPC_MAGIC_NUMBER;
+  header.payload_size = 0;
+
+  buf.resize (GST_D3D11_IPC_PKT_HEADER_SIZE);
+
+  memcpy (&buf0, &header, GST_D3D11_IPC_PKT_HEADER_SIZE);
+}
+
+void
+gst_d3d11_ipc_pkt_build_release_data (std::vector < guint8 > &buf,
+    const HANDLE handle)
+{
+  GstD3D11IpcPacketHeader header;
+  guint8 *ptr;
+
+  header.type = GstD3D11IpcPktType::RELEASE_DATA;
+  header.magic = GST_D3D11_IPC_MAGIC_NUMBER;
+  header.payload_size = sizeof (HANDLE);
+
+  buf.resize (GST_D3D11_IPC_PKT_HEADER_SIZE + header.payload_size);
+
+  ptr = &buf0;
+  memcpy (ptr, &header, GST_D3D11_IPC_PKT_HEADER_SIZE);
+  ptr += GST_D3D11_IPC_PKT_HEADER_SIZE;
+
+  memcpy (ptr, &handle, sizeof (HANDLE));
+}
+
+bool
+gst_d3d11_ipc_pkt_parse_release_data (std::vector < guint8 > &buf,
+    HANDLE & handle)
+{
+  GstD3D11IpcPacketHeader header;
+  const guint8 *ptr;
+
+  g_return_val_if_fail (buf.size () >=
+      GST_D3D11_IPC_PKT_HEADER_SIZE + sizeof (HANDLE), false);
+
+  ptr = &buf0;
+  memcpy (&header, ptr, GST_D3D11_IPC_PKT_HEADER_SIZE);
+
+  if (header.type != GstD3D11IpcPktType::RELEASE_DATA ||
+      header.magic != GST_D3D11_IPC_MAGIC_NUMBER ||
+      header.payload_size != sizeof (HANDLE)) {
+    return false;
+  }
+  ptr += GST_D3D11_IPC_PKT_HEADER_SIZE;
+
+  memcpy (&handle, ptr, sizeof (HANDLE));
+
+  return true;
+}
+
+void
+gst_d3d11_ipc_pkt_build_eos (std::vector < guint8 > &buf)
+{
+  GstD3D11IpcPacketHeader header;
+
+  header.type = GstD3D11IpcPktType::EOS;
+  header.magic = GST_D3D11_IPC_MAGIC_NUMBER;
+  header.payload_size = 0;
+
+  buf.resize (GST_D3D11_IPC_PKT_HEADER_SIZE);
+
+  memcpy (&buf0, &header, GST_D3D11_IPC_PKT_HEADER_SIZE);
+}
+
+void
+gst_d3d11_ipc_pkt_build_fin (std::vector < guint8 > &buf)
+{
+  GstD3D11IpcPacketHeader header;
+
+  header.type = GstD3D11IpcPktType::FIN;
+  header.magic = GST_D3D11_IPC_MAGIC_NUMBER;
+  header.payload_size = 0;
+
+  buf.resize (GST_D3D11_IPC_PKT_HEADER_SIZE);
+
+  memcpy (&buf0, &header, GST_D3D11_IPC_PKT_HEADER_SIZE);
+}
+
+bool
+gst_d3d11_ipc_clock_is_system (GstClock * clock)
+{
+  GstClockType clock_type = GST_CLOCK_TYPE_MONOTONIC;
+  GstClock *mclock;
+
+  if (G_OBJECT_TYPE (clock) != GST_TYPE_SYSTEM_CLOCK)
+    return false;
+
+  g_object_get (clock, "clock-type", &clock_type, nullptr);
+  if (clock_type != GST_CLOCK_TYPE_MONOTONIC)
+    return false;
+
+  mclock = gst_clock_get_master (clock);
+  if (!mclock)
+    return true;
+
+  gst_object_unref (mclock);
+  return false;
+}
+
+std::string
+gst_d3d11_ipc_wstring_to_string (const std::wstring & str)
+{
+  std::wstring_convert < std::codecvt_utf8 < wchar_t >>conv;
+  return conv.to_bytes (str);
+}
+
+std::wstring
+gst_d3d11_ipc_string_to_wstring (const std::string & str)
+{
+  std::wstring_convert < std::codecvt_utf8 < wchar_t >>conv;
+  return conv.from_bytes (str);
+}
+
+/* *INDENT-OFF* */
+static inline void rtrim(std::string &s) {
+  s.erase (std::find_if (s.rbegin(), s.rend(),
+      (unsigned char ch) {
+        return !std::isspace (ch);
+      }).base (), s.end ());
+}
+/* *INDENT-ON* */
+
+std::string
+gst_d3d11_ipc_win32_error_to_string (guint err)
+{
+  wchar_t buffer1024;
+
+  if (!FormatMessageW (FORMAT_MESSAGE_IGNORE_INSERTS |
+          FORMAT_MESSAGE_FROM_SYSTEM, nullptr, err, 0, buffer, 1024, nullptr)) {
+    return std::string ("");
+  }
+
+  std::string ret = gst_d3d11_ipc_wstring_to_string (buffer);
+  rtrim (ret);
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11ipc.h Added

@@ -0,0 +1,146 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/d3d11/gstd3d11.h>
+#include <string>
+#include <vector>
+#include <windows.h>
+
+/*
+ * Communication Sequence
+ *
+ *              +--------+                      +--------+
+ *              | client |                      | server |
+ *              +--------+                      +--------+
+ *                  |                               |
+ *                  |                               |
+ *                  |<---------- CONFIG ------------+
+ *                  |                               |
+ *                  +--------- NEED-DATA ---------->|
+ *                  |                               +-------+
+ *                  |                               |     Export
+ *                  |                               |   D3D11 memory
+ *                  |                               |<------+
+ *                  |<-------- HAVE-DATA -----------+
+ *         +--------+                               |
+ *       Import     |                               |
+ *    D3D11 memory  |                               |
+ *         +------->+                               |
+ *                  +--------- READ-DONE ---------->|
+ *         +--------+                               |
+ *      Release     |                               |
+ *   D3D11 memory   |                               |
+ *         +------->|                               |
+ *                  +-------- RELEASE-DATA -------->|
+ *                  |                               |
+ *                  +--------- NEED-DATA ---------->|
+ *                  |                               |
+ *                  |<----------- EOS --------------+
+ *         +--------+                               |
+ *    Cleanup all   |                               |
+ * shared resources |                               |
+ *         +------->|                               |
+ *                  +------------ FIN ------------->|
+ */
+
+enum class GstD3D11IpcPktType : guint8
+{
+  UNKNOWN,
+  CONFIG,
+  NEED_DATA,
+  HAVE_DATA,
+  READ_DONE,
+  RELEASE_DATA,
+  EOS,
+  FIN,
+};
+
+#pragma pack(push, 1)
+struct GstD3D11IpcPacketHeader
+{
+  GstD3D11IpcPktType type;
+  guint32 payload_size;
+  guint32 magic;
+};
+
+struct GstD3D11IpcMemLayout
+{
+  guint32 size;
+  guint32 pitch;
+  guint32 offset4;
+};
+#pragma pack(pop)
+
+constexpr guint GST_D3D11_IPC_PKT_HEADER_SIZE = sizeof (GstD3D11IpcPacketHeader);
+
+#define GST_D3D11_IPC_FORMATS \
+    "{ RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, " \
+    "P010_10LE, P012_LE, P016_LE }"
+
+bool gst_d3d11_ipc_pkt_identify (std::vector<guint8> & buf,
+                                 GstD3D11IpcPacketHeader & header);
+
+bool gst_d3d11_ipc_pkt_build_config (std::vector<guint8> & buf,
+                                     DWORD pid,
+                                     gint64 adapter_luid,
+                                     GstCaps * caps);
+
+bool gst_d3d11_ipc_pkt_parse_config (std::vector<guint8> & buf,
+                                     DWORD & pid,
+                                     gint64 & adapter_luid,
+                                     GstCaps ** caps);
+
+void gst_d3d11_ipc_pkt_build_need_data (std::vector<guint8> & buf);
+
+bool gst_d3d11_ipc_pkt_build_have_data (std::vector<guint8> & buf,
+                                        GstClockTime pts,
+                                        const GstD3D11IpcMemLayout & layout,
+                                        const HANDLE handle,
+                                        GstCaps * caps);
+
+bool gst_d3d11_ipc_pkt_parse_have_data (const std::vector<guint8> & buf,
+                                        GstClockTime & pts,
+                                        GstD3D11IpcMemLayout & layout,
+                                        HANDLE & handle,
+                                        GstCaps ** caps);
+
+void gst_d3d11_ipc_pkt_build_read_done (std::vector<guint8> & buf);
+
+void gst_d3d11_ipc_pkt_build_release_data (std::vector<guint8> & buf,
+                                           const HANDLE handle);
+
+bool gst_d3d11_ipc_pkt_parse_release_data (std::vector<guint8> & buf,
+                                           HANDLE & handle);
+
+void gst_d3d11_ipc_pkt_build_eos (std::vector<guint8> & buf);
+
+void gst_d3d11_ipc_pkt_build_fin (std::vector<guint8> & buf);
+
+bool gst_d3d11_ipc_clock_is_system (GstClock * clock);
+
+std::string gst_d3d11_ipc_wstring_to_string (const std::wstring & str);
+
+std::wstring gst_d3d11_ipc_string_to_wstring (const std::string & str);
+
+std::string gst_d3d11_ipc_win32_error_to_string (guint err);
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11ipcclient.cpp Added

@@ -0,0 +1,1171 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d11ipcclient.h"
+#include <gst/d3d11/gstd3d11-private.h>
+#include <mutex>
+#include <condition_variable>
+#include <queue>
+#include <atomic>
+#include <memory>
+#include <wrl.h>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d11_ipc_client_debug);
+#define GST_CAT_DEFAULT gst_d3d11_ipc_client_debug
+
+static GThreadPool *gc_thread_pool = nullptr;
+/* *INDENT-OFF* */
+static std::mutex gc_pool_lock;
+/* *INDENT-ON* */
+
+void
+gst_d3d11_ipc_client_deinit (void)
+{
+  std::lock_guard < std::mutex > lk (gc_pool_lock);
+  if (gc_thread_pool) {
+    g_thread_pool_free (gc_thread_pool, FALSE, TRUE);
+    gc_thread_pool = nullptr;
+  }
+}
+
+/**
+ * GstD3D11IpcIOMode:
+ *
+ * Texture import mode
+ *
+ * Since: 1.24
+ */
+GType
+gst_d3d11_ipc_io_mode_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue io_modes = {
+    /**
+     * GstD3D11IpcIOMode::copy:
+     *
+     * Copy remote texture to newly allocated texture
+     *
+     * Since: 1.24
+     */
+    {GST_D3D11_IPC_IO_COPY, "Copy remote texture", "copy"},
+
+    /**
+     * GstD3D11IpcIOMode::import:
+     *
+     * Import remote texture to without any allocation/copy
+     *
+     * Since: 1.24
+     */
+    {GST_D3D11_IPC_IO_IMPORT, "Import remote texture", "import"},
+    {0, nullptr, nullptr}
+  };
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstD3D11IpcIOMode", io_modes);
+  } GST_D3D11_CALL_ONCE_END;
+
+  return type;
+}
+
+/* *INDENT-OFF* */
+struct GstD3D11IpcClientConn : public OVERLAPPED
+{
+  GstD3D11IpcClientConn (GstD3D11IpcClient * client, HANDLE pipe_handle)
+      : client (client), pipe (pipe_handle)
+  {
+    OVERLAPPED *parent = static_cast<OVERLAPPED *> (this);
+    parent->Internal = 0;
+    parent->InternalHigh = 0;
+    parent->Offset = 0;
+    parent->OffsetHigh = 0;
+
+    client_msg.resize (GST_D3D11_IPC_PKT_HEADER_SIZE);
+    server_msg.resize (GST_D3D11_IPC_PKT_HEADER_SIZE);
+  }
+
+  ~GstD3D11IpcClientConn ()
+  {
+    if (pipe != INVALID_HANDLE_VALUE) {
+      CancelIo (pipe);
+      CloseHandle (pipe);
+    }
+  }
+
+  GstD3D11IpcClient *client;
+
+  HANDLE pipe = INVALID_HANDLE_VALUE;
+
+  GstD3D11IpcPktType type;
+  std::vector<guint8> client_msg;
+  std::vector<guint8> server_msg;
+};
+
+struct GstD3D11IpcImportData
+{
+  ~GstD3D11IpcImportData ()
+  {
+    GST_LOG_OBJECT (client, "Release handle \"%p\"", server_handle);
+    gst_object_unref (client);
+  }
+
+  GstD3D11IpcClient *client;
+  ComPtr<ID3D11Texture2D> texture;
+  ComPtr<IDXGIKeyedMutex> mutex;
+  GstD3D11IpcMemLayout layout;
+  HANDLE server_handle = nullptr;
+};
+
+struct GstD3D11IpcReleaseData
+{
+  GstD3D11IpcClient *self;
+  std::shared_ptr<GstD3D11IpcImportData> imported;
+};
+
+struct GstD3D11IpcClientPrivate
+{
+  GstD3D11IpcClientPrivate ()
+  {
+    wakeup_event = CreateEvent (nullptr, FALSE, FALSE, nullptr);
+    cancellable = CreateEvent (nullptr, TRUE, FALSE, nullptr);
+
+    shutdown = false;
+    io_pending = true;
+  }
+
+  ~GstD3D11IpcClientPrivate ()
+  {
+    gst_clear_caps (&caps);
+    if (pool) {
+      gst_buffer_pool_set_active (pool, FALSE);
+      gst_object_unref (pool);
+    }
+
+    gst_clear_object (&device);
+
+    CloseHandle (wakeup_event);
+    CloseHandle (cancellable);
+    if (server_process)
+      CloseHandle (server_process);
+  }
+
+  std::string address;
+  GstD3D11IpcIOMode io_mode = GST_D3D11_IPC_IO_COPY;
+  GstClockTime timeout;
+  HANDLE wakeup_event;
+  HANDLE cancellable;
+  HANDLE server_process = nullptr;
+  std::mutex lock;
+  std::condition_variable cond;
+  GstD3D11Device *device = nullptr;
+  GstCaps *caps = nullptr;
+  GstBufferPool *pool = nullptr;
+  GstVideoInfo info;
+  bool server_eos = false;
+  bool flushing = false;
+  bool aborted = false;
+  bool sent_fin = false;
+  std::atomic<bool> shutdown;
+  std::atomic<bool> io_pending;
+  GThread *loop_thread = nullptr;
+  std::queue <GstSample *> samples;
+  std::shared_ptr<GstD3D11IpcClientConn> conn;
+  std::queue<HANDLE> unused_data;
+  std::vector<std::weak_ptr<GstD3D11IpcImportData>> imported;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D11IpcClient
+{
+  GstObject parent;
+
+  GstD3D11IpcClientPrivate *priv;
+};
+
+static void gst_d3d11_ipc_client_dispose (GObject * object);
+static void gst_d3d11_ipc_client_finalize (GObject * object);
+static void gst_d3d11_ipc_client_continue (GstD3D11IpcClient * self);
+static void gst_d3d11_ipc_client_send_msg (GstD3D11IpcClient * self);
+
+#define gst_d3d11_ipc_client_parent_class parent_class
+G_DEFINE_TYPE (GstD3D11IpcClient, gst_d3d11_ipc_client, GST_TYPE_OBJECT);
+
+static void
+gst_d3d11_ipc_client_class_init (GstD3D11IpcClientClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gst_d3d11_ipc_client_dispose;
+  object_class->finalize = gst_d3d11_ipc_client_finalize;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d11_ipc_client_debug, "d3d11ipcclient",
+      0, "d3d11ipcclient");
+}
+
+static void
+gst_d3d11_ipc_client_init (GstD3D11IpcClient * self)
+{
+  self->priv = new GstD3D11IpcClientPrivate ();
+}
+
+static void
+gst_d3d11_ipc_client_dispose (GObject * object)
+{
+  GstD3D11IpcClient *self = GST_D3D11_IPC_CLIENT (object);
+  GstD3D11IpcClientPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "dispose");
+
+  SetEvent (priv->cancellable);
+
+  g_clear_pointer (&priv->loop_thread, g_thread_join);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gst_d3d11_ipc_client_finalize (GObject * object)
+{
+  GstD3D11IpcClient *self = GST_D3D11_IPC_CLIENT (object);
+
+  GST_DEBUG_OBJECT (self, "finalize");
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d11_ipc_client_abort (GstD3D11IpcClient * self)
+{
+  GstD3D11IpcClientPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->aborted = true;
+  priv->cond.notify_all ();
+}
+
+static bool
+gst_d3d11_client_update_caps (GstD3D11IpcClient * self, GstCaps * caps)
+{
+  GstD3D11IpcClientPrivate *priv = self->priv;
+
+  if (!caps)
+    return true;
+
+  gst_clear_caps (&priv->caps);
+  priv->caps = caps;
+
+  if (priv->pool) {
+    gst_buffer_pool_set_active (priv->pool, FALSE);
+    gst_clear_object (&priv->pool);
+  }
+
+  if (!gst_video_info_from_caps (&priv->info, caps)) {
+    GST_ERROR_OBJECT (self, "Invalid caps");
+    return false;
+  }
+
+  if (priv->io_mode == GST_D3D11_IPC_IO_COPY) {
+    GstStructure *config;
+    GstD3D11AllocationParams *params;
+    guint bind_flags = 0;
+    GstD3D11Format device_format;
+
+    if (!gst_d3d11_device_get_format (priv->device,
+            GST_VIDEO_INFO_FORMAT (&priv->info), &device_format)) {
+      GST_ERROR_OBJECT (self, "Couldn't get device format");
+      return false;
+    }
+
+    if ((device_format.format_support0 &
+            (guint) D3D11_FORMAT_SUPPORT_SHADER_SAMPLE) != 0) {
+      bind_flags |= D3D11_BIND_SHADER_RESOURCE;
+    }
+
+    if ((device_format.format_support0 &
+            (guint) D3D11_FORMAT_SUPPORT_RENDER_TARGET) != 0) {
+      bind_flags |= D3D11_BIND_RENDER_TARGET;
+    }
+
+    priv->pool = gst_d3d11_buffer_pool_new (priv->device);
+    config = gst_buffer_pool_get_config (priv->pool);
+
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+    gst_buffer_pool_config_set_params (config, priv->caps,
+        GST_VIDEO_INFO_SIZE (&priv->info), 0, 0);
+
+    params = gst_d3d11_allocation_params_new (priv->device, &priv->info,
+        GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags, 0);
+
+    gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+    gst_d3d11_allocation_params_free (params);
+
+    if (!gst_buffer_pool_set_config (priv->pool, config)) {
+      GST_ERROR_OBJECT (self, "Couldn't set pool config");
+      gst_clear_object (&priv->pool);
+      return false;
+    }
+
+    if (!gst_buffer_pool_set_active (priv->pool, TRUE)) {
+      GST_ERROR_OBJECT (self, "Couldn't active pool");
+      gst_clear_object (&priv->pool);
+      return false;
+    }
+  }
+
+  return true;
+}
+
+static bool
+gst_d3d11_ipc_client_config_data (GstD3D11IpcClient * self)
+{
+  GstD3D11IpcClientPrivate *priv = self->priv;
+  gint64 prev_luid, luid;
+  GstCaps *caps = nullptr;
+  auto conn = priv->conn;
+  DWORD server_pid;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  g_object_get (priv->device, "adapter-luid", &prev_luid, nullptr);
+
+  if (!gst_d3d11_ipc_pkt_parse_config (conn->server_msg,
+          server_pid, luid, &caps)) {
+    GST_ERROR_OBJECT (self, "Couldn't parse CONFIG-DATA");
+    return false;
+  }
+
+  if (priv->server_process) {
+    GST_WARNING_OBJECT (self, "Have server process handle already");
+    CloseHandle (priv->server_process);
+  }
+
+  priv->server_process = OpenProcess (PROCESS_DUP_HANDLE, FALSE, server_pid);
+  if (!priv->server_process) {
+    guint last_err = GetLastError ();
+    auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+    GST_ERROR_OBJECT (self, "Couldn't open server process, 0x%x (%s)",
+        last_err, err.c_str ());
+    return false;
+  }
+
+  if (prev_luid != luid) {
+    GstD3D11Device *device = gst_d3d11_device_new_for_adapter_luid (luid,
+        D3D11_CREATE_DEVICE_BGRA_SUPPORT);
+    if (!device) {
+      GST_ERROR_OBJECT (self, "Couldn't create device");
+      return false;
+    }
+
+    gst_object_unref (priv->device);
+    priv->device = device;
+  }
+
+  if (!gst_d3d11_client_update_caps (self, caps))
+    return false;
+
+  priv->cond.notify_all ();
+
+  return true;
+}
+
+static void
+gst_d3d11_ipc_client_release_imported_data (GstD3D11IpcReleaseData * data)
+{
+  GstD3D11IpcClient *self = data->self;
+  GstD3D11IpcClientPrivate *priv = self->priv;
+  HANDLE server_handle = data->imported->server_handle;
+
+  GST_LOG_OBJECT (self, "Releasing data \"%p\"", server_handle);
+
+  data->imported = nullptr;
+
+  priv->lock.lock ();
+  priv->unused_data.push (server_handle);
+  priv->lock.unlock ();
+
+  SetEvent (priv->wakeup_event);
+
+  gst_object_unref (data->self);
+
+  delete data;
+}
+
+static bool
+gst_d3d11_ipc_client_have_data (GstD3D11IpcClient * self)
+{
+  GstD3D11IpcClientPrivate *priv = self->priv;
+  GstBuffer *buffer;
+  GstMemory *mem;
+  GstSample *sample;
+  GstClockTime pts;
+  GstCaps *caps = nullptr;
+  GstD3D11IpcMemLayout layout;
+  std::shared_ptr < GstD3D11IpcImportData > import_data;
+  std::unique_lock < std::mutex > lk (priv->lock);
+  HANDLE server_handle = nullptr;
+  HANDLE client_handle = nullptr;
+  auto conn = priv->conn;
+  ComPtr < ID3D11Texture2D > texture;
+  HRESULT hr;
+
+  if (!gst_d3d11_ipc_pkt_parse_have_data (conn->server_msg,
+          pts, layout, server_handle, &caps)) {
+    GST_ERROR_OBJECT (self, "Couldn't parse HAVE-DATA packet");
+    return false;
+  }
+
+  if (!gst_d3d11_client_update_caps (self, caps))
+    return false;
+
+  if (!DuplicateHandle (priv->server_process, server_handle,
+          GetCurrentProcess (), &client_handle, 0, FALSE,
+          DUPLICATE_SAME_ACCESS)) {
+    guint last_err = GetLastError ();
+    auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+    GST_ERROR_OBJECT (self, "Couldn't duplicate handle, 0x%x (%s)",
+        last_err, err.c_str ());
+    return false;
+  }
+
+  GST_LOG_OBJECT (self, "Importing server handle %p", server_handle);
+
+  ID3D11Device *device = gst_d3d11_device_get_device_handle (priv->device);
+  ComPtr < ID3D11Device1 > device1;
+  ComPtr < IDXGIKeyedMutex > mutex;
+
+  hr = device->QueryInterface (IID_PPV_ARGS (&device1));
+  if (!gst_d3d11_result (hr, priv->device)) {
+    GST_ERROR_OBJECT (self, "ID3D11Device1 interface is not available");
+    return false;
+  }
+
+  hr = device1->OpenSharedResource1 (client_handle, IID_PPV_ARGS (&texture));
+  CloseHandle (client_handle);
+
+  if (!gst_d3d11_result (hr, priv->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't open resource");
+    return false;
+  }
+
+  hr = texture->QueryInterface (IID_PPV_ARGS (&mutex));
+  if (!gst_d3d11_result (hr, priv->device)) {
+    GST_ERROR_OBJECT (self, "couldn't get keyed mutex interface");
+    return false;
+  }
+
+  import_data = std::make_shared < GstD3D11IpcImportData > ();
+  import_data->client = (GstD3D11IpcClient *) gst_object_ref (self);
+  import_data->texture = texture;
+  import_data->mutex = mutex;
+  import_data->layout = layout;
+  import_data->server_handle = server_handle;
+
+  if (priv->io_mode == GST_D3D11_IPC_IO_COPY) {
+    ID3D11DeviceContext *context =
+        gst_d3d11_device_get_device_context_handle (priv->device);
+    ID3D11Texture2D *dst_texture;
+    D3D11_BOX src_box = { 0, };
+    D3D11_TEXTURE2D_DESC dst_desc, src_desc;
+    GstMapInfo info;
+
+    hr = import_data->mutex->AcquireSync (0, INFINITE);
+    if (hr != S_OK) {
+      GST_ERROR_OBJECT (self, "Couldn't acquire sync");
+      return false;
+    }
+
+    gst_buffer_pool_acquire_buffer (priv->pool, &buffer, nullptr);
+    mem = gst_buffer_peek_memory (buffer, 0);
+
+    gst_memory_map (mem, &info, (GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D11));
+
+    dst_texture = (ID3D11Texture2D *) info.data;
+    dst_texture->GetDesc (&dst_desc);
+
+    texture->GetDesc (&src_desc);
+
+    src_box.left = 0;
+    src_box.top = 0;
+    src_box.front = 0;
+    src_box.back = 1;
+    src_box.right = MIN (src_desc.Width, dst_desc.Width);
+    src_box.bottom = MIN (src_desc.Height, dst_desc.Height);
+
+    context->CopySubresourceRegion (dst_texture, 0, 0, 0, 0,
+        texture.Get (), 0, &src_box);
+
+    import_data->mutex->ReleaseSync (0);
+
+    gst_memory_unmap (mem, &info);
+
+    priv->unused_data.push (server_handle);
+  } else {
+    GstMemory *mem;
+    gint strideGST_VIDEO_MAX_PLANES;
+    gsize offsetGST_VIDEO_MAX_PLANES;
+
+    for (guint i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
+      stridei = import_data->layout.pitch;
+      offseti = import_data->layout.offseti;
+    }
+
+    auto data = new GstD3D11IpcReleaseData ();
+    data->self = (GstD3D11IpcClient *) gst_object_ref (self);
+    data->imported = import_data;
+
+    mem = gst_d3d11_allocator_alloc_wrapped (nullptr, priv->device,
+        texture.Get (), import_data->layout.size, data,
+        (GDestroyNotify) gst_d3d11_ipc_client_release_imported_data);
+    GST_MINI_OBJECT_FLAG_SET (mem, GST_MEMORY_FLAG_READONLY);
+
+    buffer = gst_buffer_new ();
+    gst_buffer_append_memory (buffer, mem);
+
+    gst_buffer_add_video_meta_full (buffer, GST_VIDEO_FRAME_FLAG_NONE,
+        GST_VIDEO_INFO_FORMAT (&priv->info), GST_VIDEO_INFO_WIDTH (&priv->info),
+        GST_VIDEO_INFO_HEIGHT (&priv->info),
+        GST_VIDEO_INFO_N_PLANES (&priv->info), offset, stride);
+
+    priv->imported.push_back (import_data);
+  }
+
+  GST_BUFFER_PTS (buffer) = pts;
+  GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
+  GST_BUFFER_DURATION (buffer) = GST_CLOCK_TIME_NONE;
+
+  sample = gst_sample_new (buffer, priv->caps, nullptr, nullptr);
+  gst_buffer_unref (buffer);
+
+  /* Drops too old samples */
+  std::queue < GstSample * >drop_queue;
+  while (priv->samples.size () > 2) {
+    drop_queue.push (priv->samples.front ());
+    priv->samples.pop ();
+  }
+
+  priv->samples.push (sample);
+  priv->cond.notify_all ();
+  lk.unlock ();
+
+  import_data = nullptr;
+  while (!drop_queue.empty ()) {
+    auto old = drop_queue.front ();
+    gst_sample_unref (old);
+    drop_queue.pop ();
+  }
+
+  return true;
+}
+
+static void
+gst_d3d11_ipc_client_wait_msg_finish (GstD3D11IpcClient * client)
+{
+  GstD3D11IpcClientPrivate *priv = client->priv;
+  GstD3D11IpcPacketHeader header;
+  auto conn = priv->conn;
+
+  if (!gst_d3d11_ipc_pkt_identify (conn->server_msg, header)) {
+    GST_ERROR_OBJECT (client, "Broken header");
+    gst_d3d11_ipc_client_abort (client);
+    return;
+  }
+
+  switch (header.type) {
+    case GstD3D11IpcPktType::CONFIG:
+      GST_LOG_OBJECT (client, "Got CONFIG");
+      if (!gst_d3d11_ipc_client_config_data (client)) {
+        gst_d3d11_ipc_client_abort (client);
+        return;
+      }
+
+      gst_d3d11_ipc_client_continue (client);
+      break;
+    case GstD3D11IpcPktType::HAVE_DATA:
+      GST_LOG_OBJECT (client, "Got HAVE-DATA");
+      gst_d3d11_device_lock (priv->device);
+      if (!gst_d3d11_ipc_client_have_data (client)) {
+        gst_d3d11_device_unlock (priv->device);
+        gst_d3d11_ipc_client_abort (client);
+        return;
+      }
+
+      gst_d3d11_device_unlock (priv->device);
+
+      GST_LOG_OBJECT (client, "Sending READ-DONE");
+      gst_d3d11_ipc_pkt_build_read_done (conn->client_msg);
+      conn->type = GstD3D11IpcPktType::READ_DONE;
+      gst_d3d11_ipc_client_send_msg (client);
+      break;
+    case GstD3D11IpcPktType::EOS:
+      GST_DEBUG_OBJECT (client, "Got EOS");
+      priv->server_eos = true;
+      priv->lock.lock ();
+      priv->cond.notify_all ();
+      priv->lock.unlock ();
+      gst_d3d11_ipc_client_continue (client);
+      break;
+    default:
+      GST_WARNING_OBJECT (client, "Unexpected packet type");
+      gst_d3d11_ipc_client_abort (client);
+      break;
+  }
+}
+
+static void WINAPI
+gst_d3d11_ipc_client_payload_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstD3D11IpcClientConn *conn =
+      static_cast < GstD3D11IpcClientConn * >(overlap);
+  GstD3D11IpcClient *self = conn->client;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_d3d11_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (self, "ReadFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    gst_d3d11_ipc_client_abort (self);
+  }
+
+  gst_d3d11_ipc_client_wait_msg_finish (self);
+}
+
+static void WINAPI
+gst_d3d11_ipc_client_win32_wait_header_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstD3D11IpcClientConn *conn =
+      static_cast < GstD3D11IpcClientConn * >(overlap);
+  GstD3D11IpcClient *self = conn->client;
+  GstD3D11IpcPacketHeader header;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_d3d11_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (self, "ReadFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    gst_d3d11_ipc_client_abort (self);
+    return;
+  }
+
+  if (!gst_d3d11_ipc_pkt_identify (conn->server_msg, header)) {
+    GST_ERROR_OBJECT (self, "Broken header");
+    gst_d3d11_ipc_client_abort (self);
+    return;
+  }
+
+  if (header.payload_size == 0) {
+    gst_d3d11_ipc_client_wait_msg_finish (self);
+    return;
+  }
+
+  GST_LOG_OBJECT (self, "Reading payload");
+
+  if (!ReadFileEx (conn->pipe, &conn->server_msg0 +
+          GST_D3D11_IPC_PKT_HEADER_SIZE, header.payload_size, conn,
+          gst_d3d11_ipc_client_payload_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (self, "ReadFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    gst_d3d11_ipc_client_abort (self);
+  }
+}
+
+static void
+gst_d3d11_ipc_client_wait_msg (GstD3D11IpcClient * self)
+{
+  GstD3D11IpcClientPrivate *priv = self->priv;
+  auto conn = priv->conn;
+  priv->io_pending = true;
+
+  if (!ReadFileEx (conn->pipe, &conn->server_msg0,
+          GST_D3D11_IPC_PKT_HEADER_SIZE, conn.get (),
+          gst_d3d11_ipc_client_win32_wait_header_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (self, "ReadFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    gst_d3d11_ipc_client_abort (self);
+  }
+}
+
+static void WINAPI
+gst_cuda_ipc_client_win32_send_msg_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstD3D11IpcClientConn *conn =
+      static_cast < GstD3D11IpcClientConn * >(overlap);
+  GstD3D11IpcClient *self = conn->client;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_d3d11_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (self, "WriteFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    gst_d3d11_ipc_client_abort (self);
+    return;
+  }
+
+  switch (conn->type) {
+    case GstD3D11IpcPktType::NEED_DATA:
+      GST_LOG_OBJECT (self, "Sent NEED-DATA");
+      gst_d3d11_ipc_client_wait_msg (self);
+      break;
+    case GstD3D11IpcPktType::READ_DONE:
+      GST_LOG_OBJECT (self, "Sent READ-DONE");
+      gst_d3d11_ipc_client_continue (self);
+      break;
+    case GstD3D11IpcPktType::RELEASE_DATA:
+      GST_LOG_OBJECT (self, "Sent RELEASE-DATA");
+      gst_d3d11_ipc_client_continue (self);
+      break;
+    case GstD3D11IpcPktType::FIN:
+      GST_DEBUG_OBJECT (self, "Sent FIN");
+      gst_d3d11_ipc_client_abort (self);
+      break;
+    default:
+      GST_ERROR_OBJECT (self, "Unexpected msg type");
+      gst_d3d11_ipc_client_abort (self);
+      break;
+  }
+}
+
+static void
+gst_d3d11_ipc_client_send_msg (GstD3D11IpcClient * self)
+{
+  GstD3D11IpcClientPrivate *priv = self->priv;
+
+  auto conn = priv->conn;
+  priv->io_pending = true;
+
+  if (!WriteFileEx (conn->pipe, &conn->client_msg0,
+          conn->client_msg.size (), conn.get (),
+          gst_cuda_ipc_client_win32_send_msg_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (self, "WriteFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    gst_d3d11_ipc_client_abort (self);
+  }
+}
+
+static void
+gst_d3d11_ipc_client_run_gc (GstD3D11IpcClient * self)
+{
+  GstD3D11IpcClientPrivate *priv = self->priv;
+
+  for (auto it = priv->imported.begin (); it != priv->imported.end ();) {
+    auto data = it->lock ();
+    if (!data) {
+      it = priv->imported.erase (it);
+    } else {
+      it++;
+    }
+  }
+}
+
+static void
+gst_d3d11_ipc_client_continue (GstD3D11IpcClient * self)
+{
+  GstD3D11IpcClientPrivate *priv = self->priv;
+  std::unique_lock < std::mutex > lk (priv->lock);
+  auto conn = priv->conn;
+
+  if (!conn) {
+    GST_WARNING_OBJECT (self, "No connection was made");
+    priv->aborted = true;
+    priv->cond.notify_all ();
+    return;
+  }
+
+  if (priv->aborted) {
+    priv->cond.notify_all ();
+    GST_DEBUG_OBJECT (self, "Operation was aborted");
+    return;
+  }
+
+  if (!priv->unused_data.empty ()) {
+    HANDLE server_handle = priv->unused_data.front ();
+    priv->unused_data.pop ();
+
+    GST_LOG_OBJECT (self, "Sending RELEASE-DATA %p", server_handle);
+
+    gst_d3d11_ipc_pkt_build_release_data (conn->client_msg, server_handle);
+    conn->type = GstD3D11IpcPktType::RELEASE_DATA;
+    lk.unlock ();
+
+    gst_d3d11_ipc_client_send_msg (self);
+    return;
+  }
+
+  if (priv->shutdown) {
+    auto drop_queue = priv->samples;
+    while (!priv->samples.empty ())
+      priv->samples.pop ();
+    lk.unlock ();
+
+    while (!drop_queue.empty ()) {
+      auto sample = drop_queue.front ();
+      gst_sample_unref (sample);
+      drop_queue.pop ();
+    }
+    lk.lock ();
+  }
+
+  if (priv->server_eos || priv->shutdown) {
+    gst_d3d11_ipc_client_run_gc (self);
+
+    GST_DEBUG_OBJECT (self, "Remaining imported memory %" G_GSIZE_FORMAT,
+        priv->imported.size ());
+
+    if (priv->imported.empty ()) {
+      GST_DEBUG_OBJECT (self, "Drained");
+      if (priv->sent_fin) {
+        priv->aborted = true;
+        priv->cond.notify_all ();
+      } else {
+        lk.unlock ();
+
+        priv->sent_fin = true;
+        gst_d3d11_ipc_pkt_build_fin (conn->client_msg);
+        conn->type = GstD3D11IpcPktType::FIN;
+
+        GST_DEBUG_OBJECT (self, "Sending FIN");
+        gst_d3d11_ipc_client_send_msg (self);
+        return;
+      }
+    } else {
+      priv->io_pending = false;
+    }
+    return;
+  }
+
+  lk.unlock ();
+
+  gst_d3d11_ipc_pkt_build_need_data (conn->client_msg);
+  conn->type = GstD3D11IpcPktType::NEED_DATA;
+
+  GST_LOG_OBJECT (self, "Sending NEED-DATA");
+  gst_d3d11_ipc_client_send_msg (self);
+}
+
+static gpointer
+gst_d3d11_ipc_client_loop_thread_func (GstD3D11IpcClient * self)
+{
+  GstD3D11IpcClientPrivate *priv = self->priv;
+  DWORD mode = PIPE_READMODE_MESSAGE;
+  guint wait_ret;
+  HANDLE pipe = INVALID_HANDLE_VALUE;
+  GstClockTime start_time = gst_util_get_timestamp ();
+  HANDLE waitables = { priv->cancellable, priv->wakeup_event };
+  std::wstring address = gst_d3d11_ipc_string_to_wstring (priv->address);
+
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
+  CREATEFILE2_EXTENDED_PARAMETERS params;
+  memset (&params, 0, sizeof (CREATEFILE2_EXTENDED_PARAMETERS));
+  params.dwSize = sizeof (CREATEFILE2_EXTENDED_PARAMETERS);
+  params.dwFileAttributes = 0;
+  params.dwFileFlags = FILE_FLAG_OVERLAPPED;
+  params.dwSecurityQosFlags = SECURITY_IMPERSONATION;
+#endif
+
+  GST_DEBUG_OBJECT (self, "Starting loop thread");
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  do {
+    GstClockTime diff;
+
+    if (priv->flushing) {
+      GST_DEBUG_OBJECT (self, "We are flushing");
+      priv->aborted = true;
+      priv->cond.notify_all ();
+      goto out;
+    }
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
+    pipe = CreateFile2 (address.c_str (), GENERIC_READ | GENERIC_WRITE, 0,
+        OPEN_EXISTING, &params);
+#else
+    pipe = CreateFileW (address.c_str (),
+        GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING,
+        FILE_FLAG_OVERLAPPED, nullptr);
+#endif
+
+    if (pipe != INVALID_HANDLE_VALUE)
+      break;
+
+    if (priv->timeout > 0) {
+      diff = gst_util_get_timestamp () - start_time;
+      if (diff > priv->timeout) {
+        GST_WARNING_OBJECT (self, "Timeout");
+        priv->aborted = true;
+        priv->cond.notify_all ();
+        goto out;
+      }
+    }
+
+    /* Retry per 100ms */
+    GST_DEBUG_OBJECT (self, "Sleep for next retry");
+    priv->cond.wait_for (lk, std::chrono::milliseconds (100));
+  } while (true);
+
+  if (!SetNamedPipeHandleState (pipe, &mode, nullptr, nullptr)) {
+    guint last_err = GetLastError ();
+    auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (self, "SetNamedPipeHandleState failed with 0x%x (%s)",
+        last_err, err.c_str ());
+
+    CloseHandle (pipe);
+    priv->aborted = true;
+    priv->cond.notify_all ();
+    goto out;
+  }
+
+  priv->conn = std::make_shared < GstD3D11IpcClientConn > (self, pipe);
+  priv->cond.notify_all ();
+  lk.unlock ();
+
+  gst_d3d11_ipc_client_wait_msg (self);
+
+  do {
+    /* Enters alertable thread state and wait for I/O completion event
+     * or cancellable event */
+    wait_ret = WaitForMultipleObjectsEx (G_N_ELEMENTS (waitables), waitables,
+        FALSE, INFINITE, TRUE);
+    if (wait_ret == WAIT_OBJECT_0) {
+      GST_DEBUG ("Operation cancelled");
+      goto out;
+    }
+
+    switch (wait_ret) {
+      case WAIT_IO_COMPLETION:
+        break;
+      case WAIT_OBJECT_0 + 1:
+        if (!priv->io_pending)
+          gst_d3d11_ipc_client_continue (self);
+        break;
+      default:
+        GST_WARNING ("Unexpected wait return 0x%x", wait_ret);
+        gst_d3d11_ipc_client_abort (self);
+        goto out;
+    }
+  } while (true);
+
+out:
+  while (!priv->samples.empty ()) {
+    auto sample = priv->samples.front ();
+    gst_sample_unref (sample);
+    priv->samples.pop ();
+  }
+
+  priv->conn = nullptr;
+
+  GST_DEBUG_OBJECT (self, "Exit loop thread");
+
+  return nullptr;
+}
+
+GstFlowReturn
+gst_d3d11_ipc_client_run (GstD3D11IpcClient * client)
+{
+  GstD3D11IpcClientPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_D3D11_IPC_CLIENT (client), GST_FLOW_ERROR);
+
+  priv = client->priv;
+  std::unique_lock < std::mutex > lk (priv->lock);
+  if (!priv->loop_thread) {
+    priv->loop_thread = g_thread_new ("d3d11-ipc-client",
+        (GThreadFunc) gst_d3d11_ipc_client_loop_thread_func, client);
+
+    while (!priv->caps && !priv->aborted && !priv->flushing)
+      priv->cond.wait (lk);
+  }
+
+  if (priv->flushing) {
+    GST_DEBUG_OBJECT (client, "We are flushing");
+    return GST_FLOW_FLUSHING;
+  } else if (priv->aborted || !priv->caps) {
+    GST_DEBUG_OBJECT (client, "Aborted");
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+GstCaps *
+gst_d3d11_ipc_client_get_caps (GstD3D11IpcClient * client)
+{
+  GstCaps *caps = nullptr;
+  GstD3D11IpcClientPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_D3D11_IPC_CLIENT (client), nullptr);
+
+  priv = client->priv;
+
+  if (gst_d3d11_ipc_client_run (client) != GST_FLOW_OK)
+    return nullptr;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if (priv->caps)
+    caps = gst_caps_ref (priv->caps);
+
+  return caps;
+}
+
+static void
+gst_d3d11_ipc_client_stop_async (GstD3D11IpcClient * client, gpointer user_data)
+{
+  GstD3D11IpcClientPrivate *priv = client->priv;
+
+  GST_DEBUG_OBJECT (client, "Stopping");
+  std::unique_lock < std::mutex > lk (priv->lock);
+  while (!priv->aborted)
+    priv->cond.wait (lk);
+  lk.unlock ();
+
+  SetEvent (priv->cancellable);
+  g_clear_pointer (&priv->loop_thread, g_thread_join);
+
+  GST_DEBUG_OBJECT (client, "Stopped");
+
+  gst_object_unref (client);
+}
+
+static void
+gst_d3d11_ipc_client_push_stop_async (GstD3D11IpcClient * client)
+{
+  std::lock_guard < std::mutex > lk (gc_pool_lock);
+  if (!gc_thread_pool) {
+    gc_thread_pool = g_thread_pool_new ((GFunc) gst_d3d11_ipc_client_stop_async,
+        nullptr, -1, FALSE, nullptr);
+  }
+
+  g_thread_pool_push (gc_thread_pool, gst_object_ref (client), nullptr);
+}
+
+void
+gst_d3d11_ipc_client_stop (GstD3D11IpcClient * client)
+{
+  GstD3D11IpcClientPrivate *priv;
+
+  g_return_if_fail (GST_IS_D3D11_IPC_CLIENT (client));
+
+  priv = client->priv;
+
+  GST_DEBUG_OBJECT (client, "Stopping");
+  priv->shutdown = true;
+  SetEvent (priv->wakeup_event);
+
+  if (priv->io_mode == GST_D3D11_IPC_IO_COPY) {
+    std::unique_lock < std::mutex > lk (priv->lock);
+    while (!priv->aborted)
+      priv->cond.wait (lk);
+    lk.unlock ();
+
+    GST_DEBUG_OBJECT (client, "Terminating");
+
+    SetEvent (priv->cancellable);
+
+    g_clear_pointer (&priv->loop_thread, g_thread_join);
+
+    GST_DEBUG_OBJECT (client, "Stopped");
+  } else {
+    /* We don't know when imported memory gets released */
+    gst_d3d11_ipc_client_push_stop_async (client);
+  }
+}
+
+void
+gst_d3d11_ipc_client_set_flushing (GstD3D11IpcClient * client, bool flushing)
+{
+  GstD3D11IpcClientPrivate *priv;
+
+  g_return_if_fail (GST_IS_D3D11_IPC_CLIENT (client));
+
+  priv = client->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->flushing = flushing;
+  priv->cond.notify_all ();
+}
+
+GstFlowReturn
+gst_d3d11_ipc_client_get_sample (GstD3D11IpcClient * client,
+    GstSample ** sample)
+{
+  GstD3D11IpcClientPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_D3D11_IPC_CLIENT (client), GST_FLOW_ERROR);
+  g_return_val_if_fail (sample, GST_FLOW_ERROR);
+
+  priv = client->priv;
+
+  GST_LOG_OBJECT (client, "Waiting for sample");
+  std::unique_lock < std::mutex > lk (priv->lock);
+  while (!priv->flushing && !priv->aborted && !priv->server_eos &&
+      priv->samples.empty ()) {
+    priv->cond.wait (lk);
+  }
+
+  if (!priv->samples.empty ()) {
+    *sample = priv->samples.front ();
+    priv->samples.pop ();
+
+    GST_LOG_OBJECT (client, "Have sample");
+    return GST_FLOW_OK;
+  }
+
+  if (priv->flushing) {
+    GST_DEBUG_OBJECT (client, "Flushing");
+    return GST_FLOW_FLUSHING;
+  }
+
+  GST_DEBUG_OBJECT (client, "EOS");
+
+  return GST_FLOW_EOS;
+}
+
+GstD3D11IpcClient *
+gst_d3d11_ipc_client_new (const std::string & address, GstD3D11Device * device,
+    GstD3D11IpcIOMode io_mode, guint timeout)
+{
+  GstD3D11IpcClient *self;
+  GstD3D11IpcClientPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_D3D11_DEVICE (device), nullptr);
+
+  self = (GstD3D11IpcClient *)
+      g_object_new (GST_TYPE_D3D11_IPC_CLIENT, nullptr);
+  gst_object_ref_sink (self);
+
+  priv = self->priv;
+  priv->address = address;
+  priv->timeout = timeout * GST_SECOND;
+  priv->io_mode = io_mode;
+  priv->device = (GstD3D11Device *) gst_object_ref (device);
+
+  return self;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11ipcclient.h Added

@@ -0,0 +1,60 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/d3d11/gstd3d11.h>
+#include "gstd3d11ipc.h"
+
+G_BEGIN_DECLS
+
+enum GstD3D11IpcIOMode
+{
+  GST_D3D11_IPC_IO_COPY,
+  GST_D3D11_IPC_IO_IMPORT,
+};
+
+#define GST_TYPE_D3D11_IPC_IO_MODE (gst_d3d11_ipc_io_mode_get_type ())
+GType gst_d3d11_ipc_io_mode_get_type (void);
+
+#define GST_TYPE_D3D11_IPC_CLIENT (gst_d3d11_ipc_client_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D11IpcClient, gst_d3d11_ipc_client,
+    GST, D3D11_IPC_CLIENT, GstObject);
+
+void                gst_d3d11_ipc_client_deinit (void);
+
+GstD3D11IpcClient * gst_d3d11_ipc_client_new (const std::string & address,
+                                              GstD3D11Device * device,
+                                              GstD3D11IpcIOMode io_mode,
+                                              guint timeout);
+
+GstFlowReturn       gst_d3d11_ipc_client_get_sample (GstD3D11IpcClient * client,
+                                                     GstSample ** sample);
+
+void                gst_d3d11_ipc_client_set_flushing (GstD3D11IpcClient * client,
+                                                       bool flushing);
+
+GstCaps *           gst_d3d11_ipc_client_get_caps     (GstD3D11IpcClient * client);
+
+GstFlowReturn       gst_d3d11_ipc_client_run          (GstD3D11IpcClient * client);
+
+void                gst_d3d11_ipc_client_stop         (GstD3D11IpcClient * client);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11ipcserver.cpp Added

@@ -0,0 +1,843 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d11ipcserver.h"
+#include <unordered_map>
+#include <mutex>
+#include <atomic>
+#include <string>
+#include <memory>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d11_ipc_server_debug);
+#define GST_CAT_DEFAULT gst_d3d11_ipc_server_debug
+
+/* *INDENT-OFF* */
+struct GstD3D11IpcServerData
+{
+  ~GstD3D11IpcServerData ()
+  {
+    if (sample)
+      gst_sample_unref (sample);
+  }
+
+  GstSample *sample = nullptr;
+  HANDLE handle = nullptr;
+  GstD3D11IpcMemLayout layout;
+  GstClockTime pts;
+  guint64 seq_num;
+};
+
+struct GstD3D11IpcServerConn : public OVERLAPPED
+{
+  GstD3D11IpcServerConn (HANDLE pipe_handle) : pipe (pipe_handle)
+  {
+    OVERLAPPED *parent = static_cast<OVERLAPPED *> (this);
+    parent->Internal = 0;
+    parent->InternalHigh = 0;
+    parent->Offset = 0;
+    parent->OffsetHigh = 0;
+
+    client_msg.resize (GST_D3D11_IPC_PKT_HEADER_SIZE);
+    server_msg.resize (GST_D3D11_IPC_PKT_HEADER_SIZE);
+  }
+
+  ~GstD3D11IpcServerConn()
+  {
+    if (pipe != INVALID_HANDLE_VALUE) {
+      CancelIo (pipe);
+      DisconnectNamedPipe (pipe);
+      CloseHandle (pipe);
+    }
+
+    gst_clear_caps (&caps);
+  }
+
+  GstD3D11IpcServer *server;
+
+  HANDLE pipe;
+
+  GstD3D11IpcPktType type;
+  std::vector<guint8> client_msg;
+  std::vector<guint8> server_msg;
+  std::shared_ptr<GstD3D11IpcServerData> data;
+  std::vector<std::shared_ptr<GstD3D11IpcServerData>> peer_handles;
+  GstCaps *caps = nullptr;
+  guint64 seq_num = 0;
+  guint id;
+  bool eos = false;
+  bool pending_have_data = false;
+  bool configured = false;
+};
+
+struct GstD3D11IpcServerPrivate
+{
+  GstD3D11IpcServerPrivate ()
+  {
+    cancellable = CreateEvent (nullptr, TRUE, FALSE, nullptr);
+    wakeup_event = CreateEvent (nullptr, FALSE, FALSE, nullptr);
+
+    shutdown = false;
+    aborted = false;
+  }
+
+  ~GstD3D11IpcServerPrivate ()
+  {
+    CloseHandle (cancellable);
+    CloseHandle (wakeup_event);
+    gst_clear_object (&device);
+  }
+
+  GstD3D11Device *device = nullptr;
+  gint64 adapter_luid = 0;
+  std::mutex lock;
+  guint64 seq_num = 0;
+  guint next_conn_id = 0;
+  std::unordered_map<guint, std::shared_ptr<GstD3D11IpcServerConn>> conn_map;
+  GThread *loop_thread = nullptr;
+  std::atomic<bool>shutdown;
+  std::atomic<bool>aborted;
+  std::shared_ptr<GstD3D11IpcServerData> data;
+  std::string address;
+  HANDLE cancellable;
+  HANDLE wakeup_event;
+  DWORD pid;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D11IpcServer
+{
+  GstObject parent;
+
+  GstD3D11IpcServerPrivate *priv;
+};
+
+static void gst_d3d11_ipc_server_dispose (GObject * object);
+static void gst_d3d11_ipc_server_finalize (GObject * object);
+static void gst_d3d11_ipc_server_on_idle (GstD3D11IpcServer * self);
+static void gst_d3d11_ipc_server_send_msg (GstD3D11IpcServer * self,
+    GstD3D11IpcServerConn * conn);
+static void gst_d3d11_ipc_server_wait_msg (GstD3D11IpcServer * self,
+    GstD3D11IpcServerConn * conn);
+
+#define gst_d3d11_ipc_server_parent_class parent_class
+G_DEFINE_TYPE (GstD3D11IpcServer, gst_d3d11_ipc_server, GST_TYPE_OBJECT);
+
+static void
+gst_d3d11_ipc_server_class_init (GstD3D11IpcServerClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_d3d11_ipc_server_finalize;
+  object_class->dispose = gst_d3d11_ipc_server_dispose;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d11_ipc_server_debug, "d3d11ipcserver",
+      0, "d3d11ipcserver");
+}
+
+static void
+gst_d3d11_ipc_server_init (GstD3D11IpcServer * self)
+{
+  self->priv = new GstD3D11IpcServerPrivate ();
+  self->priv->pid = GetCurrentProcessId ();
+}
+
+static void
+gst_d3d11_ipc_server_dispose (GObject * object)
+{
+  GstD3D11IpcServer *self = GST_D3D11_IPC_SERVER (object);
+  GstD3D11IpcServerPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "dispose");
+
+  SetEvent (priv->cancellable);
+
+  g_clear_pointer (&priv->loop_thread, g_thread_join);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gst_d3d11_ipc_server_finalize (GObject * object)
+{
+  GstD3D11IpcServer *self = GST_D3D11_IPC_SERVER (object);
+
+  GST_DEBUG_OBJECT (self, "finalize");
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static HANDLE
+gst_cuda_ipc_server_win32_create_pipe (GstD3D11IpcServer * self,
+    OVERLAPPED * overlap, bool &io_pending)
+{
+  GstD3D11IpcServerPrivate *priv = self->priv;
+  HANDLE pipe = CreateNamedPipeA (priv->address.c_str (),
+      PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
+      PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
+      PIPE_UNLIMITED_INSTANCES, 1024, 1024, 5000, nullptr);
+
+  if (pipe == INVALID_HANDLE_VALUE) {
+    guint last_err = GetLastError ();
+    auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+    GST_ERROR_OBJECT (self, "CreateNamedPipeA failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    return INVALID_HANDLE_VALUE;
+  }
+
+  if (ConnectNamedPipe (pipe, overlap)) {
+    guint last_err = GetLastError ();
+    auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+    GST_ERROR_OBJECT (self, "ConnectNamedPipe failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    return INVALID_HANDLE_VALUE;
+  }
+
+  io_pending = false;
+  guint last_err = GetLastError ();
+
+  switch (last_err) {
+    case ERROR_IO_PENDING:
+      io_pending = true;
+      break;
+    case ERROR_PIPE_CONNECTED:
+      SetEvent (overlap->hEvent);
+      break;
+    default:
+    {
+      auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+      GST_ERROR_OBJECT (self, "ConnectNamedPipe failed with 0x%x (%s)",
+          last_err, err.c_str ());
+      CloseHandle (pipe);
+      return INVALID_HANDLE_VALUE;
+    }
+  }
+
+  return pipe;
+}
+
+static void
+gst_d3d11_ipc_server_close_connection (GstD3D11IpcServer * self,
+    GstD3D11IpcServerConn * conn)
+{
+  GstD3D11IpcServerPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Closing conn-id %u", conn->id);
+
+  priv->conn_map.erase (conn->id);
+
+  if (priv->shutdown && priv->conn_map.empty ()) {
+    GST_DEBUG_OBJECT (self, "All connection were closed");
+    SetEvent (priv->cancellable);
+  }
+}
+
+static void
+gst_d3d11_ipc_server_have_data (GstD3D11IpcServer * self,
+    GstD3D11IpcServerConn * conn)
+{
+  GstCaps *caps;
+
+  if (!conn->data) {
+    GST_ERROR_OBJECT (self, "Have no data to send, conn-id: %u", conn->id);
+    gst_d3d11_ipc_server_close_connection (self, conn);
+    return;
+  }
+
+  conn->pending_have_data = false;
+  conn->seq_num = conn->data->seq_num + 1;
+
+  caps = gst_sample_get_caps (conn->data->sample);
+  if (!conn->caps || !gst_caps_is_equal (conn->caps, caps)) {
+    GST_DEBUG_OBJECT (self, "Sending caps %" GST_PTR_FORMAT " to conn-id %u",
+        caps, conn->id);
+    gst_caps_replace (&conn->caps, caps);
+  } else {
+    caps = nullptr;
+  }
+
+  GST_LOG_OBJECT (self, "Sending HAVE-DATA with handle \"%p\", conn-id :%u",
+      conn->data->handle, conn->id);
+
+  if (!gst_d3d11_ipc_pkt_build_have_data (conn->server_msg, conn->data->pts,
+          conn->data->layout, conn->data->handle, caps)) {
+    GST_ERROR_OBJECT (self, "Couldn't build HAVE-DATA pkt, conn-id: %u",
+        conn->id);
+    gst_d3d11_ipc_server_close_connection (self, conn);
+    return;
+  }
+
+  conn->type = GstD3D11IpcPktType::HAVE_DATA;
+  gst_d3d11_ipc_server_send_msg (self, conn);
+}
+
+static bool
+gst_d3d11_ipc_server_on_release_data (GstD3D11IpcServer * self,
+    GstD3D11IpcServerConn * conn)
+{
+  bool found = false;
+  HANDLE handle = nullptr;
+
+  if (!gst_d3d11_ipc_pkt_parse_release_data (conn->client_msg, handle)) {
+    GST_ERROR_OBJECT (self, "Couldn't parse RELEASE-DATA, conn-id: %u",
+        conn->id);
+    return false;
+  }
+
+  GST_LOG_OBJECT (self, "RELEASE-DATA \"%p\", conn-id: %u", handle, conn->id);
+
+  for (auto it = conn->peer_handles.begin (); it != conn->peer_handles.end ();
+      it++) {
+    auto other = (*it)->handle;
+    if (handle == other) {
+      found = true;
+      conn->peer_handles.erase (it);
+      break;
+    }
+  }
+
+  if (!found) {
+    GST_WARNING_OBJECT (self,
+        "Unexpected name to remove, conn-id: %u", conn->id);
+    return false;
+  }
+
+  GST_LOG_OBJECT (self, "Client is holding %" G_GSIZE_FORMAT " handles",
+      conn->peer_handles.size ());
+
+  return true;
+}
+
+static void
+gst_d3d11_ipc_server_wait_msg_finish (GstD3D11IpcServer * server,
+    GstD3D11IpcServerConn * conn)
+{
+  GstD3D11IpcPacketHeader header;
+
+  if (!gst_d3d11_ipc_pkt_identify (conn->client_msg, header)) {
+    GST_ERROR_OBJECT (server, "Broken header, conn-id: %u", conn->id);
+    gst_d3d11_ipc_server_close_connection (server, conn);
+    return;
+  }
+
+  switch (header.type) {
+    case GstD3D11IpcPktType::NEED_DATA:
+      GST_LOG_OBJECT (server, "NEED-DATA, conn-id: %u", conn->id);
+      if (!conn->data) {
+        GST_LOG_OBJECT (server, "Wait for available data, conn-id: %u",
+            conn->id);
+        conn->pending_have_data = true;
+        gst_d3d11_ipc_server_on_idle (server);
+        return;
+      }
+      gst_d3d11_ipc_server_have_data (server, conn);
+      break;
+    case GstD3D11IpcPktType::READ_DONE:
+      GST_LOG_OBJECT (server, "READ-DONE, conn-id: %u", conn->id);
+
+      if (!conn->data) {
+        GST_ERROR_OBJECT (server, "Unexpected READ-DATA, conn-id: %u",
+            conn->id);
+        gst_d3d11_ipc_server_close_connection (server, conn);
+        return;
+      }
+
+      conn->peer_handles.push_back (conn->data);
+      conn->data = nullptr;
+      gst_d3d11_ipc_server_wait_msg (server, conn);
+      break;
+    case GstD3D11IpcPktType::RELEASE_DATA:
+      GST_LOG_OBJECT (server, "RELEASE-DATA, conn-id: %u", conn->id);
+      if (!gst_d3d11_ipc_server_on_release_data (server, conn))
+        gst_d3d11_ipc_server_close_connection (server, conn);
+      else
+        gst_d3d11_ipc_server_wait_msg (server, conn);
+      break;
+    case GstD3D11IpcPktType::FIN:
+      GST_DEBUG_OBJECT (server, "FIN, conn-id %u", conn->id);
+      gst_d3d11_ipc_server_close_connection (server, conn);
+      break;
+    default:
+      GST_ERROR_OBJECT (server, "Unexpected packet, conn-id: %u", conn->id);
+      gst_d3d11_ipc_server_close_connection (server, conn);
+      break;
+  }
+}
+
+static void WINAPI
+gst_d3d11_ipc_server_payload_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstD3D11IpcServerConn *conn =
+      static_cast < GstD3D11IpcServerConn * >(overlap);
+  GstD3D11IpcServer *self = conn->server;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_d3d11_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (self, "ReadFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    gst_d3d11_ipc_server_close_connection (self, conn);
+    return;
+  }
+
+  gst_d3d11_ipc_server_wait_msg_finish (self, conn);
+}
+
+static void WINAPI
+gst_d3d11_ipc_server_wait_msg_header_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstD3D11IpcServerConn *conn =
+      static_cast < GstD3D11IpcServerConn * >(overlap);
+  GstD3D11IpcServer *self = conn->server;
+  GstD3D11IpcPacketHeader header;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_d3d11_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (self, "ReadFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    gst_d3d11_ipc_server_close_connection (self, conn);
+    return;
+  }
+
+  if (!gst_d3d11_ipc_pkt_identify (conn->client_msg, header)) {
+    GST_ERROR_OBJECT (self, "Broken header");
+    gst_d3d11_ipc_server_close_connection (self, conn);
+    return;
+  }
+
+  if (header.payload_size == 0) {
+    gst_d3d11_ipc_server_wait_msg_finish (conn->server, conn);
+    return;
+  }
+
+  GST_LOG_OBJECT (self, "Reading payload");
+
+  if (!ReadFileEx (conn->pipe, &conn->client_msg0 +
+          GST_D3D11_IPC_PKT_HEADER_SIZE, header.payload_size, conn,
+          gst_d3d11_ipc_server_payload_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (self, "ReadFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    gst_d3d11_ipc_server_close_connection (self, conn);
+  }
+}
+
+static void
+gst_d3d11_ipc_server_wait_msg (GstD3D11IpcServer * self,
+    GstD3D11IpcServerConn * conn)
+{
+  if (!ReadFileEx (conn->pipe, &conn->client_msg0,
+          GST_D3D11_IPC_PKT_HEADER_SIZE, conn,
+          gst_d3d11_ipc_server_wait_msg_header_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (self, "ReadFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    gst_d3d11_ipc_server_close_connection (self, conn);
+  }
+}
+
+static void
+gst_d3d11_ipc_server_eos (GstD3D11IpcServer * self,
+    GstD3D11IpcServerConn * conn)
+{
+  gst_d3d11_ipc_pkt_build_eos (conn->server_msg);
+  conn->eos = true;
+  conn->type = GstD3D11IpcPktType::EOS;
+
+  gst_d3d11_ipc_server_send_msg (self, conn);
+}
+
+static void
+gst_d3d11_ipc_server_config_data (GstD3D11IpcServer * self,
+    GstD3D11IpcServerConn * conn)
+{
+  GstD3D11IpcServerPrivate *priv = self->priv;
+  GstCaps *caps = gst_sample_get_caps (conn->data->sample);
+
+  gst_caps_replace (&conn->caps, caps);
+
+  gst_d3d11_ipc_pkt_build_config (conn->server_msg,
+      priv->pid, priv->adapter_luid, conn->caps);
+  conn->type = GstD3D11IpcPktType::CONFIG;
+
+  GST_LOG_OBJECT (self, "Sending CONFIG, conn-id %u", conn->id);
+  gst_d3d11_ipc_server_send_msg (self, conn);
+}
+
+static void
+gst_d3d11_ipc_server_on_idle (GstD3D11IpcServer * self)
+{
+  GstD3D11IpcServerPrivate *priv = self->priv;
+
+  GST_LOG_OBJECT (self, "idle");
+
+  if (priv->shutdown) {
+    GST_DEBUG_OBJECT (self, "We are stopping");
+
+    if (priv->conn_map.empty ()) {
+      GST_DEBUG_OBJECT (self, "All connections were closed");
+      SetEvent (priv->cancellable);
+      return;
+    }
+
+    std::vector < std::shared_ptr < GstD3D11IpcServerConn >> to_send_eos;
+    /* *INDENT-OFF* */
+    for (auto it : priv->conn_map) {
+      auto conn = it.second;
+      if (conn->eos || !conn->pending_have_data)
+        continue;
+
+      to_send_eos.push_back (conn);
+    }
+
+    for (auto it : to_send_eos) {
+      GST_DEBUG_OBJECT (self, "Sending EOS to conn-id: %u", it->id);
+      gst_d3d11_ipc_server_eos (self, it.get ());
+    }
+
+    GST_DEBUG_OBJECT (self, "Have %" G_GSIZE_FORMAT " alive connections",
+        priv->conn_map.size());
+
+    size_t num_closed = 0;
+    for (auto it : priv->conn_map) {
+      auto conn = it.second;
+      GST_DEBUG_OBJECT (self, "conn-id %u"
+          " peer handle size %" G_GSIZE_FORMAT, conn->id,
+          conn->peer_handles.size ());
+
+      /* Cannot erase conn since it's still referenced.
+       * Manually close connection */
+      if (conn->peer_handles.empty ()) {
+        if (conn->pipe != INVALID_HANDLE_VALUE) {
+          CancelIo (conn->pipe);
+          DisconnectNamedPipe (conn->pipe);
+          CloseHandle (conn->pipe);
+          conn->pipe = INVALID_HANDLE_VALUE;
+        }
+
+        num_closed++;
+      }
+    }
+    /* *INDENT-ON* */
+
+    if (priv->conn_map.size () == num_closed) {
+      GST_DEBUG_OBJECT (self, "All connections were closed");
+      SetEvent (priv->cancellable);
+    }
+
+    return;
+  }
+
+  if (priv->conn_map.empty ()) {
+    GST_LOG_OBJECT (self, "Have no connection");
+    return;
+  }
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  if (!priv->data)
+    return;
+
+  /* *INDENT-OFF* */
+  std::vector < std::shared_ptr < GstD3D11IpcServerConn >> to_config_data;
+  std::vector < std::shared_ptr < GstD3D11IpcServerConn >> to_send_have_data;
+  for (auto it : priv->conn_map) {
+    auto conn = it.second;
+    if (!conn->configured) {
+      conn->configured = true;
+      conn->data = priv->data;
+      to_config_data.push_back (conn);
+    } else if (conn->pending_have_data && conn->seq_num <= priv->data->seq_num) {
+      conn->data = priv->data;
+      to_send_have_data.push_back (conn);
+    }
+  }
+  lk.unlock ();
+
+  for (auto it: to_config_data)
+    gst_d3d11_ipc_server_config_data (self, it.get ());
+
+  for (auto it: to_send_have_data)
+    gst_d3d11_ipc_server_have_data (self, it.get ());
+  /* *INDENT-ON* */
+}
+
+static void WINAPI
+gst_d3d11_ipc_server_send_msg_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstD3D11IpcServerConn *conn =
+      static_cast < GstD3D11IpcServerConn * >(overlap);
+  GstD3D11IpcServer *self = conn->server;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_d3d11_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (self, "ReadFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    gst_d3d11_ipc_server_close_connection (self, conn);
+    return;
+  }
+
+  GST_LOG_OBJECT (self, "Sent message");
+
+  switch (conn->type) {
+    case GstD3D11IpcPktType::CONFIG:
+      GST_DEBUG_OBJECT (self, "Sent CONFIG-DATA, conn-id %u", conn->id);
+      gst_d3d11_ipc_server_wait_msg (self, conn);
+      break;
+    case GstD3D11IpcPktType::HAVE_DATA:
+      GST_LOG_OBJECT (self, "Sent HAVE-DATA, conn-id %u", conn->id);
+      gst_d3d11_ipc_server_wait_msg (self, conn);
+      break;
+    case GstD3D11IpcPktType::EOS:
+      GST_DEBUG_OBJECT (self, "Sent EOS, conn-id %u", conn->id);
+      gst_d3d11_ipc_server_wait_msg (self, conn);
+      break;
+    default:
+      GST_ERROR_OBJECT (self, "Unexpected msg type");
+      gst_d3d11_ipc_server_close_connection (self, conn);
+      break;
+  }
+}
+
+static void
+gst_d3d11_ipc_server_send_msg (GstD3D11IpcServer * self,
+    GstD3D11IpcServerConn * conn)
+{
+  GST_LOG_OBJECT (self, "Sending message");
+
+  if (!WriteFileEx (conn->pipe, &conn->server_msg0,
+          conn->server_msg.size (), conn,
+          gst_d3d11_ipc_server_send_msg_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (self, "WriteFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    gst_d3d11_ipc_server_close_connection (self, conn);
+  }
+}
+
+static void
+gst_d3d11_ipc_server_on_incoming_connection (GstD3D11IpcServer * self,
+    std::shared_ptr < GstD3D11IpcServerConn > conn)
+{
+  GstD3D11IpcServerPrivate *priv = self->priv;
+
+  priv->lock.lock ();
+  conn->server = self;
+  conn->id = priv->next_conn_id;
+  conn->data = priv->data;
+  priv->next_conn_id++;
+  priv->lock.unlock ();
+
+  GST_DEBUG_OBJECT (self, "New connection, conn-id: %u", conn->id);
+
+  /* *INDENT-OFF* */
+  priv->conn_map.insert ({conn->id, conn});
+  /* *INDENT-ON* */
+
+  if (conn->data) {
+    conn->configured = true;
+    gst_d3d11_ipc_server_config_data (self, conn.get ());
+  } else {
+    GST_DEBUG_OBJECT (self, "Have no config data yet, waiting for data");
+  }
+}
+
+static gpointer
+gst_d3d11_ipc_server_loop_thread_func (GstD3D11IpcServer * self)
+{
+  GstD3D11IpcServerPrivate *priv = self->priv;
+  bool io_pending = false;
+  guint wait_ret;
+  HANDLE pipe;
+  OVERLAPPED overlap;
+  HANDLE waitables3;
+
+  GST_DEBUG_OBJECT (self, "Entering loop");
+
+  memset (&overlap, 0, sizeof (OVERLAPPED));
+
+  overlap.hEvent = CreateEvent (nullptr, TRUE, TRUE, nullptr);
+  pipe = gst_cuda_ipc_server_win32_create_pipe (self, &overlap, io_pending);
+  if (pipe == INVALID_HANDLE_VALUE) {
+    CloseHandle (overlap.hEvent);
+    priv->aborted = true;
+    goto out;
+  }
+
+  waitables0 = overlap.hEvent;
+  waitables1 = priv->wakeup_event;
+  waitables2 = priv->cancellable;
+
+  do {
+    wait_ret = WaitForMultipleObjectsEx (G_N_ELEMENTS (waitables), waitables,
+        FALSE, INFINITE, TRUE);
+
+    if (wait_ret == WAIT_OBJECT_0 + 2) {
+      GST_DEBUG_OBJECT (self, "Operation cancelled");
+      goto out;
+    }
+
+    switch (wait_ret) {
+      case WAIT_OBJECT_0:
+      {
+        DWORD n_bytes;
+
+        if (io_pending
+            && !GetOverlappedResult (pipe, &overlap, &n_bytes, FALSE)) {
+          guint last_err = GetLastError ();
+          auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+          GST_WARNING_OBJECT (self, "GetOverlappedResult failed with 0x%x (%s)",
+              last_err, err.c_str ());
+          CloseHandle (pipe);
+          pipe = INVALID_HANDLE_VALUE;
+          break;
+        }
+
+        auto conn = std::make_shared < GstD3D11IpcServerConn > (pipe);
+        conn->server = self;
+        pipe = INVALID_HANDLE_VALUE;
+        gst_d3d11_ipc_server_on_incoming_connection (self, conn);
+
+        pipe = gst_cuda_ipc_server_win32_create_pipe (self,
+            &overlap, io_pending);
+        break;
+      }
+      case WAIT_IO_COMPLETION:
+        break;
+      case WAIT_OBJECT_0 + 1:
+        gst_d3d11_ipc_server_on_idle (self);
+        break;
+      default:
+      {
+        guint last_err = GetLastError ();
+        auto err = gst_d3d11_ipc_win32_error_to_string (last_err);
+        GST_ERROR_OBJECT (self,
+            "WaitForMultipleObjectsEx return 0x%x, last error 0x%x (%s)",
+            wait_ret, last_err, err.c_str ());
+        priv->aborted = true;
+        goto out;
+      }
+    }
+  } while (true);
+
+out:
+  if (pipe != INVALID_HANDLE_VALUE) {
+    CancelIo (pipe);
+    DisconnectNamedPipe (pipe);
+    CloseHandle (pipe);
+  }
+
+  CloseHandle (overlap.hEvent);
+
+  priv->conn_map.clear ();
+
+  GST_DEBUG_OBJECT (self, "Exit loop thread");
+
+  return nullptr;
+}
+
+GstFlowReturn
+gst_d3d11_ipc_server_send_data (GstD3D11IpcServer * server, GstSample * sample,
+    const GstD3D11IpcMemLayout & layout, HANDLE handle, GstClockTime pts)
+{
+  GstD3D11IpcServerPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_D3D11_IPC_SERVER (server), GST_FLOW_ERROR);
+  g_return_val_if_fail (GST_IS_SAMPLE (sample), GST_FLOW_ERROR);
+
+  priv = server->priv;
+
+  GST_LOG_OBJECT (server, "Sending data");
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  if (priv->aborted) {
+    GST_DEBUG_OBJECT (server, "Was aborted");
+    return GST_FLOW_ERROR;
+  }
+
+  auto data = std::make_shared < GstD3D11IpcServerData > ();
+  data->sample = gst_sample_ref (sample);
+  data->handle = handle;
+  data->layout = layout;
+  data->pts = pts;
+  data->seq_num = priv->seq_num;
+
+  priv->seq_num++;
+  priv->data = data;
+  lk.unlock ();
+
+  SetEvent (priv->wakeup_event);
+
+  return GST_FLOW_OK;
+}
+
+void
+gst_d3d11_ipc_server_stop (GstD3D11IpcServer * server)
+{
+  GstD3D11IpcServerPrivate *priv;
+
+  g_return_if_fail (GST_IS_D3D11_IPC_SERVER (server));
+
+  priv = server->priv;
+
+  GST_DEBUG_OBJECT (server, "Stopping");
+  priv->shutdown = true;
+  SetEvent (priv->wakeup_event);
+
+  g_clear_pointer (&priv->loop_thread, g_thread_join);
+
+  GST_DEBUG_OBJECT (server, "Stopped");
+}
+
+GstD3D11IpcServer *
+gst_d3d11_ipc_server_new (const std::string & address, gint64 adapter_luid)
+{
+  GstD3D11IpcServer *self;
+  GstD3D11IpcServerPrivate *priv;
+
+  self = (GstD3D11IpcServer *)
+      g_object_new (GST_TYPE_D3D11_IPC_SERVER, nullptr);
+  gst_object_ref_sink (self);
+
+  priv = self->priv;
+  priv->address = address;
+  priv->adapter_luid = adapter_luid;
+
+  priv->loop_thread = g_thread_new ("d3d11-ipc-server",
+      (GThreadFunc) gst_d3d11_ipc_server_loop_thread_func, self);
+
+  return self;
+}
+
+gint64
+gst_d3d11_ipc_server_get_adapter_luid (GstD3D11IpcServer * server)
+{
+  g_return_val_if_fail (GST_IS_D3D11_IPC_SERVER (server), 0);
+
+  return server->priv->adapter_luid;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11ipcserver.h Added

@@ -0,0 +1,45 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/d3d11/gstd3d11.h>
+#include "gstd3d11ipc.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D11_IPC_SERVER (gst_d3d11_ipc_server_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D11IpcServer, gst_d3d11_ipc_server,
+    GST, D3D11_IPC_SERVER, GstObject);
+
+GstD3D11IpcServer * gst_d3d11_ipc_server_new (const std::string & address,
+                                              gint64 adapter_luid);
+
+GstFlowReturn       gst_d3d11_ipc_server_send_data (GstD3D11IpcServer * server,
+                                                    GstSample * sample,
+                                                    const GstD3D11IpcMemLayout & layout,
+                                                    HANDLE handle,
+                                                    GstClockTime pts);
+
+void                gst_d3d11_ipc_server_stop      (GstD3D11IpcServer * server);
+
+gint64              gst_d3d11_ipc_server_get_adapter_luid (GstD3D11IpcServer * server);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11ipcsink.cpp Added

@@ -0,0 +1,754 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d11ipcsink
+ * @title: d3d11ipcsink
+ * @short_description: Direct3D11 Inter Process Communication (IPC) sink
+ *
+ * d3d11ipcsink exports Direct3D11 texture for connected d3d11ipcsrc elements
+ * to be able to import it
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 videotestsrc ! d3d11upload ! d3d11ipcsink
+ * ```
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d11ipcsink.h"
+#include "gstd3d11ipcserver.h"
+#include "gstd3d11pluginutils.h"
+#include <mutex>
+#include <string>
+#include <vector>
+#include <wrl.h>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d11_ipc_sink_debug);
+#define GST_CAT_DEFAULT gst_d3d11_ipc_sink_debug
+
+static GstStaticCaps pad_template_caps =
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+    (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, GST_D3D11_IPC_FORMATS) "; "
+    GST_VIDEO_CAPS_MAKE (GST_D3D11_IPC_FORMATS));
+
+enum
+{
+  PROP_0,
+  PROP_ADAPTER,
+  PROP_PIPE_NAME,
+  PROP_MIN_BUFFER_SIZE,
+};
+
+#define DEFAULT_ADAPTER -1
+#define DEFAULT_PIPE_NAME "\\\\.\\pipe\\gst.d3d11.ipc"
+#define DEFAULT_MIN_BUFFER_SIZE 0
+
+/* *INDENT-OFF* */
+struct GstD3D11IpcSinkPrivate
+{
+  GstD3D11Device *device = nullptr;
+
+  GstBufferPool *fallback_pool = nullptr;
+  GstVideoInfo info;
+
+  GstD3D11IpcServer *server = nullptr;
+  GstCaps *caps = nullptr;
+  GstSample *prepared_sample = nullptr;
+  HANDLE prepared_handle = nullptr;
+  GstD3D11IpcMemLayout layout;
+
+  std::mutex lock;
+
+  /* properties */
+  gint adapter = DEFAULT_ADAPTER;
+  std::string pipe_name = DEFAULT_PIPE_NAME;
+  guint buffer_size = DEFAULT_MIN_BUFFER_SIZE;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D11IpcSink
+{
+  GstBaseSink parent;
+
+  GstD3D11IpcSinkPrivate *priv;
+};
+
+static void gst_d3d11_ipc_sink_finalize (GObject * object);
+static void gst_d3d11_ipc_sink_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_win32_video_sink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static GstClock *gst_d3d11_ipc_sink_provide_clock (GstElement * elem);
+static void gst_d3d11_ipc_sink_set_context (GstElement * elem,
+    GstContext * context);
+
+static gboolean gst_d3d11_ipc_sink_start (GstBaseSink * sink);
+static gboolean gst_d3d11_ipc_sink_stop (GstBaseSink * sink);
+static gboolean gst_d3d11_ipc_sink_set_caps (GstBaseSink * sink,
+    GstCaps * caps);
+static void gst_d3d11_ipc_sink_get_time (GstBaseSink * sink, GstBuffer * buf,
+    GstClockTime * start, GstClockTime * end);
+static gboolean gst_d3d11_ipc_sink_propose_allocation (GstBaseSink * sink,
+    GstQuery * query);
+static gboolean gst_d3d11_ipc_sink_query (GstBaseSink * sink, GstQuery * query);
+static GstFlowReturn gst_d3d11_ipc_sink_prepare (GstBaseSink * sink,
+    GstBuffer * buf);
+static GstFlowReturn gst_d3d11_ipc_sink_render (GstBaseSink * sink,
+    GstBuffer * buf);
+
+#define gst_d3d11_ipc_sink_parent_class parent_class
+G_DEFINE_TYPE (GstD3D11IpcSink, gst_d3d11_ipc_sink, GST_TYPE_BASE_SINK);
+
+static void
+gst_d3d11_ipc_sink_class_init (GstD3D11IpcSinkClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseSinkClass *sink_class = GST_BASE_SINK_CLASS (klass);
+  GstCaps *caps;
+
+  object_class->finalize = gst_d3d11_ipc_sink_finalize;
+  object_class->set_property = gst_d3d11_ipc_sink_set_property;
+  object_class->get_property = gst_win32_video_sink_get_property;
+
+  g_object_class_install_property (object_class, PROP_ADAPTER,
+      g_param_spec_int ("adapter", "Adapter",
+          "DXGI adapter index (-1 for default)",
+          -1, G_MAXINT32, DEFAULT_ADAPTER,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_PIPE_NAME,
+      g_param_spec_string ("pipe-name", "Pipe Name",
+          "The name of Win32 named pipe to communicate with clients. "
+          "Validation of the pipe name is caller's responsibility",
+          DEFAULT_PIPE_NAME, (GParamFlags) (G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS | GST_PARAM_MUTABLE_READY)));
+
+  g_object_class_install_property (object_class, PROP_MIN_BUFFER_SIZE,
+      g_param_spec_uint ("min-buffer-size", "Min Buffer Size",
+          "Minumum number of buffers", 0, G_MAXUINT, DEFAULT_MIN_BUFFER_SIZE,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  gst_element_class_set_static_metadata (element_class,
+      "Direct3D11 IPC Sink", "Sink/Video",
+      "Sends Direct3D11 shared handle to peer d3d11ipcsrc elements",
+      "Seungha Yang <seungha@centricular.com>");
+
+  caps = gst_d3d11_get_updated_template_caps (&pad_template_caps);
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, caps));
+  gst_caps_unref (caps);
+
+  element_class->provide_clock =
+      GST_DEBUG_FUNCPTR (gst_d3d11_ipc_sink_provide_clock);
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d11_ipc_sink_set_context);
+
+  sink_class->start = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_sink_start);
+  sink_class->stop = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_sink_stop);
+  sink_class->set_caps = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_sink_set_caps);
+  sink_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d11_ipc_sink_propose_allocation);
+  sink_class->query = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_sink_query);
+  sink_class->get_times = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_sink_get_time);
+  sink_class->prepare = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_sink_prepare);
+  sink_class->render = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_sink_render);
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d11_ipc_sink_debug, "d3d11ipcsink",
+      0, "d3d11ipcsink");
+}
+
+static void
+gst_d3d11_ipc_sink_init (GstD3D11IpcSink * self)
+{
+  self->priv = new GstD3D11IpcSinkPrivate ();
+
+  GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_PROVIDE_CLOCK);
+  GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_REQUIRE_CLOCK);
+}
+
+static void
+gst_d3d11_ipc_sink_finalize (GObject * object)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d11_ipc_sink_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (object);
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_ADAPTER:
+      priv->adapter = g_value_get_int (value);
+      break;
+    case PROP_PIPE_NAME:
+    {
+      const gchar *pipe_name = g_value_get_string (value);
+      priv->pipe_name.clear ();
+
+      if (pipe_name)
+        priv->pipe_name = pipe_name;
+      else
+        priv->pipe_name = DEFAULT_PIPE_NAME;
+      break;
+    }
+    case PROP_MIN_BUFFER_SIZE:
+      priv->buffer_size = g_value_get_uint (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_win32_video_sink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (object);
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_ADAPTER:
+      g_value_set_int (value, priv->adapter);
+      break;
+    case PROP_PIPE_NAME:
+      g_value_set_string (value, priv->pipe_name.c_str ());
+      break;
+    case PROP_MIN_BUFFER_SIZE:
+      g_value_set_uint (value, priv->buffer_size);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstClock *
+gst_d3d11_ipc_sink_provide_clock (GstElement * elem)
+{
+  return gst_system_clock_obtain ();
+}
+
+static void
+gst_d3d11_ipc_sink_set_context (GstElement * elem, GstContext * context)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (elem);
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+
+  gst_d3d11_handle_set_context (elem, context, priv->adapter, &priv->device);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (elem, context);
+}
+
+static gboolean
+gst_d3d11_ipc_sink_start (GstBaseSink * sink)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (sink);
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Start");
+
+  if (!gst_d3d11_ensure_element_data (GST_ELEMENT_CAST (self), priv->adapter,
+          &priv->device)) {
+    GST_ERROR_OBJECT (sink, "Cannot create d3d11device");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d11_ipc_sink_stop (GstBaseSink * sink)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (sink);
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  if (priv->server)
+    gst_d3d11_ipc_server_stop (priv->server);
+  gst_clear_object (&priv->server);
+
+  GST_DEBUG_OBJECT (self, "Server cleared");
+
+  if (priv->fallback_pool) {
+    gst_buffer_pool_set_active (priv->fallback_pool, FALSE);
+    gst_clear_object (&priv->fallback_pool);
+  }
+
+  gst_clear_sample (&priv->prepared_sample);
+  gst_clear_object (&priv->device);
+
+  return TRUE;
+}
+
+static void
+gst_d3d11_ipc_sink_get_time (GstBaseSink * sink, GstBuffer * buf,
+    GstClockTime * start, GstClockTime * end)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (sink);
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+  GstClockTime timestamp;
+
+  timestamp = GST_BUFFER_PTS (buf);
+  if (!GST_CLOCK_TIME_IS_VALID (timestamp))
+    timestamp = GST_BUFFER_DTS (buf);
+
+  if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
+    *start = timestamp;
+    if (GST_BUFFER_DURATION_IS_VALID (buf)) {
+      *end = timestamp + GST_BUFFER_DURATION (buf);
+    } else if (priv->info.fps_n > 0) {
+      *end = timestamp +
+          gst_util_uint64_scale_int (GST_SECOND, priv->info.fps_d,
+          priv->info.fps_n);
+    } else if (sink->segment.rate < 0) {
+      *end = timestamp;
+    }
+  }
+}
+
+static GstBufferPool *
+gst_d3d11_ipc_sink_create_pool (GstD3D11IpcSink * self,
+    const GstVideoInfo * info, GstCaps * caps, guint min_buffers)
+{
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+  GstStructure *config;
+  GstD3D11AllocationParams *params;
+  guint bind_flags = 0;
+  GstD3D11Format device_format;
+  GstBufferPool *pool;
+
+  if (!gst_d3d11_device_get_format (priv->device,
+          GST_VIDEO_INFO_FORMAT (info), &device_format)) {
+    GST_ERROR_OBJECT (self, "Couldn't get device format");
+    return nullptr;
+  }
+
+  if ((device_format.format_support0 &
+          (guint) D3D11_FORMAT_SUPPORT_SHADER_SAMPLE) != 0) {
+    bind_flags |= D3D11_BIND_SHADER_RESOURCE;
+  }
+
+  if ((device_format.format_support0 &
+          (guint) D3D11_FORMAT_SUPPORT_RENDER_TARGET) != 0) {
+    bind_flags |= D3D11_BIND_RENDER_TARGET;
+  }
+
+  pool = gst_d3d11_buffer_pool_new (priv->device);
+  config = gst_buffer_pool_get_config (pool);
+
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+  gst_buffer_pool_config_set_params (config, priv->caps,
+      GST_VIDEO_INFO_SIZE (info), min_buffers, 0);
+
+  params = gst_d3d11_allocation_params_new (priv->device, &priv->info,
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags,
+      D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX |
+      D3D11_RESOURCE_MISC_SHARED_NTHANDLE);
+
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_d3d11_allocation_params_free (params);
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (self, "Couldn't set pool config");
+    gst_object_unref (pool);
+    return nullptr;
+  }
+
+  return pool;
+}
+
+static gboolean
+gst_d3d11_ipc_sink_set_caps (GstBaseSink * sink, GstCaps * caps)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (sink);
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+  GstCaps *new_caps;
+  GstStructure *s;
+  const gchar *str;
+
+  GST_DEBUG_OBJECT (self, "New caps %" GST_PTR_FORMAT, caps);
+
+  if (!gst_video_info_from_caps (&priv->info, caps)) {
+    GST_ERROR_OBJECT (self, "Invalid caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+
+  if (priv->fallback_pool) {
+    gst_buffer_pool_set_active (priv->fallback_pool, FALSE);
+    gst_clear_object (&priv->fallback_pool);
+  }
+
+  s = gst_caps_get_structure (caps, 0);
+
+  /* Takes values we know it's always deserializable */
+  new_caps = gst_caps_new_empty_simple ("video/x-raw");
+  gst_caps_set_simple (new_caps, "format", G_TYPE_STRING,
+      gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&priv->info)),
+      "width", G_TYPE_INT, priv->info.width,
+      "height", G_TYPE_INT, priv->info.height,
+      "framerate", GST_TYPE_FRACTION, priv->info.fps_n, priv->info.fps_d,
+      "pixel-aspect-ratio", GST_TYPE_FRACTION, priv->info.par_n,
+      priv->info.par_d, nullptr);
+
+  str = gst_structure_get_string (s, "colorimetry");
+  if (str)
+    gst_caps_set_simple (new_caps, "colorimetry", G_TYPE_STRING, str, nullptr);
+
+  str = gst_structure_get_string (s, "mastering-display-info");
+  if (str) {
+    gst_caps_set_simple (new_caps, "mastering-display-info", G_TYPE_STRING,
+        str, nullptr);
+  }
+
+  str = gst_structure_get_string (s, "content-light-level");
+  if (str) {
+    gst_caps_set_simple (new_caps, "content-light-level", G_TYPE_STRING,
+        str, nullptr);
+  }
+
+  gst_caps_set_features_simple (new_caps,
+      gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, nullptr));
+
+  gst_clear_caps (&priv->caps);
+  priv->caps = new_caps;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d11_ipc_sink_propose_allocation (GstBaseSink * sink, GstQuery * query)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (sink);
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+  GstCaps *caps;
+  GstBufferPool *pool = nullptr;
+  GstVideoInfo info;
+  guint size;
+  gboolean need_pool;
+
+  gst_query_parse_allocation (query, &caps, &need_pool);
+  if (!caps) {
+    GST_WARNING_OBJECT (sink, "No caps specified");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_WARNING_OBJECT (sink, "Invalid caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+
+  /* the normal size of a frame */
+  size = info.size;
+  if (need_pool) {
+    GstCapsFeatures *features;
+    GstStructure *config;
+
+    features = gst_caps_get_features (caps, 0);
+    if (features
+        && gst_caps_features_contains (features,
+            GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY)) {
+      GST_DEBUG_OBJECT (self, "upstream support d3d11 memory");
+      pool = gst_d3d11_ipc_sink_create_pool (self, &info, caps,
+          priv->buffer_size);
+      if (!pool) {
+        GST_ERROR_OBJECT (self, "Couldn't create pool");
+        return FALSE;
+      }
+
+      config = gst_buffer_pool_get_config (pool);
+      gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr,
+          nullptr);
+      gst_structure_free (config);
+    } else {
+      pool = gst_video_buffer_pool_new ();
+      config = gst_buffer_pool_get_config (pool);
+      gst_buffer_pool_config_add_option (config,
+          GST_BUFFER_POOL_OPTION_VIDEO_META);
+      gst_buffer_pool_config_add_option (config,
+          GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+
+      gst_buffer_pool_config_set_params (config,
+          caps, size, priv->buffer_size, 0);
+
+      if (!gst_buffer_pool_set_config (pool, config)) {
+        GST_ERROR_OBJECT (pool, "Couldn't set config");
+        gst_object_unref (pool);
+
+        return FALSE;
+      }
+    }
+  }
+
+  gst_query_add_allocation_pool (query, pool, size, priv->buffer_size, 0);
+  gst_clear_object (&pool);
+
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d11_ipc_sink_query (GstBaseSink * sink, GstQuery * query)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (sink);
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      if (gst_d3d11_handle_context_query (GST_ELEMENT (self), query,
+              priv->device)) {
+        return TRUE;
+      }
+      break;
+    default:
+      break;
+  }
+
+  return GST_BASE_SINK_CLASS (parent_class)->query (sink, query);
+}
+
+static GstBuffer *
+gst_d3d11_ipc_upload (GstD3D11IpcSink * self, GstBuffer * buf)
+{
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+  GstBuffer *uploaded = nullptr;
+  GstFlowReturn ret;
+  GstMemory *mem;
+  const guint misc_flags = D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX |
+      D3D11_RESOURCE_MISC_SHARED_NTHANDLE;
+
+  mem = gst_buffer_peek_memory (buf, 0);
+  if (gst_is_d3d11_memory (mem)) {
+    GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
+    bool is_same_device = false;
+
+    if (dmem->device == priv->device) {
+      is_same_device = true;
+    } else {
+      gint64 adapter_luid;
+
+      g_object_get (dmem->device, "adapter-luid", &adapter_luid, nullptr);
+      if (adapter_luid == gst_d3d11_ipc_server_get_adapter_luid (priv->server))
+        is_same_device = true;
+    }
+
+    if (is_same_device) {
+      D3D11_TEXTURE2D_DESC desc;
+
+      gst_d3d11_memory_get_texture_desc (dmem, &desc);
+      if ((desc.MiscFlags & misc_flags) == misc_flags)
+        return gst_buffer_ref (buf);
+    }
+  }
+
+  if (!priv->fallback_pool) {
+    priv->fallback_pool = gst_d3d11_ipc_sink_create_pool (self, &priv->info,
+        priv->caps, 0);
+    if (!priv->fallback_pool) {
+      GST_ERROR_OBJECT (self, "Couldn't create fallback pool");
+      return nullptr;
+    }
+
+    if (!gst_buffer_pool_set_active (priv->fallback_pool, TRUE)) {
+      GST_ERROR_OBJECT (self, "Couldn't active pool");
+      gst_clear_object (&priv->fallback_pool);
+      return nullptr;
+    }
+  }
+
+  ret = gst_buffer_pool_acquire_buffer (priv->fallback_pool,
+      &uploaded, nullptr);
+  if (ret != GST_FLOW_OK) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire fallback buffer");
+    return nullptr;
+  }
+
+  if (!gst_d3d11_buffer_copy_into (uploaded, buf, &priv->info)) {
+    GST_ERROR_OBJECT (self, "Couldn't copy memory");
+    gst_buffer_unref (uploaded);
+    return nullptr;
+  }
+
+  return uploaded;
+}
+
+static gboolean
+gst_d3d11_ipc_sink_ensure_server (GstD3D11IpcSink * self, GstBuffer * buffer)
+{
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+  GstMemory *mem;
+  gint64 adapter_luid;
+
+  if (priv->server)
+    return TRUE;
+
+  g_object_get (priv->device, "adapter-luid", &adapter_luid, nullptr);
+
+  mem = gst_buffer_peek_memory (buffer, 0);
+  if (gst_is_d3d11_memory (mem)) {
+    GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
+    if (dmem->device != priv->device) {
+      g_object_get (dmem->device, "adapter-luid", &adapter_luid, nullptr);
+      gst_object_unref (priv->device);
+      priv->device = (GstD3D11Device *) gst_object_ref (dmem->device);
+    }
+  }
+
+  priv->server = gst_d3d11_ipc_server_new (priv->pipe_name, adapter_luid);
+  if (!priv->server) {
+    GST_ERROR_OBJECT (self, "Couldn't create server");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_d3d11_ipc_sink_prepare (GstBaseSink * sink, GstBuffer * buf)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (sink);
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+  GstBuffer *uploaded;
+  GstD3D11Memory *dmem;
+  GstVideoFrame frame;
+  HANDLE nt_handle = nullptr;
+
+  gst_clear_sample (&priv->prepared_sample);
+
+  if (!gst_d3d11_ipc_sink_ensure_server (self, buf))
+    return GST_FLOW_ERROR;
+
+  uploaded = gst_d3d11_ipc_upload (self, buf);
+  if (!uploaded) {
+    GST_ERROR_OBJECT (self, "Couldn't upload buffer");
+    return GST_FLOW_ERROR;
+  }
+
+  dmem = (GstD3D11Memory *) gst_buffer_peek_memory (uploaded, 0);
+
+  /* Upload staging to device memory */
+  if (!gst_video_frame_map (&frame, &priv->info, uploaded,
+          (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D11))) {
+    GST_ERROR_OBJECT (self, "Couldn't upload memory");
+    gst_buffer_unref (uploaded);
+    return GST_FLOW_ERROR;
+  }
+
+  priv->layout.size = dmem->mem.size;
+  priv->layout.pitch = frame.info.stride0;
+  for (guint i = 0; i < GST_VIDEO_FRAME_N_PLANES (&frame); i++)
+    priv->layout.offseti = frame.info.offseti;
+
+  gst_video_frame_unmap (&frame);
+
+  if (!gst_d3d11_memory_get_nt_handle (dmem, &nt_handle)) {
+    GST_ERROR_OBJECT (self, "Couldn't get NT handle");
+    gst_buffer_unref (uploaded);
+    return GST_FLOW_ERROR;
+  }
+
+  priv->prepared_sample = gst_sample_new (uploaded,
+      priv->caps, nullptr, nullptr);
+  priv->prepared_handle = nt_handle;
+
+  gst_buffer_unref (uploaded);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_d3d11_ipc_sink_render (GstBaseSink * sink, GstBuffer * buf)
+{
+  GstD3D11IpcSink *self = GST_D3D11_IPC_SINK (sink);
+  GstD3D11IpcSinkPrivate *priv = self->priv;
+  GstClockTime pts;
+  GstClockTime now_system;
+  GstClockTime buf_pts;
+  GstClockTime buffer_clock = GST_CLOCK_TIME_NONE;
+  GstFlowReturn ret;
+
+  if (!priv->prepared_sample) {
+    GST_ERROR_OBJECT (self, "Have no prepared sample");
+    return GST_FLOW_ERROR;
+  }
+
+  pts = now_system = gst_util_get_timestamp ();
+  buf_pts = GST_BUFFER_PTS (buf);
+  if (!GST_CLOCK_TIME_IS_VALID (buf_pts))
+    buf_pts = GST_BUFFER_DTS (buf);
+
+  if (GST_CLOCK_TIME_IS_VALID (buf_pts)) {
+    buffer_clock = gst_segment_to_running_time (&sink->segment,
+        GST_FORMAT_TIME, buf_pts) +
+        GST_ELEMENT_CAST (sink)->base_time + gst_base_sink_get_latency (sink);
+  }
+
+  if (GST_CLOCK_TIME_IS_VALID (buffer_clock)) {
+    GstClock *clock = gst_element_get_clock (GST_ELEMENT_CAST (sink));
+    if (!gst_d3d11_ipc_clock_is_system (clock)) {
+      GstClockTime now_gst = gst_clock_get_time (clock);
+      GstClockTimeDiff converted = buffer_clock;
+
+      converted -= now_gst;
+      converted += now_system;
+
+      if (converted < 0) {
+        /* Shouldn't happen */
+        GST_WARNING_OBJECT (self, "Negative buffer clock");
+        pts = 0;
+      } else {
+        pts = converted;
+      }
+    } else {
+      /* buffer clock is already system time */
+      pts = buffer_clock;
+    }
+    gst_object_unref (clock);
+  }
+
+  ret = gst_d3d11_ipc_server_send_data (priv->server, priv->prepared_sample,
+      priv->layout, priv->prepared_handle, pts);
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11ipcsink.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/base/gstbasesink.h>
+#include <gst/video/video.h>
+#include <gst/d3d11/gstd3d11.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D11_IPC_SINK (gst_d3d11_ipc_sink_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D11IpcSink, gst_d3d11_ipc_sink,
+    GST, D3D11_IPC_SINK, GstBaseSink);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11ipcsrc.cpp Added

@@ -0,0 +1,525 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d11ipcsrc
+ * @title: d3d11ipcsrc
+ * @short_description: Direct3D11 Inter Process Communication (IPC) src
+ *
+ * d3d11ipcsrc imports Direct3D11 texture exported by peer d3d11ipcsrc element
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 d3d11ipcsrc ! queue ! d3d11videosink
+ * ```
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d11ipcsrc.h"
+#include "gstd3d11ipcclient.h"
+#include "gstd3d11pluginutils.h"
+#include <mutex>
+#include <string>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d11_ipc_src_debug);
+#define GST_CAT_DEFAULT gst_d3d11_ipc_src_debug
+
+static GstStaticCaps pad_template_caps =
+GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+    (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, GST_D3D11_IPC_FORMATS));
+
+enum
+{
+  PROP_0,
+  PROP_PIPE_NAME,
+  PROP_PROCESSING_DEADLINE,
+  PROP_IO_MODE,
+  PROP_CONN_TIMEOUT,
+};
+
+#define DEFAULT_PIPE_NAME "\\\\.\\pipe\\gst.d3d11.ipc"
+#define DEFAULT_PROCESSING_DEADLINE (20 * GST_MSECOND)
+#define DEFAULT_IO_MODE GST_D3D11_IPC_IO_COPY
+#define DEFAULT_CONN_TIMEOUT 5
+
+/* *INDENT-OFF* */
+struct GstD3D11IpcSrcPrivate
+{
+  GstD3D11Device *device = nullptr;
+
+  GstD3D11IpcClient *client = nullptr;
+  GstCaps *caps = nullptr;
+
+  GstVideoInfo info;
+  std::mutex lock;
+  bool flushing = false;
+
+  /* properties */
+  std::string pipe_name = DEFAULT_PIPE_NAME;
+  GstClockTime processing_deadline = DEFAULT_PROCESSING_DEADLINE;
+  GstD3D11IpcIOMode io_mode = DEFAULT_IO_MODE;
+  guint conn_timeout = DEFAULT_CONN_TIMEOUT;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D11IpcSrc
+{
+  GstBaseSrc parent;
+
+  GstD3D11IpcSrcPrivate *priv;
+};
+
+static void gst_d3d11_ipc_src_finalize (GObject * object);
+static void gst_d3d11_ipc_src_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_win32_video_src_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static GstClock *gst_d3d11_ipc_src_provide_clock (GstElement * elem);
+static void gst_d3d11_ipc_src_set_context (GstElement * elem,
+    GstContext * context);
+
+static gboolean gst_d3d11_ipc_src_start (GstBaseSrc * src);
+static gboolean gst_d3d11_ipc_src_stop (GstBaseSrc * src);
+static gboolean gst_d3d11_ipc_src_unlock (GstBaseSrc * src);
+static gboolean gst_d3d11_ipc_src_unlock_stop (GstBaseSrc * src);
+static gboolean gst_d3d11_ipc_src_query (GstBaseSrc * src, GstQuery * query);
+static GstCaps *gst_d3d11_ipc_src_get_caps (GstBaseSrc * src, GstCaps * filter);
+static GstCaps *gst_d3d11_ipc_src_fixate (GstBaseSrc * src, GstCaps * caps);
+static GstFlowReturn gst_d3d11_ipc_src_create (GstBaseSrc * src, guint64 offset,
+    guint size, GstBuffer ** buf);
+
+#define gst_d3d11_ipc_src_parent_class parent_class
+G_DEFINE_TYPE (GstD3D11IpcSrc, gst_d3d11_ipc_src, GST_TYPE_BASE_SRC);
+
+static void
+gst_d3d11_ipc_src_class_init (GstD3D11IpcSrcClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseSrcClass *src_class = GST_BASE_SRC_CLASS (klass);
+  GstCaps *caps;
+
+  object_class->finalize = gst_d3d11_ipc_src_finalize;
+  object_class->set_property = gst_d3d11_ipc_src_set_property;
+  object_class->get_property = gst_win32_video_src_get_property;
+
+  g_object_class_install_property (object_class, PROP_PIPE_NAME,
+      g_param_spec_string ("pipe-name", "Pipe Name",
+          "The name of Win32 named pipe to communicate with clients. "
+          "Validation of the pipe name is caller's responsibility",
+          DEFAULT_PIPE_NAME, (GParamFlags) (G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS | GST_PARAM_MUTABLE_READY)));
+
+  g_object_class_install_property (object_class, PROP_PROCESSING_DEADLINE,
+      g_param_spec_uint64 ("processing-deadline", "Processing deadline",
+          "Maximum processing time for a buffer in nanoseconds", 0, G_MAXUINT64,
+          DEFAULT_PROCESSING_DEADLINE, (GParamFlags) (G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS | GST_PARAM_MUTABLE_PLAYING)));
+
+  g_object_class_install_property (object_class, PROP_IO_MODE,
+      g_param_spec_enum ("io-mode", "IO Mode", "Memory I/O mode to use",
+          GST_TYPE_D3D11_IPC_IO_MODE, DEFAULT_IO_MODE,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_CONN_TIMEOUT,
+      g_param_spec_uint ("connection-timeout", "Connection Timeout",
+          "Connection timeout in seconds (0 = never timeout)", 0, G_MAXINT,
+          DEFAULT_CONN_TIMEOUT,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  gst_element_class_set_static_metadata (element_class,
+      "Direct3D11 IPC Source", "Source/Video",
+      "Receives Direct3D11 shared handle from the d3d11ipcsink element",
+      "Seungha Yang <seungha@centricular.com>");
+
+  caps = gst_d3d11_get_updated_template_caps (&pad_template_caps);
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, caps));
+  gst_caps_unref (caps);
+
+  element_class->provide_clock =
+      GST_DEBUG_FUNCPTR (gst_d3d11_ipc_src_provide_clock);
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d11_ipc_src_set_context);
+
+  src_class->start = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_src_start);
+  src_class->stop = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_src_stop);
+  src_class->unlock = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_src_unlock);
+  src_class->unlock_stop = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_src_unlock_stop);
+  src_class->query = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_src_query);
+  src_class->get_caps = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_src_get_caps);
+  src_class->fixate = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_src_fixate);
+  src_class->create = GST_DEBUG_FUNCPTR (gst_d3d11_ipc_src_create);
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d11_ipc_src_debug, "d3d11ipcsrc",
+      0, "d3d11ipcsrc");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D11_IPC_IO_MODE,
+      (GstPluginAPIFlags) 0);
+}
+
+static void
+gst_d3d11_ipc_src_init (GstD3D11IpcSrc * self)
+{
+  gst_base_src_set_format (GST_BASE_SRC (self), GST_FORMAT_TIME);
+  gst_base_src_set_live (GST_BASE_SRC (self), TRUE);
+
+  self->priv = new GstD3D11IpcSrcPrivate ();
+
+  GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_PROVIDE_CLOCK);
+  GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_REQUIRE_CLOCK);
+}
+
+static void
+gst_d3d11_ipc_src_finalize (GObject * object)
+{
+  GstD3D11IpcSrc *self = GST_D3D11_IPC_SRC (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d11_ipc_src_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstD3D11IpcSrc *self = GST_D3D11_IPC_SRC (object);
+  GstD3D11IpcSrcPrivate *priv = self->priv;
+  std::unique_lock < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_PIPE_NAME:
+    {
+      const gchar *pipe_name = g_value_get_string (value);
+      priv->pipe_name.clear ();
+
+      if (pipe_name)
+        priv->pipe_name = pipe_name;
+      else
+        priv->pipe_name = DEFAULT_PIPE_NAME;
+      break;
+    }
+    case PROP_PROCESSING_DEADLINE:
+    {
+      GstClockTime prev_val, new_val;
+      prev_val = priv->processing_deadline;
+      new_val = g_value_get_uint64 (value);
+      priv->processing_deadline = new_val;
+
+      if (prev_val != new_val) {
+        lk.unlock ();
+        GST_DEBUG_OBJECT (self, "Posting latency message");
+        gst_element_post_message (GST_ELEMENT_CAST (self),
+            gst_message_new_latency (GST_OBJECT_CAST (self)));
+      }
+      break;
+    }
+    case PROP_IO_MODE:
+      priv->io_mode = (GstD3D11IpcIOMode) g_value_get_enum (value);
+      break;
+    case PROP_CONN_TIMEOUT:
+      priv->conn_timeout = g_value_get_uint (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_win32_video_src_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstD3D11IpcSrc *self = GST_D3D11_IPC_SRC (object);
+  GstD3D11IpcSrcPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_PIPE_NAME:
+      g_value_set_string (value, priv->pipe_name.c_str ());
+      break;
+    case PROP_PROCESSING_DEADLINE:
+      g_value_set_uint64 (value, priv->processing_deadline);
+      break;
+    case PROP_IO_MODE:
+      g_value_set_enum (value, priv->io_mode);
+      break;
+    case PROP_CONN_TIMEOUT:
+      g_value_set_uint (value, priv->conn_timeout);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstClock *
+gst_d3d11_ipc_src_provide_clock (GstElement * elem)
+{
+  return gst_system_clock_obtain ();
+}
+
+static void
+gst_d3d11_ipc_src_set_context (GstElement * elem, GstContext * context)
+{
+  GstD3D11IpcSrc *self = GST_D3D11_IPC_SRC (elem);
+  GstD3D11IpcSrcPrivate *priv = self->priv;
+
+  gst_d3d11_handle_set_context (elem, context, -1, &priv->device);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (elem, context);
+}
+
+static gboolean
+gst_d3d11_ipc_src_start (GstBaseSrc * src)
+{
+  GstD3D11IpcSrc *self = GST_D3D11_IPC_SRC (src);
+  GstD3D11IpcSrcPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Start");
+
+  if (!gst_d3d11_ensure_element_data (GST_ELEMENT_CAST (self),
+          -1, &priv->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't get D3D11 context");
+    return FALSE;
+  }
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->client = gst_d3d11_ipc_client_new (priv->pipe_name, priv->device,
+      priv->io_mode, priv->conn_timeout);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d11_ipc_src_stop (GstBaseSrc * src)
+{
+  GstD3D11IpcSrc *self = GST_D3D11_IPC_SRC (src);
+  GstD3D11IpcSrcPrivate *priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  if (priv->client)
+    gst_d3d11_ipc_client_stop (priv->client);
+
+  gst_clear_object (&priv->client);
+  gst_clear_object (&priv->device);
+  gst_clear_caps (&priv->caps);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d11_ipc_src_unlock (GstBaseSrc * src)
+{
+  GstD3D11IpcSrc *self = GST_D3D11_IPC_SRC (src);
+  GstD3D11IpcSrcPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Unlock");
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->flushing = true;
+  if (priv->client)
+    gst_d3d11_ipc_client_set_flushing (priv->client, true);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d11_ipc_src_unlock_stop (GstBaseSrc * src)
+{
+  GstD3D11IpcSrc *self = GST_D3D11_IPC_SRC (src);
+  GstD3D11IpcSrcPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Unlock stop");
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->flushing = false;
+  if (priv->client)
+    gst_d3d11_ipc_client_set_flushing (priv->client, false);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d11_ipc_src_query (GstBaseSrc * src, GstQuery * query)
+{
+  GstD3D11IpcSrc *self = GST_D3D11_IPC_SRC (src);
+  GstD3D11IpcSrcPrivate *priv = self->priv;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_LATENCY:
+    {
+      std::lock_guard < std::mutex > lk (priv->lock);
+      if (GST_CLOCK_TIME_IS_VALID (priv->processing_deadline)) {
+        gst_query_set_latency (query, TRUE, priv->processing_deadline,
+            GST_CLOCK_TIME_NONE);
+      } else {
+        gst_query_set_latency (query, TRUE, 0, 0);
+      }
+      return TRUE;
+    }
+    case GST_QUERY_CONTEXT:
+      if (gst_d3d11_handle_context_query (GST_ELEMENT (self), query,
+              priv->device)) {
+        return TRUE;
+      }
+      break;
+    default:
+      break;
+  }
+
+  return GST_BASE_SRC_CLASS (parent_class)->query (src, query);
+}
+
+static GstCaps *
+gst_d3d11_ipc_src_get_caps (GstBaseSrc * src, GstCaps * filter)
+{
+  GstD3D11IpcSrc *self = GST_D3D11_IPC_SRC (src);
+  GstD3D11IpcSrcPrivate *priv = self->priv;
+  GstD3D11IpcClient *client = nullptr;
+  GstCaps *caps = nullptr;
+
+  GST_DEBUG_OBJECT (self, "Get caps");
+
+  priv->lock.lock ();
+  if (priv->caps)
+    caps = gst_caps_ref (priv->caps);
+  else if (priv->client)
+    client = (GstD3D11IpcClient *) gst_object_ref (priv->client);
+  priv->lock.unlock ();
+
+  if (!caps && client)
+    caps = gst_d3d11_ipc_client_get_caps (priv->client);
+
+  if (!caps)
+    caps = gst_pad_get_pad_template_caps (GST_BASE_SRC_PAD (src));
+
+  if (filter) {
+    GstCaps *tmp = gst_caps_intersect_full (filter,
+        caps, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (caps);
+    caps = tmp;
+  }
+
+  gst_clear_object (&client);
+  GST_DEBUG_OBJECT (self, "Returning caps %" GST_PTR_FORMAT, caps);
+
+  return caps;
+}
+
+static GstCaps *
+gst_d3d11_ipc_src_fixate (GstBaseSrc * src, GstCaps * caps)
+{
+  /* We don't negotiate with server. In here, we do fixate resolution to
+   * 320 x 240 (same as default of videotestsrc) which makes a little more
+   * sense than 1x1 */
+  caps = gst_caps_make_writable (caps);
+
+  for (guint i = 0; i < gst_caps_get_size (caps); i++) {
+    GstStructure *s = gst_caps_get_structure (caps, i);
+
+    gst_structure_fixate_field_nearest_int (s, "width", 320);
+    gst_structure_fixate_field_nearest_int (s, "height", 240);
+  }
+
+  return gst_caps_fixate (caps);
+}
+
+static GstFlowReturn
+gst_d3d11_ipc_src_create (GstBaseSrc * src, guint64 offset, guint size,
+    GstBuffer ** buf)
+{
+  GstD3D11IpcSrc *self = GST_D3D11_IPC_SRC (src);
+  GstD3D11IpcSrcPrivate *priv = self->priv;
+  GstFlowReturn ret;
+  GstSample *sample = nullptr;
+  GstCaps *caps;
+  GstClock *clock;
+  bool is_system_clock = true;
+  GstClockTime pts;
+  GstClockTime base_time;
+  GstClockTime now_system;
+  GstClockTime now_gst;
+  GstClockTime remote_pts;
+  GstBuffer *buffer;
+
+  ret = gst_d3d11_ipc_client_run (priv->client);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  ret = gst_d3d11_ipc_client_get_sample (priv->client, &sample);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  now_system = gst_util_get_timestamp ();
+  clock = gst_element_get_clock (GST_ELEMENT_CAST (self));
+  now_gst = gst_clock_get_time (clock);
+  base_time = GST_ELEMENT_CAST (self)->base_time;
+  is_system_clock = gst_d3d11_ipc_clock_is_system (clock);
+  gst_object_unref (clock);
+
+  buffer = gst_sample_get_buffer (sample);
+  remote_pts = GST_BUFFER_PTS (buffer);
+
+  if (!is_system_clock) {
+    GstClockTimeDiff now_pts = now_gst - base_time + remote_pts - now_system;
+
+    if (now_pts >= 0)
+      pts = now_pts;
+    else
+      pts = 0;
+  } else {
+    if (remote_pts >= base_time) {
+      pts = remote_pts - base_time;
+    } else {
+      GST_WARNING_OBJECT (self,
+          "Remote clock is smaller than our base time, remote %"
+          GST_TIME_FORMAT ", base_time %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (remote_pts), GST_TIME_ARGS (base_time));
+      pts = 0;
+    }
+  }
+
+  GST_BUFFER_PTS (buffer) = pts;
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  caps = gst_sample_get_caps (sample);
+  if (!priv->caps || !gst_caps_is_equal (priv->caps, caps)) {
+    gst_caps_replace (&priv->caps, caps);
+    lk.unlock ();
+    gst_base_src_set_caps (src, priv->caps);
+  }
+
+  *buf = gst_buffer_ref (buffer);
+  gst_sample_unref (sample);
+
+  return GST_FLOW_OK;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11ipcsrc.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/base/gstbasesrc.h>
+#include <gst/video/video.h>
+#include <gst/d3d11/gstd3d11.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D11_IPC_SRC (gst_d3d11_ipc_src_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D11IpcSrc, gst_d3d11_ipc_src,
+    GST, D3D11_IPC_SRC, GstBaseSrc);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11mpeg2dec.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11mpeg2dec.cpp Changed

@@ -37,102 +37,13 @@
 #endif
 
 #include "gstd3d11mpeg2dec.h"
-
-#include <gst/codecs/gstmpeg2decoder.h>
-#include <string.h>
-#include <vector>
-
-/* HACK: to expose dxva data structure on UWP */
-#ifdef WINAPI_PARTITION_DESKTOP
-#undef WINAPI_PARTITION_DESKTOP
-#endif
-#define WINAPI_PARTITION_DESKTOP 1
-#include <d3d9.h>
-#include <dxva.h>
+#include <gst/dxva/gstdxvampeg2decoder.h>
 
 GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_mpeg2_dec_debug);
 #define GST_CAT_DEFAULT gst_d3d11_mpeg2_dec_debug
 
-/* *INDENT-OFF* */
-typedef struct _GstD3D11Mpeg2DecInner
-{
-  GstD3D11Device *device = nullptr;
-  GstD3D11Decoder *d3d11_decoder = nullptr;
-
-  DXVA_PictureParameters pic_params;
-  DXVA_QmatrixData iq_matrix;
-
-  std::vector<DXVA_SliceInfo> slice_list;
-  std::vector<guint8> bitstream_buffer;
-
-  gboolean submit_iq_data;
-
-  gint width = 0;
-  gint height = 0;
-  guint width_in_mb = 0;
-  guint height_in_mb = 0;
-  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
-  GstMpegVideoSequenceHdr seq;
-  GstMpegVideoProfile profile = GST_MPEG_VIDEO_PROFILE_MAIN;
-  gboolean interlaced = FALSE;
-} GstD3D11Mpeg2DecInner;
-/* *INDENT-ON* */
-
-typedef struct _GstD3D11Mpeg2Dec
-{
-  GstMpeg2Decoder parent;
-  GstD3D11Mpeg2DecInner *inner;
-} GstD3D11Mpeg2Dec;
-
-typedef struct _GstD3D11Mpeg2DecClass
-{
-  GstMpeg2DecoderClass parent_class;
-  GstD3D11DecoderSubClassData class_data;
-} GstD3D11Mpeg2DecClass;
-
-static GstElementClass *parent_class = NULL;
-
-#define GST_D3D11_MPEG2_DEC(object) ((GstD3D11Mpeg2Dec *) (object))
-#define GST_D3D11_MPEG2_DEC_GET_CLASS(object) \
-    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstD3D11Mpeg2DecClass))
-
-static void gst_d3d11_mpeg2_dec_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_d3d11_mpeg2_dec_finalize (GObject * object);
-static void gst_d3d11_mpeg2_dec_set_context (GstElement * element,
-    GstContext * context);
-
-static gboolean gst_d3d11_mpeg2_dec_open (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_mpeg2_dec_close (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_mpeg2_dec_negotiate (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_mpeg2_dec_decide_allocation (GstVideoDecoder *
-    decoder, GstQuery * query);
-static gboolean gst_d3d11_mpeg2_dec_src_query (GstVideoDecoder * decoder,
-    GstQuery * query);
-static gboolean gst_d3d11_mpeg2_dec_sink_event (GstVideoDecoder * decoder,
-    GstEvent * event);
-
-/* GstMpeg2Decoder */
-static GstFlowReturn gst_d3d11_mpeg2_dec_new_sequence (GstMpeg2Decoder *
-    decoder, const GstMpegVideoSequenceHdr * seq,
-    const GstMpegVideoSequenceExt * seq_ext,
-    const GstMpegVideoSequenceDisplayExt * seq_display_ext,
-    const GstMpegVideoSequenceScalableExt * seq_scalable_ext,
-    gint max_dpb_size);
-static GstFlowReturn gst_d3d11_mpeg2_dec_new_picture (GstMpeg2Decoder * decoder,
-    GstVideoCodecFrame * frame, GstMpeg2Picture * picture);
-static GstFlowReturn
-gst_d3d11_mpeg2_dec_new_field_picture (GstMpeg2Decoder * decoder,
-    GstMpeg2Picture * first_field, GstMpeg2Picture * second_field);
-static GstFlowReturn gst_d3d11_mpeg2_dec_start_picture (GstMpeg2Decoder *
-    decoder, GstMpeg2Picture * picture, GstMpeg2Slice * slice,
-    GstMpeg2Picture * prev_picture, GstMpeg2Picture * next_picture);
-static GstFlowReturn gst_d3d11_mpeg2_dec_decode_slice (GstMpeg2Decoder *
-    decoder, GstMpeg2Picture * picture, GstMpeg2Slice * slice);
-static GstFlowReturn gst_d3d11_mpeg2_dec_end_picture (GstMpeg2Decoder * decoder,
-    GstMpeg2Picture * picture);
-static GstFlowReturn gst_d3d11_mpeg2_dec_output_picture (GstMpeg2Decoder *
-    decoder, GstVideoCodecFrame * frame, GstMpeg2Picture * picture);
+GST_D3D11_DECODER_DEFINE_TYPE_FULL (GstD3D11Mpeg2Dec, gst_d3d11_mpeg2_dec,
+    GST, D3D11_MPEG2_DEC, GstDxvaMpeg2Decoder);
 
 static void
 gst_d3d11_mpeg2_dec_class_init (GstD3D11Mpeg2DecClass * klass, gpointer data)
@@ -140,11 +51,10 @@
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
-  GstMpeg2DecoderClass *mpeg2decoder_class = GST_MPEG2_DECODER_CLASS (klass);
+  GstDxvaMpeg2DecoderClass *dxva_class = GST_DXVA_MPEG2_DECODER_CLASS (klass);
   GstD3D11DecoderClassData *cdata = (GstD3D11DecoderClassData *) data;
 
   gobject_class->get_property = gst_d3d11_mpeg2_dec_get_property;
-  gobject_class->finalize = gst_d3d11_mpeg2_dec_finalize;
 
   element_class->set_context =
       GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_set_context);
@@ -167,30 +77,28 @@
   decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_negotiate);
   decoder_class->decide_allocation =
       GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_decide_allocation);
+  decoder_class->sink_query =
+      GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_sink_query);
   decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_src_query);
   decoder_class->sink_event =
       GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_sink_event);
 
-  mpeg2decoder_class->new_sequence =
-      GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_new_sequence);
-  mpeg2decoder_class->new_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_new_picture);
-  mpeg2decoder_class->new_field_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_new_field_picture);
-  mpeg2decoder_class->start_picture =
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_new_picture);
+  dxva_class->duplicate_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_duplicate_picture);
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_get_picture_id);
+  dxva_class->start_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_start_picture);
-  mpeg2decoder_class->decode_slice =
-      GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_decode_slice);
-  mpeg2decoder_class->end_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_end_picture);
-  mpeg2decoder_class->output_picture =
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_end_picture);
+  dxva_class->output_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_mpeg2_dec_output_picture);
 }
 
 static void
 gst_d3d11_mpeg2_dec_init (GstD3D11Mpeg2Dec * self)
 {
-  self->inner = new GstD3D11Mpeg2DecInner ();
 }
 
 static void
@@ -204,25 +112,14 @@
 }
 
 static void
-gst_d3d11_mpeg2_dec_finalize (GObject * object)
-{
-  GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (object);
-
-  delete self->inner;
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
 gst_d3d11_mpeg2_dec_set_context (GstElement * element, GstContext * context)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (element);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
   GstD3D11Mpeg2DecClass *klass = GST_D3D11_MPEG2_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
   gst_d3d11_handle_set_context_for_adapter_luid (element,
-      context, cdata->adapter_luid, &inner->device);
+      context, cdata->adapter_luid, &self->device);
 
   GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
 }
@@ -231,27 +128,20 @@
 gst_d3d11_mpeg2_dec_open (GstVideoDecoder * decoder)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
   GstD3D11Mpeg2DecClass *klass = GST_D3D11_MPEG2_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
-  if (!gst_d3d11_decoder_proxy_open (decoder,
-          cdata, &inner->device, &inner->d3d11_decoder)) {
-    GST_ERROR_OBJECT (self, "Failed to open decoder");
-    return FALSE;
-  }
-
-  return TRUE;
+  return gst_d3d11_decoder_proxy_open (decoder,
+      cdata, &self->device, &self->decoder);
 }
 
 static gboolean
 gst_d3d11_mpeg2_dec_close (GstVideoDecoder * decoder)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
 
-  gst_clear_object (&inner->d3d11_decoder);
-  gst_clear_object (&inner->device);
+  gst_clear_object (&self->decoder);
+  gst_clear_object (&self->device);
 
   return TRUE;
 }
@@ -260,9 +150,8 @@
 gst_d3d11_mpeg2_dec_negotiate (GstVideoDecoder * decoder)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_negotiate (inner->d3d11_decoder, decoder))
+  if (!gst_d3d11_decoder_negotiate (self->decoder, decoder))
     return FALSE;
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
@@ -273,27 +162,23 @@
     GstQuery * query)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_decide_allocation (inner->d3d11_decoder,
-          decoder, query)) {
+  if (!gst_d3d11_decoder_decide_allocation (self->decoder, decoder, query))
     return FALSE;
-  }
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
       (decoder, query);
 }
 
 static gboolean
-gst_d3d11_mpeg2_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+gst_d3d11_mpeg2_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
 
   switch (GST_QUERY_TYPE (query)) {
     case GST_QUERY_CONTEXT:
       if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
-              query, inner->device)) {
+              query, self->device)) {
         return TRUE;
       }
       break;
@@ -301,478 +186,108 @@
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
 }
 
 static gboolean
-gst_d3d11_mpeg2_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+gst_d3d11_mpeg2_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
 
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_FLUSH_START:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, TRUE);
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
+              query, self->device)) {
+        return TRUE;
+      }
       break;
-    case GST_EVENT_FLUSH_STOP:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, FALSE);
     default:
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
 }
 
-static GstFlowReturn
-gst_d3d11_mpeg2_dec_new_sequence (GstMpeg2Decoder * decoder,
-    const GstMpegVideoSequenceHdr * seq,
-    const GstMpegVideoSequenceExt * seq_ext,
-    const GstMpegVideoSequenceDisplayExt * seq_display_ext,
-    const GstMpegVideoSequenceScalableExt * seq_scalable_ext, gint max_dpb_size)
+static gboolean
+gst_d3d11_mpeg2_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
-  gboolean interlaced;
-  gboolean modified = FALSE;
-  gint width, height;
-  GstMpegVideoProfile mpeg_profile;
-
-  GST_LOG_OBJECT (self, "new sequence");
-
-  interlaced = seq_ext ? !seq_ext->progressive : FALSE;
-  if (inner->interlaced != interlaced) {
-    GST_INFO_OBJECT (self, "interlaced sequence change");
-    inner->interlaced = interlaced;
-    modified = TRUE;
-  }
-
-  width = seq->width;
-  height = seq->height;
-  if (seq_ext) {
-    width = (width & 0x0fff) | ((guint32) seq_ext->horiz_size_ext << 12);
-    height = (height & 0x0fff) | ((guint32) seq_ext->vert_size_ext << 12);
-  }
 
-  if (inner->width != width || inner->height != height) {
-    GST_INFO_OBJECT (self, "resolution change %dx%d -> %dx%d",
-        inner->width, inner->height, width, height);
-    inner->width = width;
-    inner->height = height;
-    inner->width_in_mb = GST_ROUND_UP_16 (width) >> 4;
-    inner->height_in_mb = GST_ROUND_UP_16 (height) >> 4;
-    modified = TRUE;
-  }
-
-  mpeg_profile = GST_MPEG_VIDEO_PROFILE_MAIN;
-  if (seq_ext)
-    mpeg_profile = (GstMpegVideoProfile) seq_ext->profile;
-
-  if (mpeg_profile != GST_MPEG_VIDEO_PROFILE_MAIN &&
-      mpeg_profile != GST_MPEG_VIDEO_PROFILE_SIMPLE) {
-    GST_ERROR_OBJECT (self, "Cannot support profile %d", mpeg_profile);
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
+  if (self->decoder)
+    gst_d3d11_decoder_sink_event (self->decoder, event);
 
-  if (inner->profile != mpeg_profile) {
-    GST_INFO_OBJECT (self, "Profile change %d -> %d",
-        inner->profile, mpeg_profile);
-    inner->profile = mpeg_profile;
-    modified = TRUE;
-  }
-
-  if (modified || !gst_d3d11_decoder_is_configured (inner->d3d11_decoder)) {
-    GstVideoInfo info;
-
-    /* FIXME: support I420 */
-    inner->out_format = GST_VIDEO_FORMAT_NV12;
-
-    gst_video_info_set_format (&info,
-        inner->out_format, inner->width, inner->height);
-    if (inner->interlaced)
-      GST_VIDEO_INFO_INTERLACE_MODE (&info) = GST_VIDEO_INTERLACE_MODE_MIXED;
-
-    if (!gst_d3d11_decoder_configure (inner->d3d11_decoder,
-            decoder->input_state, &info, 0, 0,
-            inner->width, inner->height, max_dpb_size)) {
-      GST_ERROR_OBJECT (self, "Failed to create decoder");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-
-    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
-      GST_WARNING_OBJECT (self, "Failed to negotiate with downstream");
-      return GST_FLOW_NOT_NEGOTIATED;
-    }
-  }
-
-  return GST_FLOW_OK;
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
 }
 
 static GstFlowReturn
-gst_d3d11_mpeg2_dec_new_picture (GstMpeg2Decoder * decoder,
-    GstVideoCodecFrame * frame, GstMpeg2Picture * picture)
+gst_d3d11_mpeg2_dec_configure (GstDxvaMpeg2Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-
-  view_buffer = gst_d3d11_decoder_get_output_view_buffer (inner->d3d11_decoder,
-      GST_VIDEO_DECODER (decoder));
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "No available output view buffer");
-    return GST_FLOW_ERROR;
-  }
-
-  GST_LOG_OBJECT (self, "New output view buffer %" GST_PTR_FORMAT, view_buffer);
 
-  gst_mpeg2_picture_set_user_data (picture,
-      view_buffer, (GDestroyNotify) gst_buffer_unref);
-
-  GST_LOG_OBJECT (self, "New MPEG2 picture %p", picture);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_configure (self->decoder, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
 }
 
 static GstFlowReturn
-gst_d3d11_mpeg2_dec_new_field_picture (GstMpeg2Decoder * decoder,
-    GstMpeg2Picture * first_field, GstMpeg2Picture * second_field)
+gst_d3d11_mpeg2_dec_new_picture (GstDxvaMpeg2Decoder * decoder,
+    GstCodecPicture * picture)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstBuffer *view_buffer;
-
-  view_buffer = (GstBuffer *)
-      gst_mpeg2_picture_get_user_data (first_field);
 
-  if (!view_buffer) {
-    GST_WARNING_OBJECT (self, "First picture does not have output view buffer");
-    return GST_FLOW_OK;
-  }
-
-  GST_LOG_OBJECT (self, "New field picture with buffer %" GST_PTR_FORMAT,
-      view_buffer);
-
-  gst_mpeg2_picture_set_user_data (second_field,
-      gst_buffer_ref (view_buffer), (GDestroyNotify) gst_buffer_unref);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_new_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture);
 }
 
-static ID3D11VideoDecoderOutputView *
-gst_d3d11_mpeg2_dec_get_output_view_from_picture (GstD3D11Mpeg2Dec * self,
-    GstMpeg2Picture * picture, guint8 * view_id)
-{
-  GstD3D11Mpeg2DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-  ID3D11VideoDecoderOutputView *view;
-
-  if (!picture)
-    return NULL;
-
-  view_buffer = (GstBuffer *) gst_mpeg2_picture_get_user_data (picture);
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view buffer");
-    return NULL;
-  }
-
-  view =
-      gst_d3d11_decoder_get_output_view_from_buffer (inner->d3d11_decoder,
-      view_buffer, view_id);
-  if (!view) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view handle");
-    return NULL;
-  }
-
-  return view;
-}
-
-static inline WORD
-_pack_f_codes (guint8 f_code22)
+static GstFlowReturn
+gst_d3d11_mpeg2_dec_duplicate_picture (GstDxvaMpeg2Decoder * decoder,
+    GstCodecPicture * src, GstCodecPicture * dst)
 {
-  return (((WORD) f_code00 << 12)
-      | ((WORD) f_code01 << 8)
-      | ((WORD) f_code10 << 4)
-      | (f_code11));
-}
+  GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
 
-static inline WORD
-_pack_pce_elements (GstMpeg2Slice * slice)
-{
-  return (((WORD) slice->pic_ext->intra_dc_precision << 14)
-      | ((WORD) slice->pic_ext->picture_structure << 12)
-      | ((WORD) slice->pic_ext->top_field_first << 11)
-      | ((WORD) slice->pic_ext->frame_pred_frame_dct << 10)
-      | ((WORD) slice->pic_ext->concealment_motion_vectors << 9)
-      | ((WORD) slice->pic_ext->q_scale_type << 8)
-      | ((WORD) slice->pic_ext->intra_vlc_format << 7)
-      | ((WORD) slice->pic_ext->alternate_scan << 6)
-      | ((WORD) slice->pic_ext->repeat_first_field << 5)
-      | ((WORD) slice->pic_ext->chroma_420_type << 4)
-      | ((WORD) slice->pic_ext->progressive_frame << 3));
+  return gst_d3d11_decoder_duplicate_picture (self->decoder, src, dst);
 }
 
-static GstFlowReturn
-gst_d3d11_mpeg2_dec_start_picture (GstMpeg2Decoder * decoder,
-    GstMpeg2Picture * picture, GstMpeg2Slice * slice,
-    GstMpeg2Picture * prev_picture, GstMpeg2Picture * next_picture)
+static guint8
+gst_d3d11_mpeg2_dec_get_picture_id (GstDxvaMpeg2Decoder * decoder,
+    GstCodecPicture * picture)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
-  DXVA_PictureParameters *pic_params = &inner->pic_params;
-  DXVA_QmatrixData *iq_matrix = &inner->iq_matrix;
-  ID3D11VideoDecoderOutputView *view;
-  ID3D11VideoDecoderOutputView *other_view;
-  guint8 view_id = 0xff;
-  guint8 other_view_id = 0xff;
-  gboolean is_field =
-      picture->structure != GST_MPEG_VIDEO_PICTURE_STRUCTURE_FRAME;
-
-  view = gst_d3d11_mpeg2_dec_get_output_view_from_picture (self, picture,
-      &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_ERROR;
-  }
-
-  memset (pic_params, 0, sizeof (DXVA_PictureParameters));
-  memset (iq_matrix, 0, sizeof (DXVA_QmatrixData));
-
-  /* Fill DXVA_PictureParameters */
-  pic_params->wDecodedPictureIndex = view_id;
-  pic_params->wForwardRefPictureIndex = 0xffff;
-  pic_params->wBackwardRefPictureIndex = 0xffff;
-
-  switch (picture->type) {
-    case GST_MPEG_VIDEO_PICTURE_TYPE_B:{
-      if (next_picture) {
-        other_view =
-            gst_d3d11_mpeg2_dec_get_output_view_from_picture (self,
-            next_picture, &other_view_id);
-        if (other_view)
-          pic_params->wBackwardRefPictureIndex = other_view_id;
-      }
-    }
-      /* fall-through */
-    case GST_MPEG_VIDEO_PICTURE_TYPE_P:{
-      if (prev_picture) {
-        other_view =
-            gst_d3d11_mpeg2_dec_get_output_view_from_picture (self,
-            prev_picture, &other_view_id);
-        if (other_view)
-          pic_params->wForwardRefPictureIndex = other_view_id;
-      }
-    }
-    default:
-      break;
-  }
-
-  pic_params->wPicWidthInMBminus1 = inner->width_in_mb - 1;
-  pic_params->wPicHeightInMBminus1 = (inner->height_in_mb >> is_field) - 1;
-  pic_params->bMacroblockWidthMinus1 = 15;
-  pic_params->bMacroblockHeightMinus1 = 15;
-  pic_params->bBlockWidthMinus1 = 7;
-  pic_params->bBlockHeightMinus1 = 7;
-  pic_params->bBPPminus1 = 7;
-  pic_params->bPicStructure = (BYTE) picture->structure;
-  if (picture->first_field && is_field) {
-    pic_params->bSecondField = TRUE;
-  }
-  pic_params->bPicIntra = picture->type == GST_MPEG_VIDEO_PICTURE_TYPE_I;
-  pic_params->bPicBackwardPrediction =
-      picture->type == GST_MPEG_VIDEO_PICTURE_TYPE_B;
-  /* FIXME: 1 -> 4:2:0, 2 -> 4:2:2, 3 -> 4:4:4 */
-  pic_params->bChromaFormat = 1;
-  pic_params->bPicScanFixed = 1;
-  pic_params->bPicScanMethod = slice->pic_ext->alternate_scan;
-  pic_params->wBitstreamFcodes = _pack_f_codes (slice->pic_ext->f_code);
-  pic_params->wBitstreamPCEelements = _pack_pce_elements (slice);
-
-  /* Fill DXVA_QmatrixData */
-  if (slice->quant_matrix &&
-      /* The value in bNewQmatrix0 and bNewQmatrix1 must not both be zero.
-       * https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/dxva/ns-dxva-_dxva_qmatrixdata
-       */
-      (slice->quant_matrix->load_intra_quantiser_matrix ||
-          slice->quant_matrix->load_non_intra_quantiser_matrix)) {
-    GstMpegVideoQuantMatrixExt *quant_matrix = slice->quant_matrix;
-
-    if (quant_matrix->load_intra_quantiser_matrix) {
-      iq_matrix->bNewQmatrix0 = 1;
-      for (guint i = 0; i < 64; i++) {
-        iq_matrix->Qmatrix0i = quant_matrix->intra_quantiser_matrixi;
-      }
-    }
-
-    if (quant_matrix->load_non_intra_quantiser_matrix) {
-      iq_matrix->bNewQmatrix1 = 1;
-      for (guint i = 0; i < 64; i++) {
-        iq_matrix->Qmatrix1i = quant_matrix->non_intra_quantiser_matrixi;
-      }
-    }
 
-    if (quant_matrix->load_chroma_intra_quantiser_matrix) {
-      iq_matrix->bNewQmatrix2 = 1;
-      for (guint i = 0; i < 64; i++) {
-        iq_matrix->Qmatrix2i =
-            quant_matrix->chroma_intra_quantiser_matrixi;
-      }
-    }
-
-    if (quant_matrix->load_chroma_non_intra_quantiser_matrix) {
-      iq_matrix->bNewQmatrix3 = 1;
-      for (guint i = 0; i < 64; i++) {
-        iq_matrix->Qmatrix3i =
-            quant_matrix->chroma_non_intra_quantiser_matrixi;
-      }
-    }
-
-    inner->submit_iq_data = TRUE;
-  } else {
-    inner->submit_iq_data = FALSE;
-  }
-
-  inner->slice_list.resize (0);
-  inner->bitstream_buffer.resize (0);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_get_picture_id (self->decoder, picture);
 }
 
 static GstFlowReturn
-gst_d3d11_mpeg2_dec_decode_slice (GstMpeg2Decoder * decoder,
-    GstMpeg2Picture * picture, GstMpeg2Slice * slice)
+gst_d3d11_mpeg2_dec_start_picture (GstDxvaMpeg2Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
-  GstMpegVideoSliceHdr *header = &slice->header;
-  GstMpegVideoPacket *packet = &slice->packet;
-  DXVA_SliceInfo slice_info = { 0, };
-
-  g_assert (packet->offset >= 4);
-
-  slice_info.wHorizontalPosition = header->mb_column;
-  slice_info.wVerticalPosition = header->mb_row;
-  /* including start code 4 bytes */
-  slice_info.dwSliceBitsInBuffer = 8 * (packet->size + 4);
-  slice_info.dwSliceDataLocation = inner->bitstream_buffer.size ();
-  /* XXX: We don't have information about the number of MBs in this slice.
-   * Just store offset here, and actual number will be calculated later */
-  slice_info.wNumberMBsInSlice =
-      (header->mb_row * inner->width_in_mb) + header->mb_column;
-  slice_info.wQuantizerScaleCode = header->quantiser_scale_code;
-  slice_info.wMBbitOffset = header->header_size + 32;
-
-  inner->slice_list.push_back (slice_info);
-
-  size_t pos = inner->bitstream_buffer.size ();
-  inner->bitstream_buffer.resize (pos + packet->size + 4);
-  memcpy (&inner->bitstream_buffer0 + pos, packet->data + packet->offset - 4,
-      packet->size + 4);
-
-  return GST_FLOW_OK;
+
+  return gst_d3d11_decoder_start_picture (self->decoder, picture, picture_id);
 }
 
 static GstFlowReturn
-gst_d3d11_mpeg2_dec_end_picture (GstMpeg2Decoder * decoder,
-    GstMpeg2Picture * picture)
+gst_d3d11_mpeg2_dec_end_picture (GstDxvaMpeg2Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
-  ID3D11VideoDecoderOutputView *view;
-  guint8 view_id = 0xff;
-  GstD3D11DecodeInputStreamArgs input_args;
-  gboolean is_field =
-      picture->structure != GST_MPEG_VIDEO_PICTURE_STRUCTURE_FRAME;
-  guint mb_count = inner->width_in_mb * (inner->height_in_mb >> is_field);
-
-  if (inner->bitstream_buffer.empty ()) {
-    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
-    return GST_FLOW_ERROR;
-  }
-
-  view = gst_d3d11_mpeg2_dec_get_output_view_from_picture (self, picture,
-      &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_ERROR;
-  }
-
-  memset (&input_args, 0, sizeof (GstD3D11DecodeInputStreamArgs));
-
-  DXVA_SliceInfo *first = &inner->slice_list0;
-  for (size_t i = 0; i < inner->slice_list.size (); i++) {
-    DXVA_SliceInfo *slice = first + i;
-
-    /* Update the number of MBs per slice */
-    if (i == inner->slice_list.size () - 1) {
-      slice->wNumberMBsInSlice = mb_count - slice->wNumberMBsInSlice;
-    } else {
-      DXVA_SliceInfo *next = first + i + 1;
-      slice->wNumberMBsInSlice =
-          next->wNumberMBsInSlice - slice->wNumberMBsInSlice;
-    }
-  }
 
-  input_args.picture_params = &inner->pic_params;
-  input_args.picture_params_size = sizeof (DXVA_PictureParameters);
-  input_args.slice_control = &inner->slice_list0;
-  input_args.slice_control_size =
-      sizeof (DXVA_SliceInfo) * inner->slice_list.size ();
-  input_args.bitstream = &inner->bitstream_buffer0;
-  input_args.bitstream_size = inner->bitstream_buffer.size ();
-  if (inner->submit_iq_data) {
-    input_args.inverse_quantization_matrix = &inner->iq_matrix;
-    input_args.inverse_quantization_matrix_size = sizeof (DXVA_QmatrixData);
-  }
-
-  return gst_d3d11_decoder_decode_frame (inner->d3d11_decoder,
-      view, &input_args);
+  return gst_d3d11_decoder_end_picture (self->decoder, picture, args);
 }
 
 static GstFlowReturn
-gst_d3d11_mpeg2_dec_output_picture (GstMpeg2Decoder * decoder,
-    GstVideoCodecFrame * frame, GstMpeg2Picture * picture)
+gst_d3d11_mpeg2_dec_output_picture (GstDxvaMpeg2Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
 {
   GstD3D11Mpeg2Dec *self = GST_D3D11_MPEG2_DEC (decoder);
-  GstD3D11Mpeg2DecInner *inner = self->inner;
-  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
-  GstBuffer *view_buffer;
-
-  GST_LOG_OBJECT (self, "Outputting picture %p", picture);
-
-  view_buffer = (GstBuffer *) gst_mpeg2_picture_get_user_data (picture);
-
-  if (!view_buffer) {
-    GST_ERROR_OBJECT (self, "Could not get output view");
-    goto error;
-  }
-
-  if (!gst_d3d11_decoder_process_output (inner->d3d11_decoder, vdec,
-          picture->discont_state, inner->width, inner->height, view_buffer,
-          &frame->output_buffer)) {
-    GST_ERROR_OBJECT (self, "Failed to copy buffer");
-    goto error;
-  }
-
-  if (picture->buffer_flags != 0) {
-    gboolean interlaced =
-        (picture->buffer_flags & GST_VIDEO_BUFFER_FLAG_INTERLACED) != 0;
-    gboolean tff = (picture->buffer_flags & GST_VIDEO_BUFFER_FLAG_TFF) != 0;
-
-    GST_TRACE_OBJECT (self,
-        "apply buffer flags 0x%x (interlaced %d, top-field-first %d)",
-        picture->buffer_flags, interlaced, tff);
-    GST_BUFFER_FLAG_SET (frame->output_buffer, picture->buffer_flags);
-  }
-
-  gst_mpeg2_picture_unref (picture);
-
-  return gst_video_decoder_finish_frame (vdec, frame);
-
-error:
-  gst_mpeg2_picture_unref (picture);
-  gst_video_decoder_release_frame (vdec, frame);
 
-  return GST_FLOW_ERROR;
+  return gst_d3d11_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
 }
 
 void
@@ -785,18 +300,18 @@
   guint index = 0;
   GTypeInfo type_info = {
     sizeof (GstD3D11Mpeg2DecClass),
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     (GClassInitFunc) gst_d3d11_mpeg2_dec_class_init,
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     sizeof (GstD3D11Mpeg2Dec),
     0,
     (GInstanceInitFunc) gst_d3d11_mpeg2_dec_init,
   };
-  const GUID *supported_profile = NULL;
-  GstCaps *sink_caps = NULL;
-  GstCaps *src_caps = NULL;
+  const GUID *supported_profile = nullptr;
+  GstCaps *sink_caps = nullptr;
+  GstCaps *src_caps = nullptr;
 
   if (!gst_d3d11_decoder_get_supported_decoder_profile (device,
           GST_DXVA_CODEC_MPEG2, GST_VIDEO_FORMAT_NV12, &supported_profile)) {
@@ -811,7 +326,7 @@
       GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY "); video/x-raw");
 
   /* NOTE: We are supporting only 4:2:0, main or simple profiles */
-  gst_caps_set_simple (src_caps, "format", G_TYPE_STRING, "NV12", NULL);
+  gst_caps_set_simple (src_caps, "format", G_TYPE_STRING, "NV12", nullptr);
 
   type_info.class_data =
       gst_d3d11_decoder_class_data_new (device, GST_DXVA_CODEC_MPEG2,
@@ -828,7 +343,7 @@
     feature_name = g_strdup_printf ("d3d11mpeg2device%ddec", index);
   }
 
-  type = g_type_register_static (GST_TYPE_MPEG2_DECODER,
+  type = g_type_register_static (GST_TYPE_DXVA_MPEG2_DECODER,
       type_name, &type_info, (GTypeFlags) 0);
 
   /* make lower rank than default device */

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11mpeg2dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11mpeg2dec.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11overlay.cpp Added

@@ -0,0 +1,443 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d11overlay
+ * @title: d3d11overlay
+ *
+ * Provides Direct3D11 render target view handles to an application so that
+ * the application can overlay/blend an image on the render target
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 d3d11testsrc ! queue ! d3d11overlay ! queue ! d3d11videosink
+ * ```
+ *
+ * Since: 1.24
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstd3d11overlay.h"
+#include <gst/d3d11/gstd3d11-private.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d11_overlay_debug);
+#define GST_CAT_DEFAULT gst_d3d11_overlay_debug
+
+static GstStaticCaps template_caps =
+GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+    (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, "{ BGRA, RGBA }"));
+
+enum
+{
+  SIGNAL_DRAW,
+  SIGNAL_CAPS_CHANGED,
+  SIGNAL_LAST,
+};
+
+static guint gst_d3d11_overlay_signalsSIGNAL_LAST;
+
+struct _GstD3D11Overlay
+{
+  GstD3D11BaseFilter parent;
+
+  GstBufferPool *fallback_pool;
+};
+
+#define gst_d3d11_overlay_parent_class parent_class
+G_DEFINE_TYPE (GstD3D11Overlay, gst_d3d11_overlay, GST_TYPE_D3D11_BASE_FILTER);
+
+static gboolean gst_d3d11_overlay_stop (GstBaseTransform * trans);
+static gboolean gst_d3d11_overlay_propose_allocation (GstBaseTransform * trans,
+    GstQuery * decide_query, GstQuery * query);
+static GstFlowReturn gst_d3d11_overlay_transform_ip (GstBaseTransform * trans,
+    GstBuffer * buf);
+static gboolean gst_d3d11_overlay_set_info (GstD3D11BaseFilter * filter,
+    GstCaps * in_caps, GstVideoInfo * in_info, GstCaps * out_caps,
+    GstVideoInfo * out_info);
+
+static void
+gst_d3d11_overlay_class_init (GstD3D11OverlayClass * klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
+  GstD3D11BaseFilterClass *filter_class = GST_D3D11_BASE_FILTER_CLASS (klass);
+  GstCaps *caps;
+
+  /**
+   * GstD3D11Overlay::draw:
+   * @overlay: Overlay element emitting the signal
+   * @device: GstD3D11Device object
+   * @render_target: ID3D11RenderTargetView handle
+   * @timestamp: Timestamp (see #GstClockTime) of the current buffer
+   * @duration: Duration (see #GstClockTime) of the current buffer
+   *
+   * This signal is emitted when an overlay can be drawn. This signal is
+   * emitted with gst_d3d11_device_lock taken.
+   *
+   * Client should return %TRUE if an overlay has been rendered.
+   * Otherwise the element might discard the updated scene.
+   *
+   * Returns: %TRUE if rendering operation happend
+   *
+   * Since: 1.24
+   */
+  gst_d3d11_overlay_signalsSIGNAL_DRAW = g_signal_new ("draw",
+      G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, nullptr, nullptr,
+      nullptr, G_TYPE_BOOLEAN, 4, GST_TYPE_OBJECT, G_TYPE_POINTER,
+      G_TYPE_UINT64, G_TYPE_UINT64);
+
+  /**
+   * GstD3D11Overlay::caps-changed:
+   * @overlay: Overlay element emitting the signal
+   * @caps: #GstCaps of the element
+
+   * This signal is emitted when the caps or associated GstD3D11Device
+   * of the element has changed
+   *
+   * Since: 1.24
+   */
+  gst_d3d11_overlay_signalsSIGNAL_CAPS_CHANGED = g_signal_new ("caps-changed",
+      G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, nullptr, nullptr,
+      nullptr, G_TYPE_NONE, 1, GST_TYPE_CAPS);
+
+  caps = gst_d3d11_get_updated_template_caps (&template_caps);
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, caps));
+
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, caps));
+  gst_caps_unref (caps);
+
+  gst_element_class_set_static_metadata (element_class,
+      "Direct3D11 Overlay", "Filter/Video",
+      "Provides application renderable Direct3D11 render target view",
+      "Seungha Yang <seungha@centricular.com>");
+
+  trans_class->passthrough_on_same_caps = FALSE;
+
+  trans_class->stop = GST_DEBUG_FUNCPTR (gst_d3d11_overlay_stop);
+  trans_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d11_overlay_propose_allocation);
+  trans_class->transform_ip =
+      GST_DEBUG_FUNCPTR (gst_d3d11_overlay_transform_ip);
+
+  filter_class->set_info = GST_DEBUG_FUNCPTR (gst_d3d11_overlay_set_info);
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d11_overlay_debug,
+      "d3d11overlay", 0, "d3d11overlay");
+}
+
+static void
+gst_d3d11_overlay_init (GstD3D11Overlay * self)
+{
+}
+
+static gboolean
+gst_d3d11_overlay_stop (GstBaseTransform * trans)
+{
+  GstD3D11Overlay *self = GST_D3D11_OVERLAY (trans);
+
+  if (self->fallback_pool) {
+    gst_buffer_pool_set_active (self->fallback_pool, FALSE);
+    gst_clear_object (&self->fallback_pool);
+  }
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->stop (trans);
+}
+
+static gboolean
+gst_d3d11_overlay_propose_allocation (GstBaseTransform * trans,
+    GstQuery * decide_query, GstQuery * query)
+{
+  GstD3D11BaseFilter *filter = GST_D3D11_BASE_FILTER (trans);
+  GstVideoInfo info;
+  GstCaps *caps;
+  guint size;
+  GstBufferPool *pool = nullptr;
+  gboolean update_pool = FALSE;
+  guint min = 0;
+  guint max = 0;
+  GstStructure *config;
+  GstD3D11AllocationParams *params;
+
+  if (!GST_BASE_TRANSFORM_CLASS (parent_class)->propose_allocation (trans,
+          decide_query, query))
+    return FALSE;
+
+  gst_query_parse_allocation (query, &caps, nullptr);
+
+  if (!caps) {
+    GST_WARNING_OBJECT (filter, "Query without caps");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_ERROR_OBJECT (filter, "Invalid caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+
+  size = GST_VIDEO_INFO_SIZE (&info);
+
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, nullptr, &min, &max);
+
+    if (pool) {
+      if (!GST_IS_D3D11_BUFFER_POOL (pool)) {
+        gst_clear_object (&pool);
+      } else {
+        GstD3D11BufferPool *dpool = GST_D3D11_BUFFER_POOL (pool);
+        if (dpool->device != filter->device)
+          gst_clear_object (&pool);
+      }
+    }
+
+    update_pool = TRUE;
+  }
+
+  if (!pool)
+    pool = gst_d3d11_buffer_pool_new (filter->device);
+
+  config = gst_buffer_pool_get_config (pool);
+
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+  gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
+
+  params = gst_buffer_pool_config_get_d3d11_allocation_params (config);
+  if (params) {
+    gst_d3d11_allocation_params_set_bind_flags (params,
+        D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET);
+  } else {
+    params = gst_d3d11_allocation_params_new (filter->device, &info,
+        GST_D3D11_ALLOCATION_FLAG_DEFAULT,
+        D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET, 0);
+  }
+
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_d3d11_allocation_params_free (params);
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (filter, "Couldn't set pool config");
+    gst_object_unref (pool);
+    return FALSE;
+  }
+
+  /* d3d11 buffer pool will update buffer size based on allocated texture,
+   * get size from config again */
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  if (update_pool)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+
+  gst_object_unref (pool);
+
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, nullptr);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d11_overlay_copy_memory (GstD3D11Overlay * self, GstMemory * src,
+    GstMemory * dst)
+{
+  GstD3D11BaseFilter *filter = GST_D3D11_BASE_FILTER (self);
+  GstMapInfo src_map;
+  GstMapInfo dst_map;
+  ID3D11Resource *dst_texture, *src_texture;
+  ID3D11DeviceContext *context;
+  D3D11_TEXTURE2D_DESC src_desc, dst_desc;
+  D3D11_BOX src_box;
+
+  context = gst_d3d11_device_get_device_context_handle (filter->device);
+
+  if (!gst_memory_map (src,
+          &src_map, (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D11))) {
+    GST_ERROR_OBJECT (self, "Couldn't map src memory");
+    return FALSE;
+  }
+
+  if (!gst_memory_map (dst,
+          &dst_map, (GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D11))) {
+    GST_ERROR_OBJECT (self, "Couldn't map dst memory");
+    gst_memory_unmap (src, &src_map);
+    return FALSE;
+  }
+
+  gst_d3d11_memory_get_texture_desc (GST_D3D11_MEMORY_CAST (src), &src_desc);
+  gst_d3d11_memory_get_texture_desc (GST_D3D11_MEMORY_CAST (dst), &dst_desc);
+
+  src_texture = (ID3D11Texture2D *) src_map.data;
+  dst_texture = (ID3D11Texture2D *) dst_map.data;
+
+  src_box.front = 0;
+  src_box.back = 1;
+  src_box.left = 0;
+  src_box.top = 0;
+  src_box.right = MIN (src_desc.Width, dst_desc.Width);
+  src_box.bottom = MIN (src_desc.Height, dst_desc.Height);
+
+  context->CopySubresourceRegion (dst_texture,
+      0, 0, 0, 0, src_texture, 0, &src_box);
+
+  gst_memory_unmap (src, &src_map);
+  gst_memory_unmap (dst, &dst_map);
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_d3d11_overlay_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
+{
+  GstD3D11BaseFilter *filter = GST_D3D11_BASE_FILTER (trans);
+  GstD3D11Overlay *self = GST_D3D11_OVERLAY (trans);
+  GstMemory *mem;
+  GstD3D11Memory *dmem;
+  ID3D11RenderTargetView *rtv;
+  GstBuffer *fallback_buf = nullptr;
+  GstMemory *fallback_mem = nullptr;
+  GstD3D11Memory *fallback_dmem = nullptr;
+  GstMemory *target_mem;
+  GstMapInfo map;
+  gboolean rendered = FALSE;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  mem = gst_buffer_peek_memory (buf, 0);
+  if (!gst_is_d3d11_memory (mem)) {
+    GST_ERROR_OBJECT (self, "Not a d3d11 memory");
+    return GST_FLOW_ERROR;
+  }
+
+  dmem = GST_D3D11_MEMORY_CAST (mem);
+  rtv = gst_d3d11_memory_get_render_target_view (dmem, 0);
+  if (!rtv) {
+    GST_DEBUG_OBJECT (self, "RTV is unavailable");
+
+    gst_buffer_pool_acquire_buffer (self->fallback_pool, &fallback_buf,
+        nullptr);
+    if (!fallback_buf) {
+      GST_ERROR_OBJECT (self, "Couldn't allocate fallback buffer");
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  GstD3D11DeviceLockGuard lk (filter->device);
+  if (fallback_buf) {
+    fallback_mem = gst_buffer_peek_memory (fallback_buf, 0);
+
+    if (!gst_d3d11_overlay_copy_memory (self, mem, fallback_mem)) {
+      GST_ERROR_OBJECT (self, "Couldn't copy input memory to fallback");
+      gst_buffer_unref (fallback_buf);
+      return GST_FLOW_ERROR;
+    }
+
+    fallback_dmem = GST_D3D11_MEMORY_CAST (fallback_mem);
+    rtv = gst_d3d11_memory_get_render_target_view (fallback_dmem, 0);
+    if (!rtv) {
+      GST_ERROR_OBJECT (self, "RTV is unavailable");
+      gst_buffer_unref (fallback_buf);
+      return GST_FLOW_ERROR;
+    }
+
+    target_mem = fallback_mem;
+  } else {
+    target_mem = mem;
+  }
+
+  if (!gst_memory_map (target_mem, &map,
+          (GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D11))) {
+    GST_ERROR_OBJECT (self, "Couldn't map render target memory");
+    gst_clear_buffer (&fallback_buf);
+    return GST_FLOW_ERROR;
+  }
+
+  g_signal_emit (self, gst_d3d11_overlay_signalsSIGNAL_DRAW, 0,
+      filter->device, rtv, GST_BUFFER_PTS (buf), GST_BUFFER_DURATION (buf),
+      &rendered);
+
+  GST_LOG_OBJECT (self, "Draw signal return: %d", rendered);
+
+  gst_memory_unmap (target_mem, &map);
+
+  if (fallback_buf && rendered) {
+    if (!gst_d3d11_overlay_copy_memory (self, fallback_mem, mem)) {
+      GST_ERROR_OBJECT (self, "Couldn't copy back to input memory");
+      ret = GST_FLOW_ERROR;
+    }
+  }
+
+  gst_clear_buffer (&fallback_buf);
+
+  return ret;
+}
+
+static gboolean
+gst_d3d11_overlay_set_info (GstD3D11BaseFilter * filter, GstCaps * in_caps,
+    GstVideoInfo * in_info, GstCaps * out_caps, GstVideoInfo * out_info)
+{
+  GstD3D11Overlay *self = GST_D3D11_OVERLAY (filter);
+  GstStructure *config;
+  GstD3D11AllocationParams *params;
+
+  if (self->fallback_pool) {
+    gst_buffer_pool_set_active (self->fallback_pool, FALSE);
+    gst_object_unref (self->fallback_pool);
+  }
+
+  self->fallback_pool = gst_d3d11_buffer_pool_new (filter->device);
+  config = gst_buffer_pool_get_config (self->fallback_pool);
+
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+  gst_buffer_pool_config_set_params (config, in_caps,
+      GST_VIDEO_INFO_SIZE (in_info), 0, 0);
+
+  params = gst_d3d11_allocation_params_new (filter->device, in_info,
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT,
+      D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET, 0);
+
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_d3d11_allocation_params_free (params);
+
+  if (!gst_buffer_pool_set_config (self->fallback_pool, config)) {
+    GST_ERROR_OBJECT (self, "Couldn't set pool config");
+    gst_clear_object (&self->fallback_pool);
+    return FALSE;
+  }
+
+  if (!gst_buffer_pool_set_active (self->fallback_pool, TRUE)) {
+    GST_ERROR_OBJECT (self, "Couldn't activate pool");
+    gst_clear_object (&self->fallback_pool);
+    return FALSE;
+  }
+
+  GST_DEBUG_OBJECT (self, "New caps %" GST_PTR_FORMAT, in_caps);
+
+  g_signal_emit (self, gst_d3d11_overlay_signalsSIGNAL_CAPS_CHANGED, 0,
+      in_caps);
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11overlay.h Added

@@ -0,0 +1,32 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstd3d11basefilter.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D11_OVERLAY (gst_d3d11_overlay_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D11Overlay,
+    gst_d3d11_overlay, GST, D3D11_OVERLAY, GstD3D11BaseFilter);
+
+G_END_DECLS
+

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11overlaycompositor.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11overlaycompositor.cpp Changed

@@ -24,6 +24,9 @@
 #include "gstd3d11overlaycompositor.h"
 #include "gstd3d11pluginutils.h"
 #include <wrl.h>
+#include <memory>
+#include <vector>
+#include <algorithm>
 
 GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_overlay_compositor_debug);
 #define GST_CAT_DEFAULT gst_d3d11_overlay_compositor_debug
@@ -44,37 +47,25 @@
   } texture;
 } VertexData;
 
-static const gchar templ_pixel_shader =
-    "Texture2D shaderTexture;\n"
-    "SamplerState samplerState;\n"
-    "struct PS_INPUT\n"
-    "{\n"
-    "  float4 Position: SV_POSITION;\n"
-    "  float2 Texture: TEXCOORD;\n"
-    "};\n"
-    "float4 main(PS_INPUT input): SV_TARGET\n"
-    "{\n"
-    "  return shaderTexture.Sample(samplerState, input.Texture);\n"
-    "}\n";
-
-static const gchar templ_vertex_shader =
-    "struct VS_INPUT\n"
-    "{\n"
-    "  float4 Position : POSITION;\n"
-    "  float2 Texture : TEXCOORD;\n"
-    "};\n"
-    "\n"
-    "struct VS_OUTPUT\n"
-    "{\n"
-    "  float4 Position: SV_POSITION;\n"
-    "  float2 Texture: TEXCOORD;\n"
-    "};\n"
-    "\n"
-    "VS_OUTPUT main(VS_INPUT input)\n"
-    "{\n"
-    "  return input;\n"
-    "}\n";
-/* *INDENT-ON* */
+struct GstD3D11CompositionOverlay
+{
+  ~GstD3D11CompositionOverlay ()
+  {
+    if (overlay_rect)
+      gst_video_overlay_rectangle_unref (overlay_rect);
+    if (d3d11_buffer)
+      gst_buffer_unref (d3d11_buffer);
+  }
+
+  GstVideoOverlayRectangle *overlay_rect = nullptr;
+  ComPtr<ID3D11Texture2D> texture;
+  ComPtr<ID3D11ShaderResourceView> srv;
+  ComPtr<ID3D11Buffer> vertex_buffer;
+  gboolean premul_alpha = FALSE;
+  GstBuffer *d3d11_buffer = nullptr;
+};
+
+typedef std::shared_ptr<GstD3D11CompositionOverlay> GstD3D11CompositionOverlayPtr;
 
 struct _GstD3D11OverlayCompositorPrivate
 {
@@ -82,31 +73,24 @@
 
   D3D11_VIEWPORT viewport;
 
-  ID3D11PixelShader *ps;
-  ID3D11VertexShader *vs;
-  ID3D11InputLayout *layout;
-  ID3D11SamplerState *sampler;
-  ID3D11BlendState *blend;
-  ID3D11Buffer *index_buffer;
-
-  /* GstD3D11CompositionOverlay */
-  GList *overlays;
+  ComPtr<ID3D11PixelShader> ps;
+  ComPtr<ID3D11PixelShader> premul_ps;
+  ComPtr<ID3D11VertexShader> vs;
+  ComPtr<ID3D11InputLayout> layout;
+  ComPtr<ID3D11SamplerState> sampler;
+  ComPtr<ID3D11BlendState> blend;
+  ComPtr<ID3D11Buffer> index_buffer;
+  ComPtr<ID3D11RasterizerState> rs;
+  std::vector<GstVideoOverlayRectangle *> rects_to_upload;
+
+  std::vector<GstD3D11CompositionOverlayPtr> overlays;
 };
+/* *INDENT-ON* */
 
-typedef struct
-{
-  GstVideoOverlayRectangle *overlay_rect;
-  ID3D11Texture2D *texture;
-  ID3D11ShaderResourceView *srv;
-  ID3D11Buffer *vertex_buffer;
-} GstD3D11CompositionOverlay;
-
-static void gst_d3d11_overlay_compositor_dispose (GObject * object);
-static void
-gst_d3d11_overlay_compositor_free_overlays (GstD3D11OverlayCompositor * self);
+static void gst_d3d11_overlay_compositor_finalize (GObject * object);
 
 #define gst_d3d11_overlay_compositor_parent_class parent_class
-G_DEFINE_TYPE_WITH_PRIVATE (GstD3D11OverlayCompositor,
+G_DEFINE_TYPE (GstD3D11OverlayCompositor,
     gst_d3d11_overlay_compositor, GST_TYPE_OBJECT);
 
 static void
@@ -114,50 +98,39 @@
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->dispose = gst_d3d11_overlay_compositor_dispose;
+  object_class->finalize = gst_d3d11_overlay_compositor_finalize;
 }
 
 static void
 gst_d3d11_overlay_compositor_init (GstD3D11OverlayCompositor * self)
 {
-  self->priv = (GstD3D11OverlayCompositorPrivate *)
-      gst_d3d11_overlay_compositor_get_instance_private (self);
+  self->priv = new GstD3D11OverlayCompositorPrivate ();
 }
 
 static void
-gst_d3d11_overlay_compositor_dispose (GObject * object)
+gst_d3d11_overlay_compositor_finalize (GObject * object)
 {
   GstD3D11OverlayCompositor *self = GST_D3D11_OVERLAY_COMPOSITOR (object);
-  GstD3D11OverlayCompositorPrivate *priv = self->priv;
-
-  gst_d3d11_overlay_compositor_free_overlays (self);
 
-  GST_D3D11_CLEAR_COM (priv->ps);
-  GST_D3D11_CLEAR_COM (priv->vs);
-  GST_D3D11_CLEAR_COM (priv->layout);
-  GST_D3D11_CLEAR_COM (priv->sampler);
-  GST_D3D11_CLEAR_COM (priv->blend);
-  GST_D3D11_CLEAR_COM (priv->index_buffer);
+  delete self->priv;
 
   gst_clear_object (&self->device);
 
-  G_OBJECT_CLASS (parent_class)->dispose (object);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-static GstD3D11CompositionOverlay *
+static GstD3D11CompositionOverlayPtr
 gst_d3d11_composition_overlay_new (GstD3D11OverlayCompositor * self,
     GstVideoOverlayRectangle * overlay_rect)
 {
   GstD3D11OverlayCompositorPrivate *priv = self->priv;
-  GstD3D11CompositionOverlay *overlay = nullptr;
   gint x, y;
   guint width, height;
-  D3D11_SUBRESOURCE_DATA subresource_data;
+  D3D11_SUBRESOURCE_DATA subresource;
   D3D11_TEXTURE2D_DESC texture_desc;
   D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc;
   D3D11_BUFFER_DESC buffer_desc;
-  D3D11_MAPPED_SUBRESOURCE map;
-  VertexData *vertex_data;
+  VertexData vertex_data4;
   GstBuffer *buf;
   GstVideoMeta *vmeta;
   GstMapInfo info;
@@ -165,21 +138,23 @@
   gint stride;
   HRESULT hr;
   ID3D11Device *device_handle;
-  ID3D11DeviceContext *context_handle;
   GstD3D11Device *device = self->device;
   FLOAT x1, y1, x2, y2;
   gdouble val;
   ComPtr < ID3D11Texture2D > texture;
   ComPtr < ID3D11ShaderResourceView > srv;
   ComPtr < ID3D11Buffer > vertex_buffer;
+  GstVideoOverlayFormatFlags flags;
+  gboolean premul_alpha = FALSE;
+  GstMemory *mem;
+  gboolean is_d3d11 = FALSE;
 
-  memset (&subresource_data, 0, sizeof (subresource_data));
+  memset (&subresource, 0, sizeof (subresource));
   memset (&texture_desc, 0, sizeof (texture_desc));
   memset (&srv_desc, 0, sizeof (srv_desc));
   memset (&buffer_desc, 0, sizeof (buffer_desc));
 
   device_handle = gst_d3d11_device_get_device_handle (device);
-  context_handle = gst_d3d11_device_get_device_context_handle (device);
 
   if (!gst_video_overlay_rectangle_get_render_rectangle (overlay_rect, &x, &y,
           &width, &height)) {
@@ -187,82 +162,81 @@
     return nullptr;
   }
 
+  flags = gst_video_overlay_rectangle_get_flags (overlay_rect);
+  if ((flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA) != 0) {
+    premul_alpha = TRUE;
+    flags = GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA;
+  } else {
+    flags = GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE;
+  }
+
   buf = gst_video_overlay_rectangle_get_pixels_unscaled_argb (overlay_rect,
-      GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE);
+      flags);
   if (!buf) {
     GST_ERROR_OBJECT (self, "Failed to get overlay buffer");
     return nullptr;
   }
 
-  vmeta = gst_buffer_get_video_meta (buf);
-  if (!vmeta) {
-    GST_ERROR_OBJECT (self, "Failed to get video meta");
-    return nullptr;
-  }
-
-  if (!gst_video_meta_map (vmeta,
-          0, &info, (gpointer *) & data, &stride, GST_MAP_READ)) {
-    GST_ERROR_OBJECT (self, "Failed to map");
-    return nullptr;
-  }
-
-  /* Do create texture and upload data at once, for create immutable texture */
-  subresource_data.pSysMem = data;
-  subresource_data.SysMemPitch = stride;
-  subresource_data.SysMemSlicePitch = 0;
-
-  texture_desc.Width = vmeta->width;
-  texture_desc.Height = vmeta->height;
-  texture_desc.MipLevels = 1;
-  texture_desc.ArraySize = 1;
-  texture_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
-  texture_desc.SampleDesc.Count = 1;
-  texture_desc.SampleDesc.Quality = 0;
-  texture_desc.Usage = D3D11_USAGE_IMMUTABLE;
-  texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
-  texture_desc.CPUAccessFlags = 0;
-
-  hr = device_handle->CreateTexture2D (&texture_desc,
-      &subresource_data, &texture);
-  gst_video_meta_unmap (vmeta, 0, &info);
-
-  if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self, "Failed to create texture");
-    return nullptr;
+  mem = gst_buffer_peek_memory (buf, 0);
+  if (gst_is_d3d11_memory (mem)) {
+    GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
+    if (dmem->device == self->device) {
+      srv = gst_d3d11_memory_get_shader_resource_view (dmem, 0);
+      if (srv) {
+        texture = (ID3D11Texture2D *)
+            gst_d3d11_memory_get_resource_handle (dmem);
+        is_d3d11 = TRUE;
+      }
+    }
   }
 
-  srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-  srv_desc.Texture2D.MipLevels = 1;
-
-  hr = device_handle->CreateShaderResourceView (texture.Get (), &srv_desc,
-      &srv);
-  if (!gst_d3d11_result (hr, device) || !srv) {
-    GST_ERROR_OBJECT (self, "Failed to create shader resource view");
-    return nullptr;
-  }
+  if (!is_d3d11) {
+    vmeta = gst_buffer_get_video_meta (buf);
+    if (!vmeta) {
+      GST_ERROR_OBJECT (self, "Failed to get video meta");
+      return nullptr;
+    }
 
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (VertexData) * 4;
-  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+    if (!gst_video_meta_map (vmeta,
+            0, &info, (gpointer *) & data, &stride, GST_MAP_READ)) {
+      GST_ERROR_OBJECT (self, "Failed to map");
+      return nullptr;
+    }
 
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &vertex_buffer);
-  if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self,
-        "Couldn't create vertex buffer, hr: 0x%x", (guint) hr);
-    return nullptr;
-  }
+    /* Do create texture and upload data at once, for create immutable texture */
+    subresource.pSysMem = data;
+    subresource.SysMemPitch = stride;
+
+    texture_desc.Width = vmeta->width;
+    texture_desc.Height = vmeta->height;
+    texture_desc.MipLevels = 1;
+    texture_desc.ArraySize = 1;
+    texture_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
+    texture_desc.SampleDesc.Count = 1;
+    texture_desc.SampleDesc.Quality = 0;
+    texture_desc.Usage = D3D11_USAGE_IMMUTABLE;
+    texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
+    texture_desc.CPUAccessFlags = 0;
+
+    hr = device_handle->CreateTexture2D (&texture_desc, &subresource, &texture);
+    gst_video_meta_unmap (vmeta, 0, &info);
+
+    if (!gst_d3d11_result (hr, device)) {
+      GST_ERROR_OBJECT (self, "Failed to create texture");
+      return nullptr;
+    }
 
-  GstD3D11DeviceLockGuard lk (device);
-  hr = context_handle->Map (vertex_buffer.Get (),
-      0, D3D11_MAP_WRITE_DISCARD, 0, &map);
+    srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
+    srv_desc.Texture2D.MipLevels = 1;
 
-  if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self, "Couldn't map vertex buffer, hr: 0x%x", (guint) hr);
-    return nullptr;
+    hr = device_handle->CreateShaderResourceView (texture.Get (), &srv_desc,
+        &srv);
+    if (!gst_d3d11_result (hr, device) || !srv) {
+      GST_ERROR_OBJECT (self, "Failed to create shader resource view");
+      return nullptr;
+    }
   }
 
-  vertex_data = (VertexData *) map.pData;
   /* bottom left */
   gst_util_fraction_to_double (x, GST_VIDEO_INFO_WIDTH (&priv->info), &val);
   x1 = (val * 2.0f) - 1.0f;
@@ -307,31 +281,31 @@
   vertex_data3.texture.u = 1.0f;
   vertex_data3.texture.v = 1.0f;
 
-  context_handle->Unmap (vertex_buffer.Get (), 0);
-
-  overlay = g_new0 (GstD3D11CompositionOverlay, 1);
-  overlay->overlay_rect = gst_video_overlay_rectangle_ref (overlay_rect);
-  overlay->texture = texture.Detach ();
-  overlay->srv = srv.Detach ();
-  overlay->vertex_buffer = vertex_buffer.Detach ();
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (VertexData) * 4;
+  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
 
-  return overlay;
-}
+  subresource.pSysMem = vertex_data;
+  subresource.SysMemPitch = sizeof (VertexData) * 4;
 
-static void
-gst_d3d11_composition_overlay_free (GstD3D11CompositionOverlay * overlay)
-{
-  if (!overlay)
-    return;
-
-  if (overlay->overlay_rect)
-    gst_video_overlay_rectangle_unref (overlay->overlay_rect);
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &vertex_buffer);
+  if (!gst_d3d11_result (hr, device)) {
+    GST_ERROR_OBJECT (self,
+        "Couldn't create vertex buffer, hr: 0x%x", (guint) hr);
+    return nullptr;
+  }
 
-  GST_D3D11_CLEAR_COM (overlay->srv);
-  GST_D3D11_CLEAR_COM (overlay->texture);
-  GST_D3D11_CLEAR_COM (overlay->vertex_buffer);
+  auto overlay = std::make_shared < GstD3D11CompositionOverlay > ();
+  overlay->overlay_rect = gst_video_overlay_rectangle_ref (overlay_rect);
+  overlay->texture = texture;
+  overlay->srv = srv;
+  overlay->vertex_buffer = vertex_buffer;
+  overlay->premul_alpha = premul_alpha;
+  if (is_d3d11)
+    overlay->d3d11_buffer = gst_buffer_ref (buf);
 
-  g_free (overlay);
+  return overlay;
 }
 
 static gboolean
@@ -341,83 +315,66 @@
   GstVideoInfo *info = &priv->info;
   GstD3D11Device *device = self->device;
   HRESULT hr;
-  D3D11_SAMPLER_DESC sampler_desc;
-  D3D11_INPUT_ELEMENT_DESC input_desc2;
   D3D11_BUFFER_DESC buffer_desc;
   D3D11_BLEND_DESC blend_desc;
-  D3D11_MAPPED_SUBRESOURCE map;
-  WORD *indices;
+  D3D11_SUBRESOURCE_DATA subresource;
+  const WORD indices6 = { 0, 1, 2, 3, 0, 2 };
   ID3D11Device *device_handle;
-  ID3D11DeviceContext *context_handle;
   ComPtr < ID3D11PixelShader > ps;
+  ComPtr < ID3D11PixelShader > premul_ps;
   ComPtr < ID3D11VertexShader > vs;
   ComPtr < ID3D11InputLayout > layout;
   ComPtr < ID3D11SamplerState > sampler;
   ComPtr < ID3D11BlendState > blend;
   ComPtr < ID3D11Buffer > index_buffer;
+  ComPtr < ID3D11RasterizerState > rs;
 
-  memset (&sampler_desc, 0, sizeof (sampler_desc));
-  memset (input_desc, 0, sizeof (input_desc));
   memset (&buffer_desc, 0, sizeof (buffer_desc));
   memset (&blend_desc, 0, sizeof (blend_desc));
+  memset (&subresource, 0, sizeof (subresource));
 
   device_handle = gst_d3d11_device_get_device_handle (device);
-  context_handle = gst_d3d11_device_get_device_context_handle (device);
-
-  /* bilinear filtering */
-  sampler_desc.Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;
-  sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
-  sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
-  sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
-  sampler_desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
-  sampler_desc.MinLOD = 0;
-  sampler_desc.MaxLOD = D3D11_FLOAT32_MAX;
-
-  hr = device_handle->CreateSamplerState (&sampler_desc, &sampler);
+
+  hr = gst_d3d11_device_get_sampler (device,
+      D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT, &sampler);
   if (!gst_d3d11_result (hr, device)) {
     GST_ERROR_OBJECT (self, "Couldn't create sampler state, hr: 0x%x",
         (guint) hr);
     return FALSE;
   }
 
-  hr = gst_d3d11_create_pixel_shader_simple (device,
-      templ_pixel_shader, "main", &ps);
+  hr = gst_d3d11_get_pixel_shader_sample (device, &ps);
   if (!gst_d3d11_result (hr, device)) {
     GST_ERROR_OBJECT (self, "Couldn't create pixel shader");
     return FALSE;
   }
 
-  input_desc0.SemanticName = "POSITION";
-  input_desc0.SemanticIndex = 0;
-  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
-  input_desc0.InputSlot = 0;
-  input_desc0.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-  input_desc0.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-  input_desc0.InstanceDataStepRate = 0;
-
-  input_desc1.SemanticName = "TEXCOORD";
-  input_desc1.SemanticIndex = 0;
-  input_desc1.Format = DXGI_FORMAT_R32G32_FLOAT;
-  input_desc1.InputSlot = 0;
-  input_desc1.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-  input_desc1.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-  input_desc1.InstanceDataStepRate = 0;
-
-  hr = gst_d3d11_create_vertex_shader_simple (device, templ_vertex_shader,
-      "main", input_desc, G_N_ELEMENTS (input_desc), &vs, &layout);
+  hr = gst_d3d11_get_pixel_shader_sample_premul (device, &premul_ps);
   if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self, "Couldn't vertex pixel shader");
+    GST_ERROR_OBJECT (self, "Couldn't create premul pixel shader");
+    return FALSE;
+  }
+
+  hr = gst_d3d11_get_vertex_shader_coord (device, &vs, &layout);
+  if (!gst_d3d11_result (hr, device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create vertex pixel shader");
+    return FALSE;
+  }
+
+  hr = gst_d3d11_device_get_rasterizer (device, &rs);
+  if (!gst_d3d11_result (hr, device)) {
+    GST_ERROR_OBJECT (self, "Couldn't get rasterizer state");
     return FALSE;
   }
 
   blend_desc.AlphaToCoverageEnable = FALSE;
   blend_desc.IndependentBlendEnable = FALSE;
   blend_desc.RenderTarget0.BlendEnable = TRUE;
-  blend_desc.RenderTarget0.SrcBlend = D3D11_BLEND_SRC_ALPHA;
+  blend_desc.RenderTarget0.SrcBlend = D3D11_BLEND_ONE;
   blend_desc.RenderTarget0.DestBlend = D3D11_BLEND_INV_SRC_ALPHA;
   blend_desc.RenderTarget0.BlendOp = D3D11_BLEND_OP_ADD;
   blend_desc.RenderTarget0.SrcBlendAlpha = D3D11_BLEND_ONE;
-  blend_desc.RenderTarget0.DestBlendAlpha = D3D11_BLEND_ZERO;
+  blend_desc.RenderTarget0.DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
   blend_desc.RenderTarget0.BlendOpAlpha = D3D11_BLEND_OP_ADD;
   blend_desc.RenderTarget0.RenderTargetWriteMask =
       D3D11_COLOR_WRITE_ENABLE_ALL;
@@ -434,41 +391,24 @@
   buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
   buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
 
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &index_buffer);
+  subresource.pSysMem = indices;
+  subresource.SysMemPitch = sizeof (WORD) * 6;
+
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &index_buffer);
   if (!gst_d3d11_result (hr, device)) {
     GST_ERROR_OBJECT (self,
         "Couldn't create index buffer, hr: 0x%x", (guint) hr);
     return FALSE;
   }
 
-  GstD3D11DeviceLockGuard lk (device);
-  hr = context_handle->Map (index_buffer.Get (),
-      0, D3D11_MAP_WRITE_DISCARD, 0, &map);
-
-  if (!gst_d3d11_result (hr, device)) {
-    GST_ERROR_OBJECT (self, "Couldn't map index buffer, hr: 0x%x", (guint) hr);
-    return FALSE;
-  }
-
-  indices = (WORD *) map.pData;
-
-  /* clockwise indexing */
-  indices0 = 0;               /* bottom left */
-  indices1 = 1;               /* top left */
-  indices2 = 2;               /* top right */
-
-  indices3 = 3;               /* bottom right */
-  indices4 = 0;               /* bottom left  */
-  indices5 = 2;               /* top right */
-
-  context_handle->Unmap (index_buffer.Get (), 0);
-
-  priv->ps = ps.Detach ();
-  priv->vs = vs.Detach ();
-  priv->layout = layout.Detach ();
-  priv->sampler = sampler.Detach ();
-  priv->blend = blend.Detach ();
-  priv->index_buffer = index_buffer.Detach ();
+  priv->ps = ps;
+  priv->premul_ps = premul_ps;
+  priv->vs = vs;
+  priv->layout = layout;
+  priv->sampler = sampler;
+  priv->blend = blend;
+  priv->index_buffer = index_buffer;
+  priv->rs = rs;
 
   priv->viewport.TopLeftX = 0;
   priv->viewport.TopLeftY = 0;
@@ -506,39 +446,28 @@
   return self;
 }
 
-static void
-gst_d3d11_overlay_compositor_free_overlays (GstD3D11OverlayCompositor * self)
+static gboolean
+gst_d3d11_overlay_compositor_foreach_meta (GstBuffer * buffer, GstMeta ** meta,
+    GstD3D11OverlayCompositor * self)
 {
   GstD3D11OverlayCompositorPrivate *priv = self->priv;
+  GstVideoOverlayCompositionMeta *cmeta;
+  guint num_rect;
 
-  if (priv->overlays) {
-    g_list_free_full (priv->overlays,
-        (GDestroyNotify) gst_d3d11_composition_overlay_free);
-
-    priv->overlays = nullptr;
-  }
-}
-
-static gint
-find_in_compositor (const GstD3D11CompositionOverlay * overlay,
-    const GstVideoOverlayRectangle * rect)
-{
-  return !(overlay->overlay_rect == rect);
-}
+  if ((*meta)->info->api != GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE)
+    return TRUE;
 
-static gboolean
-is_in_video_overlay_composition (GstVideoOverlayComposition * voc,
-    GstD3D11CompositionOverlay * overlay)
-{
-  guint i;
+  cmeta = (GstVideoOverlayCompositionMeta *) (*meta);
+  if (!cmeta->overlay)
+    return TRUE;
 
-  for (i = 0; i < gst_video_overlay_composition_n_rectangles (voc); i++) {
-    GstVideoOverlayRectangle *rectangle =
-        gst_video_overlay_composition_get_rectangle (voc, i);
-    if (overlay->overlay_rect == rectangle)
-      return TRUE;
+  num_rect = gst_video_overlay_composition_n_rectangles (cmeta->overlay);
+  for (guint i = 0; i < num_rect; i++) {
+    auto rect = gst_video_overlay_composition_get_rectangle (cmeta->overlay, i);
+    priv->rects_to_upload.push_back (rect);
   }
-  return FALSE;
+
+  return TRUE;
 }
 
 gboolean
@@ -546,61 +475,64 @@
     GstBuffer * buf)
 {
   GstD3D11OverlayCompositorPrivate *priv;
-  GstVideoOverlayCompositionMeta *meta;
-  gint i, num_overlays;
-  GList *iter;
 
   g_return_val_if_fail (compositor != nullptr, FALSE);
   g_return_val_if_fail (GST_IS_BUFFER (buf), FALSE);
 
   priv = compositor->priv;
+  priv->rects_to_upload.clear ();
 
-  meta = gst_buffer_get_video_overlay_composition_meta (buf);
-  if (!meta) {
-    gst_d3d11_overlay_compositor_free_overlays (compositor);
-    return TRUE;
-  }
+  gst_buffer_foreach_meta (buf,
+      (GstBufferForeachMetaFunc) gst_d3d11_overlay_compositor_foreach_meta,
+      compositor);
 
-  num_overlays = gst_video_overlay_composition_n_rectangles (meta->overlay);
-  if (!num_overlays) {
-    gst_d3d11_overlay_compositor_free_overlays (compositor);
+  if (priv->rects_to_upload.empty ()) {
+    priv->overlays.clear ();
     return TRUE;
   }
 
-  GST_LOG_OBJECT (compositor, "Upload %d overlay rectangles", num_overlays);
-
-  /* Upload new overlay */
-  for (i = 0; i < num_overlays; i++) {
-    GstVideoOverlayRectangle *rectangle =
-        gst_video_overlay_composition_get_rectangle (meta->overlay, i);
-
-    if (!g_list_find_custom (priv->overlays,
-            rectangle, (GCompareFunc) find_in_compositor)) {
-      GstD3D11CompositionOverlay *overlay = nullptr;
-
-      overlay = gst_d3d11_composition_overlay_new (compositor, rectangle);
-
-      if (!overlay)
+  GST_LOG_OBJECT (compositor, "Found %" G_GSIZE_FORMAT
+      " overlay rectangles, %" G_GSIZE_FORMAT " in current queue",
+      priv->rects_to_upload.size (), priv->overlays.size ());
+
+  /* *INDENT-OFF* */
+  for (auto it : priv->rects_to_upload) {
+    if (std::find_if (priv->overlays.begin (), priv->overlays.end (),
+          & (const auto & overlay) -> bool {
+            return overlay->overlay_rect == it;
+           }) == priv->overlays.end ()) {
+      auto new_overlay = gst_d3d11_composition_overlay_new (compositor, it);
+      if (!new_overlay)
         return FALSE;
 
-      priv->overlays = g_list_append (priv->overlays, overlay);
+      priv->overlays.push_back (new_overlay);
     }
   }
+  /* *INDENT-ON* */
+
+  GST_LOG_OBJECT (compositor, "Overlay rectangles in queue after uploaded %"
+      G_GSIZE_FORMAT, priv->overlays.size ());
 
   /* Remove old overlay */
-  iter = priv->overlays;
-  while (iter) {
-    GstD3D11CompositionOverlay *overlay =
-        (GstD3D11CompositionOverlay *) iter->data;
-    GList *next = iter->next;
-
-    if (!is_in_video_overlay_composition (meta->overlay, overlay)) {
-      priv->overlays = g_list_delete_link (priv->overlays, iter);
-      gst_d3d11_composition_overlay_free (overlay);
+  /* *INDENT-OFF* */
+  auto it = priv->overlays.begin ();
+  while (it != priv->overlays.end ()) {
+    auto old_overlay = *it;
+    if (std::find_if (priv->rects_to_upload.begin (),
+          priv->rects_to_upload.end (), & (const auto & overlay) -> bool {
+            return overlay == old_overlay->overlay_rect;
+          }) == priv->rects_to_upload.end ()) {
+      GST_LOG_OBJECT (compositor, "Removing %p from queue",
+          old_overlay->overlay_rect);
+      it = priv->overlays.erase (it);
+    } else {
+      it++;
     }
-
-    iter = next;
   }
+  /* *INDENT-ON* */
+
+  GST_LOG_OBJECT (compositor, "Final queue size %" G_GSIZE_FORMAT,
+      priv->overlays.size ());
 
   return TRUE;
 }
@@ -633,41 +565,60 @@
     compositor, ID3D11RenderTargetView * rtvGST_VIDEO_MAX_PLANES)
 {
   GstD3D11OverlayCompositorPrivate *priv;
-  GList *iter;
   ID3D11DeviceContext *context;
   ID3D11ShaderResourceView *clear_viewGST_VIDEO_MAX_PLANES = { nullptr, };
   UINT strides = sizeof (VertexData);
   UINT offsets = 0;
+  ID3D11SamplerState *samplers1;
 
   g_return_val_if_fail (compositor != nullptr, FALSE);
   g_return_val_if_fail (rtv != nullptr, FALSE);
 
   priv = compositor->priv;
 
-  if (!priv->overlays)
+  if (priv->overlays.empty ())
     return TRUE;
 
+  samplers0 = priv->sampler.Get ();
+
   context = gst_d3d11_device_get_device_context_handle (compositor->device);
   context->IASetPrimitiveTopology (D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-  context->IASetInputLayout (priv->layout);
-  context->IASetIndexBuffer (priv->index_buffer, DXGI_FORMAT_R16_UINT, 0);
-  context->PSSetSamplers (0, 1, &priv->sampler);
-  context->VSSetShader (priv->vs, nullptr, 0);
-  context->PSSetShader (priv->ps, nullptr, 0);
+  context->IASetInputLayout (priv->layout.Get ());
+  context->IASetIndexBuffer (priv->index_buffer.Get (),
+      DXGI_FORMAT_R16_UINT, 0);
+  context->PSSetSamplers (0, 1, samplers);
+  context->VSSetShader (priv->vs.Get (), nullptr, 0);
   context->RSSetViewports (1, &priv->viewport);
+  context->RSSetState (priv->rs.Get ());
   context->OMSetRenderTargets (1, rtv, nullptr);
-  context->OMSetBlendState (priv->blend, nullptr, 0xffffffff);
+  context->OMSetBlendState (priv->blend.Get (), nullptr, 0xffffffff);
+
+  /* *INDENT-OFF* */
+  for (auto overlay : priv->overlays) {
+    ID3D11ShaderResourceView *srv = { overlay->srv.Get () };
+    ID3D11Buffer *vertex_buf = { overlay->vertex_buffer.Get () };
+    GstMapInfo info;
+    GstMemory *mem = nullptr;
+
+    if (overlay->d3d11_buffer) {
+      mem = gst_buffer_peek_memory (overlay->d3d11_buffer, 0);
+      gst_memory_map (mem, &info, (GstMapFlags) (GST_MAP_D3D11 | GST_MAP_READ));
+    }
 
-  for (iter = priv->overlays; iter; iter = g_list_next (iter)) {
-    GstD3D11CompositionOverlay *overlay =
-        (GstD3D11CompositionOverlay *) iter->data;
+    if (!overlay->premul_alpha)
+      context->PSSetShader (priv->premul_ps.Get (), nullptr, 0);
+    else
+      context->PSSetShader (priv->ps.Get (), nullptr, 0);
 
-    context->PSSetShaderResources (0, 1, &overlay->srv);
-    context->IASetVertexBuffers (0,
-        1, &overlay->vertex_buffer, &strides, &offsets);
+    context->PSSetShaderResources (0, 1, srv);
+    context->IASetVertexBuffers (0, 1, vertex_buf, &strides, &offsets);
 
     context->DrawIndexed (6, 0, 0);
+
+    if (mem)
+      gst_memory_unmap (mem, &info);
   }
+  /* *INDENT-ON* */
 
   context->PSSetShaderResources (0, 1, clear_view);
   context->OMSetRenderTargets (0, nullptr, nullptr);

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11pluginutils.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11pluginutils.cpp Changed

@@ -26,10 +26,138 @@
 
 #include <windows.h>
 #include <versionhelpers.h>
+#include <wrl.h>
+
+#include "hlsl/gstd3d11plugin-hlsl.h"
+
+/* Disable platform-specific intrinsics */
+#define _XM_NO_INTRINSICS_
+#include <DirectXMath.h>
 
 GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_plugin_utils_debug);
 #define GST_CAT_DEFAULT gst_d3d11_plugin_utils_debug
 
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+using namespace DirectX;
+/* *INDENT-ON* */
+
+/**
+ * GstD3D11AlphaMode:
+ *
+ * Since: 1.24
+ */
+GType
+gst_d3d11_alpha_mode_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue alpha_mode = {
+    /**
+     * GstD3D11AlphaMode::unspecified:
+     *
+     * Since: 1.24
+     */
+    {GST_D3D11_ALPHA_MODE_UNSPECIFIED, "Unspecified", "unspecified"},
+
+    /**
+     * GstD3D11AlphaMode::premultiplied:
+     *
+     * Since: 1.24
+     */
+    {GST_D3D11_ALPHA_MODE_PREMULTIPLIED, "Premultiplied", "premultiplied"},
+
+    /**
+     * GstD3D11AlphaMode::straight:
+     *
+     * Since: 1.24
+     */
+    {GST_D3D11_ALPHA_MODE_STRAIGHT, "Straight", "straight"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstD3D11AlphaMode", alpha_mode);
+  } GST_D3D11_CALL_ONCE_END;
+
+  return type;
+}
+
+/**
+ * GstD3D11MSAAMode:
+ *
+ * Since: 1.24
+ */
+GType
+gst_d3d11_msaa_mode_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue msaa_mode = {
+    {GST_D3D11_MSAA_DISABLED, "Disabled", "disabled"},
+    {GST_D3D11_MSAA_2X, "2x MSAA", "2x"},
+    {GST_D3D11_MSAA_4X, "4x MSAA", "4x"},
+    {GST_D3D11_MSAA_8X, "8x MSAA", "8x"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstD3D11MSAAMode", msaa_mode);
+  } GST_D3D11_CALL_ONCE_END;
+
+  return type;
+}
+
+/**
+ * GstD3D11SamplingMethod:
+ *
+ * Texture sampling method
+ *
+ * Since: 1.24
+ */
+GType
+gst_d3d11_sampling_method_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue methods = {
+    /**
+     * GstD3D11SamplingMethod::nearest-neighbour:
+     *
+     * Since: 1.24
+     */
+    {GST_D3D11_SAMPLING_METHOD_NEAREST,
+        "Nearest Neighbour", "nearest-neighbour"},
+
+    /**
+     * GstD3D11SamplingMethod::bilinear:
+     *
+     * Since: 1.24
+     */
+    {GST_D3D11_SAMPLING_METHOD_BILINEAR,
+        "Bilinear", "bilinear"},
+
+    /**
+     * GstD3D11SamplingMethod::linear-minification:
+     *
+     * Since: 1.24
+     */
+    {GST_D3D11_SAMPLING_METHOD_LINEAR_MINIFICATION,
+        "Linear minification, point magnification", "linear-minification"},
+
+    /**
+     * GstD3D11SamplingMethod::anisotropic:
+     *
+     * Since: 1.24
+     */
+    {GST_D3D11_SAMPLING_METHOD_ANISOTROPIC, "Anisotropic", "anisotropic"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstD3D11SamplingMethod", methods);
+  } GST_D3D11_CALL_ONCE_END;
+
+  return type;
+}
+
 /* Max Texture Dimension for feature level 11_0 ~ 12_1 */
 static guint _gst_d3d11_texture_max_dimension = 16384;
 
@@ -87,24 +215,11 @@
 }
 
 GstD3D11DeviceVendor
-gst_d3d11_get_device_vendor (GstD3D11Device * device)
+gst_d3d11_get_device_vendor_from_id (guint vendor_id)
 {
-  guint device_id = 0;
-  guint vendor_id = 0;
-  gchar *desc = NULL;
   GstD3D11DeviceVendor vendor = GST_D3D11_DEVICE_VENDOR_UNKNOWN;
 
-  g_return_val_if_fail (GST_IS_D3D11_DEVICE (device),
-      GST_D3D11_DEVICE_VENDOR_UNKNOWN);
-
-  g_object_get (device, "device-id", &device_id, "vendor-id", &vendor_id,
-      "description", &desc, NULL);
-
   switch (vendor_id) {
-    case 0:
-      if (device_id == 0 && desc && g_strrstr (desc, "SraKmd"))
-        vendor = GST_D3D11_DEVICE_VENDOR_XBOX;
-      break;
     case 0x1002:
     case 0x1022:
       vendor = GST_D3D11_DEVICE_VENDOR_AMD;
@@ -122,9 +237,32 @@
       break;
   }
 
+  return vendor;
+}
+
+GstD3D11DeviceVendor
+gst_d3d11_get_device_vendor (GstD3D11Device * device)
+{
+  guint device_id = 0;
+  guint vendor_id = 0;
+  gchar *desc = nullptr;
+  GstD3D11DeviceVendor vendor = GST_D3D11_DEVICE_VENDOR_UNKNOWN;
+
+  g_return_val_if_fail (GST_IS_D3D11_DEVICE (device),
+      GST_D3D11_DEVICE_VENDOR_UNKNOWN);
+
+  g_object_get (device, "device-id", &device_id, "vendor-id", &vendor_id,
+      "description", &desc, nullptr);
+
+  if (device_id == 0 && desc && g_strrstr (desc, "SraKmd"))
+    vendor = GST_D3D11_DEVICE_VENDOR_XBOX;
+
   g_free (desc);
 
-  return vendor;
+  if (vendor != GST_D3D11_DEVICE_VENDOR_UNKNOWN)
+    return vendor;
+
+  return gst_d3d11_get_device_vendor_from_id (vendor_id);
 }
 
 gboolean
@@ -638,3 +776,267 @@
 
   return pool;
 }
+
+HRESULT
+gst_d3d11_get_pixel_shader_checker_luma (GstD3D11Device * device,
+    ID3D11PixelShader ** ps)
+{
+  static gint64 token = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_pixel_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+  return gst_d3d11_device_get_pixel_shader (device, token,
+      g_PSMain_checker_luma, sizeof (g_PSMain_checker_luma),
+      g_PSMain_checker_luma_str, sizeof (g_PSMain_checker_luma_str),
+      "PSMain_checker_luma", nullptr, ps);
+}
+
+HRESULT
+gst_d3d11_get_pixel_shader_checker_rgb (GstD3D11Device * device,
+    ID3D11PixelShader ** ps)
+{
+  static gint64 token = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_pixel_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+  return gst_d3d11_device_get_pixel_shader (device, token,
+      g_PSMain_checker_rgb, sizeof (g_PSMain_checker_rgb),
+      g_PSMain_checker_rgb_str, sizeof (g_PSMain_checker_rgb_str),
+      "PSMain_checker_rgb", nullptr, ps);
+}
+
+HRESULT
+gst_d3d11_get_pixel_shader_checker_vuya (GstD3D11Device * device,
+    ID3D11PixelShader ** ps)
+{
+  static gint64 token = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_pixel_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+  return gst_d3d11_device_get_pixel_shader (device, token,
+      g_PSMain_checker_vuya, sizeof (g_PSMain_checker_vuya),
+      g_PSMain_checker_vuya_str, sizeof (g_PSMain_checker_vuya_str),
+      "PSMain_checker_vuya", nullptr, ps);
+}
+
+HRESULT
+gst_d3d11_get_pixel_shader_checker (GstD3D11Device * device,
+    ID3D11PixelShader ** ps)
+{
+  static gint64 token = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_pixel_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+  return gst_d3d11_device_get_pixel_shader (device, token,
+      g_PSMain_checker, sizeof (g_PSMain_checker),
+      g_PSMain_checker_str, sizeof (g_PSMain_checker_str),
+      "PSMain_checker", nullptr, ps);
+}
+
+HRESULT
+gst_d3d11_get_pixel_shader_color (GstD3D11Device * device,
+    ID3D11PixelShader ** ps)
+{
+  static gint64 token = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_pixel_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+  return gst_d3d11_device_get_pixel_shader (device, token,
+      g_PSMain_color, sizeof (g_PSMain_color),
+      g_PSMain_color_str, sizeof (g_PSMain_color_str), "PSMain_color",
+      nullptr, ps);
+}
+
+HRESULT
+gst_d3d11_get_pixel_shader_sample_premul (GstD3D11Device * device,
+    ID3D11PixelShader ** ps)
+{
+  static gint64 token = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_pixel_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+  return gst_d3d11_device_get_pixel_shader (device, token,
+      g_PSMain_sample_premul, sizeof (g_PSMain_sample_premul),
+      g_PSMain_sample_premul_str, sizeof (g_PSMain_sample_premul_str),
+      "PSMain_sample_premul", nullptr, ps);
+}
+
+HRESULT
+gst_d3d11_get_pixel_shader_sample (GstD3D11Device * device,
+    ID3D11PixelShader ** ps)
+{
+  static gint64 token = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_pixel_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+  return gst_d3d11_device_get_pixel_shader (device, token,
+      g_PSMain_sample, sizeof (g_PSMain_sample),
+      g_PSMain_sample_str, sizeof (g_PSMain_sample_str), "PSMain_sample",
+      nullptr, ps);
+}
+
+HRESULT
+gst_d3d11_get_pixel_shader_snow (GstD3D11Device * device,
+    ID3D11PixelShader ** ps)
+{
+  static gint64 token = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_pixel_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+  return gst_d3d11_device_get_pixel_shader (device, token,
+      g_PSMain_snow, sizeof (g_PSMain_snow),
+      g_PSMain_snow_str, sizeof (g_PSMain_snow_str), "PSMain_snow",
+      nullptr, ps);
+}
+
+HRESULT
+gst_d3d11_get_vertex_shader_color (GstD3D11Device * device,
+    ID3D11VertexShader ** vs, ID3D11InputLayout ** layout)
+{
+  static gint64 token = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_vertex_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+  D3D11_INPUT_ELEMENT_DESC input_desc2;
+
+  input_desc0.SemanticName = "POSITION";
+  input_desc0.SemanticIndex = 0;
+  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+  input_desc0.InputSlot = 0;
+  input_desc0.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
+  input_desc0.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+  input_desc0.InstanceDataStepRate = 0;
+
+  input_desc1.SemanticName = "COLOR";
+  input_desc1.SemanticIndex = 0;
+  input_desc1.Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+  input_desc1.InputSlot = 0;
+  input_desc1.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
+  input_desc1.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+  input_desc1.InstanceDataStepRate = 0;
+
+  return gst_d3d11_device_get_vertex_shader (device, token,
+      g_VSMain_color, sizeof (g_VSMain_color),
+      g_VSMain_color_str, sizeof (g_VSMain_color_str), "VSMain_color",
+      input_desc, G_N_ELEMENTS (input_desc), vs, layout);
+}
+
+HRESULT
+gst_d3d11_get_vertex_shader_coord (GstD3D11Device * device,
+    ID3D11VertexShader ** vs, ID3D11InputLayout ** layout)
+{
+  static gint64 token = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_vertex_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+  D3D11_INPUT_ELEMENT_DESC input_desc2;
+
+  input_desc0.SemanticName = "POSITION";
+  input_desc0.SemanticIndex = 0;
+  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+  input_desc0.InputSlot = 0;
+  input_desc0.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
+  input_desc0.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+  input_desc0.InstanceDataStepRate = 0;
+
+  input_desc1.SemanticName = "TEXCOORD";
+  input_desc1.SemanticIndex = 0;
+  input_desc1.Format = DXGI_FORMAT_R32G32_FLOAT;
+  input_desc1.InputSlot = 0;
+  input_desc1.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
+  input_desc1.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+  input_desc1.InstanceDataStepRate = 0;
+
+  return gst_d3d11_device_get_vertex_shader (device, token,
+      g_VSMain_coord, sizeof (g_VSMain_coord),
+      g_VSMain_coord_str, sizeof (g_VSMain_coord_str), "VSMain_coord",
+      input_desc, G_N_ELEMENTS (input_desc), vs, layout);
+}
+
+HRESULT
+gst_d3d11_get_vertex_shader_pos (GstD3D11Device * device,
+    ID3D11VertexShader ** vs, ID3D11InputLayout ** layout)
+{
+  static gint64 token = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    token = gst_d3d11_vertex_shader_token_new ();
+  } GST_D3D11_CALL_ONCE_END;
+
+  D3D11_INPUT_ELEMENT_DESC input_desc;
+
+  input_desc.SemanticName = "POSITION";
+  input_desc.SemanticIndex = 0;
+  input_desc.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+  input_desc.InputSlot = 0;
+  input_desc.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
+  input_desc.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
+  input_desc.InstanceDataStepRate = 0;
+
+  return gst_d3d11_device_get_vertex_shader (device, token,
+      g_VSMain_pos, sizeof (g_VSMain_pos),
+      g_VSMain_pos_str, sizeof (g_VSMain_pos_str), "VSMain_pos", &input_desc, 1,
+      vs, layout);
+}
+
+gboolean
+gst_d3d11_need_transform (gfloat rotation_x, gfloat rotation_y,
+    gfloat rotation_z, gfloat scale_x, gfloat scale_y)
+{
+  const gfloat min_diff = 0.00001f;
+
+  if (!XMScalarNearEqual (rotation_x, 0.0f, min_diff) ||
+      !XMScalarNearEqual (rotation_y, 0.0f, min_diff) ||
+      !XMScalarNearEqual (rotation_z, 0.0f, min_diff) ||
+      !XMScalarNearEqual (scale_x, 1.0f, min_diff) ||
+      !XMScalarNearEqual (scale_y, 1.0f, min_diff)) {
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+struct SamplingMethodMap
+{
+  GstD3D11SamplingMethod method;
+  D3D11_FILTER filter;
+};
+
+static const SamplingMethodMap sampling_method_map = {
+  {GST_D3D11_SAMPLING_METHOD_NEAREST, D3D11_FILTER_MIN_MAG_MIP_POINT},
+  {GST_D3D11_SAMPLING_METHOD_BILINEAR, D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT},
+  {GST_D3D11_SAMPLING_METHOD_LINEAR_MINIFICATION,
+      D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT},
+  {GST_D3D11_SAMPLING_METHOD_ANISOTROPIC, D3D11_FILTER_ANISOTROPIC},
+};
+
+D3D11_FILTER
+gst_d3d11_sampling_method_to_native (GstD3D11SamplingMethod method)
+{
+  for (guint i = 0; i < G_N_ELEMENTS (sampling_method_map); i++) {
+    if (sampling_method_mapi.method == method)
+      return sampling_method_mapi.filter;
+  }
+
+  return D3D11_FILTER_MIN_MAG_MIP_POINT;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11pluginutils.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11pluginutils.h Changed

@@ -25,6 +25,8 @@
 #include <gst/video/video.h>
 #include <gst/d3d11/gstd3d11.h>
 #include <gst/d3d11/gstd3d11-private.h>
+#include <gst/d3d11/gstd3d11device-private.h>
+#include <gst/d3d11/gstd3d11converter-private.h>
 
 G_BEGIN_DECLS
 
@@ -38,6 +40,39 @@
   GST_D3D11_DEVICE_VENDOR_XBOX,
 } GstD3D11DeviceVendor;
 
+
+typedef enum
+{
+  GST_D3D11_ALPHA_MODE_UNSPECIFIED = 0,
+  GST_D3D11_ALPHA_MODE_PREMULTIPLIED,
+  GST_D3D11_ALPHA_MODE_STRAIGHT,
+} GstD3D11AlphaMode;
+
+#define GST_TYPE_D3D11_ALPHA_MODE (gst_d3d11_alpha_mode_get_type())
+GType gst_d3d11_alpha_mode_get_type (void);
+
+typedef enum
+{
+  GST_D3D11_MSAA_DISABLED,
+  GST_D3D11_MSAA_2X,
+  GST_D3D11_MSAA_4X,
+  GST_D3D11_MSAA_8X,
+} GstD3D11MSAAMode;
+
+#define GST_TYPE_D3D11_MSAA_MODE (gst_d3d11_msaa_mode_get_type())
+GType gst_d3d11_msaa_mode_get_type (void);
+
+typedef enum
+{
+  GST_D3D11_SAMPLING_METHOD_NEAREST,
+  GST_D3D11_SAMPLING_METHOD_BILINEAR,
+  GST_D3D11_SAMPLING_METHOD_LINEAR_MINIFICATION,
+  GST_D3D11_SAMPLING_METHOD_ANISOTROPIC,
+} GstD3D11SamplingMethod;
+
+#define GST_TYPE_D3D11_SAMPLING_METHOD (gst_d3d11_sampling_method_get_type())
+GType gst_d3d11_sampling_method_get_type (void);
+
 void            gst_d3d11_plugin_utils_init         (D3D_FEATURE_LEVEL feature_level);
 
 GstCaps *       gst_d3d11_get_updated_template_caps (GstStaticCaps * template_caps);
@@ -46,6 +81,8 @@
 
 GstD3D11DeviceVendor gst_d3d11_get_device_vendor    (GstD3D11Device * device);
 
+GstD3D11DeviceVendor gst_d3d11_get_device_vendor_from_id (guint vendor_id);
+
 gboolean        gst_d3d11_hdr_meta_data_to_dxgi     (GstVideoMasteringDisplayInfo * minfo,
                                                      GstVideoContentLightLevel * cll,
                                                      DXGI_HDR_METADATA_HDR10 * dxgi_hdr10);
@@ -87,6 +124,50 @@
                                                          guint min_buffers,
                                                          guint max_buffers);
 
+HRESULT         gst_d3d11_get_pixel_shader_checker_luma (GstD3D11Device * device,
+                                                         ID3D11PixelShader ** ps);
+
+HRESULT         gst_d3d11_get_pixel_shader_checker_rgb  (GstD3D11Device * device,
+                                                         ID3D11PixelShader ** ps);
+
+HRESULT         gst_d3d11_get_pixel_shader_checker_vuya (GstD3D11Device * device,
+                                                         ID3D11PixelShader ** ps);
+
+HRESULT         gst_d3d11_get_pixel_shader_checker (GstD3D11Device * device,
+                                                    ID3D11PixelShader ** ps);
+
+HRESULT         gst_d3d11_get_pixel_shader_color   (GstD3D11Device * device,
+                                                    ID3D11PixelShader ** ps);
+
+HRESULT         gst_d3d11_get_pixel_shader_sample_premul (GstD3D11Device * device,
+                                                          ID3D11PixelShader ** ps);
+
+HRESULT         gst_d3d11_get_pixel_shader_sample  (GstD3D11Device * device,
+                                                    ID3D11PixelShader ** ps);
+
+HRESULT         gst_d3d11_get_pixel_shader_snow   (GstD3D11Device * device,
+                                                   ID3D11PixelShader ** ps);
+
+HRESULT         gst_d3d11_get_vertex_shader_color  (GstD3D11Device * device,
+                                                   ID3D11VertexShader ** vs,
+                                                   ID3D11InputLayout ** layout);
+
+HRESULT         gst_d3d11_get_vertex_shader_coord  (GstD3D11Device * device,
+                                                   ID3D11VertexShader ** vs,
+                                                   ID3D11InputLayout ** layout);
+
+HRESULT         gst_d3d11_get_vertex_shader_pos   (GstD3D11Device * device,
+                                                   ID3D11VertexShader ** vs,
+                                                   ID3D11InputLayout ** layout);
+
+gboolean        gst_d3d11_need_transform          (gfloat rotation_x,
+                                                   gfloat rotation_y,
+                                                   gfloat rotation_z,
+                                                   gfloat scale_x,
+                                                   gfloat scale_y);
+
+D3D11_FILTER    gst_d3d11_sampling_method_to_native (GstD3D11SamplingMethod method);
+
 G_END_DECLS
 
 #endif /* __GST_D3D11_PLUGIN_UTILS_H__ */

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11screencapture.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11screencapture.cpp Changed

@@ -79,21 +79,6 @@
 }
 
 gboolean
-gst_d3d11_screen_capture_get_colorimetry (GstD3D11ScreenCapture * capture,
-    GstVideoColorimetry * colorimetry)
-{
-  GstD3D11ScreenCaptureClass *klass;
-
-  g_return_val_if_fail (GST_IS_D3D11_SCREEN_CAPTURE (capture), FALSE);
-  g_return_val_if_fail (colorimetry != nullptr, FALSE);
-
-  klass = GST_D3D11_SCREEN_CAPTURE_GET_CLASS (capture);
-  g_assert (klass->get_colorimetry);
-
-  return klass->get_colorimetry (capture, colorimetry);
-}
-
-gboolean
 gst_d3d11_screen_capture_unlock (GstD3D11ScreenCapture * capture)
 {
   GstD3D11ScreenCaptureClass *klass;
@@ -137,9 +122,7 @@
 GstFlowReturn
 gst_d3d11_screen_capture_do_capture (GstD3D11ScreenCapture * capture,
     GstD3D11Device * device, ID3D11Texture2D * texture,
-    ID3D11RenderTargetView * rtv, ID3D11VertexShader * vs,
-    ID3D11PixelShader * ps, ID3D11InputLayout * layout,
-    ID3D11SamplerState * sampler, ID3D11BlendState * blend,
+    ID3D11RenderTargetView * rtv, ShaderResource * resource,
     D3D11_BOX * crop_box, gboolean draw_mouse)
 {
   GstD3D11ScreenCaptureClass *klass;
@@ -151,7 +134,7 @@
   g_assert (klass->do_capture);
 
   return klass->do_capture (capture, device, texture, rtv,
-      vs, ps, layout, sampler, blend, crop_box, draw_mouse);
+      resource, crop_box, draw_mouse);
 }
 
 HRESULT

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11screencapture.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11screencapture.h Changed

@@ -41,6 +41,16 @@
 #define GST_D3D11_SCREEN_CAPTURE_FLOW_SIZE_CHANGED GST_FLOW_CUSTOM_SUCCESS_1
 #define GST_D3D11_SCREEN_CAPTURE_FLOW_UNSUPPORTED GST_FLOW_CUSTOM_ERROR
 
+struct ShaderResource
+{
+  ID3D11VertexShader * vs;
+  ID3D11PixelShader * ps;
+  ID3D11InputLayout * layout;
+  ID3D11SamplerState * sampler;
+  ID3D11BlendState * blend;
+  ID3D11RasterizerState * rs;
+};
+
 struct _GstD3D11ScreenCapture
 {
   GstObject parent;
@@ -56,9 +66,6 @@
                              guint * width,
                              guint * height);
 
-  gboolean      (*get_colorimetry) (GstD3D11ScreenCapture * capture,
-                                    GstVideoColorimetry * colorimetry);
-
   gboolean      (*unlock)          (GstD3D11ScreenCapture * capture);
 
   gboolean      (*unlock_stop)     (GstD3D11ScreenCapture * capture);
@@ -70,11 +77,7 @@
                                     GstD3D11Device * device,
                                     ID3D11Texture2D * texture,
                                     ID3D11RenderTargetView * rtv,
-                                    ID3D11VertexShader * vs,
-                                    ID3D11PixelShader * ps,
-                                    ID3D11InputLayout * layout,
-                                    ID3D11SamplerState * sampler,
-                                    ID3D11BlendState * blend,
+                                    ShaderResource * resource,
                                     D3D11_BOX * crop_box,
                                     gboolean draw_mouse);
 };
@@ -87,9 +90,6 @@
                                                    guint * width,
                                                    guint * height);
 
-gboolean        gst_d3d11_screen_capture_get_colorimetry (GstD3D11ScreenCapture * capture,
-                                                          GstVideoColorimetry * colorimetry);
-
 gboolean        gst_d3d11_screen_capture_unlock      (GstD3D11ScreenCapture * capture);
 
 gboolean        gst_d3d11_screen_capture_unlock_stop (GstD3D11ScreenCapture * capture);
@@ -101,11 +101,7 @@
                                                       GstD3D11Device * device,
                                                       ID3D11Texture2D * texture,
                                                       ID3D11RenderTargetView * rtv,
-                                                      ID3D11VertexShader * vs,
-                                                      ID3D11PixelShader * ps,
-                                                      ID3D11InputLayout * layout,
-                                                      ID3D11SamplerState * sampler,
-                                                      ID3D11BlendState * blend,
+                                                      ShaderResource * resource,
                                                       D3D11_BOX * crop_box,
                                                       gboolean draw_mouse);

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11screencapturedevice.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11screencapturedevice.cpp Changed

@@ -39,8 +39,10 @@
 
 static GstStaticCaps template_caps =
     GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
-    (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, "BGRA") ", pixel-aspect-ratio = 1/1;"
-    GST_VIDEO_CAPS_MAKE ("BGRA") ", pixel-aspect-ratio = 1/1");
+    (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY,
+        "BGRA") ", pixel-aspect-ratio = 1/1, colorimetry = (string) sRGB; "
+    GST_VIDEO_CAPS_MAKE ("BGRA") ", pixel-aspect-ratio = 1/1, "
+    "colorimetry = (string) sRGB");
 
 enum
 {
@@ -157,8 +159,8 @@
       GST_DEBUG_FUNCPTR (gst_d3d11_screen_capture_device_provider_probe);
 
   gst_device_provider_class_set_static_metadata (provider_class,
-      "Direct3D11 Desktop Capture Device Provider",
-      "Source/Monitor", "List Direct3D11 desktop capture source devices",
+      "Direct3D11 Screen Capture Device Provider",
+      "Source/Monitor", "List Direct3D11 screen capture source devices",
       "Seungha Yang <seungha@centricular.com>");
 }
 
@@ -175,6 +177,9 @@
   UINT32 num_path = 0;
   UINT32 num_mode = 0;
   LONG query_ret;
+  DISPLAYCONFIG_PATH_INFO *path_infos = nullptr;
+  DISPLAYCONFIG_MODE_INFO *mode_infos = nullptr;
+  gboolean ret = FALSE;
 
   memset (target, 0, sizeof (DISPLAYCONFIG_TARGET_DEVICE_NAME));
 
@@ -183,15 +188,13 @@
   if (query_ret != ERROR_SUCCESS || num_path == 0 || num_mode == 0)
     return FALSE;
 
-  DISPLAYCONFIG_PATH_INFO *path_infos = (DISPLAYCONFIG_PATH_INFO *)
-      g_alloca (num_path * sizeof (DISPLAYCONFIG_PATH_INFO));
-  DISPLAYCONFIG_MODE_INFO *mode_infos = (DISPLAYCONFIG_MODE_INFO *)
-      g_alloca (num_mode * sizeof (DISPLAYCONFIG_MODE_INFO));
+  path_infos = g_new0 (DISPLAYCONFIG_PATH_INFO, num_path);
+  mode_infos = g_new0 (DISPLAYCONFIG_MODE_INFO, num_mode);
 
   query_ret = QueryDisplayConfig (QDC_ONLY_ACTIVE_PATHS, &num_path,
       path_infos, &num_mode, mode_infos, nullptr);
   if (query_ret != ERROR_SUCCESS)
-    return FALSE;
+    goto out;
 
   for (UINT32 i = 0; i < num_path; i++) {
     DISPLAYCONFIG_PATH_INFO *p = &path_infosi;
@@ -226,10 +229,15 @@
 
     memcpy (target, &tmp, sizeof (DISPLAYCONFIG_TARGET_DEVICE_NAME));
 
-    return TRUE;
+    ret = TRUE;
+    break;
   }
 
-  return FALSE;
+out:
+  g_free (path_infos);
+  g_free (mode_infos);
+
+  return ret;
 }
 
 /* XXX: please bump MinGW toolchain version,
@@ -312,7 +320,9 @@
   GstCaps *caps;
   gint width, height, left, top, right, bottom;
   GstStructure *props;
-  std::wstring_convert < std::codecvt_utf8 < wchar_t >, wchar_t >converter;
+  /* *INDENT-OFF* */
+  std::wstring_convert < std::codecvt_utf8 < wchar_t >, wchar_t > converter;
+  /* *INDENT-ON* */
   std::string device_name;
   std::string display_name;
   std::string device_path;

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11screencapturesrc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11screencapturesrc.cpp Changed

@@ -66,6 +66,7 @@
   PROP_SHOW_BORDER,
   PROP_CAPTURE_API,
   PROP_ADAPTER,
+  PROP_WINDOW_CAPTURE_MODE,
 };
 
 typedef enum
@@ -74,6 +75,12 @@
   GST_D3D11_SCREEN_CAPTURE_API_WGC,
 } GstD3D11ScreenCaptureAPI;
 
+typedef enum
+{
+  GST_D3D11_WINDOW_CAPTURE_DEFAULT,
+  GST_D3D11_WINDOW_CAPTURE_CLIENT,
+} GstD3D11WindowCaptureMode;
+
 #ifdef HAVE_WINRT_CAPTURE
 /**
  * GstD3D11ScreenCaptureAPI:
@@ -109,6 +116,42 @@
 
   return api_type;
 }
+
+/**
+ * GstD3D11WindowCaptureMode:
+ *
+ * Since: 1.24
+ */
+#define GST_TYPE_D3D11_WINDOW_CAPTURE_MODE (gst_d3d11_window_capture_mode_get_type())
+static GType
+gst_d3d11_window_capture_mode_get_type (void)
+{
+  static GType type = 0;
+
+  GST_D3D11_CALL_ONCE_BEGIN {
+    static const GEnumValue hwnd_modes = {
+      /**
+       * GstD3D11WindowCaptureMode::default:
+       *
+       * Since: 1.24
+       */
+      {GST_D3D11_WINDOW_CAPTURE_DEFAULT,
+          "Capture entire window area", "default"},
+
+      /**
+       * GstD3D11WindowCaptureMode::client:
+       *
+       * Since: 1.24
+       */
+      {GST_D3D11_WINDOW_CAPTURE_CLIENT, "Capture client area", "client"},
+      {0, nullptr, nullptr},
+    };
+
+    type = g_enum_register_static ("GstD3D11WindowCaptureMode", hwnd_modes);
+  } GST_D3D11_CALL_ONCE_END;
+
+  return type;
+}
 #endif
 
 #define DEFAULT_MONITOR_INDEX -1
@@ -116,11 +159,14 @@
 #define DEFAULT_SHOW_BORDER FALSE
 #define DEFAULT_CAPTURE_API GST_D3D11_SCREEN_CAPTURE_API_DXGI
 #define DEFAULT_ADAPTER -1
+#define DEFAULT_WINDOW_CAPTURE_MODE GST_D3D11_WINDOW_CAPTURE_DEFAULT
 
 static GstStaticCaps template_caps =
     GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
-    (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, "BGRA") ", pixel-aspect-ratio = 1/1;"
-    GST_VIDEO_CAPS_MAKE ("BGRA") ", pixel-aspect-ratio = 1/1");
+    (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY,
+        "BGRA") ", pixel-aspect-ratio = 1/1, colorimetry = (string) sRGB; "
+    GST_VIDEO_CAPS_MAKE ("BGRA") ", pixel-aspect-ratio = 1/1, "
+    "colorimetry = (string) sRGB");
 
 struct _GstD3D11ScreenCaptureSrc
 {
@@ -142,6 +188,7 @@
   gboolean show_cursor;
   gboolean show_border;
   GstD3D11ScreenCaptureAPI capture_api;
+  GstD3D11WindowCaptureMode hwnd_capture_mode;
   gint adapter;
 
   guint crop_x;
@@ -156,11 +203,7 @@
 
   gboolean downstream_supports_d3d11;
 
-  ID3D11VertexShader *vs;
-  ID3D11PixelShader *ps;
-  ID3D11InputLayout *layout;
-  ID3D11SamplerState *sampler;
-  ID3D11BlendState *blend;
+  ShaderResource resource;
 
   CRITICAL_SECTION lock;
 };
@@ -343,6 +386,22 @@
             -1, G_MAXINT32, DEFAULT_ADAPTER,
             (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
                 GST_PARAM_CONDITIONALLY_AVAILABLE | G_PARAM_STATIC_STRINGS)));
+
+    /**
+     * GstD3D11ScreenCaptureSrc:window-capture-mode:
+     *
+     * Window capture mode to use
+     *
+     * Since: 1.24
+     */
+    g_object_class_install_property (gobject_class, PROP_WINDOW_CAPTURE_MODE,
+        g_param_spec_enum ("window-capture-mode", "Window Capture Mode",
+            "Window capture mode to use if \"window-handle\" is set",
+            GST_TYPE_D3D11_WINDOW_CAPTURE_MODE, DEFAULT_WINDOW_CAPTURE_MODE,
+            (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+                GST_PARAM_CONDITIONALLY_AVAILABLE | G_PARAM_STATIC_STRINGS)));
+    gst_type_mark_as_plugin_api (GST_TYPE_D3D11_WINDOW_CAPTURE_MODE,
+        (GstPluginAPIFlags) 0);
   }
 #endif
 
@@ -350,7 +409,7 @@
       GST_DEBUG_FUNCPTR (gst_d3d11_screen_capture_src_set_context);
 
   gst_element_class_set_static_metadata (element_class,
-      "Direct3D11 screen capture src", "Source/Video",
+      "Direct3D11 Screen Capture Source", "Source/Video",
       "Captures desktop screen", "Seungha Yang <seungha@centricular.com>");
 
   caps = gst_d3d11_get_updated_template_caps (&template_caps);
@@ -388,6 +447,7 @@
   self->show_cursor = DEFAULT_SHOW_CURSOR;
   self->show_border = DEFAULT_SHOW_BORDER;
   self->capture_api = DEFAULT_CAPTURE_API;
+  self->hwnd_capture_mode = DEFAULT_WINDOW_CAPTURE_MODE;
   self->adapter = DEFAULT_ADAPTER;
   self->min_latency = GST_CLOCK_TIME_NONE;
   self->max_latency = GST_CLOCK_TIME_NONE;
@@ -459,6 +519,10 @@
     case PROP_ADAPTER:
       self->adapter = g_value_get_int (value);
       break;
+    case PROP_WINDOW_CAPTURE_MODE:
+      self->hwnd_capture_mode =
+          (GstD3D11WindowCaptureMode) g_value_get_enum (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -505,6 +569,9 @@
     case PROP_ADAPTER:
       g_value_set_int (value, self->adapter);
       break;
+    case PROP_WINDOW_CAPTURE_MODE:
+      g_value_set_enum (value, self->hwnd_capture_mode);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -565,7 +632,6 @@
   GstD3D11ScreenCaptureSrc *self = GST_D3D11_SCREEN_CAPTURE_SRC (bsrc);
   GstCaps *caps = NULL;
   guint width, height;
-  GstVideoColorimetry color;
 
   if (!self->capture) {
     GST_DEBUG_OBJECT (self, "capture object is not configured yet");
@@ -582,16 +648,6 @@
   gst_caps_set_simple (caps, "width", G_TYPE_INT, width, "height",
       G_TYPE_INT, height, nullptr);
 
-  if (gst_d3d11_screen_capture_get_colorimetry (self->capture, &color)) {
-    gchar *color_str = gst_video_colorimetry_to_string (&color);
-
-    if (color_str) {
-      gst_caps_set_simple (caps, "colorimetry", G_TYPE_STRING, color_str,
-          nullptr);
-      g_free (color_str);
-    }
-  }
-
   if (filter) {
     GstCaps *tmp =
         gst_caps_intersect_full (filter, caps, GST_CAPS_INTERSECT_FIRST);
@@ -733,7 +789,8 @@
           GST_D3D11_ALLOCATION_FLAG_DEFAULT,
           D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET, 0);
     } else {
-      d3d11_params->desc0.BindFlags |= D3D11_BIND_RENDER_TARGET;
+      gst_d3d11_allocation_params_set_bind_flags (d3d11_params,
+          D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET);
     }
 
     gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
@@ -765,7 +822,8 @@
       d3d11_params = gst_d3d11_allocation_params_new (self->device, &vinfo,
           GST_D3D11_ALLOCATION_FLAG_DEFAULT, D3D11_BIND_RENDER_TARGET, 0);
     } else {
-      d3d11_params->desc0.BindFlags |= D3D11_BIND_RENDER_TARGET;
+      gst_d3d11_allocation_params_set_bind_flags (d3d11_params,
+          D3D11_BIND_RENDER_TARGET);
     }
 
     gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
@@ -801,83 +859,33 @@
 static gboolean
 gst_d3d11_screen_capture_prepare_shader (GstD3D11ScreenCaptureSrc * self)
 {
-  /* *INDENT-OFF* */
-  static const gchar vs_str =
-      "struct VS_INPUT {\n"
-      "  float4 Position: POSITION;\n"
-      "  float2 Texture: TEXCOORD;\n"
-      "};\n"
-      "\n"
-      "struct VS_OUTPUT {\n"
-      "  float4 Position: SV_POSITION;\n"
-      "  float2 Texture: TEXCOORD;\n"
-      "};\n"
-      "\n"
-      "VS_OUTPUT main (VS_INPUT input)\n"
-      "{\n"
-      "  return input;\n"
-      "}";
-  static const gchar ps_str =
-      "Texture2D shaderTexture;\n"
-      "SamplerState samplerState;\n"
-      "\n"
-      "struct PS_INPUT {\n"
-      "  float4 Position: SV_POSITION;\n"
-      "  float2 Texture: TEXCOORD;\n"
-      "};\n"
-      "\n"
-      "struct PS_OUTPUT {\n"
-      "  float4 Plane: SV_Target;\n"
-      "};\n"
-      "\n"
-      "PS_OUTPUT main(PS_INPUT input)\n"
-      "{\n"
-      "  PS_OUTPUT output;\n"
-      "  output.Plane = shaderTexture.Sample(samplerState, input.Texture);\n"
-      "  return output;\n"
-      "}";
-  /* *INDENT-ON* */
-  D3D11_INPUT_ELEMENT_DESC input_desc = {
-    {"POSITION",
-        0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0},
-    {"TEXCOORD",
-        0, DXGI_FORMAT_R32G32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0}
-  };
   ComPtr < ID3D11VertexShader > vs;
   ComPtr < ID3D11InputLayout > layout;
   ComPtr < ID3D11PixelShader > ps;
   ComPtr < ID3D11SamplerState > sampler;
   ComPtr < ID3D11BlendState > blend;
-  D3D11_SAMPLER_DESC sampler_desc;
+  ComPtr < ID3D11RasterizerState > rs;
   D3D11_BLEND_DESC blend_desc;
   ID3D11Device *device_handle;
   HRESULT hr;
+  ShaderResource *resource = &self->resource;
 
   device_handle = gst_d3d11_device_get_device_handle (self->device);
 
-  hr = gst_d3d11_create_vertex_shader_simple (self->device,
-      vs_str, "main", input_desc, G_N_ELEMENTS (input_desc), &vs, &layout);
+  hr = gst_d3d11_get_vertex_shader_coord (self->device, &vs, &layout);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self, "Failed to create vertex shader");
     return FALSE;
   }
 
-  hr = gst_d3d11_create_pixel_shader_simple (self->device, ps_str, "main", &ps);
+  hr = gst_d3d11_get_pixel_shader_sample (self->device, &ps);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self, "Failed to create pixel shader");
     return FALSE;
   }
 
-  memset (&sampler_desc, 0, sizeof (D3D11_SAMPLER_DESC));
-  sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
-  sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
-  sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
-  sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
-  sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER;
-  sampler_desc.MinLOD = 0;
-  sampler_desc.MaxLOD = D3D11_FLOAT32_MAX;
-
-  hr = device_handle->CreateSamplerState (&sampler_desc, &sampler);
+  hr = gst_d3d11_device_get_sampler (self->device,
+      D3D11_FILTER_MIN_MAG_MIP_LINEAR, &sampler);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self,
         "Failed to create sampler state, hr 0x%x", (guint) hr);
@@ -903,11 +911,18 @@
     return FALSE;
   }
 
-  self->vs = vs.Detach ();
-  self->ps = ps.Detach ();
-  self->layout = layout.Detach ();
-  self->sampler = sampler.Detach ();
-  self->blend = blend.Detach ();
+  hr = gst_d3d11_device_get_rasterizer (self->device, &rs);
+  if (!gst_d3d11_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't get rasterizer state");
+    return FALSE;
+  }
+
+  resource->vs = vs.Detach ();
+  resource->ps = ps.Detach ();
+  resource->layout = layout.Detach ();
+  resource->sampler = sampler.Detach ();
+  resource->blend = blend.Detach ();
+  resource->rs = rs.Detach ();
 
   return TRUE;
 }
@@ -965,9 +980,11 @@
 #ifdef HAVE_WINRT_CAPTURE
   if (self->window_handle) {
     capture = gst_d3d11_winrt_capture_new (self->device, nullptr,
-        self->window_handle);
+        self->window_handle,
+        self->hwnd_capture_mode == GST_D3D11_WINDOW_CAPTURE_CLIENT);
   } else if (self->capture_api == GST_D3D11_SCREEN_CAPTURE_API_WGC) {
-    capture = gst_d3d11_winrt_capture_new (self->device, monitor, nullptr);
+    capture = gst_d3d11_winrt_capture_new (self->device,
+        monitor, nullptr, FALSE);
   }
 #endif
 
@@ -990,7 +1007,8 @@
         self->capture_api = GST_D3D11_SCREEN_CAPTURE_API_WGC;
         gst_clear_object (&capture);
         GST_WARNING_OBJECT (self, "DXGI capture is not available");
-        capture = gst_d3d11_winrt_capture_new (self->device, monitor, nullptr);
+        capture = gst_d3d11_winrt_capture_new (self->device,
+            monitor, nullptr, FALSE);
         if (capture
             && gst_d3d11_screen_capture_prepare (capture) == GST_FLOW_OK) {
           GST_INFO_OBJECT (self, "Fallback to Windows Graphics Capture");
@@ -1059,6 +1077,7 @@
 gst_d3d11_screen_capture_src_stop (GstBaseSrc * bsrc)
 {
   GstD3D11ScreenCaptureSrc *self = GST_D3D11_SCREEN_CAPTURE_SRC (bsrc);
+  ShaderResource *resource = &self->resource;
   GstD3D11CSLockGuard lk (&self->lock);
 
   if (self->pool) {
@@ -1066,11 +1085,12 @@
     gst_clear_object (&self->pool);
   }
 
-  GST_D3D11_CLEAR_COM (self->vs);
-  GST_D3D11_CLEAR_COM (self->ps);
-  GST_D3D11_CLEAR_COM (self->layout);
-  GST_D3D11_CLEAR_COM (self->sampler);
-  GST_D3D11_CLEAR_COM (self->blend);
+  GST_D3D11_CLEAR_COM (resource->vs);
+  GST_D3D11_CLEAR_COM (resource->ps);
+  GST_D3D11_CLEAR_COM (resource->layout);
+  GST_D3D11_CLEAR_COM (resource->sampler);
+  GST_D3D11_CLEAR_COM (resource->blend);
+  GST_D3D11_CLEAR_COM (resource->rs);
 
   gst_clear_object (&self->capture);
   gst_clear_object (&self->device);
@@ -1305,8 +1325,7 @@
   texture = (ID3D11Texture2D *) info.data;
   before_capture = gst_clock_get_time (clock);
   ret = gst_d3d11_screen_capture_do_capture (self->capture, self->device,
-      texture, rtv, self->vs, self->ps, self->layout, self->sampler,
-      self->blend, &self->crop_box, draw_mouse);
+      texture, rtv, &self->resource, &self->crop_box, draw_mouse);
   gst_memory_unmap (mem, &info);
 
   switch (ret) {

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11testsrc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11testsrc.cpp Changed

@@ -40,6 +40,10 @@
 #include "gstd3d11pluginutils.h"
 #include <wrl.h>
 #include <string.h>
+#include <d2d1.h>
+#include <math.h>
+#include <memory>
+#include <vector>
 
 /* *INDENT-OFF* */
 using namespace Microsoft::WRL;
@@ -66,6 +70,10 @@
   GST_D3D11_TEST_SRC_CHECKERS2,
   GST_D3D11_TEST_SRC_CHECKERS4,
   GST_D3D11_TEST_SRC_CHECKERS8,
+  GST_D3D11_TEST_SRC_CIRCULAR,
+  GST_D3D11_TEST_SRC_BLINK,
+  /* sync with videotestsrc */
+  GST_D3D11_TEST_SRC_BALL = 18,
 } GstD3D11TestSrcPattern;
 
 /**
@@ -92,6 +100,27 @@
       {GST_D3D11_TEST_SRC_CHECKERS2, "Checkers 2px", "checkers-2"},
       {GST_D3D11_TEST_SRC_CHECKERS4, "Checkers 4px", "checkers-4"},
       {GST_D3D11_TEST_SRC_CHECKERS8, "Checkers 8px", "checkers-8"},
+
+      /**
+       * GstD3D11TestSrcPattern::circular:
+       *
+       * Since: 1.24
+       */
+      {GST_D3D11_TEST_SRC_CIRCULAR, "Circular", "circular"},
+
+      /**
+       * GstD3D11TestSrcPattern::blink:
+       *
+       * Since: 1.24
+       */
+      {GST_D3D11_TEST_SRC_BLINK, "Blink", "blink"},
+
+      /**
+       * GstD3D11TestSrcPattern::ball:
+       *
+       * Since: 1.24
+       */
+      {GST_D3D11_TEST_SRC_BALL, "Moving ball", "ball"},
       {0, nullptr, nullptr},
     };
 
@@ -160,23 +189,52 @@
   COLOR_DARK_GREY,
 };
 
-typedef struct
+struct SnowConstBuffer
 {
-  ID3D11PixelShader *ps;
-  ID3D11VertexShader *vs;
-  ID3D11InputLayout *layout;
-  ID3D11Buffer *vertex_buffer;
-  ID3D11Buffer *index_buffer;
-  ID3D11Buffer *const_buffer;
-  guint vertex_stride;
-  guint index_count;
-} GstD3D11TestSrcQuad;
+  FLOAT time = 0.0f;
+  FLOAT alpha = 1.0f;
+  FLOAT padding2;
+};
 
-typedef struct
+struct CheckerConstBuffer
+{
+  FLOAT width;
+  FLOAT height;
+  FLOAT checker_size;
+  FLOAT alpha = 1.0f;
+};
+
+struct GstD3D11TestSrcQuad
+{
+  ComPtr < ID3D11PixelShader > ps;
+  ComPtr < ID3D11VertexShader > vs;
+  ComPtr < ID3D11InputLayout > layout;
+  ComPtr < ID3D11Buffer > vertex_buffer;
+  ComPtr < ID3D11Buffer > index_buffer;
+  ComPtr < ID3D11Buffer > const_buffer;
+  guint vertex_stride = 0;
+  guint index_count = 0;
+  gboolean is_checker = FALSE;
+  gboolean is_snow = FALSE;
+  CheckerConstBuffer checker_const_buffer;
+  SnowConstBuffer snow_const_buffer;
+};
+
+struct StaticColor
 {
-  const ColorValue *clear_color;
-  GstD3D11TestSrcQuad *quad2;
-} GstD3D11TestSrcRender;
+  ColorValue value;
+  gboolean is_valid = FALSE;
+};
+
+/* *INDENT-OFF* */
+struct GstD3D11TestSrcRender
+{
+  StaticColor static_color2;
+  std::vector < std::shared_ptr < GstD3D11TestSrcQuad >> quad;
+  ComPtr <ID3D11RasterizerState> rs;
+  GstD3D11TestSrcPattern pattern;
+};
+/* *INDENT-ON* */
 
 struct _GstD3D11TestSrc
 {
@@ -194,6 +252,10 @@
   GstD3D11TestSrcPattern pattern;
   GstD3D11TestSrcRender *render;
   D3D11_VIEWPORT viewport;
+  ID2D1Factory *d2d_factory;
+  gint64 token;
+  gfloat alpha;
+  GstD3D11AlphaMode alpha_mode;
 
   gboolean reverse;
   gint64 n_frames;
@@ -202,13 +264,7 @@
   GstClockTime running_time;
 };
 
-typedef struct
-{
-  FLOAT time;
-  FLOAT padding3;
-} TimeConstBuffer;
-
-typedef struct
+struct UvVertexData
 {
   struct
   {
@@ -221,9 +277,9 @@
     FLOAT u;
     FLOAT v;
   } texture;
-} UvVertexData;
+};
 
-typedef struct
+struct ColorVertexData
 {
   struct
   {
@@ -238,195 +294,41 @@
     FLOAT b;
     FLOAT a;
   } color;
-} ColorVertexData;
-
-/* *INDENT-OFF* */
-static const gchar templ_vs_coord =
-    "struct VS_INPUT {\n"
-    "  float4 Position: POSITION;\n"
-    "  float2 Texture: TEXCOORD;\n"
-    "};\n"
-    "struct VS_OUTPUT {\n"
-    "  float4 Position: SV_POSITION;\n"
-    "  float2 Texture: TEXCOORD;\n"
-    "};\n"
-    "VS_OUTPUT main (VS_INPUT input)\n"
-    "{\n"
-    "  return input;\n"
-    "}";
-
-static const gchar templ_vs_color =
-    "struct VS_INPUT {\n"
-    "  float4 Position: POSITION;\n"
-    "  float4 Color: COLOR;\n"
-    "};\n"
-    "struct VS_OUTPUT {\n"
-    "  float4 Position: SV_POSITION;\n"
-    "  float4 Color: COLOR;\n"
-    "};\n"
-    "VS_OUTPUT main (VS_INPUT input)\n"
-    "{\n"
-    "  return input;\n"
-    "}";
-
-static const gchar templ_ps_snow =
-    "cbuffer TimeConstBuffer : register(b0)\n"
-    "{\n"
-    "  float time;\n"
-    "  float3 padding;\n"
-    "}\n"
-    "struct PS_INPUT {\n"
-    "  float4 Position: SV_POSITION;\n"
-    "  float2 Texture: TEXCOORD;\n"
-    "};\n"
-    "float get_rand(float2 uv)\n"
-    "{\n"
-    "  return frac(sin(dot(uv, float2(12.9898,78.233))) * 43758.5453);\n"
-    "}\n"
-    "float4 main(PS_INPUT input) : SV_Target\n"
-    "{\n"
-    "  float4 output;\n"
-    "  float val = get_rand (time * input.Texture);\n"
-    "  output.rgb = float3(val, val, val);\n"
-    "  output.a = 1.0f;\n"
-    "  return output;\n"
-    "}";
-
-static const gchar templ_ps_smpte =
-    "struct PS_INPUT {\n"
-    "  float4 Position: SV_POSITION;\n"
-    "  float4 Color: COLOR;\n"
-    "};\n"
-    "float4 main(PS_INPUT input) : SV_TARGET\n"
-    "{\n"
-    "  return input.Color;\n"
-    "}";
-
-static const gchar templ_ps_checker =
-    "static const float width = %d;\n"
-    "static const float height = %d;\n"
-    "static const float checker_size = %d;\n"
-    "struct PS_INPUT {\n"
-    "  float4 Position: SV_POSITION;\n"
-    "  float2 Texture: TEXCOORD;\n"
-    "};\n"
-    "float4 main(PS_INPUT input) : SV_Target\n"
-    "{\n"
-    "  float4 output;\n"
-    "  float2 xy_mod = floor (0.5 * input.Texture * float2 (width, height) / checker_size);\n"
-    "  float result = fmod (xy_mod.x + xy_mod.y, 2.0);\n"
-    "  output.r = step (result, 0.5);\n"
-    "  output.g = 1.0 - output.r;\n"
-    "  output.ba = float2 (0.0f, 1.0f);\n"
-    "  return output;\n"
-    "}";
-/* *INDENT-ON* */
+};
 
 static gboolean
 setup_snow_render (GstD3D11TestSrc * self, GstD3D11TestSrcRender * render,
     guint on_smpte)
 {
   HRESULT hr;
-  D3D11_INPUT_ELEMENT_DESC input_desc2;
   D3D11_BUFFER_DESC buffer_desc;
-  D3D11_MAPPED_SUBRESOURCE map;
-  UvVertexData *vertex_data;
-  WORD *indices;
+  D3D11_SUBRESOURCE_DATA subresource;
+  UvVertexData vertex_data4;
+  const WORD indices6 = { 0, 1, 2, 3, 0, 2 };
   ID3D11Device *device_handle =
       gst_d3d11_device_get_device_handle (self->device);
-  ID3D11DeviceContext *context_handle =
-      gst_d3d11_device_get_device_context_handle (self->device);
   ComPtr < ID3D11PixelShader > ps;
   ComPtr < ID3D11VertexShader > vs;
   ComPtr < ID3D11InputLayout > layout;
   ComPtr < ID3D11Buffer > vertex_buffer;
   ComPtr < ID3D11Buffer > index_buffer;
   ComPtr < ID3D11Buffer > const_buffer;
-  GstD3D11TestSrcQuad *quad;
 
-  memset (input_desc, 0, sizeof (input_desc));
   memset (&buffer_desc, 0, sizeof (buffer_desc));
+  memset (&subresource, 0, sizeof (subresource));
 
-  input_desc0.SemanticName = "POSITION";
-  input_desc0.SemanticIndex = 0;
-  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
-  input_desc0.InputSlot = 0;
-  input_desc0.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-  input_desc0.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-  input_desc0.InstanceDataStepRate = 0;
-
-  input_desc1.SemanticName = "TEXCOORD";
-  input_desc1.SemanticIndex = 0;
-  input_desc1.Format = DXGI_FORMAT_R32G32_FLOAT;
-  input_desc1.InputSlot = 0;
-  input_desc1.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-  input_desc1.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-  input_desc1.InstanceDataStepRate = 0;
-
-  hr = gst_d3d11_create_vertex_shader_simple (self->device, templ_vs_coord,
-      "main", input_desc, G_N_ELEMENTS (input_desc), &vs, &layout);
+  hr = gst_d3d11_get_vertex_shader_coord (self->device, &vs, &layout);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self, "Failed to compile vertext shader");
     return FALSE;
   }
 
-  hr = gst_d3d11_create_pixel_shader_simple (self->device,
-      templ_ps_snow, "main", &ps);
+  hr = gst_d3d11_get_pixel_shader_snow (self->device, &ps);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self, "Failed to compile pixel shader");
     return FALSE;
   }
 
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (UvVertexData) * 4;
-  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &vertex_buffer);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to create vertex buffer");
-    return FALSE;
-  }
-
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (WORD) * 6;
-  buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &index_buffer);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to create index buffer");
-    return FALSE;
-  }
-
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (TimeConstBuffer);
-  buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &const_buffer);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to create constant buffer");
-    return FALSE;
-  }
-
-  GstD3D11DeviceLockGuard lk (self->device);
-  hr = context_handle->Map (vertex_buffer.Get (), 0, D3D11_MAP_WRITE_DISCARD, 0,
-      &map);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to map vertex buffer");
-    return FALSE;
-  }
-  vertex_data = (UvVertexData *) map.pData;
-
-  hr = context_handle->Map (index_buffer.Get (), 0, D3D11_MAP_WRITE_DISCARD, 0,
-      &map);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to map index buffer");
-    context_handle->Unmap (vertex_buffer.Get (), 0);
-    return FALSE;
-  }
-  indices = (WORD *) map.pData;
-
   if (on_smpte) {
     FLOAT left, right, top, bottom;
     FLOAT left_u, right_u, top_v, bottom_v;
@@ -497,32 +399,59 @@
     vertex_data3.texture.v = 1.0f;
   }
 
-  /* clockwise indexing */
-  indices0 = 0;               /* bottom left */
-  indices1 = 1;               /* top left */
-  indices2 = 2;               /* top right */
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (UvVertexData) * 4;
+  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
 
-  indices3 = 3;               /* bottom right */
-  indices4 = 0;               /* bottom left  */
-  indices5 = 2;               /* top right */
+  subresource.pSysMem = vertex_data;
+  subresource.SysMemPitch = sizeof (UvVertexData) * 4;
 
-  context_handle->Unmap (vertex_buffer.Get (), 0);
-  context_handle->Unmap (index_buffer.Get (), 0);
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &vertex_buffer);
+  if (!gst_d3d11_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Failed to create vertex buffer");
+    return FALSE;
+  }
 
-  quad = g_new0 (GstD3D11TestSrcQuad, 1);
-  if (on_smpte)
-    render->quad1 = quad;
-  else
-    render->quad0 = quad;
-
-  quad->ps = ps.Detach ();
-  quad->vs = vs.Detach ();
-  quad->layout = layout.Detach ();
-  quad->vertex_buffer = vertex_buffer.Detach ();
-  quad->index_buffer = index_buffer.Detach ();
-  quad->const_buffer = const_buffer.Detach ();
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (WORD) * 6;
+  buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+
+  subresource.pSysMem = indices;
+  subresource.SysMemPitch = sizeof (WORD) * 6;
+
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &index_buffer);
+  if (!gst_d3d11_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Failed to create index buffer");
+    return FALSE;
+  }
+
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (SnowConstBuffer);
+  buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &const_buffer);
+  if (!gst_d3d11_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Failed to create constant buffer");
+    return FALSE;
+  }
+
+  auto quad = std::make_shared < GstD3D11TestSrcQuad > ();
+
+  quad->ps = ps;
+  quad->vs = vs;
+  quad->layout = layout;
+  quad->vertex_buffer = vertex_buffer;
+  quad->index_buffer = index_buffer;
+  quad->const_buffer = const_buffer;
   quad->vertex_stride = sizeof (UvVertexData);
   quad->index_count = 6;
+  quad->is_snow = TRUE;
+  quad->snow_const_buffer.time = 0;
+  quad->snow_const_buffer.alpha = self->alpha;
+
+  render->quad.push_back (quad);
 
   return TRUE;
 }
@@ -531,97 +460,35 @@
 setup_smpte_render (GstD3D11TestSrc * self, GstD3D11TestSrcRender * render)
 {
   HRESULT hr;
-  D3D11_INPUT_ELEMENT_DESC input_desc2;
   D3D11_BUFFER_DESC buffer_desc;
-  D3D11_MAPPED_SUBRESOURCE map;
-  ColorVertexData *vertex_data;
-  WORD *indices;
+  D3D11_SUBRESOURCE_DATA subresource;
+  ColorVertexData vertex_data4 * 20;
+  WORD indices6 * 20;
   ID3D11Device *device_handle =
       gst_d3d11_device_get_device_handle (self->device);
-  ID3D11DeviceContext *context_handle =
-      gst_d3d11_device_get_device_context_handle (self->device);
   ComPtr < ID3D11PixelShader > ps;
   ComPtr < ID3D11VertexShader > vs;
   ComPtr < ID3D11InputLayout > layout;
   ComPtr < ID3D11Buffer > vertex_buffer;
   ComPtr < ID3D11Buffer > index_buffer;
-  GstD3D11TestSrcQuad *quad;
   guint num_vertex = 0;
   guint num_index = 0;
 
-  memset (input_desc, 0, sizeof (input_desc));
   memset (&buffer_desc, 0, sizeof (buffer_desc));
+  memset (&subresource, 0, sizeof (subresource));
 
-  input_desc0.SemanticName = "POSITION";
-  input_desc0.SemanticIndex = 0;
-  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
-  input_desc0.InputSlot = 0;
-  input_desc0.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-  input_desc0.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-  input_desc0.InstanceDataStepRate = 0;
-
-  input_desc1.SemanticName = "COLOR";
-  input_desc1.SemanticIndex = 0;
-  input_desc1.Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
-  input_desc1.InputSlot = 0;
-  input_desc1.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-  input_desc1.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-  input_desc1.InstanceDataStepRate = 0;
-
-  hr = gst_d3d11_create_vertex_shader_simple (self->device, templ_vs_color,
-      "main", input_desc, G_N_ELEMENTS (input_desc), &vs, &layout);
+  hr = gst_d3d11_get_vertex_shader_color (self->device, &vs, &layout);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self, "Failed to compile vertext shader");
     return FALSE;
   }
 
-  hr = gst_d3d11_create_pixel_shader_simple (self->device,
-      templ_ps_smpte, "main", &ps);
+  hr = gst_d3d11_get_pixel_shader_color (self->device, &ps);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self, "Failed to compile pixel shader");
     return FALSE;
   }
 
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (ColorVertexData) * 4 * 20;
-  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &vertex_buffer);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to create vertex buffer");
-    return FALSE;
-  }
-
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (WORD) * 6 * 20;
-  buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &index_buffer);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to create index buffer");
-    return FALSE;
-  }
-
-  GstD3D11DeviceLockGuard lk (self->device);
-  hr = context_handle->Map (vertex_buffer.Get (), 0, D3D11_MAP_WRITE_DISCARD, 0,
-      &map);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to map vertex buffer");
-    return FALSE;
-  }
-  vertex_data = (ColorVertexData *) map.pData;
-
-  hr = context_handle->Map (index_buffer.Get (), 0, D3D11_MAP_WRITE_DISCARD, 0,
-      &map);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to map index buffer");
-    context_handle->Unmap (vertex_buffer.Get (), 0);
-    return FALSE;
-  }
-  indices = (WORD *) map.pData;
-
   /* top row */
   for (guint i = 0; i < 7; i++) {
     FLOAT left, right, top, bottom;
@@ -642,25 +509,28 @@
     vertex_database.color.r = color->r;
     vertex_database.color.g = color->g;
     vertex_database.color.b = color->b;
-    vertex_database.color.a = color->a;
+    vertex_database.color.a = self->alpha;
 
     /* top left */
     vertex_database + 1.position.x = left;
     vertex_database + 1.position.y = top;
     vertex_database + 1.position.z = 0.0f;
     vertex_database + 1.color = vertex_database.color;
+    vertex_database + 1.color.a = self->alpha;
 
     /* top right */
     vertex_database + 2.position.x = right;
     vertex_database + 2.position.y = top;
     vertex_database + 2.position.z = 0.0f;
     vertex_database + 2.color = vertex_database.color;
+    vertex_database + 2.color.a = self->alpha;
 
     /* bottom right */
     vertex_database + 3.position.x = right;
     vertex_database + 3.position.y = bottom;
     vertex_database + 3.position.z = 0.0f;
     vertex_database + 3.color = vertex_database.color;
+    vertex_database + 3.color.a = self->alpha;
 
     /* clockwise indexing */
     indicesidx_base = base;   /* bottom left */
@@ -699,25 +569,28 @@
     vertex_database.color.r = color->r;
     vertex_database.color.g = color->g;
     vertex_database.color.b = color->b;
-    vertex_database.color.a = color->a;
+    vertex_database.color.a = self->alpha;
 
     /* top left */
     vertex_database + 1.position.x = left;
     vertex_database + 1.position.y = top;
     vertex_database + 1.position.z = 0.0f;
     vertex_database + 1.color = vertex_database.color;
+    vertex_database + 1.color.a = self->alpha;
 
     /* top right */
     vertex_database + 2.position.x = right;
     vertex_database + 2.position.y = top;
     vertex_database + 2.position.z = 0.0f;
     vertex_database + 2.color = vertex_database.color;
+    vertex_database + 2.color.a = self->alpha;
 
     /* bottom right */
     vertex_database + 3.position.x = right;
     vertex_database + 3.position.y = bottom;
     vertex_database + 3.position.z = 0.0f;
     vertex_database + 3.color = vertex_database.color;
+    vertex_database + 3.color.a = self->alpha;
 
     /* clockwise indexing */
     indicesidx_base = base;   /* bottom left */
@@ -758,25 +631,28 @@
     vertex_database.color.r = color->r;
     vertex_database.color.g = color->g;
     vertex_database.color.b = color->b;
-    vertex_database.color.a = color->a;
+    vertex_database.color.a = self->alpha;
 
     /* top left */
     vertex_database + 1.position.x = left;
     vertex_database + 1.position.y = top;
     vertex_database + 1.position.z = 0.0f;
     vertex_database + 1.color = vertex_database.color;
+    vertex_database + 1.color.a = self->alpha;
 
     /* top right */
     vertex_database + 2.position.x = right;
     vertex_database + 2.position.y = top;
     vertex_database + 2.position.z = 0.0f;
     vertex_database + 2.color = vertex_database.color;
+    vertex_database + 2.color.a = self->alpha;
 
     /* bottom right */
     vertex_database + 3.position.x = right;
     vertex_database + 3.position.y = bottom;
     vertex_database + 3.position.z = 0.0f;
     vertex_database + 3.color = vertex_database.color;
+    vertex_database + 3.color.a = self->alpha;
 
     /* clockwise indexing */
     indicesidx_base = base;   /* bottom left */
@@ -817,25 +693,28 @@
     vertex_database.color.r = color->r;
     vertex_database.color.g = color->g;
     vertex_database.color.b = color->b;
-    vertex_database.color.a = color->a;
+    vertex_database.color.a = self->alpha;
 
     /* top left */
     vertex_database + 1.position.x = left;
     vertex_database + 1.position.y = top;
     vertex_database + 1.position.z = 0.0f;
     vertex_database + 1.color = vertex_database.color;
+    vertex_database + 1.color.a = self->alpha;
 
     /* top right */
     vertex_database + 2.position.x = right;
     vertex_database + 2.position.y = top;
     vertex_database + 2.position.z = 0.0f;
     vertex_database + 2.color = vertex_database.color;
+    vertex_database + 2.color.a = self->alpha;
 
     /* bottom right */
     vertex_database + 3.position.x = right;
     vertex_database + 3.position.y = bottom;
     vertex_database + 3.position.z = 0.0f;
     vertex_database + 3.color = vertex_database.color;
+    vertex_database + 3.color.a = self->alpha;
 
     /* clockwise indexing */
     indicesidx_base = base;   /* bottom left */
@@ -847,19 +726,46 @@
     indicesidx_base + 5 = base + 2;   /* top right */
   }
 
-  context_handle->Unmap (vertex_buffer.Get (), 0);
-  context_handle->Unmap (index_buffer.Get (), 0);
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (ColorVertexData) * 4 * 20;
+  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+
+  subresource.pSysMem = vertex_data;
+  subresource.SysMemPitch = sizeof (ColorVertexData) * 4 * 20;
+
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &vertex_buffer);
+  if (!gst_d3d11_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Failed to create vertex buffer");
+    return FALSE;
+  }
+
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (WORD) * 6 * 20;
+  buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+
+  subresource.pSysMem = indices;
+  subresource.SysMemPitch = sizeof (WORD) * 6 * 20;
 
-  render->quad0 = quad = g_new0 (GstD3D11TestSrcQuad, 1);
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &index_buffer);
+  if (!gst_d3d11_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Failed to create index buffer");
+    return FALSE;
+  }
+
+  auto quad = std::make_shared < GstD3D11TestSrcQuad > ();
 
-  quad->ps = ps.Detach ();
-  quad->vs = vs.Detach ();
-  quad->layout = layout.Detach ();
-  quad->vertex_buffer = vertex_buffer.Detach ();
-  quad->index_buffer = index_buffer.Detach ();
+  quad->ps = ps;
+  quad->vs = vs;
+  quad->layout = layout;
+  quad->vertex_buffer = vertex_buffer;
+  quad->index_buffer = index_buffer;
   quad->vertex_stride = sizeof (ColorVertexData);
   quad->index_count = 6 * 20;
 
+  render->quad.push_back (quad);
+
   return setup_snow_render (self, render, TRUE);
 }
 
@@ -868,98 +774,34 @@
     guint checker_size)
 {
   HRESULT hr;
-  D3D11_INPUT_ELEMENT_DESC input_desc2;
   D3D11_BUFFER_DESC buffer_desc;
-  D3D11_MAPPED_SUBRESOURCE map;
-  UvVertexData *vertex_data;
-  WORD *indices;
+  D3D11_SUBRESOURCE_DATA subresource;
+  UvVertexData vertex_data4;
+  const WORD indices6 = { 0, 1, 2, 3, 0, 2 };
   ID3D11Device *device_handle =
       gst_d3d11_device_get_device_handle (self->device);
-  ID3D11DeviceContext *context_handle =
-      gst_d3d11_device_get_device_context_handle (self->device);
   ComPtr < ID3D11PixelShader > ps;
   ComPtr < ID3D11VertexShader > vs;
   ComPtr < ID3D11InputLayout > layout;
   ComPtr < ID3D11Buffer > vertex_buffer;
   ComPtr < ID3D11Buffer > index_buffer;
-  GstD3D11TestSrcQuad *quad;
-  gchar *ps_src;
+  ComPtr < ID3D11Buffer > const_buffer;
 
-  memset (input_desc, 0, sizeof (input_desc));
   memset (&buffer_desc, 0, sizeof (buffer_desc));
+  memset (&subresource, 0, sizeof (subresource));
 
-  input_desc0.SemanticName = "POSITION";
-  input_desc0.SemanticIndex = 0;
-  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
-  input_desc0.InputSlot = 0;
-  input_desc0.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-  input_desc0.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-  input_desc0.InstanceDataStepRate = 0;
-
-  input_desc1.SemanticName = "TEXCOORD";
-  input_desc1.SemanticIndex = 0;
-  input_desc1.Format = DXGI_FORMAT_R32G32_FLOAT;
-  input_desc1.InputSlot = 0;
-  input_desc1.AlignedByteOffset = D3D11_APPEND_ALIGNED_ELEMENT;
-  input_desc1.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
-  input_desc1.InstanceDataStepRate = 0;
-
-  hr = gst_d3d11_create_vertex_shader_simple (self->device, templ_vs_coord,
-      "main", input_desc, G_N_ELEMENTS (input_desc), &vs, &layout);
+  hr = gst_d3d11_get_vertex_shader_coord (self->device, &vs, &layout);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self, "Failed to compile vertext shader");
     return FALSE;
   }
 
-  ps_src = g_strdup_printf (templ_ps_checker,
-      self->info.width, self->info.height, checker_size);
-  hr = gst_d3d11_create_pixel_shader_simple (self->device, ps_src, "main", &ps);
-  g_free (ps_src);
+  hr = gst_d3d11_get_pixel_shader_checker (self->device, &ps);
   if (!gst_d3d11_result (hr, self->device)) {
     GST_ERROR_OBJECT (self, "Failed to compile pixel shader");
     return FALSE;
   }
 
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (UvVertexData) * 4;
-  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &vertex_buffer);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to create vertex buffer");
-    return FALSE;
-  }
-
-  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
-  buffer_desc.ByteWidth = sizeof (WORD) * 6;
-  buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
-  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-
-  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &index_buffer);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to create index buffer");
-    return FALSE;
-  }
-
-  GstD3D11DeviceLockGuard lk (self->device);
-  hr = context_handle->Map (vertex_buffer.Get (), 0, D3D11_MAP_WRITE_DISCARD, 0,
-      &map);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to map vertex buffer");
-    return FALSE;
-  }
-  vertex_data = (UvVertexData *) map.pData;
-
-  hr = context_handle->Map (index_buffer.Get (), 0, D3D11_MAP_WRITE_DISCARD, 0,
-      &map);
-  if (!gst_d3d11_result (hr, self->device)) {
-    GST_ERROR_OBJECT (self, "Failed to map index buffer");
-    context_handle->Unmap (vertex_buffer.Get (), 0);
-    return FALSE;
-  }
-  indices = (WORD *) map.pData;
-
   /* bottom left */
   vertex_data0.position.x = -1.0f;
   vertex_data0.position.y = -1.0f;
@@ -987,27 +829,83 @@
   vertex_data3.texture.u = 1.0f;
   vertex_data3.texture.v = 1.0f;
 
-  /* clockwise indexing */
-  indices0 = 0;               /* bottom left */
-  indices1 = 1;               /* top left */
-  indices2 = 2;               /* top right */
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (UvVertexData) * 4;
+  buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
 
-  indices3 = 3;               /* bottom right */
-  indices4 = 0;               /* bottom left  */
-  indices5 = 2;               /* top right */
+  subresource.pSysMem = vertex_data;
+  subresource.SysMemPitch = sizeof (UvVertexData) * 4;
 
-  context_handle->Unmap (vertex_buffer.Get (), 0);
-  context_handle->Unmap (index_buffer.Get (), 0);
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &vertex_buffer);
+  if (!gst_d3d11_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Failed to create vertex buffer");
+    return FALSE;
+  }
 
-  render->quad0 = quad = g_new0 (GstD3D11TestSrcQuad, 1);
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (WORD) * 6;
+  buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+
+  subresource.pSysMem = indices;
+  subresource.SysMemPitch = sizeof (WORD) * 6;
+
+  hr = device_handle->CreateBuffer (&buffer_desc, &subresource, &index_buffer);
+  if (!gst_d3d11_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Failed to create index buffer");
+    return FALSE;
+  }
 
-  quad->ps = ps.Detach ();
-  quad->vs = vs.Detach ();
-  quad->layout = layout.Detach ();
-  quad->vertex_buffer = vertex_buffer.Detach ();
-  quad->index_buffer = index_buffer.Detach ();
+  buffer_desc.Usage = D3D11_USAGE_DYNAMIC;
+  buffer_desc.ByteWidth = sizeof (CheckerConstBuffer);
+  buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
+  buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+  hr = device_handle->CreateBuffer (&buffer_desc, nullptr, &const_buffer);
+  if (!gst_d3d11_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Failed to create constant buffer");
+    return FALSE;
+  }
+
+  auto quad = std::make_shared < GstD3D11TestSrcQuad > ();
+
+  quad->ps = ps;
+  quad->vs = vs;
+  quad->layout = layout;
+  quad->vertex_buffer = vertex_buffer;
+  quad->index_buffer = index_buffer;
+  quad->const_buffer = const_buffer;
   quad->vertex_stride = sizeof (UvVertexData);
   quad->index_count = 6;
+  quad->is_checker = TRUE;
+  quad->checker_const_buffer.width = self->info.width;
+  quad->checker_const_buffer.height = self->info.height;
+  quad->checker_const_buffer.checker_size = checker_size;
+  quad->checker_const_buffer.alpha = self->alpha;
+
+  render->quad.push_back (quad);
+
+  return TRUE;
+}
+
+static gboolean
+setup_d2d_render (GstD3D11TestSrc * self, GstD3D11TestSrcRender * render)
+{
+  HRESULT hr;
+  ComPtr < ID2D1Factory > d2d_factory;
+
+  if (self->d2d_factory)
+    return TRUE;
+
+  hr = D2D1CreateFactory (D2D1_FACTORY_TYPE_MULTI_THREADED,
+      IID_PPV_ARGS (&d2d_factory));
+
+  if (!gst_d3d11_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create D2D factory");
+    return FALSE;
+  }
+
+  self->d2d_factory = d2d_factory.Detach ();
 
   return TRUE;
 }
@@ -1018,10 +916,14 @@
   PROP_ADAPTER,
   PROP_IS_LIVE,
   PROP_PATTERN,
+  PROP_ALPHA,
+  PROP_ALPHA_MODE,
 };
 
 #define DEFAULT_ADAPTER -1
 #define DEFAULT_PATTERN GST_D3D11_TEST_SRC_SMPTE
+#define DEFAULT_ALPHA 1.0f
+#define DEFAULT_ALPHA_MODE GST_D3D11_ALPHA_MODE_UNSPECIFIED
 
 static void gst_d3d11_test_src_dispose (GObject * object);
 static void gst_d3d11_test_src_set_property (GObject * object,
@@ -1080,11 +982,37 @@
           (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
               G_PARAM_STATIC_STRINGS)));
 
+  /**
+   * GstD3D11TestSrc:alpha:
+   *
+   * Global alpha value to apply
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_ALPHA,
+      g_param_spec_float ("alpha", "Alpha", "Global alpha value to use",
+          0, 1, DEFAULT_ALPHA,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11TestSrc:alpha-mode:
+   *
+   * Alpha mode to use
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_ALPHA_MODE,
+      g_param_spec_enum ("alpha-mode", "Alpha Mode",
+          "alpha mode to use", GST_TYPE_D3D11_ALPHA_MODE, DEFAULT_ALPHA_MODE,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
   element_class->set_context =
       GST_DEBUG_FUNCPTR (gst_d3d11_test_src_set_context);
 
   gst_element_class_set_static_metadata (element_class,
-      "Direct3D11 test src", "Source/Video",
+      "Direct3D11 Test Source", "Source/Video",
       "Creates a test video stream", "Seungha Yang <seungha@centricular.com>");
 
   caps = gst_d3d11_get_updated_template_caps (&template_caps);
@@ -1110,6 +1038,8 @@
 
   gst_type_mark_as_plugin_api (GST_TYPE_D3D11_TEST_SRC_PATTERN,
       (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D11_ALPHA_MODE,
+      (GstPluginAPIFlags) 0);
 }
 
 static void
@@ -1119,6 +1049,8 @@
 
   self->adapter_index = DEFAULT_ADAPTER;
   self->pattern = DEFAULT_PATTERN;
+  self->alpha = DEFAULT_ALPHA;
+  self->alpha_mode = DEFAULT_ALPHA_MODE;
 }
 
 static void
@@ -1147,6 +1079,12 @@
     case PROP_PATTERN:
       self->pattern = (GstD3D11TestSrcPattern) g_value_get_enum (value);
       break;
+    case PROP_ALPHA:
+      self->alpha = g_value_get_float (value);
+      break;
+    case PROP_ALPHA_MODE:
+      self->alpha_mode = (GstD3D11AlphaMode) g_value_get_enum (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1169,6 +1107,12 @@
     case PROP_PATTERN:
       g_value_set_enum (value, self->pattern);
       break;
+    case PROP_ALPHA:
+      g_value_set_float (value, self->alpha);
+      break;
+    case PROP_ALPHA_MODE:
+      g_value_set_enum (value, self->alpha_mode);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1238,34 +1182,6 @@
 }
 
 static void
-gst_d3d11_test_src_quad_free (GstD3D11TestSrcQuad * quad)
-{
-  if (!quad)
-    return;
-
-  GST_D3D11_CLEAR_COM (quad->ps);
-  GST_D3D11_CLEAR_COM (quad->vs);
-  GST_D3D11_CLEAR_COM (quad->layout);
-  GST_D3D11_CLEAR_COM (quad->vertex_buffer);
-  GST_D3D11_CLEAR_COM (quad->index_buffer);
-  GST_D3D11_CLEAR_COM (quad->const_buffer);
-
-  g_free (quad);
-}
-
-static void
-gst_d3d11_test_src_render_free (GstD3D11TestSrcRender * render)
-{
-  if (!render)
-    return;
-
-  for (guint i = 0; i < G_N_ELEMENTS (render->quad); i++)
-    g_clear_pointer (&render->quadi, gst_d3d11_test_src_quad_free);
-
-  g_free (render);
-}
-
-static void
 gst_d3d11_test_src_clear_resource (GstD3D11TestSrc * self)
 {
   if (self->render_pool) {
@@ -1278,7 +1194,11 @@
     gst_clear_object (&self->convert_pool);
   }
 
-  g_clear_pointer (&self->render, gst_d3d11_test_src_render_free);
+  if (self->render) {
+    delete self->render;
+    self->render = nullptr;
+  }
+
   gst_clear_object (&self->converter);
 }
 
@@ -1290,12 +1210,25 @@
   GstD3D11AllocationParams *params;
   GstD3D11TestSrcRender *render;
   GstStructure *config;
+  HRESULT hr;
+  GstD3D11Format device_format;
+  guint bind_flags = 0;
 
   config = gst_structure_new ("converter-config",
       GST_D3D11_CONVERTER_OPT_BACKEND, GST_TYPE_D3D11_CONVERTER_BACKEND,
-      GST_D3D11_CONVERTER_BACKEND_SHADER, nullptr);
+      GST_D3D11_CONVERTER_BACKEND_SHADER,
+      GST_D3D11_CONVERTER_OPT_DEST_ALPHA_MODE,
+      GST_TYPE_D3D11_CONVERTER_ALPHA_MODE, self->alpha_mode, nullptr);
+
+  /* D2D uses premultiplied alpha */
+  if (self->pattern == GST_D3D11_TEST_SRC_CIRCULAR ||
+      self->pattern == GST_D3D11_TEST_SRC_BALL) {
+    gst_structure_set (config, GST_D3D11_CONVERTER_OPT_SRC_ALPHA_MODE,
+        GST_TYPE_D3D11_CONVERTER_ALPHA_MODE,
+        GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED, nullptr);
+  }
 
-  gst_video_info_set_format (&draw_info, GST_VIDEO_FORMAT_RGBA,
+  gst_video_info_set_format (&draw_info, GST_VIDEO_FORMAT_BGRA,
       self->info.width, self->info.height);
   self->converter = gst_d3d11_converter_new (self->device,
       &draw_info, &self->info, config);
@@ -1308,7 +1241,8 @@
   draw_caps = gst_video_info_to_caps (&draw_info);
   params = gst_d3d11_allocation_params_new (self->device, &draw_info,
       GST_D3D11_ALLOCATION_FLAG_DEFAULT,
-      D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET, 0);
+      D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET,
+      D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX);
 
   self->render_pool = gst_d3d11_buffer_pool_new_with_options (self->device,
       draw_caps, params, 0, 0);
@@ -1321,8 +1255,19 @@
     goto error;
   }
 
+  gst_d3d11_device_get_format (self->device,
+      GST_VIDEO_INFO_FORMAT (&self->info), &device_format);
+
+  if ((device_format.format_support0 &
+          D3D11_FORMAT_SUPPORT_RENDER_TARGET) != 0) {
+    bind_flags |= D3D11_BIND_RENDER_TARGET;
+  } else if ((device_format.format_support0 &
+          D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW) != 0) {
+    bind_flags |= D3D11_BIND_UNORDERED_ACCESS;
+  }
+
   params = gst_d3d11_allocation_params_new (self->device, &self->info,
-      GST_D3D11_ALLOCATION_FLAG_DEFAULT, D3D11_BIND_RENDER_TARGET, 0);
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags, 0);
   self->convert_pool = gst_d3d11_buffer_pool_new_with_options (self->device,
       caps, params, 0, 0);
   gst_d3d11_allocation_params_free (params);
@@ -1340,7 +1285,14 @@
   self->viewport.MinDepth = 0.0f;
   self->viewport.MaxDepth = 1.0f;
 
-  self->render = render = g_new0 (GstD3D11TestSrcRender, 1);
+  self->render = render = new GstD3D11TestSrcRender ();
+  render->pattern = self->pattern;
+
+  hr = gst_d3d11_device_get_rasterizer (self->device, &render->rs);
+  if (!gst_d3d11_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't get rasterizer state");
+    goto error;
+  }
 
   switch (self->pattern) {
     case GST_D3D11_TEST_SRC_SMPTE:
@@ -1352,19 +1304,29 @@
         goto error;
       break;
     case GST_D3D11_TEST_SRC_BLACK:
-      render->clear_color = &color_tableCOLOR_BLACK;
+      render->static_color0.value = color_tableCOLOR_BLACK;
+      render->static_color0.value.a = self->alpha;
+      render->static_color0.is_valid = TRUE;
       break;
     case GST_D3D11_TEST_SRC_WHITE:
-      render->clear_color = &color_tableCOLOR_WHITE;
+      render->static_color0.value = color_tableCOLOR_WHITE;
+      render->static_color0.value.a = self->alpha;
+      render->static_color0.is_valid = TRUE;
       break;
     case GST_D3D11_TEST_SRC_RED:
-      render->clear_color = &color_tableCOLOR_RED;
+      render->static_color0.value = color_tableCOLOR_RED;
+      render->static_color0.value.a = self->alpha;
+      render->static_color0.is_valid = TRUE;
       break;
     case GST_D3D11_TEST_SRC_GREEN:
-      render->clear_color = &color_tableCOLOR_GREEN;
+      render->static_color0.value = color_tableCOLOR_GREEN;
+      render->static_color0.value.a = self->alpha;
+      render->static_color0.is_valid = TRUE;
       break;
     case GST_D3D11_TEST_SRC_BLUE:
-      render->clear_color = &color_tableCOLOR_BLUE;
+      render->static_color0.value = color_tableCOLOR_BLUE;
+      render->static_color0.value.a = self->alpha;
+      render->static_color0.is_valid = TRUE;
       break;
     case GST_D3D11_TEST_SRC_CHECKERS1:
       if (!setup_checker_render (self, render, 1))
@@ -1382,6 +1344,19 @@
       if (!setup_checker_render (self, render, 8))
         goto error;
       break;
+    case GST_D3D11_TEST_SRC_BLINK:
+      render->static_color0.value = color_tableCOLOR_BLACK;
+      render->static_color0.value.a = self->alpha;
+      render->static_color0.is_valid = TRUE;
+      render->static_color1.value = color_tableCOLOR_WHITE;
+      render->static_color1.value.a = self->alpha;
+      render->static_color1.is_valid = TRUE;
+      break;
+    case GST_D3D11_TEST_SRC_CIRCULAR:
+    case GST_D3D11_TEST_SRC_BALL:
+      if (!setup_d2d_render (self, render))
+        goto error;
+      break;
   }
 
   return TRUE;
@@ -1477,13 +1452,31 @@
   gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
 
   if (self->downstream_supports_d3d11) {
+    GstD3D11Format device_format;
+    guint bind_flags = 0;
+
+    gst_d3d11_device_get_format (self->device, GST_VIDEO_INFO_FORMAT (&vinfo),
+        &device_format);
+
+    if ((device_format.format_support0 &
+            D3D11_FORMAT_SUPPORT_RENDER_TARGET) != 0) {
+      bind_flags |= D3D11_BIND_RENDER_TARGET;
+    }
+
+    if ((device_format.format_support0 &
+            D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW) != 0) {
+      bind_flags |= D3D11_BIND_UNORDERED_ACCESS;
+    }
+
+    if ((device_format.format_support0 & D3D11_BIND_SHADER_RESOURCE) != 0)
+      bind_flags |= D3D11_BIND_SHADER_RESOURCE;
+
     d3d11_params = gst_buffer_pool_config_get_d3d11_allocation_params (config);
     if (!d3d11_params) {
       d3d11_params = gst_d3d11_allocation_params_new (self->device, &vinfo,
-          GST_D3D11_ALLOCATION_FLAG_DEFAULT,
-          D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET, 0);
+          GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags, 0);
     } else {
-      d3d11_params->desc0.BindFlags |= D3D11_BIND_RENDER_TARGET;
+      gst_d3d11_allocation_params_set_bind_flags (d3d11_params, bind_flags);
     }
 
     gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
@@ -1523,6 +1516,7 @@
   self->n_frames = 0;
   self->accum_frames = 0;
   self->accum_rtime = 0;
+  self->token = gst_d3d11_create_user_token ();
 
   gst_video_info_init (&self->info);
 
@@ -1536,6 +1530,7 @@
 
   gst_d3d11_test_src_clear_resource (self);
   gst_clear_object (&self->device);
+  GST_D3D11_CLEAR_COM (self->d2d_factory);
 
   return TRUE;
 }
@@ -1621,59 +1616,283 @@
   }
 }
 
+struct GstD3D11TestSrcD2DData
+{
+  ID2D1RenderTarget *target;
+  ID2D1Brush *brush;
+  ID2D1Factory *factory;
+};
+
+static void
+gst_d3d11_test_src_d2d_data_free (GstD3D11TestSrcD2DData * data)
+{
+  GST_D3D11_CLEAR_COM (data->brush);
+  GST_D3D11_CLEAR_COM (data->target);
+  GST_D3D11_CLEAR_COM (data->factory);
+
+  g_free (data);
+}
+
+static gboolean
+gst_d3d11_test_src_draw_ball (GstD3D11TestSrc * self,
+    ID3D11DeviceContext * context, GstD3D11Memory * mem)
+{
+  GstD3D11TestSrcD2DData *data;
+  HRESULT hr;
+  gdouble rad;
+  FLOAT x, y;
+  ID2D1RadialGradientBrush *ball_brush;
+
+  data = (GstD3D11TestSrcD2DData *)
+      gst_d3d11_memory_get_token_data (mem, self->token);
+
+  if (!data) {
+    ComPtr < IDXGISurface > surface;
+    ComPtr < ID2D1RenderTarget > d2d_target;
+    ComPtr < ID2D1GradientStopCollection > collection;
+    ComPtr < ID2D1RadialGradientBrush > brush;
+    ID3D11Texture2D *texture;
+    D2D1_RENDER_TARGET_PROPERTIES props;
+    D2D1_GRADIENT_STOP stops3;
+
+    props.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
+    props.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM;
+    props.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED;
+    props.dpiX = 0;
+    props.dpiY = 0;
+    props.usage = D2D1_RENDER_TARGET_USAGE_NONE;
+    props.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
+
+    texture = (ID3D11Texture2D *) gst_d3d11_memory_get_resource_handle (mem);
+
+    hr = texture->QueryInterface (IID_PPV_ARGS (&surface));
+    if (!gst_d3d11_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't get DXGI surface");
+      return FALSE;
+    }
+
+    hr = self->d2d_factory->CreateDxgiSurfaceRenderTarget (surface.Get (),
+        props, &d2d_target);
+    if (!gst_d3d11_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't get D2D render target");
+      return FALSE;
+    }
+
+    stops0.color = D2D1::ColorF (D2D1::ColorF::White, self->alpha);
+    stops0.position = 0.0f;
+    stops1.color = D2D1::ColorF (D2D1::ColorF::Snow, self->alpha);
+    stops1.position = 0.3f;
+    stops2.color = D2D1::ColorF (D2D1::ColorF::Black, self->alpha);
+    stops2.position = 1.0f;
+
+    hr = d2d_target->CreateGradientStopCollection (stops, 3, D2D1_GAMMA_1_0,
+        D2D1_EXTEND_MODE_CLAMP, &collection);
+    if (!gst_d3d11_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create gradient stop collection");
+      return FALSE;
+    }
+
+    hr = d2d_target->CreateRadialGradientBrush (D2D1::
+        RadialGradientBrushProperties (D2D1::Point2F (0, 0), D2D1::Point2F (0,
+                0), 20, 20), collection.Get (), &brush);
+    if (!gst_d3d11_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create brush");
+      return FALSE;
+    }
+
+    data = g_new0 (GstD3D11TestSrcD2DData, 1);
+    data->target = d2d_target.Detach ();
+    data->brush = brush.Detach ();
+    data->factory = self->d2d_factory;
+    self->d2d_factory->AddRef ();
+
+    gst_d3d11_memory_set_token_data (mem, self->token, data,
+        (GDestroyNotify) gst_d3d11_test_src_d2d_data_free);
+  }
+
+  rad = (gdouble) self->n_frames / 200;
+  rad = 2 * G_PI * rad;
+  x = 20 + (0.5 + 0.5 * sin (rad)) * (self->info.width - 40);
+  y = 20 + (0.5 + 0.5 * sin (rad * sqrt (2))) * (self->info.height - 40);
+
+  ball_brush = (ID2D1RadialGradientBrush *) data->brush;
+  ball_brush->SetCenter (D2D1::Point2F (x, y));
+
+  data->target->BeginDraw ();
+  data->target->Clear (D2D1::ColorF (D2D1::ColorF::Black));
+  data->target->FillEllipse (D2D1::Ellipse (D2D1::Point2F (x, y), 20, 20),
+      data->brush);
+  data->target->EndDraw ();
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d11_test_src_draw_circular (GstD3D11TestSrc * self,
+    ID3D11DeviceContext * context, GstD3D11Memory * mem)
+{
+  GstD3D11TestSrcD2DData *data;
+  HRESULT hr;
+  FLOAT x, y;
+  FLOAT rad;
+
+  rad = ((FLOAT) MAX (self->info.width, self->info.height)) / 2;
+  x = (FLOAT) self->info.width / 2;
+  y = (FLOAT) self->info.height / 2;
+
+  data = (GstD3D11TestSrcD2DData *)
+      gst_d3d11_memory_get_token_data (mem, self->token);
+
+  if (!data) {
+    ComPtr < IDXGISurface > surface;
+    ComPtr < ID2D1RenderTarget > d2d_target;
+    ComPtr < ID2D1GradientStopCollection > collection;
+    ComPtr < ID2D1RadialGradientBrush > brush;
+    ID3D11Texture2D *texture;
+    D2D1_RENDER_TARGET_PROPERTIES props;
+    D2D1_GRADIENT_STOP stops129;
+    FLOAT position = 1.0f;
+
+    props.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
+    props.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM;
+    props.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED;
+    props.dpiX = 0;
+    props.dpiY = 0;
+    props.usage = D2D1_RENDER_TARGET_USAGE_NONE;
+    props.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
+
+    texture = (ID3D11Texture2D *) gst_d3d11_memory_get_resource_handle (mem);
+
+    hr = texture->QueryInterface (IID_PPV_ARGS (&surface));
+    if (!gst_d3d11_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't get DXGI surface");
+      return FALSE;
+    }
+
+    hr = self->d2d_factory->CreateDxgiSurfaceRenderTarget (surface.Get (),
+        props, &d2d_target);
+    if (!gst_d3d11_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't get D2D render target");
+      return FALSE;
+    }
+
+    for (guint i = 0; i < G_N_ELEMENTS (stops); i++) {
+      FLOAT diff;
+      if ((i % 2) == 0)
+        stopsi.color = D2D1::ColorF (D2D1::ColorF::Black, self->alpha);
+      else
+        stopsi.color = D2D1::ColorF (D2D1::ColorF::White, self->alpha);
+
+      stopsi.position = position;
+      diff = position / G_N_ELEMENTS (stops) * 2;
+      position -= diff;
+    }
+
+    hr = d2d_target->CreateGradientStopCollection (stops, G_N_ELEMENTS (stops),
+        &collection);
+    if (!gst_d3d11_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create gradient stop collection");
+      return FALSE;
+    }
+
+    hr = d2d_target->CreateRadialGradientBrush (D2D1::
+        RadialGradientBrushProperties (D2D1::Point2F (x, y), D2D1::Point2F (0,
+                0), rad, rad), collection.Get (), &brush);
+    if (!gst_d3d11_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create brush");
+      return FALSE;
+    }
+
+    data = g_new0 (GstD3D11TestSrcD2DData, 1);
+    data->target = d2d_target.Detach ();
+    data->brush = brush.Detach ();
+    data->factory = self->d2d_factory;
+    self->d2d_factory->AddRef ();
+
+    gst_d3d11_memory_set_token_data (mem, self->token, data,
+        (GDestroyNotify) gst_d3d11_test_src_d2d_data_free);
+  }
+
+  data->target->BeginDraw ();
+  data->target->Clear (D2D1::ColorF (D2D1::ColorF::Black));
+  data->target->FillEllipse (D2D1::Ellipse (D2D1::Point2F (x, y), rad, rad),
+      data->brush);
+  data->target->EndDraw ();
+
+  return TRUE;
+}
+
 static gboolean
 gst_d3d11_test_src_draw_pattern (GstD3D11TestSrc * self,
-    ID3D11DeviceContext * context, ID3D11RenderTargetView * rtv)
+    ID3D11DeviceContext * context, GstD3D11Memory * mem,
+    ID3D11RenderTargetView * rtv, GstClockTime pts)
 {
   GstD3D11TestSrcRender *render = self->render;
   HRESULT hr;
-  TimeConstBuffer *time_buf;
   D3D11_MAPPED_SUBRESOURCE map;
   UINT offsets = 0;
 
-  if (render->clear_color) {
-    context->ClearRenderTargetView (rtv, render->clear_color->color);
+  if (render->static_color0.is_valid) {
+    if (render->static_color1.is_valid && (self->n_frames % 2) == 1)
+      context->ClearRenderTargetView (rtv, render->static_color1.value.color);
+    else
+      context->ClearRenderTargetView (rtv, render->static_color0.value.color);
     return TRUE;
   }
 
+  if (render->pattern == GST_D3D11_TEST_SRC_BALL)
+    return gst_d3d11_test_src_draw_ball (self, context, mem);
+  else if (render->pattern == GST_D3D11_TEST_SRC_CIRCULAR)
+    return gst_d3d11_test_src_draw_circular (self, context, mem);
+
   context->IASetPrimitiveTopology (D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
   context->RSSetViewports (1, &self->viewport);
+  context->RSSetState (render->rs.Get ());
   context->OMSetRenderTargets (1, &rtv, nullptr);
   context->OMSetBlendState (nullptr, nullptr, 0xffffffff);
 
-  for (guint i = 0; i < G_N_ELEMENTS (render->quad); i++) {
-    GstD3D11TestSrcQuad *quad = render->quadi;
-
-    if (!quad)
-      break;
-
+  /* *INDENT-OFF* */
+  for (auto quad : render->quad) {
     if (quad->const_buffer) {
-      hr = context->Map (quad->const_buffer, 0, D3D11_MAP_WRITE_DISCARD, 0,
-          &map);
+      hr = context->Map (quad->const_buffer.Get (),
+          0, D3D11_MAP_WRITE_DISCARD, 0, &map);
       if (!gst_d3d11_result (hr, self->device)) {
         GST_ERROR_OBJECT (self, "Failed to map constant buffer");
         return FALSE;
       }
 
-      time_buf = (TimeConstBuffer *) map.pData;
-      time_buf->time = (FLOAT) ((FLOAT) (self->running_time + 1) / GST_SECOND);
-      context->Unmap (quad->const_buffer, 0);
+      if (quad->is_snow) {
+        SnowConstBuffer *const_buf = (SnowConstBuffer *) map.pData;
+        const_buf->time = (FLOAT) pts / GST_SECOND;
+        const_buf->alpha = self->alpha;
+      } else if (quad->is_checker) {
+        CheckerConstBuffer *const_buf = (CheckerConstBuffer *) map.pData;
+        quad->checker_const_buffer.alpha = self->alpha;
+        memcpy (const_buf, &quad->checker_const_buffer,
+            sizeof (CheckerConstBuffer));
+      }
+
+      context->Unmap (quad->const_buffer.Get (), 0);
 
-      context->PSSetConstantBuffers (0, 1, &quad->const_buffer);
+      ID3D11Buffer *const_bufs = { quad->const_buffer.Get () };
+      context->PSSetConstantBuffers (0, 1, const_bufs);
     } else {
       context->PSSetConstantBuffers (0, 0, nullptr);
     }
 
-    context->IASetInputLayout (quad->layout);
-    context->IASetVertexBuffers (0, 1, &quad->vertex_buffer,
+    context->IASetInputLayout (quad->layout.Get ());
+    ID3D11Buffer *vertex_buf = { quad->vertex_buffer.Get () };
+    context->IASetVertexBuffers (0, 1, vertex_buf,
         &quad->vertex_stride, &offsets);
-    context->IASetIndexBuffer (quad->index_buffer, DXGI_FORMAT_R16_UINT, 0);
+    context->IASetIndexBuffer (quad->index_buffer.Get (), DXGI_FORMAT_R16_UINT,
+        0);
 
-    context->VSSetShader (quad->vs, nullptr, 0);
-    context->PSSetShader (quad->ps, nullptr, 0);
+    context->VSSetShader (quad->vs.Get (), nullptr, 0);
+    context->PSSetShader (quad->ps.Get (), nullptr, 0);
 
     context->DrawIndexed (quad->index_count, 0, 0);
   }
+  /* *INDENT-ON* */
 
   context->OMSetRenderTargets (0, nullptr, nullptr);
 
@@ -1735,7 +1954,9 @@
     goto error;
   }
 
-  gst_d3d11_test_src_draw_pattern (self, context_handle, pattern_rtv);
+  pts = self->accum_rtime + self->running_time;
+  gst_d3d11_test_src_draw_pattern (self, context_handle, dmem, pattern_rtv,
+      pts);
   gst_memory_unmap (mem, &render_info);
   convert_ret = gst_d3d11_converter_convert_buffer_unlocked (self->converter,
       render_buffer, convert_buffer);
@@ -1754,8 +1975,6 @@
 
   gst_clear_buffer (&render_buffer);
 
-  pts = self->accum_rtime + self->running_time;
-
   GST_BUFFER_PTS (buffer) = pts;
   GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
   GST_BUFFER_OFFSET (buffer) = self->accum_frames + self->n_frames;

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11upload.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11upload.cpp Changed

@@ -105,7 +105,7 @@
   gst_caps_unref (caps);
 
   gst_element_class_set_static_metadata (element_class,
-      "Direct3D11 uploader", "Filter/Video",
+      "Direct3D11 Uploader", "Filter/Video",
       "Uploads data into Direct3D11 texture memory",
       "Seungha Yang <seungha.yang@navercorp.com>");
 
@@ -308,7 +308,6 @@
   GstD3D11Format d3d11_format;
   GstD3D11AllocationParams *d3d11_params;
   guint bind_flags = 0;
-  guint i;
   DXGI_FORMAT dxgi_format = DXGI_FORMAT_UNKNOWN;
   UINT supported = 0;
   HRESULT hr;
@@ -380,10 +379,7 @@
     d3d11_params = gst_d3d11_allocation_params_new (filter->device, &vinfo,
         GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags, 0);
   } else {
-    /* Set bind flag */
-    for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&vinfo); i++) {
-      d3d11_params->desci.BindFlags |= bind_flags;
-    }
+    gst_d3d11_allocation_params_set_bind_flags (d3d11_params, bind_flags);
   }
 
   gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11videosink.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11videosink.cpp Changed

@@ -65,6 +65,17 @@
   PROP_PRIMARIES_MODE,
   PROP_DISPLAY_FORMAT,
   PROP_EMIT_PRESENT,
+  PROP_FOV,
+  PROP_ORTHO,
+  PROP_ROTATION_X,
+  PROP_ROTATION_Y,
+  PROP_ROTATION_Z,
+  PROP_SCALE_X,
+  PROP_SCALE_Y,
+  PROP_MSAA,
+  PROP_SAMPLING_METHOD,
+  PROP_REDRAW_ON_UPDATE,
+  PROP_RENDER_RECTANGE,
 };
 
 #define DEFAULT_ADAPTER                   -1
@@ -77,6 +88,13 @@
 #define DEFAULT_PRIMARIES_MODE            GST_VIDEO_PRIMARIES_MODE_NONE
 #define DEFAULT_DISPLAY_FORMAT            DXGI_FORMAT_UNKNOWN
 #define DEFAULT_EMIT_PRESENT              FALSE
+#define DEFAULT_ROTATION                  0.0f
+#define DEFAULT_SCALE                     1.0f
+#define DEFAULT_FOV                       90.0f
+#define DEFAULT_ORTHO                     FALSE
+#define DEFAULT_MSAA                      GST_D3D11_MSAA_DISABLED
+#define DEFAULT_SAMPLING_METHOD           GST_D3D11_SAMPLING_METHOD_BILINEAR
+#define DEFAULT_REDROW_ON_UPDATE          TRUE
 
 /**
  * GstD3D11VideoSinkDisplayFormat:
@@ -187,6 +205,16 @@
   GstVideoPrimariesMode primaries_mode;
   DXGI_FORMAT display_format;
   gboolean emit_present;
+  gfloat fov;
+  gboolean ortho;
+  gfloat rotation_x;
+  gfloat rotation_y;
+  gfloat rotation_z;
+  gfloat scale_x;
+  gfloat scale_y;
+  GstD3D11MSAAMode msaa;
+  GstD3D11SamplingMethod sampling_method;
+  gboolean redraw_on_update;
 
   /* saved render rectangle until we have a window */
   GstVideoRectangle render_rect;
@@ -318,6 +346,8 @@
    * - DXGI_FORMAT_R10G10B10A2_UNORM
    *
    * Since: 1.20
+   *
+   * Deprecated, Use appsink to access GStreamer produced D3D11 texture
    */
   g_object_class_install_property (gobject_class, PROP_DRAW_ON_SHARED_TEXTURE,
       g_param_spec_boolean ("draw-on-shared-texture",
@@ -399,6 +429,144 @@
               G_PARAM_STATIC_STRINGS)));
 
   /**
+   * GstD3D11VideoSink:fov:
+   *
+   * Field of view angle in degrees
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_FOV,
+      g_param_spec_float ("fov", "Fov",
+          "Field of view angle in degrees",
+          0, G_MAXFLOAT, DEFAULT_FOV,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11VideoSink:ortho:
+   *
+   * Use orthographic projection
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_ORTHO,
+      g_param_spec_boolean ("ortho", "Orthographic",
+          "Use orthographic projection", DEFAULT_ORTHO,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11VideoSink:rotation-x:
+   *
+   * x-axis rotation angle to be applied prior to "rotate-method"
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_ROTATION_X,
+      g_param_spec_float ("rotation-x", "Rotation X",
+          "x-axis rotation angle in degrees",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_ROTATION,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11VideoSink:rotation-y:
+   *
+   * y-axis rotation angle to be applied prior to "rotate-method"
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_ROTATION_Y,
+      g_param_spec_float ("rotation-y", "Rotation Y",
+          "y-axis rotation angle in degrees",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_ROTATION,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11VideoSink:rotation-z:
+   *
+   * z-axis rotation angle to be applied prior to "rotate-method"
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_ROTATION_Z,
+      g_param_spec_float ("rotation-z", "Rotation Z",
+          "z-axis rotation angle in degrees",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_ROTATION,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11VideoSink:scale-x:
+   *
+   * Scale multiplier for x-axis
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_SCALE_X,
+      g_param_spec_float ("scale-x", "Scale X",
+          "Scale multiplier for x-axis",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_SCALE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11VideoSink:scale-y:
+   *
+   * Scale multiplier for y-axis
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_SCALE_Y,
+      g_param_spec_float ("scale-y", "Scale Y",
+          "Scale multiplier for y-axis",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_SCALE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11VideoSink:msaa:
+   *
+   * MSAA (Multi-Sampling Anti-Aliasing) level
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MSAA,
+      g_param_spec_enum ("msaa", "MSAA",
+          "MSAA (Multi-Sampling Anti-Aliasing) level",
+          GST_TYPE_D3D11_MSAA_MODE, DEFAULT_MSAA,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11VideoSink:sampling-method:
+   *
+   * Sampling method
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_SAMPLING_METHOD,
+      g_param_spec_enum ("sampling-method", "Sampling method",
+          "Sampler filter type to use", GST_TYPE_D3D11_SAMPLING_METHOD,
+          DEFAULT_SAMPLING_METHOD, (GParamFlags) (GST_PARAM_MUTABLE_READY |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11VideoSink:redraw-on-update:
+   *
+   * Immediately apply updated geometry related properties and redraw
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_REDRAW_ON_UPDATE,
+      g_param_spec_boolean ("redraw-on-update",
+          "redraw-on-update",
+          "Immediately apply updated geometry related properties and redraw. "
+          "If disabled, properties will be applied on the next frame or "
+          "window resize", DEFAULT_REDROW_ON_UPDATE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstD3D11VideoSink:render-rectangle:
+   *
+   * Since: 1.24
+   */
+  gst_video_overlay_install_properties (gobject_class, PROP_RENDER_RECTANGE);
+
+  /**
    * GstD3D11VideoSink::begin-draw:
    * @videosink: the #d3d11videosink
    *
@@ -407,6 +575,8 @@
    * #d3d11videosink::begin-draw signal handler.
    *
    * Since: 1.20
+   *
+   * Deprecated, Use appsink to access GStreamer produced D3D11 texture
    */
   gst_d3d11_video_sink_signalsSIGNAL_BEGIN_DRAW =
       g_signal_new ("begin-draw", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
@@ -431,6 +601,11 @@
    * @acquire_key and @release_key will be ignored.
    *
    * Since: 1.20
+   *
+   * As of 1.24, @acquire_key and @release_key must be zero. Other values are
+   * not supported.
+   *
+   * Deprecated, Use appsink to access GStreamer produced D3D11 texture
    */
   gst_d3d11_video_sink_signalsSIGNAL_DRAW =
       g_signal_new ("draw", G_TYPE_FROM_CLASS (klass),
@@ -464,7 +639,7 @@
       GST_DEBUG_FUNCPTR (gst_d3d11_video_sink_set_context);
 
   gst_element_class_set_static_metadata (element_class,
-      "Direct3D11 video sink", "Sink/Video",
+      "Direct3D11 Video Sink", "Sink/Video",
       "A Direct3D11 based videosink",
       "Seungha Yang <seungha.yang@navercorp.com>");
 
@@ -495,6 +670,7 @@
       (GstPluginAPIFlags) 0);
   gst_type_mark_as_plugin_api (GST_TYPE_D3D11_VIDEO_SINK_DISPLAY_FORMAT,
       (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D11_MSAA_MODE, (GstPluginAPIFlags) 0);
 }
 
 static void
@@ -510,6 +686,16 @@
   self->primaries_mode = DEFAULT_PRIMARIES_MODE;
   self->display_format = DEFAULT_DISPLAY_FORMAT;
   self->emit_present = DEFAULT_EMIT_PRESENT;
+  self->fov = DEFAULT_FOV;
+  self->ortho = DEFAULT_ORTHO;
+  self->rotation_x = DEFAULT_ROTATION;
+  self->rotation_y = DEFAULT_ROTATION;
+  self->rotation_z = DEFAULT_ROTATION;
+  self->scale_x = DEFAULT_SCALE;
+  self->scale_y = DEFAULT_SCALE;
+  self->msaa = DEFAULT_MSAA;
+  self->sampling_method = DEFAULT_SAMPLING_METHOD;
+  self->redraw_on_update = DEFAULT_REDROW_ON_UPDATE;
 
   InitializeCriticalSection (&self->lock);
 }
@@ -571,6 +757,49 @@
     case PROP_EMIT_PRESENT:
       self->emit_present = g_value_get_boolean (value);
       break;
+    case PROP_FOV:
+      self->fov = g_value_get_float (value);
+      gst_d3d11_video_sink_set_orientation (self, self->method, FALSE);
+      break;
+    case PROP_ORTHO:
+      self->ortho = g_value_get_boolean (value);
+      gst_d3d11_video_sink_set_orientation (self, self->method, FALSE);
+      break;
+    case PROP_ROTATION_X:
+      self->rotation_x = g_value_get_float (value);
+      gst_d3d11_video_sink_set_orientation (self, self->method, FALSE);
+      break;
+    case PROP_ROTATION_Y:
+      self->rotation_y = g_value_get_float (value);
+      gst_d3d11_video_sink_set_orientation (self, self->method, FALSE);
+      break;
+    case PROP_ROTATION_Z:
+      self->rotation_z = g_value_get_float (value);
+      gst_d3d11_video_sink_set_orientation (self, self->method, FALSE);
+      break;
+    case PROP_SCALE_X:
+      self->scale_x = g_value_get_float (value);
+      gst_d3d11_video_sink_set_orientation (self, self->method, FALSE);
+      break;
+    case PROP_SCALE_Y:
+      self->scale_y = g_value_get_float (value);
+      gst_d3d11_video_sink_set_orientation (self, self->method, FALSE);
+      break;
+    case PROP_MSAA:
+      self->msaa = (GstD3D11MSAAMode) g_value_get_enum (value);
+      if (self->window)
+        gst_d3d11_window_set_msaa_mode (self->window, self->msaa);
+      break;
+    case PROP_SAMPLING_METHOD:
+      self->sampling_method = (GstD3D11SamplingMethod) g_value_get_enum (value);
+      break;
+    case PROP_REDRAW_ON_UPDATE:
+      self->redraw_on_update = g_value_get_boolean (value);
+      break;
+    case PROP_RENDER_RECTANGE:
+      gst_video_overlay_set_property (object, PROP_RENDER_RECTANGE,
+          PROP_RENDER_RECTANGE, value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -622,6 +851,36 @@
     case PROP_EMIT_PRESENT:
       g_value_set_boolean (value, self->emit_present);
       break;
+    case PROP_FOV:
+      g_value_set_float (value, self->fov);
+      break;
+    case PROP_ORTHO:
+      g_value_set_boolean (value, self->ortho);
+      break;
+    case PROP_ROTATION_X:
+      g_value_set_float (value, self->rotation_x);
+      break;
+    case PROP_ROTATION_Y:
+      g_value_set_float (value, self->rotation_x);
+      break;
+    case PROP_ROTATION_Z:
+      g_value_set_float (value, self->rotation_z);
+      break;
+    case PROP_SCALE_X:
+      g_value_set_float (value, self->scale_x);
+      break;
+    case PROP_SCALE_Y:
+      g_value_set_float (value, self->scale_y);
+      break;
+    case PROP_MSAA:
+      g_value_set_enum (value, self->msaa);
+      break;
+    case PROP_SAMPLING_METHOD:
+      g_value_set_enum (value, self->sampling_method);
+      break;
+    case PROP_REDRAW_ON_UPDATE:
+      g_value_set_boolean (value, self->redraw_on_update);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -708,6 +967,17 @@
   return TRUE;
 }
 
+static void
+gst_d3d11_video_sink_release_window (GstD3D11VideoSink * self)
+{
+  if (self->window == NULL)
+    return;
+
+  g_signal_handlers_disconnect_by_data (self->window, self);
+  gst_d3d11_window_unprepare (self->window);
+  gst_clear_object (&self->window);
+}
+
 static GstFlowReturn
 gst_d3d11_video_sink_update_window (GstD3D11VideoSink * self, GstCaps * caps)
 {
@@ -821,7 +1091,10 @@
       GST_D3D11_CONVERTER_OPT_GAMMA_MODE,
       GST_TYPE_VIDEO_GAMMA_MODE, self->gamma_mode,
       GST_D3D11_CONVERTER_OPT_PRIMARIES_MODE,
-      GST_TYPE_VIDEO_PRIMARIES_MODE, self->primaries_mode, nullptr);
+      GST_TYPE_VIDEO_PRIMARIES_MODE, self->primaries_mode,
+      GST_D3D11_CONVERTER_OPT_SAMPLER_FILTER,
+      GST_TYPE_D3D11_CONVERTER_SAMPLER_FILTER,
+      gst_d3d11_sampling_method_to_native (self->sampling_method), nullptr);
 
   window = (GstD3D11Window *) gst_object_ref (self->window);
   LeaveCriticalSection (&self->lock);
@@ -834,8 +1107,7 @@
     if (ret == GST_FLOW_FLUSHING) {
       GstD3D11CSLockGuard lk (&self->lock);
       GST_WARNING_OBJECT (self, "Couldn't prepare window but we are flushing");
-      gst_d3d11_window_unprepare (self->window);
-      gst_clear_object (&self->window);
+      gst_d3d11_video_sink_release_window (self);
       gst_object_unref (window);
 
       return GST_FLOW_FLUSHING;
@@ -1007,6 +1279,14 @@
 #if (!GST_D3D11_WINAPI_ONLY_APP)
     case GST_D3D11_WINDOW_NATIVE_TYPE_HWND:
       self->window = gst_d3d11_window_win32_new (self->device, self->window_id);
+      if (!self->window_id) {
+        HWND internal_hwnd =
+            gst_d3d11_window_win32_get_internal_hwnd (self->window);
+        GST_DEBUG_OBJECT (self, "Have window handle %" G_GUINTPTR_FORMAT,
+            (guintptr) internal_hwnd);
+        gst_video_overlay_got_window_handle (GST_VIDEO_OVERLAY (self),
+            (guintptr) internal_hwnd);
+      }
       break;
 #endif
 #if GST_D3D11_WINAPI_APP
@@ -1036,7 +1316,11 @@
       "enable-navigation-events", self->enable_navigation_events,
       "emit-present", self->emit_present, nullptr);
 
-  gst_d3d11_window_set_orientation (self->window, self->selected_method);
+  gst_d3d11_window_set_orientation (self->window, self->redraw_on_update,
+      self->selected_method,
+      self->fov, self->ortho, self->rotation_x, self->rotation_y,
+      self->rotation_z, self->scale_x, self->scale_y);
+  gst_d3d11_window_set_msaa_mode (self->window, self->msaa);
 
   g_signal_connect (self->window, "key-event",
       G_CALLBACK (gst_d3d11_video_sink_key_event), self);
@@ -1065,10 +1349,8 @@
     gst_clear_object (&self->pool);
   }
 
-  if (self->window)
-    gst_d3d11_window_unprepare (self->window);
+  gst_d3d11_video_sink_release_window (self);
 
-  gst_clear_object (&self->window);
   gst_clear_object (&self->device);
   g_clear_pointer (&self->title, g_free);
 
@@ -1300,8 +1582,12 @@
     self->selected_method = self->method;
   }
 
-  if (self->window)
-    gst_d3d11_window_set_orientation (self->window, self->selected_method);
+  if (self->window) {
+    gst_d3d11_window_set_orientation (self->window, self->redraw_on_update,
+        self->selected_method,
+        self->fov, self->ortho, self->rotation_x, self->rotation_y,
+        self->rotation_z, self->scale_x, self->scale_y);
+  }
 }
 
 static void
@@ -1346,6 +1632,27 @@
   self->device = (GstD3D11Device *) gst_object_ref (dmem->device);
 }
 
+static gboolean
+gst_d3d11_video_sink_foreach_meta (GstBuffer * buffer, GstMeta ** meta,
+    GstBuffer * uploaded)
+{
+  GstVideoOverlayCompositionMeta *cmeta;
+
+  if ((*meta)->info->api != GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE)
+    return TRUE;
+
+  cmeta = (GstVideoOverlayCompositionMeta *) (*meta);
+  if (!cmeta->overlay)
+    return TRUE;
+
+  if (gst_video_overlay_composition_n_rectangles (cmeta->overlay) == 0)
+    return TRUE;
+
+  gst_buffer_add_video_overlay_composition_meta (uploaded, cmeta->overlay);
+
+  return TRUE;
+}
+
 static GstFlowReturn
 gst_d3d11_video_sink_prepare (GstBaseSink * sink, GstBuffer * buffer)
 {
@@ -1370,8 +1677,6 @@
   }
 
   if (!gst_is_d3d11_buffer (buffer)) {
-    GstVideoOverlayCompositionMeta *overlay_meta;
-
     ret = gst_buffer_pool_acquire_buffer (self->pool, &self->prepared_buffer,
         nullptr);
     if (ret != GST_FLOW_OK)
@@ -1392,11 +1697,9 @@
       gst_memory_unmap (mem, &info);
     }
 
-    overlay_meta = gst_buffer_get_video_overlay_composition_meta (buffer);
-    if (overlay_meta) {
-      gst_buffer_add_video_overlay_composition_meta (self->prepared_buffer,
-          overlay_meta->overlay);
-    }
+    gst_buffer_foreach_meta (buffer,
+        (GstBufferForeachMetaFunc) gst_d3d11_video_sink_foreach_meta,
+        self->prepared_buffer);
   } else {
     self->prepared_buffer = gst_buffer_ref (buffer);
   }
@@ -1550,6 +1853,11 @@
     return FALSE;
   }
 
+  if (acquire_key != 0 || release_key != 0) {
+    GST_ERROR_OBJECT (self, "Non zero mutex key value is not supported");
+    return FALSE;
+  }
+
   GstD3D11CSLockGuard lk (&self->lock);
   if (!self->drawing || !self->prepared_buffer) {
     GST_WARNING_OBJECT (self, "Nothing to draw");

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11vp8dec.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11vp8dec.cpp Changed

@@ -37,88 +37,13 @@
 #endif
 
 #include "gstd3d11vp8dec.h"
-
-#include <gst/codecs/gstvp8decoder.h>
-#include <string.h>
-#include <vector>
-
-/* HACK: to expose dxva data structure on UWP */
-#ifdef WINAPI_PARTITION_DESKTOP
-#undef WINAPI_PARTITION_DESKTOP
-#endif
-#define WINAPI_PARTITION_DESKTOP 1
-#include <d3d9.h>
-#include <dxva.h>
+#include <gst/dxva/gstdxvavp8decoder.h>
 
 GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_vp8_dec_debug);
 #define GST_CAT_DEFAULT gst_d3d11_vp8_dec_debug
 
-/* *INDENT-OFF* */
-typedef struct _GstD3D11Vp8DecInner
-{
-  GstD3D11Device *device = nullptr;
-  GstD3D11Decoder *d3d11_decoder = nullptr;
-
-  DXVA_PicParams_VP8 pic_params;
-  DXVA_Slice_VPx_Short slice;
-
-  /* In case of VP8, there's only one slice per picture so we don't
-   * need this bitstream buffer, but this will be used for 128 bytes alignment */
-  std::vector<guint8> bitstream_buffer;
-
-  guint width = 0;
-  guint height = 0;
-  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
-} GstD3D11Vp8DecInner;
-/* *INDENT-ON* */
-
-typedef struct _GstD3D11Vp8Dec
-{
-  GstVp8Decoder parent;
-  GstD3D11Vp8DecInner *inner;
-} GstD3D11Vp8Dec;
-
-typedef struct _GstD3D11Vp8DecClass
-{
-  GstVp8DecoderClass parent_class;
-  GstD3D11DecoderSubClassData class_data;
-} GstD3D11Vp8DecClass;
-
-static GstElementClass *parent_class = NULL;
-
-#define GST_D3D11_VP8_DEC(object) ((GstD3D11Vp8Dec *) (object))
-#define GST_D3D11_VP8_DEC_GET_CLASS(object) \
-    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstD3D11Vp8DecClass))
-
-static void gst_d3d11_vp8_dec_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_d3d11_vp8_dec_finalize (GObject * object);
-static void gst_d3d11_vp8_dec_set_context (GstElement * element,
-    GstContext * context);
-
-static gboolean gst_d3d11_vp8_dec_open (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_vp8_dec_close (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_vp8_dec_negotiate (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_vp8_dec_decide_allocation (GstVideoDecoder *
-    decoder, GstQuery * query);
-static gboolean gst_d3d11_vp8_dec_src_query (GstVideoDecoder * decoder,
-    GstQuery * query);
-static gboolean gst_d3d11_vp8_sink_event (GstVideoDecoder * decoder,
-    GstEvent * event);
-
-/* GstVp8Decoder */
-static GstFlowReturn gst_d3d11_vp8_dec_new_sequence (GstVp8Decoder * decoder,
-    const GstVp8FrameHdr * frame_hdr, gint max_dpb_size);
-static GstFlowReturn gst_d3d11_vp8_dec_new_picture (GstVp8Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp8Picture * picture);
-static GstFlowReturn gst_d3d11_vp8_dec_start_picture (GstVp8Decoder * decoder,
-    GstVp8Picture * picture);
-static GstFlowReturn gst_d3d11_vp8_dec_decode_picture (GstVp8Decoder * decoder,
-    GstVp8Picture * picture, GstVp8Parser * parser);
-static GstFlowReturn gst_d3d11_vp8_dec_end_picture (GstVp8Decoder * decoder,
-    GstVp8Picture * picture);
-static GstFlowReturn gst_d3d11_vp8_dec_output_picture (GstVp8Decoder *
-    decoder, GstVideoCodecFrame * frame, GstVp8Picture * picture);
+GST_D3D11_DECODER_DEFINE_TYPE (GstD3D11Vp8Dec, gst_d3d11_vp8_dec,
+    GST, D3D11_VP8_DEC, GstDxvaVp8Decoder);
 
 static void
 gst_d3d11_vp8_dec_class_init (GstD3D11Vp8DecClass * klass, gpointer data)
@@ -126,11 +51,10 @@
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
-  GstVp8DecoderClass *vp8decoder_class = GST_VP8_DECODER_CLASS (klass);
+  GstDxvaVp8DecoderClass *dxva_class = GST_DXVA_VP8_DECODER_CLASS (klass);
   GstD3D11DecoderClassData *cdata = (GstD3D11DecoderClassData *) data;
 
   gobject_class->get_property = gst_d3d11_vp8_dec_get_property;
-  gobject_class->finalize = gst_d3d11_vp8_dec_finalize;
 
   element_class->set_context =
       GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_set_context);
@@ -153,27 +77,24 @@
   decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_negotiate);
   decoder_class->decide_allocation =
       GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_sink_query);
   decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_src_query);
-  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d11_vp8_sink_event);
+  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_sink_event);
 
-  vp8decoder_class->new_sequence =
-      GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_new_sequence);
-  vp8decoder_class->new_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_new_picture);
-  vp8decoder_class->start_picture =
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_new_picture);
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_get_picture_id);
+  dxva_class->start_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_start_picture);
-  vp8decoder_class->decode_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_decode_picture);
-  vp8decoder_class->end_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_end_picture);
-  vp8decoder_class->output_picture =
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_end_picture);
+  dxva_class->output_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_vp8_dec_output_picture);
 }
 
 static void
 gst_d3d11_vp8_dec_init (GstD3D11Vp8Dec * self)
 {
-  self->inner = new GstD3D11Vp8DecInner ();
 }
 
 static void
@@ -187,25 +108,14 @@
 }
 
 static void
-gst_d3d11_vp8_dec_finalize (GObject * object)
-{
-  GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (object);
-
-  delete self->inner;
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
 gst_d3d11_vp8_dec_set_context (GstElement * element, GstContext * context)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (element);
-  GstD3D11Vp8DecInner *inner = self->inner;
   GstD3D11Vp8DecClass *klass = GST_D3D11_VP8_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
   gst_d3d11_handle_set_context_for_adapter_luid (element,
-      context, cdata->adapter_luid, &inner->device);
+      context, cdata->adapter_luid, &self->device);
 
   GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
 }
@@ -214,27 +124,20 @@
 gst_d3d11_vp8_dec_open (GstVideoDecoder * decoder)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
   GstD3D11Vp8DecClass *klass = GST_D3D11_VP8_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
-  if (!gst_d3d11_decoder_proxy_open (decoder,
-          cdata, &inner->device, &inner->d3d11_decoder)) {
-    GST_ERROR_OBJECT (self, "Failed to open decoder");
-    return FALSE;
-  }
-
-  return TRUE;
+  return gst_d3d11_decoder_proxy_open (decoder,
+      cdata, &self->device, &self->decoder);
 }
 
 static gboolean
 gst_d3d11_vp8_dec_close (GstVideoDecoder * decoder)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
 
-  gst_clear_object (&inner->d3d11_decoder);
-  gst_clear_object (&inner->device);
+  gst_clear_object (&self->decoder);
+  gst_clear_object (&self->device);
 
   return TRUE;
 }
@@ -243,9 +146,8 @@
 gst_d3d11_vp8_dec_negotiate (GstVideoDecoder * decoder)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_negotiate (inner->d3d11_decoder, decoder))
+  if (!gst_d3d11_decoder_negotiate (self->decoder, decoder))
     return FALSE;
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
@@ -256,27 +158,23 @@
     GstQuery * query)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_decide_allocation (inner->d3d11_decoder, decoder,
-          query)) {
+  if (!gst_d3d11_decoder_decide_allocation (self->decoder, decoder, query))
     return FALSE;
-  }
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
       (decoder, query);
 }
 
 static gboolean
-gst_d3d11_vp8_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+gst_d3d11_vp8_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
 
   switch (GST_QUERY_TYPE (query)) {
     case GST_QUERY_CONTEXT:
       if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
-              query, inner->device)) {
+              query, self->device)) {
         return TRUE;
       }
       break;
@@ -284,382 +182,99 @@
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
 }
 
 static gboolean
-gst_d3d11_vp8_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+gst_d3d11_vp8_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
 
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_FLUSH_START:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, TRUE);
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
+              query, self->device)) {
+        return TRUE;
+      }
       break;
-    case GST_EVENT_FLUSH_STOP:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, FALSE);
     default:
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
 }
 
-static GstFlowReturn
-gst_d3d11_vp8_dec_new_sequence (GstVp8Decoder * decoder,
-    const GstVp8FrameHdr * frame_hdr, gint max_dpb_size)
+static gboolean
+gst_d3d11_vp8_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
-  GstVideoInfo info;
 
-  GST_LOG_OBJECT (self, "new sequence");
-
-  /* FIXME: support I420 */
-  inner->out_format = GST_VIDEO_FORMAT_NV12;
-  inner->width = frame_hdr->width;
-  inner->height = frame_hdr->height;
-
-  gst_video_info_set_format (&info,
-      inner->out_format, inner->width, inner->height);
-
-  if (!gst_d3d11_decoder_configure (inner->d3d11_decoder,
-          decoder->input_state, &info, 0, 0, inner->width, inner->height,
-          max_dpb_size)) {
-    GST_ERROR_OBJECT (self, "Failed to create decoder");
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
-    GST_WARNING_OBJECT (self, "Failed to negotiate with downstream");
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
+  if (self->decoder)
+    gst_d3d11_decoder_sink_event (self->decoder, event);
 
-  return GST_FLOW_OK;
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
 }
 
 static GstFlowReturn
-gst_d3d11_vp8_dec_new_picture (GstVp8Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp8Picture * picture)
+gst_d3d11_vp8_dec_configure (GstDxvaVp8Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-
-  view_buffer = gst_d3d11_decoder_get_output_view_buffer (inner->d3d11_decoder,
-      GST_VIDEO_DECODER (decoder));
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "No available output view buffer");
-    return GST_FLOW_FLUSHING;
-  }
-
-  GST_LOG_OBJECT (self, "New output view buffer %" GST_PTR_FORMAT, view_buffer);
-
-  gst_vp8_picture_set_user_data (picture,
-      view_buffer, (GDestroyNotify) gst_buffer_unref);
 
-  GST_LOG_OBJECT (self, "New VP8 picture %p", picture);
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_configure (self->decoder, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
 }
 
 static GstFlowReturn
-gst_d3d11_vp8_dec_start_picture (GstVp8Decoder * decoder,
-    GstVp8Picture * picture)
+gst_d3d11_vp8_dec_new_picture (GstDxvaVp8Decoder * decoder,
+    GstCodecPicture * picture)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
-
-  inner->bitstream_buffer.resize (0);
 
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_new_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture);
 }
 
-static ID3D11VideoDecoderOutputView *
-gst_d3d11_vp8_dec_get_output_view_from_picture (GstD3D11Vp8Dec * self,
-    GstVp8Picture * picture, guint8 * view_id)
+static guint8
+gst_d3d11_vp8_dec_get_picture_id (GstDxvaVp8Decoder * decoder,
+    GstCodecPicture * picture)
 {
-  GstD3D11Vp8DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-  ID3D11VideoDecoderOutputView *view;
-
-  view_buffer = (GstBuffer *) gst_vp8_picture_get_user_data (picture);
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view buffer");
-    return NULL;
-  }
-
-  view =
-      gst_d3d11_decoder_get_output_view_from_buffer (inner->d3d11_decoder,
-      view_buffer, view_id);
-  if (!view) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view handle");
-    return NULL;
-  }
-
-  return view;
-}
-
-static void
-gst_d3d11_vp8_dec_copy_frame_params (GstD3D11Vp8Dec * self,
-    GstVp8Picture * picture, GstVp8Parser * parser, DXVA_PicParams_VP8 * params)
-{
-  const GstVp8FrameHdr *frame_hdr = &picture->frame_hdr;
-  gint i;
-
-  /* 0: keyframe, 1: inter */
-  params->frame_type = !frame_hdr->key_frame;
-  params->version = frame_hdr->version;
-  params->show_frame = frame_hdr->show_frame;
-  params->clamp_type = frame_hdr->clamping_type;
-
-  params->filter_type = frame_hdr->filter_type;
-  params->filter_level = frame_hdr->loop_filter_level;
-  params->sharpness_level = frame_hdr->sharpness_level;
-  params->mode_ref_lf_delta_enabled =
-      parser->mb_lf_adjust.loop_filter_adj_enable;
-  params->mode_ref_lf_delta_update =
-      parser->mb_lf_adjust.mode_ref_lf_delta_update;
-  for (i = 0; i < 4; i++) {
-    params->ref_lf_deltasi = parser->mb_lf_adjust.ref_frame_deltai;
-    params->mode_lf_deltasi = parser->mb_lf_adjust.mb_mode_deltai;
-  }
-  params->log2_nbr_of_dct_partitions = frame_hdr->log2_nbr_of_dct_partitions;
-  params->base_qindex = frame_hdr->quant_indices.y_ac_qi;
-  params->y1dc_delta_q = frame_hdr->quant_indices.y_dc_delta;
-  params->y2dc_delta_q = frame_hdr->quant_indices.y2_dc_delta;
-  params->y2ac_delta_q = frame_hdr->quant_indices.y2_ac_delta;
-  params->uvdc_delta_q = frame_hdr->quant_indices.uv_dc_delta;
-  params->uvac_delta_q = frame_hdr->quant_indices.uv_ac_delta;
-
-  params->ref_frame_sign_bias_golden = frame_hdr->sign_bias_golden;
-  params->ref_frame_sign_bias_altref = frame_hdr->sign_bias_alternate;
-
-  params->refresh_entropy_probs = frame_hdr->refresh_entropy_probs;
-
-  memcpy (params->vp8_coef_update_probs, frame_hdr->token_probs.prob,
-      sizeof (frame_hdr->token_probs.prob));
-
-  params->mb_no_coeff_skip = frame_hdr->mb_no_skip_coeff;
-  params->prob_skip_false = frame_hdr->prob_skip_false;
-  params->prob_intra = frame_hdr->prob_intra;
-  params->prob_last = frame_hdr->prob_last;
-  params->prob_golden = frame_hdr->prob_gf;
-
-  memcpy (params->intra_16x16_prob, frame_hdr->mode_probs.y_prob,
-      sizeof (frame_hdr->mode_probs.y_prob));
-  memcpy (params->intra_chroma_prob, frame_hdr->mode_probs.uv_prob,
-      sizeof (frame_hdr->mode_probs.uv_prob));
-  memcpy (params->vp8_mv_update_probs, frame_hdr->mv_probs.prob,
-      sizeof (frame_hdr->mv_probs.prob));
-}
-
-static void
-gst_d3d11_vp8_dec_copy_reference_frames (GstD3D11Vp8Dec * self,
-    DXVA_PicParams_VP8 * params)
-{
-  GstVp8Decoder *decoder = GST_VP8_DECODER (self);
-  ID3D11VideoDecoderOutputView *view;
-  guint8 view_id = 0xff;
-
-  if (decoder->alt_ref_picture) {
-    view = gst_d3d11_vp8_dec_get_output_view_from_picture (self,
-        decoder->alt_ref_picture, &view_id);
-    if (!view) {
-      GST_ERROR_OBJECT (self, "picture does not have output view handle");
-      return;
-    }
-
-    params->alt_fb_idx.Index7Bits = view_id;
-  } else {
-    params->alt_fb_idx.bPicEntry = 0xff;
-  }
-
-  if (decoder->golden_ref_picture) {
-    view = gst_d3d11_vp8_dec_get_output_view_from_picture (self,
-        decoder->golden_ref_picture, &view_id);
-    if (!view) {
-      GST_ERROR_OBJECT (self, "picture does not have output view handle");
-      return;
-    }
-
-    params->gld_fb_idx.Index7Bits = view_id;
-  } else {
-    params->gld_fb_idx.bPicEntry = 0xff;
-  }
-
-  if (decoder->last_picture) {
-    view = gst_d3d11_vp8_dec_get_output_view_from_picture (self,
-        decoder->last_picture, &view_id);
-    if (!view) {
-      GST_ERROR_OBJECT (self, "picture does not have output view handle");
-      return;
-    }
-
-    params->lst_fb_idx.Index7Bits = view_id;
-  } else {
-    params->lst_fb_idx.bPicEntry = 0xff;
-  }
-}
-
-static void
-gst_d3d11_vp8_dec_copy_segmentation_params (GstD3D11Vp8Dec * self,
-    GstVp8Parser * parser, DXVA_PicParams_VP8 * params)
-{
-  const GstVp8Segmentation *seg = &parser->segmentation;
-  gint i;
-
-  params->stVP8Segments.segmentation_enabled = seg->segmentation_enabled;
-  params->stVP8Segments.update_mb_segmentation_map =
-      seg->update_mb_segmentation_map;
-  params->stVP8Segments.update_mb_segmentation_data =
-      seg->update_segment_feature_data;
-  params->stVP8Segments.mb_segement_abs_delta = seg->segment_feature_mode;
-
-  for (i = 0; i < 4; i++) {
-    params->stVP8Segments.segment_feature_data0i =
-        seg->quantizer_update_valuei;
-  }
-
-  for (i = 0; i < 4; i++) {
-    params->stVP8Segments.segment_feature_data1i = seg->lf_update_valuei;
-  }
+  GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
 
-  for (i = 0; i < 3; i++) {
-    params->stVP8Segments.mb_segment_tree_probsi = seg->segment_probi;
-  }
+  return gst_d3d11_decoder_get_picture_id (self->decoder, picture);
 }
 
 static GstFlowReturn
-gst_d3d11_vp8_dec_decode_picture (GstVp8Decoder * decoder,
-    GstVp8Picture * picture, GstVp8Parser * parser)
+gst_d3d11_vp8_dec_start_picture (GstDxvaVp8Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
-  DXVA_PicParams_VP8 *pic_params = &inner->pic_params;
-  DXVA_Slice_VPx_Short *slice = &inner->slice;
-  ID3D11VideoDecoderOutputView *view;
-  guint8 view_id = 0xff;
-  const GstVp8FrameHdr *frame_hdr = &picture->frame_hdr;
-
-  view = gst_d3d11_vp8_dec_get_output_view_from_picture (self,
-      picture, &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_ERROR;
-  }
-
-  memset (pic_params, 0, sizeof (DXVA_PicParams_VP8));
-
-  pic_params->first_part_size = frame_hdr->first_part_size;
-  pic_params->width = inner->width;
-  pic_params->height = inner->height;
-  pic_params->CurrPic.Index7Bits = view_id;
-  pic_params->StatusReportFeedbackNumber = 1;
-
-  gst_d3d11_vp8_dec_copy_frame_params (self, picture, parser, pic_params);
-  gst_d3d11_vp8_dec_copy_reference_frames (self, pic_params);
-  gst_d3d11_vp8_dec_copy_segmentation_params (self, parser, pic_params);
 
-  inner->bitstream_buffer.resize (picture->size);
-  memcpy (&inner->bitstream_buffer0, picture->data, picture->size);
-
-  slice->BSNALunitDataLocation = 0;
-  slice->SliceBytesInBuffer = inner->bitstream_buffer.size ();
-  slice->wBadSliceChopping = 0;
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_start_picture (self->decoder, picture, picture_id);
 }
 
 static GstFlowReturn
-gst_d3d11_vp8_dec_end_picture (GstVp8Decoder * decoder, GstVp8Picture * picture)
+gst_d3d11_vp8_dec_end_picture (GstDxvaVp8Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
-  ID3D11VideoDecoderOutputView *view;
-  guint8 view_id = 0xff;
-  size_t bitstream_buffer_size;
-  size_t bitstream_pos;
-  GstD3D11DecodeInputStreamArgs input_args;
-
-  if (inner->bitstream_buffer.empty ()) {
-    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
-    return GST_FLOW_ERROR;
-  }
-
-  view = gst_d3d11_vp8_dec_get_output_view_from_picture (self,
-      picture, &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_ERROR;
-  }
-
-  memset (&input_args, 0, sizeof (GstD3D11DecodeInputStreamArgs));
-
-  bitstream_pos = inner->bitstream_buffer.size ();
-  bitstream_buffer_size = GST_ROUND_UP_128 (bitstream_pos);
-
-  if (bitstream_buffer_size > bitstream_pos) {
-    size_t padding = bitstream_buffer_size - bitstream_pos;
-
-    /* As per DXVA spec, total amount of bitstream buffer size should be
-     * 128 bytes aligned. If actual data is not multiple of 128 bytes,
-     * the last slice data needs to be zero-padded */
-    inner->bitstream_buffer.resize (bitstream_buffer_size, 0);
 
-    inner->slice.SliceBytesInBuffer += padding;
-  }
-
-  input_args.picture_params = &inner->pic_params;
-  input_args.picture_params_size = sizeof (DXVA_PicParams_VP8);
-  input_args.slice_control = &inner->slice;
-  input_args.slice_control_size = sizeof (DXVA_Slice_VPx_Short);
-  input_args.bitstream = &inner->bitstream_buffer0;
-  input_args.bitstream_size = inner->bitstream_buffer.size ();
-
-  return gst_d3d11_decoder_decode_frame (inner->d3d11_decoder,
-      view, &input_args);
+  return gst_d3d11_decoder_end_picture (self->decoder, picture, args);
 }
 
 static GstFlowReturn
-gst_d3d11_vp8_dec_output_picture (GstVp8Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp8Picture * picture)
+gst_d3d11_vp8_dec_output_picture (GstDxvaVp8Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
 {
   GstD3D11Vp8Dec *self = GST_D3D11_VP8_DEC (decoder);
-  GstD3D11Vp8DecInner *inner = self->inner;
-  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
-  GstBuffer *view_buffer;
-
-  g_assert (picture->frame_hdr.show_frame);
-
-  GST_LOG_OBJECT (self, "Outputting picture %p", picture);
-
-  view_buffer = (GstBuffer *) gst_vp8_picture_get_user_data (picture);
-
-  if (!view_buffer) {
-    GST_ERROR_OBJECT (self, "Could not get output view");
-    goto error;
-  }
-
-  if (!gst_d3d11_decoder_process_output (inner->d3d11_decoder, vdec,
-          picture->discont_state, inner->width, inner->height, view_buffer,
-          &frame->output_buffer)) {
-    GST_ERROR_OBJECT (self, "Failed to copy buffer");
-    goto error;
-  }
-
-  gst_vp8_picture_unref (picture);
-
-  return gst_video_decoder_finish_frame (vdec, frame);
-
-error:
-  gst_vp8_picture_unref (picture);
-  gst_video_decoder_release_frame (vdec, frame);
 
-  return GST_FLOW_ERROR;
+  return gst_d3d11_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
 }
 
 void
@@ -673,18 +288,18 @@
   guint i;
   GTypeInfo type_info = {
     sizeof (GstD3D11Vp8DecClass),
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     (GClassInitFunc) gst_d3d11_vp8_dec_class_init,
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     sizeof (GstD3D11Vp8Dec),
     0,
     (GInstanceInitFunc) gst_d3d11_vp8_dec_init,
   };
-  const GUID *profile_guid = NULL;
-  GstCaps *sink_caps = NULL;
-  GstCaps *src_caps = NULL;
+  const GUID *profile_guid = nullptr;
+  GstCaps *sink_caps = nullptr;
+  GstCaps *src_caps = nullptr;
   guint max_width = 0;
   guint max_height = 0;
   guint resolution;
@@ -719,7 +334,7 @@
   src_caps = gst_caps_from_string ("video/x-raw("
       GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY "); video/x-raw");
 
-  gst_caps_set_simple (src_caps, "format", G_TYPE_STRING, "NV12", NULL);
+  gst_caps_set_simple (src_caps, "format", G_TYPE_STRING, "NV12", nullptr);
 
   /* To cover both landscape and portrait, select max value */
   resolution = MAX (max_width, max_height);
@@ -739,7 +354,7 @@
     feature_name = g_strdup_printf ("d3d11vp8device%ddec", index);
   }
 
-  type = g_type_register_static (GST_TYPE_VP8_DECODER,
+  type = g_type_register_static (GST_TYPE_DXVA_VP8_DECODER,
       type_name, &type_info, (GTypeFlags) 0);
 
   /* make lower rank than default device */

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11vp8dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11vp8dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11vp9dec.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11vp9dec.cpp Changed

@@ -15,36 +15,6 @@
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
- *
- * NOTE: some of implementations are copied/modified from Chromium code
- *
- * Copyright 2015 The Chromium Authors. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *    * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *    * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
@@ -68,91 +38,13 @@
 
 #include "gstd3d11vp9dec.h"
 #include "gstd3d11pluginutils.h"
-
-#include <gst/codecs/gstvp9decoder.h>
-#include <string.h>
-#include <vector>
-
-/* HACK: to expose dxva data structure on UWP */
-#ifdef WINAPI_PARTITION_DESKTOP
-#undef WINAPI_PARTITION_DESKTOP
-#endif
-#define WINAPI_PARTITION_DESKTOP 1
-#include <d3d9.h>
-#include <dxva.h>
+#include <gst/dxva/gstdxvavp9decoder.h>
 
 GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_vp9_dec_debug);
 #define GST_CAT_DEFAULT gst_d3d11_vp9_dec_debug
 
-/* *INDENT-OFF* */
-typedef struct _GstD3D11Vp9DecInner
-{
-  GstD3D11Device *device = nullptr;
-  GstD3D11Decoder *d3d11_decoder = nullptr;
-
-  DXVA_PicParams_VP9 pic_params;
-  DXVA_Slice_VPx_Short slice;
-
-  /* In case of VP9, there's only one slice per picture so we don't
-   * need this bitstream buffer, but this will be used for 128 bytes alignment */
-  std::vector<guint8> bitstream_buffer;
-
-  /* To calculate use_prev_in_find_mv_refs */
-  guint last_frame_width = 0;
-  guint last_frame_height = 0;
-  gboolean last_show_frame = FALSE;
-} GstD3D11Vp9DecInner;
-/* *INDENT-ON* */
-
-typedef struct _GstD3D11Vp9Dec
-{
-  GstVp9Decoder parent;
-  GstD3D11Vp9DecInner *inner;
-} GstD3D11Vp9Dec;
-
-typedef struct _GstD3D11Vp9DecClass
-{
-  GstVp9DecoderClass parent_class;
-  GstD3D11DecoderSubClassData class_data;
-} GstD3D11Vp9DecClass;
-
-static GstElementClass *parent_class = NULL;
-
-#define GST_D3D11_VP9_DEC(object) ((GstD3D11Vp9Dec *) (object))
-#define GST_D3D11_VP9_DEC_GET_CLASS(object) \
-    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstD3D11Vp9DecClass))
-
-static void gst_d3d11_vp9_dec_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_d3d11_vp9_dec_finalize (GObject * object);
-static void gst_d3d11_vp9_dec_set_context (GstElement * element,
-    GstContext * context);
-
-static gboolean gst_d3d11_vp9_dec_open (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_vp9_dec_close (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_vp9_dec_negotiate (GstVideoDecoder * decoder);
-static gboolean gst_d3d11_vp9_dec_decide_allocation (GstVideoDecoder *
-    decoder, GstQuery * query);
-static gboolean gst_d3d11_vp9_dec_src_query (GstVideoDecoder * decoder,
-    GstQuery * query);
-static gboolean gst_d3d11_vp9_dec_sink_event (GstVideoDecoder * decoder,
-    GstEvent * event);
-
-/* GstVp9Decoder */
-static GstFlowReturn gst_d3d11_vp9_dec_new_sequence (GstVp9Decoder * decoder,
-    const GstVp9FrameHeader * frame_hdr, gint max_dpb_size);
-static GstFlowReturn gst_d3d11_vp9_dec_new_picture (GstVp9Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp9Picture * picture);
-static GstVp9Picture *gst_d3d11_vp9_dec_duplicate_picture (GstVp9Decoder *
-    decoder, GstVideoCodecFrame * frame, GstVp9Picture * picture);
-static GstFlowReturn gst_d3d11_vp9_dec_start_picture (GstVp9Decoder * decoder,
-    GstVp9Picture * picture);
-static GstFlowReturn gst_d3d11_vp9_dec_decode_picture (GstVp9Decoder * decoder,
-    GstVp9Picture * picture, GstVp9Dpb * dpb);
-static GstFlowReturn gst_d3d11_vp9_dec_end_picture (GstVp9Decoder * decoder,
-    GstVp9Picture * picture);
-static GstFlowReturn gst_d3d11_vp9_dec_output_picture (GstVp9Decoder *
-    decoder, GstVideoCodecFrame * frame, GstVp9Picture * picture);
+GST_D3D11_DECODER_DEFINE_TYPE_FULL (GstD3D11Vp9Dec, gst_d3d11_vp9_dec,
+    GST, D3D11_VP9_DEC, GstDxvaVp9Decoder);
 
 static void
 gst_d3d11_vp9_dec_class_init (GstD3D11Vp9DecClass * klass, gpointer data)
@@ -160,11 +52,10 @@
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
-  GstVp9DecoderClass *vp9decoder_class = GST_VP9_DECODER_CLASS (klass);
+  GstDxvaVp9DecoderClass *dxva_class = GST_DXVA_VP9_DECODER_CLASS (klass);
   GstD3D11DecoderClassData *cdata = (GstD3D11DecoderClassData *) data;
 
   gobject_class->get_property = gst_d3d11_vp9_dec_get_property;
-  gobject_class->finalize = gst_d3d11_vp9_dec_finalize;
 
   element_class->set_context =
       GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_set_context);
@@ -188,29 +79,26 @@
   decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_negotiate);
   decoder_class->decide_allocation =
       GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_sink_query);
   decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_src_query);
   decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_sink_event);
 
-  vp9decoder_class->new_sequence =
-      GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_new_sequence);
-  vp9decoder_class->new_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_new_picture);
-  vp9decoder_class->duplicate_picture =
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_new_picture);
+  dxva_class->duplicate_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_duplicate_picture);
-  vp9decoder_class->start_picture =
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_get_picture_id);
+  dxva_class->start_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_start_picture);
-  vp9decoder_class->decode_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_decode_picture);
-  vp9decoder_class->end_picture =
-      GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_end_picture);
-  vp9decoder_class->output_picture =
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_end_picture);
+  dxva_class->output_picture =
       GST_DEBUG_FUNCPTR (gst_d3d11_vp9_dec_output_picture);
 }
 
 static void
 gst_d3d11_vp9_dec_init (GstD3D11Vp9Dec * self)
 {
-  self->inner = new GstD3D11Vp9DecInner ();
 }
 
 static void
@@ -224,25 +112,14 @@
 }
 
 static void
-gst_d3d11_vp9_dec_finalize (GObject * object)
-{
-  GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (object);
-
-  delete self->inner;
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
 gst_d3d11_vp9_dec_set_context (GstElement * element, GstContext * context)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (element);
-  GstD3D11Vp9DecInner *inner = self->inner;
   GstD3D11Vp9DecClass *klass = GST_D3D11_VP9_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
   gst_d3d11_handle_set_context_for_adapter_luid (element,
-      context, cdata->adapter_luid, &inner->device);
+      context, cdata->adapter_luid, &self->device);
 
   GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
 }
@@ -252,37 +129,30 @@
 {
   GstVp9Decoder *vp9dec = GST_VP9_DECODER (decoder);
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
   GstD3D11Vp9DecClass *klass = GST_D3D11_VP9_DEC_GET_CLASS (self);
   GstD3D11DecoderSubClassData *cdata = &klass->class_data;
 
-  if (!gst_d3d11_decoder_proxy_open (decoder,
-          cdata, &inner->device, &inner->d3d11_decoder)) {
-    GST_ERROR_OBJECT (self, "Failed to open decoder");
-    return FALSE;
-  }
-
   /* XXX: ConfigDecoderSpecific bit 12 indicates whether accelerator can
    * support non-keyframe format change or not, but it doesn't seem to be
    * reliable, since 1b means that it's supported and 0b indicates it may not be
    * supported. Because some GPUs can support it even if the bit 12 is not
    * set, do filtering by vendor for now (AMD and Intel looks fine) */
-  if (gst_d3d11_get_device_vendor (inner->device) ==
+  if (gst_d3d11_get_device_vendor_from_id (cdata->vendor_id) ==
       GST_D3D11_DEVICE_VENDOR_NVIDIA) {
     gst_vp9_decoder_set_non_keyframe_format_change_support (vp9dec, FALSE);
   }
 
-  return TRUE;
+  return gst_d3d11_decoder_proxy_open (decoder,
+      cdata, &self->device, &self->decoder);
 }
 
 static gboolean
 gst_d3d11_vp9_dec_close (GstVideoDecoder * decoder)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
 
-  gst_clear_object (&inner->d3d11_decoder);
-  gst_clear_object (&inner->device);
+  gst_clear_object (&self->decoder);
+  gst_clear_object (&self->device);
 
   return TRUE;
 }
@@ -291,9 +161,8 @@
 gst_d3d11_vp9_dec_negotiate (GstVideoDecoder * decoder)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_negotiate (inner->d3d11_decoder, decoder))
+  if (!gst_d3d11_decoder_negotiate (self->decoder, decoder))
     return FALSE;
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
@@ -304,27 +173,23 @@
     GstQuery * query)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
 
-  if (!gst_d3d11_decoder_decide_allocation (inner->d3d11_decoder,
-          decoder, query)) {
+  if (!gst_d3d11_decoder_decide_allocation (self->decoder, decoder, query))
     return FALSE;
-  }
 
   return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
       (decoder, query);
 }
 
 static gboolean
-gst_d3d11_vp9_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+gst_d3d11_vp9_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
 
   switch (GST_QUERY_TYPE (query)) {
     case GST_QUERY_CONTEXT:
       if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
-              query, inner->device)) {
+              query, self->device)) {
         return TRUE;
       }
       break;
@@ -332,470 +197,108 @@
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
 }
 
 static gboolean
-gst_d3d11_vp9_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+gst_d3d11_vp9_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
 
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_FLUSH_START:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, TRUE);
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      if (gst_d3d11_handle_context_query (GST_ELEMENT (decoder),
+              query, self->device)) {
+        return TRUE;
+      }
       break;
-    case GST_EVENT_FLUSH_STOP:
-      if (inner->d3d11_decoder)
-        gst_d3d11_decoder_set_flushing (inner->d3d11_decoder, decoder, FALSE);
     default:
       break;
   }
 
-  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
 }
 
-static GstFlowReturn
-gst_d3d11_vp9_dec_new_sequence (GstVp9Decoder * decoder,
-    const GstVp9FrameHeader * frame_hdr, gint max_dpb_size)
+static gboolean
+gst_d3d11_vp9_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
-  GstVideoInfo info;
-  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
 
-  GST_LOG_OBJECT (self, "new sequence");
+  if (self->decoder)
+    gst_d3d11_decoder_sink_event (self->decoder, event);
 
-  if (frame_hdr->profile == GST_VP9_PROFILE_0)
-    out_format = GST_VIDEO_FORMAT_NV12;
-  else if (frame_hdr->profile == GST_VP9_PROFILE_2)
-    out_format = GST_VIDEO_FORMAT_P010_10LE;
-
-  if (out_format == GST_VIDEO_FORMAT_UNKNOWN) {
-    GST_ERROR_OBJECT (self, "Could not support profile %d", frame_hdr->profile);
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  gst_video_info_set_format (&info,
-      out_format, frame_hdr->width, frame_hdr->height);
-
-  if (!gst_d3d11_decoder_configure (inner->d3d11_decoder,
-          decoder->input_state, &info, 0, 0, (gint) frame_hdr->width,
-          (gint) frame_hdr->height, max_dpb_size)) {
-    GST_ERROR_OBJECT (self, "Failed to create decoder");
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
-    GST_WARNING_OBJECT (self, "Failed to negotiate with downstream");
-    return GST_FLOW_NOT_NEGOTIATED;
-  }
-
-  /* Will be updated per decode_picture */
-  inner->last_frame_width = inner->last_frame_height = 0;
-  inner->last_show_frame = FALSE;
-
-  return GST_FLOW_OK;
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
 }
 
 static GstFlowReturn
-gst_d3d11_vp9_dec_new_picture (GstVp9Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp9Picture * picture)
+gst_d3d11_vp9_dec_configure (GstDxvaVp9Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-
-  view_buffer = gst_d3d11_decoder_get_output_view_buffer (inner->d3d11_decoder,
-      GST_VIDEO_DECODER (decoder));
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "No available output view buffer");
-    return GST_FLOW_FLUSHING;
-  }
-
-  GST_LOG_OBJECT (self, "New output view buffer %" GST_PTR_FORMAT, view_buffer);
-
-  gst_vp9_picture_set_user_data (picture,
-      view_buffer, (GDestroyNotify) gst_buffer_unref);
-
-  GST_LOG_OBJECT (self, "New VP9 picture %p", picture);
 
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_configure (self->decoder, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
 }
 
-static GstVp9Picture *
-gst_d3d11_vp9_dec_duplicate_picture (GstVp9Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp9Picture * picture)
+static GstFlowReturn
+gst_d3d11_vp9_dec_new_picture (GstDxvaVp9Decoder * decoder,
+    GstCodecPicture * picture)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstBuffer *view_buffer;
-  GstVp9Picture *new_picture;
-
-  view_buffer = (GstBuffer *) gst_vp9_picture_get_user_data (picture);
-
-  if (!view_buffer) {
-    GST_ERROR_OBJECT (self, "Parent picture does not have output view buffer");
-    return NULL;
-  }
 
-  new_picture = gst_vp9_picture_new ();
-  new_picture->frame_hdr = picture->frame_hdr;
-
-  GST_LOG_OBJECT (self, "Duplicate output with buffer %" GST_PTR_FORMAT,
-      view_buffer);
-
-  gst_vp9_picture_set_user_data (new_picture,
-      gst_buffer_ref (view_buffer), (GDestroyNotify) gst_buffer_unref);
-
-  return new_picture;
+  return gst_d3d11_decoder_new_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture);
 }
 
 static GstFlowReturn
-gst_d3d11_vp9_dec_start_picture (GstVp9Decoder * decoder,
-    GstVp9Picture * picture)
+gst_d3d11_vp9_dec_duplicate_picture (GstDxvaVp9Decoder * decoder,
+    GstCodecPicture * src, GstCodecPicture * dst)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
-
-  inner->bitstream_buffer.resize (0);
 
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_duplicate_picture (self->decoder, src, dst);
 }
 
-static ID3D11VideoDecoderOutputView *
-gst_d3d11_vp9_dec_get_output_view_from_picture (GstD3D11Vp9Dec * self,
-    GstVp9Picture * picture, guint8 * view_id)
+static guint8
+gst_d3d11_vp9_dec_get_picture_id (GstDxvaVp9Decoder * decoder,
+    GstCodecPicture * picture)
 {
-  GstD3D11Vp9DecInner *inner = self->inner;
-  GstBuffer *view_buffer;
-  ID3D11VideoDecoderOutputView *view;
-
-  view_buffer = (GstBuffer *) gst_vp9_picture_get_user_data (picture);
-  if (!view_buffer) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view buffer");
-    return NULL;
-  }
-
-  view =
-      gst_d3d11_decoder_get_output_view_from_buffer (inner->d3d11_decoder,
-      view_buffer, view_id);
-  if (!view) {
-    GST_DEBUG_OBJECT (self, "current picture does not have output view handle");
-    return NULL;
-  }
-
-  return view;
-}
-
-static void
-gst_d3d11_vp9_dec_copy_frame_params (GstD3D11Vp9Dec * self,
-    GstVp9Picture * picture, DXVA_PicParams_VP9 * params)
-{
-  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
-
-  params->profile = frame_hdr->profile;
-  params->frame_type = frame_hdr->frame_type;
-  params->show_frame = frame_hdr->show_frame;
-  params->error_resilient_mode = frame_hdr->error_resilient_mode;
-  params->subsampling_x = frame_hdr->subsampling_x;
-  params->subsampling_y = frame_hdr->subsampling_y;
-  params->refresh_frame_context = frame_hdr->refresh_frame_context;
-  params->frame_parallel_decoding_mode =
-      frame_hdr->frame_parallel_decoding_mode;
-  params->intra_only = frame_hdr->intra_only;
-  params->frame_context_idx = frame_hdr->frame_context_idx;
-  params->reset_frame_context = frame_hdr->reset_frame_context;
-  if (frame_hdr->frame_type == GST_VP9_KEY_FRAME)
-    params->allow_high_precision_mv = 0;
-  else
-    params->allow_high_precision_mv = frame_hdr->allow_high_precision_mv;
-
-  params->width = frame_hdr->width;
-  params->height = frame_hdr->height;
-  params->BitDepthMinus8Luma = frame_hdr->bit_depth - 8;
-  params->BitDepthMinus8Chroma = frame_hdr->bit_depth - 8;
-
-  params->interp_filter = frame_hdr->interpolation_filter;
-  params->log2_tile_cols = frame_hdr->tile_cols_log2;
-  params->log2_tile_rows = frame_hdr->tile_rows_log2;
-}
-
-static void
-gst_d3d11_vp9_dec_copy_reference_frames (GstD3D11Vp9Dec * self,
-    GstVp9Picture * picture, GstVp9Dpb * dpb, DXVA_PicParams_VP9 * params)
-{
-  gint i;
-
-  for (i = 0; i < GST_VP9_REF_FRAMES; i++) {
-    if (dpb->pic_listi) {
-      GstVp9Picture *other_pic = dpb->pic_listi;
-      ID3D11VideoDecoderOutputView *view;
-      guint8 view_id = 0xff;
-
-      view = gst_d3d11_vp9_dec_get_output_view_from_picture (self, other_pic,
-          &view_id);
-      if (!view) {
-        GST_ERROR_OBJECT (self, "picture does not have output view handle");
-        return;
-      }
-
-      params->ref_frame_mapi.Index7Bits = view_id;
-      params->ref_frame_coded_widthi = picture->frame_hdr.width;
-      params->ref_frame_coded_heighti = picture->frame_hdr.height;
-    } else {
-      params->ref_frame_mapi.bPicEntry = 0xff;
-      params->ref_frame_coded_widthi = 0;
-      params->ref_frame_coded_heighti = 0;
-    }
-  }
-}
-
-static void
-gst_d3d11_vp9_dec_copy_frame_refs (GstD3D11Vp9Dec * self,
-    GstVp9Picture * picture, DXVA_PicParams_VP9 * params)
-{
-  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
-  gint i;
-
-  for (i = 0; i < GST_VP9_REFS_PER_FRAME; i++) {
-    params->frame_refsi = params->ref_frame_mapframe_hdr->ref_frame_idxi;
-  }
-
-  G_STATIC_ASSERT (G_N_ELEMENTS (params->ref_frame_sign_bias) ==
-      G_N_ELEMENTS (frame_hdr->ref_frame_sign_bias));
-  G_STATIC_ASSERT (sizeof (params->ref_frame_sign_bias) ==
-      sizeof (frame_hdr->ref_frame_sign_bias));
-  memcpy (params->ref_frame_sign_bias,
-      frame_hdr->ref_frame_sign_bias, sizeof (frame_hdr->ref_frame_sign_bias));
-}
-
-static void
-gst_d3d11_vp9_dec_copy_loop_filter_params (GstD3D11Vp9Dec * self,
-    GstVp9Picture * picture, DXVA_PicParams_VP9 * params)
-{
-  GstD3D11Vp9DecInner *inner = self->inner;
-  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
-  const GstVp9LoopFilterParams *lfp = &frame_hdr->loop_filter_params;
-
-  params->filter_level = lfp->loop_filter_level;
-  params->sharpness_level = lfp->loop_filter_sharpness;
-  params->mode_ref_delta_enabled = lfp->loop_filter_delta_enabled;
-  params->mode_ref_delta_update = lfp->loop_filter_delta_update;
-  params->use_prev_in_find_mv_refs =
-      inner->last_show_frame && !frame_hdr->error_resilient_mode;
-
-  if (frame_hdr->frame_type != GST_VP9_KEY_FRAME && !frame_hdr->intra_only) {
-    params->use_prev_in_find_mv_refs &=
-        (frame_hdr->width == inner->last_frame_width &&
-        frame_hdr->height == inner->last_frame_height);
-  }
-
-  G_STATIC_ASSERT (G_N_ELEMENTS (params->ref_deltas) ==
-      G_N_ELEMENTS (lfp->loop_filter_ref_deltas));
-  G_STATIC_ASSERT (sizeof (params->ref_deltas) ==
-      sizeof (lfp->loop_filter_ref_deltas));
-  memcpy (params->ref_deltas, lfp->loop_filter_ref_deltas,
-      sizeof (lfp->loop_filter_ref_deltas));
-
-  G_STATIC_ASSERT (G_N_ELEMENTS (params->mode_deltas) ==
-      G_N_ELEMENTS (lfp->loop_filter_mode_deltas));
-  G_STATIC_ASSERT (sizeof (params->mode_deltas) ==
-      sizeof (lfp->loop_filter_mode_deltas));
-  memcpy (params->mode_deltas, lfp->loop_filter_mode_deltas,
-      sizeof (lfp->loop_filter_mode_deltas));
-}
-
-static void
-gst_d3d11_vp9_dec_copy_quant_params (GstD3D11Vp9Dec * self,
-    GstVp9Picture * picture, DXVA_PicParams_VP9 * params)
-{
-  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
-  const GstVp9QuantizationParams *qp = &frame_hdr->quantization_params;
-
-  params->base_qindex = qp->base_q_idx;
-  params->y_dc_delta_q = qp->delta_q_y_dc;
-  params->uv_dc_delta_q = qp->delta_q_uv_dc;
-  params->uv_ac_delta_q = qp->delta_q_uv_ac;
-}
-
-static void
-gst_d3d11_vp9_dec_copy_segmentation_params (GstD3D11Vp9Dec * self,
-    GstVp9Picture * picture, DXVA_PicParams_VP9 * params)
-{
-  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
-  const GstVp9SegmentationParams *sp = &frame_hdr->segmentation_params;
-  gint i, j;
-
-  params->stVP9Segments.enabled = sp->segmentation_enabled;
-  params->stVP9Segments.update_map = sp->segmentation_update_map;
-  params->stVP9Segments.temporal_update = sp->segmentation_temporal_update;
-  params->stVP9Segments.abs_delta = sp->segmentation_abs_or_delta_update;
-
-  G_STATIC_ASSERT (G_N_ELEMENTS (params->stVP9Segments.tree_probs) ==
-      G_N_ELEMENTS (sp->segmentation_tree_probs));
-  G_STATIC_ASSERT (sizeof (params->stVP9Segments.tree_probs) ==
-      sizeof (sp->segmentation_tree_probs));
-  memcpy (params->stVP9Segments.tree_probs, sp->segmentation_tree_probs,
-      sizeof (sp->segmentation_tree_probs));
-
-  G_STATIC_ASSERT (G_N_ELEMENTS (params->stVP9Segments.pred_probs) ==
-      G_N_ELEMENTS (sp->segmentation_pred_prob));
-  G_STATIC_ASSERT (sizeof (params->stVP9Segments.pred_probs) ==
-      sizeof (sp->segmentation_pred_prob));
-
-  if (sp->segmentation_temporal_update) {
-    memcpy (params->stVP9Segments.pred_probs, sp->segmentation_pred_prob,
-        sizeof (params->stVP9Segments.pred_probs));
-  } else {
-    memset (params->stVP9Segments.pred_probs, 255,
-        sizeof (params->stVP9Segments.pred_probs));
-  }
-
-  for (i = 0; i < GST_VP9_MAX_SEGMENTS; i++) {
-    params->stVP9Segments.feature_maski =
-        (sp->feature_enablediGST_VP9_SEG_LVL_ALT_Q << 0) |
-        (sp->feature_enablediGST_VP9_SEG_LVL_ALT_L << 1) |
-        (sp->feature_enablediGST_VP9_SEG_LVL_REF_FRAME << 2) |
-        (sp->feature_enablediGST_VP9_SEG_SEG_LVL_SKIP << 3);
+  GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
 
-    for (j = 0; j < 3; j++)
-      params->stVP9Segments.feature_dataij = sp->feature_dataij;
-    params->stVP9Segments.feature_datai3 = 0;
-  }
+  return gst_d3d11_decoder_get_picture_id (self->decoder, picture);
 }
 
 static GstFlowReturn
-gst_d3d11_vp9_dec_decode_picture (GstVp9Decoder * decoder,
-    GstVp9Picture * picture, GstVp9Dpb * dpb)
+gst_d3d11_vp9_dec_start_picture (GstDxvaVp9Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
-  DXVA_PicParams_VP9 *pic_params = &inner->pic_params;
-  DXVA_Slice_VPx_Short *slice = &inner->slice;
-  ID3D11VideoDecoderOutputView *view;
-  guint8 view_id = 0xff;
-
-  view = gst_d3d11_vp9_dec_get_output_view_from_picture (self, picture,
-      &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_ERROR;
-  }
-
-  memset (pic_params, 0, sizeof (DXVA_PicParams_VP9));
 
-  pic_params->CurrPic.Index7Bits = view_id;
-  pic_params->uncompressed_header_size_byte_aligned =
-      picture->frame_hdr.frame_header_length_in_bytes;
-  pic_params->first_partition_size = picture->frame_hdr.header_size_in_bytes;
-  pic_params->StatusReportFeedbackNumber = 1;
-
-  gst_d3d11_vp9_dec_copy_frame_params (self, picture, pic_params);
-  gst_d3d11_vp9_dec_copy_reference_frames (self, picture, dpb, pic_params);
-  gst_d3d11_vp9_dec_copy_frame_refs (self, picture, pic_params);
-  gst_d3d11_vp9_dec_copy_loop_filter_params (self, picture, pic_params);
-  gst_d3d11_vp9_dec_copy_quant_params (self, picture, pic_params);
-  gst_d3d11_vp9_dec_copy_segmentation_params (self, picture, pic_params);
-
-  inner->bitstream_buffer.resize (picture->size);
-  memcpy (&inner->bitstream_buffer0, picture->data, picture->size);
-
-  slice->BSNALunitDataLocation = 0;
-  slice->SliceBytesInBuffer = inner->bitstream_buffer.size ();
-  slice->wBadSliceChopping = 0;
-
-  inner->last_frame_width = pic_params->width;
-  inner->last_frame_height = pic_params->height;
-  inner->last_show_frame = pic_params->show_frame;
-
-  return GST_FLOW_OK;
+  return gst_d3d11_decoder_start_picture (self->decoder, picture, picture_id);
 }
 
 static GstFlowReturn
-gst_d3d11_vp9_dec_end_picture (GstVp9Decoder * decoder, GstVp9Picture * picture)
+gst_d3d11_vp9_dec_end_picture (GstDxvaVp9Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
-  ID3D11VideoDecoderOutputView *view;
-  guint8 view_id = 0xff;
-  size_t bitstream_buffer_size;
-  size_t bitstream_pos;
-  GstD3D11DecodeInputStreamArgs input_args;
-
-  if (inner->bitstream_buffer.empty ()) {
-    GST_ERROR_OBJECT (self, "No bitstream buffer to submit");
-    return GST_FLOW_ERROR;
-  }
-
-  view = gst_d3d11_vp9_dec_get_output_view_from_picture (self,
-      picture, &view_id);
-  if (!view) {
-    GST_ERROR_OBJECT (self, "current picture does not have output view handle");
-    return GST_FLOW_ERROR;
-  }
 
-  memset (&input_args, 0, sizeof (GstD3D11DecodeInputStreamArgs));
-
-  bitstream_pos = inner->bitstream_buffer.size ();
-  bitstream_buffer_size = GST_ROUND_UP_128 (bitstream_pos);
-
-  if (bitstream_buffer_size > bitstream_pos) {
-    size_t padding = bitstream_buffer_size - bitstream_pos;
-
-    /* As per DXVA spec, total amount of bitstream buffer size should be
-     * 128 bytes aligned. If actual data is not multiple of 128 bytes,
-     * the last slice data needs to be zero-padded */
-    inner->bitstream_buffer.resize (bitstream_buffer_size, 0);
-
-    inner->slice.SliceBytesInBuffer += padding;
-  }
-
-  input_args.picture_params = &inner->pic_params;
-  input_args.picture_params_size = sizeof (DXVA_PicParams_VP9);
-  input_args.slice_control = &inner->slice;
-  input_args.slice_control_size = sizeof (DXVA_Slice_VPx_Short);
-  input_args.bitstream = &inner->bitstream_buffer0;
-  input_args.bitstream_size = inner->bitstream_buffer.size ();
-
-  return gst_d3d11_decoder_decode_frame (inner->d3d11_decoder,
-      view, &input_args);
+  return gst_d3d11_decoder_end_picture (self->decoder, picture, args);
 }
 
 static GstFlowReturn
-gst_d3d11_vp9_dec_output_picture (GstVp9Decoder * decoder,
-    GstVideoCodecFrame * frame, GstVp9Picture * picture)
+gst_d3d11_vp9_dec_output_picture (GstDxvaVp9Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
 {
   GstD3D11Vp9Dec *self = GST_D3D11_VP9_DEC (decoder);
-  GstD3D11Vp9DecInner *inner = self->inner;
-  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
-  GstBuffer *view_buffer;
-
-  GST_LOG_OBJECT (self, "Outputting picture %p", picture);
-
-  view_buffer = (GstBuffer *) gst_vp9_picture_get_user_data (picture);
-
-  if (!view_buffer) {
-    GST_ERROR_OBJECT (self, "Could not get output view");
-    goto error;
-  }
-
-  if (!gst_d3d11_decoder_process_output (inner->d3d11_decoder, vdec,
-          picture->discont_state, picture->frame_hdr.width,
-          picture->frame_hdr.height, view_buffer, &frame->output_buffer)) {
-    GST_ERROR_OBJECT (self, "Failed to copy buffer");
-    goto error;
-  }
-
-  gst_vp9_picture_unref (picture);
-
-  return gst_video_decoder_finish_frame (vdec, frame);
-
-error:
-  gst_vp9_picture_unref (picture);
-  gst_video_decoder_release_frame (vdec, frame);
 
-  return GST_FLOW_ERROR;
+  return gst_d3d11_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
 }
 
 void
@@ -810,20 +313,20 @@
   const GUID *profile;
   GTypeInfo type_info = {
     sizeof (GstD3D11Vp9DecClass),
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     (GClassInitFunc) gst_d3d11_vp9_dec_class_init,
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
     sizeof (GstD3D11Vp9Dec),
     0,
     (GInstanceInitFunc) gst_d3d11_vp9_dec_init,
   };
-  const GUID *profile2_guid = NULL;
-  const GUID *profile0_guid = NULL;
-  GstCaps *sink_caps = NULL;
-  GstCaps *src_caps = NULL;
-  GstCaps *d3d11_caps = NULL;
+  const GUID *profile2_guid = nullptr;
+  const GUID *profile0_guid = nullptr;
+  GstCaps *sink_caps = nullptr;
+  GstCaps *src_caps = nullptr;
+  GstCaps *d3d11_caps = nullptr;
   guint max_width = 0;
   guint max_height = 0;
   guint resolution;
@@ -914,7 +417,7 @@
 
   d3d11_caps = gst_caps_copy (src_caps);
   gst_caps_set_features_simple (d3d11_caps,
-      gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, NULL));
+      gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, nullptr));
   src_caps = gst_caps_merge (d3d11_caps, src_caps);
 
   /* To cover both landscape and portrait, select max value */
@@ -935,7 +438,7 @@
     feature_name = g_strdup_printf ("d3d11vp9device%ddec", index);
   }
 
-  type = g_type_register_static (GST_TYPE_VP9_DECODER,
+  type = g_type_register_static (GST_TYPE_DXVA_VP9_DECODER,
       type_name, &type_info, (GTypeFlags) 0);
 
   /* make lower rank than default device */

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11vp9dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11vp9dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11window.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11window.cpp Changed

@@ -104,8 +104,8 @@
 static void gst_d3d11_window_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 static void gst_d3d11_window_dispose (GObject * object);
-static GstFlowReturn gst_d3d111_window_present (GstD3D11Window * self,
-    GstBuffer * buffer, GstBuffer * render_target);
+static GstFlowReturn gst_d3d11_window_present (GstD3D11Window * self,
+    GstBuffer * buffer, GstBuffer * render_target, GstBuffer * multisample);
 static void gst_d3d11_window_on_resize_default (GstD3D11Window * window,
     guint width, guint height);
 static GstFlowReturn gst_d3d11_window_prepare_default (GstD3D11Window * window,
@@ -194,6 +194,14 @@
   self->fullscreen_toggle_mode = GST_D3D11_WINDOW_FULLSCREEN_TOGGLE_MODE_NONE;
   self->fullscreen = DEFAULT_FULLSCREEN;
   self->emit_present = DEFAULT_EMIT_PRESENT;
+  self->fov = 90.0f;
+  self->ortho = FALSE;
+  self->rotation_x = 0.0f;
+  self->rotation_y = 0.0f;
+  self->rotation_z = 0.0f;
+  self->scale_x = 1.0f;
+  self->scale_y = 1.0f;
+  self->msaa = GST_D3D11_MSAA_DISABLED;
 }
 
 static void
@@ -279,6 +287,7 @@
   gst_clear_object (&self->compositor);
   gst_clear_object (&self->converter);
 
+  gst_clear_buffer (&self->msaa_buffer);
   gst_clear_buffer (&self->cached_buffer);
   gst_clear_object (&self->device);
 
@@ -297,14 +306,19 @@
   GstVideoRectangle src_rect, dst_rect, rst_rect;
   IDXGISwapChain *swap_chain;
   GstMemory *mem;
+  GstMemory *msaa_mem = nullptr;
   GstD3D11Memory *dmem;
   ID3D11RenderTargetView *rtv;
   ID3D11DeviceContext *context;
+  ID3D11Device *device_handle;
   gsize size;
   GstD3D11DeviceLockGuard lk (device);
   const FLOAT clear_color = { 0.0, 0.0, 0.0, 1.0 };
+  UINT quality_levels = 0;
+  UINT sample_count = 1;
 
   gst_clear_buffer (&self->backbuffer);
+  gst_clear_buffer (&self->msaa_buffer);
   if (!self->swap_chain)
     return;
 
@@ -350,12 +364,56 @@
     return;
   }
 
+  switch (self->msaa) {
+    case GST_D3D11_MSAA_2X:
+      sample_count = 2;
+      break;
+    case GST_D3D11_MSAA_4X:
+      sample_count = 4;
+      break;
+    case GST_D3D11_MSAA_8X:
+      sample_count = 8;
+      break;
+    default:
+      break;
+  }
+
+  device_handle = gst_d3d11_device_get_device_handle (self->device);
+  while (sample_count > 1) {
+    hr = device_handle->CheckMultisampleQualityLevels (desc.Format,
+        sample_count, &quality_levels);
+    if (gst_d3d11_result (hr, device) && quality_levels > 0)
+      break;
+
+    sample_count = sample_count / 2;
+  };
+
+  if (sample_count > 1 && quality_levels > 0) {
+    ComPtr < ID3D11Texture2D > multisample_texture;
+    desc.SampleDesc.Count = sample_count;
+    desc.SampleDesc.Quality = quality_levels - 1;
+    device_handle->CreateTexture2D (&desc, nullptr, &multisample_texture);
+
+    if (multisample_texture) {
+      msaa_mem = gst_d3d11_allocator_alloc_wrapped (nullptr,
+          self->device, multisample_texture.Get (), size, nullptr, nullptr);
+
+      dmem = GST_D3D11_MEMORY_CAST (msaa_mem);
+      rtv = gst_d3d11_memory_get_render_target_view (dmem, 0);
+    }
+  }
+
   context = gst_d3d11_device_get_device_context_handle (self->device);
   context->ClearRenderTargetView (rtv, clear_color);
 
   self->backbuffer = gst_buffer_new ();
   gst_buffer_append_memory (self->backbuffer, mem);
 
+  if (msaa_mem) {
+    self->msaa_buffer = gst_buffer_new ();
+    gst_buffer_append_memory (self->msaa_buffer, msaa_mem);
+  }
+
   self->surface_width = desc.Width;
   self->surface_height = desc.Height;
 
@@ -399,8 +457,10 @@
   self->first_present = TRUE;
 
   /* redraw the last scene if cached buffer exits */
-  if (self->cached_buffer)
-    gst_d3d111_window_present (self, self->cached_buffer, self->backbuffer);
+  if (self->cached_buffer) {
+    gst_d3d11_window_present (self, self->cached_buffer, self->backbuffer,
+        self->msaa_buffer);
+  }
 }
 
 void
@@ -755,6 +815,19 @@
   gst_video_info_apply_dxgi_color_space (swapchain_colorspace,
       &window->render_info);
 
+  if (GST_VIDEO_INFO_HAS_ALPHA (&window->info)) {
+    if (config) {
+      gst_structure_set (config, GST_D3D11_CONVERTER_OPT_DEST_ALPHA_MODE,
+          GST_TYPE_D3D11_CONVERTER_ALPHA_MODE,
+          GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED, nullptr);
+    } else {
+      config = gst_structure_new ("convert-config",
+          GST_D3D11_CONVERTER_OPT_DEST_ALPHA_MODE,
+          GST_TYPE_D3D11_CONVERTER_ALPHA_MODE,
+          GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED, nullptr);
+    }
+  }
+
   window->converter = gst_d3d11_converter_new (device,
       &window->info, &window->render_info, config);
 
@@ -835,8 +908,8 @@
 }
 
 static GstFlowReturn
-gst_d3d111_window_present (GstD3D11Window * self, GstBuffer * buffer,
-    GstBuffer * backbuffer)
+gst_d3d11_window_present (GstD3D11Window * self, GstBuffer * buffer,
+    GstBuffer * backbuffer, GstBuffer * multisample)
 {
   GstD3D11WindowClass *klass = GST_D3D11_WINDOW_GET_CLASS (self);
   GstFlowReturn ret = GST_FLOW_OK;
@@ -846,6 +919,8 @@
   ID3D11RenderTargetView *rtv;
   GstMemory *mem;
   GstD3D11Memory *dmem;
+  GstBuffer *target_buf;
+  ID3D11DeviceContext *context;
 
   if (!buffer)
     return GST_FLOW_OK;
@@ -855,7 +930,12 @@
     return GST_FLOW_ERROR;
   }
 
-  mem = gst_buffer_peek_memory (backbuffer, 0);
+  if (multisample)
+    target_buf = multisample;
+  else
+    target_buf = backbuffer;
+
+  mem = gst_buffer_peek_memory (target_buf, 0);
   if (!gst_is_d3d11_memory (mem)) {
     GST_ERROR_OBJECT (self, "Invalid back buffer");
     return GST_FLOW_ERROR;
@@ -868,14 +948,13 @@
     return GST_FLOW_ERROR;
   }
 
+  context = gst_d3d11_device_get_device_context_handle (self->device);
+
   /* We use flip mode swapchain and will not redraw borders.
    * So backbuffer should be cleared manually in order to remove artifact of
    * previous client's rendering on present signal */
-  if (self->emit_present) {
+  if (self->emit_present || self->first_present) {
     const FLOAT clear_color = { 0.0f, 0.0f, 0.0f, 1.0f };
-    ID3D11DeviceContext *context =
-        gst_d3d11_device_get_device_context_handle (self->device);
-
     context->ClearRenderTargetView (rtv, clear_color);
   }
 
@@ -908,22 +987,47 @@
     viewport.MinDepth = 0.0f;
     viewport.MaxDepth = 1.0f;
 
-    g_object_set (self->converter, "dest-x", (gint) self->render_rect.left,
-        "dest-y", (gint) self->render_rect.top,
-        "dest-width",
-        (gint) (self->render_rect.right - self->render_rect.left),
-        "dest-height",
-        (gint) (self->render_rect.bottom - self->render_rect.top),
-        "video-direction", self->method, nullptr);
+    g_object_set (self->converter, "dest-x", (gint) viewport.TopLeftX,
+        "dest-y", (gint) viewport.TopLeftY,
+        "dest-width", (gint) viewport.Width,
+        "dest-height", (gint) viewport.Height, nullptr);
+
+    if (!gst_d3d11_need_transform (self->rotation_x, self->rotation_y,
+            self->rotation_z, self->scale_x, self->scale_y)) {
+      g_object_set (self->converter, "video-direction", self->method, nullptr);
+    } else {
+      GST_DEBUG_OBJECT (self, "Applying custom transform");
+
+      gst_d3d11_converter_apply_transform (self->converter, self->method,
+          viewport.Width, viewport.Height, self->fov, self->ortho,
+          self->rotation_x, self->rotation_y, self->rotation_z,
+          self->scale_x, self->scale_y);
+    }
+
     gst_d3d11_overlay_compositor_update_viewport (self->compositor, &viewport);
   }
 
   if (!gst_d3d11_converter_convert_buffer_unlocked (self->converter,
-          buffer, backbuffer)) {
+          buffer, target_buf)) {
     GST_ERROR_OBJECT (self, "Couldn't render buffer");
     return GST_FLOW_ERROR;
   }
 
+  if (multisample) {
+    GstD3D11Memory *src_mem;
+    GstD3D11Memory *dst_mem;
+
+    src_mem = (GstD3D11Memory *) gst_buffer_peek_memory (multisample, 0);
+    dst_mem = (GstD3D11Memory *) gst_buffer_peek_memory (backbuffer, 0);
+
+    auto src_tex = gst_d3d11_memory_get_resource_handle (src_mem);
+    auto dst_tex = gst_d3d11_memory_get_resource_handle (dst_mem);
+
+    context->ResolveSubresource (dst_tex, 0, src_tex, 0, self->dxgi_format);
+
+    rtv = gst_d3d11_memory_get_render_target_view (dst_mem, 0);
+  }
+
   gst_d3d11_overlay_compositor_upload (self->compositor, buffer);
   gst_d3d11_overlay_compositor_draw_unlocked (self->compositor, &rtv);
 
@@ -949,8 +1053,8 @@
   if (buffer)
     gst_buffer_replace (&window->cached_buffer, buffer);
 
-  return gst_d3d111_window_present (window, window->cached_buffer,
-      window->backbuffer);
+  return gst_d3d11_window_present (window, window->cached_buffer,
+      window->backbuffer, window->msaa_buffer);
 }
 
 GstFlowReturn
@@ -980,7 +1084,7 @@
     return GST_FLOW_OK;
   }
 
-  ret = gst_d3d111_window_present (window, buffer, data.render_target);
+  ret = gst_d3d11_window_present (window, buffer, data.render_target, nullptr);
 
   klass->release_shared_handle (window, &data);
 
@@ -1084,17 +1188,39 @@
 }
 
 void
-gst_d3d11_window_set_orientation (GstD3D11Window * window,
-    GstVideoOrientationMethod method)
+gst_d3d11_window_set_orientation (GstD3D11Window * window, gboolean immediate,
+    GstVideoOrientationMethod method, gfloat fov, gboolean ortho,
+    gfloat rotation_x, gfloat rotation_y, gfloat rotation_z,
+    gfloat scale_x, gfloat scale_y)
 {
-  if (method == GST_VIDEO_ORIENTATION_AUTO ||
-      method == GST_VIDEO_ORIENTATION_CUSTOM) {
-    return;
+  GstD3D11DeviceLockGuard lk (window->device);
+  if (window->method != method || window->fov != fov || window->ortho != ortho
+      || window->rotation_x != rotation_x || window->rotation_y != rotation_y
+      || window->rotation_z != rotation_z || window->scale_x != scale_x
+      || window->scale_y != scale_y) {
+    window->method = method;
+    window->fov = fov;
+    window->ortho = ortho;
+    window->rotation_x = rotation_x;
+    window->rotation_y = rotation_y;
+    window->rotation_z = rotation_z;
+    window->scale_x = scale_x;
+    window->scale_y = scale_y;
+    window->first_present = TRUE;
+    if (immediate && window->swap_chain && window->backbuffer
+        && window->cached_buffer) {
+      gst_d3d11_window_present (window, window->cached_buffer,
+          window->backbuffer, window->msaa_buffer);
+    }
   }
+}
 
+void
+gst_d3d11_window_set_msaa_mode (GstD3D11Window * window, GstD3D11MSAAMode mode)
+{
   GstD3D11DeviceLockGuard lk (window->device);
-  if (window->method != method) {
-    window->method = method;
+  if (window->msaa != mode) {
+    window->msaa = mode;
     if (window->swap_chain) {
       GstD3D11WindowClass *klass = GST_D3D11_WINDOW_GET_CLASS (window);

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11window.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11window.h Changed

@@ -66,9 +66,9 @@
   guint texture_misc_flags;
   guint64 acquire_key;
   guint64 release_key;
+  gboolean use_keyed_mutex;
 
   GstBuffer *render_target;
-  IDXGIKeyedMutex *keyed_mutex;
 } GstD3D11WindowSharedHandleData;
 
 struct _GstD3D11Window
@@ -109,11 +109,20 @@
   IDXGISwapChain *swap_chain;
   GstBuffer *backbuffer;
   DXGI_FORMAT dxgi_format;
+  GstBuffer *msaa_buffer;
 
   GstBuffer *cached_buffer;
   gboolean first_present;
 
   GstVideoOrientationMethod method;
+  gfloat fov;
+  gboolean ortho;
+  gfloat rotation_x;
+  gfloat rotation_y;
+  gfloat rotation_z;
+  gfloat scale_x;
+  gfloat scale_y;
+  GstD3D11MSAAMode msaa;
 };
 
 struct _GstD3D11WindowClass
@@ -178,7 +187,18 @@
                                                      const gchar *title);
 
 void          gst_d3d11_window_set_orientation      (GstD3D11Window * window,
-                                                     GstVideoOrientationMethod method);
+                                                     gboolean immediate,
+                                                     GstVideoOrientationMethod method,
+                                                     gfloat fov,
+                                                     gboolean ortho,
+                                                     gfloat rotation_x,
+                                                     gfloat rotation_y,
+                                                     gfloat rotation_z,
+                                                     gfloat scale_x,
+                                                     gfloat scale_y);
+
+void          gst_d3d11_window_set_msaa_mode        (GstD3D11Window * window,
+                                                     GstD3D11MSAAMode mode);
 
 GstFlowReturn gst_d3d11_window_prepare              (GstD3D11Window * window,
                                                      guint display_width,

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11window_dummy.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11window_dummy.cpp Changed

@@ -211,7 +211,6 @@
   GstMemory *mem;
   GstD3D11Memory *dmem;
   D3D11_TEXTURE2D_DESC desc;
-  gboolean use_keyed_mutex = FALSE;
 
   device_handle = gst_d3d11_device_get_device_handle (device);
 
@@ -234,17 +233,10 @@
     return FALSE;
 
   texture->GetDesc (&desc);
-  use_keyed_mutex = (desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX) ==
+  data->use_keyed_mutex =
+      (desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX) ==
       D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX;
 
-  if (use_keyed_mutex) {
-    hr = texture->QueryInterface (IID_PPV_ARGS (&keyed_mutex));
-    if (!gst_d3d11_result (hr, device)) {
-      GST_ERROR_OBJECT (window, "Keyed mutex is unavailable");
-      return FALSE;
-    }
-  }
-
   mem = gst_d3d11_allocator_alloc_wrapped (nullptr,
       device, texture.Get (), desc.Width * desc.Height * 4, nullptr, nullptr);
   if (!mem) {
@@ -260,23 +252,12 @@
     return FALSE;
   }
 
-  if (keyed_mutex) {
-    hr = keyed_mutex->AcquireSync (data->acquire_key, INFINITE);
-    if (!gst_d3d11_result (hr, device)) {
-      GST_ERROR_OBJECT (window, "Couldn't acquire sync");
-      gst_memory_unref (mem);
-      return FALSE;
-    }
-  }
-
   /* Everything is prepared now */
   gst_d3d11_window_dummy_on_resize (window, desc.Width, desc.Height);
 
   /* Move owned resources */
   data->render_target = gst_buffer_new ();
   gst_buffer_append_memory (data->render_target, mem);
-  if (keyed_mutex)
-    data->keyed_mutex = keyed_mutex.Detach ();
 
   return TRUE;
 }
@@ -287,15 +268,9 @@
 {
   GstD3D11WindowDummy *self = GST_D3D11_WINDOW_DUMMY (window);
   GstD3D11Device *device = window->device;
-  HRESULT hr;
 
   /* TODO: cache owned resource for the later reuse? */
-  if (data->keyed_mutex) {
-    hr = data->keyed_mutex->ReleaseSync (data->release_key);
-    gst_d3d11_result (hr, device);
-
-    GST_D3D11_CLEAR_COM (data->keyed_mutex);
-  } else {
+  if (!data->use_keyed_mutex) {
     /* If keyed mutex is not used, let's handle sync manually by using
      * fence. Issued GPU commands might not be finished yet */

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11window_win32.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11window_win32.cpp Changed

@@ -78,11 +78,11 @@
 
   GThread *internal_hwnd_thread;
 
+  GRecMutex hwnds_lock;
   HWND internal_hwnd;
   HWND external_hwnd;
   GstD3D11WindowWin32OverlayState overlay_state;
 
-  HDC device_handle;
   gboolean have_swapchain1;
 
   /* atomic */
@@ -105,7 +105,7 @@
     GST_TYPE_D3D11_WINDOW);
 
 static void gst_d3d11_window_win32_constructed (GObject * object);
-static void gst_d3d11_window_win32_dispose (GObject * object);
+static void gst_d3d11_window_win32_finalize (GObject * object);
 
 static void gst_d3d11_window_win32_show (GstD3D11Window * window);
 static void gst_d3d11_window_win32_update_swap_chain (GstD3D11Window * window);
@@ -149,7 +149,7 @@
   GstD3D11WindowClass *window_class = GST_D3D11_WINDOW_CLASS (klass);
 
   gobject_class->constructed = gst_d3d11_window_win32_constructed;
-  gobject_class->dispose = gst_d3d11_window_win32_dispose;
+  gobject_class->finalize = gst_d3d11_window_win32_finalize;
 
   window_class->show = GST_DEBUG_FUNCPTR (gst_d3d11_window_win32_show);
   window_class->update_swap_chain =
@@ -178,6 +178,7 @@
 {
   self->main_context = g_main_context_new ();
   self->restore_placement.length = sizeof (WINDOWPLACEMENT);
+  g_rec_mutex_init (&self->hwnds_lock);
 }
 
 static void
@@ -206,11 +207,14 @@
 }
 
 static void
-gst_d3d11_window_win32_dispose (GObject * object)
+gst_d3d11_window_win32_finalize (GObject * object)
 {
-  GST_DEBUG_OBJECT (object, "dispose");
+  GstD3D11WindowWin32 *self = (GstD3D11WindowWin32 *) object;
+
+  GST_DEBUG_OBJECT (object, "finalize");
   gst_d3d11_window_win32_unprepare (GST_D3D11_WINDOW (object));
-  G_OBJECT_CLASS (parent_class)->dispose (object);
+  g_rec_mutex_clear (&self->hwnds_lock);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static GstFlowReturn
@@ -288,9 +292,13 @@
           0, 0);
     }
 
+    /* Hold hwnds lock to allow the window thread finish processing what it could
+     * already have in the queue at this moment, before we reset the handlers to null */
+    g_rec_mutex_lock (&self->hwnds_lock);
     self->external_hwnd = NULL;
     self->internal_hwnd = NULL;
     self->internal_hwnd_thread = NULL;
+    g_rec_mutex_unlock (&self->hwnds_lock);
   }
 
   if (self->loop) {
@@ -345,16 +353,10 @@
        * on message pumping thread is not a worst idea in generall */
       PostMessageA (self->internal_hwnd, WM_GST_D3D11_MOVE_WINDOW, 0, 0);
     }
-  } else {
-    /* XXX: Not sure what's expected behavior if we are drawing on internal
-     * HWND but user wants to specify rectangle.
-     *
-     * - Should we move window to corresponding desktop coordinates ?
-     * - Or should crop correspondingly by modifying viewport of
-     *   render target view of swapchian's backbuffer or so ?
-     * - Or should we ignore set_render_rectangle if we are drawing on
-     *   internal HWND without external HWND ?
-     */
+  } else if (!window->external_handle && self->internal_hwnd) {
+    MoveWindow (self->internal_hwnd,
+        self->render_rect.x, self->render_rect.y, self->render_rect.w,
+        self->render_rect.h, TRUE);
   }
 }
 
@@ -586,7 +588,7 @@
     wc.lpfnWndProc = window_proc;
     wc.hInstance = hinstance;
     wc.hIcon = LoadIcon (NULL, IDI_WINLOGO);
-    wc.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
+    wc.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
     wc.hCursor = LoadCursor (NULL, IDC_ARROW);
     wc.hbrBackground = (HBRUSH) GetStockObject (BLACK_BRUSH);
     wc.lpszClassName = "GSTD3D11";
@@ -603,7 +605,6 @@
     GST_LOG_OBJECT (self, "window class was already registered");
   }
 
-  self->device_handle = 0;
   self->internal_hwnd = 0;
   self->visible = FALSE;
 
@@ -623,12 +624,6 @@
   GST_DEBUG_OBJECT (self, "d3d11 window created: %" G_GUINTPTR_FORMAT,
       (guintptr) self->internal_hwnd);
 
-  /* device_handle is set in the window_proc */
-  if (!self->device_handle) {
-    GST_ERROR_OBJECT (self, "device handle is not available");
-    return FALSE;
-  }
-
   GST_LOG_OBJECT (self,
       "Created a internal d3d11 window %p", self->internal_hwnd);
 
@@ -871,18 +866,21 @@
 
     GST_LOG_OBJECT (self, "WM_CREATE");
 
-    self->device_handle = GetDC (hWnd);
-    /* Do this, otherwise we hang on exit. We can still use it (due to the
-     * CS_OWNDC flag in the WindowClass) after we have Released.
-     */
-    ReleaseDC (hWnd, self->device_handle);
-
     SetPropA (hWnd, D3D11_WINDOW_PROP_NAME, self);
   } else if ((self = gst_d3d11_window_win32_hwnd_get_instance (hWnd))) {
-    g_assert (self->internal_hwnd == hWnd);
+    g_rec_mutex_lock (&self->hwnds_lock);
+    if (self->internal_hwnd != hWnd) {
+      g_warn_if_fail (self->internal_hwnd == NULL);
+      /* Most likely the instance is already in the destruction proccess,
+       * just let it process WM_GST_D3D11_DESTROY_INTERNAL_WINDOW */
+      g_rec_mutex_unlock (&self->hwnds_lock);
+      gst_object_unref (self);
+      return DefWindowProcA (hWnd, uMsg, wParam, lParam);
+    }
 
     gst_d3d11_window_win32_handle_window_proc (self, hWnd, uMsg, wParam,
         lParam);
+    g_rec_mutex_unlock (&self->hwnds_lock);
 
     switch (uMsg) {
       case WM_SIZE:
@@ -1197,22 +1195,30 @@
     /* if no parent the real size has to be set now because this has not been done
      * when at window creation */
     if (!self->external_hwnd) {
-      RECT rect = { 0, };
-
-      rect.right = width;
-      rect.bottom = height;
-
-      if (AdjustWindowRect (&rect, WS_GST_D3D11, FALSE)) {
-        width = rect.right - rect.left;
-        height = rect.bottom - rect.top;
+      if (self->render_rect.x != 0 || self->render_rect.y != 0 ||
+          self->render_rect.w != 0 || self->render_rect.h != 0) {
+        MoveWindow (self->internal_hwnd,
+            self->render_rect.x, self->render_rect.y, self->render_rect.w,
+            self->render_rect.h, FALSE);
       } else {
-        width += 2 * GetSystemMetrics (SM_CXSIZEFRAME);
-        height +=
-            2 * GetSystemMetrics (SM_CYSIZEFRAME) +
-            GetSystemMetrics (SM_CYCAPTION);
+        RECT rect = { 0, };
+
+        rect.right = width;
+        rect.bottom = height;
+
+        if (AdjustWindowRect (&rect, WS_GST_D3D11, FALSE)) {
+          width = rect.right - rect.left;
+          height = rect.bottom - rect.top;
+        } else {
+          width += 2 * GetSystemMetrics (SM_CXSIZEFRAME);
+          height +=
+              2 * GetSystemMetrics (SM_CYSIZEFRAME) +
+              GetSystemMetrics (SM_CYCAPTION);
+        }
+
+        MoveWindow (self->internal_hwnd, 0, 0, width, height, FALSE);
       }
 
-      MoveWindow (self->internal_hwnd, 0, 0, width, height, FALSE);
       ShowWindow (self->internal_hwnd, SW_SHOW);
     } else if (self->internal_hwnd) {
       /* ShowWindow will throw message to message pumping thread (app thread)
@@ -1297,6 +1303,13 @@
   }
 }
 
+HWND
+gst_d3d11_window_win32_get_internal_hwnd (GstD3D11Window * window)
+{
+  GstD3D11WindowWin32 *self = GST_D3D11_WINDOW_WIN32 (window);
+  return self->internal_hwnd;
+}
+
 GstD3D11Window *
 gst_d3d11_window_win32_new (GstD3D11Device * device, guintptr handle)
 {

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11window_win32.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11window_win32.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11winrtcapture.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11winrtcapture.cpp Changed

@@ -38,6 +38,7 @@
 #include <windows.graphics.directx.direct3d11.h>
 #include <windows.graphics.directx.direct3d11.interop.h>
 #include <string.h>
+#include <dwmapi.h>
 
 #include <wrl.h>
 
@@ -79,6 +80,7 @@
   HRESULT (WINAPI * WindowsDeleteString) (HSTRING string);
   HRESULT (WINAPI * RoGetActivationFactory) (HSTRING activatable_class_id,
       REFIID iid, void ** factory);
+  DPI_AWARENESS_CONTEXT (WINAPI * SetThreadDpiAwarenessContext) (DPI_AWARENESS_CONTEXT context);
 } GstD3D11WinRTVTable;
 
 static GstD3D11WinRTVTable winrt_vtable = { FALSE, };
@@ -153,6 +155,8 @@
       g_module_close (d3d11_module); \
     if (combase_module) \
       g_module_close (combase_module); \
+    if (user32_module) \
+      g_module_close (user32_module); \
     return; \
   } \
 } G_STMT_END
@@ -162,6 +166,7 @@
 {
   static GModule *d3d11_module = nullptr;
   static GModule *combase_module = nullptr;
+  static GModule *user32_module = nullptr;
 
   GST_D3D11_CALL_ONCE_BEGIN {
     d3d11_module = g_module_open ("d3d11.dll", G_MODULE_BIND_LAZY);
@@ -175,6 +180,13 @@
       return;
     }
 
+    user32_module = g_module_open ("user32.dll", G_MODULE_BIND_LAZY);
+    if (!user32_module) {
+      g_module_close (combase_module);
+      g_module_close (d3d11_module);
+      return;
+    }
+
     LOAD_SYMBOL (d3d11_module, CreateDirect3D11DeviceFromDXGIDevice,
         CreateDirect3D11DeviceFromDXGIDevice);
     LOAD_SYMBOL (combase_module, RoInitialize, RoInitialize);
@@ -183,6 +195,8 @@
     LOAD_SYMBOL (combase_module, WindowsDeleteString, WindowsDeleteString);
     LOAD_SYMBOL (combase_module, RoGetActivationFactory,
         RoGetActivationFactory);
+    LOAD_SYMBOL (user32_module, SetThreadDpiAwarenessContext,
+        SetThreadDpiAwarenessContext);
 
     winrt_vtable.loaded = TRUE;
   }
@@ -197,6 +211,7 @@
   PROP_D3D11_DEVICE,
   PROP_MONITOR_HANDLE,
   PROP_WINDOW_HANDLE,
+  PROP_CLIENT_ONLY,
 };
 
 struct _GstD3D11WinRTCapture
@@ -210,6 +225,8 @@
   /* Actual texture resolution */
   UINT width;
   UINT height;
+  UINT capture_width;
+  UINT capture_height;
 
   gboolean flushing;
   boolean show_mouse;
@@ -225,6 +242,7 @@
 
   HMONITOR monitor_handle;
   HWND window_handle;
+  gboolean client_only;
 
   HWND hidden_window;
 };
@@ -241,9 +259,6 @@
 gst_d3d11_winrt_capture_get_size (GstD3D11ScreenCapture * capture,
     guint * width, guint * height);
 static gboolean
-gst_d3d11_winrt_capture_get_colorimetry (GstD3D11ScreenCapture * capture,
-    GstVideoColorimetry * colorimetry);
-static gboolean
 gst_d3d11_winrt_capture_unlock (GstD3D11ScreenCapture * capture);
 static gboolean
 gst_d3d11_winrt_capture_unlock_stop (GstD3D11ScreenCapture * capture);
@@ -253,9 +268,7 @@
 static GstFlowReturn
 gst_d3d11_winrt_capture_do_capture (GstD3D11ScreenCapture * capture,
     GstD3D11Device * device, ID3D11Texture2D * texture,
-    ID3D11RenderTargetView * rtv, ID3D11VertexShader * vs,
-    ID3D11PixelShader * ps, ID3D11InputLayout * layout,
-    ID3D11SamplerState * sampler, ID3D11BlendState * blend,
+    ID3D11RenderTargetView * rtv, ShaderResource * resource,
     D3D11_BOX * crop_box, gboolean draw_mouse);
 static gpointer
 gst_d3d11_winrt_capture_thread_func (GstD3D11WinRTCapture * self);
@@ -292,12 +305,15 @@
           "A HWND handle of window to capture", (GParamFlags)
           (G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
               G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property (gobject_class, PROP_CLIENT_ONLY,
+      g_param_spec_boolean ("client-only",
+          "Client Only", "Captures only client area", FALSE,
+          (GParamFlags) (G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
+              G_PARAM_STATIC_STRINGS)));
 
   capture_class->prepare = GST_DEBUG_FUNCPTR (gst_d3d11_winrt_capture_prepare);
   capture_class->get_size =
       GST_DEBUG_FUNCPTR (gst_d3d11_winrt_capture_get_size);
-  capture_class->get_colorimetry =
-      GST_DEBUG_FUNCPTR (gst_d3d11_winrt_capture_get_colorimetry);
   capture_class->unlock = GST_DEBUG_FUNCPTR (gst_d3d11_winrt_capture_unlock);
   capture_class->unlock_stop =
       GST_DEBUG_FUNCPTR (gst_d3d11_winrt_capture_unlock_stop);
@@ -372,6 +388,9 @@
     case PROP_WINDOW_HANDLE:
       self->window_handle = (HWND) g_value_get_pointer (value);
       break;
+    case PROP_CLIENT_ONLY:
+      self->client_only = g_value_get_boolean (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -478,8 +497,26 @@
     goto error;
   }
 
-  self->width = (UINT) self->pool_size.Width;
-  self->height = (UINT) self->pool_size.Height;
+  self->width = self->capture_width = (UINT) self->pool_size.Width;
+  self->height = self->capture_height = (UINT) self->pool_size.Height;
+
+  if (self->window_handle && self->client_only) {
+    RECT rect;
+    if (!GetClientRect (self->window_handle, &rect)) {
+      GST_ERROR_OBJECT (self, "Could not get client rect");
+      goto error;
+    }
+
+    self->capture_width = rect.right - rect.left;
+    self->capture_height = rect.bottom - rect.top;
+
+    self->capture_width = MAX (self->capture_width, 1);
+    self->capture_height = MAX (self->capture_height, 1);
+
+    GST_DEBUG_OBJECT (self, "Client rect %d:%d:%d:%d, pool size %dx%d",
+        rect.left, rect.top, rect.right, rect.bottom,
+        self->width, self->height);
+  }
 
   hr = pool_statics2->CreateFreeThreaded (inner->d3d_device.Get (),
       DirectXPixelFormat::DirectXPixelFormat_B8G8R8A8UIntNormalized,
@@ -652,6 +689,9 @@
   }
 #endif
 
+  winrt_vtable.SetThreadDpiAwarenessContext
+      (DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE);
+
   QueryPerformanceFrequency (&self->frequency);
 
   winrt_vtable.RoInitialize (RO_INIT_MULTITHREADED);
@@ -744,20 +784,13 @@
 {
   GstD3D11WinRTCapture *self = GST_D3D11_WINRT_CAPTURE (capture);
 
-  *width = self->width;
-  *height = self->height;
+  *width = self->capture_width;
+  *height = self->capture_height;
 
   return TRUE;
 }
 
 static gboolean
-gst_d3d11_winrt_capture_get_colorimetry (GstD3D11ScreenCapture * capture,
-    GstVideoColorimetry * colorimetry)
-{
-  return FALSE;
-}
-
-static gboolean
 gst_d3d11_winrt_capture_unlock (GstD3D11ScreenCapture * capture)
 {
   GstD3D11WinRTCapture *self = GST_D3D11_WINRT_CAPTURE (capture);
@@ -801,9 +834,7 @@
 static GstFlowReturn
 gst_d3d11_winrt_capture_do_capture (GstD3D11ScreenCapture * capture,
     GstD3D11Device * device, ID3D11Texture2D * texture,
-    ID3D11RenderTargetView * rtv, ID3D11VertexShader * vs,
-    ID3D11PixelShader * ps, ID3D11InputLayout * layout,
-    ID3D11SamplerState * sampler, ID3D11BlendState * blend,
+    ID3D11RenderTargetView * rtv, ShaderResource * resource,
     D3D11_BOX * crop_box, gboolean draw_mouse)
 {
   GstD3D11WinRTCapture *self = GST_D3D11_WINRT_CAPTURE (capture);
@@ -819,6 +850,7 @@
   LONGLONG timeout;
   D3D11_TEXTURE2D_DESC desc;
   gboolean size_changed = FALSE;
+  D3D11_BOX box = *crop_box;
 
   GstD3D11CSLockGuard lk (&self->lock);
 again:
@@ -933,23 +965,93 @@
         self->width, self->height, desc.Width, desc.Height);
     self->width = desc.Width;
     self->height = desc.Height;
+    if (!self->window_handle || !self->client_only) {
+      self->capture_width = self->width;
+      self->capture_height = self->capture_height;
+    }
+
     size_changed = TRUE;
   }
 
+  if (self->window_handle && self->client_only) {
+    RECT client_rect, bound_rect;
+    POINT client_pos = { 0, };
+    UINT width, height;
+    DPI_AWARENESS_CONTEXT prev;
+    BOOL ret;
+
+    prev = winrt_vtable.SetThreadDpiAwarenessContext
+        (DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE);
+    ret = GetClientRect (self->window_handle, &client_rect) &&
+        DwmGetWindowAttribute (self->window_handle,
+        DWMWA_EXTENDED_FRAME_BOUNDS, &bound_rect, sizeof (RECT)) == S_OK &&
+        ClientToScreen (self->window_handle, &client_pos);
+
+    if (prev)
+      winrt_vtable.SetThreadDpiAwarenessContext (prev);
+
+    if (!ret) {
+      GST_ERROR_OBJECT (self, "Could not get client rect");
+      return GST_FLOW_ERROR;
+    }
+
+    width = client_rect.right - client_rect.left;
+    height = client_rect.bottom - client_rect.top;
+
+    width = MAX (width, 1);
+    height = MAX (height, 1);
+
+    if (self->capture_width != width || self->capture_height != height) {
+      GST_DEBUG_OBJECT (self, "Client rect size changed %dx%d -> %dx%d",
+          self->capture_width, self->capture_height, width, height);
+      self->capture_width = width;
+      self->capture_height = height;
+      size_changed = TRUE;
+    } else {
+      UINT x_offset = 0;
+      UINT y_offset = 0;
+
+      GST_LOG_OBJECT (self, "bound-rect: %d:%d:%d:%d, "
+          "client-rect: %d:%d:%d:%d, client-upper-left: %d:%d",
+          bound_rect.left, bound_rect.top, bound_rect.right, bound_rect.bottom,
+          client_rect.left, client_rect.top, client_rect.right,
+          client_rect.bottom, client_pos.x, client_pos.y);
+
+      if (client_pos.x > bound_rect.left)
+        x_offset = client_pos.x - bound_rect.left;
+
+      if (client_pos.y > bound_rect.top)
+        y_offset = client_pos.y - bound_rect.top;
+
+      box.left += x_offset;
+      box.top += y_offset;
+
+      box.right += x_offset;
+      box.bottom += y_offset;
+
+      /* left and top is inclusive */
+      box.left = MIN (desc.Width - 1, box.left);
+      box.top = MIN (desc.Height - 1, box.top);
+
+      box.right = MIN (desc.Width, box.right);
+      box.bottom = MIN (desc.Height, box.bottom);
+    }
+  }
+
   if (size_changed)
     return GST_D3D11_SCREEN_CAPTURE_FLOW_SIZE_CHANGED;
 
   context_handle = gst_d3d11_device_get_device_context_handle (self->device);
   GstD3D11DeviceLockGuard device_lk (self->device);
   context_handle->CopySubresourceRegion (texture, 0, 0, 0, 0,
-      captured_texture.Get (), 0, crop_box);
+      captured_texture.Get (), 0, &box);
 
   return GST_FLOW_OK;
 }
 
 GstD3D11ScreenCapture *
 gst_d3d11_winrt_capture_new (GstD3D11Device * device, HMONITOR monitor_handle,
-    HWND window_handle)
+    HWND window_handle, gboolean client_only)
 {
   GstD3D11WinRTCapture *self;
 
@@ -963,7 +1065,9 @@
 
   self = (GstD3D11WinRTCapture *) g_object_new (GST_TYPE_D3D11_WINRT_CAPTURE,
       "d3d11device", device, "monitor-handle", (gpointer) monitor_handle,
-      "window-handle", (gpointer) window_handle, nullptr);
+      "window-handle", (gpointer) window_handle, "client-only", client_only,
+      nullptr);
+
   if (!self->inner) {
     gst_clear_object (&self);
     return nullptr;

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/gstd3d11winrtcapture.h -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/gstd3d11winrtcapture.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl Added

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/PSMain_checker.hlsl Added

@@ -0,0 +1,73 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef BUILDING_HLSL
+cbuffer CheckerConstBuffer : register(b0)
+{
+  float width;
+  float height;
+  float checker_size;
+  float alpha;
+};
+
+struct PS_INPUT
+{
+  float4 Position: SV_POSITION;
+  float2 Texture: TEXCOORD;
+};
+
+float4 PSMain_checker (PS_INPUT input) : SV_Target
+{
+  float4 output;
+  float2 xy_mod = floor (0.5 * input.Texture * float2 (width, height) / checker_size);
+  float result = fmod (xy_mod.x + xy_mod.y, 2.0);
+  output.r = step (result, 0.5);
+  output.g = 1.0 - output.r;
+  output.b = 0;
+  output.a = alpha;
+  return output;
+}
+#else
+static const char g_PSMain_checker_str =
+"cbuffer CheckerConstBuffer : register(b0)\n"
+"{\n"
+"  float width;\n"
+"  float height;\n"
+"  float checker_size;\n"
+"  float alpha;\n"
+"};\n"
+"\n"
+"struct PS_INPUT\n"
+"{\n"
+"  float4 Position: SV_POSITION;\n"
+"  float2 Texture: TEXCOORD;\n"
+"};\n"
+"\n"
+"float4 PSMain_checker (PS_INPUT input) : SV_Target\n"
+"{\n"
+"  float4 output;\n"
+"  float2 xy_mod = floor (0.5 * input.Texture * float2 (width, height) / checker_size);\n"
+"  float result = fmod (xy_mod.x + xy_mod.y, 2.0);\n"
+"  output.r = step (result, 0.5);\n"
+"  output.g = 1.0 - output.r;\n"
+"  output.b = 0;\n"
+"  output.a = alpha;\n"
+"  return output;\n"
+"}\n";
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/PSMain_checker_luma.hlsl Added

@@ -0,0 +1,83 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef BUILDING_HLSL
+static const float blocksize = 8.0;
+static const float4 high = float4 (0.667, 0.0, 0.0, 1.0);
+static const float4 low = float4 (0.333, 0.0, 0.0, 1.0);
+
+struct PS_INPUT
+{
+  float4 Position : SV_POSITION;
+};
+
+struct PS_OUTPUT
+{
+  float4 Plane : SV_TARGET;
+};
+
+PS_OUTPUT PSMain_checker_luma (PS_INPUT input)
+{
+  PS_OUTPUT output;
+  if ((input.Position.x % (blocksize * 2.0)) >= blocksize) {
+    if ((input.Position.y % (blocksize * 2.0)) >= blocksize)
+      output.Plane = low;
+    else
+      output.Plane = high;
+  } else {
+    if ((input.Position.y % (blocksize * 2.0)) < blocksize)
+      output.Plane = low;
+    else
+      output.Plane = high;
+  }
+  return output;
+}
+#else
+static const char g_PSMain_checker_luma_str =
+"static const float blocksize = 8.0;\n"
+"static const float4 high = float4 (0.667, 0.0, 0.0, 1.0);\n"
+"static const float4 low = float4 (0.333, 0.0, 0.0, 1.0);\n"
+"\n"
+"struct PS_INPUT\n"
+"{\n"
+"  float4 Position : SV_POSITION;\n"
+"};\n"
+"\n"
+"struct PS_OUTPUT\n"
+"{\n"
+"  float4 Plane : SV_TARGET;\n"
+"};\n"
+"\n"
+"PS_OUTPUT PSMain_checker_luma (PS_INPUT input)\n"
+"{\n"
+"  PS_OUTPUT output;\n"
+"  if ((input.Position.x % (blocksize * 2.0)) >= blocksize) {\n"
+"    if ((input.Position.y % (blocksize * 2.0)) >= blocksize)\n"
+"      output.Plane = low;\n"
+"    else\n"
+"      output.Plane = high;\n"
+"  } else {\n"
+"    if ((input.Position.y % (blocksize * 2.0)) < blocksize)\n"
+"      output.Plane = low;\n"
+"    else\n"
+"      output.Plane = high;\n"
+"  }\n"
+"  return output;\n"
+"}\n";
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/PSMain_checker_rgb.hlsl Added

@@ -0,0 +1,83 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef BUILDING_HLSL
+static const float blocksize = 8.0;
+static const float4 high = float4 (0.667, 0.667, 0.667, 1.0);
+static const float4 low = float4 (0.333, 0.333, 0.333, 1.0);
+
+struct PS_INPUT
+{
+  float4 Position : SV_POSITION;
+};
+
+struct PS_OUTPUT
+{
+  float4 Plane : SV_TARGET;
+};
+
+PS_OUTPUT PSMain_checker_rgb (PS_INPUT input)
+{
+  PS_OUTPUT output;
+  if ((input.Position.x % (blocksize * 2.0)) >= blocksize) {
+    if ((input.Position.y % (blocksize * 2.0)) >= blocksize)
+      output.Plane = low;
+    else
+      output.Plane = high;
+  } else {
+    if ((input.Position.y % (blocksize * 2.0)) < blocksize)
+      output.Plane = low;
+    else
+      output.Plane = high;
+  }
+  return output;
+}
+#else
+static const char g_PSMain_checker_rgb_str =
+"static const float blocksize = 8.0;\n"
+"static const float4 high = float4 (0.667, 0.667, 0.667, 1.0);\n"
+"static const float4 low = float4 (0.333, 0.333, 0.333, 1.0);\n"
+"\n"
+"struct PS_INPUT\n"
+"{\n"
+"  float4 Position : SV_POSITION;\n"
+"};\n"
+"\n"
+"struct PS_OUTPUT\n"
+"{\n"
+"  float4 Plane : SV_TARGET;\n"
+"};\n"
+"\n"
+"PS_OUTPUT PSMain_checker_rgb (PS_INPUT input)\n"
+"{\n"
+"  PS_OUTPUT output;\n"
+"  if ((input.Position.x % (blocksize * 2.0)) >= blocksize) {\n"
+"    if ((input.Position.y % (blocksize * 2.0)) >= blocksize)\n"
+"      output.Plane = low;\n"
+"    else\n"
+"      output.Plane = high;\n"
+"  } else {\n"
+"    if ((input.Position.y % (blocksize * 2.0)) < blocksize)\n"
+"      output.Plane = low;\n"
+"    else\n"
+"      output.Plane = high;\n"
+"  }\n"
+"  return output;\n"
+"}\n";
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/PSMain_checker_vuya.hlsl Added

@@ -0,0 +1,83 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef BUILDING_HLSL
+static const float blocksize = 8.0;
+static const float4 high = float4 (0.5, 0.5, 0.667, 1.0);
+static const float4 low = float4 (0.5, 0.5, 0.333, 1.0);
+
+struct PS_INPUT
+{
+  float4 Position : SV_POSITION;
+};
+
+struct PS_OUTPUT
+{
+  float4 Plane : SV_TARGET;
+};
+
+PS_OUTPUT PSMain_checker_vuya (PS_INPUT input)
+{
+  PS_OUTPUT output;
+  if ((input.Position.x % (blocksize * 2.0)) >= blocksize) {
+    if ((input.Position.y % (blocksize * 2.0)) >= blocksize)
+      output.Plane = low;
+    else
+      output.Plane = high;
+  } else {
+    if ((input.Position.y % (blocksize * 2.0)) < blocksize)
+      output.Plane = low;
+    else
+      output.Plane = high;
+  }
+  return output;
+}
+#else
+static const char g_PSMain_checker_vuya_str =
+"static const float blocksize = 8.0;\n"
+"static const float4 high = float4 (0.5, 0.5, 0.667, 1.0);\n"
+"static const float4 low = float4 (0.5, 0.5, 0.333, 1.0);\n"
+"\n"
+"struct PS_INPUT\n"
+"{\n"
+"  float4 Position : SV_POSITION;\n"
+"};\n"
+"\n"
+"struct PS_OUTPUT\n"
+"{\n"
+"  float4 Plane : SV_TARGET;\n"
+"};\n"
+"\n"
+"PS_OUTPUT PSMain_checker_vuya (PS_INPUT input)\n"
+"{\n"
+"  PS_OUTPUT output;\n"
+"  if ((input.Position.x % (blocksize * 2.0)) >= blocksize) {\n"
+"    if ((input.Position.y % (blocksize * 2.0)) >= blocksize)\n"
+"      output.Plane = low;\n"
+"    else\n"
+"      output.Plane = high;\n"
+"  } else {\n"
+"    if ((input.Position.y % (blocksize * 2.0)) < blocksize)\n"
+"      output.Plane = low;\n"
+"    else\n"
+"      output.Plane = high;\n"
+"  }\n"
+"  return output;\n"
+"}\n";
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/PSMain_color.hlsl Added

@@ -0,0 +1,43 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef BUILDING_HLSL
+struct PS_INPUT
+{
+  float4 Position: SV_POSITION;
+  float4 Color: COLOR;
+};
+
+float4 PSMain_color (PS_INPUT input) : SV_TARGET
+{
+  return input.Color;
+}
+#else
+static const char g_PSMain_color_str =
+"struct PS_INPUT\n"
+"{\n"
+"  float4 Position: SV_POSITION;\n"
+"  float4 Color: COLOR;\n"
+"};\n"
+"\n"
+"float4 PSMain_color (PS_INPUT input) : SV_TARGET\n"
+"{\n"
+"  return input.Color;\n"
+"}\n";
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/PSMain_sample.hlsl Added

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/PSMain_sample_premul.hlsl Added

@@ -0,0 +1,61 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef BUILDING_HLSL
+Texture2D shaderTexture;
+SamplerState samplerState;
+
+struct PS_INPUT
+{
+  float4 Position : SV_POSITION;
+  float2 Texture : TEXCOORD;
+};
+
+float4 PSMain_sample_premul (PS_INPUT input): SV_TARGET
+{
+  float4 sample = shaderTexture.Sample (samplerState, input.Texture);
+  float4 premul_sample;
+  premul_sample.r = saturate (sample.r * sample.a);
+  premul_sample.g = saturate (sample.g * sample.a);
+  premul_sample.b = saturate (sample.b * sample.a);
+  premul_sample.a = sample.a;
+  return premul_sample;
+}
+#else
+static const char g_PSMain_sample_premul_str =
+"Texture2D shaderTexture;\n"
+"SamplerState samplerState;\n"
+"\n"
+"struct PS_INPUT\n"
+"{\n"
+"  float4 Position : SV_POSITION;\n"
+"  float2 Texture : TEXCOORD;\n"
+"};\n"
+"\n"
+"float4 PSMain_sample_premul (PS_INPUT input): SV_TARGET\n"
+"{\n"
+"  float4 sample = shaderTexture.Sample (samplerState, input.Texture);\n"
+"  float4 premul_sample;\n"
+"  premul_sample.r = saturate (sample.r * sample.a);\n"
+"  premul_sample.g = saturate (sample.g * sample.a);\n"
+"  premul_sample.b = saturate (sample.b * sample.a);\n"
+"  premul_sample.a = sample.a;\n"
+"  return premul_sample;\n"
+"}\n";
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/PSMain_snow.hlsl Added

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/VSMain_color.hlsl Added

@@ -0,0 +1,55 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef BUILDING_HLSL
+struct VS_INPUT
+{
+  float4 Position : POSITION;
+  float4 Color : COLOR;
+};
+
+struct VS_OUTPUT
+{
+  float4 Position : SV_POSITION;
+  float4 Color : COLOR;
+};
+
+VS_OUTPUT VSMain_color (VS_INPUT input)
+{
+  return input;
+}
+#else
+static const char g_VSMain_color_str =
+"struct VS_INPUT\n"
+"{\n"
+"  float4 Position : POSITION;\n"
+"  float4 Color : COLOR;\n"
+"};\n"
+"\n"
+"struct VS_OUTPUT\n"
+"{\n"
+"  float4 Position : SV_POSITION;\n"
+"  float4 Color : COLOR;\n"
+"};\n"
+"\n"
+"VS_OUTPUT VSMain_color (VS_INPUT input)\n"
+"{\n"
+"  return input;\n"
+"}\n";
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/VSMain_coord.hlsl Added

@@ -0,0 +1,55 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef BUILDING_HLSL
+struct VS_INPUT
+{
+  float4 Position : POSITION;
+  float2 Texture : TEXCOORD;
+};
+
+struct VS_OUTPUT
+{
+  float4 Position : SV_POSITION;
+  float2 Texture : TEXCOORD;
+};
+
+VS_OUTPUT VSMain_coord (VS_INPUT input)
+{
+  return input;
+}
+#else
+static const char g_VSMain_coord_str =
+"struct VS_INPUT\n"
+"{\n"
+"  float4 Position : POSITION;\n"
+"  float2 Texture : TEXCOORD;\n"
+"};\n"
+"\n"
+"struct VS_OUTPUT\n"
+"{\n"
+"  float4 Position : SV_POSITION;\n"
+"  float2 Texture : TEXCOORD;\n"
+"};\n"
+"\n"
+"VS_OUTPUT VSMain_coord (VS_INPUT input)\n"
+"{\n"
+"  return input;\n"
+"}\n";
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/VSMain_pos.hlsl Added

@@ -0,0 +1,51 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef BUILDING_HLSL
+struct VS_INPUT
+{
+  float4 Position : POSITION;
+};
+
+struct VS_OUTPUT
+{
+  float4 Position : SV_POSITION;
+};
+
+VS_OUTPUT VSMain_pos (VS_INPUT input)
+{
+  return input;
+}
+#else
+static const char g_VSMain_pos_str =
+"struct VS_INPUT\n"
+"{\n"
+"  float4 Position : POSITION;\n"
+"};\n"
+"\n"
+"struct VS_OUTPUT\n"
+"{\n"
+"  float4 Position : SV_POSITION;\n"
+"};\n"
+"\n"
+"VS_OUTPUT VSMain_pos (VS_INPUT input)\n"
+"{\n"
+"  return input;\n"
+"}\n";
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/gstd3d11plugin-hlsl.h Added

@@ -0,0 +1,58 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#ifdef HLSL_PRECOMPILED
+#include "PSMain_checker_luma.h"
+#include "PSMain_checker_rgb.h"
+#include "PSMain_checker_vuya.h"
+#include "PSMain_checker.h"
+#include "PSMain_color.h"
+#include "PSMain_sample_premul.h"
+#include "PSMain_sample.h"
+#include "PSMain_snow.h"
+#include "VSMain_color.h"
+#include "VSMain_coord.h"
+#include "VSMain_pos.h"
+#else
+const BYTE g_PSMain_checker_luma = { 0 };
+const BYTE g_PSMain_checker_rgb = { 0 };
+const BYTE g_PSMain_checker_vuya = { 0 };
+const BYTE g_PSMain_checker = { 0 };
+const BYTE g_PSMain_color = { 0 };
+const BYTE g_PSMain_sample_premul = { 0 };
+const BYTE g_PSMain_sample = { 0 };
+const BYTE g_PSMain_snow = { 0 };
+const BYTE g_VSMain_color = { 0 };
+const BYTE g_VSMain_coord = { 0 };
+const BYTE g_VSMain_pos = { 0 };
+#endif
+
+#include "PSMain_checker_luma.hlsl"
+#include "PSMain_checker_rgb.hlsl"
+#include "PSMain_checker_vuya.hlsl"
+#include "PSMain_checker.hlsl"
+#include "PSMain_color.hlsl"
+#include "PSMain_sample_premul.hlsl"
+#include "PSMain_sample.hlsl"
+#include "PSMain_snow.hlsl"
+#include "VSMain_color.hlsl"
+#include "VSMain_coord.hlsl"
+#include "VSMain_pos.hlsl"

gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/hlsl/meson.build Added

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/meson.build Changed

@@ -8,7 +8,13 @@
   'gstd3d11download.cpp',
   'gstd3d11h264dec.cpp',
   'gstd3d11h265dec.cpp',
+  'gstd3d11ipc.cpp',
+  'gstd3d11ipcclient.cpp',
+  'gstd3d11ipcserver.cpp',
+  'gstd3d11ipcsink.cpp',
+  'gstd3d11ipcsrc.cpp',
   'gstd3d11mpeg2dec.cpp',
+  'gstd3d11overlay.cpp',
   'gstd3d11overlaycompositor.cpp',
   'gstd3d11pluginutils.cpp',
   'gstd3d11testsrc.cpp',
@@ -26,11 +32,12 @@
 extra_dep = 
 
 d3d11_option = get_option('d3d11')
+d3d11_wgc_option = get_option('d3d11-wgc')
 if host_system != 'windows' or d3d11_option.disabled()
   subdir_done()
 endif
 
-if not gstd3d11_dep.found() or not cc.has_header('dxva.h') or not cc.has_header('d3d9.h')
+if not gstd3d11_dep.found() or not gstdxva_dep.found()
   if d3d11_option.enabled()
     error('The d3d11 was enabled explicitly, but required dependencies were not found.')
   endif
@@ -47,25 +54,36 @@
   subdir_done()
 endif
 
-have_wgc = cxx.compiles('''
-    #include<windows.h>
-    #include<winstring.h>
-    #include<roapi.h>
-    #include<windows.graphics.capture.h>,
-    #include<windows.graphics.capture.interop.h>
-    #include<windows.graphics.directx.direct3d11.h>
-    #include<windows.graphics.directx.direct3d11.interop.h>
-    #include<wrl.h>
-    using namespace Microsoft::WRL;
-    using namespace ABI::Windows::Graphics::Capture;
-    ComPtr<IDirect3D11CaptureFramePoolStatics> pool_statics;
-    ComPtr<IDirect3D11CaptureFramePoolStatics2> pool_statics2;
-    ComPtr<IDirect3D11CaptureFramePool> pool;
-    ComPtr<IGraphicsCaptureSession> session;
-    ComPtr<IGraphicsCaptureSession2> session2;
-    ComPtr<IGraphicsCaptureSession3> session3;
-    ''',
-    name: 'Windows Graphics Capture support in Windows SDK')
+d2d_dep = cc.find_library('d2d1', required: d3d11_option)
+have_d2d_h = cc.has_header('d2d1.h', required: d3d11_option)
+dwmapi_lib = cc.find_library('dwmapi', required: d3d11_wgc_option)
+have_wgc = false
+
+if not d3d11_wgc_option.disabled()
+  have_wgc = cxx.compiles('''
+      #include<windows.h>
+      #include<winstring.h>
+      #include<roapi.h>
+      #include<windows.graphics.capture.h>,
+      #include<windows.graphics.capture.interop.h>
+      #include<windows.graphics.directx.direct3d11.h>
+      #include<windows.graphics.directx.direct3d11.interop.h>
+      #include<wrl.h>
+      using namespace Microsoft::WRL;
+      using namespace ABI::Windows::Graphics::Capture;
+      ComPtr<IDirect3D11CaptureFramePoolStatics> pool_statics;
+      ComPtr<IDirect3D11CaptureFramePoolStatics2> pool_statics2;
+      ComPtr<IDirect3D11CaptureFramePool> pool;
+      ComPtr<IGraphicsCaptureSession> session;
+      ComPtr<IGraphicsCaptureSession2> session2;
+      ComPtr<IGraphicsCaptureSession3> session3;
+      ''',
+      name: 'Windows Graphics Capture support in Windows SDK')
+
+  if d3d11_wgc_option.enabled() and not have_wgc
+    error('The Windows Graphics Capture feature is enabled but not supported by Windows SDK')
+  endif
+endif
 
 # if build target is Windows 10 and WINAPI_PARTITION_APP is allowed,
 # we can build UWP only modules as well
@@ -73,6 +91,9 @@
   d3d11_sources += 'gstd3d11window_corewindow.cpp',
                     'gstd3d11window_swapchainpanel.cpp'
   extra_dep += runtimeobject_lib
+  if cc.get_id() == 'msvc' and get_option('b_sanitize') == 'address'
+    extra_args += '/bigobj'
+  endif
 endif
 
 if d3d11_winapi_desktop
@@ -88,9 +109,10 @@
     extra_dep += winmm_lib
   endif
 
-  if have_wgc
+  if have_wgc and dwmapi_lib.found()
     d3d11_sources += 'gstd3d11winrtcapture.cpp'
     extra_args += '-DHAVE_WINRT_CAPTURE'
+    extra_dep += dwmapi_lib
   endif
 endif
 
@@ -104,12 +126,20 @@
   extra_args += extra_mingw_args
 endif
 
+hlsl_precompiled = 
+fxc = find_program ('fxc', required : get_option ('d3d11-hlsl-precompile'))
+if cc.get_id() == 'msvc' and fxc.found()
+  subdir('hlsl')
+  extra_args += '-DHLSL_PRECOMPILED'
+endif
+
 gstd3d11 = library('gstd3d11',
-  d3d11_sources,
+  d3d11_sources + hlsl_precompiled,
   c_args : gst_plugins_bad_args + extra_c_args + extra_args,
   cpp_args: gst_plugins_bad_args + extra_args,
   include_directories : configinc,
-  dependencies : gstbase_dep, gstvideo_dep, gmodule_dep, gstcontroller_dep, gstd3d11_dep, gstcodecs_dep + extra_dep,
+  dependencies : gstbase_dep, gstvideo_dep, gmodule_dep, gstcontroller_dep,
+                  gstd3d11_dep, gstdxva_dep, d2d_dep, directxmath_dep + extra_dep,
   install : true,
   install_dir : plugins_install_dir,
 )

gst-plugins-bad-1.22.7.tar.xz/sys/d3d11/plugin.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/d3d11/plugin.cpp Changed

@@ -75,6 +75,10 @@
 #include "gstd3d11av1dec.h"
 #include "gstd3d11deinterlace.h"
 #include "gstd3d11testsrc.h"
+#include "gstd3d11overlay.h"
+#include "gstd3d11ipcsink.h"
+#include "gstd3d11ipcsrc.h"
+#include "gstd3d11ipcclient.h"
 
 #if !GST_D3D11_WINAPI_ONLY_APP
 #include "gstd3d11screencapturesrc.h"
@@ -110,6 +114,12 @@
 
 #define GST_CAT_DEFAULT gst_d3d11_debug
 
+static void
+plugin_deinit (gpointer data)
+{
+  gst_d3d11_ipc_client_deinit ();
+}
+
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
@@ -194,7 +204,8 @@
         gst_d3d11_vp8_dec_register (plugin, device, GST_RANK_PRIMARY);
         /* rust dav1ddec has "primary" rank */
         gst_d3d11_av1_dec_register (plugin, device, GST_RANK_PRIMARY + 1);
-        gst_d3d11_mpeg2_dec_register (plugin, device, GST_RANK_SECONDARY);
+        /* avdec_mpeg2video has primary rank */
+        gst_d3d11_mpeg2_dec_register (plugin, device, GST_RANK_PRIMARY + 1);
       }
 
       gst_d3d11_deinterlace_register (plugin, device, GST_RANK_MARGINAL);
@@ -203,17 +214,9 @@
     gst_object_unref (device);
   }
 
-  /* FIXME: Our shader code is not compatible with D3D_FEATURE_LEVEL_9_3
-   * or lower. So HLSL compiler cannot understand our shader code and
-   * therefore d3d11colorconverter cannot be configured.
-   *
-   * Known D3D_FEATURE_LEVEL_9_3 driver is
-   * "VirtualBox Graphics Adapter (WDDM)"
-   * ... and there might be some more old physical devices which don't support
-   * D3D_FEATURE_LEVEL_10_0.
-   */
+  /* We don't support legacy Direct9.x level GPU */
   if (max_feature_level < D3D_FEATURE_LEVEL_10_0)
-    video_sink_rank = GST_RANK_NONE;
+    return TRUE;
 
   gst_d3d11_plugin_utils_init (max_feature_level);
 
@@ -234,6 +237,12 @@
       "d3d11compositor", GST_RANK_SECONDARY, GST_TYPE_D3D11_COMPOSITOR);
   gst_element_register (plugin,
       "d3d11testsrc", GST_RANK_NONE, GST_TYPE_D3D11_TEST_SRC);
+  gst_element_register (plugin,
+      "d3d11overlay", GST_RANK_NONE, GST_TYPE_D3D11_OVERLAY);
+  gst_element_register (plugin,
+      "d3d11ipcsink", GST_RANK_NONE, GST_TYPE_D3D11_IPC_SINK);
+  gst_element_register (plugin,
+      "d3d11ipcsrc", GST_RANK_NONE, GST_TYPE_D3D11_IPC_SRC);
 
 #if !GST_D3D11_WINAPI_ONLY_APP
   if (gst_d3d11_is_windows_8_or_greater ()) {
@@ -251,6 +260,10 @@
   }
 #endif
 
+  g_object_set_data_full (G_OBJECT (plugin),
+      "plugin-d3d11-shutdown", (gpointer) "shutdown-data",
+      (GDestroyNotify) plugin_deinit);
+
   return TRUE;
 }

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12 Added

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d11on12.cpp Added

@@ -0,0 +1,129 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d11on12.h"
+#include <d3d11on12.h>
+#include <wrl.h>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+HRESULT
+GstD3D11On12CreateDevice (IUnknown * device, IUnknown * command_queue,
+    IUnknown ** d3d11on12)
+{
+  static const D3D_FEATURE_LEVEL feature_levels = {
+    D3D_FEATURE_LEVEL_12_1,
+    D3D_FEATURE_LEVEL_12_0,
+    D3D_FEATURE_LEVEL_11_1,
+    D3D_FEATURE_LEVEL_11_0,
+  };
+
+  g_return_val_if_fail (device, E_INVALIDARG);
+  g_return_val_if_fail (command_queue, E_INVALIDARG);
+  g_return_val_if_fail (d3d11on12, E_INVALIDARG);
+
+  IUnknown *cq = { command_queue };
+
+  ComPtr < ID3D11Device > d3d11device;
+  auto hr = D3D11On12CreateDevice (device, D3D11_CREATE_DEVICE_BGRA_SUPPORT,
+      feature_levels, G_N_ELEMENTS (feature_levels), cq, 1, 0, &d3d11device,
+      nullptr, nullptr);
+
+  if (FAILED (hr))
+    return hr;
+
+  ComPtr < ID3D11On12Device > d3d11on12device;
+  hr = d3d11device.As (&d3d11on12device);
+  if (FAILED (hr))
+    return hr;
+
+  *d3d11on12 = d3d11on12device.Detach ();
+  return S_OK;
+}
+
+HRESULT
+GstD3D11On12CreateWrappedResource (IUnknown * d3d11on12, IUnknown * resource12,
+    UINT bind_flags, UINT misc_flags, UINT cpu_access_flags,
+    UINT structure_byte_stride, UINT in_state, UINT out_state,
+    ID3D11Resource ** resource11)
+{
+  g_return_val_if_fail (d3d11on12, E_INVALIDARG);
+  g_return_val_if_fail (resource12, E_INVALIDARG);
+  g_return_val_if_fail (resource11, E_INVALIDARG);
+
+  ComPtr < ID3D11On12Device > device;
+  auto hr = d3d11on12->QueryInterface (IID_PPV_ARGS (&device));
+  if (FAILED (hr))
+    return hr;
+
+  D3D11_RESOURCE_FLAGS flags = { };
+  flags.BindFlags = bind_flags;
+  flags.MiscFlags = misc_flags;
+  flags.CPUAccessFlags = cpu_access_flags;
+  flags.StructureByteStride = structure_byte_stride;
+
+  ComPtr < ID3D11Resource > resource;
+  hr = device->CreateWrappedResource (resource12, &flags,
+      (D3D12_RESOURCE_STATES) in_state, (D3D12_RESOURCE_STATES) out_state,
+      IID_PPV_ARGS (&resource));
+  if (FAILED (hr))
+    return hr;
+
+  *resource11 = resource.Detach ();
+
+  return S_OK;
+}
+
+HRESULT
+GstD3D11On12ReleaseWrappedResource (IUnknown * d3d11on12,
+    ID3D11Resource ** resources, guint num_resources)
+{
+  g_return_val_if_fail (d3d11on12, E_INVALIDARG);
+
+  ComPtr < ID3D11On12Device > device;
+  auto hr = d3d11on12->QueryInterface (IID_PPV_ARGS (&device));
+  if (FAILED (hr))
+    return hr;
+
+  device->ReleaseWrappedResources (resources, num_resources);
+
+  return S_OK;
+}
+
+HRESULT
+GstD3D11On12AcquireWrappedResource (IUnknown * d3d11on12,
+    ID3D11Resource ** resources, guint num_resources)
+{
+  g_return_val_if_fail (d3d11on12, E_INVALIDARG);
+
+  ComPtr < ID3D11On12Device > device;
+  auto hr = d3d11on12->QueryInterface (IID_PPV_ARGS (&device));
+  if (FAILED (hr))
+    return hr;
+
+  device->AcquireWrappedResources (resources, num_resources);
+
+  return S_OK;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d11on12.h Added

@@ -0,0 +1,50 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <windows.h>
+#include <d3d11.h>
+
+G_BEGIN_DECLS
+
+HRESULT GstD3D11On12CreateDevice (IUnknown * device,
+                                  IUnknown * command_queue,
+                                  IUnknown ** d3d11on12);
+
+HRESULT GstD3D11On12CreateWrappedResource (IUnknown * d3d11on12,
+                                           IUnknown * resource12,
+                                           UINT bind_flags,
+                                           UINT misc_flags,
+                                           UINT cpu_access_flags,
+                                           UINT structure_byte_stride,
+                                           UINT in_state,
+                                           UINT out_state,
+                                           ID3D11Resource ** resource11);
+
+HRESULT GstD3D11On12ReleaseWrappedResource (IUnknown * d3d11on12,
+                                            ID3D11Resource ** resources,
+                                            guint num_resources);
+
+HRESULT GstD3D11On12AcquireWrappedResource (IUnknown * d3d11on12,
+                                            ID3D11Resource ** resources,
+                                            guint num_resources);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12-private.h Added

@@ -0,0 +1,197 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "gstd3d12device.h"
+#include "gstd3d12format.h"
+
+/*
+ * Preferred sorting order in a tier
+ *   - number of components
+ *   - depth
+ *   - subsampling
+ *   - supports both SRV and RTV
+ *   - prefer smaller number of planes
+ *   - prefer non-complex formats
+ *   - prefer YUV formats over RGB ones
+ *   - prefer I420 over YV12
+ *   - format name
+ */
+
+/* DXGI (semi) native formats */
+#define GST_D3D12_TIER_0_FORMATS \
+    "RGBA64_LE, RGB10A2_LE, Y410, VUYA, RGBA, BGRA, RBGA, P016_LE, P012_LE, " \
+    "P010_10LE, RGBx, BGRx, NV12"
+
+/* both SRV and RTV are supported */
+#define GST_D3D12_TIER_1_FORMATS \
+    "AYUV64, GBRA_12LE, GBRA_10LE, AYUV, ABGR, ARGB, GBRA, Y444_16LE, " \
+    "GBR_16LE, Y444_12LE, GBR_12LE, I422_12LE, I420_12LE, Y444_10LE, GBR_10LE, " \
+    "I422_10LE, I420_10LE, Y444, BGRP, GBR, RGBP, xBGR, xRGB, Y42B, NV21, " \
+    "I420, YV12, GRAY16_LE, GRAY8"
+
+#define GST_D3D12_COMMON_FORMATS \
+    GST_D3D12_TIER_0_FORMATS ", " \
+    GST_D3D12_TIER_1_FORMATS
+
+#define GST_D3D12_ALL_FORMATS \
+    "{ " GST_D3D12_COMMON_FORMATS " }"
+
+#define MAKE_FORMAT_MAP_YUV(g,d,r0,r1,r2,r3) \
+  { GST_VIDEO_FORMAT_ ##g, DXGI_FORMAT_ ##d, \
+    { DXGI_FORMAT_ ##r0, DXGI_FORMAT_ ##r1, DXGI_FORMAT_ ##r2, DXGI_FORMAT_ ##r3 }, \
+    { DXGI_FORMAT_ ##r0, DXGI_FORMAT_ ##r1, DXGI_FORMAT_ ##r2, DXGI_FORMAT_ ##r3 }, \
+    (D3D12_FORMAT_SUPPORT1) (D3D12_FORMAT_SUPPORT1_RENDER_TARGET | D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE) }
+
+#define MAKE_FORMAT_MAP_FULL(g,d,r0,r1,r2,r3,f) \
+  { g, DXGI_FORMAT_ ##d, \
+    { DXGI_FORMAT_ ##r0, DXGI_FORMAT_ ##r1, DXGI_FORMAT_ ##r2, DXGI_FORMAT_ ##r3 }, \
+    { DXGI_FORMAT_ ##r0, DXGI_FORMAT_ ##r1, DXGI_FORMAT_ ##r2, DXGI_FORMAT_ ##r3 }, \
+    (D3D12_FORMAT_SUPPORT1) (f) }
+
+#define MAKE_FORMAT_MAP_RGB(g,d) \
+  { GST_VIDEO_FORMAT_ ##g, DXGI_FORMAT_ ##d, \
+    { DXGI_FORMAT_ ##d, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, \
+    { DXGI_FORMAT_ ##d, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, \
+    (D3D12_FORMAT_SUPPORT1) (D3D12_FORMAT_SUPPORT1_RENDER_TARGET | D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE) }
+
+#define MAKE_FORMAT_MAP_RGBP(g,d,a) \
+  { GST_VIDEO_FORMAT_ ##g, DXGI_FORMAT_UNKNOWN, \
+    { DXGI_FORMAT_ ##d, DXGI_FORMAT_ ##d, DXGI_FORMAT_ ##d, DXGI_FORMAT_ ##a }, \
+    { DXGI_FORMAT_ ##d, DXGI_FORMAT_ ##d, DXGI_FORMAT_ ##d, DXGI_FORMAT_ ##a }, \
+    (D3D12_FORMAT_SUPPORT1) (D3D12_FORMAT_SUPPORT1_RENDER_TARGET | D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE) }
+
+static const GstD3D12Format g_gst_d3d12_default_format_map = {
+  MAKE_FORMAT_MAP_RGB (BGRA, B8G8R8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (RGBA, R8G8B8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (BGRx, B8G8R8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (RGBx, R8G8B8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (ARGB, R8G8B8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (xRGB, R8G8B8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (ABGR, R8G8B8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (xBGR, R8G8B8A8_UNORM),
+  MAKE_FORMAT_MAP_RGB (RGB10A2_LE, R10G10B10A2_UNORM),
+  MAKE_FORMAT_MAP_RGB (RGBA64_LE, R16G16B16A16_UNORM),
+  MAKE_FORMAT_MAP_YUV (AYUV, UNKNOWN, R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (AYUV64, UNKNOWN, R16G16B16A16_UNORM, UNKNOWN, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (VUYA, AYUV, R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (NV12, NV12, R8_UNORM, R8G8_UNORM, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (NV21, UNKNOWN, R8_UNORM, R8G8_UNORM, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (P010_10LE, P010, R16_UNORM, R16G16_UNORM, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (P012_LE, P016, R16_UNORM, R16G16_UNORM, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (P016_LE, P016, R16_UNORM, R16G16_UNORM, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (I420, UNKNOWN, R8_UNORM, R8_UNORM, R8_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (YV12, UNKNOWN, R8_UNORM, R8_UNORM, R8_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (I420_10LE, UNKNOWN, R16_UNORM, R16_UNORM, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (I420_12LE, UNKNOWN, R16_UNORM, R16_UNORM, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (Y42B, UNKNOWN, R8_UNORM, R8_UNORM, R8_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (I422_10LE, UNKNOWN, R16_UNORM, R16_UNORM, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (I422_12LE, UNKNOWN, R16_UNORM, R16_UNORM, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (Y444, UNKNOWN, R8_UNORM, R8_UNORM, R8_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (Y444_10LE, UNKNOWN, R16_UNORM, R16_UNORM, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (Y444_12LE, UNKNOWN, R16_UNORM, R16_UNORM, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (Y444_16LE, UNKNOWN, R16_UNORM, R16_UNORM, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (UYVY, UNKNOWN, R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (VYUY, UNKNOWN, R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_YUV (YVYU, UNKNOWN, R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN),
+  MAKE_FORMAT_MAP_RGB (GRAY8, R8_UNORM),
+  MAKE_FORMAT_MAP_RGB (GRAY16_LE, R16_UNORM),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_Y410, Y410,
+      R10G10B10A2_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_BGR10A2_LE, Y410,
+      R10G10B10A2_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_YUY2, YUY2,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_Y210, Y210,
+      R16G16B16A16_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_Y212_LE, Y216,
+      R16G16B16A16_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_Y412_LE, Y416,
+      R16G16B16A16_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_BGRA64_LE, Y416,
+      R16G16B16A16_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_RGB, UNKNOWN,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_BGR, UNKNOWN,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_v210, UNKNOWN,
+      R10G10B10A2_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_v216, UNKNOWN,
+      R16G16B16A16_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_v308, UNKNOWN,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_IYU2, UNKNOWN,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_RGB16, UNKNOWN,
+      R16_UINT, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_BGR16, UNKNOWN,
+      R16_UINT, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_RGB15, UNKNOWN,
+      R16_UINT, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_BGR15, UNKNOWN,
+      R16_UINT, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_r210, UNKNOWN,
+      R32_UINT, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_FULL (GST_VIDEO_FORMAT_RBGA, AYUV,
+      R8G8B8A8_UNORM, UNKNOWN, UNKNOWN, UNKNOWN,
+      D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE),
+  MAKE_FORMAT_MAP_RGBP (RGBP, R8_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_RGBP (BGRP, R8_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_RGBP (GBR, R8_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_RGBP (GBR_10LE, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_RGBP (GBR_12LE, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_RGBP (GBR_16LE, R16_UNORM, UNKNOWN),
+  MAKE_FORMAT_MAP_RGBP (GBRA, R8_UNORM, R8_UNORM),
+  MAKE_FORMAT_MAP_RGBP (GBRA_10LE, R16_UNORM, R16_UNORM),
+  MAKE_FORMAT_MAP_RGBP (GBRA_12LE, R16_UNORM, R16_UNORM),
+};
+
+#undef MAKE_FORMAT_MAP_YUV
+#undef MAKE_FORMAT_MAP_FULL
+#undef MAKE_FORMAT_MAP_RGB
+#undef MAKE_FORMAT_MAP_RGBP
+
+#define GST_D3D12_N_FORMATS G_N_ELEMENTS(g_gst_d3d12_default_format_map)
+
+void gst_d3d12_device_clear_yuv_texture (GstD3D12Device * device,
+                                         GstMemory * mem);
+
+void gst_d3d12_init_background_thread (void);
+
+void gst_d3d12_sync_background_thread (void);

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12.h Added

@@ -0,0 +1,34 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "gstd3d12_fwd.h"
+#include "gstd3d12bufferpool.h"
+#include "gstd3d12commandallocatorpool.h"
+#include "gstd3d12commandlistpool.h"
+#include "gstd3d12commandqueue.h"
+#include "gstd3d12converter.h"
+#include "gstd3d12descriptorpool.h"
+#include "gstd3d12device.h"
+#include "gstd3d12fencedatapool.h"
+#include "gstd3d12format.h"
+#include "gstd3d12memory.h"
+#include "gstd3d12utils.h"

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12_fwd.h Added

@@ -0,0 +1,64 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+
+#ifndef INITGUID
+#include <initguid.h>
+#endif
+
+#include <directx/d3d12.h>
+#include <directx/d3d12video.h>
+#include <dxgi1_6.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GstD3D12Device GstD3D12Device;
+typedef struct _GstD3D12DeviceClass GstD3D12DeviceClass;
+typedef struct _GstD3D12DevicePrivate GstD3D12DevicePrivate;
+
+typedef struct _GstD3D12Memory GstD3D12Memory;
+typedef struct _GstD3D12MemoryPrivate GstD3D12MemoryPrivate;
+
+typedef struct _GstD3D12Allocator GstD3D12Allocator;
+typedef struct _GstD3D12AllocatorClass GstD3D12AllocatorClass;
+typedef struct _GstD3D12AllocatorPrivate GstD3D12AllocatorPrivate;
+
+typedef struct _GstD3D12PoolAllocator GstD3D12PoolAllocator;
+typedef struct _GstD3D12PoolAllocatorClass GstD3D12PoolAllocatorClass;
+typedef struct _GstD3D12PoolAllocatorPrivate GstD3D12PoolAllocatorPrivate;
+
+typedef struct _GstD3D12Format GstD3D12Format;
+
+typedef struct _GstD3D12AllocationParams GstD3D12AllocationParams;
+
+typedef struct _GstD3D12BufferPool GstD3D12BufferPool;
+typedef struct _GstD3D12BufferPoolClass GstD3D12BufferPoolClass;
+typedef struct _GstD3D12BufferPoolPrivate GstD3D12BufferPoolPrivate;
+
+typedef struct _GstD3D12Converter GstD3D12Converter;
+typedef struct _GstD3D12ConverterClass GstD3D12ConverterClass;
+typedef struct _GstD3D12ConverterPrivate GstD3D12ConverterPrivate;
+
+typedef struct _GstD3D12FenceData GstD3D12FenceData;
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12av1dec.cpp Added

@@ -0,0 +1,380 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02120-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d12av1dec
+ * @title: d3d12av1dec
+ *
+ * A Direct3D12 based AV1 video decoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/av1/file ! parsebin ! d3d12av1dec ! videoconvert ! autovideosink
+ * ```
+ *
+ * Since: 1.24
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstd3d12av1dec.h"
+#include "gstd3d12device.h"
+#include "gstd3d12utils.h"
+#include <gst/dxva/gstdxvaav1decoder.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_av1_dec_debug);
+#define GST_CAT_DEFAULT gst_d3d12_av1_dec_debug
+
+GST_D3D12_DECODER_DEFINE_TYPE_FULL (GstD3D12AV1Dec, gst_d3d12_av1_dec,
+    GST, D3D12_AV1_DEC, GstDxvaAV1Decoder);
+
+static void
+gst_d3d12_av1_dec_class_init (GstD3D12AV1DecClass * klass, gpointer data)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstDxvaAV1DecoderClass *dxva_class = GST_DXVA_AV1_DECODER_CLASS (klass);
+  GstD3D12DecoderClassData *cdata = (GstD3D12DecoderClassData *) data;
+
+  gobject_class->finalize = gst_d3d12_av1_dec_finalize;
+  gobject_class->get_property = gst_d3d12_av1_dec_get_property;
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_set_context);
+
+  parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
+  gst_d3d12_decoder_class_data_fill_subclass_data (cdata, &klass->class_data);
+
+  gst_d3d12_decoder_proxy_class_init (element_class, cdata,
+      "Seungha Yang <seungha@centricualr.com>");
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_open);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_stop);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_close);
+  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_sink_query);
+  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_src_query);
+  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_sink_event);
+  decoder_class->drain = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_drain);
+  decoder_class->finish = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_finish);
+  decoder_class->flush = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_flush);
+
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_new_picture);
+  dxva_class->duplicate_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_duplicate_picture);
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_get_picture_id);
+  dxva_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_start_picture);
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_end_picture);
+  dxva_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_av1_dec_output_picture);
+}
+
+static void
+gst_d3d12_av1_dec_init (GstD3D12AV1Dec * self)
+{
+  GstD3D12AV1DecClass *klass = GST_D3D12_AV1_DEC_GET_CLASS (self);
+  GstD3D12DecoderSubClassData *cdata = &klass->class_data;
+
+  self->decoder = gst_d3d12_decoder_new (GST_DXVA_CODEC_AV1,
+      cdata->adapter_luid);
+}
+
+static void
+gst_d3d12_av1_dec_finalize (GObject * object)
+{
+  auto self = GST_D3D12_AV1_DEC (object);
+
+  gst_object_unref (self->decoder);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_av1_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstD3D12AV1DecClass *klass = GST_D3D12_AV1_DEC_GET_CLASS (object);
+  GstD3D12DecoderSubClassData *cdata = &klass->class_data;
+
+  gst_d3d12_decoder_proxy_get_property (object, prop_id, value, pspec, cdata);
+}
+
+static void
+gst_d3d12_av1_dec_set_context (GstElement * element, GstContext * context)
+{
+  auto self = GST_D3D12_AV1_DEC (element);
+
+  gst_d3d12_decoder_set_context (self->decoder, element, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_d3d12_av1_dec_open (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  return gst_d3d12_decoder_open (self->decoder, GST_ELEMENT (self));
+}
+
+static gboolean
+gst_d3d12_av1_dec_stop (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  gst_d3d12_decoder_stop (self->decoder);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+}
+
+static gboolean
+gst_d3d12_av1_dec_close (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  return gst_d3d12_decoder_close (self->decoder);
+}
+
+static gboolean
+gst_d3d12_av1_dec_negotiate (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  if (!gst_d3d12_decoder_negotiate (self->decoder, decoder))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_d3d12_av1_dec_decide_allocation (GstVideoDecoder * decoder,
+    GstQuery * query)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  if (!gst_d3d12_decoder_decide_allocation (self->decoder, decoder, query)) {
+    return FALSE;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static gboolean
+gst_d3d12_av1_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_av1_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_av1_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  gst_d3d12_decoder_sink_event (self->decoder, event);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstFlowReturn
+gst_d3d12_av1_dec_drain (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->drain (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_av1_dec_finish (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->finish (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static gboolean
+gst_d3d12_av1_dec_flush (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->flush (decoder);
+  gst_d3d12_decoder_flush (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_av1_dec_configure (GstDxvaAV1Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+  auto videodec = GST_VIDEO_DECODER (decoder);
+
+  return gst_d3d12_decoder_configure (self->decoder, videodec, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
+}
+
+static GstFlowReturn
+gst_d3d12_av1_dec_new_picture (GstDxvaAV1Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  return gst_d3d12_decoder_new_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture);
+}
+
+static GstFlowReturn
+gst_d3d12_av1_dec_duplicate_picture (GstDxvaAV1Decoder * decoder,
+    GstCodecPicture * src, GstCodecPicture * dst)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  return gst_d3d12_decoder_duplicate_picture (self->decoder, src, dst);
+}
+
+static guint8
+gst_d3d12_av1_dec_get_picture_id (GstDxvaAV1Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  return gst_d3d12_decoder_get_picture_id (self->decoder, picture);
+}
+
+static GstFlowReturn
+gst_d3d12_av1_dec_start_picture (GstDxvaAV1Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  return gst_d3d12_decoder_start_picture (self->decoder, picture, picture_id);
+}
+
+static GstFlowReturn
+gst_d3d12_av1_dec_end_picture (GstDxvaAV1Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  return gst_d3d12_decoder_end_picture (self->decoder, picture, ref_pics, args);
+}
+
+static GstFlowReturn
+gst_d3d12_av1_dec_output_picture (GstDxvaAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
+{
+  auto self = GST_D3D12_AV1_DEC (decoder);
+
+  return gst_d3d12_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
+}
+
+void
+gst_d3d12_av1_dec_register (GstPlugin * plugin, GstD3D12Device * device,
+    ID3D12VideoDevice * video_device, guint rank)
+{
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  guint index = 0;
+  GTypeInfo type_info = {
+    sizeof (GstD3D12AV1DecClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_d3d12_av1_dec_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstD3D12AV1Dec),
+    0,
+    (GInstanceInitFunc) gst_d3d12_av1_dec_init,
+  };
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_av1_dec_debug, "d3d12av1dec", 0,
+      "d3d12av1dec");
+
+  type_info.class_data =
+      gst_d3d12_decoder_check_feature_support (device, video_device,
+      GST_DXVA_CODEC_AV1);
+  if (!type_info.class_data)
+    return;
+
+  type_name = g_strdup ("GstD3D12AV1Dec");
+  feature_name = g_strdup ("d3d12av1dec");
+
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstD3D12AV1Device%dDec", index);
+    feature_name = g_strdup_printf ("d3d12av1device%ddec", index);
+  }
+
+  type = g_type_register_static (GST_TYPE_DXVA_AV1_DECODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  /* make lower rank than default device */
+  if (rank > 0 && index != 0)
+    rank--;
+
+  if (index != 0)
+    gst_element_type_set_skip_documentation (type);
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12av1dec.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstd3d12decoder.h"
+
+G_BEGIN_DECLS
+
+void  gst_d3d12_av1_dec_register (GstPlugin * plugin,
+                                  GstD3D12Device * device,
+                                  ID3D12VideoDevice * video_device,
+                                  guint rank);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12basefilter.cpp Added

@@ -0,0 +1,257 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include "gstd3d12basefilter.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_base_filter_debug);
+#define GST_CAT_DEFAULT gst_d3d12_base_filter_debug
+
+#define META_TAG_VIDEO meta_tag_video_quark
+static GQuark meta_tag_video_quark;
+
+#define gst_d3d12_base_filter_parent_class parent_class
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstD3D12BaseFilter, gst_d3d12_base_filter,
+    GST_TYPE_BASE_TRANSFORM,
+    GST_DEBUG_CATEGORY_INIT (gst_d3d12_base_filter_debug,
+        "d3d12basefilter", 0, "d3d12 basefilter"));
+
+static void gst_d3d12_base_filter_dispose (GObject * object);
+static void gst_d3d12_base_filter_set_context (GstElement * element,
+    GstContext * context);
+static gboolean gst_d3d12_base_filter_start (GstBaseTransform * trans);
+static gboolean gst_d3d12_base_filter_stop (GstBaseTransform * trans);
+static gboolean gst_d3d12_base_filter_set_caps (GstBaseTransform * trans,
+    GstCaps * incaps, GstCaps * outcaps);
+static gboolean
+gst_d3d12_base_filter_query (GstBaseTransform * trans,
+    GstPadDirection direction, GstQuery * query);
+static void gst_d3d12_base_filter_before_transform (GstBaseTransform * trans,
+    GstBuffer * buffer);
+static gboolean gst_d3d12_base_filter_transform_meta (GstBaseTransform * trans,
+    GstBuffer * outbuf, GstMeta * meta, GstBuffer * inbuf);
+
+static void
+gst_d3d12_base_filter_class_init (GstD3D12BaseFilterClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
+
+  gobject_class->dispose = gst_d3d12_base_filter_dispose;
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_base_filter_set_context);
+
+  trans_class->start = GST_DEBUG_FUNCPTR (gst_d3d12_base_filter_start);
+  trans_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_base_filter_stop);
+  trans_class->set_caps = GST_DEBUG_FUNCPTR (gst_d3d12_base_filter_set_caps);
+  trans_class->query = GST_DEBUG_FUNCPTR (gst_d3d12_base_filter_query);
+  trans_class->before_transform =
+      GST_DEBUG_FUNCPTR (gst_d3d12_base_filter_before_transform);
+  trans_class->transform_meta =
+      GST_DEBUG_FUNCPTR (gst_d3d12_base_filter_transform_meta);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_BASE_FILTER,
+      (GstPluginAPIFlags) 0);
+  meta_tag_video_quark = g_quark_from_static_string (GST_META_TAG_VIDEO_STR);
+}
+
+static void
+gst_d3d12_base_filter_init (GstD3D12BaseFilter * filter)
+{
+}
+
+static void
+gst_d3d12_base_filter_dispose (GObject * object)
+{
+  GstD3D12BaseFilter *self = GST_D3D12_BASE_FILTER (object);
+
+  gst_clear_object (&self->device);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gst_d3d12_base_filter_set_context (GstElement * element, GstContext * context)
+{
+  GstD3D12BaseFilter *self = GST_D3D12_BASE_FILTER (element);
+
+  gst_d3d12_handle_set_context (element, context, -1, &self->device);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_d3d12_base_filter_start (GstBaseTransform * trans)
+{
+  GstD3D12BaseFilter *self = GST_D3D12_BASE_FILTER (trans);
+
+  if (!gst_d3d12_ensure_element_data (GST_ELEMENT_CAST (self),
+          -1, &self->device)) {
+    GST_ERROR_OBJECT (self, "Failed to get D3D12 device");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_base_filter_stop (GstBaseTransform * trans)
+{
+  GstD3D12BaseFilter *self = GST_D3D12_BASE_FILTER (trans);
+
+  gst_clear_object (&self->device);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_base_filter_set_caps (GstBaseTransform * trans, GstCaps * incaps,
+    GstCaps * outcaps)
+{
+  GstD3D12BaseFilter *self = GST_D3D12_BASE_FILTER (trans);
+  GstVideoInfo in_info, out_info;
+  GstD3D12BaseFilterClass *klass;
+  gboolean res;
+
+  if (!self->device) {
+    GST_ERROR_OBJECT (self, "No available D3D12 device");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&in_info, incaps)) {
+    GST_ERROR_OBJECT (self, "Invalid input caps %" GST_PTR_FORMAT, incaps);
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&out_info, outcaps)) {
+    GST_ERROR_OBJECT (self, "Invalid output caps %" GST_PTR_FORMAT, outcaps);
+    return FALSE;
+  }
+
+  klass = GST_D3D12_BASE_FILTER_GET_CLASS (self);
+  if (klass->set_info)
+    res = klass->set_info (self, incaps, &in_info, outcaps, &out_info);
+  else
+    res = TRUE;
+
+  if (res) {
+    self->in_info = in_info;
+    self->out_info = out_info;
+  }
+
+  return res;
+}
+
+static gboolean
+gst_d3d12_base_filter_query (GstBaseTransform * trans,
+    GstPadDirection direction, GstQuery * query)
+{
+  GstD3D12BaseFilter *self = GST_D3D12_BASE_FILTER (trans);
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+    {
+      if (gst_d3d12_handle_context_query (GST_ELEMENT (self), query,
+              self->device)) {
+        return TRUE;
+      }
+      break;
+    }
+    default:
+      break;
+  }
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->query (trans, direction,
+      query);
+}
+
+static void
+gst_d3d12_base_filter_before_transform (GstBaseTransform * trans,
+    GstBuffer * buffer)
+{
+  GstD3D12BaseFilter *self = GST_D3D12_BASE_FILTER (trans);
+  GstD3D12Memory *dmem;
+  GstMemory *mem;
+  GstCaps *in_caps = nullptr;
+  GstCaps *out_caps = nullptr;
+
+  mem = gst_buffer_peek_memory (buffer, 0);
+  if (!gst_is_d3d12_memory (mem))
+    return;
+
+  dmem = GST_D3D12_MEMORY_CAST (mem);
+  /* d3d12 devices are singletons per adapter */
+  if (dmem->device == self->device)
+    return;
+
+  GST_INFO_OBJECT (self, "Updating device %" GST_PTR_FORMAT " -> %"
+      GST_PTR_FORMAT, self->device, dmem->device);
+
+  gst_object_unref (self->device);
+  self->device = (GstD3D12Device *) gst_object_ref (dmem->device);
+
+  in_caps = gst_pad_get_current_caps (GST_BASE_TRANSFORM_SINK_PAD (trans));
+  if (!in_caps) {
+    GST_WARNING_OBJECT (self, "sinkpad has null caps");
+    goto out;
+  }
+
+  out_caps = gst_pad_get_current_caps (GST_BASE_TRANSFORM_SRC_PAD (trans));
+  if (!out_caps) {
+    GST_WARNING_OBJECT (self, "Has no configured output caps");
+    goto out;
+  }
+
+  /* subclass will update internal object.
+   * Note that gst_base_transform_reconfigure() might not trigger this
+   * unless caps was changed meanwhile */
+  gst_d3d12_base_filter_set_caps (trans, in_caps, out_caps);
+
+  /* Mark reconfigure so that we can update pool */
+  gst_base_transform_reconfigure_src (trans);
+
+out:
+  gst_clear_caps (&in_caps);
+  gst_clear_caps (&out_caps);
+
+  return;
+}
+
+static gboolean
+gst_d3d12_base_filter_transform_meta (GstBaseTransform * trans,
+    GstBuffer * outbuf, GstMeta * meta, GstBuffer * inbuf)
+{
+  const GstMetaInfo *info = meta->info;
+  const gchar *const *tags;
+
+  tags = gst_meta_api_type_get_tags (info->api);
+
+  if (!tags || (g_strv_length ((gchar **) tags) == 1
+          && gst_meta_api_type_has_tag (info->api, META_TAG_VIDEO))) {
+    return TRUE;
+  }
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->transform_meta (trans, outbuf,
+      meta, inbuf);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12basefilter.h Added

@@ -0,0 +1,65 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/base/gstbasetransform.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_BASE_FILTER             (gst_d3d12_base_filter_get_type())
+#define GST_D3D12_BASE_FILTER(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_D3D12_BASE_FILTER,GstD3D12BaseFilter))
+#define GST_D3D12_BASE_FILTER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_D3D12_BASE_FILTER,GstD3D12BaseFilterClass))
+#define GST_D3D12_BASE_FILTER_GET_CLASS(obj)   (GST_D3D12_BASE_FILTER_CLASS(G_OBJECT_GET_CLASS(obj)))
+#define GST_IS_D3D12_BASE_FILTER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_D3D12_BASE_FILTER))
+#define GST_IS_D3D12_BASE_FILTER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_D3D12_BASE_FILTER))
+
+typedef struct _GstD3D12BaseFilter GstD3D12BaseFilter;
+typedef struct _GstD3D12BaseFilterClass GstD3D12BaseFilterClass;
+
+struct _GstD3D12BaseFilter
+{
+  GstBaseTransform parent;
+
+  GstD3D12Device *device;
+
+  GstVideoInfo in_info;
+  GstVideoInfo out_info;
+};
+
+struct _GstD3D12BaseFilterClass
+{
+  GstBaseTransformClass parent_class;
+
+  gboolean  (*set_info) (GstD3D12BaseFilter * filter,
+                         GstCaps * in_caps,
+                         GstVideoInfo * in_info,
+                         GstCaps * out_caps,
+                         GstVideoInfo * out_info);
+};
+
+GType gst_d3d12_base_filter_get_type (void);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstD3D12BaseFilter, gst_object_unref)
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12bufferpool.cpp Added

@@ -0,0 +1,408 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12.h"
+#include "gstd3d12memory-private.h"
+#include <directx/d3dx12.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_buffer_pool_debug);
+#define GST_CAT_DEFAULT gst_d3d12_buffer_pool_debug
+
+struct _GstD3D12BufferPoolPrivate
+{
+  GstD3D12Allocator *allocGST_VIDEO_MAX_PLANES;
+
+  GstD3D12AllocationParams *d3d12_params;
+
+  gint strideGST_VIDEO_MAX_PLANES;
+  gsize offsetGST_VIDEO_MAX_PLANES;
+};
+
+#define gst_d3d12_buffer_pool_parent_class parent_class
+G_DEFINE_TYPE_WITH_PRIVATE (GstD3D12BufferPool,
+    gst_d3d12_buffer_pool, GST_TYPE_BUFFER_POOL);
+
+static void gst_d3d12_buffer_pool_dispose (GObject * object);
+static const gchar **gst_d3d12_buffer_pool_get_options (GstBufferPool * pool);
+static gboolean gst_d3d12_buffer_pool_set_config (GstBufferPool * pool,
+    GstStructure * config);
+static GstFlowReturn gst_d3d12_buffer_pool_alloc_buffer (GstBufferPool * pool,
+    GstBuffer ** buffer, GstBufferPoolAcquireParams * params);
+static GstFlowReturn gst_d3d12_buffer_pool_acquire_buffer (GstBufferPool * pool,
+    GstBuffer ** buffer, GstBufferPoolAcquireParams * params);
+static gboolean gst_d3d12_buffer_pool_start (GstBufferPool * pool);
+static gboolean gst_d3d12_buffer_pool_stop (GstBufferPool * pool);
+
+static void
+gst_d3d12_buffer_pool_class_init (GstD3D12BufferPoolClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto pool_class = GST_BUFFER_POOL_CLASS (klass);
+
+  object_class->dispose = gst_d3d12_buffer_pool_dispose;
+
+  pool_class->get_options = gst_d3d12_buffer_pool_get_options;
+  pool_class->set_config = gst_d3d12_buffer_pool_set_config;
+  pool_class->alloc_buffer = gst_d3d12_buffer_pool_alloc_buffer;
+  pool_class->acquire_buffer = gst_d3d12_buffer_pool_acquire_buffer;
+  pool_class->start = gst_d3d12_buffer_pool_start;
+  pool_class->stop = gst_d3d12_buffer_pool_stop;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_buffer_pool_debug, "d3d12bufferpool", 0,
+      "d3d12bufferpool");
+}
+
+static void
+gst_d3d12_buffer_pool_init (GstD3D12BufferPool * self)
+{
+  self->priv = (GstD3D12BufferPoolPrivate *)
+      gst_d3d12_buffer_pool_get_instance_private (self);
+}
+
+static void
+gst_d3d12_buffer_pool_clear_allocator (GstD3D12BufferPool * self)
+{
+  auto priv = self->priv;
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS (priv->alloc); i++) {
+    if (priv->alloci) {
+      gst_d3d12_allocator_set_active (priv->alloci, FALSE);
+      gst_clear_object (&priv->alloci);
+    }
+  }
+}
+
+static void
+gst_d3d12_buffer_pool_dispose (GObject * object)
+{
+  auto self = GST_D3D12_BUFFER_POOL (object);
+  auto priv = self->priv;
+
+  g_clear_pointer (&priv->d3d12_params, gst_d3d12_allocation_params_free);
+  gst_clear_object (&self->device);
+  gst_d3d12_buffer_pool_clear_allocator (self);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static const gchar **
+gst_d3d12_buffer_pool_get_options (GstBufferPool * pool)
+{
+  /* NOTE: d3d12 memory does not support alignment */
+  static const gchar *options =
+      { GST_BUFFER_POOL_OPTION_VIDEO_META, nullptr };
+
+  return options;
+}
+
+static gboolean
+gst_d3d12_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
+{
+  auto self = GST_D3D12_BUFFER_POOL (pool);
+  auto priv = self->priv;
+  GstVideoInfo info;
+  GstCaps *caps = nullptr;
+  guint min_buffers, max_buffers;
+  D3D12_RESOURCE_DESC descGST_VIDEO_MAX_PLANES;
+  D3D12_HEAP_PROPERTIES heap_props =
+      CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+
+  if (!gst_buffer_pool_config_get_params (config, &caps, nullptr, &min_buffers,
+          &max_buffers)) {
+    GST_WARNING_OBJECT (self, "invalid config");
+    return FALSE;
+  }
+
+  if (!caps) {
+    GST_WARNING_OBJECT (self, "Empty caps");
+    return FALSE;
+  }
+
+  /* now parse the caps from the config */
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_WARNING_OBJECT (self, "Invalid caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+
+  GST_LOG_OBJECT (self, "%dx%d, caps %" GST_PTR_FORMAT, info.width, info.height,
+      caps);
+
+  gst_d3d12_buffer_pool_clear_allocator (self);
+
+  memset (priv->stride, 0, sizeof (priv->stride));
+  memset (priv->offset, 0, sizeof (priv->offset));
+
+  g_clear_pointer (&priv->d3d12_params, gst_d3d12_allocation_params_free);
+  priv->d3d12_params =
+      gst_buffer_pool_config_get_d3d12_allocation_params (config);
+  if (!priv->d3d12_params) {
+    priv->d3d12_params =
+        gst_d3d12_allocation_params_new (self->device,
+        &info, GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  const auto params = priv->d3d12_params;
+  memset (desc, 0, sizeof (desc));
+
+  gsize total_mem_size = 0;
+  D3D12_PLACED_SUBRESOURCE_FOOTPRINT layoutGST_VIDEO_MAX_PLANES;
+  if (params->d3d12_format.dxgi_format != DXGI_FORMAT_UNKNOWN) {
+    desc0 = CD3DX12_RESOURCE_DESC::Tex2D (params->d3d12_format.dxgi_format,
+        params->aligned_info.width, params->aligned_info.height,
+        params->array_size, 1, 1, 0, params->resource_flags);
+    switch (params->d3d12_format.dxgi_format) {
+      case DXGI_FORMAT_NV12:
+      case DXGI_FORMAT_P010:
+      case DXGI_FORMAT_P016:
+        desc0.Width = GST_ROUND_UP_2 (desc0.Width);
+        desc0.Height = GST_ROUND_UP_2 (desc0.Height);
+        break;
+      case DXGI_FORMAT_Y210:
+      case DXGI_FORMAT_Y216:
+        desc0.Width = GST_ROUND_UP_2 (desc0.Width);
+        break;
+      default:
+        break;
+    }
+
+    auto alloc = (GstD3D12Allocator *)
+        gst_d3d12_pool_allocator_new (self->device,
+        &heap_props, params->heap_flags, &desc0,
+        D3D12_RESOURCE_STATE_COMMON, nullptr);
+    auto num_planes = D3D12GetFormatPlaneCount (device,
+        params->d3d12_format.dxgi_format);
+
+    auto single_array_desc = desc0;
+    single_array_desc.DepthOrArraySize = 1;
+
+    UINT64 mem_size;
+    device->GetCopyableFootprints (&single_array_desc, 0, num_planes, 0,
+        layout, nullptr, nullptr, &mem_size);
+    total_mem_size = mem_size;
+    for (guint i = 0; i < num_planes; i++) {
+      priv->stridei = layouti.Footprint.RowPitch;
+      priv->offseti = layouti.Offset;
+    }
+
+    priv->alloc0 = alloc;
+  } else {
+    for (guint i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
+      if (params->d3d12_format.resource_formati == DXGI_FORMAT_UNKNOWN)
+        break;
+
+      desci =
+          CD3DX12_RESOURCE_DESC::Tex2D (params->d3d12_format.resource_formati,
+          GST_VIDEO_INFO_COMP_WIDTH (&params->aligned_info, i),
+          GST_VIDEO_INFO_COMP_HEIGHT (&params->aligned_info, i),
+          params->array_size, 1, 1, 0, params->resource_flags);
+
+      auto alloc = (GstD3D12Allocator *)
+          gst_d3d12_pool_allocator_new (self->device,
+          &heap_props, params->heap_flags, &desci,
+          D3D12_RESOURCE_STATE_COMMON, nullptr);
+
+      UINT64 mem_size;
+      device->GetCopyableFootprints (&desci, 0, 1, 0,
+          &layouti, nullptr, nullptr, &mem_size);
+
+      priv->stridei = layouti.Footprint.RowPitch;
+      priv->offseti = total_mem_size;
+      total_mem_size += mem_size;
+
+      priv->alloci = alloc;
+    }
+  }
+
+  if (params->array_size > 1)
+    max_buffers = params->array_size;
+
+  gst_buffer_pool_config_set_params (config,
+      caps, total_mem_size, min_buffers, max_buffers);
+
+  return GST_BUFFER_POOL_CLASS (parent_class)->set_config (pool, config);
+}
+
+static GstFlowReturn
+gst_d3d12_buffer_pool_fill_buffer (GstD3D12BufferPool * self, GstBuffer * buf)
+{
+  auto priv = self->priv;
+  GstFlowReturn ret = GST_FLOW_OK;
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS (priv->alloc); i++) {
+    GstMemory *mem = nullptr;
+    auto alloc = (GstD3D12PoolAllocator *) priv->alloci;
+
+    if (!alloc)
+      break;
+
+    ret = gst_d3d12_pool_allocator_acquire_memory (alloc, &mem);
+    if (ret != GST_FLOW_OK) {
+      GST_WARNING_OBJECT (self, "Failed to acquire memory, ret %s",
+          gst_flow_get_name (ret));
+      return ret;
+    }
+
+    auto dmem = (GstD3D12Memory *) mem;
+    GST_MINI_OBJECT_FLAG_UNSET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_UPLOAD);
+    gst_d3d12_memory_sync (dmem);
+    gst_buffer_append_memory (buf, mem);
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_d3d12_buffer_pool_alloc_buffer (GstBufferPool * pool, GstBuffer ** buffer,
+    GstBufferPoolAcquireParams * params)
+{
+  auto self = GST_D3D12_BUFFER_POOL (pool);
+  auto priv = self->priv;
+  GstD3D12AllocationParams *d3d12_params = priv->d3d12_params;
+  GstVideoInfo *info = &d3d12_params->info;
+  GstBuffer *buf;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  buf = gst_buffer_new ();
+  ret = gst_d3d12_buffer_pool_fill_buffer (self, buf);
+  if (ret != GST_FLOW_OK) {
+    gst_buffer_unref (buf);
+    return ret;
+  }
+
+  gst_buffer_add_video_meta_full (buf, GST_VIDEO_FRAME_FLAG_NONE,
+      GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info),
+      GST_VIDEO_INFO_HEIGHT (info), GST_VIDEO_INFO_N_PLANES (info),
+      priv->offset, priv->stride);
+
+  *buffer = buf;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_d3d12_buffer_pool_acquire_buffer (GstBufferPool * pool,
+    GstBuffer ** buffer, GstBufferPoolAcquireParams * params)
+{
+  GstFlowReturn ret;
+
+  ret = GST_BUFFER_POOL_CLASS (parent_class)->acquire_buffer (pool,
+      buffer, params);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  auto mem = (GstD3D12Memory *) gst_buffer_peek_memory (*buffer, 0);
+  GST_MINI_OBJECT_FLAG_UNSET (mem, GST_D3D12_MEMORY_TRANSFER_NEED_UPLOAD);
+  gst_d3d12_memory_sync (mem);
+
+  return ret;
+}
+
+static gboolean
+gst_d3d12_buffer_pool_start (GstBufferPool * pool)
+{
+  auto self = GST_D3D12_BUFFER_POOL (pool);
+  auto priv = self->priv;
+  guint i;
+
+  GST_DEBUG_OBJECT (self, "Start");
+
+  for (i = 0; i < G_N_ELEMENTS (priv->alloc); i++) {
+    GstD3D12Allocator *alloc = priv->alloci;
+
+    if (!alloc)
+      break;
+
+    if (!gst_d3d12_allocator_set_active (alloc, TRUE)) {
+      GST_ERROR_OBJECT (self, "Failed to activate allocator");
+      return FALSE;
+    }
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_buffer_pool_stop (GstBufferPool * pool)
+{
+  auto self = GST_D3D12_BUFFER_POOL (pool);
+  auto priv = self->priv;
+  guint i;
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  for (i = 0; i < G_N_ELEMENTS (priv->alloc); i++) {
+    GstD3D12Allocator *alloc = priv->alloci;
+
+    if (!alloc)
+      break;
+
+    if (!gst_d3d12_allocator_set_active (alloc, FALSE)) {
+      GST_ERROR_OBJECT (self, "Failed to deactivate allocator");
+      return FALSE;
+    }
+  }
+
+  return GST_BUFFER_POOL_CLASS (parent_class)->stop (pool);
+}
+
+GstBufferPool *
+gst_d3d12_buffer_pool_new (GstD3D12Device * device)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+
+  auto self = (GstD3D12BufferPool *)
+      g_object_new (GST_TYPE_D3D12_BUFFER_POOL, nullptr);
+  gst_object_ref_sink (self);
+
+  self->device = (GstD3D12Device *) gst_object_ref (device);
+
+  return GST_BUFFER_POOL_CAST (self);
+}
+
+GstD3D12AllocationParams *
+gst_buffer_pool_config_get_d3d12_allocation_params (GstStructure * config)
+{
+  GstD3D12AllocationParams *ret = nullptr;
+
+  if (!gst_structure_get (config, "d3d12-allocation-params",
+          GST_TYPE_D3D12_ALLOCATION_PARAMS, &ret, nullptr)) {
+    return nullptr;
+  }
+
+  return ret;
+}
+
+void
+gst_buffer_pool_config_set_d3d12_allocation_params (GstStructure * config,
+    GstD3D12AllocationParams * params)
+{
+  g_return_if_fail (config);
+  g_return_if_fail (params);
+
+  gst_structure_set (config, "d3d12-allocation-params",
+      GST_TYPE_D3D12_ALLOCATION_PARAMS, params, nullptr);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12bufferpool.h Added

@@ -0,0 +1,57 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+#include "gstd3d12memory.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_BUFFER_POOL    (gst_d3d12_buffer_pool_get_type())
+#define GST_D3D12_BUFFER_POOL(obj)    (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_D3D12_BUFFER_POOL, GstD3D12BufferPool))
+#define GST_IS_D3D12_BUFFER_POOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_D3D12_BUFFER_POOL))
+
+struct _GstD3D12BufferPool
+{
+  GstBufferPool parent;
+
+  GstD3D12Device *device;
+
+  GstD3D12BufferPoolPrivate *priv;
+};
+
+struct _GstD3D12BufferPoolClass
+{
+  GstBufferPoolClass parent_class;
+};
+
+GType           gst_d3d12_buffer_pool_get_type (void);
+
+GstBufferPool * gst_d3d12_buffer_pool_new (GstD3D12Device * device);
+
+GstD3D12AllocationParams * gst_buffer_pool_config_get_d3d12_allocation_params (GstStructure * config);
+
+void            gst_buffer_pool_config_set_d3d12_allocation_params (GstStructure * config,
+                                                                    GstD3D12AllocationParams * params);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12commandallocatorpool.cpp Added

@@ -0,0 +1,279 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12.h"
+#include <wrl.h>
+#include <queue>
+#include <mutex>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_command_allocator_pool_debug);
+#define GST_CAT_DEFAULT gst_d3d12_command_allocator_pool_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+struct _GstD3D12CommandAllocator : public GstMiniObject
+{
+  ~_GstD3D12CommandAllocator ()
+  {
+    if (notify)
+      notify (user_data);
+  }
+
+  GstD3D12CommandAllocatorPool *pool = nullptr;
+  D3D12_COMMAND_LIST_TYPE type;
+  ComPtr < ID3D12CommandAllocator > ca;
+  gpointer user_data = nullptr;
+  GDestroyNotify notify = nullptr;
+};
+
+struct GstD3D12CommandAllocatorPoolPrivate
+{
+  ~GstD3D12CommandAllocatorPoolPrivate ()
+  {
+    while (!cmd_pool.empty ()) {
+      auto cmd = cmd_pool.front ();
+      cmd_pool.pop ();
+      gst_mini_object_unref (cmd);
+    }
+  }
+
+  ComPtr<ID3D12Device> device;
+
+  std::mutex lock;
+  std::queue<GstD3D12CommandAllocator *>cmd_pool;
+  D3D12_COMMAND_LIST_TYPE cmd_type;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12CommandAllocatorPool
+{
+  GstObject parent;
+
+  GstD3D12CommandAllocatorPoolPrivate *priv;
+};
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstD3D12CommandAllocator,
+    gst_d3d12_command_allocator);
+
+static void gst_d3d12_command_allocator_pool_finalize (GObject * object);
+
+#define gst_d3d12_command_allocator_pool_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12CommandAllocatorPool,
+    gst_d3d12_command_allocator_pool, GST_TYPE_OBJECT);
+
+static void
+gst_d3d12_command_allocator_pool_class_init (GstD3D12CommandAllocatorPoolClass *
+    klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_command_allocator_pool_finalize;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_command_allocator_pool_debug,
+      "d3d12commandallocatorpool", 0, "d3d12commandallocatorpool");
+}
+
+static void
+gst_d3d12_command_allocator_pool_init (GstD3D12CommandAllocatorPool * self)
+{
+  self->priv = new GstD3D12CommandAllocatorPoolPrivate ();
+}
+
+static void
+gst_d3d12_command_allocator_pool_finalize (GObject * object)
+{
+  auto self = GST_D3D12_COMMAND_ALLOCATOR_POOL (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GstD3D12CommandAllocatorPool *
+gst_d3d12_command_allocator_pool_new (GstD3D12Device * device,
+    D3D12_COMMAND_LIST_TYPE type)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+
+  auto self = (GstD3D12CommandAllocatorPool *)
+      g_object_new (GST_TYPE_D3D12_COMMAND_ALLOCATOR_POOL, nullptr);
+  gst_object_ref_sink (self);
+
+  auto priv = self->priv;
+  priv->device = gst_d3d12_device_get_device_handle (device);
+  priv->cmd_type = type;
+
+  return self;
+}
+
+static void
+gst_d3d12_command_allocator_pool_release (GstD3D12CommandAllocatorPool * pool,
+    GstD3D12CommandAllocator * cmd)
+{
+  auto priv = pool->priv;
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+    cmd->dispose = nullptr;
+    cmd->pool = nullptr;
+    priv->cmd_pool.push (cmd);
+  }
+
+  gst_object_unref (pool);
+}
+
+static gboolean
+gst_d3d12_command_allocator_dispose (GstD3D12CommandAllocator * cmd)
+{
+  if (!cmd->pool)
+    return TRUE;
+
+  gst_mini_object_ref (cmd);
+  gst_d3d12_command_allocator_pool_release (cmd->pool, cmd);
+
+  return FALSE;
+}
+
+static void
+gst_d3d12_command_allocator_free (GstD3D12CommandAllocator * cmd)
+{
+  delete cmd;
+}
+
+static GstD3D12CommandAllocator *
+gst_d3d12_command_allocator_new (ID3D12CommandAllocator * ca,
+    D3D12_COMMAND_LIST_TYPE type)
+{
+  auto cmd = new GstD3D12CommandAllocator ();
+  cmd->ca = ca;
+  cmd->type = type;
+
+  gst_mini_object_init (cmd, 0, gst_d3d12_command_allocator_get_type (),
+      nullptr, nullptr,
+      (GstMiniObjectFreeFunction) gst_d3d12_command_allocator_free);
+
+  return cmd;
+}
+
+gboolean
+gst_d3d12_command_allocator_pool_acquire (GstD3D12CommandAllocatorPool * pool,
+    GstD3D12CommandAllocator ** cmd)
+{
+  g_return_val_if_fail (GST_IS_D3D12_COMMAND_ALLOCATOR_POOL (pool), FALSE);
+  g_return_val_if_fail (cmd, FALSE);
+
+  *cmd = nullptr;
+
+  auto priv = pool->priv;
+  GstD3D12CommandAllocator *new_cmd = nullptr;
+  HRESULT hr;
+
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+    if (!priv->cmd_pool.empty ()) {
+      new_cmd = priv->cmd_pool.front ();
+      priv->cmd_pool.pop ();
+    }
+  }
+
+  if (!new_cmd) {
+    ComPtr < ID3D12CommandAllocator > ca;
+    hr = priv->device->CreateCommandAllocator (priv->cmd_type,
+        IID_PPV_ARGS (&ca));
+    if (FAILED (hr)) {
+      GST_ERROR_OBJECT (pool, "Couldn't create command allocator, hr: 0x%x",
+          (guint) hr);
+      return FALSE;
+    }
+
+    new_cmd = gst_d3d12_command_allocator_new (ca.Get (), priv->cmd_type);
+  }
+
+  new_cmd->pool = (GstD3D12CommandAllocatorPool *) gst_object_ref (pool);
+  new_cmd->dispose =
+      (GstMiniObjectDisposeFunction) gst_d3d12_command_allocator_dispose;
+
+  *cmd = new_cmd;
+
+  return TRUE;
+}
+
+GstD3D12CommandAllocator *
+gst_d3d12_command_allocator_ref (GstD3D12CommandAllocator * cmd)
+{
+  return (GstD3D12CommandAllocator *) gst_mini_object_ref (cmd);
+}
+
+void
+gst_d3d12_command_allocator_unref (GstD3D12CommandAllocator * cmd)
+{
+  gst_mini_object_unref (cmd);
+}
+
+void
+gst_clear_d3d12_command_allocator (GstD3D12CommandAllocator ** cmd)
+{
+  gst_clear_mini_object (cmd);
+}
+
+D3D12_COMMAND_LIST_TYPE
+gst_d3d12_command_allocator_get_command_type (GstD3D12CommandAllocator * cmd)
+{
+  g_return_val_if_fail (cmd, D3D12_COMMAND_LIST_TYPE_NONE);
+
+  return cmd->type;
+}
+
+gboolean
+gst_d3d12_command_allocator_get_handle (GstD3D12CommandAllocator * cmd,
+    ID3D12CommandAllocator ** ca)
+{
+  g_return_val_if_fail (cmd, FALSE);
+  g_return_val_if_fail (ca, FALSE);
+
+  *ca = cmd->ca.Get ();
+  (*ca)->AddRef ();
+
+  return TRUE;
+}
+
+void
+gst_d3d12_command_allocator_set_user_data (GstD3D12CommandAllocator * cmd,
+    gpointer user_data, GDestroyNotify notify)
+{
+  g_return_if_fail (cmd);
+
+  if (cmd->notify)
+    cmd->notify (cmd->user_data);
+
+  cmd->user_data = user_data;
+  cmd->notify = notify;
+}
+
+gpointer
+gst_d3d12_command_allocator_get_user_data (GstD3D12CommandAllocator * cmd)
+{
+  g_return_val_if_fail (cmd, nullptr);
+
+  return cmd->user_data;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12commandallocatorpool.h Added

@@ -0,0 +1,58 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_COMMAND_ALLOCATOR_POOL (gst_d3d12_command_allocator_pool_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12CommandAllocatorPool,
+    gst_d3d12_command_allocator_pool, GST, D3D12_COMMAND_ALLOCATOR_POOL, GstObject);
+
+typedef struct _GstD3D12CommandAllocator GstD3D12CommandAllocator;
+
+GstD3D12CommandAllocatorPool * gst_d3d12_command_allocator_pool_new (GstD3D12Device * device,
+                                                                     D3D12_COMMAND_LIST_TYPE type);
+
+gboolean                       gst_d3d12_command_allocator_pool_acquire (GstD3D12CommandAllocatorPool * pool,
+                                                                         GstD3D12CommandAllocator ** cmd);
+
+GstD3D12CommandAllocator *     gst_d3d12_command_allocator_ref (GstD3D12CommandAllocator * cmd);
+
+void                           gst_d3d12_command_allocator_unref (GstD3D12CommandAllocator * cmd);
+
+void                           gst_clear_d3d12_command_allocator (GstD3D12CommandAllocator ** cmd);
+
+D3D12_COMMAND_LIST_TYPE        gst_d3d12_command_allocator_get_command_type (GstD3D12CommandAllocator * cmd);
+
+gboolean                       gst_d3d12_command_allocator_get_handle (GstD3D12CommandAllocator * cmd,
+                                                                       ID3D12CommandAllocator ** ca);
+
+void                           gst_d3d12_command_allocator_set_user_data (GstD3D12CommandAllocator * cmd,
+                                                                          gpointer user_data,
+                                                                          GDestroyNotify notify);
+
+gpointer                       gst_d3d12_command_allocator_get_user_data (GstD3D12CommandAllocator * cmd);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12commandlistpool.cpp Added

@@ -0,0 +1,269 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * This library is free software; you cln 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12.h"
+#include <wrl.h>
+#include <queue>
+#include <mutex>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_command_list_pool_debug);
+#define GST_CAT_DEFAULT gst_d3d12_command_list_pool_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+struct _GstD3D12CommandList : public GstMiniObject
+{
+  GstD3D12CommandListPool *pool = nullptr;
+  D3D12_COMMAND_LIST_TYPE type;
+  ComPtr < ID3D12CommandList > cl;
+};
+
+struct GstD3D12CommandListPoolPrivate
+{
+  ~GstD3D12CommandListPoolPrivate ()
+  {
+    while (!cmd_pool.empty ()) {
+      auto cmd = cmd_pool.front ();
+      cmd_pool.pop ();
+      gst_mini_object_unref (cmd);
+    }
+  }
+
+  ComPtr<ID3D12Device> device;
+
+  std::mutex lock;
+  std::queue<GstD3D12CommandList *>cmd_pool;
+  D3D12_COMMAND_LIST_TYPE cmd_type;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12CommandListPool
+{
+  GstObject parent;
+
+  GstD3D12CommandListPoolPrivate *priv;
+};
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstD3D12CommandList, gst_d3d12_command_list);
+
+static void gst_d3d12_command_list_pool_finalize (GObject * object);
+
+#define gst_d3d12_command_list_pool_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12CommandListPool,
+    gst_d3d12_command_list_pool, GST_TYPE_OBJECT);
+
+static void
+gst_d3d12_command_list_pool_class_init (GstD3D12CommandListPoolClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_command_list_pool_finalize;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_command_list_pool_debug,
+      "d3d12commandlistpool", 0, "d3d12commandlistpool");
+}
+
+static void
+gst_d3d12_command_list_pool_init (GstD3D12CommandListPool * self)
+{
+  self->priv = new GstD3D12CommandListPoolPrivate ();
+}
+
+static void
+gst_d3d12_command_list_pool_finalize (GObject * object)
+{
+  auto self = GST_D3D12_COMMAND_LIST_POOL (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GstD3D12CommandListPool *
+gst_d3d12_command_list_pool_new (GstD3D12Device * device,
+    D3D12_COMMAND_LIST_TYPE type)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+
+  if (type != D3D12_COMMAND_LIST_TYPE_DIRECT &&
+      type != D3D12_COMMAND_LIST_TYPE_COPY) {
+    GST_ERROR_OBJECT (device, "Not supported command list type");
+    return nullptr;
+  }
+
+  auto self = (GstD3D12CommandListPool *)
+      g_object_new (GST_TYPE_D3D12_COMMAND_LIST_POOL, nullptr);
+  gst_object_ref_sink (self);
+
+  auto priv = self->priv;
+  priv->device = gst_d3d12_device_get_device_handle (device);;
+  priv->cmd_type = type;
+
+  return self;
+}
+
+static void
+gst_d3d12_command_list_pool_release (GstD3D12CommandListPool * pool,
+    GstD3D12CommandList * cmd)
+{
+  auto priv = pool->priv;
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+    cmd->dispose = nullptr;
+    cmd->pool = nullptr;
+    priv->cmd_pool.push (cmd);
+  }
+
+  gst_object_unref (pool);
+}
+
+static gboolean
+gst_d3d12_command_list_dispose (GstD3D12CommandList * cmd)
+{
+  if (!cmd->pool)
+    return TRUE;
+
+  gst_mini_object_ref (cmd);
+  gst_d3d12_command_list_pool_release (cmd->pool, cmd);
+
+  return FALSE;
+}
+
+static void
+gst_d3d12_command_list_free (GstD3D12CommandList * cmd)
+{
+  delete cmd;
+}
+
+static GstD3D12CommandList *
+gst_d3d12_command_list_new (ID3D12CommandList * cl,
+    D3D12_COMMAND_LIST_TYPE type)
+{
+  auto cmd = new GstD3D12CommandList ();
+  cmd->cl = cl;
+  cmd->type = type;
+
+  gst_mini_object_init (cmd, 0, gst_d3d12_command_list_get_type (),
+      nullptr, nullptr,
+      (GstMiniObjectFreeFunction) gst_d3d12_command_list_free);
+
+  return cmd;
+}
+
+gboolean
+gst_d3d12_command_list_pool_acquire (GstD3D12CommandListPool * pool,
+    ID3D12CommandAllocator * ca, GstD3D12CommandList ** cmd)
+{
+  g_return_val_if_fail (GST_IS_D3D12_COMMAND_LIST_POOL (pool), FALSE);
+  g_return_val_if_fail (ca, FALSE);
+  g_return_val_if_fail (cmd, FALSE);
+
+  *cmd = nullptr;
+
+  auto priv = pool->priv;
+  GstD3D12CommandList *new_cmd = nullptr;
+  HRESULT hr;
+
+  hr = ca->Reset ();
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (pool, "Couldn't reset command allocator");
+    return FALSE;
+  }
+
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+    if (!priv->cmd_pool.empty ()) {
+      new_cmd = priv->cmd_pool.front ();
+      priv->cmd_pool.pop ();
+    }
+  }
+
+  ComPtr < ID3D12GraphicsCommandList > cl;
+  if (!new_cmd) {
+    hr = priv->device->CreateCommandList (0, priv->cmd_type,
+        ca, nullptr, IID_PPV_ARGS (&cl));
+    if (FAILED (hr)) {
+      GST_ERROR_OBJECT (pool, "Couldn't create command list, hr: 0x%x",
+          (guint) hr);
+      return FALSE;
+    }
+
+    new_cmd = gst_d3d12_command_list_new (cl.Get (), priv->cmd_type);
+  } else {
+    new_cmd->cl->QueryInterface (IID_PPV_ARGS (&cl));
+    hr = cl->Reset (ca, nullptr);
+    if (FAILED (hr)) {
+      GST_ERROR_OBJECT (pool, "Couldn't reset command list");
+      gst_mini_object_unref (new_cmd);
+      return false;
+    }
+  }
+
+  new_cmd->pool = (GstD3D12CommandListPool *) gst_object_ref (pool);
+  new_cmd->dispose =
+      (GstMiniObjectDisposeFunction) gst_d3d12_command_list_dispose;
+
+  *cmd = new_cmd;
+
+  return TRUE;
+}
+
+GstD3D12CommandList *
+gst_d3d12_command_list_ref (GstD3D12CommandList * cmd)
+{
+  return (GstD3D12CommandList *) gst_mini_object_ref (cmd);
+}
+
+void
+gst_d3d12_command_list_unref (GstD3D12CommandList * cmd)
+{
+  gst_mini_object_unref (cmd);
+}
+
+void
+gst_clear_d3d12_command_list (GstD3D12CommandList ** cmd)
+{
+  gst_clear_mini_object (cmd);
+}
+
+D3D12_COMMAND_LIST_TYPE
+gst_d3d12_command_list_get_command_type (GstD3D12CommandList * cmd)
+{
+  g_return_val_if_fail (cmd, D3D12_COMMAND_LIST_TYPE_NONE);
+
+  return cmd->type;
+}
+
+gboolean
+gst_d3d12_command_list_get_handle (GstD3D12CommandList * cmd,
+    ID3D12CommandList ** cl)
+{
+  g_return_val_if_fail (cmd, FALSE);
+  g_return_val_if_fail (cl, FALSE);
+
+  *cl = cmd->cl.Get ();
+  (*cl)->AddRef ();
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12commandlistpool.h Added

@@ -0,0 +1,53 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_COMMAND_LIST_POOL (gst_d3d12_command_list_pool_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12CommandListPool,
+    gst_d3d12_command_list_pool, GST, D3D12_COMMAND_LIST_POOL, GstObject);
+
+typedef struct _GstD3D12CommandList GstD3D12CommandList;
+
+GstD3D12CommandListPool * gst_d3d12_command_list_pool_new (GstD3D12Device * device,
+                                                           D3D12_COMMAND_LIST_TYPE type);
+
+gboolean                  gst_d3d12_command_list_pool_acquire (GstD3D12CommandListPool * pool,
+                                                               ID3D12CommandAllocator * ca,
+                                                               GstD3D12CommandList ** cmd);
+
+GstD3D12CommandList *     gst_d3d12_command_list_ref (GstD3D12CommandList * cmd);
+
+void                      gst_d3d12_command_list_unref (GstD3D12CommandList * cmd);
+
+void                      gst_clear_d3d12_command_list (GstD3D12CommandList ** cmd);
+
+D3D12_COMMAND_LIST_TYPE   gst_d3d12_command_list_get_command_type (GstD3D12CommandList * cmd);
+
+gboolean                  gst_d3d12_command_list_get_handle (GstD3D12CommandList * cmd,
+                                                             ID3D12CommandList ** cl);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12commandqueue.cpp Added

@@ -0,0 +1,409 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * This library is free software; you cln 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12.h"
+#include "gstd3d12-private.h"
+#include <wrl.h>
+#include <queue>
+#include <mutex>
+#include <memory>
+#include <condition_variable>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_command_queue_debug);
+#define GST_CAT_DEFAULT gst_d3d12_command_queue_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+struct GCData
+{
+  GCData (gpointer user_data, GDestroyNotify destroy_notify,
+      guint64 fence_value) : data (user_data),
+          notify(destroy_notify), fence_val (fence_value) {}
+  ~GCData ()
+  {
+    if (notify)
+      notify (data);
+  }
+
+  gpointer data = nullptr;
+  GDestroyNotify notify = nullptr;
+  guint64 fence_val = 0;
+};
+
+typedef std::shared_ptr<GCData> GCDataPtr;
+
+struct GstD3D12CommandQueuePrivate
+{
+  GstD3D12CommandQueuePrivate ()
+  {
+    event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+  }
+
+  ~GstD3D12CommandQueuePrivate ()
+  {
+    {
+      std::lock_guard <std::mutex> lk (lock);
+      shutdown = true;
+      cond.notify_one ();
+    }
+
+    g_clear_pointer (&gc_thread, g_thread_join);
+
+    auto completed = fence->GetCompletedValue ();
+    if (fence_val > completed) {
+      auto hr = fence->SetEventOnCompletion (completed, event_handle);
+      if (SUCCEEDED (hr))
+        WaitForSingleObjectEx (event_handle, INFINITE, FALSE);
+    }
+
+    CloseHandle (event_handle);
+  }
+
+  struct gc_cmp {
+    bool operator()(const GCDataPtr &a, const GCDataPtr &b)
+    {
+      return a->fence_val > b->fence_val;
+    }
+  };
+
+  D3D12_COMMAND_QUEUE_DESC desc;
+
+  ComPtr<ID3D12Device> device;
+  ComPtr<ID3D12CommandQueue> cq;
+  ComPtr<ID3D12Fence> fence;
+  HANDLE event_handle;
+  guint64 fence_val = 0;
+
+  GThread *gc_thread = nullptr;
+  std::priority_queue<GCDataPtr, std::vector<GCDataPtr>, gc_cmp> gc_list;
+
+  std::mutex execute_lock;
+  std::mutex lock;
+  std::condition_variable cond;
+  bool shutdown = false;
+  size_t queue_size = 0;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12CommandQueue
+{
+  GstObject parent;
+
+  GstD3D12CommandQueuePrivate *priv;
+};
+
+static void gst_d3d12_command_queue_finalize (GObject * object);
+
+#define gst_d3d12_command_queue_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12CommandQueue, gst_d3d12_command_queue, GST_TYPE_OBJECT);
+
+static void
+gst_d3d12_command_queue_class_init (GstD3D12CommandQueueClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_command_queue_finalize;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_command_queue_debug,
+      "d3d12commandqueue", 0, "d3d12commandqueue");
+}
+
+static void
+gst_d3d12_command_queue_init (GstD3D12CommandQueue * self)
+{
+  self->priv = new GstD3D12CommandQueuePrivate ();
+}
+
+static void
+gst_d3d12_command_queue_finalize (GObject * object)
+{
+  auto self = GST_D3D12_COMMAND_QUEUE (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GstD3D12CommandQueue *
+gst_d3d12_command_queue_new (GstD3D12Device * device,
+    const D3D12_COMMAND_QUEUE_DESC * desc, guint queue_size)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+  g_return_val_if_fail (desc, nullptr);
+
+  auto device_handle = gst_d3d12_device_get_device_handle (device);
+
+  ComPtr < ID3D12CommandQueue > cq;
+  auto hr = device_handle->CreateCommandQueue (desc, IID_PPV_ARGS (&cq));
+  if (!gst_d3d12_result (hr, device)) {
+    GST_ERROR_OBJECT (device, "Couldn't create command queue");
+    return nullptr;
+  }
+
+  ComPtr < ID3D12Fence > fence;
+  hr = device_handle->CreateFence (0,
+      D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS (&fence));
+  if (!gst_d3d12_result (hr, device)) {
+    GST_ERROR_OBJECT (device, "Couldn't create fence");
+    return nullptr;
+  }
+
+  auto self = (GstD3D12CommandQueue *)
+      g_object_new (GST_TYPE_D3D12_COMMAND_QUEUE, nullptr);
+  gst_object_ref_sink (self);
+
+  auto priv = self->priv;
+  priv->device = gst_d3d12_device_get_device_handle (device);
+  priv->cq = cq;
+  priv->fence = fence;
+  priv->queue_size = queue_size;
+
+  return self;
+}
+
+gboolean
+gst_d3d12_command_queue_get_handle (GstD3D12CommandQueue * queue,
+    ID3D12CommandQueue ** handle)
+{
+  g_return_val_if_fail (GST_IS_D3D12_COMMAND_QUEUE (queue), FALSE);
+  g_return_val_if_fail (handle, FALSE);
+
+  auto priv = queue->priv;
+
+  *handle = priv->cq.Get ();
+  (*handle)->AddRef ();
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_command_queue_get_fence (GstD3D12CommandQueue * queue,
+    ID3D12Fence ** handle)
+{
+  g_return_val_if_fail (GST_IS_D3D12_COMMAND_QUEUE (queue), FALSE);
+  g_return_val_if_fail (handle, FALSE);
+
+  auto priv = queue->priv;
+
+  *handle = priv->fence.Get ();
+  (*handle)->AddRef ();
+
+  return TRUE;
+}
+
+HRESULT
+gst_d3d12_command_queue_execute_command_lists (GstD3D12CommandQueue * queue,
+    guint num_command_lists, ID3D12CommandList ** command_lists,
+    guint64 * fence_value)
+{
+  g_return_val_if_fail (GST_IS_D3D12_COMMAND_QUEUE (queue), E_INVALIDARG);
+
+  auto priv = queue->priv;
+  HRESULT hr;
+
+  std::lock_guard < std::mutex > lk (priv->execute_lock);
+  priv->fence_val++;
+  priv->cq->ExecuteCommandLists (num_command_lists, command_lists);
+  hr = priv->cq->Signal (priv->fence.Get (), priv->fence_val);
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (queue, "Signal failed");
+    priv->fence_val--;
+  } else if (fence_value) {
+    *fence_value = priv->fence_val;
+  }
+
+  if (priv->queue_size > 0) {
+    auto completed = priv->fence->GetCompletedValue ();
+    if (completed + priv->queue_size < priv->fence_val) {
+      hr = priv->fence->SetEventOnCompletion (priv->fence_val -
+          priv->queue_size, priv->event_handle);
+      if (FAILED (hr)) {
+        GST_ERROR_OBJECT (queue, "SetEventOnCompletion failed");
+        return hr;
+      }
+      WaitForSingleObjectEx (priv->event_handle, INFINITE, FALSE);
+    }
+  }
+
+  return hr;
+}
+
+HRESULT
+gst_d3d12_command_queue_execute_wait (GstD3D12CommandQueue * queue,
+    ID3D12Fence * fence, guint64 fence_value)
+{
+  g_return_val_if_fail (GST_IS_D3D12_COMMAND_QUEUE (queue), E_INVALIDARG);
+  g_return_val_if_fail (fence, E_INVALIDARG);
+
+  auto priv = queue->priv;
+
+  return priv->cq->Wait (fence, fence_value);
+}
+
+guint64
+gst_d3d12_command_queue_get_completed_value (GstD3D12CommandQueue * queue)
+{
+  g_return_val_if_fail (GST_IS_D3D12_COMMAND_QUEUE (queue), G_MAXUINT64);
+
+  return queue->priv->fence->GetCompletedValue ();
+}
+
+HRESULT
+gst_d3d12_command_queue_fence_wait (GstD3D12CommandQueue * queue,
+    guint64 fence_value, HANDLE event_handle)
+{
+  g_return_val_if_fail (GST_IS_D3D12_COMMAND_QUEUE (queue), E_INVALIDARG);
+
+  auto priv = queue->priv;
+  guint64 fence_to_wait = fence_value;
+  HRESULT hr;
+  if (fence_value == G_MAXUINT64) {
+    std::lock_guard < std::mutex > lk (priv->execute_lock);
+    priv->fence_val++;
+    hr = priv->cq->Signal (priv->fence.Get (), priv->fence_val);
+    if (FAILED (hr)) {
+      GST_ERROR_OBJECT (queue, "Signal failed");
+      priv->fence_val--;
+      return hr;
+    }
+
+    fence_to_wait = priv->fence_val;
+  }
+
+  auto completed = priv->fence->GetCompletedValue ();
+  if (completed < fence_to_wait) {
+    bool close_handle = false;
+    if (!event_handle) {
+      event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+      close_handle = true;
+    }
+
+    hr = priv->fence->SetEventOnCompletion (fence_to_wait, event_handle);
+    if (FAILED (hr)) {
+      GST_ERROR_OBJECT (queue, "SetEventOnCompletion failed");
+      if (close_handle)
+        CloseHandle (event_handle);
+
+      return hr;
+    }
+
+    WaitForSingleObjectEx (event_handle, INFINITE, FALSE);
+    if (close_handle)
+      CloseHandle (event_handle);
+  }
+
+  return S_OK;
+}
+
+static gpointer
+gst_d3d12_command_queue_gc_thread (GstD3D12CommandQueue * self)
+{
+  auto priv = self->priv;
+
+  GST_INFO_OBJECT (self, "Entering GC thread");
+
+  HANDLE event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+
+  while (true) {
+    GCDataPtr gc_data;
+
+    {
+      std::unique_lock < std::mutex > lk (priv->lock);
+      while (!priv->shutdown && priv->gc_list.empty ())
+        priv->cond.wait (lk);
+
+      if (priv->shutdown)
+        break;
+
+      auto completed = priv->fence->GetCompletedValue ();
+      while (!priv->gc_list.empty ()) {
+        auto top = priv->gc_list.top ();
+        if (top->fence_val > completed) {
+          gc_data = top;
+          priv->gc_list.pop ();
+          break;
+        }
+
+        GST_LOG_OBJECT (self, "Releasing fence data, completed %"
+            G_GUINT64_FORMAT ", fence value %" G_GUINT64_FORMAT,
+            completed, top->fence_val);
+
+        priv->gc_list.pop ();
+      }
+    }
+
+    if (gc_data) {
+      GST_LOG_OBJECT (self, "Waiting for fence data %" G_GUINT64_FORMAT,
+          gc_data->fence_val);
+      auto hr =
+          priv->fence->SetEventOnCompletion (gc_data->fence_val, event_handle);
+      if (FAILED (hr)) {
+        GST_ERROR_OBJECT (self, "SetEventOnCompletion failed");
+      } else {
+        WaitForSingleObjectEx (event_handle, INFINITE, FALSE);
+        GST_LOG_OBJECT (self, "Waiting done, %" G_GUINT64_FORMAT,
+            gc_data->fence_val);
+      }
+    }
+  }
+
+  GST_INFO_OBJECT (self, "Leaving GC thread");
+
+  CloseHandle (event_handle);
+
+  return nullptr;
+}
+
+void
+gst_d3d12_command_queue_set_notify (GstD3D12CommandQueue * queue,
+    guint64 fence_value, gpointer fence_data, GDestroyNotify notify)
+{
+  g_return_if_fail (GST_IS_D3D12_COMMAND_QUEUE (queue));
+
+  auto priv = queue->priv;
+
+  auto completed = priv->fence->GetCompletedValue ();
+  if (completed >= fence_value) {
+    GST_DEBUG_OBJECT (queue, "Already completed fence value %"
+        G_GUINT64_FORMAT, fence_value);
+
+    if (notify)
+      notify (fence_data);
+    return;
+  }
+
+  auto gc_data = std::make_shared < GCData > (fence_data, notify, fence_value);
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if (!priv->gc_thread) {
+    gst_d3d12_init_background_thread ();
+    priv->gc_thread = g_thread_new ("GstD3D12Gc",
+        (GThreadFunc) gst_d3d12_command_queue_gc_thread, queue);
+  }
+
+  GST_LOG_OBJECT (queue, "Pushing GC data %" G_GUINT64_FORMAT, fence_value);
+
+  priv->gc_list.push (std::move (gc_data));
+  priv->cond.notify_one ();
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12commandqueue.h Added

@@ -0,0 +1,63 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_COMMAND_QUEUE (gst_d3d12_command_queue_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12CommandQueue,
+    gst_d3d12_command_queue, GST, D3D12_COMMAND_QUEUE, GstObject);
+
+GstD3D12CommandQueue * gst_d3d12_command_queue_new (GstD3D12Device * device,
+                                                    const D3D12_COMMAND_QUEUE_DESC * desc,
+                                                    guint queue_size);
+
+gboolean               gst_d3d12_command_queue_get_handle (GstD3D12CommandQueue * queue,
+                                                           ID3D12CommandQueue ** handle);
+
+gboolean               gst_d3d12_command_queue_get_fence  (GstD3D12CommandQueue * queue,
+                                                           ID3D12Fence ** handle);
+
+HRESULT                gst_d3d12_command_queue_execute_command_lists (GstD3D12CommandQueue * queue,
+                                                                      guint num_command_lists,
+                                                                      ID3D12CommandList ** command_lists,
+                                                                      guint64 * fence_value);
+
+HRESULT                gst_d3d12_command_queue_execute_wait (GstD3D12CommandQueue * queue,
+                                                             ID3D12Fence * fence,
+                                                             guint64 fence_value);
+
+guint64                gst_d3d12_command_queue_get_completed_value (GstD3D12CommandQueue * queue);
+
+HRESULT                gst_d3d12_command_queue_fence_wait   (GstD3D12CommandQueue * queue,
+                                                             guint64 fence_value,
+                                                             HANDLE event_handle);
+
+
+void                   gst_d3d12_command_queue_set_notify (GstD3D12CommandQueue * queue,
+                                                           guint64 fence_value,
+                                                           gpointer fence_data,
+                                                           GDestroyNotify notify);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12compositor.cpp Added

@@ -0,0 +1,2542 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d12compositor
+ * @title: d3d12compositor
+ *
+ * A Direct3D12 based video compositing element.
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 d3d12compositor name=c ! d3d12videosink \
+ *     videotestsrc ! video/x-raw,width=320,height=240 ! c. \
+ *     videotestsrc pattern=ball ! video/x-raw,width=100,height=100 ! c.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12compositor.h"
+#include "gstd3d12pluginutils.h"
+#include <directx/d3dx12.h>
+#include <mutex>
+#include <future>
+#include <vector>
+#include <queue>
+#include <string.h>
+#include <wrl.h>
+#include "PSMain_checker_luma.h"
+#include "PSMain_checker_rgb.h"
+#include "PSMain_checker_vuya.h"
+#include "VSMain_pos.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_compositor_debug);
+#define GST_CAT_DEFAULT gst_d3d12_compositor_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+enum GstD3D12CompositorBackground
+{
+  GST_D3D12_COMPOSITOR_BACKGROUND_CHECKER,
+  GST_D3D12_COMPOSITOR_BACKGROUND_BLACK,
+  GST_D3D12_COMPOSITOR_BACKGROUND_WHITE,
+  GST_D3D12_COMPOSITOR_BACKGROUND_TRANSPARENT,
+};
+
+#define GST_TYPE_D3D12_COMPOSITOR_BACKGROUND (gst_d3d12_compositor_background_get_type())
+static GType
+gst_d3d12_compositor_background_get_type (void)
+{
+  static GType compositor_background_type = 0;
+  static const GEnumValue compositor_background = {
+    {GST_D3D12_COMPOSITOR_BACKGROUND_CHECKER, "Checker pattern", "checker"},
+    {GST_D3D12_COMPOSITOR_BACKGROUND_BLACK, "Black", "black"},
+    {GST_D3D12_COMPOSITOR_BACKGROUND_WHITE, "White", "white"},
+    {GST_D3D12_COMPOSITOR_BACKGROUND_TRANSPARENT,
+        "Transparent Background to enable further compositing", "transparent"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    compositor_background_type =
+        g_enum_register_static ("GstD3D12CompositorBackground",
+        compositor_background);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return compositor_background_type;
+}
+
+enum GstD3D12CompositorOperator
+{
+  GST_D3D12_COMPOSITOR_OPERATOR_SOURCE,
+  GST_D3D12_COMPOSITOR_OPERATOR_OVER,
+};
+
+#define GST_TYPE_D3D12_COMPOSITOR_OPERATOR (gst_d3d12_compositor_operator_get_type())
+static GType
+gst_d3d12_compositor_operator_get_type (void)
+{
+  static GType compositor_operator_type = 0;
+  static const GEnumValue compositor_operator = {
+    {GST_D3D12_COMPOSITOR_OPERATOR_SOURCE, "Source", "source"},
+    {GST_D3D12_COMPOSITOR_OPERATOR_OVER, "Over", "over"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    compositor_operator_type =
+        g_enum_register_static ("GstD3D12CompositorOperator",
+        compositor_operator);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return compositor_operator_type;
+}
+
+enum GstD3D12CompositorSizingPolicy
+{
+  GST_D3D12_COMPOSITOR_SIZING_POLICY_NONE,
+  GST_D3D12_COMPOSITOR_SIZING_POLICY_KEEP_ASPECT_RATIO,
+};
+
+#define GST_TYPE_D3D12_COMPOSITOR_SIZING_POLICY (gst_d3d12_compositor_sizing_policy_get_type())
+static GType
+gst_d3d12_compositor_sizing_policy_get_type (void)
+{
+  static GType sizing_policy_type = 0;
+
+  static const GEnumValue sizing_polices = {
+    {GST_D3D12_COMPOSITOR_SIZING_POLICY_NONE,
+        "None: Image is scaled to fill configured destination rectangle without "
+          "padding or keeping the aspect ratio", "none"},
+    {GST_D3D12_COMPOSITOR_SIZING_POLICY_KEEP_ASPECT_RATIO,
+          "Keep Aspect Ratio: Image is scaled to fit destination rectangle "
+          "specified by GstD3D12CompositorPad:{xpos, ypos, width, height} "
+          "with preserved aspect ratio. Resulting image will be centered in "
+          "the destination rectangle with padding if necessary",
+        "keep-aspect-ratio"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    sizing_policy_type =
+        g_enum_register_static ("GstD3D12CompositorSizingPolicy",
+        sizing_polices);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return sizing_policy_type;
+}
+
+enum
+{
+  PROP_PAD_0,
+  PROP_PAD_XPOS,
+  PROP_PAD_YPOS,
+  PROP_PAD_WIDTH,
+  PROP_PAD_HEIGHT,
+  PROP_PAD_ALPHA,
+  PROP_PAD_OPERATOR,
+  PROP_PAD_SIZING_POLICY,
+  PROP_PAD_GAMMA_MODE,
+  PROP_PAD_PRIMARIES_MODE,
+};
+
+#define DEFAULT_PAD_XPOS   0
+#define DEFAULT_PAD_YPOS   0
+#define DEFAULT_PAD_WIDTH  0
+#define DEFAULT_PAD_HEIGHT 0
+#define DEFAULT_PAD_ALPHA  1.0
+#define DEFAULT_PAD_OPERATOR GST_D3D12_COMPOSITOR_OPERATOR_OVER
+#define DEFAULT_PAD_SIZING_POLICY GST_D3D12_COMPOSITOR_SIZING_POLICY_NONE
+
+enum
+{
+  PROP_0,
+  PROP_ADAPTER,
+  PROP_BACKGROUND,
+  PROP_IGNORE_INACTIVE_PADS,
+};
+
+#define DEFAULT_ADAPTER -1
+#define DEFAULT_BACKGROUND GST_D3D12_COMPOSITOR_BACKGROUND_CHECKER
+
+static const D3D12_RENDER_TARGET_BLEND_DESC g_blend_source = {
+  TRUE,
+  FALSE,
+  D3D12_BLEND_ONE,
+  D3D12_BLEND_ZERO,
+  D3D12_BLEND_OP_ADD,
+  D3D12_BLEND_ONE,
+  D3D12_BLEND_ZERO,
+  D3D12_BLEND_OP_ADD,
+  D3D12_LOGIC_OP_NOOP,
+  D3D12_COLOR_WRITE_ENABLE_ALL,
+};
+
+static const D3D12_RENDER_TARGET_BLEND_DESC g_blend_over = {
+  TRUE,
+  FALSE,
+  D3D12_BLEND_SRC_ALPHA,
+  D3D12_BLEND_INV_SRC_ALPHA,
+  D3D12_BLEND_OP_ADD,
+  D3D12_BLEND_ONE,
+  D3D12_BLEND_INV_SRC_ALPHA,
+  D3D12_BLEND_OP_ADD,
+  D3D12_LOGIC_OP_NOOP,
+  D3D12_COLOR_WRITE_ENABLE_ALL,
+};
+
+static const D3D12_RENDER_TARGET_BLEND_DESC g_blend_over_factor = {
+  TRUE,
+  FALSE,
+  D3D12_BLEND_BLEND_FACTOR,
+  D3D12_BLEND_INV_BLEND_FACTOR,
+  D3D12_BLEND_OP_ADD,
+  D3D12_BLEND_BLEND_FACTOR,
+  D3D12_BLEND_INV_BLEND_FACTOR,
+  D3D12_BLEND_OP_ADD,
+  D3D12_LOGIC_OP_NOOP,
+  D3D12_COLOR_WRITE_ENABLE_ALL,
+};
+
+static const D3D12_ROOT_SIGNATURE_FLAGS g_rs_flags =
+    D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_AMPLIFICATION_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_MESH_SHADER_ROOT_ACCESS;
+
+struct PadContext
+{
+  PadContext (GstD3D12Device * dev)
+  {
+    event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+    device = (GstD3D12Device *) gst_object_ref (dev);
+    ca_pool = gst_d3d12_command_allocator_pool_new (device,
+        D3D12_COMMAND_LIST_TYPE_DIRECT);
+    gst_video_info_init (&info);
+  }
+
+  PadContext () = delete;
+
+  ~PadContext () {
+    gst_d3d12_device_fence_wait (device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        fence_val, event_handle);
+
+    CloseHandle (event_handle);
+
+    gst_clear_d3d12_fence_data (&fence_data);
+    gst_clear_object (&conv);
+    gst_clear_object (&ca_pool);
+    gst_clear_object (&device);
+  }
+
+  GstVideoInfo info;
+  GstD3D12CommandAllocatorPool *ca_pool;
+  ComPtr < ID3D12GraphicsCommandList > cl;
+  GstD3D12FenceData *fence_data = nullptr;
+  GstD3D12Device *device;
+  GstD3D12Converter *conv = nullptr;
+  HANDLE event_handle;
+  guint64 fence_val = 0;
+};
+
+struct GstD3D12CompositorPadPrivate
+{
+  GstD3D12CompositorPadPrivate ()
+  {
+    blend_desc = CD3DX12_BLEND_DESC (D3D12_DEFAULT);
+    blend_desc.RenderTarget0 = g_blend_over;
+    for (guint i = 0; i < 4; i++)
+      blend_factori = 1.0f;
+  }
+
+  std::unique_ptr < PadContext > ctx;
+  std::future < gboolean > prepare_rst;
+
+  gboolean position_updated = FALSE;
+  gboolean alpha_updated = FALSE;
+  gboolean blend_desc_updated = FALSE;
+  D3D12_BLEND_DESC blend_desc;
+  gfloat blend_factor4;
+
+  std::recursive_mutex lock;
+
+  /* properties */
+  gint xpos = DEFAULT_PAD_XPOS;
+  gint ypos = DEFAULT_PAD_YPOS;
+  gint width = DEFAULT_PAD_WIDTH;
+  gint height = DEFAULT_PAD_HEIGHT;
+  gdouble alpha = DEFAULT_PAD_ALPHA;
+  GstD3D12CompositorOperator op = DEFAULT_PAD_OPERATOR;
+  GstD3D12CompositorSizingPolicy sizing_policy = DEFAULT_PAD_SIZING_POLICY;
+};
+
+struct _GstD3D12CompositorPad
+{
+  GstVideoAggregatorConvertPad parent;
+
+  GstD3D12CompositorPadPrivate *priv;
+};
+
+struct VertexData
+{
+  struct
+  {
+    FLOAT x;
+    FLOAT y;
+    FLOAT z;
+  } position;
+  struct
+  {
+    FLOAT u;
+    FLOAT v;
+  } texture;
+};
+
+struct BackgroundRender
+{
+  BackgroundRender (GstD3D12Device * dev, const GstVideoInfo & info)
+  {
+    event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+    device = (GstD3D12Device *) gst_object_ref (dev);
+    ca_pool = gst_d3d12_command_allocator_pool_new (device,
+        D3D12_COMMAND_LIST_TYPE_DIRECT);
+
+    D3D12_VERSIONED_ROOT_SIGNATURE_DESC rs_desc = { };
+    CD3DX12_VERSIONED_ROOT_SIGNATURE_DESC::Init_1_0 (rs_desc,
+        0, nullptr, 0, nullptr, g_rs_flags);
+
+    ComPtr < ID3DBlob > rs_blob;
+    ComPtr < ID3DBlob > error_blob;
+    auto hr = D3DX12SerializeVersionedRootSignature (&rs_desc,
+        D3D_ROOT_SIGNATURE_VERSION_1_1, &rs_blob, &error_blob);
+    if (!gst_d3d12_result (hr, device)) {
+      const gchar *error_msg = nullptr;
+      if (error_blob)
+        error_msg = (const gchar *) error_blob->GetBufferPointer ();
+
+      GST_ERROR_OBJECT (device, "Couldn't serialize root signature, error: %s",
+          GST_STR_NULL (error_msg));
+      return;
+    }
+
+    auto device_handle = gst_d3d12_device_get_device_handle (device);
+    hr = device_handle->CreateRootSignature (0, rs_blob->GetBufferPointer (),
+        rs_blob->GetBufferSize (), IID_PPV_ARGS (&rs));
+    if (!gst_d3d12_result (hr, device)) {
+      GST_ERROR_OBJECT (device, "Couldn't create root signature");
+      return;
+    }
+
+    GstD3D12Format format;
+    gst_d3d12_device_get_format (device, GST_VIDEO_INFO_FORMAT (&info),
+        &format);
+
+    D3D12_INPUT_ELEMENT_DESC input_desc;
+    input_desc.SemanticName = "POSITION";
+    input_desc.SemanticIndex = 0;
+    input_desc.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+    input_desc.InputSlot = 0;
+    input_desc.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+    input_desc.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+    input_desc.InstanceDataStepRate = 0;
+
+    D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc = { };
+    pso_desc.pRootSignature = rs.Get ();
+    pso_desc.VS.BytecodeLength = sizeof (g_VSMain_pos);
+    pso_desc.VS.pShaderBytecode = g_VSMain_pos;
+    if (GST_VIDEO_INFO_IS_RGB (&info)) {
+      pso_desc.PS.BytecodeLength = sizeof (g_PSMain_checker_rgb);
+      pso_desc.PS.pShaderBytecode = g_PSMain_checker_rgb;
+    } else if (GST_VIDEO_INFO_FORMAT (&info) == GST_VIDEO_FORMAT_VUYA) {
+      pso_desc.PS.BytecodeLength = sizeof (g_PSMain_checker_vuya);
+      pso_desc.PS.pShaderBytecode = g_PSMain_checker_vuya;
+    } else {
+      pso_desc.PS.BytecodeLength = sizeof (g_PSMain_checker_luma);
+      pso_desc.PS.pShaderBytecode = g_PSMain_checker_luma;
+    }
+    pso_desc.BlendState = CD3DX12_BLEND_DESC (D3D12_DEFAULT);
+    pso_desc.SampleMask = UINT_MAX;
+    pso_desc.RasterizerState = CD3DX12_RASTERIZER_DESC (D3D12_DEFAULT);
+    pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
+    pso_desc.DepthStencilState.DepthEnable = FALSE;
+    pso_desc.DepthStencilState.StencilEnable = FALSE;
+    pso_desc.InputLayout.pInputElementDescs = &input_desc;
+    pso_desc.InputLayout.NumElements = 1;
+    pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
+    pso_desc.NumRenderTargets = 1;
+    pso_desc.RTVFormats0 = format.resource_format0;
+    pso_desc.SampleDesc.Count = 1;
+
+    hr = device_handle->CreateGraphicsPipelineState (&pso_desc,
+        IID_PPV_ARGS (&pso));
+    if (!gst_d3d12_result (hr, device)) {
+      GST_ERROR_OBJECT (device, "Couldn't create pso");
+      return;
+    }
+
+    VertexData vertex_data4;
+    const WORD indices6 = { 0, 1, 2, 3, 0, 2 };
+
+    /* bottom left */
+    vertex_data0.position.x = -1.0f;
+    vertex_data0.position.y = -1.0f;
+    vertex_data0.position.z = 0.0f;
+    vertex_data0.texture.u = 0.0f;
+    vertex_data0.texture.v = 1.0f;
+
+    /* top left */
+    vertex_data1.position.x = -1.0f;
+    vertex_data1.position.y = 1.0f;
+    vertex_data1.position.z = 0.0f;
+    vertex_data1.texture.u = 0.0f;
+    vertex_data1.texture.v = 0.0f;
+
+    /* top right */
+    vertex_data2.position.x = 1.0f;
+    vertex_data2.position.y = 1.0f;
+    vertex_data2.position.z = 0.0f;
+    vertex_data2.texture.u = 1.0f;
+    vertex_data2.texture.v = 0.0f;
+
+    /* bottom right */
+    vertex_data3.position.x = 1.0f;
+    vertex_data3.position.y = -1.0f;
+    vertex_data3.position.z = 0.0f;
+    vertex_data3.texture.u = 1.0f;
+    vertex_data3.texture.v = 1.0f;
+
+    D3D12_HEAP_PROPERTIES heap_prop =
+        CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+    D3D12_RESOURCE_DESC buffer_desc =
+        CD3DX12_RESOURCE_DESC::Buffer (sizeof (VertexData) * 4 +
+        sizeof (indices));
+
+    hr = device_handle->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED, &buffer_desc,
+        D3D12_RESOURCE_STATE_GENERIC_READ,
+        nullptr, IID_PPV_ARGS (&vertex_index_upload));
+    if (!gst_d3d12_result (hr, device)) {
+      GST_ERROR_OBJECT (device, "Couldn't create vertex upload buf");
+      return;
+    }
+
+    guint8 *data;
+    CD3DX12_RANGE range (0, 0);
+    hr = vertex_index_upload->Map (0, &range, (void **) &data);
+    if (!gst_d3d12_result (hr, device)) {
+      GST_ERROR_OBJECT (device, "Couldn't map index buffer");
+      return;
+    }
+
+    memcpy (data, vertex_data, sizeof (VertexData) * 4);
+    memcpy (data + sizeof (VertexData) * 4, indices, sizeof (indices));
+    vertex_index_upload->Unmap (0, nullptr);
+
+    heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+    hr = device_handle->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED, &buffer_desc,
+        D3D12_RESOURCE_STATE_COMMON, nullptr, IID_PPV_ARGS (&vertex_index_buf));
+    if (!gst_d3d12_result (hr, device)) {
+      GST_ERROR_OBJECT (device, "Couldn't create index buffer");
+      return;
+    }
+
+    vbv.BufferLocation = vertex_index_buf->GetGPUVirtualAddress ();
+    vbv.SizeInBytes = sizeof (VertexData) * 4;
+    vbv.StrideInBytes = sizeof (VertexData);
+    ibv.BufferLocation = vbv.BufferLocation + vbv.SizeInBytes;
+    ibv.SizeInBytes = sizeof (indices);
+    ibv.Format = DXGI_FORMAT_R16_UINT;
+
+    viewport.TopLeftX = 0;
+    viewport.TopLeftY = 0;
+    viewport.Width = info.width;
+    viewport.Height = info.height;
+    viewport.MinDepth = 0;
+    viewport.MaxDepth = 1;
+
+    scissor_rect.left = 0;
+    scissor_rect.top = 0;
+    scissor_rect.right = info.width;
+    scissor_rect.bottom = info.height;
+
+    rtv_inc_size =
+        device_handle->GetDescriptorHandleIncrementSize
+        (D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
+
+    is_valid = true;
+  }
+  BackgroundRender () = delete;
+
+  ~BackgroundRender () {
+    gst_d3d12_device_fence_wait (device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        fence_val, event_handle);
+
+    CloseHandle (event_handle);
+
+    gst_clear_object (&ca_pool);
+    gst_clear_object (&device);
+  }
+
+  GstD3D12Device *device;
+  ComPtr < ID3D12RootSignature > rs;
+  ComPtr < ID3D12PipelineState > pso;
+  ComPtr < ID3D12Resource > vertex_index_buf;
+  ComPtr < ID3D12Resource > vertex_index_upload;
+  D3D12_VERTEX_BUFFER_VIEW vbv;
+  D3D12_INDEX_BUFFER_VIEW ibv;
+  ComPtr < ID3D12GraphicsCommandList > cl;
+  GstD3D12CommandAllocatorPool *ca_pool;
+  D3D12_VIEWPORT viewport;
+  D3D12_RECT scissor_rect;
+  guint rtv_inc_size;
+  bool need_upload = true;
+  bool is_valid = false;
+  HANDLE event_handle;
+  guint64 fence_val = 0;
+};
+
+struct ClearColor
+{
+  /* rtvcolors */
+  FLOAT color44;
+};
+
+struct GStD3D12CompositorPrivate
+{
+  GStD3D12CompositorPrivate ()
+  {
+    fence_data_pool = gst_d3d12_fence_data_pool_new ();
+    gst_video_info_init (&negotiated_info);
+  }
+
+   ~GStD3D12CompositorPrivate ()
+  {
+    gst_clear_buffer (&fallback_buf);
+    gst_clear_object (&fence_data_pool);
+  }
+
+  GstBuffer *fallback_buf = nullptr;
+  GstBuffer *generated_output_buf = nullptr;
+
+  std::unique_ptr < BackgroundRender > bg_render;
+  /* black/white/transparent */
+  ClearColor clear_color3;
+  GstD3D12FenceDataPool *fence_data_pool;
+  std::vector < D3D12_CPU_DESCRIPTOR_HANDLE > rtv_handles;
+  std::queue < guint64 > scheduled;
+
+  GstVideoInfo negotiated_info;
+
+  gboolean downstream_supports_d3d12 = FALSE;
+
+  std::recursive_mutex lock;
+
+  /* properties */
+  gint adapter = DEFAULT_ADAPTER;
+  GstD3D12CompositorBackground background = DEFAULT_BACKGROUND;
+};
+
+struct _GstD3D12Compositor
+{
+  GstVideoAggregator parent;
+
+  GstD3D12Device *device;
+
+  GStD3D12CompositorPrivate *priv;
+};
+
+static void gst_d3d12_compositor_pad_finalize (GObject * object);
+static void gst_d3d12_compositor_pad_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_d3d12_compositor_pad_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+static void
+gst_d3d12_compositor_pad_update_conversion_info (GstVideoAggregatorPad * pad);
+static void
+gst_d3d12_compositor_pad_prepare_frame_start (GstVideoAggregatorPad * pad,
+    GstVideoAggregator * vagg, GstBuffer * buffer,
+    GstVideoFrame * prepared_frame);
+static void
+gst_d3d12_compositor_pad_prepare_frame_finish (GstVideoAggregatorPad * pad,
+    GstVideoAggregator * vagg, GstVideoFrame * prepared_frame);
+static void gst_d3d12_compositor_pad_clean_frame (GstVideoAggregatorPad * vpad,
+    GstVideoAggregator * vagg, GstVideoFrame * prepared_frame);
+
+#define gst_d3d12_compositor_pad_parent_class parent_pad_class
+G_DEFINE_TYPE (GstD3D12CompositorPad, gst_d3d12_compositor_pad,
+    GST_TYPE_VIDEO_AGGREGATOR_PAD);
+
+static void
+gst_d3d12_compositor_pad_class_init (GstD3D12CompositorPadClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto vagg_pad_class = GST_VIDEO_AGGREGATOR_PAD_CLASS (klass);
+  GParamFlags param_flags = (GParamFlags)
+      (G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS);
+
+  object_class->finalize = gst_d3d12_compositor_pad_finalize;
+  object_class->set_property = gst_d3d12_compositor_pad_set_property;
+  object_class->get_property = gst_d3d12_compositor_pad_get_property;
+
+  g_object_class_install_property (object_class, PROP_PAD_XPOS,
+      g_param_spec_int ("xpos", "X Position", "X position of the picture",
+          G_MININT, G_MAXINT, DEFAULT_PAD_XPOS, param_flags));
+  g_object_class_install_property (object_class, PROP_PAD_YPOS,
+      g_param_spec_int ("ypos", "Y Position", "Y position of the picture",
+          G_MININT, G_MAXINT, DEFAULT_PAD_YPOS, param_flags));
+  g_object_class_install_property (object_class, PROP_PAD_WIDTH,
+      g_param_spec_int ("width", "Width", "Width of the picture",
+          G_MININT, G_MAXINT, DEFAULT_PAD_WIDTH, param_flags));
+  g_object_class_install_property (object_class, PROP_PAD_HEIGHT,
+      g_param_spec_int ("height", "Height", "Height of the picture",
+          G_MININT, G_MAXINT, DEFAULT_PAD_HEIGHT, param_flags));
+  g_object_class_install_property (object_class, PROP_PAD_ALPHA,
+      g_param_spec_double ("alpha", "Alpha", "Alpha of the picture", 0.0, 1.0,
+          DEFAULT_PAD_ALPHA, param_flags));
+  g_object_class_install_property (object_class, PROP_PAD_OPERATOR,
+      g_param_spec_enum ("operator", "Operator",
+          "Blending operator to use for blending this pad over the previous ones",
+          GST_TYPE_D3D12_COMPOSITOR_OPERATOR, DEFAULT_PAD_OPERATOR,
+          param_flags));
+  g_object_class_install_property (object_class, PROP_PAD_SIZING_POLICY,
+      g_param_spec_enum ("sizing-policy", "Sizing policy",
+          "Sizing policy to use for image scaling",
+          GST_TYPE_D3D12_COMPOSITOR_SIZING_POLICY, DEFAULT_PAD_SIZING_POLICY,
+          param_flags));
+
+  vagg_pad_class->update_conversion_info =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_pad_update_conversion_info);
+  vagg_pad_class->prepare_frame_start =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_pad_prepare_frame_start);
+  vagg_pad_class->prepare_frame_finish =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_pad_prepare_frame_finish);
+  vagg_pad_class->clean_frame =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_pad_clean_frame);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_COMPOSITOR_OPERATOR,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_COMPOSITOR_SIZING_POLICY,
+      (GstPluginAPIFlags) 0);
+}
+
+static void
+gst_d3d12_compositor_pad_init (GstD3D12CompositorPad * pad)
+{
+  pad->priv = new GstD3D12CompositorPadPrivate ();
+}
+
+static void
+gst_d3d12_compositor_pad_finalize (GObject * object)
+{
+  auto self = GST_D3D12_COMPOSITOR_PAD (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_pad_class)->finalize (object);
+}
+
+static void
+gst_d3d12_compositor_pad_update_position (GstD3D12CompositorPad * pad,
+    gint * old, const GValue * value)
+{
+  auto priv = pad->priv;
+  gint tmp = g_value_get_int (value);
+
+  if (*old != tmp) {
+    *old = tmp;
+    priv->position_updated = TRUE;
+  }
+}
+
+static void
+gst_d3d12_compositor_pad_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  auto pad = GST_D3D12_COMPOSITOR_PAD (object);
+  auto priv = pad->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  switch (prop_id) {
+    case PROP_PAD_XPOS:
+      gst_d3d12_compositor_pad_update_position (pad, &priv->xpos, value);
+      break;
+    case PROP_PAD_YPOS:
+      gst_d3d12_compositor_pad_update_position (pad, &priv->ypos, value);
+      break;
+    case PROP_PAD_WIDTH:
+      gst_d3d12_compositor_pad_update_position (pad, &priv->width, value);
+      break;
+    case PROP_PAD_HEIGHT:
+      gst_d3d12_compositor_pad_update_position (pad, &priv->height, value);
+      break;
+    case PROP_PAD_ALPHA:{
+      gdouble alpha = g_value_get_double (value);
+      if (priv->alpha != alpha) {
+        priv->alpha_updated = TRUE;
+        priv->alpha = alpha;
+      }
+      break;
+    }
+    case PROP_PAD_OPERATOR:{
+      GstD3D12CompositorOperator op =
+          (GstD3D12CompositorOperator) g_value_get_enum (value);
+      if (op != priv->op) {
+        priv->op = op;
+        priv->blend_desc_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_PAD_SIZING_POLICY:{
+      GstD3D12CompositorSizingPolicy policy =
+          (GstD3D12CompositorSizingPolicy) g_value_get_enum (value);
+      if (priv->sizing_policy != policy) {
+        priv->sizing_policy = policy;
+        priv->position_updated = TRUE;
+      }
+      break;
+    }
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_compositor_pad_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  auto pad = GST_D3D12_COMPOSITOR_PAD (object);
+  auto priv = pad->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  switch (prop_id) {
+    case PROP_PAD_XPOS:
+      g_value_set_int (value, priv->xpos);
+      break;
+    case PROP_PAD_YPOS:
+      g_value_set_int (value, priv->ypos);
+      break;
+    case PROP_PAD_WIDTH:
+      g_value_set_int (value, priv->width);
+      break;
+    case PROP_PAD_HEIGHT:
+      g_value_set_int (value, priv->height);
+      break;
+    case PROP_PAD_ALPHA:
+      g_value_set_double (value, priv->alpha);
+      break;
+    case PROP_PAD_OPERATOR:
+      g_value_set_enum (value, priv->op);
+      break;
+    case PROP_PAD_SIZING_POLICY:
+      g_value_set_enum (value, priv->sizing_policy);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_compositor_pad_update_conversion_info (GstVideoAggregatorPad * pad)
+{
+  auto cpad = GST_D3D12_COMPOSITOR_PAD (pad);
+  auto priv = cpad->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  priv->position_updated = TRUE;
+}
+
+static void
+gst_d3d12_compositor_pad_get_output_size (GstD3D12CompositorPad * pad,
+    gint out_par_n, gint out_par_d, gint * width, gint * height,
+    gint * x_offset, gint * y_offset)
+{
+  auto priv = pad->priv;
+  auto vagg_pad = GST_VIDEO_AGGREGATOR_PAD (pad);
+  gint pad_width, pad_height;
+  guint dar_n, dar_d;
+
+  *x_offset = 0;
+  *y_offset = 0;
+  *width = 0;
+  *height = 0;
+
+  /* FIXME: Anything better we can do here? */
+  if (!vagg_pad->info.finfo
+      || vagg_pad->info.finfo->format == GST_VIDEO_FORMAT_UNKNOWN) {
+    GST_DEBUG_OBJECT (pad, "Have no caps yet");
+    return;
+  }
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+
+  pad_width = priv->width <= 0 ? GST_VIDEO_INFO_WIDTH (&vagg_pad->info) :
+      priv->width;
+  pad_height = priv->height <= 0 ? GST_VIDEO_INFO_HEIGHT (&vagg_pad->info) :
+      priv->height;
+
+  if (pad_width == 0 || pad_height == 0)
+    return;
+
+  if (!gst_video_calculate_display_ratio (&dar_n, &dar_d, pad_width, pad_height,
+          GST_VIDEO_INFO_PAR_N (&vagg_pad->info),
+          GST_VIDEO_INFO_PAR_D (&vagg_pad->info), out_par_n, out_par_d)) {
+    GST_WARNING_OBJECT (pad, "Cannot calculate display aspect ratio");
+    return;
+  }
+
+  GST_TRACE_OBJECT (pad, "scaling %ux%u by %u/%u (%u/%u / %u/%u)",
+      pad_width, pad_height, dar_n, dar_d,
+      GST_VIDEO_INFO_PAR_N (&vagg_pad->info),
+      GST_VIDEO_INFO_PAR_D (&vagg_pad->info), out_par_n, out_par_d);
+
+  switch (priv->sizing_policy) {
+    case GST_D3D12_COMPOSITOR_SIZING_POLICY_NONE:
+      /* Pick either height or width, whichever is an integer multiple of the
+       * display aspect ratio. However, prefer preserving the height to account
+       * for interlaced video. */
+      if (pad_height % dar_n == 0) {
+        pad_width = gst_util_uint64_scale_int (pad_height, dar_n, dar_d);
+      } else if (pad_width % dar_d == 0) {
+        pad_height = gst_util_uint64_scale_int (pad_width, dar_d, dar_n);
+      } else {
+        pad_width = gst_util_uint64_scale_int (pad_height, dar_n, dar_d);
+      }
+      break;
+    case GST_D3D12_COMPOSITOR_SIZING_POLICY_KEEP_ASPECT_RATIO:{
+      gint from_dar_n, from_dar_d, to_dar_n, to_dar_d, num, den;
+
+      /* Calculate DAR again with actual video size */
+      if (!gst_util_fraction_multiply (GST_VIDEO_INFO_WIDTH (&vagg_pad->info),
+              GST_VIDEO_INFO_HEIGHT (&vagg_pad->info),
+              GST_VIDEO_INFO_PAR_N (&vagg_pad->info),
+              GST_VIDEO_INFO_PAR_D (&vagg_pad->info), &from_dar_n,
+              &from_dar_d)) {
+        from_dar_n = from_dar_d = -1;
+      }
+
+      if (!gst_util_fraction_multiply (pad_width, pad_height,
+              out_par_n, out_par_d, &to_dar_n, &to_dar_d)) {
+        to_dar_n = to_dar_d = -1;
+      }
+
+      if (from_dar_n != to_dar_n || from_dar_d != to_dar_d) {
+        /* Calculate new output resolution */
+        if (from_dar_n != -1 && from_dar_d != -1
+            && gst_util_fraction_multiply (from_dar_n, from_dar_d,
+                out_par_d, out_par_n, &num, &den)) {
+          GstVideoRectangle src_rect, dst_rect, rst_rect;
+
+          src_rect.h = gst_util_uint64_scale_int (pad_width, den, num);
+          if (src_rect.h == 0) {
+            pad_width = 0;
+            pad_height = 0;
+            break;
+          }
+
+          src_rect.x = src_rect.y = 0;
+          src_rect.w = pad_width;
+
+          dst_rect.x = dst_rect.y = 0;
+          dst_rect.w = pad_width;
+          dst_rect.h = pad_height;
+
+          /* Scale rect to be centered in destination rect */
+          gst_video_center_rect (&src_rect, &dst_rect, &rst_rect, TRUE);
+
+          GST_LOG_OBJECT (pad,
+              "Re-calculated size %dx%d -> %dx%d (x-offset %d, y-offset %d)",
+              pad_width, pad_height, rst_rect.w, rst_rect.h, rst_rect.x,
+              rst_rect.h);
+
+          *x_offset = rst_rect.x;
+          *y_offset = rst_rect.y;
+          pad_width = rst_rect.w;
+          pad_height = rst_rect.h;
+        } else {
+          GST_WARNING_OBJECT (pad, "Failed to calculate output size");
+
+          *x_offset = 0;
+          *y_offset = 0;
+          pad_width = 0;
+          pad_height = 0;
+        }
+      }
+      break;
+    }
+  }
+
+  *width = pad_width;
+  *height = pad_height;
+}
+
+static GstVideoRectangle
+clamp_rectangle (gint x, gint y, gint w, gint h, gint outer_width,
+    gint outer_height)
+{
+  gint x2 = x + w;
+  gint y2 = y + h;
+  GstVideoRectangle clamped;
+
+  /* Clamp the x/y coordinates of this frame to the output boundaries to cover
+   * the case where (say, with negative xpos/ypos or w/h greater than the output
+   * size) the non-obscured portion of the frame could be outside the bounds of
+   * the video itself and hence not visible at all */
+  clamped.x = CLAMP (x, 0, outer_width);
+  clamped.y = CLAMP (y, 0, outer_height);
+  clamped.w = CLAMP (x2, 0, outer_width) - clamped.x;
+  clamped.h = CLAMP (y2, 0, outer_height) - clamped.y;
+
+  return clamped;
+}
+
+static gboolean
+gst_d3d12_compositor_pad_check_frame_obscured (GstVideoAggregatorPad * pad,
+    GstVideoAggregator * vagg)
+{
+  auto cpad = GST_D3D12_COMPOSITOR_PAD (pad);
+  auto priv = cpad->priv;
+  gint width, height;
+  GstVideoInfo *info = &vagg->info;
+  /* The rectangle representing this frame, clamped to the video's boundaries.
+   * Due to the clamping, this is different from the frame width/height above. */
+  GstVideoRectangle frame_rect;
+  gint x_offset, y_offset;
+
+  /* There's three types of width/height here:
+   * 1. GST_VIDEO_FRAME_WIDTH/HEIGHT:
+   *     The frame width/height (same as pad->info.height/width;
+   *     see gst_video_frame_map())
+   * 2. cpad->width/height:
+   *     The optional pad property for scaling the frame (if zero, the video is
+   *     left unscaled)
+   */
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  if (priv->alpha == 0)
+    return TRUE;
+
+  gst_d3d12_compositor_pad_get_output_size (cpad, GST_VIDEO_INFO_PAR_N (info),
+      GST_VIDEO_INFO_PAR_D (info), &width, &height, &x_offset, &y_offset);
+
+  frame_rect = clamp_rectangle (priv->xpos + x_offset, priv->ypos + y_offset,
+      width, height, GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_HEIGHT (info));
+
+  if (frame_rect.w == 0 || frame_rect.h == 0) {
+    GST_DEBUG_OBJECT (pad, "Resulting frame is zero-width or zero-height "
+        "(w: %i, h: %i), skipping", frame_rect.w, frame_rect.h);
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+static gboolean
+gst_d3d12_compositor_pad_setup_converter (GstVideoAggregatorPad * pad,
+    GstVideoAggregator * vagg)
+{
+  auto cpad = GST_D3D12_COMPOSITOR_PAD (pad);
+  auto priv = cpad->priv;
+  auto self = GST_D3D12_COMPOSITOR (vagg);
+  gint width, height;
+  GstVideoInfo *info = &vagg->info;
+  GstVideoRectangle frame_rect;
+  gboolean output_has_alpha_comp = FALSE;
+  gint x_offset, y_offset;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+
+  if (GST_VIDEO_INFO_HAS_ALPHA (info) ||
+      GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_FORMAT_BGRx ||
+      GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_FORMAT_RGBx) {
+    output_has_alpha_comp = TRUE;
+  }
+
+  if (priv->ctx) {
+    if (GST_VIDEO_INFO_FORMAT (&priv->ctx->info) !=
+        GST_VIDEO_INFO_FORMAT (&pad->info)) {
+      priv->ctx = nullptr;
+    }
+  }
+
+  if (!priv->ctx || priv->blend_desc_updated) {
+    switch (priv->op) {
+      case GST_D3D12_COMPOSITOR_OPERATOR_SOURCE:
+        priv->blend_desc.RenderTarget0 = g_blend_source;
+        break;
+      case GST_D3D12_COMPOSITOR_OPERATOR_OVER:
+        if (output_has_alpha_comp)
+          priv->blend_desc.RenderTarget0 = g_blend_over;
+        else
+          priv->blend_desc.RenderTarget0 = g_blend_over_factor;
+        break;
+      default:
+        g_assert_not_reached ();
+        return FALSE;
+    }
+  }
+
+  if (!priv->ctx || priv->alpha_updated) {
+    for (guint i = 0; i < 4; i++)
+      priv->blend_factori = priv->alpha;
+  }
+
+  if (!priv->ctx) {
+    auto ctx = std::make_unique < PadContext > (self->device);
+    ctx->info = pad->info;
+
+    ctx->conv = gst_d3d12_converter_new (self->device, &pad->info, info,
+        &priv->blend_desc, priv->blend_factor, nullptr);
+    if (!ctx->conv) {
+      GST_ERROR_OBJECT (pad, "Couldn't create converter");
+      return FALSE;
+    }
+
+    priv->ctx = std::move (ctx);
+  }
+
+  if (priv->ctx->fence_val == 0 || priv->alpha_updated) {
+    g_object_set (priv->ctx->conv, "alpha", priv->alpha, nullptr);
+    gst_d3d12_converter_update_blend_state (priv->ctx->conv,
+        &priv->blend_desc, priv->blend_factor);
+  }
+
+  priv->alpha_updated = FALSE;
+  priv->blend_desc_updated = FALSE;
+
+  if (priv->ctx->fence_val != 0 && !priv->position_updated)
+    return TRUE;
+
+  gst_d3d12_compositor_pad_get_output_size (cpad, GST_VIDEO_INFO_PAR_N (info),
+      GST_VIDEO_INFO_PAR_D (info), &width, &height, &x_offset, &y_offset);
+
+  frame_rect = clamp_rectangle (priv->xpos + x_offset, priv->ypos + y_offset,
+      width, height, GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_HEIGHT (info));
+
+#ifndef GST_DISABLE_GST_DEBUG
+  guint zorder = 0;
+  g_object_get (pad, "zorder", &zorder, nullptr);
+
+  GST_LOG_OBJECT (pad, "Update position, pad-xpos %d, pad-ypos %d, "
+      "pad-zorder %d, pad-width %d, pad-height %d, in-resolution %dx%d, "
+      "out-resoution %dx%d, dst-{x,y,width,height} %d-%d-%d-%d",
+      priv->xpos, priv->ypos, zorder, priv->width, priv->height,
+      GST_VIDEO_INFO_WIDTH (&pad->info), GST_VIDEO_INFO_HEIGHT (&pad->info),
+      GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_HEIGHT (info),
+      frame_rect.x, frame_rect.y, frame_rect.w, frame_rect.h);
+#endif
+
+  priv->position_updated = FALSE;
+
+  g_object_set (priv->ctx->conv, "dest-x", frame_rect.x,
+      "dest-y", frame_rect.y, "dest-width", frame_rect.w,
+      "dest-height", frame_rect.h, nullptr);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_compositor_preprare_func (GstVideoAggregatorPad * pad,
+    GstVideoAggregator * vagg, GstBuffer * buffer,
+    GstVideoFrame * prepared_frame)
+{
+  auto self = GST_D3D12_COMPOSITOR (vagg);
+  auto cpad = GST_D3D12_COMPOSITOR_PAD (pad);
+  auto priv = cpad->priv;
+
+  GST_LOG_OBJECT (pad, "Building command list");
+
+  if (!self->priv->generated_output_buf) {
+    GST_ERROR_OBJECT (cpad, "Have no generated output buf");
+    return FALSE;
+  }
+
+  /* Skip this frame */
+  if (gst_d3d12_compositor_pad_check_frame_obscured (pad, vagg))
+    return TRUE;
+
+  if (!gst_d3d12_compositor_pad_setup_converter (pad, vagg))
+    return FALSE;
+
+  gint x, y, w, h;
+  auto crop_meta = gst_buffer_get_video_crop_meta (buffer);
+  if (crop_meta) {
+    x = crop_meta->x;
+    y = crop_meta->y;
+    w = crop_meta->width;
+    h = crop_meta->height;
+  } else {
+    x = y = 0;
+    w = pad->info.width;
+    h = pad->info.height;
+  }
+
+  g_assert (priv->ctx);
+
+  g_object_set (priv->ctx->conv, "src-x", x, "src-y", y, "src-width", w,
+      "src-height", h, nullptr);
+
+  GstD3D12CommandAllocator *gst_ca;
+  if (!gst_d3d12_command_allocator_pool_acquire (priv->ctx->ca_pool, &gst_ca)) {
+    GST_ERROR_OBJECT (cpad, "Couldn't acquire command allocator");
+    return FALSE;
+  }
+
+  GstD3D12FenceData *fence_data;
+  gst_d3d12_fence_data_pool_acquire (self->priv->fence_data_pool, &fence_data);
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, gst_ca);
+
+  ComPtr < ID3D12CommandAllocator > ca;
+  gst_d3d12_command_allocator_get_handle (gst_ca, &ca);
+
+  auto hr = ca->Reset ();
+  if (!gst_d3d12_result (hr, priv->ctx->device)) {
+    GST_ERROR_OBJECT (cpad, "Couldn't reset command allocator");
+    gst_d3d12_fence_data_unref (fence_data);
+    return FALSE;
+  }
+
+  if (!priv->ctx->cl) {
+    auto device = gst_d3d12_device_get_device_handle (priv->ctx->device);
+    hr = device->CreateCommandList (0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        ca.Get (), nullptr, IID_PPV_ARGS (&priv->ctx->cl));
+    if (!gst_d3d12_result (hr, priv->ctx->device)) {
+      GST_ERROR_OBJECT (cpad, "Couldn't create command list");
+      gst_d3d12_fence_data_unref (fence_data);
+      return FALSE;
+    }
+  } else {
+    hr = priv->ctx->cl->Reset (ca.Get (), nullptr);
+    if (!gst_d3d12_result (hr, priv->ctx->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't reset command list");
+      gst_d3d12_fence_data_unref (fence_data);
+      return FALSE;
+    }
+  }
+
+  if (!gst_d3d12_converter_convert_buffer (priv->ctx->conv,
+          buffer, self->priv->generated_output_buf, fence_data,
+          priv->ctx->cl.Get ())) {
+    GST_ERROR_OBJECT (self, "Couldn't build command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    return FALSE;
+  }
+
+  hr = priv->ctx->cl->Close ();
+  if (!gst_d3d12_result (hr, priv->ctx->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't close command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    return FALSE;
+  }
+
+  prepared_frame->buffer = buffer;
+
+  priv->ctx->fence_data = fence_data;
+
+  GST_LOG_OBJECT (pad, "Command list prepared");
+
+  return TRUE;
+}
+
+static void
+gst_d3d12_compositor_pad_prepare_frame_start (GstVideoAggregatorPad * pad,
+    GstVideoAggregator * vagg, GstBuffer * buffer,
+    GstVideoFrame * prepared_frame)
+{
+  auto cpad = GST_D3D12_COMPOSITOR_PAD (pad);
+  auto priv = cpad->priv;
+
+  GST_LOG_OBJECT (cpad, "Prepare start");
+
+  priv->prepare_rst = std::async (std::launch::async,
+      gst_d3d12_compositor_preprare_func, pad, vagg, buffer, prepared_frame);
+}
+
+static void
+gst_d3d12_compositor_pad_prepare_frame_finish (GstVideoAggregatorPad * pad,
+    GstVideoAggregator * vagg, GstVideoFrame * prepared_frame)
+{
+  /* Will wait on aggregate() function */
+}
+
+static void
+gst_d3d12_compositor_pad_clean_frame (GstVideoAggregatorPad * pad,
+    GstVideoAggregator * vagg, GstVideoFrame * prepared_frame)
+{
+  auto cpad = GST_D3D12_COMPOSITOR_PAD (pad);
+  auto priv = cpad->priv;
+
+  if (priv->prepare_rst.valid ()) {
+    GST_WARNING_OBJECT (cpad, "Async task still pending");
+    priv->prepare_rst.get ();
+  }
+
+  memset (prepared_frame, 0, sizeof (GstVideoFrame));
+
+  if (priv->ctx && priv->ctx->fence_data) {
+    gst_d3d12_device_set_fence_notify (priv->ctx->device,
+        D3D12_COMMAND_LIST_TYPE_DIRECT, priv->ctx->fence_val,
+        priv->ctx->fence_data);
+    priv->ctx->fence_data = nullptr;
+  }
+}
+
+static GstStaticPadTemplate sink_template =
+    GST_STATIC_PAD_TEMPLATE ("sink_%u", GST_PAD_SINK, GST_PAD_REQUEST,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE (GST_D3D12_ALL_FORMATS)));
+
+/* formats we can output without conversion.
+ * Excludes 10/12 bits planar YUV (needs bitshift) and
+ * AYUV/AYUV64 (d3d12 runtime does not understand the ayuv order) */
+#define COMPOSITOR_SRC_FORMATS \
+    "{ RGBA64_LE, RGB10A2_LE, BGRA, RGBA, BGRx, RGBx, VUYA, NV12, NV21, " \
+    "P010_10LE, P012_LE, P016_LE, I420, YV12, Y42B, Y444, Y444_16LE, " \
+    "GRAY8, GRAY16_LE }"
+
+static GstStaticPadTemplate src_template =
+    GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, COMPOSITOR_SRC_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE (COMPOSITOR_SRC_FORMATS)));
+
+static void gst_d3d12_compositor_child_proxy_init (gpointer g_iface,
+    gpointer iface_data);
+static void gst_d3d12_compositor_finalize (GObject * object);
+static void gst_d3d12_compositor_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_d3d12_compositor_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+
+static GstPad *gst_d3d12_compositor_request_new_pad (GstElement * element,
+    GstPadTemplate * templ, const gchar * name, const GstCaps * caps);
+static void gst_d3d12_compositor_release_pad (GstElement * element,
+    GstPad * pad);
+static void gst_d3d12_compositor_set_context (GstElement * element,
+    GstContext * context);
+
+static gboolean gst_d3d12_compositor_start (GstAggregator * agg);
+static gboolean gst_d3d12_compositor_stop (GstAggregator * agg);
+static gboolean gst_d3d12_compositor_sink_query (GstAggregator * agg,
+    GstAggregatorPad * pad, GstQuery * query);
+static gboolean gst_d3d12_compositor_src_query (GstAggregator * agg,
+    GstQuery * query);
+static GstCaps *gst_d3d12_compositor_fixate_src_caps (GstAggregator * agg,
+    GstCaps * caps);
+static gboolean gst_d3d12_compositor_negotiated_src_caps (GstAggregator * agg,
+    GstCaps * caps);
+static gboolean
+gst_d3d12_compositor_propose_allocation (GstAggregator * agg,
+    GstAggregatorPad * pad, GstQuery * decide_query, GstQuery * query);
+static gboolean gst_d3d12_compositor_decide_allocation (GstAggregator * agg,
+    GstQuery * query);
+static GstFlowReturn
+gst_d3d12_compositor_aggregate_frames (GstVideoAggregator * vagg,
+    GstBuffer * outbuf);
+static GstFlowReturn
+gst_d3d12_compositor_create_output_buffer (GstVideoAggregator * vagg,
+    GstBuffer ** outbuffer);
+
+#define gst_d3d12_compositor_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstD3D12Compositor, gst_d3d12_compositor,
+    GST_TYPE_VIDEO_AGGREGATOR, G_IMPLEMENT_INTERFACE (GST_TYPE_CHILD_PROXY,
+        gst_d3d12_compositor_child_proxy_init));
+
+static void
+gst_d3d12_compositor_class_init (GstD3D12CompositorClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto element_class = GST_ELEMENT_CLASS (klass);
+  auto agg_class = GST_AGGREGATOR_CLASS (klass);
+  auto vagg_class = GST_VIDEO_AGGREGATOR_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_compositor_finalize;
+  object_class->set_property = gst_d3d12_compositor_set_property;
+  object_class->get_property = gst_d3d12_compositor_get_property;
+
+  g_object_class_install_property (object_class, PROP_ADAPTER,
+      g_param_spec_int ("adapter", "Adapter",
+          "Adapter index for creating device (-1 for default)",
+          -1, G_MAXINT32, DEFAULT_ADAPTER,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_BACKGROUND,
+      g_param_spec_enum ("background", "Background", "Background type",
+          GST_TYPE_D3D12_COMPOSITOR_BACKGROUND,
+          DEFAULT_BACKGROUND,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class,
+      PROP_IGNORE_INACTIVE_PADS, g_param_spec_boolean ("ignore-inactive-pads",
+          "Ignore inactive pads",
+          "Avoid timing out waiting for inactive pads", FALSE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  element_class->request_new_pad =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_request_new_pad);
+  element_class->release_pad =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_release_pad);
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_set_context);
+
+  agg_class->start = GST_DEBUG_FUNCPTR (gst_d3d12_compositor_start);
+  agg_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_compositor_stop);
+  agg_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d12_compositor_sink_query);
+  agg_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d12_compositor_src_query);
+  agg_class->fixate_src_caps =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_fixate_src_caps);
+  agg_class->negotiated_src_caps =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_negotiated_src_caps);
+  agg_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_propose_allocation);
+  agg_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_decide_allocation);
+
+  vagg_class->aggregate_frames =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_aggregate_frames);
+  vagg_class->create_output_buffer =
+      GST_DEBUG_FUNCPTR (gst_d3d12_compositor_create_output_buffer);
+
+  gst_element_class_add_static_pad_template_with_gtype (element_class,
+      &sink_template, GST_TYPE_D3D12_COMPOSITOR_PAD);
+  gst_element_class_add_static_pad_template_with_gtype (element_class,
+      &src_template, GST_TYPE_AGGREGATOR_PAD);
+
+  gst_element_class_set_static_metadata (element_class, "Direct3D12 Compositor",
+      "Filter/Editor/Video/Compositor", "A Direct3D12 compositor",
+      "Seungha Yang <seungha@centricular.com>");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_COMPOSITOR_BACKGROUND,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_COMPOSITOR_PAD,
+      (GstPluginAPIFlags) 0);
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_compositor_debug,
+      "d3d12compositor", 0, "d3d12compositor element");
+}
+
+static void
+gst_d3d12_compositor_init (GstD3D12Compositor * self)
+{
+  self->priv = new GStD3D12CompositorPrivate ();
+}
+
+static void
+gst_d3d12_compositor_finalize (GObject * object)
+{
+  auto self = GST_D3D12_COMPOSITOR (object);
+
+  delete self->priv;
+
+  gst_clear_object (&self->device);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_compositor_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_COMPOSITOR (object);
+  auto priv = self->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  switch (prop_id) {
+    case PROP_ADAPTER:
+      priv->adapter = g_value_get_int (value);
+      break;
+    case PROP_BACKGROUND:
+      priv->background =
+          (GstD3D12CompositorBackground) g_value_get_enum (value);
+      break;
+    case PROP_IGNORE_INACTIVE_PADS:
+      gst_aggregator_set_ignore_inactive_pads (GST_AGGREGATOR (object),
+          g_value_get_boolean (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_compositor_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_COMPOSITOR (object);
+  auto priv = self->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  switch (prop_id) {
+    case PROP_ADAPTER:
+      g_value_set_int (value, priv->adapter);
+      break;
+    case PROP_BACKGROUND:
+      g_value_set_enum (value, priv->background);
+      break;
+    case PROP_IGNORE_INACTIVE_PADS:
+      g_value_set_boolean (value,
+          gst_aggregator_get_ignore_inactive_pads (GST_AGGREGATOR (object)));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GObject *
+gst_d3d12_compositor_child_proxy_get_child_by_index (GstChildProxy * proxy,
+    guint index)
+{
+  auto self = GST_D3D12_COMPOSITOR (proxy);
+  GObject *obj = nullptr;
+
+  GST_OBJECT_LOCK (self);
+  obj = (GObject *) g_list_nth_data (GST_ELEMENT_CAST (self)->sinkpads, index);
+  if (obj)
+    gst_object_ref (obj);
+  GST_OBJECT_UNLOCK (self);
+
+  return obj;
+}
+
+static guint
+gst_d3d12_compositor_child_proxy_get_children_count (GstChildProxy * proxy)
+{
+  auto self = GST_D3D12_COMPOSITOR (proxy);
+  guint count = 0;
+
+  GST_OBJECT_LOCK (self);
+  count = GST_ELEMENT_CAST (self)->numsinkpads;
+  GST_OBJECT_UNLOCK (self);
+  GST_INFO_OBJECT (self, "Children Count: %d", count);
+
+  return count;
+}
+
+static void
+gst_d3d12_compositor_child_proxy_init (gpointer g_iface, gpointer iface_data)
+{
+  GstChildProxyInterface *iface = (GstChildProxyInterface *) g_iface;
+
+  iface->get_child_by_index =
+      gst_d3d12_compositor_child_proxy_get_child_by_index;
+  iface->get_children_count =
+      gst_d3d12_compositor_child_proxy_get_children_count;
+}
+
+static GstPad *
+gst_d3d12_compositor_request_new_pad (GstElement * element,
+    GstPadTemplate * templ, const gchar * name, const GstCaps * caps)
+{
+  GstPad *pad;
+
+  pad = GST_ELEMENT_CLASS (parent_class)->request_new_pad (element,
+      templ, name, caps);
+
+  if (!pad) {
+    GST_DEBUG_OBJECT (element, "could not create/add pad");
+    return nullptr;
+  }
+
+  gst_child_proxy_child_added (GST_CHILD_PROXY (element), G_OBJECT (pad),
+      GST_OBJECT_NAME (pad));
+
+  GST_DEBUG_OBJECT (element, "Created new pad %s:%s", GST_DEBUG_PAD_NAME (pad));
+
+  return pad;
+}
+
+static void
+gst_d3d12_compositor_release_pad (GstElement * element, GstPad * pad)
+{
+  auto self = GST_D3D12_COMPOSITOR (element);
+
+  GST_DEBUG_OBJECT (self, "Releasing pad %s:%s", GST_DEBUG_PAD_NAME (pad));
+
+  gst_child_proxy_child_removed (GST_CHILD_PROXY (self), G_OBJECT (pad),
+      GST_OBJECT_NAME (pad));
+
+  GST_ELEMENT_CLASS (parent_class)->release_pad (element, pad);
+}
+
+static void
+gst_d3d12_compositor_set_context (GstElement * element, GstContext * context)
+{
+  auto self = GST_D3D12_COMPOSITOR (element);
+  auto priv = self->priv;
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    gst_d3d12_handle_set_context (element, context, priv->adapter,
+        &self->device);
+  }
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_d3d12_compositor_start (GstAggregator * agg)
+{
+  auto self = GST_D3D12_COMPOSITOR (agg);
+  auto priv = self->priv;
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    if (!gst_d3d12_ensure_element_data (GST_ELEMENT_CAST (self),
+            priv->adapter, &self->device)) {
+      GST_ERROR_OBJECT (self, "Failed to get D3D12 device");
+      return FALSE;
+    }
+  }
+
+  priv->scheduled = { };
+
+  return GST_AGGREGATOR_CLASS (parent_class)->start (agg);
+}
+
+static gboolean
+gst_d3d12_compositor_stop (GstAggregator * agg)
+{
+  auto self = GST_D3D12_COMPOSITOR (agg);
+  auto priv = self->priv;
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    priv->bg_render = nullptr;
+    gst_clear_object (&self->device);
+  }
+
+  return GST_AGGREGATOR_CLASS (parent_class)->stop (agg);
+}
+
+static GstCaps *
+gst_d3d12_compositor_sink_getcaps (GstPad * pad, GstCaps * filter)
+{
+  GstCaps *sinkcaps;
+  GstCaps *template_caps;
+  GstCaps *filtered_caps;
+  GstCaps *returned_caps;
+
+  template_caps = gst_pad_get_pad_template_caps (pad);
+
+  sinkcaps = gst_pad_get_current_caps (pad);
+  if (sinkcaps == nullptr) {
+    sinkcaps = gst_caps_ref (template_caps);
+  } else {
+    sinkcaps = gst_caps_merge (sinkcaps, gst_caps_ref (template_caps));
+  }
+
+  if (filter) {
+    filtered_caps = gst_caps_intersect (sinkcaps, filter);
+    gst_caps_unref (sinkcaps);
+  } else {
+    filtered_caps = sinkcaps;   /* pass ownership */
+  }
+
+  returned_caps = gst_caps_intersect (filtered_caps, template_caps);
+
+  gst_caps_unref (template_caps);
+  gst_caps_unref (filtered_caps);
+
+  GST_DEBUG_OBJECT (pad, "returning %" GST_PTR_FORMAT, returned_caps);
+
+  return returned_caps;
+}
+
+static gboolean
+gst_d3d12_compositor_sink_acceptcaps (GstPad * pad, GstCaps * caps)
+{
+  gboolean ret;
+  GstCaps *template_caps;
+
+  GST_DEBUG_OBJECT (pad, "try accept caps of %" GST_PTR_FORMAT, caps);
+
+  template_caps = gst_pad_get_pad_template_caps (pad);
+  template_caps = gst_caps_make_writable (template_caps);
+
+  ret = gst_caps_can_intersect (caps, template_caps);
+  GST_DEBUG_OBJECT (pad, "%saccepted caps %" GST_PTR_FORMAT,
+      (ret ? "" : "not "), caps);
+  gst_caps_unref (template_caps);
+
+  return ret;
+}
+
+static gboolean
+gst_d3d12_compositor_sink_query (GstAggregator * agg,
+    GstAggregatorPad * pad, GstQuery * query)
+{
+  auto self = GST_D3D12_COMPOSITOR (agg);
+  auto priv = self->priv;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+    {
+      std::lock_guard < std::recursive_mutex > lk (priv->lock);
+      if (gst_d3d12_handle_context_query (GST_ELEMENT (agg), query,
+              self->device)) {
+        return TRUE;
+      }
+      break;
+    }
+    case GST_QUERY_CAPS:{
+      GstCaps *filter, *caps;
+
+      gst_query_parse_caps (query, &filter);
+      caps = gst_d3d12_compositor_sink_getcaps (GST_PAD (pad), filter);
+      gst_query_set_caps_result (query, caps);
+      gst_caps_unref (caps);
+      return TRUE;
+    }
+    case GST_QUERY_ACCEPT_CAPS:{
+      GstCaps *caps;
+      gboolean ret;
+
+      gst_query_parse_accept_caps (query, &caps);
+      ret = gst_d3d12_compositor_sink_acceptcaps (GST_PAD (pad), caps);
+      gst_query_set_accept_caps_result (query, ret);
+      return TRUE;
+    }
+    default:
+      break;
+  }
+
+  return GST_AGGREGATOR_CLASS (parent_class)->sink_query (agg, pad, query);
+}
+
+static gboolean
+gst_d3d12_compositor_src_query (GstAggregator * agg, GstQuery * query)
+{
+  auto self = GST_D3D12_COMPOSITOR (agg);
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      if (gst_d3d12_handle_context_query (GST_ELEMENT (agg), query,
+              self->device)) {
+        return TRUE;
+      }
+      break;
+    default:
+      break;
+  }
+
+  return GST_AGGREGATOR_CLASS (parent_class)->src_query (agg, query);
+}
+
+static GstCaps *
+gst_d3d12_compositor_fixate_src_caps (GstAggregator * agg, GstCaps * caps)
+{
+  auto vagg = GST_VIDEO_AGGREGATOR (agg);
+  GList *l;
+  gint best_width = -1, best_height = -1;
+  gint best_fps_n = -1, best_fps_d = -1;
+  gint par_n, par_d;
+  gdouble best_fps = 0.;
+  GstCaps *ret = nullptr;
+  GstStructure *s;
+
+  ret = gst_caps_make_writable (caps);
+
+  /* we need this to calculate how large to make the output frame */
+  s = gst_caps_get_structure (ret, 0);
+  if (gst_structure_has_field (s, "pixel-aspect-ratio")) {
+    gst_structure_fixate_field_nearest_fraction (s, "pixel-aspect-ratio", 1, 1);
+    gst_structure_get_fraction (s, "pixel-aspect-ratio", &par_n, &par_d);
+  } else {
+    par_n = par_d = 1;
+  }
+
+  GST_OBJECT_LOCK (vagg);
+  for (l = GST_ELEMENT (vagg)->sinkpads; l; l = l->next) {
+    auto vaggpad = GST_VIDEO_AGGREGATOR_PAD (l->data);
+    auto cpad = GST_D3D12_COMPOSITOR_PAD (vaggpad);
+    auto priv = cpad->priv;
+    gint this_width, this_height;
+    gint width, height;
+    gint fps_n, fps_d;
+    gdouble cur_fps;
+    gint x_offset;
+    gint y_offset;
+
+    fps_n = GST_VIDEO_INFO_FPS_N (&vaggpad->info);
+    fps_d = GST_VIDEO_INFO_FPS_D (&vaggpad->info);
+    gst_d3d12_compositor_pad_get_output_size (cpad,
+        par_n, par_d, &width, &height, &x_offset, &y_offset);
+
+    if (width == 0 || height == 0)
+      continue;
+
+    /* {x,y}_offset represent padding size of each top and left area.
+     * To calculate total resolution, count bottom and right padding area
+     * as well here */
+    this_width = width + MAX (priv->xpos + 2 * x_offset, 0);
+    this_height = height + MAX (priv->ypos + 2 * y_offset, 0);
+
+    if (best_width < this_width)
+      best_width = this_width;
+    if (best_height < this_height)
+      best_height = this_height;
+
+    if (fps_d == 0)
+      cur_fps = 0.0;
+    else
+      gst_util_fraction_to_double (fps_n, fps_d, &cur_fps);
+
+    if (best_fps < cur_fps) {
+      best_fps = cur_fps;
+      best_fps_n = fps_n;
+      best_fps_d = fps_d;
+    }
+  }
+  GST_OBJECT_UNLOCK (vagg);
+
+  if (best_fps_n <= 0 || best_fps_d <= 0 || best_fps == 0.0) {
+    best_fps_n = 25;
+    best_fps_d = 1;
+    best_fps = 25.0;
+  }
+
+  if (best_width <= 0 || best_height <= 0) {
+    best_width = 320;
+    best_height = 240;
+  }
+
+  gst_structure_fixate_field_nearest_int (s, "width", best_width);
+  gst_structure_fixate_field_nearest_int (s, "height", best_height);
+  gst_structure_fixate_field_nearest_fraction (s, "framerate", best_fps_n,
+      best_fps_d);
+  ret = gst_caps_fixate (ret);
+
+  GST_LOG_OBJECT (agg, "Fixated caps %" GST_PTR_FORMAT, ret);
+
+  return ret;
+}
+
+static void
+convert_info_gray_to_yuv (const GstVideoInfo * gray, GstVideoInfo * yuv)
+{
+  GstVideoInfo tmp;
+
+  if (GST_VIDEO_INFO_IS_YUV (gray)) {
+    *yuv = *gray;
+    return;
+  }
+
+  if (gray->finfo->depth0 == 8) {
+    gst_video_info_set_format (&tmp,
+        GST_VIDEO_FORMAT_Y444, gray->width, gray->height);
+  } else {
+    gst_video_info_set_format (&tmp,
+        GST_VIDEO_FORMAT_Y444_16LE, gray->width, gray->height);
+  }
+
+  tmp.colorimetry.range = gray->colorimetry.range;
+  if (tmp.colorimetry.range == GST_VIDEO_COLOR_RANGE_UNKNOWN)
+    tmp.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
+
+  tmp.colorimetry.primaries = gray->colorimetry.primaries;
+  if (tmp.colorimetry.primaries == GST_VIDEO_COLOR_PRIMARIES_UNKNOWN)
+    tmp.colorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_BT709;
+
+  tmp.colorimetry.transfer = gray->colorimetry.transfer;
+  if (tmp.colorimetry.transfer == GST_VIDEO_TRANSFER_UNKNOWN)
+    tmp.colorimetry.transfer = GST_VIDEO_TRANSFER_BT709;
+
+  tmp.colorimetry.matrix = gray->colorimetry.matrix;
+  if (tmp.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN)
+    tmp.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
+
+  *yuv = tmp;
+}
+
+static void
+gst_d3d12_compositor_calculate_background_color (GstD3D12Compositor * self,
+    const GstVideoInfo * info)
+{
+  auto priv = self->priv;
+  GstD3D12ColorMatrix clear_color_matrix;
+  gdouble rgb3;
+  gdouble converted3;
+  GstVideoFormat format = GST_VIDEO_INFO_FORMAT (info);
+
+  if (GST_VIDEO_INFO_IS_RGB (info)) {
+    GstVideoInfo rgb_info = *info;
+    rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
+
+    gst_d3d12_color_range_adjust_matrix_unorm (&rgb_info, info,
+        &clear_color_matrix);
+  } else {
+    GstVideoInfo rgb_info;
+    GstVideoInfo yuv_info;
+
+    gst_video_info_set_format (&rgb_info, GST_VIDEO_FORMAT_RGBA64_LE,
+        info->width, info->height);
+    convert_info_gray_to_yuv (info, &yuv_info);
+
+    if (yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN ||
+        yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_RGB) {
+      GST_WARNING_OBJECT (self, "Invalid matrix is detected");
+      yuv_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
+    }
+
+    gst_d3d12_rgb_to_yuv_matrix_unorm (&rgb_info,
+        &yuv_info, &clear_color_matrix);
+  }
+
+  /* Calculate black and white color values */
+  for (guint i = 0; i < 2; i++) {
+    ClearColor *clear_color = &priv->clear_colori;
+    rgb0 = rgb1 = rgb2 = (gdouble) i;
+
+    for (guint j = 0; j < 3; j++) {
+      convertedj = 0;
+      for (guint k = 0; k < 3; k++) {
+        convertedj += clear_color_matrix.matrixjk * rgbk;
+      }
+      convertedj += clear_color_matrix.offsetj;
+      convertedj = CLAMP (convertedj,
+          clear_color_matrix.minj, clear_color_matrix.maxj);
+    }
+
+    GST_DEBUG_OBJECT (self, "Calculated background color RGB: %f, %f, %f",
+        converted0, converted1, converted2);
+
+    if (GST_VIDEO_INFO_IS_RGB (info) || GST_VIDEO_INFO_IS_GRAY (info)) {
+      for (guint j = 0; j < 3; j++)
+        clear_color->color0j = convertedj;
+      clear_color->color03 = 1.0;
+    } else {
+      switch (format) {
+        case GST_VIDEO_FORMAT_VUYA:
+          clear_color->color00 = converted2;
+          clear_color->color01 = converted1;
+          clear_color->color02 = converted0;
+          clear_color->color03 = 1.0;
+          break;
+        case GST_VIDEO_FORMAT_NV12:
+        case GST_VIDEO_FORMAT_NV21:
+        case GST_VIDEO_FORMAT_P010_10LE:
+        case GST_VIDEO_FORMAT_P012_LE:
+        case GST_VIDEO_FORMAT_P016_LE:
+          clear_color->color00 = converted0;
+          clear_color->color01 = 0;
+          clear_color->color02 = 0;
+          clear_color->color03 = 1.0;
+          if (format == GST_VIDEO_FORMAT_NV21) {
+            clear_color->color10 = converted2;
+            clear_color->color11 = converted1;
+          } else {
+            clear_color->color10 = converted1;
+            clear_color->color11 = converted2;
+          }
+          clear_color->color12 = 0;
+          clear_color->color13 = 1.0;
+          break;
+        case GST_VIDEO_FORMAT_I420:
+        case GST_VIDEO_FORMAT_YV12:
+        case GST_VIDEO_FORMAT_I420_10LE:
+        case GST_VIDEO_FORMAT_I420_12LE:
+        case GST_VIDEO_FORMAT_Y42B:
+        case GST_VIDEO_FORMAT_I422_10LE:
+        case GST_VIDEO_FORMAT_I422_12LE:
+        case GST_VIDEO_FORMAT_Y444:
+        case GST_VIDEO_FORMAT_Y444_10LE:
+        case GST_VIDEO_FORMAT_Y444_12LE:
+        case GST_VIDEO_FORMAT_Y444_16LE:
+          clear_color->color00 = converted0;
+          clear_color->color01 = 0;
+          clear_color->color02 = 0;
+          clear_color->color03 = 1.0;
+          if (format == GST_VIDEO_FORMAT_YV12) {
+            clear_color->color10 = converted2;
+            clear_color->color20 = converted1;
+          } else {
+            clear_color->color10 = converted1;
+            clear_color->color20 = converted2;
+          }
+          clear_color->color11 = 0;
+          clear_color->color12 = 0;
+          clear_color->color13 = 1.0;
+          clear_color->color21 = 0;
+          clear_color->color22 = 0;
+          clear_color->color23 = 1.0;
+          break;
+        default:
+          g_assert_not_reached ();
+          break;
+      }
+    }
+  }
+}
+
+static gboolean
+gst_d3d12_compositor_clear_pad_context (GstD3D12Compositor * self,
+    GstD3D12CompositorPad * cpad, gpointer user_data)
+{
+  auto priv = cpad->priv;
+  priv->ctx = nullptr;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_compositor_negotiated_src_caps (GstAggregator * agg, GstCaps * caps)
+{
+  auto self = GST_D3D12_COMPOSITOR (agg);
+  auto priv = self->priv;
+  GstVideoInfo info;
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_ERROR_OBJECT (self, "Failed to convert caps to info");
+    return FALSE;
+  }
+
+  auto features = gst_caps_get_features (caps, 0);
+  if (features
+      && gst_caps_features_contains (features,
+          GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY)) {
+    GST_DEBUG_OBJECT (self, "Negotiated with D3D12 memory caps");
+    priv->downstream_supports_d3d12 = TRUE;
+  } else {
+    GST_DEBUG_OBJECT (self, "Negotiated with system memory caps");
+    priv->downstream_supports_d3d12 = FALSE;
+  }
+
+  if (GST_VIDEO_INFO_FORMAT (&info) !=
+      GST_VIDEO_INFO_FORMAT (&priv->negotiated_info)) {
+    gst_element_foreach_sink_pad (GST_ELEMENT_CAST (self),
+        (GstElementForeachPadFunc) gst_d3d12_compositor_clear_pad_context,
+        nullptr);
+    priv->bg_render = nullptr;
+  }
+  gst_clear_buffer (&priv->fallback_buf);
+
+  priv->negotiated_info = info;
+  gst_d3d12_compositor_calculate_background_color (self, &info);
+
+  if (!priv->bg_render) {
+    auto bg_render = std::make_unique < BackgroundRender > (self->device, info);
+    if (!bg_render->is_valid) {
+      GST_ERROR_OBJECT (self, "Couldn't configure background render object");
+      return FALSE;
+    }
+
+    priv->bg_render = std::move (bg_render);
+  } else {
+    priv->bg_render->viewport.Width = info.width;
+    priv->bg_render->viewport.Height = info.height;
+    priv->bg_render->scissor_rect.right = info.width;
+    priv->bg_render->scissor_rect.bottom = info.height;
+  }
+
+  if (!priv->downstream_supports_d3d12) {
+    auto pool = gst_d3d12_buffer_pool_new (self->device);
+    auto config = gst_buffer_pool_get_config (pool);
+    auto params = gst_d3d12_allocation_params_new (self->device, &info,
+        GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+        D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+    gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+    gst_d3d12_allocation_params_free (params);
+    gst_buffer_pool_config_set_params (config, caps, info.size, 0, 0);
+
+    if (!gst_buffer_pool_set_config (pool, config)) {
+      GST_ERROR_OBJECT (self, "Couldn't set pool config");
+      gst_object_unref (pool);
+      return FALSE;
+    }
+
+    if (!gst_buffer_pool_set_active (pool, TRUE)) {
+      GST_ERROR_OBJECT (self, "Failed to set active");
+      gst_object_unref (pool);
+      return FALSE;
+    }
+
+    gst_buffer_pool_acquire_buffer (pool, &priv->fallback_buf, nullptr);
+    gst_buffer_pool_set_active (pool, FALSE);
+    gst_object_unref (pool);
+
+    if (!priv->fallback_buf) {
+      GST_ERROR_OBJECT (self, "Couldn't acquire fallback buf");
+      return FALSE;
+    }
+  }
+
+  return GST_AGGREGATOR_CLASS (parent_class)->negotiated_src_caps (agg, caps);
+}
+
+static gboolean
+gst_d3d12_compositor_propose_allocation (GstAggregator * agg,
+    GstAggregatorPad * pad, GstQuery * decide_query, GstQuery * query)
+{
+  auto self = GST_D3D12_COMPOSITOR (agg);
+  GstVideoInfo info;
+  GstBufferPool *pool;
+  GstCaps *caps;
+  gboolean is_d3d12 = FALSE;
+  guint size;
+
+  gst_query_parse_allocation (query, &caps, nullptr);
+
+  if (!caps)
+    return FALSE;
+
+  if (!gst_video_info_from_caps (&info, caps))
+    return FALSE;
+
+  auto features = gst_caps_get_features (caps, 0);
+  if (gst_caps_features_contains (features,
+          GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY)) {
+    GST_DEBUG_OBJECT (pad, "Upstream support d3d12 memory");
+    is_d3d12 = TRUE;
+  }
+
+  if (gst_query_get_n_allocation_pools (query) == 0) {
+    if (is_d3d12)
+      pool = gst_d3d12_buffer_pool_new (self->device);
+    else
+      pool = gst_video_buffer_pool_new ();
+
+    if (!pool) {
+      GST_ERROR_OBJECT (self, "Failed to create buffer pool");
+      return FALSE;
+    }
+
+    auto config = gst_buffer_pool_get_config (pool);
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+    size = GST_VIDEO_INFO_SIZE (&info);
+    if (is_d3d12) {
+      auto params = gst_d3d12_allocation_params_new (self->device,
+          &info, GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+          D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
+          D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+
+      gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+      gst_d3d12_allocation_params_free (params);
+    } else {
+      gst_buffer_pool_config_add_option (config,
+          GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+    }
+
+    gst_buffer_pool_config_set_params (config, caps, (guint) size, 0, 0);
+
+    if (!gst_buffer_pool_set_config (pool, config)) {
+      GST_ERROR_OBJECT (pool, "Couldn't set config");
+      gst_object_unref (pool);
+
+      return FALSE;
+    }
+
+    /* d3d12 buffer pool will update buffer size based on allocated texture,
+     * get size from config again */
+    config = gst_buffer_pool_get_config (pool);
+    gst_buffer_pool_config_get_params (config,
+        nullptr, &size, nullptr, nullptr);
+    gst_structure_free (config);
+
+    gst_query_add_allocation_pool (query, pool, size, 0, 0);
+    gst_object_unref (pool);
+  }
+
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, nullptr);
+  if (is_d3d12) {
+    gst_query_add_allocation_meta (query, GST_VIDEO_CROP_META_API_TYPE,
+        nullptr);
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_compositor_decide_allocation (GstAggregator * agg, GstQuery * query)
+{
+  auto self = GST_D3D12_COMPOSITOR (agg);
+  auto priv = self->priv;
+  GstCaps *caps;
+  GstBufferPool *pool = nullptr;
+  guint n, size, min, max;
+  GstVideoInfo info;
+  gboolean use_d3d12_pool;
+
+  gst_query_parse_allocation (query, &caps, nullptr);
+
+  if (!caps) {
+    GST_DEBUG_OBJECT (self, "No output caps");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_ERROR_OBJECT (self, "Invalid caps");
+    return FALSE;
+  }
+
+  use_d3d12_pool = priv->downstream_supports_d3d12;
+
+  n = gst_query_get_n_allocation_pools (query);
+  if (n > 0)
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+
+  /* create our own pool */
+  if (pool && use_d3d12_pool) {
+    if (!GST_IS_D3D12_BUFFER_POOL (pool)) {
+      GST_DEBUG_OBJECT (self,
+          "Downstream pool is not d3d12, will create new one");
+      gst_clear_object (&pool);
+    } else {
+      GstD3D12BufferPool *dpool = GST_D3D12_BUFFER_POOL (pool);
+      if (dpool->device != self->device) {
+        GST_DEBUG_OBJECT (self, "Different device, will create new one");
+        gst_clear_object (&pool);
+      }
+    }
+  }
+
+  size = (guint) info.size;
+
+  if (!pool) {
+    if (use_d3d12_pool)
+      pool = gst_d3d12_buffer_pool_new (self->device);
+    else
+      pool = gst_video_buffer_pool_new ();
+
+    min = 0;
+    max = 0;
+  }
+
+  auto config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_set_params (config, caps, size, min, max);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+  if (use_d3d12_pool) {
+    auto params = gst_buffer_pool_config_get_d3d12_allocation_params (config);
+    if (!params) {
+      params = gst_d3d12_allocation_params_new (self->device, &info,
+          GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+          D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
+          D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+    } else {
+      gst_d3d12_allocation_params_set_resource_flags (params,
+          D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
+          D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+    }
+
+    gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+    gst_d3d12_allocation_params_free (params);
+  }
+
+  gst_buffer_pool_set_config (pool, config);
+
+  /* d3d12 buffer pool will update buffer size based on allocated texture,
+   * get size from config again */
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  if (n > 0)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_compositor_draw_background (GstD3D12Compositor * self)
+{
+  auto priv = self->priv;
+  ClearColor *color = &priv->clear_color0;
+  auto bg_render = priv->bg_render.get ();
+  auto & rtv_handles = priv->rtv_handles;
+  std::vector < D3D12_RECT > rtv_rects;
+
+  rtv_handles.clear ();
+  for (guint i = 0; i < gst_buffer_n_memory (priv->generated_output_buf); i++) {
+    auto mem = (GstD3D12Memory *)
+        gst_buffer_peek_memory (priv->generated_output_buf, i);
+    auto num_planes = gst_d3d12_memory_get_plane_count (mem);
+    ComPtr < ID3D12DescriptorHeap > rtv_heap;
+
+    if (!gst_d3d12_memory_get_render_target_view_heap (mem, &rtv_heap)) {
+      GST_ERROR_OBJECT (self, "Couldn't get rtv heap");
+      return FALSE;
+    }
+
+    auto cpu_handle =
+        CD3DX12_CPU_DESCRIPTOR_HANDLE
+        (rtv_heap->GetCPUDescriptorHandleForHeapStart ());
+
+    for (guint plane = 0; plane < num_planes; plane++) {
+      D3D12_RECT rect = { };
+      gst_d3d12_memory_get_plane_rectangle (mem, plane, &rect);
+      rtv_rects.push_back (rect);
+      rtv_handles.push_back (cpu_handle);
+      cpu_handle.Offset (bg_render->rtv_inc_size);
+    }
+  }
+
+  GstD3D12CommandAllocator *gst_ca;
+  if (!gst_d3d12_command_allocator_pool_acquire (bg_render->ca_pool, &gst_ca)) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire command allocator");
+    return FALSE;
+  }
+
+  GstD3D12FenceData *fence_data;
+  gst_d3d12_fence_data_pool_acquire (priv->fence_data_pool, &fence_data);
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, gst_ca);
+
+  ComPtr < ID3D12CommandAllocator > ca;
+  gst_d3d12_command_allocator_get_handle (gst_ca, &ca);
+
+  auto hr = ca->Reset ();
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't reset command allocator");
+    gst_d3d12_fence_data_unref (fence_data);
+    return FALSE;
+  }
+
+  if (!bg_render->cl) {
+    auto device = gst_d3d12_device_get_device_handle (self->device);
+    hr = device->CreateCommandList (0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        ca.Get (), bg_render->pso.Get (), IID_PPV_ARGS (&bg_render->cl));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create command list");
+      gst_d3d12_fence_data_unref (fence_data);
+      return FALSE;
+    }
+  } else {
+    hr = bg_render->cl->Reset (ca.Get (), bg_render->pso.Get ());
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't reset command list");
+      gst_d3d12_fence_data_unref (fence_data);
+      return FALSE;
+    }
+  }
+
+  auto cl = bg_render->cl;
+  if (bg_render->vertex_index_upload) {
+    cl->CopyResource (bg_render->vertex_index_buf.Get (),
+        bg_render->vertex_index_upload.Get ());
+    D3D12_RESOURCE_BARRIER barrier =
+        CD3DX12_RESOURCE_BARRIER::Transition (bg_render->
+        vertex_index_buf.Get (),
+        D3D12_RESOURCE_STATE_COPY_DEST,
+        D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER |
+        D3D12_RESOURCE_STATE_INDEX_BUFFER);
+    cl->ResourceBarrier (1, &barrier);
+  }
+
+  if (priv->background == GST_D3D12_COMPOSITOR_BACKGROUND_CHECKER) {
+    cl->SetGraphicsRootSignature (bg_render->rs.Get ());
+    cl->IASetPrimitiveTopology (D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+    cl->IASetIndexBuffer (&bg_render->ibv);
+    cl->IASetVertexBuffers (0, 1, &bg_render->vbv);
+    cl->RSSetViewports (1, &bg_render->viewport);
+    cl->RSSetScissorRects (1, &bg_render->scissor_rect);
+    cl->OMSetRenderTargets (1, rtv_handles.data (), FALSE, nullptr);
+    cl->DrawIndexedInstanced (6, 1, 0, 0, 0);
+
+    /* clear U and V components if needed */
+    for (size_t i = 1; i < rtv_handles.size (); i++) {
+      cl->ClearRenderTargetView (rtv_handlesi, color->colori, 1,
+          &rtv_rectsi);
+    }
+  } else {
+    switch (priv->background) {
+      case GST_D3D12_COMPOSITOR_BACKGROUND_BLACK:
+        color = &priv->clear_color0;
+        break;
+      case GST_D3D12_COMPOSITOR_BACKGROUND_WHITE:
+        color = &priv->clear_color1;
+        break;
+      case GST_D3D12_COMPOSITOR_BACKGROUND_TRANSPARENT:
+        color = &priv->clear_color2;
+        break;
+      default:
+        g_assert_not_reached ();
+        return FALSE;
+    }
+
+    for (size_t i = 0; i < priv->rtv_handles.size (); i++) {
+      cl->ClearRenderTargetView (rtv_handlesi, color->colori, 1,
+          &rtv_rectsi);
+    }
+  }
+
+  hr = cl->Close ();
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't close command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    return FALSE;
+  }
+
+  ID3D12CommandList *cmd_list = { cl.Get () };
+
+  if (!gst_d3d12_device_execute_command_lists (self->device,
+          D3D12_COMMAND_LIST_TYPE_DIRECT, 1, cmd_list,
+          &priv->bg_render->fence_val)) {
+    GST_ERROR_OBJECT (self, "Couldn't execute command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    return FALSE;
+  }
+
+  gst_d3d12_buffer_after_write (priv->generated_output_buf,
+      bg_render->fence_val);
+
+  if (bg_render->vertex_index_upload) {
+    gst_d3d12_fence_data_add_notify_com (fence_data,
+        bg_render->vertex_index_upload.Detach ());
+  }
+
+  gst_d3d12_device_set_fence_notify (self->device,
+      D3D12_COMMAND_LIST_TYPE_DIRECT, priv->bg_render->fence_val, fence_data);
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_d3d12_compositor_aggregate_frames (GstVideoAggregator * vagg,
+    GstBuffer * outbuf)
+{
+  auto self = GST_D3D12_COMPOSITOR (vagg);
+  auto priv = self->priv;
+  GList *iter;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  GST_LOG_OBJECT (self, "aggregate");
+
+  if (!priv->generated_output_buf) {
+    GST_ERROR_OBJECT (self, "No generated output buffer");
+    return GST_FLOW_ERROR;
+  }
+
+  auto completed = gst_d3d12_device_get_completed_value (self->device,
+      D3D12_COMMAND_LIST_TYPE_DIRECT);
+  while (!priv->scheduled.empty ()) {
+    if (priv->scheduled.front () > completed)
+      break;
+
+    priv->scheduled.pop ();
+  }
+
+  /* avoid too large buffering */
+  if (priv->scheduled.size () > 2) {
+    auto fence_to_wait = priv->scheduled.front ();
+    priv->scheduled.pop ();
+    GST_LOG_OBJECT (self, "Waiting for previous command, %" G_GUINT64_FORMAT,
+        fence_to_wait);
+    gst_d3d12_device_fence_wait (self->device,
+        D3D12_COMMAND_LIST_TYPE_DIRECT, fence_to_wait,
+        priv->bg_render->event_handle);
+  }
+
+  if (!gst_d3d12_compositor_draw_background (self)) {
+    GST_ERROR_OBJECT (self, "Couldn't draw background");
+    return GST_FLOW_ERROR;
+  }
+
+  guint64 fence_val = priv->bg_render->fence_val;
+  GST_OBJECT_LOCK (self);
+  for (iter = GST_ELEMENT (vagg)->sinkpads; iter; iter = g_list_next (iter)) {
+    auto pad = GST_VIDEO_AGGREGATOR_PAD (iter->data);
+    auto cpad = GST_D3D12_COMPOSITOR_PAD (pad);
+    auto pad_priv = cpad->priv;
+
+    /* Might be a case where pad was added between prepare_frame() and
+     * aggregate_frames() */
+    if (!pad_priv->prepare_rst.valid ()) {
+      GST_DEBUG_OBJECT (pad, "Ignoring non-prepared pad");
+      continue;
+    }
+
+    GST_LOG_OBJECT (cpad, "Waiting for command list building thread");
+    auto prepare_ret = pad_priv->prepare_rst.get ();
+    if (!prepare_ret) {
+      GST_ERROR_OBJECT (pad, "Couldn't build command list");
+      ret = GST_FLOW_ERROR;
+      break;
+    }
+
+    if (!gst_video_aggregator_pad_get_prepared_frame (pad))
+      continue;
+
+    GST_LOG_OBJECT (cpad, "Command list prepared");
+
+    ID3D12CommandList *cmd_list = { pad_priv->ctx->cl.Get () };
+    if (!gst_d3d12_device_execute_command_lists (self->device,
+            D3D12_COMMAND_LIST_TYPE_DIRECT, 1, cmd_list,
+            &pad_priv->ctx->fence_val)) {
+      GST_ERROR_OBJECT (self, "Couldn't execute command list");
+      ret = GST_FLOW_ERROR;
+      break;
+    }
+
+    fence_val = pad_priv->ctx->fence_val;
+    gst_d3d12_buffer_after_write (priv->generated_output_buf, fence_val);
+  }
+  GST_OBJECT_UNLOCK (self);
+
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  priv->scheduled.push (fence_val);
+  if (priv->generated_output_buf != outbuf) {
+    GstVideoFrame out_frame, in_frame;
+    if (!gst_video_frame_map (&in_frame, &vagg->info,
+            priv->generated_output_buf, GST_MAP_READ)) {
+      GST_ERROR_OBJECT (self, "Couldn't map generated buffer");
+      return GST_FLOW_ERROR;
+    }
+
+    if (!gst_video_frame_map (&out_frame, &vagg->info, outbuf, GST_MAP_WRITE)) {
+      GST_ERROR_OBJECT (self, "Couldn't map output buffer");
+      gst_video_frame_unmap (&in_frame);
+      return GST_FLOW_ERROR;
+    }
+
+    auto copy_ret = gst_video_frame_copy (&out_frame, &in_frame);
+    gst_video_frame_unmap (&out_frame);
+    gst_video_frame_unmap (&in_frame);
+    if (!copy_ret) {
+      GST_ERROR_OBJECT (self, "Couldn't copy frame");
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  return GST_FLOW_OK;
+}
+
+struct DeviceCheckData
+{
+  /* without holding ref */
+  GstD3D12Device *other_device = nullptr;
+  gboolean have_same_device = FALSE;
+};
+
+static gboolean
+gst_d3d12_compositor_check_device_update (GstElement * agg,
+    GstVideoAggregatorPad * vpad, DeviceCheckData * data)
+{
+  auto self = GST_D3D12_COMPOSITOR (agg);
+  GstBuffer *buf;
+  GstMemory *mem;
+  GstD3D12Memory *dmem;
+
+  buf = gst_video_aggregator_pad_get_current_buffer (vpad);
+  if (!buf)
+    return TRUE;
+
+  /* Ignore gap buffer */
+  if (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP) ||
+      gst_buffer_get_size (buf) == 0) {
+    return TRUE;
+  }
+
+  mem = gst_buffer_peek_memory (buf, 0);
+  if (!gst_is_d3d12_memory (mem))
+    return TRUE;
+
+  dmem = GST_D3D12_MEMORY_CAST (mem);
+
+  /* We can use existing device */
+  if (dmem->device == self->device) {
+    data->have_same_device = TRUE;
+    return FALSE;
+  }
+
+  data->other_device = dmem->device;
+
+  /* Keep iterate since there might be one buffer which holds the same device
+   * as ours */
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_d3d12_compositor_create_output_buffer (GstVideoAggregator * vagg,
+    GstBuffer ** outbuffer)
+{
+  auto self = GST_D3D12_COMPOSITOR (vagg);
+  auto priv = self->priv;
+  DeviceCheckData data;
+
+  /* Check whether there is at least one sinkpad which holds d3d12 buffer
+   * with compatible device, and if not, update our device */
+  data.other_device = nullptr;
+  data.have_same_device = FALSE;
+
+  gst_element_foreach_sink_pad (GST_ELEMENT_CAST (vagg),
+      (GstElementForeachPadFunc) gst_d3d12_compositor_check_device_update,
+      &data);
+
+  priv->generated_output_buf = nullptr;
+  if (data.have_same_device || !data.other_device) {
+    GstBuffer *buf = nullptr;
+    auto ret =
+        GST_VIDEO_AGGREGATOR_CLASS (parent_class)->create_output_buffer (vagg,
+        &buf);
+    if (ret != GST_FLOW_OK)
+      return ret;
+
+    if (priv->downstream_supports_d3d12)
+      priv->generated_output_buf = buf;
+    else
+      priv->generated_output_buf = priv->fallback_buf;
+
+    *outbuffer = buf;
+    return GST_FLOW_OK;
+  }
+
+  /* Clear all device dependent resources */
+  gst_element_foreach_sink_pad (GST_ELEMENT_CAST (vagg),
+      (GstElementForeachPadFunc) gst_d3d12_compositor_clear_pad_context,
+      nullptr);
+
+  gst_clear_buffer (&priv->fallback_buf);
+  priv->bg_render = nullptr;
+  priv->scheduled = { };
+
+  GST_INFO_OBJECT (self, "Updating device %" GST_PTR_FORMAT " -> %"
+      GST_PTR_FORMAT, self->device, data.other_device);
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    gst_object_unref (self->device);
+    self->device = (GstD3D12Device *) gst_object_ref (data.other_device);
+  }
+
+  /* We cannot call gst_aggregator_negotiate() here, since GstVideoAggregator
+   * is holding GST_VIDEO_AGGREGATOR_LOCK() already.
+   * Mark reconfigure and do reconfigure later */
+  gst_pad_mark_reconfigure (GST_AGGREGATOR_SRC_PAD (vagg));
+
+  return GST_AGGREGATOR_FLOW_NEED_DATA;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12compositor.h Added

@@ -0,0 +1,38 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/video/gstvideoaggregator.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_COMPOSITOR_PAD (gst_d3d12_compositor_pad_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12CompositorPad, gst_d3d12_compositor_pad,
+    GST, D3D12_COMPOSITOR_PAD, GstVideoAggregatorPad)
+
+#define GST_TYPE_D3D12_COMPOSITOR (gst_d3d12_compositor_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12Compositor, gst_d3d12_compositor,
+    GST, D3D12_COMPOSITOR, GstVideoAggregator)
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12convert.cpp Added

@@ -0,0 +1,2125 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12convert.h"
+#include "gstd3d12pluginutils.h"
+#include <directx/d3dx12.h>
+#include <mutex>
+#include <memory>
+#include <queue>
+#include <wrl.h>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_convert_debug);
+#define GST_CAT_DEFAULT gst_d3d12_convert_debug
+
+static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS)));
+
+static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS)));
+
+enum
+{
+  PROP_0,
+  PROP_SAMPLING_METHOD,
+  PROP_ADD_BORDERS,
+  PROP_BORDER_COLOR,
+  PROP_VIDEO_DIRECTION,
+  PROP_GAMMA_MODE,
+  PROP_PRIMARIES_MODE,
+};
+
+#define DEFAULT_ADD_BORDERS TRUE
+#define DEFAULT_BORDER_COLOR G_GUINT64_CONSTANT(0xffff000000000000)
+#define DEFAULT_GAMMA_MODE GST_VIDEO_GAMMA_MODE_NONE
+#define DEFAULT_PRIMARIES_MODE GST_VIDEO_PRIMARIES_MODE_NONE
+#define DEFAULT_SAMPLING_METHOD GST_D3D12_SAMPLING_METHOD_BILINEAR
+
+#define ASYNC_DEPTH 2
+
+/* *INDENT-OFF* */
+struct ConvertContext
+{
+  ConvertContext (GstD3D12Device * dev)
+  {
+    event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+    device = (GstD3D12Device *) gst_object_ref (dev);
+    ca_pool = gst_d3d12_command_allocator_pool_new (device,
+        D3D12_COMMAND_LIST_TYPE_DIRECT);
+  }
+
+   ~ConvertContext ()
+  {
+    gst_d3d12_device_fence_wait (device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        fence_val, event_handle);
+
+    CloseHandle (event_handle);
+    gst_clear_object (&ca_pool);
+    gst_clear_object (&conv);
+    gst_clear_object (&device);
+  }
+
+  GstD3D12Device *device = nullptr;
+  GstD3D12Converter *conv = nullptr;
+  ComPtr<ID3D12GraphicsCommandList> cl;
+  std::queue<guint64> scheduled;
+  GstD3D12CommandAllocatorPool *ca_pool;
+  HANDLE event_handle;
+  guint64 fence_val = 0;
+};
+
+struct GstD3D12ConvertPrivate
+{
+  GstD3D12ConvertPrivate ()
+  {
+    fence_data_pool = gst_d3d12_fence_data_pool_new ();
+  }
+
+  ~GstD3D12ConvertPrivate ()
+  {
+    gst_clear_object (&fence_data_pool);
+  }
+
+  std::unique_ptr < ConvertContext > ctx;
+  gboolean same_caps = FALSE;
+  gboolean downstream_supports_crop_meta = FALSE;
+  GstD3D12FenceDataPool *fence_data_pool;
+
+  /* used for border rendering */
+  D3D12_BOX in_rect = { };
+  D3D12_BOX prev_in_rect = { };
+  D3D12_BOX out_rect = { };
+
+  gint borders_h = 0;
+  gint borders_w = 0;
+
+  gboolean add_borders = DEFAULT_ADD_BORDERS;
+  gboolean active_add_borders = DEFAULT_ADD_BORDERS;
+
+  guint64 border_color = DEFAULT_BORDER_COLOR;
+
+  GstVideoGammaMode gamma_mode = DEFAULT_GAMMA_MODE;
+  GstVideoGammaMode active_gamma_mode = DEFAULT_GAMMA_MODE;
+
+  GstVideoPrimariesMode primaries_mode = DEFAULT_PRIMARIES_MODE;
+  GstVideoPrimariesMode active_primaries_mode = DEFAULT_PRIMARIES_MODE;
+
+  /* sampling method, configured via property */
+  GstD3D12SamplingMethod sampling_method = DEFAULT_SAMPLING_METHOD;
+  GstD3D12SamplingMethod active_sampling_method = DEFAULT_SAMPLING_METHOD;
+
+  /* orientation */
+  /* method configured via property */
+  GstVideoOrientationMethod method = GST_VIDEO_ORIENTATION_IDENTITY;
+  /* method parsed from tag */
+  GstVideoOrientationMethod tag_method = GST_VIDEO_ORIENTATION_IDENTITY;
+  /* method currently selected based on "method" and "tag_method" */
+  GstVideoOrientationMethod selected_method = GST_VIDEO_ORIENTATION_IDENTITY;
+  /* method previously selected and used for negotiation */
+  GstVideoOrientationMethod active_method = GST_VIDEO_ORIENTATION_IDENTITY;
+
+  std::mutex lock;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12Convert
+{
+  GstD3D12BaseFilter parent;
+
+  GstD3D12ConvertPrivate *priv;
+};
+
+static void gst_d3d12_convert_finalize (GObject * object);
+static void gst_d3d12_convert_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_d3d12_convert_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+static gboolean gst_d3d12_convert_stop (GstBaseTransform * trans);
+static GstCaps *gst_d3d12_convert_transform_caps (GstBaseTransform *
+    trans, GstPadDirection direction, GstCaps * caps, GstCaps * filter);
+static GstCaps *gst_d3d12_convert_fixate_caps (GstBaseTransform *
+    base, GstPadDirection direction, GstCaps * caps, GstCaps * othercaps);
+static gboolean gst_d3d12_convert_propose_allocation (GstBaseTransform * trans,
+    GstQuery * decide_query, GstQuery * query);
+static gboolean gst_d3d12_convert_decide_allocation (GstBaseTransform * trans,
+    GstQuery * query);
+static gboolean gst_d3d12_convert_sink_event (GstBaseTransform * trans,
+    GstEvent * event);
+static GstFlowReturn
+gst_d3d12_convert_generate_output (GstBaseTransform * trans,
+    GstBuffer ** buffer);
+static gboolean gst_d3d12_convert_transform_meta (GstBaseTransform * trans,
+    GstBuffer * outbuf, GstMeta * meta, GstBuffer * inbuf);
+static void gst_d3d12_convert_before_transform (GstBaseTransform * trans,
+    GstBuffer * buffer);
+static GstFlowReturn gst_d3d12_convert_transform (GstBaseTransform * trans,
+    GstBuffer * inbuf, GstBuffer * outbuf);
+static gboolean gst_d3d12_convert_set_info (GstD3D12BaseFilter * filter,
+    GstCaps * incaps, GstVideoInfo * in_info, GstCaps * outcaps,
+    GstVideoInfo * out_info);
+
+static void
+gst_d3d12_convert_video_direction_interface_init (GstVideoDirectionInterface *
+    iface)
+{
+}
+
+#define gst_d3d12_convert_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstD3D12Convert, gst_d3d12_convert,
+    GST_TYPE_D3D12_BASE_FILTER,
+    G_IMPLEMENT_INTERFACE (GST_TYPE_VIDEO_DIRECTION,
+        gst_d3d12_convert_video_direction_interface_init));
+
+static void
+gst_d3d12_convert_class_init (GstD3D12ConvertClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto element_class = GST_ELEMENT_CLASS (klass);
+  auto trans_class = GST_BASE_TRANSFORM_CLASS (klass);
+  auto filter_class = GST_D3D12_BASE_FILTER_CLASS (klass);
+
+  object_class->set_property = gst_d3d12_convert_set_property;
+  object_class->get_property = gst_d3d12_convert_get_property;
+  object_class->finalize = gst_d3d12_convert_finalize;
+
+  g_object_class_install_property (object_class, PROP_SAMPLING_METHOD,
+      g_param_spec_enum ("method", "Method",
+          "Method used for sampling",
+          GST_TYPE_D3D12_SAMPLING_METHOD, DEFAULT_SAMPLING_METHOD,
+          (GParamFlags) (GST_PARAM_MUTABLE_PLAYING | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_ADD_BORDERS,
+      g_param_spec_boolean ("add-borders", "Add Borders",
+          "Add black borders if necessary to keep the display aspect ratio",
+          DEFAULT_ADD_BORDERS, (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_BORDER_COLOR,
+      g_param_spec_uint64 ("border-color", "Border color",
+          "Border color to use in ARGB64 format", 0, G_MAXUINT64,
+          DEFAULT_BORDER_COLOR, (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_override_property (object_class, PROP_VIDEO_DIRECTION,
+      "video-direction");
+
+  g_object_class_install_property (object_class, PROP_GAMMA_MODE,
+      g_param_spec_enum ("gamma-mode", "Gamma mode",
+          "Gamma conversion mode", GST_TYPE_VIDEO_GAMMA_MODE,
+          DEFAULT_GAMMA_MODE, (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_PRIMARIES_MODE,
+      g_param_spec_enum ("primaries-mode", "Primaries Mode",
+          "Primaries conversion mode", GST_TYPE_VIDEO_PRIMARIES_MODE,
+          DEFAULT_PRIMARIES_MODE, (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
+              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  gst_element_class_add_static_pad_template (element_class, &sink_template);
+  gst_element_class_add_static_pad_template (element_class, &src_template);
+
+  gst_element_class_set_static_metadata (element_class,
+      "Direct3D12 Converter",
+      "Filter/Converter/Scaler/Effect/Video/Hardware",
+      "Performs resizing, colorspace conversion, cropping and flipping/rotating using Direct3D12",
+      "Seungha Yang <seungha@centricular.com>");
+
+  trans_class->passthrough_on_same_caps = FALSE;
+
+  trans_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_convert_stop);
+  trans_class->transform_caps =
+      GST_DEBUG_FUNCPTR (gst_d3d12_convert_transform_caps);
+  trans_class->fixate_caps = GST_DEBUG_FUNCPTR (gst_d3d12_convert_fixate_caps);
+  trans_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_convert_propose_allocation);
+  trans_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_convert_decide_allocation);
+  trans_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d12_convert_sink_event);
+  trans_class->generate_output =
+      GST_DEBUG_FUNCPTR (gst_d3d12_convert_generate_output);
+  trans_class->transform_meta =
+      GST_DEBUG_FUNCPTR (gst_d3d12_convert_transform_meta);
+  trans_class->before_transform =
+      GST_DEBUG_FUNCPTR (gst_d3d12_convert_before_transform);
+  trans_class->transform = GST_DEBUG_FUNCPTR (gst_d3d12_convert_transform);
+
+  filter_class->set_info = GST_DEBUG_FUNCPTR (gst_d3d12_convert_set_info);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_SAMPLING_METHOD,
+      (GstPluginAPIFlags) 0);
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_convert_debug, "d3d12convert", 0,
+      "d3d12convert");
+}
+
+static void
+gst_d3d12_convert_init (GstD3D12Convert * self)
+{
+  self->priv = new GstD3D12ConvertPrivate ();
+}
+
+static void
+gst_d3d12_convert_finalize (GObject * object)
+{
+  auto self = GST_D3D12_CONVERT (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_convert_set_sampling_method (GstD3D12Convert * self,
+    GstD3D12SamplingMethod method)
+{
+  auto priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  GST_DEBUG_OBJECT (self,
+      "Sampling method %d -> %d", priv->sampling_method, method);
+
+  priv->sampling_method = method;
+  if (priv->sampling_method != priv->active_sampling_method)
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+}
+
+static void
+gst_d3d12_convert_set_add_border (GstD3D12Convert * self, gboolean add_border)
+{
+  auto priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  priv->add_borders = add_border;
+  if (priv->add_borders != priv->active_add_borders)
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
+}
+
+static void
+gst_d3d12_convert_set_border_color (GstD3D12Convert * self,
+    guint64 border_color)
+{
+  auto priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  priv->border_color = border_color;
+  if (priv->ctx)
+    g_object_set (priv->ctx->conv, "border-color", priv->border_color, nullptr);
+}
+
+static void
+gst_d3d12_convert_set_orientation (GstD3D12Convert * self,
+    GstVideoOrientationMethod method, gboolean from_tag)
+{
+  if (method == GST_VIDEO_ORIENTATION_CUSTOM) {
+    GST_WARNING_OBJECT (self, "Unsupported custom orientation");
+    return;
+  }
+
+  auto priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  if (from_tag)
+    priv->tag_method = method;
+  else
+    priv->method = method;
+
+  if (priv->method == GST_VIDEO_ORIENTATION_AUTO) {
+    priv->selected_method = priv->tag_method;
+  } else {
+    priv->selected_method = priv->method;
+  }
+
+  if (priv->selected_method != priv->active_method) {
+    GST_DEBUG_OBJECT (self, "Rotation orientation %d -> %d",
+        priv->active_method, priv->selected_method);
+
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM (self));
+  }
+}
+
+static void
+gst_d3d12_convert_set_gamma_mode (GstD3D12Convert * self,
+    GstVideoGammaMode mode)
+{
+  auto priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  GstVideoGammaMode prev_mode = priv->gamma_mode;
+  priv->gamma_mode = mode;
+
+  if (priv->gamma_mode != priv->active_gamma_mode) {
+    GST_DEBUG_OBJECT (self, "Gamma mode %d -> %d", prev_mode, priv->gamma_mode);
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM (self));
+  }
+}
+
+static void
+gst_d3d12_convert_set_primaries_mode (GstD3D12Convert * self,
+    GstVideoPrimariesMode mode)
+{
+  auto priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  GstVideoPrimariesMode prev_mode = priv->primaries_mode;
+  priv->primaries_mode = mode;
+
+  if (priv->primaries_mode != priv->active_primaries_mode) {
+    gboolean prev_enabled = TRUE;
+    gboolean new_enabled = TRUE;
+
+    GST_DEBUG_OBJECT (self, "Primaries mode %d -> %d",
+        prev_mode, priv->primaries_mode);
+
+    if (prev_mode == GST_VIDEO_PRIMARIES_MODE_NONE)
+      prev_enabled = FALSE;
+
+    if (priv->primaries_mode == GST_VIDEO_PRIMARIES_MODE_NONE)
+      new_enabled = FALSE;
+
+    if (prev_enabled != new_enabled)
+      gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM (self));
+    else
+      priv->active_primaries_mode = priv->primaries_mode;
+  }
+}
+
+static void
+gst_d3d12_convert_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_CONVERT (object);
+
+  switch (prop_id) {
+    case PROP_SAMPLING_METHOD:
+      gst_d3d12_convert_set_sampling_method (self,
+          (GstD3D12SamplingMethod) g_value_get_enum (value));
+      break;
+    case PROP_ADD_BORDERS:
+      gst_d3d12_convert_set_add_border (self, g_value_get_boolean (value));
+      break;
+    case PROP_BORDER_COLOR:
+      gst_d3d12_convert_set_border_color (self, g_value_get_uint64 (value));
+      break;
+    case PROP_VIDEO_DIRECTION:
+      gst_d3d12_convert_set_orientation (self,
+          (GstVideoOrientationMethod) g_value_get_enum (value), FALSE);
+      break;
+    case PROP_GAMMA_MODE:
+      gst_d3d12_convert_set_gamma_mode (self,
+          (GstVideoGammaMode) g_value_get_enum (value));
+      break;
+    case PROP_PRIMARIES_MODE:
+      gst_d3d12_convert_set_primaries_mode (self,
+          (GstVideoPrimariesMode) g_value_get_enum (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_convert_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_CONVERT (object);
+  auto priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  switch (prop_id) {
+    case PROP_SAMPLING_METHOD:
+      g_value_set_enum (value, priv->sampling_method);
+      break;
+    case PROP_ADD_BORDERS:
+      g_value_set_boolean (value, priv->add_borders);
+      break;
+    case PROP_BORDER_COLOR:
+      g_value_set_uint64 (value, priv->border_color);
+      break;
+    case PROP_VIDEO_DIRECTION:
+      g_value_set_enum (value, priv->method);
+      break;
+    case PROP_GAMMA_MODE:
+      g_value_set_enum (value, priv->gamma_mode);
+      break;
+    case PROP_PRIMARIES_MODE:
+      g_value_set_enum (value, priv->primaries_mode);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static gboolean
+gst_d3d12_convert_stop (GstBaseTransform * trans)
+{
+  auto self = GST_D3D12_CONVERT (trans);
+  auto priv = self->priv;
+
+  priv->ctx = nullptr;
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->stop (trans);
+}
+
+/* copies the given caps */
+static GstCaps *
+gst_d3d12_convert_caps_remove_format_info (GstCaps * caps)
+{
+  GstStructure *st;
+  GstCapsFeatures *f;
+  gint i, n;
+  GstCaps *res;
+  GstCapsFeatures *feature =
+      gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY);
+
+  res = gst_caps_new_empty ();
+
+  n = gst_caps_get_size (caps);
+  for (i = 0; i < n; i++) {
+    st = gst_caps_get_structure (caps, i);
+    f = gst_caps_get_features (caps, i);
+
+    /* If this is already expressed by the existing caps
+     * skip this structure */
+    if (i > 0 && gst_caps_is_subset_structure_full (res, st, f))
+      continue;
+
+    st = gst_structure_copy (st);
+    /* Only remove format info for the cases when we can actually convert */
+    if (!gst_caps_features_is_any (f)
+        && gst_caps_features_is_equal (f, feature)) {
+      gst_structure_remove_fields (st, "format", "colorimetry", "chroma-site",
+          nullptr);
+    }
+
+    gst_caps_append_structure_full (res, st, gst_caps_features_copy (f));
+  }
+  gst_caps_features_free (feature);
+
+  return res;
+}
+
+static GstCaps *
+gst_d3d12_convert_caps_rangify_size_info (GstCaps * caps)
+{
+  GstStructure *st;
+  GstCapsFeatures *f;
+  gint i, n;
+  GstCaps *res;
+  GstCapsFeatures *feature =
+      gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY);
+
+  res = gst_caps_new_empty ();
+
+  n = gst_caps_get_size (caps);
+  for (i = 0; i < n; i++) {
+    st = gst_caps_get_structure (caps, i);
+    f = gst_caps_get_features (caps, i);
+
+    /* If this is already expressed by the existing caps
+     * skip this structure */
+    if (i > 0 && gst_caps_is_subset_structure_full (res, st, f))
+      continue;
+
+    st = gst_structure_copy (st);
+    /* Only remove format info for the cases when we can actually convert */
+    if (!gst_caps_features_is_any (f)
+        && gst_caps_features_is_equal (f, feature)) {
+      gst_structure_set (st, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+          "height", GST_TYPE_INT_RANGE, 1, G_MAXINT, nullptr);
+
+      /* if pixel aspect ratio, make a range of it */
+      if (gst_structure_has_field (st, "pixel-aspect-ratio")) {
+        gst_structure_set (st, "pixel-aspect-ratio",
+            GST_TYPE_FRACTION_RANGE, 1, G_MAXINT, G_MAXINT, 1, nullptr);
+      }
+    }
+
+    gst_caps_append_structure_full (res, st, gst_caps_features_copy (f));
+  }
+  gst_caps_features_free (feature);
+
+  return res;
+}
+
+static GstCaps *
+gst_d3d12_convert_caps_remove_format_and_rangify_size_info (GstCaps * caps)
+{
+  GstStructure *st;
+  GstCapsFeatures *f;
+  gint i, n;
+  GstCaps *res;
+  GstCapsFeatures *feature =
+      gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY);
+
+  res = gst_caps_new_empty ();
+
+  n = gst_caps_get_size (caps);
+  for (i = 0; i < n; i++) {
+    st = gst_caps_get_structure (caps, i);
+    f = gst_caps_get_features (caps, i);
+
+    /* If this is already expressed by the existing caps
+     * skip this structure */
+    if (i > 0 && gst_caps_is_subset_structure_full (res, st, f))
+      continue;
+
+    st = gst_structure_copy (st);
+    /* Only remove format info for the cases when we can actually convert */
+    if (!gst_caps_features_is_any (f)
+        && gst_caps_features_is_equal (f, feature)) {
+      gst_structure_set (st, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+          "height", GST_TYPE_INT_RANGE, 1, G_MAXINT, nullptr);
+      /* if pixel aspect ratio, make a range of it */
+      if (gst_structure_has_field (st, "pixel-aspect-ratio")) {
+        gst_structure_set (st, "pixel-aspect-ratio",
+            GST_TYPE_FRACTION_RANGE, 1, G_MAXINT, G_MAXINT, 1, nullptr);
+      }
+      gst_structure_remove_fields (st, "format", "colorimetry", "chroma-site",
+          nullptr);
+    }
+
+    gst_caps_append_structure_full (res, st, gst_caps_features_copy (f));
+  }
+  gst_caps_features_free (feature);
+
+  return res;
+}
+
+static GstCaps *
+gst_d3d12_convert_transform_caps (GstBaseTransform *
+    trans, GstPadDirection direction, GstCaps * caps, GstCaps * filter)
+{
+  GstCaps *tmp, *tmp2;
+  GstCaps *result;
+
+  /* Get all possible caps that we can transform to */
+  tmp = gst_d3d12_convert_caps_remove_format_and_rangify_size_info (caps);
+
+  if (filter) {
+    tmp2 = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (tmp);
+    tmp = tmp2;
+  }
+
+  result = tmp;
+
+  GST_DEBUG_OBJECT (trans, "transformed %" GST_PTR_FORMAT " into %"
+      GST_PTR_FORMAT, caps, result);
+
+  return result;
+}
+
+/*
+ * This is an incomplete matrix of in formats and a score for the prefered output
+ * format.
+ *
+ *         out: RGB24   RGB16  ARGB  AYUV  YUV444  YUV422 YUV420 YUV411 YUV410  PAL  GRAY
+ *  in
+ * RGB24          0      2       1     2     2       3      4      5      6      7    8
+ * RGB16          1      0       1     2     2       3      4      5      6      7    8
+ * ARGB           2      3       0     1     4       5      6      7      8      9    10
+ * AYUV           3      4       1     0     2       5      6      7      8      9    10
+ * YUV444         2      4       3     1     0       5      6      7      8      9    10
+ * YUV422         3      5       4     2     1       0      6      7      8      9    10
+ * YUV420         4      6       5     3     2       1      0      7      8      9    10
+ * YUV411         4      6       5     3     2       1      7      0      8      9    10
+ * YUV410         6      8       7     5     4       3      2      1      0      9    10
+ * PAL            1      3       2     6     4       6      7      8      9      0    10
+ * GRAY           1      4       3     2     1       5      6      7      8      9    0
+ *
+ * PAL or GRAY are never prefered, if we can we would convert to PAL instead
+ * of GRAY, though
+ * less subsampling is prefered and if any, preferably horizontal
+ * We would like to keep the alpha, even if we would need to to colorspace conversion
+ * or lose depth.
+ */
+#define SCORE_FORMAT_CHANGE       1
+#define SCORE_DEPTH_CHANGE        1
+#define SCORE_ALPHA_CHANGE        1
+#define SCORE_CHROMA_W_CHANGE     1
+#define SCORE_CHROMA_H_CHANGE     1
+#define SCORE_PALETTE_CHANGE      1
+
+#define SCORE_COLORSPACE_LOSS     2     /* RGB <-> YUV */
+#define SCORE_DEPTH_LOSS          4     /* change bit depth */
+#define SCORE_ALPHA_LOSS          8     /* lose the alpha channel */
+#define SCORE_CHROMA_W_LOSS      16     /* vertical subsample */
+#define SCORE_CHROMA_H_LOSS      32     /* horizontal subsample */
+#define SCORE_PALETTE_LOSS       64     /* convert to palette format */
+#define SCORE_COLOR_LOSS        128     /* convert to GRAY */
+
+#define COLORSPACE_MASK (GST_VIDEO_FORMAT_FLAG_YUV | \
+                         GST_VIDEO_FORMAT_FLAG_RGB | GST_VIDEO_FORMAT_FLAG_GRAY)
+#define ALPHA_MASK      (GST_VIDEO_FORMAT_FLAG_ALPHA)
+#define PALETTE_MASK    (GST_VIDEO_FORMAT_FLAG_PALETTE)
+
+/* calculate how much loss a conversion would be */
+static void
+score_value (GstBaseTransform * base, const GstVideoFormatInfo * in_info,
+    const GValue * val, gint * min_loss, const GstVideoFormatInfo ** out_info)
+{
+  const gchar *fname;
+  const GstVideoFormatInfo *t_info;
+  guint in_flags, t_flags;
+  gint loss;
+
+  fname = g_value_get_string (val);
+  t_info = gst_video_format_get_info (gst_video_format_from_string (fname));
+  if (!t_info || t_info->format == GST_VIDEO_FORMAT_UNKNOWN)
+    return;
+
+  /* accept input format immediately without loss */
+  if (in_info == t_info) {
+    *min_loss = 0;
+    *out_info = t_info;
+    return;
+  }
+
+  loss = SCORE_FORMAT_CHANGE;
+
+  in_flags = GST_VIDEO_FORMAT_INFO_FLAGS (in_info);
+  in_flags &= ~GST_VIDEO_FORMAT_FLAG_LE;
+  in_flags &= ~GST_VIDEO_FORMAT_FLAG_COMPLEX;
+  in_flags &= ~GST_VIDEO_FORMAT_FLAG_UNPACK;
+
+  t_flags = GST_VIDEO_FORMAT_INFO_FLAGS (t_info);
+  t_flags &= ~GST_VIDEO_FORMAT_FLAG_LE;
+  t_flags &= ~GST_VIDEO_FORMAT_FLAG_COMPLEX;
+  t_flags &= ~GST_VIDEO_FORMAT_FLAG_UNPACK;
+
+  if ((t_flags & PALETTE_MASK) != (in_flags & PALETTE_MASK)) {
+    loss += SCORE_PALETTE_CHANGE;
+    if (t_flags & PALETTE_MASK)
+      loss += SCORE_PALETTE_LOSS;
+  }
+
+  if ((t_flags & COLORSPACE_MASK) != (in_flags & COLORSPACE_MASK)) {
+    loss += SCORE_COLORSPACE_LOSS;
+    if (t_flags & GST_VIDEO_FORMAT_FLAG_GRAY)
+      loss += SCORE_COLOR_LOSS;
+  }
+
+  if ((t_flags & ALPHA_MASK) != (in_flags & ALPHA_MASK)) {
+    loss += SCORE_ALPHA_CHANGE;
+    if (in_flags & ALPHA_MASK)
+      loss += SCORE_ALPHA_LOSS;
+  }
+
+  if ((in_info->h_sub1) != (t_info->h_sub1)) {
+    loss += SCORE_CHROMA_H_CHANGE;
+    if ((in_info->h_sub1) < (t_info->h_sub1))
+      loss += SCORE_CHROMA_H_LOSS;
+  }
+  if ((in_info->w_sub1) != (t_info->w_sub1)) {
+    loss += SCORE_CHROMA_W_CHANGE;
+    if ((in_info->w_sub1) < (t_info->w_sub1))
+      loss += SCORE_CHROMA_W_LOSS;
+  }
+
+  if ((in_info->bits) != (t_info->bits)) {
+    loss += SCORE_DEPTH_CHANGE;
+    if ((in_info->bits) > (t_info->bits))
+      loss += SCORE_DEPTH_LOSS + (in_info->bits - t_info->bits);
+  }
+
+  GST_DEBUG_OBJECT (base, "score %s -> %s = %d",
+      GST_VIDEO_FORMAT_INFO_NAME (in_info),
+      GST_VIDEO_FORMAT_INFO_NAME (t_info), loss);
+
+  if (loss < *min_loss) {
+    GST_DEBUG_OBJECT (base, "found new best %d", loss);
+    *out_info = t_info;
+    *min_loss = loss;
+  }
+}
+
+static void
+gst_d3d12_convert_fixate_format (GstBaseTransform * trans, GstCaps * caps,
+    GstCaps * result)
+{
+  GstStructure *ins, *outs;
+  const gchar *in_format;
+  const GstVideoFormatInfo *in_info, *out_info = nullptr;
+  gint min_loss = G_MAXINT;
+  guint i, capslen;
+
+  ins = gst_caps_get_structure (caps, 0);
+  in_format = gst_structure_get_string (ins, "format");
+  if (!in_format) {
+    return;
+  }
+
+  GST_DEBUG_OBJECT (trans, "source format %s", in_format);
+
+  in_info =
+      gst_video_format_get_info (gst_video_format_from_string (in_format));
+  if (!in_info)
+    return;
+
+  outs = gst_caps_get_structure (result, 0);
+
+  capslen = gst_caps_get_size (result);
+  GST_DEBUG ("iterate %d structures", capslen);
+  for (i = 0; i < capslen; i++) {
+    GstStructure *tests;
+    const GValue *format;
+
+    tests = gst_caps_get_structure (result, i);
+    format = gst_structure_get_value (tests, "format");
+
+    /* should not happen */
+    if (format == nullptr)
+      continue;
+
+    if (GST_VALUE_HOLDS_LIST (format)) {
+      gint j, len;
+
+      len = gst_value_list_get_size (format);
+      GST_DEBUG_OBJECT (trans, "have %d formats", len);
+      for (j = 0; j < len; j++) {
+        const GValue *val;
+
+        val = gst_value_list_get_value (format, j);
+        if (G_VALUE_HOLDS_STRING (val)) {
+          score_value (trans, in_info, val, &min_loss, &out_info);
+          if (min_loss == 0)
+            break;
+        }
+      }
+    } else if (G_VALUE_HOLDS_STRING (format)) {
+      score_value (trans, in_info, format, &min_loss, &out_info);
+    }
+  }
+  if (out_info)
+    gst_structure_set (outs, "format", G_TYPE_STRING,
+        GST_VIDEO_FORMAT_INFO_NAME (out_info), nullptr);
+}
+
+static gboolean
+subsampling_unchanged (GstVideoInfo * in_info, GstVideoInfo * out_info)
+{
+  guint i;
+  const GstVideoFormatInfo *in_format, *out_format;
+
+  if (GST_VIDEO_INFO_N_COMPONENTS (in_info) !=
+      GST_VIDEO_INFO_N_COMPONENTS (out_info))
+    return FALSE;
+
+  in_format = in_info->finfo;
+  out_format = out_info->finfo;
+
+  for (i = 0; i < GST_VIDEO_INFO_N_COMPONENTS (in_info); i++) {
+    if (GST_VIDEO_FORMAT_INFO_W_SUB (in_format,
+            i) != GST_VIDEO_FORMAT_INFO_W_SUB (out_format, i))
+      return FALSE;
+    if (GST_VIDEO_FORMAT_INFO_H_SUB (in_format,
+            i) != GST_VIDEO_FORMAT_INFO_H_SUB (out_format, i))
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+static void
+transfer_colorimetry_from_input (GstBaseTransform * trans, GstCaps * in_caps,
+    GstCaps * out_caps)
+{
+  GstStructure *out_caps_s = gst_caps_get_structure (out_caps, 0);
+  GstStructure *in_caps_s = gst_caps_get_structure (in_caps, 0);
+  gboolean have_colorimetry =
+      gst_structure_has_field (out_caps_s, "colorimetry");
+  gboolean have_chroma_site =
+      gst_structure_has_field (out_caps_s, "chroma-site");
+
+  /* If the output already has colorimetry and chroma-site, stop,
+   * otherwise try and transfer what we can from the input caps */
+  if (have_colorimetry && have_chroma_site)
+    return;
+
+  {
+    GstVideoInfo in_info, out_info;
+    const GValue *in_colorimetry =
+        gst_structure_get_value (in_caps_s, "colorimetry");
+
+    if (!gst_video_info_from_caps (&in_info, in_caps)) {
+      GST_WARNING_OBJECT (trans,
+          "Failed to convert sink pad caps to video info");
+      return;
+    }
+    if (!gst_video_info_from_caps (&out_info, out_caps)) {
+      GST_WARNING_OBJECT (trans,
+          "Failed to convert src pad caps to video info");
+      return;
+    }
+
+    if (!have_colorimetry && in_colorimetry != nullptr) {
+      if ((GST_VIDEO_INFO_IS_YUV (&out_info)
+              && GST_VIDEO_INFO_IS_YUV (&in_info))
+          || (GST_VIDEO_INFO_IS_RGB (&out_info)
+              && GST_VIDEO_INFO_IS_RGB (&in_info))
+          || (GST_VIDEO_INFO_IS_GRAY (&out_info)
+              && GST_VIDEO_INFO_IS_GRAY (&in_info))) {
+        /* Can transfer the colorimetry intact from the input if it has it */
+        gst_structure_set_value (out_caps_s, "colorimetry", in_colorimetry);
+      } else {
+        gchar *colorimetry_str;
+
+        /* Changing between YUV/RGB - forward primaries and transfer function, but use
+         * default range and matrix.
+         * the primaries is used for conversion between RGB and XYZ (CIE 1931 coordinate).
+         * the transfer function could be another reference (e.g., HDR)
+         */
+        out_info.colorimetry.primaries = in_info.colorimetry.primaries;
+        out_info.colorimetry.transfer = in_info.colorimetry.transfer;
+
+        colorimetry_str =
+            gst_video_colorimetry_to_string (&out_info.colorimetry);
+        gst_caps_set_simple (out_caps, "colorimetry", G_TYPE_STRING,
+            colorimetry_str, nullptr);
+        g_free (colorimetry_str);
+      }
+    }
+
+    /* Only YUV output needs chroma-site. If the input was also YUV and had the same chroma
+     * subsampling, transfer the siting. If the sub-sampling is changing, then the planes get
+     * scaled anyway so there's no real reason to prefer the input siting. */
+    if (!have_chroma_site && GST_VIDEO_INFO_IS_YUV (&out_info)) {
+      if (GST_VIDEO_INFO_IS_YUV (&in_info)) {
+        const GValue *in_chroma_site =
+            gst_structure_get_value (in_caps_s, "chroma-site");
+        if (in_chroma_site != nullptr
+            && subsampling_unchanged (&in_info, &out_info))
+          gst_structure_set_value (out_caps_s, "chroma-site", in_chroma_site);
+      }
+    }
+  }
+}
+
+static GstCaps *
+gst_d3d12_convert_get_fixed_format (GstBaseTransform * trans,
+    GstPadDirection direction, GstCaps * caps, GstCaps * othercaps)
+{
+  GstCaps *result;
+
+  result = gst_caps_intersect (othercaps, caps);
+  if (gst_caps_is_empty (result)) {
+    gst_caps_unref (result);
+    result = gst_caps_copy (othercaps);
+  }
+
+  gst_d3d12_convert_fixate_format (trans, caps, result);
+
+  /* fixate remaining fields */
+  result = gst_caps_fixate (result);
+
+  if (direction == GST_PAD_SINK) {
+    if (gst_caps_is_subset (caps, result)) {
+      gst_caps_replace (&result, caps);
+    } else {
+      /* Try and preserve input colorimetry / chroma information */
+      transfer_colorimetry_from_input (trans, caps, result);
+    }
+  }
+
+  return result;
+}
+
+static GstCaps *
+gst_d3d12_convert_fixate_size (GstBaseTransform * base,
+    GstPadDirection direction, GstCaps * caps, GstCaps * othercaps)
+{
+  auto self = GST_D3D12_CONVERT (base);
+  auto priv = self->priv;
+  GstStructure *ins, *outs;
+  const GValue *from_par, *to_par;
+  GValue fpar = G_VALUE_INIT, tpar = G_VALUE_INIT;
+  gboolean rotate = FALSE;
+
+  othercaps = gst_caps_truncate (othercaps);
+  othercaps = gst_caps_make_writable (othercaps);
+  ins = gst_caps_get_structure (caps, 0);
+  outs = gst_caps_get_structure (othercaps, 0);
+
+  from_par = gst_structure_get_value (ins, "pixel-aspect-ratio");
+  to_par = gst_structure_get_value (outs, "pixel-aspect-ratio");
+
+  /* If we're fixating from the sinkpad we always set the PAR and
+   * assume that missing PAR on the sinkpad means 1/1 and
+   * missing PAR on the srcpad means undefined
+   */
+  std::lock_guard < std::mutex > lk (priv->lock);
+  switch (priv->selected_method) {
+    case GST_VIDEO_ORIENTATION_90R:
+    case GST_VIDEO_ORIENTATION_90L:
+    case GST_VIDEO_ORIENTATION_UL_LR:
+    case GST_VIDEO_ORIENTATION_UR_LL:
+      rotate = TRUE;
+      break;
+    default:
+      rotate = FALSE;
+      break;
+  }
+
+  if (direction == GST_PAD_SINK) {
+    if (!from_par) {
+      g_value_init (&fpar, GST_TYPE_FRACTION);
+      gst_value_set_fraction (&fpar, 1, 1);
+      from_par = &fpar;
+    }
+    if (!to_par) {
+      g_value_init (&tpar, GST_TYPE_FRACTION_RANGE);
+      gst_value_set_fraction_range_full (&tpar, 1, G_MAXINT, G_MAXINT, 1);
+      to_par = &tpar;
+    }
+  } else {
+    gint from_par_n, from_par_d;
+
+    if (!from_par) {
+      g_value_init (&fpar, GST_TYPE_FRACTION);
+      gst_value_set_fraction (&fpar, 1, 1);
+      from_par = &fpar;
+
+      from_par_n = from_par_d = 1;
+    } else {
+      from_par_n = gst_value_get_fraction_numerator (from_par);
+      from_par_d = gst_value_get_fraction_denominator (from_par);
+    }
+
+    if (!to_par) {
+      gint to_par_n, to_par_d;
+
+      if (rotate) {
+        to_par_n = from_par_d;
+        to_par_d = from_par_n;
+      } else {
+        to_par_n = from_par_n;
+        to_par_d = from_par_d;
+      }
+
+      g_value_init (&tpar, GST_TYPE_FRACTION);
+      gst_value_set_fraction (&tpar, to_par_n, to_par_d);
+      to_par = &tpar;
+
+      gst_structure_set (outs, "pixel-aspect-ratio", GST_TYPE_FRACTION,
+          to_par_n, to_par_d, nullptr);
+    }
+  }
+
+  /* we have both PAR but they might not be fixated */
+  {
+    gint from_w, from_h, from_par_n, from_par_d, to_par_n, to_par_d;
+    gint w = 0, h = 0;
+    gint from_dar_n, from_dar_d;
+    gint num, den;
+
+    /* from_par should be fixed */
+    g_return_val_if_fail (gst_value_is_fixed (from_par), othercaps);
+
+    from_par_n = gst_value_get_fraction_numerator (from_par);
+    from_par_d = gst_value_get_fraction_denominator (from_par);
+
+    gst_structure_get_int (ins, "width", &from_w);
+    gst_structure_get_int (ins, "height", &from_h);
+
+    gst_structure_get_int (outs, "width", &w);
+    gst_structure_get_int (outs, "height", &h);
+
+    /* swap dimensions when it's rotated */
+    if (rotate) {
+      gint _tmp = from_w;
+      from_w = from_h;
+      from_h = _tmp;
+
+      _tmp = from_par_n;
+      from_par_n = from_par_d;
+      from_par_d = _tmp;
+    }
+
+    /* if both width and height are already fixed, we can't do anything
+     * about it anymore */
+    if (w && h) {
+      guint n, d;
+
+      GST_DEBUG_OBJECT (base, "dimensions already set to %dx%d, not fixating",
+          w, h);
+      if (!gst_value_is_fixed (to_par)) {
+        if (gst_video_calculate_display_ratio (&n, &d, from_w, from_h,
+                from_par_n, from_par_d, w, h)) {
+          GST_DEBUG_OBJECT (base, "fixating to_par to %dx%d", n, d);
+          if (gst_structure_has_field (outs, "pixel-aspect-ratio"))
+            gst_structure_fixate_field_nearest_fraction (outs,
+                "pixel-aspect-ratio", n, d);
+          else if (n != d)
+            gst_structure_set (outs, "pixel-aspect-ratio", GST_TYPE_FRACTION,
+                n, d, nullptr);
+        }
+      }
+      goto done;
+    }
+
+    /* Calculate input DAR */
+    if (!gst_util_fraction_multiply (from_w, from_h, from_par_n, from_par_d,
+            &from_dar_n, &from_dar_d)) {
+      GST_ELEMENT_ERROR (base, CORE, NEGOTIATION, (nullptr),
+          ("Error calculating the output scaled size - integer overflow"));
+      goto done;
+    }
+
+    GST_DEBUG_OBJECT (base, "Input DAR is %d/%d", from_dar_n, from_dar_d);
+
+    /* If either width or height are fixed there's not much we
+     * can do either except choosing a height or width and PAR
+     * that matches the DAR as good as possible
+     */
+    if (h) {
+      GstStructure *tmp;
+      gint set_w, set_par_n, set_par_d;
+
+      GST_DEBUG_OBJECT (base, "height is fixed (%d)", h);
+
+      /* If the PAR is fixed too, there's not much to do
+       * except choosing the width that is nearest to the
+       * width with the same DAR */
+      if (gst_value_is_fixed (to_par)) {
+        to_par_n = gst_value_get_fraction_numerator (to_par);
+        to_par_d = gst_value_get_fraction_denominator (to_par);
+
+        GST_DEBUG_OBJECT (base, "PAR is fixed %d/%d", to_par_n, to_par_d);
+
+        if (!gst_util_fraction_multiply (from_dar_n, from_dar_d, to_par_d,
+                to_par_n, &num, &den)) {
+          GST_ELEMENT_ERROR (base, CORE, NEGOTIATION, (nullptr),
+              ("Error calculating the output scaled size - integer overflow"));
+          goto done;
+        }
+
+        w = (guint) gst_util_uint64_scale_int_round (h, num, den);
+        gst_structure_fixate_field_nearest_int (outs, "width", w);
+
+        goto done;
+      }
+
+      /* The PAR is not fixed and it's quite likely that we can set
+       * an arbitrary PAR. */
+
+      /* Check if we can keep the input width */
+      tmp = gst_structure_copy (outs);
+      gst_structure_fixate_field_nearest_int (tmp, "width", from_w);
+      gst_structure_get_int (tmp, "width", &set_w);
+
+      /* Might have failed but try to keep the DAR nonetheless by
+       * adjusting the PAR */
+      if (!gst_util_fraction_multiply (from_dar_n, from_dar_d, h, set_w,
+              &to_par_n, &to_par_d)) {
+        GST_ELEMENT_ERROR (base, CORE, NEGOTIATION, (nullptr),
+            ("Error calculating the output scaled size - integer overflow"));
+        gst_structure_free (tmp);
+        goto done;
+      }
+
+      if (!gst_structure_has_field (tmp, "pixel-aspect-ratio"))
+        gst_structure_set_value (tmp, "pixel-aspect-ratio", to_par);
+      gst_structure_fixate_field_nearest_fraction (tmp, "pixel-aspect-ratio",
+          to_par_n, to_par_d);
+      gst_structure_get_fraction (tmp, "pixel-aspect-ratio", &set_par_n,
+          &set_par_d);
+      gst_structure_free (tmp);
+
+      /* Check if the adjusted PAR is accepted */
+      if (set_par_n == to_par_n && set_par_d == to_par_d) {
+        if (gst_structure_has_field (outs, "pixel-aspect-ratio") ||
+            set_par_n != set_par_d)
+          gst_structure_set (outs, "width", G_TYPE_INT, set_w,
+              "pixel-aspect-ratio", GST_TYPE_FRACTION, set_par_n, set_par_d,
+              nullptr);
+        goto done;
+      }
+
+      /* Otherwise scale the width to the new PAR and check if the
+       * adjusted with is accepted. If all that fails we can't keep
+       * the DAR */
+      if (!gst_util_fraction_multiply (from_dar_n, from_dar_d, set_par_d,
+              set_par_n, &num, &den)) {
+        GST_ELEMENT_ERROR (base, CORE, NEGOTIATION, (nullptr),
+            ("Error calculating the output scaled size - integer overflow"));
+        goto done;
+      }
+
+      w = (guint) gst_util_uint64_scale_int_round (h, num, den);
+      gst_structure_fixate_field_nearest_int (outs, "width", w);
+      if (gst_structure_has_field (outs, "pixel-aspect-ratio") ||
+          set_par_n != set_par_d)
+        gst_structure_set (outs, "pixel-aspect-ratio", GST_TYPE_FRACTION,
+            set_par_n, set_par_d, nullptr);
+
+      goto done;
+    } else if (w) {
+      GstStructure *tmp;
+      gint set_h, set_par_n, set_par_d;
+
+      GST_DEBUG_OBJECT (base, "width is fixed (%d)", w);
+
+      /* If the PAR is fixed too, there's not much to do
+       * except choosing the height that is nearest to the
+       * height with the same DAR */
+      if (gst_value_is_fixed (to_par)) {
+        to_par_n = gst_value_get_fraction_numerator (to_par);
+        to_par_d = gst_value_get_fraction_denominator (to_par);
+
+        GST_DEBUG_OBJECT (base, "PAR is fixed %d/%d", to_par_n, to_par_d);
+
+        if (!gst_util_fraction_multiply (from_dar_n, from_dar_d, to_par_d,
+                to_par_n, &num, &den)) {
+          GST_ELEMENT_ERROR (base, CORE, NEGOTIATION, (nullptr),
+              ("Error calculating the output scaled size - integer overflow"));
+          goto done;
+        }
+
+        h = (guint) gst_util_uint64_scale_int_round (w, den, num);
+        gst_structure_fixate_field_nearest_int (outs, "height", h);
+
+        goto done;
+      }
+
+      /* The PAR is not fixed and it's quite likely that we can set
+       * an arbitrary PAR. */
+
+      /* Check if we can keep the input height */
+      tmp = gst_structure_copy (outs);
+      gst_structure_fixate_field_nearest_int (tmp, "height", from_h);
+      gst_structure_get_int (tmp, "height", &set_h);
+
+      /* Might have failed but try to keep the DAR nonetheless by
+       * adjusting the PAR */
+      if (!gst_util_fraction_multiply (from_dar_n, from_dar_d, set_h, w,
+              &to_par_n, &to_par_d)) {
+        GST_ELEMENT_ERROR (base, CORE, NEGOTIATION, (nullptr),
+            ("Error calculating the output scaled size - integer overflow"));
+        gst_structure_free (tmp);
+        goto done;
+      }
+      if (!gst_structure_has_field (tmp, "pixel-aspect-ratio"))
+        gst_structure_set_value (tmp, "pixel-aspect-ratio", to_par);
+      gst_structure_fixate_field_nearest_fraction (tmp, "pixel-aspect-ratio",
+          to_par_n, to_par_d);
+      gst_structure_get_fraction (tmp, "pixel-aspect-ratio", &set_par_n,
+          &set_par_d);
+      gst_structure_free (tmp);
+
+      /* Check if the adjusted PAR is accepted */
+      if (set_par_n == to_par_n && set_par_d == to_par_d) {
+        if (gst_structure_has_field (outs, "pixel-aspect-ratio") ||
+            set_par_n != set_par_d)
+          gst_structure_set (outs, "height", G_TYPE_INT, set_h,
+              "pixel-aspect-ratio", GST_TYPE_FRACTION, set_par_n, set_par_d,
+              nullptr);
+        goto done;
+      }
+
+      /* Otherwise scale the height to the new PAR and check if the
+       * adjusted with is accepted. If all that fails we can't keep
+       * the DAR */
+      if (!gst_util_fraction_multiply (from_dar_n, from_dar_d, set_par_d,
+              set_par_n, &num, &den)) {
+        GST_ELEMENT_ERROR (base, CORE, NEGOTIATION, (nullptr),
+            ("Error calculating the output scale sized - integer overflow"));
+        goto done;
+      }
+
+      h = (guint) gst_util_uint64_scale_int_round (w, den, num);
+      gst_structure_fixate_field_nearest_int (outs, "height", h);
+      if (gst_structure_has_field (outs, "pixel-aspect-ratio") ||
+          set_par_n != set_par_d)
+        gst_structure_set (outs, "pixel-aspect-ratio", GST_TYPE_FRACTION,
+            set_par_n, set_par_d, nullptr);
+
+      goto done;
+    } else if (gst_value_is_fixed (to_par)) {
+      GstStructure *tmp;
+      gint set_h, set_w, f_h, f_w;
+
+      to_par_n = gst_value_get_fraction_numerator (to_par);
+      to_par_d = gst_value_get_fraction_denominator (to_par);
+
+      /* Calculate scale factor for the PAR change */
+      if (!gst_util_fraction_multiply (from_dar_n, from_dar_d, to_par_n,
+              to_par_d, &num, &den)) {
+        GST_ELEMENT_ERROR (base, CORE, NEGOTIATION, (nullptr),
+            ("Error calculating the output scaled size - integer overflow"));
+        goto done;
+      }
+
+      /* Try to keep the input height (because of interlacing) */
+      tmp = gst_structure_copy (outs);
+      gst_structure_fixate_field_nearest_int (tmp, "height", from_h);
+      gst_structure_get_int (tmp, "height", &set_h);
+
+      /* This might have failed but try to scale the width
+       * to keep the DAR nonetheless */
+      w = (guint) gst_util_uint64_scale_int_round (set_h, num, den);
+      gst_structure_fixate_field_nearest_int (tmp, "width", w);
+      gst_structure_get_int (tmp, "width", &set_w);
+      gst_structure_free (tmp);
+
+      /* We kept the DAR and the height is nearest to the original height */
+      if (set_w == w) {
+        gst_structure_set (outs, "width", G_TYPE_INT, set_w, "height",
+            G_TYPE_INT, set_h, nullptr);
+        goto done;
+      }
+
+      f_h = set_h;
+      f_w = set_w;
+
+      /* If the former failed, try to keep the input width at least */
+      tmp = gst_structure_copy (outs);
+      gst_structure_fixate_field_nearest_int (tmp, "width", from_w);
+      gst_structure_get_int (tmp, "width", &set_w);
+
+      /* This might have failed but try to scale the width
+       * to keep the DAR nonetheless */
+      h = (guint) gst_util_uint64_scale_int_round (set_w, den, num);
+      gst_structure_fixate_field_nearest_int (tmp, "height", h);
+      gst_structure_get_int (tmp, "height", &set_h);
+      gst_structure_free (tmp);
+
+      /* We kept the DAR and the width is nearest to the original width */
+      if (set_h == h) {
+        gst_structure_set (outs, "width", G_TYPE_INT, set_w, "height",
+            G_TYPE_INT, set_h, nullptr);
+        goto done;
+      }
+
+      /* If all this failed, keep the dimensions with the DAR that was closest
+       * to the correct DAR. This changes the DAR but there's not much else to
+       * do here.
+       */
+      if (set_w * ABS (set_h - h) < ABS (f_w - w) * f_h) {
+        f_h = set_h;
+        f_w = set_w;
+      }
+      gst_structure_set (outs, "width", G_TYPE_INT, f_w, "height", G_TYPE_INT,
+          f_h, nullptr);
+      goto done;
+    } else {
+      GstStructure *tmp;
+      gint set_h, set_w, set_par_n, set_par_d, tmp2;
+
+      /* width, height and PAR are not fixed but passthrough is not possible */
+
+      /* First try to keep the height and width as good as possible
+       * and scale PAR */
+      tmp = gst_structure_copy (outs);
+      gst_structure_fixate_field_nearest_int (tmp, "height", from_h);
+      gst_structure_get_int (tmp, "height", &set_h);
+      gst_structure_fixate_field_nearest_int (tmp, "width", from_w);
+      gst_structure_get_int (tmp, "width", &set_w);
+
+      if (!gst_util_fraction_multiply (from_dar_n, from_dar_d, set_h, set_w,
+              &to_par_n, &to_par_d)) {
+        GST_ELEMENT_ERROR (base, CORE, NEGOTIATION, (nullptr),
+            ("Error calculating the output scaled size - integer overflow"));
+        gst_structure_free (tmp);
+        goto done;
+      }
+
+      if (!gst_structure_has_field (tmp, "pixel-aspect-ratio"))
+        gst_structure_set_value (tmp, "pixel-aspect-ratio", to_par);
+      gst_structure_fixate_field_nearest_fraction (tmp, "pixel-aspect-ratio",
+          to_par_n, to_par_d);
+      gst_structure_get_fraction (tmp, "pixel-aspect-ratio", &set_par_n,
+          &set_par_d);
+      gst_structure_free (tmp);
+
+      if (set_par_n == to_par_n && set_par_d == to_par_d) {
+        gst_structure_set (outs, "width", G_TYPE_INT, set_w, "height",
+            G_TYPE_INT, set_h, nullptr);
+
+        if (gst_structure_has_field (outs, "pixel-aspect-ratio") ||
+            set_par_n != set_par_d)
+          gst_structure_set (outs, "pixel-aspect-ratio", GST_TYPE_FRACTION,
+              set_par_n, set_par_d, nullptr);
+        goto done;
+      }
+
+      /* Otherwise try to scale width to keep the DAR with the set
+       * PAR and height */
+      if (!gst_util_fraction_multiply (from_dar_n, from_dar_d, set_par_d,
+              set_par_n, &num, &den)) {
+        GST_ELEMENT_ERROR (base, CORE, NEGOTIATION, (nullptr),
+            ("Error calculating the output scaled size - integer overflow"));
+        goto done;
+      }
+
+      w = (guint) gst_util_uint64_scale_int_round (set_h, num, den);
+      tmp = gst_structure_copy (outs);
+      gst_structure_fixate_field_nearest_int (tmp, "width", w);
+      gst_structure_get_int (tmp, "width", &tmp2);
+      gst_structure_free (tmp);
+
+      if (tmp2 == w) {
+        gst_structure_set (outs, "width", G_TYPE_INT, tmp2, "height",
+            G_TYPE_INT, set_h, nullptr);
+        if (gst_structure_has_field (outs, "pixel-aspect-ratio") ||
+            set_par_n != set_par_d)
+          gst_structure_set (outs, "pixel-aspect-ratio", GST_TYPE_FRACTION,
+              set_par_n, set_par_d, nullptr);
+        goto done;
+      }
+
+      /* ... or try the same with the height */
+      h = (guint) gst_util_uint64_scale_int_round (set_w, den, num);
+      tmp = gst_structure_copy (outs);
+      gst_structure_fixate_field_nearest_int (tmp, "height", h);
+      gst_structure_get_int (tmp, "height", &tmp2);
+      gst_structure_free (tmp);
+
+      if (tmp2 == h) {
+        gst_structure_set (outs, "width", G_TYPE_INT, set_w, "height",
+            G_TYPE_INT, tmp2, nullptr);
+        if (gst_structure_has_field (outs, "pixel-aspect-ratio") ||
+            set_par_n != set_par_d)
+          gst_structure_set (outs, "pixel-aspect-ratio", GST_TYPE_FRACTION,
+              set_par_n, set_par_d, nullptr);
+        goto done;
+      }
+
+      /* If all fails we can't keep the DAR and take the nearest values
+       * for everything from the first try */
+      gst_structure_set (outs, "width", G_TYPE_INT, set_w, "height",
+          G_TYPE_INT, set_h, nullptr);
+      if (gst_structure_has_field (outs, "pixel-aspect-ratio") ||
+          set_par_n != set_par_d)
+        gst_structure_set (outs, "pixel-aspect-ratio", GST_TYPE_FRACTION,
+            set_par_n, set_par_d, nullptr);
+    }
+  }
+
+done:
+  if (from_par == &fpar)
+    g_value_unset (&fpar);
+  if (to_par == &tpar)
+    g_value_unset (&tpar);
+
+  return othercaps;
+}
+
+static GstCaps *
+gst_d3d12_convert_fixate_caps (GstBaseTransform * trans,
+    GstPadDirection direction, GstCaps * caps, GstCaps * othercaps)
+{
+  GST_DEBUG_OBJECT (trans,
+      "trying to fixate othercaps %" GST_PTR_FORMAT " based on caps %"
+      GST_PTR_FORMAT, othercaps, caps);
+
+  auto format = gst_d3d12_convert_get_fixed_format (trans, direction, caps,
+      othercaps);
+
+  if (gst_caps_is_empty (format)) {
+    GST_ERROR_OBJECT (trans, "Could not convert formats");
+    return format;
+  }
+
+  /* convert mode is "all" or "size" here */
+  othercaps = gst_d3d12_convert_fixate_size (trans, direction, caps, othercaps);
+
+  if (gst_caps_get_size (othercaps) == 1) {
+    guint i;
+    const gchar *format_fields = { "format", "colorimetry", "chroma-site" };
+    GstStructure *format_struct = gst_caps_get_structure (format, 0);
+    GstStructure *fixated_struct;
+
+    othercaps = gst_caps_make_writable (othercaps);
+    fixated_struct = gst_caps_get_structure (othercaps, 0);
+
+    for (i = 0; i < G_N_ELEMENTS (format_fields); i++) {
+      if (gst_structure_has_field (format_struct, format_fieldsi)) {
+        gst_structure_set (fixated_struct, format_fieldsi, G_TYPE_STRING,
+            gst_structure_get_string (format_struct, format_fieldsi),
+            nullptr);
+      } else {
+        gst_structure_remove_field (fixated_struct, format_fieldsi);
+      }
+    }
+  }
+  gst_caps_unref (format);
+
+  GST_DEBUG_OBJECT (trans, "fixated othercaps to %" GST_PTR_FORMAT, othercaps);
+
+  return othercaps;
+}
+
+static gboolean
+gst_d3d12_convert_propose_allocation (GstBaseTransform * trans,
+    GstQuery * decide_query, GstQuery * query)
+{
+  auto filter = GST_D3D12_BASE_FILTER (trans);
+  auto self = GST_D3D12_CONVERT (trans);
+  auto priv = self->priv;
+  GstVideoInfo info;
+  GstBufferPool *pool = nullptr;
+  GstCaps *caps;
+  guint n_pools, i;
+  guint size;
+
+  if (!GST_BASE_TRANSFORM_CLASS (parent_class)->propose_allocation (trans,
+          decide_query, query)) {
+    return FALSE;
+  }
+
+  if (priv->same_caps) {
+    if (!gst_pad_peer_query (trans->srcpad, query))
+      return FALSE;
+
+    gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, nullptr);
+    gst_query_add_allocation_meta (query,
+        GST_VIDEO_CROP_META_API_TYPE, nullptr);
+    return TRUE;
+  }
+
+  gst_query_parse_allocation (query, &caps, nullptr);
+
+  if (!caps)
+    return FALSE;
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_ERROR_OBJECT (filter, "Invalid caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+
+  n_pools = gst_query_get_n_allocation_pools (query);
+  for (i = 0; i < n_pools; i++) {
+    gst_query_parse_nth_allocation_pool (query, i, &pool, nullptr, nullptr,
+        nullptr);
+    if (pool) {
+      if (!GST_IS_D3D12_BUFFER_POOL (pool)) {
+        gst_clear_object (&pool);
+      } else {
+        auto dpool = GST_D3D12_BUFFER_POOL (pool);
+        if (dpool->device != filter->device)
+          gst_clear_object (&pool);
+      }
+    }
+  }
+
+  if (!pool)
+    pool = gst_d3d12_buffer_pool_new (filter->device);
+
+  auto config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+  auto d3d12_params =
+      gst_buffer_pool_config_get_d3d12_allocation_params (config);
+  if (!d3d12_params) {
+    d3d12_params = gst_d3d12_allocation_params_new (filter->device, &info,
+        GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+  } else {
+    gst_d3d12_allocation_params_set_resource_flags (d3d12_params,
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+    gst_d3d12_allocation_params_unset_resource_flags (d3d12_params,
+        D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE);
+  }
+
+  gst_buffer_pool_config_set_d3d12_allocation_params (config, d3d12_params);
+  gst_d3d12_allocation_params_free (d3d12_params);
+
+  /* size will be updated by d3d12 buffer pool */
+  gst_buffer_pool_config_set_params (config, caps, 0, 0, 0);
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (filter, "failed to set config");
+    gst_object_unref (pool);
+    return FALSE;
+  }
+
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, nullptr);
+  gst_query_add_allocation_meta (query,
+      GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE, nullptr);
+  gst_query_add_allocation_meta (query, GST_VIDEO_CROP_META_API_TYPE, nullptr);
+
+  /* d3d12 buffer pool will update buffer size based on allocated texture,
+   * get size from config again */
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  gst_query_add_allocation_pool (query, pool, size, 0, 0);
+
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_convert_decide_allocation (GstBaseTransform * trans, GstQuery * query)
+{
+  auto filter = GST_D3D12_BASE_FILTER (trans);
+  auto self = GST_D3D12_CONVERT (trans);
+  auto priv = self->priv;
+  GstCaps *outcaps = nullptr;
+  GstBufferPool *pool = nullptr;
+  guint size, min = 0, max = 0;
+  GstStructure *config;
+  gboolean update_pool = FALSE;
+  GstVideoInfo info;
+
+  gst_query_parse_allocation (query, &outcaps, nullptr);
+
+  if (!outcaps)
+    return FALSE;
+
+  if (!gst_video_info_from_caps (&info, outcaps)) {
+    GST_ERROR_OBJECT (filter, "Invalid caps %" GST_PTR_FORMAT, outcaps);
+    return FALSE;
+  }
+
+  priv->downstream_supports_crop_meta = gst_query_find_allocation_meta (query,
+      GST_VIDEO_CROP_META_API_TYPE, nullptr);
+  GST_DEBUG_OBJECT (self, "Downstream crop meta support: %d",
+      priv->downstream_supports_crop_meta);
+
+  size = GST_VIDEO_INFO_SIZE (&info);
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+    if (pool) {
+      if (!GST_IS_D3D12_BUFFER_POOL (pool)) {
+        gst_clear_object (&pool);
+      } else {
+        auto dpool = GST_D3D12_BUFFER_POOL (pool);
+        if (dpool->device != filter->device)
+          gst_clear_object (&pool);
+      }
+    }
+
+    update_pool = TRUE;
+  }
+
+  if (!pool)
+    pool = gst_d3d12_buffer_pool_new (filter->device);
+
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+  auto d3d12_params =
+      gst_buffer_pool_config_get_d3d12_allocation_params (config);
+  if (!d3d12_params) {
+    d3d12_params = gst_d3d12_allocation_params_new (filter->device, &info,
+        GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+        D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+  } else {
+    gst_d3d12_allocation_params_set_resource_flags (d3d12_params,
+        D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+  }
+
+  gst_buffer_pool_config_set_d3d12_allocation_params (config, d3d12_params);
+  gst_d3d12_allocation_params_free (d3d12_params);
+
+  gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
+  gst_buffer_pool_set_config (pool, config);
+
+  /* d3d12 buffer pool will update buffer size based on allocated texture,
+   * get size from config again */
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  if (update_pool)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+
+  gst_object_unref (pool);
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->decide_allocation (trans,
+      query);
+}
+
+static gboolean
+gst_d3d12_convert_needs_color_convert (GstD3D12Convert * self,
+    const GstVideoInfo * in_info, const GstVideoInfo * out_info)
+{
+  auto priv = self->priv;
+  const GstVideoColorimetry *in_cinfo = &in_info->colorimetry;
+  const GstVideoColorimetry *out_cinfo = &out_info->colorimetry;
+
+  if (in_cinfo->range != out_cinfo->range ||
+      in_cinfo->matrix != out_cinfo->matrix) {
+    return TRUE;
+  }
+
+  if (priv->primaries_mode != GST_VIDEO_PRIMARIES_MODE_NONE &&
+      !gst_video_color_primaries_is_equivalent (in_cinfo->primaries,
+          out_cinfo->primaries)) {
+    return TRUE;
+  }
+
+  if (priv->gamma_mode != GST_VIDEO_GAMMA_MODE_NONE &&
+      !gst_video_transfer_function_is_equivalent (in_cinfo->transfer,
+          GST_VIDEO_INFO_COMP_DEPTH (in_info, 0), out_cinfo->transfer,
+          GST_VIDEO_INFO_COMP_DEPTH (out_info, 0))) {
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+static gboolean
+gst_d3d12_convert_set_info (GstD3D12BaseFilter * filter,
+    GstCaps * incaps, GstVideoInfo * in_info, GstCaps * outcaps,
+    GstVideoInfo * out_info)
+{
+  auto self = GST_D3D12_CONVERT (filter);
+  auto priv = self->priv;
+  gint from_dar_n, from_dar_d, to_dar_n, to_dar_d;
+  gint border_offset_x = 0;
+  gint border_offset_y = 0;
+  gboolean need_flip = FALSE;
+  gint in_width, in_height, in_par_n, in_par_d;
+  gint out_width, out_height;
+  GstStructure *config;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->active_method = priv->selected_method;
+  priv->active_add_borders = priv->add_borders;
+  priv->active_gamma_mode = priv->gamma_mode;
+  priv->active_primaries_mode = priv->primaries_mode;
+  priv->active_sampling_method = priv->sampling_method;
+
+  GST_DEBUG_OBJECT (self, "method %d, add-borders %d, gamma-mode %d, "
+      "primaries-mode %d, sampling %d", priv->active_method,
+      priv->active_add_borders, priv->active_gamma_mode,
+      priv->active_primaries_mode, priv->active_sampling_method);
+
+  if (priv->active_method != GST_VIDEO_ORIENTATION_IDENTITY)
+    need_flip = TRUE;
+
+  if (!need_flip && gst_caps_is_equal (incaps, outcaps)) {
+    priv->same_caps = TRUE;
+  } else {
+    priv->same_caps = FALSE;
+  }
+
+  switch (priv->selected_method) {
+    case GST_VIDEO_ORIENTATION_90R:
+    case GST_VIDEO_ORIENTATION_90L:
+    case GST_VIDEO_ORIENTATION_UL_LR:
+    case GST_VIDEO_ORIENTATION_UR_LL:
+      in_width = in_info->height;
+      in_height = in_info->width;
+      in_par_n = in_info->par_d;
+      in_par_d = in_info->par_n;
+      break;
+    default:
+      in_width = in_info->width;
+      in_height = in_info->height;
+      in_par_n = in_info->par_n;
+      in_par_d = in_info->par_d;
+      break;
+  }
+
+  if (!gst_util_fraction_multiply (in_width,
+          in_height, in_par_n, in_par_d, &from_dar_n, &from_dar_d)) {
+    from_dar_n = from_dar_d = -1;
+  }
+
+  if (!gst_util_fraction_multiply (out_info->width,
+          out_info->height, out_info->par_n, out_info->par_d, &to_dar_n,
+          &to_dar_d)) {
+    to_dar_n = to_dar_d = -1;
+  }
+
+  priv->borders_w = priv->borders_h = 0;
+  if (to_dar_n != from_dar_n || to_dar_d != from_dar_d) {
+    if (priv->active_add_borders) {
+      gint n, d, to_h, to_w;
+
+      if (from_dar_n != -1 && from_dar_d != -1
+          && gst_util_fraction_multiply (from_dar_n, from_dar_d,
+              out_info->par_d, out_info->par_n, &n, &d)) {
+        to_h = gst_util_uint64_scale_int (out_info->width, d, n);
+        if (to_h <= out_info->height) {
+          priv->borders_h = out_info->height - to_h;
+          priv->borders_w = 0;
+        } else {
+          to_w = gst_util_uint64_scale_int (out_info->height, n, d);
+          g_assert (to_w <= out_info->width);
+          priv->borders_h = 0;
+          priv->borders_w = out_info->width - to_w;
+        }
+      } else {
+        GST_WARNING_OBJECT (self, "Can't calculate borders");
+      }
+    } else {
+      GST_INFO_OBJECT (self, "Display aspect ratio update %d/%d -> %d/%d",
+          from_dar_n, from_dar_d, to_dar_n, to_dar_d);
+    }
+  }
+
+  priv->ctx = nullptr;
+
+  GST_DEBUG_OBJECT (self, "Setup convert with format %s -> %s",
+      gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (in_info)),
+      gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (out_info)));
+
+  /* if present, these must match */
+  if (in_info->interlace_mode != out_info->interlace_mode) {
+    GST_ERROR_OBJECT (self, "input and output formats do not match");
+    return FALSE;
+  }
+
+  if (in_width == out_info->width && in_height == out_info->height
+      && in_info->finfo == out_info->finfo && priv->borders_w == 0 &&
+      priv->borders_h == 0 && !need_flip &&
+      !gst_d3d12_convert_needs_color_convert (self, in_info, out_info)) {
+    priv->same_caps = TRUE;
+  }
+
+  config = gst_structure_new ("convert-config",
+      GST_D3D12_CONVERTER_OPT_GAMMA_MODE,
+      GST_TYPE_VIDEO_GAMMA_MODE, priv->active_gamma_mode,
+      GST_D3D12_CONVERTER_OPT_PRIMARIES_MODE,
+      GST_TYPE_VIDEO_PRIMARIES_MODE, priv->active_primaries_mode,
+      GST_D3D12_CONVERTER_OPT_SAMPLER_FILTER,
+      GST_TYPE_D3D12_CONVERTER_SAMPLER_FILTER,
+      gst_d3d12_sampling_method_to_native
+      (priv->active_sampling_method), nullptr);
+
+  auto ctx = std::make_unique < ConvertContext > (filter->device);
+
+  ctx->conv = gst_d3d12_converter_new (filter->device, in_info,
+      out_info, nullptr, nullptr, config);
+  if (!ctx->conv) {
+    GST_ERROR_OBJECT (self, "Couldn't create converter");
+    return FALSE;
+  }
+
+  GST_DEBUG_OBJECT (self, "from=%dx%d (par=%d/%d dar=%d/%d), size %"
+      G_GSIZE_FORMAT " -> to=%dx%d (par=%d/%d dar=%d/%d borders=%d:%d), "
+      "size %" G_GSIZE_FORMAT ", orientation: %d",
+      in_info->width, in_info->height, in_info->par_n, in_info->par_d,
+      from_dar_n, from_dar_d, in_info->size, out_info->width,
+      out_info->height, out_info->par_n, out_info->par_d, to_dar_n, to_dar_d,
+      priv->borders_w, priv->borders_h, out_info->size, priv->active_method);
+
+  priv->in_rect = CD3DX12_BOX (0, 0,
+      GST_VIDEO_INFO_WIDTH (in_info), GST_VIDEO_INFO_HEIGHT (in_info));
+  priv->prev_in_rect = priv->in_rect;
+
+  if (priv->borders_w) {
+    border_offset_x = priv->borders_w / 2;
+    priv->out_rect.left = border_offset_x;
+    priv->out_rect.right = GST_VIDEO_INFO_WIDTH (out_info) - border_offset_x;
+  } else {
+    priv->out_rect.left = 0;
+    priv->out_rect.right = GST_VIDEO_INFO_WIDTH (out_info);
+  }
+
+  if (priv->borders_h) {
+    border_offset_y = priv->borders_h / 2;
+    priv->out_rect.top = border_offset_y;
+    priv->out_rect.bottom = GST_VIDEO_INFO_HEIGHT (out_info) - border_offset_y;
+  } else {
+    priv->out_rect.top = 0;
+    priv->out_rect.bottom = GST_VIDEO_INFO_HEIGHT (out_info);
+  }
+
+  out_width = priv->out_rect.right - priv->out_rect.left;
+  out_height = priv->out_rect.bottom - priv->out_rect.top;
+
+  g_object_set (ctx->conv, "dest-x", (gint) priv->out_rect.left,
+      "dest-y", (gint) priv->out_rect.top,
+      "dest-width", out_width, "dest-height", out_height,
+      "video-direction", priv->active_method, nullptr);
+
+  if (priv->borders_w > 0 || priv->borders_h > 0) {
+    g_object_set (ctx->conv, "fill-border", TRUE, "border-color",
+        priv->border_color, nullptr);
+  }
+
+  priv->ctx = std::move (ctx);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_convert_sink_event (GstBaseTransform * trans, GstEvent * event)
+{
+  GstD3D12Convert *base = GST_D3D12_CONVERT (trans);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_TAG:{
+      GstTagList *taglist;
+      GstVideoOrientationMethod method = GST_VIDEO_ORIENTATION_IDENTITY;
+
+      gst_event_parse_tag (event, &taglist);
+      if (gst_video_orientation_from_tag (taglist, &method))
+        gst_d3d12_convert_set_orientation (base, method, TRUE);
+      break;
+    }
+    default:
+      break;
+  }
+
+  return GST_BASE_TRANSFORM_CLASS (gst_d3d12_convert_parent_class)->sink_event
+      (trans, event);
+}
+
+static GstFlowReturn
+gst_d3d12_convert_generate_output (GstBaseTransform * trans,
+    GstBuffer ** buffer)
+{
+  auto self = GST_D3D12_CONVERT (trans);
+  auto priv = self->priv;
+  gboolean passthrough = priv->same_caps;
+
+  if (!trans->queued_buf)
+    return GST_FLOW_OK;
+
+  if (passthrough && !priv->downstream_supports_crop_meta) {
+    if (gst_buffer_get_video_crop_meta (trans->queued_buf)) {
+      GST_LOG_OBJECT (self,
+          "Buffer has crop meta but downstream does not support crop");
+      passthrough = FALSE;
+    }
+  }
+
+  if (!passthrough) {
+    return GST_BASE_TRANSFORM_CLASS (parent_class)->generate_output (trans,
+        buffer);
+  }
+
+  *buffer = trans->queued_buf;
+  trans->queued_buf = nullptr;
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_d3d12_convert_transform_meta (GstBaseTransform * trans,
+    GstBuffer * outbuf, GstMeta * meta, GstBuffer * inbuf)
+{
+  /* Do not copy crop meta in any case.
+   *
+   * 1) When input and output caps are identical,
+   * - If downstream supports crop meta or crop meta is not attached on input
+   *   buffer, then we do passthrough input buffers.
+   *   In that case, this method must not be called already
+   * - Otherwise (downstream does not support crop meta), we do crop input
+   *   and copy cropped area to output buffer
+   * 2) in case of input-caps != output-caps, we specify source rectangle to
+   *   shader or video processor object. Then the conversion object will
+   *   consider source cropping area automatically
+   */
+  if (meta->info->api == GST_VIDEO_CROP_META_API_TYPE)
+    return FALSE;
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->transform_meta (trans,
+      outbuf, meta, inbuf);
+}
+
+static void
+gst_d3d12_convert_before_transform (GstBaseTransform * trans,
+    GstBuffer * buffer)
+{
+  auto self = GST_D3D12_CONVERT (trans);
+  auto priv = self->priv;
+  GstCaps *in_caps;
+  GstCaps *out_caps;
+  GstBaseTransformClass *klass;
+  gboolean update = FALSE;
+
+  GST_BASE_TRANSFORM_CLASS (parent_class)->before_transform (trans, buffer);
+
+  priv->lock.lock ();
+  if (priv->selected_method != priv->active_method ||
+      priv->add_borders != priv->active_add_borders ||
+      priv->gamma_mode != priv->active_gamma_mode ||
+      priv->primaries_mode != priv->active_primaries_mode ||
+      priv->sampling_method != priv->active_sampling_method) {
+    update = TRUE;
+  }
+  priv->lock.unlock ();
+
+  if (!update)
+    return;
+
+  GST_DEBUG_OBJECT (self, "Updating caps for property change");
+
+  in_caps = gst_pad_get_current_caps (GST_BASE_TRANSFORM_SINK_PAD (trans));
+  if (!in_caps) {
+    GST_WARNING_OBJECT (trans, "sinkpad has no current caps");
+    return;
+  }
+
+  out_caps = gst_pad_get_current_caps (GST_BASE_TRANSFORM_SRC_PAD (trans));
+  if (!out_caps) {
+    GST_WARNING_OBJECT (trans, "srcpad has no current caps");
+    gst_caps_unref (in_caps);
+    return;
+  }
+
+  klass = GST_BASE_TRANSFORM_GET_CLASS (trans);
+  klass->set_caps (trans, in_caps, out_caps);
+  gst_caps_unref (in_caps);
+  gst_caps_unref (out_caps);
+
+  gst_base_transform_reconfigure_src (trans);
+}
+
+static GstFlowReturn
+gst_d3d12_convert_transform (GstBaseTransform * trans, GstBuffer * inbuf,
+    GstBuffer * outbuf)
+{
+  auto self = GST_D3D12_CONVERT (trans);
+  auto priv = self->priv;
+  D3D12_BOX in_rect;
+
+  auto crop_meta = gst_buffer_get_video_crop_meta (inbuf);
+  if (crop_meta) {
+    GST_LOG_OBJECT (self, "Have crop rect, x:y:w:h = %d:%d:%d:%d",
+        crop_meta->x, crop_meta->y, crop_meta->width, crop_meta->height);
+
+    in_rect = CD3DX12_BOX (crop_meta->x, crop_meta->y,
+        crop_meta->x + crop_meta->width, crop_meta->y + crop_meta->height);
+  } else {
+    in_rect = priv->in_rect;
+  }
+
+  if (in_rect != priv->in_rect) {
+    priv->prev_in_rect = in_rect;
+    g_object_set (priv->ctx->conv, "src-x", (gint) in_rect.left,
+        "src-y", (gint) in_rect.top,
+        "src-width", (gint) in_rect.right - in_rect.left,
+        "src-height", (gint) in_rect.bottom - in_rect.top, nullptr);
+  }
+
+  auto completed = gst_d3d12_device_get_completed_value (priv->ctx->device,
+      D3D12_COMMAND_LIST_TYPE_DIRECT);
+  while (!priv->ctx->scheduled.empty ()) {
+    if (priv->ctx->scheduled.front () > completed)
+      break;
+
+    priv->ctx->scheduled.pop ();
+  }
+
+  if (priv->ctx->scheduled.size () >= ASYNC_DEPTH) {
+    auto fence_to_wait = priv->ctx->scheduled.front ();
+    priv->ctx->scheduled.pop ();
+    gst_d3d12_device_fence_wait (priv->ctx->device,
+        D3D12_COMMAND_LIST_TYPE_DIRECT, fence_to_wait, priv->ctx->event_handle);
+  }
+
+  GstD3D12CommandAllocator *gst_ca;
+  if (!gst_d3d12_command_allocator_pool_acquire (priv->ctx->ca_pool, &gst_ca)) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire command allocator");
+    return GST_FLOW_ERROR;
+  }
+
+  ComPtr < ID3D12CommandAllocator > ca;
+  gst_d3d12_command_allocator_get_handle (gst_ca, &ca);
+
+  auto hr = ca->Reset ();
+  if (!gst_d3d12_result (hr, priv->ctx->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't reset command allocator");
+    gst_d3d12_command_allocator_unref (gst_ca);
+    return GST_FLOW_ERROR;
+  }
+
+  if (!priv->ctx->cl) {
+    auto device = gst_d3d12_device_get_device_handle (priv->ctx->device);
+    hr = device->CreateCommandList (0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        ca.Get (), nullptr, IID_PPV_ARGS (&priv->ctx->cl));
+    if (!gst_d3d12_result (hr, priv->ctx->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create command list");
+      gst_d3d12_command_allocator_unref (gst_ca);
+      return GST_FLOW_ERROR;
+    }
+  } else {
+    hr = priv->ctx->cl->Reset (ca.Get (), nullptr);
+    if (!gst_d3d12_result (hr, priv->ctx->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't reset command list");
+      gst_d3d12_command_allocator_unref (gst_ca);
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  GstD3D12FenceData *fence_data;
+  gst_d3d12_fence_data_pool_acquire (priv->fence_data_pool, &fence_data);
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, gst_ca);
+
+  if (!gst_d3d12_converter_convert_buffer (priv->ctx->conv,
+          inbuf, outbuf, fence_data, priv->ctx->cl.Get ())) {
+    GST_ERROR_OBJECT (self, "Couldn't build command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    return GST_FLOW_ERROR;
+  }
+
+  hr = priv->ctx->cl->Close ();
+  if (!gst_d3d12_result (hr, priv->ctx->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't close command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    return GST_FLOW_ERROR;
+  }
+
+  ID3D12CommandList *cmd_list = { priv->ctx->cl.Get () };
+
+  if (!gst_d3d12_device_execute_command_lists (priv->ctx->device,
+          D3D12_COMMAND_LIST_TYPE_DIRECT, 1, cmd_list, &priv->ctx->fence_val)) {
+    GST_ERROR_OBJECT (self, "Couldn't execute command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    return GST_FLOW_ERROR;
+  }
+
+  gst_d3d12_buffer_after_write (outbuf, priv->ctx->fence_val);
+
+  gst_d3d12_device_set_fence_notify (priv->ctx->device,
+      D3D12_COMMAND_LIST_TYPE_DIRECT, priv->ctx->fence_val, fence_data);
+
+  priv->ctx->scheduled.push (priv->ctx->fence_val);
+
+  return GST_FLOW_OK;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12convert.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "gstd3d12basefilter.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_CONVERT (gst_d3d12_convert_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12Convert, gst_d3d12_convert,
+    GST, D3D12_CONVERT, GstD3D12BaseFilter)
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12converter-builder.cpp Added

@@ -0,0 +1,579 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12.h"
+#include "gstd3d12converter-builder.h"
+#include <directx/d3dx12.h>
+#include <map>
+#include <mutex>
+#include <string>
+#include <utility>
+#include <memory>
+#include "PSMainConverter.h"
+#include "VSMain_converter.h"
+
+GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_converter_debug);
+#define GST_CAT_DEFAULT gst_d3d12_converter_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+enum class PS_OUTPUT
+{
+  PACKED,
+  LUMA,
+  CHROMA,
+  CHROMA_PLANAR,
+  PLANAR,
+  PLANAR_FULL,
+};
+
+static const std::string
+ps_output_to_string (PS_OUTPUT output)
+{
+  switch (output) {
+    case PS_OUTPUT::PACKED:
+      return "PS_OUTPUT_PACKED";
+    case PS_OUTPUT::LUMA:
+      return "PS_OUTPUT_LUMA";
+    case PS_OUTPUT::CHROMA:
+      return "PS_OUTPUT_CHROMA";
+    case PS_OUTPUT::CHROMA_PLANAR:
+      return "PS_OUTPUT_CHROMA_PLANAR";
+    case PS_OUTPUT::PLANAR:
+      return "PS_OUTPUT_PLANAR";
+    case PS_OUTPUT::PLANAR_FULL:
+      return "PS_OUTPUT_PLANAR_FULL";
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return "";
+}
+
+static guint
+ps_output_get_num_rtv (PS_OUTPUT output)
+{
+  switch (output) {
+    case PS_OUTPUT::PACKED:
+    case PS_OUTPUT::LUMA:
+    case PS_OUTPUT::CHROMA:
+      return 1;
+    case PS_OUTPUT::CHROMA_PLANAR:
+      return 2;
+    case PS_OUTPUT::PLANAR:
+      return 3;
+    case PS_OUTPUT::PLANAR_FULL:
+      return 4;
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return 0;
+}
+
+static std::string
+make_input (GstVideoFormat format, gboolean premul)
+{
+  switch (format) {
+    case GST_VIDEO_FORMAT_RGBA:
+    case GST_VIDEO_FORMAT_RGBA64_LE:
+    case GST_VIDEO_FORMAT_RGB10A2_LE:
+    case GST_VIDEO_FORMAT_BGRA:
+      if (premul)
+        return "RGBAPremul";
+      return "RGBA";
+    case GST_VIDEO_FORMAT_RGBx:
+    case GST_VIDEO_FORMAT_BGRx:
+      return "RGBx";
+    case GST_VIDEO_FORMAT_ARGB:
+      return "ARGB";
+    case GST_VIDEO_FORMAT_xRGB:
+      return "xRGB";
+    case GST_VIDEO_FORMAT_ABGR:
+      return "ABGR";
+    case GST_VIDEO_FORMAT_xBGR:
+      return "xBGR";
+    case GST_VIDEO_FORMAT_VUYA:
+      return "VUYA";
+    case GST_VIDEO_FORMAT_AYUV:
+    case GST_VIDEO_FORMAT_AYUV64:
+      return "AYUV";
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+    case GST_VIDEO_FORMAT_P016_LE:
+      return "NV12";
+    case GST_VIDEO_FORMAT_NV21:
+      return "NV21";
+    case GST_VIDEO_FORMAT_I420:
+    case GST_VIDEO_FORMAT_Y42B:
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_Y444_16LE:
+      return "I420";
+    case GST_VIDEO_FORMAT_YV12:
+      return "YV12";
+    case GST_VIDEO_FORMAT_I420_10LE:
+    case GST_VIDEO_FORMAT_I422_10LE:
+    case GST_VIDEO_FORMAT_Y444_10LE:
+      return "I420_10";
+    case GST_VIDEO_FORMAT_I420_12LE:
+    case GST_VIDEO_FORMAT_I422_12LE:
+    case GST_VIDEO_FORMAT_Y444_12LE:
+      return "I420_12";
+    case GST_VIDEO_FORMAT_Y410:
+      return "Y410";
+    case GST_VIDEO_FORMAT_GRAY8:
+    case GST_VIDEO_FORMAT_GRAY16_LE:
+      return "GRAY";
+    case GST_VIDEO_FORMAT_RGBP:
+      return "RGBP";
+    case GST_VIDEO_FORMAT_BGRP:
+      return "BGRP";
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      return "GBR";
+    case GST_VIDEO_FORMAT_GBR_10LE:
+      return "GBR_10";
+    case GST_VIDEO_FORMAT_GBR_12LE:
+      return "GBR_12";
+    case GST_VIDEO_FORMAT_GBRA:
+      return "GBRA";
+    case GST_VIDEO_FORMAT_GBRA_10LE:
+      return "GBRA_10";
+    case GST_VIDEO_FORMAT_GBRA_12LE:
+      return "GBRA_12";
+    case GST_VIDEO_FORMAT_Y412_LE:
+      return "Y412";
+    case GST_VIDEO_FORMAT_BGR10A2_LE:
+      return "BGR10A2";
+    case GST_VIDEO_FORMAT_BGRA64_LE:
+      return "BGRA64";
+    case GST_VIDEO_FORMAT_RBGA:
+      return "RBGA";
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return "";
+}
+
+static std::vector<std::pair<PS_OUTPUT, std::string>>
+make_output (GstVideoFormat format, gboolean premul)
+{
+  std::vector<std::pair<PS_OUTPUT, std::string>> ret;
+
+  switch (format) {
+    case GST_VIDEO_FORMAT_RGBA:
+    case GST_VIDEO_FORMAT_RGBA64_LE:
+    case GST_VIDEO_FORMAT_RGB10A2_LE:
+    case GST_VIDEO_FORMAT_BGRA:
+      if (premul)
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "RGBAPremul"));
+      else
+        ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "RGBA"));
+      break;
+    case GST_VIDEO_FORMAT_RGBx:
+    case GST_VIDEO_FORMAT_BGRx:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "RGBx"));
+      break;
+    case GST_VIDEO_FORMAT_ARGB:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "ARGB"));
+      break;
+    case GST_VIDEO_FORMAT_xRGB:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "xRGB"));
+      break;
+    case GST_VIDEO_FORMAT_ABGR:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "ABGR"));
+      break;
+    case GST_VIDEO_FORMAT_xBGR:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "xBGR"));
+      break;
+    case GST_VIDEO_FORMAT_VUYA:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "VUYA"));
+      break;
+    case GST_VIDEO_FORMAT_AYUV:
+    case GST_VIDEO_FORMAT_AYUV64:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "AYUV"));
+      break;
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+    case GST_VIDEO_FORMAT_P016_LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA, "ChromaNV12"));
+      break;
+    case GST_VIDEO_FORMAT_NV21:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA, "ChromaNV21"));
+      break;
+    case GST_VIDEO_FORMAT_I420:
+    case GST_VIDEO_FORMAT_Y42B:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA_PLANAR, "ChromaI420"));
+      break;
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_Y444_16LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "Y444"));
+      break;
+    case GST_VIDEO_FORMAT_YV12:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA_PLANAR, "ChromaYV12"));
+      break;
+    case GST_VIDEO_FORMAT_I420_10LE:
+    case GST_VIDEO_FORMAT_I422_10LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma_10"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA_PLANAR, "ChromaI420_10"));
+      break;
+    case GST_VIDEO_FORMAT_Y444_10LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "Y444_10"));
+      break;
+    case GST_VIDEO_FORMAT_I420_12LE:
+    case GST_VIDEO_FORMAT_I422_12LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma_12"));
+      ret.push_back(std::make_pair(PS_OUTPUT::CHROMA_PLANAR, "ChromaI420_12"));
+      break;
+    case GST_VIDEO_FORMAT_Y444_12LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "Y444_12"));
+      break;
+    case GST_VIDEO_FORMAT_GRAY8:
+    case GST_VIDEO_FORMAT_GRAY16_LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::LUMA, "Luma"));
+      break;
+    case GST_VIDEO_FORMAT_RGBP:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "RGBP"));
+      break;
+    case GST_VIDEO_FORMAT_BGRP:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "BGRP"));
+      break;
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "GBR"));
+      break;
+    case GST_VIDEO_FORMAT_GBR_10LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "GBR_10"));
+      break;
+    case GST_VIDEO_FORMAT_GBR_12LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR, "GBR_12"));
+      break;
+    case GST_VIDEO_FORMAT_GBRA:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR_FULL, "GBRA"));
+      break;
+    case GST_VIDEO_FORMAT_GBRA_10LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR_FULL, "GBRA_10"));
+      break;
+    case GST_VIDEO_FORMAT_GBRA_12LE:
+      ret.push_back(std::make_pair(PS_OUTPUT::PLANAR_FULL, "GBRA_12"));
+      break;
+    case GST_VIDEO_FORMAT_RBGA:
+      ret.push_back(std::make_pair(PS_OUTPUT::PACKED, "RBGA"));
+      break;
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return ret;
+}
+
+PixelShaderBlobList
+gst_d3d12_get_converter_pixel_shader_blob (GstVideoFormat in_format,
+    GstVideoFormat out_format, gboolean in_premul, gboolean out_premul,
+    CONVERT_TYPE type)
+{
+  auto input = make_input (in_format, in_premul);
+  auto output = make_output (out_format, out_premul);
+  std::string conv_type;
+  PixelShaderBlobList ret;
+  static std::mutex cache_lock;
+  static std::map<std::string, std::shared_ptr<PixelShaderBlob>> ps_cache;
+
+  switch (type) {
+    case CONVERT_TYPE::IDENTITY:
+      conv_type = "Identity";
+      break;
+    case CONVERT_TYPE::SIMPLE:
+      conv_type = "Simple";
+      break;
+    case CONVERT_TYPE::RANGE:
+      conv_type = "Range";
+      break;
+    case CONVERT_TYPE::GAMMA:
+      conv_type = "Gamma";
+      break;
+    case CONVERT_TYPE::PRIMARY:
+      conv_type = "Primary";
+      break;
+  }
+
+  for (const auto & it : output) {
+    std::string entry_point = "PSMain_" + input + "_" + conv_type + "_" +
+        it.second;
+    std::shared_ptr<PixelShaderBlob> source;
+    std::lock_guard<std::mutex> lk (cache_lock);
+    auto cached = ps_cache.find(entry_point);
+    if (cached != ps_cache.end()) {
+      source = cached->second;
+    } else {
+      auto precompiled = precompiled_bytecode.find (entry_point);
+      if (precompiled == precompiled_bytecode.end ()) {
+        GST_ERROR ("Couldn't find precompiled %s", entry_point.c_str ());
+        ret.clear ();
+        return ret;
+      }
+      source = std::make_shared<PixelShaderBlob> ();
+      source->bytecode.pShaderBytecode = precompiled->second.first;
+      source->bytecode.BytecodeLength = precompiled->second.second;
+      source->num_rtv = ps_output_get_num_rtv (it.first);
+      ps_cacheentry_point = source;
+    }
+
+    ret.push_back (*source);
+  }
+
+  return ret;
+}
+/* *INDENT-ON* */
+
+HRESULT
+gst_d3d12_get_converter_vertex_shader_blob (D3D12_SHADER_BYTECODE * vs,
+    D3D12_INPUT_ELEMENT_DESC input_desc2)
+{
+  input_desc0.SemanticName = "POSITION";
+  input_desc0.SemanticIndex = 0;
+  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+  input_desc0.InputSlot = 0;
+  input_desc0.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  input_desc0.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  input_desc0.InstanceDataStepRate = 0;
+
+  input_desc1.SemanticName = "TEXCOORD";
+  input_desc1.SemanticIndex = 0;
+  input_desc1.Format = DXGI_FORMAT_R32G32_FLOAT;
+  input_desc1.InputSlot = 0;
+  input_desc1.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  input_desc1.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  input_desc1.InstanceDataStepRate = 0;
+
+  vs->BytecodeLength = sizeof (g_VSMain_converter);
+  vs->pShaderBytecode = g_VSMain_converter;
+
+  return S_OK;
+}
+
+/* root signature
+ *
+ * +-----+---------+--------------+
+ * | RS  | size in |              |
+ * | idx |  DWORD  |              |
+ * +-----+---------+--------------+
+ * | 0   |  1      | table (SRV)  |
+ * +-----+---------+--------------+
+ * | 1   |  16     |  VS matrix   |
+ * +-----+---------+--------------+
+ * | 2   |  1      |   PS alpha   |
+ * +-----+---------+--------------+
+ * | 3   |  2      |   PS CBV     |
+ * +-----+---------+--------------+
+ */
+static const D3D12_STATIC_SAMPLER_DESC static_sampler_desc_ = {
+  D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT,
+  D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+  D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+  D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+  0,
+  1,
+  D3D12_COMPARISON_FUNC_ALWAYS,
+  D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK,
+  0,
+  D3D12_FLOAT32_MAX,
+  0,
+  0,
+  D3D12_SHADER_VISIBILITY_PIXEL
+};
+
+static const D3D12_ROOT_SIGNATURE_FLAGS rs_flags_ =
+    D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_AMPLIFICATION_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_MESH_SHADER_ROOT_ACCESS;
+
+ConverterRootSignature::ConverterRootSignature (D3D_ROOT_SIGNATURE_VERSION
+    version, UINT num_srv, D3D12_FILTER filter, bool build_lut)
+{
+  D3D12_VERSIONED_ROOT_SIGNATURE_DESC desc = { };
+
+  num_srv_ = num_srv;
+  have_lut_ = build_lut;
+
+  std::vector < D3D12_STATIC_SAMPLER_DESC > static_sampler;
+  D3D12_STATIC_SAMPLER_DESC sampler_desc = static_sampler_desc_;
+  sampler_desc.Filter = filter;
+  if (filter == D3D12_FILTER_ANISOTROPIC)
+    sampler_desc.MaxAnisotropy = 16;
+
+  static_sampler.push_back (sampler_desc);
+
+  if (build_lut) {
+    sampler_desc = static_sampler_desc_;
+    sampler_desc.ShaderRegister = 1;
+    static_sampler.push_back (sampler_desc);
+  }
+
+  std::vector < D3D12_DESCRIPTOR_RANGE1 > range_v1_1;
+  std::vector < D3D12_ROOT_PARAMETER1 > param_list_v1_1;
+
+  std::vector < D3D12_DESCRIPTOR_RANGE > range_v1_0;
+  std::vector < D3D12_ROOT_PARAMETER > param_list_v1_0;
+
+  if (version == D3D_ROOT_SIGNATURE_VERSION_1_1) {
+    CD3DX12_ROOT_PARAMETER1 param;
+    ps_srv_ = 0;
+    for (UINT i = 0; i < num_srv; i++) {
+      range_v1_1.push_back (CD3DX12_DESCRIPTOR_RANGE1
+          (D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, i, 0,
+              D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE |
+              D3D12_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE));
+    }
+
+    if (build_lut) {
+      range_v1_1.push_back (CD3DX12_DESCRIPTOR_RANGE1
+          (D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 4, 0,
+              D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE |
+              D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE));
+      range_v1_1.push_back (CD3DX12_DESCRIPTOR_RANGE1
+          (D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 5, 0,
+              D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE |
+              D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE));
+    }
+
+    param.InitAsDescriptorTable (range_v1_1.size (),
+        range_v1_1.data (), D3D12_SHADER_VISIBILITY_PIXEL);
+    param_list_v1_1.push_back (param);
+
+    /* VS root const, maybe updated */
+    vs_root_const_ = (UINT) param_list_v1_1.size ();
+    param.InitAsConstants (16, 0, 1, D3D12_SHADER_VISIBILITY_VERTEX);
+    param_list_v1_1.push_back (param);
+
+    /* PS alpha constant value, maybe updated */
+    ps_root_const_ = (UINT) param_list_v1_1.size ();
+    param.InitAsConstants (1, 0, 0, D3D12_SHADER_VISIBILITY_PIXEL);
+    param_list_v1_1.push_back (param);
+
+    /* PS CBV, this is static */
+    ps_cbv_ = (UINT) param_list_v1_1.size ();
+    param.InitAsConstantBufferView (1, 0,
+        D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE,
+        D3D12_SHADER_VISIBILITY_PIXEL);
+    param_list_v1_1.push_back (param);
+
+    CD3DX12_VERSIONED_ROOT_SIGNATURE_DESC::Init_1_1 (desc,
+        param_list_v1_1.size (), param_list_v1_1.data (),
+        static_sampler.size (), static_sampler.data (), rs_flags_);
+  } else {
+    CD3DX12_ROOT_PARAMETER param;
+    ps_srv_ = 0;
+    for (UINT i = 0; i < num_srv; i++) {
+      range_v1_0.push_back (CD3DX12_DESCRIPTOR_RANGE
+          (D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, i));
+    }
+
+    if (build_lut) {
+      range_v1_0.push_back (CD3DX12_DESCRIPTOR_RANGE
+          (D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 4));
+      range_v1_0.push_back (CD3DX12_DESCRIPTOR_RANGE
+          (D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 5));
+    }
+
+    param.InitAsDescriptorTable (range_v1_0.size (),
+        range_v1_0.data (), D3D12_SHADER_VISIBILITY_PIXEL);
+    param_list_v1_0.push_back (param);
+
+    /* VS root const, maybe updated */
+    vs_root_const_ = (UINT) param_list_v1_0.size ();
+    param.InitAsConstants (16, 0, 1, D3D12_SHADER_VISIBILITY_VERTEX);
+    param_list_v1_0.push_back (param);
+
+    /* PS alpha constant value, maybe updated */
+    ps_root_const_ = (UINT) param_list_v1_0.size ();
+    param.InitAsConstants (1, 0, 0, D3D12_SHADER_VISIBILITY_PIXEL);
+    param_list_v1_0.push_back (param);
+
+    /* PS CBV, this is static */
+    ps_cbv_ = (UINT) param_list_v1_0.size ();
+    param.InitAsConstantBufferView (1, 0, D3D12_SHADER_VISIBILITY_PIXEL);
+    param_list_v1_0.push_back (param);
+
+    CD3DX12_VERSIONED_ROOT_SIGNATURE_DESC::Init_1_0 (desc,
+        param_list_v1_0.size (), param_list_v1_0.data (),
+        static_sampler.size (), static_sampler.data (), rs_flags_);
+  }
+
+  ComPtr < ID3DBlob > error_blob;
+  hr_ = D3DX12SerializeVersionedRootSignature (&desc,
+      D3D_ROOT_SIGNATURE_VERSION_1_1, &blob_, &error_blob);
+  if (FAILED (hr_)) {
+    const gchar *error_msg = nullptr;
+    if (error_blob)
+      error_msg = (const gchar *) error_blob->GetBufferPointer ();
+    GST_ERROR ("Couldn't serialize root signature, hr: 0x%x, error detail: %s",
+        (guint) hr_, GST_STR_NULL (error_msg));
+  }
+}
+
+ConverterRootSignaturePtr
+gst_d3d12_get_converter_root_signature (GstD3D12Device * device,
+    GstVideoFormat in_format, CONVERT_TYPE type, D3D12_FILTER filter)
+{
+  auto info = gst_video_format_get_info (in_format);
+  auto num_planes = GST_VIDEO_FORMAT_INFO_N_PLANES (info);
+  bool build_lut = false;
+
+  auto device_handle = gst_d3d12_device_get_device_handle (device);
+  D3D_ROOT_SIGNATURE_VERSION rs_version = D3D_ROOT_SIGNATURE_VERSION_1_1;
+  D3D12_FEATURE_DATA_ROOT_SIGNATURE feature_data = { };
+  feature_data.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1;
+  auto hr = device_handle->CheckFeatureSupport (D3D12_FEATURE_ROOT_SIGNATURE,
+      &feature_data, sizeof (feature_data));
+  if (FAILED (hr)) {
+    rs_version = D3D_ROOT_SIGNATURE_VERSION_1_0;
+  } else {
+    GST_INFO_OBJECT (device, "Device supports version 1.1 root signature");
+  }
+
+  if (type == CONVERT_TYPE::GAMMA || type == CONVERT_TYPE::PRIMARY)
+    build_lut = true;
+
+  auto rs = std::make_shared < ConverterRootSignature >
+      (rs_version, num_planes, filter, build_lut);
+  if (!rs->IsValid ())
+    return nullptr;
+
+  return rs;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12converter-builder.h Added

@@ -0,0 +1,127 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+#include <vector>
+#include <wrl.h>
+#include <memory>
+#include <vector>
+
+enum class CONVERT_TYPE
+{
+  IDENTITY,
+  SIMPLE,
+  RANGE,
+  GAMMA,
+  PRIMARY,
+};
+
+struct PixelShaderBlob
+{
+  D3D12_SHADER_BYTECODE bytecode;
+  guint num_rtv;
+};
+
+class ConverterRootSignature
+{
+public:
+  ConverterRootSignature () = delete;
+  ConverterRootSignature (D3D_ROOT_SIGNATURE_VERSION version, UINT num_srv,
+      D3D12_FILTER filter, bool build_lut);
+
+  UINT GetPsSrvIdx ()
+  {
+    return ps_srv_;
+  }
+
+  UINT GetNumSrv ()
+  {
+    return num_srv_;
+  }
+
+  bool HaveLut ()
+  {
+    return have_lut_;
+  }
+
+  UINT GetVsRootConstIdx ()
+  {
+    return vs_root_const_;
+  }
+
+  UINT GetPsRootConstIdx ()
+  {
+    return ps_root_const_;
+  };
+
+  UINT GetPsCbvIdx ()
+  {
+    return ps_cbv_;
+  }
+
+  bool IsValid ()
+  {
+    return SUCCEEDED (hr_);
+  }
+
+  HRESULT GetBlob (ID3DBlob ** blob)
+  {
+    if (SUCCEEDED (hr_)) {
+      *blob = blob_.Get ();
+      (*blob)->AddRef ();
+    }
+
+    return hr_;
+  }
+
+private:
+  Microsoft::WRL::ComPtr<ID3DBlob> blob_;
+
+  UINT ps_srv_ = 0;
+  UINT ps_cbv_ = 0;
+  UINT vs_root_const_ = 0;
+  UINT num_srv_ = 0;
+  bool have_lut_ = false;
+  UINT ps_root_const_ = 0;
+  HRESULT hr_ = S_OK;
+};
+
+typedef std::vector<PixelShaderBlob> PixelShaderBlobList;
+typedef std::shared_ptr<ConverterRootSignature> ConverterRootSignaturePtr;
+
+PixelShaderBlobList
+gst_d3d12_get_converter_pixel_shader_blob (GstVideoFormat in_format,
+                                           GstVideoFormat out_format,
+                                           gboolean in_premul,
+                                           gboolean out_premul,
+                                           CONVERT_TYPE type);
+
+HRESULT
+gst_d3d12_get_converter_vertex_shader_blob (D3D12_SHADER_BYTECODE * vs,
+                                            D3D12_INPUT_ELEMENT_DESC layout2);
+
+ConverterRootSignaturePtr
+gst_d3d12_get_converter_root_signature (GstD3D12Device * device,
+                                        GstVideoFormat in_format,
+                                        CONVERT_TYPE type,
+                                        D3D12_FILTER filter);
\ No newline at end of file

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12converter.cpp Added

@@ -0,0 +1,2355 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12.h"
+#include "gstd3d12converter-builder.h"
+#include <directx/d3dx12.h>
+#include <wrl.h>
+#include <string.h>
+#include <math.h>
+#include <map>
+#include <vector>
+#include <memory>
+#include <queue>
+
+#ifndef HAVE_DIRECTX_MATH_SIMD
+#define _XM_NO_INTRINSICS_
+#endif
+#include <DirectXMath.h>
+
+GST_DEBUG_CATEGORY (gst_d3d12_converter_debug);
+#define GST_CAT_DEFAULT gst_d3d12_converter_debug
+
+GType
+gst_d3d12_converter_sampler_filter_get_type (void)
+{
+  static GType filter_type = 0;
+  static const GEnumValue filter_types = {
+    {D3D12_FILTER_MIN_MAG_MIP_POINT,
+        "D3D12_FILTER_MIN_MAG_MIP_POINT", "min-mag-mip-point"},
+    {D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT,
+        "D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT", "min-linear-mag-mip-point"},
+    {D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT,
+        "D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT", "min-mag-linear-mip-point"},
+    {D3D12_FILTER_ANISOTROPIC, "D3D12_FILTER_ANISOTROPIC", "anisotropic"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    filter_type = g_enum_register_static ("GstD3D12ConverterSamplerFilter",
+        filter_types);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return filter_type;
+}
+
+GType
+gst_d3d12_converter_alpha_mode_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue alpha_mode = {
+    {GST_D3D12_CONVERTER_ALPHA_MODE_UNSPECIFIED,
+        "GST_D3D12_CONVERTER_ALPHA_MODE_UNSPECIFIED", "unspecified"},
+    {GST_D3D12_CONVERTER_ALPHA_MODE_PREMULTIPLIED,
+        "GST_D3D12_CONVERTER_ALPHA_MODE_PREMULTIPLIED", "premultiplied"},
+    {GST_D3D12_CONVERTER_ALPHA_MODE_STRAIGHT,
+        "GST_D3D12_CONVERTER_ALPHA_MODE_STRAIGHT", "straight"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstD3D12ConverterAlphaMode", alpha_mode);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return type;
+}
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+using namespace DirectX;
+/* *INDENT-ON* */
+
+#define GAMMA_LUT_SIZE 4096
+#define DEFAULT_BUFFER_COUNT 2
+static const WORD g_indices6 = { 0, 1, 2, 3, 0, 2 };
+
+struct PSColorSpace
+{
+  /* + 1 for 16bytes alignment  */
+  FLOAT coeffX4;
+  FLOAT coeffY4;
+  FLOAT coeffZ4;
+  FLOAT offset4;
+  FLOAT min4;
+  FLOAT max4;
+};
+
+struct PSConstBuffer
+{
+  PSColorSpace preCoeff;
+  PSColorSpace postCoeff;
+  PSColorSpace primariesCoeff;
+};
+
+struct VertexData
+{
+  struct
+  {
+    FLOAT x;
+    FLOAT y;
+    FLOAT z;
+  } position;
+  struct
+  {
+    FLOAT u;
+    FLOAT v;
+  } texture;
+};
+
+struct GammaLut
+{
+  guint16 lutGAMMA_LUT_SIZE;
+};
+
+/* *INDENT-OFF* */
+typedef std::shared_ptr<GammaLut> GammaLutPtr;
+
+static const XMFLOAT4X4A g_matrix_identity = XMFLOAT4X4A (
+    1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 1.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_90r = XMFLOAT4X4A (
+    0.0f, -1.0f, 0.0f, 0.0f,
+    1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_180 = XMFLOAT4X4A (
+    -1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, -1.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_90l = XMFLOAT4X4A (
+    0.0f, 1.0f, 0.0f, 0.0f,
+    -1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_horiz = XMFLOAT4X4A (
+    -1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 1.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_vert = XMFLOAT4X4A (
+    1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, -1.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_ul_lr = XMFLOAT4X4A (
+    0.0f, -1.0f, 0.0f, 0.0f,
+    -1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+
+static const XMFLOAT4X4A g_matrix_ur_ll = XMFLOAT4X4A (
+    0.0f, 1.0f, 0.0f, 0.0f,
+    1.0f, 0.0f, 0.0f, 0.0f,
+    0.0f, 0.0f, 1.0f, 0.0f,
+    0.0f, 0.0f, 0.0f, 1.0f);
+/* *INDENT-ON* */
+
+enum
+{
+  PROP_0,
+  PROP_SRC_X,
+  PROP_SRC_Y,
+  PROP_SRC_WIDTH,
+  PROP_SRC_HEIGHT,
+  PROP_DEST_X,
+  PROP_DEST_Y,
+  PROP_DEST_WIDTH,
+  PROP_DEST_HEIGHT,
+  PROP_ALPHA,
+  PROP_FILL_BORDER,
+  PROP_BORDER_COLOR,
+  PROP_VIDEO_DIRECTION,
+};
+
+/* *INDENT-OFF* */
+struct QuadData
+{
+  D3D12_INPUT_ELEMENT_DESC input_desc2;
+  D3D12_GRAPHICS_PIPELINE_STATE_DESC desc = { };
+  ComPtr<ID3D12PipelineState> pso;
+  guint num_rtv;
+};
+
+#define STATE_VERTEX_AND_INDEX \
+  (D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER | D3D12_RESOURCE_STATE_INDEX_BUFFER)
+
+struct ConverterUploadData
+{
+  ComPtr<ID3D12Resource> vertex_index_upload;
+  ComPtr<ID3D12Resource> ps_const_upload;
+  ComPtr<ID3D12Resource> gamma_dec_lut_upload;
+  ComPtr<ID3D12Resource> gamma_enc_lut_upload;
+};
+
+static void
+converter_upload_data_free (ConverterUploadData * data)
+{
+  if (data)
+    delete data;
+}
+
+struct _GstD3D12ConverterPrivate
+{
+  _GstD3D12ConverterPrivate ()
+  {
+    transform = g_matrix_identity;
+    custom_transform = g_matrix_identity;
+    blend_desc = CD3DX12_BLEND_DESC (D3D12_DEFAULT);
+    for (guint i = 0; i < 4; i++)
+      blend_factori = 1.0f;
+
+    sample_desc.Count = 1;
+    sample_desc.Quality = 0;
+  }
+
+  ~_GstD3D12ConverterPrivate ()
+  {
+    if (fallback_pool) {
+      gst_buffer_pool_set_active (fallback_pool, FALSE);
+      gst_clear_object (&fallback_pool);
+    }
+    converter_upload_data_free (upload_data);
+    gst_clear_object (&srv_heap_pool);
+  }
+
+  GstVideoInfo in_info;
+  GstVideoInfo out_info;
+
+  GstD3D12Format in_d3d12_format;
+  GstD3D12Format out_d3d12_format;
+
+  CONVERT_TYPE convert_type = CONVERT_TYPE::IDENTITY;
+
+  D3D12_VIEWPORT viewportGST_VIDEO_MAX_PLANES;
+  D3D12_RECT scissor_rectGST_VIDEO_MAX_PLANES;
+
+  D3D12_BLEND_DESC blend_desc;
+  FLOAT blend_factor4;
+  DXGI_SAMPLE_DESC sample_desc;
+  gboolean update_pso = FALSE;
+
+  GstVideoInfo fallback_pool_info;
+  GstBufferPool *fallback_pool = nullptr;
+
+  ConverterRootSignaturePtr crs;
+  ComPtr<ID3D12RootSignature> rs;
+
+  D3D12_VERTEX_BUFFER_VIEW vbv;
+  D3D12_INDEX_BUFFER_VIEW idv;
+  ComPtr<ID3D12Resource> vertex_index_buf;
+  ComPtr<ID3D12Resource> ps_const_buf;
+  ComPtr<ID3D12Resource> gamma_dec_lut;
+  ComPtr<ID3D12Resource> gamma_enc_lut;
+  D3D12_PLACED_SUBRESOURCE_FOOTPRINT gamma_lut_layout;
+  ComPtr<ID3D12DescriptorHeap> gamma_lut_heap;
+
+  std::vector<QuadData> quad_data;
+
+  GstD3D12DescriptorPool *srv_heap_pool = nullptr;
+
+  ConverterUploadData *upload_data = nullptr;
+  bool is_first = true;
+
+  guint srv_inc_size;
+  guint rtv_inc_size;
+
+  std::vector<D3D12_RESOURCE_BARRIER> barriers;
+  std::vector<D3D12_CPU_DESCRIPTOR_HANDLE> rtv_handles;
+
+  guint64 input_texture_width;
+  guint input_texture_height;
+  gboolean update_src_rect = FALSE;
+  gboolean update_dest_rect = FALSE;
+  gboolean update_transform = FALSE;
+  XMFLOAT4X4A transform;
+  XMFLOAT4X4A custom_transform;
+
+  PSConstBuffer const_data;
+
+  gboolean clear_background = FALSE;
+  FLOAT clear_color44;
+  GstD3D12ColorMatrix clear_color_matrix;
+
+  GstVideoOrientationMethod video_direction;
+
+  std::mutex prop_lock;
+
+  /* properties */
+  gint src_x = 0;
+  gint src_y = 0;
+  gint src_width = 0;
+  gint src_height = 0;
+  gint dest_x = 0;
+  gint dest_y = 0;
+  gint dest_width = 0;
+  gint dest_height = 0;
+  FLOAT alpha = 1.0;
+  gboolean fill_border = FALSE;
+  guint64 border_color = 0;
+  GstD3D12ConverterAlphaMode src_alpha_mode =
+      GST_D3D12_CONVERTER_ALPHA_MODE_UNSPECIFIED;
+  GstD3D12ConverterAlphaMode dst_alpha_mode =
+      GST_D3D12_CONVERTER_ALPHA_MODE_UNSPECIFIED;
+};
+/* *INDENT-ON* */
+
+static void gst_d3d12_converter_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_d3d12_converter_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+static void gst_d3d12_converter_finalize (GObject * object);
+static void
+gst_d3d12_converter_calculate_border_color (GstD3D12Converter * self);
+
+#define gst_d3d12_converter_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12Converter, gst_d3d12_converter, GST_TYPE_OBJECT);
+
+static void
+gst_d3d12_converter_class_init (GstD3D12ConverterClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto param_flags = (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  object_class->set_property = gst_d3d12_converter_set_property;
+  object_class->get_property = gst_d3d12_converter_get_property;
+  object_class->finalize = gst_d3d12_converter_finalize;
+
+  g_object_class_install_property (object_class, PROP_SRC_X,
+      g_param_spec_int ("src-x", "Src-X",
+          "Source x poisition to start conversion", G_MININT, G_MAXINT, 0,
+          param_flags));
+  g_object_class_install_property (object_class, PROP_SRC_Y,
+      g_param_spec_int ("src-y", "Src-Y",
+          "Source y poisition to start conversion", G_MININT, G_MAXINT, 0,
+          param_flags));
+  g_object_class_install_property (object_class, PROP_SRC_WIDTH,
+      g_param_spec_int ("src-width", "Src-Width",
+          "Source width to convert", 0, G_MAXINT, 0, param_flags));
+  g_object_class_install_property (object_class, PROP_SRC_HEIGHT,
+      g_param_spec_int ("src-height", "Src-Height",
+          "Source height to convert", 0, G_MAXINT, 0, param_flags));
+  g_object_class_install_property (object_class, PROP_DEST_X,
+      g_param_spec_int ("dest-x", "Dest-X",
+          "x poisition in the destination frame", G_MININT, G_MAXINT, 0,
+          param_flags));
+  g_object_class_install_property (object_class, PROP_DEST_Y,
+      g_param_spec_int ("dest-y", "Dest-Y",
+          "y poisition in the destination frame", G_MININT, G_MAXINT, 0,
+          param_flags));
+  g_object_class_install_property (object_class, PROP_DEST_WIDTH,
+      g_param_spec_int ("dest-width", "Dest-Width",
+          "Width in the destination frame", 0, G_MAXINT, 0, param_flags));
+  g_object_class_install_property (object_class, PROP_DEST_HEIGHT,
+      g_param_spec_int ("dest-height", "Dest-Height",
+          "Height in the destination frame", 0, G_MAXINT, 0, param_flags));
+  g_object_class_install_property (object_class, PROP_ALPHA,
+      g_param_spec_double ("alpha", "Alpha",
+          "The alpha color value to use", 0, 1.0, 1.0, param_flags));
+  g_object_class_install_property (object_class, PROP_FILL_BORDER,
+      g_param_spec_boolean ("fill-border", "Fill border",
+          "Fill border with \"border-color\" if destination rectangle does not "
+          "fill the complete destination image", FALSE, param_flags));
+  g_object_class_install_property (object_class, PROP_BORDER_COLOR,
+      g_param_spec_uint64 ("border-color", "Border Color",
+          "ARGB representation of the border color to use",
+          0, G_MAXUINT64, 0xffff000000000000, param_flags));
+  g_object_class_install_property (object_class, PROP_VIDEO_DIRECTION,
+      g_param_spec_enum ("video-direction", "Video Direction",
+          "Video direction", GST_TYPE_VIDEO_ORIENTATION_METHOD,
+          GST_VIDEO_ORIENTATION_IDENTITY, param_flags));
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_converter_debug,
+      "d3d12converter", 0, "d3d12converter");
+}
+
+static void
+gst_d3d12_converter_init (GstD3D12Converter * self)
+{
+  self->priv = new GstD3D12ConverterPrivate ();
+}
+
+static void
+gst_d3d12_converter_finalize (GObject * object)
+{
+  auto self = GST_D3D12_CONVERTER (object);
+
+  delete self->priv;
+  gst_clear_object (&self->device);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+update_src_rect (GstD3D12Converter * self, gint * old_val,
+    const GValue * new_val)
+{
+  auto priv = self->priv;
+  gint tmp;
+
+  tmp = g_value_get_int (new_val);
+  if (tmp != *old_val) {
+    priv->update_src_rect = TRUE;
+    *old_val = tmp;
+  }
+}
+
+static void
+update_dest_rect (GstD3D12Converter * self, gint * old_val,
+    const GValue * new_val)
+{
+  auto priv = self->priv;
+  gint tmp;
+
+  tmp = g_value_get_int (new_val);
+  if (tmp != *old_val) {
+    priv->update_dest_rect = TRUE;
+    *old_val = tmp;
+  }
+}
+
+static void
+gst_d3d12_converter_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_CONVERTER (object);
+  auto priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+  switch (prop_id) {
+    case PROP_SRC_X:
+      update_src_rect (self, &priv->src_x, value);
+      break;
+    case PROP_SRC_Y:
+      update_src_rect (self, &priv->src_y, value);
+      break;
+    case PROP_SRC_WIDTH:
+      update_src_rect (self, &priv->src_width, value);
+      break;
+    case PROP_SRC_HEIGHT:
+      update_src_rect (self, &priv->src_height, value);
+      break;
+    case PROP_DEST_X:
+      update_dest_rect (self, &priv->dest_x, value);
+      break;
+    case PROP_DEST_Y:
+      update_dest_rect (self, &priv->dest_y, value);
+      break;
+    case PROP_DEST_WIDTH:
+      update_dest_rect (self, &priv->dest_width, value);
+      break;
+    case PROP_DEST_HEIGHT:
+      update_dest_rect (self, &priv->dest_height, value);
+      break;
+    case PROP_ALPHA:
+      priv->alpha = g_value_get_double (value);
+      break;
+    case PROP_FILL_BORDER:{
+      gboolean fill_border = g_value_get_boolean (value);
+
+      if (fill_border != priv->fill_border) {
+        priv->update_dest_rect = TRUE;
+        priv->fill_border = fill_border;
+      }
+      break;
+    }
+    case PROP_BORDER_COLOR:{
+      guint64 border_color = g_value_get_uint64 (value);
+
+      if (border_color != priv->border_color) {
+        priv->border_color = border_color;
+        gst_d3d12_converter_calculate_border_color (self);
+      }
+      break;
+    }
+    case PROP_VIDEO_DIRECTION:{
+      GstVideoOrientationMethod video_direction =
+          (GstVideoOrientationMethod) g_value_get_enum (value);
+      if (video_direction != priv->video_direction) {
+        priv->video_direction = video_direction;
+        priv->update_transform = TRUE;
+      }
+      break;
+    }
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_converter_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_CONVERTER (object);
+  auto priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+  switch (prop_id) {
+    case PROP_SRC_X:
+      g_value_set_int (value, priv->src_x);
+      break;
+    case PROP_SRC_Y:
+      g_value_set_int (value, priv->src_y);
+      break;
+    case PROP_SRC_WIDTH:
+      g_value_set_int (value, priv->src_width);
+      break;
+    case PROP_SRC_HEIGHT:
+      g_value_set_int (value, priv->src_height);
+      break;
+    case PROP_DEST_X:
+      g_value_set_int (value, priv->dest_x);
+      break;
+    case PROP_DEST_Y:
+      g_value_set_int (value, priv->dest_y);
+      break;
+    case PROP_DEST_WIDTH:
+      g_value_set_int (value, priv->dest_width);
+      break;
+    case PROP_DEST_HEIGHT:
+      g_value_set_int (value, priv->dest_height);
+      break;
+    case PROP_ALPHA:
+      g_value_set_double (value, priv->alpha);
+      break;
+    case PROP_FILL_BORDER:
+      g_value_set_boolean (value, priv->fill_border);
+      break;
+    case PROP_BORDER_COLOR:
+      g_value_set_uint64 (value, priv->border_color);
+      break;
+    case PROP_VIDEO_DIRECTION:
+      g_value_set_enum (value, priv->video_direction);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GammaLutPtr
+gst_d3d12_converter_get_gamma_dec_table (GstVideoTransferFunction func)
+{
+  static std::mutex lut_lock;
+  static std::map < GstVideoTransferFunction, GammaLutPtr > g_gamma_dec_table;
+
+  std::lock_guard < std::mutex > lk (lut_lock);
+  auto lut = g_gamma_dec_table.find (func);
+  if (lut != g_gamma_dec_table.end ())
+    return lut->second;
+
+  const gdouble scale = (gdouble) 1 / (GAMMA_LUT_SIZE - 1);
+  auto table = std::make_shared < GammaLut > ();
+  for (guint i = 0; i < GAMMA_LUT_SIZE; i++) {
+    gdouble val = gst_video_transfer_function_decode (func, i * scale);
+    val = rint (val * 65535);
+    val = CLAMP (val, 0, 65535);
+    table->luti = (guint16) val;
+  }
+
+  g_gamma_dec_tablefunc = table;
+  return table;
+}
+
+static GammaLutPtr
+gst_d3d12_converter_get_gamma_enc_table (GstVideoTransferFunction func)
+{
+  static std::mutex lut_lock;
+  static std::map < GstVideoTransferFunction, GammaLutPtr > g_gamma_enc_table;
+
+  std::lock_guard < std::mutex > lk (lut_lock);
+  auto lut = g_gamma_enc_table.find (func);
+  if (lut != g_gamma_enc_table.end ())
+    return lut->second;
+
+  const gdouble scale = (gdouble) 1 / (GAMMA_LUT_SIZE - 1);
+  auto table = std::make_shared < GammaLut > ();
+  for (guint i = 0; i < GAMMA_LUT_SIZE; i++) {
+    gdouble val = gst_video_transfer_function_encode (func, i * scale);
+    val = rint (val * 65535);
+    val = CLAMP (val, 0, 65535);
+    table->luti = (guint16) val;
+  }
+
+  g_gamma_enc_tablefunc = table;
+  return table;
+}
+
+static gboolean
+gst_d3d12_converter_setup_resource (GstD3D12Converter * self,
+    const GstVideoInfo * in_info, const GstVideoInfo * out_info,
+    D3D12_FILTER sampler_filter)
+{
+  auto priv = self->priv;
+  HRESULT hr;
+  VertexData vertex_data4;
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+
+  priv->srv_inc_size = device->GetDescriptorHandleIncrementSize
+      (D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+  priv->rtv_inc_size = device->GetDescriptorHandleIncrementSize
+      (D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
+
+  ComPtr < ID3DBlob > rs_blob;
+  priv->crs =
+      gst_d3d12_get_converter_root_signature (self->device,
+      GST_VIDEO_INFO_FORMAT (in_info), priv->convert_type, sampler_filter);
+  if (!priv->crs) {
+    GST_ERROR_OBJECT (self, "Couldn't get root signature blob");
+    return FALSE;
+  }
+
+  priv->crs->GetBlob (&rs_blob);
+  hr = device->CreateRootSignature (0, rs_blob->GetBufferPointer (),
+      rs_blob->GetBufferSize (), IID_PPV_ARGS (&priv->rs));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create root signature");
+    return FALSE;
+  }
+
+  auto psblob_list =
+      gst_d3d12_get_converter_pixel_shader_blob (GST_VIDEO_INFO_FORMAT
+      (in_info), GST_VIDEO_INFO_FORMAT (out_info),
+      priv->src_alpha_mode == GST_D3D12_CONVERTER_ALPHA_MODE_PREMULTIPLIED,
+      priv->dst_alpha_mode == GST_D3D12_CONVERTER_ALPHA_MODE_PREMULTIPLIED,
+      priv->convert_type);
+  if (psblob_list.empty ()) {
+    GST_ERROR_OBJECT (self, "Couldn't get pixel shader blob");
+    return FALSE;
+  }
+
+  D3D12_SHADER_BYTECODE vs_blob;
+  D3D12_INPUT_ELEMENT_DESC input_desc2;
+  hr = gst_d3d12_get_converter_vertex_shader_blob (&vs_blob, input_desc);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't get vertex shader blob");
+    return FALSE;
+  }
+
+  std::queue < DXGI_FORMAT > rtv_formats;
+  for (guint i = 0; i < 4; i++) {
+    auto format = priv->out_d3d12_format.resource_formati;
+    if (format == DXGI_FORMAT_UNKNOWN)
+      break;
+
+    rtv_formats.push (format);
+  }
+
+  priv->quad_data.resize (psblob_list.size ());
+
+  for (size_t i = 0; i < psblob_list.size (); i++) {
+    priv->quad_datai.input_desc0 = input_desc0;
+    priv->quad_datai.input_desc1 = input_desc1;
+
+    auto & pso_desc = priv->quad_datai.desc;
+    pso_desc.pRootSignature = priv->rs.Get ();
+    pso_desc.VS = vs_blob;
+    pso_desc.PS = psblob_listi.bytecode;
+    pso_desc.BlendState = priv->blend_desc;
+    pso_desc.SampleMask = UINT_MAX;
+    pso_desc.RasterizerState = CD3DX12_RASTERIZER_DESC (D3D12_DEFAULT);
+    pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
+    pso_desc.DepthStencilState.DepthEnable = FALSE;
+    pso_desc.DepthStencilState.StencilEnable = FALSE;
+    pso_desc.InputLayout.pInputElementDescs = priv->quad_datai.input_desc;
+    pso_desc.InputLayout.NumElements = 2;
+    pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
+    pso_desc.NumRenderTargets = psblob_listi.num_rtv;
+    for (UINT j = 0; j < pso_desc.NumRenderTargets; j++) {
+      pso_desc.RTVFormatsj = rtv_formats.front ();
+      rtv_formats.pop ();
+    }
+    pso_desc.SampleDesc.Count = 1;
+
+    ComPtr < ID3D12PipelineState > pso;
+    hr = device->CreateGraphicsPipelineState (&pso_desc, IID_PPV_ARGS (&pso));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create PSO");
+      return FALSE;
+    }
+
+    priv->quad_datai.pso = pso;
+    priv->quad_datai.num_rtv = psblob_listi.num_rtv;
+  }
+
+  D3D12_DESCRIPTOR_HEAP_DESC srv_heap_desc = { };
+  srv_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
+  srv_heap_desc.NumDescriptors = priv->crs->GetNumSrv ();
+  if (priv->crs->HaveLut ())
+    srv_heap_desc.NumDescriptors += 2;
+
+  srv_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
+
+  priv->srv_heap_pool = gst_d3d12_descriptor_pool_new (self->device,
+      &srv_heap_desc);
+
+  priv->upload_data = new ConverterUploadData ();
+  auto upload_data = priv->upload_data;
+
+  /* bottom left */
+  vertex_data0.position.x = -1.0f;
+  vertex_data0.position.y = -1.0f;
+  vertex_data0.position.z = 0.0f;
+  vertex_data0.texture.u = 0.0f;
+  vertex_data0.texture.v = 1.0f;
+
+  /* top left */
+  vertex_data1.position.x = -1.0f;
+  vertex_data1.position.y = 1.0f;
+  vertex_data1.position.z = 0.0f;
+  vertex_data1.texture.u = 0.0f;
+  vertex_data1.texture.v = 0.0f;
+
+  /* top right */
+  vertex_data2.position.x = 1.0f;
+  vertex_data2.position.y = 1.0f;
+  vertex_data2.position.z = 0.0f;
+  vertex_data2.texture.u = 1.0f;
+  vertex_data2.texture.v = 0.0f;
+
+  /* bottom right */
+  vertex_data3.position.x = 1.0f;
+  vertex_data3.position.y = -1.0f;
+  vertex_data3.position.z = 0.0f;
+  vertex_data3.texture.u = 1.0f;
+  vertex_data3.texture.v = 1.0f;
+
+  /* vertex and index buffers */
+  D3D12_HEAP_PROPERTIES heap_prop;
+  D3D12_RESOURCE_DESC resource_desc;
+  CD3DX12_RANGE range (0, 0);
+  guint8 *data;
+  {
+    heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+    resource_desc =
+        CD3DX12_RESOURCE_DESC::Buffer (sizeof (VertexData) * 4 +
+        sizeof (g_indices));
+    hr = device->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+        &resource_desc, D3D12_RESOURCE_STATE_COMMON, nullptr,
+        IID_PPV_ARGS (&priv->vertex_index_buf));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create vertex buffer");
+      return FALSE;
+    }
+
+    priv->vbv.BufferLocation = priv->vertex_index_buf->GetGPUVirtualAddress ();
+    priv->vbv.SizeInBytes = sizeof (VertexData) * 4;
+    priv->vbv.StrideInBytes = sizeof (VertexData);
+
+    priv->idv.BufferLocation = priv->vbv.BufferLocation + priv->vbv.SizeInBytes;
+    priv->idv.SizeInBytes = sizeof (g_indices);
+    priv->idv.Format = DXGI_FORMAT_R16_UINT;
+
+    heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+    hr = device->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+        &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+        IID_PPV_ARGS (&upload_data->vertex_index_upload));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create vertex buffer upload");
+      return FALSE;
+    }
+
+    hr = upload_data->vertex_index_upload->Map (0, &range, (void **) &data);
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't map vertext buffer");
+      return FALSE;
+    }
+
+    memcpy (data, vertex_data, sizeof (VertexData) * 4);
+    memcpy (data + sizeof (VertexData) * 4, g_indices, sizeof (g_indices));
+    upload_data->vertex_index_upload->Unmap (0, nullptr);
+  }
+
+  /* pixel shader const buffer, static */
+  {
+    heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+    resource_desc = CD3DX12_RESOURCE_DESC::Buffer (sizeof (PSConstBuffer));
+    hr = device->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+        &resource_desc, D3D12_RESOURCE_STATE_COMMON, nullptr,
+        IID_PPV_ARGS (&priv->ps_const_buf));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create const buffer");
+      return FALSE;
+    }
+
+    heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+    hr = device->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+        &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+        IID_PPV_ARGS (&upload_data->ps_const_upload));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create const buffer upload");
+      return FALSE;
+    }
+
+    hr = upload_data->ps_const_upload->Map (0, &range, (void **) &data);
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't map index buffer");
+      return FALSE;
+    }
+
+    memcpy (data, &priv->const_data, sizeof (PSConstBuffer));
+    upload_data->ps_const_upload->Unmap (0, nullptr);
+  }
+
+  if (priv->crs->HaveLut ()) {
+    heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+    resource_desc = CD3DX12_RESOURCE_DESC::Tex1D (DXGI_FORMAT_R16_UNORM,
+        GAMMA_LUT_SIZE, 1, 1);
+
+    hr = device->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+        &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, nullptr,
+        IID_PPV_ARGS (&priv->gamma_dec_lut));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create gamma decoding LUT");
+      return FALSE;
+    }
+
+    hr = device->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+        &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, nullptr,
+        IID_PPV_ARGS (&priv->gamma_enc_lut));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create gamma encoding LUT");
+      return FALSE;
+    }
+
+    UINT64 gamma_lut_size;
+    device->GetCopyableFootprints (&resource_desc, 0, 1, 0,
+        &priv->gamma_lut_layout, nullptr, nullptr, &gamma_lut_size);
+
+    heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+    resource_desc = CD3DX12_RESOURCE_DESC::Buffer (gamma_lut_size);
+
+    hr = device->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+        &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+        IID_PPV_ARGS (&upload_data->gamma_dec_lut_upload));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create gamma decoding LUT upload");
+      return FALSE;
+    }
+
+    hr = device->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+        &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+        IID_PPV_ARGS (&upload_data->gamma_enc_lut_upload));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create gamma encoding LUT upload");
+      return FALSE;
+    }
+
+    auto in_trc = in_info->colorimetry.transfer;
+    auto out_trc = in_info->colorimetry.transfer;
+
+    auto gamma_dec_table = gst_d3d12_converter_get_gamma_dec_table (in_trc);
+    auto gamma_enc_table = gst_d3d12_converter_get_gamma_enc_table (out_trc);
+
+    hr = upload_data->gamma_dec_lut_upload->Map (0, &range, (void **) &data);
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't map gamma lut upload buffer");
+      return FALSE;
+    }
+
+    memcpy (data, gamma_dec_table->lut, GAMMA_LUT_SIZE * sizeof (guint16));
+    upload_data->gamma_dec_lut_upload->Unmap (0, nullptr);
+
+    hr = upload_data->gamma_enc_lut_upload->Map (0, &range, (void **) &data);
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't map gamma lut upload buffer");
+      return FALSE;
+    }
+
+    memcpy (data, gamma_enc_table->lut, GAMMA_LUT_SIZE * sizeof (guint16));
+    upload_data->gamma_enc_lut_upload->Unmap (0, nullptr);
+
+    D3D12_DESCRIPTOR_HEAP_DESC desc = { };
+    desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
+    desc.NumDescriptors = 2;
+    desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
+
+    auto hr = device->CreateDescriptorHeap (&desc,
+        IID_PPV_ARGS (&priv->gamma_lut_heap));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't map gamma lut upload buffer");
+      return FALSE;
+    }
+
+    auto cpu_handle =
+        CD3DX12_CPU_DESCRIPTOR_HANDLE
+        (priv->gamma_lut_heap->GetCPUDescriptorHandleForHeapStart ());
+
+    D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc = { };
+    srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE1D;
+    srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+    srv_desc.Texture1D.MipLevels = 1;
+
+    device->CreateShaderResourceView (priv->gamma_dec_lut.Get (), &srv_desc,
+        cpu_handle);
+    cpu_handle.Offset (priv->srv_inc_size);
+
+    device->CreateShaderResourceView (priv->gamma_enc_lut.Get (), &srv_desc,
+        cpu_handle);
+  }
+
+  priv->input_texture_width = GST_VIDEO_INFO_WIDTH (in_info);
+  priv->input_texture_height = GST_VIDEO_INFO_HEIGHT (in_info);
+
+  for (guint i = 0; i < GST_VIDEO_INFO_N_PLANES (out_info); i++) {
+    priv->viewporti.TopLeftX = 0;
+    priv->viewporti.TopLeftY = 0;
+    priv->viewporti.Width = GST_VIDEO_INFO_COMP_WIDTH (out_info, i);
+    priv->viewporti.Height = GST_VIDEO_INFO_COMP_HEIGHT (out_info, i);
+    priv->viewporti.MinDepth = 0.0f;
+    priv->viewporti.MaxDepth = 1.0f;
+
+    priv->scissor_recti.left = 0;
+    priv->scissor_recti.top = 0;
+    priv->scissor_recti.right = GST_VIDEO_INFO_COMP_WIDTH (out_info, i);
+    priv->scissor_recti.bottom = GST_VIDEO_INFO_COMP_HEIGHT (out_info, i);
+  }
+
+  return TRUE;
+}
+
+static void
+gst_d3d12_converter_update_clear_background (GstD3D12Converter * self)
+{
+  auto priv = self->priv;
+  const GstVideoInfo *out_info = &priv->out_info;
+
+  if (priv->fill_border && (priv->dest_x != 0 || priv->dest_y != 0 ||
+          priv->dest_width != out_info->width ||
+          priv->dest_height != out_info->height ||
+          priv->video_direction == GST_VIDEO_ORIENTATION_CUSTOM)) {
+    GST_DEBUG_OBJECT (self, "Enable background color");
+    priv->clear_background = TRUE;
+  } else {
+    GST_DEBUG_OBJECT (self, "Disable background color");
+    priv->clear_background = FALSE;
+  }
+}
+
+static gboolean
+gst_d3d12_converter_apply_orientation (GstD3D12Converter * self)
+{
+  auto priv = self->priv;
+
+  switch (priv->video_direction) {
+    case GST_VIDEO_ORIENTATION_IDENTITY:
+    case GST_VIDEO_ORIENTATION_AUTO:
+    default:
+      priv->transform = g_matrix_identity;
+      break;
+    case GST_VIDEO_ORIENTATION_90R:
+      priv->transform = g_matrix_90r;
+      break;
+    case GST_VIDEO_ORIENTATION_180:
+      priv->transform = g_matrix_180;
+      break;
+    case GST_VIDEO_ORIENTATION_90L:
+      priv->transform = g_matrix_90l;
+      break;
+    case GST_VIDEO_ORIENTATION_HORIZ:
+      priv->transform = g_matrix_horiz;
+      break;
+    case GST_VIDEO_ORIENTATION_VERT:
+      priv->transform = g_matrix_vert;
+      break;
+    case GST_VIDEO_ORIENTATION_UL_LR:
+      priv->transform = g_matrix_ul_lr;
+      break;
+    case GST_VIDEO_ORIENTATION_UR_LL:
+      priv->transform = g_matrix_ur_ll;
+      break;
+    case GST_VIDEO_ORIENTATION_CUSTOM:
+      priv->transform = priv->custom_transform;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_converter_update_transform (GstD3D12Converter * self)
+{
+  auto priv = self->priv;
+
+  if (!priv->update_transform)
+    return TRUE;
+
+  priv->update_transform = FALSE;
+
+  gst_d3d12_converter_update_clear_background (self);
+
+  return gst_d3d12_converter_apply_orientation (self);
+}
+
+static gboolean
+gst_d3d12_converter_update_src_rect (GstD3D12Converter * self)
+{
+  auto priv = self->priv;
+  VertexData vertex_data4;
+  HRESULT hr;
+  FLOAT u0, u1, v0, v1, off_u, off_v;
+  gint texture_width = priv->input_texture_width;
+  gint texture_height = priv->input_texture_height;
+
+  if (!priv->update_src_rect)
+    return TRUE;
+
+  priv->update_src_rect = FALSE;
+
+  GST_DEBUG_OBJECT (self, "Updating vertex buffer");
+
+  if (!priv->upload_data)
+    priv->upload_data = new ConverterUploadData ();
+
+  auto upload_data = priv->upload_data;
+  if (!upload_data->vertex_index_upload) {
+    D3D12_HEAP_PROPERTIES heap_prop =
+        CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+    D3D12_RESOURCE_DESC buffer_desc =
+        CD3DX12_RESOURCE_DESC::Buffer (sizeof (vertex_data) +
+        sizeof (g_indices));
+    auto device = gst_d3d12_device_get_device_handle (self->device);
+    hr = device->CreateCommittedResource (&heap_prop, D3D12_HEAP_FLAG_NONE,
+        &buffer_desc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+        IID_PPV_ARGS (&upload_data->vertex_index_upload));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create vertex buffer upload");
+      return FALSE;
+    }
+  }
+
+  /*
+   *  (u0, v0) -- (u1, v0)
+   *     |            |
+   *  (u0, v1) -- (u1, v1)
+   */
+  off_u = 0.5f / texture_width;
+  off_v = 0.5f / texture_height;
+
+  if (priv->src_x > 0)
+    u0 = (priv->src_x / (gfloat) texture_width) + off_u;
+  else
+    u0 = 0.0f;
+
+  if ((priv->src_x + priv->src_width) != texture_width)
+    u1 = ((priv->src_x + priv->src_width) / (gfloat) texture_width) - off_u;
+  else
+    u1 = 1.0f;
+
+  if (priv->src_y > 0)
+    v0 = (priv->src_y / (gfloat) texture_height) + off_v;
+  else
+    v0 = 0.0;
+
+  if ((priv->src_y + priv->src_height) != texture_height)
+    v1 = ((priv->src_y + priv->src_height) / (gfloat) texture_height) - off_v;
+  else
+    v1 = 1.0f;
+
+  /* bottom left */
+  vertex_data0.position.x = -1.0f;
+  vertex_data0.position.y = -1.0f;
+  vertex_data0.position.z = 0.0f;
+  vertex_data0.texture.u = u0;
+  vertex_data0.texture.v = v1;
+
+  /* top left */
+  vertex_data1.position.x = -1.0f;
+  vertex_data1.position.y = 1.0f;
+  vertex_data1.position.z = 0.0f;
+  vertex_data1.texture.u = u0;
+  vertex_data1.texture.v = v0;
+
+  /* top right */
+  vertex_data2.position.x = 1.0f;
+  vertex_data2.position.y = 1.0f;
+  vertex_data2.position.z = 0.0f;
+  vertex_data2.texture.u = u1;
+  vertex_data2.texture.v = v0;
+
+  /* bottom right */
+  vertex_data3.position.x = 1.0f;
+  vertex_data3.position.y = -1.0f;
+  vertex_data3.position.z = 0.0f;
+  vertex_data3.texture.u = u1;
+  vertex_data3.texture.v = v1;
+
+  guint8 *data;
+  CD3DX12_RANGE range (0, 0);
+  hr = upload_data->vertex_index_upload->Map (0, &range, (void **) &data);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't map vertex buffer, hr: 0x%x", (guint) hr);
+    return FALSE;
+  }
+
+  memcpy (data, vertex_data, sizeof (VertexData) * 4);
+  memcpy (data + sizeof (VertexData) * 4, g_indices, sizeof (g_indices));
+
+  upload_data->vertex_index_upload->Unmap (0, nullptr);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_converter_update_dest_rect (GstD3D12Converter * self)
+{
+  auto priv = self->priv;
+
+  if (!priv->update_dest_rect)
+    return TRUE;
+
+  priv->viewport0.TopLeftX = priv->dest_x;
+  priv->viewport0.TopLeftY = priv->dest_y;
+  priv->viewport0.Width = priv->dest_width;
+  priv->viewport0.Height = priv->dest_height;
+
+  priv->scissor_rect0.left = priv->dest_x;
+  priv->scissor_rect0.top = priv->dest_y;
+  priv->scissor_rect0.right = priv->dest_width + priv->dest_x;
+  priv->scissor_rect0.bottom = priv->dest_height + priv->dest_y;
+
+  GST_DEBUG_OBJECT (self,
+      "Update viewport, TopLeftX: %f, TopLeftY: %f, Width: %f, Height %f",
+      priv->viewport0.TopLeftX, priv->viewport0.TopLeftY,
+      priv->viewport0.Width, priv->viewport0.Height);
+
+  gst_d3d12_converter_update_clear_background (self);
+
+  switch (GST_VIDEO_INFO_FORMAT (&priv->out_info)) {
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_NV21:
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+    case GST_VIDEO_FORMAT_P016_LE:
+    case GST_VIDEO_FORMAT_I420:
+    case GST_VIDEO_FORMAT_YV12:
+    case GST_VIDEO_FORMAT_I420_10LE:
+    case GST_VIDEO_FORMAT_I420_12LE:
+      priv->viewport1.TopLeftX = priv->viewport0.TopLeftX / 2;
+      priv->viewport1.TopLeftY = priv->viewport0.TopLeftY / 2;
+      priv->viewport1.Width = priv->viewport0.Width / 2;
+      priv->viewport1.Height = priv->viewport0.Height / 2;
+
+      priv->scissor_rect1.left = priv->scissor_rect0.left / 2;
+      priv->scissor_rect1.top = priv->scissor_rect0.top / 2;
+      priv->scissor_rect1.right = priv->scissor_rect0.right / 2;
+      priv->scissor_rect1.bottom = priv->scissor_rect0.bottom / 2;
+
+      for (guint i = 2; i < GST_VIDEO_INFO_N_PLANES (&priv->out_info); i++) {
+        priv->viewporti = priv->viewport1;
+        priv->scissor_recti = priv->scissor_rect1;
+      }
+
+      break;
+    case GST_VIDEO_FORMAT_Y42B:
+    case GST_VIDEO_FORMAT_I422_10LE:
+    case GST_VIDEO_FORMAT_I422_12LE:
+      priv->viewport1.TopLeftX = priv->viewport0.TopLeftX / 2;
+      priv->viewport1.TopLeftY = priv->viewport0.TopLeftY;
+      priv->viewport1.Width = priv->viewport0.Width / 2;
+      priv->viewport1.Height = priv->viewport0.Height;
+
+      priv->scissor_rect1.left = priv->scissor_rect0.left / 2;
+      priv->scissor_rect1.top = priv->scissor_rect0.top;
+      priv->scissor_rect1.right = priv->scissor_rect0.right / 2;
+      priv->scissor_rect1.bottom = priv->scissor_rect0.bottom;
+
+      for (guint i = 2; i < GST_VIDEO_INFO_N_PLANES (&priv->out_info); i++) {
+        priv->viewporti = priv->viewport1;
+        priv->scissor_recti = priv->scissor_rect1;
+      }
+      break;
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_Y444_10LE:
+    case GST_VIDEO_FORMAT_Y444_12LE:
+    case GST_VIDEO_FORMAT_Y444_16LE:
+    case GST_VIDEO_FORMAT_RGBP:
+    case GST_VIDEO_FORMAT_BGRP:
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBR_10LE:
+    case GST_VIDEO_FORMAT_GBR_12LE:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+    case GST_VIDEO_FORMAT_GBRA:
+    case GST_VIDEO_FORMAT_GBRA_10LE:
+    case GST_VIDEO_FORMAT_GBRA_12LE:
+      for (guint i = 1; i < GST_VIDEO_INFO_N_PLANES (&priv->out_info); i++) {
+        priv->viewporti = priv->viewport0;
+        priv->scissor_recti = priv->scissor_rect0;
+      }
+      break;
+    default:
+      break;
+  }
+
+  priv->update_dest_rect = FALSE;
+
+  return TRUE;
+}
+
+static void
+convert_info_gray_to_yuv (const GstVideoInfo * gray, GstVideoInfo * yuv)
+{
+  GstVideoInfo tmp;
+
+  if (GST_VIDEO_INFO_IS_YUV (gray)) {
+    *yuv = *gray;
+    return;
+  }
+
+  if (gray->finfo->depth0 == 8) {
+    gst_video_info_set_format (&tmp,
+        GST_VIDEO_FORMAT_Y444, gray->width, gray->height);
+  } else {
+    gst_video_info_set_format (&tmp,
+        GST_VIDEO_FORMAT_Y444_16LE, gray->width, gray->height);
+  }
+
+  tmp.colorimetry.range = gray->colorimetry.range;
+  if (tmp.colorimetry.range == GST_VIDEO_COLOR_RANGE_UNKNOWN)
+    tmp.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
+
+  tmp.colorimetry.primaries = gray->colorimetry.primaries;
+  if (tmp.colorimetry.primaries == GST_VIDEO_COLOR_PRIMARIES_UNKNOWN)
+    tmp.colorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_BT709;
+
+  tmp.colorimetry.transfer = gray->colorimetry.transfer;
+  if (tmp.colorimetry.transfer == GST_VIDEO_TRANSFER_UNKNOWN)
+    tmp.colorimetry.transfer = GST_VIDEO_TRANSFER_BT709;
+
+  tmp.colorimetry.matrix = gray->colorimetry.matrix;
+  if (tmp.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN)
+    tmp.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
+
+  *yuv = tmp;
+}
+
+static gboolean
+gst_d3d12_converter_calculate_matrix (GstD3D12Converter * self,
+    const GstVideoInfo * in_info, const GstVideoInfo * out_info)
+{
+  auto priv = self->priv;
+  GstD3D12ColorMatrix pre_coeff;
+  GstD3D12ColorMatrix post_coeff;
+  GstD3D12ColorMatrix primaries_coeff;
+  GstVideoInfo rgb_info;
+
+  gst_d3d12_color_matrix_init (&pre_coeff);
+  gst_d3d12_color_matrix_init (&post_coeff);
+  gst_d3d12_color_matrix_init (&primaries_coeff);
+
+  switch (priv->convert_type) {
+    case CONVERT_TYPE::RANGE:
+      gst_d3d12_color_range_adjust_matrix_unorm (in_info, out_info,
+          &post_coeff);
+      break;
+    case CONVERT_TYPE::SIMPLE:
+      if (GST_VIDEO_INFO_IS_RGB (in_info)) {
+        gst_d3d12_rgb_to_yuv_matrix_unorm (in_info, out_info, &post_coeff);
+      } else {
+        gst_d3d12_yuv_to_rgb_matrix_unorm (in_info, out_info, &post_coeff);
+      }
+      break;
+    case CONVERT_TYPE::GAMMA:
+    case CONVERT_TYPE::PRIMARY:
+      if (GST_VIDEO_INFO_IS_RGB (in_info)) {
+        rgb_info = *in_info;
+        if (in_info->colorimetry.range == GST_VIDEO_COLOR_RANGE_16_235) {
+          rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
+
+          gst_d3d12_color_range_adjust_matrix_unorm (in_info,
+              &rgb_info, &pre_coeff);
+        }
+      } else {
+        gst_video_info_set_format (&rgb_info,
+            in_info->finfo->depth0 == 8 ? GST_VIDEO_FORMAT_RGBA :
+            GST_VIDEO_FORMAT_RGBA64_LE, in_info->width, in_info->height);
+        rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
+        rgb_info.colorimetry.transfer = in_info->colorimetry.transfer;
+        rgb_info.colorimetry.primaries = in_info->colorimetry.primaries;
+
+        gst_d3d12_yuv_to_rgb_matrix_unorm (in_info, &rgb_info, &pre_coeff);
+      }
+
+      if (priv->convert_type == CONVERT_TYPE::PRIMARY) {
+        const GstVideoColorPrimariesInfo *in_pinfo;
+        const GstVideoColorPrimariesInfo *out_pinfo;
+
+        in_pinfo =
+            gst_video_color_primaries_get_info (in_info->colorimetry.primaries);
+        out_pinfo =
+            gst_video_color_primaries_get_info (out_info->
+            colorimetry.primaries);
+
+        gst_d3d12_color_primaries_matrix_unorm (in_pinfo, out_pinfo,
+            &primaries_coeff);
+      }
+
+      if (GST_VIDEO_INFO_IS_RGB (out_info)) {
+        if (out_info->colorimetry.range == GST_VIDEO_COLOR_RANGE_16_235) {
+          rgb_info = *out_info;
+          rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
+
+          gst_d3d12_color_range_adjust_matrix_unorm (&rgb_info,
+              out_info, &post_coeff);
+        }
+      } else {
+        gst_d3d12_rgb_to_yuv_matrix_unorm (&rgb_info, out_info, &post_coeff);
+      }
+      break;
+    default:
+      break;
+  }
+
+  if (gst_debug_category_get_threshold (GST_CAT_DEFAULT) >= GST_LEVEL_DEBUG) {
+    gchar *matrix_dump;
+    matrix_dump = gst_d3d12_dump_color_matrix (&pre_coeff);
+    GST_DEBUG_OBJECT (self, "PreCoeff \n%s", matrix_dump);
+    g_free (matrix_dump);
+
+    matrix_dump = gst_d3d12_dump_color_matrix (&primaries_coeff);
+    GST_DEBUG_OBJECT (self, "PrimaryCoeff \n%s", matrix_dump);
+    g_free (matrix_dump);
+
+    matrix_dump = gst_d3d12_dump_color_matrix (&post_coeff);
+    GST_DEBUG_OBJECT (self, "PostCoeff \n%s", matrix_dump);
+    g_free (matrix_dump);
+  }
+
+  PSColorSpace *preCoeff = &priv->const_data.preCoeff;
+  PSColorSpace *postCoeff = &priv->const_data.postCoeff;
+  PSColorSpace *primariesCoeff = &priv->const_data.primariesCoeff;
+
+  for (guint i = 0; i < 3; i++) {
+    preCoeff->coeffXi = pre_coeff.matrix0i;
+    preCoeff->coeffYi = pre_coeff.matrix1i;
+    preCoeff->coeffZi = pre_coeff.matrix2i;
+    preCoeff->offseti = pre_coeff.offseti;
+    preCoeff->mini = pre_coeff.mini;
+    preCoeff->maxi = pre_coeff.maxi;
+
+    postCoeff->coeffXi = post_coeff.matrix0i;
+    postCoeff->coeffYi = post_coeff.matrix1i;
+    postCoeff->coeffZi = post_coeff.matrix2i;
+    postCoeff->offseti = post_coeff.offseti;
+    postCoeff->mini = post_coeff.mini;
+    postCoeff->maxi = post_coeff.maxi;
+
+    primariesCoeff->coeffXi = primaries_coeff.matrix0i;
+    primariesCoeff->coeffYi = primaries_coeff.matrix1i;
+    primariesCoeff->coeffZi = primaries_coeff.matrix2i;
+    primariesCoeff->offseti = primaries_coeff.offseti;
+    primariesCoeff->mini = primaries_coeff.mini;
+    primariesCoeff->maxi = primaries_coeff.maxi;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+is_custom_format (GstVideoFormat format)
+{
+  switch (format) {
+    case GST_VIDEO_FORMAT_xRGB:
+    case GST_VIDEO_FORMAT_xBGR:
+    case GST_VIDEO_FORMAT_ARGB:
+    case GST_VIDEO_FORMAT_ABGR:
+    case GST_VIDEO_FORMAT_BGRA64_LE:
+    case GST_VIDEO_FORMAT_BGR10A2_LE:
+    case GST_VIDEO_FORMAT_RBGA:
+      return TRUE;
+    default:
+      break;
+  }
+
+  return FALSE;
+}
+
+static void
+gst_d3d12_converter_calculate_border_color (GstD3D12Converter * self)
+{
+  auto priv = self->priv;
+  GstD3D12ColorMatrix *m = &priv->clear_color_matrix;
+  const GstVideoInfo *out_info = &priv->out_info;
+  gdouble a;
+  gdouble rgb3;
+  gdouble converted3;
+  GstVideoFormat format = GST_VIDEO_INFO_FORMAT (out_info);
+
+  a = ((priv->border_color & 0xffff000000000000) >> 48) / (gdouble) G_MAXUINT16;
+  rgb0 =
+      ((priv->border_color & 0x0000ffff00000000) >> 32) / (gdouble) G_MAXUINT16;
+  rgb1 =
+      ((priv->border_color & 0x00000000ffff0000) >> 16) / (gdouble) G_MAXUINT16;
+  rgb2 = (priv->border_color & 0x000000000000ffff) / (gdouble) G_MAXUINT16;
+
+  for (guint i = 0; i < 3; i++) {
+    convertedi = 0;
+    for (guint j = 0; j < 3; j++) {
+      convertedi += m->matrixij * rgbj;
+    }
+    convertedi += m->offseti;
+    convertedi = CLAMP (convertedi, m->mini, m->maxi);
+  }
+
+  GST_DEBUG_OBJECT (self, "Calculated background color ARGB: %f, %f, %f, %f",
+      a, converted0, converted1, converted2);
+
+  /* scale down if output is planar high bitdepth format */
+  switch (format) {
+    case GST_VIDEO_FORMAT_I420_10LE:
+    case GST_VIDEO_FORMAT_I422_10LE:
+    case GST_VIDEO_FORMAT_Y444_10LE:
+    case GST_VIDEO_FORMAT_GBR_10LE:
+    case GST_VIDEO_FORMAT_GBRA_10LE:
+      for (guint i = 0; i < 3; i++) {
+        convertedi /= 64.0;
+      }
+      a /= 64.0;
+      break;
+    case GST_VIDEO_FORMAT_I420_12LE:
+    case GST_VIDEO_FORMAT_I422_12LE:
+    case GST_VIDEO_FORMAT_Y444_12LE:
+    case GST_VIDEO_FORMAT_GBR_12LE:
+    case GST_VIDEO_FORMAT_GBRA_12LE:
+      for (guint i = 0; i < 3; i++) {
+        convertedi /= 16.0;
+      }
+      a /= 16.0;
+      break;
+    default:
+      break;
+  }
+
+  if ((GST_VIDEO_INFO_IS_RGB (out_info) &&
+          GST_VIDEO_INFO_N_PLANES (out_info) == 1 &&
+          !is_custom_format (format)) || GST_VIDEO_INFO_IS_GRAY (out_info)) {
+    for (guint i = 0; i < 3; i++)
+      priv->clear_color0i = convertedi;
+    priv->clear_color03 = a;
+  } else {
+    switch (format) {
+      case GST_VIDEO_FORMAT_VUYA:
+        priv->clear_color00 = converted2;
+        priv->clear_color01 = converted1;
+        priv->clear_color02 = converted0;
+        priv->clear_color03 = a;
+        break;
+      case GST_VIDEO_FORMAT_AYUV:
+      case GST_VIDEO_FORMAT_AYUV64:
+        priv->clear_color00 = a;
+        priv->clear_color01 = converted0;
+        priv->clear_color02 = converted1;
+        priv->clear_color03 = converted2;
+        break;
+      case GST_VIDEO_FORMAT_ARGB:
+      case GST_VIDEO_FORMAT_xRGB:
+        priv->clear_color00 = a;
+        priv->clear_color01 = converted0;
+        priv->clear_color02 = converted1;
+        priv->clear_color03 = converted2;
+        break;
+      case GST_VIDEO_FORMAT_ABGR:
+      case GST_VIDEO_FORMAT_xBGR:
+        priv->clear_color00 = a;
+        priv->clear_color01 = converted2;
+        priv->clear_color02 = converted1;
+        priv->clear_color03 = converted0;
+        break;
+      case GST_VIDEO_FORMAT_RBGA:
+        priv->clear_color00 = converted0;
+        priv->clear_color01 = converted2;
+        priv->clear_color02 = converted1;
+        priv->clear_color03 = a;
+        break;
+      case GST_VIDEO_FORMAT_NV12:
+      case GST_VIDEO_FORMAT_NV21:
+      case GST_VIDEO_FORMAT_P010_10LE:
+      case GST_VIDEO_FORMAT_P012_LE:
+      case GST_VIDEO_FORMAT_P016_LE:
+        priv->clear_color00 = converted0;
+        priv->clear_color01 = 0;
+        priv->clear_color02 = 0;
+        priv->clear_color03 = 1.0;
+        if (format == GST_VIDEO_FORMAT_NV21) {
+          priv->clear_color10 = converted2;
+          priv->clear_color11 = converted1;
+        } else {
+          priv->clear_color10 = converted1;
+          priv->clear_color11 = converted2;
+        }
+        priv->clear_color12 = 0;
+        priv->clear_color13 = 1.0;
+        break;
+      case GST_VIDEO_FORMAT_I420:
+      case GST_VIDEO_FORMAT_YV12:
+      case GST_VIDEO_FORMAT_I420_10LE:
+      case GST_VIDEO_FORMAT_I420_12LE:
+      case GST_VIDEO_FORMAT_Y42B:
+      case GST_VIDEO_FORMAT_I422_10LE:
+      case GST_VIDEO_FORMAT_I422_12LE:
+      case GST_VIDEO_FORMAT_Y444:
+      case GST_VIDEO_FORMAT_Y444_10LE:
+      case GST_VIDEO_FORMAT_Y444_12LE:
+      case GST_VIDEO_FORMAT_Y444_16LE:
+        priv->clear_color00 = converted0;
+        priv->clear_color01 = 0;
+        priv->clear_color02 = 0;
+        priv->clear_color03 = 1.0;
+        if (format == GST_VIDEO_FORMAT_YV12) {
+          priv->clear_color10 = converted2;
+          priv->clear_color20 = converted1;
+        } else {
+          priv->clear_color10 = converted1;
+          priv->clear_color20 = converted2;
+        }
+        priv->clear_color11 = 0;
+        priv->clear_color12 = 0;
+        priv->clear_color13 = 1.0;
+        priv->clear_color21 = 0;
+        priv->clear_color22 = 0;
+        priv->clear_color23 = 1.0;
+        break;
+      case GST_VIDEO_FORMAT_RGBP:
+        priv->clear_color00 = converted0;
+        priv->clear_color10 = converted1;
+        priv->clear_color20 = converted2;
+        break;
+      case GST_VIDEO_FORMAT_BGRP:
+        priv->clear_color00 = converted2;
+        priv->clear_color10 = converted1;
+        priv->clear_color20 = converted0;
+        break;
+      case GST_VIDEO_FORMAT_GBR:
+      case GST_VIDEO_FORMAT_GBR_10LE:
+      case GST_VIDEO_FORMAT_GBR_12LE:
+      case GST_VIDEO_FORMAT_GBR_16LE:
+        priv->clear_color00 = converted1;
+        priv->clear_color10 = converted2;
+        priv->clear_color20 = converted0;
+        break;
+      case GST_VIDEO_FORMAT_GBRA:
+      case GST_VIDEO_FORMAT_GBRA_10LE:
+      case GST_VIDEO_FORMAT_GBRA_12LE:
+        priv->clear_color00 = converted1;
+        priv->clear_color10 = converted2;
+        priv->clear_color20 = converted0;
+        priv->clear_color30 = a;
+        break;
+      default:
+        g_assert_not_reached ();
+        break;
+    }
+  }
+}
+
+GstD3D12Converter *
+gst_d3d12_converter_new (GstD3D12Device * device, const GstVideoInfo * in_info,
+    const GstVideoInfo * out_info, const D3D12_BLEND_DESC * blend_desc,
+    const gfloat blend_factor4, GstStructure * config)
+{
+  GstD3D12Converter *self;
+  GstD3D12Format in_d3d12_format;
+  GstD3D12Format out_d3d12_format;
+  gboolean allow_gamma = FALSE;
+  gboolean allow_primaries = FALSE;
+  D3D12_FILTER sampler_filter = D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT;
+  GstVideoInfo matrix_in_info;
+  GstVideoInfo matrix_out_info;
+
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+  g_return_val_if_fail (in_info != nullptr, nullptr);
+  g_return_val_if_fail (out_info != nullptr, nullptr);
+
+  self = (GstD3D12Converter *) g_object_new (GST_TYPE_D3D12_CONVERTER, nullptr);
+  gst_object_ref_sink (self);
+  auto priv = self->priv;
+
+  if (blend_desc)
+    priv->blend_desc = *blend_desc;
+
+  if (blend_factor) {
+    for (guint i = 0; i < 4; i++)
+      priv->blend_factori = blend_factori;
+  }
+
+  if (config) {
+    gint value;
+    if (gst_structure_get_enum (config, GST_D3D12_CONVERTER_OPT_GAMMA_MODE,
+            GST_TYPE_VIDEO_GAMMA_MODE, &value) &&
+        (GstVideoGammaMode) value != GST_VIDEO_GAMMA_MODE_NONE) {
+      allow_gamma = TRUE;
+    }
+
+    if (gst_structure_get_enum (config, GST_D3D12_CONVERTER_OPT_PRIMARIES_MODE,
+            GST_TYPE_VIDEO_PRIMARIES_MODE, &value) &&
+        (GstVideoPrimariesMode) value != GST_VIDEO_PRIMARIES_MODE_NONE) {
+      allow_primaries = TRUE;
+    }
+
+    gst_structure_get_enum (config, GST_D3D12_CONVERTER_OPT_SAMPLER_FILTER,
+        GST_TYPE_D3D12_CONVERTER_SAMPLER_FILTER, (int *) &sampler_filter);
+
+    gst_structure_get_enum (config, GST_D3D12_CONVERTER_OPT_SRC_ALPHA_MODE,
+        GST_TYPE_D3D12_CONVERTER_ALPHA_MODE, (int *) &priv->src_alpha_mode);
+    gst_structure_get_enum (config, GST_D3D12_CONVERTER_OPT_DEST_ALPHA_MODE,
+        GST_TYPE_D3D12_CONVERTER_ALPHA_MODE, (int *) &priv->dst_alpha_mode);
+
+    gst_structure_free (config);
+  }
+
+  GST_DEBUG_OBJECT (self,
+      "Setup converter with format %s -> %s, "
+      "allow gamma conversion: %d, allow primaries conversion: %d ",
+      gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (in_info)),
+      gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (out_info)),
+      allow_gamma, allow_primaries);
+
+  if (!gst_d3d12_device_get_format (device, GST_VIDEO_INFO_FORMAT (in_info),
+          &in_d3d12_format)) {
+    GST_ERROR_OBJECT (self, "%s couldn't be converted to d3d12 format",
+        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (in_info)));
+    gst_object_unref (self);
+    return nullptr;
+  }
+
+  if (!gst_d3d12_device_get_format (device, GST_VIDEO_INFO_FORMAT (out_info),
+          &out_d3d12_format)) {
+    GST_ERROR_OBJECT (self, "%s couldn't be converted to d3d12 format",
+        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (in_info)));
+    gst_object_unref (self);
+    return nullptr;
+  }
+
+  self->device = (GstD3D12Device *) gst_object_ref (device);
+  priv->in_info = *in_info;
+  priv->out_info = *out_info;
+  priv->in_d3d12_format = in_d3d12_format;
+  priv->out_d3d12_format = out_d3d12_format;
+
+  /* Init properties */
+  priv->src_width = GST_VIDEO_INFO_WIDTH (in_info);
+  priv->src_height = GST_VIDEO_INFO_HEIGHT (in_info);
+  priv->dest_width = GST_VIDEO_INFO_WIDTH (out_info);
+  priv->dest_height = GST_VIDEO_INFO_HEIGHT (out_info);
+  priv->alpha = 1.0;
+  priv->border_color = 0xffff000000000000;
+
+  if (GST_VIDEO_INFO_IS_RGB (&priv->out_info)) {
+    GstVideoInfo rgb_info = priv->out_info;
+    rgb_info.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
+    gst_d3d12_color_range_adjust_matrix_unorm (&rgb_info, &priv->out_info,
+        &priv->clear_color_matrix);
+  } else {
+    GstVideoInfo rgb_info;
+    GstVideoInfo yuv_info;
+
+    gst_video_info_set_format (&rgb_info, GST_VIDEO_FORMAT_RGBA64_LE,
+        priv->out_info.width, priv->out_info.height);
+    convert_info_gray_to_yuv (&priv->out_info, &yuv_info);
+
+    if (yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN ||
+        yuv_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_RGB) {
+      GST_WARNING_OBJECT (self, "Invalid matrix is detected");
+      yuv_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
+    }
+
+    gst_d3d12_rgb_to_yuv_matrix_unorm (&rgb_info,
+        &yuv_info, &priv->clear_color_matrix);
+  }
+
+  gst_d3d12_converter_calculate_border_color (self);
+
+  priv->convert_type = CONVERT_TYPE::IDENTITY;
+  if (GST_VIDEO_INFO_IS_RGB (in_info) != GST_VIDEO_INFO_IS_RGB (out_info)) {
+    priv->convert_type = CONVERT_TYPE::SIMPLE;
+  } else if (in_info->colorimetry.range != GST_VIDEO_COLOR_RANGE_UNKNOWN &&
+      out_info->colorimetry.range != GST_VIDEO_COLOR_RANGE_UNKNOWN &&
+      in_info->colorimetry.range != out_info->colorimetry.range) {
+    priv->convert_type = CONVERT_TYPE::RANGE;
+  }
+
+  if (allow_gamma &&
+      in_info->colorimetry.transfer != GST_VIDEO_TRANSFER_UNKNOWN &&
+      out_info->colorimetry.transfer != GST_VIDEO_TRANSFER_UNKNOWN &&
+      !gst_video_transfer_function_is_equivalent (in_info->colorimetry.transfer,
+          GST_VIDEO_INFO_COMP_DEPTH (in_info, 0),
+          out_info->colorimetry.transfer, GST_VIDEO_INFO_COMP_DEPTH (out_info,
+              0))) {
+    GST_DEBUG_OBJECT (self, "Different transfer function %d -> %d",
+        in_info->colorimetry.transfer, out_info->colorimetry.transfer);
+    priv->convert_type = CONVERT_TYPE::GAMMA;
+  }
+
+  if (allow_primaries &&
+      in_info->colorimetry.primaries != GST_VIDEO_COLOR_PRIMARIES_UNKNOWN &&
+      out_info->colorimetry.primaries != GST_VIDEO_COLOR_PRIMARIES_UNKNOWN &&
+      in_info->colorimetry.transfer != GST_VIDEO_TRANSFER_UNKNOWN &&
+      out_info->colorimetry.transfer != GST_VIDEO_TRANSFER_UNKNOWN &&
+      !gst_video_color_primaries_is_equivalent (in_info->colorimetry.primaries,
+          out_info->colorimetry.primaries)) {
+    GST_DEBUG_OBJECT (self, "Different primaries %d -> %d",
+        in_info->colorimetry.primaries, out_info->colorimetry.primaries);
+    priv->convert_type = CONVERT_TYPE::PRIMARY;
+  }
+
+  if (GST_VIDEO_INFO_IS_RGB (&priv->in_info)) {
+    matrix_in_info = priv->in_info;
+  } else {
+    convert_info_gray_to_yuv (&priv->in_info, &matrix_in_info);
+    if (matrix_in_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN ||
+        matrix_in_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_RGB) {
+      matrix_in_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
+    }
+  }
+
+  if (GST_VIDEO_INFO_IS_RGB (&priv->out_info)) {
+    matrix_out_info = priv->out_info;
+  } else {
+    convert_info_gray_to_yuv (&priv->out_info, &matrix_out_info);
+    if (matrix_out_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_UNKNOWN ||
+        matrix_out_info.colorimetry.matrix == GST_VIDEO_COLOR_MATRIX_RGB) {
+      matrix_out_info.colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
+    }
+  }
+
+  if (!gst_d3d12_converter_calculate_matrix (self,
+          &matrix_in_info, &matrix_out_info)) {
+    gst_object_unref (self);
+    return nullptr;
+  }
+
+  if (!gst_d3d12_converter_setup_resource (self, &priv->in_info,
+          &priv->out_info, sampler_filter)) {
+    gst_object_unref (self);
+    return nullptr;
+  }
+
+  return self;
+}
+
+static gboolean
+gst_d3d12_converter_update_pso (GstD3D12Converter * self)
+{
+  auto priv = self->priv;
+  if (!priv->update_pso)
+    return TRUE;
+
+  std::vector < QuadData > quad_data;
+  quad_data.resize (priv->quad_data.size ());
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+
+  for (size_t i = 0; i < quad_data.size (); i++) {
+    D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc = priv->quad_datai.desc;
+    pso_desc.BlendState = priv->blend_desc;
+    pso_desc.SampleDesc = priv->sample_desc;
+
+    ComPtr < ID3D12PipelineState > pso;
+    auto hr =
+        device->CreateGraphicsPipelineState (&pso_desc, IID_PPV_ARGS (&pso));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create pso");
+      return FALSE;
+    }
+
+    quad_datai.desc = pso_desc;
+    quad_datai.pso = pso;
+    quad_datai.num_rtv = priv->quad_datai.num_rtv;
+  }
+
+  priv->update_pso = FALSE;
+  priv->quad_data = quad_data;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_converter_execute (GstD3D12Converter * self,
+    GstBuffer * in_buf, GstBuffer * out_buf, GstD3D12FenceData * fence_data,
+    ID3D12GraphicsCommandList * cl)
+{
+  auto priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+  auto mem = (GstD3D12Memory *) gst_buffer_peek_memory (in_buf, 0);
+  auto resource = gst_d3d12_memory_get_resource_handle (mem);
+  auto desc = resource->GetDesc ();
+  if (desc.Width != priv->input_texture_width ||
+      desc.Height != priv->input_texture_height) {
+    GST_DEBUG_OBJECT (self, "Texture resolution changed %ux%u -> %ux%u",
+        (guint) priv->input_texture_width, priv->input_texture_height,
+        (guint) desc.Width, desc.Height);
+    priv->input_texture_width = desc.Width;
+    priv->input_texture_height = desc.Height;
+    priv->update_src_rect = TRUE;
+  }
+
+  mem = (GstD3D12Memory *) gst_buffer_peek_memory (out_buf, 0);
+  resource = gst_d3d12_memory_get_resource_handle (mem);
+  desc = resource->GetDesc ();
+  if (desc.SampleDesc.Count != priv->sample_desc.Count ||
+      desc.SampleDesc.Quality != priv->sample_desc.Quality) {
+    GST_DEBUG_OBJECT (self, "Sample desc updated");
+    priv->sample_desc = desc.SampleDesc;
+    priv->update_pso = TRUE;
+  }
+
+  if (!gst_d3d12_converter_update_dest_rect (self)) {
+    GST_ERROR_OBJECT (self, "Failed to update dest rect");
+    return FALSE;
+  }
+
+  if (!gst_d3d12_converter_update_src_rect (self)) {
+    GST_ERROR_OBJECT (self, "Failed to update src rect");
+    return FALSE;
+  }
+
+  if (!gst_d3d12_converter_update_transform (self)) {
+    GST_ERROR_OBJECT (self, "Failed to update transform matrix");
+    return FALSE;
+  }
+
+  if (!gst_d3d12_converter_update_pso (self)) {
+    GST_ERROR_OBJECT (self, "Failed to update pso");
+    return FALSE;
+  }
+
+  auto & barriers = priv->barriers;
+  auto & rtv_handles = priv->rtv_handles;
+
+  barriers.clear ();
+  rtv_handles.clear ();
+  std::vector < D3D12_RECT > rtv_rects;
+
+  auto upload_data = priv->upload_data;
+
+  if (priv->is_first) {
+    g_assert (upload_data);
+
+    GST_DEBUG_OBJECT (self, "First loop, uploading data");
+    cl->CopyResource (priv->vertex_index_buf.Get (),
+        upload_data->vertex_index_upload.Get ());
+    barriers.
+        push_back (CD3DX12_RESOURCE_BARRIER::Transition (priv->vertex_index_buf.
+            Get (), D3D12_RESOURCE_STATE_COPY_DEST, STATE_VERTEX_AND_INDEX));
+
+    cl->CopyResource (priv->ps_const_buf.Get (),
+        upload_data->ps_const_upload.Get ());
+    barriers.
+        push_back (CD3DX12_RESOURCE_BARRIER::Transition (priv->ps_const_buf.
+            Get (), D3D12_RESOURCE_STATE_COPY_DEST,
+            D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER));
+
+    if (priv->crs->HaveLut ()) {
+      D3D12_TEXTURE_COPY_LOCATION src;
+      D3D12_TEXTURE_COPY_LOCATION dst;
+      g_assert (upload_data->gamma_dec_lut_upload);
+      g_assert (upload_data->gamma_enc_lut_upload);
+      g_assert (priv->gamma_dec_lut);
+      g_assert (priv->gamma_enc_lut);
+
+      src =
+          CD3DX12_TEXTURE_COPY_LOCATION (upload_data->
+          gamma_dec_lut_upload.Get (), priv->gamma_lut_layout);
+      dst = CD3DX12_TEXTURE_COPY_LOCATION (priv->gamma_dec_lut.Get ());
+
+      cl->CopyTextureRegion (&dst, 0, 0, 0, &src, nullptr);
+      barriers.
+          push_back (CD3DX12_RESOURCE_BARRIER::Transition (priv->gamma_dec_lut.
+              Get (), D3D12_RESOURCE_STATE_COPY_DEST,
+              D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE));
+
+      src =
+          CD3DX12_TEXTURE_COPY_LOCATION (upload_data->
+          gamma_enc_lut_upload.Get (), priv->gamma_lut_layout);
+      dst = CD3DX12_TEXTURE_COPY_LOCATION (priv->gamma_enc_lut.Get ());
+
+      cl->CopyTextureRegion (&dst, 0, 0, 0, &src, nullptr);
+      barriers.
+          push_back (CD3DX12_RESOURCE_BARRIER::Transition (priv->gamma_enc_lut.
+              Get (), D3D12_RESOURCE_STATE_COPY_DEST,
+              D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE));
+    }
+  } else if (upload_data) {
+    std::vector < D3D12_RESOURCE_BARRIER > pre_copy_barriers;
+    if (upload_data->vertex_index_upload) {
+      pre_copy_barriers.
+          push_back (CD3DX12_RESOURCE_BARRIER::
+          Transition (priv->vertex_index_buf.Get (), STATE_VERTEX_AND_INDEX,
+              D3D12_RESOURCE_STATE_COPY_DEST));
+
+      barriers.
+          push_back (CD3DX12_RESOURCE_BARRIER::
+          Transition (priv->vertex_index_buf.Get (),
+              D3D12_RESOURCE_STATE_COPY_DEST, STATE_VERTEX_AND_INDEX));
+    }
+
+    if (!pre_copy_barriers.empty ()) {
+      cl->ResourceBarrier (pre_copy_barriers.size (),
+          pre_copy_barriers.data ());
+    }
+
+    if (upload_data->vertex_index_upload) {
+      GST_DEBUG_OBJECT (self, "Vertex updated");
+      cl->CopyResource (priv->vertex_index_buf.Get (),
+          upload_data->vertex_index_upload.Get ());
+    }
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+
+  ComPtr < ID3D12DescriptorHeap > srv_heap;
+  GstD3D12Descriptor *descriptor;
+  if (!gst_d3d12_descriptor_pool_acquire (priv->srv_heap_pool, &descriptor)) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire srv heap");
+    return FALSE;
+  }
+
+  gst_d3d12_descriptor_get_handle (descriptor, &srv_heap);
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, descriptor);
+
+  auto cpu_handle =
+      CD3DX12_CPU_DESCRIPTOR_HANDLE
+      (srv_heap->GetCPUDescriptorHandleForHeapStart ());
+
+  for (guint i = 0; i < gst_buffer_n_memory (in_buf); i++) {
+    auto mem = (GstD3D12Memory *) gst_buffer_peek_memory (in_buf, i);
+    auto num_planes = gst_d3d12_memory_get_plane_count (mem);
+    ComPtr < ID3D12DescriptorHeap > mem_srv_heap;
+
+    if (!gst_d3d12_memory_get_shader_resource_view_heap (mem, &mem_srv_heap)) {
+      GST_ERROR_OBJECT (self, "Couldn't get SRV");
+      return FALSE;
+    }
+
+    device->CopyDescriptorsSimple (num_planes, cpu_handle,
+        mem_srv_heap->GetCPUDescriptorHandleForHeapStart (),
+        D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+    cpu_handle.Offset (num_planes, priv->srv_inc_size);
+  }
+
+  if (priv->crs->HaveLut ()) {
+    device->CopyDescriptorsSimple (2, cpu_handle,
+        priv->gamma_lut_heap->GetCPUDescriptorHandleForHeapStart (),
+        D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+  }
+
+  for (guint i = 0; i < gst_buffer_n_memory (out_buf); i++) {
+    auto mem = (GstD3D12Memory *) gst_buffer_peek_memory (out_buf, i);
+    auto num_planes = gst_d3d12_memory_get_plane_count (mem);
+    ComPtr < ID3D12DescriptorHeap > rtv_heap;
+
+    if (!gst_d3d12_memory_get_render_target_view_heap (mem, &rtv_heap)) {
+      GST_ERROR_OBJECT (self, "Couldn't get rtv heap");
+      return FALSE;
+    }
+
+    auto cpu_handle =
+        CD3DX12_CPU_DESCRIPTOR_HANDLE
+        (rtv_heap->GetCPUDescriptorHandleForHeapStart ());
+
+    for (guint plane = 0; plane < num_planes; plane++) {
+      D3D12_RECT rect = { };
+      gst_d3d12_memory_get_plane_rectangle (mem, plane, &rect);
+      rtv_rects.push_back (rect);
+      rtv_handles.push_back (cpu_handle);
+      cpu_handle.Offset (priv->rtv_inc_size);
+    }
+  }
+
+  if (!barriers.empty ())
+    cl->ResourceBarrier (barriers.size (), barriers.data ());
+
+  if (priv->clear_background) {
+    for (size_t i = 0; i < rtv_handles.size (); i++) {
+      cl->ClearRenderTargetView (rtv_handlesi,
+          priv->clear_colori, 1, &rtv_rectsi);
+    }
+  }
+
+  auto pso = priv->quad_data0.pso.Get ();
+
+  cl->SetGraphicsRootSignature (priv->rs.Get ());
+  cl->SetPipelineState (pso);
+
+  ID3D12DescriptorHeap *heaps = { srv_heap.Get () };
+  cl->SetDescriptorHeaps (1, heaps);
+  cl->SetGraphicsRootDescriptorTable (priv->crs->GetPsSrvIdx (),
+      srv_heap->GetGPUDescriptorHandleForHeapStart ());
+  cl->SetGraphicsRoot32BitConstants (priv->crs->GetVsRootConstIdx (),
+      16, &priv->transform, 0);
+  cl->SetGraphicsRoot32BitConstants (priv->crs->GetPsRootConstIdx (),
+      1, &priv->alpha, 0);
+  cl->SetGraphicsRootConstantBufferView (priv->crs->GetPsCbvIdx (),
+      priv->ps_const_buf->GetGPUVirtualAddress ());
+
+  cl->IASetIndexBuffer (&priv->idv);
+  cl->IASetVertexBuffers (0, 1, &priv->vbv);
+  cl->IASetPrimitiveTopology (D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+  cl->RSSetViewports (priv->quad_data0.num_rtv, priv->viewport);
+  cl->RSSetScissorRects (priv->quad_data0.num_rtv, priv->scissor_rect);
+  cl->OMSetRenderTargets (priv->quad_data0.num_rtv,
+      rtv_handles.data (), FALSE, nullptr);
+  cl->OMSetBlendFactor (priv->blend_factor);
+  cl->DrawIndexedInstanced (6, 1, 0, 0, 0);
+
+  pso->AddRef ();
+  gst_d3d12_fence_data_add_notify_com (fence_data, pso);
+
+  auto offset = priv->quad_data0.num_rtv;
+  if (priv->quad_data.size () == 2) {
+    pso = priv->quad_data1.pso.Get ();
+
+    cl->SetPipelineState (pso);
+    cl->RSSetViewports (priv->quad_data1.num_rtv, &priv->viewportoffset);
+    cl->RSSetScissorRects (priv->quad_data1.num_rtv,
+        &priv->scissor_rectoffset);
+    cl->OMSetRenderTargets (priv->quad_data1.num_rtv,
+        rtv_handles.data () + offset, FALSE, nullptr);
+    cl->DrawIndexedInstanced (6, 1, 0, 0, 0);
+
+    pso->AddRef ();
+    gst_d3d12_fence_data_add_notify_com (fence_data, pso);
+  }
+
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data,
+      gst_buffer_ref (in_buf));
+  if (priv->upload_data) {
+    gst_d3d12_fence_data_add_notify (fence_data,
+        priv->upload_data, (GDestroyNotify) converter_upload_data_free);
+  }
+  priv->upload_data = nullptr;
+  priv->is_first = false;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_converter_map_buffer (GstBuffer * buffer,
+    GstMapInfo infoGST_VIDEO_MAX_PLANES, GstMapFlags flags)
+{
+  GstMapFlags map_flags;
+  guint num_mapped = 0;
+
+  map_flags = (GstMapFlags) (flags | GST_MAP_D3D12);
+
+  for (num_mapped = 0; num_mapped < gst_buffer_n_memory (buffer); num_mapped++) {
+    auto mem = gst_buffer_peek_memory (buffer, num_mapped);
+
+    if (!gst_memory_map (mem, &infonum_mapped, map_flags))
+      goto error;
+  }
+
+  return TRUE;
+
+error:
+  for (guint i = 0; i < num_mapped; i++) {
+    auto mem = gst_buffer_peek_memory (buffer, i);
+    gst_memory_unmap (mem, &infoi);
+  }
+
+  return FALSE;
+}
+
+static void
+gst_d3d12_converter_unmap_buffer (GstBuffer * buffer,
+    GstMapInfo infoGST_VIDEO_MAX_PLANES)
+{
+  for (guint i = 0; i < gst_buffer_n_memory (buffer); i++) {
+    auto mem = gst_buffer_peek_memory (buffer, i);
+    gst_memory_unmap (mem, &infoi);
+  }
+}
+
+static GstBuffer *
+gst_d3d12_converter_upload_buffer (GstD3D12Converter * self, GstBuffer * in_buf)
+{
+  GstVideoFrame in_frame, out_frame;
+  auto priv = self->priv;
+  GstBuffer *fallback_buf = nullptr;
+
+  if (!gst_video_frame_map (&in_frame, &priv->in_info, in_buf, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (self, "Couldn't map video frame");
+    return nullptr;
+  }
+
+  if (priv->fallback_pool) {
+    if (priv->fallback_pool_info.width != in_frame.info.width ||
+        priv->fallback_pool_info.height != in_frame.info.height) {
+      gst_buffer_pool_set_active (priv->fallback_pool, FALSE);
+      gst_clear_object (&priv->fallback_pool);
+    }
+  }
+
+  if (!priv->fallback_pool) {
+    priv->fallback_pool = gst_d3d12_buffer_pool_new (self->device);
+    priv->fallback_pool_info = in_frame.info;
+    auto caps = gst_video_info_to_caps (&in_frame.info);
+    auto config = gst_buffer_pool_get_config (priv->fallback_pool);
+    auto params = gst_d3d12_allocation_params_new (self->device, &in_frame.info,
+        GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+    gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+    gst_d3d12_allocation_params_free (params);
+    gst_buffer_pool_config_set_params (config, caps, in_frame.info.size, 0, 0);
+    gst_caps_unref (caps);
+
+    if (!gst_buffer_pool_set_config (priv->fallback_pool, config)) {
+      GST_ERROR_OBJECT (self, "Couldn't set pool config");
+      gst_video_frame_unmap (&in_frame);
+      gst_clear_object (&priv->fallback_pool);
+      return nullptr;
+    }
+
+    if (!gst_buffer_pool_set_active (priv->fallback_pool, TRUE)) {
+      GST_ERROR_OBJECT (self, "Failed to set active");
+      gst_video_frame_unmap (&in_frame);
+      gst_clear_object (&priv->fallback_pool);
+      return nullptr;
+    }
+  }
+
+  gst_buffer_pool_acquire_buffer (priv->fallback_pool, &fallback_buf, nullptr);
+  if (!fallback_buf) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire fallback buf");
+    gst_video_frame_unmap (&in_frame);
+    return nullptr;
+  }
+
+  if (!gst_video_frame_map (&out_frame, &priv->fallback_pool_info, fallback_buf,
+          GST_MAP_WRITE)) {
+    GST_ERROR_OBJECT (self, "Couldn't map output frame");
+    gst_video_frame_unmap (&in_frame);
+    gst_buffer_unref (fallback_buf);
+    return nullptr;
+  }
+
+  auto copy_ret = gst_video_frame_copy (&out_frame, &in_frame);
+  gst_video_frame_unmap (&out_frame);
+  gst_video_frame_unmap (&in_frame);
+
+  if (!copy_ret) {
+    GST_ERROR_OBJECT (self, "Couldn't copy to fallback buffer");
+    gst_buffer_unref (fallback_buf);
+    return nullptr;
+  }
+
+  return fallback_buf;
+}
+
+static gboolean
+gst_d3d12_converter_check_needs_upload (GstD3D12Converter * self,
+    GstBuffer * buf)
+{
+  auto mem = gst_buffer_peek_memory (buf, 0);
+  if (!gst_is_d3d12_memory (mem))
+    return TRUE;
+
+  auto dmem = GST_D3D12_MEMORY_CAST (mem);
+  if (dmem->device != self->device)
+    return TRUE;
+
+  auto resource = gst_d3d12_memory_get_resource_handle (dmem);
+  auto desc = resource->GetDesc ();
+  if ((desc.Flags & D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE) ==
+      D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE) {
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+gboolean
+gst_d3d12_converter_convert_buffer (GstD3D12Converter * converter,
+    GstBuffer * in_buf, GstBuffer * out_buf, GstD3D12FenceData * fence_data,
+    ID3D12GraphicsCommandList * cl)
+{
+  g_return_val_if_fail (GST_IS_D3D12_CONVERTER (converter), FALSE);
+  g_return_val_if_fail (GST_IS_BUFFER (in_buf), FALSE);
+  g_return_val_if_fail (GST_IS_BUFFER (out_buf), FALSE);
+  g_return_val_if_fail (fence_data, FALSE);
+  g_return_val_if_fail (cl, FALSE);
+
+  GstMapInfo in_infoGST_VIDEO_MAX_PLANES;
+
+  gboolean need_upload = gst_d3d12_converter_check_needs_upload (converter,
+      in_buf);
+
+  if (need_upload) {
+    in_buf = gst_d3d12_converter_upload_buffer (converter, in_buf);
+    if (!in_buf)
+      return FALSE;
+  }
+
+  if (!gst_d3d12_converter_map_buffer (in_buf, in_info, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (converter, "Couldn't map input buffer");
+    if (need_upload)
+      gst_buffer_unref (in_buf);
+    return FALSE;
+  }
+  gst_d3d12_converter_unmap_buffer (in_buf, in_info);
+
+  auto ret = gst_d3d12_converter_execute (converter,
+      in_buf, out_buf, fence_data, cl);
+
+  /* fence data will hold this buffer */
+  if (need_upload)
+    gst_buffer_unref (in_buf);
+
+  return ret;
+}
+
+gboolean
+gst_d3d12_converter_update_blend_state (GstD3D12Converter * converter,
+    const D3D12_BLEND_DESC * blend_desc, const gfloat blend_factor4)
+{
+  g_return_val_if_fail (GST_IS_D3D12_CONVERTER (converter), FALSE);
+
+  auto priv = converter->priv;
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+  D3D12_BLEND_DESC new_blend = CD3DX12_BLEND_DESC (D3D12_DEFAULT);
+
+  if (blend_desc)
+    new_blend = *blend_desc;
+
+  if (memcmp (&priv->blend_desc, &new_blend, sizeof (D3D12_BLEND_DESC)) != 0)
+    priv->update_pso = TRUE;
+
+  if (blend_factor) {
+    for (guint i = 0; i < 4; i++)
+      priv->blend_factori = blend_factori;
+  } else {
+    for (guint i = 0; i < 4; i++)
+      priv->blend_factori = 1.0f;
+  }
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_converter_apply_transform (GstD3D12Converter * converter,
+    GstVideoOrientationMethod orientation, gfloat viewport_width,
+    gfloat viewport_height, gfloat fov, gboolean ortho, gfloat rotation_x,
+    gfloat rotation_y, gfloat rotation_z, gfloat scale_x, gfloat scale_y)
+{
+  g_return_val_if_fail (GST_IS_D3D12_CONVERTER (converter), FALSE);
+
+  auto priv = converter->priv;
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+
+  gfloat aspect_ratio;
+  gboolean rotated = FALSE;
+  XMMATRIX rotate_matrix = XMMatrixIdentity ();
+
+  switch (orientation) {
+    case GST_VIDEO_ORIENTATION_IDENTITY:
+    case GST_VIDEO_ORIENTATION_AUTO:
+    case GST_VIDEO_ORIENTATION_CUSTOM:
+    default:
+      break;
+    case GST_VIDEO_ORIENTATION_90R:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_90r);
+      rotated = TRUE;
+      break;
+    case GST_VIDEO_ORIENTATION_180:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_180);
+      break;
+    case GST_VIDEO_ORIENTATION_90L:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_90l);
+      rotated = TRUE;
+      break;
+    case GST_VIDEO_ORIENTATION_HORIZ:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_horiz);
+      break;
+    case GST_VIDEO_ORIENTATION_VERT:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_vert);
+      break;
+    case GST_VIDEO_ORIENTATION_UL_LR:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_ul_lr);
+      rotated = TRUE;
+      break;
+    case GST_VIDEO_ORIENTATION_UR_LL:
+      rotate_matrix = XMLoadFloat4x4A (&g_matrix_ur_ll);
+      rotated = TRUE;
+      break;
+  }
+
+  if (rotated)
+    aspect_ratio = viewport_height / viewport_width;
+  else
+    aspect_ratio = viewport_width / viewport_height;
+
+  /* Apply user specified transform matrix first, then rotate-method */
+  XMMATRIX scale = XMMatrixScaling (scale_x * aspect_ratio, scale_y, 1.0);
+
+  XMMATRIX rotate =
+      XMMatrixRotationX (XMConvertToRadians (rotation_x)) *
+      XMMatrixRotationY (XMConvertToRadians (-rotation_y)) *
+      XMMatrixRotationZ (XMConvertToRadians (-rotation_z));
+
+  XMMATRIX view = XMMatrixLookAtLH (XMVectorSet (0.0, 0.0, -1.0, 0.0),
+      XMVectorSet (0.0, 0.0, 0.0, 0.0), XMVectorSet (0.0, 1.0, 0.0, 0.0));
+
+  XMMATRIX proj;
+  if (ortho) {
+    proj = XMMatrixOrthographicOffCenterLH (-aspect_ratio,
+        aspect_ratio, -1.0, 1.0, 0.1, 100.0);
+  } else {
+    proj = XMMatrixPerspectiveFovLH (XMConvertToRadians (fov),
+        aspect_ratio, 0.1, 100.0);
+  }
+
+  XMMATRIX mvp = scale * rotate * view * proj * rotate_matrix;
+  XMStoreFloat4x4A (&priv->custom_transform, mvp);
+  priv->update_transform = TRUE;
+  priv->video_direction = GST_VIDEO_ORIENTATION_CUSTOM;
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12converter.h Added

@@ -0,0 +1,165 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+#include "gstd3d12fencedatapool.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_CONVERTER             (gst_d3d12_converter_get_type())
+#define GST_D3D12_CONVERTER(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_D3D12_CONVERTER,GstD3D12Converter))
+#define GST_D3D12_CONVERTER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_D3D12_CONVERTER,GstD3D12ConverterClass))
+#define GST_D3D12_CONVERTER_GET_CLASS(obj)   (GST_D3D12_CONVERTER_CLASS(G_OBJECT_GET_CLASS(obj)))
+#define GST_IS_D3D12_CONVERTER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_D3D12_CONVERTER))
+#define GST_IS_D3D12_CONVERTER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_D3D12_CONVERTER))
+#define GST_D3D12_CONVERTER_CAST(obj)        ((GstD3D12Converter*)(obj))
+
+/**
+ * GST_D3D12_CONVERTER_OPT_GAMMA_MODE:
+ *
+ * #GstVideoGammaMode, set the gamma mode.
+ * Default is #GST_VIDEO_GAMMA_MODE_NONE
+ */
+#define GST_D3D12_CONVERTER_OPT_GAMMA_MODE "GstD3D12Converter.gamma-mode"
+
+/**
+ * GST_D3D12_CONVERTER_OPT_PRIMARIES_MODE:
+ *
+ * #GstVideoPrimariesMode, set the primaries conversion mode.
+ * Default is #GST_VIDEO_PRIMARIES_MODE_NONE.
+ */
+#define GST_D3D12_CONVERTER_OPT_PRIMARIES_MODE "GstD3D12Converter.primaries-mode"
+
+ /**
+  * GST_D3D12_CONVERTER_OPT_SAMPLER_FILTER:
+  *
+  * #D3D12_FILTER, set sampler filter.
+  *
+  * Supported values are:
+  * @D3D12_FILTER_MIN_MAG_MIP_POINT
+  * @D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT
+  * @D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT
+  * @D3D12_FILTER_ANISOTROPIC
+  *
+  * Default is #D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT.
+  */
+#define GST_D3D12_CONVERTER_OPT_SAMPLER_FILTER "GstD3D12Converter.sampler-filter"
+
+GType gst_d3d12_converter_sampler_filter_get_type (void);
+#define GST_TYPE_D3D12_CONVERTER_SAMPLER_FILTER (gst_d3d12_converter_sampler_filter_get_type())
+
+/**
+ * GstD3D12ConverterAlphaMode:
+ * @GST_D3D12_CONVERTER_ALPHA_MODE_UNSPECIFIED: Unspecified alpha mode
+ * @GST_D3D12_CONVERTER_ALPHA_MODE_PREMULTIPLIED: Premultiplied alpha
+ * @GST_D3D12_CONVERTER_ALPHA_MODE_STRAIGHT: Straight alpha
+ *
+ * Alpha mode. Enum values are idnetical to DXGI_ALPHA_MODE
+ */
+typedef enum
+{
+  GST_D3D12_CONVERTER_ALPHA_MODE_UNSPECIFIED = 0,
+  GST_D3D12_CONVERTER_ALPHA_MODE_PREMULTIPLIED = 1,
+  GST_D3D12_CONVERTER_ALPHA_MODE_STRAIGHT = 2,
+} GstD3D12ConverterAlphaMode;
+
+GType gst_d3d12_converter_alpha_mode_get_type (void);
+#define GST_TYPE_D3D12_CONVERTER_ALPHA_MODE (gst_d3d12_converter_alpha_mode_get_type())
+
+/**
+ * GST_D3D12_CONVERTER_OPT_SRC_ALPHA_MODE:
+ *
+ * Set the source alpha mode.
+ * Default is #GST_D3D12_CONVERTER_ALPHA_MODE_UNSPECIFIED.
+ */
+#define GST_D3D12_CONVERTER_OPT_SRC_ALPHA_MODE "GstD3D12Converter.src-alpha-mode"
+
+/**
+ * GST_D3D12_CONVERTER_OPT_DEST_ALPHA_MODE:
+ *
+ * Set the source alpha mode.
+ * Default is #GST_D3D12_CONVERTER_ALPHA_MODE_UNSPECIFIED.
+ */
+#define GST_D3D12_CONVERTER_OPT_DEST_ALPHA_MODE "GstD3D12Converter.dest-alpha-mode"
+
+/**
+ * GstD3D12Converter:
+ *
+ * Opaque GstD3D12Converter struct
+ */
+struct _GstD3D12Converter
+{
+  GstObject parent;
+
+  GstD3D12Device *device;
+
+  /*< private >*/
+  GstD3D12ConverterPrivate *priv;
+  gpointer _gst_reservedGST_PADDING;
+};
+
+/**
+ * GstD3D12ConverterClass:
+ *
+ * Opaque GstD3D12ConverterClass struct
+ */
+struct _GstD3D12ConverterClass
+{
+  GstObjectClass parent_class;
+
+  /*< private >*/
+  gpointer _gst_reservedGST_PADDING;
+};
+
+GType               gst_d3d12_converter_get_type (void);
+
+GstD3D12Converter * gst_d3d12_converter_new  (GstD3D12Device * device,
+                                              const GstVideoInfo * in_info,
+                                              const GstVideoInfo * out_info,
+                                              const D3D12_BLEND_DESC * blend_desc,
+                                              const gfloat blend_factor4,
+                                              GstStructure * config);
+
+gboolean            gst_d3d12_converter_convert_buffer (GstD3D12Converter * converter,
+                                                        GstBuffer * in_buf,
+                                                        GstBuffer * out_buf,
+                                                        GstD3D12FenceData * fence_data,
+                                                        ID3D12GraphicsCommandList * command_list);
+
+gboolean            gst_d3d12_converter_update_blend_state (GstD3D12Converter * converter,
+                                                            const D3D12_BLEND_DESC * blend_desc,
+                                                            const gfloat blend_factor4);
+
+gboolean            gst_d3d12_converter_apply_transform (GstD3D12Converter * converter,
+                                                         GstVideoOrientationMethod orientation,
+                                                         gfloat viewport_width,
+                                                         gfloat viewport_height,
+                                                         gfloat fov,
+                                                         gboolean ortho,
+                                                         gfloat rotation_x,
+                                                         gfloat rotation_y,
+                                                         gfloat rotation_z,
+                                                         gfloat scale_x,
+                                                         gfloat scale_y);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12decoder.cpp Added

@@ -0,0 +1,2263 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <directx/d3dx12.h>
+#include "gstd3d12decoder.h"
+#include <gst/base/gstqueuearray.h>
+#include <wrl.h>
+#include <string.h>
+#include <mutex>
+#include <set>
+#include <vector>
+#include <queue>
+#include <string>
+#include <vector>
+#include <memory>
+#include <algorithm>
+#include <atomic>
+
+GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_decoder_debug);
+#define GST_CAT_DEFAULT gst_d3d12_decoder_debug
+
+struct DecoderFormat
+{
+  GstDxvaCodec codec;
+  const GUID decode_profile;
+  DXGI_FORMAT format3;
+};
+
+static const DecoderFormat format_list = {
+  {GST_DXVA_CODEC_MPEG2, D3D12_VIDEO_DECODE_PROFILE_MPEG2,
+      {DXGI_FORMAT_NV12, DXGI_FORMAT_UNKNOWN,}},
+  {GST_DXVA_CODEC_MPEG2, D3D12_VIDEO_DECODE_PROFILE_MPEG1_AND_MPEG2,
+      {DXGI_FORMAT_NV12, DXGI_FORMAT_UNKNOWN,}},
+  {GST_DXVA_CODEC_H264, D3D12_VIDEO_DECODE_PROFILE_H264,
+      {DXGI_FORMAT_NV12, DXGI_FORMAT_UNKNOWN,}},
+  {GST_DXVA_CODEC_H265, D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN,
+      {DXGI_FORMAT_NV12, DXGI_FORMAT_UNKNOWN,}},
+  {GST_DXVA_CODEC_H265, D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN10,
+      DXGI_FORMAT_P010},
+  {GST_DXVA_CODEC_VP8, D3D12_VIDEO_DECODE_PROFILE_VP8,
+      {DXGI_FORMAT_NV12, DXGI_FORMAT_UNKNOWN,}},
+  {GST_DXVA_CODEC_VP9, D3D12_VIDEO_DECODE_PROFILE_VP9,
+      {DXGI_FORMAT_NV12, DXGI_FORMAT_UNKNOWN,}},
+  {GST_DXVA_CODEC_VP9, D3D12_VIDEO_DECODE_PROFILE_VP9_10BIT_PROFILE2,
+      {DXGI_FORMAT_P010, DXGI_FORMAT_UNKNOWN,}},
+  {GST_DXVA_CODEC_AV1, D3D12_VIDEO_DECODE_PROFILE_AV1_PROFILE0,
+      {DXGI_FORMAT_NV12, DXGI_FORMAT_P010}},
+};
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+class GstD3D12Dpb
+{
+public:
+  GstD3D12Dpb (guint8 size) : size_(size)
+  {
+    textures_.resize (size);
+    subresources_.resize (size);
+    heaps_.resize (size);
+
+    for (guint i = 0; i < size; i++) {
+      dxva_id_.push (i);
+      textures_i = nullptr;
+      subresources_i = 0;
+      heaps_i = nullptr;
+    }
+  }
+
+  guint8 Acquire (GstD3D12Memory * mem, ID3D12VideoDecoderHeap * heap)
+  {
+    std::unique_lock <std::mutex> lk (lock_);
+    while (dxva_id_.empty ())
+      cond_.wait (lk);
+
+    guint8 ret = dxva_id_.front ();
+    dxva_id_.pop ();
+
+    GstD3D12Memory *dmem;
+    ID3D12Resource *resource;
+    UINT subresource = 0;
+
+    dmem = GST_D3D12_MEMORY_CAST (mem);
+    resource = gst_d3d12_memory_get_resource_handle (dmem);
+    gst_d3d12_memory_get_subresource_index (dmem, 0, &subresource);
+
+    textures_ret = resource;
+    subresources_ret = subresource;
+    heaps_ret = heap;
+
+    return ret;
+  }
+
+  void Release (guint8 id)
+  {
+    std::lock_guard <std::mutex> lk (lock_);
+
+    if (id == 0xff || id >= size_) {
+      GST_WARNING ("Unexpected id %d", id);
+      return;
+    }
+
+    dxva_id_.push (id);
+    textures_id = nullptr;
+    subresources_id = 0;
+    heaps_id = nullptr;
+
+    cond_.notify_one ();
+  }
+
+  void GetReferenceFrames (D3D12_VIDEO_DECODE_REFERENCE_FRAMES & frames)
+  {
+    frames.NumTexture2Ds = size_;
+    frames.ppTexture2Ds = textures_.data ();
+    frames.pSubresources = subresources_.data ();
+    frames.ppHeaps = heaps_.data ();
+  }
+
+  void Lock ()
+  {
+    lock_.lock ();
+  }
+
+  void Unlock ()
+  {
+    lock_.unlock ();
+  }
+
+private:
+  std::queue<guint8> dxva_id_;
+  std::mutex lock_;
+  std::condition_variable cond_;
+  guint size_;
+  std::vector<ID3D12Resource *> textures_;
+  std::vector<UINT> subresources_;
+  std::vector<ID3D12VideoDecoderHeap *> heaps_;
+  bool flushing = false;
+};
+
+struct GstD3D12DecoderPicture : public GstMiniObject
+{
+  GstD3D12DecoderPicture (GstBuffer * dpb_buf, GstBuffer * out_buf,
+      std::shared_ptr<GstD3D12Dpb> d3d12_dpb, ID3D12VideoDecoder * dec,
+      ID3D12VideoDecoderHeap * decoder_heap, guint8 dxva_id)
+      : buffer(dpb_buf), output_buffer(out_buf)
+      , decoder(dec), heap(decoder_heap), dpb(d3d12_dpb), view_id(dxva_id) {}
+
+  ~GstD3D12DecoderPicture ()
+  {
+    auto d3d12_dpb = dpb.lock ();
+    if (d3d12_dpb)
+      d3d12_dpb->Release (view_id);
+
+    if (buffer)
+      gst_buffer_unref (buffer);
+    if (output_buffer)
+      gst_buffer_unref (output_buffer);
+  }
+
+  GstBuffer *buffer;
+  GstBuffer *output_buffer;
+  ComPtr<ID3D12VideoDecoder> decoder;
+  ComPtr<ID3D12VideoDecoderHeap> heap;
+  std::weak_ptr<GstD3D12Dpb> dpb;
+  guint64 fence_val = 0;
+
+  guint8 view_id;
+};
+
+static GType gst_d3d12_decoder_picture_get_type (void);
+#define GST_TYPE_D3D12_DECODER_PICTURE (gst_d3d12_decoder_picture_get_type ())
+GST_DEFINE_MINI_OBJECT_TYPE (GstD3D12DecoderPicture, gst_d3d12_decoder_picture);
+
+enum GstD3D12DecoderOutputType
+{
+  GST_D3D12_DECODER_OUTPUT_UNKNOWN = 0,
+  GST_D3D12_DECODER_OUTPUT_SYSTEM = (1 << 0),
+  GST_D3D12_DECODER_OUTPUT_D3D12 = (1 << 1),
+};
+
+DEFINE_ENUM_FLAG_OPERATORS (GstD3D12DecoderOutputType);
+
+constexpr UINT64 ASYNC_DEPTH = 4;
+
+struct DecoderCmdData
+{
+  DecoderCmdData ()
+  {
+    event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+  }
+
+  ~DecoderCmdData ()
+  {
+    CloseHandle (event_handle);
+    gst_clear_object (&ca_pool);
+    gst_clear_object (&queue);
+  }
+
+  ComPtr<ID3D12Device> device;
+
+  ComPtr<ID3D12VideoDevice> video_device;
+  ComPtr<ID3D12VideoDecodeCommandList> cl;
+  GstD3D12CommandQueue *queue = nullptr;
+  GstD3D12CommandAllocatorPool *ca_pool = nullptr;
+
+  /* Fence to wait at command record thread */
+  HANDLE event_handle;
+  UINT64 fence_val = 0;
+};
+
+struct DecoderOutputData
+{
+  GstVideoDecoder *decoder = nullptr;
+  GstVideoCodecFrame *frame = nullptr;
+  GstCodecPicture *picture = nullptr;
+  gint width = 0;
+  gint height = 0;
+  GstVideoBufferFlags buffer_flags = (GstVideoBufferFlags) 0;
+};
+
+struct DecoderSessionData
+{
+  DecoderSessionData ()
+  {
+    output_queue = gst_queue_array_new_for_struct (sizeof (DecoderOutputData),
+        16);
+  }
+
+  ~DecoderSessionData ()
+  {
+    if (dpb_pool) {
+      gst_buffer_pool_set_active (dpb_pool, FALSE);
+      gst_object_unref (dpb_pool);
+    }
+
+    if (output_pool) {
+      gst_buffer_pool_set_active (output_pool, FALSE);
+      gst_object_unref (output_pool);
+    }
+
+    if (input_state)
+      gst_video_codec_state_unref (input_state);
+
+    if (output_state)
+      gst_video_codec_state_unref (output_state);
+
+    gst_queue_array_free (output_queue);
+  }
+
+  D3D12_VIDEO_DECODER_DESC decoder_desc = {};
+  ComPtr<ID3D12VideoDecoder> decoder;
+
+  D3D12_VIDEO_DECODER_HEAP_DESC heap_desc = {};
+  ComPtr<ID3D12VideoDecoderHeap> heap;
+
+  std::shared_ptr<GstD3D12Dpb> dpb;
+
+  ComPtr<ID3D12Resource> staging;
+
+  GstBufferPool *dpb_pool = nullptr;
+
+  /* Used for output if reference-only texture is required */
+  GstBufferPool *output_pool = nullptr;
+
+  GstVideoCodecState *input_state = nullptr;
+  GstVideoCodecState *output_state = nullptr;
+
+  gint aligned_width = 0;
+  gint aligned_height = 0;
+  guint dpb_size = 0;
+
+  GstVideoInfo info;
+  GstVideoInfo output_info;
+  gint crop_x = 0;
+  gint crop_y = 0;
+  gint coded_width = 0;
+  gint coded_height = 0;
+  DXGI_FORMAT decoder_format = DXGI_FORMAT_UNKNOWN;
+  bool need_crop = false;
+  bool use_crop_meta = false;
+  bool array_of_textures = false;
+  bool reference_only = false;
+
+  GstD3D12DecoderOutputType output_type = GST_D3D12_DECODER_OUTPUT_SYSTEM;
+
+  D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT support = { 0, };
+
+  /* For staging */
+  D3D12_PLACED_SUBRESOURCE_FOOTPRINT layoutGST_VIDEO_MAX_PLANES = { 0, };
+
+  std::mutex queue_lock;
+  std::condition_variable queue_cond;
+  GstQueueArray *output_queue;
+
+  std::recursive_mutex lock;
+};
+
+struct GstD3D12DecoderPrivate
+{
+  GstD3D12DecoderPrivate ()
+  {
+    copy_event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+    fence_data_pool = gst_d3d12_fence_data_pool_new ();
+  }
+
+  ~GstD3D12DecoderPrivate ()
+  {
+    CloseHandle (copy_event_handle);
+    gst_clear_object (&fence_data_pool);
+  }
+
+  std::mutex lock;
+  std::recursive_mutex context_lock;
+
+  std::unique_ptr<DecoderCmdData> cmd;
+  std::unique_ptr<DecoderSessionData> session;
+  GThread *output_thread = nullptr;
+  std::atomic<bool> flushing;
+  std::atomic<GstFlowReturn> last_flow;
+
+  HANDLE copy_event_handle;
+
+  GstD3D12FenceDataPool *fence_data_pool;
+
+  std::vector<D3D12_RESOURCE_BARRIER> pre_barriers;
+  std::vector<D3D12_RESOURCE_BARRIER> post_barriers;
+  std::vector < GstD3D12DecoderPicture * >configured_ref_pics;
+};
+
+/* *INDENT-ON* */
+
+struct _GstD3D12Decoder
+{
+  GstObject parent;
+
+  GstDxvaCodec codec;
+  GstD3D12Device *device;
+  gint64 adapter_luid;
+
+  GstD3D12DecoderPrivate *priv;
+};
+
+static void gst_d3d12_decoder_finalize (GObject * object);
+static gpointer gst_d3d12_decoder_output_loop (GstD3D12Decoder * self);
+
+#define parent_class gst_d3d12_decoder_parent_class
+G_DEFINE_TYPE (GstD3D12Decoder, gst_d3d12_decoder, GST_TYPE_OBJECT);
+
+static void
+gst_d3d12_decoder_class_init (GstD3D12DecoderClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->finalize = gst_d3d12_decoder_finalize;
+}
+
+static void
+gst_d3d12_decoder_init (GstD3D12Decoder * self)
+{
+  self->priv = new GstD3D12DecoderPrivate ();
+}
+
+static void
+gst_d3d12_decoder_finalize (GObject * object)
+{
+  auto self = GST_D3D12_DECODER (object);
+
+  gst_clear_object (&self->device);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GstD3D12Decoder *
+gst_d3d12_decoder_new (GstDxvaCodec codec, gint64 adapter_luid)
+{
+  GstD3D12Decoder *self;
+
+  g_return_val_if_fail (codec > GST_DXVA_CODEC_NONE, nullptr);
+  g_return_val_if_fail (codec < GST_DXVA_CODEC_LAST, nullptr);
+
+  self = (GstD3D12Decoder *) g_object_new (GST_TYPE_D3D12_DECODER, nullptr);
+  self->codec = codec;
+  self->adapter_luid = adapter_luid;
+
+  return self;
+}
+
+gboolean
+gst_d3d12_decoder_open (GstD3D12Decoder * decoder, GstElement * element)
+{
+  if (!gst_d3d12_ensure_element_data_for_adapter_luid (element,
+          decoder->adapter_luid, &decoder->device)) {
+    GST_ERROR_OBJECT (element, "Cannot create d3d12device");
+    return FALSE;
+  }
+
+  auto priv = decoder->priv;
+  auto cmd = std::make_unique < DecoderCmdData > ();
+  HRESULT hr;
+
+  cmd->device = gst_d3d12_device_get_device_handle (decoder->device);
+
+  hr = cmd->device.As (&cmd->video_device);
+  if (!gst_d3d12_result (hr, decoder->device)) {
+    GST_ERROR_OBJECT (element, "ID3D12VideoDevice interface is unavailable");
+    return FALSE;
+  }
+
+  D3D12_COMMAND_QUEUE_DESC desc = { };
+  desc.Type = D3D12_COMMAND_LIST_TYPE_VIDEO_DECODE;
+  desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
+  cmd->queue = gst_d3d12_command_queue_new (decoder->device, &desc, 4);
+  if (!cmd->queue) {
+    GST_ERROR_OBJECT (element, "Couldn't create command queue");
+    return FALSE;
+  }
+
+  cmd->ca_pool = gst_d3d12_command_allocator_pool_new (decoder->device,
+      D3D12_COMMAND_LIST_TYPE_VIDEO_DECODE);
+
+  priv->cmd = std::move (cmd);
+  priv->flushing = false;
+
+  return TRUE;
+}
+
+GstFlowReturn
+gst_d3d12_decoder_drain (GstD3D12Decoder * decoder, GstVideoDecoder * videodec)
+{
+  auto priv = decoder->priv;
+
+  GST_DEBUG_OBJECT (decoder, "Draining");
+  if (priv->cmd) {
+    gst_d3d12_command_queue_fence_wait (priv->cmd->queue, priv->cmd->fence_val,
+        priv->cmd->event_handle);
+  }
+
+  GST_VIDEO_DECODER_STREAM_UNLOCK (videodec);
+  if (priv->output_thread && priv->session) {
+    auto empty_data = DecoderOutputData ();
+    std::lock_guard < std::mutex > lk (priv->session->queue_lock);
+    gst_queue_array_push_tail_struct (priv->session->output_queue, &empty_data);
+    priv->session->queue_cond.notify_one ();
+  }
+
+  g_clear_pointer (&priv->output_thread, g_thread_join);
+  GST_VIDEO_DECODER_STREAM_LOCK (videodec);
+
+  GST_DEBUG_OBJECT (decoder, "Drain done");
+
+  return GST_FLOW_OK;
+}
+
+gboolean
+gst_d3d12_decoder_flush (GstD3D12Decoder * decoder, GstVideoDecoder * videodec)
+{
+  auto priv = decoder->priv;
+
+  GST_DEBUG_OBJECT (decoder, "Flushing");
+
+  priv->flushing = true;
+  gst_d3d12_decoder_drain (decoder, videodec);
+  priv->flushing = false;
+  priv->last_flow = GST_FLOW_OK;
+
+  GST_DEBUG_OBJECT (decoder, "Flush done");
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_decoder_close (GstD3D12Decoder * decoder)
+{
+  auto priv = decoder->priv;
+
+  GST_DEBUG_OBJECT (decoder, "Close");
+
+  if (priv->cmd) {
+    gst_d3d12_command_queue_fence_wait (priv->cmd->queue, priv->cmd->fence_val,
+        priv->cmd->event_handle);
+  }
+
+  priv->session = nullptr;
+  priv->cmd = nullptr;
+
+  gst_clear_object (&decoder->device);
+
+  return TRUE;
+}
+
+GstFlowReturn
+gst_d3d12_decoder_configure (GstD3D12Decoder * decoder,
+    GstVideoDecoder * videodec, GstVideoCodecState * input_state,
+    const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width,
+    gint coded_height, guint dpb_size)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DECODER (decoder), GST_FLOW_ERROR);
+  g_return_val_if_fail (info, GST_FLOW_ERROR);
+  g_return_val_if_fail (input_state, GST_FLOW_ERROR);
+  g_return_val_if_fail (coded_width >= GST_VIDEO_INFO_WIDTH (info),
+      GST_FLOW_ERROR);
+  g_return_val_if_fail (coded_height >= GST_VIDEO_INFO_HEIGHT (info),
+      GST_FLOW_ERROR);
+  g_return_val_if_fail (dpb_size > 0, GST_FLOW_ERROR);
+
+  GstD3D12Format device_format;
+  auto priv = decoder->priv;
+  HRESULT hr;
+
+  D3D12_VIDEO_DECODER_DESC prev_desc = { };
+  ComPtr < ID3D12VideoDecoder > prev_decoder;
+
+  /* Store previous encoder object and reuse if possible */
+  if (priv->session) {
+    prev_desc = priv->session->decoder_desc;
+    prev_decoder = priv->session->decoder;
+  }
+
+  gst_d3d12_decoder_drain (decoder, videodec);
+  priv->session = nullptr;
+
+  if (!gst_d3d12_device_get_format (decoder->device,
+          GST_VIDEO_INFO_FORMAT (info), &device_format) ||
+      device_format.dxgi_format == DXGI_FORMAT_UNKNOWN) {
+    GST_ERROR_OBJECT (decoder, "Could not determine dxgi format from %s",
+        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (info)));
+    return GST_FLOW_ERROR;
+  }
+
+  if (decoder->codec == GST_DXVA_CODEC_H264)
+    dpb_size += 1;
+
+  /* +2 for threading */
+  dpb_size += 2;
+
+  dpb_size = MAX (dpb_size, ASYNC_DEPTH);
+
+  auto session = std::make_unique < DecoderSessionData > ();
+  session->input_state = gst_video_codec_state_ref (input_state);
+  session->info = *info;
+  session->output_info = *info;
+  session->crop_x = crop_x;
+  session->crop_y = crop_y;
+  session->coded_width = coded_width;
+  session->coded_height = coded_height;
+  session->dpb_size = dpb_size;
+  session->decoder_format = device_format.dxgi_format;
+
+  if (crop_x != 0 || crop_y != 0)
+    session->need_crop = true;
+
+  bool supported = false;
+  for (guint i = 0; i < G_N_ELEMENTS (format_list); i++) {
+    const DecoderFormat *decoder_format = nullptr;
+    if (format_listi.codec != decoder->codec)
+      continue;
+
+    for (guint j = 0; j < G_N_ELEMENTS (format_listi.format); j++) {
+      DXGI_FORMAT format = format_listi.formatj;
+
+      if (format == DXGI_FORMAT_UNKNOWN)
+        break;
+
+      if (format == session->decoder_format) {
+        decoder_format = &format_listi;
+        break;
+      }
+    }
+
+    if (!decoder_format)
+      continue;
+
+    D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT support = { };
+    support.Configuration.DecodeProfile = decoder_format->decode_profile;
+    support.Configuration.BitstreamEncryption =
+        D3D12_BITSTREAM_ENCRYPTION_TYPE_NONE;
+
+    if (GST_VIDEO_INFO_IS_INTERLACED (info) &&
+        GST_VIDEO_INFO_INTERLACE_MODE (info) !=
+        GST_VIDEO_INTERLACE_MODE_ALTERNATE) {
+      support.Configuration.InterlaceType =
+          D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_FIELD_BASED;
+    } else {
+      support.Configuration.InterlaceType =
+          D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_NONE;
+    }
+
+    support.DecodeFormat = session->decoder_format;
+    support.FrameRate = { 0, 1 };
+    support.Width = coded_width;
+    support.Height = coded_height;
+    hr = priv->cmd->
+        video_device->CheckFeatureSupport (D3D12_FEATURE_VIDEO_DECODE_SUPPORT,
+        &support, sizeof (support));
+    if (FAILED (hr))
+      continue;
+
+    if ((support.SupportFlags & D3D12_VIDEO_DECODE_SUPPORT_FLAG_SUPPORTED) == 0)
+      continue;
+
+    session->support = support;
+    supported = true;
+    break;
+  }
+
+  if (!supported) {
+    GST_ERROR_OBJECT (decoder,
+        "Decoder does not support current configuration");
+    return GST_FLOW_ERROR;
+  }
+
+  const auto & support = session->support;
+  guint alignment = 16;
+  if ((support.ConfigurationFlags &
+          D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_HEIGHT_ALIGNMENT_MULTIPLE_32_REQUIRED)
+      != 0) {
+    alignment = 32;
+  }
+
+  session->aligned_width = GST_ROUND_UP_N (session->coded_width, alignment);
+  session->aligned_height = GST_ROUND_UP_N (session->coded_height, alignment);
+
+  if (prev_decoder && prev_desc.Configuration.DecodeProfile ==
+      support.Configuration.DecodeProfile &&
+      prev_desc.Configuration.InterlaceType ==
+      support.Configuration.InterlaceType) {
+    session->decoder = prev_decoder;
+    session->decoder_desc = prev_desc;
+  } else {
+    D3D12_VIDEO_DECODER_DESC desc;
+
+    desc.NodeMask = 0;
+    desc.Configuration = support.Configuration;
+    hr = priv->cmd->video_device->CreateVideoDecoder (&desc,
+        IID_PPV_ARGS (&session->decoder));
+    if (!gst_d3d12_result (hr, decoder->device)) {
+      GST_ERROR_OBJECT (decoder, "Couldn't create decoder object");
+      return GST_FLOW_ERROR;
+    }
+
+    session->decoder_desc = desc;
+  }
+
+  D3D12_VIDEO_DECODER_HEAP_DESC heap_desc;
+  heap_desc.NodeMask = 0;
+  heap_desc.Configuration = session->support.Configuration;
+  heap_desc.DecodeWidth = session->aligned_width;
+  heap_desc.DecodeHeight = session->aligned_height;
+  heap_desc.Format = session->decoder_format;
+  heap_desc.FrameRate = { 0, 1 };
+  heap_desc.BitRate = 0;
+  heap_desc.MaxDecodePictureBufferCount = session->dpb_size;
+  hr = priv->cmd->video_device->CreateVideoDecoderHeap (&heap_desc,
+      IID_PPV_ARGS (&session->heap));
+  if (!gst_d3d12_result (hr, decoder->device)) {
+    GST_ERROR_OBJECT (decoder, "Couldn't create decoder heap");
+    return GST_FLOW_ERROR;
+  }
+
+  guint max_buffers = session->dpb_size;
+  if (support.DecodeTier == D3D12_VIDEO_DECODE_TIER_1) {
+    session->array_of_textures = false;
+  } else {
+    session->array_of_textures = true;
+    max_buffers = 0;
+  }
+
+  D3D12_RESOURCE_FLAGS resource_flags;
+  if ((support.ConfigurationFlags &
+          D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_REFERENCE_ONLY_ALLOCATIONS_REQUIRED)
+      != 0 || !session->array_of_textures) {
+    resource_flags =
+        D3D12_RESOURCE_FLAG_VIDEO_DECODE_REFERENCE_ONLY |
+        D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE;
+    session->reference_only = true;
+  } else {
+    resource_flags = D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS;
+    session->reference_only = false;
+  }
+
+  GST_DEBUG_OBJECT (decoder, "reference only: %d, array-of-textures: %d",
+      session->reference_only, session->array_of_textures);
+
+  GstVideoAlignment align;
+  gst_video_alignment_reset (&align);
+  align.padding_right = session->aligned_width - info->width;
+  align.padding_bottom = session->aligned_height - info->height;
+
+  auto params = gst_d3d12_allocation_params_new (decoder->device, info,
+      GST_D3D12_ALLOCATION_FLAG_DEFAULT, resource_flags);
+  gst_d3d12_allocation_params_alignment (params, &align);
+  gst_d3d12_allocation_params_set_heap_flags (params,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED);
+  if (!session->array_of_textures)
+    gst_d3d12_allocation_params_set_array_size (params, session->dpb_size);
+
+  session->dpb_pool = gst_d3d12_buffer_pool_new (decoder->device);
+  auto config = gst_buffer_pool_get_config (session->dpb_pool);
+  auto caps = gst_video_info_to_caps (info);
+
+  gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+  gst_d3d12_allocation_params_free (params);
+  gst_buffer_pool_config_set_params (config, caps, info->size, 0, max_buffers);
+  if (!gst_buffer_pool_set_config (session->dpb_pool, config)) {
+    GST_ERROR_OBJECT (decoder, "Couldn't set pool config");
+    gst_caps_unref (caps);
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_buffer_pool_set_active (session->dpb_pool, TRUE)) {
+    GST_ERROR_OBJECT (decoder, "Set active failed");
+    gst_caps_unref (caps);
+    return GST_FLOW_ERROR;
+  }
+
+  if (session->reference_only) {
+    GST_DEBUG_OBJECT (decoder, "Creating output only pool");
+    session->output_pool = gst_d3d12_buffer_pool_new (decoder->device);
+    config = gst_buffer_pool_get_config (session->output_pool);
+
+    params = gst_d3d12_allocation_params_new (decoder->device, info,
+        GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+    gst_d3d12_allocation_params_alignment (params, &align);
+    gst_d3d12_allocation_params_set_heap_flags (params,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED);
+    gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+    gst_d3d12_allocation_params_free (params);
+    gst_buffer_pool_config_set_params (config, caps, info->size, 0, 0);
+
+    if (!gst_buffer_pool_set_config (session->output_pool, config)) {
+      GST_ERROR_OBJECT (decoder, "Couldn't set pool config");
+      gst_caps_unref (caps);
+      return GST_FLOW_ERROR;
+    }
+
+    if (!gst_buffer_pool_set_active (session->output_pool, TRUE)) {
+      GST_ERROR_OBJECT (decoder, "Set active failed");
+      gst_caps_unref (caps);
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  gst_caps_unref (caps);
+
+  session->dpb = std::make_shared < GstD3D12Dpb > ((guint8) session->dpb_size);
+
+  priv->session = std::move (session);
+  priv->last_flow = GST_FLOW_OK;
+
+  return GST_FLOW_OK;
+}
+
+gboolean
+gst_d3d12_decoder_stop (GstD3D12Decoder * decoder)
+{
+  auto priv = decoder->priv;
+
+  GST_DEBUG_OBJECT (decoder, "Stop");
+
+  priv->flushing = true;
+  if (priv->cmd) {
+    gst_d3d12_command_queue_fence_wait (priv->cmd->queue, priv->cmd->fence_val,
+        priv->cmd->event_handle);
+  }
+
+  if (priv->output_thread && priv->session) {
+    auto empty_data = DecoderOutputData ();
+    std::lock_guard < std::mutex > lk (priv->session->queue_lock);
+    gst_queue_array_push_tail_struct (priv->session->output_queue, &empty_data);
+    priv->session->queue_cond.notify_one ();
+  }
+
+  g_clear_pointer (&priv->output_thread, g_thread_join);
+  priv->flushing = false;
+
+  priv->session = nullptr;
+
+  return TRUE;
+}
+
+static void
+gst_d3d12_decoder_picture_free (GstD3D12DecoderPicture * self)
+{
+  delete self;
+}
+
+static GstD3D12DecoderPicture *
+gst_d3d12_decoder_picture_new (GstD3D12Decoder * self, GstBuffer * buffer,
+    GstBuffer * output_buffer, ID3D12VideoDecoder * dec,
+    ID3D12VideoDecoderHeap * heap)
+{
+  auto priv = self->priv;
+  auto mem = (GstD3D12Memory *) gst_buffer_peek_memory (buffer, 0);
+
+  auto view_id = priv->session->dpb->Acquire (mem, heap);
+  if (view_id == 0xff) {
+    GST_WARNING_OBJECT (self, "No empty picture");
+    gst_buffer_unref (buffer);
+    if (output_buffer)
+      gst_buffer_unref (output_buffer);
+    return nullptr;
+  }
+
+  auto picture = new GstD3D12DecoderPicture (buffer, output_buffer,
+      priv->session->dpb, dec, heap, view_id);
+
+  gst_mini_object_init (picture, 0, GST_TYPE_D3D12_DECODER_PICTURE,
+      nullptr, nullptr,
+      (GstMiniObjectFreeFunction) gst_d3d12_decoder_picture_free);
+
+  return picture;
+}
+
+GstFlowReturn
+gst_d3d12_decoder_new_picture (GstD3D12Decoder * decoder,
+    GstVideoDecoder * videodec, GstCodecPicture * picture)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DECODER (decoder), GST_FLOW_ERROR);
+  g_return_val_if_fail (GST_IS_VIDEO_DECODER (videodec), GST_FLOW_ERROR);
+  g_return_val_if_fail (picture != nullptr, GST_FLOW_ERROR);
+
+  auto priv = decoder->priv;
+  if (!priv->session) {
+    GST_ERROR_OBJECT (decoder, "No session configured");
+    return GST_FLOW_ERROR;
+  }
+
+  GST_VIDEO_DECODER_STREAM_UNLOCK (videodec);
+  GstBuffer *buffer;
+  auto ret = gst_buffer_pool_acquire_buffer (priv->session->dpb_pool,
+      &buffer, nullptr);
+  if (ret != GST_FLOW_OK) {
+    GST_WARNING_OBJECT (videodec, "Couldn't acquire memory");
+    GST_VIDEO_DECODER_STREAM_LOCK (videodec);
+    return ret;
+  }
+
+  GstBuffer *output_buffer = nullptr;
+  if (priv->session->reference_only) {
+    ret = gst_buffer_pool_acquire_buffer (priv->session->output_pool,
+        &output_buffer, nullptr);
+    if (ret != GST_FLOW_OK) {
+      GST_WARNING_OBJECT (videodec, "Couldn't acquire output memory");
+      GST_VIDEO_DECODER_STREAM_LOCK (videodec);
+      gst_buffer_unref (buffer);
+      return ret;
+    }
+  }
+
+  /* unlock so that output thread can output picture and return
+   * back to dpb */
+  auto decoder_pic = gst_d3d12_decoder_picture_new (decoder, buffer,
+      output_buffer, priv->session->decoder.Get (), priv->session->heap.Get ());
+  GST_VIDEO_DECODER_STREAM_LOCK (videodec);
+  if (!decoder_pic) {
+    GST_ERROR_OBJECT (videodec, "Couldn't create new picture");
+    return GST_FLOW_ERROR;
+  }
+
+  gst_codec_picture_set_user_data (picture, decoder_pic,
+      (GDestroyNotify) gst_mini_object_unref);
+
+  return GST_FLOW_OK;
+}
+
+GstFlowReturn
+gst_d3d12_decoder_new_picture_with_size (GstD3D12Decoder * decoder,
+    GstVideoDecoder * videodec, GstCodecPicture * picture, guint width,
+    guint height)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DECODER (decoder), GST_FLOW_ERROR);
+  g_return_val_if_fail (GST_IS_VIDEO_DECODER (videodec), GST_FLOW_ERROR);
+  g_return_val_if_fail (picture != nullptr, GST_FLOW_ERROR);
+
+  auto priv = decoder->priv;
+  if (!priv->session) {
+    GST_ERROR_OBJECT (decoder, "No session configured");
+    return GST_FLOW_ERROR;
+  }
+
+  if (priv->session->coded_width >= width &&
+      priv->session->coded_height >= height) {
+    return gst_d3d12_decoder_new_picture (decoder, videodec, picture);
+  }
+
+  /* FIXME: D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_ALLOW_RESOLUTION_CHANGE_ON_NON_KEY_FRAME
+   * supported GPU can decode stream with mixed decoder heap */
+  GST_ERROR_OBJECT (decoder,
+      "Non-keyframe resolution change with larger size is not supported");
+
+  return GST_FLOW_ERROR;
+}
+
+static inline GstD3D12DecoderPicture *
+get_decoder_picture (GstCodecPicture * picture)
+{
+  return (GstD3D12DecoderPicture *) gst_codec_picture_get_user_data (picture);
+}
+
+GstFlowReturn
+gst_d3d12_decoder_duplicate_picture (GstD3D12Decoder * decoder,
+    GstCodecPicture * src, GstCodecPicture * dst)
+{
+  auto decoder_pic = get_decoder_picture (src);
+
+  if (!decoder_pic)
+    return GST_FLOW_ERROR;
+
+  gst_codec_picture_set_user_data (dst, gst_mini_object_ref (decoder_pic),
+      (GDestroyNotify) gst_mini_object_unref);
+
+  return GST_FLOW_OK;
+}
+
+guint8
+gst_d3d12_decoder_get_picture_id (GstD3D12Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  if (!picture)
+    return 0xff;
+
+  auto decoder_pic = get_decoder_picture (picture);
+  if (!decoder_pic)
+    return 0xff;
+
+  return decoder_pic->view_id;
+}
+
+GstFlowReturn
+gst_d3d12_decoder_start_picture (GstD3D12Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
+{
+  auto decoder_pic = get_decoder_picture (picture);
+
+  if (picture_id)
+    *picture_id = 0xff;
+
+  if (!decoder_pic)
+    return GST_FLOW_ERROR;
+
+  if (picture_id)
+    *picture_id = decoder_pic->view_id;
+
+  return GST_FLOW_OK;
+}
+
+struct DecoderBitstream
+{
+  ComPtr < ID3D12Resource > bitstream;
+  gsize bitstream_size = 0;
+};
+
+static void
+bitstream_free_func (DecoderBitstream * buffer)
+{
+  if (buffer)
+    delete buffer;
+}
+
+static gboolean
+gst_d3d12_decoder_upload_bitstream (GstD3D12Decoder * self, gpointer data,
+    gsize size, GstD3D12CommandAllocator * cmd)
+{
+  auto priv = self->priv;
+  HRESULT hr;
+
+  auto buffer = (DecoderBitstream *)
+      gst_d3d12_command_allocator_get_user_data (cmd);
+
+  if (!buffer || buffer->bitstream_size < size) {
+    buffer = new DecoderBitstream ();
+    gst_d3d12_command_allocator_set_user_data (cmd, buffer,
+        (GDestroyNotify) bitstream_free_func);
+  }
+
+  if (!buffer->bitstream) {
+    ComPtr < ID3D12Resource > bitstream;
+    size_t alloc_size = GST_ROUND_UP_128 (size) + 1024;
+
+    D3D12_HEAP_PROPERTIES heap_prop =
+        CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+    D3D12_RESOURCE_DESC desc = CD3DX12_RESOURCE_DESC::Buffer (alloc_size);
+    hr = priv->cmd->device->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_CREATE_NOT_ZEROED, &desc,
+        D3D12_RESOURCE_STATE_GENERIC_READ, nullptr, IID_PPV_ARGS (&bitstream));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Failed to create bitstream buffer");
+      return FALSE;
+    }
+
+    GST_LOG_OBJECT (self, "Allocated new bitstream buffer with size %"
+        G_GSIZE_FORMAT, size);
+
+    buffer->bitstream = bitstream;
+    buffer->bitstream_size = alloc_size;
+  }
+
+  gpointer map_data;
+  D3D12_RANGE zero_range = { 0, 0 };
+  hr = buffer->bitstream->Map (0, &zero_range, &map_data);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't map bitstream buffer");
+    return FALSE;
+  }
+
+  memcpy (map_data, data, size);
+
+  D3D12_RANGE range = { 0, size };
+  buffer->bitstream->Unmap (0, &range);
+
+  return TRUE;
+}
+
+GstFlowReturn
+gst_d3d12_decoder_end_picture (GstD3D12Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
+{
+  auto priv = decoder->priv;
+  HRESULT hr;
+  D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS out_args;
+  D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS in_args;
+  ID3D12Resource *resource;
+  ID3D12Resource *out_resource = nullptr;
+  GstD3D12Memory *dmem;
+  UINT subresource2;
+  auto & pre_barriers = priv->pre_barriers;
+  auto & post_barriers = priv->post_barriers;
+  auto & configured_ref_pics = priv->configured_ref_pics;
+
+  pre_barriers.clear ();
+  post_barriers.clear ();
+  configured_ref_pics.clear ();
+
+  auto decoder_pic = get_decoder_picture (picture);
+  if (!decoder_pic) {
+    GST_ERROR_OBJECT (decoder, "No attached decoder picture");
+    return GST_FLOW_ERROR;
+  }
+
+  if (!args->bitstream || args->bitstream_size == 0) {
+    GST_ERROR_OBJECT (decoder, "No bitstream buffer passed");
+    return GST_FLOW_ERROR;
+  }
+
+  GST_LOG_OBJECT (decoder, "End picture with dxva-id %d, num-ref-pics %u",
+      decoder_pic->view_id, ref_pics->len);
+
+  if (!priv->output_thread) {
+    GST_DEBUG_OBJECT (decoder, "Spawning output thread");
+    priv->output_thread = g_thread_new ("GstD3D12DecoderLoop",
+        (GThreadFunc) gst_d3d12_decoder_output_loop, decoder);
+  }
+
+  GstD3D12CommandAllocator *gst_ca;
+  if (!gst_d3d12_command_allocator_pool_acquire (priv->cmd->ca_pool, &gst_ca)) {
+    GST_ERROR_OBJECT (decoder, "Couldn't acquire command allocator");
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_d3d12_decoder_upload_bitstream (decoder, args->bitstream,
+          args->bitstream_size, gst_ca)) {
+    gst_d3d12_command_allocator_unref (gst_ca);
+    return GST_FLOW_ERROR;
+  }
+
+  auto bitstream = (DecoderBitstream *)
+      gst_d3d12_command_allocator_get_user_data (gst_ca);
+  g_assert (bitstream);
+
+  memset (&in_args, 0, sizeof (D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS));
+  memset (&out_args, 0, sizeof (D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS));
+
+  ComPtr < ID3D12CommandAllocator > ca;
+  gst_d3d12_command_allocator_get_handle (gst_ca, &ca);
+
+  hr = ca->Reset ();
+  if (!gst_d3d12_result (hr, decoder->device)) {
+    GST_ERROR_OBJECT (decoder, "Couldn't reset command allocator");
+    gst_d3d12_command_allocator_unref (gst_ca);
+    return GST_FLOW_ERROR;
+  }
+
+  if (!priv->cmd->cl) {
+    hr = priv->cmd->device->CreateCommandList (0,
+        D3D12_COMMAND_LIST_TYPE_VIDEO_DECODE,
+        ca.Get (), nullptr, IID_PPV_ARGS (&priv->cmd->cl));
+  } else {
+    hr = priv->cmd->cl->Reset (ca.Get ());
+  }
+
+  if (!gst_d3d12_result (hr, decoder->device)) {
+    GST_ERROR_OBJECT (decoder, "Couldn't configure command list");
+    gst_d3d12_command_allocator_unref (gst_ca);
+    return GST_FLOW_ERROR;
+  }
+
+  for (guint i = 0; i < ref_pics->len; i++) {
+    auto ref_pic = (GstCodecPicture *) g_ptr_array_index (ref_pics, i);
+    auto ref_dec_pic = get_decoder_picture (ref_pic);
+
+    if (!ref_dec_pic || ref_dec_pic == decoder_pic)
+      continue;
+
+    if (std::find (configured_ref_pics.begin (), configured_ref_pics.end (),
+            ref_dec_pic) != configured_ref_pics.end ()) {
+      continue;
+    }
+
+    configured_ref_pics.push_back (ref_dec_pic);
+
+    dmem = (GstD3D12Memory *) gst_buffer_peek_memory (ref_dec_pic->buffer, 0);
+
+    resource = gst_d3d12_memory_get_resource_handle (dmem);
+    if (priv->session->array_of_textures) {
+      pre_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+              D3D12_RESOURCE_STATE_COMMON,
+              D3D12_RESOURCE_STATE_VIDEO_DECODE_READ));
+      post_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+              D3D12_RESOURCE_STATE_VIDEO_DECODE_READ,
+              D3D12_RESOURCE_STATE_COMMON));
+    } else {
+      gst_d3d12_memory_get_subresource_index (dmem, 0, &subresource0);
+      gst_d3d12_memory_get_subresource_index (dmem, 1, &subresource1);
+
+      pre_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+              D3D12_RESOURCE_STATE_COMMON,
+              D3D12_RESOURCE_STATE_VIDEO_DECODE_READ, subresource0));
+      pre_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+              D3D12_RESOURCE_STATE_COMMON,
+              D3D12_RESOURCE_STATE_VIDEO_DECODE_READ, subresource1));
+      post_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+              D3D12_RESOURCE_STATE_VIDEO_DECODE_READ,
+              D3D12_RESOURCE_STATE_COMMON, subresource0));
+      post_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+              D3D12_RESOURCE_STATE_VIDEO_DECODE_READ,
+              D3D12_RESOURCE_STATE_COMMON, subresource1));
+    }
+  }
+
+  if (decoder_pic->output_buffer) {
+    dmem = (GstD3D12Memory *)
+        gst_buffer_peek_memory (decoder_pic->output_buffer, 0);
+    out_resource = gst_d3d12_memory_get_resource_handle (dmem);
+
+    pre_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (out_resource,
+            D3D12_RESOURCE_STATE_COMMON,
+            D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE));
+    post_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (out_resource,
+            D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE,
+            D3D12_RESOURCE_STATE_COMMON));
+  }
+
+  dmem = (GstD3D12Memory *) gst_buffer_peek_memory (decoder_pic->buffer, 0);
+  resource = gst_d3d12_memory_get_resource_handle (dmem);
+  gst_d3d12_memory_get_subresource_index (GST_D3D12_MEMORY_CAST (dmem), 0,
+      &subresource0);
+
+  if (priv->session->array_of_textures) {
+    pre_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+            D3D12_RESOURCE_STATE_COMMON,
+            D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE));
+    post_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+            D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE,
+            D3D12_RESOURCE_STATE_COMMON));
+  } else {
+    gst_d3d12_memory_get_subresource_index (GST_D3D12_MEMORY_CAST (dmem), 1,
+        &subresource1);
+
+    pre_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+            D3D12_RESOURCE_STATE_COMMON,
+            D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE, subresource0));
+    pre_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+            D3D12_RESOURCE_STATE_COMMON,
+            D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE, subresource1));
+    post_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+            D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE,
+            D3D12_RESOURCE_STATE_COMMON, subresource0));
+    post_barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (resource,
+            D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE,
+            D3D12_RESOURCE_STATE_COMMON, subresource1));
+  }
+
+  priv->cmd->cl->ResourceBarrier (pre_barriers.size (), &pre_barriers0);
+
+  if (out_resource) {
+    out_args.pOutputTexture2D = out_resource;
+    out_args.OutputSubresource = 0;
+    out_args.ConversionArguments.Enable = TRUE;
+    out_args.ConversionArguments.pReferenceTexture2D = resource;
+    out_args.ConversionArguments.ReferenceSubresource = subresource0;
+  } else {
+    out_args.pOutputTexture2D = resource;
+    out_args.OutputSubresource = subresource0;
+    out_args.ConversionArguments.Enable = FALSE;
+  }
+
+  if (args->picture_params) {
+    in_args.FrameArgumentsin_args.NumFrameArguments.Type =
+        D3D12_VIDEO_DECODE_ARGUMENT_TYPE_PICTURE_PARAMETERS;
+    in_args.FrameArgumentsin_args.NumFrameArguments.Size =
+        args->picture_params_size;
+    in_args.FrameArgumentsin_args.NumFrameArguments.pData =
+        args->picture_params;
+    in_args.NumFrameArguments++;
+  }
+
+  if (args->slice_control) {
+    in_args.FrameArgumentsin_args.NumFrameArguments.Type =
+        D3D12_VIDEO_DECODE_ARGUMENT_TYPE_SLICE_CONTROL;
+    in_args.FrameArgumentsin_args.NumFrameArguments.Size =
+        args->slice_control_size;
+    in_args.FrameArgumentsin_args.NumFrameArguments.pData =
+        args->slice_control;
+    in_args.NumFrameArguments++;
+  }
+
+  if (args->inverse_quantization_matrix) {
+    in_args.FrameArgumentsin_args.NumFrameArguments.Type =
+        D3D12_VIDEO_DECODE_ARGUMENT_TYPE_INVERSE_QUANTIZATION_MATRIX;
+    in_args.FrameArgumentsin_args.NumFrameArguments.Size =
+        args->inverse_quantization_matrix_size;
+    in_args.FrameArgumentsin_args.NumFrameArguments.pData =
+        args->inverse_quantization_matrix;
+    in_args.NumFrameArguments++;
+  }
+
+  in_args.CompressedBitstream.pBuffer = bitstream->bitstream.Get ();
+  in_args.CompressedBitstream.Offset = 0;
+  in_args.CompressedBitstream.Size = args->bitstream_size;
+  in_args.pHeap = decoder_pic->heap.Get ();
+
+  priv->session->dpb->Lock ();
+  priv->session->dpb->GetReferenceFrames (in_args.ReferenceFrames);
+
+  priv->cmd->cl->DecodeFrame (priv->session->decoder.Get (),
+      &out_args, &in_args);
+
+  if (!post_barriers.empty ())
+    priv->cmd->cl->ResourceBarrier (post_barriers.size (), &post_barriers0);
+
+  hr = priv->cmd->cl->Close ();
+  priv->session->dpb->Unlock ();
+
+  if (!gst_d3d12_result (hr, decoder->device)) {
+    GST_ERROR_OBJECT (decoder, "Couldn't record decoding command");
+    gst_d3d12_command_allocator_unref (gst_ca);
+    return GST_FLOW_ERROR;
+  }
+
+  ID3D12CommandList *cl = { priv->cmd->cl.Get () };
+
+  hr = gst_d3d12_command_queue_execute_command_lists (priv->cmd->queue,
+      1, cl, &priv->cmd->fence_val);
+  if (!gst_d3d12_result (hr, decoder->device)) {
+    GST_ERROR_OBJECT (decoder, "Couldn't execute command list");
+    gst_d3d12_command_allocator_unref (gst_ca);
+    return GST_FLOW_ERROR;
+  }
+
+  decoder_pic->fence_val = priv->cmd->fence_val;
+
+  GstD3D12FenceData *fence_data;
+  gst_d3d12_fence_data_pool_acquire (priv->fence_data_pool, &fence_data);
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data,
+      gst_mini_object_ref (decoder_pic));
+  for (guint i = 0; i < ref_pics->len; i++) {
+    auto ref_pic = (GstCodecPicture *) g_ptr_array_index (ref_pics, i);
+    gst_d3d12_fence_data_add_notify_mini_object (fence_data,
+        gst_codec_picture_ref (ref_pic));
+  }
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, gst_ca);
+
+  gst_d3d12_command_queue_set_notify (priv->cmd->queue, priv->cmd->fence_val,
+      fence_data, (GDestroyNotify) gst_d3d12_fence_data_unref);
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_d3d12_decoder_ensure_staging_texture (GstD3D12Decoder * self)
+{
+  GstD3D12DecoderPrivate *priv = self->priv;
+
+  if (priv->session->staging)
+    return TRUE;
+
+  ComPtr < ID3D12Resource > staging;
+  HRESULT hr;
+  UINT64 size;
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  D3D12_RESOURCE_DESC tex_desc =
+      CD3DX12_RESOURCE_DESC::Tex2D (priv->session->decoder_format,
+      priv->session->aligned_width, priv->session->aligned_height, 1, 1);
+
+  device->GetCopyableFootprints (&tex_desc, 0, 2, 0,
+      priv->session->layout, nullptr, nullptr, &size);
+
+  D3D12_HEAP_PROPERTIES heap_prop = CD3DX12_HEAP_PROPERTIES
+      (D3D12_HEAP_TYPE_READBACK);
+  D3D12_RESOURCE_DESC desc = CD3DX12_RESOURCE_DESC::Buffer (size);
+
+  hr = device->CreateCommittedResource (&heap_prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &desc, D3D12_RESOURCE_STATE_COPY_DEST, nullptr, IID_PPV_ARGS (&staging));
+  if (!gst_d3d12_result (hr, self->device))
+    return FALSE;
+
+  priv->session->staging = staging;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_decoder_can_direct_render (GstD3D12Decoder * self,
+    GstVideoDecoder * videodec, GstBuffer * buffer,
+    gint display_width, gint display_height)
+{
+  auto priv = self->priv;
+
+  if (priv->session->output_type != GST_D3D12_DECODER_OUTPUT_D3D12)
+    return FALSE;
+
+  if (display_width != GST_VIDEO_INFO_WIDTH (&priv->session->info) ||
+      display_height != GST_VIDEO_INFO_HEIGHT (&priv->session->info)) {
+    return FALSE;
+  }
+
+  /* We need to crop but downstream does not support crop, need to copy */
+  if (priv->session->need_crop && !priv->session->use_crop_meta)
+    return FALSE;
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_d3d12_decoder_process_output (GstD3D12Decoder * self,
+    GstVideoDecoder * videodec, GstVideoCodecFrame * frame,
+    GstCodecPicture * picture, GstVideoBufferFlags buffer_flags,
+    gint display_width, gint display_height)
+{
+  GstFlowReturn ret = GST_FLOW_ERROR;
+  GstBuffer *buffer;
+  GstD3D12Memory *dmem;
+  ID3D12Resource *resource;
+  UINT subresource2;
+  HRESULT hr;
+  bool attach_crop_meta = false;
+
+  auto priv = self->priv;
+
+  auto decoder_pic = get_decoder_picture (picture);
+  g_assert (decoder_pic);
+
+  gboolean need_negotiate = FALSE;
+  if (display_width != GST_VIDEO_INFO_WIDTH (&priv->session->output_info) ||
+      display_height != GST_VIDEO_INFO_HEIGHT (&priv->session->output_info)) {
+    GST_INFO_OBJECT (videodec, "Frame size changed, do renegotiate");
+
+    gst_video_info_set_interlaced_format (&priv->session->output_info,
+        GST_VIDEO_INFO_FORMAT (&priv->session->info),
+        GST_VIDEO_INFO_INTERLACE_MODE (&priv->session->info),
+        display_width, display_height);
+
+    need_negotiate = TRUE;
+  } else if (picture->discont_state) {
+    g_clear_pointer (&priv->session->input_state, gst_video_codec_state_unref);
+    priv->session->input_state =
+        gst_video_codec_state_ref (picture->discont_state);
+    need_negotiate = TRUE;
+  } else if (gst_pad_check_reconfigure (GST_VIDEO_DECODER_SRC_PAD (videodec))) {
+    need_negotiate = TRUE;
+  }
+
+  if (need_negotiate && !gst_video_decoder_negotiate (videodec)) {
+    GST_ERROR_OBJECT (videodec, "Couldn't negotiate with downstream");
+    gst_codec_picture_unref (picture);
+    gst_video_decoder_release_frame (videodec, frame);
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  buffer = decoder_pic->output_buffer ?
+      decoder_pic->output_buffer : decoder_pic->buffer;
+  dmem = (GstD3D12Memory *) gst_buffer_peek_memory (buffer, 0);
+
+  priv->session->lock.lock ();
+  if (gst_d3d12_decoder_can_direct_render (self, videodec,
+          decoder_pic->buffer, display_width, display_height)) {
+    GST_LOG_OBJECT (self, "Outputting without copy");
+
+    GST_MINI_OBJECT_FLAG_SET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_DOWNLOAD);
+    GST_MINI_OBJECT_FLAG_UNSET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_UPLOAD);
+
+    if (priv->session->need_crop)
+      attach_crop_meta = true;
+
+    frame->output_buffer = gst_buffer_ref (buffer);
+  } else {
+    ID3D12Resource *out_resource = nullptr;
+    UINT out_subresource2;
+
+    ret = gst_video_decoder_allocate_output_frame (videodec, frame);
+    if (ret != GST_FLOW_OK) {
+      GST_ERROR_OBJECT (videodec, "Couldn't allocate output buffer");
+      goto error;
+    }
+
+    auto out_mem = gst_buffer_peek_memory (frame->output_buffer, 0);
+    if (gst_is_d3d12_memory (out_mem)) {
+      auto out_dmem = GST_D3D12_MEMORY_CAST (out_mem);
+      if (dmem->device == self->device) {
+        out_resource = gst_d3d12_memory_get_resource_handle (out_dmem);
+        gst_d3d12_memory_get_subresource_index (out_dmem, 0,
+            &out_subresource0);
+        gst_d3d12_memory_get_subresource_index (out_dmem, 1,
+            &out_subresource1);
+
+        GST_MINI_OBJECT_FLAG_SET (out_dmem,
+            GST_D3D12_MEMORY_TRANSFER_NEED_DOWNLOAD);
+        GST_MINI_OBJECT_FLAG_UNSET (out_dmem,
+            GST_D3D12_MEMORY_TRANSFER_NEED_UPLOAD);
+      }
+    }
+
+    if (!out_resource && !gst_d3d12_decoder_ensure_staging_texture (self)) {
+      GST_ERROR_OBJECT (videodec, "Couldn't allocate staging texture");
+      ret = GST_FLOW_ERROR;
+      goto error;
+    }
+
+    resource = gst_d3d12_memory_get_resource_handle (dmem);
+
+    gst_d3d12_memory_get_subresource_index (dmem, 0, &subresource0);
+    gst_d3d12_memory_get_subresource_index (dmem, 1, &subresource1);
+
+    /* Copy texture to staging */
+    D3D12_BOX src_box2;
+    std::vector < GstD3D12CopyTextureRegionArgs > copy_args;
+
+    for (guint i = 0; i < 2; i++) {
+      GstD3D12CopyTextureRegionArgs args;
+      memset (&args, 0, sizeof (args));
+
+      args.src = CD3DX12_TEXTURE_COPY_LOCATION (resource, subresourcei);
+
+      if (out_resource) {
+        args.dst =
+            CD3DX12_TEXTURE_COPY_LOCATION (out_resource, out_subresourcei);
+      } else {
+        args.dst =
+            CD3DX12_TEXTURE_COPY_LOCATION (priv->session->staging.Get (),
+            priv->session->layouti);
+      }
+
+      /* FIXME: only 4:2:0 */
+      if (i == 0) {
+        src_boxi.left = GST_ROUND_UP_2 (priv->session->crop_x);
+        src_boxi.top = GST_ROUND_UP_2 (priv->session->crop_y);
+        src_boxi.right = GST_ROUND_UP_2 (priv->session->crop_x +
+            priv->session->output_info.width);
+        src_boxi.bottom =
+            GST_ROUND_UP_2 (priv->session->crop_y +
+            priv->session->output_info.height);
+      } else {
+        src_boxi.left = GST_ROUND_UP_2 (priv->session->crop_x) / 2;
+        src_boxi.top = GST_ROUND_UP_2 (priv->session->crop_y) / 2;
+        src_boxi.right =
+            GST_ROUND_UP_2 (priv->session->crop_x +
+            priv->session->output_info.width) / 2;
+        src_boxi.bottom =
+            GST_ROUND_UP_2 (priv->session->crop_y +
+            priv->session->output_info.height) / 2;
+      }
+
+      src_boxi.front = 0;
+      src_boxi.back = 1;
+
+      args.src_box = &src_boxi;
+      copy_args.push_back (args);
+    }
+
+    guint64 copy_fence_val = 0;
+    D3D12_COMMAND_LIST_TYPE queue_type = D3D12_COMMAND_LIST_TYPE_COPY;
+    if (out_resource)
+      queue_type = D3D12_COMMAND_LIST_TYPE_DIRECT;
+    gst_d3d12_device_copy_texture_region (self->device, copy_args.size (),
+        copy_args.data (), queue_type, &copy_fence_val);
+    gst_d3d12_device_fence_wait (self->device, queue_type,
+        copy_fence_val, priv->copy_event_handle);
+
+    if (!out_resource) {
+      guint8 *map_data;
+      GstVideoFrame vframe;
+
+      hr = priv->session->staging->Map (0, nullptr, (void **) &map_data);
+      if (!gst_d3d12_result (hr, self->device)) {
+        ret = GST_FLOW_ERROR;
+        goto error;
+      }
+
+      gst_video_frame_map (&vframe,
+          &priv->session->output_info, frame->output_buffer, GST_MAP_WRITE);
+
+      for (guint i = 0; i < GST_VIDEO_FRAME_N_PLANES (&vframe); i++) {
+        guint8 *src = map_data + priv->session->layouti.Offset;
+        guint8 *dst = (guint8 *) GST_VIDEO_FRAME_PLANE_DATA (&vframe, i);
+        gint width = GST_VIDEO_FRAME_COMP_WIDTH (&vframe, i) *
+            GST_VIDEO_FRAME_COMP_PSTRIDE (&vframe, i);
+
+        for (gint j = 0; j < GST_VIDEO_FRAME_COMP_HEIGHT (&vframe, i); j++) {
+          memcpy (dst, src, width);
+          dst += GST_VIDEO_FRAME_PLANE_STRIDE (&vframe, i);
+          src += priv->session->layouti.Footprint.RowPitch;
+        }
+      }
+
+      priv->session->staging->Unmap (0, nullptr);
+      gst_video_frame_unmap (&vframe);
+    }
+  }
+
+  priv->session->lock.unlock ();
+
+  GST_BUFFER_FLAG_SET (frame->output_buffer, buffer_flags);
+  gst_codec_picture_unref (picture);
+
+  if (attach_crop_meta) {
+    frame->output_buffer = gst_buffer_make_writable (frame->output_buffer);
+
+    auto crop_meta = gst_buffer_add_video_crop_meta (frame->output_buffer);
+    crop_meta->x = priv->session->crop_x;
+    crop_meta->y = priv->session->crop_y;
+    crop_meta->width = priv->session->info.width;
+    crop_meta->height = priv->session->info.height;
+
+    GST_TRACE_OBJECT (self, "Attatching crop meta");
+  }
+
+  return gst_video_decoder_finish_frame (videodec, frame);
+
+error:
+  priv->session->lock.unlock ();
+  gst_codec_picture_unref (picture);
+  gst_video_decoder_release_frame (videodec, frame);
+
+  return ret;
+}
+
+static gpointer
+gst_d3d12_decoder_output_loop (GstD3D12Decoder * self)
+{
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Entering output thread");
+
+  HANDLE event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+
+  while (true) {
+    DecoderOutputData output_data;
+    {
+      GST_LOG_OBJECT (self, "Waiting for output data");
+      std::unique_lock < std::mutex > lk (priv->session->queue_lock);
+      while (gst_queue_array_is_empty (priv->session->output_queue))
+        priv->session->queue_cond.wait (lk);
+
+      output_data = *((DecoderOutputData *)
+          gst_queue_array_pop_head_struct (priv->session->output_queue));
+    }
+
+    if (!output_data.frame) {
+      GST_DEBUG_OBJECT (self, "Got terminate data");
+      break;
+    }
+
+    auto decoder_pic = get_decoder_picture (output_data.picture);
+    g_assert (decoder_pic);
+    gst_d3d12_command_queue_fence_wait (priv->cmd->queue,
+        decoder_pic->fence_val, event_handle);
+
+    if (priv->flushing) {
+      GST_DEBUG_OBJECT (self, "Drop framem, we are flushing");
+      gst_codec_picture_unref (output_data.picture);
+      gst_video_decoder_release_frame (output_data.decoder, output_data.frame);
+    } else if (priv->last_flow == GST_FLOW_OK) {
+      priv->last_flow = gst_d3d12_decoder_process_output (self,
+          output_data.decoder, output_data.frame, output_data.picture,
+          output_data.buffer_flags, output_data.width, output_data.height);
+
+      if (priv->last_flow != GST_FLOW_FLUSHING &&
+          priv->last_flow != GST_FLOW_OK) {
+        GST_WARNING_OBJECT (self, "Last flow was %s",
+            gst_flow_get_name (priv->last_flow));
+      }
+    } else {
+      GST_DEBUG_OBJECT (self, "Dropping framem last flow return was %s",
+          gst_flow_get_name (priv->last_flow));
+      gst_codec_picture_unref (output_data.picture);
+      gst_video_decoder_release_frame (output_data.decoder, output_data.frame);
+    }
+  }
+
+  GST_DEBUG_OBJECT (self, "Leaving output thread");
+
+  CloseHandle (event_handle);
+
+  return nullptr;
+}
+
+GstFlowReturn
+gst_d3d12_decoder_output_picture (GstD3D12Decoder * decoder,
+    GstVideoDecoder * videodec, GstVideoCodecFrame * frame,
+    GstCodecPicture * picture, GstVideoBufferFlags buffer_flags,
+    gint display_width, gint display_height)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DECODER (decoder), GST_FLOW_ERROR);
+  g_return_val_if_fail (GST_IS_VIDEO_DECODER (videodec), GST_FLOW_ERROR);
+  g_return_val_if_fail (frame != nullptr, GST_FLOW_ERROR);
+  g_return_val_if_fail (picture != nullptr, GST_FLOW_ERROR);
+
+  auto priv = decoder->priv;
+
+  GST_LOG_OBJECT (decoder, "Output picture");
+
+  if (!priv->session) {
+    GST_ERROR_OBJECT (decoder, "No session configured");
+    gst_codec_picture_unref (picture);
+    gst_video_decoder_release_frame (videodec, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  auto output_data = DecoderOutputData ();
+  output_data.decoder = videodec;
+  output_data.frame = frame;
+  output_data.picture = picture;
+  output_data.buffer_flags = buffer_flags;
+  output_data.width = display_width;
+  output_data.height = display_height;
+
+  std::lock_guard < std::mutex > lk (priv->session->queue_lock);
+  gst_queue_array_push_tail_struct (priv->session->output_queue, &output_data);
+  priv->session->queue_cond.notify_one ();
+
+  return priv->last_flow;
+}
+
+gboolean
+gst_d3d12_decoder_negotiate (GstD3D12Decoder * decoder,
+    GstVideoDecoder * videodec)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DECODER (decoder), FALSE);
+  g_return_val_if_fail (GST_IS_VIDEO_DECODER (videodec), FALSE);
+
+  auto priv = decoder->priv;
+  GstStructure *s;
+  const gchar *str;
+
+  if (!priv->session) {
+    GST_WARNING_OBJECT (decoder, "No configured session");
+    return FALSE;
+  }
+
+  auto peer_caps =
+      gst_pad_get_allowed_caps (GST_VIDEO_DECODER_SRC_PAD (videodec));
+  GST_DEBUG_OBJECT (videodec, "Allowed caps %" GST_PTR_FORMAT, peer_caps);
+
+  GstD3D12DecoderOutputType allowed_types = GST_D3D12_DECODER_OUTPUT_UNKNOWN;
+  if (!peer_caps || gst_caps_is_any (peer_caps)) {
+    GST_DEBUG_OBJECT (videodec,
+        "cannot determine output format, use system memory");
+  } else {
+    GstCapsFeatures *features;
+    guint size = gst_caps_get_size (peer_caps);
+    guint i;
+
+    for (i = 0; i < size; i++) {
+      features = gst_caps_get_features (peer_caps, i);
+
+      if (!features)
+        continue;
+
+      if (gst_caps_features_contains (features,
+              GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY)) {
+        allowed_types |= GST_D3D12_DECODER_OUTPUT_D3D12;
+      }
+    }
+  }
+  gst_clear_caps (&peer_caps);
+
+  GST_DEBUG_OBJECT (videodec, "Downstream feature support 0x%x",
+      (guint) allowed_types);
+
+  std::lock_guard < std::recursive_mutex > lk (priv->session->lock);
+  auto input_state = priv->session->input_state;
+  auto info = &priv->session->output_info;
+
+  /* TODO: add support alternate interlace */
+  auto state = gst_video_decoder_set_interlaced_output_state (videodec,
+      GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_INTERLACE_MODE (info),
+      GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_HEIGHT (info), input_state);
+
+  if (!state) {
+    GST_ERROR_OBJECT (decoder, "Couldn't set output state");
+    return FALSE;
+  }
+
+  state->caps = gst_video_info_to_caps (&state->info);
+
+  s = gst_caps_get_structure (input_state->caps, 0);
+  str = gst_structure_get_string (s, "mastering-display-info");
+  if (str) {
+    gst_caps_set_simple (state->caps,
+        "mastering-display-info", G_TYPE_STRING, str, nullptr);
+  }
+
+  str = gst_structure_get_string (s, "content-light-level");
+  if (str) {
+    gst_caps_set_simple (state->caps,
+        "content-light-level", G_TYPE_STRING, str, nullptr);
+  }
+
+  g_clear_pointer (&priv->session->output_state, gst_video_codec_state_unref);
+  priv->session->output_state = state;
+
+  auto prev_output_type = priv->session->output_type;
+  if (prev_output_type != GST_D3D12_DECODER_OUTPUT_UNKNOWN &&
+      (prev_output_type & allowed_types) == prev_output_type) {
+    priv->session->output_type = prev_output_type;
+  } else {
+    if ((allowed_types & GST_D3D12_DECODER_OUTPUT_D3D12) != 0)
+      priv->session->output_type = GST_D3D12_DECODER_OUTPUT_D3D12;
+    else
+      priv->session->output_type = GST_D3D12_DECODER_OUTPUT_SYSTEM;
+  }
+
+  if (priv->session->output_type == GST_D3D12_DECODER_OUTPUT_D3D12) {
+    gst_caps_set_features (state->caps, 0,
+        gst_caps_features_new_single (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY));
+    priv->session->output_type = GST_D3D12_DECODER_OUTPUT_D3D12;
+  }
+
+  GST_DEBUG_OBJECT (decoder, "Selected output type %d",
+      priv->session->output_type);
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_decoder_decide_allocation (GstD3D12Decoder * decoder,
+    GstVideoDecoder * videodec, GstQuery * query)
+{
+  GstD3D12DecoderPrivate *priv = decoder->priv;
+  GstCaps *outcaps;
+  GstBufferPool *pool = nullptr;
+  guint n, size, min = 0, max = 0;
+  GstVideoInfo vinfo;
+  GstStructure *config;
+
+  g_return_val_if_fail (GST_IS_D3D12_DECODER (decoder), FALSE);
+  g_return_val_if_fail (GST_IS_VIDEO_DECODER (videodec), FALSE);
+  g_return_val_if_fail (query != nullptr, FALSE);
+
+  if (!priv->session) {
+    GST_ERROR_OBJECT (videodec, "Should open decoder first");
+    return FALSE;
+  }
+
+  gst_query_parse_allocation (query, &outcaps, nullptr);
+
+  if (!outcaps) {
+    GST_DEBUG_OBJECT (decoder, "No output caps");
+    return FALSE;
+  }
+
+  std::lock_guard < std::recursive_mutex > lk (priv->session->lock);
+  if (priv->session->output_type == GST_D3D12_DECODER_OUTPUT_D3D12) {
+    priv->session->use_crop_meta =
+        gst_query_find_allocation_meta (query, GST_VIDEO_CROP_META_API_TYPE,
+        nullptr);
+  } else {
+    priv->session->use_crop_meta = false;
+  }
+
+  gst_video_info_from_caps (&vinfo, outcaps);
+  n = gst_query_get_n_allocation_pools (query);
+  if (n > 0)
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+
+  if (pool) {
+    if (priv->session->output_type == GST_D3D12_DECODER_OUTPUT_D3D12) {
+      if (!GST_IS_D3D12_BUFFER_POOL (pool)) {
+        GST_DEBUG_OBJECT (videodec,
+            "Downstream pool is not d3d12, will create new one");
+        gst_clear_object (&pool);
+      } else {
+        GstD3D12BufferPool *dpool = GST_D3D12_BUFFER_POOL (pool);
+        if (dpool->device != decoder->device) {
+          GST_DEBUG_OBJECT (videodec, "Different device, will create new one");
+          gst_clear_object (&pool);
+        }
+      }
+    }
+  }
+
+  if (!pool) {
+    switch (priv->session->output_type) {
+      case GST_D3D12_DECODER_OUTPUT_D3D12:
+        pool = gst_d3d12_buffer_pool_new (decoder->device);
+        break;
+      default:
+        pool = gst_video_buffer_pool_new ();
+        break;
+    }
+
+    size = (guint) vinfo.size;
+  }
+
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+  if (priv->session->output_type == GST_D3D12_DECODER_OUTPUT_D3D12) {
+    GstD3D12AllocationParams *params;
+    GstVideoAlignment align;
+    gint width, height;
+
+    gst_video_alignment_reset (&align);
+
+    params = gst_buffer_pool_config_get_d3d12_allocation_params (config);
+    if (!params) {
+      params = gst_d3d12_allocation_params_new (decoder->device, &vinfo,
+          GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+          D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+    } else {
+      gst_d3d12_allocation_params_set_resource_flags (params,
+          D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+    }
+
+    width = GST_VIDEO_INFO_WIDTH (&vinfo);
+    height = GST_VIDEO_INFO_HEIGHT (&vinfo);
+
+    /* need alignment to copy decoder output texture to downstream texture */
+    align.padding_right = GST_ROUND_UP_16 (width) - width;
+    align.padding_bottom = GST_ROUND_UP_16 (height) - height;
+    gst_d3d12_allocation_params_alignment (params, &align);
+    gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+    gst_d3d12_allocation_params_free (params);
+
+
+    GST_DEBUG_OBJECT (videodec, "Downstream min buffres: %d", min);
+
+    /* We will not use downstream pool for decoding, and therefore preallocation
+     * is unnecessary. So, Non-zero min buffer will be a waste of GPU memory */
+    min = 0;
+  }
+
+  gst_buffer_pool_set_config (pool, config);
+  /* d3d12 buffer pool will update buffer size based on allocated texture,
+   * get size from config again */
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  if (n > 0)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+
+void
+gst_d3d12_decoder_sink_event (GstD3D12Decoder * decoder, GstEvent * event)
+{
+}
+
+void
+gst_d3d12_decoder_set_context (GstD3D12Decoder * decoder, GstElement * element,
+    GstContext * context)
+{
+  auto priv = decoder->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->context_lock);
+  gst_d3d12_handle_set_context_for_adapter_luid (element,
+      context, decoder->adapter_luid, &decoder->device);
+}
+
+gboolean
+gst_d3d12_decoder_handle_query (GstD3D12Decoder * decoder, GstElement * element,
+    GstQuery * query)
+{
+  if (GST_QUERY_TYPE (query) != GST_QUERY_CONTEXT)
+    return FALSE;
+
+  auto priv = decoder->priv;
+  std::lock_guard < std::recursive_mutex > lk (priv->context_lock);
+  return gst_d3d12_handle_context_query (element, query, decoder->device);
+}
+
+enum
+{
+  PROP_DECODER_ADAPTER_LUID = 1,
+  PROP_DECODER_DEVICE_ID,
+  PROP_DECODER_VENDOR_ID,
+};
+
+struct _GstD3D12DecoderClassData
+{
+  GstD3D12DecoderSubClassData subclass_data;
+  GstCaps *sink_caps;
+  GstCaps *src_caps;
+  gchar *description;
+};
+
+static void
+gst_d3d12_decoder_get_profiles (const GUID & profile,
+    std::vector < std::string > &list)
+{
+  if (profile == D3D12_VIDEO_DECODE_PROFILE_MPEG2 ||
+      profile == D3D12_VIDEO_DECODE_PROFILE_MPEG1_AND_MPEG2) {
+    list.push_back ("main");
+    list.push_back ("simple");
+  } else if (profile == D3D12_VIDEO_DECODE_PROFILE_H264) {
+    list.push_back ("high");
+    list.push_back ("progressive-high");
+    list.push_back ("constrained-high");
+    list.push_back ("main");
+    list.push_back ("constrained-baseline");
+    list.push_back ("baseline");
+  } else if (profile == D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN) {
+    list.push_back ("main");
+  } else if (profile == D3D12_VIDEO_DECODE_PROFILE_HEVC_MAIN10) {
+    list.push_back ("main-10");
+  } else if (profile == D3D12_VIDEO_DECODE_PROFILE_VP8) {
+    /* skip profile field */
+  } else if (profile == D3D12_VIDEO_DECODE_PROFILE_VP9) {
+    list.push_back ("0");
+  } else if (profile == D3D12_VIDEO_DECODE_PROFILE_VP9_10BIT_PROFILE2) {
+    list.push_back ("2");
+  } else if (profile == D3D12_VIDEO_DECODE_PROFILE_AV1_PROFILE0) {
+    list.push_back ("main");
+  } else {
+    g_assert_not_reached ();
+  }
+}
+
+GstD3D12DecoderClassData *
+gst_d3d12_decoder_check_feature_support (GstD3D12Device * device,
+    ID3D12VideoDevice * video_device, GstDxvaCodec codec)
+{
+  HRESULT hr;
+  GstDxvaResolution max_resolution = { 0, 0 };
+  D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS config_flags =
+      D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_NONE;
+  D3D12_VIDEO_DECODE_TIER tier = D3D12_VIDEO_DECODE_TIER_NOT_SUPPORTED;
+  std::set < DXGI_FORMAT > supported_formats;
+  std::vector < std::string > profiles;
+
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+  g_return_val_if_fail (video_device != nullptr, nullptr);
+
+  for (guint i = 0; i < G_N_ELEMENTS (format_list); i++) {
+    if (format_listi.codec != codec)
+      continue;
+
+    D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT s;
+    s.NodeIndex = 0;
+    s.Configuration.DecodeProfile = format_listi.decode_profile;
+    s.Configuration.BitstreamEncryption = D3D12_BITSTREAM_ENCRYPTION_TYPE_NONE;
+    s.Configuration.InterlaceType = D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_NONE;
+    s.FrameRate = { 0, 1 };
+    s.BitRate = 0;
+
+    bool supported = false;
+    for (guint j = 0; j < G_N_ELEMENTS (format_listi.format); j++) {
+      s.DecodeFormat = format_listi.formatj;
+      if (s.DecodeFormat == DXGI_FORMAT_UNKNOWN)
+        break;
+
+      for (guint k = 0; k < G_N_ELEMENTS (gst_dxva_resolutions); k++) {
+        s.Width = gst_dxva_resolutionsk.width;
+        s.Height = gst_dxva_resolutionsk.height;
+
+        hr = video_device->CheckFeatureSupport
+            (D3D12_FEATURE_VIDEO_DECODE_SUPPORT, &s,
+            sizeof (D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT));
+        if (FAILED (hr))
+          break;
+
+        if ((s.SupportFlags & D3D12_VIDEO_DECODE_SUPPORT_FLAG_SUPPORTED) == 0)
+          break;
+
+        if (max_resolution.width < gst_dxva_resolutionsk.width)
+          max_resolution.width = gst_dxva_resolutionsk.width;
+        if (max_resolution.height < gst_dxva_resolutionsk.height)
+          max_resolution.height = gst_dxva_resolutionsk.height;
+
+        supported_formats.insert (format_listi.formatj);
+        config_flags = s.ConfigurationFlags;
+        tier = s.DecodeTier;
+        supported = true;
+      }
+    }
+
+    if (supported)
+      gst_d3d12_decoder_get_profiles (format_listi.decode_profile, profiles);
+  }
+
+  if (supported_formats.empty ()) {
+    GST_DEBUG_OBJECT (device, "Device doesn't support %s",
+        gst_dxva_codec_to_string (codec));
+    return nullptr;
+  }
+
+  GST_DEBUG_OBJECT (device,
+      "Device supports codec %s (%dx%d), configuration flags 0x%x, tier: %d",
+      gst_dxva_codec_to_string (codec),
+      max_resolution.width, max_resolution.height, config_flags, tier);
+
+  std::string format_string;
+
+  /* *INDENT-OFF* */
+  for (const auto &iter : supported_formats) {
+    GstVideoFormat format = gst_d3d12_dxgi_format_to_gst (iter);
+
+    if (format == GST_VIDEO_FORMAT_UNKNOWN) {
+      GST_ERROR_OBJECT (device,
+          "Failed to get video format from dxgi format %d", iter);
+    }
+
+    if (!format_string.empty ())
+      format_string += ", ";
+
+     format_string += gst_video_format_to_string (format);
+  }
+  /* *INDENT-ON* */
+
+  std::string src_caps_string;
+  /* TODO: support d3d12 memory */
+  src_caps_string = "video/x-raw, format = (string) ";
+  if (supported_formats.size () > 1) {
+    src_caps_string += "{ " + format_string + " }";
+  } else {
+    src_caps_string += format_string;
+  }
+
+  std::string sink_caps_string;
+  std::string profile_string;
+
+  switch (codec) {
+    case GST_DXVA_CODEC_MPEG2:
+      sink_caps_string = "video/mpeg, "
+          "mpegversion = (int) 2, systemstream = (boolean) false";
+      break;
+    case GST_DXVA_CODEC_H264:
+      sink_caps_string = "video/x-h264, "
+          "stream-format=(string) { avc, avc3, byte-stream }, "
+          "alignment=(string) au";
+      break;
+    case GST_DXVA_CODEC_H265:
+      sink_caps_string = "video/x-h265, "
+          "stream-format=(string) { hev1, hvc1, byte-stream }, "
+          "alignment=(string) au";
+      break;
+    case GST_DXVA_CODEC_VP8:
+      sink_caps_string = "video/x-vp8";
+      break;
+    case GST_DXVA_CODEC_VP9:
+      if (profiles.size () > 1) {
+        sink_caps_string =
+            "video/x-vp9, alignment = (string) frame, profile = (string) 0; "
+            "video/x-vp9, alignment = (string) frame, profile = (string) 2, "
+            "bit-depth-luma = (uint) 10, bit-depth-chroma = (uint) 10";
+      } else if (profiles0 == "0") {
+        sink_caps_string =
+            "video/x-vp9, alignment = (string) frame, profile = (string) 0";
+      } else {
+        sink_caps_string =
+            "video/x-vp9, alignment = (string) frame, profile = (string) 2, "
+            "bit-depth-luma = (uint) 10, bit-depth-chroma = (uint) 10";
+      }
+      break;
+    case GST_DXVA_CODEC_AV1:
+      sink_caps_string = "video/x-av1, alignment = (string) frame";
+      break;
+    default:
+      g_assert_not_reached ();
+      return nullptr;
+  }
+
+  /* *INDENT-OFF* */
+  if (codec != GST_DXVA_CODEC_VP9 && codec != GST_DXVA_CODEC_VP8) {
+    if (profiles.size () > 1) {
+      profile_string = "{ ";
+      bool first = true;
+      for (auto it : profiles) {
+        if (!first)
+          profile_string += ", ";
+
+        profile_string += it;
+        first = false;
+      }
+
+      profile_string += " }";
+    } else {
+      profile_string = profiles0;
+    }
+
+    sink_caps_string += ", profile=(string) ";
+    sink_caps_string += profile_string;
+  }
+  /* *INDENT-ON* */
+
+  GstCaps *sink_caps = gst_caps_from_string (sink_caps_string.c_str ());
+  GstCaps *raw_caps = gst_caps_from_string (src_caps_string.c_str ());
+  GstCaps *src_caps = gst_caps_copy (raw_caps);
+  gst_caps_set_features_simple (src_caps,
+      gst_caps_features_new_single (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY));
+  gst_caps_append (src_caps, raw_caps);
+
+  gint max_res = MAX (max_resolution.width, max_resolution.height);
+  gst_caps_set_simple (sink_caps,
+      "width", GST_TYPE_INT_RANGE, 1, max_res,
+      "height", GST_TYPE_INT_RANGE, 1, max_res, nullptr);
+  gst_caps_set_simple (src_caps,
+      "width", GST_TYPE_INT_RANGE, 1, max_res,
+      "height", GST_TYPE_INT_RANGE, 1, max_res, nullptr);
+
+  GstD3D12DecoderClassData *ret = g_new0 (GstD3D12DecoderClassData, 1);
+  GstD3D12DecoderSubClassData *subclass_data = &ret->subclass_data;
+
+  ret->sink_caps = sink_caps;
+  ret->src_caps = src_caps;
+
+  subclass_data->codec = codec;
+
+  /* class data will be leaked if the element never gets instantiated */
+  GST_MINI_OBJECT_FLAG_SET (sink_caps, GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (src_caps, GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  g_object_get (device, "adapter-luid", &subclass_data->adapter_luid,
+      "device-id", &subclass_data->device_id, "vendor-id",
+      &subclass_data->vendor_id, "description", &ret->description, nullptr);
+
+  GST_DEBUG_OBJECT (device,
+      "Configured sink caps: %" GST_PTR_FORMAT ", src caps: %" GST_PTR_FORMAT,
+      sink_caps, src_caps);
+
+  return ret;
+}
+
+static void
+gst_d3d12_decoder_class_data_free (GstD3D12DecoderClassData * data)
+{
+  if (!data)
+    return;
+
+  gst_clear_caps (&data->sink_caps);
+  gst_clear_caps (&data->src_caps);
+  g_free (data->description);
+  g_free (data);
+}
+
+void
+gst_d3d12_decoder_class_data_fill_subclass_data (GstD3D12DecoderClassData *
+    data, GstD3D12DecoderSubClassData * subclass_data)
+{
+  g_return_if_fail (data != nullptr);
+  g_return_if_fail (subclass_data != nullptr);
+
+  *subclass_data = data->subclass_data;
+}
+
+void
+gst_d3d12_decoder_proxy_class_init (GstElementClass * klass,
+    GstD3D12DecoderClassData * data, const gchar * author)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstD3D12DecoderSubClassData *cdata = &data->subclass_data;
+  std::string long_name;
+  std::string description;
+  const gchar *codec_name;
+  GParamFlags param_flags = (GParamFlags) (GST_PARAM_DOC_SHOW_DEFAULT |
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  GstPadTemplate *pad_templ;
+
+  g_object_class_install_property (gobject_class, PROP_DECODER_ADAPTER_LUID,
+      g_param_spec_int64 ("adapter-luid", "Adapter LUID",
+          "DXGI Adapter LUID (Locally Unique Identifier) of created device",
+          G_MININT64, G_MAXINT64, 0, param_flags));
+
+  g_object_class_install_property (gobject_class, PROP_DECODER_DEVICE_ID,
+      g_param_spec_uint ("device-id", "Device Id",
+          "DXGI Device ID", 0, G_MAXUINT32, 0, param_flags));
+
+  g_object_class_install_property (gobject_class, PROP_DECODER_VENDOR_ID,
+      g_param_spec_uint ("vendor-id", "Vendor Id",
+          "DXGI Vendor ID", 0, G_MAXUINT32, 0, param_flags));
+
+  codec_name = gst_dxva_codec_to_string (cdata->codec);
+  long_name = "Direct3D12/DXVA " + std::string (codec_name) + " " +
+      std::string (data->description) + " Decoder";
+  description = "Direct3D12/DXVA based " + std::string (codec_name) +
+      " video decoder";
+
+  gst_element_class_set_metadata (klass, long_name.c_str (),
+      "Codec/Decoder/Video/Hardware", description.c_str (), author);
+
+  pad_templ = gst_pad_template_new ("sink",
+      GST_PAD_SINK, GST_PAD_ALWAYS, data->sink_caps);
+  gst_element_class_add_pad_template (klass, pad_templ);
+
+  pad_templ = gst_pad_template_new ("src",
+      GST_PAD_SRC, GST_PAD_ALWAYS, data->src_caps);
+  gst_element_class_add_pad_template (klass, pad_templ);
+
+  gst_d3d12_decoder_class_data_free (data);
+}
+
+void
+gst_d3d12_decoder_proxy_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec,
+    GstD3D12DecoderSubClassData * subclass_data)
+{
+  switch (prop_id) {
+    case PROP_DECODER_ADAPTER_LUID:
+      g_value_set_int64 (value, subclass_data->adapter_luid);
+      break;
+    case PROP_DECODER_DEVICE_ID:
+      g_value_set_uint (value, subclass_data->device_id);
+      break;
+    case PROP_DECODER_VENDOR_ID:
+      g_value_set_uint (value, subclass_data->vendor_id);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12decoder.h Added

@@ -0,0 +1,199 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/codecs/gstcodecpicture.h>
+#include <gst/dxva/gstdxva.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_DECODER (gst_d3d12_decoder_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12Decoder,
+    gst_d3d12_decoder, GST, D3D12_DECODER, GstObject);
+
+typedef struct _GstD3D12DecoderClassData GstD3D12DecoderClassData;
+
+struct GstD3D12DecoderSubClassData
+{
+  GstDxvaCodec codec;
+  gint64 adapter_luid;
+  guint device_id;
+  guint vendor_id;
+};
+
+#define GST_D3D12_DECODER_DEFINE_TYPE(ModuleObjName,module_obj_name,MODULE,OBJ_NAME,ParentName) \
+  static GstElementClass *parent_class = NULL; \
+  typedef struct _##ModuleObjName { \
+    ParentName parent; \
+    GstD3D12Decoder *decoder; \
+  } ModuleObjName;\
+  typedef struct _##ModuleObjName##Class { \
+    ParentName##Class parent_class; \
+    GstD3D12DecoderSubClassData class_data; \
+  } ModuleObjName##Class; \
+  static inline ModuleObjName * MODULE##_##OBJ_NAME (gpointer ptr) { \
+    return (ModuleObjName *) (ptr); \
+  } \
+  static inline ModuleObjName##Class * MODULE##_##OBJ_NAME##_GET_CLASS (gpointer ptr) { \
+    return G_TYPE_INSTANCE_GET_CLASS ((ptr),G_TYPE_FROM_INSTANCE(ptr),ModuleObjName##Class); \
+  } \
+  static void module_obj_name##_finalize (GObject * object); \
+  static void module_obj_name##_get_property (GObject * object, \
+      guint prop_id, GValue * value, GParamSpec * pspec); \
+  static void module_obj_name##_set_context (GstElement * element, \
+      GstContext * context); \
+  static gboolean module_obj_name##_open (GstVideoDecoder * decoder); \
+  static gboolean module_obj_name##_stop (GstVideoDecoder * decoder); \
+  static gboolean module_obj_name##_close (GstVideoDecoder * decoder); \
+  static gboolean module_obj_name##_negotiate (GstVideoDecoder * decoder); \
+  static gboolean module_obj_name##_decide_allocation (GstVideoDecoder * decoder, \
+      GstQuery * query); \
+  static gboolean module_obj_name##_sink_query (GstVideoDecoder * decoder, \
+      GstQuery * query); \
+  static gboolean module_obj_name##_src_query (GstVideoDecoder * decoder, \
+      GstQuery * query); \
+  static gboolean module_obj_name##_sink_event (GstVideoDecoder * decoder, \
+      GstEvent * event); \
+  static GstFlowReturn module_obj_name##_drain (GstVideoDecoder * decoder); \
+  static GstFlowReturn module_obj_name##_finish (GstVideoDecoder * decoder); \
+  static gboolean module_obj_name##_flush (GstVideoDecoder * decoder); \
+  static GstFlowReturn module_obj_name##_configure (ParentName * decoder, \
+      GstVideoCodecState * input_state, const GstVideoInfo * info, \
+      gint crop_x, gint crop_y, \
+      gint coded_width, gint coded_height, gint max_dpb_size); \
+  static GstFlowReturn  module_obj_name##_new_picture (ParentName * decoder, \
+      GstCodecPicture * picture); \
+  static guint8 module_obj_name##_get_picture_id (ParentName * decoder, \
+      GstCodecPicture * picture); \
+  static GstFlowReturn  module_obj_name##_start_picture (ParentName * decoder, \
+      GstCodecPicture * picture, guint8 * picture_id); \
+  static GstFlowReturn module_obj_name##_end_picture (ParentName * decoder, \
+      GstCodecPicture * picture, GPtrArray * ref_pics, \
+      const GstDxvaDecodingArgs * args); \
+  static GstFlowReturn module_obj_name##_output_picture (ParentName * decoder, \
+      GstVideoCodecFrame * frame, GstCodecPicture * picture, \
+      GstVideoBufferFlags buffer_flags, \
+      gint display_width, gint display_height);
+
+#define GST_D3D12_DECODER_DEFINE_TYPE_FULL(ModuleObjName,module_obj_name,MODULE,OBJ_NAME,ParentName) \
+  GST_D3D12_DECODER_DEFINE_TYPE(ModuleObjName,module_obj_name,MODULE,OBJ_NAME,ParentName); \
+  static GstFlowReturn  module_obj_name##_duplicate_picture (ParentName * decoder, \
+      GstCodecPicture * src, GstCodecPicture * dst);
+
+GstD3D12Decoder * gst_d3d12_decoder_new               (GstDxvaCodec codec,
+                                                       gint64 adapter_luid);
+
+gboolean          gst_d3d12_decoder_open              (GstD3D12Decoder * decoder,
+                                                       GstElement * element);
+
+gboolean          gst_d3d12_decoder_close             (GstD3D12Decoder * decoder);
+
+GstFlowReturn     gst_d3d12_decoder_configure         (GstD3D12Decoder * decoder,
+                                                       GstVideoDecoder * videodec,
+                                                       GstVideoCodecState * input_state,
+                                                       const GstVideoInfo * info,
+                                                       gint crop_x,
+                                                       gint crop_y,
+                                                       gint coded_width,
+                                                       gint coded_height,
+                                                       guint dpb_size);
+
+GstFlowReturn     gst_d3d12_decoder_drain             (GstD3D12Decoder * decoder,
+                                                       GstVideoDecoder * videodec);
+
+gboolean          gst_d3d12_decoder_flush             (GstD3D12Decoder * decoder,
+                                                       GstVideoDecoder * videodec);
+
+gboolean          gst_d3d12_decoder_stop              (GstD3D12Decoder * decoder);
+
+GstFlowReturn     gst_d3d12_decoder_new_picture   (GstD3D12Decoder * decoder,
+                                                   GstVideoDecoder * videodec,
+                                                   GstCodecPicture * picture);
+
+GstFlowReturn     gst_d3d12_decoder_new_picture_with_size (GstD3D12Decoder * decoder,
+                                                           GstVideoDecoder * videodec,
+                                                           GstCodecPicture * picture,
+                                                           guint width,
+                                                           guint height);
+
+GstFlowReturn     gst_d3d12_decoder_duplicate_picture (GstD3D12Decoder * decoder,
+                                                       GstCodecPicture * src,
+                                                       GstCodecPicture * dst);
+
+guint8            gst_d3d12_decoder_get_picture_id    (GstD3D12Decoder * decoder,
+                                                       GstCodecPicture * picture);
+
+GstFlowReturn     gst_d3d12_decoder_start_picture     (GstD3D12Decoder * decoder,
+                                                       GstCodecPicture * picture,
+                                                       guint8 * picture_id);
+
+GstFlowReturn     gst_d3d12_decoder_end_picture       (GstD3D12Decoder * decoder,
+                                                       GstCodecPicture * picture,
+                                                       GPtrArray * ref_pics,
+                                                       const GstDxvaDecodingArgs * args);
+
+GstFlowReturn     gst_d3d12_decoder_output_picture      (GstD3D12Decoder * decoder,
+                                                         GstVideoDecoder * videodec,
+                                                         GstVideoCodecFrame * frame,
+                                                         GstCodecPicture * picture,
+                                                         GstVideoBufferFlags buffer_flags,
+                                                         gint display_width,
+                                                         gint display_height);
+
+gboolean          gst_d3d12_decoder_negotiate         (GstD3D12Decoder * decoder,
+                                                       GstVideoDecoder * videodec);
+
+gboolean          gst_d3d12_decoder_decide_allocation (GstD3D12Decoder * decoder,
+                                                       GstVideoDecoder * videodec,
+                                                       GstQuery * query);
+
+void              gst_d3d12_decoder_sink_event        (GstD3D12Decoder * decoder,
+                                                       GstEvent * event);
+
+void              gst_d3d12_decoder_set_context       (GstD3D12Decoder * decoder,
+                                                       GstElement * element,
+                                                       GstContext * context);
+
+gboolean          gst_d3d12_decoder_handle_query      (GstD3D12Decoder * decoder,
+                                                       GstElement * element,
+                                                       GstQuery * query);
+
+/* Utils for element registration */
+GstD3D12DecoderClassData * gst_d3d12_decoder_check_feature_support   (GstD3D12Device * device,
+                                                                      ID3D12VideoDevice * video_device,
+                                                                      GstDxvaCodec codec);
+
+void  gst_d3d12_decoder_class_data_fill_subclass_data (GstD3D12DecoderClassData * data,
+                                                       GstD3D12DecoderSubClassData * subclass_data);
+
+void  gst_d3d12_decoder_proxy_class_init              (GstElementClass * klass,
+                                                       GstD3D12DecoderClassData * data,
+                                                       const gchar * author);
+
+void  gst_d3d12_decoder_proxy_get_property            (GObject * object,
+                                                       guint prop_id,
+                                                       GValue * value,
+                                                       GParamSpec * pspec,
+                                                       GstD3D12DecoderSubClassData * subclass_data);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12descriptorpool.cpp Added

@@ -0,0 +1,237 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * This library is free software; you cln 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12.h"
+#include <wrl.h>
+#include <queue>
+#include <mutex>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_descriptor_pool_debug);
+#define GST_CAT_DEFAULT gst_d3d12_descriptor_pool_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+struct _GstD3D12Descriptor : public GstMiniObject
+{
+  GstD3D12DescriptorPool *pool = nullptr;
+  ComPtr < ID3D12DescriptorHeap > heap;
+};
+
+struct GstD3D12DescriptorPoolPrivate
+{
+  ~GstD3D12DescriptorPoolPrivate ()
+  {
+    while (!heap_pool.empty ()) {
+      auto desc = heap_pool.front ();
+      heap_pool.pop ();
+      gst_mini_object_unref (desc);
+    }
+  }
+
+  ComPtr<ID3D12Device> device;
+
+  std::mutex lock;
+  std::queue<GstD3D12Descriptor *>heap_pool;
+  D3D12_DESCRIPTOR_HEAP_DESC heap_desc;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12DescriptorPool
+{
+  GstObject parent;
+
+  GstD3D12DescriptorPoolPrivate *priv;
+};
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstD3D12Descriptor, gst_d3d12_descriptor);
+
+static void gst_d3d12_descriptor_pool_finalize (GObject * object);
+
+#define gst_d3d12_descriptor_pool_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12DescriptorPool,
+    gst_d3d12_descriptor_pool, GST_TYPE_OBJECT);
+
+static void
+gst_d3d12_descriptor_pool_class_init (GstD3D12DescriptorPoolClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_descriptor_pool_finalize;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_descriptor_pool_debug,
+      "d3d12descriptorpool", 0, "d3d12descriptorpool");
+}
+
+static void
+gst_d3d12_descriptor_pool_init (GstD3D12DescriptorPool * self)
+{
+  self->priv = new GstD3D12DescriptorPoolPrivate ();
+}
+
+static void
+gst_d3d12_descriptor_pool_finalize (GObject * object)
+{
+  auto self = GST_D3D12_DESCRIPTOR_POOL (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GstD3D12DescriptorPool *
+gst_d3d12_descriptor_pool_new (GstD3D12Device * device,
+    const D3D12_DESCRIPTOR_HEAP_DESC * desc)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+  g_return_val_if_fail (desc, nullptr);
+
+  auto self = (GstD3D12DescriptorPool *)
+      g_object_new (GST_TYPE_D3D12_DESCRIPTOR_POOL, nullptr);
+  gst_object_ref_sink (self);
+
+  auto priv = self->priv;
+  priv->device = gst_d3d12_device_get_device_handle (device);
+  priv->heap_desc = *desc;
+
+  return self;
+}
+
+static void
+gst_d3d12_descriptor_pool_release (GstD3D12DescriptorPool * pool,
+    GstD3D12Descriptor * desc)
+{
+  auto priv = pool->priv;
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+    desc->dispose = nullptr;
+    desc->pool = nullptr;
+    priv->heap_pool.push (desc);
+  }
+
+  gst_object_unref (pool);
+}
+
+static gboolean
+gst_d3d12_descriptor_dispose (GstD3D12Descriptor * desc)
+{
+  if (!desc->pool)
+    return TRUE;
+
+  gst_mini_object_ref (desc);
+  gst_d3d12_descriptor_pool_release (desc->pool, desc);
+
+  return FALSE;
+}
+
+static void
+gst_d3d12_descriptor_free (GstD3D12Descriptor * desc)
+{
+  delete desc;
+}
+
+static GstD3D12Descriptor *
+gst_d3d12_descriptor_new (ID3D12DescriptorHeap * heap)
+{
+  auto desc = new GstD3D12Descriptor ();
+  desc->heap = heap;
+
+  gst_mini_object_init (desc, 0, gst_d3d12_descriptor_get_type (),
+      nullptr, nullptr, (GstMiniObjectFreeFunction) gst_d3d12_descriptor_free);
+
+  return desc;
+}
+
+gboolean
+gst_d3d12_descriptor_pool_acquire (GstD3D12DescriptorPool * pool,
+    GstD3D12Descriptor ** desc)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DESCRIPTOR_POOL (pool), FALSE);
+  g_return_val_if_fail (desc, FALSE);
+
+  *desc = nullptr;
+
+  auto priv = pool->priv;
+  GstD3D12Descriptor *new_desc = nullptr;
+  HRESULT hr;
+
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+    if (!priv->heap_pool.empty ()) {
+      new_desc = priv->heap_pool.front ();
+      priv->heap_pool.pop ();
+    }
+  }
+
+  if (!new_desc) {
+    ComPtr < ID3D12DescriptorHeap > heap;
+    hr = priv->device->CreateDescriptorHeap (&priv->heap_desc,
+        IID_PPV_ARGS (&heap));
+    if (FAILED (hr)) {
+      GST_ERROR_OBJECT (pool, "Couldn't create descriptor heap, hr: 0x%x",
+          (guint) hr);
+      return FALSE;
+    }
+
+    new_desc = gst_d3d12_descriptor_new (heap.Get ());
+  }
+
+  new_desc->pool = (GstD3D12DescriptorPool *) gst_object_ref (pool);
+  new_desc->dispose =
+      (GstMiniObjectDisposeFunction) gst_d3d12_descriptor_dispose;
+
+  *desc = new_desc;
+
+  return TRUE;
+}
+
+GstD3D12Descriptor *
+gst_d3d12_descriptor_ref (GstD3D12Descriptor * desc)
+{
+  return (GstD3D12Descriptor *) gst_mini_object_ref (desc);
+}
+
+void
+gst_d3d12_descriptor_unref (GstD3D12Descriptor * desc)
+{
+  gst_mini_object_unref (desc);
+}
+
+void
+gst_clear_d3d12_descriptor (GstD3D12Descriptor ** desc)
+{
+  gst_clear_mini_object (desc);
+}
+
+gboolean
+gst_d3d12_descriptor_get_handle (GstD3D12Descriptor * desc,
+    ID3D12DescriptorHeap ** heap)
+{
+  g_return_val_if_fail (desc, FALSE);
+  g_return_val_if_fail (heap, FALSE);
+
+  *heap = desc->heap.Get ();
+  (*heap)->AddRef ();
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12descriptorpool.h Added

@@ -0,0 +1,50 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_DESCRIPTOR_POOL (gst_d3d12_descriptor_pool_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12DescriptorPool,
+    gst_d3d12_descriptor_pool, GST, D3D12_DESCRIPTOR_POOL, GstObject);
+
+typedef struct _GstD3D12Descriptor GstD3D12Descriptor;
+
+GstD3D12DescriptorPool *  gst_d3d12_descriptor_pool_new (GstD3D12Device * device,
+                                                         const D3D12_DESCRIPTOR_HEAP_DESC * desc);
+
+gboolean                  gst_d3d12_descriptor_pool_acquire (GstD3D12DescriptorPool * pool,
+                                                               GstD3D12Descriptor ** desc);
+
+GstD3D12Descriptor *      gst_d3d12_descriptor_ref (GstD3D12Descriptor * desc);
+
+void                      gst_d3d12_descriptor_unref (GstD3D12Descriptor * desc);
+
+void                      gst_clear_d3d12_descriptor (GstD3D12Descriptor ** desc);
+
+gboolean                  gst_d3d12_descriptor_get_handle (GstD3D12Descriptor * desc,
+                                                           ID3D12DescriptorHeap ** heap);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12device.cpp Added

@@ -0,0 +1,1306 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12.h"
+#include "gstd3d12-private.h"
+#include "gstd3d11on12.h"
+#include <directx/d3dx12.h>
+#include <wrl.h>
+#include <vector>
+#include <string.h>
+#include <mutex>
+#include <condition_variable>
+#include <string>
+#include <locale>
+#include <codecvt>
+#include <algorithm>
+#include <d3d12sdklayers.h>
+#include <memory>
+#include <queue>
+#include <unordered_map>
+#include <thread>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_device_debug);
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_sdk_debug);
+#define GST_CAT_DEFAULT gst_d3d12_device_debug
+
+enum
+{
+  PROP_0,
+  PROP_ADAPTER_INDEX,
+  PROP_ADAPTER_LUID,
+  PROP_DEVICE_ID,
+  PROP_VENDOR_ID,
+  PROP_HARDWARE,
+  PROP_DESCRIPTION,
+};
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+struct _GstD3D12DevicePrivate
+{
+  ~_GstD3D12DevicePrivate ()
+  {
+    auto hr = device->GetDeviceRemovedReason ();
+    /* If device were not removed, make sure no pending command in queue */
+    if (hr == S_OK) {
+      if (direct_queue)
+        gst_d3d12_command_queue_fence_wait (direct_queue, G_MAXUINT64, nullptr);
+
+      if (copy_queue)
+        gst_d3d12_command_queue_fence_wait (copy_queue, G_MAXUINT64, nullptr);
+    }
+
+    gst_clear_object (&direct_queue);
+    gst_clear_object (&copy_queue);
+
+    gst_clear_object (&direct_ca_pool);
+    gst_clear_object (&direct_cl_pool);
+
+    gst_clear_object (&copy_ca_pool);
+    gst_clear_object (&copy_cl_pool);
+
+    factory = nullptr;
+    adapter = nullptr;
+    d3d11on12 = nullptr;
+
+    if (info_queue && device) {
+      ComPtr <ID3D12DebugDevice> debug_dev;
+      device.As (&debug_dev);
+      if (debug_dev) {
+        debug_dev->ReportLiveDeviceObjects (D3D12_RLDO_DETAIL |
+            D3D12_RLDO_IGNORE_INTERNAL);
+
+        UINT64 num_msg = info_queue->GetNumStoredMessages ();
+        for (UINT64 i = 0; i < num_msg; i++) {
+          HRESULT hr;
+          SIZE_T msg_len;
+          D3D12_MESSAGE *msg;
+
+          hr = info_queue->GetMessage (i, nullptr, &msg_len);
+          if (FAILED (hr) || msg_len == 0)
+            continue;
+
+          msg = (D3D12_MESSAGE *) g_malloc0 (msg_len);
+          hr = info_queue->GetMessage (i, msg, &msg_len);
+          if (FAILED (hr) || msg_len == 0) {
+            g_free (msg);
+            continue;
+          }
+
+          gst_debug_log (gst_d3d12_sdk_debug, GST_LEVEL_INFO,
+              __FILE__, GST_FUNCTION, __LINE__, nullptr,
+              "D3D12InfoQueue: %s", msg->pDescription);
+          g_free (msg);
+        }
+
+        info_queue->ClearStoredMessages ();
+      }
+    }
+  }
+
+  ComPtr<ID3D12Device> device;
+  ComPtr<IDXGIAdapter1> adapter;
+  ComPtr<IDXGIFactory2> factory;
+  std::unordered_map<GstVideoFormat, GstD3D12Format> format_table;
+  std::recursive_mutex extern_lock;
+  std::mutex lock;
+
+  ComPtr<ID3D12InfoQueue> info_queue;
+
+  ComPtr<IUnknown> d3d11on12;
+
+  GstD3D12CommandQueue *direct_queue = nullptr;
+  GstD3D12CommandQueue *copy_queue = nullptr;
+
+  GstD3D12CommandListPool *direct_cl_pool = nullptr;
+  GstD3D12CommandAllocatorPool *direct_ca_pool = nullptr;
+
+  GstD3D12CommandListPool *copy_cl_pool = nullptr;
+  GstD3D12CommandAllocatorPool *copy_ca_pool = nullptr;
+
+  guint rtv_inc_size;
+
+  guint adapter_index = 0;
+  guint device_id = 0;
+  guint vendor_id = 0;
+  std::string description;
+  gint64 adapter_luid = 0;
+};
+
+enum GstD3D12DeviceConstructType
+{
+  GST_D3D12_DEVICE_CONSTRUCT_FOR_INDEX,
+  GST_D3D12_DEVICE_CONSTRUCT_FOR_LUID,
+};
+
+struct GstD3D12DeviceConstructData
+{
+  union
+  {
+    guint index;
+    gint64 luid;
+  } data;
+  GstD3D12DeviceConstructType type;
+};
+
+static GstD3D12Device *
+gst_d3d12_device_new_internal (const GstD3D12DeviceConstructData * data);
+
+struct DeviceCache
+{
+  ~DeviceCache()
+  {
+    if (priv)
+      delete priv;
+  }
+
+  GstD3D12Device *device = nullptr;
+  GstD3D12DevicePrivate *priv = nullptr;
+  guint64 token = 0;
+};
+
+/* Because ID3D12Device instance is a singleton per adapter,
+ * this DeviceCacheManager object will cache GstD3D12Device object and
+ * will return the same GstD3D12Device object for create request
+ * if instanted object exists already.
+ *
+ * Another role of this object dtor thread management.
+ * GstD3D12CommandQueue object held by GstD3D12Device will run background
+ * garbage collection thread and releasing garbage collection data
+ * could result in releasing GstD3D12Device object, which can cause self-thread
+ * joining. This manager will run one background thread to avoid it
+ */
+class DeviceCacheManager
+{
+public:
+  DeviceCacheManager (const DeviceCacheManager &) = delete;
+  DeviceCacheManager& operator= (const DeviceCacheManager &) = delete;
+  static DeviceCacheManager * GetInstance()
+  {
+    static DeviceCacheManager *inst = nullptr;
+    GST_D3D12_CALL_ONCE_BEGIN {
+      inst = new DeviceCacheManager ();
+    } GST_D3D12_CALL_ONCE_END;
+
+    return inst;
+  }
+
+  void InitThread ()
+  {
+    std::lock_guard <std::mutex> lk (lock_);
+    if (!thread_)
+      thread_ = new std::thread (&DeviceCacheManager::threadFunc, this);
+  }
+
+  void Sync ()
+  {
+    guint64 to_wait = 0;
+
+    {
+      std::lock_guard <std::mutex> lk (lock_);
+      if (!thread_)
+        return;
+
+      token_++;
+      to_wait = token_;
+
+      auto empty_item = std::make_shared <DeviceCache> ();
+      empty_item->token = to_wait;
+
+      std::lock_guard <std::mutex> olk (thread_lock_);
+      to_remove_.push (std::move (empty_item));
+      thread_cond_.notify_one ();
+    }
+
+    std::unique_lock <std::mutex> olk (token_lock_);
+    while (token_synced_ < to_wait)
+      token_cond_.wait (olk);
+  }
+
+  GstD3D12Device * Create (const GstD3D12DeviceConstructData * data)
+  {
+    std::lock_guard <std::mutex> lk (lock_);
+    auto it = std::find_if (list_.begin (), list_.end (),
+        & (const auto & cache) {
+          const auto priv = cache->priv;
+          if (data->type == GST_D3D12_DEVICE_CONSTRUCT_FOR_INDEX)
+            return priv->adapter_index == data->data.index;
+
+          return priv->adapter_luid == data->data.luid;
+        });
+
+    if (it != list_.end ())
+      return (GstD3D12Device *) gst_object_ref ((*it)->device);
+
+    auto device = gst_d3d12_device_new_internal (data);
+    if (!device)
+      return nullptr;
+
+    gst_object_ref_sink (device);
+
+    auto item = std::make_shared <DeviceCache> ();
+    item->device = device;
+    item->priv = device->priv;
+
+    g_object_weak_ref (G_OBJECT (device), DeviceCacheManager::NotifyCb, this);
+    list_.push_back (item);
+
+    return device;
+  }
+
+  static void NotifyCb (gpointer data, GObject * device)
+  {
+    auto self = (DeviceCacheManager *) data;
+    self->remove ((GstD3D12Device *) device);
+  }
+
+private:
+  DeviceCacheManager () {}
+  ~DeviceCacheManager () {}
+
+  void threadFunc ()
+  {
+    while (true) {
+      std::unique_lock <std::mutex> lk (thread_lock_);
+      while (to_remove_.empty ())
+        thread_cond_.wait (lk);
+
+      while (!to_remove_.empty ()) {
+        guint64 token;
+
+        {
+          auto item = to_remove_.front ();
+          to_remove_.pop ();
+          token = item->token;
+        }
+
+        std::lock_guard <std::mutex> olk (token_lock_);
+        token_synced_ = token;
+        token_cond_.notify_all ();
+      }
+    }
+  }
+
+  void remove (GstD3D12Device * device)
+  {
+    std::lock_guard <std::mutex> lk (lock_);
+    auto it = std::find_if (list_.begin (), list_.end (),
+        & (const auto & cache) {
+          return cache->device == device;
+        });
+
+    std::shared_ptr<DeviceCache> cached;
+    if (it != list_.end ()) {
+      cached = *it;
+      list_.erase (it);
+    } else {
+      GST_WARNING ("Couldn't find device from cache");
+    }
+
+    if (cached && thread_) {
+      std::lock_guard <std::mutex> tlk (thread_lock_);
+      token_++;
+      cached->token = token_;
+      to_remove_.push (std::move (cached));
+      thread_cond_.notify_one ();
+    }
+  }
+
+private:
+  std::mutex lock_;
+  std::vector<std::shared_ptr<DeviceCache>> list_;
+  std::mutex thread_lock_;
+  std::condition_variable thread_cond_;
+  std::thread *thread_ = nullptr;
+  std::queue<std::shared_ptr<DeviceCache>> to_remove_;
+  std::mutex token_lock_;
+  std::condition_variable token_cond_;
+  guint64 token_ = 0;
+  guint64 token_synced_ = 0;
+};
+/* *INDENT-ON* */
+
+void
+gst_d3d12_init_background_thread (void)
+{
+  auto manager = DeviceCacheManager::GetInstance ();
+  manager->InitThread ();
+}
+
+void
+gst_d3d12_sync_background_thread (void)
+{
+  auto manager = DeviceCacheManager::GetInstance ();
+  manager->Sync ();
+}
+
+static gboolean
+gst_d3d12_device_enable_debug (void)
+{
+  static gboolean enabled = FALSE;
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    GST_DEBUG_CATEGORY_INIT (gst_d3d12_sdk_debug,
+        "d3d12debuglayer", 0, "d3d12 SDK layer debug");
+
+    /* Enables debug layer only if it's requested, otherwise
+     * already configured d3d12 devices (e.g., owned by application)
+     * will be invalidated by ID3D12Debug::EnableDebugLayer() */
+    if (!g_getenv ("GST_ENABLE_D3D12_DEBUG"))
+      return;
+
+    HRESULT hr;
+    ComPtr < ID3D12Debug > d3d12_debug;
+    hr = D3D12GetDebugInterface (IID_PPV_ARGS (&d3d12_debug));
+    if (FAILED (hr))
+      return;
+
+    d3d12_debug->EnableDebugLayer ();
+    enabled = TRUE;
+
+    GST_INFO ("D3D12 debug layer is enabled");
+
+    ComPtr < ID3D12Debug5 > d3d12_debug5;
+    hr = d3d12_debug.As (&d3d12_debug5);
+    if (SUCCEEDED (hr))
+      d3d12_debug5->SetEnableAutoName (TRUE);
+
+    ComPtr < ID3D12Debug1 > d3d12_debug1;
+    hr = d3d12_debug.As (&d3d12_debug1);
+    if (FAILED (hr))
+      return;
+
+    d3d12_debug1->SetEnableSynchronizedCommandQueueValidation (TRUE);
+
+    GST_INFO ("Enabled synchronized command queue validation");
+
+    if (!g_getenv ("GST_ENABLE_D3D12_DEBUG_GPU_VALIDATION"))
+      return;
+
+    d3d12_debug1->SetEnableGPUBasedValidation (TRUE);
+
+    GST_INFO ("Enabled GPU based validation");
+  }
+  GST_D3D12_CALL_ONCE_END;
+
+  return enabled;
+}
+
+#define gst_d3d12_device_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12Device, gst_d3d12_device, GST_TYPE_OBJECT);
+
+static void gst_d3d12_device_finalize (GObject * object);
+static void gst_d3d12_device_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+static void gst_d3d12_device_setup_format_table (GstD3D12Device * self);
+
+static void
+gst_d3d12_device_class_init (GstD3D12DeviceClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GParamFlags readable_flags =
+      (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  gobject_class->finalize = gst_d3d12_device_finalize;
+  gobject_class->get_property = gst_d3d12_device_get_property;
+
+  g_object_class_install_property (gobject_class, PROP_ADAPTER_INDEX,
+      g_param_spec_uint ("adapter-index", "Adapter Index",
+          "DXGI Adapter index for creating device",
+          0, G_MAXUINT32, 0, readable_flags));
+
+  g_object_class_install_property (gobject_class, PROP_ADAPTER_LUID,
+      g_param_spec_int64 ("adapter-luid", "Adapter LUID",
+          "DXGI Adapter LUID (Locally Unique Identifier) of created device",
+          0, G_MAXINT64, 0, readable_flags));
+
+  g_object_class_install_property (gobject_class, PROP_DEVICE_ID,
+      g_param_spec_uint ("device-id", "Device Id",
+          "DXGI Device ID", 0, G_MAXUINT32, 0, readable_flags));
+
+  g_object_class_install_property (gobject_class, PROP_VENDOR_ID,
+      g_param_spec_uint ("vendor-id", "Vendor Id",
+          "DXGI Vendor ID", 0, G_MAXUINT32, 0, readable_flags));
+
+  g_object_class_install_property (gobject_class, PROP_DESCRIPTION,
+      g_param_spec_string ("description", "Description",
+          "Human readable device description", nullptr, readable_flags));
+}
+
+static void
+gst_d3d12_device_init (GstD3D12Device * self)
+{
+  self->priv = new GstD3D12DevicePrivate ();
+}
+
+static void
+gst_d3d12_device_finalize (GObject * object)
+{
+  auto self = GST_D3D12_DEVICE (object);
+
+  GST_DEBUG_OBJECT (self, "Finalize");
+
+  /* Don't delete private struct. DeviceCacheManager will destroy it */
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_device_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstD3D12Device *self = GST_D3D12_DEVICE (object);
+  GstD3D12DevicePrivate *priv = self->priv;
+
+  switch (prop_id) {
+    case PROP_ADAPTER_INDEX:
+      g_value_set_uint (value, priv->adapter_index);
+      break;
+    case PROP_ADAPTER_LUID:
+      g_value_set_int64 (value, priv->adapter_luid);
+      break;
+    case PROP_DEVICE_ID:
+      g_value_set_uint (value, priv->device_id);
+      break;
+    case PROP_VENDOR_ID:
+      g_value_set_uint (value, priv->vendor_id);
+      break;
+    case PROP_DESCRIPTION:
+      g_value_set_string (value, priv->description.c_str ());
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static gboolean
+check_format_support (GstD3D12Device * self, DXGI_FORMAT format,
+    guint flags, D3D12_FEATURE_DATA_FORMAT_SUPPORT * support)
+{
+  ID3D12Device *device = self->priv->device.Get ();
+  HRESULT hr;
+
+  support->Format = format;
+  hr = device->CheckFeatureSupport (D3D12_FEATURE_FORMAT_SUPPORT, support,
+      sizeof (D3D12_FEATURE_DATA_FORMAT_SUPPORT));
+  if (FAILED (hr)) {
+    GST_INFO_OBJECT (self,
+        "Failed to check feature support for DXGI format %d", format);
+    return FALSE;
+  }
+
+  if (((guint) support->Support1 & flags) != flags) {
+    GST_INFO_OBJECT (self,
+        "DXGI format %d supports1 flag 0x%x, required 0x%x", format,
+        support->Support1, flags);
+
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static void
+gst_d3d12_device_setup_format_table (GstD3D12Device * self)
+{
+  auto priv = self->priv;
+
+  for (guint i = 0; i < GST_D3D12_N_FORMATS; i++) {
+    const auto iter = &g_gst_d3d12_default_format_mapi;
+    D3D12_FEATURE_DATA_FORMAT_SUPPORT supportGST_VIDEO_MAX_PLANES;
+    gboolean native = true;
+
+    switch (iter->format) {
+        /* RGB/GRAY */
+      case GST_VIDEO_FORMAT_BGRA:
+      case GST_VIDEO_FORMAT_BGRx:
+      case GST_VIDEO_FORMAT_RGBA:
+      case GST_VIDEO_FORMAT_RGBx:
+      case GST_VIDEO_FORMAT_RGB10A2_LE:
+      case GST_VIDEO_FORMAT_RGBA64_LE:
+      case GST_VIDEO_FORMAT_GRAY8:
+      case GST_VIDEO_FORMAT_GRAY16_LE:
+        if (!check_format_support (self, iter->dxgi_format,
+                iter->format_support10, &support0)) {
+          continue;
+        }
+        break;
+        /* YUV DXGI native formats */
+      case GST_VIDEO_FORMAT_VUYA:
+      case GST_VIDEO_FORMAT_Y410:
+      case GST_VIDEO_FORMAT_NV12:
+      case GST_VIDEO_FORMAT_P010_10LE:
+      case GST_VIDEO_FORMAT_P012_LE:
+      case GST_VIDEO_FORMAT_P016_LE:
+      case GST_VIDEO_FORMAT_YUY2:
+      case GST_VIDEO_FORMAT_Y210:
+      case GST_VIDEO_FORMAT_Y212_LE:
+      case GST_VIDEO_FORMAT_Y412_LE:
+      case GST_VIDEO_FORMAT_BGRA64_LE:
+      case GST_VIDEO_FORMAT_BGR10A2_LE:
+      case GST_VIDEO_FORMAT_RBGA:
+      {
+        if (!check_format_support (self, iter->dxgi_format,
+                iter->format_support10, &support0)) {
+          bool supported = true;
+          for (guint j = 0; j < GST_VIDEO_MAX_PLANES; j++) {
+            if (iter->resource_formatj == DXGI_FORMAT_UNKNOWN)
+              break;
+
+            if (!check_format_support (self, iter->resource_formatj,
+                    iter->format_support10, &supportj)) {
+              supported = false;
+              break;
+            }
+          }
+
+          if (!supported)
+            continue;
+
+          native = false;
+        }
+        break;
+      }
+        /* non-DXGI native formats */
+      case GST_VIDEO_FORMAT_NV21:
+      case GST_VIDEO_FORMAT_I420:
+      case GST_VIDEO_FORMAT_YV12:
+      case GST_VIDEO_FORMAT_I420_10LE:
+      case GST_VIDEO_FORMAT_I420_12LE:
+      case GST_VIDEO_FORMAT_Y42B:
+      case GST_VIDEO_FORMAT_I422_10LE:
+      case GST_VIDEO_FORMAT_I422_12LE:
+      case GST_VIDEO_FORMAT_Y444:
+      case GST_VIDEO_FORMAT_Y444_10LE:
+      case GST_VIDEO_FORMAT_Y444_12LE:
+      case GST_VIDEO_FORMAT_Y444_16LE:
+      case GST_VIDEO_FORMAT_AYUV:
+      case GST_VIDEO_FORMAT_AYUV64:
+      case GST_VIDEO_FORMAT_UYVY:
+      case GST_VIDEO_FORMAT_VYUY:
+      case GST_VIDEO_FORMAT_YVYU:
+      case GST_VIDEO_FORMAT_ARGB:
+      case GST_VIDEO_FORMAT_xRGB:
+      case GST_VIDEO_FORMAT_ABGR:
+      case GST_VIDEO_FORMAT_xBGR:
+      case GST_VIDEO_FORMAT_RGB:
+      case GST_VIDEO_FORMAT_BGR:
+      case GST_VIDEO_FORMAT_v210:
+      case GST_VIDEO_FORMAT_v216:
+      case GST_VIDEO_FORMAT_v308:
+      case GST_VIDEO_FORMAT_IYU2:
+      case GST_VIDEO_FORMAT_RGB16:
+      case GST_VIDEO_FORMAT_BGR16:
+      case GST_VIDEO_FORMAT_RGB15:
+      case GST_VIDEO_FORMAT_BGR15:
+      case GST_VIDEO_FORMAT_r210:
+        /* RGB planar formats */
+      case GST_VIDEO_FORMAT_RGBP:
+      case GST_VIDEO_FORMAT_BGRP:
+      case GST_VIDEO_FORMAT_GBR:
+      case GST_VIDEO_FORMAT_GBR_10LE:
+      case GST_VIDEO_FORMAT_GBR_12LE:
+      case GST_VIDEO_FORMAT_GBR_16LE:
+      case GST_VIDEO_FORMAT_GBRA:
+      case GST_VIDEO_FORMAT_GBRA_10LE:
+      case GST_VIDEO_FORMAT_GBRA_12LE:
+      {
+        bool supported = true;
+        native = false;
+
+        for (guint j = 0; j < GST_VIDEO_MAX_PLANES; j++) {
+          if (iter->resource_formatj == DXGI_FORMAT_UNKNOWN)
+            break;
+
+          if (!check_format_support (self, iter->resource_formatj,
+                  iter->format_support10, &supportj)) {
+            supported = false;
+            break;
+          }
+        }
+
+        if (!supported)
+          continue;
+        break;
+      }
+      default:
+        g_assert_not_reached ();
+        return;
+    }
+
+    auto format = *iter;
+
+    if (!native)
+      format.dxgi_format = DXGI_FORMAT_UNKNOWN;
+
+    for (guint j = 0; j < GST_VIDEO_MAX_PLANES; j++) {
+      format.format_support1j = supportj.Support1;
+      format.format_support2j = supportj.Support2;
+    }
+
+    priv->format_tableformat.format = format;
+  }
+}
+
+static HRESULT
+gst_d3d12_device_find_adapter (const GstD3D12DeviceConstructData * data,
+    IDXGIFactory2 * factory, guint * index, IDXGIAdapter1 ** rst)
+{
+  HRESULT hr;
+
+  switch (data->type) {
+    case GST_D3D12_DEVICE_CONSTRUCT_FOR_INDEX:{
+      ComPtr < IDXGIAdapter1 > adapter;
+      hr = factory->EnumAdapters1 (data->data.index, &adapter);
+      if (FAILED (hr))
+        return hr;
+
+      *index = data->data.index;
+      *rst = adapter.Detach ();
+      return S_OK;
+    }
+    case GST_D3D12_DEVICE_CONSTRUCT_FOR_LUID:
+      for (UINT i = 0;; i++) {
+        ComPtr < IDXGIAdapter1 > adapter;
+        DXGI_ADAPTER_DESC1 desc;
+
+        hr = factory->EnumAdapters1 (i, &adapter);
+        if (FAILED (hr))
+          return hr;
+
+        hr = adapter->GetDesc1 (&desc);
+        if (FAILED (hr))
+          return hr;
+
+        if (gst_d3d12_luid_to_int64 (&desc.AdapterLuid) != data->data.luid) {
+          continue;
+        }
+
+        *index = i;
+        *rst = adapter.Detach ();
+
+        return S_OK;
+      }
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return E_FAIL;
+}
+
+static GstD3D12Device *
+gst_d3d12_device_new_internal (const GstD3D12DeviceConstructData * data)
+{
+  ComPtr < IDXGIFactory2 > factory;
+  ComPtr < IDXGIAdapter1 > adapter;
+  ComPtr < ID3D12Device > device;
+  HRESULT hr;
+  UINT factory_flags = 0;
+  guint index = 0;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_device_debug,
+      "d3d12device", 0, "d3d12 device object");
+
+  gst_d3d12_device_enable_debug ();
+
+  hr = CreateDXGIFactory2 (factory_flags, IID_PPV_ARGS (&factory));
+  if (FAILED (hr)) {
+    GST_WARNING ("Could create dxgi factory, hr: 0x%x", (guint) hr);
+    return nullptr;
+  }
+
+  hr = gst_d3d12_device_find_adapter (data, factory.Get (), &index, &adapter);
+  if (FAILED (hr)) {
+    GST_WARNING ("Could not find adapter, hr: 0x%x", (guint) hr);
+    return nullptr;
+  }
+
+  DXGI_ADAPTER_DESC1 desc;
+  hr = adapter->GetDesc1 (&desc);
+  if (FAILED (hr)) {
+    GST_WARNING ("Could not get adapter desc, hr: 0x%x", (guint) hr);
+    return nullptr;
+  }
+
+  hr = D3D12CreateDevice (adapter.Get (), D3D_FEATURE_LEVEL_11_0,
+      IID_PPV_ARGS (&device));
+  if (FAILED (hr)) {
+    GST_WARNING ("Could not create device, hr: 0x%x", (guint) hr);
+    return nullptr;
+  }
+
+  GstD3D12Device *self = (GstD3D12Device *)
+      g_object_new (GST_TYPE_D3D12_DEVICE, nullptr);
+  GstD3D12DevicePrivate *priv = self->priv;
+
+  priv->factory = factory;
+  priv->adapter = adapter;
+  priv->device = device;
+  priv->adapter_luid = gst_d3d12_luid_to_int64 (&desc.AdapterLuid);
+  priv->vendor_id = desc.VendorId;
+  priv->device_id = desc.DeviceId;
+  priv->adapter_index = index;
+
+  std::wstring_convert < std::codecvt_utf8 < wchar_t >, wchar_t >converter;
+  priv->description = converter.to_bytes (desc.Description);
+
+  GST_INFO_OBJECT (self,
+      "adapter index %d: D3D12 device vendor-id: 0x%04x, device-id: 0x%04x, "
+      "Flags: 0x%x, adapter-luid: %" G_GINT64_FORMAT ", %s",
+      priv->adapter_index, desc.VendorId, desc.DeviceId, desc.Flags,
+      priv->adapter_luid, priv->description.c_str ());
+
+  gst_d3d12_device_setup_format_table (self);
+
+  if (gst_d3d12_device_enable_debug ()) {
+    ComPtr < ID3D12InfoQueue > info_queue;
+    device.As (&info_queue);
+    priv->info_queue = info_queue;
+  }
+
+
+  D3D12_COMMAND_QUEUE_DESC queue_desc = { };
+  queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
+  queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
+
+  priv->direct_queue = gst_d3d12_command_queue_new (self, &queue_desc, 0);
+  if (!priv->direct_queue)
+    goto error;
+
+  priv->direct_cl_pool = gst_d3d12_command_list_pool_new (self,
+      D3D12_COMMAND_LIST_TYPE_DIRECT);
+  if (!priv->direct_cl_pool)
+    goto error;
+
+  priv->direct_ca_pool = gst_d3d12_command_allocator_pool_new (self,
+      D3D12_COMMAND_LIST_TYPE_DIRECT);
+  if (!priv->direct_ca_pool)
+    goto error;
+
+  queue_desc.Type = D3D12_COMMAND_LIST_TYPE_COPY;
+  priv->copy_queue = gst_d3d12_command_queue_new (self, &queue_desc, 0);
+  if (!priv->copy_queue)
+    goto error;
+
+  priv->copy_cl_pool = gst_d3d12_command_list_pool_new (self,
+      D3D12_COMMAND_LIST_TYPE_COPY);
+  if (!priv->copy_cl_pool)
+    goto error;
+
+  priv->copy_ca_pool = gst_d3d12_command_allocator_pool_new (self,
+      D3D12_COMMAND_LIST_TYPE_COPY);
+  if (!priv->copy_ca_pool)
+    goto error;
+
+  priv->rtv_inc_size =
+      device->GetDescriptorHandleIncrementSize (D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
+
+  return self;
+
+error:
+  gst_object_unref (self);
+  return nullptr;
+}
+
+GstD3D12Device *
+gst_d3d12_device_new (guint adapter_index)
+{
+  auto manager = DeviceCacheManager::GetInstance ();
+  GstD3D12DeviceConstructData data;
+  data.data.index = adapter_index;
+  data.type = GST_D3D12_DEVICE_CONSTRUCT_FOR_INDEX;
+
+  return manager->Create (&data);
+}
+
+GstD3D12Device *
+gst_d3d12_device_new_for_adapter_luid (gint64 adapter_luid)
+{
+  auto manager = DeviceCacheManager::GetInstance ();
+  GstD3D12DeviceConstructData data;
+  data.data.luid = adapter_luid;
+  data.type = GST_D3D12_DEVICE_CONSTRUCT_FOR_LUID;
+
+  return manager->Create (&data);
+}
+
+ID3D12Device *
+gst_d3d12_device_get_device_handle (GstD3D12Device * device)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+
+  return device->priv->device.Get ();
+}
+
+IDXGIAdapter1 *
+gst_d3d12_device_get_adapter_handle (GstD3D12Device * device)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+
+  return device->priv->adapter.Get ();
+}
+
+IDXGIFactory2 *
+gst_d3d12_device_get_factory_handle (GstD3D12Device * device)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+
+  return device->priv->factory.Get ();
+}
+
+gboolean
+gst_d3d12_device_get_d3d11on12_device (GstD3D12Device * device,
+    IUnknown ** d3d11on12)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), FALSE);
+  g_return_val_if_fail (d3d11on12, FALSE);
+
+  auto priv = device->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if (!priv->d3d11on12) {
+    ComPtr < ID3D12CommandQueue > cq;
+    gst_d3d12_command_queue_get_handle (priv->direct_queue, &cq);
+    auto hr = GstD3D11On12CreateDevice (priv->device.Get (), cq.Get (),
+        &priv->d3d11on12);
+    if (!gst_d3d12_result (hr, device)) {
+      GST_ERROR_OBJECT (device, "Couldn't create d3d11on12 device");
+      return FALSE;
+    }
+  }
+
+  *d3d11on12 = priv->d3d11on12.Get ();
+  (*d3d11on12)->AddRef ();
+
+  return TRUE;
+}
+
+void
+gst_d3d12_device_lock (GstD3D12Device * device)
+{
+  g_return_if_fail (GST_IS_D3D12_DEVICE (device));
+
+  auto priv = device->priv;
+  priv->extern_lock.lock ();
+}
+
+void
+gst_d3d12_device_unlock (GstD3D12Device * device)
+{
+  g_return_if_fail (GST_IS_D3D12_DEVICE (device));
+
+  auto priv = device->priv;
+  priv->extern_lock.unlock ();
+}
+
+gboolean
+gst_d3d12_device_get_format (GstD3D12Device * device,
+    GstVideoFormat format, GstD3D12Format * device_format)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), FALSE);
+  g_return_val_if_fail (device_format != nullptr, FALSE);
+
+  auto priv = device->priv;
+  const auto & target = priv->format_table.find (format);
+  if (target == priv->format_table.end ())
+    return FALSE;
+
+  if (device_format)
+    *device_format = target->second;
+
+  return TRUE;
+}
+
+GstD3D12CommandQueue *
+gst_d3d12_device_get_command_queue (GstD3D12Device * device,
+    D3D12_COMMAND_LIST_TYPE queue_type)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+
+  auto priv = device->priv;
+
+  switch (queue_type) {
+    case D3D12_COMMAND_LIST_TYPE_DIRECT:
+      return priv->direct_queue;
+    case D3D12_COMMAND_LIST_TYPE_COPY:
+      return priv->copy_queue;
+    default:
+      break;
+  }
+
+  GST_ERROR_OBJECT (device, "Not supported queue type %d", queue_type);
+
+  return nullptr;
+}
+
+gboolean
+gst_d3d12_device_execute_command_lists (GstD3D12Device * device,
+    D3D12_COMMAND_LIST_TYPE queue_type, guint num_command_lists,
+    ID3D12CommandList ** command_lists, guint64 * fence_value)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), FALSE);
+
+  auto priv = device->priv;
+  GstD3D12CommandQueue *queue;
+
+  switch (queue_type) {
+    case D3D12_COMMAND_LIST_TYPE_DIRECT:
+      queue = priv->direct_queue;
+      break;
+    case D3D12_COMMAND_LIST_TYPE_COPY:
+      queue = priv->copy_queue;
+      break;
+    default:
+      GST_ERROR_OBJECT (device, "Not supported queue type %d", queue_type);
+      return FALSE;
+  }
+
+  auto hr = gst_d3d12_command_queue_execute_command_lists (queue,
+      num_command_lists, command_lists, fence_value);
+
+  return gst_d3d12_result (hr, device);
+}
+
+guint64
+gst_d3d12_device_get_completed_value (GstD3D12Device * device,
+    D3D12_COMMAND_LIST_TYPE queue_type)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), G_MAXUINT64);
+
+  auto priv = device->priv;
+  GstD3D12CommandQueue *queue;
+
+  switch (queue_type) {
+    case D3D12_COMMAND_LIST_TYPE_DIRECT:
+      queue = priv->direct_queue;
+      break;
+    case D3D12_COMMAND_LIST_TYPE_COPY:
+      queue = priv->copy_queue;
+      break;
+    default:
+      GST_ERROR_OBJECT (device, "Not supported queue type %d", queue_type);
+      return G_MAXUINT64;
+  }
+
+  return gst_d3d12_command_queue_get_completed_value (queue);
+}
+
+gboolean
+gst_d3d12_device_set_fence_notify (GstD3D12Device * device,
+    D3D12_COMMAND_LIST_TYPE queue_type, guint64 fence_value,
+    GstD3D12FenceData * fence_data)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), FALSE);
+  g_return_val_if_fail (fence_data, FALSE);
+
+  auto priv = device->priv;
+  GstD3D12CommandQueue *queue;
+
+  switch (queue_type) {
+    case D3D12_COMMAND_LIST_TYPE_DIRECT:
+      queue = priv->direct_queue;
+      break;
+    case D3D12_COMMAND_LIST_TYPE_COPY:
+      queue = priv->copy_queue;
+      break;
+    default:
+      GST_ERROR_OBJECT (device, "Not supported queue type %d", queue_type);
+      return FALSE;
+  }
+
+  gst_d3d12_command_queue_set_notify (queue, fence_value, fence_data,
+      (GDestroyNotify) gst_d3d12_fence_data_unref);
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_device_fence_wait (GstD3D12Device * device,
+    D3D12_COMMAND_LIST_TYPE queue_type, guint64 fence_value,
+    HANDLE event_handle)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), FALSE);
+
+  auto priv = device->priv;
+  GstD3D12CommandQueue *queue;
+
+  switch (queue_type) {
+    case D3D12_COMMAND_LIST_TYPE_DIRECT:
+      queue = priv->direct_queue;
+      break;
+    case D3D12_COMMAND_LIST_TYPE_COPY:
+      queue = priv->copy_queue;
+      break;
+    default:
+      GST_ERROR_OBJECT (device, "Not supported queue type %d", queue_type);
+      return FALSE;
+  }
+
+  auto hr = gst_d3d12_command_queue_fence_wait (queue,
+      fence_value, event_handle);
+
+  return gst_d3d12_result (hr, device);
+}
+
+gboolean
+gst_d3d12_device_copy_texture_region (GstD3D12Device * device,
+    guint num_args, const GstD3D12CopyTextureRegionArgs * args,
+    D3D12_COMMAND_LIST_TYPE command_type, guint64 * fence_value)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), FALSE);
+  g_return_val_if_fail (num_args > 0, FALSE);
+  g_return_val_if_fail (args, FALSE);
+
+  HRESULT hr;
+  auto priv = device->priv;
+  GstD3D12CommandAllocatorPool *ca_pool;
+  GstD3D12CommandAllocator *gst_ca = nullptr;
+  GstD3D12CommandListPool *cl_pool;
+  GstD3D12CommandList *gst_cl = nullptr;
+  GstD3D12CommandQueue *queue = nullptr;
+  guint64 fence_val = 0;
+
+  switch (command_type) {
+    case D3D12_COMMAND_LIST_TYPE_DIRECT:
+      queue = priv->direct_queue;
+      ca_pool = priv->direct_ca_pool;
+      cl_pool = priv->direct_cl_pool;
+      break;
+    case D3D12_COMMAND_LIST_TYPE_COPY:
+      queue = priv->copy_queue;
+      ca_pool = priv->copy_ca_pool;
+      cl_pool = priv->copy_cl_pool;
+      break;
+    default:
+      GST_ERROR_OBJECT (device, "Not supported command list type %d",
+          command_type);
+      return FALSE;
+  }
+
+  gst_d3d12_command_allocator_pool_acquire (ca_pool, &gst_ca);
+  if (!gst_ca) {
+    GST_ERROR_OBJECT (device, "Couldn't acquire command allocator");
+    return FALSE;
+  }
+
+  ComPtr < ID3D12CommandAllocator > ca;
+  gst_d3d12_command_allocator_get_handle (gst_ca, &ca);
+
+  gst_d3d12_command_list_pool_acquire (cl_pool, ca.Get (), &gst_cl);
+
+  if (!gst_cl) {
+    GST_ERROR_OBJECT (device, "Couldn't acquire command list");
+    gst_clear_d3d12_command_allocator (&gst_ca);
+    return FALSE;
+  }
+
+  ComPtr < ID3D12CommandList > cl_base;
+  ComPtr < ID3D12GraphicsCommandList > cl;
+
+  gst_d3d12_command_list_get_handle (gst_cl, &cl_base);
+  cl_base.As (&cl);
+
+  for (guint i = 0; i < num_args; i++) {
+    const auto arg = argsi;
+    cl->CopyTextureRegion (&arg.dst, arg.dst_x, arg.dst_y, arg.dst_z,
+        &arg.src, arg.src_box);
+  }
+
+  hr = cl->Close ();
+  if (!gst_d3d12_result (hr, device)) {
+    GST_ERROR_OBJECT (device, "Couldn't close command list");
+    gst_clear_d3d12_command_list (&gst_cl);
+    gst_clear_d3d12_command_allocator (&gst_ca);
+    return FALSE;
+  }
+
+  ID3D12CommandList *cmd_list = { cl.Get () };
+  hr = gst_d3d12_command_queue_execute_command_lists (queue,
+      1, cmd_list, &fence_val);
+  auto ret = gst_d3d12_result (hr, device);
+
+  /* We can release command list since command list pool will hold it */
+  gst_d3d12_command_list_unref (gst_cl);
+
+  if (ret) {
+    gst_d3d12_command_queue_set_notify (queue, fence_val, gst_ca,
+        (GDestroyNotify) gst_d3d12_command_allocator_unref);
+  } else {
+    gst_d3d12_command_allocator_unref (gst_ca);
+  }
+
+  if (fence_value)
+    *fence_value = fence_val;
+
+  return ret;
+}
+
+static inline GstDebugLevel
+d3d12_message_severity_to_gst (D3D12_MESSAGE_SEVERITY level)
+{
+  switch (level) {
+    case D3D12_MESSAGE_SEVERITY_CORRUPTION:
+    case D3D12_MESSAGE_SEVERITY_ERROR:
+      return GST_LEVEL_ERROR;
+    case D3D12_MESSAGE_SEVERITY_WARNING:
+      return GST_LEVEL_WARNING;
+    case D3D12_MESSAGE_SEVERITY_INFO:
+      return GST_LEVEL_INFO;
+    case D3D12_MESSAGE_SEVERITY_MESSAGE:
+      return GST_LEVEL_DEBUG;
+    default:
+      break;
+  }
+
+  return GST_LEVEL_LOG;
+}
+
+void
+gst_d3d12_device_d3d12_debug (GstD3D12Device * device, const gchar * file,
+    const gchar * function, gint line)
+{
+  g_return_if_fail (GST_IS_D3D12_DEVICE (device));
+
+  if (!device->priv->info_queue)
+    return;
+
+  GstD3D12DevicePrivate *priv = device->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->extern_lock);
+  ID3D12InfoQueue *info_queue = priv->info_queue.Get ();
+  UINT64 num_msg = info_queue->GetNumStoredMessages ();
+  for (guint64 i = 0; i < num_msg; i++) {
+    HRESULT hr;
+    SIZE_T msg_len;
+    D3D12_MESSAGE *msg;
+    GstDebugLevel msg_level;
+    GstDebugLevel selected_level;
+
+    hr = info_queue->GetMessage (i, nullptr, &msg_len);
+    if (FAILED (hr) || msg_len == 0)
+      continue;
+
+    msg = (D3D12_MESSAGE *) g_malloc0 (msg_len);
+    hr = info_queue->GetMessage (i, msg, &msg_len);
+    if (FAILED (hr) || msg_len == 0) {
+      g_free (msg);
+      continue;
+    }
+
+    msg_level = d3d12_message_severity_to_gst (msg->Severity);
+    if (msg->Category == D3D12_MESSAGE_CATEGORY_STATE_CREATION &&
+        msg_level > GST_LEVEL_ERROR) {
+      /* Do not warn for live object, since there would be live object
+       * when ReportLiveDeviceObjects was called */
+      selected_level = GST_LEVEL_INFO;
+    } else {
+      selected_level = msg_level;
+    }
+
+    gst_debug_log (gst_d3d12_sdk_debug, selected_level, file, function, line,
+        G_OBJECT (device), "D3D12InfoQueue: %s", msg->pDescription);
+    g_free (msg);
+  }
+
+  info_queue->ClearStoredMessages ();
+}
+
+void
+gst_d3d12_device_clear_yuv_texture (GstD3D12Device * device, GstMemory * mem)
+{
+  auto priv = device->priv;
+  auto dmem = GST_D3D12_MEMORY_CAST (mem);
+  ComPtr < ID3D12DescriptorHeap > heap;
+
+  auto resource = gst_d3d12_memory_get_resource_handle (dmem);
+  auto desc = resource->GetDesc ();
+
+  if (desc.Format != DXGI_FORMAT_NV12 && desc.Format != DXGI_FORMAT_P010 &&
+      desc.Format != DXGI_FORMAT_P016) {
+    return;
+  }
+
+  gst_d3d12_memory_get_render_target_view_heap (dmem, &heap);
+  if (!heap)
+    return;
+
+  D3D12_RECT rect = { };
+  if (!gst_d3d12_memory_get_plane_rectangle (dmem, 1, &rect))
+    return;
+
+  GstD3D12CommandAllocator *gst_ca = nullptr;
+  gst_d3d12_command_allocator_pool_acquire (priv->direct_ca_pool, &gst_ca);
+  if (!gst_ca)
+    return;
+
+  ComPtr < ID3D12CommandAllocator > ca;
+  gst_d3d12_command_allocator_get_handle (gst_ca, &ca);
+
+  GstD3D12CommandList *gst_cl = nullptr;
+  gst_d3d12_command_list_pool_acquire (priv->direct_cl_pool,
+      ca.Get (), &gst_cl);
+  if (!gst_cl) {
+    gst_d3d12_command_allocator_unref (gst_ca);
+    return;
+  }
+
+  ComPtr < ID3D12CommandList > cl_base;
+  ComPtr < ID3D12GraphicsCommandList > cl;
+
+  gst_d3d12_command_list_get_handle (gst_cl, &cl_base);
+  cl_base.As (&cl);
+
+  auto rtv_handle =
+      CD3DX12_CPU_DESCRIPTOR_HANDLE (heap->GetCPUDescriptorHandleForHeapStart
+      (),
+      priv->rtv_inc_size);
+
+  const FLOAT clear_color4 = { 0.5f, 0.5f, 0.5f, 1.0f };
+  cl->ClearRenderTargetView (rtv_handle, clear_color, 1, &rect);
+
+  auto hr = cl->Close ();
+  if (!gst_d3d12_result (hr, device)) {
+    gst_clear_d3d12_command_list (&gst_cl);
+    gst_clear_d3d12_command_allocator (&gst_ca);
+    return;
+  }
+
+  ID3D12CommandList *cmd_list = { cl.Get () };
+  guint64 fence_val = 0;
+  hr = gst_d3d12_command_queue_execute_command_lists (priv->direct_queue,
+      1, cmd_list, &fence_val);
+  auto ret = gst_d3d12_result (hr, device);
+  gst_d3d12_command_list_unref (gst_cl);
+
+  if (ret) {
+    gst_d3d12_command_queue_set_notify (priv->direct_queue, fence_val,
+        gst_ca, (GDestroyNotify) gst_d3d12_command_allocator_unref);
+    dmem->fence_value = fence_val;
+  } else {
+    gst_d3d12_command_allocator_unref (gst_ca);
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12device.h Added

@@ -0,0 +1,123 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+#include "gstd3d12commandqueue.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_DEVICE             (gst_d3d12_device_get_type())
+#define GST_D3D12_DEVICE(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_D3D12_DEVICE,GstD3D12Device))
+#define GST_D3D12_DEVICE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_D3D12_DEVICE,GstD3D12DeviceClass))
+#define GST_D3D12_DEVICE_GET_CLASS(obj)   (GST_D3D12_DEVICE_CLASS(G_OBJECT_GET_CLASS(obj)))
+#define GST_IS_D3D12_DEVICE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_D3D12_DEVICE))
+#define GST_IS_D3D12_DEVICE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_D3D12_DEVICE))
+#define GST_D3D12_DEVICE_CAST(obj)        ((GstD3D12Device*)(obj))
+
+#define GST_D3D12_DEVICE_HANDLE_CONTEXT_TYPE "gst.d3d12.device.handle"
+
+struct _GstD3D12Device
+{
+  GstObject parent;
+
+  /*< private >*/
+  GstD3D12DevicePrivate *priv;
+  gpointer _gst_reservedGST_PADDING;
+};
+
+struct _GstD3D12DeviceClass
+{
+  GstObjectClass parent_class;
+
+  /*< private >*/
+  gpointer _gst_reservedGST_PADDING;
+};
+
+typedef struct _GstD3D12CopyTextureRegionArgs
+{
+  D3D12_TEXTURE_COPY_LOCATION dst;
+  guint dst_x;
+  guint dst_y;
+  guint dst_z;
+  D3D12_TEXTURE_COPY_LOCATION src;
+  const D3D12_BOX * src_box;
+} GstD3D12CopyTextureRegionArgs;
+
+GType                   gst_d3d12_device_get_type                 (void);
+
+GstD3D12Device *        gst_d3d12_device_new                      (guint adapter_index);
+
+GstD3D12Device *        gst_d3d12_device_new_for_adapter_luid     (gint64 adapter_luid);
+
+ID3D12Device *          gst_d3d12_device_get_device_handle        (GstD3D12Device * device);
+
+IDXGIAdapter1 *         gst_d3d12_device_get_adapter_handle       (GstD3D12Device * device);
+
+IDXGIFactory2 *         gst_d3d12_device_get_factory_handle       (GstD3D12Device * device);
+
+gboolean                gst_d3d12_device_get_d3d11on12_device     (GstD3D12Device * device,
+                                                                   IUnknown ** d3d11on12);
+
+void                    gst_d3d12_device_lock                     (GstD3D12Device * device);
+
+void                    gst_d3d12_device_unlock                   (GstD3D12Device * device);
+
+gboolean                gst_d3d12_device_get_format               (GstD3D12Device * device,
+                                                                   GstVideoFormat format,
+                                                                   GstD3D12Format * device_format);
+
+GstD3D12CommandQueue *  gst_d3d12_device_get_command_queue        (GstD3D12Device * device,
+                                                                   D3D12_COMMAND_LIST_TYPE queue_type);
+
+gboolean                gst_d3d12_device_execute_command_lists    (GstD3D12Device * device,
+                                                                   D3D12_COMMAND_LIST_TYPE queue_type,
+                                                                   guint num_command_lists,
+                                                                   ID3D12CommandList ** command_lists,
+                                                                   guint64 * fence_value);
+
+guint64                 gst_d3d12_device_get_completed_value      (GstD3D12Device * device,
+                                                                   D3D12_COMMAND_LIST_TYPE queue_type);
+
+gboolean                gst_d3d12_device_set_fence_notify         (GstD3D12Device * device,
+                                                                   D3D12_COMMAND_LIST_TYPE queue_type,
+                                                                   guint64 fence_value,
+                                                                   GstD3D12FenceData * fence_data);
+
+gboolean                gst_d3d12_device_fence_wait               (GstD3D12Device * device,
+                                                                   D3D12_COMMAND_LIST_TYPE queue_type,
+                                                                   guint64 fence_value,
+                                                                   HANDLE event_handle);
+
+gboolean                gst_d3d12_device_copy_texture_region      (GstD3D12Device * device,
+                                                                   guint num_args,
+                                                                   const GstD3D12CopyTextureRegionArgs * args,
+                                                                   D3D12_COMMAND_LIST_TYPE command_type,
+                                                                   guint64 * fence_value);
+
+void                    gst_d3d12_device_d3d12_debug              (GstD3D12Device * device,
+                                                                   const gchar * file,
+                                                                   const gchar * function,
+                                                                   gint line);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12download.cpp Added

@@ -0,0 +1,322 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstd3d12download.h"
+#include "gstd3d12pluginutils.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_download_debug);
+#define GST_CAT_DEFAULT gst_d3d12_download_debug
+
+static GstStaticPadTemplate sink_template =
+    GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE (GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS)));
+
+static GstStaticPadTemplate src_template =
+    GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE (GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS)));
+
+struct _GstD3D12Download
+{
+  GstD3D12BaseFilter parent;
+};
+
+#define gst_d3d12_download_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12Download, gst_d3d12_download,
+    GST_TYPE_D3D12_BASE_FILTER);
+
+static GstCaps *gst_d3d12_download_transform_caps (GstBaseTransform * trans,
+    GstPadDirection direction, GstCaps * caps, GstCaps * filter);
+static gboolean gst_d3d12_download_propose_allocation (GstBaseTransform * trans,
+    GstQuery * decide_query, GstQuery * query);
+static gboolean gst_d3d12_download_decide_allocation (GstBaseTransform * trans,
+    GstQuery * query);
+static GstFlowReturn gst_d3d12_download_transform (GstBaseTransform * trans,
+    GstBuffer * inbuf, GstBuffer * outbuf);
+
+static void
+gst_d3d12_download_class_init (GstD3D12DownloadClass * klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
+
+  gst_element_class_add_static_pad_template (element_class, &sink_template);
+  gst_element_class_add_static_pad_template (element_class, &src_template);
+
+  gst_element_class_set_static_metadata (element_class,
+      "Direct3D12 Downloader", "Filter/Video",
+      "Downloads Direct3D12 texture memory into system memory",
+      "Seungha Yang <seungha@centricular.com>");
+
+  trans_class->passthrough_on_same_caps = TRUE;
+
+  trans_class->transform_caps =
+      GST_DEBUG_FUNCPTR (gst_d3d12_download_transform_caps);
+  trans_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_download_propose_allocation);
+  trans_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_download_decide_allocation);
+  trans_class->transform = GST_DEBUG_FUNCPTR (gst_d3d12_download_transform);
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_download_debug,
+      "d3d12download", 0, "d3d12download Element");
+}
+
+static void
+gst_d3d12_download_init (GstD3D12Download * self)
+{
+}
+
+static GstCaps *
+_set_caps_features (const GstCaps * caps, const gchar * feature_name)
+{
+  GstCaps *tmp = gst_caps_copy (caps);
+  guint n = gst_caps_get_size (tmp);
+  guint i = 0;
+
+  for (i = 0; i < n; i++) {
+    gst_caps_set_features (tmp, i,
+        gst_caps_features_from_string (feature_name));
+  }
+
+  return tmp;
+}
+
+static GstCaps *
+gst_d3d12_download_transform_caps (GstBaseTransform * trans,
+    GstPadDirection direction, GstCaps * caps, GstCaps * filter)
+{
+  GstCaps *result, *tmp;
+
+  GST_DEBUG_OBJECT (trans,
+      "Transforming caps %" GST_PTR_FORMAT " in direction %s", caps,
+      (direction == GST_PAD_SINK) ? "sink" : "src");
+
+  if (direction == GST_PAD_SINK) {
+    tmp = _set_caps_features (caps, GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
+    tmp = gst_caps_merge (gst_caps_ref (caps), tmp);
+  } else {
+    GstCaps *newcaps;
+    tmp = gst_caps_ref (caps);
+
+    newcaps = _set_caps_features (caps, GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY);
+    tmp = gst_caps_merge (tmp, newcaps);
+  }
+
+  if (filter) {
+    result = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (tmp);
+  } else {
+    result = tmp;
+  }
+
+  GST_DEBUG_OBJECT (trans, "returning caps: %" GST_PTR_FORMAT, result);
+
+  return result;
+}
+
+static gboolean
+gst_d3d12_download_propose_allocation (GstBaseTransform * trans,
+    GstQuery * decide_query, GstQuery * query)
+{
+  GstD3D12BaseFilter *filter = GST_D3D12_BASE_FILTER (trans);
+  GstVideoInfo info;
+  GstBufferPool *pool;
+  GstCaps *caps;
+  guint size;
+  gboolean is_d3d12 = FALSE;
+
+  if (!GST_BASE_TRANSFORM_CLASS (parent_class)->propose_allocation (trans,
+          decide_query, query))
+    return FALSE;
+
+  /* passthrough, we're done */
+  if (!decide_query)
+    return TRUE;
+
+  gst_query_parse_allocation (query, &caps, nullptr);
+
+  if (!caps) {
+    GST_WARNING_OBJECT (filter, "Allocation query without caps");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps))
+    return FALSE;
+
+  if (gst_query_get_n_allocation_pools (query) == 0) {
+    GstCapsFeatures *features;
+    GstStructure *config;
+
+    features = gst_caps_get_features (caps, 0);
+
+    if (features && gst_caps_features_contains (features,
+            GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY)) {
+      GST_DEBUG_OBJECT (filter, "upstream support d3d12 memory");
+      pool = gst_d3d12_buffer_pool_new (filter->device);
+      is_d3d12 = TRUE;
+    } else {
+      pool = gst_video_buffer_pool_new ();
+    }
+
+    config = gst_buffer_pool_get_config (pool);
+
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
+    if (!is_d3d12) {
+      gst_buffer_pool_config_add_option (config,
+          GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+    }
+
+    size = GST_VIDEO_INFO_SIZE (&info);
+    gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
+
+    if (!gst_buffer_pool_set_config (pool, config)) {
+      GST_ERROR_OBJECT (filter, "Bufferpool config failed");
+      gst_object_unref (pool);
+      return FALSE;
+    }
+
+    /* d3d12 buffer pool will update buffer size based on allocated texture,
+     * get size from config again */
+    config = gst_buffer_pool_get_config (pool);
+    gst_buffer_pool_config_get_params (config,
+        nullptr, &size, nullptr, nullptr);
+    gst_structure_free (config);
+
+    gst_query_add_allocation_pool (query, pool, size, 0, 0);
+    gst_object_unref (pool);
+  }
+
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, nullptr);
+  gst_query_add_allocation_meta (query,
+      GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE, nullptr);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_download_decide_allocation (GstBaseTransform * trans,
+    GstQuery * query)
+{
+  GstBufferPool *pool = nullptr;
+  GstStructure *config;
+  guint min, max, size;
+  gboolean update_pool;
+  GstCaps *outcaps = nullptr;
+
+  gst_query_parse_allocation (query, &outcaps, nullptr);
+
+  if (!outcaps) {
+    GST_WARNING_OBJECT (trans, "Allocation query without caps");
+    return FALSE;
+  }
+
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+
+    update_pool = TRUE;
+  } else {
+    GstVideoInfo vinfo;
+
+    gst_video_info_from_caps (&vinfo, outcaps);
+    size = vinfo.size;
+    min = max = 0;
+    update_pool = FALSE;
+  }
+
+  if (!pool) {
+    pool = gst_video_buffer_pool_new ();
+  }
+
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+  gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
+  gst_buffer_pool_set_config (pool, config);
+
+  /* d3d12 buffer pool will update buffer size based on allocated texture,
+   * get size from config again */
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  if (update_pool)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+
+  gst_object_unref (pool);
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->decide_allocation (trans,
+      query);
+}
+
+static GstFlowReturn
+gst_d3d12_download_transform (GstBaseTransform * trans, GstBuffer * inbuf,
+    GstBuffer * outbuf)
+{
+  GstD3D12BaseFilter *filter = GST_D3D12_BASE_FILTER (trans);
+  GstVideoFrame in_frame, out_frame;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  if (!gst_video_frame_map (&in_frame, &filter->in_info, inbuf, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (filter, "Couldn't map input frame");
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_video_frame_map (&out_frame,
+          &filter->out_info, outbuf, GST_MAP_WRITE)) {
+    GST_ERROR_OBJECT (filter, "Couldn't map output frame");
+    gst_video_frame_unmap (&in_frame);
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_video_frame_copy (&out_frame, &in_frame)) {
+    GST_ERROR_OBJECT (filter, "Copy failed");
+    ret = GST_FLOW_ERROR;
+  }
+
+  gst_video_frame_unmap (&out_frame);
+  gst_video_frame_unmap (&in_frame);
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12download.h Added

@@ -0,0 +1,31 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstd3d12basefilter.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_DOWNLOAD (gst_d3d12_download_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12Download,
+    gst_d3d12_download, GST, D3D12_DOWNLOAD, GstD3D12BaseFilter);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12dpbstorage.cpp Added

@@ -0,0 +1,333 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12dpbstorage.h"
+#include <wrl.h>
+#include <vector>
+#include <directx/d3dx12.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_dpb_storage_debug);
+#define GST_CAT_DEFAULT gst_d3d12_dpb_storage_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+struct OwnedTexture
+{
+  ComPtr<ID3D12Resource> texture;
+  guint subresource = 0;
+  gboolean is_free = TRUE;
+};
+
+struct GstD3D12DpbStoragePrivate
+{
+  gboolean array_of_textures;
+  DXGI_FORMAT format;
+  guint width;
+  guint height;
+  D3D12_RESOURCE_FLAGS resource_flags;
+  std::vector<ID3D12Resource *> dpb;
+  std::vector<guint> dpb_subresource;
+  std::vector<OwnedTexture> pool;
+  ComPtr<ID3D12Resource> base_texture;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12DpbStorage
+{
+  GstObject parent;
+
+  GstD3D12Device *device;
+  GstD3D12DpbStoragePrivate *priv;
+};
+
+static void gst_d3d12_dpb_storage_finalize (GObject * object);
+
+#define gst_d3d12_dpb_storage_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12DpbStorage, gst_d3d12_dpb_storage, GST_TYPE_OBJECT);
+
+static void
+gst_d3d12_dpb_storage_class_init (GstD3D12DpbStorageClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_dpb_storage_finalize;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_dpb_storage_debug, "d3d12dpbstorage", 0,
+      "d3d12dpbstorage");
+}
+
+static void
+gst_d3d12_dpb_storage_init (GstD3D12DpbStorage * self)
+{
+  self->priv = new GstD3D12DpbStoragePrivate ();
+}
+
+static void
+gst_d3d12_dpb_storage_finalize (GObject * object)
+{
+  auto self = GST_D3D12_DPB_STORAGE (object);
+
+  delete self->priv;
+  gst_clear_object (&self->device);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static HRESULT
+allocate_texture (ID3D12Device * device, DXGI_FORMAT format, guint width,
+    guint height, D3D12_RESOURCE_FLAGS resource_flags, guint array_size,
+    ID3D12Resource ** texture)
+{
+  D3D12_HEAP_PROPERTIES prop =
+      CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+  D3D12_RESOURCE_DESC desc = CD3DX12_RESOURCE_DESC::Tex2D (format,
+      width, height, array_size, 1, 1, 0, resource_flags);
+
+  return device->CreateCommittedResource (&prop, D3D12_HEAP_FLAG_NONE,
+      &desc, D3D12_RESOURCE_STATE_COMMON, nullptr, IID_PPV_ARGS (texture));
+}
+
+gboolean
+gst_d3d12_dpb_storage_acquire_frame (GstD3D12DpbStorage * storage,
+    D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE * frame)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DPB_STORAGE (storage), FALSE);
+  g_return_val_if_fail (frame, FALSE);
+
+  auto priv = storage->priv;
+
+  for (size_t i = 0; i < priv->pool.size (); i++) {
+    auto & it = priv->pooli;
+    if (it.is_free) {
+      frame->pReconstructedPicture = it.texture.Get ();
+      frame->ReconstructedPictureSubresource = it.subresource;
+      it.is_free = FALSE;
+      return TRUE;
+    }
+  }
+
+  if (!priv->array_of_textures) {
+    GST_ERROR_OBJECT (storage, "No available free texture");
+    frame->pReconstructedPicture = nullptr;
+    frame->ReconstructedPictureSubresource = 0;
+    return FALSE;
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (storage->device);
+
+  OwnedTexture new_texture;
+  new_texture.is_free = FALSE;
+  HRESULT hr = allocate_texture (device, priv->format, priv->width,
+      priv->height, priv->resource_flags, 1, &new_texture.texture);
+
+  if (!gst_d3d12_result (hr, storage->device)) {
+    GST_ERROR_OBJECT (storage, "Couldn't allocate texture");
+    frame->pReconstructedPicture = nullptr;
+    frame->ReconstructedPictureSubresource = 0;
+    return FALSE;
+  }
+
+  frame->pReconstructedPicture = new_texture.texture.Get ();
+  frame->ReconstructedPictureSubresource = 0;
+
+  priv->pool.push_back (new_texture);
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_dpb_storage_add_frame (GstD3D12DpbStorage * storage,
+    D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE * frame)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DPB_STORAGE (storage), FALSE);
+  g_return_val_if_fail (frame, FALSE);
+  g_return_val_if_fail (frame->pReconstructedPicture, FALSE);
+
+  auto priv = storage->priv;
+
+  priv->dpb.insert (priv->dpb.begin (), frame->pReconstructedPicture);
+  priv->dpb_subresource.insert (priv->dpb_subresource.begin (),
+      frame->ReconstructedPictureSubresource);
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_dpb_storage_get_reference_frames (GstD3D12DpbStorage * storage,
+    D3D12_VIDEO_ENCODE_REFERENCE_FRAMES * ref_frames)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DPB_STORAGE (storage), FALSE);
+  g_return_val_if_fail (ref_frames, FALSE);
+
+  auto priv = storage->priv;
+
+  ref_frames->NumTexture2Ds = priv->dpb.size ();
+  ref_frames->ppTexture2Ds = priv->dpb.data ();
+  if (priv->array_of_textures)
+    ref_frames->pSubresources = nullptr;
+  else
+    ref_frames->pSubresources = priv->dpb_subresource.data ();
+
+  return TRUE;
+}
+
+static void
+gst_d3d12_dpb_storage_release_frame (GstD3D12DpbStorage * self,
+    ID3D12Resource * texture, guint subresource)
+{
+  auto priv = self->priv;
+
+  if (priv->array_of_textures) {
+    for (size_t i = 0; i < priv->pool.size (); i++) {
+      auto & it = priv->pooli;
+      if (texture == it.texture.Get () && it.subresource == subresource) {
+        it.is_free = TRUE;
+        return;
+      }
+    }
+
+    g_assert_not_reached ();
+  } else {
+    g_return_if_fail (subresource < priv->pool.size ());
+
+    priv->poolsubresource.is_free = TRUE;
+  }
+}
+
+gboolean
+gst_d3d12_dpb_storage_remove_oldest_frame (GstD3D12DpbStorage * storage)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DPB_STORAGE (storage), FALSE);
+
+  auto priv = storage->priv;
+
+  if (priv->dpb.empty ()) {
+    GST_WARNING_OBJECT (storage, "DPB is empty now");
+    return FALSE;
+  }
+
+  gst_d3d12_dpb_storage_release_frame (storage,
+      priv->dpb.back (), priv->dpb_subresource.back ());
+
+  priv->dpb.pop_back ();
+  priv->dpb_subresource.pop_back ();
+
+  return TRUE;
+}
+
+void
+gst_d3d12_dpb_storage_clear_dpb (GstD3D12DpbStorage * storage)
+{
+  g_return_if_fail (GST_IS_D3D12_DPB_STORAGE (storage));
+
+  auto priv = storage->priv;
+
+  g_assert (priv->dpb.size () == priv->dpb_subresource.size ());
+
+  for (size_t i = 0; i < priv->dpb.size (); i++) {
+    gst_d3d12_dpb_storage_release_frame (storage,
+        priv->dpbi, priv->dpb_subresourcei);
+  }
+
+  priv->dpb.clear ();
+  priv->dpb_subresource.clear ();
+}
+
+guint
+gst_d3d12_dpb_storage_get_dpb_size (GstD3D12DpbStorage * storage)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DPB_STORAGE (storage), 0);
+
+  auto priv = storage->priv;
+
+  return priv->dpb.size ();
+}
+
+guint
+gst_d3d12_dpb_storage_get_pool_size (GstD3D12DpbStorage * storage)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DPB_STORAGE (storage), 0);
+
+  auto priv = storage->priv;
+
+  return priv->pool.size ();
+}
+
+GstD3D12DpbStorage *
+gst_d3d12_dpb_storage_new (GstD3D12Device * device, guint dpb_size,
+    gboolean use_array_of_textures, DXGI_FORMAT format, guint width,
+    guint height, D3D12_RESOURCE_FLAGS resource_flags)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+
+  auto self = (GstD3D12DpbStorage *)
+      g_object_new (GST_TYPE_D3D12_DPB_STORAGE, nullptr);
+  gst_object_ref_sink (self);
+
+  self->device = (GstD3D12Device *) gst_object_ref (device);
+  auto priv = self->priv;
+  auto device_handle = gst_d3d12_device_get_device_handle (device);
+  HRESULT hr;
+
+  if (use_array_of_textures) {
+    for (guint i = 0; i < dpb_size; i++) {
+      OwnedTexture texture;
+
+      hr = allocate_texture (device_handle,
+          format, width, height, resource_flags, 1, &texture.texture);
+      if (!gst_d3d12_result (hr, device)) {
+        GST_ERROR_OBJECT (self, "Couldn't allocate initial texture");
+        gst_object_unref (self);
+        return nullptr;
+      }
+
+      priv->pool.push_back (texture);
+    }
+  } else {
+    hr = allocate_texture (device_handle,
+        format, width, height, resource_flags, dpb_size, &priv->base_texture);
+
+    if (!gst_d3d12_result (hr, device)) {
+      GST_ERROR_OBJECT (self, "Couldn't allocate initial texture");
+      gst_object_unref (self);
+      return nullptr;
+    }
+
+    priv->pool.resize (dpb_size);
+
+    for (guint i = 0; i < dpb_size; i++) {
+      priv->pooli.texture = priv->base_texture;
+      priv->pooli.subresource = i;
+    }
+  }
+
+  priv->width = width;
+  priv->height = height;
+  priv->resource_flags = resource_flags;
+  priv->array_of_textures = use_array_of_textures;
+  priv->dpb.reserve (dpb_size);
+  priv->dpb_subresource.reserve (dpb_size);
+
+  return self;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12dpbstorage.h Added

@@ -0,0 +1,57 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_DPB_STORAGE (gst_d3d12_dpb_storage_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12DpbStorage, gst_d3d12_dpb_storage,
+    GST, D3D12_DPB_STORAGE, GstObject);
+
+GstD3D12DpbStorage * gst_d3d12_dpb_storage_new (GstD3D12Device * device,
+                                                guint dpb_size,
+                                                gboolean use_array_of_textures,
+                                                DXGI_FORMAT format,
+                                                guint width,
+                                                guint height,
+                                                D3D12_RESOURCE_FLAGS resource_flags);
+
+gboolean gst_d3d12_dpb_storage_acquire_frame (GstD3D12DpbStorage * storage,
+                                              D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE * frame);
+
+gboolean gst_d3d12_dpb_storage_add_frame     (GstD3D12DpbStorage * storage,
+                                              D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE * frame);
+
+gboolean gst_d3d12_dpb_storage_get_reference_frames  (GstD3D12DpbStorage * storage,
+                                                      D3D12_VIDEO_ENCODE_REFERENCE_FRAMES * ref_frames);
+
+gboolean gst_d3d12_dpb_storage_remove_oldest_frame   (GstD3D12DpbStorage * storage);
+
+void     gst_d3d12_dpb_storage_clear_dpb     (GstD3D12DpbStorage * storage);
+
+guint    gst_d3d12_dpb_storage_get_dpb_size  (GstD3D12DpbStorage * storage);
+
+guint    gst_d3d12_dpb_storage_get_pool_size (GstD3D12DpbStorage * storage);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12dxgicapture.cpp Added

@@ -0,0 +1,1776 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12dxgicapture.h"
+#include "gstd3d12pluginutils.h"
+#include <d3d11_3.h>
+#include <directx/d3dx12.h>
+#include <string.h>
+#include <mutex>
+#include <vector>
+#include <memory>
+#include <future>
+#include <wrl.h>
+#include "PSMain_sample.h"
+#include "VSMain_coord.h"
+
+#define _XM_NO_INTRINSICS_
+#include <DirectXMath.h>
+
+GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_screen_capture_debug);
+#define GST_CAT_DEFAULT gst_d3d12_screen_capture_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+using namespace DirectX;
+
+/* List of GstD3D12DxgiCapture weakref */
+static std::mutex g_g_dupl_list_lock;
+static GList *g_dupl_list = nullptr;
+
+/* Below implementation were taken from Microsoft sample
+ * https://github.com/microsoft/Windows-classic-samples/tree/master/Samples/DXGIDesktopDuplication
+ */
+
+/* List of expected error cases */
+/* These are the errors we expect from general Dxgi API due to a transition */
+static HRESULT SystemTransitionsExpectedErrors = {
+  DXGI_ERROR_DEVICE_REMOVED,
+  DXGI_ERROR_ACCESS_LOST,
+  static_cast<HRESULT>(WAIT_ABANDONED),
+  S_OK
+};
+
+/* These are the errors we expect from IDXGIOutput1::DuplicateOutput
+ * due to a transition */
+static HRESULT CreateDuplicationExpectedErrors = {
+  DXGI_ERROR_DEVICE_REMOVED,
+  static_cast<HRESULT>(E_ACCESSDENIED),
+  DXGI_ERROR_SESSION_DISCONNECTED,
+  S_OK
+};
+
+/* These are the errors we expect from IDXGIOutputDuplication methods
+ * due to a transition */
+static HRESULT FrameInfoExpectedErrors = {
+  DXGI_ERROR_DEVICE_REMOVED,
+  DXGI_ERROR_ACCESS_LOST,
+  S_OK
+};
+
+static GstFlowReturn
+flow_return_from_hr (ID3D11Device * device,
+    HRESULT hr, HRESULT * expected_errors = nullptr)
+{
+  HRESULT translated_hr = hr;
+
+  /* On an error check if the DX device is lost */
+  if (device) {
+    HRESULT remove_reason = device->GetDeviceRemovedReason ();
+
+    switch (remove_reason) {
+      case DXGI_ERROR_DEVICE_REMOVED:
+      case DXGI_ERROR_DEVICE_RESET:
+      case static_cast<HRESULT>(E_OUTOFMEMORY):
+        /* Our device has been stopped due to an external event on the GPU so
+         * map them all to device removed and continue processing the condition
+         */
+        translated_hr = DXGI_ERROR_DEVICE_REMOVED;
+        break;
+      case S_OK:
+        /* Device is not removed so use original error */
+        break;
+      default:
+        /* Device is removed but not a error we want to remap */
+        translated_hr = remove_reason;
+        break;
+    }
+  }
+
+  /* Check if this error was expected or not */
+  if (expected_errors) {
+    HRESULT* rst = expected_errors;
+
+    while (*rst != S_OK) {
+      if (*rst == translated_hr)
+        return GST_D3D12_SCREEN_CAPTURE_FLOW_EXPECTED_ERROR;
+
+      rst++;
+    }
+  }
+
+  return GST_FLOW_ERROR;
+}
+
+struct PtrInfo
+{
+  PtrInfo ()
+  {
+    LastTimeStamp.QuadPart = 0;
+    position_info.Visible = FALSE;
+  }
+
+  void buildMonochrom ()
+  {
+    width_ = shape_info.Width;
+    height_ = shape_info.Height / 2;
+    stride_ = width_ * 4;
+    UINT pstride = 4;
+    auto size = height_ * stride_;
+    texture_.resize (size);
+    xor_texture_.resize (size);
+
+    const BYTE black = { 0, 0, 0, 0xff };
+    const BYTE white = { 0xff, 0xff, 0xff, 0xff };
+    const BYTE transparent = { 0, 0, 0, 0 };
+
+    for (UINT row = 0; row < height_; row++) {
+      for (UINT col = 0; col < width_; col++) {
+        auto src_pos = (row * shape_info.Pitch) + (col / 8);
+        auto and_mask = (shape_buffersrc_pos >> (7 - (col % 8))) & 0x1;
+        auto xor_mask = (shape_buffersrc_pos + size >> (7 - (col % 8))) & 0x1;
+        auto dst_pos = (row * stride_) + (col * pstride);
+
+        if (and_mask) {
+          memcpy (texture_.data () + dst_pos,
+              transparent, sizeof (transparent));
+
+          if (xor_mask) {
+            memcpy (xor_texture_.data () + dst_pos, white, sizeof (white));
+          } else {
+            memcpy (xor_texture_.data () + dst_pos, transparent,
+                sizeof (transparent));
+          }
+        } else {
+          memcpy (texture_.data () + dst_pos, black, sizeof (black));
+          memcpy (xor_texture_.data () + dst_pos, transparent,
+                sizeof (transparent));
+        }
+      }
+    }
+  }
+
+  void buildMaskedColor ()
+  {
+    width_ = shape_info.Width;
+    height_ = shape_info.Height;
+    stride_ = shape_info.Pitch;
+
+    auto size = height_ * stride_;
+    UINT pstride = 4;
+    texture_.resize (size);
+    xor_texture_.resize (size);
+    memcpy (texture_.data (), shape_buffer.data (), size);
+    memcpy (xor_texture_.data (), shape_buffer.data (), size);
+
+    for (UINT row = 0; row < height_; row++) {
+      for (UINT col = 0; col < width_; col++) {
+        auto mask_pos = row * stride_ + col * pstride + 3;
+        texture_mask_pos = shape_buffermask_pos ? 0 : 0xff;
+        xor_texture_mask_pos = shape_buffermask_pos ? 0xff : 0;
+      }
+    }
+  }
+
+  void BuildTexture ()
+  {
+    texture_.clear ();
+    xor_texture_.clear ();
+    width_ = 0;
+    height_ = 0;
+    stride_ = 0;
+
+    switch (shape_info.Type) {
+      case DXGI_OUTDUPL_POINTER_SHAPE_TYPE_COLOR:
+      {
+        width_ = shape_info.Width;
+        height_ = shape_info.Height;
+        stride_ = shape_info.Pitch;
+
+        auto size = stride_ * height_;
+        texture_.resize (size);
+        memcpy (texture_.data (), shape_buffer.data (), size);
+        break;
+      }
+      case DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MONOCHROME:
+        buildMonochrom ();
+        break;
+      case DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MASKED_COLOR:
+        buildMaskedColor ();
+        break;
+      default:
+        GST_WARNING ("Unexpected shape type %u", shape_info.Type);
+        break;
+    }
+
+    token_++;
+  }
+
+  std::vector<BYTE> shape_buffer;
+  DXGI_OUTDUPL_POINTER_SHAPE_INFO shape_info;
+  DXGI_OUTDUPL_POINTER_POSITION position_info;
+  LARGE_INTEGER LastTimeStamp;
+
+  UINT width_ = 0;
+  UINT height_ = 0;
+  UINT stride_ = 0;
+  std::vector<BYTE> texture_;
+  std::vector<BYTE> xor_texture_;
+  UINT64 token_ = 0;
+};
+
+struct MoveRectData
+{
+  RECT src_rect;
+  RECT dst_rect;
+  D3D12_BOX box;
+};
+
+struct VERTEX
+{
+  XMFLOAT3 Pos;
+  XMFLOAT2 TexCoord;
+};
+
+class DesktopDupCtx
+{
+public:
+  DesktopDupCtx () {}
+
+  GstFlowReturn Init (HMONITOR monitor)
+  {
+    ComPtr<IDXGIAdapter1> adapter;
+    ComPtr<IDXGIOutput> output;
+    ComPtr<IDXGIOutput1> output1;
+
+    HRESULT hr = gst_d3d12_screen_capture_find_output_for_monitor (monitor,
+        &adapter, &output);
+    if (FAILED (hr)) {
+      GST_ERROR ("Couldn't get adapter and output for monitor");
+      return GST_FLOW_ERROR;
+    }
+
+    hr = output.As (&output1);
+    if (FAILED (hr)) {
+      GST_ERROR ("Couldn't get IDXGIOutput1 interface, hr 0x%x", (guint) hr);
+      return GST_FLOW_ERROR;
+    }
+
+    HDESK hdesk = OpenInputDesktop (0, FALSE, GENERIC_ALL);
+    if (hdesk) {
+      if (!SetThreadDesktop (hdesk)) {
+        GST_WARNING ("SetThreadDesktop() failed, error %lu", GetLastError());
+      }
+
+      CloseDesktop (hdesk);
+    } else {
+      GST_WARNING ("OpenInputDesktop() failed, error %lu", GetLastError());
+    }
+
+    static const D3D_FEATURE_LEVEL feature_levels = {
+      D3D_FEATURE_LEVEL_11_1,
+      D3D_FEATURE_LEVEL_11_0,
+      D3D_FEATURE_LEVEL_10_1,
+      D3D_FEATURE_LEVEL_10_0,
+    };
+
+    hr = D3D11CreateDevice (adapter.Get (), D3D_DRIVER_TYPE_UNKNOWN, nullptr,
+        D3D11_CREATE_DEVICE_BGRA_SUPPORT, feature_levels,
+        G_N_ELEMENTS (feature_levels), D3D11_SDK_VERSION, &device_, nullptr,
+        nullptr);
+    if (FAILED (hr)) {
+      hr = D3D11CreateDevice (adapter.Get (), D3D_DRIVER_TYPE_UNKNOWN, nullptr,
+          D3D11_CREATE_DEVICE_BGRA_SUPPORT, &feature_levels1,
+          G_N_ELEMENTS (feature_levels) - 1, D3D11_SDK_VERSION, &device_,
+          nullptr, nullptr);
+    }
+
+    if (FAILED (hr)) {
+      GST_ERROR ("Couldn't create d3d11 device");
+      return GST_FLOW_ERROR;
+    }
+
+    /* FIXME: Use DuplicateOutput1 to avoid potentail color conversion */
+    hr = output1->DuplicateOutput(device_.Get(), &dupl_);
+    if (FAILED (hr)) {
+      if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) {
+        GST_ERROR ("Hit the max allowed number of Desktop Duplication session");
+        return GST_FLOW_ERROR;
+      }
+
+      /* Seems to be one limitation of Desktop Duplication API design
+       * See
+       * https://docs.microsoft.com/en-US/troubleshoot/windows-client/shell-experience/error-when-dda-capable-app-is-against-gpu
+       */
+      if (hr == DXGI_ERROR_UNSUPPORTED) {
+        GST_WARNING ("IDXGIOutput1::DuplicateOutput returned "
+            "DXGI_ERROR_UNSUPPORTED, possiblely application is run against a "
+            "discrete GPU");
+        return GST_D3D12_SCREEN_CAPTURE_FLOW_UNSUPPORTED;
+      }
+
+      return flow_return_from_hr (device_.Get(), hr,
+          CreateDuplicationExpectedErrors);
+    }
+
+    dupl_->GetDesc (&output_desc_);
+
+    return GST_FLOW_OK;
+  }
+
+  void ReleaseFrame ()
+  {
+    if (acquired_frame_) {
+      acquired_frame_ = nullptr;
+      dupl_->ReleaseFrame ();
+    }
+  }
+
+  GstFlowReturn AcquireNextFrame (IDXGIResource ** resource)
+  {
+    HRESULT hr;
+
+    move_rect_.clear ();
+    dirty_rect_.clear ();
+    dirty_vertex_.clear ();
+
+    if (acquired_frame_) {
+      acquired_frame_ = nullptr;
+      dupl_->ReleaseFrame ();
+    }
+
+    hr = dupl_->AcquireNextFrame(0, &frame_info_, &acquired_frame_);
+    if (hr == DXGI_ERROR_WAIT_TIMEOUT)
+      return GST_FLOW_OK;
+
+    if (FAILED (hr)) {
+      GST_WARNING ("AcquireNextFrame failed with 0x%x", (guint) hr);
+      return flow_return_from_hr (device_.Get (), hr, FrameInfoExpectedErrors);
+    }
+
+    metadata_buffer_.resize (frame_info_.TotalMetadataBufferSize);
+    if (frame_info_.TotalMetadataBufferSize > 0) {
+      UINT buf_size = frame_info_.TotalMetadataBufferSize;
+      hr = dupl_->GetFrameMoveRects (buf_size,
+         (DXGI_OUTDUPL_MOVE_RECT *) metadata_buffer_.data (), &buf_size);
+      if (FAILED (hr)) {
+        GST_ERROR ("Couldn't get move rect, hr: 0x%x", (guint) hr);
+        return flow_return_from_hr (device_.Get (),
+            hr, FrameInfoExpectedErrors);
+      }
+
+      auto move_count = buf_size / sizeof (DXGI_OUTDUPL_MOVE_RECT);
+      buildMoveRects (move_count);
+
+      auto dirty_rects = metadata_buffer_.data () + buf_size;
+      buf_size = frame_info_.TotalMetadataBufferSize - buf_size;
+
+      hr = dupl_->GetFrameDirtyRects (buf_size, (RECT *) dirty_rects,
+          &buf_size);
+      if (FAILED (hr)) {
+        GST_ERROR ("Couldn't get dirty rect, hr: 0x%x", (guint) hr);
+        return flow_return_from_hr (device_.Get (),
+            hr, FrameInfoExpectedErrors);
+      }
+
+      auto dirty_count = buf_size / sizeof (RECT);
+      buildDirtyVertex ((RECT *) dirty_rects, dirty_count);
+    }
+
+    if (frame_info_.LastMouseUpdateTime.QuadPart != 0) {
+      ptr_info_.position_info = frame_info_.PointerPosition;
+      ptr_info_.LastTimeStamp = frame_info_.LastMouseUpdateTime;
+
+      if (frame_info_.PointerShapeBufferSize > 0) {
+        UINT buf_size;
+        ptr_info_.shape_buffer.resize (frame_info_.PointerShapeBufferSize);
+        hr = dupl_->GetFramePointerShape (frame_info_.PointerShapeBufferSize,
+            (void *) ptr_info_.shape_buffer.data (), &buf_size,
+            &ptr_info_.shape_info);
+        if (FAILED (hr)) {
+          return flow_return_from_hr(device_.Get (),
+              hr, FrameInfoExpectedErrors);
+        }
+
+        ptr_info_.BuildTexture ();
+      }
+    }
+
+    *resource = acquired_frame_.Get ();
+    (*resource)->AddRef ();
+
+    return GST_FLOW_OK;
+  }
+
+  void GetSize (guint * width, guint * height)
+  {
+    *width = output_desc_.ModeDesc.Width;
+    *height = output_desc_.ModeDesc.Height;
+  }
+
+  DXGI_OUTDUPL_DESC GetDesc ()
+  {
+    return output_desc_;
+  }
+
+  UINT GetMoveCount ()
+  {
+    return move_rect_.size ();
+  }
+
+  const std::vector<MoveRectData> & GetMoveRects ()
+  {
+    return move_rect_;
+  }
+
+  UINT GetDirtyCount ()
+  {
+    return dirty_rect_.size ();
+  }
+
+  const std::vector<RECT> & GetDirtyRects ()
+  {
+    return dirty_rect_;
+  }
+
+  const std::vector<VERTEX> & GetDirtyVertex ()
+  {
+    return dirty_vertex_;
+  }
+
+  const PtrInfo & GetPointerInfo ()
+  {
+    return ptr_info_;
+  }
+
+private:
+  void buildMoveRects (UINT move_count)
+  {
+    INT width = (INT) output_desc_.ModeDesc.Width;
+    INT height = (INT) output_desc_.ModeDesc.Height;
+
+    for (UINT i = 0; i < move_count; i++) {
+      DXGI_OUTDUPL_MOVE_RECT *move_rect =
+          ((DXGI_OUTDUPL_MOVE_RECT *) metadata_buffer_.data ()) + i;
+      RECT src_rect;
+      RECT dst_rect;
+
+      switch (output_desc_.Rotation) {
+        case DXGI_MODE_ROTATION_UNSPECIFIED:
+        case DXGI_MODE_ROTATION_IDENTITY:
+          src_rect.left = move_rect->SourcePoint.x;
+          src_rect.top = move_rect->SourcePoint.y;
+          src_rect.right = move_rect->SourcePoint.x +
+              move_rect->DestinationRect.right - move_rect->DestinationRect.left;
+          src_rect.bottom = move_rect->SourcePoint.y +
+              move_rect->DestinationRect.bottom - move_rect->DestinationRect.top;
+          dst_rect = move_rect->DestinationRect;
+          break;
+        case DXGI_MODE_ROTATION_ROTATE90:
+          src_rect.left = height - (move_rect->SourcePoint.y +
+              move_rect->DestinationRect.bottom - move_rect->DestinationRect.top);
+          src_rect.top = move_rect->SourcePoint.x;
+          src_rect.right = height - move_rect->SourcePoint.y;
+          src_rect.bottom = move_rect->SourcePoint.x +
+              move_rect->DestinationRect.right - move_rect->DestinationRect.left;
+
+          dst_rect.left = height - move_rect->DestinationRect.bottom;
+          dst_rect.top = move_rect->DestinationRect.left;
+          dst_rect.right = height - move_rect->DestinationRect.top;
+          dst_rect.bottom = move_rect->DestinationRect.right;
+          break;
+        case DXGI_MODE_ROTATION_ROTATE180:
+          src_rect.left = width - (move_rect->SourcePoint.x +
+              move_rect->DestinationRect.right - move_rect->DestinationRect.left);
+          src_rect.top = height - (move_rect->SourcePoint.y +
+              move_rect->DestinationRect.bottom - move_rect->DestinationRect.top);
+          src_rect.right = width - move_rect->SourcePoint.x;
+          src_rect.bottom = height - move_rect->SourcePoint.y;
+
+          dst_rect.left = width - move_rect->DestinationRect.right;
+          dst_rect.top = height - move_rect->DestinationRect.bottom;
+          dst_rect.right = width - move_rect->DestinationRect.left;
+          dst_rect.bottom =  height - move_rect->DestinationRect.top;
+          break;
+        case DXGI_MODE_ROTATION_ROTATE270:
+          src_rect.left = move_rect->SourcePoint.x;
+          src_rect.top = width - (move_rect->SourcePoint.x +
+              move_rect->DestinationRect.right - move_rect->DestinationRect.left);
+          src_rect.right = move_rect->SourcePoint.y +
+              move_rect->DestinationRect.bottom - move_rect->DestinationRect.top;
+          src_rect.bottom = width - move_rect->SourcePoint.x;
+
+          dst_rect.left = move_rect->DestinationRect.top;
+          dst_rect.top = width - move_rect->DestinationRect.right;
+          dst_rect.right = move_rect->DestinationRect.bottom;
+          dst_rect.bottom =  width - move_rect->DestinationRect.left;
+          break;
+        default:
+          continue;
+      }
+
+      MoveRectData rect_data = { };
+      rect_data.src_rect = src_rect;
+      rect_data.dst_rect = dst_rect;
+      rect_data.box.left = src_rect.left;
+      rect_data.box.top = src_rect.top;
+      rect_data.box.right = src_rect.right;
+      rect_data.box.bottom = src_rect.bottom;
+      rect_data.box.front = 0;
+      rect_data.box.back = 1;
+
+      move_rect_.push_back (rect_data);
+    }
+  }
+
+  void buildDirtyVertex (RECT * rects, UINT num_rect)
+  {
+    if (num_rect == 0)
+      return;
+
+    dirty_vertex_.resize (num_rect * 6);
+    FLOAT width = output_desc_.ModeDesc.Width;
+    FLOAT height = output_desc_.ModeDesc.Height;
+    FLOAT center_x = width / 2.0f;
+    FLOAT center_y = height / 2.0f;
+
+    for (UINT i = 0; i < num_rect; i++) {
+      RECT dirty = rectsi;
+      RECT dest_dirty = dirty;
+      UINT base = i * 6;
+
+      dirty_rect_.push_back (dirty);
+
+      switch (output_desc_.Rotation) {
+        case DXGI_MODE_ROTATION_ROTATE90:
+          dest_dirty.left = width - dirty.bottom;
+          dest_dirty.top = dirty.left;
+          dest_dirty.right = width - dirty.top;
+          dest_dirty.bottom = dirty.right;
+
+          dirty_vertex_base.TexCoord = XMFLOAT2 (
+              dirty.right / width, dirty.bottom / height);
+          dirty_vertex_base + 1.TexCoord = XMFLOAT2 (
+              dirty.left / width, dirty.bottom / height);
+          dirty_vertex_base + 2.TexCoord = XMFLOAT2 (
+              dirty.right / width, dirty.top / height);
+          dirty_vertex_base + 5.TexCoord = XMFLOAT2(
+              dirty.left / width, dirty.top / height);
+          break;
+        case DXGI_MODE_ROTATION_ROTATE180:
+          dest_dirty.left = width - dirty.right;
+          dest_dirty.top = height - dirty.bottom;
+          dest_dirty.right = width - dirty.left;
+          dest_dirty.bottom = height - dirty.top;
+
+          dirty_vertex_base.TexCoord = XMFLOAT2(
+              dirty.right / width, dirty.top / height);
+          dirty_vertex_base + 1.TexCoord = XMFLOAT2 (
+              dirty.right / width, dirty.bottom / height);
+          dirty_vertex_base + 2.TexCoord = XMFLOAT2 (
+              dirty.left / width, dirty.top / height);
+          dirty_vertex_base + 5.TexCoord = XMFLOAT2 (
+              dirty.left / width, dirty.bottom / height);
+          break;
+        case DXGI_MODE_ROTATION_ROTATE270:
+          dest_dirty.left = dirty.top;
+          dest_dirty.top = height - dirty.right;
+          dest_dirty.right = dirty.bottom;
+          dest_dirty.bottom = height - dirty.left;
+
+          dirty_vertex_base.TexCoord = XMFLOAT2 (
+              dirty.left / width, dirty.top / height);
+          dirty_vertex_base + 1.TexCoord = XMFLOAT2 (
+              dirty.right / width, dirty.top / height);
+          dirty_vertex_base + 2.TexCoord = XMFLOAT2 (
+              dirty.left / width, dirty.bottom / height);
+          dirty_vertex_base + 5.TexCoord = XMFLOAT2 (
+              dirty.right / width, dirty.bottom / height);
+          break;
+        case DXGI_MODE_ROTATION_UNSPECIFIED:
+        case DXGI_MODE_ROTATION_IDENTITY:
+        default:
+          dirty_vertex_base.TexCoord = XMFLOAT2 (
+              dirty.left / width, dirty.bottom / height);
+          dirty_vertex_base + 1.TexCoord = XMFLOAT2 (
+              dirty.left / width, dirty.top / height);
+          dirty_vertex_base + 2.TexCoord = XMFLOAT2 (
+              dirty.right / width, dirty.bottom / height);
+          dirty_vertex_base + 5.TexCoord = XMFLOAT2 (
+              dirty.right / width, dirty.top / height);
+          break;
+      }
+
+      /* Set positions */
+      dirty_vertex_base.Pos = XMFLOAT3 (
+          (dest_dirty.left - center_x) / center_x,
+          -1 * (dest_dirty.bottom - center_y) / center_y, 0.0f);
+      dirty_vertex_base + 1.Pos = XMFLOAT3 (
+          (dest_dirty.left - center_x) / center_x,
+          -1 * (dest_dirty.top - center_y) / center_y, 0.0f);
+      dirty_vertex_base + 2.Pos = XMFLOAT3 (
+          (dest_dirty.right - center_x) / center_x,
+          -1 * (dest_dirty.bottom - center_y) / center_y, 0.0f);
+      dirty_vertex_base + 3.Pos = dirty_vertex_base + 2.Pos;
+      dirty_vertex_base + 4.Pos = dirty_vertex_base + 1.Pos;
+      dirty_vertex_base + 5.Pos = XMFLOAT3 (
+          (dest_dirty.right - center_x) / center_x,
+          -1 * (dest_dirty.top - center_y) / center_y, 0.0f);
+
+      dirty_vertex_base + 3.TexCoord = dirty_vertex_base + 2.TexCoord;
+      dirty_vertex_base + 4.TexCoord = dirty_vertex_base + 1.TexCoord;
+    }
+  }
+
+private:
+  PtrInfo ptr_info_;
+  DXGI_OUTDUPL_DESC output_desc_;
+  DXGI_OUTDUPL_FRAME_INFO frame_info_;
+  ComPtr<IDXGIOutputDuplication> dupl_;
+  ComPtr<ID3D11Device> device_;
+  ComPtr<IDXGIResource> acquired_frame_;
+  std::vector<MoveRectData> move_rect_;
+  std::vector<VERTEX> dirty_vertex_;
+  std::vector<RECT> dirty_rect_;
+
+  /* frame metadata */
+  std::vector<BYTE> metadata_buffer_;
+};
+
+struct GstD3D12DxgiCapturePrivate
+{
+  GstD3D12DxgiCapturePrivate ()
+  {
+    event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+    fence_data_pool = gst_d3d12_fence_data_pool_new ();
+  }
+
+  ~GstD3D12DxgiCapturePrivate ()
+  {
+    if (device) {
+      auto fence_to_wait = MAX (fence_val, mouse_fence_val);
+      gst_d3d12_device_fence_wait (device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+          fence_to_wait, event_handle);
+    }
+    CloseHandle (event_handle);
+    gst_clear_buffer (&mouse_buf);
+    gst_clear_buffer (&mouse_xor_buf);
+    gst_clear_object (&ca_pool);
+    gst_clear_object (&fence_data_pool);
+    gst_clear_object (&mouse_blend);
+    gst_clear_object (&mouse_xor_blend);
+    gst_clear_object (&device);
+  }
+
+  GstD3D12Device *device = nullptr;
+
+  std::unique_ptr<DesktopDupCtx> ctx;
+  ComPtr<IDXGIOutput1> output;
+  ComPtr<IDXGIResource> last_resource;
+  ComPtr<ID3D12Resource> shared_resource;
+  ComPtr<ID3D12Resource> move_frame;
+  ComPtr<ID3D12Resource> processed_frame;
+  ComPtr<ID3D12RootSignature> rs;
+  ComPtr<ID3D12PipelineState> pso;
+  GstD3D12CommandAllocatorPool *ca_pool = nullptr;
+  GstD3D12FenceDataPool *fence_data_pool;
+  GstD3D12FenceData *mouse_fence_data = nullptr;
+  ComPtr<ID3D12GraphicsCommandList> cl;
+  ComPtr<ID3D12GraphicsCommandList> mouse_cl;
+  ComPtr<ID3D12DescriptorHeap> srv_heap;
+  ComPtr<ID3D12DescriptorHeap> rtv_heap;
+  ComPtr<ID3D12Resource> dirty_vertex_buf;
+  UINT dirty_vertex_size = 0;
+  GstBuffer *mouse_buf = nullptr;
+  GstBuffer *mouse_xor_buf = nullptr;
+  D3D12_VIEWPORT viewport;
+  D3D12_RECT scissor_rect;
+  D3D12_RESOURCE_STATES resource_state = D3D12_RESOURCE_STATE_COMMON;
+
+  GstD3D12Converter *mouse_blend = nullptr;
+  GstD3D12Converter *mouse_xor_blend = nullptr;
+
+  HMONITOR monitor_handle = nullptr;
+  RECT desktop_coordinates = { };
+
+  guint cached_width = 0;
+  guint cached_height = 0;
+
+  HANDLE event_handle;
+  guint64 fence_val = 0;
+  guint64 mouse_fence_val = 0;
+
+  guint64 mouse_token = 0;
+
+  std::mutex lock;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12DxgiCapture
+{
+  GstD3D12ScreenCapture parent;
+
+  GstD3D12Device *device;
+
+  GstD3D12DxgiCapturePrivate *priv;
+};
+
+static void gst_d3d12_dxgi_capture_dispose (GObject * object);
+static void gst_d3d12_dxgi_capture_finalize (GObject * object);
+static void gst_d3d12_dxgi_capture_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static GstFlowReturn
+gst_d3d12_dxgi_capture_prepare (GstD3D12ScreenCapture * capture);
+static gboolean
+gst_d3d12_dxgi_capture_get_size (GstD3D12ScreenCapture * capture,
+    guint * width, guint * height);
+static GstFlowReturn
+gst_d3d12_dxgi_capture_do_capture (GstD3D12ScreenCapture * capture,
+    GstBuffer * buffer, const D3D12_BOX * crop_box, gboolean draw_mouse);
+
+#define gst_d3d12_dxgi_capture_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12DxgiCapture, gst_d3d12_dxgi_capture,
+    GST_TYPE_D3D12_SCREEN_CAPTURE);
+
+static void
+gst_d3d12_dxgi_capture_class_init (GstD3D12DxgiCaptureClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto capture_class = GST_D3D12_SCREEN_CAPTURE_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_dxgi_capture_finalize;
+
+  capture_class->prepare = GST_DEBUG_FUNCPTR (gst_d3d12_dxgi_capture_prepare);
+  capture_class->get_size = GST_DEBUG_FUNCPTR (gst_d3d12_dxgi_capture_get_size);
+  capture_class->do_capture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_dxgi_capture_do_capture);
+}
+
+static void
+gst_d3d12_dxgi_capture_init (GstD3D12DxgiCapture * self)
+{
+  self->priv = new GstD3D12DxgiCapturePrivate ();
+}
+
+static void
+gst_d3d12_dxgi_capture_finalize (GObject * object)
+{
+  auto self = GST_D3D12_DXGI_CAPTURE (object);
+
+  delete self->priv;
+  gst_clear_object (&self->device);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_dxgi_capture_weak_ref_notify (gpointer data,
+    GstD3D12DxgiCapture * dupl)
+{
+  std::lock_guard < std::mutex > lk (g_g_dupl_list_lock);
+  g_dupl_list = g_list_remove (g_dupl_list, dupl);
+}
+
+static gboolean
+gst_d3d12_dxgi_capture_open (GstD3D12DxgiCapture * self,
+    HMONITOR monitor_handle)
+{
+  const D3D12_ROOT_SIGNATURE_FLAGS rs_flags =
+      D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT |
+      D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS |
+      D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS |
+      D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS |
+      D3D12_ROOT_SIGNATURE_FLAG_DENY_AMPLIFICATION_SHADER_ROOT_ACCESS |
+      D3D12_ROOT_SIGNATURE_FLAG_DENY_MESH_SHADER_ROOT_ACCESS;
+  const D3D12_STATIC_SAMPLER_DESC static_sampler_desc = {
+    D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT,
+    D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+    D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+    D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+    0,
+    1,
+    D3D12_COMPARISON_FUNC_ALWAYS,
+    D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK,
+    0,
+    D3D12_FLOAT32_MAX,
+    0,
+    0,
+    D3D12_SHADER_VISIBILITY_PIXEL
+  };
+
+  auto priv = self->priv;
+  priv->monitor_handle = monitor_handle;
+
+  ComPtr < IDXGIOutput > output;
+  auto hr = gst_d3d12_screen_capture_find_output_for_monitor (monitor_handle,
+      nullptr, &output);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_WARNING_OBJECT (self,
+        "Failed to find associated adapter for monitor %p", monitor_handle);
+    return FALSE;
+  }
+
+  hr = output.As (&priv->output);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_WARNING_OBJECT (self, "IDXGIOutput1 interface unavailable");
+    return FALSE;
+  }
+
+  DXGI_OUTPUT_DESC output_desc;
+  hr = output->GetDesc (&output_desc);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_WARNING_OBJECT (self, "Couldn't get output desc");
+    return FALSE;
+  }
+
+  /* DesktopCoordinates will not report actual texture size in case that
+   * application is running without dpi-awareness. To get actual monitor size,
+   * we need to use Win32 API... */
+  MONITORINFOEXW monitor_info;
+  DEVMODEW dev_mode;
+
+  monitor_info.cbSize = sizeof (MONITORINFOEXW);
+  if (!GetMonitorInfoW (output_desc.Monitor, (LPMONITORINFO) & monitor_info)) {
+    GST_WARNING_OBJECT (self, "Couldn't get monitor info");
+    return FALSE;
+  }
+
+  dev_mode.dmSize = sizeof (DEVMODEW);
+  dev_mode.dmDriverExtra = sizeof (POINTL);
+  dev_mode.dmFields = DM_POSITION;
+  if (!EnumDisplaySettingsW
+      (monitor_info.szDevice, ENUM_CURRENT_SETTINGS, &dev_mode)) {
+    GST_WARNING_OBJECT (self, "Couldn't enumerate display settings");
+    return FALSE;
+  }
+
+  priv->desktop_coordinates.left = dev_mode.dmPosition.x;
+  priv->desktop_coordinates.top = dev_mode.dmPosition.y;
+  priv->desktop_coordinates.right =
+      dev_mode.dmPosition.x + dev_mode.dmPelsWidth;
+  priv->desktop_coordinates.bottom =
+      dev_mode.dmPosition.y + dev_mode.dmPelsHeight;
+
+  priv->cached_width =
+      priv->desktop_coordinates.right - priv->desktop_coordinates.left;
+  priv->cached_height =
+      priv->desktop_coordinates.bottom - priv->desktop_coordinates.top;
+
+  GST_DEBUG_OBJECT (self,
+      "Desktop coordinates left:top:right:bottom = %ld:%ld:%ld:%ld (%dx%d)",
+      priv->desktop_coordinates.left, priv->desktop_coordinates.top,
+      priv->desktop_coordinates.right, priv->desktop_coordinates.bottom,
+      priv->cached_width, priv->cached_height);
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+
+  CD3DX12_ROOT_PARAMETER param;
+  D3D12_DESCRIPTOR_RANGE range;
+  std::vector < D3D12_ROOT_PARAMETER > param_list;
+
+  range = CD3DX12_DESCRIPTOR_RANGE (D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0);
+  param.InitAsDescriptorTable (1, &range, D3D12_SHADER_VISIBILITY_PIXEL);
+  param_list.push_back (param);
+
+  D3D12_VERSIONED_ROOT_SIGNATURE_DESC rs_desc = { };
+  CD3DX12_VERSIONED_ROOT_SIGNATURE_DESC::Init_1_0 (rs_desc,
+      param_list.size (), param_list.data (),
+      1, &static_sampler_desc, rs_flags);
+  ComPtr < ID3DBlob > rs_blob;
+  ComPtr < ID3DBlob > error_blob;
+  hr = D3DX12SerializeVersionedRootSignature (&rs_desc,
+      D3D_ROOT_SIGNATURE_VERSION_1_1, &rs_blob, &error_blob);
+  if (!gst_d3d12_result (hr, self->device)) {
+    const gchar *error_msg = nullptr;
+    if (error_blob)
+      error_msg = (const gchar *) error_blob->GetBufferPointer ();
+
+    GST_ERROR_OBJECT (self, "Couldn't serialize root signature, error: %s",
+        GST_STR_NULL (error_msg));
+    return FALSE;
+  }
+
+  hr = device->CreateRootSignature (0, rs_blob->GetBufferPointer (),
+      rs_blob->GetBufferSize (), IID_PPV_ARGS (&priv->rs));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create root signature");
+    return FALSE;
+  }
+
+  D3D12_INPUT_ELEMENT_DESC input_desc2;
+  input_desc0.SemanticName = "POSITION";
+  input_desc0.SemanticIndex = 0;
+  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+  input_desc0.InputSlot = 0;
+  input_desc0.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  input_desc0.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  input_desc0.InstanceDataStepRate = 0;
+
+  input_desc1.SemanticName = "TEXCOORD";
+  input_desc1.SemanticIndex = 0;
+  input_desc1.Format = DXGI_FORMAT_R32G32_FLOAT;
+  input_desc1.InputSlot = 0;
+  input_desc1.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  input_desc1.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  input_desc1.InstanceDataStepRate = 0;
+
+  D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc = { };
+  pso_desc.pRootSignature = priv->rs.Get ();
+  pso_desc.VS.BytecodeLength = sizeof (g_VSMain_coord);
+  pso_desc.VS.pShaderBytecode = g_VSMain_coord;
+  pso_desc.PS.BytecodeLength = sizeof (g_PSMain_sample);
+  pso_desc.PS.pShaderBytecode = g_PSMain_sample;
+  pso_desc.BlendState = CD3DX12_BLEND_DESC (D3D12_DEFAULT);
+  pso_desc.SampleMask = UINT_MAX;
+  pso_desc.RasterizerState = CD3DX12_RASTERIZER_DESC (D3D12_DEFAULT);
+  pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
+  pso_desc.DepthStencilState.DepthEnable = FALSE;
+  pso_desc.DepthStencilState.StencilEnable = FALSE;
+  pso_desc.InputLayout.pInputElementDescs = input_desc;
+  pso_desc.InputLayout.NumElements = G_N_ELEMENTS (input_desc);
+  pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
+  pso_desc.NumRenderTargets = 1;
+  pso_desc.RTVFormats0 = DXGI_FORMAT_B8G8R8A8_UNORM;
+  pso_desc.SampleDesc.Count = 1;
+
+  hr = device->CreateGraphicsPipelineState (&pso_desc,
+      IID_PPV_ARGS (&priv->pso));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create pso");
+    return FALSE;
+  }
+
+  /* size will be updated later */
+  GstVideoInfo info;
+  gst_video_info_set_format (&info, GST_VIDEO_FORMAT_BGRA,
+      priv->cached_width, priv->cached_height);
+  D3D12_BLEND_DESC blend_desc = CD3DX12_BLEND_DESC (D3D12_DEFAULT);
+
+  blend_desc.RenderTarget0.BlendEnable = TRUE;
+  blend_desc.RenderTarget0.LogicOpEnable = FALSE;
+  blend_desc.RenderTarget0.SrcBlend = D3D12_BLEND_SRC_ALPHA;
+  blend_desc.RenderTarget0.DestBlend = D3D12_BLEND_INV_SRC_ALPHA;
+  blend_desc.RenderTarget0.BlendOp = D3D12_BLEND_OP_ADD;
+  blend_desc.RenderTarget0.SrcBlendAlpha = D3D12_BLEND_ZERO;
+  blend_desc.RenderTarget0.DestBlendAlpha = D3D12_BLEND_ONE;
+  blend_desc.RenderTarget0.BlendOpAlpha = D3D12_BLEND_OP_ADD;
+  blend_desc.RenderTarget0.LogicOp = D3D12_LOGIC_OP_NOOP;
+  blend_desc.RenderTarget0.RenderTargetWriteMask =
+      D3D12_COLOR_WRITE_ENABLE_ALL;
+
+  priv->mouse_blend = gst_d3d12_converter_new (self->device, &info, &info,
+      &blend_desc, nullptr, nullptr);
+
+  blend_desc.RenderTarget0.SrcBlend = D3D12_BLEND_INV_DEST_COLOR;
+  blend_desc.RenderTarget0.DestBlend = D3D12_BLEND_INV_SRC_COLOR;
+  priv->mouse_xor_blend = gst_d3d12_converter_new (self->device, &info, &info,
+      &blend_desc, nullptr, nullptr);
+
+  D3D12_DESCRIPTOR_HEAP_DESC heap_desc = { };
+  heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
+  heap_desc.NumDescriptors = 1;
+  heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
+  hr = device->CreateDescriptorHeap (&heap_desc,
+      IID_PPV_ARGS (&priv->srv_heap));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create descriptor heap");
+    return FALSE;
+  }
+
+  heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV;
+  heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
+  hr = device->CreateDescriptorHeap (&heap_desc,
+      IID_PPV_ARGS (&priv->rtv_heap));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create descriptor heap");
+    return FALSE;
+  }
+
+  priv->ca_pool = gst_d3d12_command_allocator_pool_new (self->device,
+      D3D12_COMMAND_LIST_TYPE_DIRECT);
+
+  priv->device = (GstD3D12Device *) gst_object_ref (self->device);
+
+  return TRUE;
+}
+
+GstD3D12ScreenCapture *
+gst_d3d12_dxgi_capture_new (GstD3D12Device * device, HMONITOR monitor_handle)
+{
+  GList *iter;
+
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+
+  /* Check if we have dup object corresponding to monitor_handle,
+   * and if there is already configured capture object, reuse it.
+   * This is because of the limitation of desktop duplication API
+   * (i.e., in a process, only one duplication object can exist).
+   * See also
+   * https://docs.microsoft.com/en-us/windows/win32/api/dxgi1_2/nf-dxgi1_2-idxgioutput1-duplicateoutput#remarks
+   */
+  std::lock_guard < std::mutex > lk (g_g_dupl_list_lock);
+  for (iter = g_dupl_list; iter; iter = g_list_next (iter)) {
+    auto capture = (GstD3D12DxgiCapture *) iter->data;
+    auto priv = capture->priv;
+
+    if (priv->monitor_handle == monitor_handle) {
+      GST_DEBUG ("Found configured desktop dup object for monitor handle %p",
+          monitor_handle);
+      gst_object_ref (capture);
+      return GST_D3D12_SCREEN_CAPTURE_CAST (capture);
+    }
+  }
+
+  auto self = (GstD3D12DxgiCapture *) g_object_new (GST_TYPE_D3D12_DXGI_CAPTURE,
+      nullptr);
+  self->device = (GstD3D12Device *) gst_object_ref (device);
+  gst_object_ref_sink (self);
+
+  if (!gst_d3d12_dxgi_capture_open (self, monitor_handle)) {
+    gst_object_unref (self);
+    return nullptr;
+  }
+
+  g_object_weak_ref (G_OBJECT (self),
+      (GWeakNotify) gst_d3d12_dxgi_capture_weak_ref_notify, nullptr);
+  g_dupl_list = g_list_append (g_dupl_list, self);
+
+  return GST_D3D12_SCREEN_CAPTURE_CAST (self);
+}
+
+static GstFlowReturn
+gst_d3d12_dxgi_capture_prepare_unlocked (GstD3D12DxgiCapture * self)
+{
+  auto priv = self->priv;
+
+  if (priv->ctx) {
+    GST_DEBUG_OBJECT (self, "Already prepared");
+    return GST_FLOW_OK;
+  }
+
+  auto ctx = std::make_unique < DesktopDupCtx > ();
+  auto ret = ctx->Init (priv->monitor_handle);
+  if (ret != GST_FLOW_OK) {
+    GST_WARNING_OBJECT (self,
+        "Couldn't prepare capturing, %sexpected failure",
+        ret == GST_D3D12_SCREEN_CAPTURE_FLOW_EXPECTED_ERROR ? "" : "un");
+
+    return ret;
+  }
+
+  ctx->GetSize (&priv->cached_width, &priv->cached_height);
+  priv->viewport.TopLeftX = 0;
+  priv->viewport.TopLeftY = 0;
+  priv->viewport.Width = priv->cached_width;
+  priv->viewport.Height = priv->cached_height;
+  priv->viewport.MinDepth = 0;
+  priv->viewport.MaxDepth = 1;
+
+  priv->scissor_rect.left = 0;
+  priv->scissor_rect.top = 0;
+  priv->scissor_rect.right = priv->cached_width;
+  priv->scissor_rect.bottom = priv->cached_height;
+
+  ComPtr < ID3D12Resource > processed_frame;
+  D3D12_CLEAR_VALUE clear_value = { };
+  clear_value.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
+  clear_value.Color0 = 0.0f;
+  clear_value.Color1 = 0.0f;
+  clear_value.Color2 = 0.0f;
+  clear_value.Color3 = 1.0f;
+
+  D3D12_HEAP_PROPERTIES heap_prop =
+      CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+  D3D12_RESOURCE_DESC resource_desc =
+      CD3DX12_RESOURCE_DESC::Tex2D (DXGI_FORMAT_B8G8R8A8_UNORM,
+      priv->cached_width, priv->cached_height, 1, 1, 1, 0,
+      D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
+      D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  auto hr = device->CreateCommittedResource (&heap_prop, D3D12_HEAP_FLAG_NONE,
+      &resource_desc, D3D12_RESOURCE_STATE_COMMON, &clear_value,
+      IID_PPV_ARGS (&processed_frame));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create texture");
+    return GST_FLOW_ERROR;
+  }
+
+  D3D12_RENDER_TARGET_VIEW_DESC rtv_desc = { };
+  rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D;
+  rtv_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
+  rtv_desc.Texture2D.PlaneSlice = 0;
+
+  device->CreateRenderTargetView (processed_frame.Get (), &rtv_desc,
+      priv->rtv_heap->GetCPUDescriptorHandleForHeapStart ());
+
+  priv->ctx = std::move (ctx);
+  priv->processed_frame = processed_frame;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_d3d12_dxgi_capture_prepare (GstD3D12ScreenCapture * capture)
+{
+  auto self = GST_D3D12_DXGI_CAPTURE (capture);
+  auto priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  return gst_d3d12_dxgi_capture_prepare_unlocked (self);
+}
+
+static gboolean
+gst_d3d12_dxgi_capture_get_size_unlocked (GstD3D12DxgiCapture * self,
+    guint * width, guint * height)
+{
+  auto priv = self->priv;
+
+  *width = 0;
+  *height = 0;
+
+  if (priv->ctx)
+    priv->ctx->GetSize (&priv->cached_width, &priv->cached_height);
+
+  *width = priv->cached_width;
+  *height = priv->cached_height;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_dxgi_capture_get_size (GstD3D12ScreenCapture * capture,
+    guint * width, guint * height)
+{
+  auto self = GST_D3D12_DXGI_CAPTURE (capture);
+  auto priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  return gst_d3d12_dxgi_capture_get_size_unlocked (self, width, height);
+}
+
+static gboolean
+gst_d3d12_dxgi_capture_copy_move_rects (GstD3D12DxgiCapture * self,
+    ID3D12GraphicsCommandList * cl)
+{
+  auto priv = self->priv;
+  HRESULT hr;
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+
+  GST_LOG_OBJECT (self, "Rendering move rects");
+
+  std::vector < D3D12_RESOURCE_BARRIER > barriers;
+  if (!priv->move_frame) {
+    D3D12_HEAP_PROPERTIES heap_prop =
+        CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+    D3D12_RESOURCE_DESC resource_desc = priv->processed_frame->GetDesc ();
+    resource_desc.Flags = D3D12_RESOURCE_FLAG_NONE;
+    hr = device->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST,
+        nullptr, IID_PPV_ARGS (&priv->move_frame));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create move texture");
+      return FALSE;
+    }
+  }
+
+  D3D12_TEXTURE_COPY_LOCATION move_frame =
+      CD3DX12_TEXTURE_COPY_LOCATION (priv->move_frame.Get ());
+  D3D12_TEXTURE_COPY_LOCATION processed_frame =
+      CD3DX12_TEXTURE_COPY_LOCATION (priv->processed_frame.Get ());
+
+  const auto & data = priv->ctx->GetMoveRects ();
+  for (size_t i = 0; i < data.size (); i++) {
+    const auto & rect = datai;
+    cl->CopyTextureRegion (&move_frame, rect.src_rect.left, rect.src_rect.top,
+        0, &processed_frame, &rect.box);
+  }
+
+  priv->resource_state = D3D12_RESOURCE_STATE_COPY_DEST;
+
+  barriers.clear ();
+  barriers.
+      push_back (CD3DX12_RESOURCE_BARRIER::Transition (priv->processed_frame.
+          Get (), D3D12_RESOURCE_STATE_COPY_SOURCE,
+          D3D12_RESOURCE_STATE_COPY_DEST));
+  barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (priv->
+          move_frame.Get (), D3D12_RESOURCE_STATE_COPY_DEST,
+          D3D12_RESOURCE_STATE_COPY_SOURCE));
+  cl->ResourceBarrier (barriers.size (), barriers.data ());
+  for (size_t i = 0; i < data.size (); i++) {
+    const auto & rect = datai;
+    cl->CopyTextureRegion (&processed_frame, rect.dst_rect.left,
+        rect.dst_rect.top, 0, &move_frame, &rect.box);
+  }
+
+  barriers.clear ();
+  barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (priv->
+          move_frame.Get (), D3D12_RESOURCE_STATE_COPY_SOURCE,
+          D3D12_RESOURCE_STATE_COPY_DEST));
+  cl->ResourceBarrier (barriers.size (), barriers.data ());
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_dxgi_capture_copy_dirty_rects (GstD3D12DxgiCapture * self,
+    IDXGIResource * resource, ID3D12GraphicsCommandList * cl)
+{
+  auto priv = self->priv;
+  HRESULT hr;
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+
+  GST_LOG_OBJECT (self, "Rendering dirty rects");
+
+  if (!priv->shared_resource) {
+    ComPtr < IDXGIResource1 > resource1;
+    hr = resource->QueryInterface (IID_PPV_ARGS (&resource1));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "IDXGIResource1 interface unavailable");
+      return FALSE;
+    }
+
+    HANDLE shared_handle;
+    hr = resource1->CreateSharedHandle (nullptr, DXGI_SHARED_RESOURCE_READ,
+        nullptr, &shared_handle);
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create shared handle");
+      return FALSE;
+    }
+
+    hr = device->OpenSharedHandle (shared_handle,
+        IID_PPV_ARGS (&priv->shared_resource));
+    CloseHandle (shared_handle);
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't open shared resource");
+      return FALSE;
+    }
+
+    D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc = { };
+    srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+    srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+    srv_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
+    srv_desc.Texture2D.PlaneSlice = 0;
+    srv_desc.Texture2D.MipLevels = 1;
+
+    device->CreateShaderResourceView (priv->shared_resource.Get (), &srv_desc,
+        priv->srv_heap->GetCPUDescriptorHandleForHeapStart ());
+  }
+
+  auto desc = priv->ctx->GetDesc ();
+  if (desc.Rotation == DXGI_MODE_ROTATION_UNSPECIFIED ||
+      desc.Rotation == DXGI_MODE_ROTATION_IDENTITY) {
+    const auto & rects = priv->ctx->GetDirtyRects ();
+    D3D12_TEXTURE_COPY_LOCATION src =
+        CD3DX12_TEXTURE_COPY_LOCATION (priv->shared_resource.Get ());
+    D3D12_TEXTURE_COPY_LOCATION dst =
+        CD3DX12_TEXTURE_COPY_LOCATION (priv->processed_frame.Get ());
+    D3D12_BOX box;
+    box.front = 0;
+    box.back = 1;
+
+    GST_LOG_OBJECT (self, "Perform copy");
+
+    for (size_t i = 0; i < rects.size (); i++) {
+      const auto & rect = rectsi;
+      box.left = rect.left;
+      box.right = rect.right;
+      box.top = rect.top;
+      box.bottom = rect.bottom;
+
+      cl->CopyTextureRegion (&dst, box.left, box.top, 0, &src, &box);
+    }
+
+    if (priv->resource_state == D3D12_RESOURCE_STATE_COMMON)
+      priv->resource_state = D3D12_RESOURCE_STATE_COPY_DEST;
+  } else {
+    GST_LOG_OBJECT (self, "Perform draw");
+
+    if (priv->resource_state != D3D12_RESOURCE_STATE_COMMON) {
+      D3D12_RESOURCE_BARRIER barrier =
+          CD3DX12_RESOURCE_BARRIER::Transition (priv->processed_frame.Get (),
+          priv->resource_state, D3D12_RESOURCE_STATE_RENDER_TARGET);
+      priv->cl->ResourceBarrier (1, &barrier);
+    }
+
+    cl->SetGraphicsRootSignature (priv->rs.Get ());
+    cl->IASetPrimitiveTopology (D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+    cl->RSSetViewports (1, &priv->viewport);
+    cl->RSSetScissorRects (1, &priv->scissor_rect);
+    D3D12_CPU_DESCRIPTOR_HANDLE rtv_heaps = {
+      priv->rtv_heap->GetCPUDescriptorHandleForHeapStart ()
+    };
+
+    cl->OMSetRenderTargets (1, rtv_heaps, FALSE, nullptr);
+
+    const auto & vertex = priv->ctx->GetDirtyVertex ();
+    UINT buf_size = vertex.size () * sizeof (VERTEX);
+    if (priv->dirty_vertex_size < buf_size)
+      priv->dirty_vertex_buf = nullptr;
+
+    if (!priv->dirty_vertex_buf) {
+      D3D12_HEAP_PROPERTIES heap_prop =
+          CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+      D3D12_RESOURCE_DESC buffer_desc =
+          CD3DX12_RESOURCE_DESC::Buffer (buf_size);
+      hr = device->CreateCommittedResource (&heap_prop,
+          D3D12_HEAP_FLAG_CREATE_NOT_ZEROED, &buffer_desc,
+          D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+          IID_PPV_ARGS (&priv->dirty_vertex_buf));
+      if (!gst_d3d12_result (hr, self->device)) {
+        GST_ERROR_OBJECT (self, "Couldn't create vertex buffer");
+        return FALSE;
+      }
+
+      priv->dirty_vertex_size = buf_size;
+    }
+
+    CD3DX12_RANGE range (0, 0);
+    void *data;
+    hr = priv->dirty_vertex_buf->Map (0, &range, &data);
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't map buffer");
+      return FALSE;
+    }
+
+    memcpy (data, vertex.data (), buf_size);
+    priv->dirty_vertex_buf->Unmap (0, nullptr);
+    D3D12_VERTEX_BUFFER_VIEW vbv = { };
+    vbv.BufferLocation = priv->dirty_vertex_buf->GetGPUVirtualAddress ();
+    vbv.SizeInBytes = buf_size;
+    vbv.StrideInBytes = sizeof (VERTEX);
+
+    ID3D12DescriptorHeap *heaps = { priv->srv_heap.Get () };
+    cl->SetDescriptorHeaps (1, heaps);
+    cl->SetGraphicsRootDescriptorTable (0,
+        priv->srv_heap->GetGPUDescriptorHandleForHeapStart ());
+    cl->IASetVertexBuffers (0, 1, &vbv);
+    cl->DrawInstanced (vertex.size (), 1, 0, 0);
+
+    if (priv->resource_state == D3D12_RESOURCE_STATE_COMMON)
+      priv->resource_state = D3D12_RESOURCE_STATE_RENDER_TARGET;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_dxgi_capture_draw_mouse (GstD3D12DxgiCapture * self,
+    GstBuffer * buffer, const D3D12_BOX * crop_box)
+{
+  auto priv = self->priv;
+  const auto & info = priv->ctx->GetPointerInfo ();
+  HRESULT hr;
+
+  if (!info.position_info.Visible)
+    return TRUE;
+
+  if (!info.width_ || !info.height_)
+    return TRUE;
+
+  if (info.position_info.Position.x + info.width_ < crop_box->left ||
+      info.position_info.Position.x > crop_box->right ||
+      info.position_info.Position.y + info.height_ < crop_box->top ||
+      info.position_info.Position.y > crop_box->bottom) {
+    return TRUE;
+  }
+
+  if (info.token_ != priv->mouse_token) {
+    gst_clear_buffer (&priv->mouse_buf);
+    gst_clear_buffer (&priv->mouse_xor_buf);
+    priv->mouse_token = info.token_;
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  if (!priv->mouse_buf) {
+    ComPtr < ID3D12Resource > mouse_texture;
+    ComPtr < ID3D12Resource > mouse_xor_texture;
+
+    D3D12_HEAP_PROPERTIES heap_prop =
+        CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+    D3D12_RESOURCE_DESC resource_desc =
+        CD3DX12_RESOURCE_DESC::Tex2D (DXGI_FORMAT_B8G8R8A8_UNORM,
+        info.width_, info.height_, 1, 1, 1, 0,
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+
+    hr = device->CreateCommittedResource (&heap_prop,
+        D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON,
+        nullptr, IID_PPV_ARGS (&mouse_texture));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create mouse texture");
+      return FALSE;
+    }
+
+    if (!info.xor_texture_.empty ()) {
+      hr = device->CreateCommittedResource (&heap_prop,
+          D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON,
+          nullptr, IID_PPV_ARGS (&mouse_xor_texture));
+      if (!gst_d3d12_result (hr, self->device)) {
+        GST_ERROR_OBJECT (self, "Couldn't create mouse texture");
+        return FALSE;
+      }
+    }
+
+    priv->mouse_buf = gst_buffer_new ();
+    auto mem = gst_d3d12_allocator_alloc_wrapped (nullptr, self->device,
+        mouse_texture.Get (), 0);
+    gst_buffer_append_memory (priv->mouse_buf, mem);
+
+    if (mouse_xor_texture) {
+      priv->mouse_xor_buf = gst_buffer_new ();
+      auto mem = gst_d3d12_allocator_alloc_wrapped (nullptr, self->device,
+          mouse_xor_texture.Get (), 0);
+      gst_buffer_append_memory (priv->mouse_xor_buf, mem);
+    }
+
+    D3D12_PLACED_SUBRESOURCE_FOOTPRINT layout;
+    UINT64 buffer_size;
+
+    device->GetCopyableFootprints (&resource_desc,
+        0, 1, 0, &layout, nullptr, nullptr, &buffer_size);
+
+    GstMapInfo map_info;
+    gst_buffer_map (priv->mouse_buf, &map_info, GST_MAP_WRITE);
+    auto src = info.texture_.data ();
+    auto dst = (guint8 *) map_info.data;
+    for (UINT i = 0; i < info.height_; i++) {
+      memcpy (dst, src, info.width_ * 4);
+      src += info.stride_;
+      dst += layout.Footprint.RowPitch;
+    }
+    gst_buffer_unmap (priv->mouse_buf, &map_info);
+
+    if (priv->mouse_xor_buf) {
+      gst_buffer_map (priv->mouse_xor_buf, &map_info, GST_MAP_WRITE);
+      auto src = info.xor_texture_.data ();
+      auto dst = (guint8 *) map_info.data;
+      for (UINT i = 0; i < info.height_; i++) {
+        memcpy (dst, src, info.width_ * 4);
+        src += info.stride_;
+        dst += layout.Footprint.RowPitch;
+      }
+      gst_buffer_unmap (priv->mouse_xor_buf, &map_info);
+    }
+  }
+
+  gst_d3d12_fence_data_pool_acquire (priv->fence_data_pool,
+      &priv->mouse_fence_data);
+  auto fence_data = priv->mouse_fence_data;
+
+  GstD3D12CommandAllocator *gst_ca = nullptr;
+  ComPtr < ID3D12CommandAllocator > ca;
+
+  if (!gst_d3d12_command_allocator_pool_acquire (priv->ca_pool, &gst_ca)) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire command allocator");
+    return FALSE;
+  }
+
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, gst_ca);
+
+  gst_d3d12_command_allocator_get_handle (gst_ca, &ca);
+  hr = ca->Reset ();
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't reset command allocator");
+    return FALSE;
+  }
+
+  if (!priv->mouse_cl) {
+    hr = device->CreateCommandList (0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        ca.Get (), nullptr, IID_PPV_ARGS (&priv->mouse_cl));
+  } else {
+    hr = priv->mouse_cl->Reset (ca.Get (), nullptr);
+  }
+
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't reset command list");
+    return FALSE;
+  }
+
+  auto cl = priv->mouse_cl;
+  gint ptr_x = info.position_info.Position.x - crop_box->left;
+  gint ptr_y = info.position_info.Position.y - crop_box->top;
+  gint ptr_w = info.width_;
+  gint ptr_h = info.height_;
+
+  g_object_set (priv->mouse_blend, "src-x", 0, "src-y", 0, "src-width",
+      ptr_w, "src-height", ptr_h, "dest-x", ptr_x, "dest-y", ptr_y,
+      "dest-width", ptr_w, "dest-height", ptr_h, nullptr);
+
+  if (!gst_d3d12_converter_convert_buffer (priv->mouse_blend,
+          priv->mouse_buf, buffer, fence_data, cl.Get ())) {
+    GST_ERROR_OBJECT (self, "Couldn't build mouse blend command");
+    return FALSE;
+  }
+
+  if (priv->mouse_xor_buf) {
+    g_object_set (priv->mouse_xor_blend, "src-x", 0, "src-y", 0, "src-width",
+        ptr_w, "src-height", ptr_h, "dest-x", ptr_x, "dest-y", ptr_y,
+        "dest-width", ptr_w, "dest-height", ptr_h, nullptr);
+
+    if (!gst_d3d12_converter_convert_buffer (priv->mouse_xor_blend,
+            priv->mouse_xor_buf, buffer, fence_data, cl.Get ())) {
+      GST_ERROR_OBJECT (self, "Couldn't build mouse blend command");
+      return FALSE;
+    }
+  }
+
+  hr = cl->Close ();
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't close command list");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_d3d12_dxgi_capture_do_capture (GstD3D12ScreenCapture * capture,
+    GstBuffer * buffer, const D3D12_BOX * crop_box, gboolean draw_mouse)
+{
+  auto self = GST_D3D12_DXGI_CAPTURE (capture);
+  auto priv = self->priv;
+  GstFlowReturn ret = GST_FLOW_OK;
+  guint width, height;
+  GstD3D12Memory *dmem;
+  ID3D12Resource *out_resource;
+  D3D12_TEXTURE_COPY_LOCATION src, dst;
+  ID3D12CommandList *cmd_list1;
+  GstD3D12FenceData *fence_data = nullptr;
+  GstD3D12CommandAllocator *gst_ca = nullptr;
+  ComPtr < ID3D12CommandAllocator > ca;
+  HRESULT hr;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if (!priv->ctx) {
+    ret = gst_d3d12_dxgi_capture_prepare_unlocked (self);
+    if (ret != GST_FLOW_OK) {
+      GST_WARNING_OBJECT (self, "We are not prepared");
+      return ret;
+    }
+  }
+
+  gst_d3d12_dxgi_capture_get_size_unlocked (self, &width, &height);
+  if (crop_box->left > width || crop_box->right > width ||
+      crop_box->top > height || crop_box->bottom > height) {
+    GST_INFO_OBJECT (self,
+        "Capture area (%u, %u, %u, %u) doesn't fit into screen size %ux%u",
+        crop_box->left, crop_box->right, crop_box->top,
+        crop_box->bottom, width, height);
+
+    return GST_D3D12_SCREEN_CAPTURE_FLOW_SIZE_CHANGED;
+  }
+
+  ComPtr < IDXGIResource > resource;
+  ret = priv->ctx->AcquireNextFrame (&resource);
+  if (ret != GST_FLOW_OK) {
+    priv->ctx = nullptr;
+    priv->processed_frame = nullptr;
+    priv->move_frame = nullptr;
+    if (ret == GST_D3D12_SCREEN_CAPTURE_FLOW_EXPECTED_ERROR) {
+      GST_WARNING_OBJECT (self, "Couldn't capture frame, but expected failure");
+    } else {
+      GST_ERROR_OBJECT (self, "Unexpected failure during capture");
+    }
+
+    return ret;
+  }
+
+  if (resource) {
+    if (resource != priv->last_resource)
+      priv->shared_resource = nullptr;
+
+    priv->last_resource = resource;
+  }
+
+  GST_LOG_OBJECT (self, "Capture done");
+
+  bool have_move_rect = false;
+  if (priv->ctx->GetMoveCount () > 0)
+    have_move_rect = true;
+  bool have_dirty_rect = false;
+  if ((priv->ctx->GetDirtyCount () > 0) && resource)
+    have_dirty_rect = true;
+
+  std::future < gboolean > mouse_blend_ret;
+  if (draw_mouse) {
+    /* Build mouse draw command from other thread */
+    mouse_blend_ret = std::async (std::launch::async,
+        gst_d3d12_dxgi_capture_draw_mouse, self, buffer, crop_box);
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  if (!gst_d3d12_command_allocator_pool_acquire (priv->ca_pool, &gst_ca)) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire command allocator");
+    goto error;
+  }
+
+  gst_d3d12_fence_data_pool_acquire (priv->fence_data_pool, &fence_data);
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, gst_ca);
+
+  gst_d3d12_command_allocator_get_handle (gst_ca, &ca);
+
+  hr = ca->Reset ();
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't reset command allocator");
+    goto error;
+  }
+
+  if (!priv->cl) {
+    hr = device->CreateCommandList (0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        ca.Get (), priv->pso.Get (), IID_PPV_ARGS (&priv->cl));
+  } else {
+    hr = priv->cl->Reset (ca.Get (), priv->pso.Get ());
+  }
+
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't reset command list");
+    goto error;
+  }
+
+  priv->resource_state = D3D12_RESOURCE_STATE_COMMON;
+  if (have_move_rect &&
+      !gst_d3d12_dxgi_capture_copy_move_rects (self, priv->cl.Get ())) {
+    GST_ERROR_OBJECT (self, "Couldn't copy move rects");
+    goto error;
+  }
+
+  if (have_dirty_rect &&
+      !gst_d3d12_dxgi_capture_copy_dirty_rects (self, resource.Get (),
+          priv->cl.Get ())) {
+    GST_ERROR_OBJECT (self, "Couldn't copy dirty rects");
+    goto error;
+  }
+
+  dmem = (GstD3D12Memory *) gst_buffer_peek_memory (buffer, 0);
+  out_resource = gst_d3d12_memory_get_resource_handle (dmem);
+
+  src = CD3DX12_TEXTURE_COPY_LOCATION (priv->processed_frame.Get ());
+  dst = CD3DX12_TEXTURE_COPY_LOCATION (out_resource);
+
+  if (priv->resource_state != D3D12_RESOURCE_STATE_COMMON) {
+    D3D12_RESOURCE_BARRIER barrier =
+        CD3DX12_RESOURCE_BARRIER::Transition (priv->processed_frame.Get (),
+        priv->resource_state, D3D12_RESOURCE_STATE_COPY_SOURCE);
+    priv->cl->ResourceBarrier (1, &barrier);
+  }
+
+  priv->cl->CopyTextureRegion (&dst, 0, 0, 0, &src, crop_box);
+
+  hr = priv->cl->Close ();
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't close command list");
+    goto error;
+  }
+
+  cmd_list0 = priv->cl.Get ();
+
+  if (!gst_d3d12_device_execute_command_lists (self->device,
+          D3D12_COMMAND_LIST_TYPE_DIRECT, 1, cmd_list, &priv->fence_val)) {
+    GST_ERROR_OBJECT (self, "Couldn't execute command list");
+    goto error;
+  }
+
+  gst_d3d12_device_set_fence_notify (self->device,
+      D3D12_COMMAND_LIST_TYPE_DIRECT, priv->fence_val, fence_data);
+
+  gst_d3d12_buffer_after_write (buffer, priv->fence_val);
+
+  if (draw_mouse) {
+    auto blend_ret = mouse_blend_ret.get ();
+    if (!blend_ret) {
+      GST_ERROR_OBJECT (self, "Couldn't build mouse draw command");
+      goto error;
+    }
+
+    if (priv->mouse_fence_data && priv->mouse_cl) {
+      cmd_list0 = priv->mouse_cl.Get ();
+
+      if (!gst_d3d12_device_execute_command_lists (self->device,
+              D3D12_COMMAND_LIST_TYPE_DIRECT, 1, cmd_list,
+              &priv->mouse_fence_val)) {
+        GST_ERROR_OBJECT (self, "Couldn't execute command list");
+        goto error;
+      }
+
+      gst_d3d12_device_set_fence_notify (self->device,
+          D3D12_COMMAND_LIST_TYPE_DIRECT, priv->mouse_fence_val,
+          priv->mouse_fence_data);
+      priv->mouse_fence_data = nullptr;
+
+      gst_d3d12_buffer_after_write (buffer, priv->mouse_fence_val);
+    }
+  }
+
+  if (have_dirty_rect) {
+    gst_d3d12_device_fence_wait (self->device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        priv->fence_val, priv->event_handle);
+  }
+
+  priv->ctx->ReleaseFrame ();
+
+  return GST_FLOW_OK;
+
+error:
+  if (mouse_blend_ret.valid ())
+    mouse_blend_ret.get ();
+
+  gst_clear_d3d12_fence_data (&priv->mouse_fence_data);
+  gst_clear_d3d12_fence_data (&fence_data);
+  gst_clear_buffer (&priv->mouse_buf);
+  gst_clear_buffer (&priv->mouse_xor_buf);
+  resource = nullptr;
+  priv->last_resource = nullptr;
+  priv->shared_resource = nullptr;
+  priv->processed_frame = nullptr;
+  priv->move_frame = nullptr;
+  priv->ctx = nullptr;
+
+  return GST_FLOW_ERROR;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12dxgicapture.h Added

@@ -0,0 +1,36 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12screencapture.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_DXGI_CAPTURE (gst_d3d12_dxgi_capture_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12DxgiCapture, gst_d3d12_dxgi_capture,
+    GST, D3D12_DXGI_CAPTURE, GstD3D12ScreenCapture);
+
+GstD3D12ScreenCapture * gst_d3d12_dxgi_capture_new (GstD3D12Device * device,
+                                                    HMONITOR monitor_handle);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12encoder.cpp Added

@@ -0,0 +1,1651 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12encoder.h"
+#include "gstd3d12encoderbufferpool.h"
+#include "gstd3d12pluginutils.h"
+#include <gst/base/gstqueuearray.h>
+#include <directx/d3dx12.h>
+#include <wrl.h>
+#include <memory>
+#include <vector>
+#include <queue>
+#include <mutex>
+#include <condition_variable>
+#include <atomic>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_encoder_debug);
+#define GST_CAT_DEFAULT gst_d3d12_encoder_debug
+
+enum
+{
+  PROP_0,
+  PROP_ADAPTER_LUID,
+  PROP_DEVICE_ID,
+  PROP_VENDOR_ID,
+};
+
+#define ASYNC_DEPTH 4
+
+struct EncoderOutputData
+{
+  GstVideoCodecFrame *frame = nullptr;
+  GstD3D12EncoderBuffer *buffer = nullptr;
+  guint64 fence_val = 0;
+};
+
+/* *INDENT-OFF* */
+struct EncoderSessionData
+{
+  EncoderSessionData ()
+  {
+    output_queue = gst_queue_array_new_for_struct (sizeof (EncoderOutputData),
+        16);
+  }
+
+  ~EncoderSessionData ()
+  {
+    if (upload_pool)
+      gst_buffer_pool_set_active (upload_pool, FALSE);
+    gst_clear_object (&upload_pool);
+    gst_clear_object (&encoder_pool);
+    gst_queue_array_free (output_queue);
+  }
+
+  ComPtr<ID3D12VideoEncoder> encoder;
+  ComPtr<ID3D12VideoEncoderHeap> heap;
+
+  std::mutex queue_lock;
+  std::condition_variable queue_cond;
+  GstQueueArray *output_queue;
+
+  GstD3D12EncoderBufferPool *encoder_pool = nullptr;
+  GstBufferPool *upload_pool = nullptr;
+};
+
+struct EncoderCmdData
+{
+  EncoderCmdData ()
+  {
+    event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+  }
+
+  ~EncoderCmdData ()
+  {
+    if (queue)
+      gst_d3d12_command_queue_fence_wait (queue, G_MAXUINT64, event_handle);
+
+    CloseHandle (event_handle);
+    gst_clear_object (&ca_pool);
+    gst_clear_object (&queue);
+  }
+
+  ComPtr<ID3D12VideoDevice3> video_device;
+  ComPtr<ID3D12VideoEncodeCommandList2> cl;
+  GstD3D12CommandQueue *queue = nullptr;
+  GstD3D12CommandAllocatorPool *ca_pool = nullptr;
+  HANDLE event_handle;
+  guint64 fence_val = 0;
+};
+
+struct GstD3D12EncoderPrivate
+{
+  GstD3D12EncoderPrivate ()
+  {
+    fence_data_pool = gst_d3d12_fence_data_pool_new ();
+  }
+
+  ~GstD3D12EncoderPrivate ()
+  {
+    gst_clear_object (&fence_data_pool);
+    g_clear_pointer (&input_state, gst_video_codec_state_unref);
+  }
+
+  GstD3D12EncoderConfig config = { };
+  D3D12_VIDEO_ENCODER_DESC encoder_desc = { };
+  D3D12_VIDEO_ENCODER_HEAP_DESC heap_desc = { };
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTS resource_req = { };
+
+  GstVideoCodecState *input_state = nullptr;
+
+  std::vector<D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA> subregions;
+
+  std::unique_ptr<EncoderCmdData> cmd;
+  std::unique_ptr<EncoderSessionData> session;
+  GThread *output_thread = nullptr;
+  GstD3D12FenceDataPool *fence_data_pool;
+  std::atomic<GstFlowReturn> last_flow = { GST_FLOW_OK };
+  std::atomic<bool> flushing = { false };
+  bool array_of_textures = false;
+  D3D12_FEATURE_DATA_FORMAT_INFO format_info = { };
+};
+/* *INDENT-ON* */
+
+static void gst_d3d12_encoder_finalize (GObject * object);
+static void gst_d3d12_encoder_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_d3d12_encoder_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static void gst_d3d12_encoder_set_context (GstElement * element,
+    GstContext * context);
+static gboolean gst_d3d12_encoder_open (GstVideoEncoder * encoder);
+static gboolean gst_d3d12_encoder_start (GstVideoEncoder * encoder);
+static gboolean gst_d3d12_encoder_stop (GstVideoEncoder * encoder);
+static gboolean gst_d3d12_encoder_close (GstVideoEncoder * encoder);
+static gboolean gst_d3d12_encoder_sink_query (GstVideoEncoder * encoder,
+    GstQuery * query);
+static gboolean gst_d3d12_encoder_src_query (GstVideoEncoder * encoder,
+    GstQuery * query);
+static gboolean gst_d3d12_encoder_propose_allocation (GstVideoEncoder * encoder,
+    GstQuery * query);
+static gboolean gst_d3d12_encoder_set_format (GstVideoEncoder * encoder,
+    GstVideoCodecState * state);
+static GstFlowReturn gst_d3d12_encoder_handle_frame (GstVideoEncoder * encoder,
+    GstVideoCodecFrame * frame);
+static GstFlowReturn gst_d3d12_encoder_finish (GstVideoEncoder * encoder);
+static gboolean gst_d3d12_encoder_flush (GstVideoEncoder * encoder);
+
+#define gst_d3d12_encoder_parent_class parent_class
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstD3D12Encoder,
+    gst_d3d12_encoder, GST_TYPE_VIDEO_ENCODER,
+    GST_DEBUG_CATEGORY_INIT (gst_d3d12_encoder_debug,
+        "d3d12encoder", 0, "d3d12encoder"));
+
+static void
+gst_d3d12_encoder_class_init (GstD3D12EncoderClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto element_class = GST_ELEMENT_CLASS (klass);
+  auto encoder_class = GST_VIDEO_ENCODER_CLASS (klass);
+  auto read_only_params = (GParamFlags) (GST_PARAM_DOC_SHOW_DEFAULT |
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  object_class->finalize = gst_d3d12_encoder_finalize;
+  object_class->get_property = gst_d3d12_encoder_get_property;
+
+  g_object_class_install_property (object_class, PROP_ADAPTER_LUID,
+      g_param_spec_int64 ("adapter-luid", "Adapter LUID",
+          "DXGI Adapter LUID (Locally Unique Identifier) of created device",
+          G_MININT64, G_MAXINT64, 0, read_only_params));
+  g_object_class_install_property (object_class, PROP_DEVICE_ID,
+      g_param_spec_uint ("device-id", "Device Id",
+          "DXGI Device ID", 0, G_MAXUINT32, 0, read_only_params));
+  g_object_class_install_property (object_class, PROP_VENDOR_ID,
+      g_param_spec_uint ("vendor-id", "Vendor Id",
+          "DXGI Vendor ID", 0, G_MAXUINT32, 0, read_only_params));
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_encoder_set_context);
+
+  encoder_class->open = GST_DEBUG_FUNCPTR (gst_d3d12_encoder_open);
+  encoder_class->start = GST_DEBUG_FUNCPTR (gst_d3d12_encoder_start);
+  encoder_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_encoder_stop);
+  encoder_class->close = GST_DEBUG_FUNCPTR (gst_d3d12_encoder_close);
+  encoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d12_encoder_sink_query);
+  encoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d12_encoder_src_query);
+  encoder_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_encoder_propose_allocation);
+  encoder_class->set_format = GST_DEBUG_FUNCPTR (gst_d3d12_encoder_set_format);
+  encoder_class->handle_frame =
+      GST_DEBUG_FUNCPTR (gst_d3d12_encoder_handle_frame);
+  encoder_class->finish = GST_DEBUG_FUNCPTR (gst_d3d12_encoder_finish);
+  encoder_class->flush = GST_DEBUG_FUNCPTR (gst_d3d12_encoder_flush);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_ENCODER, (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_ENCODER_RATE_CONTROL,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_ENCODER_RATE_CONTROL_SUPPORT,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_ENCODER_SUBREGION_LAYOUT,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_ENCODER_SUBREGION_LAYOUT_SUPPORT,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_ENCODER_SEI_INSERT_MODE,
+      (GstPluginAPIFlags) 0);
+}
+
+static void
+gst_d3d12_encoder_init (GstD3D12Encoder * self)
+{
+  self->priv = new GstD3D12EncoderPrivate ();
+}
+
+static void
+gst_d3d12_encoder_finalize (GObject * object)
+{
+  auto self = GST_D3D12_ENCODER (object);
+
+  delete self->priv;
+  gst_clear_object (&self->device);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_encoder_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_ENCODER (object);
+  auto klass = GST_D3D12_ENCODER_GET_CLASS (self);
+
+  switch (prop_id) {
+    case PROP_ADAPTER_LUID:
+      g_value_set_int64 (value, klass->adapter_luid);
+      break;
+    case PROP_DEVICE_ID:
+      g_value_set_uint (value, klass->device_id);
+      break;
+    case PROP_VENDOR_ID:
+      g_value_set_uint (value, klass->vendor_id);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_encoder_set_context (GstElement * element, GstContext * context)
+{
+  auto self = GST_D3D12_ENCODER (element);
+  auto klass = GST_D3D12_ENCODER_GET_CLASS (self);
+
+  gst_d3d12_handle_set_context_for_adapter_luid (element, context,
+      klass->adapter_luid, &self->device);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_d3d12_encoder_open (GstVideoEncoder * encoder)
+{
+  auto self = GST_D3D12_ENCODER (encoder);
+  auto priv = self->priv;
+  auto klass = GST_D3D12_ENCODER_GET_CLASS (self);
+  HRESULT hr;
+  ComPtr < ID3D12VideoDevice3 > video_device;
+
+  if (!gst_d3d12_ensure_element_data_for_adapter_luid (GST_ELEMENT_CAST (self),
+          klass->adapter_luid, &self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't get device");
+    return FALSE;
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  hr = device->QueryInterface (IID_PPV_ARGS (&video_device));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "ID3D12VideoDevice3 interface is unavailable");
+    return FALSE;
+  }
+
+  D3D12_COMMAND_QUEUE_DESC queue_desc = { };
+  queue_desc.Type = D3D12_COMMAND_LIST_TYPE_VIDEO_ENCODE;
+
+  auto cmd = std::make_unique < EncoderCmdData > ();
+  cmd->queue = gst_d3d12_command_queue_new (self->device,
+      &queue_desc, ASYNC_DEPTH);
+  if (!cmd->queue) {
+    GST_ERROR_OBJECT (self, "Couldn't create command queue");
+    return FALSE;
+  }
+
+  cmd->ca_pool = gst_d3d12_command_allocator_pool_new (self->device,
+      D3D12_COMMAND_LIST_TYPE_VIDEO_ENCODE);
+  cmd->video_device = video_device;
+
+  priv->cmd = std::move (cmd);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_encoder_start (GstVideoEncoder * encoder)
+{
+  auto self = GST_D3D12_ENCODER (encoder);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Start");
+
+  if (!priv->cmd) {
+    GST_ERROR_OBJECT (self, "Command data is not configured");
+    return FALSE;
+  }
+
+  priv->last_flow = GST_FLOW_OK;
+
+  return TRUE;
+}
+
+static void
+gst_d3d12_encoder_drain (GstD3D12Encoder * self, gboolean locked)
+{
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Draining");
+
+  /* Unlock stream-lock so that output thread can push pending data
+   * from output thread */
+  if (locked)
+    GST_VIDEO_ENCODER_STREAM_UNLOCK (self);
+
+  if (priv->cmd) {
+    GST_DEBUG_OBJECT (self, "Waiting for command finish %" G_GUINT64_FORMAT,
+        priv->cmd->fence_val);
+    gst_d3d12_command_queue_fence_wait (priv->cmd->queue, priv->cmd->fence_val,
+        priv->cmd->event_handle);
+  }
+
+  if (priv->session && priv->output_thread) {
+    GST_DEBUG_OBJECT (self, "Sending empty task");
+    auto empty_data = EncoderOutputData ();
+    std::lock_guard < std::mutex > lk (priv->session->queue_lock);
+    gst_queue_array_push_tail_struct (priv->session->output_queue, &empty_data);
+    priv->session->queue_cond.notify_one ();
+  }
+
+  g_clear_pointer (&priv->output_thread, g_thread_join);
+
+  if (locked)
+    GST_VIDEO_ENCODER_STREAM_LOCK (self);
+
+  GST_DEBUG_OBJECT (self, "Drained");
+}
+
+static gboolean
+gst_d3d12_encoder_stop (GstVideoEncoder * encoder)
+{
+  auto self = GST_D3D12_ENCODER (encoder);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  gst_d3d12_encoder_drain (self, FALSE);
+  priv->session = nullptr;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_encoder_close (GstVideoEncoder * encoder)
+{
+  auto self = GST_D3D12_ENCODER (encoder);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Close");
+
+  gst_d3d12_encoder_drain (self, FALSE);
+  priv->session = nullptr;
+  priv->cmd = nullptr;
+
+  gst_clear_object (&self->device);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_encoder_handle_query (GstD3D12Encoder * self, GstQuery * query)
+{
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      return gst_d3d12_handle_context_query (GST_ELEMENT (self),
+          query, self->device);
+    default:
+      break;
+  }
+
+  return FALSE;
+}
+
+static gboolean
+gst_d3d12_encoder_sink_query (GstVideoEncoder * encoder, GstQuery * query)
+{
+  auto self = GST_D3D12_ENCODER (encoder);
+
+  if (gst_d3d12_encoder_handle_query (self, query))
+    return TRUE;
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->sink_query (encoder, query);
+}
+
+static gboolean
+gst_d3d12_encoder_src_query (GstVideoEncoder * encoder, GstQuery * query)
+{
+  auto self = GST_D3D12_ENCODER (encoder);
+
+  if (gst_d3d12_encoder_handle_query (self, query))
+    return TRUE;
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->src_query (encoder, query);
+}
+
+static GstBufferPool *
+gst_d3d12_encoder_create_upload_pool (GstD3D12Encoder * self)
+{
+  auto priv = self->priv;
+  GstVideoInfo info;
+
+  gst_video_info_set_format (&info, GST_VIDEO_FORMAT_NV12,
+      priv->config.resolution.Width, priv->config.resolution.Height);
+  auto caps = gst_video_info_to_caps (&info);
+  auto pool = gst_d3d12_buffer_pool_new (self->device);
+  auto config = gst_buffer_pool_get_config (pool);
+
+  auto params = gst_d3d12_allocation_params_new (self->device, &info,
+      GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+      D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS |
+      D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET);
+  gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+  gst_d3d12_allocation_params_free (params);
+  gst_buffer_pool_config_set_params (config, caps, info.size, 0, 0);
+  gst_caps_unref (caps);
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (self, "Set config failed");
+    gst_object_unref (pool);
+    return nullptr;
+  }
+
+  if (!gst_buffer_pool_set_active (pool, TRUE)) {
+    GST_ERROR_OBJECT (self, "Set active failed");
+    gst_object_unref (pool);
+    return nullptr;
+  }
+
+  return pool;
+}
+
+static gboolean
+gst_d3d12_encoder_propose_allocation (GstVideoEncoder * encoder,
+    GstQuery * query)
+{
+  auto self = GST_D3D12_ENCODER (encoder);
+  auto priv = self->priv;
+  GstCaps *caps;
+  GstVideoInfo info;
+
+  gst_query_parse_allocation (query, &caps, nullptr);
+  if (!caps) {
+    GST_WARNING_OBJECT (self, "null caps in query");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_WARNING_OBJECT (self, "Failed to convert caps into info");
+    return FALSE;
+  }
+
+  auto features = gst_caps_get_features (caps, 0);
+  gboolean is_d3d12 = FALSE;
+  GstBufferPool *pool;
+  if (gst_caps_features_contains (features,
+          GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY)) {
+    GST_DEBUG_OBJECT (self, "Upstream supports d3d12 memory");
+    pool = gst_d3d12_buffer_pool_new (self->device);
+    is_d3d12 = TRUE;
+  } else {
+    pool = gst_video_buffer_pool_new ();
+  }
+
+  if (!pool) {
+    GST_ERROR_OBJECT (self, "Couldn't create buffer pool");
+    return FALSE;
+  }
+
+  auto config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+  if (is_d3d12) {
+    GstVideoAlignment align;
+
+    gst_video_alignment_reset (&align);
+    align.padding_right = priv->config.resolution.Width - info.width;
+    align.padding_bottom = priv->config.resolution.Height - info.height;
+
+    auto params = gst_d3d12_allocation_params_new (self->device, &info,
+        GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS |
+        D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET);
+    gst_d3d12_allocation_params_alignment (params, &align);
+    gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+    gst_d3d12_allocation_params_free (params);
+  } else {
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+  }
+
+  guint size = GST_VIDEO_INFO_SIZE (&info);
+  gst_buffer_pool_config_set_params (config, caps, size, ASYNC_DEPTH, 0);
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (self, "Failed to set pool config");
+    gst_object_unref (pool);
+    return FALSE;
+  }
+
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  gst_query_add_allocation_pool (query, pool, size, ASYNC_DEPTH, 0);
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, nullptr);
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_encoder_set_format (GstVideoEncoder * encoder,
+    GstVideoCodecState * state)
+{
+  auto self = GST_D3D12_ENCODER (encoder);
+  auto priv = self->priv;
+  auto klass = GST_D3D12_ENCODER_GET_CLASS (self);
+
+  gst_d3d12_encoder_drain (self, TRUE);
+  priv->session = nullptr;
+
+  g_clear_pointer (&priv->input_state, gst_video_codec_state_unref);
+  priv->input_state = gst_video_codec_state_ref (state);
+
+  priv->last_flow = GST_FLOW_OK;
+  priv->config = { };
+
+  GST_DEBUG_OBJECT (self, "Set format with caps %" GST_PTR_FORMAT, state->caps);
+
+  if (!klass->new_sequence (self, priv->cmd->video_device.Get (), state,
+          &priv->config)) {
+    GST_ERROR_OBJECT (self, "Couldn't accept new sequence");
+    return FALSE;
+  }
+
+  g_assert (priv->config.max_subregions > 0);
+
+  auto & config = priv->config;
+  auto flags = config.support_flags;
+
+  GST_DEBUG_OBJECT (self, "Encoder caps, "
+      "rate-control-reconfig: %d, resolution-reconfig: %d, "
+      "vbv-size: %d, frame-analysis: %d, texture-arrays: %d, delta-qp: %d, "
+      "subregion-reconfig: %d, qp-range: %d, initial-qp: %d, "
+      "max-frame-size: %d, gop-reconfigure: %d, me-precision-limit: %d",
+      CHECK_SUPPORT_FLAG (flags, RATE_CONTROL_RECONFIGURATION_AVAILABLE),
+      CHECK_SUPPORT_FLAG (flags, RESOLUTION_RECONFIGURATION_AVAILABLE),
+      CHECK_SUPPORT_FLAG (flags, RATE_CONTROL_VBV_SIZE_CONFIG_AVAILABLE),
+      CHECK_SUPPORT_FLAG (flags, RATE_CONTROL_FRAME_ANALYSIS_AVAILABLE),
+      CHECK_SUPPORT_FLAG (flags, RECONSTRUCTED_FRAMES_REQUIRE_TEXTURE_ARRAYS),
+      CHECK_SUPPORT_FLAG (flags, RATE_CONTROL_DELTA_QP_AVAILABLE),
+      CHECK_SUPPORT_FLAG (flags, SUBREGION_LAYOUT_RECONFIGURATION_AVAILABLE),
+      CHECK_SUPPORT_FLAG (flags, RATE_CONTROL_ADJUSTABLE_QP_RANGE_AVAILABLE),
+      CHECK_SUPPORT_FLAG (flags, RATE_CONTROL_INITIAL_QP_AVAILABLE),
+      CHECK_SUPPORT_FLAG (flags, RATE_CONTROL_MAX_FRAME_SIZE_AVAILABLE),
+      CHECK_SUPPORT_FLAG (flags, SEQUENCE_GOP_RECONFIGURATION_AVAILABLE),
+      CHECK_SUPPORT_FLAG (flags,
+          MOTION_ESTIMATION_PRECISION_MODE_LIMIT_AVAILABLE));
+
+  auto video_device = priv->cmd->video_device;
+
+  auto & resource_req = priv->resource_req;
+  resource_req.Codec = klass->codec;
+  resource_req.Profile = config.profile_desc;
+  resource_req.InputFormat = DXGI_FORMAT_NV12;
+  resource_req.PictureTargetResolution = config.resolution;
+  auto hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_RESOURCE_REQUIREMENTS,
+      &resource_req, sizeof (resource_req));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't query resource requirement");
+    return FALSE;
+  }
+
+  if (CHECK_SUPPORT_FLAG (flags, RECONSTRUCTED_FRAMES_REQUIRE_TEXTURE_ARRAYS)) {
+    GST_DEBUG_OBJECT (self, "Device requires texture array");
+    priv->array_of_textures = false;
+  } else {
+    GST_DEBUG_OBJECT (self, "Device supports array of textures");
+    priv->array_of_textures = true;
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  priv->format_info.Format = DXGI_FORMAT_NV12;
+  hr = device->CheckFeatureSupport (D3D12_FEATURE_FORMAT_INFO,
+      &priv->format_info, sizeof (priv->format_info));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't query format info");
+    return FALSE;
+  }
+
+  auto session = std::make_unique < EncoderSessionData > ();
+
+  auto & desc = priv->encoder_desc;
+  desc = { };
+  desc.EncodeCodec = klass->codec;
+  desc.EncodeProfile = config.profile_desc;
+  desc.InputFormat = priv->format_info.Format;
+  desc.CodecConfiguration = config.codec_config;
+  desc.MaxMotionEstimationPrecision =
+      D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_MAXIMUM;
+
+  hr = video_device->CreateVideoEncoder (&desc,
+      IID_PPV_ARGS (&session->encoder));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create encoder");
+    return FALSE;
+  }
+
+  auto & heap_desc = priv->heap_desc;
+  heap_desc = { };
+  heap_desc.EncodeCodec = klass->codec;
+  heap_desc.EncodeProfile = config.profile_desc;
+  heap_desc.EncodeLevel = config.level;
+  heap_desc.ResolutionsListCount = 1;
+  heap_desc.pResolutionList = &config.resolution;
+  hr = video_device->CreateVideoEncoderHeap (&heap_desc,
+      IID_PPV_ARGS (&session->heap));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create encoder heap");
+    return FALSE;
+  }
+
+  guint resolved_metadata_size;
+  resolved_metadata_size = sizeof (D3D12_VIDEO_ENCODER_OUTPUT_METADATA)
+      + sizeof (D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA) *
+      config.max_subregions;
+  if (resource_req.EncoderMetadataBufferAccessAlignment > 1) {
+    resolved_metadata_size =
+        ((resolved_metadata_size +
+            resource_req.EncoderMetadataBufferAccessAlignment - 1) /
+        resource_req.EncoderMetadataBufferAccessAlignment) *
+        resource_req.EncoderMetadataBufferAccessAlignment;
+  }
+
+  /* TODO: calculate bitstream buffer size */
+  guint bitstream_size = 1024 * 1024 * 8;
+  session->encoder_pool = gst_d3d12_encoder_buffer_pool_new (self->device,
+      resource_req.MaxEncoderOutputMetadataBufferSize,
+      resolved_metadata_size, bitstream_size, ASYNC_DEPTH);
+
+  session->upload_pool = gst_d3d12_encoder_create_upload_pool (self);
+  if (!session->upload_pool)
+    return FALSE;
+
+  priv->session = std::move (session);
+
+  return TRUE;
+}
+
+static GstBuffer *
+gst_d3d12_encoder_upload_frame (GstD3D12Encoder * self, GstBuffer * buffer)
+{
+  auto priv = self->priv;
+  const auto info = &priv->input_state->info;
+  GstBuffer *upload = nullptr;
+  gboolean d3d12_copy = FALSE;
+
+  auto mem = gst_buffer_peek_memory (buffer, 0);
+  if (gst_is_d3d12_memory (mem)) {
+    auto dmem = GST_D3D12_MEMORY_CAST (mem);
+    if (dmem->device == self->device) {
+      GstMapInfo map_info;
+      if (!gst_memory_map (mem, &map_info,
+              (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D12))) {
+        GST_ERROR_OBJECT (self, "Couldn't map memory");
+        return nullptr;
+      }
+
+      gst_memory_unmap (mem, &map_info);
+
+      auto resource = gst_d3d12_memory_get_resource_handle (dmem);
+      auto desc = resource->GetDesc ();
+      if (desc.Width >= (UINT64) priv->config.resolution.Width &&
+          desc.Height >= priv->config.resolution.Height) {
+        return gst_buffer_ref (buffer);
+      }
+
+      d3d12_copy = TRUE;
+    }
+  }
+
+  gst_buffer_pool_acquire_buffer (priv->session->upload_pool, &upload, nullptr);
+  if (!upload) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire buffer");
+    return nullptr;
+  }
+
+  if (d3d12_copy) {
+    std::vector < GstD3D12CopyTextureRegionArgs > copy_args;
+    auto dmem = GST_D3D12_MEMORY_CAST (mem);
+    auto src_resource = gst_d3d12_memory_get_resource_handle (dmem);
+    dmem = (GstD3D12Memory *) gst_buffer_peek_memory (upload, 0);
+    auto dst_resource = gst_d3d12_memory_get_resource_handle (dmem);
+    D3D12_BOX src_box2;
+
+    auto desc = src_resource->GetDesc ();
+
+    UINT width = MIN ((UINT) desc.Width, priv->config.resolution.Width);
+    UINT height = MIN ((UINT) desc.Height, priv->config.resolution.Height);
+
+    for (guint i = 0; i < 2; i++) {
+      GstD3D12CopyTextureRegionArgs args;
+      memset (&args, 0, sizeof (args));
+
+      args.src = CD3DX12_TEXTURE_COPY_LOCATION (src_resource, i);
+      args.dst = CD3DX12_TEXTURE_COPY_LOCATION (dst_resource, i);
+
+      src_boxi.left = 0;
+      src_boxi.top = 0;
+      src_boxi.front = 0;
+      src_boxi.back = 1;
+
+      if (i == 0) {
+        src_boxi.right = width;
+        src_boxi.bottom = height;
+      } else {
+        src_boxi.right = width / 2;
+        src_boxi.bottom = height / 2;
+      }
+
+      args.src_box = &src_boxi;
+      copy_args.push_back (args);
+    }
+
+    guint64 fence_val = 0;
+    gst_d3d12_device_copy_texture_region (self->device, copy_args.size (),
+        copy_args.data (), D3D12_COMMAND_LIST_TYPE_DIRECT, &fence_val);
+    gst_d3d12_buffer_after_write (upload, fence_val);
+  } else {
+    GstVideoFrame src_frame, dst_frame;
+    if (!gst_video_frame_map (&src_frame, info, buffer, GST_MAP_READ)) {
+      GST_ERROR_OBJECT (self, "Couldn't map frame");
+      gst_buffer_unref (upload);
+      return nullptr;
+    }
+
+    if (!gst_video_frame_map (&dst_frame, info, upload, GST_MAP_WRITE)) {
+      GST_ERROR_OBJECT (self, "Couldn't map frame");
+      gst_video_frame_unmap (&src_frame);
+      gst_buffer_unref (upload);
+      return nullptr;
+    }
+
+    for (guint i = 0; i < GST_VIDEO_FRAME_N_PLANES (&src_frame); i++) {
+      auto src_width_in_bytes = GST_VIDEO_FRAME_COMP_WIDTH (&src_frame, i) *
+          GST_VIDEO_FRAME_COMP_PSTRIDE (&src_frame, i);
+      auto src_height = GST_VIDEO_FRAME_COMP_HEIGHT (&src_frame, i);
+      auto src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (&src_frame, i);
+
+      auto dst_width_in_bytes = GST_VIDEO_FRAME_COMP_WIDTH (&dst_frame, i) *
+          GST_VIDEO_FRAME_COMP_PSTRIDE (&dst_frame, i);
+      auto dst_height = GST_VIDEO_FRAME_COMP_HEIGHT (&dst_frame, i);
+      auto dst_stride = GST_VIDEO_FRAME_PLANE_STRIDE (&dst_frame, i);
+
+      auto width_in_bytes = MIN (src_width_in_bytes, dst_width_in_bytes);
+      auto height = MIN (src_height, dst_height);
+      auto src_data = (guint8 *) GST_VIDEO_FRAME_PLANE_DATA (&src_frame, i);
+      auto dst_data = (guint8 *) GST_VIDEO_FRAME_PLANE_DATA (&dst_frame, i);
+
+      for (guint j = 0; j < height; j++) {
+        memcpy (dst_data, src_data, width_in_bytes);
+        dst_data += dst_stride;
+        src_data += src_stride;
+      }
+    }
+
+    gst_video_frame_unmap (&dst_frame);
+    gst_video_frame_unmap (&src_frame);
+
+    GstMapInfo map_info;
+    mem = gst_buffer_peek_memory (upload, 0);
+    if (!gst_memory_map (mem, &map_info,
+            (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D12))) {
+      GST_ERROR_OBJECT (self, "Couldn't map memory");
+      gst_buffer_unref (upload);
+      return nullptr;
+    }
+
+    gst_memory_unmap (mem, &map_info);
+  }
+
+  return upload;
+}
+
+static void
+gst_d3d12_encoder_build_command (GstD3D12Encoder * self,
+    const D3D12_VIDEO_ENCODER_ENCODEFRAME_INPUT_ARGUMENTS * in_args,
+    const D3D12_VIDEO_ENCODER_ENCODEFRAME_OUTPUT_ARGUMENTS * out_args,
+    const D3D12_VIDEO_ENCODER_RESOLVE_METADATA_INPUT_ARGUMENTS * meta_in_args,
+    const D3D12_VIDEO_ENCODER_RESOLVE_METADATA_OUTPUT_ARGUMENTS * meta_out_args,
+    GstD3D12FenceData * fence_data,
+    ID3D12VideoEncodeCommandList2 * command_list)
+{
+  auto priv = self->priv;
+  const auto & format_info = priv->format_info;
+  auto array_of_textures = priv->array_of_textures;
+
+  std::vector < D3D12_RESOURCE_BARRIER > pre_enc_barrier;
+  std::vector < D3D12_RESOURCE_BARRIER > post_enc_barrier;
+
+  pre_enc_barrier.
+      push_back (CD3DX12_RESOURCE_BARRIER::Transition (in_args->pInputFrame,
+          D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ));
+  post_enc_barrier.
+      push_back (CD3DX12_RESOURCE_BARRIER::Transition (in_args->pInputFrame,
+          D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ, D3D12_RESOURCE_STATE_COMMON));
+
+  /* Reference picture barriers */
+  if (in_args->PictureControlDesc.ReferenceFrames.NumTexture2Ds > 0) {
+    if (array_of_textures) {
+      for (UINT i = 0;
+          i < in_args->PictureControlDesc.ReferenceFrames.NumTexture2Ds; i++) {
+        auto ref_pic =
+            in_args->PictureControlDesc.ReferenceFrames.ppTexture2Dsi;
+        ref_pic->AddRef ();
+        gst_d3d12_fence_data_add_notify_com (fence_data, ref_pic);
+        pre_enc_barrier.push_back (CD3DX12_RESOURCE_BARRIER::
+            Transition (ref_pic, D3D12_RESOURCE_STATE_COMMON,
+                D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ));
+        post_enc_barrier.push_back (CD3DX12_RESOURCE_BARRIER::
+            Transition (ref_pic, D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ,
+                D3D12_RESOURCE_STATE_COMMON));
+      }
+    } else {
+      auto ref_pic =
+          in_args->PictureControlDesc.ReferenceFrames.ppTexture2Ds0;
+      ref_pic->AddRef ();
+      gst_d3d12_fence_data_add_notify_com (fence_data, ref_pic);
+      auto ref_pic_desc = ref_pic->GetDesc ();
+
+      for (UINT i = 0;
+          i < in_args->PictureControlDesc.ReferenceFrames.NumTexture2Ds; i++) {
+        UINT mip_slice, plane_slice, array_slice;
+        D3D12DecomposeSubresource (in_args->PictureControlDesc.
+            ReferenceFrames.pSubresourcesi, ref_pic_desc.MipLevels,
+            ref_pic_desc.DepthOrArraySize, mip_slice, array_slice, plane_slice);
+
+        for (UINT plane = 0; plane < format_info.PlaneCount; plane++) {
+          UINT subresource = D3D12CalcSubresource (mip_slice, array_slice,
+              plane, ref_pic_desc.MipLevels,
+              ref_pic_desc.DepthOrArraySize);
+
+          pre_enc_barrier.push_back (CD3DX12_RESOURCE_BARRIER::
+              Transition (ref_pic, D3D12_RESOURCE_STATE_COMMON,
+                  D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ, subresource));
+          post_enc_barrier.push_back (CD3DX12_RESOURCE_BARRIER::
+              Transition (ref_pic, D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ,
+                  D3D12_RESOURCE_STATE_COMMON, subresource));
+        }
+      }
+    }
+  }
+
+  /* Reconstructed picture barries */
+  if (out_args->ReconstructedPicture.pReconstructedPicture) {
+    out_args->ReconstructedPicture.pReconstructedPicture->AddRef ();
+    gst_d3d12_fence_data_add_notify_com (fence_data,
+        out_args->ReconstructedPicture.pReconstructedPicture);
+
+    if (array_of_textures) {
+      pre_enc_barrier.push_back (CD3DX12_RESOURCE_BARRIER::
+          Transition (out_args->ReconstructedPicture.pReconstructedPicture,
+              D3D12_RESOURCE_STATE_COMMON,
+              D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE));
+
+      post_enc_barrier.push_back (CD3DX12_RESOURCE_BARRIER::
+          Transition (out_args->ReconstructedPicture.pReconstructedPicture,
+              D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE,
+              D3D12_RESOURCE_STATE_COMMON));
+    } else {
+      auto recon_pic_desc =
+          out_args->ReconstructedPicture.pReconstructedPicture->GetDesc ();
+      UINT mip_slice, plane_slice, array_slice;
+
+      D3D12DecomposeSubresource (out_args->
+          ReconstructedPicture.ReconstructedPictureSubresource,
+          recon_pic_desc.MipLevels, recon_pic_desc.DepthOrArraySize, mip_slice,
+          array_slice, plane_slice);
+
+      for (UINT plane = 0; plane < format_info.PlaneCount; plane++) {
+        UINT subresource = D3D12CalcSubresource (mip_slice, array_slice,
+            plane, recon_pic_desc.MipLevels,
+            recon_pic_desc.DepthOrArraySize);
+
+        pre_enc_barrier.push_back (CD3DX12_RESOURCE_BARRIER::
+            Transition (out_args->ReconstructedPicture.pReconstructedPicture,
+                D3D12_RESOURCE_STATE_COMMON,
+                D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE, subresource));
+
+        post_enc_barrier.push_back (CD3DX12_RESOURCE_BARRIER::
+            Transition (out_args->ReconstructedPicture.pReconstructedPicture,
+                D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE,
+                D3D12_RESOURCE_STATE_COMMON, subresource));
+      }
+    }
+  }
+
+  pre_enc_barrier.
+      push_back (CD3DX12_RESOURCE_BARRIER::Transition (out_args->Bitstream.
+          pBuffer, D3D12_RESOURCE_STATE_COMMON,
+          D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE));
+  pre_enc_barrier.
+      push_back (CD3DX12_RESOURCE_BARRIER::
+      Transition (out_args->EncoderOutputMetadata.pBuffer,
+          D3D12_RESOURCE_STATE_COMMON,
+          D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE));
+
+  command_list->ResourceBarrier (pre_enc_barrier.size (),
+      pre_enc_barrier.data ());
+
+  auto encoder = priv->session->encoder;
+  auto heap = priv->session->heap;
+
+  command_list->EncodeFrame (encoder.Get (), heap.Get (), in_args, out_args);
+  gst_d3d12_fence_data_add_notify_com (fence_data, encoder.Detach ());
+  gst_d3d12_fence_data_add_notify_com (fence_data, heap.Detach ());
+
+  post_enc_barrier.
+      push_back (CD3DX12_RESOURCE_BARRIER::Transition (out_args->Bitstream.
+          pBuffer, D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE,
+          D3D12_RESOURCE_STATE_COMMON));
+  post_enc_barrier.
+      push_back (CD3DX12_RESOURCE_BARRIER::
+      Transition (out_args->EncoderOutputMetadata.pBuffer,
+          D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE,
+          D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ));
+  post_enc_barrier.push_back (CD3DX12_RESOURCE_BARRIER::
+      Transition (meta_out_args->ResolvedLayoutMetadata.pBuffer,
+          D3D12_RESOURCE_STATE_COMMON,
+          D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE));
+
+  command_list->ResourceBarrier (post_enc_barrier.size (),
+      post_enc_barrier.data ());
+
+  command_list->ResolveEncoderOutputMetadata (meta_in_args, meta_out_args);
+
+  std::vector < D3D12_RESOURCE_BARRIER > post_resolve_barrier;
+  post_resolve_barrier.push_back (CD3DX12_RESOURCE_BARRIER::
+      Transition (out_args->EncoderOutputMetadata.pBuffer,
+          D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ, D3D12_RESOURCE_STATE_COMMON));
+  post_resolve_barrier.push_back (CD3DX12_RESOURCE_BARRIER::
+      Transition (meta_out_args->ResolvedLayoutMetadata.pBuffer,
+          D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE,
+          D3D12_RESOURCE_STATE_COMMON));
+
+  command_list->ResourceBarrier (post_resolve_barrier.size (),
+      post_resolve_barrier.data ());
+}
+
+static gboolean
+gst_d3d12_encoder_resolve_bitstream (GstD3D12Encoder * self,
+    ID3D12Resource * resolved_metadata, ID3D12Resource * bitstream,
+    GstBuffer * output)
+{
+  auto priv = self->priv;
+  guint8 *map_data;
+  HRESULT hr;
+
+  g_assert (output);
+
+  CD3DX12_RANGE zero_range (0, 0);
+
+  hr = resolved_metadata->Map (0, nullptr, (void **) &map_data);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't map metadata");
+    return FALSE;
+  }
+
+  D3D12_VIDEO_ENCODER_OUTPUT_METADATA output_meta =
+      *((D3D12_VIDEO_ENCODER_OUTPUT_METADATA *) map_data);
+  GST_TRACE_OBJECT (self,
+      "EncodeErrorFlags: %" G_GUINT64_FORMAT ", "
+      "EncodeStats.AverageQP: %" G_GUINT64_FORMAT ", "
+      "EncodeStats.IntraCodingUnitsCount: %" G_GUINT64_FORMAT ", "
+      "EncodeStats.InterCodingUnitsCount: %" G_GUINT64_FORMAT ", "
+      "EncodeStats.SkipCodingUnitsCount: %" G_GUINT64_FORMAT ", "
+      "EncodeStats.AverageMotionEstimationXDirection: %" G_GUINT64_FORMAT ", "
+      "EncodeStats.AverageMotionEstimationYDirection: %" G_GUINT64_FORMAT ", "
+      "EncodedBitstreamWrittenBytesCount: %" G_GUINT64_FORMAT ", "
+      "WrittenSubregionsCount: %" G_GUINT64_FORMAT,
+      output_meta.EncodeErrorFlags,
+      output_meta.EncodeStats.AverageQP,
+      output_meta.EncodeStats.IntraCodingUnitsCount,
+      output_meta.EncodeStats.InterCodingUnitsCount,
+      output_meta.EncodeStats.SkipCodingUnitsCount,
+      output_meta.EncodeStats.AverageMotionEstimationXDirection,
+      output_meta.EncodeStats.AverageMotionEstimationYDirection,
+      output_meta.EncodedBitstreamWrittenBytesCount,
+      output_meta.WrittenSubregionsCount);
+
+  if (output_meta.WrittenSubregionsCount == 0 ||
+      output_meta.EncodedBitstreamWrittenBytesCount == 0) {
+    GST_ERROR_OBJECT (self, "No written data");
+    resolved_metadata->Unmap (0, &zero_range);
+
+    return FALSE;
+  }
+
+  if (output_meta.EncodeErrorFlags !=
+      D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_NO_ERROR) {
+    if ((output_meta.EncodeErrorFlags &
+            D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_CODEC_PICTURE_CONTROL_NOT_SUPPORTED)
+        != 0) {
+      GST_ERROR_OBJECT (self, "Picture control not supported");
+    }
+
+    if ((output_meta.EncodeErrorFlags &
+            D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_SUBREGION_LAYOUT_CONFIGURATION_NOT_SUPPORTED)
+        != 0) {
+      GST_ERROR_OBJECT (self, "Subregion layout not supported");
+    }
+
+    if ((output_meta.EncodeErrorFlags &
+            D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_INVALID_REFERENCE_PICTURES) !=
+        0) {
+      GST_ERROR_OBJECT (self, "Invalid reference picture");
+    }
+
+    if ((output_meta.EncodeErrorFlags &
+            D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_RECONFIGURATION_REQUEST_NOT_SUPPORTED)
+        != 0) {
+      GST_ERROR_OBJECT (self, "Reconfigure not supported");
+    }
+
+    if ((output_meta.EncodeErrorFlags &
+            D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_INVALID_METADATA_BUFFER_SOURCE)
+        != 0) {
+      GST_ERROR_OBJECT (self, "Invalid metadata buffer source");
+    }
+    resolved_metadata->Unmap (0, &zero_range);
+
+    return FALSE;
+  }
+
+  map_data += sizeof (D3D12_VIDEO_ENCODER_OUTPUT_METADATA);
+  priv->subregions.clear ();
+  UINT64 total_subregion_size = 0;
+  for (guint i = 0; i < output_meta.WrittenSubregionsCount; i++) {
+    auto subregion =
+        *((D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA *) map_data);
+
+    GST_TRACE_OBJECT (self, "Subregion %d, bSize: %" G_GUINT64_FORMAT ", "
+        "bStartOffset: %" G_GUINT64_FORMAT ", bHeaderSize: %" G_GUINT64_FORMAT,
+        i, subregion.bSize, subregion.bStartOffset, subregion.bHeaderSize);
+
+    subregion.bStartOffset += total_subregion_size;
+
+    priv->subregions.push_back (subregion);
+    total_subregion_size += subregion.bSize;
+    map_data += sizeof (D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA);
+  }
+
+  resolved_metadata->Unmap (0, &zero_range);
+
+  hr = bitstream->Map (0, nullptr, (void **) &map_data);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't map bitstream");
+    return FALSE;
+  }
+
+  auto mem = gst_allocator_alloc (nullptr, total_subregion_size, nullptr);
+  GstMapInfo map_info;
+
+  gst_memory_map (mem, &map_info, GST_MAP_WRITE);
+  auto data = (guint8 *) map_info.data;
+  for (size_t i = 0; i < priv->subregions.size (); i++) {
+    const auto & subregion = priv->subregionsi;
+    memcpy (data, map_data + subregion.bStartOffset, subregion.bSize);
+    data += subregion.bSize;
+  }
+  gst_memory_unmap (mem, &map_info);
+  bitstream->Unmap (0, &zero_range);
+
+  gst_buffer_append_memory (output, mem);
+
+  return TRUE;
+}
+
+static gpointer
+gst_d3d12_encoder_output_loop (GstD3D12Encoder * self)
+{
+  auto priv = self->priv;
+  auto encoder = GST_VIDEO_ENCODER (self);
+
+  GST_DEBUG_OBJECT (self, "Entering output thread");
+
+  HANDLE event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+
+  while (true) {
+    EncoderOutputData output_data;
+    {
+      GST_LOG_OBJECT (self, "Waiting for output data");
+      std::unique_lock < std::mutex > lk (priv->session->queue_lock);
+      while (gst_queue_array_is_empty (priv->session->output_queue))
+        priv->session->queue_cond.wait (lk);
+
+      output_data = *((EncoderOutputData *)
+          gst_queue_array_pop_head_struct (priv->session->output_queue));
+    }
+
+    if (!output_data.frame) {
+      GST_DEBUG_OBJECT (self, "Got terminate data");
+      break;
+    }
+
+    GST_LOG_OBJECT (self, "Processing output %" G_GUINT64_FORMAT,
+        output_data.fence_val);
+
+    gst_d3d12_command_queue_fence_wait (priv->cmd->queue, output_data.fence_val,
+        event_handle);
+
+    if (priv->flushing) {
+      GST_DEBUG_OBJECT (self, "We are flushing");
+      gst_d3d12_encoder_buffer_unref (output_data.buffer);
+      gst_clear_buffer (&output_data.frame->output_buffer);
+      gst_video_encoder_finish_frame (encoder, output_data.frame);
+    } else if (priv->last_flow == GST_FLOW_OK) {
+      ComPtr < ID3D12Resource > resolved_metadata;
+      ComPtr < ID3D12Resource > bitstream;
+
+      gst_d3d12_encoder_buffer_get_resolved_metadata (output_data.buffer,
+          &resolved_metadata);
+      gst_d3d12_encoder_buffer_get_bitstream (output_data.buffer, &bitstream);
+
+      auto frame = output_data.frame;
+      if (!frame->output_buffer)
+        frame->output_buffer = gst_buffer_new ();
+
+      auto resolve_ret = gst_d3d12_encoder_resolve_bitstream (self,
+          resolved_metadata.Get (),
+          bitstream.Get (), frame->output_buffer);
+      gst_d3d12_encoder_buffer_unref (output_data.buffer);
+
+      if (!resolve_ret) {
+        GST_ERROR_OBJECT (self, "Couldn't resolve bitstream buffer");
+        priv->last_flow = GST_FLOW_ERROR;
+        gst_clear_buffer (&frame->output_buffer);
+        gst_video_encoder_finish_frame (encoder, frame);
+      } else {
+        /* TODO: calculate dts in case of bframe is used */
+        frame->dts = frame->pts;
+
+        priv->last_flow = gst_video_encoder_finish_frame (encoder, frame);
+        if (priv->last_flow != GST_FLOW_OK) {
+          GST_WARNING_OBJECT (self, "Last flow was %s",
+              gst_flow_get_name (priv->last_flow));
+        }
+      }
+    } else {
+      GST_DEBUG_OBJECT (self, "Dropping framem last flow return was %s",
+          gst_flow_get_name (priv->last_flow));
+      gst_d3d12_encoder_buffer_unref (output_data.buffer);
+      gst_clear_buffer (&output_data.frame->output_buffer);
+      gst_video_encoder_finish_frame (encoder, output_data.frame);
+    }
+  }
+
+  GST_DEBUG_OBJECT (self, "Leaving output thread");
+
+  CloseHandle (event_handle);
+
+  return nullptr;
+}
+
+static GstFlowReturn
+gst_d3d12_encoder_handle_frame (GstVideoEncoder * encoder,
+    GstVideoCodecFrame * frame)
+{
+  auto self = GST_D3D12_ENCODER (encoder);
+  auto priv = self->priv;
+  auto & config = priv->config;
+  auto klass = GST_D3D12_ENCODER_GET_CLASS (self);
+
+  if (!priv->session) {
+    GST_ERROR_OBJECT (self, "Encoding session is not configured");
+    return GST_FLOW_ERROR;
+  }
+
+  if (!priv->session->encoder || !priv->session->heap) {
+    GST_ERROR_OBJECT (self, "Previous reconfigure failed");
+    return GST_FLOW_ERROR;
+  }
+
+  if (priv->last_flow != GST_FLOW_OK) {
+    GST_WARNING_OBJECT (self, "Last flow was %s",
+        gst_flow_get_name (priv->last_flow));
+    gst_video_encoder_finish_frame (encoder, frame);
+    return priv->last_flow;
+  }
+
+  auto upload = gst_d3d12_encoder_upload_frame (self, frame->input_buffer);
+  if (!upload) {
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  GstD3D12FenceData *fence_data;
+  gst_d3d12_fence_data_pool_acquire (priv->fence_data_pool, &fence_data);
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, upload);
+
+  GstD3D12CommandAllocator *gst_ca;
+  if (!gst_d3d12_command_allocator_pool_acquire (priv->cmd->ca_pool, &gst_ca)) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire command allocator");
+    gst_d3d12_fence_data_unref (fence_data);
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, gst_ca);
+
+  ComPtr < ID3D12CommandAllocator > ca;
+  gst_d3d12_command_allocator_get_handle (gst_ca, &ca);
+  auto hr = ca->Reset ();
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't reset command allocator");
+    gst_d3d12_fence_data_unref (fence_data);
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  if (!priv->cmd->cl) {
+    auto device = gst_d3d12_device_get_device_handle (self->device);
+    hr = device->CreateCommandList (0, D3D12_COMMAND_LIST_TYPE_VIDEO_ENCODE,
+        ca.Get (), nullptr, IID_PPV_ARGS (&priv->cmd->cl));
+  } else {
+    hr = priv->cmd->cl->Reset (ca.Get ());
+  }
+
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't reset command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  auto video_device = priv->cmd->video_device.Get ();
+  D3D12_VIDEO_ENCODER_ENCODEFRAME_INPUT_ARGUMENTS in_args = { };
+  D3D12_VIDEO_ENCODER_ENCODEFRAME_OUTPUT_ARGUMENTS out_args = { };
+  D3D12_VIDEO_ENCODER_RESOLVE_METADATA_INPUT_ARGUMENTS meta_in_args = { };
+  D3D12_VIDEO_ENCODER_RESOLVE_METADATA_OUTPUT_ARGUMENTS meta_out_args = { };
+  auto prev_max_subregions = config.max_subregions;
+  gboolean need_new_session = FALSE;
+  if (!klass->start_frame (self, video_device, frame,
+          &in_args.SequenceControlDesc,
+          &in_args.PictureControlDesc, &out_args.ReconstructedPicture, &config,
+          &need_new_session)) {
+    GST_ERROR_OBJECT (self, "Start frame failed");
+    gst_d3d12_fence_data_unref (fence_data);
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  if (need_new_session) {
+    GST_DEBUG_OBJECT (self, "Need new encoding session");
+    in_args.SequenceControlDesc.Flags =
+        D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_NONE;
+
+    priv->session->encoder = nullptr;
+    priv->session->heap = nullptr;
+
+    auto & desc = priv->encoder_desc;
+    desc.EncodeCodec = klass->codec;
+    desc.EncodeProfile = config.profile_desc;
+    desc.InputFormat = priv->format_info.Format;
+    desc.CodecConfiguration = config.codec_config;
+    desc.MaxMotionEstimationPrecision =
+        D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_MAXIMUM;
+
+    hr = video_device->CreateVideoEncoder (&desc,
+        IID_PPV_ARGS (&priv->session->encoder));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create encoder");
+      gst_d3d12_fence_data_unref (fence_data);
+      gst_video_encoder_finish_frame (encoder, frame);
+      return GST_FLOW_ERROR;
+    }
+
+    auto & heap_desc = priv->heap_desc;
+    heap_desc.EncodeCodec = klass->codec;
+    heap_desc.EncodeProfile = config.profile_desc;
+    heap_desc.EncodeLevel = config.level;
+    heap_desc.ResolutionsListCount = 1;
+    heap_desc.pResolutionList = &config.resolution;
+    hr = video_device->CreateVideoEncoderHeap (&heap_desc,
+        IID_PPV_ARGS (&priv->session->heap));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create encoder heap");
+      gst_d3d12_fence_data_unref (fence_data);
+      gst_video_encoder_finish_frame (encoder, frame);
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  if (prev_max_subregions != config.max_subregions) {
+    gst_clear_object (&priv->session->encoder_pool);
+    const auto & resource_req = priv->resource_req;
+
+    GST_DEBUG_OBJECT (self, "Subregion count changed %d -> %d",
+        prev_max_subregions, config.max_subregions);
+
+    guint resolved_metadata_size;
+    resolved_metadata_size = sizeof (D3D12_VIDEO_ENCODER_OUTPUT_METADATA)
+        + sizeof (D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA) *
+        config.max_subregions;
+    if (priv->resource_req.EncoderMetadataBufferAccessAlignment > 1) {
+      resolved_metadata_size =
+          ((resolved_metadata_size +
+              resource_req.EncoderMetadataBufferAccessAlignment - 1) /
+          resource_req.EncoderMetadataBufferAccessAlignment) *
+          resource_req.EncoderMetadataBufferAccessAlignment;
+    }
+
+    /* TODO: calculate bitstream buffer size */
+    guint bitstream_size = 1024 * 1024 * 8;
+    priv->session->encoder_pool =
+        gst_d3d12_encoder_buffer_pool_new (self->device,
+        resource_req.MaxEncoderOutputMetadataBufferSize,
+        resolved_metadata_size, bitstream_size, ASYNC_DEPTH);
+  }
+
+  GstD3D12EncoderBuffer *encoder_buf;
+  GST_VIDEO_ENCODER_STREAM_UNLOCK (self);
+  if (!gst_d3d12_encoder_buffer_pool_acquire (priv->session->encoder_pool,
+          &encoder_buf)) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire bitstream buffer");
+    GST_VIDEO_ENCODER_STREAM_LOCK (self);
+    klass->end_frame (self);
+    gst_clear_buffer (&frame->output_buffer);
+    gst_d3d12_fence_data_unref (fence_data);
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+  GST_VIDEO_ENCODER_STREAM_LOCK (self);
+
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, encoder_buf);
+
+  ComPtr < ID3D12Resource > metadata;
+  ComPtr < ID3D12Resource > resolved_metadata;
+  ComPtr < ID3D12Resource > bitstream;
+  gst_d3d12_encoder_buffer_get_metadata (encoder_buf, &metadata);
+  gst_d3d12_encoder_buffer_get_resolved_metadata (encoder_buf,
+      &resolved_metadata);
+  gst_d3d12_encoder_buffer_get_bitstream (encoder_buf, &bitstream);
+
+  auto mem = (GstD3D12Memory *) gst_buffer_peek_memory (upload, 0);
+  auto resource = gst_d3d12_memory_get_resource_handle (mem);
+
+  in_args.pInputFrame = resource;
+  in_args.InputFrameSubresource = 0;
+  in_args.CurrentFrameBitstreamMetadataSize = 0;
+
+  out_args.Bitstream.pBuffer = bitstream.Get ();
+  out_args.Bitstream.FrameStartOffset = 0;
+  out_args.EncoderOutputMetadata.pBuffer = metadata.Get ();
+  out_args.EncoderOutputMetadata.Offset = 0;
+
+  meta_in_args.EncoderCodec = klass->codec;
+  meta_in_args.EncoderProfile = config.profile_desc;
+  meta_in_args.EncoderInputFormat = DXGI_FORMAT_NV12;
+  meta_in_args.EncodedPictureEffectiveResolution = config.resolution;
+  meta_in_args.HWLayoutMetadata.pBuffer = metadata.Get ();
+  meta_in_args.HWLayoutMetadata.Offset = 0;
+
+  meta_out_args.ResolvedLayoutMetadata.pBuffer = resolved_metadata.Get ();
+  meta_out_args.ResolvedLayoutMetadata.Offset = 0;
+
+  auto cl = priv->cmd->cl;
+  gst_d3d12_encoder_build_command (self, &in_args, &out_args, &meta_in_args,
+      &meta_out_args, fence_data, cl.Get ());
+  hr = cl->Close ();
+
+  klass->end_frame (self);
+
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't close command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    gst_clear_buffer (&frame->output_buffer);
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  auto completed = gst_d3d12_device_get_completed_value (self->device,
+      D3D12_COMMAND_LIST_TYPE_DIRECT);
+  if (completed < mem->fence_value) {
+    auto queue = gst_d3d12_device_get_command_queue (self->device,
+        D3D12_COMMAND_LIST_TYPE_DIRECT);
+    ComPtr < ID3D12Fence > fence;
+    gst_d3d12_command_queue_get_fence (queue, &fence);
+    gst_d3d12_command_queue_execute_wait (priv->cmd->queue, fence.Get (),
+        mem->fence_value);
+  }
+
+  ID3D12CommandList *cmd_list = { cl.Get () };
+  hr = gst_d3d12_command_queue_execute_command_lists (priv->cmd->queue,
+      1, cmd_list, &priv->cmd->fence_val);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't execute command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    gst_clear_buffer (&frame->output_buffer);
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  gst_d3d12_command_queue_set_notify (priv->cmd->queue, priv->cmd->fence_val,
+      fence_data, (GDestroyNotify) gst_d3d12_fence_data_unref);
+
+  auto output_data = EncoderOutputData ();
+  output_data.frame = frame;
+  output_data.buffer = gst_d3d12_encoder_buffer_ref (encoder_buf);
+  output_data.fence_val = priv->cmd->fence_val;
+
+  GST_LOG_OBJECT (self, "Enqueue data %" G_GUINT64_FORMAT,
+      priv->cmd->fence_val);
+
+  GST_VIDEO_ENCODER_STREAM_UNLOCK (self);
+  {
+    std::lock_guard < std::mutex > lk (priv->session->queue_lock);
+    gst_queue_array_push_tail_struct (priv->session->output_queue,
+        &output_data);
+    priv->session->queue_cond.notify_one ();
+  }
+  GST_VIDEO_ENCODER_STREAM_LOCK (self);
+
+  if (!priv->output_thread) {
+    GST_DEBUG_OBJECT (self, "Spawning output thread");
+    priv->output_thread = g_thread_new ("GstD3D12H264EncLoop",
+        (GThreadFunc) gst_d3d12_encoder_output_loop, self);
+  }
+
+  return priv->last_flow;
+}
+
+static GstFlowReturn
+gst_d3d12_encoder_finish (GstVideoEncoder * encoder)
+{
+  auto self = GST_D3D12_ENCODER (encoder);
+
+  GST_DEBUG_OBJECT (self, "Finish");
+
+  gst_d3d12_encoder_drain (self, TRUE);
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_d3d12_encoder_flush (GstVideoEncoder * encoder)
+{
+  auto self = GST_D3D12_ENCODER (encoder);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Finish");
+
+  priv->flushing = true;
+  gst_d3d12_encoder_drain (self, TRUE);
+  priv->flushing = false;
+  priv->last_flow = GST_FLOW_OK;
+
+  return GST_FLOW_OK;
+}
+
+GType
+gst_d3d12_encoder_rate_control_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue methods = {
+    {D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP, "Constant QP", "cqp"},
+    {D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR, "Constant bitrate", "cbr"},
+    {D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR, "Variable bitrate", "vbr"},
+    {D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR,
+        "Constant quality variable bitrate", "qvbr"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstD3D12EncoderRateControl", methods);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return type;
+}
+
+GType
+gst_d3d12_encoder_rate_control_support_get_type (void)
+{
+  static GType type = 0;
+  static const GFlagsValue methods = {
+    {(1 << D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP), "Constant QP", "cqp"},
+    {(1 << D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR), "Constant bitrate",
+        "cbr"},
+    {(1 << D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR), "Variable bitrate",
+        "vbr"},
+    {(1 << D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR),
+        "Constant quality variable bitrate", "qvbr"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    type = g_flags_register_static ("GstD3D12EncoderRateControlSupport",
+        methods);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return type;
+}
+
+GType
+gst_d3d12_encoder_subregion_layout_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue methods = {
+    {D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_FULL_FRAME,
+        "Full frame without partitioning", "full"},
+    {D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_BYTES_PER_SUBREGION,
+        "Bytes per subregion", "bytes"},
+    {D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_SQUARE_UNITS_PER_SUBREGION_ROW_UNALIGNED,
+        "Coding units (e.g., macroblock) per subregion", "coding-units"},
+    {D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_UNIFORM_PARTITIONING_ROWS_PER_SUBREGION,
+        "Uniform rows per subregion", "rows"},
+    {D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_UNIFORM_PARTITIONING_SUBREGIONS_PER_FRAME,
+        "Uniform subregions per frame", "subregions"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstD3D12EncoderSubregionLayout", methods);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return type;
+}
+
+GType
+gst_d3d12_encoder_subregion_layout_support_get_type (void)
+{
+  static GType type = 0;
+  static const GFlagsValue methods = {
+    {(1 << D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_FULL_FRAME),
+        "Full frame without partitioning", "full"},
+    {(1 << D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_BYTES_PER_SUBREGION),
+        "Bytes per subregion", "bytes"},
+    {(1 << D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_SQUARE_UNITS_PER_SUBREGION_ROW_UNALIGNED),
+        "Coding units (e.g., macroblock) per subregion", "coding-units"},
+    {(1 << D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_UNIFORM_PARTITIONING_ROWS_PER_SUBREGION),
+        "Uniform rows (in coding-unit) per subregion", "rows"},
+    {(1 << D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_UNIFORM_PARTITIONING_SUBREGIONS_PER_FRAME),
+        "Uniform subregions per frame", "subregions"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    type = g_flags_register_static ("GstD3D12EncoderSubregionLayoutSupport",
+        methods);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return type;
+}
+
+GType
+gst_d3d12_encoder_sei_insert_mode_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue modes = {
+    {GST_D3D12_ENCODER_SEI_INSERT, "Insert", "insert"},
+    {GST_D3D12_ENCODER_SEI_INSERT_AND_DROP, "Insert and drop",
+        "insert-and-drop"},
+    {GST_D3D12_ENCODER_SEI_DISABLED, "Disabled", "disabled"},
+    {0, nullptr, nullptr}
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstD3D12EncoderSeiInsertMode", modes);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return type;
+}
+
+gboolean
+gst_d3d12_encoder_check_needs_new_session (D3D12_VIDEO_ENCODER_SUPPORT_FLAGS
+    support_flags, D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAGS seq_flags)
+{
+  bool rc_updated = (seq_flags &
+      D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_RATE_CONTROL_CHANGE) != 0;
+  bool can_rc_update = CHECK_SUPPORT_FLAG (support_flags,
+      RATE_CONTROL_RECONFIGURATION_AVAILABLE);
+  if (rc_updated && !can_rc_update)
+    return TRUE;
+
+  bool layout_updated = (seq_flags &
+      D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_SUBREGION_LAYOUT_CHANGE) != 0;
+  bool can_layout_update = CHECK_SUPPORT_FLAG (support_flags,
+      SUBREGION_LAYOUT_RECONFIGURATION_AVAILABLE);
+  if (layout_updated && !can_layout_update)
+    return TRUE;
+
+  bool gop_updated = (seq_flags &
+      D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_GOP_SEQUENCE_CHANGE) != 0;
+  bool can_gop_update = CHECK_SUPPORT_FLAG (support_flags,
+      SEQUENCE_GOP_RECONFIGURATION_AVAILABLE);
+  if (gop_updated && !can_gop_update)
+    return TRUE;
+
+  return FALSE;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12encoder.h Added

@@ -0,0 +1,119 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_ENCODER            (gst_d3d12_encoder_get_type())
+#define GST_D3D12_ENCODER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_D3D12_ENCODER,GstD3D12Encoder))
+#define GST_D3D12_ENCODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_D3D12_ENCODER,GstD3D12EncoderClass))
+#define GST_D3D12_ENCODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_D3D12_ENCODER,GstD3D12EncoderClass))
+#define GST_IS_D3D12_ENCODER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_D3D12_ENCODER))
+#define GST_IS_D3D12_ENCODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_D3D12_ENCODER))
+
+struct GstD3D12EncoderPrivate;
+
+struct GstD3D12EncoderConfig
+{
+  D3D12_VIDEO_ENCODER_PROFILE_DESC profile_desc;
+  D3D12_VIDEO_ENCODER_LEVEL_SETTING level;
+  D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION codec_config;
+  D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA layout;
+  D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE gop_struct;
+  D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC resolution;
+  D3D12_VIDEO_ENCODER_SUPPORT_FLAGS support_flags;
+  D3D12_VIDEO_ENCODER_RATE_CONTROL_CQP cqp;;
+  D3D12_VIDEO_ENCODER_RATE_CONTROL_CBR cbr;
+  D3D12_VIDEO_ENCODER_RATE_CONTROL_VBR vbr;
+  D3D12_VIDEO_ENCODER_RATE_CONTROL_QVBR qvbr;
+  D3D12_VIDEO_ENCODER_RATE_CONTROL rate_control;
+  guint max_subregions;
+};
+
+enum GstD3D12EncoderSeiInsertMode
+{
+  GST_D3D12_ENCODER_SEI_INSERT,
+  GST_D3D12_ENCODER_SEI_INSERT_AND_DROP,
+  GST_D3D12_ENCODER_SEI_DISABLED,
+};
+
+#define GST_TYPE_D3D12_ENCODER_RATE_CONTROL (gst_d3d12_encoder_rate_control_get_type ())
+GType gst_d3d12_encoder_rate_control_get_type (void);
+
+#define GST_TYPE_D3D12_ENCODER_RATE_CONTROL_SUPPORT (gst_d3d12_encoder_rate_control_support_get_type ())
+GType gst_d3d12_encoder_rate_control_support_get_type (void);
+
+#define GST_TYPE_D3D12_ENCODER_SUBREGION_LAYOUT (gst_d3d12_encoder_subregion_layout_get_type())
+GType gst_d3d12_encoder_subregion_layout_get_type (void);
+
+#define GST_TYPE_D3D12_ENCODER_SUBREGION_LAYOUT_SUPPORT (gst_d3d12_encoder_subregion_layout_support_get_type ())
+GType gst_d3d12_encoder_subregion_layout_support_get_type (void);
+
+#define GST_TYPE_D3D12_ENCODER_SEI_INSERT_MODE (gst_d3d12_encoder_sei_insert_mode_get_type ())
+GType gst_d3d12_encoder_sei_insert_mode_get_type (void);
+
+struct GstD3D12Encoder
+{
+  GstVideoEncoder parent;
+
+  GstD3D12Device *device;
+
+  GstD3D12EncoderPrivate *priv;
+};
+
+struct GstD3D12EncoderClass
+{
+  GstVideoEncoderClass parent_class;
+
+  D3D12_VIDEO_ENCODER_CODEC codec;
+  gint64 adapter_luid;
+  guint device_id;
+  guint vendor_id;
+
+  gboolean  (*new_sequence)   (GstD3D12Encoder * encoder,
+                               ID3D12VideoDevice * video_device,
+                               GstVideoCodecState * state,
+                               GstD3D12EncoderConfig * config);
+
+  gboolean  (*start_frame)    (GstD3D12Encoder * encoder,
+                               ID3D12VideoDevice * video_device,
+                               GstVideoCodecFrame * frame,
+                               D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESC * seq_ctrl,
+                               D3D12_VIDEO_ENCODER_PICTURE_CONTROL_DESC * picture_ctrl,
+                               D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE * recon_pic,
+                               GstD3D12EncoderConfig * config,
+                               gboolean * need_new_session);
+
+  gboolean  (*end_frame)      (GstD3D12Encoder * encoder);
+};
+
+GType gst_d3d12_encoder_get_type (void);
+
+gboolean gst_d3d12_encoder_check_needs_new_session (D3D12_VIDEO_ENCODER_SUPPORT_FLAGS support_flags,
+                                                    D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAGS seq_flags);
+
+#define CHECK_SUPPORT_FLAG(flags, f) \
+    ((flags & D3D12_VIDEO_ENCODER_SUPPORT_FLAG_ ##f) != 0)
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12encoderbufferpool.cpp Added

@@ -0,0 +1,326 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * This library is free software; you cln 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12encoderbufferpool.h"
+#include <directx/d3dx12.h>
+#include <wrl.h>
+#include <queue>
+#include <mutex>
+#include <condition_variable>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_encoder_buffer_pool_debug);
+#define GST_CAT_DEFAULT gst_d3d12_encoder_buffer_pool_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+struct _GstD3D12EncoderBuffer : public GstMiniObject
+{
+  GstD3D12EncoderBufferPool *pool = nullptr;
+  ComPtr<ID3D12Resource> metadata;
+  ComPtr<ID3D12Resource> resolved_metadata;
+  ComPtr<ID3D12Resource> bitstream;
+};
+
+struct GstD3D12EncoderBufferPoolPrivate
+{
+  ~GstD3D12EncoderBufferPoolPrivate ()
+  {
+    while (!buffer_pool.empty ()) {
+      auto buf = buffer_pool.front ();
+      buffer_pool.pop ();
+      gst_mini_object_unref (buf);
+    }
+  }
+
+  ComPtr<ID3D12Device> device;
+
+  std::mutex lock;
+  std::condition_variable cond;
+  std::queue<GstD3D12EncoderBuffer *>buffer_pool;
+
+  guint metadata_size;
+  guint resolved_metadata_size;
+  guint bitstream_size;
+  guint pool_size;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12EncoderBufferPool
+{
+  GstObject parent;
+
+  GstD3D12EncoderBufferPoolPrivate *priv;
+};
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstD3D12EncoderBuffer, gst_d3d12_encoder_buffer);
+
+static void gst_d3d12_encoder_buffer_pool_finalize (GObject * object);
+
+#define gst_d3d12_encoder_buffer_pool_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12EncoderBufferPool,
+    gst_d3d12_encoder_buffer_pool, GST_TYPE_OBJECT);
+
+static void
+gst_d3d12_encoder_buffer_pool_class_init (GstD3D12EncoderBufferPoolClass *
+    klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_encoder_buffer_pool_finalize;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_encoder_buffer_pool_debug,
+      "d3d12encoderbufferpool", 0, "d3d12encoderbufferpool");
+}
+
+static void
+gst_d3d12_encoder_buffer_pool_init (GstD3D12EncoderBufferPool * self)
+{
+  self->priv = new GstD3D12EncoderBufferPoolPrivate ();
+}
+
+static void
+gst_d3d12_encoder_buffer_pool_finalize (GObject * object)
+{
+  auto self = GST_D3D12_ENCODER_BUFFER_POOL (object);
+
+  GST_DEBUG_OBJECT (self, "Finalize");
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_encoder_buffer_free (GstD3D12EncoderBuffer * buffer)
+{
+  delete buffer;
+}
+
+static GstD3D12EncoderBuffer *
+gst_d3d12_encoder_buffer_pool_alloc (GstD3D12EncoderBufferPool * self)
+{
+  auto priv = self->priv;
+  D3D12_HEAP_PROPERTIES prop =
+      CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+  D3D12_RESOURCE_DESC desc =
+      CD3DX12_RESOURCE_DESC::Buffer (priv->metadata_size);
+
+  ComPtr < ID3D12Resource > metadata;
+  auto hr = priv->device->CreateCommittedResource (&prop,
+      D3D12_HEAP_FLAG_NONE, &desc, D3D12_RESOURCE_STATE_COMMON,
+      nullptr, IID_PPV_ARGS (&metadata));
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (self, "Couldn't metadata buffer, hr: 0x%x", (guint) hr);
+    return nullptr;
+  }
+
+  prop = CD3DX12_HEAP_PROPERTIES (D3D12_CPU_PAGE_PROPERTY_WRITE_BACK,
+      D3D12_MEMORY_POOL_L0);
+  desc = CD3DX12_RESOURCE_DESC::Buffer (priv->resolved_metadata_size);
+  ComPtr < ID3D12Resource > resolved_metadata;
+  hr = priv->device->CreateCommittedResource (&prop,
+      D3D12_HEAP_FLAG_NONE, &desc, D3D12_RESOURCE_STATE_COMMON,
+      nullptr, IID_PPV_ARGS (&resolved_metadata));
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (self, "Couldn't metadata buffer, hr: 0x%x", (guint) hr);
+    return nullptr;
+  }
+
+  desc = CD3DX12_RESOURCE_DESC::Buffer (priv->bitstream_size);
+  ComPtr < ID3D12Resource > bitstream;
+  hr = priv->device->CreateCommittedResource (&prop,
+      D3D12_HEAP_FLAG_NONE, &desc, D3D12_RESOURCE_STATE_COMMON,
+      nullptr, IID_PPV_ARGS (&bitstream));
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (self, "Couldn't metadata buffer, hr: 0x%x", (guint) hr);
+    return nullptr;
+  }
+
+  auto new_buf = new GstD3D12EncoderBuffer ();
+
+  gst_mini_object_init (new_buf, 0, gst_d3d12_encoder_buffer_get_type (),
+      nullptr, nullptr,
+      (GstMiniObjectFreeFunction) gst_d3d12_encoder_buffer_free);
+  new_buf->metadata = metadata;
+  new_buf->resolved_metadata = resolved_metadata;
+  new_buf->bitstream = bitstream;
+
+  return new_buf;
+}
+
+GstD3D12EncoderBufferPool *
+gst_d3d12_encoder_buffer_pool_new (GstD3D12Device * device,
+    guint metadata_size, guint resolved_metadata_size, guint bitstream_size,
+    guint pool_size)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+
+  auto self = (GstD3D12EncoderBufferPool *)
+      g_object_new (GST_TYPE_D3D12_ENCODER_BUFFER_POOL, nullptr);
+  gst_object_ref_sink (self);
+
+  auto priv = self->priv;
+  priv->device = gst_d3d12_device_get_device_handle (device);;
+  priv->metadata_size = metadata_size;
+  priv->resolved_metadata_size = resolved_metadata_size;
+  priv->bitstream_size = bitstream_size;
+  priv->pool_size = pool_size;
+
+  for (guint i = 0; i < pool_size; i++) {
+    auto new_buf = gst_d3d12_encoder_buffer_pool_alloc (self);
+    if (!new_buf) {
+      gst_object_unref (self);
+      return nullptr;
+    }
+
+    priv->buffer_pool.push (new_buf);
+  }
+
+  return self;
+}
+
+static void
+gst_d3d12_encoder_buffer_pool_release (GstD3D12EncoderBufferPool * pool,
+    GstD3D12EncoderBuffer * buffer)
+{
+  auto priv = pool->priv;
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+    buffer->dispose = nullptr;
+    buffer->pool = nullptr;
+    priv->buffer_pool.push (buffer);
+    priv->cond.notify_one ();
+  }
+
+  gst_object_unref (pool);
+}
+
+static gboolean
+gst_d3d12_encoder_buffer_dispose (GstD3D12EncoderBuffer * buffer)
+{
+  if (!buffer->pool)
+    return TRUE;
+
+  gst_mini_object_ref (buffer);
+  gst_d3d12_encoder_buffer_pool_release (buffer->pool, buffer);
+
+  return FALSE;
+}
+
+gboolean
+gst_d3d12_encoder_buffer_pool_acquire (GstD3D12EncoderBufferPool * pool,
+    GstD3D12EncoderBuffer ** buffer)
+{
+  g_return_val_if_fail (GST_IS_D3D12_ENCODER_BUFFER_POOL (pool), FALSE);
+  g_return_val_if_fail (buffer, FALSE);
+
+  *buffer = nullptr;
+
+  auto priv = pool->priv;
+  GstD3D12EncoderBuffer *new_buf = nullptr;
+
+  {
+    std::unique_lock < std::mutex > lk (priv->lock);
+    if (priv->pool_size > 0) {
+      while (priv->buffer_pool.empty ())
+        priv->cond.wait (lk);
+    }
+
+    if (!priv->buffer_pool.empty ()) {
+      new_buf = priv->buffer_pool.front ();
+      priv->buffer_pool.pop ();
+    }
+  }
+
+  if (!new_buf)
+    new_buf = gst_d3d12_encoder_buffer_pool_alloc (pool);
+
+  if (!new_buf)
+    return FALSE;
+
+  new_buf->pool = (GstD3D12EncoderBufferPool *) gst_object_ref (pool);
+  new_buf->dispose =
+      (GstMiniObjectDisposeFunction) gst_d3d12_encoder_buffer_dispose;
+
+  *buffer = new_buf;
+
+  return TRUE;
+}
+
+GstD3D12EncoderBuffer *
+gst_d3d12_encoder_buffer_ref (GstD3D12EncoderBuffer * buffer)
+{
+  return (GstD3D12EncoderBuffer *) gst_mini_object_ref (buffer);
+}
+
+void
+gst_d3d12_encoder_buffer_unref (GstD3D12EncoderBuffer * buffer)
+{
+  gst_mini_object_unref (buffer);
+}
+
+void
+gst_clear_d3d12_encoder_buffer (GstD3D12EncoderBuffer ** buffer)
+{
+  gst_clear_mini_object (buffer);
+}
+
+gboolean
+gst_d3d12_encoder_buffer_get_metadata (GstD3D12EncoderBuffer * buffer,
+    ID3D12Resource ** metadata)
+{
+  g_return_val_if_fail (buffer, FALSE);
+  g_return_val_if_fail (metadata, FALSE);
+
+  *metadata = buffer->metadata.Get ();
+  (*metadata)->AddRef ();
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_encoder_buffer_get_resolved_metadata (GstD3D12EncoderBuffer * buffer,
+    ID3D12Resource ** resolved_metadata)
+{
+  g_return_val_if_fail (buffer, FALSE);
+  g_return_val_if_fail (resolved_metadata, FALSE);
+
+  *resolved_metadata = buffer->resolved_metadata.Get ();
+  (*resolved_metadata)->AddRef ();
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_encoder_buffer_get_bitstream (GstD3D12EncoderBuffer * buffer,
+    ID3D12Resource ** bitstream)
+{
+  g_return_val_if_fail (buffer, FALSE);
+  g_return_val_if_fail (bitstream, FALSE);
+
+  *bitstream = buffer->bitstream.Get ();
+  (*bitstream)->AddRef ();
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12encoderbufferpool.h Added

@@ -0,0 +1,59 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_ENCODER_BUFFER_POOL (gst_d3d12_encoder_buffer_pool_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12EncoderBufferPool,
+    gst_d3d12_encoder_buffer_pool, GST, D3D12_ENCODER_BUFFER_POOL, GstObject);
+
+typedef struct _GstD3D12EncoderBuffer GstD3D12EncoderBuffer;
+
+GstD3D12EncoderBufferPool * gst_d3d12_encoder_buffer_pool_new (GstD3D12Device * device,
+                                                               guint metadata_size,
+                                                               guint resolved_metadata_size,
+                                                               guint bitstream_size,
+                                                               guint pool_size);
+
+gboolean                    gst_d3d12_encoder_buffer_pool_acquire (GstD3D12EncoderBufferPool * pool,
+                                                                   GstD3D12EncoderBuffer ** buffer);
+
+GstD3D12EncoderBuffer *     gst_d3d12_encoder_buffer_ref (GstD3D12EncoderBuffer * buffer);
+
+void                        gst_d3d12_encoder_buffer_unref (GstD3D12EncoderBuffer * buffer);
+
+void                        gst_clear_d3d12_encoder_buffer (GstD3D12EncoderBuffer ** buffer);
+
+gboolean                    gst_d3d12_encoder_buffer_get_metadata (GstD3D12EncoderBuffer * buffer,
+                                                                   ID3D12Resource ** metadata);
+
+gboolean                    gst_d3d12_encoder_buffer_get_resolved_metadata (GstD3D12EncoderBuffer * buffer,
+                                                                            ID3D12Resource ** resolved_metadata);
+
+gboolean                    gst_d3d12_encoder_buffer_get_bitstream (GstD3D12EncoderBuffer * buffer,
+                                                                    ID3D12Resource ** bitstream);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12fencedatapool.cpp Added

@@ -0,0 +1,273 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12fencedatapool.h"
+#include <gst/base/gstqueuearray.h>
+#include <mutex>
+#include <queue>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_fence_data_pool_debug);
+#define GST_CAT_DEFAULT gst_d3d12_fence_data_pool_debug
+
+struct NotifyData
+{
+  gpointer user_data = nullptr;
+  GDestroyNotify notify = nullptr;
+};
+
+static void
+notify_data_clear_func (NotifyData * data)
+{
+  if (data->notify)
+    data->notify (data->user_data);
+
+  data->user_data = nullptr;
+  data->notify = nullptr;
+}
+
+/* *INDENT-OFF* */
+struct _GstD3D12FenceData : public GstMiniObject
+{
+  _GstD3D12FenceData ()
+  {
+    queue = gst_queue_array_new_for_struct (sizeof (NotifyData), 4);
+    gst_queue_array_set_clear_func (queue,
+        (GDestroyNotify) notify_data_clear_func);
+  }
+
+  ~_GstD3D12FenceData ()
+  {
+    gst_queue_array_free (queue);
+  }
+
+  GstD3D12FenceDataPool *pool = nullptr;
+  GstQueueArray *queue;
+};
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstD3D12FenceData, gst_d3d12_fence_data);
+
+struct GstD3D12FenceDataPoolPrivate
+{
+  ~GstD3D12FenceDataPoolPrivate ()
+  {
+    while (!data_pool.empty ()) {
+      auto data = data_pool.front ();
+      data_pool.pop ();
+      gst_mini_object_unref (data);
+    }
+  }
+
+  std::mutex lock;
+  std::queue<GstD3D12FenceData *>data_pool;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12FenceDataPool
+{
+  GstObject parent;
+
+  GstD3D12FenceDataPoolPrivate *priv;
+};
+
+static void gst_d3d12_fence_data_pool_finalize (GObject * object);
+
+#define gst_d3d12_fence_data_pool_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12FenceDataPool,
+    gst_d3d12_fence_data_pool, GST_TYPE_OBJECT);
+
+static void
+gst_d3d12_fence_data_pool_class_init (GstD3D12FenceDataPoolClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_fence_data_pool_finalize;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_fence_data_pool_debug,
+      "d3d12fencedatapool", 0, "d3d12fencedatapool");
+}
+
+static void
+gst_d3d12_fence_data_pool_init (GstD3D12FenceDataPool * self)
+{
+  self->priv = new GstD3D12FenceDataPoolPrivate ();
+}
+
+static void
+gst_d3d12_fence_data_pool_finalize (GObject * object)
+{
+  auto self = GST_D3D12_FENCE_DATA_POOL (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GstD3D12FenceDataPool *
+gst_d3d12_fence_data_pool_new (void)
+{
+  auto self = (GstD3D12FenceDataPool *)
+      g_object_new (GST_TYPE_D3D12_FENCE_DATA_POOL, nullptr);
+  gst_object_ref_sink (self);
+
+  return self;
+}
+
+static void
+gst_d3d12_fence_data_pool_release (GstD3D12FenceDataPool * pool,
+    GstD3D12FenceData * data)
+{
+  auto priv = pool->priv;
+  gst_queue_array_clear (data->queue);
+
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+    data->dispose = nullptr;
+    data->pool = nullptr;
+    priv->data_pool.push (data);
+  }
+
+  gst_object_unref (pool);
+}
+
+static void
+gst_d3d12_fence_data_free (GstD3D12FenceData * data)
+{
+  delete data;
+}
+
+static gboolean
+gst_d3d12_fence_data_dispose (GstD3D12FenceData * data)
+{
+  if (!data->pool)
+    return TRUE;
+
+  gst_mini_object_ref (data);
+  gst_d3d12_fence_data_pool_release (data->pool, data);
+  return FALSE;
+}
+
+static GstD3D12FenceData *
+gst_d3d12_fence_data_new (void)
+{
+  auto data = new GstD3D12FenceData ();
+
+  gst_mini_object_init (data, 0, gst_d3d12_fence_data_get_type (),
+      nullptr, nullptr, (GstMiniObjectFreeFunction) gst_d3d12_fence_data_free);
+
+  return data;
+}
+
+gboolean
+gst_d3d12_fence_data_pool_acquire (GstD3D12FenceDataPool * pool,
+    GstD3D12FenceData ** data)
+{
+  g_return_val_if_fail (GST_IS_D3D12_FENCE_DATA_POOL (pool), FALSE);
+  g_return_val_if_fail (data, FALSE);
+
+  auto priv = pool->priv;
+  GstD3D12FenceData *new_data = nullptr;
+
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+    if (!priv->data_pool.empty ()) {
+      new_data = priv->data_pool.front ();
+      priv->data_pool.pop ();
+    }
+  }
+
+  if (!new_data)
+    new_data = gst_d3d12_fence_data_new ();
+
+  new_data->pool = (GstD3D12FenceDataPool *) gst_object_ref (pool);
+  new_data->dispose =
+      (GstMiniObjectDisposeFunction) gst_d3d12_fence_data_dispose;
+
+  *data = new_data;
+
+  return TRUE;
+}
+
+static inline void
+gst_d3d12_fence_data_add_notify_internal (GstD3D12FenceData * data,
+    gpointer user_data, GDestroyNotify notify)
+{
+  NotifyData notify_data;
+
+  notify_data.user_data = user_data;
+  notify_data.notify = notify;
+
+  gst_queue_array_push_tail_struct (data->queue, &notify_data);
+}
+
+void
+gst_d3d12_fence_data_add_notify (GstD3D12FenceData * data, gpointer user_data,
+    GDestroyNotify notify)
+{
+  g_return_if_fail (data);
+
+  gst_d3d12_fence_data_add_notify_internal (data, user_data, notify);
+}
+
+static void
+com_free_func (IUnknown * unknown)
+{
+  if (unknown)
+    unknown->Release ();
+}
+
+void
+gst_d3d12_fence_data_add_notify_com (GstD3D12FenceData * data, gpointer unknown)
+{
+  g_return_if_fail (data);
+
+  gst_d3d12_fence_data_add_notify_internal (data,
+      unknown, (GDestroyNotify) com_free_func);
+}
+
+void
+gst_d3d12_fence_data_add_notify_mini_object (GstD3D12FenceData * data,
+    gpointer object)
+{
+  g_return_if_fail (data);
+
+  gst_d3d12_fence_data_add_notify_internal (data,
+      object, (GDestroyNotify) gst_mini_object_unref);
+}
+
+GstD3D12FenceData *
+gst_d3d12_fence_data_ref (GstD3D12FenceData * data)
+{
+  return (GstD3D12FenceData *) gst_mini_object_ref (data);
+}
+
+void
+gst_d3d12_fence_data_unref (GstD3D12FenceData * data)
+{
+  gst_mini_object_unref (data);
+}
+
+void
+gst_clear_d3d12_fence_data (GstD3D12FenceData ** data)
+{
+  gst_clear_mini_object (data);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12fencedatapool.h Added

@@ -0,0 +1,54 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_FENCE_DATA_POOL (gst_d3d12_fence_data_pool_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12FenceDataPool,
+    gst_d3d12_fence_data_pool, GST, D3D12_FENCE_DATA_POOL, GstObject);
+
+GstD3D12FenceDataPool * gst_d3d12_fence_data_pool_new (void);
+
+gboolean                gst_d3d12_fence_data_pool_acquire (GstD3D12FenceDataPool * pool,
+                                                           GstD3D12FenceData ** data);
+
+void                    gst_d3d12_fence_data_add_notify (GstD3D12FenceData * data,
+                                                         gpointer user_data,
+                                                         GDestroyNotify notify);
+
+void                    gst_d3d12_fence_data_add_notify_com (GstD3D12FenceData * data,
+                                                             gpointer unknown);
+
+void                    gst_d3d12_fence_data_add_notify_mini_object (GstD3D12FenceData * data,
+                                                                     gpointer object);
+
+GstD3D12FenceData *     gst_d3d12_fence_data_ref (GstD3D12FenceData * data);
+
+void                    gst_d3d12_fence_data_unref (GstD3D12FenceData * data);
+
+void                    gst_clear_d3d12_fence_data (GstD3D12FenceData ** data);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12format.cpp Added

@@ -0,0 +1,876 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12.h"
+#include "gstd3d12-private.h"
+#include <string.h>
+
+GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_format_debug);
+#define GST_CAT_DEFAULT gst_d3d12_format_debug
+
+GstVideoFormat
+gst_d3d12_dxgi_format_to_gst (DXGI_FORMAT format)
+{
+  switch (format) {
+    case DXGI_FORMAT_B8G8R8A8_UNORM:
+      return GST_VIDEO_FORMAT_BGRA;
+    case DXGI_FORMAT_R8G8B8A8_UNORM:
+      return GST_VIDEO_FORMAT_RGBA;
+    case DXGI_FORMAT_R10G10B10A2_UNORM:
+      return GST_VIDEO_FORMAT_RGB10A2_LE;
+    case DXGI_FORMAT_AYUV:
+      return GST_VIDEO_FORMAT_VUYA;
+    case DXGI_FORMAT_YUY2:
+      return GST_VIDEO_FORMAT_YUY2;
+    case DXGI_FORMAT_Y210:
+      return GST_VIDEO_FORMAT_Y210;
+    case DXGI_FORMAT_Y410:
+      return GST_VIDEO_FORMAT_Y410;
+    case DXGI_FORMAT_NV12:
+      return GST_VIDEO_FORMAT_NV12;
+    case DXGI_FORMAT_P010:
+      return GST_VIDEO_FORMAT_P010_10LE;
+    case DXGI_FORMAT_P016:
+      return GST_VIDEO_FORMAT_P016_LE;
+    default:
+      break;
+  }
+
+  return GST_VIDEO_FORMAT_UNKNOWN;
+}
+
+gboolean
+gst_d3d12_dxgi_format_to_resource_formats (DXGI_FORMAT format,
+    DXGI_FORMAT resource_formatGST_VIDEO_MAX_PLANES)
+{
+  g_return_val_if_fail (resource_format != nullptr, FALSE);
+
+  for (guint i = 0; i < GST_VIDEO_MAX_PLANES; i++)
+    resource_formati = DXGI_FORMAT_UNKNOWN;
+
+  switch (format) {
+    case DXGI_FORMAT_B8G8R8A8_UNORM:
+    case DXGI_FORMAT_R8G8B8A8_UNORM:
+    case DXGI_FORMAT_R10G10B10A2_UNORM:
+    case DXGI_FORMAT_R8_UNORM:
+    case DXGI_FORMAT_R8G8_UNORM:
+    case DXGI_FORMAT_R16_UNORM:
+    case DXGI_FORMAT_R16G16_UNORM:
+    case DXGI_FORMAT_G8R8_G8B8_UNORM:
+    case DXGI_FORMAT_R8G8_B8G8_UNORM:
+    case DXGI_FORMAT_R16G16B16A16_UNORM:
+      resource_format0 = format;
+      break;
+    case DXGI_FORMAT_AYUV:
+    case DXGI_FORMAT_YUY2:
+      resource_format0 = DXGI_FORMAT_R8G8B8A8_UNORM;
+      break;
+    case DXGI_FORMAT_NV12:
+      resource_format0 = DXGI_FORMAT_R8_UNORM;
+      resource_format1 = DXGI_FORMAT_R8G8_UNORM;
+      break;
+    case DXGI_FORMAT_P010:
+    case DXGI_FORMAT_P016:
+      resource_format0 = DXGI_FORMAT_R16_UNORM;
+      resource_format1 = DXGI_FORMAT_R16G16_UNORM;
+      break;
+    case DXGI_FORMAT_Y210:
+      resource_format0 = DXGI_FORMAT_R16G16B16A16_UNORM;
+      break;
+    case DXGI_FORMAT_Y410:
+      resource_format0 = DXGI_FORMAT_R10G10B10A2_UNORM;
+      break;
+    default:
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+char *
+gst_d3d12_dump_color_matrix (GstD3D12ColorMatrix * matrix)
+{
+  /* *INDENT-OFF* */
+  static const gchar format =
+      "MATRIX\n"
+      "|% .6f, % .6f, % .6f|\n"
+      "|% .6f, % .6f, % .6f|\n"
+      "|% .6f, % .6f, % .6f|\n"
+      "OFFSET\n"
+      "|% .6f, % .6f, % .6f|\n"
+      "MIN\n"
+      "|% .6f, % .6f, % .6f|\n"
+      "MAX\n"
+      "|% .6f, % .6f, % .6f|";
+  /* *INDENT-ON* */
+
+  g_return_val_if_fail (matrix != nullptr, nullptr);
+
+  return g_strdup_printf (format,
+      matrix->matrix00, matrix->matrix01, matrix->matrix02,
+      matrix->matrix10, matrix->matrix11, matrix->matrix12,
+      matrix->matrix20, matrix->matrix21, matrix->matrix22,
+      matrix->offset0, matrix->offset1, matrix->offset2,
+      matrix->min0, matrix->min1, matrix->min2,
+      matrix->max0, matrix->max1, matrix->max2);
+}
+
+static void
+color_matrix_copy (GstD3D12ColorMatrix * dst, const GstD3D12ColorMatrix * src)
+{
+  for (guint i = 0; i < 3; i++) {
+    for (guint j = 0; j < 3; j++) {
+      dst->matrixij = src->matrixij;
+    }
+  }
+}
+
+static void
+color_matrix_multiply (GstD3D12ColorMatrix * dst, GstD3D12ColorMatrix * a,
+    GstD3D12ColorMatrix * b)
+{
+  GstD3D12ColorMatrix tmp;
+
+  for (guint i = 0; i < 3; i++) {
+    for (guint j = 0; j < 3; j++) {
+      gdouble val = 0;
+      for (guint k = 0; k < 3; k++) {
+        val += a->matrixik * b->matrixkj;
+      }
+
+      tmp.matrixij = val;
+    }
+  }
+
+  color_matrix_copy (dst, &tmp);
+}
+
+static void
+color_matrix_identity (GstD3D12ColorMatrix * m)
+{
+  for (guint i = 0; i < 3; i++) {
+    for (guint j = 0; j < 3; j++) {
+      if (i == j)
+        m->matrixij = 1.0;
+      else
+        m->matrixij = 0;
+    }
+  }
+}
+
+void
+gst_d3d12_color_matrix_init (GstD3D12ColorMatrix * matrix)
+{
+  g_return_if_fail (matrix);
+
+  color_matrix_identity (matrix);
+  for (guint i = 0; i < 3; i++) {
+    matrix->mini = 0;
+    matrix->maxi = 1;
+    matrix->offseti = 0;
+  }
+}
+
+static gboolean
+color_matrix_invert (GstD3D12ColorMatrix * dst, GstD3D12ColorMatrix * src)
+{
+  GstD3D12ColorMatrix tmp;
+  gdouble det;
+
+  color_matrix_identity (&tmp);
+  for (guint j = 0; j < 3; j++) {
+    for (guint i = 0; i < 3; i++) {
+      tmp.matrixji =
+          src->matrix(i + 1) % 3(j + 1) % 3 *
+          src->matrix(i + 2) % 3(j + 2) % 3 -
+          src->matrix(i + 1) % 3(j + 2) % 3 *
+          src->matrix(i + 2) % 3(j + 1) % 3;
+    }
+  }
+
+  det = tmp.matrix00 * src->matrix00 +
+      tmp.matrix01 * src->matrix10 +
+      tmp.matrix02 * src->matrix20;
+  if (det == 0)
+    return FALSE;
+
+  for (guint j = 0; j < 3; j++) {
+    for (guint i = 0; i < 3; i++) {
+      tmp.matrixij /= det;
+    }
+  }
+
+  color_matrix_copy (dst, &tmp);
+
+  return TRUE;
+}
+
+/**
+ * gst_d3d12_color_range_adjust_matrix_unorm:
+ * @in_info: a #GstVideoInfo
+ * @out_info: a #GstVideoInfo
+ * @matrix: a #GstD3D12ColorMatrix
+ *
+ * Calculates matrix for color range adjustment. Both input and output
+ * signals are in normalized 0.0..1.0 space.
+ *
+ * Resulting values can be calculated by
+ * | Yout |                           | Yin |   | matrix.offset0 |
+ * | Uout | = clamp ( matrix.matrix * | Uin | + | matrix.offset1 |, matrix.min, matrix.max )
+ * | Vout |                           | Vin |   | matrix.offset2 |
+ *
+ * Returns: %TRUE if successful
+ */
+gboolean
+gst_d3d12_color_range_adjust_matrix_unorm (const GstVideoInfo * in_info,
+    const GstVideoInfo * out_info, GstD3D12ColorMatrix * matrix)
+{
+  gboolean in_rgb, out_rgb;
+  gint in_offsetGST_VIDEO_MAX_COMPONENTS;
+  gint in_scaleGST_VIDEO_MAX_COMPONENTS;
+  gint out_offsetGST_VIDEO_MAX_COMPONENTS;
+  gint out_scaleGST_VIDEO_MAX_COMPONENTS;
+  GstVideoColorRange in_range;
+  GstVideoColorRange out_range;
+  gdouble src_fullscale, dst_fullscale;
+
+  g_return_val_if_fail (in_info != nullptr, FALSE);
+  g_return_val_if_fail (out_info != nullptr, FALSE);
+  g_return_val_if_fail (matrix != nullptr, FALSE);
+
+  memset (matrix, 0, sizeof (GstD3D12ColorMatrix));
+  for (guint i = 0; i < 3; i++) {
+    matrix->matrixii = 1.0;
+    matrix->matrixii = 1.0;
+    matrix->matrixii = 1.0;
+    matrix->maxi = 1.0;
+  }
+
+  in_rgb = GST_VIDEO_INFO_IS_RGB (in_info);
+  out_rgb = GST_VIDEO_INFO_IS_RGB (out_info);
+
+  if (in_rgb != out_rgb) {
+    GST_WARNING ("Invalid format conversion");
+    return FALSE;
+  }
+
+  in_range = in_info->colorimetry.range;
+  out_range = out_info->colorimetry.range;
+
+  if (in_range == GST_VIDEO_COLOR_RANGE_UNKNOWN) {
+    GST_WARNING ("Unknown input color range");
+    if (in_rgb || GST_VIDEO_INFO_IS_GRAY (in_info))
+      in_range = GST_VIDEO_COLOR_RANGE_0_255;
+    else
+      in_range = GST_VIDEO_COLOR_RANGE_16_235;
+  }
+
+  if (out_range == GST_VIDEO_COLOR_RANGE_UNKNOWN) {
+    GST_WARNING ("Unknown output color range");
+    if (out_rgb || GST_VIDEO_INFO_IS_GRAY (out_info))
+      out_range = GST_VIDEO_COLOR_RANGE_0_255;
+    else
+      out_range = GST_VIDEO_COLOR_RANGE_16_235;
+  }
+
+  src_fullscale = (gdouble) ((1 << in_info->finfo->depth0) - 1);
+  dst_fullscale = (gdouble) ((1 << out_info->finfo->depth0) - 1);
+
+  gst_video_color_range_offsets (in_range, in_info->finfo, in_offset, in_scale);
+  gst_video_color_range_offsets (out_range,
+      out_info->finfo, out_offset, out_scale);
+
+  matrix->min0 = matrix->min1 = matrix->min2 =
+      (gdouble) out_offset0 / dst_fullscale;
+
+  matrix->max0 = (out_scale0 + out_offset0) / dst_fullscale;
+  matrix->max1 = matrix->max2 =
+      (out_scale1 + out_offset0) / dst_fullscale;
+
+  if (in_info->colorimetry.range == out_info->colorimetry.range) {
+    GST_DEBUG ("Same color range");
+    return TRUE;
+  }
+
+  /* Formula
+   *
+   * 1) Scales and offset compensates input to 0..1 range
+   * SRC_NORMi = (srci * src_fullscale - in_offseti) / in_scalei
+   *             = (srci * src_fullscale / in_scalei) - in_offseti / in_scalei
+   *
+   * 2) Reverse to output UNIT scale
+   * DST_UINTi = SRC_NORMi * out_scalei + out_offseti
+   *             = srci * src_fullscale * out_scalei / in_scalei
+   *               - in_offseti * out_scalei / in_scalei
+   *               + out_offseti
+   *
+   * 3) Back to 0..1 scale
+   * dsti = DST_UINTi / dst_fullscale
+   *        = COEFFi * srci + OFFi
+   * where
+   *             src_fullscale * out_scalei
+   * COEFFi = ------------------------------
+   *             dst_fullscale * in_scalei
+   *
+   *            out_offseti     in_offseti * out_scalei
+   * OFFi =  -------------- -  ------------------------------
+   *            dst_fullscale     dst_fullscale * in_scalei
+   */
+  for (guint i = 0; i < 3; i++) {
+    matrix->matrixii = (src_fullscale * out_scalei) /
+        (dst_fullscale * in_scalei);
+    matrix->offseti = (out_offseti / dst_fullscale) -
+        ((gdouble) in_offseti * out_scalei / (dst_fullscale * in_scalei));
+  }
+
+  return TRUE;
+}
+
+/**
+ * gst_d3d12_yuv_to_rgb_matrix_unorm:
+ * @in_yuv_info: a #GstVideoInfo of input YUV signal
+ * @out_rgb_info: a #GstVideoInfo of output RGB signal
+ * @matrix: a #GstD3D12ColorMatrix
+ *
+ * Calculates transform matrix from YUV to RGB conversion. Both input and output
+ * signals are in normalized 0.0..1.0 space and additional gamma decoding
+ * or primary/transfer function transform is not performed by this matrix.
+ *
+ * Resulting non-linear RGB values can be calculated by
+ * | R' |                           | Y' |   | matrix.offset0 |
+ * | G' | = clamp ( matrix.matrix * | Cb | + | matrix.offset1 | matrix.min, matrix.max )
+ * | B' |                           | Cr |   | matrix.offset2 |
+ *
+ * Returns: %TRUE if successful
+ */
+gboolean
+gst_d3d12_yuv_to_rgb_matrix_unorm (const GstVideoInfo * in_yuv_info,
+    const GstVideoInfo * out_rgb_info, GstD3D12ColorMatrix * matrix)
+{
+  gint offset4, scale4;
+  gdouble Kr, Kb, Kg;
+
+  g_return_val_if_fail (in_yuv_info != nullptr, FALSE);
+  g_return_val_if_fail (out_rgb_info != nullptr, FALSE);
+  g_return_val_if_fail (matrix != nullptr, FALSE);
+
+  /*
+   * <Formula>
+   *
+   * Input: Unsigned normalized Y'CbCr(unorm), 0.0..1.0 range
+   * Output: Unsigned normalized non-linear R'G'B'(unorm), 0.0..1.0 range
+   *
+   * 1) Y'CbCr(unorm) to scaled Y'CbCr
+   * | Y' |     | Y'(unorm) |
+   * | Cb | = S | Cb(unorm) |
+   * | Cb |     | Cr(unorm) |
+   * where S = (2 ^ bitdepth) - 1
+   *
+   * 2) Y'CbCr to YPbPr
+   * Y  = (Y' - offsetY )    / scaleY
+   * Pb = (Cb - offsetCbCr) / scaleCbCr
+   * Pr = (Cr - offsetCrCr) / scaleCrCr
+   * =>
+   * Y  = Y'(unorm) * Sy  + Oy
+   * Pb = Cb(unorm) * Suv + Ouv
+   * Pb = Cr(unorm) * Suv + Ouv
+   * where
+   * Sy  = S / scaleY
+   * Suv = S / scaleCbCr
+   * Oy  = -(offsetY / scaleY)
+   * Ouv = -(offsetCbCr / scaleCbCr)
+   *
+   * 3) YPbPr to R'G'B'
+   * | R' |      | Y  |
+   * | G' | = M *| Pb |
+   * | B' |      | Pr |
+   * where
+   *     | vecR |
+   * M = | vecG |
+   *     | vecB |
+   * vecR = | 1,         0           ,       2(1 - Kr)      |
+   * vecG = | 1, -(Kb/Kg) * 2(1 - Kb), -(Kr/Kg) * 2(1 - Kr) |
+   * vecB = | 1,       2(1 - Kb)     ,          0           |
+   * =>
+   * R' = dot(vecR, (Syuv * Y'CbCr(unorm))) + dot(vecR, Offset)
+   * G' = dot(vecG, (Svuy * Y'CbCr(unorm))) + dot(vecG, Offset)
+   * B' = dot(vecB, (Syuv * Y'CbCr(unorm)) + dot(vecB, Offset)
+   * where
+   *        | Sy,   0,   0 |
+   * Syuv = |  0, Suv,   0 |
+   *        |  0    0, Suv |
+   *
+   *          | Oy  |
+   * Offset = | Ouv |
+   *          | Ouv |
+   *
+   * 4) YUV -> RGB matrix
+   * | R' |            | Y'(unorm) |   | offsetA |
+   * | G' | = Matrix * | Cb(unorm) | + | offsetB |
+   * | B' |            | Cr(unorm) |   | offsetC |
+   *
+   * where
+   *          | vecR |
+   * Matrix = | vecG | * Syuv
+   *          | vecB |
+   *
+   * offsetA = dot(vecR, Offset)
+   * offsetB = dot(vecG, Offset)
+   * offsetC = dot(vecB, Offset)
+   *
+   * 4) Consider 16-235 scale RGB
+   * RGBfull(0..255) -> RGBfull(16..235) matrix is represented by
+   * | Rs |      | Rf |   | Or |
+   * | Gs | = Ms | Gf | + | Og |
+   * | Bs |      | Bf |   | Ob |
+   *
+   * Combining all matrix into
+   * | Rs |                   | Y'(unorm) |   | offsetA |     | Or |
+   * | Gs | = Ms * ( Matrix * | Cb(unorm) | + | offsetB | ) + | Og |
+   * | Bs |                   | Cr(unorm) |   | offsetC |     | Ob |
+   *
+   *                        | Y'(unorm) |      | offsetA |   | Or |
+   *        = Ms * Matrix * | Cb(unorm) | + Ms | offsetB | + | Og |
+   *                        | Cr(unorm) |      | offsetC |   | Ob |
+   */
+
+  memset (matrix, 0, sizeof (GstD3D12ColorMatrix));
+  for (guint i = 0; i < 3; i++)
+    matrix->maxi = 1.0;
+
+  gst_video_color_range_offsets (in_yuv_info->colorimetry.range,
+      in_yuv_info->finfo, offset, scale);
+
+  if (gst_video_color_matrix_get_Kr_Kb (in_yuv_info->colorimetry.matrix,
+          &Kr, &Kb)) {
+    guint S;
+    gdouble Sy, Suv;
+    gdouble Oy, Ouv;
+    gdouble vecR3, vecG3, vecB3;
+
+    Kg = 1.0 - Kr - Kb;
+
+    vecR0 = 1.0;
+    vecR1 = 0;
+    vecR2 = 2 * (1 - Kr);
+
+    vecG0 = 1.0;
+    vecG1 = -(Kb / Kg) * 2 * (1 - Kb);
+    vecG2 = -(Kr / Kg) * 2 * (1 - Kr);
+
+    vecB0 = 1.0;
+    vecB1 = 2 * (1 - Kb);
+    vecB2 = 0;
+
+    /* Assume all components has the same bitdepth */
+    S = (1 << in_yuv_info->finfo->depth0) - 1;
+    Sy = (gdouble) S / scale0;
+    Suv = (gdouble) S / scale1;
+    Oy = -((gdouble) offset0 / scale0);
+    Ouv = -((gdouble) offset1 / scale1);
+
+    matrix->matrix00 = Sy * vecR0;
+    matrix->matrix10 = Sy * vecG0;
+    matrix->matrix20 = Sy * vecB0;
+
+    matrix->matrix01 = Suv * vecR1;
+    matrix->matrix11 = Suv * vecG1;
+    matrix->matrix21 = Suv * vecB1;
+
+    matrix->matrix02 = Suv * vecR2;
+    matrix->matrix12 = Suv * vecG2;
+    matrix->matrix22 = Suv * vecB2;
+
+    matrix->offset0 = vecR0 * Oy + vecR1 * Ouv + vecR2 * Ouv;
+    matrix->offset1 = vecG0 * Oy + vecG1 * Ouv + vecG2 * Ouv;
+    matrix->offset2 = vecB0 * Oy + vecB1 * Ouv + vecB2 * Ouv;
+
+    /* Apply RGB range scale matrix */
+    if (out_rgb_info->colorimetry.range == GST_VIDEO_COLOR_RANGE_16_235) {
+      GstD3D12ColorMatrix scale_matrix, rst;
+      GstVideoInfo full_rgb = *out_rgb_info;
+
+      full_rgb.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
+
+      if (gst_d3d12_color_range_adjust_matrix_unorm (&full_rgb,
+              out_rgb_info, &scale_matrix)) {
+        /* Ms * Matrix */
+        color_matrix_multiply (&rst, &scale_matrix, matrix);
+
+        /* Ms * transform offsets */
+        for (guint i = 0; i < 3; i++) {
+          gdouble val = 0;
+          for (guint j = 0; j < 3; j++) {
+            val += scale_matrix.matrixij * matrix->offsetj;
+          }
+          rst.offseti = val + scale_matrix.offseti;
+        }
+
+        /* copy back to output matrix */
+        for (guint i = 0; i < 3; i++) {
+          for (guint j = 0; j < 3; j++) {
+            matrix->matrixij = rst.matrixij;
+          }
+          matrix->offseti = rst.offseti;
+          matrix->mini = scale_matrix.mini;
+          matrix->maxi = scale_matrix.maxi;
+        }
+      }
+    }
+  } else {
+    /* Unknown matrix */
+    matrix->matrix00 = 1.0;
+    matrix->matrix11 = 1.0;
+    matrix->matrix22 = 1.0;
+  }
+
+  return TRUE;
+}
+
+/**
+ * gst_d3d12_rgb_to_yuv_matrix_unorm:
+ * @in_rgb_info: a #GstVideoInfo of input RGB signal
+ * @out_yuv_info: a #GstVideoInfo of output YUV signal
+ * @matrix: a #GstD3D12ColorMatrix
+ *
+ * Calculates transform matrix from RGB to YUV conversion. Both input and output
+ * signals are in normalized 0.0..1.0 space and additional gamma decoding
+ * or primary/transfer function transform is not performed by this matrix.
+ *
+ * Resulting RGB values can be calculated by
+ * | Y' |                           | R' |   | matrix.offset0 |
+ * | Cb | = clamp ( matrix.matrix * | G' | + | matrix.offset1 |, matrix.min, matrix.max )
+ * | Cr |                           | B' |   | matrix.offset2 |
+ *
+ * Returns: %TRUE if successful
+ */
+gboolean
+gst_d3d12_rgb_to_yuv_matrix_unorm (const GstVideoInfo * in_rgb_info,
+    const GstVideoInfo * out_yuv_info, GstD3D12ColorMatrix * matrix)
+{
+  gint offset4, scale4;
+  gdouble Kr, Kb, Kg;
+
+  g_return_val_if_fail (in_rgb_info != nullptr, FALSE);
+  g_return_val_if_fail (out_yuv_info != nullptr, FALSE);
+  g_return_val_if_fail (matrix != nullptr, FALSE);
+
+  /*
+   * <Formula>
+   *
+   * Input: Unsigned normalized non-linear R'G'B'(unorm), 0.0..1.0 range
+   * Output: Unsigned normalized Y'CbCr(unorm), 0.0..1.0 range
+   *
+   * 1) R'G'B' to YPbPr
+   * | Y  |      | R' |
+   * | Pb | = M *| G' |
+   * | Pr |      | B' |
+   * where
+   *     | vecY |
+   * M = | vecU |
+   *     | vecV |
+   * vecY = |       Kr      ,       Kg      ,      Kb       |
+   * vecU = | -0.5*Kr/(1-Kb), -0.5*Kg/(1-Kb),     0.5       |
+   * vecV = |      0.5      , -0.5*Kg/(1-Kr), -0.5*Kb(1-Kr) |
+   *
+   * 2) YPbPr to Y'CbCr(unorm)
+   * Y'(unorm) = (Y  * scaleY + offsetY)       / S
+   * Cb(unorm) = (Pb * scaleCbCr + offsetCbCr) / S
+   * Cr(unorm) = (Pr * scaleCbCr + offsetCbCr) / S
+   * =>
+   * Y'(unorm) = (Y  * scaleY    / S) + (offsetY    / S)
+   * Cb(unorm) = (Pb * scaleCbCr / S) + (offsetCbCr / S)
+   * Cr(unorm) = (Pb * scaleCbCr / S) + (offsetCbCr / S)
+   * where S = (2 ^ bitdepth) - 1
+   *
+   * 3) RGB -> YUV matrix
+   * | Y'(unorm) |            | R' |   | offsetA |
+   * | Cb(unorm) | = Matrix * | G' | + | offsetB |
+   * | Cr(unorm) |            | B' |   | offsetC |
+   *
+   * where
+   *          | (scaleY/S)    * vecY |
+   * Matrix = | (scaleCbCr/S) * vecU |
+   *          | (scaleCbCr/S) * vecV |
+   *
+   * offsetA = offsetY    / S
+   * offsetB = offsetCbCr / S
+   * offsetC = offsetCbCr / S
+   *
+   * 4) Consider 16-235 scale RGB
+   * RGBstudio(16..235) -> RGBfull(0..255) matrix is represented by
+   * | Rf |      | Rs |   | Or |
+   * | Gf | = Ms | Gs | + | Og |
+   * | Bf |      | Bs |   | Ob |
+   *
+   * Combining all matrix into
+   * | Y'(unorm) |                 | Rs |   | Or |     | offsetA |
+   * | Cb(unorm) | = Matrix * ( Ms | Gs | + | Og | ) + | offsetB |
+   * | Cr(unorm) |                 | Bs |   | Ob |     | offsetC |
+   *
+   *                             | Rs |          | Or |   | offsetA |
+   *               = Matrix * Ms | Gs | + Matrix | Og | + | offsetB |
+   *                             | Bs |          | Ob |   | offsetB |
+   */
+
+  memset (matrix, 0, sizeof (GstD3D12ColorMatrix));
+  for (guint i = 0; i < 3; i++)
+    matrix->maxi = 1.0;
+
+  gst_video_color_range_offsets (out_yuv_info->colorimetry.range,
+      out_yuv_info->finfo, offset, scale);
+
+  if (gst_video_color_matrix_get_Kr_Kb (out_yuv_info->colorimetry.matrix,
+          &Kr, &Kb)) {
+    guint S;
+    gdouble Sy, Suv;
+    gdouble Oy, Ouv;
+    gdouble vecY3, vecU3, vecV3;
+
+    Kg = 1.0 - Kr - Kb;
+
+    vecY0 = Kr;
+    vecY1 = Kg;
+    vecY2 = Kb;
+
+    vecU0 = -0.5 * Kr / (1 - Kb);
+    vecU1 = -0.5 * Kg / (1 - Kb);
+    vecU2 = 0.5;
+
+    vecV0 = 0.5;
+    vecV1 = -0.5 * Kg / (1 - Kr);
+    vecV2 = -0.5 * Kb / (1 - Kr);
+
+    /* Assume all components has the same bitdepth */
+    S = (1 << out_yuv_info->finfo->depth0) - 1;
+    Sy = (gdouble) scale0 / S;
+    Suv = (gdouble) scale1 / S;
+    Oy = (gdouble) offset0 / S;
+    Ouv = (gdouble) offset1 / S;
+
+    for (guint i = 0; i < 3; i++) {
+      matrix->matrix0i = Sy * vecYi;
+      matrix->matrix1i = Suv * vecUi;
+      matrix->matrix2i = Suv * vecVi;
+    }
+
+    matrix->offset0 = Oy;
+    matrix->offset1 = Ouv;
+    matrix->offset2 = Ouv;
+
+    matrix->min0 = Oy;
+    matrix->min1 = Oy;
+    matrix->min2 = Oy;
+
+    matrix->max0 = ((gdouble) scale0 + offset0) / S;
+    matrix->max1 = ((gdouble) scale1 + offset0) / S;
+    matrix->max2 = ((gdouble) scale1 + offset0) / S;
+
+    /* Apply RGB range scale matrix */
+    if (in_rgb_info->colorimetry.range == GST_VIDEO_COLOR_RANGE_16_235) {
+      GstD3D12ColorMatrix scale_matrix, rst;
+      GstVideoInfo full_rgb = *in_rgb_info;
+
+      full_rgb.colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;
+
+      if (gst_d3d12_color_range_adjust_matrix_unorm (in_rgb_info,
+              &full_rgb, &scale_matrix)) {
+        /* Matrix * Ms */
+        color_matrix_multiply (&rst, matrix, &scale_matrix);
+
+        /* Matrix * scale offsets */
+        for (guint i = 0; i < 3; i++) {
+          gdouble val = 0;
+          for (guint j = 0; j < 3; j++) {
+            val += matrix->matrixij * scale_matrix.offsetj;
+          }
+          rst.offseti = val + matrix->offseti;
+        }
+
+        /* copy back to output matrix */
+        for (guint i = 0; i < 3; i++) {
+          for (guint j = 0; j < 3; j++) {
+            matrix->matrixij = rst.matrixij;
+          }
+          matrix->offseti = rst.offseti;
+        }
+      }
+    }
+  } else {
+    /* Unknown matrix */
+    matrix->matrix00 = 1.0;
+    matrix->matrix11 = 1.0;
+    matrix->matrix22 = 1.0;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+rgb_to_xyz_matrix (const GstVideoColorPrimariesInfo * info,
+    GstD3D12ColorMatrix * matrix)
+{
+  GstD3D12ColorMatrix m, im;
+  gdouble Sr, Sg, Sb;
+  gdouble Xw, Yw, Zw;
+
+  if (info->Rx == 0 || info->Gx == 0 || info->By == 0 || info->Wy == 0)
+    return FALSE;
+
+  color_matrix_identity (&m);
+
+  m.matrix00 = info->Rx / info->Ry;
+  m.matrix10 = 1.0;
+  m.matrix20 = (1.0 - info->Rx - info->Ry) / info->Ry;
+
+  m.matrix01 = info->Gx / info->Gy;
+  m.matrix11 = 1.0;
+  m.matrix21 = (1.0 - info->Gx - info->Gy) / info->Gy;
+
+  m.matrix02 = info->Bx / info->By;
+  m.matrix12 = 1.0;
+  m.matrix22 = (1.0 - info->Bx - info->By) / info->By;
+
+  if (!color_matrix_invert (&im, &m))
+    return FALSE;
+
+  Xw = info->Wx / info->Wy;
+  Yw = 1.0;
+  Zw = (1.0 - info->Wx - info->Wy) / info->Wy;
+
+  Sr = im.matrix00 * Xw + im.matrix01 * Yw + im.matrix02 * Zw;
+  Sg = im.matrix10 * Xw + im.matrix11 * Yw + im.matrix12 * Zw;
+  Sb = im.matrix20 * Xw + im.matrix21 * Yw + im.matrix22 * Zw;
+
+  for (guint i = 0; i < 3; i++) {
+    m.matrixi0 *= Sr;
+    m.matrixi1 *= Sg;
+    m.matrixi2 *= Sb;
+  }
+
+  color_matrix_copy (matrix, &m);
+
+  return TRUE;
+}
+
+/**
+ * gst_d3d12_color_primaries_matrix_unorm:
+ * @in_info: a #GstVideoColorPrimariesInfo of input signal
+ * @out_info: a #GstVideoColorPrimariesInfo of output signal
+ * @matrix: a #GstD3D12ColorMatrix
+ *
+ * Calculates color primaries conversion matrix
+ *
+ * Resulting RGB values can be calculated by
+ * | Rout |                              | Rin |
+ * | Gout | = saturate ( matrix.matrix * | Gin | )
+ * | Bout |                              | Bin |
+ *
+ * Returns: %TRUE if successful
+ */
+gboolean
+gst_d3d12_color_primaries_matrix_unorm (const GstVideoColorPrimariesInfo *
+    in_info, const GstVideoColorPrimariesInfo * out_info,
+    GstD3D12ColorMatrix * matrix)
+{
+  GstD3D12ColorMatrix Ms, invMd, ret;
+
+  g_return_val_if_fail (in_info != nullptr, FALSE);
+  g_return_val_if_fail (out_info != nullptr, FALSE);
+  g_return_val_if_fail (matrix != nullptr, FALSE);
+
+  /*
+   * <Formula>
+   *
+   * 1) RGB -> XYZ conversion
+   * | X |     | R |
+   * | Y | = M | G |
+   * | Z |     | B |
+   * where
+   *     | SrXr, SgXg, SbXb |
+   * M = | SrYr, SgYg, SbYb |
+   *     | SrZr, SgZg, SbZb |
+   *
+   * Xr = xr / yr
+   * Yr = 1
+   * Zr = (1 - xr - yr) / yr
+   * xr and yr are xy coordinates of red primary in the CIE 1931 color space.
+   * And its applied to G and B components
+   *
+   * | Sr |        | Xr, Xg, Xb |     | Xw |
+   * | Sg | = inv( | Yr, Yg, Yb | ) * | Yw |
+   * | Sb |        | Zr, Zg, Zb |     | Zw |
+   *
+   * 2) XYZsrc -> XYZdst conversion
+   * Apply chromatic adaptation
+   * | Xdst |      | Xsrc |
+   * | Ydst | = Mc | Ysrc |
+   * | Zdst |      | Zsrc |
+   * where
+   *      | Xwdst / Xwsrc,       0      ,       0       |
+   * Mc = |       0      , Ywdst / Ywsrc,       0       |
+   *      |       0      ,       0      , Zwdst / Zwsrc |
+   *
+   * where
+   *
+   * 3) Final matrix
+   * | Rd |                      | Rs |
+   * | Gd | = inv (Md) * Mc * Ms | Gs |
+   * | Bd |                      | Bs |
+   */
+
+  memset (matrix, 0, sizeof (GstD3D12ColorMatrix));
+  for (guint i = 0; i < 3; i++)
+    matrix->maxi = 1.0;
+
+  if (!rgb_to_xyz_matrix (in_info, &Ms)) {
+    GST_WARNING ("Failed to get src XYZ matrix");
+    return FALSE;
+  }
+
+  if (!rgb_to_xyz_matrix (out_info, &invMd) ||
+      !color_matrix_invert (&invMd, &invMd)) {
+    GST_WARNING ("Failed to get dst XYZ matrix");
+    return FALSE;
+  }
+
+  if (in_info->Wx != out_info->Wx || in_info->Wy != out_info->Wy) {
+    GstD3D12ColorMatrix Mc;
+
+    color_matrix_identity (&Mc);
+    Mc.matrix00 = (out_info->Wx / out_info->Wy) /
+        (in_info->Wx / in_info->Wy);
+    /* Yw == 1.0 */
+    Mc.matrix22 = ((1.0 - out_info->Wx - out_info->Wy) / out_info->Wy) /
+        ((1.0 - in_info->Wx - in_info->Wy) / in_info->Wy);
+
+    color_matrix_multiply (&ret, &Mc, &Ms);
+  } else {
+    color_matrix_copy (&ret, &Ms);
+  }
+
+  color_matrix_multiply (&ret, &invMd, &ret);
+  color_matrix_copy (matrix, &ret);
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12format.h Added

@@ -0,0 +1,86 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+
+G_BEGIN_DECLS
+
+struct _GstD3D12Format
+{
+  GstVideoFormat format;
+
+  /* direct mapping to dxgi format if applicable */
+  DXGI_FORMAT dxgi_format;
+
+  /* formats for texture processing */
+  DXGI_FORMAT resource_formatGST_VIDEO_MAX_PLANES;
+
+  /* extra format used for unordered access view (unused) */
+  DXGI_FORMAT uav_formatGST_VIDEO_MAX_PLANES;
+
+  /* D3D12_FORMAT_SUPPORT1 flags */
+  guint format_support1GST_VIDEO_MAX_PLANES;
+
+  /* D3D12_FORMAT_SUPPORT2 flags (unused) */
+  guint format_support2GST_VIDEO_MAX_PLANES;
+
+  /*< private >*/
+  guint paddingGST_PADDING_LARGE;
+};
+
+typedef struct _GstD3D12ColorMatrix
+{
+  gdouble matrix33;
+  gdouble offset3;
+  gdouble min3;
+  gdouble max3;
+} GstD3D12ColorMatrix;
+
+GstVideoFormat  gst_d3d12_dxgi_format_to_gst        (DXGI_FORMAT format);
+
+gboolean        gst_d3d12_dxgi_format_to_resource_formats (DXGI_FORMAT format,
+                                                           DXGI_FORMAT resource_formatGST_VIDEO_MAX_PLANES);
+
+void            gst_d3d12_color_matrix_init (GstD3D12ColorMatrix * matrix);
+
+gchar *         gst_d3d12_dump_color_matrix (GstD3D12ColorMatrix * matrix);
+
+gboolean        gst_d3d12_color_range_adjust_matrix_unorm (const GstVideoInfo * in_info,
+                                                           const GstVideoInfo * out_info,
+                                                           GstD3D12ColorMatrix * matrix);
+
+gboolean        gst_d3d12_yuv_to_rgb_matrix_unorm (const GstVideoInfo * in_yuv_info,
+                                                   const GstVideoInfo * out_rgb_info,
+                                                   GstD3D12ColorMatrix * matrix);
+
+gboolean        gst_d3d12_rgb_to_yuv_matrix_unorm (const GstVideoInfo * in_rgb_info,
+                                                   const GstVideoInfo * out_yuv_info,
+                                                   GstD3D12ColorMatrix * matrix);
+
+gboolean        gst_d3d12_color_primaries_matrix_unorm (const GstVideoColorPrimariesInfo * in_info,
+                                                        const GstVideoColorPrimariesInfo * out_info,
+                                                        GstD3D12ColorMatrix * matrix);
+
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12h264dec.cpp Added

@@ -0,0 +1,378 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02120-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d12h264dec
+ * @title: d3d12h264dec
+ *
+ * A Direct3D12 based H.264 video decoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/h264/file ! parsebin ! d3d12h264dec ! videoconvert ! autovideosink
+ * ```
+ *
+ * Since: 1.24
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstd3d12h264dec.h"
+#include <gst/dxva/gstdxvah264decoder.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_h264_dec_debug);
+#define GST_CAT_DEFAULT gst_d3d12_h264_dec_debug
+
+GST_D3D12_DECODER_DEFINE_TYPE_FULL (GstD3D12H264Dec, gst_d3d12_h264_dec,
+    GST, D3D12_H264_DEC, GstDxvaH264Decoder);
+
+static void
+gst_d3d12_h264_dec_class_init (GstD3D12H264DecClass * klass, gpointer data)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstDxvaH264DecoderClass *dxva_class = GST_DXVA_H264_DECODER_CLASS (klass);
+  GstD3D12DecoderClassData *cdata = (GstD3D12DecoderClassData *) data;
+
+  gobject_class->finalize = gst_d3d12_h264_dec_finalize;
+  gobject_class->get_property = gst_d3d12_h264_dec_get_property;
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_set_context);
+
+  parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
+  gst_d3d12_decoder_class_data_fill_subclass_data (cdata, &klass->class_data);
+
+  gst_d3d12_decoder_proxy_class_init (element_class, cdata,
+      "Seungha Yang <seungha@centricualr.com>");
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_open);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_stop);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_close);
+  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_sink_query);
+  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_src_query);
+  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_sink_event);
+  decoder_class->drain = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_drain);
+  decoder_class->finish = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_finish);
+  decoder_class->flush = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_flush);
+
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_new_picture);
+  dxva_class->duplicate_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_duplicate_picture);
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_get_picture_id);
+  dxva_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_start_picture);
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_end_picture);
+  dxva_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h264_dec_output_picture);
+}
+
+static void
+gst_d3d12_h264_dec_init (GstD3D12H264Dec * self)
+{
+  GstD3D12H264DecClass *klass = GST_D3D12_H264_DEC_GET_CLASS (self);
+  GstD3D12DecoderSubClassData *cdata = &klass->class_data;
+
+  self->decoder = gst_d3d12_decoder_new (GST_DXVA_CODEC_H264,
+      cdata->adapter_luid);
+}
+
+static void
+gst_d3d12_h264_dec_finalize (GObject * object)
+{
+  GstD3D12H264Dec *self = GST_D3D12_H264_DEC (object);
+
+  gst_object_unref (self->decoder);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_h264_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstD3D12H264DecClass *klass = GST_D3D12_H264_DEC_GET_CLASS (object);
+  GstD3D12DecoderSubClassData *cdata = &klass->class_data;
+
+  gst_d3d12_decoder_proxy_get_property (object, prop_id, value, pspec, cdata);
+}
+
+static void
+gst_d3d12_h264_dec_set_context (GstElement * element, GstContext * context)
+{
+  GstD3D12H264Dec *self = GST_D3D12_H264_DEC (element);
+
+  gst_d3d12_decoder_set_context (self->decoder, element, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_d3d12_h264_dec_open (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  return gst_d3d12_decoder_open (self->decoder, GST_ELEMENT (self));
+}
+
+static gboolean
+gst_d3d12_h264_dec_stop (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  gst_d3d12_decoder_stop (self->decoder);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+}
+
+static gboolean
+gst_d3d12_h264_dec_close (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  return gst_d3d12_decoder_close (self->decoder);
+}
+
+static gboolean
+gst_d3d12_h264_dec_negotiate (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  if (!gst_d3d12_decoder_negotiate (self->decoder, decoder))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_d3d12_h264_dec_decide_allocation (GstVideoDecoder * decoder,
+    GstQuery * query)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  if (!gst_d3d12_decoder_decide_allocation (self->decoder, decoder, query)) {
+    return FALSE;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static gboolean
+gst_d3d12_h264_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_h264_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_h264_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  gst_d3d12_decoder_sink_event (self->decoder, event);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstFlowReturn
+gst_d3d12_h264_dec_drain (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->drain (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_h264_dec_finish (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->finish (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static gboolean
+gst_d3d12_h264_dec_flush (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->flush (decoder);
+  gst_d3d12_decoder_flush (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_h264_dec_configure (GstDxvaH264Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+  auto videodec = GST_VIDEO_DECODER (decoder);
+
+  return gst_d3d12_decoder_configure (self->decoder, videodec, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
+}
+
+static GstFlowReturn
+gst_d3d12_h264_dec_new_picture (GstDxvaH264Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  return gst_d3d12_decoder_new_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture);
+}
+
+static GstFlowReturn
+gst_d3d12_h264_dec_duplicate_picture (GstDxvaH264Decoder * decoder,
+    GstCodecPicture * src, GstCodecPicture * dst)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  return gst_d3d12_decoder_duplicate_picture (self->decoder, src, dst);
+}
+
+static guint8
+gst_d3d12_h264_dec_get_picture_id (GstDxvaH264Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  return gst_d3d12_decoder_get_picture_id (self->decoder, picture);
+}
+
+static GstFlowReturn
+gst_d3d12_h264_dec_start_picture (GstDxvaH264Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  return gst_d3d12_decoder_start_picture (self->decoder, picture, picture_id);
+}
+
+static GstFlowReturn
+gst_d3d12_h264_dec_end_picture (GstDxvaH264Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  return gst_d3d12_decoder_end_picture (self->decoder, picture, ref_pics, args);
+}
+
+static GstFlowReturn
+gst_d3d12_h264_dec_output_picture (GstDxvaH264Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
+{
+  auto self = GST_D3D12_H264_DEC (decoder);
+
+  return gst_d3d12_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
+}
+
+void
+gst_d3d12_h264_dec_register (GstPlugin * plugin, GstD3D12Device * device,
+    ID3D12VideoDevice * video_device, guint rank)
+{
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  guint index = 0;
+  GTypeInfo type_info = {
+    sizeof (GstD3D12H264DecClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_d3d12_h264_dec_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstD3D12H264Dec),
+    0,
+    (GInstanceInitFunc) gst_d3d12_h264_dec_init,
+  };
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_h264_dec_debug, "d3d12h264dec", 0,
+      "d3d12h264dec");
+
+  type_info.class_data =
+      gst_d3d12_decoder_check_feature_support (device, video_device,
+      GST_DXVA_CODEC_H264);
+  if (!type_info.class_data)
+    return;
+
+  type_name = g_strdup ("GstD3D12H264Dec");
+  feature_name = g_strdup ("d3d12h264dec");
+
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstD3D12H264Device%dDec", index);
+    feature_name = g_strdup_printf ("d3d12h264device%ddec", index);
+  }
+
+  type = g_type_register_static (GST_TYPE_DXVA_H264_DECODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  /* make lower rank than default device */
+  if (rank > 0 && index != 0)
+    rank--;
+
+  if (index != 0)
+    gst_element_type_set_skip_documentation (type);
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12h264dec.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstd3d12decoder.h"
+
+G_BEGIN_DECLS
+
+void  gst_d3d12_h264_dec_register (GstPlugin * plugin,
+                                   GstD3D12Device * device,
+                                   ID3D12VideoDevice * video_device,
+                                   guint rank);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12h264enc.cpp Added

@@ -0,0 +1,2477 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12h264enc.h"
+#include "gstd3d12encoder.h"
+#include "gstd3d12dpbstorage.h"
+#include "gstd3d12pluginutils.h"
+#include <gst/base/gstqueuearray.h>
+#include <gst/codecparsers/gsth264parser.h>
+#include <gst/codecparsers/gsth264bitwriter.h>
+#include <directx/d3dx12.h>
+#include <wrl.h>
+#include <string.h>
+#include <cmath>
+#include <vector>
+#include <array>
+#include <string>
+#include <mutex>
+#include <condition_variable>
+#include <unordered_map>
+#include <memory>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_h264_enc_debug);
+#define GST_CAT_DEFAULT gst_d3d12_h264_enc_debug
+
+enum
+{
+  PROP_0,
+  PROP_RATE_CONTROL_SUPPORT,
+  PROP_SLICE_MODE_SUPPORT,
+  PROP_AUD,
+  PROP_GOP_SIZE,
+  PROP_REF_FRAMES,
+  PROP_FRAME_ANALYSIS,
+  PROP_RATE_CONTROL,
+  PROP_BITRATE,
+  PROP_MAX_BITRATE,
+  PROP_QVBR_QUALITY,
+  PROP_QP_INIT,
+  PROP_QP_MIN,
+  PROP_QP_MAX,
+  PROP_QP_I,
+  PROP_QP_P,
+  PROP_QP_B,
+  PROP_SLICE_MODE,
+  PROP_SLICE_PARTITION,
+  PROP_CC_INSERT,
+};
+
+#define DEFAULT_AUD TRUE
+#define DEFAULT_FRAME_ANALYSIS FALSE
+#define DEFAULT_GOP_SIZE 60
+#define DEFAULT_RATE_CONTROL D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR
+#define DEFAULT_BITRATE 2000
+#define DEFAULT_MAX_BITRATE 4000
+#define DEFAULT_QVBR_QUALITY 23
+#define DEFAULT_QP 0
+#define DEFAULT_CQP 23
+#define DEFAULT_REF_FRAMES 0
+#define DEFAULT_SLICE_MODE D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_FULL_FRAME
+#define DEFAULT_SLICE_PARTITION 0
+#define DEFAULT_CC_INSERT GST_D3D12_ENCODER_SEI_INSERT
+
+struct GstD3D12H264EncClassData
+{
+  gint64 luid;
+  guint device_id;
+  guint vendor_id;
+  gchar *description;
+  GstCaps *sink_caps;
+  GstCaps *src_caps;
+  guint rc_support;
+  guint slice_mode_support;
+};
+
+/* *INDENT-OFF* */
+class GstD3D12H264EncGop
+{
+public:
+  void Init (guint gop_length)
+  {
+    /* TODO: pic_order_cnt_type == 0 for b-frame  */
+    gop_struct_.pic_order_cnt_type = 2;
+    if (gop_length == 1)
+      gop_struct_.PPicturePeriod = 0;
+    else
+      gop_struct_.PPicturePeriod = 1;
+
+    /* 0 means infinite */
+    if (gop_length == 0) {
+      gop_struct_.GOPLength = 0;
+      gop_struct_.log2_max_frame_num_minus4 = 12;
+    } else {
+      /* count bits */
+      guint val = gop_length;
+      guint num_bits = 0;
+      while (val) {
+        num_bits++;
+        val >>= 1;
+      }
+
+      if (num_bits < 4)
+        gop_struct_.log2_max_frame_num_minus4 = 0;
+      else if (num_bits > 16)
+        gop_struct_.log2_max_frame_num_minus4 = 12;
+      else
+        gop_struct_.log2_max_frame_num_minus4 = num_bits - 4;
+
+      gop_struct_.GOPLength = gop_length;
+    }
+
+    MaxFrameNum_ = 1 << (gop_struct_.log2_max_frame_num_minus4 + 4);
+
+    if (gop_struct_.pic_order_cnt_type == 2) {
+      /* unused */
+      gop_struct_.log2_max_pic_order_cnt_lsb_minus4 = 0;
+      MaxPicOrderCnt_ = MaxFrameNum_ * 2;
+    } else {
+      guint log2_max_pic_order_cnt = gop_struct_.log2_max_frame_num_minus4 + 5;
+      log2_max_pic_order_cnt = MIN (16, log2_max_pic_order_cnt);
+      gop_struct_.log2_max_pic_order_cnt_lsb_minus4 = log2_max_pic_order_cnt - 4;
+
+      MaxPicOrderCnt_ = 1 << log2_max_pic_order_cnt;
+    }
+
+    gop_start_ = true;
+    frame_num_ = 0;
+    encode_order_ = 0;
+  }
+
+  D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264
+  GetGopStruct ()
+  {
+    return gop_struct_;
+  }
+
+  void
+  FillPicCtrl (D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264 & pic_ctrl)
+  {
+    if (gop_start_) {
+      pic_ctrl.FrameType = D3D12_VIDEO_ENCODER_FRAME_TYPE_H264_IDR_FRAME;
+      pic_ctrl.idr_pic_id = idr_pic_id_;
+      pic_ctrl.FrameDecodingOrderNumber = 0;
+      pic_ctrl.PictureOrderCountNumber = 0;
+      pic_ctrl.TemporalLayerIndex = 0;
+      idr_pic_id_++;
+      gop_start_ = false;
+    } else {
+      pic_ctrl.FrameType = D3D12_VIDEO_ENCODER_FRAME_TYPE_H264_P_FRAME;
+      pic_ctrl.idr_pic_id = idr_pic_id_;
+      pic_ctrl.FrameDecodingOrderNumber = frame_num_;
+      pic_ctrl.PictureOrderCountNumber = ((guint) frame_num_) * 2;
+      pic_ctrl.TemporalLayerIndex = 0;
+    }
+
+    /* And increase frame num */
+    /* FIXME: frame_num = (frame_num_of_pref_ref_pic + 1) % ...  */
+    frame_num_ = (frame_num_ + 1) % MaxFrameNum_;
+    encode_order_++;
+    if (gop_struct_.GOPLength != 0 && encode_order_ >= gop_struct_.GOPLength) {
+      frame_num_ = 0;
+      encode_order_ = 0;
+      gop_start_ = true;
+    }
+  }
+
+  void ForceKeyUnit ()
+  {
+    frame_num_ = 0;
+    encode_order_ = 0;
+    gop_start_ = true;
+  }
+
+private:
+  D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264 gop_struct_ = { };
+  guint16 frame_num_ = 0;
+  guint16 idr_pic_id_ = 0;
+  guint32 MaxFrameNum_ = 16;
+  guint32 MaxPicOrderCnt_ = 16;
+  guint64 encode_order_ = 0;
+  bool gop_start_ = false;
+};
+
+class GstD3D12H264EncDpb
+{
+public:
+  GstD3D12H264EncDpb (GstD3D12Device * device, UINT width, UINT height,
+       UINT max_dpb_size, bool array_of_textures)
+  {
+    max_dpb_size_ = max_dpb_size;
+    if (max_dpb_size_ > 0) {
+      storage_ = gst_d3d12_dpb_storage_new (device, max_dpb_size + 1,
+          array_of_textures, DXGI_FORMAT_NV12, width, height,
+          D3D12_RESOURCE_FLAG_VIDEO_ENCODE_REFERENCE_ONLY |
+          D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE);
+    }
+  }
+
+  ~GstD3D12H264EncDpb ()
+  {
+    gst_clear_object (&storage_);
+  }
+
+  bool IsValid ()
+  {
+    if (max_dpb_size_ > 0 && !storage_)
+      return false;
+
+    return true;
+  }
+
+  bool StartFrame (bool is_reference,
+      D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264 * ctrl_data,
+      D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE * recon_pic,
+      D3D12_VIDEO_ENCODE_REFERENCE_FRAMES * ref_frames,
+      UINT64 display_order)
+  {
+    ctrl_data_ = *ctrl_data;
+    cur_display_order_ = display_order;
+    cur_frame_is_ref_ = is_reference;
+
+    recon_pic_.pReconstructedPicture = nullptr;
+    recon_pic_.ReconstructedPictureSubresource = 0;
+
+    if (max_dpb_size_ > 0 &&
+      ctrl_data_.FrameType == D3D12_VIDEO_ENCODER_FRAME_TYPE_H264_IDR_FRAME) {
+      ref_pic_desc_.clear();
+      ref_pic_display_order_.clear ();
+      gst_d3d12_dpb_storage_clear_dpb (storage_);
+    }
+
+    if (is_reference) {
+      g_assert (max_dpb_size_ > 0);
+      if (!gst_d3d12_dpb_storage_acquire_frame (storage_, &recon_pic_))
+        return false;
+    }
+
+    *recon_pic = recon_pic_;
+
+    switch (ctrl_data_.FrameType) {
+      case D3D12_VIDEO_ENCODER_FRAME_TYPE_H264_P_FRAME:
+      case D3D12_VIDEO_ENCODER_FRAME_TYPE_H264_B_FRAME:
+        g_assert (max_dpb_size_ > 0);
+        gst_d3d12_dpb_storage_get_reference_frames (storage_,
+            ref_frames);
+        break;
+      default:
+        ref_frames->NumTexture2Ds = 0;
+        ref_frames->ppTexture2Ds = nullptr;
+        ref_frames->pSubresources = nullptr;
+        break;
+    }
+
+    list0_.clear ();
+    list1_.clear ();
+
+    bool build_l0 = (ctrl_data_.FrameType ==
+      D3D12_VIDEO_ENCODER_FRAME_TYPE_H264_P_FRAME) ||
+      (ctrl_data_.FrameType ==
+      D3D12_VIDEO_ENCODER_FRAME_TYPE_H264_B_FRAME);
+    bool build_l1 = ctrl_data_.FrameType ==
+        D3D12_VIDEO_ENCODER_FRAME_TYPE_H264_B_FRAME;
+
+    if (build_l0) {
+      for (UINT i = 0; i < (UINT) ref_pic_display_order_.size (); i++) {
+        if (ref_pic_display_order_i < display_order)
+          list0_.push_back (i);
+      }
+    }
+
+    if (build_l1) {
+      for (UINT i = 0; i < (UINT) ref_pic_display_order_.size (); i++) {
+        if (ref_pic_display_order_i > display_order)
+          list1_.push_back (i);
+      }
+    }
+
+    ctrl_data->List0ReferenceFramesCount = list0_.size ();
+    ctrl_data->pList0ReferenceFrames =
+        list0_.empty () ? nullptr : list0_.data ();
+
+    ctrl_data->List1ReferenceFramesCount = list1_.size ();
+    ctrl_data->pList1ReferenceFrames =
+        list1_.empty () ? nullptr : list1_.data ();
+
+    ctrl_data->ReferenceFramesReconPictureDescriptorsCount =
+        ref_pic_desc_.size ();
+    ctrl_data->pReferenceFramesReconPictureDescriptors =
+        ref_pic_desc_.empty () ? nullptr : ref_pic_desc_.data ();
+
+    return true;
+  }
+
+  void EndFrame ()
+  {
+    if (!cur_frame_is_ref_ || max_dpb_size_ == 0)
+      return;
+
+    if (gst_d3d12_dpb_storage_get_dpb_size (storage_) == max_dpb_size_) {
+      gst_d3d12_dpb_storage_remove_oldest_frame (storage_);
+      ref_pic_display_order_.pop_back ();
+      ref_pic_desc_.pop_back ();
+    }
+
+    gst_d3d12_dpb_storage_add_frame (storage_, &recon_pic_);
+
+    D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_H264 desc = { };
+    desc.ReconstructedPictureResourceIndex = 0;
+    desc.IsLongTermReference = FALSE;
+    desc.PictureOrderCountNumber = ctrl_data_.PictureOrderCountNumber;
+    desc.FrameDecodingOrderNumber = ctrl_data_.FrameDecodingOrderNumber;
+    desc.TemporalLayerIndex = 0;
+
+    ref_pic_display_order_.insert (ref_pic_display_order_.begin (),
+        cur_display_order_);
+    ref_pic_desc_.insert (ref_pic_desc_.begin(), desc);
+    for (UINT i = 1; i < ref_pic_desc_.size (); i++)
+      ref_pic_desc_i.ReconstructedPictureResourceIndex = i;
+  }
+
+private:
+  std::vector<D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_H264> ref_pic_desc_;
+  std::vector<UINT64> ref_pic_display_order_;
+  D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE recon_pic_ = { };
+  D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264 ctrl_data_ = { };
+  std::vector<UINT> list0_;
+  std::vector<UINT> list1_;
+  UINT max_dpb_size_ = 0;
+  UINT64 cur_display_order_ = 0;
+  bool cur_frame_is_ref_ = false;
+  GstD3D12DpbStorage *storage_ = nullptr;
+};
+
+struct GstD3D12H264SPS
+{
+  void Clear ()
+  {
+    memset (&sps, 0, sizeof (GstH264SPS));
+    bytes.clear ();
+  }
+
+  GstH264SPS sps;
+  std::vector<guint8> bytes;
+};
+
+struct GstD3D12H264PPS
+{
+  void Clear ()
+  {
+    memset (&pps, 0, sizeof (GstH264PPS));
+    bytes.clear ();
+  }
+
+  GstH264PPS pps;
+  std::vector<guint8> bytes;
+};
+
+struct GstD3D12H264EncPrivate
+{
+  GstD3D12H264EncPrivate ()
+  {
+    cc_sei = g_array_new (FALSE, FALSE, sizeof (GstH264SEIMessage));
+    g_array_set_clear_func (cc_sei, (GDestroyNotify) gst_h264_sei_clear);
+  }
+
+  ~GstD3D12H264EncPrivate ()
+  {
+    g_array_unref (cc_sei);
+  }
+
+  GstVideoInfo info;
+  GstD3D12H264SPS sps;
+  std::vector<GstD3D12H264PPS> pps;
+  GstH264Profile selected_profile;
+  GstD3D12H264EncGop gop;
+  std::unique_ptr<GstD3D12H264EncDpb> dpb;
+  guint last_pps_id = 0;
+  guint64 display_order = 0;
+  GArray *cc_sei;
+
+  std::mutex prop_lock;
+
+  GstD3D12EncoderConfig encoder_config = { };
+
+  D3D12_VIDEO_ENCODER_PROFILE_H264 profile_h264 =
+      D3D12_VIDEO_ENCODER_PROFILE_H264_MAIN;
+  D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264 config_h264 = { };
+  D3D12_VIDEO_ENCODER_LEVELS_H264 level_h264;
+  D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICES
+      layout_slices = { };
+  D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264 gop_struct_h264 = { };
+  D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264 pic_control_h264 = { };
+
+  D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE selected_rc_mode =
+      D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_ABSOLUTE_QP_MAP;
+  D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE selected_slice_mode =
+      DEFAULT_SLICE_MODE;
+  guint selected_ref_frames = 0;
+  D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_H264 pic_ctrl_support = { };
+
+  /* properties */
+  gboolean aud = DEFAULT_AUD;
+
+  /* gop struct related */
+  guint gop_size = DEFAULT_GOP_SIZE;
+  guint ref_frames = DEFAULT_REF_FRAMES;
+  gboolean gop_updated = FALSE;
+
+  /* rate control config */
+  D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE rc_mode = DEFAULT_RATE_CONTROL;
+  gboolean frame_analysis = DEFAULT_FRAME_ANALYSIS;
+  gboolean rc_flag_updated = FALSE;
+  guint bitrate = DEFAULT_BITRATE;
+  guint max_bitrate = DEFAULT_MAX_BITRATE;
+  guint qvbr_quality = DEFAULT_QVBR_QUALITY;
+  guint qp_init = DEFAULT_QP;
+  guint qp_min = DEFAULT_QP;
+  guint qp_max = DEFAULT_QP;
+  guint qp_i = DEFAULT_CQP;
+  guint qp_p = DEFAULT_CQP;
+  guint qp_b = DEFAULT_CQP;
+  gboolean rc_updated = FALSE;
+
+  /* slice mode */
+  D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE slice_mode =
+      DEFAULT_SLICE_MODE;
+  guint slice_partition = DEFAULT_SLICE_PARTITION;
+  gboolean slice_updated = FALSE;
+
+  GstD3D12EncoderSeiInsertMode cc_insert = DEFAULT_CC_INSERT;
+};
+/* *INDENT-ON* */
+
+struct GstD3D12H264Enc
+{
+  GstD3D12Encoder parent;
+
+  GstD3D12H264EncPrivate *priv;
+};
+
+struct GstD3D12H264EncClass
+{
+  GstD3D12EncoderClass parent_class;
+
+  GstD3D12H264EncClassData *cdata;
+};
+
+static inline GstD3D12H264Enc *
+GST_D3D12_H264_ENC (gpointer ptr)
+{
+  return (GstD3D12H264Enc *) ptr;
+}
+
+static inline GstD3D12H264EncClass *
+GST_D3D12_H264_ENC_GET_CLASS (gpointer ptr)
+{
+  return G_TYPE_INSTANCE_GET_CLASS (ptr, G_TYPE_FROM_INSTANCE (ptr),
+      GstD3D12H264EncClass);
+}
+
+static void gst_d3d12_h264_enc_finalize (GObject * object);
+static void gst_d3d12_h264_enc_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_d3d12_h264_enc_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static gboolean gst_d3d12_h264_enc_start (GstVideoEncoder * encoder);
+static gboolean gst_d3d12_h264_enc_stop (GstVideoEncoder * encoder);
+static gboolean gst_d3d12_h264_enc_transform_meta (GstVideoEncoder * encoder,
+    GstVideoCodecFrame * frame, GstMeta * meta);
+static gboolean gst_d3d12_h264_enc_new_sequence (GstD3D12Encoder * encoder,
+    ID3D12VideoDevice * video_device, GstVideoCodecState * state,
+    GstD3D12EncoderConfig * config);
+static gboolean gst_d3d12_h264_enc_start_frame (GstD3D12Encoder * encoder,
+    ID3D12VideoDevice * video_device, GstVideoCodecFrame * frame,
+    D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESC * seq_ctrl,
+    D3D12_VIDEO_ENCODER_PICTURE_CONTROL_DESC * picture_ctrl,
+    D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE * recon_pic,
+    GstD3D12EncoderConfig * config, gboolean * need_new_session);
+static gboolean gst_d3d12_h264_enc_end_frame (GstD3D12Encoder * encoder);
+
+static GstElementClass *parent_class = nullptr;
+
+static void
+gst_d3d12_h264_enc_class_init (GstD3D12H264EncClass * klass, gpointer data)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto element_class = GST_ELEMENT_CLASS (klass);
+  auto encoder_class = GST_VIDEO_ENCODER_CLASS (klass);
+  auto d3d12enc_class = GST_D3D12_ENCODER_CLASS (klass);
+  auto cdata = (GstD3D12H264EncClassData *) data;
+  GstPadTemplate *pad_templ;
+  auto read_only_params = (GParamFlags) (GST_PARAM_DOC_SHOW_DEFAULT |
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  auto rw_params = (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
+  klass->cdata = cdata;
+
+  object_class->finalize = gst_d3d12_h264_enc_finalize;
+  object_class->set_property = gst_d3d12_h264_enc_set_property;
+  object_class->get_property = gst_d3d12_h264_enc_get_property;
+
+  g_object_class_install_property (object_class, PROP_RATE_CONTROL_SUPPORT,
+      g_param_spec_flags ("rate-control-support", "Rate Control Support",
+          "Supported rate control modes",
+          GST_TYPE_D3D12_ENCODER_RATE_CONTROL_SUPPORT, 0, read_only_params));
+
+  g_object_class_install_property (object_class, PROP_SLICE_MODE_SUPPORT,
+      g_param_spec_flags ("slice-mode-support", "Slice Mode Support",
+          "Supported slice partition modes",
+          GST_TYPE_D3D12_ENCODER_SUBREGION_LAYOUT_SUPPORT, 1,
+          read_only_params));
+
+  g_object_class_install_property (object_class, PROP_AUD,
+      g_param_spec_boolean ("aud", "AUD", "Use AU delimiter", DEFAULT_AUD,
+          rw_params));
+
+  g_object_class_install_property (object_class, PROP_GOP_SIZE,
+      g_param_spec_uint ("gop-size", "GOP Size", "Size of GOP (0 = infinite)",
+          0, G_MAXUINT32, DEFAULT_GOP_SIZE, rw_params));
+
+  g_object_class_install_property (object_class, PROP_REF_FRAMES,
+      g_param_spec_uint ("ref-frames", "Ref frames",
+          "Preferred number of reference frames. Actual number of reference "
+          "frames can be limited depending on hardware (0 = unspecified)",
+          0, 16, DEFAULT_REF_FRAMES, rw_params));
+
+  g_object_class_install_property (object_class, PROP_FRAME_ANALYSIS,
+      g_param_spec_boolean ("frame-analysis", "Frame Analysis",
+          "Enable 2 pass encoding if supported by hardware",
+          DEFAULT_FRAME_ANALYSIS, rw_params));
+
+  g_object_class_install_property (object_class, PROP_RATE_CONTROL,
+      g_param_spec_enum ("rate-control", "Rate Control",
+          "Rate Control Method", GST_TYPE_D3D12_ENCODER_RATE_CONTROL,
+          DEFAULT_RATE_CONTROL, rw_params));
+
+  g_object_class_install_property (object_class, PROP_BITRATE,
+      g_param_spec_uint ("bitrate", "Bitrate",
+          "Target bitrate in kbits/second. "
+          "Used for \"cbr\", \"vbr\", and \"qvbr\" rate control",
+          0, G_MAXUINT, DEFAULT_BITRATE, rw_params));
+
+  g_object_class_install_property (object_class, PROP_MAX_BITRATE,
+      g_param_spec_uint ("max-bitrate", "Max Bitrate",
+          "Peak bitrate in kbits/second. "
+          "Used for \"vbr\", and \"qvbr\" rate control",
+          0, G_MAXUINT, DEFAULT_MAX_BITRATE, rw_params));
+
+  g_object_class_install_property (object_class, PROP_QVBR_QUALITY,
+      g_param_spec_uint ("qvbr-quality", "QVBR Quality",
+          "Constant quality target value for \"qvbr\" rate control",
+          0, 51, DEFAULT_QVBR_QUALITY, rw_params));
+
+  g_object_class_install_property (object_class, PROP_QP_INIT,
+      g_param_spec_uint ("qp-init", "QP Init",
+          "Initial QP value. "
+          "Used for \"cbr\", \"vbr\", and \"qvbr\" rate control",
+          0, 51, DEFAULT_QP, rw_params));
+
+  g_object_class_install_property (object_class, PROP_QP_MIN,
+      g_param_spec_uint ("qp-min", "QP Min",
+          "Minimum QP value for \"cbr\", \"vbr\", and \"qvbr\" rate control. "
+          "To enable min/max QP setting, \"qp-max >= qp-min > 0\" "
+          "condition should be satisfied", 0, 51, DEFAULT_QP, rw_params));
+
+  g_object_class_install_property (object_class, PROP_QP_MAX,
+      g_param_spec_uint ("qp-max", "QP Max",
+          "Maximum QP value for \"cbr\", \"vbr\", and \"qvbr\" rate control. "
+          "To enable min/max QP setting, \"qp-max >= qp-min > 0\" "
+          "condition should be satisfied", 0, 51, DEFAULT_QP, rw_params));
+
+  g_object_class_install_property (object_class, PROP_QP_I,
+      g_param_spec_uint ("qp-i", "QP I",
+          "Constant QP value for I frames. Used for \"cqp\" rate control",
+          1, 51, DEFAULT_CQP, rw_params));
+
+  g_object_class_install_property (object_class, PROP_QP_P,
+      g_param_spec_uint ("qp-p", "QP P",
+          "Constant QP value for P frames. Used for \"cqp\" rate control",
+          1, 51, DEFAULT_CQP, rw_params));
+
+  g_object_class_install_property (object_class, PROP_QP_I,
+      g_param_spec_uint ("qp-b", "QP B",
+          "Constant QP value for B frames. Used for \"cqp\" rate control",
+          1, 51, DEFAULT_CQP, rw_params));
+
+  g_object_class_install_property (object_class, PROP_SLICE_MODE,
+      g_param_spec_enum ("slice-mode", "Slice Mode",
+          "Slice partiton mode", GST_TYPE_D3D12_ENCODER_SUBREGION_LAYOUT,
+          DEFAULT_SLICE_MODE, rw_params));
+
+  g_object_class_install_property (object_class, PROP_SLICE_PARTITION,
+      g_param_spec_uint ("slice-partition", "Slice partition",
+          "Slice partition threshold interpreted depending on \"slice-mode\". "
+          "If set zero, full frame encoding will be selected without "
+          "partitioning regardless of requested \"slice-mode\"",
+          0, G_MAXUINT, DEFAULT_SLICE_PARTITION, rw_params));
+
+  g_object_class_install_property (object_class, PROP_CC_INSERT,
+      g_param_spec_enum ("cc-insert", "Closed Caption Insert",
+          "Closed Caption insert mode", GST_TYPE_D3D12_ENCODER_SEI_INSERT_MODE,
+          DEFAULT_CC_INSERT, rw_params));
+
+  std::string long_name = "Direct3D12 H.264 " + std::string (cdata->description)
+      + " Encoder";
+  gst_element_class_set_metadata (element_class, long_name.c_str (),
+      "Codec/Encoder/Video/Hardware", "Direct3D12 H.264 Video Encoder",
+      "Seungha Yang <seungha@centricular.com>");
+
+  pad_templ = gst_pad_template_new ("sink",
+      GST_PAD_SINK, GST_PAD_ALWAYS, cdata->sink_caps);
+  gst_element_class_add_pad_template (element_class, pad_templ);
+
+  pad_templ = gst_pad_template_new ("src",
+      GST_PAD_SRC, GST_PAD_ALWAYS, cdata->src_caps);
+  gst_element_class_add_pad_template (element_class, pad_templ);
+
+  encoder_class->start = GST_DEBUG_FUNCPTR (gst_d3d12_h264_enc_start);
+  encoder_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_h264_enc_stop);
+  encoder_class->transform_meta =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h264_enc_transform_meta);
+
+  d3d12enc_class->adapter_luid = cdata->luid;
+  d3d12enc_class->device_id = cdata->device_id;
+  d3d12enc_class->vendor_id = cdata->vendor_id;
+  d3d12enc_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h264_enc_new_sequence);
+  d3d12enc_class->start_frame =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h264_enc_start_frame);
+  d3d12enc_class->end_frame = GST_DEBUG_FUNCPTR (gst_d3d12_h264_enc_end_frame);
+}
+
+static void
+gst_d3d12_h264_enc_init (GstD3D12H264Enc * self)
+{
+  self->priv = new GstD3D12H264EncPrivate ();
+}
+
+static void
+gst_d3d12_h264_enc_finalize (GObject * object)
+{
+  auto self = GST_D3D12_H264_ENC (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_h264_enc_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_H264_ENC (object);
+  auto priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+  switch (prop_id) {
+    case PROP_AUD:
+      priv->aud = g_value_get_boolean (value);
+      break;
+    case PROP_GOP_SIZE:
+    {
+      auto gop_size = g_value_get_uint (value);
+      if (gop_size != priv->gop_size) {
+        priv->gop_size = gop_size;
+        priv->gop_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_REF_FRAMES:
+    {
+      auto ref_frames = g_value_get_uint (value);
+      if (ref_frames != priv->ref_frames) {
+        priv->ref_frames = ref_frames;
+        priv->gop_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_FRAME_ANALYSIS:
+    {
+      auto frame_analysis = g_value_get_boolean (value);
+      if (frame_analysis != priv->frame_analysis) {
+        priv->frame_analysis = frame_analysis;
+        priv->rc_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_RATE_CONTROL:
+    {
+      auto mode = (D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE)
+          g_value_get_enum (value);
+      if (mode != priv->rc_mode) {
+        priv->rc_mode = mode;
+        priv->rc_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_BITRATE:
+    {
+      auto bitrate = g_value_get_uint (value);
+      if (bitrate == 0)
+        bitrate = DEFAULT_BITRATE;
+
+      if (bitrate != priv->bitrate) {
+        priv->bitrate = bitrate;
+        if (priv->selected_rc_mode != D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP)
+          priv->rc_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_MAX_BITRATE:
+    {
+      auto max_bitrate = g_value_get_uint (value);
+      if (max_bitrate == 0)
+        max_bitrate = DEFAULT_MAX_BITRATE;
+
+      if (max_bitrate != priv->max_bitrate) {
+        priv->max_bitrate = max_bitrate;
+        switch (priv->selected_rc_mode) {
+          case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR:
+          case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR:
+            priv->rc_updated = TRUE;
+            break;
+          default:
+            break;
+        }
+      }
+      break;
+    }
+    case PROP_QVBR_QUALITY:
+    {
+      auto qvbr_quality = g_value_get_uint (value);
+      if (qvbr_quality != priv->qvbr_quality) {
+        priv->qvbr_quality = qvbr_quality;
+        if (priv->selected_rc_mode ==
+            D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR) {
+          priv->rc_updated = TRUE;
+        }
+      }
+      break;
+    }
+    case PROP_QP_INIT:
+    {
+      auto qp_init = g_value_get_uint (value);
+      if (qp_init != priv->qp_init) {
+        priv->qp_init = qp_init;
+        switch (priv->selected_rc_mode) {
+          case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR:
+          case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR:
+          case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR:
+            priv->rc_updated = TRUE;
+            break;
+          default:
+            break;
+        }
+      }
+      break;
+    }
+    case PROP_QP_MIN:
+    {
+      auto qp_min = g_value_get_uint (value);
+      if (qp_min != priv->qp_min) {
+        priv->qp_min = qp_min;
+        switch (priv->selected_rc_mode) {
+          case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR:
+          case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR:
+          case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR:
+            priv->rc_updated = TRUE;
+            break;
+          default:
+            break;
+        }
+      }
+      break;
+    }
+    case PROP_QP_MAX:
+    {
+      auto qp_max = g_value_get_uint (value);
+      if (qp_max != priv->qp_max) {
+        priv->qp_max = qp_max;
+        switch (priv->selected_rc_mode) {
+          case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR:
+          case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR:
+          case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR:
+            priv->rc_updated = TRUE;
+            break;
+          default:
+            break;
+        }
+      }
+      break;
+    }
+    case PROP_QP_I:
+    {
+      auto qp_i = g_value_get_uint (value);
+      if (qp_i != priv->qp_i) {
+        priv->qp_i = qp_i;
+        if (priv->selected_rc_mode == D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP)
+          priv->rc_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_QP_P:
+    {
+      auto qp_p = g_value_get_uint (value);
+      if (qp_p != priv->qp_p) {
+        priv->qp_p = qp_p;
+        if (priv->selected_rc_mode == D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP)
+          priv->rc_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_QP_B:
+    {
+      auto qp_b = g_value_get_uint (value);
+      if (qp_b != priv->qp_b) {
+        priv->qp_b = qp_b;
+        if (priv->selected_rc_mode == D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP)
+          priv->rc_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_SLICE_MODE:
+    {
+      auto slice_mode = (D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE)
+          g_value_get_enum (value);
+      if (slice_mode != priv->slice_mode) {
+        priv->slice_mode = slice_mode;
+        if (priv->selected_slice_mode != slice_mode)
+          priv->slice_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_SLICE_PARTITION:
+    {
+      auto slice_partition = g_value_get_uint (value);
+      if (slice_partition != priv->slice_partition) {
+        priv->slice_partition = slice_partition;
+        if (priv->selected_slice_mode !=
+            D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_FULL_FRAME) {
+          priv->slice_updated = TRUE;
+        }
+      }
+      break;
+    }
+    case PROP_CC_INSERT:
+      priv->cc_insert = (GstD3D12EncoderSeiInsertMode) g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_h264_enc_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_H264_ENC (object);
+  auto priv = self->priv;
+  auto klass = GST_D3D12_H264_ENC_GET_CLASS (self);
+  const auto cdata = klass->cdata;
+
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+  switch (prop_id) {
+    case PROP_RATE_CONTROL_SUPPORT:
+      g_value_set_flags (value, cdata->rc_support);
+      break;
+    case PROP_SLICE_MODE_SUPPORT:
+      g_value_set_flags (value, cdata->slice_mode_support);
+      break;
+    case PROP_AUD:
+      g_value_set_boolean (value, priv->aud);
+      break;
+    case PROP_GOP_SIZE:
+      g_value_set_uint (value, priv->gop_size);
+      break;
+    case PROP_REF_FRAMES:
+      g_value_set_uint (value, priv->ref_frames);
+      break;
+    case PROP_FRAME_ANALYSIS:
+      g_value_set_boolean (value, priv->frame_analysis);
+      break;
+    case PROP_RATE_CONTROL:
+      g_value_set_enum (value, priv->rc_mode);
+      break;
+    case PROP_BITRATE:
+      g_value_set_uint (value, priv->bitrate);
+      break;
+    case PROP_MAX_BITRATE:
+      g_value_set_uint (value, priv->max_bitrate);
+      break;
+    case PROP_QVBR_QUALITY:
+      g_value_set_uint (value, priv->qvbr_quality);
+      break;
+    case PROP_QP_INIT:
+      g_value_set_uint (value, priv->qp_init);
+      break;
+    case PROP_QP_MIN:
+      g_value_set_uint (value, priv->qp_min);
+      break;
+    case PROP_QP_MAX:
+      g_value_set_uint (value, priv->qp_max);
+      break;
+    case PROP_QP_I:
+      g_value_set_uint (value, priv->qp_i);
+      break;
+    case PROP_QP_P:
+      g_value_set_uint (value, priv->qp_p);
+      break;
+    case PROP_QP_B:
+      g_value_set_uint (value, priv->qp_p);
+      break;
+    case PROP_SLICE_MODE:
+      g_value_set_enum (value, priv->slice_mode);
+      break;
+    case PROP_SLICE_PARTITION:
+      g_value_set_uint (value, priv->slice_partition);
+      break;
+    case PROP_CC_INSERT:
+      g_value_set_enum (value, priv->cc_insert);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static gboolean
+gst_d3d12_h264_enc_start (GstVideoEncoder * encoder)
+{
+  auto self = GST_D3D12_H264_ENC (encoder);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Start");
+
+  priv->display_order = 0;
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->start (encoder);
+}
+
+static gboolean
+gst_d3d12_h264_enc_stop (GstVideoEncoder * encoder)
+{
+  auto self = GST_D3D12_H264_ENC (encoder);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  priv->dpb = nullptr;
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->stop (encoder);
+}
+
+static gboolean
+gst_d3d12_h264_enc_transform_meta (GstVideoEncoder * encoder,
+    GstVideoCodecFrame * frame, GstMeta * meta)
+{
+  auto self = GST_D3D12_H264_ENC (encoder);
+  auto priv = self->priv;
+
+  if (meta->info->api == GST_VIDEO_CAPTION_META_API_TYPE) {
+    std::lock_guard < std::mutex > lk (priv->prop_lock);
+    if (priv->cc_insert == GST_D3D12_ENCODER_SEI_INSERT_AND_DROP) {
+      auto cc_meta = (GstVideoCaptionMeta *) meta;
+      if (cc_meta->caption_type == GST_VIDEO_CAPTION_TYPE_CEA708_RAW)
+        return FALSE;
+    }
+  }
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->transform_meta (encoder,
+      frame, meta);
+}
+
+static gboolean
+gst_d3d12_h264_enc_build_sps (GstD3D12H264Enc * self, const GstVideoInfo * info,
+    const D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC * resolution,
+    guint num_ref)
+{
+  auto priv = self->priv;
+  guint8 sps_buf4096 = { 0, };
+  /* *INDENT-OFF* */
+  static const std::unordered_map<D3D12_VIDEO_ENCODER_LEVELS_H264, guint8>
+      level_map = {
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_1, GST_H264_LEVEL_L1},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_1b, GST_H264_LEVEL_L1B},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_11, GST_H264_LEVEL_L1_1},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_12, GST_H264_LEVEL_L1_2},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_13, GST_H264_LEVEL_L1_3},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_2, GST_H264_LEVEL_L2},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_21, GST_H264_LEVEL_L2_1},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_22, GST_H264_LEVEL_L2_2},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_3, GST_H264_LEVEL_L3},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_31, GST_H264_LEVEL_L3_1},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_32, GST_H264_LEVEL_L3_2},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_4, GST_H264_LEVEL_L4},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_41, GST_H264_LEVEL_L4_1},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_42, GST_H264_LEVEL_L4_2},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_5, GST_H264_LEVEL_L5},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_51, GST_H264_LEVEL_L5_1},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_52, GST_H264_LEVEL_L5_2},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_6, GST_H264_LEVEL_L6},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_61, GST_H264_LEVEL_L6_1},
+    {D3D12_VIDEO_ENCODER_LEVELS_H264_62, GST_H264_LEVEL_L6_2},
+  };
+  static const std::array<std::pair<gint, gint>, 17> par_map {{
+    {0, 0},
+    {1, 1},
+    {12, 11},
+    {10, 11},
+    {16, 11},
+    {40, 33},
+    {24, 11},
+    {20, 11},
+    {32, 11},
+    {80, 33},
+    {18, 11},
+    {15, 11},
+    {64, 33},
+    {160, 99},
+    {4, 3},
+    {3, 2},
+    {2, 1}
+  }};
+  /* *INDENT-ON* */
+
+  priv->sps.Clear ();
+  auto & sps = priv->sps.sps;
+  sps.id = 0;
+  sps.profile_idc = priv->selected_profile;
+  switch (sps.profile_idc) {
+    case GST_H264_PROFILE_BASELINE:
+      sps.constraint_set0_flag = 1;
+      sps.constraint_set1_flag = 1;
+      break;
+    case GST_H264_PROFILE_MAIN:
+      sps.constraint_set1_flag = 1;
+      break;
+    default:
+      break;
+  }
+
+  if (priv->level_h264 == D3D12_VIDEO_ENCODER_LEVELS_H264_1b)
+    sps.constraint_set3_flag = 1;
+
+  sps.level_idc = level_map.at (priv->level_h264);
+  /* d3d12 supports only 4:2:0 encoding */
+  sps.chroma_format_idc = 1;
+  sps.separate_colour_plane_flag = 0;
+  /* add high-10 profile support */
+  sps.bit_depth_luma_minus8 = 0;
+  sps.bit_depth_chroma_minus8 = 0;
+  sps.qpprime_y_zero_transform_bypass_flag = 0;
+  sps.scaling_matrix_present_flag = 0;
+  sps.log2_max_frame_num_minus4 =
+      priv->gop_struct_h264.log2_max_frame_num_minus4;
+  sps.pic_order_cnt_type = priv->gop_struct_h264.pic_order_cnt_type;
+  sps.log2_max_pic_order_cnt_lsb_minus4 =
+      priv->gop_struct_h264.log2_max_pic_order_cnt_lsb_minus4;
+  sps.num_ref_frames = num_ref;
+  sps.gaps_in_frame_num_value_allowed_flag = 0;
+  sps.pic_width_in_mbs_minus1 = (resolution->Width / 16) - 1;
+  sps.pic_height_in_map_units_minus1 = (resolution->Height / 16) - 1;
+  sps.frame_mbs_only_flag = 1;
+
+  if (sps.profile_idc != GST_H264_PROFILE_BASELINE)
+    sps.direct_8x8_inference_flag = 1;
+
+  if (resolution->Width != (UINT) info->width ||
+      resolution->Height != (UINT) info->height) {
+    sps.frame_cropping_flag = 1;
+    sps.frame_crop_left_offset = 0;
+    sps.frame_crop_right_offset = (resolution->Width - info->width) / 2;
+    sps.frame_crop_top_offset = 0;
+    sps.frame_crop_bottom_offset = (resolution->Height - info->height) / 2;
+  }
+
+  sps.vui_parameters_present_flag = 1;
+  auto & vui = sps.vui_parameters;
+  const auto colorimetry = &info->colorimetry;
+
+  if (info->par_n > 0 && info->par_d > 0) {
+    const auto it = std::find_if (par_map.begin (),
+        par_map.end (),&(const auto & par) {
+          return par.first == info->par_n && par.second == info->par_d;
+        }
+    );
+
+    if (it != par_map.end ()) {
+      vui.aspect_ratio_info_present_flag = 1;
+      vui.aspect_ratio_idc = (guint8) std::distance (par_map.begin (), it);
+    } else if (info->par_n <= G_MAXUINT16 && info->par_d <= G_MAXUINT16) {
+      vui.aspect_ratio_info_present_flag = 1;
+      vui.aspect_ratio_idc = 0xff;
+      vui.sar_width = info->par_n;
+      vui.sar_height = info->par_d;
+    }
+  }
+
+  vui.video_signal_type_present_flag = 1;
+  /* Unspecified */
+  vui.video_format = 5;
+  vui.video_full_range_flag =
+      colorimetry->range == GST_VIDEO_COLOR_RANGE_0_255 ? 1 : 0;
+  vui.colour_description_present_flag = 1;
+  vui.colour_primaries =
+      gst_video_color_primaries_to_iso (colorimetry->primaries);
+  vui.transfer_characteristics =
+      gst_video_transfer_function_to_iso (colorimetry->transfer);
+  vui.matrix_coefficients = gst_video_color_matrix_to_iso (colorimetry->matrix);
+  if (info->fps_n > 0 && info->fps_d > 0) {
+    vui.timing_info_present_flag = 1;
+    vui.num_units_in_tick = info->fps_d;
+    vui.time_scale = 2 * (guint) info->fps_n;
+  }
+
+  /* TODO: pic_struct_present_flag = 1 for picture timeing SEI */
+
+  guint nal_size = G_N_ELEMENTS (sps_buf);
+  GstH264BitWriterResult write_ret =
+      gst_h264_bit_writer_sps (&sps, TRUE, sps_buf, &nal_size);
+  if (write_ret != GST_H264_BIT_WRITER_OK) {
+    GST_ERROR_OBJECT (self, "Couldn't build SPS");
+    return FALSE;
+  }
+
+  priv->sps.bytes.resize (G_N_ELEMENTS (sps_buf));
+  guint written_size = priv->sps.bytes.size ();
+  write_ret = gst_h264_bit_writer_convert_to_nal (4, FALSE, TRUE, FALSE,
+      sps_buf, nal_size * 8, priv->sps.bytes.data (), &written_size);
+  if (write_ret != GST_H264_BIT_WRITER_OK) {
+    GST_ERROR_OBJECT (self, "Couldn't build SPS bytes");
+    return FALSE;
+  }
+  priv->sps.bytes.resize (written_size);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_h264_enc_build_pps (GstD3D12H264Enc * self, guint num_ref)
+{
+  auto priv = self->priv;
+
+  /* Driver does not seem to use num_ref_idx_active_override_flag.
+   * Needs multiple PPS to signal ref pics */
+  /* TODO: make more PPS for L1 ref pics */
+  guint num_pps = MAX (1, num_ref);
+  priv->pps.resize (num_pps);
+  for (size_t i = 0; i < priv->pps.size (); i++) {
+    guint8 pps_buf1024 = { 0, };
+    auto & d3d12_pps = priv->ppsi;
+    d3d12_pps.Clear ();
+
+    auto & pps = d3d12_pps.pps;
+
+    pps.id = i;
+    pps.sequence = &priv->sps.sps;
+    if ((priv->config_h264.ConfigurationFlags &
+            D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_ENABLE_CABAC_ENCODING)
+        != 0) {
+      pps.entropy_coding_mode_flag = 1;
+    } else {
+      pps.entropy_coding_mode_flag = 0;
+    }
+
+    pps.pic_order_present_flag = 0;
+    pps.num_slice_groups_minus1 = 0;
+    pps.num_ref_idx_l0_active_minus1 = i;
+    pps.num_ref_idx_l1_active_minus1 = 0;
+    pps.weighted_pred_flag = 0;
+    pps.weighted_bipred_idc = 0;
+    pps.pic_init_qp_minus26 = 0;
+    pps.pic_init_qs_minus26 = 0;
+    pps.chroma_qp_index_offset = 0;
+    pps.deblocking_filter_control_present_flag = 1;
+    if ((priv->config_h264.ConfigurationFlags &
+            D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_USE_CONSTRAINED_INTRAPREDICTION)
+        != 0) {
+      pps.constrained_intra_pred_flag = 1;
+    } else {
+      pps.constrained_intra_pred_flag = 0;
+    }
+    pps.redundant_pic_cnt_present_flag = 0;
+    if ((priv->config_h264.ConfigurationFlags &
+            D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_USE_ADAPTIVE_8x8_TRANSFORM)
+        != 0) {
+      /* double check. This is not allowed for baseline and main profiles */
+      pps.transform_8x8_mode_flag = 1;
+    } else {
+      pps.transform_8x8_mode_flag = 0;
+    }
+
+    pps.pic_scaling_matrix_present_flag = 0;
+    pps.second_chroma_qp_index_offset = 0;
+
+    guint nal_size = G_N_ELEMENTS (pps_buf);
+    d3d12_pps.bytes.resize (nal_size);
+    GstH264BitWriterResult write_ret =
+        gst_h264_bit_writer_pps (&pps, TRUE, pps_buf, &nal_size);
+    if (write_ret != GST_H264_BIT_WRITER_OK) {
+      GST_ERROR_OBJECT (self, "Couldn't build PPS");
+      return FALSE;
+    }
+
+    guint written_size = d3d12_pps.bytes.size ();
+    write_ret = gst_h264_bit_writer_convert_to_nal (4, FALSE, TRUE, FALSE,
+        pps_buf, nal_size * 8, d3d12_pps.bytes.data (), &written_size);
+    if (write_ret != GST_H264_BIT_WRITER_OK) {
+      GST_ERROR_OBJECT (self, "Couldn't build PPS bytes");
+      return FALSE;
+    }
+
+    d3d12_pps.bytes.resize (written_size);
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_h264_enc_get_max_ref_frames (GstD3D12H264Enc * self)
+{
+  auto priv = self->priv;
+  const auto & pic_ctrl_support = priv->pic_ctrl_support;
+
+  guint max_ref_frames = MIN (pic_ctrl_support.MaxL0ReferencesForP,
+      pic_ctrl_support.MaxDPBCapacity);
+  guint ref_frames = priv->ref_frames;
+
+  if (max_ref_frames == 0) {
+    GST_INFO_OBJECT (self,
+        "Hardware does not support inter prediction, forcing all-intra");
+    ref_frames = 0;
+  } else if (priv->gop_size == 1) {
+    GST_INFO_OBJECT (self, "User requested all-intra coding");
+    ref_frames = 0;
+  } else {
+    /* TODO: at least 2 ref frames if B frame is enabled */
+    if (ref_frames != 0)
+      ref_frames = MIN (ref_frames, max_ref_frames);
+    else
+      ref_frames = 1;
+  }
+
+  return ref_frames;
+}
+
+static gboolean
+gst_d3d12_h264_enc_update_gop (GstD3D12H264Enc * self,
+    ID3D12VideoDevice * video_device, GstD3D12EncoderConfig * config,
+    D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAGS * seq_flags)
+{
+  auto priv = self->priv;
+
+  if (seq_flags && !priv->gop_updated)
+    return TRUE;
+
+  auto ref_frames = gst_d3d12_h264_enc_get_max_ref_frames (self);
+  auto gop_size = priv->gop_size;
+  if (ref_frames == 0)
+    gop_size = 1;
+
+  priv->last_pps_id = 0;
+
+  auto prev_gop_struct = priv->gop.GetGopStruct ();
+  auto prev_ref_frames = priv->selected_ref_frames;
+
+  priv->selected_ref_frames = ref_frames;
+  priv->gop.Init (gop_size);
+  priv->gop_struct_h264 = priv->gop.GetGopStruct ();
+
+  if (seq_flags) {
+    if (prev_ref_frames != ref_frames ||
+        memcmp (&prev_gop_struct, &priv->gop_struct_h264,
+            sizeof (priv->gop_struct_h264)) != 0) {
+      GST_DEBUG_OBJECT (self, "Gop struct updated");
+      *seq_flags |=
+          D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_GOP_SEQUENCE_CHANGE;
+    }
+  }
+
+  GST_DEBUG_OBJECT (self,
+      "Configured GOP struct, GOPLength: %u, PPicturePeriod: %u, "
+      "pic_order_cnt_type: %d, log2_max_frame_num_minus4: %d, "
+      "log2_max_pic_order_cnt_lsb_minus4: %d", priv->gop_struct_h264.GOPLength,
+      priv->gop_struct_h264.PPicturePeriod,
+      priv->gop_struct_h264.pic_order_cnt_type,
+      priv->gop_struct_h264.log2_max_frame_num_minus4,
+      priv->gop_struct_h264.log2_max_pic_order_cnt_lsb_minus4);
+
+  priv->gop_updated = FALSE;
+
+  return TRUE;
+}
+
+/* called with prop_lock taken */
+static gboolean
+gst_d3d12_h264_enc_update_rate_control (GstD3D12H264Enc * self,
+    ID3D12VideoDevice * video_device, GstD3D12EncoderConfig * config,
+    D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAGS * seq_flags)
+{
+  auto priv = self->priv;
+  const D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE rc_modes = {
+    D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR,
+    D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR,
+    D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR,
+    D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP,
+  };
+
+  if (seq_flags && !priv->rc_updated)
+    return TRUE;
+
+  GstD3D12EncoderConfig prev_config = *config;
+
+  config->rate_control.Flags = D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAG_NONE;
+  UINT64 bitrate = priv->bitrate;
+  if (bitrate == 0)
+    bitrate = DEFAULT_BITRATE;
+
+  UINT64 max_bitrate = priv->max_bitrate;
+  if (max_bitrate < bitrate) {
+    if (bitrate >= G_MAXUINT64 / 2)
+      max_bitrate = bitrate;
+    else
+      max_bitrate = bitrate * 2;
+  }
+
+  /* Property uses kbps, and API uses bps */
+  bitrate *= 1000;
+  max_bitrate *= 1000;
+
+  /* Fill every rate control struct and select later */
+  config->cqp.ConstantQP_FullIntracodedFrame = priv->qp_i;
+  config->cqp.ConstantQP_InterPredictedFrame_PrevRefOnly = priv->qp_p;
+  config->cqp.ConstantQP_InterPredictedFrame_BiDirectionalRef = priv->qp_b;
+
+  config->cbr.InitialQP = priv->qp_init;
+  config->cbr.MinQP = priv->qp_min;
+  config->cbr.MaxQP = priv->qp_max;
+  config->cbr.TargetBitRate = bitrate;
+
+  config->vbr.InitialQP = priv->qp_init;
+  config->vbr.MinQP = priv->qp_min;
+  config->vbr.MaxQP = priv->qp_max;
+  config->vbr.TargetAvgBitRate = bitrate;
+  config->vbr.PeakBitRate = max_bitrate;
+
+  config->qvbr.InitialQP = priv->qp_init;
+  config->qvbr.MinQP = priv->qp_min;
+  config->qvbr.MaxQP = priv->qp_max;
+  config->qvbr.TargetAvgBitRate = bitrate;
+  config->qvbr.PeakBitRate = max_bitrate;
+  config->qvbr.ConstantQualityTarget = priv->qvbr_quality;
+
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_RATE_CONTROL_MODE feature_data = { };
+  feature_data.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  feature_data.RateControlMode = priv->rc_mode;
+
+  auto hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_RATE_CONTROL_MODE,
+      &feature_data, sizeof (feature_data));
+  if (SUCCEEDED (hr) && feature_data.IsSupported) {
+    priv->selected_rc_mode = priv->rc_mode;
+  } else {
+    GST_INFO_OBJECT (self, "Requested rate control mode is not supported");
+
+    for (guint i = 0; i < G_N_ELEMENTS (rc_modes); i++) {
+      feature_data.RateControlMode = rc_modesi;
+      hr = video_device->CheckFeatureSupport
+          (D3D12_FEATURE_VIDEO_ENCODER_RATE_CONTROL_MODE, &feature_data,
+          sizeof (feature_data));
+      if (SUCCEEDED (hr) && feature_data.IsSupported) {
+        priv->selected_rc_mode = rc_modesi;
+        break;
+      } else {
+        feature_data.IsSupported = FALSE;
+      }
+    }
+
+    if (!feature_data.IsSupported) {
+      GST_ERROR_OBJECT (self, "Couldn't find support rate control mode");
+      return FALSE;
+    }
+  }
+
+  GST_INFO_OBJECT (self, "Requested rate control mode %d, selected %d",
+      priv->rc_mode, priv->selected_rc_mode);
+
+  config->rate_control.Mode = priv->selected_rc_mode;
+  switch (priv->selected_rc_mode) {
+    case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP:
+      config->rate_control.ConfigParams.DataSize = sizeof (config->cqp);
+      config->rate_control.ConfigParams.pConfiguration_CQP = &config->cqp;
+      break;
+    case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR:
+      config->rate_control.ConfigParams.DataSize = sizeof (config->cbr);
+      config->rate_control.ConfigParams.pConfiguration_CBR = &config->cbr;
+      break;
+    case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR:
+      config->rate_control.ConfigParams.DataSize = sizeof (config->vbr);
+      config->rate_control.ConfigParams.pConfiguration_VBR = &config->vbr;
+      break;
+    case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR:
+      config->rate_control.ConfigParams.DataSize = sizeof (config->qvbr);
+      config->rate_control.ConfigParams.pConfiguration_QVBR = &config->qvbr;
+      break;
+    default:
+      g_assert_not_reached ();
+      return FALSE;
+  }
+
+  if (seq_flags) {
+    if (prev_config.rate_control.Mode != config->rate_control.Mode) {
+      GST_DEBUG_OBJECT (self, "Rate control mode changed %d -> %d",
+          prev_config.rate_control.Mode, config->rate_control.Mode);
+      *seq_flags |=
+          D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_RATE_CONTROL_CHANGE;
+    } else {
+      void *prev, *cur;
+      switch (config->rate_control.Mode) {
+        case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP:
+          prev = &prev_config.cqp;
+          cur = &config->cqp;
+          break;
+        case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR:
+          prev = &prev_config.cbr;
+          cur = &config->cbr;
+          break;
+        case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR:
+          prev = &prev_config.vbr;
+          cur = &config->vbr;
+          break;
+        case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR:
+          prev = &prev_config.qvbr;
+          cur = &config->cbr;
+          break;
+        default:
+          g_assert_not_reached ();
+          return FALSE;
+      }
+
+      if (memcmp (prev, cur, config->rate_control.ConfigParams.DataSize) != 0) {
+        GST_DEBUG_OBJECT (self, "Rate control params updated");
+        *seq_flags |=
+            D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_RATE_CONTROL_CHANGE;
+      }
+    }
+  }
+
+  priv->rc_updated = FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_h264_enc_update_slice (GstD3D12H264Enc * self,
+    ID3D12VideoDevice * video_device, GstD3D12EncoderConfig * config,
+    D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAGS * seq_flags,
+    D3D12_VIDEO_ENCODER_SUPPORT_FLAGS * support_flags)
+{
+  auto priv = self->priv;
+
+  if (seq_flags && !priv->slice_updated)
+    return TRUE;
+
+  auto encoder = GST_D3D12_ENCODER (self);
+  auto prev_mode = priv->selected_slice_mode;
+  auto prev_slice = priv->layout_slices;
+
+  priv->selected_slice_mode =
+      D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_FULL_FRAME;
+  priv->layout_slices.NumberOfSlicesPerFrame = 1;
+  config->max_subregions = 1;
+
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT support = { };
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS limits = { };
+  D3D12_VIDEO_ENCODER_PROFILE_H264 suggested_profile = priv->profile_h264;
+  D3D12_VIDEO_ENCODER_LEVELS_H264 suggested_level;
+
+  support.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  support.InputFormat = DXGI_FORMAT_NV12;
+  support.CodecConfiguration = config->codec_config;
+  support.CodecGopSequence = config->gop_struct;
+  support.RateControl = config->rate_control;
+  /* TODO: add intra-refresh support */
+  support.IntraRefresh = D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE_NONE;
+  support.ResolutionsListCount = 1;
+  support.pResolutionList = &config->resolution;
+  support.MaxReferenceFramesInDPB = priv->selected_ref_frames;
+  support.pResolutionDependentSupport = &limits;
+  support.SuggestedProfile.DataSize = sizeof (suggested_profile);
+  support.SuggestedProfile.pH264Profile = &suggested_profile;
+  support.SuggestedLevel.DataSize = sizeof (suggested_level);
+  support.SuggestedLevel.pH264LevelSetting = &suggested_level;
+
+  HRESULT hr;
+  if (priv->slice_mode !=
+      D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_FULL_FRAME
+      && priv->slice_partition > 0) {
+    /* TODO: fallback to other mode if possible */
+    D3D12_FEATURE_DATA_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE
+        feature_layout = { };
+    feature_layout.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+    feature_layout.Profile = config->profile_desc;
+    feature_layout.Level = config->level;
+    feature_layout.SubregionMode = priv->slice_mode;
+    hr = video_device->CheckFeatureSupport
+        (D3D12_FEATURE_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE,
+        &feature_layout, sizeof (feature_layout));
+    if (!gst_d3d12_result (hr, encoder->device) || !feature_layout.IsSupported) {
+      GST_WARNING_OBJECT (self, "Requested slice mode is not supported");
+    } else {
+      support.SubregionFrameEncoding = priv->slice_mode;
+      hr = video_device->CheckFeatureSupport
+          (D3D12_FEATURE_VIDEO_ENCODER_SUPPORT, &support, sizeof (support));
+      if (gst_d3d12_result (hr, encoder->device)
+          && CHECK_SUPPORT_FLAG (support.SupportFlags, GENERAL_SUPPORT_OK)
+          && support.ValidationFlags == D3D12_VIDEO_ENCODER_VALIDATION_FLAG_NONE
+          && limits.MaxSubregionsNumber > 1
+          && limits.SubregionBlockPixelsSize > 0) {
+        switch (priv->slice_mode) {
+          case D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_BYTES_PER_SUBREGION:
+            priv->selected_slice_mode =
+                priv->slice_mode;
+            /* Don't know how many slices would be generated */
+            config->max_subregions = limits.MaxSubregionsNumber;
+            *support_flags = support.SupportFlags;
+            break;
+          case D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_SQUARE_UNITS_PER_SUBREGION_ROW_UNALIGNED:
+          {
+            auto total_mbs =
+                (config->resolution.Width / limits.SubregionBlockPixelsSize) *
+                (config->resolution.Height / limits.SubregionBlockPixelsSize);
+            if (priv->slice_partition >= total_mbs) {
+              GST_DEBUG_OBJECT (self,
+                  "Requested MBs per slice exceeds total MBs per frame");
+            } else {
+              priv->selected_slice_mode = priv->slice_mode;
+
+              auto min_mbs_per_slice = (guint) std::ceil ((float) total_mbs
+                  / limits.MaxSubregionsNumber);
+
+              if (min_mbs_per_slice > priv->slice_partition) {
+                GST_WARNING_OBJECT (self, "Too small number of MBs per slice");
+                priv->layout_slices.NumberOfCodingUnitsPerSlice =
+                    min_mbs_per_slice;
+                config->max_subregions = limits.MaxSubregionsNumber;
+              } else {
+                priv->layout_slices.NumberOfCodingUnitsPerSlice =
+                    priv->slice_partition;
+                config->max_subregions = std::ceil ((float) total_mbs
+                    / priv->slice_partition);
+              }
+
+              *support_flags = support.SupportFlags;
+            }
+            break;
+          }
+          case D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_UNIFORM_PARTITIONING_ROWS_PER_SUBREGION:
+          {
+            auto total_rows = config->resolution.Height /
+                limits.SubregionBlockPixelsSize;
+            if (priv->slice_partition >= total_rows) {
+              GST_DEBUG_OBJECT (self,
+                  "Requested rows per slice exceeds total rows per frame");
+            } else {
+              priv->selected_slice_mode = priv->slice_mode;
+
+              auto min_rows_per_slice = (guint) std::ceil ((float) total_rows
+                  / limits.MaxSubregionsNumber);
+
+              if (min_rows_per_slice > priv->slice_partition) {
+                GST_WARNING_OBJECT (self, "Too small number of rows per slice");
+                priv->layout_slices.NumberOfRowsPerSlice = min_rows_per_slice;
+                config->max_subregions = limits.MaxSubregionsNumber;
+              } else {
+                priv->layout_slices.NumberOfRowsPerSlice =
+                    priv->slice_partition;
+                config->max_subregions = (guint) std::ceil ((float) total_rows
+                    / priv->slice_partition);
+              }
+
+              *support_flags = support.SupportFlags;
+            }
+            break;
+          }
+          case D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_UNIFORM_PARTITIONING_SUBREGIONS_PER_FRAME:
+          {
+            if (priv->slice_partition > 1) {
+              priv->selected_slice_mode = priv->slice_mode;
+
+              if (priv->slice_partition > limits.MaxSubregionsNumber) {
+                GST_WARNING_OBJECT (self, "Too many slices per frame");
+                priv->layout_slices.NumberOfSlicesPerFrame =
+                    limits.MaxSubregionsNumber;
+                config->max_subregions = limits.MaxSubregionsNumber;
+              } else {
+                priv->layout_slices.NumberOfSlicesPerFrame =
+                    priv->slice_partition;
+                config->max_subregions = priv->slice_partition;
+              }
+
+              *support_flags = support.SupportFlags;
+            }
+            break;
+          }
+          default:
+            break;
+        }
+      }
+    }
+  }
+
+  if (seq_flags && (prev_mode != priv->selected_slice_mode ||
+          prev_slice.NumberOfSlicesPerFrame !=
+          priv->layout_slices.NumberOfSlicesPerFrame)) {
+    GST_DEBUG_OBJECT (self, "Slice mode updated");
+    *seq_flags |=
+        D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_SUBREGION_LAYOUT_CHANGE;
+  }
+
+  priv->slice_updated = FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_h264_enc_reconfigure (GstD3D12H264Enc * self,
+    ID3D12VideoDevice * video_device, GstD3D12EncoderConfig * config,
+    D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAGS * seq_flags)
+{
+  auto encoder = GST_D3D12_ENCODER (self);
+  auto priv = self->priv;
+  auto prev_config = *config;
+
+  if (!gst_d3d12_h264_enc_update_gop (self, video_device, config, seq_flags))
+    return FALSE;
+
+  if (!gst_d3d12_h264_enc_update_rate_control (self,
+          video_device, config, seq_flags)) {
+    return FALSE;
+  }
+
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT support = { };
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS limits = { };
+  D3D12_VIDEO_ENCODER_PROFILE_H264 suggested_profile = priv->profile_h264;
+
+  support.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  support.InputFormat = DXGI_FORMAT_NV12;
+  support.CodecConfiguration = config->codec_config;
+  support.CodecGopSequence = config->gop_struct;
+  support.RateControl = config->rate_control;
+  /* TODO: add intra-refresh support */
+  support.IntraRefresh = D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE_NONE;
+  support.SubregionFrameEncoding = priv->selected_slice_mode;
+  support.ResolutionsListCount = 1;
+  support.pResolutionList = &config->resolution;
+  support.MaxReferenceFramesInDPB = priv->selected_ref_frames;
+  support.pResolutionDependentSupport = &limits;
+  support.SuggestedProfile.DataSize = sizeof (suggested_profile);
+  support.SuggestedProfile.pH264Profile = &suggested_profile;
+  support.SuggestedLevel = config->level;
+
+  auto hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_SUPPORT, &support, sizeof (support));
+
+  /* This is our minimum/simplest configuration
+   * TODO: negotiate again depending on validation flags */
+  if (!gst_d3d12_result (hr, encoder->device) ||
+      !CHECK_SUPPORT_FLAG (support.SupportFlags, GENERAL_SUPPORT_OK) ||
+      (support.ValidationFlags != D3D12_VIDEO_ENCODER_VALIDATION_FLAG_NONE)) {
+    GST_ERROR_OBJECT (self, "Couldn't query encoder support");
+    return FALSE;
+  }
+
+  /* Update rate control flags based on support flags */
+  if (priv->frame_analysis) {
+    if (CHECK_SUPPORT_FLAG (support.SupportFlags,
+            RATE_CONTROL_FRAME_ANALYSIS_AVAILABLE)) {
+      GST_INFO_OBJECT (self, "Frame analysis is enabled as requested");
+      config->rate_control.Flags |=
+          D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAG_ENABLE_FRAME_ANALYSIS;
+    } else {
+      GST_INFO_OBJECT (self, "Frame analysis is not supported");
+    }
+  }
+
+  if (priv->qp_init > 0) {
+    switch (priv->selected_rc_mode) {
+      case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR:
+      case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR:
+      case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR:
+        if (CHECK_SUPPORT_FLAG (support.SupportFlags,
+                RATE_CONTROL_INITIAL_QP_AVAILABLE)) {
+          GST_INFO_OBJECT (self, "Initial QP %d is enabled as requested",
+              priv->qp_init);
+          config->rate_control.Flags |=
+              D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAG_ENABLE_INITIAL_QP;
+        } else {
+          GST_INFO_OBJECT (self, "Initial QP is not supported");
+        }
+        break;
+      default:
+        break;
+    }
+  }
+
+  if (priv->qp_max >= priv->qp_min && priv->qp_min > 0) {
+    switch (priv->selected_rc_mode) {
+      case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR:
+      case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR:
+      case D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR:
+        if (CHECK_SUPPORT_FLAG (support.SupportFlags,
+                RATE_CONTROL_ADJUSTABLE_QP_RANGE_AVAILABLE)) {
+          GST_INFO_OBJECT (self, "QP range %d, %d is enabled as requested",
+              priv->qp_min, priv->qp_max);
+          config->rate_control.Flags |=
+              D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAG_ENABLE_QP_RANGE;
+        } else {
+          GST_INFO_OBJECT (self, "QP range is not supported");
+        }
+        break;
+      default:
+        break;
+    }
+  }
+
+  if (seq_flags) {
+    if (prev_config.rate_control.Flags != config->rate_control.Flags) {
+      GST_DEBUG_OBJECT (self, "Rate control flag updated");
+      *seq_flags |=
+          D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_RATE_CONTROL_CHANGE;
+    }
+  }
+
+  if (!gst_d3d12_h264_enc_update_slice (self, video_device, config,
+          seq_flags, &support.SupportFlags)) {
+    return FALSE;
+  }
+
+  config->support_flags = support.SupportFlags;
+
+  if (!seq_flags ||
+      (*seq_flags &
+          D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_GOP_SEQUENCE_CHANGE) != 0) {
+    priv->gop.ForceKeyUnit ();
+    gst_d3d12_h264_enc_build_sps (self, &priv->info, &config->resolution,
+        priv->selected_ref_frames);
+    gst_d3d12_h264_enc_build_pps (self, priv->selected_ref_frames);
+
+    bool array_of_textures = !CHECK_SUPPORT_FLAG (config->support_flags,
+        RECONSTRUCTED_FRAMES_REQUIRE_TEXTURE_ARRAYS);
+    auto dpb = std::make_unique < GstD3D12H264EncDpb > (encoder->device,
+        config->resolution.Width, config->resolution.Height,
+        priv->selected_ref_frames,
+        array_of_textures);
+    if (!dpb->IsValid ()) {
+      GST_ERROR_OBJECT (self, "Couldn't create dpb");
+      return FALSE;
+    }
+
+    GST_DEBUG_OBJECT (self, "New DPB configured");
+
+    priv->dpb = nullptr;
+    priv->dpb = std::move (dpb);
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_h264_enc_new_sequence (GstD3D12Encoder * encoder,
+    ID3D12VideoDevice * video_device, GstVideoCodecState * state,
+    GstD3D12EncoderConfig * config)
+{
+  auto self = GST_D3D12_H264_ENC (encoder);
+  auto priv = self->priv;
+  auto info = &state->info;
+
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+
+  priv->dpb = nullptr;
+  priv->info = state->info;
+
+  config->profile_desc.DataSize = sizeof (D3D12_VIDEO_ENCODER_PROFILE_H264);
+  config->profile_desc.pH264Profile = &priv->profile_h264;
+
+  config->codec_config.DataSize =
+      sizeof (D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264);
+  config->codec_config.pH264Config = &priv->config_h264;
+
+  config->level.DataSize = sizeof (D3D12_VIDEO_ENCODER_LEVELS_H264);
+  config->level.pH264LevelSetting = &priv->level_h264;
+
+  config->layout.DataSize =
+      sizeof
+      (D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICES);
+  config->layout.pSlicesPartition_H264 = &priv->layout_slices;
+
+  config->gop_struct.DataSize =
+      sizeof (D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264);
+  config->gop_struct.pH264GroupOfPictures = &priv->gop_struct_h264;
+
+  config->resolution.Width = GST_ROUND_UP_16 (info->width);
+  config->resolution.Height = GST_ROUND_UP_16 (info->height);
+
+  priv->selected_profile = GST_H264_PROFILE_MAIN;
+  priv->profile_h264 = D3D12_VIDEO_ENCODER_PROFILE_H264_MAIN;
+
+  auto allowed_caps =
+      gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (encoder));
+  if (allowed_caps && !gst_caps_is_any (allowed_caps)) {
+    allowed_caps = gst_caps_fixate (gst_caps_make_writable (allowed_caps));
+    auto s = gst_caps_get_structure (allowed_caps, 0);
+    auto profile_str = gst_structure_get_string (s, "profile");
+    if (g_strcmp0 (profile_str, "high") == 0) {
+      priv->selected_profile = GST_H264_PROFILE_HIGH;
+      priv->profile_h264 = D3D12_VIDEO_ENCODER_PROFILE_H264_HIGH;
+    } else if (g_strcmp0 (profile_str, "constrained-baseline") == 0) {
+      priv->selected_profile = GST_H264_PROFILE_BASELINE;
+      priv->profile_h264 = D3D12_VIDEO_ENCODER_PROFILE_H264_MAIN;
+    } else {
+      priv->selected_profile = GST_H264_PROFILE_MAIN;
+      priv->profile_h264 = D3D12_VIDEO_ENCODER_PROFILE_H264_MAIN;
+    }
+  }
+
+  gst_clear_caps (&allowed_caps);
+
+  const gchar *profile_str = nullptr;
+  switch (priv->selected_profile) {
+    case GST_H264_PROFILE_BASELINE:
+      profile_str = "constrained-baseline";
+      break;
+    case GST_H264_PROFILE_MAIN:
+      profile_str = "main";
+      break;
+    case GST_H264_PROFILE_HIGH:
+      profile_str = "high";
+      break;
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  auto caps = gst_caps_new_simple ("video/x-h264",
+      "alignment", G_TYPE_STRING, "au", "profile", G_TYPE_STRING, profile_str,
+      "stream-format", G_TYPE_STRING, "byte-stream", nullptr);
+  auto output_state =
+      gst_video_encoder_set_output_state (GST_VIDEO_ENCODER (self), caps,
+      state);
+  gst_video_codec_state_unref (output_state);
+
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT
+      feature_pic_ctrl = { };
+  feature_pic_ctrl.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  feature_pic_ctrl.Profile.DataSize = sizeof (priv->profile_h264);
+  feature_pic_ctrl.Profile.pH264Profile = &priv->profile_h264;
+  feature_pic_ctrl.PictureSupport.DataSize = sizeof (priv->pic_ctrl_support);
+  feature_pic_ctrl.PictureSupport.pH264Support = &priv->pic_ctrl_support;
+  auto hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT,
+      &feature_pic_ctrl, sizeof (feature_pic_ctrl));
+  if (!gst_d3d12_result (hr, encoder->device) || !feature_pic_ctrl.IsSupported) {
+    GST_ERROR_OBJECT (self, "Couldn't query picture control support");
+    return FALSE;
+  }
+
+  if (info->fps_n > 0 && info->fps_d > 0) {
+    config->rate_control.TargetFrameRate.Numerator = info->fps_n;
+    config->rate_control.TargetFrameRate.Denominator = info->fps_d;
+  } else {
+    config->rate_control.TargetFrameRate.Numerator = 30;
+    config->rate_control.TargetFrameRate.Denominator = 1;
+  }
+
+  priv->config_h264.ConfigurationFlags =
+      D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_NONE;
+  priv->config_h264.DirectModeConfig =
+      D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_DIRECT_MODES_DISABLED;
+  priv->config_h264.DisableDeblockingFilterConfig =
+      D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_0_ALL_LUMA_CHROMA_SLICE_BLOCK_EDGES_ALWAYS_FILTERED;
+
+  if (priv->selected_profile != GST_H264_PROFILE_BASELINE) {
+    priv->config_h264.ConfigurationFlags |=
+        D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAG_ENABLE_CABAC_ENCODING;
+  }
+
+  return gst_d3d12_h264_enc_reconfigure (self, video_device, config, nullptr);
+}
+
+static gboolean
+gst_d3d12_h264_enc_foreach_caption_meta (GstBuffer * buffer, GstMeta ** meta,
+    GArray * cc_sei)
+{
+  if ((*meta)->info->api != GST_VIDEO_CAPTION_META_API_TYPE)
+    return TRUE;
+
+  auto cc_meta = (GstVideoCaptionMeta *) (*meta);
+  if (cc_meta->caption_type != GST_VIDEO_CAPTION_TYPE_CEA708_RAW)
+    return TRUE;
+
+  GstH264SEIMessage sei = { };
+  sei.payloadType = GST_H264_SEI_REGISTERED_USER_DATA;
+  auto rud = &sei.payload.registered_user_data;
+
+  rud->country_code = 181;
+  rud->size = cc_meta->size + 10;
+
+  auto data = (guint8 *) g_malloc (rud->size);
+  data0 = 0;                  /* 16-bits itu_t_t35_provider_code */
+  data1 = 49;
+  data2 = 'G';                /* 32-bits ATSC_user_identifier */
+  data3 = 'A';
+  data4 = '9';
+  data5 = '4';
+  data6 = 3;                  /* 8-bits ATSC1_data_user_data_type_code */
+  /* 8-bits:
+   * 1 bit process_em_data_flag (0)
+   * 1 bit process_cc_data_flag (1)
+   * 1 bit additional_data_flag (0)
+   * 5-bits cc_count
+   */
+  data7 = ((cc_meta->size / 3) & 0x1f) | 0x40;
+  data8 = 255;                /* 8 bits em_data, unused */
+  memcpy (data + 9, cc_meta->data, cc_meta->size);
+  datacc_meta->size + 9 = 255;        /* 8 marker bits */
+
+  rud->data = data;
+
+  g_array_append_val (cc_sei, sei);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_h264_enc_start_frame (GstD3D12Encoder * encoder,
+    ID3D12VideoDevice * video_device, GstVideoCodecFrame * frame,
+    D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESC * seq_ctrl,
+    D3D12_VIDEO_ENCODER_PICTURE_CONTROL_DESC * picture_ctrl,
+    D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE * recon_pic,
+    GstD3D12EncoderConfig * config, gboolean * need_new_session)
+{
+  auto self = GST_D3D12_H264_ENC (encoder);
+  auto priv = self->priv;
+  static guint8 aud_data = {
+    0x00, 0x00, 0x00, 0x01, 0x09, 0xf0
+  };
+
+  *need_new_session = FALSE;
+
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+  seq_ctrl->Flags = D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_NONE;
+
+  /* Reset GOP struct on force-keyunit */
+  if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame)) {
+    GST_DEBUG_OBJECT (self, "Force keyframe requested");
+    priv->gop.ForceKeyUnit ();
+  }
+
+  auto prev_level = priv->level_h264;
+  if (!gst_d3d12_h264_enc_reconfigure (self, video_device, config,
+          &seq_ctrl->Flags)) {
+    GST_ERROR_OBJECT (self, "Reconfigure failed");
+    return FALSE;
+  }
+
+  if (seq_ctrl->Flags != D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_NONE) {
+    *need_new_session =
+        gst_d3d12_encoder_check_needs_new_session (config->support_flags,
+        seq_ctrl->Flags);
+  }
+
+  if (priv->level_h264 != prev_level)
+    *need_new_session = TRUE;
+
+  if (*need_new_session) {
+    seq_ctrl->Flags = D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAG_NONE;
+
+    GST_DEBUG_OBJECT (self, "Needs new session, forcing IDR");
+    priv->gop.ForceKeyUnit ();
+  }
+
+  priv->gop.FillPicCtrl (priv->pic_control_h264);
+
+  if (priv->pic_control_h264.FrameType ==
+      D3D12_VIDEO_ENCODER_FRAME_TYPE_H264_IDR_FRAME) {
+    GST_LOG_OBJECT (self, "Sync point at frame %" G_GUINT64_FORMAT,
+        priv->display_order);
+    GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
+  }
+
+  seq_ctrl->IntraRefreshConfig.Mode =
+      D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE_NONE;
+  seq_ctrl->IntraRefreshConfig.IntraRefreshDuration = 0;
+  seq_ctrl->RateControl = config->rate_control;
+  seq_ctrl->PictureTargetResolution = config->resolution;
+  seq_ctrl->SelectedLayoutMode = priv->selected_slice_mode;
+  seq_ctrl->FrameSubregionsLayoutData = config->layout;
+  seq_ctrl->CodecGopSequence = config->gop_struct;
+
+  picture_ctrl->IntraRefreshFrameIndex = 0;
+  /* TODO: b frame can be non-reference picture */
+  picture_ctrl->Flags = priv->selected_ref_frames > 0 ?
+      D3D12_VIDEO_ENCODER_PICTURE_CONTROL_FLAG_USED_AS_REFERENCE_PICTURE :
+      D3D12_VIDEO_ENCODER_PICTURE_CONTROL_FLAG_NONE;
+  picture_ctrl->PictureControlCodecData.DataSize =
+      sizeof (priv->pic_control_h264);
+  picture_ctrl->PictureControlCodecData.pH264PicData = &priv->pic_control_h264;
+
+  if (!priv->dpb->StartFrame (picture_ctrl->Flags ==
+          D3D12_VIDEO_ENCODER_PICTURE_CONTROL_FLAG_USED_AS_REFERENCE_PICTURE,
+          &priv->pic_control_h264, recon_pic, &picture_ctrl->ReferenceFrames,
+          priv->display_order)) {
+    GST_ERROR_OBJECT (self, "Start frame failed");
+    return FALSE;
+  }
+
+  priv->display_order++;
+
+  priv->pic_control_h264.Flags =
+      D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_FLAG_NONE;
+  /* FIXME: count L1 too */
+  priv->pic_control_h264.pic_parameter_set_id =
+      priv->pic_control_h264.List0ReferenceFramesCount > 1 ?
+      priv->pic_control_h264.List0ReferenceFramesCount - 1 : 0;
+  priv->pic_control_h264.adaptive_ref_pic_marking_mode_flag = 0;
+  priv->pic_control_h264.RefPicMarkingOperationsCommandsCount = 0;
+  priv->pic_control_h264.pRefPicMarkingOperationsCommands = nullptr;
+  priv->pic_control_h264.List0RefPicModificationsCount = 0;
+  priv->pic_control_h264.pList0RefPicModifications = nullptr;
+  priv->pic_control_h264.List1RefPicModificationsCount = 0;
+  priv->pic_control_h264.pList1RefPicModifications = nullptr;
+  priv->pic_control_h264.QPMapValuesCount = 0;
+  priv->pic_control_h264.pRateControlQPMap = nullptr;
+
+  if (priv->pic_control_h264.FrameType ==
+      D3D12_VIDEO_ENCODER_FRAME_TYPE_H264_IDR_FRAME) {
+    auto buf_size = priv->sps.bytes.size () + priv->pps0.bytes.size ();
+    if (priv->aud)
+      buf_size += sizeof (aud_data);
+
+    auto output_buf = gst_buffer_new_and_alloc (buf_size);
+    GstMapInfo map_info;
+    gst_buffer_map (output_buf, &map_info, GST_MAP_WRITE);
+    auto data = (guint8 *) map_info.data;
+
+    if (priv->aud) {
+      memcpy (data, aud_data, sizeof (aud_data));
+      data += sizeof (aud_data);
+    }
+
+    memcpy (data, priv->sps.bytes.data (), priv->sps.bytes.size ());
+    data += priv->sps.bytes.size ();
+
+    memcpy (data, priv->pps0.bytes.data (), priv->pps0.bytes.size ());
+    gst_buffer_unmap (output_buf, &map_info);
+    frame->output_buffer = output_buf;
+
+    priv->last_pps_id = 0;
+  } else if (priv->pic_control_h264.pic_parameter_set_id != priv->last_pps_id) {
+    const auto & cur_pps =
+        priv->ppspriv->pic_control_h264.pic_parameter_set_id;
+    auto buf_size = cur_pps.bytes.size ();
+
+    if (priv->aud)
+      buf_size += sizeof (aud_data);
+
+    auto output_buf = gst_buffer_new_and_alloc (buf_size);
+    GstMapInfo map_info;
+    gst_buffer_map (output_buf, &map_info, GST_MAP_WRITE);
+    auto data = (guint8 *) map_info.data;
+
+    if (priv->aud) {
+      memcpy (data, aud_data, sizeof (aud_data));
+      data += sizeof (aud_data);
+    }
+
+    memcpy (data, cur_pps.bytes.data (), cur_pps.bytes.size ());
+    gst_buffer_unmap (output_buf, &map_info);
+    frame->output_buffer = output_buf;
+
+    priv->last_pps_id = priv->pic_control_h264.pic_parameter_set_id;
+  } else if (priv->aud) {
+    auto buf_size = sizeof (aud_data);
+    auto output_buf = gst_buffer_new_and_alloc (buf_size);
+    GstMapInfo map_info;
+    gst_buffer_map (output_buf, &map_info, GST_MAP_WRITE);
+    memcpy (map_info.data, aud_data, sizeof (aud_data));
+    gst_buffer_unmap (output_buf, &map_info);
+    frame->output_buffer = output_buf;
+  }
+
+  if (priv->cc_insert != GST_D3D12_ENCODER_SEI_DISABLED) {
+    g_array_set_size (priv->cc_sei, 0);
+    gst_buffer_foreach_meta (frame->input_buffer,
+        (GstBufferForeachMetaFunc) gst_d3d12_h264_enc_foreach_caption_meta,
+        priv->cc_sei);
+    if (priv->cc_sei->len > 0) {
+      auto mem = gst_h264_create_sei_memory (4, priv->cc_sei);
+      if (mem) {
+        GST_TRACE_OBJECT (self, "Inserting CC SEI");
+
+        if (!frame->output_buffer)
+          frame->output_buffer = gst_buffer_new ();
+
+        gst_buffer_append_memory (frame->output_buffer, mem);
+      }
+    }
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_h264_enc_end_frame (GstD3D12Encoder * encoder)
+{
+  auto self = GST_D3D12_H264_ENC (encoder);
+  auto priv = self->priv;
+
+  priv->dpb->EndFrame ();
+
+  return TRUE;
+}
+
+void
+gst_d3d12_h264_enc_register (GstPlugin * plugin, GstD3D12Device * device,
+    ID3D12VideoDevice * video_device, guint rank)
+{
+  HRESULT hr;
+  std::vector < std::string > profiles;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_h264_enc_debug,
+      "d3d12h264enc", 0, "d3d12h264enc");
+
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC feature_codec = { };
+  feature_codec.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  hr = video_device->CheckFeatureSupport (D3D12_FEATURE_VIDEO_ENCODER_CODEC,
+      &feature_codec, sizeof (feature_codec));
+
+  if (FAILED (hr) || !feature_codec.IsSupported) {
+    GST_INFO_OBJECT (device, "Device does not support H.264 encoding");
+    return;
+  }
+
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_PROFILE_LEVEL feature_profile_level = { };
+  D3D12_VIDEO_ENCODER_PROFILE_H264 profile_h264 =
+      D3D12_VIDEO_ENCODER_PROFILE_H264_MAIN;
+  D3D12_VIDEO_ENCODER_LEVELS_H264 level_h264_min;
+  D3D12_VIDEO_ENCODER_LEVELS_H264 level_h264_max;
+
+  feature_profile_level.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  feature_profile_level.Profile.DataSize = sizeof (profile_h264);
+  feature_profile_level.Profile.pH264Profile = &profile_h264;
+  feature_profile_level.MinSupportedLevel.DataSize = sizeof (level_h264_min);
+  feature_profile_level.MinSupportedLevel.pH264LevelSetting = &level_h264_min;
+  feature_profile_level.MaxSupportedLevel.DataSize = sizeof (level_h264_max);
+  feature_profile_level.MaxSupportedLevel.pH264LevelSetting = &level_h264_max;
+
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_INPUT_FORMAT feature_input_format = { };
+  feature_input_format.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  feature_input_format.Profile = feature_profile_level.Profile;
+
+  hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_PROFILE_LEVEL, &feature_profile_level,
+      sizeof (feature_profile_level));
+  if (FAILED (hr) || !feature_profile_level.IsSupported) {
+    GST_WARNING_OBJECT (device, "Main profile is not supported");
+    return;
+  }
+
+  feature_input_format.Format = DXGI_FORMAT_NV12;
+  hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_INPUT_FORMAT, &feature_input_format,
+      sizeof (feature_input_format));
+  if (FAILED (hr) || !feature_input_format.IsSupported) {
+    GST_WARNING_OBJECT (device, "NV12 format is not supported");
+    return;
+  }
+
+  profiles.push_back ("constrained-baseline");
+  profiles.push_back ("main");
+  GST_INFO_OBJECT (device, "Main profile is supported, level %d, %d",
+      level_h264_min, level_h264_max);
+
+  profile_h264 = D3D12_VIDEO_ENCODER_PROFILE_H264_HIGH;
+  hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_PROFILE_LEVEL, &feature_profile_level,
+      sizeof (feature_profile_level));
+  if (SUCCEEDED (hr) && feature_profile_level.IsSupported) {
+    profiles.push_back ("high");
+    GST_INFO_OBJECT (device, "High profile is supported, level %d, %d",
+        level_h264_min, level_h264_max);
+  }
+
+  if (profiles.empty ()) {
+    GST_WARNING_OBJECT (device, "Couldn't find supported profile");
+    return;
+  }
+
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION_RATIOS_COUNT ratios_count
+      = { };
+  ratios_count.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_OUTPUT_RESOLUTION_RATIOS_COUNT,
+      &ratios_count, sizeof (ratios_count));
+  if (FAILED (hr)) {
+    GST_WARNING_OBJECT (device,
+        "Couldn't query output resolution ratios count");
+    return;
+  }
+
+  std::vector < D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_RATIO_DESC > ratios;
+
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION feature_resolution = { };
+  feature_resolution.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  feature_resolution.ResolutionRatiosCount = ratios_count.ResolutionRatiosCount;
+  if (ratios_count.ResolutionRatiosCount > 0) {
+    ratios.resize (ratios_count.ResolutionRatiosCount);
+    feature_resolution.pResolutionRatios = &ratios0;
+  }
+
+  hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_OUTPUT_RESOLUTION, &feature_resolution,
+      sizeof (feature_resolution));
+  if (FAILED (hr) || !feature_resolution.IsSupported) {
+    GST_WARNING_OBJECT (device, "Couldn't query output resolution");
+    return;
+  }
+
+  GST_INFO_OBJECT (device,
+      "Device supported resolution %ux%u - %ux%u, align requirement %u, %u",
+      feature_resolution.MinResolutionSupported.Width,
+      feature_resolution.MinResolutionSupported.Height,
+      feature_resolution.MaxResolutionSupported.Width,
+      feature_resolution.MaxResolutionSupported.Height,
+      feature_resolution.ResolutionWidthMultipleRequirement,
+      feature_resolution.ResolutionHeightMultipleRequirement);
+
+  guint rc_support = 0;
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_RATE_CONTROL_MODE feature_rate_control = { };
+  feature_rate_control.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  feature_rate_control.RateControlMode =
+      D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP;
+
+  hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_RATE_CONTROL_MODE, &feature_rate_control,
+      sizeof (feature_rate_control));
+  if (SUCCEEDED (hr) && feature_rate_control.IsSupported) {
+    GST_INFO_OBJECT (device, "CQP suported");
+    rc_support |= (1 << D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CQP);
+  }
+
+  feature_rate_control.RateControlMode =
+      D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR;
+  hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_RATE_CONTROL_MODE, &feature_rate_control,
+      sizeof (feature_rate_control));
+  if (SUCCEEDED (hr) && feature_rate_control.IsSupported) {
+    GST_INFO_OBJECT (device, "CBR suported");
+    rc_support |= (1 << D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_CBR);
+  }
+
+  feature_rate_control.RateControlMode =
+      D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR;
+  hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_RATE_CONTROL_MODE, &feature_rate_control,
+      sizeof (feature_rate_control));
+  if (SUCCEEDED (hr) && feature_rate_control.IsSupported) {
+    GST_INFO_OBJECT (device, "VBR suported");
+    rc_support |= (1 << D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_VBR);
+  }
+
+  feature_rate_control.RateControlMode =
+      D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR;
+  hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_RATE_CONTROL_MODE, &feature_rate_control,
+      sizeof (feature_rate_control));
+  if (SUCCEEDED (hr) && feature_rate_control.IsSupported) {
+    GST_INFO_OBJECT (device, "VBR suported");
+    rc_support |= (1 << D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE_QVBR);
+  }
+
+  if (!rc_support) {
+    GST_WARNING_OBJECT (device, "Couldn't find supported rate control mode");
+    return;
+  }
+
+  profile_h264 = D3D12_VIDEO_ENCODER_PROFILE_H264_MAIN;
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE
+      feature_layout = { };
+  feature_layout.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  feature_layout.Profile.DataSize = sizeof (profile_h264);
+  feature_layout.Profile.pH264Profile = &profile_h264;
+  feature_layout.Level.DataSize = sizeof (D3D12_VIDEO_ENCODER_LEVELS_H264);
+
+  D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE layout_modes = {
+    D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_FULL_FRAME,
+    D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_BYTES_PER_SUBREGION,
+    D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_SQUARE_UNITS_PER_SUBREGION_ROW_UNALIGNED,
+    D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_UNIFORM_PARTITIONING_ROWS_PER_SUBREGION,
+    D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_UNIFORM_PARTITIONING_SUBREGIONS_PER_FRAME,
+  };
+
+  guint slice_mode_support = 0;
+  for (guint i = 0; i < G_N_ELEMENTS (layout_modes); i++) {
+    feature_layout.SubregionMode = layout_modesi;
+    for (guint level = (guint) level_h264_min; level <= (guint) level_h264_max;
+        level++) {
+      auto level_h264 = (D3D12_VIDEO_ENCODER_LEVELS_H264) level;
+      feature_layout.Level.pH264LevelSetting = &level_h264;
+      hr = video_device->CheckFeatureSupport
+          (D3D12_FEATURE_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE,
+          &feature_layout, sizeof (feature_layout));
+      if (SUCCEEDED (hr) && feature_layout.IsSupported) {
+        slice_mode_support |= (1 << layout_modesi);
+        break;
+      }
+    }
+  }
+
+  if (!slice_mode_support) {
+    GST_WARNING_OBJECT (device, "No supported subregion layout");
+    return;
+  }
+
+  if (slice_mode_support & (1 <<
+          D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE_FULL_FRAME)
+      == 0) {
+    GST_WARNING_OBJECT (device, "Full frame encoding is not supported");
+    return;
+  }
+
+  auto subregions =
+      g_flags_to_string (GST_TYPE_D3D12_ENCODER_SUBREGION_LAYOUT_SUPPORT,
+      slice_mode_support);
+  GST_INFO_OBJECT (device, "Supported subregion modes: \"%s\"", subregions);
+  g_free (subregions);
+
+  D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_H264 picture_ctrl_h264;
+  D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT
+      feature_pic_ctrl = { };
+
+  feature_pic_ctrl.Codec = D3D12_VIDEO_ENCODER_CODEC_H264;
+  feature_pic_ctrl.Profile.DataSize = sizeof (profile_h264);
+  feature_pic_ctrl.Profile.pH264Profile = &profile_h264;
+  feature_pic_ctrl.PictureSupport.DataSize = sizeof (picture_ctrl_h264);
+  feature_pic_ctrl.PictureSupport.pH264Support = &picture_ctrl_h264;
+
+  hr = video_device->CheckFeatureSupport
+      (D3D12_FEATURE_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT,
+      &feature_pic_ctrl, sizeof (feature_pic_ctrl));
+  if (FAILED (hr) || !feature_pic_ctrl.IsSupported) {
+    GST_WARNING_OBJECT (device, "Couldn't query picture control support");
+    return;
+  }
+
+  GST_INFO_OBJECT (device, "MaxL0ReferencesForP: %u, MaxL0ReferencesForB: %u, "
+      "MaxL1ReferencesForB: %u, MaxLongTermReferences: %u, MaxDPBCapacity %u",
+      picture_ctrl_h264.MaxL0ReferencesForP,
+      picture_ctrl_h264.MaxL0ReferencesForB,
+      picture_ctrl_h264.MaxL1ReferencesForB,
+      picture_ctrl_h264.MaxLongTermReferences,
+      picture_ctrl_h264.MaxDPBCapacity);
+
+  std::string resolution_str = "width = (int) " +
+      std::to_string (feature_resolution.MinResolutionSupported.Width) + ", " +
+      std::to_string (feature_resolution.MaxResolutionSupported.Width) +
+      ", height = (int) " +
+      std::to_string (feature_resolution.MinResolutionSupported.Height) + ", " +
+      std::to_string (feature_resolution.MaxResolutionSupported.Height) + " ";
+  std::string sink_caps_str = "video/x-raw, format = (string) NV12, " +
+      resolution_str + ", interlace-mode = (string) progressive";
+
+  std::string src_caps_str = "video/x-h264, " + resolution_str +
+      ", stream-format = (string) byte-stream, alignment = (string) au, ";
+  if (profiles.size () == 1) {
+    src_caps_str += "profile = (string) " + profiles0;
+  } else {
+    src_caps_str += "profile = (string) { ";
+    std::reverse (profiles.begin (), profiles.end ());
+    for (size_t i = 0; i < profiles.size (); i++) {
+      if (i != 0)
+        src_caps_str += ", ";
+      src_caps_str += profilesi;
+    }
+    src_caps_str += " }";
+  }
+
+  auto sysmem_caps = gst_caps_from_string (sink_caps_str.c_str ());
+  auto sink_caps = gst_caps_copy (sysmem_caps);
+  gst_caps_set_features_simple (sink_caps,
+      gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, nullptr));
+  gst_caps_append (sink_caps, sysmem_caps);
+  auto src_caps = gst_caps_from_string (src_caps_str.c_str ());
+
+  GST_MINI_OBJECT_FLAG_SET (sink_caps, GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (src_caps, GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  GstD3D12H264EncClassData *cdata = new GstD3D12H264EncClassData ();
+  g_object_get (device, "adapter-luid", &cdata->luid,
+      "device-id", &cdata->device_id, "vendor-id", &cdata->vendor_id,
+      "description", &cdata->description, nullptr);
+  cdata->sink_caps = sink_caps;
+  cdata->src_caps = src_caps;
+  cdata->rc_support = rc_support;
+  cdata->slice_mode_support = slice_mode_support;
+
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  guint index = 0;
+  GTypeInfo type_info = {
+    sizeof (GstD3D12H264EncClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_d3d12_h264_enc_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstD3D12H264Enc),
+    0,
+    (GInstanceInitFunc) gst_d3d12_h264_enc_init,
+  };
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstD3D12H264Enc");
+  feature_name = g_strdup ("d3d12h264enc");
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstD3D12H264Device%dEnc", index);
+    feature_name = g_strdup_printf ("d3d12h264device%denc", index);
+  }
+
+  type = g_type_register_static (GST_TYPE_D3D12_ENCODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  if (rank > 0 && index != 0)
+    rank--;
+
+  if (index != 0)
+    gst_element_type_set_skip_documentation (type);
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12h264enc.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+void gst_d3d12_h264_enc_register (GstPlugin * plugin,
+                                  GstD3D12Device * device,
+                                  ID3D12VideoDevice * video_device,
+                                  guint rank);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12h265dec.cpp Added

@@ -0,0 +1,367 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02120-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d12h265dec
+ * @title: d3d12h265dec
+ *
+ * A Direct3D12 based H.265 video decoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/h265/file ! parsebin ! d3d12h265dec ! videoconvert ! autovideosink
+ * ```
+ *
+ * Since: 1.24
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstd3d12h265dec.h"
+#include <gst/dxva/gstdxvah265decoder.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_h265_dec_debug);
+#define GST_CAT_DEFAULT gst_d3d12_h265_dec_debug
+
+GST_D3D12_DECODER_DEFINE_TYPE (GstD3D12H265Dec, gst_d3d12_h265_dec,
+    GST, D3D12_H265_DEC, GstDxvaH265Decoder);
+
+static void
+gst_d3d12_h265_dec_class_init (GstD3D12H265DecClass * klass, gpointer data)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstDxvaH265DecoderClass *dxva_class = GST_DXVA_H265_DECODER_CLASS (klass);
+  GstD3D12DecoderClassData *cdata = (GstD3D12DecoderClassData *) data;
+
+  gobject_class->finalize = gst_d3d12_h265_dec_finalize;
+  gobject_class->get_property = gst_d3d12_h265_dec_get_property;
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_set_context);
+
+  parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
+  gst_d3d12_decoder_class_data_fill_subclass_data (cdata, &klass->class_data);
+
+  gst_d3d12_decoder_proxy_class_init (element_class, cdata,
+      "Seungha Yang <seungha@centricualr.com>");
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_open);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_stop);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_close);
+  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_sink_query);
+  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_src_query);
+  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_sink_event);
+  decoder_class->drain = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_drain);
+  decoder_class->finish = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_finish);
+  decoder_class->flush = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_flush);
+
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_new_picture);
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_get_picture_id);
+  dxva_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_start_picture);
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_end_picture);
+  dxva_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_h265_dec_output_picture);
+}
+
+static void
+gst_d3d12_h265_dec_init (GstD3D12H265Dec * self)
+{
+  GstD3D12H265DecClass *klass = GST_D3D12_H265_DEC_GET_CLASS (self);
+  GstD3D12DecoderSubClassData *cdata = &klass->class_data;
+
+  self->decoder = gst_d3d12_decoder_new (GST_DXVA_CODEC_H265,
+      cdata->adapter_luid);
+}
+
+static void
+gst_d3d12_h265_dec_finalize (GObject * object)
+{
+  auto self = GST_D3D12_H265_DEC (object);
+
+  gst_object_unref (self->decoder);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_h265_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstD3D12H265DecClass *klass = GST_D3D12_H265_DEC_GET_CLASS (object);
+  GstD3D12DecoderSubClassData *cdata = &klass->class_data;
+
+  gst_d3d12_decoder_proxy_get_property (object, prop_id, value, pspec, cdata);
+}
+
+static void
+gst_d3d12_h265_dec_set_context (GstElement * element, GstContext * context)
+{
+  auto self = GST_D3D12_H265_DEC (element);
+
+  gst_d3d12_decoder_set_context (self->decoder, element, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_d3d12_h265_dec_open (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  return gst_d3d12_decoder_open (self->decoder, GST_ELEMENT (self));
+}
+
+static gboolean
+gst_d3d12_h265_dec_stop (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  gst_d3d12_decoder_stop (self->decoder);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+}
+
+static gboolean
+gst_d3d12_h265_dec_close (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  return gst_d3d12_decoder_close (self->decoder);
+}
+
+static gboolean
+gst_d3d12_h265_dec_negotiate (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  if (!gst_d3d12_decoder_negotiate (self->decoder, decoder))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_d3d12_h265_dec_decide_allocation (GstVideoDecoder * decoder,
+    GstQuery * query)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  if (!gst_d3d12_decoder_decide_allocation (self->decoder, decoder, query)) {
+    return FALSE;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static gboolean
+gst_d3d12_h265_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_h265_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_h265_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  gst_d3d12_decoder_sink_event (self->decoder, event);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstFlowReturn
+gst_d3d12_h265_dec_drain (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->drain (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_h265_dec_finish (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->finish (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static gboolean
+gst_d3d12_h265_dec_flush (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->flush (decoder);
+  gst_d3d12_decoder_flush (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_h265_dec_configure (GstDxvaH265Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+  auto videodec = GST_VIDEO_DECODER (decoder);
+
+  return gst_d3d12_decoder_configure (self->decoder, videodec, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
+}
+
+static GstFlowReturn
+gst_d3d12_h265_dec_new_picture (GstDxvaH265Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  return gst_d3d12_decoder_new_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture);
+}
+
+static guint8
+gst_d3d12_h265_dec_get_picture_id (GstDxvaH265Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  return gst_d3d12_decoder_get_picture_id (self->decoder, picture);
+}
+
+static GstFlowReturn
+gst_d3d12_h265_dec_start_picture (GstDxvaH265Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  return gst_d3d12_decoder_start_picture (self->decoder, picture, picture_id);
+}
+
+static GstFlowReturn
+gst_d3d12_h265_dec_end_picture (GstDxvaH265Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  return gst_d3d12_decoder_end_picture (self->decoder, picture, ref_pics, args);
+}
+
+static GstFlowReturn
+gst_d3d12_h265_dec_output_picture (GstDxvaH265Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
+{
+  auto self = GST_D3D12_H265_DEC (decoder);
+
+  return gst_d3d12_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
+}
+
+void
+gst_d3d12_h265_dec_register (GstPlugin * plugin, GstD3D12Device * device,
+    ID3D12VideoDevice * video_device, guint rank)
+{
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  guint index = 0;
+  GTypeInfo type_info = {
+    sizeof (GstD3D12H265DecClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_d3d12_h265_dec_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstD3D12H265Dec),
+    0,
+    (GInstanceInitFunc) gst_d3d12_h265_dec_init,
+  };
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_h265_dec_debug, "d3d12h265dec", 0,
+      "d3d12h265dec");
+
+  type_info.class_data =
+      gst_d3d12_decoder_check_feature_support (device, video_device,
+      GST_DXVA_CODEC_H265);
+  if (!type_info.class_data)
+    return;
+
+  type_name = g_strdup ("GstD3D12H265Dec");
+  feature_name = g_strdup ("d3d12h265dec");
+
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstD3D12H265Device%dDec", index);
+    feature_name = g_strdup_printf ("d3d12h265device%ddec", index);
+  }
+
+  type = g_type_register_static (GST_TYPE_DXVA_H265_DECODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  /* make lower rank than default device */
+  if (rank > 0 && index != 0)
+    rank--;
+
+  if (index != 0)
+    gst_element_type_set_skip_documentation (type);
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12h265dec.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstd3d12decoder.h"
+
+G_BEGIN_DECLS
+
+void  gst_d3d12_h265_dec_register (GstPlugin * plugin,
+                                   GstD3D12Device * device,
+                                   ID3D12VideoDevice * video_device,
+                                   guint rank);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12memory-private.h Added

@@ -0,0 +1,42 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+#include "gstd3d12format.h"
+#include "gstd3d12memory.h"
+
+G_BEGIN_DECLS
+
+struct _GstD3D12AllocationParams
+{
+  GstVideoInfo info;
+  GstVideoInfo aligned_info;
+  GstD3D12Format d3d12_format;
+  GstD3D12AllocationFlags flags;
+  D3D12_HEAP_FLAGS heap_flags;
+  D3D12_RESOURCE_FLAGS resource_flags;
+  guint array_size;
+};
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12memory.cpp Added

@@ -0,0 +1,1261 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12.h"
+#include "gstd3d12memory-private.h"
+#include "gstd3d12-private.h"
+#include <directx/d3dx12.h>
+#include <string.h>
+#include <wrl.h>
+#include <mutex>
+#include <condition_variable>
+#include <atomic>
+#include <queue>
+#include <vector>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_allocator_debug);
+#define GST_CAT_DEFAULT gst_d3d12_allocator_debug
+
+static GstD3D12Allocator *_d3d12_memory_allocator = nullptr;
+
+static gint
+gst_d3d12_allocation_params_compare (const GstD3D12AllocationParams * p1,
+    const GstD3D12AllocationParams * p2)
+{
+  g_return_val_if_fail (p1, -1);
+  g_return_val_if_fail (p2, -1);
+
+  if (p1 == p2)
+    return 0;
+
+  return -1;
+}
+
+static void
+gst_d3d12_allocation_params_init (GType type)
+{
+  static GstValueTable table = {
+    0, (GstValueCompareFunc) gst_d3d12_allocation_params_compare,
+    nullptr, nullptr
+  };
+
+  table.type = type;
+  gst_value_register (&table);
+}
+
+G_DEFINE_BOXED_TYPE_WITH_CODE (GstD3D12AllocationParams,
+    gst_d3d12_allocation_params,
+    (GBoxedCopyFunc) gst_d3d12_allocation_params_copy,
+    (GBoxedFreeFunc) gst_d3d12_allocation_params_free,
+    gst_d3d12_allocation_params_init (g_define_type_id));
+
+GstD3D12AllocationParams *
+gst_d3d12_allocation_params_new (GstD3D12Device * device,
+    const GstVideoInfo * info, GstD3D12AllocationFlags flags,
+    D3D12_RESOURCE_FLAGS resource_flags)
+{
+  GstD3D12AllocationParams *ret;
+  GstD3D12Format d3d12_format;
+  GstVideoFormat format;
+
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+  g_return_val_if_fail (info, nullptr);
+
+  format = GST_VIDEO_INFO_FORMAT (info);
+  if (!gst_d3d12_device_get_format (device, format, &d3d12_format)) {
+    GST_WARNING_OBJECT (device, "%s is not supported",
+        gst_video_format_to_string (format));
+    return nullptr;
+  }
+
+  ret = g_new0 (GstD3D12AllocationParams, 1);
+  ret->info = *info;
+  ret->aligned_info = *info;
+  ret->d3d12_format = d3d12_format;
+  ret->array_size = 1;
+  ret->flags = flags;
+  ret->heap_flags = D3D12_HEAP_FLAG_NONE;
+  ret->resource_flags = resource_flags;
+
+  return ret;
+}
+
+GstD3D12AllocationParams *
+gst_d3d12_allocation_params_copy (GstD3D12AllocationParams * src)
+{
+  GstD3D12AllocationParams *dst;
+
+  g_return_val_if_fail (src != NULL, NULL);
+
+  dst = g_new0 (GstD3D12AllocationParams, 1);
+  memcpy (dst, src, sizeof (GstD3D12AllocationParams));
+
+  return dst;
+}
+
+void
+gst_d3d12_allocation_params_free (GstD3D12AllocationParams * params)
+{
+  g_free (params);
+}
+
+gboolean
+gst_d3d12_allocation_params_alignment (GstD3D12AllocationParams * params,
+    const GstVideoAlignment * align)
+{
+  guint padding_width, padding_height;
+  GstVideoInfo *info;
+  GstVideoInfo new_info;
+
+  g_return_val_if_fail (params, FALSE);
+  g_return_val_if_fail (align, FALSE);
+
+  /* d3d11 does not support stride align. Consider padding only */
+  padding_width = align->padding_left + align->padding_right;
+  padding_height = align->padding_top + align->padding_bottom;
+
+  info = &params->info;
+
+  if (!gst_video_info_set_format (&new_info, GST_VIDEO_INFO_FORMAT (info),
+          GST_VIDEO_INFO_WIDTH (info) + padding_width,
+          GST_VIDEO_INFO_HEIGHT (info) + padding_height)) {
+    GST_WARNING ("Set format failed");
+    return FALSE;
+  }
+
+  params->aligned_info = new_info;
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_allocation_params_set_resource_flags (GstD3D12AllocationParams *
+    params, D3D12_RESOURCE_FLAGS resource_flags)
+{
+  g_return_val_if_fail (params, FALSE);
+
+  params->resource_flags |= resource_flags;
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_allocation_params_unset_resource_flags (GstD3D12AllocationParams *
+    params, D3D12_RESOURCE_FLAGS resource_flags)
+{
+  g_return_val_if_fail (params, FALSE);
+
+  params->resource_flags &= ~resource_flags;
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_allocation_params_set_heap_flags (GstD3D12AllocationParams *
+    params, D3D12_HEAP_FLAGS heap_flags)
+{
+  g_return_val_if_fail (params, FALSE);
+
+  params->heap_flags |= heap_flags;
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_allocation_params_set_array_size (GstD3D12AllocationParams * params,
+    guint size)
+{
+  g_return_val_if_fail (params, FALSE);
+  g_return_val_if_fail (size > 0, FALSE);
+  g_return_val_if_fail (size <= G_MAXUINT16, FALSE);
+
+  params->array_size = size;
+
+  return TRUE;
+}
+
+
+/* *INDENT-OFF* */
+struct _GstD3D12MemoryPrivate
+{
+  ~_GstD3D12MemoryPrivate ()
+  {
+    if (event_handle)
+      CloseHandle (event_handle);
+  }
+
+  ComPtr<ID3D12Resource> resource;
+  ComPtr<ID3D12Resource> staging;
+
+  ComPtr<ID3D12DescriptorHeap> srv_heap;
+  ComPtr<ID3D12DescriptorHeap> rtv_heap;
+
+  gpointer staging_ptr = nullptr;
+
+  D3D12_RESOURCE_DESC desc;
+
+  HANDLE event_handle = nullptr;
+
+  /* Queryied via ID3D12Device::GetCopyableFootprints */
+  D3D12_PLACED_SUBRESOURCE_FOOTPRINT layoutGST_VIDEO_MAX_PLANES;
+  guint64 size;
+  guint num_subresources;
+  D3D12_RECT subresource_rectGST_VIDEO_MAX_PLANES;
+  guint subresource_indexGST_VIDEO_MAX_PLANES;
+  DXGI_FORMAT resource_formatsGST_VIDEO_MAX_PLANES;
+  guint srv_inc_size;
+  guint rtv_inc_size;
+  guint64 cpu_map_count = 0;
+
+  std::mutex lock;
+};
+/* *INDENT-ON* */
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstD3D12Memory, gst_d3d12_memory);
+
+static gboolean
+gst_d3d12_memory_ensure_staging_resource (GstD3D12Memory * dmem)
+{
+  auto priv = dmem->priv;
+
+  if (priv->staging)
+    return TRUE;
+
+  if ((priv->desc.Flags & D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS) == 0) {
+    GST_ERROR_OBJECT (dmem->device, "simultaneous access is not supported");
+    return FALSE;
+  }
+
+  HRESULT hr;
+  auto device = gst_d3d12_device_get_device_handle (dmem->device);
+  D3D12_HEAP_PROPERTIES prop =
+      CD3DX12_HEAP_PROPERTIES (D3D12_CPU_PAGE_PROPERTY_WRITE_BACK,
+      D3D12_MEMORY_POOL_L0);
+  D3D12_RESOURCE_DESC desc = CD3DX12_RESOURCE_DESC::Buffer (priv->size);
+  ComPtr < ID3D12Resource > staging;
+  hr = device->CreateCommittedResource (&prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &desc, D3D12_RESOURCE_STATE_COMMON, nullptr, IID_PPV_ARGS (&staging));
+  if (!gst_d3d12_result (hr, dmem->device)) {
+    GST_ERROR_OBJECT (dmem->device, "Couldn't create staging resource");
+    return FALSE;
+  }
+
+  priv->staging = staging;
+
+  GST_MINI_OBJECT_FLAG_SET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_DOWNLOAD);
+
+  return TRUE;
+}
+
+static void
+gst_d3d12_memory_wait_gpu (GstD3D12Memory * dmem,
+    D3D12_COMMAND_LIST_TYPE command_type, guint64 fence_value)
+{
+  auto priv = dmem->priv;
+  auto completed = gst_d3d12_device_get_completed_value (dmem->device,
+      command_type);
+  if (completed < fence_value) {
+    if (!priv->event_handle) {
+      priv->event_handle =
+          CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+    }
+
+    gst_d3d12_device_fence_wait (dmem->device, command_type,
+        fence_value, priv->event_handle);
+  }
+}
+
+static gboolean
+gst_d3d12_memory_download (GstD3D12Memory * dmem)
+{
+  auto priv = dmem->priv;
+
+  if (!priv->staging ||
+      !GST_MEMORY_FLAG_IS_SET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_DOWNLOAD)) {
+    return TRUE;
+  }
+
+  std::vector < GstD3D12CopyTextureRegionArgs > copy_args;
+  for (guint i = 0; i < priv->num_subresources; i++) {
+    GstD3D12CopyTextureRegionArgs args;
+    memset (&args, 0, sizeof (args));
+
+    args.dst = CD3DX12_TEXTURE_COPY_LOCATION (priv->staging.Get (),
+        priv->layouti);
+    args.src = CD3DX12_TEXTURE_COPY_LOCATION (priv->resource.Get (),
+        priv->subresource_indexi);
+
+    copy_args.push_back (args);
+  }
+
+  gst_d3d12_memory_wait_gpu (dmem, D3D12_COMMAND_LIST_TYPE_DIRECT,
+      dmem->fence_value);
+
+  guint64 fence_val = 0;
+  /* Use async copy queue when downloading */
+  if (!gst_d3d12_device_copy_texture_region (dmem->device, copy_args.size (),
+          copy_args.data (), D3D12_COMMAND_LIST_TYPE_COPY, &fence_val)) {
+    GST_ERROR_OBJECT (dmem->device, "Couldn't download texture to staging");
+    return FALSE;
+  }
+
+  gst_d3d12_memory_wait_gpu (dmem, D3D12_COMMAND_LIST_TYPE_COPY, fence_val);
+
+  GST_MEMORY_FLAG_UNSET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_DOWNLOAD);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_memory_upload (GstD3D12Memory * dmem)
+{
+  auto priv = dmem->priv;
+
+  if (!priv->staging ||
+      !GST_MEMORY_FLAG_IS_SET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_UPLOAD)) {
+    return TRUE;
+  }
+
+  std::vector < GstD3D12CopyTextureRegionArgs > copy_args;
+  for (guint i = 0; i < priv->num_subresources; i++) {
+    GstD3D12CopyTextureRegionArgs args;
+    memset (&args, 0, sizeof (args));
+
+    args.dst = CD3DX12_TEXTURE_COPY_LOCATION (priv->resource.Get (),
+        priv->subresource_indexi);
+    args.src = CD3DX12_TEXTURE_COPY_LOCATION (priv->staging.Get (),
+        priv->layouti);
+
+    copy_args.push_back (args);
+  }
+
+  if (!gst_d3d12_device_copy_texture_region (dmem->device, copy_args.size (),
+          copy_args.data (), D3D12_COMMAND_LIST_TYPE_DIRECT,
+          &dmem->fence_value)) {
+    GST_ERROR_OBJECT (dmem->device, "Couldn't upload texture");
+    return FALSE;
+  }
+
+  GST_MEMORY_FLAG_UNSET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_UPLOAD);
+
+  return TRUE;
+}
+
+static gpointer
+gst_d3d12_memory_map_full (GstMemory * mem, GstMapInfo * info, gsize maxsize)
+{
+  auto dmem = GST_D3D12_MEMORY_CAST (mem);
+  auto priv = dmem->priv;
+  GstMapFlags flags = info->flags;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  if ((flags & GST_MAP_D3D12) != 0) {
+    gst_d3d12_memory_upload (dmem);
+
+    if ((flags & GST_MAP_WRITE) != 0)
+      GST_MINI_OBJECT_FLAG_SET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_DOWNLOAD);
+
+    return priv->resource.Get ();
+  }
+
+  if (priv->cpu_map_count == 0) {
+    if (!gst_d3d12_memory_ensure_staging_resource (dmem)) {
+      GST_ERROR_OBJECT (mem->allocator,
+          "Couldn't create readback_staging resource");
+      return nullptr;
+    }
+
+    if (!gst_d3d12_memory_download (dmem)) {
+      GST_ERROR_OBJECT (mem->allocator, "Couldn't download resource");
+      return nullptr;
+    }
+
+    auto hr = priv->staging->Map (0, nullptr, &priv->staging_ptr);
+    if (!gst_d3d12_result (hr, dmem->device)) {
+      GST_ERROR_OBJECT (dmem->device, "Couldn't map readback resource");
+      return nullptr;
+    }
+  }
+
+  if ((flags & GST_MAP_WRITE) != 0)
+    GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D12_MEMORY_TRANSFER_NEED_UPLOAD);
+
+  priv->cpu_map_count++;
+
+  return priv->staging_ptr;
+}
+
+static void
+gst_d3d12_memory_unmap_full (GstMemory * mem, GstMapInfo * info)
+{
+  auto dmem = GST_D3D12_MEMORY_CAST (mem);
+  auto priv = dmem->priv;
+  GstMapFlags flags = info->flags;
+
+  if ((flags & GST_MAP_D3D12) == 0) {
+    std::lock_guard < std::mutex > lk (priv->lock);
+
+    g_assert (priv->cpu_map_count != 0);
+    priv->cpu_map_count--;
+    if (priv->cpu_map_count == 0)
+      priv->staging->Unmap (0, nullptr);
+  }
+}
+
+static GstMemory *
+gst_d3d12_memory_share (GstMemory * mem, gssize offset, gssize size)
+{
+  /* TODO: impl. */
+  return nullptr;
+}
+
+gboolean
+gst_is_d3d12_memory (GstMemory * mem)
+{
+  return mem != nullptr && mem->allocator != nullptr &&
+      (GST_IS_D3D12_ALLOCATOR (mem->allocator) ||
+      GST_IS_D3D12_POOL_ALLOCATOR (mem->allocator));
+}
+
+gboolean
+gst_d3d12_memory_sync (GstD3D12Memory * mem)
+{
+  g_return_val_if_fail (gst_is_d3d12_memory (GST_MEMORY_CAST (mem)), FALSE);
+
+  gst_d3d12_memory_upload (mem);
+  gst_d3d12_memory_wait_gpu (mem,
+      D3D12_COMMAND_LIST_TYPE_DIRECT, mem->fence_value);
+
+  return TRUE;
+}
+
+void
+gst_d3d12_memory_init_once (void)
+{
+  GST_D3D12_CALL_ONCE_BEGIN {
+    _d3d12_memory_allocator =
+        (GstD3D12Allocator *) g_object_new (GST_TYPE_D3D12_ALLOCATOR, nullptr);
+    gst_object_ref_sink (_d3d12_memory_allocator);
+    gst_object_ref (_d3d12_memory_allocator);
+
+    gst_allocator_register (GST_D3D12_MEMORY_NAME,
+        GST_ALLOCATOR_CAST (_d3d12_memory_allocator));
+  } GST_D3D12_CALL_ONCE_END;
+}
+
+ID3D12Resource *
+gst_d3d12_memory_get_resource_handle (GstD3D12Memory * mem)
+{
+  g_return_val_if_fail (gst_is_d3d12_memory (GST_MEMORY_CAST (mem)), FALSE);
+
+  return mem->priv->resource.Get ();
+}
+
+gboolean
+gst_d3d12_memory_get_subresource_index (GstD3D12Memory * mem, guint plane,
+    guint * index)
+{
+  g_return_val_if_fail (gst_is_d3d12_memory (GST_MEMORY_CAST (mem)), FALSE);
+  g_return_val_if_fail (index != nullptr, FALSE);
+
+  if (plane >= mem->priv->num_subresources) {
+    GST_WARNING_OBJECT (GST_MEMORY_CAST (mem)->allocator, "Invalid plane %d",
+        plane);
+    return FALSE;
+  }
+
+  *index = mem->priv->subresource_indexplane;
+
+  return TRUE;
+}
+
+guint
+gst_d3d12_memory_get_plane_count (GstD3D12Memory * mem)
+{
+  g_return_val_if_fail (gst_is_d3d12_memory (GST_MEMORY_CAST (mem)), 0);
+
+  return mem->priv->num_subresources;
+}
+
+gboolean
+gst_d3d12_memory_get_plane_rectangle (GstD3D12Memory * mem, guint plane,
+    D3D12_RECT * rect)
+{
+  g_return_val_if_fail (gst_is_d3d12_memory (GST_MEMORY_CAST (mem)), FALSE);
+  g_return_val_if_fail (rect, FALSE);
+
+  if (plane >= mem->priv->num_subresources)
+    return FALSE;
+
+  *rect = mem->priv->subresource_rectplane;
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_memory_get_shader_resource_view_heap (GstD3D12Memory * mem,
+    ID3D12DescriptorHeap ** heap)
+{
+  auto priv = mem->priv;
+  auto allocator = GST_MEMORY_CAST (mem)->allocator;
+  if ((priv->desc.Flags & D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE) != 0) {
+    GST_LOG_OBJECT (allocator,
+        "Shader resource was denied, configured flags 0x%x",
+        (guint) priv->desc.Flags);
+    return FALSE;
+  }
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if (!priv->srv_heap) {
+    D3D12_DESCRIPTOR_HEAP_DESC desc = { };
+    desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
+    desc.NumDescriptors = priv->num_subresources;
+    desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
+
+    auto device = gst_d3d12_device_get_device_handle (mem->device);
+
+    ComPtr < ID3D12DescriptorHeap > srv_heap;
+    auto hr = device->CreateDescriptorHeap (&desc, IID_PPV_ARGS (&srv_heap));
+    if (!gst_d3d12_result (hr, mem->device)) {
+      GST_ERROR_OBJECT (allocator, "Couldn't create descriptor heap");
+      return FALSE;
+    }
+
+    priv->srv_heap = srv_heap;
+
+    D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc = { };
+    srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+    srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+    srv_desc.Texture2D.MipLevels = 1;
+
+    auto cpu_handle =
+        CD3DX12_CPU_DESCRIPTOR_HANDLE
+        (srv_heap->GetCPUDescriptorHandleForHeapStart ());
+
+    for (guint i = 0; i < priv->num_subresources; i++) {
+      srv_desc.Format = priv->resource_formatsi;
+      srv_desc.Texture2D.PlaneSlice = i;
+      device->CreateShaderResourceView (priv->resource.Get (), &srv_desc,
+          cpu_handle);
+      cpu_handle.Offset (priv->srv_inc_size);
+    }
+  }
+
+  *heap = priv->srv_heap.Get ();
+  (*heap)->AddRef ();
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_memory_get_render_target_view_heap (GstD3D12Memory * mem,
+    ID3D12DescriptorHeap ** heap)
+{
+  auto priv = mem->priv;
+  auto allocator = GST_MEMORY_CAST (mem)->allocator;
+  if ((priv->desc.Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET) == 0) {
+    GST_LOG_OBJECT (allocator,
+        "Render target is not allowed, configured flags 0x%x",
+        (guint) priv->desc.Flags);
+    return FALSE;
+  }
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if (!priv->rtv_heap) {
+    D3D12_DESCRIPTOR_HEAP_DESC desc = { };
+    desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV;
+    desc.NumDescriptors = priv->num_subresources;
+    desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
+
+    auto device = gst_d3d12_device_get_device_handle (mem->device);
+
+    ComPtr < ID3D12DescriptorHeap > rtv_heap;
+    auto hr = device->CreateDescriptorHeap (&desc, IID_PPV_ARGS (&rtv_heap));
+    if (!gst_d3d12_result (hr, mem->device)) {
+      GST_ERROR_OBJECT (allocator, "Couldn't create descriptor heap");
+      return FALSE;
+    }
+
+    priv->rtv_heap = rtv_heap;
+
+    D3D12_RENDER_TARGET_VIEW_DESC rtv_desc = { };
+    rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D;
+    if (priv->desc.SampleDesc.Count > 1)
+      rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMS;
+
+    auto cpu_handle =
+        CD3DX12_CPU_DESCRIPTOR_HANDLE
+        (rtv_heap->GetCPUDescriptorHandleForHeapStart ());
+
+    for (guint i = 0; i < priv->num_subresources; i++) {
+      rtv_desc.Format = priv->resource_formatsi;
+      if (priv->desc.SampleDesc.Count == 1)
+        rtv_desc.Texture2D.PlaneSlice = i;
+      device->CreateRenderTargetView (priv->resource.Get (), &rtv_desc,
+          cpu_handle);
+      cpu_handle.Offset (priv->rtv_inc_size);
+    }
+  }
+
+  *heap = priv->rtv_heap.Get ();
+  (*heap)->AddRef ();
+
+  return TRUE;
+}
+
+/* GstD3D12Allocator */
+#define gst_d3d12_allocator_parent_class alloc_parent_class
+G_DEFINE_TYPE (GstD3D12Allocator, gst_d3d12_allocator, GST_TYPE_ALLOCATOR);
+
+static GstMemory *gst_d3d12_allocator_dummy_alloc (GstAllocator * allocator,
+    gsize size, GstAllocationParams * params);
+static GstMemory *gst_d3d12_allocator_alloc_internal (GstD3D12Allocator * self,
+    GstD3D12Device * device, const D3D12_HEAP_PROPERTIES * heap_props,
+    D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC * desc,
+    D3D12_RESOURCE_STATES initial_state,
+    const D3D12_CLEAR_VALUE * optimized_clear_value);
+static void gst_d3d12_allocator_free (GstAllocator * allocator,
+    GstMemory * mem);
+
+static void
+gst_d3d12_allocator_class_init (GstD3D12AllocatorClass * klass)
+{
+  GstAllocatorClass *allocator_class = GST_ALLOCATOR_CLASS (klass);
+
+  allocator_class->alloc = gst_d3d12_allocator_dummy_alloc;
+  allocator_class->free = gst_d3d12_allocator_free;
+}
+
+static void
+gst_d3d12_allocator_init (GstD3D12Allocator * allocator)
+{
+  GstAllocator *alloc = GST_ALLOCATOR_CAST (allocator);
+
+  alloc->mem_type = GST_D3D12_MEMORY_NAME;
+  alloc->mem_map_full = gst_d3d12_memory_map_full;
+  alloc->mem_unmap_full = gst_d3d12_memory_unmap_full;
+  alloc->mem_share = gst_d3d12_memory_share;
+
+  GST_OBJECT_FLAG_SET (alloc, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC);
+}
+
+static GstMemory *
+gst_d3d12_allocator_dummy_alloc (GstAllocator * allocator, gsize size,
+    GstAllocationParams * params)
+{
+  g_return_val_if_reached (nullptr);
+}
+
+static void
+gst_d3d12_allocator_free (GstAllocator * allocator, GstMemory * mem)
+{
+  auto dmem = GST_D3D12_MEMORY_CAST (mem);
+
+  GST_LOG_OBJECT (allocator, "Free memory %p", mem);
+
+  gst_d3d12_memory_wait_gpu (dmem, D3D12_COMMAND_LIST_TYPE_DIRECT,
+      dmem->fence_value);
+
+  delete dmem->priv;
+
+  gst_clear_object (&dmem->device);
+
+  g_free (dmem);
+}
+
+GstMemory *
+gst_d3d12_allocator_alloc_wrapped (GstD3D12Allocator * allocator,
+    GstD3D12Device * device, ID3D12Resource * resource, guint array_slice)
+{
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+  g_return_val_if_fail (resource, nullptr);
+
+  if (!allocator) {
+    gst_d3d12_memory_init_once ();
+    allocator = _d3d12_memory_allocator;
+  }
+
+  auto device_handle = gst_d3d12_device_get_device_handle (device);
+  auto desc = resource->GetDesc ();
+  guint8 num_subresources =
+      D3D12GetFormatPlaneCount (device_handle, desc.Format);
+
+  if (num_subresources == 0) {
+    GST_ERROR_OBJECT (allocator, "Couldn't get format info");
+    return nullptr;
+  }
+
+  if (array_slice >= desc.DepthOrArraySize) {
+    GST_ERROR_OBJECT (allocator, "Invalid array slice");
+    return nullptr;
+  }
+
+  auto mem = g_new0 (GstD3D12Memory, 1);
+  mem->priv = new GstD3D12MemoryPrivate ();
+
+  auto priv = mem->priv;
+  priv->desc = desc;
+  priv->num_subresources = num_subresources;
+  priv->resource = resource;
+  gst_d3d12_dxgi_format_to_resource_formats (priv->desc.Format,
+      priv->resource_formats);
+  priv->srv_inc_size =
+      device_handle->GetDescriptorHandleIncrementSize
+      (D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
+  priv->rtv_inc_size =
+      device_handle->GetDescriptorHandleIncrementSize
+      (D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
+
+  mem->device = (GstD3D12Device *) gst_object_ref (device);
+
+  for (guint i = 0; i < num_subresources; i++) {
+    /* One notable difference between D3D12/D3D11 is that, D3D12 introduced
+     * *PLANE* slice concept. That means, Each plane of YUV format
+     * (e.g, DXGI_FORMAT_NV12) can be accessible in D3D12 but that wasn't
+     * allowed in D3D11. As a result, the way for calculating subresource index
+     * is changed. This is an example of subresource indexing
+     * for array size == 3 with NV12 format.
+     *
+     *     Array 0       Array 1       Array 2
+     * +-------------+-------------+-------------+
+     * | Y plane : 0 | Y plane : 1 | Y plane : 2 |
+     * +-------------+-------------+-------------+
+     * | UV plane: 3 | UV plane: 4 | UV plane: 5 |
+     * +-------------+-------------+-------------+
+     */
+    mem->priv->subresource_indexi = D3D12CalcSubresource (0,
+        array_slice, i, 1, desc.DepthOrArraySize);
+  }
+
+  /* Then calculate staging memory size and copyable layout */
+  UINT64 size;
+  desc.DepthOrArraySize = 1;
+  device_handle->GetCopyableFootprints (&desc, 0,
+      num_subresources, 0, priv->layout, nullptr, nullptr, &size);
+  priv->size = size;
+
+  priv->subresource_rect0.left = 0;
+  priv->subresource_rect0.top = 0;
+  priv->subresource_rect0.right = (LONG) desc.Width;
+  priv->subresource_rect0.bottom = (LONG) desc.Height;
+
+  for (guint i = 1; i < num_subresources; i++) {
+    priv->subresource_recti.left = 0;
+    priv->subresource_recti.top = 0;
+    switch (desc.Format) {
+      case DXGI_FORMAT_NV12:
+      case DXGI_FORMAT_P010:
+      case DXGI_FORMAT_P016:
+        priv->subresource_recti.right = (LONG) desc.Width / 2;
+        priv->subresource_recti.bottom = (LONG) desc.Height / 2;
+        break;
+      default:
+        GST_WARNING_OBJECT (allocator, "Unexpected multi-plane format %d",
+            desc.Format);
+        priv->subresource_recti.right = (LONG) desc.Width / 2;
+        priv->subresource_recti.bottom = (LONG) desc.Height / 2;
+        break;
+    }
+  }
+
+  gst_memory_init (GST_MEMORY_CAST (mem),
+      (GstMemoryFlags) 0, GST_ALLOCATOR_CAST (allocator), nullptr,
+      mem->priv->size, 0, 0, mem->priv->size);
+
+  GST_LOG_OBJECT (allocator,
+      "Allocated new memory %p with size %" G_GUINT64_FORMAT, mem, priv->size);
+
+  return GST_MEMORY_CAST (mem);
+}
+
+static GstMemory *
+gst_d3d12_allocator_alloc_internal (GstD3D12Allocator * self,
+    GstD3D12Device * device, const D3D12_HEAP_PROPERTIES * heap_props,
+    D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC * desc,
+    D3D12_RESOURCE_STATES initial_state,
+    const D3D12_CLEAR_VALUE * optimized_clear_value)
+{
+  ID3D12Device *device_handle;
+  HRESULT hr;
+  ComPtr < ID3D12Resource > resource;
+
+  device_handle = gst_d3d12_device_get_device_handle (device);
+  hr = device_handle->CreateCommittedResource (heap_props, heap_flags,
+      desc, initial_state, optimized_clear_value, IID_PPV_ARGS (&resource));
+  if (!gst_d3d12_result (hr, device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create texture");
+    return nullptr;
+  }
+
+  auto mem =
+      gst_d3d12_allocator_alloc_wrapped (self, device, resource.Get (), 0);
+  if (!mem)
+    return nullptr;
+
+  /* Initialize YUV texture with black color */
+  if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D &&
+      (desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET) != 0 &&
+      (heap_flags & D3D12_HEAP_FLAG_CREATE_NOT_ZEROED) == 0 &&
+      desc->DepthOrArraySize == 1) {
+    gst_d3d12_device_clear_yuv_texture (device, mem);
+  }
+
+  return mem;
+}
+
+GstMemory *
+gst_d3d12_allocator_alloc (GstD3D12Allocator * allocator,
+    GstD3D12Device * device, const D3D12_HEAP_PROPERTIES * heap_props,
+    D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC * desc,
+    D3D12_RESOURCE_STATES initial_state,
+    const D3D12_CLEAR_VALUE * optimized_clear_value)
+{
+  g_return_val_if_fail (GST_IS_D3D12_ALLOCATOR (allocator), nullptr);
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+  g_return_val_if_fail (heap_props != nullptr, nullptr);
+  g_return_val_if_fail (desc != nullptr, nullptr);
+
+  if (desc->DepthOrArraySize > 1) {
+    GST_ERROR_OBJECT (allocator, "Array is not supported, use pool allocator");
+    return nullptr;
+  }
+
+  return gst_d3d12_allocator_alloc_internal (allocator, device, heap_props,
+      heap_flags, desc, initial_state, optimized_clear_value);
+}
+
+gboolean
+gst_d3d12_allocator_set_active (GstD3D12Allocator * allocator, gboolean active)
+{
+  GstD3D12AllocatorClass *klass;
+
+  g_return_val_if_fail (GST_IS_D3D12_ALLOCATOR (allocator), FALSE);
+
+  klass = GST_D3D12_ALLOCATOR_GET_CLASS (allocator);
+  if (klass->set_actvie)
+    return klass->set_actvie (allocator, active);
+
+  return TRUE;
+}
+
+/* GstD3D12PoolAllocator */
+
+/* *INDENT-OFF* */
+struct _GstD3D12PoolAllocatorPrivate
+{
+  _GstD3D12PoolAllocatorPrivate()
+  {
+    outstanding = 0;
+  }
+
+  /* For the case where DepthOrArraySize > 1 */
+  ComPtr<ID3D12Resource> resource;
+
+  D3D12_HEAP_PROPERTIES heap_props;
+  D3D12_HEAP_FLAGS heap_flags;
+  D3D12_RESOURCE_DESC desc;
+  D3D12_RESOURCE_STATES initial_state;
+  D3D12_CLEAR_VALUE clear_value;
+  gboolean clear_value_is_valid = FALSE;
+
+  std::queue<GstMemory *> queue;
+
+  std::mutex lock;
+  std::condition_variable cond;
+  gboolean started = FALSE;
+  gboolean active = FALSE;
+
+  std::atomic<guint> outstanding;
+  guint cur_mems = 0;
+  gboolean flushing = FALSE;
+};
+/* *INDENT-ON* */
+
+static void gst_d3d12_pool_allocator_finalize (GObject * object);
+
+static gboolean
+gst_d3d12_pool_allocator_set_active (GstD3D12Allocator * allocator,
+    gboolean active);
+
+static gboolean gst_d3d12_pool_allocator_start (GstD3D12PoolAllocator * self);
+static gboolean gst_d3d12_pool_allocator_stop (GstD3D12PoolAllocator * self);
+static gboolean gst_d3d12_memory_release (GstMiniObject * mini_object);
+
+#define gst_d3d12_pool_allocator_parent_class pool_alloc_parent_class
+G_DEFINE_TYPE (GstD3D12PoolAllocator, gst_d3d12_pool_allocator,
+    GST_TYPE_D3D12_ALLOCATOR);
+
+static void
+gst_d3d12_pool_allocator_class_init (GstD3D12PoolAllocatorClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstD3D12AllocatorClass *d3d12alloc_class = GST_D3D12_ALLOCATOR_CLASS (klass);
+
+  gobject_class->finalize = gst_d3d12_pool_allocator_finalize;
+
+  d3d12alloc_class->set_actvie = gst_d3d12_pool_allocator_set_active;
+}
+
+static void
+gst_d3d12_pool_allocator_init (GstD3D12PoolAllocator * self)
+{
+  self->priv = new GstD3D12PoolAllocatorPrivate ();
+}
+
+static void
+gst_d3d12_pool_allocator_finalize (GObject * object)
+{
+  GstD3D12PoolAllocator *self = GST_D3D12_POOL_ALLOCATOR (object);
+
+  GST_DEBUG_OBJECT (self, "Finalize");
+
+  gst_d3d12_pool_allocator_stop (self);
+  delete self->priv;
+
+  g_clear_object (&self->device);
+
+  G_OBJECT_CLASS (pool_alloc_parent_class)->finalize (object);
+}
+
+/* must be called with the lock */
+static gboolean
+gst_d3d12_pool_allocator_start (GstD3D12PoolAllocator * self)
+{
+  GstD3D12PoolAllocatorPrivate *priv = self->priv;
+  ID3D12Device *device_handle;
+  HRESULT hr;
+
+  if (priv->started)
+    return TRUE;
+
+  /* Nothing to do */
+  if (priv->desc.DepthOrArraySize == 1) {
+    priv->started = TRUE;
+    return TRUE;
+  }
+
+  device_handle = gst_d3d12_device_get_device_handle (self->device);
+  if (!priv->resource) {
+    ComPtr < ID3D12Resource > resource;
+    hr = device_handle->CreateCommittedResource (&priv->heap_props,
+        priv->heap_flags, &priv->desc, priv->initial_state,
+        priv->clear_value_is_valid ? &priv->clear_value : nullptr,
+        IID_PPV_ARGS (&resource));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Failed to allocate texture");
+      return FALSE;
+    }
+
+    priv->resource = resource;
+  }
+
+  for (guint i = 0; i < priv->desc.DepthOrArraySize; i++) {
+    GstMemory *mem;
+
+    mem = gst_d3d12_allocator_alloc_wrapped (_d3d12_memory_allocator,
+        self->device, priv->resource.Get (), i);
+
+    priv->cur_mems++;
+    priv->queue.push (mem);
+  }
+
+  priv->started = TRUE;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_pool_allocator_set_active (GstD3D12Allocator * allocator,
+    gboolean active)
+{
+  GstD3D12PoolAllocator *self = GST_D3D12_POOL_ALLOCATOR (allocator);
+  GstD3D12PoolAllocatorPrivate *priv = self->priv;
+
+  GST_LOG_OBJECT (self, "active %d", active);
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  /* just return if we are already in the right state */
+  if (priv->active == active) {
+    GST_LOG_OBJECT (self, "allocator was in the right state");
+    return TRUE;
+  }
+
+  if (active) {
+    if (!gst_d3d12_pool_allocator_start (self)) {
+      GST_ERROR_OBJECT (self, "start failed");
+      return FALSE;
+    }
+
+    priv->active = TRUE;
+    priv->flushing = FALSE;
+  } else {
+    priv->flushing = TRUE;
+    priv->active = FALSE;
+
+    priv->cond.notify_all ();
+
+    /* when all memory objects are in the pool, free them. Else they will be
+     * freed when they are released */
+    GST_LOG_OBJECT (self, "outstanding memories %d, (in queue %u)",
+        priv->outstanding.load (), (guint) priv->queue.size ());
+    if (priv->outstanding == 0) {
+      if (!gst_d3d12_pool_allocator_stop (self)) {
+        GST_ERROR_OBJECT (self, "stop failed");
+        return FALSE;
+      }
+    }
+  }
+
+  return TRUE;
+}
+
+static void
+gst_d3d12_pool_allocator_free_memory (GstD3D12PoolAllocator * self,
+    GstMemory * mem)
+{
+  GstD3D12PoolAllocatorPrivate *priv = self->priv;
+
+  priv->cur_mems--;
+  GST_LOG_OBJECT (self, "freeing memory %p (%u left)", mem, priv->cur_mems);
+
+  GST_MINI_OBJECT_CAST (mem)->dispose = nullptr;
+  gst_memory_unref (mem);
+}
+
+/* must be called with the lock */
+static void
+gst_d3d12_pool_allocator_clear_queue (GstD3D12PoolAllocator * self)
+{
+  GstD3D12PoolAllocatorPrivate *priv = self->priv;
+
+  GST_LOG_OBJECT (self, "Clearing queue");
+
+  while (!priv->queue.empty ()) {
+    GstMemory *mem = priv->queue.front ();
+    priv->queue.pop ();
+    gst_d3d12_pool_allocator_free_memory (self, mem);
+  }
+
+  GST_LOG_OBJECT (self, "Clear done");
+}
+
+/* must be called with the lock */
+static gboolean
+gst_d3d12_pool_allocator_stop (GstD3D12PoolAllocator * self)
+{
+  GstD3D12PoolAllocatorPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  if (priv->started) {
+    gst_d3d12_pool_allocator_clear_queue (self);
+
+    priv->started = FALSE;
+  } else {
+    GST_DEBUG_OBJECT (self, "Wasn't started");
+  }
+
+  return TRUE;
+}
+
+static void
+gst_d3d12_pool_allocator_release_memory (GstD3D12PoolAllocator * self,
+    GstMemory * mem)
+{
+  GstD3D12PoolAllocatorPrivate *priv = self->priv;
+
+  GST_LOG_OBJECT (self, "Released memory %p", mem);
+
+  GST_MINI_OBJECT_CAST (mem)->dispose = nullptr;
+  mem->allocator = (GstAllocator *) gst_object_ref (_d3d12_memory_allocator);
+
+  /* keep it around in our queue */
+  priv->queue.push (mem);
+  priv->outstanding--;
+  if (priv->outstanding == 0 && priv->flushing)
+    gst_d3d12_pool_allocator_stop (self);
+  priv->cond.notify_all ();
+  priv->lock.unlock ();
+
+  gst_object_unref (self);
+}
+
+static gboolean
+gst_d3d12_memory_release (GstMiniObject * mini_object)
+{
+  GstMemory *mem = GST_MEMORY_CAST (mini_object);
+  GstD3D12PoolAllocator *alloc;
+  GstD3D12PoolAllocatorPrivate *priv;
+
+  g_assert (mem->allocator != nullptr);
+
+  if (!GST_IS_D3D12_POOL_ALLOCATOR (mem->allocator)) {
+    GST_LOG_OBJECT (mem->allocator, "Not our memory, free");
+    return TRUE;
+  }
+
+  alloc = GST_D3D12_POOL_ALLOCATOR (mem->allocator);
+  priv = alloc->priv;
+
+  priv->lock.lock ();
+  /* return the memory to the allocator */
+  gst_memory_ref (mem);
+  gst_d3d12_pool_allocator_release_memory (alloc, mem);
+
+  return FALSE;
+}
+
+/* must be called with the lock */
+static GstFlowReturn
+gst_d3d12_pool_allocator_alloc (GstD3D12PoolAllocator * self, GstMemory ** mem)
+{
+  GstD3D12PoolAllocatorPrivate *priv = self->priv;
+  GstMemory *new_mem;
+
+  /* we allcates texture array during start */
+  if (priv->desc.DepthOrArraySize > 1)
+    return GST_FLOW_EOS;
+
+  /* increment the allocation counter */
+  new_mem =
+      gst_d3d12_allocator_alloc_internal (_d3d12_memory_allocator,
+      self->device, &priv->heap_props,
+      priv->heap_flags, &priv->desc, priv->initial_state,
+      priv->clear_value_is_valid ? &priv->clear_value : nullptr);
+
+  if (!new_mem) {
+    GST_ERROR_OBJECT (self, "Failed to allocate new memory");
+    return GST_FLOW_ERROR;
+  }
+
+  priv->cur_mems++;
+
+  *mem = new_mem;
+
+  return GST_FLOW_OK;
+}
+
+/* must be called with the lock */
+static GstFlowReturn
+gst_d3d12_pool_allocator_acquire_memory_internal (GstD3D12PoolAllocator * self,
+    GstMemory ** memory, std::unique_lock < std::mutex > &lk)
+{
+  GstD3D12PoolAllocatorPrivate *priv = self->priv;
+  GstFlowReturn ret = GST_FLOW_ERROR;
+
+  do {
+    if (priv->flushing) {
+      GST_DEBUG_OBJECT (self, "we are flushing");
+      return GST_FLOW_FLUSHING;
+    }
+
+    if (!priv->queue.empty ()) {
+      *memory = priv->queue.front ();
+      priv->queue.pop ();
+      GST_LOG_OBJECT (self, "acquired memory %p", *memory);
+      return GST_FLOW_OK;
+    }
+
+    /* no memory, try to allocate some more */
+    GST_LOG_OBJECT (self, "no memory, trying to allocate");
+    ret = gst_d3d12_pool_allocator_alloc (self, memory);
+    if (ret == GST_FLOW_OK)
+      return ret;
+
+    /* something went wrong, return error */
+    if (ret != GST_FLOW_EOS)
+      break;
+
+    GST_LOG_OBJECT (self, "waiting for free memory or flushing");
+    priv->cond.wait (lk);
+  } while (TRUE);
+
+  return ret;
+}
+
+GstD3D12PoolAllocator *
+gst_d3d12_pool_allocator_new (GstD3D12Device * device,
+    const D3D12_HEAP_PROPERTIES * heap_props, D3D12_HEAP_FLAGS heap_flags,
+    const D3D12_RESOURCE_DESC * desc, D3D12_RESOURCE_STATES initial_state,
+    const D3D12_CLEAR_VALUE * optimized_clear_value)
+{
+  GstD3D12PoolAllocator *self;
+
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+  g_return_val_if_fail (heap_props != nullptr, nullptr);
+  g_return_val_if_fail (desc != nullptr, nullptr);
+
+  gst_d3d12_memory_init_once ();
+
+  self = (GstD3D12PoolAllocator *)
+      g_object_new (GST_TYPE_D3D12_POOL_ALLOCATOR, nullptr);
+  gst_object_ref_sink (self);
+
+  self->device = (GstD3D12Device *) gst_object_ref (device);
+  self->priv->heap_props = *heap_props;
+  self->priv->heap_flags = heap_flags;
+  self->priv->desc = *desc;
+  self->priv->initial_state = initial_state;
+  if (optimized_clear_value) {
+    self->priv->clear_value = *optimized_clear_value;
+    self->priv->clear_value_is_valid = TRUE;
+  } else {
+    self->priv->clear_value_is_valid = FALSE;
+  }
+
+  return self;
+}
+
+GstFlowReturn
+gst_d3d12_pool_allocator_acquire_memory (GstD3D12PoolAllocator * allocator,
+    GstMemory ** memory)
+{
+  GstFlowReturn ret;
+  GstD3D12PoolAllocatorPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_D3D12_POOL_ALLOCATOR (allocator),
+      GST_FLOW_ERROR);
+  g_return_val_if_fail (memory != nullptr, GST_FLOW_ERROR);
+
+  priv = allocator->priv;
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  ret = gst_d3d12_pool_allocator_acquire_memory_internal (allocator,
+      memory, lk);
+
+  if (ret == GST_FLOW_OK) {
+    GstMemory *mem = *memory;
+    /* Replace default allocator with ours */
+    gst_object_unref (mem->allocator);
+    mem->allocator = (GstAllocator *) gst_object_ref (allocator);
+    GST_MINI_OBJECT_CAST (mem)->dispose = gst_d3d12_memory_release;
+    priv->outstanding++;
+  }
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12memory.h Added

@@ -0,0 +1,226 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12_fwd.h"
+#include "gstd3d12format.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_ALLOCATION_PARAMS    (gst_d3d12_allocation_params_get_type())
+
+#define GST_TYPE_D3D12_MEMORY               (gst_d3d12_memory_get_type())
+#define GST_D3D12_MEMORY_CAST(obj)          ((GstD3D12Memory *)obj)
+
+#define GST_TYPE_D3D12_ALLOCATOR            (gst_d3d12_allocator_get_type())
+#define GST_D3D12_ALLOCATOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_D3D12_ALLOCATOR, GstD3D12Allocator))
+#define GST_D3D12_ALLOCATOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_D3D12_ALLOCATOR, GstD3D12AllocatorClass))
+#define GST_IS_D3D12_ALLOCATOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_D3D12_ALLOCATOR))
+#define GST_IS_D3D12_ALLOCATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_D3D12_ALLOCATOR))
+#define GST_D3D12_ALLOCATOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_D3D12_ALLOCATOR, GstD3D12AllocatorClass))
+#define GST_D3D12_ALLOCATOR_CAST(obj)       ((GstD3D12Allocator *)obj)
+
+#define GST_TYPE_D3D12_POOL_ALLOCATOR            (gst_d3d12_pool_allocator_get_type())
+#define GST_D3D12_POOL_ALLOCATOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_D3D12_POOL_ALLOCATOR, GstD3D12PoolAllocator))
+#define GST_D3D12_POOL_ALLOCATOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_D3D12_POOL_ALLOCATOR, GstD3D12PoolAllocatorClass))
+#define GST_IS_D3D12_POOL_ALLOCATOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_D3D12_POOL_ALLOCATOR))
+#define GST_IS_D3D12_POOL_ALLOCATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_D3D12_POOL_ALLOCATOR))
+#define GST_D3D12_POOL_ALLOCATOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_D3D12_POOL_ALLOCATOR, GstD3D12PoolAllocatorClass))
+#define GST_D3D12_POOL_ALLOCATOR_CAST(obj)       ((GstD3D12PoolAllocator *)obj)
+
+/**
+ * GST_D3D12_MEMORY_NAME:
+ *
+ * The name of the Direct3D12 memory
+ */
+#define GST_D3D12_MEMORY_NAME "D3D12Memory"
+
+/**
+ * GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY:
+ *
+ * Name of the caps feature for indicating the use of #GstD3D12Memory
+ */
+#define GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY "memory:D3D12Memory"
+
+/**
+ * GST_MAP_D3D12:
+ *
+ * Flag indicating that we should map the D3D12 resource instead of to system memory.
+ */
+#define GST_MAP_D3D12 (GST_MAP_FLAG_LAST << 1)
+
+/**
+ * GstD3D12MemoryTransfer:
+ *
+ * Pending memory transfer operation
+ */
+typedef enum
+{
+  GST_D3D12_MEMORY_TRANSFER_NEED_DOWNLOAD   = (GST_MEMORY_FLAG_LAST << 0),
+  GST_D3D12_MEMORY_TRANSFER_NEED_UPLOAD     = (GST_MEMORY_FLAG_LAST << 1)
+} GstD3D12MemoryTransfer;
+
+typedef enum
+{
+  GST_D3D12_ALLOCATION_FLAG_DEFAULT = 0,
+} GstD3D12AllocationFlags;
+
+GType                      gst_d3d12_allocation_params_get_type (void);
+
+GstD3D12AllocationParams * gst_d3d12_allocation_params_new      (GstD3D12Device * device,
+                                                                 const GstVideoInfo * info,
+                                                                 GstD3D12AllocationFlags flags,
+                                                                 D3D12_RESOURCE_FLAGS resource_flags);
+
+GstD3D12AllocationParams * gst_d3d12_allocation_params_copy     (GstD3D12AllocationParams * src);
+
+void                       gst_d3d12_allocation_params_free     (GstD3D12AllocationParams * params);
+
+gboolean                   gst_d3d12_allocation_params_alignment (GstD3D12AllocationParams * parms,
+                                                                  const GstVideoAlignment * align);
+
+gboolean                   gst_d3d12_allocation_params_set_resource_flags (GstD3D12AllocationParams * params,
+                                                                           D3D12_RESOURCE_FLAGS resource_flags);
+
+gboolean                   gst_d3d12_allocation_params_unset_resource_flags (GstD3D12AllocationParams * params,
+                                                                             D3D12_RESOURCE_FLAGS resource_flags);
+
+gboolean                   gst_d3d12_allocation_params_set_heap_flags (GstD3D12AllocationParams * params,
+                                                                       D3D12_HEAP_FLAGS heap_flags);
+
+gboolean                   gst_d3d12_allocation_params_set_array_size (GstD3D12AllocationParams * params,
+                                                                       guint size);
+
+struct _GstD3D12Memory
+{
+  GstMemory mem;
+
+  /*< public >*/
+  GstD3D12Device *device;
+  guint64 fence_value;
+
+  /*< private >*/
+  GstD3D12MemoryPrivate *priv;
+  gpointer _gst_reservedGST_PADDING;
+};
+
+GType             gst_d3d12_memory_get_type (void);
+
+void              gst_d3d12_memory_init_once (void);
+
+gboolean          gst_is_d3d12_memory        (GstMemory * mem);
+
+gboolean          gst_d3d12_memory_sync      (GstD3D12Memory * mem);
+
+ID3D12Resource *  gst_d3d12_memory_get_resource_handle (GstD3D12Memory * mem);
+
+gboolean          gst_d3d12_memory_get_subresource_index (GstD3D12Memory * mem,
+                                                          guint plane,
+                                                          guint * index);
+
+guint             gst_d3d12_memory_get_plane_count       (GstD3D12Memory * mem);
+
+gboolean          gst_d3d12_memory_get_plane_rectangle   (GstD3D12Memory * mem,
+                                                          guint plane,
+                                                          D3D12_RECT * rect);
+
+gboolean          gst_d3d12_memory_get_shader_resource_view_heap (GstD3D12Memory * mem,
+                                                                  ID3D12DescriptorHeap ** heap);
+
+gboolean          gst_d3d12_memory_get_render_target_view_heap (GstD3D12Memory * mem,
+                                                                ID3D12DescriptorHeap ** heap);
+
+
+struct _GstD3D12Allocator
+{
+  GstAllocator allocator;
+
+  /*< private >*/
+  GstD3D12AllocatorPrivate *priv;
+
+  gpointer _gst_reservedGST_PADDING;
+};
+
+struct _GstD3D12AllocatorClass
+{
+  GstAllocatorClass allocator_class;
+
+  gboolean (*set_actvie)   (GstD3D12Allocator * allocator,
+                            gboolean active);
+
+  /*< private >*/
+  gpointer _gst_reservedGST_PADDING_LARGE;
+};
+
+GType       gst_d3d12_allocator_get_type  (void);
+
+GstMemory * gst_d3d12_allocator_alloc     (GstD3D12Allocator * allocator,
+                                           GstD3D12Device * device,
+                                           const D3D12_HEAP_PROPERTIES * heap_props,
+                                           D3D12_HEAP_FLAGS heap_flags,
+                                           const D3D12_RESOURCE_DESC * desc,
+                                           D3D12_RESOURCE_STATES initial_state,
+                                           const D3D12_CLEAR_VALUE * optimized_clear_value);
+
+GstMemory * gst_d3d12_allocator_alloc_wrapped (GstD3D12Allocator * allocator,
+                                               GstD3D12Device * device,
+                                               ID3D12Resource * resource,
+                                               guint array_slice);
+
+gboolean    gst_d3d12_allocator_set_active (GstD3D12Allocator * allocator,
+                                            gboolean active);
+
+struct _GstD3D12PoolAllocator
+{
+  GstD3D12Allocator allocator;
+
+  /*< public >*/
+  GstD3D12Device *device;
+
+  /*< private >*/
+  GstD3D12PoolAllocatorPrivate *priv;
+
+  gpointer _gst_reservedGST_PADDING;
+};
+
+struct _GstD3D12PoolAllocatorClass
+{
+  GstD3D12AllocatorClass allocator_class;
+
+  /*< private >*/
+  gpointer _gst_reservedGST_PADDING;
+};
+
+GType                   gst_d3d12_pool_allocator_get_type  (void);
+
+GstD3D12PoolAllocator * gst_d3d12_pool_allocator_new (GstD3D12Device * device,
+                                                      const D3D12_HEAP_PROPERTIES * heap_props,
+                                                      D3D12_HEAP_FLAGS heap_flags,
+                                                      const D3D12_RESOURCE_DESC * desc,
+                                                      D3D12_RESOURCE_STATES initial_state,
+                                                      const D3D12_CLEAR_VALUE * optimized_clear_value);
+
+GstFlowReturn           gst_d3d12_pool_allocator_acquire_memory (GstD3D12PoolAllocator * allocator,
+                                                                 GstMemory ** memory);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12mpeg2dec.cpp Added

@@ -0,0 +1,381 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02120-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d12mpeg2dec
+ * @title: d3d12mpeg2dec
+ *
+ * A Direct3D12 based MPEG-2 video decoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/mpeg2/file ! parsebin ! d3d12mpeg2dec ! videoconvert ! autovideosink
+ * ```
+ *
+ * Since: 1.24
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstd3d12mpeg2dec.h"
+#include <gst/dxva/gstdxvampeg2decoder.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_mpeg2_dec_debug);
+#define GST_CAT_DEFAULT gst_d3d12_mpeg2_dec_debug
+
+GST_D3D12_DECODER_DEFINE_TYPE_FULL (GstD3D12Mpeg2Dec, gst_d3d12_mpeg2_dec,
+    GST, D3D12_MPEG2_DEC, GstDxvaMpeg2Decoder);
+
+static void
+gst_d3d12_mpeg2_dec_class_init (GstD3D12Mpeg2DecClass * klass, gpointer data)
+{
+  auto gobject_class = G_OBJECT_CLASS (klass);
+  auto element_class = GST_ELEMENT_CLASS (klass);
+  auto decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  auto dxva_class = GST_DXVA_MPEG2_DECODER_CLASS (klass);
+  auto cdata = (GstD3D12DecoderClassData *) data;
+
+  gobject_class->finalize = gst_d3d12_mpeg2_dec_finalize;
+  gobject_class->get_property = gst_d3d12_mpeg2_dec_get_property;
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_set_context);
+
+  parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
+  gst_d3d12_decoder_class_data_fill_subclass_data (cdata, &klass->class_data);
+
+  gst_d3d12_decoder_proxy_class_init (element_class, cdata,
+      "Seungha Yang <seungha@centricualr.com>");
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_open);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_stop);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_close);
+  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_decide_allocation);
+  decoder_class->sink_query =
+      GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_sink_query);
+  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_src_query);
+  decoder_class->sink_event =
+      GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_sink_event);
+  decoder_class->drain = GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_drain);
+  decoder_class->finish = GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_finish);
+  decoder_class->flush = GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_flush);
+
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_new_picture);
+  dxva_class->duplicate_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_duplicate_picture);
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_get_picture_id);
+  dxva_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_start_picture);
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_end_picture);
+  dxva_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_mpeg2_dec_output_picture);
+}
+
+static void
+gst_d3d12_mpeg2_dec_init (GstD3D12Mpeg2Dec * self)
+{
+  auto klass = GST_D3D12_MPEG2_DEC_GET_CLASS (self);
+  auto cdata = &klass->class_data;
+
+  self->decoder = gst_d3d12_decoder_new (GST_DXVA_CODEC_MPEG2,
+      cdata->adapter_luid);
+
+  gst_dxva_mpeg2_decoder_disable_postproc (GST_DXVA_MPEG2_DECODER (self));
+}
+
+static void
+gst_d3d12_mpeg2_dec_finalize (GObject * object)
+{
+  auto self = GST_D3D12_MPEG2_DEC (object);
+
+  gst_object_unref (self->decoder);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_mpeg2_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  auto klass = GST_D3D12_MPEG2_DEC_GET_CLASS (object);
+  auto cdata = &klass->class_data;
+
+  gst_d3d12_decoder_proxy_get_property (object, prop_id, value, pspec, cdata);
+}
+
+static void
+gst_d3d12_mpeg2_dec_set_context (GstElement * element, GstContext * context)
+{
+  auto self = GST_D3D12_MPEG2_DEC (element);
+
+  gst_d3d12_decoder_set_context (self->decoder, element, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_d3d12_mpeg2_dec_open (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  return gst_d3d12_decoder_open (self->decoder, GST_ELEMENT (self));
+}
+
+static gboolean
+gst_d3d12_mpeg2_dec_stop (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  gst_d3d12_decoder_stop (self->decoder);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+}
+
+static gboolean
+gst_d3d12_mpeg2_dec_close (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  return gst_d3d12_decoder_close (self->decoder);
+}
+
+static gboolean
+gst_d3d12_mpeg2_dec_negotiate (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  if (!gst_d3d12_decoder_negotiate (self->decoder, decoder))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_d3d12_mpeg2_dec_decide_allocation (GstVideoDecoder * decoder,
+    GstQuery * query)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  if (!gst_d3d12_decoder_decide_allocation (self->decoder, decoder, query))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static gboolean
+gst_d3d12_mpeg2_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_mpeg2_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_mpeg2_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  gst_d3d12_decoder_sink_event (self->decoder, event);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstFlowReturn
+gst_d3d12_mpeg2_dec_drain (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->drain (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_mpeg2_dec_finish (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->finish (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static gboolean
+gst_d3d12_mpeg2_dec_flush (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->flush (decoder);
+  gst_d3d12_decoder_flush (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_mpeg2_dec_configure (GstDxvaMpeg2Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+  auto videodec = GST_VIDEO_DECODER (decoder);
+
+  return gst_d3d12_decoder_configure (self->decoder, videodec, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
+}
+
+static GstFlowReturn
+gst_d3d12_mpeg2_dec_new_picture (GstDxvaMpeg2Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  return gst_d3d12_decoder_new_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture);
+}
+
+static GstFlowReturn
+gst_d3d12_mpeg2_dec_duplicate_picture (GstDxvaMpeg2Decoder * decoder,
+    GstCodecPicture * src, GstCodecPicture * dst)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  return gst_d3d12_decoder_duplicate_picture (self->decoder, src, dst);
+}
+
+static guint8
+gst_d3d12_mpeg2_dec_get_picture_id (GstDxvaMpeg2Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  return gst_d3d12_decoder_get_picture_id (self->decoder, picture);
+}
+
+static GstFlowReturn
+gst_d3d12_mpeg2_dec_start_picture (GstDxvaMpeg2Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  return gst_d3d12_decoder_start_picture (self->decoder, picture, picture_id);
+}
+
+static GstFlowReturn
+gst_d3d12_mpeg2_dec_end_picture (GstDxvaMpeg2Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  return gst_d3d12_decoder_end_picture (self->decoder, picture, ref_pics, args);
+}
+
+static GstFlowReturn
+gst_d3d12_mpeg2_dec_output_picture (GstDxvaMpeg2Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
+{
+  auto self = GST_D3D12_MPEG2_DEC (decoder);
+
+  return gst_d3d12_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
+}
+
+void
+gst_d3d12_mpeg2_dec_register (GstPlugin * plugin, GstD3D12Device * device,
+    ID3D12VideoDevice * video_device, guint rank)
+{
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  guint index = 0;
+  GTypeInfo type_info = {
+    sizeof (GstD3D12Mpeg2DecClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_d3d12_mpeg2_dec_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstD3D12Mpeg2Dec),
+    0,
+    (GInstanceInitFunc) gst_d3d12_mpeg2_dec_init,
+  };
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_mpeg2_dec_debug, "d3d12mpeg2dec", 0,
+      "d3d12mpeg2dec");
+
+  type_info.class_data =
+      gst_d3d12_decoder_check_feature_support (device, video_device,
+      GST_DXVA_CODEC_MPEG2);
+  if (!type_info.class_data)
+    return;
+
+  type_name = g_strdup ("GstD3D12Mpeg2Dec");
+  feature_name = g_strdup ("d3d12mpeg2dec");
+
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstD3D12Mpeg2Device%dDec", index);
+    feature_name = g_strdup_printf ("d3d12mpeg2device%ddec", index);
+  }
+
+  type = g_type_register_static (GST_TYPE_DXVA_MPEG2_DECODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  /* make lower rank than default device */
+  if (rank > 0 && index != 0)
+    rank--;
+
+  if (index != 0)
+    gst_element_type_set_skip_documentation (type);
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12mpeg2dec.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstd3d12decoder.h"
+
+G_BEGIN_DECLS
+
+void  gst_d3d12_mpeg2_dec_register (GstPlugin * plugin,
+                                    GstD3D12Device * device,
+                                    ID3D12VideoDevice * video_device,
+                                    guint rank);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12overlaycompositor.cpp Added

@@ -0,0 +1,828 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02120-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12overlaycompositor.h"
+#include <directx/d3dx12.h>
+#include <wrl.h>
+#include <memory>
+#include <vector>
+#include <algorithm>
+#include "PSMain_sample.h"
+#include "PSMain_sample_premul.h"
+#include "VSMain_coord.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_overlay_compositor_debug);
+#define GST_CAT_DEFAULT gst_d3d12_overlay_compositor_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+struct VertexData
+{
+  struct {
+    FLOAT x;
+    FLOAT y;
+    FLOAT z;
+  } position;
+  struct {
+    FLOAT u;
+    FLOAT v;
+  } texture;
+};
+
+struct GstD3D12OverlayRect : public GstMiniObject
+{
+  ~GstD3D12OverlayRect ()
+  {
+    if (overlay_rect)
+      gst_video_overlay_rectangle_unref (overlay_rect);
+
+    gst_clear_d3d12_descriptor (&srv_heap);
+  }
+
+  GstVideoOverlayRectangle *overlay_rect = nullptr;
+  ComPtr<ID3D12Resource> texture;
+  ComPtr<ID3D12Resource> staging;
+  ComPtr<ID3D12Resource> vertex_buf;
+  GstD3D12Descriptor *srv_heap = nullptr;
+  D3D12_VERTEX_BUFFER_VIEW vbv;
+  D3D12_PLACED_SUBRESOURCE_FOOTPRINT layout;
+  gboolean premul_alpha = FALSE;
+  gboolean need_upload = TRUE;
+};
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstD3D12OverlayRect, gst_d3d12_overlay_rect);
+
+struct GstD3D12OverlayCompositorPrivate
+{
+  GstD3D12OverlayCompositorPrivate ()
+  {
+    sample_desc.Count = 1;
+    sample_desc.Quality = 0;
+  }
+
+  ~GstD3D12OverlayCompositorPrivate ()
+  {
+    if (overlays)
+      g_list_free_full (overlays, (GDestroyNotify) gst_mini_object_unref);
+
+    gst_clear_object (&ca_pool);
+    gst_clear_object (&srv_heap_pool);
+  }
+
+  GstVideoInfo info;
+
+  D3D12_VIEWPORT viewport;
+  D3D12_RECT scissor_rect;
+
+  D3D12_INPUT_ELEMENT_DESC input_desc2;
+  D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc = { };
+  D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_premul_desc = { };
+  DXGI_SAMPLE_DESC sample_desc;
+
+  ComPtr<ID3D12RootSignature> rs;
+  ComPtr<ID3D12PipelineState> pso;
+  ComPtr<ID3D12PipelineState> pso_premul;
+  D3D12_INDEX_BUFFER_VIEW idv;
+  ComPtr<ID3D12Resource> index_buf;
+  ComPtr<ID3D12GraphicsCommandList> cl;
+  GstD3D12CommandAllocatorPool *ca_pool = nullptr;
+  GstD3D12DescriptorPool *srv_heap_pool = nullptr;
+
+  GList *overlays = nullptr;
+
+  std::vector<GstVideoOverlayRectangle *> rects_to_upload;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12OverlayCompositor
+{
+  GstObject parent;
+
+  GstD3D12Device *device;
+
+  GstD3D12OverlayCompositorPrivate *priv;
+};
+
+static void gst_d3d12_overlay_compositor_finalize (GObject * object);
+
+#define gst_d3d12_overlay_compositor_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12OverlayCompositor,
+    gst_d3d12_overlay_compositor, GST_TYPE_OBJECT);
+
+static void
+gst_d3d12_overlay_compositor_class_init (GstD3D12OverlayCompositorClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_overlay_compositor_finalize;
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_overlay_compositor_debug,
+      "d3d12overlaycompositor", 0, "d3d12overlaycompositor");
+}
+
+static void
+gst_d3d12_overlay_compositor_init (GstD3D12OverlayCompositor * self)
+{
+  self->priv = new GstD3D12OverlayCompositorPrivate ();
+}
+
+static void
+gst_d3d12_overlay_compositor_finalize (GObject * object)
+{
+  GstD3D12OverlayCompositor *self = GST_D3D12_OVERLAY_COMPOSITOR (object);
+
+  delete self->priv;
+
+  gst_clear_object (&self->device);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_overlay_rect_free (GstD3D12OverlayRect * rect)
+{
+  if (rect)
+    delete rect;
+}
+
+static GstD3D12OverlayRect *
+gst_d3d12_overlay_rect_new (GstD3D12OverlayCompositor * self,
+    GstVideoOverlayRectangle * overlay_rect)
+{
+  auto priv = self->priv;
+  gint x, y;
+  guint width, height;
+  VertexData vertex_data4;
+  FLOAT x1, y1, x2, y2;
+  gdouble val;
+  GstVideoOverlayFormatFlags flags;
+  gboolean premul_alpha = FALSE;
+
+  if (!gst_video_overlay_rectangle_get_render_rectangle (overlay_rect, &x, &y,
+          &width, &height)) {
+    GST_ERROR_OBJECT (self, "Failed to get render rectangle");
+    return nullptr;
+  }
+
+  flags = gst_video_overlay_rectangle_get_flags (overlay_rect);
+  if ((flags & GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA) != 0) {
+    premul_alpha = TRUE;
+    flags = GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA;
+  } else {
+    flags = GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE;
+  }
+
+  auto buf = gst_video_overlay_rectangle_get_pixels_unscaled_argb (overlay_rect,
+      flags);
+  if (!buf) {
+    GST_ERROR_OBJECT (self, "Failed to get overlay buffer");
+    return nullptr;
+  }
+
+  auto vmeta = gst_buffer_get_video_meta (buf);
+  if (!vmeta) {
+    GST_ERROR_OBJECT (self, "Failed to get video meta");
+    return nullptr;
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  D3D12_HEAP_PROPERTIES heap_prop =
+      CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+  D3D12_RESOURCE_DESC desc =
+      CD3DX12_RESOURCE_DESC::Tex2D (DXGI_FORMAT_B8G8R8A8_UNORM, vmeta->width,
+      vmeta->height, 1, 1);
+
+  ComPtr < ID3D12Resource > texture;
+  auto hr = device->CreateCommittedResource (&heap_prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &desc, D3D12_RESOURCE_STATE_COPY_DEST, nullptr, IID_PPV_ARGS (&texture));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create texture");
+    return nullptr;
+  }
+
+  D3D12_PLACED_SUBRESOURCE_FOOTPRINT layout;
+  UINT64 size;
+  device->GetCopyableFootprints (&desc, 0, 1, 0, &layout, nullptr, nullptr,
+      &size);
+
+  ComPtr < ID3D12Resource > staging;
+  heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+  desc = CD3DX12_RESOURCE_DESC::Buffer (size);
+  hr = device->CreateCommittedResource (&heap_prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &desc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+      IID_PPV_ARGS (&staging));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create upload buffer");
+    return nullptr;
+  }
+
+  guint8 *map_data;
+  hr = staging->Map (0, nullptr, (void **) &map_data);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't map staging");
+    return nullptr;
+  }
+
+  guint8 *data;
+  gint stride;
+  GstMapInfo info;
+  if (!gst_video_meta_map (vmeta,
+          0, &info, (gpointer *) & data, &stride, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (self, "Failed to map");
+    return nullptr;
+  }
+
+  if (layout.Footprint.RowPitch == (UINT) stride) {
+    memcpy (map_data, data, stride * layout.Footprint.Height);
+  } else {
+    guint width_in_bytes = 4 * layout.Footprint.Width;
+    for (UINT i = 0; i < layout.Footprint.Height; i++) {
+      memcpy (map_data, data, width_in_bytes);
+      map_data += layout.Footprint.RowPitch;
+      data += stride;
+    }
+  }
+
+  staging->Unmap (0, nullptr);
+  gst_video_meta_unmap (vmeta, 0, &info);
+
+  /* bottom left */
+  gst_util_fraction_to_double (x, GST_VIDEO_INFO_WIDTH (&priv->info), &val);
+  x1 = (val * 2.0f) - 1.0f;
+
+  gst_util_fraction_to_double (y + height,
+      GST_VIDEO_INFO_HEIGHT (&priv->info), &val);
+  y1 = (val * -2.0f) + 1.0f;
+
+  /* top right */
+  gst_util_fraction_to_double (x + width,
+      GST_VIDEO_INFO_WIDTH (&priv->info), &val);
+  x2 = (val * 2.0f) - 1.0f;
+
+  gst_util_fraction_to_double (y, GST_VIDEO_INFO_HEIGHT (&priv->info), &val);
+  y2 = (val * -2.0f) + 1.0f;
+
+  /* bottom left */
+  vertex_data0.position.x = x1;
+  vertex_data0.position.y = y1;
+  vertex_data0.position.z = 0.0f;
+  vertex_data0.texture.u = 0.0f;
+  vertex_data0.texture.v = 1.0f;
+
+  /* top left */
+  vertex_data1.position.x = x1;
+  vertex_data1.position.y = y2;
+  vertex_data1.position.z = 0.0f;
+  vertex_data1.texture.u = 0.0f;
+  vertex_data1.texture.v = 0.0f;
+
+  /* top right */
+  vertex_data2.position.x = x2;
+  vertex_data2.position.y = y2;
+  vertex_data2.position.z = 0.0f;
+  vertex_data2.texture.u = 1.0f;
+  vertex_data2.texture.v = 0.0f;
+
+  /* bottom right */
+  vertex_data3.position.x = x2;
+  vertex_data3.position.y = y1;
+  vertex_data3.position.z = 0.0f;
+  vertex_data3.texture.u = 1.0f;
+  vertex_data3.texture.v = 1.0f;
+
+  ComPtr < ID3D12Resource > vertex_buf;
+  heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+  desc = CD3DX12_RESOURCE_DESC::Buffer (sizeof (VertexData) * 4);
+  hr = device->CreateCommittedResource (&heap_prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &desc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+      IID_PPV_ARGS (&vertex_buf));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create vertex buffer");
+    return nullptr;
+  }
+
+  hr = vertex_buf->Map (0, nullptr, (void **) &map_data);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't map vertex buffer");
+    return nullptr;
+  }
+
+  memcpy (map_data, vertex_data, sizeof (VertexData) * 4);
+  vertex_buf->Unmap (0, nullptr);
+
+  GstD3D12Descriptor *srv_heap;
+  if (!gst_d3d12_descriptor_pool_acquire (priv->srv_heap_pool, &srv_heap)) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire command allocator");
+    return nullptr;
+  }
+
+  ComPtr < ID3D12DescriptorHeap > srv_heap_handle;
+  gst_d3d12_descriptor_get_handle (srv_heap, &srv_heap_handle);
+  D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc = { };
+  srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
+  srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
+  srv_desc.Texture2D.MipLevels = 1;
+  srv_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
+
+  device->CreateShaderResourceView (texture.Get (), &srv_desc,
+      srv_heap_handle->GetCPUDescriptorHandleForHeapStart ());
+
+  auto rect = new GstD3D12OverlayRect ();
+  gst_mini_object_init (rect, 0, gst_d3d12_overlay_rect_get_type (),
+      nullptr, nullptr,
+      (GstMiniObjectFreeFunction) gst_d3d12_overlay_rect_free);
+
+  rect->overlay_rect = gst_video_overlay_rectangle_ref (overlay_rect);
+  rect->texture = texture;
+  rect->staging = staging;
+  rect->vertex_buf = vertex_buf;
+  rect->vbv.BufferLocation = vertex_buf->GetGPUVirtualAddress ();
+  rect->vbv.SizeInBytes = sizeof (VertexData) * 4;
+  rect->vbv.StrideInBytes = sizeof (VertexData);
+  rect->layout = layout;
+  rect->srv_heap = srv_heap;
+  rect->premul_alpha = premul_alpha;
+
+  return rect;
+}
+
+static gboolean
+gst_d3d12_overlay_compositor_setup_shader (GstD3D12OverlayCompositor * self)
+{
+  auto priv = self->priv;
+  GstVideoInfo *info = &priv->info;
+  const WORD indices6 = { 0, 1, 2, 3, 0, 2 };
+  const D3D12_ROOT_SIGNATURE_FLAGS rs_flags =
+      D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT |
+      D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS |
+      D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS |
+      D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS |
+      D3D12_ROOT_SIGNATURE_FLAG_DENY_AMPLIFICATION_SHADER_ROOT_ACCESS |
+      D3D12_ROOT_SIGNATURE_FLAG_DENY_MESH_SHADER_ROOT_ACCESS;
+  const D3D12_STATIC_SAMPLER_DESC static_sampler_desc = {
+    D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT,
+    D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+    D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+    D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
+    0,
+    1,
+    D3D12_COMPARISON_FUNC_ALWAYS,
+    D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK,
+    0,
+    D3D12_FLOAT32_MAX,
+    0,
+    0,
+    D3D12_SHADER_VISIBILITY_PIXEL
+  };
+
+  CD3DX12_ROOT_PARAMETER param;
+  D3D12_DESCRIPTOR_RANGE range;
+  std::vector < D3D12_ROOT_PARAMETER > param_list;
+
+  range = CD3DX12_DESCRIPTOR_RANGE (D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0);
+  param.InitAsDescriptorTable (1, &range, D3D12_SHADER_VISIBILITY_PIXEL);
+  param_list.push_back (param);
+
+  D3D12_VERSIONED_ROOT_SIGNATURE_DESC rs_desc = { };
+  CD3DX12_VERSIONED_ROOT_SIGNATURE_DESC::Init_1_0 (rs_desc,
+      param_list.size (), param_list.data (),
+      1, &static_sampler_desc, rs_flags);
+
+  ComPtr < ID3DBlob > rs_blob;
+  ComPtr < ID3DBlob > error_blob;
+  auto hr = D3DX12SerializeVersionedRootSignature (&rs_desc,
+      D3D_ROOT_SIGNATURE_VERSION_1_1, &rs_blob, &error_blob);
+  if (!gst_d3d12_result (hr, self->device)) {
+    const gchar *error_msg = nullptr;
+    if (error_blob)
+      error_msg = (const gchar *) error_blob->GetBufferPointer ();
+
+    GST_ERROR_OBJECT (self, "Couldn't serialize root signature, error: %s",
+        GST_STR_NULL (error_msg));
+    return FALSE;
+  }
+
+  GstD3D12Format device_format;
+  gst_d3d12_device_get_format (self->device, GST_VIDEO_INFO_FORMAT (info),
+      &device_format);
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  ComPtr < ID3D12RootSignature > rs;
+  device->CreateRootSignature (0, rs_blob->GetBufferPointer (),
+      rs_blob->GetBufferSize (), IID_PPV_ARGS (&rs));
+
+  priv->input_desc0.SemanticName = "POSITION";
+  priv->input_desc0.SemanticIndex = 0;
+  priv->input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+  priv->input_desc0.InputSlot = 0;
+  priv->input_desc0.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  priv->input_desc0.InputSlotClass =
+      D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  priv->input_desc0.InstanceDataStepRate = 0;
+
+  priv->input_desc1.SemanticName = "TEXCOORD";
+  priv->input_desc1.SemanticIndex = 0;
+  priv->input_desc1.Format = DXGI_FORMAT_R32G32_FLOAT;
+  priv->input_desc1.InputSlot = 0;
+  priv->input_desc1.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  priv->input_desc1.InputSlotClass =
+      D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  priv->input_desc1.InstanceDataStepRate = 0;
+
+  auto & pso_desc = priv->pso_desc;
+  pso_desc.pRootSignature = rs.Get ();
+  pso_desc.VS.BytecodeLength = sizeof (g_VSMain_coord);
+  pso_desc.VS.pShaderBytecode = g_VSMain_coord;
+  pso_desc.PS.BytecodeLength = sizeof (g_PSMain_sample);
+  pso_desc.PS.pShaderBytecode = g_PSMain_sample;
+  pso_desc.BlendState = CD3DX12_BLEND_DESC (D3D12_DEFAULT);
+  pso_desc.BlendState.RenderTarget0.BlendEnable = TRUE;
+  pso_desc.BlendState.RenderTarget0.LogicOpEnable = FALSE;
+  pso_desc.BlendState.RenderTarget0.SrcBlend = D3D12_BLEND_SRC_ALPHA;
+  pso_desc.BlendState.RenderTarget0.DestBlend = D3D12_BLEND_INV_SRC_ALPHA;
+  pso_desc.BlendState.RenderTarget0.BlendOp = D3D12_BLEND_OP_ADD;
+  pso_desc.BlendState.RenderTarget0.SrcBlendAlpha = D3D12_BLEND_ONE;
+  pso_desc.BlendState.RenderTarget0.DestBlendAlpha =
+      D3D12_BLEND_INV_SRC_ALPHA;
+  pso_desc.BlendState.RenderTarget0.BlendOpAlpha = D3D12_BLEND_OP_ADD;
+  pso_desc.BlendState.RenderTarget0.LogicOp = D3D12_LOGIC_OP_NOOP;
+  pso_desc.BlendState.RenderTarget0.RenderTargetWriteMask =
+      D3D12_COLOR_WRITE_ENABLE_ALL;
+  pso_desc.SampleMask = UINT_MAX;
+  pso_desc.RasterizerState = CD3DX12_RASTERIZER_DESC (D3D12_DEFAULT);
+  pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
+  pso_desc.DepthStencilState.DepthEnable = FALSE;
+  pso_desc.DepthStencilState.StencilEnable = FALSE;
+  pso_desc.InputLayout.pInputElementDescs = priv->input_desc;
+  pso_desc.InputLayout.NumElements = 2;
+  pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
+  pso_desc.NumRenderTargets = 1;
+  pso_desc.RTVFormats0 = device_format.resource_format0;
+  pso_desc.SampleDesc.Count = 1;
+
+  ComPtr < ID3D12PipelineState > pso;
+  hr = device->CreateGraphicsPipelineState (&pso_desc, IID_PPV_ARGS (&pso));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create pso");
+    return FALSE;
+  }
+
+  ComPtr < ID3D12PipelineState > pso_premul;
+  auto & pso_premul_desc = priv->pso_premul_desc;
+  pso_premul_desc = priv->pso_desc;
+  pso_premul_desc.PS.BytecodeLength = sizeof (g_PSMain_sample_premul);
+  pso_premul_desc.PS.pShaderBytecode = g_PSMain_sample_premul;
+  hr = device->CreateGraphicsPipelineState (&pso_premul_desc,
+      IID_PPV_ARGS (&pso_premul));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create pso");
+    return FALSE;
+  }
+
+  D3D12_HEAP_PROPERTIES heap_prop =
+      CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+  D3D12_RESOURCE_DESC buffer_desc =
+      CD3DX12_RESOURCE_DESC::Buffer (sizeof (indices));
+  ComPtr < ID3D12Resource > index_buf;
+  hr = device->CreateCommittedResource (&heap_prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &buffer_desc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+      IID_PPV_ARGS (&index_buf));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create index buffer");
+    return FALSE;
+  }
+
+  void *data;
+  hr = index_buf->Map (0, nullptr, &data);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't map index buffer");
+    return FALSE;
+  }
+
+  memcpy (data, indices, sizeof (indices));
+  index_buf->Unmap (0, nullptr);
+
+  D3D12_DESCRIPTOR_HEAP_DESC heap_desc = { };
+  heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
+  heap_desc.NumDescriptors = 1;
+  heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
+
+  priv->rs = rs;
+  priv->pso = pso;
+  priv->pso_premul = pso_premul;
+  priv->idv.BufferLocation = index_buf->GetGPUVirtualAddress ();
+  priv->idv.SizeInBytes = sizeof (indices);
+  priv->idv.Format = DXGI_FORMAT_R16_UINT;
+  priv->index_buf = index_buf;
+  priv->srv_heap_pool = gst_d3d12_descriptor_pool_new (self->device,
+      &heap_desc);
+  priv->ca_pool = gst_d3d12_command_allocator_pool_new (self->device,
+      D3D12_COMMAND_LIST_TYPE_DIRECT);
+
+  priv->viewport.TopLeftX = 0;
+  priv->viewport.TopLeftY = 0;
+  priv->viewport.Width = GST_VIDEO_INFO_WIDTH (info);
+  priv->viewport.Height = GST_VIDEO_INFO_HEIGHT (info);
+  priv->viewport.MinDepth = 0.0f;
+  priv->viewport.MaxDepth = 1.0f;
+
+  priv->scissor_rect.left = 0;
+  priv->scissor_rect.top = 0;
+  priv->scissor_rect.right = GST_VIDEO_INFO_WIDTH (info);
+  priv->scissor_rect.bottom = GST_VIDEO_INFO_HEIGHT (info);
+
+  return TRUE;
+}
+
+GstD3D12OverlayCompositor *
+gst_d3d12_overlay_compositor_new (GstD3D12Device * device,
+    const GstVideoInfo * info)
+{
+  GstD3D12OverlayCompositor *self = nullptr;
+  GstD3D12OverlayCompositorPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+  g_return_val_if_fail (info != nullptr, nullptr);
+
+  self = (GstD3D12OverlayCompositor *)
+      g_object_new (GST_TYPE_D3D12_OVERLAY_COMPOSITOR, nullptr);
+  gst_object_ref_sink (self);
+  priv = self->priv;
+
+  self->device = (GstD3D12Device *) gst_object_ref (device);
+  priv->info = *info;
+
+  if (!gst_d3d12_overlay_compositor_setup_shader (self)) {
+    gst_object_unref (self);
+    return nullptr;
+  }
+
+  return self;
+}
+
+static gboolean
+gst_d3d12_overlay_compositor_foreach_meta (GstBuffer * buffer, GstMeta ** meta,
+    GstD3D12OverlayCompositor * self)
+{
+  auto priv = self->priv;
+
+  if ((*meta)->info->api != GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE)
+    return TRUE;
+
+  auto cmeta = (GstVideoOverlayCompositionMeta *) (*meta);
+  if (!cmeta->overlay)
+    return TRUE;
+
+  auto num_rect = gst_video_overlay_composition_n_rectangles (cmeta->overlay);
+  for (guint i = 0; i < num_rect; i++) {
+    auto rect = gst_video_overlay_composition_get_rectangle (cmeta->overlay, i);
+    priv->rects_to_upload.push_back (rect);
+  }
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_overlay_compositor_upload (GstD3D12OverlayCompositor * compositor,
+    GstBuffer * buf)
+{
+  g_return_val_if_fail (compositor != nullptr, FALSE);
+  g_return_val_if_fail (GST_IS_BUFFER (buf), FALSE);
+
+  auto priv = compositor->priv;
+  priv->rects_to_upload.clear ();
+
+  gst_buffer_foreach_meta (buf,
+      (GstBufferForeachMetaFunc) gst_d3d12_overlay_compositor_foreach_meta,
+      compositor);
+
+  if (priv->rects_to_upload.empty ()) {
+    if (priv->overlays)
+      g_list_free_full (priv->overlays, (GDestroyNotify) gst_mini_object_unref);
+    priv->overlays = nullptr;
+    return TRUE;
+  }
+
+  GST_LOG_OBJECT (compositor, "Found %" G_GSIZE_FORMAT
+      " overlay rectangles", priv->rects_to_upload.size ());
+
+  for (size_t i = 0; i < priv->rects_to_upload.size (); i++) {
+    GList *iter;
+    bool found = false;
+    for (iter = priv->overlays; iter; iter = g_list_next (iter)) {
+      auto rect = (GstD3D12OverlayRect *) iter->data;
+      if (rect->overlay_rect == priv->rects_to_uploadi) {
+        found = true;
+        break;
+      }
+    }
+
+    if (!found) {
+      auto new_rect = gst_d3d12_overlay_rect_new (compositor,
+          priv->rects_to_uploadi);
+      if (new_rect)
+        priv->overlays = g_list_append (priv->overlays, new_rect);
+    }
+  }
+
+  /* Remove old overlay */
+  GList *iter;
+  GList *next;
+  for (iter = priv->overlays; iter; iter = next) {
+    auto rect = (GstD3D12OverlayRect *) iter->data;
+    next = g_list_next (iter);
+
+    if (std::find_if (priv->rects_to_upload.begin (),
+            priv->rects_to_upload.end (),&(const auto & overlay)->bool
+            {
+            return overlay == rect->overlay_rect;}
+        ) == priv->rects_to_upload.end ()) {
+      gst_mini_object_unref (rect);
+      priv->overlays = g_list_delete_link (priv->overlays, iter);
+    }
+  }
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_overlay_compositor_update_viewport (GstD3D12OverlayCompositor *
+    compositor, GstVideoRectangle * viewport)
+{
+  g_return_val_if_fail (GST_IS_D3D12_OVERLAY_COMPOSITOR (compositor), FALSE);
+  g_return_val_if_fail (viewport != nullptr, FALSE);
+
+  auto priv = compositor->priv;
+
+  priv->viewport.TopLeftX = viewport->x;
+  priv->viewport.TopLeftY = viewport->y;
+  priv->viewport.Width = viewport->w;
+  priv->viewport.Height = viewport->h;
+
+  priv->scissor_rect.left = viewport->x;
+  priv->scissor_rect.top = viewport->y;
+  priv->scissor_rect.right = viewport->x + viewport->w;
+  priv->scissor_rect.bottom = viewport->y + viewport->h;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_overlay_compositor_execute (GstD3D12OverlayCompositor * self,
+    GstBuffer * buf, GstD3D12FenceData * fence_data,
+    ID3D12GraphicsCommandList * cl)
+{
+  auto priv = self->priv;
+
+  auto mem = (GstD3D12Memory *) gst_buffer_peek_memory (buf, 0);
+  ComPtr < ID3D12DescriptorHeap > rtv_heap;
+  if (!gst_d3d12_memory_get_render_target_view_heap (mem, &rtv_heap)) {
+    GST_ERROR_OBJECT (self, "Couldn't get rtv heap");
+    return FALSE;
+  }
+
+  GList *iter;
+  ComPtr < ID3D12PipelineState > prev_pso;
+  for (iter = priv->overlays; iter; iter = g_list_next (iter)) {
+    auto rect = (GstD3D12OverlayRect *) iter->data;
+    if (rect->need_upload) {
+      D3D12_TEXTURE_COPY_LOCATION src =
+          CD3DX12_TEXTURE_COPY_LOCATION (rect->staging.Get (), rect->layout);
+      D3D12_TEXTURE_COPY_LOCATION dst =
+          CD3DX12_TEXTURE_COPY_LOCATION (rect->texture.Get ());
+      GST_LOG_OBJECT (self, "First render, uploading texture");
+      cl->CopyTextureRegion (&dst, 0, 0, 0, &src, nullptr);
+      D3D12_RESOURCE_BARRIER barrier =
+          CD3DX12_RESOURCE_BARRIER::Transition (rect->texture.Get (),
+          D3D12_RESOURCE_STATE_COPY_DEST,
+          D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+      cl->ResourceBarrier (1, &barrier);
+      rect->need_upload = FALSE;
+    }
+
+    cl->SetGraphicsRootSignature (priv->rs.Get ());
+
+    ComPtr < ID3D12PipelineState > pso;
+    if (rect->premul_alpha)
+      pso = priv->pso;
+    else
+      pso = priv->pso_premul;
+
+    if (!prev_pso) {
+      cl->SetPipelineState (pso.Get ());
+      cl->IASetIndexBuffer (&priv->idv);
+      cl->IASetPrimitiveTopology (D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+      cl->RSSetViewports (1, &priv->viewport);
+      cl->RSSetScissorRects (1, &priv->scissor_rect);
+      D3D12_CPU_DESCRIPTOR_HANDLE rtv_heaps = {
+        rtv_heap->GetCPUDescriptorHandleForHeapStart ()
+      };
+      cl->OMSetRenderTargets (1, rtv_heaps, FALSE, nullptr);
+    } else if (pso != prev_pso) {
+      cl->SetPipelineState (pso.Get ());
+    }
+
+    ComPtr < ID3D12DescriptorHeap > srv_heap;
+    gst_d3d12_descriptor_get_handle (rect->srv_heap, &srv_heap);
+    ID3D12DescriptorHeap *heaps = { srv_heap.Get () };
+    cl->SetDescriptorHeaps (1, heaps);
+    cl->SetGraphicsRootDescriptorTable (0,
+        srv_heap->GetGPUDescriptorHandleForHeapStart ());
+    cl->IASetVertexBuffers (0, 1, &rect->vbv);
+
+    cl->DrawIndexedInstanced (6, 1, 0, 0, 0);
+
+    gst_d3d12_fence_data_add_notify_mini_object (fence_data,
+        gst_mini_object_ref (rect));
+
+    prev_pso = nullptr;
+    prev_pso = pso;
+  }
+
+  priv->pso->AddRef ();
+  gst_d3d12_fence_data_add_notify_com (fence_data, priv->pso.Get ());
+
+  priv->pso_premul->AddRef ();
+  gst_d3d12_fence_data_add_notify_com (fence_data, priv->pso_premul.Get ());
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_overlay_compositor_draw (GstD3D12OverlayCompositor * compositor,
+    GstBuffer * buf, GstD3D12FenceData * fence_data,
+    ID3D12GraphicsCommandList * command_list)
+{
+  g_return_val_if_fail (compositor != nullptr, FALSE);
+  g_return_val_if_fail (GST_IS_BUFFER (buf), FALSE);
+  g_return_val_if_fail (fence_data, FALSE);
+  g_return_val_if_fail (command_list, FALSE);
+
+  auto priv = compositor->priv;
+
+  if (!priv->overlays)
+    return TRUE;
+
+  auto mem = (GstD3D12Memory *) gst_buffer_peek_memory (buf, 0);
+  auto resource = gst_d3d12_memory_get_resource_handle (mem);
+  auto desc = resource->GetDesc ();
+  if (desc.SampleDesc.Count != priv->sample_desc.Count ||
+      desc.SampleDesc.Quality != priv->sample_desc.Quality) {
+    auto device = gst_d3d12_device_get_device_handle (compositor->device);
+
+    auto pso_desc = priv->pso_desc;
+    pso_desc.SampleDesc = desc.SampleDesc;
+    ComPtr < ID3D12PipelineState > pso;
+    auto hr = device->CreateGraphicsPipelineState (&pso_desc,
+        IID_PPV_ARGS (&pso));
+    if (!gst_d3d12_result (hr, compositor->device)) {
+      GST_ERROR_OBJECT (compositor, "Couldn't create pso");
+      return FALSE;
+    }
+
+    ComPtr < ID3D12PipelineState > pso_premul;
+    auto pso_premul_desc = priv->pso_premul_desc;
+    pso_premul_desc.SampleDesc = desc.SampleDesc;
+    hr = device->CreateGraphicsPipelineState (&pso_premul_desc,
+        IID_PPV_ARGS (&pso_premul));
+    if (!gst_d3d12_result (hr, compositor->device)) {
+      GST_ERROR_OBJECT (compositor, "Couldn't create pso");
+      return FALSE;
+    }
+
+    priv->pso = nullptr;
+    priv->pso_premul = nullptr;
+
+    priv->pso = pso;
+    priv->pso_premul = pso_premul;
+    priv->sample_desc = desc.SampleDesc;
+  }
+
+  return gst_d3d12_overlay_compositor_execute (compositor,
+      buf, fence_data, command_list);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12overlaycompositor.h Added

@@ -0,0 +1,47 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02120-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_OVERLAY_COMPOSITOR (gst_d3d12_overlay_compositor_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12OverlayCompositor, gst_d3d12_overlay_compositor,
+    GST, D3D12_OVERLAY_COMPOSITOR, GstObject)
+
+GstD3D12OverlayCompositor * gst_d3d12_overlay_compositor_new  (GstD3D12Device * device,
+                                                               const GstVideoInfo * info);
+
+gboolean                    gst_d3d12_overlay_compositor_upload (GstD3D12OverlayCompositor * compositor,
+                                                                 GstBuffer * buf);
+
+gboolean                    gst_d3d12_overlay_compositor_update_viewport (GstD3D12OverlayCompositor * compositor,
+                                                                          GstVideoRectangle * viewport);
+
+gboolean                    gst_d3d12_overlay_compositor_draw (GstD3D12OverlayCompositor * compositor,
+                                                               GstBuffer * buf,
+                                                               GstD3D12FenceData * fence_data,
+                                                               ID3D12GraphicsCommandList * command_list);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12pluginutils.cpp Added

@@ -0,0 +1,128 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12pluginutils.h"
+
+#define _XM_NO_INTRINSICS_
+#include <DirectXMath.h>
+
+/* *INDENT-OFF* */
+using namespace DirectX;
+/* *INDENT-ON* */
+
+GType
+gst_d3d12_sampling_method_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue methods = {
+    {GST_D3D12_SAMPLING_METHOD_NEAREST,
+        "Nearest Neighbour", "nearest-neighbour"},
+    {GST_D3D12_SAMPLING_METHOD_BILINEAR,
+        "Bilinear", "bilinear"},
+    {GST_D3D12_SAMPLING_METHOD_LINEAR_MINIFICATION,
+        "Linear minification, point magnification", "linear-minification"},
+    {GST_D3D12_SAMPLING_METHOD_ANISOTROPIC, "Anisotropic", "anisotropic"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstD3D12SamplingMethod", methods);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return type;
+}
+
+struct SamplingMethodMap
+{
+  GstD3D12SamplingMethod method;
+  D3D12_FILTER filter;
+};
+
+static const SamplingMethodMap sampling_method_map = {
+  {GST_D3D12_SAMPLING_METHOD_NEAREST, D3D12_FILTER_MIN_MAG_MIP_POINT},
+  {GST_D3D12_SAMPLING_METHOD_BILINEAR, D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT},
+  {GST_D3D12_SAMPLING_METHOD_LINEAR_MINIFICATION,
+      D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT},
+  {GST_D3D12_SAMPLING_METHOD_ANISOTROPIC, D3D12_FILTER_ANISOTROPIC},
+};
+
+D3D12_FILTER
+gst_d3d12_sampling_method_to_native (GstD3D12SamplingMethod method)
+{
+  for (guint i = 0; i < G_N_ELEMENTS (sampling_method_map); i++) {
+    if (sampling_method_mapi.method == method)
+      return sampling_method_mapi.filter;
+  }
+
+  return D3D12_FILTER_MIN_MAG_MIP_POINT;
+}
+
+GType
+gst_d3d12_msaa_mode_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue msaa_mode = {
+    {GST_D3D12_MSAA_DISABLED, "Disabled", "disabled"},
+    {GST_D3D12_MSAA_2X, "2x MSAA", "2x"},
+    {GST_D3D12_MSAA_4X, "4x MSAA", "4x"},
+    {GST_D3D12_MSAA_8X, "8x MSAA", "8x"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstD3D12MSAAMode", msaa_mode);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return type;
+}
+
+void
+gst_d3d12_buffer_after_write (GstBuffer * buffer, guint64 fence_value)
+{
+  for (guint i = 0; i < gst_buffer_n_memory (buffer); i++) {
+    auto mem = gst_buffer_peek_memory (buffer, i);
+    g_return_if_fail (gst_is_d3d12_memory (mem));
+
+    auto dmem = GST_D3D12_MEMORY_CAST (mem);
+    dmem->fence_value = fence_value;
+    GST_MINI_OBJECT_FLAG_SET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_DOWNLOAD);
+    GST_MINI_OBJECT_FLAG_UNSET (dmem, GST_D3D12_MEMORY_TRANSFER_NEED_UPLOAD);
+  }
+}
+
+gboolean
+gst_d3d12_need_transform (gfloat rotation_x, gfloat rotation_y,
+    gfloat rotation_z, gfloat scale_x, gfloat scale_y)
+{
+  const gfloat min_diff = 0.00001f;
+
+  if (!XMScalarNearEqual (rotation_x, 0.0f, min_diff) ||
+      !XMScalarNearEqual (rotation_y, 0.0f, min_diff) ||
+      !XMScalarNearEqual (rotation_z, 0.0f, min_diff) ||
+      !XMScalarNearEqual (scale_x, 1.0f, min_diff) ||
+      !XMScalarNearEqual (scale_y, 1.0f, min_diff)) {
+    return TRUE;
+  }
+
+  return FALSE;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12pluginutils.h Added

@@ -0,0 +1,61 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "gstd3d12.h"
+#include "gstd3d12-private.h"
+
+G_BEGIN_DECLS
+
+enum GstD3D12SamplingMethod
+{
+  GST_D3D12_SAMPLING_METHOD_NEAREST,
+  GST_D3D12_SAMPLING_METHOD_BILINEAR,
+  GST_D3D12_SAMPLING_METHOD_LINEAR_MINIFICATION,
+  GST_D3D12_SAMPLING_METHOD_ANISOTROPIC,
+};
+
+#define GST_TYPE_D3D12_SAMPLING_METHOD (gst_d3d12_sampling_method_get_type())
+GType gst_d3d12_sampling_method_get_type (void);
+
+D3D12_FILTER  gst_d3d12_sampling_method_to_native (GstD3D12SamplingMethod method);
+
+enum GstD3D12MSAAMode
+{
+  GST_D3D12_MSAA_DISABLED,
+  GST_D3D12_MSAA_2X,
+  GST_D3D12_MSAA_4X,
+  GST_D3D12_MSAA_8X,
+};
+
+#define GST_TYPE_D3D12_MSAA_MODE (gst_d3d12_msaa_mode_get_type())
+GType gst_d3d12_msaa_mode_get_type (void);
+
+void          gst_d3d12_buffer_after_write (GstBuffer * buffer,
+                                            guint64 fence_value);
+
+gboolean      gst_d3d12_need_transform (gfloat rotation_x,
+                                        gfloat rotation_y,
+                                        gfloat rotation_z,
+                                        gfloat scale_x,
+                                        gfloat scale_y);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12screencapture.cpp Added

@@ -0,0 +1,276 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12screencapture.h"
+#include "gstd3d12pluginutils.h"
+#include <string.h>
+
+#include <wrl.h>
+
+GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_screen_capture_debug);
+#define GST_CAT_DEFAULT gst_d3d12_screen_capture_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+#define gst_d3d12_screen_capture_parent_class parent_class
+G_DEFINE_ABSTRACT_TYPE (GstD3D12ScreenCapture, gst_d3d12_screen_capture,
+    GST_TYPE_OBJECT);
+
+static void
+gst_d3d12_screen_capture_class_init (GstD3D12ScreenCaptureClass * klass)
+{
+}
+
+static void
+gst_d3d12_screen_capture_init (GstD3D12ScreenCapture * self)
+{
+}
+
+GstFlowReturn
+gst_d3d12_screen_capture_prepare (GstD3D12ScreenCapture * capture)
+{
+  g_return_val_if_fail (GST_IS_D3D12_SCREEN_CAPTURE (capture), GST_FLOW_ERROR);
+
+  auto klass = GST_D3D12_SCREEN_CAPTURE_GET_CLASS (capture);
+  g_assert (klass->prepare);
+
+  return klass->prepare (capture);
+}
+
+gboolean
+gst_d3d12_screen_capture_get_size (GstD3D12ScreenCapture * capture,
+    guint * width, guint * height)
+{
+  g_return_val_if_fail (GST_IS_D3D12_SCREEN_CAPTURE (capture), FALSE);
+  g_return_val_if_fail (width != nullptr, FALSE);
+  g_return_val_if_fail (height != nullptr, FALSE);
+
+  auto klass = GST_D3D12_SCREEN_CAPTURE_GET_CLASS (capture);
+  g_assert (klass->get_size);
+
+  return klass->get_size (capture, width, height);
+}
+
+gboolean
+gst_d3d12_screen_capture_unlock (GstD3D12ScreenCapture * capture)
+{
+  g_return_val_if_fail (GST_IS_D3D12_SCREEN_CAPTURE (capture), FALSE);
+
+  auto klass = GST_D3D12_SCREEN_CAPTURE_GET_CLASS (capture);
+
+  if (klass->unlock)
+    return klass->unlock (capture);
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_screen_capture_unlock_stop (GstD3D12ScreenCapture * capture)
+{
+  g_return_val_if_fail (GST_IS_D3D12_SCREEN_CAPTURE (capture), FALSE);
+
+  auto klass = GST_D3D12_SCREEN_CAPTURE_GET_CLASS (capture);
+
+  if (klass->unlock_stop)
+    return klass->unlock_stop (capture);
+
+  return TRUE;
+}
+
+void
+gst_d3d12_screen_capture_show_border (GstD3D12ScreenCapture * capture,
+    gboolean show)
+{
+  g_return_if_fail (GST_IS_D3D12_SCREEN_CAPTURE (capture));
+
+  auto klass = GST_D3D12_SCREEN_CAPTURE_GET_CLASS (capture);
+
+  if (klass->show_border)
+    klass->show_border (capture, show);
+}
+
+GstFlowReturn
+gst_d3d12_screen_capture_do_capture (GstD3D12ScreenCapture * capture,
+    GstBuffer * buffer, const D3D12_BOX * crop_box, gboolean draw_mouse)
+{
+  g_return_val_if_fail (GST_IS_D3D12_SCREEN_CAPTURE (capture), GST_FLOW_ERROR);
+  g_return_val_if_fail (GST_IS_BUFFER (buffer), GST_FLOW_ERROR);
+
+  auto klass = GST_D3D12_SCREEN_CAPTURE_GET_CLASS (capture);
+  g_assert (klass->do_capture);
+
+  return klass->do_capture (capture, buffer, crop_box, draw_mouse);
+}
+
+HRESULT
+gst_d3d12_screen_capture_find_output_for_monitor (HMONITOR monitor,
+    IDXGIAdapter1 ** adapter, IDXGIOutput ** output)
+{
+  ComPtr < IDXGIFactory1 > factory;
+  HRESULT hr = S_OK;
+
+  g_return_val_if_fail (monitor != nullptr, E_INVALIDARG);
+
+  hr = CreateDXGIFactory1 (IID_PPV_ARGS (&factory));
+  if (FAILED (hr))
+    return hr;
+
+  for (UINT adapter_idx = 0;; adapter_idx++) {
+    ComPtr < IDXGIAdapter1 > adapter_tmp;
+
+    hr = factory->EnumAdapters1 (adapter_idx, &adapter_tmp);
+    if (FAILED (hr))
+      break;
+
+    for (UINT output_idx = 0;; output_idx++) {
+      ComPtr < IDXGIOutput > output_tmp;
+      DXGI_OUTPUT_DESC desc;
+
+      hr = adapter_tmp->EnumOutputs (output_idx, &output_tmp);
+      if (FAILED (hr))
+        break;
+
+      hr = output_tmp->GetDesc (&desc);
+      if (FAILED (hr))
+        continue;
+
+      if (desc.Monitor == monitor) {
+        if (adapter)
+          *adapter = adapter_tmp.Detach ();
+        if (output)
+          *output = output_tmp.Detach ();
+
+        return S_OK;
+      }
+    }
+  }
+
+  return E_FAIL;
+}
+
+HRESULT
+gst_d3d12_screen_capture_find_primary_monitor (HMONITOR * monitor,
+    IDXGIAdapter1 ** adapter, IDXGIOutput ** output)
+{
+  ComPtr < IDXGIFactory1 > factory;
+  HRESULT hr = S_OK;
+
+  hr = CreateDXGIFactory1 (IID_PPV_ARGS (&factory));
+  if (FAILED (hr))
+    return hr;
+
+  for (UINT adapter_idx = 0;; adapter_idx++) {
+    ComPtr < IDXGIAdapter1 > adapter_tmp;
+
+    hr = factory->EnumAdapters1 (adapter_idx, &adapter_tmp);
+    if (FAILED (hr))
+      break;
+
+    for (UINT output_idx = 0;; output_idx++) {
+      ComPtr < IDXGIOutput > output_tmp;
+      DXGI_OUTPUT_DESC desc;
+      MONITORINFOEXW minfo;
+
+      hr = adapter_tmp->EnumOutputs (output_idx, &output_tmp);
+      if (FAILED (hr))
+        break;
+
+      hr = output_tmp->GetDesc (&desc);
+      if (FAILED (hr))
+        continue;
+
+      minfo.cbSize = sizeof (MONITORINFOEXW);
+      if (!GetMonitorInfoW (desc.Monitor, &minfo))
+        continue;
+
+      if ((minfo.dwFlags & MONITORINFOF_PRIMARY) != 0) {
+        if (monitor)
+          *monitor = desc.Monitor;
+        if (adapter)
+          *adapter = adapter_tmp.Detach ();
+        if (output)
+          *output = output_tmp.Detach ();
+
+        return S_OK;
+      }
+    }
+  }
+
+  return E_FAIL;
+}
+
+HRESULT
+gst_d3d12_screen_capture_find_nth_monitor (guint index, HMONITOR * monitor,
+    IDXGIAdapter1 ** adapter, IDXGIOutput ** output)
+{
+  ComPtr < IDXGIFactory1 > factory;
+  HRESULT hr = S_OK;
+  guint num_found = 0;
+
+  hr = CreateDXGIFactory1 (IID_PPV_ARGS (&factory));
+  if (FAILED (hr))
+    return hr;
+
+  for (UINT adapter_idx = 0;; adapter_idx++) {
+    ComPtr < IDXGIAdapter1 > adapter_tmp;
+
+    hr = factory->EnumAdapters1 (adapter_idx, &adapter_tmp);
+    if (FAILED (hr))
+      break;
+
+    for (UINT output_idx = 0;; output_idx++) {
+      ComPtr < IDXGIOutput > output_tmp;
+      DXGI_OUTPUT_DESC desc;
+      MONITORINFOEXW minfo;
+
+      hr = adapter_tmp->EnumOutputs (output_idx, &output_tmp);
+      if (FAILED (hr))
+        break;
+
+      hr = output_tmp->GetDesc (&desc);
+      if (FAILED (hr))
+        continue;
+
+      minfo.cbSize = sizeof (MONITORINFOEXW);
+      if (!GetMonitorInfoW (desc.Monitor, &minfo))
+        continue;
+
+      if (num_found == index) {
+        if (monitor)
+          *monitor = desc.Monitor;
+        if (adapter)
+          *adapter = adapter_tmp.Detach ();
+        if (output)
+          *output = output_tmp.Detach ();
+
+        return S_OK;
+      }
+
+      num_found++;
+    }
+  }
+
+  return E_FAIL;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12screencapture.h Added

@@ -0,0 +1,107 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_SCREEN_CAPTURE             (gst_d3d12_screen_capture_get_type())
+#define GST_D3D12_SCREEN_CAPTURE(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_D3D12_SCREEN_CAPTURE,GstD3D12ScreenCapture))
+#define GST_D3D12_SCREEN_CAPTURE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_D3D12_SCREEN_CAPTURE,GstD3D12ScreenCaptureClass))
+#define GST_D3D12_SCREEN_CAPTURE_GET_CLASS(obj)   (GST_D3D12_SCREEN_CAPTURE_CLASS(G_OBJECT_GET_CLASS(obj)))
+#define GST_IS_D3D12_SCREEN_CAPTURE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_D3D12_SCREEN_CAPTURE))
+#define GST_IS_D3D12_SCREEN_CAPTURE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_D3D12_SCREEN_CAPTURE))
+#define GST_D3D12_SCREEN_CAPTURE_CAST(obj)        ((GstD3D12ScreenCapture*)(obj))
+
+typedef struct _GstD3D12ScreenCapture GstD3D12ScreenCapture;
+typedef struct _GstD3D12ScreenCaptureClass GstD3D12ScreenCaptureClass;
+
+#define GST_D3D12_SCREEN_CAPTURE_FLOW_EXPECTED_ERROR GST_FLOW_CUSTOM_SUCCESS
+#define GST_D3D12_SCREEN_CAPTURE_FLOW_SIZE_CHANGED GST_FLOW_CUSTOM_SUCCESS_1
+#define GST_D3D12_SCREEN_CAPTURE_FLOW_UNSUPPORTED GST_FLOW_CUSTOM_ERROR
+
+struct _GstD3D12ScreenCapture
+{
+  GstObject parent;
+};
+
+struct _GstD3D12ScreenCaptureClass
+{
+  GstObjectClass parent_class;
+
+  GstFlowReturn (*prepare) (GstD3D12ScreenCapture * capture);
+
+  gboolean      (*get_size) (GstD3D12ScreenCapture * capture,
+                             guint * width,
+                             guint * height);
+
+  gboolean      (*unlock)          (GstD3D12ScreenCapture * capture);
+
+  gboolean      (*unlock_stop)     (GstD3D12ScreenCapture * capture);
+
+  void          (*show_border)     (GstD3D12ScreenCapture * capture,
+                                    gboolean show);
+
+  GstFlowReturn (*do_capture)      (GstD3D12ScreenCapture * capture,
+                                    GstBuffer * buffer,
+                                    const D3D12_BOX * crop_box,
+                                    gboolean draw_mouse);
+};
+
+GType           gst_d3d12_screen_capture_get_type (void);
+
+GstFlowReturn   gst_d3d12_screen_capture_prepare (GstD3D12ScreenCapture * capture);
+
+gboolean        gst_d3d12_screen_capture_get_size (GstD3D12ScreenCapture * capture,
+                                                   guint * width,
+                                                   guint * height);
+
+gboolean        gst_d3d12_screen_capture_unlock      (GstD3D12ScreenCapture * capture);
+
+gboolean        gst_d3d12_screen_capture_unlock_stop (GstD3D12ScreenCapture * capture);
+
+void            gst_d3d12_screen_capture_show_border (GstD3D12ScreenCapture * capture,
+                                                      gboolean show);
+
+GstFlowReturn   gst_d3d12_screen_capture_do_capture  (GstD3D12ScreenCapture * capture,
+                                                      GstBuffer * buffer,
+                                                      const D3D12_BOX * crop_box,
+                                                      gboolean draw_mouse);
+
+HRESULT         gst_d3d12_screen_capture_find_output_for_monitor (HMONITOR monitor,
+                                                                  IDXGIAdapter1 ** adapter,
+                                                                  IDXGIOutput ** output);
+
+HRESULT         gst_d3d12_screen_capture_find_primary_monitor (HMONITOR * monitor,
+                                                               IDXGIAdapter1 ** adapter,
+                                                               IDXGIOutput ** output);
+
+HRESULT         gst_d3d12_screen_capture_find_nth_monitor (guint index,
+                                                           HMONITOR * monitor,
+                                                           IDXGIAdapter1 ** adapter,
+                                                           IDXGIOutput ** output);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstD3D12ScreenCapture, gst_object_unref)
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12screencapturedevice.cpp Added

@@ -0,0 +1,455 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12screencapturedevice.h"
+#include "gstd3d12screencapture.h"
+#include <gst/video/video.h>
+#include <wrl.h>
+#include <string.h>
+#include <string>
+#include <locale>
+#include <codecvt>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_screen_capture_debug);
+#define GST_CAT_DEFAULT gst_d3d12_screen_capture_debug
+
+static GstStaticCaps template_caps =
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+    (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY,
+        "BGRA") ", pixel-aspect-ratio = 1/1, colorimetry = (string) sRGB; "
+    GST_VIDEO_CAPS_MAKE ("BGRA") ", pixel-aspect-ratio = 1/1, "
+    "colorimetry = (string) sRGB");
+
+enum
+{
+  PROP_0,
+  PROP_MONITOR_HANDLE,
+};
+
+struct _GstD3D12ScreenCaptureDevice
+{
+  GstDevice parent;
+
+  HMONITOR monitor_handle;
+};
+
+static void gst_d3d12_screen_capture_device_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+static void gst_d3d12_screen_capture_device_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static GstElement *gst_d3d12_screen_capture_device_create_element (GstDevice *
+    device, const gchar * name);
+
+G_DEFINE_TYPE (GstD3D12ScreenCaptureDevice,
+    gst_d3d12_screen_capture_device, GST_TYPE_DEVICE);
+
+static void
+gst_d3d12_screen_capture_device_class_init (GstD3D12ScreenCaptureDeviceClass *
+    klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto dev_class = GST_DEVICE_CLASS (klass);
+
+  object_class->get_property = gst_d3d12_screen_capture_device_get_property;
+  object_class->set_property = gst_d3d12_screen_capture_device_set_property;
+
+  g_object_class_install_property (object_class, PROP_MONITOR_HANDLE,
+      g_param_spec_uint64 ("monitor-handle", "Monitor Handle",
+          "A HMONITOR handle", 0, G_MAXUINT64, 0,
+          (GParamFlags) (G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE |
+              G_PARAM_CONSTRUCT_ONLY)));
+
+  dev_class->create_element = gst_d3d12_screen_capture_device_create_element;
+}
+
+static void
+gst_d3d12_screen_capture_device_init (GstD3D12ScreenCaptureDevice * self)
+{
+}
+
+static void
+gst_d3d12_screen_capture_device_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_DEVICE (object);
+
+  switch (prop_id) {
+    case PROP_MONITOR_HANDLE:
+      g_value_set_uint64 (value, (guint64) self->monitor_handle);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_screen_capture_device_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_DEVICE (object);
+
+  switch (prop_id) {
+    case PROP_MONITOR_HANDLE:
+      self->monitor_handle = (HMONITOR) g_value_get_uint64 (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstElement *
+gst_d3d12_screen_capture_device_create_element (GstDevice * device,
+    const gchar * name)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_DEVICE (device);
+  auto elem = gst_element_factory_make ("d3d12screencapturesrc", name);
+
+  g_object_set (elem, "monitor-handle", self->monitor_handle, nullptr);
+
+  return elem;
+}
+
+struct _GstD3D12ScreenCaptureDeviceProvider
+{
+  GstDeviceProvider parent;
+};
+
+G_DEFINE_TYPE (GstD3D12ScreenCaptureDeviceProvider,
+    gst_d3d12_screen_capture_device_provider, GST_TYPE_DEVICE_PROVIDER);
+
+static GList *gst_d3d12_screen_capture_device_provider_probe (GstDeviceProvider
+    * provider);
+
+static void
+    gst_d3d12_screen_capture_device_provider_class_init
+    (GstD3D12ScreenCaptureDeviceProviderClass * klass)
+{
+  auto provider_class = GST_DEVICE_PROVIDER_CLASS (klass);
+
+  provider_class->probe =
+      GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_device_provider_probe);
+
+  gst_device_provider_class_set_static_metadata (provider_class,
+      "Direct3D12 Screen Capture Device Provider",
+      "Source/Monitor", "List Direct3D12 screen capture source devices",
+      "Seungha Yang <seungha@centricular.com>");
+}
+
+static void
+    gst_d3d12_screen_capture_device_provider_init
+    (GstD3D12ScreenCaptureDeviceProvider * self)
+{
+}
+
+static gboolean
+get_monitor_name (const MONITORINFOEXW * info,
+    DISPLAYCONFIG_TARGET_DEVICE_NAME * target)
+{
+  UINT32 num_path = 0;
+  UINT32 num_mode = 0;
+  LONG query_ret;
+  DISPLAYCONFIG_PATH_INFO *path_infos = nullptr;
+  DISPLAYCONFIG_MODE_INFO *mode_infos = nullptr;
+  gboolean ret = FALSE;
+
+  memset (target, 0, sizeof (DISPLAYCONFIG_TARGET_DEVICE_NAME));
+
+  query_ret = GetDisplayConfigBufferSizes (QDC_ONLY_ACTIVE_PATHS,
+      &num_path, &num_mode);
+  if (query_ret != ERROR_SUCCESS || num_path == 0 || num_mode == 0)
+    return FALSE;
+
+  path_infos = g_new0 (DISPLAYCONFIG_PATH_INFO, num_path);
+  mode_infos = g_new0 (DISPLAYCONFIG_MODE_INFO, num_mode);
+
+  query_ret = QueryDisplayConfig (QDC_ONLY_ACTIVE_PATHS, &num_path,
+      path_infos, &num_mode, mode_infos, nullptr);
+  if (query_ret != ERROR_SUCCESS)
+    goto out;
+
+  for (UINT32 i = 0; i < num_path; i++) {
+    DISPLAYCONFIG_PATH_INFO *p = &path_infosi;
+    DISPLAYCONFIG_SOURCE_DEVICE_NAME source;
+
+    memset (&source, 0, sizeof (DISPLAYCONFIG_SOURCE_DEVICE_NAME));
+
+    source.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME;
+    source.header.size = sizeof (DISPLAYCONFIG_SOURCE_DEVICE_NAME);
+    source.header.adapterId = p->sourceInfo.adapterId;
+    source.header.id = p->sourceInfo.id;
+
+    query_ret = DisplayConfigGetDeviceInfo (&source.header);
+    if (query_ret != ERROR_SUCCESS)
+      continue;
+
+    if (wcscmp (info->szDevice, source.viewGdiDeviceName) != 0)
+      continue;
+
+    DISPLAYCONFIG_TARGET_DEVICE_NAME tmp;
+
+    memset (&tmp, 0, sizeof (DISPLAYCONFIG_TARGET_DEVICE_NAME));
+
+    tmp.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME;
+    tmp.header.size = sizeof (DISPLAYCONFIG_TARGET_DEVICE_NAME);
+    tmp.header.adapterId = p->sourceInfo.adapterId;
+    tmp.header.id = p->targetInfo.id;
+
+    query_ret = DisplayConfigGetDeviceInfo (&tmp.header);
+    if (query_ret != ERROR_SUCCESS)
+      continue;
+
+    memcpy (target, &tmp, sizeof (DISPLAYCONFIG_TARGET_DEVICE_NAME));
+
+    ret = TRUE;
+    break;
+  }
+
+out:
+  g_free (path_infos);
+  g_free (mode_infos);
+
+  return ret;
+}
+
+/* XXX: please bump MinGW toolchain version,
+ * DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY defined in wingdi.h */
+typedef enum
+{
+  OUTPUT_TECH_OTHER = -1,
+  OUTPUT_TECH_HD15 = 0,
+  OUTPUT_TECH_SVIDEO = 1,
+  OUTPUT_TECH_COMPOSITE_VIDEO = 2,
+  OUTPUT_TECH_COMPONENT_VIDEO = 3,
+  OUTPUT_TECH_DVI = 4,
+  OUTPUT_TECH_HDMI = 5,
+  OUTPUT_TECH_LVDS = 6,
+  OUTPUT_TECH_D_JPN = 8,
+  OUTPUT_TECH_SDI = 9,
+  OUTPUT_TECH_DISPLAYPORT_EXTERNAL = 10,
+  OUTPUT_TECH_DISPLAYPORT_EMBEDDED = 11,
+  OUTPUT_TECH_UDI_EXTERNAL = 12,
+  OUTPUT_TECH_UDI_EMBEDDED = 13,
+  OUTPUT_TECH_SDTVDONGLE = 14,
+  OUTPUT_TECH_MIRACAST = 15,
+  OUTPUT_TECH_INDIRECT_WIRED = 16,
+  OUTPUT_TECH_INDIRECT_VIRTUAL = 17,
+  OUTPUT_TECH_INTERNAL = 0x80000000,
+  OUTPUT_TECH_FORCE_UINT32 = 0xFFFFFFFF
+} GST_OUTPUT_TECHNOLOGY;
+
+static const gchar *
+output_tech_to_string (GST_OUTPUT_TECHNOLOGY tech)
+{
+  switch (tech) {
+    case OUTPUT_TECH_HD15:
+      return "hd15";
+    case OUTPUT_TECH_SVIDEO:
+      return "svideo";
+    case OUTPUT_TECH_COMPOSITE_VIDEO:
+      return "composite-video";
+    case OUTPUT_TECH_DVI:
+      return "dvi";
+    case OUTPUT_TECH_HDMI:
+      return "hdmi";
+    case OUTPUT_TECH_LVDS:
+      return "lvds";
+    case OUTPUT_TECH_D_JPN:
+      return "d-jpn";
+    case OUTPUT_TECH_SDI:
+      return "sdi";
+    case OUTPUT_TECH_DISPLAYPORT_EXTERNAL:
+      return "displayport-external";
+    case OUTPUT_TECH_DISPLAYPORT_EMBEDDED:
+      return "displayport-internal";
+    case OUTPUT_TECH_UDI_EXTERNAL:
+      return "udi-external";
+    case OUTPUT_TECH_UDI_EMBEDDED:
+      return "udi-embedded";
+    case OUTPUT_TECH_SDTVDONGLE:
+      return "sdtv";
+    case OUTPUT_TECH_MIRACAST:
+      return "miracast";
+    case OUTPUT_TECH_INDIRECT_WIRED:
+      return "indirect-wired";
+    case OUTPUT_TECH_INDIRECT_VIRTUAL:
+      return "indirect-virtual";
+    case OUTPUT_TECH_INTERNAL:
+      return "internal";
+    default:
+      break;
+  }
+
+  return "unknown";
+}
+
+static GstDevice *
+create_device (const DXGI_ADAPTER_DESC * adapter_desc,
+    const DXGI_OUTPUT_DESC * output_desc,
+    const MONITORINFOEXW * minfo, const DEVMODEW * dev_mode,
+    const DISPLAYCONFIG_TARGET_DEVICE_NAME * target)
+{
+  GstCaps *caps;
+  gint width, height, left, top, right, bottom;
+  GstStructure *props;
+  /* *INDENT-OFF* */
+  std::wstring_convert < std::codecvt_utf8 < wchar_t >, wchar_t > converter;
+  /* *INDENT-ON* */
+  std::string device_name;
+  std::string display_name;
+  std::string device_path;
+  std::string device_description;
+  const gchar *output_type;
+  gboolean primary = FALSE;
+  GstDevice *device;
+
+  left = (gint) dev_mode->dmPosition.x;
+  top = (gint) dev_mode->dmPosition.y;
+  width = dev_mode->dmPelsWidth;
+  height = dev_mode->dmPelsHeight;
+  right = left + width;
+  bottom = top + height;
+
+  caps = gst_static_caps_get (&template_caps);
+  caps = gst_caps_make_writable (caps);
+  gst_caps_set_simple (caps,
+      "width", G_TYPE_INT, width, "height", G_TYPE_INT, height, nullptr);
+
+  device_name = converter.to_bytes (minfo->szDevice);
+  display_name = converter.to_bytes (target->monitorFriendlyDeviceName);
+  device_path = converter.to_bytes (target->monitorDevicePath);
+  device_description = converter.to_bytes (adapter_desc->Description);
+  output_type =
+      output_tech_to_string ((GST_OUTPUT_TECHNOLOGY) target->outputTechnology);
+  if ((minfo->dwFlags & MONITORINFOF_PRIMARY) != 0)
+    primary = TRUE;
+
+  props = gst_structure_new ("d3d12screencapturedevice-proplist",
+      "device.api", G_TYPE_STRING, "d3d12",
+      "device.name", G_TYPE_STRING, GST_STR_NULL (device_name.c_str ()),
+      "device.path", G_TYPE_STRING, GST_STR_NULL (device_path.c_str ()),
+      "device.primary", G_TYPE_BOOLEAN, primary,
+      "device.type", G_TYPE_STRING, output_type,
+      "device.hmonitor", G_TYPE_UINT64, (guint64) output_desc->Monitor,
+      "device.adapter.luid", G_TYPE_INT64,
+      gst_d3d12_luid_to_int64 (&adapter_desc->AdapterLuid),
+      "device.adapter.description", G_TYPE_STRING,
+      GST_STR_NULL (device_description.c_str ()),
+      "desktop.coordinates.left", G_TYPE_INT,
+      (gint) output_desc->DesktopCoordinates.left,
+      "desktop.coordinates.top", G_TYPE_INT,
+      (gint) output_desc->DesktopCoordinates.top,
+      "desktop.coordinates.right", G_TYPE_INT,
+      (gint) output_desc->DesktopCoordinates.right,
+      "desktop.coordinates.bottom", G_TYPE_INT,
+      (gint) output_desc->DesktopCoordinates.bottom,
+      "display.coordinates.left", G_TYPE_INT, left,
+      "display.coordinates.top", G_TYPE_INT, top,
+      "display.coordinates.right", G_TYPE_INT, right,
+      "display.coordinates.bottom", G_TYPE_INT, bottom, nullptr);
+
+  device = (GstDevice *) g_object_new (GST_TYPE_D3D12_SCREEN_CAPTURE_DEVICE,
+      "display-name", display_name.c_str (), "caps", caps, "device-class",
+      "Source/Monitor", "properties", props, "monitor-handle",
+      (guint64) output_desc->Monitor, nullptr);
+
+  gst_caps_unref (caps);
+
+  return device;
+}
+
+static GList *
+gst_d3d12_screen_capture_device_provider_probe (GstDeviceProvider * provider)
+{
+  GList *devices = nullptr;
+  ComPtr < IDXGIFactory1 > factory;
+  HRESULT hr = S_OK;
+
+  hr = CreateDXGIFactory1 (IID_PPV_ARGS (&factory));
+  if (FAILED (hr))
+    return nullptr;
+
+  for (UINT adapter_idx = 0;; adapter_idx++) {
+    ComPtr < IDXGIAdapter1 > adapter;
+    DXGI_ADAPTER_DESC adapter_desc;
+
+    hr = factory->EnumAdapters1 (adapter_idx, &adapter);
+    if (FAILED (hr))
+      break;
+
+    hr = adapter->GetDesc (&adapter_desc);
+    if (FAILED (hr))
+      continue;
+
+    for (UINT output_idx = 0;; output_idx++) {
+      ComPtr < IDXGIOutput > output;
+      ComPtr < IDXGIOutput1 > output1;
+      DXGI_OUTPUT_DESC desc;
+      MONITORINFOEXW minfo;
+      DEVMODEW dev_mode;
+      DISPLAYCONFIG_TARGET_DEVICE_NAME target;
+      GstDevice *dev;
+
+      hr = adapter->EnumOutputs (output_idx, &output);
+      if (FAILED (hr))
+        break;
+
+      hr = output.As (&output1);
+      if (FAILED (hr))
+        continue;
+
+      hr = output->GetDesc (&desc);
+      if (FAILED (hr))
+        continue;
+
+      minfo.cbSize = sizeof (MONITORINFOEXW);
+      if (!GetMonitorInfoW (desc.Monitor, &minfo))
+        continue;
+
+      dev_mode.dmSize = sizeof (DEVMODEW);
+      dev_mode.dmDriverExtra = sizeof (POINTL);
+      dev_mode.dmFields = DM_POSITION;
+      if (!EnumDisplaySettingsW (minfo.szDevice,
+              ENUM_CURRENT_SETTINGS, &dev_mode)) {
+        continue;
+      }
+
+      /* Human readable monitor name is not always availabe, if it's empty
+       * fill it with generic one */
+      if (!get_monitor_name (&minfo, &target) ||
+          wcslen (target.monitorFriendlyDeviceName) == 0) {
+        wcscpy (target.monitorFriendlyDeviceName, L"Generic PnP Monitor");
+      }
+
+      dev = create_device (&adapter_desc, &desc, &minfo, &dev_mode, &target);
+      devices = g_list_append (devices, dev);
+    }
+  }
+
+  return devices;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12screencapturedevice.h Added

@@ -0,0 +1,37 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_SCREEN_CAPTURE_DEVICE (gst_d3d12_screen_capture_device_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12ScreenCaptureDevice, gst_d3d12_screen_capture_device,
+    GST, D3D12_SCREEN_CAPTURE_DEVICE, GstDevice);
+
+#define GST_TYPE_D3D12_SCREEN_CAPTURE_DEVICE_PROVIDER (gst_d3d12_screen_capture_device_provider_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12ScreenCaptureDeviceProvider,
+    gst_d3d12_screen_capture_device_provider,
+    GST, D3D12_SCREEN_CAPTURE_DEVICE_PROVIDER, GstDeviceProvider);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12screencapturesrc.cpp Added

@@ -0,0 +1,1006 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d12screencapturesrc
+ * @title: d3d12screencapturesrc
+ *
+ * Direct3D12 screen capture element
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 d3d12screencapturesrc ! queue ! d3d12videosink
+ * ```
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12screencapturesrc.h"
+#include "gstd3d12dxgicapture.h"
+#include "gstd3d12pluginutils.h"
+#include <mutex>
+#include <wrl.h>
+#include <string.h>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY (gst_d3d12_screen_capture_debug);
+#define GST_CAT_DEFAULT gst_d3d12_screen_capture_debug
+
+enum
+{
+  PROP_0,
+  PROP_MONITOR_INDEX,
+  PROP_MONITOR_HANDLE,
+  PROP_SHOW_CURSOR,
+  PROP_CROP_X,
+  PROP_CROP_Y,
+  PROP_CROP_WIDTH,
+  PROP_CROP_HEIGHT,
+};
+
+#define DEFAULT_MONITOR_INDEX -1
+#define DEFAULT_SHOW_CURSOR FALSE
+
+static GstStaticPadTemplate src_template =
+    GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, "BGRA")
+        ", pixel-aspect-ratio = 1/1, colorimetry = (string) sRGB; "
+        GST_VIDEO_CAPS_MAKE ("BGRA") ", pixel-aspect-ratio = 1/1, "
+        "colorimetry = (string) sRGB"));
+
+struct GstD3D12ScreenCaptureSrcPrivate
+{
+  ~GstD3D12ScreenCaptureSrcPrivate ()
+  {
+    if (pool) {
+      gst_buffer_pool_set_active (pool, FALSE);
+      gst_clear_object (&pool);
+    }
+
+    gst_clear_object (&capture);
+  }
+
+  guint64 last_frame_no = 0;
+  GstClockID clock_id = nullptr;
+  GstVideoInfo video_info;
+
+  GstD3D12ScreenCapture *capture = nullptr;
+
+  GstBufferPool *pool = nullptr;
+
+  gint64 adapter_luid = 0;
+  gint monitor_index = DEFAULT_MONITOR_INDEX;
+  HMONITOR monitor_handle = nullptr;
+  gboolean show_cursor = DEFAULT_SHOW_CURSOR;
+
+  guint crop_x = 0;
+  guint crop_y = 0;
+  guint crop_w = 0;
+  guint crop_h = 0;
+  D3D12_BOX crop_box = { };
+
+  gboolean flushing = FALSE;
+  GstClockTime latency = GST_CLOCK_TIME_NONE;
+
+  gboolean downstream_supports_d3d12 = FALSE;
+
+  std::recursive_mutex lock;
+  std::mutex flush_lock;
+};
+
+struct _GstD3D12ScreenCaptureSrc
+{
+  GstBaseSrc src;
+  GstD3D12Device *device;
+  GstD3D12ScreenCaptureSrcPrivate *priv;
+};
+
+static void gst_d3d12_screen_capture_src_finalize (GObject * object);
+static void gst_d3d12_screen_capture_src_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_d3d12_screen_capture_src_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+
+static GstClock *gst_d3d12_screen_capture_src_provide_clock (GstElement *
+    element);
+static void gst_d3d12_screen_capture_src_set_context (GstElement * element,
+    GstContext * context);
+
+static GstCaps *gst_d3d12_screen_capture_src_get_caps (GstBaseSrc * bsrc,
+    GstCaps * filter);
+static GstCaps *gst_d3d12_screen_capture_src_fixate (GstBaseSrc * bsrc,
+    GstCaps * caps);
+static gboolean gst_d3d12_screen_capture_src_set_caps (GstBaseSrc * bsrc,
+    GstCaps * caps);
+static gboolean gst_d3d12_screen_capture_src_decide_allocation (GstBaseSrc *
+    bsrc, GstQuery * query);
+static gboolean gst_d3d12_screen_capture_src_start (GstBaseSrc * bsrc);
+static gboolean gst_d3d12_screen_capture_src_stop (GstBaseSrc * bsrc);
+static gboolean gst_d3d12_screen_capture_src_unlock (GstBaseSrc * bsrc);
+static gboolean gst_d3d12_screen_capture_src_unlock_stop (GstBaseSrc * bsrc);
+static gboolean
+gst_d3d12_screen_capture_src_src_query (GstBaseSrc * bsrc, GstQuery * query);
+
+static GstFlowReturn gst_d3d12_screen_capture_src_create (GstBaseSrc * bsrc,
+    guint64 offset, guint size, GstBuffer ** buf);
+
+#define gst_d3d12_screen_capture_src_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12ScreenCaptureSrc, gst_d3d12_screen_capture_src,
+    GST_TYPE_BASE_SRC);
+
+static void
+gst_d3d12_screen_capture_src_class_init (GstD3D12ScreenCaptureSrcClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto element_class = GST_ELEMENT_CLASS (klass);
+  auto basesrc_class = GST_BASE_SRC_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_screen_capture_src_finalize;
+  object_class->set_property = gst_d3d12_screen_capture_src_set_property;
+  object_class->get_property = gst_d3d12_screen_capture_src_get_property;
+
+  g_object_class_install_property (object_class, PROP_MONITOR_INDEX,
+      g_param_spec_int ("monitor-index", "Monitor Index",
+          "Zero-based index for monitor to capture (-1 = primary monitor)",
+          -1, G_MAXINT, DEFAULT_MONITOR_INDEX,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_MONITOR_HANDLE,
+      g_param_spec_uint64 ("monitor-handle", "Monitor Handle",
+          "A HMONITOR handle of monitor to capture",
+          0, G_MAXUINT64, 0,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_SHOW_CURSOR,
+      g_param_spec_boolean ("show-cursor",
+          "Show Mouse Cursor", "Whether to show mouse cursor",
+          DEFAULT_SHOW_CURSOR,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_CROP_X,
+      g_param_spec_uint ("crop-x", "Crop X",
+          "Horizontal coordinate of top left corner for the screen capture area",
+          0, G_MAXUINT, 0,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_CROP_Y,
+      g_param_spec_uint ("crop-y", "Crop Y",
+          "Vertical coordinate of top left corner for the screen capture area",
+          0, G_MAXUINT, 0,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_CROP_WIDTH,
+      g_param_spec_uint ("crop-width", "Crop Width",
+          "Width of screen capture area (0 = maximum)",
+          0, G_MAXUINT, 0,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_CROP_HEIGHT,
+      g_param_spec_uint ("crop-height", "Crop Height",
+          "Height of screen capture area (0 = maximum)",
+          0, G_MAXUINT, 0,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  element_class->provide_clock =
+      GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_provide_clock);
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_set_context);
+
+  gst_element_class_set_static_metadata (element_class,
+      "Direct3D12 Screen Capture Source", "Source/Video",
+      "Captures desktop screen", "Seungha Yang <seungha@centricular.com>");
+
+  gst_element_class_add_static_pad_template (element_class, &src_template);
+
+  basesrc_class->get_caps =
+      GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_get_caps);
+  basesrc_class->fixate =
+      GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_fixate);
+  basesrc_class->set_caps =
+      GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_set_caps);
+  basesrc_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_decide_allocation);
+  basesrc_class->start = GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_start);
+  basesrc_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_stop);
+  basesrc_class->unlock =
+      GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_unlock);
+  basesrc_class->unlock_stop =
+      GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_unlock_stop);
+  basesrc_class->query =
+      GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_src_query);
+  basesrc_class->create =
+      GST_DEBUG_FUNCPTR (gst_d3d12_screen_capture_src_create);
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_screen_capture_debug,
+      "d3d12screencapturesrc", 0, "d3d12screencapturesrc");
+}
+
+static void
+gst_d3d12_screen_capture_src_init (GstD3D12ScreenCaptureSrc * self)
+{
+  gst_base_src_set_live (GST_BASE_SRC (self), TRUE);
+  gst_base_src_set_format (GST_BASE_SRC (self), GST_FORMAT_TIME);
+
+  self->priv = new GstD3D12ScreenCaptureSrcPrivate ();
+
+  GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_PROVIDE_CLOCK);
+  GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_REQUIRE_CLOCK);
+}
+
+static void
+gst_d3d12_screen_capture_src_finalize (GObject * object)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (object);
+
+  delete self->priv;
+  gst_clear_object (&self->device);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_screen_capture_src_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (object);
+  auto priv = self->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  switch (prop_id) {
+    case PROP_MONITOR_INDEX:
+      priv->monitor_index = g_value_get_int (value);
+      break;
+    case PROP_MONITOR_HANDLE:
+      priv->monitor_handle = (HMONITOR) g_value_get_uint64 (value);
+      break;
+    case PROP_SHOW_CURSOR:
+      priv->show_cursor = g_value_get_boolean (value);
+      break;
+    case PROP_CROP_X:
+      priv->crop_x = g_value_get_uint (value);
+      break;
+    case PROP_CROP_Y:
+      priv->crop_y = g_value_get_uint (value);
+      break;
+    case PROP_CROP_WIDTH:
+      priv->crop_w = g_value_get_uint (value);
+      break;
+    case PROP_CROP_HEIGHT:
+      priv->crop_h = g_value_get_uint (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  };
+}
+
+static void
+gst_d3d12_screen_capture_src_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (object);
+  auto priv = self->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  switch (prop_id) {
+    case PROP_MONITOR_INDEX:
+      g_value_set_int (value, priv->monitor_index);
+      break;
+    case PROP_MONITOR_HANDLE:
+      g_value_set_uint64 (value, (guint64) priv->monitor_handle);
+      break;
+    case PROP_SHOW_CURSOR:
+      g_value_set_boolean (value, priv->show_cursor);
+      break;
+    case PROP_CROP_X:
+      g_value_set_uint (value, priv->crop_x);
+      break;
+    case PROP_CROP_Y:
+      g_value_set_uint (value, priv->crop_y);
+      break;
+    case PROP_CROP_WIDTH:
+      g_value_set_uint (value, priv->crop_w);
+      break;
+    case PROP_CROP_HEIGHT:
+      g_value_set_uint (value, priv->crop_h);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  };
+}
+
+static GstClock *
+gst_d3d12_screen_capture_src_provide_clock (GstElement * element)
+{
+  return gst_system_clock_obtain ();
+}
+
+static void
+gst_d3d12_screen_capture_src_set_context (GstElement * element,
+    GstContext * context)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (element);
+  auto priv = self->priv;
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    gst_d3d12_handle_set_context_for_adapter_luid (element,
+        context, priv->adapter_luid, &self->device);
+  }
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static void
+gst_d3d12_screen_capture_src_get_crop_box (GstD3D12ScreenCaptureSrc * self,
+    D3D12_BOX & box)
+{
+  auto priv = self->priv;
+  guint screen_width, screen_height;
+
+  box.front = 0;
+  box.back = 1;
+
+  gst_d3d12_screen_capture_get_size (priv->capture, &screen_width,
+      &screen_height);
+
+  if ((priv->crop_x + priv->crop_w) > screen_width ||
+      (priv->crop_y + priv->crop_h) > screen_height) {
+    GST_WARNING ("Capture region outside of the screen bounds; ignoring.");
+
+    box.left = 0;
+    box.top = 0;
+    box.right = screen_width;
+    box.bottom = screen_height;
+  } else {
+    box.left = priv->crop_x;
+    box.top = priv->crop_y;
+    box.right = priv->crop_w ? (priv->crop_x + priv->crop_w) : screen_width;
+    box.bottom = priv->crop_h ? (priv->crop_y + priv->crop_h) : screen_height;
+  }
+}
+
+static GstCaps *
+gst_d3d12_screen_capture_src_get_caps (GstBaseSrc * bsrc, GstCaps * filter)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (bsrc);
+  auto priv = self->priv;
+  guint width, height;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  if (!priv->capture) {
+    GST_DEBUG_OBJECT (self, "capture object is not configured yet");
+    return gst_pad_get_pad_template_caps (GST_BASE_SRC_PAD (bsrc));
+  }
+
+  gst_d3d12_screen_capture_src_get_crop_box (self, priv->crop_box);
+  width = priv->crop_box.right - priv->crop_box.left;
+  height = priv->crop_box.bottom - priv->crop_box.top;
+
+  auto caps = gst_pad_get_pad_template_caps (GST_BASE_SRC_PAD (bsrc));
+  caps = gst_caps_make_writable (caps);
+
+  gst_caps_set_simple (caps, "width", G_TYPE_INT, width, "height",
+      G_TYPE_INT, height, nullptr);
+
+  if (filter) {
+    auto tmp = gst_caps_intersect_full (filter, caps, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (caps);
+
+    caps = tmp;
+  }
+
+  return caps;
+}
+
+static GstCaps *
+gst_d3d12_screen_capture_src_fixate (GstBaseSrc * bsrc, GstCaps * caps)
+{
+  GstCaps *d3d12_caps = nullptr;
+
+  caps = gst_caps_make_writable (caps);
+  auto size = gst_caps_get_size (caps);
+
+  for (guint i = 0; i < size; i++) {
+    auto s = gst_caps_get_structure (caps, i);
+    gst_structure_fixate_field_nearest_fraction (s, "framerate", 30, 1);
+
+    if (!d3d12_caps) {
+      auto features = gst_caps_get_features (caps, i);
+
+      if (gst_caps_features_contains (features,
+              GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY)) {
+        d3d12_caps = gst_caps_new_empty ();
+        gst_caps_append_structure (d3d12_caps, gst_structure_copy (s));
+
+        gst_caps_set_features (d3d12_caps, 0,
+            gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY,
+                nullptr));
+        break;
+      }
+    }
+  }
+
+  if (d3d12_caps) {
+    gst_caps_unref (caps);
+    caps = d3d12_caps;
+  }
+
+  return gst_caps_fixate (caps);
+}
+
+static gboolean
+gst_d3d12_screen_capture_src_set_caps (GstBaseSrc * bsrc, GstCaps * caps)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (bsrc);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Set caps %" GST_PTR_FORMAT, caps);
+
+  auto features = gst_caps_get_features (caps, 0);
+  if (gst_caps_features_contains (features,
+          GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY)) {
+    priv->downstream_supports_d3d12 = TRUE;
+  } else {
+    priv->downstream_supports_d3d12 = FALSE;
+  }
+
+  gst_video_info_from_caps (&priv->video_info, caps);
+  gst_base_src_set_blocksize (bsrc, GST_VIDEO_INFO_SIZE (&priv->video_info));
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_screen_capture_src_decide_allocation (GstBaseSrc * bsrc,
+    GstQuery * query)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (bsrc);
+  auto priv = self->priv;
+  GstBufferPool *pool = nullptr;
+  GstStructure *config;
+  GstCaps *caps;
+  guint min, max, size;
+  gboolean update_pool;
+  GstVideoInfo vinfo;
+
+  if (priv->pool) {
+    gst_buffer_pool_set_active (priv->pool, FALSE);
+    gst_clear_object (&priv->pool);
+  }
+
+  gst_query_parse_allocation (query, &caps, nullptr);
+
+  if (!caps) {
+    GST_ERROR_OBJECT (self, "No output caps");
+    return FALSE;
+  }
+
+  gst_video_info_from_caps (&vinfo, caps);
+
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+    update_pool = TRUE;
+  } else {
+    size = GST_VIDEO_INFO_SIZE (&vinfo);
+
+    min = max = 0;
+    update_pool = FALSE;
+  }
+
+  if (pool && priv->downstream_supports_d3d12) {
+    if (!GST_IS_D3D12_BUFFER_POOL (pool)) {
+      gst_clear_object (&pool);
+    } else {
+      auto dpool = GST_D3D12_BUFFER_POOL (pool);
+      if (dpool->device != self->device)
+        gst_clear_object (&pool);
+    }
+  }
+
+  if (!pool) {
+    if (priv->downstream_supports_d3d12)
+      pool = gst_d3d12_buffer_pool_new (self->device);
+    else
+      pool = gst_video_buffer_pool_new ();
+  }
+
+  config = gst_buffer_pool_get_config (pool);
+
+  gst_buffer_pool_config_set_params (config, caps, size, min, max);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+  if (priv->downstream_supports_d3d12) {
+    D3D12_RESOURCE_FLAGS resource_flags =
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS |
+        D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+
+    auto params = gst_buffer_pool_config_get_d3d12_allocation_params (config);
+    if (!params) {
+      params = gst_d3d12_allocation_params_new (self->device, &vinfo,
+          GST_D3D12_ALLOCATION_FLAG_DEFAULT, resource_flags);
+    } else {
+      gst_d3d12_allocation_params_set_resource_flags (params, resource_flags);
+      gst_d3d12_allocation_params_unset_resource_flags (params,
+          D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE);
+    }
+
+    gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+    gst_d3d12_allocation_params_free (params);
+  }
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (self, "Failed to set config");
+    gst_clear_object (&pool);
+    return FALSE;
+  }
+
+  /* d3d12 buffer pool will update buffer size based on allocated texture,
+   * get size from config again */
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  if (!priv->downstream_supports_d3d12) {
+    priv->pool = gst_d3d12_buffer_pool_new (self->device);
+
+    config = gst_buffer_pool_get_config (priv->pool);
+
+    gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+    D3D12_RESOURCE_FLAGS resource_flags =
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS |
+        D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+
+    auto params = gst_d3d12_allocation_params_new (self->device, &vinfo,
+        GST_D3D12_ALLOCATION_FLAG_DEFAULT, resource_flags);
+    gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+    gst_d3d12_allocation_params_free (params);
+
+    if (!gst_buffer_pool_set_config (priv->pool, config)) {
+      GST_ERROR_OBJECT (self, "Failed to set config for internal pool");
+      gst_clear_object (&priv->pool);
+      gst_clear_object (&pool);
+      return FALSE;
+    }
+
+    if (!gst_buffer_pool_set_active (priv->pool, TRUE)) {
+      GST_ERROR_OBJECT (self, "Failed to activate internal pool");
+      gst_clear_object (&pool);
+      return FALSE;
+    }
+  }
+
+  if (update_pool)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_screen_capture_src_start (GstBaseSrc * bsrc)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (bsrc);
+  auto priv = self->priv;
+  GstFlowReturn ret;
+  HMONITOR monitor = priv->monitor_handle;
+  ComPtr < IDXGIAdapter1 > adapter;
+  DXGI_ADAPTER_DESC desc;
+  GstD3D12ScreenCapture *capture = nullptr;
+  HRESULT hr;
+
+  if (monitor) {
+    hr = gst_d3d12_screen_capture_find_output_for_monitor (monitor,
+        &adapter, nullptr);
+  } else if (priv->monitor_index < 0) {
+    hr = gst_d3d12_screen_capture_find_primary_monitor (&monitor,
+        &adapter, nullptr);
+  } else {
+    hr = gst_d3d12_screen_capture_find_nth_monitor (priv->monitor_index,
+        &monitor, &adapter, nullptr);
+  }
+
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (self, "Couldn't get monitor handle");
+    goto error;
+  }
+
+  adapter->GetDesc (&desc);
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    priv->adapter_luid = gst_d3d12_luid_to_int64 (&desc.AdapterLuid);
+    gst_clear_object (&self->device);
+
+    gst_d3d12_ensure_element_data_for_adapter_luid (GST_ELEMENT_CAST (self),
+        priv->adapter_luid, &self->device);
+  }
+
+  if (!self->device) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+        ("D3D12 device is not available"), (nullptr));
+    return FALSE;
+  }
+
+  capture = gst_d3d12_dxgi_capture_new (self->device, monitor);
+  if (!capture) {
+    GST_ERROR_OBJECT (self, "Couldn't create capture object");
+    goto error;
+  }
+
+  /* Check if we can open device */
+  ret = gst_d3d12_screen_capture_prepare (capture);
+  switch (ret) {
+    case GST_D3D12_SCREEN_CAPTURE_FLOW_EXPECTED_ERROR:
+    case GST_FLOW_OK:
+      break;
+    case GST_D3D12_SCREEN_CAPTURE_FLOW_UNSUPPORTED:
+      goto unsupported;
+    default:
+      goto error;
+  }
+
+  priv->last_frame_no = -1;
+  priv->latency = GST_CLOCK_TIME_NONE;
+  priv->capture = capture;
+
+  return TRUE;
+
+error:
+  {
+    gst_clear_object (&capture);
+    GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+        ("Failed to prepare capture object with given configuration, "
+            "monitor-index: %d, monitor-handle: %p",
+            priv->monitor_index, priv->monitor_handle), (nullptr));
+    return FALSE;
+  }
+
+unsupported:
+  {
+    gst_clear_object (&capture);
+    GST_ELEMENT_ERROR (self, RESOURCE, OPEN_READ,
+        ("Failed to prepare capture object with given configuration, "
+            "monitor-index: %d, monitor-handle: %p",
+            priv->monitor_index, priv->monitor_handle),
+        ("Try run the application on the integrated GPU"));
+    return FALSE;
+  }
+}
+
+static gboolean
+gst_d3d12_screen_capture_src_stop (GstBaseSrc * bsrc)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (bsrc);
+  auto priv = self->priv;
+
+  if (priv->pool) {
+    gst_buffer_pool_set_active (priv->pool, FALSE);
+    gst_clear_object (&priv->pool);
+  }
+
+  gst_clear_object (&priv->capture);
+  gst_clear_object (&self->device);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_screen_capture_src_unlock (GstBaseSrc * bsrc)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (bsrc);
+  auto priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->flush_lock);
+  if (priv->clock_id) {
+    GST_DEBUG_OBJECT (self, "Waking up waiting clock");
+    gst_clock_id_unschedule (priv->clock_id);
+  }
+  priv->flushing = TRUE;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_screen_capture_src_unlock_stop (GstBaseSrc * bsrc)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (bsrc);
+  auto priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->flush_lock);
+  priv->flushing = FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_screen_capture_src_src_query (GstBaseSrc * bsrc, GstQuery * query)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (bsrc);
+  auto priv = self->priv;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+    {
+      std::lock_guard < std::recursive_mutex > lk (priv->lock);
+      if (gst_d3d12_handle_context_query (GST_ELEMENT_CAST (self), query,
+              self->device)) {
+        return TRUE;
+      }
+      break;
+    }
+    case GST_QUERY_LATENCY:
+    {
+      std::lock_guard < std::recursive_mutex > lk (priv->lock);
+      if (GST_CLOCK_TIME_IS_VALID (priv->latency)) {
+        gst_query_set_latency (query, TRUE, priv->latency, GST_CLOCK_TIME_NONE);
+        return TRUE;
+      }
+      break;
+    }
+    default:
+      break;
+  }
+
+  return GST_BASE_SRC_CLASS (parent_class)->query (bsrc, query);
+}
+
+static GstFlowReturn
+gst_d3d12_screen_capture_src_create (GstBaseSrc * bsrc, guint64 offset,
+    guint size, GstBuffer ** buf)
+{
+  auto self = GST_D3D12_SCREEN_CAPTURE_SRC (bsrc);
+  auto priv = self->priv;
+  gint fps_n, fps_d;
+  GstFlowReturn ret = GST_FLOW_OK;
+  GstClockTime base_time;
+  GstClockTime next_capture_ts;
+  GstClockTime latency;
+  GstClockTime dur;
+  guint64 next_frame_no;
+  gboolean draw_mouse;
+  /* Just magic number... */
+  gint unsupported_retry_count = 100;
+  GstBuffer *buffer = nullptr;
+  D3D12_BOX crop_box;
+
+  if (!priv->capture) {
+    GST_ELEMENT_ERROR (self, RESOURCE, OPEN_READ,
+        ("Couldn't configure capture object"), (nullptr));
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  fps_n = GST_VIDEO_INFO_FPS_N (&priv->video_info);
+  fps_d = GST_VIDEO_INFO_FPS_D (&priv->video_info);
+
+  if (fps_n <= 0 || fps_d <= 0)
+    return GST_FLOW_NOT_NEGOTIATED;
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    draw_mouse = priv->show_cursor;
+    gst_d3d12_screen_capture_src_get_crop_box (self, crop_box);
+    if (crop_box.left != priv->crop_box.left ||
+        crop_box.right != priv->crop_box.right ||
+        crop_box.top != priv->crop_box.top ||
+        crop_box.bottom != priv->crop_box.bottom) {
+      GST_INFO_OBJECT (self, "Capture area changed, need negotiation");
+      if (!gst_base_src_negotiate (bsrc)) {
+        GST_ERROR_OBJECT (self, "Failed to negotiate with new capture area");
+        return GST_FLOW_NOT_NEGOTIATED;
+      }
+    }
+  }
+
+again:
+  auto clock = gst_element_get_clock (GST_ELEMENT_CAST (self));
+
+  /* Check flushing before waiting clock because we are might be doing
+   * retry */
+  {
+    std::unique_lock < std::mutex > lk (priv->flush_lock);
+    if (priv->flushing) {
+      gst_clear_object (&clock);
+      return GST_FLOW_FLUSHING;
+    }
+
+    base_time = GST_ELEMENT_CAST (self)->base_time;
+    next_capture_ts = gst_clock_get_time (clock);
+    next_capture_ts -= base_time;
+
+    next_frame_no = gst_util_uint64_scale (next_capture_ts,
+        fps_n, GST_SECOND * fps_d);
+
+    if (next_frame_no == priv->last_frame_no) {
+      GstClockID id;
+      GstClockReturn clock_ret;
+
+      /* Need to wait for the next frame */
+      next_frame_no += 1;
+
+      /* Figure out what the next frame time is */
+      next_capture_ts = gst_util_uint64_scale (next_frame_no,
+          fps_d * GST_SECOND, fps_n);
+
+      id = gst_clock_new_single_shot_id (GST_ELEMENT_CLOCK (self),
+          next_capture_ts + base_time);
+      priv->clock_id = id;
+
+      /* release the object lock while waiting */
+      lk.unlock ();
+
+      GST_LOG_OBJECT (self, "Waiting for next frame time %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (next_capture_ts));
+      clock_ret = gst_clock_id_wait (id, nullptr);
+      lk.lock ();
+
+      gst_clock_id_unref (id);
+      priv->clock_id = nullptr;
+
+      if (clock_ret == GST_CLOCK_UNSCHEDULED) {
+        /* Got woken up by the unlock function */
+        gst_clear_object (&clock);
+        return GST_FLOW_FLUSHING;
+      }
+      /* Duration is a complete 1/fps frame duration */
+      dur = gst_util_uint64_scale_int (GST_SECOND, fps_d, fps_n);
+    } else {
+      GstClockTime next_frame_ts;
+
+      GST_LOG_OBJECT (self, "No need to wait for next frame time %"
+          GST_TIME_FORMAT " next frame = %" G_GINT64_FORMAT " prev = %"
+          G_GINT64_FORMAT, GST_TIME_ARGS (next_capture_ts), next_frame_no,
+          priv->last_frame_no);
+
+      next_frame_ts = gst_util_uint64_scale (next_frame_no + 1,
+          fps_d * GST_SECOND, fps_n);
+      /* Frame duration is from now until the next expected capture time */
+      dur = next_frame_ts - next_capture_ts;
+    }
+  }
+  gst_clear_object (&clock);
+
+  priv->last_frame_no = next_frame_no;
+
+  if (!buffer) {
+    if (priv->downstream_supports_d3d12) {
+      ret = GST_BASE_SRC_CLASS (parent_class)->alloc (bsrc,
+          offset, size, &buffer);
+    } else {
+      ret = gst_buffer_pool_acquire_buffer (priv->pool, &buffer, nullptr);
+    }
+
+    if (ret != GST_FLOW_OK)
+      return ret;
+  }
+
+  auto before_capture = gst_util_get_timestamp ();
+  ret = gst_d3d12_screen_capture_do_capture (priv->capture, buffer,
+      &crop_box, draw_mouse);
+
+  switch (ret) {
+    case GST_D3D12_SCREEN_CAPTURE_FLOW_EXPECTED_ERROR:
+      GST_WARNING_OBJECT (self, "Got expected error, try again");
+      goto again;
+    case GST_D3D12_SCREEN_CAPTURE_FLOW_UNSUPPORTED:
+      GST_WARNING_OBJECT (self, "Got DXGI_ERROR_UNSUPPORTED error");
+      unsupported_retry_count--;
+
+      if (unsupported_retry_count < 0) {
+        gst_clear_buffer (&buffer);
+        GST_ERROR_OBJECT (self, "too many DXGI_ERROR_UNSUPPORTED");
+        return GST_FLOW_ERROR;
+      }
+
+      goto again;
+    case GST_D3D12_SCREEN_CAPTURE_FLOW_SIZE_CHANGED:
+      GST_INFO_OBJECT (self, "Size was changed, need negotiation");
+      gst_clear_buffer (&buffer);
+
+      if (!gst_base_src_negotiate (bsrc)) {
+        GST_ERROR_OBJECT (self, "Failed to negotiate with new size");
+        return GST_FLOW_NOT_NEGOTIATED;
+      }
+      goto again;
+    default:
+      break;
+  }
+
+  if (ret != GST_FLOW_OK) {
+    gst_clear_buffer (&buffer);
+    return ret;
+  }
+
+  if (!priv->downstream_supports_d3d12) {
+    GstVideoFrame in_frame, out_frame;
+    GstBuffer *sysmem_buf = nullptr;
+    ret = GST_BASE_SRC_CLASS (parent_class)->alloc (bsrc,
+        offset, size, &sysmem_buf);
+    if (ret != GST_FLOW_OK) {
+      gst_clear_buffer (&buffer);
+      return ret;
+    }
+
+    if (!gst_video_frame_map (&in_frame, &priv->video_info, buffer,
+            GST_MAP_READ)) {
+      GST_ERROR_OBJECT (self, "Couldn't map frame");
+      gst_clear_buffer (&buffer);
+      gst_clear_buffer (&sysmem_buf);
+      return GST_FLOW_ERROR;
+    }
+
+    if (!gst_video_frame_map (&out_frame, &priv->video_info, sysmem_buf,
+            GST_MAP_WRITE)) {
+      GST_ERROR_OBJECT (self, "Couldn't map frame");
+      gst_video_frame_unmap (&in_frame);
+      gst_clear_buffer (&buffer);
+      gst_clear_buffer (&sysmem_buf);
+      return GST_FLOW_ERROR;
+    }
+
+    auto copy_ret = gst_video_frame_copy (&out_frame, &in_frame);
+    gst_video_frame_unmap (&out_frame);
+    gst_video_frame_unmap (&in_frame);
+
+    if (!copy_ret) {
+      GST_ERROR_OBJECT (self, "Couldn't copy frame");
+      gst_clear_buffer (&buffer);
+      gst_clear_buffer (&sysmem_buf);
+      return GST_FLOW_ERROR;
+    }
+
+    gst_buffer_unref (buffer);
+    buffer = sysmem_buf;
+  }
+
+  GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
+  GST_BUFFER_PTS (buffer) = next_capture_ts;
+  GST_BUFFER_DURATION (buffer) = dur;
+
+  auto after_capture = gst_util_get_timestamp ();
+  latency = after_capture - before_capture;
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    if (!GST_CLOCK_TIME_IS_VALID (priv->latency) || priv->latency < latency) {
+      priv->latency = latency;
+      gst_element_post_message (GST_ELEMENT_CAST (self),
+          gst_message_new_latency (GST_OBJECT_CAST (self)));
+    }
+  }
+
+  *buf = buffer;
+
+  return GST_FLOW_OK;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12screencapturesrc.h Added

@@ -0,0 +1,34 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/base/gstbasesrc.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_SCREEN_CAPTURE_SRC (gst_d3d12_screen_capture_src_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12ScreenCaptureSrc, gst_d3d12_screen_capture_src,
+    GST, D3D12_SCREEN_CAPTURE_SRC, GstBaseSrc);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12testsrc.cpp Added

@@ -0,0 +1,2265 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d12testsrc
+ * @title: d3d12testsrc
+ *
+ * The d3d12testsrc element is used to produce test video data
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 d3d12testsrc ! queue ! d3d12videosink
+ * ```
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12testsrc.h"
+#include "gstd3d11on12.h"
+#include "gstd3d12pluginutils.h"
+#include <directx/d3dx12.h>
+#include <wrl.h>
+#include <string.h>
+#include <d3d11.h>
+#include <d2d1.h>
+#include <math.h>
+#include <memory>
+#include <vector>
+#include <queue>
+#include "PSMain_checker.h"
+#include "PSMain_color.h"
+#include "PSMain_snow.h"
+#include "VSMain_color.h"
+#include "VSMain_coord.h"
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_test_src_debug);
+#define GST_CAT_DEFAULT gst_d3d12_test_src_debug
+
+static GstStaticPadTemplate src_template =
+    GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE (GST_D3D12_ALL_FORMATS)));
+
+enum GstD3D12TestSrcPattern
+{
+  GST_D3D12_TEST_SRC_SMPTE,
+  GST_D3D12_TEST_SRC_SNOW,
+  GST_D3D12_TEST_SRC_BLACK,
+  GST_D3D12_TEST_SRC_WHITE,
+  GST_D3D12_TEST_SRC_RED,
+  GST_D3D12_TEST_SRC_GREEN,
+  GST_D3D12_TEST_SRC_BLUE,
+  GST_D3D12_TEST_SRC_CHECKERS1,
+  GST_D3D12_TEST_SRC_CHECKERS2,
+  GST_D3D12_TEST_SRC_CHECKERS4,
+  GST_D3D12_TEST_SRC_CHECKERS8,
+  GST_D3D12_TEST_SRC_CIRCULAR,
+  GST_D3D12_TEST_SRC_BLINK,
+  /* sync with videotestsrc */
+  GST_D3D12_TEST_SRC_BALL = 18,
+};
+
+#define GST_TYPE_D3D12_TEST_SRC_PATTERN (gst_d3d12_test_src_pattern_get_type ())
+static GType
+gst_d3d12_test_src_pattern_get_type (void)
+{
+  static GType pattern_type = 0;
+
+  GST_D3D12_CALL_ONCE_BEGIN {
+    static const GEnumValue pattern_types = {
+      {GST_D3D12_TEST_SRC_SMPTE, "SMPTE 100% color bars", "smpte"},
+      {GST_D3D12_TEST_SRC_SNOW, "Random (television snow)", "snow"},
+      {GST_D3D12_TEST_SRC_BLACK, "100% Black", "black"},
+      {GST_D3D12_TEST_SRC_WHITE, "100% White", "white"},
+      {GST_D3D12_TEST_SRC_RED, "Red", "red"},
+      {GST_D3D12_TEST_SRC_GREEN, "Green", "green"},
+      {GST_D3D12_TEST_SRC_BLUE, "Blue", "blue"},
+      {GST_D3D12_TEST_SRC_CHECKERS1, "Checkers 1px", "checkers-1"},
+      {GST_D3D12_TEST_SRC_CHECKERS2, "Checkers 2px", "checkers-2"},
+      {GST_D3D12_TEST_SRC_CHECKERS4, "Checkers 4px", "checkers-4"},
+      {GST_D3D12_TEST_SRC_CHECKERS8, "Checkers 8px", "checkers-8"},
+      {GST_D3D12_TEST_SRC_CIRCULAR, "Circular", "circular"},
+      {GST_D3D12_TEST_SRC_BLINK, "Blink", "blink"},
+      {GST_D3D12_TEST_SRC_BALL, "Moving ball", "ball"},
+      {0, nullptr, nullptr},
+    };
+
+    pattern_type = g_enum_register_static ("GstD3D12TestSrcPattern",
+        pattern_types);
+  } GST_D3D12_CALL_ONCE_END;
+
+  return pattern_type;
+}
+
+enum
+{
+  PROP_0,
+  PROP_ADAPTER,
+  PROP_IS_LIVE,
+  PROP_PATTERN,
+  PROP_ALPHA,
+  PROP_ALPHA_MODE,
+};
+
+#define DEFAULT_ADAPTER -1
+#define DEFAULT_PATTERN GST_D3D12_TEST_SRC_SMPTE
+#define DEFAULT_ALPHA 1.0f
+
+#define ASYNC_DEPTH 2
+
+struct ColorValue
+{
+  union
+  {
+    struct
+    {
+      FLOAT r;
+      FLOAT g;
+      FLOAT b;
+      FLOAT a;
+    };
+    FLOAT color4;
+  };
+};
+
+static const ColorValue color_table = {
+  /* white */
+  {1.0f, 1.0f, 1.0f, 1.0f},
+  /* yellow */
+  {1.0f, 1.0f, 0.0f, 1.0f},
+  /* cyan */
+  {0.0f, 1.0f, 1.0f, 1.0f},
+  /* green */
+  {0.0f, 1.0f, 0.0f, 1.0f},
+  /* magenta */
+  {1.0f, 0.0f, 1.0f, 1.0f},
+  /* red */
+  {1.0f, 0.0f, 0.0f, 1.0f},
+  /* blue */
+  {0.0f, 0.0f, 1.0f, 1.0f},
+  /* black */
+  {0.0f, 0.0f, 0.0f, 1.0f},
+  /* -I */
+  {0.0, 0.0f, 0.5f, 1.0f},
+  /* +Q */
+  {0.0f, 0.5, 1.0f, 1.0f},
+  /* superblack */
+  {0.0f, 0.0f, 0.0f, 1.0f},
+  /* 7.421875% grey */
+  {19. / 256.0f, 19. / 256.0f, 19. / 256.0, 1.0f},
+};
+
+enum
+{
+  COLOR_WHITE = 0,
+  COLOR_YELLOW,
+  COLOR_CYAN,
+  COLOR_GREEN,
+  COLOR_MAGENTA,
+  COLOR_RED,
+  COLOR_BLUE,
+  COLOR_BLACK,
+  COLOR_NEG_I,
+  COLOR_POS_Q,
+  COLOR_SUPER_BLACK,
+  COLOR_DARK_GREY,
+};
+
+struct SnowConstBuffer
+{
+  FLOAT time = 0.0f;
+  FLOAT alpha = 1.0f;
+};
+
+struct CheckerConstBuffer
+{
+  FLOAT width;
+  FLOAT height;
+  FLOAT checker_size;
+  FLOAT alpha = 1.0f;
+};
+
+struct GstD3D12TestSrcQuad
+{
+  ComPtr < ID3D12RootSignature > rs;
+  ComPtr < ID3D12PipelineState > pso;
+  ComPtr < ID3D12Resource > vertex_index_buf;
+  ComPtr < ID3D12Resource > vertex_index_upload;
+  D3D12_VERTEX_BUFFER_VIEW vbv;
+  D3D12_INDEX_BUFFER_VIEW ibv;
+  guint index_count = 0;
+  gboolean is_checker = FALSE;
+  gboolean is_snow = FALSE;
+  CheckerConstBuffer checker_const_buffer;
+  SnowConstBuffer snow_const_buffer;
+};
+
+struct StaticColor
+{
+  ColorValue value;
+  gboolean is_valid = FALSE;
+};
+
+/* *INDENT-OFF* */
+struct RenderContext
+{
+  RenderContext (GstD3D12Device * dev)
+  {
+    event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+    device = (GstD3D12Device *) gst_object_ref (dev);
+    ca_pool = gst_d3d12_command_allocator_pool_new (device,
+        D3D12_COMMAND_LIST_TYPE_DIRECT);
+  }
+
+  ~RenderContext ()
+  {
+    gst_d3d12_device_fence_wait (device, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        fence_val, event_handle);
+
+    CloseHandle (event_handle);
+
+    /* releasing d3d12/d3d11/d2d shared resource might not thread safe? */
+    gst_d3d12_device_lock (device);
+    brush = nullptr;
+    d2d_target = nullptr;
+    wrapped_texture = nullptr;
+    gst_d3d12_device_unlock (device);
+
+    gst_clear_buffer (&render_buffer);
+
+    if (convert_pool) {
+      gst_buffer_pool_set_active (convert_pool, FALSE);
+      gst_clear_object (&convert_pool);
+    }
+
+    gst_clear_object (&ca_pool);
+    gst_clear_object (&conv);
+    gst_clear_object (&device);
+  }
+
+  GstD3D12Device *device = nullptr;
+  GstD3D12Converter *conv = nullptr;
+  GstBuffer *render_buffer = nullptr;
+  GstBufferPool *convert_pool = nullptr;
+
+  ComPtr<IUnknown> d3d11on12;
+  ComPtr<ID3D11DeviceContext> d3d11_context;
+  ComPtr<ID2D1RenderTarget> d2d_target;
+  ComPtr<ID2D1RadialGradientBrush> brush;
+  gdouble rad;
+  FLOAT x;
+  FLOAT y;
+
+  ComPtr<ID3D12Resource> texture;
+  ComPtr<ID3D12DescriptorHeap> rtv_heap;
+  ComPtr<ID3D11Resource> wrapped_texture;
+
+  ComPtr<ID3D12GraphicsCommandList> cl;
+  std::queue<guint64> scheduled;
+  GstD3D12CommandAllocatorPool *ca_pool;
+
+  D3D12_VIEWPORT viewport;
+  D3D12_RECT scissor_rect;
+
+  StaticColor static_color2;
+  std::vector < std::shared_ptr < GstD3D12TestSrcQuad >> quad;
+  GstD3D12TestSrcPattern pattern;
+  HANDLE event_handle;
+  guint64 fence_val = 0;
+};
+
+struct GstD3D12TestSrcPrivate
+{
+  GstD3D12TestSrcPrivate ()
+  {
+    fence_data_pool = gst_d3d12_fence_data_pool_new ();
+    gst_video_info_init (&info);
+  }
+
+  ~GstD3D12TestSrcPrivate ()
+  {
+    gst_clear_object (&fence_data_pool);
+  }
+
+  gboolean downstream_supports_d3d12 = FALSE;
+
+  GstVideoInfo info;
+
+  GstD3D12FenceDataPool *fence_data_pool;
+
+  gint adapter_index = DEFAULT_ADAPTER;
+  GstD3D12TestSrcPattern pattern = DEFAULT_PATTERN;
+  std::unique_ptr<RenderContext> ctx;
+  D3D12_VIEWPORT viewport;
+  ComPtr<ID2D1Factory> d2d_factory;
+  gfloat alpha = DEFAULT_ALPHA;
+
+  gboolean reverse = FALSE;
+  gint64 n_frames = 0;
+  gint64 accum_frames = 0;
+  GstClockTime accum_rtime = 0;
+  GstClockTime running_time = 0;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12TestSrc
+{
+  GstBaseSrc src;
+
+  GstD3D12Device *device;
+
+  GstD3D12TestSrcPrivate *priv;
+};
+
+struct UvVertexData
+{
+  struct
+  {
+    FLOAT x;
+    FLOAT y;
+    FLOAT z;
+  } position;
+  struct
+  {
+    FLOAT u;
+    FLOAT v;
+  } texture;
+};
+
+struct ColorVertexData
+{
+  struct
+  {
+    FLOAT x;
+    FLOAT y;
+    FLOAT z;
+  } position;
+  struct
+  {
+    FLOAT r;
+    FLOAT g;
+    FLOAT b;
+    FLOAT a;
+  } color;
+};
+
+static const D3D12_ROOT_SIGNATURE_FLAGS g_rs_flags =
+    D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_AMPLIFICATION_SHADER_ROOT_ACCESS |
+    D3D12_ROOT_SIGNATURE_FLAG_DENY_MESH_SHADER_ROOT_ACCESS;
+
+
+static gboolean
+setup_snow_render (GstD3D12TestSrc * self, RenderContext * ctx,
+    gboolean on_smpte)
+{
+  auto priv = self->priv;
+  HRESULT hr;
+  UvVertexData vertex_data4;
+  const WORD indices6 = { 0, 1, 2, 3, 0, 2 };
+
+  CD3DX12_ROOT_PARAMETER param;
+  param.InitAsConstants (2, 0, 0, D3D12_SHADER_VISIBILITY_PIXEL);
+
+  D3D12_VERSIONED_ROOT_SIGNATURE_DESC rs_desc = { };
+  CD3DX12_VERSIONED_ROOT_SIGNATURE_DESC::Init_1_0 (rs_desc,
+      1, &param, 0, nullptr, g_rs_flags);
+
+  ComPtr < ID3DBlob > rs_blob;
+  ComPtr < ID3DBlob > error_blob;
+  hr = D3DX12SerializeVersionedRootSignature (&rs_desc,
+      D3D_ROOT_SIGNATURE_VERSION_1_1, &rs_blob, &error_blob);
+  if (!gst_d3d12_result (hr, self->device)) {
+    const gchar *error_msg = nullptr;
+    if (error_blob)
+      error_msg = (const gchar *) error_blob->GetBufferPointer ();
+
+    GST_ERROR_OBJECT (self, "Couldn't serialize root signature, error: %s",
+        GST_STR_NULL (error_msg));
+    return FALSE;
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  ComPtr < ID3D12RootSignature > rs;
+  hr = device->CreateRootSignature (0, rs_blob->GetBufferPointer (),
+      rs_blob->GetBufferSize (), IID_PPV_ARGS (&rs));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create root signature");
+    return FALSE;
+  }
+
+  D3D12_INPUT_ELEMENT_DESC input_desc2;
+  input_desc0.SemanticName = "POSITION";
+  input_desc0.SemanticIndex = 0;
+  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+  input_desc0.InputSlot = 0;
+  input_desc0.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  input_desc0.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  input_desc0.InstanceDataStepRate = 0;
+
+  input_desc1.SemanticName = "TEXCOORD";
+  input_desc1.SemanticIndex = 0;
+  input_desc1.Format = DXGI_FORMAT_R32G32_FLOAT;
+  input_desc1.InputSlot = 0;
+  input_desc1.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  input_desc1.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  input_desc1.InstanceDataStepRate = 0;
+
+  D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc = { };
+  pso_desc.pRootSignature = rs.Get ();
+  pso_desc.VS.BytecodeLength = sizeof (g_VSMain_coord);
+  pso_desc.VS.pShaderBytecode = g_VSMain_coord;
+  pso_desc.PS.BytecodeLength = sizeof (g_PSMain_snow);
+  pso_desc.PS.pShaderBytecode = g_PSMain_snow;
+  pso_desc.BlendState = CD3DX12_BLEND_DESC (D3D12_DEFAULT);
+  pso_desc.SampleMask = UINT_MAX;
+  pso_desc.RasterizerState = CD3DX12_RASTERIZER_DESC (D3D12_DEFAULT);
+  pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
+  pso_desc.DepthStencilState.DepthEnable = FALSE;
+  pso_desc.DepthStencilState.StencilEnable = FALSE;
+  pso_desc.InputLayout.pInputElementDescs = input_desc;
+  pso_desc.InputLayout.NumElements = G_N_ELEMENTS (input_desc);
+  pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
+  pso_desc.NumRenderTargets = 1;
+  pso_desc.RTVFormats0 = DXGI_FORMAT_B8G8R8A8_UNORM;
+  pso_desc.SampleDesc.Count = 1;
+
+  ComPtr < ID3D12PipelineState > pso;
+  hr = device->CreateGraphicsPipelineState (&pso_desc, IID_PPV_ARGS (&pso));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create pso");
+    return FALSE;
+  }
+
+  if (on_smpte) {
+    FLOAT left, right, top, bottom;
+    FLOAT left_u, right_u, top_v, bottom_v;
+
+    left = 0.5f;
+    right = 1.0f;
+    top = -0.5f;
+    bottom = -1.0f;
+
+    left_u = 3.0f / 4.0f;
+    right_u = 1.0f;
+    top_v = 3.0f / 4.0f;
+    bottom_v = 1.0f;
+
+    /* bottom left */
+    vertex_data0.position.x = left;
+    vertex_data0.position.y = bottom;
+    vertex_data0.position.z = 0.0f;
+    vertex_data0.texture.u = left_u;
+    vertex_data0.texture.v = bottom_v;
+
+    /* top left */
+    vertex_data1.position.x = left;
+    vertex_data1.position.y = top;
+    vertex_data1.position.z = 0.0f;
+    vertex_data1.texture.u = left_u;
+    vertex_data1.texture.v = top_v;
+
+    /* top right */
+    vertex_data2.position.x = right;
+    vertex_data2.position.y = top;
+    vertex_data2.position.z = 0.0f;
+    vertex_data2.texture.u = right_u;
+    vertex_data2.texture.v = top_v;
+
+    /* bottom right */
+    vertex_data3.position.x = right;
+    vertex_data3.position.y = bottom;
+    vertex_data3.position.z = 0.0f;
+    vertex_data3.texture.u = right_u;
+    vertex_data3.texture.v = bottom_v;
+  } else {
+    /* bottom left */
+    vertex_data0.position.x = -1.0f;
+    vertex_data0.position.y = -1.0f;
+    vertex_data0.position.z = 0.0f;
+    vertex_data0.texture.u = 0.0f;
+    vertex_data0.texture.v = 1.0f;
+    /* top left */
+    vertex_data1.position.x = -1.0f;
+    vertex_data1.position.y = 1.0f;
+    vertex_data1.position.z = 0.0f;
+    vertex_data1.texture.u = 0.0f;
+    vertex_data1.texture.v = 0.0f;
+
+    /* top right */
+    vertex_data2.position.x = 1.0f;
+    vertex_data2.position.y = 1.0f;
+    vertex_data2.position.z = 0.0f;
+    vertex_data2.texture.u = 1.0f;
+    vertex_data2.texture.v = 0.0f;
+
+    /* bottom right */
+    vertex_data3.position.x = 1.0f;
+    vertex_data3.position.y = -1.0f;
+    vertex_data3.position.z = 0.0f;
+    vertex_data3.texture.u = 1.0f;
+    vertex_data3.texture.v = 1.0f;
+  }
+
+  D3D12_HEAP_PROPERTIES heap_prop =
+      CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+  D3D12_RESOURCE_DESC buffer_desc =
+      CD3DX12_RESOURCE_DESC::Buffer (sizeof (UvVertexData) * 4
+      + sizeof (indices));
+  ComPtr < ID3D12Resource > vertex_index_upload;
+  hr = device->CreateCommittedResource (&heap_prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &buffer_desc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+      IID_PPV_ARGS (&vertex_index_upload));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create index buffer");
+    return FALSE;
+  }
+
+  guint8 *data;
+  CD3DX12_RANGE range (0, 0);
+  hr = vertex_index_upload->Map (0, &range, (void **) &data);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't map index buffer");
+    return FALSE;
+  }
+
+  memcpy (data, vertex_data, sizeof (UvVertexData) * 4);
+  memcpy (data + sizeof (UvVertexData) * 4, indices, sizeof (indices));
+  vertex_index_upload->Unmap (0, nullptr);
+
+  heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+  ComPtr < ID3D12Resource > vertex_index_buf;
+  hr = device->CreateCommittedResource (&heap_prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &buffer_desc, D3D12_RESOURCE_STATE_COMMON, nullptr,
+      IID_PPV_ARGS (&vertex_index_buf));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create index buffer");
+    return FALSE;
+  }
+
+  auto quad = std::make_shared < GstD3D12TestSrcQuad > ();
+
+  quad->rs = rs;
+  quad->pso = pso;
+  quad->vertex_index_buf = vertex_index_buf;
+  quad->vertex_index_upload = vertex_index_upload;
+  quad->vbv.BufferLocation = vertex_index_buf->GetGPUVirtualAddress ();
+  quad->vbv.SizeInBytes = sizeof (UvVertexData) * 4;
+  quad->vbv.StrideInBytes = sizeof (UvVertexData);
+  quad->ibv.BufferLocation = quad->vbv.BufferLocation + quad->vbv.SizeInBytes;
+  quad->ibv.SizeInBytes = sizeof (indices);
+  quad->ibv.Format = DXGI_FORMAT_R16_UINT;
+  quad->index_count = 6;
+  quad->is_snow = TRUE;
+  quad->snow_const_buffer.time = 0;
+  quad->snow_const_buffer.alpha = priv->alpha;
+
+  ctx->quad.push_back (quad);
+
+  return TRUE;
+}
+
+static gboolean
+setup_smpte_render (GstD3D12TestSrc * self, RenderContext * ctx)
+{
+  auto priv = self->priv;
+  HRESULT hr;
+  ColorVertexData vertex_data4 * 20;
+  WORD indices6 * 20;
+  guint num_vertex = 0;
+  guint num_index = 0;
+
+  D3D12_VERSIONED_ROOT_SIGNATURE_DESC rs_desc = { };
+  CD3DX12_VERSIONED_ROOT_SIGNATURE_DESC::Init_1_0 (rs_desc,
+      0, nullptr, 0, nullptr, g_rs_flags);
+
+  ComPtr < ID3DBlob > rs_blob;
+  ComPtr < ID3DBlob > error_blob;
+  hr = D3DX12SerializeVersionedRootSignature (&rs_desc,
+      D3D_ROOT_SIGNATURE_VERSION_1_1, &rs_blob, &error_blob);
+  if (!gst_d3d12_result (hr, self->device)) {
+    const gchar *error_msg = nullptr;
+    if (error_blob)
+      error_msg = (const gchar *) error_blob->GetBufferPointer ();
+
+    GST_ERROR_OBJECT (self, "Couldn't serialize root signature, error: %s",
+        GST_STR_NULL (error_msg));
+    return FALSE;
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  ComPtr < ID3D12RootSignature > rs;
+  hr = device->CreateRootSignature (0, rs_blob->GetBufferPointer (),
+      rs_blob->GetBufferSize (), IID_PPV_ARGS (&rs));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create root signature");
+    return FALSE;
+  }
+
+  D3D12_INPUT_ELEMENT_DESC input_desc2;
+  input_desc0.SemanticName = "POSITION";
+  input_desc0.SemanticIndex = 0;
+  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+  input_desc0.InputSlot = 0;
+  input_desc0.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  input_desc0.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  input_desc0.InstanceDataStepRate = 0;
+
+  input_desc1.SemanticName = "COLOR";
+  input_desc1.SemanticIndex = 0;
+  input_desc1.Format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+  input_desc1.InputSlot = 0;
+  input_desc1.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  input_desc1.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  input_desc1.InstanceDataStepRate = 0;
+
+  D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc = { };
+  pso_desc.pRootSignature = rs.Get ();
+  pso_desc.VS.BytecodeLength = sizeof (g_VSMain_color);
+  pso_desc.VS.pShaderBytecode = g_VSMain_color;
+  pso_desc.PS.BytecodeLength = sizeof (g_PSMain_color);
+  pso_desc.PS.pShaderBytecode = g_PSMain_color;
+  pso_desc.BlendState = CD3DX12_BLEND_DESC (D3D12_DEFAULT);
+  pso_desc.SampleMask = UINT_MAX;
+  pso_desc.RasterizerState = CD3DX12_RASTERIZER_DESC (D3D12_DEFAULT);
+  pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
+  pso_desc.DepthStencilState.DepthEnable = FALSE;
+  pso_desc.DepthStencilState.StencilEnable = FALSE;
+  pso_desc.InputLayout.pInputElementDescs = input_desc;
+  pso_desc.InputLayout.NumElements = G_N_ELEMENTS (input_desc);
+  pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
+  pso_desc.NumRenderTargets = 1;
+  pso_desc.RTVFormats0 = DXGI_FORMAT_B8G8R8A8_UNORM;
+  pso_desc.SampleDesc.Count = 1;
+
+  ComPtr < ID3D12PipelineState > pso;
+  hr = device->CreateGraphicsPipelineState (&pso_desc, IID_PPV_ARGS (&pso));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create pso");
+    return FALSE;
+  }
+
+  /* top row */
+  for (guint i = 0; i < 7; i++) {
+    FLOAT left, right, top, bottom;
+    FLOAT scale = 2.0f / 7.0f;
+    guint base = i * 4;
+    guint idx_base = i * 6;
+    const ColorValue *color = &color_tablei;
+
+    left = -1.0f + i * scale;
+    right = -1.0f + (i + 1) * scale;
+    top = 1.0f;
+    bottom = -1.0f / 3.0f;
+
+    /* bottom left */
+    vertex_database.position.x = left;
+    vertex_database.position.y = bottom;
+    vertex_database.position.z = 0.0f;
+    vertex_database.color.r = color->r;
+    vertex_database.color.g = color->g;
+    vertex_database.color.b = color->b;
+    vertex_database.color.a = priv->alpha;
+
+    /* top left */
+    vertex_database + 1.position.x = left;
+    vertex_database + 1.position.y = top;
+    vertex_database + 1.position.z = 0.0f;
+    vertex_database + 1.color = vertex_database.color;
+    vertex_database + 1.color.a = priv->alpha;
+
+    /* top right */
+    vertex_database + 2.position.x = right;
+    vertex_database + 2.position.y = top;
+    vertex_database + 2.position.z = 0.0f;
+    vertex_database + 2.color = vertex_database.color;
+    vertex_database + 2.color.a = priv->alpha;
+
+    /* bottom right */
+    vertex_database + 3.position.x = right;
+    vertex_database + 3.position.y = bottom;
+    vertex_database + 3.position.z = 0.0f;
+    vertex_database + 3.color = vertex_database.color;
+    vertex_database + 3.color.a = priv->alpha;
+
+    /* clockwise indexing */
+    indicesidx_base = base;   /* bottom left */
+    indicesidx_base + 1 = base + 1;   /* top left */
+    indicesidx_base + 2 = base + 2;   /* top right */
+
+    indicesidx_base + 3 = base + 3;   /* bottom right */
+    indicesidx_base + 4 = base;       /* bottom left  */
+    indicesidx_base + 5 = base + 2;   /* top right */
+  }
+  num_vertex += 4 * 7;
+  num_index += 6 * 7;
+
+  /* middle row */
+  for (guint i = 0; i < 7; i++) {
+    FLOAT left, right, top, bottom;
+    FLOAT scale = 2.0f / 7.0f;
+    guint base = i * 4 + num_vertex;
+    guint idx_base = i * 6 + num_index;
+    const ColorValue *color;
+
+    if ((i % 2) != 0)
+      color = &color_tableCOLOR_BLACK;
+    else
+      color = &color_tableCOLOR_BLUE - i;
+
+    left = -1.0f + i * scale;
+    right = -1.0f + (i + 1) * scale;
+    top = -1.0f / 3.0f;
+    bottom = -0.5f;
+
+    /* bottom left */
+    vertex_database.position.x = left;
+    vertex_database.position.y = bottom;
+    vertex_database.position.z = 0.0f;
+    vertex_database.color.r = color->r;
+    vertex_database.color.g = color->g;
+    vertex_database.color.b = color->b;
+    vertex_database.color.a = priv->alpha;
+
+    /* top left */
+    vertex_database + 1.position.x = left;
+    vertex_database + 1.position.y = top;
+    vertex_database + 1.position.z = 0.0f;
+    vertex_database + 1.color = vertex_database.color;
+    vertex_database + 1.color.a = priv->alpha;
+
+    /* top right */
+    vertex_database + 2.position.x = right;
+    vertex_database + 2.position.y = top;
+    vertex_database + 2.position.z = 0.0f;
+    vertex_database + 2.color = vertex_database.color;
+    vertex_database + 2.color.a = priv->alpha;
+
+    /* bottom right */
+    vertex_database + 3.position.x = right;
+    vertex_database + 3.position.y = bottom;
+    vertex_database + 3.position.z = 0.0f;
+    vertex_database + 3.color = vertex_database.color;
+    vertex_database + 3.color.a = priv->alpha;
+
+    /* clockwise indexing */
+    indicesidx_base = base;   /* bottom left */
+    indicesidx_base + 1 = base + 1;   /* top left */
+    indicesidx_base + 2 = base + 2;   /* top right */
+
+    indicesidx_base + 3 = base + 3;   /* bottom right */
+    indicesidx_base + 4 = base;       /* bottom left  */
+    indicesidx_base + 5 = base + 2;   /* top right */
+  }
+  num_vertex += 4 * 7;
+  num_index += 6 * 7;
+
+  /* bottom row, left three */
+  for (guint i = 0; i < 3; i++) {
+    FLOAT left, right, top, bottom;
+    FLOAT scale = 1.0f / 3.0f;
+    guint base = i * 4 + num_vertex;
+    guint idx_base = i * 6 + num_index;
+    const ColorValue *color;
+
+    if (i == 0)
+      color = &color_tableCOLOR_NEG_I;
+    else if (i == 1)
+      color = &color_tableCOLOR_WHITE;
+    else
+      color = &color_tableCOLOR_POS_Q;
+
+    left = -1.0f + i * scale;
+    right = -1.0f + (i + 1) * scale;
+    top = -0.5f;
+    bottom = -1.0f;
+
+    /* bottom left */
+    vertex_database.position.x = left;
+    vertex_database.position.y = bottom;
+    vertex_database.position.z = 0.0f;
+    vertex_database.color.r = color->r;
+    vertex_database.color.g = color->g;
+    vertex_database.color.b = color->b;
+    vertex_database.color.a = priv->alpha;
+
+    /* top left */
+    vertex_database + 1.position.x = left;
+    vertex_database + 1.position.y = top;
+    vertex_database + 1.position.z = 0.0f;
+    vertex_database + 1.color = vertex_database.color;
+    vertex_database + 1.color.a = priv->alpha;
+
+    /* top right */
+    vertex_database + 2.position.x = right;
+    vertex_database + 2.position.y = top;
+    vertex_database + 2.position.z = 0.0f;
+    vertex_database + 2.color = vertex_database.color;
+    vertex_database + 2.color.a = priv->alpha;
+
+    /* bottom right */
+    vertex_database + 3.position.x = right;
+    vertex_database + 3.position.y = bottom;
+    vertex_database + 3.position.z = 0.0f;
+    vertex_database + 3.color = vertex_database.color;
+    vertex_database + 3.color.a = priv->alpha;
+
+    /* clockwise indexing */
+    indicesidx_base = base;   /* bottom left */
+    indicesidx_base + 1 = base + 1;   /* top left */
+    indicesidx_base + 2 = base + 2;   /* top right */
+
+    indicesidx_base + 3 = base + 3;   /* bottom right */
+    indicesidx_base + 4 = base;       /* bottom left  */
+    indicesidx_base + 5 = base + 2;   /* top right */
+  }
+  num_vertex += 4 * 3;
+  num_index += 6 * 3;
+
+  /* bottom row, middle three */
+  for (guint i = 0; i < 3; i++) {
+    FLOAT left, right, top, bottom;
+    FLOAT scale = 1.0f / 6.0f;
+    guint base = i * 4 + num_vertex;
+    guint idx_base = i * 6 + num_index;
+    const ColorValue *color;
+
+    if (i == 0)
+      color = &color_tableCOLOR_SUPER_BLACK;
+    else if (i == 1)
+      color = &color_tableCOLOR_BLACK;
+    else
+      color = &color_tableCOLOR_DARK_GREY;
+
+    left = i * scale;
+    right = (i + 1) * scale;
+    top = -0.5f;
+    bottom = -1.0f;
+
+    /* bottom left */
+    vertex_database.position.x = left;
+    vertex_database.position.y = bottom;
+    vertex_database.position.z = 0.0f;
+    vertex_database.color.r = color->r;
+    vertex_database.color.g = color->g;
+    vertex_database.color.b = color->b;
+    vertex_database.color.a = priv->alpha;
+
+    /* top left */
+    vertex_database + 1.position.x = left;
+    vertex_database + 1.position.y = top;
+    vertex_database + 1.position.z = 0.0f;
+    vertex_database + 1.color = vertex_database.color;
+    vertex_database + 1.color.a = priv->alpha;
+
+    /* top right */
+    vertex_database + 2.position.x = right;
+    vertex_database + 2.position.y = top;
+    vertex_database + 2.position.z = 0.0f;
+    vertex_database + 2.color = vertex_database.color;
+    vertex_database + 2.color.a = priv->alpha;
+
+    /* bottom right */
+    vertex_database + 3.position.x = right;
+    vertex_database + 3.position.y = bottom;
+    vertex_database + 3.position.z = 0.0f;
+    vertex_database + 3.color = vertex_database.color;
+    vertex_database + 3.color.a = priv->alpha;
+
+    /* clockwise indexing */
+    indicesidx_base = base;   /* bottom left */
+    indicesidx_base + 1 = base + 1;   /* top left */
+    indicesidx_base + 2 = base + 2;   /* top right */
+
+    indicesidx_base + 3 = base + 3;   /* bottom right */
+    indicesidx_base + 4 = base;       /* bottom left  */
+    indicesidx_base + 5 = base + 2;   /* top right */
+  }
+
+  D3D12_HEAP_PROPERTIES heap_prop =
+      CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+  D3D12_RESOURCE_DESC buffer_desc =
+      CD3DX12_RESOURCE_DESC::Buffer (sizeof (ColorVertexData) * 4 * 20
+      + sizeof (WORD) * 6 * 20);
+  ComPtr < ID3D12Resource > vertex_index_upload;
+  hr = device->CreateCommittedResource (&heap_prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &buffer_desc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+      IID_PPV_ARGS (&vertex_index_upload));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create index buffer");
+    return FALSE;
+  }
+
+  guint8 *data;
+  CD3DX12_RANGE range (0, 0);
+  hr = vertex_index_upload->Map (0, &range, (void **) &data);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't map index buffer");
+    return FALSE;
+  }
+
+  memcpy (data, vertex_data, sizeof (ColorVertexData) * 4 * 20);
+  memcpy (data + sizeof (ColorVertexData) * 4 * 20, indices,
+      sizeof (WORD) * 6 * 20);
+  vertex_index_upload->Unmap (0, nullptr);
+
+  heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+  ComPtr < ID3D12Resource > vertex_index_buf;
+  hr = device->CreateCommittedResource (&heap_prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &buffer_desc, D3D12_RESOURCE_STATE_COMMON, nullptr,
+      IID_PPV_ARGS (&vertex_index_buf));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create index buffer");
+    return FALSE;
+  }
+
+  auto quad = std::make_shared < GstD3D12TestSrcQuad > ();
+
+  quad->rs = rs;
+  quad->pso = pso;
+  quad->vertex_index_buf = vertex_index_buf;
+  quad->vertex_index_upload = vertex_index_upload;
+  quad->vbv.BufferLocation = vertex_index_buf->GetGPUVirtualAddress ();
+  quad->vbv.SizeInBytes = sizeof (ColorVertexData) * 4 * 20;
+  quad->vbv.StrideInBytes = sizeof (ColorVertexData);
+  quad->ibv.BufferLocation = quad->vbv.BufferLocation + quad->vbv.SizeInBytes;
+  quad->ibv.SizeInBytes = sizeof (WORD) * 6 * 20;
+  quad->ibv.Format = DXGI_FORMAT_R16_UINT;
+  quad->index_count = 6 * 20;
+
+  ctx->quad.push_back (quad);
+
+  return setup_snow_render (self, ctx, TRUE);
+}
+
+static gboolean
+setup_checker_render (GstD3D12TestSrc * self, RenderContext * ctx,
+    guint checker_size)
+{
+  auto priv = self->priv;
+  HRESULT hr;
+  UvVertexData vertex_data4;
+  const WORD indices6 = { 0, 1, 2, 3, 0, 2 };
+
+  CD3DX12_ROOT_PARAMETER param;
+  param.InitAsConstants (4, 0, 0, D3D12_SHADER_VISIBILITY_PIXEL);
+
+  D3D12_VERSIONED_ROOT_SIGNATURE_DESC rs_desc = { };
+  CD3DX12_VERSIONED_ROOT_SIGNATURE_DESC::Init_1_0 (rs_desc,
+      1, &param, 0, nullptr, g_rs_flags);
+
+  ComPtr < ID3DBlob > rs_blob;
+  ComPtr < ID3DBlob > error_blob;
+  hr = D3DX12SerializeVersionedRootSignature (&rs_desc,
+      D3D_ROOT_SIGNATURE_VERSION_1_1, &rs_blob, &error_blob);
+  if (!gst_d3d12_result (hr, self->device)) {
+    const gchar *error_msg = nullptr;
+    if (error_blob)
+      error_msg = (const gchar *) error_blob->GetBufferPointer ();
+
+    GST_ERROR_OBJECT (self, "Couldn't serialize root signature, error: %s",
+        GST_STR_NULL (error_msg));
+    return FALSE;
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  ComPtr < ID3D12RootSignature > rs;
+  hr = device->CreateRootSignature (0, rs_blob->GetBufferPointer (),
+      rs_blob->GetBufferSize (), IID_PPV_ARGS (&rs));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create root signature");
+    return FALSE;
+  }
+
+  D3D12_INPUT_ELEMENT_DESC input_desc2;
+  input_desc0.SemanticName = "POSITION";
+  input_desc0.SemanticIndex = 0;
+  input_desc0.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+  input_desc0.InputSlot = 0;
+  input_desc0.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  input_desc0.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  input_desc0.InstanceDataStepRate = 0;
+
+  input_desc1.SemanticName = "TEXCOORD";
+  input_desc1.SemanticIndex = 0;
+  input_desc1.Format = DXGI_FORMAT_R32G32_FLOAT;
+  input_desc1.InputSlot = 0;
+  input_desc1.AlignedByteOffset = D3D12_APPEND_ALIGNED_ELEMENT;
+  input_desc1.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
+  input_desc1.InstanceDataStepRate = 0;
+
+  D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc = { };
+  pso_desc.pRootSignature = rs.Get ();
+  pso_desc.VS.BytecodeLength = sizeof (g_VSMain_coord);
+  pso_desc.VS.pShaderBytecode = g_VSMain_coord;
+  pso_desc.PS.BytecodeLength = sizeof (g_PSMain_checker);
+  pso_desc.PS.pShaderBytecode = g_PSMain_checker;
+  pso_desc.BlendState = CD3DX12_BLEND_DESC (D3D12_DEFAULT);
+  pso_desc.SampleMask = UINT_MAX;
+  pso_desc.RasterizerState = CD3DX12_RASTERIZER_DESC (D3D12_DEFAULT);
+  pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE;
+  pso_desc.DepthStencilState.DepthEnable = FALSE;
+  pso_desc.DepthStencilState.StencilEnable = FALSE;
+  pso_desc.InputLayout.pInputElementDescs = input_desc;
+  pso_desc.InputLayout.NumElements = G_N_ELEMENTS (input_desc);
+  pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
+  pso_desc.NumRenderTargets = 1;
+  pso_desc.RTVFormats0 = DXGI_FORMAT_B8G8R8A8_UNORM;
+  pso_desc.SampleDesc.Count = 1;
+
+  ComPtr < ID3D12PipelineState > pso;
+  hr = device->CreateGraphicsPipelineState (&pso_desc, IID_PPV_ARGS (&pso));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create pso");
+    return FALSE;
+  }
+
+  /* bottom left */
+  vertex_data0.position.x = -1.0f;
+  vertex_data0.position.y = -1.0f;
+  vertex_data0.position.z = 0.0f;
+  vertex_data0.texture.u = 0.0f;
+  vertex_data0.texture.v = 1.0f;
+  /* top left */
+  vertex_data1.position.x = -1.0f;
+  vertex_data1.position.y = 1.0f;
+  vertex_data1.position.z = 0.0f;
+  vertex_data1.texture.u = 0.0f;
+  vertex_data1.texture.v = 0.0f;
+
+  /* top right */
+  vertex_data2.position.x = 1.0f;
+  vertex_data2.position.y = 1.0f;
+  vertex_data2.position.z = 0.0f;
+  vertex_data2.texture.u = 1.0f;
+  vertex_data2.texture.v = 0.0f;
+
+  /* bottom right */
+  vertex_data3.position.x = 1.0f;
+  vertex_data3.position.y = -1.0f;
+  vertex_data3.position.z = 0.0f;
+  vertex_data3.texture.u = 1.0f;
+  vertex_data3.texture.v = 1.0f;
+
+  D3D12_HEAP_PROPERTIES heap_prop =
+      CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_UPLOAD);
+  D3D12_RESOURCE_DESC buffer_desc =
+      CD3DX12_RESOURCE_DESC::Buffer (sizeof (UvVertexData) * 4
+      + sizeof (indices));
+  ComPtr < ID3D12Resource > vertex_index_upload;
+  hr = device->CreateCommittedResource (&heap_prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &buffer_desc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr,
+      IID_PPV_ARGS (&vertex_index_upload));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create index buffer");
+    return FALSE;
+  }
+
+  guint8 *data;
+  CD3DX12_RANGE range (0, 0);
+  hr = vertex_index_upload->Map (0, &range, (void **) &data);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't map index buffer");
+    return FALSE;
+  }
+
+  memcpy (data, vertex_data, sizeof (UvVertexData) * 4);
+  memcpy (data + sizeof (UvVertexData) * 4, indices, sizeof (indices));
+  vertex_index_upload->Unmap (0, nullptr);
+
+  heap_prop = CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+  ComPtr < ID3D12Resource > vertex_index_buf;
+  hr = device->CreateCommittedResource (&heap_prop,
+      D3D12_HEAP_FLAG_CREATE_NOT_ZEROED,
+      &buffer_desc, D3D12_RESOURCE_STATE_COMMON, nullptr,
+      IID_PPV_ARGS (&vertex_index_buf));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create index buffer");
+    return FALSE;
+  }
+
+  auto quad = std::make_shared < GstD3D12TestSrcQuad > ();
+
+  quad->rs = rs;
+  quad->pso = pso;
+  quad->vertex_index_buf = vertex_index_buf;
+  quad->vertex_index_upload = vertex_index_upload;
+  quad->vbv.BufferLocation = vertex_index_buf->GetGPUVirtualAddress ();
+  quad->vbv.SizeInBytes = sizeof (UvVertexData) * 4;
+  quad->vbv.StrideInBytes = sizeof (UvVertexData);
+  quad->ibv.BufferLocation = quad->vbv.BufferLocation + quad->vbv.SizeInBytes;
+  quad->ibv.SizeInBytes = sizeof (indices);
+  quad->ibv.Format = DXGI_FORMAT_R16_UINT;
+  quad->index_count = 6;
+  quad->is_checker = TRUE;
+  quad->checker_const_buffer.width = priv->info.width;
+  quad->checker_const_buffer.height = priv->info.height;
+  quad->checker_const_buffer.checker_size = checker_size;
+  quad->checker_const_buffer.alpha = priv->alpha;
+
+  ctx->quad.push_back (quad);
+
+  return TRUE;
+}
+
+static gboolean
+setup_d2d_render (GstD3D12TestSrc * self, RenderContext * ctx)
+{
+  auto priv = self->priv;
+  HRESULT hr;
+
+  if (!priv->d2d_factory) {
+    ComPtr < ID2D1Factory > d2d_factory;
+    hr = D2D1CreateFactory (D2D1_FACTORY_TYPE_MULTI_THREADED,
+        IID_PPV_ARGS (&d2d_factory));
+
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create D2D factory");
+      return FALSE;
+    }
+
+    priv->d2d_factory = d2d_factory;
+  }
+
+  hr = gst_d3d12_device_get_d3d11on12_device (self->device, &ctx->d3d11on12);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't get d3d11on12 device");
+    return FALSE;
+  }
+
+  ComPtr < ID3D11Device > d3d11dev;
+  hr = ctx->d3d11on12.As (&d3d11dev);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't get d3d11 device");
+    return FALSE;
+  }
+
+  d3d11dev->GetImmediateContext (&ctx->d3d11_context);
+
+  hr = GstD3D11On12CreateWrappedResource (ctx->d3d11on12.Get (),
+      ctx->texture.Get (),
+      D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE,
+      D3D11_RESOURCE_MISC_SHARED, 0, 0,
+      D3D12_RESOURCE_STATE_RENDER_TARGET,
+      D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, &ctx->wrapped_texture);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create wrapped resource");
+    return FALSE;
+  }
+
+  ComPtr < IDXGISurface > surface;
+  hr = ctx->wrapped_texture.As (&surface);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't get DXGI surface");
+    return FALSE;
+  }
+
+  D2D1_RENDER_TARGET_PROPERTIES props = { };
+  props.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
+  props.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM;
+  props.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED;
+  props.dpiX = 0;
+  props.dpiY = 0;
+  props.usage = D2D1_RENDER_TARGET_USAGE_NONE;
+  props.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
+
+  hr = priv->d2d_factory->CreateDxgiSurfaceRenderTarget (surface.Get (),
+      &props, &ctx->d2d_target);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create d2d render target");
+    return FALSE;
+  }
+
+  switch (ctx->pattern) {
+    case GST_D3D12_TEST_SRC_BALL:
+    {
+      D2D1_GRADIENT_STOP stops3;
+      stops0.color = D2D1::ColorF (D2D1::ColorF::White, priv->alpha);
+      stops0.position = 0.0f;
+      stops1.color = D2D1::ColorF (D2D1::ColorF::Snow, priv->alpha);
+      stops1.position = 0.3f;
+      stops2.color = D2D1::ColorF (D2D1::ColorF::Black, priv->alpha);
+      stops2.position = 1.0f;
+
+      ComPtr < ID2D1GradientStopCollection > collection;
+      hr = ctx->d2d_target->CreateGradientStopCollection (stops,
+          G_N_ELEMENTS (stops), D2D1_GAMMA_1_0, D2D1_EXTEND_MODE_CLAMP,
+          &collection);
+      if (!gst_d3d12_result (hr, self->device)) {
+        GST_ERROR_OBJECT (self, "Couldn't create stop collection");
+        return FALSE;
+      }
+
+      hr = ctx->
+          d2d_target->CreateRadialGradientBrush (D2D1::
+          RadialGradientBrushProperties (D2D1::Point2F (0, 0), D2D1::Point2F (0,
+                  0), 20, 20), collection.Get (), &ctx->brush);
+      if (!gst_d3d12_result (hr, self->device)) {
+        GST_ERROR_OBJECT (self, "Couldn't create brush");
+        return FALSE;
+      }
+      break;
+    }
+    case GST_D3D12_TEST_SRC_CIRCULAR:
+    {
+      D2D1_GRADIENT_STOP stops129;
+      FLOAT position = 1.0f;
+
+      for (guint i = 0; i < G_N_ELEMENTS (stops); i++) {
+        FLOAT diff;
+        if ((i % 2) == 0)
+          stopsi.color = D2D1::ColorF (D2D1::ColorF::Black, priv->alpha);
+        else
+          stopsi.color = D2D1::ColorF (D2D1::ColorF::White, priv->alpha);
+
+        stopsi.position = position;
+        diff = position / G_N_ELEMENTS (stops) * 2;
+        position -= diff;
+      }
+
+      ComPtr < ID2D1GradientStopCollection > collection;
+      hr = ctx->d2d_target->CreateGradientStopCollection (stops,
+          G_N_ELEMENTS (stops), D2D1_GAMMA_1_0, D2D1_EXTEND_MODE_CLAMP,
+          &collection);
+      if (!gst_d3d12_result (hr, self->device)) {
+        GST_ERROR_OBJECT (self, "Couldn't create stop collection");
+        return FALSE;
+      }
+
+      ctx->x = priv->info.width / 2;
+      ctx->y = priv->info.height / 2;
+      ctx->rad = MAX (ctx->x, ctx->y);
+
+      hr = ctx->
+          d2d_target->CreateRadialGradientBrush (D2D1::
+          RadialGradientBrushProperties (D2D1::Point2F (ctx->x, ctx->y),
+              D2D1::Point2F (0, 0), ctx->rad, ctx->rad), collection.Get (),
+          &ctx->brush);
+      if (!gst_d3d12_result (hr, self->device)) {
+        GST_ERROR_OBJECT (self, "Couldn't create brush");
+        return FALSE;
+      }
+      break;
+    }
+    default:
+      g_assert_not_reached ();
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+static void gst_d3d12_test_src_finalize (GObject * object);
+static void gst_d3d12_test_src_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_d3d12_test_src_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+
+static void gst_d3d12_test_src_set_context (GstElement * element,
+    GstContext * context);
+
+static gboolean gst_d3d12_test_src_is_seekable (GstBaseSrc * bsrc);
+static gboolean gst_d3d12_test_src_do_seek (GstBaseSrc * bsrc,
+    GstSegment * segment);
+static GstCaps *gst_d3d12_test_src_fixate (GstBaseSrc * bsrc, GstCaps * caps);
+static gboolean gst_d3d12_test_src_set_caps (GstBaseSrc * bsrc, GstCaps * caps);
+static gboolean gst_d3d12_test_src_decide_allocation (GstBaseSrc *
+    bsrc, GstQuery * query);
+static gboolean gst_d3d12_test_src_start (GstBaseSrc * bsrc);
+static gboolean gst_d3d12_test_src_stop (GstBaseSrc * bsrc);
+static gboolean gst_d3d12_test_src_src_query (GstBaseSrc * bsrc,
+    GstQuery * query);
+static void gst_d3d12_test_src_get_times (GstBaseSrc * bsrc,
+    GstBuffer * buffer, GstClockTime * start, GstClockTime * end);
+static GstFlowReturn gst_d3d12_test_src_create (GstBaseSrc * bsrc,
+    guint64 offset, guint size, GstBuffer ** buf);
+
+#define gst_d3d12_test_src_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12TestSrc, gst_d3d12_test_src, GST_TYPE_BASE_SRC);
+
+static void
+gst_d3d12_test_src_class_init (GstD3D12TestSrcClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto element_class = GST_ELEMENT_CLASS (klass);
+  auto basesrc_class = GST_BASE_SRC_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_test_src_finalize;
+  object_class->set_property = gst_d3d12_test_src_set_property;
+  object_class->get_property = gst_d3d12_test_src_get_property;
+
+  g_object_class_install_property (object_class, PROP_ADAPTER,
+      g_param_spec_int ("adapter", "Adapter",
+          "DXGI Adapter index (-1 for any device)",
+          -1, G_MAXINT32, DEFAULT_ADAPTER,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property (object_class, PROP_IS_LIVE,
+      g_param_spec_boolean ("is-live", "Is Live",
+          "Whether to act as a live source", FALSE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property (object_class, PROP_PATTERN,
+      g_param_spec_enum ("pattern", "Pattern",
+          "Type of test pattern to generate", GST_TYPE_D3D12_TEST_SRC_PATTERN,
+          DEFAULT_PATTERN,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property (object_class, PROP_ALPHA,
+      g_param_spec_float ("alpha", "Alpha", "Global alpha value to use",
+          0, 1, DEFAULT_ALPHA,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_test_src_set_context);
+
+  gst_element_class_set_static_metadata (element_class,
+      "Direct3D12 Test Source", "Source/Video",
+      "Creates a test video stream", "Seungha Yang <seungha@centricular.com>");
+
+  gst_element_class_add_static_pad_template (element_class, &src_template);
+
+  basesrc_class->is_seekable =
+      GST_DEBUG_FUNCPTR (gst_d3d12_test_src_is_seekable);
+  basesrc_class->do_seek = GST_DEBUG_FUNCPTR (gst_d3d12_test_src_do_seek);
+  basesrc_class->fixate = GST_DEBUG_FUNCPTR (gst_d3d12_test_src_fixate);
+  basesrc_class->set_caps = GST_DEBUG_FUNCPTR (gst_d3d12_test_src_set_caps);
+  basesrc_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_test_src_decide_allocation);
+  basesrc_class->start = GST_DEBUG_FUNCPTR (gst_d3d12_test_src_start);
+  basesrc_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_test_src_stop);
+  basesrc_class->query = GST_DEBUG_FUNCPTR (gst_d3d12_test_src_src_query);
+  basesrc_class->get_times = GST_DEBUG_FUNCPTR (gst_d3d12_test_src_get_times);
+  basesrc_class->create = GST_DEBUG_FUNCPTR (gst_d3d12_test_src_create);
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_test_src_debug, "d3d12testsrc", 0,
+      "d3d12testsrc");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_TEST_SRC_PATTERN,
+      (GstPluginAPIFlags) 0);
+}
+
+static void
+gst_d3d12_test_src_init (GstD3D12TestSrc * self)
+{
+  gst_base_src_set_format (GST_BASE_SRC (self), GST_FORMAT_TIME);
+
+  self->priv = new GstD3D12TestSrcPrivate ();
+}
+
+static void
+gst_d3d12_test_src_finalize (GObject * object)
+{
+  auto self = GST_D3D12_TEST_SRC (object);
+
+  delete self->priv;
+  gst_clear_object (&self->device);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_test_src_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_TEST_SRC (object);
+  auto priv = self->priv;
+
+  switch (prop_id) {
+    case PROP_ADAPTER:
+      priv->adapter_index = g_value_get_int (value);
+      break;
+    case PROP_IS_LIVE:
+      gst_base_src_set_live (GST_BASE_SRC (self), g_value_get_boolean (value));
+      break;
+    case PROP_PATTERN:
+      priv->pattern = (GstD3D12TestSrcPattern) g_value_get_enum (value);
+      break;
+    case PROP_ALPHA:
+      priv->alpha = g_value_get_float (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_test_src_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_TEST_SRC (object);
+  auto priv = self->priv;
+
+  switch (prop_id) {
+    case PROP_ADAPTER:
+      g_value_set_int (value, priv->adapter_index);
+      break;
+    case PROP_IS_LIVE:
+      g_value_set_boolean (value, gst_base_src_is_live (GST_BASE_SRC (self)));
+      break;
+    case PROP_PATTERN:
+      g_value_set_enum (value, priv->pattern);
+      break;
+    case PROP_ALPHA:
+      g_value_set_float (value, priv->alpha);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_test_src_set_context (GstElement * element, GstContext * context)
+{
+  auto self = GST_D3D12_TEST_SRC (element);
+  auto priv = self->priv;
+
+  gst_d3d12_handle_set_context (element,
+      context, priv->adapter_index, &self->device);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_d3d12_test_src_is_seekable (GstBaseSrc * bsrc)
+{
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_test_src_do_seek (GstBaseSrc * bsrc, GstSegment * segment)
+{
+  auto self = GST_D3D12_TEST_SRC (bsrc);
+  auto priv = self->priv;
+  GstClockTime position;
+
+  segment->time = segment->start;
+  position = segment->position;
+  priv->reverse = segment->rate < 0;
+
+  /* now move to the position indicated */
+  if (priv->info.fps_n) {
+    priv->n_frames = gst_util_uint64_scale (position,
+        priv->info.fps_n, priv->info.fps_d * GST_SECOND);
+  } else {
+    priv->n_frames = 0;
+  }
+  priv->accum_frames = 0;
+  priv->accum_rtime = 0;
+  if (priv->info.fps_n) {
+    priv->running_time = gst_util_uint64_scale (priv->n_frames,
+        priv->info.fps_d * GST_SECOND, priv->info.fps_n);
+  } else {
+    /* FIXME : Not sure what to set here */
+    priv->running_time = 0;
+  }
+
+  return TRUE;
+}
+
+static GstCaps *
+gst_d3d12_test_src_fixate (GstBaseSrc * bsrc, GstCaps * caps)
+{
+  GstStructure *s;
+
+  caps = gst_caps_make_writable (caps);
+  s = gst_caps_get_structure (caps, 0);
+
+  gst_structure_fixate_field_nearest_int (s, "width", 320);
+  gst_structure_fixate_field_nearest_int (s, "height", 240);
+  gst_structure_fixate_field_nearest_fraction (s, "framerate", 30, 1);
+
+  return GST_BASE_SRC_CLASS (parent_class)->fixate (bsrc, caps);
+}
+
+static gboolean
+gst_d3d12_test_src_setup_context (GstD3D12TestSrc * self, GstCaps * caps)
+{
+  auto priv = self->priv;
+  GstVideoInfo draw_info;
+  HRESULT hr;
+  GstStructure *config = nullptr;
+
+  auto ctx = std::make_unique < RenderContext > (self->device);
+
+  /* D2D uses premultiplied alpha */
+  if (priv->pattern == GST_D3D12_TEST_SRC_CIRCULAR ||
+      priv->pattern == GST_D3D12_TEST_SRC_BALL) {
+    config = gst_structure_new ("converter-config",
+        GST_D3D12_CONVERTER_OPT_SRC_ALPHA_MODE,
+        GST_TYPE_D3D12_CONVERTER_ALPHA_MODE,
+        GST_D3D12_CONVERTER_ALPHA_MODE_PREMULTIPLIED, nullptr);
+  }
+
+  gst_video_info_set_format (&draw_info, GST_VIDEO_FORMAT_BGRA,
+      priv->info.width, priv->info.height);
+  ctx->conv = gst_d3d12_converter_new (self->device,
+      &draw_info, &priv->info, nullptr, nullptr, config);
+
+  if (!ctx->conv) {
+    GST_ERROR_OBJECT (self, "Failed to create converter");
+    return FALSE;
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  D3D12_HEAP_PROPERTIES heap_prop =
+      CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+  D3D12_RESOURCE_DESC resource_desc =
+      CD3DX12_RESOURCE_DESC::Tex2D (DXGI_FORMAT_B8G8R8A8_UNORM,
+      priv->info.width, priv->info.height, 1, 1, 1, 0,
+      D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
+      D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+  D3D12_CLEAR_VALUE clear_value = { };
+  D3D12_HEAP_FLAGS heap_flags = D3D12_HEAP_FLAG_CREATE_NOT_ZEROED;
+  clear_value.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
+  clear_value.Color0 = 0.0f;
+  clear_value.Color1 = 0.0f;
+  clear_value.Color2 = 0.0f;
+  clear_value.Color3 = 1.0f;
+
+  switch (priv->pattern) {
+    case GST_D3D12_TEST_SRC_WHITE:
+      memcpy (clear_value.Color, color_tableCOLOR_WHITE.color,
+          sizeof (FLOAT) * 4);
+      break;
+    case GST_D3D12_TEST_SRC_RED:
+      memcpy (clear_value.Color, color_tableCOLOR_RED.color,
+          sizeof (FLOAT) * 4);
+      break;
+    case GST_D3D12_TEST_SRC_GREEN:
+      memcpy (clear_value.Color, color_tableCOLOR_GREEN.color,
+          sizeof (FLOAT) * 4);
+      break;
+    case GST_D3D12_TEST_SRC_BLUE:
+      memcpy (clear_value.Color, color_tableCOLOR_BLUE.color,
+          sizeof (FLOAT) * 4);
+      break;
+    case GST_D3D12_TEST_SRC_CIRCULAR:
+    case GST_D3D12_TEST_SRC_BALL:
+      heap_flags |= D3D12_HEAP_FLAG_SHARED;
+      break;
+    default:
+      break;
+  }
+
+  hr = device->CreateCommittedResource (&heap_prop, heap_flags,
+      &resource_desc, D3D12_RESOURCE_STATE_COMMON, &clear_value,
+      IID_PPV_ARGS (&ctx->texture));
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't create texture");
+    return FALSE;
+  }
+
+  auto mem = gst_d3d12_allocator_alloc_wrapped (nullptr, self->device,
+      ctx->texture.Get (), 0);
+  if (!mem) {
+    GST_ERROR_OBJECT (self, "Couldn't wrap texture");
+    return FALSE;
+  }
+
+  if (!gst_d3d12_memory_get_render_target_view_heap ((GstD3D12Memory *) mem,
+          &ctx->rtv_heap)) {
+    GST_ERROR_OBJECT (self, "Couldn't get rtv heap");
+    gst_memory_unref (mem);
+    return FALSE;
+  }
+
+  ctx->render_buffer = gst_buffer_new ();
+  gst_buffer_append_memory (ctx->render_buffer, mem);
+
+  if (!priv->downstream_supports_d3d12) {
+    ctx->convert_pool = gst_d3d12_buffer_pool_new (self->device);
+    config = gst_buffer_pool_get_config (ctx->convert_pool);
+    gst_buffer_pool_config_set_params (config, caps, priv->info.size, 0, 0);
+    auto params = gst_d3d12_allocation_params_new (self->device, &priv->info,
+        GST_D3D12_ALLOCATION_FLAG_DEFAULT,
+        D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET |
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS);
+    gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+    gst_d3d12_allocation_params_free (params);
+
+    if (!gst_buffer_pool_set_config (ctx->convert_pool, config)) {
+      GST_ERROR_OBJECT (self, "Couldn't set pool config");
+      return FALSE;
+    }
+
+    if (!gst_buffer_pool_set_active (ctx->convert_pool, TRUE)) {
+      GST_ERROR_OBJECT (self, "Couldn't configure buffer pool");
+      return FALSE;
+    }
+  }
+
+  ctx->viewport.TopLeftX = 0;
+  ctx->viewport.TopLeftY = 0;
+  ctx->viewport.Width = priv->info.width;
+  ctx->viewport.Height = priv->info.height;
+  ctx->viewport.MinDepth = 0.0f;
+  ctx->viewport.MaxDepth = 1.0f;
+
+  ctx->scissor_rect.left = 0;
+  ctx->scissor_rect.top = 0;
+  ctx->scissor_rect.right = priv->info.width;
+  ctx->scissor_rect.bottom = priv->info.height;
+
+  ctx->pattern = priv->pattern;
+
+  switch (priv->pattern) {
+    case GST_D3D12_TEST_SRC_SMPTE:
+      if (!setup_smpte_render (self, ctx.get ()))
+        return FALSE;
+      break;
+    case GST_D3D12_TEST_SRC_SNOW:
+      if (!setup_snow_render (self, ctx.get (), FALSE))
+        return FALSE;
+      break;
+    case GST_D3D12_TEST_SRC_BLACK:
+      ctx->static_color0.value = color_tableCOLOR_BLACK;
+      ctx->static_color0.value.a = priv->alpha;
+      ctx->static_color0.is_valid = TRUE;
+      break;
+    case GST_D3D12_TEST_SRC_WHITE:
+      ctx->static_color0.value = color_tableCOLOR_WHITE;
+      ctx->static_color0.value.a = priv->alpha;
+      ctx->static_color0.is_valid = TRUE;
+      break;
+    case GST_D3D12_TEST_SRC_RED:
+      ctx->static_color0.value = color_tableCOLOR_RED;
+      ctx->static_color0.value.a = priv->alpha;
+      ctx->static_color0.is_valid = TRUE;
+      break;
+    case GST_D3D12_TEST_SRC_GREEN:
+      ctx->static_color0.value = color_tableCOLOR_GREEN;
+      ctx->static_color0.value.a = priv->alpha;
+      ctx->static_color0.is_valid = TRUE;
+      break;
+    case GST_D3D12_TEST_SRC_BLUE:
+      ctx->static_color0.value = color_tableCOLOR_BLUE;
+      ctx->static_color0.value.a = priv->alpha;
+      ctx->static_color0.is_valid = TRUE;
+      break;
+    case GST_D3D12_TEST_SRC_CHECKERS1:
+      if (!setup_checker_render (self, ctx.get (), 1))
+        return FALSE;
+      break;
+    case GST_D3D12_TEST_SRC_CHECKERS2:
+      if (!setup_checker_render (self, ctx.get (), 2))
+        return FALSE;
+      break;
+    case GST_D3D12_TEST_SRC_CHECKERS4:
+      if (!setup_checker_render (self, ctx.get (), 4))
+        return FALSE;
+      break;
+    case GST_D3D12_TEST_SRC_CHECKERS8:
+      if (!setup_checker_render (self, ctx.get (), 8))
+        return FALSE;
+      break;
+    case GST_D3D12_TEST_SRC_BLINK:
+      ctx->static_color0.value = color_tableCOLOR_BLACK;
+      ctx->static_color0.value.a = priv->alpha;
+      ctx->static_color0.is_valid = TRUE;
+      ctx->static_color1.value = color_tableCOLOR_WHITE;
+      ctx->static_color1.value.a = priv->alpha;
+      ctx->static_color1.is_valid = TRUE;
+      break;
+    case GST_D3D12_TEST_SRC_CIRCULAR:
+    case GST_D3D12_TEST_SRC_BALL:
+      if (!setup_d2d_render (self, ctx.get ()))
+        return FALSE;
+      break;
+  }
+
+  priv->ctx = std::move (ctx);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_test_src_set_caps (GstBaseSrc * bsrc, GstCaps * caps)
+{
+  auto self = GST_D3D12_TEST_SRC (bsrc);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Set caps %" GST_PTR_FORMAT, caps);
+
+  priv->ctx = nullptr;
+
+  auto features = gst_caps_get_features (caps, 0);
+  if (features && gst_caps_features_contains (features,
+          GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY)) {
+    priv->downstream_supports_d3d12 = TRUE;
+  } else {
+    priv->downstream_supports_d3d12 = FALSE;
+  }
+
+  GST_OBJECT_LOCK (self);
+  gst_video_info_from_caps (&priv->info, caps);
+  GST_OBJECT_UNLOCK (self);
+  if (priv->info.fps_d <= 0 || priv->info.fps_n <= 0) {
+    GST_ERROR_OBJECT (self, "Invalid framerate %d/%d", priv->info.fps_n,
+        priv->info.fps_d);
+    return FALSE;
+  }
+
+  gst_base_src_set_blocksize (bsrc, GST_VIDEO_INFO_SIZE (&priv->info));
+
+  return gst_d3d12_test_src_setup_context (self, caps);
+}
+
+static gboolean
+gst_d3d12_test_src_decide_allocation (GstBaseSrc * bsrc, GstQuery * query)
+{
+  auto self = GST_D3D12_TEST_SRC (bsrc);
+  auto priv = self->priv;
+  GstBufferPool *pool = nullptr;
+  GstCaps *caps;
+  guint min, max, size;
+  gboolean update_pool;
+  GstVideoInfo vinfo;
+
+  gst_query_parse_allocation (query, &caps, nullptr);
+
+  if (!caps) {
+    GST_ERROR_OBJECT (self, "No output caps");
+    return FALSE;
+  }
+
+  gst_video_info_from_caps (&vinfo, caps);
+
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+    update_pool = TRUE;
+  } else {
+    size = GST_VIDEO_INFO_SIZE (&vinfo);
+
+    min = max = 0;
+    update_pool = FALSE;
+  }
+
+  if (pool && priv->downstream_supports_d3d12) {
+    if (!GST_IS_D3D12_BUFFER_POOL (pool)) {
+      gst_clear_object (&pool);
+    } else {
+      GstD3D12BufferPool *dpool = GST_D3D12_BUFFER_POOL (pool);
+      if (dpool->device != self->device)
+        gst_clear_object (&pool);
+    }
+  }
+
+  if (!pool) {
+    if (priv->downstream_supports_d3d12)
+      pool = gst_d3d12_buffer_pool_new (self->device);
+    else
+      pool = gst_video_buffer_pool_new ();
+  }
+
+  auto config = gst_buffer_pool_get_config (pool);
+
+  gst_buffer_pool_config_set_params (config, caps, size, min, max);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+  if (priv->downstream_supports_d3d12) {
+    D3D12_RESOURCE_FLAGS resource_flags =
+        D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS |
+        D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+
+    auto params = gst_buffer_pool_config_get_d3d12_allocation_params (config);
+    if (!params) {
+      params = gst_d3d12_allocation_params_new (self->device, &vinfo,
+          GST_D3D12_ALLOCATION_FLAG_DEFAULT, resource_flags);
+    } else {
+      gst_d3d12_allocation_params_set_resource_flags (params, resource_flags);
+      gst_d3d12_allocation_params_unset_resource_flags (params,
+          D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE);
+    }
+
+    gst_buffer_pool_config_set_d3d12_allocation_params (config, params);
+    gst_d3d12_allocation_params_free (params);
+  }
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (self, "Failed to set config");
+    gst_clear_object (&pool);
+    return FALSE;
+  }
+
+  if (update_pool)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_test_src_start (GstBaseSrc * bsrc)
+{
+  auto self = GST_D3D12_TEST_SRC (bsrc);
+  auto priv = self->priv;
+
+  if (!gst_d3d12_ensure_element_data (GST_ELEMENT (bsrc), priv->adapter_index,
+          &self->device)) {
+    GST_ELEMENT_ERROR (self, RESOURCE, OPEN_READ,
+        ("Failed to prepare device"), (nullptr));
+    return FALSE;
+  }
+
+  priv->running_time = 0;
+  priv->reverse = FALSE;
+  priv->n_frames = 0;
+  priv->accum_frames = 0;
+  priv->accum_rtime = 0;
+
+  gst_video_info_init (&priv->info);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_test_src_stop (GstBaseSrc * bsrc)
+{
+  auto self = GST_D3D12_TEST_SRC (bsrc);
+  auto priv = self->priv;
+
+  priv->ctx = nullptr;
+  priv->d2d_factory = nullptr;
+  gst_clear_object (&self->device);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_test_src_src_query (GstBaseSrc * bsrc, GstQuery * query)
+{
+  auto self = GST_D3D12_TEST_SRC (bsrc);
+  auto priv = self->priv;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      if (gst_d3d12_handle_context_query (GST_ELEMENT_CAST (self), query,
+              self->device)) {
+        return TRUE;
+      }
+      break;
+    case GST_QUERY_LATENCY:
+      GST_OBJECT_LOCK (self);
+      if (priv->info.fps_n > 0 && priv->info.fps_d > 0) {
+        GstClockTime latency;
+
+        latency =
+            gst_util_uint64_scale (GST_SECOND, priv->info.fps_d,
+            priv->info.fps_n);
+        GST_OBJECT_UNLOCK (self);
+        gst_query_set_latency (query,
+            gst_base_src_is_live (bsrc), latency, GST_CLOCK_TIME_NONE);
+        GST_DEBUG_OBJECT (self, "Reporting latency of %" GST_TIME_FORMAT,
+            GST_TIME_ARGS (latency));
+        return TRUE;
+      }
+      GST_OBJECT_UNLOCK (self);
+      break;
+    case GST_QUERY_DURATION:
+      if (bsrc->num_buffers > 0) {
+        GstFormat format;
+
+        gst_query_parse_duration (query, &format, nullptr);
+        if (format != GST_FORMAT_TIME)
+          return FALSE;
+
+        GST_OBJECT_LOCK (self);
+        if (format == GST_FORMAT_TIME && priv->info.fps_n > 0 &&
+            priv->info.fps_d > 0) {
+          gint64 dur;
+          dur = gst_util_uint64_scale_int_round (bsrc->num_buffers
+              * GST_SECOND, priv->info.fps_d, priv->info.fps_n);
+          gst_query_set_duration (query, GST_FORMAT_TIME, dur);
+          GST_OBJECT_UNLOCK (self);
+          return TRUE;
+        }
+
+        GST_OBJECT_UNLOCK (self);
+      }
+      break;
+    default:
+      break;
+  }
+
+  return GST_BASE_SRC_CLASS (parent_class)->query (bsrc, query);
+}
+
+static void
+gst_d3d12_test_src_get_times (GstBaseSrc * bsrc, GstBuffer * buffer,
+    GstClockTime * start, GstClockTime * end)
+{
+  /* for live sources, sync on the timestamp of the buffer */
+  if (gst_base_src_is_live (bsrc)) {
+    GstClockTime timestamp = GST_BUFFER_PTS (buffer);
+
+    if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
+      /* get duration to calculate end time */
+      GstClockTime duration = GST_BUFFER_DURATION (buffer);
+
+      if (GST_CLOCK_TIME_IS_VALID (duration)) {
+        *end = timestamp + duration;
+      }
+      *start = timestamp;
+    }
+  } else {
+    *start = -1;
+    *end = -1;
+  }
+}
+
+static gboolean
+gst_d3d12_test_src_draw_ball (GstD3D12TestSrc * self)
+{
+  auto priv = self->priv;
+  gdouble rad;
+  FLOAT x, y;
+
+  rad = (gdouble) priv->n_frames / 200;
+  rad = 2 * G_PI * rad;
+  x = 20 + (0.5 + 0.5 * sin (rad)) * (priv->info.width - 40);
+  y = 20 + (0.5 + 0.5 * sin (rad * sqrt (2))) * (priv->info.height - 40);
+
+  gst_d3d12_device_lock (self->device);
+  ID3D11Resource *resources = { priv->ctx->wrapped_texture.Get () };
+
+  GstD3D11On12AcquireWrappedResource (priv->ctx->d3d11on12.Get (), resources,
+      1);
+
+  priv->ctx->brush->SetCenter (D2D1::Point2F (x, y));
+  priv->ctx->d2d_target->BeginDraw ();
+  priv->ctx->d2d_target->Clear (D2D1::ColorF (D2D1::ColorF::Black));
+  priv->ctx->d2d_target->FillEllipse (D2D1::Ellipse (D2D1::Point2F (x, y),
+          20, 20), priv->ctx->brush.Get ());
+  priv->ctx->d2d_target->EndDraw ();
+
+  GstD3D11On12ReleaseWrappedResource (priv->ctx->d3d11on12.Get (), resources,
+      1);
+
+  priv->ctx->d3d11_context->Flush ();
+  gst_d3d12_device_unlock (self->device);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_test_src_draw_circular (GstD3D12TestSrc * self)
+{
+  auto priv = self->priv;
+
+  gst_d3d12_device_lock (self->device);
+  ID3D11Resource *resources = { priv->ctx->wrapped_texture.Get () };
+
+  GstD3D11On12AcquireWrappedResource (priv->ctx->d3d11on12.Get (), resources,
+      1);
+  priv->ctx->d2d_target->BeginDraw ();
+  priv->ctx->d2d_target->Clear (D2D1::ColorF (D2D1::ColorF::Black));
+  priv->ctx->d2d_target->FillEllipse (D2D1::Ellipse (D2D1::Point2F (priv->
+              ctx->x, priv->ctx->y), priv->ctx->rad, priv->ctx->rad),
+      priv->ctx->brush.Get ());
+  priv->ctx->d2d_target->EndDraw ();
+
+  GstD3D11On12ReleaseWrappedResource (priv->ctx->d3d11on12.Get (), resources,
+      1);
+
+  priv->ctx->d3d11_context->Flush ();
+
+  gst_d3d12_device_unlock (self->device);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_test_src_draw_pattern (GstD3D12TestSrc * self, GstClockTime pts,
+    ID3D12GraphicsCommandList * cl)
+{
+  auto priv = self->priv;
+  auto ctx = priv->ctx.get ();
+  D3D12_RESOURCE_BARRIER barrier;
+
+  if (ctx->pattern == GST_D3D12_TEST_SRC_BALL)
+    return gst_d3d12_test_src_draw_ball (self);
+  else if (ctx->pattern == GST_D3D12_TEST_SRC_CIRCULAR)
+    return gst_d3d12_test_src_draw_circular (self);
+
+  if (ctx->static_color0.is_valid) {
+    if (ctx->static_color1.is_valid && (priv->n_frames % 2) == 1) {
+      cl->ClearRenderTargetView (ctx->
+          rtv_heap->GetCPUDescriptorHandleForHeapStart (),
+          ctx->static_color1.value.color, 0, nullptr);
+    } else {
+      cl->ClearRenderTargetView (ctx->
+          rtv_heap->GetCPUDescriptorHandleForHeapStart (),
+          ctx->static_color0.value.color, 0, nullptr);
+    }
+  } else {
+    cl->IASetPrimitiveTopology (D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+    cl->RSSetViewports (1, &ctx->viewport);
+    cl->RSSetScissorRects (1, &ctx->scissor_rect);
+    D3D12_CPU_DESCRIPTOR_HANDLE rtv_heaps = {
+      priv->ctx->rtv_heap->GetCPUDescriptorHandleForHeapStart ()
+    };
+    cl->OMSetRenderTargets (1, rtv_heaps, FALSE, nullptr);
+
+    for (size_t i = 0; i < ctx->quad.size (); i++) {
+      auto quad = ctx->quadi;
+      if (priv->ctx->fence_val == 0) {
+        cl->CopyResource (quad->vertex_index_buf.Get (),
+            quad->vertex_index_upload.Get ());
+        barrier =
+            CD3DX12_RESOURCE_BARRIER::Transition (quad->vertex_index_buf.Get (),
+            D3D12_RESOURCE_STATE_COPY_DEST,
+            D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER |
+            D3D12_RESOURCE_STATE_INDEX_BUFFER);
+        cl->ResourceBarrier (1, &barrier);
+      }
+
+      cl->SetGraphicsRootSignature (quad->rs.Get ());
+      if (quad->is_snow) {
+        quad->snow_const_buffer.time = (FLOAT) pts / GST_SECOND;
+        quad->snow_const_buffer.alpha = priv->alpha;
+        cl->SetGraphicsRoot32BitConstants (0, 2, &quad->snow_const_buffer, 0);
+      } else if (quad->is_checker) {
+        quad->checker_const_buffer.alpha = priv->alpha;
+        cl->SetGraphicsRoot32BitConstants (0, 4, &quad->checker_const_buffer,
+            0);
+      }
+
+      cl->SetPipelineState (quad->pso.Get ());
+      cl->IASetIndexBuffer (&quad->ibv);
+      cl->IASetVertexBuffers (0, 1, &quad->vbv);
+      cl->DrawIndexedInstanced (quad->index_count, 1, 0, 0, 0);
+    }
+  }
+
+  barrier = CD3DX12_RESOURCE_BARRIER::Transition (ctx->texture.Get (),
+      D3D12_RESOURCE_STATE_RENDER_TARGET,
+      D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+  cl->ResourceBarrier (1, &barrier);
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_d3d12_test_src_create (GstBaseSrc * bsrc, guint64 offset,
+    guint size, GstBuffer ** buf)
+{
+  auto self = GST_D3D12_TEST_SRC (bsrc);
+  auto priv = self->priv;
+  GstBuffer *buffer = nullptr;
+  GstBuffer *convert_buffer = nullptr;
+  GstFlowReturn ret = GST_FLOW_ERROR;
+  GstClockTime pts;
+  GstClockTime next_time;
+
+  if (priv->downstream_supports_d3d12) {
+    ret = GST_BASE_SRC_CLASS (parent_class)->alloc (bsrc,
+        offset, size, &convert_buffer);
+  } else {
+    ret = gst_buffer_pool_acquire_buffer (priv->ctx->convert_pool,
+        &convert_buffer, nullptr);
+  }
+
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  auto completed = gst_d3d12_device_get_completed_value (self->device,
+      D3D12_COMMAND_LIST_TYPE_DIRECT);
+  while (!priv->ctx->scheduled.empty ()) {
+    if (priv->ctx->scheduled.front () > completed)
+      break;
+
+    priv->ctx->scheduled.pop ();
+  }
+
+  if (priv->ctx->scheduled.size () >= ASYNC_DEPTH) {
+    auto fence_to_wait = priv->ctx->scheduled.front ();
+    priv->ctx->scheduled.pop ();
+    gst_d3d12_device_fence_wait (self->device,
+        D3D12_COMMAND_LIST_TYPE_DIRECT, fence_to_wait, priv->ctx->event_handle);
+  }
+
+  GstD3D12CommandAllocator *gst_ca;
+  if (!gst_d3d12_command_allocator_pool_acquire (priv->ctx->ca_pool, &gst_ca)) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire command allocator");
+    gst_clear_buffer (&convert_buffer);
+    return GST_FLOW_ERROR;
+  }
+
+  ComPtr < ID3D12CommandAllocator > ca;
+  gst_d3d12_command_allocator_get_handle (gst_ca, &ca);
+
+  auto hr = ca->Reset ();
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't reset command allocator");
+    gst_d3d12_command_allocator_unref (gst_ca);
+    gst_clear_buffer (&convert_buffer);
+    return GST_FLOW_ERROR;
+  }
+
+  if (!priv->ctx->cl) {
+    auto device = gst_d3d12_device_get_device_handle (self->device);
+    hr = device->CreateCommandList (0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        ca.Get (), nullptr, IID_PPV_ARGS (&priv->ctx->cl));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't reset command list");
+      gst_d3d12_command_allocator_unref (gst_ca);
+      gst_clear_buffer (&convert_buffer);
+      return GST_FLOW_ERROR;
+    }
+  } else {
+    hr = priv->ctx->cl->Reset (ca.Get (), nullptr);
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't reset command list");
+      gst_d3d12_command_allocator_unref (gst_ca);
+      gst_clear_buffer (&convert_buffer);
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  auto cl = priv->ctx->cl;
+  GstD3D12FenceData *fence_data;
+  gst_d3d12_fence_data_pool_acquire (priv->fence_data_pool, &fence_data);
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, gst_ca);
+
+  pts = priv->accum_rtime + priv->running_time;
+  gst_d3d12_test_src_draw_pattern (self, pts, cl.Get ());
+
+  if (!gst_d3d12_converter_convert_buffer (priv->ctx->conv,
+          priv->ctx->render_buffer, convert_buffer, fence_data, cl.Get ())) {
+    GST_ERROR_OBJECT (self, "Couldn't build convert command");
+    gst_clear_buffer (&convert_buffer);
+    gst_d3d12_fence_data_unref (fence_data);
+    return GST_FLOW_ERROR;
+  }
+
+  hr = cl->Close ();
+
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't close command list");
+    gst_clear_buffer (&convert_buffer);
+    gst_d3d12_fence_data_unref (fence_data);
+    return GST_FLOW_ERROR;
+  }
+
+  ID3D12CommandList *cmd_list = { priv->ctx->cl.Get () };
+
+  if (!gst_d3d12_device_execute_command_lists (self->device,
+          D3D12_COMMAND_LIST_TYPE_DIRECT, 1, cmd_list, &priv->ctx->fence_val)) {
+    GST_ERROR_OBJECT (self, "Couldn't execute command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    return GST_FLOW_ERROR;
+  }
+
+  gst_d3d12_buffer_after_write (convert_buffer, priv->ctx->fence_val);
+
+  gst_d3d12_device_set_fence_notify (self->device,
+      D3D12_COMMAND_LIST_TYPE_DIRECT, priv->ctx->fence_val, fence_data);
+
+  priv->ctx->scheduled.push (priv->ctx->fence_val);
+
+  if (priv->downstream_supports_d3d12) {
+    buffer = convert_buffer;
+    convert_buffer = nullptr;
+  } else {
+    ret = GST_BASE_SRC_CLASS (parent_class)->alloc (bsrc,
+        offset, size, &buffer);
+    if (ret != GST_FLOW_OK) {
+      gst_buffer_unref (convert_buffer);
+      return ret;
+    }
+
+    GstVideoFrame src_frame, dst_frame;
+    if (!gst_video_frame_map (&src_frame, &priv->info, convert_buffer,
+            GST_MAP_READ)) {
+      GST_ERROR_OBJECT (self, "Couldn't map convert buffer");
+      gst_buffer_unref (convert_buffer);
+      gst_buffer_unref (buffer);
+      return GST_FLOW_ERROR;
+    }
+
+    if (!gst_video_frame_map (&dst_frame, &priv->info, buffer, GST_MAP_WRITE)) {
+      GST_ERROR_OBJECT (self, "Couldn't map output buffer");
+      gst_video_frame_unmap (&src_frame);
+      gst_buffer_unref (convert_buffer);
+      gst_buffer_unref (buffer);
+      return GST_FLOW_ERROR;
+    }
+
+    auto copy_ret = gst_video_frame_copy (&dst_frame, &src_frame);
+    gst_video_frame_unmap (&src_frame);
+    gst_video_frame_unmap (&dst_frame);
+    gst_buffer_unref (convert_buffer);
+
+    if (!copy_ret) {
+      GST_ERROR_OBJECT (self, "Couldn't copy frame");
+      gst_buffer_unref (buffer);
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  GST_BUFFER_PTS (buffer) = pts;
+  GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
+  GST_BUFFER_OFFSET (buffer) = priv->accum_frames + priv->n_frames;
+  if (priv->reverse) {
+    priv->n_frames--;
+  } else {
+    priv->n_frames++;
+  }
+  GST_BUFFER_OFFSET_END (buffer) = GST_BUFFER_OFFSET (buffer) + 1;
+
+  next_time = gst_util_uint64_scale (priv->n_frames,
+      priv->info.fps_d * GST_SECOND, priv->info.fps_n);
+  if (priv->reverse) {
+    /* We already decremented to next frame */
+    GstClockTime prev_pts = gst_util_uint64_scale (priv->n_frames + 2,
+        priv->info.fps_d * GST_SECOND, priv->info.fps_n);
+
+    GST_BUFFER_DURATION (buffer) = prev_pts - GST_BUFFER_PTS (buffer);
+  } else {
+    GST_BUFFER_DURATION (buffer) = next_time - priv->running_time;
+  }
+
+  priv->running_time = next_time;
+  *buf = buffer;
+
+  return GST_FLOW_OK;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12testsrc.h Added

@@ -0,0 +1,34 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/base/gstbasesrc.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_TEST_SRC (gst_d3d12_test_src_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12TestSrc, gst_d3d12_test_src,
+    GST, D3D12_TEST_SRC, GstBaseSrc);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12upload.cpp Added

@@ -0,0 +1,320 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12upload.h"
+#include "gstd3d12pluginutils.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_upload_debug);
+#define GST_CAT_DEFAULT gst_d3d12_upload_debug
+
+static GstStaticPadTemplate sink_template =
+    GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE (GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS)));
+
+static GstStaticPadTemplate src_template =
+    GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE (GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS)));
+
+struct _GstD3D12Upload
+{
+  GstD3D12BaseFilter parent;
+};
+
+#define gst_d3d12_upload_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12Upload, gst_d3d12_upload, GST_TYPE_D3D12_BASE_FILTER);
+
+static GstCaps *gst_d3d12_upload_transform_caps (GstBaseTransform * trans,
+    GstPadDirection direction, GstCaps * caps, GstCaps * filter);
+static gboolean gst_d3d12_upload_propose_allocation (GstBaseTransform * trans,
+    GstQuery * decide_query, GstQuery * query);
+static gboolean gst_d3d12_upload_decide_allocation (GstBaseTransform * trans,
+    GstQuery * query);
+static GstFlowReturn gst_d3d12_upload_transform (GstBaseTransform * trans,
+    GstBuffer * inbuf, GstBuffer * outbuf);
+
+static void
+gst_d3d12_upload_class_init (GstD3D12UploadClass * klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
+
+  gst_element_class_add_static_pad_template (element_class, &sink_template);
+  gst_element_class_add_static_pad_template (element_class, &src_template);
+
+  gst_element_class_set_static_metadata (element_class,
+      "Direct3D12 Uploader", "Filter/Video",
+      "Uploads system memory into Direct3D12 texture memory",
+      "Seungha Yang <seungha@centricular.com>");
+
+  trans_class->passthrough_on_same_caps = TRUE;
+
+  trans_class->transform_caps =
+      GST_DEBUG_FUNCPTR (gst_d3d12_upload_transform_caps);
+  trans_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_upload_propose_allocation);
+  trans_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_upload_decide_allocation);
+  trans_class->transform = GST_DEBUG_FUNCPTR (gst_d3d12_upload_transform);
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_upload_debug,
+      "d3d12upload", 0, "d3d12upload Element");
+}
+
+static void
+gst_d3d12_upload_init (GstD3D12Upload * self)
+{
+}
+
+static GstCaps *
+_set_caps_features (const GstCaps * caps, const gchar * feature_name)
+{
+  GstCaps *tmp = gst_caps_copy (caps);
+  guint n = gst_caps_get_size (tmp);
+  guint i = 0;
+
+  for (i = 0; i < n; i++) {
+    gst_caps_set_features (tmp, i,
+        gst_caps_features_from_string (feature_name));
+  }
+
+  return tmp;
+}
+
+static GstCaps *
+gst_d3d12_upload_transform_caps (GstBaseTransform * trans,
+    GstPadDirection direction, GstCaps * caps, GstCaps * filter)
+{
+  GstCaps *result, *tmp;
+
+  GST_DEBUG_OBJECT (trans,
+      "Transforming caps %" GST_PTR_FORMAT " in direction %s", caps,
+      (direction == GST_PAD_SINK) ? "sink" : "src");
+
+  if (direction == GST_PAD_SINK) {
+    tmp = _set_caps_features (caps, GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY);
+    tmp = gst_caps_merge (gst_caps_ref (caps), tmp);
+  } else {
+    GstCaps *newcaps;
+    tmp = gst_caps_ref (caps);
+
+    newcaps = _set_caps_features (caps, GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
+    tmp = gst_caps_merge (tmp, newcaps);
+  }
+
+  if (filter) {
+    result = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (tmp);
+  } else {
+    result = tmp;
+  }
+
+  GST_DEBUG_OBJECT (trans, "returning caps: %" GST_PTR_FORMAT, result);
+
+  return result;
+}
+
+static gboolean
+gst_d3d12_upload_propose_allocation (GstBaseTransform * trans,
+    GstQuery * decide_query, GstQuery * query)
+{
+  GstD3D12BaseFilter *filter = GST_D3D12_BASE_FILTER (trans);
+  GstVideoInfo info;
+  GstBufferPool *pool;
+  GstCaps *caps;
+  guint size;
+  gboolean is_d3d12 = FALSE;
+
+  if (!GST_BASE_TRANSFORM_CLASS (parent_class)->propose_allocation (trans,
+          decide_query, query))
+    return FALSE;
+
+  /* passthrough, we're done */
+  if (!decide_query)
+    return TRUE;
+
+  gst_query_parse_allocation (query, &caps, nullptr);
+
+  if (!caps) {
+    GST_WARNING_OBJECT (filter, "Allocation query without caps");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps))
+    return FALSE;
+
+  if (gst_query_get_n_allocation_pools (query) == 0) {
+    GstCapsFeatures *features;
+    GstStructure *config;
+
+    features = gst_caps_get_features (caps, 0);
+
+    if (features && gst_caps_features_contains (features,
+            GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY)) {
+      GST_DEBUG_OBJECT (filter, "upstream support d3d12 memory");
+      pool = gst_d3d12_buffer_pool_new (filter->device);
+      is_d3d12 = TRUE;
+    } else {
+      pool = gst_video_buffer_pool_new ();
+    }
+
+    config = gst_buffer_pool_get_config (pool);
+
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
+    if (!is_d3d12) {
+      gst_buffer_pool_config_add_option (config,
+          GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+    }
+
+    size = GST_VIDEO_INFO_SIZE (&info);
+    gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
+
+    if (!gst_buffer_pool_set_config (pool, config)) {
+      GST_ERROR_OBJECT (filter, "Bufferpool config failed");
+      gst_object_unref (pool);
+      return FALSE;
+    }
+
+    /* d3d12 buffer pool will update buffer size based on allocated texture,
+     * get size from config again */
+    config = gst_buffer_pool_get_config (pool);
+    gst_buffer_pool_config_get_params (config,
+        nullptr, &size, nullptr, nullptr);
+    gst_structure_free (config);
+
+    gst_query_add_allocation_pool (query, pool, size, 0, 0);
+    gst_object_unref (pool);
+  }
+
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, nullptr);
+  gst_query_add_allocation_meta (query,
+      GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE, nullptr);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_upload_decide_allocation (GstBaseTransform * trans, GstQuery * query)
+{
+  GstBufferPool *pool = nullptr;
+  GstStructure *config;
+  guint min, max, size;
+  gboolean update_pool;
+  GstCaps *outcaps = nullptr;
+
+  gst_query_parse_allocation (query, &outcaps, nullptr);
+
+  if (!outcaps) {
+    GST_WARNING_OBJECT (trans, "Allocation query without caps");
+    return FALSE;
+  }
+
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+
+    update_pool = TRUE;
+  } else {
+    GstVideoInfo vinfo;
+
+    gst_video_info_from_caps (&vinfo, outcaps);
+    size = vinfo.size;
+    min = max = 0;
+    update_pool = FALSE;
+  }
+
+  if (!pool) {
+    pool = gst_video_buffer_pool_new ();
+  }
+
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+  gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
+  gst_buffer_pool_set_config (pool, config);
+
+  /* d3d12 buffer pool will update buffer size based on allocated texture,
+   * get size from config again */
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  if (update_pool)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+
+  gst_object_unref (pool);
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->decide_allocation (trans,
+      query);
+}
+
+static GstFlowReturn
+gst_d3d12_upload_transform (GstBaseTransform * trans, GstBuffer * inbuf,
+    GstBuffer * outbuf)
+{
+  GstD3D12BaseFilter *filter = GST_D3D12_BASE_FILTER (trans);
+  GstVideoFrame in_frame, out_frame;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  if (!gst_video_frame_map (&in_frame, &filter->in_info, inbuf, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (filter, "Couldn't map input frame");
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_video_frame_map (&out_frame,
+          &filter->out_info, outbuf, GST_MAP_WRITE)) {
+    GST_ERROR_OBJECT (filter, "Couldn't map output frame");
+    gst_video_frame_unmap (&in_frame);
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_video_frame_copy (&out_frame, &in_frame)) {
+    GST_ERROR_OBJECT (filter, "Copy failed");
+    ret = GST_FLOW_ERROR;
+  }
+
+  gst_video_frame_unmap (&out_frame);
+  gst_video_frame_unmap (&in_frame);
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12upload.h Added

@@ -0,0 +1,31 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstd3d12basefilter.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_UPLOAD (gst_d3d12_upload_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12Upload,
+    gst_d3d12_upload, GST, D3D12_UPLOAD, GstD3D12BaseFilter);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12utils.cpp Added

@@ -0,0 +1,433 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12.h"
+#include <mutex>
+
+/* *INDENT-OFF* */
+static std::recursive_mutex context_lock_;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_STATIC (GST_CAT_CONTEXT);
+GST_DEBUG_CATEGORY_EXTERN (gst_d3d12_utils_debug);
+#define GST_CAT_DEFAULT gst_d3d12_utils_debug
+
+static void
+init_context_debug (void)
+{
+  GST_D3D12_CALL_ONCE_BEGIN {
+    GST_DEBUG_CATEGORY_GET (GST_CAT_CONTEXT, "GST_CONTEXT");
+  } GST_D3D12_CALL_ONCE_END;
+}
+
+gboolean
+gst_d3d12_handle_set_context (GstElement * element, GstContext * context,
+    gint adapter_index, GstD3D12Device ** device)
+{
+  const gchar *context_type;
+
+  g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
+  g_return_val_if_fail (device != nullptr, FALSE);
+
+  init_context_debug ();
+
+  if (!context)
+    return FALSE;
+
+  context_type = gst_context_get_context_type (context);
+  if (g_strcmp0 (context_type, GST_D3D12_DEVICE_HANDLE_CONTEXT_TYPE) == 0) {
+    const GstStructure *str;
+    GstD3D12Device *other_device = nullptr;
+    guint other_adapter = 0;
+
+    /* If we had device already, will not replace it */
+    if (*device)
+      return TRUE;
+
+    str = gst_context_get_structure (context);
+
+    if (gst_structure_get (str, "device", GST_TYPE_D3D12_DEVICE,
+            &other_device, "adapter-index", G_TYPE_UINT, &other_adapter,
+            nullptr)) {
+      if (adapter_index == -1 || (guint) adapter_index == other_adapter) {
+        GST_CAT_DEBUG_OBJECT (GST_CAT_CONTEXT,
+            element, "Found D3D12 device context");
+        *device = other_device;
+
+        return TRUE;
+      }
+
+      gst_object_unref (other_device);
+    }
+  }
+
+  return FALSE;
+}
+
+gboolean
+gst_d3d12_handle_set_context_for_adapter_luid (GstElement * element,
+    GstContext * context, gint64 adapter_luid, GstD3D12Device ** device)
+{
+  const gchar *context_type;
+
+  g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
+  g_return_val_if_fail (device != nullptr, FALSE);
+
+  init_context_debug ();
+
+  if (!context)
+    return FALSE;
+
+  context_type = gst_context_get_context_type (context);
+  if (g_strcmp0 (context_type, GST_D3D12_DEVICE_HANDLE_CONTEXT_TYPE) == 0) {
+    const GstStructure *str;
+    GstD3D12Device *other_device = nullptr;
+    gint64 other_adapter = 0;
+
+    /* If we had device already, will not replace it */
+    if (*device)
+      return TRUE;
+
+    str = gst_context_get_structure (context);
+
+    if (gst_structure_get (str, "device", GST_TYPE_D3D12_DEVICE,
+            &other_device, "adapter-luid", G_TYPE_INT64, &other_adapter,
+            nullptr)) {
+      if (adapter_luid == other_adapter) {
+        GST_CAT_DEBUG_OBJECT (GST_CAT_CONTEXT,
+            element, "Found D3D12 device context");
+        *device = other_device;
+
+        return TRUE;
+      }
+
+      gst_object_unref (other_device);
+    }
+  }
+
+  return FALSE;
+}
+
+static void
+context_set_d3d12_device (GstContext * context, GstD3D12Device * device)
+{
+  GstStructure *s;
+  guint adapter_index = 0;
+  guint device_id = 0;
+  guint vendor_id = 0;
+  gchar *desc = nullptr;
+  gint64 adapter_luid = 0;
+
+  g_return_if_fail (context != nullptr);
+
+  g_object_get (G_OBJECT (device), "adapter-index", &adapter_index,
+      "device-id", &device_id, "vendor-id", &vendor_id, "description", &desc,
+      "adapter-luid", &adapter_luid, nullptr);
+
+  GST_CAT_LOG (GST_CAT_CONTEXT,
+      "setting GstD3D12Device(%" GST_PTR_FORMAT
+      ") with adapter index %d on context(%" GST_PTR_FORMAT ")",
+      device, adapter_index, context);
+
+  s = gst_context_writable_structure (context);
+  gst_structure_set (s, "device", GST_TYPE_D3D12_DEVICE, device,
+      "adapter-index", G_TYPE_UINT, adapter_index,
+      "adapter-luid", G_TYPE_INT64, adapter_luid,
+      "device-id", G_TYPE_UINT, device_id,
+      "vendor-id", G_TYPE_UINT, vendor_id,
+      "description", G_TYPE_STRING, GST_STR_NULL (desc), nullptr);
+  g_free (desc);
+}
+
+gboolean
+gst_d3d12_handle_context_query (GstElement * element, GstQuery * query,
+    GstD3D12Device * device)
+{
+  const gchar *context_type;
+  GstContext *context, *old_context;
+
+  g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
+  g_return_val_if_fail (GST_IS_QUERY (query), FALSE);
+
+  init_context_debug ();
+
+  GST_LOG_OBJECT (element, "handle context query %" GST_PTR_FORMAT, query);
+
+  if (!device)
+    return FALSE;
+
+  gst_query_parse_context_type (query, &context_type);
+  if (g_strcmp0 (context_type, GST_D3D12_DEVICE_HANDLE_CONTEXT_TYPE) != 0)
+    return FALSE;
+
+  gst_query_parse_context (query, &old_context);
+  if (old_context)
+    context = gst_context_copy (old_context);
+  else
+    context = gst_context_new (GST_D3D12_DEVICE_HANDLE_CONTEXT_TYPE, TRUE);
+
+  context_set_d3d12_device (context, device);
+  gst_query_set_context (query, context);
+  gst_context_unref (context);
+
+  GST_DEBUG_OBJECT (element, "successfully set %" GST_PTR_FORMAT
+      " on %" GST_PTR_FORMAT, device, query);
+
+  return TRUE;
+}
+
+static gboolean
+pad_query (const GValue * item, GValue * value, gpointer user_data)
+{
+  GstPad *pad = (GstPad *) g_value_get_object (item);
+  GstQuery *query = (GstQuery *) user_data;
+  gboolean res;
+
+  res = gst_pad_peer_query (pad, query);
+
+  if (res) {
+    g_value_set_boolean (value, TRUE);
+    return FALSE;
+  }
+
+  GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, pad, "pad peer query failed");
+  return TRUE;
+}
+
+static gboolean
+run_query (GstElement * element, GstQuery * query, GstPadDirection direction)
+{
+  GstIterator *it;
+  GstIteratorFoldFunction func = pad_query;
+  GValue res = G_VALUE_INIT;
+
+  g_value_init (&res, G_TYPE_BOOLEAN);
+  g_value_set_boolean (&res, FALSE);
+
+  /* Ask neighbor */
+  if (direction == GST_PAD_SRC)
+    it = gst_element_iterate_src_pads (element);
+  else
+    it = gst_element_iterate_sink_pads (element);
+
+  while (gst_iterator_fold (it, func, &res, query) == GST_ITERATOR_RESYNC)
+    gst_iterator_resync (it);
+
+  gst_iterator_free (it);
+
+  return g_value_get_boolean (&res);
+}
+
+static void
+run_d3d12_context_query (GstElement * element, GstD3D12Device ** device)
+{
+  GstQuery *query;
+  GstContext *ctxt = nullptr;
+
+  query = gst_query_new_context (GST_D3D12_DEVICE_HANDLE_CONTEXT_TYPE);
+  if (run_query (element, query, GST_PAD_SRC)) {
+    gst_query_parse_context (query, &ctxt);
+    if (ctxt) {
+      GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
+          "found context (%" GST_PTR_FORMAT ") in downstream query", ctxt);
+      gst_element_set_context (element, ctxt);
+    }
+  }
+
+  if (*device == nullptr && run_query (element, query, GST_PAD_SINK)) {
+    gst_query_parse_context (query, &ctxt);
+    if (ctxt) {
+      GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
+          "found context (%" GST_PTR_FORMAT ") in upstream query", ctxt);
+      gst_element_set_context (element, ctxt);
+    }
+  }
+
+  if (*device == nullptr) {
+    GstMessage *msg;
+
+    GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
+        "posting need context message");
+    msg = gst_message_new_need_context (GST_OBJECT_CAST (element),
+        GST_D3D12_DEVICE_HANDLE_CONTEXT_TYPE);
+    gst_element_post_message (element, msg);
+  }
+
+  gst_query_unref (query);
+}
+
+gboolean
+gst_d3d12_ensure_element_data (GstElement * element, gint adapter_index,
+    GstD3D12Device ** device)
+{
+  guint target_adapter = 0;
+  std::lock_guard < std::recursive_mutex > lk (context_lock_);
+
+  g_return_val_if_fail (element != nullptr, FALSE);
+  g_return_val_if_fail (device != nullptr, FALSE);
+
+  init_context_debug ();
+
+  if (*device) {
+    GST_LOG_OBJECT (element, "already have a device %" GST_PTR_FORMAT, *device);
+    return TRUE;
+  }
+
+  run_d3d12_context_query (element, device);
+  if (*device)
+    return TRUE;
+
+  if (adapter_index > 0)
+    target_adapter = adapter_index;
+
+  *device = gst_d3d12_device_new (target_adapter);
+
+  if (*device == nullptr) {
+    GST_ERROR_OBJECT (element,
+        "Couldn't create new device with adapter index %d", target_adapter);
+    return FALSE;
+  } else {
+    GstContext *context;
+    GstMessage *msg;
+
+    /* Propagate new D3D12 device context */
+
+    context = gst_context_new (GST_D3D12_DEVICE_HANDLE_CONTEXT_TYPE, TRUE);
+    context_set_d3d12_device (context, *device);
+
+    gst_element_set_context (element, context);
+
+    GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
+        "posting have context (%p) message with D3D12 device context (%p)",
+        context, *device);
+    msg = gst_message_new_have_context (GST_OBJECT_CAST (element), context);
+    gst_element_post_message (GST_ELEMENT_CAST (element), msg);
+  }
+
+  return TRUE;
+}
+
+gboolean
+gst_d3d12_ensure_element_data_for_adapter_luid (GstElement * element,
+    gint64 adapter_luid, GstD3D12Device ** device)
+{
+  std::lock_guard < std::recursive_mutex > lk (context_lock_);
+
+  g_return_val_if_fail (element != nullptr, FALSE);
+  g_return_val_if_fail (device != nullptr, FALSE);
+
+  init_context_debug ();
+
+  if (*device) {
+    GST_LOG_OBJECT (element, "already have a device %" GST_PTR_FORMAT, *device);
+    return TRUE;
+  }
+
+  run_d3d12_context_query (element, device);
+  if (*device)
+    return TRUE;
+
+  *device = gst_d3d12_device_new_for_adapter_luid (adapter_luid);
+
+  if (*device == nullptr) {
+    GST_ERROR_OBJECT (element,
+        "Couldn't create new device with adapter luid %" G_GINT64_FORMAT,
+        adapter_luid);
+    return FALSE;
+  } else {
+    GstContext *context;
+    GstMessage *msg;
+
+    /* Propagate new D3D12 device context */
+    context = gst_context_new (GST_D3D12_DEVICE_HANDLE_CONTEXT_TYPE, TRUE);
+    context_set_d3d12_device (context, *device);
+
+    gst_element_set_context (element, context);
+
+    GST_CAT_INFO_OBJECT (GST_CAT_CONTEXT, element,
+        "posting have context (%p) message with D3D12 device context (%p)",
+        context, *device);
+    msg = gst_message_new_have_context (GST_OBJECT_CAST (element), context);
+    gst_element_post_message (GST_ELEMENT_CAST (element), msg);
+  }
+
+  return TRUE;
+}
+
+gint64
+gst_d3d12_luid_to_int64 (const LUID * luid)
+{
+  LARGE_INTEGER val;
+
+  g_return_val_if_fail (luid != nullptr, 0);
+
+  val.LowPart = luid->LowPart;
+  val.HighPart = luid->HighPart;
+
+  return val.QuadPart;
+}
+
+GstContext *
+gst_d3d12_context_new (GstD3D12Device * device)
+{
+  GstContext *context;
+
+  g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
+
+  context = gst_context_new (GST_D3D12_DEVICE_HANDLE_CONTEXT_TYPE, TRUE);
+  context_set_d3d12_device (context, device);
+
+  return context;
+
+}
+
+gboolean
+_gst_d3d12_result (HRESULT hr, GstD3D12Device * device, GstDebugCategory * cat,
+    const gchar * file, const gchar * function, gint line, GstDebugLevel level)
+{
+#ifndef GST_DISABLE_GST_DEBUG
+  gboolean ret = TRUE;
+
+  if (device)
+    gst_d3d12_device_d3d12_debug (device, file, function, line);
+
+  if (FAILED (hr)) {
+    gchar *error_text = nullptr;
+
+    error_text = g_win32_error_message ((guint) hr);
+    /* g_win32_error_message() doesn't cover all HERESULT return code,
+     * so it could be empty string, or nullptr if there was an error
+     * in g_utf16_to_utf8() */
+    gst_debug_log (cat, level, file, function, line,
+        nullptr, "D3D12 call failed: 0x%x, %s", (guint) hr,
+        GST_STR_NULL (error_text));
+    g_free (error_text);
+
+    ret = FALSE;
+  }
+
+  return ret;
+#else
+  return SUCCEEDED (hr);
+#endif
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12utils.h Added

@@ -0,0 +1,84 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "gstd3d12_fwd.h"
+
+G_BEGIN_DECLS
+
+gboolean  gst_d3d12_handle_set_context (GstElement * element,
+                                        GstContext * context,
+                                        gint adapter_index,
+                                        GstD3D12Device ** device);
+
+gboolean  gst_d3d12_handle_set_context_for_adapter_luid (GstElement * element,
+                                                         GstContext * context,
+                                                         gint64 adapter_luid,
+                                                         GstD3D12Device ** device);
+
+gboolean  gst_d3d12_handle_context_query (GstElement * element,
+                                          GstQuery * query,
+                                          GstD3D12Device * device);
+
+gboolean  gst_d3d12_ensure_element_data  (GstElement * element,
+                                          gint adapter_index,
+                                          GstD3D12Device ** device);
+
+gboolean  gst_d3d12_ensure_element_data_for_adapter_luid (GstElement * element,
+                                                          gint64 adapter_luid,
+                                                          GstD3D12Device ** device);
+
+gint64    gst_d3d12_luid_to_int64 (const LUID * luid);
+
+GstContext * gst_d3d12_context_new (GstD3D12Device * device);
+
+gboolean _gst_d3d12_result (HRESULT hr,
+                            GstD3D12Device * device,
+                            GstDebugCategory * cat,
+                            const gchar * file,
+                            const gchar * function,
+                            gint line,
+                            GstDebugLevel level);
+
+/**
+ * gst_d3d12_result:
+ * @result: HRESULT D3D12 API return code
+ * @device: (nullable): Associated #GstD3D12Device
+ *
+ * Returns: %TRUE if D3D12 API call result is SUCCESS
+ */
+#ifndef GST_DISABLE_GST_DEBUG
+#define gst_d3d12_result(result,device) \
+    _gst_d3d12_result (result, device, GST_CAT_DEFAULT, __FILE__, GST_FUNCTION, __LINE__, GST_LEVEL_ERROR)
+#else
+#define gst_d3d12_result(result,device) \
+    _gst_d3d12_result (result, device, NULL, __FILE__, GST_FUNCTION, __LINE__, GST_LEVEL_ERROR)
+#endif
+
+G_END_DECLS
+
+#include <mutex>
+
+#define GST_D3D12_CALL_ONCE_BEGIN \
+    static std::once_flag __once_flag; \
+    std::call_once (__once_flag, &()
+
+#define GST_D3D12_CALL_ONCE_END )

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12videosink.cpp Added

@@ -0,0 +1,1245 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12videosink.h"
+#include "gstd3d12pluginutils.h"
+#include "gstd3d12window.h"
+#include <mutex>
+#include <atomic>
+#include <string>
+
+enum
+{
+  PROP_0,
+  PROP_ADAPTER,
+  PROP_FORCE_ASPECT_RATIO,
+  PROP_ENABLE_NAVIGATION_EVENTS,
+  PROP_ROTATE_METHOD,
+  PROP_FULLSCREEN_ON_ALT_ENTER,
+  PROP_FULLSCREEN,
+  PROP_MSAA,
+  PROP_REDRAW_ON_UPDATE,
+  PROP_FOV,
+  PROP_ORTHO,
+  PROP_ROTATION_X,
+  PROP_ROTATION_Y,
+  PROP_ROTATION_Z,
+  PROP_SCALE_X,
+  PROP_SCALE_Y,
+  PROP_SAMPLING_METHOD,
+  PROP_GAMMA_MODE,
+  PROP_PRIMARIES_MODE,
+};
+
+#define DEFAULT_ADAPTER -1
+#define DEFAULT_FORCE_ASPECT_RATIO TRUE
+#define DEFAULT_ENABLE_NAVIGATION_EVENTS TRUE
+#define DEFAULT_ROTATE_METHOD GST_VIDEO_ORIENTATION_IDENTITY
+#define DEFAULT_FULLSCREEN_ON_ALT_ENTER FALSE
+#define DEFAULT_FULLSCREEN FALSE
+#define DEFAULT_MSAA GST_D3D12_MSAA_DISABLED
+#define DEFAULT_REDROW_ON_UPDATE TRUE
+#define DEFAULT_ROTATION 0.0f
+#define DEFAULT_SCALE 1.0f
+#define DEFAULT_FOV 90.0f
+#define DEFAULT_ORTHO FALSE
+#define DEFAULT_SAMPLING_METHOD GST_D3D12_SAMPLING_METHOD_BILINEAR
+#define DEFAULT_GAMMA_MODE GST_VIDEO_GAMMA_MODE_NONE
+#define DEFAULT_PRIMARIES_MODE GST_VIDEO_PRIMARIES_MODE_NONE
+
+static GstStaticPadTemplate sink_template =
+    GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY, GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS) ";"
+        GST_VIDEO_CAPS_MAKE (GST_D3D12_ALL_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY ","
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,
+            GST_D3D12_ALL_FORMATS)));
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_video_sink_debug);
+#define GST_CAT_DEFAULT gst_d3d12_video_sink_debug
+
+/* *INDENT-OFF* */
+struct GstD3D12VideoSinkPrivate
+{
+  GstD3D12VideoSinkPrivate ()
+  {
+    window = gst_d3d12_window_new ();
+  }
+
+  ~GstD3D12VideoSinkPrivate ()
+  {
+    gst_clear_caps (&caps);
+    gst_clear_object (&window);
+    if (pool) {
+      gst_buffer_pool_set_active (pool, FALSE);
+      gst_object_unref (pool);
+    }
+  }
+
+  GstD3D12Window *window;
+  guintptr window_handle = 0;
+  gboolean window_handle_updated = FALSE;
+
+  std::recursive_mutex context_lock;
+
+  GstVideoInfo info;
+  GstCaps *caps = nullptr;
+  gboolean update_window = FALSE;
+  GstBufferPool *pool = nullptr;
+
+  std::recursive_mutex lock;
+  /* properties */
+  std::atomic<gint> adapter = { DEFAULT_ADAPTER };
+  gboolean force_aspect_ratio = DEFAULT_FORCE_ASPECT_RATIO;
+  gboolean enable_navigation = DEFAULT_ENABLE_NAVIGATION_EVENTS;
+  GstVideoOrientationMethod orientation = DEFAULT_ROTATE_METHOD;
+  GstVideoOrientationMethod orientation_from_tag = DEFAULT_ROTATE_METHOD;
+  GstVideoOrientationMethod orientation_selected = DEFAULT_ROTATE_METHOD;
+  gboolean fullscreen_on_alt_enter = DEFAULT_FULLSCREEN_ON_ALT_ENTER;
+  gboolean fullscreen = DEFAULT_FULLSCREEN;
+  GstD3D12MSAAMode msaa = DEFAULT_MSAA;
+  gboolean redraw_on_update = DEFAULT_REDROW_ON_UPDATE;
+  gfloat fov = DEFAULT_FOV;
+  gboolean ortho = DEFAULT_ORTHO;
+  gfloat rotation_x = DEFAULT_ROTATION;
+  gfloat rotation_y = DEFAULT_ROTATION;
+  gfloat rotation_z = DEFAULT_ROTATION;
+  gfloat scale_x = DEFAULT_SCALE;
+  gfloat scale_y = DEFAULT_SCALE;
+  GstVideoGammaMode gamma_mode = DEFAULT_GAMMA_MODE;
+  GstVideoPrimariesMode primaries_mode = DEFAULT_PRIMARIES_MODE;
+  GstD3D12SamplingMethod sampling_method = DEFAULT_SAMPLING_METHOD;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12VideoSink
+{
+  GstVideoSink parent;
+
+  GstD3D12Device *device;
+
+  GstD3D12VideoSinkPrivate *priv;
+};
+
+static void gst_d3d12_videosink_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_d3d12_videosink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+static void gst_d3d12_video_sink_dispose (GObject * object);
+static void gst_d3d12_video_sink_finalize (GObject * object);
+static void gst_d3d12_video_sink_set_context (GstElement * element,
+    GstContext * context);
+static gboolean gst_d3d12_video_sink_start (GstBaseSink * sink);
+static gboolean gst_d3d12_video_sink_stop (GstBaseSink * sink);
+static gboolean gst_d3d12_video_sink_unlock (GstBaseSink * sink);
+static gboolean gst_d3d12_video_sink_unlock_stop (GstBaseSink * sink);
+static gboolean gst_d3d12_video_sink_propose_allocation (GstBaseSink * sink,
+    GstQuery * query);
+static gboolean gst_d3d12_video_sink_query (GstBaseSink * sink,
+    GstQuery * query);
+static GstFlowReturn gst_d3d12_video_sink_prepare (GstBaseSink * sink,
+    GstBuffer * buf);
+static gboolean gst_d3d12_video_sink_event (GstBaseSink * sink,
+    GstEvent * event);
+static gboolean gst_d3d12_video_sink_set_info (GstVideoSink * sink,
+    GstCaps * caps, const GstVideoInfo * info);
+static GstFlowReturn gst_d3d12_video_sink_show_frame (GstVideoSink * sink,
+    GstBuffer * buf);
+static void gst_d3d12_video_sink_set_orientation (GstD3D12VideoSink * self,
+    GstVideoOrientationMethod method, gboolean from_tag);
+static void gst_d3d12_video_sink_key_event (GstD3D12Window * window,
+    const gchar * event, const gchar * key, GstD3D12VideoSink * self);
+static void gst_d3d12_video_sink_mouse_event (GstD3D12Window * window,
+    const gchar * event, gint button, gdouble x, gdouble y,
+    GstD3D12VideoSink * self);
+static void gst_d3d12_video_sink_on_fullscreen (GstD3D12Window * window,
+    gboolean is_fullscreen, GstD3D12VideoSink * self);
+
+static void
+gst_d3d12_video_sink_video_overlay_init (GstVideoOverlayInterface * iface);
+static void
+gst_d3d12_video_sink_navigation_init (GstNavigationInterface * iface);
+
+#define gst_d3d12_video_sink_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstD3D12VideoSink, gst_d3d12_video_sink,
+    GST_TYPE_VIDEO_SINK,
+    G_IMPLEMENT_INTERFACE (GST_TYPE_VIDEO_OVERLAY,
+        gst_d3d12_video_sink_video_overlay_init);
+    G_IMPLEMENT_INTERFACE (GST_TYPE_NAVIGATION,
+        gst_d3d12_video_sink_navigation_init);
+    GST_DEBUG_CATEGORY_INIT (gst_d3d12_video_sink_debug,
+        "d3d12videosink", 0, "d3d12videosink"));
+
+static void
+gst_d3d12_video_sink_class_init (GstD3D12VideoSinkClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto element_class = GST_ELEMENT_CLASS (klass);
+  auto basesink_class = GST_BASE_SINK_CLASS (klass);
+  auto videosink_class = GST_VIDEO_SINK_CLASS (klass);
+
+  object_class->set_property = gst_d3d12_videosink_set_property;
+  object_class->get_property = gst_d3d12_videosink_get_property;
+  object_class->dispose = gst_d3d12_video_sink_dispose;
+  object_class->finalize = gst_d3d12_video_sink_finalize;
+
+  g_object_class_install_property (object_class, PROP_ADAPTER,
+      g_param_spec_int ("adapter", "Adapter",
+          "Adapter index for creating device (-1 for default)",
+          -1, G_MAXINT32, DEFAULT_ADAPTER,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_FORCE_ASPECT_RATIO,
+      g_param_spec_boolean ("force-aspect-ratio",
+          "Force aspect ratio",
+          "When enabled, scaling will respect original aspect ratio",
+          DEFAULT_FORCE_ASPECT_RATIO,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_ENABLE_NAVIGATION_EVENTS,
+      g_param_spec_boolean ("enable-navigation-events",
+          "Enable navigation events",
+          "When enabled, navigation events are sent upstream",
+          DEFAULT_ENABLE_NAVIGATION_EVENTS,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_ROTATE_METHOD,
+      g_param_spec_enum ("rotate-method", "Rotate Method",
+          "Rotate method to use",
+          GST_TYPE_VIDEO_ORIENTATION_METHOD, GST_VIDEO_ORIENTATION_IDENTITY,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class,
+      PROP_FULLSCREEN_ON_ALT_ENTER,
+      g_param_spec_boolean ("fullscreen-on-alt-enter",
+          "Fullscreen on Alt Enter",
+          "Enable fullscreen toggle on alt+enter key input",
+          DEFAULT_FULLSCREEN_ON_ALT_ENTER,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_FULLSCREEN,
+      g_param_spec_boolean ("fullscreen", "Fullscreen",
+          "Fullscreen mode", DEFAULT_FULLSCREEN,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_MSAA,
+      g_param_spec_enum ("msaa", "MSAA",
+          "MSAA (Multi-Sampling Anti-Aliasing) level",
+          GST_TYPE_D3D12_MSAA_MODE, DEFAULT_MSAA,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_REDRAW_ON_UPDATE,
+      g_param_spec_boolean ("redraw-on-update",
+          "redraw-on-update",
+          "Immediately apply updated geometry related properties and redraw. "
+          "If disabled, properties will be applied on the next frame or "
+          "window resize", DEFAULT_REDROW_ON_UPDATE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_FOV,
+      g_param_spec_float ("fov", "Fov",
+          "Field of view angle in degrees",
+          0, G_MAXFLOAT, DEFAULT_FOV,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_ORTHO,
+      g_param_spec_boolean ("ortho", "Orthographic",
+          "Use orthographic projection", DEFAULT_ORTHO,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_ROTATION_X,
+      g_param_spec_float ("rotation-x", "Rotation X",
+          "x-axis rotation angle in degrees",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_ROTATION,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_ROTATION_Y,
+      g_param_spec_float ("rotation-y", "Rotation Y",
+          "y-axis rotation angle in degrees",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_ROTATION,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_ROTATION_Z,
+      g_param_spec_float ("rotation-z", "Rotation Z",
+          "z-axis rotation angle in degrees",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_ROTATION,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_SCALE_X,
+      g_param_spec_float ("scale-x", "Scale X",
+          "Scale multiplier for x-axis",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_SCALE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_SCALE_Y,
+      g_param_spec_float ("scale-y", "Scale Y",
+          "Scale multiplier for y-axis",
+          -G_MAXFLOAT, G_MAXFLOAT, DEFAULT_SCALE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_GAMMA_MODE,
+      g_param_spec_enum ("gamma-mode", "Gamma mode",
+          "Gamma conversion mode", GST_TYPE_VIDEO_GAMMA_MODE,
+          DEFAULT_GAMMA_MODE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_PRIMARIES_MODE,
+      g_param_spec_enum ("primaries-mode", "Primaries Mode",
+          "Primaries conversion mode", GST_TYPE_VIDEO_PRIMARIES_MODE,
+          DEFAULT_PRIMARIES_MODE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_SAMPLING_METHOD,
+      g_param_spec_enum ("sampling-method", "Sampling method",
+          "Sampler filter type to use", GST_TYPE_D3D12_SAMPLING_METHOD,
+          DEFAULT_SAMPLING_METHOD,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_video_sink_set_context);
+
+  gst_element_class_set_static_metadata (element_class,
+      "Direct3D12 Video Sink", "Sink/Video", "A Direct3D12 Video Sink",
+      "Seungha Yang <seungha@centricular.com>");
+
+  gst_element_class_add_static_pad_template (element_class, &sink_template);
+
+  basesink_class->start = GST_DEBUG_FUNCPTR (gst_d3d12_video_sink_start);
+  basesink_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_video_sink_stop);
+  basesink_class->unlock = GST_DEBUG_FUNCPTR (gst_d3d12_video_sink_unlock);
+  basesink_class->unlock_stop =
+      GST_DEBUG_FUNCPTR (gst_d3d12_video_sink_unlock_stop);
+  basesink_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_video_sink_propose_allocation);
+  basesink_class->query = GST_DEBUG_FUNCPTR (gst_d3d12_video_sink_query);
+  basesink_class->prepare = GST_DEBUG_FUNCPTR (gst_d3d12_video_sink_prepare);
+  basesink_class->event = GST_DEBUG_FUNCPTR (gst_d3d12_video_sink_event);
+
+  videosink_class->set_info = GST_DEBUG_FUNCPTR (gst_d3d12_video_sink_set_info);
+  videosink_class->show_frame =
+      GST_DEBUG_FUNCPTR (gst_d3d12_video_sink_show_frame);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_MSAA_MODE, (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_D3D12_SAMPLING_METHOD,
+      (GstPluginAPIFlags) 0);
+}
+
+static void
+gst_d3d12_video_sink_init (GstD3D12VideoSink * self)
+{
+  self->priv = new GstD3D12VideoSinkPrivate ();
+
+  auto priv = self->priv;
+  g_signal_connect (priv->window, "key-event",
+      G_CALLBACK (gst_d3d12_video_sink_key_event), self);
+  g_signal_connect (priv->window, "mouse-event",
+      G_CALLBACK (gst_d3d12_video_sink_mouse_event), self);
+  g_signal_connect (priv->window, "fullscreen",
+      G_CALLBACK (gst_d3d12_video_sink_on_fullscreen), self);
+}
+
+static void
+gst_d3d12_video_sink_dispose (GObject * object)
+{
+  auto self = GST_D3D12_VIDEO_SINK (object);
+  auto priv = self->priv;
+
+  g_signal_handlers_disconnect_by_data (priv->window, self);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gst_d3d12_video_sink_finalize (GObject * object)
+{
+  auto self = GST_D3D12_VIDEO_SINK (object);
+
+  delete self->priv;
+  gst_clear_object (&self->device);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_videosink_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_VIDEO_SINK (object);
+  auto priv = self->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  switch (prop_id) {
+    case PROP_ADAPTER:
+      priv->adapter = g_value_get_int (value);
+      break;
+    case PROP_FORCE_ASPECT_RATIO:
+      priv->force_aspect_ratio = g_value_get_boolean (value);
+      gst_d3d12_window_set_force_aspect_ratio (priv->window,
+          priv->force_aspect_ratio);
+      break;
+    case PROP_ENABLE_NAVIGATION_EVENTS:
+      priv->enable_navigation = g_value_get_boolean (value);
+      gst_d3d12_window_set_enable_navigation_events (priv->window,
+          priv->enable_navigation);
+      break;
+    case PROP_ROTATE_METHOD:
+      gst_d3d12_video_sink_set_orientation (self,
+          (GstVideoOrientationMethod) g_value_get_enum (value), FALSE);
+      break;
+    case PROP_FULLSCREEN_ON_ALT_ENTER:
+      priv->fullscreen_on_alt_enter = g_value_get_boolean (value);
+      gst_d3d12_window_enable_fullscreen_on_alt_enter (priv->window,
+          priv->fullscreen_on_alt_enter);
+      break;
+    case PROP_FULLSCREEN:
+      priv->fullscreen = g_value_get_boolean (value);
+      gst_d3d12_window_set_fullscreen (priv->window, priv->fullscreen);
+      break;
+    case PROP_MSAA:
+      priv->msaa = (GstD3D12MSAAMode) g_value_get_enum (value);
+      gst_d3d12_window_set_msaa (priv->window, priv->msaa);
+      break;
+    case PROP_REDRAW_ON_UPDATE:
+      priv->redraw_on_update = g_value_get_boolean (value);
+      gst_d3d12_video_sink_set_orientation (self, priv->orientation, FALSE);
+      break;
+    case PROP_FOV:
+      priv->fov = g_value_get_float (value);
+      gst_d3d12_video_sink_set_orientation (self, priv->orientation, FALSE);
+      break;
+    case PROP_ORTHO:
+      priv->ortho = g_value_get_boolean (value);
+      gst_d3d12_video_sink_set_orientation (self, priv->orientation, FALSE);
+      break;
+    case PROP_ROTATION_X:
+      priv->rotation_x = g_value_get_float (value);
+      gst_d3d12_video_sink_set_orientation (self, priv->orientation, FALSE);
+      break;
+    case PROP_ROTATION_Y:
+      priv->rotation_y = g_value_get_float (value);
+      gst_d3d12_video_sink_set_orientation (self, priv->orientation, FALSE);
+      break;
+    case PROP_ROTATION_Z:
+      priv->rotation_z = g_value_get_float (value);
+      gst_d3d12_video_sink_set_orientation (self, priv->orientation, FALSE);
+      break;
+    case PROP_SCALE_X:
+      priv->scale_x = g_value_get_float (value);
+      gst_d3d12_video_sink_set_orientation (self, priv->orientation, FALSE);
+      break;
+    case PROP_SCALE_Y:
+      priv->scale_y = g_value_get_float (value);
+      gst_d3d12_video_sink_set_orientation (self, priv->orientation, FALSE);
+      break;
+    case PROP_GAMMA_MODE:
+    {
+      auto gamma_mode = (GstVideoGammaMode) g_value_get_enum (value);
+      if (priv->gamma_mode != gamma_mode) {
+        priv->gamma_mode = gamma_mode;
+        priv->update_window = TRUE;
+      }
+      break;
+    }
+    case PROP_PRIMARIES_MODE:
+    {
+      auto primaries_mode = (GstVideoPrimariesMode) g_value_get_enum (value);
+      if (priv->primaries_mode != primaries_mode) {
+        priv->primaries_mode = primaries_mode;
+        priv->update_window = TRUE;
+      }
+      break;
+    }
+    case PROP_SAMPLING_METHOD:
+    {
+      auto sampling_method = (GstD3D12SamplingMethod) g_value_get_enum (value);
+      if (priv->sampling_method != sampling_method) {
+        priv->sampling_method = sampling_method;
+        priv->update_window = TRUE;
+      }
+      break;
+    }
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_videosink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_D3D12_VIDEO_SINK (object);
+  auto priv = self->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  switch (prop_id) {
+    case PROP_ADAPTER:
+      g_value_set_int (value, priv->adapter);
+      break;
+    case PROP_FORCE_ASPECT_RATIO:
+      g_value_set_boolean (value, priv->force_aspect_ratio);
+      break;
+    case PROP_ENABLE_NAVIGATION_EVENTS:
+      g_value_set_boolean (value, priv->enable_navigation);
+      break;
+    case PROP_ROTATE_METHOD:
+      g_value_set_enum (value, priv->orientation);
+      break;
+    case PROP_FULLSCREEN_ON_ALT_ENTER:
+      g_value_set_boolean (value, priv->fullscreen_on_alt_enter);
+      break;
+    case PROP_FULLSCREEN:
+      g_value_set_boolean (value, priv->fullscreen);
+      break;
+    case PROP_MSAA:
+      g_value_set_enum (value, priv->msaa);
+      break;
+    case PROP_REDRAW_ON_UPDATE:
+      g_value_set_boolean (value, priv->redraw_on_update);
+      break;
+    case PROP_FOV:
+      g_value_set_float (value, priv->fov);
+      break;
+    case PROP_ORTHO:
+      g_value_set_boolean (value, priv->ortho);
+      break;
+    case PROP_ROTATION_X:
+      g_value_set_float (value, priv->rotation_x);
+      break;
+    case PROP_ROTATION_Y:
+      g_value_set_float (value, priv->rotation_x);
+      break;
+    case PROP_ROTATION_Z:
+      g_value_set_float (value, priv->rotation_z);
+      break;
+    case PROP_SCALE_X:
+      g_value_set_float (value, priv->scale_x);
+      break;
+    case PROP_SCALE_Y:
+      g_value_set_float (value, priv->scale_y);
+      break;
+    case PROP_GAMMA_MODE:
+      g_value_set_enum (value, priv->gamma_mode);
+      break;
+    case PROP_PRIMARIES_MODE:
+      g_value_set_enum (value, priv->primaries_mode);
+      break;
+    case PROP_SAMPLING_METHOD:
+      g_value_set_enum (value, priv->sampling_method);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_d3d12_video_sink_set_orientation (GstD3D12VideoSink * self,
+    GstVideoOrientationMethod orientation, gboolean from_tag)
+{
+  auto priv = self->priv;
+
+  if (orientation == GST_VIDEO_ORIENTATION_CUSTOM) {
+    GST_WARNING_OBJECT (self, "Unsupported custom orientation");
+    return;
+  }
+
+  if (from_tag)
+    priv->orientation_from_tag = orientation;
+  else
+    priv->orientation = orientation;
+
+  if (priv->orientation == GST_VIDEO_ORIENTATION_AUTO)
+    priv->orientation_selected = priv->orientation_from_tag;
+  else
+    priv->orientation_selected = priv->orientation;
+
+  gst_d3d12_window_set_orientation (priv->window,
+      priv->redraw_on_update, priv->orientation_selected, priv->fov,
+      priv->ortho, priv->rotation_x, priv->rotation_y, priv->rotation_z,
+      priv->scale_x, priv->scale_y);
+}
+
+static void
+gst_d3d12_video_sink_set_context (GstElement * element, GstContext * context)
+{
+  auto self = GST_D3D12_VIDEO_SINK (element);
+  auto priv = self->priv;
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->context_lock);
+    gst_d3d12_handle_set_context (element,
+        context, priv->adapter, &self->device);
+  }
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_d3d12_video_sink_event (GstBaseSink * sink, GstEvent * event)
+{
+  auto self = GST_D3D12_VIDEO_SINK (sink);
+  auto priv = self->priv;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_TAG:{
+      GstTagList *taglist;
+      gchar *title = nullptr;
+
+      gst_event_parse_tag (event, &taglist);
+      gst_tag_list_get_string (taglist, GST_TAG_TITLE, &title);
+
+      std::lock_guard < std::recursive_mutex > lk (priv->lock);
+
+      if (title) {
+        const gchar *app_name = g_get_application_name ();
+        std::string title_string;
+
+        if (app_name) {
+          title_string = std::string (title) + " : " + std::string (app_name);
+        } else {
+          title_string = std::string (title);
+        }
+
+        gst_d3d12_window_set_title (priv->window, title_string.c_str ());
+        g_free (title);
+      }
+
+      GstVideoOrientationMethod orientation = GST_VIDEO_ORIENTATION_IDENTITY;
+      if (gst_video_orientation_from_tag (taglist, &orientation))
+        gst_d3d12_video_sink_set_orientation (self, orientation, TRUE);
+      break;
+    }
+    default:
+      break;
+  }
+
+  return GST_BASE_SINK_CLASS (parent_class)->event (sink, event);
+}
+
+static gboolean
+gst_d3d12_video_sink_set_info (GstVideoSink * sink, GstCaps * caps,
+    const GstVideoInfo * info)
+{
+  auto self = GST_D3D12_VIDEO_SINK (sink);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "set caps %" GST_PTR_FORMAT, caps);
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  gst_caps_replace (&priv->caps, caps);
+  priv->info = *info;
+  priv->update_window = TRUE;
+
+  return TRUE;
+}
+
+static void
+gst_d3d12_video_sink_key_event (GstD3D12Window * window, const gchar * event,
+    const gchar * key, GstD3D12VideoSink * self)
+{
+  GstEvent *key_event;
+
+  GST_LOG_OBJECT (self, "send key event %s, key %s", event, key);
+  if (g_strcmp0 ("key-press", event) == 0) {
+    key_event = gst_navigation_event_new_key_press (key,
+        GST_NAVIGATION_MODIFIER_NONE);
+  } else if (g_strcmp0 ("key-release", event) == 0) {
+    key_event = gst_navigation_event_new_key_release (key,
+        GST_NAVIGATION_MODIFIER_NONE);
+  } else {
+    return;
+  }
+
+  gst_navigation_send_event_simple (GST_NAVIGATION (self), key_event);
+}
+
+static void
+gst_d3d12_video_sink_mouse_event (GstD3D12Window * window, const gchar * event,
+    gint button, gdouble x, gdouble y, GstD3D12VideoSink * self)
+{
+  GstEvent *mouse_event;
+
+  GST_LOG_OBJECT (self,
+      "send mouse event %s, button %d (%.1f, %.1f)", event, button, x, y);
+  if (g_strcmp0 ("mouse-button-press", event) == 0) {
+    mouse_event = gst_navigation_event_new_mouse_button_press (button, x, y,
+        GST_NAVIGATION_MODIFIER_NONE);
+  } else if (g_strcmp0 ("mouse-button-release", event) == 0) {
+    mouse_event = gst_navigation_event_new_mouse_button_release (button, x, y,
+        GST_NAVIGATION_MODIFIER_NONE);
+  } else if (g_strcmp0 ("mouse-move", event) == 0) {
+    mouse_event = gst_navigation_event_new_mouse_move (x, y,
+        GST_NAVIGATION_MODIFIER_NONE);
+  } else {
+    return;
+  }
+
+  gst_navigation_send_event_simple (GST_NAVIGATION (self), mouse_event);
+}
+
+static void
+gst_d3d12_video_sink_on_fullscreen (GstD3D12Window * window,
+    gboolean is_fullscreen, GstD3D12VideoSink * self)
+{
+  auto priv = self->priv;
+  gboolean notify = FALSE;
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    if (priv->fullscreen != is_fullscreen) {
+      priv->fullscreen = is_fullscreen;
+      notify = TRUE;
+    }
+  }
+
+  if (notify)
+    g_object_notify (G_OBJECT (self), "fullscreen");
+}
+
+static GstFlowReturn
+gst_d3d12_video_sink_update_window (GstD3D12VideoSink * self)
+{
+  auto priv = self->priv;
+  auto overlay = GST_VIDEO_OVERLAY (self);
+  bool notify_window_handle = false;
+  guintptr window_handle = 0;
+  auto window_state = gst_d3d12_window_get_state (priv->window);
+
+  if (window_state == GST_D3D12_WINDOW_STATE_CLOSED) {
+    GST_ERROR_OBJECT (self, "Window was closed");
+    return GST_FLOW_ERROR;
+  }
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    if (window_state == GST_D3D12_WINDOW_STATE_OPENED && !priv->update_window)
+      return GST_FLOW_OK;
+
+    GST_DEBUG_OBJECT (self, "Updating window with caps %" GST_PTR_FORMAT,
+        priv->caps);
+
+    if (window_state == GST_D3D12_WINDOW_STATE_INIT) {
+      if (!priv->window_handle)
+        gst_video_overlay_prepare_window_handle (overlay);
+
+      if (priv->window_handle) {
+        gst_video_overlay_got_window_handle (overlay, priv->window_handle);
+        window_handle = priv->window_handle;
+      } else {
+        notify_window_handle = true;
+      }
+    } else {
+      window_handle = priv->window_handle;
+    }
+
+    priv->update_window = FALSE;
+  }
+
+  if (priv->pool) {
+    gst_buffer_pool_set_active (priv->pool, FALSE);
+    gst_clear_object (&priv->pool);
+  }
+
+  auto video_width = GST_VIDEO_INFO_WIDTH (&priv->info);
+  auto video_height = GST_VIDEO_INFO_HEIGHT (&priv->info);
+  auto video_par_n = GST_VIDEO_INFO_PAR_N (&priv->info);
+  auto video_par_d = GST_VIDEO_INFO_PAR_D (&priv->info);
+  gint display_par_n = 1;
+  gint display_par_d = 1;
+  guint num, den;
+
+  if (!gst_video_calculate_display_ratio (&num, &den, video_width,
+          video_height, video_par_n, video_par_d, display_par_n,
+          display_par_d)) {
+    GST_ELEMENT_ERROR (self, CORE, NEGOTIATION, (nullptr),
+        ("Error calculating the output display ratio of the video."));
+    return GST_FLOW_ERROR;
+  }
+
+  GST_DEBUG_OBJECT (self,
+      "video width/height: %dx%d, calculated display ratio: %d/%d format: %s",
+      video_width, video_height, num, den,
+      gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&priv->info)));
+
+  if (video_height % den == 0) {
+    GST_DEBUG_OBJECT (self, "keeping video height");
+    GST_VIDEO_SINK_WIDTH (self) = (guint)
+        gst_util_uint64_scale_int (video_height, num, den);
+    GST_VIDEO_SINK_HEIGHT (self) = video_height;
+  } else if (video_width % num == 0) {
+    GST_DEBUG_OBJECT (self, "keeping video width");
+    GST_VIDEO_SINK_WIDTH (self) = video_width;
+    GST_VIDEO_SINK_HEIGHT (self) = (guint)
+        gst_util_uint64_scale_int (video_width, den, num);
+  } else {
+    GST_DEBUG_OBJECT (self, "approximating while keeping video height");
+    GST_VIDEO_SINK_WIDTH (self) = (guint)
+        gst_util_uint64_scale_int (video_height, num, den);
+    GST_VIDEO_SINK_HEIGHT (self) = video_height;
+  }
+
+  GST_DEBUG_OBJECT (self, "scaling to %dx%d",
+      GST_VIDEO_SINK_WIDTH (self), GST_VIDEO_SINK_HEIGHT (self));
+
+  if (GST_VIDEO_SINK_WIDTH (self) <= 0 || GST_VIDEO_SINK_HEIGHT (self) <= 0) {
+    GST_ELEMENT_ERROR (self, CORE, NEGOTIATION, (nullptr),
+        ("Error calculating the output display ratio of the video."));
+    return GST_FLOW_ERROR;
+  }
+
+  auto config = gst_structure_new ("convert-config",
+      GST_D3D12_CONVERTER_OPT_GAMMA_MODE,
+      GST_TYPE_VIDEO_GAMMA_MODE, priv->gamma_mode,
+      GST_D3D12_CONVERTER_OPT_PRIMARIES_MODE,
+      GST_TYPE_VIDEO_PRIMARIES_MODE, priv->primaries_mode,
+      GST_D3D12_CONVERTER_OPT_SAMPLER_FILTER,
+      GST_TYPE_D3D12_CONVERTER_SAMPLER_FILTER,
+      gst_d3d12_sampling_method_to_native (priv->sampling_method), nullptr);
+
+  auto ret = gst_d3d12_window_prepare (priv->window, self->device,
+      window_handle, GST_VIDEO_SINK_WIDTH (self),
+      GST_VIDEO_SINK_HEIGHT (self), priv->caps, config);
+  if (ret != GST_FLOW_OK) {
+    if (ret == GST_FLOW_FLUSHING) {
+      GST_WARNING_OBJECT (self, "We are flushing");
+      gst_d3d12_window_unprepare (priv->window);
+
+      return ret;
+    }
+
+    GST_ELEMENT_ERROR (self, RESOURCE, FAILED, (nullptr),
+        ("Couldn't setup swapchain"));
+    return GST_FLOW_ERROR;
+  }
+
+  if (notify_window_handle && !window_handle) {
+    window_handle = gst_d3d12_window_get_window_handle (priv->window);
+    gst_video_overlay_got_window_handle (overlay, window_handle);
+  }
+
+  priv->pool = gst_d3d12_buffer_pool_new (self->device);
+  config = gst_buffer_pool_get_config (priv->pool);
+
+  gst_buffer_pool_config_set_params (config, priv->caps, priv->info.size, 0, 0);
+  if (!gst_buffer_pool_set_config (priv->pool, config) ||
+      !gst_buffer_pool_set_active (priv->pool, TRUE)) {
+    GST_ELEMENT_ERROR (self, RESOURCE, FAILED, (nullptr),
+        ("Couldn't setup buffer pool"));
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_d3d12_video_sink_start (GstBaseSink * sink)
+{
+  auto self = GST_D3D12_VIDEO_SINK (sink);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Start");
+
+  if (!gst_d3d12_ensure_element_data (GST_ELEMENT_CAST (self), priv->adapter,
+          &self->device)) {
+    GST_ERROR_OBJECT (sink, "Cannot create device");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_video_sink_stop (GstBaseSink * sink)
+{
+  auto self = GST_D3D12_VIDEO_SINK (sink);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  priv->orientation_from_tag = GST_VIDEO_ORIENTATION_IDENTITY;
+
+  if (priv->pool) {
+    gst_buffer_pool_set_active (priv->pool, FALSE);
+    gst_clear_object (&priv->pool);
+  }
+
+  gst_d3d12_window_unprepare (priv->window);
+  gst_clear_object (&self->device);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_video_sink_unlock (GstBaseSink * sink)
+{
+  auto self = GST_D3D12_VIDEO_SINK (sink);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Unlock");
+
+  gst_d3d12_window_unlock (priv->window);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_video_sink_unlock_stop (GstBaseSink * sink)
+{
+  auto self = GST_D3D12_VIDEO_SINK (sink);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Unlock stop");
+
+  gst_d3d12_window_unlock_stop (priv->window);
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_video_sink_propose_allocation (GstBaseSink * sink, GstQuery * query)
+{
+  auto self = GST_D3D12_VIDEO_SINK (sink);
+  GstCaps *caps;
+  GstBufferPool *pool = nullptr;
+  GstVideoInfo info;
+  guint size;
+  gboolean need_pool;
+
+  if (!self->device) {
+    GST_WARNING_OBJECT (self, "No configured device");
+    return FALSE;
+  }
+
+  gst_query_parse_allocation (query, &caps, &need_pool);
+  if (!caps) {
+    GST_WARNING_OBJECT (self, "no caps specified");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_ERROR_OBJECT (self, "Invalid caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+
+  size = info.size;
+
+  bool is_d3d12 = false;
+  auto features = gst_caps_get_features (caps, 0);
+  if (gst_caps_features_contains (features,
+          GST_CAPS_FEATURE_MEMORY_D3D12_MEMORY)) {
+    is_d3d12 = true;
+    GST_DEBUG_OBJECT (self, "upstream support d3d12 memory");
+  }
+
+  if (need_pool) {
+    if (is_d3d12)
+      pool = gst_d3d12_buffer_pool_new (self->device);
+    else
+      pool = gst_video_buffer_pool_new ();
+
+    auto config = gst_buffer_pool_get_config (pool);
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
+    if (!is_d3d12) {
+      gst_buffer_pool_config_add_option (config,
+          GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+    }
+
+    gst_buffer_pool_config_set_params (config, caps, size, 2, 0);
+
+    if (!gst_buffer_pool_set_config (pool, config)) {
+      GST_ERROR_OBJECT (pool, "Couldn't set config");
+      gst_object_unref (pool);
+
+      return FALSE;
+    }
+
+    if (is_d3d12) {
+      config = gst_buffer_pool_get_config (pool);
+      gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr,
+          nullptr);
+      gst_structure_free (config);
+    }
+  }
+
+  gst_query_add_allocation_pool (query, pool, size, 2, 0);
+  gst_clear_object (&pool);
+
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, nullptr);
+  gst_query_add_allocation_meta (query,
+      GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE, nullptr);
+  if (is_d3d12) {
+    gst_query_add_allocation_meta (query,
+        GST_VIDEO_CROP_META_API_TYPE, nullptr);
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_d3d12_video_sink_query (GstBaseSink * sink, GstQuery * query)
+{
+  auto self = GST_D3D12_VIDEO_SINK (sink);
+  auto priv = self->priv;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+    {
+      std::lock_guard < std::recursive_mutex > lk (priv->context_lock);
+      if (gst_d3d12_handle_context_query (GST_ELEMENT (self), query,
+              self->device)) {
+        return TRUE;
+      }
+      break;
+    }
+    default:
+      break;
+  }
+
+  return GST_BASE_SINK_CLASS (parent_class)->query (sink, query);
+}
+
+static void
+gst_d3d12_video_sink_check_device_update (GstD3D12VideoSink * self,
+    GstBuffer * buf)
+{
+  auto priv = self->priv;
+
+  auto mem = gst_buffer_peek_memory (buf, 0);
+  if (!gst_is_d3d12_memory (mem))
+    return;
+
+  auto dmem = GST_D3D12_MEMORY_CAST (mem);
+  if (dmem->device == self->device)
+    return;
+
+  GST_INFO_OBJECT (self, "Updating device %" GST_PTR_FORMAT " -> %"
+      GST_PTR_FORMAT, self->device, dmem->device);
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    priv->update_window = TRUE;
+  }
+
+  std::lock_guard < std::recursive_mutex > lk (priv->context_lock);
+  gst_clear_object (&self->device);
+  self->device = (GstD3D12Device *) gst_object_ref (dmem->device);
+}
+
+static gboolean
+gst_d3d12_video_sink_foreach_meta (GstBuffer * buffer, GstMeta ** meta,
+    GstBuffer * uploaded)
+{
+  if ((*meta)->info->api != GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE)
+    return TRUE;
+
+  auto cmeta = (GstVideoOverlayCompositionMeta *) (*meta);
+  if (!cmeta->overlay)
+    return TRUE;
+
+  if (gst_video_overlay_composition_n_rectangles (cmeta->overlay) == 0)
+    return TRUE;
+
+  gst_buffer_add_video_overlay_composition_meta (uploaded, cmeta->overlay);
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_d3d12_video_sink_prepare (GstBaseSink * sink, GstBuffer * buffer)
+{
+  auto self = GST_D3D12_VIDEO_SINK (sink);
+  auto priv = self->priv;
+
+  gst_d3d12_video_sink_check_device_update (self, buffer);
+  auto ret = gst_d3d12_video_sink_update_window (self);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  GstBuffer *upload = nullptr;
+  auto mem = gst_buffer_peek_memory (buffer, 0);
+  if (!gst_is_d3d12_memory (mem)) {
+    gst_buffer_pool_acquire_buffer (priv->pool, &upload, nullptr);
+    if (!upload) {
+      GST_ERROR_OBJECT (self, "Couldn't allocate upload buffer");
+      return GST_FLOW_ERROR;
+    }
+
+    GstVideoFrame in_frame, out_frame;
+    if (!gst_video_frame_map (&in_frame, &priv->info, buffer, GST_MAP_READ)) {
+      GST_ERROR_OBJECT (self, "Couldn't map input frame");
+      gst_buffer_unref (upload);
+      return GST_FLOW_ERROR;
+    }
+
+    if (!gst_video_frame_map (&out_frame, &priv->info, upload, GST_MAP_WRITE)) {
+      GST_ERROR_OBJECT (self, "Couldn't map upload frame");
+      gst_video_frame_unmap (&in_frame);
+      gst_buffer_unref (upload);
+      return GST_FLOW_ERROR;
+    }
+
+    auto copy_ret = gst_video_frame_copy (&out_frame, &in_frame);
+    gst_video_frame_unmap (&out_frame);
+    gst_video_frame_unmap (&in_frame);
+    if (!copy_ret) {
+      GST_ERROR_OBJECT (self, "Couldn't copy frame");
+      gst_buffer_unref (upload);
+      return GST_FLOW_ERROR;
+    }
+
+    gst_buffer_foreach_meta (buffer,
+        (GstBufferForeachMetaFunc) gst_d3d12_video_sink_foreach_meta, upload);
+
+    buffer = upload;
+  }
+
+  ret = gst_d3d12_window_set_buffer (priv->window, buffer);
+
+  if (upload)
+    gst_buffer_unref (upload);
+
+  if (ret == GST_D3D12_WINDOW_FLOW_CLOSED) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+        ("Output window was closed"), (nullptr));
+    return GST_FLOW_ERROR;
+  }
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_video_sink_show_frame (GstVideoSink * sink, GstBuffer * buf)
+{
+  auto self = GST_D3D12_VIDEO_SINK (sink);
+  auto priv = self->priv;
+
+  auto ret = gst_d3d12_window_present (priv->window);
+  if (ret == GST_D3D12_WINDOW_FLOW_CLOSED) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND,
+        ("Output window was closed"), (nullptr));
+    ret = GST_FLOW_ERROR;
+  }
+
+  return ret;
+}
+
+static void
+gst_d3d12_video_sink_overlay_expose (GstVideoOverlay * overlay)
+{
+  auto self = GST_D3D12_VIDEO_SINK (overlay);
+  auto priv = self->priv;
+
+  gst_d3d12_window_set_buffer (priv->window, nullptr);
+}
+
+static void
+gst_d3d12_video_sink_overlay_handle_events (GstVideoOverlay * overlay,
+    gboolean handle_events)
+{
+  auto self = GST_D3D12_VIDEO_SINK (overlay);
+  auto priv = self->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  priv->enable_navigation = handle_events;
+  gst_d3d12_window_set_enable_navigation_events (priv->window, handle_events);
+}
+
+static void
+gst_d3d12_video_sink_overlay_set_window_handle (GstVideoOverlay * overlay,
+    guintptr window_handle)
+{
+  auto self = GST_D3D12_VIDEO_SINK (overlay);
+  auto priv = self->priv;
+
+  GST_DEBUG ("set window handle %" G_GUINTPTR_FORMAT, window_handle);
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  if (priv->window_handle != window_handle) {
+    priv->window_handle = window_handle;
+    priv->update_window = TRUE;
+  }
+}
+
+static void
+gst_d3d12_video_sink_overlay_set_render_rectangle (GstVideoOverlay * overlay,
+    gint x, gint y, gint width, gint height)
+{
+  auto self = GST_D3D12_VIDEO_SINK (overlay);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self,
+      "render rect x: %d, y: %d, width: %d, height %d", x, y, width, height);
+
+  GstVideoRectangle rect;
+  rect.x = x;
+  rect.y = y;
+  rect.w = width;
+  rect.h = height;
+
+  gst_d3d12_window_set_render_rect (priv->window, &rect);
+}
+
+static void
+gst_d3d12_video_sink_video_overlay_init (GstVideoOverlayInterface * iface)
+{
+  iface->expose = gst_d3d12_video_sink_overlay_expose;
+  iface->handle_events = gst_d3d12_video_sink_overlay_handle_events;
+  iface->set_window_handle = gst_d3d12_video_sink_overlay_set_window_handle;
+  iface->set_render_rectangle =
+      gst_d3d12_video_sink_overlay_set_render_rectangle;
+}
+
+static void
+gst_d3d12_video_sink_navigation_send_event (GstNavigation * navigation,
+    GstEvent * event)
+{
+  auto self = GST_D3D12_VIDEO_SINK (navigation);
+
+  if (event) {
+    gboolean handled;
+
+    gst_event_ref (event);
+    handled = gst_pad_push_event (GST_VIDEO_SINK_PAD (self), event);
+
+    if (!handled)
+      gst_element_post_message (GST_ELEMENT_CAST (self),
+          gst_navigation_message_new_event (GST_OBJECT_CAST (self), event));
+
+    gst_event_unref (event);
+  }
+}
+
+static void
+gst_d3d12_video_sink_navigation_init (GstNavigationInterface * iface)
+{
+  iface->send_event_simple = gst_d3d12_video_sink_navigation_send_event;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12videosink.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_D3D12_VIDEO_SINK (gst_d3d12_video_sink_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12VideoSink, gst_d3d12_video_sink,
+    GST, D3D12_VIDEO_SINK, GstVideoSink)
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12vp8dec.cpp Added

@@ -0,0 +1,367 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02120-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d12vp8dec
+ * @title: d3d12vp8dec
+ *
+ * A Direct3D12 based VP8 video decoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/vp8/file ! parsebin ! d3d12vp8dec ! videoconvert ! autovideosink
+ * ```
+ *
+ * Since: 1.24
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstd3d12vp8dec.h"
+#include <gst/dxva/gstdxvavp8decoder.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_vp8_dec_debug);
+#define GST_CAT_DEFAULT gst_d3d12_vp8_dec_debug
+
+GST_D3D12_DECODER_DEFINE_TYPE (GstD3D12Vp8Dec, gst_d3d12_vp8_dec,
+    GST, D3D12_VP8_DEC, GstDxvaVp8Decoder);
+
+static void
+gst_d3d12_vp8_dec_class_init (GstD3D12Vp8DecClass * klass, gpointer data)
+{
+  auto gobject_class = G_OBJECT_CLASS (klass);
+  auto element_class = GST_ELEMENT_CLASS (klass);
+  auto decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  auto dxva_class = GST_DXVA_VP8_DECODER_CLASS (klass);
+  auto cdata = (GstD3D12DecoderClassData *) data;
+
+  gobject_class->finalize = gst_d3d12_vp8_dec_finalize;
+  gobject_class->get_property = gst_d3d12_vp8_dec_get_property;
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_set_context);
+
+  parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
+  gst_d3d12_decoder_class_data_fill_subclass_data (cdata, &klass->class_data);
+
+  gst_d3d12_decoder_proxy_class_init (element_class, cdata,
+      "Seungha Yang <seungha@centricualr.com>");
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_open);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_stop);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_close);
+  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_sink_query);
+  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_src_query);
+  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_sink_event);
+  decoder_class->drain = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_drain);
+  decoder_class->finish = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_finish);
+  decoder_class->flush = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_flush);
+
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_new_picture);
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_get_picture_id);
+  dxva_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_start_picture);
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_end_picture);
+  dxva_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_vp8_dec_output_picture);
+}
+
+static void
+gst_d3d12_vp8_dec_init (GstD3D12Vp8Dec * self)
+{
+  auto klass = GST_D3D12_VP8_DEC_GET_CLASS (self);
+  auto cdata = &klass->class_data;
+
+  self->decoder = gst_d3d12_decoder_new (GST_DXVA_CODEC_VP8,
+      cdata->adapter_luid);
+}
+
+static void
+gst_d3d12_vp8_dec_finalize (GObject * object)
+{
+  auto self = GST_D3D12_VP8_DEC (object);
+
+  gst_object_unref (self->decoder);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_vp8_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  auto klass = GST_D3D12_VP8_DEC_GET_CLASS (object);
+  auto cdata = &klass->class_data;
+
+  gst_d3d12_decoder_proxy_get_property (object, prop_id, value, pspec, cdata);
+}
+
+static void
+gst_d3d12_vp8_dec_set_context (GstElement * element, GstContext * context)
+{
+  auto self = GST_D3D12_VP8_DEC (element);
+
+  gst_d3d12_decoder_set_context (self->decoder, element, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_d3d12_vp8_dec_open (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  return gst_d3d12_decoder_open (self->decoder, GST_ELEMENT (self));
+}
+
+static gboolean
+gst_d3d12_vp8_dec_stop (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  gst_d3d12_decoder_stop (self->decoder);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+}
+
+static gboolean
+gst_d3d12_vp8_dec_close (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  return gst_d3d12_decoder_close (self->decoder);
+}
+
+static gboolean
+gst_d3d12_vp8_dec_negotiate (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  if (!gst_d3d12_decoder_negotiate (self->decoder, decoder))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_d3d12_vp8_dec_decide_allocation (GstVideoDecoder * decoder,
+    GstQuery * query)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  if (!gst_d3d12_decoder_decide_allocation (self->decoder, decoder, query)) {
+    return FALSE;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static gboolean
+gst_d3d12_vp8_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_vp8_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_vp8_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  gst_d3d12_decoder_sink_event (self->decoder, event);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstFlowReturn
+gst_d3d12_vp8_dec_drain (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->drain (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_vp8_dec_finish (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->finish (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static gboolean
+gst_d3d12_vp8_dec_flush (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->flush (decoder);
+  gst_d3d12_decoder_flush (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_vp8_dec_configure (GstDxvaVp8Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+  auto videodec = GST_VIDEO_DECODER (decoder);
+
+  return gst_d3d12_decoder_configure (self->decoder, videodec, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
+}
+
+static GstFlowReturn
+gst_d3d12_vp8_dec_new_picture (GstDxvaVp8Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  return gst_d3d12_decoder_new_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture);
+}
+
+static guint8
+gst_d3d12_vp8_dec_get_picture_id (GstDxvaVp8Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  return gst_d3d12_decoder_get_picture_id (self->decoder, picture);
+}
+
+static GstFlowReturn
+gst_d3d12_vp8_dec_start_picture (GstDxvaVp8Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  return gst_d3d12_decoder_start_picture (self->decoder, picture, picture_id);
+}
+
+static GstFlowReturn
+gst_d3d12_vp8_dec_end_picture (GstDxvaVp8Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  return gst_d3d12_decoder_end_picture (self->decoder, picture, ref_pics, args);
+}
+
+static GstFlowReturn
+gst_d3d12_vp8_dec_output_picture (GstDxvaVp8Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
+{
+  auto self = GST_D3D12_VP8_DEC (decoder);
+
+  return gst_d3d12_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
+}
+
+void
+gst_d3d12_vp8_dec_register (GstPlugin * plugin, GstD3D12Device * device,
+    ID3D12VideoDevice * video_device, guint rank)
+{
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  guint index = 0;
+  GTypeInfo type_info = {
+    sizeof (GstD3D12Vp8DecClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_d3d12_vp8_dec_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstD3D12Vp8Dec),
+    0,
+    (GInstanceInitFunc) gst_d3d12_vp8_dec_init,
+  };
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_vp8_dec_debug, "d3d12vp8dec", 0,
+      "d3d12vp8dec");
+
+  type_info.class_data =
+      gst_d3d12_decoder_check_feature_support (device, video_device,
+      GST_DXVA_CODEC_VP8);
+  if (!type_info.class_data)
+    return;
+
+  type_name = g_strdup ("GstD3D12Vp8Dec");
+  feature_name = g_strdup ("d3d12vp8dec");
+
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstD3D12Vp8Device%dDec", index);
+    feature_name = g_strdup_printf ("d3d12vp8device%ddec", index);
+  }
+
+  type = g_type_register_static (GST_TYPE_DXVA_VP8_DECODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  /* make lower rank than default device */
+  if (rank > 0 && index != 0)
+    rank--;
+
+  if (index != 0)
+    gst_element_type_set_skip_documentation (type);
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12vp8dec.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstd3d12decoder.h"
+
+G_BEGIN_DECLS
+
+void  gst_d3d12_vp8_dec_register (GstPlugin * plugin,
+                                  GstD3D12Device * device,
+                                  ID3D12VideoDevice * video_device,
+                                  guint rank);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12vp9dec.cpp Added

@@ -0,0 +1,380 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02120-1301, USA.
+ */
+
+/**
+ * SECTION:element-d3d12vp9dec
+ * @title: d3d12vp9dec
+ *
+ * A Direct3D12 based VP9 video decoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/vp9/file ! parsebin ! d3d12vp9dec ! videoconvert ! autovideosink
+ * ```
+ *
+ * Since: 1.24
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gstd3d12vp9dec.h"
+#include <gst/dxva/gstdxvavp9decoder.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_vp9_dec_debug);
+#define GST_CAT_DEFAULT gst_d3d12_vp9_dec_debug
+
+GST_D3D12_DECODER_DEFINE_TYPE_FULL (GstD3D12Vp9Dec, gst_d3d12_vp9_dec,
+    GST, D3D12_VP9_DEC, GstDxvaVp9Decoder);
+
+static void
+gst_d3d12_vp9_dec_class_init (GstD3D12Vp9DecClass * klass, gpointer data)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstDxvaVp9DecoderClass *dxva_class = GST_DXVA_VP9_DECODER_CLASS (klass);
+  GstD3D12DecoderClassData *cdata = (GstD3D12DecoderClassData *) data;
+
+  gobject_class->finalize = gst_d3d12_vp9_dec_finalize;
+  gobject_class->get_property = gst_d3d12_vp9_dec_get_property;
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_set_context);
+
+  parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
+  gst_d3d12_decoder_class_data_fill_subclass_data (cdata, &klass->class_data);
+
+  gst_d3d12_decoder_proxy_class_init (element_class, cdata,
+      "Seungha Yang <seungha@centricualr.com>");
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_open);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_stop);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_close);
+  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_sink_query);
+  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_src_query);
+  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_sink_event);
+  decoder_class->drain = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_drain);
+  decoder_class->finish = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_finish);
+  decoder_class->flush = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_flush);
+
+  dxva_class->configure = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_configure);
+  dxva_class->new_picture = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_new_picture);
+  dxva_class->duplicate_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_duplicate_picture);
+  dxva_class->get_picture_id =
+      GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_get_picture_id);
+  dxva_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_start_picture);
+  dxva_class->end_picture = GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_end_picture);
+  dxva_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_d3d12_vp9_dec_output_picture);
+}
+
+static void
+gst_d3d12_vp9_dec_init (GstD3D12Vp9Dec * self)
+{
+  GstD3D12Vp9DecClass *klass = GST_D3D12_VP9_DEC_GET_CLASS (self);
+  GstD3D12DecoderSubClassData *cdata = &klass->class_data;
+
+  self->decoder = gst_d3d12_decoder_new (GST_DXVA_CODEC_VP9,
+      cdata->adapter_luid);
+}
+
+static void
+gst_d3d12_vp9_dec_finalize (GObject * object)
+{
+  auto self = GST_D3D12_VP9_DEC (object);
+
+  gst_object_unref (self->decoder);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_vp9_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstD3D12Vp9DecClass *klass = GST_D3D12_VP9_DEC_GET_CLASS (object);
+  GstD3D12DecoderSubClassData *cdata = &klass->class_data;
+
+  gst_d3d12_decoder_proxy_get_property (object, prop_id, value, pspec, cdata);
+}
+
+static void
+gst_d3d12_vp9_dec_set_context (GstElement * element, GstContext * context)
+{
+  auto self = GST_D3D12_VP9_DEC (element);
+
+  gst_d3d12_decoder_set_context (self->decoder, element, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_d3d12_vp9_dec_open (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  return gst_d3d12_decoder_open (self->decoder, GST_ELEMENT (self));
+}
+
+static gboolean
+gst_d3d12_vp9_dec_stop (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  gst_d3d12_decoder_stop (self->decoder);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+}
+
+static gboolean
+gst_d3d12_vp9_dec_close (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  return gst_d3d12_decoder_close (self->decoder);
+}
+
+static gboolean
+gst_d3d12_vp9_dec_negotiate (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  if (!gst_d3d12_decoder_negotiate (self->decoder, decoder))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_d3d12_vp9_dec_decide_allocation (GstVideoDecoder * decoder,
+    GstQuery * query)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  if (!gst_d3d12_decoder_decide_allocation (self->decoder, decoder, query)) {
+    return FALSE;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static gboolean
+gst_d3d12_vp9_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_vp9_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  if (gst_d3d12_decoder_handle_query (self->decoder, GST_ELEMENT (self), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+}
+
+static gboolean
+gst_d3d12_vp9_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  gst_d3d12_decoder_sink_event (self->decoder, event);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstFlowReturn
+gst_d3d12_vp9_dec_drain (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->drain (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_vp9_dec_finish (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->finish (decoder);
+  gst_d3d12_decoder_drain (self->decoder, decoder);
+
+  return ret;
+}
+
+static gboolean
+gst_d3d12_vp9_dec_flush (GstVideoDecoder * decoder)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  auto ret = GST_VIDEO_DECODER_CLASS (parent_class)->flush (decoder);
+  gst_d3d12_decoder_flush (self->decoder, decoder);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_d3d12_vp9_dec_configure (GstDxvaVp9Decoder * decoder,
+    GstVideoCodecState * input_state, const GstVideoInfo * info,
+    gint crop_x, gint crop_y, gint coded_width, gint coded_height,
+    gint max_dpb_size)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+  auto videodec = GST_VIDEO_DECODER (decoder);
+
+  return gst_d3d12_decoder_configure (self->decoder, videodec, input_state,
+      info, crop_x, crop_y, coded_width, coded_height, max_dpb_size);
+}
+
+static GstFlowReturn
+gst_d3d12_vp9_dec_new_picture (GstDxvaVp9Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+  auto vp9pic = GST_VP9_PICTURE (picture);
+
+  return gst_d3d12_decoder_new_picture_with_size (self->decoder,
+      GST_VIDEO_DECODER (decoder), picture, vp9pic->frame_hdr.width,
+      vp9pic->frame_hdr.height);
+}
+
+static GstFlowReturn
+gst_d3d12_vp9_dec_duplicate_picture (GstDxvaVp9Decoder * decoder,
+    GstCodecPicture * src, GstCodecPicture * dst)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  return gst_d3d12_decoder_duplicate_picture (self->decoder, src, dst);
+}
+
+static guint8
+gst_d3d12_vp9_dec_get_picture_id (GstDxvaVp9Decoder * decoder,
+    GstCodecPicture * picture)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  return gst_d3d12_decoder_get_picture_id (self->decoder, picture);
+}
+
+static GstFlowReturn
+gst_d3d12_vp9_dec_start_picture (GstDxvaVp9Decoder * decoder,
+    GstCodecPicture * picture, guint8 * picture_id)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  return gst_d3d12_decoder_start_picture (self->decoder, picture, picture_id);
+}
+
+static GstFlowReturn
+gst_d3d12_vp9_dec_end_picture (GstDxvaVp9Decoder * decoder,
+    GstCodecPicture * picture, GPtrArray * ref_pics,
+    const GstDxvaDecodingArgs * args)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  return gst_d3d12_decoder_end_picture (self->decoder, picture, ref_pics, args);
+}
+
+static GstFlowReturn
+gst_d3d12_vp9_dec_output_picture (GstDxvaVp9Decoder * decoder,
+    GstVideoCodecFrame * frame, GstCodecPicture * picture,
+    GstVideoBufferFlags buffer_flags, gint display_width, gint display_height)
+{
+  auto self = GST_D3D12_VP9_DEC (decoder);
+
+  return gst_d3d12_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, picture,
+      buffer_flags, display_width, display_height);
+}
+
+void
+gst_d3d12_vp9_dec_register (GstPlugin * plugin, GstD3D12Device * device,
+    ID3D12VideoDevice * video_device, guint rank)
+{
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  guint index = 0;
+  GTypeInfo type_info = {
+    sizeof (GstD3D12Vp9DecClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_d3d12_vp9_dec_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstD3D12Vp9Dec),
+    0,
+    (GInstanceInitFunc) gst_d3d12_vp9_dec_init,
+  };
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_vp9_dec_debug, "d3d12vp9dec", 0,
+      "d3d12vp9dec");
+
+  type_info.class_data =
+      gst_d3d12_decoder_check_feature_support (device, video_device,
+      GST_DXVA_CODEC_VP9);
+  if (!type_info.class_data)
+    return;
+
+  type_name = g_strdup ("GstD3D12Vp9Dec");
+  feature_name = g_strdup ("d3d12vp9dec");
+
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstD3D12Vp9Device%dDec", index);
+    feature_name = g_strdup_printf ("d3d12vp9device%ddec", index);
+  }
+
+  type = g_type_register_static (GST_TYPE_DXVA_VP9_DECODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  /* make lower rank than default device */
+  if (rank > 0 && index != 0)
+    rank--;
+
+  if (index != 0)
+    gst_element_type_set_skip_documentation (type);
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12vp9dec.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstd3d12decoder.h"
+
+G_BEGIN_DECLS
+
+void  gst_d3d12_vp9_dec_register (GstPlugin * plugin,
+                                  GstD3D12Device * device,
+                                  ID3D12VideoDevice * video_device,
+                                  guint rank);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12window.cpp Added

@@ -0,0 +1,1782 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstd3d12window.h"
+#include "gstd3d12overlaycompositor.h"
+#include <directx/d3dx12.h>
+#include <mutex>
+#include <condition_variable>
+#include <vector>
+#include <memory>
+#include <atomic>
+#include <wrl.h>
+#include <string>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+static std::mutex global_hwnd_lock;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_STATIC (gst_d3d12_window_debug);
+#define GST_CAT_DEFAULT gst_d3d12_window_debug
+
+#define WS_GST_D3D12 (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW)
+#define EXTERNAL_PROC_PROP_NAME L"gst-d3d12-hwnd-external-proc"
+#define D3D12_WINDOW_PROP_NAME L"gst-d3d12-hwnd-obj"
+#define WM_GST_D3D12_FULLSCREEN (WM_USER + 1)
+#define WM_GST_D3D12_CONSTRUCT_INTERNAL_WINDOW (WM_USER + 2)
+#define WM_GST_D3D12_DESTROY_INTERNAL_WINDOW (WM_USER + 3)
+#define WM_GST_D3D12_UPDATE_RENDER_RECT (WM_USER + 4)
+
+#define BACK_BUFFER_COUNT 3
+
+enum
+{
+  SIGNAL_KEY_EVENT,
+  SIGNAL_MOUSE_EVENT,
+  SIGNAL_FULLSCREEN,
+  SIGNAL_LAST
+};
+
+static guint d3d12_window_signalsSIGNAL_LAST = { 0, };
+
+/* *INDENT-OFF* */
+struct SwapBuffer
+{
+  SwapBuffer (GstBuffer * buf)
+  {
+    backbuf = buf;
+  }
+
+  ~SwapBuffer ()
+  {
+    gst_clear_buffer (&backbuf);
+  }
+
+  GstBuffer *backbuf = nullptr;
+  gboolean first = TRUE;
+};
+
+struct DeviceContext
+{
+  DeviceContext () = delete;
+  DeviceContext (GstD3D12Device * dev)
+  {
+    event_handle = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
+    device = (GstD3D12Device *) gst_object_ref (dev);
+
+    D3D12_COMMAND_QUEUE_DESC queue_desc = { };
+    queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
+    queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
+
+    queue = gst_d3d12_command_queue_new (device,
+        &queue_desc, BACK_BUFFER_COUNT * 2);
+    if (!queue) {
+      GST_ERROR_OBJECT (device, "Couldn't create command queue");
+      return;
+    }
+
+    ca_pool = gst_d3d12_command_allocator_pool_new (device,
+        D3D12_COMMAND_LIST_TYPE_DIRECT);
+    if (!ca_pool) {
+      GST_ERROR_OBJECT (device, "Couldn't create command allocator pool");
+      return;
+    }
+
+    initialized = true;
+  }
+
+  ~DeviceContext ()
+  {
+    WaitGpu ();
+
+    CloseHandle (event_handle);
+
+    gst_clear_object (&queue);
+    gst_clear_object (&ca_pool);
+    gst_clear_buffer (&cached_buf);
+    gst_clear_object (&conv);
+    gst_clear_object (&comp);
+    gst_clear_buffer (&msaa_buf);
+    gst_clear_object (&device);
+  }
+
+  void WaitGpu ()
+  {
+    if (!queue)
+      return;
+
+    gst_d3d12_command_queue_fence_wait (queue, G_MAXUINT64, event_handle);
+  }
+
+  ComPtr<ID3D12GraphicsCommandList> cl;
+  ComPtr<IDXGISwapChain4> swapchain;
+  GstBuffer *msaa_buf = nullptr;
+  std::vector<std::shared_ptr<SwapBuffer>> swap_buffers;
+  D3D12_RESOURCE_DESC buffer_desc;
+  GstD3D12Converter *conv = nullptr;
+  GstD3D12OverlayCompositor *comp = nullptr;
+  GstBuffer *cached_buf = nullptr;
+  GstD3D12Device *device = nullptr;
+  GstD3D12CommandQueue *queue = nullptr;
+  GstD3D12CommandAllocatorPool *ca_pool = nullptr;
+  UINT64 fence_val = 0;
+  HANDLE event_handle;
+  bool initialized = false;
+};
+
+struct GstD3D12WindowPrivate
+{
+  GstD3D12WindowPrivate ()
+  {
+    main_context = g_main_context_new ();
+    loop = g_main_loop_new (main_context, FALSE);
+
+    render_rect.w = -1;
+    render_rect.h = -1;
+
+    gst_video_info_init (&input_info);
+    gst_video_info_init (&display_info);
+
+    fence_data_pool = gst_d3d12_fence_data_pool_new ();
+  }
+
+  ~GstD3D12WindowPrivate ()
+  {
+    g_main_loop_unref (loop);
+    g_main_context_unref (main_context);
+    gst_clear_object (&fence_data_pool);
+  }
+
+  std::recursive_mutex lock;
+  DXGI_FORMAT display_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+
+  GstVideoOrientationMethod orientation = GST_VIDEO_ORIENTATION_IDENTITY;
+  gfloat fov = 90.0f;
+  gboolean ortho = FALSE;
+  gfloat rotation_x = 0;
+  gfloat rotation_y = 0;
+  gfloat rotation_z = 0;
+  gfloat scale_x = 1.0f;
+  gfloat scale_y = 1.0f;
+
+  /* fullscreen related variables */
+  gboolean fullscreen_on_alt_enter = TRUE;
+  gboolean requested_fullscreen = FALSE;
+  gboolean applied_fullscreen = FALSE;
+  LONG restore_style;
+  WINDOWPLACEMENT restore_placement;
+
+  GstD3D12FenceDataPool *fence_data_pool;
+
+  /* User specified rect */
+  GstVideoRectangle render_rect = { };
+
+  GstVideoRectangle output_rect = { };
+  RECT dirty_rect = { };
+  GstVideoInfo input_info;
+  GstVideoInfo display_info;
+
+  D3D12_BOX crop_rect = { };
+  D3D12_BOX prev_crop_rect = { };
+
+  gboolean force_aspect_ratio = TRUE;
+  std::atomic<gboolean> enable_navigation = { TRUE };
+  gboolean first_present = TRUE;
+  gboolean backbuf_rendered = FALSE;
+
+  std::unique_ptr<DeviceContext> ctx;
+
+  std::wstring title;
+  gboolean update_title = FALSE;
+
+  GstD3D12MSAAMode msaa = GST_D3D12_MSAA_DISABLED;
+
+  /* Win32 window handles */
+  std::mutex hwnd_lock;
+  std::condition_variable hwnd_cond;
+  HWND hwnd = nullptr;
+  HWND external_hwnd = nullptr;
+  std::atomic<GstD3D12WindowState> state = { GST_D3D12_WINDOW_STATE_INIT };
+  GThread *main_loop_thread = nullptr;
+
+  GThread *internal_hwnd_thread = nullptr;
+
+  GMainLoop *loop = nullptr;
+  GMainContext *main_context = nullptr;
+  gboolean flushing = FALSE;
+};
+/* *INDENT-ON* */
+
+struct _GstD3D12Window
+{
+  GstObject parent;
+
+  GstD3D12Device *device;
+
+  GstD3D12WindowPrivate *priv;
+};
+
+static GstFlowReturn gst_d3d12_window_on_resize (GstD3D12Window * self);
+
+#define gst_d3d12_window_parent_class parent_class
+G_DEFINE_TYPE (GstD3D12Window, gst_d3d12_window, GST_TYPE_OBJECT);
+
+static void gst_d3d12_window_finalize (GObject * object);
+
+static void
+gst_d3d12_window_class_init (GstD3D12WindowClass * klass)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_d3d12_window_finalize;
+
+  d3d12_window_signalsSIGNAL_KEY_EVENT =
+      g_signal_new ("key-event", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, nullptr, nullptr, nullptr,
+      G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
+
+  d3d12_window_signalsSIGNAL_MOUSE_EVENT =
+      g_signal_new ("mouse-event", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, nullptr, nullptr, nullptr,
+      G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_INT, G_TYPE_DOUBLE, G_TYPE_DOUBLE);
+
+  d3d12_window_signalsSIGNAL_FULLSCREEN =
+      g_signal_new ("fullscreen", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, nullptr, nullptr, nullptr,
+      G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_window_debug,
+      "d3d12window", 0, "d3d12window");
+}
+
+static void
+gst_d3d12_window_init (GstD3D12Window * self)
+{
+  self->priv = new GstD3D12WindowPrivate ();
+}
+
+static void
+gst_d3d12_window_finalize (GObject * object)
+{
+  auto self = GST_D3D12_WINDOW (object);
+
+  delete self->priv;
+
+  gst_clear_object (&self->device);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_d3d12_window_on_key_event (GstD3D12Window * self,
+    UINT msg, WPARAM wparam, LPARAM lparam)
+{
+  gunichar2 keyname128;
+  const gchar *event;
+
+  if (!GetKeyNameTextW (lparam, (LPWSTR) keyname, 128))
+    return;
+
+  gchar *name = g_utf16_to_utf8 (keyname, 128, nullptr, nullptr, nullptr);
+  if (!name)
+    return;
+
+  if (msg == WM_KEYDOWN)
+    event = "key-press";
+  else
+    event = "key-release";
+
+  g_signal_emit (self, d3d12_window_signalsSIGNAL_KEY_EVENT, 0, event, name);
+  g_free (name);
+}
+
+static void
+gst_d3d12_window_on_mouse_event (GstD3D12Window * self, UINT msg, WPARAM wparam,
+    LPARAM lparam)
+{
+  auto priv = self->priv;
+  gint button = 0;
+  const gchar *event = nullptr;
+
+  switch (msg) {
+    case WM_MOUSEMOVE:
+      button = 0;
+      event = "mouse-move";
+      break;
+    case WM_LBUTTONDOWN:
+      button = 1;
+      event = "mouse-button-press";
+      break;
+    case WM_LBUTTONUP:
+      button = 1;
+      event = "mouse-button-release";
+      break;
+    case WM_RBUTTONDOWN:
+      button = 2;
+      event = "mouse-button-press";
+      break;
+    case WM_RBUTTONUP:
+      button = 2;
+      event = "mouse-button-release";
+      break;
+    case WM_MBUTTONDOWN:
+      button = 3;
+      event = "mouse-button-press";
+      break;
+    case WM_MBUTTONUP:
+      button = 3;
+      event = "mouse-button-release";
+      break;
+    default:
+      return;
+  }
+
+  GstVideoRectangle output_rect = { };
+  GstVideoOrientationMethod orientation;
+  gint in_w, in_h;
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    orientation = priv->orientation;
+    output_rect = priv->output_rect;
+    in_w = priv->input_info.width;
+    in_h = priv->input_info.height;
+  }
+  auto xpos = LOWORD (lparam);
+  auto ypos = HIWORD (lparam);
+
+  if (in_w <= 0 || in_h <= 0 || xpos < output_rect.x ||
+      xpos >= output_rect.x + output_rect.w || ypos < output_rect.y ||
+      ypos >= output_rect.y + output_rect.h) {
+    return;
+  }
+
+  gint src_w, src_h;
+  switch (orientation) {
+    case GST_VIDEO_ORIENTATION_90R:
+    case GST_VIDEO_ORIENTATION_90L:
+    case GST_VIDEO_ORIENTATION_UL_LR:
+    case GST_VIDEO_ORIENTATION_UR_LL:
+      src_w = in_h;
+      src_h = in_w;
+      break;
+    default:
+      src_w = in_w;
+      src_h = in_h;
+      break;
+  }
+
+  xpos = ((xpos - output_rect.x) / (double) output_rect.w) * src_w;
+  ypos = ((ypos - output_rect.y) / (double) output_rect.h) * src_h;
+
+  xpos = CLAMP (xpos, 0, (LONG) (src_w - 1));
+  ypos = CLAMP (ypos, 0, (LONG) (src_h - 1));
+
+  double final_x = 0;
+  double final_y = 0;
+
+  switch (orientation) {
+    case GST_VIDEO_ORIENTATION_90R:
+      final_x = ypos;
+      final_y = src_w - xpos;
+      break;
+    case GST_VIDEO_ORIENTATION_90L:
+      final_x = src_h - ypos;
+      final_y = xpos;
+      break;
+    case GST_VIDEO_ORIENTATION_UR_LL:
+      final_x = src_h - ypos;
+      final_y = src_w - xpos;
+      break;
+    case GST_VIDEO_ORIENTATION_UL_LR:
+      final_x = ypos;
+      final_y = xpos;
+      break;
+    case GST_VIDEO_ORIENTATION_180:
+      final_x = src_w - xpos;
+      final_y = src_h - ypos;
+      break;
+    case GST_VIDEO_ORIENTATION_HORIZ:
+      final_x = src_w - xpos;
+      final_y = ypos;
+      break;
+    case GST_VIDEO_ORIENTATION_VERT:
+      final_x = xpos;
+      final_y = src_h - ypos;
+      break;
+    default:
+      final_x = xpos;
+      final_y = ypos;
+      break;
+  }
+
+  g_signal_emit (self, d3d12_window_signalsSIGNAL_MOUSE_EVENT, 0,
+      event, button, final_x, final_y);
+}
+
+static void
+gst_d3d12_window_toggle_fullscreen_mode (GstD3D12Window * self,
+    gboolean emit_signal)
+{
+  auto priv = self->priv;
+  HWND hwnd = nullptr;
+  gboolean is_fullscreen;
+  ComPtr < IDXGISwapChain > swapchain;
+
+  {
+    std::lock_guard < std::mutex > hlk (priv->hwnd_lock);
+    hwnd = priv->external_hwnd ? priv->external_hwnd : priv->hwnd;
+
+    if (!hwnd)
+      return;
+
+    if (priv->requested_fullscreen == priv->applied_fullscreen)
+      return;
+
+    {
+      std::lock_guard < std::recursive_mutex > lk (priv->lock);
+      if (priv->ctx)
+        swapchain = priv->ctx->swapchain;
+    }
+
+    if (!swapchain)
+      return;
+
+    GST_DEBUG_OBJECT (self, "Change mode to %s",
+        priv->requested_fullscreen ? "fullscreen" : "windowed");
+
+    priv->applied_fullscreen = priv->requested_fullscreen;
+    is_fullscreen = priv->applied_fullscreen;
+  }
+
+  if (!is_fullscreen) {
+    SetWindowLongW (hwnd, GWL_STYLE, priv->restore_style);
+    SetWindowPlacement (hwnd, &priv->restore_placement);
+  } else {
+    ComPtr < IDXGIOutput > output;
+    DXGI_OUTPUT_DESC output_desc;
+
+    /* remember current placement to restore window later */
+    GetWindowPlacement (hwnd, &priv->restore_placement);
+
+    /* show window before change style */
+    ShowWindow (hwnd, SW_SHOW);
+
+    priv->restore_style = GetWindowLong (hwnd, GWL_STYLE);
+
+    /* Make the window borderless so that the client area can fill the screen */
+    SetWindowLongA (hwnd, GWL_STYLE,
+        priv->restore_style &
+        ~(WS_CAPTION | WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_SYSMENU |
+            WS_THICKFRAME | WS_MAXIMIZE));
+
+    swapchain->GetContainingOutput (&output);
+    output->GetDesc (&output_desc);
+
+    SetWindowPos (hwnd, HWND_TOP,
+        output_desc.DesktopCoordinates.left,
+        output_desc.DesktopCoordinates.top,
+        output_desc.DesktopCoordinates.right,
+        output_desc.DesktopCoordinates.bottom,
+        SWP_FRAMECHANGED | SWP_NOACTIVATE);
+
+    ShowWindow (hwnd, SW_MAXIMIZE);
+  }
+
+  GST_DEBUG_OBJECT (self, "Fullscreen mode change done");
+
+  if (emit_signal) {
+    g_signal_emit (self, d3d12_window_signalsSIGNAL_FULLSCREEN,
+        0, is_fullscreen);
+  }
+}
+
+static GstD3D12Window *
+gst_d3d12_window_from_hwnd (HWND hwnd)
+{
+  std::lock_guard < std::mutex > lk (global_hwnd_lock);
+  auto self = GetPropW (hwnd, D3D12_WINDOW_PROP_NAME);
+  if (self)
+    gst_object_ref (self);
+
+  return (GstD3D12Window *) self;
+}
+
+static LRESULT CALLBACK
+gst_d3d12_window_proc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+  switch (msg) {
+    case WM_CREATE:
+    {
+      LPCREATESTRUCTW create_param = (LPCREATESTRUCTW) lparam;
+      SetPropW (hwnd, D3D12_WINDOW_PROP_NAME, create_param->lpCreateParams);
+      break;
+    }
+    case WM_GST_D3D12_DESTROY_INTERNAL_WINDOW:
+    {
+      GST_INFO ("Handle destroy window message");
+      DestroyWindow (hwnd);
+      return 0;
+    }
+    case WM_GST_D3D12_UPDATE_RENDER_RECT:
+    {
+      auto self = gst_d3d12_window_from_hwnd (hwnd);
+      if (self) {
+        GstVideoRectangle render_rect = { };
+        {
+          auto priv = self->priv;
+          std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+          render_rect = priv->render_rect;
+        }
+
+        if (render_rect.w > 0 && render_rect.h > 0) {
+          MoveWindow (hwnd,
+              render_rect.x, render_rect.y, render_rect.w, render_rect.h, TRUE);
+        }
+
+        gst_object_unref (self);
+      }
+      return 0;
+    }
+    case WM_GST_D3D12_FULLSCREEN:
+    {
+      auto self = gst_d3d12_window_from_hwnd (hwnd);
+      if (self) {
+        gst_d3d12_window_toggle_fullscreen_mode (self, FALSE);
+        gst_object_unref (self);
+      }
+
+      return 0;
+    }
+    case WM_SYSKEYDOWN:
+    {
+      WORD state = GetKeyState (VK_RETURN);
+      BYTE high = HIBYTE (state);
+
+      if (high & 0x1) {
+        auto self = gst_d3d12_window_from_hwnd (hwnd);
+        if (self) {
+          auto priv = self->priv;
+          bool do_toggle = false;
+          {
+            std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+            if (priv->fullscreen_on_alt_enter) {
+              priv->requested_fullscreen = !priv->applied_fullscreen;
+              do_toggle = true;
+            }
+          }
+
+          if (do_toggle)
+            gst_d3d12_window_toggle_fullscreen_mode (self, TRUE);
+
+          gst_object_unref (self);
+        }
+      }
+      break;
+    }
+    case WM_SIZE:
+    {
+      auto self = gst_d3d12_window_from_hwnd (hwnd);
+      if (self) {
+        gst_d3d12_window_on_resize (self);
+        gst_object_unref (self);
+      }
+      break;
+    }
+    case WM_CLOSE:
+    {
+      auto self = gst_d3d12_window_from_hwnd (hwnd);
+      if (self) {
+        auto priv = self->priv;
+        GST_DEBUG_OBJECT (self, "Internal window is being closed");
+        {
+          std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+          RemovePropW (priv->hwnd, D3D12_WINDOW_PROP_NAME);
+          priv->hwnd = nullptr;
+          priv->state = GST_D3D12_WINDOW_STATE_CLOSED;
+
+        }
+        gst_object_unref (self);
+      }
+      break;
+    }
+    case WM_NCHITTEST:
+    {
+      auto self = gst_d3d12_window_from_hwnd (hwnd);
+      if (self && self->priv->external_hwnd) {
+        gst_object_unref (self);
+
+        /* To passthrough mouse event if external window is used.
+         * Only hit-test succeeded window can receive/handle some mouse events
+         * and we want such events to be handled by parent (application) window
+         */
+        return (LRESULT) HTTRANSPARENT;
+      }
+
+      gst_clear_object (&self);
+      break;
+    }
+    case WM_KEYDOWN:
+    case WM_KEYUP:
+    {
+      auto self = gst_d3d12_window_from_hwnd (hwnd);
+      if (self) {
+        auto priv = self->priv;
+        if (priv->enable_navigation)
+          gst_d3d12_window_on_key_event (self, msg, wparam, lparam);
+        gst_object_unref (self);
+      }
+      break;
+    }
+    case WM_LBUTTONDOWN:
+    case WM_LBUTTONUP:
+    case WM_RBUTTONDOWN:
+    case WM_RBUTTONUP:
+    case WM_MBUTTONDOWN:
+    case WM_MBUTTONUP:
+    case WM_MOUSEMOVE:
+    {
+      auto self = gst_d3d12_window_from_hwnd (hwnd);
+      if (self) {
+        auto priv = self->priv;
+        if (priv->enable_navigation)
+          gst_d3d12_window_on_mouse_event (self, msg, wparam, lparam);
+        gst_object_unref (self);
+      }
+      break;
+    }
+    default:
+      break;
+  }
+
+  return DefWindowProcW (hwnd, msg, wparam, lparam);
+}
+
+static void
+gst_d3d12_window_create_hwnd (GstD3D12Window * self)
+{
+  auto priv = self->priv;
+  auto inst = GetModuleHandle (nullptr);
+
+  {
+    static std::mutex class_lock;
+    std::lock_guard < std::mutex > lk (class_lock);
+    WNDCLASSEXW wc = { };
+
+    if (!GetClassInfoExW (inst, L"GstD3D12Hwnd", &wc)) {
+      wc.cbSize = sizeof (WNDCLASSEXW);
+      wc.lpfnWndProc = gst_d3d12_window_proc;
+      wc.hInstance = inst;
+      wc.hIcon = LoadIcon (nullptr, IDI_WINLOGO);
+      wc.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
+      wc.hCursor = LoadCursor (nullptr, IDC_ARROW);
+      wc.hbrBackground = (HBRUSH) GetStockObject (BLACK_BRUSH);
+      wc.lpszClassName = L"GstD3D12Hwnd";
+
+      RegisterClassExW (&wc);
+    }
+  }
+
+  int x = CW_USEDEFAULT;
+  int y = CW_USEDEFAULT;
+  int w = 0;
+  int h = 0;
+  DWORD style = WS_GST_D3D12;
+
+  std::wstring title = L"Direct3D12 Renderer";
+  if (!priv->title.empty ())
+    title = priv->title;
+
+  if (!priv->external_hwnd) {
+    if (priv->render_rect.w > 0 && priv->render_rect.h > 0) {
+      x = priv->render_rect.x;
+      y = priv->render_rect.y;
+      w = priv->render_rect.w;
+      h = priv->render_rect.h;
+    } else {
+      std::lock_guard < std::recursive_mutex > lk (priv->lock);
+      RECT rect = { };
+      switch (priv->orientation) {
+        case GST_VIDEO_ORIENTATION_90R:
+        case GST_VIDEO_ORIENTATION_90L:
+        case GST_VIDEO_ORIENTATION_UL_LR:
+        case GST_VIDEO_ORIENTATION_UR_LL:
+          rect.right = GST_VIDEO_INFO_HEIGHT (&priv->display_info);
+          rect.bottom = GST_VIDEO_INFO_WIDTH (&priv->display_info);
+          break;
+        default:
+          rect.right = GST_VIDEO_INFO_WIDTH (&priv->display_info);
+          rect.bottom = GST_VIDEO_INFO_HEIGHT (&priv->display_info);
+          break;
+      }
+
+      AdjustWindowRect (&rect, WS_GST_D3D12, FALSE);
+
+      w = rect.right - rect.left;
+      h = rect.bottom - rect.top;
+    }
+
+    style |= WS_VISIBLE;
+  }
+
+  priv->hwnd = CreateWindowExW (0, L"GstD3D12Hwnd", title.c_str (),
+      style, x, y, w, h, (HWND) nullptr, (HMENU) nullptr, inst, self);
+  priv->applied_fullscreen = FALSE;
+  priv->internal_hwnd_thread = g_thread_self ();
+}
+
+static void
+gst_d3d12_window_release_external_hwnd (GstD3D12Window * self)
+{
+  auto priv = self->priv;
+
+  if (!priv->external_hwnd)
+    return;
+
+  auto hwnd = priv->external_hwnd;
+  priv->external_hwnd = nullptr;
+
+  auto external_proc = (WNDPROC) GetPropW (hwnd, EXTERNAL_PROC_PROP_NAME);
+  if (!external_proc) {
+    GST_WARNING_OBJECT (self, "Failed to get original window procedure");
+    return;
+  }
+
+  GST_DEBUG_OBJECT (self, "release external window %" G_GUINTPTR_FORMAT
+      ", original window procedure %p", (guintptr) hwnd, external_proc);
+
+  RemovePropW (hwnd, EXTERNAL_PROC_PROP_NAME);
+  RemovePropW (hwnd, D3D12_WINDOW_PROP_NAME);
+
+  if (!SetWindowLongPtrW (hwnd, GWLP_WNDPROC, (LONG_PTR) external_proc))
+    GST_WARNING_OBJECT (self, "Couldn't restore original window procedure");
+}
+
+static LRESULT FAR PASCAL
+sub_class_proc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+  auto external_window_proc =
+      (WNDPROC) GetPropW (hwnd, EXTERNAL_PROC_PROP_NAME);
+  auto self = gst_d3d12_window_from_hwnd (hwnd);
+
+  if (!self) {
+    GST_DEBUG ("No object attached to the window, chain up to default");
+    return CallWindowProcW (external_window_proc, hwnd, msg, wparam, lparam);
+  }
+
+  auto priv = self->priv;
+  switch (msg) {
+    case WM_GST_D3D12_CONSTRUCT_INTERNAL_WINDOW:
+    {
+      GST_DEBUG_OBJECT (self, "Create internal window");
+      std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+      if (priv->hwnd) {
+        GST_WARNING_OBJECT (self,
+            "Window already created, probably we have received 2 creation messages");
+        gst_object_unref (self);
+        return 0;
+      }
+
+      gst_d3d12_window_create_hwnd (self);
+      SetWindowLongPtrW (priv->hwnd, GWL_STYLE, WS_CHILD | WS_MAXIMIZE);
+      SetParent (priv->hwnd, priv->external_hwnd);
+
+      RECT rect;
+      GetClientRect (priv->external_hwnd, &rect);
+
+      if (priv->render_rect.w > 0 && priv->render_rect.h > 0) {
+        rect.left = priv->render_rect.x;
+        rect.top = priv->render_rect.y;
+        rect.right = priv->render_rect.x + priv->render_rect.w;
+        rect.bottom = priv->render_rect.y + priv->render_rect.h;
+      }
+
+      SetWindowPos (priv->hwnd, HWND_TOP, rect.left, rect.top,
+          rect.right - rect.left, rect.bottom - rect.top,
+          SWP_ASYNCWINDOWPOS | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER |
+          SWP_FRAMECHANGED | SWP_NOACTIVATE);
+      MoveWindow (priv->hwnd, rect.left, rect.top,
+          rect.right - rect.left, rect.bottom - rect.top, FALSE);
+      ShowWindow (priv->hwnd, SW_SHOW);
+
+      priv->state = GST_D3D12_WINDOW_STATE_OPENED;
+      priv->hwnd_cond.notify_all ();
+
+      /* don't need to be chained up to parent window procedure,
+       * as this is our custom message */
+      gst_object_unref (self);
+      return 0;
+    }
+    case WM_SYSKEYDOWN:
+    {
+      WORD state = GetKeyState (VK_RETURN);
+      BYTE high = HIBYTE (state);
+
+      if (high & 0x1) {
+        bool do_toggle = false;
+        {
+          std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+          if (priv->fullscreen_on_alt_enter) {
+            priv->requested_fullscreen = !priv->applied_fullscreen;
+            do_toggle = true;
+          }
+        }
+
+        if (do_toggle)
+          gst_d3d12_window_toggle_fullscreen_mode (self, TRUE);
+      }
+      break;
+    }
+    case WM_SIZE:
+      if (priv->render_rect.w > 0 || priv->render_rect.h > 0) {
+        MoveWindow (priv->hwnd,
+            priv->render_rect.x, priv->render_rect.y,
+            priv->render_rect.w, priv->render_rect.h, FALSE);
+      } else {
+        MoveWindow (priv->hwnd, 0, 0, LOWORD (lparam), HIWORD (lparam), FALSE);
+      }
+      break;
+    case WM_DESTROY:
+    {
+      std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+      GST_WARNING_OBJECT (self, "external window is closing");
+
+      gst_d3d12_window_release_external_hwnd (self);
+
+      if (priv->hwnd)
+        DestroyWindow (priv->hwnd);
+      priv->hwnd = nullptr;
+
+      priv->state = GST_D3D12_WINDOW_STATE_CLOSED;
+      priv->hwnd_cond.notify_all ();
+      break;
+    }
+    case WM_KEYDOWN:
+    case WM_KEYUP:
+      if (priv->enable_navigation)
+        gst_d3d12_window_on_key_event (self, msg, wparam, lparam);
+      break;
+    case WM_LBUTTONDOWN:
+    case WM_LBUTTONUP:
+    case WM_RBUTTONDOWN:
+    case WM_RBUTTONUP:
+    case WM_MBUTTONDOWN:
+    case WM_MBUTTONUP:
+    case WM_MOUSEMOVE:
+      if (priv->enable_navigation)
+        gst_d3d12_window_on_mouse_event (self, msg, wparam, lparam);
+      break;
+    default:
+      break;
+  }
+
+  gst_object_unref (self);
+
+  return CallWindowProcW (external_window_proc, hwnd, msg, wparam, lparam);
+}
+
+static gboolean
+msg_io_cb (GIOChannel * source, GIOCondition condition, gpointer data)
+{
+  MSG msg;
+
+  if (!PeekMessage (&msg, nullptr, 0, 0, PM_REMOVE))
+    return G_SOURCE_CONTINUE;
+
+  TranslateMessage (&msg);
+  DispatchMessage (&msg);
+
+  return G_SOURCE_CONTINUE;
+}
+
+static gpointer
+gst_d3d12_window_hwnd_thread_func (GstD3D12Window * self)
+{
+  auto priv = self->priv;
+
+  g_main_context_push_thread_default (priv->main_context);
+
+  gst_d3d12_window_create_hwnd (self);
+  priv->state = GST_D3D12_WINDOW_STATE_OPENED;
+
+  auto msg_io_ch = g_io_channel_win32_new_messages (0);
+  auto msg_source = g_io_create_watch (msg_io_ch, G_IO_IN);
+  g_source_set_callback (msg_source, (GSourceFunc) msg_io_cb, nullptr, nullptr);
+  g_source_attach (msg_source, priv->main_context);
+
+  auto idle_source = g_idle_source_new ();
+  g_source_set_callback (idle_source,(gpointer data)->gboolean {
+        auto self = GST_D3D12_WINDOW (data);
+        auto priv = self->priv;
+        std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+        priv->hwnd_cond.notify_all ();
+        return G_SOURCE_REMOVE;
+      }
+      , self, nullptr);
+
+  g_source_attach (idle_source, priv->main_context);
+  g_source_unref (idle_source);
+
+  g_main_loop_run (priv->loop);
+
+  g_clear_pointer (&priv->hwnd, DestroyWindow);
+
+  g_source_destroy (msg_source);
+  g_source_unref (msg_source);
+  g_io_channel_unref (msg_io_ch);
+
+  g_main_context_pop_thread_default (priv->main_context);
+
+  return nullptr;
+}
+
+static GstFlowReturn
+gst_d3d12_window_prepare_hwnd (GstD3D12Window * self, guintptr window_handle)
+{
+  auto priv = self->priv;
+
+  switch (priv->state) {
+    case GST_D3D12_WINDOW_STATE_OPENED:
+      return GST_FLOW_OK;
+    case GST_D3D12_WINDOW_STATE_CLOSED:
+      return GST_FLOW_ERROR;
+    default:
+      break;
+  }
+
+  std::unique_lock < std::mutex > lk (priv->hwnd_lock);
+  priv->external_hwnd = (HWND) window_handle;
+  if (!priv->external_hwnd) {
+    priv->main_loop_thread = g_thread_new ("GstD3D12Window",
+        (GThreadFunc) gst_d3d12_window_hwnd_thread_func, self);
+    while (!g_main_loop_is_running (priv->loop))
+      priv->hwnd_cond.wait (lk);
+
+    return GST_FLOW_OK;
+  }
+
+  if (!IsWindow (priv->external_hwnd)) {
+    GST_ERROR_OBJECT (self, "Invalid window handle");
+    return GST_FLOW_ERROR;
+  }
+
+  {
+    std::lock_guard < std::mutex > glk (global_hwnd_lock);
+    auto external_proc =
+        (WNDPROC) GetWindowLongPtrA (priv->external_hwnd, GWLP_WNDPROC);
+
+    SetPropW (priv->external_hwnd, EXTERNAL_PROC_PROP_NAME,
+        (HANDLE) external_proc);
+    SetPropW (priv->external_hwnd, D3D12_WINDOW_PROP_NAME, self);
+    SetWindowLongPtrW (priv->external_hwnd, GWLP_WNDPROC,
+        (LONG_PTR) sub_class_proc);
+  }
+
+  PostMessageW (priv->external_hwnd,
+      WM_GST_D3D12_CONSTRUCT_INTERNAL_WINDOW, 0, 0);
+  while (priv->external_hwnd &&
+      priv->state == GST_D3D12_WINDOW_STATE_INIT && !priv->flushing) {
+    priv->hwnd_cond.wait (lk);
+  }
+
+  if (priv->state != GST_D3D12_WINDOW_STATE_OPENED) {
+    if (priv->flushing) {
+      GST_DEBUG_OBJECT (self, "We are flushing");
+      return GST_FLOW_FLUSHING;
+    }
+
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+void
+gst_d3d12_window_unprepare (GstD3D12Window * window)
+{
+  GST_DEBUG_OBJECT (window, "Unprepare");
+
+  auto priv = window->priv;
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    priv->ctx = nullptr;
+    gst_clear_object (&window->device);
+  }
+
+  if (priv->external_hwnd) {
+    {
+      std::lock_guard < std::mutex > lk (global_hwnd_lock);
+      gst_d3d12_window_release_external_hwnd (window);
+    }
+
+    std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+    if (priv->hwnd) {
+      if (priv->internal_hwnd_thread == g_thread_self ()) {
+        /* State changing thread is identical to internal window thread.
+         * window can be closed here */
+
+        GST_INFO_OBJECT (window, "Closing internal window immediately");
+        DestroyWindow (priv->hwnd);
+      } else {
+        /* We cannot destroy internal window from non-window thread.
+         * and we cannot use synchronously SendMessage() method at this point
+         * since window thread might be waiting for current thread and SendMessage()
+         * will be blocked until it's called from window thread.
+         * Instead, posts message so that it can be closed from window thread
+         * asynchronously */
+        GST_INFO_OBJECT (window, "Posting custom destory message");
+        PostMessageW (priv->hwnd, WM_GST_D3D12_DESTROY_INTERNAL_WINDOW, 0, 0);
+      }
+    }
+  }
+
+  g_main_loop_quit (priv->loop);
+  g_clear_pointer (&priv->main_loop_thread, g_thread_join);
+
+  std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+  priv->hwnd = nullptr;
+  priv->external_hwnd = nullptr;
+  priv->internal_hwnd_thread = nullptr;
+  priv->state = GST_D3D12_WINDOW_STATE_INIT;
+  priv->applied_fullscreen = FALSE;
+}
+
+void
+gst_d3d12_window_unlock (GstD3D12Window * window)
+{
+  GST_DEBUG_OBJECT (window, "Unlock");
+
+  auto priv = window->priv;
+  std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+  priv->flushing = TRUE;
+  priv->hwnd_cond.notify_all ();
+}
+
+void
+gst_d3d12_window_unlock_stop (GstD3D12Window * window)
+{
+  GST_DEBUG_OBJECT (window, "Unlock stop");
+
+  auto priv = window->priv;
+  std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+  priv->flushing = FALSE;
+  priv->hwnd_cond.notify_all ();
+}
+
+static GstFlowReturn
+gst_d3d12_window_on_resize (GstD3D12Window * self)
+{
+  auto priv = self->priv;
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+
+  /* resize might be called before swapchain configuration */
+  if (!priv->ctx)
+    return GST_FLOW_OK;
+
+  if (priv->ctx->fence_val != 0)
+    priv->ctx->WaitGpu ();
+  priv->ctx->swap_buffers.clear ();
+  gst_clear_buffer (&priv->ctx->msaa_buf);
+
+  DXGI_SWAP_CHAIN_DESC desc = { };
+  priv->ctx->swapchain->GetDesc (&desc);
+  auto hr = priv->ctx->swapchain->ResizeBuffers (BACK_BUFFER_COUNT,
+      0, 0, priv->display_format, desc.Flags);
+  if (!gst_d3d12_result (hr, self->device)) {
+    GST_ERROR_OBJECT (self, "Couldn't resize buffers");
+    return GST_FLOW_ERROR;
+  }
+
+  for (guint i = 0; i < BACK_BUFFER_COUNT; i++) {
+    ComPtr < ID3D12Resource > backbuf;
+    hr = priv->ctx->swapchain->GetBuffer (i, IID_PPV_ARGS (&backbuf));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't get backbuffer");
+      return GST_FLOW_ERROR;
+    }
+
+    if (i == 0)
+      priv->ctx->buffer_desc = backbuf->GetDesc ();
+
+    auto mem = gst_d3d12_allocator_alloc_wrapped (nullptr, self->device,
+        backbuf.Get (), 0);
+    auto buf = gst_buffer_new ();
+    gst_buffer_append_memory (buf, mem);
+    priv->ctx->swap_buffers.push_back (std::make_shared < SwapBuffer > (buf));
+  }
+
+  guint sample_count = 1;
+  switch (priv->msaa) {
+    case GST_D3D12_MSAA_2X:
+      sample_count = 2;
+      break;
+    case GST_D3D12_MSAA_4X:
+      sample_count = 4;
+      break;
+    case GST_D3D12_MSAA_8X:
+      sample_count = 8;
+      break;
+    default:
+      break;
+  }
+
+  auto device = gst_d3d12_device_get_device_handle (self->device);
+  D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS feature_data = { };
+  feature_data.Format = priv->ctx->buffer_desc.Format;
+  feature_data.SampleCount = sample_count;
+
+  while (feature_data.SampleCount > 1) {
+    hr = device->CheckFeatureSupport (D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS,
+        &feature_data, sizeof (feature_data));
+    if (SUCCEEDED (hr) && feature_data.NumQualityLevels > 0)
+      break;
+
+    feature_data.SampleCount /= 2;
+  }
+
+  if (feature_data.SampleCount > 1 && feature_data.NumQualityLevels > 0) {
+    GST_DEBUG_OBJECT (self, "Enable MSAA x%d with quality level %d",
+        feature_data.SampleCount, feature_data.NumQualityLevels - 1);
+    D3D12_HEAP_PROPERTIES heap_prop =
+        CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
+    D3D12_RESOURCE_DESC resource_desc =
+        CD3DX12_RESOURCE_DESC::Tex2D (priv->ctx->buffer_desc.Format,
+        priv->ctx->buffer_desc.Width, priv->ctx->buffer_desc.Height,
+        1, 1, feature_data.SampleCount, feature_data.NumQualityLevels - 1,
+        D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET);
+    D3D12_CLEAR_VALUE clear_value = { };
+    clear_value.Format = priv->ctx->buffer_desc.Format;
+    clear_value.Color0 = 0.0f;
+    clear_value.Color1 = 0.0f;
+    clear_value.Color2 = 0.0f;
+    clear_value.Color3 = 1.0f;
+
+    ComPtr < ID3D12Resource > msaa_texture;
+    hr = device->CreateCommittedResource (&heap_prop, D3D12_HEAP_FLAG_NONE,
+        &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value,
+        IID_PPV_ARGS (&msaa_texture));
+    if (!gst_d3d12_result (hr, self->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create MSAA texture");
+      return GST_FLOW_ERROR;
+    }
+
+    auto mem = gst_d3d12_allocator_alloc_wrapped (nullptr, self->device,
+        msaa_texture.Get (), 0);
+    priv->ctx->msaa_buf = gst_buffer_new ();
+    gst_buffer_append_memory (priv->ctx->msaa_buf, mem);
+  }
+
+  priv->first_present = TRUE;
+  priv->backbuf_rendered = FALSE;
+
+  /* redraw the last scene if cached buffer exits */
+  GstFlowReturn ret = GST_FLOW_OK;
+  if (priv->ctx->cached_buf) {
+    ret = gst_d3d12_window_set_buffer (self, priv->ctx->cached_buf);
+    if (ret == GST_FLOW_OK)
+      ret = gst_d3d12_window_present (self);
+  }
+
+  return ret;
+}
+
+GstFlowReturn
+gst_d3d12_window_prepare (GstD3D12Window * window, GstD3D12Device * device,
+    guintptr window_handle, guint display_width, guint display_height,
+    GstCaps * caps, GstStructure * config)
+{
+  auto priv = window->priv;
+  GstVideoInfo in_info;
+  GstVideoFormat format = GST_VIDEO_FORMAT_RGBA;
+  priv->display_format = DXGI_FORMAT_R8G8B8A8_UNORM;
+  gst_video_info_from_caps (&in_info, caps);
+
+  if (GST_VIDEO_INFO_COMP_DEPTH (&in_info, 0) > 8) {
+    auto device_handle = gst_d3d12_device_get_device_handle (device);
+    D3D12_FEATURE_DATA_FORMAT_SUPPORT format_support = { };
+    const D3D12_FORMAT_SUPPORT1 support_flags =
+        D3D12_FORMAT_SUPPORT1_RENDER_TARGET | D3D12_FORMAT_SUPPORT1_DISPLAY;
+    format_support.Format = DXGI_FORMAT_R10G10B10A2_UNORM;
+    format_support.Support1 = support_flags;
+    auto hr = device_handle->CheckFeatureSupport (D3D12_FEATURE_FORMAT_SUPPORT,
+        &format_support, sizeof (format_support));
+    if (SUCCEEDED (hr) && (format_support.Support1 & support_flags)
+        == support_flags) {
+      priv->display_format = DXGI_FORMAT_R10G10B10A2_UNORM;
+      format = GST_VIDEO_FORMAT_RGB10A2_LE;
+    }
+  }
+
+  {
+    std::lock_guard < std::recursive_mutex > lk (priv->lock);
+    gst_video_info_set_format (&priv->display_info, format,
+        display_width, display_height);
+  }
+
+  auto ret = gst_d3d12_window_prepare_hwnd (window, window_handle);
+  if (ret != GST_FLOW_OK) {
+    GST_WARNING_OBJECT (window, "Couldn't setup window handle");
+    if (config)
+      gst_structure_free (config);
+
+    return ret;
+  }
+
+  std::unique_lock < std::recursive_mutex > lk (priv->lock);
+  HRESULT hr;
+
+  if (window->device != device) {
+    priv->ctx = nullptr;
+    gst_clear_object (&window->device);
+    window->device = (GstD3D12Device *) gst_object_ref (device);
+  }
+
+  if (!priv->ctx) {
+    auto ctx = std::make_unique < DeviceContext > (device);
+    if (!ctx->initialized) {
+      GST_ERROR_OBJECT (window, "Couldn't initialize device context");
+      if (config)
+        gst_structure_free (config);
+
+      return GST_FLOW_ERROR;
+    }
+
+    DXGI_SWAP_CHAIN_DESC1 desc = { };
+    desc.Format = priv->display_format;
+    desc.SampleDesc.Count = 1;
+    desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
+    desc.BufferCount = BACK_BUFFER_COUNT;
+    desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
+
+    auto factory = gst_d3d12_device_get_factory_handle (device);
+
+    ComPtr < ID3D12CommandQueue > cq;
+    gst_d3d12_command_queue_get_handle (ctx->queue, &cq);
+
+    ComPtr < IDXGISwapChain1 > swapchain;
+    hr = factory->CreateSwapChainForHwnd (cq.Get (), priv->hwnd,
+        &desc, nullptr, nullptr, &swapchain);
+    if (!gst_d3d12_result (hr, window->device)) {
+      GST_ERROR_OBJECT (window, "Couldn't create swapchain");
+      if (config)
+        gst_structure_free (config);
+
+      return GST_FLOW_ERROR;
+    }
+
+    ComPtr < IDXGIFactory1 > parent_factory;
+    hr = swapchain->GetParent (IID_PPV_ARGS (&parent_factory));
+    if (!gst_d3d12_result (hr, window->device)) {
+      GST_WARNING_OBJECT (window, "Couldn't get parent factory");
+    } else {
+      hr = parent_factory->MakeWindowAssociation (priv->hwnd,
+          DXGI_MWA_NO_ALT_ENTER);
+      if (!gst_d3d12_result (hr, window->device)) {
+        GST_WARNING_OBJECT (window, "MakeWindowAssociation failed, hr: 0x%x",
+            (guint) hr);
+      }
+    }
+
+    hr = swapchain.As (&ctx->swapchain);
+    if (!gst_d3d12_result (hr, window->device)) {
+      GST_ERROR_OBJECT (window, "IDXGISwapChain4 interface is unavailable");
+      if (config)
+        gst_structure_free (config);
+      return GST_FLOW_ERROR;
+    }
+
+    priv->ctx = std::move (ctx);
+  } else {
+    priv->ctx->WaitGpu ();
+  }
+
+  priv->input_info = in_info;
+  priv->crop_rect = CD3DX12_BOX (0, 0, in_info.width, in_info.height);
+  priv->prev_crop_rect = priv->crop_rect;
+
+  gst_clear_object (&priv->ctx->conv);
+  gst_clear_object (&priv->ctx->comp);
+  gst_clear_buffer (&priv->ctx->cached_buf);
+
+  if (GST_VIDEO_INFO_HAS_ALPHA (&in_info)) {
+    gst_structure_set (config, GST_D3D12_CONVERTER_OPT_DEST_ALPHA_MODE,
+        GST_TYPE_D3D12_CONVERTER_ALPHA_MODE,
+        GST_D3D12_CONVERTER_ALPHA_MODE_PREMULTIPLIED, nullptr);
+  }
+
+  priv->ctx->conv = gst_d3d12_converter_new (window->device,
+      &priv->input_info, &priv->display_info, nullptr, nullptr, config);
+  if (!priv->ctx->conv) {
+    GST_ERROR_OBJECT (window, "Couldn't create converter");
+    priv->ctx = nullptr;
+    return GST_FLOW_ERROR;
+  }
+
+  priv->ctx->comp = gst_d3d12_overlay_compositor_new (window->device,
+      &priv->display_info);
+  if (!priv->ctx->comp) {
+    GST_ERROR_OBJECT (window, "Couldn't create overlay compositor");
+    priv->ctx = nullptr;
+    return GST_FLOW_ERROR;
+  }
+
+  ret = gst_d3d12_window_on_resize (window);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  lk.unlock ();
+
+  std::lock_guard < std::mutex > hlk (priv->hwnd_lock);
+  if (priv->requested_fullscreen != priv->applied_fullscreen)
+    PostMessageW (priv->hwnd, WM_GST_D3D12_FULLSCREEN, 0, 0);
+
+  return GST_FLOW_OK;
+}
+
+GstFlowReturn
+gst_d3d12_window_set_buffer (GstD3D12Window * window, GstBuffer * buffer)
+{
+  auto priv = window->priv;
+
+  if (buffer && priv->state != GST_D3D12_WINDOW_STATE_OPENED) {
+    GST_ERROR_OBJECT (window, "Window was closed");
+    return GST_D3D12_WINDOW_FLOW_CLOSED;
+  }
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  if (!priv->ctx) {
+    if (!buffer) {
+      GST_DEBUG_OBJECT (window, "Swapchain was not configured");
+      return GST_FLOW_OK;
+    }
+
+    GST_ERROR_OBJECT (window, "Swapchain was not configured");
+    return GST_FLOW_ERROR;
+  }
+
+  if (buffer)
+    gst_buffer_replace (&priv->ctx->cached_buf, buffer);
+
+  if (!priv->ctx->cached_buf)
+    return GST_FLOW_OK;
+
+  auto cur_idx = priv->ctx->swapchain->GetCurrentBackBufferIndex ();
+  auto swapbuf = priv->ctx->swap_bufferscur_idx;
+
+  auto crop_rect = priv->crop_rect;
+  auto crop_meta = gst_buffer_get_video_crop_meta (priv->ctx->cached_buf);
+  if (crop_meta) {
+    crop_rect = CD3DX12_BOX (crop_meta->x, crop_meta->y,
+        crop_meta->x + crop_meta->width, crop_meta->y + crop_meta->height);
+  }
+
+  if (crop_rect != priv->prev_crop_rect) {
+    g_object_set (priv->ctx->conv, "src-x", (gint) crop_rect.left,
+        "src-y", (gint) crop_rect.top,
+        "src-width", (gint) (crop_rect.right - crop_rect.left),
+        "src-height", (gint) (crop_rect.bottom - crop_rect.top), nullptr);
+    priv->prev_crop_rect = crop_rect;
+  }
+
+  if (priv->first_present) {
+    GstVideoRectangle dst_rect = { };
+    GstVideoRectangle rst_rect = { };
+    dst_rect.w = (gint) priv->ctx->buffer_desc.Width;
+    dst_rect.h = (gint) priv->ctx->buffer_desc.Height;
+
+    for (size_t i = 0; i < priv->ctx->swap_buffers.size (); i++)
+      priv->ctx->swap_buffersi->first = true;
+
+    if (priv->force_aspect_ratio) {
+      GstVideoRectangle src_rect = { };
+
+      switch (priv->orientation) {
+        case GST_VIDEO_ORIENTATION_90R:
+        case GST_VIDEO_ORIENTATION_90L:
+        case GST_VIDEO_ORIENTATION_UL_LR:
+        case GST_VIDEO_ORIENTATION_UR_LL:
+          src_rect.w = GST_VIDEO_INFO_HEIGHT (&priv->display_info);
+          src_rect.h = GST_VIDEO_INFO_WIDTH (&priv->display_info);
+          break;
+        default:
+          src_rect.w = GST_VIDEO_INFO_WIDTH (&priv->display_info);
+          src_rect.h = GST_VIDEO_INFO_HEIGHT (&priv->display_info);
+          break;
+      }
+
+      gst_video_sink_center_rect (src_rect, dst_rect, &rst_rect, TRUE);
+    } else {
+      rst_rect = dst_rect;
+    }
+
+    priv->output_rect = rst_rect;
+    priv->dirty_rect.left = rst_rect.x;
+    priv->dirty_rect.top = rst_rect.y;
+    priv->dirty_rect.right = rst_rect.x + rst_rect.w;
+    priv->dirty_rect.bottom = rst_rect.y + rst_rect.h;
+
+    g_object_set (priv->ctx->conv, "dest-x", priv->output_rect.x,
+        "dest-y", priv->output_rect.y, "dest-width", priv->output_rect.w,
+        "dest-height", priv->output_rect.h, nullptr);
+
+    if (gst_d3d12_need_transform (priv->rotation_x, priv->rotation_y,
+            priv->rotation_z, priv->scale_x, priv->scale_y)) {
+      gst_d3d12_converter_apply_transform (priv->ctx->conv, priv->orientation,
+          priv->output_rect.w, priv->output_rect.h, priv->fov, priv->ortho,
+          priv->rotation_x, priv->rotation_y, priv->rotation_z,
+          priv->scale_x, priv->scale_y);
+    } else {
+      g_object_set (priv->ctx->conv,
+          "video-direction", priv->orientation, nullptr);
+    }
+
+    gst_d3d12_overlay_compositor_update_viewport (priv->ctx->comp,
+        &priv->output_rect);
+  }
+
+  g_object_set (priv->ctx->conv, "fill-border", swapbuf->first, nullptr);
+  swapbuf->first = FALSE;
+
+  gst_d3d12_overlay_compositor_upload (priv->ctx->comp, priv->ctx->cached_buf);
+
+  GstD3D12CommandAllocator *gst_ca;
+  if (!gst_d3d12_command_allocator_pool_acquire (priv->ctx->ca_pool, &gst_ca)) {
+    GST_ERROR_OBJECT (window, "Couldn't acquire command allocator");
+    return GST_FLOW_ERROR;
+  }
+
+  ComPtr < ID3D12CommandAllocator > ca;
+  gst_d3d12_command_allocator_get_handle (gst_ca, &ca);
+  auto hr = ca->Reset ();
+  if (!gst_d3d12_result (hr, window->device)) {
+    GST_ERROR_OBJECT (window, "Couldn't reset command list");
+    gst_d3d12_command_allocator_unref (gst_ca);
+    return GST_FLOW_ERROR;
+  }
+
+  ComPtr < ID3D12GraphicsCommandList > cl;
+  if (!priv->ctx->cl) {
+    auto device = gst_d3d12_device_get_device_handle (priv->ctx->device);
+    hr = device->CreateCommandList (0, D3D12_COMMAND_LIST_TYPE_DIRECT,
+        ca.Get (), nullptr, IID_PPV_ARGS (&cl));
+    if (!gst_d3d12_result (hr, priv->ctx->device)) {
+      GST_ERROR_OBJECT (window, "Couldn't create command list");
+      gst_d3d12_command_allocator_unref (gst_ca);
+      return GST_FLOW_ERROR;
+    }
+
+    priv->ctx->cl = cl;
+  } else {
+    cl = priv->ctx->cl;
+    hr = cl->Reset (ca.Get (), nullptr);
+    if (!gst_d3d12_result (hr, priv->ctx->device)) {
+      GST_ERROR_OBJECT (window, "Couldn't reset command list");
+      gst_d3d12_command_allocator_unref (gst_ca);
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  GstD3D12FenceData *fence_data;
+  gst_d3d12_fence_data_pool_acquire (priv->fence_data_pool, &fence_data);
+  gst_d3d12_fence_data_add_notify_mini_object (fence_data, gst_ca);
+
+  auto mem = (GstD3D12Memory *) gst_buffer_peek_memory (swapbuf->backbuf, 0);
+  auto backbuf_texture = gst_d3d12_memory_get_resource_handle (mem);
+  ID3D12Resource *msaa_resource = nullptr;
+  GstBuffer *conv_outbuf = swapbuf->backbuf;
+  if (priv->ctx->msaa_buf) {
+    conv_outbuf = priv->ctx->msaa_buf;
+    mem = (GstD3D12Memory *) gst_buffer_peek_memory (priv->ctx->msaa_buf, 0);
+    msaa_resource = gst_d3d12_memory_get_resource_handle (mem);
+    /* MSAA resource must be render target state here already */
+  } else {
+    D3D12_RESOURCE_BARRIER barrier =
+        CD3DX12_RESOURCE_BARRIER::Transition (backbuf_texture,
+        D3D12_RESOURCE_STATE_COMMON,
+        D3D12_RESOURCE_STATE_RENDER_TARGET);
+    cl->ResourceBarrier (1, &barrier);
+  }
+
+  if (!gst_d3d12_converter_convert_buffer (priv->ctx->conv,
+          priv->ctx->cached_buf, conv_outbuf, fence_data, cl.Get ())) {
+    GST_ERROR_OBJECT (window, "Couldn't build convert command");
+    gst_d3d12_fence_data_unref (fence_data);
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_d3d12_overlay_compositor_draw (priv->ctx->comp,
+          conv_outbuf, fence_data, cl.Get ())) {
+    GST_ERROR_OBJECT (window, "Couldn't build overlay command");
+    gst_d3d12_fence_data_unref (fence_data);
+    return GST_FLOW_ERROR;
+  }
+
+  if (msaa_resource) {
+    std::vector < D3D12_RESOURCE_BARRIER > barriers;
+    barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (msaa_resource,
+            D3D12_RESOURCE_STATE_RENDER_TARGET,
+            D3D12_RESOURCE_STATE_RESOLVE_SOURCE));
+    barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (backbuf_texture,
+            D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_RESOLVE_DEST));
+    cl->ResourceBarrier (barriers.size (), barriers.data ());
+
+    cl->ResolveSubresource (backbuf_texture, 0, msaa_resource, 0,
+        priv->display_format);
+
+    barriers.clear ();
+    barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (msaa_resource,
+            D3D12_RESOURCE_STATE_RESOLVE_SOURCE,
+            D3D12_RESOURCE_STATE_RENDER_TARGET));
+    barriers.push_back (CD3DX12_RESOURCE_BARRIER::Transition (backbuf_texture,
+            D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COMMON));
+    cl->ResourceBarrier (barriers.size (), barriers.data ());
+  } else {
+    D3D12_RESOURCE_BARRIER barrier =
+        CD3DX12_RESOURCE_BARRIER::Transition (backbuf_texture,
+        D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COMMON);
+
+    cl->ResourceBarrier (1, &barrier);
+  }
+
+  hr = cl->Close ();
+  if (!gst_d3d12_result (hr, priv->ctx->device)) {
+    GST_ERROR_OBJECT (window, "Couldn't close command list");
+    gst_d3d12_fence_data_unref (fence_data);
+    return GST_FLOW_ERROR;
+  }
+
+  guint64 max_fence_val = 0;
+  auto num_mem = gst_buffer_n_memory (priv->ctx->cached_buf);
+  for (guint i = 0; i < num_mem; i++) {
+    mem = (GstD3D12Memory *) gst_buffer_peek_memory (priv->ctx->cached_buf, 0);
+    if (mem->fence_value > max_fence_val)
+      max_fence_val = mem->fence_value;
+  }
+
+  auto completed = gst_d3d12_device_get_completed_value (priv->ctx->device,
+      D3D12_COMMAND_LIST_TYPE_DIRECT);
+
+  if (completed < max_fence_val) {
+    auto device_queue = gst_d3d12_device_get_command_queue (priv->ctx->device,
+        D3D12_COMMAND_LIST_TYPE_DIRECT);
+    ComPtr < ID3D12Fence > fence;
+    gst_d3d12_command_queue_get_fence (device_queue, &fence);
+    gst_d3d12_command_queue_execute_wait (priv->ctx->queue, fence.Get (),
+        max_fence_val);
+  }
+
+  ID3D12CommandList *cmd_list = { cl.Get () };
+  hr = gst_d3d12_command_queue_execute_command_lists (priv->ctx->queue,
+      1, cmd_list, &priv->ctx->fence_val);
+  if (!gst_d3d12_result (hr, priv->ctx->device)) {
+    GST_ERROR_OBJECT (window, "Signal failed");
+    gst_d3d12_fence_data_unref (fence_data);
+    return GST_FLOW_ERROR;
+  }
+
+  gst_d3d12_command_queue_set_notify (priv->ctx->queue, priv->ctx->fence_val,
+      fence_data, (GDestroyNotify) gst_d3d12_fence_data_unref);
+
+  priv->backbuf_rendered = TRUE;
+
+  return GST_FLOW_OK;
+}
+
+GstFlowReturn
+gst_d3d12_window_present (GstD3D12Window * window)
+{
+  auto priv = window->priv;
+
+  if (priv->state != GST_D3D12_WINDOW_STATE_OPENED) {
+    GST_ERROR_OBJECT (window, "Window was closed");
+    return GST_D3D12_WINDOW_FLOW_CLOSED;
+  }
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  if (!priv->ctx) {
+    GST_ERROR_OBJECT (window, "Swapchain was not configured");
+    return GST_FLOW_ERROR;
+  }
+
+  if (priv->backbuf_rendered) {
+    DXGI_PRESENT_PARAMETERS params = { };
+
+    if (!priv->first_present) {
+      params.DirtyRectsCount = 1;
+      params.pDirtyRects = &priv->dirty_rect;
+    }
+
+    auto hr = priv->ctx->swapchain->Present1 (0,
+        DXGI_PRESENT_DO_NOT_WAIT, &params);
+
+    priv->first_present = FALSE;
+    priv->backbuf_rendered = FALSE;
+    if (hr != DXGI_ERROR_WAS_STILL_DRAWING &&
+        !gst_d3d12_result (hr, window->device))
+      GST_WARNING_OBJECT (window, "Present return 0x%x", (guint) hr);
+  }
+
+  return GST_FLOW_OK;
+}
+
+guintptr
+gst_d3d12_window_get_window_handle (GstD3D12Window * window)
+{
+  auto priv = window->priv;
+
+  return (guintptr) priv->hwnd;
+}
+
+void
+gst_d3d12_window_set_render_rect (GstD3D12Window * window,
+    const GstVideoRectangle * rect)
+{
+  auto priv = window->priv;
+
+  {
+    std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+    priv->render_rect = *rect;
+  }
+
+  if (priv->hwnd) {
+    PostMessageW (priv->hwnd, WM_GST_D3D12_UPDATE_RENDER_RECT, 0, 0);
+    return;
+  }
+}
+
+void
+gst_d3d12_window_set_force_aspect_ratio (GstD3D12Window * window,
+    gboolean force_aspect_ratio)
+{
+  auto priv = window->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  if (priv->force_aspect_ratio != force_aspect_ratio) {
+    priv->force_aspect_ratio = force_aspect_ratio;
+    gst_d3d12_window_on_resize (window);
+  }
+}
+
+void
+gst_d3d12_window_set_enable_navigation_events (GstD3D12Window * window,
+    gboolean enable)
+{
+  auto priv = window->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  priv->enable_navigation = enable;
+}
+
+void
+gst_d3d12_window_set_orientation (GstD3D12Window * window, gboolean immediate,
+    GstVideoOrientationMethod orientation, gfloat fov, gboolean ortho,
+    gfloat rotation_x, gfloat rotation_y, gfloat rotation_z,
+    gfloat scale_x, gfloat scale_y)
+{
+  auto priv = window->priv;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  if (priv->orientation != orientation || priv->fov != fov
+      || priv->ortho != ortho
+      || priv->rotation_x != rotation_x || priv->rotation_y != rotation_y
+      || priv->rotation_z != rotation_z || priv->scale_x != scale_x
+      || priv->scale_y != scale_y) {
+    priv->orientation = orientation;
+    priv->fov = fov;
+    priv->ortho = ortho;
+    priv->rotation_x = rotation_x;
+    priv->rotation_y = rotation_y;
+    priv->rotation_z = rotation_z;
+    priv->scale_x = scale_x;
+    priv->scale_y = scale_y;
+    priv->first_present = TRUE;
+    if (immediate)
+      gst_d3d12_window_set_buffer (window, nullptr);
+  }
+}
+
+void
+gst_d3d12_window_set_title (GstD3D12Window * window, const gchar * title)
+{
+  auto priv = window->priv;
+  wchar_t *wtitle = nullptr;
+
+  if (title)
+    wtitle = (wchar_t *) g_utf8_to_utf16 (title, -1, nullptr, nullptr, nullptr);
+
+  std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+  if (!wtitle) {
+    priv->title.clear ();
+  } else {
+    priv->title = wtitle;
+  }
+  g_free (wtitle);
+}
+
+GstD3D12Window *
+gst_d3d12_window_new (void)
+{
+  auto self = (GstD3D12Window *) g_object_new (GST_TYPE_D3D12_WINDOW, nullptr);
+  gst_object_ref_sink (self);
+
+  return self;
+}
+
+GstD3D12WindowState
+gst_d3d12_window_get_state (GstD3D12Window * window)
+{
+  auto priv = window->priv;
+
+  return priv->state;
+}
+
+void
+gst_d3d12_window_enable_fullscreen_on_alt_enter (GstD3D12Window * window,
+    gboolean enable)
+{
+  auto priv = window->priv;
+  std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+  priv->fullscreen_on_alt_enter = enable;
+}
+
+void
+gst_d3d12_window_set_fullscreen (GstD3D12Window * window, gboolean enable)
+{
+  auto priv = window->priv;
+  std::lock_guard < std::mutex > lk (priv->hwnd_lock);
+  priv->requested_fullscreen = enable;
+  if (priv->hwnd && priv->applied_fullscreen != priv->requested_fullscreen)
+    PostMessageW (priv->hwnd, WM_GST_D3D12_FULLSCREEN, 0, 0);
+}
+
+void
+gst_d3d12_window_set_msaa (GstD3D12Window * window, GstD3D12MSAAMode msaa)
+{
+  auto priv = window->priv;
+  std::lock_guard < std::recursive_mutex > lk (priv->lock);
+  if (priv->msaa != msaa) {
+    priv->msaa = msaa;
+    gst_d3d12_window_on_resize (window);
+  }
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/gstd3d12window.h Added

@@ -0,0 +1,100 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include "gstd3d12.h"
+#include "gstd3d12pluginutils.h"
+
+G_BEGIN_DECLS
+
+#define GST_D3D12_WINDOW_FLOW_CLOSED GST_FLOW_CUSTOM_ERROR
+
+#define GST_TYPE_D3D12_WINDOW (gst_d3d12_window_get_type())
+G_DECLARE_FINAL_TYPE (GstD3D12Window, gst_d3d12_window,
+    GST, D3D12_WINDOW, GstObject)
+
+enum GstD3D12WindowState
+{
+  GST_D3D12_WINDOW_STATE_INIT,
+  GST_D3D12_WINDOW_STATE_OPENED,
+  GST_D3D12_WINDOW_STATE_CLOSED,
+};
+
+GstD3D12Window * gst_d3d12_window_new (void);
+
+guintptr         gst_d3d12_window_get_window_handle (GstD3D12Window * window);
+
+GstD3D12WindowState gst_d3d12_window_get_state (GstD3D12Window * window);
+
+GstFlowReturn    gst_d3d12_window_prepare (GstD3D12Window * window,
+                                           GstD3D12Device * device,
+                                           guintptr window_handle,
+                                           guint display_width,
+                                           guint display_height,
+                                           GstCaps * caps,
+                                           GstStructure * config);
+
+void             gst_d3d12_window_unprepare (GstD3D12Window * window);
+
+void             gst_d3d12_window_unlock    (GstD3D12Window * window);
+
+void             gst_d3d12_window_unlock_stop (GstD3D12Window * window);
+
+GstFlowReturn    gst_d3d12_window_set_buffer (GstD3D12Window * window,
+                                              GstBuffer * buffer);
+
+GstFlowReturn    gst_d3d12_window_present (GstD3D12Window * window);
+
+void             gst_d3d12_window_set_render_rect (GstD3D12Window * window,
+                                                   const GstVideoRectangle * rect);
+
+void             gst_d3d12_window_set_force_aspect_ratio (GstD3D12Window * window,
+                                                          gboolean force_aspect_ratio);
+
+void             gst_d3d12_window_set_enable_navigation_events (GstD3D12Window * window,
+                                                                gboolean enable);
+
+void             gst_d3d12_window_set_orientation (GstD3D12Window * window,
+                                                   gboolean immediate,
+                                                   GstVideoOrientationMethod orientation,
+                                                   gfloat fov,
+                                                   gboolean ortho,
+                                                   gfloat rotation_x,
+                                                   gfloat rotation_y,
+                                                   gfloat rotation_z,
+                                                   gfloat scale_x,
+                                                   gfloat scale_y);
+
+void             gst_d3d12_window_set_title (GstD3D12Window * window,
+                                             const gchar * title);
+
+void             gst_d3d12_window_enable_fullscreen_on_alt_enter (GstD3D12Window * window,
+                                                                  gboolean enable);
+
+void             gst_d3d12_window_set_fullscreen (GstD3D12Window * window,
+                                                  gboolean enable);
+
+void             gst_d3d12_window_set_msaa (GstD3D12Window * window,
+                                            GstD3D12MSAAMode msaa);
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl Added

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/PSMain_checker.hlsl Added

@@ -0,0 +1,44 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+cbuffer CheckerConstBuffer : register(b0)
+{
+  float width;
+  float height;
+  float checker_size;
+  float alpha;
+};
+
+struct PS_INPUT
+{
+  float4 Position: SV_POSITION;
+  float2 Texture: TEXCOORD;
+};
+
+float4 PSMain_checker (PS_INPUT input) : SV_Target
+{
+  float4 output;
+  float2 xy_mod = floor (0.5 * input.Texture * float2 (width, height) / checker_size);
+  float result = fmod (xy_mod.x + xy_mod.y, 2.0);
+  output.r = step (result, 0.5);
+  output.g = 1.0 - output.r;
+  output.b = 0;
+  output.a = alpha;
+  return output;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/PSMain_checker_luma.hlsl Added

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/PSMain_checker_rgb.hlsl Added

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/PSMain_checker_vuya.hlsl Added

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/PSMain_color.hlsl Added

@@ -0,0 +1,29 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+struct PS_INPUT
+{
+  float4 Position: SV_POSITION;
+  float4 Color: COLOR;
+};
+
+float4 PSMain_color (PS_INPUT input) : SV_TARGET
+{
+  return input.Color;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/PSMain_converter.hlsl Added

@@ -0,0 +1,969 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+cbuffer PsAlphaFactor : register(b0, space0)
+{
+  float alphaFactor;
+};
+
+struct PSColorSpace
+{
+  float3 CoeffX;
+  float3 CoeffY;
+  float3 CoeffZ;
+  float3 Offset;
+  float3 Min;
+  float3 Max;
+  float padding;
+};
+
+cbuffer PsConstBuffer : register(b1, space0)
+{
+  PSColorSpace preCoeff;
+  PSColorSpace postCoeff;
+  PSColorSpace primariesCoeff;
+};
+
+#ifdef NUM_SRV_1
+Texture2D shaderTexture_0 : register(t0, space0);
+#endif
+#ifdef NUM_SRV_2
+Texture2D shaderTexture_0 : register(t0, space0);
+Texture2D shaderTexture_1 : register(t1, space0);
+#endif
+#ifdef NUM_SRV_3
+Texture2D shaderTexture_0 : register(t0, space0);
+Texture2D shaderTexture_1 : register(t1, space0);
+Texture2D shaderTexture_2 : register(t2, space0);
+#endif
+#ifdef NUM_SRV_4
+Texture2D shaderTexture_0 : register(t0, space0);
+Texture2D shaderTexture_1 : register(t1, space0);
+Texture2D shaderTexture_2 : register(t2, space0);
+Texture2D shaderTexture_3 : register(t3, space0);
+#endif
+
+SamplerState samplerState : register(s0, space0);
+
+#ifdef BUILD_LUT
+Texture1D<float> gammaDecLUT : register(t4, space0);
+Texture1D<float> gammaEncLUT : register(t5, space0);
+SamplerState lutSamplerState : register(s1, space0);
+#endif
+
+struct PS_INPUT
+{
+  float4 Position: SV_POSITION;
+  float2 Texture: TEXCOORD;
+};
+
+struct PS_OUTPUT_PACKED
+{
+  float4 Plane0: SV_TARGET0;
+};
+
+struct PS_OUTPUT_LUMA
+{
+  float4 Plane0: SV_TARGET0;
+};
+
+struct PS_OUTPUT_CHROMA
+{
+  float4 Plane0: SV_TARGET0;
+};
+
+struct PS_OUTPUT_CHROMA_PLANAR
+{
+  float4 Plane0: SV_TARGET0;
+  float4 Plane1: SV_TARGET1;
+};
+
+struct PS_OUTPUT_PLANAR
+{
+  float4 Plane0: SV_TARGET0;
+  float4 Plane1: SV_TARGET1;
+  float4 Plane2: SV_TARGET2;
+};
+
+struct PS_OUTPUT_PLANAR_FULL
+{
+  float4 Plane0: SV_TARGET0;
+  float4 Plane1: SV_TARGET1;
+  float4 Plane2: SV_TARGET2;
+  float4 Plane3: SV_TARGET3;
+};
+
+float4 DoAlphaPremul (float4 sample)
+{
+  float4 premul_tex;
+  premul_tex.rgb = sample.rgb * sample.a;
+  premul_tex.a = sample.a;
+  return premul_tex;
+}
+
+float4 DoAlphaUnpremul (float4 sample)
+{
+  float4 unpremul_tex;
+  if (sample.a == 0 || sample.a == 1)
+    return sample;
+
+  unpremul_tex.rgb = saturate (sample.rgb / sample.a);
+  unpremul_tex.a = sample.a;
+  return unpremul_tex;
+}
+
+interface ISampler
+{
+  float4 Execute (float2 uv);
+};
+
+#ifdef NUM_SRV_1
+class SamplerRGBA : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture_0.Sample(samplerState, uv);
+  }
+};
+
+class SamplerRGBAPremul : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return DoAlphaUnpremul (shaderTexture_0.Sample(samplerState, uv));
+  }
+};
+
+class SamplerRBGA : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture_0.Sample(samplerState, uv).rbga;
+  }
+};
+
+class SamplerVUYA : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture_0.Sample(samplerState, uv).zyxw;
+  }
+};
+
+class SamplerY410 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return float4 (shaderTexture_0.Sample(samplerState, uv).yxz, 1.0);
+  }
+};
+
+class SamplerY412 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture_0.Sample(samplerState, uv).grba;
+  }
+};
+
+class SamplerAYUV : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture_0.Sample(samplerState, uv).yzwx;
+  }
+};
+
+class SamplerRGBx : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return float4 (shaderTexture_0.Sample(samplerState, uv).rgb, 1.0);
+  }
+};
+
+class SamplerxRGB : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return float4 (shaderTexture_0.Sample(samplerState, uv).gba, 1.0);
+  }
+};
+
+class SamplerARGB : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture_0.Sample(samplerState, uv).gbar;
+  }
+};
+
+class SamplerxBGR : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return float4 (shaderTexture_0.Sample(samplerState, uv).abg, 1.0);
+  }
+};
+
+class SamplerABGR : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture_0.Sample(samplerState, uv).abgr;
+  }
+};
+
+class SamplerBGR10A2 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return float4 (shaderTexture_0.Sample(samplerState, uv).zyx, 1.0);
+  }
+};
+
+class SamplerBGRA64 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    return shaderTexture_0.Sample(samplerState, uv).bgra;
+  }
+};
+
+class SamplerGRAY : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.x = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.y = 0.5;
+    sample.z = 0.5;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+#endif
+
+#ifdef NUM_SRV_2
+class SamplerNV12 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.x = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.yz = shaderTexture_1.Sample(samplerState, uv).xy;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerNV21 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.x = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.yz = shaderTexture_1.Sample(samplerState, uv).yx;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+#endif
+
+#ifdef NUM_SRV_3
+class SamplerI420 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.x = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.y = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.z = shaderTexture_2.Sample(samplerState, uv).x;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerYV12 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.x = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.z = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.y = shaderTexture_2.Sample(samplerState, uv).x;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerI420_10 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float3 sample;
+    sample.x = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.y = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.z = shaderTexture_2.Sample(samplerState, uv).x;
+    return float4 (saturate (sample * 64.0), 1.0);
+  }
+};
+
+class SamplerI420_12 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float3 sample;
+    sample.x = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.y = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.z = shaderTexture_2.Sample(samplerState, uv).x;
+    return float4 (saturate (sample * 16.0), 1.0);
+  }
+};
+
+class SamplerGBR : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.g = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture_2.Sample(samplerState, uv).x;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerGBR_10 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float3 sample;
+    sample.g = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture_2.Sample(samplerState, uv).x;
+    return float4 (saturate (sample * 64.0), 1.0);
+  }
+};
+
+class SamplerGBR_12 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float3 sample;
+    sample.g = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture_2.Sample(samplerState, uv).x;
+    return float4 (saturate (sample * 16.0), 1.0);
+  }
+};
+
+class SamplerRGBP : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.r = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.g = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.b = shaderTexture_2.Sample(samplerState, uv).x;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+
+class SamplerBGRP : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.b = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.g = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture_2.Sample(samplerState, uv).x;
+    sample.a = 1.0;
+    return sample;
+  }
+};
+#endif
+
+#ifdef NUM_SRV_4
+class SamplerGBRA : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.g = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture_2.Sample(samplerState, uv).x;
+    sample.a = shaderTexture_3.Sample(samplerState, uv).x;
+    return sample;
+  }
+};
+
+class SamplerGBRA_10 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.g = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture_2.Sample(samplerState, uv).x;
+    sample.a = shaderTexture_3.Sample(samplerState, uv).x;
+    return saturate (sample * 64.0);
+  }
+};
+
+class SamplerGBRA_12 : ISampler
+{
+  float4 Execute (float2 uv)
+  {
+    float4 sample;
+    sample.g = shaderTexture_0.Sample(samplerState, uv).x;
+    sample.b = shaderTexture_1.Sample(samplerState, uv).x;
+    sample.r = shaderTexture_2.Sample(samplerState, uv).x;
+    sample.a = shaderTexture_3.Sample(samplerState, uv).x;
+    return saturate (sample * 16.0);
+  }
+};
+#endif
+
+interface IConverter
+{
+  float4 Execute (float4 sample);
+};
+
+class ConverterIdentity : IConverter
+{
+  float4 Execute (float4 sample)
+  {
+    return sample;
+  }
+};
+
+class ConverterRange : IConverter
+{
+  float4 Execute (float4 sample)
+  {
+    float3 out_space;
+    out_space.x = postCoeff.CoeffX.x * sample.x;
+    out_space.y = postCoeff.CoeffY.y * sample.y;
+    out_space.z = postCoeff.CoeffZ.z * sample.z;
+    out_space += postCoeff.Offset;
+    return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);
+  }
+};
+
+class ConverterSimple : IConverter
+{
+  float4 Execute (float4 sample)
+  {
+    float3 out_space;
+    out_space.x = dot (postCoeff.CoeffX, sample.xyz);
+    out_space.y = dot (postCoeff.CoeffY, sample.xyz);
+    out_space.z = dot (postCoeff.CoeffZ, sample.xyz);
+    out_space += postCoeff.Offset;
+    return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);
+  }
+};
+
+#ifdef BUILD_LUT
+class ConverterGamma : IConverter
+{
+  float4 Execute (float4 sample)
+  {
+    float3 rgb_space;
+    float3 out_space;
+    rgb_space.x = dot (preCoeff.CoeffX, sample.xyz);
+    rgb_space.y = dot (preCoeff.CoeffY, sample.xyz);
+    rgb_space.z = dot (preCoeff.CoeffZ, sample.xyz);
+    rgb_space += preCoeff.Offset;
+    rgb_space = clamp (rgb_space, preCoeff.Min, preCoeff.Max);
+
+    rgb_space.x = gammaDecLUT.Sample (lutSamplerState, rgb_space.x);
+    rgb_space.y = gammaDecLUT.Sample (lutSamplerState, rgb_space.y);
+    rgb_space.z = gammaDecLUT.Sample (lutSamplerState, rgb_space.z);
+
+    rgb_space.x = gammaEncLUT.Sample (lutSamplerState, rgb_space.x);
+    rgb_space.y = gammaEncLUT.Sample (lutSamplerState, rgb_space.y);
+    rgb_space.z = gammaEncLUT.Sample (lutSamplerState, rgb_space.z);
+
+    out_space.x = dot (postCoeff.CoeffX, rgb_space);
+    out_space.y = dot (postCoeff.CoeffY, rgb_space);
+    out_space.z = dot (postCoeff.CoeffZ, rgb_space);
+    out_space += postCoeff.Offset;
+    return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);
+  }
+};
+
+class ConverterPrimary : IConverter
+{
+  float4 Execute (float4 sample)
+  {
+    float3 rgb_space;
+    float3 primary_converted;
+    float3 out_space;
+
+    rgb_space.x = dot (preCoeff.CoeffX, sample.xyz);
+    rgb_space.y = dot (preCoeff.CoeffY, sample.xyz);
+    rgb_space.z = dot (preCoeff.CoeffZ, sample.xyz);
+    rgb_space += preCoeff.Offset;
+    rgb_space = clamp (rgb_space, preCoeff.Min, preCoeff.Max);
+
+    rgb_space.x = gammaDecLUT.Sample (lutSamplerState, rgb_space.x);
+    rgb_space.y = gammaDecLUT.Sample (lutSamplerState, rgb_space.y);
+    rgb_space.z = gammaDecLUT.Sample (lutSamplerState, rgb_space.z);
+
+    primary_converted.x = dot (primariesCoeff.CoeffX, rgb_space);
+    primary_converted.y = dot (primariesCoeff.CoeffY, rgb_space);
+    primary_converted.z = dot (primariesCoeff.CoeffZ, rgb_space);
+
+    rgb_space.x = gammaEncLUT.Sample (lutSamplerState, primary_converted.x);
+    rgb_space.y = gammaEncLUT.Sample (lutSamplerState, primary_converted.y);
+    rgb_space.z = gammaEncLUT.Sample (lutSamplerState, primary_converted.z);
+
+    out_space.x = dot (postCoeff.CoeffX, rgb_space);
+    out_space.y = dot (postCoeff.CoeffY, rgb_space);
+    out_space.z = dot (postCoeff.CoeffZ, rgb_space);
+    out_space += postCoeff.Offset;
+    return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);
+  }
+};
+#endif
+
+float UnormTo10bit (float sample)
+{
+  return sample * 1023.0 / 65535.0;
+}
+
+float2 UnormTo10bit (float2 sample)
+{
+  return sample * 1023.0 / 65535.0;
+}
+
+float3 UnormTo10bit (float3 sample)
+{
+  return sample * 1023.0 / 65535.0;
+}
+
+float4 UnormTo10bit (float4 sample)
+{
+  return sample * 1023.0 / 65535.0;
+}
+
+float UnormTo12bit (float sample)
+{
+  return sample * 4095.0 / 65535.0;
+}
+
+float2 UnormTo12bit (float2 sample)
+{
+  return sample * 4095.0 / 65535.0;
+}
+
+float3 UnormTo12bit (float3 sample)
+{
+  return sample * 4095.0 / 65535.0;
+}
+
+float4 UnormTo12bit (float4 sample)
+{
+  return sample * 4095.0 / 65535.0;
+}
+
+interface IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample);
+};
+
+class OutputRGBA : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = float4 (sample.rgb, sample.a * alphaFactor);
+    return output;
+  }
+};
+
+class OutputRGBAPremul : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    sample.a *= alphaFactor;
+    output.Plane0 = DoAlphaPremul (sample);
+    return output;
+  }
+};
+
+class OutputRGBx : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = float4 (sample.rgb, 1.0);
+    return output;
+  }
+};
+
+class OutputxRGB : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = float4 (0.0, sample.rgb);
+    return output;
+  }
+};
+
+class OutputARGB : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = sample.argb;
+    return output;
+  }
+};
+
+class OutputxBGR : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = float4 (0.0, sample.bgr);
+    return output;
+  }
+};
+
+class OutputABGR : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    output.Plane0 = sample.abgr;
+    return output;
+  }
+};
+
+class OutputVUYA : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    sample.a *= alphaFactor;
+    output.Plane0 = sample.zyxw;
+    return output;
+  }
+};
+
+class OutputAYUV : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    sample.a *= alphaFactor;
+    output.Plane0 = sample.wxyz;
+    return output;
+  }
+};
+
+class OutputRBGA : IOutputPacked
+{
+  PS_OUTPUT_PACKED Build (float4 sample)
+  {
+    PS_OUTPUT_PACKED output;
+    sample.a *= alphaFactor;
+    output.Plane0 = sample.rbga;
+    return output;
+  }
+};
+
+interface IOutputLuma
+{
+  PS_OUTPUT_LUMA Build (float4 sample);
+};
+
+class OutputLuma : IOutputLuma
+{
+  PS_OUTPUT_LUMA Build (float4 sample)
+  {
+    PS_OUTPUT_LUMA output;
+    output.Plane0 = float4 (sample.x, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputLuma_10 : IOutputLuma
+{
+  PS_OUTPUT_LUMA Build (float4 sample)
+  {
+    PS_OUTPUT_LUMA output;
+    output.Plane0 = float4 (UnormTo10bit (sample.x), 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputLuma_12 : IOutputLuma
+{
+  PS_OUTPUT_LUMA Build (float4 sample)
+  {
+    PS_OUTPUT_LUMA output;
+    output.Plane0 = float4 (UnormTo12bit (sample.x), 0, 0, 0);
+    return output;
+  }
+};
+
+interface IOutputChroma
+{
+  PS_OUTPUT_CHROMA Build (float4 sample);
+};
+
+class OutputChromaNV12 : IOutputChroma
+{
+  PS_OUTPUT_CHROMA Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA output;
+    output.Plane0 = float4 (sample.yz, 0, 0);
+    return output;
+  }
+};
+
+class OutputChromaNV21 : IOutputChroma
+{
+  PS_OUTPUT_CHROMA Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA output;
+    output.Plane0 = float4 (sample.zy, 0, 0);
+    return output;
+  }
+};
+
+interface IOutputChromaPlanar
+{
+  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample);
+};
+
+class OutputChromaI420 : IOutputChromaPlanar
+{
+  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA_PLANAR output;
+    output.Plane0 = float4 (sample.y, 0, 0, 0);
+    output.Plane1 = float4 (sample.z, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputChromaYV12 : IOutputChromaPlanar
+{
+  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA_PLANAR output;
+    output.Plane0 = float4 (sample.z, 0, 0, 0);
+    output.Plane1 = float4 (sample.y, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputChromaI420_10 : IOutputChromaPlanar
+{
+  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA_PLANAR output;
+    float2 scaled = UnormTo10bit (sample.yz);
+    output.Plane0 = float4 (scaled.x, 0, 0, 0);
+    output.Plane1 = float4 (scaled.y, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputChromaI420_12 : IOutputChromaPlanar
+{
+  PS_OUTPUT_CHROMA_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_CHROMA_PLANAR output;
+    float2 scaled = UnormTo12bit (sample.yz);
+    output.Plane0 = float4 (scaled.x, 0, 0, 0);
+    output.Plane1 = float4 (scaled.y, 0, 0, 0);
+    return output;
+  }
+};
+
+interface IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample);
+};
+
+class OutputY444 : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    output.Plane0 = float4 (sample.x, 0, 0, 0);
+    output.Plane1 = float4 (sample.y, 0, 0, 0);
+    output.Plane2 = float4 (sample.z, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputY444_10 : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    float3 scaled = UnormTo10bit (sample.xyz);
+    output.Plane0 = float4 (scaled.x, 0, 0, 0);
+    output.Plane1 = float4 (scaled.y, 0, 0, 0);
+    output.Plane2 = float4 (scaled.z, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputY444_12 : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    float3 scaled = UnormTo12bit (sample.xyz);
+    output.Plane0 = float4 (scaled.x, 0, 0, 0);
+    output.Plane1 = float4 (scaled.y, 0, 0, 0);
+    output.Plane2 = float4 (scaled.z, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBR : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    output.Plane0 = float4 (sample.g, 0, 0, 0);
+    output.Plane1 = float4 (sample.b, 0, 0, 0);
+    output.Plane2 = float4 (sample.r, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBR_10 : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    float3 scaled = UnormTo10bit (sample.rgb);
+    output.Plane0 = float4 (scaled.g, 0, 0, 0);
+    output.Plane1 = float4 (scaled.b, 0, 0, 0);
+    output.Plane2 = float4 (scaled.r, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBR_12 : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    float3 scaled = UnormTo12bit (sample.rgb);
+    output.Plane0 = float4 (scaled.g, 0, 0, 0);
+    output.Plane1 = float4 (scaled.b, 0, 0, 0);
+    output.Plane2 = float4 (scaled.r, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputRGBP : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    output.Plane0 = float4 (sample.r, 0, 0, 0);
+    output.Plane1 = float4 (sample.g, 0, 0, 0);
+    output.Plane2 = float4 (sample.b, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputBGRP : IOutputPlanar
+{
+  PS_OUTPUT_PLANAR Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR output;
+    output.Plane0 = float4 (sample.b, 0, 0, 0);
+    output.Plane1 = float4 (sample.g, 0, 0, 0);
+    output.Plane2 = float4 (sample.r, 0, 0, 0);
+    return output;
+  }
+};
+
+interface IOutputPlanarFull
+{
+  PS_OUTPUT_PLANAR_FULL Build (float4 sample);
+};
+
+class OutputGBRA : IOutputPlanarFull
+{
+  PS_OUTPUT_PLANAR_FULL Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR_FULL output;
+    output.Plane0 = float4 (sample.g, 0, 0, 0);
+    output.Plane1 = float4 (sample.b, 0, 0, 0);
+    output.Plane2 = float4 (sample.r, 0, 0, 0);
+    output.Plane3 = float4 (sample.a * alphaFactor, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBRA_10 : IOutputPlanarFull
+{
+  PS_OUTPUT_PLANAR_FULL Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR_FULL output;
+    float4 scaled;
+    sample.a *= alphaFactor;
+    scaled = UnormTo10bit (sample);
+    output.Plane0 = float4 (scaled.g, 0, 0, 0);
+    output.Plane1 = float4 (scaled.b, 0, 0, 0);
+    output.Plane2 = float4 (scaled.r, 0, 0, 0);
+    output.Plane3 = float4 (scaled.a, 0, 0, 0);
+    return output;
+  }
+};
+
+class OutputGBRA_12 : IOutputPlanarFull
+{
+  PS_OUTPUT_PLANAR_FULL Build (float4 sample)
+  {
+    PS_OUTPUT_PLANAR_FULL output;
+    float4 scaled;
+    sample.a *= alphaFactor;
+    scaled = UnormTo12bit (sample);
+    output.Plane0 = float4 (scaled.g, 0, 0, 0);
+    output.Plane1 = float4 (scaled.b, 0, 0, 0);
+    output.Plane2 = float4 (scaled.r, 0, 0, 0);
+    output.Plane3 = float4 (scaled.a, 0, 0, 0);
+    return output;
+  }
+};
+
+OUTPUT_TYPE ENTRY_POINT (PS_INPUT input)
+{
+  SAMPLER g_sampler;
+  CONVERTER g_converter;
+  OUTPUT_BUILDER g_builder;
+  return g_builder.Build (g_converter.Execute (g_sampler.Execute (input.Texture)));
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/PSMain_sample.hlsl Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+Texture2D shaderTexture : register(t0, space0);
+SamplerState samplerState : register(s0, space0);
+
+struct PS_INPUT
+{
+  float4 Position : SV_POSITION;
+  float2 Texture : TEXCOORD;
+};
+
+float4 PSMain_sample (PS_INPUT input): SV_TARGET
+{
+  return shaderTexture.Sample (samplerState, input.Texture);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/PSMain_sample_premul.hlsl Added

@@ -0,0 +1,38 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+Texture2D shaderTexture : register(t0, space0);
+SamplerState samplerState : register(s0, space0);
+
+struct PS_INPUT
+{
+  float4 Position : SV_POSITION;
+  float2 Texture : TEXCOORD;
+};
+
+float4 PSMain_sample_premul (PS_INPUT input): SV_TARGET
+{
+  float4 sample = shaderTexture.Sample (samplerState, input.Texture);
+  float4 premul_sample;
+  premul_sample.r = saturate (sample.r * sample.a);
+  premul_sample.g = saturate (sample.g * sample.a);
+  premul_sample.b = saturate (sample.b * sample.a);
+  premul_sample.a = sample.a;
+  return premul_sample;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/PSMain_snow.hlsl Added

@@ -0,0 +1,45 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+cbuffer SnowConstBuffer : register(b0)
+{
+  float time;
+  float alpha;
+};
+
+struct PS_INPUT
+{
+  float4 Position : SV_POSITION;
+  float2 Texture : TEXCOORD;
+};
+
+float get_rand (float2 uv)
+{
+  return frac (sin (dot (uv, float2 (12.9898,78.233))) * 43758.5453);
+}
+
+float4 PSMain_snow (PS_INPUT input) : SV_Target
+{
+  float4 output;
+  float val = get_rand (time * input.Texture);
+  output.rgb = float3(val, val, val);
+  output.a = alpha;
+  return output;
+}
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/VSMain_color.hlsl Added

@@ -0,0 +1,35 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+struct VS_INPUT
+{
+  float4 Position : POSITION;
+  float4 Color : COLOR;
+};
+
+struct VS_OUTPUT
+{
+  float4 Position : SV_POSITION;
+  float4 Color : COLOR;
+};
+
+VS_OUTPUT VSMain_color (VS_INPUT input)
+{
+  return input;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/VSMain_converter.hlsl Added

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/VSMain_coord.hlsl Added

@@ -0,0 +1,35 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+struct VS_INPUT
+{
+  float4 Position : POSITION;
+  float2 Texture : TEXCOORD;
+};
+
+struct VS_OUTPUT
+{
+  float4 Position : SV_POSITION;
+  float2 Texture : TEXCOORD;
+};
+
+VS_OUTPUT VSMain_coord (VS_INPUT input)
+{
+  return input;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/VSMain_pos.hlsl Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+struct VS_INPUT
+{
+  float4 Position : POSITION;
+};
+
+struct VS_OUTPUT
+{
+  float4 Position : SV_POSITION;
+};
+
+VS_OUTPUT VSMain_pos (VS_INPUT input)
+{
+  return input;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/collect_hlsl_header.py Added

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/hlsl/meson.build Added

@@ -0,0 +1,172 @@
+hlsl_conv_ps_source = files('PSMain_converter.hlsl')
+
+hlsl_conv_ps_input_formats = 
+  'NV12', false, 2,
+  'NV21', false, 2,
+  'I420', false, 3,
+  'YV12', false, 3,
+  'I420_10', false, 3,
+  'I420_12', false, 3,
+  'VUYA', false, 1,
+  'Y410', false, 1,
+  'AYUV', false, 1,
+  'Y412', false, 1,
+  'RGBA', true, 1,
+  'RGBAPremul', true, 1,
+  'RGBx', true, 1,
+  'GBR', true, 3,
+  'GBR_10', true, 3,
+  'GBR_12', true, 3,
+  'GBRA', true, 4,
+  'GBRA_10', true, 4,
+  'GBRA_12', true, 4,
+  'RGBP', true, 3,
+  'BGRP', true, 3,
+  'xRGB', true, 1,
+  'ARGB', true, 1,
+  'xBGR', true, 1,
+  'ABGR', true, 1,
+  'BGR10A2', true, 1,
+  'BGRA64', true, 1,
+  'RBGA', true, 1,
+  'GRAY', false, 1,
+
+
+hlsl_conv_ps_output_formats = 
+  'PS_OUTPUT_LUMA', 'Luma', false,
+  'PS_OUTPUT_LUMA', 'Luma_10', false,
+  'PS_OUTPUT_LUMA', 'Luma_12', false,
+  'PS_OUTPUT_CHROMA', 'ChromaNV12', false,
+  'PS_OUTPUT_CHROMA', 'ChromaNV21', false,
+  'PS_OUTPUT_CHROMA_PLANAR', 'ChromaI420', false,
+  'PS_OUTPUT_CHROMA_PLANAR', 'ChromaYV12', false,
+  'PS_OUTPUT_CHROMA_PLANAR', 'ChromaI420_10', false,
+  'PS_OUTPUT_CHROMA_PLANAR', 'ChromaI420_12', false,
+  'PS_OUTPUT_PLANAR', 'Y444', false,
+  'PS_OUTPUT_PLANAR', 'Y444_10', false,
+  'PS_OUTPUT_PLANAR', 'Y444_12', false,
+  'PS_OUTPUT_PLANAR', 'GBR', true,
+  'PS_OUTPUT_PLANAR', 'GBR_10', true,
+  'PS_OUTPUT_PLANAR', 'GBR_12', true,
+  'PS_OUTPUT_PLANAR', 'RGBP', true,
+  'PS_OUTPUT_PLANAR', 'BGRP', true,
+  'PS_OUTPUT_PLANAR_FULL', 'GBRA', true,
+  'PS_OUTPUT_PLANAR_FULL', 'GBRA_10', true,
+  'PS_OUTPUT_PLANAR_FULL', 'GBRA_12', true,
+  'PS_OUTPUT_PACKED', 'RGBA', true,
+  'PS_OUTPUT_PACKED', 'RGBAPremul', true,
+  'PS_OUTPUT_PACKED', 'RBGA', true,
+  'PS_OUTPUT_PACKED', 'RGBx', true,
+  'PS_OUTPUT_PACKED', 'VUYA', false,
+  'PS_OUTPUT_PACKED', 'AYUV', false,
+  'PS_OUTPUT_PACKED', 'xRGB', true,
+  'PS_OUTPUT_PACKED', 'ARGB', true,
+  'PS_OUTPUT_PACKED', 'xBGR', true,
+  'PS_OUTPUT_PACKED', 'ABGR', true,
+
+
+extra_converters = 
+  'Gamma',
+  'Primary',
+
+
+header_collector = find_program('collect_hlsl_header.py')
+
+foreach input_format : hlsl_conv_ps_input_formats
+  in_format = input_format.get(0)
+  num_srv = input_format.get(2)
+  foreach output_format : hlsl_conv_ps_output_formats
+    converters = 
+    if input_format.get(1) != output_format.get(2)
+      converters += 'Simple'
+    else
+      converters += 'Identity', 'Range'
+    endif
+    output_type = output_format.get(0)
+    output_builder = output_format.get(1)
+    foreach conv : converters
+      entry_point = 'PSMain_@0@_@1@_@2@'.format(in_format, conv, output_builder)
+      header = '@0@.h'.format(entry_point)
+      compiled_shader = custom_target(header,
+          input : hlsl_conv_ps_source,
+          output : header,
+          command : dxc, '/Fh', '@OUTPUT@',
+                    '/E', entry_point,
+                    '/T', 'ps_6_0',
+                    '/D', 'OUTPUT_TYPE=@0@'.format(output_type),
+                    '/D', 'ENTRY_POINT=@0@'.format(entry_point),
+                    '/D', 'SAMPLER=Sampler@0@'.format(in_format),
+                    '/D', 'CONVERTER=Converter@0@'.format(conv),
+                    '/D', 'OUTPUT_BUILDER=Output@0@'.format(output_builder),
+                    '/D', 'NUM_SRV_@0@=1'.format(num_srv),
+                    '/all-resources-bound',
+                    '@INPUT@')
+      hlsl_precompiled += compiled_shader
+    endforeach
+
+    foreach conv : extra_converters
+      entry_point = 'PSMain_@0@_@1@_@2@'.format(in_format, conv, output_builder)
+      header = '@0@.h'.format(entry_point)
+      compiled_shader = custom_target(header,
+          input : hlsl_conv_ps_source,
+          output : header,
+          command : dxc, '/Fh', '@OUTPUT@',
+                    '/E', entry_point,
+                    '/T', 'ps_6_0',
+                    '/D', 'OUTPUT_TYPE=@0@'.format(output_type),
+                    '/D', 'ENTRY_POINT=@0@'.format(entry_point),
+                    '/D', 'SAMPLER=Sampler@0@'.format(in_format),
+                    '/D', 'CONVERTER=Converter@0@'.format(conv),
+                    '/D', 'OUTPUT_BUILDER=Output@0@'.format(output_builder),
+                    '/D', 'NUM_SRV_@0@=1'.format(num_srv),
+                    '/D', 'BUILD_LUT=1',
+                    '/all-resources-bound',
+                    '@INPUT@')
+      hlsl_precompiled += compiled_shader
+    endforeach
+  endforeach
+endforeach
+
+header_collection = 'PSMainConverter.h'
+generated_collection = custom_target(header_collection,
+    input : hlsl_precompiled,
+    output : header_collection,
+    command : header_collector,
+        '--input', meson.current_build_dir(),
+        '--prefix', 'PSMain_',
+        '--output', '@OUTPUT@'
+    )
+
+hlsl_precompiled += generated_collection
+
+hlsl_sources = 
+  'VSMain_converter', 'vs_6_0',
+  'PSMain_sample', 'ps_6_0',
+  'PSMain_sample_premul', 'ps_6_0',
+  'VSMain_coord', 'vs_6_0',
+  'PSMain_color', 'ps_6_0',
+  'VSMain_color', 'vs_6_0',
+  'PSMain_snow', 'ps_6_0',
+  'PSMain_checker', 'ps_6_0',
+  'PSMain_checker_luma', 'ps_6_0',
+  'PSMain_checker_rgb', 'ps_6_0',
+  'PSMain_checker_vuya', 'ps_6_0',
+  'VSMain_pos', 'vs_6_0',
+
+
+foreach shader : hlsl_sources
+  entry_point = shader.get(0)
+  source = files('@0@.hlsl'.format(entry_point))
+  header = '@0@.h'.format(entry_point)
+  compiled_shader = custom_target(header,
+      input : source,
+      output : header,
+      command : dxc, '/Fh', '@OUTPUT@',
+                '/E', entry_point,
+                '/T', shader.get(1),
+                '/all-resources-bound',
+                '@INPUT@')
+  hlsl_precompiled += compiled_shader
+endforeach
+
+

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/meson.build Added

@@ -0,0 +1,123 @@
+d3d12_sources = 
+  'gstd3d11on12.cpp',
+  'gstd3d12av1dec.cpp',
+  'gstd3d12basefilter.cpp',
+  'gstd3d12bufferpool.cpp',
+  'gstd3d12commandallocatorpool.cpp',
+  'gstd3d12commandlistpool.cpp',
+  'gstd3d12commandqueue.cpp',
+  'gstd3d12compositor.cpp',
+  'gstd3d12converter-builder.cpp',
+  'gstd3d12converter.cpp',
+  'gstd3d12convert.cpp',
+  'gstd3d12decoder.cpp',
+  'gstd3d12descriptorpool.cpp',
+  'gstd3d12device.cpp',
+  'gstd3d12download.cpp',
+  'gstd3d12dpbstorage.cpp',
+  'gstd3d12dxgicapture.cpp',
+  'gstd3d12encoder.cpp',
+  'gstd3d12encoderbufferpool.cpp',
+  'gstd3d12fencedatapool.cpp',
+  'gstd3d12format.cpp',
+  'gstd3d12h264dec.cpp',
+  'gstd3d12h264enc.cpp',
+  'gstd3d12h265dec.cpp',
+  'gstd3d12memory.cpp',
+  'gstd3d12mpeg2dec.cpp',
+  'gstd3d12overlaycompositor.cpp',
+  'gstd3d12pluginutils.cpp',
+  'gstd3d12screencapture.cpp',
+  'gstd3d12screencapturedevice.cpp',
+  'gstd3d12screencapturesrc.cpp',
+  'gstd3d12testsrc.cpp',
+  'gstd3d12upload.cpp',
+  'gstd3d12utils.cpp',
+  'gstd3d12videosink.cpp',
+  'gstd3d12vp8dec.cpp',
+  'gstd3d12vp9dec.cpp',
+  'gstd3d12window.cpp',
+  'plugin.cpp',
+
+
+hlsl_precompiled = 
+
+extra_args = 
+  '-DGST_USE_UNSTABLE_API',
+  # Disable this warning error. Otherwise d3dx12.h will break build
+  '/wd4062',
+
+
+d3d12_option = get_option('d3d12')
+if host_system != 'windows' or d3d12_option.disabled()
+  subdir_done()
+endif
+
+if cc.get_id() != 'msvc'
+  if d3d12_option.enabled()
+    error('d3d12 plugin supports only MSVC build')
+  endif
+  subdir_done()
+endif
+
+d3d12_lib = cc.find_library('d3d12', required : d3d12_option)
+d3d11_lib = cc.find_library('d3d11', required : d3d12_option)
+d2d_dep = cc.find_library('d2d1', required: d3d12_option)
+dxgi_lib = cc.find_library('dxgi', required : d3d12_option)
+dx_headers_dep = dependency('DirectX-Headers',
+    version: '>= 1.611',
+    allow_fallback: true,
+    required: d3d12_option)
+dxc = find_program('dxc', required : d3d12_option)
+
+if not gstdxva_dep.found() or not d3d12_lib.found() or not dxgi_lib.found() \
+  or not dx_headers_dep.found() or not dxc.found() or not d2d_dep.found()
+  if d3d12_option.enabled()
+    error('The d3d12 was enabled explicitly, but required dependencies were not found.')
+  endif
+  subdir_done()
+endif
+
+d3d12_headers = 
+  'dxgi1_6.h',
+  'd3d11.h',
+  'd3d11on12.h',
+  'd2d1.h',
+  'DirectXMath.h',
+
+
+have_d3d12_headers = true
+foreach h: d3d12_headers
+  if not cc.has_header(h)
+    have_d3d12_headers = false
+  endif
+endforeach
+
+if not have_d3d12_headers
+  if d3d12_option.enabled()
+    error('The d3d12 plugin was enabled explicitly, but required dependencies were not found.')
+  endif
+  subdir_done()
+endif
+
+hlsl_precompiled = 
+subdir('hlsl')
+
+# https://learn.microsoft.com/en-us/windows/win32/dxmath/pg-xnamath-internals#windows-sse-versus-sse2
+# x86 with Windows 7 or older may not support SSE2
+if host_machine.cpu_family() != 'x86'
+  extra_args += '-DHAVE_DIRECTX_MATH_SIMD'
+endif
+
+gstd3d12 = library('gstd3d12',
+  d3d12_sources + hlsl_precompiled,
+  c_args : gst_plugins_bad_args + extra_args,
+  cpp_args: gst_plugins_bad_args + extra_args,
+  include_directories : configinc,
+  dependencies : gstbase_dep, gstvideo_dep, gstcodecs_dep,
+                  gstdxva_dep, d3d12_lib, d3d11_lib, d2d_dep, dxgi_lib,
+                  dx_headers_dep,
+  install : true,
+  install_dir : plugins_install_dir,
+)
+plugins += gstd3d12

gst-plugins-bad-1.24.5.tar.xz/sys/d3d12/plugin.cpp Added

@@ -0,0 +1,158 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * plugin-d3d12:
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gst/gst.h>
+#include "gstd3d12.h"
+#include "gstd3d12-private.h"
+#include "gstd3d12convert.h"
+#include "gstd3d12download.h"
+#include "gstd3d12upload.h"
+#include "gstd3d12videosink.h"
+#include "gstd3d12testsrc.h"
+#include "gstd3d12compositor.h"
+#include "gstd3d12screencapturedevice.h"
+#include "gstd3d12screencapturesrc.h"
+#include "gstd3d12mpeg2dec.h"
+#include "gstd3d12h264dec.h"
+#include "gstd3d12h264enc.h"
+#include "gstd3d12h265dec.h"
+#include "gstd3d12vp8dec.h"
+#include "gstd3d12vp9dec.h"
+#include "gstd3d12av1dec.h"
+#include <windows.h>
+#include <versionhelpers.h>
+#include <wrl.h>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY (gst_d3d12_debug);
+GST_DEBUG_CATEGORY (gst_d3d12_allocator_debug);
+GST_DEBUG_CATEGORY (gst_d3d12_decoder_debug);
+GST_DEBUG_CATEGORY (gst_d3d12_format_debug);
+GST_DEBUG_CATEGORY (gst_d3d12_utils_debug);
+
+#define GST_CAT_DEFAULT gst_d3d12_debug
+
+static void
+plugin_deinit (gpointer data)
+{
+  gst_d3d12_sync_background_thread ();
+}
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_debug, "d3d12", 0, "d3d12");
+
+  if (!IsWindows8OrGreater ()) {
+    GST_WARNING ("Not supported OS");
+    return TRUE;
+  }
+
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_allocator_debug, "d3d12allocator", 0,
+      "d3d12allocator");
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_decoder_debug, "d3d12decoder", 0,
+      "d3d12decoder");
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_format_debug, "d3d12format", 0,
+      "d3d12format");
+  GST_DEBUG_CATEGORY_INIT (gst_d3d12_utils_debug,
+      "d3d12utils", 0, "d3d12utils");
+
+  /* Enumerate devices to register decoders per device and to get the highest
+   * feature level */
+  /* AMD seems to be supporting up to 12 cards, and 8 for NVIDIA */
+  for (guint i = 0; i < 12; i++) {
+    GstD3D12Device *device = nullptr;
+    ID3D12Device *device_handle;
+    ComPtr < ID3D12VideoDevice > video_device;
+    HRESULT hr;
+
+    device = gst_d3d12_device_new (i);
+    if (!device)
+      break;
+
+    device_handle = gst_d3d12_device_get_device_handle (device);
+
+    hr = device_handle->QueryInterface (IID_PPV_ARGS (&video_device));
+    if (FAILED (hr)) {
+      gst_object_unref (device);
+      continue;
+    }
+
+    gst_d3d12_mpeg2_dec_register (plugin, device, video_device.Get (),
+        GST_RANK_NONE);
+    gst_d3d12_h264_dec_register (plugin, device, video_device.Get (),
+        GST_RANK_NONE);
+    gst_d3d12_h265_dec_register (plugin, device, video_device.Get (),
+        GST_RANK_NONE);
+    gst_d3d12_vp8_dec_register (plugin, device, video_device.Get (),
+        GST_RANK_NONE);
+    gst_d3d12_vp9_dec_register (plugin, device, video_device.Get (),
+        GST_RANK_NONE);
+    gst_d3d12_av1_dec_register (plugin, device, video_device.Get (),
+        GST_RANK_NONE);
+
+    gst_d3d12_h264_enc_register (plugin, device, video_device.Get (),
+        GST_RANK_NONE);
+
+    gst_object_unref (device);
+  }
+
+  gst_element_register (plugin,
+      "d3d12convert", GST_RANK_NONE, GST_TYPE_D3D12_CONVERT);
+  gst_element_register (plugin,
+      "d3d12download", GST_RANK_NONE, GST_TYPE_D3D12_DOWNLOAD);
+  gst_element_register (plugin,
+      "d3d12upload", GST_RANK_NONE, GST_TYPE_D3D12_UPLOAD);
+  gst_element_register (plugin,
+      "d3d12videosink", GST_RANK_NONE, GST_TYPE_D3D12_VIDEO_SINK);
+  gst_element_register (plugin,
+      "d3d12testsrc", GST_RANK_NONE, GST_TYPE_D3D12_TEST_SRC);
+  gst_element_register (plugin,
+      "d3d12compositor", GST_RANK_NONE, GST_TYPE_D3D12_COMPOSITOR);
+  gst_element_register (plugin, "d3d12screencapturesrc", GST_RANK_NONE,
+      GST_TYPE_D3D12_SCREEN_CAPTURE_SRC);
+  gst_device_provider_register (plugin,
+      "d3d12screencapturedeviceprovider", GST_RANK_PRIMARY,
+      GST_TYPE_D3D12_SCREEN_CAPTURE_DEVICE_PROVIDER);
+
+  g_object_set_data_full (G_OBJECT (plugin),
+      "plugin-d3d12-shutdown", (gpointer) "shutdown-data",
+      (GDestroyNotify) plugin_deinit);
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    d3d12,
+    "Direct3D12 plugin",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

gst-plugins-bad-1.22.7.tar.xz/sys/d3dvideosink/d3dhelpers.c -> gst-plugins-bad-1.24.5.tar.xz/sys/d3dvideosink/d3dhelpers.c Changed

@@ -226,18 +226,18 @@
   D3DFORMAT d3d_format;
 } gst_d3d_format_map = {
   {
-  GST_VIDEO_FORMAT_BGRx, D3DFMT_X8R8G8B8}, {
-  GST_VIDEO_FORMAT_RGBx, D3DFMT_X8B8G8R8}, {
-  GST_VIDEO_FORMAT_BGRA, D3DFMT_A8R8G8B8}, {
-  GST_VIDEO_FORMAT_RGBA, D3DFMT_A8B8G8R8}, {
-  GST_VIDEO_FORMAT_BGR, D3DFMT_R8G8B8}, {
-  GST_VIDEO_FORMAT_RGB16, D3DFMT_R5G6B5}, {
-  GST_VIDEO_FORMAT_RGB15, D3DFMT_X1R5G5B5}, {
-  GST_VIDEO_FORMAT_I420, D3DFMT_YV12}, {
-  GST_VIDEO_FORMAT_YV12, D3DFMT_YV12}, {
-  GST_VIDEO_FORMAT_NV12, D3DFMT_NV12}, {
-  GST_VIDEO_FORMAT_YUY2, D3DFMT_YUY2}, {
-  GST_VIDEO_FORMAT_UYVY, D3DFMT_UYVY}
+      GST_VIDEO_FORMAT_BGRx, D3DFMT_X8R8G8B8}, {
+      GST_VIDEO_FORMAT_RGBx, D3DFMT_X8B8G8R8}, {
+      GST_VIDEO_FORMAT_BGRA, D3DFMT_A8R8G8B8}, {
+      GST_VIDEO_FORMAT_RGBA, D3DFMT_A8B8G8R8}, {
+      GST_VIDEO_FORMAT_BGR, D3DFMT_R8G8B8}, {
+      GST_VIDEO_FORMAT_RGB16, D3DFMT_R5G6B5}, {
+      GST_VIDEO_FORMAT_RGB15, D3DFMT_X1R5G5B5}, {
+      GST_VIDEO_FORMAT_I420, D3DFMT_YV12}, {
+      GST_VIDEO_FORMAT_YV12, D3DFMT_YV12}, {
+      GST_VIDEO_FORMAT_NV12, D3DFMT_NV12}, {
+      GST_VIDEO_FORMAT_YUY2, D3DFMT_YUY2}, {
+      GST_VIDEO_FORMAT_UYVY, D3DFMT_UYVY}
 };
 
 static D3DFORMAT

gst-plugins-bad-1.22.7.tar.xz/sys/decklink/gstdecklinkvideosink.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/decklink/gstdecklinkvideosink.cpp Changed

@@ -32,15 +32,15 @@
  * Playout a 1080p25 test-video to the SDI-Out of Card 0. Devices are numbered
  * starting with 0.
  *
- * # Duplex-Mode:
- * Certain DechLink Cards like the Duo2 or the Quad2 contain two or four
+ * ## Duplex-Mode
+ * Certain DeckLink Cards like the Duo2 or the Quad2 contain two or four
  * independent SDI units with two connectors each. These units can operate either
  * in half- or in full-duplex mode.
  *
  * The Duplex-Mode of a Card can be configured using the `duplex-mode`-Property.
  * Cards that to not support Duplex-Modes are not influenced by the property.
  *
- * ## Half-Duplex-Mode (default):
+ * ### Half-Duplex-Mode (default)
  * By default decklinkvideosink will configure them into half-duplex mode, so that
  * each connector acts as if it were an independent DeckLink Card which can either
  * be used as an Input or as an Output. In this mode the Duo2 can be used as as 4 SDI
@@ -67,7 +67,7 @@
  * Playout a Test-Screen with colored Snow on the first and fourth unit
  * (ie. the Connectors 1-4 of a Duo2 unit).
  *
- * ## Device-Number-Mapping in Half-Duplex-Mode
+ * ### Device-Number-Mapping in Half-Duplex-Mode
  * The device-number to connector-mapping is as follows for the Duo2
  * - `device-number=0` SDI1
  * - `device-number=1` SDI3
@@ -84,11 +84,11 @@
  * - `device-number=6` SDI6
  * - `device-number=7` SDI8
  *
- * ## Full-Duplex-Mode:
+ * ### Full-Duplex-Mode
  * When operating in full-duplex mode, two connectors of a unit are combined to
  * a single device, performing keying with the second connection.
  *
- * ## Device-Number-Mapping in Full-Duplex-Mode
+ * ### Device-Number-Mapping in Full-Duplex-Mode
  * The device-number to connector-mapping in full-duplex-mode is as follows for the Duo2
  * - `device-number=0` SDI1 primary, SDI2 secondary
  * - `device-number=1` SDI3 primaty, SDI4 secondary
@@ -99,13 +99,13 @@
  * - `device-number=2` SDI5 primary, SDI6 secondary
  * - `device-number=3` SDI7 primary, SDI8 secondary
  *
- * # Keying
+ * ## Keying
  * Keying is the process of overlaing Video with an Alpha-Channel on top of an
  * existing Video-Stream. The Duo2 and Quad2-Cards can perform two different
  * Keying-Modes when operated in full-duplex mode. Both modes expect Video with
  * an Alpha-Channel.
  *
- * ## Internal Keyer:
+ * ### Internal Keyer
  * In internal Keying-Mode the primary port becomes an Input and the secondary port
  * an Output. The unit overlays Video played back from the Computer onto the Input
  * and outputs the combined Video-Stream to the Output.
@@ -117,7 +117,7 @@
  *  decklinkvideosink device-number=0 duplex-mode=full keyer-mode=internal video-format=8bit-bgra mode=1080p25
  * |
  *
- * ## External Keyer:
+ * ### External Keyer
  * In external Keying-Mode the primary port outputs the alpha-chanel as the
  * luma-value (key-channel). Transparent pixels are black, opaque pixels are white.
  * The RGB-Component of the Video are output on the secondary channel.

gst-plugins-bad-1.22.7.tar.xz/sys/decklink/gstdecklinkvideosrc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/decklink/gstdecklinkvideosrc.cpp Changed

@@ -33,15 +33,15 @@
  * Capturing 1080p25 video from the SDI-In of Card 0. Devices are numbered
  * starting with 0.
  *
- * # Duplex-Mode:
- * Certain DechLink Cards like the Duo2 or the Quad2 contain two or four
+ * ## Duplex-Mode
+ * Certain DeckLink Cards like the Duo2 or the Quad2 contain two or four
  * independent SDI units with two connectors each. These units can operate either
  * in half- or in full-duplex mode.
  *
  * The Duplex-Mode of a Card can be configured using the `duplex-mode`-Property.
  * Cards that to not support Duplex-Modes are not influenced by the property.
  *
- * ## Half-Duplex-Mode (default):
+ * ### Half-Duplex-Mode (default)
  * By default decklinkvideosrc will configure them into half-duplex mode, so that
  * each connector acts as if it were an independent DeckLink Card which can either
  * be used as an Input or as an Output. In this mode the Duo2 can be used as as 4 SDI
@@ -75,7 +75,7 @@
  * Playout a Test-Screen with colored Snow on the first and fourth unit
  * (ie. the Connectors 1-4 of a Duo2 unit).
  *
- * ## Device-Number-Mapping in Half-Duplex-Mode
+ * ### Device-Number-Mapping in Half-Duplex-Mode
  * The device-number to connector-mapping in half-duplex-mode is as follows for the Duo2
  * - `device-number=0` SDI1
  * - `device-number=1` SDI3
@@ -92,7 +92,7 @@
  * - `device-number=6` SDI6
  * - `device-number=7` SDI8
  *
- * ## Full-Duplex-Mode:
+ * ### Full-Duplex-Mode
  * When operating in full-duplex mode, two connectors of a unit are combined to
  * a single device, performing extra processing with the second connection.
  *
@@ -119,7 +119,7 @@
  * Capturing Video on the primary port of device 0, output flipped version of the
  * video on secondary port of the same device.
  *
- * ## Device-Number-Mapping in Full-Duplex-Mode
+ * ### Device-Number-Mapping in Full-Duplex-Mode
  * The device-number to connector-mapping in full-duplex-mode is as follows for the Duo2
  * - `device-number=0` SDI1 primary, SDI2 secondary
  * - `device-number=1` SDI3 primaty, SDI4 secondary
@@ -1766,4 +1766,4 @@
 out:
 
   return ret;
-}
\ No newline at end of file
+}

gst-plugins-bad-1.22.7.tar.xz/sys/directshow/gstdshow.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/directshow/gstdshow.cpp Changed

gst-plugins-bad-1.22.7.tar.xz/sys/dvb/dvbbasebin.c -> gst-plugins-bad-1.24.5.tar.xz/sys/dvb/dvbbasebin.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/dvb/gstdvbsrc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/dvb/gstdvbsrc.c Changed

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite Added

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwrite-effect.cpp Added

@@ -0,0 +1,163 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdwrite-effect.h"
+
+/* *INDENT-OFF* */
+STDMETHODIMP
+IGstDWriteTextEffect::CreateInstance (IGstDWriteTextEffect ** effect)
+{
+  IGstDWriteTextEffect *self = new IGstDWriteTextEffect ();
+  if (!self)
+    return E_OUTOFMEMORY;
+
+  *effect = self;
+
+  return S_OK;
+}
+
+STDMETHODIMP_ (BOOL)
+IGstDWriteTextEffect::IsEnabledColor (const D2D1_COLOR_F & color)
+{
+  if (color.r != 0 || color.g != 0 || color.b != 0 || color.a != 0)
+    return TRUE;
+
+  return FALSE;
+}
+
+STDMETHODIMP_ (ULONG)
+IGstDWriteTextEffect::AddRef (void)
+{
+  return InterlockedIncrement (&ref_count_);
+}
+
+STDMETHODIMP_ (ULONG)
+IGstDWriteTextEffect::Release (void)
+{
+  ULONG ref_count;
+
+  ref_count = InterlockedDecrement (&ref_count_);
+
+  if (ref_count == 0)
+    delete this;
+
+  return ref_count;
+}
+
+STDMETHODIMP
+IGstDWriteTextEffect::QueryInterface (REFIID riid, void ** object)
+{
+  if (riid == IID_IUnknown) {
+    *object = static_cast<IUnknown *>
+        (static_cast<IGstDWriteTextEffect *> (this));
+  } else if (riid == IID_IGstDWriteTextEffect) {
+    *object = this;
+  } else {
+    *object = nullptr;
+    return E_NOINTERFACE;
+  }
+
+  AddRef ();
+
+  return S_OK;
+}
+
+STDMETHODIMP
+IGstDWriteTextEffect::Clone (IGstDWriteTextEffect ** effect)
+{
+  IGstDWriteTextEffect *copy = new IGstDWriteTextEffect ();
+
+  if (!copy)
+    return E_OUTOFMEMORY;
+
+  for (UINT i = 0; i < GST_DWRITE_BRUSH_LAST; i++)
+    copy->brush_i = this->brush_i;
+
+  copy->enable_color_font_ = enable_color_font_;
+
+  *effect = copy;
+
+  return S_OK;
+}
+
+STDMETHODIMP
+IGstDWriteTextEffect::GetBrushColor (GST_DWRITE_BRUSH_TARGET target,
+    D2D1_COLOR_F * color, BOOL * enabled)
+{
+  if (color)
+    *color = brush_target;
+
+  if (enabled) {
+    if (IGstDWriteTextEffect::IsEnabledColor (brush_target))
+      *enabled = TRUE;
+    else
+      *enabled = FALSE;
+  }
+
+  return S_OK;
+}
+
+STDMETHODIMP
+IGstDWriteTextEffect::SetBrushColor (GST_DWRITE_BRUSH_TARGET target,
+    const D2D1_COLOR_F * color)
+{
+  if (!color)
+    brush_target = D2D1::ColorF (D2D1::ColorF::Black, 0);
+  else
+    brush_target = *color;
+
+  return S_OK;
+}
+
+STDMETHODIMP
+IGstDWriteTextEffect::SetEnableColorFont (BOOL enable)
+{
+  enable_color_font_ = enable;
+
+  return S_OK;
+}
+
+STDMETHODIMP
+IGstDWriteTextEffect::GetEnableColorFont (BOOL * enable)
+{
+  if (!enable)
+    return E_INVALIDARG;
+
+  *enable = enable_color_font_ ;
+
+  return S_OK;
+}
+
+IGstDWriteTextEffect::IGstDWriteTextEffect (void)
+{
+  for (UINT32 i = 0; i < GST_DWRITE_BRUSH_LAST; i++)
+    brush_i = D2D1::ColorF (D2D1::ColorF::Black);
+
+  /* Disable custom shadow effects by default */
+  brush_GST_DWRITE_BRUSH_SHADOW = D2D1::ColorF (D2D1::ColorF::Black, 0);
+}
+
+IGstDWriteTextEffect::~IGstDWriteTextEffect (void)
+{
+}
+/* *INDENT-ON* */

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwrite-effect.h Added

@@ -0,0 +1,70 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "gstdwrite-enums.h"
+
+enum GST_DWRITE_BRUSH_TARGET
+{
+  GST_DWRITE_BRUSH_FORGROUND = 0,
+  GST_DWRITE_BRUSH_OUTLINE,
+  GST_DWRITE_BRUSH_UNDERLINE,
+  GST_DWRITE_BRUSH_STRIKETHROUGH,
+  GST_DWRITE_BRUSH_SHADOW,
+  GST_DWRITE_BRUSH_BACKGROUND,
+  GST_DWRITE_BRUSH_LAST
+};
+
+DEFINE_GUID (IID_IGstDWriteTextEffect, 0x23c579ae, 0x2e18,
+    0x11ed, 0xa2, 0x61, 0x02, 0x42, 0xac, 0x12, 0x00, 0x02);
+class IGstDWriteTextEffect : public IUnknown
+{
+public:
+  static STDMETHODIMP         CreateInstance (IGstDWriteTextEffect ** effect);
+  static STDMETHODIMP_ (BOOL) IsEnabledColor (const D2D1_COLOR_F & color);
+
+  /* IUnknown */
+  STDMETHODIMP_ (ULONG) AddRef  (void);
+  STDMETHODIMP_ (ULONG) Release (void);
+  STDMETHODIMP QueryInterface   (REFIID riid,
+                                 void ** object);
+
+  /* effect methods */
+  STDMETHODIMP Clone         (IGstDWriteTextEffect ** effect);
+  STDMETHODIMP GetBrushColor (GST_DWRITE_BRUSH_TARGET target,
+                              D2D1_COLOR_F * color,
+                              BOOL * enabled);
+  STDMETHODIMP SetBrushColor (GST_DWRITE_BRUSH_TARGET target,
+                              const D2D1_COLOR_F * color);
+
+  STDMETHODIMP SetEnableColorFont (BOOL enable);
+
+  STDMETHODIMP GetEnableColorFont (BOOL * enable);
+
+private:
+  IGstDWriteTextEffect (void);
+  virtual ~IGstDWriteTextEffect (void);
+
+private:
+  ULONG ref_count_ = 1;
+  D2D1_COLOR_F brush_GST_DWRITE_BRUSH_LAST;
+  BOOL enable_color_font_ = FALSE;
+};

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwrite-enums.cpp Added

@@ -0,0 +1,237 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdwrite-enums.h"
+#include "gstdwrite-utils.h"
+
+/* XXX: MinGW's header does not define some enum values */
+enum
+{
+  GST_DWRITE_TEXT_ALIGNMENT_LEADING,
+  GST_DWRITE_TEXT_ALIGNMENT_TRAILING,
+  GST_DWRITE_TEXT_ALIGNMENT_CENTER,
+  GST_DWRITE_TEXT_ALIGNMENT_JUSTIFIED,
+};
+
+enum
+{
+  GST_DWRITE_PARAGRAPH_ALIGNMENT_NEAR,
+  GST_DWRITE_PARAGRAPH_ALIGNMENT_FAR,
+  GST_DWRITE_PARAGRAPH_ALIGNMENT_CENTER,
+};
+
+enum
+{
+  GST_DWRITE_FONT_WEIGHT_THIN = 100,
+  GST_DWRITE_FONT_WEIGHT_EXTRA_LIGHT = 200,
+  GST_DWRITE_FONT_WEIGHT_ULTRA_LIGHT = 200,
+  GST_DWRITE_FONT_WEIGHT_LIGHT = 300,
+  GST_DWRITE_FONT_WEIGHT_SEMI_LIGHT = 350,
+  GST_DWRITE_FONT_WEIGHT_NORMAL = 400,
+  GST_DWRITE_FONT_WEIGHT_REGULAR = 400,
+  GST_DWRITE_FONT_WEIGHT_MEDIUM = 500,
+  GST_DWRITE_FONT_WEIGHT_DEMI_BOLD = 600,
+  GST_DWRITE_FONT_WEIGHT_SEMI_BOLD = 600,
+  GST_DWRITE_FONT_WEIGHT_BOLD = 700,
+  GST_DWRITE_FONT_WEIGHT_EXTRA_BOLD = 800,
+  GST_DWRITE_FONT_WEIGHT_ULTRA_BOLD = 800,
+  GST_DWRITE_FONT_WEIGHT_BLACK = 900,
+  GST_DWRITE_FONT_WEIGHT_HEAVY = 900,
+  GST_DWRITE_FONT_WEIGHT_EXTRA_BLACK = 950,
+  GST_DWRITE_FONT_WEIGHT_ULTRA_BLACK = 950
+};
+
+enum
+{
+  GST_DWRITE_FONT_STYLE_NORMAL,
+  GST_DWRITE_FONT_STYLE_OBLIQUE,
+  GST_DWRITE_FONT_STYLE_ITALIC,
+};
+
+enum
+{
+  GST_DWRITE_FONT_STRETCH_UNDEFINED = 0,
+  GST_DWRITE_FONT_STRETCH_ULTRA_CONDENSED = 1,
+  GST_DWRITE_FONT_STRETCH_EXTRA_CONDENSED = 2,
+  GST_DWRITE_FONT_STRETCH_CONDENSED = 3,
+  GST_DWRITE_FONT_STRETCH_SEMI_CONDENSED = 4,
+  GST_DWRITE_FONT_STRETCH_NORMAL = 5,
+  GST_DWRITE_FONT_STRETCH_MEDIUM = 5,
+  GST_DWRITE_FONT_STRETCH_SEMI_EXPANDED = 6,
+  GST_DWRITE_FONT_STRETCH_EXPANDED = 7,
+  GST_DWRITE_FONT_STRETCH_EXTRA_EXPANDED = 8,
+  GST_DWRITE_FONT_STRETCH_ULTRA_EXPANDED = 9
+};
+
+GType
+gst_dwrite_text_alignment_get_type (void)
+{
+  static GType text_align_type = 0;
+  static const GEnumValue text_align_types = {
+    {GST_DWRITE_TEXT_ALIGNMENT_LEADING, "DWRITE_TEXT_ALIGNMENT_LEADING",
+        "leading"},
+    {GST_DWRITE_TEXT_ALIGNMENT_TRAILING,
+        "DWRITE_TEXT_ALIGNMENT_TRAILING", "trailing"},
+    {GST_DWRITE_TEXT_ALIGNMENT_CENTER,
+        "DWRITE_TEXT_ALIGNMENT_CENTER", "center"},
+    {GST_DWRITE_TEXT_ALIGNMENT_JUSTIFIED,
+        "DWRITE_TEXT_ALIGNMENT_JUSTIFIED", "justified"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_DWRITE_CALL_ONCE_BEGIN {
+    text_align_type = g_enum_register_static ("GstDWriteTextAlignment",
+        text_align_types);
+  } GST_DWRITE_CALL_ONCE_END;
+
+  return text_align_type;
+}
+
+GType
+gst_dwrite_paragraph_alignment_get_type (void)
+{
+  static GType paragraph_align_type = 0;
+  static const GEnumValue paragraph_align_types = {
+    {GST_DWRITE_PARAGRAPH_ALIGNMENT_NEAR, "DWRITE_PARAGRAPH_ALIGNMENT_NEAR",
+        "near"},
+    {GST_DWRITE_PARAGRAPH_ALIGNMENT_FAR,
+        "DWRITE_PARAGRAPH_ALIGNMENT_FAR", "far"},
+    {GST_DWRITE_PARAGRAPH_ALIGNMENT_CENTER,
+        "DWRITE_PARAGRAPH_ALIGNMENT_CENTER", "center"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_DWRITE_CALL_ONCE_BEGIN {
+    paragraph_align_type =
+        g_enum_register_static ("GstDWriteParagraphAlignment",
+        paragraph_align_types);
+  } GST_DWRITE_CALL_ONCE_END;
+
+  return paragraph_align_type;
+}
+
+GType
+gst_dwrite_font_weight_get_type (void)
+{
+  static GType font_weight_type = 0;
+  static const GEnumValue font_weight_types = {
+    {GST_DWRITE_FONT_WEIGHT_THIN, "DWRITE_FONT_WEIGHT_THIN", "thin"},
+    {GST_DWRITE_FONT_WEIGHT_EXTRA_LIGHT, "DWRITE_FONT_WEIGHT_EXTRA_LIGHT",
+        "extra-light"},
+    {GST_DWRITE_FONT_WEIGHT_ULTRA_LIGHT,
+        "DWRITE_FONT_WEIGHT_ULTRA_LIGHT", "ultra-light"},
+    {GST_DWRITE_FONT_WEIGHT_LIGHT, "DWRITE_FONT_WEIGHT_LIGHT", "light"},
+    {GST_DWRITE_FONT_WEIGHT_SEMI_LIGHT, "DWRITE_FONT_WEIGHT_SEMI_LIGHT",
+        "semi-light"},
+    {GST_DWRITE_FONT_WEIGHT_NORMAL, "DWRITE_FONT_WEIGHT_NORMAL", "normal"},
+    {GST_DWRITE_FONT_WEIGHT_REGULAR, "DWRITE_FONT_WEIGHT_REGULAR",
+        "regular"},
+    {GST_DWRITE_FONT_WEIGHT_MEDIUM, "DWRITE_FONT_WEIGHT_MEDIUM", "medium"},
+    {GST_DWRITE_FONT_WEIGHT_DEMI_BOLD, "DWRITE_FONT_WEIGHT_DEMI_BOLD",
+        "demi-bold"},
+    {GST_DWRITE_FONT_WEIGHT_SEMI_BOLD, "DWRITE_FONT_WEIGHT_SEMI_BOLD",
+        "semi-bold"},
+    {GST_DWRITE_FONT_WEIGHT_BOLD, "DWRITE_FONT_WEIGHT_BOLD", "bold"},
+    {GST_DWRITE_FONT_WEIGHT_EXTRA_BOLD, "DWRITE_FONT_WEIGHT_EXTRA_BOLD",
+        "extra-bold"},
+    {GST_DWRITE_FONT_WEIGHT_ULTRA_BOLD, "DWRITE_FONT_WEIGHT_ULTRA_BOLD",
+        "ultra-bold"},
+    {GST_DWRITE_FONT_WEIGHT_BLACK, "DWRITE_FONT_WEIGHT_BLACK", "black"},
+    {GST_DWRITE_FONT_WEIGHT_HEAVY, "DWRITE_FONT_WEIGHT_HEAVY", "heavy"},
+    {GST_DWRITE_FONT_WEIGHT_EXTRA_BLACK, "DWRITE_FONT_WEIGHT_EXTRA_BLACK",
+        "extra-black"},
+    {GST_DWRITE_FONT_WEIGHT_ULTRA_BLACK, "DWRITE_FONT_WEIGHT_ULTRA_BLACK",
+        "ultra-black"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_DWRITE_CALL_ONCE_BEGIN {
+    font_weight_type = g_enum_register_static ("GstDWriteFontWeight",
+        font_weight_types);
+  } GST_DWRITE_CALL_ONCE_END;
+
+  return font_weight_type;
+}
+
+GType
+gst_dwrite_font_style_get_type (void)
+{
+  static GType font_style_type = 0;
+  static const GEnumValue font_style_types = {
+    {GST_DWRITE_FONT_STYLE_NORMAL, "DWRITE_FONT_STYLE_NORMAL", "normal"},
+    {GST_DWRITE_FONT_STYLE_OBLIQUE, "DWRITE_FONT_STYLE_OBLIQUE", "oblique"},
+    {GST_DWRITE_FONT_STYLE_ITALIC, "DWRITE_FONT_STYLE_ITALIC", "italic"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_DWRITE_CALL_ONCE_BEGIN {
+    font_style_type = g_enum_register_static ("GstDWriteFontStyle",
+        font_style_types);
+  } GST_DWRITE_CALL_ONCE_END;
+
+  return font_style_type;
+}
+
+GType
+gst_dwrite_font_stretch_get_type (void)
+{
+  static GType font_stretch_type = 0;
+  static const GEnumValue font_stretch_types = {
+    {GST_DWRITE_FONT_STRETCH_UNDEFINED, "DWRITE_FONT_STRETCH_UNDEFINED",
+        "undefined"},
+    {GST_DWRITE_FONT_STRETCH_ULTRA_CONDENSED,
+          "DWRITE_FONT_STRETCH_ULTRA_CONDENSED",
+        "ultra-condensed"},
+    {GST_DWRITE_FONT_STRETCH_EXTRA_CONDENSED,
+          "DWRITE_FONT_STRETCH_EXTRA_CONDENSED",
+        "extra-condensed"},
+    {GST_DWRITE_FONT_STRETCH_CONDENSED, "DWRITE_FONT_STRETCH_CONDENSED",
+        "condensed"},
+    {GST_DWRITE_FONT_STRETCH_SEMI_CONDENSED,
+          "DWRITE_FONT_STRETCH_SEMI_CONDENSED",
+        "semi-condensed"},
+    {GST_DWRITE_FONT_STRETCH_NORMAL, "DWRITE_FONT_STRETCH_NORMAL",
+        "normal"},
+    {GST_DWRITE_FONT_STRETCH_MEDIUM, "DWRITE_FONT_STRETCH_MEDIUM",
+        "medium"},
+    {GST_DWRITE_FONT_STRETCH_SEMI_EXPANDED,
+          "DWRITE_FONT_STRETCH_SEMI_EXPANDED",
+        "semi-expanded"},
+    {GST_DWRITE_FONT_STRETCH_EXPANDED, "DWRITE_FONT_STRETCH_EXPANDED",
+        "expanded"},
+    {GST_DWRITE_FONT_STRETCH_EXTRA_EXPANDED,
+          "DWRITE_FONT_STRETCH_EXTRA_EXPANDED",
+        "extra-expanded"},
+    {GST_DWRITE_FONT_STRETCH_ULTRA_EXPANDED,
+          "DWRITE_FONT_STRETCH_ULTRA_EXPANDED",
+        "ultra-expanded"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_DWRITE_CALL_ONCE_BEGIN {
+    font_stretch_type = g_enum_register_static ("GstDWriteFontStretch",
+        font_stretch_types);
+  } GST_DWRITE_CALL_ONCE_END;
+
+  return font_stretch_type;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwrite-enums.h Added

@@ -0,0 +1,49 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/d3d11/gstd3d11.h>
+#include <d2d1_1.h>
+#include <dwrite.h>
+
+#ifdef HAVE_DWRITE_COLOR_FONT
+#include <d2d1_3.h>
+#include <dwrite_3.h>
+#endif
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DWRITE_TEXT_ALIGNMENT            (gst_dwrite_text_alignment_get_type ())
+GType gst_dwrite_text_alignment_get_type (void);
+
+#define GST_TYPE_DWRITE_PARAGRAPH_ALIGNMENT       (gst_dwrite_paragraph_alignment_get_type ())
+GType gst_dwrite_paragraph_alignment_get_type (void);
+
+#define GST_TYPE_DWRITE_FONT_WEIGHT               (gst_dwrite_font_weight_get_type ())
+GType gst_dwrite_font_weight_get_type (void);
+
+#define GST_TYPE_DWRITE_FONT_STYLE                (gst_dwrite_font_style_get_type ())
+GType gst_dwrite_font_style_get_type (void);
+
+#define GST_TYPE_DWRITE_FONT_STRETCH              (gst_dwrite_font_stretch_get_type ())
+GType gst_dwrite_font_stretch_get_type (void);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwrite-renderer.cpp Added

@@ -0,0 +1,649 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdwrite-renderer.h"
+#include <wrl.h>
+#include <vector>
+
+GST_DEBUG_CATEGORY_EXTERN (gst_dwrite_debug);
+#define GST_CAT_DEFAULT gst_dwrite_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+enum class RenderPath
+{
+  BACKGROUND,
+  TEXT,
+};
+
+struct RenderContext
+{
+  RenderPath render_path;
+  ID2D1Factory *factory;
+  ID2D1RenderTarget *target;
+  RECT client_rect;
+  std::vector<DWRITE_LINE_METRICS> line_metrics;
+  UINT line_index = 0;
+  UINT char_index = 0;
+  ComPtr<ID2D1Geometry> bg_rect;
+  D2D1_COLOR_F bg_color = D2D1::ColorF (D2D1::ColorF::Black, 0.0);
+};
+/* *INDENT-ON* */
+
+static HRESULT
+CombineTwoGeometries (ID2D1Factory * factory, ID2D1Geometry * a,
+    ID2D1Geometry * b, ID2D1Geometry ** result)
+{
+  HRESULT hr;
+  ComPtr < ID2D1GeometrySink > sink;
+  ComPtr < ID2D1PathGeometry > geometry;
+
+  hr = factory->CreatePathGeometry (&geometry);
+  if (FAILED (hr)) {
+    GST_WARNING ("Couldn't create path geometry, 0x%x", (guint) hr);
+    return hr;
+  }
+
+  hr = geometry->Open (&sink);
+  if (FAILED (hr)) {
+    GST_WARNING ("Couldn't open path geometry, 0x%x", (guint) hr);
+    return hr;
+  }
+
+  hr = a->CombineWithGeometry (b,
+      D2D1_COMBINE_MODE_UNION, nullptr, sink.Get ());
+  if (FAILED (hr)) {
+    GST_WARNING ("Couldn't combine geometry, 0x%x", (guint) hr);
+    return hr;
+  }
+
+  hr = sink->Close ();
+  if (FAILED (hr)) {
+    GST_WARNING ("Couldn't close sink, 0x%x", (guint) hr);
+    return hr;
+  }
+
+  *result = geometry.Detach ();
+
+  return S_OK;
+}
+
+STDMETHODIMP
+    IGstDWriteTextRenderer::CreateInstance (IDWriteFactory * factory,
+    IGstDWriteTextRenderer ** renderer)
+{
+  IGstDWriteTextRenderer *self = new IGstDWriteTextRenderer ();
+
+  if (!self)
+    return E_OUTOFMEMORY;
+
+  self->factory_ = factory;
+  factory->AddRef ();
+  *renderer = self;
+
+  return S_OK;
+}
+
+/* IUnknown */
+STDMETHODIMP_ (ULONG)
+    IGstDWriteTextRenderer::AddRef (void)
+{
+  return InterlockedIncrement (&ref_count_);
+}
+
+STDMETHODIMP_ (ULONG)
+    IGstDWriteTextRenderer::Release (void)
+{
+  ULONG ref_count;
+
+  ref_count = InterlockedDecrement (&ref_count_);
+
+  if (ref_count == 0)
+    delete this;
+
+  return ref_count;
+}
+
+STDMETHODIMP
+IGstDWriteTextRenderer::QueryInterface (REFIID riid, void **object)
+{
+  if (riid == __uuidof (IUnknown)) {
+    *object = static_cast < IUnknown * >
+        (static_cast < IGstDWriteTextRenderer * >(this));
+  } else if (riid == __uuidof (IDWritePixelSnapping)) {
+    *object = static_cast < IDWritePixelSnapping * >
+        (static_cast < IGstDWriteTextRenderer * >(this));
+  } else if (riid == IID_IGstDWriteTextRenderer) {
+    *object = static_cast < IDWriteTextRenderer * >
+        (static_cast < IGstDWriteTextRenderer * >(this));
+  } else {
+    *object = nullptr;
+    return E_NOINTERFACE;
+  }
+
+  AddRef ();
+
+  return S_OK;
+}
+
+/* IDWritePixelSnapping */
+STDMETHODIMP
+    IGstDWriteTextRenderer::IsPixelSnappingDisabled (void *context,
+    BOOL * is_disabled)
+{
+  *is_disabled = FALSE;
+  return S_OK;
+}
+
+STDMETHODIMP
+    IGstDWriteTextRenderer::GetCurrentTransform (void *context,
+    DWRITE_MATRIX * transform)
+{
+  RenderContext *render_ctx;
+
+  g_assert (context != nullptr);
+
+  render_ctx = (RenderContext *) context;
+  render_ctx->target->GetTransform (reinterpret_cast <
+      D2D1_MATRIX_3X2_F * >(transform));
+
+  return S_OK;
+}
+
+STDMETHODIMP
+    IGstDWriteTextRenderer::GetPixelsPerDip (void *context,
+    FLOAT * pixels_per_dip)
+{
+  *pixels_per_dip = 1.0f;
+
+  return S_OK;
+}
+
+/* IDWriteTextRenderer */
+STDMETHODIMP
+    IGstDWriteTextRenderer::DrawGlyphRun (void *context, FLOAT origin_x,
+    FLOAT origin_y, DWRITE_MEASURING_MODE mode,
+    DWRITE_GLYPH_RUN const *glyph_run,
+    DWRITE_GLYPH_RUN_DESCRIPTION const *glyph_run_desc,
+    IUnknown * client_effect)
+{
+  ComPtr < ID2D1PathGeometry > geometry;
+  ComPtr < ID2D1GeometrySink > sink;
+  ComPtr < ID2D1TransformedGeometry > transformed;
+  ComPtr < ID2D1TransformedGeometry > shadow_transformed;
+  ComPtr < IGstDWriteTextEffect > effect;
+  ComPtr < ID2D1SolidColorBrush > brush;
+  ComPtr < ID2D1SolidColorBrush > outline_brush;
+  ComPtr < ID2D1SolidColorBrush > shadow_brush;
+  RenderContext *render_ctx;
+  ID2D1RenderTarget *target;
+  ID2D1Factory *factory;
+  HRESULT hr;
+  RECT client_rect;
+  D2D1_COLOR_F fg_color = D2D1::ColorF (D2D1::ColorF::Black);
+  BOOL enable_color_font = FALSE;
+
+  g_assert (context != nullptr);
+
+  render_ctx = (RenderContext *) context;
+  client_rect = render_ctx->client_rect;
+  target = render_ctx->target;
+  factory = render_ctx->factory;
+
+  if (client_effect)
+    client_effect->QueryInterface (IID_IGstDWriteTextEffect, &effect);
+
+  if (render_ctx->render_path == RenderPath::BACKGROUND) {
+    D2D1_COLOR_F color;
+    BOOL enabled;
+    DWRITE_FONT_METRICS font_metrics;
+    FLOAT run_width = 0;
+    FLOAT adjust, ascent, descent;
+    D2D1_RECT_F bg_rect;
+    ComPtr < ID2D1SolidColorBrush > bg_brush;
+    DWRITE_LINE_METRICS line_metrics =
+        render_ctx->line_metrics.at (render_ctx->line_index);
+
+    if (effect &&
+        render_ctx->char_index + line_metrics.trailingWhitespaceLength <
+        line_metrics.length) {
+      effect->GetBrushColor (GST_DWRITE_BRUSH_BACKGROUND, &color, &enabled);
+      if (enabled) {
+        ComPtr < ID2D1RectangleGeometry > rect_geometry;
+        ComPtr < ID2D1PathGeometry > path_geometry;
+        ComPtr < ID2D1GeometrySink > path_sink;
+
+        for (UINT32 i = 0; i < glyph_run->glyphCount; i++)
+          run_width += glyph_run->glyphAdvancesi;
+
+        glyph_run->fontFace->GetMetrics (&font_metrics);
+        adjust = glyph_run->fontEmSize / font_metrics.designUnitsPerEm;
+        ascent = adjust * font_metrics.ascent;
+        descent = adjust * font_metrics.descent;
+
+        bg_rect =
+            D2D1::RectF (origin_x, origin_y - ascent, origin_x + run_width,
+            origin_y + descent);
+
+        hr = factory->CreateRectangleGeometry (bg_rect, &rect_geometry);
+        if (FAILED (hr))
+          return hr;
+
+        hr = factory->CreatePathGeometry (&path_geometry);
+        if (FAILED (hr))
+          return hr;
+
+        hr = path_geometry->Open (&path_sink);
+        if (FAILED (hr))
+          return hr;
+
+        hr = rect_geometry->Outline (nullptr, path_sink.Get ());
+        if (FAILED (hr))
+          return hr;
+
+        path_sink->Close ();
+
+        if (render_ctx->bg_rect) {
+          if (render_ctx->bg_color.r == color.r &&
+              render_ctx->bg_color.g == color.g &&
+              render_ctx->bg_color.b == color.b &&
+              render_ctx->bg_color.a == color.a) {
+            ComPtr < ID2D1Geometry > combined;
+            hr = CombineTwoGeometries (factory,
+                render_ctx->bg_rect.Get (), path_geometry.Get (), &combined);
+            if (FAILED (hr))
+              return hr;
+
+            render_ctx->bg_rect = combined;
+          } else {
+            target->CreateSolidColorBrush (render_ctx->bg_color, &bg_brush);
+            target->FillGeometry (render_ctx->bg_rect.Get (), bg_brush.Get ());
+            render_ctx->bg_rect = nullptr;
+          }
+        }
+
+        if (!render_ctx->bg_rect) {
+          render_ctx->bg_rect = path_geometry;
+          render_ctx->bg_color = color;
+        }
+      }
+    }
+
+    render_ctx->char_index += glyph_run_desc->stringLength;
+    if (render_ctx->char_index >= line_metrics.length) {
+      render_ctx->line_index++;
+      render_ctx->char_index = 0;
+    }
+
+    return S_OK;
+  }
+
+  hr = factory->CreatePathGeometry (&geometry);
+  if (FAILED (hr))
+    return hr;
+
+  hr = geometry->Open (&sink);
+  if (FAILED (hr))
+    return hr;
+
+  hr = glyph_run->fontFace->GetGlyphRunOutline (glyph_run->fontEmSize,
+      glyph_run->glyphIndices, glyph_run->glyphAdvances,
+      glyph_run->glyphOffsets, glyph_run->glyphCount, glyph_run->isSideways,
+      glyph_run->bidiLevel % 2, sink.Get ());
+
+  if (FAILED (hr))
+    return hr;
+
+  sink->Close ();
+
+  hr = factory->CreateTransformedGeometry (geometry.Get (),
+      D2D1::Matrix3x2F::Translation (origin_x, origin_y), &transformed);
+
+  if (FAILED (hr))
+    return hr;
+
+  if (effect) {
+    D2D1_COLOR_F color;
+    BOOL enabled;
+
+    effect->GetBrushColor (GST_DWRITE_BRUSH_FORGROUND, &color, &enabled);
+    if (enabled) {
+      target->CreateSolidColorBrush (color, &brush);
+      fg_color = color;
+    }
+
+    effect->GetBrushColor (GST_DWRITE_BRUSH_OUTLINE, &color, &enabled);
+    if (enabled)
+      target->CreateSolidColorBrush (color, &outline_brush);
+
+    effect->GetBrushColor (GST_DWRITE_BRUSH_SHADOW, &color, &enabled);
+    if (enabled)
+      target->CreateSolidColorBrush (color, &shadow_brush);
+
+    effect->GetEnableColorFont (&enable_color_font);
+  } else {
+    target->CreateSolidColorBrush (D2D1::ColorF (D2D1::ColorF::Black), &brush);
+    outline_brush = brush;
+  }
+
+#ifdef HAVE_DWRITE_COLOR_FONT
+  if (enable_color_font) {
+    const DWRITE_GLYPH_IMAGE_FORMATS supported_formats =
+        (DWRITE_GLYPH_IMAGE_FORMATS) (DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE |
+        DWRITE_GLYPH_IMAGE_FORMATS_CFF |
+        DWRITE_GLYPH_IMAGE_FORMATS_COLR |
+        DWRITE_GLYPH_IMAGE_FORMATS_SVG |
+        DWRITE_GLYPH_IMAGE_FORMATS_PNG |
+        DWRITE_GLYPH_IMAGE_FORMATS_JPEG |
+        DWRITE_GLYPH_IMAGE_FORMATS_TIFF |
+        DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8);
+
+    ComPtr < IDWriteColorGlyphRunEnumerator1 > glyph_run_enum;
+    ComPtr < IDWriteFactory4 > factory4;
+    ComPtr < ID2D1DeviceContext4 > ctx4;
+    hr = factory_->QueryInterface (IID_PPV_ARGS (&factory4));
+    if (SUCCEEDED (hr))
+      hr = target->QueryInterface (IID_PPV_ARGS (&ctx4));
+
+    if (SUCCEEDED (hr)) {
+      hr = factory4->TranslateColorGlyphRun (D2D1::Point2 (origin_x, origin_y),
+          glyph_run, glyph_run_desc, supported_formats,
+          DWRITE_MEASURING_MODE_NATURAL, nullptr, 0, &glyph_run_enum);
+      if (hr != DWRITE_E_NOCOLOR && SUCCEEDED (hr)) {
+        ComPtr < ID2D1SolidColorBrush > tmp_brush;
+        BOOL has_run = FALSE;
+        do {
+          DWRITE_COLOR_GLYPH_RUN1 const *color_run;
+          hr = glyph_run_enum->MoveNext (&has_run);
+
+          if (FAILED (hr))
+            return hr;
+
+          if (!has_run)
+            return S_OK;
+
+          hr = glyph_run_enum->GetCurrentRun (&color_run);
+          if (FAILED (hr))
+            return hr;
+
+          const auto cur_origin = D2D1::Point2F (color_run->baselineOriginX,
+              color_run->baselineOriginY);
+          switch (color_run->glyphImageFormat) {
+            case DWRITE_GLYPH_IMAGE_FORMATS_PNG:
+            case DWRITE_GLYPH_IMAGE_FORMATS_JPEG:
+            case DWRITE_GLYPH_IMAGE_FORMATS_TIFF:
+            case DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8:
+              ctx4->DrawColorBitmapGlyphRun (color_run->glyphImageFormat,
+                  cur_origin, &color_run->glyphRun,
+                  DWRITE_MEASURING_MODE_NATURAL);
+              break;
+            case DWRITE_GLYPH_IMAGE_FORMATS_SVG:
+            {
+              ComPtr < ID2D1SolidColorBrush > svg_brush;
+              if (brush)
+                svg_brush = brush;
+              else if (outline_brush)
+                svg_brush = outline_brush;
+
+              ctx4->DrawSvgGlyphRun (cur_origin, &color_run->glyphRun,
+                  svg_brush.Get ());
+              break;
+            }
+            case DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE:
+            case DWRITE_GLYPH_IMAGE_FORMATS_CFF:
+            case DWRITE_GLYPH_IMAGE_FORMATS_COLR:
+            default:
+              if (!tmp_brush) {
+                hr = target->CreateSolidColorBrush (fg_color, &tmp_brush);
+                if (FAILED (hr))
+                  return hr;
+              }
+
+              if (color_run->paletteIndex == 0xffff)
+                tmp_brush->SetColor (fg_color);
+              else
+                tmp_brush->SetColor (color_run->runColor);
+
+              target->DrawGlyphRun (cur_origin, &color_run->glyphRun,
+                  tmp_brush.Get ());
+              break;
+          }
+
+        } while (has_run && SUCCEEDED (hr));
+
+        return S_OK;
+      }
+    }
+  }
+#endif /* HAVE_DWRITE_COLOR_FONT */
+
+  if (shadow_brush) {
+    FLOAT adjust = glyph_run->fontEmSize * 0.06;
+    hr = factory->CreateTransformedGeometry (geometry.Get (),
+        D2D1::Matrix3x2F::Translation (origin_x + adjust, origin_y + adjust),
+        &shadow_transformed);
+
+    if (FAILED (hr))
+      return hr;
+  }
+
+  if (shadow_brush)
+    target->FillGeometry (shadow_transformed.Get (), shadow_brush.Get ());
+
+  if (outline_brush)
+    target->DrawGeometry (transformed.Get (), outline_brush.Get ());
+
+  if (brush)
+    target->FillGeometry (transformed.Get (), brush.Get ());
+
+  return S_OK;
+}
+
+STDMETHODIMP
+    IGstDWriteTextRenderer::DrawUnderline (void *context, FLOAT origin_x,
+    FLOAT origin_y, DWRITE_UNDERLINE const *underline, IUnknown * client_effect)
+{
+  ComPtr < ID2D1RectangleGeometry > geometry;
+  ComPtr < ID2D1TransformedGeometry > transformed;
+  ComPtr < IGstDWriteTextEffect > effect;
+  ComPtr < ID2D1SolidColorBrush > brush;
+  RenderContext *render_ctx;
+  ID2D1RenderTarget *target;
+  ID2D1Factory *factory;
+  HRESULT hr;
+
+  g_assert (context != nullptr);
+
+  render_ctx = (RenderContext *) context;
+  if (render_ctx->render_path == RenderPath::BACKGROUND)
+    return S_OK;
+
+  target = render_ctx->target;
+  factory = render_ctx->factory;
+
+  hr = factory->CreateRectangleGeometry (D2D1::RectF (0, underline->offset,
+          underline->width, underline->offset + underline->thickness),
+      &geometry);
+  if (FAILED (hr)) {
+    GST_WARNING ("Couldn't create geometry, 0x%x", (guint) hr);
+    return hr;
+  }
+
+  hr = factory->CreateTransformedGeometry (geometry.Get (),
+      D2D1::Matrix3x2F::Translation (origin_x, origin_y), &transformed);
+  if (FAILED (hr)) {
+    GST_WARNING ("Couldn't create transformed geometry, 0x%x", (guint) hr);
+    return hr;
+  }
+
+  if (client_effect)
+    client_effect->QueryInterface (IID_IGstDWriteTextEffect, &effect);
+
+  if (effect) {
+    D2D1_COLOR_F color;
+    BOOL enabled;
+
+    effect->GetBrushColor (GST_DWRITE_BRUSH_UNDERLINE, &color, &enabled);
+    if (enabled)
+      target->CreateSolidColorBrush (color, &brush);
+  } else {
+    target->CreateSolidColorBrush (D2D1::ColorF (D2D1::ColorF::Black), &brush);
+  }
+
+  if (brush)
+    target->FillGeometry (transformed.Get (), brush.Get ());
+
+  return S_OK;
+}
+
+STDMETHODIMP
+    IGstDWriteTextRenderer::DrawStrikethrough (void *context, FLOAT origin_x,
+    FLOAT origin_y, DWRITE_STRIKETHROUGH const *strikethrough,
+    IUnknown * client_effect)
+{
+  ComPtr < ID2D1RectangleGeometry > geometry;
+  ComPtr < ID2D1TransformedGeometry > transformed;
+  ComPtr < IGstDWriteTextEffect > effect;
+  ComPtr < ID2D1SolidColorBrush > brush;
+  RenderContext *render_ctx;
+  ID2D1RenderTarget *target;
+  ID2D1Factory *factory;
+  HRESULT hr;
+
+  g_assert (context != nullptr);
+
+  render_ctx = (RenderContext *) context;
+  if (render_ctx->render_path == RenderPath::BACKGROUND)
+    return S_OK;
+
+  target = render_ctx->target;
+  factory = render_ctx->factory;
+
+  hr = factory->CreateRectangleGeometry (D2D1::RectF (0,
+          strikethrough->offset, strikethrough->width,
+          strikethrough->offset + strikethrough->thickness), &geometry);
+
+  if (FAILED (hr)) {
+    GST_WARNING ("Couldn't create geometry, 0x%x", (guint) hr);
+    return hr;
+  }
+
+  hr = factory->CreateTransformedGeometry (geometry.Get (),
+      D2D1::Matrix3x2F::Translation (origin_x, origin_y), &transformed);
+
+  if (FAILED (hr)) {
+    GST_WARNING ("Couldn't create transformed geometry, 0x%x", (guint) hr);
+    return hr;
+  }
+
+  if (client_effect)
+    client_effect->QueryInterface (IID_IGstDWriteTextEffect, &effect);
+
+  if (effect) {
+    D2D1_COLOR_F color;
+    BOOL enabled;
+
+    effect->GetBrushColor (GST_DWRITE_BRUSH_STRIKETHROUGH, &color, &enabled);
+    if (enabled)
+      target->CreateSolidColorBrush (color, &brush);
+  } else {
+    target->CreateSolidColorBrush (D2D1::ColorF (D2D1::ColorF::Black), &brush);
+  }
+
+  if (brush)
+    target->FillGeometry (transformed.Get (), brush.Get ());
+
+  return S_OK;
+}
+
+STDMETHODIMP
+    IGstDWriteTextRenderer::DrawInlineObject (void *context, FLOAT origin_x,
+    FLOAT origin_y, IDWriteInlineObject * inline_object, BOOL is_sideways,
+    BOOL is_right_to_left, IUnknown * client_effect)
+{
+  GST_WARNING ("Not implemented");
+  return E_NOTIMPL;
+}
+
+IGstDWriteTextRenderer::IGstDWriteTextRenderer (void)
+{
+}
+
+IGstDWriteTextRenderer::~IGstDWriteTextRenderer (void)
+{
+  factory_->Release ();
+}
+
+STDMETHODIMP
+    IGstDWriteTextRenderer::Draw (const D2D1_POINT_2F & origin,
+    const RECT & client_rect, IDWriteTextLayout * layout,
+    ID2D1RenderTarget * target)
+{
+  HRESULT hr;
+  RenderContext context;
+  ComPtr < ID2D1Factory > d2d_factory;
+  UINT32 num_lines = 0;
+
+  g_return_val_if_fail (layout != nullptr, E_INVALIDARG);
+  g_return_val_if_fail (target != nullptr, E_INVALIDARG);
+
+  hr = layout->GetLineMetrics (nullptr, 0, &num_lines);
+  if (hr != E_NOT_SUFFICIENT_BUFFER)
+    return hr;
+
+  context.line_metrics.resize (num_lines);
+  hr = layout->GetLineMetrics (&context.line_metrics0,
+      context.line_metrics.size (), &num_lines);
+  if (FAILED (hr))
+    return hr;
+
+  target->GetFactory (&d2d_factory);
+  context.render_path = RenderPath::BACKGROUND;
+  context.client_rect = client_rect;
+  context.target = target;
+  context.factory = d2d_factory.Get ();
+
+  hr = layout->Draw (&context, this, origin.x, origin.y);
+
+  if (FAILED (hr)) {
+    GST_WARNING ("Background Draw failed with 0x%x", (guint) hr);
+    return hr;
+  }
+
+  if (context.bg_rect) {
+    ComPtr < ID2D1SolidColorBrush > bg_brush;
+    target->CreateSolidColorBrush (context.bg_color, &bg_brush);
+    target->FillGeometry (context.bg_rect.Get (), bg_brush.Get ());
+    context.bg_rect = nullptr;
+  }
+
+  context.render_path = RenderPath::TEXT;
+  hr = layout->Draw (&context, this, origin.x, origin.y);
+
+  if (FAILED (hr)) {
+    GST_WARNING ("Draw failed with 0x%x", (guint) hr);
+  }
+
+  return hr;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwrite-renderer.h Added

@@ -0,0 +1,88 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "gstdwrite-enums.h"
+#include "gstdwrite-effect.h"
+
+DEFINE_GUID (IID_IGstDWriteTextRenderer, 0xb969dc25, 0xf7d2,
+    0x4cf8, 0x92, 0x0f, 0x5a, 0x27, 0xd1, 0x6d, 0x03, 0x6a);
+
+class IGstDWriteTextRenderer : public IDWriteTextRenderer
+{
+public:
+  static STDMETHODIMP CreateInstance (IDWriteFactory * factory,
+                                      IGstDWriteTextRenderer ** renderer);
+
+  /* IUnknown */
+  STDMETHODIMP_ (ULONG) AddRef (void);
+  STDMETHODIMP_ (ULONG) Release (void);
+  STDMETHODIMP QueryInterface (REFIID riid,
+                               void ** object);
+
+  /* IDWritePixelSnapping */
+  STDMETHODIMP IsPixelSnappingDisabled (void * context,
+                                        BOOL * is_disabled);
+  STDMETHODIMP GetCurrentTransform     (void * context,
+                                        DWRITE_MATRIX * transform);
+  STDMETHODIMP GetPixelsPerDip         (void * context,
+                                        FLOAT * pixels_per_dip);
+
+  /* IDWriteTextRenderer */
+  STDMETHODIMP DrawGlyphRun      (void * context,
+                                  FLOAT origin_x,
+                                  FLOAT origin_y,
+                                  DWRITE_MEASURING_MODE mode,
+                                  DWRITE_GLYPH_RUN const *glyph_run,
+                                  DWRITE_GLYPH_RUN_DESCRIPTION const *glyph_run_desc,
+                                  IUnknown * client_effect);
+  STDMETHODIMP DrawUnderline     (void * context,
+                                  FLOAT origin_x,
+                                  FLOAT origin_y,
+                                  DWRITE_UNDERLINE const * underline,
+                                  IUnknown * client_effect);
+  STDMETHODIMP DrawStrikethrough (void * context,
+                                  FLOAT origin_x,
+                                  FLOAT origin_y,
+                                  DWRITE_STRIKETHROUGH const * strikethrough,
+                                  IUnknown * client_effect);
+  STDMETHODIMP DrawInlineObject  (void * context,
+                                  FLOAT origin_x,
+                                  FLOAT origin_y,
+                                  IDWriteInlineObject * inline_object,
+                                  BOOL is_sideways,
+                                  BOOL is_right_to_left,
+                                  IUnknown * client_effect);
+
+  /* Entry point for drawing text */
+  STDMETHODIMP Draw (const D2D1_POINT_2F & origin,
+                     const RECT & client_rect,
+                     IDWriteTextLayout * layout,
+                     ID2D1RenderTarget * target);
+
+private:
+  IGstDWriteTextRenderer (void);
+  virtual ~IGstDWriteTextRenderer (void);
+
+private:
+  IDWriteFactory *factory_;
+  ULONG ref_count_ = 1;
+};

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwrite-utils.cpp Added

@@ -0,0 +1,158 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/d3d11/gstd3d11.h>
+#include "gstdwrite-utils.h"
+
+GType
+gst_dwrite_subtitle_meta_api_get_type (void)
+{
+  static GType type = 0;
+  static const gchar *tags = { NULL, };
+
+  GST_DWRITE_CALL_ONCE_BEGIN {
+    type = gst_meta_api_type_register ("GstDWriteSubtitleMetaAPI", tags);
+  } GST_DWRITE_CALL_ONCE_END;
+
+  return type;
+}
+
+static gboolean
+gst_dwrite_subtitle_meta_init (GstMeta * meta, gpointer params,
+    GstBuffer * buffer)
+{
+  GstDWriteSubtitleMeta *m = (GstDWriteSubtitleMeta *) meta;
+
+  m->stream = NULL;
+  m->subtitle = NULL;
+
+  return TRUE;
+}
+
+static void
+gst_dwrite_subtitle_meta_free (GstMeta * meta, GstBuffer * buffer)
+{
+  GstDWriteSubtitleMeta *m = (GstDWriteSubtitleMeta *) meta;
+
+  if (m->stream)
+    gst_object_unref (m->stream);
+
+  if (m->subtitle)
+    gst_buffer_unref (m->subtitle);
+}
+
+static gboolean
+gst_dwrite_subtitle_meta_transform (GstBuffer * dest, GstMeta * meta,
+    GstBuffer * buffer, GQuark type, gpointer data)
+{
+  GstDWriteSubtitleMeta *dmeta, *smeta;
+
+  if (GST_META_TRANSFORM_IS_COPY (type)) {
+    smeta = (GstDWriteSubtitleMeta *) meta;
+
+    dmeta = gst_buffer_add_dwrite_subtitle_meta (dest,
+        smeta->stream, smeta->subtitle);
+    if (!dmeta)
+      return FALSE;
+  } else {
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+const GstMetaInfo *
+gst_dwrite_subtitle_meta_get_info (void)
+{
+  static const GstMetaInfo *info = NULL;
+
+  GST_DWRITE_CALL_ONCE_BEGIN {
+    info = gst_meta_register (GST_DWRITE_SUBTITLE_META_API_TYPE,
+        "GstDWriteSubtitleMeta",
+        sizeof (GstDWriteSubtitleMeta),
+        gst_dwrite_subtitle_meta_init,
+        gst_dwrite_subtitle_meta_free, gst_dwrite_subtitle_meta_transform);
+  }
+  GST_DWRITE_CALL_ONCE_END;
+
+  return info;
+}
+
+GstDWriteSubtitleMeta *
+gst_buffer_add_dwrite_subtitle_meta (GstBuffer * buffer, GstStream * stream,
+    GstBuffer * subtitle)
+{
+  GstDWriteSubtitleMeta *meta;
+
+  g_return_val_if_fail (GST_IS_BUFFER (buffer), NULL);
+  g_return_val_if_fail (GST_IS_STREAM (stream), NULL);
+  g_return_val_if_fail (GST_IS_BUFFER (subtitle), NULL);
+
+  meta = (GstDWriteSubtitleMeta *) gst_buffer_add_meta (buffer,
+      GST_DWRITE_SUBTITLE_META_INFO, NULL);
+
+  if (!meta)
+    return NULL;
+
+  meta->stream = (GstStream *) gst_object_ref (stream);
+  meta->subtitle = gst_buffer_ref (subtitle);
+
+  return meta;
+}
+
+gboolean
+gst_dwrite_is_windows_10_or_greater (void)
+{
+  static gboolean ret = FALSE;
+
+  GST_DWRITE_CALL_ONCE_BEGIN {
+#if (!GST_D3D11_WINAPI_ONLY_APP)
+    OSVERSIONINFOEXW osverinfo;
+    typedef NTSTATUS (WINAPI fRtlGetVersion) (PRTL_OSVERSIONINFOEXW);
+    fRtlGetVersion *RtlGetVersion = NULL;
+    HMODULE hmodule = NULL;
+
+    memset (&osverinfo, 0, sizeof (OSVERSIONINFOEXW));
+    osverinfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW);
+
+    hmodule = LoadLibraryW (L"ntdll.dll");
+    if (!hmodule)
+      return;
+
+    RtlGetVersion =
+        (fRtlGetVersion *) GetProcAddress (hmodule, "RtlGetVersion");
+    if (RtlGetVersion) {
+      RtlGetVersion (&osverinfo);
+      if (osverinfo.dwMajorVersion > 10 || osverinfo.dwMajorVersion == 10)
+        ret = TRUE;
+    }
+
+    if (hmodule)
+      FreeLibrary (hmodule);
+#else
+    ret = TRUE;
+#endif
+  } GST_DWRITE_CALL_ONCE_END;
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwrite-utils.h Added

@@ -0,0 +1,91 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+typedef struct
+{
+  GstMeta meta;
+
+  GstStream *stream;
+  GstBuffer *subtitle;
+
+  /*< private >*/
+  gpointer _gst_reservedGST_PADDING;
+} GstDWriteSubtitleMeta;
+
+GType gst_dwrite_subtitle_meta_api_get_type (void);
+#define GST_DWRITE_SUBTITLE_META_API_TYPE (gst_dwrite_subtitle_meta_api_get_type())
+
+const GstMetaInfo * gst_dwrite_subtitle_meta_get_info (void);
+#define GST_DWRITE_SUBTITLE_META_INFO (gst_dwrite_subtitle_meta_get_info())
+
+#define gst_buffer_get_dwrite_subtitle_meta(b) \
+    ((GstDWriteSubtitleMeta *) gst_buffer_get_meta((b), GST_DWRITE_SUBTITLE_META_API_TYPE))
+
+GstDWriteSubtitleMeta * gst_buffer_add_dwrite_subtitle_meta (GstBuffer * buffer,
+                                                             GstStream * stream,
+                                                             GstBuffer * subtitle);
+
+gboolean gst_dwrite_is_windows_10_or_greater (void);
+
+G_END_DECLS
+
+#ifdef __cplusplus
+#include <string>
+#include <mutex>
+
+static inline std::wstring
+gst_dwrite_string_to_wstring (const std::string & str)
+{
+  auto tmp = g_utf8_to_utf16 (str.c_str (), -1, nullptr, nullptr, nullptr);
+  if (!tmp)
+    return std::wstring ();
+
+  std::wstring ret = (wchar_t *) tmp;
+  g_free (tmp);
+
+  return ret;
+}
+
+static inline std::string
+gst_dwrite_wstring_to_string (const std::wstring & str)
+{
+  auto tmp = g_utf16_to_utf8 ((const gunichar2 *) str.c_str (),
+      -1, nullptr, nullptr, nullptr);
+  if (!tmp)
+    return std::string ();
+
+  std::string ret = tmp;
+  g_free (tmp);
+
+  return ret;
+}
+
+#define GST_DWRITE_CALL_ONCE_BEGIN \
+    static std::once_flag __once_flag; \
+    std::call_once (__once_flag, &()
+
+#define GST_DWRITE_CALL_ONCE_END )
+
+#endif /* __cplusplus */

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritebaseoverlay.cpp Added

@@ -0,0 +1,989 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gst/d3d11/gstd3d11-private.h>
+#include "gstdwritebaseoverlay.h"
+#include "gstdwriteoverlayobject.h"
+#include "gstdwrite-effect.h"
+#include <wrl.h>
+#include <mutex>
+
+GST_DEBUG_CATEGORY_STATIC (dwrite_base_overlay_debug);
+#define GST_CAT_DEFAULT dwrite_base_overlay_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-raw(ANY)")
+    );
+
+static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-raw(ANY)")
+    );
+
+enum
+{
+  PROP_0,
+  PROP_VISIBLE,
+  PROP_FONT_FAMILY,
+  PROP_FONT_SIZE,
+  PROP_AUTO_RESIZE,
+  PROP_FONT_WEIGHT,
+  PROP_FONT_STYLE,
+  PROP_FONT_STRETCH,
+  PROP_TEXT,
+  PROP_COLOR,
+  PROP_OUTLINE_COLOR,
+  PROP_SHADOW_COLOR,
+  PROP_BACKGROUND_COLOR,
+  PROP_LAYOUT_X,
+  PROP_LAYOUT_Y,
+  PROP_LAYOUT_WIDTH,
+  PROP_LAYOUT_HEIGHT,
+  PROP_TEXT_ALIGNMENT,
+  PROP_PARAGRAPH_ALIGNMENT,
+  PROP_ENABLE_COLOR_FONT,
+};
+
+/* *INDENT-OFF* */
+static std::vector <GParamSpec *> _pspec;
+/* *INDENT-ON* */
+
+#define DEFAULT_VISIBLE TRUE
+#define DEFAULT_FONT_FAMILY "MS Reference Sans Serif"
+#define DEFAULT_FONT_SIZE 24
+#define DEFAULT_REFERENCE_FRAME_SIZE 640
+#define DEFAULT_AUTO_RESIZE TRUE
+#define DEFAULT_FONT_WEIGHT DWRITE_FONT_WEIGHT_NORMAL
+#define DEFAULT_FONT_STYLE DWRITE_FONT_STYLE_NORMAL
+#define DEFAULT_FONT_STRETCH DWRITE_FONT_STRETCH_NORMAL
+#define DEFAULT_FOREGROUND_COLOR 0xffffffff
+#define DEFAULT_OUTLINE_COLOR 0xff000000
+#define DEFAULT_SHADOW_COLOR 0x80000000
+#define DEFAULT_BACKGROUND_COLOR 0x0
+#define DEFAULT_LAYOUT_XY 0.03f
+#define DEFAULT_LAYOUT_WH 0.92f
+#define DEFAULT_TEXT_ALIGNMENT DWRITE_TEXT_ALIGNMENT_LEADING
+#define DEFAULT_PARAGRAPH_ALIGNMENT DWRITE_PARAGRAPH_ALIGNMENT_NEAR
+#define DEFAULT_COLOR_FONT TRUE
+
+/* *INDENT-OFF* */
+struct _GstDWriteBaseOverlayPrivate
+{
+  _GstDWriteBaseOverlayPrivate ()
+  {
+    overlay = gst_dwrite_overlay_object_new ();
+  }
+
+  ~_GstDWriteBaseOverlayPrivate ()
+  {
+    gst_clear_object (&overlay);
+  }
+
+  std::mutex prop_lock;
+
+  GstDWriteOverlayObject *overlay = nullptr;
+  ComPtr<IDWriteFactory> dwrite_factory;
+  ComPtr<IDWriteTextFormat> text_format;
+  ComPtr<IDWriteTextLayout> layout;
+
+  D2D_POINT_2F layout_origin;
+  D2D_POINT_2F layout_size;
+
+  std::wstring prev_text;
+  std::wstring cur_text;
+
+  GstDWriteBlendMode blend_mode = GstDWriteBlendMode::NOT_SUPPORTED;
+
+  /* properties */
+  gboolean visible = DEFAULT_VISIBLE;
+  std::string font_family = DEFAULT_FONT_FAMILY;
+  gfloat font_size = DEFAULT_FONT_SIZE;
+  gboolean auto_resize = DEFAULT_AUTO_RESIZE;
+  DWRITE_FONT_WEIGHT font_weight = DEFAULT_FONT_WEIGHT;
+  DWRITE_FONT_STYLE font_style = DEFAULT_FONT_STYLE;
+  DWRITE_FONT_STRETCH font_stretch = DEFAULT_FONT_STRETCH;
+
+  std::wstring default_text;
+  guint foreground_color = DEFAULT_FOREGROUND_COLOR;
+  guint outline_color = DEFAULT_OUTLINE_COLOR;
+  guint shadow_color = DEFAULT_SHADOW_COLOR;
+  guint background_color = DEFAULT_BACKGROUND_COLOR;
+
+  gdouble layout_x = DEFAULT_LAYOUT_XY;
+  gdouble layout_y = DEFAULT_LAYOUT_XY;
+  gdouble layout_width = DEFAULT_LAYOUT_WH;
+  gdouble layout_height = DEFAULT_LAYOUT_WH;
+  DWRITE_TEXT_ALIGNMENT text_align = DEFAULT_TEXT_ALIGNMENT;
+  DWRITE_PARAGRAPH_ALIGNMENT paragraph_align = DEFAULT_PARAGRAPH_ALIGNMENT;
+
+  gboolean color_font = FALSE;
+};
+/* *INDENT-ON* */
+
+static void gst_dwrite_base_overlay_finalize (GObject * object);
+static void gst_dwrite_base_overlay_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_dwrite_base_overlay_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+static void gst_dwrite_base_overlay_set_context (GstElement * elem,
+    GstContext * context);
+static gboolean gst_dwrite_base_overlay_start (GstBaseTransform * trans);
+static gboolean gst_dwrite_base_overlay_stop (GstBaseTransform * trans);
+static gboolean gst_dwrite_base_overlay_query (GstBaseTransform * trans,
+    GstPadDirection direction, GstQuery * query);
+static gboolean gst_dwrite_base_overlay_set_caps (GstBaseTransform * trans,
+    GstCaps * incaps, GstCaps * outcaps);
+static gboolean
+gst_dwrite_base_overlay_decide_allocation (GstBaseTransform * trans,
+    GstQuery * query);
+static gboolean
+gst_dwrite_base_overlay_propose_allocation (GstBaseTransform * trans,
+    GstQuery * decide_query, GstQuery * query);
+static GstCaps *gst_dwrite_base_overlay_transform_caps (GstBaseTransform *
+    trans, GstPadDirection direction, GstCaps * caps, GstCaps * filter);
+static void gst_dwrite_base_overlay_before_transform (GstBaseTransform * trans,
+    GstBuffer * buf);
+static GstFlowReturn
+gst_dwrite_base_overlay_prepare_output_buffer (GstBaseTransform * trans,
+    GstBuffer * inbuf, GstBuffer ** outbuf);
+static GstFlowReturn gst_dwrite_base_overlay_transform (GstBaseTransform *
+    trans, GstBuffer * inbuf, GstBuffer * outbuf);
+
+#define gst_dwrite_base_overlay_parent_class parent_class
+G_DEFINE_TYPE (GstDWriteBaseOverlay, gst_dwrite_base_overlay,
+    GST_TYPE_BASE_TRANSFORM);
+
+static void
+gst_dwrite_base_overlay_class_init (GstDWriteBaseOverlayClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
+
+  object_class->finalize = gst_dwrite_base_overlay_finalize;
+  object_class->set_property = gst_dwrite_base_overlay_set_property;
+  object_class->get_property = gst_dwrite_base_overlay_get_property;
+
+  gst_dwrite_base_overlay_build_param_specs (_pspec);
+  for (guint i = 0; i < (guint) _pspec.size (); i++)
+    g_object_class_install_property (object_class, i + 1, _pspeci);
+
+  gst_element_class_add_static_pad_template (element_class, &sink_template);
+  gst_element_class_add_static_pad_template (element_class, &src_template);
+
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_dwrite_base_overlay_set_context);
+
+  trans_class->start = GST_DEBUG_FUNCPTR (gst_dwrite_base_overlay_start);
+  trans_class->stop = GST_DEBUG_FUNCPTR (gst_dwrite_base_overlay_stop);
+  trans_class->query = GST_DEBUG_FUNCPTR (gst_dwrite_base_overlay_query);
+  trans_class->set_caps = GST_DEBUG_FUNCPTR (gst_dwrite_base_overlay_set_caps);
+  trans_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_dwrite_base_overlay_decide_allocation);
+  trans_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_dwrite_base_overlay_propose_allocation);
+  trans_class->transform_caps =
+      GST_DEBUG_FUNCPTR (gst_dwrite_base_overlay_transform_caps);
+  trans_class->before_transform =
+      GST_DEBUG_FUNCPTR (gst_dwrite_base_overlay_before_transform);
+  trans_class->prepare_output_buffer =
+      GST_DEBUG_FUNCPTR (gst_dwrite_base_overlay_prepare_output_buffer);
+  trans_class->transform =
+      GST_DEBUG_FUNCPTR (gst_dwrite_base_overlay_transform);
+
+  GST_DEBUG_CATEGORY_INIT (dwrite_base_overlay_debug,
+      "dwritebaseoverlay", 0, "dwritebaseoverlay");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_DWRITE_BASE_OVERLAY,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_DWRITE_FONT_WEIGHT,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_DWRITE_FONT_STYLE,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_DWRITE_FONT_STRETCH,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_DWRITE_TEXT_ALIGNMENT,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_DWRITE_PARAGRAPH_ALIGNMENT,
+      (GstPluginAPIFlags) 0);
+}
+
+static void
+gst_dwrite_base_overlay_init (GstDWriteBaseOverlay * self)
+{
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+
+  self->priv = priv = new GstDWriteBaseOverlayPrivate ();
+  if (gst_dwrite_is_windows_10_or_greater ())
+    priv->color_font = DEFAULT_COLOR_FONT;
+}
+
+static void
+gst_dwrite_base_overlay_finalize (GObject * object)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_dwrite_base_overlay_clear_layout (GstDWriteBaseOverlay * self)
+{
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+
+  priv->layout = nullptr;
+}
+
+static void
+update_uint (GstDWriteBaseOverlay * self, guint * prev, const GValue * value)
+{
+  guint val = g_value_get_uint (value);
+  if (val != *prev) {
+    *prev = val;
+    gst_dwrite_base_overlay_clear_layout (self);
+  }
+}
+
+static void
+update_double (GstDWriteBaseOverlay * self, gdouble * prev,
+    const GValue * value)
+{
+  gdouble val = g_value_get_double (value);
+  if (val != *prev) {
+    *prev = val;
+    gst_dwrite_base_overlay_clear_layout (self);
+  }
+}
+
+static void
+update_enum (GstDWriteBaseOverlay * self, gint * prev, const GValue * value)
+{
+  gint val = g_value_get_enum (value);
+  if (val != *prev) {
+    *prev = val;
+    gst_dwrite_base_overlay_clear_layout (self);
+  }
+}
+
+static void
+gst_dwrite_base_overlay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (object);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+
+  switch (prop_id) {
+    case PROP_VISIBLE:
+      priv->visible = g_value_get_boolean (value);
+      break;
+    case PROP_FONT_FAMILY:{
+      const gchar *font_family = g_value_get_string (value);
+      std::string font;
+
+      if (font_family)
+        font = font_family;
+      else
+        font = DEFAULT_FONT_FAMILY;
+
+      if (font != priv->font_family) {
+        priv->font_family = font;
+        priv->text_format = nullptr;
+        gst_dwrite_base_overlay_clear_layout (self);
+      }
+      break;
+    }
+    case PROP_FONT_SIZE:
+    {
+      gfloat font_size = g_value_get_float (value);
+      if (font_size != priv->font_size) {
+        priv->font_size = font_size;
+        priv->text_format = nullptr;
+        gst_dwrite_base_overlay_clear_layout (self);
+      }
+      break;
+    }
+    case PROP_AUTO_RESIZE:
+    {
+      gboolean auto_resize = g_value_get_uint (value);
+      if (auto_resize != priv->auto_resize) {
+        priv->auto_resize = auto_resize;
+        priv->text_format = nullptr;
+        gst_dwrite_base_overlay_clear_layout (self);
+      }
+      break;
+    }
+    case PROP_FONT_WEIGHT:
+    {
+      DWRITE_FONT_WEIGHT weight = (DWRITE_FONT_WEIGHT) g_value_get_enum (value);
+      if (weight != priv->font_weight) {
+        priv->font_weight = weight;
+        priv->text_format = nullptr;
+        gst_dwrite_base_overlay_clear_layout (self);
+      }
+      break;
+    }
+    case PROP_FONT_STYLE:
+    {
+      DWRITE_FONT_STYLE style = (DWRITE_FONT_STYLE) g_value_get_enum (value);
+      if (style != priv->font_style) {
+        priv->font_style = style;
+        priv->text_format = nullptr;
+        gst_dwrite_base_overlay_clear_layout (self);
+      }
+      break;
+    }
+    case PROP_FONT_STRETCH:
+    {
+      DWRITE_FONT_STRETCH stretch =
+          (DWRITE_FONT_STRETCH) g_value_get_enum (value);
+      if (stretch != priv->font_stretch) {
+        priv->font_stretch = stretch;
+        priv->text_format = nullptr;
+        gst_dwrite_base_overlay_clear_layout (self);
+      }
+      break;
+    }
+    case PROP_TEXT:
+    {
+      const gchar *new_text = g_value_get_string (value);
+      std::wstring new_string;
+
+      if (new_text)
+        new_string = gst_dwrite_string_to_wstring (new_text);
+
+      if (priv->default_text != new_string) {
+        priv->default_text = new_string;
+        gst_dwrite_base_overlay_clear_layout (self);
+      }
+      break;
+    }
+    case PROP_COLOR:
+      update_uint (self, &priv->foreground_color, value);
+      break;
+    case PROP_OUTLINE_COLOR:
+      update_uint (self, &priv->outline_color, value);
+      break;
+    case PROP_SHADOW_COLOR:
+      update_uint (self, &priv->shadow_color, value);
+      break;
+    case PROP_BACKGROUND_COLOR:
+      update_uint (self, &priv->background_color, value);
+      break;
+    case PROP_LAYOUT_X:
+      update_double (self, &priv->layout_x, value);
+      break;
+    case PROP_LAYOUT_Y:
+      update_double (self, &priv->layout_y, value);
+      break;
+    case PROP_LAYOUT_WIDTH:
+      update_double (self, &priv->layout_width, value);
+      break;
+    case PROP_LAYOUT_HEIGHT:
+      update_double (self, &priv->layout_height, value);
+      break;
+    case PROP_TEXT_ALIGNMENT:
+      update_enum (self, (gint *) & priv->text_align, value);
+      break;
+    case PROP_PARAGRAPH_ALIGNMENT:
+      update_enum (self, (gint *) & priv->paragraph_align, value);
+      break;
+    case PROP_ENABLE_COLOR_FONT:
+      priv->color_font = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_dwrite_base_overlay_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (object);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+
+  switch (prop_id) {
+    case PROP_VISIBLE:
+      g_value_set_boolean (value, priv->visible);
+      break;
+    case PROP_FONT_FAMILY:
+      g_value_set_string (value, priv->font_family.c_str ());
+      break;
+    case PROP_FONT_SIZE:
+      g_value_set_float (value, priv->font_size);
+      break;
+    case PROP_AUTO_RESIZE:
+      g_value_set_boolean (value, priv->auto_resize);
+      break;
+    case PROP_FONT_WEIGHT:
+      g_value_set_enum (value, priv->font_weight);
+      break;
+    case PROP_FONT_STYLE:
+      g_value_set_enum (value, priv->font_style);
+      break;
+    case PROP_FONT_STRETCH:
+      g_value_set_enum (value, priv->font_stretch);
+      break;
+    case PROP_TEXT:
+      if (priv->default_text.empty ()) {
+        g_value_set_string (value, "");
+      } else {
+        std::string str = gst_dwrite_wstring_to_string (priv->default_text);
+        g_value_set_string (value, str.c_str ());
+      }
+      break;
+    case PROP_COLOR:
+      g_value_set_uint (value, priv->foreground_color);
+      break;
+    case PROP_OUTLINE_COLOR:
+      g_value_set_uint (value, priv->outline_color);
+      break;
+    case PROP_SHADOW_COLOR:
+      g_value_set_uint (value, priv->shadow_color);
+      break;
+    case PROP_BACKGROUND_COLOR:
+      g_value_set_uint (value, priv->background_color);
+      break;
+    case PROP_LAYOUT_X:
+      g_value_set_double (value, priv->layout_x);
+      break;
+    case PROP_LAYOUT_Y:
+      g_value_set_double (value, priv->layout_y);
+      break;
+    case PROP_LAYOUT_WIDTH:
+      g_value_set_double (value, priv->layout_width);
+      break;
+    case PROP_LAYOUT_HEIGHT:
+      g_value_set_double (value, priv->layout_height);
+      break;
+    case PROP_TEXT_ALIGNMENT:
+      g_value_set_enum (value, priv->text_align);
+      break;
+    case PROP_PARAGRAPH_ALIGNMENT:
+      g_value_set_enum (value, priv->paragraph_align);
+      break;
+    case PROP_ENABLE_COLOR_FONT:
+      g_value_set_boolean (value, priv->color_font);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_dwrite_base_overlay_set_context (GstElement * elem, GstContext * context)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (elem);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+
+  gst_dwrite_overlay_object_set_context (priv->overlay, elem, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (elem, context);
+}
+
+static gboolean
+gst_dwrite_base_overlay_start (GstBaseTransform * trans)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (trans);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+  HRESULT hr;
+
+  hr = DWriteCreateFactory (DWRITE_FACTORY_TYPE_SHARED,
+      __uuidof (IDWriteFactory), (IUnknown **) (&priv->dwrite_factory));
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (self, "Couldn't create dwrite factory");
+    return FALSE;
+  }
+
+  gst_video_info_init (&self->info);
+
+  return gst_dwrite_overlay_object_start (priv->overlay,
+      priv->dwrite_factory.Get ());
+}
+
+static void
+gst_dwrite_base_overlay_clear_resource (GstDWriteBaseOverlay * self)
+{
+  gst_dwrite_base_overlay_clear_layout (self);
+}
+
+static gboolean
+gst_dwrite_base_overlay_stop (GstBaseTransform * trans)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (trans);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+
+  gst_dwrite_base_overlay_clear_resource (self);
+
+  gst_dwrite_overlay_object_stop (priv->overlay);
+
+  priv->dwrite_factory = nullptr;
+
+  return TRUE;
+}
+
+static gboolean
+gst_dwrite_base_overlay_query (GstBaseTransform * trans,
+    GstPadDirection direction, GstQuery * query)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (trans);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+
+  if (gst_dwrite_overlay_object_handle_query (priv->overlay,
+          GST_ELEMENT (self), query)) {
+    return TRUE;
+  }
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->query (trans,
+      direction, query);
+}
+
+static gboolean
+gst_dwrite_base_overlay_decide_allocation (GstBaseTransform * trans,
+    GstQuery * query)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (trans);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+
+  if (!gst_dwrite_overlay_object_decide_allocation (priv->overlay,
+          GST_ELEMENT (self), query)) {
+    return FALSE;
+  }
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->decide_allocation (trans,
+      query);
+}
+
+static gboolean
+gst_dwrite_base_overlay_propose_allocation (GstBaseTransform * trans,
+    GstQuery * decide_query, GstQuery * query)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (trans);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+  gboolean ret;
+
+  GST_DEBUG_OBJECT (self, "Propose allocation");
+
+  if (!GST_BASE_TRANSFORM_CLASS (parent_class)->propose_allocation (trans,
+          decide_query, query))
+    return FALSE;
+
+  if (!decide_query) {
+    GST_DEBUG_OBJECT (self, "Passthrough");
+    return TRUE;
+  }
+
+  ret = gst_pad_peer_query (trans->srcpad, query);
+  if (!ret)
+    return FALSE;
+
+  return gst_dwrite_overlay_object_propose_allocation (priv->overlay,
+      GST_ELEMENT (self), query);
+}
+
+static GstCaps *
+gst_dwrite_base_overlay_add_feature (GstCaps * caps)
+{
+  GstCaps *new_caps = gst_caps_new_empty ();
+  guint caps_size = gst_caps_get_size (caps);
+
+  for (guint i = 0; i < caps_size; i++) {
+    GstStructure *s = gst_caps_get_structure (caps, i);
+    GstCapsFeatures *f =
+        gst_caps_features_copy (gst_caps_get_features (caps, i));
+    GstCaps *c = gst_caps_new_full (gst_structure_copy (s), nullptr);
+
+    if (!gst_caps_features_is_any (f) &&
+        !gst_caps_features_contains (f,
+            GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION)) {
+      gst_caps_features_add (f,
+          GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
+    }
+
+    gst_caps_set_features (c, 0, f);
+    gst_caps_append (new_caps, c);
+  }
+
+  return new_caps;
+}
+
+static GstCaps *
+gst_dwrite_overlay_remove_feature (GstCaps * caps)
+{
+  GstCaps *new_caps = gst_caps_new_empty ();
+  guint caps_size = gst_caps_get_size (caps);
+
+  for (guint i = 0; i < caps_size; i++) {
+    GstStructure *s = gst_caps_get_structure (caps, i);
+    GstCapsFeatures *f =
+        gst_caps_features_copy (gst_caps_get_features (caps, i));
+    GstCaps *c = gst_caps_new_full (gst_structure_copy (s), nullptr);
+
+    gst_caps_features_remove (f,
+        GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
+    gst_caps_set_features (c, 0, f);
+    gst_caps_append (new_caps, c);
+  }
+
+  return new_caps;
+}
+
+static GstCaps *
+gst_dwrite_base_overlay_transform_caps (GstBaseTransform * trans,
+    GstPadDirection direction, GstCaps * caps, GstCaps * filter)
+{
+  GstCaps *result, *tmp;
+
+  GST_DEBUG_OBJECT (trans,
+      "Transforming caps %" GST_PTR_FORMAT " in direction %s", caps,
+      (direction == GST_PAD_SINK) ? "sink" : "src");
+
+  if (direction == GST_PAD_SINK) {
+    tmp = gst_dwrite_base_overlay_add_feature (caps);
+    tmp = gst_caps_merge (tmp, gst_caps_ref (caps));
+  } else {
+    tmp = gst_dwrite_overlay_remove_feature (caps);
+    tmp = gst_caps_merge (gst_caps_ref (caps), tmp);
+  }
+
+  if (filter) {
+    result = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (tmp);
+  } else {
+    result = tmp;
+  }
+
+  GST_DEBUG_OBJECT (trans, "returning caps: %" GST_PTR_FORMAT, result);
+
+  return result;
+}
+
+static gboolean
+gst_dwrite_base_overlay_set_caps (GstBaseTransform * trans, GstCaps * incaps,
+    GstCaps * outcaps)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (trans);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+
+  gst_dwrite_base_overlay_clear_layout (self);
+
+  if (!gst_dwrite_overlay_object_set_caps (priv->overlay,
+          GST_ELEMENT (self), incaps, outcaps, &self->info,
+          &priv->blend_mode)) {
+    GST_ERROR_OBJECT (self, "Set caps failed");
+    return FALSE;
+  }
+
+  priv->prop_lock.lock ();
+  priv->text_format = nullptr;
+  priv->layout = nullptr;
+  priv->prop_lock.unlock ();
+
+  if (priv->blend_mode == GstDWriteBlendMode::NOT_SUPPORTED)
+    gst_base_transform_set_passthrough (trans, TRUE);
+  else
+    gst_base_transform_set_passthrough (trans, FALSE);
+
+  return TRUE;
+}
+
+static void
+gst_dwrite_base_overlay_before_transform (GstBaseTransform * trans,
+    GstBuffer * buf)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (trans);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+
+  if (gst_dwrite_overlay_object_update_device (priv->overlay, buf))
+    gst_base_transform_reconfigure (trans);
+}
+
+static GstFlowReturn
+gst_dwrite_base_overlay_prepare_output_buffer (GstBaseTransform * trans,
+    GstBuffer * inbuf, GstBuffer ** outbuf)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (trans);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+  GstDWriteBaseOverlayClass *klass = GST_DWRITE_BASE_OVERLAY_GET_CLASS (self);
+
+  if (priv->blend_mode == GstDWriteBlendMode::NOT_SUPPORTED) {
+    GST_TRACE_OBJECT (self, "Force passthrough");
+
+    return
+        GST_BASE_TRANSFORM_CLASS (parent_class)->prepare_output_buffer (trans,
+        inbuf, outbuf);
+  }
+
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+  /* Invisible, do passthrough */
+  if (!priv->visible) {
+    gst_base_transform_set_passthrough (trans, TRUE);
+    *outbuf = inbuf;
+    return GST_FLOW_OK;
+  }
+
+  priv->cur_text = klass->get_text (self, priv->default_text, inbuf);
+  if (priv->cur_text.empty ()) {
+    priv->prev_text.clear ();
+    gst_dwrite_base_overlay_clear_layout (self);
+    /* Nothing to render, passthrough */
+    gst_base_transform_set_passthrough (trans, TRUE);
+    *outbuf = inbuf;
+    return GST_FLOW_OK;
+  }
+
+  gst_base_transform_set_passthrough (trans, FALSE);
+  if (priv->prev_text != priv->cur_text)
+    gst_dwrite_base_overlay_clear_layout (self);
+
+  priv->prev_text = priv->cur_text;
+
+  return gst_dwrite_overlay_object_prepare_output (priv->overlay, trans,
+      parent_class, inbuf, outbuf);
+}
+
+static gboolean
+gst_dwrite_base_overlay_update_text_format (GstDWriteBaseOverlay * self)
+{
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+  FLOAT font_size;
+  HRESULT hr;
+
+  if (priv->text_format)
+    return TRUE;
+
+  gst_dwrite_base_overlay_clear_layout (self);
+
+  if (priv->auto_resize) {
+    font_size = (FLOAT) self->info.width * priv->font_size / 640;
+  } else {
+    font_size = priv->font_size;
+  }
+
+  std::wstring wfont_family = gst_dwrite_string_to_wstring (priv->font_family);
+
+  hr = priv->dwrite_factory->CreateTextFormat (wfont_family.c_str (), nullptr,
+      priv->font_weight, priv->font_style, priv->font_stretch,
+      font_size, L"en-us", &priv->text_format);
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (self, "Couldn't create text format");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static inline D2D1_COLOR_F
+unpack_argb (guint packed)
+{
+  D2D1_COLOR_F ret;
+  ret.a = ((packed >> 24) & 0xff) / 255.f;
+  ret.r = ((packed >> 16) & 0xff) / 255.f;
+  ret.g = ((packed >> 8) & 0xff) / 255.f;
+  ret.b = ((packed >> 0) & 0xff) / 255.f;
+
+  return ret;
+}
+
+static gboolean
+gst_dwrite_base_overlay_create_layout (GstDWriteBaseOverlay * self,
+    const std::wstring & text)
+{
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+  D2D1_COLOR_F color;
+  ComPtr < IGstDWriteTextEffect > effect;
+  HRESULT hr;
+  DWRITE_TEXT_RANGE range;
+
+  priv->layout_origin.x = priv->layout_x * self->info.width;
+  priv->layout_origin.y = priv->layout_y * self->info.height;
+  priv->layout_size.x = priv->layout_width * self->info.width;
+  priv->layout_size.y = priv->layout_height * self->info.height;
+
+  hr = priv->dwrite_factory->CreateTextLayout (text.c_str (), text.length (),
+      priv->text_format.Get (), priv->layout_size.x, priv->layout_size.y,
+      &priv->layout);
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (self, "Couldn't create text layout");
+    return FALSE;
+  }
+
+  hr = IGstDWriteTextEffect::CreateInstance (&effect);
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (self, "Couldn't create text effect");
+    priv->layout = nullptr;
+    return FALSE;
+  }
+
+  range.startPosition = 0;
+  range.length = G_MAXUINT32;
+
+  priv->layout->SetTextAlignment (priv->text_align);
+  priv->layout->SetParagraphAlignment (priv->paragraph_align);
+  priv->layout->SetMaxWidth (priv->layout_size.x);
+  priv->layout->SetMaxHeight (priv->layout_size.y);
+
+  color = unpack_argb (priv->foreground_color);
+  effect->SetBrushColor (GST_DWRITE_BRUSH_FORGROUND, &color);
+
+  color = unpack_argb (priv->outline_color);
+  effect->SetBrushColor (GST_DWRITE_BRUSH_OUTLINE, &color);
+
+  color = unpack_argb (priv->shadow_color);
+  effect->SetBrushColor (GST_DWRITE_BRUSH_SHADOW, &color);
+
+  color = unpack_argb (priv->background_color);
+  effect->SetBrushColor (GST_DWRITE_BRUSH_BACKGROUND, &color);
+
+  effect->SetEnableColorFont (priv->color_font);
+
+  hr = priv->layout->SetDrawingEffect (effect.Get (), range);
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (self, "Couldn't set drawing effect");
+    priv->layout = nullptr;
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_dwrite_base_overlay_transform (GstBaseTransform * trans, GstBuffer * inbuf,
+    GstBuffer * outbuf)
+{
+  GstDWriteBaseOverlay *self = GST_DWRITE_BASE_OVERLAY (trans);
+  GstDWriteBaseOverlayPrivate *priv = self->priv;
+  GstDWriteBaseOverlayClass *klass = GST_DWRITE_BASE_OVERLAY_GET_CLASS (self);
+  std::lock_guard < std::mutex > lk (priv->prop_lock);
+
+  if (!priv->overlay) {
+    GST_ERROR_OBJECT (self, "Overlay object is not configured");
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_dwrite_base_overlay_update_text_format (self))
+    return GST_FLOW_ERROR;
+
+  if (!priv->layout &&
+      !gst_dwrite_base_overlay_create_layout (self, priv->cur_text)) {
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_dwrite_overlay_object_draw (priv->overlay, outbuf,
+          priv->layout.Get (), priv->layout_origin.x, priv->layout_origin.y)) {
+    GST_ERROR_OBJECT (self, "Draw failed");
+    return GST_FLOW_ERROR;
+  }
+
+  if (klass->after_transform)
+    klass->after_transform (self, outbuf);
+
+  return GST_FLOW_OK;
+}
+
+void
+gst_dwrite_base_overlay_build_param_specs (std::vector < GParamSpec * >&pspec)
+{
+  pspec.push_back (g_param_spec_boolean ("visible", "Visible",
+          "Whether to draw text", DEFAULT_VISIBLE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_string ("font-family", "Font Family",
+          "Font family to use", DEFAULT_FONT_FAMILY,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_float ("font-size", "Font Size",
+          "Font size to use", 0.1f, 1638.f, DEFAULT_FONT_SIZE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_boolean ("auto-resize", "Auto Resize",
+          "Calculate font size to be equivalent to \"font-size\" at "
+          "\"reference-frame-size\"", DEFAULT_AUTO_RESIZE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_enum ("font-weight", "Font Weight",
+          "Font Weight", GST_TYPE_DWRITE_FONT_WEIGHT, DEFAULT_FONT_WEIGHT,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_enum ("font-style", "Font Style", "Font Style",
+          GST_TYPE_DWRITE_FONT_STYLE, DEFAULT_FONT_STYLE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_enum ("font-stretch", "Font Stretch",
+          "Font Stretch", GST_TYPE_DWRITE_FONT_STRETCH, DEFAULT_FONT_STRETCH,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_string ("text", "Text", "Text to render", "",
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_uint ("foreground-color", "Foreground Color",
+          "Foreground color to use (big-endian ARGB)", 0, G_MAXUINT32,
+          DEFAULT_FOREGROUND_COLOR,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_uint ("outline-color", "Outline Color",
+          "Text outline color to use (big-endian ARGB)", 0, G_MAXUINT32,
+          DEFAULT_OUTLINE_COLOR,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_uint ("shadow-color", "Shadow Color",
+          "Shadow color to use (big-endian ARGB)", 0, G_MAXUINT32,
+          DEFAULT_SHADOW_COLOR,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_uint ("background-color", "Background Color",
+          "Background color to use (big-endian ARGB)", 0, G_MAXUINT32,
+          DEFAULT_BACKGROUND_COLOR,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_double ("layout-x", "Layout X",
+          "Normalized X coordinate of text layout", 0, 1, DEFAULT_LAYOUT_XY,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_double ("layout-y", "Layout Y",
+          "Normalized Y coordinate of text layout", 0, 1, DEFAULT_LAYOUT_XY,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_double ("layout-width", "Layout Width",
+          "Normalized width of text layout", 0, 1, DEFAULT_LAYOUT_WH,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_double ("layout-height", "Layout Height",
+          "Normalized height of text layout", 0, 1, DEFAULT_LAYOUT_WH,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_enum ("text-alignment", "Text Alignment",
+          "Text Alignment", GST_TYPE_DWRITE_TEXT_ALIGNMENT,
+          DEFAULT_TEXT_ALIGNMENT,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_enum ("paragraph-alignment",
+          "Paragraph alignment", "Paragraph Alignment",
+          GST_TYPE_DWRITE_PARAGRAPH_ALIGNMENT, DEFAULT_PARAGRAPH_ALIGNMENT,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+#ifdef HAVE_DWRITE_COLOR_FONT
+  if (gst_dwrite_is_windows_10_or_greater ()) {
+    pspec.push_back (g_param_spec_boolean ("color-font", "Color Font",
+            "Enable color font, requires Windows 10 or newer",
+            DEFAULT_COLOR_FONT,
+            (GParamFlags) (GST_PARAM_CONDITIONALLY_AVAILABLE |
+                G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  }
+#endif
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritebaseoverlay.h Added

@@ -0,0 +1,75 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/d3d11/gstd3d11.h>
+#include <gst/video/video.h>
+#include <gst/base/base.h>
+#include <string>
+#include "gstdwrite-utils.h"
+#include "gstdwrite-enums.h"
+#include <vector>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DWRITE_BASE_OVERLAY             (gst_dwrite_base_overlay_get_type())
+#define GST_DWRITE_BASE_OVERLAY(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DWRITE_BASE_OVERLAY,GstDWriteBaseOverlay))
+#define GST_DWRITE_BASE_OVERLAY_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_DWRITE_BASE_OVERLAY,GstDWriteBaseOverlayClass))
+#define GST_DWRITE_BASE_OVERLAY_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_DWRITE_BASE_OVERLAY,GstDWriteBaseOverlayClass))
+#define GST_IS_DWRITE_BASE_OVERLAY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DWRITE_BASE_OVERLAY))
+#define GST_IS_DWRITE_BASE_OVERLAY_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_DWRITE_BASE_OVERLAY))
+
+typedef struct _GstDWriteBaseOverlay GstDWriteBaseOverlay;
+typedef struct _GstDWriteBaseOverlayClass GstDWriteBaseOverlayClass;
+typedef struct _GstDWriteBaseOverlayPrivate GstDWriteBaseOverlayPrivate;
+
+typedef std::wstring WString;
+
+struct _GstDWriteBaseOverlay
+{
+  GstBaseTransform parent;
+
+  GstVideoInfo info;
+
+  GstDWriteBaseOverlayPrivate *priv;
+};
+
+struct _GstDWriteBaseOverlayClass
+{
+  GstBaseTransformClass parent_class;
+
+  gboolean     (*sink_event) (GstDWriteBaseOverlay * overlay,
+                              GstEvent * event);
+
+  WString      (*get_text)   (GstDWriteBaseOverlay * overlay,
+                              const std::wstring & default_text,
+                              GstBuffer * buffer);
+
+  void         (*after_transform) (GstDWriteBaseOverlay * overlay,
+                                   GstBuffer * buffer);
+};
+
+GType gst_dwrite_base_overlay_get_type (void);
+
+void gst_dwrite_base_overlay_build_param_specs (std::vector<GParamSpec *> & pspec);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstDWriteBaseOverlay, gst_object_unref)
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritebitmapmemory.cpp Added

@@ -0,0 +1,300 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdwritebitmapmemory.h"
+#include <mutex>
+#include <condition_variable>
+#include <thread>
+#include <wrl.h>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+/* *INDENT-ON* */
+
+GST_DEBUG_CATEGORY_STATIC (gst_dwrite_bitmap_allocator_debug);
+#define GST_CAT_DEFAULT gst_dwrite_bitmap_allocator_debug
+
+#define GST_DWRITE_BITMAP_MEMORY_NAME "DWriteBitmapMemory"
+
+struct GstDWriteBitmapAllocatorPrivate
+{
+  GstDWriteBitmapAllocatorPrivate ()
+  {
+    com_thread = std::thread (&GstDWriteBitmapAllocatorPrivate::ComThreadFunc,
+        this);
+    std::unique_lock < std::mutex > lk (init_lock);
+    while (!running)
+      init_cond.wait (lk);
+  }
+
+   ~GstDWriteBitmapAllocatorPrivate ()
+  {
+    thread_lock.lock ();
+    terminate = true;
+    thread_cond.notify_one ();
+    thread_lock.unlock ();
+
+    com_thread.join ();
+  }
+
+  void ComThreadFunc ()
+  {
+    HRESULT hr;
+    CoInitializeEx (nullptr, COINIT_MULTITHREADED);
+
+    hr = CoCreateInstance (CLSID_WICImagingFactory, nullptr,
+        CLSCTX_INPROC_SERVER, IID_PPV_ARGS (&factory));
+    if (FAILED (hr))
+      GST_ERROR ("Couldn't create image factory");
+
+    init_lock.lock ();
+    running = true;
+    init_cond.notify_one ();
+    init_lock.unlock ();
+
+    std::unique_lock < std::mutex > lk (thread_lock);
+    while (!terminate)
+      thread_cond.wait (lk);
+
+    if (factory)
+      factory->Release ();
+
+    CoUninitialize ();
+  }
+
+  IWICImagingFactory *factory = nullptr;
+
+  std::mutex init_lock;
+  std::condition_variable init_cond;
+
+  std::mutex thread_lock;
+  std::condition_variable thread_cond;
+
+  bool running = false;
+  bool terminate = false;
+
+  std::thread com_thread;
+};
+
+struct _GstDWriteBitmapAllocator
+{
+  GstAllocator parent;
+
+  GstDWriteBitmapAllocatorPrivate *priv;
+};
+
+static void gst_dwrite_bitmap_allocator_finalize (GObject * object);
+
+static GstMemory *gst_dwrite_bitmap_allocator_dummy_alloc (GstAllocator * alloc,
+    gsize size, GstAllocationParams * params);
+static void gst_dwrite_bitmap_allocator_free (GstAllocator * alloc,
+    GstMemory * mem);
+
+static gpointer gst_dwrite_bitmap_allocator_map (GstMemory * mem,
+    GstMapInfo * info, gsize maxsize);
+static void gst_dwrite_bitmap_allocator_unmap (GstMemory * mem,
+    GstMapInfo * info);
+static GstMemory *gst_dwrite_bitmap_allocator_share (GstMemory * mem,
+    gssize offset, gssize size);
+
+#define gst_dwrite_bitmap_allocator_parent_class parent_class
+G_DEFINE_TYPE (GstDWriteBitmapAllocator, gst_dwrite_bitmap_allocator,
+    GST_TYPE_ALLOCATOR);
+
+static void
+gst_dwrite_bitmap_allocator_class_init (GstDWriteBitmapAllocatorClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstAllocatorClass *alloc_class = GST_ALLOCATOR_CLASS (klass);
+
+  object_class->finalize = gst_dwrite_bitmap_allocator_finalize;
+
+  alloc_class->alloc = gst_dwrite_bitmap_allocator_dummy_alloc;
+  alloc_class->free = gst_dwrite_bitmap_allocator_free;
+
+  GST_DEBUG_CATEGORY_INIT (gst_dwrite_bitmap_allocator_debug,
+      "dwritebitmapallocator", 0, "dwritebitmapallocator");
+}
+
+static void
+gst_dwrite_bitmap_allocator_init (GstDWriteBitmapAllocator * self)
+{
+  GstAllocator *alloc = GST_ALLOCATOR_CAST (self);
+
+  alloc->mem_type = GST_DWRITE_BITMAP_MEMORY_NAME;
+  alloc->mem_map_full = gst_dwrite_bitmap_allocator_map;
+  alloc->mem_unmap_full = gst_dwrite_bitmap_allocator_unmap;
+  alloc->mem_share = gst_dwrite_bitmap_allocator_share;
+
+  GST_OBJECT_FLAG_SET (alloc, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC);
+
+  self->priv = new GstDWriteBitmapAllocatorPrivate ();
+}
+
+static void
+gst_dwrite_bitmap_allocator_finalize (GObject * object)
+{
+  GstDWriteBitmapAllocator *self = GST_DWRITE_BITMAP_ALLOCATOR (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static GstMemory *
+gst_dwrite_bitmap_allocator_dummy_alloc (GstAllocator * alloc, gsize size,
+    GstAllocationParams * params)
+{
+  g_assert_not_reached ();
+  return nullptr;
+}
+
+static void
+gst_dwrite_bitmap_allocator_free (GstAllocator * alloc, GstMemory * mem)
+{
+  GstDWriteBitmapMemory *dmem = (GstDWriteBitmapMemory *) mem;
+
+  if (dmem->bitmap)
+    dmem->bitmap->Release ();
+
+  g_free (dmem);
+}
+
+static GstMemory *
+gst_dwrite_bitmap_allocator_share (GstMemory * mem, gssize offset, gssize size)
+{
+  return nullptr;
+}
+
+static gpointer
+gst_dwrite_bitmap_allocator_map (GstMemory * mem, GstMapInfo * info,
+    gsize maxsize)
+{
+  GstDWriteBitmapMemory *dmem = (GstDWriteBitmapMemory *) mem;
+  ComPtr < IWICBitmapLock > bitmap_lock;
+  HRESULT hr;
+  WICRect rect = { 0, 0, dmem->info.width, dmem->info.height };
+  DWORD map_flags = 0;
+  BYTE *ptr = nullptr;
+  UINT size;
+
+  info->user_data0 = nullptr;
+
+  if ((info->flags & GST_MAP_READ) == GST_MAP_READ)
+    map_flags |= (gint) WICBitmapLockRead;
+
+  if ((info->flags & GST_MAP_WRITE) == GST_MAP_WRITE)
+    map_flags |= (gint) WICBitmapLockWrite;
+
+
+  hr = dmem->bitmap->Lock (&rect, map_flags, &bitmap_lock);
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (mem->allocator,
+        "Couldn't map bitmap, hr: 0x%x", (guint) hr);
+    return nullptr;
+  }
+
+  hr = bitmap_lock->GetDataPointer (&size, &ptr);
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (mem->allocator, "Couldn't get data pointer, hr: 0x%x",
+        (guint) hr);
+    return nullptr;
+  }
+
+  info->user_data0 = (gpointer) bitmap_lock.Detach ();
+
+  return (gpointer) ptr;
+}
+
+static void
+gst_dwrite_bitmap_allocator_unmap (GstMemory * mem, GstMapInfo * info)
+{
+  IWICBitmapLock *bitmap_lock;
+
+  bitmap_lock = (IWICBitmapLock *) info->user_data0;
+  if (!bitmap_lock) {
+    GST_WARNING_OBJECT (mem->allocator, "No attached bitmap lock");
+    return;
+  }
+
+  bitmap_lock->Release ();
+  info->user_data0 = nullptr;
+}
+
+GstDWriteBitmapAllocator *
+gst_dwrite_bitmap_allocator_new (void)
+{
+  GstDWriteBitmapAllocator *self = (GstDWriteBitmapAllocator *)
+      g_object_new (GST_TYPE_DWRITE_BITMAP_ALLOCATOR, nullptr);
+
+  gst_object_ref_sink (self);
+
+  if (!self->priv->factory) {
+    gst_object_unref (self);
+    return nullptr;
+  }
+
+  return self;
+}
+
+GstMemory *
+gst_dwrite_bitmap_allocator_alloc (GstDWriteBitmapAllocator * alloc,
+    guint width, guint height)
+{
+  HRESULT hr;
+  IWICImagingFactory *factory = alloc->priv->factory;
+  ComPtr < IWICBitmap > bitmap;
+  ComPtr < IWICBitmapLock > bitmap_lock;
+  WICRect rect = { 0, 0, (INT) width, (INT) height };
+  guint stride = width * 4;
+  GstDWriteBitmapMemory *mem;
+  gsize size;
+
+  hr = factory->CreateBitmap (width, height, GUID_WICPixelFormat32bppPBGRA,
+      WICBitmapCacheOnDemand, &bitmap);
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (alloc, "Couldn't create bitmap, hr: 0x%x", (guint) hr);
+    return nullptr;
+  }
+
+  hr = bitmap->Lock (&rect, WICBitmapLockRead, &bitmap_lock);
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (alloc, "Couldn't lock bitmap, hr: 0x%x", (guint) hr);
+    return nullptr;
+  }
+
+  bitmap_lock = nullptr;
+  size = stride * height;
+
+  mem = g_new0 (GstDWriteBitmapMemory, 1);
+  gst_memory_init (GST_MEMORY_CAST (mem), (GstMemoryFlags) 0,
+      GST_ALLOCATOR_CAST (alloc), nullptr, size, 0, 0, size);
+
+  gst_video_info_set_format (&mem->info, GST_VIDEO_FORMAT_BGRA, width, height);
+  mem->info.size = size;
+  mem->info.stride0 = stride;
+
+  mem->bitmap = bitmap.Detach ();
+
+  return GST_MEMORY_CAST (mem);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritebitmapmemory.h Added

@@ -0,0 +1,48 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <wincodec.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DWRITE_BITMAP_ALLOCATOR (gst_dwrite_bitmap_allocator_get_type())
+G_DECLARE_FINAL_TYPE (GstDWriteBitmapAllocator,
+    gst_dwrite_bitmap_allocator, GST, DWRITE_BITMAP_ALLOCATOR, GstAllocator);
+
+typedef struct _GstDWriteBitmapMemory GstDWriteBitmapMemory;
+
+struct _GstDWriteBitmapMemory
+{
+  GstMemory mem;
+
+  GstVideoInfo info;
+  IWICBitmap *bitmap;
+};
+
+GstDWriteBitmapAllocator * gst_dwrite_bitmap_allocator_new (void);
+
+GstMemory * gst_dwrite_bitmap_allocator_alloc (GstDWriteBitmapAllocator * alloc,
+                                               guint width,
+                                               guint height);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritebitmappool.cpp Added

@@ -0,0 +1,195 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdwritebitmappool.h"
+
+GST_DEBUG_CATEGORY_STATIC (dwrite_bitmap_pool_debug);
+#define GST_CAT_DEFAULT dwrite_bitmap_pool_debug
+
+struct _GstDWriteBitmapPool
+{
+  GstBufferPool parent;
+
+  GstDWriteBitmapAllocator *alloc;
+  GstVideoInfo info;
+};
+
+#define gst_dwrite_bitmap_pool_parent_class parent_class
+G_DEFINE_TYPE (GstDWriteBitmapPool,
+    gst_dwrite_bitmap_pool, GST_TYPE_BUFFER_POOL);
+
+static void gst_dwrite_bitmap_pool_finalize (GObject * object);
+static const gchar **gst_dwrite_bitmap_pool_get_options (GstBufferPool * pool);
+static gboolean gst_dwrite_bitmap_pool_set_config (GstBufferPool * pool,
+    GstStructure * config);
+static GstFlowReturn gst_dwrite_bitmap_pool_alloc_buffer (GstBufferPool *
+    pool, GstBuffer ** buffer, GstBufferPoolAcquireParams * params);
+
+static void
+gst_dwrite_bitmap_pool_class_init (GstDWriteBitmapPoolClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstBufferPoolClass *pool_class = GST_BUFFER_POOL_CLASS (klass);
+
+  object_class->finalize = gst_dwrite_bitmap_pool_finalize;
+
+  pool_class->get_options =
+      GST_DEBUG_FUNCPTR (gst_dwrite_bitmap_pool_get_options);
+  pool_class->set_config =
+      GST_DEBUG_FUNCPTR (gst_dwrite_bitmap_pool_set_config);
+  pool_class->alloc_buffer =
+      GST_DEBUG_FUNCPTR (gst_dwrite_bitmap_pool_alloc_buffer);
+
+  GST_DEBUG_CATEGORY_INIT (dwrite_bitmap_pool_debug,
+      "dwritebitmappool", 0, "dwritebitmappool");
+}
+
+static void
+gst_dwrite_bitmap_pool_init (GstDWriteBitmapPool * self)
+{
+}
+
+static void
+gst_dwrite_bitmap_pool_finalize (GObject * object)
+{
+  GstDWriteBitmapPool *self = GST_DWRITE_BITMAP_POOL (object);
+
+  gst_clear_object (&self->alloc);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static const gchar **
+gst_dwrite_bitmap_pool_get_options (GstBufferPool * pool)
+{
+  static const gchar *options = { GST_BUFFER_POOL_OPTION_VIDEO_META,
+    nullptr
+  };
+
+  return options;
+}
+
+static gboolean
+gst_dwrite_bitmap_pool_set_config (GstBufferPool * pool, GstStructure * config)
+{
+  GstDWriteBitmapPool *self = GST_DWRITE_BITMAP_POOL (pool);
+  GstCaps *caps;
+  guint size, min_buffers, max_buffers;
+  GstDWriteBitmapMemory *dmem;
+  GstMemory *mem;
+
+  if (!gst_buffer_pool_config_get_params (config,
+          &caps, &size, &min_buffers, &max_buffers)) {
+    GST_WARNING_OBJECT (self, "Invalid config");
+    return FALSE;
+  }
+
+  if (!caps) {
+    GST_WARNING_OBJECT (self, "No caps");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&self->info, caps)) {
+    GST_WARNING_OBJECT (self, "Invalid caps");
+    return FALSE;
+  }
+
+  if (GST_VIDEO_INFO_FORMAT (&self->info) != GST_VIDEO_FORMAT_BGRA) {
+    GST_WARNING_OBJECT (self, "Unsupported format");
+    return FALSE;
+  }
+
+  if (!self->alloc)
+    self->alloc = gst_dwrite_bitmap_allocator_new ();
+
+  if (!self->alloc) {
+    GST_WARNING_OBJECT (self, "Couldn't create allocator");
+    return FALSE;
+  }
+
+  mem = gst_dwrite_bitmap_allocator_alloc (self->alloc,
+      self->info.width, self->info.height);
+  if (!mem) {
+    GST_WARNING_OBJECT (self, "Couldn't allocate memory");
+    return FALSE;
+  }
+
+  dmem = (GstDWriteBitmapMemory *) mem;
+  size = dmem->info.size;
+  gst_memory_unref (mem);
+
+  gst_buffer_pool_config_set_params (config, caps, size, min_buffers,
+      max_buffers);
+
+  return GST_BUFFER_POOL_CLASS (parent_class)->set_config (pool, config);
+}
+
+static GstFlowReturn
+gst_dwrite_bitmap_pool_alloc_buffer (GstBufferPool * pool,
+    GstBuffer ** buffer, GstBufferPoolAcquireParams * params)
+{
+  GstDWriteBitmapPool *self = GST_DWRITE_BITMAP_POOL (pool);
+  GstBuffer *buf;
+  GstMemory *mem;
+  GstDWriteBitmapMemory *dmem;
+
+  *buffer = nullptr;
+
+  if (!self->alloc) {
+    GST_ERROR_OBJECT (self, "Allocator was not configured");
+    return GST_FLOW_ERROR;
+  }
+
+  mem = gst_dwrite_bitmap_allocator_alloc (self->alloc,
+      self->info.width, self->info.height);
+  if (!mem) {
+    GST_ERROR_OBJECT (self, "Couldn't allocate memory");
+    return GST_FLOW_ERROR;
+  }
+
+  buf = gst_buffer_new ();
+  gst_buffer_append_memory (buf, mem);
+
+  dmem = (GstDWriteBitmapMemory *) mem;
+
+  gst_buffer_add_video_meta_full (buf, GST_VIDEO_FRAME_FLAG_NONE,
+      GST_VIDEO_INFO_FORMAT (&dmem->info), GST_VIDEO_INFO_WIDTH (&dmem->info),
+      GST_VIDEO_INFO_HEIGHT (&dmem->info),
+      GST_VIDEO_INFO_N_PLANES (&dmem->info), dmem->info.offset,
+      dmem->info.stride);
+
+  *buffer = buf;
+
+  return GST_FLOW_OK;
+}
+
+GstBufferPool *
+gst_dwrite_bitmap_pool_new (void)
+{
+  GstBufferPool *pool = (GstBufferPool *)
+      g_object_new (GST_TYPE_DWRITE_BITMAP_POOL, nullptr);
+
+  gst_object_ref_sink (pool);
+
+  return pool;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritebitmappool.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "gstdwritebitmapmemory.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DWRITE_BITMAP_POOL (gst_dwrite_bitmap_pool_get_type())
+G_DECLARE_FINAL_TYPE (GstDWriteBitmapPool,
+    gst_dwrite_bitmap_pool, GST, DWRITE_BITMAP_POOL, GstBufferPool);
+
+GstBufferPool * gst_dwrite_bitmap_pool_new (void);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwriteclockoverlay.cpp Added

@@ -0,0 +1,193 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdwriteclockoverlay.h"
+#include <mutex>
+#include <time.h>
+
+GST_DEBUG_CATEGORY_STATIC (dwrite_clock_overlay_debug);
+#define GST_CAT_DEFAULT dwrite_clock_overlay_debug
+
+enum
+{
+  PROP_0,
+  PROP_TIME_FORMAT,
+};
+
+#define DEFAULT_TIME_FORMAT "%H:%M:%S"
+
+struct GstDWriteClockOverlayPrivate
+{
+  std::mutex lock;
+  std::string format;
+  WString wformat;
+};
+
+struct _GstDWriteClockOverlay
+{
+  GstDWriteBaseOverlay parent;
+
+  GstDWriteClockOverlayPrivate *priv;
+};
+
+static void gst_dwrite_clock_overlay_finalize (GObject * object);
+static void gst_dwrite_clock_overlay_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_dwrite_clock_overlay_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+
+static WString
+gst_dwrite_clock_overlay_get_text (GstDWriteBaseOverlay * overlay,
+    const WString & default_text, GstBuffer * buffer);
+
+#define gst_dwrite_clock_overlay_parent_class parent_class
+G_DEFINE_TYPE (GstDWriteClockOverlay, gst_dwrite_clock_overlay,
+    GST_TYPE_DWRITE_BASE_OVERLAY);
+
+static void
+gst_dwrite_clock_overlay_class_init (GstDWriteClockOverlayClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstDWriteBaseOverlayClass *overlay_class =
+      GST_DWRITE_BASE_OVERLAY_CLASS (klass);
+
+  object_class->finalize = gst_dwrite_clock_overlay_finalize;
+  object_class->set_property = gst_dwrite_clock_overlay_set_property;
+  object_class->get_property = gst_dwrite_clock_overlay_get_property;
+
+  g_object_class_install_property (object_class, PROP_TIME_FORMAT,
+      g_param_spec_string ("time-format", "Date/Time Format",
+          "Format to use for time and date value, as in strftime.",
+          DEFAULT_TIME_FORMAT,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  gst_element_class_set_static_metadata (element_class,
+      "DirectWrite Clock Overlay", "Filter/Editor/Video",
+      "Overlays the current clock time on a video stream",
+      "Seungha Yang <seungha@centricular.com>");
+
+  overlay_class->get_text =
+      GST_DEBUG_FUNCPTR (gst_dwrite_clock_overlay_get_text);
+
+  GST_DEBUG_CATEGORY_INIT (dwrite_clock_overlay_debug,
+      "dwriteclockoverlay", 0, "dwriteclockoverlay");
+}
+
+static void
+gst_dwrite_clock_overlay_init (GstDWriteClockOverlay * self)
+{
+  g_object_set (self, "text-alignment", DWRITE_TEXT_ALIGNMENT_LEADING,
+      "paragraph-alignment", DWRITE_PARAGRAPH_ALIGNMENT_NEAR, nullptr);
+
+  self->priv = new GstDWriteClockOverlayPrivate ();
+  self->priv->format = DEFAULT_TIME_FORMAT;
+  self->priv->wformat = gst_dwrite_string_to_wstring (DEFAULT_TIME_FORMAT);
+}
+
+static void
+gst_dwrite_clock_overlay_finalize (GObject * object)
+{
+  GstDWriteClockOverlay *self = GST_DWRITE_CLOCK_OVERLAY (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_dwrite_clock_overlay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstDWriteClockOverlay *self = GST_DWRITE_CLOCK_OVERLAY (object);
+  GstDWriteClockOverlayPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_TIME_FORMAT:
+    {
+      const gchar *format = g_value_get_string (value);
+      if (format)
+        priv->format = format;
+      else
+        priv->format = DEFAULT_TIME_FORMAT;
+
+      priv->wformat = gst_dwrite_string_to_wstring (priv->format);
+      break;
+    }
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_dwrite_clock_overlay_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstDWriteClockOverlay *self = GST_DWRITE_CLOCK_OVERLAY (object);
+  GstDWriteClockOverlayPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_TIME_FORMAT:
+      g_value_set_string (value, priv->format.c_str ());
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static WString
+gst_dwrite_clock_overlay_render_time (GstDWriteClockOverlay * self)
+{
+  GstDWriteClockOverlayPrivate *priv = self->priv;
+  struct tm *t;
+  time_t now;
+  wchar_t text256;
+
+  now = time (nullptr);
+  t = localtime (&now);
+
+  if (!t)
+    return WString (L"--:--:--");
+
+  if (wcsftime (text, G_N_ELEMENTS (text), priv->wformat.c_str (), t) == 0)
+    return WString (L"--:--:--");
+
+  return WString (text);
+}
+
+static WString
+gst_dwrite_clock_overlay_get_text (GstDWriteBaseOverlay * overlay,
+    const WString & default_text, GstBuffer * buffer)
+{
+  GstDWriteClockOverlay *self = GST_DWRITE_CLOCK_OVERLAY (overlay);
+  WString time_str = gst_dwrite_clock_overlay_render_time (self);
+
+  if (default_text.empty ())
+    return time_str;
+
+  return default_text + WString (L" ") + time_str;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwriteclockoverlay.h Added

@@ -0,0 +1,30 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstdwritebaseoverlay.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DWRITE_CLOCK_OVERLAY (gst_dwrite_clock_overlay_get_type())
+G_DECLARE_FINAL_TYPE (GstDWriteClockOverlay,
+    gst_dwrite_clock_overlay, GST, DWRITE_CLOCK_OVERLAY, GstDWriteBaseOverlay);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwriteoverlayobject.cpp Added

@@ -0,0 +1,1312 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/d3d11/gstd3d11-private.h>
+#include "gstdwriteoverlayobject.h"
+#include "gstdwritebitmappool.h"
+#include "gstdwrite-renderer.h"
+#include "gstdwrite-effect.h"
+#include <wrl.h>
+#include <mutex>
+
+GST_DEBUG_CATEGORY_STATIC (dwrite_overlay_object_debug);
+#define GST_CAT_DEFAULT dwrite_overlay_object_debug
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+struct GstDWriteOverlayObjectPrivate
+{
+  GstDWriteOverlayObjectPrivate ()
+  {
+    gst_video_info_init (&info);
+    gst_video_info_init (&bgra_info);
+    gst_video_info_init (&layout_info);
+  }
+
+  ~GstDWriteOverlayObjectPrivate ()
+  {
+    ClearResource (true);
+    gst_clear_caps (&outcaps);
+    gst_clear_object (&device);
+  }
+
+  void ClearResource (bool hard)
+  {
+    if (hard)
+      blend_mode = GstDWriteBlendMode::NOT_SUPPORTED;
+
+    g_clear_pointer (&overlay_rect, gst_video_overlay_rectangle_unref);
+    gst_clear_buffer (&layout_buf);
+    layout = nullptr;
+
+    if (layout_pool) {
+      gst_buffer_pool_set_active (layout_pool, FALSE);
+      gst_clear_object (&layout_pool);
+    }
+
+    if (blend_pool) {
+      gst_buffer_pool_set_active (blend_pool, FALSE);
+      gst_clear_object (&blend_pool);
+    }
+
+    gst_clear_object (&pre_conv);
+    gst_clear_object (&blend_conv);
+    gst_clear_object (&post_conv);
+  }
+
+  GstVideoInfo info;
+  GstVideoInfo bgra_info;
+  GstVideoInfo layout_info;
+
+  GstD3D11Device *device = nullptr;
+  GstCaps *outcaps = nullptr;
+
+  ComPtr<ID2D1Factory> d2d_factory;
+  ComPtr<IDWriteFactory> dwrite_factory;
+  ComPtr<IDWriteTextLayout> layout;
+  ComPtr<IGstDWriteTextRenderer> renderer;
+
+  GstDWriteBlendMode blend_mode = GstDWriteBlendMode::NOT_SUPPORTED;
+
+  GstBufferPool *layout_pool = nullptr;
+  GstBufferPool *blend_pool = nullptr;
+  GstBuffer *layout_buf = nullptr;
+  /* Convert input texture to BGRA */
+  GstD3D11Converter *pre_conv = nullptr;
+  /* Blend converted BGRA texture with rendered text texture */
+  GstD3D11Converter *blend_conv = nullptr;
+  /* Convert blended texture to original format */
+  GstD3D11Converter *post_conv = nullptr;
+  GstVideoOverlayRectangle *overlay_rect = nullptr;
+
+  gboolean is_d3d11 = FALSE;
+  gboolean attach_meta = FALSE;
+  gboolean use_bitmap = FALSE;
+
+  std::recursive_mutex ctx_lock;
+};
+/* *INDENT-ON* */
+
+struct _GstDWriteOverlayObject
+{
+  GstObject parent;
+
+  GstDWriteOverlayObjectPrivate *priv;
+};
+
+static void gst_dwrite_overlay_object_finalize (GObject * object);
+
+#define gst_dwrite_overlay_object_parent_class parent_class
+G_DEFINE_TYPE (GstDWriteOverlayObject, gst_dwrite_overlay_object,
+    GST_TYPE_OBJECT);
+
+static void
+gst_dwrite_overlay_object_class_init (GstDWriteOverlayObjectClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_dwrite_overlay_object_finalize;
+
+  GST_DEBUG_CATEGORY_INIT (dwrite_overlay_object_debug,
+      "dwriteoverlayobject", 0, "dwriteoverlayobject");
+}
+
+static void
+gst_dwrite_overlay_object_init (GstDWriteOverlayObject * self)
+{
+  self->priv = new GstDWriteOverlayObjectPrivate ();
+}
+
+static void
+gst_dwrite_overlay_object_finalize (GObject * object)
+{
+  GstDWriteOverlayObject *self = GST_DWRITE_OVERLAY_OBJECT (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_dwrite_overlay_object_decide_blend_mode (GstDWriteOverlayObject * self)
+{
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+
+  if (priv->attach_meta) {
+    if (priv->is_d3d11)
+      priv->blend_mode = GstDWriteBlendMode::ATTACH_TEXTURE;
+    else
+      priv->blend_mode = GstDWriteBlendMode::ATTACH_BITMAP;
+    return;
+  }
+
+  if (!priv->is_d3d11) {
+    priv->blend_mode = GstDWriteBlendMode::SW_BLEND;
+    return;
+  }
+
+  /* Decide best blend mode to use based on format */
+  switch (GST_VIDEO_INFO_FORMAT (&priv->info)) {
+    case GST_VIDEO_FORMAT_BGRA:
+    case GST_VIDEO_FORMAT_RGBA:
+    case GST_VIDEO_FORMAT_BGRx:
+    case GST_VIDEO_FORMAT_RGBx:
+    case GST_VIDEO_FORMAT_VUYA:
+    case GST_VIDEO_FORMAT_RGBA64_LE:
+    case GST_VIDEO_FORMAT_RGB10A2_LE:
+      /* Alpha aware formats */
+      priv->blend_mode = GstDWriteBlendMode::BLEND;
+      break;
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_NV21:
+    case GST_VIDEO_FORMAT_I420:
+    case GST_VIDEO_FORMAT_YV12:
+    case GST_VIDEO_FORMAT_Y42B:
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_GRAY8:
+    case GST_VIDEO_FORMAT_AYUV:
+    case GST_VIDEO_FORMAT_RGBP:
+    case GST_VIDEO_FORMAT_BGRP:
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBRA:
+      /* 8bits formats */
+      priv->blend_mode = GstDWriteBlendMode::CONVERT;
+      break;
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+    case GST_VIDEO_FORMAT_P016_LE:
+    case GST_VIDEO_FORMAT_I420_10LE:
+    case GST_VIDEO_FORMAT_I420_12LE:
+    case GST_VIDEO_FORMAT_I422_10LE:
+    case GST_VIDEO_FORMAT_I422_12LE:
+    case GST_VIDEO_FORMAT_Y444_10LE:
+    case GST_VIDEO_FORMAT_Y444_12LE:
+    case GST_VIDEO_FORMAT_Y444_16LE:
+    case GST_VIDEO_FORMAT_GRAY16_LE:
+    case GST_VIDEO_FORMAT_AYUV64:
+    case GST_VIDEO_FORMAT_GBR_10LE:
+    case GST_VIDEO_FORMAT_GBR_12LE:
+    case GST_VIDEO_FORMAT_GBRA_10LE:
+    case GST_VIDEO_FORMAT_GBRA_12LE:
+      /* high bitdept formats */
+      priv->blend_mode = GstDWriteBlendMode::CONVERT_64;
+      break;
+    default:
+      /* d3d11 blending is not supported, fallback to software blending */
+      priv->blend_mode = GstDWriteBlendMode::SW_BLEND;
+      break;
+  }
+}
+
+static gboolean
+is_subsampled_yuv (const GstVideoInfo * info)
+{
+  if (!GST_VIDEO_INFO_IS_YUV (info))
+    return FALSE;
+
+  for (guint i = 0; i < GST_VIDEO_MAX_COMPONENTS; i++) {
+    if (info->finfo->w_subi != 0 || info->finfo->h_subi != 0)
+      return TRUE;
+  }
+
+  return FALSE;
+}
+
+static GstD3D11Converter *
+gst_dwrite_overlay_object_create_converter (GstDWriteOverlayObject * self,
+    const GstVideoInfo * in_info, const GstVideoInfo * out_info,
+    gboolean is_blend)
+{
+  GstD3D11Converter *ret;
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+  GstStructure *config;
+  D3D11_FILTER filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
+
+  if (is_subsampled_yuv (in_info) || is_subsampled_yuv (out_info))
+    filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT;
+
+  config = gst_structure_new ("convert-config",
+      GST_D3D11_CONVERTER_OPT_BACKEND, GST_TYPE_D3D11_CONVERTER_BACKEND,
+      GST_D3D11_CONVERTER_BACKEND_SHADER,
+      GST_D3D11_CONVERTER_OPT_SAMPLER_FILTER,
+      GST_TYPE_D3D11_CONVERTER_SAMPLER_FILTER, filter, nullptr);
+  if (is_blend) {
+    gst_structure_set (config, GST_D3D11_CONVERTER_OPT_SRC_ALPHA_MODE,
+        GST_TYPE_D3D11_CONVERTER_ALPHA_MODE,
+        GST_D3D11_CONVERTER_ALPHA_MODE_PREMULTIPLIED, nullptr);
+  }
+
+  ret = gst_d3d11_converter_new (priv->device, in_info, out_info, config);
+  if (!ret)
+    GST_ERROR_OBJECT (self, "Couldn't create converter");
+
+  return ret;
+}
+
+static GstBufferPool *
+gst_dwrite_overlay_object_create_d3d11_pool (GstDWriteOverlayObject * self,
+    const GstVideoInfo * info)
+{
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+  GstCaps *caps = nullptr;
+  GstStructure *config;
+  GstD3D11AllocationParams *params;
+  GstBufferPool *pool = nullptr;
+
+  caps = gst_video_info_to_caps (info);
+  if (!caps) {
+    GST_ERROR_OBJECT (self, "Couldn't create caps");
+    return nullptr;
+  }
+
+  pool = gst_d3d11_buffer_pool_new (priv->device);
+  config = gst_buffer_pool_get_config (pool);
+
+  params = gst_d3d11_allocation_params_new (priv->device, info,
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT,
+      D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET, 0);
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_d3d11_allocation_params_free (params);
+  gst_buffer_pool_config_set_params (config, caps, info->size, 0, 0);
+  gst_caps_unref (caps);
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (self, "Couldn't set pool config");
+    goto error;
+  }
+
+  if (!gst_buffer_pool_set_active (pool, TRUE)) {
+    GST_ERROR_OBJECT (self, "Couldn't activate pool");
+    goto error;
+  }
+
+  return pool;
+
+error:
+  gst_clear_object (&pool);
+
+  return nullptr;
+}
+
+static GstBufferPool *
+gst_dwrite_overlay_object_create_bitmap_pool (GstDWriteOverlayObject * self,
+    const GstVideoInfo * info)
+{
+  GstCaps *caps = nullptr;
+  GstStructure *config;
+  GstBufferPool *pool = nullptr;
+
+  caps = gst_video_info_to_caps (info);
+  if (!caps) {
+    GST_ERROR_OBJECT (self, "Couldn't create caps");
+    return nullptr;
+  }
+
+  pool = gst_dwrite_bitmap_pool_new ();
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_set_params (config, caps, info->size, 0, 0);
+  gst_caps_unref (caps);
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (self, "Couldn't set pool config");
+    goto error;
+  }
+
+  if (!gst_buffer_pool_set_active (pool, TRUE)) {
+    GST_ERROR_OBJECT (self, "Couldn't activate pool");
+    goto error;
+  }
+
+  return pool;
+
+error:
+  gst_clear_object (&pool);
+
+  return nullptr;
+}
+
+static gboolean
+gst_dwrite_overlay_object_prepare_resource (GstDWriteOverlayObject * self)
+{
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+
+  switch (priv->blend_mode) {
+    case GstDWriteBlendMode::ATTACH_TEXTURE:
+    case GstDWriteBlendMode::ATTACH_BITMAP:
+    case GstDWriteBlendMode::SW_BLEND:
+      /* Updated later */
+      break;
+    case GstDWriteBlendMode::BLEND:
+      priv->blend_conv = gst_dwrite_overlay_object_create_converter (self,
+          &priv->bgra_info, &priv->info, TRUE);
+      if (!priv->blend_conv)
+        return FALSE;
+      break;
+    case GstDWriteBlendMode::CONVERT:
+      priv->blend_pool = gst_dwrite_overlay_object_create_d3d11_pool (self,
+          &priv->bgra_info);
+      if (!priv->blend_pool)
+        return FALSE;
+
+      priv->pre_conv = gst_dwrite_overlay_object_create_converter (self,
+          &priv->info, &priv->bgra_info, FALSE);
+      if (!priv->pre_conv)
+        return FALSE;
+
+      priv->blend_conv = gst_dwrite_overlay_object_create_converter (self,
+          &priv->bgra_info, &priv->bgra_info, TRUE);
+      if (!priv->blend_conv)
+        return FALSE;
+
+      priv->post_conv = gst_dwrite_overlay_object_create_converter (self,
+          &priv->bgra_info, &priv->info, FALSE);
+      if (!priv->blend_conv)
+        return FALSE;
+      break;
+    case GstDWriteBlendMode::CONVERT_64:
+    {
+      GstVideoInfo blend_info;
+      gst_video_info_set_format (&blend_info, GST_VIDEO_FORMAT_RGBA64_LE,
+          priv->info.width, priv->info.height);
+
+      priv->blend_pool = gst_dwrite_overlay_object_create_d3d11_pool (self,
+          &blend_info);
+      if (!priv->blend_pool)
+        return FALSE;
+
+      priv->pre_conv = gst_dwrite_overlay_object_create_converter (self,
+          &priv->info, &blend_info, FALSE);
+      if (!priv->pre_conv)
+        return FALSE;
+
+      priv->blend_conv = gst_dwrite_overlay_object_create_converter (self,
+          &priv->bgra_info, &blend_info, TRUE);
+      if (!priv->pre_conv)
+        return FALSE;
+
+      priv->post_conv = gst_dwrite_overlay_object_create_converter (self,
+          &blend_info, &priv->info, FALSE);
+      if (!priv->post_conv)
+        return FALSE;
+
+      break;
+    }
+    default:
+      g_assert_not_reached ();
+      return FALSE;
+  }
+
+  if (priv->blend_conv) {
+    D3D11_BLEND_DESC desc = { 0, };
+    ComPtr < ID3D11BlendState > blend;
+    ID3D11Device *device = gst_d3d11_device_get_device_handle (priv->device);
+    HRESULT hr;
+
+    desc.AlphaToCoverageEnable = FALSE;
+    desc.IndependentBlendEnable = FALSE;
+    desc.RenderTarget0.BlendEnable = TRUE;
+    desc.RenderTarget0.SrcBlend = D3D11_BLEND_SRC_ALPHA;
+    desc.RenderTarget0.DestBlend = D3D11_BLEND_INV_SRC_ALPHA;
+    desc.RenderTarget0.BlendOp = D3D11_BLEND_OP_ADD;
+    desc.RenderTarget0.SrcBlendAlpha = D3D11_BLEND_ONE;
+    desc.RenderTarget0.DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA;
+    desc.RenderTarget0.BlendOpAlpha = D3D11_BLEND_OP_ADD;
+    desc.RenderTarget0.RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
+
+    hr = device->CreateBlendState (&desc, &blend);
+    if (!gst_d3d11_result (hr, priv->device)) {
+      GST_ERROR_OBJECT (self, "Couldn't create blend state");
+      return FALSE;
+    }
+
+    g_object_set (priv->blend_conv, "blend-state", blend.Get (), nullptr);
+  }
+
+  return TRUE;
+}
+
+static const gchar *
+gst_dwrite_overlay_mode_to_string (GstDWriteBlendMode mode)
+{
+  switch (mode) {
+    case GstDWriteBlendMode::NOT_SUPPORTED:
+      return "not-supported";
+    case GstDWriteBlendMode::ATTACH_TEXTURE:
+      return "attach-texture";
+    case GstDWriteBlendMode::ATTACH_BITMAP:
+      return "attach-bitmap";
+    case GstDWriteBlendMode::SW_BLEND:
+      return "sw-blend";
+    case GstDWriteBlendMode::BLEND:
+      return "blend";
+    case GstDWriteBlendMode::CONVERT:
+      return "convert";
+    case GstDWriteBlendMode::CONVERT_64:
+      return "convert-64";
+    default:
+      break;
+  }
+
+  return "unknown";
+}
+
+GstDWriteOverlayObject *
+gst_dwrite_overlay_object_new (void)
+{
+  GstDWriteOverlayObject *self;
+
+  self = (GstDWriteOverlayObject *)
+      g_object_new (GST_TYPE_DWRITE_OVERLAY_OBJECT, nullptr);
+  gst_object_ref_sink (self);
+
+  return self;
+}
+
+gboolean
+gst_dwrite_overlay_object_start (GstDWriteOverlayObject * object,
+    IDWriteFactory * dwrite_factory)
+{
+  GstDWriteOverlayObjectPrivate *priv = object->priv;
+  HRESULT hr;
+  ComPtr < ID2D1Factory > d2d_factory;
+
+  hr = D2D1CreateFactory (D2D1_FACTORY_TYPE_MULTI_THREADED,
+      IID_PPV_ARGS (&d2d_factory));
+  if (FAILED (hr)) {
+    GST_ERROR_OBJECT (object, "Couldn't create d2d factory");
+    return FALSE;
+  }
+
+  priv->d2d_factory = d2d_factory;
+  priv->dwrite_factory = dwrite_factory;
+  IGstDWriteTextRenderer::CreateInstance (dwrite_factory, &priv->renderer);
+
+  return TRUE;
+}
+
+gboolean
+gst_dwrite_overlay_object_stop (GstDWriteOverlayObject * object)
+{
+  GstDWriteOverlayObjectPrivate *priv = object->priv;
+
+  priv->ClearResource (true);
+  priv->dwrite_factory = nullptr;
+  priv->d2d_factory = nullptr;
+  priv->renderer = nullptr;
+  gst_clear_object (&priv->device);
+  gst_clear_caps (&priv->outcaps);
+
+  return TRUE;
+}
+
+void
+gst_dwrite_overlay_object_set_context (GstDWriteOverlayObject * object,
+    GstElement * elem, GstContext * context)
+{
+  GstDWriteOverlayObjectPrivate *priv = object->priv;
+  std::lock_guard < std::recursive_mutex > lk (priv->ctx_lock);
+
+  gst_d3d11_handle_set_context (elem, context, -1, &priv->device);
+}
+
+gboolean
+gst_dwrite_overlay_object_handle_query (GstDWriteOverlayObject * object,
+    GstElement * elem, GstQuery * query)
+{
+  GstDWriteOverlayObjectPrivate *priv = object->priv;
+
+  if (GST_QUERY_TYPE (query) != GST_QUERY_CONTEXT)
+    return FALSE;
+
+  std::lock_guard < std::recursive_mutex > lk (priv->ctx_lock);
+  if (gst_d3d11_handle_context_query (elem, query, priv->device))
+    return TRUE;
+
+  return FALSE;
+}
+
+gboolean
+gst_dwrite_overlay_object_decide_allocation (GstDWriteOverlayObject * object,
+    GstElement * elem, GstQuery * query)
+{
+  GstDWriteOverlayObjectPrivate *priv = object->priv;
+  guint min, max, size;
+  gboolean update_pool;
+  GstCaps *caps = nullptr;
+  GstVideoInfo info;
+  GstBufferPool *pool = nullptr;
+  GstCapsFeatures *features;
+  GstStructure *config;
+  GstD3D11AllocationParams *params;
+  guint bind_flags = 0;
+  GstD3D11Format d3d11_format;
+
+  GST_DEBUG_OBJECT (elem, "Decide allocation");
+
+  gst_query_parse_allocation (query, &caps, nullptr);
+  if (!caps) {
+    GST_WARNING_OBJECT (elem, "Query without caps");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_ERROR_OBJECT (elem, "Invalid caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+
+  features = gst_caps_get_features (caps, 0);
+  if (!features || !gst_caps_features_contains (features,
+          GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY)) {
+    GST_DEBUG_OBJECT (elem, "Not a d3d11 memory");
+    return TRUE;
+  }
+
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+    update_pool = TRUE;
+  } else {
+    min = max = 0;
+    size = info.size;
+  }
+
+  if (pool) {
+    std::lock_guard < std::recursive_mutex > lk (priv->ctx_lock);
+    if (!gst_d3d11_ensure_element_data (elem, -1, &priv->device)) {
+      GST_ERROR_OBJECT (elem, "Couldn't create deice");
+      return FALSE;
+    }
+
+    if (!GST_IS_D3D11_BUFFER_POOL (pool)) {
+      gst_clear_object (&pool);
+    } else {
+      GstD3D11BufferPool *dpool = GST_D3D11_BUFFER_POOL (pool);
+      if (dpool->device != priv->device)
+        gst_clear_object (&pool);
+    }
+  }
+
+  if (!pool)
+    pool = gst_d3d11_buffer_pool_new (priv->device);
+
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+  gst_buffer_pool_config_set_params (config, caps, size, min, max);
+
+  gst_d3d11_device_get_format (priv->device, GST_VIDEO_INFO_FORMAT (&info),
+      &d3d11_format);
+  if ((d3d11_format.format_support0 &
+          D3D11_FORMAT_SUPPORT_SHADER_SAMPLE) != 0) {
+    bind_flags |= D3D11_BIND_SHADER_RESOURCE;
+  }
+
+  if ((d3d11_format.format_support0 &
+          D3D11_FORMAT_SUPPORT_RENDER_TARGET) != 0) {
+    bind_flags |= D3D11_BIND_RENDER_TARGET;
+  }
+
+  params = gst_buffer_pool_config_get_d3d11_allocation_params (config);
+  if (!params) {
+    params = gst_d3d11_allocation_params_new (priv->device, &info,
+        GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags, 0);
+  } else {
+    gst_d3d11_allocation_params_set_bind_flags (params, bind_flags);
+  }
+
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_d3d11_allocation_params_free (params);
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (elem, "Couldn't set config");
+    gst_object_unref (pool);
+    return FALSE;
+  }
+
+  /* Get updated size in case of d3d11 */
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  if (update_pool)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+
+gboolean
+gst_dwrite_overlay_object_propose_allocation (GstDWriteOverlayObject * object,
+    GstElement * elem, GstQuery * query)
+{
+  GstCaps *caps = nullptr;
+  GstVideoInfo info;
+  GstCapsFeatures *features;
+  guint min, max, size;
+  GstBufferPool *pool;
+  GstD3D11BufferPool *dpool;
+  GstStructure *config;
+  GstD3D11AllocationParams *params;
+  guint bind_flags = 0;
+  GstD3D11Format d3d11_format;
+
+  GST_DEBUG_OBJECT (elem, "Propose allocation");
+
+  gst_query_parse_allocation (query, &caps, nullptr);
+  if (!caps) {
+    GST_WARNING_OBJECT (elem, "Query without caps");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_ERROR_OBJECT (elem, "Invalid caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+
+  features = gst_caps_get_features (caps, 0);
+  if (!features || !gst_caps_features_contains (features,
+          GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY)) {
+    GST_DEBUG_OBJECT (elem, "Not a d3d11 memory");
+    return TRUE;
+  }
+
+  if (gst_query_get_n_allocation_pools (query) == 0)
+    return TRUE;
+
+  gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+  if (!pool)
+    return TRUE;
+
+  if (!GST_IS_D3D11_BUFFER_POOL (pool)) {
+    gst_object_unref (pool);
+    return TRUE;
+  }
+
+  dpool = GST_D3D11_BUFFER_POOL (pool);
+  gst_d3d11_device_get_format (dpool->device, GST_VIDEO_INFO_FORMAT (&info),
+      &d3d11_format);
+  if ((d3d11_format.format_support0 &
+          D3D11_FORMAT_SUPPORT_SHADER_SAMPLE) != 0) {
+    bind_flags |= D3D11_BIND_SHADER_RESOURCE;
+  }
+
+  if ((d3d11_format.format_support0 &
+          D3D11_FORMAT_SUPPORT_RENDER_TARGET) != 0) {
+    bind_flags |= D3D11_BIND_RENDER_TARGET;
+  }
+
+  config = gst_buffer_pool_get_config (pool);
+  params = gst_buffer_pool_config_get_d3d11_allocation_params (config);
+  if (!params) {
+    params = gst_d3d11_allocation_params_new (dpool->device, &info,
+        GST_D3D11_ALLOCATION_FLAG_DEFAULT, bind_flags, 0);
+  } else {
+    gst_d3d11_allocation_params_set_bind_flags (params, bind_flags);
+  }
+
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_d3d11_allocation_params_free (params);
+
+  gst_buffer_pool_config_set_params (config, caps, size, min, max);
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_ERROR_OBJECT (elem, "Couldn't set config");
+    gst_object_unref (pool);
+    return FALSE;
+  }
+
+  gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+
+gboolean
+gst_dwrite_overlay_object_set_caps (GstDWriteOverlayObject * object,
+    GstElement * elem, GstCaps * in_caps, GstCaps * out_caps,
+    GstVideoInfo * info, GstDWriteBlendMode * selected_mode)
+{
+  GstDWriteOverlayObjectPrivate *priv = object->priv;
+  gboolean is_system;
+  GstCapsFeatures *features;
+
+  *selected_mode = GstDWriteBlendMode::NOT_SUPPORTED;
+
+  priv->ClearResource (true);
+  gst_caps_replace (&priv->outcaps, out_caps);
+
+  if (!gst_video_info_from_caps (info, in_caps)) {
+    GST_WARNING_OBJECT (elem, "Invalid caps %" GST_PTR_FORMAT, in_caps);
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&priv->info, out_caps)) {
+    GST_ERROR ("Invalid caps %" GST_PTR_FORMAT, out_caps);
+    return FALSE;
+  }
+
+  gst_video_info_set_format (&priv->bgra_info, GST_VIDEO_FORMAT_BGRA,
+      priv->info.width, priv->info.height);
+
+  features = gst_caps_get_features (out_caps, 0);
+  priv->is_d3d11 = gst_caps_features_contains (features,
+      GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY);
+  is_system = gst_caps_features_contains (features,
+      GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
+  priv->attach_meta = gst_caps_features_contains (features,
+      GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
+
+  if (priv->is_d3d11) {
+    std::lock_guard < std::recursive_mutex > lk (priv->ctx_lock);
+    if (!gst_d3d11_ensure_element_data (elem, -1, &priv->device)) {
+      GST_ERROR_OBJECT (elem, "Couldn't create deice");
+      return FALSE;
+    }
+  }
+
+  if (!priv->is_d3d11 && !is_system && !priv->attach_meta) {
+    GST_WARNING_OBJECT (elem,
+        "Not d3d11/system memory without composition meta support");
+    return TRUE;
+  }
+
+  gst_dwrite_overlay_object_decide_blend_mode (object);
+  GST_INFO_OBJECT (elem, "Selected blend mode: %s",
+      gst_dwrite_overlay_mode_to_string (priv->blend_mode));
+
+  if (priv->blend_mode == GstDWriteBlendMode::SW_BLEND ||
+      priv->blend_mode == GstDWriteBlendMode::ATTACH_BITMAP) {
+    priv->use_bitmap = TRUE;
+  } else {
+    priv->use_bitmap = FALSE;
+  }
+
+  if (!gst_dwrite_overlay_object_prepare_resource (object)) {
+    GST_ERROR_OBJECT (elem, "Couldn't prepare resource");
+    priv->ClearResource (true);
+    return FALSE;
+  }
+
+  *selected_mode = priv->blend_mode;
+  return TRUE;
+}
+
+gboolean
+gst_dwrite_overlay_object_update_device (GstDWriteOverlayObject * object,
+    GstBuffer * buffer)
+{
+  GstDWriteOverlayObjectPrivate *priv = object->priv;
+  GstMemory *mem;
+  GstD3D11Memory *dmem;
+
+  if (priv->blend_mode == GstDWriteBlendMode::NOT_SUPPORTED || priv->use_bitmap)
+    return FALSE;
+
+  mem = gst_buffer_peek_memory (buffer, 0);
+  if (!gst_is_d3d11_memory (mem))
+    return FALSE;
+
+  dmem = GST_D3D11_MEMORY_CAST (mem);
+  std::lock_guard < std::recursive_mutex > lk (priv->ctx_lock);
+  if (dmem->device == priv->device)
+    return FALSE;
+
+  GST_DEBUG_OBJECT (object, "Updating device");
+  gst_clear_object (&priv->device);
+  priv->device = (GstD3D11Device *) gst_object_ref (dmem->device);
+  priv->ClearResource (false);
+  gst_dwrite_overlay_object_prepare_resource (object);
+
+  return TRUE;
+}
+
+static gboolean
+gst_dwrite_overlay_object_upload_system (GstDWriteOverlayObject * self,
+    GstBuffer * dst, GstBuffer * src)
+{
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+  GstVideoFrame in_frame, out_frame;
+  gboolean ret;
+
+  GST_TRACE_OBJECT (self, "system copy");
+
+  if (!gst_video_frame_map (&in_frame, &priv->info, src,
+          (GstMapFlags) (GST_MAP_READ | GST_VIDEO_FRAME_MAP_FLAG_NO_REF))) {
+    GST_ERROR_OBJECT (self, "Couldn't map input frame");
+    return FALSE;
+  }
+
+  if (!gst_video_frame_map (&out_frame, &priv->info, dst,
+          (GstMapFlags) (GST_MAP_WRITE | GST_VIDEO_FRAME_MAP_FLAG_NO_REF))) {
+    gst_video_frame_unmap (&in_frame);
+    GST_ERROR_OBJECT (self, "Couldn't map output frame");
+    return FALSE;
+  }
+
+  ret = gst_video_frame_copy (&out_frame, &in_frame);
+
+  gst_video_frame_unmap (&in_frame);
+  gst_video_frame_unmap (&out_frame);
+
+  return ret;
+}
+
+static gboolean
+gst_dwrite_overlay_object_upload_d3d11 (GstDWriteOverlayObject * self,
+    GstBuffer * dst, GstBuffer * src)
+{
+  GST_TRACE_OBJECT (self, "d3d11 copy");
+
+  for (guint i = 0; i < gst_buffer_n_memory (dst); i++) {
+    GstMemory *dst_mem, *src_mem;
+    GstD3D11Memory *dst_dmem, *src_dmem;
+    GstMapInfo dst_info;
+    GstMapInfo src_info;
+    ID3D11Resource *dst_texture, *src_texture;
+    ID3D11DeviceContext *device_context;
+    GstD3D11Device *device;
+    D3D11_BOX src_box = { 0, };
+    D3D11_TEXTURE2D_DESC dst_desc, src_desc;
+    guint dst_subidx, src_subidx;
+
+    dst_mem = gst_buffer_peek_memory (dst, i);
+    src_mem = gst_buffer_peek_memory (src, i);
+
+    dst_dmem = (GstD3D11Memory *) dst_mem;
+    src_dmem = (GstD3D11Memory *) src_mem;
+
+    device = dst_dmem->device;
+
+    gst_d3d11_memory_get_texture_desc (dst_dmem, &dst_desc);
+    gst_d3d11_memory_get_texture_desc (src_dmem, &src_desc);
+
+    device_context = gst_d3d11_device_get_device_context_handle (device);
+
+    if (!gst_memory_map (dst_mem, &dst_info,
+            (GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D11))) {
+      GST_ERROR_OBJECT (self, "Cannot map dst d3d11 memory");
+      return FALSE;
+    }
+
+    if (!gst_memory_map (src_mem, &src_info,
+            (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D11))) {
+      GST_ERROR_OBJECT (self, "Cannot map src d3d11 memory");
+      gst_memory_unmap (dst_mem, &dst_info);
+      return FALSE;
+    }
+
+    dst_texture = (ID3D11Resource *) dst_info.data;
+    src_texture = (ID3D11Resource *) src_info.data;
+
+    /* src/dst texture size might be different if padding was used.
+     * select smaller size */
+    src_box.left = 0;
+    src_box.top = 0;
+    src_box.front = 0;
+    src_box.back = 1;
+    src_box.right = MIN (src_desc.Width, dst_desc.Width);
+    src_box.bottom = MIN (src_desc.Height, dst_desc.Height);
+
+    dst_subidx = gst_d3d11_memory_get_subresource_index (dst_dmem);
+    src_subidx = gst_d3d11_memory_get_subresource_index (src_dmem);
+
+    GstD3D11DeviceLockGuard lk (device);
+    device_context->CopySubresourceRegion (dst_texture, dst_subidx, 0, 0, 0,
+        src_texture, src_subidx, &src_box);
+
+    gst_memory_unmap (src_mem, &src_info);
+    gst_memory_unmap (dst_mem, &dst_info);
+  }
+
+  return TRUE;
+}
+
+GstFlowReturn
+gst_dwrite_overlay_object_prepare_output (GstDWriteOverlayObject * object,
+    GstBaseTransform * trans, gpointer trans_class, GstBuffer * inbuf,
+    GstBuffer ** outbuf)
+{
+  GstDWriteOverlayObjectPrivate *priv = object->priv;
+  GstMemory *mem = gst_buffer_peek_memory (inbuf, 0);
+  GstFlowReturn ret;
+  gboolean is_d3d11 = FALSE;
+  gboolean upload_ret;
+
+  /* attaching meta or software blending can be in-place processing */
+  switch (priv->blend_mode) {
+    case GstDWriteBlendMode::ATTACH_TEXTURE:
+    case GstDWriteBlendMode::ATTACH_BITMAP:
+    case GstDWriteBlendMode::SW_BLEND:
+      goto inplace;
+    default:
+      break;
+  }
+
+  if (gst_is_d3d11_memory (mem)) {
+    D3D11_TEXTURE2D_DESC desc;
+    GstD3D11Memory *dmem;
+    const guint bind_flags = (D3D11_BIND_RENDER_TARGET |
+        D3D11_BIND_SHADER_RESOURCE);
+
+    is_d3d11 = TRUE;
+
+    dmem = GST_D3D11_MEMORY_CAST (mem);
+    gst_d3d11_memory_get_texture_desc (dmem, &desc);
+
+    /* Cannot write on decoder resource */
+    if ((desc.BindFlags & D3D11_BIND_DECODER) == 0 &&
+        (desc.BindFlags & bind_flags) == bind_flags) {
+      goto inplace;
+    }
+  }
+
+  /* Needs to allocate new buffer */
+  ret = GST_BASE_TRANSFORM_CLASS (trans_class)->prepare_output_buffer (trans,
+      inbuf, outbuf);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  if (is_d3d11) {
+    upload_ret = gst_dwrite_overlay_object_upload_d3d11 (object,
+        *outbuf, inbuf);
+  } else {
+    upload_ret = gst_dwrite_overlay_object_upload_system (object,
+        *outbuf, inbuf);
+  }
+
+  if (!upload_ret) {
+    gst_clear_buffer (outbuf);
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+
+inplace:
+  if (gst_buffer_is_writable (inbuf))
+    *outbuf = inbuf;
+  else
+    *outbuf = gst_buffer_copy (inbuf);
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_dwrite_overlay_object_get_target_from_d3d11 (GstDWriteOverlayObject * self,
+    GstMemory * mem, ID2D1RenderTarget ** target)
+{
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+  ComPtr < IDXGISurface > surface;
+  GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
+  ID3D11Resource *texture;
+  HRESULT hr;
+  static const D2D1_RENDER_TARGET_PROPERTIES props = {
+    D2D1_RENDER_TARGET_TYPE_DEFAULT, DXGI_FORMAT_B8G8R8A8_UNORM,
+    D2D1_ALPHA_MODE_PREMULTIPLIED, 0, 0, D2D1_RENDER_TARGET_USAGE_NONE,
+    D2D1_FEATURE_LEVEL_DEFAULT
+  };
+
+  texture = gst_d3d11_memory_get_resource_handle (dmem);
+  hr = texture->QueryInterface (IID_PPV_ARGS (&surface));
+  if (!gst_d3d11_result (hr, priv->device))
+    return FALSE;
+
+  hr = priv->d2d_factory->CreateDxgiSurfaceRenderTarget (surface.Get (), props,
+      target);
+
+  return gst_d3d11_result (hr, priv->device);
+}
+
+static gboolean
+gst_dwrite_overlay_object_get_target_from_bitmap (GstDWriteOverlayObject * self,
+    GstMemory * mem, ID2D1RenderTarget ** target)
+{
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+  GstDWriteBitmapMemory *dmem = (GstDWriteBitmapMemory *) mem;
+  HRESULT hr;
+  static const D2D1_RENDER_TARGET_PROPERTIES props = {
+    D2D1_RENDER_TARGET_TYPE_DEFAULT, DXGI_FORMAT_B8G8R8A8_UNORM,
+    D2D1_ALPHA_MODE_PREMULTIPLIED, 0, 0, D2D1_RENDER_TARGET_USAGE_NONE,
+    D2D1_FEATURE_LEVEL_DEFAULT
+  };
+
+  hr = priv->d2d_factory->CreateWicBitmapRenderTarget (dmem->bitmap, &props,
+      target);
+
+  return SUCCEEDED (hr);
+}
+
+static gboolean
+gst_dwrite_overlay_object_draw_layout (GstDWriteOverlayObject * self,
+    IDWriteTextLayout * layout, gint x, gint y)
+{
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+  gint width, height;
+  GstMemory *mem;
+  ComPtr < ID2D1RenderTarget > target;
+  GstMapInfo info;
+
+  if (priv->layout_buf) {
+    if (priv->layout && priv->layout.Get () == layout)
+      return TRUE;
+
+    gst_clear_buffer (&priv->layout_buf);
+    g_clear_pointer (&priv->overlay_rect, gst_video_overlay_rectangle_unref);
+  }
+
+  priv->layout = nullptr;
+  priv->layout = layout;
+
+  if (priv->layout_buf)
+    return TRUE;
+
+  width = (gint) layout->GetMaxWidth ();
+  height = (gint) layout->GetMaxHeight ();
+
+  if (priv->layout_pool &&
+      (priv->layout_info.width != width
+          || priv->layout_info.height != height)) {
+    gst_buffer_pool_set_active (priv->layout_pool, FALSE);
+    gst_clear_object (&priv->layout_pool);
+  }
+
+  if (!priv->layout_pool) {
+    gst_video_info_set_format (&priv->layout_info, GST_VIDEO_FORMAT_BGRA,
+        width, height);
+    if (priv->use_bitmap) {
+      priv->layout_pool = gst_dwrite_overlay_object_create_bitmap_pool (self,
+          &priv->layout_info);
+    } else {
+      priv->layout_pool = gst_dwrite_overlay_object_create_d3d11_pool (self,
+          &priv->layout_info);
+    }
+  }
+
+  if (!priv->layout_pool)
+    return FALSE;
+
+  gst_buffer_pool_acquire_buffer (priv->layout_pool,
+      &priv->layout_buf, nullptr);
+  if (!priv->layout_buf) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire layout buffer");
+    return FALSE;
+  }
+
+  mem = gst_buffer_peek_memory (priv->layout_buf, 0);
+  if (priv->use_bitmap) {
+    if (!gst_dwrite_overlay_object_get_target_from_bitmap (self, mem, &target)) {
+      GST_ERROR_OBJECT (self, "Couldn't get target from bitmap");
+      gst_clear_buffer (&priv->layout_buf);
+      return FALSE;
+    }
+  } else {
+    if (!gst_memory_map (mem, &info,
+            (GstMapFlags) (GST_MAP_WRITE | GST_MAP_D3D11))) {
+      GST_ERROR_OBJECT (self, "Could not map buffer");
+      gst_clear_buffer (&priv->layout_buf);
+      return FALSE;
+    }
+
+    if (!gst_dwrite_overlay_object_get_target_from_d3d11 (self, mem, &target)) {
+      GST_ERROR_OBJECT (self, "Couldn't get target from texture");
+      gst_memory_unmap (mem, &info);
+      gst_clear_buffer (&priv->layout_buf);
+      return FALSE;
+    }
+  }
+
+  target->BeginDraw ();
+  target->Clear (D2D1::ColorF (D2D1::ColorF::Black, 0.0));
+  priv->renderer->Draw (D2D1::Point2F (),
+      D2D1::Rect (0, 0, width, height), layout, target.Get ());
+  target->EndDraw ();
+
+  /* Release render target before unmapping. Otherwise pending GPU operations
+   * can be executed after releasing keyed-mutex, if texture was allocated with
+   * keyed-mutex enabled */
+  target = nullptr;
+
+  if (!priv->use_bitmap)
+    gst_memory_unmap (mem, &info);
+
+  priv->overlay_rect = gst_video_overlay_rectangle_new_raw (priv->layout_buf,
+      x, y, width, height, GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA);
+
+  return TRUE;
+}
+
+static gboolean
+gst_dwrite_overlay_object_mode_attach (GstDWriteOverlayObject * self,
+    GstBuffer * buffer)
+{
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+  GstVideoOverlayCompositionMeta *meta;
+
+  meta = gst_buffer_get_video_overlay_composition_meta (buffer);
+  if (meta) {
+    if (meta->overlay) {
+      meta->overlay =
+          gst_video_overlay_composition_make_writable (meta->overlay);
+      gst_video_overlay_composition_add_rectangle (meta->overlay,
+          priv->overlay_rect);
+    } else {
+      meta->overlay = gst_video_overlay_composition_new (priv->overlay_rect);
+    }
+  } else {
+    GstVideoOverlayComposition *comp =
+        gst_video_overlay_composition_new (priv->overlay_rect);
+    meta = gst_buffer_add_video_overlay_composition_meta (buffer, comp);
+    gst_video_overlay_composition_unref (comp);
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_dwrite_overlay_mode_sw_blend (GstDWriteOverlayObject * self,
+    GstBuffer * buffer, gint x, gint y)
+{
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+  GstVideoFrame dst_frame, src_frame;
+  gboolean ret;
+
+  if (!gst_video_frame_map (&dst_frame, &priv->info, buffer,
+          (GstMapFlags) (GST_MAP_WRITE | GST_VIDEO_FRAME_MAP_FLAG_NO_REF))) {
+    GST_ERROR_OBJECT (self, "Couldn't map input buffer");
+    return FALSE;
+  }
+
+  if (!gst_video_frame_map (&src_frame, &priv->layout_info, priv->layout_buf,
+          (GstMapFlags) (GST_MAP_READ | GST_VIDEO_FRAME_MAP_FLAG_NO_REF))) {
+    gst_video_frame_unmap (&dst_frame);
+    GST_ERROR_OBJECT (self, "Couldn't map text buffer");
+    return FALSE;
+  }
+
+  src_frame.info.flags = (GstVideoFlags)
+      (src_frame.info.flags | GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA);
+  ret = gst_video_blend (&dst_frame, &src_frame, x, y, 1.0);
+  gst_video_frame_unmap (&src_frame);
+  gst_video_frame_unmap (&dst_frame);
+
+  return ret;
+}
+
+static gboolean
+gst_dwrite_overlay_mode_blend (GstDWriteOverlayObject * self,
+    GstBuffer * buffer, gint x, gint y)
+{
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+
+  g_object_set (priv->blend_conv, "src-width", priv->layout_info.width,
+      "src-height", priv->layout_info.height,
+      "dest-x", x, "dest-y", y, "dest-width", priv->layout_info.width,
+      "dest-height", priv->layout_info.height, nullptr);
+
+  return gst_d3d11_converter_convert_buffer (priv->blend_conv,
+      priv->layout_buf, buffer);
+}
+
+static gboolean
+gst_dwrite_overlay_mode_convert (GstDWriteOverlayObject * self,
+    GstBuffer * buffer, gint x, gint y)
+{
+  GstDWriteOverlayObjectPrivate *priv = self->priv;
+  GstBuffer *pre_buf = nullptr;
+
+  g_object_set (priv->blend_conv, "src-width", priv->layout_info.width,
+      "src-height", priv->layout_info.height,
+      "dest-x", x, "dest-y", y, "dest-width", priv->layout_info.width,
+      "dest-height", priv->layout_info.height, nullptr);
+
+  gst_buffer_pool_acquire_buffer (priv->blend_pool, &pre_buf, nullptr);
+  if (!pre_buf) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire preconv buffer");
+    return FALSE;
+  }
+
+  if (!gst_d3d11_converter_convert_buffer_unlocked (priv->pre_conv,
+          buffer, pre_buf)) {
+    GST_ERROR_OBJECT (self, "pre-convert failed");
+    goto error;
+  }
+
+  if (!gst_d3d11_converter_convert_buffer_unlocked (priv->blend_conv,
+          priv->layout_buf, pre_buf)) {
+    GST_ERROR_OBJECT (self, "blend-convert failed");
+    goto error;
+  }
+
+  if (!gst_d3d11_converter_convert_buffer_unlocked (priv->post_conv,
+          pre_buf, buffer)) {
+    GST_ERROR_OBJECT (self, "post-convert failed");
+    goto error;
+  }
+
+  gst_buffer_unref (pre_buf);
+
+  return TRUE;
+
+error:
+  gst_clear_buffer (&pre_buf);
+  return FALSE;
+}
+
+gboolean
+gst_dwrite_overlay_object_draw (GstDWriteOverlayObject * object,
+    GstBuffer * buffer, IDWriteTextLayout * layout, gint x, gint y)
+{
+  GstDWriteOverlayObjectPrivate *priv = object->priv;
+  gboolean ret = FALSE;
+
+  if (priv->device)
+    gst_d3d11_device_lock (priv->device);
+
+  if (!gst_dwrite_overlay_object_draw_layout (object, layout, x, y))
+    goto out;
+
+  switch (priv->blend_mode) {
+    case GstDWriteBlendMode::ATTACH_TEXTURE:
+    case GstDWriteBlendMode::ATTACH_BITMAP:
+      ret = gst_dwrite_overlay_object_mode_attach (object, buffer);
+      break;
+    case GstDWriteBlendMode::SW_BLEND:
+      ret = gst_dwrite_overlay_mode_sw_blend (object, buffer, x, y);
+      break;
+    case GstDWriteBlendMode::BLEND:
+      ret = gst_dwrite_overlay_mode_blend (object, buffer, x, y);
+      break;
+    case GstDWriteBlendMode::CONVERT:
+    case GstDWriteBlendMode::CONVERT_64:
+      ret = gst_dwrite_overlay_mode_convert (object, buffer, x, y);
+      break;
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+out:
+  if (priv->device)
+    gst_d3d11_device_unlock (priv->device);
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwriteoverlayobject.h Added

@@ -0,0 +1,109 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/d3d11/gstd3d11.h>
+#include <gst/video/video.h>
+#include <gst/base/base.h>
+#include "gstdwrite-utils.h"
+#include "gstdwrite-enums.h"
+
+G_BEGIN_DECLS
+
+enum class GstDWriteBlendMode
+{
+  NOT_SUPPORTED,
+
+  /* attach meta with d3d11 texture buffer. */
+  ATTACH_TEXTURE,
+
+  /* attach meta with bitmap buffer */
+  ATTACH_BITMAP,
+
+  /* software blending */
+  SW_BLEND,
+
+  /* 1) renders text on BGRA
+   * 2) blends */
+  BLEND,
+
+  /* 1) convert texture to BGRA
+   * 2) render text on another BGRA texture
+   * 3) blends two textures
+   * 3) converts back to original format */
+  CONVERT,
+
+  /* 1) converts texture to RGBA64_LE
+   * 2) renders text on BGRA texture
+   * 3) blends two textures
+   * 3) converts back original format */
+  CONVERT_64,
+};
+
+#define GST_TYPE_DWRITE_OVERLAY_OBJECT (gst_dwrite_overlay_object_get_type())
+G_DECLARE_FINAL_TYPE (GstDWriteOverlayObject,
+    gst_dwrite_overlay_object, GST, DWRITE_OVERLAY_OBJECT, GstObject);
+
+GstDWriteOverlayObject * gst_dwrite_overlay_object_new (void);
+
+gboolean  gst_dwrite_overlay_object_start (GstDWriteOverlayObject * object,
+                                           IDWriteFactory * dwrite_factory);
+
+gboolean  gst_dwrite_overlay_object_stop  (GstDWriteOverlayObject * object);
+
+void      gst_dwrite_overlay_object_set_context (GstDWriteOverlayObject * object,
+                                                 GstElement * elem,
+                                                 GstContext * context);
+
+gboolean  gst_dwrite_overlay_object_handle_query (GstDWriteOverlayObject * object,
+                                                  GstElement * elem,
+                                                  GstQuery * query);
+
+gboolean  gst_dwrite_overlay_object_decide_allocation (GstDWriteOverlayObject * object,
+                                                       GstElement * elem,
+                                                       GstQuery * query);
+
+gboolean  gst_dwrite_overlay_object_propose_allocation (GstDWriteOverlayObject * object,
+                                                        GstElement * elem,
+                                                        GstQuery * query);
+
+gboolean  gst_dwrite_overlay_object_set_caps (GstDWriteOverlayObject * object,
+                                              GstElement * elem,
+                                              GstCaps * in_caps,
+                                              GstCaps * out_caps,
+                                              GstVideoInfo * info,
+                                              GstDWriteBlendMode * selected_mode);
+
+gboolean  gst_dwrite_overlay_object_update_device (GstDWriteOverlayObject * object,
+                                                   GstBuffer * buffer);
+
+GstFlowReturn gst_dwrite_overlay_object_prepare_output (GstDWriteOverlayObject * object,
+                                                        GstBaseTransform * trans,
+                                                        gpointer trans_class,
+                                                        GstBuffer * inbuf,
+                                                        GstBuffer ** outbuf);
+
+gboolean  gst_dwrite_overlay_object_draw (GstDWriteOverlayObject * object,
+                                          GstBuffer * buffer,
+                                          IDWriteTextLayout * layout,
+                                          gint x,
+                                          gint y);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritesubtitlemux.cpp Added

@@ -0,0 +1,746 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/video/video.h>
+#include "gstdwritesubtitlemux.h"
+#include "gstdwrite-utils.h"
+
+GST_DEBUG_CATEGORY_STATIC (dwrite_subtitle_mux_debug);
+#define GST_CAT_DEFAULT dwrite_subtitle_mux_debug
+
+static GstStaticPadTemplate video_templ = GST_STATIC_PAD_TEMPLATE ("video",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-raw(ANY)"));
+
+static GstStaticPadTemplate text_templ = GST_STATIC_PAD_TEMPLATE ("text_%u",
+    GST_PAD_SINK,
+    GST_PAD_REQUEST,
+    GST_STATIC_CAPS ("text/x-raw"));
+
+static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-raw(ANY)")
+    );
+
+enum
+{
+  PROP_PAD_0,
+  PROP_PAD_ACTIVE,
+};
+
+struct _GstDWriteSubtitleMuxPad
+{
+  GstAggregatorPad parent;
+
+  GMutex lock;
+
+  gchar *stream_id;
+  GstBuffer *buffer;
+  GstStream *stream;
+  GstStream *pending_stream;
+
+  GstClockTime start_time;
+  GstClockTime end_time;
+  gboolean active;
+};
+
+static void gst_dwrite_subtitle_mux_pad_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_dwrite_subtitle_mux_pad_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+static void gst_dwrite_subtitle_mux_pad_dispose (GObject * object);
+static void gst_dwrite_subtitle_mux_pad_finalize (GObject * object);
+static GstFlowReturn
+gst_dwrite_subtitle_mux_pad_flush (GstAggregatorPad * aggpad,
+    GstAggregator * agg);
+
+#define gst_dwrite_subtitle_mux_pad_parent_class pad_parent_class
+G_DEFINE_TYPE (GstDWriteSubtitleMuxPad, gst_dwrite_subtitle_mux_pad,
+    GST_TYPE_AGGREGATOR_PAD);
+
+static void
+gst_dwrite_subtitle_mux_pad_class_init (GstDWriteSubtitleMuxPadClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstAggregatorPadClass *pad_class = GST_AGGREGATOR_PAD_CLASS (klass);
+
+  object_class->dispose = gst_dwrite_subtitle_mux_pad_dispose;
+  object_class->finalize = gst_dwrite_subtitle_mux_pad_finalize;
+  object_class->set_property = gst_dwrite_subtitle_mux_pad_set_property;
+  object_class->get_property = gst_dwrite_subtitle_mux_pad_get_property;
+
+  g_object_class_install_property (object_class,
+      PROP_PAD_ACTIVE, g_param_spec_boolean ("active", "Active",
+          "Active state of the pad. If FALSE, subtitle from this pad will be"
+          "be ignored", TRUE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  pad_class->flush = GST_DEBUG_FUNCPTR (gst_dwrite_subtitle_mux_pad_flush);
+}
+
+static void
+gst_dwrite_subtitle_mux_pad_init (GstDWriteSubtitleMuxPad * self)
+{
+  self->start_time = GST_CLOCK_TIME_NONE;
+  self->end_time = GST_CLOCK_TIME_NONE;
+  self->active = TRUE;
+
+  g_mutex_init (&self->lock);
+}
+
+static void
+gst_dwrite_subtitle_mux_pad_dispose (GObject * object)
+{
+  GstDWriteSubtitleMuxPad *self = GST_DWRITE_SUBTITLE_MUX_PAD (object);
+
+  gst_clear_buffer (&self->buffer);
+  gst_clear_object (&self->stream);
+  gst_clear_object (&self->pending_stream);
+
+  G_OBJECT_CLASS (pad_parent_class)->dispose (object);
+}
+
+static void
+gst_dwrite_subtitle_mux_pad_finalize (GObject * object)
+{
+  GstDWriteSubtitleMuxPad *self = GST_DWRITE_SUBTITLE_MUX_PAD (object);
+
+  g_free (self->stream_id);
+  g_mutex_clear (&self->lock);
+
+  G_OBJECT_CLASS (pad_parent_class)->finalize (object);
+}
+
+static void
+gst_dwrite_subtitle_mux_pad_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstDWriteSubtitleMuxPad *self = GST_DWRITE_SUBTITLE_MUX_PAD (object);
+
+  g_mutex_lock (&self->lock);
+  switch (prop_id) {
+    case PROP_PAD_ACTIVE:
+      self->active = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+  g_mutex_unlock (&self->lock);
+}
+
+static void
+gst_dwrite_subtitle_mux_pad_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstDWriteSubtitleMuxPad *self = GST_DWRITE_SUBTITLE_MUX_PAD (object);
+
+  g_mutex_lock (&self->lock);
+  switch (prop_id) {
+    case PROP_PAD_ACTIVE:
+      g_value_set_boolean (value, self->active);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+  g_mutex_unlock (&self->lock);
+}
+
+static GstFlowReturn
+gst_dwrite_subtitle_mux_pad_flush (GstAggregatorPad * aggpad,
+    GstAggregator * agg)
+{
+  GstDWriteSubtitleMuxPad *self = GST_DWRITE_SUBTITLE_MUX_PAD (aggpad);
+
+  gst_clear_buffer (&self->buffer);
+  self->start_time = GST_CLOCK_TIME_NONE;
+  self->end_time = GST_CLOCK_TIME_NONE;
+
+  return GST_FLOW_OK;
+}
+
+struct _GstDWriteSubtitleMux
+{
+  GstAggregator parent;
+
+  GstDWriteSubtitleMuxPad *video_pad;
+};
+
+static GstPad *gst_dwrite_subtitle_mux_request_new_pad (GstElement * elem,
+    GstPadTemplate * templ, const gchar * name, const GstCaps * caps);
+static gboolean gst_dwrite_subtitle_mux_sink_query (GstAggregator * agg,
+    GstAggregatorPad * pad, GstQuery * query);
+static gboolean gst_dwrite_subtitle_mux_src_query (GstAggregator * agg,
+    GstQuery * query);
+static gboolean gst_dwrite_subtitle_mux_sink_event (GstAggregator * agg,
+    GstAggregatorPad * pad, GstEvent * event);
+static GstFlowReturn gst_dwrite_subtitle_mux_aggregate (GstAggregator * agg,
+    gboolean timeout);
+
+#define gst_dwrite_subtitle_mux_parent_class parent_class
+G_DEFINE_TYPE (GstDWriteSubtitleMux, gst_dwrite_subtitle_mux,
+    GST_TYPE_AGGREGATOR);
+
+static void
+gst_dwrite_subtitle_mux_class_init (GstDWriteSubtitleMuxClass * klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstAggregatorClass *agg_class = GST_AGGREGATOR_CLASS (klass);
+
+  element_class->request_new_pad =
+      GST_DEBUG_FUNCPTR (gst_dwrite_subtitle_mux_request_new_pad);
+
+  gst_element_class_set_static_metadata (element_class,
+      "DirectWrite Subtitle Mux", "Generic",
+      "Attach subtitle metas on video buffers",
+      "Seungha Yang <seungha@centricular.com>");
+
+  gst_element_class_add_static_pad_template_with_gtype (element_class,
+      &video_templ, GST_TYPE_DWRITE_SUBTITLE_MUX_PAD);
+  gst_element_class_add_static_pad_template_with_gtype (element_class,
+      &text_templ, GST_TYPE_DWRITE_SUBTITLE_MUX_PAD);
+  gst_element_class_add_static_pad_template_with_gtype (element_class,
+      &src_templ, GST_TYPE_AGGREGATOR_PAD);
+
+  agg_class->sink_query =
+      GST_DEBUG_FUNCPTR (gst_dwrite_subtitle_mux_sink_query);
+  agg_class->src_query = GST_DEBUG_FUNCPTR (gst_dwrite_subtitle_mux_src_query);
+  agg_class->sink_event =
+      GST_DEBUG_FUNCPTR (gst_dwrite_subtitle_mux_sink_event);
+  agg_class->aggregate = GST_DEBUG_FUNCPTR (gst_dwrite_subtitle_mux_aggregate);
+  agg_class->get_next_time =
+      GST_DEBUG_FUNCPTR (gst_aggregator_simple_get_next_time);
+  agg_class->negotiate = NULL;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_DWRITE_SUBTITLE_MUX_PAD,
+      (GstPluginAPIFlags) 0);
+
+  GST_DEBUG_CATEGORY_INIT (dwrite_subtitle_mux_debug,
+      "dwritesubtitlemux", 0, "dwritesubtitlemux");
+}
+
+static void
+gst_dwrite_subtitle_mux_init (GstDWriteSubtitleMux * self)
+{
+  GstElement *elem = GST_ELEMENT_CAST (self);
+  GstElementClass *klass = GST_ELEMENT_GET_CLASS (elem);
+  GstAggregator *agg = GST_AGGREGATOR_CAST (self);
+  GstPadTemplate *templ;
+  GstPad *video_pad;
+
+  templ = gst_element_class_get_pad_template (klass, "video");
+  video_pad = gst_pad_new_from_template (templ, "video");
+
+  gst_element_add_pad (elem, video_pad);
+  self->video_pad = GST_DWRITE_SUBTITLE_MUX_PAD (video_pad);
+
+  gst_aggregator_set_force_live (agg, TRUE);
+}
+
+static GstPad *
+gst_dwrite_subtitle_mux_request_new_pad (GstElement * elem,
+    GstPadTemplate * templ, const gchar * name, const GstCaps * caps)
+{
+  GstPad *pad;
+
+  pad = GST_ELEMENT_CLASS (parent_class)->request_new_pad (elem,
+      templ, name, caps);
+
+  if (!pad)
+    return NULL;
+
+  GST_PAD_SET_ACCEPT_INTERSECT (pad);
+  GST_PAD_SET_ACCEPT_TEMPLATE (pad);
+
+  return pad;
+}
+
+static gboolean
+gst_dwrite_subtitle_mux_sink_query (GstAggregator * agg, GstAggregatorPad * pad,
+    GstQuery * query)
+{
+  GstDWriteSubtitleMux *self = GST_DWRITE_SUBTITLE_MUX (agg);
+  GstDWriteSubtitleMuxPad *spad = GST_DWRITE_SUBTITLE_MUX_PAD (pad);
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_ALLOCATION:
+      if (spad == self->video_pad) {
+        guint i = 0;
+        guint n_allocation;
+        guint down_min = 0;
+
+        if (!gst_pad_peer_query (agg->srcpad, query))
+          return FALSE;
+
+        /* We need one more video buffer. Update pool size */
+        n_allocation = gst_query_get_n_allocation_pools (query);
+
+        while (i < n_allocation) {
+          GstBufferPool *pool = NULL;
+          guint size, min, max;
+
+          gst_query_parse_nth_allocation_pool (query,
+              i, &pool, &size, &min, &max);
+
+          if (min == max) {
+            if (pool)
+              gst_object_unref (pool);
+            gst_query_remove_nth_allocation_pool (query, i);
+            n_allocation--;
+            down_min = MAX (min, down_min);
+            continue;
+          }
+
+          gst_query_set_nth_allocation_pool (query,
+              i, pool, size, min + 1, max);
+          if (pool)
+            gst_object_unref (pool);
+          i++;
+        }
+
+        if (n_allocation == 0) {
+          GstCaps *caps;
+          GstVideoInfo info;
+
+          gst_query_parse_allocation (query, &caps, NULL);
+          gst_video_info_from_caps (&info, caps);
+
+          gst_query_add_allocation_pool (query,
+              NULL, info.size, down_min + 1, 0);
+        }
+
+        return TRUE;
+      }
+      return FALSE;
+    case GST_QUERY_CAPS:
+    case GST_QUERY_ACCEPT_CAPS:
+      if (spad == self->video_pad)
+        return gst_pad_peer_query (agg->srcpad, query);
+      break;
+    default:
+      break;
+  }
+
+  return GST_AGGREGATOR_CLASS (parent_class)->sink_query (agg, pad, query);
+}
+
+static gboolean
+gst_dwrite_subtitle_mux_src_query (GstAggregator * agg, GstQuery * query)
+{
+  GstDWriteSubtitleMux *self = GST_DWRITE_SUBTITLE_MUX (agg);
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CAPS:
+      return gst_pad_peer_query (GST_PAD_CAST (self->video_pad), query);
+    default:
+      break;
+  }
+
+  return GST_AGGREGATOR_CLASS (parent_class)->src_query (agg, query);
+}
+
+static GstFlowReturn
+gst_dwrite_subtitle_mux_drain (GstDWriteSubtitleMux * self)
+{
+  GstAggregator *agg = GST_AGGREGATOR_CAST (self);
+  GstElement *elem = GST_ELEMENT_CAST (self);
+  GstAggregatorPad *srcpad = GST_AGGREGATOR_PAD_CAST (agg->srcpad);
+  GstBuffer *buffer;
+  GList *iter;
+  GstFlowReturn ret;
+
+  if (!self->video_pad->buffer)
+    return GST_FLOW_OK;
+
+  buffer = self->video_pad->buffer;
+  self->video_pad->buffer = NULL;
+
+  srcpad->segment.position = GST_BUFFER_PTS (buffer);
+  if (srcpad->segment.rate >= 0 && GST_BUFFER_DURATION_IS_VALID (buffer) &&
+      GST_BUFFER_PTS_IS_VALID (buffer)) {
+    srcpad->segment.position += GST_BUFFER_DURATION (buffer);
+  }
+
+  if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_GAP) ||
+      gst_buffer_get_size (buffer) == 0) {
+    GST_DEBUG_OBJECT (self, "Dropping gap buffer");
+    gst_buffer_unref (buffer);
+    return GST_FLOW_OK;
+  }
+
+  GST_LOG_OBJECT (self, "Draining buffer %" GST_PTR_FORMAT, buffer);
+
+  GST_OBJECT_LOCK (self);
+  for (iter = elem->sinkpads; iter; iter = g_list_next (iter)) {
+    GstDWriteSubtitleMuxPad *pad = (GstDWriteSubtitleMuxPad *) iter->data;
+
+    if (pad == self->video_pad)
+      continue;
+
+    g_mutex_lock (&pad->lock);
+    if (!pad->buffer || !pad->active) {
+      g_mutex_unlock (&pad->lock);
+      continue;
+    }
+
+    if (GST_BUFFER_FLAG_IS_SET (pad->buffer, GST_BUFFER_FLAG_GAP) ||
+        gst_buffer_get_size (pad->buffer) == 0) {
+      g_mutex_unlock (&pad->lock);
+      continue;
+    }
+
+    buffer = gst_buffer_make_writable (buffer);
+    gst_buffer_add_dwrite_subtitle_meta (buffer, pad->stream, pad->buffer);
+    g_mutex_unlock (&pad->lock);
+  }
+  GST_OBJECT_UNLOCK (self);
+
+  ret = gst_aggregator_finish_buffer (GST_AGGREGATOR_CAST (self), buffer);
+  GST_LOG_OBJECT (self, "Drain returned %s", gst_flow_get_name (ret));
+
+  return ret;
+}
+
+static gboolean
+gst_dwrite_subtitle_mux_sink_event (GstAggregator * agg, GstAggregatorPad * pad,
+    GstEvent * event)
+{
+  GstDWriteSubtitleMux *self = GST_DWRITE_SUBTITLE_MUX (agg);
+  GstDWriteSubtitleMuxPad *spad = GST_DWRITE_SUBTITLE_MUX_PAD (pad);
+
+  GST_LOG_OBJECT (pad, "Got event %" GST_PTR_FORMAT, event);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_STREAM_START:
+    {
+      const gchar *stream_id;
+      gst_event_parse_stream_start (event, &stream_id);
+      g_free (spad->stream_id);
+      spad->stream_id = g_strdup (stream_id);
+      break;
+    }
+    case GST_EVENT_CAPS:
+    {
+      GstCaps *caps;
+      gst_event_parse_caps (event, &caps);
+
+      if (spad == self->video_pad) {
+        GstVideoInfo info;
+        gint fps_n = 25;
+        gint fps_d = 1;
+        GstClockTime latency;
+
+        gst_video_info_from_caps (&info, caps);
+
+        if (info.fps_n > 0 && info.fps_d > 0) {
+          fps_n = info.fps_n;
+          fps_d = info.fps_d;
+        }
+
+        latency = gst_util_uint64_scale (GST_SECOND, fps_d, fps_n);
+        gst_aggregator_set_latency (agg, latency, latency);
+
+        gst_dwrite_subtitle_mux_drain (self);
+        gst_aggregator_set_src_caps (agg, caps);
+      } else {
+        gst_clear_object (&spad->pending_stream);
+        spad->pending_stream = gst_stream_new (spad->stream_id,
+            caps, GST_STREAM_TYPE_TEXT, GST_STREAM_FLAG_SPARSE);
+      }
+      break;
+    }
+    case GST_EVENT_SEGMENT:
+      if (spad == self->video_pad) {
+        const GstSegment *segment;
+        gst_event_parse_segment (event, &segment);
+        gst_dwrite_subtitle_mux_drain (self);
+        gst_aggregator_update_segment (agg, segment);
+      }
+      break;
+    case GST_EVENT_TAG:
+      if (spad != self->video_pad) {
+        GstTagList *tags;
+        gst_event_parse_tag (event, &tags);
+        if (spad->pending_stream)
+          gst_stream_set_tags (spad->pending_stream, tags);
+        else if (spad->stream)
+          gst_stream_set_tags (spad->stream, tags);
+      }
+      break;
+    default:
+      break;
+  }
+
+  return GST_AGGREGATOR_CLASS (parent_class)->sink_event (agg, pad, event);
+}
+
+static GstFlowReturn
+gst_dwrite_subtitle_mux_fill_single_queue (GstDWriteSubtitleMux * self,
+    GstDWriteSubtitleMuxPad * pad, GstClockTime out_start_running_time,
+    GstClockTime out_end_running_time, gboolean timeout)
+{
+  GstAggregatorPad *apad = GST_AGGREGATOR_PAD_CAST (pad);
+  GstSegment *segment;
+  gboolean is_eos;
+  GstBuffer *buf;
+  GstClockTime pts, dur;
+  GstClockTime start_time;
+  GstClockTime end_time;
+  GstClockTime start_running_time, end_running_time;
+  GstFlowReturn ret = GST_FLOW_OK;
+
+  segment = &apad->segment;
+
+  if (gst_aggregator_pad_is_inactive (apad)) {
+    GST_DEBUG_OBJECT (pad, "Pad is inactive");
+    return GST_FLOW_OK;
+  }
+
+  is_eos = gst_aggregator_pad_is_eos (apad);
+
+  if (pad->buffer && GST_CLOCK_TIME_IS_VALID (out_start_running_time) &&
+      GST_CLOCK_TIME_IS_VALID (pad->end_time) &&
+      pad->end_time <= out_start_running_time) {
+    GST_LOG_OBJECT (pad, "Discard prev buffer %" GST_PTR_FORMAT, pad->buffer);
+    gst_clear_buffer (&pad->buffer);
+  }
+
+  buf = gst_aggregator_pad_peek_buffer (apad);
+  if (!buf) {
+    GST_DEBUG_OBJECT (pad, "Pad has empty buffer");
+
+    if (!pad->buffer) {
+      if (is_eos) {
+        GST_DEBUG_OBJECT (pad, "Pad is EOS");
+        return GST_FLOW_EOS;
+      } else if (!timeout) {
+        GST_DEBUG_OBJECT (pad, "Need more data");
+        return GST_AGGREGATOR_FLOW_NEED_DATA;
+      } else {
+        GST_DEBUG_OBJECT (pad, "Timeout");
+      }
+    }
+
+    return GST_FLOW_OK;
+  }
+
+  GST_LOG_OBJECT (pad, "Currently peeked buffer %" GST_PTR_FORMAT, buf);
+
+  pts = GST_BUFFER_PTS (buf);
+  if (!GST_CLOCK_TIME_IS_VALID (pts)) {
+    GST_ERROR_OBJECT (pad, "Unknown buffer pts");
+    ret = GST_FLOW_ERROR;
+    goto out;
+  }
+
+  dur = GST_BUFFER_DURATION (buf);
+  if (GST_CLOCK_TIME_IS_VALID (dur)) {
+    end_time = gst_segment_to_running_time (segment,
+        GST_FORMAT_TIME, pts + dur);
+  } else {
+    end_time = GST_CLOCK_TIME_NONE;
+  }
+
+  pts = MAX (pts, segment->start);
+  start_time = gst_segment_to_running_time (segment, GST_FORMAT_TIME, pts);
+  if (segment->rate >= 0) {
+    start_running_time = start_time;
+    end_running_time = end_time;
+  } else {
+    start_running_time = end_time;
+    end_running_time = start_time;
+  }
+
+  if (GST_CLOCK_TIME_IS_VALID (out_start_running_time) &&
+      GST_CLOCK_TIME_IS_VALID (end_running_time) &&
+      end_running_time <= out_start_running_time) {
+    if (pad->pending_stream) {
+      gst_clear_object (&pad->stream);
+      pad->stream = g_steal_pointer (&pad->pending_stream);
+    }
+    GST_LOG_OBJECT (pad, "Discard old buffer %" GST_PTR_FORMAT, buf);
+    gst_clear_buffer (&pad->buffer);
+    gst_aggregator_pad_drop_buffer (apad);
+    ret = GST_AGGREGATOR_FLOW_NEED_DATA;
+    goto out;
+  }
+
+  if (!pad->buffer) {
+    GST_LOG_OBJECT (pad, "Queueing new buffer %" GST_PTR_FORMAT, buf);
+    if (pad->pending_stream) {
+      gst_clear_object (&pad->stream);
+      pad->stream = g_steal_pointer (&pad->pending_stream);
+    }
+
+    pad->buffer = gst_buffer_ref (buf);
+    pad->start_time = start_running_time;
+    pad->end_time = end_running_time;
+    gst_aggregator_pad_drop_buffer (apad);
+  } else if (pad->buffer != buf && !GST_CLOCK_TIME_IS_VALID (pad->end_time)) {
+    if (segment->rate >= 0)
+      pad->end_time = start_running_time;
+    else
+      pad->end_time = end_running_time;
+
+    if (GST_CLOCK_TIME_IS_VALID (out_start_running_time) &&
+        GST_CLOCK_TIME_IS_VALID (pad->end_time) &&
+        pad->end_time > out_start_running_time) {
+      GST_LOG_OBJECT (pad, "Keep old buffer %" GST_PTR_FORMAT, pad->buffer);
+    } else {
+      GST_LOG_OBJECT (pad, "Replacing with new buffer %" GST_PTR_FORMAT, buf);
+      if (pad->pending_stream) {
+        gst_clear_object (&pad->stream);
+        pad->stream = g_steal_pointer (&pad->pending_stream);
+      }
+
+      gst_buffer_replace (&pad->buffer, buf);
+      pad->start_time = start_running_time;
+      pad->end_time = end_running_time;
+      gst_aggregator_pad_drop_buffer (apad);
+    }
+  }
+
+  if (!GST_CLOCK_TIME_IS_VALID (pad->end_time) &&
+      GST_CLOCK_TIME_IS_VALID (out_start_running_time)) {
+    GST_LOG_OBJECT (pad, "Unknown end running time, need more data");
+    ret = GST_AGGREGATOR_FLOW_NEED_DATA;
+  }
+
+out:
+  gst_clear_buffer (&buf);
+  return ret;
+}
+
+static GstFlowReturn
+gst_dwrite_subtitle_mux_fill_queues (GstDWriteSubtitleMux * self,
+    GstClockTime start_running_time, GstClockTime end_running_time,
+    gboolean timeout)
+{
+  GstElement *elem = GST_ELEMENT_CAST (self);
+  GList *iter;
+  gboolean need_more_data = FALSE;
+  GstFlowReturn ret;
+
+  GST_OBJECT_LOCK (self);
+  for (iter = elem->sinkpads; iter; iter = g_list_next (iter)) {
+    GstDWriteSubtitleMuxPad *pad = (GstDWriteSubtitleMuxPad *) iter->data;
+
+    if (pad == self->video_pad)
+      continue;
+
+    ret = gst_dwrite_subtitle_mux_fill_single_queue (self, pad,
+        start_running_time, end_running_time, timeout);
+    if (ret == GST_FLOW_ERROR) {
+      GST_OBJECT_UNLOCK (self);
+      return GST_FLOW_ERROR;
+    }
+
+    if (ret == GST_AGGREGATOR_FLOW_NEED_DATA)
+      need_more_data = TRUE;
+  }
+  GST_OBJECT_UNLOCK (self);
+
+  if (need_more_data)
+    return GST_AGGREGATOR_FLOW_NEED_DATA;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_dwrite_subtitle_mux_aggregate (GstAggregator * agg, gboolean timeout)
+{
+  GstDWriteSubtitleMux *self = GST_DWRITE_SUBTITLE_MUX (agg);
+  GstAggregatorPad *video_pad = GST_AGGREGATOR_PAD_CAST (self->video_pad);
+  GstSegment *agg_segment = &GST_AGGREGATOR_PAD_CAST (agg->srcpad)->segment;
+  GstBuffer *video_buf = NULL;
+  GstClockTime cur_running_time = GST_CLOCK_TIME_NONE;
+  GstFlowReturn ret;
+
+  video_buf = gst_aggregator_pad_peek_buffer (video_pad);
+  if (!video_buf) {
+    if (gst_aggregator_pad_is_eos (video_pad)) {
+      if (!self->video_pad->buffer) {
+        GST_DEBUG_OBJECT (self, "Video EOS");
+        return GST_FLOW_EOS;
+      }
+    } else {
+      return GST_AGGREGATOR_FLOW_NEED_DATA;
+    }
+  }
+
+  if (video_buf) {
+    cur_running_time = gst_segment_to_running_time (&video_pad->segment,
+        GST_FORMAT_TIME, GST_BUFFER_PTS (video_buf));
+
+    if (!self->video_pad->buffer) {
+      GST_DEBUG_OBJECT (self,
+          "Initial video buffer %" GST_PTR_FORMAT, video_buf);
+
+      self->video_pad->buffer = video_buf;
+      if (agg_segment->rate >= 0)
+        self->video_pad->start_time = cur_running_time;
+      else
+        self->video_pad->end_time = cur_running_time;
+      gst_aggregator_pad_drop_buffer (video_pad);
+
+      return GST_AGGREGATOR_FLOW_NEED_DATA;
+    }
+  }
+
+  if (agg_segment->rate >= 0) {
+    self->video_pad->end_time = cur_running_time;
+  } else {
+    self->video_pad->start_time = cur_running_time;
+  }
+
+  GST_LOG_OBJECT (self, "Fill subtitle queues for running time %"
+      GST_TIME_FORMAT " - %" GST_TIME_FORMAT,
+      GST_TIME_ARGS (self->video_pad->start_time),
+      GST_TIME_ARGS (self->video_pad->end_time));
+
+  ret = gst_dwrite_subtitle_mux_fill_queues (self, self->video_pad->start_time,
+      self->video_pad->end_time, timeout);
+
+  if (ret == GST_FLOW_OK) {
+    ret = gst_dwrite_subtitle_mux_drain (self);
+    gst_aggregator_pad_drop_buffer (video_pad);
+
+    if (video_buf) {
+      self->video_pad->buffer = gst_buffer_ref (video_buf);
+
+      if (agg_segment->rate >= 0)
+        self->video_pad->start_time = cur_running_time;
+      else
+        self->video_pad->end_time = cur_running_time;
+    }
+  } else if (ret == GST_AGGREGATOR_FLOW_NEED_DATA) {
+    GST_DEBUG_OBJECT (self, "Need more data");
+  }
+
+  gst_clear_buffer (&video_buf);
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritesubtitlemux.h Added

@@ -0,0 +1,35 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/base/base.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DWRITE_SUBTITLE_MUX_PAD (gst_dwrite_subtitle_mux_pad_get_type())
+G_DECLARE_FINAL_TYPE (GstDWriteSubtitleMuxPad, gst_dwrite_subtitle_mux_pad,
+    GST, DWRITE_SUBTITLE_MUX_PAD, GstAggregatorPad)
+
+#define GST_TYPE_DWRITE_SUBTITLE_MUX (gst_dwrite_subtitle_mux_get_type())
+G_DECLARE_FINAL_TYPE (GstDWriteSubtitleMux, gst_dwrite_subtitle_mux,
+    GST, DWRITE_SUBTITLE_MUX, GstAggregator)
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritesubtitleoverlay.cpp Added

@@ -0,0 +1,259 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/d3d11/gstd3d11.h>
+#include <gst/d3d11/gstd3d11-private.h>
+#include <gst/video/video.h>
+#include "gstdwritesubtitleoverlay.h"
+#include "gstdwrite-utils.h"
+#include "gstdwritetextoverlay.h"
+#include <mutex>
+
+GST_DEBUG_CATEGORY_STATIC (dwrite_subtitle_overlay_debug);
+#define GST_CAT_DEFAULT dwrite_subtitle_overlay_debug
+
+static GstStaticPadTemplate video_templ = GST_STATIC_PAD_TEMPLATE ("video",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-raw(ANY)")
+    );
+
+static GstStaticPadTemplate text_templ = GST_STATIC_PAD_TEMPLATE ("text",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("text/x-raw, format = { pango-markup, utf8 }"));
+
+static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-raw(ANY)")
+    );
+
+/* *INDENT-OFF* */
+static std::vector<GParamSpec *> _pspec;
+/* *INDENT-ON* */
+
+struct GstDWriteSubtitleOverlayPrivate
+{
+  std::mutex lock;
+
+  GstElement *mux = nullptr;
+  GstElement *overlay = nullptr;
+  GstPad *text_pad = nullptr;
+  GstPad *mux_pad = nullptr;
+};
+
+struct _GstDWriteSubtitleOverlay
+{
+  GstBin parent;
+
+  GstDWriteSubtitleOverlayPrivate *priv;
+};
+
+static void gst_dwrite_subtitle_overlay_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_dwrite_subtitle_overlay_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+static GstPadLinkReturn gst_dwrite_subtitle_overlay_text_link (GstPad * pad,
+    GstObject * parent, GstPad * peer);
+static void gst_dwrite_subtitle_overlay_text_unlink (GstPad * pad,
+    GstObject * parent);
+static gboolean gst_dwrite_subtitle_overlay_src_event (GstPad * pad,
+    GstObject * parent, GstEvent * event);
+
+#define gst_dwrite_subtitle_overlay_parent_class parent_class
+G_DEFINE_TYPE (GstDWriteSubtitleOverlay, gst_dwrite_subtitle_overlay,
+    GST_TYPE_BIN);
+
+static void
+gst_dwrite_subtitle_overlay_class_init (GstDWriteSubtitleOverlayClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+
+  object_class->set_property = gst_dwrite_subtitle_overlay_set_property;
+  object_class->get_property = gst_dwrite_subtitle_overlay_get_property;
+
+  gst_dwrite_base_overlay_build_param_specs (_pspec);
+  gst_dwrite_text_overlay_build_param_specs (_pspec);
+
+  for (guint i = 0; i < _pspec.size (); i++)
+    g_object_class_install_property (object_class, i + 1, _pspeci);
+
+  gst_element_class_set_static_metadata (element_class,
+      "DirectWrite Subtitle Overlay",
+      "Filter/Editor/Video/Overlay/Subtitle",
+      "Adds subtitle strings on top of a video buffer",
+      "Seungha Yang <seungha@centricular.com>");
+
+  gst_element_class_add_static_pad_template (element_class, &video_templ);
+  gst_element_class_add_static_pad_template (element_class, &text_templ);
+  gst_element_class_add_static_pad_template (element_class, &src_templ);
+
+  GST_DEBUG_CATEGORY_INIT (dwrite_subtitle_overlay_debug,
+      "dwritesubtitleoverlay", 0, "dwritesubtitleoverlay");
+}
+
+static void
+gst_dwrite_subtitle_overlay_init (GstDWriteSubtitleOverlay * self)
+{
+  GstElement *elem = GST_ELEMENT_CAST (self);
+  GstPad *gpad;
+  GstPad *pad;
+  GstPadTemplate *templ;
+  GstDWriteSubtitleOverlayPrivate *priv;
+
+  self->priv = priv = new GstDWriteSubtitleOverlayPrivate ();
+
+  priv->mux = gst_element_factory_make ("dwritesubtitlemux", "subtitle-mux");
+  priv->overlay =
+      gst_element_factory_make ("dwritetextoverlay", "text-overlay");
+
+  gst_bin_add_many (GST_BIN_CAST (self), priv->mux, priv->overlay, nullptr);
+  gst_element_link (priv->mux, priv->overlay);
+
+  pad = gst_element_get_static_pad (priv->mux, "video");
+  gpad = gst_ghost_pad_new ("video", pad);
+  gst_object_unref (pad);
+  gst_element_add_pad (elem, gpad);
+
+  pad = gst_element_get_static_pad (priv->overlay, "src");
+  gpad = gst_ghost_pad_new ("src", pad);
+  gst_object_unref (pad);
+  gst_element_add_pad (elem, gpad);
+
+  pad = GST_PAD_CAST (gst_proxy_pad_get_internal (GST_PROXY_PAD (gpad)));
+  gst_pad_set_event_function (pad, gst_dwrite_subtitle_overlay_src_event);
+  gst_object_unref (pad);
+
+  templ = gst_static_pad_template_get (&text_templ);
+  priv->text_pad = gst_ghost_pad_new_no_target_from_template ("text", templ);
+  gst_object_unref (templ);
+  gst_element_add_pad (elem, priv->text_pad);
+
+  GST_PAD_SET_ACCEPT_INTERSECT (priv->text_pad);
+  GST_PAD_SET_ACCEPT_TEMPLATE (priv->text_pad);
+
+  gst_pad_set_link_function (priv->text_pad,
+      gst_dwrite_subtitle_overlay_text_link);
+  gst_pad_set_unlink_function (priv->text_pad,
+      gst_dwrite_subtitle_overlay_text_unlink);
+}
+
+static void
+gst_dwrite_subtitle_overlay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstDWriteSubtitleOverlay *self = GST_DWRITE_SUBTITLE_OVERLAY (object);
+  GstDWriteSubtitleOverlayPrivate *priv = self->priv;
+
+  g_object_set_property (G_OBJECT (priv->overlay), pspec->name, value);
+}
+
+static void
+gst_dwrite_subtitle_overlay_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstDWriteSubtitleOverlay *self = GST_DWRITE_SUBTITLE_OVERLAY (object);
+  GstDWriteSubtitleOverlayPrivate *priv = self->priv;
+
+  g_object_get_property (G_OBJECT (priv->overlay), pspec->name, value);
+}
+
+static GstPadLinkReturn
+gst_dwrite_subtitle_overlay_text_link (GstPad * pad, GstObject * parent,
+    GstPad * peer)
+{
+  GstDWriteSubtitleOverlay *self = GST_DWRITE_SUBTITLE_OVERLAY (parent);
+  GstDWriteSubtitleOverlayPrivate *priv = self->priv;
+  GstPad *mux_pad;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  mux_pad = gst_element_request_pad_simple (priv->mux, "text_%u");
+  if (!mux_pad) {
+    GST_ERROR_OBJECT (self, "Couldn't get mux pad");
+    return GST_PAD_LINK_REFUSED;
+  }
+
+  gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (priv->text_pad), mux_pad);
+  gst_clear_object (&priv->mux_pad);
+  priv->mux_pad = mux_pad;
+
+  GST_DEBUG_OBJECT (self, "Text pad linked");
+
+  return GST_PAD_LINK_OK;
+}
+
+static void
+gst_dwrite_subtitle_overlay_text_unlink (GstPad * pad, GstObject * parent)
+{
+  GstDWriteSubtitleOverlay *self = GST_DWRITE_SUBTITLE_OVERLAY (parent);
+  GstDWriteSubtitleOverlayPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  /* We cannot clear target on unlink function, since unlink function is
+   * called with GST_OBJECT_LOCK and get/set target will take the lock
+   * as well. Let ghostpad hold old target but it's fine */
+  if (!priv->mux_pad) {
+    GST_WARNING_OBJECT (self, "No linked mux pad");
+  } else {
+    GST_DEBUG_OBJECT (self, "Unlinking text pad");
+    gst_element_release_request_pad (priv->mux, priv->mux_pad);
+    gst_clear_object (&priv->mux_pad);
+  }
+}
+
+static gboolean
+gst_dwrite_subtitle_overlay_src_event (GstPad * pad, GstObject * parent,
+    GstEvent * event)
+{
+  guint32 seqnum;
+
+  /* subtitleoverlay elements will drop flush event if it was passed to text pad
+   * based on the pango element's behavior, it should be dropped since
+   * aggregator will forward the same flush event to text pad as well.
+   * Replace flush event with ours */
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_FLUSH_START:
+      seqnum = gst_event_get_seqnum (event);
+      gst_event_unref (event);
+      event = gst_event_new_flush_start ();
+      gst_event_set_seqnum (event, seqnum);
+      break;
+    case GST_EVENT_FLUSH_STOP:
+    {
+      gboolean reset;
+      gst_event_parse_flush_stop (event, &reset);
+      seqnum = gst_event_get_seqnum (event);
+      gst_event_unref (event);
+      event = gst_event_new_flush_stop (reset);
+      gst_event_set_seqnum (event, seqnum);
+      break;
+    }
+    default:
+      break;
+  }
+
+  return gst_pad_event_default (pad, parent, event);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritesubtitleoverlay.h Added

@@ -0,0 +1,31 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/base/base.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DWRITE_SUBTITLE_OVERLAY (gst_dwrite_subtitle_overlay_get_type())
+G_DECLARE_FINAL_TYPE (GstDWriteSubtitleOverlay, gst_dwrite_subtitle_overlay,
+    GST, DWRITE_SUBTITLE_OVERLAY, GstBin)
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritetextoverlay.cpp Added

@@ -0,0 +1,730 @@
+/* GStreamer
+ * Copyright (C) 2020 Mathieu Duponchelle <mathieu@centricular.com>
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdwritetextoverlay.h"
+#include <gst/base/base.h>
+#include <caption.h>
+#include <mutex>
+
+GST_DEBUG_CATEGORY_STATIC (dwrite_text_overlay_debug);
+#define GST_CAT_DEFAULT dwrite_text_overlay_debug
+
+enum
+{
+  PROP_0,
+  PROP_ENABLE_CC,
+  PROP_CC_FIELD,
+  PROP_CC_TIMEOUT,
+  PROP_REMOVE_CC_META,
+};
+
+/* *INDENT-OFF* */
+static std::vector<GParamSpec *> _pspec;
+/* *INDENT-ON* */
+
+#define DEFAULT_ENABLE_CC TRUE
+#define DEFAULT_CC_FIELD -1
+#define DEFAULT_CC_TIMEOUT GST_CLOCK_TIME_NONE
+#define DEFAULT_REMOVE_CC_META FALSE
+
+/* *INDENT-OFF* */
+struct GstDWriteTextOverlayPrivate
+{
+  std::mutex lock;
+  caption_frame_t frame;
+  GstClockTime caption_running_time;
+  GstClockTime running_time;
+  guint8 selected_field;
+
+  std::string closed_caption;
+  std::string text;
+
+  /* properties */
+  gboolean enable_cc = DEFAULT_ENABLE_CC;
+  gint field = DEFAULT_CC_FIELD;
+  GstClockTime timeout = DEFAULT_CC_TIMEOUT;
+  gboolean remove_caption_meta = DEFAULT_REMOVE_CC_META;
+};
+/* *INDENT-ON* */
+
+struct _GstDWriteTextOverlay
+{
+  GstDWriteBaseOverlay parent;
+
+  GstDWriteTextOverlayPrivate *priv;
+};
+
+static void gst_dwrite_text_overlay_finalize (GObject * object);
+static void gst_dwrite_text_overlay_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_dwrite_text_overlay_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+static gboolean gst_dwrite_text_overlay_start (GstBaseTransform * trans);
+static gboolean gst_dwrite_text_overlay_sink_event (GstBaseTransform * trans,
+    GstEvent * event);
+static WString gst_dwrite_text_overlay_get_text (GstDWriteBaseOverlay * overlay,
+    const WString & default_text, GstBuffer * buffer);
+static void
+gst_dwrite_text_overlay_after_transform (GstDWriteBaseOverlay * overlay,
+    GstBuffer * buffer);
+
+#define gst_dwrite_text_overlay_parent_class parent_class
+G_DEFINE_TYPE (GstDWriteTextOverlay, gst_dwrite_text_overlay,
+    GST_TYPE_DWRITE_BASE_OVERLAY);
+
+static void
+gst_dwrite_text_overlay_class_init (GstDWriteTextOverlayClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
+  GstDWriteBaseOverlayClass *overlay_class =
+      GST_DWRITE_BASE_OVERLAY_CLASS (klass);
+
+  object_class->finalize = gst_dwrite_text_overlay_finalize;
+  object_class->set_property = gst_dwrite_text_overlay_set_property;
+  object_class->get_property = gst_dwrite_text_overlay_get_property;
+
+  gst_dwrite_text_overlay_build_param_specs (_pspec);
+  for (guint i = 0; i < _pspec.size (); i++)
+    g_object_class_install_property (object_class, i + 1, _pspeci);
+
+  gst_element_class_set_static_metadata (element_class,
+      "DirectWrite Text Overlay", "Filter/Editor/Video",
+      "Adds text strings on top of a video buffer",
+      "Seungha Yang <seungha@centricular.com>");
+
+  trans_class->start = GST_DEBUG_FUNCPTR (gst_dwrite_text_overlay_start);
+  trans_class->sink_event =
+      GST_DEBUG_FUNCPTR (gst_dwrite_text_overlay_sink_event);
+
+  overlay_class->get_text =
+      GST_DEBUG_FUNCPTR (gst_dwrite_text_overlay_get_text);
+  overlay_class->after_transform =
+      GST_DEBUG_FUNCPTR (gst_dwrite_text_overlay_after_transform);
+
+  GST_DEBUG_CATEGORY_INIT (dwrite_text_overlay_debug,
+      "dwritetextoverlay", 0, "dwritetextoverlay");
+}
+
+static void
+gst_dwrite_text_overlay_init (GstDWriteTextOverlay * self)
+{
+  self->priv = new GstDWriteTextOverlayPrivate ();
+  self->priv->closed_caption.reserve (CAPTION_FRAME_TEXT_BYTES);
+
+  g_object_set (self, "text-alignment", DWRITE_TEXT_ALIGNMENT_CENTER,
+      "paragraph-alignment", DWRITE_PARAGRAPH_ALIGNMENT_FAR,
+      "font-size", 20.0, nullptr);
+}
+
+static void
+gst_dwrite_text_overlay_finalize (GObject * object)
+{
+  GstDWriteTextOverlay *self = GST_DWRITE_TEXT_OVERLAY (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_dwrite_text_overlay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstDWriteTextOverlay *self = GST_DWRITE_TEXT_OVERLAY (object);
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_ENABLE_CC:
+      priv->enable_cc = g_value_get_boolean (value);
+      break;
+    case PROP_CC_FIELD:
+      priv->field = g_value_get_int (value);
+      if (priv->field == -1) {
+        priv->selected_field = 0xff;
+      } else {
+        priv->selected_field = (guint) priv->field;
+      }
+      break;
+    case PROP_CC_TIMEOUT:
+      priv->timeout = g_value_get_uint64 (value);
+      break;
+    case PROP_REMOVE_CC_META:
+      priv->remove_caption_meta = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_dwrite_text_overlay_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstDWriteTextOverlay *self = GST_DWRITE_TEXT_OVERLAY (object);
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_ENABLE_CC:
+      g_value_set_boolean (value, priv->enable_cc);
+      break;
+    case PROP_CC_FIELD:
+      g_value_set_int (value, priv->field);
+      break;
+    case PROP_CC_TIMEOUT:
+      g_value_set_uint64 (value, priv->timeout);
+      break;
+    case PROP_REMOVE_CC_META:
+      g_value_set_boolean (value, priv->remove_caption_meta);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static gboolean
+gst_dwrite_text_overlay_start (GstBaseTransform * trans)
+{
+  GstDWriteTextOverlay *self = GST_DWRITE_TEXT_OVERLAY (trans);
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+
+  caption_frame_init (&priv->frame);
+  priv->running_time = GST_CLOCK_TIME_NONE;
+  priv->caption_running_time = GST_CLOCK_TIME_NONE;
+  priv->selected_field = 0xff;
+  priv->closed_caption.clear ();
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->start (trans);
+}
+
+static gboolean
+gst_dwrite_text_overlay_sink_event (GstBaseTransform * trans, GstEvent * event)
+{
+  GstDWriteTextOverlay *self = GST_DWRITE_TEXT_OVERLAY (trans);
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_SEGMENT:
+      priv->caption_running_time = GST_CLOCK_TIME_NONE;
+      priv->running_time = GST_CLOCK_TIME_NONE;
+      break;
+    default:
+      break;
+  }
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->sink_event (trans, event);
+}
+
+static guint
+gst_dwrite_text_overlay_extract_cdp (GstDWriteTextOverlay * self,
+    const guint8 * cdp, guint cdp_len, guint * pos)
+{
+  GstByteReader br;
+  guint16 u16;
+  guint8 u8;
+  guint8 flags;
+  guint len = 0;
+
+  GST_TRACE_OBJECT (self, "Extracting CDP");
+
+  /* Header + footer length */
+  if (cdp_len < 11) {
+    GST_WARNING_OBJECT (self, "cdp packet too short (%u). expected at "
+        "least %u", cdp_len, 11);
+    return 0;
+  }
+
+  gst_byte_reader_init (&br, cdp, cdp_len);
+  u16 = gst_byte_reader_get_uint16_be_unchecked (&br);
+  if (u16 != 0x9669) {
+    GST_WARNING_OBJECT (self, "cdp packet does not have initial magic bytes "
+        "of 0x9669");
+    return 0;
+  }
+
+  u8 = gst_byte_reader_get_uint8_unchecked (&br);
+  if (u8 != cdp_len) {
+    GST_WARNING_OBJECT (self, "cdp packet length (%u) does not match passed "
+        "in value (%u)", u8, cdp_len);
+    return 0;
+  }
+
+  /* skip framerate value */
+  gst_byte_reader_skip_unchecked (&br, 1);
+
+  flags = gst_byte_reader_get_uint8_unchecked (&br);
+  /* No cc_data? */
+  if ((flags & 0x40) == 0) {
+    GST_DEBUG_OBJECT (self, "cdp packet does have any cc_data");
+    return 0;
+  }
+
+  /* cdp_hdr_sequence_cntr */
+  gst_byte_reader_skip_unchecked (&br, 2);
+
+  /* skip timecode */
+  if (flags & 0x80) {
+    if (gst_byte_reader_get_remaining (&br) < 5) {
+      GST_WARNING_OBJECT (self, "cdp packet does not have enough data to "
+          "contain a timecode (%u). Need at least 5 bytes",
+          gst_byte_reader_get_remaining (&br));
+      return 0;
+    }
+
+    gst_byte_reader_skip_unchecked (&br, 5);
+  }
+
+  /* ccdata_present */
+  if (flags & 0x40) {
+    guint8 cc_count;
+
+    if (gst_byte_reader_get_remaining (&br) < 2) {
+      GST_WARNING_OBJECT (self, "not enough data to contain valid cc_data");
+      return 0;
+    }
+
+    u8 = gst_byte_reader_get_uint8_unchecked (&br);
+    if (u8 != 0x72) {
+      GST_WARNING_OBJECT (self, "missing cc_data start code of 0x72, "
+          "found 0x%02x", u8);
+      return 0;
+    }
+
+    cc_count = gst_byte_reader_get_uint8_unchecked (&br);
+    if ((cc_count & 0xe0) != 0xe0) {
+      GST_WARNING_OBJECT (self, "reserved bits are not 0xe0, found 0x%02x", u8);
+      return 0;
+    }
+    cc_count &= 0x1f;
+
+    len = 3 * cc_count;
+    if (gst_byte_reader_get_remaining (&br) < len) {
+      GST_WARNING_OBJECT (self, "not enough bytes (%u) left for the "
+          "number of byte triples (%u)", gst_byte_reader_get_remaining (&br),
+          cc_count);
+      return 0;
+    }
+
+    *pos = gst_byte_reader_get_pos (&br);
+  }
+
+  /* skip everything else we don't care about */
+  return len;
+}
+
+static void
+gst_dwrite_text_overlay_decode_cc_data (GstDWriteTextOverlay * self,
+    const guint8 * data, guint len, GstClockTime running_time)
+{
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+  GstByteReader br;
+
+  GST_TRACE_OBJECT (self, "Decoding CC data");
+
+  gst_byte_reader_init (&br, data, len);
+  while (gst_byte_reader_get_remaining (&br) >= 3) {
+    guint8 cc_type;
+    guint16 cc_data;
+
+    cc_type = gst_byte_reader_get_uint8_unchecked (&br);
+    cc_data = gst_byte_reader_get_uint16_be_unchecked (&br);
+
+    if ((cc_type & 0x04) != 0x04)
+      continue;
+
+    cc_type = cc_type & 0x03;
+    if (cc_type != 0x00 && cc_type != 0x01)
+      continue;
+
+    if (priv->selected_field == 0xff) {
+      GST_INFO_OBJECT (self, "Selected field %d", cc_type);
+      priv->selected_field = cc_type;
+    }
+
+    if (cc_type != priv->selected_field)
+      continue;
+
+    auto status = caption_frame_decode (&priv->frame, cc_data, 0.0);
+    switch (status) {
+      case LIBCAPTION_READY:
+      {
+        auto len = caption_frame_to_text (&priv->frame,
+            &priv->closed_caption0, FALSE);
+        priv->closed_caption.resize (len);
+        break;
+      }
+      case LIBCAPTION_CLEAR:
+        priv->closed_caption.clear ();
+        break;
+      default:
+        break;
+    }
+
+    priv->caption_running_time = running_time;
+  }
+}
+
+static void
+gst_dwrite_text_overlay_decode_s334_1a (GstDWriteTextOverlay * self,
+    const guint8 * data, guint len, GstClockTime running_time)
+{
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+  GstByteReader br;
+
+  GST_TRACE_OBJECT (self, "Decoding S334-1A");
+
+  gst_byte_reader_init (&br, data, len);
+  while (gst_byte_reader_get_remaining (&br) >= 3) {
+    guint8 cc_type;
+    guint16 cc_data;
+
+    cc_type = gst_byte_reader_get_uint8_unchecked (&br);
+    cc_data = gst_byte_reader_get_uint16_be_unchecked (&br);
+
+    cc_type = cc_type & 0x01;
+    if (priv->selected_field == 0xff) {
+      GST_INFO_OBJECT (self, "Selected field %d", cc_type);
+      priv->selected_field = cc_type;
+    }
+
+    if (cc_type != priv->selected_field)
+      continue;
+
+    auto status = caption_frame_decode (&priv->frame, cc_data, 0.0);
+    switch (status) {
+      case LIBCAPTION_READY:
+      {
+        auto len = caption_frame_to_text (&priv->frame,
+            &priv->closed_caption0, FALSE);
+        priv->closed_caption.resize (len);
+        break;
+      }
+      case LIBCAPTION_CLEAR:
+        priv->closed_caption.clear ();
+        break;
+      default:
+        break;
+    }
+
+    priv->caption_running_time = running_time;
+  }
+}
+
+static void
+gst_dwrite_text_overlay_decode_raw (GstDWriteTextOverlay * self,
+    const guint8 * data, guint len, GstClockTime running_time)
+{
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+  GstByteReader br;
+
+  GST_TRACE_OBJECT (self, "Decoding CEA608 RAW");
+
+  gst_byte_reader_init (&br, data, len);
+  while (gst_byte_reader_get_remaining (&br) >= 2) {
+    guint16 cc_data;
+
+    cc_data = gst_byte_reader_get_uint16_be_unchecked (&br);
+
+    auto status = caption_frame_decode (&priv->frame, cc_data, 0.0);
+    switch (status) {
+      case LIBCAPTION_READY:
+      {
+        auto len = caption_frame_to_text (&priv->frame,
+            &priv->closed_caption0, FALSE);
+        priv->closed_caption.resize (len);
+        break;
+      }
+      case LIBCAPTION_CLEAR:
+        priv->closed_caption.clear ();
+        break;
+      default:
+        break;
+    }
+
+    priv->caption_running_time = running_time;
+  }
+}
+
+static void
+xml_text (GMarkupParseContext * context, const gchar * text, gsize text_len,
+    gpointer user_data, GError ** error)
+{
+  gchar **accum = (gchar **) user_data;
+  gchar *concat;
+
+  if (*accum) {
+    concat = g_strconcat (*accum, text, NULL);
+    g_free (*accum);
+    *accum = concat;
+  } else {
+    *accum = g_strdup (text);
+  }
+}
+
+static gchar *
+gst_dwrite_text_overlay_strip_markup (GstDWriteTextOverlay * self,
+    const gchar * markup)
+{
+  GMarkupParser parser = { 0, };
+  GMarkupParseContext *context;
+  gchar *accum = nullptr;
+
+  parser.text = xml_text;
+  context = g_markup_parse_context_new (&parser,
+      (GMarkupParseFlags) 0, &accum, nullptr);
+
+  if (!g_markup_parse_context_parse (context, "<root>", 6, nullptr))
+    goto error;
+
+  if (!g_markup_parse_context_parse (context, markup, strlen (markup), nullptr))
+    goto error;
+
+  if (!g_markup_parse_context_parse (context, "</root>", 7, nullptr))
+    goto error;
+
+  if (!g_markup_parse_context_end_parse (context, nullptr))
+    goto error;
+
+done:
+  g_markup_parse_context_free (context);
+  return accum;
+
+error:
+  g_free (accum);
+  accum = nullptr;
+  goto done;
+}
+
+static void
+gst_dwrite_text_overlay_extract_meta (GstDWriteTextOverlay * self,
+    GstDWriteSubtitleMeta * meta)
+{
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+  GstCaps *caps = nullptr;
+  GstStructure *s;
+  const gchar *format;
+  std::string str;
+  GstMapInfo info;
+
+  if (!meta || !meta->subtitle || !meta->stream)
+    return;
+
+  caps = gst_stream_get_caps (meta->stream);
+  if (!caps)
+    return;
+
+  if (gst_buffer_get_size (meta->subtitle) == 0)
+    goto out;
+
+  if (!gst_buffer_map (meta->subtitle, &info, GST_MAP_READ))
+    goto out;
+
+  s = gst_caps_get_structure (caps, 0);
+  format = gst_structure_get_string (s, "format");
+  /* TODO: parse pango attributs and make layout based on that */
+  if (g_strcmp0 (format, "pango-markup") == 0) {
+    gchar *stripped = gst_dwrite_text_overlay_strip_markup (self,
+        (gchar *) info.data);
+    gst_buffer_unmap (meta->subtitle, &info);
+
+    if (!stripped)
+      goto out;
+
+    if (priv->text.empty ()) {
+      priv->text = stripped;
+    } else {
+      priv->text += "\n";
+      priv->text += stripped;
+    }
+  } else {
+    std::string ret;
+    ret.resize (info.size);
+    memcpy (&ret0, info.data, info.size);
+    gst_buffer_unmap (meta->subtitle, &info);
+    auto len = strlen (ret.c_str ());
+    ret.resize (len);
+
+    if (priv->text.empty ())
+      priv->text = ret;
+    else
+      priv->text += " " + ret;
+  }
+
+out:
+  gst_clear_caps (&caps);
+}
+
+static gboolean
+gst_dwrite_text_overlay_foreach_meta (GstBuffer * buffer, GstMeta ** meta,
+    GstDWriteTextOverlay * self)
+{
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+  GstVideoCaptionMeta *cc_meta;
+
+  if (priv->enable_cc && (*meta)->info->api == GST_VIDEO_CAPTION_META_API_TYPE) {
+    cc_meta = (GstVideoCaptionMeta *) (*meta);
+    switch (cc_meta->caption_type) {
+      case GST_VIDEO_CAPTION_TYPE_CEA608_RAW:
+        gst_dwrite_text_overlay_decode_raw (self, cc_meta->data, cc_meta->size,
+            priv->running_time);
+        break;
+      case GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A:
+        gst_dwrite_text_overlay_decode_s334_1a (self, cc_meta->data,
+            cc_meta->size, priv->running_time);
+        break;
+      case GST_VIDEO_CAPTION_TYPE_CEA708_RAW:
+        gst_dwrite_text_overlay_decode_cc_data (self, cc_meta->data,
+            cc_meta->size, priv->running_time);
+        break;
+      case GST_VIDEO_CAPTION_TYPE_CEA708_CDP:
+      {
+        guint len, pos = 0;
+        len = gst_dwrite_text_overlay_extract_cdp (self, cc_meta->data,
+            cc_meta->size, &pos);
+        if (len > 0) {
+          gst_dwrite_text_overlay_decode_cc_data (self, cc_meta->data + pos,
+              len, priv->running_time);
+        }
+        break;
+      }
+      default:
+        break;
+    }
+  } else if ((*meta)->info->api == GST_DWRITE_SUBTITLE_META_API_TYPE) {
+    GstDWriteSubtitleMeta *smeta = (GstDWriteSubtitleMeta *) (*meta);
+    gst_dwrite_text_overlay_extract_meta (self, smeta);
+  }
+
+  return TRUE;
+}
+
+static WString
+gst_dwrite_text_overlay_get_text (GstDWriteBaseOverlay * overlay,
+    const WString & default_text, GstBuffer * buffer)
+{
+  GstBaseTransform *trans = GST_BASE_TRANSFORM (overlay);
+  GstDWriteTextOverlay *self = GST_DWRITE_TEXT_OVERLAY (overlay);
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+  WString text_wide;
+
+  priv->text.clear ();
+
+  priv->running_time = gst_segment_to_running_time (&trans->segment,
+      GST_FORMAT_TIME, GST_BUFFER_PTS (buffer));
+
+  gst_buffer_foreach_meta (buffer,
+      (GstBufferForeachMetaFunc) gst_dwrite_text_overlay_foreach_meta, self);
+
+  if (priv->enable_cc) {
+    if (GST_CLOCK_TIME_IS_VALID (priv->timeout) &&
+        GST_CLOCK_TIME_IS_VALID (priv->running_time) &&
+        GST_CLOCK_TIME_IS_VALID (priv->caption_running_time) &&
+        priv->running_time >= priv->caption_running_time) {
+      GstClockTime diff = priv->running_time - priv->caption_running_time;
+
+      if (diff > priv->timeout) {
+        GST_INFO_OBJECT (self, "Reached timeout, clearing text");
+        priv->closed_caption.clear ();
+      }
+    }
+  } else {
+    priv->closed_caption.clear ();
+  }
+
+  if (priv->closed_caption.empty () && priv->text.empty ())
+    return default_text;
+
+  if (!priv->text.empty ())
+    text_wide = gst_dwrite_string_to_wstring (priv->text);
+
+  if (!priv->closed_caption.empty ()) {
+    if (!text_wide.empty ())
+      text_wide += L"\n";
+
+    text_wide += gst_dwrite_string_to_wstring (priv->closed_caption);
+  }
+
+  if (default_text.empty ())
+    return text_wide;
+
+  return default_text + WString (L" ") + text_wide;
+}
+
+static gboolean
+gst_dwrite_text_overlay_remove_meta (GstBuffer * buffer, GstMeta ** meta,
+    GstDWriteTextOverlay * self)
+{
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+
+  if ((*meta)->info->api == GST_VIDEO_CAPTION_META_API_TYPE &&
+      priv->enable_cc && priv->remove_caption_meta) {
+    GST_TRACE_OBJECT (self, "Removing caption meta");
+    *meta = nullptr;
+  } else if ((*meta)->info->api == GST_DWRITE_SUBTITLE_META_API_TYPE) {
+    *meta = nullptr;
+  }
+
+  return TRUE;
+}
+
+static void
+gst_dwrite_text_overlay_after_transform (GstDWriteBaseOverlay * overlay,
+    GstBuffer * buffer)
+{
+  GstDWriteTextOverlay *self = GST_DWRITE_TEXT_OVERLAY (overlay);
+  GstDWriteTextOverlayPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  gst_buffer_foreach_meta (buffer,
+      (GstBufferForeachMetaFunc) gst_dwrite_text_overlay_remove_meta, self);
+}
+
+void
+gst_dwrite_text_overlay_build_param_specs (std::vector < GParamSpec * >&pspec)
+{
+  pspec.push_back (g_param_spec_boolean ("enable-cc", "Enable CC",
+          "Enable closed caption rendering",
+          DEFAULT_ENABLE_CC,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_int ("cc-field", "CC Field",
+          "The closed caption field to render when available, (-1 = automatic)",
+          -1, 1, DEFAULT_CC_FIELD,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_uint64 ("cc-timeout", "CC Timeout",
+          "Duration after which to erase overlay when no cc data has arrived "
+          "for the selected field, in nanoseconds unit", 16 * GST_SECOND,
+          GST_CLOCK_TIME_NONE, DEFAULT_CC_TIMEOUT,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  pspec.push_back (g_param_spec_boolean ("remove-cc-meta", "Remove CC Meta",
+          "Remove caption meta from output buffers "
+          "when closed caption rendering is enabled",
+          DEFAULT_REMOVE_CC_META,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritetextoverlay.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstdwritebaseoverlay.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DWRITE_TEXT_OVERLAY (gst_dwrite_text_overlay_get_type())
+G_DECLARE_FINAL_TYPE (GstDWriteTextOverlay,
+    gst_dwrite_text_overlay, GST, DWRITE_TEXT_OVERLAY, GstDWriteBaseOverlay);
+
+void gst_dwrite_text_overlay_build_param_specs (std::vector<GParamSpec *> & pspec);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritetimeoverlay.cpp Added

@@ -0,0 +1,438 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdwritetimeoverlay.h"
+#include <mutex>
+#include <strsafe.h>
+
+GST_DEBUG_CATEGORY_STATIC (dwrite_time_overlay_debug);
+#define GST_CAT_DEFAULT dwrite_time_overlay_debug
+
+typedef enum
+{
+  GST_DWRITE_TIME_OVERLAY_TIME_LINE_BUFFER_TIME,
+  GST_DWRITE_TIME_OVERLAY_TIME_LINE_STREAM_TIME,
+  GST_DWRITE_TIME_OVERLAY_TIME_LINE_RUNNING_TIME,
+  GST_DWRITE_TIME_OVERLAY_TIME_LINE_TIME_CODE,
+  GST_DWRITE_TIME_OVERLAY_TIME_LINE_ELAPSED_RUNNING_TIME,
+  GST_DWRITE_TIME_OVERLAY_TIME_LINE_REFERENCE_TIMESTAMP,
+  GST_DWRITE_TIME_OVERLAY_TIME_LINE_BUFFER_COUNT,
+  GST_DWRITE_TIME_OVERLAY_TIME_LINE_BUFFER_OFFSET,
+} GstDWriteTimeOverlayTimeLine;
+
+#define GST_TYPE_DWrite_TIME_OVERLAY_TIME_LINE (gst_dwrite_time_overlay_time_line_type ())
+static GType
+gst_dwrite_time_overlay_time_line_type (void)
+{
+  static GType type;
+  static const GEnumValue modes = {
+    {GST_DWRITE_TIME_OVERLAY_TIME_LINE_BUFFER_TIME,
+        "buffer-time", "buffer-time"},
+    {GST_DWRITE_TIME_OVERLAY_TIME_LINE_STREAM_TIME,
+        "stream-time", "stream-time"},
+    {GST_DWRITE_TIME_OVERLAY_TIME_LINE_RUNNING_TIME,
+        "running-time", "running-time"},
+    {GST_DWRITE_TIME_OVERLAY_TIME_LINE_TIME_CODE, "time-code", "time-code"},
+    {GST_DWRITE_TIME_OVERLAY_TIME_LINE_ELAPSED_RUNNING_TIME,
+        "elapsed-running-time", "elapsed-running-time"},
+    {GST_DWRITE_TIME_OVERLAY_TIME_LINE_REFERENCE_TIMESTAMP,
+        "reference-timestamp", "reference-timestamp"},
+    {GST_DWRITE_TIME_OVERLAY_TIME_LINE_BUFFER_COUNT,
+        "buffer-count", "buffer-count"},
+    {GST_DWRITE_TIME_OVERLAY_TIME_LINE_BUFFER_OFFSET,
+        "buffer-offset", "buffer-offset"},
+    {0, nullptr, nullptr},
+  };
+
+  GST_DWRITE_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstDWriteTimeOverlayTimeLine", modes);
+  } GST_DWRITE_CALL_ONCE_END;
+
+  return type;
+}
+
+enum
+{
+  PROP_0,
+  PROP_TIME_LINE,
+  PROP_SHOW_TIMES_AS_DATES,
+  PROP_DATETIME_EPOCH,
+  PROP_DATETIME_FORMAT,
+  PROP_REFERENCE_TIMESTAMP_CAPS,
+};
+
+#define DEFAULT_TIME_LINE GST_DWRITE_TIME_OVERLAY_TIME_LINE_BUFFER_TIME
+#define DEFAULT_SHOW_TIMES_AS_DATES FALSE
+#define DEFAULT_DATETIME_FORMAT "%F %T" /* YYYY-MM-DD hh:mm:ss */
+
+static GstStaticCaps ntp_reference_timestamp_caps =
+GST_STATIC_CAPS ("timestamp/x-ntp");
+
+struct GstDWriteTimeOverlayPrivate
+{
+  GstDWriteTimeOverlayPrivate ()
+  {
+    datetime_epoch = g_date_time_new_utc (1900, 1, 1, 0, 0, 0);
+    reference_timestamp_caps =
+        gst_static_caps_get (&ntp_reference_timestamp_caps);
+  }
+
+   ~GstDWriteTimeOverlayPrivate ()
+  {
+    if (datetime_epoch)
+      g_date_time_unref (datetime_epoch);
+    gst_clear_caps (&reference_timestamp_caps);
+  }
+
+  std::mutex lock;
+  GstDWriteTimeOverlayTimeLine time_line = DEFAULT_TIME_LINE;
+
+  gboolean show_times_as_dates = DEFAULT_SHOW_TIMES_AS_DATES;
+  guint64 buffer_count = 0;
+  std::string datetime_format = DEFAULT_DATETIME_FORMAT;
+  GDateTime *datetime_epoch;
+  GstCaps *reference_timestamp_caps;
+  GstClockTime first_running_time = GST_CLOCK_TIME_NONE;
+};
+
+struct _GstDWriteTimeOverlay
+{
+  GstDWriteBaseOverlay parent;
+
+  GstDWriteTimeOverlayPrivate *priv;
+};
+
+static void gst_dwrite_time_overlay_finalize (GObject * object);
+static void gst_dwrite_time_overlay_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_dwrite_time_overlay_get_property (GObject * object,
+    guint prop_id, GValue * value, GParamSpec * pspec);
+static gboolean gst_dwrite_time_overlay_sink_event (GstBaseTransform * trans,
+    GstEvent * event);
+static gboolean gst_dwrite_time_overlay_start (GstBaseTransform * overlay);
+static WString gst_dwrite_time_overlay_get_text (GstDWriteBaseOverlay * overlay,
+    const WString & default_text, GstBuffer * buffer);
+
+#define gst_dwrite_time_overlay_parent_class parent_class
+G_DEFINE_TYPE (GstDWriteTimeOverlay, gst_dwrite_time_overlay,
+    GST_TYPE_DWRITE_BASE_OVERLAY);
+
+static void
+gst_dwrite_time_overlay_class_init (GstDWriteTimeOverlayClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
+  GstDWriteBaseOverlayClass *overlay_class =
+      GST_DWRITE_BASE_OVERLAY_CLASS (klass);
+
+  object_class->finalize = gst_dwrite_time_overlay_finalize;
+  object_class->set_property = gst_dwrite_time_overlay_set_property;
+  object_class->get_property = gst_dwrite_time_overlay_get_property;
+
+  g_object_class_install_property (object_class, PROP_TIME_LINE,
+      g_param_spec_enum ("time-mode", "Time Mode", "What time to show",
+          GST_TYPE_DWrite_TIME_OVERLAY_TIME_LINE, DEFAULT_TIME_LINE,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property (object_class, PROP_DATETIME_EPOCH,
+      g_param_spec_boxed ("datetime-epoch", "Datetime Epoch",
+          "When showing times as dates, the initial date from which time "
+          "is counted, if not specified prime epoch is used (1900-01-01)",
+          G_TYPE_DATE_TIME,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property (object_class, PROP_DATETIME_FORMAT,
+      g_param_spec_string ("datetime-format", "Datetime Format",
+          "When showing times as dates, the format to render date and time in",
+          DEFAULT_DATETIME_FORMAT,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property (object_class, PROP_SHOW_TIMES_AS_DATES,
+      g_param_spec_boolean ("show-times-as-dates", "Show times as dates",
+          "Whether to display times, counted from datetime-epoch, as dates",
+          DEFAULT_SHOW_TIMES_AS_DATES,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  g_object_class_install_property (object_class, PROP_REFERENCE_TIMESTAMP_CAPS,
+      g_param_spec_boxed ("reference-timestamp-caps",
+          "Reference Timestamp Caps",
+          "Caps to use for the reference timestamp time mode",
+          GST_TYPE_CAPS,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  gst_element_class_set_static_metadata (element_class,
+      "DirectWrite Time Overlay", "Filter/Editor/Video",
+      "Overlays buffer time stamps on a video stream",
+      "Seungha Yang <seungha@centricular.com>");
+
+  trans_class->sink_event =
+      GST_DEBUG_FUNCPTR (gst_dwrite_time_overlay_sink_event);
+
+  trans_class->start = GST_DEBUG_FUNCPTR (gst_dwrite_time_overlay_start);
+  overlay_class->get_text =
+      GST_DEBUG_FUNCPTR (gst_dwrite_time_overlay_get_text);
+
+  GST_DEBUG_CATEGORY_INIT (dwrite_time_overlay_debug,
+      "dwritetimeoverlay", 0, "dwritetimeoverlay");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_DWrite_TIME_OVERLAY_TIME_LINE,
+      (GstPluginAPIFlags) 0);
+}
+
+static void
+gst_dwrite_time_overlay_init (GstDWriteTimeOverlay * self)
+{
+  g_object_set (self, "text-alignment", DWRITE_TEXT_ALIGNMENT_LEADING,
+      "paragraph-alignment", DWRITE_PARAGRAPH_ALIGNMENT_NEAR, nullptr);
+
+  self->priv = new GstDWriteTimeOverlayPrivate ();
+}
+
+static void
+gst_dwrite_time_overlay_finalize (GObject * object)
+{
+  GstDWriteTimeOverlay *self = GST_DWRITE_TIME_OVERLAY (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_dwrite_time_overlay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstDWriteTimeOverlay *self = GST_DWRITE_TIME_OVERLAY (object);
+  GstDWriteTimeOverlayPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_TIME_LINE:
+      priv->time_line = (GstDWriteTimeOverlayTimeLine) g_value_get_enum (value);
+      break;
+    case PROP_SHOW_TIMES_AS_DATES:
+      priv->show_times_as_dates = g_value_get_boolean (value);
+      break;
+    case PROP_DATETIME_EPOCH:
+      g_date_time_unref (priv->datetime_epoch);
+      priv->datetime_epoch = (GDateTime *) g_value_dup_boxed (value);
+      break;
+    case PROP_DATETIME_FORMAT:
+    {
+      const gchar *format = g_value_get_string (value);
+      if (format)
+        priv->datetime_format = format;
+      else
+        priv->datetime_format = DEFAULT_DATETIME_FORMAT;
+      break;
+    }
+    case PROP_REFERENCE_TIMESTAMP_CAPS:
+      gst_clear_caps (&priv->reference_timestamp_caps);
+      priv->reference_timestamp_caps = (GstCaps *) g_value_dup_boxed (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_dwrite_time_overlay_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstDWriteTimeOverlay *self = GST_DWRITE_TIME_OVERLAY (object);
+  GstDWriteTimeOverlayPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_TIME_LINE:
+      g_value_set_enum (value, priv->time_line);
+      break;
+    case PROP_SHOW_TIMES_AS_DATES:
+      g_value_set_boolean (value, priv->show_times_as_dates);
+      break;
+    case PROP_DATETIME_EPOCH:
+      g_value_set_boxed (value, priv->datetime_epoch);
+      break;
+    case PROP_DATETIME_FORMAT:
+      g_value_set_string (value, priv->datetime_format.c_str ());
+      break;
+    case PROP_REFERENCE_TIMESTAMP_CAPS:
+      g_value_set_boxed (value, priv->reference_timestamp_caps);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static gboolean
+gst_dwrite_time_overlay_start (GstBaseTransform * trans)
+{
+  GstDWriteTimeOverlay *self = GST_DWRITE_TIME_OVERLAY (trans);
+  GstDWriteTimeOverlayPrivate *priv = self->priv;
+
+  priv->first_running_time = GST_CLOCK_TIME_NONE;
+  priv->buffer_count = 0;
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->start (trans);
+}
+
+static gboolean
+gst_dwrite_time_overlay_sink_event (GstBaseTransform * trans, GstEvent * event)
+{
+  GstDWriteTimeOverlay *self = GST_DWRITE_TIME_OVERLAY (trans);
+  GstDWriteTimeOverlayPrivate *priv = self->priv;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_FLUSH_STOP:
+      priv->first_running_time = GST_CLOCK_TIME_NONE;
+      break;
+    default:
+      break;
+  }
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->sink_event (trans, event);
+}
+
+static WString
+gst_dwrite_time_overlay_render_time (GstDWriteTimeOverlay * self,
+    GstClockTime time)
+{
+  wchar_t text256;
+  HRESULT hr;
+  guint h, m, s, ms;
+
+  if (!GST_CLOCK_TIME_IS_VALID (time))
+    return WString ();
+
+  h = (guint) (time / (GST_SECOND * 60 * 60));
+  m = (guint) ((time / (GST_SECOND * 60)) % 60);
+  s = (guint) ((time / GST_SECOND) % 60);
+  ms = (guint) ((time % GST_SECOND) / (1000 * 1000));
+
+  hr = StringCbPrintfW (text, sizeof (text), L"%u:%02u:%02u.%03u", h, m, s, ms);
+
+  if (FAILED (hr))
+    return WString ();
+
+  return WString (text);
+}
+
+static WString
+gst_dwrite_time_overlay_get_text (GstDWriteBaseOverlay * overlay,
+    const WString & default_text, GstBuffer * buffer)
+{
+  GstDWriteTimeOverlay *self = GST_DWRITE_TIME_OVERLAY (overlay);
+  GstDWriteTimeOverlayPrivate *priv = self->priv;
+  WString time_str;
+  WString ret;
+  std::lock_guard < std::mutex > lk (priv->lock);
+  gboolean show_buffer_count = FALSE;
+
+  if (priv->time_line == GST_DWRITE_TIME_OVERLAY_TIME_LINE_TIME_CODE) {
+    GstVideoTimeCodeMeta *tc_meta =
+        gst_buffer_get_video_time_code_meta (buffer);
+    if (!tc_meta) {
+      GST_DEBUG_OBJECT (self, "buffer without valid timecode");
+      time_str = L"00:00:00:00";
+    } else {
+      gchar *str = gst_video_time_code_to_string (&tc_meta->tc);
+      GST_DEBUG_OBJECT (self, "buffer with timecode %s", str);
+      time_str = gst_dwrite_string_to_wstring (str);
+      g_free (str);
+    }
+  } else {
+    GstBaseTransform *trans = GST_BASE_TRANSFORM (overlay);
+    GstClockTime ts, ts_buffer;
+    GstSegment *seg = &trans->segment;
+
+    ts = ts_buffer = GST_BUFFER_TIMESTAMP (buffer);
+    if (GST_CLOCK_TIME_IS_VALID (ts)) {
+      switch (priv->time_line) {
+        case GST_DWRITE_TIME_OVERLAY_TIME_LINE_STREAM_TIME:
+          ts = gst_segment_to_stream_time (seg, GST_FORMAT_TIME, ts_buffer);
+          break;
+        case GST_DWRITE_TIME_OVERLAY_TIME_LINE_RUNNING_TIME:
+          ts = gst_segment_to_running_time (seg, GST_FORMAT_TIME, ts_buffer);
+          break;
+        case GST_DWRITE_TIME_OVERLAY_TIME_LINE_ELAPSED_RUNNING_TIME:
+          ts = gst_segment_to_running_time (seg, GST_FORMAT_TIME, ts_buffer);
+          if (!GST_CLOCK_TIME_IS_VALID (priv->first_running_time))
+            priv->first_running_time = ts;
+          ts -= priv->first_running_time;
+          break;
+        case GST_DWRITE_TIME_OVERLAY_TIME_LINE_REFERENCE_TIMESTAMP:
+        {
+          GstReferenceTimestampMeta *meta;
+          if (priv->reference_timestamp_caps) {
+            meta = gst_buffer_get_reference_timestamp_meta (buffer,
+                priv->reference_timestamp_caps);
+            if (meta)
+              ts = meta->timestamp;
+            else
+              ts = 0;
+          } else {
+            ts = 0;
+          }
+          break;
+        }
+        case GST_DWRITE_TIME_OVERLAY_TIME_LINE_BUFFER_COUNT:
+          show_buffer_count = TRUE;
+          priv->buffer_count++;
+          break;
+        case GST_DWRITE_TIME_OVERLAY_TIME_LINE_BUFFER_OFFSET:
+          show_buffer_count = TRUE;
+          ts = gst_segment_to_running_time (seg, GST_FORMAT_TIME, ts_buffer);
+          priv->buffer_count = gst_util_uint64_scale (ts, overlay->info.fps_n,
+              overlay->info.fps_d * GST_SECOND);
+          break;
+        case GST_DWRITE_TIME_OVERLAY_TIME_LINE_BUFFER_TIME:
+        default:
+          ts = ts_buffer;
+          break;
+      }
+
+      if (show_buffer_count) {
+        time_str = std::to_wstring (priv->buffer_count);
+      } else if (priv->show_times_as_dates) {
+        GDateTime *datetime;
+        gchar *str;
+
+        datetime =
+            g_date_time_add_seconds (priv->datetime_epoch,
+            ((gdouble) ts) / GST_SECOND);
+
+        str = g_date_time_format (datetime, priv->datetime_format.c_str ());
+        time_str = gst_dwrite_string_to_wstring (str);
+
+        g_free (str);
+        g_date_time_unref (datetime);
+      } else {
+        time_str = gst_dwrite_time_overlay_render_time (self, ts);
+      }
+    }
+  }
+
+  if (default_text.empty ())
+    return time_str;
+
+  return default_text + WString (L" ") + time_str;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/gstdwritetimeoverlay.h Added

@@ -0,0 +1,30 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstdwritebaseoverlay.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_DWRITE_TIME_OVERLAY (gst_dwrite_time_overlay_get_type())
+G_DECLARE_FINAL_TYPE (GstDWriteTimeOverlay,
+    gst_dwrite_time_overlay, GST, DWRITE_TIME_OVERLAY, GstDWriteBaseOverlay);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption Added

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/LICENSE.txt Added

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/caption.c Added

@@ -0,0 +1,529 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#include "caption.h"
+#include "eia608.h"
+#include "utf8.h"
+#include "xds.h"
+#include <stdio.h>
+#include <string.h>
+////////////////////////////////////////////////////////////////////////////////
+void
+caption_frame_buffer_clear (caption_frame_buffer_t * buff)
+{
+  memset (buff, 0, sizeof (caption_frame_buffer_t));
+}
+
+void
+caption_frame_state_clear (caption_frame_t * frame)
+{
+  frame->write = 0;
+  frame->timestamp = -1;
+  frame->state = (caption_frame_state_t) {
+  0, 0, 0, SCREEN_ROWS - 1, 0, 0};      // clear global state
+}
+
+void
+caption_frame_init (caption_frame_t * frame)
+{
+  xds_init (&frame->xds);
+  caption_frame_state_clear (frame);
+  caption_frame_buffer_clear (&frame->back);
+  caption_frame_buffer_clear (&frame->front);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Helpers
+static caption_frame_cell_t *
+frame_buffer_cell (caption_frame_buffer_t * buff, int row, int col)
+{
+  if (!buff || 0 > row || SCREEN_ROWS <= row || 0 > col || SCREEN_COLS <= col) {
+    return 0;
+  }
+
+  return &buff->cellrowcol;
+}
+
+int caption_frame_clear_char (caption_frame_t * frame, int row, int col)
+{
+  if (!frame->write) {
+    return 0;
+  }
+
+  caption_frame_cell_t *cell = frame_buffer_cell (frame->write, row, col);
+
+  if (cell) {
+    memset (cell, 0, sizeof (caption_frame_cell_t));
+    return 1;
+  }
+
+  return 0;
+}
+
+uint16_t _eia608_from_utf8 (const char *s);     // function is in eia608.c.re2c
+int
+caption_frame_write_char (caption_frame_t * frame, int row, int col,
+    eia608_style_t style, int underline, const char *c)
+{
+  if (!frame->write || !_eia608_from_utf8 (c)) {
+    return 0;
+  }
+
+  caption_frame_cell_t *cell = frame_buffer_cell (frame->write, row, col);
+
+  if (cell && utf8_char_copy (&cell->data0, c)) {
+    cell->uln = underline;
+    cell->sty = style;
+    return 1;
+  }
+
+  return 0;
+}
+
+const utf8_char_t *
+caption_frame_read_char (caption_frame_t * frame, int row, int col,
+    eia608_style_t * style, int *underline)
+{
+  // always read from front
+  caption_frame_cell_t *cell = frame_buffer_cell (&frame->front, row, col);
+
+  if (!cell) {
+    if (style) {
+      (*style) = eia608_style_white;
+    }
+
+    if (underline) {
+      (*underline) = 0;
+    }
+
+    return EIA608_CHAR_NULL;
+  }
+
+  if (style) {
+    (*style) = cell->sty;
+  }
+
+  if (underline) {
+    (*underline) = cell->uln;
+  }
+
+  return &cell->data0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Parsing
+libcaption_stauts_t
+caption_frame_carriage_return (caption_frame_t * frame)
+{
+  if (0 > frame->state.row || SCREEN_ROWS <= frame->state.row) {
+    return LIBCAPTION_ERROR;
+  }
+
+  int r = frame->state.row - (frame->state.rup - 1);
+
+  if (0 >= r || !caption_frame_rollup (frame)) {
+    return LIBCAPTION_OK;
+  }
+
+  for (; r < SCREEN_ROWS; ++r) {
+    uint8_t *dst = (uint8_t *) frame_buffer_cell (frame->write, r - 1, 0);
+    uint8_t *src = (uint8_t *) frame_buffer_cell (frame->write, r - 0, 0);
+    memcpy (dst, src, sizeof (caption_frame_cell_t) * SCREEN_COLS);
+  }
+
+  frame->state.col = 0;
+  caption_frame_cell_t *cell =
+      frame_buffer_cell (frame->write, SCREEN_ROWS - 1, 0);
+  memset (cell, 0, sizeof (caption_frame_cell_t) * SCREEN_COLS);
+  return LIBCAPTION_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+libcaption_stauts_t
+eia608_write_char (caption_frame_t * frame, char *c)
+{
+  if (0 == c || 0 == c0 || SCREEN_ROWS <= frame->state.row
+      || 0 > frame->state.row || SCREEN_COLS <= frame->state.col
+      || 0 > frame->state.col) {
+    // NO-OP
+  } else if (caption_frame_write_char (frame, frame->state.row,
+          frame->state.col, frame->state.sty, frame->state.uln, c)) {
+    frame->state.col += 1;
+  }
+
+  return LIBCAPTION_OK;
+}
+
+libcaption_stauts_t
+caption_frame_end (caption_frame_t * frame)
+{
+  memcpy (&frame->front, &frame->back, sizeof (caption_frame_buffer_t));
+  caption_frame_buffer_clear (&frame->back);    // This is required
+  return LIBCAPTION_READY;
+}
+
+libcaption_stauts_t
+caption_frame_decode_preamble (caption_frame_t * frame, uint16_t cc_data)
+{
+  eia608_style_t sty;
+  int row, col, chn, uln;
+
+  if (eia608_parse_preamble (cc_data, &row, &col, &sty, &chn, &uln)) {
+    frame->state.row = row;
+    frame->state.col = col;
+    frame->state.sty = sty;
+    frame->state.uln = uln;
+  }
+
+  return LIBCAPTION_OK;
+}
+
+libcaption_stauts_t
+caption_frame_decode_midrowchange (caption_frame_t * frame, uint16_t cc_data)
+{
+  eia608_style_t sty;
+  int chn, unl;
+
+  if (eia608_parse_midrowchange (cc_data, &chn, &sty, &unl)) {
+    frame->state.sty = sty;
+    frame->state.uln = unl;
+  }
+
+  return LIBCAPTION_OK;
+}
+
+libcaption_stauts_t
+caption_frame_backspace (caption_frame_t * frame)
+{
+  // do not reverse wrap (tw 28:20)
+  frame->state.col = (0 < frame->state.col) ? (frame->state.col - 1) : 0;
+  caption_frame_clear_char (frame, frame->state.row, frame->state.col);
+  return LIBCAPTION_READY;
+}
+
+libcaption_stauts_t
+caption_frame_delete_to_end_of_row (caption_frame_t * frame)
+{
+  int c;
+  if (frame->write) {
+    for (c = frame->state.col; c < SCREEN_COLS; ++c) {
+      caption_frame_clear_char (frame, frame->state.row, c);
+    }
+  }
+  // TODO test this and replace loop
+  //  uint8_t* dst = (uint8_t*)frame_buffer_cell(frame->write, frame->state.row, frame->state.col);
+  //  memset(dst,0,sizeof(caption_frame_cell_t) * (SCREEN_COLS - frame->state.col - 1))
+
+  return LIBCAPTION_READY;
+}
+
+libcaption_stauts_t
+caption_frame_decode_control (caption_frame_t * frame, uint16_t cc_data)
+{
+  int cc;
+  eia608_control_t cmd = eia608_parse_control (cc_data, &cc);
+
+  switch (cmd) {
+      // PAINT ON
+    case eia608_control_resume_direct_captioning:
+      frame->state.rup = 0;
+      frame->write = &frame->front;
+      return LIBCAPTION_OK;
+
+    case eia608_control_erase_display_memory:
+      caption_frame_buffer_clear (&frame->front);
+      return LIBCAPTION_CLEAR;
+
+      // ROLL-UP
+    case eia608_control_roll_up_2:
+      frame->state.rup = 1;
+      frame->write = &frame->front;
+      return LIBCAPTION_OK;
+
+    case eia608_control_roll_up_3:
+      frame->state.rup = 2;
+      frame->write = &frame->front;
+      return LIBCAPTION_OK;
+
+    case eia608_control_roll_up_4:
+      frame->state.rup = 3;
+      frame->write = &frame->front;
+      return LIBCAPTION_OK;
+
+    case eia608_control_carriage_return:
+      return caption_frame_carriage_return (frame);
+
+      // Corrections (Is this only valid as part of paint on?)
+    case eia608_control_backspace:
+      return caption_frame_backspace (frame);
+    case eia608_control_delete_to_end_of_row:
+      return caption_frame_delete_to_end_of_row (frame);
+
+      // POP ON
+    case eia608_control_resume_caption_loading:
+      frame->state.rup = 0;
+      frame->write = &frame->back;
+      return LIBCAPTION_OK;
+
+    case eia608_control_erase_non_displayed_memory:
+      caption_frame_buffer_clear (&frame->back);
+      return LIBCAPTION_OK;
+
+    case eia608_control_end_of_caption:
+      return caption_frame_end (frame);
+
+      // cursor positioning
+    case eia608_tab_offset_0:
+    case eia608_tab_offset_1:
+    case eia608_tab_offset_2:
+    case eia608_tab_offset_3:
+      frame->state.col += (cmd - eia608_tab_offset_0);
+      return LIBCAPTION_OK;
+
+      // Unhandled
+    default:
+    case eia608_control_alarm_off:
+    case eia608_control_alarm_on:
+    case eia608_control_text_restart:
+    case eia608_control_text_resume_text_display:
+      return LIBCAPTION_OK;
+  }
+}
+
+libcaption_stauts_t
+caption_frame_decode_text (caption_frame_t * frame, uint16_t cc_data)
+{
+  int chan;
+  char char15, char25;
+  size_t chars = eia608_to_utf8 (cc_data, &chan, &char10, &char20);
+
+  if (eia608_is_westeu (cc_data)) {
+    // Extended charcters replace the previous charcter for back compatibility
+    caption_frame_backspace (frame);
+  }
+
+  if (0 < chars) {
+    eia608_write_char (frame, char1);
+  }
+
+  if (1 < chars) {
+    eia608_write_char (frame, char2);
+  }
+
+  return LIBCAPTION_OK;
+}
+
+libcaption_stauts_t
+caption_frame_decode (caption_frame_t * frame, uint16_t cc_data,
+    double timestamp)
+{
+  if (!eia608_parity_varify (cc_data)) {
+    frame->status = LIBCAPTION_ERROR;
+    return frame->status;
+  }
+
+  if (eia608_is_padding (cc_data)) {
+    frame->status = LIBCAPTION_OK;
+    return frame->status;
+  }
+
+  // skip duplicate controll commands. We also skip duplicate specialna to match the behaviour of iOS/vlc
+  if ((eia608_is_specialna(cc_data) || eia608_is_control(cc_data)) && cc_data == frame->state.cc_data) {
+    if (timestamp < 0 && caption_frame_popon (frame))
+      frame->timestamp += (1 / 29.97);
+    return LIBCAPTION_OK;
+  }
+
+  if (timestamp >= 0) {
+      frame->timestamp = timestamp;
+      frame->status = LIBCAPTION_OK;
+  } else if (caption_frame_popon (frame)) {
+    frame->timestamp += (1 / 29.97);
+  }
+
+  frame->state.cc_data = cc_data;
+
+  if (frame->xds.state) {
+    frame->status = xds_decode (&frame->xds, cc_data);
+  } else if (eia608_is_xds (cc_data)) {
+    frame->status = xds_decode (&frame->xds, cc_data);
+  } else if (eia608_is_control (cc_data)) {
+    frame->status = caption_frame_decode_control (frame, cc_data);
+  } else if (eia608_is_basicna (cc_data) || eia608_is_specialna (cc_data)
+      || eia608_is_westeu (cc_data)) {
+
+    // Don't decode text if we dont know what mode we are in.
+    if (!frame->write) {
+      frame->status = LIBCAPTION_OK;
+      return frame->status;
+    }
+
+    frame->status = caption_frame_decode_text (frame, cc_data);
+
+    // If we are in paint on mode, display immiditally
+    if (LIBCAPTION_OK == frame->status && caption_frame_painton (frame)) {
+      frame->status = LIBCAPTION_READY;
+    }
+  } else if (eia608_is_preamble (cc_data)) {
+    frame->status = caption_frame_decode_preamble (frame, cc_data);
+  } else if (eia608_is_midrowchange (cc_data)) {
+    frame->status = caption_frame_decode_midrowchange (frame, cc_data);
+  }
+
+  return frame->status;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+int
+caption_frame_from_text (caption_frame_t * frame, const utf8_char_t * data)
+{
+  ssize_t size = (ssize_t) strlen (data);
+  caption_frame_init (frame);
+  frame->write = &frame->back;
+
+  for (size_t r = 0; (*data) && size && r < SCREEN_ROWS;) {
+    // skip whitespace at start of line
+    while (size && utf8_char_whitespace (data)) {
+      size_t s = utf8_char_length (data);
+      data += s, size -= s;
+    }
+
+    // get charcter count for wrap (or orest of line)
+    utf8_size_t char_count = utf8_wrap_length (data, SCREEN_COLS);
+    // write to caption frame
+    for (size_t c = 0; c < char_count; ++c) {
+      size_t char_length = utf8_char_length (data);
+      caption_frame_write_char (frame, r, c, eia608_style_white, 0, data);
+      data += char_length, size -= char_length;
+    }
+
+    r += char_count ? 1 : 0;    // Update row num only if not blank
+  }
+
+  caption_frame_end (frame);
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+size_t
+caption_frame_to_text (caption_frame_t * frame, utf8_char_t * data, int full)
+{
+  int r, c, uln, crlf = 0, count = 0;
+  size_t s, size = 0;
+  eia608_style_t sty;
+  (*data) = '\0';
+
+  for (r = 0; r < SCREEN_ROWS; ++r) {
+    crlf += count, count = 0;
+    for (c = 0; c < SCREEN_COLS; ++c) {
+      const utf8_char_t *chr =
+          caption_frame_read_char (frame, r, c, &sty, &uln);
+      // dont start a new line until we encounter at least one printable character
+      if (full ||
+          (0 < utf8_char_length (chr) && (0 < count
+              || !utf8_char_whitespace (chr)))) {
+        if (0 < crlf) {
+          memcpy (data, "\r\n\0", 3);
+          data += 2, size += 2, crlf = 0;
+        }
+
+        s = utf8_char_copy (data, chr);
+        data += s, size += s, ++count;
+      }
+    }
+  }
+
+  return size;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+size_t
+caption_frame_dump_buffer (caption_frame_t * frame, utf8_char_t * buf)
+{
+  int r, c;
+  size_t bytes, total = 0;
+  bytes =
+      sprintf (buf,
+      "   timestamp: %f\n   row: %02d    col: %02d    roll-up: %d\n",
+      frame->timestamp, frame->state.row, frame->state.col,
+      caption_frame_rollup (frame));
+  total += bytes, buf += bytes;
+  bytes =
+      sprintf (buf,
+      "   00000000001111111111222222222233\t   00000000001111111111222222222233\n"
+      "   01234567890123456789012345678901\t   01234567890123456789012345678901\n"
+      "  %s--------------------------------%s\t  %s--------------------------------%s\n",
+      EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT,
+      EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT,
+      EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT,
+      EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT);
+  total += bytes;
+  buf += bytes;
+
+  for (r = 0; r < SCREEN_ROWS; ++r) {
+    bytes = sprintf (buf, "%02d%s", r, EIA608_CHAR_VERTICAL_LINE);
+    total += bytes, buf += bytes;
+
+    // front buffer
+    for (c = 0; c < SCREEN_COLS; ++c) {
+      caption_frame_cell_t *cell = frame_buffer_cell (&frame->front, r, c);
+      bytes = utf8_char_copy (buf, (!cell
+              || 0 == cell->data0) ? EIA608_CHAR_SPACE : &cell->data0);
+      total += bytes, buf += bytes;
+    }
+
+    bytes =
+        sprintf (buf, "%s\t%02d%s", EIA608_CHAR_VERTICAL_LINE, r,
+        EIA608_CHAR_VERTICAL_LINE);
+    total += bytes, buf += bytes;
+
+    // back buffer
+    for (c = 0; c < SCREEN_COLS; ++c) {
+      caption_frame_cell_t *cell = frame_buffer_cell (&frame->back, r, c);
+      bytes = utf8_char_copy (buf, (!cell
+              || 0 == cell->data0) ? EIA608_CHAR_SPACE : &cell->data0);
+      total += bytes, buf += bytes;
+    }
+
+    bytes = sprintf (buf, "%s\n", EIA608_CHAR_VERTICAL_LINE);
+    total += bytes, buf += bytes;
+  }
+
+  bytes =
+      sprintf (buf,
+      "  %s--------------------------------%s\t  %s--------------------------------%s\n",
+      EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT,
+      EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT,
+      EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT,
+      EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT);
+  total += bytes, buf += bytes;
+  return total;
+}
+
+void
+caption_frame_dump (caption_frame_t * frame)
+{
+  utf8_char_t buffCAPTION_FRAME_DUMP_BUF_SIZE;
+  caption_frame_dump_buffer (frame, buff);
+  fprintf (stderr, "%s\n", buff);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/caption.h Added

@@ -0,0 +1,136 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#ifndef LIBCAPTION_H
+#define LIBCAPTION_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "eia608.h"
+#include "utf8.h"
+#include "xds.h"
+
+typedef enum {
+    LIBCAPTION_ERROR = 0,
+    LIBCAPTION_OK = 1,
+    LIBCAPTION_READY = 2,
+    LIBCAPTION_CLEAR = 3,
+} libcaption_stauts_t;
+
+static inline libcaption_stauts_t libcaption_status_update(libcaption_stauts_t old_stat, libcaption_stauts_t new_stat)
+{
+    return (LIBCAPTION_ERROR == old_stat || LIBCAPTION_ERROR == new_stat) ? LIBCAPTION_ERROR : (LIBCAPTION_READY == old_stat) ? LIBCAPTION_READY : new_stat;
+}
+
+#define SCREEN_ROWS 15
+#define SCREEN_COLS 32
+
+typedef struct {
+    uint8_t uln; //< underline
+    uint8_t sty; //< style
+    utf8_char_t data5; //< 4 byte utf8 values plus null term
+} caption_frame_cell_t;
+
+typedef struct {
+    caption_frame_cell_t cellSCREEN_ROWSSCREEN_COLS;
+} caption_frame_buffer_t;
+
+typedef struct {
+    uint8_t uln; //< underline
+    uint8_t sty; //< style
+    uint8_t rup; //< roll-up line count minus 1
+    int8_t row, col;
+    uint16_t cc_data;
+} caption_frame_state_t;
+
+// timestamp and duration are in seconds
+typedef struct {
+    double timestamp;
+    xds_t xds;
+    caption_frame_state_t state;
+    caption_frame_buffer_t front;
+    caption_frame_buffer_t back;
+    caption_frame_buffer_t* write;
+    libcaption_stauts_t status;
+} caption_frame_t;
+
+/*!
+    \brief Initializes an allocated caption_frame_t instance
+    \param frame Pointer to prealocated caption_frame_t object
+*/
+void caption_frame_init(caption_frame_t* frame);
+/*! \brief
+    \param
+*/
+static inline int caption_frame_popon(caption_frame_t* frame) { return (frame->write == &frame->back) ? 1 : 0; }
+/*! \brief
+    \param
+*/
+static inline int caption_frame_painton(caption_frame_t* frame) { return (frame->write == &frame->front) ? 1 : 0; }
+/*! \brief
+    \param
+*/
+const static int _caption_frame_rollup = { 0, 2, 3, 4 };
+static inline int caption_frame_rollup(caption_frame_t* frame) { return _caption_frame_rollupframe->state.rup; }
+/*! \brief
+    \param
+*/
+static inline double caption_frame_timestamp(caption_frame_t* frame) { return frame->timestamp; }
+/*! \brief Writes a single charcter to a caption_frame_t object
+    \param frame A pointer to an allocted and initialized caption_frame_t object
+    \param row Row position to write charcter, must be between 0 and SCREEN_ROWS-1
+    \param col Column position to write charcter, must be between 0 and SCREEN_ROWS-1
+    \param style Style to apply to charcter
+    \param underline Set underline attribute, 0 = off any other value = on
+    \param c pointer to a single valid utf8 charcter. Bytes are automatically determined, and a NULL terminator is not required
+*/
+int caption_frame_write_char(caption_frame_t* frame, int row, int col, eia608_style_t style, int underline, const utf8_char_t* c);
+/*! \brief
+    \param
+*/
+const utf8_char_t* caption_frame_read_char(caption_frame_t* frame, int row, int col, eia608_style_t* style, int* underline);
+/*! \brief
+    \param
+*/
+libcaption_stauts_t caption_frame_decode(caption_frame_t* frame, uint16_t cc_data, double timestamp);
+/*! \brief
+    \param
+*/
+int caption_frame_from_text(caption_frame_t* frame, const utf8_char_t* data);
+/*! \brief
+    \param
+*/
+#define CAPTION_FRAME_TEXT_BYTES (4 * ((SCREEN_COLS + 2) * SCREEN_ROWS) + 1)
+size_t caption_frame_to_text(caption_frame_t* frame, utf8_char_t* data, int full);
+/*! \brief
+    \param
+*/
+#define CAPTION_FRAME_DUMP_BUF_SIZE 8192
+size_t caption_frame_dump_buffer(caption_frame_t* frame, utf8_char_t* buf);
+void caption_frame_dump(caption_frame_t* frame);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/eia608.c Added

@@ -0,0 +1,375 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#include "eia608.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+////////////////////////////////////////////////////////////////////////////////
+int eia608_row_map = { 10, -1, 0, 1, 2, 3, 11, 12, 13, 14, 4, 5, 6, 7, 8, 9 };
+int eia608_reverse_row_map =
+    { 2, 3, 4, 5, 10, 11, 12, 13, 14, 15, 0, 6, 7, 8, 9, 1 };
+
+const char *eia608_style_map = {
+  "white",
+  "green",
+  "blue",
+  "cyan",
+  "red",
+  "yellow",
+  "magenta",
+  "italics",
+};
+
+static inline uint16_t
+eia608_row_pramble (int row, int chan, int x, int underline)
+{
+  row = eia608_reverse_row_maprow & 0x0F;
+  return eia608_parity (0x1040 | (chan ? 0x0800 : 0x0000) | ((row << 7) &
+          0x0700) | ((row << 5) & 0x0020) | ((x << 1) & 0x001E) | (underline ?
+      0x0001 : 0x0000));
+}
+
+uint16_t
+eia608_row_column_pramble (int row, int col, int chan, int underline)
+{
+  return eia608_row_pramble (row, chan, 0x8 | (col / 4), underline);
+}
+
+uint16_t
+eia608_row_style_pramble (int row, int chan, eia608_style_t style,
+    int underline)
+{
+  return eia608_row_pramble (row, chan, style, underline);
+}
+
+uint16_t
+eia608_midrow_change (int chan, eia608_style_t style, int underline)
+{
+  return eia608_parity (0x1120 | ((chan << 11) & 0x0800) | ((style << 1) &
+          0x000E) | (underline & 0x0001));
+}
+
+int
+eia608_parse_preamble (uint16_t cc_data, int *row, int *col,
+    eia608_style_t * style, int *chan, int *underline)
+{
+  (*row) =
+      eia608_row_map((0x0700 & cc_data) >> 7) | ((0x0020 & cc_data) >> 5);
+  (*chan) = ! !(0x0800 & cc_data);
+  (*underline) = 0x0001 & cc_data;
+
+  if (0x0010 & cc_data) {
+    (*style) = eia608_style_white;
+    (*col) = 4 * ((0x000E & cc_data) >> 1);
+  } else {
+    (*style) = (0x000E & cc_data) >> 1;
+    (*col) = 0;
+  }
+
+  return 1;
+}
+
+int
+eia608_parse_midrowchange (uint16_t cc_data, int *chan, eia608_style_t * style,
+    int *underline)
+{
+  (*chan) = ! !(0x0800 & cc_data);
+
+  if (0x1120 == (0x7770 & cc_data)) {
+    (*style) = (0x000E & cc_data) >> 1;
+    (*underline) = 0x0001 & cc_data;
+  }
+
+  return 1;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// control command
+eia608_control_t
+eia608_parse_control (uint16_t cc_data, int *cc)
+{
+  if (0x0200 & cc_data) {
+    (*cc) = (cc_data & 0x0800 ? 0x01 : 0x00);
+    return (eia608_control_t) (0x177F & cc_data);
+  } else {
+    (*cc) = (cc_data & 0x0800 ? 0x01 : 0x00) | (cc_data & 0x0100 ? 0x02 : 0x00);
+    return (eia608_control_t) (0x167F & cc_data);
+  }
+}
+
+uint16_t
+eia608_control_command (eia608_control_t cmd, int cc)
+{
+  uint16_t c = (cc & 0x01) ? 0x0800 : 0x0000;
+  uint16_t f = (cc & 0x02) ? 0x0100 : 0x0000;
+
+  if (eia608_tab_offset_0 == (eia608_control_t) (cmd & 0xFFC0)) {
+    return (eia608_control_t) eia608_parity (cmd | c);
+  } else {
+    return (eia608_control_t) eia608_parity (cmd | c | f);
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// text
+static const char *
+utf8_from_index (int idx)
+{
+  return (0 <= idx && EIA608_CHAR_COUNT > idx) ? eia608_char_mapidx : "";
+}
+
+static int
+eia608_to_index (uint16_t cc_data, int *chan, int *c1, int *c2)
+{
+  (*c1) = (*c2) = -1;
+  (*chan) = 0;
+  cc_data &= 0x7F7F;            // strip off parity bits
+
+  // Handle Basic NA BEFORE we strip the channel bit
+  if (eia608_is_basicna (cc_data)) {
+    // we got first char, yes. But what about second char?
+    (*c1) = (cc_data >> 8) - 0x20;
+    cc_data &= 0x00FF;
+
+    if (0x0020 <= cc_data && 0x0080 > cc_data) {
+      (*c2) = cc_data - 0x20;
+      return 2;
+    }
+
+    return 1;
+  }
+  // Check then strip second channel toggle
+  (*chan) = cc_data & 0x0800;
+  cc_data = cc_data & 0xF7FF;
+
+  if (eia608_is_specialna (cc_data)) {
+    // Special North American character
+    (*c1) = cc_data - 0x1130 + 0x60;
+    return 1;
+  }
+
+  if (0x1220 <= cc_data && 0x1240 > cc_data) {
+    // Extended Western European character set, Spanish/Miscellaneous/French
+    (*c1) = cc_data - 0x1220 + 0x70;
+    return 1;
+  }
+
+  if (0x1320 <= cc_data && 0x1340 > cc_data) {
+    // Extended Western European character set, Portuguese/German/Danish
+    (*c1) = cc_data - 0x1320 + 0x90;
+    return 1;
+  }
+
+  return 0;
+}
+
+int
+eia608_to_utf8 (uint16_t c, int *chan, char *str1, char *str2)
+{
+  int c1, c2;
+  int size = (int) eia608_to_index (c, chan, &c1, &c2);
+  utf8_char_copy (str1, utf8_from_index (c1));
+  utf8_char_copy (str2, utf8_from_index (c2));
+  return size;
+}
+
+uint16_t
+eia608_from_basicna (uint16_t bna1, uint16_t bna2)
+{
+  if (!eia608_is_basicna (bna1) || !eia608_is_basicna (bna2)) {
+    return 0;
+  }
+
+  return eia608_parity ((0xFF00 & bna1) | ((0xFF00 & bna2) >> 8));
+}
+
+// prototype for re2c generated function
+uint16_t _eia608_from_utf8 (const utf8_char_t * s);
+uint16_t
+eia608_from_utf8_1 (const utf8_char_t * c, int chan)
+{
+  uint16_t cc_data = _eia608_from_utf8 (c);
+
+  if (0 == cc_data) {
+    return cc_data;
+  }
+
+  if (chan && !eia608_is_basicna (cc_data)) {
+    cc_data |= 0x0800;
+  }
+
+  return eia608_parity (cc_data);
+}
+
+uint16_t
+eia608_from_utf8_2 (const utf8_char_t * c1, const utf8_char_t * c2)
+{
+  uint16_t cc1 = _eia608_from_utf8 (c1);
+  uint16_t cc2 = _eia608_from_utf8 (c2);
+  return eia608_from_basicna (cc1, cc2);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+int
+eia608_to_text (char *buf, ssize_t size, uint16_t cc_data)
+{
+  eia608_style_t style;
+  const char *text = 0;
+  char char15, char25;
+  char10 = char20 = 0;
+  int row, col, chan, underline;
+  int ret;
+
+  if (!eia608_parity_varify (cc_data)) {
+    text = "parity failed";
+  } else if (0 == eia608_parity_strip (cc_data)) {
+    text = "pad";
+  } else if (eia608_is_basicna (cc_data)) {
+    text = "basicna";
+    eia608_to_utf8 (cc_data, &chan, &char10, &char20);
+  } else if (eia608_is_specialna (cc_data)) {
+    text = "specialna";
+    eia608_to_utf8 (cc_data, &chan, &char10, &char20);
+  } else if (eia608_is_westeu (cc_data)) {
+    text = "westeu";
+    eia608_to_utf8 (cc_data, &chan, &char10, &char20);
+  } else if (eia608_is_xds (cc_data)) {
+    text = "xds";
+  } else if (eia608_is_midrowchange (cc_data)) {
+    text = "midrowchange";
+  } else if (eia608_is_norpak (cc_data)) {
+    text = "norpak";
+  } else if (eia608_is_preamble (cc_data)) {
+    eia608_parse_preamble (cc_data, &row, &col, &style, &chan, &underline);
+    ret = snprintf(buf, size, "cc %04X (%04X) '%s' '%s' (preamble: row: %d col: %d style: %d chan: %d underline: %d)",
+        cc_data, eia608_parity_strip (cc_data), char1, char2, row, col, style, chan, underline);
+  } else if (eia608_is_control (cc_data)) {
+    switch (eia608_parse_control (cc_data, &chan)) {
+
+      default:
+        text = "unknown_control";
+        break;
+
+      case eia608_tab_offset_0:
+        text = "eia608_tab_offset_0";
+        break;
+
+      case eia608_tab_offset_1:
+        text = "eia608_tab_offset_1";
+        break;
+
+      case eia608_tab_offset_2:
+        text = "eia608_tab_offset_2";
+        break;
+
+      case eia608_tab_offset_3:
+        text = "eia608_tab_offset_3";
+        break;
+
+      case eia608_control_resume_caption_loading:
+        text = "eia608_control_resume_caption_loading";
+        break;
+
+      case eia608_control_backspace:
+        text = "eia608_control_backspace";
+        break;
+
+      case eia608_control_alarm_off:
+        text = "eia608_control_alarm_off";
+        break;
+
+      case eia608_control_alarm_on:
+        text = "eia608_control_alarm_on";
+        break;
+
+      case eia608_control_delete_to_end_of_row:
+        text = "eia608_control_delete_to_end_of_row";
+        break;
+
+      case eia608_control_roll_up_2:
+        text = "eia608_control_roll_up_2";
+        break;
+
+      case eia608_control_roll_up_3:
+        text = "eia608_control_roll_up_3";
+        break;
+
+      case eia608_control_roll_up_4:
+        text = "eia608_control_roll_up_4";
+        break;
+
+      case eia608_control_resume_direct_captioning:
+        text = "eia608_control_resume_direct_captioning";
+        break;
+
+      case eia608_control_text_restart:
+        text = "eia608_control_text_restart";
+        break;
+
+      case eia608_control_text_resume_text_display:
+        text = "eia608_control_text_resume_text_display";
+        break;
+
+      case eia608_control_erase_display_memory:
+        text = "eia608_control_erase_display_memory";
+        break;
+
+      case eia608_control_carriage_return:
+        text = "eia608_control_carriage_return";
+        break;
+
+      case eia608_control_erase_non_displayed_memory:
+        text = "eia608_control_erase_non_displayed_memory";
+        break;
+
+      case eia608_control_end_of_caption:
+        text = "eia608_control_end_of_caption";
+        break;
+    }
+  } else {
+    text = "unhandled";
+  }
+
+  if (text != 0) {
+    ret = snprintf (buf, size, "cc %04X (%04X) '%s' '%s' (%s)", cc_data, eia608_parity_strip (cc_data), char1, char2, text);
+  }
+
+  return ret;
+}
+
+void
+eia608_dump (uint16_t cc_data)
+{
+  char *text = NULL;
+  int bufsz;
+
+  bufsz = eia608_to_text (NULL, 0, cc_data);
+  text = malloc(bufsz + 1);
+  eia608_to_text (text, bufsz + 1, cc_data);
+  fprintf (stderr, "%s\n", text);
+
+  free (text);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/eia608.h Added

@@ -0,0 +1,219 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#ifndef LIBCAPTION_EIA608_H
+#define LIBCAPTION_EIA608_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include "eia608_charmap.h"
+#include "utf8.h"
+////////////////////////////////////////////////////////////////////////////////
+// Parity
+#define EIA608_BX(B, X) (((B) << (X)) & 0x80)
+#define EIA608_BP(B) ((B)&0x7F) | (0x80 ^ EIA608_BX((B), 1) ^ EIA608_BX((B), 2) ^ EIA608_BX((B), 3) ^ EIA608_BX((B), 4) ^ EIA608_BX((B), 5) ^ EIA608_BX((B), 6) ^ EIA608_BX((B), 7))
+#define EIA608_B2(B) EIA608_BP((B) + 0), EIA608_BP((B) + 1), EIA608_BP((B) + 2), EIA608_BP((B) + 3), EIA608_BP((B) + 4), EIA608_BP((B) + 5), EIA608_BP((B) + 6), EIA608_BP((B) + 7)
+#define EIA608_B1(B) EIA608_B2((B) + 0), EIA608_B2((B) + 8), EIA608_B2((B) + 16), EIA608_B2((B) + 24), EIA608_B2((B) + 32), EIA608_B2((B) + 40), EIA608_B2((B) + 48), EIA608_B2((B) + 56)
+
+static const uint8_t eia608_parity_table = { EIA608_B1(0), EIA608_B1(64) };
+extern const char* eia608_style_map;
+
+#ifdef _MSC_VER
+#ifndef inline
+#define inline __inline
+#endif
+// ssize_t is POSIX and does not exist on Windows
+#if defined(_WIN64)
+typedef signed long ssize_t;
+#else
+typedef signed int ssize_t;
+#endif
+#endif
+
+/*! \brief
+    \param
+*/
+static inline uint8_t eia608_parity_byte(uint8_t cc_data) { return eia608_parity_table0x7F & cc_data; }
+/*! \brief
+    \param
+*/
+static inline uint16_t eia608_parity_word(uint16_t cc_data) { return (uint16_t)((eia608_parity_byte((uint8_t)(cc_data >> 8)) << 8) | eia608_parity_byte((uint8_t)cc_data)); }
+/*! \brief
+    \param
+*/
+static inline uint16_t eia608_parity(uint16_t cc_data) { return eia608_parity_word(cc_data); }
+/*! \brief
+    \param
+*/
+static inline int eia608_parity_varify(uint16_t cc_data) { return eia608_parity_word(cc_data) == cc_data ? 1 : 0; }
+/*! \brief
+    \param
+*/
+static inline int eia608_parity_strip(uint16_t cc_data) { return cc_data & 0x7F7F; }
+/*! \brief
+    \param
+*/
+static inline int eia608_test_second_channel_bit(uint16_t cc_data) { return (cc_data & 0x0800); }
+
+////////////////////////////////////////////////////////////////////////////////
+// cc_data types
+/*! \brief
+    \param
+*/
+static inline int eia608_is_basicna(uint16_t cc_data) { return 0x0000 != (0x6000 & cc_data); /*&& 0x1F00 < (0x7F00 & cc_data);*/ }
+/*! \brief
+    \param
+*/
+static inline int eia608_is_preamble(uint16_t cc_data) { return 0x1040 == (0x7040 & cc_data); }
+/*! \brief
+    \param
+*/
+static inline int eia608_is_midrowchange(uint16_t cc_data) { return 0x1120 == (0x7770 & cc_data); }
+/*! \brief
+    \param
+*/
+static inline int eia608_is_specialna(uint16_t cc_data) { return 0x1130 == (0x7770 & cc_data); }
+/*! \brief
+    \param
+*/
+static inline int eia608_is_xds(uint16_t cc_data) { return 0x0000 == (0x7070 & cc_data) && 0x0000 != (0x0F0F & cc_data); }
+/*! \brief
+    \param
+*/
+static inline int eia608_is_westeu(uint16_t cc_data) { return 0x1220 == (0x7660 & cc_data); }
+/*! \brief
+    \param
+*/
+static inline int eia608_is_control(uint16_t cc_data) { return 0x1420 == (0x7670 & cc_data) || 0x1720 == (0x7770 & cc_data); }
+/*! \brief
+    \param
+*/
+static inline int eia608_is_norpak(uint16_t cc_data) { return 0x1724 == (0x777C & cc_data) || 0x1728 == (0x777C & cc_data); }
+/*! \brief
+    \param
+*/
+static inline int eia608_is_padding(uint16_t cc_data) { return 0x8080 == cc_data; }
+
+////////////////////////////////////////////////////////////////////////////////
+// preamble
+typedef enum {
+    eia608_style_white = 0,
+    eia608_style_green = 1,
+    eia608_style_blue = 2,
+    eia608_style_cyan = 3,
+    eia608_style_red = 4,
+    eia608_style_yellow = 5,
+    eia608_style_magenta = 6,
+    eia608_style_italics = 7,
+} eia608_style_t;
+
+/*! \brief
+    \param
+*/
+int eia608_parse_preamble(uint16_t cc_data, int* row, int* col, eia608_style_t* style, int* chan, int* underline);
+/*! \brief
+    \param
+*/
+int eia608_parse_midrowchange(uint16_t cc_data, int* chan, eia608_style_t* style, int* underline);
+/*! \brief
+    \param
+*/
+uint16_t eia608_row_column_pramble(int row, int col, int chan, int underline);
+/*! \brief
+    \param
+*/
+uint16_t eia608_row_style_pramble(int row, int chan, eia608_style_t style, int underline);
+/*! \brief
+    \param
+*/
+uint16_t eia608_midrow_change(int chan, eia608_style_t style, int underline);
+////////////////////////////////////////////////////////////////////////////////
+// control command
+typedef enum {
+    eia608_tab_offset_0 = 0x1720,
+    eia608_tab_offset_1 = 0x1721,
+    eia608_tab_offset_2 = 0x1722,
+    eia608_tab_offset_3 = 0x1723,
+    eia608_control_resume_caption_loading = 0x1420,
+    eia608_control_backspace = 0x1421,
+    eia608_control_alarm_off = 0x1422,
+    eia608_control_alarm_on = 0x1423,
+    eia608_control_delete_to_end_of_row = 0x1424,
+    eia608_control_roll_up_2 = 0x1425,
+    eia608_control_roll_up_3 = 0x1426,
+    eia608_control_roll_up_4 = 0x1427,
+    eia608_control_resume_direct_captioning = 0x1429,
+    eia608_control_text_restart = 0x142A,
+    eia608_control_text_resume_text_display = 0x142B,
+    eia608_control_erase_display_memory = 0x142C,
+    eia608_control_carriage_return = 0x142D,
+    eia608_control_erase_non_displayed_memory = 0x142E,
+    eia608_control_end_of_caption = 0x142F,
+} eia608_control_t;
+
+/*! \brief
+    \param
+*/
+uint16_t eia608_control_command(eia608_control_t cmd, int cc);
+/*! \brief
+    \param
+*/
+static inline uint16_t eia608_tab(int size, int cc) { return eia608_control_command((eia608_control_t)(eia608_tab_offset_0 | (size & 0x0F)), cc); }
+/*! \brief
+    \param
+*/
+eia608_control_t eia608_parse_control(uint16_t cc_data, int* cc);
+////////////////////////////////////////////////////////////////////////////////
+// text
+/*! \brief
+    \param c
+*/
+uint16_t eia608_from_utf8_1(const utf8_char_t* c, int chan);
+/*! \brief
+    \param
+*/
+uint16_t eia608_from_utf8_2(const utf8_char_t* c1, const utf8_char_t* c2);
+/*! \brief
+    \param
+*/
+uint16_t eia608_from_basicna(uint16_t bna1, uint16_t bna2);
+/*! \brief
+    \param
+*/
+int eia608_to_utf8(uint16_t c, int* chan, utf8_char_t* char1, utf8_char_t* char2);
+////////////////////////////////////////////////////////////////////////////////
+/*! \brief
+    \param
+*/
+void eia608_dump(uint16_t cc_data);
+/*! \brief
+    \param
+*/
+int eia608_to_text (char *buf, ssize_t size, uint16_t cc_data);
+////////////////////////////////////////////////////////////////////////////////
+#ifdef __cplusplus
+}
+#endif
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/eia608_charmap.c Added

@@ -0,0 +1,208 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#include "eia608_charmap.h"
+// 0 - 95: Basic North American character set
+// 96 - 111: Special North American character
+// 112 - 127: Extended Western European character set : Extended Spanish/Miscellaneous
+// 128 - 143: Extended Western European character set : Extended French
+// 144 - 159: Extended Western European character set : Portuguese
+// 160 - 175: Extended Western European character set : German/Danish
+const char *eia608_char_map = {
+  EIA608_CHAR_SPACE,
+  EIA608_CHAR_EXCLAMATION_MARK,
+  EIA608_CHAR_QUOTATION_MARK,
+  EIA608_CHAR_NUMBER_SIGN,
+  EIA608_CHAR_DOLLAR_SIGN,
+  EIA608_CHAR_PERCENT_SIGN,
+  EIA608_CHAR_AMPERSAND,
+  EIA608_CHAR_RIGHT_SINGLE_QUOTATION_MARK,
+  EIA608_CHAR_LEFT_PARENTHESIS,
+  EIA608_CHAR_RIGHT_PARENTHESIS,
+  EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_ACUTE,
+  EIA608_CHAR_PLUS_SIGN,
+  EIA608_CHAR_COMMA,
+  EIA608_CHAR_HYPHEN_MINUS,
+  EIA608_CHAR_FULL_STOP,
+  EIA608_CHAR_SOLIDUS,
+  EIA608_CHAR_DIGIT_ZERO,
+  EIA608_CHAR_DIGIT_ONE,
+  EIA608_CHAR_DIGIT_TWO,
+  EIA608_CHAR_DIGIT_THREE,
+  EIA608_CHAR_DIGIT_FOUR,
+  EIA608_CHAR_DIGIT_FIVE,
+  EIA608_CHAR_DIGIT_SIX,
+  EIA608_CHAR_DIGIT_SEVEN,
+  EIA608_CHAR_DIGIT_EIGHT,
+  EIA608_CHAR_DIGIT_NINE,
+  EIA608_CHAR_COLON,
+  EIA608_CHAR_SEMICOLON,
+  EIA608_CHAR_LESS_THAN_SIGN,
+  EIA608_CHAR_EQUALS_SIGN,
+  EIA608_CHAR_GREATER_THAN_SIGN,
+  EIA608_CHAR_QUESTION_MARK,
+  EIA608_CHAR_COMMERCIAL_AT,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_A,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_B,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_C,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_D,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_E,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_F,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_G,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_H,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_I,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_J,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_K,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_L,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_M,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_N,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_O,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_P,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_Q,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_R,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_S,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_T,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_U,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_V,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_W,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_X,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_Y,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_Z,
+  EIA608_CHAR_LEFT_SQUARE_BRACKET,
+  EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_ACUTE,
+  EIA608_CHAR_RIGHT_SQUARE_BRACKET,
+  EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_ACUTE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_ACUTE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_ACUTE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_A,
+  EIA608_CHAR_LATIN_SMALL_LETTER_B,
+  EIA608_CHAR_LATIN_SMALL_LETTER_C,
+  EIA608_CHAR_LATIN_SMALL_LETTER_D,
+  EIA608_CHAR_LATIN_SMALL_LETTER_E,
+  EIA608_CHAR_LATIN_SMALL_LETTER_F,
+  EIA608_CHAR_LATIN_SMALL_LETTER_G,
+  EIA608_CHAR_LATIN_SMALL_LETTER_H,
+  EIA608_CHAR_LATIN_SMALL_LETTER_I,
+  EIA608_CHAR_LATIN_SMALL_LETTER_J,
+  EIA608_CHAR_LATIN_SMALL_LETTER_K,
+  EIA608_CHAR_LATIN_SMALL_LETTER_L,
+  EIA608_CHAR_LATIN_SMALL_LETTER_M,
+  EIA608_CHAR_LATIN_SMALL_LETTER_N,
+  EIA608_CHAR_LATIN_SMALL_LETTER_O,
+  EIA608_CHAR_LATIN_SMALL_LETTER_P,
+  EIA608_CHAR_LATIN_SMALL_LETTER_Q,
+  EIA608_CHAR_LATIN_SMALL_LETTER_R,
+  EIA608_CHAR_LATIN_SMALL_LETTER_S,
+  EIA608_CHAR_LATIN_SMALL_LETTER_T,
+  EIA608_CHAR_LATIN_SMALL_LETTER_U,
+  EIA608_CHAR_LATIN_SMALL_LETTER_V,
+  EIA608_CHAR_LATIN_SMALL_LETTER_W,
+  EIA608_CHAR_LATIN_SMALL_LETTER_X,
+  EIA608_CHAR_LATIN_SMALL_LETTER_Y,
+  EIA608_CHAR_LATIN_SMALL_LETTER_Z,
+  EIA608_CHAR_LATIN_SMALL_LETTER_C_WITH_CEDILLA,
+  EIA608_CHAR_DIVISION_SIGN,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_N_WITH_TILDE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_N_WITH_TILDE,
+  EIA608_CHAR_FULL_BLOCK,
+  EIA608_CHAR_REGISTERED_SIGN,
+  EIA608_CHAR_DEGREE_SIGN,
+  EIA608_CHAR_VULGAR_FRACTION_ONE_HALF,
+  EIA608_CHAR_INVERTED_QUESTION_MARK,
+  EIA608_CHAR_TRADE_MARK_SIGN,
+  EIA608_CHAR_CENT_SIGN,
+  EIA608_CHAR_POUND_SIGN,
+  EIA608_CHAR_EIGHTH_NOTE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_GRAVE,
+  EIA608_CHAR_NO_BREAK_SPACE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_GRAVE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX,
+  EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX,
+  EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_CIRCUMFLEX,
+  EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX,
+  EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_CIRCUMFLEX,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_ACUTE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_ACUTE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_ACUTE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_ACUTE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS,
+  EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_DIAERESIS,
+  EIA608_CHAR_LEFT_SINGLE_QUOTATION_MARK,
+  EIA608_CHAR_INVERTED_EXCLAMATION_MARK,
+  EIA608_CHAR_ASTERISK,
+  EIA608_CHAR_APOSTROPHE,
+  EIA608_CHAR_EM_DASH,
+  EIA608_CHAR_COPYRIGHT_SIGN,
+  EIA608_CHAR_SERVICE_MARK,
+  EIA608_CHAR_BULLET,
+  EIA608_CHAR_LEFT_DOUBLE_QUOTATION_MARK,
+  EIA608_CHAR_RIGHT_DOUBLE_QUOTATION_MARK,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_GRAVE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_C_WITH_CEDILLA,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_GRAVE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_DIAERESIS,
+  EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_DIAERESIS,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_CIRCUMFLEX,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS,
+  EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_DIAERESIS,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_GRAVE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_GRAVE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX,
+  EIA608_CHAR_LEFT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK,
+  EIA608_CHAR_RIGHT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_TILDE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_TILDE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_ACUTE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_GRAVE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_GRAVE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_GRAVE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_GRAVE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_TILDE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_TILDE,
+  EIA608_CHAR_LEFT_CURLY_BRACKET,
+  EIA608_CHAR_RIGHT_CURLY_BRACKET,
+  EIA608_CHAR_REVERSE_SOLIDUS,
+  EIA608_CHAR_CIRCUMFLEX_ACCENT,
+  EIA608_CHAR_LOW_LINE,
+  EIA608_CHAR_VERTICAL_LINE,
+  EIA608_CHAR_TILDE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS,
+  EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_DIAERESIS,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS,
+  EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_DIAERESIS,
+  EIA608_CHAR_LATIN_SMALL_LETTER_SHARP_S,
+  EIA608_CHAR_YEN_SIGN,
+  EIA608_CHAR_CURRENCY_SIGN,
+  EIA608_CHAR_BROKEN_BAR,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_RING_ABOVE,
+  EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_STROKE,
+  EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_STROKE,
+  EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT,
+  EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT,
+  EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT,
+  EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT,
+};

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/eia608_charmap.h Added

@@ -0,0 +1,236 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#ifndef LIBCAPTION_EIA608_CHARMAP_H
+#define LIBCAPTION_EIA608_CHARMAP_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define EIA608_CHAR_COUNT 176
+extern const char* eia608_char_mapEIA608_CHAR_COUNT;
+
+// Helper char
+#define EIA608_CHAR_NULL ""
+// Basic North American character set
+#define EIA608_CHAR_SPACE "\x20"
+#define EIA608_CHAR_EXCLAMATION_MARK "\x21"
+#define EIA608_CHAR_QUOTATION_MARK "\x22"
+#define EIA608_CHAR_NUMBER_SIGN "\x23"
+#define EIA608_CHAR_DOLLAR_SIGN "\x24"
+#define EIA608_CHAR_PERCENT_SIGN "\x25"
+#define EIA608_CHAR_AMPERSAND "\x26"
+#define EIA608_CHAR_LEFT_SINGLE_QUOTATION_MARK "\xE2\x80\x98"
+#define EIA608_CHAR_LEFT_PARENTHESIS "\x28"
+#define EIA608_CHAR_RIGHT_PARENTHESIS "\x29"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_ACUTE "\xC3\xA1"
+#define EIA608_CHAR_PLUS_SIGN "\x2B"
+#define EIA608_CHAR_COMMA "\x2C"
+#define EIA608_CHAR_HYPHEN_MINUS "\x2D"
+#define EIA608_CHAR_FULL_STOP "\x2E"
+#define EIA608_CHAR_SOLIDUS "\x2F"
+
+// Basic North American character set
+#define EIA608_CHAR_DIGIT_ZERO "\x30"
+#define EIA608_CHAR_DIGIT_ONE "\x31"
+#define EIA608_CHAR_DIGIT_TWO "\x32"
+#define EIA608_CHAR_DIGIT_THREE "\x33"
+#define EIA608_CHAR_DIGIT_FOUR "\x34"
+#define EIA608_CHAR_DIGIT_FIVE "\x35"
+#define EIA608_CHAR_DIGIT_SIX "\x36"
+#define EIA608_CHAR_DIGIT_SEVEN "\x37"
+#define EIA608_CHAR_DIGIT_EIGHT "\x38"
+#define EIA608_CHAR_DIGIT_NINE "\x39"
+#define EIA608_CHAR_COLON "\x3A"
+#define EIA608_CHAR_SEMICOLON "\x3B"
+#define EIA608_CHAR_LESS_THAN_SIGN "\x3C"
+#define EIA608_CHAR_EQUALS_SIGN "\x3D"
+#define EIA608_CHAR_GREATER_THAN_SIGN "\x3E"
+#define EIA608_CHAR_QUESTION_MARK "\x3F"
+
+// Basic North American character set
+#define EIA608_CHAR_COMMERCIAL_AT "\x40"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A "\x41"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_B "\x42"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_C "\x43"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_D "\x44"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E "\x45"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_F "\x46"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_G "\x47"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_H "\x48"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I "\x49"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_J "\x4A"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_K "\x4B"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_L "\x4C"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_M "\x4D"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_N "\x4E"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O "\x4F"
+
+// Basic North American character set
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_P "\x50"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_Q "\x51"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_R "\x52"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_S "\x53"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_T "\x54"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U "\x55"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_V "\x56"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_W "\x57"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_X "\x58"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_Y "\x59"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_Z "\x5A"
+#define EIA608_CHAR_LEFT_SQUARE_BRACKET "\x5B"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_ACUTE "\xC3\xA9"
+#define EIA608_CHAR_RIGHT_SQUARE_BRACKET "\x5D"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_ACUTE "\xC3\xAD"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_ACUTE "\xC3\xB3"
+
+// Basic North American character set
+#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_ACUTE "\xC3\xBA"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A "\x61"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_B "\x62"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_C "\x63"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_D "\x64"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_E "\x65"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_F "\x66"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_G "\x67"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_H "\x68"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_I "\x69"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_J "\x6A"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_K "\x6B"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_L "\x6C"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_M "\x6D"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_N "\x6E"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O "\x6F"
+
+// Basic North American character set
+#define EIA608_CHAR_LATIN_SMALL_LETTER_P "\x70"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_Q "\x71"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_R "\x72"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_S "\x73"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_T "\x74"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_U "\x75"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_V "\x76"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_W "\x77"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_X "\x78"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_Y "\x79"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_Z "\x7A"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_C_WITH_CEDILLA "\xC3\xA7"
+#define EIA608_CHAR_DIVISION_SIGN "\xC3\xB7"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_N_WITH_TILDE "\xC3\x91"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_N_WITH_TILDE "\xC3\xB1"
+#define EIA608_CHAR_FULL_BLOCK "\xE2\x96\x88"
+
+// Special North American character setedit
+#define EIA608_CHAR_REGISTERED_SIGN "\xC2\xAE"
+#define EIA608_CHAR_DEGREE_SIGN "\xC2\xB0"
+#define EIA608_CHAR_VULGAR_FRACTION_ONE_HALF "\xC2\xBD"
+#define EIA608_CHAR_INVERTED_QUESTION_MARK "\xC2\xBF"
+#define EIA608_CHAR_TRADE_MARK_SIGN "\xE2\x84\xA2"
+#define EIA608_CHAR_CENT_SIGN "\xC2\xA2"
+#define EIA608_CHAR_POUND_SIGN "\xC2\xA3"
+#define EIA608_CHAR_EIGHTH_NOTE "\xE2\x99\xAA"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_GRAVE "\xC3\xA0"
+#define EIA608_CHAR_NO_BREAK_SPACE "\xC2\xA0"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_GRAVE "\xC3\xA8"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX "\xC3\xA2"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX "\xC3\xAA"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_CIRCUMFLEX "\xC3\xAE"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX "\xC3\xB4"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_CIRCUMFLEX "\xC3\xBB"
+
+// Extended Western European character set : Extended Spanish/Miscellaneous
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_ACUTE "\xC3\x81"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_ACUTE "\xC3\x89"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_ACUTE "\xC3\x93"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_ACUTE "\xC3\x9A"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS "\xC3\x9C"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_DIAERESIS "\xC3\xBC"
+#define EIA608_CHAR_RIGHT_SINGLE_QUOTATION_MARK "\xE2\x80\x99"
+#define EIA608_CHAR_INVERTED_EXCLAMATION_MARK "\xC2\xA1"
+#define EIA608_CHAR_ASTERISK "\x2A"
+#define EIA608_CHAR_APOSTROPHE "\x27"
+#define EIA608_CHAR_EM_DASH "\xE2\x80\x94"
+#define EIA608_CHAR_COPYRIGHT_SIGN "\xC2\xA9"
+#define EIA608_CHAR_SERVICE_MARK "\xE2\x84\xA0"
+#define EIA608_CHAR_BULLET "\xE2\x80\xA2"
+#define EIA608_CHAR_LEFT_DOUBLE_QUOTATION_MARK "\xE2\x80\x9C"
+#define EIA608_CHAR_RIGHT_DOUBLE_QUOTATION_MARK "\xE2\x80\x9D"
+
+// Extended Western European character set : Extended French
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_GRAVE "\xC3\x80"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX "\xC3\x82"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_C_WITH_CEDILLA "\xC3\x87"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_GRAVE "\xC3\x88"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX "\xC3\x8A"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_E_WITH_DIAERESIS "\xC3\x8B"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_E_WITH_DIAERESIS "\xC3\xAB"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_CIRCUMFLEX "\xC3\x8E"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS "\xC3\x8F"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_DIAERESIS "\xC3\xAF"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX "\xC3\x94"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_GRAVE "\xC3\x99"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_U_WITH_GRAVE "\xC3\xB9"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX "\xC3\x9B"
+#define EIA608_CHAR_LEFT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK "\xC2\xAB"
+#define EIA608_CHAR_RIGHT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK "\xC2\xBB"
+
+// Extended Western European character set : Portuguese
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_TILDE "\xC3\x83"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_TILDE "\xC3\xA3"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_ACUTE "\xC3\x8D"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_I_WITH_GRAVE "\xC3\x8C"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_I_WITH_GRAVE "\xC3\xAC"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_GRAVE "\xC3\x92"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_GRAVE "\xC3\xB2"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_TILDE "\xC3\x95"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_TILDE "\xC3\xB5"
+#define EIA608_CHAR_LEFT_CURLY_BRACKET "\x7B"
+#define EIA608_CHAR_RIGHT_CURLY_BRACKET "\x7D"
+#define EIA608_CHAR_REVERSE_SOLIDUS "\x5C"
+#define EIA608_CHAR_CIRCUMFLEX_ACCENT "\x5E"
+#define EIA608_CHAR_LOW_LINE "\x5F"
+#define EIA608_CHAR_VERTICAL_LINE "\x7C"
+#define EIA608_CHAR_TILDE "\x7E"
+
+// Extended Western European character set : German/Danish
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS "\xC3\x84"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_DIAERESIS "\xC3\xA4"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS "\xC3\x96"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_DIAERESIS "\xC3\xB6"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_SHARP_S "\xC3\x9F"
+#define EIA608_CHAR_YEN_SIGN "\xC2\xA5"
+#define EIA608_CHAR_CURRENCY_SIGN "\xC2\xA4"
+#define EIA608_CHAR_BROKEN_BAR "\xC2\xA6"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE "\xC3\x85"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_A_WITH_RING_ABOVE "\xC3\xA5"
+#define EIA608_CHAR_LATIN_CAPITAL_LETTER_O_WITH_STROKE "\xC3\x98"
+#define EIA608_CHAR_LATIN_SMALL_LETTER_O_WITH_STROKE "\xC3\xB8"
+#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT "\xE2\x94\x8C" // top left
+#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT "\xE2\x94\x90" // top right
+#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT "\xE2\x94\x94" // lower left
+#define EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT "\xE2\x94\x98" // bottom right
+
+#ifdef __cplusplus
+}
+#endif
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/eia608_from_utf8.c Added

@@ -0,0 +1,799 @@
+/* Generated by re2c 1.0.3 on Tue Jun 19 17:18:11 2018 */
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#include "utf8.h"
+#include <ctype.h>
+#include <stdint.h>
+
+uint16_t
+_eia608_from_utf8 (const utf8_char_t * s)
+{
+  const unsigned char *YYMARKER = 0;
+  const unsigned char *YYCURSOR = (const unsigned char *) s;
+
+  if (0 == s) {
+    return 0x0000;
+  }
+
+
+  {
+    unsigned char yych;
+    yych = *YYCURSOR;
+    if (yych <= '`') {
+      if (yych <= '*') {
+        if (yych <= '&') {
+          if (yych <= 0x00)
+            goto yy2;
+          if (yych <= 0x1F)
+            goto yy4;
+          goto yy6;
+        } else {
+          if (yych <= '\'')
+            goto yy8;
+          if (yych <= ')')
+            goto yy6;
+          goto yy10;
+        }
+      } else {
+        if (yych <= '') {
+          if (yych == '\\')
+            goto yy12;
+          goto yy6;
+        } else {
+          if (yych <= '^')
+            goto yy14;
+          if (yych <= '_')
+            goto yy16;
+          goto yy18;
+        }
+      }
+    } else {
+      if (yych <= 0x7F) {
+        if (yych <= '|') {
+          if (yych <= 'z')
+            goto yy6;
+          if (yych <= '{')
+            goto yy20;
+          goto yy22;
+        } else {
+          if (yych <= '}')
+            goto yy24;
+          if (yych <= '~')
+            goto yy26;
+          goto yy28;
+        }
+      } else {
+        if (yych <= 0xC3) {
+          if (yych <= 0xC1)
+            goto yy4;
+          if (yych <= 0xC2)
+            goto yy30;
+          goto yy31;
+        } else {
+          if (yych == 0xE2)
+            goto yy32;
+          goto yy4;
+        }
+      }
+    }
+  yy2:
+    ++YYCURSOR;
+    {
+       /*NULL*/ return 0x0000;
+    }
+  yy4:
+    ++YYCURSOR;
+  yy5:
+    {                           /*DEFAULT_RULE */
+      return 0x0000;
+    }
+  yy6:
+    ++YYCURSOR;
+    {                           /*ASCII range */
+      return (s0 << 8) & 0xFF00;
+    }
+  yy8:
+    ++YYCURSOR;
+    {                           /*APOSTROPHE -> RIGHT_SINGLE_QUOTATION_MARK */
+      return 0x1229;
+    }
+  yy10:
+    ++YYCURSOR;
+    {
+       /*ASTERISK*/ return 0x1228;
+    }
+  yy12:
+    ++YYCURSOR;
+    {                           /*REVERSE_SOLIDUS */
+      return 0x132B;
+    }
+  yy14:
+    ++YYCURSOR;
+    {                           /*CIRCUMFLEX_ACCENT */
+      return 0x132C;
+    }
+  yy16:
+    ++YYCURSOR;
+    {                           /*LOW_LINE */
+      return 0x132D;
+    }
+  yy18:
+    ++YYCURSOR;
+    {                           /*GRAVE_ACCENT -> LEFT_SINGLE_QUOTATION_MARK */
+      return 0x1226;
+    }
+  yy20:
+    ++YYCURSOR;
+    {                           /*LEFT_CURLY_BRACKET */
+      return 0x1329;
+    }
+  yy22:
+    ++YYCURSOR;
+    {                           /*VERTICAL_LINE */
+      return 0x132E;
+    }
+  yy24:
+    ++YYCURSOR;
+    {                           /*RIGHT_CURLY_BRACKET */
+      return 0x132A;
+    }
+  yy26:
+    ++YYCURSOR;
+    {
+       /*TILDE*/ return 0x132F;
+    }
+  yy28:
+    ++YYCURSOR;
+    {                           /*DEL/BACKSPACE. Need to set bits 9 and 12! return 0x1421; */
+      return 0x0000;
+    }
+  yy30:
+    yych = *++YYCURSOR;
+    switch (yych) {
+      case 0xA0:
+        goto yy33;
+      case 0xA1:
+        goto yy35;
+      case 0xA2:
+        goto yy37;
+      case 0xA3:
+        goto yy39;
+      case 0xA4:
+        goto yy41;
+      case 0xA5:
+        goto yy43;
+      case 0xA6:
+        goto yy45;
+      case 0xA9:
+        goto yy47;
+      case 0xAB:
+        goto yy49;
+      case 0xAE:
+        goto yy51;
+      case 0xB0:
+        goto yy53;
+      case 0xBB:
+        goto yy55;
+      case 0xBD:
+        goto yy57;
+      case 0xBF:
+        goto yy59;
+      default:
+        goto yy5;
+    }
+  yy31:
+    yych = *++YYCURSOR;
+    switch (yych) {
+      case 0x80:
+        goto yy61;
+      case 0x81:
+        goto yy63;
+      case 0x82:
+        goto yy65;
+      case 0x83:
+        goto yy67;
+      case 0x84:
+        goto yy69;
+      case 0x85:
+        goto yy71;
+      case 0x87:
+        goto yy73;
+      case 0x88:
+        goto yy75;
+      case 0x89:
+        goto yy77;
+      case 0x8A:
+        goto yy79;
+      case 0x8B:
+        goto yy81;
+      case 0x8C:
+        goto yy83;
+      case 0x8D:
+        goto yy85;
+      case 0x8E:
+        goto yy87;
+      case 0x8F:
+        goto yy89;
+      case 0x91:
+        goto yy91;
+      case 0x92:
+        goto yy93;
+      case 0x93:
+        goto yy95;
+      case 0x94:
+        goto yy97;
+      case 0x95:
+        goto yy99;
+      case 0x96:
+        goto yy101;
+      case 0x98:
+        goto yy103;
+      case 0x99:
+        goto yy105;
+      case 0x9A:
+        goto yy107;
+      case 0x9B:
+        goto yy109;
+      case 0x9C:
+        goto yy111;
+      case 0x9F:
+        goto yy113;
+      case 0xA0:
+        goto yy115;
+      case 0xA1:
+        goto yy117;
+      case 0xA2:
+        goto yy119;
+      case 0xA3:
+        goto yy121;
+      case 0xA4:
+        goto yy123;
+      case 0xA5:
+        goto yy125;
+      case 0xA7:
+        goto yy127;
+      case 0xA8:
+        goto yy129;
+      case 0xA9:
+        goto yy131;
+      case 0xAA:
+        goto yy133;
+      case 0xAB:
+        goto yy135;
+      case 0xAC:
+        goto yy137;
+      case 0xAD:
+        goto yy139;
+      case 0xAE:
+        goto yy141;
+      case 0xAF:
+        goto yy143;
+      case 0xB1:
+        goto yy145;
+      case 0xB2:
+        goto yy147;
+      case 0xB3:
+        goto yy149;
+      case 0xB4:
+        goto yy151;
+      case 0xB5:
+        goto yy153;
+      case 0xB6:
+        goto yy155;
+      case 0xB7:
+        goto yy157;
+      case 0xB8:
+        goto yy159;
+      case 0xB9:
+        goto yy161;
+      case 0xBA:
+        goto yy163;
+      case 0xBB:
+        goto yy165;
+      case 0xBC:
+        goto yy167;
+      default:
+        goto yy5;
+    }
+  yy32:
+    yych = *(YYMARKER = ++YYCURSOR);
+    switch (yych) {
+      case 0x80:
+        goto yy169;
+      case 0x84:
+        goto yy171;
+      case 0x94:
+        goto yy172;
+      case 0x96:
+        goto yy173;
+      case 0x99:
+        goto yy174;
+      default:
+        goto yy5;
+    }
+  yy33:
+    ++YYCURSOR;
+    {                           /*NO_BREAK_SPACE */
+      return 0x1139;
+    }
+  yy35:
+    ++YYCURSOR;
+    {                           /*INVERTED_EXCLAMATION_MARK */
+      return 0x1227;
+    }
+  yy37:
+    ++YYCURSOR;
+    {                           /*CENT_SIGN */
+      return 0x1135;
+    }
+  yy39:
+    ++YYCURSOR;
+    {                           /*POUND_SIGN */
+      return 0x1136;
+    }
+  yy41:
+    ++YYCURSOR;
+    {                           /*CURRENCY_SIGN */
+      return 0x1336;
+    }
+  yy43:
+    ++YYCURSOR;
+    {                           /*YEN_SIGN */
+      return 0x1335;
+    }
+  yy45:
+    ++YYCURSOR;
+    {                           /*BROKEN_BAR */
+      return 0x1337;
+    }
+  yy47:
+    ++YYCURSOR;
+    {                           /*COPYRIGHT_SIGN */
+      return 0x122B;
+    }
+  yy49:
+    ++YYCURSOR;
+    {                           /*LEFT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK */
+      return 0x123E;
+    }
+  yy51:
+    ++YYCURSOR;
+    {                           /*REGISTERED_SIGN */
+      return 0x1130;
+    }
+  yy53:
+    ++YYCURSOR;
+    {                           /*DEGREE_SIGN */
+      return 0x1131;
+    }
+  yy55:
+    ++YYCURSOR;
+    {                           /*RIGHT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK */
+      return 0x123F;
+    }
+  yy57:
+    ++YYCURSOR;
+    {                           /*VULGAR_FRACTION_ONE_HALF */
+      return 0x1132;
+    }
+  yy59:
+    ++YYCURSOR;
+    {                           /*INVERTED_QUESTION_MARK */
+      return 0x1133;
+    }
+  yy61:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_A_WITH_GRAVE */
+      return 0x1230;
+    }
+  yy63:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_A_WITH_ACUTE */
+      return 0x1220;
+    }
+  yy65:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX */
+      return 0x1231;
+    }
+  yy67:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_A_WITH_TILDE */
+      return 0x1320;
+    }
+  yy69:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS */
+      return 0x1330;
+    }
+  yy71:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE */
+      return 0x1338;
+    }
+  yy73:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_C_WITH_CEDILLA */
+      return 0x1232;
+    }
+  yy75:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_E_WITH_GRAVE */
+      return 0x1233;
+    }
+  yy77:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_E_WITH_ACUTE */
+      return 0x1221;
+    }
+  yy79:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX */
+      return 0x1234;
+    }
+  yy81:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_E_WITH_DIAERESIS */
+      return 0x1235;
+    }
+  yy83:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_I_WITH_GRAVE */
+      return 0x1323;
+    }
+  yy85:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_I_WITH_ACUTE */
+      return 0x1322;
+    }
+  yy87:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_I_WITH_CIRCUMFLEX */
+      return 0x1237;
+    }
+  yy89:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS */
+      return 0x1238;
+    }
+  yy91:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_N_WITH_TILDE */
+      return 0x7D00;
+    }
+  yy93:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_O_WITH_GRAVE */
+      return 0x1325;
+    }
+  yy95:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_O_WITH_ACUTE */
+      return 0x1222;
+    }
+  yy97:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX */
+      return 0x123A;
+    }
+  yy99:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_O_WITH_TILDE */
+      return 0x1327;
+    }
+  yy101:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS */
+      return 0x1332;
+    }
+  yy103:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_O_WITH_STROKE */
+      return 0x133A;
+    }
+  yy105:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_U_WITH_GRAVE */
+      return 0x123B;
+    }
+  yy107:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_U_WITH_ACUTE */
+      return 0x1223;
+    }
+  yy109:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX */
+      return 0x123D;
+    }
+  yy111:
+    ++YYCURSOR;
+    {                           /*LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS */
+      return 0x1224;
+    }
+  yy113:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_SHARP_S */
+      return 0x1334;
+    }
+  yy115:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_A_WITH_GRAVE */
+      return 0x1138;
+    }
+  yy117:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_A_WITH_ACUTE */
+      return 0x2A00;
+    }
+  yy119:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX */
+      return 0x113B;
+    }
+  yy121:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_A_WITH_TILDE */
+      return 0x1321;
+    }
+  yy123:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_A_WITH_DIAERESIS */
+      return 0x1331;
+    }
+  yy125:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_A_WITH_RING_ABOVE */
+      return 0x1339;
+    }
+  yy127:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_C_WITH_CEDILLA */
+      return 0x7B00;
+    }
+  yy129:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_E_WITH_GRAVE */
+      return 0x113A;
+    }
+  yy131:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_E_WITH_ACUTE */
+      return 0x5C00;
+    }
+  yy133:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX */
+      return 0x113C;
+    }
+  yy135:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_E_WITH_DIAERESIS */
+      return 0x1236;
+    }
+  yy137:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_I_WITH_GRAVE */
+      return 0x1324;
+    }
+  yy139:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_I_WITH_ACUTE */
+      return 0x5E00;
+    }
+  yy141:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_I_WITH_CIRCUMFLEX */
+      return 0x113D;
+    }
+  yy143:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_I_WITH_DIAERESIS */
+      return 0x1239;
+    }
+  yy145:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_N_WITH_TILDE */
+      return 0x7E00;
+    }
+  yy147:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_O_WITH_GRAVE */
+      return 0x1326;
+    }
+  yy149:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_O_WITH_ACUTE */
+      return 0x5F00;
+    }
+  yy151:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX */
+      return 0x113E;
+    }
+  yy153:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_O_WITH_TILDE */
+      return 0x1328;
+    }
+  yy155:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_O_WITH_DIAERESIS */
+      return 0x1333;
+    }
+  yy157:
+    ++YYCURSOR;
+    {                           /*DIVISION_SIGN */
+      return 0x7C00;
+    }
+  yy159:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_O_WITH_STROKE */
+      return 0x133B;
+    }
+  yy161:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_U_WITH_GRAVE */
+      return 0x123C;
+    }
+  yy163:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_U_WITH_ACUTE */
+      return 0x6000;
+    }
+  yy165:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_U_WITH_CIRCUMFLEX */
+      return 0x113F;
+    }
+  yy167:
+    ++YYCURSOR;
+    {                           /*LATIN_SMALL_LETTER_U_WITH_DIAERESIS */
+      return 0x1225;
+    }
+  yy169:
+    yych = *++YYCURSOR;
+    switch (yych) {
+      case 0x94:
+        goto yy175;
+      case 0x98:
+        goto yy177;
+      case 0x99:
+        goto yy179;
+      case 0x9C:
+        goto yy181;
+      case 0x9D:
+        goto yy183;
+      case 0xA2:
+        goto yy185;
+      default:
+        goto yy170;
+    }
+  yy170:
+    YYCURSOR = YYMARKER;
+    goto yy5;
+  yy171:
+    yych = *++YYCURSOR;
+    if (yych == 0xA0)
+      goto yy187;
+    if (yych == 0xA2)
+      goto yy189;
+    goto yy170;
+  yy172:
+    yych = *++YYCURSOR;
+    switch (yych) {
+      case 0x8C:
+        goto yy191;
+      case 0x90:
+        goto yy193;
+      case 0x94:
+        goto yy195;
+      case 0x98:
+        goto yy197;
+      default:
+        goto yy170;
+    }
+  yy173:
+    yych = *++YYCURSOR;
+    if (yych == 0x88)
+      goto yy199;
+    goto yy170;
+  yy174:
+    yych = *++YYCURSOR;
+    if (yych == 0xAA)
+      goto yy201;
+    goto yy170;
+  yy175:
+    ++YYCURSOR;
+    {                           /*EM_DASH */
+      return 0x122A;
+    }
+  yy177:
+    ++YYCURSOR;
+    {                           /*LEFT_SINGLE_QUOTATION_MARK */
+      return 0x1226;
+    }
+  yy179:
+    ++YYCURSOR;
+    {                           /*RIGHT_SINGLE_QUOTATION_MARK -> APOSTROPHE */
+      return 0x2700;
+    }
+  yy181:
+    ++YYCURSOR;
+    {                           /*LEFT_DOUBLE_QUOTATION_MARK */
+      return 0x122E;
+    }
+  yy183:
+    ++YYCURSOR;
+    {                           /*RIGHT_DOUBLE_QUOTATION_MARK */
+      return 0x122F;
+    }
+  yy185:
+    ++YYCURSOR;
+    {
+       /*BULLET*/ return 0x122D;
+    }
+  yy187:
+    ++YYCURSOR;
+    {                           /*SERVICE_MARK */
+      return 0x122C;
+    }
+  yy189:
+    ++YYCURSOR;
+    {                           /*TRADE_MARK_SIGN */
+      return 0x1134;
+    }
+  yy191:
+    ++YYCURSOR;
+    {                           /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT */
+      return 0x133C;
+    }
+  yy193:
+    ++YYCURSOR;
+    {                           /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT */
+      return 0x133D;
+    }
+  yy195:
+    ++YYCURSOR;
+    {                           /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT */
+      return 0x133E;
+    }
+  yy197:
+    ++YYCURSOR;
+    {                           /*EIA608_CHAR_BOX_DRAWINGS_LIGHT_UP_AND_LEFT */
+      return 0x133F;
+    }
+  yy199:
+    ++YYCURSOR;
+    {                           /*FULL_BLOCK */
+      return 0x7F00;
+    }
+  yy201:
+    ++YYCURSOR;
+    {                           /*EIGHTH_NOTE */
+      return 0x1137;
+    }
+  }
+
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/meson.build Added

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/utf8.c Added

@@ -0,0 +1,261 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+
+#include "utf8.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+const utf8_char_t *
+utf8_char_next (const utf8_char_t * c)
+{
+  const utf8_char_t *n = c + utf8_char_length (c);
+  return n == c ? 0 : n;
+}
+
+// returnes the length of the char in bytes
+size_t
+utf8_char_length (const utf8_char_t * c)
+{
+  // count null term as zero size
+  if (!c || 0x00 == c0) {
+    return 0;
+  }
+
+  static const size_t _utf8_char_length = {
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2,
+    2, 2, 2, 3, 3, 4, 0
+  };
+
+  return _utf8_char_length(c0 >> 3) & 0x1F;
+}
+
+int
+utf8_char_whitespace (const utf8_char_t * c)
+{
+  // 0x7F is DEL
+  if (!c || (c0 >= 0 && c0 <= ' ') || c0 == 0x7F) {
+    return 1;
+  }
+  // EIA608_CHAR_NO_BREAK_SPACE TODO other utf8 spaces
+  if (0xC2 == (unsigned char) c0 && 0xA0 == (unsigned char) c1) {
+    return 1;
+  }
+
+  return 0;
+}
+
+// returns length of the string in bytes
+// size is number of charcter to count (0 to count until NULL term)
+size_t
+utf8_string_length (const utf8_char_t * data, utf8_size_t size)
+{
+  size_t char_length, byts = 0;
+
+  if (0 == size) {
+    size = utf8_char_count (data, 0);
+  }
+
+  for (; 0 < size; --size) {
+    if (0 == (char_length = utf8_char_length (data))) {
+      break;
+    }
+
+    data += char_length;
+    byts += char_length;
+  }
+
+  return byts;
+}
+
+size_t
+utf8_char_copy (utf8_char_t * dst, const utf8_char_t * src)
+{
+  size_t bytes = utf8_char_length (src);
+
+  if (bytes && dst) {
+    memcpy (dst, src, bytes);
+    dstbytes = '\0';
+  }
+
+  return bytes;
+}
+
+// returnes the number of utf8 charcters in a string given the number of bytes
+// to count until the a null terminator, pass 0 for size
+utf8_size_t
+utf8_char_count (const char *data, size_t size)
+{
+  size_t i, bytes = 0;
+  utf8_size_t count = 0;
+
+  if (0 == size) {
+    size = strlen (data);
+  }
+
+  for (i = 0; i < size; ++count, i += bytes) {
+    if (0 == (bytes = utf8_char_length (&datai))) {
+      break;
+    }
+  }
+
+  return count;
+}
+
+// returns the length of the line in bytes triming not printable charcters at the end
+size_t
+utf8_trimmed_length (const utf8_char_t * data, utf8_size_t charcters)
+{
+  size_t l, t = 0, split_at = 0;
+  for (size_t c = 0; (*data) && c < charcters; ++c) {
+    l = utf8_char_length (data);
+    if (!utf8_char_whitespace (data)) {
+      split_at = t + l;
+    }
+    t += l, data += l;
+  }
+
+  return split_at;
+}
+
+size_t
+_utf8_newline (const utf8_char_t * data)
+{
+  if ('\r' == data0) {
+    return '\n' == data1 ? 2 : 1;     // windows/unix
+  } else if ('\n' == data0) {
+    return '\r' == data1 ? 2 : 1;     // riscos/macos
+  } else {
+    return 0;
+  }
+}
+
+// returns the length in bytes of the line including the new line charcter(s)
+// auto detects between windows(CRLF), unix(LF), mac(CR) and riscos (LFCR) line endings
+size_t
+utf8_line_length (const utf8_char_t * data)
+{
+  size_t n, len = 0;
+
+  for (len = 0; 0 != datalen; ++len) {
+    if (0 < (n = _utf8_newline (data))) {
+      return len + n;
+    }
+
+    data += utf8_char_length (data);
+  }
+
+  return len;
+}
+
+// returns number of chars to include before split
+utf8_size_t
+utf8_wrap_length (const utf8_char_t * data, utf8_size_t size)
+{
+  // Set split_at to size, so if a split point cna not be found, retuns the size passed in
+  size_t char_length, char_count, split_at = size;
+
+  for (char_count = 0; char_count <= size; ++char_count) {
+    if (_utf8_newline (data)) {
+      return char_count;
+    } else if (utf8_char_whitespace (data)) {
+      split_at = char_count;
+    }
+
+    char_length = utf8_char_length (data);
+    data += char_length;
+  }
+
+  return split_at;
+}
+
+int
+utf8_line_count (const utf8_char_t * data)
+{
+  size_t len = 0;
+  int count = 0;
+
+  do {
+    len = utf8_line_length (data);
+    data += len;
+    ++count;
+  } while (0 < len);
+
+  return count - 1;
+}
+
+utf8_char_t *
+utf8_load_text_file (const char *path, size_t * size)
+{
+  utf8_char_t *data = NULL;
+  FILE *file = fopen (path, "r");
+
+  if (file) {
+    fseek (file, 0, SEEK_END);
+    size_t file_size = ftell (file);
+    fseek (file, 0, SEEK_SET);
+
+    if (0 == (*size) || file_size <= (*size)) {
+      (*size) = 0;
+      data = (utf8_char_t *) malloc (1 + file_size);
+      memset (data, '\0', file_size);
+
+      if (data) {
+        utf8_char_t *pos = data;
+        size_t bytes_read = 0;
+
+        while (0 < (bytes_read = fread (pos, 1, file_size - (*size), file))) {
+          pos += bytes_read;
+          (*size) += bytes_read;
+        }
+      }
+
+      fclose (file);
+    }
+  }
+
+  data*size = 0;
+  return data;
+}
+
+#ifndef strnstr
+char *
+strnstr (const char *string1, const char *string2, size_t len)
+{
+  size_t length2;
+
+  length2 = strlen (string2);
+  if (!length2) {
+    return (char *) string1;
+  }
+
+  while (len >= length2) {
+    len--;
+    if (!memcmp (string1, string2, length2))
+      return (char *) string1;
+    string1++;
+  }
+  return NULL;
+}
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/utf8.h Added

@@ -0,0 +1,128 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#ifndef LIBCAPTION_UTF8_H
+#define LIBCAPTION_UTF8_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <inttypes.h>
+#include <stddef.h>
+
+// These types exist to make the code more self dcoumenting
+// utf8_char_t point is a null teminate string of utf8 encodecd chars
+//
+// utf8_size_t is the length of a string in chars
+// size_t is bytes
+typedef char utf8_char_t;
+typedef size_t utf8_size_t;
+/*! \brief
+    \param
+
+    Skiped continuation bytes
+*/
+
+const utf8_char_t* utf8_char_next(const utf8_char_t* c);
+/*! \brief
+    \param
+
+    returnes the length of the char in bytes
+*/
+size_t utf8_char_length(const utf8_char_t* c);
+
+/*! \brief
+    \param
+
+    returns 1 if first charcter is white space
+*/
+int utf8_char_whitespace(const utf8_char_t* c);
+
+/*! \brief
+    \param
+
+    returns length of the string in bytes
+    size is number of charcter to count (0 to count until NULL term)
+*/
+size_t utf8_string_length(const utf8_char_t* data, utf8_size_t size);
+/*! \brief
+    \param
+*/
+size_t utf8_char_copy(utf8_char_t* dst, const utf8_char_t* src);
+
+/*! \brief
+    \param
+
+    returnes the number of utf8 charcters in a string givne the numbe of bytes
+    to coutn until the a null terminator, pass 0 for size
+*/
+utf8_size_t utf8_char_count(const char* data, size_t size);
+/*! \brief
+    \param
+
+    returnes the length of the line in bytes triming not printable characters at the end
+*/
+utf8_size_t utf8_trimmed_length(const utf8_char_t* data, utf8_size_t charcters);
+/*! \brief
+    \param
+
+    returns the length in bytes of the line including the new line charcter(s)
+    auto detects between windows(CRLF), unix(LF), mac(CR) and riscos (LFCR) line endings
+*/
+size_t utf8_line_length(const utf8_char_t* data);
+/*! \brief
+    \param
+
+    returns number of chars to include before split
+*/
+utf8_size_t utf8_wrap_length(const utf8_char_t* data, utf8_size_t size);
+
+/*! \brief
+    \param
+
+    returns number of new lines in the string
+*/
+int utf8_line_count(const utf8_char_t* data);
+
+/*! \brief
+    \param
+    size in/out. In the the max seize, out is the size read;
+    returns number of new lins in teh string
+*/
+#define UFTF_DEFAULT_MAX_FILE_SIZE = (50 * 1024 * 1024);
+
+utf8_char_t* utf8_load_text_file(const char* path, size_t* size);
+
+/*! \brief
+    \param
+
+    Compares 2 strings up to max len
+*/
+#ifndef strnstr
+char* strnstr(const char* string1, const char* string2, size_t len);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/version.txt Added

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/xds.c Added

@@ -0,0 +1,64 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+// http://www.theneitherworld.com/mcpoodle/SCC_TOOLS/DOCS/CC_XDS.HTML#PR
+#include "xds.h"
+#include "caption.h"
+#include <string.h>
+
+void
+xds_init (xds_t * xds)
+{
+  memset (xds, 0, sizeof (xds_t));
+}
+
+int
+xds_decode (xds_t * xds, uint16_t cc)
+{
+  switch (xds->state) {
+    default:
+    case 0:
+      xds_init (xds);
+      xds->class_code = (cc & 0x0F00) >> 8;
+      xds->type = (cc & 0x000F);
+      xds->state = 1;
+      return LIBCAPTION_OK;
+
+    case 1:
+      if (0x8F00 == (cc & 0xFF00)) {
+        xds->checksum = (cc & 0x007F);
+        xds->state = 0;
+        return LIBCAPTION_READY;
+      }
+
+      if (xds->size < 32) {
+        xds->contentxds->size + 0 = (cc & 0x7F00) >> 8;
+        xds->contentxds->size + 1 = (cc & 0x007F);
+        xds->size += 2;
+        return LIBCAPTION_OK;
+      }
+  }
+
+  xds->state = 0;
+  return LIBCAPTION_ERROR;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/libcaption/xds.h Added

@@ -0,0 +1,48 @@
+/**********************************************************************************************/
+/* The MIT License                                                                            */
+/*                                                                                            */
+/* Copyright 2016-2017 Twitch Interactive, Inc. or its affiliates. All Rights Reserved.       */
+/*                                                                                            */
+/* Permission is hereby granted, free of charge, to any person obtaining a copy               */
+/* of this software and associated documentation files (the "Software"), to deal              */
+/* in the Software without restriction, including without limitation the rights               */
+/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                  */
+/* copies of the Software, and to permit persons to whom the Software is                      */
+/* furnished to do so, subject to the following conditions:                                   */
+/*                                                                                            */
+/* The above copyright notice and this permission notice shall be included in                 */
+/* all copies or substantial portions of the Software.                                        */
+/*                                                                                            */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                 */
+/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                   */
+/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                */
+/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                     */
+/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,              */
+/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                  */
+/* THE SOFTWARE.                                                                              */
+/**********************************************************************************************/
+#ifndef LIBCAPTION_XDS_H
+#define LIBCAPTION_XDS_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <inttypes.h>
+#include <stddef.h>
+
+typedef struct {
+    int state;
+    uint8_t class_code;
+    uint8_t type;
+    uint32_t size;
+    uint8_t content32;
+    uint8_t checksum;
+} xds_t;
+
+void xds_init(xds_t* xds);
+int xds_decode(xds_t* xds, uint16_t cc);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/meson.build Added

@@ -0,0 +1,75 @@
+dwrite_sources = 
+  'gstdwrite-effect.cpp',
+  'gstdwrite-enums.cpp',
+  'gstdwrite-renderer.cpp',
+  'gstdwrite-utils.cpp',
+  'gstdwritebaseoverlay.cpp',
+  'gstdwritebitmapmemory.cpp',
+  'gstdwritebitmappool.cpp',
+  'gstdwriteclockoverlay.cpp',
+  'gstdwriteoverlayobject.cpp',
+  'gstdwritesubtitlemux.cpp',
+  'gstdwritesubtitleoverlay.cpp',
+  'gstdwritetextoverlay.cpp',
+  'gstdwritetimeoverlay.cpp',
+  'plugin.cpp',
+
+
+extra_args = '-DGST_USE_UNSTABLE_API'
+
+dwrite_option = get_option('dwrite')
+if host_system != 'windows' or dwrite_option.disabled()
+  subdir_done()
+endif
+
+if not gstd3d11_dep.found()
+  if dwrite_option.enabled()
+    error('The dwrite was enabled explicitly, but required dependencies were not found.')
+  endif
+  subdir_done()
+endif
+
+d2d_dep = cc.find_library('d2d1', required: dwrite_option)
+dwrite_lib = cc.find_library('dwrite', required : dwrite_option)
+windowscodecs_lib = cc.find_library('windowscodecs', required : dwrite_option)
+have_d2d_h = cc.has_header('d2d1_1.h')
+have_dwrite_h = cc.has_header('dwrite.h')
+have_wincodec_h = cc.has_header('wincodec.h')
+
+if not have_d2d_h or not have_dwrite_h or not have_wincodec_h
+  if dwrite_option.enabled()
+    error('The dwrite was enabled explicitly, but required dependencies were not found.')
+  endif
+  subdir_done ()
+endif
+
+if cc.has_header('d2d1_3.h') and cc.has_header('dwrite_3.h')
+  # DWRITE_GLYPH_IMAGE_FORMATS enum requires NTDDI_WIN10_RS1
+  extra_args += '-DWINVER=0x0A00',
+                 '-D_WIN32_WINNT=0x0A00',
+                 '-DNTDDI_VERSION=0x0A000002',
+                 '-DHAVE_DWRITE_COLOR_FONT'
+endif
+
+# MinGW 32bits compiler seems to be complaining about redundant-decls
+# when ComPtr is in use. Let's just disable the warning
+if cc.get_id() != 'msvc'
+  extra_mingw_args = cc.get_supported_arguments(
+    '-Wno-redundant-decls',
+  )
+
+  extra_args += extra_mingw_args
+endif
+
+subdir('libcaption')
+
+gstdwrite = library('gstdwrite',
+  dwrite_sources,
+  c_args : gst_plugins_bad_args + extra_args,
+  cpp_args: gst_plugins_bad_args + extra_args,
+  include_directories : configinc,
+  dependencies : gstbase_dep, gstvideo_dep, gstd3d11_dep, d2d_dep, dwrite_lib, dwrite_libcaption_dep,
+  install : true,
+  install_dir : plugins_install_dir,
+)
+plugins += gstdwrite

gst-plugins-bad-1.24.5.tar.xz/sys/dwrite/plugin.cpp Added

@@ -0,0 +1,61 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * plugin-dwrite:
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstdwritesubtitlemux.h"
+#include "gstdwriteclockoverlay.h"
+#include "gstdwritetextoverlay.h"
+#include "gstdwritetimeoverlay.h"
+#include "gstdwritesubtitleoverlay.h"
+
+GST_DEBUG_CATEGORY (gst_dwrite_debug);
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  GST_DEBUG_CATEGORY_INIT (gst_dwrite_debug, "dwrite", 0, "dwrite");
+
+  gst_element_register (plugin, "dwritesubtitlemux", GST_RANK_NONE,
+      GST_TYPE_DWRITE_SUBTITLE_MUX);
+  gst_element_register (plugin, "dwriteclockoverlay", GST_RANK_NONE,
+      GST_TYPE_DWRITE_CLOCK_OVERLAY);
+  gst_element_register (plugin, "dwritetextoverlay", GST_RANK_NONE,
+      GST_TYPE_DWRITE_TEXT_OVERLAY);
+  gst_element_register (plugin, "dwritetimeoverlay", GST_RANK_NONE,
+      GST_TYPE_DWRITE_TIME_OVERLAY);
+  gst_element_register (plugin, "dwritesubtitleoverlay", GST_RANK_NONE,
+      GST_TYPE_DWRITE_SUBTITLE_OVERLAY);
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    dwrite,
+    "dwrite",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);

gst-plugins-bad-1.22.7.tar.xz/sys/kms/gstkmsallocator.c -> gst-plugins-bad-1.24.5.tar.xz/sys/kms/gstkmsallocator.c Changed

@@ -38,6 +38,7 @@
 #include <drm.h>
 
 #include <gst/allocators/gstdmabuf.h>
+#include <gst/allocators/gstdrmdumb.h>
 
 #include "gstkmsallocator.h"
 #include "gstkmsutils.h"
@@ -51,20 +52,12 @@
 
 #define GST_KMS_MEMORY_TYPE "KMSMemory"
 
-struct kms_bo
-{
-  void *ptr;
-  size_t size;
-  unsigned handle;
-  unsigned int refs;
-};
-
 struct _GstKMSAllocatorPrivate
 {
   int fd;
   /* protected by GstKMSAllocator object lock */
   GList *mem_cache;
-  GstAllocator *dmabuf_alloc;
+  GstAllocator *dumb_alloc;
 };
 
 #define parent_class gst_kms_allocator_parent_class
@@ -101,92 +94,40 @@
   return alloc->priv->fd > -1;
 }
 
-static void
-gst_kms_allocator_memory_reset (GstKMSAllocator * allocator, GstKMSMemory * mem)
-{
-  int err;
-  struct drm_mode_destroy_dumb arg = { 0, };
-
-  if (!check_fd (allocator))
-    return;
-
-  if (mem->fb_id) {
-    GST_DEBUG_OBJECT (allocator, "removing fb id %d", mem->fb_id);
-    drmModeRmFB (allocator->priv->fd, mem->fb_id);
-    mem->fb_id = 0;
-  }
-
-  if (!mem->bo)
-    return;
-
-  if (mem->bo->ptr != NULL) {
-    GST_WARNING_OBJECT (allocator, "destroying mapped bo (refcount=%d)",
-        mem->bo->refs);
-    munmap (mem->bo->ptr, mem->bo->size);
-    mem->bo->ptr = NULL;
-  }
-
-  arg.handle = mem->bo->handle;
-
-  err = drmIoctl (allocator->priv->fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg);
-  if (err)
-    GST_WARNING_OBJECT (allocator,
-        "Failed to destroy dumb buffer object: %s %d",
-        g_strerror (errno), errno);
-
-  g_free (mem->bo);
-  mem->bo = NULL;
-}
-
 static gboolean
 gst_kms_allocator_memory_create (GstKMSAllocator * allocator,
     GstKMSMemory * kmsmem, GstVideoInfo * vinfo)
 {
-  gint i, ret, h;
-  struct drm_mode_create_dumb arg = { 0, };
-  guint32 fmt;
+  gint i, h;
   gint num_planes = GST_VIDEO_INFO_N_PLANES (vinfo);
   gsize offs = 0;
+  guint32 pitch;
 
   if (kmsmem->bo)
     return TRUE;
 
-  if (!check_fd (allocator))
-    return FALSE;
-
-  kmsmem->bo = g_malloc0 (sizeof (*kmsmem->bo));
+  kmsmem->bo = gst_drm_dumb_allocator_alloc (allocator->priv->dumb_alloc,
+      gst_drm_format_from_video (GST_VIDEO_INFO_FORMAT (vinfo)),
+      GST_VIDEO_INFO_WIDTH (vinfo), GST_VIDEO_INFO_HEIGHT (vinfo), &pitch);
   if (!kmsmem->bo)
-    return FALSE;
-
-  fmt = gst_drm_format_from_video (GST_VIDEO_INFO_FORMAT (vinfo));
-  arg.bpp = gst_drm_bpp_from_drm (fmt);
-  arg.width = GST_VIDEO_INFO_WIDTH (vinfo);
-  h = GST_VIDEO_INFO_HEIGHT (vinfo);
-  arg.height = gst_drm_height_from_drm (fmt, h);
-
-  ret = drmIoctl (allocator->priv->fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg);
-  if (ret)
     goto create_failed;
 
-  if (!arg.pitch)
+  if (!pitch)
     goto done;
 
+  h = GST_VIDEO_INFO_HEIGHT (vinfo);
   for (i = 0; i < num_planes; i++) {
-    guint32 pitch;
-
-    if (!arg.pitch)
-      continue;
+    guint32 stride;
 
     /* Overwrite the video info's stride and offset using the pitch calculcated
      * by the kms driver. */
-    pitch = gst_video_format_info_extrapolate_stride (vinfo->finfo, i,
-        arg.pitch);
+    stride = gst_video_format_info_extrapolate_stride (vinfo->finfo, i, pitch);
     GST_VIDEO_INFO_PLANE_STRIDE (vinfo, i) = pitch;
     GST_VIDEO_INFO_PLANE_OFFSET (vinfo, i) = offs;
 
     /* Note that we cannot negotiate special padding betweem each planes,
      * hence using the display height here. */
-    offs += pitch * GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT (vinfo->finfo, i, h);
+    offs += stride * GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT (vinfo->finfo, i, h);
 
     GST_DEBUG_OBJECT (allocator, "Created BO plane %i with stride %i and "
         "offset %" G_GSIZE_FORMAT, i,
@@ -198,10 +139,6 @@
   GST_VIDEO_INFO_SIZE (vinfo) = offs;
 
 done:
-  kmsmem->bo->handle = arg.handle;
-  /* will be used a memory maxsize */
-  kmsmem->bo->size = arg.size;
-
   /* Validate the size to prevent overflow */
   if (kmsmem->bo->size < GST_VIDEO_INFO_SIZE (vinfo)) {
     GST_ERROR_OBJECT (allocator,
@@ -218,8 +155,6 @@
   {
     GST_ERROR_OBJECT (allocator, "Failed to create buffer object: %s (%d)",
         g_strerror (errno), errno);
-    g_free (kmsmem->bo);
-    kmsmem->bo = NULL;
     return FALSE;
   }
 }
@@ -233,8 +168,18 @@
   alloc = GST_KMS_ALLOCATOR (allocator);
   kmsmem = (GstKMSMemory *) mem;
 
-  gst_kms_allocator_memory_reset (alloc, kmsmem);
-  g_slice_free (GstKMSMemory, kmsmem);
+  if (check_fd (alloc) && kmsmem->fb_id) {
+    GST_DEBUG_OBJECT (allocator, "removing fb id %d", kmsmem->fb_id);
+    drmModeRmFB (alloc->priv->fd, kmsmem->fb_id);
+    kmsmem->fb_id = 0;
+  }
+
+  if (kmsmem->bo) {
+    gst_memory_unref (kmsmem->bo);
+    kmsmem->bo = NULL;
+  }
+
+  g_free (kmsmem);
 }
 
 static void
@@ -277,6 +222,22 @@
 }
 
 static void
+gst_kms_allocator_constructed (GObject * obj)
+{
+  GstKMSAllocator *alloc;
+
+  alloc = GST_KMS_ALLOCATOR (obj);
+
+  /* Should be called after the properties are set */
+  g_assert (check_fd (alloc));
+  alloc->priv->dumb_alloc =
+      gst_drm_dumb_allocator_new_with_fd (alloc->priv->fd);
+
+  /* Its already opened and we already checked for dumb allocation support */
+  g_assert (alloc->priv->dumb_alloc);
+}
+
+static void
 gst_kms_allocator_finalize (GObject * obj)
 {
   GstKMSAllocator *alloc;
@@ -285,8 +246,8 @@
 
   gst_kms_allocator_clear_cache (GST_ALLOCATOR (alloc));
 
-  if (alloc->priv->dmabuf_alloc)
-    gst_object_unref (alloc->priv->dmabuf_alloc);
+  if (alloc->priv->dumb_alloc)
+    gst_object_unref (alloc->priv->dumb_alloc);
 
   if (check_fd (alloc))
     close (alloc->priv->fd);
@@ -307,11 +268,12 @@
 
   gobject_class->set_property = gst_kms_allocator_set_property;
   gobject_class->get_property = gst_kms_allocator_get_property;
+  gobject_class->constructed = gst_kms_allocator_constructed;
   gobject_class->finalize = gst_kms_allocator_finalize;
 
   g_propsPROP_DRM_FD = g_param_spec_int ("drm-fd", "DRM fd",
       "DRM file descriptor", -1, G_MAXINT, -1,
-      G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
 
   g_object_class_install_properties (gobject_class, PROP_N, g_props);
 }
@@ -320,46 +282,20 @@
 gst_kms_memory_map (GstMemory * mem, gsize maxsize, GstMapFlags flags)
 {
   GstKMSMemory *kmsmem;
-  GstKMSAllocator *alloc;
-  int err;
-  gpointer out;
-  struct drm_mode_map_dumb arg = { 0, };
-
-  alloc = (GstKMSAllocator *) mem->allocator;
-
-  if (!check_fd (alloc))
-    return NULL;
 
   kmsmem = (GstKMSMemory *) mem;
   if (!kmsmem->bo)
     return NULL;
 
-  /* Reuse existing buffer object mapping if possible */
-  if (kmsmem->bo->ptr != NULL) {
+  if (kmsmem->bo_map.data)
     goto out;
-  }
 
-  arg.handle = kmsmem->bo->handle;
-
-  err = drmIoctl (alloc->priv->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
-  if (err) {
-    GST_ERROR_OBJECT (alloc, "Failed to get offset of buffer object: %s %d",
-        g_strerror (errno), errno);
-    return NULL;
-  }
-
-  out = mmap (0, kmsmem->bo->size,
-      PROT_READ | PROT_WRITE, MAP_SHARED, alloc->priv->fd, arg.offset);
-  if (out == MAP_FAILED) {
-    GST_ERROR_OBJECT (alloc, "Failed to map dumb buffer object: %s %d",
-        g_strerror (errno), errno);
+  if (!gst_memory_map (kmsmem->bo, &kmsmem->bo_map, flags))
     return NULL;
-  }
-  kmsmem->bo->ptr = out;
 
 out:
-  g_atomic_int_inc (&kmsmem->bo->refs);
-  return kmsmem->bo->ptr;
+  g_atomic_int_inc (&kmsmem->bo_map_refs);
+  return kmsmem->bo_map.data;
 }
 
 static void
@@ -367,16 +303,13 @@
 {
   GstKMSMemory *kmsmem;
 
-  if (!check_fd ((GstKMSAllocator *) mem->allocator))
-    return;
-
   kmsmem = (GstKMSMemory *) mem;
   if (!kmsmem->bo)
     return;
 
-  if (g_atomic_int_dec_and_test (&kmsmem->bo->refs)) {
-    munmap (kmsmem->bo->ptr, kmsmem->bo->size);
-    kmsmem->bo->ptr = NULL;
+  if (g_atomic_int_dec_and_test (&kmsmem->bo_map_refs)) {
+    gst_memory_unmap (kmsmem->bo, &kmsmem->bo_map);
+    kmsmem->bo_map.data = NULL;
   }
 }
 
@@ -414,11 +347,12 @@
  * which are relative to the GstBuffer start. */
 static gboolean
 gst_kms_allocator_add_fb (GstKMSAllocator * alloc, GstKMSMemory * kmsmem,
-    gsize in_offsetsGST_VIDEO_MAX_PLANES, GstVideoInfo * vinfo)
+    gsize in_offsetsGST_VIDEO_MAX_PLANES, GstVideoInfo * vinfo,
+    guint32 bo_handles4)
 {
   gint i, ret;
   gint num_planes = GST_VIDEO_INFO_N_PLANES (vinfo);
-  guint32 w, h, fmt, bo_handles4 = { 0, };
+  guint32 w, h, fmt;
   guint32 pitches4 = { 0, };
   guint32 offsets4 = { 0, };
 
@@ -430,11 +364,6 @@
   fmt = gst_drm_format_from_video (GST_VIDEO_INFO_FORMAT (vinfo));
 
   for (i = 0; i < num_planes; i++) {
-    if (kmsmem->bo)
-      bo_handlesi = kmsmem->bo->handle;
-    else
-      bo_handlesi = kmsmem->gem_handlei;
-
     pitchesi = GST_VIDEO_INFO_PLANE_STRIDE (vinfo, i);
     offsetsi = in_offsetsi;
   }
@@ -459,24 +388,28 @@
   GstKMSAllocator *alloc;
   GstKMSMemory *kmsmem;
   GstMemory *mem;
+  guint32 bo_handle4 = { 0, };
+  gint i;
 
-  kmsmem = g_slice_new0 (GstKMSMemory);
-  if (!kmsmem)
-    return NULL;
+  kmsmem = g_new0 (GstKMSMemory, 1);
 
   alloc = GST_KMS_ALLOCATOR (allocator);
 
   mem = GST_MEMORY_CAST (kmsmem);
 
   if (!gst_kms_allocator_memory_create (alloc, kmsmem, vinfo)) {
-    g_slice_free (GstKMSMemory, kmsmem);
+    g_free (kmsmem);
     return NULL;
   }
 
   gst_memory_init (mem, GST_MEMORY_FLAG_NO_SHARE, allocator, NULL,
-      kmsmem->bo->size, 0, 0, GST_VIDEO_INFO_SIZE (vinfo));
+      kmsmem->bo->maxsize, 0, 0, GST_VIDEO_INFO_SIZE (vinfo));
+
+  for (i = 0; i < GST_VIDEO_INFO_N_PLANES (vinfo); i++)
+    bo_handlei = gst_drm_dumb_memory_get_handle (kmsmem->bo);
 
-  if (!gst_kms_allocator_add_fb (alloc, kmsmem, vinfo->offset, vinfo))
+  if (!gst_kms_allocator_add_fb (alloc, kmsmem, vinfo->offset, vinfo,
+          bo_handle))
     goto fail;
 
   return mem;
@@ -494,13 +427,12 @@
   GstKMSAllocator *alloc;
   GstKMSMemory *kmsmem;
   GstMemory *mem;
-  gint i, ret;
+  gint i, j, ret;
+  guint32 gem_handle4 = { 0, };
 
   g_return_val_if_fail (n_planes <= GST_VIDEO_MAX_PLANES, FALSE);
 
-  kmsmem = g_slice_new0 (GstKMSMemory);
-  if (!kmsmem)
-    return FALSE;
+  kmsmem = g_new0 (GstKMSMemory, 1);
 
   mem = GST_MEMORY_CAST (kmsmem);
   gst_memory_init (mem, GST_MEMORY_FLAG_NO_SHARE, allocator, NULL,
@@ -508,42 +440,49 @@
 
   alloc = GST_KMS_ALLOCATOR (allocator);
   for (i = 0; i < n_planes; i++) {
-    ret = drmPrimeFDToHandle (alloc->priv->fd, prime_fdsi,
-        &kmsmem->gem_handlei);
+    ret = drmPrimeFDToHandle (alloc->priv->fd, prime_fdsi, &gem_handlei);
     if (ret)
       goto import_fd_failed;
   }
 
-  if (!gst_kms_allocator_add_fb (alloc, kmsmem, offsets, vinfo))
+  if (!gst_kms_allocator_add_fb (alloc, kmsmem, offsets, vinfo, gem_handle))
     goto failed;
 
+done:
   for (i = 0; i < n_planes; i++) {
-    struct drm_gem_close arg = { kmsmem->gem_handlei, };
+    struct drm_gem_close arg = { gem_handlei, };
     gint err;
 
+    if (!gem_handlei)
+      continue;
+
+    /* Do not close the same handle twice. */
+    for (j = 0; j < i; j++) {
+      if (gem_handlej == gem_handlei)
+        break;
+    }
+    if (j < i)
+      continue;
+
     err = drmIoctl (alloc->priv->fd, DRM_IOCTL_GEM_CLOSE, &arg);
     if (err)
       GST_WARNING_OBJECT (allocator,
           "Failed to close GEM handle: %s %d", g_strerror (errno), errno);
-
-    kmsmem->gem_handlei = 0;
   }
 
   return kmsmem;
 
   /* ERRORS */
 import_fd_failed:
-  {
-    GST_ERROR_OBJECT (alloc, "Failed to import prime fd %d: %s (%d)",
-        prime_fdsi, g_strerror (errno), errno);
-    /* fallback */
-  }
+  GST_ERROR_OBJECT (alloc, "Failed to import prime fd %d: %s (%d)",
+      prime_fdsi, g_strerror (errno), errno);
+  /* fallthrough */
 
 failed:
-  {
-    gst_memory_unref (mem);
-    return NULL;
-  }
+  gst_memory_unref (mem);
+  mem = NULL;
+  kmsmem = NULL;
+  goto done;
 }
 
 GstMemory *
@@ -552,30 +491,21 @@
   GstKMSMemory *kmsmem = (GstKMSMemory *) _kmsmem;
   GstKMSAllocator *alloc = GST_KMS_ALLOCATOR (allocator);
   GstMemory *mem;
-  gint ret;
-  gint prime_fd;
 
   /* We can only export DUMB buffers */
   g_return_val_if_fail (kmsmem->bo, NULL);
 
-
-  ret = drmPrimeHandleToFD (alloc->priv->fd, kmsmem->bo->handle,
-      DRM_CLOEXEC | DRM_RDWR, &prime_fd);
-  if (ret)
+  mem = gst_drm_dumb_memory_export_dmabuf (kmsmem->bo);
+  if (!mem)
     goto export_fd_failed;
 
-  if (G_UNLIKELY (alloc->priv->dmabuf_alloc == NULL))
-    alloc->priv->dmabuf_alloc = gst_dmabuf_allocator_new ();
-
-  mem = gst_dmabuf_allocator_alloc (alloc->priv->dmabuf_alloc, prime_fd,
-      gst_memory_get_sizes (_kmsmem, NULL, NULL));
-
   /* Populate the cache so KMSSink can find the kmsmem back when it receives
    * one of these DMABuf. This call takes ownership of the kmsmem. */
   gst_kms_allocator_cache (allocator, mem, _kmsmem);
 
-  GST_DEBUG_OBJECT (alloc, "Exported bo handle %d as %d", kmsmem->bo->handle,
-      prime_fd);
+  GST_DEBUG_OBJECT (alloc, "Exported bo handle %d as %d",
+      gst_drm_dumb_memory_get_handle (kmsmem->bo),
+      gst_dmabuf_memory_get_fd (mem));
 
   return mem;
 
@@ -583,7 +513,7 @@
 export_fd_failed:
   {
     GST_ERROR_OBJECT (alloc, "Failed to export bo handle %d: %s (%d)",
-        kmsmem->bo->handle, g_strerror (errno), ret);
+        gst_drm_dumb_memory_get_handle (kmsmem->bo), g_strerror (errno), errno);
     return NULL;
   }
 }

gst-plugins-bad-1.22.7.tar.xz/sys/kms/gstkmsallocator.h -> gst-plugins-bad-1.24.5.tar.xz/sys/kms/gstkmsallocator.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/kms/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/kms/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/sys/mediafoundation/gstmfcapturedshow.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/mediafoundation/gstmfcapturedshow.cpp Changed

@@ -41,7 +41,7 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_mf_source_object_debug);
 #define GST_CAT_DEFAULT gst_mf_source_object_debug
 
-DEFINE_GUID (MEDIASUBTYPE_I420, 0x30323449, 0x0000, 0x0010, 0x80, 0x00, 0x00,
+DEFINE_GUID (MF_MEDIASUBTYPE_I420, 0x30323449, 0x0000, 0x0010, 0x80, 0x00, 0x00,
     0xAA, 0x00, 0x38, 0x9B, 0x71);
 
 /* From qedit.h */
@@ -756,7 +756,7 @@
     return GST_VIDEO_FORMAT_YV12;
   else if (subtype == MEDIASUBTYPE_NV12)
     return GST_VIDEO_FORMAT_NV12;
-  else if (subtype == MEDIASUBTYPE_I420)
+  else if (subtype == MF_MEDIASUBTYPE_I420)
     return GST_VIDEO_FORMAT_I420;
   else if (subtype == MEDIASUBTYPE_IYUV)
     return GST_VIDEO_FORMAT_I420;
@@ -1187,16 +1187,20 @@
       self->inner->grabber = grabber;
       self->inner->fakesink = fakesink;
 
-      object->opened =
-          gst_mf_capture_dshow_open (self, selected.moniker.Get ());
-
-      g_free (object->device_path);
-      object->device_path = g_strdup (selected.path.c_str());
+      if (!gst_mf_capture_dshow_open (self, selected.moniker.Get ())) {
+        object->source_state = GST_MF_ACTIVATION_FAILED;
+      } else {
+        object->source_state = GST_MF_OK;
+        g_free (object->device_path);
+        object->device_path = g_strdup (selected.path.c_str());
 
-      g_free (object->device_name);
-      object->device_name = g_strdup (selected.name.c_str());
+        g_free (object->device_name);
+        object->device_name = g_strdup (selected.name.c_str());
 
-      object->device_index = selected.index;
+        object->device_index = selected.index;
+      }
+    } else {
+      object->source_state = GST_MF_DEVICE_NOT_FOUND;
     }
   }
 
@@ -1411,7 +1415,7 @@
 
   gst_object_ref_sink (self);
 
-  if (!self->opened) {
+  if (self->source_state != GST_MF_OK) {
     GST_DEBUG_OBJECT (self, "Couldn't open device");
     gst_object_unref (self);
     return nullptr;
@@ -1419,3 +1423,21 @@
 
   return self;
 }
+
+GstMFSourceResult
+gst_mf_capture_dshow_enumerate (gint device_index, GstMFSourceObject ** object)
+{
+  auto self = (GstMFSourceObject *) g_object_new (GST_TYPE_MF_CAPTURE_DSHOW,
+      "source-type", GST_MF_SOURCE_TYPE_VIDEO, "device-index", device_index,
+      nullptr);
+  gst_object_ref_sink (self);
+
+  auto ret = self->source_state;
+  if (ret != GST_MF_OK) {
+    gst_object_unref (self);
+    return ret;
+  }
+
+  *object = self;
+  return GST_MF_OK;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/mediafoundation/gstmfcapturedshow.h -> gst-plugins-bad-1.24.5.tar.xz/sys/mediafoundation/gstmfcapturedshow.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/mediafoundation/gstmfcapturewinrt.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/mediafoundation/gstmfcapturewinrt.cpp Changed

@@ -295,6 +295,7 @@
 
   if (!target_group) {
     GST_WARNING_OBJECT (self, "No matching device");
+    source->source_state = GST_MF_DEVICE_NOT_FOUND;
     goto run_loop;
   }
 
@@ -318,7 +319,7 @@
   GST_DEBUG_OBJECT (self, "Available output caps %" GST_PTR_FORMAT,
       self->supported_caps);
 
-  source->opened = TRUE;
+  source->source_state = GST_MF_OK;
 
   g_free (source->device_path);
   source->device_path = g_strdup (target_group->id_.c_str ());
@@ -751,18 +752,40 @@
       "source-type", type, "device-index", device_index, "device-name",
       device_name, "device-path", device_path, "dispatcher", dispatcher,
       nullptr);
+  gst_object_ref_sink (self);
 
   /* Reset explicitly to ensure that it happens before
    * RoInitializeWrapper dtor is called */
   core_dispatcher.Reset ();
 
-  if (!self->opened) {
+  if (self->source_state != GST_MF_OK) {
     GST_WARNING_OBJECT (self, "Couldn't open device");
     gst_object_unref (self);
     return nullptr;
   }
 
+  return self;
+}
+
+GstMFSourceResult
+gst_mf_capture_winrt_enumerate (gint device_index, GstMFSourceObject ** object)
+{
+  ComPtr < ICoreDispatcher > core_dispatcher;
+  /* Multiple COM init is allowed */
+  RoInitializeWrapper init_wrapper (RO_INIT_MULTITHREADED);
+  FindCoreDispatcherForCurrentThread (&core_dispatcher);
+
+  auto self = (GstMFSourceObject *) g_object_new (GST_TYPE_MF_CAPTURE_WINRT,
+      "source-type", GST_MF_SOURCE_TYPE_VIDEO, "device-index", device_index,
+      "dispatcher", core_dispatcher.Get (), nullptr);
   gst_object_ref_sink (self);
 
-  return self;
+  auto ret = self->source_state;
+  if (ret != GST_MF_OK) {
+    gst_object_unref (self);
+    return ret;
+  }
+
+  *object = self;
+  return GST_MF_OK;
 }

gst-plugins-bad-1.22.7.tar.xz/sys/mediafoundation/gstmfcapturewinrt.h -> gst-plugins-bad-1.24.5.tar.xz/sys/mediafoundation/gstmfcapturewinrt.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/mediafoundation/gstmfdevice.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/mediafoundation/gstmfdevice.cpp Changed

gst-plugins-bad-1.22.7.tar.xz/sys/mediafoundation/gstmfsourceobject.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/mediafoundation/gstmfsourceobject.cpp Changed

gst-plugins-bad-1.22.7.tar.xz/sys/mediafoundation/gstmfsourceobject.h -> gst-plugins-bad-1.24.5.tar.xz/sys/mediafoundation/gstmfsourceobject.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/mediafoundation/gstmfsourcereader.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/mediafoundation/gstmfsourcereader.cpp Changed

@@ -839,15 +839,20 @@
   }
 
   if (target) {
-    object->opened = gst_mf_source_reader_open (self, target->handle);
-
-    g_free (object->device_path);
-    object->device_path = g_strdup (target->path);
+    if (!gst_mf_source_reader_open (self, target->handle)) {
+      object->source_state = GST_MF_ACTIVATION_FAILED;
+    } else {
+      object->source_state = GST_MF_OK;
+      g_free (object->device_path);
+      object->device_path = g_strdup (target->path);
 
-    g_free (object->device_name);
-    object->device_name = g_strdup (target->name);
+      g_free (object->device_name);
+      object->device_name = g_strdup (target->name);
 
-    object->device_index = target->index;
+      object->device_index = target->index;
+    }
+  } else {
+    object->source_state = GST_MF_DEVICE_NOT_FOUND;
   }
 
   if (activate_list)
@@ -991,7 +996,7 @@
 
   gst_object_ref_sink (self);
 
-  if (!self->opened) {
+  if (self->source_state != GST_MF_OK) {
     GST_DEBUG_OBJECT (self, "Couldn't open device");
     gst_object_unref (self);
     return nullptr;
@@ -999,3 +1004,21 @@
 
   return self;
 }
+
+GstMFSourceResult
+gst_mf_source_reader_enumerate (gint device_index, GstMFSourceObject ** object)
+{
+  auto self = (GstMFSourceObject *) g_object_new (GST_TYPE_MF_SOURCE_READER,
+      "source-type", GST_MF_SOURCE_TYPE_VIDEO, "device-index", device_index,
+      nullptr);
+  gst_object_ref_sink (self);
+
+  auto ret = self->source_state;
+  if (ret != GST_MF_OK) {
+    gst_object_unref (self);
+    return ret;
+  }
+
+  *object = self;
+  return GST_MF_OK;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/mediafoundation/gstmfsourcereader.h -> gst-plugins-bad-1.24.5.tar.xz/sys/mediafoundation/gstmfsourcereader.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/mediafoundation/gstmfutils.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/mediafoundation/gstmfutils.cpp Changed

gst-plugins-bad-1.22.7.tar.xz/sys/mediafoundation/gstmfutils.h -> gst-plugins-bad-1.24.5.tar.xz/sys/mediafoundation/gstmfutils.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdk.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdk.c Changed

@@ -90,7 +90,8 @@
 plugin_add_dependencies (GstPlugin * plugin)
 {
 #ifndef _WIN32
-  const gchar *env_vars = { "LIBVA_DRIVER_NAME", NULL };
+  const gchar *env_vars =
+      { "LIBVA_DRIVER_NAME", "GST_MSDK_DRM_DEVICE", NULL };
   const gchar *kernel_paths = { "/dev/dri", NULL };
   const gchar *kernel_names = { "card", "render", NULL };
 
@@ -112,9 +113,286 @@
 }
 
 static gboolean
+_register_encoder (GstPlugin * plugin,
+    GstMsdkContext * context, guint codec_id,
+    GstCaps * sink_caps, GstCaps * src_caps)
+{
+  gboolean ret = TRUE;
+
+  switch (codec_id) {
+    case MFX_CODEC_AVC:
+      ret = gst_msdkh264enc_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+    case MFX_CODEC_HEVC:
+      ret = gst_msdkh265enc_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);;
+      break;
+    case MFX_CODEC_MPEG2:
+      ret = gst_msdkmpeg2enc_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+#ifdef USE_MSDK_VP9_ENC
+    case MFX_CODEC_VP9:
+      ret = gst_msdkvp9enc_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+#endif
+#ifdef USE_MSDK_AV1_ENC
+    case MFX_CODEC_AV1:
+      ret = gst_msdkav1enc_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+#endif
+    case MFX_CODEC_JPEG:
+      ret = gst_msdkmjpegenc_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+    default:
+      ret = FALSE;
+      break;
+  }
+
+  return ret;
+}
+
+static gboolean
+_register_decoder (GstPlugin * plugin,
+    GstMsdkContext * context, guint codec_id,
+    GstCaps * sink_caps, GstCaps * src_caps)
+{
+  gboolean ret = TRUE;
+
+  switch (codec_id) {
+    case MFX_CODEC_AVC:
+      ret = gst_msdkh264dec_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+    case MFX_CODEC_HEVC:
+      ret = gst_msdkh265dec_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+    case MFX_CODEC_MPEG2:
+      ret = gst_msdkmpeg2dec_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+    case MFX_CODEC_VP8:
+      ret = gst_msdkvp8dec_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+#ifdef USE_MSDK_VP9_DEC
+    case MFX_CODEC_VP9:
+      ret = gst_msdkvp9dec_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+#endif
+#ifdef USE_MSDK_AV1_DEC
+    case MFX_CODEC_AV1:
+      ret = gst_msdkav1dec_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+#endif
+    case MFX_CODEC_JPEG:
+      ret = gst_msdkmjpegdec_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+    case MFX_CODEC_VC1:
+      ret = gst_msdkvc1dec_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE);
+      break;
+    default:
+      ret = FALSE;
+      break;
+  }
+
+  return ret;
+}
+
+#if (MFX_VERSION >= 2000)
+
+static void
+_register_encoders (GstPlugin * plugin,
+    GstMsdkContext * context, mfxEncoderDescription * enc_desc)
+{
+  GstCaps *sink_caps = NULL;
+  GstCaps *src_caps = NULL;
+
+  for (guint c = 0; c < enc_desc->NumCodecs; c++) {
+    if (!gst_msdkcaps_enc_create_caps (context, enc_desc,
+            enc_desc->Codecsc.CodecID, &sink_caps, &src_caps)) {
+      GST_WARNING ("Failed to create caps for %" GST_FOURCC_FORMAT " ENC",
+          GST_FOURCC_ARGS (enc_desc->Codecsc.CodecID));
+      continue;
+    }
+
+    if (!_register_encoder (plugin,
+            context, enc_desc->Codecsc.CodecID, sink_caps, src_caps)) {
+      GST_WARNING ("Failed to register %" GST_FOURCC_FORMAT " ENC",
+          GST_FOURCC_ARGS (enc_desc->Codecsc.CodecID));
+      continue;
+    }
+
+    gst_caps_unref (sink_caps);
+    gst_caps_unref (src_caps);
+  }
+}
+
+static void
+_register_decoders (GstPlugin * plugin,
+    GstMsdkContext * context, mfxDecoderDescription * dec_desc)
+{
+  GstCaps *sink_caps = NULL;
+  GstCaps *src_caps = NULL;
+
+  for (guint c = 0; c < dec_desc->NumCodecs; c++) {
+    if (!gst_msdkcaps_dec_create_caps (context, dec_desc,
+            dec_desc->Codecsc.CodecID, &sink_caps, &src_caps)) {
+      GST_WARNING ("Failed to create caps for %" GST_FOURCC_FORMAT " DEC",
+          GST_FOURCC_ARGS (dec_desc->Codecsc.CodecID));
+      continue;
+    }
+
+    if (!_register_decoder (plugin,
+            context, dec_desc->Codecsc.CodecID, sink_caps, src_caps)) {
+      GST_WARNING ("Failed to register %" GST_FOURCC_FORMAT " DEC",
+          GST_FOURCC_ARGS (dec_desc->Codecsc.CodecID));
+      continue;
+    }
+
+    gst_caps_unref (sink_caps);
+    gst_caps_unref (src_caps);
+  }
+}
+
+static void
+_register_vpp (GstPlugin * plugin,
+    GstMsdkContext * context, mfxVPPDescription * vpp_desc)
+{
+  GstCaps *sink_caps = NULL;
+  GstCaps *src_caps = NULL;
+
+  if (!gst_msdkcaps_vpp_create_caps (context, vpp_desc, &sink_caps, &src_caps)) {
+    GST_WARNING ("Failed to create caps for VPP");
+    return;
+  }
+
+  if (!gst_msdkvpp_register (plugin,
+          context, sink_caps, src_caps, GST_RANK_NONE)) {
+    GST_WARNING ("Failed to register VPP");
+  }
+
+  gst_caps_unref (sink_caps);
+  gst_caps_unref (src_caps);
+}
+
+#endif
+
+static const guint enc_static_codecs = {
+  MFX_CODEC_AVC,
+  MFX_CODEC_HEVC,
+  MFX_CODEC_MPEG2,
+#ifdef USE_MSDK_VP9_ENC
+  MFX_CODEC_VP9,
+#endif
+#ifdef USE_MSDK_AV1_ENC
+  MFX_CODEC_AV1,
+#endif
+  MFX_CODEC_JPEG
+};
+
+static const guint dec_static_codecs = {
+  MFX_CODEC_AVC,
+  MFX_CODEC_HEVC,
+  MFX_CODEC_MPEG2,
+  MFX_CODEC_VP8,
+#ifdef USE_MSDK_VP9_DEC
+  MFX_CODEC_VP9,
+#endif
+#ifdef USE_MSDK_AV1_DEC
+  MFX_CODEC_AV1,
+#endif
+  MFX_CODEC_JPEG,
+  MFX_CODEC_VC1
+};
+
+static void
+_register_encoders_with_static_caps (GstPlugin * plugin,
+    GstMsdkContext * context)
+{
+  GstCaps *sink_caps = NULL;
+  GstCaps *src_caps = NULL;
+
+  for (guint c = 0; c < G_N_ELEMENTS (enc_static_codecs); c++) {
+    if (!gst_msdkcaps_enc_create_static_caps (context,
+            enc_static_codecsc, &sink_caps, &src_caps)) {
+      GST_WARNING ("Failed to create static caps for %" GST_FOURCC_FORMAT
+          " ENC", GST_FOURCC_ARGS (enc_static_codecsc));
+      continue;
+    }
+
+    if (!_register_encoder (plugin, context,
+            enc_static_codecsc, sink_caps, src_caps)) {
+      GST_WARNING ("Failed to register %" GST_FOURCC_FORMAT " ENC",
+          GST_FOURCC_ARGS (enc_static_codecsc));
+      continue;
+    }
+
+    gst_caps_unref (sink_caps);
+    gst_caps_unref (src_caps);
+  }
+}
+
+static void
+_register_decoders_with_static_caps (GstPlugin * plugin,
+    GstMsdkContext * context)
+{
+  GstCaps *sink_caps = NULL;
+  GstCaps *src_caps = NULL;
+
+  for (guint c = 0; c < G_N_ELEMENTS (dec_static_codecs); c++) {
+    if (!gst_msdkcaps_dec_create_static_caps (context,
+            dec_static_codecsc, &sink_caps, &src_caps)) {
+      GST_WARNING ("Failed to create static caps for %" GST_FOURCC_FORMAT
+          " DEC", GST_FOURCC_ARGS (dec_static_codecsc));
+      continue;
+    }
+
+    if (!_register_decoder (plugin, context,
+            dec_static_codecsc, sink_caps, src_caps)) {
+      GST_WARNING ("Failed to register %" GST_FOURCC_FORMAT " DEC",
+          GST_FOURCC_ARGS (dec_static_codecsc));
+      continue;
+    }
+
+    gst_caps_unref (sink_caps);
+    gst_caps_unref (src_caps);
+  }
+}
+
+static void
+_register_vpp_with_static_caps (GstPlugin * plugin, GstMsdkContext * context)
+{
+  GstCaps *sink_caps = NULL;
+  GstCaps *src_caps = NULL;
+
+  if (!gst_msdkcaps_vpp_create_static_caps (context, &sink_caps, &src_caps)) {
+    GST_WARNING ("Failed to create static caps for VPP");
+    return;
+  }
+
+  if (!gst_msdkvpp_register (plugin, context,
+          sink_caps, src_caps, GST_RANK_NONE)) {
+    GST_WARNING ("Failed to register VPP");
+  }
+
+  gst_caps_unref (sink_caps);
+  gst_caps_unref (src_caps);
+}
+
+static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  gboolean ret;
+  GstMsdkContext *context;
 
   GST_DEBUG_CATEGORY_INIT (gst_msdk_debug, "msdk", 0, "msdk");
   GST_DEBUG_CATEGORY_INIT (gst_msdkdec_debug, "msdkdec", 0, "msdkdec");
@@ -145,58 +423,41 @@
 
   plugin_add_dependencies (plugin);
 
-  if (!msdk_is_available ())
+  context = gst_msdk_context_new (TRUE);
+  if (!context)
     return TRUE;                /* return TRUE to avoid getting blacklisted */
 
-  ret = gst_element_register (plugin, "msdkh264dec", GST_RANK_NONE,
-      GST_TYPE_MSDKH264DEC);
-
-  ret = gst_element_register (plugin, "msdkh264enc", GST_RANK_NONE,
-      GST_TYPE_MSDKH264ENC);
-
-  ret = gst_element_register (plugin, "msdkh265dec", GST_RANK_NONE,
-      GST_TYPE_MSDKH265DEC);
-
-  ret = gst_element_register (plugin, "msdkh265enc", GST_RANK_NONE,
-      GST_TYPE_MSDKH265ENC);
+#if (MFX_VERSION >= 2000)
+  mfxImplDescription *desc = (mfxImplDescription *)
+      msdk_get_impl_description (gst_msdk_context_get_loader (context),
+      gst_msdk_context_get_impl_idx (context));
 
-  ret = gst_element_register (plugin, "msdkmjpegdec", GST_RANK_NONE,
-      GST_TYPE_MSDKMJPEGDEC);
+  if (desc && desc->Enc.NumCodecs > 0)
+    _register_encoders (plugin, context, &desc->Enc);
+  else
+    _register_encoders_with_static_caps (plugin, context);
 
-  ret = gst_element_register (plugin, "msdkmjpegenc", GST_RANK_NONE,
-      GST_TYPE_MSDKMJPEGENC);
+  if (desc && desc->Dec.NumCodecs > 0)
+    _register_decoders (plugin, context, &desc->Dec);
+  else
+    _register_decoders_with_static_caps (plugin, context);
 
-  ret = gst_element_register (plugin, "msdkmpeg2dec", GST_RANK_NONE,
-      GST_TYPE_MSDKMPEG2DEC);
+  if (desc && desc->VPP.NumFilters > 0)
+    _register_vpp (plugin, context, &desc->VPP);
+  else
+    _register_vpp_with_static_caps (plugin, context);
 
-  ret = gst_element_register (plugin, "msdkmpeg2enc", GST_RANK_NONE,
-      GST_TYPE_MSDKMPEG2ENC);
-
-  ret = gst_element_register (plugin, "msdkvp8dec", GST_RANK_NONE,
-      GST_TYPE_MSDKVP8DEC);
-
-  ret = gst_element_register (plugin, "msdkvc1dec", GST_RANK_NONE,
-      GST_TYPE_MSDKVC1DEC);
-#ifdef USE_MSDK_VP9_DEC
-  ret = gst_element_register (plugin, "msdkvp9dec", GST_RANK_NONE,
-      GST_TYPE_MSDKVP9DEC);
+  if (desc)
+    msdk_release_impl_description (gst_msdk_context_get_loader (context), desc);
+#else
+  _register_encoders_with_static_caps (plugin, context);
+  _register_decoders_with_static_caps (plugin, context);
+  _register_vpp_with_static_caps (plugin, context);
 #endif
-#ifdef USE_MSDK_VP9_ENC
-  ret = gst_element_register (plugin, "msdkvp9enc", GST_RANK_NONE,
-      GST_TYPE_MSDKVP9ENC);
-#endif
-#ifdef USE_MSDK_AV1_DEC
-  ret = gst_element_register (plugin, "msdkav1dec", GST_RANK_NONE,
-      GST_TYPE_MSDKAV1DEC);
-#endif
-#ifdef USE_MSDK_AV1_ENC
-  ret = gst_element_register (plugin, "msdkav1enc", GST_RANK_NONE,
-      GST_TYPE_MSDKAV1ENC);
-#endif
-  ret = gst_element_register (plugin, "msdkvpp", GST_RANK_NONE,
-      GST_TYPE_MSDKVPP);
 
-  return ret;
+  gst_object_unref (context);
+
+  return TRUE;
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkallocator.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkallocator.c Changed

@@ -32,17 +32,18 @@
 #include "gstmsdkallocator.h"
 
 static gboolean
-map_data (GstBuffer * buffer, mfxFrameSurface1 * mfx_surface, GstVideoInfo info)
+map_data (GstBuffer * buffer, mfxFrameSurface1 * mfx_surface,
+    const GstVideoInfo * info)
 {
   guint stride;
   GstVideoFrame frame;
 
-  if (!gst_video_frame_map (&frame, &info, buffer, GST_MAP_READWRITE))
+  if (!gst_video_frame_map (&frame, info, buffer, GST_MAP_READWRITE))
     return FALSE;
 
   stride = GST_VIDEO_FRAME_PLANE_STRIDE (&frame, 0);
 
-  switch (GST_VIDEO_INFO_FORMAT (&info)) {
+  switch (GST_VIDEO_INFO_FORMAT (info)) {
     case GST_VIDEO_FORMAT_NV12:
     case GST_VIDEO_FORMAT_P010_10LE:
     case GST_VIDEO_FORMAT_P012_LE:
@@ -119,7 +120,8 @@
 }
 
 GstMsdkSurface *
-gst_msdk_import_sys_mem_to_msdk_surface (GstBuffer * buf, GstVideoInfo info)
+gst_msdk_import_sys_mem_to_msdk_surface (GstBuffer * buf,
+    const GstVideoInfo * info)
 {
   GstMsdkSurface *msdk_surface = NULL;
   GstMapInfo map_info;
@@ -141,7 +143,7 @@
 
   gst_buffer_unmap (buf, &map_info);
 
-  gst_msdk_set_mfx_frame_info_from_video_info (&frame_info, &info);
+  gst_msdk_set_mfx_frame_info_from_video_info (&frame_info, info);
   mfx_surface->Info = frame_info;
 
   msdk_surface = g_slice_new0 (GstMsdkSurface);
@@ -149,3 +151,15 @@
 
   return msdk_surface;
 }
+
+GQuark
+gst_msdk_frame_surface_quark_get (void)
+{
+  static gsize g_quark;
+
+  if (g_once_init_enter (&g_quark)) {
+    gsize quark = (gsize) g_quark_from_static_string ("GstMsdkFrameSurface");
+    g_once_init_leave (&g_quark, quark);
+  }
+  return g_quark;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkallocator.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkallocator.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkallocator_d3d.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkallocator_d3d.c Changed

@@ -50,12 +50,163 @@
 gst_msdk_frame_alloc (mfxHDL pthis, mfxFrameAllocRequest * req,
     mfxFrameAllocResponse * resp)
 {
-  return MFX_ERR_NONE;
+  mfxStatus status = MFX_ERR_NONE;
+  gint i;
+  GstMsdkSurface *msdk_surface = NULL;
+  mfxMemId *mids = NULL;
+  GstMsdkContext *context = (GstMsdkContext *) pthis;
+  GstMsdkAllocResponse *msdk_resp = NULL;
+  mfxU32 fourcc = req->Info.FourCC;
+  mfxU16 surfaces_num = req->NumFrameSuggested;
+  GList *tmp_list = NULL;
+  GList *l;
+  GstMsdkSurface *tmp_surface = NULL;
+
+  /* MFX_MAKEFOURCC('V','P','8','S') is used for MFX_FOURCC_VP9_SEGMAP surface
+   * in MSDK and this surface is an internal surface. The external allocator
+   * shouldn't be used for this surface allocation
+   *
+   * See https://github.com/Intel-Media-SDK/MediaSDK/issues/762
+   */
+  if (req->Type & MFX_MEMTYPE_INTERNAL_FRAME
+      && fourcc == MFX_MAKEFOURCC ('V', 'P', '8', 'S'))
+    return MFX_ERR_UNSUPPORTED;
+
+  if (req->Type & MFX_MEMTYPE_EXTERNAL_FRAME) {
+    GstMsdkAllocResponse *cached =
+        gst_msdk_context_get_cached_alloc_responses_by_request (context, req);
+    if (cached) {
+      /* check if enough frames were allocated */
+      if (req->NumFrameSuggested > cached->response.NumFrameActual)
+        return MFX_ERR_MEMORY_ALLOC;
+
+      *resp = cached->response;
+      g_atomic_int_inc (&cached->refcount);
+      return MFX_ERR_NONE;
+    }
+  }
+
+  if (!(req->Type & (MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET |
+              MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET)))
+    return MFX_ERR_UNSUPPORTED;
+
+  mids = (mfxMemId *) g_slice_alloc0 (surfaces_num * sizeof (mfxMemId));
+  msdk_resp =
+      (GstMsdkAllocResponse *) g_slice_alloc0 (sizeof (GstMsdkAllocResponse));
+
+  if (fourcc != MFX_FOURCC_P8) {
+    GstBufferPool *pool;
+    GstVideoFormat format;
+    GstStructure *config;
+    GstVideoInfo info;
+    GstCaps *caps;
+    GstVideoAlignment align;
+    GstD3D11Device *device;
+    GstD3D11AllocationParams *params;
+
+    device = gst_msdk_context_get_d3d11_device (context);
+
+    format = gst_msdk_get_video_format_from_mfx_fourcc (fourcc);
+    gst_video_info_set_format (&info, format, req->Info.CropW, req->Info.CropH);
+
+    gst_video_alignment_reset (&align);
+    gst_msdk_set_video_alignment
+        (&info, req->Info.Width, req->Info.Height, &align);
+    gst_video_info_align (&info, &align);
+
+    caps = gst_video_info_to_caps (&info);
+
+    pool = gst_msdk_context_get_alloc_pool (context);
+    if (!pool) {
+      goto error_alloc;
+    }
+
+    config = gst_buffer_pool_get_config (GST_BUFFER_POOL_CAST (pool));
+    params = gst_d3d11_allocation_params_new (device, &info,
+        GST_D3D11_ALLOCATION_FLAG_DEFAULT,
+        D3D11_BIND_DECODER | D3D11_BIND_SHADER_RESOURCE, 0);
+    gst_d3d11_allocation_params_alignment (params, &align);
+    gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+    gst_d3d11_allocation_params_free (params);
+    gst_buffer_pool_config_set_params (config, caps,
+        GST_VIDEO_INFO_SIZE (&info), surfaces_num, surfaces_num);
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+
+    if (!gst_buffer_pool_set_config (pool, config)) {
+      GST_ERROR ("Failed to set pool config");
+      gst_object_unref (pool);
+      goto error_alloc;
+    }
+
+    if (!gst_buffer_pool_set_active (pool, TRUE)) {
+      GST_ERROR ("Failed to activate pool");
+      gst_object_unref (pool);
+      goto error_alloc;
+    }
+
+    for (i = 0; i < surfaces_num; i++) {
+      GstBuffer *buf;
+
+      if (gst_buffer_pool_acquire_buffer (pool, &buf, NULL) != GST_FLOW_OK) {
+        GST_ERROR ("Failed to allocate buffer");
+        gst_buffer_pool_set_active (pool, FALSE);
+        gst_object_unref (pool);
+        goto error_alloc;
+      }
+
+      msdk_surface =
+          gst_msdk_import_to_msdk_surface (buf, context, &info, GST_MAP_WRITE);
+      if (msdk_surface)
+        msdk_surface->buf = buf;
+      midsi = msdk_surface->surface->Data.MemId;
+      tmp_list = g_list_prepend (tmp_list, msdk_surface);
+    }
+  }
+  resp->mids = mids;
+  resp->NumFrameActual = surfaces_num;
+
+  msdk_resp->response = *resp;
+  msdk_resp->request = *req;
+  msdk_resp->refcount = 1;
+
+  gst_msdk_context_add_alloc_response (context, msdk_resp);
+
+  /* We need to put all the buffers back to the pool */
+  for (l = tmp_list; l; l = l->next) {
+    tmp_surface = (GstMsdkSurface *) l->data;
+    gst_buffer_unref (tmp_surface->buf);
+  }
+
+  return status;
+
+error_alloc:
+  g_slice_free1 (surfaces_num * sizeof (mfxMemId), mids);
+  g_slice_free1 (sizeof (GstMsdkAllocResponse), msdk_resp);
+  return MFX_ERR_MEMORY_ALLOC;
 }
 
 mfxStatus
 gst_msdk_frame_free (mfxHDL pthis, mfxFrameAllocResponse * resp)
 {
+  GstMsdkContext *context = (GstMsdkContext *) pthis;
+  GstMsdkAllocResponse *cached = NULL;
+
+  cached = gst_msdk_context_get_cached_alloc_responses (context, resp);
+
+  if (cached) {
+    if (!g_atomic_int_dec_and_test (&cached->refcount))
+      return MFX_ERR_NONE;
+  } else
+    return MFX_ERR_NONE;
+
+  if (!gst_msdk_context_remove_alloc_response (context, resp))
+    return MFX_ERR_NONE;
+
+  g_slice_free1 (resp->NumFrameActual * sizeof (mfxMemId), resp->mids);
+
   return MFX_ERR_NONE;
 }

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkallocator_libva.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkallocator_libva.c Changed

@@ -32,6 +32,7 @@
 
 #include <va/va.h>
 #include <va/va_drmcommon.h>
+#include <libdrm/drm_fourcc.h>
 #include <unistd.h>
 #include "gstmsdkallocator.h"
 #include "gstmsdkallocator_libva.h"
@@ -40,36 +41,28 @@
 #include <gst/va/gstvaallocator.h>
 
 #define GST_MSDK_FRAME_SURFACE gst_msdk_frame_surface_quark_get ()
-static GQuark
-gst_msdk_frame_surface_quark_get (void)
-{
-  static gsize g_quark;
 
-  if (g_once_init_enter (&g_quark)) {
-    gsize quark = (gsize) g_quark_from_static_string ("GstMsdkFrameSurface");
-    g_once_init_leave (&g_quark, quark);
-  }
-  return g_quark;
+static void
+gst_msdk_surface_list_free (GstMsdkSurface * surface)
+{
+  gst_buffer_unref (surface->buf);
+  g_slice_free (GstMsdkSurface, surface);
 }
 
 mfxStatus
 gst_msdk_frame_alloc (mfxHDL pthis, mfxFrameAllocRequest * req,
     mfxFrameAllocResponse * resp)
 {
-  VAStatus va_status;
   mfxStatus status = MFX_ERR_NONE;
   gint i;
-  guint format;
-  guint va_fourcc = 0;
-  VASurfaceID *surfaces = NULL;
-  VASurfaceAttrib attribs2;
-  guint num_attribs = 0;
+  GstMsdkSurface *msdk_surface = NULL;
   mfxMemId *mids = NULL;
   GstMsdkContext *context = (GstMsdkContext *) pthis;
-  GstMsdkMemoryID *msdk_mids = NULL;
   GstMsdkAllocResponse *msdk_resp = NULL;
   mfxU32 fourcc = req->Info.FourCC;
   mfxU16 surfaces_num = req->NumFrameSuggested;
+  GList *tmp_list = NULL;
+  VAStatus va_status;
 
   /* MFX_MAKEFOURCC('V','P','8','S') is used for MFX_FOURCC_VP9_SEGMAP surface
    * in MSDK and this surface is an internal surface. The external allocator
@@ -103,128 +96,92 @@
               MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET)))
     return MFX_ERR_UNSUPPORTED;
 
-  va_fourcc = gst_msdk_get_va_fourcc_from_mfx_fourcc (fourcc);
-
-  msdk_mids =
-      (GstMsdkMemoryID *) g_slice_alloc0 (surfaces_num *
-      sizeof (GstMsdkMemoryID));
   mids = (mfxMemId *) g_slice_alloc0 (surfaces_num * sizeof (mfxMemId));
-  surfaces =
-      (VASurfaceID *) g_slice_alloc0 (surfaces_num * sizeof (VASurfaceID));
-  msdk_resp =
-      (GstMsdkAllocResponse *) g_slice_alloc0 (sizeof (GstMsdkAllocResponse));
-
-  if (va_fourcc != VA_FOURCC_P208) {
-    attribs0.type = VASurfaceAttribPixelFormat;
-    attribs0.flags = VA_SURFACE_ATTRIB_SETTABLE;
-    attribs0.value.type = VAGenericValueTypeInteger;
-    attribs0.value.value.i = va_fourcc;
-    num_attribs = 1;
-
-    /* set VA_SURFACE_ATTRIB_USAGE_HINT_ENCODER flag for encoding */
-#if (MFX_VERSION >= 1025)
-    if ((req->Type & MFX_MEMTYPE_VIDEO_MEMORY_ENCODER_TARGET) &&
-        (req->Type & MFX_MEMTYPE_FROM_ENCODE)) {
-      attribs1.type = VASurfaceAttribUsageHint;
-      attribs1.flags = VA_SURFACE_ATTRIB_SETTABLE;
-      attribs1.value.type = VAGenericValueTypeInteger;
-      attribs1.value.value.i = VA_SURFACE_ATTRIB_USAGE_HINT_ENCODER;
-      num_attribs = 2;
+  msdk_resp = g_slice_new0 (GstMsdkAllocResponse);
+
+  if (fourcc != MFX_FOURCC_P8) {
+    GstBufferPool *pool;
+    GstVideoFormat format;
+    GstStructure *config;
+    GstVideoInfo info;
+    GstCaps *caps;
+    GstVideoAlignment align;
+    guint min_buffers, max_buffers;
+
+    format = gst_msdk_get_video_format_from_mfx_fourcc (fourcc);
+    gst_video_info_set_format (&info, format, req->Info.CropW, req->Info.CropH);
+
+    gst_video_alignment_reset (&align);
+    gst_msdk_set_video_alignment
+        (&info, req->Info.Width, req->Info.Height, &align);
+    gst_video_info_align (&info, &align);
+
+    pool = gst_msdk_context_get_alloc_pool (context);
+    if (!pool) {
+      status = MFX_ERR_MEMORY_ALLOC;
+      goto error_alloc;
     }
-#endif
-
-    format =
-        gst_msdk_get_va_rt_format_from_mfx_rt_format (req->Info.ChromaFormat);
-
-    if (format == VA_RT_FORMAT_YUV420 && va_fourcc == VA_FOURCC_P010)
-#if VA_CHECK_VERSION(1, 2, 0)
-      format = VA_RT_FORMAT_YUV420_10;
-#else
-      format = VA_RT_FORMAT_YUV420_10BPP;
-#endif
-
-#if VA_CHECK_VERSION(1, 4, 1)
-    if (format == VA_RT_FORMAT_YUV444 && va_fourcc == VA_FOURCC_A2R10G10B10)
-      format = VA_RT_FORMAT_RGB32_10;
-#endif
-
-#if ((MFX_VERSION >= 1027) && VA_CHECK_VERSION(1, 2, 0))
-    if (format == VA_RT_FORMAT_YUV422 && va_fourcc == VA_FOURCC_Y210)
-      format = VA_RT_FORMAT_YUV422_10;
-    else if (format == VA_RT_FORMAT_YUV444 && va_fourcc == VA_FOURCC_Y410)
-      format = VA_RT_FORMAT_YUV444_10;
-#endif
-
-#if ((MFX_VERSION >= 1031) && VA_CHECK_VERSION(1, 2, 0))
-    if (format == VA_RT_FORMAT_YUV420 && va_fourcc == VA_FOURCC_P016)
-      format = VA_RT_FORMAT_YUV420_12;
-
-    if (format == VA_RT_FORMAT_YUV422 && va_fourcc == VA_FOURCC_Y216)
-      format = VA_RT_FORMAT_YUV422_12;
-
-    if (format == VA_RT_FORMAT_YUV444 && va_fourcc == VA_FOURCC_Y416)
-      format = VA_RT_FORMAT_YUV444_12;
-#endif
 
-#if (MFX_VERSION >= 2004)
-    if (format == VA_RT_FORMAT_YUV444 && (va_fourcc == VA_FOURCC_RGBP
-            || va_fourcc == VA_FOURCC_BGRP))
-      format = VA_RT_FORMAT_RGBP;
-#endif
+    config = gst_buffer_pool_get_config (GST_BUFFER_POOL_CAST (pool));
+    if (!gst_buffer_pool_config_get_params (config, &caps, NULL, &min_buffers,
+            &max_buffers)) {
+      status = MFX_ERR_MEMORY_ALLOC;
+      goto error_alloc;
+    }
 
-    va_status = vaCreateSurfaces (gst_msdk_context_get_handle (context),
-        format,
-        req->Info.Width, req->Info.Height, surfaces, surfaces_num, attribs,
-        num_attribs);
+    max_buffers = MAX (max_buffers, surfaces_num);
+    gst_buffer_pool_config_set_params (config, caps,
+        GST_VIDEO_INFO_SIZE (&info), min_buffers, max_buffers);
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+    gst_buffer_pool_config_set_va_alignment (config, &align);
+
+    if (!gst_buffer_pool_set_config (pool, config)) {
+      GST_ERROR ("Failed to set pool config");
+      gst_object_unref (pool);
+      status = MFX_ERR_MEMORY_ALLOC;
+      goto error_alloc;
+    }
 
-    status = gst_msdk_get_mfx_status_from_va_status (va_status);
-    if (status != MFX_ERR_NONE) {
-      GST_WARNING ("failed to create VA surface");
-      return status;
+    if (!gst_buffer_pool_set_active (pool, TRUE)) {
+      GST_ERROR ("Failed to activate pool");
+      gst_object_unref (pool);
+      status = MFX_ERR_MEMORY_ALLOC;
+      goto error_alloc;
     }
 
     for (i = 0; i < surfaces_num; i++) {
-      /* Get dmabuf handle if MFX_MEMTYPE_EXPORT_FRAME */
-      if (req->Type & MFX_MEMTYPE_EXPORT_FRAME) {
-        VADRMPRIMESurfaceDescriptor va_desc = { 0 };
-        uint32_t export_flags = VA_EXPORT_SURFACE_SEPARATE_LAYERS |
-            VA_EXPORT_SURFACE_READ_WRITE;
-
-        va_status =
-            vaExportSurfaceHandle (gst_msdk_context_get_handle (context),
-            surfacesi, VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2, export_flags,
-            &va_desc);
-
-        status = gst_msdk_get_mfx_status_from_va_status (va_status);
-
-        if (MFX_ERR_NONE != status) {
-          GST_ERROR ("Failed to export surface");
-          return status;
-        }
-
-        g_assert (va_desc.num_objects);
+      GstBuffer *buf;
+
+      if (gst_buffer_pool_acquire_buffer (pool, &buf, NULL) != GST_FLOW_OK) {
+        GST_ERROR ("Failed to allocate buffer");
+        gst_buffer_pool_set_active (pool, FALSE);
+        gst_object_unref (pool);
+        status = MFX_ERR_MEMORY_ALLOC;
+        goto error_alloc;
+      }
 
-        /* This plugin supports single object only */
-        if (va_desc.num_objects > 1) {
-          GST_ERROR ("Can not support multiple objects");
-          return MFX_ERR_UNSUPPORTED;
-        }
+      msdk_surface = gst_msdk_import_to_msdk_surface (buf, context, &info, 0);
 
-        msdk_midsi.desc = va_desc;
+      if (!msdk_surface) {
+        GST_ERROR ("Failed to get GstMsdkSurface");
+        gst_buffer_pool_set_active (pool, FALSE);
+        gst_object_unref (pool);
+        status = MFX_ERR_MEMORY_ALLOC;
+        goto error_alloc;
       }
 
-      /* Don't use image for DMABuf */
-      msdk_midsi.image.image_id = VA_INVALID_ID;
-      msdk_midsi.image.buf = VA_INVALID_ID;
-
-      msdk_midsi.surface = &surfacesi;
-      midsi = (mfxMemId *) & msdk_midsi;
+      msdk_surface->buf = buf;
+      midsi = msdk_surface->surface->Data.MemId;
+      tmp_list = g_list_prepend (tmp_list, msdk_surface);
     }
   } else {
-    /* This is requested from the driver when h265 encoding.
+    /* This path is to handle a special case when requesting MFX_FOURCC_P208, We keep
+     * this to avoid failure when building gst-msdk plugins using old version of MediaSDK.
      * These buffers will be used inside the driver and released by
      * gst_msdk_frame_free functions. Application doesn't need to handle these buffers.
-     *
      * See https://github.com/Intel-Media-SDK/samples/issues/13 for more details.
      */
     VAContextID context_id = req->AllocId;
@@ -234,6 +191,7 @@
 
     for (i = 0; i < surfaces_num; i++) {
       VABufferID coded_buf;
+      GstMsdkMemoryID msdk_mid;
 
       va_status = vaCreateBuffer (gst_msdk_context_get_handle (context),
           context_id, VAEncCodedBufferType, codedbuf_size, 1, NULL, &coded_buf);
@@ -241,18 +199,17 @@
       status = gst_msdk_get_mfx_status_from_va_status (va_status);
       if (status < MFX_ERR_NONE) {
         GST_ERROR ("failed to create buffer");
-        return status;
+        goto error_alloc;
       }
 
-      surfacesi = coded_buf;
-      msdk_midsi.surface = &surfacesi;
-      msdk_midsi.fourcc = fourcc;
+      msdk_mid.surface = coded_buf;
+      msdk_mid.fourcc = fourcc;
 
       /* Don't use image for P208 */
-      msdk_midsi.image.image_id = VA_INVALID_ID;
-      msdk_midsi.image.buf = VA_INVALID_ID;
+      msdk_mid.image.image_id = VA_INVALID_ID;
+      msdk_mid.image.buf = VA_INVALID_ID;
 
-      midsi = (mfxMemId *) & msdk_midsi;
+      midsi = (mfxMemId *) & msdk_mid;
     }
   }
 
@@ -265,6 +222,15 @@
 
   gst_msdk_context_add_alloc_response (context, msdk_resp);
 
+  g_list_free_full (tmp_list, (GDestroyNotify) gst_msdk_surface_list_free);
+
+  return status;
+
+error_alloc:
+  g_slice_free1 (surfaces_num * sizeof (mfxMemId), mids);
+  g_slice_free (GstMsdkAllocResponse, msdk_resp);
+  if (tmp_list)
+    g_list_free_full (tmp_list, (GDestroyNotify) gst_msdk_surface_list_free);
   return status;
 }
 
@@ -272,11 +238,6 @@
 gst_msdk_frame_free (mfxHDL pthis, mfxFrameAllocResponse * resp)
 {
   GstMsdkContext *context = (GstMsdkContext *) pthis;
-  VAStatus va_status = VA_STATUS_SUCCESS;
-  mfxStatus status;
-  GstMsdkMemoryID *mem_id;
-  VADisplay dpy;
-  gint i;
   GstMsdkAllocResponse *cached = NULL;
 
   cached = gst_msdk_context_get_cached_alloc_responses (context, resp);
@@ -290,45 +251,9 @@
   if (!gst_msdk_context_remove_alloc_response (context, resp))
     return MFX_ERR_NONE;
 
-  mem_id = resp->mids0;
-  dpy = gst_msdk_context_get_handle (context);
-
-  if (mem_id->fourcc != MFX_FOURCC_P8) {
-    /* Make sure that all the vaImages are destroyed */
-    for (i = 0; i < resp->NumFrameActual; i++) {
-      GstMsdkMemoryID *mem = resp->midsi;
-
-      /* Release prime fd if used */
-      if (mem->desc.num_objects) {
-        g_assert (mem->desc.num_objects == 1);
-        close (mem->desc.objects0.fd);
-        mem->desc.num_objects = 0;
-      }
-
-      if (mem->image.image_id != VA_INVALID_ID &&
-          vaDestroyImage (dpy, mem->image.image_id) == VA_STATUS_SUCCESS) {
-        mem_id->image.image_id = VA_INVALID_ID;
-        mem_id->image.buf = VA_INVALID_ID;
-      }
-    }
-
-    va_status =
-        vaDestroySurfaces (dpy, (VASurfaceID *) mem_id->surface,
-        resp->NumFrameActual);
-  } else {
-    VASurfaceID *surfaces = mem_id->surface;
-
-    for (i = 0; i < resp->NumFrameActual; i++) {
-      va_status = vaDestroyBuffer (dpy, surfacesi);
-    }
-  }
-
-  g_slice_free1 (resp->NumFrameActual * sizeof (VASurfaceID), mem_id->surface);
-  g_slice_free1 (resp->NumFrameActual * sizeof (GstMsdkMemoryID), mem_id);
   g_slice_free1 (resp->NumFrameActual * sizeof (mfxMemId), resp->mids);
 
-  status = gst_msdk_get_mfx_status_from_va_status (va_status);
-  return status;
+  return MFX_ERR_NONE;
 }
 
 mfxStatus
@@ -338,7 +263,7 @@
   VAStatus va_status;
   mfxStatus status;
   mfxU8 *buf = NULL;
-  VASurfaceID *va_surface;
+  VASurfaceID va_surface;
   VADisplay dpy;
   GstMsdkMemoryID *mem_id;
 
@@ -352,7 +277,7 @@
   }
 
   if (mem_id->fourcc != MFX_FOURCC_P8) {
-    va_status = vaDeriveImage (dpy, *va_surface, &mem_id->image);
+    va_status = vaDeriveImage (dpy, va_surface, &mem_id->image);
     status = gst_msdk_get_mfx_status_from_va_status (va_status);
 
     if (status != MFX_ERR_NONE) {
@@ -421,7 +346,6 @@
         data->Y = data->V + 2;
         data->A = data->V + 3;
         break;
-#if VA_CHECK_VERSION(1, 4, 1)
       case VA_FOURCC_A2R10G10B10:
         data->Pitch = mem_id->image.pitches0;
         data->R = buf + mem_id->image.offsets0;
@@ -429,8 +353,6 @@
         data->B = data->R;
         data->A = data->R;
         break;
-#endif
-#if VA_CHECK_VERSION(1, 2, 0)
       case VA_FOURCC_Y210:
       case VA_FOURCC_Y216:
         data->Pitch = mem_id->image.pitches0;
@@ -449,7 +371,6 @@
         data->V = data->U + 4;
         data->A = data->U + 6;
         break;
-#endif
       case VA_FOURCC_ABGR:
         data->Pitch = mem_id->image.pitches0;
         data->R = buf + mem_id->image.offsets0;
@@ -480,7 +401,7 @@
   } else {
     VACodedBufferSegment *coded_buffer_segment;
     va_status =
-        vaMapBuffer (dpy, *va_surface, (void **) (&coded_buffer_segment));
+        vaMapBuffer (dpy, va_surface, (void **) (&coded_buffer_segment));
     status = gst_msdk_get_mfx_status_from_va_status (va_status);
     if (MFX_ERR_NONE == status)
       data->Y = (mfxU8 *) coded_buffer_segment->buf;
@@ -512,7 +433,7 @@
       mem_id->image.buf = VA_INVALID_ID;
     }
   } else {
-    va_status = vaUnmapBuffer (dpy, *(mem_id->surface));
+    va_status = vaUnmapBuffer (dpy, mem_id->surface);
   }
 
   status = gst_msdk_get_mfx_status_from_va_status (va_status);
@@ -529,7 +450,7 @@
     return MFX_ERR_INVALID_HANDLE;
 
   mem_id = mid;
-  *hdl = mem_id->surface;
+  *hdl = &mem_id->surface;
 
   return MFX_ERR_NONE;
 }
@@ -607,11 +528,7 @@
       va_fourcc = VA_FOURCC_YUY2;
       break;
     case GST_VIDEO_FORMAT_P010_10LE:
-#if VA_CHECK_VERSION(1, 2, 0)
       va_chroma = VA_RT_FORMAT_YUV420_10;
-#else
-      va_chroma = VA_RT_FORMAT_YUV420_10BPP;
-#endif
       va_fourcc = VA_FOURCC_P010;
       break;
     case GST_VIDEO_FORMAT_UYVY:
@@ -628,13 +545,10 @@
       va_chroma = VA_RT_FORMAT_YUV444;
       va_fourcc = VA_FOURCC_AYUV;
       break;
-#if VA_CHECK_VERSION(1, 4, 1)
     case GST_VIDEO_FORMAT_BGR10A2_LE:
       va_chroma = VA_RT_FORMAT_RGB32_10;
       va_fourcc = VA_FOURCC_A2R10G10B10;
       break;
-#endif
-#if VA_CHECK_VERSION(1, 2, 0)
     case GST_VIDEO_FORMAT_Y210:
       va_chroma = VA_RT_FORMAT_YUV422_10;
       va_fourcc = VA_FOURCC_Y210;
@@ -655,7 +569,6 @@
       va_chroma = VA_RT_FORMAT_YUV444_12;
       va_fourcc = VA_FOURCC_Y416;
       break;
-#endif
 #if (MFX_VERSION >= 2004)
     case GST_VIDEO_FORMAT_RGBP:
       va_chroma = VA_RT_FORMAT_RGBP;
@@ -719,49 +632,17 @@
   }
 }
 
-static VASurfaceID
-_get_va_surface (GstBuffer * buf, GstVideoInfo * info,
-    GstMsdkContext * msdk_context)
+static void
+gst_msdk_qdata_free (gpointer data)
 {
-  VASurfaceID va_surface = VA_INVALID_ID;
+  mfxFrameSurface1 *mfx_surface = data;
 
-  if (!info) {
-    va_surface = gst_va_buffer_get_surface (buf);
-  } else {
-    /* Update offset/stride/size if there is VideoMeta attached to
-     * the dma buffer, which is then used to get vasurface */
-    GstMemory *mem;
-    gint i, fd;
-    GstVideoMeta *vmeta;
-
-    vmeta = gst_buffer_get_video_meta (buf);
-    if (vmeta) {
-      if (GST_VIDEO_INFO_FORMAT (info) != vmeta->format ||
-          GST_VIDEO_INFO_WIDTH (info) != vmeta->width ||
-          GST_VIDEO_INFO_HEIGHT (info) != vmeta->height ||
-          GST_VIDEO_INFO_N_PLANES (info) != vmeta->n_planes) {
-        GST_ERROR ("VideoMeta attached to buffer is not matching"
-            "the negotiated width/height/format");
-        return va_surface;
-      }
-      for (i = 0; i < GST_VIDEO_INFO_N_PLANES (info); ++i) {
-        GST_VIDEO_INFO_PLANE_OFFSET (info, i) = vmeta->offseti;
-        GST_VIDEO_INFO_PLANE_STRIDE (info, i) = vmeta->stridei;
-      }
-      GST_VIDEO_INFO_SIZE (info) = gst_buffer_get_size (buf);
-    }
+  if (mfx_surface->Data.Locked == 0) {
+    GstMsdkMemoryID *msdk_mid = (GstMsdkMemoryID *) mfx_surface->Data.MemId;
 
-    mem = gst_buffer_peek_memory (buf, 0);
-    fd = gst_dmabuf_memory_get_fd (mem);
-    if (fd < 0)
-      return va_surface;
-    /* export dmabuf to vasurface */
-    if (!gst_msdk_export_dmabuf_to_vasurface (msdk_context, info, fd,
-            &va_surface))
-      return VA_INVALID_ID;
+    g_slice_free (GstMsdkMemoryID, msdk_mid);
+    g_slice_free (mfxFrameSurface1, mfx_surface);
   }
-
-  return va_surface;
 }
 
 /* Currently parameter map_flag is not useful on Linux */
@@ -775,6 +656,7 @@
   GstMsdkSurface *msdk_surface = NULL;
   mfxFrameSurface1 *mfx_surface = NULL;
   GstMsdkMemoryID *msdk_mid = NULL;
+  GDestroyNotify qdata_destroy = NULL;
 
   mem = gst_buffer_peek_memory (buf, 0);
   msdk_surface = g_slice_new0 (GstMsdkSurface);
@@ -787,13 +669,7 @@
     return msdk_surface;
   }
 
-  if (gst_msdk_is_va_mem (mem)) {
-    va_surface = _get_va_surface (buf, NULL, NULL);
-  } else if (gst_is_dmabuf_memory (mem)) {
-    /* For dma memory, videoinfo is used with dma fd to create va surface. */
-    GstVideoInfo info = *vinfo;
-    va_surface = _get_va_surface (buf, &info, msdk_context);
-  }
+  va_surface = gst_va_buffer_get_surface (buf);
 
   if (va_surface == VA_INVALID_ID) {
     g_slice_free (GstMsdkSurface, msdk_surface);
@@ -803,17 +679,17 @@
   mfx_surface = g_slice_new0 (mfxFrameSurface1);
   msdk_mid = g_slice_new0 (GstMsdkMemoryID);
 
-  msdk_mid->surface = g_slice_new0 (VASurfaceID);
-  *msdk_mid->surface = va_surface;
+  msdk_mid->surface = va_surface;
 
   mfx_surface->Data.MemId = (mfxMemId) msdk_mid;
 
   gst_msdk_set_mfx_frame_info_from_video_info (&frame_info, vinfo);
   mfx_surface->Info = frame_info;
 
+  qdata_destroy = gst_msdk_qdata_free;
   /* Set mfxFrameSurface1 as qdata in buffer */
   gst_mini_object_set_qdata (GST_MINI_OBJECT_CAST (mem),
-      GST_MSDK_FRAME_SURFACE, mfx_surface, NULL);
+      GST_MSDK_FRAME_SURFACE, mfx_surface, qdata_destroy);
 
   msdk_surface->surface = mfx_surface;
 
@@ -836,7 +712,7 @@
 {
   GstMsdkMemoryID *msdk_mid = NULL;
   VADisplay dpy;
-  VASurfaceID *old_surface_id;
+  VASurfaceID old_surface_id;
   VAStatus va_status;
   mfxStatus status = MFX_ERR_NONE;
 
@@ -857,14 +733,14 @@
 
   /* Destroy the associated VASurface */
   old_surface_id = msdk_mid->surface;
-  if (*old_surface_id != VA_INVALID_ID) {
-    va_status = vaDestroySurfaces (dpy, old_surface_id, 1);
+  if (old_surface_id != VA_INVALID_ID) {
+    va_status = vaDestroySurfaces (dpy, &old_surface_id, 1);
     status = gst_msdk_get_mfx_status_from_va_status (va_status);
     if (status != MFX_ERR_NONE)
       goto error_destroy_va_surface;
   }
 
-  *msdk_mid->surface = surface_id;
+  msdk_mid->surface = surface_id;
 
   return TRUE;
 
@@ -875,7 +751,75 @@
   }
 error_destroy_va_surface:
   {
-    GST_ERROR ("Failed to Destroy the VASurfaceID %x", *old_surface_id);
+    GST_ERROR ("Failed to Destroy the VASurfaceID %x", old_surface_id);
     return FALSE;
   }
 }
+
+static guint
+_get_usage_hint (GstMsdkContextJobType job_type)
+{
+  guint hint = VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC;
+
+  switch (job_type) {
+    case GST_MSDK_JOB_DECODER:
+      hint |= VA_SURFACE_ATTRIB_USAGE_HINT_DECODER;
+      break;
+    case GST_MSDK_JOB_ENCODER:
+      hint |= VA_SURFACE_ATTRIB_USAGE_HINT_ENCODER;
+      break;
+    case GST_MSDK_JOB_VPP:
+      hint |= VA_SURFACE_ATTRIB_USAGE_HINT_VPP_READ |
+          VA_SURFACE_ATTRIB_USAGE_HINT_VPP_WRITE;
+      break;
+    default:
+      GST_WARNING ("Unsupported job type %d", job_type);
+      break;
+  }
+
+  return hint;
+}
+
+void
+gst_msdk_get_supported_modifiers (GstMsdkContext * context,
+    GstMsdkContextJobType job_type, GstVideoFormat format, GValue * modifiers)
+{
+  guint64 mod = DRM_FORMAT_MOD_INVALID;
+  guint64 mod_gen = DRM_FORMAT_MOD_INVALID;
+  GValue gmod = G_VALUE_INIT;
+  guint usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC;
+  GstVaDisplay *display =
+      (GstVaDisplay *) gst_msdk_context_get_va_display (context);
+
+  g_value_init (&gmod, G_TYPE_UINT64);
+
+  mod = gst_va_dmabuf_get_modifier_for_format (display, format, usage_hint);
+  if (mod != DRM_FORMAT_MOD_INVALID && mod != DRM_FORMAT_MOD_LINEAR) {
+    g_value_set_uint64 (&gmod, mod);
+    gst_value_list_append_value (modifiers, &gmod);
+  }
+
+  usage_hint = _get_usage_hint (job_type);
+  if (usage_hint != VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC) {
+    mod_gen =
+        gst_va_dmabuf_get_modifier_for_format (display, format, usage_hint);
+    if (mod_gen != mod && mod_gen != DRM_FORMAT_MOD_INVALID &&
+        mod_gen != DRM_FORMAT_MOD_LINEAR) {
+      g_value_set_uint64 (&gmod, mod_gen);
+      gst_value_list_append_value (modifiers, &gmod);
+    }
+  }
+
+  if (mod == DRM_FORMAT_MOD_LINEAR || mod_gen == DRM_FORMAT_MOD_LINEAR) {
+    g_value_set_uint64 (&gmod, DRM_FORMAT_MOD_LINEAR);
+    gst_value_list_append_value (modifiers, &gmod);
+  }
+
+  if (mod == DRM_FORMAT_MOD_INVALID && mod_gen == DRM_FORMAT_MOD_INVALID) {
+    GST_WARNING ("Failed to get modifier %s:0x%016llx",
+        gst_video_format_to_string (format), DRM_FORMAT_MOD_INVALID);
+  }
+
+  gst_object_unref (display);
+  g_value_unset (&gmod);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkallocator_libva.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkallocator_libva.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkav1dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkav1dec.c Changed

@@ -50,27 +50,31 @@
 #endif
 
 #include "gstmsdkav1dec.h"
-#include "gstmsdkvideomemory.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkav1dec_debug);
 #define GST_CAT_DEFAULT gst_msdkav1dec_debug
 
-#define COMMON_FORMAT "{ NV12, P010_10LE, VUYA, Y410 }"
+#define GST_MSDKAV1DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkAV1Dec))
+#define GST_MSDKAV1DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkAV1DecClass))
+#define GST_IS_MSDKAV1DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKAV1DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
 
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-av1")
-    );
+/* *INDENT-OFF* */
+static const gchar *doc_src_caps_str =
+    GST_VIDEO_CAPS_MAKE ("{ NV12, P010_10LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf",
+        "{ NV12, P010_10LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory", "{ NV12 }");
+/* *INDENT-ON* */
 
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR (COMMON_FORMAT, COMMON_FORMAT))
-    );
+static const gchar *doc_sink_caps_str = "video/x-av1";
 
-#define gst_msdkav1dec_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkAV1Dec, gst_msdkav1dec, GST_TYPE_MSDKDEC);
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkav1dec_configure (GstMsdkDec * decoder)
@@ -103,10 +107,13 @@
 }
 
 static void
-gst_msdkav1dec_class_init (GstMsdkAV1DecClass * klass)
+gst_msdkav1dec_class_init (gpointer klass, gpointer data)
 {
   GstElementClass *element_class;
   GstMsdkDecClass *decoder_class;
+  MsdkDecCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
 
   element_class = GST_ELEMENT_CLASS (klass);
   decoder_class = GST_MSDKDEC_CLASS (klass);
@@ -121,11 +128,56 @@
       "AV1 video decoder based on " MFX_API_SDK,
       "Haihao Xiang <haihao.xiang@intel.com>");
 
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkav1dec_init (GstMsdkAV1Dec * thiz)
+gst_msdkav1dec_init (GTypeInstance * instance, gpointer g_class)
 {
 }
+
+gboolean
+gst_msdkav1dec_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkDecCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkAV1DecClass),
+    .class_init = gst_msdkav1dec_class_init,
+    .instance_size = sizeof (GstMsdkAV1Dec),
+    .instance_init = gst_msdkav1dec_init
+  };
+
+  cdata = g_new (MsdkDecCData, 1);
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkAV1Dec");
+  feature_name = g_strdup ("msdkav1dec");
+
+  type = g_type_register_static (GST_TYPE_MSDKDEC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkav1dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkav1dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkav1enc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkav1enc.c Changed

@@ -56,6 +56,15 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkav1enc_debug);
 #define GST_CAT_DEFAULT gst_msdkav1enc_debug
 
+#define GST_MSDKAV1ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkAV1Enc))
+#define GST_MSDKAV1ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkAV1EncClass))
+#define GST_IS_MSDKAV1ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKAV1ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
+
 enum
 {
   PROP_TILE_ROW = GST_MSDKENC_PROP_MAX,
@@ -69,48 +78,39 @@
 #define PROP_B_PYRAMID_DEFAULT          MFX_B_REF_UNKNOWN
 #define PROP_P_PYRAMID_DEFAULT          MFX_P_REF_DEFAULT
 
-#define RAW_FORMATS "NV12, P010_10LE"
-#define PROFILES    "main"
-
-#define COMMON_FORMAT "{ " RAW_FORMATS " }"
-#define SRC_PROFILES  "{ " PROFILES " }"
+/* *INDENT-OFF* */
+static const gchar *doc_sink_caps_str =
+    GST_VIDEO_CAPS_MAKE ("{ NV12, P010_10LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf",
+        "{ NV12, P010_10LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory", "{ NV12 }");
+/* *INDENT-ON* */
 
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR (COMMON_FORMAT,
-            COMMON_FORMAT)));
+static const gchar *doc_src_caps_str = "video/x-av1";
 
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-av1, "
-        "framerate = (fraction) 0/1, MAX, "
-        "width = (int)  1, MAX , height = (int)  1, MAX , "
-        "profile = (string) " SRC_PROFILES)
-    );
-
-#define gst_msdkav1enc_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkAV1Enc, gst_msdkav1enc, GST_TYPE_MSDKENC);
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkav1enc_set_format (GstMsdkEnc * encoder)
 {
   GstMsdkAV1Enc *thiz = GST_MSDKAV1ENC (encoder);
+  GstPad *srcpad;
   GstCaps *template_caps;
   GstCaps *allowed_caps = NULL;
 
   thiz->profile = MFX_PROFILE_AV1_MAIN;
 
-  allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (encoder));
+  srcpad = GST_VIDEO_ENCODER_SRC_PAD (encoder);
 
+  allowed_caps = gst_pad_get_allowed_caps (srcpad);
   if (!allowed_caps || gst_caps_is_empty (allowed_caps)) {
     if (allowed_caps)
       gst_caps_unref (allowed_caps);
     return FALSE;
   }
 
-  template_caps = gst_static_pad_template_get_caps (&src_factory);
+  template_caps = gst_pad_get_pad_template_caps (srcpad);
 
   /* If downstream has ANY caps let encoder decide profile and level */
   if (gst_caps_is_equal (allowed_caps, template_caps)) {
@@ -237,6 +237,15 @@
   return caps;
 }
 
+static gboolean
+gst_msdkav1enc_is_format_supported (GstMsdkEnc * encoder, GstVideoFormat format)
+{
+  if (format == GST_VIDEO_FORMAT_NV12 || format == GST_VIDEO_FORMAT_P010_10LE)
+    return TRUE;
+
+  return FALSE;
+}
+
 static void
 gst_msdkav1enc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
@@ -314,26 +323,9 @@
 }
 
 static void
-gst_msdkav1enc_class_init (GstMsdkAV1EncClass * klass)
+_msdkav1enc_install_properties (GObjectClass * gobject_class,
+    GstMsdkEncClass * encoder_class)
 {
-  GObjectClass *gobject_class;
-  GstElementClass *element_class;
-  GstMsdkEncClass *encoder_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  element_class = GST_ELEMENT_CLASS (klass);
-  encoder_class = GST_MSDKENC_CLASS (klass);
-
-  gobject_class->finalize = gst_msdkav1enc_finalize;
-  gobject_class->set_property = gst_msdkav1enc_set_property;
-  gobject_class->get_property = gst_msdkav1enc_get_property;
-
-  encoder_class->set_format = gst_msdkav1enc_set_format;
-  encoder_class->configure = gst_msdkav1enc_configure;
-  encoder_class->set_src_caps = gst_msdkav1enc_set_src_caps;
-  encoder_class->qp_max = 255;
-  encoder_class->qp_min = 0;
-
   gst_msdkenc_install_common_properties (encoder_class);
 
   g_object_class_install_property (gobject_class, PROP_TILE_ROW,
@@ -357,6 +349,34 @@
       g_param_spec_boolean ("p-pyramid", "P-pyramid",
           "Enable P-Pyramid Reference structure", PROP_P_PYRAMID_DEFAULT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+}
+
+static void
+gst_msdkav1enc_class_init (gpointer klass, gpointer data)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *element_class;
+  GstMsdkEncClass *encoder_class;
+  MsdkEncCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  element_class = GST_ELEMENT_CLASS (klass);
+  encoder_class = GST_MSDKENC_CLASS (klass);
+
+  gobject_class->finalize = gst_msdkav1enc_finalize;
+  gobject_class->set_property = gst_msdkav1enc_set_property;
+  gobject_class->get_property = gst_msdkav1enc_get_property;
+
+  encoder_class->set_format = gst_msdkav1enc_set_format;
+  encoder_class->configure = gst_msdkav1enc_configure;
+  encoder_class->set_src_caps = gst_msdkav1enc_set_src_caps;
+  encoder_class->is_format_supported = gst_msdkav1enc_is_format_supported;
+  encoder_class->qp_max = 255;
+  encoder_class->qp_min = 0;
+
+  _msdkav1enc_install_properties (gobject_class, encoder_class);
 
   gst_element_class_set_static_metadata (element_class,
       "Intel MSDK AV1 encoder",
@@ -365,15 +385,61 @@
       "Haihao Xiang <haihao.xiang@intel.com>, "
       "Mengkejiergeli Ba <mengkejiergeli.ba@intel.com>");
 
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkav1enc_init (GstMsdkAV1Enc * thiz)
+gst_msdkav1enc_init (GTypeInstance * instance, gpointer g_class)
 {
+  GstMsdkAV1Enc *thiz = GST_MSDKAV1ENC (instance);
   thiz->num_tile_rows = PROP_TILE_ROW_DEFAULT;
   thiz->num_tile_cols = PROP_TILE_COL_DEFAULT;
   thiz->b_pyramid = PROP_B_PYRAMID_DEFAULT;
   thiz->p_pyramid = PROP_P_PYRAMID_DEFAULT;
 }
+
+gboolean
+gst_msdkav1enc_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkEncCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkAV1EncClass),
+    .class_init = gst_msdkav1enc_class_init,
+    .instance_size = sizeof (GstMsdkAV1Enc),
+    .instance_init = gst_msdkav1enc_init
+  };
+
+  cdata = g_new (MsdkEncCData, 1);
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkAV1Enc");
+  feature_name = g_strdup ("msdkav1enc");
+
+  type = g_type_register_static (GST_TYPE_MSDKENC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkav1enc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkav1enc.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkcaps.c Added

@@ -0,0 +1,2125 @@
+/* GStreamer Intel MSDK plugin
+ * Copyright (c) 2023, Intel Corporation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gstmsdkcaps.h"
+
+#ifndef _WIN32
+#include <libdrm/drm_fourcc.h>
+#include <gst/video/video-info-dma.h>
+#include "gstmsdkallocator_libva.h"
+#include <gst/va/gstvavideoformat.h>
+#endif
+
+#define DEFAULT_DELIMITER ", "
+#define PROFILE_DELIMITER DEFAULT_DELIMITER
+
+#define DEFAULT_VIDEO_FORMAT GST_VIDEO_FORMAT_NV12
+
+#define ENC_IOPATTERN MFX_IOPATTERN_IN_VIDEO_MEMORY
+#define DEC_IOPATTERN MFX_IOPATTERN_OUT_VIDEO_MEMORY
+#define VPP_IOPATTERN \
+    MFX_IOPATTERN_IN_VIDEO_MEMORY | MFX_IOPATTERN_OUT_VIDEO_MEMORY
+
+#ifdef _WIN32
+/* fix "unreferenced local variable" for windows */
+#define VAR_UNUSED(v) (void)(v)
+#endif
+
+#if (MFX_VERSION >= 2000)
+static guint default_width = GST_ROUND_UP_16 (320);
+static guint default_height = GST_ROUND_UP_16 (240);
+
+static guint max_res_widths = { 640, 1280, 1920, 2048, 4096, 8192, 16384 };
+
+static guint max_res_heights = {
+  480, 720, 1080, 1920, 2048, 4096, 8192, 12288, 16384
+};
+#endif
+
+typedef struct
+{
+  mfxU32 id;
+  const gchar *names;
+} Profile;
+
+static const Profile profs_avc = {
+  {MFX_PROFILE_AVC_MAIN, "main"},
+  {MFX_PROFILE_AVC_BASELINE, "baseline"},
+  {MFX_PROFILE_AVC_EXTENDED, "extended"},
+  {MFX_PROFILE_AVC_HIGH, "high"},
+  {MFX_PROFILE_AVC_CONSTRAINED_BASELINE, "constrained-baseline"},
+  {MFX_PROFILE_AVC_CONSTRAINED_HIGH, "constrained-high"},
+  {MFX_PROFILE_AVC_PROGRESSIVE_HIGH, "progressive-high"},
+  {MFX_PROFILE_UNKNOWN, NULL}
+};
+
+static const Profile profs_hevc = {
+  {MFX_PROFILE_HEVC_MAIN, "main"},
+  {MFX_PROFILE_HEVC_MAIN10, "main-10, main-10-still-picture"},
+  {MFX_PROFILE_HEVC_MAINSP, "main-still-picture"},
+  {MFX_PROFILE_HEVC_REXT, "main-444, main-444-10, main-422-10, main-12"},
+#if (MFX_VERSION >= 1032)
+  {MFX_PROFILE_HEVC_SCC, "screen-extended-main, screen-extended-main-10, "
+        "screen-extended-main-444, screen-extended-main-444-10"},
+#endif
+  {MFX_PROFILE_UNKNOWN, NULL}
+};
+
+static const Profile profs_mpeg2 = {
+  {MFX_PROFILE_MPEG2_MAIN, "main"},
+  {MFX_PROFILE_MPEG2_SIMPLE, "simple"},
+  {MFX_PROFILE_MPEG2_HIGH, "high"},
+  {MFX_PROFILE_UNKNOWN, NULL}
+};
+
+static const Profile profs_vc1 = {
+  {MFX_PROFILE_VC1_MAIN, "main"},
+  {MFX_PROFILE_VC1_SIMPLE, "simple"},
+  {MFX_PROFILE_VC1_ADVANCED, "advanced"},
+  {MFX_PROFILE_UNKNOWN, NULL}
+};
+
+static const Profile profs_vp8 = {
+  {MFX_PROFILE_VP8_0, "0"},
+  {MFX_PROFILE_VP8_1, "1"},
+  {MFX_PROFILE_VP8_2, "2"},
+  {MFX_PROFILE_VP8_3, "3"},
+  {MFX_PROFILE_UNKNOWN, NULL}
+};
+
+static const Profile profs_vp9 = {
+  {MFX_PROFILE_VP9_0, "0"},
+  {MFX_PROFILE_VP9_1, "1"},
+  {MFX_PROFILE_VP9_2, "2"},
+  {MFX_PROFILE_VP9_3, "3"},
+  {MFX_PROFILE_UNKNOWN, NULL}
+};
+
+static const Profile profs_av1 = {
+#if (MFX_VERSION >= 1034)
+  {MFX_PROFILE_AV1_MAIN, "main"},
+  {MFX_PROFILE_AV1_HIGH, "high"},
+  {MFX_PROFILE_AV1_PRO, "pro"},
+#endif
+  {MFX_PROFILE_UNKNOWN, NULL}
+};
+
+static const Profile profs_jpeg = {
+  {MFX_PROFILE_JPEG_BASELINE, "baseline"},
+  {MFX_PROFILE_UNKNOWN, NULL}
+};
+
+static const struct CodecProfiles
+{
+  guint codec;
+  const gchar *media_type;
+  const Profile *profiles;
+} codec_profs = {
+  {MFX_CODEC_AVC, "video/x-h264", profs_avc},
+  {MFX_CODEC_HEVC, "video/x-h265", profs_hevc},
+  {MFX_CODEC_MPEG2, "video/mpeg", profs_mpeg2},
+  {MFX_CODEC_VC1, "video/x-wmv", profs_vc1},
+  {MFX_CODEC_VP8, "video/x-vp8", profs_vp8},
+  {MFX_CODEC_VP9, "video/x-vp9", profs_vp9},
+  {MFX_CODEC_AV1, "video/x-av1", profs_av1},
+  {MFX_CODEC_JPEG, "image/jpeg", profs_jpeg}
+};
+
+typedef struct
+{
+  guint min_width;
+  guint max_width;
+  guint min_height;
+  guint max_height;
+} ResolutionRange;
+
+typedef gboolean (*IsParamSupportedFunc) (mfxSession * session,
+    mfxVideoParam * in, mfxVideoParam * out);
+
+gboolean
+gst_msdkcaps_has_feature (const GstCaps * caps, const gchar * feature)
+{
+  guint i;
+
+  for (i = 0; i < gst_caps_get_size (caps); i++) {
+    GstCapsFeatures *const features = gst_caps_get_features (caps, i);
+    /* Skip ANY features, we need an exact match for correct evaluation */
+    if (gst_caps_features_is_any (features))
+      continue;
+    if (gst_caps_features_contains (features, feature))
+      return TRUE;
+  }
+
+  return FALSE;
+}
+
+static void
+_list_append_string (GValue * list, const gchar * str)
+{
+  GValue gval = G_VALUE_INIT;
+
+  g_return_if_fail (list != NULL);
+  g_return_if_fail (str != NULL);
+
+  g_value_init (&gval, G_TYPE_STRING);
+  g_value_set_string (&gval, str);
+
+  gst_value_list_append_value (list, &gval);
+  g_value_unset (&gval);
+}
+
+static gboolean
+_strings_to_list (const gchar * strings, GValue * list)
+{
+  gchar **strs = NULL;
+
+  if (!strings || !list)
+    return FALSE;
+
+  strs = g_strsplit (strings, DEFAULT_DELIMITER, 0);
+  for (guint i = 0; strsi; i++)
+    _list_append_string (list, strsi);
+  g_strfreev (strs);
+
+  return TRUE;
+}
+
+static const gchar *
+_get_media_type (guint codec)
+{
+  for (int c = 0; c < G_N_ELEMENTS (codec_profs); c++) {
+    if (codec_profsc.codec == codec)
+      return codec_profsc.media_type;
+  }
+
+  return NULL;
+}
+
+#ifndef _WIN32
+/* For RGB cases, the byte orders are different between vaImageFormat (LSB) and
+ * GStreamer video format (MSB). This function corrects the mapping between
+ * different order manners.
+ */
+static void
+_fix_map (GstMsdkContext * context)
+{
+  GstVaDisplay *display = NULL;
+  VAImageFormat *va_formats;
+  VADisplay dpy;
+  VAStatus status;
+  int max, num = 0;
+
+  display = (GstVaDisplay *) gst_msdk_context_get_va_display (context);
+  dpy = gst_va_display_get_va_dpy (display);
+  gst_object_unref (display);
+
+  max = vaMaxNumImageFormats (dpy);
+  if (max == 0)
+    return;
+
+  va_formats = g_new (VAImageFormat, max);
+  status = vaQueryImageFormats (dpy, va_formats, &num);
+  gst_va_video_format_fix_map (va_formats, num);
+
+  if (status != VA_STATUS_SUCCESS)
+    GST_WARNING ("vaQueryImageFormats: %s", vaErrorStr (status));
+
+  g_free (va_formats);
+  return;
+}
+
+static gboolean
+_dma_fmt_to_dma_drm_fmts (GstMsdkContext * context,
+    GstMsdkContextJobType job_type,
+    const GValue * dma_fmts, GValue * dma_drm_fmts)
+{
+  const gchar *fmt_str;
+  gchar *drm_fmt_str;
+  guint32 drm_fourcc;
+  guint64 modifier;
+  GstVideoFormat fmt;
+  GValue gval = G_VALUE_INIT;
+  GValue mods = G_VALUE_INIT;
+
+  g_return_val_if_fail (dma_fmts != NULL, FALSE);
+  g_return_val_if_fail (context != NULL, FALSE);
+
+  fmt_str = g_value_get_string (dma_fmts);
+  fmt = gst_video_format_from_string (fmt_str);
+
+  g_return_val_if_fail (fmt != GST_VIDEO_FORMAT_UNKNOWN, FALSE);
+
+  _fix_map (context);
+
+  drm_fourcc = gst_va_drm_fourcc_from_video_format (fmt);
+  if (drm_fourcc == DRM_FORMAT_INVALID)
+    return FALSE;
+
+  g_value_init (&mods, GST_TYPE_LIST);
+  g_value_init (&gval, G_TYPE_STRING);
+
+  gst_msdk_get_supported_modifiers (context, job_type, fmt, &mods);
+
+  for (gint m = 0; m < gst_value_list_get_size (&mods); m++) {
+    const GValue *gmod = gst_value_list_get_value (&mods, m);
+    modifier = g_value_get_uint64 (gmod);
+
+    drm_fmt_str = gst_video_dma_drm_fourcc_to_string (drm_fourcc, modifier);
+    if (!drm_fmt_str)
+      continue;
+
+    g_value_set_string (&gval, drm_fmt_str);
+    gst_value_list_append_value (dma_drm_fmts, &gval);
+
+    GST_DEBUG ("Got modifier: %s", drm_fmt_str);
+    g_free (drm_fmt_str);
+  }
+  g_value_unset (&mods);
+  g_value_unset (&gval);
+
+  return TRUE;
+}
+
+static gboolean
+_dma_fmts_to_dma_drm_fmts (GstMsdkContext * context,
+    GstMsdkContextJobType job_type,
+    const GValue * dma_fmts, GValue * dma_drm_fmts)
+{
+  gint size = gst_value_list_get_size (dma_fmts);
+
+  for (gint f = 0; f < size; f++) {
+    const GValue *dma_fmt = gst_value_list_get_value (dma_fmts, f);
+    if (!dma_fmt)
+      continue;
+
+    _dma_fmt_to_dma_drm_fmts (context, job_type, dma_fmt, dma_drm_fmts);
+  }
+
+  return TRUE;
+}
+
+static GstCaps *
+_create_dma_drm_caps (GstMsdkContext * context,
+    GstMsdkContextJobType job_type, const GValue * dma_formats)
+{
+  GstCaps *dma_drm_caps = NULL;
+  GValue dma_drm_fmts = G_VALUE_INIT;
+
+  g_return_val_if_fail (context != NULL, FALSE);
+  g_return_val_if_fail (dma_formats != NULL, FALSE);
+
+  g_value_init (&dma_drm_fmts, GST_TYPE_LIST);
+
+  if (GST_VALUE_HOLDS_LIST (dma_formats))
+    _dma_fmts_to_dma_drm_fmts (context, job_type, dma_formats, &dma_drm_fmts);
+  else if (G_VALUE_HOLDS_STRING (dma_formats))
+    _dma_fmt_to_dma_drm_fmts (context, job_type, dma_formats, &dma_drm_fmts);
+
+  if (gst_value_list_get_size (&dma_drm_fmts) > 0) {
+    dma_drm_caps = gst_caps_from_string ("video/x-raw(memory:DMABuf)");
+    gst_caps_set_simple (dma_drm_caps, "format", G_TYPE_STRING, "DMA_DRM",
+        NULL);
+    gst_caps_set_value (dma_drm_caps, "drm-format", &dma_drm_fmts);
+  }
+
+  g_value_unset (&dma_drm_fmts);
+
+  return dma_drm_caps;
+}
+#endif
+
+#if (MFX_VERSION >= 2000)
+
+static gboolean
+_fill_mfxframeinfo (GstVideoFormat format, mfxFrameInfo * frameinfo)
+{
+  if (format == GST_VIDEO_FORMAT_UNKNOWN)
+    return FALSE;
+
+  frameinfo->ChromaFormat = gst_msdk_get_mfx_chroma_from_format (format);
+  frameinfo->FourCC = gst_msdk_get_mfx_fourcc_from_format (format);
+
+  switch (format) {
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_YV12:
+    case GST_VIDEO_FORMAT_I420:
+    case GST_VIDEO_FORMAT_YUY2:
+    case GST_VIDEO_FORMAT_UYVY:
+    case GST_VIDEO_FORMAT_BGRA:
+    case GST_VIDEO_FORMAT_ABGR:
+    case GST_VIDEO_FORMAT_BGRx:
+    case GST_VIDEO_FORMAT_VUYA:
+      frameinfo->BitDepthLuma = 8;
+      frameinfo->BitDepthChroma = 8;
+      frameinfo->Shift = 0;
+      break;
+    case GST_VIDEO_FORMAT_BGR10A2_LE:
+      frameinfo->BitDepthLuma = 10;
+      frameinfo->BitDepthChroma = 10;
+      break;
+    case GST_VIDEO_FORMAT_P010_10LE:
+      frameinfo->BitDepthLuma = 10;
+      frameinfo->BitDepthChroma = 10;
+      frameinfo->Shift = 1;
+      break;
+#if (MFX_VERSION >= 1027)
+    case GST_VIDEO_FORMAT_Y210:
+      frameinfo->BitDepthLuma = 10;
+      frameinfo->BitDepthChroma = 10;
+      frameinfo->Shift = 1;
+      break;
+    case GST_VIDEO_FORMAT_Y410:
+      frameinfo->BitDepthLuma = 10;
+      frameinfo->BitDepthChroma = 10;
+      frameinfo->Shift = 0;
+      break;
+#endif
+#if (MFX_VERSION >= 1031)
+    case GST_VIDEO_FORMAT_P012_LE:
+    case GST_VIDEO_FORMAT_Y212_LE:
+    case GST_VIDEO_FORMAT_Y412_LE:
+      frameinfo->BitDepthLuma = 12;
+      frameinfo->BitDepthChroma = 12;
+      frameinfo->Shift = 1;
+      break;
+#endif
+#if (MFX_VERSION >=2004)
+    case GST_VIDEO_FORMAT_RGBP:
+    case GST_VIDEO_FORMAT_BGRP:
+      frameinfo->BitDepthLuma = 8;
+      frameinfo->BitDepthChroma = 8;
+      frameinfo->Shift = 0;
+      break;
+#endif
+    case GST_VIDEO_FORMAT_RGB16:
+      /* Ignore parameters settings, do nothing */
+      break;
+    default:
+      GST_WARNING ("Unsupported format %s",
+          gst_video_format_to_string (format));
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+static const gchar *
+_profile_to_string (guint codec, mfxU32 profile)
+{
+  if (profile == MFX_PROFILE_UNKNOWN)
+    return NULL;
+
+  for (int c = 0; c < G_N_ELEMENTS (codec_profs); c++) {
+    if (codec_profsc.codec == codec) {
+      const Profile *p = codec_profsc.profiles;
+      for (; p->id != MFX_PROFILE_UNKNOWN; p++) {
+        if (p->id == profile)
+          return p->names;
+      }
+    }
+  }
+
+  return NULL;
+}
+
+static mfxU16
+_get_main_codec_profile (guint codec)
+{
+  for (int c = 0; c < G_N_ELEMENTS (codec_profs); c++) {
+    if (codec_profsc.codec == codec) {
+      return codec_profsc.profiles->id;
+    }
+  }
+
+  return MFX_PROFILE_UNKNOWN;
+}
+
+static void
+_codec_init_param (mfxVideoParam * param,
+    guint codec_id, mfxU16 pattern, GstVideoFormat format)
+{
+  g_return_if_fail (param != NULL);
+
+  memset (param, 0, sizeof (mfxVideoParam));
+  param->IOPattern = pattern;
+  param->mfx.CodecId = codec_id;
+  param->mfx.CodecProfile = _get_main_codec_profile (codec_id);
+  param->mfx.FrameInfo.Width = default_width;
+  param->mfx.FrameInfo.Height = default_height;
+  param->mfx.FrameInfo.CropW = param->mfx.FrameInfo.Width;
+  param->mfx.FrameInfo.CropH = param->mfx.FrameInfo.Height;
+  param->mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+  param->mfx.FrameInfo.FrameRateExtN = 30;
+  param->mfx.FrameInfo.FrameRateExtD = 1;
+  param->mfx.FrameInfo.AspectRatioW = 1;
+  param->mfx.FrameInfo.AspectRatioH = 1;
+
+  _fill_mfxframeinfo (format, &param->mfx.FrameInfo);
+}
+
+static gboolean
+_get_min_width (mfxSession * session, mfxVideoParam * in,
+    mfxVideoParam * out, IsParamSupportedFunc func,
+    const mfxRange32U * width, guint * min_w)
+{
+  g_return_val_if_fail (func != NULL, FALSE);
+
+  in->mfx.FrameInfo.Height = default_height;
+  in->mfx.FrameInfo.CropH = default_height;
+  out->mfx.FrameInfo.Height = in->mfx.FrameInfo.Height;
+  out->mfx.FrameInfo.CropH = in->mfx.FrameInfo.CropH;
+
+  for (guint w = width->Min; w < *min_w;) {
+    in->mfx.FrameInfo.Width = w;
+    in->mfx.FrameInfo.CropW = w;
+    out->mfx.FrameInfo.Width = in->mfx.FrameInfo.Width;
+    out->mfx.FrameInfo.CropW = in->mfx.FrameInfo.CropW;
+
+    if (func (session, in, out)) {
+      *min_w = in->mfx.FrameInfo.Width;
+      return TRUE;
+    } else {
+      if (out->mfx.FrameInfo.Width != 0) {
+        if (func (session, out, out)) {
+          *min_w = out->mfx.FrameInfo.Width;
+          return TRUE;
+        }
+      }
+    }
+
+    w += width->Step;
+  }
+
+  return FALSE;
+}
+
+static gboolean
+_get_min_height (mfxSession * session, mfxVideoParam * in,
+    mfxVideoParam * out, IsParamSupportedFunc func,
+    const mfxRange32U * height, guint * min_h)
+{
+  g_return_val_if_fail (func != NULL, FALSE);
+
+  in->mfx.FrameInfo.Width = default_width;
+  in->mfx.FrameInfo.CropW = default_width;
+  out->mfx.FrameInfo.Width = in->mfx.FrameInfo.Width;
+  out->mfx.FrameInfo.CropW = in->mfx.FrameInfo.CropW;
+
+  for (guint h = height->Min; h < *min_h;) {
+    in->mfx.FrameInfo.Height = h;
+    in->mfx.FrameInfo.CropH = h;
+    out->mfx.FrameInfo.Height = h;
+    out->mfx.FrameInfo.CropH = h;
+
+    if (func (session, in, out)) {
+      *min_h = in->mfx.FrameInfo.Height;
+      return TRUE;
+    } else {
+      if (out->mfx.FrameInfo.Height != 0) {
+        if (func (session, out, out)) {
+          *min_h = out->mfx.FrameInfo.Height;
+          return TRUE;
+        }
+      }
+    }
+
+    h += height->Step;
+  }
+
+  return FALSE;
+}
+
+static guint
+_get_smaller_res_width (guint cur_res_width)
+{
+  guint i = G_N_ELEMENTS (max_res_widths) - 1;
+
+  for (; i >= 0; i--) {
+    if (max_res_widthsi < cur_res_width)
+      return max_res_widthsi;
+  }
+
+  return 0;
+}
+
+static gboolean
+_get_max_width (mfxSession * session, mfxVideoParam * in,
+    mfxVideoParam * out, IsParamSupportedFunc func,
+    const mfxRange32U * width, guint * max_w)
+{
+  guint w;
+
+  g_return_val_if_fail (func != NULL, FALSE);
+
+  in->mfx.FrameInfo.Height = default_height;
+  in->mfx.FrameInfo.CropH = default_height;
+  out->mfx.FrameInfo.Height = in->mfx.FrameInfo.Height;
+  out->mfx.FrameInfo.CropH = in->mfx.FrameInfo.CropH;
+
+  w = width->Max;
+  do {
+    in->mfx.FrameInfo.Width = w;
+    in->mfx.FrameInfo.CropW = w;
+    out->mfx.FrameInfo.Width = in->mfx.FrameInfo.Width;
+    out->mfx.FrameInfo.CropW = in->mfx.FrameInfo.CropW;
+
+    if (func (session, in, out)) {
+      *max_w = in->mfx.FrameInfo.Width;
+      return TRUE;
+    } else {
+      if (out->mfx.FrameInfo.Width != 0) {
+        if (func (session, out, out)) {
+          *max_w = out->mfx.FrameInfo.Width;
+          return TRUE;
+        }
+      }
+    }
+
+    w = _get_smaller_res_width (w);
+  } while (w);
+
+  return FALSE;
+}
+
+static guint
+_get_smaller_res_height (guint cur_res_height)
+{
+  guint i = G_N_ELEMENTS (max_res_heights) - 1;
+
+  for (; i >= 0; i--) {
+    if (max_res_heightsi < cur_res_height)
+      return max_res_heightsi;
+  }
+
+  return 0;
+}
+
+static gboolean
+_get_max_height (mfxSession * session, mfxVideoParam * in,
+    mfxVideoParam * out, IsParamSupportedFunc func,
+    const mfxRange32U * height, guint * max_h)
+{
+  guint h;
+
+  g_return_val_if_fail (func != NULL, FALSE);
+
+  in->mfx.FrameInfo.Width = default_width;
+  in->mfx.FrameInfo.CropW = default_width;
+  out->mfx.FrameInfo.Width = in->mfx.FrameInfo.Width;
+  out->mfx.FrameInfo.CropW = in->mfx.FrameInfo.CropW;
+
+  h = height->Max;
+  do {
+    in->mfx.FrameInfo.Height = h;
+    in->mfx.FrameInfo.CropH = h;
+    out->mfx.FrameInfo.Height = in->mfx.FrameInfo.Height;
+    out->mfx.FrameInfo.CropH = in->mfx.FrameInfo.CropH;
+
+    if (func (session, in, out)) {
+      *max_h = in->mfx.FrameInfo.Height;
+      return TRUE;
+    } else {
+      if (out->mfx.FrameInfo.Height != 0) {
+        if (func (session, out, out)) {
+          *max_h = out->mfx.FrameInfo.Height;
+          return TRUE;
+        }
+      }
+    }
+
+    h = _get_smaller_res_height (h);
+  } while (h);
+
+  return FALSE;
+}
+
+static gboolean
+_format_in_list (GstVideoFormat format, GValue * list)
+{
+  const GValue *gfmt;
+  const gchar *fmt_str = NULL;
+  guint size = gst_value_list_get_size (list);
+
+  if (format == GST_VIDEO_FORMAT_UNKNOWN)
+    return FALSE;
+
+  for (guint i = 0; i < size; i++) {
+    gfmt = gst_value_list_get_value (list, i);
+    fmt_str = g_value_get_string (gfmt);
+
+    if (format == gst_video_format_from_string (fmt_str))
+      return TRUE;
+  }
+
+  return FALSE;
+}
+
+static gboolean
+_fourcc_in_array (mfxU32 fourcc, mfxU32 * array, mfxU16 num)
+{
+  for (guint i = 0; i < num; i++) {
+    if (arrayi == fourcc)
+      return TRUE;
+  }
+
+  return FALSE;
+}
+
+static inline gboolean
+_enc_is_param_supported (mfxSession * session,
+    mfxVideoParam * in, mfxVideoParam * out)
+{
+  mfxStatus status = MFXVideoENCODE_Query (*session, in, out);
+  if (status == MFX_ERR_NONE)
+    return TRUE;
+
+  return FALSE;
+}
+
+static inline gboolean
+_enc_ensure_codec (mfxEncoderDescription * enc_desc, guint c)
+{
+  for (guint p = 0; p < enc_desc->Codecsc.NumProfiles; p++) {
+    if (enc_desc->Codecsc.Profilesp.MemDesc->NumColorFormats)
+      return TRUE;
+  }
+
+  return FALSE;
+}
+
+static inline gint
+_enc_get_codec_index (mfxEncoderDescription * enc_desc, guint codec_id)
+{
+  gint c;
+
+  for (c = 0; c < enc_desc->NumCodecs; c++) {
+    if (enc_desc->Codecsc.CodecID == codec_id) {
+      break;
+    }
+  }
+
+  if (c >= enc_desc->NumCodecs)
+    goto failed;
+
+  if (!_enc_ensure_codec (enc_desc, c))
+    goto failed;
+
+  return c;
+
+failed:
+  GST_WARNING ("Unsupported codec %" GST_FOURCC_FORMAT,
+      GST_FOURCC_ARGS (codec_id));
+  return -1;
+}
+
+static gboolean
+_enc_get_resolution_range (mfxSession * session,
+    mfxEncoderDescription * enc_desc, guint codec_id,
+    ResolutionRange * res_range)
+{
+  guint c;
+  mfxVideoParam in, out;
+  mfxRange32U *width, *height;
+  ResolutionRange res = { default_width, default_width,
+    default_height, default_height
+  };
+
+  g_return_val_if_fail (res_range != NULL, FALSE);
+
+  c = _enc_get_codec_index (enc_desc, codec_id);
+  width = &enc_desc->Codecsc.Profiles->MemDesc->Width;
+  height = &enc_desc->Codecsc.Profiles->MemDesc->Height;
+
+  _codec_init_param (&in, codec_id, ENC_IOPATTERN, DEFAULT_VIDEO_FORMAT);
+  if (codec_id == MFX_CODEC_AV1)
+    in.mfx.CodecLevel = MFX_LEVEL_AV1_41;
+  out = in;
+
+  IsParamSupportedFunc func = _enc_is_param_supported;
+  if (!_get_min_width (session, &in, &out, func, width, &res.min_width) ||
+      !_get_max_width (session, &in, &out, func, width, &res.max_width) ||
+      !_get_min_height (session, &in, &out, func, height, &res.min_height) ||
+      !_get_max_height (session, &in, &out, func, height, &res.max_height))
+    return FALSE;
+
+  GST_DEBUG ("Got %" GST_FOURCC_FORMAT
+      " ENC supported resolution range width: %d, %d, height: %d, %d",
+      GST_FOURCC_ARGS (enc_desc->Codecsc.CodecID),
+      res.min_width, res.max_width, res.min_height, res.max_height);
+
+  res_range->min_width = res.min_width;
+  res_range->max_width = res.max_width;
+  res_range->min_height = res.min_height;
+  res_range->max_height = res.max_height;
+
+  return TRUE;
+}
+
+static gboolean
+_enc_is_format_supported (mfxSession * session,
+    guint codec_id, GstVideoFormat format,
+    mfxVideoParam * in, mfxVideoParam * out)
+{
+  if (!_fill_mfxframeinfo (format, &in->mfx.FrameInfo))
+    return FALSE;
+
+  in->mfx.LowPower = MFX_CODINGOPTION_UNKNOWN;
+  if (!_enc_is_param_supported (session, in, out)) {
+    in->mfx.LowPower = (out->mfx.LowPower == MFX_CODINGOPTION_ON) ?
+        MFX_CODINGOPTION_OFF : MFX_CODINGOPTION_ON;
+
+    if (!_enc_is_param_supported (session, in, out))
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+_enc_get_supported_formats_and_profiles (mfxSession * session,
+    mfxEncoderDescription * enc_desc, guint codec_id,
+    GValue * supported_fmts, GValue * supported_profs)
+{
+  guint size;
+  const GValue *gfmt;
+  GValue fmts = G_VALUE_INIT;
+  GstVideoFormat fmt = DEFAULT_VIDEO_FORMAT;
+  mfxVideoParam in, out;
+  gboolean prof_supported;
+  const gchar *prof_str = NULL;
+  gchar **profs = NULL;
+  gint c = _enc_get_codec_index (enc_desc, codec_id);
+
+  _codec_init_param (&in, codec_id, ENC_IOPATTERN, DEFAULT_VIDEO_FORMAT);
+  if (codec_id == MFX_CODEC_AV1)
+    in.mfx.CodecLevel = MFX_LEVEL_AV1_41;
+  out = in;
+
+  g_value_init (&fmts, GST_TYPE_LIST);
+  gst_msdk_get_video_format_list (&fmts);
+  size = gst_value_list_get_size (&fmts);
+
+  for (guint p = 0; p < enc_desc->Codecsc.NumProfiles; p++) {
+    in.mfx.CodecProfile = enc_desc->Codecsc.Profilesp.Profile;
+    prof_supported = FALSE;
+
+    for (guint i = 0; i < size; i++) {
+      gfmt = gst_value_list_get_value (&fmts, i);
+      fmt = g_value_get_uint (gfmt);
+
+      if (_format_in_list (fmt, supported_fmts))
+        continue;
+
+      if (!_fourcc_in_array (gst_msdk_get_mfx_fourcc_from_format (fmt),
+              enc_desc->Codecsc.Profilesp.MemDesc->ColorFormats,
+              enc_desc->Codecsc.Profilesp.MemDesc->NumColorFormats))
+        continue;
+
+      if (!_enc_is_format_supported (session, codec_id, fmt, &in, &out))
+        continue;
+
+      _list_append_string (supported_fmts, gst_video_format_to_string (fmt));
+      prof_supported = TRUE;
+    }
+
+    if (!prof_supported) {
+      for (guint f = 0;
+          f < enc_desc->Codecsc.Profilesp.MemDesc->NumColorFormats; f++) {
+        fmt =
+            gst_msdk_get_video_format_from_mfx_fourcc (enc_desc->
+            Codecsc.Profilesp.MemDesc->ColorFormatsf);
+        if (_enc_is_format_supported (session, codec_id, fmt, &in, &out)) {
+          prof_supported = TRUE;
+          break;
+        }
+      }
+    }
+
+    if (!prof_supported)
+      continue;
+
+    prof_str = _profile_to_string (codec_id, in.mfx.CodecProfile);
+    if (!prof_str)
+      continue;
+
+    profs = g_strsplit (prof_str, PROFILE_DELIMITER, 0);
+    for (guint i = 0; profsi; i++)
+      _list_append_string (supported_profs, profsi);
+    g_strfreev (profs);
+  }
+
+  g_value_unset (&fmts);
+
+  if (gst_value_list_get_size (supported_fmts) == 0 ||
+      gst_value_list_get_size (supported_profs) == 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+static GstCaps *
+_enc_create_sink_caps (GstMsdkContext * context, guint codec_id,
+    const ResolutionRange * res, GValue * supported_formats)
+{
+  GstCaps *caps, *dma_caps, *raw_caps;
+
+#ifndef _WIN32
+  caps = gst_caps_from_string
+      ("video/x-raw(memory:VAMemory), format=(string){ NV12 }");
+  dma_caps = _create_dma_drm_caps (context, GST_MSDK_JOB_ENCODER,
+      supported_formats);
+  gst_caps_append (caps, dma_caps);
+#else
+  VAR_UNUSED (dma_caps);
+  caps = gst_caps_from_string
+      ("video/x-raw(memory:D3D11Memory), format=(string){ NV12 }");
+#endif
+
+  raw_caps = gst_caps_from_string ("video/x-raw");
+  gst_caps_set_value (raw_caps, "format", supported_formats);
+  gst_caps_append (caps, raw_caps);
+
+  gst_caps_set_simple (caps,
+      "width", GST_TYPE_INT_RANGE, res->min_width, res->max_width,
+      "height", GST_TYPE_INT_RANGE, res->min_height, res->max_height,
+      "interlace-mode", G_TYPE_STRING, "progressive", NULL);
+
+  GST_DEBUG ("Create %" GST_FOURCC_FORMAT " ENC sink_caps %" GST_PTR_FORMAT,
+      GST_FOURCC_ARGS (codec_id), caps);
+
+  return caps;
+}
+
+static GstCaps *
+_enc_create_src_caps (guint codec_id,
+    const ResolutionRange * res, GValue * supported_profiles)
+{
+  GstCaps *caps;
+  const gchar *media_type = NULL;
+
+  media_type = _get_media_type (codec_id);
+  if (!media_type)
+    return NULL;
+
+  caps = gst_caps_new_empty_simple (media_type);
+  gst_caps_set_value (caps, "profile", supported_profiles);
+  gst_caps_set_simple (caps,
+      "width", GST_TYPE_INT_RANGE, res->min_width, res->max_width,
+      "height", GST_TYPE_INT_RANGE, res->min_height, res->max_height, NULL);
+
+  GST_DEBUG ("Create %" GST_FOURCC_FORMAT " ENC src_caps %" GST_PTR_FORMAT,
+      GST_FOURCC_ARGS (codec_id), caps);
+
+  return caps;
+}
+
+gboolean
+gst_msdkcaps_enc_create_caps (GstMsdkContext * context,
+    gpointer enc_description, guint codec_id,
+    GstCaps ** sink_caps, GstCaps ** src_caps)
+{
+  mfxEncoderDescription *enc_desc;
+  GstCaps *in_caps = NULL, *out_caps = NULL;
+  ResolutionRange res_range = { 1, G_MAXUINT16, 1, G_MAXUINT16 };
+  GValue supported_fmts = G_VALUE_INIT;
+  GValue supported_profs = G_VALUE_INIT;
+  mfxSession session;
+
+  g_return_val_if_fail (context, FALSE);
+  g_return_val_if_fail (enc_description, FALSE);
+
+  session = gst_msdk_context_get_session (context);
+  enc_desc = (mfxEncoderDescription *) enc_description;
+
+  if (_enc_get_codec_index (enc_desc, codec_id) < 0)
+    goto failed;
+
+  g_value_init (&supported_fmts, GST_TYPE_LIST);
+  g_value_init (&supported_profs, GST_TYPE_LIST);
+  if (!_enc_get_supported_formats_and_profiles (&session,
+          enc_desc, codec_id, &supported_fmts, &supported_profs))
+    goto failed;
+
+  if (!_enc_get_resolution_range (&session, enc_desc, codec_id, &res_range))
+    goto failed;
+
+  in_caps = _enc_create_sink_caps (context,
+      codec_id, &res_range, &supported_fmts);
+  g_value_unset (&supported_fmts);
+  if (!in_caps)
+    goto failed;
+
+  out_caps = _enc_create_src_caps (codec_id, &res_range, &supported_profs);
+  g_value_unset (&supported_profs);
+  if (!out_caps)
+    goto failed;
+
+  *sink_caps = in_caps;
+  *src_caps = out_caps;
+
+  return TRUE;
+
+failed:
+  GST_WARNING ("Failed to create caps for %" GST_FOURCC_FORMAT " ENC",
+      GST_FOURCC_ARGS (codec_id));
+
+  g_value_unset (&supported_fmts);
+  g_value_unset (&supported_profs);
+  if (in_caps)
+    gst_caps_unref (in_caps);
+
+  return FALSE;
+}
+
+static inline gboolean
+_dec_is_param_supported (mfxSession * session,
+    mfxVideoParam * in, mfxVideoParam * out)
+{
+  mfxStatus status = MFXVideoDECODE_Query (*session, in, out);
+  if (status == MFX_ERR_NONE)
+    return TRUE;
+
+  return FALSE;
+}
+
+static inline gboolean
+_dec_ensure_codec (mfxDecoderDescription * dec_desc, guint c)
+{
+  for (guint p = 0; p < dec_desc->Codecsc.NumProfiles; p++) {
+    if (dec_desc->Codecsc.Profilesp.MemDesc->NumColorFormats)
+      return TRUE;
+  }
+
+  return FALSE;
+}
+
+static inline gint
+_dec_get_codec_index (mfxDecoderDescription * dec_desc, guint codec_id)
+{
+  gint c;
+
+  for (c = 0; c < dec_desc->NumCodecs; c++) {
+    if (dec_desc->Codecsc.CodecID == codec_id) {
+      break;
+    }
+  }
+
+  if (c >= dec_desc->NumCodecs)
+    goto failed;
+
+  if (!_dec_ensure_codec (dec_desc, c))
+    goto failed;
+
+  return c;
+
+failed:
+  GST_WARNING ("Unsupported codec %" GST_FOURCC_FORMAT,
+      GST_FOURCC_ARGS (codec_id));
+  return -1;
+}
+
+static void
+_jpegdec_set_color_format (mfxVideoParam * param, GstVideoFormat format)
+{
+  param->mfx.JPEGChromaFormat = param->mfx.FrameInfo.ChromaFormat;
+
+  switch (format) {
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_YUY2:
+      param->mfx.JPEGColorFormat = MFX_JPEG_COLORFORMAT_YCbCr;
+      break;
+    case GST_VIDEO_FORMAT_BGRA:
+    case GST_VIDEO_FORMAT_BGRx:
+      param->mfx.JPEGColorFormat = MFX_JPEG_COLORFORMAT_RGB;
+      break;
+    default:
+      GST_WARNING ("Jpegdec unsupported format %s",
+          gst_video_format_to_string (format));
+      break;
+  }
+}
+
+static gboolean
+_dec_get_resolution_range (mfxSession * session,
+    mfxDecoderDescription * dec_desc, guint codec_id,
+    ResolutionRange * res_range)
+{
+  guint c;
+  mfxVideoParam in, out;
+  mfxRange32U *width, *height;
+  ResolutionRange res = { default_width, default_width,
+    default_height, default_height
+  };
+
+  g_return_val_if_fail (res_range != NULL, FALSE);
+
+  c = _dec_get_codec_index (dec_desc, codec_id);
+  width = &dec_desc->Codecsc.Profiles->MemDesc->Width;
+  height = &dec_desc->Codecsc.Profiles->MemDesc->Height;
+
+  _codec_init_param (&in, codec_id, DEC_IOPATTERN, DEFAULT_VIDEO_FORMAT);
+  if (codec_id == MFX_CODEC_AV1)
+    in.mfx.CodecLevel = MFX_LEVEL_AV1_41;
+  if (codec_id == MFX_CODEC_JPEG)
+    _jpegdec_set_color_format (&in, GST_VIDEO_FORMAT_NV12);
+  out = in;
+
+  IsParamSupportedFunc func = _dec_is_param_supported;
+  if (!_get_min_width (session, &in, &out, func, width, &res.min_width) ||
+      !_get_max_width (session, &in, &out, func, width, &res.max_width) ||
+      !_get_min_height (session, &in, &out, func, height, &res.min_height) ||
+      !_get_max_height (session, &in, &out, func, height, &res.max_height))
+    return FALSE;
+
+  GST_DEBUG ("Got %" GST_FOURCC_FORMAT
+      " DEC supported resolution range width: %d, %d, height: %d, %d",
+      GST_FOURCC_ARGS (dec_desc->Codecsc.CodecID),
+      res.min_width, res.max_width, res.min_height, res.max_height);
+
+  res_range->min_width = res.min_width;
+  res_range->max_width = res.max_width;
+  res_range->min_height = res.min_height;
+  res_range->max_height = res.max_height;
+
+  return TRUE;
+}
+
+static gboolean
+_dec_is_format_supported (mfxSession * session,
+    guint codec_id, GstVideoFormat format,
+    mfxVideoParam * in, mfxVideoParam * out)
+{
+  if (!_fill_mfxframeinfo (format, &in->mfx.FrameInfo))
+    return FALSE;
+
+  if (codec_id == MFX_CODEC_JPEG)
+    _jpegdec_set_color_format (in, format);
+
+  in->mfx.LowPower = MFX_CODINGOPTION_UNKNOWN;
+  if (!_dec_is_param_supported (session, in, out)) {
+    in->mfx.LowPower = (out->mfx.LowPower == MFX_CODINGOPTION_ON) ?
+        MFX_CODINGOPTION_OFF : MFX_CODINGOPTION_ON;
+
+    if (!_dec_is_param_supported (session, in, out))
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+_dec_get_supported_formats (mfxSession * session,
+    mfxDecoderDescription * dec_desc, guint codec_id, GValue * supported_fmts)
+{
+  guint size;
+  const GValue *gfmt;
+  GValue fmts = G_VALUE_INIT;
+  GstVideoFormat fmt = DEFAULT_VIDEO_FORMAT;
+  mfxVideoParam in, out;
+  gint c;
+
+  _codec_init_param (&in, codec_id, DEC_IOPATTERN, DEFAULT_VIDEO_FORMAT);
+  if (codec_id == MFX_CODEC_AV1)
+    in.mfx.CodecLevel = MFX_LEVEL_AV1_41;
+  out = in;
+
+  g_value_init (&fmts, GST_TYPE_LIST);
+  gst_msdk_get_video_format_list (&fmts);
+  size = gst_value_list_get_size (&fmts);
+
+  c = _dec_get_codec_index (dec_desc, codec_id);
+
+  for (guint p = 0; p < dec_desc->Codecsc.NumProfiles; p++) {
+    in.mfx.CodecProfile = dec_desc->Codecsc.Profilesp.Profile;
+
+    for (guint i = 0; i < size; i++) {
+      gfmt = gst_value_list_get_value (&fmts, i);
+      fmt = g_value_get_uint (gfmt);
+
+      if (_format_in_list (fmt, supported_fmts))
+        continue;
+
+      if (!_fourcc_in_array (gst_msdk_get_mfx_fourcc_from_format (fmt),
+              dec_desc->Codecsc.Profilesp.MemDesc->ColorFormats,
+              dec_desc->Codecsc.Profilesp.MemDesc->NumColorFormats))
+        continue;
+
+      if (!_dec_is_format_supported (session, codec_id, fmt, &in, &out))
+        continue;
+
+      _list_append_string (supported_fmts, gst_video_format_to_string (fmt));
+    }
+  }
+
+  g_value_unset (&fmts);
+
+  return (gst_value_list_get_size (supported_fmts) == 0) ? FALSE : TRUE;
+}
+
+static GstCaps *
+_dec_create_sink_caps (guint codec_id)
+{
+  GstCaps *caps;
+  const gchar *media_type = NULL;
+
+  media_type = _get_media_type (codec_id);
+  if (!media_type)
+    return NULL;
+
+  caps = gst_caps_new_empty_simple (media_type);
+
+  GST_DEBUG ("Create %" GST_FOURCC_FORMAT " DEC sink_caps %" GST_PTR_FORMAT,
+      GST_FOURCC_ARGS (codec_id), caps);
+
+  return caps;
+}
+
+static GstCaps *
+_dec_create_src_caps (GstMsdkContext * context,
+    mfxSession * session, guint codec_id,
+    mfxDecoderDescription * dec_desc, GValue * supported_formats)
+{
+  GstCaps *caps, *dma_caps, *raw_caps;
+  ResolutionRange res = { 1, G_MAXUINT16, 1, G_MAXUINT16 };
+
+  if (!_dec_get_resolution_range (session, dec_desc, codec_id, &res))
+    return NULL;
+
+#ifndef _WIN32
+  caps = gst_caps_from_string
+      ("video/x-raw(memory:VAMemory), format=(string){ NV12 }");
+  dma_caps = _create_dma_drm_caps (context, GST_MSDK_JOB_DECODER,
+      supported_formats);
+  gst_caps_append (caps, dma_caps);
+#else
+  VAR_UNUSED (dma_caps);
+  caps = gst_caps_from_string
+      ("video/x-raw(memory:D3D11Memory), format=(string){ NV12 }");
+#endif
+
+  raw_caps = gst_caps_from_string ("video/x-raw");
+  gst_caps_set_value (raw_caps, "format", supported_formats);
+  gst_caps_append (caps, raw_caps);
+
+  gst_caps_set_simple (caps,
+      "width", GST_TYPE_INT_RANGE, res.min_width, res.max_width,
+      "height", GST_TYPE_INT_RANGE, res.min_height, res.max_height,
+      "interlace-mode", G_TYPE_STRING, "progressive", NULL);
+
+  GST_DEBUG ("Create %" GST_FOURCC_FORMAT " DEC src_caps %" GST_PTR_FORMAT,
+      GST_FOURCC_ARGS (codec_id), caps);
+
+  return caps;
+}
+
+gboolean
+gst_msdkcaps_dec_create_caps (GstMsdkContext * context,
+    gpointer dec_description, guint codec_id,
+    GstCaps ** sink_caps, GstCaps ** src_caps)
+{
+  mfxDecoderDescription *dec_desc;
+  GstCaps *in_caps = NULL, *out_caps = NULL;
+  GValue supported_fmts = G_VALUE_INIT;
+  mfxSession session;
+
+  g_return_val_if_fail (context, FALSE);
+  g_return_val_if_fail (dec_description, FALSE);
+
+  session = gst_msdk_context_get_session (context);
+  dec_desc = (mfxDecoderDescription *) dec_description;
+
+  if (_dec_get_codec_index (dec_desc, codec_id) < 0)
+    goto failed;
+
+  g_value_init (&supported_fmts, GST_TYPE_LIST);
+  if (!_dec_get_supported_formats (&session,
+          dec_desc, codec_id, &supported_fmts))
+    goto failed;
+
+  in_caps = _dec_create_sink_caps (codec_id);
+  if (!in_caps)
+    goto failed;
+
+  out_caps = _dec_create_src_caps (context,
+      &session, codec_id, dec_desc, &supported_fmts);
+  g_value_unset (&supported_fmts);
+  if (!out_caps)
+    goto failed;
+
+  *sink_caps = in_caps;
+  *src_caps = out_caps;
+
+  return TRUE;
+
+failed:
+  GST_WARNING ("Failed to create caps for %" GST_FOURCC_FORMAT " DEC",
+      GST_FOURCC_ARGS (codec_id));
+
+  g_value_unset (&supported_fmts);
+  if (in_caps)
+    gst_caps_unref (in_caps);
+
+  return FALSE;
+}
+
+static void
+_vpp_init_param (mfxVideoParam * param,
+    GstVideoFormat infmt, GstVideoFormat outfmt)
+{
+  g_return_if_fail (param != NULL);
+
+  memset (param, 0, sizeof (mfxVideoParam));
+  param->IOPattern = VPP_IOPATTERN;
+  param->vpp.In.Width = default_width;
+  param->vpp.In.Height = default_height;
+  param->vpp.In.CropW = param->mfx.FrameInfo.Width;
+  param->vpp.In.CropH = param->mfx.FrameInfo.Height;
+  param->vpp.In.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+  param->vpp.In.FrameRateExtN = 30;
+  param->vpp.In.FrameRateExtD = 1;
+  param->vpp.In.AspectRatioW = 1;
+  param->vpp.In.AspectRatioH = 1;
+
+  param->vpp.Out = param->vpp.In;
+
+  _fill_mfxframeinfo (infmt, &param->vpp.In);
+  _fill_mfxframeinfo (outfmt, &param->vpp.Out);
+}
+
+static inline gboolean
+_vpp_is_param_supported (mfxSession * session,
+    mfxVideoParam * in, mfxVideoParam * out)
+{
+  mfxStatus status = MFXVideoVPP_Query (*session, in, out);
+  if (status == MFX_ERR_NONE)
+    return TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+_vpp_are_formats_supported (mfxSession * session,
+    GstVideoFormat infmt, GstVideoFormat outfmt,
+    mfxVideoParam * in, mfxVideoParam * out)
+{
+  if (!_fill_mfxframeinfo (infmt, &in->vpp.In))
+    return FALSE;
+
+  if (!_fill_mfxframeinfo (outfmt, &in->vpp.Out))
+    return FALSE;
+
+  if (!_vpp_is_param_supported (session, in, out))
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+_vpp_get_supported_formats (mfxSession * session,
+    GValue * supported_in_fmts, GValue * supported_out_fmts)
+{
+  guint size;
+  const GValue *gfmt;
+  GValue fmts = G_VALUE_INIT;
+  GstVideoFormat infmt = DEFAULT_VIDEO_FORMAT;
+  GstVideoFormat outfmt = DEFAULT_VIDEO_FORMAT;
+  gboolean infmt_in_list, outfmt_in_list;
+  mfxVideoParam in, out;
+
+  _vpp_init_param (&in, infmt, outfmt);
+  out = in;
+
+  g_value_init (&fmts, GST_TYPE_LIST);
+  gst_msdk_get_video_format_list (&fmts);
+
+  size = gst_value_list_get_size (&fmts);
+  for (guint i = 0; i < size; i++) {
+    gfmt = gst_value_list_get_value (&fmts, i);
+    infmt = g_value_get_uint (gfmt);
+
+    for (guint j = 0; j < size; j++) {
+      gfmt = gst_value_list_get_value (&fmts, j);
+      outfmt = g_value_get_uint (gfmt);
+
+      infmt_in_list = _format_in_list (infmt, supported_in_fmts);
+      outfmt_in_list = _format_in_list (outfmt, supported_out_fmts);
+      if (infmt_in_list && outfmt_in_list)
+        continue;
+
+      if (!_vpp_are_formats_supported (session, infmt, outfmt, &in, &out))
+        continue;
+
+      if (!infmt_in_list)
+        _list_append_string (supported_in_fmts,
+            gst_video_format_to_string (infmt));
+
+      if (!outfmt_in_list)
+        _list_append_string (supported_out_fmts,
+            gst_video_format_to_string (outfmt));
+    }
+  }
+
+  g_value_unset (&fmts);
+
+  if (gst_value_list_get_size (supported_in_fmts) == 0 ||
+      gst_value_list_get_size (supported_out_fmts) == 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+_vpp_get_desc_image_range (mfxVPPDescription * vpp_desc,
+    GstVideoFormat format, mfxRange32U * width, mfxRange32U * height)
+{
+  mfxU32 infmt = gst_msdk_get_mfx_fourcc_from_format (format);
+
+  for (guint f = 0; f < vpp_desc->NumFilters; f++) {
+    for (guint i = 0; i < vpp_desc->NumFilters; i++) {
+      if (vpp_desc->Filtersf.MemDesc->Formatsi.InFormat != infmt)
+        continue;
+
+      *width = vpp_desc->Filtersf.MemDesc->Width;
+      *height = vpp_desc->Filtersf.MemDesc->Height;
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
+static gboolean
+_vpp_get_resolution_range (mfxSession * session,
+    mfxVPPDescription * vpp_desc, ResolutionRange * res_range)
+{
+  mfxVideoParam in, out;
+  mfxRange32U width, height;
+  ResolutionRange res = { default_width, default_width,
+    default_height, default_height
+  };
+
+  g_return_val_if_fail (res_range != NULL, FALSE);
+
+  if (!_vpp_get_desc_image_range (vpp_desc,
+          DEFAULT_VIDEO_FORMAT, &width, &height))
+    return FALSE;
+
+  _vpp_init_param (&in, DEFAULT_VIDEO_FORMAT, DEFAULT_VIDEO_FORMAT);
+  out = in;
+
+  IsParamSupportedFunc func = _vpp_is_param_supported;
+  if (!_get_min_width (session, &in, &out, func, &width, &res.min_width) ||
+      !_get_max_width (session, &in, &out, func, &width, &res.max_width) ||
+      !_get_min_height (session, &in, &out, func, &height, &res.min_height) ||
+      !_get_max_height (session, &in, &out, func, &height, &res.max_height))
+    return FALSE;
+
+  GST_DEBUG ("Got VPP supported resolution range "
+      "width: %d, %d, height: %d, %d",
+      res.min_width, res.max_width, res.min_height, res.max_height);
+
+  res_range->min_width = res.min_width;
+  res_range->max_width = res.max_width;
+  res_range->min_height = res.min_height;
+  res_range->max_height = res.max_height;
+
+  return TRUE;
+}
+
+static GstCaps *
+_vpp_create_caps (GstMsdkContext * context,
+    GValue * supported_fmts, ResolutionRange * res)
+{
+  GstCaps *caps, *dma_caps, *raw_caps;
+
+#ifndef _WIN32
+  caps = gst_caps_from_string ("video/x-raw(memory:VAMemory), "
+      "format=(string){ NV12, VUYA, P010_10LE }");
+  dma_caps = _create_dma_drm_caps (context, GST_MSDK_JOB_VPP, supported_fmts);
+  gst_caps_append (caps, dma_caps);
+#else
+  VAR_UNUSED (dma_caps);
+  caps = gst_caps_from_string ("video/x-raw(memory:D3D11Memory), "
+      "format=(string){ NV12, VUYA, P010_10LE }");
+#endif
+  raw_caps = gst_caps_from_string ("video/x-raw");
+  gst_caps_set_value (raw_caps, "format", supported_fmts);
+  gst_caps_append (caps, raw_caps);
+
+  gst_caps_set_simple (caps,
+      "width", GST_TYPE_INT_RANGE, res->min_width, res->max_width,
+      "height", GST_TYPE_INT_RANGE, res->min_height, res->max_height, NULL);
+
+  gst_msdkcaps_set_strings (caps, "memory:SystemMemory",
+      "interlace-mode", "progressive, interleaved, mixed");
+
+  GST_DEBUG ("Create VPP caps %" GST_PTR_FORMAT, caps);
+
+  return caps;
+}
+
+gboolean
+gst_msdkcaps_vpp_create_caps (GstMsdkContext * context,
+    gpointer vpp_description, GstCaps ** sink_caps, GstCaps ** src_caps)
+{
+  mfxVPPDescription *vpp_desc;
+  GstCaps *in_caps = NULL, *out_caps = NULL;
+  GValue supported_in_fmts = G_VALUE_INIT;
+  GValue supported_out_fmts = G_VALUE_INIT;
+  ResolutionRange res_range = { 1, G_MAXUINT16, 1, G_MAXUINT16 };
+  mfxSession session;
+
+  g_return_val_if_fail (context, FALSE);
+  g_return_val_if_fail (vpp_description, FALSE);
+
+  vpp_desc = (mfxVPPDescription *) vpp_description;
+  if (vpp_desc->NumFilters == 0)
+    return FALSE;
+
+  session = gst_msdk_context_get_session (context);
+
+  g_value_init (&supported_in_fmts, GST_TYPE_LIST);
+  g_value_init (&supported_out_fmts, GST_TYPE_LIST);
+
+  if (!_vpp_get_supported_formats (&session,
+          &supported_in_fmts, &supported_out_fmts))
+    goto failed;
+
+  if (!_vpp_get_resolution_range (&session, vpp_desc, &res_range))
+    goto failed;
+
+  in_caps = _vpp_create_caps (context, &supported_in_fmts, &res_range);
+  g_value_unset (&supported_in_fmts);
+  if (!in_caps)
+    goto failed;
+
+  out_caps = _vpp_create_caps (context, &supported_out_fmts, &res_range);
+  g_value_unset (&supported_out_fmts);
+  if (!out_caps)
+    goto failed;
+
+  *sink_caps = in_caps;
+  *src_caps = out_caps;
+
+  return TRUE;
+
+failed:
+  GST_WARNING ("Failed to create caps for VPP");
+
+  g_value_unset (&supported_in_fmts);
+  g_value_unset (&supported_out_fmts);
+  if (in_caps)
+    gst_caps_unref (in_caps);
+
+  return FALSE;
+}
+
+#else
+
+gboolean
+gst_msdkcaps_enc_create_caps (GstMsdkContext * context,
+    gpointer enc_description, guint codec_id,
+    GstCaps ** sink_caps, GstCaps ** src_caps)
+{
+  return FALSE;
+}
+
+gboolean
+gst_msdkcaps_dec_create_caps (GstMsdkContext * context,
+    gpointer dec_description, guint codec_id,
+    GstCaps ** sink_caps, GstCaps ** src_caps)
+{
+  return FALSE;
+}
+
+gboolean
+gst_msdkcaps_vpp_create_caps (GstMsdkContext * context,
+    gpointer vpp_description, GstCaps ** sink_caps, GstCaps ** src_caps)
+{
+  return FALSE;
+}
+
+#endif
+
+static gboolean
+_get_profiles (guint codec_id, GValue * supported_profs)
+{
+  const Profile *profiles = NULL;
+  gchar **profs = NULL;
+
+  g_return_val_if_fail (supported_profs != NULL, FALSE);
+
+  for (guint c = 0; c < G_N_ELEMENTS (codec_profs); c++) {
+    if (codec_profsc.codec == codec_id) {
+      profiles = codec_profsc.profiles;
+      break;
+    }
+  }
+  if (!profiles)
+    return FALSE;
+
+  for (; profiles->id != MFX_PROFILE_UNKNOWN; profiles++) {
+    profs = g_strsplit (profiles->names, PROFILE_DELIMITER, 0);
+    for (guint p = 0; profsp; p++)
+      _list_append_string (supported_profs, profsp);
+    g_strfreev (profs);
+  }
+
+  return TRUE;
+}
+
+static const char *
+_enc_get_static_raw_formats (guint codec_id)
+{
+  switch (codec_id) {
+    case MFX_CODEC_AVC:
+      return "NV12, YUY2, UYVY, BGRA";
+    case MFX_CODEC_HEVC:
+      return "NV12, YUY2, BGRA, BGR10A2_LE, P010_10LE, VUYA, Y410, Y210, "
+          "P012_LE";
+    case MFX_CODEC_MPEG2:
+      return "NV12";
+    case MFX_CODEC_VP9:
+      return "NV12, P010_10LE, VUYA, Y410";
+    case MFX_CODEC_AV1:
+      return "NV12, P010_10LE";
+    case MFX_CODEC_JPEG:
+      return "NV12, YUY2, UYVY, BGRA";
+    default:
+      GST_WARNING ("Unsupported codec %" GST_FOURCC_FORMAT,
+          GST_FOURCC_ARGS (codec_id));
+      break;
+  }
+
+  return NULL;
+}
+
+#ifndef _WIN32
+static const char *
+_enc_get_static_dma_formats (guint codec_id)
+{
+  switch (codec_id) {
+    case MFX_CODEC_AVC:
+      return "NV12, BGRx";
+    case MFX_CODEC_HEVC:
+      return "NV12, P010_10LE";
+    case MFX_CODEC_MPEG2:
+      return "NV12";
+    case MFX_CODEC_VP9:
+      return "NV12, P010_10LE";
+    case MFX_CODEC_AV1:
+      return "NV12, P010_10LE";
+    case MFX_CODEC_JPEG:
+      return "NV12, BGRx";
+    default:
+      GST_WARNING ("Unsupported codec %" GST_FOURCC_FORMAT,
+          GST_FOURCC_ARGS (codec_id));
+      break;
+  }
+
+  return NULL;
+}
+#endif
+
+gboolean
+gst_msdkcaps_enc_create_static_caps (GstMsdkContext * context,
+    guint codec_id, GstCaps ** sink_caps, GstCaps ** src_caps)
+{
+  GstCaps *in_caps = NULL, *out_caps = NULL;
+  GstCaps *dma_caps = NULL;
+  gchar *raw_caps_str;
+  const gchar *media_type = NULL;
+  const char *raw_fmts = NULL;
+  const char *dma_fmts_str = NULL;
+  GValue dma_fmts = G_VALUE_INIT;
+  GValue supported_profs = G_VALUE_INIT;
+
+  raw_fmts = _enc_get_static_raw_formats (codec_id);
+  if (!raw_fmts)
+    goto failed;
+  raw_caps_str = g_strdup_printf ("video/x-raw, format=(string){ %s }",
+      raw_fmts);
+  in_caps = gst_caps_from_string (raw_caps_str);
+  g_free (raw_caps_str);
+
+#ifndef _WIN32
+  dma_fmts_str = _enc_get_static_dma_formats (codec_id);
+  if (!dma_fmts_str)
+    goto failed;
+
+  g_value_init (&dma_fmts, GST_TYPE_LIST);
+  _strings_to_list (dma_fmts_str, &dma_fmts);
+
+  dma_caps = _create_dma_drm_caps (context, GST_MSDK_JOB_ENCODER, &dma_fmts);
+  g_value_unset (&dma_fmts);
+  gst_caps_append (in_caps, dma_caps);
+
+  gst_caps_append (in_caps,
+      gst_caps_from_string
+      ("video/x-raw(memory:VAMemory), format=(string){ NV12 }"));
+#else
+  VAR_UNUSED (dma_caps);
+  VAR_UNUSED (dma_fmts_str);
+  VAR_UNUSED (dma_fmts);
+  gst_caps_append (in_caps,
+      gst_caps_from_string
+      ("video/x-raw(memory:D3D11Memory), format=(string){ NV12 }"));
+#endif
+
+  gst_caps_set_simple (in_caps,
+      "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+      "height", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+      "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1,
+      "interlace-mode", G_TYPE_STRING, "progressive", NULL);
+
+  media_type = _get_media_type (codec_id);
+  if (!media_type)
+    goto failed;
+
+  out_caps = gst_caps_new_empty_simple (media_type);
+
+  g_value_init (&supported_profs, GST_TYPE_LIST);
+  if (!_get_profiles (codec_id, &supported_profs))
+    goto failed;
+
+  gst_caps_set_value (out_caps, "profile", &supported_profs);
+  g_value_unset (&supported_profs);
+
+  gst_caps_set_simple (out_caps,
+      "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+      "height", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+      "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
+
+  *sink_caps = in_caps;
+  *src_caps = out_caps;
+
+  return TRUE;
+
+failed:
+  GST_WARNING ("Failed to create caps for %" GST_FOURCC_FORMAT " ENC",
+      GST_FOURCC_ARGS (codec_id));
+
+  g_value_unset (&supported_profs);
+  if (in_caps)
+    gst_caps_unref (in_caps);
+  if (out_caps)
+    gst_caps_unref (out_caps);
+  if (dma_caps)
+    gst_caps_unref (dma_caps);
+
+  return FALSE;
+}
+
+static const char *
+_dec_get_static_raw_formats (guint codec_id)
+{
+  switch (codec_id) {
+    case MFX_CODEC_AVC:
+      return "NV12, BGRA, BGRx";
+    case MFX_CODEC_HEVC:
+      return "NV12, P010_10LE, YUY2, Y210,  VUYA, Y410, P012_LE, "
+          "Y212_LE, Y412_LE, BGRA, BGRx";
+    case MFX_CODEC_MPEG2:
+      return "NV12";
+    case MFX_CODEC_VP9:
+      return "NV12, P010_10LE, VUYA, Y410, P012_LE, Y412_LE";
+    case MFX_CODEC_AV1:
+      return "NV12, P010_10LE, VUYA, Y410";
+    case MFX_CODEC_JPEG:
+      return "NV12, YUY2";
+    case MFX_CODEC_VP8:
+      return "NV12";
+    case MFX_CODEC_VC1:
+      return "NV12";
+    default:
+      GST_WARNING ("Unsupported codec %" GST_FOURCC_FORMAT,
+          GST_FOURCC_ARGS (codec_id));
+      break;
+  }
+
+  return NULL;
+}
+
+#ifndef _WIN32
+static const char *
+_dec_get_static_dma_formats (guint codec_id)
+{
+  switch (codec_id) {
+    case MFX_CODEC_AVC:
+      return "NV12, BGRA, BGRx";
+    case MFX_CODEC_HEVC:
+      return "NV12, P010_10LE, YUY2, Y210,  VUYA, Y410, P012_LE, "
+          "Y212_LE, Y412_LE, BGRA, BGRx";
+    case MFX_CODEC_MPEG2:
+      return "NV12";
+    case MFX_CODEC_VP9:
+      return "NV12, P010_10LE, VUYA, Y410, P012_LE, Y412_LE";
+    case MFX_CODEC_AV1:
+      return "NV12, P010_10LE, VUYA, Y410";
+    case MFX_CODEC_JPEG:
+      return "NV12, YUY2";
+    case MFX_CODEC_VP8:
+      return "NV12";
+    case MFX_CODEC_VC1:
+      return "NV12";
+    default:
+      GST_WARNING ("Unsupported codec %" GST_FOURCC_FORMAT,
+          GST_FOURCC_ARGS (codec_id));
+      break;
+  }
+
+  return NULL;
+}
+#endif
+
+gboolean
+gst_msdkcaps_dec_create_static_caps (GstMsdkContext * context,
+    guint codec_id, GstCaps ** sink_caps, GstCaps ** src_caps)
+{
+  GstCaps *in_caps = NULL, *out_caps = NULL;
+  GstCaps *dma_caps = NULL;
+  gchar *raw_caps_str;
+  const gchar *media_type = NULL;
+  const char *raw_fmts = NULL;
+  const char *dma_fmts_str = NULL;
+  GValue dma_fmts = G_VALUE_INIT;
+
+  media_type = _get_media_type (codec_id);
+  if (!media_type)
+    goto failed;
+
+  in_caps = gst_caps_new_empty_simple (media_type);
+
+  raw_fmts = _dec_get_static_raw_formats (codec_id);
+  if (!raw_fmts)
+    goto failed;
+  raw_caps_str = g_strdup_printf ("video/x-raw, format=(string){ %s }",
+      raw_fmts);
+  out_caps = gst_caps_from_string (raw_caps_str);
+  g_free (raw_caps_str);
+
+#ifndef _WIN32
+  dma_fmts_str = _dec_get_static_dma_formats (codec_id);
+  if (!dma_fmts_str)
+    goto failed;
+
+  g_value_init (&dma_fmts, GST_TYPE_LIST);
+  _strings_to_list (dma_fmts_str, &dma_fmts);
+
+  dma_caps = _create_dma_drm_caps (context, GST_MSDK_JOB_DECODER, &dma_fmts);
+  g_value_unset (&dma_fmts);
+  gst_caps_append (out_caps, dma_caps);
+
+  gst_caps_append (out_caps,
+      gst_caps_from_string
+      ("video/x-raw(memory:VAMemory), format=(string){ NV12 }"));
+#else
+  VAR_UNUSED (dma_caps);
+  VAR_UNUSED (dma_fmts_str);
+  VAR_UNUSED (dma_fmts);
+  gst_caps_append (out_caps,
+      gst_caps_from_string
+      ("video/x-raw(memory:D3D11Memory), format=(string){ NV12 }"));
+#endif
+
+  gst_caps_set_simple (out_caps,
+      "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+      "height", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+      "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1,
+      "interlace-mode", G_TYPE_STRING, "progressive", NULL);
+
+  *sink_caps = in_caps;
+  *src_caps = out_caps;
+
+  return TRUE;
+
+failed:
+  GST_WARNING ("Failed to create caps for %" GST_FOURCC_FORMAT " DEC",
+      GST_FOURCC_ARGS (codec_id));
+
+  if (in_caps)
+    gst_caps_unref (in_caps);
+  if (out_caps)
+    gst_caps_unref (out_caps);
+
+  return FALSE;
+}
+
+static const char *
+_vpp_get_static_raw_formats (GstPadDirection direction)
+{
+  switch (direction) {
+    case GST_PAD_SINK:
+      return "NV12, YV12, I420, YUY2, UYVY, VUYA, BGRA, BGRx, P010_10LE, "
+          "RGB16, Y410, Y210, P012_LE, Y212_LE, Y412_LE";
+    case GST_PAD_SRC:
+      return "NV12, BGRA, YUY2, UYVY, VUYA, BGRx, P010_10LE, BGR10A2_LE, "
+          "YV12, Y410, Y210, RGBP, BGRP, P012_LE, Y212_LE, Y412_LE";
+    default:
+      GST_WARNING ("Unsupported VPP direction");
+      break;
+  }
+
+  return NULL;
+}
+
+#ifndef _WIN32
+static const char *
+_vpp_get_static_dma_formats (GstPadDirection direction)
+{
+  switch (direction) {
+    case GST_PAD_SINK:
+      return "NV12, BGRA, YUY2, UYVY, VUYA, P010_10LE, RGB16, Y410, Y210, "
+          "P012_LE, Y212_LE, Y412_LE";
+    case GST_PAD_SRC:
+      return "NV12, BGRA, YUY2, UYVY, VUYA, BGRx, P010_10LE, BGR10A2_LE, "
+          "YV12, Y410, Y210, RGBP, BGRP, P012_LE, Y212_LE, Y412_LE";
+    default:
+      GST_WARNING ("Unsupported VPP direction");
+      break;
+  }
+
+  return NULL;
+}
+#endif
+
+static GstCaps *
+_vpp_create_static_caps (GstMsdkContext * context, GstPadDirection direction)
+{
+  GstCaps *caps = NULL, *dma_caps = NULL;
+  gchar *caps_str;
+  GValue dma_fmts = G_VALUE_INIT;
+
+  caps_str = g_strdup_printf ("video/x-raw, format=(string){ %s }",
+      _vpp_get_static_raw_formats (direction));
+  caps = gst_caps_from_string (caps_str);
+  g_free (caps_str);
+
+#ifndef _WIN32
+  g_value_init (&dma_fmts, GST_TYPE_LIST);
+  _strings_to_list (_vpp_get_static_dma_formats (direction), &dma_fmts);
+
+  dma_caps = _create_dma_drm_caps (context, GST_MSDK_JOB_VPP, &dma_fmts);
+  g_value_unset (&dma_fmts);
+  gst_caps_append (caps, dma_caps);
+
+  gst_caps_append (caps, gst_caps_from_string ("video/x-raw(memory:VAMemory), "
+          "format=(string){ NV12, VUYA, P010_10LE }"));
+#else
+  VAR_UNUSED (dma_caps);
+  VAR_UNUSED (dma_fmts);
+
+  gst_caps_append (caps,
+      gst_caps_from_string ("video/x-raw(memory:D3D11Memory), "
+          "format=(string){ NV12, VUYA, P010_10LE }"));
+#endif
+
+  gst_caps_set_simple (caps,
+      "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+      "height", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+      "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
+
+  gst_msdkcaps_set_strings (caps, "memory:SystemMemory",
+      "interlace-mode", "progressive, interleaved, mixed");
+
+  return caps;
+}
+
+gboolean
+gst_msdkcaps_vpp_create_static_caps (GstMsdkContext * context,
+    GstCaps ** sink_caps, GstCaps ** src_caps)
+{
+  *sink_caps = _vpp_create_static_caps (context, GST_PAD_SINK);
+  *src_caps = _vpp_create_static_caps (context, GST_PAD_SRC);
+
+  return TRUE;
+}
+
+static void
+_pad_template_init (GstElementClass * klass,
+    const gchar * name_template, GstPadDirection direction,
+    GstCaps * caps, const gchar * doc_caps_str)
+{
+  GstPadTemplate *pad_templ;
+
+  if (!caps)
+    return;
+
+  pad_templ = gst_pad_template_new (name_template,
+      direction, GST_PAD_ALWAYS, caps);
+  if (doc_caps_str) {
+    GstCaps *doc_caps = gst_caps_from_string (doc_caps_str);
+    gst_pad_template_set_documentation_caps (pad_templ, doc_caps);
+    gst_caps_unref (doc_caps);
+  }
+
+  gst_element_class_add_pad_template (klass, pad_templ);
+}
+
+void
+gst_msdkcaps_pad_template_init (GstElementClass * klass,
+    GstCaps * sink_caps, GstCaps * src_caps,
+    const gchar * doc_sink_caps_str, const gchar * doc_src_caps_str)
+{
+  _pad_template_init (klass,
+      "sink", GST_PAD_SINK, sink_caps, doc_sink_caps_str);
+
+  _pad_template_init (klass, "src", GST_PAD_SRC, src_caps, doc_src_caps_str);
+}
+
+gboolean
+gst_msdkcaps_set_strings (GstCaps * caps,
+    const gchar * features, const char *field, const gchar * strings)
+{
+  GValue list = G_VALUE_INIT;
+  guint size = gst_caps_get_size (caps);
+
+  g_return_val_if_fail (GST_IS_CAPS (caps), FALSE);
+  g_return_val_if_fail (field != NULL, FALSE);
+  g_return_val_if_fail (strings != NULL, FALSE);
+
+  g_value_init (&list, GST_TYPE_LIST);
+  _strings_to_list (strings, &list);
+
+  if (features) {
+    GstStructure *s = NULL;
+    GstCapsFeatures *f = gst_caps_features_from_string (features);
+
+    for (guint i = 0; i < size; i++) {
+      if (gst_caps_features_is_equal (f, gst_caps_get_features (caps, i))) {
+        s = gst_caps_get_structure (caps, i);
+        break;
+      }
+    }
+
+    gst_caps_features_free (f);
+
+    if (!s)
+      return FALSE;
+
+    /* When we use this function to get a fixated caps, we should set
+     * a single value instead of a list in the corresponding field.
+     */
+    if (gst_value_list_get_size (&list) == 1)
+      gst_structure_set_value (s, field, gst_value_list_get_value (&list, 0));
+    else
+      gst_structure_set_value (s, field, &list);
+  } else {
+    gst_caps_set_value (caps, field, &list);
+  }
+
+  g_value_unset (&list);
+
+  return TRUE;
+}
+
+gboolean
+gst_msdkcaps_video_info_from_caps (const GstCaps * caps,
+    GstVideoInfo * info, guint64 * modifier)
+{
+  g_return_val_if_fail (caps != NULL, FALSE);
+  g_return_val_if_fail (info != NULL, FALSE);
+
+#ifndef _WIN32
+  if (gst_video_is_dma_drm_caps (caps)) {
+    GstVideoInfoDmaDrm *drm_info = gst_video_info_dma_drm_new_from_caps (caps);
+    if (!drm_info)
+      goto failed;
+
+    if (!gst_video_info_dma_drm_to_video_info (drm_info, info)) {
+      gst_video_info_dma_drm_free (drm_info);
+      goto failed;
+    }
+    if (modifier)
+      *modifier = drm_info->drm_modifier;
+
+    gst_video_info_dma_drm_free (drm_info);
+  } else
+#endif
+
+  if (!gst_video_info_from_caps (info, caps))
+    goto failed;
+
+  return TRUE;
+
+failed:
+  GST_ERROR_OBJECT (caps, "Failed to get video info fom caps");
+  return FALSE;
+}
+
+#ifndef _WIN32
+GstCaps *
+gst_msdkcaps_video_info_to_drm_caps (GstVideoInfo * info, guint64 modifier)
+{
+  GstVideoInfoDmaDrm drm_info;
+
+  gst_video_info_dma_drm_init (&drm_info);
+  drm_info.vinfo = *info;
+  drm_info.drm_fourcc =
+      gst_va_drm_fourcc_from_video_format (GST_VIDEO_INFO_FORMAT (info));
+  drm_info.drm_modifier = modifier;
+
+  return gst_video_info_dma_drm_to_caps (&drm_info);
+}
+
+guint64
+get_msdkcaps_get_modifier (const GstCaps * caps)
+{
+  guint64 modifier = DRM_FORMAT_MOD_INVALID;
+  guint size = gst_caps_get_size (caps);
+
+  for (guint i = 0; i < size; i++) {
+    GstCapsFeatures *f = gst_caps_get_features (caps, i);
+
+    if (gst_caps_features_contains (f, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+      GstStructure *s = gst_caps_get_structure (caps, i);
+      const GValue *drm_fmts = gst_structure_get_value (s, "drm-format");
+      const gchar *drm_str = NULL;
+
+      if (!drm_fmts)
+        continue;
+
+      if (G_VALUE_HOLDS_STRING (drm_fmts))
+        drm_str = g_value_get_string (drm_fmts);
+      else if (GST_VALUE_HOLDS_LIST (drm_fmts)) {
+        const GValue *val = gst_value_list_get_value (drm_fmts, 0);
+        drm_str = g_value_get_string (val);
+      }
+
+      gst_video_dma_drm_fourcc_from_string (drm_str, &modifier);
+    }
+  }
+
+  GST_DEBUG ("got modifier: 0x%016lx", modifier);
+
+  return modifier;
+}
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkcaps.h Added

@@ -0,0 +1,95 @@
+/* GStreamer Intel MSDK plugin
+ * Copyright (c) 2023, Intel Corporation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __GST_MSDKCAPS_H__
+#define __GST_MSDKCAPS_H__
+
+#include "msdk.h"
+#include "gstmsdkcontext.h"
+
+#include <mfxjpeg.h>
+#include <mfxvp8.h>
+
+G_BEGIN_DECLS
+
+gboolean
+gst_msdkcaps_has_feature (const GstCaps * caps, const gchar * feature);
+
+gboolean
+gst_msdkcaps_enc_create_caps (GstMsdkContext * context,
+    gpointer enc_description, guint codec_id,
+    GstCaps ** sink_caps, GstCaps ** src_caps);
+
+gboolean
+gst_msdkcaps_dec_create_caps (GstMsdkContext * context,
+    gpointer dec_description, guint codec_id,
+    GstCaps ** sink_caps, GstCaps ** src_caps);
+
+gboolean
+gst_msdkcaps_vpp_create_caps (GstMsdkContext * context,
+    gpointer vpp_description, GstCaps ** sink_caps, GstCaps ** src_caps);
+
+gboolean
+gst_msdkcaps_enc_create_static_caps (GstMsdkContext * context,
+    guint codec_id, GstCaps ** sink_caps, GstCaps ** src_caps);
+
+gboolean
+gst_msdkcaps_dec_create_static_caps (GstMsdkContext * context,
+    guint codec_id, GstCaps ** sink_caps, GstCaps ** src_caps);
+
+gboolean
+gst_msdkcaps_vpp_create_static_caps (GstMsdkContext * context,
+    GstCaps ** sink_caps, GstCaps ** src_caps);
+
+void
+gst_msdkcaps_pad_template_init (GstElementClass * klass,
+    GstCaps * sink_caps, GstCaps * src_caps,
+    const gchar * doc_sink_caps_str, const gchar * doc_src_caps_str);
+
+gboolean
+gst_msdkcaps_set_strings (GstCaps * caps,
+    const gchar * features, const char * field, const gchar * strings);
+
+gboolean
+gst_msdkcaps_video_info_from_caps (const GstCaps * caps,
+    GstVideoInfo * info, guint64 * modifier);
+
+#ifndef _WIN32
+GstCaps *
+gst_msdkcaps_video_info_to_drm_caps (GstVideoInfo * info, guint64 modifier);
+
+guint64
+get_msdkcaps_get_modifier (const GstCaps * caps);
+#endif
+
+G_END_DECLS
+
+#endif /* __GST_MSDKCAPS_H__ */

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkcontext.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkcontext.c Changed

@@ -48,6 +48,7 @@
 struct _GstMsdkContextPrivate
 {
   MsdkSession session;
+  GstBufferPool *alloc_pool;
   GList *cached_alloc_responses;
   gboolean hardware;
   gboolean has_frame_allocator;
@@ -167,9 +168,7 @@
 gst_msdk_context_use_vaapi (GstMsdkContext * context)
 {
   char *path;
-  VADisplay va_dpy = NULL;
   GstVaDisplay *display_drm = NULL;
-  mfxStatus status;
   GstMsdkContextPrivate *priv = context->priv;
 
   path = get_device_path ();
@@ -179,31 +178,16 @@
   }
 
   display_drm = gst_va_display_drm_new_from_path (path);
-  if (!display_drm) {
-    GST_ERROR ("Couldn't create a VA DRM display");
-    goto failed;
-  }
   g_free (path);
 
-  va_dpy = gst_va_display_get_va_dpy (display_drm);
-
-  status = MFXVideoCORE_SetHandle (priv->session.session, MFX_HANDLE_VA_DISPLAY,
-      (mfxHDL) va_dpy);
-  if (status != MFX_ERR_NONE) {
-    GST_ERROR ("Setting VAAPI handle failed (%s)",
-        msdk_status_to_string (status));
-    goto failed;
+  if (!display_drm) {
+    GST_ERROR ("Couldn't create a VA DRM display");
+    return FALSE;
   }
 
   priv->display = display_drm;
 
   return TRUE;
-
-failed:
-  if (display_drm)
-    gst_object_unref (display_drm);
-
-  return FALSE;
 }
 #else
 static GstD3D11Device *
@@ -303,15 +287,17 @@
 #endif
 
 static gboolean
-gst_msdk_context_open (GstMsdkContext * context, gboolean hardware,
-    GstMsdkContextJobType job_type)
+gst_msdk_context_open (GstMsdkContext * context, gboolean hardware)
 {
   mfxU16 codename;
   GstMsdkContextPrivate *priv = context->priv;
   MsdkSession msdk_session;
   mfxIMPL impl;
+  mfxHDL handle = NULL;
+#ifndef _WIN32
+  mfxStatus status;
+#endif
 
-  priv->job_type = job_type;
   priv->hardware = hardware;
 
   impl = hardware ? MFX_IMPL_HARDWARE_ANY : MFX_IMPL_SOFTWARE;
@@ -320,22 +306,35 @@
   impl |= MFX_IMPL_VIA_D3D11;
 #endif
 
-  msdk_session = msdk_open_session (impl);
-  priv->session = msdk_session;
-  if (!priv->session.session)
-    goto failed;
-
 #ifndef _WIN32
   if (hardware) {
     if (!gst_msdk_context_use_vaapi (context))
-      goto failed;
+      return FALSE;
+
+    handle = (mfxHDL) gst_va_display_get_va_dpy (priv->display);
   }
-#else
+#endif
+
+  msdk_session = msdk_open_session (handle, impl);
+  if (!msdk_session.session)
+    return FALSE;
+
+  priv->session = msdk_session;
+
   if (hardware) {
+#ifndef _WIN32
+    status = MFXVideoCORE_SetHandle (priv->session.session,
+        MFX_HANDLE_VA_DISPLAY, handle);
+    if (status != MFX_ERR_NONE) {
+      GST_ERROR ("Setting VAAPI handle failed (%s)",
+          msdk_status_to_string (status));
+      return FALSE;
+    }
+#else
     if (!gst_msdk_context_use_d3d11 (context))
-      goto failed;
-  }
+      return FALSE;
 #endif
+  }
 
   codename = msdk_get_platform_codename (priv->session.session);
 
@@ -345,9 +344,6 @@
     GST_WARNING ("Unknown MFX platform");
 
   return TRUE;
-
-failed:
-  return FALSE;
 }
 
 static void
@@ -409,13 +405,13 @@
 }
 
 GstMsdkContext *
-gst_msdk_context_new (gboolean hardware, GstMsdkContextJobType job_type)
+gst_msdk_context_new (gboolean hardware)
 {
   GstMsdkContext *obj = g_object_new (GST_TYPE_MSDK_CONTEXT, NULL);
+  gst_object_ref_sink (obj);
 
-  if (obj && !gst_msdk_context_open (obj, hardware, job_type)) {
-    if (obj)
-      gst_object_unref (obj);
+  if (obj && !gst_msdk_context_open (obj, hardware)) {
+    gst_object_unref (obj);
     return NULL;
   }
 
@@ -423,18 +419,33 @@
 }
 
 GstMsdkContext *
+gst_msdk_context_new_with_job_type (gboolean hardware,
+    GstMsdkContextJobType job_type)
+{
+  GstMsdkContext *obj = gst_msdk_context_new (hardware);
+
+  if (obj)
+    obj->priv->job_type = job_type;
+
+  return obj;
+}
+
+GstMsdkContext *
 gst_msdk_context_new_with_parent (GstMsdkContext * parent)
 {
   mfxStatus status;
-  GstMsdkContext *obj = g_object_new (GST_TYPE_MSDK_CONTEXT, NULL);
-  GstMsdkContextPrivate *priv = obj->priv;
-  GstMsdkContextPrivate *parent_priv = parent->priv;
+  GstMsdkContext *obj;
+  GstMsdkContextPrivate *priv;
+  GstMsdkContextPrivate *parent_priv;
   mfxVersion version;
   mfxIMPL impl;
   MsdkSession child_msdk_session;
   mfxHandleType handle_type = 0;
-  mfxHDL handle = NULL;
+  mfxHDL handle = NULL, hardware_handle = NULL;
 
+  g_return_val_if_fail (GST_IS_MSDK_CONTEXT (parent), NULL);
+
+  parent_priv = parent->priv;
   status = MFXQueryIMPL (parent_priv->session.session, &impl);
 
   if (status == MFX_ERR_NONE)
@@ -443,7 +454,6 @@
   if (status != MFX_ERR_NONE) {
     GST_ERROR ("Failed to query the session attributes (%s)",
         msdk_status_to_string (status));
-    gst_object_unref (obj);
     return NULL;
   }
 
@@ -460,19 +470,22 @@
     if (status != MFX_ERR_NONE || !handle) {
       GST_ERROR ("Failed to get session handle (%s)",
           msdk_status_to_string (status));
-      gst_object_unref (obj);
       return NULL;
     }
   }
 
   child_msdk_session.loader = parent_priv->session.loader;
   child_msdk_session.session = NULL;
-  status = msdk_init_msdk_session (impl, &version, &child_msdk_session);
+#ifndef _WIN32
+  hardware_handle = (mfxHDL) gst_va_display_get_va_dpy (parent_priv->display);
+#endif
+
+  status = msdk_init_msdk_session (hardware_handle, impl, &version,
+      &child_msdk_session);
 
   if (status != MFX_ERR_NONE) {
     GST_ERROR ("Failed to create a child mfx session (%s)",
         msdk_status_to_string (status));
-    gst_object_unref (obj);
     return NULL;
   }
 
@@ -485,7 +498,6 @@
       GST_ERROR ("Failed to set a HW handle (%s)",
           msdk_status_to_string (status));
       MFXClose (child_msdk_session.session);
-      gst_object_unref (obj);
       return NULL;
     }
   }
@@ -497,11 +509,14 @@
     GST_ERROR ("Failed to join two sessions (%s)",
         msdk_status_to_string (status));
     MFXClose (child_msdk_session.session);
-    gst_object_unref (obj);
     return NULL;
   }
 #endif
 
+  obj = g_object_new (GST_TYPE_MSDK_CONTEXT, NULL);
+  gst_object_ref_sink (obj);
+  priv = obj->priv;
+
   /* Set loader to NULL for child session */
   priv->session.loader = NULL;
   priv->session.session = child_msdk_session.session;
@@ -530,20 +545,24 @@
   mfxU16 codename;
   mfxStatus status;
   GstVaDisplay *va_display;
+  mfxHDL handle;
 
   va_display = GST_VA_DISPLAY (display_obj);
   if (!va_display)
     return NULL;
 
   obj = g_object_new (GST_TYPE_MSDK_CONTEXT, NULL);
+  gst_object_ref_sink (obj);
 
   priv = obj->priv;
   priv->display = gst_object_ref (va_display);
 
   priv->job_type = job_type;
   priv->hardware = hardware;
-  priv->session =
-      msdk_open_session (hardware ? MFX_IMPL_HARDWARE_ANY : MFX_IMPL_SOFTWARE);
+
+  handle = (mfxHDL) gst_va_display_get_va_dpy (priv->display);
+  priv->session = msdk_open_session (handle,
+      hardware ? MFX_IMPL_HARDWARE_ANY : MFX_IMPL_SOFTWARE);
   if (!priv->session.session) {
     gst_object_unref (obj);
     return NULL;
@@ -552,7 +571,7 @@
   if (hardware) {
     status =
         MFXVideoCORE_SetHandle (priv->session.session, MFX_HANDLE_VA_DISPLAY,
-        (mfxHDL) gst_va_display_get_va_dpy (priv->display));
+        handle);
     if (status != MFX_ERR_NONE) {
       GST_ERROR ("Setting VAAPI handle failed (%s)",
           msdk_status_to_string (status));
@@ -584,14 +603,15 @@
   HRESULT hr;
 
   obj = g_object_new (GST_TYPE_MSDK_CONTEXT, NULL);
+  gst_object_ref_sink (obj);
 
   priv = obj->priv;
   priv->device = gst_object_ref (device);
 
   priv->job_type = job_type;
   priv->hardware = hardware;
-  priv->session =
-      msdk_open_session (hardware ? MFX_IMPL_HARDWARE_ANY : MFX_IMPL_SOFTWARE);
+  priv->session = msdk_open_session (NULL,
+      hardware ? MFX_IMPL_HARDWARE_ANY : MFX_IMPL_SOFTWARE);
   if (!priv->session.session) {
     goto failed;
   }
@@ -640,6 +660,18 @@
   return context->priv->session.session;
 }
 
+const mfxLoader *
+gst_msdk_context_get_loader (GstMsdkContext * context)
+{
+  return &context->priv->session.loader;
+}
+
+mfxU32
+gst_msdk_context_get_impl_idx (GstMsdkContext * context)
+{
+  return context->priv->session.impl_idx;
+}
+
 gpointer
 gst_msdk_context_get_handle (GstMsdkContext * context)
 {
@@ -735,47 +767,12 @@
     return NULL;
 }
 
-static void
-create_surfaces (GstMsdkContext * context, GstMsdkAllocResponse * resp)
-{
-  gint i;
-  mfxMemId *mem_id;
-  mfxFrameSurface1 *surface;
-
-  for (i = 0; i < resp->response.NumFrameActual; i++) {
-    mem_id = resp->response.midsi;
-    surface = (mfxFrameSurface1 *) g_slice_new0 (mfxFrameSurface1);
-    if (!surface) {
-      GST_ERROR ("failed to allocate surface");
-      break;
-    }
-    surface->Data.MemId = mem_id;
-    resp->surfaces_avail = g_list_prepend (resp->surfaces_avail, surface);
-  }
-}
-
-static void
-free_surface (gpointer surface)
-{
-  g_slice_free1 (sizeof (mfxFrameSurface1), surface);
-}
-
-static void
-remove_surfaces (GstMsdkContext * context, GstMsdkAllocResponse * resp)
-{
-  g_list_free_full (resp->surfaces_used, free_surface);
-  g_list_free_full (resp->surfaces_avail, free_surface);
-  g_list_free_full (resp->surfaces_locked, free_surface);
-}
-
 void
 gst_msdk_context_add_alloc_response (GstMsdkContext * context,
     GstMsdkAllocResponse * resp)
 {
   context->priv->cached_alloc_responses =
       g_list_prepend (context->priv->cached_alloc_responses, resp);
-
-  create_surfaces (context, resp);
 }
 
 gboolean
@@ -792,8 +789,6 @@
 
   msdk_resp = l->data;
 
-  remove_surfaces (context, msdk_resp);
-
   g_slice_free1 (sizeof (GstMsdkAllocResponse), msdk_resp);
   priv->cached_alloc_responses =
       g_list_delete_link (priv->cached_alloc_responses, l);
@@ -801,120 +796,16 @@
   return TRUE;
 }
 
-static gboolean
-check_surfaces_available (GstMsdkContext * context, GstMsdkAllocResponse * resp)
-{
-  GList *l;
-  mfxFrameSurface1 *surface = NULL;
-  GstMsdkContextPrivate *priv = context->priv;
-  gboolean ret = FALSE;
-
-  g_mutex_lock (&priv->mutex);
-  for (l = resp->surfaces_locked; l;) {
-    surface = l->data;
-    l = l->next;
-    if (!surface->Data.Locked) {
-      resp->surfaces_locked = g_list_remove (resp->surfaces_locked, surface);
-      resp->surfaces_avail = g_list_prepend (resp->surfaces_avail, surface);
-      ret = TRUE;
-    }
-  }
-  g_mutex_unlock (&priv->mutex);
-
-  return ret;
-}
-
-/*
- * There are 3 lists here in GstMsdkContext as the following:
- * 1. surfaces_avail : surfaces which are free and unused anywhere
- * 2. surfaces_used : surfaces coupled with a gst buffer and being used now.
- * 3. surfaces_locked : surfaces still locked even after the gst buffer is released.
- *
- * Note that they need to be protected by mutex to be thread-safe.
- */
-
-mfxFrameSurface1 *
-gst_msdk_context_get_surface_available (GstMsdkContext * context,
-    mfxFrameAllocResponse * resp)
-{
-  GList *l;
-  mfxFrameSurface1 *surface = NULL;
-  GstMsdkAllocResponse *msdk_resp =
-      gst_msdk_context_get_cached_alloc_responses (context, resp);
-  gint retry = 0;
-  GstMsdkContextPrivate *priv = context->priv;
-
-retry:
-  g_mutex_lock (&priv->mutex);
-  for (l = msdk_resp->surfaces_avail; l;) {
-    surface = l->data;
-    l = l->next;
-    if (!surface->Data.Locked) {
-      msdk_resp->surfaces_avail =
-          g_list_remove (msdk_resp->surfaces_avail, surface);
-      msdk_resp->surfaces_used =
-          g_list_prepend (msdk_resp->surfaces_used, surface);
-      break;
-    }
-  }
-  g_mutex_unlock (&priv->mutex);
-
-  /*
-   * If a msdk context is shared by multiple msdk elements,
-   * upstream msdk element sometimes needs to wait for a gst buffer
-   * to be released in downstream.
-   *
-   * Poll the pool for a maximum of 20 millisecond.
-   *
-   * FIXME: Is there any better way to handle this case?
-   */
-  if (!surface && retry < 20) {
-    /* If there's no surface available, find unlocked surfaces in the locked list,
-     * take it back to the available list and then search again.
-     */
-    check_surfaces_available (context, msdk_resp);
-    retry++;
-    g_usleep (1000);
-    goto retry;
-  }
-
-  return surface;
-}
-
 void
-gst_msdk_context_put_surface_locked (GstMsdkContext * context,
-    mfxFrameAllocResponse * resp, mfxFrameSurface1 * surface)
+gst_msdk_context_set_alloc_pool (GstMsdkContext * context, GstBufferPool * pool)
 {
-  GstMsdkContextPrivate *priv = context->priv;
-  GstMsdkAllocResponse *msdk_resp =
-      gst_msdk_context_get_cached_alloc_responses (context, resp);
-
-  g_mutex_lock (&priv->mutex);
-  if (!g_list_find (msdk_resp->surfaces_locked, surface)) {
-    msdk_resp->surfaces_used =
-        g_list_remove (msdk_resp->surfaces_used, surface);
-    msdk_resp->surfaces_locked =
-        g_list_prepend (msdk_resp->surfaces_locked, surface);
-  }
-  g_mutex_unlock (&priv->mutex);
+  context->priv->alloc_pool = gst_object_ref (pool);
 }
 
-void
-gst_msdk_context_put_surface_available (GstMsdkContext * context,
-    mfxFrameAllocResponse * resp, mfxFrameSurface1 * surface)
+GstBufferPool *
+gst_msdk_context_get_alloc_pool (GstMsdkContext * context)
 {
-  GstMsdkContextPrivate *priv = context->priv;
-  GstMsdkAllocResponse *msdk_resp =
-      gst_msdk_context_get_cached_alloc_responses (context, resp);
-
-  g_mutex_lock (&priv->mutex);
-  if (!g_list_find (msdk_resp->surfaces_avail, surface)) {
-    msdk_resp->surfaces_used =
-        g_list_remove (msdk_resp->surfaces_used, surface);
-    msdk_resp->surfaces_avail =
-        g_list_prepend (msdk_resp->surfaces_avail, surface);
-  }
-  g_mutex_unlock (&priv->mutex);
+  return context->priv->alloc_pool;
 }
 
 GstMsdkContextJobType
@@ -924,6 +815,13 @@
 }
 
 void
+gst_msdk_context_set_job_type (GstMsdkContext * context,
+    GstMsdkContextJobType job_type)
+{
+  context->priv->job_type = job_type;
+}
+
+void
 gst_msdk_context_add_job_type (GstMsdkContext * context,
     GstMsdkContextJobType job_type)
 {

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkcontext.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkcontext.h Changed

@@ -87,7 +87,9 @@
 
 GType gst_msdk_context_get_type (void);
 
-GstMsdkContext * gst_msdk_context_new (gboolean hardware, GstMsdkContextJobType job_type);
+GstMsdkContext * gst_msdk_context_new (gboolean hardware);
+GstMsdkContext * gst_msdk_context_new_with_job_type (gboolean hardware,
+    GstMsdkContextJobType job_type);
 GstMsdkContext * gst_msdk_context_new_with_parent (GstMsdkContext * parent);
 #ifndef _WIN32
 GstMsdkContext * gst_msdk_context_new_with_va_display (GstObject * display_obj,
@@ -97,6 +99,8 @@
     gboolean hardware, GstMsdkContextJobType job_type);
 #endif
 mfxSession gst_msdk_context_get_session (GstMsdkContext * context);
+const mfxLoader * gst_msdk_context_get_loader (GstMsdkContext * context);
+mfxU32 gst_msdk_context_get_impl_idx (GstMsdkContext * context);
 
 gpointer gst_msdk_context_get_handle (GstMsdkContext * context);
 #ifndef _WIN32
@@ -114,9 +118,6 @@
   gint refcount;
   mfxFrameAllocResponse response;
   mfxFrameAllocRequest request;
-  GList *surfaces_avail;
-  GList *surfaces_used;
-  GList *surfaces_locked;
 };
 
 GstMsdkAllocResponse *
@@ -135,19 +136,20 @@
 gst_msdk_context_remove_alloc_response (GstMsdkContext * context,
     mfxFrameAllocResponse * resp);
 
-mfxFrameSurface1 *
-gst_msdk_context_get_surface_available (GstMsdkContext * context, mfxFrameAllocResponse * resp);
-
 void
-gst_msdk_context_put_surface_locked (GstMsdkContext * context, mfxFrameAllocResponse * resp, mfxFrameSurface1 * surface);
+gst_msdk_context_set_alloc_pool (GstMsdkContext * context, GstBufferPool * pool);
 
-void
-gst_msdk_context_put_surface_available (GstMsdkContext * context, mfxFrameAllocResponse * resp, mfxFrameSurface1 * surface);
+GstBufferPool *
+gst_msdk_context_get_alloc_pool (GstMsdkContext * context);
 
 GstMsdkContextJobType
 gst_msdk_context_get_job_type (GstMsdkContext * context);
 
 void
+gst_msdk_context_set_job_type (GstMsdkContext * context,
+    GstMsdkContextJobType job_type);
+
+void
 gst_msdk_context_add_job_type (GstMsdkContext * context, GstMsdkContextJobType job_type);
 
 gint

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkcontextutil.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkcontextutil.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkdec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkdec.c Changed

@@ -36,20 +36,21 @@
 #include <stdlib.h>
 
 #include "gstmsdkdec.h"
-#include "gstmsdkbufferpool.h"
-#include "gstmsdkvideomemory.h"
-#include "gstmsdksystemmemory.h"
 #include "gstmsdkcontextutil.h"
+#include "gstmsdkallocator.h"
+#include "gstmsdkcaps.h"
+
+#ifndef _WIN32
+#include <libdrm/drm_fourcc.h>
+#include <gst/va/gstvaallocator.h>
+#include <gst/va/gstvavideoformat.h>
+#else
+#include <gst/d3d11/gstd3d11.h>
+#endif
 
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkdec_debug);
 #define GST_CAT_DEFAULT gst_msdkdec_debug
 
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR ("NV12", "NV12"))
-    );
-
 #define PROP_HARDWARE_DEFAULT            TRUE
 #define PROP_ASYNC_DEPTH_DEFAULT         1
 
@@ -63,26 +64,20 @@
 
 #define MFX_TIME_IS_VALID(time) ((time) != MFX_TIMESTAMP_UNKNOWN)
 
+#define GST_MSDK_FRAME_SURFACE gst_msdk_frame_surface_quark_get ()
+
 #define gst_msdkdec_parent_class parent_class
 G_DEFINE_TYPE (GstMsdkDec, gst_msdkdec, GST_TYPE_VIDEO_DECODER);
 
-typedef struct _MsdkSurface
-{
-  mfxFrameSurface1 *surface;
-  GstBuffer *buf;
-  GstVideoFrame data;
-  GstVideoFrame copy;
-} MsdkSurface;
-
 struct _MsdkDecTask
 {
-  MsdkSurface *surface;
+  GstMsdkSurface *surface;
   mfxSyncPoint sync_point;
 
   gboolean decode_only;
 };
 
-static gboolean gst_msdkdec_drain (GstVideoDecoder * decoder);
+static GstFlowReturn gst_msdkdec_drain (GstVideoDecoder * decoder);
 static gboolean gst_msdkdec_flush (GstVideoDecoder * decoder);
 static gboolean gst_msdkdec_negotiate (GstMsdkDec * thiz, gboolean hard_reset);
 
@@ -149,140 +144,119 @@
 }
 
 static inline void
-free_surface (MsdkSurface * s)
+free_surface (GstMsdkSurface * s)
 {
   gst_buffer_unref (s->buf);
-  g_slice_free (MsdkSurface, s);
+  g_slice_free (GstMsdkSurface, s);
 }
 
-static void
-unmap_frame (GstMsdkDec * thiz, MsdkSurface * s)
-{
-  if (s->copy.buffer) {
-    /* we allocate this buffer from down stream, we need ref-1 for it */
-    gst_buffer_unref (s->copy.buffer);
-    gst_video_frame_unmap (&s->copy);
-    s->copy.buffer = NULL;
-  }
-
-  if (s->data.buffer) {
-    gst_video_frame_unmap (&s->data);
-    s->data.buffer = NULL;
-  }
-}
-
-static void
-gst_msdkdec_free_unlocked_msdk_surfaces (GstMsdkDec * thiz)
+static gboolean
+gst_msdkdec_free_unlocked_msdk_surfaces (GstMsdkDec * thiz,
+    gboolean check_avail_surface)
 {
   GList *l;
-  MsdkSurface *surface;
+  GstMsdkSurface *surface;
 
   for (l = thiz->locked_msdk_surfaces; l;) {
     GList *next = l->next;
     surface = l->data;
-    if (surface->surface->Data.Locked == 0) {
-      unmap_frame (thiz, surface);
+    if (surface->surface->Data.Locked == 0 &&
+        GST_MINI_OBJECT_REFCOUNT_VALUE (surface->buf) == 1) {
       free_surface (surface);
       thiz->locked_msdk_surfaces =
           g_list_delete_link (thiz->locked_msdk_surfaces, l);
+
+      /* When check_avail_surface flag is enabled, it means we only
+       * need to find one available surface instead of releasing all
+       * the unlocked surfaces, so we can return TEUR here.
+       */
+      if (check_avail_surface)
+        return TRUE;
     }
     l = next;
   }
+  /* We need to check if all surfaces are in used */
+  if (g_list_length (thiz->locked_msdk_surfaces) ==
+      thiz->alloc_resp.NumFrameActual)
+    return FALSE;
+  else
+    return TRUE;
 }
 
-static GstFlowReturn
-allocate_output_buffer (GstMsdkDec * thiz, GstBuffer ** buffer)
+static GstMsdkSurface *
+allocate_output_surface (GstMsdkDec * thiz)
 {
-  GstFlowReturn flow;
-  GstVideoCodecFrame *frame;
-  GstVideoDecoder *decoder = GST_VIDEO_DECODER (thiz);
-
-  frame = gst_msdkdec_get_oldest_frame (decoder);
-  if (!frame) {
-    if (GST_PAD_IS_FLUSHING (decoder->srcpad))
-      return GST_FLOW_FLUSHING;
-    else
-      return GST_FLOW_CUSTOM_SUCCESS;
-  }
-
-  if (!frame->output_buffer) {
-    /* Free un-unsed msdk surfaces firstly, hence the associated mfx
-     * surfaces will be moved from used list to available list */
-    gst_msdkdec_free_unlocked_msdk_surfaces (thiz);
+  GstMsdkSurface *msdk_surface = NULL;
+  GstBuffer *out_buffer = NULL;
+  GstMemory *mem = NULL;
+  mfxFrameSurface1 *mfx_surface = NULL;
+  gint n = 0;
+  guint retry_times = 1000;
+#ifdef _WIN32
+  GstMapInfo map_info;
+#endif
 
-    flow = gst_video_decoder_allocate_output_frame (decoder, frame);
-    if (flow != GST_FLOW_OK) {
-      gst_video_codec_frame_unref (frame);
-      return flow;
+  /* Free un-unsed msdk surfaces firstly, hence the associated mfx
+   * surfaces will be moved from used list to available list */
+  if (!gst_msdkdec_free_unlocked_msdk_surfaces (thiz, FALSE)) {
+    for (n = 0; n < retry_times; n++) {
+      /* It is MediaSDK/oneVPL's requirement that only the pre-allocated
+       * surfaces can be used during the whole decoding process.
+       * In the case of decoder plus multi-encoders, it is possible
+       * that all surfaces are used by downstreams and no more surfaces
+       * available for decoder. So here we need to wait until there is at
+       * least one surface is free for decoder.
+       */
+      g_usleep (1000);
+      if (gst_msdkdec_free_unlocked_msdk_surfaces (thiz, TRUE))
+        break;
     }
-  }
-
-  *buffer = gst_buffer_ref (frame->output_buffer);
-  gst_buffer_replace (&frame->output_buffer, NULL);
-  gst_video_codec_frame_unref (frame);
-
-  return GST_FLOW_OK;
-}
-
-static MsdkSurface *
-get_surface (GstMsdkDec * thiz, GstBuffer * buffer)
-{
-  MsdkSurface *i;
-  GstVideoCodecState *output_state = NULL;
-  gboolean success;
-
-  i = g_slice_new0 (MsdkSurface);
-
-  if (gst_msdk_is_msdk_buffer (buffer)) {
-    i->surface = gst_msdk_get_surface_from_buffer (buffer);
-    i->buf = buffer;
-  } else {
-    /* Confirm to activate the side pool */
-    if (!gst_buffer_pool_is_active (thiz->pool) &&
-        !gst_buffer_pool_set_active (thiz->pool, TRUE)) {
-      g_slice_free (MsdkSurface, i);
+    if (n == retry_times) {
+      GST_WARNING ("No available unlocked msdk surfaces");
       return NULL;
     }
+  }
 
-    if (!gst_video_frame_map (&i->copy, &thiz->non_msdk_pool_info, buffer,
-            GST_MAP_WRITE))
-      goto failed_unref_buffer;
-
-    if (gst_buffer_pool_acquire_buffer (thiz->pool, &buffer,
-            NULL) != GST_FLOW_OK)
-      goto failed_unmap_copy;
-
-    i->surface = gst_msdk_get_surface_from_buffer (buffer);
-    i->buf = buffer;
-
-    output_state =
-        gst_video_decoder_get_output_state (GST_VIDEO_DECODER (thiz));
-    success =
-        gst_video_frame_map (&i->data, &output_state->info, buffer,
-        GST_MAP_READWRITE);
-    gst_video_codec_state_unref (output_state);
-    if (!success)
-      goto failed_unref_buffer2;
+  if ((gst_buffer_pool_acquire_buffer (thiz->alloc_pool, &out_buffer, NULL))
+      != GST_FLOW_OK) {
+    GST_ERROR_OBJECT (thiz, "Failed to allocate output buffer");
+    return NULL;
+  }
+#ifdef _WIN32
+  /* For d3d11 we should call gst_buffer_map with GST_MAP_WRITE |
+   * GST_MAP_D3D11 flags to make sure the staging texture has been uploaded
+   */
+  if (!gst_buffer_map (out_buffer, &map_info, GST_MAP_WRITE | GST_MAP_D3D11)) {
+    GST_ERROR ("Failed to map buffer");
+    return NULL;
+  }
+#endif
+  mem = gst_buffer_peek_memory (out_buffer, 0);
+  msdk_surface = g_slice_new0 (GstMsdkSurface);
+
+  if ((mfx_surface = gst_mini_object_get_qdata (GST_MINI_OBJECT_CAST (mem),
+              GST_MSDK_FRAME_SURFACE))) {
+    msdk_surface->surface = mfx_surface;
+    msdk_surface->from_qdata = TRUE;
+#ifdef _WIN32
+    gst_buffer_unmap (out_buffer, &map_info);
+#endif
+  } else {
+    GST_ERROR ("No available surfaces");
+    g_slice_free (GstMsdkSurface, msdk_surface);
+    return NULL;
   }
 
-  if (!thiz->sfc)
-    gst_msdk_update_mfx_frame_info_from_mfx_video_param (&i->surface->Info,
-        &thiz->param);
+  msdk_surface->buf = out_buffer;
 
-  thiz->locked_msdk_surfaces = g_list_append (thiz->locked_msdk_surfaces, i);
-  return i;
+  if (!thiz->sfc)
+    gst_msdk_update_mfx_frame_info_from_mfx_video_param
+        (&msdk_surface->surface->Info, &thiz->param);
 
-failed_unref_buffer2:
-  gst_buffer_unref (buffer);
-  buffer = i->data.buffer;
-failed_unmap_copy:
-  gst_video_frame_unmap (&i->copy);
-failed_unref_buffer:
-  gst_buffer_unref (buffer);
-  g_slice_free (MsdkSurface, i);
+  thiz->locked_msdk_surfaces =
+      g_list_append (thiz->locked_msdk_surfaces, msdk_surface);
 
-  GST_ERROR_OBJECT (thiz, "failed to handle buffer");
-  return NULL;
+  return msdk_surface;
 }
 
 static void
@@ -296,8 +270,7 @@
   GST_DEBUG_OBJECT (thiz, "Closing decoder with context %" GST_PTR_FORMAT,
       thiz->context);
 
-  if (thiz->use_video_memory)
-    gst_msdk_frame_free (thiz->context, &thiz->alloc_resp);
+  gst_msdk_frame_free (thiz->context, &thiz->alloc_resp);
 
   status = MFXVideoDECODE_Close (gst_msdk_context_get_session (thiz->context));
   if (status != MFX_ERR_NONE && status != MFX_ERR_NOT_INITIALIZED) {
@@ -356,13 +329,11 @@
   mfxSession session;
   mfxStatus status;
   mfxFrameAllocRequest request;
+  gint shared_async_depth;
 #if (MFX_VERSION >= 1022)
   mfxExtDecVideoProcessing ext_dec_video_proc;
 #endif
 
-  GstVideoCodecState *output_state =
-      gst_video_decoder_get_output_state (GST_VIDEO_DECODER (thiz));
-
   if (thiz->initialized)
     return TRUE;
 
@@ -376,25 +347,18 @@
     return FALSE;
   }
   info = &thiz->input_state->info;
-  output_info = &output_state->info;
+  output_info = &thiz->output_state->info;
 
   GST_OBJECT_LOCK (thiz);
 
-  if (thiz->use_video_memory) {
-    gst_msdk_set_frame_allocator (thiz->context);
-    thiz->param.IOPattern = MFX_IOPATTERN_OUT_VIDEO_MEMORY;
-  } else {
-    thiz->param.IOPattern = MFX_IOPATTERN_OUT_SYSTEM_MEMORY;
-  }
-
-  GST_INFO_OBJECT (thiz, "This MSDK decoder uses %s memory",
-      thiz->use_video_memory ? "video" : "system");
+  gst_msdk_set_frame_allocator (thiz->context);
+  thiz->param.IOPattern = MFX_IOPATTERN_OUT_VIDEO_MEMORY;
 
   thiz->param.AsyncDepth = thiz->async_depth;
 
   /* We expect msdk to fill the width and height values */
-  g_return_val_if_fail (thiz->param.mfx.FrameInfo.Width
-      && thiz->param.mfx.FrameInfo.Height, FALSE);
+  if (!(thiz->param.mfx.FrameInfo.Width && thiz->param.mfx.FrameInfo.Height))
+    goto failed;
 
   klass->preinit_decoder (thiz);
 
@@ -488,25 +452,21 @@
         "Allocating resources without considering the downstream requirement"
         "or extra scratch surface count");
 
-  if (thiz->use_video_memory) {
-    gint shared_async_depth;
-
-    shared_async_depth =
-        gst_msdk_context_get_shared_async_depth (thiz->context);
-    request.NumFrameSuggested += shared_async_depth;
+  shared_async_depth = gst_msdk_context_get_shared_async_depth (thiz->context);
+  request.NumFrameSuggested += shared_async_depth;
 
-    request.Type |= MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
-    if (thiz->use_dmabuf)
-      request.Type |= MFX_MEMTYPE_EXPORT_FRAME;
+  request.Type |= MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
+  if (thiz->use_dmabuf)
+    request.Type |= MFX_MEMTYPE_EXPORT_FRAME;
 #if (MFX_VERSION >= 1022)
-    if (thiz->sfc) {
-      request.Info.Width = ext_dec_video_proc.Out.Width;
-      request.Info.Height = ext_dec_video_proc.Out.Height;
-    }
+  if (thiz->sfc) {
+    request.Info.Width = ext_dec_video_proc.Out.Width;
+    request.Info.Height = ext_dec_video_proc.Out.Height;
+  }
 #endif
 
-    gst_msdk_frame_alloc (thiz->context, &request, &thiz->alloc_resp);
-  }
+  gst_msdk_frame_alloc (thiz->context, &request, &thiz->alloc_resp);
+  thiz->alloc_pool = gst_msdk_context_get_alloc_pool (thiz->context);
 
   /* update the prealloc_buffer count, which will be used later
    * as GstBufferPool min_buffers */
@@ -548,44 +508,45 @@
   return FALSE;
 }
 
-
-static gboolean
-_gst_caps_has_feature (const GstCaps * caps, const gchar * feature)
-{
-  guint i;
-
-  for (i = 0; i < gst_caps_get_size (caps); i++) {
-    GstCapsFeatures *const features = gst_caps_get_features (caps, i);
-    /* Skip ANY features, we need an exact match for correct evaluation */
-    if (gst_caps_features_is_any (features))
-      continue;
-    if (gst_caps_features_contains (features, feature))
-      return TRUE;
-  }
-
-  return FALSE;
-}
-
 static gboolean
-srcpad_can_dmabuf (GstMsdkDec * thiz)
+pad_accept_memory (GstMsdkDec * thiz, const gchar * mem_type, GstCaps ** filter)
 {
   gboolean ret = FALSE;
   GstCaps *caps, *out_caps;
-  GstPad *srcpad;
+  GstPad *pad;
 
-  srcpad = GST_VIDEO_DECODER_SRC_PAD (thiz);
-  caps = gst_pad_get_pad_template_caps (srcpad);
+  pad = GST_VIDEO_DECODER_SRC_PAD (thiz);
 
-  out_caps = gst_pad_peer_query_caps (srcpad, caps);
-  if (!out_caps)
-    goto done;
+  caps = gst_caps_copy (*filter);
+  gst_caps_set_features (caps, 0, gst_caps_features_from_string (mem_type));
+
+#ifndef _WIN32
+  /* In dma caps case, we need to set drm-format for raw caps */
+  if (gst_msdkcaps_has_feature (caps, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+    GstStructure *s = gst_caps_get_structure (caps, 0);
+
+    if (gst_structure_has_field (s, "format")) {
+      const gchar *fmt_str = gst_structure_get_string (s, "format");
+      GstVideoFormat fmt = gst_video_format_from_string (fmt_str);
+      guint32 fourcc = gst_va_drm_fourcc_from_video_format (fmt);
+      gchar *drm_str =
+          gst_video_dma_drm_fourcc_to_string (fourcc, thiz->modifier);
+      gst_msdkcaps_set_strings (caps, mem_type, "drm-format", drm_str);
+      gst_caps_set_simple (caps, "format", G_TYPE_STRING, "DMA_DRM", NULL);
+      g_free (drm_str);
+    }
+  }
+#endif
 
-  if (gst_caps_is_any (out_caps) || gst_caps_is_empty (out_caps)
-      || out_caps == caps)
+  out_caps = gst_pad_peer_query_caps (pad, caps);
+
+  if (!out_caps || gst_caps_is_empty (out_caps))
     goto done;
 
-  if (_gst_caps_has_feature (out_caps, GST_CAPS_FEATURE_MEMORY_DMABUF))
+  if (gst_msdkcaps_has_feature (out_caps, mem_type)) {
+    gst_caps_replace (filter, caps);
     ret = TRUE;
+  }
 
 done:
   if (caps)
@@ -615,24 +576,68 @@
 }
 
 static gboolean
+gst_msdkdec_fixate_format (GstMsdkDec * thiz, GstCaps * caps,
+    GstVideoFormat fmt)
+{
+  GValue gfmt = G_VALUE_INIT;
+
+  g_return_val_if_fail (caps != NULL, FALSE);
+  g_return_val_if_fail (gst_caps_is_writable (caps), FALSE);
+  g_return_val_if_fail (fmt != GST_VIDEO_FORMAT_UNKNOWN, FALSE);
+
+  g_value_init (&gfmt, G_TYPE_STRING);
+
+  for (guint i = 0; i < gst_caps_get_size (caps); i++) {
+    GstStructure *s = gst_caps_get_structure (caps, i);
+
+#ifndef _WIN32
+    GstCapsFeatures *f = gst_caps_get_features (caps, i);
+    if (gst_caps_features_contains (f, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+      const GValue *drm_fmts = gst_structure_get_value (s, "drm-format");
+      guint32 fourcc = gst_va_drm_fourcc_from_video_format (fmt);
+      gchar *drm_str =
+          gst_video_dma_drm_fourcc_to_string (fourcc, thiz->modifier);
+      g_value_set_string (&gfmt, drm_str);
+      g_free (drm_str);
+      if (!gst_value_can_intersect (&gfmt, drm_fmts))
+        goto failed;
+      gst_structure_set_value (s, "drm-format", &gfmt);
+      continue;
+    }
+#endif
+
+    const GValue *fmts = gst_structure_get_value (s, "format");
+    g_value_set_string (&gfmt, gst_video_format_to_string (fmt));
+    if (!gst_value_can_intersect (&gfmt, fmts))
+      goto failed;
+    gst_structure_set_value (s, "format", &gfmt);
+  }
+
+  g_value_unset (&gfmt);
+  return TRUE;
+
+failed:
+  g_value_unset (&gfmt);
+  return FALSE;
+}
+
+static gboolean
 gst_msdkdec_set_src_caps (GstMsdkDec * thiz, gboolean need_allocation)
 {
-  GstVideoCodecState *output_state;
-  GstVideoInfo *vinfo;
+  GstVideoInfo vinfo;
   GstVideoAlignment align;
   GstCaps *allocation_caps = NULL;
-  GstCaps *allowed_caps = NULL, *temp_caps;
+  GstCaps *allowed_caps = NULL, *temp_caps, *out_caps, *src_caps;
   GstVideoFormat format;
   guint width, height;
   guint alloc_w, alloc_h;
   int out_width = 0, out_height = 0;
   gint dar_n = -1, dar_d = -1;
-  const gchar *format_str;
   GstStructure *outs = NULL;
   const gchar *out_format;
-  GValue v_format = G_VALUE_INIT;
   GValue v_width = G_VALUE_INIT;
   GValue v_height = G_VALUE_INIT;
+  gboolean has_drm_format = FALSE;
 
   /* use display width and display height in output state, which
    * will be used for caps negotiation */
@@ -651,6 +656,15 @@
     GST_WARNING_OBJECT (thiz, "Failed to find a valid video format");
     return FALSE;
   }
+#ifndef _WIN32
+  /* Get possible modifier before negotiation really happens */
+  GstVaDisplay *display =
+      (GstVaDisplay *) gst_msdk_context_get_va_display (thiz->context);
+  thiz->modifier = gst_va_dmabuf_get_modifier_for_format (display, format,
+      VA_SURFACE_ATTRIB_USAGE_HINT_DECODER);
+  gst_object_unref (display);
+#endif
+
 #if (MFX_VERSION >= 1022)
   /* SFC is triggered (for AVC and HEVC) when default output format is not
    * accepted by downstream or when downstream requests for a smaller
@@ -665,41 +679,64 @@
     temp_caps = gst_pad_query_caps (GST_VIDEO_DECODER (thiz)->srcpad, NULL);
     temp_caps = gst_caps_make_writable (temp_caps);
 
-    g_value_init (&v_format, G_TYPE_STRING);
+    if (!gst_msdkdec_fixate_format (thiz, temp_caps, format)) {
+      GST_ERROR_OBJECT (thiz, "Format is not negotiable");
+      gst_caps_unref (temp_caps);
+      return FALSE;
+    }
     g_value_init (&v_width, G_TYPE_INT);
     g_value_init (&v_height, G_TYPE_INT);
 
-    g_value_set_string (&v_format, gst_video_format_to_string (format));
     g_value_set_int (&v_width, width);
     g_value_set_int (&v_height, height);
 
-    gst_caps_set_value (temp_caps, "format", &v_format);
     gst_caps_set_value (temp_caps, "width", &v_width);
     gst_caps_set_value (temp_caps, "height", &v_height);
 
-    if (gst_caps_is_empty (gst_pad_peer_query_caps (GST_VIDEO_DECODER
-                (thiz)->srcpad, temp_caps))) {
+    g_value_unset (&v_width);
+    g_value_unset (&v_height);
+
+    src_caps = gst_pad_peer_query_caps (GST_VIDEO_DECODER
+        (thiz)->srcpad, temp_caps);
+    gst_caps_unref (temp_caps);
+
+    if (gst_caps_is_empty (src_caps)) {
       if (!gst_util_fraction_multiply (width, height,
               GST_VIDEO_INFO_PAR_N (&thiz->input_state->info),
               GST_VIDEO_INFO_PAR_D (&thiz->input_state->info),
               &dar_n, &dar_d)) {
         GST_ERROR_OBJECT (thiz, "Error to calculate the output scaled size");
-        gst_caps_unref (temp_caps);
+        gst_caps_unref (src_caps);
         return FALSE;
       }
 
       allowed_caps =
           gst_pad_get_allowed_caps (GST_VIDEO_DECODER (thiz)->srcpad);
       outs = gst_caps_get_structure (allowed_caps, 0);
-      out_format = gst_structure_get_string (outs, "format");
-      gst_structure_get_int (outs, "width", &out_width);
-      gst_structure_get_int (outs, "height", &out_height);
+
+      if (gst_structure_has_field (outs, "drm-format")) {
+        out_format = gst_structure_get_string (outs, "drm-format");
+        has_drm_format = TRUE;
+      } else {
+        out_format = gst_structure_get_string (outs, "format");
+      }
 
       if (out_format) {
-        format = gst_video_format_from_string (out_format);
+        if (has_drm_format) {
+#ifndef _WIN32
+          guint drm_fourcc =
+              gst_video_dma_drm_fourcc_from_string (out_format, NULL);
+          format = gst_va_video_format_from_drm_fourcc (drm_fourcc);
+#endif
+        } else {
+          format = gst_video_format_from_string (out_format);
+        }
         thiz->sfc = TRUE;
       }
 
+      gst_structure_get_int (outs, "width", &out_width);
+      gst_structure_get_int (outs, "height", &out_height);
+
       if (!out_width && !out_height) {
         out_width = width;
         out_height = height;
@@ -721,14 +758,15 @@
       }
       gst_caps_unref (allowed_caps);
     }
-    gst_caps_unref (temp_caps);
+    gst_caps_unref (src_caps);
   }
 #endif
 
-  output_state =
+  thiz->output_state =
       gst_video_decoder_set_output_state (GST_VIDEO_DECODER (thiz),
       format, width, height, thiz->input_state);
-  if (!output_state)
+
+  if (!thiz->output_state)
     return FALSE;
 
   /* Find allocation width and height */
@@ -741,38 +779,46 @@
 
   /* Ensure output_state->caps and info have same width and height
    * Also, mandate 32 bit alignment */
-  vinfo = &output_state->info;
+  vinfo = thiz->output_state->info;
   if (width == out_width || height == out_height)
-    gst_msdk_set_video_alignment (vinfo, 0, 0, &align);
+    gst_msdk_set_video_alignment (&vinfo, 0, 0, &align);
   else
-    gst_msdk_set_video_alignment (vinfo, alloc_w, alloc_h, &align);
-  gst_video_info_align (vinfo, &align);
-  output_state->caps = gst_video_info_to_caps (vinfo);
+    gst_msdk_set_video_alignment (&vinfo, alloc_w, alloc_h, &align);
+  gst_video_info_align (&vinfo, &align);
 
-  if (srcpad_can_dmabuf (thiz))
-    gst_caps_set_features (output_state->caps, 0,
-        gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_DMABUF, NULL));
+  out_caps = gst_video_info_to_caps (&vinfo);
+
+#ifndef _WIN32
+  if (pad_accept_memory (thiz, GST_CAPS_FEATURE_MEMORY_VA, &out_caps)) {
+    GST_INFO_OBJECT (thiz, "Decoder src pad accepts VAMemory caps");
+  } else if (pad_accept_memory (thiz, GST_CAPS_FEATURE_MEMORY_DMABUF,
+          &out_caps)) {
+    GST_INFO_OBJECT (thiz, "Decoder src pad accepts DMABuf caps");
+  }
+#else
+  if (pad_accept_memory (thiz, GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, &out_caps)) {
+    GST_INFO_OBJECT (thiz, "Decoder src pad accepts D3D11Memory caps");
+  }
+#endif
+  thiz->output_state->caps = out_caps;
 
   if (need_allocation) {
     /* Find allocation width and height */
     width =
         GST_ROUND_UP_16 (thiz->param.mfx.FrameInfo.Width ? thiz->param.mfx.
-        FrameInfo.Width : GST_VIDEO_INFO_WIDTH (&output_state->info));
+        FrameInfo.Width : GST_VIDEO_INFO_WIDTH (&thiz->output_state->info));
     height =
         GST_ROUND_UP_32 (thiz->param.mfx.FrameInfo.Height ? thiz->param.mfx.
-        FrameInfo.Height : GST_VIDEO_INFO_HEIGHT (&output_state->info));
+        FrameInfo.Height : GST_VIDEO_INFO_HEIGHT (&thiz->output_state->info));
 
     /* set allocation width and height in allocation_caps,
      * which may or may not be similar to the output_state caps */
-    allocation_caps = gst_caps_copy (output_state->caps);
-    format_str =
-        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT
-        (&output_state->info));
+    allocation_caps = gst_caps_copy (thiz->output_state->caps);
     gst_caps_set_simple (allocation_caps, "width", G_TYPE_INT, width, "height",
-        G_TYPE_INT, height, "format", G_TYPE_STRING, format_str, NULL);
+        G_TYPE_INT, height, NULL);
     GST_INFO_OBJECT (thiz, "new alloc caps = %" GST_PTR_FORMAT,
         allocation_caps);
-    gst_caps_replace (&output_state->allocation_caps, allocation_caps);
+    gst_caps_replace (&thiz->output_state->allocation_caps, allocation_caps);
     gst_caps_unref (allocation_caps);
   } else {
     /* We keep the allocation parameters as it is to avoid pool re-negotiation.
@@ -780,7 +826,6 @@
      * reset if the new video frame resolution is lower than the
      * already configured one */
   }
-  gst_video_codec_state_unref (output_state);
 
   return TRUE;
 
@@ -821,7 +866,7 @@
 static gint
 _find_msdk_surface (gconstpointer msdk_surface, gconstpointer comp_surface)
 {
-  MsdkSurface *cached_surface = (MsdkSurface *) msdk_surface;
+  GstMsdkSurface *cached_surface = (GstMsdkSurface *) msdk_surface;
   mfxFrameSurface1 *_surface = (mfxFrameSurface1 *) comp_surface;
 
   return cached_surface ? cached_surface->surface != _surface : -1;
@@ -830,11 +875,8 @@
 static void
 finish_task (GstMsdkDec * thiz, MsdkDecTask * task)
 {
-  MsdkSurface *surface = task->surface;
+  GstMsdkSurface *surface = task->surface;
   if (surface) {
-    if (G_UNLIKELY (surface->copy.buffer)) {
-      unmap_frame (thiz, surface);
-    }
     thiz->locked_msdk_surfaces =
         g_list_append (thiz->locked_msdk_surfaces, surface);
   }
@@ -874,13 +916,72 @@
         ("Corruption Corrupted reference list!"), (NULL));
 }
 
+static gboolean
+_copy_to_sys_mem (GstMsdkDec * thiz, GstMsdkSurface * surface,
+    GstVideoCodecFrame * frame)
+{
+  GstBuffer *buffer = NULL;
+  GstVideoFrame src_frame;
+  GstVideoFrame dst_frame;
+  GstVideoInfo *src_info;
+  GstVideoInfo dst_info;
+
+  src_info = &thiz->output_state->info;
+  gst_video_info_set_format (&dst_info, GST_VIDEO_INFO_FORMAT (src_info),
+      GST_VIDEO_INFO_WIDTH (src_info), GST_VIDEO_INFO_HEIGHT (src_info));
+
+  if (!gst_buffer_pool_is_active (thiz->other_pool) &&
+      !gst_buffer_pool_set_active (thiz->other_pool, TRUE)) {
+    GST_ERROR_OBJECT (thiz, "Failed to activate buffer pool");
+    goto error_active;
+  }
+
+  if (gst_buffer_pool_acquire_buffer (thiz->other_pool, &buffer, NULL)
+      != GST_FLOW_OK) {
+    GST_ERROR ("Failed to acquire buffer from pool");
+    goto error;
+  }
+
+  if (!gst_video_frame_map (&src_frame, src_info, surface->buf, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (thiz, "Failed to map buf to src frame");
+    goto error;
+  }
+
+  if (!gst_video_frame_map (&dst_frame, &dst_info, buffer, GST_MAP_WRITE)) {
+    GST_ERROR_OBJECT (thiz, "Failed to map buf to dst frame");
+    gst_video_frame_unmap (&src_frame);
+    goto error;
+  }
+
+  if (!gst_video_frame_copy (&dst_frame, &src_frame)) {
+    GST_ERROR_OBJECT (thiz, "Failed to copy surface data");
+    gst_video_frame_unmap (&src_frame);
+    gst_video_frame_unmap (&dst_frame);
+    goto error;
+  }
+
+  frame->output_buffer = buffer;
+  gst_video_frame_unmap (&src_frame);
+  gst_video_frame_unmap (&dst_frame);
+
+  return TRUE;
+
+error:
+  gst_buffer_unref (buffer);
+  gst_buffer_pool_set_active (thiz->other_pool, FALSE);
+  gst_object_unref (thiz->other_pool);
+
+error_active:
+  return FALSE;
+}
+
 static GstFlowReturn
 gst_msdkdec_finish_task (GstMsdkDec * thiz, MsdkDecTask * task)
 {
   GstVideoDecoder *decoder = GST_VIDEO_DECODER (thiz);
   GstFlowReturn flow;
   GstVideoCodecFrame *frame;
-  MsdkSurface *surface;
+  GstMsdkSurface *surface;
   mfxStatus status;
   guint64 pts = MFX_TIMESTAMP_UNKNOWN;
 
@@ -901,6 +1002,23 @@
     GST_DEBUG_OBJECT (thiz, "Decoded MFX TimeStamp: %" G_GUINT64_FORMAT,
         (guint64) surface->surface->Data.TimeStamp);
     pts = surface->surface->Data.TimeStamp;
+
+    if (thiz->param.mfx.CodecId == MFX_CODEC_VP9) {
+      /* detect whether the resolution change and negotiate with downstream if so */
+      if ((surface->surface->Info.CropW && surface->surface->Info.CropH)
+          && ((thiz->output_state->info.width != surface->surface->Info.CropW)
+              || (thiz->output_state->info.height !=
+                  surface->surface->Info.CropH))) {
+        thiz->output_state->info.width = surface->surface->Info.CropW;
+        thiz->output_state->info.height = surface->surface->Info.CropH;
+        thiz->output_state->caps =
+            gst_video_info_to_caps (&thiz->output_state->info);
+        if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (thiz))) {
+          GST_ERROR_OBJECT (thiz, "Failed to negotiate");
+          return GST_FLOW_NOT_NEGOTIATED;
+        }
+      }
+    }
   }
 
   if (G_LIKELY (task->sync_point || (surface && task->decode_only))) {
@@ -919,21 +1037,17 @@
     }
 
     if (G_LIKELY (frame)) {
-      if (G_LIKELY (surface->copy.buffer == NULL)) {
+      if (!thiz->do_copy) {
         /* gst_video_decoder_finish_frame will call gst_buffer_make_writable
-         * we need this to avoid copy buffer                               */
+         * we need this to avoid copy buffer                              */
         GST_MINI_OBJECT_FLAG_SET (surface->buf, GST_MINI_OBJECT_FLAG_LOCKABLE);
         frame->output_buffer = gst_buffer_ref (surface->buf);
       } else {
-        if (!gst_video_frame_copy (&surface->copy, &surface->data)) {
-          GST_ERROR_OBJECT (thiz, "Failed to copy surface data");
-          gst_video_frame_unmap (&surface->copy);
-          gst_video_frame_unmap (&surface->data);
+        /* We need to do the copy from video memory to system memory */
+        if (!_copy_to_sys_mem (thiz, surface, frame))
           return GST_FLOW_ERROR;
-        }
-        frame->output_buffer = gst_buffer_ref (surface->copy.buffer);
-        unmap_frame (thiz, surface);
       }
+
       GST_DEBUG_OBJECT (thiz, "surface %p TimeStamp: %" G_GUINT64_FORMAT
           " frame %p TimeStamp: %" G_GUINT64_FORMAT,
           surface->surface, (guint64) surface->surface->Data.TimeStamp,
@@ -955,6 +1069,7 @@
     return flow;
   }
   finish_task (thiz, task);
+
   return GST_FLOW_OK;
 }
 
@@ -972,15 +1087,6 @@
     return TRUE;
   }
 
-  /* TODO: Currently d3d allocator is not implemented.
-   * So decoder uses system memory by default on Windows.
-   */
-#ifndef _WIN32
-  thiz->use_video_memory = TRUE;
-#else
-  thiz->use_video_memory = FALSE;
-#endif
-
   GST_INFO_OBJECT (thiz, "Found context %" GST_PTR_FORMAT " from neighbour",
       thiz->context);
 
@@ -1058,10 +1164,17 @@
     gst_video_codec_state_unref (thiz->input_state);
     thiz->input_state = NULL;
   }
+  g_clear_pointer (&thiz->output_state, gst_video_codec_state_unref);
   if (thiz->pool) {
     gst_object_unref (thiz->pool);
     thiz->pool = NULL;
   }
+  if (thiz->other_pool) {
+    gst_object_unref (thiz->other_pool);
+    thiz->other_pool = NULL;
+  }
+  gst_object_replace ((GstObject **) & thiz->alloc_pool, NULL);
+
   gst_video_info_init (&thiz->non_msdk_pool_info);
 
   gst_msdkdec_close_decoder (thiz, TRUE);
@@ -1097,13 +1210,12 @@
 release_msdk_surfaces (GstMsdkDec * thiz)
 {
   GList *l;
-  MsdkSurface *surface;
+  GstMsdkSurface *surface;
   gint locked = 0;
-  gst_msdkdec_free_unlocked_msdk_surfaces (thiz);
+  gst_msdkdec_free_unlocked_msdk_surfaces (thiz, FALSE);
 
   for (l = thiz->locked_msdk_surfaces; l; l = l->next) {
-    surface = (MsdkSurface *) l->data;
-    unmap_frame (thiz, surface);
+    surface = (GstMsdkSurface *) l->data;
     free_surface (surface);
     locked++;
   }
@@ -1203,7 +1315,7 @@
     GST_ERROR_OBJECT (thiz, "msdk return an invalid surface %p", out_surface);
     return FALSE;
   }
-  task->surface = (MsdkSurface *) l->data;
+  task->surface = (GstMsdkSurface *) l->data;
   thiz->locked_msdk_surfaces =
       g_list_delete_link (thiz->locked_msdk_surfaces, l);
   return TRUE;
@@ -1276,11 +1388,11 @@
   GstMsdkDec *thiz = GST_MSDKDEC (decoder);
   GstMsdkDecClass *klass = GST_MSDKDEC_GET_CLASS (thiz);
   GstFlowReturn flow;
-  GstBuffer *buffer, *input_buffer = NULL;
+  GstBuffer *input_buffer = NULL;
   GstVideoInfo alloc_info;
   MsdkDecTask *task = NULL;
   mfxBitstream bitstream;
-  MsdkSurface *surface = NULL;
+  GstMsdkSurface *surface = NULL;
   mfxFrameSurface1 *out_surface = NULL;
   mfxSession session;
   mfxStatus status;
@@ -1401,12 +1513,10 @@
     if (!thiz->initialized)
       hard_reset = TRUE;
     else {
-      GstVideoCodecState *output_state =
-          gst_video_decoder_get_output_state (GST_VIDEO_DECODER (thiz));
-      if (output_state) {
-        if (output_state->allocation_caps) {
-          if (!gst_video_info_from_caps (&alloc_info,
-                  output_state->allocation_caps)) {
+      if (thiz->output_state) {
+        if (thiz->output_state->allocation_caps) {
+          if (!gst_msdkcaps_video_info_from_caps
+              (thiz->output_state->allocation_caps, &alloc_info, NULL)) {
             GST_ERROR_OBJECT (thiz, "Failed to get video info from caps");
             flow = GST_FLOW_ERROR;
             goto error;
@@ -1419,7 +1529,6 @@
               GST_VIDEO_INFO_HEIGHT (&alloc_info))
             hard_reset = TRUE;
         }
-        gst_video_codec_state_unref (output_state);
       }
 
     }
@@ -1450,13 +1559,7 @@
       goto error;
     }
     if (!surface) {
-      flow = allocate_output_buffer (thiz, &buffer);
-      if (flow == GST_FLOW_CUSTOM_SUCCESS) {
-        flow = GST_FLOW_OK;
-        break;
-      } else if (flow != GST_FLOW_OK)
-        goto error;
-      surface = get_surface (thiz, buffer);
+      surface = allocate_output_surface (thiz);
       if (!surface) {
         /* Can't get a surface for some reason; finish tasks, then see if
            a surface becomes available. */
@@ -1466,7 +1569,7 @@
           flow = gst_msdkdec_finish_task (thiz, task);
           if (flow != GST_FLOW_OK)
             goto error;
-          surface = get_surface (thiz, buffer);
+          surface = allocate_output_surface (thiz);
           if (surface)
             break;
         }
@@ -1631,65 +1734,126 @@
   return ret;
 }
 
+#ifndef _WIN32
+static GstBufferPool *
+gst_msdk_create_va_pool (GstMsdkDec * thiz, GstVideoInfo * info,
+    guint num_buffers)
+{
+  GstBufferPool *pool = NULL;
+  GstAllocator *allocator;
+  GArray *formats = NULL;
+  GstAllocationParams alloc_params = { 0, 31, 0, 0 };
+  GstVaDisplay *display = NULL;
+  GstCaps *caps = NULL;
+
+  display = (GstVaDisplay *) gst_msdk_context_get_va_display (thiz->context);
+
+  if (thiz->use_dmabuf)
+    allocator = gst_va_dmabuf_allocator_new (display);
+  else {
+    formats = g_array_new (FALSE, FALSE, sizeof (GstVideoFormat));
+    g_array_append_val (formats, GST_VIDEO_INFO_FORMAT (info));
+    allocator = gst_va_allocator_new (display, formats);
+  }
+
+  gst_object_unref (display);
+
+  if (!allocator) {
+    GST_ERROR_OBJECT (thiz, "Failed to create allocator");
+    if (formats)
+      g_array_unref (formats);
+    return NULL;
+  }
+
+  if (thiz->use_dmabuf && thiz->modifier != DRM_FORMAT_MOD_INVALID) {
+    caps = gst_msdkcaps_video_info_to_drm_caps (info, thiz->modifier);
+    gst_caps_set_features (caps, 0,
+        gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_DMABUF, NULL));
+  } else {
+    caps = gst_video_info_to_caps (info);
+  }
+
+  pool = gst_va_pool_new_with_config (caps, num_buffers, num_buffers,
+      VA_SURFACE_ATTRIB_USAGE_HINT_DECODER, GST_VA_FEATURE_AUTO,
+      allocator, &alloc_params);
+
+  gst_object_unref (allocator);
+  gst_caps_unref (caps);
+  GST_LOG_OBJECT (thiz, "Creating va pool");
+  return pool;
+}
+#else
+static GstBufferPool *
+gst_msdk_create_d3d11_pool (GstMsdkDec * thiz, GstVideoInfo * info,
+    guint num_buffers)
+{
+  GstBufferPool *pool = NULL;
+  GstD3D11Device *device;
+  GstStructure *config;
+  GstD3D11AllocationParams *params;
+
+  device = gst_msdk_context_get_d3d11_device (thiz->context);
+
+  pool = gst_d3d11_buffer_pool_new (device);
+  config = gst_buffer_pool_get_config (pool);
+  params = gst_d3d11_allocation_params_new (device, info,
+      GST_D3D11_ALLOCATION_FLAG_DEFAULT,
+      D3D11_BIND_DECODER | D3D11_BIND_SHADER_RESOURCE, 0);
+
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
+  gst_d3d11_allocation_params_free (params);
+
+  return pool;
+}
+#endif
+
 static GstBufferPool *
 gst_msdkdec_create_buffer_pool (GstMsdkDec * thiz, GstVideoInfo * info,
     guint num_buffers)
 {
   GstBufferPool *pool = NULL;
   GstStructure *config;
-  GstAllocator *allocator = NULL;
+  GstCaps *caps;
   GstVideoAlignment align;
-  GstCaps *caps = NULL;
-  GstAllocationParams params = { 0, 31, 0, 0, };
-  mfxFrameAllocResponse *alloc_resp = NULL;
+  GstVideoInfo vinfo = *info;
 
-  g_return_val_if_fail (info, NULL);
-  g_return_val_if_fail (GST_VIDEO_INFO_WIDTH (info)
-      && GST_VIDEO_INFO_HEIGHT (info), NULL);
+  gst_msdk_set_video_alignment (&vinfo, 0, 0, &align);
+  gst_video_info_align (&vinfo, &align);
 
-  alloc_resp = &thiz->alloc_resp;
+  if (thiz->do_copy)
+    pool = gst_video_buffer_pool_new ();
+  else {
+#ifndef _WIN32
+    pool = gst_msdk_create_va_pool (thiz, &vinfo, num_buffers);
+#else
+    pool = gst_msdk_create_d3d11_pool (thiz, &vinfo, num_buffers);
+#endif
+  }
 
-  pool = gst_msdk_buffer_pool_new (thiz->context, alloc_resp);
   if (!pool)
     goto error_no_pool;
 
-  caps = gst_video_info_to_caps (info);
-
-  /* allocators should use the same width/height/stride/height_alignment of
-   * negotiated output caps, which is what we configure in msdk_allocator */
-  if (thiz->use_dmabuf)
-    allocator = gst_msdk_dmabuf_allocator_new (thiz->context, info, alloc_resp);
-  else if (thiz->use_video_memory)
-    allocator = gst_msdk_video_allocator_new (thiz->context, info, alloc_resp);
-  else
-    allocator = gst_msdk_system_allocator_new (info);
-
-  if (!allocator) {
-    gst_caps_unref (caps);
-    goto error_no_allocator;
+#ifndef _WIN32
+  if (thiz->use_dmabuf) {
+    caps = gst_msdkcaps_video_info_to_drm_caps (&vinfo, thiz->modifier);
+    gst_caps_set_features (caps, 0,
+        gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_DMABUF, NULL));
+  } else {
+    caps = gst_video_info_to_caps (&vinfo);
   }
+#else
+  caps = gst_video_info_to_caps (&vinfo);
+#endif
 
   config = gst_buffer_pool_get_config (GST_BUFFER_POOL_CAST (pool));
-  /* we need register all bufffers when we create the msdk context, so the buffer pool is not resize able */
   gst_buffer_pool_config_set_params (config, caps,
-      GST_VIDEO_INFO_SIZE (info), num_buffers, num_buffers);
+      GST_VIDEO_INFO_SIZE (&vinfo), num_buffers, 0);
   gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
   gst_buffer_pool_config_add_option (config,
       GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
-  gst_caps_unref (caps);
-
-  if (thiz->use_video_memory) {
-    gst_buffer_pool_config_add_option (config,
-        GST_BUFFER_POOL_OPTION_MSDK_USE_VIDEO_MEMORY);
-    if (thiz->use_dmabuf)
-      gst_buffer_pool_config_add_option (config,
-          GST_BUFFER_POOL_OPTION_MSDK_USE_DMABUF);
-  }
-
-
   gst_buffer_pool_config_set_video_alignment (config, &align);
-  gst_buffer_pool_config_set_allocator (config, allocator, &params);
-  gst_object_unref (allocator);
+
+  gst_caps_unref (caps);
 
   if (!gst_buffer_pool_set_config (pool, config))
     goto error_pool_config;
@@ -1698,20 +1862,13 @@
 
 error_no_pool:
   {
-    GST_INFO_OBJECT (thiz, "failed to create bufferpool");
-    return NULL;
-  }
-error_no_allocator:
-  {
-    GST_INFO_OBJECT (thiz, "failed to create allocator");
-    gst_object_unref (pool);
+    GST_INFO_OBJECT (thiz, "Failed to create bufferpool");
     return NULL;
   }
 error_pool_config:
   {
-    GST_INFO_OBJECT (thiz, "failed to set config");
+    GST_INFO_OBJECT (thiz, "Failed to set config");
     gst_object_unref (pool);
-    gst_object_unref (allocator);
     return NULL;
   }
 }
@@ -1722,27 +1879,88 @@
   GstMsdkDec *thiz = GST_MSDKDEC (decoder);
   GstBufferPool *pool = NULL;
   GstStructure *pool_config = NULL;
-  GstCaps *pool_caps /*, *negotiated_caps */ ;
-  guint size, min_buffers, max_buffers;
+  GstCaps *pool_caps = NULL;
+  guint size = 0;
+  guint min_buffers = 0;
+  guint max_buffers = 0;
+  gboolean has_videometa, has_video_alignment;
+
   GstAllocator *allocator = NULL;
+  GstAllocationParams params;
+  gboolean update_pool = FALSE;
+  gboolean update_allocator = FALSE;
+
+  GstVideoInfo vinfo;
 
   if (!thiz->param.mfx.FrameInfo.Width || !thiz->param.mfx.FrameInfo.Height)
     return FALSE;
 
-  if (!GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation (decoder,
-          query))
-    return FALSE;
+  gst_query_parse_allocation (query, &pool_caps, NULL);
+
+  if (!gst_msdkcaps_video_info_from_caps (pool_caps, &vinfo, NULL))
+    goto failed_to_parse_caps;
+
+  if (gst_query_get_n_allocation_params (query) > 0) {
+    gst_query_parse_nth_allocation_param (query, 0, &allocator, &params);
+    update_allocator = TRUE;
+  }
+  if (!allocator)
+    gst_allocation_params_init (&params);
+
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query,
+        0, &pool, &size, &min_buffers, &max_buffers);
+    update_pool = TRUE;
+  }
+  if (!pool)
+    pool = gst_video_buffer_pool_new ();
+
+  size = MAX (size, vinfo.size);
+  pool_config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_set_params (pool_config,
+      pool_caps, size, min_buffers, max_buffers);
+  gst_buffer_pool_config_set_allocator (pool_config, allocator, &params);
+
+  if (!gst_buffer_pool_set_config (pool, pool_config)) {
+    pool_config = gst_buffer_pool_get_config (pool);
+
+    if (!gst_buffer_pool_config_validate_params (pool_config,
+            pool_caps, size, min_buffers, max_buffers)) {
+      gst_object_unref (pool);
+      pool = gst_video_buffer_pool_new ();
+      gst_buffer_pool_config_set_params (pool_config,
+          pool_caps, size, min_buffers, max_buffers);
+      gst_buffer_pool_config_set_allocator (pool_config, allocator, &params);
+    }
+
+    if (!gst_buffer_pool_set_config (pool, pool_config))
+      return FALSE;
+  }
+
+  if (update_allocator)
+    gst_query_set_nth_allocation_param (query, 0, allocator, &params);
+  else
+    gst_query_add_allocation_param (query, allocator, &params);
+
+  if (update_pool)
+    gst_query_set_nth_allocation_pool (query,
+        0, pool, size, min_buffers, max_buffers);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min_buffers, max_buffers);
 
   /* Get the buffer pool config decided on by the base class. The base
      class ensures that there will always be at least a 0th pool in
      the query. */
-  gst_query_parse_nth_allocation_pool (query, 0, &pool, NULL, NULL, NULL);
+
   pool_config = gst_buffer_pool_get_config (pool);
 
+  has_videometa = gst_query_find_allocation_meta
+      (query, GST_VIDEO_META_API_TYPE, NULL);
+  has_video_alignment = gst_buffer_pool_has_option
+      (pool, GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+
   /* Get the caps of pool and increase the min and max buffers by async_depth.
    * We will always have that number of decode operations in-flight */
-  gst_buffer_pool_config_get_params (pool_config, &pool_caps, &size,
-      &min_buffers, &max_buffers);
   min_buffers += thiz->async_depth;
   if (max_buffers)
     max_buffers += thiz->async_depth;
@@ -1753,59 +1971,41 @@
   /* this will get updated with msdk requirement */
   thiz->min_prealloc_buffers = min_buffers;
 
-  if (_gst_caps_has_feature (pool_caps, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
-    GST_INFO_OBJECT (decoder, "This MSDK decoder uses DMABuf memory");
-    thiz->use_video_memory = thiz->use_dmabuf = TRUE;
-  } else if (thiz->sfc)
-    thiz->use_video_memory = TRUE;
-
-  /* Initialize MSDK decoder before new bufferpool tries to alloc each buffer,
-   * which requires information about frame allocation.
-   * No effect if already initialized.
-   */
-  if (!gst_msdkdec_init_decoder (thiz))
-    return FALSE;
-
-  /* get the updated min_buffers, which account for the msdk requirement as well */
-  min_buffers = thiz->min_prealloc_buffers;
-
+  if (gst_msdkcaps_has_feature (pool_caps, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+    thiz->use_dmabuf = TRUE;
+  }
   /* Decoder always use its own pool. So we create a pool if msdk APIs
    * previously requested for allocation (do_realloc = TRUE) */
   if (thiz->do_realloc || !thiz->pool) {
-    GstVideoCodecState *output_state =
-        gst_video_decoder_get_output_state (GST_VIDEO_DECODER (thiz));
     gst_clear_object (&thiz->pool);
     GST_INFO_OBJECT (decoder, "create new MSDK bufferpool");
-    thiz->pool =
-        gst_msdkdec_create_buffer_pool (thiz, &output_state->info, min_buffers);
-    gst_video_codec_state_unref (output_state);
+    thiz->pool = gst_msdkdec_create_buffer_pool
+        (thiz, &thiz->output_state->info, min_buffers);
     if (!thiz->pool) {
       GST_ERROR_OBJECT (decoder, "failed to create new pool");
       goto failed_to_create_pool;
     }
   }
-
-
-  if (gst_query_get_n_allocation_params (query) > 0) {
-    gst_query_parse_nth_allocation_param (query, 0, &allocator, NULL);
-    if (!(GST_IS_MSDK_VIDEO_ALLOCATOR (allocator) ||
-            GST_IS_MSDK_DMABUF_ALLOCATOR (allocator) ||
-            GST_IS_MSDK_SYSTEM_ALLOCATOR (allocator)))
-      thiz->ds_has_no_msdk_allocator = TRUE;
+#ifndef _WIN32
+  if (!(GST_IS_VA_ALLOCATOR (allocator) ||
+          GST_IS_VA_DMABUF_ALLOCATOR (allocator)))
+    thiz->ds_has_known_allocator = FALSE;
+#else
+  if (!GST_IS_D3D11_BUFFER_POOL (pool)) {
+    thiz->ds_has_known_allocator = FALSE;
   }
+#endif
+  if (allocator)
+    gst_object_unref (allocator);
 
-  /* If downstream supports video meta and video alignment,
-   * or downstream doesn't have msdk_allocator, we can replace
-   * with our own msdk bufferpool and use it.
+  /* If downstream supports video meta and video alignment, or downstream
+   * doesn't have known allocator (known allocator refers to va allocator
+   * or d3d allocator), we replace with our own bufferpool and use it.
    */
-  if ((gst_query_find_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL)
-          && gst_buffer_pool_has_option
-          (pool, GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT))
-      || thiz->ds_has_no_msdk_allocator) {
+  if ((has_videometa && has_video_alignment)
+      || !thiz->ds_has_known_allocator) {
     GstStructure *config;
-    GstAllocator *allocator;
 
-    /* Remove downstream's pool */
     gst_structure_free (pool_config);
     gst_object_unref (pool);
 
@@ -1818,12 +2018,10 @@
       gst_query_set_nth_allocation_param (query, 0, allocator, NULL);
     gst_structure_free (config);
   } else {
-    /* Unfortunately, downstream doesn't have videometa or alignment support,
-     * we keep msdk pool as a side-pool that will be decoded into and
-     * then copied from.
+    /* When downstream doesn't have videometa or alignment support,
+     * or downstream pool is va/d3d pool,we will use downstream pool
+     * and keep decoder's own pool as side-pool.
      */
-    GstVideoCodecState *output_state = NULL;
-
     GST_INFO_OBJECT (decoder, "Keep MSDK bufferpool as a side-pool");
 
     /* Update params to downstream's pool */
@@ -1831,40 +2029,60 @@
         min_buffers, max_buffers);
     if (!gst_buffer_pool_set_config (pool, pool_config))
       goto error_set_config;
-    if (!gst_video_info_from_caps (&thiz->non_msdk_pool_info, pool_caps)) {
-      GST_ERROR_OBJECT (thiz, "Failed to get video info from caps");
-      return FALSE;
-    }
+
+    thiz->non_msdk_pool_info = vinfo;
 
     /* update width and height with actual negotiated values */
-    output_state =
-        gst_video_decoder_get_output_state (GST_VIDEO_DECODER (thiz));
     GST_VIDEO_INFO_WIDTH (&thiz->non_msdk_pool_info) =
-        GST_VIDEO_INFO_WIDTH (&output_state->info);
+        GST_VIDEO_INFO_WIDTH (&thiz->output_state->info);
     GST_VIDEO_INFO_HEIGHT (&thiz->non_msdk_pool_info) =
-        GST_VIDEO_INFO_HEIGHT (&output_state->info);
-    gst_video_codec_state_unref (output_state);
+        GST_VIDEO_INFO_HEIGHT (&thiz->output_state->info);
+  }
+
+  gst_msdk_context_set_alloc_pool (thiz->context, pool);
+
+  /* Initialize MSDK decoder before new bufferpool tries to alloc each buffer,
+   * which requires information about frame allocation.
+   * No effect if already initialized.
+   */
+  if (!gst_msdkdec_init_decoder (thiz))
+    return FALSE;
+
+  /* get the updated min_buffers, which account for the msdk requirement as well */
+  min_buffers = thiz->min_prealloc_buffers;
+
+  if (!has_videometa && !thiz->ds_has_known_allocator
+      && gst_msdkcaps_has_feature (pool_caps,
+          GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY)) {
+    /* We need to create other pool with system memory for copy use under conditions:
+     * (1) downstream has no videometa; (2) downstream allocator is unknown;
+     * (3) negotiated caps is raw.
+     */
+    thiz->do_copy = TRUE;
+    thiz->other_pool =
+        gst_msdkdec_create_buffer_pool (thiz, &thiz->output_state->info,
+        min_buffers);
   }
 
   gst_query_set_nth_allocation_pool (query, 0, pool, size, min_buffers,
       max_buffers);
 
-  if (pool)
-    gst_object_unref (pool);
-
+  gst_object_unref (pool);
 
   return TRUE;
 
+failed_to_parse_caps:
+  GST_ERROR_OBJECT (decoder, "failed to set buffer pool config");
+  return FALSE;
+
 failed_to_create_pool:
   GST_ERROR_OBJECT (decoder, "failed to set buffer pool config");
-  if (pool)
-    gst_object_unref (pool);
+  gst_object_unref (pool);
   return FALSE;
 
 error_set_config:
   GST_ERROR_OBJECT (decoder, "failed to set buffer pool config");
-  if (pool)
-    gst_object_unref (pool);
+  gst_object_unref (pool);
   return FALSE;
 }
 
@@ -1873,9 +2091,8 @@
 {
   GstMsdkDec *thiz = GST_MSDKDEC (decoder);
   GstFlowReturn flow;
-  GstBuffer *buffer;
   MsdkDecTask *task;
-  MsdkSurface *surface = NULL;
+  GstMsdkSurface *surface = NULL;
   mfxFrameSurface1 *out_surface;
   mfxSession session;
   mfxStatus status;
@@ -1895,10 +2112,7 @@
     }
 
     if (!surface) {
-      flow = allocate_output_buffer (thiz, &buffer);
-      if (flow != GST_FLOW_OK)
-        return flow;
-      surface = get_surface (thiz, buffer);
+      surface = allocate_output_surface (thiz);
       if (!surface)
         return GST_FLOW_ERROR;
     }
@@ -2185,8 +2399,6 @@
           "Depth of asynchronous pipeline",
           1, 20, PROP_ASYNC_DEPTH_DEFAULT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
 }
 
 static void
@@ -2201,9 +2413,13 @@
   thiz->force_reset_on_res_change = TRUE;
   thiz->report_error = FALSE;
   thiz->sfc = FALSE;
-  thiz->ds_has_no_msdk_allocator = FALSE;
+  thiz->ds_has_known_allocator = TRUE;
+#ifndef _WIN32
+  thiz->modifier = DRM_FORMAT_MOD_INVALID;
+#endif
   thiz->adapter = gst_adapter_new ();
   thiz->input_state = NULL;
+  thiz->output_state = NULL;
   thiz->pool = NULL;
   thiz->context = NULL;
 }

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkdec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkdec.h Changed

@@ -38,6 +38,7 @@
 #include "gstmsdkcontext.h"
 #include "msdk-enums.h"
 #include "gstmsdkdecproputil.h"
+#include "gstmsdkcaps.h"
 
 G_BEGIN_DECLS
 
@@ -60,23 +61,28 @@
 typedef struct _GstMsdkDec GstMsdkDec;
 typedef struct _GstMsdkDecClass GstMsdkDecClass;
 typedef struct _MsdkDecTask MsdkDecTask;
+typedef struct _MsdkDecCData MsdkDecCData;
 
 struct _GstMsdkDec
 {
   GstVideoDecoder element;
 
-  /* input description */
+  /* input/output description */
   GstVideoCodecState *input_state;
+  GstVideoCodecState *output_state;
   /* aligned msdk pool info */
   GstBufferPool *pool;
+  GstBufferPool *alloc_pool;
+  GstBufferPool *other_pool;
   /* downstream pool info based on allocation query */
   GstVideoInfo non_msdk_pool_info;
   mfxFrameAllocResponse alloc_resp;
-  gboolean use_video_memory;
   gboolean use_dmabuf;
+  gboolean do_copy;
   gboolean initialized;
   gboolean sfc;
-  gboolean ds_has_no_msdk_allocator;
+  gboolean ds_has_known_allocator;
+  guint64 modifier;
 
   /* for packetization */
   GstAdapter *adapter;
@@ -131,6 +137,12 @@
   gboolean (*postinit_decoder) (GstMsdkDec * decoder);
 };
 
+struct _MsdkDecCData
+{
+  GstCaps *sink_caps;
+  GstCaps *src_caps;
+};
+
 GType gst_msdkdec_get_type (void);
 
 void

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkenc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkenc.c Changed

@@ -45,13 +45,13 @@
 #include <stdlib.h>
 
 #include "gstmsdkenc.h"
-#include "gstmsdkbufferpool.h"
-#include "gstmsdkvideomemory.h"
-#include "gstmsdksystemmemory.h"
 #include "gstmsdkcontextutil.h"
+#include "gstmsdkallocator.h"
 #include "mfxjpeg.h"
+#include "gstmsdkcaps.h"
 
 #ifndef _WIN32
+#include <libdrm/drm_fourcc.h>
 #include "gstmsdkallocator_libva.h"
 #include <gst/va/gstvaallocator.h>
 #else
@@ -80,36 +80,18 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkenc_debug);
 #define GST_CAT_DEFAULT gst_msdkenc_debug
 
-#ifdef _WIN32
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR
-        ("{ NV12, I420, YV12, YUY2, UYVY, BGRA }", "NV12") "; "
-        GST_MSDK_CAPS_MAKE_WITH_D3D11_FEATURE ("NV12"))
-    );
-#else
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR
-        ("{ NV12, I420, YV12, YUY2, UYVY, BGRA }", "NV12") "; "
-        GST_MSDK_CAPS_MAKE_WITH_VA_FEATURE ("NV12"))
-    );
-#endif
-
 #define PROP_HARDWARE_DEFAULT            TRUE
 #define PROP_ASYNC_DEPTH_DEFAULT         4
 #define PROP_TARGET_USAGE_DEFAULT        (MFX_TARGETUSAGE_BALANCED)
-#define PROP_RATE_CONTROL_DEFAULT        (MFX_RATECONTROL_CBR)
+#define PROP_RATE_CONTROL_DEFAULT        (MFX_RATECONTROL_VBR)
 #define PROP_BITRATE_DEFAULT             (2 * 1024)
 #define PROP_QPI_DEFAULT                 0
 #define PROP_QPP_DEFAULT                 0
 #define PROP_QPB_DEFAULT                 0
-#define PROP_GOP_SIZE_DEFAULT            256
+#define PROP_GOP_SIZE_DEFAULT            0
 #define PROP_REF_FRAMES_DEFAULT          0
 #define PROP_I_FRAMES_DEFAULT            0
-#define PROP_B_FRAMES_DEFAULT            0
+#define PROP_B_FRAMES_DEFAULT            -1
 #define PROP_NUM_SLICES_DEFAULT          0
 #define PROP_AVBR_ACCURACY_DEFAULT       0
 #define PROP_AVBR_CONVERGENCE_DEFAULT    0
@@ -120,8 +102,8 @@
 #define PROP_MAX_FRAME_SIZE_P_DEFAULT    0
 #define PROP_MBBRC_DEFAULT               MFX_CODINGOPTION_OFF
 #define PROP_LOWDELAY_BRC_DEFAULT        MFX_CODINGOPTION_OFF
-#define PROP_ADAPTIVE_I_DEFAULT          MFX_CODINGOPTION_OFF
-#define PROP_ADAPTIVE_B_DEFAULT          MFX_CODINGOPTION_OFF
+#define PROP_ADAPTIVE_I_DEFAULT          MFX_CODINGOPTION_UNKNOWN
+#define PROP_ADAPTIVE_B_DEFAULT          MFX_CODINGOPTION_UNKNOWN
 
 /* External coding properties */
 #define EC_PROPS_STRUCT_NAME             "props"
@@ -513,13 +495,11 @@
 gst_msdkenc_init_encoder (GstMsdkEnc * thiz)
 {
   GstMsdkEncClass *klass = GST_MSDKENC_GET_CLASS (thiz);
-  GstVideoInfo *info;
+  GstVideoInfo info;
   mfxSession session;
   mfxStatus status;
-  mfxFrameAllocRequest request2;
+  mfxFrameAllocRequest request;
   guint i;
-  gboolean need_vpp = TRUE;
-  GstVideoFormat encoder_input_fmt;
   mfxExtVideoSignalInfo ext_vsi;
 
   if (thiz->initialized) {
@@ -536,134 +516,29 @@
     GST_DEBUG_OBJECT (thiz, "Have no input state yet");
     return FALSE;
   }
-  info = &thiz->input_state->info;
+
+  if (!gst_msdkcaps_video_info_from_caps (thiz->input_state->caps, &info,
+          &thiz->modifier)) {
+    GST_WARNING_OBJECT (thiz, "Failed to get video info from input caps");
+    return FALSE;
+  }
 
   GST_OBJECT_LOCK (thiz);
   session = gst_msdk_context_get_session (thiz->context);
   thiz->codename = msdk_get_platform_codename (session);
 
-  thiz->has_vpp = FALSE;
   if (thiz->use_video_memory)
     gst_msdk_set_frame_allocator (thiz->context);
 
-  encoder_input_fmt = GST_VIDEO_INFO_FORMAT (info);
-  need_vpp = klass->need_conversion (thiz, info, &encoder_input_fmt);
-
-  if (need_vpp) {
-    switch (GST_VIDEO_INFO_FORMAT (info)) {
-      case GST_VIDEO_FORMAT_YV12:
-      case GST_VIDEO_FORMAT_I420:
-        thiz->vpp_param.vpp.In.FourCC = MFX_FOURCC_YV12;
-        thiz->vpp_param.vpp.In.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-        break;
-      case GST_VIDEO_FORMAT_YUY2:
-        thiz->vpp_param.vpp.In.FourCC = MFX_FOURCC_YUY2;
-        thiz->vpp_param.vpp.In.ChromaFormat = MFX_CHROMAFORMAT_YUV422;
-        break;
-      case GST_VIDEO_FORMAT_UYVY:
-        thiz->vpp_param.vpp.In.FourCC = MFX_FOURCC_UYVY;
-        thiz->vpp_param.vpp.In.ChromaFormat = MFX_CHROMAFORMAT_YUV422;
-        break;
-      case GST_VIDEO_FORMAT_BGRA:
-        thiz->vpp_param.vpp.In.FourCC = MFX_FOURCC_RGB4;
-        thiz->vpp_param.vpp.In.ChromaFormat = MFX_CHROMAFORMAT_YUV444;
-        break;
-      default:
-        g_assert_not_reached ();
-        break;
-    }
-
-    if (thiz->use_video_memory)
-      thiz->vpp_param.IOPattern =
-          MFX_IOPATTERN_IN_VIDEO_MEMORY | MFX_IOPATTERN_OUT_VIDEO_MEMORY;
-    else
-      thiz->vpp_param.IOPattern =
-          MFX_IOPATTERN_IN_SYSTEM_MEMORY | MFX_IOPATTERN_OUT_SYSTEM_MEMORY;
-
-    thiz->vpp_param.vpp.In.Width = GST_ROUND_UP_16 (info->width);
-    thiz->vpp_param.vpp.In.Height = GST_ROUND_UP_32 (info->height);
-    thiz->vpp_param.vpp.In.CropW = info->width;
-    thiz->vpp_param.vpp.In.CropH = info->height;
-    thiz->vpp_param.vpp.In.FrameRateExtN = info->fps_n;
-    thiz->vpp_param.vpp.In.FrameRateExtD = info->fps_d;
-    thiz->vpp_param.vpp.In.AspectRatioW = info->par_n;
-    thiz->vpp_param.vpp.In.AspectRatioH = info->par_d;
-    thiz->vpp_param.vpp.In.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
-
-    /* work-around to avoid zero fps in msdk structure */
-    if (0 == thiz->vpp_param.vpp.In.FrameRateExtN)
-      thiz->vpp_param.vpp.In.FrameRateExtN = 30;
-
-    thiz->vpp_param.vpp.Out = thiz->vpp_param.vpp.In;
-
-    switch (encoder_input_fmt) {
-      case GST_VIDEO_FORMAT_P010_10LE:
-        thiz->vpp_param.vpp.Out.FourCC = MFX_FOURCC_P010;
-        thiz->vpp_param.vpp.Out.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-        break;
-
-      case GST_VIDEO_FORMAT_YUY2:
-        thiz->vpp_param.vpp.Out.FourCC = MFX_FOURCC_YUY2;
-        thiz->vpp_param.vpp.Out.ChromaFormat = MFX_CHROMAFORMAT_YUV422;
-        break;
-
-      default:
-        thiz->vpp_param.vpp.Out.FourCC = MFX_FOURCC_NV12;
-        thiz->vpp_param.vpp.Out.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-        break;
-    }
-
-    /* validate parameters and allow MFX to make adjustments */
-    status = MFXVideoVPP_Query (session, &thiz->vpp_param, &thiz->vpp_param);
-    if (status < MFX_ERR_NONE) {
-      GST_ERROR_OBJECT (thiz, "Video VPP Query failed (%s)",
-          msdk_status_to_string (status));
-      goto failed;
-    } else if (status > MFX_ERR_NONE) {
-      GST_WARNING_OBJECT (thiz, "Video VPP Query returned: %s",
-          msdk_status_to_string (status));
-    }
-
-    status = MFXVideoVPP_QueryIOSurf (session, &thiz->vpp_param, request);
-    if (status < MFX_ERR_NONE) {
-      GST_ERROR_OBJECT (thiz, "VPP Query IO surfaces failed (%s)",
-          msdk_status_to_string (status));
-      goto failed;
-    } else if (status > MFX_ERR_NONE) {
-      GST_WARNING_OBJECT (thiz, "VPP Query IO surfaces returned: %s",
-          msdk_status_to_string (status));
-    }
-
-    if (thiz->use_video_memory)
-      request0.NumFrameSuggested +=
-          gst_msdk_context_get_shared_async_depth (thiz->context);
-    thiz->num_vpp_surfaces = request0.NumFrameSuggested;
-
-    status = MFXVideoVPP_Init (session, &thiz->vpp_param);
-    if (status < MFX_ERR_NONE) {
-      GST_ERROR_OBJECT (thiz, "Init failed (%s)",
-          msdk_status_to_string (status));
-    } else if (status > MFX_ERR_NONE) {
-      GST_WARNING_OBJECT (thiz, "Init returned: %s",
-          msdk_status_to_string (status));
-    }
-
-    status = MFXVideoVPP_GetVideoParam (session, &thiz->vpp_param);
-    if (status < MFX_ERR_NONE) {
-      mfxStatus status1;
-      GST_ERROR_OBJECT (thiz, "Get VPP Parameters failed (%s)",
-          msdk_status_to_string (status));
-      status1 = MFXVideoVPP_Close (session);
-      if (status1 != MFX_ERR_NONE && status1 != MFX_ERR_NOT_INITIALIZED)
-        GST_WARNING_OBJECT (thiz, "VPP close failed (%s)",
-            msdk_status_to_string (status1));
-    } else if (status > MFX_ERR_NONE) {
-      GST_WARNING_OBJECT (thiz, "Get VPP Parameters returned: %s",
-          msdk_status_to_string (status));
-    }
-
-    thiz->has_vpp = TRUE;
+#if (MFX_VERSION < 2000)
+  /* check the format for MSDK path */
+  if (!klass->is_format_supported (thiz, GST_VIDEO_INFO_FORMAT (&info))) {
+    GST_ERROR_OBJECT (thiz,
+        "internal vpp is no longer supported, "
+        "please use msdkvpp plugin to do conversion first");
+    goto failed;
   }
+#endif
 
   thiz->param.AsyncDepth = thiz->async_depth;
   if (thiz->use_video_memory)
@@ -679,18 +554,27 @@
   thiz->param.mfx.NumRefFrame = thiz->ref_frames;
   thiz->param.mfx.EncodedOrder = 0;     /* Take input frames in display order */
 
-  thiz->param.mfx.FrameInfo.Width = GST_ROUND_UP_16 (info->width);
-  thiz->param.mfx.FrameInfo.Height = GST_ROUND_UP_32 (info->height);
-  thiz->param.mfx.FrameInfo.CropW = info->width;
-  thiz->param.mfx.FrameInfo.CropH = info->height;
-  thiz->param.mfx.FrameInfo.FrameRateExtN = info->fps_n;
-  thiz->param.mfx.FrameInfo.FrameRateExtD = info->fps_d;
-  thiz->param.mfx.FrameInfo.AspectRatioW = info->par_n;
-  thiz->param.mfx.FrameInfo.AspectRatioH = info->par_d;
+  thiz->param.mfx.FrameInfo.Width = GST_ROUND_UP_16 (info.width);
+  thiz->param.mfx.FrameInfo.Height = GST_ROUND_UP_32 (info.height);
+  thiz->param.mfx.FrameInfo.CropW = info.width;
+  thiz->param.mfx.FrameInfo.CropH = info.height;
+  thiz->param.mfx.FrameInfo.FrameRateExtN = info.fps_n;
+  thiz->param.mfx.FrameInfo.FrameRateExtD = info.fps_d;
+  thiz->param.mfx.FrameInfo.AspectRatioW = info.par_n;
+  thiz->param.mfx.FrameInfo.AspectRatioH = info.par_d;
   thiz->param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
   thiz->param.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
 
-  switch (encoder_input_fmt) {
+  /* work-around to avoid zero fps in msdk structure */
+  if (0 == thiz->param.mfx.FrameInfo.FrameRateExtN)
+    thiz->param.mfx.FrameInfo.FrameRateExtN = 30;
+
+  thiz->frame_duration =
+      gst_util_uint64_scale (GST_SECOND,
+      thiz->param.mfx.FrameInfo.FrameRateExtD,
+      thiz->param.mfx.FrameInfo.FrameRateExtN);
+
+  switch (GST_VIDEO_INFO_FORMAT (&info)) {
     case GST_VIDEO_FORMAT_P010_10LE:
       thiz->param.mfx.FrameInfo.FourCC = MFX_FOURCC_P010;
       thiz->param.mfx.FrameInfo.BitDepthLuma = 10;
@@ -770,18 +654,18 @@
    */
   if (thiz->param.mfx.CodecId != MFX_CODEC_JPEG &&
       thiz->param.mfx.CodecId != MFX_CODEC_VP9 &&
-      (info->colorimetry.primaries || info->colorimetry.transfer
-          || info->colorimetry.matrix)) {
+      (info.colorimetry.primaries || info.colorimetry.transfer
+          || info.colorimetry.matrix)) {
     memset (&ext_vsi, 0, sizeof (ext_vsi));
     ext_vsi.Header.BufferId = MFX_EXTBUFF_VIDEO_SIGNAL_INFO;
     ext_vsi.Header.BufferSz = sizeof (ext_vsi);
     ext_vsi.ColourDescriptionPresent = 1;
     ext_vsi.ColourPrimaries =
-        gst_video_color_primaries_to_iso (info->colorimetry.primaries);
+        gst_video_color_primaries_to_iso (info.colorimetry.primaries);
     ext_vsi.TransferCharacteristics =
-        gst_video_transfer_function_to_iso (info->colorimetry.transfer);
+        gst_video_transfer_function_to_iso (info.colorimetry.transfer);
     ext_vsi.MatrixCoefficients =
-        gst_video_color_matrix_to_iso (info->colorimetry.matrix);
+        gst_video_color_matrix_to_iso (info.colorimetry.matrix);
     gst_msdkenc_add_extra_param (thiz, (mfxExtBuffer *) & ext_vsi);
   }
 
@@ -801,7 +685,7 @@
         msdk_status_to_string (status));
   }
 
-  status = MFXVideoENCODE_QueryIOSurf (session, &thiz->param, request);
+  status = MFXVideoENCODE_QueryIOSurf (session, &thiz->param, &request);
   if (status < MFX_ERR_NONE) {
     GST_ERROR_OBJECT (thiz, "Encode Query IO surfaces failed (%s)",
         msdk_status_to_string (status));
@@ -811,27 +695,17 @@
         msdk_status_to_string (status));
   }
 
-  request0.NumFrameSuggested += thiz->num_extra_frames;
-
-  if (thiz->has_vpp)
-    request0.NumFrameSuggested += thiz->num_vpp_surfaces + 1 - 4;
+  request.NumFrameSuggested += thiz->num_extra_frames;
 
-  /* Maximum of VPP output and encoder input, if using VPP */
-  if (thiz->has_vpp)
-    request0.NumFrameSuggested =
-        MAX (request0.NumFrameSuggested, request1.NumFrameSuggested);
-  if (request0.NumFrameSuggested < thiz->param.AsyncDepth) {
+  if (request.NumFrameSuggested < thiz->param.AsyncDepth) {
     GST_ERROR_OBJECT (thiz, "Required %d surfaces (%d suggested), async %d",
-        request0.NumFrameMin, request0.NumFrameSuggested,
-        thiz->param.AsyncDepth);
+        request.NumFrameMin, request.NumFrameSuggested, thiz->param.AsyncDepth);
     goto failed;
   }
 
-  /* This is VPP output (if any) and encoder input */
-  thiz->num_surfaces = request0.NumFrameSuggested;
-
   GST_DEBUG_OBJECT (thiz, "Required %d surfaces (%d suggested), allocated %d",
-      request0.NumFrameMin, request0.NumFrameSuggested, thiz->num_surfaces);
+      request.NumFrameMin, request.NumFrameSuggested,
+      request.NumFrameSuggested);
 
   status = MFXVideoENCODE_Init (session, &thiz->param);
   if (status < MFX_ERR_NONE) {
@@ -912,16 +786,6 @@
   g_free (thiz->tasks);
   thiz->tasks = NULL;
 
-  /* Close VPP before freeing the surfaces. They are shared between encoder
-   * and VPP */
-  if (thiz->has_vpp) {
-    status = MFXVideoVPP_Close (gst_msdk_context_get_session (thiz->context));
-    if (status != MFX_ERR_NONE && status != MFX_ERR_NOT_INITIALIZED) {
-      GST_WARNING_OBJECT (thiz, "VPP close failed (%s)",
-          msdk_status_to_string (status));
-    }
-  }
-
   memset (&thiz->param, 0, sizeof (thiz->param));
   thiz->num_extra_params = 0;
   thiz->initialized = FALSE;
@@ -962,8 +826,6 @@
 {
   if (fdata->frame_surface)
     gst_msdkenc_free_surface (fdata->frame_surface);
-  if (thiz->has_vpp)
-    gst_msdkenc_free_surface (fdata->converted_surface);
 
   gst_video_codec_frame_unref (fdata->frame);
   g_slice_free (FrameData, fdata);
@@ -1304,14 +1166,15 @@
 
 #ifndef _WIN32
 static GstBufferPool *
-gst_msdk_create_va_pool (GstMsdkEnc * thiz, GstCaps * caps, guint num_buffers)
+gst_msdk_create_va_pool (GstMsdkEnc * thiz, GstVideoInfo * info,
+    guint num_buffers)
 {
   GstBufferPool *pool = NULL;
   GstAllocator *allocator;
   GArray *formats = NULL;
   GstAllocationParams alloc_params = { 0, 31, 0, 0 };
   GstVaDisplay *display = NULL;
-  GstVideoInfo info = thiz->input_state->info;
+  GstCaps *aligned_caps = NULL;
 
   display = (GstVaDisplay *) gst_msdk_context_get_va_display (thiz->context);
 
@@ -1319,10 +1182,12 @@
     allocator = gst_va_dmabuf_allocator_new (display);
   } else {
     formats = g_array_new (FALSE, FALSE, sizeof (GstVideoFormat));
-    g_array_append_val (formats, GST_VIDEO_INFO_FORMAT (&info));
+    g_array_append_val (formats, GST_VIDEO_INFO_FORMAT (info));
     allocator = gst_va_allocator_new (display, formats);
   }
 
+  gst_object_unref (display);
+
   if (!allocator) {
     GST_ERROR_OBJECT (thiz, "failed to create allocator");
     if (formats)
@@ -1330,12 +1195,19 @@
     return NULL;
   }
 
-  pool =
-      gst_va_pool_new_with_config (caps, GST_VIDEO_INFO_SIZE (&info),
-      num_buffers, 0, VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC, GST_VA_FEATURE_AUTO,
+  if (thiz->use_dmabuf && thiz->modifier != DRM_FORMAT_MOD_INVALID) {
+    aligned_caps = gst_msdkcaps_video_info_to_drm_caps (info, thiz->modifier);
+    gst_caps_set_features (aligned_caps, 0,
+        gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_DMABUF, NULL));
+  } else
+    aligned_caps = gst_video_info_to_caps (info);
+
+  pool = gst_va_pool_new_with_config (aligned_caps, num_buffers, 0,
+      VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC, GST_VA_FEATURE_AUTO,
       allocator, &alloc_params);
 
   gst_object_unref (allocator);
+  gst_caps_unref (aligned_caps);
 
   GST_LOG_OBJECT (thiz, "Creating va pool");
   return pool;
@@ -1406,7 +1278,7 @@
   GstVideoInfo info;
   GstVideoAlignment align;
 
-  if (!gst_video_info_from_caps (&info, caps)) {
+  if (!gst_msdkcaps_video_info_from_caps (caps, &info, NULL)) {
     GST_INFO_OBJECT (thiz, "failed to get video info");
     return FALSE;
   }
@@ -1414,7 +1286,7 @@
   gst_msdk_set_video_alignment (&info, 0, 0, &align);
   gst_video_info_align (&info, &align);
 #ifndef _WIN32
-  pool = gst_msdk_create_va_pool (thiz, caps, num_buffers);
+  pool = gst_msdk_create_va_pool (thiz, &info, num_buffers);
 #else
   pool = gst_msdk_create_d3d11_pool (thiz, num_buffers);
 #endif
@@ -1428,13 +1300,6 @@
       GST_VIDEO_INFO_SIZE (&info), num_buffers, 0);
   gst_buffer_pool_config_set_video_alignment (config, &align);
 
-  if (thiz->use_video_memory) {
-    gst_buffer_pool_config_add_option (config,
-        GST_BUFFER_POOL_OPTION_MSDK_USE_VIDEO_MEMORY);
-    if (thiz->use_dmabuf)
-      gst_buffer_pool_config_add_option (config,
-          GST_BUFFER_POOL_OPTION_MSDK_USE_DMABUF);
-  }
   if (!gst_buffer_pool_set_config (pool, config))
     goto error_pool_config;
 
@@ -1456,24 +1321,6 @@
   }
 }
 
-/* Fixme: Common routine used by all msdk elements, should be
- * moved to a common util file */
-static gboolean
-_gst_caps_has_feature (const GstCaps * caps, const gchar * feature)
-{
-  guint i;
-
-  for (i = 0; i < gst_caps_get_size (caps); i++) {
-    GstCapsFeatures *const features = gst_caps_get_features (caps, i);
-    /* Skip ANY features, we need an exact match for correct evaluation */
-    if (gst_caps_features_is_any (features))
-      continue;
-    if (gst_caps_features_contains (features, feature))
-      return TRUE;
-  }
-  return FALSE;
-}
-
 static gboolean
 sinkpad_can_dmabuf (GstMsdkEnc * thiz)
 {
@@ -1491,7 +1338,7 @@
       || allowed_caps == caps)
     goto done;
 
-  if (_gst_caps_has_feature (allowed_caps, GST_CAPS_FEATURE_MEMORY_DMABUF))
+  if (gst_msdkcaps_has_feature (allowed_caps, GST_CAPS_FEATURE_MEMORY_DMABUF))
     ret = TRUE;
 
 done:
@@ -1566,13 +1413,16 @@
    * based pipeline usage. Ideally we should have dmabuf support even with
    * raw-caps negotiation, but we don't have dmabuf-import support in msdk
    * plugin yet */
+#ifndef _WIN32
   /* If VA is set, we do not fallback to DMA. */
   if (!thiz->use_va && sinkpad_can_dmabuf (thiz)) {
     thiz->input_state->caps = gst_caps_make_writable (thiz->input_state->caps);
     gst_caps_set_features (thiz->input_state->caps, 0,
         gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_DMABUF, NULL));
     thiz->use_dmabuf = TRUE;
+    thiz->modifier = get_msdkcaps_get_modifier (state->caps);
   }
+#endif
 
   if (!gst_msdkenc_init_encoder (thiz))
     return FALSE;
@@ -1591,86 +1441,9 @@
 
   gst_msdkenc_set_latency (thiz);
 
-  /* Create another bufferpool if VPP requires */
-  if (thiz->has_vpp) {
-    GstVideoInfo *info = &thiz->input_state->info;
-    GstVideoInfo out_info;
-    GstVideoFormat out_fmt;
-    GstCaps *caps;
-    GstBufferPool *pool = NULL;
-
-    gst_video_info_init (&out_info);
-    out_fmt =
-        gst_msdk_get_video_format_from_mfx_fourcc (thiz->vpp_param.vpp.
-        Out.FourCC);
-    gst_video_info_set_format (&out_info, out_fmt, info->width, info->height);
-    caps = gst_video_info_to_caps (&out_info);
-
-    /* If there's an existing pool try to reuse it when is compatible */
-    if (thiz->msdk_converted_pool) {
-      GstStructure *config;
-      GstCaps *pool_caps;
-      gboolean is_pool_compatible = FALSE;
-
-      config = gst_buffer_pool_get_config (thiz->msdk_converted_pool);
-      gst_buffer_pool_config_get_params (config, &pool_caps, NULL, NULL, NULL);
-      if (caps && pool_caps)
-        is_pool_compatible = gst_caps_is_equal (caps, pool_caps);
-      gst_structure_free (config);
-
-      /* If caps are the same then we are done */
-      if (is_pool_compatible) {
-        gst_caps_unref (caps);
-        goto done;
-      }
-      /* Release current pool because we are going to create a new one */
-      gst_clear_object (&thiz->msdk_converted_pool);
-    }
-
-    /* Otherwise create a new pool */
-    pool =
-        gst_msdkenc_create_buffer_pool (thiz, caps, thiz->num_surfaces, FALSE);
-
-    thiz->msdk_converted_pool = pool;
-    gst_caps_unref (caps);
-  }
-
-done:
   return TRUE;
 }
 
-/* This function will be removed later */
-static GstMsdkSurface *
-gst_msdkenc_get_surface_from_pool_old (GstMsdkEnc * thiz, GstBufferPool * pool,
-    GstBufferPoolAcquireParams * params)
-{
-  GstBuffer *new_buffer;
-  GstMsdkSurface *msdk_surface = NULL;
-
-  if (!gst_buffer_pool_is_active (pool) &&
-      !gst_buffer_pool_set_active (pool, TRUE)) {
-    GST_ERROR_OBJECT (pool, "failed to activate buffer pool");
-    return NULL;
-  }
-
-  if (gst_buffer_pool_acquire_buffer (pool, &new_buffer, params) != GST_FLOW_OK) {
-    GST_ERROR_OBJECT (pool, "failed to acquire a buffer from pool");
-    return NULL;
-  }
-#ifndef _WIN32
-  msdk_surface = gst_msdk_import_to_msdk_surface (new_buffer, thiz->context,
-      &thiz->aligned_info, 0);
-#else
-  msdk_surface =
-      gst_msdk_import_sys_mem_to_msdk_surface (new_buffer, thiz->aligned_info);
-#endif
-
-  if (msdk_surface)
-    msdk_surface->buf = new_buffer;
-
-  return msdk_surface;
-}
-
 static GstMsdkSurface *
 gst_msdkenc_get_surface_from_pool (GstMsdkEnc * thiz,
     GstVideoCodecFrame * frame, GstBuffer * buf)
@@ -1745,7 +1518,7 @@
   } else {
     msdk_surface =
         gst_msdk_import_sys_mem_to_msdk_surface (upload_buf,
-        thiz->aligned_info);
+        &thiz->aligned_info);
   }
 
   gst_buffer_replace (&frame->input_buffer, upload_buf);
@@ -1762,14 +1535,9 @@
   GstBuffer *inbuf;
 
   inbuf = frame->input_buffer;
-  if (gst_msdk_is_msdk_buffer (inbuf)) {
-    msdk_surface = g_slice_new0 (GstMsdkSurface);
-    msdk_surface->surface = gst_msdk_get_surface_from_buffer (inbuf);
-    return msdk_surface;
-  }
 
   msdk_surface = gst_msdk_import_to_msdk_surface (inbuf, thiz->context,
-      &thiz->input_state->info, GST_MAP_READ);
+      &thiz->aligned_info, GST_MAP_READ);
   if (msdk_surface) {
     msdk_surface->buf = gst_buffer_ref (inbuf);
     return msdk_surface;
@@ -1804,78 +1572,29 @@
   if (G_UNLIKELY (thiz->context == NULL))
     goto not_inited;
 
-  if (thiz->has_vpp) {
-    GstMsdkSurface *vpp_surface;
-    GstVideoFrame vframe;
-    mfxSession session;
-    mfxSyncPoint vpp_sync_point = NULL;
-    mfxStatus status;
-
-    vpp_surface = gst_msdkenc_get_surface_from_frame (thiz, frame);
-    if (!vpp_surface)
-      goto invalid_surface;
-    surface =
-        gst_msdkenc_get_surface_from_pool_old (thiz, thiz->msdk_converted_pool,
-        NULL);
-    if (!surface)
-      goto invalid_surface;
-
-    if (!gst_video_frame_map (&vframe, info, frame->input_buffer, GST_MAP_READ))
-      goto invalid_frame;
-
-    if (frame->pts != GST_CLOCK_TIME_NONE) {
-      vpp_surface->surface->Data.TimeStamp =
-          gst_util_uint64_scale (frame->pts, 90000, GST_SECOND);
-      surface->surface->Data.TimeStamp =
-          gst_util_uint64_scale (frame->pts, 90000, GST_SECOND);
-    } else {
-      vpp_surface->surface->Data.TimeStamp = MFX_TIMESTAMP_UNKNOWN;
-      surface->surface->Data.TimeStamp = MFX_TIMESTAMP_UNKNOWN;
-    }
+  surface = gst_msdkenc_get_surface_from_frame (thiz, frame);
+  if (!surface)
+    goto invalid_surface;
 
-    session = gst_msdk_context_get_session (thiz->context);
-    for (;;) {
-      status =
-          MFXVideoVPP_RunFrameVPPAsync (session, vpp_surface->surface,
-          surface->surface, NULL, &vpp_sync_point);
-      if (status != MFX_WRN_DEVICE_BUSY)
-        break;
-      /* If device is busy, wait 1ms and retry, as per MSDK's recomendation */
-      g_usleep (1000);
-    };
+  fdata = gst_msdkenc_queue_frame (thiz, frame, info);
+  if (!fdata)
+    goto invalid_frame;
 
-    gst_video_frame_unmap (&vframe);
+  fdata->frame_surface = surface;
 
-    if (status != MFX_ERR_NONE && status != MFX_ERR_MORE_DATA) {
-      GST_ELEMENT_ERROR (thiz, STREAM, ENCODE, ("Converting frame failed."),
-          ("MSDK VPP error (%s)", msdk_status_to_string (status)));
-      gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (thiz), frame);
-      return GST_FLOW_ERROR;
-    }
-
-    fdata = g_slice_new0 (FrameData);
-    fdata->frame = gst_video_codec_frame_ref (frame);
-    fdata->frame_surface = vpp_surface;
-    fdata->converted_surface = surface;
+  /* It is possible to have input frame without any framerate/pts info,
+   * we need to set the correct pts here. */
+  if (frame->presentation_frame_number == 0)
+    thiz->start_pts = frame->pts;
 
-    thiz->pending_frames = g_list_prepend (thiz->pending_frames, fdata);
+  if (frame->pts != GST_CLOCK_TIME_NONE) {
+    frame->pts = thiz->start_pts +
+        frame->presentation_frame_number * thiz->frame_duration;
+    frame->duration = thiz->frame_duration;
+    surface->surface->Data.TimeStamp =
+        gst_util_uint64_scale (frame->pts, 90000, GST_SECOND);
   } else {
-    surface = gst_msdkenc_get_surface_from_frame (thiz, frame);
-    if (!surface)
-      goto invalid_surface;
-
-    fdata = gst_msdkenc_queue_frame (thiz, frame, info);
-    if (!fdata)
-      goto invalid_frame;
-
-    fdata->frame_surface = surface;
-
-    if (frame->pts != GST_CLOCK_TIME_NONE) {
-      surface->surface->Data.TimeStamp =
-          gst_util_uint64_scale (frame->pts, 90000, GST_SECOND);
-    } else {
-      surface->surface->Data.TimeStamp = MFX_TIMESTAMP_UNKNOWN;
-    }
+    surface->surface->Data.TimeStamp = MFX_TIMESTAMP_UNKNOWN;
   }
 
   return gst_msdkenc_encode_frame (thiz, surface->surface, frame);
@@ -2043,14 +1762,14 @@
     return FALSE;
   }
 
-  if (!gst_video_info_from_caps (&info, caps)) {
+  if (!gst_msdkcaps_video_info_from_caps (caps, &info, NULL)) {
     GST_INFO_OBJECT (encoder, "failed to get video info");
     return FALSE;
   }
 
   /* if upstream allocation query supports dmabuf-capsfeatures,
    *  we do allocate dmabuf backed memory */
-  if (_gst_caps_has_feature (caps, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+  if (gst_msdkcaps_has_feature (caps, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
     GST_INFO_OBJECT (thiz, "MSDK VPP srcpad uses DMABuf memory");
     thiz->use_dmabuf = TRUE;
   }
@@ -2071,10 +1790,9 @@
     if (gst_buffer_pool_config_get_allocator (config, &allocator, NULL))
       gst_query_add_allocation_param (query, allocator, &params);
     gst_structure_free (config);
+    gst_object_unref (pool);
   }
 
-  gst_object_unref (pool);
-
   return GST_VIDEO_ENCODER_CLASS (parent_class)->propose_allocation (encoder,
       query);
 }
@@ -2225,26 +1943,9 @@
 }
 
 static gboolean
-gst_msdkenc_need_conversion (GstMsdkEnc * encoder, GstVideoInfo * info,
-    GstVideoFormat * out_format)
+gst_msdkenc_is_format_supported (GstMsdkEnc * encoder, GstVideoFormat format)
 {
-  switch (GST_VIDEO_INFO_FORMAT (info)) {
-    case GST_VIDEO_FORMAT_NV12:
-    case GST_VIDEO_FORMAT_P010_10LE:
-    case GST_VIDEO_FORMAT_VUYA:
-#if (MFX_VERSION >= 1027)
-    case GST_VIDEO_FORMAT_Y410:
-    case GST_VIDEO_FORMAT_Y210:
-#endif
-      return FALSE;
-
-    default:
-      if (GST_VIDEO_INFO_COMP_DEPTH (info, 0) == 10)
-        *out_format = GST_VIDEO_FORMAT_P010_10LE;
-      else
-        *out_format = GST_VIDEO_FORMAT_NV12;
-      return TRUE;
-  }
+  return format == GST_VIDEO_FORMAT_NV12;
 }
 
 static gboolean
@@ -2270,7 +1971,7 @@
   element_class = GST_ELEMENT_CLASS (klass);
   gstencoder_class = GST_VIDEO_ENCODER_CLASS (klass);
 
-  klass->need_conversion = gst_msdkenc_need_conversion;
+  klass->is_format_supported = gst_msdkenc_is_format_supported;
   klass->need_reconfig = gst_msdkenc_need_reconfig;
   klass->set_extra_params = gst_msdkenc_set_extra_params;
   klass->qp_max = 51;
@@ -2290,8 +1991,6 @@
       GST_DEBUG_FUNCPTR (gst_msdkenc_propose_allocation);
   gstencoder_class->src_query = GST_DEBUG_FUNCPTR (gst_msdkenc_src_query);
   gstencoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_msdkenc_sink_query);
-
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
 }
 
 static void
@@ -2321,11 +2020,47 @@
   thiz->lowdelay_brc = PROP_LOWDELAY_BRC_DEFAULT;
   thiz->adaptive_i = PROP_ADAPTIVE_I_DEFAULT;
   thiz->adaptive_b = PROP_ADAPTIVE_B_DEFAULT;
+#ifndef _WIN32
+  thiz->modifier = DRM_FORMAT_MOD_INVALID;
+#endif
 
   thiz->ext_coding_props = gst_structure_new (EC_PROPS_STRUCT_NAME,
       EC_PROPS_EXTBRC, G_TYPE_STRING, "off", NULL);
 }
 
+/* *INDENT-OFF* */
+#define UPDATE_PROPERTY                         \
+  if (*old_val == new_val) {                    \
+    return FALSE;                               \
+  }                                             \
+  *old_val = new_val;                                                   \
+  thiz->reconfig = TRUE;                                                \
+  return TRUE;                                                          \
+
+gboolean
+gst_msdkenc_check_update_property_uint (GstMsdkEnc * thiz, guint * old_val,
+    guint new_val)
+{
+  UPDATE_PROPERTY
+}
+
+gboolean
+gst_msdkenc_check_update_property_int (GstMsdkEnc * thiz, gint * old_val,
+    gint new_val)
+{
+  UPDATE_PROPERTY
+}
+
+gboolean
+gst_msdkenc_check_update_property_bool (GstMsdkEnc * thiz, gboolean * old_val,
+    gboolean new_val)
+{
+  UPDATE_PROPERTY
+}
+
+#undef UPDATE_PROPERTY
+/* *INDENT-ON* */
+
 /* gst_msdkenc_set_common_property:
  *
  * This is a helper function to set the common property
@@ -2336,18 +2071,10 @@
     const GValue * value, GParamSpec * pspec)
 {
   GstMsdkEnc *thiz = GST_MSDKENC (object);
-  GstState state;
   gboolean ret = TRUE;
 
   GST_OBJECT_LOCK (thiz);
 
-  state = GST_STATE (thiz);
-  if ((state != GST_STATE_READY && state != GST_STATE_NULL) &&
-      !(pspec->flags & GST_PARAM_MUTABLE_PLAYING)) {
-    ret = FALSE;
-    goto wrong_state;
-  }
-
   switch (prop_id) {
     case GST_MSDKENC_PROP_HARDWARE:
       thiz->hardware = g_value_get_boolean (value);
@@ -2363,23 +2090,32 @@
       break;
     case GST_MSDKENC_PROP_BITRATE:
     {
-      guint bitrate = g_value_get_uint (value);
-      /* Ensure that bitrate changed before triggering a reconfig */
-      if (bitrate != thiz->bitrate) {
-        thiz->bitrate = bitrate;
-        thiz->reconfig = TRUE;
-        GST_DEBUG_OBJECT (thiz, "changed bitrate to %u", bitrate);
+      if (gst_msdkenc_check_update_property_uint (thiz, &thiz->bitrate,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed bitrate to %u", thiz->bitrate);
       }
       break;
     }
     case GST_MSDKENC_PROP_MAX_FRAME_SIZE:
-      thiz->max_frame_size = g_value_get_uint (value);
+      if (gst_msdkenc_check_update_property_uint (thiz, &thiz->max_frame_size,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed max-frame-size to %u",
+            thiz->max_frame_size);
+      }
       break;
     case GST_MSDKENC_PROP_MAX_FRAME_SIZE_I:
-      thiz->max_frame_size_i = g_value_get_uint (value);
+      if (gst_msdkenc_check_update_property_uint (thiz, &thiz->max_frame_size_i,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed max-frame-size-i to %u",
+            thiz->max_frame_size_i);
+      }
       break;
     case GST_MSDKENC_PROP_MAX_FRAME_SIZE_P:
-      thiz->max_frame_size_p = g_value_get_uint (value);
+      if (gst_msdkenc_check_update_property_uint (thiz, &thiz->max_frame_size_p,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed max-frame-size-p to %u",
+            thiz->max_frame_size_p);
+      }
       break;
     case GST_MSDKENC_PROP_MAX_VBV_BITRATE:
       thiz->max_vbv_bitrate = g_value_get_uint (value);
@@ -2394,16 +2130,28 @@
       thiz->lookahead_depth = g_value_get_uint (value);
       break;
     case GST_MSDKENC_PROP_QPI:
-      thiz->qpi = g_value_get_uint (value);
+      if (gst_msdkenc_check_update_property_uint (thiz, &thiz->qpi,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed qpi to %u", thiz->qpi);
+      }
       break;
     case GST_MSDKENC_PROP_QPP:
-      thiz->qpp = g_value_get_uint (value);
+      if (gst_msdkenc_check_update_property_uint (thiz, &thiz->qpp,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed qpp to %u", thiz->qpp);
+      }
       break;
     case GST_MSDKENC_PROP_QPB:
-      thiz->qpb = g_value_get_uint (value);
+      if (gst_msdkenc_check_update_property_uint (thiz, &thiz->qpb,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed qpb to %u", thiz->qpb);
+      }
       break;
     case GST_MSDKENC_PROP_GOP_SIZE:
-      thiz->gop_size = g_value_get_uint (value);
+      if (gst_msdkenc_check_update_property_uint (thiz, &thiz->gop_size,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed gop-size to %u", thiz->gop_size);
+      }
       break;
     case GST_MSDKENC_PROP_REF_FRAMES:
       thiz->ref_frames = g_value_get_uint (value);
@@ -2412,7 +2160,7 @@
       thiz->i_frames = g_value_get_uint (value);
       break;
     case GST_MSDKENC_PROP_B_FRAMES:
-      thiz->b_frames = g_value_get_uint (value);
+      thiz->b_frames = g_value_get_int (value);
       break;
     case GST_MSDKENC_PROP_NUM_SLICES:
       thiz->num_slices = g_value_get_uint (value);
@@ -2445,14 +2193,6 @@
   }
   GST_OBJECT_UNLOCK (thiz);
   return ret;
-
-  /* ERROR */
-wrong_state:
-  {
-    GST_WARNING_OBJECT (thiz, "setting property in wrong state");
-    GST_OBJECT_UNLOCK (thiz);
-    return ret;
-  }
 }
 
 /* gst_msdkenc_get_common_property:
@@ -2524,7 +2264,7 @@
       g_value_set_uint (value, thiz->i_frames);
       break;
     case GST_MSDKENC_PROP_B_FRAMES:
-      g_value_set_uint (value, thiz->b_frames);
+      g_value_set_int (value, thiz->b_frames);
       break;
     case GST_MSDKENC_PROP_NUM_SLICES:
       g_value_set_uint (value, thiz->num_slices);
@@ -2673,9 +2413,9 @@
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
   obj_propertiesGST_MSDKENC_PROP_B_FRAMES =
-      g_param_spec_uint ("b-frames", "B Frames",
+      g_param_spec_int ("b-frames", "B Frames",
       "Number of B frames between I and P frames",
-      0, G_MAXINT, PROP_B_FRAMES_DEFAULT,
+      -1, G_MAXINT, PROP_B_FRAMES_DEFAULT,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
   obj_propertiesGST_MSDKENC_PROP_NUM_SLICES =

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkenc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkenc.h Changed

@@ -37,6 +37,7 @@
 #include "msdk.h"
 #include "msdk-enums.h"
 #include "gstmsdkcontext.h"
+#include "gstmsdkcaps.h"
 
 G_BEGIN_DECLS
 
@@ -55,9 +56,19 @@
 
 #define MAX_EXTRA_PARAMS 8
 
+#define check_update_property(type, obj, old_val, new_val)          \
+  gst_msdkenc_check_update_property_##type (obj, old_val, new_val)
+#define check_update_property_uint(obj, old_val, new_val)           \
+  check_update_property (uint, obj, old_val, new_val)
+#define check_update_property_int(obj, old_val, new_val)            \
+  check_update_property (int, obj, old_val, new_val)
+#define check_update_property_bool(obj, old_val, new_val)           \
+  check_update_property (bool, obj, old_val, new_val)
+
 typedef struct _GstMsdkEnc GstMsdkEnc;
 typedef struct _GstMsdkEncClass GstMsdkEncClass;
 typedef struct _MsdkEncTask MsdkEncTask;
+typedef struct _MsdkEncCData MsdkEncCData;
 
 enum
 {
@@ -105,7 +116,6 @@
   GstMsdkContext *context;
   GstMsdkContext *old_context;
   mfxVideoParam param;
-  guint num_surfaces;
   guint num_tasks;
   MsdkEncTask *tasks;
   guint next_task;
@@ -113,13 +123,6 @@
    * the default value is 0 */
   guint num_extra_frames;
 
-  gboolean has_vpp;
-  mfxVideoParam vpp_param;
-  guint num_vpp_surfaces;
-  /* Input interfaces, output above */
-  mfxFrameAllocResponse vpp_alloc_resp;
-  mfxFrameAllocResponse alloc_resp;
-
   mfxExtBuffer *extra_paramsMAX_EXTRA_PARAMS;
   guint num_extra_params;
 
@@ -139,6 +142,7 @@
   gboolean use_va;
   gboolean use_d3d11;
   gboolean initialized;
+  guint64 modifier;
 
   /* element properties */
   gboolean hardware;
@@ -158,7 +162,7 @@
   guint gop_size;
   guint ref_frames;
   guint i_frames;
-  guint b_frames;
+  gint b_frames;
   guint num_slices;
   gint16 mbbrc;
   gint16 adaptive_i;
@@ -167,6 +171,9 @@
   guint max_frame_size_p;
   gint16 lowdelay_brc;
 
+  GstClockTime start_pts;
+  GstClockTime frame_duration;
+
   GstStructure *ext_coding_props;
 
   gboolean reconfig;
@@ -181,13 +188,7 @@
   gboolean (*set_format) (GstMsdkEnc * encoder);
   gboolean (*configure) (GstMsdkEnc * encoder);
   GstCaps *(*set_src_caps) (GstMsdkEnc * encoder);
-  /* Return TRUE if vpp is required before encoding
-   * @info (in), input video info
-   * @out_format (out), a pointer to the output format of vpp, which is set
-   * when return TRUE
-   */
-  gboolean (*need_conversion) (GstMsdkEnc * encoder, GstVideoInfo * info,
-      GstVideoFormat * out_format);
+  gboolean (*is_format_supported) (GstMsdkEnc * encoder, GstVideoFormat format);
 
   /* Return TRUE if sub class requires a recofnig */
   gboolean (*need_reconfig) (GstMsdkEnc * encoder, GstVideoCodecFrame * frame);
@@ -205,6 +206,12 @@
   mfxBitstream output_bitstream;
 };
 
+struct _MsdkEncCData
+{
+  GstCaps *sink_caps;
+  GstCaps *src_caps;
+};
+
 GType gst_msdkenc_get_type (void);
 
 void gst_msdkenc_add_extra_param (GstMsdkEnc * thiz, mfxExtBuffer * param);
@@ -213,6 +220,18 @@
 gst_msdkenc_install_common_properties (GstMsdkEncClass *encoder_class);
 
 gboolean
+gst_msdkenc_check_update_property_uint (GstMsdkEnc * thiz, guint * old_val,
+                                        guint new_val);
+
+gboolean
+gst_msdkenc_check_update_property_int (GstMsdkEnc * thiz, gint * old_val,
+                                        gint new_val);
+
+gboolean
+gst_msdkenc_check_update_property_bool (GstMsdkEnc * thiz, gboolean * old_val,
+                                        gboolean new_val);
+
+gboolean
 gst_msdkenc_set_common_property (GObject * object, guint prop_id,
                                  const GValue * value, GParamSpec * pspec);
 gboolean

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkh264dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkh264dec.c Changed

@@ -54,25 +54,26 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkh264dec_debug);
 #define GST_CAT_DEFAULT gst_msdkh264dec_debug
 
-#define COMMON_FORMAT "{ NV12, BGRA, BGRx }"
-
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-h264, "
-        "width = (int)  1, MAX , height = (int)  1, MAX , "
-        "stream-format = (string) byte-stream , alignment = (string) au , "
-        "profile = (string) { high, progressive-high, constrained-high, main, baseline, constrained-baseline }")
-    );
-
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR (COMMON_FORMAT, COMMON_FORMAT))
-    );
-
-#define gst_msdkh264dec_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkH264Dec, gst_msdkh264dec, GST_TYPE_MSDKDEC);
+#define GST_MSDKH264DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkH264Dec))
+#define GST_MSDKH264DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkH264DecClass))
+#define GST_IS_MSDKH264DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKH264DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
+
+/* *INDENT-OFF* */
+static const gchar *doc_src_caps_str =
+    GST_VIDEO_CAPS_MAKE ("{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory", "{ NV12 }");
+/* *INDENT-ON* */
+
+static const gchar *doc_sink_caps_str = "video/x-h264";
+
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkh264dec_configure (GstMsdkDec * decoder)
@@ -161,11 +162,14 @@
 }
 
 static void
-gst_msdkh264dec_class_init (GstMsdkH264DecClass * klass)
+gst_msdkh264dec_class_init (gpointer klass, gpointer data)
 {
   GObjectClass *gobject_class;
   GstElementClass *element_class;
   GstMsdkDecClass *decoder_class;
+  MsdkDecCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class = G_OBJECT_CLASS (klass);
   element_class = GST_ELEMENT_CLASS (klass);
@@ -188,12 +192,62 @@
   gst_msdkdec_prop_install_error_report_property (gobject_class);
 #endif
 
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkh264dec_init (GstMsdkH264Dec * thiz)
+gst_msdkh264dec_init (GTypeInstance * instance, gpointer g_class)
 {
+  GstMsdkH264Dec *thiz = GST_MSDKH264DEC (instance);
   thiz->output_order = PROP_OUTPUT_ORDER_DEFAULT;
 }
+
+gboolean
+gst_msdkh264dec_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkDecCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkH264DecClass),
+    .class_init = gst_msdkh264dec_class_init,
+    .instance_size = sizeof (GstMsdkH264Dec),
+    .instance_init = gst_msdkh264dec_init
+  };
+
+  cdata = g_new (MsdkDecCData, 1);
+  cdata->sink_caps = gst_caps_copy (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+  gst_caps_set_simple (cdata->sink_caps,
+      "alignment", G_TYPE_STRING, "au",
+      "stream-format", G_TYPE_STRING, "byte-stream", NULL);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkH264Dec");
+  feature_name = g_strdup ("msdkh264dec");
+
+  type = g_type_register_static (GST_TYPE_MSDKDEC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkh264dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkh264dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkh264enc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkh264enc.c Changed

@@ -58,6 +58,15 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkh264enc_debug);
 #define GST_CAT_DEFAULT gst_msdkh264enc_debug
 
+#define GST_MSDKH264ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkH264Enc))
+#define GST_MSDKH264ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkH264EncClass))
+#define GST_IS_MSDKH264ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKH264ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
+
 enum
 {
   PROP_CABAC = GST_MSDKENC_PROP_MAX,
@@ -72,12 +81,19 @@
   PROP_TUNE_MODE,
   PROP_P_PYRAMID,
   PROP_MIN_QP,
+  PROP_MIN_QP_I,
+  PROP_MIN_QP_P,
+  PROP_MIN_QP_B,
   PROP_MAX_QP,
+  PROP_MAX_QP_I,
+  PROP_MAX_QP_P,
+  PROP_MAX_QP_B,
   PROP_INTRA_REFRESH_TYPE,
   PROP_INTRA_REFRESH_CYCLE_SIZE,
   PROP_INTRA_REFRESH_QP_DELTA,
   PROP_INTRA_REFRESH_CYCLE_DIST,
   PROP_DBLK_IDC,
+  PROP_PIC_TIMING_SEI,
 };
 
 enum
@@ -102,16 +118,20 @@
 #define PROP_INTRA_REFRESH_QP_DELTA_DEFAULT   0
 #define PROP_INTRA_REFRESH_CYCLE_DIST_DEFAULT 0
 #define PROP_DBLK_IDC_DEFAULT                 0
+#define PROP_PIC_TIMING_SEI_DEFAULT           TRUE
+
+/* *INDENT-OFF* */
+static const gchar *doc_sink_caps_str =
+    GST_VIDEO_CAPS_MAKE ("{ NV12, YUY2, BGRA, VUYA }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf",
+        "{ NV12, YUY2, BGRA, VUYA }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory", "{ NV12 }");
+/* *INDENT-ON* */
 
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-h264, "
-        "framerate = (fraction) 0/1, MAX, "
-        "width = (int)  1, MAX , height = (int)  1, MAX , "
-        "stream-format = (string) byte-stream , alignment = (string) au , "
-        "profile = (string) { high, main, baseline, constrained-baseline }")
-    );
+static const gchar *doc_src_caps_str = "video/x-h264";
+
+static GstElementClass *parent_class = NULL;
 
 static GType
 gst_msdkh264enc_frame_packing_get_type (void)
@@ -133,9 +153,6 @@
   return format_type;
 }
 
-#define gst_msdkh264enc_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkH264Enc, gst_msdkh264enc, GST_TYPE_MSDKENC);
-
 static void
 gst_msdkh264enc_insert_sei (GstMsdkH264Enc * thiz, GstVideoCodecFrame * frame,
     GstMemory * sei_mem)
@@ -258,14 +275,16 @@
 gst_msdkh264enc_set_format (GstMsdkEnc * encoder)
 {
   GstMsdkH264Enc *thiz = GST_MSDKH264ENC (encoder);
+  GstPad *srcpad;
   GstCaps *template_caps;
   GstCaps *allowed_caps = NULL;
 
   thiz->profile = 0;
   thiz->level = 0;
 
-  template_caps = gst_static_pad_template_get_caps (&src_factory);
-  allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (encoder));
+  srcpad = GST_VIDEO_ENCODER_SRC_PAD (encoder);
+  template_caps = gst_pad_get_pad_template_caps (srcpad);
+  allowed_caps = gst_pad_get_allowed_caps (srcpad);
 
   /* If downstream has ANY caps let encoder decide profile and level */
   if (allowed_caps == template_caps) {
@@ -282,8 +301,6 @@
       return FALSE;
     }
 
-    allowed_caps = gst_caps_make_writable (allowed_caps);
-    allowed_caps = gst_caps_fixate (allowed_caps);
     s = gst_caps_get_structure (allowed_caps, 0);
 
     profile = gst_structure_get_string (s, "profile");
@@ -297,7 +314,7 @@
       } else if (!strcmp (profile, "constrained-baseline")) {
         thiz->profile = MFX_PROFILE_AVC_CONSTRAINED_BASELINE;
       } else {
-        g_assert_not_reached ();
+        thiz->profile = MFX_PROFILE_UNKNOWN;
       }
     }
 
@@ -408,14 +425,19 @@
     thiz->option.NalHrdConformance = MFX_CODINGOPTION_OFF;
   }
 
+  thiz->option.PicTimingSEI =
+      (thiz->pic_timing_sei ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF);
+
   gst_msdkenc_add_extra_param (encoder, (mfxExtBuffer *) & thiz->option);
 
   encoder->option2.Trellis = thiz->trellis ? thiz->trellis : MFX_TRELLIS_OFF;
   encoder->option2.MaxSliceSize = thiz->max_slice_size;
-  encoder->option2.MinQPI = encoder->option2.MinQPP = encoder->option2.MinQPB =
-      thiz->min_qp;
-  encoder->option2.MaxQPI = encoder->option2.MaxQPP = encoder->option2.MaxQPB =
-      thiz->max_qp;
+  encoder->option2.MinQPI = thiz->min_qp_i;
+  encoder->option2.MinQPP = thiz->min_qp_p;
+  encoder->option2.MinQPB = thiz->min_qp_b;
+  encoder->option2.MaxQPI = thiz->max_qp_i;
+  encoder->option2.MaxQPP = thiz->max_qp_p;
+  encoder->option2.MaxQPB = thiz->max_qp_b;
   encoder->option2.IntRefType = thiz->intra_refresh_type;
   encoder->option2.IntRefCycleSize = thiz->intra_refresh_cycle_size;
   encoder->option2.IntRefQPDelta = thiz->intra_refresh_qp_delta;
@@ -572,6 +594,7 @@
 gst_msdkh264enc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
+  GstMsdkEnc *enc = GST_MSDKENC (object);
   GstMsdkH264Enc *thiz = GST_MSDKH264ENC (object);
 
   if (gst_msdkenc_set_common_property (object, prop_id, value, pspec))
@@ -619,25 +642,86 @@
       break;
     case PROP_MIN_QP:
       thiz->min_qp = g_value_get_uint (value);
+      thiz->min_qp_i = thiz->min_qp_p = thiz->min_qp_b = thiz->min_qp;
+      break;
+    case PROP_MIN_QP_I:
+      if (check_update_property_uint (enc, &thiz->min_qp_i,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed min-qp-i to %u", thiz->min_qp_i);
+      }
+      break;
+    case PROP_MIN_QP_P:
+      if (check_update_property_uint (enc, &thiz->min_qp_p,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed min-qp-p to %u", thiz->min_qp_p);
+      }
+      break;
+    case PROP_MIN_QP_B:
+      if (check_update_property_uint (enc, &thiz->min_qp_b,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed min-qp-b to %u", thiz->min_qp_b);
+      }
       break;
     case PROP_MAX_QP:
       thiz->max_qp = g_value_get_uint (value);
+      thiz->max_qp_i = thiz->max_qp_p = thiz->max_qp_b = thiz->max_qp;
+      break;
+    case PROP_MAX_QP_I:
+      if (check_update_property_uint (enc, &thiz->max_qp_i,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed max-qp-i to %u", thiz->max_qp_i);
+      }
+      break;
+    case PROP_MAX_QP_P:
+      if (check_update_property_uint (enc, &thiz->max_qp_p,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed max-qp-p to %u", thiz->max_qp_p);
+      }
+      break;
+    case PROP_MAX_QP_B:
+      if (check_update_property_uint (enc, &thiz->max_qp_b,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed max-qp-b to %u", thiz->max_qp_b);
+      }
       break;
     case PROP_INTRA_REFRESH_TYPE:
-      thiz->intra_refresh_type = g_value_get_enum (value);
+      if (check_update_property_uint (enc, &thiz->intra_refresh_type,
+              g_value_get_enum (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed intra-refresh-type to %u",
+            thiz->intra_refresh_type);
+      }
       break;
     case PROP_INTRA_REFRESH_CYCLE_SIZE:
-      thiz->intra_refresh_cycle_size = g_value_get_uint (value);
+      if (check_update_property_uint (enc, &thiz->intra_refresh_cycle_size,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed intra-refresh-cycle-size to %u",
+            thiz->intra_refresh_cycle_size);
+      }
       break;
     case PROP_INTRA_REFRESH_QP_DELTA:
-      thiz->intra_refresh_qp_delta = g_value_get_int (value);
+      if (check_update_property_int (enc, &thiz->intra_refresh_qp_delta,
+              g_value_get_int (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed intra-refresh-qp-delta to %d",
+            thiz->intra_refresh_qp_delta);
+      }
       break;
     case PROP_INTRA_REFRESH_CYCLE_DIST:
-      thiz->intra_refresh_cycle_dist = g_value_get_uint (value);
+      if (check_update_property_uint (enc, &thiz->intra_refresh_cycle_dist,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed intra-refresh-cycle-dist to %u",
+            thiz->intra_refresh_cycle_dist);
+      }
       break;
     case PROP_DBLK_IDC:
       thiz->dblk_idc = g_value_get_uint (value);
       break;
+    case PROP_PIC_TIMING_SEI:
+      if (check_update_property_bool (enc, &thiz->pic_timing_sei,
+              g_value_get_boolean (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed pic-timimg-sei to %d",
+            thiz->pic_timing_sei);
+      }
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -689,9 +773,27 @@
     case PROP_MIN_QP:
       g_value_set_uint (value, thiz->min_qp);
       break;
+    case PROP_MIN_QP_I:
+      g_value_set_uint (value, thiz->min_qp_i);
+      break;
+    case PROP_MIN_QP_P:
+      g_value_set_uint (value, thiz->min_qp_p);
+      break;
+    case PROP_MIN_QP_B:
+      g_value_set_uint (value, thiz->min_qp_b);
+      break;
     case PROP_MAX_QP:
       g_value_set_uint (value, thiz->max_qp);
       break;
+    case PROP_MAX_QP_I:
+      g_value_set_uint (value, thiz->max_qp_i);
+      break;
+    case PROP_MAX_QP_P:
+      g_value_set_uint (value, thiz->max_qp_p);
+      break;
+    case PROP_MAX_QP_B:
+      g_value_set_uint (value, thiz->max_qp_b);
+      break;
     case PROP_INTRA_REFRESH_TYPE:
       g_value_set_enum (value, thiz->intra_refresh_type);
       break;
@@ -707,6 +809,9 @@
     case PROP_DBLK_IDC:
       g_value_set_uint (value, thiz->dblk_idc);
       break;
+    case PROP_PIC_TIMING_SEI:
+      g_value_set_boolean (value, thiz->pic_timing_sei);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -732,32 +837,27 @@
     gst_msdkenc_add_extra_param (encoder, (mfxExtBuffer *) & h264enc->roi0);
 }
 
-static void
-gst_msdkh264enc_class_init (GstMsdkH264EncClass * klass)
+static gboolean
+gst_msdkh264enc_is_format_supported (GstMsdkEnc * encoder,
+    GstVideoFormat format)
 {
-  GObjectClass *gobject_class;
-  GstElementClass *element_class;
-  GstVideoEncoderClass *videoencoder_class;
-  GstMsdkEncClass *encoder_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  element_class = GST_ELEMENT_CLASS (klass);
-  videoencoder_class = GST_VIDEO_ENCODER_CLASS (klass);
-  encoder_class = GST_MSDKENC_CLASS (klass);
-
-  gobject_class->dispose = gst_msdkh264enc_dispose;
-  gobject_class->finalize = gst_msdkh264enc_finalize;
-  gobject_class->set_property = gst_msdkh264enc_set_property;
-  gobject_class->get_property = gst_msdkh264enc_get_property;
-
-  videoencoder_class->pre_push = gst_msdkh264enc_pre_push;
-
-  encoder_class->set_format = gst_msdkh264enc_set_format;
-  encoder_class->configure = gst_msdkh264enc_configure;
-  encoder_class->set_src_caps = gst_msdkh264enc_set_src_caps;
-  encoder_class->need_reconfig = gst_msdkh264enc_need_reconfig;
-  encoder_class->set_extra_params = gst_msdkh264enc_set_extra_params;
+  switch (format) {
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_YUY2:
+    case GST_VIDEO_FORMAT_VUYA:
+    case GST_VIDEO_FORMAT_UYVY:
+    case GST_VIDEO_FORMAT_BGRA:
+    case GST_VIDEO_FORMAT_BGRx:
+      return TRUE;
+    default:
+      return FALSE;
+  }
+}
 
+static void
+_msdkh264enc_install_properties (GObjectClass * gobject_class,
+    GstMsdkEncClass * encoder_class)
+{
   gst_msdkenc_install_common_properties (encoder_class);
 
   g_object_class_install_property (gobject_class, PROP_CABAC,
@@ -815,13 +915,79 @@
 
   g_object_class_install_property (gobject_class, PROP_MIN_QP,
       g_param_spec_uint ("min-qp", "Min QP",
-          "Minimal quantizer for I/P/B frames",
+          "Minimal quantizer scale for I/P/B frames",
+          0, 51, PROP_MIN_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH264Enc:min-qp-i:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MIN_QP_I,
+      g_param_spec_uint ("min-qp-i", "Min QP I",
+          "Minimal quantizer scale for I frame",
+          0, 51, PROP_MIN_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH264Enc:min-qp-p:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MIN_QP_P,
+      g_param_spec_uint ("min-qp-p", "Min QP P",
+          "Minimal quantizer scale for P frame",
+          0, 51, PROP_MIN_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH264Enc:min-qp-b:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MIN_QP_B,
+      g_param_spec_uint ("min-qp-b", "Min QP B",
+          "Minimal quantizer scale for B frame",
           0, 51, PROP_MIN_QP_DEFAULT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_class, PROP_MAX_QP,
       g_param_spec_uint ("max-qp", "Max QP",
-          "Maximum quantizer for I/P/B frames",
+          "Maximum quantizer scale for I/P/B frames",
+          0, 51, PROP_MAX_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH264Enc:max-qp-i:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MAX_QP_I,
+      g_param_spec_uint ("max-qp-i", "Max QP I",
+          "Maximum quantizer scale for I frame",
+          0, 51, PROP_MAX_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH264Enc:max-qp-p:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MAX_QP_P,
+      g_param_spec_uint ("max-qp-p", "Max QP P",
+          "Maximum quantizer scale for P frame",
+          0, 51, PROP_MAX_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH264Enc:max-qp-b:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MAX_QP_B,
+      g_param_spec_uint ("max-qp-b", "Max QP B",
+          "Maximum quantizer scale for B frame",
           0, 51, PROP_MAX_QP_DEFAULT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
@@ -856,16 +1022,67 @@
           0, 2, PROP_DBLK_IDC_DEFAULT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstMsdkH264Enc:pic-timing-sei:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_PIC_TIMING_SEI,
+      g_param_spec_boolean ("pic-timing-sei", "Picture Timing SEI",
+          "Insert picture timing SEI with pic_struct syntax",
+          PROP_PIC_TIMING_SEI_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+}
+
+static void
+gst_msdkh264enc_class_init (gpointer klass, gpointer data)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *element_class;
+  GstVideoEncoderClass *videoencoder_class;
+  GstMsdkEncClass *encoder_class;
+  MsdkEncCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  element_class = GST_ELEMENT_CLASS (klass);
+  videoencoder_class = GST_VIDEO_ENCODER_CLASS (klass);
+  encoder_class = GST_MSDKENC_CLASS (klass);
+
+  gobject_class->dispose = gst_msdkh264enc_dispose;
+  gobject_class->finalize = gst_msdkh264enc_finalize;
+  gobject_class->set_property = gst_msdkh264enc_set_property;
+  gobject_class->get_property = gst_msdkh264enc_get_property;
+
+  videoencoder_class->pre_push = gst_msdkh264enc_pre_push;
+
+  encoder_class->set_format = gst_msdkh264enc_set_format;
+  encoder_class->configure = gst_msdkh264enc_configure;
+  encoder_class->set_src_caps = gst_msdkh264enc_set_src_caps;
+  encoder_class->need_reconfig = gst_msdkh264enc_need_reconfig;
+  encoder_class->set_extra_params = gst_msdkh264enc_set_extra_params;
+  encoder_class->is_format_supported = gst_msdkh264enc_is_format_supported;
+
+  _msdkh264enc_install_properties (gobject_class, encoder_class);
+
   gst_element_class_set_static_metadata (element_class,
       "Intel MSDK H264 encoder", "Codec/Encoder/Video/Hardware",
       "H264 video encoder based on " MFX_API_SDK,
       "Josep Torra <jtorra@oblong.com>");
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
+
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkh264enc_init (GstMsdkH264Enc * thiz)
+gst_msdkh264enc_init (GTypeInstance * instance, gpointer g_class)
 {
+  GstMsdkH264Enc *thiz = GST_MSDKH264ENC (instance);
   thiz->cabac = PROP_CABAC_DEFAULT;
   thiz->lowpower = PROP_LOWPOWER_DEFAULT;
   thiz->frame_packing = PROP_FRAME_PACKING_DEFAULT;
@@ -876,10 +1093,62 @@
   thiz->tune_mode = PROP_TUNE_MODE_DEFAULT;
   thiz->p_pyramid = PROP_P_PYRAMID_DEFAULT;
   thiz->min_qp = PROP_MIN_QP_DEFAULT;
+  thiz->min_qp_i = PROP_MIN_QP_DEFAULT;
+  thiz->min_qp_p = PROP_MIN_QP_DEFAULT;
+  thiz->min_qp_b = PROP_MIN_QP_DEFAULT;
   thiz->max_qp = PROP_MAX_QP_DEFAULT;
+  thiz->max_qp_i = PROP_MAX_QP_DEFAULT;
+  thiz->max_qp_p = PROP_MAX_QP_DEFAULT;
+  thiz->max_qp_b = PROP_MAX_QP_DEFAULT;
   thiz->intra_refresh_type = PROP_INTRA_REFRESH_TYPE_DEFAULT;
   thiz->intra_refresh_cycle_size = PROP_INTRA_REFRESH_CYCLE_SIZE_DEFAULT;
   thiz->intra_refresh_qp_delta = PROP_INTRA_REFRESH_QP_DELTA_DEFAULT;
   thiz->intra_refresh_cycle_dist = PROP_INTRA_REFRESH_CYCLE_DIST_DEFAULT;
   thiz->dblk_idc = PROP_DBLK_IDC_DEFAULT;
+  thiz->pic_timing_sei = PROP_PIC_TIMING_SEI_DEFAULT;
+}
+
+gboolean
+gst_msdkh264enc_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkEncCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkH264EncClass),
+    .class_init = gst_msdkh264enc_class_init,
+    .instance_size = sizeof (GstMsdkH264Enc),
+    .instance_init = gst_msdkh264enc_init
+  };
+
+  cdata = g_new (MsdkEncCData, 1);
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = gst_caps_copy (src_caps);
+
+  gst_caps_set_simple (cdata->src_caps,
+      "alignment", G_TYPE_STRING, "au",
+      "stream-format", G_TYPE_STRING, "byte-stream", NULL);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkH264Enc");
+  feature_name = g_strdup ("msdkh264enc");
+
+  type = g_type_register_static (GST_TYPE_MSDKENC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
 }

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkh264enc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkh264enc.h Changed

@@ -37,17 +37,6 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_MSDKH264ENC \
-  (gst_msdkh264enc_get_type())
-#define GST_MSDKH264ENC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MSDKH264ENC,GstMsdkH264Enc))
-#define GST_MSDKH264ENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MSDKH264ENC,GstMsdkH264EncClass))
-#define GST_IS_MSDKH264ENC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MSDKH264ENC))
-#define GST_IS_MSDKH264ENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MSDKH264ENC))
-
 typedef struct _GstMsdkH264Enc GstMsdkH264Enc;
 typedef struct _GstMsdkH264EncClass GstMsdkH264EncClass;
 
@@ -73,12 +62,19 @@
   guint prop_flag;
   guint p_pyramid;
   guint min_qp;
+  guint min_qp_i;
+  guint min_qp_p;
+  guint min_qp_b;
   guint max_qp;
+  guint max_qp_i;
+  guint max_qp_p;
+  guint max_qp_b;
   guint intra_refresh_type;
   guint intra_refresh_cycle_size;
   gint intra_refresh_qp_delta;
   guint intra_refresh_cycle_dist;
   guint dblk_idc;
+  gboolean pic_timing_sei;
 
   GstH264NalParser *parser;
   GArray *cc_sei_array;
@@ -90,7 +86,10 @@
   GstMsdkEncClass parent_class;
 };
 
-GType gst_msdkh264enc_get_type (void);
+gboolean
+gst_msdkh264enc_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank);
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkh265dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkh265dec.c Changed

@@ -50,31 +50,36 @@
 #endif
 
 #include "gstmsdkh265dec.h"
-#include "gstmsdkvideomemory.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkh265dec_debug);
 #define GST_CAT_DEFAULT gst_msdkh265dec_debug
 
-#define COMMON_FORMAT \
-  "{ NV12, P010_10LE, YUY2, Y210, VUYA, Y410, P012_LE, Y212_LE, Y412_LE, BGRA, BGRx }"
+#define GST_TYPE_MSDKH265DEC \
+  (gst_msdkh265dec_get_type())
+#define GST_MSDKH265DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkH265Dec))
+#define GST_MSDKH265DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass),  GstMsdkH265DecClass))
+#define GST_IS_MSDKH265DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKH265DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
 
-/* TODO: update both sink and src dynamically */
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-h265, "
-        "width = (int)  1, MAX , height = (int)  1, MAX , "
-        "stream-format = (string) byte-stream , alignment = (string) au ")
-    );
+/* *INDENT-OFF* */
+static const gchar *doc_src_caps_str =
+    GST_VIDEO_CAPS_MAKE (
+        "{ NV12, P010_10LE, YUY2, VUYA, Y210, Y410, P012_LE, Y212_LE, "
+        "Y412_LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf",
+        "{ NV12, P010_10LE, YUY2, VUYA, Y210, Y410, P012_LE, Y212_LE, "
+        "Y412_LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory", "{ NV12 }");
+/* *INDENT-ON* */
 
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR (COMMON_FORMAT, COMMON_FORMAT))
-    );
+static const gchar *doc_sink_caps_str = "video/x-h265";
 
-#define gst_msdkh265dec_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkH265Dec, gst_msdkh265dec, GST_TYPE_MSDKDEC);
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkh265dec_configure (GstMsdkDec * decoder)
@@ -175,11 +180,14 @@
 }
 
 static void
-gst_msdkh265dec_class_init (GstMsdkH265DecClass * klass)
+gst_msdkh265dec_class_init (gpointer klass, gpointer data)
 {
   GObjectClass *gobject_class;
   GstElementClass *element_class;
   GstMsdkDecClass *decoder_class;
+  MsdkDecCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class = G_OBJECT_CLASS (klass);
   element_class = GST_ELEMENT_CLASS (klass);
@@ -202,12 +210,62 @@
   gst_msdkdec_prop_install_error_report_property (gobject_class);
 #endif
 
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkh265dec_init (GstMsdkH265Dec * thiz)
+gst_msdkh265dec_init (GTypeInstance * instance, gpointer g_class)
 {
+  GstMsdkH265Dec *thiz = GST_MSDKH265DEC (instance);
   thiz->output_order = PROP_OUTPUT_ORDER_DEFAULT;
 }
+
+gboolean
+gst_msdkh265dec_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkDecCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkH265DecClass),
+    .class_init = gst_msdkh265dec_class_init,
+    .instance_size = sizeof (GstMsdkH265Dec),
+    .instance_init = gst_msdkh265dec_init
+  };
+
+  cdata = g_new (MsdkDecCData, 1);
+  cdata->sink_caps = gst_caps_copy (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+  gst_caps_set_simple (cdata->sink_caps,
+      "stream-format", G_TYPE_STRING, "byte-stream",
+      "alignment", G_TYPE_STRING, "au", NULL);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkH265Dec");
+  feature_name = g_strdup ("msdkh265dec");
+
+  type = g_type_register_static (GST_TYPE_MSDKDEC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkh265dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkh265dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkh265enc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkh265enc.c Changed

@@ -56,6 +56,15 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkh265enc_debug);
 #define GST_CAT_DEFAULT gst_msdkh265enc_debug
 
+#define GST_MSDKH265ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkH265Enc))
+#define GST_MSDKH265ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkH265EncClass))
+#define GST_IS_MSDKH265ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKH265ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
+
 enum
 {
 #ifndef GST_REMOVE_DEPRECATED
@@ -71,12 +80,19 @@
   PROP_B_PYRAMID,
   PROP_P_PYRAMID,
   PROP_MIN_QP,
+  PROP_MIN_QP_I,
+  PROP_MIN_QP_P,
+  PROP_MIN_QP_B,
   PROP_MAX_QP,
+  PROP_MAX_QP_I,
+  PROP_MAX_QP_P,
+  PROP_MAX_QP_B,
   PROP_INTRA_REFRESH_TYPE,
   PROP_INTRA_REFRESH_CYCLE_SIZE,
   PROP_INTRA_REFRESH_QP_DELTA,
   PROP_INTRA_REFRESH_CYCLE_DIST,
   PROP_DBLK_IDC,
+  PROP_PIC_TIMING_SEI,
 };
 
 enum
@@ -100,70 +116,24 @@
 #define PROP_INTRA_REFRESH_QP_DELTA_DEFAULT   0
 #define PROP_INTRA_REFRESH_CYCLE_DIST_DEFAULT 0
 #define PROP_DBLK_IDC_DEFAULT                 0
+#define PROP_PIC_TIMING_SEI_DEFAULT           TRUE
 
-#define RAW_FORMATS "NV12, I420, YV12, YUY2, UYVY, BGRA, BGR10A2_LE, P010_10LE, VUYA"
-#define PROFILES    "main, main-10, main-444, main-still-picture, main-10-still-picture"
-#define COMMON_FORMAT "{ " RAW_FORMATS " }"
-#define PRFOLIE_STR   "{ " PROFILES " }"
-
-
-#if (MFX_VERSION >= 1027)
-#undef  COMMON_FORMAT
-#undef  PRFOLIE_STR
-#define FORMATS_1027    RAW_FORMATS ", Y410, Y210"
-#define PROFILES_1027   PROFILES ", main-444-10, main-422-10"
-#define COMMON_FORMAT   "{ " FORMATS_1027 " }"
-#define PRFOLIE_STR     "{ " PROFILES_1027 " }"
-#endif
-
-#if (MFX_VERSION >= 1031)
-#undef  COMMON_FORMAT
-#undef  PRFOLIE_STR
-#define FORMATS_1031    FORMATS_1027 ", P012_LE"
-#define PROFILES_1031   PROFILES_1027  ", main-12"
-#define COMMON_FORMAT   "{ " FORMATS_1031 " }"
-#define PRFOLIE_STR     "{ " PROFILES_1031 " }"
-#endif
-
-#if (MFX_VERSION >= 1032)
-#undef  COMMON_FORMAT
-#undef  PRFOLIE_STR
-#define FORMATS_1032    FORMATS_1031
-#define PROFILES_1032   PROFILES_1031  ", screen-extended-main, " \
-  "screen-extended-main-10, screen-extended-main-444, " \
-  "screen-extended-main-444-10"
-#define COMMON_FORMAT   "{ " FORMATS_1032 " }"
-#define PRFOLIE_STR     "{ " PROFILES_1032 " }"
-#endif
-
-#ifdef _WIN32
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR (COMMON_FORMAT,
-            "{ NV12, P010_10LE }") "; "
-        GST_MSDK_CAPS_MAKE_WITH_D3D11_FEATURE ("{ NV12, P010_10LE }")));
-#else
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR (COMMON_FORMAT,
-            "{ NV12, P010_10LE }") "; "
-        GST_MSDK_CAPS_MAKE_WITH_VA_FEATURE ("NV12")));
-#endif
+/* *INDENT-OFF* */
+static const gchar *doc_sink_caps_str =
+    GST_VIDEO_CAPS_MAKE (
+        "{ NV12, P010_10LE, YUY2, BGRA, VUYA, BGR10A2_LE, Y210, Y410, "
+        "P012_LE, Y212_LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf",
+        "{ NV12, P010_10LE, YUY2, BGRA, VUYA, BGR10A2_LE, Y210, Y410, "
+        "P012_LE, Y212_LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory",
+        "{ NV12, P010_10LE }");
+/* *INDENT-ON* */
 
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-h265, "
-        "framerate = (fraction) 0/1, MAX, "
-        "width = (int)  1, MAX , height = (int)  1, MAX , "
-        "stream-format = (string) byte-stream , alignment = (string) au , "
-        "profile = (string) " PRFOLIE_STR)
-    );
+static const gchar *doc_src_caps_str = "video/x-h265";
 
-#define gst_msdkh265enc_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkH265Enc, gst_msdkh265enc, GST_TYPE_MSDKENC);
+static GstElementClass *parent_class = NULL;
 
 static void
 gst_msdkh265enc_insert_sei (GstMsdkH265Enc * thiz, GstVideoCodecFrame * frame,
@@ -264,119 +234,13 @@
   gst_memory_unref (mem);
 }
 
-static void
-gst_msdkh265enc_add_mdcv_sei (GstMsdkEnc * encoder, GstVideoCodecFrame * frame)
-{
-  GstMsdkH265Enc *thiz = GST_MSDKH265ENC (encoder);
-  GstVideoMasteringDisplayInfo *mastering_display_info
-      = encoder->input_state->mastering_display_info;
-  GstH265SEIMessage sei;
-  GstH265MasteringDisplayColourVolume *mdcv;
-  GstMemory *mem = NULL;
-  guint i = 0;
-
-  memset (&sei, 0, sizeof (GstH265SEIMessage));
-  sei.payloadType = GST_H265_SEI_MASTERING_DISPLAY_COLOUR_VOLUME;
-  mdcv = &sei.payload.mastering_display_colour_volume;
-
-  for (i = 0; i < 3; i++) {
-    mdcv->display_primaries_xi =
-        mastering_display_info->display_primariesi.x;
-    mdcv->display_primaries_yi =
-        mastering_display_info->display_primariesi.y;
-  }
-
-  mdcv->white_point_x = mastering_display_info->white_point.x;
-  mdcv->white_point_y = mastering_display_info->white_point.y;
-  mdcv->max_display_mastering_luminance =
-      mastering_display_info->max_display_mastering_luminance;
-  mdcv->min_display_mastering_luminance =
-      mastering_display_info->min_display_mastering_luminance;
-
-  if (!thiz->cc_sei_array)
-    thiz->cc_sei_array = g_array_new (FALSE, FALSE, sizeof (GstH265SEIMessage));
-  else
-    g_array_set_size (thiz->cc_sei_array, 0);
-
-  g_array_append_val (thiz->cc_sei_array, sei);
-
-  if (!thiz->cc_sei_array || !thiz->cc_sei_array->len)
-    return;
-
-  /* layer_id and temporal_id will be updated by parser later */
-  mem = gst_h265_create_sei_memory (0, 1, 4, thiz->cc_sei_array);
-
-  if (!mem) {
-    GST_WARNING_OBJECT (thiz, "Cannot create SEI nal unit");
-    return;
-  }
-
-  GST_DEBUG_OBJECT (thiz,
-      "Inserting %d mastering display colout volume SEI message(s)",
-      thiz->cc_sei_array->len);
-
-  gst_msdkh265enc_insert_sei (thiz, frame, mem);
-  gst_memory_unref (mem);
-}
-
-static void
-gst_msdkh265enc_add_cll_sei (GstMsdkEnc * encoder, GstVideoCodecFrame * frame)
-{
-  GstMsdkH265Enc *thiz = GST_MSDKH265ENC (encoder);
-  GstVideoContentLightLevel *content_light_level
-      = encoder->input_state->content_light_level;
-  GstH265ContentLightLevel *cll;
-  GstH265SEIMessage sei;
-  GstMemory *mem = NULL;
-
-  memset (&sei, 0, sizeof (GstH265SEIMessage));
-  sei.payloadType = GST_H265_SEI_CONTENT_LIGHT_LEVEL;
-  cll = &sei.payload.content_light_level;
-
-  cll->max_content_light_level = content_light_level->max_content_light_level;
-  cll->max_pic_average_light_level =
-      content_light_level->max_frame_average_light_level;
-
-  if (!thiz->cc_sei_array)
-    thiz->cc_sei_array = g_array_new (FALSE, FALSE, sizeof (GstH265SEIMessage));
-  else
-    g_array_set_size (thiz->cc_sei_array, 0);
-
-  g_array_append_val (thiz->cc_sei_array, sei);
-
-  if (!thiz->cc_sei_array || !thiz->cc_sei_array->len)
-    return;
-
-  /* layer_id and temporal_id will be updated by parser later */
-  mem = gst_h265_create_sei_memory (0, 1, 4, thiz->cc_sei_array);
-
-  if (!mem) {
-    GST_WARNING_OBJECT (thiz, "Cannot create SEI nal unit");
-    return;
-  }
-
-  GST_DEBUG_OBJECT (thiz,
-      "Inserting %d content light level SEI message(s)",
-      thiz->cc_sei_array->len);
-
-  gst_msdkh265enc_insert_sei (thiz, frame, mem);
-  gst_memory_unref (mem);
-}
-
 static GstFlowReturn
 gst_msdkh265enc_pre_push (GstVideoEncoder * encoder, GstVideoCodecFrame * frame)
 {
   GstMsdkH265Enc *thiz = GST_MSDKH265ENC (encoder);
-  GstMsdkEnc *msdk_encoder = GST_MSDKENC (encoder);
 
   gst_msdkh265enc_add_cc (thiz, frame);
 
-  if (msdk_encoder->input_state->mastering_display_info)
-    gst_msdkh265enc_add_mdcv_sei (msdk_encoder, frame);
-
-  if (msdk_encoder->input_state->content_light_level)
-    gst_msdkh265enc_add_cll_sei (msdk_encoder, frame);
-
   return GST_FLOW_OK;
 }
 
@@ -384,20 +248,22 @@
 gst_msdkh265enc_set_format (GstMsdkEnc * encoder)
 {
   GstMsdkH265Enc *thiz = GST_MSDKH265ENC (encoder);
+  GstPad *srcpad;
   GstCaps *template_caps, *allowed_caps;
 
   g_free (thiz->profile_name);
   thiz->profile_name = NULL;
 
-  allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (encoder));
+  srcpad = GST_VIDEO_ENCODER_SRC_PAD (encoder);
 
+  allowed_caps = gst_pad_get_allowed_caps (srcpad);
   if (!allowed_caps || gst_caps_is_empty (allowed_caps)) {
     if (allowed_caps)
       gst_caps_unref (allowed_caps);
     return FALSE;
   }
 
-  template_caps = gst_static_pad_template_get_caps (&src_factory);
+  template_caps = gst_pad_get_pad_template_caps (srcpad);
 
   if (gst_caps_is_equal (allowed_caps, template_caps)) {
     GST_INFO_OBJECT (thiz,
@@ -422,6 +288,67 @@
   return TRUE;
 }
 
+static void
+_get_hdr_sei (GstMsdkEnc * encoder)
+{
+  GstVideoCodecState *state;
+  GstVideoMasteringDisplayInfo mdcv_info;
+  GstVideoContentLightLevel cll_info;
+  GstMsdkH265Enc *h265enc = GST_MSDKH265ENC (encoder);
+  const guint chroma_den = 50000;
+  const guint luma_den = 10000;
+
+  h265enc->have_mdcv = h265enc->have_cll = FALSE;
+  state = encoder->input_state;
+  if (gst_video_mastering_display_info_from_caps (&mdcv_info, state->caps)) {
+    memset (&h265enc->mdcv, 0, sizeof (mfxExtMasteringDisplayColourVolume));
+    h265enc->mdcv.Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME;
+    h265enc->mdcv.Header.BufferSz = sizeof (mfxExtMasteringDisplayColourVolume);
+    h265enc->mdcv.InsertPayloadToggle = MFX_PAYLOAD_IDR;
+
+    /* According to HEVC spec, display primaries order is G,B,R */
+    h265enc->mdcv.DisplayPrimariesX0 =
+        MIN ((mdcv_info.display_primaries1.x * chroma_den), chroma_den);
+    h265enc->mdcv.DisplayPrimariesY0 =
+        MIN ((mdcv_info.display_primaries1.y * chroma_den), chroma_den);
+    h265enc->mdcv.DisplayPrimariesX1 =
+        MIN ((mdcv_info.display_primaries2.x * chroma_den), chroma_den);
+    h265enc->mdcv.DisplayPrimariesY1 =
+        MIN ((mdcv_info.display_primaries2.y * chroma_den), chroma_den);
+    h265enc->mdcv.DisplayPrimariesX2 =
+        MIN ((mdcv_info.display_primaries0.x * chroma_den), chroma_den);
+    h265enc->mdcv.DisplayPrimariesY2 =
+        MIN ((mdcv_info.display_primaries0.y * chroma_den), chroma_den);
+
+    h265enc->mdcv.WhitePointX =
+        MIN ((mdcv_info.white_point.x * chroma_den), chroma_den);
+    h265enc->mdcv.WhitePointY =
+        MIN ((mdcv_info.white_point.y * chroma_den), chroma_den);
+
+    h265enc->mdcv.MaxDisplayMasteringLuminance =
+        mdcv_info.max_display_mastering_luminance * luma_den;
+    h265enc->mdcv.MinDisplayMasteringLuminance =
+        MIN ((mdcv_info.min_display_mastering_luminance * luma_den),
+        h265enc->mdcv.MaxDisplayMasteringLuminance);
+    h265enc->have_mdcv = TRUE;
+  }
+
+  if (gst_video_content_light_level_from_caps (&cll_info, state->caps)) {
+    memset (&h265enc->cll, 0, sizeof (mfxExtContentLightLevelInfo));
+    h265enc->cll.Header.BufferId = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO;
+    h265enc->cll.Header.BufferSz = sizeof (mfxExtContentLightLevelInfo);
+    h265enc->cll.InsertPayloadToggle = MFX_PAYLOAD_IDR;
+
+    h265enc->cll.MaxContentLightLevel =
+        MIN (cll_info.max_content_light_level, 65535);
+    h265enc->cll.MaxPicAverageLightLevel =
+        MIN (cll_info.max_frame_average_light_level, 65535);
+    h265enc->have_cll = TRUE;
+  }
+
+  return;
+}
+
 static gboolean
 gst_msdkh265enc_configure (GstMsdkEnc * encoder)
 {
@@ -498,12 +425,13 @@
    * "i-frames" by incrementing the value by one in each case*/
   encoder->param.mfx.IdrInterval += 1;
 
-  /* Enable Extended coding options */
   encoder->option2.MaxSliceSize = h265enc->max_slice_size;
-  encoder->option2.MinQPI = encoder->option2.MinQPP = encoder->option2.MinQPB =
-      h265enc->min_qp;
-  encoder->option2.MaxQPI = encoder->option2.MaxQPP = encoder->option2.MaxQPB =
-      h265enc->max_qp;
+  encoder->option2.MinQPI = h265enc->min_qp_i;
+  encoder->option2.MinQPP = h265enc->min_qp_p;
+  encoder->option2.MinQPB = h265enc->min_qp_b;
+  encoder->option2.MaxQPI = h265enc->max_qp_i;
+  encoder->option2.MaxQPP = h265enc->max_qp_p;
+  encoder->option2.MaxQPB = h265enc->max_qp_b;
   encoder->option2.DisableDeblockingIdc = h265enc->dblk_idc;
 
   if (h265enc->tune_mode == 16 || h265enc->lowpower) {
@@ -540,12 +468,16 @@
     encoder->enable_extopt3 = TRUE;
   }
 
-  if (encoder->option3.LowDelayBRC == MFX_CODINGOPTION_ON) {
-    h265enc->option.Header.BufferId = MFX_EXTBUFF_CODING_OPTION;
-    h265enc->option.Header.BufferSz = sizeof (h265enc->option);
+  /* Fill Extended coding options */
+  h265enc->option.Header.BufferId = MFX_EXTBUFF_CODING_OPTION;
+  h265enc->option.Header.BufferSz = sizeof (h265enc->option);
+  h265enc->option.PicTimingSEI =
+      (h265enc->pic_timing_sei ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF);
+
+  if (encoder->option3.LowDelayBRC == MFX_CODINGOPTION_ON)
     h265enc->option.NalHrdConformance = MFX_CODINGOPTION_OFF;
-    gst_msdkenc_add_extra_param (encoder, (mfxExtBuffer *) & h265enc->option);
-  }
+
+  gst_msdkenc_add_extra_param (encoder, (mfxExtBuffer *) & h265enc->option);
 
   gst_msdkenc_ensure_extended_coding_options (encoder);
 
@@ -566,6 +498,13 @@
 
   encoder->param.mfx.LowPower = h265enc->tune_mode;
 
+  /* Set HDR SEI */
+  _get_hdr_sei (encoder);
+  if (h265enc->have_mdcv)
+    gst_msdkenc_add_extra_param (encoder, (mfxExtBuffer *) & h265enc->mdcv);
+  if (h265enc->have_cll)
+    gst_msdkenc_add_extra_param (encoder, (mfxExtBuffer *) & h265enc->cll);
+
   return TRUE;
 }
 
@@ -692,6 +631,7 @@
 gst_msdkh265enc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
+  GstMsdkEnc *enc = GST_MSDKENC (object);
   GstMsdkH265Enc *thiz = GST_MSDKH265ENC (object);
 
   if (gst_msdkenc_set_common_property (object, prop_id, value, pspec))
@@ -744,32 +684,100 @@
 
     case PROP_MIN_QP:
       thiz->min_qp = g_value_get_uint (value);
+      thiz->min_qp_i = thiz->min_qp_p = thiz->min_qp_b = thiz->min_qp;
+      break;
+
+    case PROP_MIN_QP_I:
+      if (check_update_property_uint (enc, &thiz->min_qp_i,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed min-qp-i to %u", thiz->min_qp_i);
+      }
+      break;
+
+    case PROP_MIN_QP_P:
+      if (check_update_property_uint (enc, &thiz->min_qp_p,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed min-qp-p to %u", thiz->min_qp_p);
+      }
+      break;
+
+    case PROP_MIN_QP_B:
+      if (check_update_property_uint (enc, &thiz->min_qp_b,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed min-qp-b to %u", thiz->min_qp_b);
+      }
       break;
 
     case PROP_MAX_QP:
       thiz->max_qp = g_value_get_uint (value);
+      thiz->max_qp_i = thiz->max_qp_p = thiz->max_qp_b = thiz->max_qp;
+      break;
+
+    case PROP_MAX_QP_I:
+      if (check_update_property_uint (enc, &thiz->max_qp_i,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed max-qp-i to %u", thiz->max_qp_i);
+      }
+      break;
+
+    case PROP_MAX_QP_P:
+      if (check_update_property_uint (enc, &thiz->max_qp_p,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed max-qp-p to %u", thiz->max_qp_p);
+      }
+      break;
+
+    case PROP_MAX_QP_B:
+      if (check_update_property_uint (enc, &thiz->max_qp_b,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed max-qp-b to %u", thiz->max_qp_b);
+      }
       break;
 
     case PROP_INTRA_REFRESH_TYPE:
-      thiz->intra_refresh_type = g_value_get_enum (value);
+      if (check_update_property_uint (enc, &thiz->intra_refresh_type,
+              g_value_get_enum (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed intra-refresh-type to %u",
+            thiz->intra_refresh_type);
+      }
       break;
 
     case PROP_INTRA_REFRESH_CYCLE_SIZE:
-      thiz->intra_refresh_cycle_size = g_value_get_uint (value);
+      if (check_update_property_uint (enc, &thiz->intra_refresh_cycle_size,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed intra-refresh-cycle-size to %u",
+            thiz->intra_refresh_cycle_size);
+      }
       break;
 
     case PROP_INTRA_REFRESH_QP_DELTA:
-      thiz->intra_refresh_qp_delta = g_value_get_int (value);
+      if (check_update_property_int (enc, &thiz->intra_refresh_qp_delta,
+              g_value_get_int (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed intra-refresh-qp-delta to %d",
+            thiz->intra_refresh_qp_delta);
+      }
       break;
 
     case PROP_INTRA_REFRESH_CYCLE_DIST:
-      thiz->intra_refresh_cycle_dist = g_value_get_uint (value);
+      if (check_update_property_uint (enc, &thiz->intra_refresh_cycle_dist,
+              g_value_get_uint (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed intra-refresh-cycle-dist to %u",
+            thiz->intra_refresh_cycle_dist);
+      }
       break;
 
     case PROP_DBLK_IDC:
       thiz->dblk_idc = g_value_get_uint (value);
       break;
 
+    case PROP_PIC_TIMING_SEI:
+      if (check_update_property_bool (enc, &thiz->pic_timing_sei,
+              g_value_get_boolean (value))) {
+        GST_DEBUG_OBJECT (thiz, "changed pic-timimg-sei to %d",
+            thiz->pic_timing_sei);
+      }
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -826,10 +834,34 @@
       g_value_set_uint (value, thiz->min_qp);
       break;
 
+    case PROP_MIN_QP_I:
+      g_value_set_uint (value, thiz->min_qp_i);
+      break;
+
+    case PROP_MIN_QP_P:
+      g_value_set_uint (value, thiz->min_qp_p);
+      break;
+
+    case PROP_MIN_QP_B:
+      g_value_set_uint (value, thiz->min_qp_b);
+      break;
+
     case PROP_MAX_QP:
       g_value_set_uint (value, thiz->max_qp);
       break;
 
+    case PROP_MAX_QP_I:
+      g_value_set_uint (value, thiz->max_qp_i);
+      break;
+
+    case PROP_MAX_QP_P:
+      g_value_set_uint (value, thiz->max_qp_p);
+      break;
+
+    case PROP_MAX_QP_B:
+      g_value_set_uint (value, thiz->max_qp_b);
+      break;
+
     case PROP_INTRA_REFRESH_TYPE:
       g_value_set_enum (value, thiz->intra_refresh_type);
       break;
@@ -850,6 +882,10 @@
       g_value_set_uint (value, thiz->dblk_idc);
       break;
 
+    case PROP_PIC_TIMING_SEI:
+      g_value_set_boolean (value, thiz->pic_timing_sei);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -876,16 +912,19 @@
 }
 
 static gboolean
-gst_msdkh265enc_need_conversion (GstMsdkEnc * encoder, GstVideoInfo * info,
-    GstVideoFormat * out_format)
+gst_msdkh265enc_is_format_supported (GstMsdkEnc * encoder,
+    GstVideoFormat format)
 {
   GstMsdkH265Enc *h265enc = GST_MSDKH265ENC (encoder);
 
-  switch (GST_VIDEO_INFO_FORMAT (info)) {
+  switch (format) {
     case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_VUYA:
+    case GST_VIDEO_FORMAT_BGRA:
+    case GST_VIDEO_FORMAT_BGRx:
+    case GST_VIDEO_FORMAT_Y212_LE:
     case GST_VIDEO_FORMAT_BGR10A2_LE:
     case GST_VIDEO_FORMAT_P010_10LE:
-    case GST_VIDEO_FORMAT_VUYA:
 #if (MFX_VERSION >= 1027)
     case GST_VIDEO_FORMAT_Y410:
     case GST_VIDEO_FORMAT_Y210:
@@ -893,49 +932,22 @@
 #if (MFX_VERSION >= 1031)
     case GST_VIDEO_FORMAT_P012_LE:
 #endif
-      return FALSE;
-
+      return TRUE;
     case GST_VIDEO_FORMAT_YUY2:
 #if (MFX_VERSION >= 1027)
       if (encoder->codename >= MFX_PLATFORM_ICELAKE &&
           h265enc->tune_mode == MFX_CODINGOPTION_OFF)
-        return FALSE;
+        return TRUE;
 #endif
     default:
-      if (GST_VIDEO_INFO_COMP_DEPTH (info, 0) == 10)
-        *out_format = GST_VIDEO_FORMAT_P010_10LE;
-      else
-        *out_format = GST_VIDEO_FORMAT_NV12;
-      return TRUE;
+      return FALSE;
   }
 }
 
 static void
-gst_msdkh265enc_class_init (GstMsdkH265EncClass * klass)
+_msdkh265enc_install_properties (GObjectClass * gobject_class,
+    GstMsdkEncClass * encoder_class)
 {
-  GObjectClass *gobject_class;
-  GstElementClass *element_class;
-  GstVideoEncoderClass *videoencoder_class;
-  GstMsdkEncClass *encoder_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  element_class = GST_ELEMENT_CLASS (klass);
-  videoencoder_class = GST_VIDEO_ENCODER_CLASS (klass);
-  encoder_class = GST_MSDKENC_CLASS (klass);
-
-  gobject_class->finalize = gst_msdkh265enc_finalize;
-  gobject_class->set_property = gst_msdkh265enc_set_property;
-  gobject_class->get_property = gst_msdkh265enc_get_property;
-
-  videoencoder_class->pre_push = gst_msdkh265enc_pre_push;
-
-  encoder_class->set_format = gst_msdkh265enc_set_format;
-  encoder_class->configure = gst_msdkh265enc_configure;
-  encoder_class->set_src_caps = gst_msdkh265enc_set_src_caps;
-  encoder_class->need_reconfig = gst_msdkh265enc_need_reconfig;
-  encoder_class->set_extra_params = gst_msdkh265enc_set_extra_params;
-  encoder_class->need_conversion = gst_msdkh265enc_need_conversion;
-
   gst_msdkenc_install_common_properties (encoder_class);
 
 #ifndef GST_REMOVE_DEPRECATED
@@ -988,13 +1000,79 @@
 
   g_object_class_install_property (gobject_class, PROP_MIN_QP,
       g_param_spec_uint ("min-qp", "Min QP",
-          "Minimal quantizer for I/P/B frames",
+          "Minimal quantizer scale for I/P/B frames",
+          0, 51, PROP_MIN_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH265Enc:min-qp-i:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MIN_QP_I,
+      g_param_spec_uint ("min-qp-i", "Min QP I",
+          "Minimal quantizer scale for I frame",
+          0, 51, PROP_MIN_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH265Enc:min-qp-p:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MIN_QP_P,
+      g_param_spec_uint ("min-qp-p", "Min QP P",
+          "Minimal quantizer scale for P frame",
+          0, 51, PROP_MIN_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH265Enc:min-qp-b:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MIN_QP_B,
+      g_param_spec_uint ("min-qp-b", "Min QP B",
+          "Minimal quantizer scale for B frame",
           0, 51, PROP_MIN_QP_DEFAULT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_class, PROP_MAX_QP,
       g_param_spec_uint ("max-qp", "Max QP",
-          "Maximum quantizer for I/P/B frames",
+          "Maximum quantizer scale for I/P/B frames",
+          0, 51, PROP_MAX_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH265Enc:max-qp-i:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MAX_QP_I,
+      g_param_spec_uint ("max-qp-i", "Max QP I",
+          "Maximum quantizer scale for I frame",
+          0, 51, PROP_MAX_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH265Enc:max-qp-p:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MAX_QP_P,
+      g_param_spec_uint ("max-qp-p", "Max QP P",
+          "Maximum quantizer scale for P frame",
+          0, 51, PROP_MAX_QP_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GstMsdkH265Enc:max-qp-b:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_MAX_QP_B,
+      g_param_spec_uint ("max-qp-b", "Max QP B",
+          "Maximum quantizer scale for B frame",
           0, 51, PROP_MAX_QP_DEFAULT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
@@ -1029,20 +1107,68 @@
           0, 2, PROP_DBLK_IDC_DEFAULT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /**
+   * GstMsdkH265Enc:pic-timing-sei:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_PIC_TIMING_SEI,
+      g_param_spec_boolean ("pic-timing-sei", "Picture Timing SEI",
+          "Insert picture timing SEI with pic_struct syntax",
+          PROP_PIC_TIMING_SEI_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+}
+
+static void
+gst_msdkh265enc_class_init (gpointer klass, gpointer data)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *element_class;
+  GstVideoEncoderClass *videoencoder_class;
+  GstMsdkEncClass *encoder_class;
+  MsdkEncCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  element_class = GST_ELEMENT_CLASS (klass);
+  videoencoder_class = GST_VIDEO_ENCODER_CLASS (klass);
+  encoder_class = GST_MSDKENC_CLASS (klass);
+
+  gobject_class->finalize = gst_msdkh265enc_finalize;
+  gobject_class->set_property = gst_msdkh265enc_set_property;
+  gobject_class->get_property = gst_msdkh265enc_get_property;
+
+  videoencoder_class->pre_push = gst_msdkh265enc_pre_push;
+
+  encoder_class->set_format = gst_msdkh265enc_set_format;
+  encoder_class->configure = gst_msdkh265enc_configure;
+  encoder_class->set_src_caps = gst_msdkh265enc_set_src_caps;
+  encoder_class->need_reconfig = gst_msdkh265enc_need_reconfig;
+  encoder_class->set_extra_params = gst_msdkh265enc_set_extra_params;
+  encoder_class->is_format_supported = gst_msdkh265enc_is_format_supported;
+
+  _msdkh265enc_install_properties (gobject_class, encoder_class);
+
   gst_element_class_set_static_metadata (element_class,
       "Intel MSDK H265 encoder",
       "Codec/Encoder/Video/Hardware",
       "H265 video encoder based on " MFX_API_SDK,
       "Josep Torra <jtorra@oblong.com>");
 
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkh265enc_init (GstMsdkH265Enc * thiz)
+gst_msdkh265enc_init (GTypeInstance * instance, gpointer g_class)
 {
-  GstMsdkEnc *msdk_enc = (GstMsdkEnc *) thiz;
+  GstMsdkH265Enc *thiz = GST_MSDKH265ENC (instance);
+  GstMsdkEnc *msdk_enc = (GstMsdkEnc *) instance;
   thiz->lowpower = PROP_LOWPOWER_DEFAULT;
   thiz->num_tile_rows = PROP_TILE_ROW_DEFAULT;
   thiz->num_tile_cols = PROP_TILE_COL_DEFAULT;
@@ -1052,11 +1178,68 @@
   thiz->b_pyramid = PROP_B_PYRAMID_DEFAULT;
   thiz->p_pyramid = PROP_P_PYRAMID_DEFAULT;
   thiz->min_qp = PROP_MIN_QP_DEFAULT;
+  thiz->min_qp_i = PROP_MIN_QP_DEFAULT;
+  thiz->min_qp_p = PROP_MIN_QP_DEFAULT;
+  thiz->min_qp_b = PROP_MIN_QP_DEFAULT;
   thiz->max_qp = PROP_MAX_QP_DEFAULT;
+  thiz->max_qp_i = PROP_MAX_QP_DEFAULT;
+  thiz->max_qp_p = PROP_MAX_QP_DEFAULT;
+  thiz->max_qp_b = PROP_MAX_QP_DEFAULT;
   thiz->intra_refresh_type = PROP_INTRA_REFRESH_TYPE_DEFAULT;
   thiz->intra_refresh_cycle_size = PROP_INTRA_REFRESH_CYCLE_SIZE_DEFAULT;
   thiz->intra_refresh_qp_delta = PROP_INTRA_REFRESH_QP_DELTA_DEFAULT;
   thiz->intra_refresh_cycle_dist = PROP_INTRA_REFRESH_CYCLE_DIST_DEFAULT;
   thiz->dblk_idc = PROP_DBLK_IDC_DEFAULT;
+  thiz->pic_timing_sei = PROP_PIC_TIMING_SEI_DEFAULT;
   msdk_enc->num_extra_frames = 1;
 }
+
+gboolean
+gst_msdkh265enc_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkEncCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkH265EncClass),
+    .class_init = gst_msdkh265enc_class_init,
+    .instance_size = sizeof (GstMsdkH265Enc),
+    .instance_init = gst_msdkh265enc_init
+  };
+
+  cdata = g_new (MsdkEncCData, 1);
+  cdata->sink_caps = gst_caps_copy (sink_caps);
+  cdata->src_caps = gst_caps_copy (src_caps);
+
+#ifdef _WIN32
+  gst_msdkcaps_set_strings (cdata->sink_caps,
+      "memory:D3D11Memory", "format", "NV12, P010_10LE");
+#endif
+
+  gst_caps_set_simple (cdata->src_caps,
+      "alignment", G_TYPE_STRING, "au",
+      "stream-format", G_TYPE_STRING, "byte-stream", NULL);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkH265Enc");
+  feature_name = g_strdup ("msdkh265enc");
+
+  type = g_type_register_static (GST_TYPE_MSDKENC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkh265enc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkh265enc.h Changed

@@ -37,17 +37,6 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_MSDKH265ENC \
-  (gst_msdkh265enc_get_type())
-#define GST_MSDKH265ENC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MSDKH265ENC,GstMsdkH265Enc))
-#define GST_MSDKH265ENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MSDKH265ENC,GstMsdkH265EncClass))
-#define GST_IS_MSDKH265ENC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MSDKH265ENC))
-#define GST_IS_MSDKH265ENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MSDKH265ENC))
-
 typedef struct _GstMsdkH265Enc GstMsdkH265Enc;
 typedef struct _GstMsdkH265EncClass GstMsdkH265EncClass;
 
@@ -66,12 +55,19 @@
   guint b_pyramid;
   guint p_pyramid;
   guint min_qp;
+  guint min_qp_i;
+  guint min_qp_p;
+  guint min_qp_b;
   guint max_qp;
+  guint max_qp_i;
+  guint max_qp_p;
+  guint max_qp_b;
   guint intra_refresh_type;
   guint intra_refresh_cycle_size;
   gint intra_refresh_qp_delta;
   guint intra_refresh_cycle_dist;
   guint dblk_idc;
+  gboolean pic_timing_sei;
 
   mfxExtHEVCTiles ext_tiles;
   mfxExtHEVCParam ext_param;
@@ -80,6 +76,12 @@
   /* roi0 for current ROI and roi1 for previous ROI */
   mfxExtEncoderROI roi2;
 
+  /* HDR SEI */
+  mfxExtMasteringDisplayColourVolume mdcv;
+  mfxExtContentLightLevelInfo cll;
+  gboolean have_mdcv;
+  gboolean have_cll;
+
   GstH265Parser *parser;
   GArray *cc_sei_array;
 };
@@ -89,7 +91,10 @@
   GstMsdkEncClass parent_class;
 };
 
-GType gst_msdkh265enc_get_type (void);
+gboolean
+gst_msdkh265enc_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank);
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkmjpegdec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkmjpegdec.c Changed

@@ -53,28 +53,33 @@
 #include <mfxjpeg.h>
 
 #include "gstmsdkmjpegdec.h"
-#include "gstmsdkvideomemory.h"
 
 #include <gst/pbutils/pbutils.h>
 
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkmjpegdec_debug);
 #define GST_CAT_DEFAULT gst_msdkmjpegdec_debug
 
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("image/jpeg, "
-        "width = (int)  1, MAX , height = (int)  1, MAX , parsed = true ")
-    );
+#define GST_MSDKMJPEGDEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkMJPEGDec))
+#define GST_MSDKMJPEGDEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkMJPEGDecClass))
+#define GST_IS_MSDKMJPEGDEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKMJPEGDEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
 
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR ("{ NV12, YUY2 }", "{ NV12, YUY2 }"))
-    );
+/* *INDENT-OFF* */
+static const gchar *doc_src_caps_str =
+    GST_VIDEO_CAPS_MAKE ("{ NV12, YUY2, BGRA }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf",
+        "{ NV12, YUY2, BGRA }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory", "{ NV12 }");
+/* *INDENT-ON* */
 
-#define gst_msdkmjpegdec_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkMJPEGDec, gst_msdkmjpegdec, GST_TYPE_MSDKDEC);
+static const gchar *doc_sink_caps_str = "image/jpeg";
+
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkmjpegdec_configure (GstMsdkDec * decoder)
@@ -106,6 +111,7 @@
 gst_msdkmjpegdec_post_configure (GstMsdkDec * decoder)
 {
   /* Set the output color format based on the input color format */
+  GST_OBJECT_LOCK (decoder);
   switch (decoder->param.mfx.JPEGChromaFormat) {
     case MFX_CHROMAFORMAT_YUV422:
       decoder->param.mfx.FrameInfo.FourCC = MFX_FOURCC_YUY2;
@@ -116,6 +122,7 @@
       break;
   }
 
+  GST_OBJECT_UNLOCK (decoder);
   return TRUE;
 }
 
@@ -175,11 +182,14 @@
 }
 
 static void
-gst_msdkmjpegdec_class_init (GstMsdkMJPEGDecClass * klass)
+gst_msdkmjpegdec_class_init (gpointer klass, gpointer data)
 {
   GObjectClass *gobject_class;
   GstElementClass *element_class;
   GstMsdkDecClass *decoder_class;
+  MsdkDecCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class = G_OBJECT_CLASS (klass);
   element_class = GST_ELEMENT_CLASS (klass);
@@ -202,11 +212,58 @@
   gst_msdkdec_prop_install_error_report_property (gobject_class);
 #endif
 
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkmjpegdec_init (GstMsdkMJPEGDec * thiz)
+gst_msdkmjpegdec_init (GTypeInstance * instance, gpointer g_class)
+{
+}
+
+gboolean
+gst_msdkmjpegdec_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
 {
+  GType type;
+  MsdkDecCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkMJPEGDecClass),
+    .class_init = gst_msdkmjpegdec_class_init,
+    .instance_size = sizeof (GstMsdkMJPEGDec),
+    .instance_init = gst_msdkmjpegdec_init
+  };
+
+  cdata = g_new (MsdkDecCData, 1);
+  cdata->sink_caps = gst_caps_copy (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+  gst_caps_set_simple (cdata->sink_caps, "parsed", G_TYPE_BOOLEAN, TRUE, NULL);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkMJPEGDec");
+  feature_name = g_strdup ("msdkmjpegdec");
+
+  type = g_type_register_static (GST_TYPE_MSDKDEC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
 }

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkmjpegdec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkmjpegdec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkmjpegenc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkmjpegenc.c Changed

@@ -62,6 +62,15 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkmjpegenc_debug);
 #define GST_CAT_DEFAULT gst_msdkmjpegenc_debug
 
+#define GST_MSDKMJPEGENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkMJPEGEnc))
+#define GST_MSDKMJPEGENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkMJPEGEncClass))
+#define GST_IS_MSDKMJPEGENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKMJPEGENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
+
 enum
 {
   PROP_0,
@@ -70,16 +79,18 @@
 
 #define DEFAULT_QUALITY 85
 
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("image/jpeg, "
-        "framerate = (fraction) 0/1, MAX, "
-        "width = (int)  1, MAX , height = (int)  1, MAX ")
-    );
+/* *INDENT-OFF* */
+static const gchar *doc_sink_caps_str =
+    GST_VIDEO_CAPS_MAKE ("{ NV12, YUY2, BGRA }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf",
+        "{ NV12, YUY2, BGRA }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory", "{ NV12 }");
+/* *INDENT-ON* */
+
+static const gchar *doc_src_caps_str = "image/jpeg";
 
-#define gst_msdkmjpegenc_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkMJPEGEnc, gst_msdkmjpegenc, GST_TYPE_MSDKENC);
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkmjpegenc_set_format (GstMsdkEnc * encoder)
@@ -148,31 +159,30 @@
 }
 
 static gboolean
-gst_msdkmjpegenc_need_conversion (GstMsdkEnc * encoder, GstVideoInfo * info,
-    GstVideoFormat * out_format)
+gst_msdkmjpegenc_is_format_supported (GstMsdkEnc * encoder,
+    GstVideoFormat format)
 {
-  switch (GST_VIDEO_INFO_FORMAT (info)) {
+  switch (format) {
     case GST_VIDEO_FORMAT_NV12:
     case GST_VIDEO_FORMAT_YUY2:
-    case GST_VIDEO_FORMAT_BGRA:
-      return FALSE;
-
     case GST_VIDEO_FORMAT_UYVY:
-      *out_format = GST_VIDEO_FORMAT_YUY2;
+    case GST_VIDEO_FORMAT_BGRA:
+    case GST_VIDEO_FORMAT_BGRx:
       return TRUE;
-
     default:
-      *out_format = GST_VIDEO_FORMAT_NV12;
-      return TRUE;
+      return FALSE;
   }
 }
 
 static void
-gst_msdkmjpegenc_class_init (GstMsdkMJPEGEncClass * klass)
+gst_msdkmjpegenc_class_init (gpointer klass, gpointer data)
 {
   GObjectClass *gobject_class;
   GstElementClass *element_class;
   GstMsdkEncClass *encoder_class;
+  MsdkEncCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class = G_OBJECT_CLASS (klass);
   element_class = GST_ELEMENT_CLASS (klass);
@@ -181,7 +191,7 @@
   encoder_class->set_format = gst_msdkmjpegenc_set_format;
   encoder_class->configure = gst_msdkmjpegenc_configure;
   encoder_class->set_src_caps = gst_msdkmjpegenc_set_src_caps;
-  encoder_class->need_conversion = gst_msdkmjpegenc_need_conversion;
+  encoder_class->is_format_supported = gst_msdkmjpegenc_is_format_supported;
 
   gobject_class->get_property = gst_msdkmjpegenc_get_property;
   gobject_class->set_property = gst_msdkmjpegenc_set_property;
@@ -196,11 +206,58 @@
       "MJPEG video encoder based on " MFX_API_SDK,
       "Scott D Phillips <scott.d.phillips@intel.com>");
 
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkmjpegenc_init (GstMsdkMJPEGEnc * thiz)
+gst_msdkmjpegenc_init (GTypeInstance * instance, gpointer g_class)
 {
+  GstMsdkMJPEGEnc *thiz = GST_MSDKMJPEGENC (instance);
   thiz->quality = DEFAULT_QUALITY;
 }
+
+gboolean
+gst_msdkmjpegenc_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkEncCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkMJPEGEncClass),
+    .class_init = gst_msdkmjpegenc_class_init,
+    .instance_size = sizeof (GstMsdkMJPEGEnc),
+    .instance_init = gst_msdkmjpegenc_init
+  };
+
+  cdata = g_new (MsdkEncCData, 1);
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkMJPEGEnc");
+  feature_name = g_strdup ("msdkmjpegenc");
+
+  type = g_type_register_static (GST_TYPE_MSDKENC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkmjpegenc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkmjpegenc.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkmpeg2dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkmpeg2dec.c Changed

@@ -57,16 +57,26 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkmpeg2dec_debug);
 #define GST_CAT_DEFAULT gst_msdkmpeg2dec_debug
 
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/mpeg, "
-        "width = (int)  1, MAX , height = (int)  1, MAX , "
-        "mpegversion = (int) 2, " "systemstream = (boolean) false")
-    );
-
-#define gst_msdkmpeg2dec_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkMPEG2Dec, gst_msdkmpeg2dec, GST_TYPE_MSDKDEC);
+#define GST_MSDKMPEG2DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkMPEG2Dec))
+#define GST_MSDKMPEG2DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkMPEG2DecClass))
+#define GST_IS_MSDKMPEG2DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKMPEG2DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
+
+/* *INDENT-OFF* */
+static const gchar *doc_src_caps_str =
+    GST_VIDEO_CAPS_MAKE ("{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory", "{ NV12 }");
+/* *INDENT-ON* */
+
+static const gchar *doc_sink_caps_str = "video/mpeg";
+
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkmpeg2dec_configure (GstMsdkDec * decoder)
@@ -127,11 +137,14 @@
 }
 
 static void
-gst_msdkmpeg2dec_class_init (GstMsdkMPEG2DecClass * klass)
+gst_msdkmpeg2dec_class_init (gpointer klass, gpointer data)
 {
   GObjectClass *gobject_class;
   GstElementClass *element_class;
   GstMsdkDecClass *decoder_class;
+  MsdkDecCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class = G_OBJECT_CLASS (klass);
   element_class = GST_ELEMENT_CLASS (klass);
@@ -150,11 +163,62 @@
 
   gst_msdkdec_prop_install_output_oder_property (gobject_class);
 
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkmpeg2dec_init (GstMsdkMPEG2Dec * thiz)
+gst_msdkmpeg2dec_init (GTypeInstance * instance, gpointer g_class)
 {
+  GstMsdkMPEG2Dec *thiz = GST_MSDKMPEG2DEC (instance);
   thiz->output_order = PROP_OUTPUT_ORDER_DEFAULT;
 }
+
+gboolean
+gst_msdkmpeg2dec_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkDecCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkMPEG2DecClass),
+    .class_init = gst_msdkmpeg2dec_class_init,
+    .instance_size = sizeof (GstMsdkMPEG2Dec),
+    .instance_init = gst_msdkmpeg2dec_init
+  };
+
+  cdata = g_new (MsdkDecCData, 1);
+  cdata->sink_caps = gst_caps_copy (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+  gst_caps_set_simple (cdata->sink_caps,
+      "mpegversion", G_TYPE_INT, 2,
+      "systemstream", G_TYPE_BOOLEAN, FALSE, NULL);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkMPEG2Dec");
+  feature_name = g_strdup ("msdkmpeg2dec");
+
+  type = g_type_register_static (GST_TYPE_MSDKDEC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkmpeg2dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkmpeg2dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkmpeg2enc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkmpeg2enc.c Changed

@@ -54,30 +54,40 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkmpeg2enc_debug);
 #define GST_CAT_DEFAULT gst_msdkmpeg2enc_debug
 
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/mpeg, "
-        "framerate = (fraction) 0/1, MAX, "
-        "width = (int)  1, MAX , height = (int)  1, MAX , "
-        "mpegversion = (int) 2 , systemstream = (bool) false, "
-        "profile = (string) { high, main, simple }")
-    );
-
-#define gst_msdkmpeg2enc_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkMPEG2Enc, gst_msdkmpeg2enc, GST_TYPE_MSDKENC);
+#define GST_MSDKMPEG2ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkMPEG2Enc))
+#define GST_MSDKMPEG2ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkMPEG2EncClass))
+#define GST_IS_MSDKMPEG2ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKMPEG2ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
+
+/* *INDENT-OFF* */
+static const gchar *doc_sink_caps_str =
+    GST_VIDEO_CAPS_MAKE ("{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory", "{ NV12 }");
+/* *INDENT-ON* */
+
+static const gchar *doc_src_caps_str = "video/mpeg";
+
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkmpeg2enc_set_format (GstMsdkEnc * encoder)
 {
   GstMsdkMPEG2Enc *thiz = GST_MSDKMPEG2ENC (encoder);
+  GstPad *srcpad;
   GstCaps *template_caps;
   GstCaps *allowed_caps = NULL;
 
   thiz->profile = 0;
 
-  template_caps = gst_static_pad_template_get_caps (&src_factory);
-  allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (encoder));
+  srcpad = GST_VIDEO_ENCODER_SRC_PAD (encoder);
+  template_caps = gst_pad_get_pad_template_caps (srcpad);
+  allowed_caps = gst_pad_get_allowed_caps (srcpad);
 
   /* If downstream has ANY caps let encoder decide profile and level */
   if (allowed_caps == template_caps) {
@@ -188,11 +198,14 @@
 }
 
 static void
-gst_msdkmpeg2enc_class_init (GstMsdkMPEG2EncClass * klass)
+gst_msdkmpeg2enc_class_init (gpointer klass, gpointer data)
 {
   GObjectClass *gobject_class;
   GstElementClass *element_class;
   GstMsdkEncClass *encoder_class;
+  MsdkEncCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class = G_OBJECT_CLASS (klass);
   element_class = GST_ELEMENT_CLASS (klass);
@@ -213,10 +226,60 @@
       "MPEG2 video encoder based on " MFX_API_SDK,
       "Josep Torra <jtorra@oblong.com>");
 
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkmpeg2enc_init (GstMsdkMPEG2Enc * thiz)
+gst_msdkmpeg2enc_init (GTypeInstance * instance, gpointer g_class)
 {
 }
+
+gboolean
+gst_msdkmpeg2enc_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkEncCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkMPEG2EncClass),
+    .class_init = gst_msdkmpeg2enc_class_init,
+    .instance_size = sizeof (GstMsdkMPEG2Enc),
+    .instance_init = gst_msdkmpeg2enc_init
+  };
+
+  cdata = g_new (MsdkEncCData, 1);
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = gst_caps_copy (src_caps);
+
+  gst_caps_set_simple (cdata->src_caps,
+      "mpegversion", G_TYPE_INT, 2,
+      "systemstream", G_TYPE_BOOLEAN, FALSE, NULL);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkMPEG2Enc");
+  feature_name = g_strdup ("msdkmpeg2enc");
+
+  type = g_type_register_static (GST_TYPE_MSDKENC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkmpeg2enc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkmpeg2enc.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvc1dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkvc1dec.c Changed

@@ -56,28 +56,25 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkvc1dec_debug);
 #define GST_CAT_DEFAULT gst_msdkvc1dec_debug
 
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-wmv, "
-        "framerate = (fraction) 0/1, MAX, "
-        "width = (int)  1, MAX , height = (int)  1, MAX , "
-        "wmvversion= (int) 3, "
-        "format= (string) WMV3, "
-        "header-format= (string) none, "
-        "stream-format= (string) sequence-layer-frame-layer, "
-        "profile = (string) {simple, main}" ";"
-        "video/x-wmv, "
-        "framerate = (fraction) 0/1, MAX, "
-        "width = (int)  1, MAX , height = (int)  1, MAX , "
-        "wmvversion= (int) 3, "
-        "format= (string) WVC1, "
-        "header-format= (string) asf, "
-        "stream-format= (string) bdu, " "profile = (string) advanced" ";")
-    );
-
-#define gst_msdkvc1dec_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkVC1Dec, gst_msdkvc1dec, GST_TYPE_MSDKDEC);
+#define GST_MSDKVC1DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkVC1Dec))
+#define GST_MSDKVC1DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkVC1DecClass))
+#define GST_IS_MSDKVC1DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKVC1DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
+
+/* *INDENT-OFF* */
+static const gchar *doc_src_caps_str =
+    GST_VIDEO_CAPS_MAKE ("{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }");
+/* *INDENT-ON* */
+
+static const gchar *doc_sink_caps_str = "video/x-wmv";
+
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkvc1dec_configure (GstMsdkDec * decoder)
@@ -183,11 +180,14 @@
 }
 
 static void
-gst_msdkvc1dec_class_init (GstMsdkVC1DecClass * klass)
+gst_msdkvc1dec_class_init (gpointer klass, gpointer data)
 {
   GObjectClass *gobject_class;
   GstElementClass *element_class;
   GstMsdkDecClass *decoder_class;
+  MsdkDecCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class = G_OBJECT_CLASS (klass);
   element_class = GST_ELEMENT_CLASS (klass);
@@ -208,11 +208,59 @@
 
   gst_msdkdec_prop_install_output_oder_property (gobject_class);
 
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
+
 }
 
 static void
-gst_msdkvc1dec_init (GstMsdkVC1Dec * thiz)
+gst_msdkvc1dec_init (GTypeInstance * instance, gpointer g_class)
 {
+  GstMsdkVC1Dec *thiz = GST_MSDKVC1DEC (instance);
   thiz->output_order = PROP_OUTPUT_ORDER_DEFAULT;
 }
+
+gboolean
+gst_msdkvc1dec_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkDecCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkVC1DecClass),
+    .class_init = gst_msdkvc1dec_class_init,
+    .instance_size = sizeof (GstMsdkVC1Dec),
+    .instance_init = gst_msdkvc1dec_init
+  };
+
+  cdata = g_new (MsdkDecCData, 1);
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkVC1Dec");
+  feature_name = g_strdup ("msdkvc1dec");
+
+  type = g_type_register_static (GST_TYPE_MSDKDEC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvc1dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkvc1dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvp8dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkvp8dec.c Changed

@@ -57,14 +57,25 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkvp8dec_debug);
 #define GST_CAT_DEFAULT gst_msdkvp8dec_debug
 
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-vp8")
-    );
+#define GST_MSDKVP8DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkVP8Dec))
+#define GST_MSDKVP8DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass),  GstMsdkVP8DecClass))
+#define GST_IS_MSDKVP8DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKVP8DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
 
-#define gst_msdkvp8dec_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkVP8Dec, gst_msdkvp8dec, GST_TYPE_MSDKDEC);
+/* *INDENT-OFF* */
+static const gchar *doc_src_caps_str =
+    GST_VIDEO_CAPS_MAKE ("{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }");
+/* *INDENT-ON* */
+
+static const gchar *doc_sink_caps_str = "video/x-vp8";
+
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkvp8dec_configure (GstMsdkDec * decoder)
@@ -168,11 +179,14 @@
 }
 
 static void
-gst_msdkvp8dec_class_init (GstMsdkVP8DecClass * klass)
+gst_msdkvp8dec_class_init (gpointer klass, gpointer data)
 {
   GObjectClass *gobject_class;
   GstElementClass *element_class;
   GstMsdkDecClass *decoder_class;
+  MsdkDecCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class = G_OBJECT_CLASS (klass);
   element_class = GST_ELEMENT_CLASS (klass);
@@ -195,11 +209,58 @@
 
   gst_msdkdec_prop_install_output_oder_property (gobject_class);
 
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkvp8dec_init (GstMsdkVP8Dec * thiz)
+gst_msdkvp8dec_init (GTypeInstance * instance, gpointer g_class)
 {
+  GstMsdkVP8Dec *thiz = GST_MSDKVP8DEC (instance);
   thiz->output_order = PROP_OUTPUT_ORDER_DEFAULT;
 }
+
+gboolean
+gst_msdkvp8dec_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkDecCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkVP8DecClass),
+    .class_init = gst_msdkvp8dec_class_init,
+    .instance_size = sizeof (GstMsdkVP8Dec),
+    .instance_init = gst_msdkvp8dec_init
+  };
+
+  cdata = g_new (MsdkDecCData, 1);
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkVP8Dec");
+  feature_name = g_strdup ("msdkvp8dec");
+
+  type = g_type_register_static (GST_TYPE_MSDKDEC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvp8dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkvp8dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvp9dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkvp9dec.c Changed

@@ -52,27 +52,32 @@
 #endif
 
 #include "gstmsdkvp9dec.h"
-#include "gstmsdkvideomemory.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkvp9dec_debug);
 #define GST_CAT_DEFAULT gst_msdkvp9dec_debug
 
-#define COMMON_FORMAT "{ NV12, P010_10LE, VUYA, Y410, P012_LE, Y412_LE }"
-
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-vp9")
-    );
-
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR (COMMON_FORMAT, COMMON_FORMAT))
-    );
-
-#define gst_msdkvp9dec_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkVP9Dec, gst_msdkvp9dec, GST_TYPE_MSDKDEC);
+#define GST_MSDKVP9DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkVP9Dec))
+#define GST_MSDKVP9DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass),  GstMsdkVP9DecClass))
+#define GST_IS_MSDKVP9DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKVP9DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
+
+/* *INDENT-OFF* */
+static const gchar *doc_src_caps_str =
+    GST_VIDEO_CAPS_MAKE (
+        "{ NV12, P010_10LE, VUYA, Y410, P012_LE, Y412_LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf",
+        "{ NV12, P010_10LE, VUYA, Y410, P012_LE, Y412_LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory", "{ NV12 }");
+/* *INDENT-ON* */
+
+static const gchar *doc_sink_caps_str = "video/x-vp9";
+
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkvp9dec_configure (GstMsdkDec * decoder)
@@ -165,11 +170,14 @@
 }
 
 static void
-gst_msdkvp9dec_class_init (GstMsdkVP9DecClass * klass)
+gst_msdkvp9dec_class_init (gpointer klass, gpointer data)
 {
   GObjectClass *gobject_class;
   GstElementClass *element_class;
   GstMsdkDecClass *decoder_class;
+  MsdkDecCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class = G_OBJECT_CLASS (klass);
   element_class = GST_ELEMENT_CLASS (klass);
@@ -190,12 +198,58 @@
 
   gst_msdkdec_prop_install_output_oder_property (gobject_class);
 
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);;
 }
 
 static void
-gst_msdkvp9dec_init (GstMsdkVP9Dec * thiz)
+gst_msdkvp9dec_init (GTypeInstance * instance, gpointer g_class)
 {
+  GstMsdkVP9Dec *thiz = GST_MSDKVP9DEC (instance);
   thiz->output_order = PROP_OUTPUT_ORDER_DEFAULT;
 }
+
+gboolean
+gst_msdkvp9dec_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkDecCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkVP9DecClass),
+    .class_init = gst_msdkvp9dec_class_init,
+    .instance_size = sizeof (GstMsdkVP9Dec),
+    .instance_init = gst_msdkvp9dec_init
+  };
+
+  cdata = g_new (MsdkDecCData, 1);
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkVP9Dec");
+  feature_name = g_strdup ("msdkvp9dec");
+
+  type = g_type_register_static (GST_TYPE_MSDKDEC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvp9dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkvp9dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvp9enc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkvp9enc.c Changed

@@ -56,55 +56,42 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkvp9enc_debug);
 #define GST_CAT_DEFAULT gst_msdkvp9enc_debug
 
-#define RAW_FORMATS "NV12, I420, YV12, YUY2, UYVY, BGRA, P010_10LE, VUYA"
-#define PROFILES    "0, 1, 2"
-
-#if (MFX_VERSION >= 1027)
-#define COMMON_FORMAT "{ " RAW_FORMATS ", Y410 }"
-#define SRC_PROFILES  "{ " PROFILES ", 3 }"
-#else
-#define COMMON_FORMAT "{ " RAW_FORMATS " }"
-#define SRC_PROFILES  "{ " PROFILES " }"
-#endif
-
-#ifdef _WIN32
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR (COMMON_FORMAT,
-            "{ NV12, P010_10LE }") "; "
-        GST_MSDK_CAPS_MAKE_WITH_D3D11_FEATURE ("{ NV12, P010_10LE }")));
-#else
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_MSDK_CAPS_STR (COMMON_FORMAT,
-            "{ NV12, P010_10LE }") "; "
-        GST_MSDK_CAPS_MAKE_WITH_VA_FEATURE ("NV12")));
-#endif
-
-static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("video/x-vp9, "
-        "framerate = (fraction) 0/1, MAX, "
-        "width = (int)  1, MAX , height = (int)  1, MAX , "
-        "profile = (string) " SRC_PROFILES)
-    );
-
-#define gst_msdkvp9enc_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkVP9Enc, gst_msdkvp9enc, GST_TYPE_MSDKENC);
+#define GST_MSDKVP9ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkVP9Enc))
+#define GST_MSDKVP9ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkVP9EncClass))
+#define GST_IS_MSDKVP9ENC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKVP9ENC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
+
+/* *INDENT-OFF* */
+static const gchar *doc_sink_caps_str =
+    GST_VIDEO_CAPS_MAKE ("{ NV12, P010_10LE, VUYA, Y410 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf",
+        "{ NV12, P010_10LE, VUYA, Y410 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory",
+        "{ NV12, P010_10LE }");
+/* *INDENT-ON* */
+
+static const gchar *doc_src_caps_str = "video/x-vp9";
+
+static GstElementClass *parent_class = NULL;
 
 static gboolean
 gst_msdkvp9enc_set_format (GstMsdkEnc * encoder)
 {
   GstMsdkVP9Enc *thiz = GST_MSDKVP9ENC (encoder);
+  GstPad *srcpad;
   GstCaps *template_caps;
   GstCaps *allowed_caps = NULL;
 
   thiz->profile = MFX_PROFILE_VP9_0;
-  template_caps = gst_static_pad_template_get_caps (&src_factory);
-  allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (encoder));
+
+  srcpad = GST_VIDEO_ENCODER_SRC_PAD (encoder);
+  template_caps = gst_pad_get_pad_template_caps (srcpad);
+  allowed_caps = gst_pad_get_allowed_caps (srcpad);
 
   /* If downstream has ANY caps let encoder decide profile and level */
   if (allowed_caps == template_caps) {
@@ -245,6 +232,22 @@
   return caps;
 }
 
+static gboolean
+gst_msdkvp9enc_is_format_supported (GstMsdkEnc * encoder, GstVideoFormat format)
+{
+  switch (format) {
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_VUYA:
+    case GST_VIDEO_FORMAT_P010_10LE:
+#if (MFX_VERSION >= 1027)
+    case GST_VIDEO_FORMAT_Y410:
+#endif
+      return TRUE;
+    default:
+      return FALSE;
+  }
+}
+
 static void
 gst_msdkvp9enc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
@@ -266,11 +269,14 @@
 }
 
 static void
-gst_msdkvp9enc_class_init (GstMsdkVP9EncClass * klass)
+gst_msdkvp9enc_class_init (gpointer klass, gpointer data)
 {
   GObjectClass *gobject_class;
   GstElementClass *element_class;
   GstMsdkEncClass *encoder_class;
+  MsdkEncCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class = G_OBJECT_CLASS (klass);
   element_class = GST_ELEMENT_CLASS (klass);
@@ -282,6 +288,7 @@
   encoder_class->set_format = gst_msdkvp9enc_set_format;
   encoder_class->configure = gst_msdkvp9enc_configure;
   encoder_class->set_src_caps = gst_msdkvp9enc_set_src_caps;
+  encoder_class->is_format_supported = gst_msdkvp9enc_is_format_supported;
   encoder_class->qp_max = 255;
   encoder_class->qp_min = 0;
 
@@ -293,11 +300,61 @@
       "VP9 video encoder based on " MFX_API_SDK,
       "Haihao Xiang <haihao.xiang@intel.com>");
 
-  gst_element_class_add_static_pad_template (element_class, &sink_factory);
-  gst_element_class_add_static_pad_template (element_class, &src_factory);
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
 }
 
 static void
-gst_msdkvp9enc_init (GstMsdkVP9Enc * thiz)
+gst_msdkvp9enc_init (GTypeInstance * instance, gpointer g_class)
 {
 }
+
+gboolean
+gst_msdkvp9enc_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkEncCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkVP9EncClass),
+    .class_init = gst_msdkvp9enc_class_init,
+    .instance_size = sizeof (GstMsdkVP9Enc),
+    .instance_init = gst_msdkvp9enc_init
+  };
+
+  cdata = g_new (MsdkEncCData, 1);
+  cdata->sink_caps = gst_caps_copy (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+#ifdef _WIN32
+  gst_msdkcaps_set_strings (cdata->sink_caps,
+      "memory:D3D11Memory", "format", "NV12, P010_10LE");
+#endif
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkVP9Enc");
+  feature_name = g_strdup ("msdkvp9enc");
+
+  type = g_type_register_static (GST_TYPE_MSDKENC, type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvp9enc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkvp9enc.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvpp.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkvpp.c Changed

@@ -54,117 +54,33 @@
 #include <stdlib.h>
 
 #include "gstmsdkvpp.h"
-#include "gstmsdkbufferpool.h"
-#include "gstmsdkvideomemory.h"
-#include "gstmsdksystemmemory.h"
+#include "gstmsdkcaps.h"
 #include "gstmsdkcontextutil.h"
 #include "gstmsdkvpputil.h"
-
-#define EXT_FORMATS     ""
+#include "gstmsdkallocator.h"
 
 #ifndef _WIN32
+#include <libdrm/drm_fourcc.h>
 #include "gstmsdkallocator_libva.h"
 #include <gst/va/gstvaallocator.h>
-#if VA_CHECK_VERSION(1, 4, 1)
-#undef EXT_FORMATS
-#define EXT_FORMATS     ", BGR10A2_LE"
-#endif
+#include <gst/va/gstvavideoformat.h>
 #else
 #include <gst/d3d11/gstd3d11.h>
 #endif
 
-#if (MFX_VERSION >= 2004)
-#define EXT_SINK_FORMATS        ", RGB16, Y410, Y210, P012_LE, Y212_LE, Y412_LE"
-#define EXT_SRC_FORMATS         ", YV12, Y410, Y210, RGBP, BGRP, P012_LE, Y212_LE, Y412_LE"
-#elif (MFX_VERSION >= 1032)
-#define EXT_SINK_FORMATS        ", RGB16, Y410, Y210, P012_LE, Y212_LE, Y412_LE"
-#define EXT_SRC_FORMATS         ", YV12, Y410, Y210, P012_LE, Y212_LE, Y412_LE"
-#elif (MFX_VERSION >= 1031)
-#define EXT_SINK_FORMATS        ", RGB16, Y410, Y210, P012_LE, Y212_LE, Y412_LE"
-#define EXT_SRC_FORMATS         ", Y410, Y210, P012_LE, Y212_LE, Y412_LE"
-#elif (MFX_VERSION >= 1028)
-#define EXT_SINK_FORMATS        ", RGB16, Y410, Y210"
-#define EXT_SRC_FORMATS         ", Y410, Y210"
-#elif (MFX_VERSION >= 1027)
-#define EXT_SINK_FORMATS        ", Y410, Y210"
-#define EXT_SRC_FORMATS         ", Y410, Y210"
-#else
-#define EXT_SINK_FORMATS        ""
-#define EXT_SRC_FORMATS         ""
-#endif
 
 GST_DEBUG_CATEGORY_EXTERN (gst_msdkvpp_debug);
 #define GST_CAT_DEFAULT gst_msdkvpp_debug
 
-#define SUPPORTED_SYSTEM_FORMAT \
-    "{ NV12, YV12, I420, YUY2, UYVY, VUYA, BGRA, BGRx, P010_10LE" EXT_SINK_FORMATS "}"
-#define SUPPORTED_DMABUF_FORMAT \
-    "{ NV12, BGRA, YUY2, UYVY, VUYA, P010_10LE" EXT_SINK_FORMATS "}"
-#define SUPPORTED_VA_FORMAT \
-    "{ NV12, VUYA, P010_10LE }"
-#define SUPPORTED_D3D11_FORMAT \
-    "{ NV12, VUYA, P010_10LE }"
-#define SRC_SYSTEM_FORMAT \
-    "{ NV12, BGRA, YUY2, UYVY, VUYA, BGRx, P010_10LE" EXT_FORMATS EXT_SRC_FORMATS "}"
-#define SRC_DMABUF_FORMAT       \
-    "{ NV12, BGRA, YUY2, UYVY, VUYA, BGRx, P010_10LE" EXT_FORMATS EXT_SRC_FORMATS "}"
-
-#ifndef _WIN32
-#define DMABUF_SINK_CAPS_STR \
-  GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_DMABUF, \
-      SUPPORTED_DMABUF_FORMAT) ";"
-#define VA_SINK_CAPS_STR \
-  GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", SUPPORTED_VA_FORMAT)
-#else
-#define D3D11_SINK_CAPS_STR \
-  GST_MSDK_CAPS_MAKE_WITH_D3D11_FEATURE (SUPPORTED_D3D11_FORMAT)
-#endif
-
-#ifndef _WIN32
-#define DMABUF_SRC_CAPS_STR \
-  GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_DMABUF, \
-      SRC_DMABUF_FORMAT) ";"
-#define VA_SRC_CAPS_STR \
-  GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory", SUPPORTED_VA_FORMAT)
-#else
-#define D3D11_SRC_CAPS_STR \
-  GST_MSDK_CAPS_MAKE_WITH_D3D11_FEATURE (SUPPORTED_D3D11_FORMAT)
-#endif
+#define GST_MSDKVPP(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_FROM_INSTANCE (obj), GstMsdkVPP))
+#define GST_MSDKVPP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_FROM_CLASS (klass), GstMsdkVPPClass))
+#define GST_IS_MSDKVPP(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_FROM_INSTANCE (obj)))
+#define GST_IS_MSDKVPP_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_FROM_CLASS (klass)))
 
-#ifndef _WIN32
-static GstStaticPadTemplate gst_msdkvpp_sink_factory =
-    GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (SUPPORTED_SYSTEM_FORMAT)
-        ", " "interlace-mode = (string){ progressive, interleaved, mixed }" ";"
-        DMABUF_SINK_CAPS_STR VA_SINK_CAPS_STR));
-
-static GstStaticPadTemplate gst_msdkvpp_src_factory =
-    GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (DMABUF_SRC_CAPS_STR
-        GST_VIDEO_CAPS_MAKE (SRC_SYSTEM_FORMAT) ", "
-        "interlace-mode = (string){ progressive, interleaved, mixed }" ";"
-        VA_SRC_CAPS_STR));
-#else
-static GstStaticPadTemplate gst_msdkvpp_sink_factory =
-    GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (SUPPORTED_SYSTEM_FORMAT)
-        ", " "interlace-mode = (string){ progressive, interleaved, mixed }" ";"
-        D3D11_SINK_CAPS_STR));
-
-static GstStaticPadTemplate gst_msdkvpp_src_factory =
-    GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (SRC_SYSTEM_FORMAT) ", "
-        "interlace-mode = (string){ progressive, interleaved, mixed }" ";"
-        D3D11_SRC_CAPS_STR));
-#endif
 enum
 {
   PROP_0,
@@ -192,6 +108,7 @@
   PROP_CROP_RIGHT,
   PROP_CROP_TOP,
   PROP_CROP_BOTTOM,
+  PROP_HDR_TONE_MAPPING,
   PROP_N,
 };
 
@@ -217,12 +134,44 @@
 #define PROP_CROP_RIGHT_DEFAULT          0
 #define PROP_CROP_TOP_DEFAULT            0
 #define PROP_CROP_BOTTOM_DEFAULT         0
+#define PROP_HDR_TONE_MAPPING_DEFAULT    0
 
 /* 8 should enough for a normal encoder */
 #define SRC_POOL_SIZE_DEFAULT            8
 
-#define gst_msdkvpp_parent_class parent_class
-G_DEFINE_TYPE (GstMsdkVPP, gst_msdkvpp, GST_TYPE_BASE_TRANSFORM);
+/* *INDENT-OFF* */
+static const gchar *doc_sink_caps_str =
+    GST_VIDEO_CAPS_MAKE (
+        "{ NV12, YV12, I420, P010_10LE, YUY2, UYVY, BGRA, BGRx, RGB16, VUYA, "
+        "Y210, Y410, P012_LE, Y212_LE, Y412_LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf",
+        "{ NV12, YV12, I420, P010_10LE, YUY2, UYVY, BGRA, BGRx, RGB16, VUYA, "
+        "Y210, Y410, P012_LE, Y212_LE, Y412_LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory",
+        "{ NV12, VUYA, P010_10LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory",
+        "{ NV12, VUYA, P010_10LE }");
+
+static const gchar *doc_src_caps_str =
+    GST_VIDEO_CAPS_MAKE (
+        "{ NV12, BGRA, YUY2, UYVY, VUYA, BGRx, P010_10LE, BGR10A2_LE, YV12, "
+        "Y410, Y210, RGBP, BGRP, P012_LE, Y212_LE, Y412_LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:DMABuf",
+        "{ NV12, BGRA, YUY2, UYVY, VUYA, BGRx, P010_10LE, BGR10A2_LE, YV12, "
+        "Y410, Y210, RGBP, BGRP, P012_LE, Y212_LE, Y412_LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:VAMemory",
+        "{ NV12, VUYA, P010_10LE }") " ;"
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES ("memory:D3D11Memory",
+        "{ NV12, VUYA, P010_10LE }");
+/* *INDENT-ON* */
+
+static GstElementClass *parent_class = NULL;
+
+typedef struct
+{
+  GstCaps *sink_caps;
+  GstCaps *src_caps;
+} MsdkVPPCData;
 
 static void
 free_msdk_surface (gpointer p)
@@ -431,8 +380,8 @@
 
 #ifndef _WIN32
 static GstBufferPool *
-gst_msdk_create_va_pool (GstVideoInfo * info, GstMsdkContext * msdk_context,
-    gboolean use_dmabuf, guint min_buffers)
+gst_msdk_create_va_pool (GstMsdkVPP * thiz, GstVideoInfo * info,
+    GstMsdkContext * msdk_context, guint min_buffers, GstPadDirection direction)
 {
   GstBufferPool *pool = NULL;
   GstAllocator *allocator;
@@ -440,28 +389,52 @@
   GstAllocationParams alloc_params = { 0, 31, 0, 0 };
   GstVaDisplay *display = NULL;
   GstCaps *aligned_caps = NULL;
+  guint usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC;
+  gboolean use_dmabuf = FALSE;
+  guint64 modifier = DRM_FORMAT_MOD_INVALID;
 
   display = (GstVaDisplay *) gst_msdk_context_get_va_display (msdk_context);
 
+  if (direction == GST_PAD_SINK) {
+    use_dmabuf = thiz->use_sinkpad_dmabuf;
+    modifier = thiz->sink_modifier;
+  } else if (direction == GST_PAD_SRC) {
+    use_dmabuf = thiz->use_srcpad_dmabuf;
+    modifier = thiz->src_modifier;
+  }
+
   if (use_dmabuf)
     allocator = gst_va_dmabuf_allocator_new (display);
   else {
-    formats = g_array_new (FALSE, FALSE, sizeof (GstVideoFormat));
-    g_array_append_val (formats, GST_VIDEO_INFO_FORMAT (info));
+    /* From attrib query, va surface format doesn't support RGB565, so leave
+     * the formats as NULL when creating va allocator for RGB565 */
+    if (GST_VIDEO_INFO_FORMAT (info) != GST_VIDEO_FORMAT_RGB16) {
+      formats = g_array_new (FALSE, FALSE, sizeof (GstVideoFormat));
+      g_array_append_val (formats, GST_VIDEO_INFO_FORMAT (info));
+    }
     allocator = gst_va_allocator_new (display, formats);
   }
+
+  gst_object_unref (display);
+
   if (!allocator) {
     GST_ERROR ("Failed to create allocator");
     if (formats)
       g_array_unref (formats);
     return NULL;
   }
-  aligned_caps = gst_video_info_to_caps (info);
-  pool =
-      gst_va_pool_new_with_config (aligned_caps,
-      GST_VIDEO_INFO_SIZE (info), min_buffers, 0,
-      VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC, GST_VA_FEATURE_AUTO,
-      allocator, &alloc_params);
+
+  if (use_dmabuf && modifier != DRM_FORMAT_MOD_INVALID) {
+    aligned_caps = gst_msdkcaps_video_info_to_drm_caps (info, modifier);
+    usage_hint |= VA_SURFACE_ATTRIB_USAGE_HINT_VPP_READ |
+        VA_SURFACE_ATTRIB_USAGE_HINT_VPP_WRITE;
+    gst_caps_set_features (aligned_caps, 0,
+        gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_DMABUF, NULL));
+  } else
+    aligned_caps = gst_video_info_to_caps (info);
+
+  pool = gst_va_pool_new_with_config (aligned_caps, min_buffers, 0, usage_hint,
+      GST_VA_FEATURE_AUTO, allocator, &alloc_params);
 
   gst_object_unref (allocator);
   gst_caps_unref (aligned_caps);
@@ -531,17 +504,14 @@
   GstVideoInfo info;
   GstVideoInfo *pool_info = NULL;
   GstVideoAlignment align;
-  gboolean use_dmabuf = FALSE;
 
   if (direction == GST_PAD_SINK) {
     pool_info = &thiz->sinkpad_buffer_pool_info;
-    use_dmabuf = thiz->use_sinkpad_dmabuf;
   } else if (direction == GST_PAD_SRC) {
     pool_info = &thiz->srcpad_buffer_pool_info;
-    use_dmabuf = thiz->use_srcpad_dmabuf;
   }
 
-  if (!gst_video_info_from_caps (&info, caps)) {
+  if (!gst_msdkcaps_video_info_from_caps (caps, &info, NULL)) {
     goto error_no_video_info;
   }
 
@@ -549,8 +519,8 @@
   gst_video_info_align (&info, &align);
 
 #ifndef _WIN32
-  pool = gst_msdk_create_va_pool (&info, thiz->context, use_dmabuf,
-      min_num_buffers);
+  pool = gst_msdk_create_va_pool (thiz, &info, thiz->context, min_num_buffers,
+      direction);
 #else
   pool = gst_msdk_create_d3d11_pool (thiz, &info, min_num_buffers, propose);
 #endif
@@ -561,13 +531,6 @@
     goto error_no_pool;
 
   config = gst_buffer_pool_get_config (GST_BUFFER_POOL_CAST (pool));
-  if (thiz->use_video_memory) {
-    gst_buffer_pool_config_add_option (config,
-        GST_BUFFER_POOL_OPTION_MSDK_USE_VIDEO_MEMORY);
-    if (use_dmabuf)
-      gst_buffer_pool_config_add_option (config,
-          GST_BUFFER_POOL_OPTION_MSDK_USE_DMABUF);
-  }
 
   gst_buffer_pool_config_set_params (config, caps,
       GST_VIDEO_INFO_SIZE (&info), min_num_buffers, 0);
@@ -592,7 +555,6 @@
 error_no_video_info:
   {
     GST_INFO_OBJECT (thiz, "Failed to get Video info from caps");
-    gst_object_unref (pool);
     return NULL;
   }
 error_pool_config:
@@ -603,22 +565,6 @@
   }
 }
 
-static gboolean
-_gst_caps_has_feature (const GstCaps * caps, const gchar * feature)
-{
-  guint i;
-
-  for (i = 0; i < gst_caps_get_size (caps); i++) {
-    GstCapsFeatures *const features = gst_caps_get_features (caps, i);
-    /* Skip ANY features, we need an exact match for correct evaluation */
-    if (gst_caps_features_is_any (features))
-      continue;
-    if (gst_caps_features_contains (features, feature))
-      return TRUE;
-  }
-  return FALSE;
-}
-
 static GstBufferPool *
 create_src_pool (GstMsdkVPP * thiz, GstQuery * query, GstCaps * caps)
 {
@@ -679,7 +625,6 @@
 gst_msdkvpp_decide_allocation (GstBaseTransform * trans, GstQuery * query)
 {
   GstMsdkVPP *thiz = GST_MSDKVPP (trans);
-  GstVideoInfo info;
   GstCaps *caps;
 
   gst_query_parse_allocation (query, &caps, NULL);
@@ -687,13 +632,10 @@
     GST_ERROR_OBJECT (thiz, "Failed to parse the decide_allocation caps");
     return FALSE;
   }
-  if (!gst_video_info_from_caps (&info, caps)) {
-    GST_ERROR_OBJECT (thiz, "Failed to get video info");
-    return FALSE;
-  }
+
   /* We allocate the memory of type that downstream allocation requests */
 #ifndef _WIN32
-  if (_gst_caps_has_feature (caps, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+  if (gst_msdkcaps_has_feature (caps, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
     GST_INFO_OBJECT (thiz, "MSDK VPP srcpad uses DMABuf memory");
     thiz->use_srcpad_dmabuf = TRUE;
   }
@@ -738,14 +680,14 @@
     return FALSE;
   }
 
-  if (!gst_video_info_from_caps (&info, caps)) {
+  if (!gst_msdkcaps_video_info_from_caps (caps, &info, NULL)) {
     GST_ERROR_OBJECT (thiz, "Failed to get video info");
     return FALSE;
   }
 
   /* if upstream allocation query supports dmabuf-capsfeatures,
    * we do allocate dmabuf backed memory */
-  if (_gst_caps_has_feature (caps, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+  if (gst_msdkcaps_has_feature (caps, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
     GST_INFO_OBJECT (thiz, "MSDK VPP srcpad uses DMABuf memory");
     thiz->use_sinkpad_dmabuf = TRUE;
   }
@@ -857,7 +799,7 @@
   } else {
     msdk_surface =
         gst_msdk_import_sys_mem_to_msdk_surface (upload_buf,
-        thiz->sinkpad_buffer_pool_info);
+        &thiz->sinkpad_buffer_pool_info);
   }
 
   if (msdk_surface)
@@ -871,13 +813,6 @@
 {
   GstMsdkSurface *msdk_surface = NULL;
 
-  if (gst_msdk_is_msdk_buffer (inbuf)) {
-    msdk_surface = g_slice_new0 (GstMsdkSurface);
-    msdk_surface->surface = gst_msdk_get_surface_from_buffer (inbuf);
-    msdk_surface->buf = gst_buffer_ref (inbuf);
-    return msdk_surface;
-  }
-
   msdk_surface = gst_msdk_import_to_msdk_surface (inbuf, thiz->context,
       &thiz->sinkpad_info, GST_MAP_READ);
   if (msdk_surface) {
@@ -921,7 +856,7 @@
     free_msdk_surface (in_surface);
     return GST_FLOW_ERROR;
   }
-  locked_by_others = ! !in_surface->surface->Data.Locked;
+  locked_by_others = !!in_surface->surface->Data.Locked;
 
   /* always convert timestamp of input surface as msdk timestamp */
   if (inbuf->pts == GST_CLOCK_TIME_NONE)
@@ -930,23 +865,20 @@
     in_surface->surface->Data.TimeStamp =
         gst_util_uint64_scale_round (inbuf->pts, 90000, GST_SECOND);
 
-  if (gst_msdk_is_msdk_buffer (outbuf)) {
-    out_surface = g_slice_new0 (GstMsdkSurface);
-    out_surface->surface = gst_msdk_get_surface_from_buffer (outbuf);
-  } else {
+  if (thiz->use_video_memory) {
     out_surface = gst_msdk_import_to_msdk_surface (outbuf, thiz->context,
         &thiz->srcpad_info, GST_MAP_WRITE);
-    if (!thiz->use_video_memory) {
-      out_surface =
-          gst_msdk_import_sys_mem_to_msdk_surface (outbuf, thiz->srcpad_info);
-    }
-    if (out_surface)
-      out_surface->buf = gst_buffer_ref (outbuf);
-    else {
-      GST_ERROR_OBJECT (thiz, "Failed to get msdk outsurface!");
-      free_msdk_surface (in_surface);
-      return GST_FLOW_ERROR;
-    }
+  } else {
+    out_surface =
+        gst_msdk_import_sys_mem_to_msdk_surface (outbuf, &thiz->srcpad_info);
+  }
+
+  if (out_surface) {
+    out_surface->buf = gst_buffer_ref (outbuf);
+  } else {
+    GST_ERROR_OBJECT (thiz, "Failed to get msdk outsurface!");
+    free_msdk_surface (in_surface);
+    return GST_FLOW_ERROR;
   }
 
   /* update surface crop info (NOTE: msdk min frame size is 2x2) */
@@ -1019,29 +951,24 @@
       GST_BUFFER_TIMESTAMP (outbuf_new) = timestamp;
       GST_BUFFER_DURATION (outbuf_new) = thiz->buffer_duration;
 
-      if (gst_msdk_is_msdk_buffer (outbuf_new)) {
-        release_out_surface (thiz, out_surface);
-        out_surface = g_slice_new0 (GstMsdkSurface);
-        out_surface->surface = gst_msdk_get_surface_from_buffer (outbuf_new);
-        create_new_surface = TRUE;
-      } else {
-        release_out_surface (thiz, out_surface);
+      release_out_surface (thiz, out_surface);
+      if (thiz->use_video_memory) {
         out_surface =
             gst_msdk_import_to_msdk_surface (outbuf_new, thiz->context,
             &thiz->srcpad_buffer_pool_info, GST_MAP_WRITE);
-        if (!thiz->use_video_memory) {
-          out_surface =
-              gst_msdk_import_sys_mem_to_msdk_surface (outbuf_new,
-              thiz->srcpad_buffer_pool_info);
-        }
-        if (out_surface) {
-          out_surface->buf = gst_buffer_ref (outbuf_new);
-          create_new_surface = TRUE;
-        } else {
-          GST_ERROR_OBJECT (thiz, "Failed to get msdk outsurface!");
-          release_in_surface (thiz, in_surface, locked_by_others);
-          return GST_FLOW_ERROR;
-        }
+      } else {
+        out_surface =
+            gst_msdk_import_sys_mem_to_msdk_surface (outbuf_new,
+            &thiz->srcpad_buffer_pool_info);
+      }
+
+      if (out_surface) {
+        out_surface->buf = gst_buffer_ref (outbuf_new);
+        create_new_surface = TRUE;
+      } else {
+        GST_ERROR_OBJECT (thiz, "Failed to get msdk outsurface!");
+        release_in_surface (thiz, in_surface, locked_by_others);
+        return GST_FLOW_ERROR;
       }
     } else {
       GST_BUFFER_TIMESTAMP (outbuf) = timestamp;
@@ -1165,11 +1092,22 @@
 
   /* Scaling Mode */
   if (thiz->flags & GST_MSDK_FLAG_SCALING_MODE) {
-    mfxExtVPPScaling *mfx_scaling = &thiz->mfx_scaling;
-    mfx_scaling->Header.BufferId = MFX_EXTBUFF_VPP_SCALING;
-    mfx_scaling->Header.BufferSz = sizeof (mfxExtVPPScaling);
-    mfx_scaling->ScalingMode = thiz->scaling_mode;
-    gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) mfx_scaling);
+    gboolean scaling_mode_is_compute = FALSE;
+#if (MFX_VERSION >= 2007)
+    if (thiz->scaling_mode == MFX_SCALING_MODE_INTEL_GEN_COMPUTE)
+      scaling_mode_is_compute = TRUE;
+#endif
+    if (MFX_RUNTIME_VERSION_ATLEAST (thiz->version, 2, 7) ||
+        !scaling_mode_is_compute) {
+      mfxExtVPPScaling *mfx_scaling = &thiz->mfx_scaling;
+      mfx_scaling->Header.BufferId = MFX_EXTBUFF_VPP_SCALING;
+      mfx_scaling->Header.BufferSz = sizeof (mfxExtVPPScaling);
+      mfx_scaling->ScalingMode = thiz->scaling_mode;
+      gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) mfx_scaling);
+    } else {
+      GST_WARNING_OBJECT (thiz,
+          "Compute scaling mode not supported, ignore it...");
+    }
   }
 
   /* FRC */
@@ -1180,6 +1118,115 @@
     mfx_frc->Algorithm = thiz->frc_algm;
     gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) mfx_frc);
   }
+
+  /* Color properties */
+#if (MFX_VERSION >= 2000)
+  if (MFX_RUNTIME_VERSION_ATLEAST (thiz->version, 2, 0)) {
+    GstVideoInfo *in_vinfo = &thiz->sinkpad_info;
+    GstVideoInfo *out_vinfo = &thiz->srcpad_info;
+    mfxExtVideoSignalInfo *in_vsi = &thiz->in_vsi;
+    mfxExtVideoSignalInfo *out_vsi = &thiz->out_vsi;
+    mfxExtMasteringDisplayColourVolume *mdcv = &thiz->mdcv;
+    mfxExtContentLightLevelInfo *cll = &thiz->cll;
+    const guint chroma_den = 50000;
+    const guint luma_den = 10000;
+    gint tmap = 0;
+
+    if (in_vinfo->colorimetry.primaries || in_vinfo->colorimetry.transfer
+        || in_vinfo->colorimetry.matrix || in_vinfo->colorimetry.range) {
+      in_vsi->Header.BufferId = MFX_EXTBUFF_VIDEO_SIGNAL_INFO_IN;
+      in_vsi->Header.BufferSz = sizeof (in_vsi);
+      in_vsi->ColourDescriptionPresent = 1;
+      in_vsi->VideoFullRange =
+          (in_vinfo->colorimetry.range == GST_VIDEO_COLOR_RANGE_0_255);
+      in_vsi->ColourPrimaries =
+          gst_video_color_primaries_to_iso (in_vinfo->colorimetry.primaries);
+      in_vsi->TransferCharacteristics =
+          gst_video_transfer_function_to_iso (in_vinfo->colorimetry.transfer);
+      in_vsi->MatrixCoefficients =
+          gst_video_color_matrix_to_iso (in_vinfo->colorimetry.matrix);
+      gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) in_vsi);
+    }
+
+    if (thiz->hdr_tone_mapping) {
+      if (thiz->have_mdcv) {
+        mdcv->Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME_IN;
+        mdcv->Header.BufferSz = sizeof (mfxExtMasteringDisplayColourVolume);
+
+        mdcv->DisplayPrimariesX0 =
+            MIN ((thiz->mdcv_info.display_primaries1.x * chroma_den),
+            chroma_den);
+        mdcv->DisplayPrimariesY0 =
+            MIN ((thiz->mdcv_info.display_primaries1.y * chroma_den),
+            chroma_den);
+        mdcv->DisplayPrimariesX1 =
+            MIN ((thiz->mdcv_info.display_primaries2.x * chroma_den),
+            chroma_den);
+        mdcv->DisplayPrimariesY1 =
+            MIN ((thiz->mdcv_info.display_primaries2.y * chroma_den),
+            chroma_den);
+        mdcv->DisplayPrimariesX2 =
+            MIN ((thiz->mdcv_info.display_primaries0.x * chroma_den),
+            chroma_den);
+        mdcv->DisplayPrimariesY2 =
+            MIN ((thiz->mdcv_info.display_primaries0.y * chroma_den),
+            chroma_den);
+
+        mdcv->WhitePointX =
+            MIN ((thiz->mdcv_info.white_point.x * chroma_den), chroma_den);
+        mdcv->WhitePointY =
+            MIN ((thiz->mdcv_info.white_point.y * chroma_den), chroma_den);
+
+        /* From vpl spec, MaxDisplayMasteringLuminance is in the unit of 1 nits,
+         * MinDisplayMasteringLuminance is in the unit of 0.0001 nits.
+         */
+        mdcv->MaxDisplayMasteringLuminance =
+            thiz->mdcv_info.max_display_mastering_luminance;
+        mdcv->MinDisplayMasteringLuminance =
+            thiz->mdcv_info.min_display_mastering_luminance * luma_den;
+
+        gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) mdcv);
+        tmap = 1;
+      }
+
+      if (thiz->have_cll) {
+        cll->Header.BufferId = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO;
+        cll->Header.BufferSz = sizeof (mfxExtContentLightLevelInfo);
+
+        cll->MaxContentLightLevel =
+            MIN (thiz->cll_info.max_content_light_level, 65535);
+        cll->MaxPicAverageLightLevel =
+            MIN (thiz->cll_info.max_frame_average_light_level, 65535);
+
+        gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) cll);
+        tmap = 1;
+      }
+    }
+
+    if (tmap) {
+      out_vinfo->colorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_BT709;
+      out_vinfo->colorimetry.transfer = GST_VIDEO_TRANSFER_BT709;
+      out_vinfo->colorimetry.range = GST_VIDEO_COLOR_RANGE_16_235;
+      out_vinfo->colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;
+    }
+
+    if (out_vinfo->colorimetry.primaries || out_vinfo->colorimetry.transfer
+        || out_vinfo->colorimetry.matrix || out_vinfo->colorimetry.range) {
+      out_vsi->Header.BufferId = MFX_EXTBUFF_VIDEO_SIGNAL_INFO_OUT;
+      out_vsi->Header.BufferSz = sizeof (out_vsi);
+      out_vsi->ColourDescriptionPresent = 1;
+      out_vsi->VideoFullRange =
+          (out_vinfo->colorimetry.range == GST_VIDEO_COLOR_RANGE_0_255);
+      out_vsi->ColourPrimaries =
+          gst_video_color_primaries_to_iso (out_vinfo->colorimetry.primaries);
+      out_vsi->TransferCharacteristics =
+          gst_video_transfer_function_to_iso (out_vinfo->colorimetry.transfer);
+      out_vsi->MatrixCoefficients =
+          gst_video_color_matrix_to_iso (out_vinfo->colorimetry.matrix);
+      gst_msdkvpp_add_extra_param (thiz, (mfxExtBuffer *) out_vsi);
+    }
+  }
+#endif
 }
 
 static void
@@ -1225,6 +1272,11 @@
 
   GST_OBJECT_LOCK (thiz);
   session = gst_msdk_context_get_session (thiz->context);
+  status = MFXQueryVersion (session, &thiz->version);
+  if (status != MFX_ERR_NONE) {
+    GST_ERROR_OBJECT (thiz, "VPP failed to query version");
+    goto no_vpp;
+  }
 
   /* Close the current session if the session has been initialized,
    * otherwise the subsequent function call of MFXVideoVPP_Init() will
@@ -1355,9 +1407,15 @@
           gst_caps_get_features (out_caps, 0)))
     thiz->need_vpp = 1;
 
-  if (!gst_video_info_from_caps (&in_info, caps))
+  thiz->use_sinkpad_dmabuf = gst_msdkcaps_has_feature (caps,
+      GST_CAPS_FEATURE_MEMORY_DMABUF) ? TRUE : FALSE;
+  thiz->use_srcpad_dmabuf = gst_msdkcaps_has_feature (out_caps,
+      GST_CAPS_FEATURE_MEMORY_DMABUF) ? TRUE : FALSE;
+
+  if (!gst_msdkcaps_video_info_from_caps (caps, &in_info, &thiz->sink_modifier))
     goto error_no_video_info;
-  if (!gst_video_info_from_caps (&out_info, out_caps))
+  if (!gst_msdkcaps_video_info_from_caps (out_caps,
+          &out_info, &thiz->src_modifier))
     goto error_no_video_info;
 
   if (!gst_video_info_is_equal (&in_info, &thiz->sinkpad_info))
@@ -1382,9 +1440,30 @@
       gst_util_uint64_scale (GST_SECOND, GST_VIDEO_INFO_FPS_D (&out_info),
       GST_VIDEO_INFO_FPS_N (&out_info)) : 0;
 
+  thiz->have_mdcv = thiz->have_cll = FALSE;
+  if (gst_video_mastering_display_info_from_caps (&thiz->mdcv_info, caps))
+    thiz->have_mdcv = TRUE;
+
+  if (gst_video_content_light_level_from_caps (&thiz->cll_info, caps))
+    thiz->have_cll = TRUE;
+
   if (!gst_msdkvpp_initialize (thiz))
     return FALSE;
 
+  if (!thiz->hdr_tone_mapping) {
+    if (thiz->have_mdcv) {
+      if (!gst_video_mastering_display_info_add_to_caps (&thiz->mdcv_info,
+              out_caps))
+        GST_WARNING ("Failed to add mastering display info to caps");
+    }
+
+    if (thiz->have_cll) {
+      if (!gst_video_content_light_level_add_to_caps (&thiz->cll_info,
+              out_caps))
+        GST_WARNING ("Failed to add content light level to caps");
+    }
+  }
+
   /* set passthrough according to filter operation change */
   gst_msdkvpp_set_passthrough (thiz);
 
@@ -1407,54 +1486,15 @@
   return FALSE;
 }
 
-static gboolean
-pad_accept_memory (GstMsdkVPP * thiz, const gchar * mem_type,
-    GstPadDirection direction, GstCaps * filter)
-{
-  gboolean ret = FALSE;
-  GstCaps *caps, *out_caps;
-  GstPad *pad;
-  GstBaseTransform *trans = GST_BASE_TRANSFORM (thiz);
-
-  if (direction == GST_PAD_SRC)
-    pad = GST_BASE_TRANSFORM_SRC_PAD (trans);
-  else
-    pad = GST_BASE_TRANSFORM_SINK_PAD (trans);
-
-  /* make a copy of filter caps since we need to alter the structure
-   * by adding dmabuf-capsfeatures */
-  caps = gst_caps_copy (filter);
-  gst_caps_set_features (caps, 0, gst_caps_features_from_string (mem_type));
-
-  out_caps = gst_pad_peer_query_caps (pad, caps);
-  if (!out_caps)
-    goto done;
-
-  if (gst_caps_is_any (out_caps) || gst_caps_is_empty (out_caps)
-      || out_caps == caps)
-    goto done;
-
-  if (_gst_caps_has_feature (out_caps, mem_type))
-    ret = TRUE;
-done:
-  if (caps)
-    gst_caps_unref (caps);
-  if (out_caps)
-    gst_caps_unref (out_caps);
-  return ret;
-}
-
 static GstCaps *
 gst_msdkvpp_fixate_caps (GstBaseTransform * trans,
     GstPadDirection direction, GstCaps * caps, GstCaps * othercaps)
 {
   GstMsdkVPP *thiz = GST_MSDKVPP (trans);
   GstCaps *result = NULL;
-  gboolean *use_dmabuf;
 
   if (direction == GST_PAD_SRC) {
-    result = gst_caps_fixate (result);
-    use_dmabuf = &thiz->use_sinkpad_dmabuf;
+    result = gst_caps_fixate (othercaps);
   } else {
     /*
      * Override mirroring & rotation properties once video-direction
@@ -1465,34 +1505,11 @@
           (thiz->video_direction, &thiz->mirroring, &thiz->rotation);
 
     result = gst_msdkvpp_fixate_srccaps (thiz, caps, othercaps);
-    use_dmabuf = &thiz->use_srcpad_dmabuf;
   }
 
   GST_DEBUG_OBJECT (trans, "fixated to %" GST_PTR_FORMAT, result);
   gst_caps_unref (othercaps);
 
-  /* We let msdkvpp srcpad first query if downstream has va memory type caps,
-   * if not, will check the type of dma memory.
-   */
-#ifndef _WIN32
-  if (pad_accept_memory (thiz, GST_CAPS_FEATURE_MEMORY_VA,
-          direction == GST_PAD_SRC ? GST_PAD_SINK : GST_PAD_SRC, result)) {
-    gst_caps_set_features (result, 0,
-        gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_VA, NULL));
-  } else if (pad_accept_memory (thiz, GST_CAPS_FEATURE_MEMORY_DMABUF,
-          direction == GST_PAD_SRC ? GST_PAD_SINK : GST_PAD_SRC, result)) {
-    gst_caps_set_features (result, 0,
-        gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_DMABUF, NULL));
-    *use_dmabuf = TRUE;
-  }
-#else
-  if (pad_accept_memory (thiz, GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY,
-          direction == GST_PAD_SRC ? GST_PAD_SINK : GST_PAD_SRC, result)) {
-    gst_caps_set_features (result, 0,
-        gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, NULL));
-  }
-#endif
-
   return result;
 }
 
@@ -1502,16 +1519,23 @@
 gst_msdkvpp_transform_caps (GstBaseTransform * trans,
     GstPadDirection direction, GstCaps * caps, GstCaps * filter)
 {
-  GstCaps *out_caps;
+  GstCaps *out_caps = NULL;
+  GstCaps *tmp_caps;
 
   GST_DEBUG_OBJECT (trans,
       "Transforming caps %" GST_PTR_FORMAT " in direction %s", caps,
       (direction == GST_PAD_SINK) ? "sink" : "src");
 
-  if (direction == GST_PAD_SRC)
-    out_caps = gst_static_pad_template_get_caps (&gst_msdkvpp_sink_factory);
-  else
-    out_caps = gst_static_pad_template_get_caps (&gst_msdkvpp_src_factory);
+  if (direction == GST_PAD_SINK) {
+    tmp_caps =
+        gst_pad_get_pad_template_caps (GST_BASE_TRANSFORM_SRC_PAD (trans));
+  } else {
+    tmp_caps =
+        gst_pad_get_pad_template_caps (GST_BASE_TRANSFORM_SINK_PAD (trans));
+  }
+
+  if (!out_caps)
+    out_caps = tmp_caps;
 
   if (out_caps && filter) {
     GstCaps *intersection;
@@ -1647,6 +1671,10 @@
     case PROP_CROP_BOTTOM:
       thiz->crop_bottom = g_value_get_uint (value);
       break;
+    case PROP_HDR_TONE_MAPPING:
+      thiz->hdr_tone_mapping = g_value_get_boolean (value);
+      thiz->flags |= (thiz->hdr_tone_mapping ? GST_MSDK_FLAG_TONE_MAPPING : 0);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1722,6 +1750,9 @@
     case PROP_CROP_BOTTOM:
       g_value_set_uint (value, thiz->crop_bottom);
       break;
+    case PROP_HDR_TONE_MAPPING:
+      g_value_set_boolean (value, thiz->hdr_tone_mapping);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1771,49 +1802,10 @@
 }
 
 static void
-gst_msdkvpp_class_init (GstMsdkVPPClass * klass)
+_msdkvpp_install_properties (GObjectClass * gobject_class)
 {
-  GObjectClass *gobject_class;
-  GstElementClass *element_class;
-  GstBaseTransformClass *trans_class;
   GParamSpec *obj_propertiesPROP_N = { NULL, };
 
-  gobject_class = G_OBJECT_CLASS (klass);
-  element_class = GST_ELEMENT_CLASS (klass);
-  trans_class = GST_BASE_TRANSFORM_CLASS (klass);
-
-  gobject_class->set_property = gst_msdkvpp_set_property;
-  gobject_class->get_property = gst_msdkvpp_get_property;
-  gobject_class->dispose = gst_msdkvpp_dispose;
-
-  element_class->set_context = gst_msdkvpp_set_context;
-
-  gst_element_class_add_static_pad_template (element_class,
-      &gst_msdkvpp_src_factory);
-  gst_element_class_add_static_pad_template (element_class,
-      &gst_msdkvpp_sink_factory);
-
-  gst_element_class_set_static_metadata (element_class,
-      "Intel MSDK Video Postprocessor",
-      "Filter/Converter/Video;Filter/Converter/Video/Scaler;"
-      "Filter/Effect/Video;Filter/Effect/Video/Deinterlace",
-      "Video Postprocessing Filter based on " MFX_API_SDK,
-      "Sreerenj Balachandrn <sreerenj.balachandran@intel.com>");
-
-  trans_class->start = GST_DEBUG_FUNCPTR (gst_msdkvpp_start);
-  trans_class->stop = GST_DEBUG_FUNCPTR (gst_msdkvpp_stop);
-  trans_class->transform_caps = GST_DEBUG_FUNCPTR (gst_msdkvpp_transform_caps);
-  trans_class->fixate_caps = GST_DEBUG_FUNCPTR (gst_msdkvpp_fixate_caps);
-  trans_class->set_caps = GST_DEBUG_FUNCPTR (gst_msdkvpp_set_caps);
-  trans_class->transform = GST_DEBUG_FUNCPTR (gst_msdkvpp_transform);
-  trans_class->propose_allocation =
-      GST_DEBUG_FUNCPTR (gst_msdkvpp_propose_allocation);
-  trans_class->decide_allocation =
-      GST_DEBUG_FUNCPTR (gst_msdkvpp_decide_allocation);
-  trans_class->prepare_output_buffer =
-      GST_DEBUG_FUNCPTR (gst_msdkvpp_prepare_output_buffer);
-  trans_class->query = GST_DEBUG_FUNCPTR (gst_msdkvpp_query);
-
   obj_propertiesPROP_HARDWARE =
       g_param_spec_boolean ("hardware", "Hardware", "Enable hardware VPP",
       PROP_HARDWARE_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
@@ -1932,13 +1924,76 @@
       "Crop Bottom", "Pixels to crop at bottom",
       0, G_MAXUINT16, PROP_CROP_BOTTOM_DEFAULT,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  /**
+   * GstMsdkVPP:hdr-tone-mapping:
+   *
+   * Since: 1.24
+   */
+  obj_propertiesPROP_HDR_TONE_MAPPING =
+      g_param_spec_boolean ("hdr-tone-mapping", "HDR tone mapping",
+      "Enable HDR to SDR tone mapping (supported from TGL platforms)",
+      PROP_HDR_TONE_MAPPING_DEFAULT,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (gobject_class, PROP_N, obj_properties);
 }
 
+
 static void
-gst_msdkvpp_init (GstMsdkVPP * thiz)
+gst_msdkvpp_class_init (gpointer klass, gpointer data)
 {
+  GObjectClass *gobject_class;
+  GstElementClass *element_class;
+  GstBaseTransformClass *trans_class;
+  MsdkVPPCData *cdata = data;
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  element_class = GST_ELEMENT_CLASS (klass);
+  trans_class = GST_BASE_TRANSFORM_CLASS (klass);
+
+  gobject_class->set_property = gst_msdkvpp_set_property;
+  gobject_class->get_property = gst_msdkvpp_get_property;
+  gobject_class->dispose = gst_msdkvpp_dispose;
+
+  _msdkvpp_install_properties (gobject_class);
+
+  trans_class->start = GST_DEBUG_FUNCPTR (gst_msdkvpp_start);
+  trans_class->stop = GST_DEBUG_FUNCPTR (gst_msdkvpp_stop);
+  trans_class->transform_caps = GST_DEBUG_FUNCPTR (gst_msdkvpp_transform_caps);
+  trans_class->fixate_caps = GST_DEBUG_FUNCPTR (gst_msdkvpp_fixate_caps);
+  trans_class->set_caps = GST_DEBUG_FUNCPTR (gst_msdkvpp_set_caps);
+  trans_class->transform = GST_DEBUG_FUNCPTR (gst_msdkvpp_transform);
+  trans_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_msdkvpp_propose_allocation);
+  trans_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_msdkvpp_decide_allocation);
+  trans_class->prepare_output_buffer =
+      GST_DEBUG_FUNCPTR (gst_msdkvpp_prepare_output_buffer);
+  trans_class->query = GST_DEBUG_FUNCPTR (gst_msdkvpp_query);
+
+  element_class->set_context = gst_msdkvpp_set_context;
+
+  gst_element_class_set_static_metadata (element_class,
+      "Intel MSDK Video Postprocessor",
+      "Filter/Converter/Video;Filter/Converter/Video/Scaler;"
+      "Filter/Effect/Video;Filter/Effect/Video/Deinterlace",
+      "Video Postprocessing Filter based on " MFX_API_SDK,
+      "Sreerenj Balachandrn <sreerenj.balachandran@intel.com>");
+
+  gst_msdkcaps_pad_template_init (element_class,
+      cdata->sink_caps, cdata->src_caps, doc_sink_caps_str, doc_src_caps_str);
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
+}
+
+static void
+gst_msdkvpp_init (GTypeInstance * instance, gpointer g_class)
+{
+  GstMsdkVPP *thiz = GST_MSDKVPP (instance);
   thiz->initialized = FALSE;
   thiz->hardware = PROP_HARDWARE_DEFAULT;
   thiz->async_depth = PROP_ASYNC_DEPTH_DEFAULT;
@@ -1966,7 +2021,53 @@
   thiz->crop_right = PROP_CROP_RIGHT_DEFAULT;
   thiz->crop_top = PROP_CROP_TOP_DEFAULT;
   thiz->crop_bottom = PROP_CROP_BOTTOM_DEFAULT;
-
+  thiz->hdr_tone_mapping = PROP_HDR_TONE_MAPPING_DEFAULT;
+#ifndef _WIN32
+  thiz->sink_modifier = DRM_FORMAT_MOD_INVALID;
+  thiz->src_modifier = DRM_FORMAT_MOD_INVALID;
+#endif
   gst_video_info_init (&thiz->sinkpad_info);
   gst_video_info_init (&thiz->srcpad_info);
 }
+
+gboolean
+gst_msdkvpp_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank)
+{
+  GType type;
+  MsdkVPPCData *cdata;
+  gchar *type_name, *feature_name;
+  gboolean ret = FALSE;
+
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstMsdkVPPClass),
+    .class_init = gst_msdkvpp_class_init,
+    .instance_size = sizeof (GstMsdkVPP),
+    .instance_init = gst_msdkvpp_init
+  };
+
+  cdata = g_new (MsdkVPPCData, 1);
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstMsdkVPP");
+  feature_name = g_strdup ("msdkvpp");
+
+  type = g_type_register_static (GST_TYPE_BASE_TRANSFORM,
+      type_name, &type_info, 0);
+  if (type)
+    ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvpp.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkvpp.h Changed

@@ -38,19 +38,6 @@
 #include <gst/base/gstbasetransform.h>
 G_BEGIN_DECLS
 
-#define GST_TYPE_MSDKVPP \
-  (gst_msdkvpp_get_type())
-#define GST_MSDKVPP(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MSDKVPP,GstMsdkVPP))
-#define GST_MSDKVPP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MSDKVPP,GstMsdkVPPClass))
-#define GST_MSDKVPP_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_MSDKVPP,GstMsdkVPPClass))
-#define GST_IS_MSDKVPP(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MSDKVPP))
-#define GST_IS_MSDKVPP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MSDKVPP))
-
 #define MAX_EXTRA_PARAMS                 8
 
 typedef struct _GstMsdkVPP GstMsdkVPP;
@@ -69,6 +56,7 @@
   GST_MSDK_FLAG_SCALING_MODE = 1 << 9,
   GST_MSDK_FLAG_FRC          = 1 << 10,
   GST_MSDK_FLAG_VIDEO_DIRECTION = 1 << 11,
+  GST_MSDK_FLAG_TONE_MAPPING = 1 << 12,
 } GstMsdkVppFlags;
 
 struct _GstMsdkVPP
@@ -101,6 +89,11 @@
   gboolean add_video_meta;
   gboolean need_vpp;
   guint flags;
+  /* To check if sinkcaps have HDR SEIs*/
+  gboolean have_mdcv;
+  gboolean have_cll;
+  guint64 sink_modifier;
+  guint64 src_modifier;
 
   /* element properties */
   gboolean hardware;
@@ -123,6 +116,7 @@
   guint crop_right;
   guint crop_top;
   guint crop_bottom;
+  gboolean hdr_tone_mapping;
 
   GstClockTime buffer_duration;
 
@@ -137,13 +131,23 @@
   mfxExtVPPScaling mfx_scaling;
   mfxExtVPPFrameRateConversion mfx_frc;
 
+  GstVideoMasteringDisplayInfo mdcv_info;
+  GstVideoContentLightLevel cll_info;
+
   /* Extended buffers */
   mfxExtBuffer *extra_paramsMAX_EXTRA_PARAMS;
   guint num_extra_params;
 
+  mfxExtVideoSignalInfo in_vsi;
+  mfxExtVideoSignalInfo out_vsi;
+  mfxExtMasteringDisplayColourVolume mdcv;
+  mfxExtContentLightLevelInfo cll;
+
   mfxFrameAllocRequest request2;
   GList* locked_in_surfaces;
   GList* locked_out_surfaces;
+
+  mfxVersion version;
 };
 
 struct _GstMsdkVPPClass
@@ -151,7 +155,10 @@
   GstBaseTransformClass parent_class;
 };
 
-GType gst_msdkvpp_get_type (void);
+gboolean
+gst_msdkvpp_register (GstPlugin * plugin,
+    GstMsdkContext * context, GstCaps * sink_caps,
+    GstCaps * src_caps, guint rank);
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/gstmsdkvpputil.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/gstmsdkvpputil.c Changed

@@ -27,6 +27,14 @@
 
 #include "gstmsdkvpputil.h"
 #include "msdk-enums.h"
+#include "gstmsdkcaps.h"
+
+#ifndef _WIN32
+#include <libdrm/drm_fourcc.h>
+#include <gst/va/gstvavideoformat.h>
+#else
+#include <gst/d3d11/gstd3d11.h>
+#endif
 
 #define SWAP_GINT(a, b) do {      \
         const gint t = a; a = b; b = t; \
@@ -51,6 +59,156 @@
   return deinterlace;
 }
 
+/* This help function is to fixate output format for vpp src caps,
+ * when downstream element does not set a specific format, i.e. queried
+ * caps contains a list of formats, vpp src caps will loop the format
+ * list and find one format that matches the vpp sink caps format (in vinfo);
+ * if downstream has set a specific format, we use this format for vpp src caps.
+ */
+static GstCaps *
+fixate_output_format (GstMsdkVPP * thiz, GstVideoInfo * vinfo, GstCaps * caps)
+{
+  GstVideoFormat fmt = GST_VIDEO_FORMAT_UNKNOWN;
+  guint i, size, fixated_idx = 0;
+  GstStructure *s, *out = NULL;
+  GstCapsFeatures *features;
+  GstCaps *ret;
+  const GValue *format;
+  gboolean is_va = FALSE, is_dma = FALSE, is_d3d = FALSE;
+  gboolean fixate = FALSE;
+#ifndef _WIN32
+  guint64 modifier = DRM_FORMAT_MOD_INVALID;
+  guint32 fourcc;
+#endif
+
+  if (!caps)
+    return NULL;
+  size = gst_caps_get_size (caps);
+
+  for (i = 0; i < size; i++) {
+    s = gst_caps_get_structure (caps, i);
+    features = gst_caps_get_features (caps, i);
+    is_va = is_dma = is_d3d = FALSE;
+
+    if (gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+      format = gst_structure_get_value (s, "drm-format");
+      is_dma = TRUE;
+    } else {
+      format = gst_structure_get_value (s, "format");
+#ifndef _WIN32
+      if (gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_VA))
+        is_va = TRUE;
+#else
+      if (gst_caps_features_contains (features,
+              GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY))
+        is_d3d = TRUE;
+#endif
+    }
+
+    if (format == NULL)
+      continue;
+
+    if (GST_VALUE_HOLDS_LIST (format)) {
+      gint j, len;
+
+      len = gst_value_list_get_size (format);
+      GST_DEBUG_OBJECT (thiz, "have %d formats", len);
+      for (j = 0; j < len; j++) {
+        const GValue *val;
+
+        val = gst_value_list_get_value (format, j);
+        if (G_VALUE_HOLDS_STRING (val)) {
+#ifndef _WIN32
+          if (is_dma) {
+            fourcc = gst_video_dma_drm_fourcc_from_string
+                (g_value_get_string (val), &modifier);
+            fmt = gst_va_video_format_from_drm_fourcc (fourcc);
+          } else {
+            fmt = gst_video_format_from_string (g_value_get_string (val));
+          }
+#else
+          fmt = gst_video_format_from_string (g_value_get_string (val));
+#endif
+          if (fmt == GST_VIDEO_FORMAT_UNKNOWN)
+            continue;
+          if (fmt == GST_VIDEO_INFO_FORMAT (vinfo)) {
+            fixate = TRUE;
+            fixated_idx = i;
+            break;
+          }
+        }
+      }
+    } else if (G_VALUE_HOLDS_STRING (format)) {
+#ifndef _WIN32
+      if (is_dma) {
+        fourcc = gst_video_dma_drm_fourcc_from_string
+            (g_value_get_string (format), &modifier);
+        fmt = gst_va_video_format_from_drm_fourcc (fourcc);
+      } else {
+        fmt = gst_video_format_from_string (g_value_get_string (format));
+      }
+#else
+      fmt = gst_video_format_from_string (g_value_get_string (format));
+#endif
+      if (fmt == GST_VIDEO_FORMAT_UNKNOWN)
+        continue;
+
+      /* size > 1 means downstream doesn't specify the caps directly, so we
+       * still need to compare fmt with the one in vpp sinkcaps */
+      if (size > 1 && fmt != GST_VIDEO_INFO_FORMAT (vinfo))
+        continue;
+
+      fixate = TRUE;
+      break;
+    }
+    if (fixate)
+      break;
+  }
+
+  if (!fixate)
+    fmt = GST_VIDEO_FORMAT_NV12;
+
+  out = gst_structure_copy (gst_caps_get_structure (caps, fixated_idx));
+  features = gst_caps_features_copy (gst_caps_get_features (caps, fixated_idx));
+
+#ifndef _WIN32
+  if (is_dma) {
+    gchar *drm_fmt_name;
+
+    g_assert (modifier != DRM_FORMAT_MOD_INVALID);
+
+    drm_fmt_name = gst_video_dma_drm_fourcc_to_string
+        (gst_va_drm_fourcc_from_video_format (fmt), modifier);
+
+    gst_structure_set (out, "drm-format", G_TYPE_STRING, drm_fmt_name, NULL);
+    g_free (drm_fmt_name);
+  } else {
+    gst_structure_set (out, "format", G_TYPE_STRING,
+        gst_video_format_to_string (fmt), NULL);
+  }
+#else
+  gst_structure_set (out, "format", G_TYPE_STRING,
+      gst_video_format_to_string (fmt), NULL);
+#endif
+
+  ret = gst_caps_new_full (out, NULL);
+  gst_caps_set_features_simple (ret, features);
+#ifndef _WIN32
+  if (is_va)
+    gst_caps_set_features (ret, 0,
+        gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_VA));
+#else
+  if (is_d3d)
+    gst_caps_set_features (ret, 0,
+        gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY));
+#endif
+  else if (is_dma)
+    gst_caps_set_features (ret, 0,
+        gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_DMABUF));
+
+  return ret;
+}
+
 static gboolean
 fixate_output_frame_size (GstMsdkVPP * thiz, GstVideoInfo * vinfo,
     GstStructure * outs)
@@ -528,22 +686,27 @@
 _get_preferred_src_caps (GstMsdkVPP * thiz, GstVideoInfo * vinfo,
     GstCaps * srccaps)
 {
-  GstStructure *structure;
-  GstCaps *outcaps;
+  GstStructure *structure = NULL;
+  GstCaps *outcaps, *fixate_caps;
+  GstCapsFeatures *features;
 
-  structure = gst_caps_get_structure (srccaps, 0);
+  /* Fixate the format */
+  fixate_caps = fixate_output_format (thiz, vinfo, srccaps);
+  if (!fixate_caps)
+    goto fixate_failed;
 
+  structure = gst_caps_get_structure (fixate_caps, 0);
+  features = gst_caps_get_features (fixate_caps, 0);
   /* make a copy */
   structure = gst_structure_copy (structure);
+  features = gst_caps_features_copy (features);
+
+  gst_caps_unref (fixate_caps);
 
   if (thiz->keep_aspect)
     gst_structure_set (structure, "pixel-aspect-ratio", GST_TYPE_FRACTION, 1,
         1, NULL);
 
-  /* Fixate the format */
-  if (!gst_structure_fixate_field (structure, "format"))
-    goto fixate_failed;
-
   /* Fixate the frame size */
   if (!fixate_output_frame_size (thiz, vinfo, structure))
     goto fixate_failed;
@@ -564,6 +727,7 @@
 
   outcaps = gst_caps_new_empty ();
   gst_caps_append_structure (outcaps, structure);
+  gst_caps_set_features (outcaps, 0, features);
 
   return outcaps;
 
@@ -571,7 +735,8 @@
 fixate_failed:
   {
     GST_WARNING_OBJECT (thiz, "Could not fixate src caps");
-    gst_structure_free (structure);
+    if (structure)
+      gst_structure_free (structure);
     return NULL;
   }
 interlace_mode_failed:
@@ -597,7 +762,9 @@
     GstCaps * sinkcaps, GstCaps * srccaps)
 {
   GstVideoInfo vi;
-  if (!gst_video_info_from_caps (&vi, sinkcaps))
-    return NULL;
+
+  if (!gst_msdkcaps_video_info_from_caps (sinkcaps, &vi, NULL))
+    return FALSE;
+
   return _get_preferred_src_caps (msdkvpp, &vi, srccaps);
 }

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/meson.build Changed

@@ -1,7 +1,7 @@
 msdk_sources = 
   'gstmsdk.c',
   'gstmsdkallocator.c',
-  'gstmsdkbufferpool.c',
+  'gstmsdkcaps.c',
   'gstmsdkcontext.c',
   'gstmsdkcontextutil.c',
   'gstmsdkdec.c',
@@ -15,9 +15,7 @@
   'gstmsdkmjpegenc.c',
   'gstmsdkmpeg2dec.c',
   'gstmsdkmpeg2enc.c',
-  'gstmsdksystemmemory.c',
   'gstmsdkvc1dec.c',
-  'gstmsdkvideomemory.c',
   'gstmsdkvp8dec.c',
   'gstmsdkvpp.c',
   'gstmsdkvpputil.c',
@@ -33,6 +31,7 @@
 
 extra_args = 
   '-DGST_USE_UNSTABLE_API',
+  '-DMFX_DEPRECATED_OFF'
 
 
 msdk_option = get_option('msdk')
@@ -184,7 +183,7 @@
   msdk_deps_found = gstd3d11_dep.found() and legacy_stdio_dep.found() and cc.get_id() == 'msvc'
 else
   libdl_dep = cc.find_library('dl', required: get_option('msdk'))
-  libgudev_dep = dependency('gudev-1.0', required: get_option('msdk'))
+  libgudev_dep = dependency('gudev-1.0', required: get_option('msdk'), allow_fallback: true)
   libdrm_dep = dependency('libdrm', required: get_option('msdk'))
   msdk_deps = declare_dependency(dependencies: gstva_dep, libdl_dep, libgudev_dep, libdrm_dep)
   msdk_deps_found = gstva_dep.found() and libdl_dep.found() and libgudev_dep.found() and libdrm_dep.found()

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/msdk-enums.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/msdk-enums.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/msdk.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/msdk.c Changed

@@ -30,8 +30,7 @@
  */
 
 #include "msdk.h"
-#include "gstmsdkvideomemory.h"
-#include "gstmsdksystemmemory.h"
+#include "gstmsdkcontext.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gst_msdk_debug);
 #define GST_CAT_DEFAULT gst_msdk_debug
@@ -180,8 +179,77 @@
 
 #if (MFX_VERSION >= 2000)
 
+gpointer
+msdk_get_impl_description (const mfxLoader * loader, mfxU32 impl_idx)
+{
+  mfxImplDescription *desc = NULL;
+  mfxStatus status = MFX_ERR_NONE;
+
+  g_return_val_if_fail (loader != NULL, NULL);
+
+  status = MFXEnumImplementations (*loader, impl_idx,
+      MFX_IMPLCAPS_IMPLDESCSTRUCTURE, (mfxHDL *) & desc);
+  if (status != MFX_ERR_NONE) {
+    GST_ERROR ("Failed to get implementation description, %s",
+        msdk_status_to_string (status));
+    return NULL;
+  }
+
+  return desc;
+}
+
+gboolean
+msdk_release_impl_description (const mfxLoader * loader, gpointer impl_desc)
+{
+  mfxStatus status = MFX_ERR_NONE;
+  mfxImplDescription *desc = (mfxImplDescription *) impl_desc;
+
+  g_return_val_if_fail (loader != NULL, FALSE);
+
+  status = MFXDispReleaseImplDescription (*loader, desc);
+  if (status != MFX_ERR_NONE)
+    return FALSE;
+
+  return TRUE;
+}
+
+static mfxStatus
+_set_pci_id (mfxHDL handle, mfxConfig cfg)
+{
+#ifndef _WIN32
+  VAStatus va_status;
+  mfxStatus mfx_status;
+  VADisplay dpy = handle;
+  mfxVariant impl_value = {
+    .Type = MFX_VARIANT_TYPE_U16,
+  };
+  VADisplayAttribute attr = {
+    .type = VADisplayPCIID,
+  };
+
+  va_status = vaGetDisplayAttributes (dpy, &attr, 1);
+  if (va_status != VA_STATUS_SUCCESS ||
+      attr.flags == VA_DISPLAY_ATTRIB_NOT_SUPPORTED)
+    return MFX_ERR_UNSUPPORTED;
+
+  impl_value.Data.U16 = (attr.value & 0xFFFF);
+  mfx_status = MFXSetConfigFilterProperty (cfg,
+      (const mfxU8 *) "mfxImplDescription.mfxDeviceDescription.DeviceID",
+      impl_value);
+
+  if (mfx_status != MFX_ERR_NONE) {
+    GST_ERROR ("Failed to add an additional MFX configuration (%s)",
+        msdk_status_to_string (mfx_status));
+  }
+
+  return mfx_status;
+#else
+  return MFX_ERR_NONE;
+#endif
+}
+
 mfxStatus
-msdk_init_msdk_session (mfxIMPL impl, mfxVersion * pver,
+msdk_init_msdk_session (mfxHDL handle, mfxIMPL impl, mfxVersion * pver,
     MsdkSession * msdk_session)
 {
   mfxStatus sts = MFX_ERR_NONE;
@@ -239,6 +307,13 @@
       MFXUnload (loader);
       return sts;
     }
+
+    sts = _set_pci_id (handle, cfg);
+
+    if (sts != MFX_ERR_NONE) {
+      MFXUnload (loader);
+      return sts;
+    }
   }
 
   while (1) {
@@ -259,8 +334,10 @@
     sts = MFXCreateSession (loader, impl_idx, &session);
     MFXDispReleaseImplDescription (loader, impl_desc);
 
-    if (sts == MFX_ERR_NONE)
+    if (sts == MFX_ERR_NONE) {
+      msdk_session->impl_idx = impl_idx;
       break;
+    }
 
     impl_idx++;
   }
@@ -283,8 +360,21 @@
 
 #else
 
+gpointer
+msdk_get_impl_description (const mfxLoader * loader, mfxU32 impl_idx)
+{
+  return NULL;
+}
+
+gboolean
+msdk_release_impl_description (const mfxLoader * loader, gpointer impl_desc)
+{
+  return TRUE;
+}
+
+/* handle is not used here */
 mfxStatus
-msdk_init_msdk_session (mfxIMPL impl, mfxVersion * pver,
+msdk_init_msdk_session (mfxHDL handle, mfxIMPL impl, mfxVersion * pver,
     MsdkSession * msdk_session)
 {
   mfxStatus status;
@@ -307,6 +397,7 @@
 
   msdk_session->session = session;
   msdk_session->loader = NULL;
+  msdk_session->impl_idx = 0;
 
   return MFX_ERR_NONE;
 }
@@ -340,7 +431,7 @@
 }
 
 MsdkSession
-msdk_open_session (mfxIMPL impl)
+msdk_open_session (mfxHDL handle, mfxIMPL impl)
 {
   mfxSession session = NULL;
   mfxVersion version = { {1, 1}
@@ -356,7 +447,8 @@
 
   msdk_session.session = NULL;
   msdk_session.loader = NULL;
-  status = msdk_init_msdk_session (impl, &version, &msdk_session);
+  msdk_session.impl_idx = 0;
+  status = msdk_init_msdk_session (handle, impl, &version, &msdk_session);
 
   if (status != MFX_ERR_NONE)
     return msdk_session;
@@ -386,23 +478,10 @@
   msdk_close_session (&msdk_session);
   msdk_session.session = NULL;
   msdk_session.loader = NULL;
+  msdk_session.impl_idx = 0;
   return msdk_session;
 }
 
-gboolean
-msdk_is_available (void)
-{
-  /* Make sure we can create GstMsdkContext instance (the job type is not used actually) */
-  GstMsdkContext *msdk_context = gst_msdk_context_new (1, GST_MSDK_JOB_DECODER);
-
-  if (!msdk_context) {
-    return FALSE;
-  }
-
-  gst_object_unref (msdk_context);
-  return TRUE;
-}
-
 void
 gst_msdk_set_video_alignment (GstVideoInfo * info, guint alloc_w, guint alloc_h,
     GstVideoAlignment * alignment)
@@ -467,7 +546,7 @@
 
 void
 gst_msdk_set_mfx_frame_info_from_video_info (mfxFrameInfo * mfx_info,
-    GstVideoInfo * info)
+    const GstVideoInfo * info)
 {
   g_return_if_fail (info && mfx_info);
 
@@ -538,22 +617,6 @@
 }
 
 gboolean
-gst_msdk_is_msdk_buffer (GstBuffer * buf)
-{
-  GstAllocator *allocator;
-  GstMemory *mem = gst_buffer_peek_memory (buf, 0);
-
-  allocator = GST_MEMORY_CAST (mem)->allocator;
-
-  if (allocator && (GST_IS_MSDK_VIDEO_ALLOCATOR (allocator) ||
-          GST_IS_MSDK_SYSTEM_ALLOCATOR (allocator) ||
-          GST_IS_MSDK_DMABUF_ALLOCATOR (allocator)))
-    return TRUE;
-  else
-    return FALSE;
-}
-
-gboolean
 gst_msdk_is_va_mem (GstMemory * mem)
 {
   GstAllocator *allocator;
@@ -565,26 +628,6 @@
   return g_str_equal (allocator->mem_type, "VAMemory");
 }
 
-mfxFrameSurface1 *
-gst_msdk_get_surface_from_buffer (GstBuffer * buf)
-{
-  GstAllocator *allocator;
-  GstMemory *mem = gst_buffer_peek_memory (buf, 0);
-
-  allocator = GST_MEMORY_CAST (mem)->allocator;
-
-  if (GST_IS_MSDK_VIDEO_ALLOCATOR (allocator))
-    return GST_MSDK_VIDEO_MEMORY_CAST (mem)->surface;
-  else if (GST_IS_MSDK_SYSTEM_ALLOCATOR (allocator))
-    return GST_MSDK_SYSTEM_MEMORY_CAST (mem)->surface;
-  else if (GST_IS_MSDK_DMABUF_ALLOCATOR (allocator)) {
-    return gst_mini_object_get_qdata (GST_MINI_OBJECT (mem),
-        g_quark_from_static_string ("GstMsdkBufferSurface"));
-  }
-
-  return NULL;
-}
-
 GstVideoFormat
 gst_msdk_get_video_format_from_mfx_fourcc (mfxU32 fourcc)
 {
@@ -599,6 +642,22 @@
 }
 
 void
+gst_msdk_get_video_format_list (GValue * formats)
+{
+  GValue gfmt = G_VALUE_INIT;
+  const struct map *m = gst_msdk_video_format_to_mfx_map;
+
+  g_value_init (&gfmt, G_TYPE_UINT);
+
+  for (; m->format != 0; m++) {
+    g_value_set_uint (&gfmt, m->format);
+    gst_value_list_append_value (formats, &gfmt);
+  }
+
+  g_value_unset (&gfmt);
+}
+
+void
 gst_msdk_update_mfx_frame_info_from_mfx_video_param (mfxFrameInfo * mfx_info,
     mfxVideoParam * param)
 {

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/msdk.h -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/msdk.h Changed

@@ -65,6 +65,11 @@
 #define MFX_API_SDK  "Intel(R) Media SDK"
 #endif
 
+
+#define MFX_RUNTIME_VERSION_ATLEAST(MFX_VERSION, MAJOR, MINOR) \
+    ((MFX_VERSION.Major > (MAJOR)) ||                           \
+    (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR)))
+
 G_BEGIN_DECLS
 
 #define GST_MSDK_CAPS_MAKE(format) \
@@ -103,20 +108,18 @@
 #endif
 
 typedef struct _MsdkSession MsdkSession;
-typedef struct _GstMsdkSurface GstMsdkSurface;
 
 struct _MsdkSession
 {
+  mfxU32 impl_idx;
   mfxSession session;
   mfxLoader loader;
 };
 
-MsdkSession msdk_open_session (mfxIMPL impl);
+MsdkSession msdk_open_session (mfxHDL handle, mfxIMPL impl);
 void msdk_close_mfx_session (mfxSession session);
 void msdk_close_session (MsdkSession * session);
 
-gboolean msdk_is_available (void);
-
 mfxFrameSurface1 *msdk_get_free_surface (mfxFrameSurface1 * surfaces,
     guint size);
 void msdk_frame_to_surface (GstVideoFrame * frame, mfxFrameSurface1 * surface);
@@ -130,21 +133,18 @@
 gint gst_msdk_get_mfx_chroma_from_format (GstVideoFormat format);
 gint gst_msdk_get_mfx_fourcc_from_format (GstVideoFormat format);
 void gst_msdk_set_mfx_frame_info_from_video_info (mfxFrameInfo * mfx_info,
-    GstVideoInfo * info);
-
-gboolean
-gst_msdk_is_msdk_buffer (GstBuffer * buf);
+    const GstVideoInfo * info);
 
 gboolean
 gst_msdk_is_va_mem (GstMemory * mem);
 
-mfxFrameSurface1 *
-gst_msdk_get_surface_from_buffer (GstBuffer * buf);
-
 GstVideoFormat
 gst_msdk_get_video_format_from_mfx_fourcc (mfxU32 fourcc);
 
 void
+gst_msdk_get_video_format_list (GValue * formats);
+
+void
 gst_msdk_update_mfx_frame_info_from_mfx_video_param (mfxFrameInfo * mfx_info,
     mfxVideoParam * param);
 
@@ -160,9 +160,14 @@
 msdk_get_platform_codename (mfxSession session);
 
 mfxStatus
-msdk_init_msdk_session (mfxIMPL impl, mfxVersion * pver,
+msdk_init_msdk_session (mfxHDL handle, mfxIMPL impl, mfxVersion * pver,
     MsdkSession * msdk_session);
 
+gpointer
+msdk_get_impl_description (const mfxLoader * loader, mfxU32 impl_idx);
+gboolean
+msdk_release_impl_description (const mfxLoader * loader, gpointer impl_desc);
+
 G_END_DECLS
 
 #endif /* __MSDK_H__ */

gst-plugins-bad-1.22.7.tar.xz/sys/msdk/msdk_libva.c -> gst-plugins-bad-1.24.5.tar.xz/sys/msdk/msdk_libva.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstcudabasetransform.c -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudabasetransform.c Changed

@@ -29,13 +29,15 @@
 #  include <config.h>
 #endif
 
-#include <gst/cuda/gstcudautils.h>
-
 #include "gstcudabasetransform.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_cuda_base_transform_debug);
 #define GST_CAT_DEFAULT gst_cuda_base_transform_debug
 
+/* cached quark to avoid contention on the global quark table lock */
+#define META_TAG_VIDEO meta_tag_video_quark
+static GQuark meta_tag_video_quark;
+
 enum
 {
   PROP_0,
@@ -65,6 +67,9 @@
     GstPadDirection direction, GstQuery * query);
 static void gst_cuda_base_transform_before_transform (GstBaseTransform * trans,
     GstBuffer * buffer);
+static gboolean
+gst_cuda_base_transform_transform_meta (GstBaseTransform * trans,
+    GstBuffer * outbuf, GstMeta * meta, GstBuffer * inbuf);
 
 static void
 gst_cuda_base_transform_class_init (GstCudaBaseTransformClass * klass)
@@ -102,11 +107,14 @@
   trans_class->query = GST_DEBUG_FUNCPTR (gst_cuda_base_transform_query);
   trans_class->before_transform =
       GST_DEBUG_FUNCPTR (gst_cuda_base_transform_before_transform);
+  trans_class->transform_meta =
+      GST_DEBUG_FUNCPTR (gst_cuda_base_transform_transform_meta);
 
   GST_DEBUG_CATEGORY_INIT (gst_cuda_base_transform_debug,
       "cudabasefilter", 0, "cudabasefilter Element");
 
   gst_type_mark_as_plugin_api (GST_TYPE_CUDA_BASE_TRANSFORM, 0);
+  meta_tag_video_quark = g_quark_from_static_string (GST_META_TAG_VIDEO_STR);
 }
 
 static void
@@ -172,7 +180,6 @@
 gst_cuda_base_transform_start (GstBaseTransform * trans)
 {
   GstCudaBaseTransform *filter = GST_CUDA_BASE_TRANSFORM (trans);
-  CUresult cuda_ret;
 
   if (!gst_cuda_ensure_element_context (GST_ELEMENT_CAST (filter),
           filter->device_id, &filter->context)) {
@@ -180,14 +187,10 @@
     return FALSE;
   }
 
-  if (gst_cuda_context_push (filter->context)) {
-    cuda_ret = CuStreamCreate (&filter->cuda_stream, CU_STREAM_DEFAULT);
-    if (!gst_cuda_result (cuda_ret)) {
-      GST_WARNING_OBJECT (filter,
-          "Could not create cuda stream, will use default stream");
-      filter->cuda_stream = NULL;
-    }
-    gst_cuda_context_pop (NULL);
+  filter->stream = gst_cuda_stream_new (filter->context);
+  if (!filter->stream) {
+    GST_WARNING_OBJECT (filter,
+        "Could not create cuda stream, will use default stream");
   }
 
   return TRUE;
@@ -198,15 +201,8 @@
 {
   GstCudaBaseTransform *filter = GST_CUDA_BASE_TRANSFORM (trans);
 
-  if (filter->context && filter->cuda_stream) {
-    if (gst_cuda_context_push (filter->context)) {
-      gst_cuda_result (CuStreamDestroy (filter->cuda_stream));
-      gst_cuda_context_pop (NULL);
-    }
-  }
-
+  gst_clear_cuda_stream (&filter->stream);
   gst_clear_object (&filter->context);
-  filter->cuda_stream = NULL;
 
   return TRUE;
 }
@@ -340,19 +336,11 @@
   GST_INFO_OBJECT (self, "Updating device %" GST_PTR_FORMAT " -> %"
       GST_PTR_FORMAT, self->context, cmem->context);
 
-  if (self->cuda_stream) {
-    gst_cuda_context_push (self->context);
-    CuStreamDestroy (self->cuda_stream);
-    gst_cuda_context_pop (NULL);
-    self->cuda_stream = NULL;
-  }
-
+  gst_clear_cuda_stream (&self->stream);
   gst_object_unref (self->context);
   self->context = gst_object_ref (cmem->context);
 
-  gst_cuda_context_push (self->context);
-  CuStreamCreate (&self->cuda_stream, CU_STREAM_DEFAULT);
-  gst_cuda_context_pop (NULL);
+  self->stream = gst_cuda_stream_new (self->context);
 
   /* subclass will update internal object.
    * Note that gst_base_transform_reconfigure() might not trigger this
@@ -368,3 +356,20 @@
 
   return;
 }
+
+static gboolean
+gst_cuda_base_transform_transform_meta (GstBaseTransform * trans,
+    GstBuffer * outbuf, GstMeta * meta, GstBuffer * inbuf)
+{
+  const GstMetaInfo *info = meta->info;
+  const gchar *const *tags;
+
+  tags = gst_meta_api_type_get_tags (info->api);
+
+  if (!tags || (g_strv_length ((gchar **) tags) == 1
+          && gst_meta_api_type_has_tag (info->api, META_TAG_VIDEO)))
+    return TRUE;
+
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->transform_meta (trans, outbuf,
+      meta, inbuf);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstcudabasetransform.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudabasetransform.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstcudaconverter.c -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaconverter.c Changed

@@ -22,9 +22,6 @@
 #endif
 
 #include "gstcudaconverter.h"
-#include <gst/cuda/gstcudautils.h>
-#include <gst/cuda/gstcudaloader.h>
-#include <gst/cuda/gstcudanvrtc.h>
 #include <string.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_cuda_converter_debug);
@@ -638,6 +635,8 @@
 #define SAMPLE_RGBP "sample_rgbp"
 #define SAMPLE_BGRP "sample_bgrp"
 #define SAMPLE_GBR "sample_gbr"
+#define SAMPLE_GBR_10 "sample_gbr_10"
+#define SAMPLE_GBR_12 "sample_gbr_12"
 #define SAMPLE_GBRA "sample_gbra"
 
 #define WRITE_I420 "write_i420"
@@ -645,10 +644,11 @@
 #define WRITE_NV12 "write_nv12"
 #define WRITE_NV21 "write_nv21"
 #define WRITE_P010 "write_p010"
-/* same as P010 */
-#define WRITE_P016 "write_p010"
 #define WRITE_I420_10 "write_i420_10"
+#define WRITE_I420_12 "write_i420_12"
 #define WRITE_Y444 "write_y444"
+#define WRITE_Y444_10 "write_y444_10"
+#define WRITE_Y444_12 "write_y444_12"
 #define WRITE_Y444_16 "write_y444_16"
 #define WRITE_RGBA "write_rgba"
 #define WRITE_RGBx "write_rgbx"
@@ -666,7 +666,18 @@
 #define WRITE_RGBP "write_rgbp"
 #define WRITE_BGRP "write_bgrp"
 #define WRITE_GBR "write_gbr"
+#define WRITE_GBR_10 "write_gbr_10"
+#define WRITE_GBR_12 "write_gbr_12"
+#define WRITE_GBR_16 "write_gbr_16"
 #define WRITE_GBRA "write_gbra"
+#define ROTATE_IDENTITY "rotate_identity"
+#define ROTATE_90R "rotate_90r"
+#define ROTATE_180 "rotate_180"
+#define ROTATE_90L "rotate_90l"
+#define ROTATE_HORIZ "rotate_horiz"
+#define ROTATE_VERT "rotate_vert"
+#define ROTATE_UL_LR "rotate_ul_lr"
+#define ROTATE_UR_LL "rotate_ur_ll"
 
 /* *INDENT-OFF* */
 const static gchar KERNEL_COMMON =
@@ -787,7 +798,7 @@
 "  float luma = tex2D<float>(tex0, x, y);\n"
 "  float u = tex2D<float>(tex1, x, y);\n"
 "  float v = tex2D<float>(tex2, x, y);\n"
-"  /* (1 << 6) to scale 0, 1.0) range */\n"
+"  /* (1 << 4) to scale 0, 1.0) range */\n"
 "  return make_float4 (luma * 16, u * 16, v * 16, 1);\n"
 "}\n"
 "\n"
@@ -887,6 +898,27 @@
 "  float r = tex2D<float>(tex2, x, y);\n"
 "  return make_float4 (r, g, b, 1);\n"
 "}\n"
+"__device__ inline float4\n"
+SAMPLE_GBR_10 "(cudaTextureObject_t tex0, cudaTextureObject_t tex1,\n"
+"    cudaTextureObject_t tex2, cudaTextureObject_t tex3, float x, float y)\n"
+"{\n"
+"  float g = tex2D<float>(tex0, x, y);\n"
+"  float b = tex2D<float>(tex1, x, y);\n"
+"  float r = tex2D<float>(tex2, x, y);\n"
+"  /* (1 << 6) to scale 0, 1.0) range */\n"
+"  return make_float4 (r * 64, g * 64, b * 64, 1);\n"
+"}\n"
+"\n"
+"__device__ inline float4\n"
+SAMPLE_GBR_12 "(cudaTextureObject_t tex0, cudaTextureObject_t tex1,\n"
+"    cudaTextureObject_t tex2, cudaTextureObject_t tex3, float x, float y)\n"
+"{\n"
+"  float g = tex2D<float>(tex0, x, y);\n"
+"  float b = tex2D<float>(tex1, x, y);\n"
+"  float r = tex2D<float>(tex2, x, y);\n"
+"  /* (1 << 4) to scale 0, 1.0) range */\n"
+"  return make_float4 (r * 16, g * 16, b * 16, 1);\n"
+"}\n"
 "\n"
 "__device__ inline float4\n"
 SAMPLE_GBRA "(cudaTextureObject_t tex0, cudaTextureObject_t tex1,\n"
@@ -972,6 +1004,18 @@
 "}\n"
 "\n"
 "__device__ inline void\n"
+WRITE_I420_12 "(unsigned char * dst0, unsigned char * dst1, unsigned char * dst2,\n"
+"    unsigned char * dst3, float4 sample, int x, int y, int stride0, int stride1)\n"
+"{\n"
+"  *(unsigned short *) &dst0x * 2 + y * stride0 = scale_to_12bits (sample.x);\n"
+"  if (x % 2 == 0 && y % 2 == 0) {\n"
+"    unsigned int pos = x + (y / 2) * stride1;\n"
+"    *(unsigned short *) &dst1pos = scale_to_12bits (sample.y);\n"
+"    *(unsigned short *) &dst2pos = scale_to_12bits (sample.z);\n"
+"  }\n"
+"}\n"
+"\n"
+"__device__ inline void\n"
 WRITE_Y444 "(unsigned char * dst0, unsigned char * dst1, unsigned char * dst2,\n"
 "    unsigned char * dst3, float4 sample, int x, int y, int stride0, int stride1)\n"
 "{\n"
@@ -982,6 +1026,26 @@
 "}\n"
 "\n"
 "__device__ inline void\n"
+WRITE_Y444_10 "(unsigned char * dst0, unsigned char * dst1, unsigned char * dst2,\n"
+"    unsigned char * dst3, float4 sample, int x, int y, int stride0, int stride1)\n"
+"{\n"
+"  int pos = x * 2 + y * stride0;\n"
+"  *(unsigned short *) &dst0pos = scale_to_10bits (sample.x);\n"
+"  *(unsigned short *) &dst1pos = scale_to_10bits (sample.y);\n"
+"  *(unsigned short *) &dst2pos = scale_to_10bits (sample.z);\n"
+"}\n"
+"\n"
+"__device__ inline void\n"
+WRITE_Y444_12 "(unsigned char * dst0, unsigned char * dst1, unsigned char * dst2,\n"
+"    unsigned char * dst3, float4 sample, int x, int y, int stride0, int stride1)\n"
+"{\n"
+"  int pos = x * 2 + y * stride0;\n"
+"  *(unsigned short *) &dst0pos = scale_to_12bits (sample.x);\n"
+"  *(unsigned short *) &dst1pos = scale_to_12bits (sample.y);\n"
+"  *(unsigned short *) &dst2pos = scale_to_12bits (sample.z);\n"
+"}\n"
+"\n"
+"__device__ inline void\n"
 WRITE_Y444_16 "(unsigned char * dst0, unsigned char * dst1, unsigned char * dst2,\n"
 "    unsigned char * dst3, float4 sample, int x, int y, int stride0, int stride1)\n"
 "{\n"
@@ -1168,6 +1232,36 @@
 "}\n"
 "\n"
 "__device__ inline void\n"
+WRITE_GBR_10 "(unsigned char * dst0, unsigned char * dst1, unsigned char * dst2,\n"
+"    unsigned char * dst3, float4 sample, int x, int y, int stride0, int stride1)\n"
+"{\n"
+"  int pos = x * 2 + y * stride0;\n"
+"  *(unsigned short *) &dst0pos = scale_to_10bits (sample.y);\n"
+"  *(unsigned short *) &dst1pos = scale_to_10bits (sample.z);\n"
+"  *(unsigned short *) &dst2pos = scale_to_10bits (sample.x);\n"
+"}\n"
+"\n"
+"__device__ inline void\n"
+WRITE_GBR_12 "(unsigned char * dst0, unsigned char * dst1, unsigned char * dst2,\n"
+"    unsigned char * dst3, float4 sample, int x, int y, int stride0, int stride1)\n"
+"{\n"
+"  int pos = x * 2 + y * stride0;\n"
+"  *(unsigned short *) &dst0pos = scale_to_12bits (sample.y);\n"
+"  *(unsigned short *) &dst1pos = scale_to_12bits (sample.z);\n"
+"  *(unsigned short *) &dst2pos = scale_to_12bits (sample.x);\n"
+"}\n"
+"\n"
+"__device__ inline void\n"
+WRITE_GBR_16 "(unsigned char * dst0, unsigned char * dst1, unsigned char * dst2,\n"
+"    unsigned char * dst3, float4 sample, int x, int y, int stride0, int stride1)\n"
+"{\n"
+"  int pos = x * 2 + y * stride0;\n"
+"  *(unsigned short *) &dst0pos = scale_to_ushort (sample.y);\n"
+"  *(unsigned short *) &dst1pos = scale_to_ushort (sample.z);\n"
+"  *(unsigned short *) &dst2pos = scale_to_ushort (sample.x);\n"
+"}\n"
+"\n"
+"__device__ inline void\n"
 WRITE_GBRA "(unsigned char * dst0, unsigned char * dst1, unsigned char * dst2,\n"
 "    unsigned char * dst3, float4 sample, int x, int y, int stride0, int stride1)\n"
 "{\n"
@@ -1176,7 +1270,55 @@
 "  dst1pos = scale_to_uchar (sample.z);\n"
 "  dst2pos = scale_to_uchar (sample.x);\n"
 "  dst3pos = scale_to_uchar (sample.w);\n"
-"}\n";
+"}\n"
+"__device__ inline float2\n"
+ROTATE_IDENTITY "(float x, float y)\n"
+"{\n"
+"  return make_float2(x, y);\n"
+"}\n"
+"\n"
+"__device__ inline float2\n"
+ROTATE_90R "(float x, float y)\n"
+"{\n"
+"  return make_float2(y, 1.0 - x);\n"
+"}\n"
+"\n"
+"__device__ inline float2\n"
+ROTATE_180 "(float x, float y)\n"
+"{\n"
+"  return make_float2(1.0 - x, 1.0 - y);\n"
+"}\n"
+"\n"
+"__device__ inline float2\n"
+ROTATE_90L "(float x, float y)\n"
+"{\n"
+"  return make_float2(1.0 - y, x);\n"
+"}\n"
+"\n"
+"__device__ inline float2\n"
+ROTATE_HORIZ "(float x, float y)\n"
+"{\n"
+"  return make_float2(1.0 - x, y);\n"
+"}\n"
+"\n"
+"__device__ inline float2\n"
+ROTATE_VERT "(float x, float y)\n"
+"{\n"
+"  return make_float2(x, 1.0 - y);\n"
+"}\n"
+"\n"
+"__device__ inline float2\n"
+ROTATE_UL_LR "(float x, float y)\n"
+"{\n"
+"  return make_float2(y, x);\n"
+"}\n"
+"\n"
+"__device__ inline float2\n"
+ROTATE_UR_LL "(float x, float y)\n"
+"{\n"
+"  return make_float2(1.0 - y, 1.0 - x);\n"
+"}\n"
+"\n";
 
 #define GST_CUDA_KERNEL_UNPACK_FUNC "gst_cuda_kernel_unpack_func"
 static const gchar RGB_TO_RGBx =
@@ -1259,7 +1401,7 @@
 "}\n"
 "}\n";
 
-#define GST_CUDA_KERNEL_MAIN_FUNC "KernelMain"
+#define GST_CUDA_KERNEL_MAIN_FUNC "gst_cuda_converter_main"
 
 static const gchar TEMPLETA_KERNEL =
 /* KERNEL_COMMON */
@@ -1310,7 +1452,8 @@
 "  } else {\n"
 "    float x = OFFSET_X + (float) (x_pos - LEFT) / VIEW_WIDTH;\n"
 "    float y = OFFSET_Y + (float) (y_pos - TOP) / VIEW_HEIGHT;\n"
-"    float4 s = %s (tex0, tex1, tex2, tex3, x, y);\n"
+"    float2 rotated = %s (x, y);\n"
+"    float4 s = %s (tex0, tex1, tex2, tex3, rotated.x, rotated.y);\n"
 "    float3 xyz = make_float3 (s.x, s.y, s.z);\n"
 "    float3 rgb = %s (xyz, &TO_RGB_MATRIX);\n"
 "    float3 yuv = %s (rgb, &TO_YUV_MATRIX);\n"
@@ -1352,9 +1495,13 @@
   MAKE_FORMAT_YUV_SEMI_PLANAR (NV12, UNSIGNED_INT8, SAMPLE_SEMI_PLANAR),
   MAKE_FORMAT_YUV_SEMI_PLANAR (NV21, UNSIGNED_INT8, SAMPLE_SEMI_PLANAR_SWAP),
   MAKE_FORMAT_YUV_SEMI_PLANAR (P010_10LE, UNSIGNED_INT16, SAMPLE_SEMI_PLANAR),
+  MAKE_FORMAT_YUV_SEMI_PLANAR (P012_LE, UNSIGNED_INT16, SAMPLE_SEMI_PLANAR),
   MAKE_FORMAT_YUV_SEMI_PLANAR (P016_LE, UNSIGNED_INT16, SAMPLE_SEMI_PLANAR),
   MAKE_FORMAT_YUV_PLANAR (I420_10LE, UNSIGNED_INT16, SAMPLE_YUV_PLANAR_10BIS),
+  MAKE_FORMAT_YUV_PLANAR (I420_12LE, UNSIGNED_INT16, SAMPLE_YUV_PLANAR_12BIS),
   MAKE_FORMAT_YUV_PLANAR (Y444, UNSIGNED_INT8, SAMPLE_YUV_PLANAR),
+  MAKE_FORMAT_YUV_PLANAR (Y444_10LE, UNSIGNED_INT16, SAMPLE_YUV_PLANAR_10BIS),
+  MAKE_FORMAT_YUV_PLANAR (Y444_12LE, UNSIGNED_INT16, SAMPLE_YUV_PLANAR_12BIS),
   MAKE_FORMAT_YUV_PLANAR (Y444_16LE, UNSIGNED_INT16, SAMPLE_YUV_PLANAR),
   MAKE_FORMAT_RGB (RGBA, UNSIGNED_INT8, SAMPLE_RGBA),
   MAKE_FORMAT_RGB (BGRA, UNSIGNED_INT8, SAMPLE_BGRA),
@@ -1369,6 +1516,9 @@
   MAKE_FORMAT_RGBP (RGBP, UNSIGNED_INT8, SAMPLE_RGBP),
   MAKE_FORMAT_RGBP (BGRP, UNSIGNED_INT8, SAMPLE_BGRP),
   MAKE_FORMAT_RGBP (GBR, UNSIGNED_INT8, SAMPLE_GBR),
+  MAKE_FORMAT_RGBP (GBR_10LE, UNSIGNED_INT16, SAMPLE_GBR_10),
+  MAKE_FORMAT_RGBP (GBR_12LE, UNSIGNED_INT16, SAMPLE_GBR_12),
+  MAKE_FORMAT_RGBP (GBR_16LE, UNSIGNED_INT16, SAMPLE_GBR),
   MAKE_FORMAT_RGBAP (GBRA, UNSIGNED_INT8, SAMPLE_GBRA),
 };
 
@@ -1376,6 +1526,7 @@
 {
   CUdeviceptr ptr;
   gsize stride;
+  CUtexObject texture;
 } TextureBuffer;
 
 typedef struct
@@ -1391,6 +1542,8 @@
   GstVideoInfo in_info;
   GstVideoInfo out_info;
 
+  GstVideoOrientationMethod method;
+
   GstStructure *config;
 
   GstVideoInfo texture_info;
@@ -1450,12 +1603,22 @@
 
     for (i = 0; i < G_N_ELEMENTS (priv->fallback_buffer); i++) {
       if (priv->fallback_bufferi.ptr) {
+        if (priv->fallback_bufferi.texture) {
+          CuTexObjectDestroy (priv->fallback_bufferi.texture);
+          priv->fallback_bufferi.texture = 0;
+        }
+
         CuMemFree (priv->fallback_bufferi.ptr);
         priv->fallback_bufferi.ptr = 0;
       }
     }
 
     if (priv->unpack_buffer.ptr) {
+      if (priv->unpack_buffer.texture) {
+        CuTexObjectDestroy (priv->unpack_buffer.texture);
+        priv->unpack_buffer.texture = 0;
+      }
+
       CuMemFree (priv->unpack_buffer.ptr);
       priv->unpack_buffer.ptr = 0;
     }
@@ -1541,10 +1704,11 @@
   const gchar *write_func = NULL;
   const gchar *to_rgb_func = COLOR_SPACE_IDENTITY;
   const gchar *to_yuv_func = COLOR_SPACE_IDENTITY;
+  const gchar *rotate_func = ROTATE_IDENTITY;
   const GstVideoColorimetry *in_color;
   const GstVideoColorimetry *out_color;
   gchar *str;
-  gchar *ptx;
+  gchar *program = NULL;
   CUresult ret;
 
   in_info = &priv->in_info;
@@ -1573,17 +1737,25 @@
       write_func = WRITE_NV21;
       break;
     case GST_VIDEO_FORMAT_P010_10LE:
-      write_func = WRITE_P010;
-      break;
+    case GST_VIDEO_FORMAT_P012_LE:
     case GST_VIDEO_FORMAT_P016_LE:
-      write_func = WRITE_P016;
+      write_func = WRITE_P010;
       break;
     case GST_VIDEO_FORMAT_I420_10LE:
       write_func = WRITE_I420_10;
       break;
+    case GST_VIDEO_FORMAT_I420_12LE:
+      write_func = WRITE_I420_12;
+      break;
     case GST_VIDEO_FORMAT_Y444:
       write_func = WRITE_Y444;
       break;
+    case GST_VIDEO_FORMAT_Y444_10LE:
+      write_func = WRITE_Y444_10;
+      break;
+    case GST_VIDEO_FORMAT_Y444_12LE:
+      write_func = WRITE_Y444_12;
+      break;
     case GST_VIDEO_FORMAT_Y444_16LE:
       write_func = WRITE_Y444_16;
       break;
@@ -1635,6 +1807,15 @@
     case GST_VIDEO_FORMAT_GBR:
       write_func = WRITE_GBR;
       break;
+    case GST_VIDEO_FORMAT_GBR_10LE:
+      write_func = WRITE_GBR_10;
+      break;
+    case GST_VIDEO_FORMAT_GBR_12LE:
+      write_func = WRITE_GBR_12;
+      break;
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      write_func = WRITE_GBR_16;
+      break;
     case GST_VIDEO_FORMAT_GBRA:
       write_func = WRITE_GBRA;
       break;
@@ -1802,6 +1983,32 @@
   g_ascii_formatd (offset_y, G_ASCII_DTOSTR_BUF_SIZE, "%f",
       (gdouble) 0.5 / priv->dest_rect.height);
 
+  switch (priv->method) {
+    case GST_VIDEO_ORIENTATION_90R:
+      rotate_func = ROTATE_90R;
+      break;
+    case GST_VIDEO_ORIENTATION_180:
+      rotate_func = ROTATE_180;
+      break;
+    case GST_VIDEO_ORIENTATION_90L:
+      rotate_func = ROTATE_90L;
+      break;
+    case GST_VIDEO_ORIENTATION_HORIZ:
+      rotate_func = ROTATE_HORIZ;
+      break;
+    case GST_VIDEO_ORIENTATION_VERT:
+      rotate_func = ROTATE_VERT;
+      break;
+    case GST_VIDEO_ORIENTATION_UL_LR:
+      rotate_func = ROTATE_UL_LR;
+      break;
+    case GST_VIDEO_ORIENTATION_UR_LL:
+      rotate_func = ROTATE_UR_LL;
+      break;
+    default:
+      break;
+  }
+
   str = g_strdup_printf (TEMPLETA_KERNEL, KERNEL_COMMON,
       unpack_function ? unpack_function : "",
       /* TO RGB matrix */
@@ -1852,6 +2059,8 @@
       /* border colors */
       border_color_str0, border_color_str1,
       border_color_str2, border_color_str3,
+      /* adjust coord before sampling */
+      rotate_func,
       /* sampler function name */
       priv->texture_fmt->sample_func,
       /* TO RGB conversion function name */
@@ -1862,21 +2071,47 @@
       write_func);
 
   GST_LOG_OBJECT (self, "kernel code:\n%s\n", str);
-  ptx = gst_cuda_nvrtc_compile (str);
+  gint cuda_device;
+  g_object_get (self->context, "cuda-device-id", &cuda_device, NULL);
+  program = gst_cuda_nvrtc_compile_cubin (str, cuda_device);
+  if (!program) {
+    GST_WARNING_OBJECT (self, "Couldn't compile to cubin, trying ptx");
+    program = gst_cuda_nvrtc_compile (str);
+  }
   g_free (str);
 
-  if (!ptx) {
+  if (!program) {
     GST_ERROR_OBJECT (self, "Could not compile code");
     return FALSE;
   }
 
+  if (priv->dest_rect.x != 0 || priv->dest_rect.y != 0 ||
+      priv->dest_rect.width != out_info->width ||
+      priv->dest_rect.height != out_info->height ||
+      in_info->width != out_info->width
+      || in_info->height != out_info->height) {
+    for (i = 0; i < G_N_ELEMENTS (priv->filter_mode); i++)
+      priv->filter_modei = CU_TR_FILTER_MODE_LINEAR;
+  } else {
+    for (i = 0; i < G_N_ELEMENTS (priv->filter_mode); i++)
+      priv->filter_modei = CU_TR_FILTER_MODE_POINT;
+  }
+
   if (!gst_cuda_context_push (self->context)) {
     GST_ERROR_OBJECT (self, "Couldn't push context");
+    g_free (program);
     return FALSE;
   }
 
   /* Allocates intermediate memory for texture */
   if (unpack_function) {
+    CUDA_TEXTURE_DESC texture_desc;
+    CUDA_RESOURCE_DESC resource_desc;
+    CUtexObject texture = 0;
+
+    memset (&texture_desc, 0, sizeof (CUDA_TEXTURE_DESC));
+    memset (&resource_desc, 0, sizeof (CUDA_RESOURCE_DESC));
+
     ret = CuMemAllocPitch (&priv->unpack_buffer.ptr,
         &priv->unpack_buffer.stride,
         GST_VIDEO_INFO_COMP_WIDTH (texture_info, 0) *
@@ -1886,10 +2121,32 @@
       GST_ERROR_OBJECT (self, "Couldn't allocate unpack buffer");
       goto error;
     }
+
+    resource_desc.resType = CU_RESOURCE_TYPE_PITCH2D;
+    resource_desc.res.pitch2D.format = priv->texture_fmt->array_format0;
+    resource_desc.res.pitch2D.numChannels = 4;
+    resource_desc.res.pitch2D.width = in_info->width;
+    resource_desc.res.pitch2D.height = in_info->height;
+    resource_desc.res.pitch2D.pitchInBytes = priv->unpack_buffer.stride;
+    resource_desc.res.pitch2D.devPtr = priv->unpack_buffer.ptr;
+
+    texture_desc.filterMode = priv->filter_mode0;
+    texture_desc.flags = 0x2;
+    texture_desc.addressMode0 = 1;
+    texture_desc.addressMode1 = 1;
+    texture_desc.addressMode2 = 1;
+
+    ret = CuTexObjectCreate (&texture, &resource_desc, &texture_desc, NULL);
+    if (!gst_cuda_result (ret)) {
+      GST_ERROR_OBJECT (self, "Couldn't create unpack texture");
+      goto error;
+    }
+
+    priv->unpack_buffer.texture = texture;
   }
 
-  ret = CuModuleLoadData (&priv->module, ptx);
-  g_free (ptx);
+  ret = CuModuleLoadData (&priv->module, program);
+  g_clear_pointer (&program, g_free);
   if (!gst_cuda_result (ret)) {
     GST_ERROR_OBJECT (self, "Could not load module");
     priv->module = NULL;
@@ -1914,22 +2171,12 @@
 
   gst_cuda_context_pop (NULL);
 
-  if (priv->dest_rect.x != 0 || priv->dest_rect.y != 0 ||
-      priv->dest_rect.width != out_info->width ||
-      priv->dest_rect.height != out_info->height ||
-      in_info->width != out_info->width
-      || in_info->height != out_info->height) {
-    for (i = 0; i < G_N_ELEMENTS (priv->filter_mode); i++)
-      priv->filter_modei = CU_TR_FILTER_MODE_LINEAR;
-  } else {
-    for (i = 0; i < G_N_ELEMENTS (priv->filter_mode); i++)
-      priv->filter_modei = CU_TR_FILTER_MODE_POINT;
-  }
-
   return TRUE;
 
 error:
   gst_cuda_context_pop (NULL);
+  g_free (program);
+
   return FALSE;
 }
 
@@ -1966,6 +2213,7 @@
 {
   GstCudaConverter *self;
   GstCudaConverterPrivate *priv;
+  gint method;
 
   g_return_val_if_fail (in_info != NULL, NULL);
   g_return_val_if_fail (out_info != NULL, NULL);
@@ -1992,6 +2240,12 @@
       GST_CUDA_CONVERTER_OPT_DEST_WIDTH, out_info->width);
   priv->dest_rect.height = get_opt_int (self,
       GST_CUDA_CONVERTER_OPT_DEST_HEIGHT, out_info->height);
+  if (gst_structure_get_enum (priv->config,
+          GST_CUDA_CONVERTER_OPT_ORIENTATION_METHOD,
+          GST_TYPE_VIDEO_ORIENTATION_METHOD, &method)) {
+    priv->method = method;
+    GST_DEBUG_OBJECT (self, "Selected orientation method %d", method);
+  }
 
   if (!gst_cuda_converter_setup (self))
     goto error;
@@ -2077,40 +2331,38 @@
   GstCudaConverterPrivate *priv = self->priv;
   CUresult ret;
   CUdeviceptr src_ptr;
+  CUDA_MEMCPY2D params = { 0, };
 
-  src_ptr = src;
-
-  if (priv->texture_align > 0 && (src_ptr % priv->texture_align) != 0) {
-    CUDA_MEMCPY2D params = { 0, };
-
-    GST_DEBUG_OBJECT (self, "Plane %d is not aligned, copying", plane);
-
-    if (!ensure_fallback_buffer (self, stride, height, plane))
-      return 0;
+  if (!ensure_fallback_buffer (self, stride, height, plane))
+    return 0;
 
-    params.srcMemoryType = CU_MEMORYTYPE_DEVICE;
-    params.srcPitch = stride;
-    params.srcDevice = (CUdeviceptr) src_ptr;
+  params.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+  params.srcPitch = stride;
+  params.srcDevice = (CUdeviceptr) src;
 
-    params.dstMemoryType = CU_MEMORYTYPE_DEVICE;
-    params.dstPitch = priv->fallback_bufferplane.stride;
-    params.dstDevice = priv->fallback_bufferplane.ptr;
-    params.WidthInBytes = GST_VIDEO_INFO_COMP_WIDTH (&priv->in_info, plane)
-        * GST_VIDEO_INFO_COMP_PSTRIDE (&priv->in_info, plane),
-        params.Height = GST_VIDEO_INFO_COMP_HEIGHT (&priv->in_info, plane);
+  params.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+  params.dstPitch = priv->fallback_bufferplane.stride;
+  params.dstDevice = priv->fallback_bufferplane.ptr;
+  params.WidthInBytes = GST_VIDEO_INFO_COMP_WIDTH (&priv->in_info, plane)
+      * GST_VIDEO_INFO_COMP_PSTRIDE (&priv->in_info, plane),
+      params.Height = GST_VIDEO_INFO_COMP_HEIGHT (&priv->in_info, plane);
 
-    ret = CuMemcpy2D (&params);
-    if (!gst_cuda_result (ret)) {
-      GST_ERROR_OBJECT (self, "Couldn't copy to fallback buffer");
-      return 0;
-    }
+  ret = CuMemcpy2DAsync (&params, stream);
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (self, "Couldn't copy to fallback buffer");
+    return 0;
+  }
 
+  if (!priv->fallback_bufferplane.texture) {
     src_ptr = priv->fallback_bufferplane.ptr;
     stride = priv->fallback_bufferplane.stride;
+
+    priv->fallback_bufferplane.texture =
+        gst_cuda_converter_create_texture_unchecked (self, src_ptr, width,
+        height, format, channles, stride, plane, mode);
   }
 
-  return gst_cuda_converter_create_texture_unchecked (self,
-      src_ptr, width, height, format, channles, stride, plane, mode);
+  return priv->fallback_bufferplane.texture;
 }
 
 static gboolean
@@ -2148,7 +2400,8 @@
 
 gboolean
 gst_cuda_converter_convert_frame (GstCudaConverter * converter,
-    GstVideoFrame * src_frame, GstVideoFrame * dst_frame, CUstream stream)
+    GstVideoFrame * src_frame, GstVideoFrame * dst_frame, CUstream stream,
+    gboolean * synchronized)
 {
   GstCudaConverterPrivate *priv;
   const TextureFormat *format;
@@ -2162,6 +2415,8 @@
   gpointer args = { &texture0, &texture1, &texture2, &texture3,
     &dst0, &dst1, &dst2, &dst3, &stride0, &stride1
   };
+  gboolean need_sync = FALSE;
+  GstCudaMemory *cmem;
 
   g_return_val_if_fail (GST_IS_CUDA_CONVERTER (converter), FALSE);
   g_return_val_if_fail (src_frame != NULL, FALSE);
@@ -2172,6 +2427,9 @@
 
   g_assert (format);
 
+  cmem = (GstCudaMemory *) gst_buffer_peek_memory (src_frame->buffer, 0);
+  g_return_val_if_fail (gst_is_cuda_memory (GST_MEMORY_CAST (cmem)), FALSE);
+
   if (!gst_cuda_context_push (converter->context)) {
     GST_ERROR_OBJECT (converter, "Couldn't push context");
     return FALSE;
@@ -2181,25 +2439,26 @@
     if (!gst_cuda_converter_unpack_rgb (converter, src_frame, stream))
       goto out;
 
-    texture0 = gst_cuda_converter_create_texture_unchecked (converter,
-        priv->unpack_buffer.ptr, priv->in_info.width, priv->in_info.height,
-        format->array_format0, 4, priv->unpack_buffer.stride, 0,
-        priv->filter_mode0);
+    texture0 = priv->unpack_buffer.texture;
     if (!texture0) {
-      GST_ERROR_OBJECT (converter, "Couldn't create texture");
+      GST_ERROR_OBJECT (converter, "Unpack texture is unavailable");
       goto out;
     }
   } else {
     for (i = 0; i < GST_VIDEO_FRAME_N_PLANES (src_frame); i++) {
-      CUdeviceptr src;
-
-      src = (CUdeviceptr) GST_VIDEO_FRAME_PLANE_DATA (src_frame, i);
-      texturei = gst_cuda_converter_create_texture (converter,
-          src, GST_VIDEO_FRAME_COMP_WIDTH (src_frame, i),
-          GST_VIDEO_FRAME_COMP_HEIGHT (src_frame, i),
-          GST_VIDEO_FRAME_PLANE_STRIDE (src_frame, i),
-          priv->filter_modei, format->array_formati, format->channelsi, i,
-          stream);
+      if (!gst_cuda_memory_get_texture (cmem,
+              i, priv->filter_modei, &texturei)) {
+        CUdeviceptr src;
+        src = (CUdeviceptr) GST_VIDEO_FRAME_PLANE_DATA (src_frame, i);
+        texturei = gst_cuda_converter_create_texture (converter,
+            src, GST_VIDEO_FRAME_COMP_WIDTH (src_frame, i),
+            GST_VIDEO_FRAME_COMP_HEIGHT (src_frame, i),
+            GST_VIDEO_FRAME_PLANE_STRIDE (src_frame, i),
+            priv->filter_modei, format->array_formati, format->channelsi,
+            i, stream);
+        need_sync = TRUE;
+      }
+
       if (!texturei) {
         GST_ERROR_OBJECT (converter, "Couldn't create texture %d", i);
         goto out;
@@ -2226,17 +2485,15 @@
     goto out;
   }
 
-  CuStreamSynchronize (stream);
+  if (need_sync)
+    CuStreamSynchronize (stream);
+
+  if (synchronized)
+    *synchronized = need_sync;
 
   ret = TRUE;
 
 out:
-  for (i = 0; i < G_N_ELEMENTS (texture); i++) {
-    if (texturei)
-      CuTexObjectDestroy (texturei);
-    else
-      break;
-  }
 
   gst_cuda_context_pop (NULL);
   return ret;

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstcudaconverter.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaconverter.h Changed

@@ -20,7 +20,7 @@
 #pragma once
 
 #include <gst/video/video.h>
-#include <gst/cuda/gstcudacontext.h>
+#include <gst/cuda/gstcuda.h>
 
 G_BEGIN_DECLS
 
@@ -64,6 +64,13 @@
  */
 #define GST_CUDA_CONVERTER_OPT_DEST_HEIGHT   "GstCudaConverter.dest-height"
 
+/**
+ * GST_CUDA_CONVERTER_OPT_ORIENTATION_METHOD:
+ *
+ * #GstVideoOrientationMethod, default #GST_VIDEO_ORIENTATION_IDENTITY
+ */
+#define GST_CUDA_CONVERTER_OPT_ORIENTATION_METHOD   "GstCudaConverter.orientation-method"
+
 struct _GstCudaConverter
 {
   GstObject parent;
@@ -93,7 +100,8 @@
 gboolean            gst_cuda_converter_convert_frame (GstCudaConverter * converter,
                                                       GstVideoFrame * src_frame,
                                                       GstVideoFrame * dst_frame,
-                                                      CUstream cuda_stream);
+                                                      CUstream cuda_stream,
+                                                      gboolean * synchronized);
 
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstcudaconvertscale.c -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaconvertscale.c Changed

@@ -30,9 +30,10 @@
 #define GST_CAT_DEFAULT gst_cuda_base_convert_debug
 
 #define GST_CUDA_CONVET_FORMATS \
-    "{ I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, " \
-    "BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, " \
-    "Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, GBRA }"
+    "{ I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, " \
+    "Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, " \
+    "BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, RGBP, BGRP, GBR, " \
+    "GBRA, GBR_10LE, GBR_12LE, GBR_16LE }"
 
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -55,13 +56,27 @@
   GstCudaBaseTransform parent;
 
   GstCudaConverter *converter;
+  GstCudaStream *other_stream;
 
   gint borders_h;
   gint borders_w;
   gboolean add_borders;
+
+  /* orientation */
+  /* method configured via property */
+  GstVideoOrientationMethod method;
+  /* method parsed from tag */
+  GstVideoOrientationMethod tag_method;
+  /* method currently selected based on "method" and "tag_method" */
+  GstVideoOrientationMethod selected_method;
+  /* method previously selected and used for negotiation */
+  GstVideoOrientationMethod active_method;
+
+  GMutex lock;
 };
 
 static void gst_cuda_base_convert_dispose (GObject * object);
+static void gst_cuda_base_convert_finalize (GObject * object);
 static GstCaps *gst_cuda_base_convert_transform_caps (GstBaseTransform * trans,
     GstPadDirection direction, GstCaps * caps, GstCaps * filter);
 static GstCaps *gst_cuda_base_convert_fixate_caps (GstBaseTransform * trans,
@@ -102,6 +117,7 @@
       GST_CUDA_BASE_TRANSFORM_CLASS (klass);
 
   gobject_class->dispose = gst_cuda_base_convert_dispose;
+  gobject_class->finalize = gst_cuda_base_convert_finalize;
 
   gst_element_class_add_static_pad_template (element_class, &sink_template);
   gst_element_class_add_static_pad_template (element_class, &src_template);
@@ -129,6 +145,7 @@
 gst_cuda_base_convert_init (GstCudaBaseConvert * self)
 {
   self->add_borders = DEFAULT_ADD_BORDERS;
+  g_mutex_init (&self->lock);
 }
 
 static void
@@ -136,11 +153,22 @@
 {
   GstCudaBaseConvert *self = GST_CUDA_BASE_CONVERT (object);
 
+  gst_clear_cuda_stream (&self->other_stream);
   gst_clear_object (&self->converter);
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
+static void
+gst_cuda_base_convert_finalize (GObject * object)
+{
+  GstCudaBaseConvert *self = GST_CUDA_BASE_CONVERT (object);
+
+  g_mutex_clear (&self->lock);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
 static GstCaps *
 gst_cuda_base_convert_caps_remove_format_info (GstCaps * caps)
 {
@@ -608,9 +636,11 @@
 gst_cuda_base_convert_fixate_size (GstBaseTransform * base,
     GstPadDirection direction, GstCaps * caps, GstCaps * othercaps)
 {
+  GstCudaBaseConvert *self = GST_CUDA_BASE_CONVERT (base);
   GstStructure *ins, *outs;
   const GValue *from_par, *to_par;
   GValue fpar = G_VALUE_INIT, tpar = G_VALUE_INIT;
+  gboolean rotate = FALSE;
 
   othercaps = gst_caps_truncate (othercaps);
   othercaps = gst_caps_make_writable (othercaps);
@@ -620,6 +650,19 @@
   from_par = gst_structure_get_value (ins, "pixel-aspect-ratio");
   to_par = gst_structure_get_value (outs, "pixel-aspect-ratio");
 
+  g_mutex_lock (&self->lock);
+  switch (self->selected_method) {
+    case GST_VIDEO_ORIENTATION_90R:
+    case GST_VIDEO_ORIENTATION_90L:
+    case GST_VIDEO_ORIENTATION_UL_LR:
+    case GST_VIDEO_ORIENTATION_UR_LL:
+      rotate = TRUE;
+      break;
+    default:
+      rotate = FALSE;
+      break;
+  }
+
   if (direction == GST_PAD_SINK) {
     if (!from_par) {
       g_value_init (&fpar, GST_TYPE_FRACTION);
@@ -648,8 +691,13 @@
     if (!to_par) {
       gint to_par_n, to_par_d;
 
-      to_par_n = from_par_n;
-      to_par_d = from_par_d;
+      if (rotate) {
+        to_par_n = from_par_n;
+        to_par_d = from_par_d;
+      } else {
+        to_par_n = from_par_n;
+        to_par_d = from_par_d;
+      }
 
       g_value_init (&tpar, GST_TYPE_FRACTION);
       gst_value_set_fraction (&tpar, to_par_n, to_par_d);
@@ -679,6 +727,17 @@
     gst_structure_get_int (outs, "width", &w);
     gst_structure_get_int (outs, "height", &h);
 
+    /* swap dimensions when it's rotated */
+    if (rotate) {
+      gint _tmp = from_w;
+      from_w = from_h;
+      from_h = _tmp;
+
+      _tmp = from_par_n;
+      from_par_n = from_par_d;
+      from_par_d = _tmp;
+    }
+
     /* if both width and height are already fixed, we can't do anything
      * about it anymore */
     if (w && h) {
@@ -1044,6 +1103,7 @@
     g_value_unset (&fpar);
   if (to_par == &tpar)
     g_value_unset (&tpar);
+  g_mutex_unlock (&self->lock);
 
   return othercaps;
 }
@@ -1099,6 +1159,7 @@
 gst_cuda_base_convert_propose_allocation (GstBaseTransform * trans,
     GstQuery * decide_query, GstQuery * query)
 {
+  GstCudaBaseConvert *self = GST_CUDA_BASE_CONVERT (trans);
   GstCudaBaseTransform *ctrans = GST_CUDA_BASE_TRANSFORM (trans);
   GstVideoInfo info;
   GstBufferPool *pool;
@@ -1127,6 +1188,14 @@
     pool = gst_cuda_buffer_pool_new (ctrans->context);
 
     config = gst_buffer_pool_get_config (pool);
+    /* Forward downstream CUDA stream to upstream */
+    if (self->other_stream) {
+      GST_DEBUG_OBJECT (self, "Have downstream CUDA stream, forwarding");
+      gst_buffer_pool_config_set_cuda_stream (config, self->other_stream);
+    } else if (ctrans->stream) {
+      GST_DEBUG_OBJECT (self, "Set our stream to proposing buffer pool");
+      gst_buffer_pool_config_set_cuda_stream (config, ctrans->stream);
+    }
 
     gst_buffer_pool_config_add_option (config,
         GST_BUFFER_POOL_OPTION_VIDEO_META);
@@ -1159,6 +1228,7 @@
 gst_cuda_base_convert_decide_allocation (GstBaseTransform * trans,
     GstQuery * query)
 {
+  GstCudaBaseConvert *self = GST_CUDA_BASE_CONVERT (trans);
   GstCudaBaseTransform *ctrans = GST_CUDA_BASE_TRANSFORM (trans);
   GstCaps *outcaps = NULL;
   GstBufferPool *pool = NULL;
@@ -1202,6 +1272,15 @@
   config = gst_buffer_pool_get_config (pool);
   gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
   gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
+  gst_clear_cuda_stream (&self->other_stream);
+  self->other_stream = gst_buffer_pool_config_get_cuda_stream (config);
+  if (self->other_stream) {
+    GST_DEBUG_OBJECT (self, "Downstream provided CUDA stream");
+  } else if (ctrans->stream) {
+    GST_DEBUG_OBJECT (self, "Set our stream to decided buffer pool");
+    gst_buffer_pool_config_set_cuda_stream (config, ctrans->stream);
+  }
+
   gst_buffer_pool_set_config (pool, config);
 
   /* Get updated size by cuda buffer pool */
@@ -1221,19 +1300,71 @@
 }
 
 static gboolean
+needs_color_convert (const GstVideoInfo * in_info,
+    const GstVideoInfo * out_info)
+{
+  const GstVideoColorimetry *in_cinfo = &in_info->colorimetry;
+  const GstVideoColorimetry *out_cinfo = &out_info->colorimetry;
+
+  if (in_cinfo->range != out_cinfo->range ||
+      in_cinfo->matrix != out_cinfo->matrix) {
+    return TRUE;
+  }
+
+  if (!gst_video_color_primaries_is_equivalent (in_cinfo->primaries,
+          out_cinfo->primaries)) {
+    return TRUE;
+  }
+
+  if (!gst_video_transfer_function_is_equivalent (in_cinfo->transfer,
+          GST_VIDEO_INFO_COMP_DEPTH (in_info, 0), out_cinfo->transfer,
+          GST_VIDEO_INFO_COMP_DEPTH (out_info, 0))) {
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+static gboolean
 gst_cuda_base_convert_set_info (GstCudaBaseTransform * btrans,
     GstCaps * incaps, GstVideoInfo * in_info, GstCaps * outcaps,
     GstVideoInfo * out_info)
 {
   GstCudaBaseConvert *self = GST_CUDA_BASE_CONVERT (btrans);
   gint from_dar_n, from_dar_d, to_dar_n, to_dar_d;
-  GstVideoInfo tmp_info;
+  gboolean need_flip = FALSE;
+  gint in_width, in_height, in_par_n, in_par_d;
+  GstVideoOrientationMethod active_method;
 
   gst_clear_object (&self->converter);
 
-  if (!gst_util_fraction_multiply (in_info->width,
-          in_info->height, in_info->par_n, in_info->par_d, &from_dar_n,
-          &from_dar_d)) {
+  g_mutex_lock (&self->lock);
+  active_method = self->active_method = self->selected_method;
+  g_mutex_unlock (&self->lock);
+
+  if (active_method != GST_VIDEO_ORIENTATION_IDENTITY)
+    need_flip = TRUE;
+
+  switch (active_method) {
+    case GST_VIDEO_ORIENTATION_90R:
+    case GST_VIDEO_ORIENTATION_90L:
+    case GST_VIDEO_ORIENTATION_UL_LR:
+    case GST_VIDEO_ORIENTATION_UR_LL:
+      in_width = in_info->height;
+      in_height = in_info->width;
+      in_par_n = in_info->par_d;
+      in_par_d = in_info->par_n;
+      break;
+    default:
+      in_width = in_info->width;
+      in_height = in_info->height;
+      in_par_n = in_info->par_n;
+      in_par_d = in_info->par_d;
+      break;
+  }
+
+  if (!gst_util_fraction_multiply (in_width,
+          in_height, in_par_n, in_par_d, &from_dar_n, &from_dar_d)) {
     from_dar_n = from_dar_d = -1;
   }
 
@@ -1275,14 +1406,10 @@
     return FALSE;
   }
 
-  /* if the only thing different in the caps is the transfer function, and
-   * we're converting between equivalent transfer functions, do passthrough */
-  tmp_info = *in_info;
-  tmp_info.colorimetry.transfer = out_info->colorimetry.transfer;
-  if (gst_video_info_is_equal (&tmp_info, out_info) &&
-      gst_video_transfer_function_is_equivalent (in_info->colorimetry.transfer,
-          in_info->finfo->bits, out_info->colorimetry.transfer,
-          out_info->finfo->bits)) {
+  if (in_width == out_info->width && in_height == out_info->height
+      && in_info->finfo == out_info->finfo && self->borders_w == 0 &&
+      self->borders_h == 0 && !need_flip &&
+      !needs_color_convert (in_info, out_info)) {
     gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (self), TRUE);
   } else {
     GstStructure *config;
@@ -1296,7 +1423,9 @@
         GST_CUDA_CONVERTER_OPT_DEST_WIDTH,
         G_TYPE_INT, out_info->width - self->borders_w,
         GST_CUDA_CONVERTER_OPT_DEST_HEIGHT,
-        G_TYPE_INT, out_info->height - self->borders_h, NULL);
+        G_TYPE_INT, out_info->height - self->borders_h,
+        GST_CUDA_CONVERTER_OPT_ORIENTATION_METHOD,
+        GST_TYPE_VIDEO_ORIENTATION_METHOD, active_method, NULL);
 
     self->converter = gst_cuda_converter_new (in_info,
         out_info, btrans->context, config);
@@ -1343,6 +1472,10 @@
   GstVideoFrame in_frame, out_frame;
   GstFlowReturn ret = GST_FLOW_OK;
   GstMemory *mem;
+  GstCudaMemory *in_cmem, *out_cmem;
+  GstCudaStream *in_stream, *out_stream;
+  GstCudaStream *selected_stream = NULL;
+  gboolean sync_done = FALSE;
 
   if (gst_buffer_n_memory (inbuf) != 1) {
     GST_ERROR_OBJECT (self, "Invalid input buffer");
@@ -1354,6 +1487,8 @@
     GST_ERROR_OBJECT (self, "Input buffer is not CUDA");
     return GST_FLOW_ERROR;
   }
+  in_cmem = GST_CUDA_MEMORY_CAST (mem);
+  in_stream = gst_cuda_memory_get_stream (in_cmem);
 
   if (gst_buffer_n_memory (outbuf) != 1) {
     GST_ERROR_OBJECT (self, "Invalid output buffer");
@@ -1365,6 +1500,8 @@
     GST_ERROR_OBJECT (self, "Input buffer is not CUDA");
     return GST_FLOW_ERROR;
   }
+  out_cmem = GST_CUDA_MEMORY_CAST (mem);
+  out_stream = gst_cuda_memory_get_stream (out_cmem);
 
   if (!gst_video_frame_map (&in_frame, &btrans->in_info, inbuf,
           GST_MAP_READ | GST_MAP_CUDA)) {
@@ -1379,12 +1516,44 @@
     return GST_FLOW_ERROR;
   }
 
+  /* If downstream does not aware of CUDA stream (i.e., using default stream) */
+  if (!out_stream) {
+    if (in_stream) {
+      GST_TRACE_OBJECT (self, "Use upstram CUDA stream");
+      selected_stream = in_stream;
+    } else if (btrans->stream) {
+      GST_TRACE_OBJECT (self, "Use our CUDA stream");
+      selected_stream = btrans->stream;
+    }
+  } else {
+    selected_stream = out_stream;
+    if (in_stream) {
+      if (in_stream == out_stream) {
+        GST_TRACE_OBJECT (self, "Same stream");
+      } else {
+        GST_TRACE_OBJECT (self, "Different CUDA stream");
+        gst_cuda_memory_sync (in_cmem);
+      }
+    }
+  }
+
   if (!gst_cuda_converter_convert_frame (self->converter, &in_frame, &out_frame,
-          btrans->cuda_stream)) {
+          gst_cuda_stream_get_handle (selected_stream), &sync_done)) {
     GST_ERROR_OBJECT (self, "Failed to convert frame");
     ret = GST_FLOW_ERROR;
   }
 
+  if (sync_done) {
+    GST_TRACE_OBJECT (self, "Sync done by converter");
+    GST_MEMORY_FLAG_UNSET (out_cmem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+  } else if (selected_stream != out_stream) {
+    GST_MEMORY_FLAG_UNSET (out_cmem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+    GST_TRACE_OBJECT (self, "Waiting for convert sync");
+    gst_cuda_context_push (btrans->context);
+    CuStreamSynchronize (gst_cuda_stream_get_handle (selected_stream));
+    gst_cuda_context_pop (NULL);
+  }
+
   gst_video_frame_unmap (&out_frame);
   gst_video_frame_unmap (&in_frame);
 
@@ -1402,6 +1571,37 @@
     gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM_CAST (self));
 }
 
+static void
+gst_cuda_base_convert_set_orientation (GstCudaBaseConvert * self,
+    GstVideoOrientationMethod method, gboolean from_tag)
+{
+  if (method == GST_VIDEO_ORIENTATION_CUSTOM) {
+    GST_WARNING_OBJECT (self, "Unsupported custom orientation");
+    return;
+  }
+
+  g_mutex_lock (&self->lock);
+  if (from_tag)
+    self->tag_method = method;
+  else
+    self->method = method;
+
+  if (self->method == GST_VIDEO_ORIENTATION_AUTO) {
+    self->selected_method = self->tag_method;
+  } else {
+    self->selected_method = self->method;
+  }
+
+  if (self->selected_method != self->active_method) {
+    GST_DEBUG_OBJECT (self, "Rotation orientation %d -> %d",
+        self->active_method, self->selected_method);
+
+    gst_base_transform_reconfigure_src (GST_BASE_TRANSFORM (self));
+  }
+
+  g_mutex_unlock (&self->lock);
+}
+
 /**
  * SECTION:element-cudaconvertscale
  * @title: cudaconvertscale
@@ -1425,6 +1625,7 @@
 {
   PROP_CONVERT_SCALE_0,
   PROP_CONVERT_SCALE_ADD_BORDERS,
+  PROP_CONVERT_SCALE_VIDEO_DIRECTION,
 };
 
 struct _GstCudaConvertScale
@@ -1432,19 +1633,34 @@
   GstCudaBaseConvert parent;
 };
 
+static void
+    gst_cuda_convert_scale_video_direction_interface_init
+    (GstVideoDirectionInterface * iface)
+{
+}
+
 static void gst_cuda_convert_scale_set_property (GObject * object,
     guint prop_id, const GValue * value, GParamSpec * pspec);
 static void gst_cuda_convert_scale_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
+static gboolean gst_cuda_convert_scale_sink_event (GstBaseTransform * trans,
+    GstEvent * event);
 
-G_DEFINE_TYPE (GstCudaConvertScale, gst_cuda_convert_scale,
-    GST_TYPE_CUDA_BASE_CONVERT);
+#define gst_cuda_convert_scale_parent_class convert_scale_parent_class
+G_DEFINE_TYPE_WITH_CODE (GstCudaConvertScale, gst_cuda_convert_scale,
+    GST_TYPE_CUDA_BASE_CONVERT,
+    G_IMPLEMENT_INTERFACE (GST_TYPE_VIDEO_DIRECTION,
+        gst_cuda_convert_scale_video_direction_interface_init));
+
+static void gst_cuda_convert_scale_before_transform (GstBaseTransform * trans,
+    GstBuffer * buffer);
 
 static void
 gst_cuda_convert_scale_class_init (GstCudaConvertScaleClass * klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseTransformClass *transform_class = GST_BASE_TRANSFORM_CLASS (klass);
 
   gobject_class->set_property = gst_cuda_convert_scale_set_property;
   gobject_class->get_property = gst_cuda_convert_scale_get_property;
@@ -1456,11 +1672,27 @@
           DEFAULT_ADD_BORDERS, (GParamFlags) (GST_PARAM_MUTABLE_PLAYING |
               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
+  /**
+   * GstCudaConvertScale:video-direction:
+   *
+   * Video rotation/flip method to use
+   *
+   * Since: 1.24
+   */
+  g_object_class_override_property (gobject_class,
+      PROP_CONVERT_SCALE_VIDEO_DIRECTION, "video-direction");
+
   gst_element_class_set_static_metadata (element_class,
       "CUDA colorspace converter and scaler",
-      "Filter/Converter/Video/Scaler/Colorspace/Hardware",
+      "Filter/Converter/Video/Scaler/Colorspace/Effect/Hardware",
       "Resizes video and allow color conversion using CUDA",
       "Seungha Yang <seungha@centricular.com>");
+
+  transform_class->passthrough_on_same_caps = FALSE;
+  transform_class->before_transform =
+      GST_DEBUG_FUNCPTR (gst_cuda_convert_scale_before_transform);
+  transform_class->sink_event =
+      GST_DEBUG_FUNCPTR (gst_cuda_convert_scale_sink_event);
 }
 
 static void
@@ -1478,6 +1710,10 @@
     case PROP_CONVERT_SCALE_ADD_BORDERS:
       gst_cuda_base_convert_set_add_border (base, g_value_get_boolean (value));
       break;
+    case PROP_CONVERT_SCALE_VIDEO_DIRECTION:
+      gst_cuda_base_convert_set_orientation (base, g_value_get_enum (value),
+          FALSE);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1494,6 +1730,8 @@
     case PROP_CONVERT_SCALE_ADD_BORDERS:
       g_value_set_boolean (value, base->add_borders);
       break;
+    case PROP_CONVERT_SCALE_VIDEO_DIRECTION:
+      g_value_set_enum (value, base->method);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1501,6 +1739,76 @@
   }
 }
 
+static void
+gst_cuda_convert_scale_before_transform (GstBaseTransform * trans,
+    GstBuffer * buffer)
+{
+  GstCudaBaseConvert *base = GST_CUDA_BASE_CONVERT (trans);
+  gboolean update = FALSE;
+  GstCaps *in_caps;
+  GstCaps *out_caps;
+  GstBaseTransformClass *klass;
+
+  GST_BASE_TRANSFORM_CLASS (convert_scale_parent_class)->before_transform
+      (trans, buffer);
+
+  g_mutex_lock (&base->lock);
+  if (base->selected_method != base->active_method)
+    update = TRUE;
+  g_mutex_unlock (&base->lock);
+
+  if (!update)
+    return;
+
+  /* basetransform wouldn't call set_caps if in/out caps were not changed.
+   * Update it manually here */
+  GST_DEBUG_OBJECT (base, "Updating caps for direction change");
+
+  in_caps = gst_pad_get_current_caps (GST_BASE_TRANSFORM_SINK_PAD (trans));
+  if (!in_caps) {
+    GST_WARNING_OBJECT (trans, "sinkpad has no current caps");
+    return;
+  }
+
+  out_caps = gst_pad_get_current_caps (GST_BASE_TRANSFORM_SRC_PAD (trans));
+  if (!out_caps) {
+    GST_WARNING_OBJECT (trans, "srcpad has no current caps");
+    gst_caps_unref (in_caps);
+    return;
+  }
+
+  klass = GST_BASE_TRANSFORM_GET_CLASS (trans);
+  klass->set_caps (trans, in_caps, out_caps);
+  gst_caps_unref (in_caps);
+  gst_caps_unref (out_caps);
+
+  gst_base_transform_reconfigure_src (trans);
+}
+
+static gboolean
+gst_cuda_convert_scale_sink_event (GstBaseTransform * trans, GstEvent * event)
+{
+  GstCudaBaseConvert *base = GST_CUDA_BASE_CONVERT (trans);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_TAG:{
+      GstTagList *taglist;
+      GstVideoOrientationMethod method = GST_VIDEO_ORIENTATION_IDENTITY;
+
+      gst_event_parse_tag (event, &taglist);
+      if (gst_video_orientation_from_tag (taglist, &method))
+        gst_cuda_base_convert_set_orientation (base, method, TRUE);
+      break;
+    }
+    default:
+      break;
+  }
+
+  return
+      GST_BASE_TRANSFORM_CLASS (convert_scale_parent_class)->sink_event
+      (trans, event);
+}
+
 /**
  * SECTION:element-cudaconvert
  * @title: cudaconvert

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstcudaformat.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaformat.h Changed

@@ -24,18 +24,20 @@
 G_BEGIN_DECLS
 
 #define GST_CUDA_FORMATS \
-    "{ I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, " \
-    "BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, " \
-    "Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, BGRP, GBR, GBRA }"
+    "{ I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, I420_10LE, I420_12LE, Y444, " \
+    "Y444_10LE, Y444_12LE, Y444_16LE, BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, " \
+    "BGR, BGR10A2_LE, RGB10A2_LE, Y42B, I422_10LE, I422_12LE, YUY2, UYVY, RGBP, " \
+    "BGRP, GBR, GBR_10LE, GBR_12LE, GBR_16LE, GBRA }"
 
 #define GST_CUDA_GL_FORMATS \
-    "{ I420, YV12, NV12, NV21, P010_10LE, P016_LE, Y444, " \
+    "{ I420, YV12, NV12, NV21, P010_10LE, P012_LE, P016_LE, Y444, " \
     "BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE, " \
     "YUY2, UYVY, RGBP, BGRP, GBR, GBRA }"
 
 #define GST_CUDA_D3D11_FORMATS \
-    "{ I420, YV12, I420_10LE, Y444, Y444_16LE, " \
-    "BGRA, RGBA, BGRx, RGBx, Y42B, I422_10LE, I422_12LE }"
+    "{ I420, YV12, I420_10LE, I420_12LE, Y444, Y444_10LE, Y444_12LE, Y444_16LE, " \
+    "BGRA, RGBA, BGRx, RGBx, Y42B, I422_10LE, I422_12LE, GBR, GBR, GBR_10LE, " \
+    "GBR_12LE, GBR_16LE }"
 
 #define GST_CUDA_NVMM_FORMATS \
     "{ I420, YV12, NV12, NV21, P010_10LE, Y444, " \

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipc.cpp Added

@@ -0,0 +1,612 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudaipc.h"
+#include <gst/cuda/gstcuda-private.h>
+#include <string.h>
+#include <cctype>
+#include <locale>
+#include <codecvt>
+#include <algorithm>
+#include <mutex>
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
+#define GST_CUDA_IPC_MAGIC_NUMBER 0xC0DA10C0
+
+constexpr guint GST_CUDA_IPC_PKT_HAVE_DATA_PAYLOAD_MIN_SIZE =
+    sizeof (GstClockTime) + sizeof (CUipcMemHandle) +
+    sizeof (GstCudaIpcMemLayout) + sizeof (guint) + sizeof (guint);
+constexpr guint GST_CUDA_IPC_PKT_HAVE_MMAP_DATA_PAYLOAD_MIN_SIZE =
+    sizeof (GstClockTime) + sizeof (GstCudaSharableHandle) +
+    sizeof (GstCudaIpcMemLayout) + sizeof (guint) + sizeof (guint);
+constexpr guint GST_CUDA_IPC_PKT_RELEASE_DATA_PAYLOAD_SIZE =
+    sizeof (CUipcMemHandle);
+
+bool
+gst_cuda_ipc_pkt_identify (std::vector < guint8 > &buf,
+    GstCudaIpcPacketHeader & header)
+{
+  g_return_val_if_fail (buf.size () >= GST_CUDA_IPC_PKT_HEADER_SIZE, false);
+
+  memcpy (&header, &buf0, GST_CUDA_IPC_PKT_HEADER_SIZE);
+
+  if (header.magic != GST_CUDA_IPC_MAGIC_NUMBER)
+    return false;
+
+  buf.resize (GST_CUDA_IPC_PKT_HEADER_SIZE + header.payload_size);
+
+  return true;
+}
+
+bool
+gst_cuda_ipc_pkt_build_config (std::vector < guint8 > &buf,
+    GstCudaPid pid, gboolean use_mmap, GstCaps * caps)
+{
+  GstCudaIpcPacketHeader header;
+  guint8 *ptr;
+  gchar *caps_str = nullptr;
+  guint caps_size = 0;
+
+  g_return_val_if_fail (GST_IS_CAPS (caps), false);
+
+  caps_str = gst_caps_serialize (caps, GST_SERIALIZE_FLAG_NONE);
+  if (!caps_str)
+    return false;
+
+  caps_size = strlen (caps_str) + 1;
+
+  header.type = GstCudaIpcPktType::CONFIG;
+  header.magic = GST_CUDA_IPC_MAGIC_NUMBER;
+  header.payload_size = sizeof (GstCudaPid) + sizeof (gboolean) + caps_size;
+
+  buf.resize (GST_CUDA_IPC_PKT_HEADER_SIZE + header.payload_size);
+
+  ptr = &buf0;
+
+  memcpy (ptr, &header, GST_CUDA_IPC_PKT_HEADER_SIZE);
+  ptr += GST_CUDA_IPC_PKT_HEADER_SIZE;
+
+  *((GstCudaPid *) ptr) = pid;
+  ptr += sizeof (GstCudaPid);
+
+  *((gboolean *) ptr) = use_mmap;
+  ptr += sizeof (gboolean);
+
+  strcpy ((char *) ptr, caps_str);
+  g_free (caps_str);
+
+  return true;
+}
+
+bool
+gst_cuda_ipc_pkt_parse_config (std::vector < guint8 > &buf, GstCudaPid * pid,
+    gboolean * use_mmap, GstCaps ** caps)
+{
+  GstCudaIpcPacketHeader header;
+  const guint8 *ptr;
+  std::string str;
+
+  g_return_val_if_fail (buf.size () > GST_CUDA_IPC_PKT_HEADER_SIZE, false);
+  g_return_val_if_fail (caps, false);
+
+  ptr = &buf0;
+  memcpy (&header, ptr, GST_CUDA_IPC_PKT_HEADER_SIZE);
+
+  if (header.type != GstCudaIpcPktType::CONFIG ||
+      header.magic != GST_CUDA_IPC_MAGIC_NUMBER ||
+      header.payload_size <= sizeof (GstCudaPid) + sizeof (gboolean)) {
+    return false;
+  }
+
+  ptr += GST_CUDA_IPC_PKT_HEADER_SIZE;
+
+  memcpy (pid, ptr, sizeof (GstCudaPid));
+  ptr += sizeof (GstCudaPid);
+
+  memcpy (use_mmap, ptr, sizeof (gboolean));
+  ptr += sizeof (gboolean);
+
+  *caps = gst_caps_from_string ((const gchar *) ptr);
+  if (*caps == nullptr)
+    return false;
+
+  return true;
+}
+
+void
+gst_cuda_ipc_pkt_build_need_data (std::vector < guint8 > &buf)
+{
+  GstCudaIpcPacketHeader header;
+
+  header.type = GstCudaIpcPktType::NEED_DATA;
+  header.magic = GST_CUDA_IPC_MAGIC_NUMBER;
+  header.payload_size = 0;
+
+  buf.resize (GST_CUDA_IPC_PKT_HEADER_SIZE);
+
+  memcpy (&buf0, &header, GST_CUDA_IPC_PKT_HEADER_SIZE);
+}
+
+/* *INDENT-OFF* */
+bool
+gst_cuda_ipc_pkt_build_have_data (std::vector < guint8 > &buf, GstClockTime pts,
+    const GstVideoInfo & info, const CUipcMemHandle & handle, GstCaps * caps,
+    const std::vector<guint8> & meta)
+{
+  GstCudaIpcPacketHeader header;
+  GstCudaIpcMemLayout layout;
+  guint8 *ptr;
+  guint caps_len = 0;
+  gchar *caps_str = nullptr;
+
+  if (caps) {
+    caps_str = gst_caps_serialize (caps, GST_SERIALIZE_FLAG_NONE);
+    if (!caps_str)
+      return false;
+
+    caps_len = strlen (caps_str) + 1;
+  }
+
+  header.type = GstCudaIpcPktType::HAVE_DATA;
+  header.magic = GST_CUDA_IPC_MAGIC_NUMBER;
+  header.payload_size = sizeof (GstClockTime) + sizeof (CUipcMemHandle) +
+    sizeof (GstCudaIpcMemLayout) + sizeof (guint) + caps_len +
+    sizeof (guint) + meta.size ();
+
+  layout.size = layout.max_size = info.size;
+  layout.pitch = info.stride0;
+  for (guint i = 0; i < 4; i++)
+    layout.offseti = info.offseti;
+
+  buf.resize (GST_CUDA_IPC_PKT_HEADER_SIZE + header.payload_size);
+
+  ptr = &buf0;
+  memcpy (ptr, &header, GST_CUDA_IPC_PKT_HEADER_SIZE);
+  ptr += GST_CUDA_IPC_PKT_HEADER_SIZE;
+
+  memcpy (ptr, &pts, sizeof (GstClockTime));
+  ptr += sizeof (GstClockTime);
+
+  memcpy (ptr, &layout, sizeof (GstCudaIpcMemLayout));
+  ptr += sizeof (GstCudaIpcMemLayout);
+
+  memcpy (ptr, &handle, sizeof (CUipcMemHandle));
+  ptr += sizeof (CUipcMemHandle);
+
+  *((guint *) ptr) = caps_len;
+  ptr += sizeof (guint);
+  if (caps_len > 0) {
+    strcpy ((char *) ptr, caps_str);
+    ptr += caps_len;
+  }
+
+  *((guint *) ptr) = meta.size ();
+  ptr += sizeof (guint);
+  if (!meta.empty ())
+    memcpy (ptr, meta.data (), meta.size ());
+
+  g_free (caps_str);
+
+  return true;
+}
+/* *INDENT-ON* */
+
+#define DO_OFFSET(p,r,s) G_STMT_START { \
+  (p) += s; \
+  (r) -= s; \
+} G_STMT_END
+
+bool
+gst_cuda_ipc_pkt_parse_have_data (const std::vector < guint8 > &buf,
+    GstClockTime & pts, GstCudaIpcMemLayout & layout, CUipcMemHandle & handle,
+    GstCaps ** caps, std::vector < guint8 > &meta)
+{
+  GstCudaIpcPacketHeader header;
+  const guint8 *ptr;
+  size_t remaining;
+
+  g_return_val_if_fail (buf.size () >=
+      GST_CUDA_IPC_PKT_HEADER_SIZE +
+      GST_CUDA_IPC_PKT_HAVE_DATA_PAYLOAD_MIN_SIZE, false);
+  g_return_val_if_fail (caps, false);
+
+  meta.clear ();
+  remaining = buf.size ();
+
+  ptr = &buf0;
+  memcpy (&header, ptr, GST_CUDA_IPC_PKT_HEADER_SIZE);
+
+  if (header.type != GstCudaIpcPktType::HAVE_DATA ||
+      header.magic != GST_CUDA_IPC_MAGIC_NUMBER ||
+      header.payload_size < GST_CUDA_IPC_PKT_HAVE_DATA_PAYLOAD_MIN_SIZE) {
+    return false;
+  }
+
+  DO_OFFSET (ptr, remaining, GST_CUDA_IPC_PKT_HEADER_SIZE);
+
+  memcpy (&pts, ptr, sizeof (GstClockTime));
+  DO_OFFSET (ptr, remaining, sizeof (GstClockTime));
+
+  memcpy (&layout, ptr, sizeof (GstCudaIpcMemLayout));
+  DO_OFFSET (ptr, remaining, sizeof (GstCudaIpcMemLayout));
+
+  memcpy (&handle, ptr, sizeof (CUipcMemHandle));
+  DO_OFFSET (ptr, remaining, sizeof (CUipcMemHandle));
+
+  auto caps_len = *((guint *) ptr);
+  DO_OFFSET (ptr, remaining, sizeof (guint));
+  if (caps_len > 0) {
+    if (remaining < caps_len + sizeof (guint))
+      return false;
+
+    *caps = gst_caps_from_string ((const gchar *) ptr);
+    if (*caps == nullptr)
+      return false;
+  }
+
+  DO_OFFSET (ptr, remaining, caps_len);
+  if (remaining < sizeof (guint))
+    return false;
+
+  auto meta_len = *((guint *) ptr);
+  DO_OFFSET (ptr, remaining, sizeof (guint));
+  if (meta_len > 0) {
+    if (remaining < meta_len)
+      return false;
+
+    meta.resize (meta_len);
+    memcpy (meta.data (), ptr, meta_len);
+  }
+
+  return true;
+}
+
+/* *INDENT-OFF* */
+bool
+gst_cuda_ipc_pkt_build_have_mmap_data (std::vector<guint8> & buf,
+    GstClockTime pts, const GstVideoInfo & info, guint32 max_size,
+    GstCudaSharableHandle handle, GstCaps * caps,
+    const std::vector<guint8> & meta)
+{
+  GstCudaIpcPacketHeader header;
+  GstCudaIpcMemLayout layout;
+  guint8 *ptr;
+  guint caps_len = 0;
+  gchar *caps_str = nullptr;
+
+  if (caps) {
+    caps_str = gst_caps_serialize (caps, GST_SERIALIZE_FLAG_NONE);
+    if (!caps_str)
+      return false;
+
+    caps_len = strlen (caps_str) + 1;
+  }
+
+  header.type = GstCudaIpcPktType::HAVE_MMAP_DATA;
+  header.magic = GST_CUDA_IPC_MAGIC_NUMBER;
+  header.payload_size = sizeof (GstClockTime) + sizeof (GstCudaIpcMemLayout) +
+      sizeof (GstCudaSharableHandle) + sizeof (guint) + caps_len +
+      sizeof (guint) + meta.size ();
+
+  layout.size = info.size;
+  layout.max_size = max_size;
+  layout.pitch = info.stride0;
+  for (guint i = 0; i < 4; i++)
+    layout.offseti = info.offseti;
+
+  buf.resize (GST_CUDA_IPC_PKT_HEADER_SIZE + header.payload_size);
+
+  ptr = &buf0;
+  memcpy (ptr, &header, GST_CUDA_IPC_PKT_HEADER_SIZE);
+  ptr += GST_CUDA_IPC_PKT_HEADER_SIZE;
+
+  memcpy (ptr, &pts, sizeof (GstClockTime));
+  ptr += sizeof (GstClockTime);
+
+  memcpy (ptr, &layout, sizeof (GstCudaIpcMemLayout));
+  ptr += sizeof (GstCudaIpcMemLayout);
+
+  *((GstCudaSharableHandle *) ptr) = handle;
+  ptr += sizeof (GstCudaSharableHandle);
+
+  *((guint *) ptr) = caps_len;
+  ptr += sizeof (guint);
+  if (caps_len > 0) {
+    strcpy ((char *) ptr, caps_str);
+    ptr += caps_len;
+  }
+
+  *((guint *) ptr) = meta.size ();
+  ptr += sizeof (guint);
+  if (!meta.empty ())
+    memcpy (ptr, meta.data (), meta.size ());
+
+  g_free (caps_str);
+
+  return true;
+}
+/* *INDENT-ON* */
+
+bool
+gst_cuda_ipc_pkt_parse_have_mmap_data (const std::vector < guint8 > &buf,
+    GstClockTime & pts, GstCudaIpcMemLayout & layout,
+    GstCudaSharableHandle * handle, GstCaps ** caps,
+    std::vector < guint8 > &meta)
+{
+  GstCudaIpcPacketHeader header;
+  const guint8 *ptr;
+  size_t remaining;
+
+  g_return_val_if_fail (buf.size () >=
+      GST_CUDA_IPC_PKT_HEADER_SIZE +
+      GST_CUDA_IPC_PKT_HAVE_MMAP_DATA_PAYLOAD_MIN_SIZE, false);
+  g_return_val_if_fail (caps, false);
+
+  meta.clear ();
+  remaining = buf.size ();
+
+  ptr = &buf0;
+  memcpy (&header, ptr, GST_CUDA_IPC_PKT_HEADER_SIZE);
+
+  if (header.type != GstCudaIpcPktType::HAVE_MMAP_DATA ||
+      header.magic != GST_CUDA_IPC_MAGIC_NUMBER ||
+      header.payload_size < GST_CUDA_IPC_PKT_HAVE_MMAP_DATA_PAYLOAD_MIN_SIZE) {
+    return false;
+  }
+
+  DO_OFFSET (ptr, remaining, GST_CUDA_IPC_PKT_HEADER_SIZE);
+
+  memcpy (&pts, ptr, sizeof (GstClockTime));
+  DO_OFFSET (ptr, remaining, sizeof (GstClockTime));
+
+  memcpy (&layout, ptr, sizeof (GstCudaIpcMemLayout));
+  DO_OFFSET (ptr, remaining, sizeof (GstCudaIpcMemLayout));
+
+  *handle = *((GstCudaSharableHandle *) ptr);
+  DO_OFFSET (ptr, remaining, sizeof (GstCudaSharableHandle));
+
+  auto caps_len = *((guint *) ptr);
+  DO_OFFSET (ptr, remaining, sizeof (guint));
+  if (caps_len > 0) {
+    if (remaining < caps_len + sizeof (guint))
+      return false;
+
+    *caps = gst_caps_from_string ((const gchar *) ptr);
+    if (*caps == nullptr)
+      return false;
+  }
+
+  DO_OFFSET (ptr, remaining, caps_len);
+  if (remaining < sizeof (guint))
+    return false;
+
+  auto meta_len = *((guint *) ptr);
+  DO_OFFSET (ptr, remaining, sizeof (guint));
+  if (meta_len > 0) {
+    if (remaining < meta_len)
+      return false;
+
+    meta.resize (meta_len);
+    memcpy (meta.data (), ptr, meta_len);
+  }
+
+  return true;
+}
+
+void
+gst_cuda_ipc_pkt_build_read_done (std::vector < guint8 > &buf)
+{
+  GstCudaIpcPacketHeader header;
+
+  header.type = GstCudaIpcPktType::READ_DONE;
+  header.magic = GST_CUDA_IPC_MAGIC_NUMBER;
+  header.payload_size = 0;
+
+  buf.resize (GST_CUDA_IPC_PKT_HEADER_SIZE);
+
+  memcpy (&buf0, &header, GST_CUDA_IPC_PKT_HEADER_SIZE);
+}
+
+void
+gst_cuda_ipc_pkt_build_release_data (std::vector < guint8 > &buf,
+    const CUipcMemHandle & handle)
+{
+  GstCudaIpcPacketHeader header;
+  guint8 *ptr;
+
+  header.type = GstCudaIpcPktType::RELEASE_DATA;
+  header.magic = GST_CUDA_IPC_MAGIC_NUMBER;
+  header.payload_size = sizeof (CUipcMemHandle);
+
+  buf.resize (GST_CUDA_IPC_PKT_HEADER_SIZE +
+      GST_CUDA_IPC_PKT_RELEASE_DATA_PAYLOAD_SIZE);
+
+  ptr = &buf0;
+  memcpy (ptr, &header, GST_CUDA_IPC_PKT_HEADER_SIZE);
+  ptr += GST_CUDA_IPC_PKT_HEADER_SIZE;
+
+  memcpy (ptr, &handle, GST_CUDA_IPC_PKT_RELEASE_DATA_PAYLOAD_SIZE);
+}
+
+bool
+gst_cuda_ipc_pkt_parse_release_data (std::vector < guint8 > &buf,
+    CUipcMemHandle & handle)
+{
+  g_return_val_if_fail (buf.size () >=
+      GST_CUDA_IPC_PKT_HEADER_SIZE + GST_CUDA_IPC_PKT_RELEASE_DATA_PAYLOAD_SIZE,
+      false);
+
+  memcpy (&handle, &buf0 + GST_CUDA_IPC_PKT_HEADER_SIZE,
+      GST_CUDA_IPC_PKT_RELEASE_DATA_PAYLOAD_SIZE);
+
+  return true;
+}
+
+void
+gst_cuda_ipc_pkt_build_release_mmap_data (std::vector < guint8 > &buf,
+    GstCudaSharableHandle handle)
+{
+  GstCudaIpcPacketHeader header;
+  guint8 *ptr;
+
+  header.type = GstCudaIpcPktType::RELEASE_MMAP_DATA;
+  header.magic = GST_CUDA_IPC_MAGIC_NUMBER;
+  header.payload_size = sizeof (GstCudaSharableHandle);
+
+  buf.resize (GST_CUDA_IPC_PKT_HEADER_SIZE + header.payload_size);
+
+  ptr = &buf0;
+  memcpy (ptr, &header, GST_CUDA_IPC_PKT_HEADER_SIZE);
+  ptr += GST_CUDA_IPC_PKT_HEADER_SIZE;
+
+  *((GstCudaSharableHandle *) ptr) = handle;
+}
+
+bool
+gst_cuda_ipc_pkt_parse_release_mmap_data (std::vector < guint8 > &buf,
+    GstCudaSharableHandle * handle)
+{
+  guint8 *ptr;
+
+  g_return_val_if_fail (buf.size () >=
+      GST_CUDA_IPC_PKT_HEADER_SIZE + sizeof (GstCudaSharableHandle), false);
+
+  ptr = &buf0;
+  ptr += GST_CUDA_IPC_PKT_HEADER_SIZE;
+
+  *handle = *((GstCudaSharableHandle *) ptr);
+
+  return true;
+}
+
+void
+gst_cuda_ipc_pkt_build_eos (std::vector < guint8 > &buf)
+{
+  GstCudaIpcPacketHeader header;
+
+  header.type = GstCudaIpcPktType::EOS;
+  header.magic = GST_CUDA_IPC_MAGIC_NUMBER;
+  header.payload_size = 0;
+
+  buf.resize (GST_CUDA_IPC_PKT_HEADER_SIZE);
+
+  memcpy (&buf0, &header, GST_CUDA_IPC_PKT_HEADER_SIZE);
+}
+
+void
+gst_cuda_ipc_pkt_build_fin (std::vector < guint8 > &buf)
+{
+  GstCudaIpcPacketHeader header;
+
+  header.type = GstCudaIpcPktType::FIN;
+  header.magic = GST_CUDA_IPC_MAGIC_NUMBER;
+  header.payload_size = 0;
+
+  buf.resize (GST_CUDA_IPC_PKT_HEADER_SIZE);
+
+  memcpy (&buf0, &header, GST_CUDA_IPC_PKT_HEADER_SIZE);
+}
+
+std::string
+gst_cuda_ipc_mem_handle_to_string (const CUipcMemHandle & handle)
+{
+  std::string dump (68, '\0');
+  guint val16;
+  for (guint i = 0; i < 16; i++) {
+    vali = *((guint *) (handle.reserved + i * 4));
+  }
+
+  sprintf (&dump0, "%x%x%x%x-%x%x%x%x-%x%x%x%x-%x%x%x%x", val0,
+      val1, val2, val3, val4, val5, val6, val7, val8,
+      val9, val10, val11, val12, val13, val14, val15);
+
+  return dump;
+}
+
+bool
+gst_cuda_ipc_clock_is_system (GstClock * clock)
+{
+  GstClockType clock_type = GST_CLOCK_TYPE_MONOTONIC;
+  GstClock *mclock;
+
+  if (G_OBJECT_TYPE (clock) != GST_TYPE_SYSTEM_CLOCK)
+    return false;
+
+  g_object_get (clock, "clock-type", &clock_type, nullptr);
+  if (clock_type != GST_CLOCK_TYPE_MONOTONIC)
+    return false;
+
+  mclock = gst_clock_get_master (clock);
+  if (!mclock)
+    return true;
+
+  gst_object_unref (mclock);
+  return false;
+}
+
+#ifdef G_OS_WIN32
+/* *INDENT-OFF* */
+static inline void rtrim(std::string &s) {
+  s.erase (std::find_if (s.rbegin(), s.rend(),
+      (unsigned char ch) {
+        return !std::isspace (ch);
+      }).base (), s.end ());
+}
+/* *INDENT-ON* */
+
+std::string
+gst_cuda_ipc_win32_error_to_string (guint err)
+{
+  wchar_t buffer1024;
+
+  if (!FormatMessageW (FORMAT_MESSAGE_IGNORE_INSERTS |
+          FORMAT_MESSAGE_FROM_SYSTEM, nullptr, err, 0, buffer, 1024, nullptr)) {
+    return std::string ("");
+  }
+
+  std::wstring_convert < std::codecvt_utf8 < wchar_t >, wchar_t >converter;
+  std::string ret = converter.to_bytes (buffer);
+  rtrim (ret);
+
+  return ret;
+}
+#else
+std::string
+gst_cuda_ipc_win32_error_to_string (guint err)
+{
+  return std::string ("");
+}
+#endif /* G_OS_WIN32 */
+
+bool
+gst_cuda_ipc_handle_is_equal (const CUipcMemHandle & handle,
+    const CUipcMemHandle & other)
+{
+  if (memcmp (&handle, &other, sizeof (CUipcMemHandle)) == 0)
+    return true;
+
+  return false;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipc.h Added

@@ -0,0 +1,188 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/cuda/gstcuda.h>
+#include <string>
+#include <vector>
+#ifdef G_OS_WIN32
+#include <windows.h>
+#else
+#include <sys/types.h>
+#include <unistd.h>
+#endif
+
+/*
+ * Communication Sequence
+ *
+ *              +--------+                      +--------+
+ *              | client |                      | server |
+ *              +--------+                      +--------+
+ *                  |                               |
+ *                  |                               |
+ *                  +<---------- CONFIG ------------|
+ *                  |                               |
+ *                  +--------- NEED-DATA ---------->|
+ *                  |                               +-------+
+ *                  |                               |     Export
+ *                  |                               |   CUDA memory
+ *                  |                               +<------+
+ *                  +<-------- HAVE-DATA -----------|
+ *         +--------+                               |
+ *       Import     |                               |
+ *     CUDA memory  |                               |
+ *         +------->+                               |
+ *                  |--------- READ-DONE ---------->|
+ *         +--------+                               |
+ *      Release     |                               |
+ *    CUDA memory   |                               |
+ *         +--------|                               |
+ *                  |-------- RELEASE-DATA -------->|
+ *                  |                               |
+ *                  +--------- NEED-DATA ---------->|
+ *                  |                               |
+ *                  |<----------- EOS --------------|
+ *         +--------+                               |
+ *    Cleanup all   |                               |
+ * shared resources |                               |
+ *         +--------|                               |
+ *                  |------------ FIN ------------->|
+ */
+
+enum class GstCudaIpcPktType : guint8
+{
+  UNKNOWN,
+  CONFIG,
+  NEED_DATA,
+  HAVE_DATA,
+  READ_DONE,
+  RELEASE_DATA,
+  HAVE_MMAP_DATA,
+  RELEASE_MMAP_DATA,
+  EOS,
+  FIN,
+};
+
+#ifdef G_OS_WIN32
+typedef HANDLE GstCudaSharableHandle;
+typedef DWORD GstCudaPid;
+#define GST_CUDA_OS_HANDLE_FORMAT "p"
+#else
+typedef int GstCudaSharableHandle;
+typedef pid_t GstCudaPid;
+#define GST_CUDA_OS_HANDLE_FORMAT "d"
+struct OVERLAPPED
+{
+  gpointer dummy;
+};
+#endif
+
+#pragma pack(push, 1)
+struct GstCudaIpcPacketHeader
+{
+  GstCudaIpcPktType type;
+  guint32 payload_size;
+  guint32 magic;
+};
+
+struct GstCudaIpcMemLayout
+{
+  guint32 size;
+  guint32 max_size;
+  guint32 pitch;
+  guint32 offset4;
+};
+#pragma pack(pop)
+
+constexpr guint GST_CUDA_IPC_PKT_HEADER_SIZE = sizeof (GstCudaIpcPacketHeader);
+
+bool gst_cuda_ipc_pkt_identify (std::vector<guint8> & buf,
+                                 GstCudaIpcPacketHeader & header);
+
+bool gst_cuda_ipc_pkt_build_config (std::vector<guint8> & buf,
+                                     GstCudaPid pid,
+                                     gboolean use_mmap,
+                                     GstCaps * caps);
+
+bool gst_cuda_ipc_pkt_parse_config (std::vector<guint8> & buf,
+                                    GstCudaPid * pid,
+                                    gboolean * use_mmap,
+                                    GstCaps ** caps);
+
+void gst_cuda_ipc_pkt_build_need_data (std::vector<guint8> & buf);
+
+bool gst_cuda_ipc_pkt_build_have_data (std::vector<guint8> & buf,
+                                       GstClockTime pts,
+                                       const GstVideoInfo & info,
+                                       const CUipcMemHandle & handle,
+                                       GstCaps * caps,
+                                       const std::vector<guint8> & meta);
+
+bool gst_cuda_ipc_pkt_parse_have_data (const std::vector<guint8> & buf,
+                                       GstClockTime & pts,
+                                       GstCudaIpcMemLayout & layout,
+                                       CUipcMemHandle & handle,
+                                       GstCaps ** caps,
+                                       std::vector<guint8> & meta);
+
+bool gst_cuda_ipc_pkt_build_have_mmap_data (std::vector<guint8> & buf,
+                                            GstClockTime pts,
+                                            const GstVideoInfo & info,
+                                            guint32 max_size,
+                                            GstCudaSharableHandle handle,
+                                            GstCaps * caps,
+                                            const std::vector<guint8> & meta);
+
+bool gst_cuda_ipc_pkt_parse_have_mmap_data (const std::vector<guint8> & buf,
+                                            GstClockTime & pts,
+                                            GstCudaIpcMemLayout & layout,
+                                            GstCudaSharableHandle * handle,
+                                            GstCaps ** caps,
+                                            std::vector<guint8> & meta);
+
+void gst_cuda_ipc_pkt_build_read_done (std::vector<guint8> & buf);
+
+void gst_cuda_ipc_pkt_build_release_data (std::vector<guint8> & buf,
+                                          const CUipcMemHandle & handle);
+
+bool gst_cuda_ipc_pkt_parse_release_data (std::vector<guint8> & buf,
+                                          CUipcMemHandle & handle);
+
+void gst_cuda_ipc_pkt_build_release_mmap_data (std::vector<guint8> & buf,
+                                               GstCudaSharableHandle handle);
+
+bool gst_cuda_ipc_pkt_parse_release_mmap_data (std::vector<guint8> & buf,
+                                               GstCudaSharableHandle * handle);
+
+
+void gst_cuda_ipc_pkt_build_eos (std::vector<guint8> & buf);
+
+void gst_cuda_ipc_pkt_build_fin (std::vector<guint8> & buf);
+
+std::string gst_cuda_ipc_mem_handle_to_string (const CUipcMemHandle & handle);
+
+bool gst_cuda_ipc_clock_is_system (GstClock * clock);
+
+std::string gst_cuda_ipc_win32_error_to_string (guint err);
+
+bool gst_cuda_ipc_handle_is_equal (const CUipcMemHandle & handle,
+                                   const CUipcMemHandle & other);

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcclient.cpp Added

@@ -0,0 +1,1214 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudaipcclient.h"
+#include "gstnvcodecutils.h"
+#include <gst/cuda/gstcuda-private.h>
+#include <mutex>
+#include <condition_variable>
+#include <queue>
+#include <atomic>
+#include <string>
+
+GST_DEBUG_CATEGORY (cuda_ipc_client_debug);
+#define GST_CAT_DEFAULT cuda_ipc_client_debug
+
+static GThreadPool *gc_thread_pool = nullptr;
+/* *INDENT-OFF* */
+static std::mutex gc_pool_lock;
+static std::recursive_mutex import_lock_;
+/* *INDENT-ON* */
+
+void
+gst_cuda_ipc_client_deinit (void)
+{
+  std::lock_guard < std::mutex > lk (gc_pool_lock);
+  if (gc_thread_pool) {
+    g_thread_pool_free (gc_thread_pool, FALSE, TRUE);
+    gc_thread_pool = nullptr;
+  }
+}
+
+/**
+ * GstCudaIpcIOMode:
+ *
+ * Since: 1.24
+ */
+GType
+gst_cuda_ipc_io_mode_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue io_modes = {
+    {GST_CUDA_IPC_IO_COPY, "Copy remote memory", "copy"},
+    {GST_CUDA_IPC_IO_IMPORT, "Import remote memory", "import"},
+    {0, nullptr, nullptr}
+  };
+
+  GST_CUDA_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstCudaIpcIOMode", io_modes);
+  } GST_CUDA_CALL_ONCE_END;
+
+  return type;
+}
+
+static void
+gst_cuda_ipc_client_close_handle (GstCudaSharableHandle handle)
+{
+#ifdef G_OS_WIN32
+  CloseHandle (handle);
+#else
+  close (handle);
+#endif
+}
+
+/* *INDENT-OFF* */
+struct GstCudaIpcHandle
+{
+  GstCudaIpcHandle (CUipcMemHandle mem_handle,
+      CUdeviceptr device_ptr, GstCudaContext * context)
+  {
+    handle = mem_handle;
+    dptr = device_ptr;
+    ctx = (GstCudaContext *) gst_object_ref (context);
+  }
+
+  ~GstCudaIpcHandle ()
+  {
+    std::lock_guard <std::recursive_mutex> lk (import_lock_);
+    auto handle_dump = gst_cuda_ipc_mem_handle_to_string (handle);
+    GST_LOG ("Closing handle %s", handle_dump.c_str ());
+    gst_cuda_context_push (ctx);
+    CuIpcCloseMemHandle (dptr);
+    gst_cuda_context_pop (nullptr);
+    gst_object_unref (ctx);
+    GST_LOG ("Closed handle %s", handle_dump.c_str ());
+  }
+
+  CUipcMemHandle handle;
+  CUdeviceptr dptr;
+  GstCudaContext *ctx;
+};
+
+struct GstCudaIpcImportData
+{
+  std::shared_ptr<GstCudaIpcHandle> handle;
+};
+
+struct GstCudaIpcReleaseData
+{
+  GstCudaIpcClient *self;
+  std::shared_ptr<GstCudaIpcImportData> imported;
+};
+
+class GstCudaIpcImporter
+{
+public:
+  std::shared_ptr<GstCudaIpcHandle>
+  ImportHandle (CUipcMemHandle mem_handle, GstCudaContext * ctx)
+  {
+    std::lock_guard <std::recursive_mutex> lk (import_lock_);
+    CUresult ret;
+    CUdeviceptr dptr = 0;
+    auto handle_dump = gst_cuda_ipc_mem_handle_to_string (mem_handle);
+    GST_LOG ("Trying to import handle %s", handle_dump.c_str ());
+    auto it = import_table_.begin ();
+    while (it != import_table_.end ()) {
+      auto data = it->lock ();
+      if (!data) {
+        it = import_table_.erase (it);
+      } else if (gst_cuda_ipc_handle_is_equal (data->handle, mem_handle)) {
+        GST_LOG ("Returning already imported data %s", handle_dump.c_str ());
+        return data;
+      } else {
+        it++;
+      }
+    };
+
+    if (!gst_cuda_context_push (ctx))
+      return nullptr;
+
+    ret = CuIpcOpenMemHandle (&dptr,
+        mem_handle, CU_IPC_MEM_LAZY_ENABLE_PEER_ACCESS);
+    gst_cuda_context_pop (nullptr);
+    if ((ret != CUDA_ERROR_ALREADY_MAPPED && !gst_cuda_result (ret)) || !dptr) {
+      GST_ERROR ("Couldn't open mem handle");
+      return nullptr;
+    }
+
+    GST_LOG ("Imported handle %s", handle_dump.c_str ());
+
+    auto rst = std::make_shared<GstCudaIpcHandle> (mem_handle, dptr, ctx);
+    import_table_.push_back (rst);
+
+    return rst;
+  }
+
+private:
+  std::vector<std::weak_ptr<GstCudaIpcHandle>> import_table_;
+};
+
+/* Global IPC handle table for legacy mode, since multiple CuIpcOpenMemHandle()
+ * call for the same IPC handle will return error */
+static GstCudaIpcImporter _ipc_importer;
+
+struct GstCudaIpcClientPrivate
+{
+  GstCudaIpcClientPrivate ()
+  {
+    shutdown = false;
+    io_pending = true;
+  }
+
+  ~GstCudaIpcClientPrivate ()
+  {
+    gst_clear_caps (&caps);
+    if (pool) {
+      gst_buffer_pool_set_active (pool, FALSE);
+      gst_object_unref (pool);
+    }
+  }
+
+  std::mutex lock;
+  std::condition_variable cond;
+  GstCaps *caps = nullptr;
+  GstBufferPool *pool = nullptr;
+  GstVideoInfo info;
+  bool server_eos = false;
+  bool flushing = false;
+  bool aborted = false;
+  bool sent_fin = false;
+  std::atomic<bool> shutdown;
+  std::atomic<bool> io_pending;
+  GThread *loop_thread = nullptr;
+  std::queue <GstSample *> samples;
+  std::shared_ptr<GstCudaIpcClientConn> conn;
+  std::queue<CUipcMemHandle> unused_data;
+  std::queue<GstCudaSharableHandle> unused_os_handle;
+  std::vector<std::weak_ptr<GstCudaIpcImportData>> imported;
+  int device_id = 0;
+};
+/* *INDENT-ON* */
+
+static void gst_cuda_ipc_client_dispose (GObject * object);
+static void gst_cuda_ipc_client_finalize (GObject * object);
+static void gst_cuda_ipc_client_continue (GstCudaIpcClient * self);
+
+#define gst_cuda_ipc_client_parent_class parent_class
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstCudaIpcClient, gst_cuda_ipc_client,
+    GST_TYPE_OBJECT,
+    GST_DEBUG_CATEGORY_INIT (cuda_ipc_client_debug, "cudaipcclient",
+        0, "cudaipcclient"));
+
+static void
+gst_cuda_ipc_client_class_init (GstCudaIpcClientClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = gst_cuda_ipc_client_dispose;
+  object_class->finalize = gst_cuda_ipc_client_finalize;
+}
+
+static void
+gst_cuda_ipc_client_init (GstCudaIpcClient * self)
+{
+  self->priv = new GstCudaIpcClientPrivate ();
+}
+
+static void
+gst_cuda_ipc_client_dispose (GObject * object)
+{
+  GstCudaIpcClient *self = GST_CUDA_IPC_CLIENT (object);
+  GstCudaIpcClientPrivate *priv = self->priv;
+  GstCudaIpcClientClass *klass = GST_CUDA_IPC_CLIENT_GET_CLASS (self);
+
+  GST_DEBUG_OBJECT (self, "dispose");
+
+  g_assert (klass->terminate);
+  klass->terminate (self);
+
+  g_clear_pointer (&priv->loop_thread, g_thread_join);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gst_cuda_ipc_client_finalize (GObject * object)
+{
+  GstCudaIpcClient *self = GST_CUDA_IPC_CLIENT (object);
+
+  GST_DEBUG_OBJECT (self, "finalize");
+
+  delete self->priv;
+
+  gst_clear_cuda_stream (&self->stream);
+  gst_clear_object (&self->context);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GstFlowReturn
+gst_cuda_ipc_client_get_sample (GstCudaIpcClient * client, GstSample ** sample)
+{
+  GstCudaIpcClientPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_CUDA_IPC_CLIENT (client), GST_FLOW_ERROR);
+  g_return_val_if_fail (sample, GST_FLOW_ERROR);
+
+  priv = client->priv;
+
+  GST_LOG_OBJECT (client, "Waiting for sample");
+  std::unique_lock < std::mutex > lk (priv->lock);
+  while (!priv->flushing && !priv->aborted && !priv->server_eos &&
+      priv->samples.empty ()) {
+    priv->cond.wait (lk);
+  }
+
+  if (!priv->samples.empty ()) {
+    *sample = priv->samples.front ();
+    priv->samples.pop ();
+
+    GST_LOG_OBJECT (client, "Have sample");
+    return GST_FLOW_OK;
+  }
+
+  if (priv->flushing) {
+    GST_DEBUG_OBJECT (client, "Flushing");
+    return GST_FLOW_FLUSHING;
+  }
+
+  GST_DEBUG_OBJECT (client, "EOS");
+
+  return GST_FLOW_EOS;
+}
+
+void
+gst_cuda_ipc_client_set_flushing (GstCudaIpcClient * client, bool flushing)
+{
+  GstCudaIpcClientPrivate *priv;
+  GstCudaIpcClientClass *klass;
+
+  g_return_if_fail (GST_IS_CUDA_IPC_CLIENT (client));
+
+  priv = client->priv;
+  klass = GST_CUDA_IPC_CLIENT_GET_CLASS (client);
+
+  GST_DEBUG_OBJECT (client, "Setting flush %d", flushing);
+
+  klass->set_flushing (client, flushing);
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->flushing = flushing;
+  priv->cond.notify_all ();
+
+  GST_DEBUG_OBJECT (client, "Setting flush %d done", flushing);
+}
+
+static gpointer
+gst_cuda_ipc_client_loop_thread_func (GstCudaIpcClient * self)
+{
+  GstCudaIpcClientPrivate *priv = self->priv;
+  GstCudaIpcClientClass *klass = GST_CUDA_IPC_CLIENT_GET_CLASS (self);
+
+  g_assert (klass->loop);
+
+  GST_DEBUG_OBJECT (self, "Starting loop thread");
+
+  klass->loop (self);
+
+  while (!priv->samples.empty ()) {
+    auto sample = priv->samples.front ();
+    gst_sample_unref (sample);
+    priv->samples.pop ();
+  }
+
+  priv->conn = nullptr;
+
+  GST_DEBUG_OBJECT (self, "Exit loop thread");
+
+  return nullptr;
+}
+
+GstFlowReturn
+gst_cuda_ipc_client_run (GstCudaIpcClient * client)
+{
+  GstCudaIpcClientPrivate *priv;
+  guint device_id;
+
+  g_return_val_if_fail (GST_IS_CUDA_IPC_CLIENT (client), GST_FLOW_ERROR);
+
+  priv = client->priv;
+
+  if (!client->context) {
+    GST_ERROR_OBJECT (client, "Context is not configured");
+    return GST_FLOW_ERROR;
+  }
+
+  g_object_get (client->context, "cuda-device-id", &device_id, nullptr);
+  priv->device_id = (int) device_id;
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  if (!priv->loop_thread) {
+    priv->loop_thread = g_thread_new ("cuda-ipc-client",
+        (GThreadFunc) gst_cuda_ipc_client_loop_thread_func, client);
+
+    while (!priv->caps && !priv->aborted && !priv->flushing)
+      priv->cond.wait (lk);
+  }
+
+  if (priv->flushing) {
+    GST_DEBUG_OBJECT (client, "We are flushing");
+    return GST_FLOW_FLUSHING;
+  } else if (priv->aborted || !priv->caps) {
+    GST_DEBUG_OBJECT (client, "Aborted");
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+GstCaps *
+gst_cuda_ipc_client_get_caps (GstCudaIpcClient * client)
+{
+  GstCaps *caps = nullptr;
+  GstCudaIpcClientPrivate *priv;
+
+  g_return_val_if_fail (GST_IS_CUDA_IPC_CLIENT (client), nullptr);
+
+  priv = client->priv;
+
+  if (gst_cuda_ipc_client_run (client) != GST_FLOW_OK)
+    return nullptr;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if (priv->caps)
+    caps = gst_caps_ref (priv->caps);
+
+  return caps;
+}
+
+static void
+gst_cuda_ipc_client_stop_async (GstCudaIpcClient * client, gpointer user_data)
+{
+  GstCudaIpcClientPrivate *priv;
+  GstCudaIpcClientClass *klass;
+
+  priv = client->priv;
+  klass = GST_CUDA_IPC_CLIENT_GET_CLASS (client);
+
+  GST_DEBUG_OBJECT (client, "Stopping");
+  priv->shutdown = true;
+  klass->invoke (client);
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  while (!priv->aborted)
+    priv->cond.wait (lk);
+  lk.unlock ();
+
+  GST_DEBUG_OBJECT (client, "Terminating");
+
+  klass->terminate (client);
+
+  g_clear_pointer (&priv->loop_thread, g_thread_join);
+
+  GST_DEBUG_OBJECT (client, "Stopped");
+
+  gst_object_unref (client);
+}
+
+static void
+gst_cuda_ipc_client_push_stop_async (GstCudaIpcClient * client)
+{
+  std::lock_guard < std::mutex > lk (gc_pool_lock);
+  if (!gc_thread_pool) {
+    gc_thread_pool = g_thread_pool_new ((GFunc) gst_cuda_ipc_client_stop_async,
+        nullptr, -1, FALSE, nullptr);
+  }
+
+  g_thread_pool_push (gc_thread_pool, gst_object_ref (client), nullptr);
+}
+
+void
+gst_cuda_ipc_client_stop (GstCudaIpcClient * client)
+{
+  GstCudaIpcClientPrivate *priv;
+  GstCudaIpcClientClass *klass;
+
+  g_return_if_fail (GST_IS_CUDA_IPC_CLIENT (client));
+
+  if (client->io_mode == GST_CUDA_IPC_IO_COPY) {
+    priv = client->priv;
+    klass = GST_CUDA_IPC_CLIENT_GET_CLASS (client);
+
+    GST_DEBUG_OBJECT (client, "Stopping");
+    priv->shutdown = true;
+    klass->invoke (client);
+
+    std::unique_lock < std::mutex > lk (priv->lock);
+    while (!priv->aborted)
+      priv->cond.wait (lk);
+    lk.unlock ();
+
+    GST_DEBUG_OBJECT (client, "Terminating");
+
+    klass->terminate (client);
+
+    g_clear_pointer (&priv->loop_thread, g_thread_join);
+
+    GST_DEBUG_OBJECT (client, "Stopped");
+  } else {
+    gst_cuda_ipc_client_push_stop_async (client);
+  }
+}
+
+static void
+gst_cuda_ipc_client_send_msg (GstCudaIpcClient * self)
+{
+  GstCudaIpcClientPrivate *priv = self->priv;
+  GstCudaIpcClientClass *klass = GST_CUDA_IPC_CLIENT_GET_CLASS (self);
+  auto conn = priv->conn;
+
+  priv->io_pending = true;
+  if (!klass->send_msg (self, conn.get ())) {
+    GST_WARNING_OBJECT (self, "Send msg failed");
+    priv->io_pending = false;
+    gst_cuda_ipc_client_abort (self);
+  }
+}
+
+static void
+gst_cuda_ipc_client_wait_msg (GstCudaIpcClient * self)
+{
+  GstCudaIpcClientPrivate *priv = self->priv;
+  GstCudaIpcClientClass *klass = GST_CUDA_IPC_CLIENT_GET_CLASS (self);
+  auto conn = priv->conn;
+
+  priv->io_pending = true;
+  if (!klass->wait_msg (self, conn.get ())) {
+    GST_WARNING_OBJECT (self, "Wait msg failed");
+    priv->io_pending = false;
+    gst_cuda_ipc_client_abort (self);
+  }
+}
+
+void
+gst_cuda_ipc_client_new_connection (GstCudaIpcClient * client,
+    std::shared_ptr < GstCudaIpcClientConn > conn)
+{
+  GstCudaIpcClientPrivate *priv = client->priv;
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  if (priv->shutdown) {
+    GST_DEBUG_OBJECT (client, "We are stopping now");
+    return;
+  }
+
+  conn->client = client;
+  priv->conn = conn;
+  priv->cond.notify_all ();
+  lk.unlock ();
+
+  GST_LOG_OBJECT (client, "Waiting for CONFIG-DATA");
+  gst_cuda_ipc_client_wait_msg (client);
+}
+
+void
+gst_cuda_ipc_client_send_msg_finish (GstCudaIpcClient * client, bool result)
+{
+  GstCudaIpcClientPrivate *priv = client->priv;
+  auto conn = priv->conn;
+
+  if (!result) {
+    GST_WARNING_OBJECT (client, "Send msg failed");
+    gst_cuda_ipc_client_abort (client);
+    return;
+  }
+
+  switch (conn->type) {
+    case GstCudaIpcPktType::NEED_DATA:
+      GST_LOG_OBJECT (client, "Sent NEED-DATA");
+      gst_cuda_ipc_client_wait_msg (client);
+      break;
+    case GstCudaIpcPktType::READ_DONE:
+      GST_LOG_OBJECT (client, "Sent READ-DONE");
+      gst_cuda_ipc_client_continue (client);
+      break;
+    case GstCudaIpcPktType::RELEASE_DATA:
+      GST_LOG_OBJECT (client, "Sent RELEASE-DATA");
+      gst_cuda_ipc_client_continue (client);
+      break;
+    case GstCudaIpcPktType::RELEASE_MMAP_DATA:
+      GST_LOG_OBJECT (client, "Sent RELEASE-MMAP-DATA");
+      gst_cuda_ipc_client_continue (client);
+      break;
+    case GstCudaIpcPktType::FIN:
+      GST_DEBUG_OBJECT (client, "Sent FIN");
+      gst_cuda_ipc_client_abort (client);
+      break;
+    default:
+      GST_ERROR_OBJECT (client, "Unexpected msg type");
+      gst_cuda_ipc_client_abort (client);
+      break;
+  }
+}
+
+static void
+gst_cuda_ipc_client_release_imported_data (GstCudaIpcReleaseData * data)
+{
+  GstCudaIpcClient *self = data->self;
+  GstCudaIpcClientPrivate *priv = self->priv;
+  GstCudaIpcClientClass *klass = GST_CUDA_IPC_CLIENT_GET_CLASS (self);
+
+  auto handle = data->imported->handle->handle;
+  auto handle_dump = gst_cuda_ipc_mem_handle_to_string (handle);
+
+  GST_LOG_OBJECT (self, "Releasing data %s", handle_dump.c_str ());
+
+  import_lock_.lock ();
+  data->imported = nullptr;
+  import_lock_.unlock ();
+
+  priv->lock.lock ();
+  priv->unused_data.push (handle);
+  priv->lock.unlock ();
+
+  klass->invoke (self);
+
+  gst_object_unref (data->self);
+
+  delete data;
+}
+
+static bool
+gst_cuda_client_update_caps (GstCudaIpcClient * self, GstCaps * caps)
+{
+  GstCudaIpcClientPrivate *priv = self->priv;
+  GstStructure *config;
+
+  if (!caps)
+    return true;
+
+  gst_clear_caps (&priv->caps);
+  priv->caps = caps;
+
+  if (priv->pool) {
+    gst_buffer_pool_set_active (priv->pool, FALSE);
+    gst_clear_object (&priv->pool);
+  }
+
+  if (!gst_video_info_from_caps (&priv->info, caps)) {
+    GST_ERROR_OBJECT (self, "Invalid caps");
+    return false;
+  }
+
+  priv->pool = gst_cuda_buffer_pool_new (self->context);
+  config = gst_buffer_pool_get_config (priv->pool);
+
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+  gst_buffer_pool_config_set_params (config, priv->caps,
+      GST_VIDEO_INFO_SIZE (&priv->info), 0, 0);
+  if (self->stream)
+    gst_buffer_pool_config_set_cuda_stream (config, self->stream);
+
+  if (!gst_buffer_pool_set_config (priv->pool, config)) {
+    GST_ERROR_OBJECT (self, "Couldn't set pool config");
+    gst_clear_object (&priv->pool);
+    return false;
+  }
+
+  if (!gst_buffer_pool_set_active (priv->pool, TRUE)) {
+    GST_ERROR_OBJECT (self, "Couldn't active pool");
+    gst_clear_object (&priv->pool);
+    return false;
+  }
+
+  return true;
+}
+
+static bool
+gst_cuda_ipc_client_have_data (GstCudaIpcClient * self)
+{
+  GstCudaIpcClientPrivate *priv = self->priv;
+  CUipcMemHandle handle;
+  GstCudaIpcMemLayout layout;
+  CUdeviceptr dptr;
+  GstBuffer *buffer;
+  GstMemory *mem;
+  GstCudaMemory *cmem;
+  GstMapInfo info;
+  CUDA_MEMCPY2D copy_param;
+  CUstream stream;
+  GstSample *sample;
+  GstClockTime pts;
+  GstCaps *caps = nullptr;
+  std::shared_ptr < GstCudaIpcImportData > import_data;
+  std::unique_lock < std::mutex > lk (priv->lock);
+  auto conn = priv->conn;
+  std::vector < guint8 > meta;
+
+  if (!gst_cuda_ipc_pkt_parse_have_data (conn->server_msg,
+          pts, layout, handle, &caps, meta)) {
+    GST_ERROR_OBJECT (self, "Couldn't parse HAVE-DATA packet");
+    return false;
+  }
+
+  if (!gst_cuda_client_update_caps (self, caps))
+    return false;
+
+  auto handle_dump = gst_cuda_ipc_mem_handle_to_string (handle);
+  GST_LOG_OBJECT (self,
+      "Importing handle %s, size %u, pitch %u, offset %u, %u, %u, %u",
+      handle_dump.c_str (), layout.size, layout.pitch, layout.offset0,
+      layout.offset1, layout.offset2, layout.offset3);
+
+  auto import_handle = _ipc_importer.ImportHandle (handle, self->context);
+  if (!import_handle) {
+    GST_ERROR_OBJECT (self, "Couldn't open handle %s", handle_dump.c_str ());
+    return false;
+  }
+
+  dptr = import_handle->dptr;
+
+  if (self->io_mode != GST_CUDA_IPC_IO_COPY) {
+    auto it = priv->imported.begin ();
+    while (it != priv->imported.end ()) {
+      auto data = it->lock ();
+      if (!data) {
+        it = priv->imported.erase (it);
+      } else if (data->handle == import_handle) {
+        import_data = data;
+        break;
+      } else {
+        it++;
+      }
+    };
+
+    if (!import_data) {
+      import_data = std::make_shared < GstCudaIpcImportData > ();
+      import_data->handle = import_handle;
+    }
+  }
+
+  if (self->io_mode == GST_CUDA_IPC_IO_COPY) {
+    if (!gst_cuda_context_push (self->context)) {
+      GST_ERROR_OBJECT (self, "Couldn't push context");
+      return false;
+    }
+
+    gst_buffer_pool_acquire_buffer (priv->pool, &buffer, nullptr);
+    mem = gst_buffer_peek_memory (buffer, 0);
+    gst_memory_map (mem, &info, (GstMapFlags) (GST_MAP_WRITE | GST_MAP_CUDA));
+
+    memset (&copy_param, 0, sizeof (CUDA_MEMCPY2D));
+
+    cmem = GST_CUDA_MEMORY_CAST (mem);
+
+    copy_param.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+    copy_param.srcPitch = layout.pitch;
+
+    copy_param.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+    copy_param.dstPitch = cmem->info.stride0;
+
+    stream = gst_cuda_stream_get_handle (self->stream);
+
+    for (guint i = 0; i < GST_VIDEO_INFO_N_PLANES (&priv->info); i++) {
+      copy_param.srcDevice = (CUdeviceptr) ((guint8 *) dptr + layout.offseti);
+      copy_param.dstDevice = (CUdeviceptr) ((guint8 *) info.data +
+          cmem->info.offseti);
+      copy_param.WidthInBytes = GST_VIDEO_INFO_COMP_WIDTH (&priv->info, i)
+          * GST_VIDEO_INFO_COMP_PSTRIDE (&priv->info, i);
+      copy_param.Height = GST_VIDEO_INFO_COMP_HEIGHT (&priv->info, i);
+      gst_cuda_result (CuMemcpy2DAsync (&copy_param, stream));
+    }
+
+    gst_cuda_result (CuStreamSynchronize (stream));
+    gst_cuda_context_pop (nullptr);
+
+    gst_memory_unmap (mem, &info);
+    GST_MINI_OBJECT_FLAG_UNSET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+
+    priv->unused_data.push (handle);
+  } else {
+    GstVideoInfo vinfo;
+
+    vinfo = priv->info;
+    vinfo.size = layout.size;
+    for (guint i = 0; i < GST_VIDEO_INFO_N_PLANES (&priv->info); i++) {
+      vinfo.stridei = layout.pitch;
+      vinfo.offseti = layout.offseti;
+    }
+
+    auto data = new GstCudaIpcReleaseData ();
+    data->self = (GstCudaIpcClient *) gst_object_ref (self);
+    data->imported = import_data;
+
+    mem = gst_cuda_allocator_alloc_wrapped (nullptr, self->context,
+        nullptr, &vinfo, dptr, data,
+        (GDestroyNotify) gst_cuda_ipc_client_release_imported_data);
+    GST_MINI_OBJECT_FLAG_SET (mem, GST_MEMORY_FLAG_READONLY);
+
+    buffer = gst_buffer_new ();
+    gst_buffer_append_memory (buffer, mem);
+
+    gst_buffer_add_video_meta_full (buffer, GST_VIDEO_FRAME_FLAG_NONE,
+        GST_VIDEO_INFO_FORMAT (&vinfo), GST_VIDEO_INFO_WIDTH (&vinfo),
+        GST_VIDEO_INFO_HEIGHT (&vinfo), GST_VIDEO_INFO_N_PLANES (&vinfo),
+        vinfo.offset, vinfo.stride);
+  }
+
+  GST_BUFFER_PTS (buffer) = pts;
+  GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
+  GST_BUFFER_DURATION (buffer) = GST_CLOCK_TIME_NONE;
+
+  while (!meta.empty ()) {
+    guint32 consumed = 0;
+    if (!gst_meta_deserialize (buffer, meta.data (), meta.size (),
+            &consumed) || consumed == 0) {
+      break;
+    }
+
+    meta.erase (meta.begin (), meta.begin () + consumed);
+  }
+
+  sample = gst_sample_new (buffer, priv->caps, nullptr, nullptr);
+  gst_buffer_unref (buffer);
+
+  /* Drops too old samples */
+  std::queue < GstSample * >drop_queue;
+  while (priv->samples.size () > self->buffer_size) {
+    drop_queue.push (priv->samples.front ());
+    priv->samples.pop ();
+  }
+
+  priv->samples.push (sample);
+  priv->cond.notify_all ();
+  lk.unlock ();
+
+  import_data = nullptr;
+  while (!drop_queue.empty ()) {
+    auto old = drop_queue.front ();
+    gst_sample_unref (old);
+    drop_queue.pop ();
+  }
+
+  return true;
+}
+
+static void
+gst_cuda_ipc_client_run_gc (GstCudaIpcClient * self)
+{
+  GstCudaIpcClientPrivate *priv = self->priv;
+
+  for (auto it = priv->imported.begin (); it != priv->imported.end ();) {
+    auto data = it->lock ();
+    if (!data) {
+      it = priv->imported.erase (it);
+    } else {
+      it++;
+    }
+  }
+}
+
+static void
+gst_cuda_ipc_client_continue (GstCudaIpcClient * self)
+{
+  GstCudaIpcClientPrivate *priv = self->priv;
+  std::unique_lock < std::mutex > lk (priv->lock);
+  auto conn = priv->conn;
+
+  if (!conn) {
+    GST_WARNING_OBJECT (self, "No connection was made");
+    priv->aborted = true;
+    priv->cond.notify_all ();
+    return;
+  }
+
+  if (priv->aborted) {
+    priv->cond.notify_all ();
+    GST_DEBUG_OBJECT (self, "Operation was aborted");
+    return;
+  }
+
+  if (!priv->unused_data.empty ()) {
+    auto handle = priv->unused_data.front ();
+    priv->unused_data.pop ();
+
+    gst_cuda_ipc_pkt_build_release_data (conn->client_msg, handle);
+    conn->type = GstCudaIpcPktType::RELEASE_DATA;
+
+    auto handle_dump = gst_cuda_ipc_mem_handle_to_string (handle);
+    GST_LOG_OBJECT (self, "Sending RELEASE-DATA %s", handle_dump.c_str ());
+    lk.unlock ();
+
+    gst_cuda_ipc_client_send_msg (self);
+    return;
+  }
+
+  if (!priv->unused_os_handle.empty ()) {
+    auto handle = priv->unused_os_handle.front ();
+    priv->unused_os_handle.pop ();
+
+    gst_cuda_ipc_pkt_build_release_mmap_data (conn->client_msg, handle);
+    conn->type = GstCudaIpcPktType::RELEASE_MMAP_DATA;
+
+    GST_LOG_OBJECT (self, "Sending RELEASE-MMAP-DATA %"
+        GST_CUDA_OS_HANDLE_FORMAT, handle);
+    lk.unlock ();
+
+    gst_cuda_ipc_client_send_msg (self);
+    return;
+  }
+
+  if (priv->shutdown) {
+    auto drop_queue = priv->samples;
+    while (!priv->samples.empty ())
+      priv->samples.pop ();
+    lk.unlock ();
+
+    while (!drop_queue.empty ()) {
+      auto sample = drop_queue.front ();
+      gst_sample_unref (sample);
+      drop_queue.pop ();
+    }
+    lk.lock ();
+  }
+
+  if (priv->server_eos || priv->shutdown) {
+    gst_cuda_ipc_client_run_gc (self);
+
+    GST_DEBUG_OBJECT (self, "Remaining imported memory %" G_GSIZE_FORMAT,
+        priv->imported.size ());
+
+    if (priv->imported.empty ()) {
+      GST_DEBUG_OBJECT (self, "Drained");
+      if (priv->sent_fin) {
+        priv->aborted = true;
+        priv->cond.notify_all ();
+      } else {
+        lk.unlock ();
+
+        priv->sent_fin = true;
+        gst_cuda_ipc_pkt_build_fin (conn->client_msg);
+        conn->type = GstCudaIpcPktType::FIN;
+
+        GST_DEBUG_OBJECT (self, "Sending FIN");
+        gst_cuda_ipc_client_send_msg (self);
+        return;
+      }
+    } else {
+      priv->io_pending = false;
+    }
+    return;
+  }
+
+  lk.unlock ();
+
+  gst_cuda_ipc_pkt_build_need_data (conn->client_msg);
+  conn->type = GstCudaIpcPktType::NEED_DATA;
+
+  GST_LOG_OBJECT (self, "Sending NEED-DATA");
+  gst_cuda_ipc_client_send_msg (self);
+}
+
+static bool
+gst_cuda_ipc_client_config_data (GstCudaIpcClient * self)
+{
+  GstCudaIpcClientClass *klass = GST_CUDA_IPC_CLIENT_GET_CLASS (self);
+  GstCudaIpcClientPrivate *priv = self->priv;
+  GstCaps *caps = nullptr;
+  auto conn = priv->conn;
+  std::lock_guard < std::mutex > lk (priv->lock);
+  GstCudaPid server_pid;
+  gboolean use_mmap;
+
+  if (!gst_cuda_ipc_pkt_parse_config (conn->server_msg, &server_pid,
+          &use_mmap, &caps)) {
+    GST_ERROR_OBJECT (self, "Couldn't parse CONFIG-DATA");
+    return false;
+  }
+
+  if (!gst_cuda_client_update_caps (self, caps))
+    return false;
+
+  GST_DEBUG_OBJECT (self, "Got config, server pid %u, use-mmap %d",
+      (guint) server_pid, use_mmap);
+
+  if (klass->config) {
+    if (!klass->config (self, server_pid, use_mmap)) {
+      GST_ERROR_OBJECT (self, "Config failed");
+      return false;
+    }
+  }
+
+  priv->cond.notify_all ();
+
+  return true;
+}
+
+void
+gst_cuda_ipc_client_wait_msg_finish (GstCudaIpcClient * client, bool result)
+{
+  GstCudaIpcClientPrivate *priv = client->priv;
+  GstCudaIpcPacketHeader header;
+  auto conn = priv->conn;
+
+  if (!result) {
+    GST_WARNING_OBJECT (client, "Wait msg failed");
+    gst_cuda_ipc_client_abort (client);
+    return;
+  }
+
+  if (!gst_cuda_ipc_pkt_identify (conn->server_msg, header)) {
+    GST_ERROR_OBJECT (client, "Broken header");
+    gst_cuda_ipc_client_abort (client);
+    return;
+  }
+
+  switch (header.type) {
+    case GstCudaIpcPktType::CONFIG:
+      GST_LOG_OBJECT (client, "Got CONFIG");
+      if (!gst_cuda_ipc_client_config_data (client)) {
+        gst_cuda_ipc_client_abort (client);
+        return;
+      }
+
+      gst_cuda_ipc_client_continue (client);
+      break;
+    case GstCudaIpcPktType::HAVE_DATA:
+      GST_LOG_OBJECT (client, "Got HAVE-DATA");
+      if (!gst_cuda_ipc_client_have_data (client)) {
+        gst_cuda_ipc_client_abort (client);
+        return;
+      }
+
+      GST_LOG_OBJECT (client, "Sending READ-DONE");
+      gst_cuda_ipc_pkt_build_read_done (conn->client_msg);
+      conn->type = GstCudaIpcPktType::READ_DONE;
+      gst_cuda_ipc_client_send_msg (client);
+      break;
+    case GstCudaIpcPktType::EOS:
+      GST_DEBUG_OBJECT (client, "Got EOS");
+      priv->server_eos = true;
+      priv->lock.lock ();
+      priv->cond.notify_all ();
+      priv->lock.unlock ();
+      gst_cuda_ipc_client_continue (client);
+      break;
+    default:
+      GST_WARNING_OBJECT (client, "Unexpected packet type");
+      gst_cuda_ipc_client_abort (client);
+      break;
+  }
+}
+
+void
+gst_cuda_ipc_client_have_mmap_data (GstCudaIpcClient * client,
+    GstClockTime pts, const GstCudaIpcMemLayout & layout, GstCaps * caps,
+    GstCudaSharableHandle server_handle, GstCudaSharableHandle client_handle,
+    std::vector < guint8 > &meta)
+{
+  GstCudaIpcClientPrivate *priv = client->priv;
+  std::unique_lock < std::mutex > lk (priv->lock);
+  CUDA_MEMCPY2D copy_param;
+  CUstream stream;
+  CUresult ret;
+  CUmemGenericAllocationHandle handle;
+  CUdeviceptr ptr;
+  CUmemAccessDesc desc;
+  GstBuffer *buffer;
+  GstMemory *mem;
+  GstCudaMemory *cmem;
+  GstMapInfo info;
+  GstSample *sample;
+  std::queue < GstSample * >drop_queue;
+  auto conn = priv->conn;
+
+  desc.location.id = priv->device_id;
+  desc.location.type = CU_MEM_LOCATION_TYPE_DEVICE;
+  desc.flags = CU_MEM_ACCESS_FLAGS_PROT_READWRITE;
+
+  if (!gst_cuda_client_update_caps (client, caps))
+    goto error;
+
+  if (!gst_cuda_context_push (client->context)) {
+    GST_ERROR_OBJECT (client, "Couldn't push context");
+    goto error;
+  }
+
+  ret = CuMemImportFromShareableHandle (&handle,
+      (void *) ((guintptr) client_handle),
+#ifdef G_OS_WIN32
+      CU_MEM_HANDLE_TYPE_WIN32
+#else
+      CU_MEM_HANDLE_TYPE_POSIX_FILE_DESCRIPTOR
+#endif
+      );
+
+  ret = CuMemAddressReserve (&ptr, layout.max_size, 0, 0, 0);
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (client, "Couldn't reserve memory");
+    gst_cuda_context_pop (nullptr);
+    goto error;
+  }
+
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (client, "Couldn't import handle");
+    CuMemAddressFree (ptr, layout.max_size);
+    gst_cuda_context_pop (nullptr);
+    goto error;
+  }
+
+  ret = CuMemMap (ptr, layout.max_size, 0, handle, 0);
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (client, "Couldn't reserve memory");
+    CuMemRelease (handle);
+    CuMemAddressFree (ptr, layout.max_size);
+    gst_cuda_context_pop (nullptr);
+    goto error;
+  }
+
+  /* Once it's mapped, handle is not needed anymore */
+  ret = CuMemRelease (handle);
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (client, "Couldn't release handle");
+    CuMemUnmap (ptr, layout.max_size);
+    CuMemAddressFree (ptr, layout.max_size);
+    gst_cuda_context_pop (nullptr);
+    goto error;
+  }
+
+  ret = CuMemSetAccess (ptr, layout.max_size, &desc, 1);
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (client, "Couldn't set access");
+    CuMemUnmap (ptr, layout.max_size);
+    CuMemAddressFree (ptr, layout.max_size);
+    gst_cuda_context_pop (nullptr);
+    goto error;
+  }
+
+  /* All done. OS handle is not needed anymore */
+  gst_cuda_ipc_client_close_handle (client_handle);
+
+  /* XXX: mapped memory does not seem to support CUDA texture / NVENC resource.
+   * Always copy to our memory */
+  gst_buffer_pool_acquire_buffer (priv->pool, &buffer, nullptr);
+  mem = gst_buffer_peek_memory (buffer, 0);
+  gst_memory_map (mem, &info, (GstMapFlags) (GST_MAP_WRITE | GST_MAP_CUDA));
+
+  memset (&copy_param, 0, sizeof (CUDA_MEMCPY2D));
+
+  cmem = GST_CUDA_MEMORY_CAST (mem);
+
+  copy_param.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+  copy_param.srcPitch = layout.pitch;
+
+  copy_param.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+  copy_param.dstPitch = cmem->info.stride0;
+
+  stream = gst_cuda_stream_get_handle (client->stream);
+
+  for (guint i = 0; i < GST_VIDEO_INFO_N_PLANES (&priv->info); i++) {
+    copy_param.srcDevice = (CUdeviceptr) ((guint8 *) ptr + layout.offseti);
+    copy_param.dstDevice = (CUdeviceptr) ((guint8 *) info.data +
+        cmem->info.offseti);
+    copy_param.WidthInBytes = GST_VIDEO_INFO_COMP_WIDTH (&priv->info, i)
+        * GST_VIDEO_INFO_COMP_PSTRIDE (&priv->info, i);
+    copy_param.Height = GST_VIDEO_INFO_COMP_HEIGHT (&priv->info, i);
+    gst_cuda_result (CuMemcpy2DAsync (&copy_param, stream));
+  }
+
+  gst_cuda_result (CuStreamSynchronize (stream));
+
+  gst_memory_unmap (mem, &info);
+  GST_MINI_OBJECT_FLAG_UNSET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+
+  gst_cuda_result (CuMemUnmap (ptr, layout.max_size));
+  gst_cuda_result (CuMemAddressFree (ptr, layout.max_size));
+
+  gst_cuda_context_pop (nullptr);
+
+  priv->unused_os_handle.push (server_handle);
+
+  GST_BUFFER_PTS (buffer) = pts;
+  GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
+  GST_BUFFER_DURATION (buffer) = GST_CLOCK_TIME_NONE;
+
+  while (!meta.empty ()) {
+    guint32 consumed = 0;
+    if (!gst_meta_deserialize (buffer, meta.data (), meta.size (),
+            &consumed) || consumed == 0) {
+      break;
+    }
+
+    meta.erase (meta.begin (), meta.begin () + consumed);
+  }
+
+  sample = gst_sample_new (buffer, priv->caps, nullptr, nullptr);
+  gst_buffer_unref (buffer);
+
+  /* Drops too old samples */
+  while (priv->samples.size () > client->buffer_size) {
+    drop_queue.push (priv->samples.front ());
+    priv->samples.pop ();
+  }
+
+  priv->samples.push (sample);
+  priv->cond.notify_all ();
+  lk.unlock ();
+
+  while (!drop_queue.empty ()) {
+    auto old = drop_queue.front ();
+    gst_sample_unref (old);
+    drop_queue.pop ();
+  }
+
+  GST_LOG_OBJECT (client, "Sending READ-DONE");
+  gst_cuda_ipc_pkt_build_read_done (conn->client_msg);
+  conn->type = GstCudaIpcPktType::READ_DONE;
+  gst_cuda_ipc_client_send_msg (client);
+  return;
+
+error:
+  gst_cuda_ipc_client_close_handle (client_handle);
+  lk.unlock ();
+  gst_cuda_ipc_client_abort (client);
+}
+
+void
+gst_cuda_ipc_client_abort (GstCudaIpcClient * client)
+{
+  GstCudaIpcClientPrivate *priv = client->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->aborted = true;
+  priv->cond.notify_all ();
+}
+
+void
+gst_cuda_ipc_client_on_idle (GstCudaIpcClient * client)
+{
+  GstCudaIpcClientPrivate *priv = client->priv;
+  if (priv->io_pending)
+    return;
+
+  gst_cuda_ipc_client_continue (client);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcclient.h Added

@@ -0,0 +1,145 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/cuda/gstcuda.h>
+#include "gstcudaipc.h"
+#include <memory>
+#include <vector>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_CUDA_IPC_CLIENT             (gst_cuda_ipc_client_get_type())
+#define GST_CUDA_IPC_CLIENT(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CUDA_IPC_CLIENT,GstCudaIpcClient))
+#define GST_CUDA_IPC_CLIENT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CUDA_IPC_CLIENT,GstCudaIpcClientClass))
+#define GST_CUDA_IPC_CLIENT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_CUDA_IPC_CLIENT,GstCudaIpcClientClass))
+#define GST_IS_CUDA_IPC_CLIENT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CUDA_IPC_CLIENT))
+#define GST_IS_CUDA_IPC_CLIENT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_CUDA_IPC_CLIENT))
+
+struct GstCudaIpcClientConn;
+struct GstCudaIpcClientPrivate;
+
+enum GstCudaIpcIOMode
+{
+  GST_CUDA_IPC_IO_COPY,
+  GST_CUDA_IPC_IO_IMPORT,
+};
+
+#define GST_TYPE_CUDA_IPC_IO_MODE (gst_cuda_ipc_io_mode_get_type ())
+GType gst_cuda_ipc_io_mode_get_type (void);
+
+struct GstCudaIpcClient
+{
+  GstObject parent;
+
+  GstCudaContext *context;
+  GstCudaStream *stream;
+  GstCudaIpcIOMode io_mode;
+  guint buffer_size;
+
+  GstCudaIpcClientPrivate *priv;
+};
+
+struct GstCudaIpcClientClass
+{
+  GstObjectClass parent_class;
+
+  bool  (*send_msg)      (GstCudaIpcClient * client,
+                          GstCudaIpcClientConn * conn);
+
+  bool  (*wait_msg)      (GstCudaIpcClient * client,
+                          GstCudaIpcClientConn * conn);
+
+  void  (*terminate)     (GstCudaIpcClient * client);
+
+  void  (*invoke)        (GstCudaIpcClient * client);
+
+  void  (*set_flushing)  (GstCudaIpcClient * client,
+                          bool flushing);
+
+  void  (*loop)          (GstCudaIpcClient * client);
+
+  bool  (*config)        (GstCudaIpcClient * client,
+                          GstCudaPid pid,
+                          gboolean use_mmap);
+};
+
+GType             gst_cuda_ipc_client_get_type (void);
+
+GstFlowReturn     gst_cuda_ipc_client_get_sample (GstCudaIpcClient * client,
+                                                  GstSample ** sample);
+
+void              gst_cuda_ipc_client_set_flushing (GstCudaIpcClient * client,
+                                                    bool flushing);
+
+GstCaps *         gst_cuda_ipc_client_get_caps     (GstCudaIpcClient * client);
+
+GstFlowReturn     gst_cuda_ipc_client_run          (GstCudaIpcClient * client);
+
+void              gst_cuda_ipc_client_stop         (GstCudaIpcClient * client);
+
+/* subclass methods */
+void              gst_cuda_ipc_client_new_connection (GstCudaIpcClient * client,
+                                                      std::shared_ptr<GstCudaIpcClientConn> conn);
+
+void              gst_cuda_ipc_client_send_msg_finish (GstCudaIpcClient * client,
+                                                       bool result);
+
+void              gst_cuda_ipc_client_wait_msg_finish (GstCudaIpcClient * client,
+                                                       bool result);
+
+void              gst_cuda_ipc_client_have_mmap_data  (GstCudaIpcClient * client,
+                                                       GstClockTime pts,
+                                                       const GstCudaIpcMemLayout & layout,
+                                                       GstCaps * caps,
+                                                       GstCudaSharableHandle server_handle,
+                                                       GstCudaSharableHandle client_handle,
+                                                       std::vector <guint8> & meta);
+
+void              gst_cuda_ipc_client_on_idle         (GstCudaIpcClient * client);
+
+void              gst_cuda_ipc_client_abort           (GstCudaIpcClient * client);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstCudaIpcClient, gst_object_unref)
+
+G_END_DECLS
+
+struct GstCudaIpcClientConn : public OVERLAPPED
+{
+  GstCudaIpcClientConn ()
+  {
+    client_msg.resize (GST_CUDA_IPC_PKT_HEADER_SIZE);
+    server_msg.resize (GST_CUDA_IPC_PKT_HEADER_SIZE);
+  }
+
+  virtual ~GstCudaIpcClientConn()
+  {
+    gst_clear_object (&context);
+  }
+
+  GstCudaIpcClient *client;
+
+  GstCudaContext *context = nullptr;
+
+  GstCudaIpcPktType type;
+  std::vector<guint8> client_msg;
+  std::vector<guint8> server_msg;
+};

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcclient_unix.cpp Added

@@ -0,0 +1,433 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudaipcclient_unix.h"
+#include <string>
+#include <mutex>
+#include <condition_variable>
+#include <chrono>
+
+#include <gio/gunixsocketaddress.h>
+#include <gio/gunixconnection.h>
+
+GST_DEBUG_CATEGORY_EXTERN (cuda_ipc_client_debug);
+#define GST_CAT_DEFAULT cuda_ipc_client_debug
+
+/* *INDENT-OFF* */
+struct GstCudaIpcClientConnUnix : public GstCudaIpcClientConn
+{
+  GstCudaIpcClientConnUnix (GSocketConnection * socket_conn,
+      GCancellable * cancel)
+  {
+    conn = socket_conn;
+    cancellable = (GCancellable *) g_object_ref (cancel);
+    istream = g_io_stream_get_input_stream (G_IO_STREAM (conn));
+    ostream = g_io_stream_get_output_stream (G_IO_STREAM (conn));
+  }
+
+  ~GstCudaIpcClientConnUnix ()
+  {
+    g_cancellable_cancel (cancellable);
+    g_object_unref (conn);
+    g_object_unref (cancellable);
+  }
+
+  GSocketConnection *conn;
+  GInputStream *istream;
+  GOutputStream *ostream;
+  GCancellable *cancellable;
+};
+
+struct GstCudaIpcClientUnixPrivate
+{
+  GstCudaIpcClientUnixPrivate ()
+  {
+    main_context = g_main_context_new ();
+    main_loop = g_main_loop_new (main_context, FALSE);
+    cancellable = g_cancellable_new ();
+  }
+
+  ~GstCudaIpcClientUnixPrivate ()
+  {
+    g_main_loop_unref (main_loop);
+    g_main_context_unref (main_context);
+  }
+
+  std::string address;
+  GstClockTime timeout;
+  std::mutex lock;
+  std::condition_variable cond;
+
+  GMainLoop *main_loop;
+  GMainContext *main_context;
+  GCancellable *cancellable;
+  bool flushing = false;
+};
+/* *INDENT-ON* */
+
+struct _GstCudaIpcClientUnix
+{
+  GstCudaIpcClient parent;
+
+  GstCudaIpcClientUnixPrivate *priv;
+};
+
+static void gst_cuda_ipc_client_unix_finalize (GObject * object);
+static bool gst_cuda_ipc_client_unix_send_msg (GstCudaIpcClient * client,
+    GstCudaIpcClientConn * conn);
+static bool gst_cuda_ipc_client_unix_wait_msg (GstCudaIpcClient * client,
+    GstCudaIpcClientConn * conn);
+static void gst_cuda_ipc_client_unix_terminate (GstCudaIpcClient * client);
+static void gst_cuda_ipc_client_unix_invoke (GstCudaIpcClient * client);
+static void gst_cuda_ipc_client_unix_set_flushing (GstCudaIpcClient * client,
+    bool flushing);
+static void gst_cuda_ipc_client_unix_loop (GstCudaIpcClient * client);
+
+#define gst_cuda_ipc_client_unix_parent_class parent_class
+G_DEFINE_TYPE (GstCudaIpcClientUnix,
+    gst_cuda_ipc_client_unix, GST_TYPE_CUDA_IPC_CLIENT);
+
+static void
+gst_cuda_ipc_client_unix_class_init (GstCudaIpcClientUnixClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstCudaIpcClientClass *client_class = GST_CUDA_IPC_CLIENT_CLASS (klass);
+
+  object_class->finalize = gst_cuda_ipc_client_unix_finalize;
+
+  client_class->send_msg =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_unix_send_msg);
+  client_class->wait_msg =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_unix_wait_msg);
+  client_class->terminate =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_unix_terminate);
+  client_class->invoke = GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_unix_invoke);
+  client_class->set_flushing =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_unix_set_flushing);
+  client_class->loop = GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_unix_loop);
+}
+
+static void
+gst_cuda_ipc_client_unix_init (GstCudaIpcClientUnix * self)
+{
+  self->priv = new GstCudaIpcClientUnixPrivate ();
+}
+
+static void
+gst_cuda_ipc_client_unix_finalize (GObject * object)
+{
+  GstCudaIpcClientUnix *self = GST_CUDA_IPC_CLIENT_UNIX (object);
+
+  GST_DEBUG_OBJECT (self, "finalize");
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_cuda_ipc_client_unix_send_msg_finish (GObject * source,
+    GAsyncResult * result, GstCudaIpcClientConnUnix * conn)
+{
+  GstCudaIpcClient *client = conn->client;
+  gsize size;
+  GError *err = nullptr;
+  bool ret = true;
+
+  if (!g_output_stream_write_all_finish (conn->ostream, result, &size, &err)) {
+    GST_WARNING_OBJECT (client, "Write failed with %s", err->message);
+    g_clear_error (&err);
+    ret = false;
+  }
+
+  gst_cuda_ipc_client_send_msg_finish (client, ret);
+}
+
+static bool
+gst_cuda_ipc_client_unix_send_msg (GstCudaIpcClient * client,
+    GstCudaIpcClientConn * conn)
+{
+  GstCudaIpcClientConnUnix *unix_conn =
+      static_cast < GstCudaIpcClientConnUnix * >(conn);
+
+  g_output_stream_write_all_async (unix_conn->ostream, &conn->client_msg0,
+      conn->client_msg.size (), G_PRIORITY_DEFAULT, unix_conn->cancellable,
+      (GAsyncReadyCallback) gst_cuda_ipc_client_unix_send_msg_finish,
+      unix_conn);
+
+  return true;
+}
+
+static void
+gst_cuda_ipc_client_unix_finish_have_mmap_data (GstCudaIpcClient * client,
+    GstCudaIpcClientConnUnix * conn)
+{
+  GstClockTime pts;
+  GstCudaIpcMemLayout layout;
+  GstCudaSharableHandle server_handle = 0;
+  GstCudaSharableHandle client_handle = 0;
+  GstCaps *caps = nullptr;
+  GError *err = nullptr;
+  std::vector < guint8 > meta;
+
+  if (!gst_cuda_ipc_pkt_parse_have_mmap_data (conn->server_msg, pts,
+          layout, &server_handle, &caps, meta)) {
+    GST_ERROR_OBJECT (client, "Couldn't parse MMAP-DATA");
+    goto error;
+  }
+
+  client_handle =
+      g_unix_connection_receive_fd (G_UNIX_CONNECTION (conn->conn),
+      conn->cancellable, &err);
+  if (err) {
+    GST_ERROR_OBJECT (client, "Couldn't get fd, %s", err->message);
+    goto error;
+  }
+
+  gst_cuda_ipc_client_have_mmap_data (client, pts, layout, caps,
+      server_handle, client_handle, meta);
+  return;
+
+error:
+  gst_cuda_ipc_client_wait_msg_finish (client, false);
+}
+
+static void
+gst_cuda_ipc_client_unix_payload_finish (GObject * source,
+    GAsyncResult * result, GstCudaIpcClientConnUnix * conn)
+{
+  GstCudaIpcClient *client = conn->client;
+  gsize size;
+  GError *err = nullptr;
+  bool ret = true;
+  GstCudaIpcPacketHeader header;
+
+  if (!g_input_stream_read_all_finish (conn->istream, result, &size, &err)) {
+    GST_WARNING_OBJECT (client, "Read failed with %s", err->message);
+    g_clear_error (&err);
+    ret = false;
+  } else if (!gst_cuda_ipc_pkt_identify (conn->server_msg, header)) {
+    GST_ERROR_OBJECT (client, "Broken header");
+    ret = false;
+  } else if (header.type == GstCudaIpcPktType::HAVE_MMAP_DATA) {
+    gst_cuda_ipc_client_unix_finish_have_mmap_data (client, conn);
+    return;
+  }
+
+  gst_cuda_ipc_client_wait_msg_finish (client, ret);
+}
+
+static void
+gst_cuda_ipc_client_unix_wait_finish (GObject * source,
+    GAsyncResult * result, GstCudaIpcClientConnUnix * conn)
+{
+  GstCudaIpcClient *client = conn->client;
+  gsize size;
+  GError *err = nullptr;
+  GstCudaIpcPacketHeader header;
+
+  if (!g_input_stream_read_all_finish (conn->istream, result, &size, &err)) {
+    GST_WARNING_OBJECT (client, "Read failed with %s", err->message);
+    g_clear_error (&err);
+    gst_cuda_ipc_client_wait_msg_finish (client, false);
+    return;
+  }
+
+  if (!gst_cuda_ipc_pkt_identify (conn->server_msg, header)) {
+    GST_ERROR_OBJECT (client, "Broken header");
+    gst_cuda_ipc_client_wait_msg_finish (client, false);
+    return;
+  }
+
+  if (header.payload_size == 0) {
+    gst_cuda_ipc_client_wait_msg_finish (client, true);
+    return;
+  }
+
+  GST_LOG_OBJECT (client, "Reading payload");
+
+  g_input_stream_read_all_async (conn->istream,
+      &conn->server_msg0 + GST_CUDA_IPC_PKT_HEADER_SIZE, header.payload_size,
+      G_PRIORITY_DEFAULT, conn->cancellable,
+      (GAsyncReadyCallback) gst_cuda_ipc_client_unix_payload_finish, conn);
+}
+
+static bool
+gst_cuda_ipc_client_unix_wait_msg (GstCudaIpcClient * client,
+    GstCudaIpcClientConn * conn)
+{
+  GstCudaIpcClientConnUnix *unix_conn =
+      static_cast < GstCudaIpcClientConnUnix * >(conn);
+
+  g_input_stream_read_all_async (unix_conn->istream,
+      &conn->server_msg0, GST_CUDA_IPC_PKT_HEADER_SIZE,
+      G_PRIORITY_DEFAULT, unix_conn->cancellable,
+      (GAsyncReadyCallback) gst_cuda_ipc_client_unix_wait_finish, unix_conn);
+
+  return true;
+}
+
+static void
+gst_cuda_ipc_client_unix_terminate (GstCudaIpcClient * client)
+{
+  GstCudaIpcClientUnix *self = GST_CUDA_IPC_CLIENT_UNIX (client);
+  GstCudaIpcClientUnixPrivate *priv = self->priv;
+
+  g_main_loop_quit (priv->main_loop);
+}
+
+static gboolean
+gst_cuda_ipc_client_unix_invoke_func (GstCudaIpcClient * client)
+{
+  gst_cuda_ipc_client_on_idle (client);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+gst_cuda_ipc_client_unix_invoke (GstCudaIpcClient * client)
+{
+  GstCudaIpcClientUnix *self = GST_CUDA_IPC_CLIENT_UNIX (client);
+  GstCudaIpcClientUnixPrivate *priv = self->priv;
+
+  g_main_context_invoke (priv->main_context,
+      (GSourceFunc) gst_cuda_ipc_client_unix_invoke_func, client);
+}
+
+static void
+gst_cuda_ipc_client_unix_set_flushing (GstCudaIpcClient * client, bool flushing)
+{
+  GstCudaIpcClientUnix *self = GST_CUDA_IPC_CLIENT_UNIX (client);
+  GstCudaIpcClientUnixPrivate *priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->flushing = flushing;
+  priv->cond.notify_all ();
+}
+
+static void
+gst_cuda_ipc_client_unix_loop (GstCudaIpcClient * client)
+{
+  GstCudaIpcClientUnix *self = GST_CUDA_IPC_CLIENT_UNIX (client);
+  GstCudaIpcClientUnixPrivate *priv = self->priv;
+  GSocketConnection *socket_conn;
+  GSocketClient *socket_client;
+  GSocketAddress *addr;
+  GError *err = nullptr;
+  GstClockTime start_time = gst_util_get_timestamp ();
+
+  g_main_context_push_thread_default (priv->main_context);
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+
+  socket_client = g_socket_client_new ();
+  addr = g_unix_socket_address_new (priv->address.c_str ());
+
+  do {
+    GstClockTime diff;
+
+    if (priv->flushing) {
+      GST_DEBUG_OBJECT (self, "We are flushing");
+      gst_cuda_ipc_client_abort (client);
+      return;
+    }
+
+    socket_conn = g_socket_client_connect (socket_client,
+        G_SOCKET_CONNECTABLE (addr), priv->cancellable, &err);
+    if (socket_conn)
+      break;
+
+    if (err->code == G_IO_ERROR_CANCELLED) {
+      GST_DEBUG_OBJECT (self, "Operation cancelled");
+      g_clear_error (&err);
+      break;
+    } else {
+      GST_DEBUG_OBJECT (self, "Connection failed with error %s", err->message);
+      g_clear_error (&err);
+    }
+
+    if (priv->timeout > 0) {
+      diff = gst_util_get_timestamp () - start_time;
+      if (diff > priv->timeout) {
+        GST_WARNING_OBJECT (self, "Timeout");
+        break;
+      }
+    }
+
+    GST_DEBUG_OBJECT (self, "Sleep for next retry");
+    priv->cond.wait_for (lk, std::chrono::milliseconds (100));
+  } while (true);
+  lk.unlock ();
+
+  g_object_unref (socket_client);
+  g_object_unref (addr);
+
+  if (socket_conn) {
+    GST_DEBUG_OBJECT (self, "Connection established");
+
+    auto conn = std::make_shared < GstCudaIpcClientConnUnix > (socket_conn,
+        priv->cancellable);
+    gst_cuda_ipc_client_new_connection (client, conn);
+  } else {
+    GST_WARNING_OBJECT (self, "Connection failed");
+    gst_cuda_ipc_client_abort (client);
+  }
+
+  GST_DEBUG_OBJECT (self, "Starting loop");
+
+  g_main_loop_run (priv->main_loop);
+
+  GST_DEBUG_OBJECT (self, "Exit loop");
+
+  g_cancellable_cancel (priv->cancellable);
+
+  g_main_context_pop_thread_default (priv->main_context);
+}
+
+GstCudaIpcClient *
+gst_cuda_ipc_client_new (const gchar * address, GstCudaContext * context,
+    GstCudaStream * stream, GstCudaIpcIOMode io_mode, guint timeout,
+    guint buffer_size)
+{
+  GstCudaIpcClient *client;
+  GstCudaIpcClientUnix *self;
+
+  g_return_val_if_fail (address, nullptr);
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+
+  self = (GstCudaIpcClientUnix *)
+      g_object_new (GST_TYPE_CUDA_IPC_CLIENT_UNIX, nullptr);
+  gst_object_ref_sink (self);
+
+  self->priv->address = address;
+  self->priv->timeout = timeout * GST_SECOND;
+
+  client = GST_CUDA_IPC_CLIENT (self);
+  client->context = (GstCudaContext *) gst_object_ref (context);
+  if (stream)
+    client->stream = gst_cuda_stream_ref (stream);
+  client->io_mode = io_mode;
+  client->buffer_size = buffer_size;
+
+  return client;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcclient_unix.h Added

@@ -0,0 +1,37 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstcudaipcclient.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_CUDA_IPC_CLIENT_UNIX (gst_cuda_ipc_client_unix_get_type())
+G_DECLARE_FINAL_TYPE (GstCudaIpcClientUnix, gst_cuda_ipc_client_unix,
+    GST, CUDA_IPC_CLIENT_UNIX, GstCudaIpcClient);
+
+GstCudaIpcClient * gst_cuda_ipc_client_new (const gchar * address,
+                                            GstCudaContext * context,
+                                            GstCudaStream * stream,
+                                            GstCudaIpcIOMode io_mode,
+                                            guint timeout,
+                                            guint buffer_size);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcclient_win32.cpp Added

@@ -0,0 +1,482 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudaipcclient_win32.h"
+#include <string>
+#include <mutex>
+#include <condition_variable>
+#include <chrono>
+
+GST_DEBUG_CATEGORY_EXTERN (cuda_ipc_client_debug);
+#define GST_CAT_DEFAULT cuda_ipc_client_debug
+
+/* *INDENT-OFF* */
+struct GstCudaIpcClientConnWin32 : public GstCudaIpcClientConn
+{
+  GstCudaIpcClientConnWin32 (HANDLE pipe) : pipe (pipe)
+  {
+    OVERLAPPED *parent = static_cast<OVERLAPPED *> (this);
+    parent->Internal = 0;
+    parent->InternalHigh = 0;
+    parent->Offset = 0;
+    parent->OffsetHigh = 0;
+  }
+
+  ~GstCudaIpcClientConnWin32 ()
+  {
+    if (pipe != INVALID_HANDLE_VALUE) {
+      CancelIo (pipe);
+      CloseHandle (pipe);
+    }
+  }
+
+  HANDLE pipe;
+};
+
+struct GstCudaIpcClientWin32Private
+{
+  GstCudaIpcClientWin32Private ()
+  {
+    wakeup_event = CreateEvent (nullptr, FALSE, FALSE, nullptr);
+    cancellable = CreateEvent (nullptr, TRUE, FALSE, nullptr);
+  }
+
+  ~GstCudaIpcClientWin32Private ()
+  {
+    CloseHandle (wakeup_event);
+    CloseHandle (cancellable);
+    if (server_process)
+      CloseHandle (server_process);
+  }
+
+  std::string address;
+  GstClockTime timeout;
+  std::mutex lock;
+  std::condition_variable cond;
+
+  HANDLE wakeup_event;
+  HANDLE cancellable;
+  HANDLE server_process = nullptr;
+  guint last_err = ERROR_SUCCESS;
+  bool flushing = false;
+};
+/* *INDENT-ON* */
+
+struct _GstCudaIpcClientWin32
+{
+  GstCudaIpcClient parent;
+
+  GstCudaIpcClientWin32Private *priv;
+};
+
+static void gst_cuda_ipc_client_win32_finalize (GObject * object);
+static bool gst_cuda_ipc_client_win32_send_msg (GstCudaIpcClient * client,
+    GstCudaIpcClientConn * conn);
+static bool gst_cuda_ipc_client_win32_wait_msg (GstCudaIpcClient * client,
+    GstCudaIpcClientConn * conn);
+static void gst_cuda_ipc_client_win32_terminate (GstCudaIpcClient * client);
+static void gst_cuda_ipc_client_win32_invoke (GstCudaIpcClient * client);
+static void gst_cuda_ipc_client_win32_set_flushing (GstCudaIpcClient * client,
+    bool flushing);
+static void gst_cuda_ipc_client_win32_loop (GstCudaIpcClient * client);
+static bool gst_cuda_ipc_client_win32_config (GstCudaIpcClient * client,
+    GstCudaPid pid, gboolean use_mmap);
+
+#define gst_cuda_ipc_client_win32_parent_class parent_class
+G_DEFINE_TYPE (GstCudaIpcClientWin32,
+    gst_cuda_ipc_client_win32, GST_TYPE_CUDA_IPC_CLIENT);
+
+static void
+gst_cuda_ipc_client_win32_class_init (GstCudaIpcClientWin32Class * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstCudaIpcClientClass *client_class = GST_CUDA_IPC_CLIENT_CLASS (klass);
+
+  object_class->finalize = gst_cuda_ipc_client_win32_finalize;
+
+  client_class->send_msg =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_win32_send_msg);
+  client_class->wait_msg =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_win32_wait_msg);
+  client_class->terminate =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_win32_terminate);
+  client_class->invoke = GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_win32_invoke);
+  client_class->set_flushing =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_win32_set_flushing);
+  client_class->loop = GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_win32_loop);
+  client_class->config = GST_DEBUG_FUNCPTR (gst_cuda_ipc_client_win32_config);
+}
+
+static void
+gst_cuda_ipc_client_win32_init (GstCudaIpcClientWin32 * self)
+{
+  self->priv = new GstCudaIpcClientWin32Private ();
+}
+
+static void
+gst_cuda_ipc_client_win32_finalize (GObject * object)
+{
+  GstCudaIpcClientWin32 *self = GST_CUDA_IPC_CLIENT_WIN32 (object);
+
+  GST_DEBUG_OBJECT (self, "finalize");
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void WINAPI
+gst_cuda_ipc_client_win32_send_msg_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstCudaIpcClientConnWin32 *win32_conn =
+      static_cast < GstCudaIpcClientConnWin32 * >(overlap);
+  GstCudaIpcClient *client = win32_conn->client;
+  bool ret = true;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_cuda_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (client, "WriteFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    ret = false;
+  }
+
+  gst_cuda_ipc_client_send_msg_finish (client, ret);
+}
+
+static bool
+gst_cuda_ipc_client_win32_send_msg (GstCudaIpcClient * client,
+    GstCudaIpcClientConn * conn)
+{
+  GstCudaIpcClientConnWin32 *win32_conn =
+      static_cast < GstCudaIpcClientConnWin32 * >(conn);
+
+  if (!WriteFileEx (win32_conn->pipe, &conn->client_msg0,
+          conn->client_msg.size (), win32_conn,
+          gst_cuda_ipc_client_win32_send_msg_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_cuda_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (client, "WriteFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    return false;
+  }
+
+  return true;
+}
+
+static void
+gst_cuda_ipc_client_win32_finish_have_mmap_data (GstCudaIpcClient * client,
+    GstCudaIpcClientConnWin32 * win32_conn)
+{
+  GstCudaIpcClientWin32 *self = GST_CUDA_IPC_CLIENT_WIN32 (client);
+  GstCudaIpcClientWin32Private *priv = self->priv;
+  GstClockTime pts;
+  GstCudaIpcMemLayout layout;
+  GstCudaSharableHandle server_handle = nullptr;
+  GstCudaSharableHandle client_handle = nullptr;
+  GstCaps *caps = nullptr;
+  std::vector < guint8 > meta;
+
+  if (!priv->server_process) {
+    GST_ERROR_OBJECT (self, "Server process handle is not available");
+    goto error;
+  }
+
+  if (!gst_cuda_ipc_pkt_parse_have_mmap_data (win32_conn->server_msg, pts,
+          layout, &server_handle, &caps, meta)) {
+    GST_ERROR_OBJECT (self, "Couldn't parse MMAP-DATA");
+    goto error;
+  }
+
+  if (!DuplicateHandle (priv->server_process, server_handle,
+          GetCurrentProcess (), &client_handle, 0, FALSE,
+          DUPLICATE_SAME_ACCESS)) {
+    DWORD error_code = GetLastError ();
+    auto err = gst_cuda_ipc_win32_error_to_string (error_code);
+    GST_ERROR_OBJECT (self, "Couldn't duplicate handle, 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    goto error;
+  }
+
+  gst_cuda_ipc_client_have_mmap_data (client, pts, layout, caps,
+      server_handle, client_handle, meta);
+  return;
+
+error:
+  gst_cuda_ipc_client_wait_msg_finish (client, false);
+}
+
+static void WINAPI
+gst_cuda_ipc_client_win32_payload_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstCudaIpcClientConnWin32 *win32_conn =
+      static_cast < GstCudaIpcClientConnWin32 * >(overlap);
+  GstCudaIpcClient *client = win32_conn->client;
+  GstCudaIpcPacketHeader header;
+  bool ret = true;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_cuda_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (client, "ReadFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    ret = false;
+  } else if (!gst_cuda_ipc_pkt_identify (win32_conn->server_msg, header)) {
+    GST_ERROR_OBJECT (client, "Broken header");
+    ret = false;
+  } else if (header.type == GstCudaIpcPktType::HAVE_MMAP_DATA) {
+    gst_cuda_ipc_client_win32_finish_have_mmap_data (client, win32_conn);
+    return;
+  }
+
+  gst_cuda_ipc_client_wait_msg_finish (client, ret);
+}
+
+static void WINAPI
+gst_cuda_ipc_client_win32_wait_msg_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstCudaIpcClientConnWin32 *win32_conn =
+      static_cast < GstCudaIpcClientConnWin32 * >(overlap);
+  GstCudaIpcClient *client = win32_conn->client;
+  GstCudaIpcPacketHeader header;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_cuda_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (client, "ReadFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    gst_cuda_ipc_client_wait_msg_finish (client, false);
+    return;
+  }
+
+  if (!gst_cuda_ipc_pkt_identify (win32_conn->server_msg, header)) {
+    GST_ERROR_OBJECT (client, "Broken header");
+    gst_cuda_ipc_client_wait_msg_finish (client, false);
+    return;
+  }
+
+  if (header.payload_size == 0) {
+    gst_cuda_ipc_client_wait_msg_finish (client, true);
+    return;
+  }
+
+  GST_LOG_OBJECT (client, "Reading payload");
+
+  if (!ReadFileEx (win32_conn->pipe, &win32_conn->server_msg0 +
+          GST_CUDA_IPC_PKT_HEADER_SIZE, header.payload_size, win32_conn,
+          gst_cuda_ipc_client_win32_payload_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_cuda_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (client, "ReadFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    gst_cuda_ipc_client_wait_msg_finish (client, false);
+  }
+}
+
+static bool
+gst_cuda_ipc_client_win32_wait_msg (GstCudaIpcClient * client,
+    GstCudaIpcClientConn * conn)
+{
+  GstCudaIpcClientConnWin32 *win32_conn =
+      static_cast < GstCudaIpcClientConnWin32 * >(conn);
+
+  if (!ReadFileEx (win32_conn->pipe, &conn->server_msg0,
+          GST_CUDA_IPC_PKT_HEADER_SIZE, win32_conn,
+          gst_cuda_ipc_client_win32_wait_msg_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_cuda_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (client, "ReadFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    return false;
+  }
+
+  return true;
+}
+
+static void
+gst_cuda_ipc_client_win32_terminate (GstCudaIpcClient * client)
+{
+  GstCudaIpcClientWin32 *self = GST_CUDA_IPC_CLIENT_WIN32 (client);
+  GstCudaIpcClientWin32Private *priv = self->priv;
+
+  SetEvent (priv->cancellable);
+}
+
+static void
+gst_cuda_ipc_client_win32_invoke (GstCudaIpcClient * client)
+{
+  GstCudaIpcClientWin32 *self = GST_CUDA_IPC_CLIENT_WIN32 (client);
+  GstCudaIpcClientWin32Private *priv = self->priv;
+
+  SetEvent (priv->wakeup_event);
+}
+
+static void
+gst_cuda_ipc_client_win32_set_flushing (GstCudaIpcClient * client,
+    bool flushing)
+{
+  GstCudaIpcClientWin32 *self = GST_CUDA_IPC_CLIENT_WIN32 (client);
+  GstCudaIpcClientWin32Private *priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->flushing = flushing;
+  priv->cond.notify_all ();
+}
+
+static bool
+gst_cuda_ipc_client_win32_config (GstCudaIpcClient * client, GstCudaPid pid,
+    gboolean use_mmap)
+{
+  GstCudaIpcClientWin32 *self = GST_CUDA_IPC_CLIENT_WIN32 (client);
+  GstCudaIpcClientWin32Private *priv = self->priv;
+
+  if (!use_mmap)
+    return TRUE;
+
+  if (priv->server_process) {
+    GST_WARNING_OBJECT (self, "Have server process already");
+    CloseHandle (priv->server_process);
+  }
+
+  priv->server_process = OpenProcess (PROCESS_DUP_HANDLE, FALSE, pid);
+
+  if (priv->server_process)
+    return true;
+
+  DWORD error_code = GetLastError ();
+  auto err = gst_cuda_ipc_win32_error_to_string (error_code);
+  GST_ERROR_OBJECT (self, "Couldn't open server process, 0x%x (%s)",
+      (guint) error_code, err.c_str ());
+
+  return false;
+}
+
+static void
+gst_cuda_ipc_client_win32_loop (GstCudaIpcClient * client)
+{
+  GstCudaIpcClientWin32 *self = GST_CUDA_IPC_CLIENT_WIN32 (client);
+  GstCudaIpcClientWin32Private *priv = self->priv;
+  DWORD mode = PIPE_READMODE_MESSAGE;
+  guint wait_ret;
+  HANDLE pipe = INVALID_HANDLE_VALUE;
+  GstClockTime start_time = gst_util_get_timestamp ();
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  do {
+    GstClockTime diff;
+
+    if (priv->flushing) {
+      GST_DEBUG_OBJECT (self, "We are flushing");
+      gst_cuda_ipc_client_abort (client);
+      return;
+    }
+
+    pipe = CreateFileA (priv->address.c_str (),
+        GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING,
+        FILE_FLAG_OVERLAPPED, nullptr);
+    if (pipe != INVALID_HANDLE_VALUE)
+      break;
+
+    if (priv->timeout > 0) {
+      diff = gst_util_get_timestamp () - start_time;
+      if (diff > priv->timeout) {
+        GST_WARNING_OBJECT (self, "Timeout");
+        gst_cuda_ipc_client_abort (client);
+        return;
+      }
+    }
+
+    /* Retry per 100ms */
+    GST_DEBUG_OBJECT (self, "Sleep for next retry");
+    priv->cond.wait_for (lk, std::chrono::milliseconds (100));
+  } while (true);
+  lk.unlock ();
+
+  g_assert (pipe != INVALID_HANDLE_VALUE);
+
+  if (!SetNamedPipeHandleState (pipe, &mode, nullptr, nullptr)) {
+    priv->last_err = GetLastError ();
+    auto err = gst_cuda_ipc_win32_error_to_string (priv->last_err);
+    GST_WARNING_OBJECT (self, "SetNamedPipeHandleState failed with 0x%x (%s)",
+        priv->last_err, err.c_str ());
+
+    CloseHandle (pipe);
+    gst_cuda_ipc_client_abort (client);
+    return;
+  }
+
+  auto conn = std::make_shared < GstCudaIpcClientConnWin32 > (pipe);
+  gst_cuda_ipc_client_new_connection (client, conn);
+
+  HANDLE waitables = { priv->cancellable, priv->wakeup_event };
+  do {
+    /* Enters alertable thread state and wait for I/O completion event
+     * or cancellable event */
+    wait_ret = WaitForMultipleObjectsEx (G_N_ELEMENTS (waitables), waitables,
+        FALSE, INFINITE, TRUE);
+    if (wait_ret == WAIT_OBJECT_0) {
+      GST_DEBUG ("Operation cancelled");
+      return;
+    }
+
+    switch (wait_ret) {
+      case WAIT_IO_COMPLETION:
+        break;
+      case WAIT_OBJECT_0 + 1:
+        gst_cuda_ipc_client_on_idle (client);
+        break;
+      default:
+        GST_WARNING ("Unexpected wait return 0x%x", wait_ret);
+        gst_cuda_ipc_client_abort (client);
+        return;
+    }
+  } while (true);
+}
+
+GstCudaIpcClient *
+gst_cuda_ipc_client_new (const gchar * address, GstCudaContext * context,
+    GstCudaStream * stream, GstCudaIpcIOMode io_mode, guint timeout,
+    guint buffer_size)
+{
+  GstCudaIpcClient *client;
+  GstCudaIpcClientWin32 *self;
+
+  g_return_val_if_fail (address, nullptr);
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+
+  self = (GstCudaIpcClientWin32 *)
+      g_object_new (GST_TYPE_CUDA_IPC_CLIENT_WIN32, nullptr);
+  gst_object_ref_sink (self);
+
+  self->priv->address = address;
+  self->priv->timeout = timeout * GST_SECOND;
+
+  client = GST_CUDA_IPC_CLIENT (self);
+  client->context = (GstCudaContext *) gst_object_ref (context);
+  if (stream)
+    client->stream = gst_cuda_stream_ref (stream);
+  client->io_mode = io_mode;
+  client->buffer_size = buffer_size;
+
+  return client;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcclient_win32.h Added

@@ -0,0 +1,37 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstcudaipcclient.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_CUDA_IPC_CLIENT_WIN32 (gst_cuda_ipc_client_win32_get_type())
+G_DECLARE_FINAL_TYPE (GstCudaIpcClientWin32, gst_cuda_ipc_client_win32,
+    GST, CUDA_IPC_CLIENT_WIN32, GstCudaIpcClient);
+
+GstCudaIpcClient * gst_cuda_ipc_client_new (const gchar * address,
+                                            GstCudaContext * context,
+                                            GstCudaStream * stream,
+                                            GstCudaIpcIOMode io_mode,
+                                            guint timeout,
+                                            guint buffer_size);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcserver.cpp Added

@@ -0,0 +1,711 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudaipcserver.h"
+#include <unordered_map>
+#include <mutex>
+#include <atomic>
+#include <gst/cuda/gstcuda-private.h>
+
+GST_DEBUG_CATEGORY (cuda_ipc_server_debug);
+#define GST_CAT_DEFAULT cuda_ipc_server_debug
+
+/**
+ * GstCudaIpcMode:
+ *
+ * Since: 1.24
+ */
+GType
+gst_cuda_ipc_mode_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue ipc_modes = {
+    {GST_CUDA_IPC_LEGACY, "Legacy IPC mode", "legacy"},
+    {GST_CUDA_IPC_MMAP, "Memory Map", "mmap"},
+    {0, nullptr, nullptr}
+  };
+
+  GST_CUDA_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstCudaIpcMode", ipc_modes);
+  } GST_CUDA_CALL_ONCE_END;
+
+  return type;
+}
+
+struct GstCudaIpcServerPrivate
+{
+  GstCudaIpcServerPrivate ()
+  {
+    shutdown = false;
+    aborted = false;
+  }
+
+  std::mutex lock;
+  guint64 seq_num = 0;
+  guint next_conn_id = 0;
+  std::unordered_map < guint,
+      std::shared_ptr < GstCudaIpcServerConn >> conn_map;
+  GThread *loop_thread = nullptr;
+  std::atomic < bool >shutdown;
+  std::atomic < bool >aborted;
+  std::shared_ptr < GstCudaIpcServerData > data;
+};
+
+static void gst_cuda_ipc_server_dispose (GObject * object);
+static void gst_cuda_ipc_server_finalize (GObject * object);
+
+#define gst_cuda_ipc_server_parent_class parent_class
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstCudaIpcServer,
+    gst_cuda_ipc_server, GST_TYPE_OBJECT,
+    GST_DEBUG_CATEGORY_INIT (cuda_ipc_server_debug, "cudaipcserver",
+        0, "cudaipcserver"));
+
+static void
+gst_cuda_ipc_server_class_init (GstCudaIpcServerClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_cuda_ipc_server_finalize;
+  object_class->dispose = gst_cuda_ipc_server_dispose;
+}
+
+static void
+gst_cuda_ipc_server_init (GstCudaIpcServer * self)
+{
+  self->priv = new GstCudaIpcServerPrivate ();
+}
+
+static void
+gst_cuda_ipc_server_dispose (GObject * object)
+{
+  GstCudaIpcServer *self = GST_CUDA_IPC_SERVER (object);
+  GstCudaIpcServerPrivate *priv = self->priv;
+  GstCudaIpcServerClass *klass = GST_CUDA_IPC_SERVER_GET_CLASS (self);
+
+  GST_DEBUG_OBJECT (self, "dispose");
+
+  g_assert (klass->terminate);
+  klass->terminate (self);
+
+  g_clear_pointer (&priv->loop_thread, g_thread_join);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gst_cuda_ipc_server_finalize (GObject * object)
+{
+  GstCudaIpcServer *self = GST_CUDA_IPC_SERVER (object);
+
+  GST_DEBUG_OBJECT (self, "finalize");
+
+  gst_clear_object (&self->context);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GstFlowReturn
+gst_cuda_ipc_server_send_data (GstCudaIpcServer * server, GstSample * sample,
+    const GstVideoInfo & info, const CUipcMemHandle & handle, GstClockTime pts,
+    GByteArray * meta)
+{
+  GstCudaIpcServerPrivate *priv;
+  GstCudaIpcServerClass *klass;
+
+  g_return_val_if_fail (GST_IS_CUDA_IPC_SERVER (server), GST_FLOW_ERROR);
+  g_return_val_if_fail (GST_IS_SAMPLE (sample), GST_FLOW_ERROR);
+
+  if (server->ipc_mode != GST_CUDA_IPC_LEGACY) {
+    GST_ERROR_OBJECT (server, "Invalid call");
+    return GST_FLOW_ERROR;
+  }
+
+  priv = server->priv;
+  klass = GST_CUDA_IPC_SERVER_GET_CLASS (server);
+
+  GST_LOG_OBJECT (server, "Sending data");
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  if (priv->aborted) {
+    GST_DEBUG_OBJECT (server, "Was aborted");
+    return GST_FLOW_ERROR;
+  }
+
+  auto data = std::make_shared < GstCudaIpcServerData > ();
+  data->sample = gst_sample_ref (sample);
+  data->info = info;
+  data->handle = handle;
+  data->pts = pts;
+  data->seq_num = priv->seq_num;
+  if (meta && meta->len) {
+    data->meta.resize (meta->len);
+    memcpy (data->meta.data (), meta->data, meta->len);
+  }
+
+  priv->seq_num++;
+  priv->data = data;
+  lk.unlock ();
+
+  klass->invoke (server);
+
+  return GST_FLOW_OK;
+}
+
+GstFlowReturn
+gst_cuda_ipc_server_send_mmap_data (GstCudaIpcServer * server,
+    GstSample * sample, const GstVideoInfo & info, GstCudaSharableHandle handle,
+    GstClockTime pts, GByteArray * meta)
+{
+  GstCudaIpcServerPrivate *priv;
+  GstCudaIpcServerClass *klass;
+
+  g_return_val_if_fail (GST_IS_CUDA_IPC_SERVER (server), GST_FLOW_ERROR);
+  g_return_val_if_fail (GST_IS_SAMPLE (sample), GST_FLOW_ERROR);
+
+  if (server->ipc_mode != GST_CUDA_IPC_MMAP) {
+    GST_ERROR_OBJECT (server, "Invalid call");
+    return GST_FLOW_ERROR;
+  }
+
+  priv = server->priv;
+  klass = GST_CUDA_IPC_SERVER_GET_CLASS (server);
+
+  GST_LOG_OBJECT (server, "Sending data");
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  if (priv->aborted) {
+    GST_DEBUG_OBJECT (server, "Was aborted");
+    return GST_FLOW_ERROR;
+  }
+
+  auto data = std::make_shared < GstCudaIpcServerData > ();
+  data->sample = gst_sample_ref (sample);
+  data->info = info;
+  data->os_handle = handle;
+  data->pts = pts;
+  data->seq_num = priv->seq_num;
+  if (meta && meta->len) {
+    data->meta.resize (meta->len);
+    memcpy (data->meta.data (), meta->data, meta->len);
+  }
+
+  priv->seq_num++;
+  priv->data = data;
+  lk.unlock ();
+
+  klass->invoke (server);
+
+  return GST_FLOW_OK;
+}
+
+static gpointer
+gst_cuda_ipc_server_loop_thread_func (GstCudaIpcServer * self)
+{
+  GstCudaIpcServerPrivate *priv = self->priv;
+  GstCudaIpcServerClass *klass = GST_CUDA_IPC_SERVER_GET_CLASS (self);
+
+  g_assert (klass->loop);
+
+  GST_DEBUG_OBJECT (self, "Start loop thread");
+
+  klass->loop (self);
+  priv->conn_map.clear ();
+
+  GST_DEBUG_OBJECT (self, "Exit loop thread");
+
+  return nullptr;
+}
+
+void
+gst_cuda_ipc_server_run (GstCudaIpcServer * server)
+{
+  GstCudaIpcServerPrivate *priv;
+
+  g_return_if_fail (GST_IS_CUDA_IPC_SERVER (server));
+
+  priv = server->priv;
+
+  GST_DEBUG_OBJECT (server, "Running");
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  if (priv->loop_thread) {
+    GST_DEBUG_OBJECT (server, "Already running");
+    return;
+  }
+
+  GST_DEBUG_OBJECT (server, "Spawning thread");
+  priv->loop_thread = g_thread_new ("cuda-ipc-server",
+      (GThreadFunc) gst_cuda_ipc_server_loop_thread_func, server);
+}
+
+void
+gst_cuda_ipc_server_stop (GstCudaIpcServer * server)
+{
+  GstCudaIpcServerPrivate *priv;
+  GstCudaIpcServerClass *klass;
+
+  g_return_if_fail (GST_IS_CUDA_IPC_SERVER (server));
+
+  priv = server->priv;
+  klass = GST_CUDA_IPC_SERVER_GET_CLASS (server);
+
+  GST_DEBUG_OBJECT (server, "Stopping");
+  priv->shutdown = true;
+  klass->invoke (server);
+
+  g_clear_pointer (&priv->loop_thread, g_thread_join);
+
+  GST_DEBUG_OBJECT (server, "Stopped");
+}
+
+static void
+gst_cuda_ipc_server_close_connection (GstCudaIpcServer * self,
+    GstCudaIpcServerConn * conn)
+{
+  GstCudaIpcServerPrivate *priv = self->priv;
+  GstCudaIpcServerClass *klass = GST_CUDA_IPC_SERVER_GET_CLASS (self);
+
+  GST_DEBUG_OBJECT (self, "Closing conn-id %u", conn->id);
+
+  priv->conn_map.erase (conn->id);
+
+  if (priv->shutdown && priv->conn_map.empty ()) {
+    GST_DEBUG_OBJECT (self, "All connection were closed");
+    klass->terminate (self);
+  }
+}
+
+static void
+gst_cuda_ipc_server_send_msg (GstCudaIpcServer * self,
+    GstCudaIpcServerConn * conn)
+{
+  GstCudaIpcServerClass *klass = GST_CUDA_IPC_SERVER_GET_CLASS (self);
+
+  if (!klass->send_msg (self, conn)) {
+    GST_WARNING_OBJECT (self, "Send msg failed");
+    gst_cuda_ipc_server_close_connection (self, conn);
+  }
+}
+
+static void
+gst_cuda_ipc_server_config_data (GstCudaIpcServer * self,
+    GstCudaIpcServerConn * conn)
+{
+  GstCaps *caps = gst_sample_get_caps (conn->data->sample);
+
+  gst_caps_replace (&conn->caps, caps);
+
+  gst_cuda_ipc_pkt_build_config (conn->server_msg, self->pid,
+      self->ipc_mode == GST_CUDA_IPC_MMAP, conn->caps);
+  conn->type = GstCudaIpcPktType::CONFIG;
+
+  GST_LOG_OBJECT (self, "Sending CONFIG, conn-id %u", conn->id);
+  gst_cuda_ipc_server_send_msg (self, conn);
+}
+
+void
+gst_cuda_ipc_server_on_incoming_connection (GstCudaIpcServer * server,
+    std::shared_ptr < GstCudaIpcServerConn > conn)
+{
+  GstCudaIpcServerPrivate *priv = server->priv;
+
+  priv->lock.lock ();
+  conn->server = server;
+  conn->id = priv->next_conn_id;
+  conn->context = (GstCudaContext *) gst_object_ref (server->context);
+  conn->data = priv->data;
+  priv->next_conn_id++;
+  priv->lock.unlock ();
+
+  /* *INDENT-OFF* */
+  priv->conn_map.insert ({conn->id, conn});
+  /* *INDENT-ON* */
+
+  if (conn->data) {
+    conn->configured = true;
+    gst_cuda_ipc_server_config_data (server, conn.get ());
+  } else {
+    GST_DEBUG_OBJECT (server, "Have no config data yet, waiting for data");
+  }
+}
+
+static void
+gst_cuda_ipc_server_have_data (GstCudaIpcServer * self,
+    GstCudaIpcServerConn * conn)
+{
+  GstCudaIpcServerClass *klass = GST_CUDA_IPC_SERVER_GET_CLASS (self);
+  GstCaps *caps;
+  GstBuffer *buffer;
+  GstCudaMemory *cmem;
+
+  if (!conn->data) {
+    GST_ERROR_OBJECT (self, "Have no data to send, conn-id: %u", conn->id);
+    gst_cuda_ipc_server_close_connection (self, conn);
+    return;
+  }
+
+  conn->pending_have_data = false;
+  conn->seq_num = conn->data->seq_num + 1;
+
+  caps = gst_sample_get_caps (conn->data->sample);
+  if (!conn->caps || !gst_caps_is_equal (conn->caps, caps)) {
+    GST_DEBUG_OBJECT (self, "Sending caps %" GST_PTR_FORMAT " to conn-id %u",
+        caps, conn->id);
+    gst_caps_replace (&conn->caps, caps);
+  } else {
+    caps = nullptr;
+  }
+
+  buffer = gst_sample_get_buffer (conn->data->sample);
+  cmem = (GstCudaMemory *) gst_buffer_peek_memory (buffer, 0);
+
+  if (self->ipc_mode == GST_CUDA_IPC_LEGACY) {
+    auto handle_dump = gst_cuda_ipc_mem_handle_to_string (conn->data->handle);
+    GST_LOG_OBJECT (self, "Sending HAVE-DATA with handle %s, conn-id: %u",
+        handle_dump.c_str (), conn->id);
+
+    if (!gst_cuda_ipc_pkt_build_have_data (conn->server_msg, conn->data->pts,
+            conn->data->info, conn->data->handle, caps, conn->data->meta)) {
+      GST_ERROR_OBJECT (self, "Couldn't build HAVE-DATA pkt, conn-id: %u",
+          conn->id);
+      gst_cuda_ipc_server_close_connection (self, conn);
+      return;
+    }
+
+    conn->type = GstCudaIpcPktType::HAVE_DATA;
+  } else {
+    guint max_size = cmem->mem.maxsize;
+    GST_LOG_OBJECT (self, "Sending HAVE-MMAP-DATA with handle %"
+        GST_CUDA_OS_HANDLE_FORMAT ", conn-id: %u", conn->data->os_handle,
+        conn->id);
+    if (!gst_cuda_ipc_pkt_build_have_mmap_data (conn->server_msg,
+            conn->data->pts, conn->data->info, max_size, conn->data->os_handle,
+            caps, conn->data->meta)) {
+      GST_ERROR_OBJECT (self, "Couldn't build HAVE-MMAP-DATA pkt, conn-id: %u",
+          conn->id);
+      gst_cuda_ipc_server_close_connection (self, conn);
+      return;
+    }
+
+    conn->type = GstCudaIpcPktType::HAVE_MMAP_DATA;
+    if (klass->send_mmap_msg) {
+      if (!klass->send_mmap_msg (self, conn, conn->data->os_handle)) {
+        GST_WARNING_OBJECT (self, "Send msg failed");
+        gst_cuda_ipc_server_close_connection (self, conn);
+      }
+
+      return;
+    }
+  }
+
+  gst_cuda_ipc_server_send_msg (self, conn);
+}
+
+static void
+gst_cuda_ipc_server_wait_msg (GstCudaIpcServer * self,
+    GstCudaIpcServerConn * conn)
+{
+  GstCudaIpcServerClass *klass = GST_CUDA_IPC_SERVER_GET_CLASS (self);
+
+  if (!klass->wait_msg (self, conn)) {
+    GST_WARNING_OBJECT (self, "Wait msg failed, conn-id: %u", conn->id);
+    gst_cuda_ipc_server_close_connection (self, conn);
+  }
+}
+
+static bool
+gst_cuda_ipc_server_on_release_data (GstCudaIpcServer * self,
+    GstCudaIpcServerConn * conn)
+{
+  bool found = false;
+
+  if (self->ipc_mode == GST_CUDA_IPC_LEGACY) {
+    CUipcMemHandle handle;
+    if (!gst_cuda_ipc_pkt_parse_release_data (conn->client_msg, handle)) {
+      GST_ERROR_OBJECT (self, "Couldn't parse RELEASE-DATA, conn-id: %u",
+          conn->id);
+      return false;
+    }
+
+    auto handle_dump = gst_cuda_ipc_mem_handle_to_string (handle);
+    GST_LOG_OBJECT (self, "RELEASE-DATA %s, conn-id: %u",
+        handle_dump.c_str (), conn->id);
+
+    for (auto it = conn->peer_handles.begin (); it != conn->peer_handles.end ();
+        it++) {
+      CUipcMemHandle & tmp = (*it)->handle;
+      if (gst_cuda_ipc_handle_is_equal (tmp, handle)) {
+        found = true;
+        conn->peer_handles.erase (it);
+        break;
+      }
+    }
+
+    if (!found) {
+      GST_WARNING_OBJECT (self,
+          "Unexpected memory handle to remove %s, conn-id: %u",
+          handle_dump.c_str (), conn->id);
+      return false;
+    }
+  } else {
+    GstCudaSharableHandle handle;
+    if (!gst_cuda_ipc_pkt_parse_release_mmap_data (conn->client_msg, &handle)) {
+      GST_ERROR_OBJECT (self, "Couldn't parse RELEASE-MMAP-DATA, conn-id: %u",
+          conn->id);
+      return false;
+    }
+
+    GST_LOG_OBJECT (self, "RELEASE-MMAP-DATA %" GST_CUDA_OS_HANDLE_FORMAT
+        ", conn-id %u", handle, conn->id);
+
+    for (auto it = conn->peer_handles.begin (); it != conn->peer_handles.end ();
+        it++) {
+      if ((*it)->os_handle == handle) {
+        found = true;
+        conn->peer_handles.erase (it);
+        break;
+      }
+    }
+
+    if (!found) {
+      GST_WARNING_OBJECT (self,
+          "Unexpected memory handle to remove %" GST_CUDA_OS_HANDLE_FORMAT
+          ", conn-id: %u", handle, conn->id);
+      return false;
+    }
+  }
+
+  GST_LOG_OBJECT (self, "Client is holding %" G_GSIZE_FORMAT " handles",
+      conn->peer_handles.size ());
+
+  return true;
+}
+
+void
+gst_cuda_ipc_server_wait_msg_finish (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn, bool result)
+{
+  GstCudaIpcPacketHeader header;
+
+  if (!result) {
+    GST_WARNING_OBJECT (server, "Wait msg failed, conn->id: %u", conn->id);
+    gst_cuda_ipc_server_close_connection (server, conn);
+    return;
+  }
+
+  if (!gst_cuda_ipc_pkt_identify (conn->client_msg, header)) {
+    GST_ERROR_OBJECT (server, "Broken header, conn-id: %u", conn->id);
+    gst_cuda_ipc_server_close_connection (server, conn);
+    return;
+  }
+
+  switch (header.type) {
+    case GstCudaIpcPktType::NEED_DATA:
+      GST_LOG_OBJECT (server, "NEED-DATA, conn-id: %u", conn->id);
+      if (!conn->data) {
+        GST_LOG_OBJECT (server, "Wait for available data, conn-id: %u",
+            conn->id);
+        conn->pending_have_data = true;
+        gst_cuda_ipc_server_on_idle (server);
+        return;
+      }
+      gst_cuda_ipc_server_have_data (server, conn);
+      break;
+    case GstCudaIpcPktType::READ_DONE:
+      GST_LOG_OBJECT (server, "READ-DONE, conn-id: %u", conn->id);
+
+      if (!conn->data) {
+        GST_ERROR_OBJECT (server, "Unexpected READ-DATA, conn-id: %u",
+            conn->id);
+        gst_cuda_ipc_server_close_connection (server, conn);
+        return;
+      }
+
+      conn->peer_handles.push_back (conn->data);
+      conn->data = nullptr;
+      gst_cuda_ipc_server_wait_msg (server, conn);
+      break;
+    case GstCudaIpcPktType::RELEASE_DATA:
+    case GstCudaIpcPktType::RELEASE_MMAP_DATA:
+      GST_LOG_OBJECT (server, "RELEASE-DATA, conn-id: %u", conn->id);
+      if (!gst_cuda_ipc_server_on_release_data (server, conn))
+        gst_cuda_ipc_server_close_connection (server, conn);
+      else
+        gst_cuda_ipc_server_wait_msg (server, conn);
+      break;
+    case GstCudaIpcPktType::FIN:
+      GST_DEBUG_OBJECT (server, "FIN, conn-id %u", conn->id);
+      gst_cuda_ipc_server_close_connection (server, conn);
+      break;
+    default:
+      GST_ERROR_OBJECT (server, "Unexpected packet, conn-id: %u", conn->id);
+      gst_cuda_ipc_server_close_connection (server, conn);
+      break;
+  }
+}
+
+void
+gst_cuda_ipc_server_send_msg_finish (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn, bool result)
+{
+  if (!result) {
+    GST_WARNING_OBJECT (server, "Send msg failed, conn-id %u", conn->id);
+    gst_cuda_ipc_server_close_connection (server, conn);
+    return;
+  }
+
+  switch (conn->type) {
+    case GstCudaIpcPktType::CONFIG:
+      GST_DEBUG_OBJECT (server, "Sent CONFIG-DATA, conn-id %u", conn->id);
+      gst_cuda_ipc_server_wait_msg (server, conn);
+      break;
+    case GstCudaIpcPktType::HAVE_DATA:
+      GST_LOG_OBJECT (server, "Sent HAVE-DATA, conn-id %u", conn->id);
+      gst_cuda_ipc_server_wait_msg (server, conn);
+      break;
+    case GstCudaIpcPktType::HAVE_MMAP_DATA:
+      GST_LOG_OBJECT (server, "Sent HAVE-MMAP-DATA, conn-id %u", conn->id);
+      gst_cuda_ipc_server_wait_msg (server, conn);
+      break;
+    case GstCudaIpcPktType::EOS:
+      GST_DEBUG_OBJECT (server, "Sent EOS, conn-id %u", conn->id);
+      gst_cuda_ipc_server_wait_msg (server, conn);
+      break;
+    default:
+      GST_ERROR_OBJECT (server, "Unexpected msg type %d", (gint) conn->type);
+      gst_cuda_ipc_server_close_connection (server, conn);
+      break;
+  }
+}
+
+static void
+gst_cuda_ipc_server_eos (GstCudaIpcServer * self, GstCudaIpcServerConn * conn)
+{
+  gst_cuda_ipc_pkt_build_eos (conn->server_msg);
+  conn->eos = true;
+  conn->type = GstCudaIpcPktType::EOS;
+
+  gst_cuda_ipc_server_send_msg (self, conn);
+}
+
+void
+gst_cuda_ipc_server_on_idle (GstCudaIpcServer * server)
+{
+  GstCudaIpcServerClass *klass = GST_CUDA_IPC_SERVER_GET_CLASS (server);
+  GstCudaIpcServerPrivate *priv = server->priv;
+
+  GST_LOG_OBJECT (server, "idle");
+
+  if (priv->shutdown) {
+    GST_DEBUG_OBJECT (server, "We are stopping");
+
+    if (priv->conn_map.empty ()) {
+      GST_DEBUG_OBJECT (server, "All connections were closed");
+      klass->terminate (server);
+      return;
+    }
+
+    std::vector < std::shared_ptr < GstCudaIpcServerConn >> to_send_eos;
+    /* *INDENT-OFF* */
+    for (auto it : priv->conn_map) {
+      auto conn = it.second;
+      if (conn->eos || !conn->pending_have_data)
+        continue;
+
+      to_send_eos.push_back (conn);
+    }
+
+    for (auto it : to_send_eos) {
+      GST_DEBUG_OBJECT (server, "Sending EOS to conn-id: %u", it->id);
+      gst_cuda_ipc_server_eos (server, it.get ());
+    }
+
+    GST_DEBUG_OBJECT (server, "Have %" G_GSIZE_FORMAT " alive connections",
+        priv->conn_map.size());
+
+    size_t num_closed = 0;
+    for (auto it : priv->conn_map) {
+      auto conn = it.second;
+      GST_DEBUG_OBJECT (server, "conn-id %u"
+          " peer handle size %" G_GSIZE_FORMAT, conn->id,
+          conn->peer_handles.size ());
+
+      /* Cannot erase conn since it's still referenced.
+       * Manually close connection */
+      if (conn->peer_handles.empty ()) {
+        conn->CloseConn ();
+        num_closed++;
+      }
+    }
+    /* *INDENT-ON* */
+
+    if (priv->conn_map.size () == num_closed) {
+      GST_DEBUG_OBJECT (server, "All connections were closed");
+      klass->terminate (server);
+    }
+
+    return;
+  }
+
+  if (priv->conn_map.empty ()) {
+    GST_LOG_OBJECT (server, "Have no connection");
+    return;
+  }
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  if (!priv->data)
+    return;
+
+  /* *INDENT-OFF* */
+  std::vector < std::shared_ptr < GstCudaIpcServerConn >> to_config_data;
+  std::vector < std::shared_ptr < GstCudaIpcServerConn >> to_send_have_data;
+  for (auto it : priv->conn_map) {
+    auto conn = it.second;
+    if (!conn->configured) {
+      conn->configured = true;
+      conn->data = priv->data;
+      to_config_data.push_back (conn);
+    } else if (conn->pending_have_data && conn->seq_num <= priv->data->seq_num) {
+      conn->data = priv->data;
+      to_send_have_data.push_back (conn);
+    }
+  }
+  lk.unlock ();
+
+  for (auto it: to_config_data)
+    gst_cuda_ipc_server_config_data (server, it.get ());
+
+  for (auto it: to_send_have_data)
+    gst_cuda_ipc_server_have_data (server, it.get ());
+  /* *INDENT-ON* */
+}
+
+void
+gst_cuda_ipc_server_abort (GstCudaIpcServer * server)
+{
+  GstCudaIpcServerPrivate *priv = server->priv;
+
+  priv->aborted = true;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcserver.h Added

@@ -0,0 +1,173 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/cuda/gstcuda.h>
+#include "gstcudaipc.h"
+#include <memory>
+#include <vector>
+#include <string.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_CUDA_IPC_SERVER             (gst_cuda_ipc_server_get_type())
+#define GST_CUDA_IPC_SERVER(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CUDA_IPC_SERVER,GstCudaIpcServer))
+#define GST_CUDA_IPC_SERVER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CUDA_IPC_SERVER,GstCudaIpcServerClass))
+#define GST_CUDA_IPC_SERVER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_CUDA_IPC_SERVER,GstCudaIpcServerClass))
+#define GST_IS_CUDA_IPC_SERVER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CUDA_IPC_SERVER))
+#define GST_IS_CUDA_IPC_SERVER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_CUDA_IPC_SERVER))
+
+struct GstCudaIpcServerData;
+struct GstCudaIpcServerConn;
+struct GstCudaIpcServerPrivate;
+
+enum GstCudaIpcMode
+{
+  GST_CUDA_IPC_LEGACY,
+  GST_CUDA_IPC_MMAP,
+};
+
+#define GST_TYPE_CUDA_IPC_MODE (gst_cuda_ipc_mode_get_type())
+GType gst_cuda_ipc_mode_get_type (void);
+
+struct GstCudaIpcServer
+{
+  GstObject parent;
+
+  GstCudaContext *context;
+  GstCudaIpcMode ipc_mode;
+  GstCudaPid pid;
+
+  GstCudaIpcServerPrivate *priv;
+};
+
+struct GstCudaIpcServerClass
+{
+  GstObjectClass parent_class;
+
+  void  (*loop)       (GstCudaIpcServer * server);
+
+  void  (*terminate)  (GstCudaIpcServer * server);
+
+  void  (*invoke)     (GstCudaIpcServer * server);
+
+  bool  (*wait_msg)   (GstCudaIpcServer * server,
+                       GstCudaIpcServerConn * conn);
+
+  bool  (*send_msg)   (GstCudaIpcServer * server,
+                       GstCudaIpcServerConn * conn);
+
+  bool  (*send_mmap_msg) (GstCudaIpcServer * server,
+                          GstCudaIpcServerConn * conn,
+                          GstCudaSharableHandle handle);
+};
+
+GType         gst_cuda_ipc_server_get_type (void);
+
+GstFlowReturn gst_cuda_ipc_server_send_data (GstCudaIpcServer * server,
+                                             GstSample * sample,
+                                             const GstVideoInfo & info,
+                                             const CUipcMemHandle & handle,
+                                             GstClockTime pts,
+                                             GByteArray * meta);
+
+GstFlowReturn gst_cuda_ipc_server_send_mmap_data (GstCudaIpcServer * server,
+                                                  GstSample * sample,
+                                                  const GstVideoInfo & info,
+                                                  GstCudaSharableHandle handle,
+                                                  GstClockTime pts,
+                                                  GByteArray * meta);
+
+
+void          gst_cuda_ipc_server_stop      (GstCudaIpcServer * server);
+
+
+/* subclass methods */
+void gst_cuda_ipc_server_run (GstCudaIpcServer * server);
+
+void gst_cuda_ipc_server_wait_msg_finish (GstCudaIpcServer * server,
+                                          GstCudaIpcServerConn * conn,
+                                          bool result);
+
+void gst_cuda_ipc_server_send_msg_finish (GstCudaIpcServer * server,
+                                          GstCudaIpcServerConn * conn,
+                                          bool result);
+
+void gst_cuda_ipc_server_on_incoming_connection (GstCudaIpcServer * server,
+                                                 std::shared_ptr<GstCudaIpcServerConn> conn);
+
+void gst_cuda_ipc_server_on_idle (GstCudaIpcServer * server);
+
+void gst_cuda_ipc_server_abort (GstCudaIpcServer * server);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstCudaIpcServer, gst_object_unref)
+
+G_END_DECLS
+
+struct GstCudaIpcServerData
+{
+  ~GstCudaIpcServerData ()
+  {
+    if (sample)
+      gst_sample_unref (sample);
+  }
+
+  GstSample *sample;
+  GstVideoInfo info;
+  CUipcMemHandle handle;
+  GstCudaSharableHandle os_handle;
+  GstClockTime pts;
+  std::vector<guint8> meta;
+  guint64 seq_num;
+};
+
+struct GstCudaIpcServerConn : public OVERLAPPED
+{
+  GstCudaIpcServerConn ()
+  {
+    client_msg.resize (GST_CUDA_IPC_PKT_HEADER_SIZE);
+    server_msg.resize (GST_CUDA_IPC_PKT_HEADER_SIZE);
+  }
+
+  virtual ~GstCudaIpcServerConn()
+  {
+    gst_clear_object (&context);
+    gst_clear_caps (&caps);
+  }
+
+  virtual void CloseConn () = 0;
+
+  GstCudaIpcServer *server;
+
+  GstCudaContext *context = nullptr;
+
+  GstCudaIpcPktType type;
+  std::vector<guint8> client_msg;
+  std::vector<guint8> server_msg;
+  std::shared_ptr<GstCudaIpcServerData> data;
+  std::vector<std::shared_ptr<GstCudaIpcServerData>> peer_handles;
+  GstCaps *caps = nullptr;
+  guint64 seq_num = 0;
+  guint id;
+  bool eos = false;
+  bool pending_have_data = false;
+  bool configured = false;
+};

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcserver_unix.cpp Added

@@ -0,0 +1,406 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudaipcserver_unix.h"
+#include <string.h>
+#include <string>
+
+#include <gio/gunixsocketaddress.h>
+#include <gio/gunixconnection.h>
+#include <glib/gstdio.h>
+
+GST_DEBUG_CATEGORY_EXTERN (cuda_ipc_server_debug);
+#define GST_CAT_DEFAULT cuda_ipc_server_debug
+
+/* *INDENT-OFF* */
+struct GstCudaIpcServerConnUnix : public GstCudaIpcServerConn
+{
+  GstCudaIpcServerConnUnix (GSocketConnection * conn)
+  {
+    socket_conn = (GSocketConnection *) g_object_ref (conn);
+    istream = g_io_stream_get_input_stream (G_IO_STREAM (socket_conn));
+    ostream = g_io_stream_get_output_stream (G_IO_STREAM (socket_conn));
+  }
+
+  ~GstCudaIpcServerConnUnix ()
+  {
+    g_clear_object (&socket_conn);
+  }
+
+  void CloseConn ()
+  {
+    if (socket_conn)
+      g_io_stream_close (G_IO_STREAM (socket_conn), nullptr, nullptr);
+  }
+
+  /* Holds ref */
+  GSocketConnection *socket_conn = nullptr;
+
+  /* Owned by socket_conn */
+  GInputStream *istream;
+  GOutputStream *ostream;
+};
+struct GstCudaIpcServerUnixPrivate
+{
+  GstCudaIpcServerUnixPrivate ()
+  {
+    main_context = g_main_context_new ();
+    main_loop = g_main_loop_new (main_context, FALSE);
+    cancellable = g_cancellable_new ();
+  }
+
+  ~GstCudaIpcServerUnixPrivate ()
+  {
+    g_main_loop_unref (main_loop);
+    g_main_context_unref (main_context);
+    g_object_unref (cancellable);
+  }
+
+  std::string address;
+  GMainLoop *main_loop;
+  GMainContext *main_context;
+  GCancellable *cancellable;
+};
+/* *INDENT-ON* */
+
+struct _GstCudaIpcServerUnix
+{
+  GstCudaIpcServer parent;
+
+  GstCudaIpcServerUnixPrivate *priv;
+};
+
+static void gst_cuda_ipc_server_unix_finalize (GObject * object);
+static void gst_cuda_ipc_server_unix_loop (GstCudaIpcServer * server);
+static void gst_cuda_ipc_server_unix_terminate (GstCudaIpcServer * server);
+static void gst_cuda_ipc_server_unix_invoke (GstCudaIpcServer * server);
+static bool gst_cuda_ipc_server_unix_wait_msg (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn);
+static bool gst_cuda_ipc_server_unix_send_msg (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn);
+static bool gst_cuda_ipc_server_unix_send_mmap_msg (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn, GstCudaSharableHandle handle);
+
+#define gst_cuda_ipc_server_unix_parent_class parent_class
+G_DEFINE_TYPE (GstCudaIpcServerUnix,
+    gst_cuda_ipc_server_unix, GST_TYPE_CUDA_IPC_SERVER);
+
+static void
+gst_cuda_ipc_server_unix_class_init (GstCudaIpcServerUnixClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstCudaIpcServerClass *server_class = GST_CUDA_IPC_SERVER_CLASS (klass);
+
+  object_class->finalize = gst_cuda_ipc_server_unix_finalize;
+
+  server_class->loop = GST_DEBUG_FUNCPTR (gst_cuda_ipc_server_unix_loop);
+  server_class->terminate =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_server_unix_terminate);
+  server_class->invoke = GST_DEBUG_FUNCPTR (gst_cuda_ipc_server_unix_invoke);
+  server_class->wait_msg =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_server_unix_wait_msg);
+  server_class->send_msg =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_server_unix_send_msg);
+  server_class->send_mmap_msg =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_server_unix_send_mmap_msg);
+}
+
+static void
+gst_cuda_ipc_server_unix_init (GstCudaIpcServerUnix * self)
+{
+  self->priv = new GstCudaIpcServerUnixPrivate ();
+}
+
+static void
+gst_cuda_ipc_server_unix_finalize (GObject * object)
+{
+  GstCudaIpcServerUnix *self = GST_CUDA_IPC_SERVER_UNIX (object);
+
+  GST_DEBUG_OBJECT (self, "finalize");
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_cuda_ipc_server_unix_terminate (GstCudaIpcServer * server)
+{
+  GstCudaIpcServerUnix *self = GST_CUDA_IPC_SERVER_UNIX (server);
+  GstCudaIpcServerUnixPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "terminate");
+
+  g_main_loop_quit (priv->main_loop);
+}
+
+static gboolean
+gst_cuda_ipc_server_invoke_func (GstCudaIpcServer * server)
+{
+  gst_cuda_ipc_server_on_idle (server);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+gst_cuda_ipc_server_unix_invoke (GstCudaIpcServer * server)
+{
+  GstCudaIpcServerUnix *self = GST_CUDA_IPC_SERVER_UNIX (server);
+  GstCudaIpcServerUnixPrivate *priv = self->priv;
+
+  g_main_context_invoke (priv->main_context,
+      (GSourceFunc) gst_cuda_ipc_server_invoke_func, server);
+}
+
+static void
+gst_cuda_ipc_server_unix_payload_finish (GObject * source,
+    GAsyncResult * result, GstCudaIpcServerConnUnix * conn)
+{
+  GstCudaIpcServer *server = conn->server;
+  gsize size;
+  GError *err = nullptr;
+  bool ret = true;
+
+  if (!g_input_stream_read_all_finish (conn->istream, result, &size, &err)) {
+    GST_WARNING_OBJECT (server, "Read failed with %s, conn-id: %u",
+        err->message, conn->id);
+    g_clear_error (&err);
+    ret = false;
+  }
+
+  gst_cuda_ipc_server_wait_msg_finish (server, conn, ret);
+}
+
+static void
+gst_cuda_ipc_server_unix_wait_msg_finish (GObject * source,
+    GAsyncResult * result, GstCudaIpcServerConnUnix * conn)
+{
+  GstCudaIpcServerUnix *self = GST_CUDA_IPC_SERVER_UNIX (conn->server);
+  GstCudaIpcServerUnixPrivate *priv = self->priv;
+  gsize size;
+  GError *err = nullptr;
+  GstCudaIpcPacketHeader header;
+
+  if (!g_input_stream_read_all_finish (conn->istream, result, &size, &err)) {
+    GST_WARNING_OBJECT (self, "Read failed with %s, conn-id: %u",
+        err->message, conn->id);
+    g_clear_error (&err);
+    gst_cuda_ipc_server_wait_msg_finish (conn->server, conn, false);
+    return;
+  }
+
+  if (!gst_cuda_ipc_pkt_identify (conn->client_msg, header)) {
+    GST_ERROR_OBJECT (self, "Broken header, conn-id: %u", conn->id);
+    gst_cuda_ipc_server_wait_msg_finish (conn->server, conn, false);
+    return;
+  }
+
+  if (header.payload_size == 0) {
+    gst_cuda_ipc_server_wait_msg_finish (conn->server, conn, true);
+    return;
+  }
+
+  GST_LOG_OBJECT (self, "Reading payload");
+
+  g_input_stream_read_all_async (conn->istream, &conn->client_msg0 +
+      GST_CUDA_IPC_PKT_HEADER_SIZE, header.payload_size, G_PRIORITY_DEFAULT,
+      priv->cancellable,
+      (GAsyncReadyCallback) gst_cuda_ipc_server_unix_payload_finish, conn);
+}
+
+static bool
+gst_cuda_ipc_server_unix_wait_msg (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn)
+{
+  GstCudaIpcServerUnix *self = GST_CUDA_IPC_SERVER_UNIX (conn->server);
+  GstCudaIpcServerUnixPrivate *priv = self->priv;
+  GstCudaIpcServerConnUnix *unix_conn =
+      static_cast < GstCudaIpcServerConnUnix * >(conn);
+
+  GST_LOG_OBJECT (self, "Waiting for client message");
+
+  g_input_stream_read_all_async (unix_conn->istream, &conn->client_msg0,
+      GST_CUDA_IPC_PKT_HEADER_SIZE, G_PRIORITY_DEFAULT, priv->cancellable,
+      (GAsyncReadyCallback) gst_cuda_ipc_server_unix_wait_msg_finish,
+      unix_conn);
+
+  return true;
+}
+
+static void
+gst_cuda_ipc_server_unix_send_msg_finish (GObject * source,
+    GAsyncResult * result, GstCudaIpcServerConnUnix * conn)
+{
+  GstCudaIpcServerUnix *self = GST_CUDA_IPC_SERVER_UNIX (conn->server);
+  gsize size;
+  GError *err = nullptr;
+
+  if (!g_output_stream_write_all_finish (conn->ostream, result, &size, &err)) {
+    GST_WARNING_OBJECT (self, "Write failed with %s, conn-id: %u",
+        err->message, conn->id);
+    g_clear_error (&err);
+    gst_cuda_ipc_server_send_msg_finish (conn->server, conn, false);
+    return;
+  }
+
+  GST_LOG_OBJECT (self, "Sent message");
+
+  gst_cuda_ipc_server_send_msg_finish (conn->server, conn, true);
+}
+
+static bool
+gst_cuda_ipc_server_unix_send_msg (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn)
+{
+  GstCudaIpcServerUnix *self = GST_CUDA_IPC_SERVER_UNIX (conn->server);
+  GstCudaIpcServerUnixPrivate *priv = self->priv;
+  GstCudaIpcServerConnUnix *unix_conn =
+      static_cast < GstCudaIpcServerConnUnix * >(conn);
+
+  GST_LOG_OBJECT (self, "Sending message");
+
+  g_output_stream_write_all_async (unix_conn->ostream, &conn->server_msg0,
+      conn->server_msg.size (), G_PRIORITY_DEFAULT, priv->cancellable,
+      (GAsyncReadyCallback) gst_cuda_ipc_server_unix_send_msg_finish,
+      unix_conn);
+
+  return true;
+}
+
+static bool
+gst_cuda_ipc_server_unix_send_mmap_msg (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn, GstCudaSharableHandle handle)
+{
+  GstCudaIpcServerUnix *self = GST_CUDA_IPC_SERVER_UNIX (conn->server);
+  GstCudaIpcServerUnixPrivate *priv = self->priv;
+  GstCudaIpcServerConnUnix *unix_conn =
+      static_cast < GstCudaIpcServerConnUnix * >(conn);
+  GError *err = nullptr;
+
+  GST_LOG_OBJECT (self, "Sending mmap message");
+
+  if (!g_output_stream_write_all (unix_conn->ostream, &conn->server_msg0,
+          conn->server_msg.size (), nullptr, priv->cancellable, &err)) {
+    GST_WARNING_OBJECT (self, "Couldn't write mmap data, %s", err->message);
+    g_clear_error (&err);
+    return false;
+  }
+
+  if (!g_unix_connection_send_fd (G_UNIX_CONNECTION (unix_conn->socket_conn),
+          handle, priv->cancellable, &err)) {
+    GST_WARNING ("Couldn't send fd, %s", err->message);
+    g_clear_error (&err);
+    return false;
+  }
+
+  gst_cuda_ipc_server_send_msg_finish (server, conn, true);
+
+  return true;
+}
+
+static gboolean
+gst_cuda_ipc_server_unix_on_incoming (GSocketService * service,
+    GSocketConnection * socket_conn, GObject * source_obj,
+    GstCudaIpcServer * self)
+{
+  GST_DEBUG_OBJECT (self, "Got new connection");
+
+  auto conn = std::make_shared < GstCudaIpcServerConnUnix > (socket_conn);
+  gst_cuda_ipc_server_on_incoming_connection (self, conn);
+
+  return TRUE;
+}
+
+static void
+gst_cuda_ipc_server_unix_loop (GstCudaIpcServer * server)
+{
+  GstCudaIpcServerUnix *self = GST_CUDA_IPC_SERVER_UNIX (server);
+  GstCudaIpcServerUnixPrivate *priv = self->priv;
+  GError *err = nullptr;
+  GSocketAddress *addr;
+  GSocketService *service;
+  gboolean ret;
+
+  g_main_context_push_thread_default (priv->main_context);
+
+  service = g_socket_service_new ();
+  addr = g_unix_socket_address_new (priv->address.c_str ());
+
+  GST_DEBUG_OBJECT (self, "Creating service with address \"%s\"",
+      priv->address.c_str ());
+
+  ret = g_socket_listener_add_address (G_SOCKET_LISTENER (service),
+      addr, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, nullptr,
+      nullptr, &err);
+  g_object_unref (addr);
+
+  if (!ret) {
+    GST_ERROR_OBJECT (self, "Setup failed, error: %s", err->message);
+    g_clear_error (&err);
+    g_clear_object (&service);
+    gst_cuda_ipc_server_abort (server);
+  } else {
+    g_signal_connect (service,
+        "incoming", G_CALLBACK (gst_cuda_ipc_server_unix_on_incoming), self);
+    g_socket_service_start (service);
+  }
+
+  GST_DEBUG_OBJECT (self, "Starting loop");
+
+  g_main_loop_run (priv->main_loop);
+
+  GST_DEBUG_OBJECT (self, "Loop stopped");
+
+  if (service) {
+    g_cancellable_cancel (priv->cancellable);
+    g_unlink (priv->address.c_str ());
+    g_clear_object (&service);
+  }
+
+  g_main_context_pop_thread_default (priv->main_context);
+}
+
+GstCudaIpcServer *
+gst_cuda_ipc_server_new (const gchar * address, GstCudaContext * context,
+    GstCudaIpcMode ipc_mode)
+{
+  GstCudaIpcServerUnix *self;
+  GstCudaIpcServer *server;
+
+  g_return_val_if_fail (address, nullptr);
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+
+  self = (GstCudaIpcServerUnix *)
+      g_object_new (GST_TYPE_CUDA_IPC_SERVER_UNIX, nullptr);
+  gst_object_ref_sink (self);
+
+  self->priv->address = address;
+  server = GST_CUDA_IPC_SERVER (self);
+  server->context = (GstCudaContext *) gst_object_ref (context);
+  server->ipc_mode = ipc_mode;
+  server->pid = getpid ();
+
+  gst_cuda_ipc_server_run (server);
+
+  return server;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcserver_unix.h Added

@@ -0,0 +1,34 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstcudaipcserver.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_CUDA_IPC_SERVER_UNIX (gst_cuda_ipc_server_unix_get_type())
+G_DECLARE_FINAL_TYPE (GstCudaIpcServerUnix, gst_cuda_ipc_server_unix,
+    GST, CUDA_IPC_SERVER_UNIX, GstCudaIpcServer);
+
+GstCudaIpcServer * gst_cuda_ipc_server_new (const gchar * address,
+                                            GstCudaContext * context,
+                                            GstCudaIpcMode ipc_mode);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcserver_win32.cpp Added

@@ -0,0 +1,446 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudaipcserver_win32.h"
+#include <string.h>
+#include <string>
+
+GST_DEBUG_CATEGORY_EXTERN (cuda_ipc_server_debug);
+#define GST_CAT_DEFAULT cuda_ipc_server_debug
+
+/* *INDENT-OFF* */
+struct GstCudaIpcServerConnWin32 : public GstCudaIpcServerConn
+{
+  GstCudaIpcServerConnWin32 (HANDLE pipe_handle) : pipe (pipe_handle)
+  {
+    OVERLAPPED *parent = static_cast<OVERLAPPED *> (this);
+    parent->Internal = 0;
+    parent->InternalHigh = 0;
+    parent->Offset = 0;
+    parent->OffsetHigh = 0;
+  }
+
+  virtual ~GstCudaIpcServerConnWin32 ()
+  {
+    CloseConn ();
+  }
+
+  void CloseConn ()
+  {
+    if (pipe != INVALID_HANDLE_VALUE) {
+      CancelIo (pipe);
+      DisconnectNamedPipe (pipe);
+      CloseHandle (pipe);
+      pipe = INVALID_HANDLE_VALUE;
+    }
+  }
+
+  HANDLE pipe = INVALID_HANDLE_VALUE;
+};
+
+struct GstCudaIpcServerWin32Private
+{
+  GstCudaIpcServerWin32Private ()
+  {
+    cancellable = CreateEvent (nullptr, TRUE, FALSE, nullptr);
+    wakeup_event = CreateEvent (nullptr, FALSE, FALSE, nullptr);
+  }
+
+  ~GstCudaIpcServerWin32Private ()
+  {
+    CloseHandle (cancellable);
+    CloseHandle (wakeup_event);
+  }
+
+  std::string address;
+  HANDLE cancellable;
+  HANDLE wakeup_event;
+};
+/* *INDENT-ON* */
+
+struct _GstCudaIpcServerWin32
+{
+  GstCudaIpcServer parent;
+
+  GstCudaIpcServerWin32Private *priv;
+};
+
+static void gst_cuda_ipc_server_win32_finalize (GObject * object);
+static void gst_cuda_ipc_server_win32_loop (GstCudaIpcServer * server);
+static void gst_cuda_ipc_server_win32_terminate (GstCudaIpcServer * server);
+static void gst_cuda_ipc_server_win32_invoke (GstCudaIpcServer * server);
+static bool gst_cuda_ipc_server_win32_wait_msg (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn);
+static bool gst_cuda_ipc_server_win32_send_msg (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn);
+
+#define gst_cuda_ipc_server_win32_parent_class parent_class
+G_DEFINE_TYPE (GstCudaIpcServerWin32,
+    gst_cuda_ipc_server_win32, GST_TYPE_CUDA_IPC_SERVER);
+
+static void
+gst_cuda_ipc_server_win32_class_init (GstCudaIpcServerWin32Class * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstCudaIpcServerClass *server_class = GST_CUDA_IPC_SERVER_CLASS (klass);
+
+  object_class->finalize = gst_cuda_ipc_server_win32_finalize;
+
+  server_class->loop = GST_DEBUG_FUNCPTR (gst_cuda_ipc_server_win32_loop);
+  server_class->terminate =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_server_win32_terminate);
+  server_class->invoke = GST_DEBUG_FUNCPTR (gst_cuda_ipc_server_win32_invoke);
+  server_class->wait_msg =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_server_win32_wait_msg);
+  server_class->send_msg =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_server_win32_send_msg);
+}
+
+static void
+gst_cuda_ipc_server_win32_init (GstCudaIpcServerWin32 * self)
+{
+  self->priv = new GstCudaIpcServerWin32Private ();
+}
+
+static void
+gst_cuda_ipc_server_win32_finalize (GObject * object)
+{
+  GstCudaIpcServerWin32 *self = GST_CUDA_IPC_SERVER_WIN32 (object);
+
+  GST_DEBUG_OBJECT (self, "finalize");
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_cuda_ipc_server_win32_terminate (GstCudaIpcServer * server)
+{
+  GstCudaIpcServerWin32 *self = GST_CUDA_IPC_SERVER_WIN32 (server);
+  GstCudaIpcServerWin32Private *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "terminate");
+
+  SetEvent (priv->cancellable);
+}
+
+static void
+gst_cuda_ipc_server_win32_invoke (GstCudaIpcServer * server)
+{
+  GstCudaIpcServerWin32 *self = GST_CUDA_IPC_SERVER_WIN32 (server);
+  GstCudaIpcServerWin32Private *priv = self->priv;
+
+  SetEvent (priv->wakeup_event);
+}
+
+static void WINAPI
+gst_cuda_ipc_server_win32_payload_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstCudaIpcServerConnWin32 *win32_conn =
+      static_cast < GstCudaIpcServerConnWin32 * >(overlap);
+  GstCudaIpcServerWin32 *self = GST_CUDA_IPC_SERVER_WIN32 (win32_conn->server);
+  bool ret = true;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_cuda_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (self, "ReadFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    ret = false;
+  }
+
+  gst_cuda_ipc_server_wait_msg_finish (win32_conn->server, win32_conn, ret);
+}
+
+static void WINAPI
+gst_cuda_ipc_server_win32_wait_msg_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstCudaIpcServerConnWin32 *win32_conn =
+      static_cast < GstCudaIpcServerConnWin32 * >(overlap);
+  GstCudaIpcServerWin32 *self = GST_CUDA_IPC_SERVER_WIN32 (win32_conn->server);
+  GstCudaIpcPacketHeader header;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_cuda_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (self, "ReadFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    gst_cuda_ipc_server_wait_msg_finish (win32_conn->server, win32_conn, false);
+    return;
+  }
+
+  if (!gst_cuda_ipc_pkt_identify (win32_conn->client_msg, header)) {
+    GST_ERROR_OBJECT (self, "Broken header");
+    gst_cuda_ipc_server_wait_msg_finish (win32_conn->server, win32_conn, false);
+    return;
+  }
+
+  if (header.payload_size == 0) {
+    gst_cuda_ipc_server_wait_msg_finish (win32_conn->server, win32_conn, true);
+    return;
+  }
+
+  GST_LOG_OBJECT (self, "Reading payload");
+
+  if (!ReadFileEx (win32_conn->pipe, &win32_conn->client_msg0 +
+          GST_CUDA_IPC_PKT_HEADER_SIZE, header.payload_size, win32_conn,
+          gst_cuda_ipc_server_win32_payload_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_cuda_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (self, "ReadFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    gst_cuda_ipc_server_wait_msg_finish (win32_conn->server, win32_conn, false);
+  }
+}
+
+static bool
+gst_cuda_ipc_server_win32_wait_msg (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn)
+{
+  GstCudaIpcServerWin32 *self = GST_CUDA_IPC_SERVER_WIN32 (server);
+  GstCudaIpcServerConnWin32 *win32_conn =
+      static_cast < GstCudaIpcServerConnWin32 * >(conn);
+
+  GST_LOG_OBJECT (self, "Waiting for client message");
+
+  if (!ReadFileEx (win32_conn->pipe, &conn->client_msg0,
+          GST_CUDA_IPC_PKT_HEADER_SIZE, win32_conn,
+          gst_cuda_ipc_server_win32_wait_msg_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_cuda_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (self, "ReadFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    return false;
+  }
+
+  return true;
+}
+
+static void WINAPI
+gst_cuda_ipc_server_win32_send_msg_finish (DWORD error_code, DWORD size,
+    OVERLAPPED * overlap)
+{
+  GstCudaIpcServerConnWin32 *win32_conn =
+      static_cast < GstCudaIpcServerConnWin32 * >(overlap);
+  GstCudaIpcServerWin32 *self = GST_CUDA_IPC_SERVER_WIN32 (win32_conn->server);
+  bool ret = true;
+
+  if (error_code != ERROR_SUCCESS) {
+    auto err = gst_cuda_ipc_win32_error_to_string (error_code);
+    GST_WARNING_OBJECT (self, "ReadFileEx callback failed with 0x%x (%s)",
+        (guint) error_code, err.c_str ());
+    ret = false;
+  }
+
+  GST_LOG_OBJECT (self, "Sent message");
+
+  gst_cuda_ipc_server_send_msg_finish (win32_conn->server, win32_conn, ret);
+}
+
+static bool
+gst_cuda_ipc_server_win32_send_msg (GstCudaIpcServer * server,
+    GstCudaIpcServerConn * conn)
+{
+  GstCudaIpcServerWin32 *self = GST_CUDA_IPC_SERVER_WIN32 (server);
+  GstCudaIpcServerConnWin32 *win32_conn =
+      static_cast < GstCudaIpcServerConnWin32 * >(conn);
+
+  GST_LOG_OBJECT (self, "Sending message");
+
+  if (!WriteFileEx (win32_conn->pipe, &conn->server_msg0,
+          conn->server_msg.size (), win32_conn,
+          gst_cuda_ipc_server_win32_send_msg_finish)) {
+    guint last_err = GetLastError ();
+    auto err = gst_cuda_ipc_win32_error_to_string (last_err);
+    GST_WARNING_OBJECT (self, "WriteFileEx failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    return false;
+  }
+
+  return true;
+}
+
+static HANDLE
+gst_cuda_ipc_server_win32_create_pipe (GstCudaIpcServerWin32 * self,
+    OVERLAPPED * overlap, bool &io_pending)
+{
+  GstCudaIpcServerWin32Private *priv = self->priv;
+  HANDLE pipe = CreateNamedPipeA (priv->address.c_str (),
+      PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
+      PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
+      PIPE_UNLIMITED_INSTANCES, 1024, 1024, 5000, nullptr);
+
+  if (pipe == INVALID_HANDLE_VALUE) {
+    guint last_err = GetLastError ();
+    auto err = gst_cuda_ipc_win32_error_to_string (last_err);
+    GST_ERROR_OBJECT (self, "CreateNamedPipeA failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    return INVALID_HANDLE_VALUE;
+  }
+
+  if (ConnectNamedPipe (pipe, overlap)) {
+    guint last_err = GetLastError ();
+    auto err = gst_cuda_ipc_win32_error_to_string (last_err);
+    GST_ERROR_OBJECT (self, "ConnectNamedPipe failed with 0x%x (%s)",
+        last_err, err.c_str ());
+    return INVALID_HANDLE_VALUE;
+  }
+
+  io_pending = false;
+  guint last_err = GetLastError ();
+
+  switch (last_err) {
+    case ERROR_IO_PENDING:
+      io_pending = true;
+      break;
+    case ERROR_PIPE_CONNECTED:
+      SetEvent (overlap->hEvent);
+      break;
+    default:
+    {
+      auto err = gst_cuda_ipc_win32_error_to_string (last_err);
+      GST_ERROR_OBJECT (self, "ConnectNamedPipe failed with 0x%x (%s)",
+          last_err, err.c_str ());
+      CloseHandle (pipe);
+      return INVALID_HANDLE_VALUE;
+    }
+  }
+
+  return pipe;
+}
+
+static void
+gst_cuda_ipc_server_win32_loop (GstCudaIpcServer * server)
+{
+  GstCudaIpcServerWin32 *self = GST_CUDA_IPC_SERVER_WIN32 (server);
+  GstCudaIpcServerWin32Private *priv = self->priv;
+  bool io_pending = false;
+  guint wait_ret;
+  HANDLE pipe;
+  OVERLAPPED overlap;
+
+  GST_DEBUG_OBJECT (self, "Entering loop");
+
+  memset (&overlap, 0, sizeof (OVERLAPPED));
+
+  overlap.hEvent = CreateEvent (nullptr, TRUE, TRUE, nullptr);
+
+  pipe = gst_cuda_ipc_server_win32_create_pipe (self, &overlap, io_pending);
+  if (pipe == INVALID_HANDLE_VALUE) {
+    CloseHandle (overlap.hEvent);
+    gst_cuda_ipc_server_abort (server);
+    return;
+  }
+
+  HANDLE waitables =
+      { overlap.hEvent, priv->wakeup_event, priv->cancellable };
+
+  do {
+    wait_ret = WaitForMultipleObjectsEx (G_N_ELEMENTS (waitables), waitables,
+        FALSE, INFINITE, TRUE);
+
+    if (wait_ret == WAIT_OBJECT_0 + 2) {
+      GST_DEBUG_OBJECT (self, "Operation cancelled");
+      goto out;
+    }
+
+    switch (wait_ret) {
+      case WAIT_OBJECT_0:
+      {
+        DWORD n_bytes;
+
+        if (io_pending
+            && !GetOverlappedResult (pipe, &overlap, &n_bytes, FALSE)) {
+          guint last_err = GetLastError ();
+          auto err = gst_cuda_ipc_win32_error_to_string (last_err);
+          GST_WARNING_OBJECT (self, "GetOverlappedResult failed with 0x%x (%s)",
+              last_err, err.c_str ());
+          CloseHandle (pipe);
+          pipe = INVALID_HANDLE_VALUE;
+          break;
+        }
+
+        auto conn = std::make_shared < GstCudaIpcServerConnWin32 > (pipe);
+        pipe = INVALID_HANDLE_VALUE;
+        gst_cuda_ipc_server_on_incoming_connection (server, conn);
+
+        pipe = gst_cuda_ipc_server_win32_create_pipe (self,
+            &overlap, io_pending);
+        break;
+      }
+      case WAIT_IO_COMPLETION:
+        break;
+      case WAIT_OBJECT_0 + 1:
+        gst_cuda_ipc_server_on_idle (server);
+        break;
+      default:
+      {
+        guint last_err = GetLastError ();
+        auto err = gst_cuda_ipc_win32_error_to_string (last_err);
+        GST_ERROR_OBJECT (self,
+            "WaitForMultipleObjectsEx return 0x%x, last error 0x%x (%s)",
+            wait_ret, last_err, err.c_str ());
+        gst_cuda_ipc_server_abort (server);
+
+        goto out;
+      }
+    }
+  } while (true);
+
+out:
+  if (pipe != INVALID_HANDLE_VALUE) {
+    CancelIo (pipe);
+    DisconnectNamedPipe (pipe);
+    CloseHandle (pipe);
+  }
+
+  CloseHandle (overlap.hEvent);
+
+  GST_DEBUG_OBJECT (self, "Exit loop");
+}
+
+GstCudaIpcServer *
+gst_cuda_ipc_server_new (const gchar * address, GstCudaContext * context,
+    GstCudaIpcMode ipc_mode)
+{
+  GstCudaIpcServerWin32 *self;
+  GstCudaIpcServer *server;
+
+  g_return_val_if_fail (address, nullptr);
+  g_return_val_if_fail (GST_IS_CUDA_CONTEXT (context), nullptr);
+
+  self = (GstCudaIpcServerWin32 *)
+      g_object_new (GST_TYPE_CUDA_IPC_SERVER_WIN32, nullptr);
+  gst_object_ref_sink (self);
+
+  self->priv->address = address;
+  server = GST_CUDA_IPC_SERVER (self);
+  server->context = (GstCudaContext *) gst_object_ref (context);
+  server->ipc_mode = ipc_mode;
+  server->pid = GetCurrentProcessId ();
+
+  gst_cuda_ipc_server_run (server);
+
+  return server;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcserver_win32.h Added

@@ -0,0 +1,34 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstcudaipcserver.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_CUDA_IPC_SERVER_WIN32 (gst_cuda_ipc_server_win32_get_type())
+G_DECLARE_FINAL_TYPE (GstCudaIpcServerWin32, gst_cuda_ipc_server_win32,
+    GST, CUDA_IPC_SERVER_WIN32, GstCudaIpcServer);
+
+GstCudaIpcServer * gst_cuda_ipc_server_new (const gchar * address,
+                                            GstCudaContext * context,
+                                            GstCudaIpcMode ipc_mode);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcsink.cpp Added

@@ -0,0 +1,748 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-cudaipcsink
+ * @title: cudaipcsink
+ * @short_description: CUDA Inter Process Communication (IPC) sink
+ *
+ * cudaipcsink exports CUDA memory for connected cudaipcsrc elements to be able
+ * to import it
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 videotestsrc ! cudaupload ! cudaipcsink
+ * ```
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudaipcsink.h"
+#include "gstcudaformat.h"
+#include <gst/cuda/gstcuda-private.h>
+#include <mutex>
+#include <string>
+#include <vector>
+
+#ifdef G_OS_WIN32
+#include "gstcudaipcserver_win32.h"
+#else
+#include "gstcudaipcserver_unix.h"
+#endif
+
+GST_DEBUG_CATEGORY_STATIC (cuda_ipc_sink_debug);
+#define GST_CAT_DEFAULT cuda_ipc_sink_debug
+
+static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY, GST_CUDA_FORMATS) "; "
+        GST_VIDEO_CAPS_MAKE (GST_CUDA_FORMATS)));
+
+enum
+{
+  PROP_0,
+  PROP_DEVICE_ID,
+  PROP_ADDRESS,
+  PROP_IPC_MODE,
+};
+
+#define DEFAULT_DEVICE_ID -1
+#ifdef G_OS_WIN32
+#define DEFAULT_ADDRESS "\\\\.\\pipe\\gst.cuda.ipc"
+#else
+#define DEFAULT_ADDRESS "/tmp/gst.cuda.ipc"
+#endif
+#define DEFAULT_IPC_MODE GST_CUDA_IPC_LEGACY
+
+/* *INDENT-OFF* */
+struct GstCudaIpcSinkPrivate
+{
+  GstCudaIpcSinkPrivate ()
+  {
+    meta = g_byte_array_new ();
+  }
+
+  ~GstCudaIpcSinkPrivate ()
+  {
+    g_byte_array_unref (meta);
+  }
+
+  GstCudaContext *context = nullptr;
+  GstCudaStream *stream = nullptr;
+
+  GstBufferPool *fallback_pool = nullptr;
+  GstVideoInfo info;
+
+  GstCudaIpcServer *server = nullptr;
+  GstCaps *caps = nullptr;
+  GstSample *prepared_sample = nullptr;
+  GstVideoInfo mem_info;
+  CUipcMemHandle prepared_handle;
+  GstCudaSharableHandle prepared_os_handle;
+  GByteArray *meta;
+
+  std::mutex lock;
+
+  /* properties */
+  gint device_id = DEFAULT_DEVICE_ID;
+  std::string address = DEFAULT_ADDRESS;
+  GstCudaIpcMode ipc_mode = DEFAULT_IPC_MODE;
+  GstCudaIpcMode configured_ipc_mode = DEFAULT_IPC_MODE;
+};
+/* *INDENT-ON* */
+
+struct _GstCudaIpcSink
+{
+  GstBaseSink parent;
+
+  GstCudaIpcSinkPrivate *priv;
+};
+
+static void gst_cuda_ipc_sink_finalize (GObject * object);
+static void gst_cuda_ipc_sink_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_win32_video_sink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static GstClock *gst_cuda_ipc_sink_provide_clock (GstElement * elem);
+static void gst_cuda_ipc_sink_set_context (GstElement * elem,
+    GstContext * context);
+
+static gboolean gst_cuda_ipc_sink_start (GstBaseSink * sink);
+static gboolean gst_cuda_ipc_sink_stop (GstBaseSink * sink);
+static gboolean gst_cuda_ipc_sink_set_caps (GstBaseSink * sink, GstCaps * caps);
+static void gst_cuda_ipc_sink_get_time (GstBaseSink * sink,
+    GstBuffer * buf, GstClockTime * start, GstClockTime * end);
+static gboolean gst_cuda_ipc_sink_propose_allocation (GstBaseSink * sink,
+    GstQuery * query);
+static gboolean gst_cuda_ipc_sink_query (GstBaseSink * sink, GstQuery * query);
+static GstFlowReturn gst_cuda_ipc_sink_prepare (GstBaseSink * sink,
+    GstBuffer * buf);
+static GstFlowReturn gst_cuda_ipc_sink_render (GstBaseSink * sink,
+    GstBuffer * buf);
+
+#define gst_cuda_ipc_sink_parent_class parent_class
+G_DEFINE_TYPE (GstCudaIpcSink, gst_cuda_ipc_sink, GST_TYPE_BASE_SINK);
+
+static void
+gst_cuda_ipc_sink_class_init (GstCudaIpcSinkClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseSinkClass *sink_class = GST_BASE_SINK_CLASS (klass);
+
+  object_class->finalize = gst_cuda_ipc_sink_finalize;
+  object_class->set_property = gst_cuda_ipc_sink_set_property;
+  object_class->get_property = gst_win32_video_sink_get_property;
+
+  g_object_class_install_property (object_class, PROP_DEVICE_ID,
+      g_param_spec_int ("cuda-device-id", "CUDA Device ID",
+          "CUDA device id to use (-1 = auto)", -1, G_MAXINT, DEFAULT_DEVICE_ID,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_ADDRESS,
+      g_param_spec_string ("address", "Address",
+          "Server address. Specifies name of WIN32 named pipe "
+          "or unix domain socket path on Linux",
+          DEFAULT_ADDRESS, (GParamFlags) (G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS | GST_PARAM_MUTABLE_READY)));
+
+  g_object_class_install_property (object_class, PROP_IPC_MODE,
+      g_param_spec_enum ("ipc-mode", "IPC Mode",
+          "IPC mode to use", GST_TYPE_CUDA_IPC_MODE, DEFAULT_IPC_MODE,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  gst_element_class_set_static_metadata (element_class,
+      "CUDA IPC Sink", "Sink/Video",
+      "Send CUDA memory to peer cudaipcsrc elements",
+      "Seungha Yang <seungha@centricular.com>");
+  gst_element_class_add_static_pad_template (element_class, &sink_template);
+
+  element_class->provide_clock =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_sink_provide_clock);
+  element_class->set_context =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_sink_set_context);
+
+  sink_class->start = GST_DEBUG_FUNCPTR (gst_cuda_ipc_sink_start);
+  sink_class->stop = GST_DEBUG_FUNCPTR (gst_cuda_ipc_sink_stop);
+  sink_class->set_caps = GST_DEBUG_FUNCPTR (gst_cuda_ipc_sink_set_caps);
+  sink_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_sink_propose_allocation);
+  sink_class->query = GST_DEBUG_FUNCPTR (gst_cuda_ipc_sink_query);
+  sink_class->get_times = GST_DEBUG_FUNCPTR (gst_cuda_ipc_sink_get_time);
+  sink_class->prepare = GST_DEBUG_FUNCPTR (gst_cuda_ipc_sink_prepare);
+  sink_class->render = GST_DEBUG_FUNCPTR (gst_cuda_ipc_sink_render);
+
+  GST_DEBUG_CATEGORY_INIT (cuda_ipc_sink_debug, "cudaipcsink",
+      0, "cudaipcsink");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_CUDA_IPC_MODE, (GstPluginAPIFlags) 0);
+}
+
+static void
+gst_cuda_ipc_sink_init (GstCudaIpcSink * self)
+{
+  self->priv = new GstCudaIpcSinkPrivate ();
+
+  GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_PROVIDE_CLOCK);
+  GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_REQUIRE_CLOCK);
+}
+
+static void
+gst_cuda_ipc_sink_finalize (GObject * object)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_cuda_ipc_sink_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (object);
+  GstCudaIpcSinkPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_DEVICE_ID:
+      priv->device_id = g_value_get_int (value);
+      break;
+    case PROP_ADDRESS:
+    {
+      const gchar *address = g_value_get_string (value);
+      priv->address.clear ();
+
+      if (address)
+        priv->address = address;
+      break;
+    }
+    case PROP_IPC_MODE:
+      priv->ipc_mode = (GstCudaIpcMode) g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_win32_video_sink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (object);
+  GstCudaIpcSinkPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_DEVICE_ID:
+      g_value_set_int (value, priv->device_id);
+      break;
+    case PROP_ADDRESS:
+      g_value_set_string (value, priv->address.c_str ());
+      break;
+    case PROP_IPC_MODE:
+      g_value_set_enum (value, priv->ipc_mode);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstClock *
+gst_cuda_ipc_sink_provide_clock (GstElement * elem)
+{
+  return gst_system_clock_obtain ();
+}
+
+static void
+gst_cuda_ipc_sink_set_context (GstElement * elem, GstContext * context)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (elem);
+  GstCudaIpcSinkPrivate *priv = self->priv;
+
+  gst_cuda_handle_set_context (elem, context, priv->device_id, &priv->context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (elem, context);
+}
+
+static gboolean
+gst_cuda_ipc_sink_start (GstBaseSink * sink)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (sink);
+  GstCudaIpcSinkPrivate *priv = self->priv;
+  gboolean virtual_memory = FALSE;
+  gboolean os_handle = FALSE;
+
+  GST_DEBUG_OBJECT (self, "Start");
+
+  if (!gst_cuda_ensure_element_context (GST_ELEMENT_CAST (self),
+          priv->device_id, &priv->context)) {
+    GST_ERROR_OBJECT (self, "Couldn't get CUDA context");
+    return FALSE;
+  }
+
+  g_object_get (priv->context, "virtual-memory", &virtual_memory,
+      "os-handle", &os_handle, nullptr);
+
+  GST_DEBUG_OBJECT (self,
+      "virtual-memory: %d, OS-handle: %d, requested IPC mode: %d",
+      virtual_memory, os_handle, priv->ipc_mode);
+
+  priv->configured_ipc_mode = priv->ipc_mode;
+  if (priv->configured_ipc_mode == GST_CUDA_IPC_MMAP &&
+      (!virtual_memory || !os_handle)) {
+    GST_ELEMENT_WARNING (self, RESOURCE, SETTINGS, ("Not supported IPC mode"),
+        ("MMAP mode IPC is not supported by device"));
+    priv->configured_ipc_mode = GST_CUDA_IPC_LEGACY;
+  }
+
+  GST_DEBUG_OBJECT (self, "Selected IPC mode: %d", priv->configured_ipc_mode);
+
+  priv->server = gst_cuda_ipc_server_new (priv->address.c_str (),
+      priv->context, priv->configured_ipc_mode);
+  if (!priv->server) {
+    gst_clear_object (&priv->context);
+    GST_ERROR_OBJECT (self, "Couldn't create server object");
+    return FALSE;
+  }
+
+  priv->stream = gst_cuda_stream_new (priv->context);
+
+  return TRUE;
+}
+
+static gboolean
+gst_cuda_ipc_sink_stop (GstBaseSink * sink)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (sink);
+  GstCudaIpcSinkPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  if (priv->server)
+    gst_cuda_ipc_server_stop (priv->server);
+  gst_clear_object (&priv->server);
+
+  GST_DEBUG_OBJECT (self, "Server cleared");
+
+  if (priv->fallback_pool) {
+    gst_buffer_pool_set_active (priv->fallback_pool, FALSE);
+    gst_clear_object (&priv->fallback_pool);
+  }
+
+  gst_clear_sample (&priv->prepared_sample);
+  gst_clear_cuda_stream (&priv->stream);
+  gst_clear_object (&priv->context);
+
+  return TRUE;
+}
+
+static void
+gst_cuda_ipc_sink_get_time (GstBaseSink * sink, GstBuffer * buf,
+    GstClockTime * start, GstClockTime * end)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (sink);
+  GstCudaIpcSinkPrivate *priv = self->priv;
+  GstClockTime timestamp;
+
+  timestamp = GST_BUFFER_PTS (buf);
+  if (!GST_CLOCK_TIME_IS_VALID (timestamp))
+    timestamp = GST_BUFFER_DTS (buf);
+
+  if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
+    *start = timestamp;
+    if (GST_BUFFER_DURATION_IS_VALID (buf)) {
+      *end = timestamp + GST_BUFFER_DURATION (buf);
+    } else if (priv->info.fps_n > 0) {
+      *end = timestamp +
+          gst_util_uint64_scale_int (GST_SECOND, priv->info.fps_d,
+          priv->info.fps_n);
+    } else if (sink->segment.rate < 0) {
+      *end = timestamp;
+    }
+  }
+}
+
+static gboolean
+gst_cuda_ipc_sink_set_caps (GstBaseSink * sink, GstCaps * caps)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (sink);
+  GstCudaIpcSinkPrivate *priv = self->priv;
+  GstStructure *config;
+  GstCaps *new_caps;
+  GstStructure *s;
+  const gchar *str;
+
+  GST_DEBUG_OBJECT (self, "New caps %" GST_PTR_FORMAT, caps);
+
+  if (!gst_video_info_from_caps (&priv->info, caps)) {
+    GST_ERROR_OBJECT (self, "Invalid caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+
+  s = gst_caps_get_structure (caps, 0);
+
+  /* Takes values we know it's always deserializable */
+  new_caps = gst_caps_new_empty_simple ("video/x-raw");
+  gst_caps_set_simple (new_caps, "format", G_TYPE_STRING,
+      gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&priv->info)),
+      "width", G_TYPE_INT, priv->info.width,
+      "height", G_TYPE_INT, priv->info.height,
+      "framerate", GST_TYPE_FRACTION, priv->info.fps_n, priv->info.fps_d,
+      "pixel-aspect-ratio", GST_TYPE_FRACTION, priv->info.par_n,
+      priv->info.par_d, nullptr);
+
+  str = gst_structure_get_string (s, "colorimetry");
+  if (str)
+    gst_caps_set_simple (new_caps, "colorimetry", G_TYPE_STRING, str, nullptr);
+
+  str = gst_structure_get_string (s, "mastering-display-info");
+  if (str) {
+    gst_caps_set_simple (new_caps, "mastering-display-info", G_TYPE_STRING,
+        str, nullptr);
+  }
+
+  str = gst_structure_get_string (s, "content-light-level");
+  if (str) {
+    gst_caps_set_simple (new_caps, "content-light-level", G_TYPE_STRING,
+        str, nullptr);
+  }
+
+  gst_caps_set_features_simple (new_caps,
+      gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY, nullptr));
+
+  gst_clear_caps (&priv->caps);
+  priv->caps = new_caps;
+
+  if (priv->fallback_pool) {
+    gst_buffer_pool_set_active (priv->fallback_pool, FALSE);
+    gst_object_unref (priv->fallback_pool);
+  }
+
+  priv->fallback_pool = gst_cuda_buffer_pool_new (priv->context);
+  config = gst_buffer_pool_get_config (priv->fallback_pool);
+
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+  gst_buffer_pool_config_set_params (config, priv->caps,
+      GST_VIDEO_INFO_SIZE (&priv->info), 0, 0);
+  if (priv->stream)
+    gst_buffer_pool_config_set_cuda_stream (config, priv->stream);
+
+  if (priv->configured_ipc_mode == GST_CUDA_IPC_MMAP) {
+    gst_buffer_pool_config_set_cuda_alloc_method (config,
+        GST_CUDA_MEMORY_ALLOC_MMAP);
+  }
+
+  if (!gst_buffer_pool_set_config (priv->fallback_pool, config)) {
+    GST_ERROR_OBJECT (self, "Couldn't set pool config");
+    gst_clear_object (&priv->fallback_pool);
+    return FALSE;
+  }
+
+  if (!gst_buffer_pool_set_active (priv->fallback_pool, TRUE)) {
+    GST_ERROR_OBJECT (self, "Couldn't active pool");
+    gst_clear_object (&priv->fallback_pool);
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_cuda_ipc_sink_propose_allocation (GstBaseSink * sink, GstQuery * query)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (sink);
+  GstCudaIpcSinkPrivate *priv = self->priv;
+  GstCaps *caps;
+  GstBufferPool *pool = nullptr;
+  GstVideoInfo info;
+  guint size;
+  gboolean need_pool;
+
+  gst_query_parse_allocation (query, &caps, &need_pool);
+  if (!caps) {
+    GST_WARNING_OBJECT (sink, "No caps specified");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_WARNING_OBJECT (sink, "Invalid caps %" GST_PTR_FORMAT, caps);
+    return FALSE;
+  }
+
+  /* the normal size of a frame */
+  size = info.size;
+  if (need_pool) {
+    GstStructure *config;
+
+    pool = gst_cuda_buffer_pool_new (priv->context);
+
+    config = gst_buffer_pool_get_config (pool);
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
+    if (priv->stream)
+      gst_buffer_pool_config_set_cuda_stream (config, priv->stream);
+
+    if (priv->configured_ipc_mode == GST_CUDA_IPC_MMAP) {
+      gst_buffer_pool_config_set_cuda_alloc_method (config,
+          GST_CUDA_MEMORY_ALLOC_MMAP);
+    }
+
+    size = GST_VIDEO_INFO_SIZE (&info);
+    gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
+
+    if (!gst_buffer_pool_set_config (pool, config)) {
+      GST_ERROR_OBJECT (pool, "Couldn't set config");
+      gst_object_unref (pool);
+
+      return FALSE;
+    }
+  }
+
+  gst_query_add_allocation_pool (query, pool, size, 0, 0);
+  gst_clear_object (&pool);
+
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);
+
+  return TRUE;
+}
+
+static gboolean
+gst_cuda_ipc_sink_query (GstBaseSink * sink, GstQuery * query)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (sink);
+  GstCudaIpcSinkPrivate *priv = self->priv;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      if (gst_cuda_handle_context_query (GST_ELEMENT (self), query,
+              priv->context)) {
+        return TRUE;
+      }
+      break;
+    default:
+      break;
+  }
+
+  return GST_BASE_SINK_CLASS (parent_class)->query (sink, query);
+}
+
+static gboolean
+gst_cuda_ipc_sink_foreach_meta (GstBuffer * buffer, GstMeta ** meta,
+    GstCudaIpcSink * self)
+{
+  auto priv = self->priv;
+
+  if (!gst_meta_info_is_custom ((*meta)->info))
+    return TRUE;
+
+  gst_meta_serialize_simple (*meta, priv->meta);
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_cuda_ipc_sink_prepare (GstBaseSink * sink, GstBuffer * buf)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (sink);
+  GstCudaIpcSinkPrivate *priv = self->priv;
+  GstBuffer *cuda_buf;
+  GstMemory *mem;
+  GstCudaMemory *cmem;
+  GstMapInfo info;
+  CUresult ret;
+  CUdeviceptr ptr;
+  std::string handle_dump;
+
+  gst_clear_sample (&priv->prepared_sample);
+
+  cuda_buf = buf;
+  mem = gst_buffer_peek_memory (cuda_buf, 0);
+  if (!gst_is_cuda_memory (mem) ||
+      GST_CUDA_MEMORY_CAST (mem)->context != priv->context) {
+    if (gst_buffer_pool_acquire_buffer (priv->fallback_pool, &cuda_buf,
+            nullptr) != GST_FLOW_OK) {
+      GST_ERROR_OBJECT (self, "Couldn't acquire fallback buffer");
+      return GST_FLOW_ERROR;
+    }
+
+    if (!gst_cuda_buffer_copy (cuda_buf, GST_CUDA_BUFFER_COPY_CUDA,
+            &priv->info, buf, GST_CUDA_BUFFER_COPY_SYSTEM, &priv->info,
+            priv->context, priv->stream)) {
+      GST_ERROR_OBJECT (self, "Couldn't copy memory");
+      goto error;
+    }
+
+    mem = gst_buffer_peek_memory (cuda_buf, 0);
+  } else {
+    GstCudaMemory *cmem = GST_CUDA_MEMORY_CAST (mem);
+    GstCudaMemoryAllocMethod alloc_method =
+        gst_cuda_memory_get_alloc_method (cmem);
+
+    /* Copy into fallback pool if the memory belongs to fixed size buffer pool
+     * (e.g., decoder output) or mem allocation type is different */
+    if (gst_cuda_memory_is_from_fixed_pool (mem) ||
+        (priv->configured_ipc_mode == GST_CUDA_IPC_MMAP &&
+            alloc_method != GST_CUDA_MEMORY_ALLOC_MMAP) ||
+        (priv->configured_ipc_mode == GST_CUDA_IPC_LEGACY &&
+            alloc_method != GST_CUDA_MEMORY_ALLOC_MALLOC)) {
+      if (gst_buffer_pool_acquire_buffer (priv->fallback_pool, &cuda_buf,
+              nullptr) != GST_FLOW_OK) {
+        GST_ERROR_OBJECT (self, "Couldn't acquire fallback buffer");
+        return GST_FLOW_ERROR;
+      }
+
+      if (!gst_cuda_buffer_copy (cuda_buf, GST_CUDA_BUFFER_COPY_CUDA,
+              &priv->info, buf, GST_CUDA_BUFFER_COPY_CUDA, &priv->info,
+              priv->context, priv->stream)) {
+        GST_ERROR_OBJECT (self, "Couldn't copy memory");
+        goto error;
+      }
+
+      mem = gst_buffer_peek_memory (cuda_buf, 0);
+    }
+  }
+
+  cmem = GST_CUDA_MEMORY_CAST (mem);
+  priv->mem_info = cmem->info;
+  if (!gst_memory_map (mem, &info, (GstMapFlags) (GST_MAP_READ | GST_MAP_CUDA))) {
+    GST_ERROR_OBJECT (self, "Couldn't map memory");
+    goto error;
+  }
+
+  ptr = (CUdeviceptr) info.data;
+  gst_memory_unmap (mem, &info);
+  gst_cuda_memory_sync (cmem);
+
+  if (priv->configured_ipc_mode == GST_CUDA_IPC_MMAP) {
+    if (!gst_cuda_memory_export (cmem, (void *) &priv->prepared_os_handle)) {
+      GST_ERROR_OBJECT (self, "Couldn't export memory");
+      goto error;
+    }
+  } else {
+    if (!gst_cuda_context_push (cmem->context)) {
+      GST_ERROR_OBJECT (self, "Couldn't push context");
+      goto error;
+    }
+
+    ret = CuIpcGetMemHandle (&priv->prepared_handle, ptr);
+    gst_cuda_context_pop (nullptr);
+
+    if (!gst_cuda_result (ret)) {
+      GST_ERROR_OBJECT (self, "Couldn't get IPC handle");
+      goto error;
+    }
+
+    handle_dump = gst_cuda_ipc_mem_handle_to_string (priv->prepared_handle);
+    GST_TRACE_OBJECT (self, "Exported handle value for %" G_GUINTPTR_FORMAT
+        " %s", ptr, handle_dump.c_str ());
+  }
+
+  priv->prepared_sample = gst_sample_new (cuda_buf,
+      priv->caps, nullptr, nullptr);
+
+  g_byte_array_set_size (priv->meta, 0);
+  gst_buffer_foreach_meta (buf,
+      (GstBufferForeachMetaFunc) gst_cuda_ipc_sink_foreach_meta, self);
+
+  if (cuda_buf != buf)
+    gst_buffer_unref (cuda_buf);
+
+  return GST_FLOW_OK;
+
+error:
+  if (cuda_buf != buf)
+    gst_buffer_unref (cuda_buf);
+
+  return GST_FLOW_ERROR;
+}
+
+static GstFlowReturn
+gst_cuda_ipc_sink_render (GstBaseSink * sink, GstBuffer * buf)
+{
+  GstCudaIpcSink *self = GST_CUDA_IPC_SINK (sink);
+  GstCudaIpcSinkPrivate *priv = self->priv;
+  GstClockTime pts;
+  GstClockTime now_system;
+  GstClockTime buf_pts;
+  GstClockTime buffer_clock = GST_CLOCK_TIME_NONE;
+  GstFlowReturn ret;
+
+  if (!priv->prepared_sample) {
+    GST_ERROR_OBJECT (self, "Have no prepared sample");
+    return GST_FLOW_ERROR;
+  }
+
+  pts = now_system = gst_util_get_timestamp ();
+  buf_pts = GST_BUFFER_PTS (buf);
+  if (!GST_CLOCK_TIME_IS_VALID (buf_pts))
+    buf_pts = GST_BUFFER_DTS (buf);
+
+  if (GST_CLOCK_TIME_IS_VALID (buf_pts)) {
+    buffer_clock = gst_segment_to_running_time (&sink->segment,
+        GST_FORMAT_TIME, buf_pts) +
+        GST_ELEMENT_CAST (sink)->base_time + gst_base_sink_get_latency (sink);
+  }
+
+  if (GST_CLOCK_TIME_IS_VALID (buffer_clock)) {
+    GstClock *clock = gst_element_get_clock (GST_ELEMENT_CAST (sink));
+    if (!gst_cuda_ipc_clock_is_system (clock)) {
+      GstClockTime now_gst = gst_clock_get_time (clock);
+      GstClockTimeDiff converted = buffer_clock;
+
+      converted -= now_gst;
+      converted += now_system;
+
+      if (converted < 0) {
+        /* Shouldn't happen */
+        GST_WARNING_OBJECT (self, "Negative buffer clock");
+        pts = 0;
+      } else {
+        pts = converted;
+      }
+    } else {
+      /* buffer clock is already system time */
+      pts = buffer_clock;
+    }
+    gst_object_unref (clock);
+  }
+
+  if (priv->ipc_mode == GST_CUDA_IPC_LEGACY) {
+    ret = gst_cuda_ipc_server_send_data (priv->server, priv->prepared_sample,
+        priv->mem_info, priv->prepared_handle, pts, priv->meta);
+  } else {
+    ret = gst_cuda_ipc_server_send_mmap_data (priv->server,
+        priv->prepared_sample, priv->mem_info, priv->prepared_os_handle, pts,
+        priv->meta);
+  }
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcsink.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/base/gstbasesink.h>
+#include <gst/video/video.h>
+#include <gst/cuda/gstcuda.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_CUDA_IPC_SINK (gst_cuda_ipc_sink_get_type())
+G_DECLARE_FINAL_TYPE (GstCudaIpcSink, gst_cuda_ipc_sink,
+    GST, CUDA_IPC_SINK, GstBaseSink);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcsrc.cpp Added

@@ -0,0 +1,570 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-cudaipcsrc
+ * @title: cudaipcsrc
+ * @short_description: CUDA Inter Process Communication (IPC) src
+ *
+ * cudaipcsrc imports CUDA memory exported by peer cudaipcsrc element
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 cudaipcsrc ! queue ! cudadownload ! videoconvert ! queue ! autovideosink
+ * ```
+ *
+ * Since: 1.24
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstcudaipcsrc.h"
+#include "gstcudaformat.h"
+#include <mutex>
+#include <string>
+
+#ifdef G_OS_WIN32
+#include "gstcudaipcclient_win32.h"
+#else
+#include "gstcudaipcclient_unix.h"
+#endif
+
+GST_DEBUG_CATEGORY_STATIC (gst_cuda_ipc_src_debug);
+#define GST_CAT_DEFAULT gst_cuda_ipc_src_debug
+
+static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+        (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY,
+            GST_CUDA_FORMATS)));
+
+enum
+{
+  PROP_0,
+  PROP_DEVICE_ID,
+  PROP_ADDRESS,
+  PROP_PROCESSING_DEADLINE,
+  PROP_IO_MODE,
+  PROP_CONN_TIMEOUT,
+  PROP_BUFFER_SIZE,
+};
+
+#define DEFAULT_DEVICE_ID -1
+#ifdef G_OS_WIN32
+#define DEFAULT_ADDRESS "\\\\.\\pipe\\gst.cuda.ipc"
+#else
+#define DEFAULT_ADDRESS "/tmp/gst.cuda.ipc"
+#endif
+#define DEFAULT_PROCESSING_DEADLINE (20 * GST_MSECOND)
+#define DEFAULT_IO_MODE GST_CUDA_IPC_IO_COPY
+#define DEFAULT_CONN_TIMEOUT 5
+#define DEFAULT_BUFFER_SIZE 3
+
+/* *INDENT-OFF* */
+struct GstCudaIpcSrcPrivate
+{
+  GstCudaContext *context = nullptr;
+  GstCudaStream *stream = nullptr;
+
+  GstCudaIpcClient *client = nullptr;
+  GstCaps *caps = nullptr;
+
+  GstVideoInfo info;
+  std::mutex lock;
+  bool flushing = false;
+
+  /* properties */
+  gint device_id = DEFAULT_DEVICE_ID;
+  std::string address = DEFAULT_ADDRESS;
+  GstClockTime processing_deadline = DEFAULT_PROCESSING_DEADLINE;
+  GstCudaIpcIOMode io_mode = DEFAULT_IO_MODE;
+  guint conn_timeout = DEFAULT_CONN_TIMEOUT;
+  guint buffer_size = DEFAULT_BUFFER_SIZE;
+};
+/* *INDENT-ON* */
+
+struct _GstCudaIpcSrc
+{
+  GstBaseSrc parent;
+
+  GstCudaIpcSrcPrivate *priv;
+};
+
+static void gst_cuda_ipc_src_finalize (GObject * object);
+static void gst_cuda_ipc_src_set_property (GObject * object,
+    guint prop_id, const GValue * value, GParamSpec * pspec);
+static void gst_win32_video_src_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static GstClock *gst_cuda_ipc_src_provide_clock (GstElement * elem);
+static void gst_cuda_ipc_src_set_context (GstElement * elem,
+    GstContext * context);
+
+static gboolean gst_cuda_ipc_src_start (GstBaseSrc * src);
+static gboolean gst_cuda_ipc_src_stop (GstBaseSrc * src);
+static gboolean gst_cuda_ipc_src_unlock (GstBaseSrc * src);
+static gboolean gst_cuda_ipc_src_unlock_stop (GstBaseSrc * src);
+static gboolean gst_cuda_ipc_src_query (GstBaseSrc * src, GstQuery * query);
+static GstCaps *gst_cuda_ipc_src_get_caps (GstBaseSrc * src, GstCaps * filter);
+static GstCaps *gst_cuda_ipc_src_fixate (GstBaseSrc * src, GstCaps * caps);
+static GstFlowReturn gst_cuda_ipc_src_create (GstBaseSrc * src, guint64 offset,
+    guint size, GstBuffer ** buf);
+
+#define gst_cuda_ipc_src_parent_class parent_class
+G_DEFINE_TYPE (GstCudaIpcSrc, gst_cuda_ipc_src, GST_TYPE_BASE_SRC);
+
+static void
+gst_cuda_ipc_src_class_init (GstCudaIpcSrcClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseSrcClass *src_class = GST_BASE_SRC_CLASS (klass);
+
+  object_class->finalize = gst_cuda_ipc_src_finalize;
+  object_class->set_property = gst_cuda_ipc_src_set_property;
+  object_class->get_property = gst_win32_video_src_get_property;
+
+  g_object_class_install_property (object_class, PROP_DEVICE_ID,
+      g_param_spec_int ("cuda-device-id", "CUDA Device ID",
+          "CUDA device id to use (-1 = auto)", -1, G_MAXINT, DEFAULT_DEVICE_ID,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_ADDRESS,
+      g_param_spec_string ("address", "Address",
+          "Server address. Specifies name of WIN32 named pipe "
+          "or unix domain socket path on Linux",
+          DEFAULT_ADDRESS, (GParamFlags) (G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS | GST_PARAM_MUTABLE_READY)));
+
+  g_object_class_install_property (object_class, PROP_PROCESSING_DEADLINE,
+      g_param_spec_uint64 ("processing-deadline", "Processing deadline",
+          "Maximum processing time for a buffer in nanoseconds", 0, G_MAXUINT64,
+          DEFAULT_PROCESSING_DEADLINE, (GParamFlags) (G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS | GST_PARAM_MUTABLE_PLAYING)));
+
+  g_object_class_install_property (object_class, PROP_IO_MODE,
+      g_param_spec_enum ("io-mode", "IO Mode",
+          "Memory I/O mode to use. This option will be ignored if the selected "
+          "IPC mode is mmap",
+          GST_TYPE_CUDA_IPC_IO_MODE, DEFAULT_IO_MODE,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_CONN_TIMEOUT,
+      g_param_spec_uint ("connection-timeout", "Connection Timeout",
+          "Connection timeout in seconds (0 = never timeout)", 0, G_MAXINT,
+          DEFAULT_CONN_TIMEOUT,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_BUFFER_SIZE,
+      g_param_spec_uint ("buffer-size", "Buffer Size",
+          "Size of internal buffer", 1, G_MAXINT,
+          DEFAULT_BUFFER_SIZE,
+          (GParamFlags) (G_PARAM_READWRITE | GST_PARAM_MUTABLE_READY |
+              G_PARAM_STATIC_STRINGS)));
+
+  gst_element_class_set_static_metadata (element_class,
+      "CUDA IPC Src", "Source/Video",
+      "Receive CUDA memory from the cudaipcsrc element",
+      "Seungha Yang <seungha@centricular.com>");
+  gst_element_class_add_static_pad_template (element_class, &src_template);
+
+  element_class->provide_clock =
+      GST_DEBUG_FUNCPTR (gst_cuda_ipc_src_provide_clock);
+  element_class->set_context = GST_DEBUG_FUNCPTR (gst_cuda_ipc_src_set_context);
+
+  src_class->start = GST_DEBUG_FUNCPTR (gst_cuda_ipc_src_start);
+  src_class->stop = GST_DEBUG_FUNCPTR (gst_cuda_ipc_src_stop);
+  src_class->unlock = GST_DEBUG_FUNCPTR (gst_cuda_ipc_src_unlock);
+  src_class->unlock_stop = GST_DEBUG_FUNCPTR (gst_cuda_ipc_src_unlock_stop);
+  src_class->query = GST_DEBUG_FUNCPTR (gst_cuda_ipc_src_query);
+  src_class->get_caps = GST_DEBUG_FUNCPTR (gst_cuda_ipc_src_get_caps);
+  src_class->fixate = GST_DEBUG_FUNCPTR (gst_cuda_ipc_src_fixate);
+  src_class->create = GST_DEBUG_FUNCPTR (gst_cuda_ipc_src_create);
+
+  GST_DEBUG_CATEGORY_INIT (gst_cuda_ipc_src_debug, "cudaipcsrc",
+      0, "cudaipcsrc");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_CUDA_IPC_IO_MODE,
+      (GstPluginAPIFlags) 0);
+}
+
+static void
+gst_cuda_ipc_src_init (GstCudaIpcSrc * self)
+{
+  gst_base_src_set_format (GST_BASE_SRC (self), GST_FORMAT_TIME);
+  gst_base_src_set_live (GST_BASE_SRC (self), TRUE);
+
+  self->priv = new GstCudaIpcSrcPrivate ();
+
+  GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_PROVIDE_CLOCK);
+  GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_REQUIRE_CLOCK);
+}
+
+static void
+gst_cuda_ipc_src_finalize (GObject * object)
+{
+  GstCudaIpcSrc *self = GST_CUDA_IPC_SRC (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_cuda_ipc_src_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstCudaIpcSrc *self = GST_CUDA_IPC_SRC (object);
+  GstCudaIpcSrcPrivate *priv = self->priv;
+  std::unique_lock < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_DEVICE_ID:
+      priv->device_id = g_value_get_int (value);
+      break;
+    case PROP_ADDRESS:
+    {
+      const gchar *address = g_value_get_string (value);
+      priv->address.clear ();
+
+      if (address)
+        priv->address = address;
+      break;
+    }
+    case PROP_PROCESSING_DEADLINE:
+    {
+      GstClockTime prev_val, new_val;
+      prev_val = priv->processing_deadline;
+      new_val = g_value_get_uint64 (value);
+      priv->processing_deadline = new_val;
+
+      if (prev_val != new_val) {
+        lk.unlock ();
+        GST_DEBUG_OBJECT (self, "Posting latency message");
+        gst_element_post_message (GST_ELEMENT_CAST (self),
+            gst_message_new_latency (GST_OBJECT_CAST (self)));
+      }
+      break;
+    }
+    case PROP_IO_MODE:
+      priv->io_mode = (GstCudaIpcIOMode) g_value_get_enum (value);
+      break;
+    case PROP_CONN_TIMEOUT:
+      priv->conn_timeout = g_value_get_uint (value);
+      break;
+    case PROP_BUFFER_SIZE:
+      priv->buffer_size = g_value_get_uint (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_win32_video_src_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstCudaIpcSrc *self = GST_CUDA_IPC_SRC (object);
+  GstCudaIpcSrcPrivate *priv = self->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  switch (prop_id) {
+    case PROP_DEVICE_ID:
+      g_value_set_int (value, priv->device_id);
+      break;
+    case PROP_ADDRESS:
+      g_value_set_string (value, priv->address.c_str ());
+      break;
+    case PROP_PROCESSING_DEADLINE:
+      g_value_set_uint64 (value, priv->processing_deadline);
+      break;
+    case PROP_IO_MODE:
+      g_value_set_enum (value, priv->io_mode);
+      break;
+    case PROP_CONN_TIMEOUT:
+      g_value_set_uint (value, priv->conn_timeout);
+      break;
+    case PROP_BUFFER_SIZE:
+      g_value_set_uint (value, priv->buffer_size);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstClock *
+gst_cuda_ipc_src_provide_clock (GstElement * elem)
+{
+  return gst_system_clock_obtain ();
+}
+
+static void
+gst_cuda_ipc_src_set_context (GstElement * elem, GstContext * context)
+{
+  GstCudaIpcSrc *self = GST_CUDA_IPC_SRC (elem);
+  GstCudaIpcSrcPrivate *priv = self->priv;
+
+  gst_cuda_handle_set_context (elem, context, priv->device_id, &priv->context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (elem, context);
+}
+
+static gboolean
+gst_cuda_ipc_src_start (GstBaseSrc * src)
+{
+  GstCudaIpcSrc *self = GST_CUDA_IPC_SRC (src);
+  GstCudaIpcSrcPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Start");
+
+  if (!gst_cuda_ensure_element_context (GST_ELEMENT_CAST (self),
+          priv->device_id, &priv->context)) {
+    GST_ERROR_OBJECT (self, "Couldn't get CUDA context");
+    return FALSE;
+  }
+
+  priv->stream = gst_cuda_stream_new (priv->context);
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->client = gst_cuda_ipc_client_new (priv->address.c_str (), priv->context,
+      priv->stream, priv->io_mode, priv->conn_timeout, priv->buffer_size - 1);
+
+  return TRUE;
+}
+
+static gboolean
+gst_cuda_ipc_src_stop (GstBaseSrc * src)
+{
+  GstCudaIpcSrc *self = GST_CUDA_IPC_SRC (src);
+  GstCudaIpcSrcPrivate *priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  if (priv->client)
+    gst_cuda_ipc_client_stop (priv->client);
+
+  gst_clear_object (&priv->client);
+  gst_clear_cuda_stream (&priv->stream);
+  gst_clear_object (&priv->context);
+  gst_clear_caps (&priv->caps);
+
+  return TRUE;
+}
+
+static gboolean
+gst_cuda_ipc_src_unlock (GstBaseSrc * src)
+{
+  GstCudaIpcSrc *self = GST_CUDA_IPC_SRC (src);
+  GstCudaIpcSrcPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Unlock");
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->flushing = true;
+  if (priv->client)
+    gst_cuda_ipc_client_set_flushing (priv->client, true);
+
+  GST_DEBUG_OBJECT (self, "Unlocked");
+
+  return TRUE;
+}
+
+static gboolean
+gst_cuda_ipc_src_unlock_stop (GstBaseSrc * src)
+{
+  GstCudaIpcSrc *self = GST_CUDA_IPC_SRC (src);
+  GstCudaIpcSrcPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Unlock stop");
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->flushing = false;
+  if (priv->client)
+    gst_cuda_ipc_client_set_flushing (priv->client, false);
+
+  GST_DEBUG_OBJECT (self, "Unlock stopped");
+
+  return TRUE;
+}
+
+static gboolean
+gst_cuda_ipc_src_query (GstBaseSrc * src, GstQuery * query)
+{
+  GstCudaIpcSrc *self = GST_CUDA_IPC_SRC (src);
+  GstCudaIpcSrcPrivate *priv = self->priv;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_LATENCY:
+    {
+      std::lock_guard < std::mutex > lk (priv->lock);
+      if (GST_CLOCK_TIME_IS_VALID (priv->processing_deadline)) {
+        gst_query_set_latency (query, TRUE, priv->processing_deadline,
+            GST_CLOCK_TIME_NONE);
+      } else {
+        gst_query_set_latency (query, TRUE, 0, 0);
+      }
+      return TRUE;
+    }
+    case GST_QUERY_CONTEXT:
+      if (gst_cuda_handle_context_query (GST_ELEMENT (self), query,
+              priv->context)) {
+        return TRUE;
+      }
+      break;
+    default:
+      break;
+  }
+
+  return GST_BASE_SRC_CLASS (parent_class)->query (src, query);
+}
+
+static GstCaps *
+gst_cuda_ipc_src_get_caps (GstBaseSrc * src, GstCaps * filter)
+{
+  GstCudaIpcSrc *self = GST_CUDA_IPC_SRC (src);
+  GstCudaIpcSrcPrivate *priv = self->priv;
+  GstCudaIpcClient *client = nullptr;
+  GstCaps *caps = nullptr;
+
+  GST_DEBUG_OBJECT (self, "Get caps");
+
+  priv->lock.lock ();
+  if (priv->caps)
+    caps = gst_caps_ref (priv->caps);
+  else if (priv->client)
+    client = (GstCudaIpcClient *) gst_object_ref (priv->client);
+  priv->lock.unlock ();
+
+  if (!caps && client)
+    caps = gst_cuda_ipc_client_get_caps (priv->client);
+
+  if (!caps)
+    caps = gst_pad_get_pad_template_caps (GST_BASE_SRC_PAD (src));
+
+  if (filter) {
+    GstCaps *tmp = gst_caps_intersect_full (filter,
+        caps, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (caps);
+    caps = tmp;
+  }
+
+  gst_clear_object (&client);
+  GST_DEBUG_OBJECT (self, "Returning caps %" GST_PTR_FORMAT, caps);
+
+  return caps;
+}
+
+static GstCaps *
+gst_cuda_ipc_src_fixate (GstBaseSrc * src, GstCaps * caps)
+{
+  /* We don't negotiate with server. In here, we do fixate resolution to
+   * 320 x 240 (same as default of videotestsrc) which makes a little more
+   * sense than 1x1 */
+  caps = gst_caps_make_writable (caps);
+
+  for (guint i = 0; i < gst_caps_get_size (caps); i++) {
+    GstStructure *s = gst_caps_get_structure (caps, i);
+
+    gst_structure_fixate_field_nearest_int (s, "width", 320);
+    gst_structure_fixate_field_nearest_int (s, "height", 240);
+  }
+
+  return gst_caps_fixate (caps);
+}
+
+static GstFlowReturn
+gst_cuda_ipc_src_create (GstBaseSrc * src, guint64 offset, guint size,
+    GstBuffer ** buf)
+{
+  GstCudaIpcSrc *self = GST_CUDA_IPC_SRC (src);
+  GstCudaIpcSrcPrivate *priv = self->priv;
+  GstFlowReturn ret;
+  GstSample *sample = nullptr;
+  GstCaps *caps;
+  GstClock *clock;
+  bool is_system_clock = true;
+  GstClockTime pts;
+  GstClockTime base_time;
+  GstClockTime now_system;
+  GstClockTime now_gst;
+  GstClockTime remote_pts;
+  GstBuffer *buffer;
+
+  ret = gst_cuda_ipc_client_run (priv->client);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  ret = gst_cuda_ipc_client_get_sample (priv->client, &sample);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  now_system = gst_util_get_timestamp ();
+  clock = gst_element_get_clock (GST_ELEMENT_CAST (self));
+  now_gst = gst_clock_get_time (clock);
+  base_time = GST_ELEMENT_CAST (self)->base_time;
+  is_system_clock = gst_cuda_ipc_clock_is_system (clock);
+  gst_object_unref (clock);
+
+  buffer = gst_sample_get_buffer (sample);
+  remote_pts = GST_BUFFER_PTS (buffer);
+
+  if (!is_system_clock) {
+    GstClockTimeDiff now_pts = now_gst - base_time + remote_pts - now_system;
+
+    if (now_pts >= 0)
+      pts = now_pts;
+    else
+      pts = 0;
+  } else {
+    if (remote_pts >= base_time) {
+      pts = remote_pts - base_time;
+    } else {
+      GST_WARNING_OBJECT (self,
+          "Remote clock is smaller than our base time, remote %"
+          GST_TIME_FORMAT ", base_time %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (remote_pts), GST_TIME_ARGS (base_time));
+      pts = 0;
+    }
+  }
+
+  GST_BUFFER_PTS (buffer) = pts;
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  caps = gst_sample_get_caps (sample);
+  if (!priv->caps || !gst_caps_is_equal (priv->caps, caps)) {
+    gst_caps_replace (&priv->caps, caps);
+    lk.unlock ();
+    gst_base_src_set_caps (src, priv->caps);
+  }
+
+  *buf = gst_buffer_ref (buffer);
+  gst_sample_unref (sample);
+
+  return GST_FLOW_OK;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudaipcsrc.h Added

@@ -0,0 +1,33 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/base/gstbasesrc.h>
+#include <gst/video/video.h>
+#include <gst/cuda/gstcuda.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_CUDA_IPC_SRC (gst_cuda_ipc_src_get_type())
+G_DECLARE_FINAL_TYPE (GstCudaIpcSrc, gst_cuda_ipc_src,
+    GST, CUDA_IPC_SRC, GstBaseSrc);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstcudamemorycopy.c -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcudamemorycopy.c Changed

@@ -41,16 +41,15 @@
 #include "gstcudabasetransform.h"
 #include "gstcudamemorycopy.h"
 #include "gstcudaformat.h"
-#include <gst/cuda/gstcudautils.h>
 #include <gst/cuda/gstcuda-private.h>
 #ifdef HAVE_NVCODEC_NVMM
 #include "gstcudanvmm.h"
 #endif
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
 #include <gst/gl/gl.h>
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
 #include <gst/d3d11/gstd3d11.h>
 #endif
 
@@ -73,12 +72,12 @@
 
   gboolean downstream_supports_video_meta;
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   GstGLDisplay *gl_display;
   GstGLContext *gl_context;
   GstGLContext *other_gl_context;
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   GstD3D11Device *d3d11_device;
 #endif
 };
@@ -128,7 +127,7 @@
     GstVideoInfo * out_info);
 static GstFlowReturn gst_cuda_memory_copy_transform (GstBaseTransform * trans,
     GstBuffer * inbuf, GstBuffer * outbuf);
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
 static gboolean
 gst_cuda_memory_copy_ensure_d3d11_interop (GstCudaContext * context,
     GstD3D11Device * device);
@@ -169,15 +168,15 @@
 gst_cuda_memory_copy_set_context (GstElement * element, GstContext * context)
 {
   /* CUDA context is handled by parent class, handle only non-CUDA context */
-#if defined (HAVE_NVCODEC_GST_GL) || defined (GST_CUDA_HAS_D3D)
+#if defined (HAVE_CUDA_GST_GL) || defined (G_OS_WIN32)
   GstCudaMemoryCopy *self = GST_CUDA_MEMORY_COPY (element);
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   gst_gl_handle_set_context (element, context, &self->gl_display,
       &self->other_gl_context);
-#endif /* HAVE_NVCODEC_GST_GL */
+#endif /* HAVE_CUDA_GST_GL */
 
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   GstCudaBaseTransform *base = GST_CUDA_BASE_TRANSFORM (element);
   if (gst_d3d11_handle_set_context (element, context, -1, &self->d3d11_device)) {
     gboolean compatible = TRUE;
@@ -212,8 +211,8 @@
           self->d3d11_device);
     }
   }
-#endif /* GST_CUDA_HAS_D3D */
-#endif /* defined (HAVE_NVCODEC_GST_GL) || defined (GST_CUDA_HAS_D3D) */
+#endif /* G_OS_WIN32 */
+#endif /* defined (HAVE_CUDA_GST_GL) || defined (G_OS_WIN32) */
 
   GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
 }
@@ -221,17 +220,17 @@
 static gboolean
 gst_cuda_memory_copy_transform_stop (GstBaseTransform * trans)
 {
-#if defined(HAVE_NVCODEC_GST_GL) || defined(GST_CUDA_HAS_D3D)
+#if defined(HAVE_CUDA_GST_GL) || defined(G_OS_WIN32)
   GstCudaMemoryCopy *self = GST_CUDA_MEMORY_COPY (trans);
 
-# ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   gst_clear_object (&self->gl_display);
   gst_clear_object (&self->gl_context);
   gst_clear_object (&self->other_gl_context);
-# endif
-# ifdef GST_CUDA_HAS_D3D
+#endif
+#ifdef G_OS_WIN32
   gst_clear_object (&self->d3d11_device);
-# endif
+#endif
 #endif
 
   return GST_BASE_TRANSFORM_CLASS (parent_class)->stop (trans);
@@ -298,11 +297,11 @@
     }
 #endif
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
     new_caps = _set_caps_features (caps, GST_CAPS_FEATURE_MEMORY_GL_MEMORY);
     ret = gst_caps_merge (ret, new_caps);
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     new_caps = _set_caps_features (caps, GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY);
     ret = gst_caps_merge (ret, new_caps);
 #endif
@@ -346,7 +345,7 @@
   return result;
 }
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
 static void
 gst_cuda_memory_copy_ensure_gl_interop (GstGLContext * context, gboolean * ret)
 {
@@ -359,7 +358,7 @@
   cuda_ret = CuGLGetDevices (&device_count,
       device_list, 1, CU_GL_DEVICE_LIST_ALL);
 
-  if (cuda_ret != CUDA_SUCCESS || device_count == 0)
+  if (!gst_cuda_result (cuda_ret) || device_count == 0)
     return;
 
   *ret = TRUE;
@@ -427,7 +426,7 @@
 }
 #endif
 
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
 static gboolean
 gst_cuda_memory_copy_ensure_d3d11_interop (GstCudaContext * context,
     GstD3D11Device * device)
@@ -486,6 +485,7 @@
   GstBufferPool *pool = NULL;
   GstCaps *caps;
   guint size;
+  gboolean is_cuda = FALSE;
 
   if (!GST_BASE_TRANSFORM_CLASS (parent_class)->propose_allocation (trans,
           decide_query, query))
@@ -513,7 +513,7 @@
             GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY)) {
       GST_DEBUG_OBJECT (self, "upstream support CUDA memory");
       pool = gst_cuda_buffer_pool_new (ctrans->context);
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
     } else if (features && gst_caps_features_contains (features,
             GST_CAPS_FEATURE_MEMORY_GL_MEMORY) &&
         gst_cuda_memory_copy_ensure_gl_context (self)) {
@@ -521,7 +521,7 @@
 
       pool = gst_gl_buffer_pool_new (self->gl_context);
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     } else if (features && gst_caps_features_contains (features,
             GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY) &&
         gst_cuda_memory_copy_ensure_d3d11_context (self)) {
@@ -575,6 +575,8 @@
 
     size = GST_VIDEO_INFO_SIZE (&info);
     gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
+    if (is_cuda && ctrans->stream)
+      gst_buffer_pool_config_set_cuda_stream (config, ctrans->stream);
 
     if (!gst_buffer_pool_set_config (pool, config)) {
       GST_ERROR_OBJECT (ctrans, "failed to set config");
@@ -610,10 +612,10 @@
   gboolean update_pool = FALSE;
   GstCapsFeatures *features;
   gboolean need_cuda = FALSE;
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   gboolean need_gl = FALSE;
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   gboolean need_d3d11 = FALSE;
 #endif
 #ifdef HAVE_NVCODEC_NVMM
@@ -636,14 +638,14 @@
           GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY)) {
     need_cuda = TRUE;
   }
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   else if (features && gst_caps_features_contains (features,
           GST_CAPS_FEATURE_MEMORY_GL_MEMORY) &&
       gst_cuda_memory_copy_ensure_gl_context (self)) {
     need_gl = TRUE;
   }
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   else if (features && gst_caps_features_contains (features,
           GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY) &&
       gst_cuda_memory_copy_ensure_d3d11_context (self)) {
@@ -691,13 +693,13 @@
       GST_DEBUG_OBJECT (self, "creating cuda pool");
       pool = gst_cuda_buffer_pool_new (ctrans->context);
     }
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
     else if (need_gl) {
       GST_DEBUG_OBJECT (self, "creating gl pool");
       pool = gst_gl_buffer_pool_new (self->gl_context);
     }
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     else if (need_d3d11) {
       GST_DEBUG_OBJECT (self, "creating d3d11 pool");
       pool = gst_d3d11_buffer_pool_new (self->d3d11_device);
@@ -776,25 +778,25 @@
 gst_cuda_memory_copy_query (GstBaseTransform * trans,
     GstPadDirection direction, GstQuery * query)
 {
-#if defined(HAVE_NVCODEC_GST_GL) || defined(GST_CUDA_HAS_D3D)
+#if defined(HAVE_CUDA_GST_GL) || defined(G_OS_WIN32)
   GstCudaMemoryCopy *self = GST_CUDA_MEMORY_COPY (trans);
 
   switch (GST_QUERY_TYPE (query)) {
     case GST_QUERY_CONTEXT:
     {
       gboolean ret;
-# ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
       ret = gst_gl_handle_context_query (GST_ELEMENT (self), query,
           self->gl_display, self->gl_context, self->other_gl_context);
       if (ret)
         return TRUE;
-# endif
-# ifdef GST_CUDA_HAS_D3D
+#endif
+#ifdef G_OS_WIN32
       ret = gst_d3d11_handle_context_query (GST_ELEMENT (self), query,
           self->d3d11_device);
       if (ret)
         return TRUE;
-# endif
+#endif
       break;
     }
     default:
@@ -829,7 +831,7 @@
           GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY)) {
     self->out_type = GST_CUDA_BUFFER_COPY_CUDA;
   }
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   if (in_features && gst_caps_features_contains (in_features,
           GST_CAPS_FEATURE_MEMORY_GL_MEMORY)) {
     self->in_type = GST_CUDA_BUFFER_COPY_GL;
@@ -841,7 +843,7 @@
   }
 #endif
 
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   if (in_features && gst_caps_features_contains (in_features,
           GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY)) {
     self->in_type = GST_CUDA_BUFFER_COPY_D3D11;
@@ -889,7 +891,7 @@
   GstCudaBufferCopyType in_type = GST_CUDA_BUFFER_COPY_SYSTEM;
   GstCudaBufferCopyType out_type = GST_CUDA_BUFFER_COPY_SYSTEM;
   gboolean use_device_copy = FALSE;
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   D3D11_TEXTURE2D_DESC desc;
 #endif
 
@@ -914,11 +916,11 @@
   } else if (gst_is_cuda_memory (in_mem)) {
     in_type = GST_CUDA_BUFFER_COPY_CUDA;
     use_device_copy = TRUE;
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   } else if (self->gl_context && gst_is_gl_memory_pbo (in_mem)) {
     in_type = GST_CUDA_BUFFER_COPY_GL;
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   } else if (self->d3d11_device && gst_is_d3d11_memory (in_mem)
       && gst_d3d11_memory_get_texture_desc (GST_D3D11_MEMORY_CAST (in_mem),
           &desc) && desc.Usage == D3D11_USAGE_DEFAULT) {
@@ -934,11 +936,11 @@
   } else if (gst_is_cuda_memory (out_mem)) {
     out_type = GST_CUDA_BUFFER_COPY_CUDA;
     use_device_copy = TRUE;
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   } else if (self->gl_context && gst_is_gl_memory_pbo (out_mem)) {
     out_type = GST_CUDA_BUFFER_COPY_GL;
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   } else if (self->d3d11_device && gst_is_d3d11_memory (out_mem)
       && gst_d3d11_memory_get_texture_desc (GST_D3D11_MEMORY_CAST (out_mem),
           &desc) && desc.Usage == D3D11_USAGE_DEFAULT) {
@@ -952,7 +954,7 @@
     GST_TRACE_OBJECT (self, "Both in/out buffers are not CUDA");
     if (!gst_cuda_buffer_copy (outbuf, GST_CUDA_BUFFER_COPY_SYSTEM, out_info,
             inbuf, GST_CUDA_BUFFER_COPY_SYSTEM, in_info, ctrans->context,
-            ctrans->cuda_stream)) {
+            ctrans->stream)) {
       return GST_FLOW_ERROR;
     }
 
@@ -960,7 +962,7 @@
   }
 
   ret = gst_cuda_buffer_copy (outbuf, out_type, out_info, inbuf, in_type,
-      in_info, ctrans->context, ctrans->cuda_stream);
+      in_info, ctrans->context, ctrans->stream);
 
   /* system memory <-> CUDA copy fallback if possible */
   if (!ret) {
@@ -1003,7 +1005,7 @@
         gst_cuda_buffer_copy_type_to_string (fallback_out_type));
 
     ret = gst_cuda_buffer_copy (outbuf, fallback_out_type, out_info, inbuf,
-        fallback_in_type, in_info, ctrans->context, ctrans->cuda_stream);
+        fallback_in_type, in_info, ctrans->context, ctrans->stream);
   }
 
   if (ret)
@@ -1018,7 +1020,7 @@
   /* final fallback using system memory */
   ret = gst_cuda_buffer_copy (outbuf, GST_CUDA_BUFFER_COPY_SYSTEM, out_info,
       inbuf, GST_CUDA_BUFFER_COPY_SYSTEM, in_info, ctrans->context,
-      ctrans->cuda_stream);
+      ctrans->stream);
 
   if (ret)
     return GST_FLOW_OK;
@@ -1075,11 +1077,16 @@
   GST_BASE_TRANSFORM_CLASS (parent_class)->before_transform (trans, buffer);
 
   old = gst_base_transform_is_passthrough (trans);
-  if (copy->in_type == copy->out_type ||
-      (copy->in_type == GST_CUDA_BUFFER_COPY_CUDA &&
-          copy->out_type == GST_CUDA_BUFFER_COPY_SYSTEM &&
-          copy->downstream_supports_video_meta)) {
+  if (copy->in_type == copy->out_type) {
     new = TRUE;
+  } else if (copy->in_type == GST_CUDA_BUFFER_COPY_CUDA &&
+      copy->out_type == GST_CUDA_BUFFER_COPY_SYSTEM &&
+      copy->downstream_supports_video_meta) {
+    GstMemory *mem = gst_buffer_peek_memory (buffer, 0);
+    /* zero-copy decoded memory belongs to NVDEC's fixed size pool.
+     * We should return the memory to the decoder as soon as possible */
+    if (!gst_cuda_memory_is_from_fixed_pool (mem))
+      new = TRUE;
   }
 
   if (new != old) {
@@ -1156,10 +1163,10 @@
 #ifdef HAVE_NVCODEC_NVMM
   GstCaps *nvmm_caps = NULL;
 #endif
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   GstCaps *gl_caps;
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   GstCaps *d3d11_caps;
 #endif
   GstCaps *upload_sink_caps;
@@ -1183,22 +1190,22 @@
         (GST_CAPS_FEATURE_MEMORY_CUDA_NVMM_MEMORY, GST_CUDA_NVMM_FORMATS));
   }
 #endif
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   gl_caps =
       gst_caps_from_string (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
       (GST_CAPS_FEATURE_MEMORY_GL_MEMORY, GST_CUDA_GL_FORMATS));
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   d3d11_caps =
       gst_caps_from_string (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
       (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, GST_CUDA_D3D11_FORMATS));
 #endif
 
   upload_sink_caps = gst_caps_copy (sys_caps);
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   upload_sink_caps = gst_caps_merge (upload_sink_caps, gst_caps_copy (gl_caps));
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   upload_sink_caps =
       gst_caps_merge (upload_sink_caps, gst_caps_copy (d3d11_caps));
 #endif
@@ -1231,10 +1238,10 @@
       gst_caps_merge (download_sink_caps, gst_caps_copy (sys_caps));
 
   download_src_caps = sys_caps;
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   download_src_caps = gst_caps_merge (download_src_caps, gl_caps);
 #endif
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   download_src_caps = gst_caps_merge (download_src_caps, d3d11_caps);
 #endif
 #ifdef HAVE_NVCODEC_NVMM

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstcuvidloader.c -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcuvidloader.c Changed

@@ -56,6 +56,8 @@
       unsigned int reserved_flags);
     CUresult (CUDAAPI * CuvidCreateDecoder) (CUvideodecoder * phDecoder,
       CUVIDDECODECREATEINFO * pdci);
+    CUresult (CUDAAPI * CuvidReconfigureDecoder) (CUvideodecoder phDecoder,
+      CUVIDRECONFIGUREDECODERINFO * pDecReconfigParams);
     CUresult (CUDAAPI * CuvidDestroyDecoder) (CUvideodecoder hDecoder);
     CUresult (CUDAAPI * CuvidDecodePicture) (CUvideodecoder hDecoder,
       CUVIDPICPARAMS * pPicParams);
@@ -97,6 +99,7 @@
   LOAD_SYMBOL (cuvidCtxLock, CuvidCtxLock, TRUE);
   LOAD_SYMBOL (cuvidCtxUnlock, CuvidCtxUnlock, TRUE);
   LOAD_SYMBOL (cuvidCreateDecoder, CuvidCreateDecoder, TRUE);
+  LOAD_SYMBOL (cuvidReconfigureDecoder, CuvidReconfigureDecoder, FALSE);
   LOAD_SYMBOL (cuvidDestroyDecoder, CuvidDestroyDecoder, TRUE);
   LOAD_SYMBOL (cuvidDecodePicture, CuvidDecodePicture, TRUE);
   LOAD_SYMBOL (cuvidCreateVideoParser, CuvidCreateVideoParser, TRUE);
@@ -142,6 +145,15 @@
   return FALSE;
 }
 
+gboolean
+gst_cuvid_can_reconfigure (void)
+{
+  if (gst_cuvid_vtable.CuvidReconfigureDecoder)
+    return TRUE;
+
+  return FALSE;
+}
+
 CUresult CUDAAPI
 CuvidCtxLockCreate (CUvideoctxlock * pLock, CUcontext ctx)
 {
@@ -183,6 +195,16 @@
 }
 
 CUresult CUDAAPI
+CuvidReconfigureDecoder (CUvideodecoder hDecoder,
+    CUVIDRECONFIGUREDECODERINFO * pDecReconfigParams)
+{
+  g_assert (gst_cuvid_vtable.CuvidReconfigureDecoder != NULL);
+
+  return gst_cuvid_vtable.CuvidReconfigureDecoder (hDecoder,
+      pDecReconfigParams);
+}
+
+CUresult CUDAAPI
 CuvidDestroyDecoder (CUvideodecoder hDecoder)
 {
   g_assert (gst_cuvid_vtable.CuvidDestroyDecoder != NULL);

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstcuvidloader.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstcuvidloader.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvav1dec.cpp Added

@@ -0,0 +1,1087 @@
+/* GStreamer
+ * Copyright (C) 2022 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-nvav1dec
+ * @title: nvav1dec
+ *
+ * GstCodecs based NVIDIA AV1 video decoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/av1/file ! parsebin ! nvav1dec ! videoconvert ! autovideosink
+ * ```
+ *
+ * Since: 1.22
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstnvav1dec.h"
+#include "gstnvdecoder.h"
+
+#include <string.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_nv_av1_dec_debug);
+#define GST_CAT_DEFAULT gst_nv_av1_dec_debug
+
+typedef struct _GstNvAV1Dec
+{
+  GstAV1Decoder parent;
+
+  GstNvDecoder *decoder;
+
+  GstAV1SequenceHeaderOBU seq_hdr;
+  CUVIDPICPARAMS params;
+
+  /* slice buffer which will be passed to CUVIDPICPARAMS::pBitstreamData */
+  guint8 *bitstream_buffer;
+  /* allocated memory size of bitstream_buffer */
+  gsize bitstream_buffer_alloc_size;
+  /* current offset of bitstream_buffer (per frame) */
+  gsize bitstream_buffer_offset;
+
+  guint *tile_offsets;
+  guint tile_offsets_alloc_len;
+  guint num_tiles;
+
+  guint max_width;
+  guint max_height;
+  guint bitdepth;
+  guint8 film_grain_params_present;
+
+  guint num_output_surfaces;
+  guint init_max_width;
+  guint init_max_height;
+  gint max_display_delay;
+} GstNvAV1Dec;
+
+typedef struct _GstNvAV1DecClass
+{
+  GstAV1DecoderClass parent_class;
+  guint cuda_device_id;
+  gint64 adapter_luid;
+  guint max_width;
+  guint max_height;
+} GstNvAV1DecClass;
+
+enum
+{
+  PROP_0,
+  PROP_CUDA_DEVICE_ID,
+  PROP_NUM_OUTPUT_SURFACES,
+  PROP_INIT_MAX_WIDTH,
+  PROP_INIT_MAX_HEIGHT,
+  PROP_MAX_DISPLAY_DELAY,
+};
+
+#define DEFAULT_NUM_OUTPUT_SURFACES 1
+#define DEFAULT_MAX_DISPLAY_DELAY -1
+
+static GTypeClass *parent_class = nullptr;
+
+#define GST_NV_AV1_DEC(object) ((GstNvAV1Dec *) (object))
+#define GST_NV_AV1_DEC_GET_CLASS(object) \
+    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstNvAV1DecClass))
+
+static void gst_nv_av1_dec_finalize (GObject * object);
+static void gst_nv_av1_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_nv_av1_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static void gst_nv_av1_dec_set_context (GstElement * element,
+    GstContext * context);
+static gboolean gst_nv_av1_dec_open (GstVideoDecoder * decoder);
+static gboolean gst_nv_av1_dec_close (GstVideoDecoder * decoder);
+static gboolean gst_nv_av1_dec_stop (GstVideoDecoder * decoder);
+static gboolean gst_nv_av1_dec_negotiate (GstVideoDecoder * decoder);
+static gboolean gst_nv_av1_dec_decide_allocation (GstVideoDecoder *
+    decoder, GstQuery * query);
+static gboolean gst_nv_av1_dec_sink_query (GstVideoDecoder * decoder,
+    GstQuery * query);
+static gboolean gst_nv_av1_dec_src_query (GstVideoDecoder * decoder,
+    GstQuery * query);
+static gboolean gst_nv_av1_dec_sink_event (GstVideoDecoder * decoder,
+    GstEvent * event);
+
+static GstFlowReturn gst_nv_av1_dec_new_sequence (GstAV1Decoder * decoder,
+    const GstAV1SequenceHeaderOBU * seq_hdr, gint max_dpb_size);
+static GstFlowReturn gst_nv_av1_dec_new_picture (GstAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstAV1Picture * picture);
+static GstAV1Picture *gst_nv_av1_dec_duplicate_picture (GstAV1Decoder *
+    decoder, GstVideoCodecFrame * frame, GstAV1Picture * picture);
+static GstFlowReturn gst_nv_av1_dec_start_picture (GstAV1Decoder * decoder,
+    GstAV1Picture * picture, GstAV1Dpb * dpb);
+static GstFlowReturn gst_nv_av1_dec_decode_tile (GstAV1Decoder * decoder,
+    GstAV1Picture * picture, GstAV1Tile * tile);
+static GstFlowReturn gst_nv_av1_dec_end_picture (GstAV1Decoder * decoder,
+    GstAV1Picture * picture);
+static GstFlowReturn gst_nv_av1_dec_output_picture (GstAV1Decoder *
+    decoder, GstVideoCodecFrame * frame, GstAV1Picture * picture);
+static guint gst_nv_av1_dec_get_preferred_output_delay (GstAV1Decoder * decoder,
+    gboolean is_live);
+
+static void
+gst_nv_av1_dec_class_init (GstNvAV1DecClass * klass,
+    GstNvDecoderClassData * cdata)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstAV1DecoderClass *av1decoder_class = GST_AV1_DECODER_CLASS (klass);
+
+  object_class->finalize = gst_nv_av1_dec_finalize;
+  object_class->set_property = gst_nv_av1_dec_set_property;
+  object_class->get_property = gst_nv_av1_dec_get_property;
+
+  g_object_class_install_property (object_class, PROP_CUDA_DEVICE_ID,
+      g_param_spec_uint ("cuda-device-id", "CUDA device id",
+          "Assigned CUDA device id", 0, G_MAXINT, 0,
+          (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvAV1Dec:num-output-surfaces:
+   *
+   * The number of output surfaces (0 = auto, 1 = always copy).
+   * This property will be used to calculate
+   * the CUVIDDECODECREATEINFO.ulNumOutputSurfaces parameter in case of
+   * CUDA output mode.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_NUM_OUTPUT_SURFACES,
+      g_param_spec_uint ("num-output-surfaces", "Num Output Surfaces",
+          "Maximum number of output surfaces simultaneously mapped in CUDA "
+          "output mode (0 = auto, 1 = always copy)",
+          0, 64, DEFAULT_NUM_OUTPUT_SURFACES,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvAV1Dec:init-max-width:
+   *
+   * Initial CUVIDDECODECREATEINFO.ulMaxWidth value
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_INIT_MAX_WIDTH,
+      g_param_spec_uint ("init-max-width", "Initial Maximum Width",
+          "Expected maximum coded width of stream. This value is used to "
+          "pre-allocate higher dimension of output surfaces than "
+          "that of input stream, in order to help decoder reconfiguration",
+          0, cdata->max_width, 0,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvAV1Dec:init-max-height:
+   *
+   * Initial CUVIDDECODECREATEINFO.ulMaxHeight value
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_INIT_MAX_HEIGHT,
+      g_param_spec_uint ("init-max-height", "Initial Maximum Height",
+          "Expected maximum coded height of stream. This value is used to "
+          "pre-allocate higher dimension of output surfaces than "
+          "that of input stream, in order to help decoder reconfiguration",
+          0, cdata->max_height, 0,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvAV1Dec:max-display-delay:
+   *
+   * Maximum display delay
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_MAX_DISPLAY_DELAY,
+      g_param_spec_int ("max-display-delay", "Max Display Delay",
+          "Improves pipelining of decode with display, 0 means no delay "
+          "(auto = -1)", -1, 16, DEFAULT_MAX_DISPLAY_DELAY,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_set_context);
+
+  parent_class = (GTypeClass *) g_type_class_peek_parent (klass);
+  gst_element_class_set_static_metadata (element_class, "NVDEC AV1 Decoder",
+      "Codec/Decoder/Video/Hardware",
+      "NVIDIA AV1 video decoder", "Seungha Yang <seungha@centricular.com>");
+
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+          cdata->sink_caps));
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+          cdata->src_caps));
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_open);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_close);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_stop);
+  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_sink_query);
+  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_src_query);
+  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_nv_av1_dec_sink_event);
+
+  av1decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_new_sequence);
+  av1decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_new_picture);
+  av1decoder_class->duplicate_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_duplicate_picture);
+  av1decoder_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_start_picture);
+  av1decoder_class->decode_tile =
+      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_decode_tile);
+  av1decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_end_picture);
+  av1decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_output_picture);
+  av1decoder_class->get_preferred_output_delay =
+      GST_DEBUG_FUNCPTR (gst_nv_av1_dec_get_preferred_output_delay);
+
+  klass->cuda_device_id = cdata->cuda_device_id;
+  klass->adapter_luid = cdata->adapter_luid;
+  klass->max_width = cdata->max_width;
+  klass->max_height = cdata->max_height;
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
+}
+
+static void
+gst_nv_av1_dec_init (GstNvAV1Dec * self)
+{
+  GstNvAV1DecClass *klass = GST_NV_AV1_DEC_GET_CLASS (self);
+
+  self->decoder =
+      gst_nv_decoder_new (klass->cuda_device_id, klass->adapter_luid);
+
+  self->num_output_surfaces = DEFAULT_NUM_OUTPUT_SURFACES;
+  self->max_display_delay = DEFAULT_MAX_DISPLAY_DELAY;
+}
+
+static void
+gst_nv_av1_dec_finalize (GObject * object)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (object);
+
+  gst_object_unref (self->decoder);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_nv_av1_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (object);
+
+  switch (prop_id) {
+    case PROP_NUM_OUTPUT_SURFACES:
+      self->num_output_surfaces = g_value_get_uint (value);
+      break;
+    case PROP_INIT_MAX_WIDTH:
+      self->init_max_width = g_value_get_uint (value);
+      break;
+    case PROP_INIT_MAX_HEIGHT:
+      self->init_max_height = g_value_get_uint (value);
+      break;
+    case PROP_MAX_DISPLAY_DELAY:
+      self->max_display_delay = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_av1_dec_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (object);
+  GstNvAV1DecClass *klass = GST_NV_AV1_DEC_GET_CLASS (object);
+
+  switch (prop_id) {
+    case PROP_CUDA_DEVICE_ID:
+      g_value_set_uint (value, klass->cuda_device_id);
+      break;
+    case PROP_NUM_OUTPUT_SURFACES:
+      g_value_set_uint (value, self->num_output_surfaces);
+      break;
+    case PROP_INIT_MAX_WIDTH:
+      g_value_set_uint (value, self->init_max_width);
+      break;
+    case PROP_INIT_MAX_HEIGHT:
+      g_value_set_uint (value, self->init_max_height);
+      break;
+    case PROP_MAX_DISPLAY_DELAY:
+      g_value_set_int (value, self->max_display_delay);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_av1_dec_set_context (GstElement * element, GstContext * context)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (element);
+
+  gst_nv_decoder_handle_set_context (self->decoder, element, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_nv_av1_dec_open (GstVideoDecoder * decoder)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+
+  return gst_nv_decoder_open (self->decoder, GST_ELEMENT (decoder));
+}
+
+static void
+gst_nv_av1_dec_reset_bitstream_params (GstNvAV1Dec * self)
+{
+  self->bitstream_buffer_offset = 0;
+  self->num_tiles = 0;
+
+  self->params.nBitstreamDataLen = 0;
+  self->params.pBitstreamData = nullptr;
+  self->params.nNumSlices = 0;
+  self->params.pSliceDataOffsets = nullptr;
+}
+
+static gboolean
+gst_nv_av1_dec_close (GstVideoDecoder * decoder)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+
+  gst_nv_av1_dec_reset_bitstream_params (self);
+
+  g_free (self->bitstream_buffer);
+  self->bitstream_buffer = nullptr;
+
+  g_free (self->tile_offsets);
+  self->tile_offsets = nullptr;
+
+  self->bitstream_buffer_alloc_size = 0;
+  self->tile_offsets_alloc_len = 0;
+
+  return gst_nv_decoder_close (self->decoder);
+}
+
+static gboolean
+gst_nv_av1_dec_stop (GstVideoDecoder * decoder)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+  gboolean ret;
+
+  ret = GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+
+  gst_nv_decoder_reset (self->decoder);
+
+  return ret;
+}
+
+static gboolean
+gst_nv_av1_dec_negotiate (GstVideoDecoder * decoder)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+  GstAV1Decoder *av1dec = GST_AV1_DECODER (decoder);
+
+  GST_DEBUG_OBJECT (self, "negotiate");
+
+  if (!gst_nv_decoder_negotiate (self->decoder, decoder, av1dec->input_state))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_nv_av1_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+
+  if (!gst_nv_decoder_decide_allocation (self->decoder, decoder, query)) {
+    GST_WARNING_OBJECT (self, "Failed to handle decide allocation");
+    return FALSE;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static gboolean
+gst_nv_av1_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+
+  if (gst_nv_decoder_handle_query (self->decoder, GST_ELEMENT (decoder), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+}
+
+static gboolean
+gst_nv_av1_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+
+  if (gst_nv_decoder_handle_query (self->decoder, GST_ELEMENT (decoder), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+}
+
+static gboolean
+gst_nv_av1_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_FLUSH_START:
+      gst_nv_decoder_set_flushing (self->decoder, TRUE);
+      break;
+    case GST_EVENT_FLUSH_STOP:
+      gst_nv_decoder_set_flushing (self->decoder, FALSE);
+      break;
+    default:
+      break;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstFlowReturn
+gst_nv_av1_dec_new_sequence (GstAV1Decoder * decoder,
+    const GstAV1SequenceHeaderOBU * seq_hdr, gint max_dpb_size)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+  GstNvAV1DecClass *klass = GST_NV_AV1_DEC_GET_CLASS (self);
+  gboolean modified = FALSE;
+  guint max_width, max_height;
+
+  GST_LOG_OBJECT (self, "new sequence");
+
+  if (seq_hdr->seq_profile != GST_AV1_PROFILE_0) {
+    GST_WARNING_OBJECT (self, "Unsupported profile %d", seq_hdr->seq_profile);
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  if (seq_hdr->num_planes != 3) {
+    GST_WARNING_OBJECT (self, "Monochrome is not supported");
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  self->seq_hdr = *seq_hdr;
+
+  if (self->bitdepth != seq_hdr->bit_depth) {
+    GST_INFO_OBJECT (self, "Bitdepth changed %d -> %d", self->bitdepth,
+        seq_hdr->bit_depth);
+    self->bitdepth = seq_hdr->bit_depth;
+    modified = TRUE;
+  }
+
+  max_width = seq_hdr->max_frame_width_minus_1 + 1;
+  max_height = seq_hdr->max_frame_height_minus_1 + 1;
+
+  if (self->max_width != max_width || self->max_height != max_height) {
+    GST_INFO_OBJECT (self, "Resolution changed %dx%d -> %dx%d",
+        self->max_width, self->max_height, max_width, max_height);
+    self->max_width = max_width;
+    self->max_height = max_height;
+    modified = TRUE;
+  }
+
+  if (self->film_grain_params_present != seq_hdr->film_grain_params_present) {
+    GST_INFO_OBJECT (self, "Film grain present changed %d -> %d",
+        self->film_grain_params_present, seq_hdr->film_grain_params_present);
+    self->film_grain_params_present = seq_hdr->film_grain_params_present;
+    modified = TRUE;
+  }
+
+  if (modified || !gst_nv_decoder_is_configured (self->decoder)) {
+    GstVideoInfo info;
+    GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
+
+    if (self->bitdepth == 8) {
+      out_format = GST_VIDEO_FORMAT_NV12;
+    } else if (self->bitdepth == 10) {
+      out_format = GST_VIDEO_FORMAT_P010_10LE;
+    } else {
+      GST_WARNING_OBJECT (self, "Invalid bit-depth %d", seq_hdr->bit_depth);
+      return GST_FLOW_NOT_NEGOTIATED;
+    }
+
+    gst_video_info_set_format (&info,
+        out_format, self->max_width, self->max_height);
+
+    max_width = gst_nv_decoder_get_max_output_size (self->max_width,
+        self->init_max_width, klass->max_width);
+    max_height = gst_nv_decoder_get_max_output_size (self->max_height,
+        self->init_max_height, klass->max_height);
+
+    if (!gst_nv_decoder_configure (self->decoder, cudaVideoCodec_AV1,
+            &info, self->max_width, self->max_height, self->bitdepth,
+            max_dpb_size, self->film_grain_params_present ? TRUE : FALSE,
+            self->num_output_surfaces, max_width, max_height)) {
+      GST_ERROR_OBJECT (self, "Failed to create decoder");
+      return GST_FLOW_NOT_NEGOTIATED;
+    }
+
+    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+      GST_ERROR_OBJECT (self, "Failed to negotiate with downstream");
+      return GST_FLOW_NOT_NEGOTIATED;
+    }
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_av1_dec_new_picture (GstAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+
+  return gst_nv_decoder_new_picture (self->decoder,
+      GST_CODEC_PICTURE (picture));
+}
+
+static GstNvDecSurface *
+gst_nv_av1_dec_get_decoder_surface_from_picture (GstNvAV1Dec * self,
+    GstAV1Picture * picture)
+{
+  GstNvDecSurface *surface;
+
+  surface = (GstNvDecSurface *) gst_av1_picture_get_user_data (picture);
+  if (!surface)
+    GST_DEBUG_OBJECT (self, "current picture does not have decoder surface");
+
+  return surface;
+}
+
+static GstAV1Picture *
+gst_nv_av1_dec_duplicate_picture (GstAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+  GstNvDecSurface *surface;
+  GstAV1Picture *new_picture;
+
+  surface = gst_nv_av1_dec_get_decoder_surface_from_picture (self, picture);
+
+  if (!surface) {
+    GST_ERROR_OBJECT (self, "Parent picture does not have decoder surface");
+    return nullptr;
+  }
+
+  new_picture = gst_av1_picture_new ();
+  new_picture->frame_hdr = picture->frame_hdr;
+
+  gst_av1_picture_set_user_data (new_picture,
+      gst_nv_dec_surface_ref (surface),
+      (GDestroyNotify) gst_nv_dec_surface_unref);
+
+  return new_picture;
+}
+
+static inline guint8
+gst_nv_av1_dec_get_lr_unit_size (guint size)
+{
+  switch (size) {
+    case 32:
+      return 0;
+    case 64:
+      return 1;
+    case 128:
+      return 2;
+    case 256:
+      return 3;
+    default:
+      break;
+  }
+
+  return 3;
+}
+
+static GstFlowReturn
+gst_nv_av1_dec_start_picture (GstAV1Decoder * decoder, GstAV1Picture * picture,
+    GstAV1Dpb * dpb)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+  CUVIDPICPARAMS *params = &self->params;
+  CUVIDAV1PICPARAMS *av1_params = &params->CodecSpecific.av1;
+  const GstAV1SequenceHeaderOBU *seq_hdr = &self->seq_hdr;
+  const GstAV1FrameHeaderOBU *frame_hdr = &picture->frame_hdr;
+  const GstAV1GlobalMotionParams *gmp = &frame_hdr->global_motion_params;
+  const GstAV1QuantizationParams *qp = &frame_hdr->quantization_params;
+  const GstAV1TileInfo *ti = &frame_hdr->tile_info;
+  const GstAV1CDEFParams *cp = &frame_hdr->cdef_params;
+  const GstAV1SegmenationParams *sp = &frame_hdr->segmentation_params;
+  const GstAV1LoopFilterParams *lp = &frame_hdr->loop_filter_params;
+  const GstAV1LoopRestorationParams *lrp = &frame_hdr->loop_restoration_params;
+  const GstAV1FilmGrainParams *fgp = &frame_hdr->film_grain_params;
+  GstNvDecSurface *surface;
+  GstNvDecSurface *other_surface;
+  GstAV1Picture *other_pic;
+  guint i, j;
+
+  surface = gst_nv_av1_dec_get_decoder_surface_from_picture (self, picture);
+  if (!surface) {
+    GST_ERROR_OBJECT (self, "Decoder frame is unavailable");
+    return GST_FLOW_ERROR;
+  }
+
+  memset (params, 0, sizeof (CUVIDPICPARAMS));
+
+  params->PicWidthInMbs = GST_ROUND_UP_16 (frame_hdr->frame_width) >> 4;
+  params->FrameHeightInMbs = GST_ROUND_UP_16 (frame_hdr->frame_height) >> 4;
+  params->CurrPicIdx = surface->index;
+  params->intra_pic_flag = frame_hdr->frame_is_intra;
+
+  av1_params->width = frame_hdr->frame_width;
+  av1_params->height = frame_hdr->frame_height;
+  av1_params->frame_offset = frame_hdr->order_hint;
+  av1_params->decodePicIdx = surface->decode_frame_index;
+
+  /* sequence header */
+  av1_params->profile = seq_hdr->seq_profile;
+  av1_params->use_128x128_superblock = seq_hdr->use_128x128_superblock;
+  av1_params->subsampling_x = seq_hdr->color_config.subsampling_x;
+  av1_params->subsampling_y = seq_hdr->color_config.subsampling_y;
+  av1_params->mono_chrome = seq_hdr->color_config.mono_chrome;
+  av1_params->bit_depth_minus8 = seq_hdr->bit_depth - 8;
+  av1_params->enable_filter_intra = seq_hdr->enable_filter_intra;
+  av1_params->enable_intra_edge_filter = seq_hdr->enable_intra_edge_filter;
+  av1_params->enable_interintra_compound = seq_hdr->enable_interintra_compound;
+  av1_params->enable_masked_compound = seq_hdr->enable_masked_compound;
+  av1_params->enable_dual_filter = seq_hdr->enable_dual_filter;
+  av1_params->enable_order_hint = seq_hdr->enable_order_hint;
+  av1_params->order_hint_bits_minus1 = seq_hdr->order_hint_bits_minus_1;
+  av1_params->enable_jnt_comp = seq_hdr->enable_jnt_comp;
+  av1_params->enable_superres = seq_hdr->enable_superres;
+  av1_params->enable_cdef = seq_hdr->enable_cdef;
+  av1_params->enable_restoration = seq_hdr->enable_restoration;
+  av1_params->enable_fgs = seq_hdr->film_grain_params_present;
+
+  /* frame header */
+  av1_params->frame_type = frame_hdr->frame_type;
+  av1_params->show_frame = frame_hdr->show_frame;
+  av1_params->disable_cdf_update = frame_hdr->disable_cdf_update;
+  av1_params->allow_screen_content_tools =
+      frame_hdr->allow_screen_content_tools;
+  if (frame_hdr->force_integer_mv || frame_hdr->frame_is_intra)
+    av1_params->force_integer_mv = 1;
+  else
+    av1_params->force_integer_mv = 0;
+  if (frame_hdr->use_superres) {
+    av1_params->coded_denom =
+        frame_hdr->superres_denom - GST_AV1_SUPERRES_DENOM_MIN;
+  } else {
+    av1_params->coded_denom = 0;
+  }
+  av1_params->allow_intrabc = frame_hdr->allow_intrabc;
+  av1_params->allow_high_precision_mv = frame_hdr->allow_high_precision_mv;
+  av1_params->interp_filter = frame_hdr->interpolation_filter;
+  av1_params->switchable_motion_mode = frame_hdr->is_motion_mode_switchable;
+  av1_params->use_ref_frame_mvs = frame_hdr->use_ref_frame_mvs;
+  av1_params->disable_frame_end_update_cdf =
+      frame_hdr->disable_frame_end_update_cdf;
+  av1_params->delta_q_present = qp->delta_q_present;
+  av1_params->delta_q_res = qp->delta_q_res;
+  av1_params->using_qmatrix = qp->using_qmatrix;
+  av1_params->coded_lossless = frame_hdr->coded_lossless;
+  av1_params->use_superres = frame_hdr->use_superres;
+  av1_params->tx_mode = frame_hdr->tx_mode;
+  av1_params->reference_mode = frame_hdr->reference_select;
+  av1_params->allow_warped_motion = frame_hdr->allow_warped_motion;
+  av1_params->reduced_tx_set = frame_hdr->reduced_tx_set;
+  av1_params->skip_mode = frame_hdr->skip_mode_present;
+
+  /* tiling info */
+  av1_params->num_tile_cols = ti->tile_cols;
+  av1_params->num_tile_rows = ti->tile_rows;
+  av1_params->context_update_tile_id = ti->context_update_tile_id;
+  for (i = 0; i < ti->tile_cols; i++)
+    av1_params->tile_widthsi = ti->width_in_sbs_minus_1i + 1;
+
+  for (i = 0; i < ti->tile_rows; i++)
+    av1_params->tile_heightsi = ti->height_in_sbs_minus_1i + 1;
+
+  /* CDEF */
+  av1_params->cdef_damping_minus_3 = cp->cdef_damping - 3;
+  av1_params->cdef_bits = cp->cdef_bits;
+  for (i = 0; i < GST_AV1_CDEF_MAX; i++) {
+    guint8 primary;
+    guint8 secondary;
+
+    primary = cp->cdef_y_pri_strengthi;
+    secondary = cp->cdef_y_sec_strengthi;
+    if (secondary == 4)
+      secondary--;
+
+    av1_params->cdef_y_strengthi = (primary & 0x0f) | (secondary << 4);
+
+    primary = cp->cdef_uv_pri_strengthi;
+    secondary = cp->cdef_uv_sec_strengthi;
+    if (secondary == 4)
+      secondary--;
+
+    av1_params->cdef_uv_strengthi = (primary & 0x0f) | (secondary << 4);
+  }
+
+  /* SkipModeFrames */
+  if (frame_hdr->skip_mode_present) {
+    av1_params->SkipModeFrame0 = frame_hdr->skip_mode_frame0;
+    av1_params->SkipModeFrame1 = frame_hdr->skip_mode_frame1;
+  }
+
+  /* qp information */
+  av1_params->base_qindex = qp->base_q_idx;
+  av1_params->qp_y_dc_delta_q = qp->delta_q_y_dc;
+  av1_params->qp_u_dc_delta_q = qp->delta_q_u_dc;
+  av1_params->qp_u_ac_delta_q = qp->delta_q_u_ac;
+  av1_params->qp_v_dc_delta_q = qp->delta_q_v_dc;
+  av1_params->qp_v_ac_delta_q = qp->delta_q_v_ac;
+  av1_params->qm_y = qp->qm_y;
+  av1_params->qm_u = qp->qm_u;
+  av1_params->qm_v = qp->qm_v;
+
+  /* segmentation */
+  av1_params->segmentation_enabled = sp->segmentation_enabled;
+  av1_params->segmentation_update_map = sp->segmentation_update_map;
+  av1_params->segmentation_update_data = sp->segmentation_update_data;
+  av1_params->segmentation_temporal_update = sp->segmentation_temporal_update;
+  for (i = 0; i < GST_AV1_MAX_SEGMENTS; i++) {
+    for (j = 0; j < GST_AV1_SEG_LVL_MAX; j++) {
+      av1_params->segmentation_feature_dataij = sp->feature_dataij;
+      av1_params->segmentation_feature_maski |=
+          sp->feature_enabledij << j;
+    }
+  }
+
+  /* loopfilter */
+  av1_params->loop_filter_level0 = lp->loop_filter_level0;
+  av1_params->loop_filter_level1 = lp->loop_filter_level1;
+  av1_params->loop_filter_level_u = lp->loop_filter_level2;
+  av1_params->loop_filter_level_v = lp->loop_filter_level3;
+  av1_params->loop_filter_sharpness = lp->loop_filter_sharpness;
+  for (i = 0; i < GST_AV1_TOTAL_REFS_PER_FRAME; i++) {
+    av1_params->loop_filter_ref_deltasi = lp->loop_filter_ref_deltasi;
+  }
+  av1_params->loop_filter_mode_deltas0 = lp->loop_filter_mode_deltas0;
+  av1_params->loop_filter_mode_deltas1 = lp->loop_filter_mode_deltas1;
+  av1_params->loop_filter_delta_enabled = lp->loop_filter_delta_enabled;
+  av1_params->loop_filter_delta_update = lp->loop_filter_delta_update;
+  av1_params->delta_lf_present = lp->delta_lf_present;
+  av1_params->delta_lf_res = lp->delta_lf_res;
+  av1_params->delta_lf_multi = lp->delta_lf_multi;
+
+  /* restoration */
+  for (i = 0; i < 3; i++) {
+    av1_params->lr_unit_sizei =
+        gst_nv_av1_dec_get_lr_unit_size (lrp->loop_restoration_sizei);
+  }
+  av1_params->lr_type0 = lrp->frame_restoration_type0;
+  av1_params->lr_type1 = lrp->frame_restoration_type1;
+  av1_params->lr_type2 = lrp->frame_restoration_type2;
+
+  /* reference frames */
+  for (i = 0; i < GST_AV1_TOTAL_REFS_PER_FRAME; i++) {
+    guint8 ref_idx = 0xff;
+
+    other_pic = dpb->pic_listi;
+    if (other_pic) {
+      other_surface =
+          gst_nv_av1_dec_get_decoder_surface_from_picture (self, other_pic);
+      if (!other_surface) {
+        GST_ERROR_OBJECT (self, "reference frame is unavailable");
+        return GST_FLOW_ERROR;
+      }
+
+      ref_idx = other_surface->decode_frame_index;
+    }
+
+    av1_params->ref_frame_mapi = ref_idx;
+  }
+
+  if (frame_hdr->primary_ref_frame == GST_AV1_PRIMARY_REF_NONE) {
+    av1_params->primary_ref_frame = 0xff;
+  } else {
+    guint8 primary_ref_idx;
+
+    g_assert (frame_hdr->primary_ref_frame < 8);
+
+    primary_ref_idx = frame_hdr->ref_frame_idxframe_hdr->primary_ref_frame;
+    av1_params->primary_ref_frame = av1_params->ref_frame_mapprimary_ref_idx;
+  }
+  av1_params->temporal_layer_id = picture->temporal_id;
+  av1_params->spatial_layer_id = picture->spatial_id;
+
+  /* ref frame list and global motion */
+  for (i = 0; i < GST_AV1_REFS_PER_FRAME; i++) {
+    gint8 ref_idx = frame_hdr->ref_frame_idxi;
+
+    other_pic = nullptr;
+
+    if (ref_idx >= 0)
+      other_pic = dpb->pic_listref_idx;
+
+    if (other_pic) {
+      other_surface =
+          gst_nv_av1_dec_get_decoder_surface_from_picture (self, other_pic);
+
+      av1_params->ref_framei.index = other_surface->decode_frame_index;
+      av1_params->ref_framei.width = other_pic->frame_hdr.frame_width;
+      av1_params->ref_framei.height = other_pic->frame_hdr.frame_height;
+    } else {
+      av1_params->ref_framei.index = 0xff;
+    }
+
+    av1_params->global_motioni.invalid = gmp->invalidi;
+    av1_params->global_motioni.wmtype =
+        gmp->gm_typeGST_AV1_REF_LAST_FRAME + i;
+    for (j = 0; j < 6; j++) {
+      av1_params->global_motioni.wmmatj =
+          gmp->gm_paramsGST_AV1_REF_LAST_FRAME + ij;
+    }
+  }
+
+  /* film grain params */
+  if (seq_hdr->film_grain_params_present) {
+    av1_params->apply_grain = fgp->apply_grain;
+    av1_params->overlap_flag = fgp->overlap_flag;
+    av1_params->scaling_shift_minus8 = fgp->grain_scaling_minus_8;
+    av1_params->chroma_scaling_from_luma = fgp->chroma_scaling_from_luma;
+    av1_params->ar_coeff_lag = fgp->ar_coeff_lag;
+    av1_params->ar_coeff_shift_minus6 = fgp->ar_coeff_shift_minus_6;
+    av1_params->grain_scale_shift = fgp->grain_scale_shift;
+    av1_params->clip_to_restricted_range = fgp->clip_to_restricted_range;
+    av1_params->num_y_points = fgp->num_y_points;
+    for (i = 0; i < fgp->num_y_points && i < 14; i++) {
+      av1_params->scaling_points_yi0 = fgp->point_y_valuei;
+      av1_params->scaling_points_yi1 = fgp->point_y_scalingi;
+    }
+
+    av1_params->num_cb_points = fgp->num_cb_points;
+    for (i = 0; i < fgp->num_cb_points && i < 10; i++) {
+      av1_params->scaling_points_cbi0 = fgp->point_cb_valuei;
+      av1_params->scaling_points_cbi1 = fgp->point_cb_scalingi;
+    }
+
+    av1_params->num_cr_points = fgp->num_cr_points;
+    for (i = 0; i < fgp->num_cr_points && i < 10; i++) {
+      av1_params->scaling_points_cri0 = fgp->point_cr_valuei;
+      av1_params->scaling_points_cri1 = fgp->point_cr_scalingi;
+    }
+
+    av1_params->random_seed = fgp->grain_seed;
+    for (i = 0; i < 24; i++) {
+      av1_params->ar_coeffs_yi = (short) fgp->ar_coeffs_y_plus_128i - 128;
+    }
+
+    for (i = 0; i < 25; i++) {
+      av1_params->ar_coeffs_cbi = (short) fgp->ar_coeffs_cb_plus_128i - 128;
+      av1_params->ar_coeffs_cri = (short) fgp->ar_coeffs_cr_plus_128i - 128;
+    }
+    av1_params->cb_mult = fgp->cb_mult;
+    av1_params->cb_luma_mult = fgp->cb_luma_mult;
+    av1_params->cb_offset = fgp->cb_offset;
+    av1_params->cr_mult = fgp->cr_mult;
+    av1_params->cr_luma_mult = fgp->cr_luma_mult;
+    av1_params->cr_offset = fgp->cr_offset;
+  }
+
+  gst_nv_av1_dec_reset_bitstream_params (self);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_av1_dec_decode_tile (GstAV1Decoder * decoder,
+    GstAV1Picture * picture, GstAV1Tile * tile)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+  GstAV1TileGroupOBU *tile_group = &tile->tile_group;
+  guint i;
+  guint buffer_size;
+
+  if (tile_group->num_tiles * 2 > self->tile_offsets_alloc_len) {
+    self->tile_offsets_alloc_len = tile_group->num_tiles * 2;
+
+    self->tile_offsets = (guint *) g_realloc_n (self->tile_offsets,
+        self->tile_offsets_alloc_len, sizeof (guint));
+  }
+
+  self->num_tiles = tile_group->num_tiles;
+
+  for (i = tile_group->tg_start; i <= tile_group->tg_end; i++) {
+    guint offset = self->bitstream_buffer_offset +
+        tile_group->entryi.tile_offset;
+
+    self->tile_offsetsi * 2 = offset;
+    self->tile_offsetsi * 2 + 1 = offset + tile_group->entryi.tile_size;
+  }
+
+  buffer_size = self->bitstream_buffer_offset + tile->obu.obu_size;
+  if (buffer_size > self->bitstream_buffer_alloc_size) {
+    guint alloc_size = buffer_size * 2;
+
+    self->bitstream_buffer = (guint8 *) g_realloc (self->bitstream_buffer,
+        alloc_size);
+    self->bitstream_buffer_alloc_size = alloc_size;
+  }
+
+  memcpy (self->bitstream_buffer + self->bitstream_buffer_offset,
+      tile->obu.data, tile->obu.obu_size);
+
+  self->bitstream_buffer_offset += tile->obu.obu_size;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_av1_dec_end_picture (GstAV1Decoder * decoder, GstAV1Picture * picture)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+  gboolean ret;
+  CUVIDPICPARAMS *params = &self->params;
+
+  params->nBitstreamDataLen = self->bitstream_buffer_offset;
+  params->pBitstreamData = self->bitstream_buffer;
+  params->nNumSlices = self->num_tiles;
+  params->pSliceDataOffsets = self->tile_offsets;
+
+  ret = gst_nv_decoder_decode (self->decoder, params);
+
+  if (!ret) {
+    GST_ERROR_OBJECT (self, "Failed to decode picture");
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_av1_dec_output_picture (GstAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+
+  return gst_nv_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, GST_CODEC_PICTURE (picture), 0);
+}
+
+static guint
+gst_nv_av1_dec_get_preferred_output_delay (GstAV1Decoder * decoder,
+    gboolean is_live)
+{
+  GstNvAV1Dec *self = GST_NV_AV1_DEC (decoder);
+
+  if (self->max_display_delay >= 0)
+    return self->max_display_delay;
+
+  /* Prefer to zero latency for live pipeline */
+  if (is_live)
+    return 0;
+
+  return 2;
+}
+
+void
+gst_nv_av1_dec_register (GstPlugin * plugin, guint device_id,
+    gint64 adapter_luid, guint rank, GstCaps * sink_caps, GstCaps * src_caps)
+{
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  guint index = 0;
+  const GValue *value;
+  GstStructure *s;
+  GTypeInfo type_info = {
+    sizeof (GstNvAV1DecClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_nv_av1_dec_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstNvAV1Dec),
+    0,
+    (GInstanceInitFunc) gst_nv_av1_dec_init,
+  };
+  GstNvDecoderClassData *cdata;
+
+  GST_DEBUG_CATEGORY_INIT (gst_nv_av1_dec_debug, "nvav1dec", 0, "nvav1dec");
+
+  cdata = g_new0 (GstNvDecoderClassData, 1);
+
+  s = gst_caps_get_structure (sink_caps, 0);
+  value = gst_structure_get_value (s, "width");
+  cdata->max_width = (guint) gst_value_get_int_range_max (value);
+
+  value = gst_structure_get_value (s, "height");
+  cdata->max_height = (guint) gst_value_get_int_range_max (value);
+
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+  cdata->cuda_device_id = device_id;
+  cdata->adapter_luid = adapter_luid;
+
+  type_info.class_data = cdata;
+
+  type_name = g_strdup ("GstNvAV1Dec");
+  feature_name = g_strdup ("nvav1dec");
+
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstNvAV1Device%dDec", index);
+    feature_name = g_strdup_printf ("nvav1device%ddec", index);
+  }
+
+  type = g_type_register_static (GST_TYPE_AV1_DECODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  /* make lower rank than default device */
+  if (rank > 0 && index != 0)
+    rank--;
+
+  if (index != 0)
+    gst_element_type_set_skip_documentation (type);
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvav1dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvav1dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvbaseenc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvbaseenc.c Changed

@@ -22,8 +22,6 @@
 #endif
 
 #include "gstnvbaseenc.h"
-#include <gst/cuda/gstcudautils.h>
-#include <gst/cuda/gstcudabufferpool.h>
 
 #include <gst/pbutils/codec-utils.h>
 
@@ -32,7 +30,7 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_nvenc_debug);
 #define GST_CAT_DEFAULT gst_nvenc_debug
 
-#if HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
 #include <gst/gl/gl.h>
 #endif
 
@@ -462,7 +460,13 @@
   params.deviceType = NV_ENC_DEVICE_TYPE_CUDA;
   nv_ret = NvEncOpenEncodeSessionEx (&params, &nvenc->encoder);
 
-  return nv_ret == NV_ENC_SUCCESS;
+  if (nv_ret != NV_ENC_SUCCESS) {
+    /* Report error to abort if GST_CUDA_CRITICAL_ERRORS is configured */
+    gst_cuda_result (CUDA_ERROR_NO_DEVICE);
+    return FALSE;
+  }
+
+  return TRUE;
 }
 
 static gboolean
@@ -471,7 +475,6 @@
   GstNvBaseEnc *nvenc = GST_NV_BASE_ENC (enc);
   GstNvBaseEncClass *klass = GST_NV_BASE_ENC_GET_CLASS (enc);
   GValue *formats = NULL;
-  CUresult cuda_ret;
 
   if (!gst_cuda_ensure_element_context (GST_ELEMENT_CAST (enc),
           klass->cuda_device_id, &nvenc->cuda_ctx)) {
@@ -479,14 +482,10 @@
     return FALSE;
   }
 
-  if (gst_cuda_context_push (nvenc->cuda_ctx)) {
-    cuda_ret = CuStreamCreate (&nvenc->cuda_stream, CU_STREAM_DEFAULT);
-    if (!gst_cuda_result (cuda_ret)) {
-      GST_WARNING_OBJECT (nvenc,
-          "Could not create cuda stream, will use default stream");
-      nvenc->cuda_stream = NULL;
-    }
-    gst_cuda_context_pop (NULL);
+  nvenc->stream = gst_cuda_stream_new (nvenc->cuda_ctx);
+  if (!nvenc->stream) {
+    GST_WARNING_OBJECT (nvenc,
+        "Could not create cuda stream, will use default stream");
   }
 
   if (!gst_nv_base_enc_open_encode_session (nvenc)) {
@@ -520,7 +519,7 @@
           &nvenc->cuda_ctx)) {
     goto done;
   }
-#if HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   gst_gl_handle_set_context (element, context,
       (GstGLDisplay **) & nvenc->display,
       (GstGLContext **) & nvenc->other_context);
@@ -544,7 +543,7 @@
               query, nvenc->cuda_ctx))
         return TRUE;
 
-#if HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
       {
         gboolean ret;
 
@@ -569,7 +568,7 @@
   return GST_VIDEO_ENCODER_CLASS (parent_class)->sink_query (enc, query);
 }
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
 static gboolean
 gst_nv_base_enc_ensure_gl_context (GstNvBaseEnc * nvenc)
 {
@@ -640,7 +639,7 @@
   }
 
   features = gst_caps_get_features (caps, 0);
-#if HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   if (features && gst_caps_features_contains (features,
           GST_CAPS_FEATURE_MEMORY_GL_MEMORY)) {
     GST_DEBUG_OBJECT (nvenc, "upsteram support GL memory");
@@ -732,7 +731,7 @@
   memset (&nvenc->init_params, 0, sizeof (NV_ENC_INITIALIZE_PARAMS));
   memset (&nvenc->config, 0, sizeof (NV_ENC_CONFIG));
 
-#if HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   {
     gst_gl_ensure_element_data (GST_ELEMENT (nvenc),
         (GstGLDisplay **) & nvenc->display,
@@ -1000,15 +999,8 @@
     nvenc->encoder = NULL;
   }
 
-  if (nvenc->cuda_ctx && nvenc->cuda_stream) {
-    if (gst_cuda_context_push (nvenc->cuda_ctx)) {
-      gst_cuda_result (CuStreamDestroy (nvenc->cuda_stream));
-      gst_cuda_context_pop (NULL);
-    }
-  }
-
+  gst_clear_cuda_stream (&nvenc->stream);
   gst_clear_object (&nvenc->cuda_ctx);
-  nvenc->cuda_stream = NULL;
 
   GST_OBJECT_LOCK (nvenc);
   if (nvenc->input_formats)
@@ -1887,7 +1879,7 @@
             GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY)) {
       nvenc->mem_type = GST_NVENC_MEM_TYPE_CUDA;
     }
-#if HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
     else if (gst_caps_features_contains (features,
             GST_CAPS_FEATURE_MEMORY_GL_MEMORY)) {
       nvenc->mem_type = GST_NVENC_MEM_TYPE_GL;
@@ -2025,7 +2017,7 @@
   }
 }
 
-#if HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
 typedef struct _GstNvEncRegisterResourceData
 {
   GstMemory *mem;
@@ -2133,6 +2125,7 @@
   CUDA_MEMCPY2D param;
   GstCudaGraphicsResource **resources;
   guint num_resources;
+  CUstream stream = gst_cuda_stream_get_handle (nvenc->stream);
 
   data->ret = FALSE;
 
@@ -2174,7 +2167,7 @@
         gl_mem->mem.tex_id);
 
     cuda_resource =
-        gst_cuda_graphics_resource_map (resourcesi, nvenc->cuda_stream,
+        gst_cuda_graphics_resource_map (resourcesi, stream,
         CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY);
 
     if (!cuda_resource) {
@@ -2212,18 +2205,18 @@
     param.WidthInBytes = _get_plane_width (data->info, i);
     param.Height = _get_plane_height (data->info, i);
 
-    cuda_ret = CuMemcpy2DAsync (&param, nvenc->cuda_stream);
+    cuda_ret = CuMemcpy2DAsync (&param, stream);
     if (!gst_cuda_result (cuda_ret)) {
       GST_ERROR_OBJECT (data->nvenc, "failed to copy GL texture %u into cuda "
           "ret :%d", gl_mem->mem.tex_id, cuda_ret);
       g_assert_not_reached ();
     }
 
-    gst_cuda_graphics_resource_unmap (resourcesi, nvenc->cuda_stream);
+    gst_cuda_graphics_resource_unmap (resourcesi, stream);
 
     data_pointer += dest_stride * _get_plane_height (&nvenc->input_info, i);
   }
-  gst_cuda_result (CuStreamSynchronize (nvenc->cuda_stream));
+  gst_cuda_result (CuStreamSynchronize (stream));
   gst_cuda_context_pop (NULL);
 
   data->ret = TRUE;
@@ -2232,12 +2225,14 @@
 
 static gboolean
 gst_nv_base_enc_upload_frame (GstNvBaseEnc * nvenc, GstVideoFrame * frame,
-    GstNvEncInputResource * resource, gboolean use_device_memory)
+    GstNvEncInputResource * resource, gboolean use_device_memory,
+    GstCudaStream * stream)
 {
   gint i;
   CUdeviceptr dst = resource->cuda_pointer;
   GstVideoInfo *info = &frame->info;
   CUresult cuda_ret;
+  CUstream stream_handle = gst_cuda_stream_get_handle (stream);
 
   if (!gst_cuda_context_push (nvenc->cuda_ctx)) {
     GST_ERROR_OBJECT (nvenc, "cannot push context");
@@ -2264,7 +2259,7 @@
     param.WidthInBytes = _get_plane_width (info, i);
     param.Height = _get_plane_height (info, i);
 
-    cuda_ret = CuMemcpy2DAsync (&param, nvenc->cuda_stream);
+    cuda_ret = CuMemcpy2DAsync (&param, stream_handle);
     if (!gst_cuda_result (cuda_ret)) {
       GST_ERROR_OBJECT (nvenc, "cannot copy %dth plane, ret %d", i, cuda_ret);
       gst_cuda_context_pop (NULL);
@@ -2275,7 +2270,7 @@
     dst += dest_stride * _get_plane_height (&nvenc->input_info, i);
   }
 
-  gst_cuda_result (CuStreamSynchronize (nvenc->cuda_stream));
+  gst_cuda_result (CuStreamSynchronize (stream_handle));
   gst_cuda_context_pop (NULL);
 
   return TRUE;
@@ -2416,6 +2411,7 @@
   GstNvEncFrameState *state = NULL;
   GstNvEncInputResource *resource = NULL;
   gboolean use_device_memory = FALSE;
+  GstCudaStream *stream = nvenc->stream;
 
   g_assert (nvenc->encoder != NULL);
 
@@ -2439,7 +2435,7 @@
     /* reconfigured encode session should start from keyframe */
     GST_VIDEO_CODEC_FRAME_SET_FORCE_KEYFRAME (frame);
   }
-#if HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   if (nvenc->mem_type == GST_NVENC_MEM_TYPE_GL)
     in_map_flags |= GST_MAP_GL;
 #endif
@@ -2457,8 +2453,14 @@
           (gst_cuda_context_can_access_peer (cmem->context, nvenc->cuda_ctx) &&
               gst_cuda_context_can_access_peer (nvenc->cuda_ctx,
                   cmem->context))) {
+        GstCudaStream *mem_stream;
+
         use_device_memory = TRUE;
         in_map_flags |= GST_MAP_CUDA;
+
+        mem_stream = gst_cuda_memory_get_stream (cmem);
+        if (mem_stream)
+          stream = mem_stream;
       }
     }
   }
@@ -2481,7 +2483,7 @@
 
   resource = state->in_buf;
 
-#if HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   if (nvenc->mem_type == GST_NVENC_MEM_TYPE_GL) {
     GstGLMemory *gl_mem;
     GstNvEncGLMapData data;
@@ -2503,7 +2505,7 @@
   } else
 #endif
   if (!gst_nv_base_enc_upload_frame (nvenc,
-          &vframe, resource, use_device_memory)) {
+          &vframe, resource, use_device_memory, stream)) {
     flow = GST_FLOW_ERROR;
     goto unmap_and_drop;
   }

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvbaseenc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvbaseenc.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvcodecutils.h Added

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvdec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvdec.c Changed

@@ -29,9 +29,6 @@
 #include "config.h"
 #endif
 
-#include <gst/cuda/gstcudautils.h>
-#include <gst/cuda/gstcudabufferpool.h>
-
 #include "gstcuvidloader.h"
 #include "gstnvdec.h"
 
@@ -49,7 +46,7 @@
   PROP_CUDA_DEVICE_ID,
 };
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
 #define SUPPORTED_GL_APIS (GST_GL_API_OPENGL | GST_GL_API_OPENGL3 | GST_GL_API_GLES2)
 
 static gboolean
@@ -61,7 +58,7 @@
 gst_nvdec_copy_device_to_memory (GstNvDec * nvdec,
     CUVIDPARSERDISPINFO * dispinfo, GstBuffer * output_buffer);
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
 typedef struct _GstNvDecRegisterResourceData
 {
   GstMemory *mem;
@@ -151,7 +148,7 @@
 
   return cgr_info;
 }
-#endif /* HAVE_NVCODEC_GST_GL */
+#endif /* HAVE_CUDA_GST_GL */
 
 static gboolean gst_nvdec_open (GstVideoDecoder * decoder);
 static gboolean gst_nvdec_start (GstVideoDecoder * decoder);
@@ -170,7 +167,7 @@
 static GstFlowReturn gst_nvdec_drain (GstVideoDecoder * decoder);
 static GstFlowReturn gst_nvdec_finish (GstVideoDecoder * decoder);
 static gboolean gst_nvdec_negotiate (GstVideoDecoder * decoder);
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
 static gboolean gst_nvdec_ensure_gl_context (GstNvDec * nvdec);
 #endif
 
@@ -641,7 +638,7 @@
           have_cuda = TRUE;
           break;
         }
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
         if (nvdec->gl_display &&
             features && gst_caps_features_contains (features,
                 GST_CAPS_FEATURE_MEMORY_GL_MEMORY)) {
@@ -659,7 +656,7 @@
     gst_clear_caps (&caps);
   }
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   if (nvdec->mem_type == GST_NVDEC_MEM_TYPE_GL &&
       !gst_nvdec_ensure_gl_context (nvdec)) {
     GST_WARNING_OBJECT (nvdec,
@@ -674,7 +671,7 @@
       gst_caps_set_features (state->caps, 0,
           gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY, NULL));
       break;
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
     case GST_NVDEC_MEM_TYPE_GL:
       GST_DEBUG_OBJECT (nvdec, "use gl memory");
       gst_caps_set_features (state->caps, 0,
@@ -808,10 +805,14 @@
     GST_BUFFER_PTS (output_buffer) = dispinfo->timestamp;
     GST_BUFFER_DTS (output_buffer) = GST_CLOCK_TIME_NONE;
     /* assume buffer duration from framerate */
-    GST_BUFFER_DURATION (output_buffer) =
-        gst_util_uint64_scale (GST_SECOND,
-        GST_VIDEO_INFO_FPS_D (&nvdec->out_info),
-        GST_VIDEO_INFO_FPS_N (&nvdec->out_info));
+    if (nvdec->out_info.fps_n > 0 && nvdec->out_info.fps_d > 0) {
+      GST_BUFFER_DURATION (output_buffer) =
+          gst_util_uint64_scale (GST_SECOND,
+          GST_VIDEO_INFO_FPS_D (&nvdec->out_info),
+          GST_VIDEO_INFO_FPS_N (&nvdec->out_info));
+    } else {
+      GST_BUFFER_DURATION (output_buffer) = GST_CLOCK_TIME_NONE;
+    }
   } else {
     ret = gst_video_decoder_allocate_output_frame (GST_VIDEO_DECODER (nvdec),
         frame);
@@ -831,7 +832,7 @@
     }
   }
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   if (nvdec->mem_type == GST_NVDEC_MEM_TYPE_GL) {
     copy_ret = gst_nvdec_copy_device_to_gl (nvdec, dispinfo, output_buffer);
 
@@ -899,7 +900,6 @@
 {
   GstNvDec *nvdec = GST_NVDEC (decoder);
   GstNvDecClass *klass = GST_NVDEC_GET_CLASS (nvdec);
-  CUresult cuda_ret;
 
   GST_DEBUG_OBJECT (nvdec, "creating CUDA context");
 
@@ -909,16 +909,12 @@
     return FALSE;
   }
 
-  if (gst_cuda_context_push (nvdec->cuda_ctx)) {
-    cuda_ret = CuStreamCreate (&nvdec->cuda_stream, CU_STREAM_DEFAULT);
-    if (!gst_cuda_result (cuda_ret)) {
-      GST_WARNING_OBJECT (nvdec,
-          "Could not create CUDA stream, will use default stream");
-      nvdec->cuda_stream = NULL;
-    }
-    gst_cuda_context_pop (NULL);
+  nvdec->stream = gst_cuda_stream_new (nvdec->cuda_ctx);
+  if (!nvdec->stream) {
+    GST_WARNING_OBJECT (nvdec,
+        "Could not create CUDA stream, will use default stream");
   }
-#if HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   gst_gl_ensure_element_data (GST_ELEMENT (nvdec),
       &nvdec->gl_display, &nvdec->other_gl_context);
   if (nvdec->gl_display)
@@ -1020,7 +1016,7 @@
   if (!maybe_destroy_decoder_and_parser (nvdec))
     return FALSE;
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   gst_clear_object (&nvdec->gl_context);
   gst_clear_object (&nvdec->other_gl_context);
   gst_clear_object (&nvdec->gl_display);
@@ -1042,15 +1038,8 @@
 {
   GstNvDec *nvdec = GST_NVDEC (decoder);
 
-  if (nvdec->cuda_ctx && nvdec->cuda_stream) {
-    if (gst_cuda_context_push (nvdec->cuda_ctx)) {
-      gst_cuda_result (CuStreamDestroy (nvdec->cuda_stream));
-      gst_cuda_context_pop (NULL);
-    }
-  }
-
+  gst_clear_cuda_stream (&nvdec->stream);
   gst_clear_object (&nvdec->cuda_ctx);
-  nvdec->cuda_stream = NULL;
 
   return TRUE;
 }
@@ -1139,7 +1128,7 @@
   return ret;
 }
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
 typedef struct
 {
   GstNvDec *nvdec;
@@ -1161,13 +1150,14 @@
   guint pitch, i;
   CUDA_MEMCPY2D mcpy2d = { 0, };
   GstVideoInfo *info = &nvdec->output_state->info;
+  CUstream stream = gst_cuda_stream_get_handle (nvdec->stream);
 
   GST_LOG_OBJECT (nvdec, "picture index: %u", dispinfo->picture_index);
 
   proc_params.progressive_frame = dispinfo->progressive_frame;
   proc_params.top_field_first = dispinfo->top_field_first;
   proc_params.unpaired_field = dispinfo->repeat_first_field == -1;
-  proc_params.output_stream = nvdec->cuda_stream;
+  proc_params.output_stream = stream;
 
   data->ret = TRUE;
 
@@ -1211,7 +1201,7 @@
     CUdeviceptr cuda_ptr;
     gsize size;
     CUgraphicsResource cuda_resource =
-        gst_cuda_graphics_resource_map (resourcesi, nvdec->cuda_stream,
+        gst_cuda_graphics_resource_map (resourcesi, stream,
         CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD);
 
     if (!cuda_resource) {
@@ -1235,17 +1225,17 @@
     mcpy2d.dstDevice = cuda_ptr;
     mcpy2d.Height = GST_VIDEO_INFO_COMP_HEIGHT (info, i);
 
-    if (!gst_cuda_result (CuMemcpy2DAsync (&mcpy2d, nvdec->cuda_stream))) {
+    if (!gst_cuda_result (CuMemcpy2DAsync (&mcpy2d, stream))) {
       GST_WARNING_OBJECT (nvdec, "memcpy to mapped array failed");
       data->ret = FALSE;
     }
   }
 
-  gst_cuda_result (CuStreamSynchronize (nvdec->cuda_stream));
+  gst_cuda_result (CuStreamSynchronize (stream));
 
 unmap_video_frame:
   for (i = 0; i < num_resources; i++) {
-    gst_cuda_graphics_resource_unmap (resourcesi, nvdec->cuda_stream);
+    gst_cuda_graphics_resource_unmap (resourcesi, stream);
   }
 
   if (!gst_cuda_result (CuvidUnmapVideoFrame (nvdec->decoder, dptr)))
@@ -1286,13 +1276,23 @@
   gint i;
   GstMemory *mem;
   gboolean use_device_copy = FALSE;
+  gboolean need_sync = TRUE;
   GstMapFlags map_flags = GST_MAP_WRITE;
+  CUstream stream = gst_cuda_stream_get_handle (nvdec->stream);
 
   if (nvdec->mem_type == GST_NVDEC_MEM_TYPE_CUDA &&
       (mem = gst_buffer_peek_memory (output_buffer, 0)) &&
       gst_is_cuda_memory (mem)) {
+    GstCudaStream *mem_stream;
+
     map_flags |= GST_MAP_CUDA;
     use_device_copy = TRUE;
+
+    mem_stream = gst_cuda_memory_get_stream (GST_CUDA_MEMORY_CAST (mem));
+    if (mem_stream) {
+      stream = gst_cuda_stream_get_handle (mem_stream);
+      need_sync = FALSE;
+    }
   }
 
   if (!gst_video_frame_map (&video_frame, info, output_buffer, map_flags)) {
@@ -1310,7 +1310,7 @@
   params.second_field = dispinfo->repeat_first_field + 1;
   params.top_field_first = dispinfo->top_field_first;
   params.unpaired_field = dispinfo->repeat_first_field < 0;
-  params.output_stream = nvdec->cuda_stream;
+  params.output_stream = stream;
 
   if (!gst_cuda_result (CuvidMapVideoFrame (nvdec->decoder,
               dispinfo->picture_index, &dptr, &pitch, &params))) {
@@ -1337,7 +1337,7 @@
         * GST_VIDEO_INFO_COMP_PSTRIDE (info, i);
     copy_params.Height = GST_VIDEO_INFO_COMP_HEIGHT (info, i);
 
-    if (!gst_cuda_result (CuMemcpy2DAsync (&copy_params, nvdec->cuda_stream))) {
+    if (!gst_cuda_result (CuMemcpy2DAsync (&copy_params, stream))) {
       GST_ERROR_OBJECT (nvdec, "failed to copy %dth plane", i);
       CuvidUnmapVideoFrame (nvdec->decoder, dptr);
       gst_video_frame_unmap (&video_frame);
@@ -1346,7 +1346,8 @@
     }
   }
 
-  gst_cuda_result (CuStreamSynchronize (nvdec->cuda_stream));
+  if (need_sync)
+    gst_cuda_result (CuStreamSynchronize (stream));
 
   gst_video_frame_unmap (&video_frame);
 
@@ -1763,7 +1764,7 @@
   return gst_nvdec_drain (decoder);
 }
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
 static void
 gst_nvdec_check_cuda_device_from_context (GstGLContext * context,
     gboolean * ret)
@@ -1945,7 +1946,7 @@
   if (nvdec->mem_type == GST_NVDEC_MEM_TYPE_SYSTEM)
     goto done;
 
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   if (nvdec->mem_type == GST_NVDEC_MEM_TYPE_GL) {
     if (!gst_nvdec_ensure_gl_pool (nvdec, query))
       return FALSE;
@@ -1971,7 +1972,7 @@
               query, nvdec->cuda_ctx)) {
         return TRUE;
       }
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
       if (gst_gl_handle_context_query (GST_ELEMENT (decoder), query,
               nvdec->gl_display, nvdec->gl_context, nvdec->other_gl_context)) {
         if (nvdec->gl_display)
@@ -2002,7 +2003,7 @@
           context, klass->cuda_device_id, &nvdec->cuda_ctx)) {
     goto done;
   }
-#ifdef HAVE_NVCODEC_GST_GL
+#ifdef HAVE_CUDA_GST_GL
   gst_gl_handle_set_context (element, context, &nvdec->gl_display,
       &nvdec->other_gl_context);
 #endif

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvdec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvdec.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvdecobject.cpp Added

@@ -0,0 +1,622 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstnvdecobject.h"
+#include <vector>
+#include <mutex>
+#include <condition_variable>
+#include <map>
+#include <memory>
+#include <string.h>
+#include <algorithm>
+#include <gst/cuda/gstcuda-private.h>
+
+extern "C"
+{
+  GST_DEBUG_CATEGORY_EXTERN (gst_nv_decoder_debug);
+}
+
+#define GST_CAT_DEFAULT gst_nv_decoder_debug
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstNvDecSurface, gst_nv_dec_surface);
+static GstNvDecSurface *gst_nv_dec_surface_new (guint seq_num);
+
+/* *INDENT-OFF* */
+struct GstNvDecOutput
+{
+  GstNvDecObject *self = nullptr;
+  CUdeviceptr devptr = 0;
+  guint seq_num = 0;
+};
+
+struct GstNvDecObjectPrivate
+{
+  std::vector < GstNvDecSurface * >surface_queue;
+  std::map < CUdeviceptr, GstMemory *> output_map;
+  std::map < CUdeviceptr, GstMemory *> free_output_map;
+
+  std::mutex lock;
+  std::condition_variable cond;
+};
+/* *INDENT-ON* */
+
+struct _GstNvDecObject
+{
+  GstObject parent;
+
+  GstNvDecObjectPrivate *priv;
+
+  CUvideodecoder handle;
+  CUVIDDECODECREATEINFO create_info;
+
+  GstVideoInfo video_info;
+
+  GstCudaContext *context;
+
+  gboolean flushing;
+
+  guint pool_size;
+  guint num_mapped;
+  gboolean alloc_aux_frame;
+  guint plane_height;
+  guint seq_num;
+};
+
+static void gst_nv_dec_object_finalize (GObject * object);
+
+#define gst_nv_dec_object_parent_class parent_class
+G_DEFINE_TYPE (GstNvDecObject, gst_nv_dec_object, GST_TYPE_OBJECT);
+
+static void
+gst_nv_dec_object_class_init (GstNvDecObjectClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gst_nv_dec_object_finalize;
+}
+
+static void
+gst_nv_dec_object_init (GstNvDecObject * self)
+{
+  self->priv = new GstNvDecObjectPrivate ();
+}
+
+static void
+gst_nv_dec_object_finalize (GObject * object)
+{
+  GstNvDecObject *self = GST_NV_DEC_OBJECT (object);
+  GstNvDecObjectPrivate *priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Finalize");
+
+  gst_cuda_context_push (self->context);
+  /* *INDENT-OFF* */
+  for (auto it : priv->surface_queue)
+    gst_nv_dec_surface_unref (it);
+
+  /* *INDENT-OFF* */
+  for (auto it : priv->free_output_map)
+    gst_memory_unref (it.second);
+  /* *INDENT-ON* */
+
+  delete self->priv;
+
+  CuvidDestroyDecoder (self->handle);
+  gst_cuda_context_pop (nullptr);
+
+  gst_object_unref (self->context);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GstNvDecObject *
+gst_nv_dec_object_new (GstCudaContext * context,
+    CUVIDDECODECREATEINFO * create_info, const GstVideoInfo * video_info,
+    gboolean alloc_aux_frame)
+{
+  GstNvDecObject *self;
+  CUresult ret;
+  CUvideodecoder handle = nullptr;
+  guint pool_size;
+
+  if (!gst_cuda_context_push (context)) {
+    GST_ERROR_OBJECT (context, "Failed to push context");
+    return nullptr;
+  }
+
+  ret = CuvidCreateDecoder (&handle, create_info);
+  gst_cuda_context_pop (nullptr);
+
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (context, "Could not create decoder instance");
+    return nullptr;
+  }
+
+  pool_size = create_info->ulNumDecodeSurfaces;
+  if (alloc_aux_frame)
+    pool_size /= 2;
+
+  self = (GstNvDecObject *)
+      g_object_new (GST_TYPE_NV_DEC_OBJECT, nullptr);
+  gst_object_ref_sink (self);
+  self->context = (GstCudaContext *) gst_object_ref (context);
+  self->handle = handle;
+  self->create_info = *create_info;
+  self->video_info = *video_info;
+  self->pool_size = pool_size;
+  self->plane_height = create_info->ulTargetHeight;
+
+  for (guint i = 0; i < pool_size; i++) {
+    GstNvDecSurface *surf = gst_nv_dec_surface_new (0);
+
+    surf->index = i;
+
+    /* 0, pool_size - 1: output picture
+     * pool_size, pool_size * 2 - 1: decoder output without film-grain,
+     * used for reference picture */
+    if (alloc_aux_frame)
+      surf->decode_frame_index = i + pool_size;
+    else
+      surf->decode_frame_index = i;
+
+    self->priv->surface_queue.push_back (surf);
+  }
+
+  return self;
+}
+
+gboolean
+gst_nv_dec_object_reconfigure (GstNvDecObject * object,
+    CUVIDRECONFIGUREDECODERINFO * reconfigure_info,
+    const GstVideoInfo * video_info, gboolean alloc_aux_frame)
+{
+  GstNvDecObjectPrivate *priv = object->priv;
+  CUresult ret;
+  guint pool_size;
+
+  if (!gst_cuvid_can_reconfigure ())
+    return FALSE;
+
+  pool_size = reconfigure_info->ulNumDecodeSurfaces;
+  if (alloc_aux_frame)
+    pool_size /= 2;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  if (!gst_cuda_context_push (object->context)) {
+    GST_ERROR_OBJECT (object, "Couldn't push context");
+    return FALSE;
+  }
+
+  ret = CuvidReconfigureDecoder (object->handle, reconfigure_info);
+  gst_cuda_context_pop (nullptr);
+
+  if (!gst_cuda_result (ret)) {
+    GST_ERROR_OBJECT (object, "Couldn't reconfigure decoder");
+    return FALSE;
+  }
+
+  if ((guint) priv->surface_queue.size () != object->pool_size) {
+    GST_WARNING_OBJECT (object, "Unused surfaces %u != pool size %u",
+        (guint) priv->surface_queue.size (), object->pool_size);
+  }
+
+  /* Release old surfaces and create new ones */
+  /* *INDENT-OFF* */
+  for (auto it : priv->surface_queue)
+    gst_nv_dec_surface_unref (it);
+  /* *INDENT-ON* */
+
+  priv->surface_queue.clear ();
+
+  object->pool_size = pool_size;
+  object->video_info = *video_info;
+  object->seq_num++;
+  object->plane_height = reconfigure_info->ulTargetHeight;
+
+  for (guint i = 0; i < pool_size; i++) {
+    GstNvDecSurface *surf = gst_nv_dec_surface_new (object->seq_num);
+
+    surf->index = i;
+
+    /* 0, pool_size - 1: output picture
+     * pool_size, pool_size * 2 - 1: decoder output without film-grain,
+     * used for reference picture */
+    if (alloc_aux_frame)
+      surf->decode_frame_index = i + pool_size;
+    else
+      surf->decode_frame_index = i;
+
+    object->priv->surface_queue.push_back (surf);
+  }
+
+  return TRUE;
+}
+
+void
+gst_nv_dec_object_set_flushing (GstNvDecObject * object, gboolean flushing)
+{
+  GstNvDecObjectPrivate *priv = object->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+  object->flushing = flushing;
+  priv->cond.notify_all ();
+}
+
+static gboolean
+gst_nv_dec_object_unmap_surface_unlocked (GstNvDecObject * self,
+    GstNvDecSurface * surface)
+{
+  gboolean ret = TRUE;
+
+  if (!gst_cuda_result (CuvidUnmapVideoFrame (self->handle, surface->devptr))) {
+    GST_ERROR_OBJECT (self, "Couldn't unmap surface %d", surface->index);
+    ret = FALSE;
+  } else {
+    surface->devptr = 0;
+    self->num_mapped--;
+
+    GST_LOG_OBJECT (self, "Surface %d is unmapped, num-mapped %d",
+        surface->index, self->num_mapped);
+  }
+  self->priv->cond.notify_all ();
+
+  return ret;
+}
+
+GstFlowReturn
+gst_nv_dec_object_acquire_surface (GstNvDecObject * object,
+    GstNvDecSurface ** surface)
+{
+  GstNvDecObjectPrivate *priv = object->priv;
+  GstNvDecSurface *surf = nullptr;
+  std::unique_lock < std::mutex > lk (priv->lock);
+
+  do {
+    if (object->flushing) {
+      GST_DEBUG_OBJECT (object, "We are flushing");
+      return GST_FLOW_FLUSHING;
+    }
+
+    if (!priv->surface_queue.empty ()) {
+      surf = priv->surface_queue0;
+      priv->surface_queue.erase (priv->surface_queue.begin ());
+      break;
+    }
+
+    GST_LOG_OBJECT (object, "No available surface, waiting for release");
+    priv->cond.wait (lk);
+  } while (true);
+
+  g_assert (surf);
+  g_assert (!surf->object);
+
+  surf->object = (GstNvDecObject *) gst_object_ref (object);
+
+  *surface = surf;
+
+  return GST_FLOW_OK;
+}
+
+gboolean
+gst_nv_dec_object_decode (GstNvDecObject * object, CUVIDPICPARAMS * params)
+{
+  gboolean ret = TRUE;
+
+  GST_LOG_OBJECT (object, "picture index: %u", params->CurrPicIdx);
+
+  if (!gst_cuda_context_push (object->context)) {
+    GST_ERROR_OBJECT (object, "Failed to push CUDA context");
+    return FALSE;
+  }
+
+  if (!gst_cuda_result (CuvidDecodePicture (object->handle, params))) {
+    GST_ERROR_OBJECT (object, "Failed to decode picture");
+    ret = FALSE;
+  }
+
+  if (!gst_cuda_context_pop (nullptr))
+    GST_WARNING_OBJECT (object, "Failed to pop CUDA context");
+
+  return ret;
+}
+
+GstFlowReturn
+gst_nv_dec_object_map_surface (GstNvDecObject * object,
+    GstNvDecSurface * surface, GstCudaStream * stream)
+{
+  GstNvDecObjectPrivate *priv = object->priv;
+
+  if (surface->devptr) {
+    GST_ERROR_OBJECT (object, "Mapped Surface %d was not cleared",
+        surface->index);
+    return GST_FLOW_ERROR;
+  }
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  do {
+    if (object->flushing) {
+      GST_DEBUG_OBJECT (object, "We are flushing");
+      return GST_FLOW_FLUSHING;
+    }
+
+    if (object->num_mapped < (guint) object->create_info.ulNumOutputSurfaces) {
+      CUVIDPROCPARAMS params = { 0 };
+
+      params.progressive_frame = 1;
+      params.output_stream = gst_cuda_stream_get_handle (stream);
+
+      if (!gst_cuda_result (CuvidMapVideoFrame (object->handle, surface->index,
+                  &surface->devptr, &surface->pitch, &params))) {
+        GST_ERROR_OBJECT (object, "Couldn't map picture");
+        return GST_FLOW_ERROR;
+      }
+
+      object->num_mapped++;
+      GST_LOG_OBJECT (object, "Surface %d is mapped, num-mapped %d",
+          surface->index, object->num_mapped);
+      break;
+    }
+
+    GST_LOG_OBJECT (object, "No available output surface, waiting for release");
+    priv->cond.wait (lk);
+  } while (true);
+
+  return GST_FLOW_OK;
+}
+
+gboolean
+gst_nv_dec_object_unmap_surface (GstNvDecObject * object,
+    GstNvDecSurface * surface)
+{
+  GstNvDecObjectPrivate *priv = object->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  return gst_nv_dec_object_unmap_surface_unlocked (object, surface);
+}
+
+static gboolean
+gst_nv_dec_output_release (GstCudaMemory * mem)
+{
+  GstNvDecOutput *output = (GstNvDecOutput *)
+      gst_cuda_memory_get_user_data (mem);
+  GstNvDecObject *self = output->self;
+  GstNvDecObjectPrivate *priv = self->priv;
+
+  GST_LOG_OBJECT (self, "Release memory %p", mem);
+
+  gst_memory_ref (GST_MEMORY_CAST (mem));
+  GST_MINI_OBJECT_CAST (mem)->dispose = nullptr;
+
+  output->self = nullptr;
+
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+
+    self->num_mapped--;
+    gst_cuda_context_push (self->context);
+    if (!gst_cuda_result (CuvidUnmapVideoFrame (self->handle, output->devptr))) {
+      GST_ERROR_OBJECT (self, "Couldn't unmap frame");
+    } else {
+      GST_LOG_OBJECT (self, "Exported surface is freed, num-mapped %d",
+          self->num_mapped);
+    }
+    gst_cuda_context_pop (nullptr);
+
+    priv->free_output_mapoutput->devptr = GST_MEMORY_CAST (mem);
+    priv->cond.notify_all ();
+  }
+
+  gst_object_unref (self);
+
+  return FALSE;
+}
+
+static void
+gst_nv_dec_output_free (GstNvDecOutput * output)
+{
+  delete output;
+}
+
+GstFlowReturn
+gst_nv_dec_object_export_surface (GstNvDecObject * object,
+    GstNvDecSurface * surface, GstCudaStream * stream, GstMemory ** memory)
+{
+  GstNvDecObjectPrivate *priv = object->priv;
+  GstVideoInfo info;
+  gsize offset;
+  GstMemory *mem = nullptr;
+  GstNvDecOutput *output;
+
+  if (!surface->devptr) {
+    GST_ERROR_OBJECT (object, "Surface %d is not mapped", surface->index);
+    return GST_FLOW_ERROR;
+  }
+
+  GST_LOG_OBJECT (object, "Exporting surface %d", surface->index);
+
+  offset = surface->pitch * object->plane_height;
+
+  info = object->video_info;
+  switch (GST_VIDEO_INFO_FORMAT (&info)) {
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+    case GST_VIDEO_FORMAT_P016_LE:
+      info.stride0 = surface->pitch;
+      info.stride1 = surface->pitch;
+      info.offset0 = 0;
+      info.offset1 = offset;
+      info.size = offset + offset / 2;
+      break;
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_Y444_16LE:
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      info.stride0 = surface->pitch;
+      info.stride1 = surface->pitch;
+      info.stride2 = surface->pitch;
+      info.offset0 = 0;
+      info.offset1 = offset;
+      info.offset2 = offset * 2;
+      info.size = offset * 3;
+      break;
+    default:
+      GST_ERROR_OBJECT (object, "Unexpected format %s",
+          gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&info)));
+      return GST_FLOW_ERROR;
+  }
+
+  std::unique_lock < std::mutex > lk (priv->lock);
+  auto output_iter = priv->output_map.find (surface->devptr);
+  if (output_iter != priv->output_map.end ())
+    mem = output_iter->second;
+
+  if (mem) {
+    do {
+      if (object->flushing) {
+        GST_DEBUG_OBJECT (object, "We are flushing");
+        return GST_FLOW_FLUSHING;
+      }
+
+      auto iter = priv->free_output_map.find (surface->devptr);
+      if (iter != priv->free_output_map.end ()) {
+        priv->free_output_map.erase (iter);
+        break;
+      }
+
+      GST_LOG_OBJECT (object, "Waiting for output release");
+      priv->cond.wait (lk);
+    } while (true);
+
+    output = (GstNvDecOutput *)
+        gst_cuda_memory_get_user_data (GST_CUDA_MEMORY_CAST (mem));
+    if (output->seq_num != object->seq_num) {
+      GST_DEBUG_OBJECT (object,
+          "output belongs to previous sequence, need new memory");
+      gst_memory_unref (mem);
+      mem = nullptr;
+    }
+  }
+
+  if (!mem) {
+    output = new GstNvDecOutput ();
+    output->devptr = surface->devptr;
+    output->seq_num = object->seq_num;
+
+    GST_LOG_OBJECT (object, "New output, allocating memory");
+
+    mem = gst_cuda_allocator_alloc_wrapped (nullptr, object->context,
+        stream, &info, output->devptr, output,
+        (GDestroyNotify) gst_nv_dec_output_free);
+    gst_cuda_memory_set_from_fixed_pool (mem);
+
+    priv->output_mapoutput->devptr = mem;
+  } else {
+    GST_LOG_OBJECT (object, "Reuse memory");
+  }
+
+  GST_MINI_OBJECT_CAST (mem)->dispose =
+      (GstMiniObjectDisposeFunction) gst_nv_dec_output_release;
+
+  output = (GstNvDecOutput *)
+      gst_cuda_memory_get_user_data (GST_CUDA_MEMORY_CAST (mem));
+
+  g_assert (!output->self);
+
+  output->self = (GstNvDecObject *) gst_object_ref (object);
+  surface->devptr = 0;
+
+  *memory = mem;
+
+  return GST_FLOW_OK;
+}
+
+guint
+gst_nv_dec_object_get_num_free_surfaces (GstNvDecObject * object)
+{
+  GstNvDecObjectPrivate *priv = object->priv;
+  std::lock_guard < std::mutex > lk (priv->lock);
+
+  if (object->num_mapped >= object->create_info.ulNumOutputSurfaces)
+    return 0;
+
+  return object->create_info.ulNumOutputSurfaces - object->num_mapped;
+}
+
+static gboolean
+gst_nv_dec_surface_dispose (GstNvDecSurface * surf)
+{
+  GstNvDecObject *object;
+  GstNvDecObjectPrivate *priv;
+  gboolean ret = FALSE;
+
+  if (!surf->object)
+    return TRUE;
+
+  object = (GstNvDecObject *) g_steal_pointer (&surf->object);
+  priv = object->priv;
+
+  /* *INDENT-OFF* */
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+
+    if (surf->seq_num == object->seq_num) {
+      /* Back to surface queue */
+      gst_nv_dec_surface_ref (surf);
+
+      /* Keep sorted order */
+      priv->surface_queue.insert (
+          std::upper_bound (priv->surface_queue.begin (),
+          priv->surface_queue.end(), surf,
+               (const GstNvDecSurface * a, const GstNvDecSurface * b)
+              {
+                return a->index < b->index;
+              }), surf);
+      priv->cond.notify_all ();
+    } else {
+      GST_WARNING_OBJECT (object, "Releasing surface %p of previous sequence",
+          surf);
+      /* Shouldn't happen (e.g., surfaces were not flushed before reconfigure) */
+      ret = TRUE;
+    }
+  }
+  /* *INDENT-ON* */
+
+  gst_object_unref (object);
+
+  return ret;
+}
+
+static GstNvDecSurface *
+gst_nv_dec_surface_new (guint seq_num)
+{
+  GstNvDecSurface *surf = g_new0 (GstNvDecSurface, 1);
+
+  surf->seq_num = seq_num;
+
+  gst_mini_object_init (GST_MINI_OBJECT_CAST (surf),
+      0, GST_TYPE_NV_DEC_SURFACE, nullptr,
+      (GstMiniObjectDisposeFunction) gst_nv_dec_surface_dispose,
+      (GstMiniObjectFreeFunction) g_free);
+
+  return surf;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvdecobject.h Added

@@ -0,0 +1,100 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/cuda/gstcuda.h>
+#include "gstcuvidloader.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_NV_DEC_OBJECT (gst_nv_dec_object_get_type())
+G_DECLARE_FINAL_TYPE (GstNvDecObject,
+    gst_nv_dec_object, GST, NV_DEC_OBJECT, GstObject);
+
+#define GST_TYPE_NV_DEC_SURFACE (gst_nv_dec_surface_get_type())
+typedef struct _GstNvDecSurface GstNvDecSurface;
+
+struct _GstNvDecSurface
+{
+  GstMiniObject parent;
+
+  GstNvDecObject *object;
+
+  gint index;
+  gint decode_frame_index;
+
+  CUdeviceptr devptr;
+  guint pitch;
+
+  guint seq_num;
+};
+
+GstNvDecObject * gst_nv_dec_object_new (GstCudaContext * context,
+                                        CUVIDDECODECREATEINFO * create_info,
+                                        const GstVideoInfo * video_info,
+                                        gboolean alloc_aux_frame);
+
+gboolean         gst_nv_dec_object_reconfigure (GstNvDecObject * object,
+                                                CUVIDRECONFIGUREDECODERINFO * reconfigure_info,
+                                                const GstVideoInfo * video_info,
+                                                gboolean alloc_aux_frame);
+
+void             gst_nv_dec_object_set_flushing (GstNvDecObject * object,
+                                                 gboolean flushing);
+
+GstFlowReturn    gst_nv_dec_object_acquire_surface (GstNvDecObject * object,
+                                                    GstNvDecSurface ** surface);
+
+gboolean         gst_nv_dec_object_decode (GstNvDecObject * object,
+                                           CUVIDPICPARAMS * params);
+
+GstFlowReturn    gst_nv_dec_object_map_surface (GstNvDecObject * object,
+                                                GstNvDecSurface * surface,
+                                                GstCudaStream * stream);
+
+gboolean         gst_nv_dec_object_unmap_surface (GstNvDecObject * object,
+                                                  GstNvDecSurface * surface);
+
+GstFlowReturn    gst_nv_dec_object_export_surface (GstNvDecObject * object,
+                                                   GstNvDecSurface * surface,
+                                                   GstCudaStream * stream,
+                                                   GstMemory ** memory);
+
+guint            gst_nv_dec_object_get_num_free_surfaces (GstNvDecObject * object);
+
+GType gst_nv_dec_surface_get_type (void);
+
+static inline GstNvDecSurface *
+gst_nv_dec_surface_ref (GstNvDecSurface * surface)
+{
+  return (GstNvDecSurface *)
+      gst_mini_object_ref (GST_MINI_OBJECT_CAST (surface));
+}
+
+static inline void
+gst_nv_dec_surface_unref (GstNvDecSurface * surface)
+{
+  gst_mini_object_unref (GST_MINI_OBJECT_CAST (surface));
+}
+
+G_END_DECLS
+

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvdecoder.cpp Added

@@ -0,0 +1,2152 @@
+/* GStreamer
+ * Copyright (C) 2017 Ericsson AB. All rights reserved.
+ * Copyright (C) 2020 Seungha Yang <seungha@centricular.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_CUDA_GST_GL
+#include <gst/gl/gl.h>
+#include <gst/gl/gstglfuncs.h>
+#endif
+
+#ifdef G_OS_WIN32
+#include <gst/d3d11/gstd3d11.h>
+#endif
+
+#include <gst/cuda/gstcuda.h>
+#include <gst/cuda/gstcuda-private.h>
+#include "gstnvdecoder.h"
+#include "gstcudaconverter.h"
+#include <string.h>
+#include <string>
+#include <set>
+
+extern "C"
+{
+  GST_DEBUG_CATEGORY_EXTERN (gst_nv_decoder_debug);
+}
+
+#define GST_CAT_DEFAULT gst_nv_decoder_debug
+
+#ifdef HAVE_CUDA_GST_GL
+#define SUPPORTED_GL_APIS (GstGLAPI) (GST_GL_API_OPENGL | GST_GL_API_OPENGL3)
+#endif
+
+typedef enum
+{
+  GST_NV_DECODER_OUTPUT_TYPE_UNKNOWN = 0,
+  GST_NV_DECODER_OUTPUT_TYPE_SYSTEM = (1 << 0),
+  GST_NV_DECODER_OUTPUT_TYPE_GL = (1 << 1),
+  GST_NV_DECODER_OUTPUT_TYPE_CUDA = (1 << 2),
+  GST_NV_DECODER_OUTPUT_TYPE_D3D11 = (1 << 3),
+} GstNvDecoderOutputType;
+
+struct _GstNvDecoder
+{
+  GstObject parent;
+
+  guint device_id;
+  gint64 adapter_luid;
+
+  GstNvDecObject *object;
+  GstCudaContext *context;
+  GstCudaStream *stream;
+
+  GstVideoInfo info;
+  GstVideoInfo aligned_info;
+
+  CUVIDDECODECREATEINFO create_info;
+
+  gboolean alloc_aux_frame;
+  gboolean configured;
+  guint downstream_min_buffers;
+  guint num_output_surfaces;
+  gboolean wait_on_pool_full;
+
+  GMutex lock;
+
+  /* For OpenGL interop. */
+  GstObject *gl_display;
+  GstObject *gl_context;
+  GstObject *other_gl_context;
+
+  /* D3D11 interop */
+  GstObject *d3d11_device;
+  GstCudaConverter *converter;
+  GstBuffer *export_buf;
+  GstBuffer *convert_buf;
+  GstVideoInfo output_info;
+
+  GstNvDecoderOutputType output_type;
+};
+
+static void gst_nv_decoder_dispose (GObject * object);
+static void gst_nv_decoder_finalize (GObject * object);
+
+#define parent_class gst_nv_decoder_parent_class
+G_DEFINE_TYPE (GstNvDecoder, gst_nv_decoder, GST_TYPE_OBJECT);
+
+static void
+gst_nv_decoder_class_init (GstNvDecoderClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->dispose = gst_nv_decoder_dispose;
+  gobject_class->finalize = gst_nv_decoder_finalize;
+}
+
+static void
+gst_nv_decoder_init (GstNvDecoder * self)
+{
+  g_mutex_init (&self->lock);
+}
+
+static void
+gst_nv_decoder_dispose (GObject * object)
+{
+  GstNvDecoder *self = GST_NV_DECODER (object);
+
+  gst_nv_decoder_close (self);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gst_nv_decoder_finalize (GObject * object)
+{
+  GstNvDecoder *self = GST_NV_DECODER (object);
+
+  g_mutex_clear (&self->lock);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static cudaVideoChromaFormat
+chroma_format_from_video_format (GstVideoFormat format)
+{
+  switch (format) {
+    case GST_VIDEO_FORMAT_NV12:
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+      return cudaVideoChromaFormat_420;
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_Y444_16LE:
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      return cudaVideoChromaFormat_444;
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return cudaVideoChromaFormat_420;
+}
+
+static cudaVideoSurfaceFormat
+output_format_from_video_format (GstVideoFormat format)
+{
+  switch (format) {
+    case GST_VIDEO_FORMAT_NV12:
+      return cudaVideoSurfaceFormat_NV12;
+    case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
+      return cudaVideoSurfaceFormat_P016;
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_GBR:
+      return cudaVideoSurfaceFormat_YUV444;
+    case GST_VIDEO_FORMAT_Y444_16LE:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      return cudaVideoSurfaceFormat_YUV444_16Bit;
+    default:
+      g_assert_not_reached ();
+      break;
+  }
+
+  return cudaVideoSurfaceFormat_NV12;
+}
+
+GstNvDecoder *
+gst_nv_decoder_new (guint device_id, gint64 adapter_luid)
+{
+  GstNvDecoder *self;
+
+  self = (GstNvDecoder *) g_object_new (GST_TYPE_NV_DECODER, nullptr);
+  self->device_id = device_id;
+  self->adapter_luid = adapter_luid;
+  gst_object_ref_sink (self);
+
+  return self;
+}
+
+gboolean
+gst_nv_decoder_open (GstNvDecoder * decoder, GstElement * element)
+{
+  if (!gst_cuda_ensure_element_context (element,
+          decoder->device_id, &decoder->context)) {
+    GST_ERROR_OBJECT (element, "Couldn't create CUDA context");
+    return FALSE;
+  }
+
+  gst_clear_cuda_stream (&decoder->stream);
+  decoder->stream = gst_cuda_stream_new (decoder->context);
+
+  return TRUE;
+}
+
+static void
+gst_nv_decoder_reset_unlocked (GstNvDecoder * self)
+{
+  if (self->object)
+    gst_nv_dec_object_set_flushing (self->object, TRUE);
+
+  gst_clear_object (&self->object);
+
+  self->output_type = GST_NV_DECODER_OUTPUT_TYPE_UNKNOWN;
+  self->configured = FALSE;
+  self->downstream_min_buffers = 0;
+  self->num_output_surfaces = 0;
+}
+
+gboolean
+gst_nv_decoder_close (GstNvDecoder * decoder)
+{
+  gst_nv_decoder_reset_unlocked (decoder);
+
+  gst_clear_cuda_stream (&decoder->stream);
+  gst_clear_object (&decoder->context);
+  gst_clear_object (&decoder->gl_display);
+  gst_clear_object (&decoder->gl_context);
+  gst_clear_object (&decoder->other_gl_context);
+
+  gst_clear_object (&decoder->d3d11_device);
+  gst_clear_object (&decoder->converter);
+  gst_clear_buffer (&decoder->convert_buf);
+  gst_clear_buffer (&decoder->export_buf);
+
+  return TRUE;
+}
+
+gboolean
+gst_nv_decoder_is_configured (GstNvDecoder * decoder)
+{
+  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), FALSE);
+
+  return decoder->configured;
+}
+
+gboolean
+gst_nv_decoder_configure (GstNvDecoder * decoder, cudaVideoCodec codec,
+    GstVideoInfo * info, gint coded_width, gint coded_height,
+    guint coded_bitdepth, guint pool_size, gboolean alloc_aux_frame,
+    guint num_output_surfaces, guint init_max_width, guint init_max_height)
+{
+  CUVIDDECODECREATEINFO create_info = { 0, };
+  GstVideoFormat format, prev_format = GST_VIDEO_FORMAT_UNKNOWN;
+  guint alloc_size;
+
+  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), FALSE);
+  g_return_val_if_fail (codec < cudaVideoCodec_NumCodecs, FALSE);
+  g_return_val_if_fail (info != nullptr, FALSE);
+  g_return_val_if_fail (coded_width >= GST_VIDEO_INFO_WIDTH (info), FALSE);
+  g_return_val_if_fail (coded_height >= GST_VIDEO_INFO_HEIGHT (info), FALSE);
+  g_return_val_if_fail (coded_bitdepth >= 8, FALSE);
+  g_return_val_if_fail (pool_size > 0, FALSE);
+
+  gst_clear_buffer (&decoder->export_buf);
+  gst_clear_buffer (&decoder->convert_buf);
+  gst_clear_object (&decoder->converter);
+
+  format = GST_VIDEO_INFO_FORMAT (info);
+  if (decoder->info.finfo)
+    prev_format = GST_VIDEO_INFO_FORMAT (&decoder->info);
+
+  /* h264 may require additional 1 frame because of its bumping process */
+  if (codec == cudaVideoCodec_H264)
+    pool_size += 1;
+
+  /* Need pool size * 2 for decode-only (used for reference) frame
+   * and output frame, AV1 film grain case for example */
+  decoder->alloc_aux_frame = alloc_aux_frame;
+  if (alloc_aux_frame) {
+    alloc_size = pool_size * 2;
+  } else {
+    alloc_size = pool_size;
+  }
+
+  decoder->info = *info;
+  gst_video_info_set_format (&decoder->aligned_info, format,
+      GST_ROUND_UP_2 (info->width), GST_ROUND_UP_2 (info->height));
+
+  g_mutex_lock (&decoder->lock);
+  if (decoder->object) {
+    GST_DEBUG_OBJECT (decoder,
+        "Configured max resolution %ux%u %s (bit-depth %u), "
+        "new resolution %ux%u %s (bit-depth %u)",
+        (guint) decoder->create_info.ulMaxWidth,
+        (guint) decoder->create_info.ulMaxHeight,
+        gst_video_format_to_string (prev_format),
+        (guint) decoder->create_info.bitDepthMinus8 + 8,
+        (guint) coded_width, (guint) coded_height,
+        gst_video_format_to_string (format), coded_bitdepth);
+
+    if (format == prev_format &&
+        (guint) coded_width <= decoder->create_info.ulMaxWidth &&
+        (guint) coded_height <= decoder->create_info.ulMaxHeight &&
+        coded_bitdepth == (guint) decoder->create_info.bitDepthMinus8 + 8) {
+      CUVIDRECONFIGUREDECODERINFO reconfig_info = { 0, };
+
+      reconfig_info.ulWidth = coded_width;
+      reconfig_info.ulHeight = coded_height;
+      reconfig_info.ulTargetWidth = decoder->aligned_info.width;
+      reconfig_info.ulTargetHeight = decoder->aligned_info.height;
+      reconfig_info.ulNumDecodeSurfaces = alloc_size;
+      reconfig_info.display_area.right = GST_VIDEO_INFO_WIDTH (info);
+      reconfig_info.display_area.bottom = GST_VIDEO_INFO_HEIGHT (info);
+      reconfig_info.target_rect.right = GST_VIDEO_INFO_WIDTH (info);
+      reconfig_info.target_rect.bottom = GST_VIDEO_INFO_HEIGHT (info);
+
+      if (gst_nv_dec_object_reconfigure (decoder->object,
+              &reconfig_info, info, alloc_aux_frame)) {
+        GST_DEBUG_OBJECT (decoder, "Reconfigured");
+        decoder->configured = TRUE;
+        g_mutex_unlock (&decoder->lock);
+        return TRUE;
+      } else {
+        GST_WARNING_OBJECT (decoder,
+            "Couldn't reconfigure decoder, creating new decoder instance");
+      }
+    } else {
+      GST_DEBUG_OBJECT (decoder, "Need new decoder instance");
+    }
+  }
+
+  gst_nv_decoder_reset_unlocked (decoder);
+  g_mutex_unlock (&decoder->lock);
+
+  decoder->num_output_surfaces = num_output_surfaces;
+
+  create_info.ulWidth = coded_width;
+  create_info.ulHeight = coded_height;
+  create_info.ulNumDecodeSurfaces = alloc_size;
+  create_info.CodecType = codec;
+  create_info.ChromaFormat = chroma_format_from_video_format (format);
+  create_info.ulCreationFlags = cudaVideoCreate_Default;
+  create_info.bitDepthMinus8 = coded_bitdepth - 8;
+  create_info.ulIntraDecodeOnly = 0;
+
+  create_info.display_area.left = 0;
+  create_info.display_area.top = 0;
+  create_info.display_area.right = GST_VIDEO_INFO_WIDTH (info);
+  create_info.display_area.bottom = GST_VIDEO_INFO_HEIGHT (info);
+  create_info.OutputFormat = output_format_from_video_format (format);
+  create_info.DeinterlaceMode = cudaVideoDeinterlaceMode_Weave;
+
+  create_info.ulTargetWidth = decoder->aligned_info.width;
+  create_info.ulTargetHeight = decoder->aligned_info.height;
+  /* Will be updated on negotiate() */
+  create_info.ulNumOutputSurfaces = 1;
+
+  create_info.target_rect.left = 0;
+  create_info.target_rect.top = 0;
+  create_info.target_rect.right = GST_VIDEO_INFO_WIDTH (info);
+  create_info.target_rect.bottom = GST_VIDEO_INFO_HEIGHT (info);
+
+  create_info.ulMaxWidth = MAX (create_info.ulWidth, init_max_width);
+  create_info.ulMaxHeight = MAX (create_info.ulHeight, init_max_height);
+
+  decoder->create_info = create_info;
+  decoder->configured = TRUE;
+
+  return TRUE;
+}
+
+GstFlowReturn
+gst_nv_decoder_new_picture (GstNvDecoder * decoder, GstCodecPicture * picture)
+{
+  GstNvDecSurface *surface;
+  GstFlowReturn ret;
+
+  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), GST_FLOW_ERROR);
+
+  if (!decoder->object) {
+    if (decoder->output_type == GST_NV_DECODER_OUTPUT_TYPE_CUDA) {
+      if (decoder->num_output_surfaces == 0) {
+        /* Auto mode */
+        decoder->create_info.ulNumOutputSurfaces =
+            decoder->downstream_min_buffers + 2;
+      } else {
+        /* Otherwise use user provided value */
+        decoder->create_info.ulNumOutputSurfaces = decoder->num_output_surfaces;
+      }
+
+      GST_INFO_OBJECT (decoder, "Updating ulNumOutputSurfaces to %u, "
+          "user requested %u, min-downstream %u",
+          (guint) decoder->create_info.ulNumOutputSurfaces,
+          decoder->num_output_surfaces, decoder->downstream_min_buffers);
+    }
+
+    g_mutex_lock (&decoder->lock);
+    decoder->object = gst_nv_dec_object_new (decoder->context,
+        &decoder->create_info, &decoder->info, decoder->alloc_aux_frame);
+    g_mutex_unlock (&decoder->lock);
+    if (!decoder->object) {
+      GST_ERROR_OBJECT (decoder, "Couldn't create decoder object");
+      return GST_FLOW_ERROR;
+    }
+  }
+
+  ret = gst_nv_dec_object_acquire_surface (decoder->object, &surface);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  gst_codec_picture_set_user_data (picture,
+      surface, (GDestroyNotify) gst_nv_dec_surface_unref);
+
+  return GST_FLOW_OK;
+}
+
+gboolean
+gst_nv_decoder_decode (GstNvDecoder * decoder, CUVIDPICPARAMS * params)
+{
+  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), FALSE);
+  g_return_val_if_fail (decoder->object != nullptr, FALSE);
+
+  return gst_nv_dec_object_decode (decoder->object, params);
+}
+
+#ifdef HAVE_CUDA_GST_GL
+static gboolean
+gst_nv_decoder_register_cuda_resource (GstNvDecoder * self, GstMemory * mem,
+    GstCudaGraphicsResource * resource)
+{
+  GstMapInfo info;
+  gboolean ret = FALSE;
+
+  if (!gst_cuda_context_push (self->context)) {
+    GST_ERROR_OBJECT (self, "Failed to push CUDA context");
+    return FALSE;
+  }
+
+  if (gst_memory_map (mem, &info, (GstMapFlags) (GST_MAP_READ | GST_MAP_GL))) {
+    GstGLMemoryPBO *gl_mem = (GstGLMemoryPBO *) mem;
+    GstGLBuffer *gl_buffer = gl_mem->pbo;
+
+    GST_LOG_OBJECT (self,
+        "Register glbuffer %d to CUDA resource", gl_buffer->id);
+
+    /* register resource without read/write only flags, since
+     * downstream CUDA elements (e.g., nvenc) might want to access
+     * this resource later. Instead, use map flags during map/unmap */
+    if (gst_cuda_graphics_resource_register_gl_buffer (resource,
+            gl_buffer->id, CU_GRAPHICS_REGISTER_FLAGS_NONE)) {
+      ret = TRUE;
+    } else {
+      GST_WARNING_OBJECT (self, "Failed to register memory");
+    }
+
+    gst_memory_unmap (mem, &info);
+  } else {
+    GST_WARNING_OBJECT (self, "Failed to map memory");
+  }
+
+  if (!gst_cuda_context_pop (nullptr))
+    GST_WARNING_OBJECT (self, "Failed to pop CUDA context");
+
+  return ret;
+}
+
+static GstCudaGraphicsResource *
+gst_nv_decoder_ensure_cuda_graphics_resource (GstNvDecoder * self,
+    GstMemory * mem)
+{
+  GQuark quark;
+  GstCudaGraphicsResource *resource;
+
+  if (!gst_is_gl_memory_pbo (mem)) {
+    GST_WARNING_OBJECT (self, "memory is not GL PBO memory, %s",
+        mem->allocator->mem_type);
+    return nullptr;
+  }
+
+  quark = gst_cuda_quark_from_id (GST_CUDA_QUARK_GRAPHICS_RESOURCE);
+
+  resource = (GstCudaGraphicsResource *)
+      gst_mini_object_get_qdata (GST_MINI_OBJECT (mem), quark);
+
+  if (!resource) {
+    gboolean ret;
+
+    resource = gst_cuda_graphics_resource_new (self->context,
+        GST_OBJECT (GST_GL_BASE_MEMORY_CAST (mem)->context),
+        GST_CUDA_GRAPHICS_RESOURCE_GL_BUFFER);
+
+    ret = gst_nv_decoder_register_cuda_resource (self, mem, resource);
+    if (!ret) {
+      GST_WARNING_OBJECT (self, "Couldn't register resource");
+      gst_cuda_graphics_resource_free (resource);
+
+      return nullptr;
+    }
+
+    gst_mini_object_set_qdata (GST_MINI_OBJECT (mem), quark, resource,
+        (GDestroyNotify) gst_cuda_graphics_resource_free);
+  }
+
+  return resource;
+}
+
+typedef struct
+{
+  GstNvDecoder *self;
+  gboolean ret;
+  GstNvDecSurface *surface;
+  GstBuffer *output_buffer;
+} GstNvDecoderCopyToGLData;
+
+static void
+gst_nv_decoder_copy_frame_to_gl_internal (GstGLContext * context,
+    GstNvDecoderCopyToGLData * data)
+{
+  GstNvDecoder *self = data->self;
+  GstNvDecSurface *surface = data->surface;
+  GstCudaGraphicsResource **resources;
+  guint num_resources;
+  guint i;
+  CUDA_MEMCPY2D copy_params = { 0, };
+  GstVideoInfo *info = &self->info;
+  CUstream stream = gst_cuda_stream_get_handle (self->stream);
+
+  data->ret = TRUE;
+
+  num_resources = gst_buffer_n_memory (data->output_buffer);
+  resources = g_newa (GstCudaGraphicsResource *, num_resources);
+
+  if (!gst_cuda_context_push (self->context)) {
+    GST_WARNING_OBJECT (self, "Failed to push CUDA context");
+    data->ret = FALSE;
+    return;
+  }
+
+  for (i = 0; i < num_resources; i++) {
+    GstMemory *mem;
+
+    mem = gst_buffer_peek_memory (data->output_buffer, i);
+    resourcesi = gst_nv_decoder_ensure_cuda_graphics_resource (self, mem);
+    if (!resourcesi) {
+      GST_WARNING_OBJECT (self, "could not register %dth memory", i);
+      data->ret = FALSE;
+
+      return;
+    }
+
+    /* Need PBO -> texture */
+    GST_MINI_OBJECT_FLAG_SET (mem, GST_GL_BASE_MEMORY_TRANSFER_NEED_UPLOAD);
+  }
+
+  copy_params.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+  copy_params.srcPitch = surface->pitch;
+  copy_params.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+
+  for (i = 0; i < num_resources; i++) {
+    CUdeviceptr dst_ptr;
+    gsize size;
+    CUgraphicsResource cuda_resource =
+        gst_cuda_graphics_resource_map (resourcesi, nullptr,
+        CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD);
+
+    if (!cuda_resource) {
+      GST_WARNING_OBJECT (self, "failed to map CUDA resources");
+      data->ret = FALSE;
+      goto unmap_video_frame;
+    }
+
+    if (!gst_cuda_result (CuGraphicsResourceGetMappedPointer (&dst_ptr, &size,
+                cuda_resource))) {
+      GST_WARNING_OBJECT (self, "failed to map CUDA resource");
+      data->ret = FALSE;
+      break;
+    }
+
+    copy_params.dstPitch = GST_VIDEO_INFO_PLANE_STRIDE (info, i);
+    copy_params.WidthInBytes = GST_VIDEO_INFO_COMP_WIDTH (info, i)
+        * GST_VIDEO_INFO_COMP_PSTRIDE (info, i);
+
+    copy_params.srcDevice = surface->devptr +
+        (i * surface->pitch * GST_VIDEO_INFO_HEIGHT (&self->aligned_info));
+    copy_params.dstDevice = dst_ptr;
+    copy_params.Height = GST_VIDEO_INFO_COMP_HEIGHT (info, i);
+
+    if (!gst_cuda_result (CuMemcpy2DAsync (&copy_params, stream))) {
+      GST_WARNING_OBJECT (self, "memcpy to mapped array failed");
+      data->ret = FALSE;
+    }
+  }
+
+  gst_cuda_result (CuStreamSynchronize (stream));
+
+unmap_video_frame:
+  for (i = 0; i < num_resources; i++) {
+    gst_cuda_graphics_resource_unmap (resourcesi, nullptr);
+  }
+
+  if (!gst_cuda_context_pop (nullptr))
+    GST_WARNING_OBJECT (self, "Failed to pop CUDA context");
+}
+
+static GstFlowReturn
+gst_nv_decoder_copy_frame_to_gl (GstNvDecoder * decoder,
+    GstGLContext * context, GstNvDecSurface * surface, GstBuffer * buffer)
+{
+  GstNvDecoderCopyToGLData data;
+
+  data.self = decoder;
+  data.surface = surface;
+  data.output_buffer = buffer;
+
+  gst_gl_context_thread_add (context,
+      (GstGLContextThreadFunc) gst_nv_decoder_copy_frame_to_gl_internal, &data);
+
+  GST_LOG_OBJECT (decoder, "Copy frame to GL ret %d", data.ret);
+
+  if (!data.ret)
+    return GST_FLOW_ERROR;
+
+  return GST_FLOW_OK;
+}
+#endif
+
+#ifdef G_OS_WIN32
+static GstFlowReturn
+gst_nv_decoder_copy_frame_to_d3d11 (GstNvDecoder * self,
+    GstNvDecSurface * surface, GstBuffer * buffer)
+{
+  GstFlowReturn ret;
+  GstMemory *mem;
+  GstCudaMemory *cmem;
+  GstVideoFrame src_frame, dst_frame;
+  gboolean convert_ret;
+
+  if (!self->converter || !self->convert_buf) {
+    GST_ERROR_OBJECT (self, "D3D11 output is not configured");
+    return GST_FLOW_ERROR;
+  }
+
+  ret = gst_nv_dec_object_export_surface (self->object,
+      surface, self->stream, &mem);
+  if (ret != GST_FLOW_OK) {
+    GST_WARNING_OBJECT (self, "Couldn't export surface");
+    gst_nv_dec_object_unmap_surface (self->object, surface);
+    return ret;
+  }
+
+  cmem = GST_CUDA_MEMORY_CAST (mem);
+
+  /* TODO: convert without buffer wrapping */
+  if (!self->export_buf) {
+    self->export_buf = gst_buffer_new ();
+    gst_buffer_add_video_meta_full (self->export_buf, GST_VIDEO_FRAME_FLAG_NONE,
+        GST_VIDEO_INFO_FORMAT (&self->info),
+        GST_VIDEO_INFO_WIDTH (&self->info),
+        GST_VIDEO_INFO_HEIGHT (&self->info),
+        GST_VIDEO_INFO_N_PLANES (&self->info),
+        cmem->info.offset, cmem->info.stride);
+  }
+
+  gst_buffer_append_memory (self->export_buf, mem);
+  if (!gst_video_frame_map (&src_frame, &self->info, self->export_buf,
+          (GstMapFlags) (GST_MAP_READ | GST_MAP_CUDA))) {
+    GST_ERROR_OBJECT (self, "Couldn't map exported buffer");
+    gst_buffer_remove_all_memory (self->export_buf);
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_video_frame_map (&dst_frame, &self->output_info, self->convert_buf,
+          (GstMapFlags) (GST_MAP_WRITE | GST_MAP_CUDA))) {
+    GST_ERROR_OBJECT (self, "Couldn't map converter output buffer");
+    gst_buffer_remove_all_memory (self->export_buf);
+    return GST_FLOW_ERROR;
+  }
+
+  convert_ret = gst_cuda_converter_convert_frame (self->converter, &src_frame,
+      &dst_frame, gst_cuda_stream_get_handle (self->stream), nullptr);
+  gst_video_frame_unmap (&dst_frame);
+  gst_video_frame_unmap (&src_frame);
+  gst_buffer_remove_all_memory (self->export_buf);
+
+  if (!convert_ret) {
+    GST_ERROR_OBJECT (self, "Couldn't convert frame");
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_cuda_buffer_copy (buffer, GST_CUDA_BUFFER_COPY_D3D11,
+          &self->output_info, self->convert_buf, GST_CUDA_BUFFER_COPY_CUDA,
+          &self->output_info, self->context, self->stream)) {
+    GST_ERROR_OBJECT (self, "Couldn't copy buffer to d3d11 output");
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+#endif
+
+static GstFlowReturn
+gst_nv_decoder_copy_frame_to_system (GstNvDecoder * decoder,
+    GstNvDecSurface * surface, GstBuffer * buffer)
+{
+  GstVideoFrame video_frame;
+  CUDA_MEMCPY2D copy_params = { 0, };
+  GstFlowReturn ret = GST_FLOW_ERROR;
+  CUstream stream = gst_cuda_stream_get_handle (decoder->stream);
+
+  if (!gst_video_frame_map (&video_frame, &decoder->info, buffer,
+          GST_MAP_WRITE)) {
+    GST_ERROR_OBJECT (decoder, "Couldn't map video frame");
+    return GST_FLOW_ERROR;
+  }
+
+  copy_params.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+  copy_params.srcPitch = surface->pitch;
+  copy_params.dstMemoryType = CU_MEMORYTYPE_HOST;
+  copy_params.WidthInBytes = GST_VIDEO_INFO_COMP_WIDTH (&decoder->info, 0)
+      * GST_VIDEO_INFO_COMP_PSTRIDE (&decoder->info, 0);
+
+  for (guint i = 0; i < GST_VIDEO_FRAME_N_PLANES (&video_frame); i++) {
+    copy_params.srcDevice = surface->devptr +
+        (i * surface->pitch * GST_VIDEO_INFO_HEIGHT (&decoder->aligned_info));
+    copy_params.dstHost = GST_VIDEO_FRAME_PLANE_DATA (&video_frame, i);
+    copy_params.dstPitch = GST_VIDEO_FRAME_PLANE_STRIDE (&video_frame, i);
+    copy_params.Height = GST_VIDEO_FRAME_COMP_HEIGHT (&video_frame, i);
+
+    if (!gst_cuda_result (CuMemcpy2DAsync (&copy_params, stream))) {
+      GST_ERROR_OBJECT (decoder, "failed to copy %dth plane", i);
+      goto done;
+    }
+  }
+
+  gst_cuda_result (CuStreamSynchronize (stream));
+  ret = GST_FLOW_OK;
+
+done:
+  gst_video_frame_unmap (&video_frame);
+
+  return ret;
+}
+
+static GstFlowReturn
+gst_nv_decoder_copy_frame_to_cuda (GstNvDecoder * decoder,
+    GstNvDecSurface * surface, GstBuffer * buffer, GstCudaStream * stream)
+{
+  CUDA_MEMCPY2D copy_params = { 0, };
+  GstMemory *mem;
+  GstVideoFrame video_frame;
+  CUstream stream_handle = gst_cuda_stream_get_handle (stream);
+  GstFlowReturn ret = GST_FLOW_ERROR;
+
+  mem = gst_buffer_peek_memory (buffer, 0);
+  if (!gst_is_cuda_memory (mem)) {
+    GST_WARNING_OBJECT (decoder, "Not a CUDA memory");
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_video_frame_map (&video_frame,
+          &decoder->info, buffer,
+          (GstMapFlags) (GST_MAP_WRITE | GST_MAP_CUDA))) {
+    GST_ERROR_OBJECT (decoder, "frame map failure");
+    return GST_FLOW_ERROR;
+  }
+
+  copy_params.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+  copy_params.srcPitch = surface->pitch;
+  copy_params.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+
+  for (guint i = 0; i < GST_VIDEO_INFO_N_PLANES (&decoder->info); i++) {
+    copy_params.srcDevice = surface->devptr +
+        (i * surface->pitch * GST_VIDEO_INFO_HEIGHT (&decoder->aligned_info));
+    copy_params.dstDevice =
+        (CUdeviceptr) GST_VIDEO_FRAME_PLANE_DATA (&video_frame, i);
+    copy_params.dstPitch = GST_VIDEO_FRAME_PLANE_STRIDE (&video_frame, i);
+    copy_params.WidthInBytes = GST_VIDEO_INFO_COMP_WIDTH (&decoder->info, 0)
+        * GST_VIDEO_INFO_COMP_PSTRIDE (&decoder->info, 0);
+    copy_params.Height = GST_VIDEO_INFO_COMP_HEIGHT (&decoder->info, i);
+
+    if (!gst_cuda_result (CuMemcpy2DAsync (&copy_params, stream_handle))) {
+      GST_ERROR_OBJECT (decoder, "failed to copy %dth plane", i);
+      goto done;
+    }
+  }
+
+  /* Don't sync if we are using downstream memory's stream */
+  if (!stream)
+    gst_cuda_result (CuStreamSynchronize (nullptr));
+  else
+    GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+
+  ret = GST_FLOW_OK;
+
+done:
+  gst_video_frame_unmap (&video_frame);
+
+  return ret;
+}
+
+GstFlowReturn
+gst_nv_decoder_output_picture (GstNvDecoder * decoder,
+    GstVideoDecoder * videodec, GstVideoCodecFrame * frame,
+    GstCodecPicture * picture, guint buffer_flags)
+{
+  GstFlowReturn ret = GST_FLOW_OK;
+  GstNvDecSurface *surface;
+  GstCudaStream *stream;
+  gboolean can_export = FALSE;
+
+  if (picture->discont_state) {
+    GST_DEBUG_OBJECT (videodec, "Negotiate again on input state change");
+    if (!gst_nv_decoder_negotiate (decoder, videodec, picture->discont_state)) {
+      GST_ERROR_OBJECT (videodec, "Couldn't re-negotiate with updated state");
+      ret = GST_FLOW_NOT_NEGOTIATED;
+      goto error;
+    }
+  } else if (gst_pad_check_reconfigure (videodec->srcpad)) {
+    GST_DEBUG_OBJECT (videodec, "Negotiate again on reconfigure");
+    if (!gst_video_decoder_negotiate (videodec)) {
+      GST_ERROR_OBJECT (videodec,
+          "Couldn't re-negotiate on downstram reconfigure");
+      ret = GST_FLOW_NOT_NEGOTIATED;
+      goto error;
+    }
+  }
+
+  surface = (GstNvDecSurface *) gst_codec_picture_get_user_data (picture);
+  if (!surface) {
+    GST_ERROR_OBJECT (decoder, "No decoder frame in picture %p", picture);
+    goto error;
+  }
+
+  if (!gst_cuda_context_push (decoder->context)) {
+    GST_ERROR_OBJECT (decoder, "Couldn't push context");
+    ret = GST_FLOW_ERROR;
+    goto error;
+  }
+
+  stream = decoder->stream;
+  ret = gst_nv_dec_object_map_surface (decoder->object, surface, stream);
+  if (ret != GST_FLOW_OK) {
+    gst_cuda_context_pop (nullptr);
+    goto error;
+  }
+
+  if (decoder->num_output_surfaces != 1 && videodec->input_segment.rate > 0 &&
+      decoder->output_type == GST_NV_DECODER_OUTPUT_TYPE_CUDA &&
+      (guint) decoder->create_info.ulNumOutputSurfaces >=
+      decoder->downstream_min_buffers) {
+    if (decoder->wait_on_pool_full) {
+      can_export = TRUE;
+    } else {
+      guint num_free_surfaces =
+          gst_nv_dec_object_get_num_free_surfaces (decoder->object);
+
+      /* If downstream didn't propose pool but we have free surfaces */
+      if (num_free_surfaces > 0)
+        can_export = TRUE;
+      else
+        GST_LOG_OBJECT (decoder, "No more free output surface, need copy");
+    }
+  }
+
+  if (can_export) {
+    GstMemory *mem;
+    GstCudaMemory *cmem;
+    GstBuffer *buf;
+    GstVideoInfo *info = &decoder->info;
+
+    GST_LOG_OBJECT (decoder, "Exporting output surface without copy");
+
+    ret = gst_nv_dec_object_export_surface (decoder->object,
+        surface, stream, &mem);
+    if (ret != GST_FLOW_OK) {
+      GST_WARNING_OBJECT (decoder, "Couldn't export surface");
+      gst_nv_dec_object_unmap_surface (decoder->object, surface);
+      gst_cuda_context_pop (nullptr);
+
+      goto error;
+    }
+
+    gst_cuda_context_pop (nullptr);
+
+    GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_DOWNLOAD);
+
+    if (stream)
+      GST_MINI_OBJECT_FLAG_SET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+
+    buf = gst_buffer_new ();
+    cmem = GST_CUDA_MEMORY_CAST (mem);
+    gst_buffer_append_memory (buf, mem);
+    gst_buffer_add_video_meta_full (buf, GST_VIDEO_FRAME_FLAG_NONE,
+        GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info),
+        GST_VIDEO_INFO_HEIGHT (info), GST_VIDEO_INFO_N_PLANES (info),
+        cmem->info.offset, cmem->info.stride);
+
+    frame->output_buffer = buf;
+  } else {
+    gboolean need_unmap = TRUE;
+
+    frame->output_buffer = gst_video_decoder_allocate_output_buffer (videodec);
+    if (!frame->output_buffer) {
+      GST_ERROR_OBJECT (videodec, "Couldn't allocate output buffer");
+      gst_nv_dec_object_unmap_surface (decoder->object, surface);
+      gst_cuda_context_pop (nullptr);
+      ret = GST_FLOW_ERROR;
+      goto error;
+    }
+
+    switch (decoder->output_type) {
+      case GST_NV_DECODER_OUTPUT_TYPE_UNKNOWN:
+      case GST_NV_DECODER_OUTPUT_TYPE_SYSTEM:
+        ret = gst_nv_decoder_copy_frame_to_system (decoder,
+            surface, frame->output_buffer);
+        break;
+#ifdef G_OS_WIN32
+      case GST_NV_DECODER_OUTPUT_TYPE_D3D11:
+        ret = gst_nv_decoder_copy_frame_to_d3d11 (decoder, surface,
+            frame->output_buffer);
+        need_unmap = FALSE;
+        break;
+#endif
+#ifdef HAVE_CUDA_GST_GL
+      case GST_NV_DECODER_OUTPUT_TYPE_GL:
+        g_assert (decoder->gl_context != nullptr);
+
+        ret = gst_nv_decoder_copy_frame_to_gl (decoder,
+            GST_GL_CONTEXT (decoder->gl_context), surface,
+            frame->output_buffer);
+        break;
+#endif
+      case GST_NV_DECODER_OUTPUT_TYPE_CUDA:
+        ret = gst_nv_decoder_copy_frame_to_cuda (decoder,
+            surface, frame->output_buffer, stream);
+        break;
+      default:
+        g_assert_not_reached ();
+        gst_nv_dec_object_unmap_surface (decoder->object, surface);
+        gst_cuda_context_pop (nullptr);
+        ret = GST_FLOW_ERROR;
+        goto error;
+    }
+
+    /* FIXME: This is the case where OpenGL context of downstream glbufferpool
+     * belongs to non-nvidia (or different device).
+     * There should be enhancement to ensure nvdec has compatible OpenGL context
+     */
+    if (ret != GST_FLOW_OK &&
+        decoder->output_type == GST_NV_DECODER_OUTPUT_TYPE_GL) {
+      GST_WARNING_OBJECT (videodec,
+          "Couldn't copy frame to GL memory, fallback to system memory");
+      decoder->output_type = GST_NV_DECODER_OUTPUT_TYPE_SYSTEM;
+
+      ret = gst_nv_decoder_copy_frame_to_system (decoder, surface,
+          frame->output_buffer);
+    }
+
+    if (need_unmap)
+      gst_nv_dec_object_unmap_surface (decoder->object, surface);
+    gst_cuda_context_pop (nullptr);
+
+    if (ret != GST_FLOW_OK) {
+      GST_WARNING_OBJECT (videodec, "Failed to copy frame");
+      goto error;
+    }
+  }
+
+  GST_BUFFER_FLAG_SET (frame->output_buffer, buffer_flags);
+  gst_codec_picture_unref (picture);
+
+  return gst_video_decoder_finish_frame (videodec, frame);
+
+error:
+  gst_codec_picture_unref (picture);
+  gst_video_decoder_release_frame (videodec, frame);
+
+  return ret;
+}
+
+typedef enum
+{
+  GST_NV_DECODER_FORMAT_FLAG_NONE = (1 << 0),
+  GST_NV_DECODER_FORMAT_FLAG_420_8BITS = (1 << 1),
+  GST_NV_DECODER_FORMAT_FLAG_420_10BITS = (1 << 2),
+  GST_NV_DECODER_FORMAT_FLAG_420_12BITS = (1 << 3),
+  GST_NV_DECODER_FORMAT_FLAG_444_8BITS = (1 << 4),
+  GST_NV_DECODER_FORMAT_FLAG_444_10BITS = (1 << 5),
+  GST_NV_DECODER_FORMAT_FLAG_444_12BITS = (1 << 6),
+} GstNvDecoderFormatFlags;
+
+static gboolean
+gst_nv_decoder_get_supported_codec_profiles (GValue * profiles,
+    cudaVideoCodec codec, GstNvDecoderFormatFlags flags)
+{
+  GValue val = G_VALUE_INIT;
+  gboolean ret = FALSE;
+
+  g_value_init (&val, G_TYPE_STRING);
+
+  switch (codec) {
+    case cudaVideoCodec_H264:
+      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_8BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_420_8BITS) {
+        g_value_set_static_string (&val, "constrained-baseline");
+        gst_value_list_append_value (profiles, &val);
+
+        g_value_set_static_string (&val, "baseline");
+        gst_value_list_append_value (profiles, &val);
+
+        g_value_set_static_string (&val, "main");
+        gst_value_list_append_value (profiles, &val);
+
+        g_value_set_static_string (&val, "high");
+        gst_value_list_append_value (profiles, &val);
+
+        g_value_set_static_string (&val, "constrained-high");
+        gst_value_list_append_value (profiles, &val);
+
+        g_value_set_static_string (&val, "progressive-high");
+        gst_value_list_append_value (profiles, &val);
+      }
+
+      /* NVDEC supports only 4:2:0 8bits h264 decoding.
+       * following conditions are for the future enhancement */
+      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_10BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_420_10BITS) {
+        g_value_set_static_string (&val, "high-10");
+        gst_value_list_append_value (profiles, &val);
+
+        g_value_set_static_string (&val, "progressive-high-10");
+        gst_value_list_append_value (profiles, &val);
+      }
+
+      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_12BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_420_12BITS ||
+          (flags & GST_NV_DECODER_FORMAT_FLAG_444_8BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_444_8BITS ||
+          (flags & GST_NV_DECODER_FORMAT_FLAG_444_10BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_444_10BITS ||
+          (flags & GST_NV_DECODER_FORMAT_FLAG_444_12BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_444_12BITS) {
+        g_value_set_static_string (&val, "high-4:4:4");
+        gst_value_list_append_value (profiles, &val);
+      }
+
+      ret = TRUE;
+      break;
+    case cudaVideoCodec_HEVC:
+      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_8BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_420_8BITS) {
+        g_value_set_static_string (&val, "main");
+        gst_value_list_append_value (profiles, &val);
+      }
+
+      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_10BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_420_10BITS) {
+        g_value_set_static_string (&val, "main-10");
+        gst_value_list_append_value (profiles, &val);
+      }
+
+      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_12BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_420_12BITS) {
+        g_value_set_static_string (&val, "main-12");
+        gst_value_list_append_value (profiles, &val);
+      }
+
+      if ((flags & GST_NV_DECODER_FORMAT_FLAG_444_8BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_444_8BITS) {
+        g_value_set_static_string (&val, "main-444");
+        gst_value_list_append_value (profiles, &val);
+      }
+
+      if ((flags & GST_NV_DECODER_FORMAT_FLAG_444_10BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_444_10BITS) {
+        g_value_set_static_string (&val, "main-444-10");
+        gst_value_list_append_value (profiles, &val);
+      }
+
+      if ((flags & GST_NV_DECODER_FORMAT_FLAG_444_12BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_444_12BITS) {
+        g_value_set_static_string (&val, "main-444-12");
+        gst_value_list_append_value (profiles, &val);
+      }
+
+      ret = TRUE;
+      break;
+    case cudaVideoCodec_VP9:
+      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_8BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_420_8BITS) {
+        g_value_set_static_string (&val, "0");
+        gst_value_list_append_value (profiles, &val);
+      }
+
+      if ((flags & GST_NV_DECODER_FORMAT_FLAG_420_10BITS) ==
+          GST_NV_DECODER_FORMAT_FLAG_420_10BITS) {
+        g_value_set_static_string (&val, "2");
+        gst_value_list_append_value (profiles, &val);
+      }
+
+      ret = TRUE;
+      break;
+    case cudaVideoCodec_AV1:
+      g_value_set_static_string (&val, "main");
+      gst_value_list_append_value (profiles, &val);
+      ret = TRUE;
+    default:
+      break;
+  }
+
+  g_value_unset (&val);
+
+  return ret;
+}
+
+typedef struct
+{
+  cudaVideoCodec codec;
+  const gchar *codec_name;
+  const gchar *sink_caps_string;
+} GstNvdecoderCodecMap;
+
+const GstNvdecoderCodecMap codec_map_list = {
+  {cudaVideoCodec_MPEG1, "mpegvideo",
+      "video/mpeg, mpegversion = (int) 1, systemstream = (boolean) false"},
+  {cudaVideoCodec_MPEG2, "mpeg2video",
+      "video/mpeg, mpegversion = (int) 2, systemstream = (boolean) false"},
+  {cudaVideoCodec_MPEG4, "mpeg4video",
+      "video/mpeg, mpegversion = (int) 4, systemstream = (boolean) false"},
+#if 0
+  /* FIXME: need verification */
+  {cudaVideoCodec_VC1, "vc1"},
+#endif
+  /* NOTE: common supported h264 profiles for all GPU architecture
+   * 4:2:0, baseline, main, and high profiles
+   */
+  {cudaVideoCodec_H264, "h264",
+      "video/x-h264, stream-format = (string) byte-stream"
+        ", alignment = (string) au"
+        ", profile = (string) { constrained-baseline, baseline, main, high, constrained-high, progressive-high }"},
+  {cudaVideoCodec_JPEG, "jpeg", "image/jpeg"},
+#if 0
+  /* FIXME: need verification */
+  {cudaVideoCodec_H264_SVC, "h264svc"},
+  {cudaVideoCodec_H264_MVC, "h264mvc"},
+#endif
+  {cudaVideoCodec_HEVC, "h265",
+      "video/x-h265, stream-format = (string) byte-stream"
+        ", alignment = (string) au, profile = (string) { main }"},
+  {cudaVideoCodec_VP8, "vp8", "video/x-vp8"},
+  {cudaVideoCodec_VP9, "vp9", "video/x-vp9"},
+  {cudaVideoCodec_AV1, "av1", "video/x-av1, alignment = (string) frame"}
+};
+
+gboolean
+gst_nv_decoder_check_device_caps (CUcontext cuda_ctx, cudaVideoCodec codec,
+    GstCaps ** sink_template, GstCaps ** src_template)
+{
+  CUresult cuda_ret;
+  guint max_width = 0, min_width = G_MAXINT;
+  guint max_height = 0, min_height = G_MAXINT;
+  GstCaps *sink_templ = nullptr;
+  GstCaps *src_templ = nullptr;
+  /* FIXME: support 12bits format */
+  guint bitdepth_minus83 = { 0, 2, 4 };
+  GstNvDecoderFormatFlags format_flags = (GstNvDecoderFormatFlags) 0;
+  guint c_idx, b_idx;
+  cudaVideoChromaFormat chroma_list = {
+#if 0
+    /* FIXME: support monochrome */
+    cudaVideoChromaFormat_Monochrome,
+    /* FIXME: Can our OpenGL support NV16 and its 10/12bits variant?? */
+    cudaVideoChromaFormat_422,
+#endif
+    cudaVideoChromaFormat_420,
+    cudaVideoChromaFormat_444,
+  };
+  GValue profile_list = G_VALUE_INIT;
+  const GstNvdecoderCodecMap *codec_map = nullptr;
+  guint i;
+  gboolean ret = FALSE;
+  std::set < std::string > formats;
+  std::set < std::string > planar_formats;
+#ifdef G_OS_WIN32
+  gboolean is_stateless = FALSE;
+
+  switch (codec) {
+    case cudaVideoCodec_H264:
+    case cudaVideoCodec_HEVC:
+    case cudaVideoCodec_VP8:
+    case cudaVideoCodec_VP9:
+    case cudaVideoCodec_AV1:
+      is_stateless = TRUE;
+      break;
+    default:
+      break;
+  }
+#endif
+
+  for (i = 0; i < G_N_ELEMENTS (codec_map_list); i++) {
+    if (codec_map_listi.codec == codec) {
+      codec_map = &codec_map_listi;
+      break;
+    }
+  }
+
+  if (!codec_map) {
+    GST_INFO ("No codec map corresponding to codec %d", codec);
+    return FALSE;
+  }
+
+  if (!gst_cuvid_can_get_decoder_caps ()) {
+    GST_INFO ("Too old nvidia driver to query decoder capability");
+
+    src_templ = gst_caps_from_string (GST_VIDEO_CAPS_MAKE ("NV12"));
+
+    {
+      GstCaps *cuda_caps = gst_caps_copy (src_templ);
+      gst_caps_set_features_simple (cuda_caps,
+          gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY));
+
+#ifdef G_OS_WIN32
+      if (is_stateless) {
+        GstCaps *d3d11_caps =
+            gst_caps_from_string (GST_VIDEO_CAPS_MAKE ("I420"));
+        gst_caps_set_features_simple (d3d11_caps,
+            gst_caps_features_from_string
+            (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY));
+        gst_caps_append (src_templ, d3d11_caps);
+      }
+#endif
+
+#ifdef HAVE_CUDA_GST_GL
+      {
+        GstCaps *gl_caps = gst_caps_copy (src_templ);
+        gst_caps_set_features_simple (gl_caps,
+            gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_GL_MEMORY));
+        gst_caps_append (src_templ, gl_caps);
+      }
+#endif
+
+      gst_caps_append (src_templ, cuda_caps);
+    }
+
+    sink_templ = gst_caps_from_string (codec_map->sink_caps_string);
+
+    *src_template = src_templ;
+    *sink_template = sink_templ;
+
+    return TRUE;
+  }
+
+  g_value_init (&profile_list, GST_TYPE_LIST);
+
+  if (CuCtxPushCurrent (cuda_ctx) != CUDA_SUCCESS)
+    goto done;
+
+  for (c_idx = 0; c_idx < G_N_ELEMENTS (chroma_list); c_idx++) {
+    for (b_idx = 0; b_idx < G_N_ELEMENTS (bitdepth_minus8); b_idx++) {
+      CUVIDDECODECAPS decoder_caps;
+      GstNvDecoderFormatFlags cur_flag = (GstNvDecoderFormatFlags) 0;
+
+      memset (&decoder_caps, 0, sizeof (CUVIDDECODECAPS));
+
+      decoder_caps.eCodecType = codec;
+      decoder_caps.eChromaFormat = chroma_listc_idx;
+      decoder_caps.nBitDepthMinus8 = bitdepth_minus8b_idx;
+
+      cuda_ret = CuvidGetDecoderCaps (&decoder_caps);
+      if (cuda_ret != CUDA_SUCCESS) {
+        GST_INFO ("could not query %s decoder capability, ret %d",
+            codec_map->codec_name, cuda_ret);
+        continue;
+      } else if (!decoder_caps.bIsSupported) {
+        GST_LOG ("%s bit-depth %d with chroma format %d is not supported",
+            codec_map->codec_name, bitdepth_minus8b_idx + 8, c_idx);
+        continue;
+      }
+
+      if (min_width > decoder_caps.nMinWidth)
+        min_width = decoder_caps.nMinWidth;
+      if (min_height > decoder_caps.nMinHeight)
+        min_height = decoder_caps.nMinHeight;
+      if (max_width < decoder_caps.nMaxWidth)
+        max_width = decoder_caps.nMaxWidth;
+      if (max_height < decoder_caps.nMaxHeight)
+        max_height = decoder_caps.nMaxHeight;
+
+      if (chroma_listc_idx == cudaVideoChromaFormat_420)
+        cur_flag = GST_NV_DECODER_FORMAT_FLAG_420_8BITS;
+      else
+        cur_flag = GST_NV_DECODER_FORMAT_FLAG_444_8BITS;
+
+      format_flags = (GstNvDecoderFormatFlags) (format_flags |
+          (cur_flag << (bitdepth_minus8b_idx / 2)));
+
+      GST_INFO ("%s bit-depth %d with chroma format %d %d - %d x %d - %d",
+          codec_map->codec_name, bitdepth_minus8b_idx + 8, c_idx, min_width,
+          max_width, min_height, max_height);
+
+      switch (chroma_listc_idx) {
+        case cudaVideoChromaFormat_420:
+          if (bitdepth_minus8b_idx == 0) {
+            formats.insert ("NV12");
+            planar_formats.insert ("I420");
+          } else if (bitdepth_minus8b_idx == 2) {
+            formats.insert ("P010_10LE");
+            planar_formats.insert ("I420_10LE");
+          } else if (bitdepth_minus8b_idx == 4) {
+            formats.insert ("P012_LE");
+            planar_formats.insert ("I420_12LE");
+          } else {
+            GST_WARNING ("unhandled bitdepth %d", bitdepth_minus8b_idx + 8);
+            break;
+          }
+          break;
+        case cudaVideoChromaFormat_444:
+          if (cudaVideoCodec_JPEG == codec) {
+            /* NVDEC jpeg decoder can decode 4:4:4 format
+             * but it produces 4:2:0 frame */
+            break;
+          }
+
+          if (bitdepth_minus8b_idx == 0) {
+            formats.insert ("Y444");
+            planar_formats.insert ("Y444");
+            if (codec == cudaVideoCodec_HEVC) {
+              formats.insert ("GBR");
+              planar_formats.insert ("GBR");
+            }
+          } else if (bitdepth_minus8b_idx == 2 || bitdepth_minus8b_idx == 4) {
+            formats.insert ("Y444_16LE");
+            planar_formats.insert ("Y444_16LE");
+            if (codec == cudaVideoCodec_HEVC) {
+              formats.insert ("GBR_16LE");
+              planar_formats.insert ("GBR_16LE");
+            }
+          } else {
+            GST_WARNING ("unhandled bitdepth %d", bitdepth_minus8b_idx + 8);
+            break;
+          }
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
+  if (formats.empty ()) {
+    GST_INFO ("device can not support %s", codec_map->codec_name);
+    goto done;
+  }
+#define APPEND_STRING(dst,set,str) G_STMT_START { \
+  if (set.find(str) != set.end()) { \
+    if (!first) \
+      dst += ", "; \
+    dst += str; \
+    first = false; \
+  } \
+} G_STMT_END
+
+  {
+    std::string format_str;
+    if (formats.size () == 1) {
+      format_str += *(formats.begin ());
+    } else {
+      bool first = true;
+      format_str += "{ ";
+      APPEND_STRING (format_str, formats, "NV12");
+      APPEND_STRING (format_str, formats, "P010_10LE");
+      APPEND_STRING (format_str, formats, "P012_LE");
+      APPEND_STRING (format_str, formats, "Y444");
+      APPEND_STRING (format_str, formats, "Y444_16LE");
+      APPEND_STRING (format_str, formats, "GBR");
+      APPEND_STRING (format_str, formats, "GBR_16LE");
+      format_str += " }";
+    }
+
+    std::string src_caps_string =
+        "video/x-raw, format = (string) " + format_str;
+    GstCaps *raw_caps = gst_caps_from_string (src_caps_string.c_str ());
+
+    src_templ = gst_caps_copy (raw_caps);
+    gst_caps_set_features_simple (src_templ,
+        gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY));
+
+#ifdef G_OS_WIN32
+    if (is_stateless) {
+      format_str.clear ();
+
+      if (planar_formats.size () == 1) {
+        format_str += *(planar_formats.begin ());
+      } else {
+        bool first = true;
+        format_str += "{ ";
+        APPEND_STRING (format_str, planar_formats, "I420");
+        APPEND_STRING (format_str, planar_formats, "I420_10LE");
+        APPEND_STRING (format_str, planar_formats, "I420_12LE");
+        APPEND_STRING (format_str, planar_formats, "Y444");
+        APPEND_STRING (format_str, planar_formats, "Y444_16LE");
+        APPEND_STRING (format_str, planar_formats, "GBR");
+        APPEND_STRING (format_str, planar_formats, "GBR_16LE");
+        format_str += " }";
+      }
+
+      src_caps_string = "video/x-raw, format = (string) " + format_str;
+      GstCaps *d3d11_caps = gst_caps_from_string (src_caps_string.c_str ());
+      gst_caps_set_features_simple (d3d11_caps,
+          gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY));
+      gst_caps_append (src_templ, d3d11_caps);
+    }
+#endif
+
+    /* OpenGL specific */
+#ifdef HAVE_CUDA_GST_GL
+    format_str.clear ();
+
+    if (formats.size () == 1) {
+      format_str += *(formats.begin ());
+    } else {
+      bool first = true;
+      format_str += "{ ";
+      APPEND_STRING (format_str, formats, "NV12");
+      APPEND_STRING (format_str, formats, "P010_10LE");
+      APPEND_STRING (format_str, formats, "P012_LE");
+      APPEND_STRING (format_str, formats, "Y444");
+      APPEND_STRING (format_str, formats, "GBR");
+      format_str += " }";
+    }
+
+    src_caps_string = "video/x-raw, format = (string) " + format_str;
+    GstCaps *gl_caps = gst_caps_from_string (src_caps_string.c_str ());
+    gst_caps_set_features_simple (gl_caps,
+        gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_GL_MEMORY));
+    gst_caps_append (src_templ, gl_caps);
+#endif
+    gst_caps_append (src_templ, raw_caps);
+  }
+#undef APPEND_STRING
+
+  gst_caps_set_simple (src_templ,
+      "width", GST_TYPE_INT_RANGE, min_width, max_width,
+      "height", GST_TYPE_INT_RANGE, min_height, max_height, nullptr);
+
+  sink_templ = gst_caps_from_string (codec_map->sink_caps_string);
+  gst_caps_set_simple (sink_templ,
+      "width", GST_TYPE_INT_RANGE, min_width, max_width,
+      "height", GST_TYPE_INT_RANGE, min_height, max_height, nullptr);
+
+  if (gst_nv_decoder_get_supported_codec_profiles (&profile_list, codec,
+          format_flags)) {
+    gst_caps_set_value (sink_templ, "profile", &profile_list);
+  }
+
+  GST_DEBUG ("sink template caps %" GST_PTR_FORMAT, sink_templ);
+  GST_DEBUG ("src template caps %" GST_PTR_FORMAT, src_templ);
+
+  CuCtxPopCurrent (nullptr);
+
+done:
+  g_value_unset (&profile_list);
+
+  if (!sink_templ || !src_templ) {
+    gst_clear_caps (&sink_templ);
+    gst_clear_caps (&src_templ);
+
+    ret = FALSE;
+  } else {
+    /* class data will be leaked if the element never gets instantiated */
+    GST_MINI_OBJECT_FLAG_SET (src_templ, GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+    GST_MINI_OBJECT_FLAG_SET (sink_templ, GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+    *src_template = src_templ;
+    *sink_template = sink_templ;
+
+    ret = TRUE;
+  }
+
+  return ret;
+}
+
+const gchar *
+gst_cuda_video_codec_to_string (cudaVideoCodec codec)
+{
+  for (guint i = 0; i < G_N_ELEMENTS (codec_map_list); i++) {
+    if (codec_map_listi.codec == codec)
+      return codec_map_listi.codec_name;
+  }
+
+  return "unknown";
+}
+
+void
+gst_nv_decoder_handle_set_context (GstNvDecoder * decoder,
+    GstElement * element, GstContext * context)
+{
+  if (gst_cuda_handle_set_context (element, context, decoder->device_id,
+          &decoder->context)) {
+    return;
+  }
+#ifdef G_OS_WIN32
+  if (gst_d3d11_handle_set_context_for_adapter_luid (element, context,
+          decoder->adapter_luid, (GstD3D11Device **) & decoder->d3d11_device)) {
+    return;
+  }
+#endif
+
+#ifdef HAVE_CUDA_GST_GL
+  gst_gl_handle_set_context (element, context,
+      (GstGLDisplay **) & decoder->gl_display,
+      (GstGLContext **) & decoder->other_gl_context);
+#endif
+}
+
+gboolean
+gst_nv_decoder_handle_query (GstNvDecoder * decoder, GstElement * element,
+    GstQuery * query)
+{
+  if (GST_QUERY_TYPE (query) != GST_QUERY_CONTEXT)
+    return FALSE;
+
+  if (gst_cuda_handle_context_query (element, query, decoder->context))
+    return TRUE;
+
+#ifdef G_OS_WIN32
+  if (gst_d3d11_handle_context_query (element,
+          query, (GstD3D11Device *) decoder->d3d11_device)) {
+    return TRUE;
+  }
+#endif
+
+#ifdef HAVE_CUDA_GST_GL
+  if (gst_gl_handle_context_query (element, query,
+          (GstGLDisplay *) decoder->gl_display,
+          (GstGLContext *) decoder->gl_context,
+          (GstGLContext *) decoder->other_gl_context)) {
+    if (decoder->gl_display)
+      gst_gl_display_filter_gl_api (GST_GL_DISPLAY (decoder->gl_display),
+          SUPPORTED_GL_APIS);
+    return TRUE;
+  }
+#endif
+
+  return FALSE;
+}
+
+#ifdef HAVE_CUDA_GST_GL
+static void
+gst_nv_decoder_check_cuda_device_from_context (GstGLContext * context,
+    gboolean * ret)
+{
+  guint device_count = 0;
+  CUdevice device_list1 = { 0, };
+  CUresult cuda_ret;
+
+  *ret = FALSE;
+
+  cuda_ret = CuGLGetDevices (&device_count,
+      device_list, 1, CU_GL_DEVICE_LIST_ALL);
+
+  if (!gst_cuda_result (cuda_ret) || device_count == 0)
+    return;
+
+  *ret = TRUE;
+
+  return;
+}
+
+static gboolean
+gst_nv_decoder_ensure_gl_context (GstNvDecoder * decoder, GstElement * videodec)
+{
+  gboolean ret;
+  GstGLDisplay *display;
+  GstGLContext *context;
+
+  if (!gst_gl_ensure_element_data (videodec,
+          (GstGLDisplay **) & decoder->gl_display,
+          (GstGLContext **) & decoder->other_gl_context)) {
+    GST_DEBUG_OBJECT (videodec, "No available OpenGL display");
+    return FALSE;
+  }
+
+  display = GST_GL_DISPLAY (decoder->gl_display);
+
+  if (!gst_gl_query_local_gl_context (videodec, GST_PAD_SRC,
+          (GstGLContext **) & decoder->gl_context)) {
+    GST_INFO_OBJECT (videodec, "failed to query local OpenGL context");
+
+    gst_clear_object (&decoder->gl_context);
+    decoder->gl_context =
+        (GstObject *) gst_gl_display_get_gl_context_for_thread (display,
+        nullptr);
+    if (decoder->gl_context == nullptr
+        || !gst_gl_display_add_context (display,
+            GST_GL_CONTEXT (decoder->gl_context))) {
+      gst_clear_object (&decoder->gl_context);
+      if (!gst_gl_display_create_context (display,
+              (GstGLContext *) decoder->other_gl_context,
+              (GstGLContext **) & decoder->gl_context, nullptr)) {
+        GST_WARNING_OBJECT (videodec, "failed to create OpenGL context");
+        return FALSE;
+      }
+
+      if (!gst_gl_display_add_context (display,
+              (GstGLContext *) decoder->gl_context)) {
+        GST_WARNING_OBJECT (videodec,
+            "failed to add the OpenGL context to the display");
+        return FALSE;
+      }
+    }
+  }
+
+  context = GST_GL_CONTEXT (decoder->gl_context);
+
+  if (!gst_gl_context_check_gl_version (context, SUPPORTED_GL_APIS, 3, 0)) {
+    GST_WARNING_OBJECT (videodec,
+        "OpenGL context could not support PBO download");
+    return FALSE;
+  }
+
+  gst_gl_context_thread_add (context,
+      (GstGLContextThreadFunc) gst_nv_decoder_check_cuda_device_from_context,
+      &ret);
+
+  if (!ret) {
+    GST_WARNING_OBJECT (videodec,
+        "Current OpenGL context is not CUDA-compatible");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+#endif
+
+#ifdef G_OS_WIN32
+static gboolean
+gst_nv_decoder_ensure_d3d11_output (GstNvDecoder * self, GstElement * element)
+{
+  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
+  GstVideoFormat decoder_format;
+
+  if (!gst_d3d11_ensure_element_data_for_adapter_luid (GST_ELEMENT (element),
+          self->adapter_luid, (GstD3D11Device **) & self->d3d11_device)) {
+    GST_WARNING_OBJECT (element, "D3D11 device is not available");
+    return FALSE;
+  }
+
+  decoder_format = GST_VIDEO_INFO_FORMAT (&self->info);
+  switch (decoder_format) {
+    case GST_VIDEO_FORMAT_NV12:
+      out_format = GST_VIDEO_FORMAT_I420;
+      break;
+    case GST_VIDEO_FORMAT_P010_10LE:
+      out_format = GST_VIDEO_FORMAT_I420_10LE;
+      break;
+    case GST_VIDEO_FORMAT_P012_LE:
+      out_format = GST_VIDEO_FORMAT_I420_12LE;
+      break;
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_Y444_16LE:
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      out_format = GST_VIDEO_INFO_FORMAT (&self->info);
+      break;
+    default:
+      GST_WARNING_OBJECT (element,
+          "Unexpected format %s", gst_video_format_to_string (decoder_format));
+      return FALSE;
+  }
+
+  gst_video_info_set_interlaced_format (&self->output_info, out_format,
+      GST_VIDEO_INFO_INTERLACE_MODE (&self->info), self->info.width,
+      self->info.height);
+
+  if (!self->converter) {
+    self->converter = gst_cuda_converter_new (&self->info, &self->output_info,
+        self->context, nullptr);
+
+    if (!self->converter) {
+      GST_WARNING_OBJECT (element, "Couldn't create converter");
+      return FALSE;
+    }
+  }
+
+  if (!self->convert_buf) {
+    GstMemory *mem = gst_cuda_allocator_alloc (nullptr, self->context,
+        self->stream, &self->output_info);
+    GstCudaMemory *cmem;
+
+    if (!mem) {
+      GST_WARNING_OBJECT (element, "Couldn't allocate memory for conversion");
+      return FALSE;
+    }
+
+    cmem = GST_CUDA_MEMORY_CAST (mem);
+
+    self->convert_buf = gst_buffer_new ();
+    gst_buffer_append_memory (self->convert_buf, mem);
+    gst_buffer_add_video_meta_full (self->convert_buf,
+        GST_VIDEO_FRAME_FLAG_NONE,
+        GST_VIDEO_INFO_FORMAT (&self->output_info),
+        GST_VIDEO_INFO_WIDTH (&self->output_info),
+        GST_VIDEO_INFO_HEIGHT (&self->output_info),
+        GST_VIDEO_INFO_N_PLANES (&self->output_info),
+        cmem->info.offset, cmem->info.stride);
+  }
+
+  return TRUE;
+}
+#endif
+
+gboolean
+gst_nv_decoder_negotiate (GstNvDecoder * decoder,
+    GstVideoDecoder * videodec, GstVideoCodecState * input_state)
+{
+  GstVideoCodecState *state;
+  guint prev_output_type, available_types, selected_type;
+
+  g_return_val_if_fail (GST_IS_NV_DECODER (decoder), FALSE);
+  g_return_val_if_fail (GST_IS_VIDEO_DECODER (videodec), FALSE);
+  g_return_val_if_fail (input_state != nullptr, FALSE);
+
+  if (!decoder->configured) {
+    GST_ERROR_OBJECT (videodec, "Should configure decoder first");
+    return FALSE;
+  }
+
+  decoder->output_info = decoder->info;
+  prev_output_type = decoder->output_type;
+  available_types = selected_type = 0;
+
+  {
+    GstCaps *caps;
+    caps = gst_pad_get_allowed_caps (GST_VIDEO_DECODER_SRC_PAD (videodec));
+    GST_DEBUG_OBJECT (videodec, "Allowed caps %" GST_PTR_FORMAT, caps);
+
+    if (!caps || gst_caps_is_any (caps)) {
+      GST_DEBUG_OBJECT (videodec,
+          "cannot determine output format, using system memory");
+    } else {
+      GstCapsFeatures *features;
+      guint size = gst_caps_get_size (caps);
+      guint i;
+
+      for (i = 0; i < size; i++) {
+        features = gst_caps_get_features (caps, i);
+        if (features && gst_caps_features_contains (features,
+                GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY)) {
+          GST_DEBUG_OBJECT (videodec, "found CUDA memory feature");
+          available_types |= GST_NV_DECODER_OUTPUT_TYPE_CUDA;
+        }
+#ifdef G_OS_WIN32
+        if (features && gst_caps_features_contains (features,
+                GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY)) {
+          GST_DEBUG_OBJECT (videodec, "found D3D11 memory feature");
+          available_types |= GST_NV_DECODER_OUTPUT_TYPE_D3D11;
+        }
+#endif
+#ifdef HAVE_CUDA_GST_GL
+        /* TODO: gl does not support Y444_16 and GBR_16 */
+        if (GST_VIDEO_INFO_FORMAT (&decoder->info) !=
+            GST_VIDEO_FORMAT_Y444_16LE &&
+            GST_VIDEO_INFO_FORMAT (&decoder->info) !=
+            GST_VIDEO_FORMAT_GBR_16LE &&
+            features && gst_caps_features_contains (features,
+                GST_CAPS_FEATURE_MEMORY_GL_MEMORY)) {
+          GST_DEBUG_OBJECT (videodec, "found GL memory feature");
+          available_types |= GST_NV_DECODER_OUTPUT_TYPE_GL;
+        }
+#endif
+      }
+
+      if (prev_output_type != GST_NV_DECODER_OUTPUT_TYPE_UNKNOWN &&
+          (prev_output_type & available_types) == prev_output_type) {
+        selected_type = prev_output_type;
+      }
+
+      if (selected_type == GST_NV_DECODER_OUTPUT_TYPE_UNKNOWN) {
+        if ((available_types & GST_NV_DECODER_OUTPUT_TYPE_CUDA) != 0)
+          selected_type = GST_NV_DECODER_OUTPUT_TYPE_CUDA;
+        else if ((available_types & GST_NV_DECODER_OUTPUT_TYPE_D3D11) != 0)
+          selected_type = GST_NV_DECODER_OUTPUT_TYPE_D3D11;
+        else if ((available_types & GST_NV_DECODER_OUTPUT_TYPE_GL) != 0)
+          selected_type = GST_NV_DECODER_OUTPUT_TYPE_GL;
+        else
+          selected_type = GST_NV_DECODER_OUTPUT_TYPE_SYSTEM;
+      }
+
+      decoder->output_type = (GstNvDecoderOutputType) selected_type;
+      GST_DEBUG_OBJECT (videodec, "Selected type %d", selected_type);
+    }
+    gst_clear_caps (&caps);
+  }
+
+#ifdef G_OS_WIN32
+  if (decoder->output_type == GST_NV_DECODER_OUTPUT_TYPE_D3D11 &&
+      !gst_nv_decoder_ensure_d3d11_output (decoder, GST_ELEMENT (videodec))) {
+    GST_WARNING_OBJECT (videodec, "D3D11 setup failed");
+    decoder->output_type = GST_NV_DECODER_OUTPUT_TYPE_SYSTEM;
+    decoder->output_info = decoder->info;
+  }
+#endif
+
+#ifdef HAVE_CUDA_GST_GL
+  if (decoder->output_type == GST_NV_DECODER_OUTPUT_TYPE_GL &&
+      !gst_nv_decoder_ensure_gl_context (decoder, GST_ELEMENT (videodec))) {
+    GST_WARNING_OBJECT (videodec,
+        "OpenGL context is not CUDA-compatible, fallback to system memory");
+    decoder->output_type = GST_NV_DECODER_OUTPUT_TYPE_SYSTEM;
+  }
+#endif
+
+  state = gst_video_decoder_set_interlaced_output_state (videodec,
+      GST_VIDEO_INFO_FORMAT (&decoder->output_info),
+      GST_VIDEO_INFO_INTERLACE_MODE (&decoder->output_info),
+      GST_VIDEO_INFO_WIDTH (&decoder->output_info),
+      GST_VIDEO_INFO_HEIGHT (&decoder->output_info), input_state);
+  state->caps = gst_video_info_to_caps (&state->info);
+
+  switch (decoder->output_type) {
+    case GST_NV_DECODER_OUTPUT_TYPE_CUDA:
+      GST_DEBUG_OBJECT (videodec, "using CUDA memory");
+      gst_caps_set_features (state->caps, 0,
+          gst_caps_features_new_single (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY));
+      break;
+#ifdef G_OS_WIN32
+    case GST_NV_DECODER_OUTPUT_TYPE_D3D11:
+      gst_caps_set_features (state->caps, 0,
+          gst_caps_features_new_single (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY));
+      break;
+#endif
+#ifdef HAVE_CUDA_GST_GL
+    case GST_NV_DECODER_OUTPUT_TYPE_GL:
+      GST_DEBUG_OBJECT (videodec, "using GL memory");
+      gst_caps_set_features (state->caps, 0,
+          gst_caps_features_new_single (GST_CAPS_FEATURE_MEMORY_GL_MEMORY));
+      gst_caps_set_simple (state->caps, "texture-target", G_TYPE_STRING,
+          "2D", nullptr);
+      break;
+#endif
+    default:
+      GST_DEBUG_OBJECT (videodec, "using system memory");
+      break;
+  }
+
+  /* decoder baseclass will hold other reference to output state */
+  gst_video_codec_state_unref (state);
+
+  return TRUE;
+}
+
+static gboolean
+gst_nv_decoder_ensure_cuda_pool (GstNvDecoder * decoder, GstQuery * query)
+{
+  GstCaps *outcaps;
+  GstBufferPool *pool = nullptr;
+  guint n, size, min = 0, max = 0;
+  GstVideoInfo vinfo = { 0, };
+  GstStructure *config;
+  GstCudaStream *stream;
+
+  gst_query_parse_allocation (query, &outcaps, nullptr);
+  n = gst_query_get_n_allocation_pools (query);
+  if (n > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+    if (pool && !GST_IS_CUDA_BUFFER_POOL (pool)) {
+      gst_object_unref (pool);
+      pool = nullptr;
+    }
+  }
+
+  if (!pool) {
+    GST_DEBUG_OBJECT (decoder, "no downstream pool, create our pool");
+    pool = gst_cuda_buffer_pool_new (decoder->context);
+
+    if (outcaps)
+      gst_video_info_from_caps (&vinfo, outcaps);
+    size = (guint) vinfo.size;
+    decoder->wait_on_pool_full = FALSE;
+  } else {
+    decoder->wait_on_pool_full = TRUE;
+  }
+
+  config = gst_buffer_pool_get_config (pool);
+  stream = gst_buffer_pool_config_get_cuda_stream (config);
+  if (stream) {
+    GST_DEBUG_OBJECT (decoder, "Downstream CUDA stream is available");
+    gst_clear_cuda_stream (&decoder->stream);
+    decoder->stream = stream;
+  } else if (decoder->stream) {
+    GST_DEBUG_OBJECT (decoder,
+        "Downstream CUDA stream is not available, use ours");
+    gst_buffer_pool_config_set_cuda_stream (config, decoder->stream);
+  }
+
+  decoder->downstream_min_buffers = min;
+  GST_DEBUG_OBJECT (decoder, "Downstream min buffers %d", min);
+
+  /* Since we don't use downstream buffer pool, pre-allocation is unnecessary */
+  min = 0;
+
+  gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+  gst_buffer_pool_set_config (pool, config);
+
+  /* Get updated size by cuda buffer pool */
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  if (n > 0)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+
+#ifdef HAVE_CUDA_GST_GL
+static gboolean
+gst_nv_decoder_ensure_gl_pool (GstNvDecoder * decoder, GstQuery * query)
+{
+  GstCaps *outcaps;
+  GstBufferPool *pool = nullptr;
+  guint n, size, min, max;
+  GstVideoInfo vinfo = { 0, };
+  GstStructure *config;
+  GstGLContext *gl_context;
+
+  GST_DEBUG_OBJECT (decoder, "decide allocation");
+
+  if (!decoder->gl_context) {
+    GST_ERROR_OBJECT (decoder, "GL context is not available");
+    return FALSE;
+  }
+
+  gl_context = GST_GL_CONTEXT (decoder->gl_context);
+
+  gst_query_parse_allocation (query, &outcaps, nullptr);
+  n = gst_query_get_n_allocation_pools (query);
+  if (n > 0)
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+
+  if (pool && !GST_IS_GL_BUFFER_POOL (pool)) {
+    gst_object_unref (pool);
+    pool = nullptr;
+  }
+
+  if (!pool) {
+    GST_DEBUG_OBJECT (decoder, "no downstream pool, create our pool");
+    pool = gst_gl_buffer_pool_new (GST_GL_CONTEXT (gl_context));
+
+    if (outcaps)
+      gst_video_info_from_caps (&vinfo, outcaps);
+    size = (guint) vinfo.size;
+    min = max = 0;
+  }
+
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+  gst_buffer_pool_set_config (pool, config);
+  if (n > 0)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+#endif
+
+#ifdef G_OS_WIN32
+static gboolean
+gst_nv_decoder_ensure_d3d11_pool (GstNvDecoder * self, GstElement * element,
+    GstQuery * query)
+{
+  GstCaps *outcaps;
+  GstBufferPool *pool = NULL;
+  guint n, size, min = 0, max = 0;
+  GstVideoInfo info;
+  GstStructure *config;
+  GstD3D11AllocationParams *d3d11_params;
+  GstD3D11Device *device;
+
+  gst_query_parse_allocation (query, &outcaps, nullptr);
+
+  if (!outcaps) {
+    GST_DEBUG_OBJECT (element, "No output caps");
+    return FALSE;
+  }
+
+  if (!gst_d3d11_ensure_element_data_for_adapter_luid (element,
+          self->adapter_luid, (GstD3D11Device **) & self->d3d11_device)) {
+    GST_ERROR_OBJECT (element, "Couldn't create d3d11 device");
+    return FALSE;
+  }
+
+  device = GST_D3D11_DEVICE (self->d3d11_device);
+
+  gst_video_info_from_caps (&info, outcaps);
+  n = gst_query_get_n_allocation_pools (query);
+  if (n > 0)
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+
+  /* create our own pool */
+  if (pool) {
+    if (!GST_IS_D3D11_BUFFER_POOL (pool)) {
+      GST_DEBUG_OBJECT (self,
+          "Downstream pool is not d3d11, will create new one");
+      gst_clear_object (&pool);
+    } else {
+      GstD3D11BufferPool *dpool = GST_D3D11_BUFFER_POOL (pool);
+      if (dpool->device != device) {
+        GST_DEBUG_OBJECT (element, "Different device, will create new one");
+        gst_clear_object (&pool);
+      }
+    }
+  }
+
+  if (!pool) {
+    pool = gst_d3d11_buffer_pool_new (device);
+
+    size = info.size;
+  }
+
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+  d3d11_params = gst_buffer_pool_config_get_d3d11_allocation_params (config);
+  if (!d3d11_params) {
+    d3d11_params = gst_d3d11_allocation_params_new (device, &info,
+        GST_D3D11_ALLOCATION_FLAG_DEFAULT, D3D11_BIND_SHADER_RESOURCE, 0);
+  }
+
+  gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
+  gst_d3d11_allocation_params_free (d3d11_params);
+
+  gst_buffer_pool_set_config (pool, config);
+  /* d3d11 buffer pool will update buffer size based on allocated texture,
+   * get size from config again */
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  if (n > 0)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+#endif
+
+gboolean
+gst_nv_decoder_decide_allocation (GstNvDecoder * decoder,
+    GstVideoDecoder * videodec, GstQuery * query)
+{
+  gboolean ret = TRUE;
+
+  GST_DEBUG_OBJECT (videodec, "decide allocation");
+
+  switch (decoder->output_type) {
+    case GST_NV_DECODER_OUTPUT_TYPE_UNKNOWN:
+    case GST_NV_DECODER_OUTPUT_TYPE_SYSTEM:
+      /* GstVideoDecoder will take care this case */
+      break;
+#ifdef G_OS_WIN32
+    case GST_NV_DECODER_OUTPUT_TYPE_D3D11:
+      ret = gst_nv_decoder_ensure_d3d11_pool (decoder, GST_ELEMENT (videodec),
+          query);
+      break;
+#endif
+#ifdef HAVE_CUDA_GST_GL
+    case GST_NV_DECODER_OUTPUT_TYPE_GL:
+      ret = gst_nv_decoder_ensure_gl_pool (decoder, query);
+      break;
+#endif
+    case GST_NV_DECODER_OUTPUT_TYPE_CUDA:
+      ret = gst_nv_decoder_ensure_cuda_pool (decoder, query);
+      break;
+    default:
+      g_assert_not_reached ();
+      return FALSE;
+  }
+
+  return ret;
+}
+
+void
+gst_nv_decoder_set_flushing (GstNvDecoder * decoder, gboolean flushing)
+{
+  g_mutex_lock (&decoder->lock);
+  if (decoder->object)
+    gst_nv_dec_object_set_flushing (decoder->object, flushing);
+  g_mutex_unlock (&decoder->lock);
+}
+
+void
+gst_nv_decoder_reset (GstNvDecoder * decoder)
+{
+  g_mutex_lock (&decoder->lock);
+  gst_nv_decoder_reset_unlocked (decoder);
+  g_mutex_unlock (&decoder->lock);
+}
+
+guint
+gst_nv_decoder_get_max_output_size (guint coded_size, guint user_requested,
+    guint device_max)
+{
+  if (user_requested <= coded_size)
+    return coded_size;
+
+  user_requested = GST_ROUND_UP_16 (user_requested);
+
+  return MIN (user_requested, device_max);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvdecoder.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvdecoder.h Changed

@@ -22,8 +22,10 @@
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
-#include <gst/cuda/gstcudautils.h>
+#include <gst/cuda/gstcuda.h>
+#include <gst/codecs/gstcodecpicture.h>
 #include "gstcuvidloader.h"
+#include "gstnvdecobject.h"
 
 G_BEGIN_DECLS
 
@@ -31,32 +33,23 @@
 G_DECLARE_FINAL_TYPE (GstNvDecoder,
     gst_nv_decoder, GST, NV_DECODER, GstObject);
 
-typedef struct _GstNvDecoderFrame
-{
-  /* CUVIDPICPARAMS::CurrPicIdx */
-  gint index;
-  guintptr devptr;
-  guint pitch;
-
-  gboolean mapped;
-
-  /* Extra frame allocated for AV1 film grain */
-  gint decode_frame_index;
-
-  /*< private >*/
-  GstNvDecoder *decoder;
-
-  gint ref_count;
-} GstNvDecoderFrame;
-
 typedef struct _GstNvDecoderClassData
 {
   GstCaps *sink_caps;
   GstCaps *src_caps;
   guint cuda_device_id;
+  gint64 adapter_luid;
+  guint max_width;
+  guint max_height;
 } GstNvDecoderClassData;
 
-GstNvDecoder * gst_nv_decoder_new (GstCudaContext * context);
+GstNvDecoder * gst_nv_decoder_new (guint device_id,
+                                   gint64 adapter_luid);
+
+gboolean       gst_nv_decoder_open (GstNvDecoder * decoder,
+                                    GstElement * element);
+
+gboolean       gst_nv_decoder_close (GstNvDecoder * decoder);
 
 gboolean       gst_nv_decoder_is_configured (GstNvDecoder * decoder);
 
@@ -67,22 +60,27 @@
                                          gint coded_height,
                                          guint coded_bitdepth,
                                          guint pool_size,
-                                         gboolean alloc_aux_frame);
+                                         gboolean alloc_aux_frame,
+                                         guint num_output_surfaces,
+                                         guint init_max_width,
+                                         guint init_max_height);
 
-GstNvDecoderFrame * gst_nv_decoder_new_frame (GstNvDecoder * decoder);
+GstFlowReturn  gst_nv_decoder_new_picture (GstNvDecoder * decoder,
+                                           GstCodecPicture * picture);
 
-GstNvDecoderFrame * gst_nv_decoder_frame_ref (GstNvDecoderFrame * frame);
+gboolean       gst_nv_decoder_decode         (GstNvDecoder * decoder,
+                                              CUVIDPICPARAMS * params);
 
-void gst_nv_decoder_frame_unref (GstNvDecoderFrame * frame);
+GstFlowReturn  gst_nv_decoder_output_picture (GstNvDecoder * decoder,
+                                              GstVideoDecoder * videodec,
+                                              GstVideoCodecFrame * frame,
+                                              GstCodecPicture * picture,
+                                              guint buffer_flags);
 
-gboolean gst_nv_decoder_decode_picture (GstNvDecoder * decoder,
-                                        CUVIDPICPARAMS * params);
+void           gst_nv_decoder_set_flushing   (GstNvDecoder * decoder,
+                                              gboolean flushing);
 
-gboolean gst_nv_decoder_finish_frame   (GstNvDecoder * decoder,
-                                        GstVideoDecoder * videodec,
-                                        GstVideoCodecState * input_state,
-                                        GstNvDecoderFrame *frame,
-                                        GstBuffer ** buffer);
+void           gst_nv_decoder_reset          (GstNvDecoder * decoder);
 
 /* utils for class registration */
 gboolean gst_nv_decoder_check_device_caps (CUcontext cuda_ctx,
@@ -93,12 +91,12 @@
 const gchar * gst_cuda_video_codec_to_string (cudaVideoCodec codec);
 
 /* helper methods */
-gboolean gst_nv_decoder_handle_set_context   (GstNvDecoder * decoder,
-                                              GstElement * videodec,
+void     gst_nv_decoder_handle_set_context   (GstNvDecoder * decoder,
+                                              GstElement * element,
                                               GstContext * context);
 
-gboolean gst_nv_decoder_handle_context_query (GstNvDecoder * decoder,
-                                              GstVideoDecoder * videodec,
+gboolean gst_nv_decoder_handle_query         (GstNvDecoder * decoder,
+                                              GstElement * element,
                                               GstQuery * query);
 
 gboolean gst_nv_decoder_negotiate            (GstNvDecoder * decoder,
@@ -109,6 +107,10 @@
                                               GstVideoDecoder * videodec,
                                               GstQuery * query);
 
+guint    gst_nv_decoder_get_max_output_size  (guint coded_size,
+                                              guint user_requested,
+                                              guint device_max);
+
 G_END_DECLS
 
 #endif /* __GST_NV_DECODER_H__ */

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvenc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvenc.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvenc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvenc.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvencobject.cpp Added

@@ -0,0 +1,1282 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstnvencobject.h"
+#include <algorithm>
+
+GST_DEBUG_CATEGORY_EXTERN (gst_nv_encoder_debug);
+#define GST_CAT_DEFAULT gst_nv_encoder_debug
+
+/* Both CUDA and D3D11 use the same value */
+#define GST_MAP_NVENC (GST_MAP_FLAG_LAST << 1)
+#define GST_MAP_READ_NVENC (GstMapFlags)(GST_MAP_READ | GST_MAP_NVENC)
+
+/* *INDENT-OFF* */
+static GstNvEncBuffer * gst_nv_enc_buffer_new (const std::string & id,
+    guint seq_num);
+static GstNvEncResource * gst_nv_enc_resource_new (const std::string & id,
+    guint seq_num);
+static GstNvEncTask * gst_nv_enc_task_new (const std::string & id,
+    guint seq_num);
+
+struct GstNvEncBuffer : public GstMiniObject
+{
+  GstNvEncBuffer (const std::string parent_id, guint seq)
+      : id (parent_id), seq_num (seq)
+  {
+    memset (&buffer, 0, sizeof (NV_ENC_CREATE_INPUT_BUFFER));
+    memset (&buffer_lock, 0, sizeof (NV_ENC_LOCK_INPUT_BUFFER));
+
+    buffer.version = gst_nvenc_get_create_input_buffer_version ();
+    buffer_lock.version = gst_nvenc_get_lock_input_buffer_version ();
+  }
+
+  std::shared_ptr<GstNvEncObject> object;
+
+  NV_ENC_CREATE_INPUT_BUFFER buffer;
+  NV_ENC_LOCK_INPUT_BUFFER buffer_lock;
+
+  bool locked = false;
+  std::string id;
+  guint seq_num;
+};
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstNvEncBuffer, gst_nv_enc_buffer);
+
+struct GstNvEncResource : public GstMiniObject
+{
+  GstNvEncResource (const std::string & parent_id, guint seq)
+      : id (parent_id), seq_num (seq)
+  {
+    memset (&resource, 0, sizeof (NV_ENC_REGISTER_RESOURCE));
+    memset (&mapped_resource, 0, sizeof (NV_ENC_MAP_INPUT_RESOURCE));
+
+    resource.version = gst_nvenc_get_register_resource_version ();
+    mapped_resource.version = gst_nvenc_get_map_input_resource_version ();
+  }
+
+  std::weak_ptr<GstNvEncObject> object;
+
+  NV_ENC_REGISTER_RESOURCE resource;
+  NV_ENC_MAP_INPUT_RESOURCE mapped_resource;
+
+  std::string id;
+  guint seq_num;
+};
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstNvEncResource, gst_nv_enc_resource);
+
+static void
+gst_nv_enc_task_clear_sei (NV_ENC_SEI_PAYLOAD * payload)
+{
+  g_clear_pointer (&payload->payload, g_free);
+}
+
+struct GstNvEncTask : public GstMiniObject
+{
+  GstNvEncTask (const std::string & parent_id, guint seq)
+      : id (parent_id), seq_num (seq)
+  {
+    memset (&event_params, 0, sizeof (NV_ENC_EVENT_PARAMS));
+    memset (&bitstream, 0, sizeof (NV_ENC_LOCK_BITSTREAM));
+
+    event_params.version = gst_nvenc_get_event_params_version ();
+    bitstream.version = gst_nvenc_get_lock_bitstream_version ();
+
+    sei_payload = g_array_new (FALSE, FALSE, sizeof (NV_ENC_SEI_PAYLOAD));
+    g_array_set_clear_func (sei_payload,
+        (GDestroyNotify) gst_nv_enc_task_clear_sei);
+  }
+
+  ~GstNvEncTask ()
+  {
+    if (sei_payload)
+      g_array_unref (sei_payload);
+  }
+
+  std::shared_ptr<GstNvEncObject> object;
+
+  GstNvEncBuffer *buffer = nullptr;
+  GstNvEncResource *resource = nullptr;
+
+  GstBuffer *gst_buffer = nullptr;;
+  GstMapInfo info;
+  NV_ENC_DEVICE_TYPE device_type = NV_ENC_DEVICE_TYPE_CUDA;
+
+  NV_ENC_EVENT_PARAMS event_params;
+  NV_ENC_OUTPUT_PTR output_ptr = nullptr;
+
+  NV_ENC_LOCK_BITSTREAM bitstream;
+  bool locked = false;
+  std::string id;
+  guint seq_num;
+
+  GArray *sei_payload;
+};
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstNvEncTask, gst_nv_enc_task);
+
+bool
+GstNvEncObject::IsSuccess (NVENCSTATUS status, GstNvEncObject * self,
+    const gchar * file, const gchar * function, gint line)
+{
+  if (status == NV_ENC_SUCCESS)
+    return true;
+
+#ifndef GST_DISABLE_GST_DEBUG
+  const gchar *status_str = nvenc_status_to_string (status);
+
+  if (self) {
+    gst_debug_log_id (GST_CAT_DEFAULT, GST_LEVEL_ERROR, file, function,
+        line, self->id_.c_str (), "NvEnc API call failed: 0x%x, %s",
+        (guint) status, status_str);
+  } else {
+    gst_debug_log (GST_CAT_DEFAULT, GST_LEVEL_ERROR, file, function,
+      line, nullptr, "NvEnc API call failed: 0x%x, %s",
+      (guint) status, status_str);
+  }
+#endif
+
+  return false;
+}
+
+#define NVENC_IS_SUCCESS(status,obj) \
+  GstNvEncObject::IsSuccess (status, obj, __FILE__, GST_FUNCTION, __LINE__)
+
+std::shared_ptr<GstNvEncObject>
+GstNvEncObject::CreateInstance (GstElement * client, GstObject * device,
+    NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS * params)
+{
+  NVENCSTATUS status;
+  gpointer session;
+
+  status = NvEncOpenEncodeSessionEx (params, &session);
+  if (!NVENC_IS_SUCCESS (status, nullptr)) {
+    GST_ERROR_OBJECT (device, "NvEncOpenEncodeSessionEx failed");
+    /* Report error to abort if GST_CUDA_CRITICAL_ERRORS is configured */
+    gst_cuda_result (CUDA_ERROR_NO_DEVICE);
+    return nullptr;
+  }
+
+  std::shared_ptr<GstNvEncObject> self =
+      std::make_shared <GstNvEncObject> ();
+  self->id_ = GST_ELEMENT_NAME (client);
+  self->session_ = session;
+
+#ifdef G_OS_WIN32
+  if (params->deviceType == NV_ENC_DEVICE_TYPE_DIRECTX) {
+    self->device_ = (GstD3D11Device *) gst_object_ref (device);
+    self->user_token_ = gst_d3d11_create_user_token ();
+  } else
+#endif
+  {
+    self->context_ = (GstCudaContext *) gst_object_ref (device);
+    self->user_token_ = gst_cuda_create_user_token ();
+  }
+
+  self->device_type_ = params->deviceType;
+  self->buffer_seq_ = 0;
+  self->resource_seq_ = 0;
+  self->task_seq_ = 0;
+
+  GST_INFO_ID (self->id_.c_str (), "New encoder object for type %d is created",
+      self->device_type_);
+
+  return self;
+}
+
+GstNvEncObject::~GstNvEncObject ()
+{
+  GST_INFO_ID (id_.c_str (), "Destroying instance");
+
+  DeviceLock ();
+  while (!buffer_queue_.empty ()) {
+    GstNvEncBuffer *buf = buffer_queue_.front ();
+
+    NvEncDestroyInputBuffer (session_, buf->buffer.inputBuffer);
+    gst_nv_enc_buffer_unref (buf);
+    buffer_queue_.pop ();
+  }
+
+  if (!resource_queue_.empty ()) {
+    GST_INFO_ID (id_.c_str (), "Have %u outstanding input resource(s)",
+        (guint) resource_queue_.size ());
+    for (auto it : resource_queue_)
+      releaseResourceUnlocked (it);
+  }
+
+  while (!empty_task_queue_.empty ()) {
+    GstNvEncTask *task = empty_task_queue_.front ();
+
+    releaseTaskUnlocked (task);
+    empty_task_queue_.pop ();
+  }
+
+  NvEncDestroyEncoder (session_);
+  DeviceUnlock ();
+
+  gst_clear_object (&context_);
+  gst_clear_cuda_stream (&stream_);
+#ifdef G_OS_WIN32
+  gst_clear_object (&device_);
+#endif
+
+  GST_INFO_ID (id_.c_str (), "Cleared all resources");
+}
+
+gpointer
+GstNvEncObject::GetHandle ()
+{
+  return session_;
+}
+
+guint
+GstNvEncObject::GetTaskSize ()
+{
+  return task_size_;
+}
+
+void
+GstNvEncObject::releaseTaskUnlocked (GstNvEncTask * task)
+{
+  if (!task)
+    return;
+
+  if (task->output_ptr) {
+    NvEncDestroyBitstreamBuffer (session_, task->output_ptr);
+    task->output_ptr = nullptr;
+  }
+
+#ifdef G_OS_WIN32
+  if (task->event_params.completionEvent) {
+    gpointer handle = task->event_params.completionEvent;
+    NvEncUnregisterAsyncEvent (session_, &task->event_params);
+    CloseHandle (handle);
+
+    memset (&task->event_params, 0, sizeof (NV_ENC_EVENT_PARAMS));
+  }
+#endif
+
+  gst_nv_enc_task_unref (task);
+}
+
+NVENCSTATUS
+GstNvEncObject::InitSession (NV_ENC_INITIALIZE_PARAMS * params,
+    GstCudaStream * stream, const GstVideoInfo * info, guint task_size)
+{
+  NVENCSTATUS status = NV_ENC_SUCCESS;
+
+  if (initialized_) {
+    GST_ERROR_ID (id_.c_str(), "Was initialized");
+    return NV_ENC_ERR_INVALID_CALL;
+  }
+
+  if (memcmp (&params->encodeGUID, &NV_ENC_CODEC_H264_GUID, sizeof (GUID)) == 0) {
+    codec_ = GST_NV_ENC_CODEC_H264;
+  } else {
+    codec_ = GST_NV_ENC_CODEC_H265;
+  }
+
+  info_ = *info;
+  switch (GST_VIDEO_INFO_FORMAT (info)) {
+    case GST_VIDEO_FORMAT_NV12:
+      buffer_format_ = NV_ENC_BUFFER_FORMAT_NV12;
+      break;
+    case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_GBR:
+      buffer_format_ = NV_ENC_BUFFER_FORMAT_YUV444;
+      break;
+    case GST_VIDEO_FORMAT_P010_10LE:
+      buffer_format_ = NV_ENC_BUFFER_FORMAT_YUV420_10BIT;
+      break;
+    case GST_VIDEO_FORMAT_Y444_16LE:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      buffer_format_ = NV_ENC_BUFFER_FORMAT_YUV444_10BIT;
+      break;
+    default:
+      GST_ERROR_ID (id_.c_str (), "Unexpected format %s",
+          gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (info)));
+      return NV_ENC_ERR_INVALID_PARAM;
+  }
+
+  GST_DEBUG_ID (id_.c_str (), "Initializing encoder, buffer type %d",
+      buffer_format_);
+
+  status = NvEncInitializeEncoder (session_, params);
+  if (!NVENC_IS_SUCCESS (status, this))
+    return status;
+
+  if (device_type_ == NV_ENC_DEVICE_TYPE_CUDA && stream) {
+    CUstream stream_handle;
+
+    stream_ = gst_cuda_stream_ref (stream);
+    stream_handle = gst_cuda_stream_get_handle (stream);
+    status = NvEncSetIOCudaStreams (session_,
+        (NV_ENC_CUSTREAM_PTR) & stream_handle,
+        (NV_ENC_CUSTREAM_PTR) & stream_handle);
+    if (!NVENC_IS_SUCCESS (status, this))
+      return status;
+  }
+
+  for (guint i = 0; i < task_size; i++) {
+    GstNvEncTask *task = gst_nv_enc_task_new (id_, task_seq_.fetch_add (1));
+    NV_ENC_CREATE_BITSTREAM_BUFFER buffer_params = { 0, };
+
+    task->device_type = device_type_;
+
+    buffer_params.version = gst_nvenc_get_create_bitstream_buffer_version ();
+    status = NvEncCreateBitstreamBuffer (session_, &buffer_params);
+    if (!NVENC_IS_SUCCESS (status, this)) {
+      gst_nv_enc_task_unref (task);
+      goto out;
+    }
+
+    task->output_ptr = buffer_params.bitstreamBuffer;
+
+#ifdef G_OS_WIN32
+    if (params->enableEncodeAsync) {
+      task->event_params.version =  gst_nvenc_get_event_params_version ();
+      task->event_params.completionEvent = CreateEvent (nullptr,
+          FALSE, FALSE, nullptr);
+      status = NvEncRegisterAsyncEvent (session_, &task->event_params);
+      if (!NVENC_IS_SUCCESS (status, this)) {
+        CloseHandle (task->event_params.completionEvent);
+        releaseTaskUnlocked (task);
+        goto out;
+      }
+    }
+#endif
+
+    empty_task_queue_.push (task);
+  }
+
+  task_size_ = task_size;
+  lookahead_ = params->encodeConfig->rcParams.lookaheadDepth;
+  initialized_ = true;
+
+out:
+  if (status != NV_ENC_SUCCESS) {
+    while (!empty_task_queue_.empty ()) {
+      GstNvEncTask *task = empty_task_queue_.front ();
+
+      releaseTaskUnlocked (task);
+      empty_task_queue_.pop ();
+    }
+  }
+
+  return status;
+}
+
+NVENCSTATUS
+GstNvEncObject::Reconfigure (NV_ENC_RECONFIGURE_PARAMS * params)
+{
+  return NvEncReconfigureEncoder (session_, params);
+}
+
+void
+GstNvEncObject::SetFlushing (bool flushing)
+{
+  std::lock_guard <std::mutex> lk (lock_);
+  flushing_ = flushing;
+  cond_.notify_all ();
+}
+
+NVENCSTATUS
+GstNvEncObject::Encode (GstVideoCodecFrame * codec_frame,
+    NV_ENC_PIC_STRUCT pic_struct, GstNvEncTask * task)
+{
+  NVENCSTATUS status;
+  guint retry_count = 0;
+  const guint retry_threshold = 100;
+  NV_ENC_PIC_PARAMS params = { 0, };
+
+  std::unique_lock <std::mutex> lk (lock_);
+
+  params.version = gst_nvenc_get_pic_params_version ();
+  params.completionEvent = task->event_params.completionEvent;
+
+  g_assert (task->buffer || task->resource);
+
+  GST_LOG_ID (id_.c_str (), "Encoding frame %u",
+      codec_frame->system_frame_number);
+
+  if (task->buffer) {
+    params.inputWidth = task->buffer->buffer.width;
+    params.inputHeight = task->buffer->buffer.height;
+    params.inputPitch = task->buffer->buffer_lock.pitch;
+    params.inputBuffer = task->buffer->buffer.inputBuffer;
+    params.bufferFmt = task->buffer->buffer.bufferFmt;
+  } else {
+    params.inputWidth = task->resource->resource.width;
+    params.inputHeight = task->resource->resource.height;
+    params.inputPitch = task->resource->resource.pitch;
+    params.inputBuffer = task->resource->mapped_resource.mappedResource;
+    params.bufferFmt = task->resource->mapped_resource.mappedBufferFmt;
+  }
+
+  params.frameIdx = codec_frame->system_frame_number;
+  params.inputTimeStamp = codec_frame->pts;
+  params.inputDuration = codec_frame->duration;
+  params.outputBitstream = task->output_ptr;
+  params.pictureStruct = pic_struct;
+  if (task->sei_payload->len > 0) {
+    if (codec_ == GST_NV_ENC_CODEC_H264) {
+      params.codecPicParams.h264PicParams.seiPayloadArray =
+          &g_array_index (task->sei_payload, NV_ENC_SEI_PAYLOAD, 0);
+      params.codecPicParams.h264PicParams.seiPayloadArrayCnt =
+          task->sei_payload->len;
+    } else {
+      params.codecPicParams.hevcPicParams.seiPayloadArray =
+          &g_array_index (task->sei_payload, NV_ENC_SEI_PAYLOAD, 0);
+      params.codecPicParams.hevcPicParams.seiPayloadArrayCnt =
+          task->sei_payload->len;
+    }
+  }
+
+  if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (codec_frame))
+    params.encodePicFlags = NV_ENC_PIC_FLAG_FORCEIDR;
+
+  do {
+    DeviceLock ();
+    status = NvEncEncodePicture (session_, &params);
+    DeviceUnlock ();
+
+    if (status == NV_ENC_ERR_ENCODER_BUSY) {
+      if (retry_count < 100) {
+        GST_DEBUG_ID (id_.c_str (), "GPU is busy, retry count (%d/%d)",
+            retry_count, retry_threshold);
+        retry_count++;
+
+        /* Magic number 1ms */
+        g_usleep (1000);
+        continue;
+      } else {
+        GST_ERROR_ID (id_.c_str (), "GPU is keep busy, give up");
+        break;
+      }
+    }
+
+    break;
+  } while (true);
+
+  if (status != NV_ENC_SUCCESS && status != NV_ENC_ERR_NEED_MORE_INPUT) {
+    NVENC_IS_SUCCESS (status, this);
+    lk.unlock ();
+    gst_nv_enc_task_unref (task);
+    return status;
+  }
+
+  gst_video_codec_frame_set_user_data (codec_frame, task, nullptr);
+
+  {
+    std::lock_guard <std::recursive_mutex> rlk (resource_lock_);
+
+    if (task->resource)
+      active_resource_queue_.insert (task->resource);
+  }
+
+  /* On Windows and if async encoding is enabled, output thread will wait
+   * for completion event. But on Linux, async encoding is not supported.
+   * So, we should wait for NV_ENC_SUCCESS in case of sync mode
+   * (it would introduce latency though).
+   * Otherwise nvEncLockBitstream() will return error */
+  if (params.completionEvent) {
+    /* Windows only path */
+    task_queue_.push (task);
+    cond_.notify_all ();
+  } else {
+    pending_task_queue_.push (task);
+    if (status == NV_ENC_SUCCESS) {
+      bool notify = false;
+
+      /* XXX: nvEncLockBitstream() will return NV_ENC_ERR_INVALID_PARAM
+       * if lookahead is enabled. See also
+       * https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/494
+       */
+      while (pending_task_queue_.size() > lookahead_) {
+        notify = true;
+        task_queue_.push (pending_task_queue_.front ());
+        pending_task_queue_.pop ();
+      }
+
+      if (notify)
+        cond_.notify_all ();
+    }
+  }
+
+  return NV_ENC_SUCCESS;
+}
+
+NVENCSTATUS
+GstNvEncObject::Drain (GstNvEncTask * task)
+{
+  NVENCSTATUS status;
+  guint retry_count = 0;
+  const guint retry_threshold = 100;
+  NV_ENC_PIC_PARAMS params = { 0, };
+
+  std::unique_lock <std::mutex> lk (lock_);
+
+  params.version = gst_nvenc_get_pic_params_version ();
+  params.completionEvent = task->event_params.completionEvent;
+  params.encodePicFlags = NV_ENC_PIC_FLAG_EOS;
+
+  do {
+    status = NvEncEncodePicture (session_, &params);
+
+    if (status == NV_ENC_ERR_ENCODER_BUSY) {
+      if (retry_count < 100) {
+        GST_DEBUG_ID (id_.c_str (), "GPU is busy, retry count (%d/%d)",
+            retry_count, retry_threshold);
+        retry_count++;
+
+        /* Magic number 1ms */
+        g_usleep (1000);
+        continue;
+      } else {
+        GST_ERROR_ID (id_.c_str (), "GPU is keep busy, give up");
+        break;
+      }
+    }
+
+    break;
+  } while (true);
+
+  while (!pending_task_queue_.empty ()) {
+    task_queue_.push (pending_task_queue_.front ());
+    pending_task_queue_.pop ();
+  }
+
+  task_queue_.push (task);
+  cond_.notify_all ();
+
+  return status;
+}
+
+GstFlowReturn
+GstNvEncObject::GetOutput (GstNvEncTask ** task)
+{
+  GstNvEncTask *ret = nullptr;
+  std::unique_lock <std::mutex> lk (lock_);
+
+  while (task_queue_.empty ())
+    cond_.wait (lk);
+
+  ret = task_queue_.front ();
+  task_queue_.pop ();
+  lk.unlock ();
+
+  if (!ret->buffer && !ret->resource) {
+    gst_nv_enc_task_unref (ret);
+    return GST_FLOW_EOS;
+  }
+
+#ifdef G_OS_WIN32
+  if (ret->event_params.completionEvent &&
+      WaitForSingleObject (ret->event_params.completionEvent, 20000) ==
+      WAIT_FAILED) {
+    GST_ERROR_ID (id_.c_str (), "Failed to wait for completion event");
+    gst_nv_enc_task_unref (ret);
+    return GST_FLOW_ERROR;
+  }
+#endif
+
+  *task = ret;
+
+  return GST_FLOW_OK;
+}
+
+NVENCSTATUS
+GstNvEncObject::LockBitstream (NV_ENC_LOCK_BITSTREAM * bitstream)
+{
+  return NvEncLockBitstream (session_, bitstream);
+}
+
+NVENCSTATUS
+GstNvEncObject::UnlockBitstream (NV_ENC_OUTPUT_PTR output_ptr)
+{
+  return NvEncUnlockBitstream (session_, output_ptr);
+}
+
+NVENCSTATUS
+GstNvEncObject::AcquireBuffer (GstNvEncBuffer ** buffer)
+{
+  GstNvEncBuffer *new_buf = nullptr;
+  std::unique_lock <std::mutex> lk (lock_);
+
+  if (buffer_queue_.empty ()) {
+    NVENCSTATUS status;
+    NV_ENC_CREATE_INPUT_BUFFER in_buf = { 0, };
+
+    GST_LOG_ID (id_.c_str (), "No available input buffer, creating new one");
+
+    in_buf.version = gst_nvenc_get_create_input_buffer_version ();
+    in_buf.width = info_.width;
+    in_buf.height = info_.height;
+    in_buf.bufferFmt = buffer_format_;
+
+    status = NvEncCreateInputBuffer (session_, &in_buf);
+    if (!NVENC_IS_SUCCESS (status, this))
+      return status;
+
+    new_buf = gst_nv_enc_buffer_new (id_, buffer_seq_.fetch_add (1));
+    new_buf->buffer = in_buf;
+    new_buf->buffer_lock.inputBuffer = in_buf.inputBuffer;
+  } else {
+    new_buf = buffer_queue_.front ();
+    buffer_queue_.pop ();
+  }
+
+  g_assert (!new_buf->object);
+
+  new_buf->object = shared_from_this ();
+
+  *buffer = new_buf;
+
+  GST_TRACE_ID (id_.c_str (), "Acquired buffer %u", new_buf->seq_num);
+
+  return NV_ENC_SUCCESS;
+}
+
+void
+GstNvEncObject::runResourceGC ()
+{
+  std::lock_guard <std::recursive_mutex> lk (resource_lock_);
+
+  /* hard coded max size 64 */
+  if (resource_queue_.size () < 64)
+    return;
+
+  GST_LOG_ID (id_.c_str (), "Running resource GC");
+
+  DeviceLock ();
+  for (auto it : resource_queue_) {
+    if (active_resource_queue_.find (it) == active_resource_queue_.end ()) {
+      releaseResourceUnlocked (it);
+      resource_queue_.erase (it);
+    }
+  }
+  DeviceUnlock ();
+
+  GST_LOG_ID (id_.c_str (), "resource queue size after GC %u",
+      (guint) resource_queue_.size ());
+}
+
+bool
+GstNvEncObject::DeviceLock ()
+{
+  if (context_)
+    return gst_cuda_context_push (context_);
+
+  return true;
+}
+
+bool
+GstNvEncObject::DeviceUnlock ()
+{
+  if (context_)
+    return gst_cuda_context_pop (nullptr);
+
+  return true;
+}
+
+NVENCSTATUS
+GstNvEncObject::acquireResourceCuda (GstMemory * mem,
+    GstNvEncResource ** resource)
+{
+  GstNvEncResource *res;
+  GstCudaMemory *cmem;
+  NV_ENC_REGISTER_RESOURCE new_resource;
+  NV_ENC_MAP_INPUT_RESOURCE mapped_resource;
+  NVENCSTATUS status;
+  GstMapInfo info;
+
+  if (!gst_is_cuda_memory (mem)) {
+    GST_ERROR_ID (id_.c_str (), "Not a CUDA memory");
+    return NV_ENC_ERR_INVALID_CALL;
+  }
+
+  cmem = GST_CUDA_MEMORY_CAST (mem);
+
+  res = (GstNvEncResource *) gst_cuda_memory_get_token_data (cmem,
+      user_token_);
+  if (res) {
+    auto iter = resource_queue_.find (res);
+    /* This resource can be released already */
+    if (iter != resource_queue_.end ()) {
+      GST_LOG_ID (id_.c_str (), "Memory is holding registered resource");
+      *resource = gst_nv_enc_resource_ref (res);
+      return NV_ENC_SUCCESS;
+    }
+  }
+
+  if (!gst_memory_map (mem, &info, GST_MAP_READ_NVENC)) {
+    GST_ERROR_ID (id_.c_str (), "Couldn't map CUDA memory");
+    return NV_ENC_ERR_MAP_FAILED;
+  }
+
+  memset (&new_resource, 0, sizeof (NV_ENC_REGISTER_RESOURCE));
+  memset (&mapped_resource, 0, sizeof (NV_ENC_MAP_INPUT_RESOURCE));
+
+  new_resource.version = gst_nvenc_get_register_resource_version ();
+  new_resource.resourceType = NV_ENC_INPUT_RESOURCE_TYPE_CUDADEVICEPTR;
+  new_resource.width = cmem->info.width;
+  new_resource.height = cmem->info.height;
+  new_resource.pitch = cmem->info.stride0;
+  new_resource.resourceToRegister = info.data;
+  new_resource.bufferFormat = buffer_format_;
+
+  GST_LOG_ID (id_.c_str (), "Registering CUDA resource %p, %dx%d, pitch %u",
+      info.data, new_resource.width, new_resource.height, new_resource.pitch);
+
+  status = NvEncRegisterResource (session_, &new_resource);
+  gst_memory_unmap (mem, &info);
+
+  if (!NVENC_IS_SUCCESS (status, this))
+    return status;
+
+  mapped_resource.version = gst_nvenc_get_map_input_resource_version ();
+  mapped_resource.registeredResource = new_resource.registeredResource;
+  status = NvEncMapInputResource (session_, &mapped_resource);
+  if (!NVENC_IS_SUCCESS (status, this)) {
+    NvEncUnregisterResource (session_, new_resource.registeredResource);
+    return status;
+  }
+
+  res = gst_nv_enc_resource_new (id_, resource_seq_.fetch_add (1));
+  /* weak ref */
+  res->object = shared_from_this ();
+
+  res->resource = new_resource;
+  res->mapped_resource = mapped_resource;
+
+  gst_cuda_memory_set_token_data (cmem, user_token_,
+      gst_nv_enc_resource_ref (res),
+      (GDestroyNotify) gst_nv_enc_resource_unref);
+  resource_queue_.insert (res);
+
+  *resource = res;
+
+  return NV_ENC_SUCCESS;
+}
+
+#ifdef G_OS_WIN32
+NVENCSTATUS
+GstNvEncObject::acquireResourceD3D11 (GstMemory * mem,
+    GstNvEncResource ** resource)
+{
+  GstNvEncResource *res;
+  GstD3D11Memory *dmem;
+  NV_ENC_REGISTER_RESOURCE new_resource;
+  NV_ENC_MAP_INPUT_RESOURCE mapped_resource;
+  NVENCSTATUS status;
+  D3D11_TEXTURE2D_DESC desc;
+  GstMapInfo info;
+
+  if (!gst_is_d3d11_memory (mem)) {
+    GST_ERROR_ID (id_.c_str (), "Not a D3D11 memory");
+    return NV_ENC_ERR_INVALID_CALL;
+  }
+
+  dmem = GST_D3D11_MEMORY_CAST (mem);
+
+  res = (GstNvEncResource *) gst_d3d11_memory_get_token_data (dmem,
+      user_token_);
+  if (res) {
+    auto iter = resource_queue_.find (res);
+    /* This resource can be released already */
+    if (iter != resource_queue_.end ()) {
+      GST_LOG_ID (id_.c_str (), "Memory is holding registered resource");
+      *resource = gst_nv_enc_resource_ref (res);
+      return NV_ENC_SUCCESS;
+    }
+  }
+
+  if (!gst_memory_map (mem, &info, GST_MAP_READ_NVENC)) {
+    GST_ERROR_ID (id_.c_str (), "Couldn't map D3D11 memory");
+    return NV_ENC_ERR_MAP_FAILED;
+  }
+
+  gst_d3d11_memory_get_texture_desc (dmem, &desc);
+
+  memset (&new_resource, 0, sizeof (NV_ENC_REGISTER_RESOURCE));
+  memset (&mapped_resource, 0, sizeof (NV_ENC_MAP_INPUT_RESOURCE));
+
+  new_resource.version = gst_nvenc_get_register_resource_version ();
+  new_resource.resourceType = NV_ENC_INPUT_RESOURCE_TYPE_DIRECTX;
+  new_resource.width = desc.Width;
+  new_resource.height = desc.Height;
+  new_resource.pitch = 0;
+  new_resource.resourceToRegister = info.data;
+  new_resource.subResourceIndex = gst_d3d11_memory_get_subresource_index (dmem);
+  new_resource.bufferFormat = buffer_format_;
+
+  status = NvEncRegisterResource (session_, &new_resource);
+  gst_memory_unmap (mem, &info);
+  if (!NVENC_IS_SUCCESS (status, this))
+    return status;
+
+  mapped_resource.version = gst_nvenc_get_map_input_resource_version ();
+  mapped_resource.registeredResource = new_resource.registeredResource;
+  status = NvEncMapInputResource (session_, &mapped_resource);
+  if (!NVENC_IS_SUCCESS (status, this)) {
+    NvEncUnregisterResource (session_, new_resource.registeredResource);
+    return status;
+  }
+
+  res = gst_nv_enc_resource_new (id_, resource_seq_.fetch_add (1));
+  /* weak ref */
+  res->object = shared_from_this ();
+
+  res->resource = new_resource;
+  res->mapped_resource = mapped_resource;
+
+  gst_d3d11_memory_set_token_data (dmem, user_token_,
+      gst_nv_enc_resource_ref (res),
+      (GDestroyNotify) gst_nv_enc_resource_unref);
+  resource_queue_.insert (res);
+
+  *resource = res;
+
+  return NV_ENC_SUCCESS;
+}
+#endif
+
+NVENCSTATUS
+GstNvEncObject::AcquireResource (GstMemory * mem, GstNvEncResource ** resource)
+{
+  NVENCSTATUS status;
+  std::lock_guard <std::recursive_mutex> lk (resource_lock_);
+
+#ifdef G_OS_WIN32
+  if (device_type_ == NV_ENC_DEVICE_TYPE_DIRECTX) {
+    status = acquireResourceD3D11 (mem, resource);
+  } else
+#endif
+  {
+    status = acquireResourceCuda (mem, resource);
+  }
+
+  if (status == NV_ENC_SUCCESS) {
+    GST_TRACE_ID (id_.c_str (), "Returning resource %u, "
+        "resource queue size %u (active %u)",
+        (*resource)->seq_num, (guint) resource_queue_.size (),
+        (guint) active_resource_queue_.size ());
+  }
+
+  return status;
+}
+
+GstFlowReturn
+GstNvEncObject::AcquireTask (GstNvEncTask ** task, bool force)
+{
+  GstNvEncTask *new_task = nullptr;
+
+  std::unique_lock <std::mutex> lk (lock_);
+
+  do {
+    if (!force && flushing_) {
+      GST_DEBUG_ID (id_.c_str (), "We are flushing");
+      return GST_FLOW_FLUSHING;
+    }
+
+    if (!empty_task_queue_.empty ()) {
+      new_task = empty_task_queue_.front ();
+      empty_task_queue_.pop ();
+      break;
+    }
+
+    GST_LOG_ID (id_.c_str (), "No available task, waiting for release");
+    cond_.wait (lk);
+  } while (true);
+
+  g_assert (!new_task->object);
+
+  new_task->object = shared_from_this ();
+  g_array_set_size (new_task->sei_payload, 0);
+
+  *task = new_task;
+
+  GST_TRACE_ID (id_.c_str (), "Acquired task %u", new_task->seq_num);
+
+  runResourceGC ();
+
+  return GST_FLOW_OK;
+}
+
+void
+GstNvEncObject::PushEmptyTask (GstNvEncTask * task)
+{
+  std::lock_guard <std::mutex> lk (lock_);
+
+  empty_task_queue_.push (task);
+  cond_.notify_all ();
+}
+
+void
+GstNvEncObject::PushEmptyBuffer (GstNvEncBuffer * buffer)
+{
+  std::lock_guard <std::mutex> lk (lock_);
+
+  buffer_queue_.push (buffer);
+  cond_.notify_all ();
+}
+
+void
+GstNvEncObject::releaseResourceUnlocked (GstNvEncResource * resource)
+{
+  NvEncUnmapInputResource (session_, resource->mapped_resource.mappedResource);
+  NvEncUnregisterResource (session_, resource->resource.registeredResource);
+
+  resource->mapped_resource.mappedResource = nullptr;
+  resource->resource.registeredResource = nullptr;
+}
+
+void
+GstNvEncObject::ReleaseResource (GstNvEncResource * resource)
+{
+  std::lock_guard <std::recursive_mutex> lk (resource_lock_);
+
+  active_resource_queue_.erase (resource);
+
+  auto it = resource_queue_.find (resource);
+  if (it != resource_queue_.end ()) {
+    DeviceLock ();
+    releaseResourceUnlocked (resource);
+    DeviceUnlock ();
+    resource_queue_.erase (it);
+  }
+}
+
+void
+GstNvEncObject::DeactivateResource (GstNvEncResource * resource)
+{
+  std::lock_guard <std::recursive_mutex> lk (resource_lock_);
+
+  GST_TRACE_ID (resource->id.c_str (), "Deactivating resource %u",
+      resource->seq_num);
+
+  active_resource_queue_.erase (resource);
+}
+
+/* *INDENT-ON* */
+
+NVENCSTATUS
+gst_nv_enc_buffer_lock (GstNvEncBuffer * buffer,
+    gpointer * data, guint32 * pitch)
+{
+  std::shared_ptr < GstNvEncObject > object = buffer->object;
+  NVENCSTATUS status;
+
+  g_assert (object);
+
+  GST_TRACE_ID (buffer->id.c_str (), "Locking buffer %u", buffer->seq_num);
+
+  if (!buffer->locked) {
+    buffer->buffer_lock.inputBuffer = buffer->buffer.inputBuffer;
+    status = NvEncLockInputBuffer (object->GetHandle (), &buffer->buffer_lock);
+    if (!NVENC_IS_SUCCESS (status, object.get ()))
+      return status;
+
+    buffer->locked = true;
+  }
+
+  *data = buffer->buffer_lock.bufferDataPtr;
+  *pitch = buffer->buffer_lock.pitch;
+
+  return NV_ENC_SUCCESS;
+}
+
+void
+gst_nv_enc_buffer_unlock (GstNvEncBuffer * buffer)
+{
+  std::shared_ptr < GstNvEncObject > object = buffer->object;
+
+  if (!buffer->locked) {
+    GST_DEBUG_ID (buffer->id.c_str (),
+        "Buffer %u was not locked", buffer->seq_num);
+    return;
+  }
+
+  g_assert (object);
+
+  NvEncUnlockInputBuffer (object->GetHandle (), buffer->buffer.inputBuffer);
+  buffer->locked = false;
+}
+
+static gboolean
+gst_nv_enc_buffer_dispose (GstNvEncBuffer * buffer)
+{
+  std::shared_ptr < GstNvEncObject > object = buffer->object;
+
+  GST_TRACE_ID (buffer->id.c_str (), "Disposing buffer %u", buffer->seq_num);
+
+  if (!object)
+    return TRUE;
+
+  gst_nv_enc_buffer_unlock (buffer);
+  buffer->object = nullptr;
+
+  GST_TRACE_ID (buffer->id.c_str (),
+      "Back to buffer queue %u", buffer->seq_num);
+
+  /* Back to task queue */
+  gst_nv_enc_buffer_ref (buffer);
+  object->PushEmptyBuffer (buffer);
+
+  return FALSE;
+}
+
+static void
+gst_nv_enc_buffer_free (GstNvEncBuffer * buffer)
+{
+  GST_TRACE_ID (buffer->id.c_str (), "Freeing buffer %u", buffer->seq_num);
+
+  delete buffer;
+}
+
+static GstNvEncBuffer *
+gst_nv_enc_buffer_new (const std::string & id, guint seq_num)
+{
+  GstNvEncBuffer *buffer = new GstNvEncBuffer (id, seq_num);
+
+  gst_mini_object_init (buffer, 0, GST_TYPE_NV_ENC_BUFFER, nullptr,
+      (GstMiniObjectDisposeFunction) gst_nv_enc_buffer_dispose,
+      (GstMiniObjectFreeFunction) gst_nv_enc_buffer_free);
+
+  return buffer;
+}
+
+static gboolean
+gst_nv_enc_resource_dispose (GstNvEncResource * resource)
+{
+  std::shared_ptr < GstNvEncObject > object;
+
+  GST_TRACE_ID (resource->id.c_str (),
+      "Disposing resource %u", resource->seq_num);
+
+  object = resource->object.lock ();
+
+  if (!object)
+    return TRUE;
+
+  object->ReleaseResource (resource);
+
+  return TRUE;
+}
+
+static void
+gst_nv_enc_resource_free (GstNvEncResource * resource)
+{
+  GST_TRACE_ID (resource->id.c_str (),
+      "Freeing resource %u", resource->seq_num);
+
+  delete resource;
+}
+
+static GstNvEncResource *
+gst_nv_enc_resource_new (const std::string & id, guint seq_num)
+{
+  GstNvEncResource *resource = new GstNvEncResource (id, seq_num);
+
+  gst_mini_object_init (resource, 0, GST_TYPE_NV_ENC_RESOURCE, nullptr,
+      (GstMiniObjectDisposeFunction) gst_nv_enc_resource_dispose,
+      (GstMiniObjectFreeFunction) gst_nv_enc_resource_free);
+
+  return resource;
+}
+
+gboolean
+gst_nv_enc_task_set_buffer (GstNvEncTask * task, GstNvEncBuffer * buffer)
+{
+  g_assert (!task->buffer);
+  g_assert (!task->resource);
+
+  task->buffer = buffer;
+
+  return TRUE;
+}
+
+gboolean
+gst_nv_enc_task_set_resource (GstNvEncTask * task,
+    GstBuffer * buffer, GstNvEncResource * resource)
+{
+  if (!gst_buffer_map (buffer, &task->info, GST_MAP_READ_NVENC)) {
+    GST_ERROR_ID (task->id.c_str (), "Couldn't map resource buffer");
+    gst_buffer_unref (buffer);
+    gst_nv_enc_resource_unref (resource);
+    return FALSE;
+  }
+
+  task->gst_buffer = buffer;
+  task->resource = resource;
+
+  return TRUE;
+}
+
+GArray *
+gst_nv_enc_task_get_sei_payload (GstNvEncTask * task)
+{
+  return task->sei_payload;
+}
+
+NVENCSTATUS
+gst_nv_enc_task_lock_bitstream (GstNvEncTask * task,
+    NV_ENC_LOCK_BITSTREAM * bitstream)
+{
+  NVENCSTATUS status;
+
+  if (task->locked) {
+    GST_ERROR_ID (task->id.c_str (), "Bitstream was locked already");
+    return NV_ENC_ERR_INVALID_CALL;
+  }
+
+  task->bitstream.outputBitstream = task->output_ptr;
+  status = task->object->LockBitstream (&task->bitstream);
+
+  if (!NVENC_IS_SUCCESS (status, task->object.get ()))
+    return status;
+
+  task->locked = true;
+  *bitstream = task->bitstream;
+
+  return NV_ENC_SUCCESS;
+}
+
+void
+gst_nv_enc_task_unlock_bitstream (GstNvEncTask * task)
+{
+  NVENCSTATUS status;
+
+  if (!task->locked)
+    return;
+
+  status = task->object->UnlockBitstream (task->output_ptr);
+
+  NVENC_IS_SUCCESS (status, task->object.get ());
+  task->locked = false;
+}
+
+static gboolean
+gst_nv_enc_task_dispose (GstNvEncTask * task)
+{
+  std::shared_ptr < GstNvEncObject > object;
+
+  GST_TRACE_ID (task->id.c_str (), "Disposing task %u", task->seq_num);
+
+  object = task->object;
+
+  g_array_set_size (task->sei_payload, 0);
+
+  if (task->resource) {
+    object->DeactivateResource (task->resource);
+    gst_clear_nv_encoder_resource (&task->resource);
+  }
+
+  gst_clear_nv_encoder_buffer (&task->buffer);
+
+  if (task->gst_buffer) {
+    if (task->device_type == NV_ENC_DEVICE_TYPE_CUDA) {
+      GstMemory *mem = gst_buffer_peek_memory (task->gst_buffer, 0);
+      if (gst_is_cuda_memory (mem))
+        GST_MEMORY_FLAG_UNSET (mem, GST_CUDA_MEMORY_TRANSFER_NEED_SYNC);
+    }
+    gst_buffer_unmap (task->gst_buffer, &task->info);
+    gst_clear_buffer (&task->gst_buffer);
+  }
+
+  if (!object)
+    return TRUE;
+
+  task->object = nullptr;
+
+  GST_TRACE_ID (task->id.c_str (), "Back to task queue %u", task->seq_num);
+
+  /* Back to task queue */
+  gst_nv_enc_task_ref (task);
+  object->PushEmptyTask (task);
+
+  return FALSE;
+}
+
+static void
+gst_nv_enc_task_free (GstNvEncTask * task)
+{
+  GST_TRACE_ID (task->id.c_str (), "Freeing task %u", task->seq_num);
+
+  delete task;
+}
+
+static GstNvEncTask *
+gst_nv_enc_task_new (const std::string & id, guint seq_num)
+{
+  GstNvEncTask *task = new GstNvEncTask (id, seq_num);
+
+  gst_mini_object_init (task, 0, GST_TYPE_NV_ENC_TASK, nullptr,
+      (GstMiniObjectDisposeFunction) gst_nv_enc_task_dispose,
+      (GstMiniObjectFreeFunction) gst_nv_enc_task_free);
+
+  return task;
+}
+
+const gchar *
+nvenc_status_to_string (NVENCSTATUS status)
+{
+#define CASE(err) \
+    case err: \
+    return G_STRINGIFY (err);
+
+  switch (status) {
+      CASE (NV_ENC_SUCCESS);
+      CASE (NV_ENC_ERR_NO_ENCODE_DEVICE);
+      CASE (NV_ENC_ERR_UNSUPPORTED_DEVICE);
+      CASE (NV_ENC_ERR_INVALID_ENCODERDEVICE);
+      CASE (NV_ENC_ERR_INVALID_DEVICE);
+      CASE (NV_ENC_ERR_DEVICE_NOT_EXIST);
+      CASE (NV_ENC_ERR_INVALID_PTR);
+      CASE (NV_ENC_ERR_INVALID_EVENT);
+      CASE (NV_ENC_ERR_INVALID_PARAM);
+      CASE (NV_ENC_ERR_INVALID_CALL);
+      CASE (NV_ENC_ERR_OUT_OF_MEMORY);
+      CASE (NV_ENC_ERR_ENCODER_NOT_INITIALIZED);
+      CASE (NV_ENC_ERR_UNSUPPORTED_PARAM);
+      CASE (NV_ENC_ERR_LOCK_BUSY);
+      CASE (NV_ENC_ERR_NOT_ENOUGH_BUFFER);
+      CASE (NV_ENC_ERR_INVALID_VERSION);
+      CASE (NV_ENC_ERR_MAP_FAILED);
+      CASE (NV_ENC_ERR_NEED_MORE_INPUT);
+      CASE (NV_ENC_ERR_ENCODER_BUSY);
+      CASE (NV_ENC_ERR_EVENT_NOT_REGISTERD);
+      CASE (NV_ENC_ERR_GENERIC);
+      CASE (NV_ENC_ERR_INCOMPATIBLE_CLIENT_KEY);
+      CASE (NV_ENC_ERR_UNIMPLEMENTED);
+      CASE (NV_ENC_ERR_RESOURCE_REGISTER_FAILED);
+      CASE (NV_ENC_ERR_RESOURCE_NOT_REGISTERED);
+      CASE (NV_ENC_ERR_RESOURCE_NOT_MAPPED);
+    default:
+      break;
+  }
+#undef CASE
+
+  return "Unknown";
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvencobject.h Added

@@ -0,0 +1,258 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/cuda/gstcuda.h>
+#ifdef G_OS_WIN32
+#include <gst/d3d11/gstd3d11.h>
+#endif
+#include "nvEncodeAPI.h"
+#include "gstnvenc.h"
+#include <memory>
+#include <mutex>
+#include <condition_variable>
+#include <queue>
+#include <set>
+#include <string>
+#include <atomic>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_NV_ENC_BUFFER (gst_nv_enc_buffer_get_type ())
+struct GstNvEncBuffer;
+
+GType gst_nv_enc_buffer_get_type (void);
+
+NVENCSTATUS   gst_nv_enc_buffer_lock (GstNvEncBuffer * buffer,
+                                      gpointer * data,
+                                      guint32 * pitch);
+
+void          gst_nv_enc_buffer_unlock (GstNvEncBuffer * buffer);
+
+
+static inline GstNvEncBuffer *
+gst_nv_enc_buffer_ref (GstNvEncBuffer * buffer)
+{
+  return (GstNvEncBuffer *)
+      gst_mini_object_ref (GST_MINI_OBJECT_CAST (buffer));
+}
+
+static inline void
+gst_nv_enc_buffer_unref (GstNvEncBuffer * buffer)
+{
+  gst_mini_object_unref (GST_MINI_OBJECT_CAST (buffer));
+}
+
+static inline void
+gst_clear_nv_encoder_buffer (GstNvEncBuffer ** buffer)
+{
+  if (buffer && *buffer) {
+    gst_nv_enc_buffer_unref (*buffer);
+    *buffer = NULL;
+  }
+}
+
+#define GST_TYPE_NV_ENC_RESOURCE (gst_nv_enc_resource_get_type ())
+struct GstNvEncResource;
+
+GType gst_nv_enc_resource_get_type (void);
+
+static inline GstNvEncResource *
+gst_nv_enc_resource_ref (GstNvEncResource * resource)
+{
+  return (GstNvEncResource *)
+      gst_mini_object_ref (GST_MINI_OBJECT_CAST (resource));
+}
+
+static inline void
+gst_nv_enc_resource_unref (GstNvEncResource * resource)
+{
+  gst_mini_object_unref (GST_MINI_OBJECT_CAST (resource));
+}
+
+static inline void
+gst_clear_nv_encoder_resource (GstNvEncResource ** resource)
+{
+  if (resource && *resource) {
+    gst_nv_enc_resource_unref (*resource);
+    *resource = NULL;
+  }
+}
+
+#define GST_TYPE_NV_ENC_TASK (gst_nv_enc_task_get_type ())
+struct GstNvEncTask;
+
+GType gst_nv_enc_task_get_type (void);
+
+gboolean    gst_nv_enc_task_set_buffer (GstNvEncTask * task,
+                                        GstNvEncBuffer * buffer);
+
+gboolean    gst_nv_enc_task_set_resource (GstNvEncTask * task,
+                                          GstBuffer * buffer,
+                                          GstNvEncResource * resource);
+
+GArray *    gst_nv_enc_task_get_sei_payload (GstNvEncTask * task);
+
+NVENCSTATUS gst_nv_enc_task_lock_bitstream (GstNvEncTask * task,
+                                            NV_ENC_LOCK_BITSTREAM * bitstream);
+
+void gst_nv_enc_task_unlock_bitstream (GstNvEncTask * task);
+
+static inline GstNvEncTask *
+gst_nv_enc_task_ref (GstNvEncTask * task)
+{
+  return (GstNvEncTask *)
+      gst_mini_object_ref (GST_MINI_OBJECT_CAST (task));
+}
+
+static inline void
+gst_nv_enc_task_unref (GstNvEncTask * task)
+{
+  gst_mini_object_unref (GST_MINI_OBJECT_CAST (task));
+}
+
+const gchar * nvenc_status_to_string (NVENCSTATUS status);
+
+G_END_DECLS
+
+enum GstNvEncCodec
+{
+  GST_NV_ENC_CODEC_H264,
+  GST_NV_ENC_CODEC_H265,
+};
+
+class GstNvEncObject : public std::enable_shared_from_this <GstNvEncObject>
+{
+public:
+  static bool IsSuccess (NVENCSTATUS status,
+                         GstNvEncObject * self,
+                         const gchar * file,
+                         const gchar * function,
+                         gint line);
+
+  static std::shared_ptr<GstNvEncObject>
+  CreateInstance (GstElement * client,
+                  GstObject * device,
+                  NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS * params);
+
+  ~GstNvEncObject ();
+
+  gpointer      GetHandle ();
+
+  guint         GetTaskSize ();
+
+  NVENCSTATUS   InitSession (NV_ENC_INITIALIZE_PARAMS * params,
+                             GstCudaStream * stream,
+                             const GstVideoInfo * info,
+                             guint pool_size);
+
+  NVENCSTATUS   Reconfigure (NV_ENC_RECONFIGURE_PARAMS * params);
+
+  void          SetFlushing (bool flushing);
+
+  NVENCSTATUS   Encode      (GstVideoCodecFrame * codec_frame,
+                             NV_ENC_PIC_STRUCT pic_struct,
+                             GstNvEncTask * task);
+
+  NVENCSTATUS   Drain       (GstNvEncTask * task);
+
+  GstFlowReturn GetOutput   (GstNvEncTask ** task);
+
+  NVENCSTATUS   LockBitstream (NV_ENC_LOCK_BITSTREAM * bitstream);
+
+  NVENCSTATUS   UnlockBitstream (NV_ENC_OUTPUT_PTR output_ptr);
+
+  NVENCSTATUS   AcquireBuffer (GstNvEncBuffer ** buffer);
+
+  NVENCSTATUS   AcquireResource (GstMemory * mem,
+                                 GstNvEncResource ** resource);
+
+  GstFlowReturn AcquireTask (GstNvEncTask ** task,
+                             bool force);
+
+  void PushEmptyTask (GstNvEncTask * task);
+
+  void PushEmptyBuffer (GstNvEncBuffer * buffer);
+
+  void ReleaseResource (GstNvEncResource * resource);
+
+  void DeactivateResource (GstNvEncResource * resource);
+
+  bool DeviceLock ();
+
+  bool DeviceUnlock ();
+
+private:
+  void releaseResourceUnlocked (GstNvEncResource * resource);
+
+  void releaseTaskUnlocked (GstNvEncTask * task);
+
+  NVENCSTATUS acquireResourceCuda (GstMemory * mem,
+                                   GstNvEncResource ** resource);
+
+#ifdef G_OS_WIN32
+  NVENCSTATUS acquireResourceD3D11 (GstMemory * mem,
+                                    GstNvEncResource ** resource);
+#endif
+
+  void runResourceGC ();
+
+private:
+  std::string id_;
+  std::mutex lock_;
+  std::recursive_mutex resource_lock_;
+  std::condition_variable cond_;
+  /* holding unused GstNvEncBuffer object, holding ownership */
+  std::queue <GstNvEncBuffer *> buffer_queue_;
+
+  /* GstNvEncResource resource is always owned by GstMemory.
+   * below two data struct will track the resource's life cycle  */
+
+  /* list of all registered GstNvEncResource, without ownership */
+  std::set <GstNvEncResource *> resource_queue_;
+
+  /* list of GstNvEncResource in task_queue */
+  std::set <GstNvEncResource *> active_resource_queue_;
+  std::queue <GstNvEncTask *> task_queue_;
+  std::queue <GstNvEncTask *> pending_task_queue_;
+  std::queue <GstNvEncTask *> empty_task_queue_;
+  gint64 user_token_;
+  GstCudaContext *context_ = nullptr;
+  GstCudaStream *stream_ = nullptr;
+#ifdef G_OS_WIN32
+  GstD3D11Device *device_ = nullptr;
+#endif
+  GstVideoInfo info_;
+  gpointer session_ = nullptr;
+  bool initialized_ = false;
+  bool flushing_ = false;
+  guint task_size_ = 0;
+  guint lookahead_ = 0;
+
+  NV_ENC_DEVICE_TYPE device_type_ = NV_ENC_DEVICE_TYPE_CUDA;
+  NV_ENC_BUFFER_FORMAT buffer_format_ = NV_ENC_BUFFER_FORMAT_UNDEFINED;
+  GstNvEncCodec codec_;
+
+  std::atomic<guint> buffer_seq_;
+  std::atomic<guint> resource_seq_;
+  std::atomic<guint> task_seq_;
+};

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvencoder.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvencoder.cpp Changed

@@ -26,11 +26,16 @@
 #include <gst/cuda/gstcudautils.h>
 #include <gst/cuda/gstcudamemory.h>
 #include <gst/cuda/gstcudabufferpool.h>
+#include <gst/cuda/gstcudastream.h>
+#include <gst/cuda/gstcuda-private.h>
+#include <gst/base/gstbytewriter.h>
 #include <string.h>
-
-#ifdef GST_CUDA_HAS_D3D
-#include <gst/d3d11/gstd3d11.h>
-#endif
+#include <mutex>
+#include <condition_variable>
+#include <thread>
+#include <memory>
+#include <atomic>
+#include "gstnvencobject.h"
 
 #ifdef G_OS_WIN32
 #include <wrl.h>
@@ -40,62 +45,75 @@
 /* *INDENT-ON* */
 #endif
 
-GST_DEBUG_CATEGORY_STATIC (gst_nv_encoder_debug);
+#ifdef HAVE_CUDA_GST_GL
+#define SUPPORTED_GL_APIS GST_GL_API_OPENGL3
+#endif
+
+GST_DEBUG_CATEGORY (gst_nv_encoder_debug);
 #define GST_CAT_DEFAULT gst_nv_encoder_debug
 
-#define GET_LOCK(e) (&(GST_NV_ENCODER_CAST(e)->priv->lock))
-#define GST_NV_ENCODER_LOCK(e) G_STMT_START { \
-  GST_TRACE_OBJECT (e, "Locking from thread %p", g_thread_self ()); \
-  g_mutex_lock(GET_LOCK(e)); \
-  GST_TRACE_OBJECT (e, "Locked from thread %p", g_thread_self ()); \
-} G_STMT_END
+#define GST_NVENC_STATUS_FORMAT "s (%d)"
+#define GST_NVENC_STATUS_ARGS(s) nvenc_status_to_string (s), s
 
-#define GST_NV_ENCODER_UNLOCK(e) G_STMT_START { \
-  GST_TRACE_OBJECT (e, "Unlocking from thread %p", g_thread_self ()); \
-  g_mutex_unlock(GET_LOCK(e)); \
-} G_STMT_END
+enum
+{
+  PROP_0,
+  PROP_CC_INSERT,
+};
+
+#define DEFAULT_CC_INSERT GST_NV_ENCODER_SEI_INSERT
 
 struct _GstNvEncoderPrivate
 {
-  GstCudaContext *context;
-  CUstream cuda_stream;
+  _GstNvEncoderPrivate ()
+  {
+    memset (&init_params, 0, sizeof (NV_ENC_INITIALIZE_PARAMS));
+    memset (&config, 0, sizeof (NV_ENC_CONFIG));
+  }
 
-#ifdef GST_CUDA_HAS_D3D
-  GstD3D11Device *device;
-  GstD3D11Fence *fence;
+  GstCudaContext *context = nullptr;
+  GstCudaStream *stream = nullptr;
+
+#ifdef G_OS_WIN32
+  GstD3D11Device *device = nullptr;
+  GstD3D11Fence *fence = nullptr;
+#endif
+
+#ifdef HAVE_CUDA_GST_GL
+  GstGLDisplay *gl_display = nullptr;
+  GstGLContext *gl_context = nullptr;
+  GstGLContext *other_gl_context = nullptr;
+
+  gboolean gl_interop = FALSE;
 #endif
 
+  std::shared_ptr < GstNvEncObject > object;
+
   GstNvEncoderDeviceMode subclass_device_mode;
   GstNvEncoderDeviceMode selected_device_mode;
-  gint64 dxgi_adapter_luid;
-  guint cuda_device_id;
+  gint64 dxgi_adapter_luid = 0;
+  guint cuda_device_id = 0;
 
   NV_ENC_INITIALIZE_PARAMS init_params;
   NV_ENC_CONFIG config;
-  gpointer session;
-  guint lookahead;
-
-  GstVideoCodecState *input_state;
 
-  GstBufferPool *internal_pool;
+  GstVideoCodecState *input_state = nullptr;
 
-  GstClockTime dts_offset;
+  GstBufferPool *internal_pool = nullptr;
 
-  /* Array of GstNvEncoderTask, holding ownership */
-  GArray *task_pool;
+  GstClockTime dts_offset = 0;
 
-  GQueue free_tasks;
-  GQueue pending_tasks;
-  GQueue output_tasks;
+  std::mutex lock;
+  std::condition_variable cond;
 
-  GMutex lock;
-  GCond cond;
+  std::recursive_mutex context_lock;
 
-  GRecMutex context_lock;
+  std::unique_ptr < std::thread > encoding_thread;
 
-  GThread *encoding_thread;
+  std::atomic < GstFlowReturn > last_flow;
 
-  GstFlowReturn last_flow;
+  /* properties */
+  GstNvEncoderSeiInsertMode cc_insert = DEFAULT_CC_INSERT;
 };
 
 /**
@@ -104,15 +122,20 @@
  * Since: 1.22
  */
 #define gst_nv_encoder_parent_class parent_class
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GstNvEncoder, gst_nv_encoder,
-    GST_TYPE_VIDEO_ENCODER);
+G_DEFINE_ABSTRACT_TYPE (GstNvEncoder, gst_nv_encoder, GST_TYPE_VIDEO_ENCODER);
 
 static void gst_nv_encoder_finalize (GObject * object);
+static void gst_nv_encoder_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_nv_encoder_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
 static void gst_nv_encoder_set_context (GstElement * element,
     GstContext * context);
 static gboolean gst_nv_encoder_open (GstVideoEncoder * encoder);
 static gboolean gst_nv_encoder_close (GstVideoEncoder * encoder);
 static gboolean gst_nv_encoder_stop (GstVideoEncoder * encoder);
+static gboolean gst_nv_encoder_sink_event (GstVideoEncoder * encoder,
+    GstEvent * event);
 static gboolean gst_nv_encoder_sink_query (GstVideoEncoder * encoder,
     GstQuery * query);
 static gboolean gst_nv_encoder_src_query (GstVideoEncoder * encoder,
@@ -125,7 +148,8 @@
     encoder, GstVideoCodecFrame * frame);
 static GstFlowReturn gst_nv_encoder_finish (GstVideoEncoder * encoder);
 static gboolean gst_nv_encoder_flush (GstVideoEncoder * encoder);
-static void gst_nv_encoder_task_clear (GstNvEncoderTask * task);
+static gboolean gst_nv_encoder_transform_meta (GstVideoEncoder * encoder,
+    GstVideoCodecFrame * frame, GstMeta * meta);
 
 static void
 gst_nv_encoder_class_init (GstNvEncoderClass * klass)
@@ -135,12 +159,28 @@
   GstVideoEncoderClass *videoenc_class = GST_VIDEO_ENCODER_CLASS (klass);
 
   object_class->finalize = gst_nv_encoder_finalize;
+  object_class->set_property = gst_nv_encoder_set_property;
+  object_class->get_property = gst_nv_encoder_get_property;
+
+  /**
+   * GstNvEncoder:cc-insert:
+   *
+   * Closed Caption insert mode
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_CC_INSERT,
+      g_param_spec_enum ("cc-insert", "Closed Caption Insert",
+          "Closed Caption Insert mode",
+          GST_TYPE_NV_ENCODER_SEI_INSERT_MODE, DEFAULT_CC_INSERT,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
   element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_encoder_set_context);
 
   videoenc_class->open = GST_DEBUG_FUNCPTR (gst_nv_encoder_open);
   videoenc_class->close = GST_DEBUG_FUNCPTR (gst_nv_encoder_close);
   videoenc_class->stop = GST_DEBUG_FUNCPTR (gst_nv_encoder_stop);
+  videoenc_class->sink_event = GST_DEBUG_FUNCPTR (gst_nv_encoder_sink_event);
   videoenc_class->sink_query = GST_DEBUG_FUNCPTR (gst_nv_encoder_sink_query);
   videoenc_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_encoder_src_query);
   videoenc_class->propose_allocation =
@@ -150,6 +190,8 @@
       GST_DEBUG_FUNCPTR (gst_nv_encoder_handle_frame);
   videoenc_class->finish = GST_DEBUG_FUNCPTR (gst_nv_encoder_finish);
   videoenc_class->flush = GST_DEBUG_FUNCPTR (gst_nv_encoder_flush);
+  videoenc_class->transform_meta =
+      GST_DEBUG_FUNCPTR (gst_nv_encoder_transform_meta);
 
   GST_DEBUG_CATEGORY_INIT (gst_nv_encoder_debug, "nvencoder", 0, "nvencoder");
 
@@ -158,28 +200,17 @@
       (GstPluginAPIFlags) 0);
   gst_type_mark_as_plugin_api (GST_TYPE_NV_ENCODER_RC_MODE,
       (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_NV_ENCODER_SEI_INSERT_MODE,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_NV_ENCODER_MULTI_PASS,
+      (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_NV_ENCODER_TUNE, (GstPluginAPIFlags) 0);
 }
 
 static void
 gst_nv_encoder_init (GstNvEncoder * self)
 {
-  GstNvEncoderPrivate *priv;
-
-  self->priv = priv = (GstNvEncoderPrivate *)
-      gst_nv_encoder_get_instance_private (self);
-
-  priv->task_pool = g_array_new (FALSE, TRUE, sizeof (GstNvEncoderTask));
-  g_array_set_clear_func (priv->task_pool,
-      (GDestroyNotify) gst_nv_encoder_task_clear);
-
-  g_queue_init (&priv->free_tasks);
-  g_queue_init (&priv->pending_tasks);
-  g_queue_init (&priv->output_tasks);
-
-  g_mutex_init (&priv->lock);
-  g_cond_init (&priv->cond);
-
-  g_rec_mutex_init (&priv->context_lock);
+  self->priv = new GstNvEncoderPrivate ();
 
   gst_video_encoder_set_min_pts (GST_VIDEO_ENCODER (self),
       GST_SECOND * 60 * 60 * 1000);
@@ -190,16 +221,44 @@
 gst_nv_encoder_finalize (GObject * object)
 {
   GstNvEncoder *self = GST_NV_ENCODER (object);
-  GstNvEncoderPrivate *priv = self->priv;
 
-  g_array_unref (priv->task_pool);
+  delete self->priv;
 
-  g_mutex_clear (&priv->lock);
-  g_cond_clear (&priv->cond);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
 
-  g_rec_mutex_clear (&priv->context_lock);
+static void
+gst_nv_encoder_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstNvEncoder *self = GST_NV_ENCODER (object);
+  GstNvEncoderPrivate *priv = self->priv;
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  switch (prop_id) {
+    case PROP_CC_INSERT:
+      priv->cc_insert = (GstNvEncoderSeiInsertMode) g_value_get_enum (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_encoder_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstNvEncoder *self = GST_NV_ENCODER (object);
+  GstNvEncoderPrivate *priv = self->priv;
+
+  switch (prop_id) {
+    case PROP_CC_INSERT:
+      g_value_set_enum (value, priv->cc_insert);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
 }
 
 static void
@@ -208,10 +267,10 @@
   GstNvEncoder *self = GST_NV_ENCODER (element);
   GstNvEncoderPrivate *priv = self->priv;
 
-  g_rec_mutex_lock (&priv->context_lock);
+  std::unique_lock < std::recursive_mutex > lk (priv->context_lock);
 
   switch (priv->selected_device_mode) {
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     case GST_NV_ENCODER_DEVICE_D3D11:
       gst_d3d11_handle_set_context_for_adapter_luid (element,
           context, priv->dxgi_adapter_luid, &priv->device);
@@ -220,12 +279,19 @@
     case GST_NV_ENCODER_DEVICE_CUDA:
       gst_cuda_handle_set_context (element, context, priv->cuda_device_id,
           &priv->context);
+#ifdef HAVE_CUDA_GST_GL
+      if (gst_gl_handle_set_context (element, context, &priv->gl_display,
+              &priv->other_gl_context)) {
+        if (priv->gl_display)
+          gst_gl_display_filter_gl_api (priv->gl_display, SUPPORTED_GL_APIS);
+      }
+#endif
       break;
     default:
       break;
   }
 
-  g_rec_mutex_unlock (&priv->context_lock);
+  lk.unlock ();
 
   GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
 }
@@ -237,29 +303,17 @@
 
   GST_LOG_OBJECT (self, "Reset");
 
-  g_array_set_size (priv->task_pool, 0);
-
   if (priv->internal_pool) {
     gst_buffer_pool_set_active (priv->internal_pool, FALSE);
     gst_clear_object (&priv->internal_pool);
   }
 
-  if (priv->session) {
-    NvEncDestroyEncoder (priv->session);
-    priv->session = NULL;
+  if (priv->encoding_thread) {
+    priv->encoding_thread->join ();
+    priv->encoding_thread = nullptr;
   }
 
-  if (priv->context && priv->cuda_stream) {
-    gst_cuda_context_push (priv->context);
-    CuStreamDestroy (priv->cuda_stream);
-    gst_cuda_context_pop (nullptr);
-    priv->cuda_stream = nullptr;
-  }
-
-  g_queue_clear (&priv->free_tasks);
-  g_queue_clear (&priv->pending_tasks);
-  g_queue_clear (&priv->output_tasks);
-
+  priv->object = nullptr;
   priv->last_flow = GST_FLOW_OK;
 
   return TRUE;
@@ -272,7 +326,7 @@
   gboolean ret = TRUE;
 
   switch (priv->selected_device_mode) {
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     case GST_NV_ENCODER_DEVICE_D3D11:
       gst_d3d11_device_lock (priv->device);
       break;
@@ -294,7 +348,7 @@
   gboolean ret = TRUE;
 
   switch (priv->selected_device_mode) {
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     case GST_NV_ENCODER_DEVICE_D3D11:
       gst_d3d11_device_unlock (priv->device);
       break;
@@ -309,54 +363,14 @@
   return ret;
 }
 
-static GstFlowReturn
-gst_nv_encoder_get_free_task (GstNvEncoder * self, GstNvEncoderTask ** task,
-    gboolean check_last_flow)
-{
-  GstNvEncoderPrivate *priv = self->priv;
-  GstFlowReturn ret = GST_FLOW_OK;
-  GstNvEncoderTask *free_task = NULL;
-
-  GST_NV_ENCODER_LOCK (self);
-  if (check_last_flow) {
-    if (priv->last_flow != GST_FLOW_OK) {
-      ret = priv->last_flow;
-      GST_NV_ENCODER_UNLOCK (self);
-      return ret;
-    }
-
-    while (priv->last_flow == GST_FLOW_OK && (free_task = (GstNvEncoderTask *)
-            g_queue_pop_head (&priv->free_tasks)) == NULL) {
-      g_cond_wait (&priv->cond, &priv->lock);
-    }
-
-    ret = priv->last_flow;
-    if (ret != GST_FLOW_OK && free_task) {
-      g_queue_push_tail (&priv->free_tasks, free_task);
-      free_task = NULL;
-    }
-  } else {
-    while ((free_task = (GstNvEncoderTask *)
-            g_queue_pop_head (&priv->free_tasks)) == NULL)
-      g_cond_wait (&priv->cond, &priv->lock);
-  }
-  GST_NV_ENCODER_UNLOCK (self);
-
-  *task = free_task;
-
-  return ret;
-}
-
 static gboolean
 gst_nv_encoder_drain (GstNvEncoder * self, gboolean locked)
 {
   GstNvEncoderPrivate *priv = self->priv;
-  NV_ENC_PIC_PARAMS pic_params = { 0, };
   NVENCSTATUS status;
-  GstNvEncoderTask *task;
-  GstNvEncoderTask *pending_task;
+  GstNvEncTask *task = nullptr;
 
-  if (!priv->session || !priv->encoding_thread)
+  if (!priv->object || !priv->encoding_thread)
     return TRUE;
 
   GST_DEBUG_OBJECT (self, "Drain");
@@ -364,39 +378,14 @@
   if (locked)
     GST_VIDEO_ENCODER_STREAM_UNLOCK (self);
 
-  gst_nv_encoder_get_free_task (self, &task, FALSE);
+  priv->object->AcquireTask (&task, true);
 
-  task->is_eos = TRUE;
+  status = priv->object->Drain (task);
+  gst_nv_enc_result (status, self);
 
-  pic_params.version = gst_nvenc_get_pic_params_version ();
-  pic_params.encodePicFlags = NV_ENC_PIC_FLAG_EOS;
-  pic_params.completionEvent = task->event_handle;
+  priv->encoding_thread->join ();
+  priv->encoding_thread = nullptr;
 
-  gst_nv_encoder_device_lock (self);
-  status = NvEncEncodePicture (priv->session, &pic_params);
-  if (status != NV_ENC_SUCCESS) {
-    GST_DEBUG_OBJECT (self, "Drain returned status %" GST_NVENC_STATUS_FORMAT,
-        GST_NVENC_STATUS_ARGS (status));
-#ifdef G_OS_WIN32
-    if (task->event_handle) {
-      SetEvent (task->event_handle);
-    }
-#endif
-  }
-  gst_nv_encoder_device_unlock (self);
-
-  GST_NV_ENCODER_LOCK (self);
-  while ((pending_task =
-          (GstNvEncoderTask *) g_queue_pop_head (&priv->pending_tasks)) !=
-      nullptr) {
-    g_queue_push_tail (&priv->output_tasks, pending_task);
-  }
-
-  g_queue_push_tail (&priv->output_tasks, task);
-  g_cond_broadcast (&priv->cond);
-  GST_NV_ENCODER_UNLOCK (self);
-
-  g_clear_pointer (&priv->encoding_thread, g_thread_join);
   gst_nv_encoder_reset (self);
 
   if (locked)
@@ -405,7 +394,7 @@
   return TRUE;
 }
 
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
 static gboolean
 gst_nv_encoder_open_d3d11_device (GstNvEncoder * self)
 {
@@ -445,7 +434,7 @@
     case GST_NV_ENCODER_DEVICE_AUTO_SELECT:
       /* Will open GPU later */
       return TRUE;
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     case GST_NV_ENCODER_DEVICE_D3D11:
       return gst_nv_encoder_open_d3d11_device (self);
 #endif
@@ -455,6 +444,8 @@
         GST_ERROR_OBJECT (self, "failed to create CUDA context");
         return FALSE;
       }
+      if (!priv->stream && gst_nvenc_have_set_io_cuda_streams ())
+        priv->stream = gst_cuda_stream_new (priv->context);
       break;
     default:
       g_assert_not_reached ();
@@ -470,11 +461,17 @@
   GstNvEncoder *self = GST_NV_ENCODER (encoder);
   GstNvEncoderPrivate *priv = self->priv;
 
+  gst_clear_cuda_stream (&priv->stream);
   gst_clear_object (&priv->context);
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   gst_clear_d3d11_fence (&priv->fence);
   gst_clear_object (&priv->device);
 #endif
+#ifdef HAVE_CUDA_GST_GL
+  gst_clear_object (&priv->gl_display);
+  gst_clear_object (&priv->gl_context);
+  gst_clear_object (&priv->other_gl_context);
+#endif
 
   return TRUE;
 }
@@ -490,8 +487,9 @@
   gst_nv_encoder_drain (self, FALSE);
 
   if (priv->subclass_device_mode == GST_NV_ENCODER_DEVICE_AUTO_SELECT) {
+    gst_clear_cuda_stream (&priv->stream);
     gst_clear_object (&priv->context);
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     gst_clear_object (&priv->device);
 #endif
     priv->selected_device_mode = GST_NV_ENCODER_DEVICE_AUTO_SELECT;
@@ -503,21 +501,115 @@
 }
 
 static gboolean
+gst_nv_encoder_sink_event (GstVideoEncoder * encoder, GstEvent * event)
+{
+  GstNvEncoder *self = GST_NV_ENCODER (encoder);
+  GstNvEncoderPrivate *priv = self->priv;
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_FLUSH_START:
+      if (priv->object)
+        priv->object->SetFlushing (TRUE);
+      break;
+    default:
+      break;
+  }
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->sink_event (encoder, event);
+}
+
+#ifdef HAVE_CUDA_GST_GL
+static void
+gst_nv_encoder_check_cuda_device_from_gl_context (GstGLContext * context,
+    gboolean * ret)
+{
+  guint device_count = 0;
+  CUdevice device_list1 = { 0, };
+  CUresult cuda_ret;
+
+  *ret = FALSE;
+
+  cuda_ret = CuGLGetDevices (&device_count,
+      device_list, 1, CU_GL_DEVICE_LIST_ALL);
+
+  if (!gst_cuda_result (cuda_ret) || device_count == 0)
+    return;
+
+  *ret = TRUE;
+}
+
+static gboolean
+gst_nv_encoder_ensure_gl_context (GstNvEncoder * self)
+{
+  GstNvEncoderPrivate *priv = self->priv;
+  gboolean ret = FALSE;
+
+  std::unique_lock < std::recursive_mutex > lk (priv->context_lock);
+
+  if (!gst_gl_ensure_element_data (GST_ELEMENT (self), &priv->gl_display,
+          &priv->other_gl_context)) {
+    GST_DEBUG_OBJECT (self, "Couldn't get GL display");
+    return FALSE;
+  }
+
+  gst_gl_display_filter_gl_api (priv->gl_display, SUPPORTED_GL_APIS);
+
+  if (!gst_gl_display_ensure_context (priv->gl_display, priv->other_gl_context,
+          &priv->gl_context, nullptr)) {
+    GST_DEBUG_OBJECT (self, "Couldn't get GL context");
+    return FALSE;
+  }
+
+  gst_gl_context_thread_add (priv->gl_context,
+      (GstGLContextThreadFunc) gst_nv_encoder_check_cuda_device_from_gl_context,
+      &ret);
+
+  return ret;
+}
+#endif
+
+static gboolean
 gst_nv_encoder_handle_context_query (GstNvEncoder * self, GstQuery * query)
 {
   GstNvEncoderPrivate *priv = self->priv;
   gboolean ret = FALSE;
 
-  g_rec_mutex_lock (&priv->context_lock);
+  std::unique_lock < std::recursive_mutex > lk (priv->context_lock);
 
   switch (priv->selected_device_mode) {
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     case GST_NV_ENCODER_DEVICE_D3D11:
       ret = gst_d3d11_handle_context_query (GST_ELEMENT (self),
           query, priv->device);
       break;
 #endif
     case GST_NV_ENCODER_DEVICE_CUDA:
+#ifdef HAVE_CUDA_GST_GL
+    {
+      GstGLDisplay *display = nullptr;
+      GstGLContext *other = nullptr;
+      GstGLContext *local = nullptr;
+
+      if (priv->gl_display)
+        display = (GstGLDisplay *) gst_object_ref (priv->gl_display);
+      if (priv->gl_context)
+        local = (GstGLContext *) gst_object_ref (priv->gl_context);
+      if (priv->other_gl_context)
+        other = (GstGLContext *) gst_object_ref (priv->other_gl_context);
+
+      lk.unlock ();
+      ret = gst_gl_handle_context_query (GST_ELEMENT (self), query,
+          display, local, other);
+      lk.lock ();
+
+      gst_clear_object (&display);
+      gst_clear_object (&other);
+      gst_clear_object (&local);
+
+      if (ret)
+        return ret;
+    }
+#endif
       ret = gst_cuda_handle_context_query (GST_ELEMENT (self),
           query, priv->context);
       break;
@@ -525,8 +617,6 @@
       break;
   }
 
-  g_rec_mutex_unlock (&priv->context_lock);
-
   return ret;
 }
 
@@ -564,6 +654,17 @@
   return GST_VIDEO_ENCODER_CLASS (parent_class)->src_query (encoder, query);
 }
 
+static guint
+gst_nv_encoder_get_task_size (GstNvEncoder * self)
+{
+  std::shared_ptr < GstNvEncObject > object = self->priv->object;
+
+  if (!object)
+    return 0;
+
+  return object->GetTaskSize ();
+}
+
 static gboolean
 gst_nv_encoder_propose_allocation (GstVideoEncoder * encoder, GstQuery * query)
 {
@@ -576,6 +677,7 @@
   GstStructure *config;
   GstCapsFeatures *features;
   guint min_buffers;
+  gboolean use_cuda_pool = FALSE;
 
   gst_query_parse_allocation (query, &caps, NULL);
   if (!caps) {
@@ -603,7 +705,7 @@
       gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, nullptr);
       gst_query_add_allocation_pool (query, nullptr, info.size, min_buffers, 0);
       return TRUE;
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     case GST_NV_ENCODER_DEVICE_D3D11:
       if (features && gst_caps_features_contains (features,
               GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY)) {
@@ -613,10 +715,30 @@
       break;
 #endif
     case GST_NV_ENCODER_DEVICE_CUDA:
+#ifdef HAVE_CUDA_GST_GL
+      if (features && gst_caps_features_contains (features,
+              GST_CAPS_FEATURE_MEMORY_GL_MEMORY)) {
+        GST_DEBUG_OBJECT (self, "upstream support GL memory");
+        if (!gst_nv_encoder_ensure_gl_context (self)) {
+          GST_WARNING_OBJECT (self, "Couldn't get GL context");
+          priv->gl_interop = FALSE;
+          gst_query_add_allocation_meta (query,
+              GST_VIDEO_META_API_TYPE, nullptr);
+          gst_query_add_allocation_pool (query,
+              nullptr, info.size, min_buffers, 0);
+          return TRUE;
+        }
+
+        pool = gst_gl_buffer_pool_new (priv->gl_context);
+        break;
+      }
+#endif
+
       if (features && gst_caps_features_contains (features,
               GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY)) {
         GST_DEBUG_OBJECT (self, "upstream support CUDA memory");
         pool = gst_cuda_buffer_pool_new (priv->context);
+        use_cuda_pool = TRUE;
       }
       break;
     default:
@@ -630,9 +752,12 @@
   config = gst_buffer_pool_get_config (pool);
   gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
 
-
   size = GST_VIDEO_INFO_SIZE (&info);
   gst_buffer_pool_config_set_params (config, caps, size, min_buffers, 0);
+  if (use_cuda_pool && priv->stream) {
+    /* Set our stream on buffer pool config so that CUstream can be shared */
+    gst_buffer_pool_config_set_cuda_stream (config, priv->stream);
+  }
 
   if (!gst_buffer_pool_set_config (pool, config)) {
     GST_WARNING_OBJECT (self, "Failed to set pool config");
@@ -651,140 +776,6 @@
   return TRUE;
 }
 
-/* called with lock */
-static void
-gst_nv_encoder_task_reset (GstNvEncoder * self, GstNvEncoderTask * task)
-{
-  GstNvEncoderPrivate *priv = self->priv;
-
-  if (!task)
-    return;
-
-  if (task->buffer) {
-    gst_nv_encoder_device_lock (self);
-    if (priv->session) {
-      NvEncUnmapInputResource (priv->session,
-          task->mapped_resource.mappedResource);
-      NvEncUnregisterResource (priv->session,
-          task->register_resource.registeredResource);
-    }
-    gst_nv_encoder_device_unlock (self);
-
-    gst_buffer_unmap (task->buffer, &task->map_info);
-    gst_clear_buffer (&task->buffer);
-  }
-#ifdef G_OS_WIN32
-  if (task->event_handle)
-    ResetEvent (task->event_handle);
-#endif
-
-  task->is_eos = FALSE;
-
-  g_queue_push_head (&priv->free_tasks, task);
-}
-
-static gboolean
-gst_nv_encoder_create_event_handle (GstNvEncoder * self, gpointer session,
-    gpointer * event_handle)
-{
-#ifdef G_OS_WIN32
-  NV_ENC_EVENT_PARAMS event_params = { 0, };
-  NVENCSTATUS status;
-
-  event_params.version = gst_nvenc_get_event_params_version ();
-  event_params.completionEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
-  status = NvEncRegisterAsyncEvent (session, &event_params);
-
-  if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self,
-        "Failed to register async event handle, status %"
-        GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
-    CloseHandle (event_params.completionEvent);
-    return FALSE;
-  }
-
-  *event_handle = event_params.completionEvent;
-#endif
-
-  return TRUE;
-}
-
-static gboolean
-gst_d3d11_encoder_wait_for_event_handle (GstNvEncoder * self,
-    gpointer event_handle)
-{
-#ifdef G_OS_WIN32
-  /* NVCODEC SDK uses 20s */
-  if (WaitForSingleObject (event_handle, 20000) == WAIT_FAILED) {
-    GST_ERROR_OBJECT (self, "Failed to wait for completion event");
-    return FALSE;
-  }
-#endif
-
-  return TRUE;
-}
-
-static void
-gst_nv_encoder_destroy_event_handle (GstNvEncoder * self, gpointer session,
-    gpointer event_handle)
-{
-#ifdef G_OS_WIN32
-  NV_ENC_EVENT_PARAMS event_params = { 0, };
-  NVENCSTATUS status;
-
-  event_params.version = gst_nvenc_get_event_params_version ();
-  event_params.completionEvent = event_handle;
-  status = NvEncUnregisterAsyncEvent (session, &event_params);
-  CloseHandle (event_handle);
-
-  if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self,
-        "Failed to unregister async event handle, status %"
-        GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
-  }
-#endif
-}
-
-static void
-gst_nv_encoder_task_clear (GstNvEncoderTask * task)
-{
-  GstNvEncoder *self;
-  GstNvEncoderPrivate *priv;
-
-  if (!task)
-    return;
-
-  self = task->encoder;
-  priv = self->priv;
-
-  if (priv->session) {
-    gst_nv_encoder_device_lock (self);
-    if (task->buffer) {
-      NvEncUnmapInputResource (priv->session,
-          task->mapped_resource.mappedResource);
-      NvEncUnregisterResource (priv->session,
-          task->register_resource.registeredResource);
-    }
-    if (task->output_ptr)
-      NvEncDestroyBitstreamBuffer (priv->session, task->output_ptr);
-    if (task->input_buffer.inputBuffer)
-      NvEncDestroyInputBuffer (priv->session, task->input_buffer.inputBuffer);
-    if (task->event_handle) {
-      gst_nv_encoder_destroy_event_handle (self, priv->session,
-          task->event_handle);
-    }
-
-    gst_nv_encoder_device_unlock (self);
-  }
-
-  if (task->buffer) {
-    gst_buffer_unmap (task->buffer, &task->map_info);
-    gst_clear_buffer (&task->buffer);
-  }
-
-  memset (task, 0, sizeof (GstNvEncoderTask));
-}
-
 static NV_ENC_PIC_STRUCT
 gst_nv_encoder_get_pic_struct (GstNvEncoder * self, GstBuffer * buffer)
 {
@@ -822,114 +813,8 @@
   return NV_ENC_PIC_STRUCT_FIELD_BOTTOM_TOP;
 }
 
-static GstFlowReturn
-gst_nv_encoder_encode_frame (GstNvEncoder * self,
-    GstVideoCodecFrame * frame, GstNvEncoderTask * task)
-{
-  GstNvEncoderPrivate *priv = self->priv;
-  NV_ENC_PIC_PARAMS pic_params = { 0, };
-  NVENCSTATUS status;
-  guint retry_count = 0;
-  const guint retry_threshold = 100;
-
-  pic_params.version = gst_nvenc_get_pic_params_version ();
-  if (task->buffer) {
-    pic_params.inputWidth = task->register_resource.width;
-    pic_params.inputHeight = task->register_resource.height;
-    pic_params.inputPitch = task->register_resource.pitch;
-    pic_params.inputBuffer = task->mapped_resource.mappedResource;
-    pic_params.bufferFmt = task->mapped_resource.mappedBufferFmt;
-  } else {
-    pic_params.inputWidth = task->input_buffer.width;
-    pic_params.inputHeight = task->input_buffer.height;
-    pic_params.inputPitch = task->lk_input_buffer.pitch;
-    pic_params.inputBuffer = task->input_buffer.inputBuffer;
-    pic_params.bufferFmt = task->input_buffer.bufferFmt;
-  }
-
-  pic_params.frameIdx = frame->system_frame_number;
-  pic_params.inputTimeStamp = frame->pts;
-  pic_params.inputDuration = frame->duration;
-  pic_params.outputBitstream = task->output_ptr;
-  pic_params.completionEvent = task->event_handle;
-  pic_params.pictureStruct = gst_nv_encoder_get_pic_struct (self, task->buffer);
-  if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame))
-    pic_params.encodePicFlags = NV_ENC_PIC_FLAG_FORCEIDR;
-
-  do {
-    gst_nv_encoder_device_lock (self);
-    status = NvEncEncodePicture (priv->session, &pic_params);
-    gst_nv_encoder_device_unlock (self);
-
-    if (status == NV_ENC_ERR_ENCODER_BUSY) {
-      if (retry_count < 100) {
-        GST_DEBUG_OBJECT (self, "GPU is busy, retry count (%d/%d)", retry_count,
-            retry_threshold);
-        retry_count++;
-
-        /* Magic number 1ms */
-        g_usleep (1000);
-        continue;
-      } else {
-        GST_ERROR_OBJECT (self, "GPU is keep busy, give up");
-        break;
-      }
-    }
-
-    break;
-  } while (TRUE);
-
-  GST_NV_ENCODER_LOCK (self);
-  if (status != NV_ENC_SUCCESS && status != NV_ENC_ERR_NEED_MORE_INPUT) {
-    GST_ERROR_OBJECT (self, "Encode return %" GST_NVENC_STATUS_FORMAT,
-        GST_NVENC_STATUS_ARGS (status));
-    gst_nv_encoder_task_reset (self, task);
-    GST_NV_ENCODER_UNLOCK (self);
-
-    return GST_FLOW_ERROR;
-  }
-
-  gst_video_codec_frame_set_user_data (frame, task, NULL);
-
-  /* On Windows and if async encoding is enabled, output thread will wait
-   * for completion event. But on Linux, async encoding is not supported.
-   * So, we should wait for NV_ENC_SUCCESS in case of sync mode
-   * (it would introduce latency though).
-   * Otherwise nvEncLockBitstream() will return error */
-  if (task->event_handle) {
-    /* Windows only path */
-    g_queue_push_tail (&priv->output_tasks, task);
-    g_cond_broadcast (&priv->cond);
-  } else {
-    g_queue_push_tail (&priv->pending_tasks, task);
-    if (status == NV_ENC_SUCCESS) {
-      bool notify = false;
-
-      /* XXX: nvEncLockBitstream() will return NV_ENC_ERR_INVALID_PARAM
-       * if lookahead is enabled. See also
-       * https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/494
-       */
-      while (g_queue_get_length (&priv->pending_tasks) > priv->lookahead) {
-        GstNvEncoderTask *pending_task =
-            (GstNvEncoderTask *) g_queue_pop_head (&priv->pending_tasks);
-
-        g_queue_push_tail (&priv->output_tasks, pending_task);
-        notify = true;
-      }
-
-      if (notify)
-        g_cond_broadcast (&priv->cond);
-    }
-  }
-
-  GST_NV_ENCODER_UNLOCK (self);
-
-  return GST_FLOW_OK;
-}
-
 static GstVideoCodecFrame *
-gst_nv_encoder_find_output_frame (GstVideoEncoder * self,
-    GstNvEncoderTask * task)
+gst_nv_encoder_find_output_frame (GstVideoEncoder * self, GstNvEncTask * task)
 {
   GList *frames, *iter;
   GstVideoCodecFrame *ret = NULL;
@@ -938,7 +823,7 @@
 
   for (iter = frames; iter; iter = g_list_next (iter)) {
     GstVideoCodecFrame *frame = (GstVideoCodecFrame *) iter->data;
-    GstNvEncoderTask *other = (GstNvEncoderTask *)
+    GstNvEncTask *other = (GstNvEncTask *)
         gst_video_codec_frame_get_user_data (frame);
 
     if (!other)
@@ -959,69 +844,54 @@
   return ret;
 }
 
-static gpointer
+static void
 gst_nv_encoder_thread_func (GstNvEncoder * self)
 {
   GstVideoEncoder *encoder = GST_VIDEO_ENCODER (self);
   GstNvEncoderClass *klass = GST_NV_ENCODER_GET_CLASS (self);
   GstNvEncoderPrivate *priv = self->priv;
-  GstNvEncoderTask *task = NULL;
+  std::shared_ptr < GstNvEncObject > object = priv->object;
+
+  GST_INFO_OBJECT (self, "Entering encoding loop");
 
   do {
-    NV_ENC_LOCK_BITSTREAM bitstream = { 0, };
-    NVENCSTATUS status;
-    GstVideoCodecFrame *frame;
     GstFlowReturn ret;
+    GstNvEncTask *task = nullptr;
+    GstVideoCodecFrame *frame;
+    NV_ENC_LOCK_BITSTREAM bitstream;
+    NVENCSTATUS status;
 
-    GST_NV_ENCODER_LOCK (self);
-    while ((task = (GstNvEncoderTask *)
-            g_queue_pop_head (&priv->output_tasks)) == NULL) {
-      g_cond_wait (&priv->cond, &priv->lock);
-    }
-    GST_NV_ENCODER_UNLOCK (self);
-
-    if (task->event_handle) {
-      if (!gst_d3d11_encoder_wait_for_event_handle (self, task->event_handle)) {
-        GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL),
-            ("Failed to wait for event signal"));
-        goto error;
-      }
-    }
-
-    if (task->is_eos) {
-      GST_INFO_OBJECT (self, "Got EOS packet");
-
-      GST_NV_ENCODER_LOCK (self);
-      gst_nv_encoder_task_reset (self, task);
-      g_cond_broadcast (&priv->cond);
-      GST_NV_ENCODER_UNLOCK (self);
-
-      goto exit_thread;
+    ret = object->GetOutput (&task);
+    if (ret == GST_FLOW_EOS) {
+      g_assert (!task);
+      GST_INFO_OBJECT (self, "Got EOS task");
+      break;
     }
 
     frame = gst_nv_encoder_find_output_frame (encoder, task);
     if (!frame) {
+      gst_nv_enc_task_unref (task);
       GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL),
           ("Failed to find associated codec frame"));
-      goto error;
-    }
-
-    if (!gst_nv_encoder_device_lock (self)) {
-      GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL),
-          ("Failed to lock device"));
-      goto error;
+      priv->last_flow = GST_FLOW_ERROR;
+      continue;
     }
 
-    bitstream.version = gst_nvenc_get_lock_bitstream_version ();
-    bitstream.outputBitstream = task->output_ptr;
-
-    status = NvEncLockBitstream (priv->session, &bitstream);
+    status = gst_nv_enc_task_lock_bitstream (task, &bitstream);
     if (status != NV_ENC_SUCCESS) {
-      gst_nv_encoder_device_unlock (self);
+      gst_nv_enc_task_unref (task);
+      gst_video_encoder_finish_frame (encoder, frame);
       GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL),
           ("Failed to lock bitstream, status: %" GST_NVENC_STATUS_FORMAT,
               GST_NVENC_STATUS_ARGS (status)));
-      goto error;
+      priv->last_flow = GST_FLOW_ERROR;
+      continue;
+    }
+
+    if (priv->last_flow != GST_FLOW_OK) {
+      gst_nv_enc_task_unlock_bitstream (task);
+      gst_nv_enc_task_unref (task);
+      continue;
     }
 
     if (klass->create_output_buffer) {
@@ -1037,48 +907,21 @@
     if (bitstream.pictureType == NV_ENC_PIC_TYPE_IDR)
       GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
 
-    NvEncUnlockBitstream (priv->session, task->output_ptr);
-    gst_nv_encoder_device_unlock (self);
-
     frame->dts = frame->pts - priv->dts_offset;
     frame->pts = bitstream.outputTimeStamp;
     frame->duration = bitstream.outputDuration;
 
-    ret = gst_video_encoder_finish_frame (encoder, frame);
-    if (ret != GST_FLOW_OK) {
-      GST_INFO_OBJECT (self,
-          "Finish frame returned %s", gst_flow_get_name (ret));
-    }
-
-    GST_NV_ENCODER_LOCK (self);
-    gst_nv_encoder_task_reset (self, task);
-    priv->last_flow = ret;
-    g_cond_broadcast (&priv->cond);
-    GST_NV_ENCODER_UNLOCK (self);
+    gst_nv_enc_task_unlock_bitstream (task);
+    gst_nv_enc_task_unref (task);
 
-    if (ret != GST_FLOW_OK) {
-      GST_INFO_OBJECT (self, "Push returned %s", gst_flow_get_name (ret));
-      goto exit_thread;
+    priv->last_flow = gst_video_encoder_finish_frame (encoder, frame);
+    if (priv->last_flow != GST_FLOW_OK) {
+      GST_INFO_OBJECT (self,
+          "Finish frame returned %s", gst_flow_get_name (priv->last_flow));
     }
-  } while (TRUE);
-
-exit_thread:
-  {
-    GST_INFO_OBJECT (self, "Exiting thread");
-
-    return NULL;
+  } while (true);
 
-  }
-error:
-  {
-    GST_NV_ENCODER_LOCK (self);
-    gst_nv_encoder_task_reset (self, task);
-    priv->last_flow = GST_FLOW_ERROR;
-    g_cond_broadcast (&priv->cond);
-    GST_NV_ENCODER_UNLOCK (self);
-
-    goto exit_thread;
-  }
+  GST_INFO_OBJECT (self, "Exiting thread");
 }
 
 static guint
@@ -1104,20 +947,21 @@
 }
 
 static gboolean
-gst_nv_encoder_open_encode_session (GstNvEncoder * self, gpointer * session)
+gst_nv_encoder_open_encode_session (GstNvEncoder * self)
 {
   GstNvEncoderPrivate *priv = self->priv;
   NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS session_params = { 0, };
   session_params.version =
       gst_nvenc_get_open_encode_session_ex_params_version ();
   session_params.apiVersion = gst_nvenc_get_api_version ();
-  NVENCSTATUS status;
+  GstObject *device = (GstObject *) priv->context;
 
   switch (priv->selected_device_mode) {
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     case GST_NV_ENCODER_DEVICE_D3D11:
       session_params.deviceType = NV_ENC_DEVICE_TYPE_DIRECTX;
       session_params.device = gst_d3d11_device_get_device_handle (priv->device);
+      device = (GstObject *) priv->device;
       break;
 #endif
     case GST_NV_ENCODER_DEVICE_CUDA:
@@ -1129,17 +973,18 @@
       return FALSE;
   }
 
-  status = NvEncOpenEncodeSessionEx (&session_params, session);
-  if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self, "Failed to open session, status: %"
-        GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
+  priv->object = GstNvEncObject::CreateInstance (GST_ELEMENT_CAST (self),
+      device, &session_params);
+
+  if (!priv->object) {
+    GST_ERROR_OBJECT (self, "Couldn't create encoder session");
     return FALSE;
   }
 
   return TRUE;
 }
 
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
 static GstBufferPool *
 gst_nv_encoder_create_d3d11_pool (GstNvEncoder * self,
     GstVideoCodecState * state)
@@ -1186,7 +1031,7 @@
 
   /* At this moment device type must be selected already */
   switch (priv->selected_device_mode) {
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     case GST_NV_ENCODER_DEVICE_D3D11:
       return gst_nv_encoder_create_d3d11_pool (self, state);
 #endif
@@ -1201,6 +1046,9 @@
   config = gst_buffer_pool_get_config (pool);
   gst_buffer_pool_config_set_params (config, state->caps,
       GST_VIDEO_INFO_SIZE (&state->info), 0, 0);
+  if (priv->selected_device_mode == GST_NV_ENCODER_DEVICE_CUDA && priv->stream)
+    gst_buffer_pool_config_set_cuda_stream (config, priv->stream);
+
   if (!gst_buffer_pool_set_config (pool, config)) {
     GST_ERROR_OBJECT (self, "Failed to set pool config");
     gst_object_unref (pool);
@@ -1228,7 +1076,6 @@
   guint task_pool_size;
   gint fps_n, fps_d;
   GstClockTime frame_duration, min_latency, max_latency;
-  guint i;
 
   gst_nv_encoder_reset (self);
 
@@ -1258,21 +1105,34 @@
     g_assert (data.device_mode == GST_NV_ENCODER_DEVICE_CUDA ||
         data.device_mode == GST_NV_ENCODER_DEVICE_D3D11);
 
-    g_rec_mutex_lock (&priv->context_lock);
+    std::lock_guard < std::recursive_mutex > clk (priv->context_lock);
     priv->selected_device_mode = data.device_mode;
     priv->cuda_device_id = data.cuda_device_id;
     priv->dxgi_adapter_luid = data.adapter_luid;
     gst_clear_object (&priv->context);
-    if (data.device_mode == GST_NV_ENCODER_DEVICE_CUDA)
+    if (data.device_mode == GST_NV_ENCODER_DEVICE_CUDA) {
+      GstMemory *mem = gst_buffer_peek_memory (in_buf, 0);
+
       priv->context = (GstCudaContext *) data.device;
-#ifdef GST_CUDA_HAS_D3D
+      gst_clear_cuda_stream (&priv->stream);
+
+      if (gst_nvenc_have_set_io_cuda_streams ()) {
+        if (gst_is_cuda_memory (mem)) {
+          /* Use upstream CUDA stream */
+          priv->stream =
+              gst_cuda_memory_get_stream (GST_CUDA_MEMORY_CAST (mem));
+          if (priv->stream)
+            gst_cuda_stream_ref (priv->stream);
+        }
+      }
+    }
+#ifdef G_OS_WIN32
     gst_clear_object (&priv->device);
     if (data.device_mode == GST_NV_ENCODER_DEVICE_D3D11)
       priv->device = (GstD3D11Device *) data.device;
 #endif
 
     ret = gst_nv_encoder_open (GST_VIDEO_ENCODER (self));
-    g_rec_mutex_unlock (&priv->context_lock);
 
     if (!ret) {
       GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL),
@@ -1294,88 +1154,43 @@
     return FALSE;
   }
 
-  if (!gst_nv_encoder_open_encode_session (self, &priv->session)) {
+  if (!gst_nv_encoder_open_encode_session (self)) {
     GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL),
         ("Failed to open session"));
     goto error;
   }
 
-  if (!klass->set_format (self, state, priv->session, &priv->init_params,
-          &priv->config)) {
+  if (!klass->set_format (self, state, priv->object->GetHandle (),
+          &priv->init_params, &priv->config)) {
     GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL), ("Failed to set format"));
     goto error;
   }
 
+  task_pool_size = gst_nv_encoder_calculate_task_pool_size (self,
+      &priv->config);
+
   priv->init_params.encodeConfig = &priv->config;
-  status = NvEncInitializeEncoder (priv->session, &priv->init_params);
-  if (status != NV_ENC_SUCCESS) {
+  status = priv->object->InitSession (&priv->init_params,
+      priv->stream, &priv->input_state->info, task_pool_size);
+  if (!gst_nv_enc_result (status, self)) {
     GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL),
         ("Failed to init encoder, status: %"
             GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status)));
     goto error;
   }
 
-  if (priv->selected_device_mode == GST_NV_ENCODER_DEVICE_CUDA &&
-      gst_nvenc_have_set_io_cuda_streams ()) {
-    CUresult cuda_ret = CuStreamCreate (&priv->cuda_stream, CU_STREAM_DEFAULT);
-
-    if (gst_cuda_result (cuda_ret)) {
-      status = NvEncSetIOCudaStreams (priv->session,
-          (NV_ENC_CUSTREAM_PTR) & priv->cuda_stream,
-          (NV_ENC_CUSTREAM_PTR) & priv->cuda_stream);
-      if (status != NV_ENC_SUCCESS) {
-        GST_WARNING_OBJECT (self, "NvEncSetIOCudaStreams failed, status: %"
-            GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
-      }
-    }
-  }
-
-  priv->lookahead = priv->config.rcParams.lookaheadDepth;
-  task_pool_size = gst_nv_encoder_calculate_task_pool_size (self,
-      &priv->config);
-  g_array_set_size (priv->task_pool, task_pool_size);
-
-  for (i = 0; i < task_pool_size; i++) {
-    NV_ENC_CREATE_BITSTREAM_BUFFER buffer_params = { 0, };
-    GstNvEncoderTask *task = (GstNvEncoderTask *)
-        & g_array_index (priv->task_pool, GstNvEncoderTask, i);
-
-    task->encoder = self;
-
-    buffer_params.version = gst_nvenc_get_create_bitstream_buffer_version ();
-    status = NvEncCreateBitstreamBuffer (priv->session, &buffer_params);
-
-    if (status != NV_ENC_SUCCESS) {
-      GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL),
-          ("Failed to create bitstream buffer, status: %"
-              GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status)));
-      goto error;
-    }
-
-    task->output_ptr = buffer_params.bitstreamBuffer;
-
-    if (priv->init_params.enableEncodeAsync) {
-      if (!gst_nv_encoder_create_event_handle (self,
-              priv->session, &task->event_handle)) {
-        GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL),
-            ("Failed to create async event handle"));
-        goto error;
-      }
-    }
-
-    g_queue_push_tail (&priv->free_tasks, task);
-  }
   gst_nv_encoder_device_unlock (self);
 
-  if (!klass->set_output_state (self, priv->input_state, priv->session)) {
+  if (!klass->set_output_state (self, priv->input_state,
+          priv->object->GetHandle ())) {
     GST_ELEMENT_ERROR (self, STREAM, ENCODE, (NULL),
         ("Failed to set output state"));
     gst_nv_encoder_reset (self);
     return FALSE;
   }
 
-  priv->encoding_thread = g_thread_new ("GstNvEncoderThread",
-      (GThreadFunc) gst_nv_encoder_thread_func, self);
+  priv->encoding_thread = std::make_unique < std::thread >
+      (gst_nv_encoder_thread_func, self);
 
   if (info->fps_n > 0 && info->fps_d > 0) {
     fps_n = info->fps_n;
@@ -1394,7 +1209,7 @@
 
   min_latency = priv->dts_offset +
       priv->config.rcParams.lookaheadDepth * frame_duration;
-  max_latency = frame_duration * priv->task_pool->len;
+  max_latency = frame_duration * task_pool_size;
   gst_video_encoder_set_latency (GST_VIDEO_ENCODER (self),
       min_latency, max_latency);
 
@@ -1415,7 +1230,7 @@
   NV_ENC_RECONFIGURE_PARAMS params = { 0, };
   NVENCSTATUS status;
 
-  if (!priv->session) {
+  if (!priv->object) {
     GST_WARNING_OBJECT (self,
         "Encoding session was not configured, open session");
     gst_nv_encoder_drain (self, TRUE);
@@ -1427,10 +1242,8 @@
   params.reInitEncodeParams = priv->init_params;
   params.reInitEncodeParams.encodeConfig = &priv->config;
 
-  status = NvEncReconfigureEncoder (priv->session, &params);
-  if (status != NV_ENC_SUCCESS) {
-    GST_WARNING_OBJECT (self, "Failed to reconfigure encoder, status %"
-        GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
+  status = priv->object->Reconfigure (&params);
+  if (!gst_nv_enc_result (status, self)) {
     gst_nv_encoder_drain (self, TRUE);
 
     return gst_nv_encoder_init_session (self, nullptr);
@@ -1452,6 +1265,18 @@
   priv->input_state = gst_video_codec_state_ref (state);
   priv->last_flow = GST_FLOW_OK;
 
+#ifdef HAVE_CUDA_GST_GL
+  {
+    GstCapsFeatures *features = gst_caps_get_features (state->caps, 0);
+    if (gst_caps_features_contains (features,
+            GST_CAPS_FEATURE_MEMORY_GL_MEMORY)) {
+      priv->gl_interop = TRUE;
+    } else {
+      priv->gl_interop = FALSE;
+    }
+  }
+#endif
+
   /* select device again on next buffer */
   if (priv->subclass_device_mode == GST_NV_ENCODER_DEVICE_AUTO_SELECT)
     priv->selected_device_mode = GST_NV_ENCODER_DEVICE_AUTO_SELECT;
@@ -1459,173 +1284,302 @@
   return gst_nv_encoder_init_session (self, nullptr);
 }
 
-static NV_ENC_BUFFER_FORMAT
-gst_nv_encoder_get_buffer_format (GstNvEncoder * self, GstVideoFormat format)
+static GstFlowReturn
+gst_nv_encoder_copy_system (GstNvEncoder * self, const GstVideoInfo * info,
+    GstBuffer * buffer, GstNvEncTask * task)
 {
-  switch (format) {
-    case GST_VIDEO_FORMAT_NV12:
-      return NV_ENC_BUFFER_FORMAT_NV12;
-    case GST_VIDEO_FORMAT_Y444:
-      return NV_ENC_BUFFER_FORMAT_YUV444;
-    case GST_VIDEO_FORMAT_P010_10LE:
-      return NV_ENC_BUFFER_FORMAT_YUV420_10BIT;
-    case GST_VIDEO_FORMAT_Y444_16LE:
-      return NV_ENC_BUFFER_FORMAT_YUV444_10BIT;
-    default:
-      GST_ERROR_OBJECT (self, "Unexpected format %s",
-          gst_video_format_to_string (format));
-      g_assert_not_reached ();
-      break;
+  std::shared_ptr < GstNvEncObject > object = self->priv->object;
+  NVENCSTATUS status;
+  GstVideoFrame frame;
+  guint8 *dst_data;
+  guint32 pitch;
+  GstNvEncBuffer *inbuf = nullptr;
+
+  if (!gst_video_frame_map (&frame, info, buffer, GST_MAP_READ)) {
+    GST_ERROR_OBJECT (self, "Failed to map buffer");
+    return GST_FLOW_ERROR;
   }
 
-  return NV_ENC_BUFFER_FORMAT_UNDEFINED;
+  status = object->AcquireBuffer (&inbuf);
+  if (!gst_nv_enc_result (status, self)) {
+    gst_video_frame_unmap (&frame);
+    return GST_FLOW_ERROR;
+  }
+
+  status = gst_nv_enc_buffer_lock (inbuf, (gpointer *) & dst_data, &pitch);
+  if (!gst_nv_enc_result (status, self)) {
+    gst_video_frame_unmap (&frame);
+    gst_nv_enc_buffer_unref (inbuf);
+    return GST_FLOW_ERROR;
+  }
+
+  for (guint i = 0; i < GST_VIDEO_FRAME_N_PLANES (&frame); i++) {
+    guint8 *src_data = (guint8 *) GST_VIDEO_FRAME_PLANE_DATA (&frame, i);
+    guint width_in_bytes = GST_VIDEO_FRAME_COMP_WIDTH (&frame, i) *
+        GST_VIDEO_FRAME_COMP_PSTRIDE (&frame, i);
+    guint stride = GST_VIDEO_FRAME_PLANE_STRIDE (&frame, i);
+    guint height = GST_VIDEO_FRAME_COMP_HEIGHT (&frame, i);
+
+    for (guint j = 0; j < height; j++) {
+      memcpy (dst_data, src_data, width_in_bytes);
+      dst_data += pitch;
+      src_data += stride;
+    }
+  }
+
+  gst_nv_enc_buffer_unlock (inbuf);
+  gst_video_frame_unmap (&frame);
+
+  gst_nv_enc_task_set_buffer (task, inbuf);
+
+  return GST_FLOW_OK;
 }
 
-static GstFlowReturn
-gst_nv_encoder_copy_system (GstNvEncoder * self, const GstVideoInfo * info,
-    GstBuffer * buffer, gpointer session, GstNvEncoderTask * task)
-{
-  NVENCSTATUS status;
-  GstVideoFrame frame;
-  guint8 *dst_data;
-  NV_ENC_BUFFER_FORMAT format;
+#ifdef HAVE_CUDA_GST_GL
+static GstCudaGraphicsResource *
+gst_nv_encoder_ensure_gl_cuda_resource (GstNvEncoder * self, GstMemory * mem)
+{
+  GQuark quark;
+  GstNvEncoderPrivate *priv = self->priv;
+  GstCudaGraphicsResource *resource;
+
+  if (!gst_is_gl_memory_pbo (mem)) {
+    GST_WARNING_OBJECT (self, "memory is not GL PBO memory, %s",
+        mem->allocator->mem_type);
+    return nullptr;
+  }
+
+  quark = gst_cuda_quark_from_id (GST_CUDA_QUARK_GRAPHICS_RESOURCE);
+  resource = (GstCudaGraphicsResource *)
+      gst_mini_object_get_qdata (GST_MINI_OBJECT (mem), quark);
+
+  if (!resource) {
+    GstMapInfo map_info;
+    GstGLMemoryPBO *pbo = (GstGLMemoryPBO *) mem;
+    GstGLBuffer *gl_buf = pbo->pbo;
+    gboolean ret;
+
+    if (!gst_memory_map (mem, &map_info,
+            (GstMapFlags) (GST_MAP_READ | GST_MAP_GL))) {
+      GST_ERROR_OBJECT (self, "Couldn't map gl memory");
+      return nullptr;
+    }
+
+    resource = gst_cuda_graphics_resource_new (priv->context,
+        GST_OBJECT (GST_GL_BASE_MEMORY_CAST (mem)->context),
+        GST_CUDA_GRAPHICS_RESOURCE_GL_BUFFER);
+
+    GST_LOG_OBJECT (self, "registering gl buffer %d to CUDA", gl_buf->id);
+    ret = gst_cuda_graphics_resource_register_gl_buffer (resource, gl_buf->id,
+        CU_GRAPHICS_REGISTER_FLAGS_NONE);
+    gst_memory_unmap (mem, &map_info);
+
+    if (!ret) {
+      GST_ERROR_OBJECT (self, "Couldn't register gl buffer %d", gl_buf->id);
+      gst_cuda_graphics_resource_free (resource);
+      return nullptr;
+    }
+
+    gst_mini_object_set_qdata (GST_MINI_OBJECT (mem), quark, resource,
+        (GDestroyNotify) gst_cuda_graphics_resource_free);
+  }
+
+  return resource;
+}
+
+struct GstNvEncGLInteropData
+{
+  GstNvEncoder *self = nullptr;
+  GstBuffer *in_buf = nullptr;
+  GstBuffer *out_buf = nullptr;
+};
+
+static void
+gst_nv_encoder_upload_gl (GstGLContext * context, GstNvEncGLInteropData * data)
+{
+  GstNvEncoder *self = data->self;
+  GstNvEncoderPrivate *priv = self->priv;
+  CUDA_MEMCPY2D copy_param;
+  GstCudaGraphicsResource *gst_resGST_VIDEO_MAX_PLANES = { nullptr, };
+  CUgraphicsResource cuda_resGST_VIDEO_MAX_PLANES = { nullptr, };
+  CUdeviceptr src_devptrGST_VIDEO_MAX_PLANES = { 0, };
+  const GstVideoInfo *info = &priv->input_state->info;
+  CUstream stream = gst_cuda_stream_get_handle (priv->stream);
+  GstCudaMemory *cmem;
+  GstMapInfo map_info;
+  CUresult cuda_ret;
+  gboolean ret = FALSE;
+
+  gst_cuda_context_push (priv->context);
+
+  for (guint i = 0; i < GST_VIDEO_INFO_N_PLANES (info); i++) {
+    GstMemory *mem = gst_buffer_peek_memory (data->in_buf, i);
+    GstGLMemoryPBO *pbo = (GstGLMemoryPBO *) mem;
+    gsize src_size;
+
+    if (!gst_is_gl_memory_pbo (mem)) {
+      GST_ERROR_OBJECT (self, "Not a GL PBO memory");
+      goto out;
+    }
 
-  format =
-      gst_nv_encoder_get_buffer_format (self, GST_VIDEO_INFO_FORMAT (info));
-  if (format == NV_ENC_BUFFER_FORMAT_UNDEFINED)
-    return GST_FLOW_ERROR;
+    gst_resi = gst_nv_encoder_ensure_gl_cuda_resource (self, mem);
+    if (!gst_resi) {
+      GST_ERROR_OBJECT (self, "Couldn't get resource %d", i);
+      goto out;
+    }
 
-  if (!gst_video_frame_map (&frame, info, buffer, GST_MAP_READ)) {
-    GST_ERROR_OBJECT (self, "Failed to map buffer");
-    return GST_FLOW_ERROR;
-  }
+    gst_gl_memory_pbo_upload_transfer (pbo);
+    gst_gl_memory_pbo_download_transfer (pbo);
 
-  if (!task->input_buffer.inputBuffer) {
-    NV_ENC_CREATE_INPUT_BUFFER input_buffer = { 0, };
-    input_buffer.version = gst_nvenc_get_create_input_buffer_version ();
-    input_buffer.width = info->width;
-    input_buffer.height = info->height;
-    input_buffer.bufferFmt = format;
+    cuda_resi = gst_cuda_graphics_resource_map (gst_resi, stream,
+        CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY);
+    if (!cuda_resi) {
+      GST_ERROR_OBJECT (self, "Couldn't map resource");
+      goto out;
+    }
 
-    status = NvEncCreateInputBuffer (session, &input_buffer);
-    if (status != NV_ENC_SUCCESS) {
-      GST_ERROR_OBJECT (self, "Failed to create input buffer, status %"
-          GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
-      gst_video_frame_unmap (&frame);
-      return GST_FLOW_ERROR;
+    cuda_ret = CuGraphicsResourceGetMappedPointer (&src_devptri,
+        &src_size, cuda_resi);
+    if (!gst_cuda_result (cuda_ret)) {
+      GST_ERROR_OBJECT (self, "Couldn't get mapped device pointer");
+      goto out;
     }
+  }
 
-    task->input_buffer = input_buffer;
+  if (gst_buffer_pool_acquire_buffer (priv->internal_pool,
+          &data->out_buf, nullptr) != GST_FLOW_OK) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire fallback buffer");
+    goto out;
   }
 
-  task->lk_input_buffer.version = gst_nvenc_get_lock_input_buffer_version ();
-  task->lk_input_buffer.inputBuffer = task->input_buffer.inputBuffer;
-  status = NvEncLockInputBuffer (session, &task->lk_input_buffer);
-  if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self, "Failed to lock input buffer, status %"
-        GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
-    gst_video_frame_unmap (&frame);
-    return GST_FLOW_ERROR;
+  cmem = (GstCudaMemory *) gst_buffer_peek_memory (data->out_buf, 0);
+  if (!gst_memory_map (GST_MEMORY_CAST (cmem), &map_info,
+          (GstMapFlags) (GST_MAP_WRITE | GST_MAP_CUDA))) {
+    GST_ERROR_OBJECT (self, "Couldn't map fallback memory");
+    goto out;
   }
 
-  dst_data = (guint8 *) task->lk_input_buffer.bufferDataPtr;
+  memset (&copy_param, 0, sizeof (CUDA_MEMCPY2D));
 
-  for (guint i = 0; i < GST_VIDEO_FRAME_N_PLANES (&frame); i++) {
-    guint8 *src_data = (guint8 *) GST_VIDEO_FRAME_PLANE_DATA (&frame, i);
-    guint width_in_bytes = GST_VIDEO_FRAME_COMP_WIDTH (&frame, i) *
-        GST_VIDEO_FRAME_COMP_PSTRIDE (&frame, i);
-    guint stride = GST_VIDEO_FRAME_PLANE_STRIDE (&frame, i);
-    guint height = GST_VIDEO_FRAME_COMP_HEIGHT (&frame, i);
+  for (guint i = 0; i < GST_VIDEO_INFO_N_PLANES (info); i++) {
+    copy_param.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+    copy_param.srcDevice = src_devptri;
+    copy_param.srcPitch = GST_VIDEO_INFO_PLANE_STRIDE (info, i);
 
-    for (guint j = 0; j < height; j++) {
-      memcpy (dst_data, src_data, width_in_bytes);
-      dst_data += task->lk_input_buffer.pitch;
-      src_data += stride;
+    copy_param.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+    copy_param.dstDevice = ((CUdeviceptr) map_info.data) + cmem->info.offseti;
+    copy_param.dstPitch = cmem->info.stride0;
+
+    copy_param.WidthInBytes = GST_VIDEO_INFO_COMP_WIDTH (info, i) *
+        GST_VIDEO_INFO_COMP_PSTRIDE (info, i);
+    copy_param.Height = GST_VIDEO_INFO_COMP_HEIGHT (info, i);
+
+    if (!gst_cuda_result (CuMemcpy2DAsync (&copy_param, stream))) {
+      gst_memory_unmap (GST_MEMORY_CAST (cmem), &map_info);
+      GST_ERROR_OBJECT (self, "Couldn't copy plane %d", i);
+      goto out;
     }
   }
 
-  NvEncUnlockInputBuffer (session, task->input_buffer.inputBuffer);
-  gst_video_frame_unmap (&frame);
+  gst_memory_unmap (GST_MEMORY_CAST (cmem), &map_info);
 
-  return GST_FLOW_OK;
+  ret = TRUE;
+
+out:
+  for (guint i = 0; i < gst_buffer_n_memory (data->in_buf); i++) {
+    if (!gst_resi)
+      break;
+
+    gst_cuda_graphics_resource_unmap (gst_resi, stream);
+  }
+
+  CuStreamSynchronize (stream);
+  gst_cuda_context_pop (nullptr);
+  if (!ret)
+    gst_clear_buffer (&data->out_buf);
 }
+#endif /* HAVE_CUDA_GST_GL */
 
 static GstFlowReturn
 gst_nv_encoder_prepare_task_input_cuda (GstNvEncoder * self,
-    const GstVideoInfo * info, GstBuffer * buffer, gpointer session,
-    GstNvEncoderTask * task)
+    GstBuffer * buffer, GstNvEncTask * task)
 {
   GstNvEncoderPrivate *priv = self->priv;
+  std::shared_ptr < GstNvEncObject > object = priv->object;
   GstMemory *mem;
   GstCudaMemory *cmem;
   NVENCSTATUS status;
+  GstCudaStream *stream;
+  GstNvEncResource *resource = nullptr;
+  const GstVideoInfo *info = &priv->input_state->info;
 
   mem = gst_buffer_peek_memory (buffer, 0);
+
+#ifdef HAVE_CUDA_GST_GL
+  if (priv->gl_interop) {
+    if (gst_is_gl_memory (mem) && gst_buffer_n_memory (buffer) ==
+        GST_VIDEO_INFO_N_PLANES (info)) {
+      GstNvEncGLInteropData gl_data;
+      GstGLMemory *gl_mem = (GstGLMemory *) mem;
+      gl_data.self = self;
+      gl_data.in_buf = buffer;
+      gl_data.out_buf = nullptr;
+      gst_gl_context_thread_add (gl_mem->mem.context,
+          (GstGLContextThreadFunc) gst_nv_encoder_upload_gl, &gl_data);
+      if (gl_data.out_buf) {
+        mem = gst_buffer_peek_memory (gl_data.out_buf, 0);
+        status = object->AcquireResource (mem, &resource);
+
+        if (status != NV_ENC_SUCCESS) {
+          gst_buffer_unref (gl_data.out_buf);
+          GST_ERROR_OBJECT (self, "Failed to get resource, status %"
+              GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
+          return GST_FLOW_ERROR;
+        }
+
+        gst_nv_enc_task_set_resource (task, gl_data.out_buf, resource);
+
+        return GST_FLOW_OK;
+      } else {
+        GST_WARNING_OBJECT (self, "GL interop failed");
+        priv->gl_interop = FALSE;
+      }
+    }
+  }
+#endif
+
   if (!gst_is_cuda_memory (mem)) {
     GST_LOG_OBJECT (self, "Not a CUDA buffer, system copy");
-    return gst_nv_encoder_copy_system (self, info, buffer, session, task);
+    return gst_nv_encoder_copy_system (self, info, buffer, task);
   }
 
   cmem = GST_CUDA_MEMORY_CAST (mem);
   if (cmem->context != priv->context) {
     GST_LOG_OBJECT (self, "Different context, system copy");
-    return gst_nv_encoder_copy_system (self, info, buffer, session, task);
-  }
-
-  task->buffer = gst_buffer_ref (buffer);
-  if (!gst_buffer_map (task->buffer, &task->map_info,
-          (GstMapFlags) (GST_MAP_READ | GST_MAP_CUDA))) {
-    GST_ERROR_OBJECT (self, "Failed to map buffer");
-    gst_clear_buffer (&task->buffer);
-
-    return GST_FLOW_ERROR;
+    return gst_nv_encoder_copy_system (self, info, buffer, task);
   }
 
-  cmem = (GstCudaMemory *) gst_buffer_peek_memory (task->buffer, 0);
-
-  task->register_resource.version = gst_nvenc_get_register_resource_version ();
-  task->register_resource.resourceType =
-      NV_ENC_INPUT_RESOURCE_TYPE_CUDADEVICEPTR;
-  task->register_resource.width = cmem->info.width;
-  task->register_resource.height = cmem->info.height;
-  task->register_resource.pitch = cmem->info.stride0;
-  task->register_resource.resourceToRegister = task->map_info.data;
-  task->register_resource.bufferFormat =
-      gst_nv_encoder_get_buffer_format (self, GST_VIDEO_INFO_FORMAT (info));
-  if (task->register_resource.bufferFormat == NV_ENC_BUFFER_FORMAT_UNDEFINED)
-    return GST_FLOW_ERROR;
+  status = object->AcquireResource (mem, &resource);
 
-  status = NvEncRegisterResource (session, &task->register_resource);
   if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self, "Failed to register resource, status %"
+    GST_ERROR_OBJECT (self, "Failed to get resource, status %"
         GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
 
-    gst_buffer_unmap (task->buffer, &task->map_info);
-    gst_clear_buffer (&task->buffer);
-
     return GST_FLOW_ERROR;
   }
 
-  task->mapped_resource.version = gst_nvenc_get_map_input_resource_version ();
-  task->mapped_resource.registeredResource =
-      task->register_resource.registeredResource;
-  status = NvEncMapInputResource (session, &task->mapped_resource);
-  if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self, "Failed to map input resource, status %"
-        GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
-    NvEncUnregisterResource (session,
-        task->register_resource.registeredResource);
-
-    gst_buffer_unmap (task->buffer, &task->map_info);
-    gst_clear_buffer (&task->buffer);
-
-    return GST_FLOW_ERROR;
+  stream = gst_cuda_memory_get_stream (cmem);
+  if (stream != priv->stream) {
+    /* different stream, needs sync */
+    gst_cuda_memory_sync (cmem);
   }
 
+  gst_nv_enc_task_set_resource (task, gst_buffer_ref (buffer), resource);
+
   return GST_FLOW_OK;
 }
 
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
 static GstBuffer *
 gst_nv_encoder_copy_d3d11 (GstNvEncoder * self,
     GstBuffer * src_buffer, GstBufferPool * pool, gboolean shared)
@@ -1785,24 +1739,27 @@
 
 static GstFlowReturn
 gst_nv_encoder_prepare_task_input_d3d11 (GstNvEncoder * self,
-    const GstVideoInfo * info, GstBuffer * buffer, gpointer session,
-    GstBufferPool * pool, GstNvEncoderTask * task)
+    GstBuffer * buffer, GstNvEncTask * task)
 {
   GstNvEncoderPrivate *priv = self->priv;
+  std::shared_ptr < GstNvEncObject > object = priv->object;
   GstMemory *mem;
   GstD3D11Memory *dmem;
-  D3D11_TEXTURE2D_DESC desc;
   NVENCSTATUS status;
+  GstBuffer *upload_buffer = nullptr;
+  GstNvEncResource *resource = nullptr;
+  const GstVideoInfo *info = &priv->input_state->info;
+  GstBufferPool *pool = priv->internal_pool;
 
   if (gst_buffer_n_memory (buffer) > 1) {
     GST_LOG_OBJECT (self, "Not a native DXGI format, system copy");
-    return gst_nv_encoder_copy_system (self, info, buffer, session, task);
+    return gst_nv_encoder_copy_system (self, info, buffer, task);
   }
 
   mem = gst_buffer_peek_memory (buffer, 0);
   if (!gst_is_d3d11_memory (mem)) {
     GST_LOG_OBJECT (self, "Not a D3D11 buffer, system copy");
-    return gst_nv_encoder_copy_system (self, info, buffer, session, task);
+    return gst_nv_encoder_copy_system (self, info, buffer, task);
   }
 
   dmem = GST_D3D11_MEMORY_CAST (mem);
@@ -1812,80 +1769,33 @@
     g_object_get (dmem->device, "adapter-luid", &adapter_luid, NULL);
     if (adapter_luid == priv->dxgi_adapter_luid) {
       GST_LOG_OBJECT (self, "Different device but same GPU, copy d3d11");
-      task->buffer = gst_nv_encoder_copy_d3d11 (self, buffer, pool, TRUE);
+      upload_buffer = gst_nv_encoder_copy_d3d11 (self, buffer, pool, TRUE);
     } else {
       GST_LOG_OBJECT (self, "Different device, system copy");
-      return gst_nv_encoder_copy_system (self, info, buffer, session, task);
+      return gst_nv_encoder_copy_system (self, info, buffer, task);
     }
   }
 
-  if (!task->buffer)
-    task->buffer = gst_nv_encoder_upload_d3d11_frame (self, info, buffer, pool);
+  if (!upload_buffer)
+    upload_buffer =
+        gst_nv_encoder_upload_d3d11_frame (self, info, buffer, pool);
 
-  if (!task->buffer) {
+  if (!upload_buffer) {
     GST_ERROR_OBJECT (self, "Failed to upload buffer");
     return GST_FLOW_ERROR;
   }
 
-  if (!gst_buffer_map (task->buffer, &task->map_info,
-          (GstMapFlags) (GST_MAP_READ | GST_MAP_D3D11))) {
-    GST_ERROR_OBJECT (self, "Failed to map buffer");
-    gst_clear_buffer (&task->buffer);
-
-    return GST_FLOW_ERROR;
-  }
-
-  dmem = (GstD3D11Memory *) gst_buffer_peek_memory (task->buffer, 0);
-  gst_d3d11_memory_get_texture_desc (dmem, &desc);
-
-  task->register_resource.version = gst_nvenc_get_register_resource_version ();
-  task->register_resource.resourceType = NV_ENC_INPUT_RESOURCE_TYPE_DIRECTX;
-  task->register_resource.width = desc.Width;
-  task->register_resource.height = desc.Height;
-  switch (desc.Format) {
-    case DXGI_FORMAT_NV12:
-      task->register_resource.bufferFormat = NV_ENC_BUFFER_FORMAT_NV12;
-      break;
-    case DXGI_FORMAT_P010:
-      task->register_resource.bufferFormat = NV_ENC_BUFFER_FORMAT_YUV420_10BIT;
-      break;
-    default:
-      GST_ERROR_OBJECT (self, "Unexpected DXGI format %d", desc.Format);
-      g_assert_not_reached ();
-      return GST_FLOW_ERROR;
-  }
-
-  task->register_resource.subResourceIndex =
-      gst_d3d11_memory_get_subresource_index (dmem);
-  task->register_resource.resourceToRegister =
-      gst_d3d11_memory_get_resource_handle (dmem);
+  status = object->AcquireResource (mem, &resource);
 
-  status = NvEncRegisterResource (session, &task->register_resource);
   if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self, "Failed to register resource, status %"
+    GST_ERROR_OBJECT (self, "Failed to get resource, status %"
         GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
-
-    gst_buffer_unmap (task->buffer, &task->map_info);
-    gst_clear_buffer (&task->buffer);
+    gst_buffer_unref (upload_buffer);
 
     return GST_FLOW_ERROR;
   }
 
-  task->mapped_resource.version = gst_nvenc_get_map_input_resource_version ();
-  task->mapped_resource.registeredResource =
-      task->register_resource.registeredResource;
-  status = NvEncMapInputResource (session, &task->mapped_resource);
-  if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self, "Failed to map input resource, status %"
-        GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
-    NvEncUnregisterResource (session,
-        task->register_resource.registeredResource);
-
-    gst_buffer_unmap (task->buffer, &task->map_info);
-    gst_clear_buffer (&task->buffer);
-
-    return GST_FLOW_ERROR;
-  }
+  gst_nv_enc_task_set_resource (task, upload_buffer, resource);
 
   return GST_FLOW_OK;
 }
@@ -1893,22 +1803,19 @@
 
 static GstFlowReturn
 gst_nv_encoder_prepare_task_input (GstNvEncoder * self,
-    const GstVideoInfo * info, GstBuffer * buffer, gpointer session,
-    GstBufferPool * pool, GstNvEncoderTask * task)
+    GstBuffer * buffer, GstNvEncTask * task)
 {
   GstNvEncoderPrivate *priv = self->priv;
   GstFlowReturn ret = GST_FLOW_ERROR;
 
   switch (priv->selected_device_mode) {
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
     case GST_NV_ENCODER_DEVICE_D3D11:
-      ret = gst_nv_encoder_prepare_task_input_d3d11 (self, info, buffer,
-          session, pool, task);
+      ret = gst_nv_encoder_prepare_task_input_d3d11 (self, buffer, task);
       break;
 #endif
     case GST_NV_ENCODER_DEVICE_CUDA:
-      ret = gst_nv_encoder_prepare_task_input_cuda (self, info, buffer,
-          session, task);
+      ret = gst_nv_encoder_prepare_task_input_cuda (self, buffer, task);
       break;
     default:
       g_assert_not_reached ();
@@ -1918,6 +1825,69 @@
   return ret;
 }
 
+static gboolean
+gst_nv_encoder_foreach_caption_meta (GstBuffer * buffer, GstMeta ** meta,
+    GArray * payload)
+{
+  GstVideoCaptionMeta *cc_meta;
+  GstByteWriter br;
+  guint payload_size;
+  NV_ENC_SEI_PAYLOAD sei_payload;
+
+  if ((*meta)->info->api != GST_VIDEO_CAPTION_META_API_TYPE)
+    return TRUE;
+
+  cc_meta = (GstVideoCaptionMeta *) (*meta);
+
+  if (cc_meta->caption_type != GST_VIDEO_CAPTION_TYPE_CEA708_RAW)
+    return TRUE;
+
+  /* 1 byte contry_code + 10 bytes CEA-708 specific data + caption data */
+  payload_size = 11 + cc_meta->size;
+
+  gst_byte_writer_init_with_size (&br, payload_size, FALSE);
+
+  /* 8-bits itu_t_t35_country_code */
+  gst_byte_writer_put_uint8 (&br, 181);
+
+  /* 16-bits itu_t_t35_provider_code */
+  gst_byte_writer_put_uint8 (&br, 0);
+  gst_byte_writer_put_uint8 (&br, 49);
+
+  /* 32-bits ATSC_user_identifier */
+  gst_byte_writer_put_uint8 (&br, 'G');
+  gst_byte_writer_put_uint8 (&br, 'A');
+  gst_byte_writer_put_uint8 (&br, '9');
+  gst_byte_writer_put_uint8 (&br, '4');
+
+  /* 8-bits ATSC1_data_user_data_type_code */
+  gst_byte_writer_put_uint8 (&br, 3);
+
+  /* 8-bits:
+   * 1 bit process_em_data_flag (0)
+   * 1 bit process_cc_data_flag (1)
+   * 1 bit additional_data_flag (0)
+   * 5-bits cc_count
+   */
+  gst_byte_writer_put_uint8 (&br, ((cc_meta->size / 3) & 0x1f) | 0x40);
+
+  /* 8 bits em_data, unused */
+  gst_byte_writer_put_uint8 (&br, 255);
+
+  gst_byte_writer_put_data (&br, cc_meta->data, cc_meta->size);
+
+  /* 8 marker bits */
+  gst_byte_writer_put_uint8 (&br, 255);
+
+  sei_payload.payloadSize = gst_byte_writer_get_pos (&br);
+  sei_payload.payloadType = 4;
+  sei_payload.payload = gst_byte_writer_reset_and_get_data (&br);
+
+  g_array_append_val (payload, sei_payload);
+
+  return TRUE;
+}
+
 static GstFlowReturn
 gst_nv_encoder_handle_frame (GstVideoEncoder * encoder,
     GstVideoCodecFrame * frame)
@@ -1926,24 +1896,20 @@
   GstNvEncoderPrivate *priv = self->priv;
   GstNvEncoderClass *klass = GST_NV_ENCODER_GET_CLASS (self);
   GstFlowReturn ret = GST_FLOW_ERROR;
-  GstNvEncoderTask *task = NULL;
+  GstNvEncTask *task = nullptr;
   GstNvEncoderReconfigure reconfig;
   GstBuffer *in_buf = frame->input_buffer;
+  NVENCSTATUS status;
 
-  GST_TRACE_OBJECT (self, "Handle frame");
-
-  GST_NV_ENCODER_LOCK (self);
-  ret = priv->last_flow;
-  GST_NV_ENCODER_UNLOCK (self);
-
-  if (ret != GST_FLOW_OK) {
-    GST_INFO_OBJECT (self, "Last flow was %s", gst_flow_get_name (ret));
+  if (priv->last_flow != GST_FLOW_OK) {
+    GST_INFO_OBJECT (self, "Last flow was %s",
+        gst_flow_get_name (priv->last_flow));
     gst_video_encoder_finish_frame (encoder, frame);
 
-    return ret;
+    return priv->last_flow;
   }
 
-  if (!priv->session && !gst_nv_encoder_init_session (self, in_buf)) {
+  if (!priv->object && !gst_nv_encoder_init_session (self, in_buf)) {
     GST_ERROR_OBJECT (self, "Encoder object was not configured");
     gst_video_encoder_finish_frame (encoder, frame);
 
@@ -1974,43 +1940,49 @@
   /* Release stream lock temporarily for encoding thread to be able to
    * push encoded data */
   GST_VIDEO_ENCODER_STREAM_UNLOCK (self);
-  ret = gst_nv_encoder_get_free_task (self, &task, TRUE);
+  GST_TRACE_OBJECT (self, "Waiting for new task");
+  ret = priv->object->AcquireTask (&task, false);
   GST_VIDEO_ENCODER_STREAM_LOCK (self);
-  if (ret != GST_FLOW_OK) {
-    GST_DEBUG_OBJECT (self, "Last flow was %s", gst_flow_get_name (ret));
+
+  if (priv->last_flow != GST_FLOW_OK) {
+    GST_INFO_OBJECT (self, "Last flow was %s",
+        gst_flow_get_name (priv->last_flow));
     gst_video_encoder_finish_frame (encoder, frame);
-    return ret;
+
+    return priv->last_flow;
   }
 
-  if (!gst_nv_encoder_device_lock (self)) {
-    GST_ERROR_OBJECT (self, "Failed to lock device");
+  if (ret != GST_FLOW_OK) {
+    GST_DEBUG_OBJECT (self, "AcquireTask returned %s", gst_flow_get_name (ret));
     gst_video_encoder_finish_frame (encoder, frame);
-
-    return GST_FLOW_ERROR;
+    return ret;
   }
 
-  g_assert (task->buffer == NULL);
-  ret = gst_nv_encoder_prepare_task_input (self, &priv->input_state->info,
-      in_buf, priv->session, priv->internal_pool, task);
+  gst_nv_encoder_device_lock (self);
+  ret = gst_nv_encoder_prepare_task_input (self, in_buf, task);
   gst_nv_encoder_device_unlock (self);
 
   if (ret != GST_FLOW_OK) {
     GST_ERROR_OBJECT (self, "Failed to upload frame");
-    GST_NV_ENCODER_LOCK (self);
-    gst_nv_encoder_task_reset (self, task);
-    GST_NV_ENCODER_UNLOCK (self);
-
+    gst_nv_enc_task_unref (task);
     gst_video_encoder_finish_frame (encoder, frame);
 
     return ret;
   }
 
-  ret = gst_nv_encoder_encode_frame (self, frame, task);
-  if (ret != GST_FLOW_OK) {
+  if (priv->cc_insert != GST_NV_ENCODER_SEI_DISABLED) {
+    gst_buffer_foreach_meta (in_buf,
+        (GstBufferForeachMetaFunc) gst_nv_encoder_foreach_caption_meta,
+        gst_nv_enc_task_get_sei_payload (task));
+  }
+
+  status = priv->object->Encode (frame,
+      gst_nv_encoder_get_pic_struct (self, in_buf), task);
+  if (status != NV_ENC_SUCCESS) {
     GST_ERROR_OBJECT (self, "Failed to encode frame");
     gst_video_encoder_finish_frame (encoder, frame);
 
-    return ret;
+    return GST_FLOW_ERROR;
   }
 
   gst_video_codec_frame_unref (frame);
@@ -2045,12 +2017,31 @@
   return TRUE;
 }
 
-guint
-gst_nv_encoder_get_task_size (GstNvEncoder * encoder)
+static gboolean
+gst_nv_encoder_transform_meta (GstVideoEncoder * encoder,
+    GstVideoCodecFrame * frame, GstMeta * meta)
 {
-  g_return_val_if_fail (GST_IS_NV_ENCODER (encoder), 0);
+  GstNvEncoder *self = GST_NV_ENCODER (encoder);
+  GstNvEncoderPrivate *priv = self->priv;
+  GstVideoCaptionMeta *cc_meta;
+
+  /* We need to handle only case CC meta should be dropped */
+  if (priv->cc_insert != GST_NV_ENCODER_SEI_INSERT_AND_DROP)
+    goto out;
+
+  if (meta->info->api != GST_VIDEO_CAPTION_META_API_TYPE)
+    goto out;
+
+  cc_meta = (GstVideoCaptionMeta *) meta;
+  if (cc_meta->caption_type != GST_VIDEO_CAPTION_TYPE_CEA708_RAW)
+    goto out;
+
+  /* Don't copy this meta into output buffer */
+  return FALSE;
 
-  return encoder->priv->task_pool->len;
+out:
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->transform_meta (encoder,
+      frame, meta);
 }
 
 void
@@ -2075,17 +2066,121 @@
 {
   static GType preset_type = 0;
   static const GEnumValue presets = {
-    {GST_NV_ENCODER_PRESET_DEFAULT, "Default", "default"},
-    {GST_NV_ENCODER_PRESET_HP, "High Performance", "hp"},
-    {GST_NV_ENCODER_PRESET_HQ, "High Quality", "hq"},
-    {GST_NV_ENCODER_PRESET_LOW_LATENCY_DEFAULT, "Low Latency", "low-latency"},
-    {GST_NV_ENCODER_PRESET_LOW_LATENCY_HQ, "Low Latency, High Quality",
+    /**
+     * GstNvEncoderPreset::default:
+     *
+     * Since: 1.22
+     */
+    {GST_NV_ENCODER_PRESET_DEFAULT, "Default (deprecated, use p1~7 with tune)",
+        "default"},
+
+    /**
+     * GstNvEncoderPreset::hp:
+     *
+     * Since: 1.22
+     */
+    {GST_NV_ENCODER_PRESET_HP,
+        "High Performance (deprecated, use p1~7 with tune)", "hp"},
+
+    /**
+     * GstNvEncoderPreset::hq:
+     *
+     * Since: 1.22
+     */
+    {GST_NV_ENCODER_PRESET_HQ, "High Quality (deprecated, use p1~7 with tune)",
+        "hq"},
+
+    /**
+     * GstNvEncoderPreset::low-latency:
+     *
+     * Since: 1.22
+     */
+    {GST_NV_ENCODER_PRESET_LOW_LATENCY_DEFAULT,
+        "Low Latency (deprecated, use p1~7 with tune)", "low-latency"},
+
+    /**
+     * GstNvEncoderPreset::low-latency-hq:
+     *
+     * Since: 1.22
+     */
+    {GST_NV_ENCODER_PRESET_LOW_LATENCY_HQ,
+          "Low Latency (deprecated, use p1~7 with tune), High Quality",
         "low-latency-hq"},
-    {GST_NV_ENCODER_PRESET_LOW_LATENCY_HP, "Low Latency, High Performance",
+
+    /**
+     * GstNvEncoderPreset::low-latency-hq:
+     *
+     * Since: 1.22
+     */
+    {GST_NV_ENCODER_PRESET_LOW_LATENCY_HP,
+          "Low Latency (deprecated, use p1~7 with tune), High Performance",
         "low-latency-hp"},
-    {GST_NV_ENCODER_PRESET_LOSSLESS_DEFAULT, "Lossless", "lossless"},
-    {GST_NV_ENCODER_PRESET_LOSSLESS_HP, "Lossless, High Performance",
+
+    /**
+     * GstNvEncoderPreset::lossless:
+     *
+     * Since: 1.22
+     */
+    {GST_NV_ENCODER_PRESET_LOSSLESS_DEFAULT,
+        "Lossless (deprecated, use p1~7 with tune)", "lossless"},
+
+    /**
+     * GstNvEncoderPreset::lossless-hp:
+     *
+     * Since: 1.22
+     */
+    {GST_NV_ENCODER_PRESET_LOSSLESS_HP,
+          "Lossless (deprecated, use p1~7 with tune), High Performance",
         "lossless-hp"},
+
+    /**
+     * GstNvEncoderPreset::p1:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_PRESET_P1, "P1, fastest", "p1"},
+
+    /**
+     * GstNvEncoderPreset::p2:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_PRESET_P2, "P2, faster", "p2"},
+
+    /**
+     * GstNvEncoderPreset::p3:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_PRESET_P3, "P3, fast", "p3"},
+
+    /**
+     * GstNvEncoderPreset::p4:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_PRESET_P4, "P4, medium", "p4"},
+
+    /**
+     * GstNvEncoderPreset::p5:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_PRESET_P5, "P5, slow", "p5"},
+
+    /**
+     * GstNvEncoderPreset::p6:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_PRESET_P6, "P6, slower", "p6"},
+
+    /**
+     * GstNvEncoderPreset::p7:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_PRESET_P7, "P7, slowest", "p7"},
     {0, NULL, NULL},
   };
 
@@ -2098,41 +2193,6 @@
   return preset_type;
 }
 
-void
-gst_nv_encoder_preset_to_guid (GstNvEncoderPreset preset, GUID * guid)
-{
-  switch (preset) {
-    case GST_NV_ENCODER_PRESET_DEFAULT:
-      *guid = NV_ENC_PRESET_DEFAULT_GUID;
-      break;
-    case GST_NV_ENCODER_PRESET_HP:
-      *guid = NV_ENC_PRESET_HP_GUID;
-      break;
-    case GST_NV_ENCODER_PRESET_HQ:
-      *guid = NV_ENC_PRESET_HQ_GUID;
-      break;
-    case GST_NV_ENCODER_PRESET_LOW_LATENCY_DEFAULT:
-      *guid = NV_ENC_PRESET_LOW_LATENCY_DEFAULT_GUID;
-      break;
-    case GST_NV_ENCODER_PRESET_LOW_LATENCY_HQ:
-      *guid = NV_ENC_PRESET_LOW_LATENCY_HQ_GUID;
-      break;
-    case GST_NV_ENCODER_PRESET_LOW_LATENCY_HP:
-      *guid = NV_ENC_PRESET_LOW_LATENCY_HP_GUID;
-      break;
-    case GST_NV_ENCODER_PRESET_LOSSLESS_DEFAULT:
-      *guid = NV_ENC_PRESET_LOSSLESS_DEFAULT_GUID;
-      break;
-    case GST_NV_ENCODER_PRESET_LOSSLESS_HP:
-      *guid = NV_ENC_PRESET_LOSSLESS_HP_GUID;
-      break;
-    default:
-      break;
-  }
-
-  *guid = NV_ENC_PRESET_DEFAULT_GUID;
-}
-
 /**
  * GstNvEncoderRCMode:
  *
@@ -2147,9 +2207,12 @@
     {GST_NV_ENCODER_RC_MODE_VBR, "Variable Bit Rate", "vbr"},
     {GST_NV_ENCODER_RC_MODE_CBR, "Constant Bit Rate", "cbr"},
     {GST_NV_ENCODER_RC_MODE_CBR_LOWDELAY_HQ,
-        "Low-Delay CBR, High Quality", "cbr-ld-hq"},
-    {GST_NV_ENCODER_RC_MODE_CBR_HQ, "CBR, High Quality (slower)", "cbr-hq"},
-    {GST_NV_ENCODER_RC_MODE_VBR_HQ, "VBR, High Quality (slower)", "vbr-hq"},
+        "Low-Delay CBR, High Quality "
+          "(deprecated, use cbr with tune and multipass)", "cbr-ld-hq"},
+    {GST_NV_ENCODER_RC_MODE_CBR_HQ, "CBR, High Quality "
+          "(deprecated, use cbr with tune and multipass)", "cbr-hq"},
+    {GST_NV_ENCODER_RC_MODE_VBR_HQ, "VBR, High Quality "
+          "(deprecated, use vbr with tune and multipass)", "vbr-hq"},
     {0, NULL, NULL},
   };
 
@@ -2162,69 +2225,297 @@
   return rc_mode_type;
 }
 
-NV_ENC_PARAMS_RC_MODE
-gst_nv_encoder_rc_mode_to_native (GstNvEncoderRCMode rc_mode)
+void
+gst_nv_encoder_preset_to_native (GstNvEncoderPreset preset,
+    GstNvEncoderTune tune, GUID * preset_guid, NV_ENC_TUNING_INFO * tune_info)
+{
+  gboolean is_low_latency = FALSE;
+  gboolean is_lossless = FALSE;
+  switch (preset) {
+    case GST_NV_ENCODER_PRESET_DEFAULT:
+      *preset_guid = NV_ENC_PRESET_P4_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_HP:
+      *preset_guid = NV_ENC_PRESET_P1_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_HQ:
+      *preset_guid = NV_ENC_PRESET_P7_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_LOW_LATENCY_DEFAULT:
+      is_low_latency = TRUE;
+      *preset_guid = NV_ENC_PRESET_P4_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_LOW_LATENCY_HQ:
+      is_low_latency = TRUE;
+      *preset_guid = NV_ENC_PRESET_P7_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_LOW_LATENCY_HP:
+      is_low_latency = TRUE;
+      *preset_guid = NV_ENC_PRESET_P1_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_LOSSLESS_DEFAULT:
+      is_lossless = TRUE;
+      *preset_guid = NV_ENC_PRESET_P4_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_LOSSLESS_HP:
+      is_lossless = TRUE;
+      *preset_guid = NV_ENC_PRESET_P1_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_P1:
+      *preset_guid = NV_ENC_PRESET_P1_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_P2:
+      *preset_guid = NV_ENC_PRESET_P2_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_P3:
+      *preset_guid = NV_ENC_PRESET_P3_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_P4:
+      *preset_guid = NV_ENC_PRESET_P4_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_P5:
+      *preset_guid = NV_ENC_PRESET_P5_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_P6:
+      *preset_guid = NV_ENC_PRESET_P6_GUID;
+      break;
+    case GST_NV_ENCODER_PRESET_P7:
+      *preset_guid = NV_ENC_PRESET_P7_GUID;
+      break;
+    default:
+      *preset_guid = NV_ENC_PRESET_P4_GUID;
+      break;
+  }
+
+  switch (tune) {
+    case GST_NV_ENCODER_TUNE_DEFAULT:
+      if (is_low_latency)
+        *tune_info = NV_ENC_TUNING_INFO_LOW_LATENCY;
+      else if (is_lossless)
+        *tune_info = NV_ENC_TUNING_INFO_LOSSLESS;
+      else
+        *tune_info = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+      break;
+    case GST_NV_ENCODER_TUNE_HIGH_QUALITY:
+      *tune_info = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+      break;
+    case GST_NV_ENCODER_TUNE_LOW_LATENCY:
+      *tune_info = NV_ENC_TUNING_INFO_LOW_LATENCY;
+      break;
+    case GST_NV_ENCODER_TUNE_ULTRA_LOW_LATENCY:
+      *tune_info = NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY;
+      break;
+    case GST_NV_ENCODER_TUNE_LOSSLESS:
+      *tune_info = NV_ENC_TUNING_INFO_LOSSLESS;
+      break;
+    default:
+      *tune_info = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+      break;
+  }
+}
+
+void
+gst_nv_encoder_rc_mode_to_native (GstNvEncoderRCMode rc_mode,
+    GstNvEncoderMultiPass multipass, NV_ENC_PARAMS_RC_MODE * rc_mode_native,
+    NV_ENC_MULTI_PASS * multipass_native)
 {
+  gboolean is_hq = FALSE;
   switch (rc_mode) {
     case GST_NV_ENCODER_RC_MODE_CONSTQP:
-      return NV_ENC_PARAMS_RC_CONSTQP;
+      *rc_mode_native = NV_ENC_PARAMS_RC_CONSTQP;
+      break;
     case GST_NV_ENCODER_RC_MODE_VBR:
-      return NV_ENC_PARAMS_RC_VBR;
+      *rc_mode_native = NV_ENC_PARAMS_RC_VBR;
+      break;
     case GST_NV_ENCODER_RC_MODE_CBR:
-      return NV_ENC_PARAMS_RC_CBR;
+      *rc_mode_native = NV_ENC_PARAMS_RC_CBR;
+      break;
     case GST_NV_ENCODER_RC_MODE_CBR_LOWDELAY_HQ:
-      return NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ;
+      is_hq = TRUE;
+      *rc_mode_native = NV_ENC_PARAMS_RC_CBR;
+      break;
     case GST_NV_ENCODER_RC_MODE_CBR_HQ:
-      return NV_ENC_PARAMS_RC_CBR_HQ;
+      is_hq = TRUE;
+      *rc_mode_native = NV_ENC_PARAMS_RC_CBR;
+      break;
     case GST_NV_ENCODER_RC_MODE_VBR_HQ:
-      return NV_ENC_PARAMS_RC_VBR_HQ;
+      is_hq = TRUE;
+      *rc_mode_native = NV_ENC_PARAMS_RC_VBR;
+      break;
     default:
+      *rc_mode_native = NV_ENC_PARAMS_RC_VBR;
       break;
   }
 
-  return NV_ENC_PARAMS_RC_VBR;
-}
-
-const gchar *
-gst_nv_encoder_status_to_string (NVENCSTATUS status)
-{
-#define CASE(err) \
-    case err: \
-    return G_STRINGIFY (err);
-
-  switch (status) {
-      CASE (NV_ENC_SUCCESS);
-      CASE (NV_ENC_ERR_NO_ENCODE_DEVICE);
-      CASE (NV_ENC_ERR_UNSUPPORTED_DEVICE);
-      CASE (NV_ENC_ERR_INVALID_ENCODERDEVICE);
-      CASE (NV_ENC_ERR_INVALID_DEVICE);
-      CASE (NV_ENC_ERR_DEVICE_NOT_EXIST);
-      CASE (NV_ENC_ERR_INVALID_PTR);
-      CASE (NV_ENC_ERR_INVALID_EVENT);
-      CASE (NV_ENC_ERR_INVALID_PARAM);
-      CASE (NV_ENC_ERR_INVALID_CALL);
-      CASE (NV_ENC_ERR_OUT_OF_MEMORY);
-      CASE (NV_ENC_ERR_ENCODER_NOT_INITIALIZED);
-      CASE (NV_ENC_ERR_UNSUPPORTED_PARAM);
-      CASE (NV_ENC_ERR_LOCK_BUSY);
-      CASE (NV_ENC_ERR_NOT_ENOUGH_BUFFER);
-      CASE (NV_ENC_ERR_INVALID_VERSION);
-      CASE (NV_ENC_ERR_MAP_FAILED);
-      CASE (NV_ENC_ERR_NEED_MORE_INPUT);
-      CASE (NV_ENC_ERR_ENCODER_BUSY);
-      CASE (NV_ENC_ERR_EVENT_NOT_REGISTERD);
-      CASE (NV_ENC_ERR_GENERIC);
-      CASE (NV_ENC_ERR_INCOMPATIBLE_CLIENT_KEY);
-      CASE (NV_ENC_ERR_UNIMPLEMENTED);
-      CASE (NV_ENC_ERR_RESOURCE_REGISTER_FAILED);
-      CASE (NV_ENC_ERR_RESOURCE_NOT_REGISTERED);
-      CASE (NV_ENC_ERR_RESOURCE_NOT_MAPPED);
+  switch (multipass) {
+    case GST_NV_ENCODER_MULTI_PASS_DEFAULT:
+      if (is_hq)
+        *multipass_native = NV_ENC_TWO_PASS_QUARTER_RESOLUTION;
+      else
+        *multipass_native = NV_ENC_MULTI_PASS_DISABLED;
+      break;
+    case GST_NV_ENCODER_MULTI_PASS_DISABLED:
+      *multipass_native = NV_ENC_MULTI_PASS_DISABLED;
+      break;
+    case GST_NV_ENCODER_TWO_PASS_QUARTER_RESOLUTION:
+      *multipass_native = NV_ENC_TWO_PASS_QUARTER_RESOLUTION;
+      break;
+    case GST_NV_ENCODER_TWO_PASS_FULL_RESOLUTION:
+      *multipass_native = NV_ENC_TWO_PASS_FULL_RESOLUTION;
+      break;
     default:
+      *multipass_native = NV_ENC_MULTI_PASS_DISABLED;
       break;
   }
-#undef CASE
+}
+
+/**
+ * GstNvEncoderSeiInsertMode:
+ *
+ * Since: 1.24
+ */
+GType
+gst_nv_encoder_sei_insert_mode_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue insert_modes = {
+    /**
+     * GstNvEncoderSeiInsertMode::insert:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_SEI_INSERT, "Insert SEI", "insert"},
+
+    /**
+     * GstNvEncoderSeiInsertMode::insert-and-drop:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_SEI_INSERT_AND_DROP,
+          "Insert SEI and remove corresponding meta from output buffer",
+        "insert-and-drop"},
+
+    /**
+     * GstNvEncoderSeiInsertMode::disabled:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_SEI_DISABLED, "Disable SEI insertion", "disabled"},
+    {0, nullptr, nullptr}
+  };
+
+  GST_CUDA_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstNvEncoderSeiInsertMode", insert_modes);
+  } GST_CUDA_CALL_ONCE_END;
+
+  return type;
+}
+
+/**
+ * GstNvEncoderMultiPass:
+ *
+ * Since: 1.24
+ */
+GType
+gst_nv_encoder_multi_pass_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue modes = {
+    /**
+     * GstNvEncoderMultiPass::disabled:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_MULTI_PASS_DEFAULT,
+        "Disable multi-pass when cqp, vbr or cbr is used. "
+          "Otherwise encoder will select it based on rc-mode", "default"},
+
+    /**
+     * GstNvEncoderMultiPass::disabled:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_MULTI_PASS_DISABLED, "Disabled", "disabled"},
+
+    /**
+     * GstNvEncoderMultiPass::two-pass-quarter:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_TWO_PASS_QUARTER_RESOLUTION,
+          "Two pass with quarter resolution encoding in first pass",
+        "two-pass-quarter"},
+
+    /**
+     * GstNvEncoderMultiPass::two-pass:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_TWO_PASS_FULL_RESOLUTION, "Two pass", "two-pass"},
+    {0, nullptr, nullptr}
+  };
+
+  GST_CUDA_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstNvEncoderMultiPass", modes);
+  } GST_CUDA_CALL_ONCE_END;
+
+  return type;
+}
+
+/**
+ * GstNvEncoderTune:
+ *
+ * Since: 1.24
+ */
+GType
+gst_nv_encoder_tune_get_type (void)
+{
+  static GType type = 0;
+  static const GEnumValue modes = {
+    /**
+     * GstNvEncoderTune::default:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_TUNE_DEFAULT, "High quality when p1~7 preset is used. "
+          "Otherwise encoder will select it based on preset", "default"},
+
+    /**
+     * GstNvEncoderTune::high-quality:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_TUNE_HIGH_QUALITY, "High quality", "high-quality"},
+
+    /**
+     * GstNvEncoderMultiPass::low-latency:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_TUNE_LOW_LATENCY, "Low latency", "low-latency"},
+
+    /**
+     * GstNvEncoderMultiPass::ultra-low-latency:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_TUNE_ULTRA_LOW_LATENCY, "Ultra low latency",
+        "ultra-low-latency"},
+
+    /**
+     * GstNvEncoderMultiPass::lossless:
+     *
+     * Since: 1.24
+     */
+    {GST_NV_ENCODER_TUNE_LOSSLESS, "Lossless", "lossless"},
+    {0, nullptr, nullptr}
+  };
 
-  return "Unknown";
+  GST_CUDA_CALL_ONCE_BEGIN {
+    type = g_enum_register_static ("GstNvEncoderTune", modes);
+  } GST_CUDA_CALL_ONCE_END;
+
+  return type;
 }
 
 GstNvEncoderClassData *
@@ -2427,3 +2718,21 @@
 
   *merged = caps;
 }
+
+gboolean
+_gst_nv_enc_result (NVENCSTATUS status, GObject * self, const gchar * file,
+    const gchar * function, gint line)
+{
+  if (status == NV_ENC_SUCCESS)
+    return TRUE;
+
+#ifndef GST_DISABLE_GST_DEBUG
+  const gchar *status_str = nvenc_status_to_string (status);
+
+  gst_debug_log (GST_CAT_DEFAULT, GST_LEVEL_ERROR, file, function,
+      line, self, "NvEnc API call failed: 0x%x, %s",
+      (guint) status, status_str);
+#endif
+
+  return FALSE;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvencoder.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvencoder.h Changed

@@ -22,15 +22,19 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
 #include <gst/d3d11/gstd3d11.h>
 #endif
 
+#ifdef HAVE_CUDA_GST_GL
+#include <gst/gl/gl.h>
+#endif
+
 #include <string.h>
 
+#include <gst/cuda/gstcuda.h>
 #include "nvEncodeAPI.h"
 #include "gstnvenc.h"
-#include <gst/cuda/gstcudamemory.h>
 
 G_BEGIN_DECLS
 
@@ -65,6 +69,13 @@
   GST_NV_ENCODER_PRESET_LOW_LATENCY_HP,
   GST_NV_ENCODER_PRESET_LOSSLESS_DEFAULT,
   GST_NV_ENCODER_PRESET_LOSSLESS_HP,
+  GST_NV_ENCODER_PRESET_P1,
+  GST_NV_ENCODER_PRESET_P2,
+  GST_NV_ENCODER_PRESET_P3,
+  GST_NV_ENCODER_PRESET_P4,
+  GST_NV_ENCODER_PRESET_P5,
+  GST_NV_ENCODER_PRESET_P6,
+  GST_NV_ENCODER_PRESET_P7,
 } GstNvEncoderPreset;
 
 #define GST_TYPE_NV_ENCODER_RC_MODE (gst_nv_encoder_rc_mode_get_type())
@@ -80,6 +91,37 @@
   GST_NV_ENCODER_RC_MODE_VBR_HQ,
 } GstNvEncoderRCMode;
 
+#define GST_TYPE_NV_ENCODER_SEI_INSERT_MODE (gst_nv_encoder_sei_insert_mode_get_type ())
+GType gst_nv_encoder_sei_insert_mode_get_type (void);
+
+typedef enum
+{
+  GST_NV_ENCODER_SEI_INSERT,
+  GST_NV_ENCODER_SEI_INSERT_AND_DROP,
+  GST_NV_ENCODER_SEI_DISABLED,
+} GstNvEncoderSeiInsertMode;
+
+#define GST_TYPE_NV_ENCODER_MULTI_PASS (gst_nv_encoder_multi_pass_get_type ())
+GType gst_nv_encoder_multi_pass_get_type (void);
+typedef enum
+{
+  GST_NV_ENCODER_MULTI_PASS_DEFAULT = 0,
+  GST_NV_ENCODER_MULTI_PASS_DISABLED = 1,
+  GST_NV_ENCODER_TWO_PASS_QUARTER_RESOLUTION = 2,
+  GST_NV_ENCODER_TWO_PASS_FULL_RESOLUTION = 3,
+} GstNvEncoderMultiPass;
+
+#define GST_TYPE_NV_ENCODER_TUNE (gst_nv_encoder_tune_get_type ())
+GType gst_nv_encoder_tune_get_type (void);
+typedef enum
+{
+  GST_NV_ENCODER_TUNE_DEFAULT = 0,
+  GST_NV_ENCODER_TUNE_HIGH_QUALITY = 1,
+  GST_NV_ENCODER_TUNE_LOW_LATENCY = 2,
+  GST_NV_ENCODER_TUNE_ULTRA_LOW_LATENCY = 3,
+  GST_NV_ENCODER_TUNE_LOSSLESS = 4,
+} GstNvEncoderTune;
+
 typedef struct
 {
   gint max_bframes;
@@ -164,27 +206,6 @@
 
 typedef struct
 {
-  /* without ref */
-  GstNvEncoder *encoder;
-
-  /* Holds ownership */
-  GstBuffer *buffer;
-  GstMapInfo map_info;
-
-  NV_ENC_REGISTER_RESOURCE register_resource;
-  NV_ENC_MAP_INPUT_RESOURCE mapped_resource;
-
-  /* Used when input resource cannot be registered */
-  NV_ENC_CREATE_INPUT_BUFFER input_buffer;
-  NV_ENC_LOCK_INPUT_BUFFER lk_input_buffer;
-
-  NV_ENC_OUTPUT_PTR output_ptr;
-  gpointer event_handle;
-  gboolean is_eos;
-} GstNvEncoderTask;
-
-typedef struct
-{
   GstNvEncoderDeviceMode device_mode;
   guint cuda_device_id;
   gint64 adapter_luid;
@@ -228,16 +249,16 @@
 
 GType gst_nv_encoder_get_type (void);
 
-guint gst_nv_encoder_get_task_size (GstNvEncoder * encoder);
+void gst_nv_encoder_preset_to_native (GstNvEncoderPreset preset,
+                                      GstNvEncoderTune tune,
+                                      GUID * preset_guid,
+                                      NV_ENC_TUNING_INFO * tune_info);
 
-const gchar * gst_nv_encoder_status_to_string (NVENCSTATUS status);
-#define GST_NVENC_STATUS_FORMAT "s (%d)"
-#define GST_NVENC_STATUS_ARGS(s) gst_nv_encoder_status_to_string (s), s
+void gst_nv_encoder_rc_mode_to_native (GstNvEncoderRCMode rc_mode,
+                                       GstNvEncoderMultiPass multipass,
+                                       NV_ENC_PARAMS_RC_MODE * rc_mode_native,
+                                       NV_ENC_MULTI_PASS * multipass_native);
 
-void gst_nv_encoder_preset_to_guid (GstNvEncoderPreset preset,
-                                    GUID * guid);
-
-NV_ENC_PARAMS_RC_MODE gst_nv_encoder_rc_mode_to_native (GstNvEncoderRCMode rc_mode);
 
 void gst_nv_encoder_set_device_mode (GstNvEncoder * encoder,
                                      GstNvEncoderDeviceMode mode,
@@ -258,6 +279,14 @@
                                        const GstNvEncoderDeviceCaps * b,
                                        GstNvEncoderDeviceCaps * merged);
 
+gboolean _gst_nv_enc_result (NVENCSTATUS status,
+                             GObject * self,
+                             const gchar * file,
+                             const gchar * function,
+                             gint line);
+
+#define gst_nv_enc_result(status,self) \
+    _gst_nv_enc_result (status, (GObject *) self, __FILE__, GST_FUNCTION, __LINE__)
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstNvEncoder, gst_object_unref)

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvh264dec.cpp Added

@@ -0,0 +1,1121 @@
+/* GStreamer
+ * Copyright (C) 2017 Ericsson AB. All rights reserved.
+ * Copyright (C) 2019 Seungha Yang <seungha.yang@navercorp.com>
+ * Copyright (C) 2020 Seungha Yang <seungha@centricular.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Copyright 2015 The Chromium Authors. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *    * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * SECTION:element-nvh264sldec
+ * @title: nvh264sldec
+ *
+ * GstCodecs based NVIDIA H.264 video decoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/h264/file ! parsebin ! nvh264sldec ! videoconvert ! autovideosink
+ * ```
+ *
+ * Since: 1.18
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstnvh264dec.h"
+#include "gstnvdecoder.h"
+
+#include <string.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_nv_h264_dec_debug);
+#define GST_CAT_DEFAULT gst_nv_h264_dec_debug
+
+typedef struct _GstNvH264Dec
+{
+  GstH264Decoder parent;
+
+  GstNvDecoder *decoder;
+  CUVIDPICPARAMS params;
+
+  /* slice buffer which will be passed to CUVIDPICPARAMS::pBitstreamData */
+  guint8 *bitstream_buffer;
+  /* allocated memory size of bitstream_buffer */
+  gsize bitstream_buffer_alloc_size;
+  /* current offset of bitstream_buffer (per frame) */
+  gsize bitstream_buffer_offset;
+
+  guint *slice_offsets;
+  guint slice_offsets_alloc_len;
+  guint num_slices;
+
+  guint width, height;
+  guint coded_width, coded_height;
+  guint bitdepth;
+  guint chroma_format_idc;
+  gint max_dpb_size;
+
+  gboolean interlaced;
+
+  GArray *ref_list;
+
+  guint num_output_surfaces;
+  guint init_max_width;
+  guint init_max_height;
+  gint max_display_delay;
+} GstNvH264Dec;
+
+typedef struct _GstNvH264DecClass
+{
+  GstH264DecoderClass parent_class;
+  guint cuda_device_id;
+  gint64 adapter_luid;
+  guint max_width;
+  guint max_height;
+} GstNvH264DecClass;
+
+enum
+{
+  PROP_0,
+  PROP_CUDA_DEVICE_ID,
+  PROP_NUM_OUTPUT_SURFACES,
+  PROP_INIT_MAX_WIDTH,
+  PROP_INIT_MAX_HEIGHT,
+  PROP_MAX_DISPLAY_DELAY,
+};
+
+#define DEFAULT_NUM_OUTPUT_SURFACES 1
+#define DEFAULT_MAX_DISPLAY_DELAY -1
+
+static GTypeClass *parent_class = nullptr;
+
+#define GST_NV_H264_DEC(object) ((GstNvH264Dec *) (object))
+#define GST_NV_H264_DEC_GET_CLASS(object) \
+    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstNvH264DecClass))
+
+static void gst_nv_h264_decoder_finalize (GObject * object);
+static void gst_nv_h264_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_nv_h264_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static void gst_nv_h264_dec_set_context (GstElement * element,
+    GstContext * context);
+static gboolean gst_nv_h264_dec_open (GstVideoDecoder * decoder);
+static gboolean gst_nv_h264_dec_close (GstVideoDecoder * decoder);
+static gboolean gst_nv_h264_dec_stop (GstVideoDecoder * decoder);
+static gboolean gst_nv_h264_dec_negotiate (GstVideoDecoder * decoder);
+static gboolean gst_nv_h264_dec_decide_allocation (GstVideoDecoder *
+    decoder, GstQuery * query);
+static gboolean gst_nv_h264_dec_sink_query (GstVideoDecoder * decoder,
+    GstQuery * query);
+static gboolean gst_nv_h264_dec_src_query (GstVideoDecoder * decoder,
+    GstQuery * query);
+static gboolean gst_nv_h264_dec_sink_event (GstVideoDecoder * decoder,
+    GstEvent * event);
+
+/* GstH264Decoder */
+static GstFlowReturn gst_nv_h264_dec_new_sequence (GstH264Decoder * decoder,
+    const GstH264SPS * sps, gint max_dpb_size);
+static GstFlowReturn gst_nv_h264_dec_new_picture (GstH264Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH264Picture * picture);
+static GstFlowReturn
+gst_nv_h264_dec_new_field_picture (GstH264Decoder * decoder,
+    GstH264Picture * first_field, GstH264Picture * second_field);
+static GstFlowReturn gst_nv_h264_dec_output_picture (GstH264Decoder *
+    decoder, GstVideoCodecFrame * frame, GstH264Picture * picture);
+static GstFlowReturn gst_nv_h264_dec_start_picture (GstH264Decoder * decoder,
+    GstH264Picture * picture, GstH264Slice * slice, GstH264Dpb * dpb);
+static GstFlowReturn gst_nv_h264_dec_decode_slice (GstH264Decoder * decoder,
+    GstH264Picture * picture, GstH264Slice * slice, GArray * ref_pic_list0,
+    GArray * ref_pic_list1);
+static GstFlowReturn gst_nv_h264_dec_end_picture (GstH264Decoder * decoder,
+    GstH264Picture * picture);
+static guint
+gst_nv_h264_dec_get_preferred_output_delay (GstH264Decoder * decoder,
+    gboolean live);
+
+static void
+gst_nv_h264_dec_class_init (GstNvH264DecClass * klass,
+    GstNvDecoderClassData * cdata)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstH264DecoderClass *h264decoder_class = GST_H264_DECODER_CLASS (klass);
+
+  object_class->finalize = gst_nv_h264_decoder_finalize;
+  object_class->set_property = gst_nv_h264_dec_set_property;
+  object_class->get_property = gst_nv_h264_dec_get_property;
+
+  /**
+   * GstNvH264Dec:cuda-device-id:
+   *
+   * Assigned CUDA device id
+   *
+   * Since: 1.22
+   */
+  g_object_class_install_property (object_class, PROP_CUDA_DEVICE_ID,
+      g_param_spec_uint ("cuda-device-id", "CUDA device id",
+          "Assigned CUDA device id", 0, G_MAXINT, 0,
+          (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvH264Dec:num-output-surfaces:
+   *
+   * The number of output surfaces (0 = auto, 1 = always copy).
+   * This property will be used to calculate
+   * the CUVIDDECODECREATEINFO.ulNumOutputSurfaces parameter in case of
+   * CUDA output mode.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_NUM_OUTPUT_SURFACES,
+      g_param_spec_uint ("num-output-surfaces", "Num Output Surfaces",
+          "Maximum number of output surfaces simultaneously mapped in CUDA "
+          "output mode (0 = auto, 1 = always copy)",
+          0, 64, DEFAULT_NUM_OUTPUT_SURFACES,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvH264Dec:init-max-width:
+   *
+   * Initial CUVIDDECODECREATEINFO.ulMaxWidth value
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_INIT_MAX_WIDTH,
+      g_param_spec_uint ("init-max-width", "Initial Maximum Width",
+          "Expected maximum coded width of stream. This value is used to "
+          "pre-allocate higher dimension of output surfaces than "
+          "that of input stream, in order to help decoder reconfiguration",
+          0, cdata->max_width, 0,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvH264Dec:init-max-height:
+   *
+   * Initial CUVIDDECODECREATEINFO.ulMaxHeight value
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_INIT_MAX_HEIGHT,
+      g_param_spec_uint ("init-max-height", "Initial Maximum Height",
+          "Expected maximum coded height of stream. This value is used to "
+          "pre-allocate higher dimension of output surfaces than "
+          "that of input stream, in order to help decoder reconfiguration",
+          0, cdata->max_height, 0,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvH264Dec:max-display-delay:
+   *
+   * Maximum display delay
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_MAX_DISPLAY_DELAY,
+      g_param_spec_int ("max-display-delay", "Max Display Delay",
+          "Improves pipelining of decode with display, 0 means no delay "
+          "(auto = -1)", -1, 16, DEFAULT_MAX_DISPLAY_DELAY,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_set_context);
+
+  parent_class = (GTypeClass *) g_type_class_peek_parent (klass);
+  gst_element_class_set_static_metadata (element_class,
+      "NVDEC H.264 Decoder",
+      "Codec/Decoder/Video/Hardware",
+      "NVIDIA H.264 video decoder", "Seungha Yang <seungha@centricular.com>");
+
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+          cdata->sink_caps));
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+          cdata->src_caps));
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_open);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_close);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_stop);
+  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_sink_query);
+  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_src_query);
+  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_nv_h264_dec_sink_event);
+
+  h264decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_new_sequence);
+  h264decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_new_picture);
+  h264decoder_class->new_field_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_new_field_picture);
+  h264decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_output_picture);
+  h264decoder_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_start_picture);
+  h264decoder_class->decode_slice =
+      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_decode_slice);
+  h264decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_end_picture);
+  h264decoder_class->get_preferred_output_delay =
+      GST_DEBUG_FUNCPTR (gst_nv_h264_dec_get_preferred_output_delay);
+
+  klass->cuda_device_id = cdata->cuda_device_id;
+  klass->adapter_luid = cdata->adapter_luid;
+  klass->max_width = cdata->max_width;
+  klass->max_height = cdata->max_height;
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
+}
+
+static void
+gst_nv_h264_dec_init (GstNvH264Dec * self)
+{
+  GstNvH264DecClass *klass = GST_NV_H264_DEC_GET_CLASS (self);
+
+  self->decoder =
+      gst_nv_decoder_new (klass->cuda_device_id, klass->adapter_luid);
+  self->ref_list = g_array_sized_new (FALSE, TRUE,
+      sizeof (GstH264Picture *), 16);
+  g_array_set_clear_func (self->ref_list,
+      (GDestroyNotify) gst_clear_h264_picture);
+
+  self->num_output_surfaces = DEFAULT_NUM_OUTPUT_SURFACES;
+  self->max_display_delay = DEFAULT_MAX_DISPLAY_DELAY;
+}
+
+static void
+gst_nv_h264_decoder_finalize (GObject * object)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (object);
+
+  g_array_unref (self->ref_list);
+  gst_object_unref (self->decoder);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_nv_h264_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (object);
+
+  switch (prop_id) {
+    case PROP_NUM_OUTPUT_SURFACES:
+      self->num_output_surfaces = g_value_get_uint (value);
+      break;
+    case PROP_INIT_MAX_WIDTH:
+      self->init_max_width = g_value_get_uint (value);
+      break;
+    case PROP_INIT_MAX_HEIGHT:
+      self->init_max_height = g_value_get_uint (value);
+      break;
+    case PROP_MAX_DISPLAY_DELAY:
+      self->max_display_delay = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_h264_dec_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (object);
+  GstNvH264DecClass *klass = GST_NV_H264_DEC_GET_CLASS (object);
+
+  switch (prop_id) {
+    case PROP_CUDA_DEVICE_ID:
+      g_value_set_uint (value, klass->cuda_device_id);
+      break;
+    case PROP_NUM_OUTPUT_SURFACES:
+      g_value_set_uint (value, self->num_output_surfaces);
+      break;
+    case PROP_INIT_MAX_WIDTH:
+      g_value_set_uint (value, self->init_max_width);
+      break;
+    case PROP_INIT_MAX_HEIGHT:
+      g_value_set_uint (value, self->init_max_height);
+      break;
+    case PROP_MAX_DISPLAY_DELAY:
+      g_value_set_int (value, self->max_display_delay);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_h264_dec_set_context (GstElement * element, GstContext * context)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (element);
+
+  gst_nv_decoder_handle_set_context (self->decoder, element, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+/* Clear all codec specific (e.g., SPS) data */
+static void
+gst_d3d11_h264_dec_reset (GstNvH264Dec * self)
+{
+  self->width = 0;
+  self->height = 0;
+  self->coded_width = 0;
+  self->coded_height = 0;
+  self->bitdepth = 0;
+  self->chroma_format_idc = 0;
+  self->max_dpb_size = 0;
+  self->interlaced = FALSE;
+}
+
+static gboolean
+gst_nv_h264_dec_open (GstVideoDecoder * decoder)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+
+  gst_d3d11_h264_dec_reset (self);
+
+  return gst_nv_decoder_open (self->decoder, GST_ELEMENT (decoder));
+}
+
+static gboolean
+gst_nv_h264_dec_close (GstVideoDecoder * decoder)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+
+  g_clear_pointer (&self->bitstream_buffer, g_free);
+  g_clear_pointer (&self->slice_offsets, g_free);
+
+  self->bitstream_buffer_alloc_size = 0;
+  self->slice_offsets_alloc_len = 0;
+
+  return gst_nv_decoder_close (self->decoder);
+}
+
+static gboolean
+gst_nv_h264_dec_stop (GstVideoDecoder * decoder)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+  gboolean ret;
+
+  ret = GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+
+  gst_nv_decoder_reset (self->decoder);
+
+  return ret;
+}
+
+static gboolean
+gst_nv_h264_dec_negotiate (GstVideoDecoder * decoder)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+  GstH264Decoder *h264dec = GST_H264_DECODER (decoder);
+
+  GST_DEBUG_OBJECT (self, "negotiate");
+
+  if (!gst_nv_decoder_negotiate (self->decoder, decoder, h264dec->input_state))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_nv_h264_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+
+  if (!gst_nv_decoder_decide_allocation (self->decoder, decoder, query)) {
+    GST_WARNING_OBJECT (self, "Failed to handle decide allocation");
+    return FALSE;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static gboolean
+gst_nv_h264_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+
+  if (gst_nv_decoder_handle_query (self->decoder, GST_ELEMENT (decoder), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+}
+
+static gboolean
+gst_nv_h264_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+
+  if (gst_nv_decoder_handle_query (self->decoder, GST_ELEMENT (decoder), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+}
+
+static gboolean
+gst_nv_h264_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_FLUSH_START:
+      gst_nv_decoder_set_flushing (self->decoder, TRUE);
+      break;
+    case GST_EVENT_FLUSH_STOP:
+      gst_nv_decoder_set_flushing (self->decoder, FALSE);
+      break;
+    default:
+      break;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstFlowReturn
+gst_nv_h264_dec_new_sequence (GstH264Decoder * decoder, const GstH264SPS * sps,
+    gint max_dpb_size)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+  GstNvH264DecClass *klass = GST_NV_H264_DEC_GET_CLASS (self);
+  guint crop_width, crop_height;
+  gboolean modified = FALSE;
+  gboolean interlaced;
+  guint max_width, max_height;
+
+  GST_LOG_OBJECT (self, "new sequence");
+
+  if (sps->frame_cropping_flag) {
+    crop_width = sps->crop_rect_width;
+    crop_height = sps->crop_rect_height;
+  } else {
+    crop_width = sps->width;
+    crop_height = sps->height;
+  }
+
+  if (self->width != crop_width || self->height != crop_height ||
+      self->coded_width != (guint) sps->width ||
+      self->coded_height != (guint) sps->height) {
+    GST_INFO_OBJECT (self, "resolution changed %dx%d (%dx%d)",
+        crop_width, crop_height, sps->width, sps->height);
+    self->width = crop_width;
+    self->height = crop_height;
+    self->coded_width = sps->width;
+    self->coded_height = sps->height;
+    modified = TRUE;
+  }
+
+  if (self->bitdepth != (guint) sps->bit_depth_luma_minus8 + 8) {
+    GST_INFO_OBJECT (self, "bitdepth changed");
+    self->bitdepth = sps->bit_depth_luma_minus8 + 8;
+    modified = TRUE;
+  }
+
+  if (self->chroma_format_idc != sps->chroma_format_idc) {
+    GST_INFO_OBJECT (self, "chroma format changed");
+    self->chroma_format_idc = sps->chroma_format_idc;
+    modified = TRUE;
+  }
+
+  interlaced = !sps->frame_mbs_only_flag;
+  if (self->interlaced != interlaced) {
+    GST_INFO_OBJECT (self, "interlaced sequence changed");
+    self->interlaced = interlaced;
+    modified = TRUE;
+  }
+
+  if (self->max_dpb_size < max_dpb_size) {
+    GST_INFO_OBJECT (self, "Requires larger DPB size (%d -> %d)",
+        self->max_dpb_size, max_dpb_size);
+    modified = TRUE;
+  }
+
+  if (modified || !gst_nv_decoder_is_configured (self->decoder)) {
+    GstVideoInfo info;
+    GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
+
+    if (self->bitdepth == 8) {
+      if (self->chroma_format_idc == 1)
+        out_format = GST_VIDEO_FORMAT_NV12;
+      else {
+        GST_FIXME_OBJECT (self, "Could not support 8bits non-4:2:0 format");
+      }
+    } else if (self->bitdepth == 10) {
+      if (self->chroma_format_idc == 1)
+        out_format = GST_VIDEO_FORMAT_P010_10LE;
+      else {
+        GST_FIXME_OBJECT (self, "Could not support 10bits non-4:2:0 format");
+      }
+    }
+
+    if (out_format == GST_VIDEO_FORMAT_UNKNOWN) {
+      GST_ERROR_OBJECT (self, "Could not support bitdepth/chroma format");
+      return GST_FLOW_NOT_NEGOTIATED;
+    }
+
+    gst_video_info_set_format (&info, out_format, self->width, self->height);
+    if (self->interlaced)
+      GST_VIDEO_INFO_INTERLACE_MODE (&info) = GST_VIDEO_INTERLACE_MODE_MIXED;
+
+    self->max_dpb_size = max_dpb_size;
+    max_width = gst_nv_decoder_get_max_output_size (self->coded_width,
+        self->init_max_width, klass->max_width);
+    max_height = gst_nv_decoder_get_max_output_size (self->coded_height,
+        self->init_max_height, klass->max_height);
+
+    /* FIXME: add support cudaVideoCodec_H264_SVC and cudaVideoCodec_H264_MVC */
+    if (!gst_nv_decoder_configure (self->decoder,
+            cudaVideoCodec_H264, &info, self->coded_width, self->coded_height,
+            self->bitdepth, max_dpb_size, FALSE, self->num_output_surfaces,
+            max_width, max_height)) {
+      GST_ERROR_OBJECT (self, "Failed to configure decoder");
+      return GST_FLOW_NOT_NEGOTIATED;
+    }
+
+    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+      GST_ERROR_OBJECT (self, "Failed to negotiate with downstream");
+      return GST_FLOW_NOT_NEGOTIATED;
+    }
+
+    memset (&self->params, 0, sizeof (CUVIDPICPARAMS));
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_h264_dec_new_picture (GstH264Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH264Picture * picture)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+
+  return gst_nv_decoder_new_picture (self->decoder,
+      GST_CODEC_PICTURE (picture));
+}
+
+static GstFlowReturn
+gst_nv_h264_dec_new_field_picture (GstH264Decoder * decoder,
+    GstH264Picture * first_field, GstH264Picture * second_field)
+{
+  GstNvDecSurface *surface;
+
+  surface = (GstNvDecSurface *)
+      gst_h264_picture_get_user_data (first_field);
+  if (!surface) {
+    GST_ERROR_OBJECT (decoder,
+        "No decoder frame in the first picture %p", first_field);
+    return GST_FLOW_ERROR;
+  }
+
+  gst_h264_picture_set_user_data (second_field,
+      gst_nv_dec_surface_ref (surface),
+      (GDestroyNotify) gst_nv_dec_surface_unref);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_h264_dec_output_picture (GstH264Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH264Picture * picture)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+
+  return gst_nv_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, GST_CODEC_PICTURE (picture),
+      picture->buffer_flags);
+}
+
+static GstNvDecSurface *
+gst_nv_h264_dec_get_decoder_surface_from_picture (GstNvH264Dec * self,
+    GstH264Picture * picture)
+{
+  GstNvDecSurface *surface;
+
+  surface = (GstNvDecSurface *) gst_h264_picture_get_user_data (picture);
+  if (!surface)
+    GST_DEBUG_OBJECT (self, "current picture does not have decoder surface");
+
+  return surface;
+}
+
+static void
+gst_nv_h264_dec_fill_scaling_list_4x4 (const GstH264PPS * pps,
+    CUVIDH264PICPARAMS * params)
+{
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS (params->WeightScale4x4); i++)
+    gst_h264_quant_matrix_4x4_get_raster_from_zigzag (params->WeightScale4x4i,
+        pps->scaling_lists_4x4i);
+}
+
+static void
+gst_nv_h264_dec_fill_scaling_list_8x8 (const GstH264PPS * pps,
+    CUVIDH264PICPARAMS * params)
+{
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS (params->WeightScale8x8); i++) {
+    gst_h264_quant_matrix_8x8_get_raster_from_zigzag (params->WeightScale8x8i,
+        pps->scaling_lists_8x8i);
+  }
+}
+
+static void
+gst_nv_h264_dec_picture_params_from_sps (GstNvH264Dec * self,
+    const GstH264SPS * sps, gboolean field_pic, CUVIDH264PICPARAMS * params)
+{
+  params->residual_colour_transform_flag = sps->separate_colour_plane_flag;
+  params->MbaffFrameFlag = sps->mb_adaptive_frame_field_flag && !field_pic;
+
+#define COPY_FIELD(f) \
+  (params)->f = (sps)->f
+
+  COPY_FIELD (log2_max_frame_num_minus4);
+  COPY_FIELD (pic_order_cnt_type);
+  COPY_FIELD (log2_max_pic_order_cnt_lsb_minus4);
+  COPY_FIELD (delta_pic_order_always_zero_flag);
+  COPY_FIELD (frame_mbs_only_flag);
+  COPY_FIELD (direct_8x8_inference_flag);
+  COPY_FIELD (num_ref_frames);
+  COPY_FIELD (bit_depth_luma_minus8);
+  COPY_FIELD (bit_depth_chroma_minus8);
+  COPY_FIELD (qpprime_y_zero_transform_bypass_flag);
+
+#undef COPY_FIELD
+}
+
+static void
+gst_nv_h264_dec_picture_params_from_pps (GstNvH264Dec * self,
+    const GstH264PPS * pps, CUVIDH264PICPARAMS * params)
+{
+  params->second_chroma_qp_index_offset = pps->second_chroma_qp_index_offset;
+
+#define COPY_FIELD(f) \
+  (params)->f = (pps)->f
+
+  COPY_FIELD (entropy_coding_mode_flag);
+  COPY_FIELD (pic_order_present_flag);
+  COPY_FIELD (num_ref_idx_l0_active_minus1);
+  COPY_FIELD (num_ref_idx_l1_active_minus1);
+  COPY_FIELD (pic_init_qp_minus26);
+  COPY_FIELD (weighted_pred_flag);
+  COPY_FIELD (weighted_bipred_idc);
+  COPY_FIELD (pic_init_qp_minus26);
+  COPY_FIELD (deblocking_filter_control_present_flag);
+  COPY_FIELD (redundant_pic_cnt_present_flag);
+  COPY_FIELD (transform_8x8_mode_flag);
+  COPY_FIELD (constrained_intra_pred_flag);
+  COPY_FIELD (chroma_qp_index_offset);
+#undef COPY_FIELD
+
+  gst_nv_h264_dec_fill_scaling_list_4x4 (pps, params);
+  gst_nv_h264_dec_fill_scaling_list_8x8 (pps, params);
+}
+
+static void
+gst_nv_h264_dec_reset_bitstream_params (GstNvH264Dec * self)
+{
+  self->bitstream_buffer_offset = 0;
+  self->num_slices = 0;
+
+  self->params.nBitstreamDataLen = 0;
+  self->params.pBitstreamData = nullptr;
+  self->params.nNumSlices = 0;
+  self->params.pSliceDataOffsets = nullptr;
+}
+
+static void
+gst_nv_h264_dec_fill_dpb (GstNvH264Dec * self, GstH264Picture * ref,
+    CUVIDH264DPBENTRY * dpb)
+{
+  GstNvDecSurface *surface;
+
+  dpb->not_existing = ref->nonexisting;
+  dpb->PicIdx = -1;
+
+  surface = gst_nv_h264_dec_get_decoder_surface_from_picture (self, ref);
+  if (!surface) {
+    dpb->not_existing = 1;
+  } else if (!dpb->not_existing) {
+    dpb->PicIdx = surface->index;
+  }
+
+  if (dpb->not_existing)
+    return;
+
+  if (GST_H264_PICTURE_IS_LONG_TERM_REF (ref)) {
+    dpb->FrameIdx = ref->long_term_frame_idx;
+    dpb->is_long_term = 1;
+  } else {
+    dpb->FrameIdx = ref->frame_num;
+    dpb->is_long_term = 0;
+  }
+
+  switch (ref->field) {
+    case GST_H264_PICTURE_FIELD_FRAME:
+      dpb->FieldOrderCnt0 = ref->top_field_order_cnt;
+      dpb->FieldOrderCnt1 = ref->bottom_field_order_cnt;
+      dpb->used_for_reference = 0x3;
+      break;
+    case GST_H264_PICTURE_FIELD_TOP_FIELD:
+      dpb->FieldOrderCnt0 = ref->top_field_order_cnt;
+      dpb->used_for_reference = 0x1;
+      if (ref->other_field) {
+        dpb->FieldOrderCnt1 = ref->other_field->bottom_field_order_cnt;
+        dpb->used_for_reference |= 0x2;
+      } else {
+        dpb->FieldOrderCnt1 = 0;
+      }
+      break;
+    case GST_H264_PICTURE_FIELD_BOTTOM_FIELD:
+      dpb->FieldOrderCnt1 = ref->bottom_field_order_cnt;
+      dpb->used_for_reference = 0x2;
+      if (ref->other_field) {
+        dpb->FieldOrderCnt0 = ref->other_field->bottom_field_order_cnt;
+        dpb->used_for_reference |= 0x1;
+      } else {
+        dpb->FieldOrderCnt0 = 0;
+      }
+      break;
+    default:
+      dpb->FieldOrderCnt0 = 0;
+      dpb->FieldOrderCnt1 = 0;
+      dpb->used_for_reference = 0;
+      break;
+  }
+}
+
+static GstFlowReturn
+gst_nv_h264_dec_start_picture (GstH264Decoder * decoder,
+    GstH264Picture * picture, GstH264Slice * slice, GstH264Dpb * dpb)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+  CUVIDPICPARAMS *params = &self->params;
+  CUVIDH264PICPARAMS *h264_params = &params->CodecSpecific.h264;
+  const GstH264SliceHdr *slice_header = &slice->header;
+  const GstH264SPS *sps;
+  const GstH264PPS *pps;
+  GstNvDecSurface *surface;
+  GArray *ref_list = self->ref_list;
+  guint i, ref_frame_idx;
+
+  g_return_val_if_fail (slice_header->pps != nullptr, GST_FLOW_ERROR);
+  g_return_val_if_fail (slice_header->pps->sequence != nullptr, GST_FLOW_ERROR);
+
+  surface = gst_nv_h264_dec_get_decoder_surface_from_picture (self, picture);
+  if (!surface) {
+    GST_ERROR_OBJECT (self,
+        "Couldn't get decoder frame frame picture %p", picture);
+    return GST_FLOW_ERROR;
+  }
+
+  gst_nv_h264_dec_reset_bitstream_params (self);
+
+  sps = slice_header->pps->sequence;
+  pps = slice_header->pps;
+
+  /* FIXME: update sps/pps related params only when it's required */
+  params->PicWidthInMbs = sps->pic_width_in_mbs_minus1 + 1;
+  if (!sps->frame_mbs_only_flag) {
+    params->FrameHeightInMbs = (sps->pic_height_in_map_units_minus1 + 1) << 1;
+  } else {
+    params->FrameHeightInMbs = sps->pic_height_in_map_units_minus1 + 1;
+  }
+  params->CurrPicIdx = surface->index;
+  params->field_pic_flag = slice_header->field_pic_flag;
+  params->bottom_field_flag =
+      picture->field == GST_H264_PICTURE_FIELD_BOTTOM_FIELD;
+  params->second_field = picture->second_field;
+
+  if (picture->field == GST_H264_PICTURE_FIELD_TOP_FIELD) {
+    h264_params->CurrFieldOrderCnt0 = picture->top_field_order_cnt;
+    h264_params->CurrFieldOrderCnt1 = 0;
+  } else if (picture->field == GST_H264_PICTURE_FIELD_BOTTOM_FIELD) {
+    h264_params->CurrFieldOrderCnt0 = 0;
+    h264_params->CurrFieldOrderCnt1 = picture->bottom_field_order_cnt;
+  } else {
+    h264_params->CurrFieldOrderCnt0 = picture->top_field_order_cnt;
+    h264_params->CurrFieldOrderCnt1 = picture->bottom_field_order_cnt;
+  }
+
+  /* nBitstreamDataLen, pBitstreamData, nNumSlices and pSliceDataOffsets
+   * will be set later */
+
+  params->ref_pic_flag = GST_H264_PICTURE_IS_REF (picture);
+  /* will be updated later, if any slices belong to this frame is not
+   * intra slice */
+  params->intra_pic_flag = 1;
+
+  h264_params->frame_num = picture->frame_num;
+  h264_params->ref_pic_flag = GST_H264_PICTURE_IS_REF (picture);
+
+  gst_nv_h264_dec_picture_params_from_sps (self,
+      sps, slice_header->field_pic_flag, h264_params);
+  gst_nv_h264_dec_picture_params_from_pps (self, pps, h264_params);
+
+  ref_frame_idx = 0;
+  g_array_set_size (ref_list, 0);
+
+  memset (&h264_params->dpb, 0, sizeof (h264_params->dpb));
+  gst_h264_dpb_get_pictures_short_term_ref (dpb, FALSE, FALSE, ref_list);
+  for (i = 0; ref_frame_idx < 16 && i < ref_list->len; i++) {
+    GstH264Picture *other = g_array_index (ref_list, GstH264Picture *, i);
+    gst_nv_h264_dec_fill_dpb (self, other, &h264_params->dpbref_frame_idx);
+    ref_frame_idx++;
+  }
+  g_array_set_size (ref_list, 0);
+
+  gst_h264_dpb_get_pictures_long_term_ref (dpb, FALSE, ref_list);
+  for (i = 0; ref_frame_idx < 16 && i < ref_list->len; i++) {
+    GstH264Picture *other = g_array_index (ref_list, GstH264Picture *, i);
+    gst_nv_h264_dec_fill_dpb (self, other, &h264_params->dpbref_frame_idx);
+    ref_frame_idx++;
+  }
+  g_array_set_size (ref_list, 0);
+
+  for (i = ref_frame_idx; i < 16; i++)
+    h264_params->dpbi.PicIdx = -1;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_h264_dec_decode_slice (GstH264Decoder * decoder,
+    GstH264Picture * picture, GstH264Slice * slice, GArray * ref_pic_list0,
+    GArray * ref_pic_list1)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+  gsize new_size;
+
+  GST_LOG_OBJECT (self, "Decode slice, nalu size %u", slice->nalu.size);
+
+  if (self->slice_offsets_alloc_len < self->num_slices + 1) {
+    self->slice_offsets_alloc_len = 2 * (self->num_slices + 1);
+
+    self->slice_offsets = (guint *) g_realloc_n (self->slice_offsets,
+        self->slice_offsets_alloc_len, sizeof (guint));
+  }
+  self->slice_offsetsself->num_slices = self->bitstream_buffer_offset;
+  GST_LOG_OBJECT (self, "Slice offset %u for slice %d",
+      self->slice_offsetsself->num_slices, self->num_slices);
+
+  self->num_slices++;
+
+  new_size = self->bitstream_buffer_offset + slice->nalu.size + 3;
+  if (self->bitstream_buffer_alloc_size < new_size) {
+    self->bitstream_buffer_alloc_size = 2 * new_size;
+
+    self->bitstream_buffer = (guint8 *) g_realloc (self->bitstream_buffer,
+        self->bitstream_buffer_alloc_size);
+  }
+
+  self->bitstream_bufferself->bitstream_buffer_offset = 0;
+  self->bitstream_bufferself->bitstream_buffer_offset + 1 = 0;
+  self->bitstream_bufferself->bitstream_buffer_offset + 2 = 1;
+
+  memcpy (self->bitstream_buffer + self->bitstream_buffer_offset + 3,
+      slice->nalu.data + slice->nalu.offset, slice->nalu.size);
+  self->bitstream_buffer_offset = new_size;
+
+  if (!GST_H264_IS_I_SLICE (&slice->header) &&
+      !GST_H264_IS_SI_SLICE (&slice->header))
+    self->params.intra_pic_flag = 0;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_h264_dec_end_picture (GstH264Decoder * decoder, GstH264Picture * picture)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+  gboolean ret;
+  CUVIDPICPARAMS *params = &self->params;
+
+  params->nBitstreamDataLen = self->bitstream_buffer_offset;
+  params->pBitstreamData = self->bitstream_buffer;
+  params->nNumSlices = self->num_slices;
+  params->pSliceDataOffsets = self->slice_offsets;
+
+  GST_LOG_OBJECT (self, "End picture, bitstream len: %" G_GSIZE_FORMAT
+      ", num slices %d", self->bitstream_buffer_offset, self->num_slices);
+
+  ret = gst_nv_decoder_decode (self->decoder, &self->params);
+
+  if (!ret) {
+    GST_ERROR_OBJECT (self, "Failed to decode picture");
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static guint
+gst_nv_h264_dec_get_preferred_output_delay (GstH264Decoder * decoder,
+    gboolean live)
+{
+  GstNvH264Dec *self = GST_NV_H264_DEC (decoder);
+
+  if (self->max_display_delay >= 0)
+    return self->max_display_delay;
+
+  /* Prefer to zero latency for live pipeline */
+  if (live)
+    return 0;
+
+  return 2;
+}
+
+void
+gst_nv_h264_dec_register (GstPlugin * plugin, guint device_id,
+    gint64 adapter_luid, guint rank, GstCaps * sink_caps, GstCaps * src_caps)
+{
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  GstNvDecoderClassData *cdata;
+  gint index = 0;
+  const GValue *value;
+  GstStructure *s;
+  GTypeInfo type_info = {
+    sizeof (GstNvH264DecClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_nv_h264_dec_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstNvH264Dec),
+    0,
+    (GInstanceInitFunc) gst_nv_h264_dec_init,
+  };
+
+  GST_DEBUG_CATEGORY_INIT (gst_nv_h264_dec_debug, "nvh264dec", 0, "nvh264dec");
+
+  cdata = g_new0 (GstNvDecoderClassData, 1);
+  cdata->sink_caps = gst_caps_from_string ("video/x-h264, "
+      "stream-format= (string) { avc, avc3, byte-stream }, "
+      "alignment= (string) au, "
+      "profile = (string) { high, main, constrained-high, constrained-baseline, baseline, progressive-high }, "
+      "framerate = " GST_VIDEO_FPS_RANGE);
+
+  s = gst_caps_get_structure (sink_caps, 0);
+  value = gst_structure_get_value (s, "width");
+  cdata->max_width = (guint) gst_value_get_int_range_max (value);
+  gst_caps_set_value (cdata->sink_caps, "width", value);
+
+  value = gst_structure_get_value (s, "height");
+  cdata->max_height = (guint) gst_value_get_int_range_max (value);
+  gst_caps_set_value (cdata->sink_caps, "height", value);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  cdata->src_caps = gst_caps_ref (src_caps);
+  cdata->cuda_device_id = device_id;
+  cdata->adapter_luid = adapter_luid;
+
+  type_name = g_strdup ("GstNvH264Dec");
+  feature_name = g_strdup ("nvh264dec");
+
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstNvH264Device%dDec", index);
+    feature_name = g_strdup_printf ("nvh264device%ddec", index);
+  }
+
+  type_info.class_data = cdata;
+
+  type = g_type_register_static (GST_TYPE_H264_DECODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  /* make lower rank than default device */
+  if (rank > 0 && index > 0)
+    rank--;
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvh264dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvh264dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvh264encoder.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvh264encoder.cpp Changed

@@ -51,6 +51,7 @@
 #include <string>
 #include <set>
 #include <string.h>
+#include <vector>
 
 GST_DEBUG_CATEGORY_STATIC (gst_nv_h264_encoder_debug);
 #define GST_CAT_DEFAULT gst_nv_h264_encoder_debug
@@ -65,6 +66,8 @@
 
   /* init params */
   PROP_PRESET,
+  PROP_TUNE,
+  PROP_MULTI_PASS,
   PROP_WEIGHTED_PRED,
 
   /* encoding config */
@@ -108,7 +111,9 @@
   PROP_REPEAT_SEQUENCE_HEADER,
 };
 
-#define DEFAULT_PRESET            GST_NV_ENCODER_PRESET_DEFAULT
+#define DEFAULT_PRESET            GST_NV_ENCODER_PRESET_P4
+#define DEFAULT_TUNE              GST_NV_ENCODER_TUNE_DEFAULT
+#define DEFAULT_MULTI_PASS        GST_NV_ENCODER_MULTI_PASS_DEFAULT
 #define DEFAULT_WEIGHTED_PRED     FALSE
 #define DEFAULT_GOP_SIZE          30
 #define DEFAULT_B_FRAMES          0
@@ -141,6 +146,8 @@
 
   gboolean packetized;
   GstH264NalParser *parser;
+  GstMemory *sei;
+  GArray *sei_array;
 
   GstNvEncoderDeviceMode selected_device_mode;
 
@@ -149,6 +156,8 @@
   gint64 adapter_luid;
 
   GstNvEncoderPreset preset;
+  GstNvEncoderMultiPass multipass;
+  GstNvEncoderTune tune;
   gboolean weighted_pred;
 
   gint gop_size;
@@ -214,6 +223,7 @@
     GValue * value, GParamSpec * pspec);
 static GstCaps *gst_nv_h264_encoder_getcaps (GstVideoEncoder * encoder,
     GstCaps * filter);
+static gboolean gst_nv_h264_encoder_stop (GstVideoEncoder * encoder);
 static gboolean gst_nv_h264_encoder_set_format (GstNvEncoder * encoder,
     GstVideoCodecState * state, gpointer session,
     NV_ENC_INITIALIZE_PARAMS * init_params, NV_ENC_CONFIG * config);
@@ -294,6 +304,50 @@
       g_param_spec_enum ("preset", "Encoding Preset",
           "Encoding Preset", GST_TYPE_NV_ENCODER_PRESET,
           DEFAULT_PRESET, param_flags));
+
+  /**
+   * GstNvCudaH264Enc:tune:
+   *
+   * Since: 1.24
+   */
+
+  /**
+   * GstNvD3D11H264Enc:tune:
+   *
+   * Since: 1.24
+   */
+
+  /**
+   * GstNvAutoGpuH264Enc:tune:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_TUNE,
+      g_param_spec_enum ("tune", "Tune",
+          "Encoding tune", GST_TYPE_NV_ENCODER_TUNE,
+          DEFAULT_TUNE, param_flags));
+
+  /**
+   * GstNvCudaH264Enc:multi-pass:
+   *
+   * Since: 1.24
+   */
+
+  /**
+   * GstNvD3D11H264Enc:multi-pass:
+   *
+   * Since: 1.24
+   */
+
+  /**
+   * GstNvAutoGpuH264Enc:multi-pass:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_MULTI_PASS,
+      g_param_spec_enum ("multi-pass", "Multi Pass",
+          "Multi pass encoding", GST_TYPE_NV_ENCODER_MULTI_PASS,
+          DEFAULT_MULTI_PASS, param_flags));
   if (dev_caps->weighted_prediction) {
     g_object_class_install_property (object_class, PROP_WEIGHTED_PRED,
         g_param_spec_boolean ("weighted-pred", "Weighted Pred",
@@ -458,6 +512,7 @@
           cdata->src_caps));
 
   videoenc_class->getcaps = GST_DEBUG_FUNCPTR (gst_nv_h264_encoder_getcaps);
+  videoenc_class->stop = GST_DEBUG_FUNCPTR (gst_nv_h264_encoder_stop);
 
   nvenc_class->set_format = GST_DEBUG_FUNCPTR (gst_nv_h264_encoder_set_format);
   nvenc_class->set_output_state =
@@ -496,6 +551,8 @@
   self->cuda_device_id = klass->cuda_device_id;
   self->adapter_luid = klass->adapter_luid;
   self->preset = DEFAULT_PRESET;
+  self->tune = DEFAULT_TUNE;
+  self->multipass = DEFAULT_MULTI_PASS;
   self->weighted_pred = DEFAULT_WEIGHTED_PRED;
   self->gop_size = DEFAULT_GOP_SIZE;
   self->bframes = DEFAULT_B_FRAMES;
@@ -528,6 +585,7 @@
   self->repeat_sequence_header = DEFAULT_REPEAT_SEQUENCE_HEADER;
 
   self->parser = gst_h264_nal_parser_new ();
+  self->sei_array = g_array_new (FALSE, FALSE, sizeof (GstH264SEIMessage));
 
   gst_nv_encoder_set_device_mode (GST_NV_ENCODER (self), klass->device_mode,
       klass->cuda_device_id, klass->adapter_luid);
@@ -540,6 +598,7 @@
 
   g_mutex_clear (&self->prop_lock);
   gst_h264_nal_parser_free (self->parser);
+  g_array_unref (self->sei_array);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -693,6 +752,23 @@
       }
       break;
     }
+    case PROP_TUNE:{
+      GstNvEncoderTune tune = (GstNvEncoderTune) g_value_get_enum (value);
+      if (tune != self->tune) {
+        self->tune = tune;
+        self->init_param_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_MULTI_PASS:{
+      GstNvEncoderMultiPass multipass =
+          (GstNvEncoderMultiPass) g_value_get_enum (value);
+      if (multipass != self->multipass) {
+        self->multipass = multipass;
+        self->init_param_updated = TRUE;
+      }
+      break;
+    }
     case PROP_WEIGHTED_PRED:
       update_boolean (self, &self->weighted_pred, value, UPDATE_INIT_PARAM);
       break;
@@ -766,13 +842,13 @@
       update_int (self, &self->min_qp_b, value, UPDATE_RC_PARAM);
       break;
     case PROP_MAX_QP_I:
-      update_int (self, &self->min_qp_i, value, UPDATE_RC_PARAM);
+      update_int (self, &self->max_qp_i, value, UPDATE_RC_PARAM);
       break;
     case PROP_MAX_QP_P:
-      update_int (self, &self->min_qp_p, value, UPDATE_RC_PARAM);
+      update_int (self, &self->max_qp_p, value, UPDATE_RC_PARAM);
       break;
     case PROP_MAX_QP_B:
-      update_int (self, &self->min_qp_b, value, UPDATE_RC_PARAM);
+      update_int (self, &self->max_qp_b, value, UPDATE_RC_PARAM);
       break;
     case PROP_CONST_QUALITY:
       update_double (self, &self->const_quality, value, UPDATE_RC_PARAM);
@@ -811,6 +887,12 @@
     case PROP_PRESET:
       g_value_set_enum (value, self->preset);
       break;
+    case PROP_TUNE:
+      g_value_set_enum (value, self->tune);
+      break;
+    case PROP_MULTI_PASS:
+      g_value_set_enum (value, self->multipass);
+      break;
     case PROP_WEIGHTED_PRED:
       g_value_set_boolean (value, self->weighted_pred);
       break;
@@ -1040,6 +1122,21 @@
 }
 
 static gboolean
+gst_nv_h264_encoder_stop (GstVideoEncoder * encoder)
+{
+  GstNvH264Encoder *self = GST_NV_H264_ENCODER (encoder);
+
+  if (self->sei) {
+    gst_memory_unref (self->sei);
+    self->sei = nullptr;
+  }
+
+  g_array_set_size (self->sei_array, 0);
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->stop (encoder);
+}
+
+static gboolean
 gst_nv_h264_encoder_set_format (GstNvEncoder * encoder,
     GstVideoCodecState * state, gpointer session,
     NV_ENC_INITIALIZE_PARAMS * init_params, NV_ENC_CONFIG * config)
@@ -1052,7 +1149,6 @@
   NVENCSTATUS status;
   NV_ENC_PRESET_CONFIG preset_config = { 0, };
   gint dar_n, dar_d;
-  GstNvEncoderRCMode rc_mode;
   NV_ENC_CONFIG_H264 *h264_config;
   NV_ENC_CONFIG_H264_VUI_PARAMETERS *vui;
   std::set < std::string > downstream_profiles;
@@ -1194,16 +1290,16 @@
     }
   }
 
-  gst_nv_encoder_preset_to_guid (self->preset, &init_params->presetGUID);
+  gst_nv_encoder_preset_to_native (self->preset, self->tune,
+      &init_params->presetGUID, &init_params->tuningInfo);
 
   preset_config.version = gst_nvenc_get_preset_config_version ();
   preset_config.presetCfg.version = gst_nvenc_get_config_version ();
 
-  status = NvEncGetEncodePresetConfig (session, NV_ENC_CODEC_H264_GUID,
-      init_params->presetGUID, &preset_config);
-  if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self, "Failed to get preset config %"
-        GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
+  status = NvEncGetEncodePresetConfigEx (session, NV_ENC_CODEC_H264_GUID,
+      init_params->presetGUID, init_params->tuningInfo, &preset_config);
+  if (!gst_nv_enc_result (status, self)) {
+    GST_ERROR_OBJECT (self, "Failed to get preset config");
     g_mutex_unlock (&self->prop_lock);
     return FALSE;
   }
@@ -1236,7 +1332,6 @@
   }
 
   rc_params = &config->rcParams;
-  rc_mode = self->rc_mode;
 
   if (self->bitrate)
     rc_params->averageBitRate = self->bitrate * 1024;
@@ -1275,7 +1370,10 @@
     }
   }
 
-  if (rc_mode == GST_NV_ENCODER_RC_MODE_CONSTQP) {
+  gst_nv_encoder_rc_mode_to_native (self->rc_mode, self->multipass,
+      &rc_params->rateControlMode, &rc_params->multiPass);
+
+  if (rc_params->rateControlMode == NV_ENC_PARAMS_RC_CONSTQP) {
     if (self->qp_i >= 0)
       rc_params->constQP.qpIntra = self->qp_i;
     if (self->qp_p >= 0)
@@ -1284,8 +1382,6 @@
       rc_params->constQP.qpInterB = self->qp_b;
   }
 
-  rc_params->rateControlMode = gst_nv_encoder_rc_mode_to_native (rc_mode);
-
   if (self->spatial_aq) {
     rc_params->enableAQ = TRUE;
     rc_params->aqStrength = self->aq_strength;
@@ -1399,6 +1495,64 @@
   if (temporal_aq_aborted)
     g_object_notify (G_OBJECT (self), "temporal-aq");
 
+  if (state->mastering_display_info) {
+    GstH264SEIMessage sei;
+    GstH264MasteringDisplayColourVolume *mdcv;
+
+    memset (&sei, 0, sizeof (GstH264SEIMessage));
+
+    sei.payloadType = GST_H264_SEI_MASTERING_DISPLAY_COLOUR_VOLUME;
+    mdcv = &sei.payload.mastering_display_colour_volume;
+
+    /* AVC uses GBR order */
+    mdcv->display_primaries_x0 =
+        state->mastering_display_info->display_primaries1.x;
+    mdcv->display_primaries_y0 =
+        state->mastering_display_info->display_primaries1.y;
+    mdcv->display_primaries_x1 =
+        state->mastering_display_info->display_primaries2.x;
+    mdcv->display_primaries_y1 =
+        state->mastering_display_info->display_primaries2.y;
+    mdcv->display_primaries_x2 =
+        state->mastering_display_info->display_primaries0.x;
+    mdcv->display_primaries_y2 =
+        state->mastering_display_info->display_primaries0.y;
+
+    mdcv->white_point_x = state->mastering_display_info->white_point.x;
+    mdcv->white_point_y = state->mastering_display_info->white_point.y;
+    mdcv->max_display_mastering_luminance =
+        state->mastering_display_info->max_display_mastering_luminance;
+    mdcv->min_display_mastering_luminance =
+        state->mastering_display_info->min_display_mastering_luminance;
+
+    g_array_append_val (self->sei_array, sei);
+  }
+
+  if (state->content_light_level) {
+    GstH264SEIMessage sei;
+    GstH264ContentLightLevel *cll;
+
+    memset (&sei, 0, sizeof (GstH264SEIMessage));
+
+    sei.payloadType = GST_H264_SEI_CONTENT_LIGHT_LEVEL;
+    cll = &sei.payload.content_light_level;
+
+    cll->max_content_light_level =
+        state->content_light_level->max_content_light_level;
+    cll->max_pic_average_light_level =
+        state->content_light_level->max_frame_average_light_level;
+
+    g_array_append_val (self->sei_array, sei);
+  }
+
+  if (self->sei_array->len > 0) {
+    if (!self->packetized) {
+      self->sei = gst_h264_create_sei_memory (4, self->sei_array);
+    } else {
+      self->sei = gst_h264_create_sei_memory_avc (4, self->sei_array);
+    }
+  }
+
   return TRUE;
 }
 
@@ -1431,9 +1585,8 @@
   seq_params.spsppsBuffer = &spspps;
   seq_params.outSPSPPSPayloadSize = &seq_size;
   status = NvEncGetSequenceParams (session, &seq_params);
-  if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self, "Failed to get sequence header, status %"
-        GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
+  if (!gst_nv_enc_result (status, self)) {
+    GST_ERROR_OBJECT (self, "Failed to get sequence header");
     return FALSE;
   }
 
@@ -1565,41 +1718,69 @@
     NV_ENC_LOCK_BITSTREAM * bitstream)
 {
   GstNvH264Encoder *self = GST_NV_H264_ENCODER (encoder);
-  GstBuffer *buffer;
+  GstBuffer *buffer = nullptr;
   GstH264ParserResult rst;
   GstH264NalUnit nalu;
 
   if (!self->packetized) {
-    return gst_buffer_new_memdup (bitstream->bitstreamBufferPtr,
+    buffer = gst_buffer_new_memdup (bitstream->bitstreamBufferPtr,
         bitstream->bitstreamSizeInBytes);
-  }
-
-  buffer = gst_buffer_new ();
-  rst = gst_h264_parser_identify_nalu (self->parser,
-      (guint8 *) bitstream->bitstreamBufferPtr, 0,
-      bitstream->bitstreamSizeInBytes, &nalu);
-
-  if (rst == GST_H264_PARSER_NO_NAL_END)
-    rst = GST_H264_PARSER_OK;
-
-  while (rst == GST_H264_PARSER_OK) {
-    GstMemory *mem;
+  } else {
+    std::vector < GstH264NalUnit > nalu_list;
+    gsize total_size = 0;
+    GstMapInfo info;
     guint8 *data;
 
-    data = (guint8 *) g_malloc0 (nalu.size + 4);
-    GST_WRITE_UINT32_BE (data, nalu.size);
-    memcpy (data + 4, nalu.data + nalu.offset, nalu.size);
-
-    mem = gst_memory_new_wrapped ((GstMemoryFlags) 0, data, nalu.size + 4,
-        0, nalu.size + 4, data, (GDestroyNotify) g_free);
-    gst_buffer_append_memory (buffer, mem);
-
     rst = gst_h264_parser_identify_nalu (self->parser,
-        (guint8 *) bitstream->bitstreamBufferPtr, nalu.offset + nalu.size,
+        (guint8 *) bitstream->bitstreamBufferPtr, 0,
         bitstream->bitstreamSizeInBytes, &nalu);
 
     if (rst == GST_H264_PARSER_NO_NAL_END)
       rst = GST_H264_PARSER_OK;
+
+    while (rst == GST_H264_PARSER_OK) {
+      nalu_list.push_back (nalu);
+      total_size += nalu.size + 4;
+
+      rst = gst_h264_parser_identify_nalu (self->parser,
+          (guint8 *) bitstream->bitstreamBufferPtr, nalu.offset + nalu.size,
+          bitstream->bitstreamSizeInBytes, &nalu);
+
+      if (rst == GST_H264_PARSER_NO_NAL_END)
+        rst = GST_H264_PARSER_OK;
+    }
+
+    buffer = gst_buffer_new_and_alloc (total_size);
+    gst_buffer_map (buffer, &info, GST_MAP_WRITE);
+    data = (guint8 *) info.data;
+    /* *INDENT-OFF* */
+    for (const auto & it : nalu_list) {
+      GST_WRITE_UINT32_BE (data, it.size);
+      data += 4;
+      memcpy (data, it.data + it.offset, it.size);
+      data += it.size;
+    }
+    /* *INDENT-ON* */
+
+    gst_buffer_unmap (buffer, &info);
+  }
+
+  if (bitstream->pictureType == NV_ENC_PIC_TYPE_IDR && self->sei) {
+    GstBuffer *new_buf = nullptr;
+
+    if (!self->packetized) {
+      new_buf = gst_h264_parser_insert_sei (self->parser, buffer, self->sei);
+    } else {
+      new_buf = gst_h264_parser_insert_sei_avc (self->parser, 4, buffer,
+          self->sei);
+    }
+
+    if (new_buf) {
+      gst_buffer_unref (buffer);
+      buffer = new_buf;
+    } else {
+      GST_WARNING_OBJECT (self, "Couldn't insert SEI memory");
+    }
   }
 
   return buffer;
@@ -1688,7 +1869,7 @@
 
     return TRUE;
   }
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   if (klass->adapter_luid_size > 0 && gst_is_d3d11_memory (mem)) {
     GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
     GstD3D11Device *device = dmem->device;
@@ -1779,6 +1960,17 @@
   GstNvEncoderClassData *cdata;
   GstCaps *sink_caps;
   GstCaps *system_caps;
+  NV_ENC_PRESET_CONFIG preset_config = { 0, };
+
+  preset_config.version = gst_nvenc_get_preset_config_version ();
+  preset_config.presetCfg.version = gst_nvenc_get_config_version ();
+
+  status = NvEncGetEncodePresetConfigEx (session, NV_ENC_CODEC_H264_GUID,
+      NV_ENC_PRESET_P4_GUID, NV_ENC_TUNING_INFO_HIGH_QUALITY, &preset_config);
+  if (status != NV_ENC_SUCCESS) {
+    GST_WARNING_OBJECT (device, "New preset is not supported");
+    return nullptr;
+  }
 
   status = NvEncGetEncodeProfileGUIDs (session, NV_ENC_CODEC_H264_GUID,
       profile_guids, G_N_ELEMENTS (profile_guids), &profile_guid_count);
@@ -1894,7 +2086,7 @@
 
   system_caps = gst_caps_from_string (sink_caps_str.c_str ());
   sink_caps = gst_caps_copy (system_caps);
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   if (device_mode == GST_NV_ENCODER_DEVICE_D3D11) {
     gst_caps_set_features (sink_caps, 0,
         gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, nullptr));
@@ -1904,6 +2096,12 @@
   if (device_mode == GST_NV_ENCODER_DEVICE_CUDA) {
     gst_caps_set_features (sink_caps, 0,
         gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY, nullptr));
+#ifdef HAVE_CUDA_GST_GL
+    GstCaps *gl_caps = gst_caps_copy (system_caps);
+    gst_caps_set_features (gl_caps, 0,
+        gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
+    gst_caps_append (sink_caps, gl_caps);
+#endif
   }
 
   gst_caps_append (sink_caps, system_caps);
@@ -2015,7 +2213,7 @@
   return cdata;
 }
 
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
 GstNvEncoderClassData *
 gst_nv_h264_encoder_register_d3d11 (GstPlugin * plugin, GstD3D11Device * device,
     guint rank)
@@ -2219,7 +2417,7 @@
         gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY, nullptr));
     gst_caps_append (sink_caps, cuda_caps);
   }
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   if (adapter_luid_size > 0) {
     GstCaps *d3d11_caps = gst_caps_copy (system_caps);
     gst_caps_set_features (d3d11_caps, 0,
@@ -2228,6 +2426,13 @@
   }
 #endif
 
+#ifdef HAVE_CUDA_GST_GL
+  GstCaps *gl_caps = gst_caps_copy (system_caps);
+  gst_caps_set_features (gl_caps, 0,
+      gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
+  gst_caps_append (sink_caps, gl_caps);
+#endif
+
   gst_caps_append (sink_caps, system_caps);
 
   cdata = gst_nv_encoder_class_data_new ();

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvh264encoder.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvh264encoder.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvh265dec.cpp Added

@@ -0,0 +1,1242 @@
+/* GStreamer
+ * Copyright (C) 2017 Ericsson AB. All rights reserved.
+ * Copyright (C) 2019 Seungha Yang <seungha.yang@navercorp.com>
+ * Copyright (C) 2020 Seungha Yang <seungha@centricular.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Copyright 2015 The Chromium Authors. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *    * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * SECTION:element-nvh265sldec
+ * @title: nvh265sldec
+ *
+ * GstCodecs based NVIDIA H.265 video decoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/h265/file ! parsebin ! nvh265sldec ! videoconvert ! autovideosink
+ * ```
+ *
+ * Since: 1.18
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/cuda/gstcudautils.h>
+#include "gstnvh265dec.h"
+#include "gstnvdecoder.h"
+
+#include <string.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_nv_h265_dec_debug);
+#define GST_CAT_DEFAULT gst_nv_h265_dec_debug
+
+typedef struct _GstNvH265Dec
+{
+  GstH265Decoder parent;
+
+  GstNvDecoder *decoder;
+  CUVIDPICPARAMS params;
+
+  /* slice buffer which will be passed to CUVIDPICPARAMS::pBitstreamData */
+  guint8 *bitstream_buffer;
+  /* allocated memory size of bitstream_buffer */
+  gsize bitstream_buffer_alloc_size;
+  /* current offset of bitstream_buffer (per frame) */
+  gsize bitstream_buffer_offset;
+
+  guint *slice_offsets;
+  guint slice_offsets_alloc_len;
+  guint num_slices;
+
+  guint width, height;
+  guint coded_width, coded_height;
+  guint bitdepth;
+  guint chroma_format_idc;
+  gint max_dpb_size;
+
+  guint num_output_surfaces;
+  guint init_max_width;
+  guint init_max_height;
+  gint max_display_delay;
+
+  GstVideoFormat out_format;
+} GstNvH265Dec;
+
+typedef struct _GstNvH265DecClass
+{
+  GstH265DecoderClass parent_class;
+  guint cuda_device_id;
+  gint64 adapter_luid;
+  guint max_width;
+  guint max_height;
+} GstNvH265DecClass;
+
+enum
+{
+  PROP_0,
+  PROP_CUDA_DEVICE_ID,
+  PROP_NUM_OUTPUT_SURFACES,
+  PROP_INIT_MAX_WIDTH,
+  PROP_INIT_MAX_HEIGHT,
+  PROP_MAX_DISPLAY_DELAY,
+};
+
+#define DEFAULT_NUM_OUTPUT_SURFACES 1
+#define DEFAULT_MAX_DISPLAY_DELAY -1
+
+static GTypeClass *parent_class = nullptr;
+
+#define GST_NV_H265_DEC(object) ((GstNvH265Dec *) (object))
+#define GST_NV_H265_DEC_GET_CLASS(object) \
+    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstNvH265DecClass))
+
+static void gst_nv_h265_dec_finalize (GObject * object);
+static void gst_nv_h265_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_nv_h265_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static void gst_nv_h265_dec_set_context (GstElement * element,
+    GstContext * context);
+static gboolean gst_nv_h265_dec_open (GstVideoDecoder * decoder);
+static gboolean gst_nv_h265_dec_close (GstVideoDecoder * decoder);
+static gboolean gst_nv_h265_dec_stop (GstVideoDecoder * decoder);
+static gboolean gst_nv_h265_dec_negotiate (GstVideoDecoder * decoder);
+static gboolean gst_nv_h265_dec_decide_allocation (GstVideoDecoder *
+    decoder, GstQuery * query);
+static gboolean gst_nv_h265_dec_sink_query (GstVideoDecoder * decoder,
+    GstQuery * query);
+static gboolean gst_nv_h265_dec_src_query (GstVideoDecoder * decoder,
+    GstQuery * query);
+static gboolean gst_nv_h265_dec_sink_event (GstVideoDecoder * decoder,
+    GstEvent * event);
+
+/* GstH265Decoder */
+static GstFlowReturn gst_nv_h265_dec_new_sequence (GstH265Decoder * decoder,
+    const GstH265SPS * sps, gint max_dpb_size);
+static GstFlowReturn gst_nv_h265_dec_new_picture (GstH265Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH265Picture * picture);
+static GstFlowReturn gst_nv_h265_dec_output_picture (GstH265Decoder *
+    decoder, GstVideoCodecFrame * frame, GstH265Picture * picture);
+static GstFlowReturn gst_nv_h265_dec_start_picture (GstH265Decoder * decoder,
+    GstH265Picture * picture, GstH265Slice * slice, GstH265Dpb * dpb);
+static GstFlowReturn gst_nv_h265_dec_decode_slice (GstH265Decoder * decoder,
+    GstH265Picture * picture, GstH265Slice * slice,
+    GArray * ref_pic_list0, GArray * ref_pic_list1);
+static GstFlowReturn gst_nv_h265_dec_end_picture (GstH265Decoder * decoder,
+    GstH265Picture * picture);
+static guint
+gst_nv_h265_dec_get_preferred_output_delay (GstH265Decoder * decoder,
+    gboolean live);
+
+static void
+gst_nv_h265_dec_class_init (GstNvH265DecClass * klass,
+    GstNvDecoderClassData * cdata)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstH265DecoderClass *h265decoder_class = GST_H265_DECODER_CLASS (klass);
+
+  object_class->finalize = gst_nv_h265_dec_finalize;
+  object_class->set_property = gst_nv_h265_dec_set_property;
+  object_class->get_property = gst_nv_h265_dec_get_property;
+
+  /**
+   * GstNvH265Dec:cuda-device-id:
+   *
+   * Assigned CUDA device id
+   *
+   * Since: 1.22
+   */
+  g_object_class_install_property (object_class, PROP_CUDA_DEVICE_ID,
+      g_param_spec_uint ("cuda-device-id", "CUDA device id",
+          "Assigned CUDA device id", 0, G_MAXINT, 0,
+          (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvH265Dec:num-output-surfaces:
+   *
+   * The number of output surfaces (0 = auto, 1 = always copy).
+   * This property will be used to calculate
+   * the CUVIDDECODECREATEINFO.ulNumOutputSurfaces parameter in case of
+   * CUDA output mode.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_NUM_OUTPUT_SURFACES,
+      g_param_spec_uint ("num-output-surfaces", "Num Output Surfaces",
+          "Maximum number of output surfaces simultaneously mapped in CUDA "
+          "output mode (0 = auto, 1 = always copy)",
+          0, 64, DEFAULT_NUM_OUTPUT_SURFACES,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvH265Dec:init-max-width:
+   *
+   * Initial CUVIDDECODECREATEINFO.ulMaxWidth value
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_INIT_MAX_WIDTH,
+      g_param_spec_uint ("init-max-width", "Initial Maximum Width",
+          "Expected maximum coded width of stream. This value is used to "
+          "pre-allocate higher dimension of output surfaces than "
+          "that of input stream, in order to help decoder reconfiguration",
+          0, cdata->max_width, 0,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvH265Dec:init-max-height:
+   *
+   * Initial CUVIDDECODECREATEINFO.ulMaxHeight value
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_INIT_MAX_HEIGHT,
+      g_param_spec_uint ("init-max-height", "Initial Maximum Height",
+          "Expected maximum coded height of stream. This value is used to "
+          "pre-allocate higher dimension of output surfaces than "
+          "that of input stream, in order to help decoder reconfiguration",
+          0, cdata->max_height, 0,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvH265Dec:max-display-delay:
+   *
+   * Maximum display delay
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_MAX_DISPLAY_DELAY,
+      g_param_spec_int ("max-display-delay", "Max Display Delay",
+          "Improves pipelining of decode with display, 0 means no delay "
+          "(auto = -1)", -1, 16, DEFAULT_MAX_DISPLAY_DELAY,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_set_context);
+
+  parent_class = (GTypeClass *) g_type_class_peek_parent (klass);
+  gst_element_class_set_static_metadata (element_class,
+      "NVDEC H.265 Decoder",
+      "Codec/Decoder/Video/Hardware",
+      "NVIDIA H.265 video decoder", "Seungha Yang <seungha@centricular.com>");
+
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+          cdata->sink_caps));
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+          cdata->src_caps));
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_open);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_close);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_stop);
+  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_sink_query);
+  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_src_query);
+  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_nv_h265_dec_sink_event);
+
+  h265decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_new_sequence);
+  h265decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_new_picture);
+  h265decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_output_picture);
+  h265decoder_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_start_picture);
+  h265decoder_class->decode_slice =
+      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_decode_slice);
+  h265decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_end_picture);
+  h265decoder_class->get_preferred_output_delay =
+      GST_DEBUG_FUNCPTR (gst_nv_h265_dec_get_preferred_output_delay);
+
+  klass->cuda_device_id = cdata->cuda_device_id;
+  klass->adapter_luid = cdata->adapter_luid;
+  klass->max_width = cdata->max_width;
+  klass->max_height = cdata->max_height;
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
+}
+
+static void
+gst_nv_h265_dec_init (GstNvH265Dec * self)
+{
+  GstNvH265DecClass *klass = GST_NV_H265_DEC_GET_CLASS (self);
+
+  self->decoder =
+      gst_nv_decoder_new (klass->cuda_device_id, klass->adapter_luid);
+
+  self->num_output_surfaces = DEFAULT_NUM_OUTPUT_SURFACES;
+  self->max_display_delay = DEFAULT_MAX_DISPLAY_DELAY;
+}
+
+static void
+gst_nv_h265_dec_finalize (GObject * object)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (object);
+
+  gst_object_unref (self->decoder);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_nv_h265_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (object);
+
+  switch (prop_id) {
+    case PROP_NUM_OUTPUT_SURFACES:
+      self->num_output_surfaces = g_value_get_uint (value);
+      break;
+    case PROP_INIT_MAX_WIDTH:
+      self->init_max_width = g_value_get_uint (value);
+      break;
+    case PROP_INIT_MAX_HEIGHT:
+      self->init_max_height = g_value_get_uint (value);
+      break;
+    case PROP_MAX_DISPLAY_DELAY:
+      self->max_display_delay = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_h265_dec_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (object);
+  GstNvH265DecClass *klass = GST_NV_H265_DEC_GET_CLASS (object);
+
+  switch (prop_id) {
+    case PROP_CUDA_DEVICE_ID:
+      g_value_set_uint (value, klass->cuda_device_id);
+      break;
+    case PROP_NUM_OUTPUT_SURFACES:
+      g_value_set_uint (value, self->num_output_surfaces);
+      break;
+    case PROP_INIT_MAX_WIDTH:
+      g_value_set_uint (value, self->init_max_width);
+      break;
+    case PROP_INIT_MAX_HEIGHT:
+      g_value_set_uint (value, self->init_max_height);
+      break;
+    case PROP_MAX_DISPLAY_DELAY:
+      g_value_set_int (value, self->max_display_delay);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_h265_dec_set_context (GstElement * element, GstContext * context)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (element);
+
+  gst_nv_decoder_handle_set_context (self->decoder, element, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static void
+gst_nv_h265_dec_reset (GstNvH265Dec * self)
+{
+  self->width = 0;
+  self->height = 0;
+  self->coded_width = 0;
+  self->coded_height = 0;
+  self->bitdepth = 0;
+  self->chroma_format_idc = 0;
+  self->max_dpb_size = 0;
+}
+
+static gboolean
+gst_nv_h265_dec_open (GstVideoDecoder * decoder)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+
+  gst_nv_h265_dec_reset (self);
+
+  return gst_nv_decoder_open (self->decoder, GST_ELEMENT (decoder));
+}
+
+static gboolean
+gst_nv_h265_dec_close (GstVideoDecoder * decoder)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+
+  g_clear_pointer (&self->bitstream_buffer, g_free);
+  g_clear_pointer (&self->slice_offsets, g_free);
+
+  self->bitstream_buffer_alloc_size = 0;
+  self->slice_offsets_alloc_len = 0;
+
+  return gst_nv_decoder_close (self->decoder);
+}
+
+static gboolean
+gst_nv_h265_dec_stop (GstVideoDecoder * decoder)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+  gboolean ret;
+
+  ret = GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+
+  gst_nv_decoder_reset (self->decoder);
+
+  return ret;
+}
+
+static gboolean
+gst_nv_h265_dec_negotiate (GstVideoDecoder * decoder)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+  GstH265Decoder *h265dec = GST_H265_DECODER (decoder);
+
+  GST_DEBUG_OBJECT (self, "negotiate");
+
+  if (!gst_nv_decoder_negotiate (self->decoder, decoder, h265dec->input_state))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_nv_h265_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+
+  if (!gst_nv_decoder_decide_allocation (self->decoder, decoder, query)) {
+    GST_WARNING_OBJECT (self, "Failed to handle decide allocation");
+    return FALSE;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static gboolean
+gst_nv_h265_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+
+  if (gst_nv_decoder_handle_query (self->decoder, GST_ELEMENT (decoder), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+}
+
+static gboolean
+gst_nv_h265_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+
+  if (gst_nv_decoder_handle_query (self->decoder, GST_ELEMENT (decoder), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+}
+
+static gboolean
+gst_nv_h265_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_FLUSH_START:
+      gst_nv_decoder_set_flushing (self->decoder, TRUE);
+      break;
+    case GST_EVENT_FLUSH_STOP:
+      gst_nv_decoder_set_flushing (self->decoder, FALSE);
+      break;
+    default:
+      break;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstFlowReturn
+gst_nv_h265_dec_new_sequence (GstH265Decoder * decoder, const GstH265SPS * sps,
+    gint max_dpb_size)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+  GstNvH265DecClass *klass = GST_NV_H265_DEC_GET_CLASS (self);
+  guint crop_width, crop_height;
+  gboolean modified = FALSE;
+  guint max_width, max_height;
+  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
+  gboolean is_gbr = FALSE;
+  const GstH265VUIParams *vui = &sps->vui_params;
+
+  GST_LOG_OBJECT (self, "new sequence");
+
+  if (sps->conformance_window_flag) {
+    crop_width = sps->crop_rect_width;
+    crop_height = sps->crop_rect_height;
+  } else {
+    crop_width = sps->width;
+    crop_height = sps->height;
+  }
+
+  if (self->width != crop_width || self->height != crop_height ||
+      self->coded_width != (guint) sps->width ||
+      self->coded_height != (guint) sps->height) {
+    GST_INFO_OBJECT (self, "resolution changed %dx%d (%dx%d)",
+        crop_width, crop_height, sps->width, sps->height);
+    self->width = crop_width;
+    self->height = crop_height;
+    self->coded_width = sps->width;
+    self->coded_height = sps->height;
+    modified = TRUE;
+  }
+
+  if (self->bitdepth != (guint) sps->bit_depth_luma_minus8 + 8) {
+    GST_INFO_OBJECT (self, "bitdepth changed");
+    self->bitdepth = sps->bit_depth_luma_minus8 + 8;
+    modified = TRUE;
+  }
+
+  if (self->chroma_format_idc != sps->chroma_format_idc) {
+    GST_INFO_OBJECT (self, "chroma format changed");
+    self->chroma_format_idc = sps->chroma_format_idc;
+    modified = TRUE;
+  }
+
+  if (self->max_dpb_size < max_dpb_size) {
+    GST_INFO_OBJECT (self, "Requires larger DPB size (%d -> %d)",
+        self->max_dpb_size, max_dpb_size);
+    modified = TRUE;
+  }
+
+  if (sps->chroma_format_idc == 3 && vui->colour_description_present_flag &&
+      gst_video_color_matrix_from_iso (vui->matrix_coefficients) ==
+      GST_VIDEO_COLOR_MATRIX_RGB) {
+    is_gbr = TRUE;
+  }
+
+  switch (self->bitdepth) {
+    case 8:
+      if (self->chroma_format_idc == 1)
+        out_format = GST_VIDEO_FORMAT_NV12;
+      else if (self->chroma_format_idc == 3)
+        out_format = is_gbr ? GST_VIDEO_FORMAT_GBR : GST_VIDEO_FORMAT_Y444;
+      break;
+    case 10:
+      if (self->chroma_format_idc == 1) {
+        out_format = GST_VIDEO_FORMAT_P010_10LE;
+      } else if (self->chroma_format_idc == 3) {
+        out_format = is_gbr ?
+            GST_VIDEO_FORMAT_GBR_16LE : GST_VIDEO_FORMAT_Y444_16LE;
+      }
+      break;
+    case 12:
+      if (self->chroma_format_idc == 1) {
+        out_format = GST_VIDEO_FORMAT_P012_LE;
+      } else if (self->chroma_format_idc == 3) {
+        out_format = is_gbr ?
+            GST_VIDEO_FORMAT_GBR_16LE : GST_VIDEO_FORMAT_Y444_16LE;
+      }
+      break;
+    default:
+      break;
+  }
+
+  if (out_format == GST_VIDEO_FORMAT_UNKNOWN) {
+    GST_ERROR_OBJECT (self,
+        "Could not support bitdepth (%d) / chroma (%d) format", self->bitdepth,
+        self->chroma_format_idc);
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  if (self->out_format != out_format) {
+    if (self->out_format != GST_VIDEO_FORMAT_UNKNOWN) {
+      GST_INFO_OBJECT (self, "Output format changed %s -> %s",
+          gst_video_format_to_string (self->out_format),
+          gst_video_format_to_string (out_format));
+    }
+    self->out_format = out_format;
+    modified = TRUE;
+  }
+
+  if (modified || !gst_nv_decoder_is_configured (self->decoder)) {
+    GstVideoInfo info;
+
+    gst_video_info_set_format (&info,
+        self->out_format, self->width, self->height);
+
+    self->max_dpb_size = max_dpb_size;
+    max_width = gst_nv_decoder_get_max_output_size (self->coded_width,
+        self->init_max_width, klass->max_width);
+    max_height = gst_nv_decoder_get_max_output_size (self->coded_height,
+        self->init_max_height, klass->max_height);
+
+    if (!gst_nv_decoder_configure (self->decoder,
+            cudaVideoCodec_HEVC, &info, self->coded_width, self->coded_height,
+            self->bitdepth, max_dpb_size, FALSE, self->num_output_surfaces,
+            max_width, max_height)) {
+      GST_ERROR_OBJECT (self, "Failed to configure decoder");
+      return GST_FLOW_NOT_NEGOTIATED;
+    }
+
+    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+      GST_ERROR_OBJECT (self, "Failed to negotiate with downstream");
+      return GST_FLOW_NOT_NEGOTIATED;
+    }
+
+    memset (&self->params, 0, sizeof (CUVIDPICPARAMS));
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_h265_dec_new_picture (GstH265Decoder * decoder,
+    GstVideoCodecFrame * cframe, GstH265Picture * picture)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+
+  return gst_nv_decoder_new_picture (self->decoder,
+      GST_CODEC_PICTURE (picture));
+}
+
+static GstFlowReturn
+gst_nv_h265_dec_output_picture (GstH265Decoder * decoder,
+    GstVideoCodecFrame * frame, GstH265Picture * picture)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+
+  return gst_nv_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, GST_CODEC_PICTURE (picture),
+      picture->buffer_flags);
+}
+
+static GstNvDecSurface *
+gst_nv_h265_dec_get_decoder_surface_from_picture (GstNvH265Dec * self,
+    GstH265Picture * picture)
+{
+  GstNvDecSurface *surface;
+
+  surface = (GstNvDecSurface *) gst_h265_picture_get_user_data (picture);
+  if (!surface)
+    GST_DEBUG_OBJECT (self, "current picture does not have decoder frame");
+
+  return surface;
+}
+
+static void
+gst_nv_h265_dec_picture_params_from_sps (GstNvH265Dec * self,
+    const GstH265SPS * sps, CUVIDHEVCPICPARAMS * params)
+{
+#define COPY_FIELD(f) \
+  (params)->f = (sps)->f
+#define COPY_FIELD_WITH_PREFIX(f) \
+  (params)->G_PASTE(sps_,f) = (sps)->f
+#define COPY_FIELD_EXTENSION(f) \
+  (params)->f = (sps)->sps_extension_params.f
+
+  params->pic_width_in_luma_samples = sps->width;
+  params->pic_height_in_luma_samples = sps->height;
+  COPY_FIELD (log2_min_luma_coding_block_size_minus3);
+  COPY_FIELD (log2_diff_max_min_luma_coding_block_size);
+  COPY_FIELD (log2_min_transform_block_size_minus2);
+  COPY_FIELD (log2_diff_max_min_transform_block_size);
+  COPY_FIELD (pcm_enabled_flag);
+  COPY_FIELD (log2_min_pcm_luma_coding_block_size_minus3);
+  COPY_FIELD (log2_diff_max_min_pcm_luma_coding_block_size);
+  COPY_FIELD (pcm_sample_bit_depth_luma_minus1);
+  COPY_FIELD (pcm_sample_bit_depth_chroma_minus1);
+  COPY_FIELD (pcm_loop_filter_disabled_flag);
+  COPY_FIELD (strong_intra_smoothing_enabled_flag);
+  COPY_FIELD (max_transform_hierarchy_depth_intra);
+  COPY_FIELD (max_transform_hierarchy_depth_inter);
+  COPY_FIELD (max_transform_hierarchy_depth_inter);
+  COPY_FIELD (amp_enabled_flag);
+  COPY_FIELD (separate_colour_plane_flag);
+  COPY_FIELD (log2_max_pic_order_cnt_lsb_minus4);
+  COPY_FIELD (num_short_term_ref_pic_sets);
+  COPY_FIELD (long_term_ref_pics_present_flag);
+  COPY_FIELD (num_long_term_ref_pics_sps);
+  COPY_FIELD_WITH_PREFIX (temporal_mvp_enabled_flag);
+  COPY_FIELD (sample_adaptive_offset_enabled_flag);
+
+  params->scaling_list_enable_flag = sps->scaling_list_enabled_flag;
+
+  COPY_FIELD (bit_depth_luma_minus8);
+  COPY_FIELD (bit_depth_chroma_minus8);
+
+  /* Extension fields */
+  COPY_FIELD (sps_range_extension_flag);
+  if (sps->sps_range_extension_flag) {
+    COPY_FIELD_EXTENSION (high_precision_offsets_enabled_flag);
+    COPY_FIELD_EXTENSION (transform_skip_rotation_enabled_flag);
+    COPY_FIELD_EXTENSION (implicit_rdpcm_enabled_flag);
+    COPY_FIELD_EXTENSION (explicit_rdpcm_enabled_flag);
+    COPY_FIELD_EXTENSION (extended_precision_processing_flag);
+    COPY_FIELD_EXTENSION (intra_smoothing_disabled_flag);
+    COPY_FIELD_EXTENSION (persistent_rice_adaptation_enabled_flag);
+    COPY_FIELD_EXTENSION (cabac_bypass_alignment_enabled_flag);
+  }
+#undef COPY_FIELD
+#undef COPY_FIELD_WITH_PREFIX
+#undef COPY_FIELD_EXTENSION
+}
+
+static gboolean
+gst_nv_h265_dec_picture_params_from_pps (GstNvH265Dec * self,
+    const GstH265PPS * pps, CUVIDHEVCPICPARAMS * params)
+{
+  guint i;
+
+#define COPY_FIELD(f) \
+  (params)->f = (pps)->f
+#define COPY_FIELD_WITH_PREFIX(f) \
+  (params)->G_PASTE(pps_,f) = (pps)->f
+#define COPY_FIELD_EXTENSION(f) \
+  (params)->f = (pps)->pps_extension_params.f
+
+  COPY_FIELD (dependent_slice_segments_enabled_flag);
+  COPY_FIELD (slice_segment_header_extension_present_flag);
+  COPY_FIELD (sign_data_hiding_enabled_flag);
+  COPY_FIELD (cu_qp_delta_enabled_flag);
+  COPY_FIELD (diff_cu_qp_delta_depth);
+  COPY_FIELD (init_qp_minus26);
+  COPY_FIELD_WITH_PREFIX (cb_qp_offset);
+  COPY_FIELD_WITH_PREFIX (cr_qp_offset);
+  COPY_FIELD (constrained_intra_pred_flag);
+  COPY_FIELD (weighted_pred_flag);
+  COPY_FIELD (weighted_bipred_flag);
+  COPY_FIELD (transform_skip_enabled_flag);
+  COPY_FIELD (transquant_bypass_enabled_flag);
+  COPY_FIELD (entropy_coding_sync_enabled_flag);
+  COPY_FIELD (log2_parallel_merge_level_minus2);
+  COPY_FIELD (num_extra_slice_header_bits);
+  COPY_FIELD (loop_filter_across_tiles_enabled_flag);
+  COPY_FIELD (loop_filter_across_slices_enabled_flag);
+  COPY_FIELD (output_flag_present_flag);
+  COPY_FIELD (num_ref_idx_l0_default_active_minus1);
+  COPY_FIELD (num_ref_idx_l1_default_active_minus1);
+  COPY_FIELD (lists_modification_present_flag);
+  COPY_FIELD (cabac_init_present_flag);
+  COPY_FIELD_WITH_PREFIX (slice_chroma_qp_offsets_present_flag);
+  COPY_FIELD (deblocking_filter_override_enabled_flag);
+  COPY_FIELD_WITH_PREFIX (deblocking_filter_disabled_flag);
+  COPY_FIELD_WITH_PREFIX (beta_offset_div2);
+  COPY_FIELD_WITH_PREFIX (tc_offset_div2);
+  COPY_FIELD (tiles_enabled_flag);
+  COPY_FIELD (uniform_spacing_flag);
+
+  if (pps->tiles_enabled_flag) {
+    guint num_tile_columns;
+    guint num_tile_rows;
+
+    COPY_FIELD (num_tile_columns_minus1);
+    COPY_FIELD (num_tile_rows_minus1);
+
+    if (pps->num_tile_columns_minus1 >
+        G_N_ELEMENTS (params->column_width_minus1)) {
+      GST_ERROR_OBJECT (self,
+          "Too large column_width_minus1 %d", pps->num_tile_columns_minus1);
+      return FALSE;
+    }
+
+    if (pps->num_tile_rows_minus1 > G_N_ELEMENTS (params->row_height_minus1)) {
+      GST_ERROR_OBJECT (self,
+          "Too large num_tile_rows_minus1 %d", pps->num_tile_rows_minus1);
+      return FALSE;
+    }
+
+    /* XXX: The size of column_width_minus1 array in CUVIDHEVCPICPARAMS struct
+     * is 21 which is inconsistent with the spec.
+     * Just copy values as many as possible */
+    num_tile_columns = MIN (pps->num_tile_columns_minus1,
+        G_N_ELEMENTS (pps->column_width_minus1));
+    num_tile_rows = MIN (pps->num_tile_rows_minus1,
+        G_N_ELEMENTS (pps->row_height_minus1));
+
+    for (i = 0; i < num_tile_columns; i++)
+      COPY_FIELD (column_width_minus1i);
+
+    for (i = 0; i < num_tile_rows; i++)
+      COPY_FIELD (row_height_minus1i);
+  }
+
+  COPY_FIELD (pps_range_extension_flag);
+  if (pps->pps_range_extension_flag) {
+    COPY_FIELD_EXTENSION (cross_component_prediction_enabled_flag);
+    COPY_FIELD_EXTENSION (chroma_qp_offset_list_enabled_flag);
+    COPY_FIELD_EXTENSION (diff_cu_chroma_qp_offset_depth);
+    COPY_FIELD_EXTENSION (chroma_qp_offset_list_len_minus1);
+    for (i = 0; i < G_N_ELEMENTS (params->cb_qp_offset_list); i++)
+      COPY_FIELD_EXTENSION (cb_qp_offset_listi);
+    for (i = 0; i < G_N_ELEMENTS (params->cr_qp_offset_list); i++)
+      COPY_FIELD_EXTENSION (cr_qp_offset_listi);
+    COPY_FIELD_EXTENSION (log2_sao_offset_scale_luma);
+    COPY_FIELD_EXTENSION (log2_sao_offset_scale_chroma);
+  }
+#undef COPY_FIELD
+#undef COPY_FIELD_WITH_PREFIX
+#undef COPY_FIELD_EXTENSION
+
+  return TRUE;
+}
+
+static void
+gst_nv_h265_dec_reset_bitstream_params (GstNvH265Dec * self)
+{
+  self->bitstream_buffer_offset = 0;
+  self->num_slices = 0;
+
+  self->params.nBitstreamDataLen = 0;
+  self->params.pBitstreamData = nullptr;
+  self->params.nNumSlices = 0;
+  self->params.pSliceDataOffsets = nullptr;
+}
+
+static GstFlowReturn
+gst_nv_h265_dec_start_picture (GstH265Decoder * decoder,
+    GstH265Picture * picture, GstH265Slice * slice, GstH265Dpb * dpb)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+  CUVIDPICPARAMS *params = &self->params;
+  CUVIDHEVCPICPARAMS *h265_params = &params->CodecSpecific.hevc;
+  const GstH265SliceHdr *slice_header = &slice->header;
+  const GstH265SPS *sps;
+  const GstH265PPS *pps;
+  GstNvDecSurface *surface;
+  GArray *dpb_array;
+  guint num_ref_pic;
+  guint i, j, k;
+  const GstH265ScalingList *scaling_list = nullptr;
+
+  /* both NVDEC and h265parser are using the same order */
+  G_STATIC_ASSERT (sizeof (scaling_list->scaling_lists_4x4) ==
+      sizeof (h265_params->ScalingList4x4));
+  G_STATIC_ASSERT (sizeof (scaling_list->scaling_lists_8x8) ==
+      sizeof (h265_params->ScalingList8x8));
+  G_STATIC_ASSERT (sizeof (scaling_list->scaling_lists_16x16) ==
+      sizeof (h265_params->ScalingList16x16));
+  G_STATIC_ASSERT (sizeof (scaling_list->scaling_lists_32x32) ==
+      sizeof (h265_params->ScalingList32x32));
+
+  g_return_val_if_fail (slice_header->pps != nullptr, GST_FLOW_ERROR);
+  g_return_val_if_fail (slice_header->pps->sps != nullptr, GST_FLOW_ERROR);
+
+  surface = gst_nv_h265_dec_get_decoder_surface_from_picture (self, picture);
+  if (!surface) {
+    GST_ERROR_OBJECT (self,
+        "Couldn't get decoder surface frame picture %p", picture);
+    return GST_FLOW_ERROR;
+  }
+
+  gst_nv_h265_dec_reset_bitstream_params (self);
+
+  pps = slice_header->pps;
+  sps = pps->sps;
+
+  /* FIXME: update sps/pps related params only when it's required */
+  params->PicWidthInMbs = sps->pic_width_in_luma_samples / 16;
+  params->FrameHeightInMbs = sps->pic_height_in_luma_samples / 16;
+  params->CurrPicIdx = surface->index;
+
+  /* nBitstreamDataLen, pBitstreamData, nNumSlices and pSliceDataOffsets
+   * will be set later */
+  params->ref_pic_flag = picture->ref;
+  params->intra_pic_flag = GST_H265_IS_NAL_TYPE_IRAP (slice->nalu.type);
+
+  h265_params->IrapPicFlag = GST_H265_IS_NAL_TYPE_IRAP (slice->nalu.type);
+  h265_params->IdrPicFlag = GST_H265_IS_NAL_TYPE_IDR (slice->nalu.type);
+
+  gst_nv_h265_dec_picture_params_from_sps (self, sps, h265_params);
+  if (!gst_nv_h265_dec_picture_params_from_pps (self, pps, h265_params)) {
+    GST_ERROR_OBJECT (self, "Couldn't copy pps");
+    return GST_FLOW_ERROR;
+  }
+
+  /* Fill reference */
+  if (decoder->NumPocStCurrBefore >
+      G_N_ELEMENTS (h265_params->RefPicSetStCurrBefore)) {
+    GST_ERROR_OBJECT (self, "Too many RefPicSetStCurrBefore");
+    return GST_FLOW_ERROR;
+  }
+
+  if (decoder->NumPocStCurrAfter >
+      G_N_ELEMENTS (h265_params->RefPicSetStCurrAfter)) {
+    GST_ERROR_OBJECT (self, "Too many RefPicSetStCurrAfter");
+    return GST_FLOW_ERROR;
+  }
+
+  if (decoder->NumPocLtCurr > G_N_ELEMENTS (h265_params->RefPicSetLtCurr)) {
+    GST_ERROR_OBJECT (self, "Too many RefPicSetLtCurr");
+    return GST_FLOW_ERROR;
+  }
+
+  /* Fill ref list */
+  h265_params->NumBitsForShortTermRPSInSlice =
+      slice_header->short_term_ref_pic_set_size;
+  h265_params->NumDeltaPocsOfRefRpsIdx =
+      slice_header->short_term_ref_pic_sets.NumDeltaPocsOfRefRpsIdx;
+  h265_params->NumPocTotalCurr = decoder->NumPicTotalCurr;
+  h265_params->NumPocStCurrBefore = decoder->NumPocStCurrBefore;
+  h265_params->NumPocStCurrAfter = decoder->NumPocStCurrAfter;
+  h265_params->NumPocLtCurr = decoder->NumPocLtCurr;
+  h265_params->CurrPicOrderCntVal = picture->pic_order_cnt;
+
+  dpb_array = gst_h265_dpb_get_pictures_all (dpb);
+  /* count only referenced frame */
+  num_ref_pic = 0;
+  for (i = 0; i < dpb_array->len; i++) {
+    GstH265Picture *other = g_array_index (dpb_array, GstH265Picture *, i);
+    GstNvDecSurface *other_surface;
+    gint picture_index = -1;
+
+    if (!other->ref)
+      continue;
+
+    if (num_ref_pic >= G_N_ELEMENTS (h265_params->RefPicIdx)) {
+      GST_ERROR_OBJECT (self, "Too many reference frames");
+      return GST_FLOW_ERROR;
+    }
+
+    other_surface =
+        gst_nv_h265_dec_get_decoder_surface_from_picture (self, other);
+    if (other_surface)
+      picture_index = other_surface->index;
+
+    h265_params->RefPicIdxnum_ref_pic = picture_index;
+    h265_params->PicOrderCntValnum_ref_pic = other->pic_order_cnt;
+    h265_params->IsLongTermnum_ref_pic = other->long_term;
+
+    num_ref_pic++;
+  }
+  g_array_unref (dpb_array);
+
+  for (i = 0, j = 0; i < num_ref_pic; i++) {
+    GstH265Picture *other = nullptr;
+
+    while (!other && j < decoder->NumPocStCurrBefore)
+      other = decoder->RefPicSetStCurrBeforej++;
+
+    if (other) {
+      for (k = 0; k < num_ref_pic; k++) {
+        if (h265_params->PicOrderCntValk == other->pic_order_cnt) {
+          h265_params->RefPicSetStCurrBeforei = k;
+          break;
+        }
+      }
+    }
+  }
+
+  for (i = 0, j = 0; i < num_ref_pic; i++) {
+    GstH265Picture *other = nullptr;
+
+    while (!other && j < decoder->NumPocStCurrAfter)
+      other = decoder->RefPicSetStCurrAfterj++;
+
+    if (other) {
+      for (k = 0; k < num_ref_pic; k++) {
+        if (h265_params->PicOrderCntValk == other->pic_order_cnt) {
+          h265_params->RefPicSetStCurrAfteri = k;
+          break;
+        }
+      }
+    }
+  }
+
+  for (i = 0, j = 0; i < num_ref_pic; i++) {
+    GstH265Picture *other = nullptr;
+
+    while (!other && j < decoder->NumPocLtCurr)
+      other = decoder->RefPicSetLtCurrj++;
+
+    if (other) {
+      for (k = 0; k < num_ref_pic; k++) {
+        if (h265_params->PicOrderCntValk == other->pic_order_cnt) {
+          h265_params->RefPicSetLtCurri = k;
+          break;
+        }
+      }
+    }
+  }
+
+  /* Fill scaling list */
+  if (pps->scaling_list_data_present_flag ||
+      (sps->scaling_list_enabled_flag
+          && !sps->scaling_list_data_present_flag)) {
+    scaling_list = &pps->scaling_list;
+  } else {
+    scaling_list = &sps->scaling_list;
+  }
+
+  memcpy (h265_params->ScalingList4x4, scaling_list->scaling_lists_4x4,
+      sizeof (scaling_list->scaling_lists_4x4));
+  memcpy (h265_params->ScalingList8x8, scaling_list->scaling_lists_8x8,
+      sizeof (scaling_list->scaling_lists_8x8));
+  memcpy (h265_params->ScalingList16x16, scaling_list->scaling_lists_16x16,
+      sizeof (scaling_list->scaling_lists_16x16));
+  memcpy (h265_params->ScalingList32x32, scaling_list->scaling_lists_32x32,
+      sizeof (scaling_list->scaling_lists_32x32));
+
+  for (i = 0; i < G_N_ELEMENTS (h265_params->ScalingListDCCoeff16x16); i++) {
+    h265_params->ScalingListDCCoeff16x16i =
+        scaling_list->scaling_list_dc_coef_minus8_16x16i + 8;
+  }
+
+  for (i = 0; i < G_N_ELEMENTS (h265_params->ScalingListDCCoeff32x32); i++) {
+    h265_params->ScalingListDCCoeff32x32i =
+        scaling_list->scaling_list_dc_coef_minus8_32x32i + 8;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_h265_dec_decode_slice (GstH265Decoder * decoder,
+    GstH265Picture * picture, GstH265Slice * slice,
+    GArray * ref_pic_list0, GArray * ref_pic_list1)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+  gsize new_size;
+
+  GST_LOG_OBJECT (self, "Decode slice, nalu size %u", slice->nalu.size);
+
+  if (self->slice_offsets_alloc_len < self->num_slices + 1) {
+    self->slice_offsets_alloc_len = 2 * (self->num_slices + 1);
+
+    self->slice_offsets = (guint *) g_realloc_n (self->slice_offsets,
+        self->slice_offsets_alloc_len, sizeof (guint));
+  }
+  self->slice_offsetsself->num_slices = self->bitstream_buffer_offset;
+  GST_LOG_OBJECT (self, "Slice offset %u for slice %d",
+      self->slice_offsetsself->num_slices, self->num_slices);
+
+  self->num_slices++;
+
+  new_size = self->bitstream_buffer_offset + slice->nalu.size + 3;
+  if (self->bitstream_buffer_alloc_size < new_size) {
+    self->bitstream_buffer_alloc_size = 2 * new_size;
+
+    self->bitstream_buffer = (guint8 *) g_realloc (self->bitstream_buffer,
+        self->bitstream_buffer_alloc_size);
+  }
+
+  self->bitstream_bufferself->bitstream_buffer_offset = 0;
+  self->bitstream_bufferself->bitstream_buffer_offset + 1 = 0;
+  self->bitstream_bufferself->bitstream_buffer_offset + 2 = 1;
+
+  memcpy (self->bitstream_buffer + self->bitstream_buffer_offset + 3,
+      slice->nalu.data + slice->nalu.offset, slice->nalu.size);
+  self->bitstream_buffer_offset = new_size;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_h265_dec_end_picture (GstH265Decoder * decoder, GstH265Picture * picture)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+  gboolean ret;
+  CUVIDPICPARAMS *params = &self->params;
+
+  params->nBitstreamDataLen = self->bitstream_buffer_offset;
+  params->pBitstreamData = self->bitstream_buffer;
+  params->nNumSlices = self->num_slices;
+  params->pSliceDataOffsets = self->slice_offsets;
+
+  GST_LOG_OBJECT (self, "End picture, bitstream len: %" G_GSIZE_FORMAT
+      ", num slices %d", self->bitstream_buffer_offset, self->num_slices);
+
+  ret = gst_nv_decoder_decode (self->decoder, &self->params);
+
+  if (!ret) {
+    GST_ERROR_OBJECT (self, "Failed to decode picture");
+    return GST_FLOW_ERROR;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static guint
+gst_nv_h265_dec_get_preferred_output_delay (GstH265Decoder * decoder,
+    gboolean live)
+{
+  GstNvH265Dec *self = GST_NV_H265_DEC (decoder);
+
+  if (self->max_display_delay >= 0)
+    return self->max_display_delay;
+
+  /* Prefer to zero latency for live pipeline */
+  if (live)
+    return 0;
+
+  return 2;
+}
+
+void
+gst_nv_h265_dec_register (GstPlugin * plugin, guint device_id,
+    gint64 adapter_luid, guint rank, GstCaps * sink_caps, GstCaps * src_caps)
+{
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  GstNvDecoderClassData *cdata;
+  gint index = 0;
+  GValue value_list = G_VALUE_INIT;
+  GValue value = G_VALUE_INIT;
+  GstStructure *s;
+  const GValue *res_val;
+  GTypeInfo type_info = {
+    sizeof (GstNvH265DecClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_nv_h265_dec_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstNvH265Dec),
+    0,
+    (GInstanceInitFunc) gst_nv_h265_dec_init,
+  };
+
+  GST_DEBUG_CATEGORY_INIT (gst_nv_h265_dec_debug, "nvh265dec", 0, "nvh265dec");
+
+  cdata = g_new0 (GstNvDecoderClassData, 1);
+  cdata->sink_caps = gst_caps_copy (sink_caps);
+
+  s = gst_caps_get_structure (sink_caps, 0);
+  res_val = gst_structure_get_value (s, "width");
+  cdata->max_width = (guint) gst_value_get_int_range_max (res_val);
+
+  res_val = gst_structure_get_value (s, "height");
+  cdata->max_height = (guint) gst_value_get_int_range_max (res_val);
+
+  /* Update stream-format since we support packetized format as well */
+  g_value_init (&value_list, GST_TYPE_LIST);
+  g_value_init (&value, G_TYPE_STRING);
+
+  g_value_set_static_string (&value, "hev1");
+  gst_value_list_append_value (&value_list, &value);
+
+  g_value_set_static_string (&value, "hvc1");
+  gst_value_list_append_value (&value_list, &value);
+
+  g_value_set_static_string (&value, "byte-stream");
+  gst_value_list_append_value (&value_list, &value);
+
+  gst_caps_set_value (cdata->sink_caps, "stream-format", &value_list);
+  g_value_unset (&value);
+  g_value_unset (&value_list);
+
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  cdata->src_caps = gst_caps_ref (src_caps);
+  cdata->cuda_device_id = device_id;
+  cdata->adapter_luid = adapter_luid;
+
+  type_name = g_strdup ("GstNvH265Dec");
+  feature_name = g_strdup ("nvh265dec");
+
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstNvH265Device%dDec", index);
+    feature_name = g_strdup_printf ("nvh265device%ddec", index);
+  }
+
+  type_info.class_data = cdata;
+  type = g_type_register_static (GST_TYPE_H265_DECODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  /* make lower rank than default device */
+  if (rank > 0 && index > 0)
+    rank--;
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvh265dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvh265dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvh265encoder.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvh265encoder.cpp Changed

@@ -51,6 +51,7 @@
 #include <string>
 #include <set>
 #include <string.h>
+#include <vector>
 
 GST_DEBUG_CATEGORY_STATIC (gst_nv_h265_encoder_debug);
 #define GST_CAT_DEFAULT gst_nv_h265_encoder_debug
@@ -65,6 +66,8 @@
 
   /* init params */
   PROP_PRESET,
+  PROP_TUNE,
+  PROP_MULTI_PASS,
   PROP_WEIGHTED_PRED,
 
   /* encoding config */
@@ -107,7 +110,9 @@
   PROP_REPEAT_SEQUENCE_HEADER,
 };
 
-#define DEFAULT_PRESET            GST_NV_ENCODER_PRESET_DEFAULT
+#define DEFAULT_PRESET            GST_NV_ENCODER_PRESET_P4
+#define DEFAULT_TUNE              GST_NV_ENCODER_TUNE_DEFAULT
+#define DEFAULT_MULTI_PASS        GST_NV_ENCODER_MULTI_PASS_DEFAULT
 #define DEFAULT_WEIGHTED_PRED     FALSE
 #define DEFAULT_GOP_SIZE          30
 #define DEFAULT_B_FRAMES          0
@@ -147,6 +152,8 @@
 
   GstNvH265EncoderStreamFormat stream_format;
   GstH265Parser *parser;
+  GstMemory *sei;
+  GArray *sei_array;
 
   GstNvEncoderDeviceMode selected_device_mode;
 
@@ -155,6 +162,8 @@
   gint64 adapter_luid;
 
   GstNvEncoderPreset preset;
+  GstNvEncoderMultiPass multipass;
+  GstNvEncoderTune tune;
   gboolean weighted_pred;
 
   gint gop_size;
@@ -219,6 +228,7 @@
     GValue * value, GParamSpec * pspec);
 static GstCaps *gst_nv_h265_encoder_getcaps (GstVideoEncoder * encoder,
     GstCaps * filter);
+static gboolean gst_nv_h265_encoder_stop (GstVideoEncoder * encoder);
 static gboolean gst_nv_h265_encoder_set_format (GstNvEncoder * encoder,
     GstVideoCodecState * state, gpointer session,
     NV_ENC_INITIALIZE_PARAMS * init_params, NV_ENC_CONFIG * config);
@@ -299,6 +309,50 @@
       g_param_spec_enum ("preset", "Encoding Preset",
           "Encoding Preset", GST_TYPE_NV_ENCODER_PRESET,
           DEFAULT_PRESET, param_flags));
+
+  /**
+   * GstNvCudaH265Enc:tune:
+   *
+   * Since: 1.24
+   */
+
+  /**
+   * GstNvD3D11H265Enc:tune:
+   *
+   * Since: 1.24
+   */
+
+  /**
+   * GstNvAutoGpuH265Enc:tune:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_TUNE,
+      g_param_spec_enum ("tune", "Tune",
+          "Encoding tune", GST_TYPE_NV_ENCODER_TUNE,
+          DEFAULT_TUNE, param_flags));
+
+  /**
+   * GstNvCudaH265Enc:multi-pass:
+   *
+   * Since: 1.24
+   */
+
+  /**
+   * GstNvD3D11H265Enc:multi-pass:
+   *
+   * Since: 1.24
+   */
+
+  /**
+   * GstNvAutoGpuH265Enc:multi-pass:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_MULTI_PASS,
+      g_param_spec_enum ("multi-pass", "Multi Pass",
+          "Multi pass encoding", GST_TYPE_NV_ENCODER_MULTI_PASS,
+          DEFAULT_MULTI_PASS, param_flags));
   if (dev_caps->weighted_prediction) {
     g_object_class_install_property (object_class, PROP_WEIGHTED_PRED,
         g_param_spec_boolean ("weighted-pred", "Weighted Pred",
@@ -459,6 +513,7 @@
           cdata->src_caps));
 
   videoenc_class->getcaps = GST_DEBUG_FUNCPTR (gst_nv_h265_encoder_getcaps);
+  videoenc_class->stop = GST_DEBUG_FUNCPTR (gst_nv_h265_encoder_stop);
 
   nvenc_class->set_format = GST_DEBUG_FUNCPTR (gst_nv_h265_encoder_set_format);
   nvenc_class->set_output_state =
@@ -497,6 +552,8 @@
   self->cuda_device_id = klass->cuda_device_id;
   self->adapter_luid = klass->adapter_luid;
   self->preset = DEFAULT_PRESET;
+  self->tune = DEFAULT_TUNE;
+  self->multipass = DEFAULT_MULTI_PASS;
   self->weighted_pred = DEFAULT_WEIGHTED_PRED;
   self->gop_size = DEFAULT_GOP_SIZE;
   self->bframes = DEFAULT_B_FRAMES;
@@ -527,6 +584,7 @@
   self->repeat_sequence_header = DEFAULT_REPEAT_SEQUENCE_HEADER;
 
   self->parser = gst_h265_parser_new ();
+  self->sei_array = g_array_new (FALSE, FALSE, sizeof (GstH265SEIMessage));
 
   gst_nv_encoder_set_device_mode (GST_NV_ENCODER (self), klass->device_mode,
       klass->cuda_device_id, klass->adapter_luid);
@@ -539,6 +597,7 @@
 
   g_mutex_clear (&self->prop_lock);
   gst_h265_parser_free (self->parser);
+  g_array_unref (self->sei_array);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -692,6 +751,23 @@
       }
       break;
     }
+    case PROP_TUNE:{
+      GstNvEncoderTune tune = (GstNvEncoderTune) g_value_get_enum (value);
+      if (tune != self->tune) {
+        self->tune = tune;
+        self->init_param_updated = TRUE;
+      }
+      break;
+    }
+    case PROP_MULTI_PASS:{
+      GstNvEncoderMultiPass multipass =
+          (GstNvEncoderMultiPass) g_value_get_enum (value);
+      if (multipass != self->multipass) {
+        self->multipass = multipass;
+        self->init_param_updated = TRUE;
+      }
+      break;
+    }
     case PROP_WEIGHTED_PRED:
       update_boolean (self, &self->weighted_pred, value, UPDATE_INIT_PARAM);
       break;
@@ -765,13 +841,13 @@
       update_int (self, &self->min_qp_b, value, UPDATE_RC_PARAM);
       break;
     case PROP_MAX_QP_I:
-      update_int (self, &self->min_qp_i, value, UPDATE_RC_PARAM);
+      update_int (self, &self->max_qp_i, value, UPDATE_RC_PARAM);
       break;
     case PROP_MAX_QP_P:
-      update_int (self, &self->min_qp_p, value, UPDATE_RC_PARAM);
+      update_int (self, &self->max_qp_p, value, UPDATE_RC_PARAM);
       break;
     case PROP_MAX_QP_B:
-      update_int (self, &self->min_qp_b, value, UPDATE_RC_PARAM);
+      update_int (self, &self->max_qp_b, value, UPDATE_RC_PARAM);
       break;
     case PROP_CONST_QUALITY:
       update_double (self, &self->const_quality, value, UPDATE_RC_PARAM);
@@ -807,6 +883,12 @@
     case PROP_PRESET:
       g_value_set_enum (value, self->preset);
       break;
+    case PROP_TUNE:
+      g_value_set_enum (value, self->tune);
+      break;
+    case PROP_MULTI_PASS:
+      g_value_set_enum (value, self->multipass);
+      break;
     case PROP_WEIGHTED_PRED:
       g_value_set_boolean (value, self->weighted_pred);
       break;
@@ -984,8 +1066,10 @@
       allowed_formats.insert("P010_10LE");
     } else if (iter == "main-444") {
       allowed_formats.insert("Y444");
+      allowed_formats.insert("GBR");
     } else if (iter == "main-444-10") {
       allowed_formats.insert("Y444_16LE");
+      allowed_formats.insert("GBR_16LE");
     }
   }
   /* *INDENT-ON* */
@@ -1019,6 +1103,21 @@
 }
 
 static gboolean
+gst_nv_h265_encoder_stop (GstVideoEncoder * encoder)
+{
+  GstNvH265Encoder *self = GST_NV_H265_ENCODER (encoder);
+
+  if (self->sei) {
+    gst_memory_unref (self->sei);
+    self->sei = nullptr;
+  }
+
+  g_array_set_size (self->sei_array, 0);
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->stop (encoder);
+}
+
+static gboolean
 gst_nv_h265_encoder_set_format (GstNvEncoder * encoder,
     GstVideoCodecState * state, gpointer session,
     NV_ENC_INITIALIZE_PARAMS * init_params, NV_ENC_CONFIG * config)
@@ -1031,7 +1130,6 @@
   NVENCSTATUS status;
   NV_ENC_PRESET_CONFIG preset_config = { 0, };
   gint dar_n, dar_d;
-  GstNvEncoderRCMode rc_mode;
   NV_ENC_CONFIG_HEVC *hevc_config;
   NV_ENC_CONFIG_HEVC_VUI_PARAMETERS *vui;
   std::set < std::string > downstream_profiles;
@@ -1074,6 +1172,7 @@
       }
       break;
     case GST_VIDEO_FORMAT_Y444:
+    case GST_VIDEO_FORMAT_GBR:
       if (downstream_profiles.find ("main-444") == downstream_profiles.end ()) {
         GST_ERROR_OBJECT (self, "Downstream does not support 4:4:4 profile");
         return FALSE;
@@ -1083,6 +1182,7 @@
       }
       break;
     case GST_VIDEO_FORMAT_Y444_16LE:
+    case GST_VIDEO_FORMAT_GBR_16LE:
       if (downstream_profiles.find ("main-444-10") ==
           downstream_profiles.end ()) {
         GST_ERROR_OBJECT (self,
@@ -1177,16 +1277,16 @@
     init_params->darHeight = dar_d;
   }
 
-  gst_nv_encoder_preset_to_guid (self->preset, &init_params->presetGUID);
+  gst_nv_encoder_preset_to_native (self->preset, self->tune,
+      &init_params->presetGUID, &init_params->tuningInfo);
 
   preset_config.version = gst_nvenc_get_preset_config_version ();
   preset_config.presetCfg.version = gst_nvenc_get_config_version ();
 
-  status = NvEncGetEncodePresetConfig (session, NV_ENC_CODEC_HEVC_GUID,
-      init_params->presetGUID, &preset_config);
-  if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self, "Failed to get preset config %"
-        GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
+  status = NvEncGetEncodePresetConfigEx (session, NV_ENC_CODEC_HEVC_GUID,
+      init_params->presetGUID, init_params->tuningInfo, &preset_config);
+  if (!gst_nv_enc_result (status, self)) {
+    GST_ERROR_OBJECT (self, "Failed to get preset config");
     g_mutex_unlock (&self->prop_lock);
     return FALSE;
   }
@@ -1211,7 +1311,6 @@
   }
 
   rc_params = &config->rcParams;
-  rc_mode = self->rc_mode;
 
   if (self->bitrate)
     rc_params->averageBitRate = self->bitrate * 1024;
@@ -1250,7 +1349,10 @@
     }
   }
 
-  if (rc_mode == GST_NV_ENCODER_RC_MODE_CONSTQP) {
+  gst_nv_encoder_rc_mode_to_native (self->rc_mode, self->multipass,
+      &rc_params->rateControlMode, &rc_params->multiPass);
+
+  if (rc_params->rateControlMode == NV_ENC_PARAMS_RC_CONSTQP) {
     if (self->qp_i >= 0)
       rc_params->constQP.qpIntra = self->qp_i;
     if (self->qp_p >= 0)
@@ -1259,8 +1361,6 @@
       rc_params->constQP.qpInterB = self->qp_b;
   }
 
-  rc_params->rateControlMode = gst_nv_encoder_rc_mode_to_native (rc_mode);
-
   if (self->spatial_aq) {
     rc_params->enableAQ = TRUE;
     rc_params->aqStrength = self->aq_strength;
@@ -1320,7 +1420,19 @@
   }
 
   vui->colourDescriptionPresentFlag = 1;
-  vui->colourMatrix = gst_video_color_matrix_to_iso (info->colorimetry.matrix);
+  switch (GST_VIDEO_INFO_FORMAT (info)) {
+    case GST_VIDEO_FORMAT_GBR:
+    case GST_VIDEO_FORMAT_GBR_16LE:
+      /* color matrix must be "Identity" */
+      vui->colourMatrix =
+          gst_video_color_matrix_to_iso (GST_VIDEO_COLOR_MATRIX_RGB);
+      break;
+    default:
+      vui->colourMatrix =
+          gst_video_color_matrix_to_iso (info->colorimetry.matrix);
+      break;
+  }
+
   vui->colourPrimaries =
       gst_video_color_primaries_to_iso (info->colorimetry.primaries);
   vui->transferCharacteristics =
@@ -1339,6 +1451,71 @@
   if (temporal_aq_aborted)
     g_object_notify (G_OBJECT (self), "temporal-aq");
 
+  if (self->sei) {
+    gst_memory_unref (self->sei);
+    self->sei = nullptr;
+  }
+
+  g_array_set_size (self->sei_array, 0);
+
+  if (state->mastering_display_info) {
+    GstH265SEIMessage sei;
+    GstH265MasteringDisplayColourVolume *mdcv;
+
+    memset (&sei, 0, sizeof (GstH265SEIMessage));
+
+    sei.payloadType = GST_H265_SEI_MASTERING_DISPLAY_COLOUR_VOLUME;
+    mdcv = &sei.payload.mastering_display_colour_volume;
+
+    /* HEVC uses GBR order */
+    mdcv->display_primaries_x0 =
+        state->mastering_display_info->display_primaries1.x;
+    mdcv->display_primaries_y0 =
+        state->mastering_display_info->display_primaries1.y;
+    mdcv->display_primaries_x1 =
+        state->mastering_display_info->display_primaries2.x;
+    mdcv->display_primaries_y1 =
+        state->mastering_display_info->display_primaries2.y;
+    mdcv->display_primaries_x2 =
+        state->mastering_display_info->display_primaries0.x;
+    mdcv->display_primaries_y2 =
+        state->mastering_display_info->display_primaries0.y;
+
+    mdcv->white_point_x = state->mastering_display_info->white_point.x;
+    mdcv->white_point_y = state->mastering_display_info->white_point.y;
+    mdcv->max_display_mastering_luminance =
+        state->mastering_display_info->max_display_mastering_luminance;
+    mdcv->min_display_mastering_luminance =
+        state->mastering_display_info->min_display_mastering_luminance;
+
+    g_array_append_val (self->sei_array, sei);
+  }
+
+  if (state->content_light_level) {
+    GstH265SEIMessage sei;
+    GstH265ContentLightLevel *cll;
+
+    memset (&sei, 0, sizeof (GstH265SEIMessage));
+
+    sei.payloadType = GST_H265_SEI_CONTENT_LIGHT_LEVEL;
+    cll = &sei.payload.content_light_level;
+
+    cll->max_content_light_level =
+        state->content_light_level->max_content_light_level;
+    cll->max_pic_average_light_level =
+        state->content_light_level->max_frame_average_light_level;
+
+    g_array_append_val (self->sei_array, sei);
+  }
+
+  if (self->sei_array->len > 0) {
+    if (self->stream_format == GST_NV_H265_ENCODER_BYTE_STREAM) {
+      self->sei = gst_h265_create_sei_memory (0, 1, 4, self->sei_array);
+    } else {
+      self->sei = gst_h265_create_sei_memory_hevc (0, 1, 4, self->sei_array);
+    }
+  }
+
   return TRUE;
 }
 
@@ -1378,9 +1555,8 @@
   seq_params.spsppsBuffer = &vpsspspps;
   seq_params.outSPSPPSPayloadSize = &seq_size;
   status = NvEncGetSequenceParams (session, &seq_params);
-  if (status != NV_ENC_SUCCESS) {
-    GST_ERROR_OBJECT (self, "Failed to get sequence header, status %"
-        GST_NVENC_STATUS_FORMAT, GST_NVENC_STATUS_ARGS (status));
+  if (!gst_nv_enc_result (status, self)) {
+    GST_ERROR_OBJECT (self, "Failed to get sequence header");
     return FALSE;
   }
 
@@ -1573,45 +1749,72 @@
 }
 
 static GstBuffer *
-gst_nv_h265_encoder_create_output_buffer (GstNvEncoder *
-    encoder, NV_ENC_LOCK_BITSTREAM * bitstream)
+gst_nv_h265_encoder_create_output_buffer (GstNvEncoder * encoder,
+    NV_ENC_LOCK_BITSTREAM * bitstream)
 {
   GstNvH265Encoder *self = GST_NV_H265_ENCODER (encoder);
-  GstBuffer *buffer;
+  GstBuffer *buffer = nullptr;
   GstH265ParserResult rst;
   GstH265NalUnit nalu;
 
   if (self->stream_format == GST_NV_H265_ENCODER_BYTE_STREAM) {
-    return gst_buffer_new_memdup (bitstream->bitstreamBufferPtr,
+    buffer = gst_buffer_new_memdup (bitstream->bitstreamBufferPtr,
         bitstream->bitstreamSizeInBytes);
-  }
-
-  buffer = gst_buffer_new ();
-  rst = gst_h265_parser_identify_nalu (self->parser,
-      (guint8 *) bitstream->bitstreamBufferPtr, 0,
-      bitstream->bitstreamSizeInBytes, &nalu);
-
-  if (rst == GST_H265_PARSER_NO_NAL_END)
-    rst = GST_H265_PARSER_OK;
-
-  while (rst == GST_H265_PARSER_OK) {
-    GstMemory *mem;
+  } else {
+    std::vector < GstH265NalUnit > nalu_list;
+    gsize total_size = 0;
+    GstMapInfo info;
     guint8 *data;
 
-    data = (guint8 *) g_malloc0 (nalu.size + 4);
-    GST_WRITE_UINT32_BE (data, nalu.size);
-    memcpy (data + 4, nalu.data + nalu.offset, nalu.size);
-
-    mem = gst_memory_new_wrapped ((GstMemoryFlags) 0, data, nalu.size + 4,
-        0, nalu.size + 4, data, (GDestroyNotify) g_free);
-    gst_buffer_append_memory (buffer, mem);
-
     rst = gst_h265_parser_identify_nalu (self->parser,
-        (guint8 *) bitstream->bitstreamBufferPtr, nalu.offset + nalu.size,
+        (guint8 *) bitstream->bitstreamBufferPtr, 0,
         bitstream->bitstreamSizeInBytes, &nalu);
 
     if (rst == GST_H265_PARSER_NO_NAL_END)
       rst = GST_H265_PARSER_OK;
+
+    while (rst == GST_H265_PARSER_OK) {
+      nalu_list.push_back (nalu);
+      total_size += nalu.size + 4;
+
+      rst = gst_h265_parser_identify_nalu (self->parser,
+          (guint8 *) bitstream->bitstreamBufferPtr, nalu.offset + nalu.size,
+          bitstream->bitstreamSizeInBytes, &nalu);
+
+      if (rst == GST_H265_PARSER_NO_NAL_END)
+        rst = GST_H265_PARSER_OK;
+    }
+
+    buffer = gst_buffer_new_and_alloc (total_size);
+    gst_buffer_map (buffer, &info, GST_MAP_WRITE);
+    data = (guint8 *) info.data;
+    /* *INDENT-OFF* */
+    for (const auto & it : nalu_list) {
+      GST_WRITE_UINT32_BE (data, it.size);
+      data += 4;
+      memcpy (data, it.data + it.offset, it.size);
+      data += it.size;
+    }
+    /* *INDENT-ON* */
+    gst_buffer_unmap (buffer, &info);
+  }
+
+  if (bitstream->pictureType == NV_ENC_PIC_TYPE_IDR && self->sei) {
+    GstBuffer *new_buf = nullptr;
+
+    if (self->stream_format == GST_NV_H265_ENCODER_BYTE_STREAM) {
+      new_buf = gst_h265_parser_insert_sei (self->parser, buffer, self->sei);
+    } else {
+      new_buf = gst_h265_parser_insert_sei_hevc (self->parser, 4, buffer,
+          self->sei);
+    }
+
+    if (new_buf) {
+      gst_buffer_unref (buffer);
+      buffer = new_buf;
+    } else {
+      GST_WARNING_OBJECT (self, "Couldn't insert SEI memory");
+    }
   }
 
   return buffer;
@@ -1700,7 +1903,7 @@
 
     return TRUE;
   }
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   if (klass->adapter_luid_size > 0 && gst_is_d3d11_memory (mem)) {
     GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
     GstD3D11Device *device = dmem->device;
@@ -1791,6 +1994,17 @@
   GstNvEncoderClassData *cdata;
   GstCaps *sink_caps;
   GstCaps *system_caps;
+  NV_ENC_PRESET_CONFIG preset_config = { 0, };
+
+  preset_config.version = gst_nvenc_get_preset_config_version ();
+  preset_config.presetCfg.version = gst_nvenc_get_config_version ();
+
+  status = NvEncGetEncodePresetConfigEx (session, NV_ENC_CODEC_HEVC_GUID,
+      NV_ENC_PRESET_P4_GUID, NV_ENC_TUNING_INFO_HIGH_QUALITY, &preset_config);
+  if (status != NV_ENC_SUCCESS) {
+    GST_WARNING_OBJECT (device, "New preset is not supported");
+    return nullptr;
+  }
 
   status = NvEncGetEncodeProfileGUIDs (session, NV_ENC_CODEC_HEVC_GUID,
       profile_guids, G_N_ELEMENTS (profile_guids), &profile_guid_count);
@@ -1814,16 +2028,20 @@
         formats.insert ("NV12");
         break;
       case NV_ENC_BUFFER_FORMAT_YUV444:
-        if (dev_caps.yuv444_encode)
+        if (dev_caps.yuv444_encode) {
           formats.insert ("Y444");
+          formats.insert ("GBR");
+        }
         break;
       case NV_ENC_BUFFER_FORMAT_YUV420_10BIT:
         if (dev_caps.supports_10bit_encode)
           formats.insert ("P010_10LE");
         break;
       case NV_ENC_BUFFER_FORMAT_YUV444_10BIT:
-        if (dev_caps.supports_10bit_encode && dev_caps.yuv444_encode)
+        if (dev_caps.supports_10bit_encode && dev_caps.yuv444_encode) {
           formats.insert ("Y444_16LE");
+          formats.insert ("GBR_16LE");
+        }
         break;
       default:
         break;
@@ -1853,6 +2071,8 @@
     APPEND_STRING (format_str, formats, "P010_10LE");
     APPEND_STRING (format_str, formats, "Y444");
     APPEND_STRING (format_str, formats, "Y444_16LE");
+    APPEND_STRING (format_str, formats, "GBR");
+    APPEND_STRING (format_str, formats, "GBR_16LE");
     format_str += " }";
   }
 
@@ -1904,7 +2124,7 @@
 
   system_caps = gst_caps_from_string (sink_caps_str.c_str ());
   sink_caps = gst_caps_copy (system_caps);
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   if (device_mode == GST_NV_ENCODER_DEVICE_D3D11) {
     gst_caps_set_features (sink_caps, 0,
         gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_D3D11_MEMORY, nullptr));
@@ -1914,6 +2134,12 @@
   if (device_mode == GST_NV_ENCODER_DEVICE_CUDA) {
     gst_caps_set_features (sink_caps, 0,
         gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY, nullptr));
+#ifdef HAVE_CUDA_GST_GL
+    GstCaps *gl_caps = gst_caps_copy (system_caps);
+    gst_caps_set_features (gl_caps, 0,
+        gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
+    gst_caps_append (sink_caps, gl_caps);
+#endif
   }
 
   gst_caps_append (sink_caps, system_caps);
@@ -2025,7 +2251,7 @@
   return cdata;
 }
 
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
 GstNvEncoderClassData *
 gst_nv_h265_encoder_register_d3d11 (GstPlugin * plugin, GstD3D11Device * device,
     guint rank)
@@ -2183,6 +2409,8 @@
     APPEND_STRING (format_str, formats, "P010_10LE");
     APPEND_STRING (format_str, formats, "Y444");
     APPEND_STRING (format_str, formats, "Y444_16LE");
+    APPEND_STRING (format_str, formats, "GBR");
+    APPEND_STRING (format_str, formats, "GBR_16LE");
     format_str += " }";
   }
 
@@ -2223,7 +2451,7 @@
         gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY, nullptr));
     gst_caps_append (sink_caps, cuda_caps);
   }
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
   if (adapter_luid_size > 0) {
     GstCaps *d3d11_caps = gst_caps_copy (system_caps);
     gst_caps_set_features (d3d11_caps, 0,
@@ -2232,6 +2460,13 @@
   }
 #endif
 
+#ifdef HAVE_CUDA_GST_GL
+  GstCaps *gl_caps = gst_caps_copy (system_caps);
+  gst_caps_set_features (gl_caps, 0,
+      gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
+  gst_caps_append (sink_caps, gl_caps);
+#endif
+
   gst_caps_append (sink_caps, system_caps);
 
   cdata = gst_nv_encoder_class_data_new ();

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvh265encoder.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvh265encoder.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvjpegenc.cpp Added

@@ -0,0 +1,1062 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstnvjpegenc.h"
+#include <gst/cuda/gstcuda-private.h>
+#include <gst/video/video.h>
+#include <gmodule.h>
+#include <string>
+#include <mutex>
+
+/**
+ * SECTION:element-nvjpegenc
+ * @title: nvjpegenc
+ *
+ * A nvJPEG library based JPEG encoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 videotestsrc num-buffers=1 ! nvjpegenc ! filesink location=myjpeg.jpg
+ * ```
+ *
+ * Since: 1.24
+ *
+ */
+
+GST_DEBUG_CATEGORY_STATIC (gst_nv_jpeg_enc_debug);
+#define GST_CAT_DEFAULT gst_nv_jpeg_enc_debug
+
+typedef gpointer nvjpegHandle_t;
+typedef gpointer nvjpegEncoderState_t;
+typedef gpointer nvjpegEncoderParams_t;
+
+enum nvjpegStatus_t
+{
+  NVJPEG_STATUS_SUCCESS = 0,
+};
+
+enum nvjpegChromaSubsampling_t
+{
+  NVJPEG_CSS_444 = 0,
+  NVJPEG_CSS_422 = 1,
+  NVJPEG_CSS_420 = 2,
+  NVJPEG_CSS_440 = 3,
+  NVJPEG_CSS_411 = 4,
+  NVJPEG_CSS_410 = 5,
+  NVJPEG_CSS_GRAY = 6,
+  NVJPEG_CSS_410V = 7,
+  NVJPEG_CSS_UNKNOWN = -1
+};
+
+struct nvjpegImage_t
+{
+  unsigned char *channel4;
+  size_t pitch4;
+};
+
+/* *INDENT-OFF* */
+struct GstNvJpegVTable
+{
+  gboolean loaded = FALSE;
+
+  nvjpegStatus_t (*NvjpegCreateSimple) (nvjpegHandle_t * handle);
+  nvjpegStatus_t (*NvjpegDestroy) (nvjpegHandle_t handle);
+
+  nvjpegStatus_t (*NvjpegEncoderStateCreate) (nvjpegHandle_t handle,
+      nvjpegEncoderState_t * state, CUstream stream);
+  nvjpegStatus_t (*NvjpegEncoderStateDestroy) (nvjpegEncoderState_t state);
+
+  nvjpegStatus_t (*NvjpegEncoderParamsCreate) (nvjpegHandle_t handle,
+      nvjpegEncoderParams_t * params, CUstream stream);
+  nvjpegStatus_t (*NvjpegEncoderParamsDestroy) (nvjpegEncoderParams_t params);
+
+  nvjpegStatus_t (*NvjpegEncoderParamsSetQuality) (nvjpegEncoderParams_t params,
+      const int quality, CUstream stream);
+  nvjpegStatus_t (*NvjpegEncoderParamsSetSamplingFactors) (
+      nvjpegEncoderParams_t params, const nvjpegChromaSubsampling_t subsampling,
+      CUstream stream);
+  nvjpegStatus_t (*NvjpegEncodeYUV) (nvjpegHandle_t handle,
+      nvjpegEncoderState_t state, const nvjpegEncoderParams_t params,
+      const nvjpegImage_t * source, nvjpegChromaSubsampling_t subsampling,
+      int width, int height, CUstream stream);
+  nvjpegStatus_t (*NvjpegEncodeRetrieveBitstream) (nvjpegHandle_t handle,
+      nvjpegEncoderState_t state, unsigned char *data, size_t *length,
+      CUstream stream);
+};
+/* *INDENT-ON* */
+
+static GstNvJpegVTable g_vtable = { };
+
+#define LOAD_SYMBOL(name,func) G_STMT_START { \
+  if (!g_module_symbol (module, G_STRINGIFY (name), (gpointer *) &vtable->func)) { \
+    GST_ERROR ("Failed to load '%s', %s", G_STRINGIFY (name), g_module_error()); \
+    return; \
+  } \
+} G_STMT_END;
+
+static gboolean
+gst_nv_jpeg_enc_load_library (void)
+{
+  static GModule *module = nullptr;
+
+  GST_CUDA_CALL_ONCE_BEGIN {
+    gint cuda_version;
+    auto ret = CuDriverGetVersion (&cuda_version);
+    if (ret != CUDA_SUCCESS) {
+      GST_WARNING ("Couldn't get driver version, 0x%x", (guint) ret);
+      return;
+    }
+
+    auto cuda_major_ver = cuda_version / 1000;
+    std::string nvjpeg_lib_name;
+#ifdef G_OS_WIN32
+    nvjpeg_lib_name = "nvjpeg64_" + std::to_string (cuda_major_ver) + ".dll";
+    module = g_module_open (nvjpeg_lib_name.c_str (), G_MODULE_BIND_LAZY);
+#else
+    nvjpeg_lib_name = "libnvjpeg.so";
+    module = g_module_open (nvjpeg_lib_name.c_str (), G_MODULE_BIND_LAZY);
+    if (!module) {
+      nvjpeg_lib_name += "." + std::to_string (cuda_major_ver);
+      module = g_module_open (nvjpeg_lib_name.c_str (), G_MODULE_BIND_LAZY);
+    }
+#endif
+
+    if (!module)
+      return;
+
+    GstNvJpegVTable *vtable = &g_vtable;
+
+    LOAD_SYMBOL (nvjpegCreateSimple, NvjpegCreateSimple);
+    LOAD_SYMBOL (nvjpegDestroy, NvjpegDestroy);
+
+    LOAD_SYMBOL (nvjpegEncoderStateCreate, NvjpegEncoderStateCreate);
+    LOAD_SYMBOL (nvjpegEncoderStateDestroy, NvjpegEncoderStateDestroy);
+
+    LOAD_SYMBOL (nvjpegEncoderParamsCreate, NvjpegEncoderParamsCreate);
+    LOAD_SYMBOL (nvjpegEncoderParamsDestroy, NvjpegEncoderParamsDestroy);
+
+    LOAD_SYMBOL (nvjpegEncoderParamsSetQuality, NvjpegEncoderParamsSetQuality);
+    LOAD_SYMBOL (nvjpegEncoderParamsSetSamplingFactors,
+        NvjpegEncoderParamsSetSamplingFactors);
+    LOAD_SYMBOL (nvjpegEncodeYUV, NvjpegEncodeYUV);
+    LOAD_SYMBOL (nvjpegEncodeRetrieveBitstream, NvjpegEncodeRetrieveBitstream);
+
+    vtable->loaded = TRUE;
+    GST_INFO ("nvjpeg library loaded");
+  }
+  GST_CUDA_CALL_ONCE_END;
+
+  return g_vtable.loaded;
+}
+
+enum
+{
+  PROP_0,
+  PROP_CUDA_DEVICE_ID,
+  PROP_QUALITY,
+};
+
+#define DEFAULT_JPEG_QUALITY 85
+
+static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("image/jpeg, width = " GST_VIDEO_SIZE_RANGE ", "
+        "height = " GST_VIDEO_SIZE_RANGE)
+    );
+
+struct GstNvJpegEncCData
+{
+  guint cuda_device_id;
+  GstCaps *sink_caps;
+  gboolean have_nvrtc;
+};
+
+/* *INDENT-OFF* */
+struct GstNvJpegEncPrivate
+{
+  GstCudaContext *context = nullptr;
+  GstCudaStream *stream = nullptr;
+
+  nvjpegHandle_t handle = nullptr;
+  nvjpegEncoderState_t state = nullptr;
+  nvjpegEncoderParams_t params = nullptr;
+  nvjpegChromaSubsampling_t subsampling;
+
+  CUmodule module = nullptr;
+  CUfunction kernel_func = nullptr;
+  bool launch_kernel = false;
+
+  CUdeviceptr uv2 = { 0, };
+  gint pitch;
+
+  GstVideoInfo info;
+  GstBufferPool *pool = nullptr;
+  GstBuffer *fallback_buf = nullptr;
+
+  std::mutex lock;
+  guint quality = DEFAULT_JPEG_QUALITY;
+  bool quality_updated = false;
+};
+/* *INDENT-ON* */
+
+struct GstNvJpegEnc
+{
+  GstVideoEncoder parent;
+
+  GstNvJpegEncPrivate *priv;
+};
+
+struct GstNvJpegEncClass
+{
+  GstVideoEncoderClass parent_class;
+
+  guint cuda_device_id;
+  gboolean have_nvrtc;
+};
+
+static void gst_nv_jpeg_enc_finalize (GObject * object);
+static void gst_nv_jpeg_enc_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_nv_jpeg_enc_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+static void gst_nv_jpeg_enc_set_context (GstElement * element,
+    GstContext * context);
+static gboolean gst_nv_jpeg_enc_open (GstVideoEncoder * encoder);
+static gboolean gst_nv_jpeg_enc_stop (GstVideoEncoder * encoder);
+static gboolean gst_nv_jpeg_enc_close (GstVideoEncoder * encoder);
+static gboolean gst_nv_jpeg_enc_sink_query (GstVideoEncoder * encoder,
+    GstQuery * query);
+static gboolean gst_nv_jpeg_enc_src_query (GstVideoEncoder * encoder,
+    GstQuery * query);
+static gboolean gst_nv_jpeg_enc_propose_allocation (GstVideoEncoder * encoder,
+    GstQuery * query);
+static gboolean gst_nv_jpeg_enc_set_format (GstVideoEncoder * encoder,
+    GstVideoCodecState * state);
+static GstFlowReturn gst_nv_jpeg_enc_handle_frame (GstVideoEncoder * encoder,
+    GstVideoCodecFrame * frame);
+
+static GstElementClass *parent_class = nullptr;
+
+#define GST_NV_JPEG_ENC(object) ((GstNvJpegEnc *) (object))
+#define GST_NV_JPEG_ENC_GET_CLASS(object) \
+    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstNvJpegEncClass))
+
+static void
+gst_nv_jpeg_enc_class_init (GstNvJpegEncClass * klass, gpointer data)
+{
+  auto object_class = G_OBJECT_CLASS (klass);
+  auto element_class = GST_ELEMENT_CLASS (klass);
+  auto encoder_class = GST_VIDEO_ENCODER_CLASS (klass);
+  auto cdata = (GstNvJpegEncCData *) data;
+
+  parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
+
+  object_class->finalize = gst_nv_jpeg_enc_finalize;
+  object_class->set_property = gst_nv_jpeg_enc_set_property;
+  object_class->get_property = gst_nv_jpeg_enc_get_property;
+
+  g_object_class_install_property (object_class, PROP_CUDA_DEVICE_ID,
+      g_param_spec_uint ("cuda-device-id", "CUDA Device ID",
+          "CUDA device ID of associated GPU", 0, G_MAXINT, 0,
+          (GParamFlags) (GST_PARAM_DOC_SHOW_DEFAULT |
+              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
+
+  g_object_class_install_property (object_class, PROP_QUALITY,
+      g_param_spec_uint ("quality", "Quality",
+          "Quality of encoding", 1, 100, DEFAULT_JPEG_QUALITY,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  gst_element_class_set_static_metadata (element_class,
+      "NVIDIA JPEG Encoder", "Codec/Encoder/Video/Hardware",
+      "Encode JPEG image using nvJPEG library",
+      "Seungha Yang <seungha@centricular.com>");
+
+  auto sink_templ = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+      cdata->sink_caps);
+
+  gst_element_class_add_pad_template (element_class, sink_templ);
+  gst_element_class_add_static_pad_template (element_class, &src_template);
+
+  element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_jpeg_enc_set_context);
+
+  encoder_class->open = GST_DEBUG_FUNCPTR (gst_nv_jpeg_enc_open);
+  encoder_class->stop = GST_DEBUG_FUNCPTR (gst_nv_jpeg_enc_stop);
+  encoder_class->close = GST_DEBUG_FUNCPTR (gst_nv_jpeg_enc_close);
+  encoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_nv_jpeg_enc_sink_query);
+  encoder_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_jpeg_enc_src_query);
+  encoder_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_nv_jpeg_enc_propose_allocation);
+  encoder_class->set_format = GST_DEBUG_FUNCPTR (gst_nv_jpeg_enc_set_format);
+  encoder_class->handle_frame =
+      GST_DEBUG_FUNCPTR (gst_nv_jpeg_enc_handle_frame);
+
+  klass->cuda_device_id = cdata->cuda_device_id;
+  klass->have_nvrtc = cdata->have_nvrtc;
+  gst_caps_unref (cdata->sink_caps);
+  g_free (cdata);
+}
+
+static void
+gst_nv_jpeg_enc_init (GstNvJpegEnc * self)
+{
+  self->priv = new GstNvJpegEncPrivate ();
+}
+
+static void
+gst_nv_jpeg_enc_finalize (GObject * object)
+{
+  auto self = GST_NV_JPEG_ENC (object);
+
+  delete self->priv;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_nv_jpeg_enc_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  auto self = GST_NV_JPEG_ENC (object);
+  auto priv = self->priv;
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  switch (prop_id) {
+    case PROP_QUALITY:
+    {
+      auto quality = g_value_get_uint (value);
+      if (quality != priv->quality) {
+        priv->quality_updated = true;
+        priv->quality = quality;
+      }
+      break;
+    }
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_jpeg_enc_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  auto self = GST_NV_JPEG_ENC (object);
+  auto priv = self->priv;
+  auto klass = GST_NV_JPEG_ENC_GET_CLASS (self);
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  switch (prop_id) {
+    case PROP_CUDA_DEVICE_ID:
+      g_value_set_uint (value, klass->cuda_device_id);
+      break;
+    case PROP_QUALITY:
+      g_value_set_uint (value, priv->quality);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_jpeg_enc_set_context (GstElement * element, GstContext * context)
+{
+  auto self = GST_NV_JPEG_ENC (element);
+  auto priv = self->priv;
+  auto klass = GST_NV_JPEG_ENC_GET_CLASS (self);
+
+  gst_cuda_handle_set_context (element, context, klass->cuda_device_id,
+      &priv->context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+#define KERNEL_MAIN_FUNC "gst_nv_jpec_enc_kernel"
+/* *INDENT-OFF* */
+const static gchar kernel_source =
+"extern \"C\" {\n"
+"__device__ inline unsigned char\n"
+"scale_to_uchar (float val)\n"
+"{\n"
+"  return (unsigned char) __float2int_rz (val * 255.0);\n"
+"}\n"
+"\n"
+"__global__ void\n"
+KERNEL_MAIN_FUNC "(cudaTextureObject_t uv_tex, unsigned char * out_u,\n"
+"    unsigned char * out_v, int width, int height, int stride)\n"
+"{\n"
+"  int x_pos = blockIdx.x * blockDim.x + threadIdx.x;\n"
+"  int y_pos = blockIdx.y * blockDim.y + threadIdx.y;\n"
+"  if (x_pos >= width || y_pos >= height)\n"
+"    return;\n"
+"  float x = 0;\n"
+"  float y = 0;\n"
+"  if (width > 1)\n"
+"    x = (float) x_pos / (width - 1);\n"
+"  if (height > 1)\n"
+"    y = (float) y_pos / (height - 1);\n"
+"  float2 uv = tex2D<float2> (uv_tex, x, y);\n"
+"  unsigned int pos = x_pos + (y_pos * stride);\n"
+"  out_upos = scale_to_uchar (uv.x);\n"
+"  out_vpos = scale_to_uchar (uv.y);\n"
+"}\n"
+"}";
+/* *INDENT-ON* */
+
+static gboolean
+gst_nv_jpeg_enc_open (GstVideoEncoder * encoder)
+{
+  auto self = GST_NV_JPEG_ENC (encoder);
+  auto priv = self->priv;
+  auto klass = GST_NV_JPEG_ENC_GET_CLASS (self);
+
+  GST_DEBUG_OBJECT (self, "Open");
+
+  if (!gst_cuda_ensure_element_context (GST_ELEMENT_CAST (encoder),
+          klass->cuda_device_id, &priv->context)) {
+    GST_ERROR_OBJECT (self, "Couldn't create CUDA context");
+    return FALSE;
+  }
+
+  if (!gst_cuda_context_push (priv->context)) {
+    GST_ERROR_OBJECT (self, "Couldn't push context");
+    return FALSE;
+  }
+
+  if (!priv->module && klass->have_nvrtc) {
+    auto program = gst_cuda_nvrtc_compile_cubin (kernel_source,
+        klass->cuda_device_id);
+    if (!program)
+      program = gst_cuda_nvrtc_compile (kernel_source);
+
+    if (!program) {
+      GST_ERROR_OBJECT (self, "Couldn't compile kernel source");
+      gst_cuda_context_pop (nullptr);
+      return FALSE;
+    }
+
+    auto ret = CuModuleLoadData (&priv->module, program);
+    g_free (program);
+
+    if (!gst_cuda_result (ret)) {
+      GST_ERROR_OBJECT (self, "Couldn't load module");
+      gst_cuda_context_pop (nullptr);
+      return FALSE;
+    }
+
+    ret = CuModuleGetFunction (&priv->kernel_func, priv->module,
+        KERNEL_MAIN_FUNC);
+    if (!gst_cuda_result (ret)) {
+      GST_ERROR_OBJECT (self, "Couldn't get kernel function");
+      gst_cuda_context_pop (nullptr);
+      return FALSE;
+    }
+  }
+
+  auto ret = g_vtable.NvjpegCreateSimple (&priv->handle);
+  gst_cuda_context_pop (nullptr);
+
+  if (ret != NVJPEG_STATUS_SUCCESS) {
+    GST_ERROR_OBJECT (self, "Couldn't create encoder handle");
+    return FALSE;
+  }
+
+  priv->stream = gst_cuda_stream_new (priv->context);
+
+  return TRUE;
+}
+
+static void
+gst_nv_jpeg_enc_reset (GstNvJpegEnc * self)
+{
+  auto priv = self->priv;
+  if (priv->context && gst_cuda_context_push (priv->context)) {
+    if (priv->state)
+      g_vtable.NvjpegEncoderStateDestroy (priv->state);
+
+    if (priv->params)
+      g_vtable.NvjpegEncoderParamsDestroy (priv->params);
+
+    for (guint i = 0; i < G_N_ELEMENTS (priv->uv); i++) {
+      if (priv->uvi) {
+        CuMemFree (priv->uvi);
+        priv->uvi = 0;
+      }
+    }
+
+    gst_cuda_context_pop (nullptr);
+  }
+
+  priv->state = nullptr;
+  priv->params = nullptr;
+  priv->launch_kernel = false;
+
+  gst_clear_buffer (&priv->fallback_buf);
+
+  if (priv->pool) {
+    gst_buffer_pool_set_active (priv->pool, FALSE);
+    gst_clear_object (&priv->pool);
+  }
+}
+
+static gboolean
+gst_nv_jpeg_enc_stop (GstVideoEncoder * encoder)
+{
+  auto self = GST_NV_JPEG_ENC (encoder);
+
+  gst_nv_jpeg_enc_reset (self);
+
+  return TRUE;
+}
+
+static gboolean
+gst_nv_jpeg_enc_close (GstVideoEncoder * encoder)
+{
+  auto self = GST_NV_JPEG_ENC (encoder);
+  auto priv = self->priv;
+
+  GST_DEBUG_OBJECT (self, "Close");
+
+  if (priv->context && gst_cuda_context_push (priv->context)) {
+    if (priv->handle)
+      g_vtable.NvjpegDestroy (priv->handle);
+
+    if (priv->module) {
+      CuModuleUnload (priv->module);
+      priv->module = nullptr;
+    }
+
+    gst_cuda_context_pop (nullptr);
+  }
+
+  priv->handle = nullptr;
+  gst_clear_cuda_stream (&priv->stream);
+  gst_clear_object (&priv->context);
+
+  return TRUE;
+}
+
+static gboolean
+gst_nv_jpeg_enc_handle_query (GstNvJpegEnc * self, GstQuery * query)
+{
+  auto priv = self->priv;
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CONTEXT:
+      return gst_cuda_handle_context_query (GST_ELEMENT (self), query,
+          priv->context);
+    default:
+      break;
+  }
+
+  return FALSE;
+}
+
+static gboolean
+gst_nv_jpeg_enc_sink_query (GstVideoEncoder * encoder, GstQuery * query)
+{
+  auto self = GST_NV_JPEG_ENC (encoder);
+
+  if (gst_nv_jpeg_enc_handle_query (self, query))
+    return TRUE;
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->sink_query (encoder, query);
+}
+
+static gboolean
+gst_nv_jpeg_enc_src_query (GstVideoEncoder * encoder, GstQuery * query)
+{
+  auto self = GST_NV_JPEG_ENC (encoder);
+
+  if (gst_nv_jpeg_enc_handle_query (self, query))
+    return TRUE;
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->src_query (encoder, query);
+}
+
+static gboolean
+gst_nv_jpeg_enc_propose_allocation (GstVideoEncoder * encoder, GstQuery * query)
+{
+  auto self = GST_NV_JPEG_ENC (encoder);
+  auto priv = self->priv;
+  GstVideoInfo info;
+  GstBufferPool *pool = nullptr;
+  GstCaps *caps;
+  gboolean use_cuda_pool = FALSE;
+
+  gst_query_parse_allocation (query, &caps, NULL);
+  if (!caps) {
+    GST_WARNING_OBJECT (self, "null caps in query");
+    return FALSE;
+  }
+
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_WARNING_OBJECT (self, "Failed to convert caps into info");
+    return FALSE;
+  }
+
+  auto features = gst_caps_get_features (caps, 0);
+  if (gst_caps_features_contains (features,
+          GST_CAPS_FEATURE_MEMORY_CUDA_MEMORY)) {
+    GST_DEBUG_OBJECT (self, "Upstream support CUDA memory");
+    use_cuda_pool = TRUE;
+  }
+
+  if (use_cuda_pool)
+    pool = gst_cuda_buffer_pool_new (priv->context);
+  else
+    pool = gst_video_buffer_pool_new ();
+
+  auto config = gst_buffer_pool_get_config (pool);
+
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+  if (!use_cuda_pool) {
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
+  }
+
+  guint size = GST_VIDEO_INFO_SIZE (&info);
+  gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
+  if (use_cuda_pool && priv->stream) {
+    /* Set our stream on buffer pool config so that CUstream can be shared */
+    gst_buffer_pool_config_set_cuda_stream (config, priv->stream);
+  }
+
+  if (!gst_buffer_pool_set_config (pool, config)) {
+    GST_WARNING_OBJECT (self, "Failed to set pool config");
+    gst_object_unref (pool);
+    return FALSE;
+  }
+
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_get_params (config, nullptr, &size, nullptr, nullptr);
+  gst_structure_free (config);
+
+  gst_query_add_allocation_pool (query, pool, size, 0, 0);
+  gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, nullptr);
+  gst_object_unref (pool);
+
+  return TRUE;
+}
+
+static gboolean
+gst_nv_jpeg_enc_set_format (GstVideoEncoder * encoder,
+    GstVideoCodecState * state)
+{
+  auto self = GST_NV_JPEG_ENC (encoder);
+  auto priv = self->priv;
+
+  priv->info = state->info;
+
+  auto caps = gst_caps_new_empty_simple ("image/jpeg");
+  auto output_state = gst_video_encoder_set_output_state (encoder, caps,
+      state);
+  gst_video_codec_state_unref (output_state);
+
+  gst_nv_jpeg_enc_reset (self);
+
+  switch (GST_VIDEO_INFO_FORMAT (&priv->info)) {
+    case GST_VIDEO_FORMAT_I420:
+      priv->subsampling = NVJPEG_CSS_420;
+      break;
+    case GST_VIDEO_FORMAT_NV12:
+      priv->subsampling = NVJPEG_CSS_420;
+      priv->launch_kernel = true;
+      break;
+    case GST_VIDEO_FORMAT_Y42B:
+      priv->subsampling = NVJPEG_CSS_422;
+      break;
+    case GST_VIDEO_FORMAT_Y444:
+      priv->subsampling = NVJPEG_CSS_444;
+      break;
+    default:
+      g_assert_not_reached ();
+      return FALSE;
+  }
+
+  std::lock_guard < std::mutex > lk (priv->lock);
+  priv->quality_updated = false;
+
+  if (!gst_cuda_context_push (priv->context)) {
+    GST_ERROR_OBJECT (self, "Couldn't push context");
+    return FALSE;
+  }
+
+  /* Allocate memory  */
+  if (priv->launch_kernel) {
+    auto width = (priv->info.width + 1) / 2;
+    auto height = (priv->info.height + 1) / 2;
+    size_t pitch;
+    auto ret = CuMemAllocPitch (&priv->uv0, &pitch, width, height, 16);
+    if (!gst_cuda_result (ret)) {
+      GST_ERROR_OBJECT (self, "Couldn't allocate U plane memory");
+      gst_cuda_context_pop (nullptr);
+      return FALSE;
+    }
+
+    ret = CuMemAllocPitch (&priv->uv1, &pitch, width, height, 16);
+    if (!gst_cuda_result (ret)) {
+      GST_ERROR_OBJECT (self, "Couldn't allocate V plane memory");
+      gst_cuda_context_pop (nullptr);
+      gst_nv_jpeg_enc_reset (self);
+      return FALSE;
+    }
+
+    priv->pitch = pitch;
+  }
+
+  auto stream = gst_cuda_stream_get_handle (priv->stream);
+  auto ret = g_vtable.NvjpegEncoderParamsCreate (priv->handle, &priv->params,
+      stream);
+  if (ret != NVJPEG_STATUS_SUCCESS) {
+    GST_ERROR_OBJECT (self, "Couldn't create param handle, ret %d", ret);
+    gst_cuda_context_pop (nullptr);
+    gst_nv_jpeg_enc_reset (self);
+    return FALSE;
+  }
+
+  ret = g_vtable.NvjpegEncoderParamsSetQuality (priv->params,
+      priv->quality, stream);
+  if (ret != NVJPEG_STATUS_SUCCESS) {
+    GST_ERROR_OBJECT (self, "Couldn't set quality, ret %d", ret);
+    gst_cuda_context_pop (nullptr);
+    gst_nv_jpeg_enc_reset (self);
+    return FALSE;
+  }
+
+  ret = g_vtable.NvjpegEncoderParamsSetSamplingFactors (priv->params,
+      priv->subsampling, stream);
+  if (ret != NVJPEG_STATUS_SUCCESS) {
+    GST_ERROR_OBJECT (self, "Couldn't set subsampling factor, ret %d", ret);
+    gst_cuda_context_pop (nullptr);
+    gst_nv_jpeg_enc_reset (self);
+    return FALSE;
+  }
+
+  ret = g_vtable.NvjpegEncoderStateCreate (priv->handle, &priv->state, stream);
+  gst_cuda_context_pop (nullptr);
+
+  if (ret != NVJPEG_STATUS_SUCCESS) {
+    GST_ERROR_OBJECT (self, "Couldn't create state handle, ret %d", ret);
+    gst_nv_jpeg_enc_reset (self);
+    return FALSE;
+  }
+
+  priv->pool = gst_cuda_buffer_pool_new (priv->context);
+  auto config = gst_buffer_pool_get_config (priv->pool);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+  gst_buffer_pool_config_set_params (config,
+      state->caps, priv->info.size, 0, 0);
+  if (priv->stream)
+    gst_buffer_pool_config_set_cuda_stream (config, priv->stream);
+
+  if (!gst_buffer_pool_set_config (priv->pool, config)) {
+    GST_ERROR_OBJECT (self, "Failed to set pool config");
+    gst_nv_jpeg_enc_reset (self);
+    return FALSE;
+  }
+
+  if (!gst_buffer_pool_set_active (priv->pool, TRUE)) {
+    GST_ERROR_OBJECT (self, "Pool set active failed");
+    gst_nv_jpeg_enc_reset (self);
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static GstBuffer *
+gst_nv_jpeg_enc_upload_system (GstNvJpegEnc * self, GstBuffer * buffer)
+{
+  auto priv = self->priv;
+  auto info = &priv->info;
+
+  if (!priv->fallback_buf) {
+    gst_buffer_pool_acquire_buffer (priv->pool, &priv->fallback_buf, nullptr);
+    if (!priv->fallback_buf) {
+      GST_ERROR_OBJECT (self, "Couldn't acquire upload buffer");
+      return nullptr;
+    }
+  }
+
+  if (!gst_cuda_buffer_copy (priv->fallback_buf, GST_CUDA_BUFFER_COPY_CUDA,
+          info, buffer, GST_CUDA_BUFFER_COPY_SYSTEM, info, priv->context,
+          priv->stream)) {
+    GST_ERROR_OBJECT (self, "Couldn't upload frame");
+    return nullptr;
+  }
+
+  return priv->fallback_buf;
+}
+
+static GstBuffer *
+gst_nv_jpeg_enc_upload (GstNvJpegEnc * self, GstBuffer * buffer)
+{
+  auto priv = self->priv;
+  auto mem = gst_buffer_peek_memory (buffer, 0);
+
+  if (!gst_is_cuda_memory (mem))
+    return gst_nv_jpeg_enc_upload_system (self, buffer);
+
+  auto cmem = GST_CUDA_MEMORY_CAST (mem);
+  if (cmem->context != priv->context)
+    return gst_nv_jpeg_enc_upload_system (self, buffer);
+
+  auto stream = gst_cuda_memory_get_stream (cmem);
+  if (stream != priv->stream)
+    gst_cuda_memory_sync (cmem);
+
+  return buffer;
+}
+
+#define CUDA_BLOCK_X 16
+#define CUDA_BLOCK_Y 16
+#define DIV_UP(size,block) (((size) + ((block) - 1)) / (block))
+
+static gboolean
+gst_nv_jpeg_enc_fill_source (GstNvJpegEnc * self, GstBuffer * buffer,
+    nvjpegImage_t * source)
+{
+  auto priv = self->priv;
+  auto upload = gst_nv_jpeg_enc_upload (self, buffer);
+  if (!upload)
+    return FALSE;
+
+  GstVideoFrame frame;
+  if (!gst_video_frame_map (&frame,
+          &priv->info, upload, (GstMapFlags) (GST_MAP_READ | GST_MAP_CUDA))) {
+    GST_ERROR_OBJECT (self, "Couldn't map input buffer");
+    return FALSE;
+  }
+
+  if (priv->launch_kernel) {
+    CUtexObject texture;
+    auto cmem = (GstCudaMemory *) gst_buffer_peek_memory (upload, 0);
+    if (!gst_cuda_memory_get_texture (cmem,
+            1, CU_TR_FILTER_MODE_POINT, &texture)) {
+      GST_ERROR_OBJECT (self, "Couldn't get texture");
+      gst_video_frame_unmap (&frame);
+      return FALSE;
+    }
+
+    gint width = priv->info.width / 2;
+    gint height = priv->info.height / 2;
+    gpointer args = { &texture, &priv->uv0, &priv->uv1, &width, &height,
+      &priv->pitch
+    };
+
+    if (!gst_cuda_context_push (priv->context)) {
+      GST_ERROR_OBJECT (self, "Couldn't push context");
+      gst_video_frame_unmap (&frame);
+      return FALSE;
+    }
+
+    auto stream = gst_cuda_stream_get_handle (priv->stream);
+    auto ret = CuLaunchKernel (priv->kernel_func, DIV_UP (width, CUDA_BLOCK_X),
+        DIV_UP (height, CUDA_BLOCK_Y), 1, CUDA_BLOCK_X, CUDA_BLOCK_Y, 1, 0,
+        stream, args, nullptr);
+    gst_cuda_context_pop (nullptr);
+    if (!gst_cuda_result (ret)) {
+      GST_ERROR_OBJECT (self, "Couldn't launch kernel");
+      gst_video_frame_unmap (&frame);
+      return FALSE;
+    }
+
+    source->channel0 = (unsigned char *)
+        GST_VIDEO_FRAME_PLANE_DATA (&frame, 0);
+    source->pitch0 = GST_VIDEO_FRAME_PLANE_STRIDE (&frame, 0);
+
+    source->channel1 = (unsigned char *) priv->uv0;
+    source->channel2 = (unsigned char *) priv->uv1;
+    source->pitch1 = source->pitch2 = priv->pitch;
+  } else {
+    for (guint i = 0; i < GST_VIDEO_FRAME_N_PLANES (&frame); i++) {
+      source->channeli = (unsigned char *)
+          GST_VIDEO_FRAME_PLANE_DATA (&frame, i);
+      source->pitchi = GST_VIDEO_FRAME_PLANE_STRIDE (&frame, i);
+    }
+  }
+
+  gst_video_frame_unmap (&frame);
+
+  return TRUE;
+}
+
+static GstFlowReturn
+gst_nv_jpeg_enc_handle_frame (GstVideoEncoder * encoder,
+    GstVideoCodecFrame * frame)
+{
+  auto self = GST_NV_JPEG_ENC (encoder);
+  auto priv = self->priv;
+
+  if (!gst_cuda_context_push (priv->context)) {
+    GST_ERROR_OBJECT (self, "Couldn't push context");
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  auto stream = gst_cuda_stream_get_handle (priv->stream);
+
+  {
+    std::lock_guard < std::mutex > lk (priv->lock);
+    if (priv->quality_updated) {
+      priv->quality_updated = false;
+      auto ret = g_vtable.NvjpegEncoderParamsSetQuality (priv->params,
+          priv->quality, stream);
+      if (ret != NVJPEG_STATUS_SUCCESS) {
+        GST_ERROR_OBJECT (self, "Couldn't set quality, ret %d", ret);
+        gst_cuda_context_pop (nullptr);
+        gst_video_encoder_finish_frame (encoder, frame);
+        return GST_FLOW_ERROR;
+      }
+    }
+  }
+
+  nvjpegImage_t source = { };
+  if (!gst_nv_jpeg_enc_fill_source (self, frame->input_buffer, &source)) {
+    GST_ERROR_OBJECT (self, "Couldn't fill source struct");
+    gst_cuda_context_pop (nullptr);
+    gst_video_encoder_finish_frame (encoder, frame);
+
+    return GST_FLOW_ERROR;
+  }
+
+  auto ret = g_vtable.NvjpegEncodeYUV (priv->handle, priv->state, priv->params,
+      &source, priv->subsampling, priv->info.width, priv->info.height, stream);
+  if (ret != NVJPEG_STATUS_SUCCESS) {
+    GST_ERROR_OBJECT (self, "nvjpegEncodeYUV failed, ret: %d", ret);
+    gst_cuda_context_pop (nullptr);
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  size_t length = 0;
+  ret = g_vtable.NvjpegEncodeRetrieveBitstream (priv->handle,
+      priv->state, nullptr, &length, stream);
+  if (ret != NVJPEG_STATUS_SUCCESS) {
+    GST_ERROR_OBJECT (self,
+        "nvjpegEncodeRetrieveBitstream failed, ret: %d", ret);
+    gst_cuda_context_pop (nullptr);
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  CuStreamSynchronize (stream);
+
+  auto outbuf = gst_buffer_new_and_alloc (length);
+  GstMapInfo map;
+  gst_buffer_map (outbuf, &map, GST_MAP_WRITE);
+  ret = g_vtable.NvjpegEncodeRetrieveBitstream (priv->handle,
+      priv->state, (unsigned char *) map.data, &length, stream);
+  gst_buffer_unmap (outbuf, &map);
+  gst_cuda_context_pop (nullptr);
+
+  if (ret != NVJPEG_STATUS_SUCCESS) {
+    GST_ERROR_OBJECT (self,
+        "nvjpegEncodeRetrieveBitstream failed, ret: %d", ret);
+    gst_buffer_unref (outbuf);
+    gst_video_encoder_finish_frame (encoder, frame);
+    return GST_FLOW_ERROR;
+  }
+
+  frame->output_buffer = outbuf;
+  frame->dts = frame->pts;
+  GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
+
+  return gst_video_encoder_finish_frame (encoder, frame);
+}
+
+void
+gst_nv_jpeg_enc_register (GstPlugin * plugin, GstCudaContext * context,
+    guint rank, gboolean have_nvrtc)
+{
+  GST_DEBUG_CATEGORY_INIT (gst_nv_jpeg_enc_debug, "nvjpegenc", 0, "nvjpegenc");
+
+  if (!gst_nv_jpeg_enc_load_library ())
+    return;
+
+  GType type;
+  guint index = 0;
+  GTypeInfo type_info = {
+    sizeof (GstNvJpegEncClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_nv_jpeg_enc_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstNvJpegEnc),
+    0,
+    (GInstanceInitFunc) gst_nv_jpeg_enc_init,
+  };
+
+  guint cuda_device_id;
+  g_object_get (context, "cuda-device-id", &cuda_device_id, nullptr);
+
+  std::string format_string;
+  if (have_nvrtc)
+    format_string = "NV12, I420, Y42B, Y444";
+  else
+    format_string = "I420, Y42B, Y444";
+
+  std::string cuda_caps_str = "video/x-raw(memory:CUDAMemory), "
+      "format = (string) { " + format_string + " }, width = "
+      GST_VIDEO_SIZE_RANGE ", height = " GST_VIDEO_SIZE_RANGE;
+  GstCaps *sink_caps = gst_caps_from_string (cuda_caps_str.c_str ());
+  GstCaps *sysmem_caps = gst_caps_from_string ("video/x-raw, format = (string)"
+      "{ I420, Y42B, Y444 }, width = " GST_VIDEO_SIZE_RANGE
+      ", height = " GST_VIDEO_SIZE_RANGE);
+
+  gst_caps_append (sink_caps, sysmem_caps);
+  GST_MINI_OBJECT_FLAG_SET (sink_caps, GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  auto cdata = g_new0 (GstNvJpegEncCData, 1);
+  cdata->cuda_device_id = cuda_device_id;
+  cdata->sink_caps = sink_caps;
+  cdata->have_nvrtc = have_nvrtc;
+  type_info.class_data = cdata;
+
+  auto type_name = g_strdup ("GstNvJpegEnc");
+  auto feature_name = g_strdup ("nvjpegenc");
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstNvJpegDevice%dEnc", index);
+    feature_name = g_strdup_printf ("nvjpegdevice%denc", index);
+  }
+
+  type = g_type_register_static (GST_TYPE_VIDEO_ENCODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  if (rank > 0 && index != 0)
+    rank--;
+
+  if (index != 0)
+    gst_element_type_set_skip_documentation (type);
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvjpegenc.h Added

@@ -0,0 +1,31 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/cuda/gstcuda.h>
+
+G_BEGIN_DECLS
+
+void gst_nv_jpeg_enc_register (GstPlugin * plugin,
+                               GstCudaContext * context,
+                               guint rank,
+                               gboolean have_nvrtc);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvvp8dec.cpp Added

@@ -0,0 +1,697 @@
+/* GStreamer
+ * Copyright (C) 2020 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-nvvp8sldec
+ * @title: nvvp8sldec
+ *
+ * GstCodecs based NVIDIA VP8 video decoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/vp8/file ! parsebin ! nvvp8sldec ! videoconvert ! autovideosink
+ * ```
+ *
+ * Since: 1.20
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstnvvp8dec.h"
+#include "gstnvdecoder.h"
+
+#include <string.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_nv_vp8_dec_debug);
+#define GST_CAT_DEFAULT gst_nv_vp8_dec_debug
+
+typedef struct _GstNvVp8Dec
+{
+  GstVp8Decoder parent;
+
+  GstNvDecoder *decoder;
+  CUVIDPICPARAMS params;
+
+  guint width, height;
+
+  guint num_output_surfaces;
+  guint init_max_width;
+  guint init_max_height;
+  gint max_display_delay;
+} GstNvVp8Dec;
+
+typedef struct _GstNvVp8DecClass
+{
+  GstVp8DecoderClass parent_class;
+  guint cuda_device_id;
+  gint64 adapter_luid;
+  guint max_width;
+  guint max_height;
+} GstNvVp8DecClass;
+
+enum
+{
+  PROP_0,
+  PROP_CUDA_DEVICE_ID,
+  PROP_NUM_OUTPUT_SURFACES,
+  PROP_INIT_MAX_WIDTH,
+  PROP_INIT_MAX_HEIGHT,
+  PROP_MAX_DISPLAY_DELAY,
+};
+
+#define DEFAULT_NUM_OUTPUT_SURFACES 1
+#define DEFAULT_MAX_DISPLAY_DELAY -1
+
+static GTypeClass *parent_class = nullptr;
+
+#define GST_NV_VP8_DEC(object) ((GstNvVp8Dec *) (object))
+#define GST_NV_VP8_DEC_GET_CLASS(object) \
+    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstNvVp8DecClass))
+
+static void gst_nv_vp8_dec_finalize (GObject * object);
+static void gst_nv_vp8_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_nv_vp8_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static void gst_nv_vp8_dec_set_context (GstElement * element,
+    GstContext * context);
+static gboolean gst_nv_vp8_dec_open (GstVideoDecoder * decoder);
+static gboolean gst_nv_vp8_dec_close (GstVideoDecoder * decoder);
+static gboolean gst_nv_vp8_dec_stop (GstVideoDecoder * decoder);
+static gboolean gst_nv_vp8_dec_negotiate (GstVideoDecoder * decoder);
+static gboolean gst_nv_vp8_dec_decide_allocation (GstVideoDecoder *
+    decoder, GstQuery * query);
+static gboolean gst_nv_vp8_dec_sink_query (GstVideoDecoder * decoder,
+    GstQuery * query);
+static gboolean gst_nv_vp8_dec_src_query (GstVideoDecoder * decoder,
+    GstQuery * query);
+static gboolean gst_nv_vp8_dec_sink_event (GstVideoDecoder * decoder,
+    GstEvent * event);
+
+/* GstVp8Decoder */
+static GstFlowReturn gst_nv_vp8_dec_new_sequence (GstVp8Decoder * decoder,
+    const GstVp8FrameHdr * frame_hdr, gint max_dpb_size);
+static GstFlowReturn gst_nv_vp8_dec_new_picture (GstVp8Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp8Picture * picture);
+static GstFlowReturn gst_nv_vp8_dec_decode_picture (GstVp8Decoder * decoder,
+    GstVp8Picture * picture, GstVp8Parser * parser);
+static GstFlowReturn gst_nv_vp8_dec_output_picture (GstVp8Decoder *
+    decoder, GstVideoCodecFrame * frame, GstVp8Picture * picture);
+static guint gst_nv_vp8_dec_get_preferred_output_delay (GstVp8Decoder * decoder,
+    gboolean is_live);
+
+static void
+gst_nv_vp8_dec_class_init (GstNvVp8DecClass * klass,
+    GstNvDecoderClassData * cdata)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstVp8DecoderClass *vp8decoder_class = GST_VP8_DECODER_CLASS (klass);
+
+  object_class->finalize = gst_nv_vp8_dec_finalize;
+  object_class->set_property = gst_nv_vp8_dec_set_property;
+  object_class->get_property = gst_nv_vp8_dec_get_property;
+
+  /**
+   * GstNvVp8Dec:cuda-device-id:
+   *
+   * Assigned CUDA device id
+   *
+   * Since: 1.22
+   */
+  g_object_class_install_property (object_class, PROP_CUDA_DEVICE_ID,
+      g_param_spec_uint ("cuda-device-id", "CUDA device id",
+          "Assigned CUDA device id", 0, G_MAXINT, 0,
+          (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvVp8Dec:num-output-surfaces:
+   *
+   * The number of output surfaces (0 = auto, 1 = always copy).
+   * This property will be used to calculate
+   * the CUVIDDECODECREATEINFO.ulNumOutputSurfaces parameter in case of
+   * CUDA output mode.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_NUM_OUTPUT_SURFACES,
+      g_param_spec_uint ("num-output-surfaces", "Num Output Surfaces",
+          "Maximum number of output surfaces simultaneously mapped in CUDA "
+          "output mode (0 = auto, 1 = always copy)",
+          0, 64, DEFAULT_NUM_OUTPUT_SURFACES,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvVp8Dec:init-max-width:
+   *
+   * Initial CUVIDDECODECREATEINFO.ulMaxWidth value
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_INIT_MAX_WIDTH,
+      g_param_spec_uint ("init-max-width", "Initial Maximum Width",
+          "Expected maximum coded width of stream. This value is used to "
+          "pre-allocate higher dimension of output surfaces than "
+          "that of input stream, in order to help decoder reconfiguration",
+          0, cdata->max_width, 0,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvVp8Dec:init-max-height:
+   *
+   * Initial CUVIDDECODECREATEINFO.ulMaxHeight value
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_INIT_MAX_HEIGHT,
+      g_param_spec_uint ("init-max-height", "Initial Maximum Height",
+          "Expected maximum coded height of stream. This value is used to "
+          "pre-allocate higher dimension of output surfaces than "
+          "that of input stream, in order to help decoder reconfiguration",
+          0, cdata->max_height, 0,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvVp8Dec:max-display-delay:
+   *
+   * Maximum display delay
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_MAX_DISPLAY_DELAY,
+      g_param_spec_int ("max-display-delay", "Max Display Delay",
+          "Improves pipelining of decode with display, 0 means no delay "
+          "(auto = -1)", -1, 16, DEFAULT_MAX_DISPLAY_DELAY,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_set_context);
+
+  parent_class = (GTypeClass *) g_type_class_peek_parent (klass);
+  gst_element_class_set_metadata (element_class,
+      "NVDEC VP8 Decoder",
+      "Codec/Decoder/Video/Hardware",
+      "NVIDIA VP8 video decoder", "Seungha Yang <seungha@centricular.com>");
+
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+          cdata->sink_caps));
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+          cdata->src_caps));
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_open);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_close);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_stop);
+  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_sink_query);
+  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_src_query);
+  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_sink_event);
+
+  vp8decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_new_sequence);
+  vp8decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_new_picture);
+  vp8decoder_class->decode_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_decode_picture);
+  vp8decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_output_picture);
+  vp8decoder_class->get_preferred_output_delay =
+      GST_DEBUG_FUNCPTR (gst_nv_vp8_dec_get_preferred_output_delay);
+
+  klass->cuda_device_id = cdata->cuda_device_id;
+  klass->adapter_luid = cdata->adapter_luid;
+  klass->max_width = cdata->max_width;
+  klass->max_height = cdata->max_height;
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
+}
+
+static void
+gst_nv_vp8_dec_init (GstNvVp8Dec * self)
+{
+  GstNvVp8DecClass *klass = GST_NV_VP8_DEC_GET_CLASS (self);
+
+  self->decoder =
+      gst_nv_decoder_new (klass->cuda_device_id, klass->adapter_luid);
+
+  self->num_output_surfaces = DEFAULT_NUM_OUTPUT_SURFACES;
+  self->max_display_delay = DEFAULT_MAX_DISPLAY_DELAY;
+}
+
+static void
+gst_nv_vp8_dec_finalize (GObject * object)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (object);
+
+  gst_object_unref (self->decoder);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_nv_vp8_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (object);
+
+  switch (prop_id) {
+    case PROP_NUM_OUTPUT_SURFACES:
+      self->num_output_surfaces = g_value_get_uint (value);
+      break;
+    case PROP_INIT_MAX_WIDTH:
+      self->init_max_width = g_value_get_uint (value);
+      break;
+    case PROP_INIT_MAX_HEIGHT:
+      self->init_max_height = g_value_get_uint (value);
+      break;
+    case PROP_MAX_DISPLAY_DELAY:
+      self->max_display_delay = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_vp8_dec_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (object);
+  GstNvVp8DecClass *klass = GST_NV_VP8_DEC_GET_CLASS (object);
+
+  switch (prop_id) {
+    case PROP_CUDA_DEVICE_ID:
+      g_value_set_uint (value, klass->cuda_device_id);
+      break;
+    case PROP_NUM_OUTPUT_SURFACES:
+      g_value_set_uint (value, self->num_output_surfaces);
+      break;
+    case PROP_INIT_MAX_WIDTH:
+      g_value_set_uint (value, self->init_max_width);
+      break;
+    case PROP_INIT_MAX_HEIGHT:
+      g_value_set_uint (value, self->init_max_height);
+      break;
+    case PROP_MAX_DISPLAY_DELAY:
+      g_value_set_int (value, self->max_display_delay);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_vp8_dec_set_context (GstElement * element, GstContext * context)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (element);
+
+  gst_nv_decoder_handle_set_context (self->decoder, element, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_nv_vp8_dec_open (GstVideoDecoder * decoder)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+
+  return gst_nv_decoder_open (self->decoder, GST_ELEMENT (decoder));
+}
+
+static gboolean
+gst_nv_vp8_dec_close (GstVideoDecoder * decoder)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+
+  return gst_nv_decoder_close (self->decoder);
+}
+
+static gboolean
+gst_nv_vp8_dec_stop (GstVideoDecoder * decoder)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+  gboolean ret;
+
+  ret = GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+
+  gst_nv_decoder_reset (self->decoder);
+
+  return ret;
+}
+
+static gboolean
+gst_nv_vp8_dec_negotiate (GstVideoDecoder * decoder)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+  GstVp8Decoder *vp8dec = GST_VP8_DECODER (decoder);
+
+  GST_DEBUG_OBJECT (self, "negotiate");
+
+  if (!gst_nv_decoder_negotiate (self->decoder, decoder, vp8dec->input_state))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_nv_vp8_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+
+  if (!gst_nv_decoder_decide_allocation (self->decoder, decoder, query)) {
+    GST_WARNING_OBJECT (self, "Failed to handle decide allocation");
+    return FALSE;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static gboolean
+gst_nv_vp8_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+
+  if (gst_nv_decoder_handle_query (self->decoder, GST_ELEMENT (decoder), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+}
+
+static gboolean
+gst_nv_vp8_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+
+  if (gst_nv_decoder_handle_query (self->decoder, GST_ELEMENT (decoder), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+}
+
+static gboolean
+gst_nv_vp8_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_FLUSH_START:
+      gst_nv_decoder_set_flushing (self->decoder, TRUE);
+      break;
+    case GST_EVENT_FLUSH_STOP:
+      gst_nv_decoder_set_flushing (self->decoder, FALSE);
+      break;
+    default:
+      break;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstFlowReturn
+gst_nv_vp8_dec_new_sequence (GstVp8Decoder * decoder,
+    const GstVp8FrameHdr * frame_hdr, gint max_dpb_size)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+  GstNvVp8DecClass *klass = GST_NV_VP8_DEC_GET_CLASS (self);
+  gboolean modified = FALSE;
+  guint max_width, max_height;
+
+  GST_LOG_OBJECT (self, "new sequence");
+
+  if (self->width != frame_hdr->width || self->height != frame_hdr->height) {
+    if (self->decoder) {
+      GST_INFO_OBJECT (self, "resolution changed %dx%d -> %dx%d",
+          self->width, self->height, frame_hdr->width, frame_hdr->height);
+    }
+
+    self->width = frame_hdr->width;
+    self->height = frame_hdr->height;
+
+    modified = TRUE;
+  }
+
+  if (modified || !gst_nv_decoder_is_configured (self->decoder)) {
+    GstVideoInfo info;
+
+    gst_video_info_set_format (&info,
+        GST_VIDEO_FORMAT_NV12, self->width, self->height);
+
+    max_width = gst_nv_decoder_get_max_output_size (self->width,
+        self->init_max_width, klass->max_width);
+    max_height = gst_nv_decoder_get_max_output_size (self->height,
+        self->init_max_height, klass->max_height);
+
+    if (!gst_nv_decoder_configure (self->decoder,
+            cudaVideoCodec_VP8, &info, self->width, self->height, 8,
+            max_dpb_size, FALSE, self->num_output_surfaces, max_width,
+            max_height)) {
+      GST_ERROR_OBJECT (self, "Failed to configure decoder");
+      return GST_FLOW_NOT_NEGOTIATED;
+    }
+
+    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+      GST_ERROR_OBJECT (self, "Failed to negotiate with downstream");
+      return GST_FLOW_NOT_NEGOTIATED;
+    }
+
+    memset (&self->params, 0, sizeof (CUVIDPICPARAMS));
+
+    self->params.PicWidthInMbs = GST_ROUND_UP_16 (self->width) >> 4;
+    self->params.FrameHeightInMbs = GST_ROUND_UP_16 (self->height) >> 4;
+
+    self->params.CodecSpecific.vp8.width = self->width;
+    self->params.CodecSpecific.vp8.height = self->height;
+  }
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_vp8_dec_new_picture (GstVp8Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp8Picture * picture)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+
+  return gst_nv_decoder_new_picture (self->decoder,
+      GST_CODEC_PICTURE (picture));
+}
+
+static GstNvDecSurface *
+gst_nv_vp8_dec_get_decoder_frame_from_picture (GstNvVp8Dec * self,
+    GstVp8Picture * picture)
+{
+  GstNvDecSurface *surface;
+
+  surface = (GstNvDecSurface *) gst_vp8_picture_get_user_data (picture);
+  if (!surface)
+    GST_DEBUG_OBJECT (self, "current picture does not have decoder surface");
+
+  return surface;
+}
+
+static GstFlowReturn
+gst_nv_vp8_dec_decode_picture (GstVp8Decoder * decoder,
+    GstVp8Picture * picture, GstVp8Parser * parser)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+  GstVp8FrameHdr *frame_hdr = &picture->frame_hdr;
+  GstNvDecSurface *surface;
+  GstNvDecSurface *other_surface;
+  guint offset = 0;
+
+  GST_LOG_OBJECT (self, "Decode picture, size %" G_GSIZE_FORMAT, picture->size);
+
+  surface = gst_nv_vp8_dec_get_decoder_frame_from_picture (self, picture);
+  if (!surface) {
+    GST_ERROR_OBJECT (self, "Decoder frame is unavailable");
+    return GST_FLOW_ERROR;
+  }
+
+  self->params.nBitstreamDataLen = picture->size;
+  self->params.pBitstreamData = picture->data;
+  self->params.nNumSlices = 1;
+  self->params.pSliceDataOffsets = &offset;
+
+  self->params.CurrPicIdx = surface->index;
+
+  self->params.CodecSpecific.vp8.first_partition_size =
+      frame_hdr->first_part_size;
+
+  if (decoder->alt_ref_picture) {
+    other_surface =
+        gst_nv_vp8_dec_get_decoder_frame_from_picture (self,
+        decoder->alt_ref_picture);
+    if (!other_surface) {
+      GST_ERROR_OBJECT (self, "Couldn't get decoder frame for AltRef");
+      return GST_FLOW_ERROR;
+    }
+
+    self->params.CodecSpecific.vp8.AltRefIdx = other_surface->index;
+  } else {
+    self->params.CodecSpecific.vp8.AltRefIdx = 0xff;
+  }
+
+  if (decoder->golden_ref_picture) {
+    other_surface =
+        gst_nv_vp8_dec_get_decoder_frame_from_picture (self,
+        decoder->golden_ref_picture);
+    if (!other_surface) {
+      GST_ERROR_OBJECT (self, "Couldn't get decoder frame for GoldenRef");
+      return GST_FLOW_ERROR;
+    }
+
+    self->params.CodecSpecific.vp8.GoldenRefIdx = other_surface->index;
+  } else {
+    self->params.CodecSpecific.vp8.GoldenRefIdx = 0xff;
+  }
+
+  if (decoder->last_picture) {
+    other_surface =
+        gst_nv_vp8_dec_get_decoder_frame_from_picture (self,
+        decoder->last_picture);
+    if (!other_surface) {
+      GST_ERROR_OBJECT (self, "Couldn't get decoder frame for LastRef");
+      return GST_FLOW_ERROR;
+    }
+
+    self->params.CodecSpecific.vp8.LastRefIdx = other_surface->index;
+  } else {
+    self->params.CodecSpecific.vp8.LastRefIdx = 0xff;
+  }
+
+  self->params.CodecSpecific.vp8.vp8_frame_tag.frame_type =
+      frame_hdr->key_frame ? 0 : 1;
+  self->params.CodecSpecific.vp8.vp8_frame_tag.version = frame_hdr->version;
+  self->params.CodecSpecific.vp8.vp8_frame_tag.show_frame =
+      frame_hdr->show_frame;
+  self->params.CodecSpecific.vp8.vp8_frame_tag.update_mb_segmentation_data =
+      parser->segmentation.segmentation_enabled ?
+      parser->segmentation.update_segment_feature_data : 0;
+
+  if (!gst_nv_decoder_decode (self->decoder, &self->params))
+    return GST_FLOW_ERROR;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_vp8_dec_output_picture (GstVp8Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp8Picture * picture)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+
+  return gst_nv_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, GST_CODEC_PICTURE (picture), 0);
+}
+
+static guint
+gst_nv_vp8_dec_get_preferred_output_delay (GstVp8Decoder * decoder,
+    gboolean is_live)
+{
+  GstNvVp8Dec *self = GST_NV_VP8_DEC (decoder);
+
+  if (self->max_display_delay >= 0)
+    return self->max_display_delay;
+
+  /* Prefer to zero latency for live pipeline */
+  if (is_live)
+    return 0;
+
+  return 2;
+}
+
+void
+gst_nv_vp8_dec_register (GstPlugin * plugin, guint device_id,
+    gint64 adapter_luid, guint rank, GstCaps * sink_caps, GstCaps * src_caps)
+{
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  GstNvDecoderClassData *cdata;
+  gint index = 0;
+  const GValue *value;
+  GstStructure *s;
+  GTypeInfo type_info = {
+    sizeof (GstNvVp8DecClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_nv_vp8_dec_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstNvVp8Dec),
+    0,
+    (GInstanceInitFunc) gst_nv_vp8_dec_init,
+  };
+
+  GST_DEBUG_CATEGORY_INIT (gst_nv_vp8_dec_debug, "nvvp8dec", 0, "nvvp8dec");
+
+  cdata = g_new0 (GstNvDecoderClassData, 1);
+
+  s = gst_caps_get_structure (sink_caps, 0);
+  value = gst_structure_get_value (s, "width");
+  cdata->max_width = (guint) gst_value_get_int_range_max (value);
+
+  value = gst_structure_get_value (s, "height");
+  cdata->max_height = (guint) gst_value_get_int_range_max (value);
+
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = gst_caps_ref (src_caps);
+  cdata->cuda_device_id = device_id;
+  cdata->adapter_luid = adapter_luid;
+
+  type_name = g_strdup ("GstNvVp8Dec");
+  feature_name = g_strdup ("nvvp8dec");
+
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstNvVp8Device%dDec", index);
+    feature_name = g_strdup_printf ("nvvp8device%ddec", index);
+  }
+
+  type_info.class_data = cdata;
+  type = g_type_register_static (GST_TYPE_VP8_DECODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  /* make lower rank than default device */
+  if (rank > 0 && index > 0)
+    rank--;
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvvp8dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvvp8dec.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvvp9dec.cpp Added

@@ -0,0 +1,798 @@
+/* GStreamer
+ * Copyright (C) 2020 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-nvvp9sldec
+ * @title: nvvp9sldec
+ *
+ * GstCodecs based NVIDIA VP9 video decoder
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 filesrc location=/path/to/vp9/file ! parsebin ! nvvp9sldec ! videoconvert ! autovideosink
+ * ```
+ *
+ * Since: 1.20
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstnvvp9dec.h"
+#include "gstnvdecoder.h"
+
+#include <string.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_nv_vp9_dec_debug);
+#define GST_CAT_DEFAULT gst_nv_vp9_dec_debug
+
+typedef struct _GstNvVp9Dec
+{
+  GstVp9Decoder parent;
+
+  GstNvDecoder *decoder;
+  CUVIDPICPARAMS params;
+
+  guint width, height;
+  GstVP9Profile profile;
+
+  guint num_output_surfaces;
+  guint init_max_width;
+  guint init_max_height;
+  gint max_display_delay;
+} GstNvVp9Dec;
+
+typedef struct _GstNvVp9DecClass
+{
+  GstVp9DecoderClass parent_class;
+  guint cuda_device_id;
+  gint64 adapter_luid;
+  guint max_width;
+  guint max_height;
+} GstNvVp9DecClass;
+
+enum
+{
+  PROP_0,
+  PROP_CUDA_DEVICE_ID,
+  PROP_NUM_OUTPUT_SURFACES,
+  PROP_INIT_MAX_WIDTH,
+  PROP_INIT_MAX_HEIGHT,
+  PROP_MAX_DISPLAY_DELAY,
+};
+
+#define DEFAULT_NUM_OUTPUT_SURFACES 1
+#define DEFAULT_MAX_DISPLAY_DELAY -1
+
+static GTypeClass *parent_class = nullptr;
+
+#define GST_NV_VP9_DEC(object) ((GstNvVp9Dec *) (object))
+#define GST_NV_VP9_DEC_GET_CLASS(object) \
+    (G_TYPE_INSTANCE_GET_CLASS ((object),G_TYPE_FROM_INSTANCE (object),GstNvVp9DecClass))
+
+static void gst_nv_vp9_dec_finalize (GObject * object);
+static void gst_nv_vp9_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_nv_vp9_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static void gst_nv_vp9_dec_set_context (GstElement * element,
+    GstContext * context);
+static gboolean gst_nv_vp9_dec_open (GstVideoDecoder * decoder);
+static gboolean gst_nv_vp9_dec_close (GstVideoDecoder * decoder);
+static gboolean gst_nv_vp9_dec_stop (GstVideoDecoder * decoder);
+static gboolean gst_nv_vp9_dec_negotiate (GstVideoDecoder * decoder);
+static gboolean gst_nv_vp9_dec_decide_allocation (GstVideoDecoder *
+    decoder, GstQuery * query);
+static gboolean gst_nv_vp9_dec_sink_query (GstVideoDecoder * decoder,
+    GstQuery * query);
+static gboolean gst_nv_vp9_dec_src_query (GstVideoDecoder * decoder,
+    GstQuery * query);
+static gboolean gst_nv_vp9_dec_sink_event (GstVideoDecoder * decoder,
+    GstEvent * event);
+
+/* GstVp9Decoder */
+static GstFlowReturn gst_nv_vp9_dec_new_sequence (GstVp9Decoder * decoder,
+    const GstVp9FrameHeader * frame_hdr, gint max_dpb_size);
+static GstFlowReturn gst_nv_vp9_dec_new_picture (GstVp9Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp9Picture * picture);
+static GstVp9Picture *gst_nv_vp9_dec_duplicate_picture (GstVp9Decoder *
+    decoder, GstVideoCodecFrame * frame, GstVp9Picture * picture);
+static GstFlowReturn gst_nv_vp9_dec_decode_picture (GstVp9Decoder * decoder,
+    GstVp9Picture * picture, GstVp9Dpb * dpb);
+static GstFlowReturn gst_nv_vp9_dec_output_picture (GstVp9Decoder *
+    decoder, GstVideoCodecFrame * frame, GstVp9Picture * picture);
+static guint gst_nv_vp9_dec_get_preferred_output_delay (GstVp9Decoder * decoder,
+    gboolean is_live);
+
+static void
+gst_nv_vp9_dec_class_init (GstNvVp9DecClass * klass,
+    GstNvDecoderClassData * cdata)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstVp9DecoderClass *vp9decoder_class = GST_VP9_DECODER_CLASS (klass);
+
+  object_class->finalize = gst_nv_vp9_dec_finalize;
+  object_class->set_property = gst_nv_vp9_dec_set_property;
+  object_class->get_property = gst_nv_vp9_dec_get_property;
+
+  /**
+   * GstNvVp9Dec:cuda-device-id:
+   *
+   * Assigned CUDA device id
+   *
+   * Since: 1.22
+   */
+  g_object_class_install_property (object_class, PROP_CUDA_DEVICE_ID,
+      g_param_spec_uint ("cuda-device-id", "CUDA device id",
+          "Assigned CUDA device id", 0, G_MAXINT, 0,
+          (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvVp9Dec:num-output-surfaces:
+   *
+   * The number of output surfaces (0 = auto, 1 = always copy).
+   * This property will be used to calculate
+   * the CUVIDDECODECREATEINFO.ulNumOutputSurfaces parameter in case of
+   * CUDA output mode.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_NUM_OUTPUT_SURFACES,
+      g_param_spec_uint ("num-output-surfaces", "Num Output Surfaces",
+          "Maximum number of output surfaces simultaneously mapped in CUDA "
+          "output mode (0 = auto, 1 = always copy)",
+          0, 64, DEFAULT_NUM_OUTPUT_SURFACES,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvVp9Dec:init-max-width:
+   *
+   * Initial CUVIDDECODECREATEINFO.ulMaxWidth value
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_INIT_MAX_WIDTH,
+      g_param_spec_uint ("init-max-width", "Initial Maximum Width",
+          "Expected maximum coded width of stream. This value is used to "
+          "pre-allocate higher dimension of output surfaces than "
+          "that of input stream, in order to help decoder reconfiguration",
+          0, cdata->max_width, 0,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvVp9Dec:init-max-height:
+   *
+   * Initial CUVIDDECODECREATEINFO.ulMaxHeight value
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_INIT_MAX_HEIGHT,
+      g_param_spec_uint ("init-max-height", "Initial Maximum Height",
+          "Expected maximum coded height of stream. This value is used to "
+          "pre-allocate higher dimension of output surfaces than "
+          "that of input stream, in order to help decoder reconfiguration",
+          0, cdata->max_height, 0,
+          (GParamFlags) (GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
+              G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstNvVp9Dec:max-display-delay:
+   *
+   * Maximum display delay
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_MAX_DISPLAY_DELAY,
+      g_param_spec_int ("max-display-delay", "Max Display Delay",
+          "Improves pipelining of decode with display, 0 means no delay "
+          "(auto = -1)", -1, 16, DEFAULT_MAX_DISPLAY_DELAY,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  element_class->set_context = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_set_context);
+
+  parent_class = (GTypeClass *) g_type_class_peek_parent (klass);
+  gst_element_class_set_metadata (element_class,
+      "NVDEC VP9 Decoder",
+      "Codec/Decoder/Video/Hardware",
+      "NVIDIA VP9 video decoder", "Seungha Yang <seungha@centricular.com>");
+
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+          cdata->sink_caps));
+  gst_element_class_add_pad_template (element_class,
+      gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+          cdata->src_caps));
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_open);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_close);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_stop);
+  decoder_class->negotiate = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_decide_allocation);
+  decoder_class->sink_query = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_sink_query);
+  decoder_class->src_query = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_src_query);
+  decoder_class->sink_event = GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_sink_event);
+
+  vp9decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_new_sequence);
+  vp9decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_new_picture);
+  vp9decoder_class->duplicate_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_duplicate_picture);
+  vp9decoder_class->decode_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_decode_picture);
+  vp9decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_output_picture);
+  vp9decoder_class->get_preferred_output_delay =
+      GST_DEBUG_FUNCPTR (gst_nv_vp9_dec_get_preferred_output_delay);
+
+  klass->cuda_device_id = cdata->cuda_device_id;
+  klass->adapter_luid = cdata->adapter_luid;
+  klass->max_width = cdata->max_width;
+  klass->max_height = cdata->max_height;
+
+  gst_caps_unref (cdata->sink_caps);
+  gst_caps_unref (cdata->src_caps);
+  g_free (cdata);
+}
+
+static void
+gst_nv_vp9_dec_init (GstNvVp9Dec * self)
+{
+  GstNvVp9DecClass *klass = GST_NV_VP9_DEC_GET_CLASS (self);
+
+  self->decoder =
+      gst_nv_decoder_new (klass->cuda_device_id, klass->adapter_luid);
+
+  self->num_output_surfaces = DEFAULT_NUM_OUTPUT_SURFACES;
+  self->max_display_delay = DEFAULT_MAX_DISPLAY_DELAY;
+}
+
+static void
+gst_nv_vp9_dec_finalize (GObject * object)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (object);
+
+  gst_object_unref (self->decoder);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gst_nv_vp9_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (object);
+
+  switch (prop_id) {
+    case PROP_NUM_OUTPUT_SURFACES:
+      self->num_output_surfaces = g_value_get_uint (value);
+      break;
+    case PROP_INIT_MAX_WIDTH:
+      self->init_max_width = g_value_get_uint (value);
+      break;
+    case PROP_INIT_MAX_HEIGHT:
+      self->init_max_height = g_value_get_uint (value);
+      break;
+    case PROP_MAX_DISPLAY_DELAY:
+      self->max_display_delay = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_vp9_dec_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (object);
+  GstNvVp9DecClass *klass = GST_NV_VP9_DEC_GET_CLASS (object);
+
+  switch (prop_id) {
+    case PROP_CUDA_DEVICE_ID:
+      g_value_set_uint (value, klass->cuda_device_id);
+      break;
+    case PROP_NUM_OUTPUT_SURFACES:
+      g_value_set_uint (value, self->num_output_surfaces);
+      break;
+    case PROP_INIT_MAX_WIDTH:
+      g_value_set_uint (value, self->init_max_width);
+      break;
+    case PROP_INIT_MAX_HEIGHT:
+      g_value_set_uint (value, self->init_max_height);
+      break;
+    case PROP_MAX_DISPLAY_DELAY:
+      g_value_set_int (value, self->max_display_delay);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_nv_vp9_dec_set_context (GstElement * element, GstContext * context)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (element);
+
+  gst_nv_decoder_handle_set_context (self->decoder, element, context);
+
+  GST_ELEMENT_CLASS (parent_class)->set_context (element, context);
+}
+
+static gboolean
+gst_nv_vp9_dec_open (GstVideoDecoder * decoder)
+{
+  GstVp9Decoder *vp9dec = GST_VP9_DECODER (decoder);
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+
+  /* NVDEC doesn't support non-keyframe resolution change and it will result
+   * in outputting broken frames */
+  gst_vp9_decoder_set_non_keyframe_format_change_support (vp9dec, FALSE);
+
+  return gst_nv_decoder_open (self->decoder, GST_ELEMENT (decoder));
+}
+
+static gboolean
+gst_nv_vp9_dec_close (GstVideoDecoder * decoder)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+
+  return gst_nv_decoder_close (self->decoder);
+}
+
+static gboolean
+gst_nv_vp9_dec_stop (GstVideoDecoder * decoder)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+  gboolean ret;
+
+  ret = GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+
+  gst_nv_decoder_reset (self->decoder);
+
+  return ret;
+}
+
+static gboolean
+gst_nv_vp9_dec_negotiate (GstVideoDecoder * decoder)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+  GstVp9Decoder *vp9dec = GST_VP9_DECODER (decoder);
+
+  GST_DEBUG_OBJECT (self, "negotiate");
+
+  if (!gst_nv_decoder_negotiate (self->decoder, decoder, vp9dec->input_state))
+    return FALSE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder);
+}
+
+static gboolean
+gst_nv_vp9_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+
+  if (!gst_nv_decoder_decide_allocation (self->decoder, decoder, query)) {
+    GST_WARNING_OBJECT (self, "Failed to handle decide allocation");
+    return FALSE;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static gboolean
+gst_nv_vp9_dec_sink_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+
+  if (gst_nv_decoder_handle_query (self->decoder, GST_ELEMENT (decoder), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_query (decoder, query);
+}
+
+static gboolean
+gst_nv_vp9_dec_src_query (GstVideoDecoder * decoder, GstQuery * query)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+
+  if (gst_nv_decoder_handle_query (self->decoder, GST_ELEMENT (decoder), query))
+    return TRUE;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->src_query (decoder, query);
+}
+
+static gboolean
+gst_nv_vp9_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_FLUSH_START:
+      gst_nv_decoder_set_flushing (self->decoder, TRUE);
+      break;
+    case GST_EVENT_FLUSH_STOP:
+      gst_nv_decoder_set_flushing (self->decoder, FALSE);
+      break;
+    default:
+      break;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstFlowReturn
+gst_nv_vp9_dec_new_sequence (GstVp9Decoder * decoder,
+    const GstVp9FrameHeader * frame_hdr, gint max_dpb_size)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+  GstNvVp9DecClass *klass = GST_NV_VP9_DEC_GET_CLASS (self);
+  GstVideoFormat out_format = GST_VIDEO_FORMAT_UNKNOWN;
+  GstVideoInfo info;
+  guint max_width, max_height;
+
+  GST_LOG_OBJECT (self, "new sequence");
+
+  self->width = frame_hdr->width;
+  self->height = frame_hdr->height;
+  self->profile = (GstVP9Profile) frame_hdr->profile;
+
+  if (self->profile == GST_VP9_PROFILE_0) {
+    out_format = GST_VIDEO_FORMAT_NV12;
+  } else if (self->profile == GST_VP9_PROFILE_2) {
+    if (frame_hdr->bit_depth == 10) {
+      out_format = GST_VIDEO_FORMAT_P010_10LE;
+    } else {
+      out_format = GST_VIDEO_FORMAT_P012_LE;
+    }
+  }
+
+  if (out_format == GST_VIDEO_FORMAT_UNKNOWN) {
+    GST_ERROR_OBJECT (self, "Could not support profile %d", self->profile);
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  gst_video_info_set_format (&info, out_format, self->width, self->height);
+
+  max_width = gst_nv_decoder_get_max_output_size (self->width,
+      self->init_max_width, klass->max_width);
+  max_height = gst_nv_decoder_get_max_output_size (self->height,
+      self->init_max_height, klass->max_height);
+
+  if (!gst_nv_decoder_configure (self->decoder,
+          cudaVideoCodec_VP9, &info, self->width, self->height,
+          frame_hdr->bit_depth, max_dpb_size, FALSE,
+          self->num_output_surfaces, max_width, max_height)) {
+    GST_ERROR_OBJECT (self, "Failed to configure decoder");
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+    GST_ERROR_OBJECT (self, "Failed to negotiate with downstream");
+    return GST_FLOW_NOT_NEGOTIATED;
+  }
+
+  memset (&self->params, 0, sizeof (CUVIDPICPARAMS));
+
+  self->params.CodecSpecific.vp9.colorSpace = frame_hdr->color_space;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_vp9_dec_new_picture (GstVp9Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp9Picture * picture)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+
+  return gst_nv_decoder_new_picture (self->decoder,
+      GST_CODEC_PICTURE (picture));
+}
+
+static GstNvDecSurface *
+gst_nv_vp9_dec_get_decoder_frame_from_picture (GstNvVp9Dec * self,
+    GstVp9Picture * picture)
+{
+  GstNvDecSurface *surface;
+
+  surface = (GstNvDecSurface *) gst_vp9_picture_get_user_data (picture);
+  if (!surface)
+    GST_DEBUG_OBJECT (self, "current picture does not have decoder surface");
+
+  return surface;
+}
+
+static GstVp9Picture *
+gst_nv_vp9_dec_duplicate_picture (GstVp9Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp9Picture * picture)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+  GstNvDecSurface *surface;
+  GstVp9Picture *new_picture;
+
+  surface = gst_nv_vp9_dec_get_decoder_frame_from_picture (self, picture);
+
+  if (!surface) {
+    GST_ERROR_OBJECT (self, "Parent picture does not have decoder surface");
+    return nullptr;
+  }
+
+  new_picture = gst_vp9_picture_new ();
+  new_picture->frame_hdr = picture->frame_hdr;
+
+  gst_vp9_picture_set_user_data (new_picture,
+      gst_nv_dec_surface_ref (surface),
+      (GDestroyNotify) gst_nv_dec_surface_unref);
+
+  return new_picture;
+}
+
+static GstFlowReturn
+gst_nv_vp9_dec_decode_picture (GstVp9Decoder * decoder,
+    GstVp9Picture * picture, GstVp9Dpb * dpb)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+  const GstVp9FrameHeader *frame_hdr = &picture->frame_hdr;
+  const GstVp9LoopFilterParams *lfp = &frame_hdr->loop_filter_params;
+  const GstVp9SegmentationParams *sp = &frame_hdr->segmentation_params;
+  const GstVp9QuantizationParams *qp = &frame_hdr->quantization_params;
+  CUVIDPICPARAMS *params = &self->params;
+  CUVIDVP9PICPARAMS *vp9_params = &params->CodecSpecific.vp9;
+  GstNvDecSurface *surface;
+  GstNvDecSurface *other_surface;
+  guint offset = 0;
+  guint8 ref_frame_mapGST_VP9_REF_FRAMES;
+  gint i;
+
+  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->mbRefLfDelta) ==
+      GST_VP9_MAX_REF_LF_DELTAS);
+  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->mbModeLfDelta) ==
+      GST_VP9_MAX_MODE_LF_DELTAS);
+  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->mb_segment_tree_probs) ==
+      GST_VP9_SEG_TREE_PROBS);
+  G_STATIC_ASSERT (sizeof (vp9_params->mb_segment_tree_probs) ==
+      sizeof (sp->segmentation_tree_probs));
+  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->segment_pred_probs) ==
+      GST_VP9_PREDICTION_PROBS);
+  G_STATIC_ASSERT (sizeof (vp9_params->segment_pred_probs) ==
+      sizeof (sp->segmentation_pred_prob));
+  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->refFrameSignBias) ==
+      GST_VP9_REFS_PER_FRAME + 1);
+  G_STATIC_ASSERT (sizeof (vp9_params->refFrameSignBias) ==
+      sizeof (frame_hdr->ref_frame_sign_bias));
+  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->activeRefIdx) ==
+      GST_VP9_REFS_PER_FRAME);
+  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->segmentFeatureEnable) ==
+      GST_VP9_MAX_SEGMENTS);
+  G_STATIC_ASSERT (sizeof (vp9_params->segmentFeatureEnable) ==
+      sizeof (sp->feature_enabled));
+  G_STATIC_ASSERT (G_N_ELEMENTS (vp9_params->segmentFeatureData) ==
+      GST_VP9_MAX_SEGMENTS);
+  G_STATIC_ASSERT (sizeof (vp9_params->segmentFeatureData) ==
+      sizeof (sp->feature_data));
+
+  GST_LOG_OBJECT (self, "Decode picture, size %" G_GSIZE_FORMAT, picture->size);
+
+  surface = gst_nv_vp9_dec_get_decoder_frame_from_picture (self, picture);
+  if (!surface) {
+    GST_ERROR_OBJECT (self, "Decoder frame is unavailable");
+    return GST_FLOW_ERROR;
+  }
+
+  params->nBitstreamDataLen = picture->size;
+  params->pBitstreamData = picture->data;
+  params->nNumSlices = 1;
+  params->pSliceDataOffsets = &offset;
+
+  params->PicWidthInMbs = GST_ROUND_UP_16 (frame_hdr->width) >> 4;
+  params->FrameHeightInMbs = GST_ROUND_UP_16 (frame_hdr->height) >> 4;
+  params->CurrPicIdx = surface->index;
+
+  vp9_params->width = frame_hdr->width;
+  vp9_params->height = frame_hdr->height;
+
+  for (i = 0; i < GST_VP9_REF_FRAMES; i++) {
+    if (dpb->pic_listi) {
+      other_surface = gst_nv_vp9_dec_get_decoder_frame_from_picture (self,
+          dpb->pic_listi);
+      if (!other_surface) {
+        GST_ERROR_OBJECT (self, "Couldn't get decoder frame from picture");
+        return GST_FLOW_ERROR;
+      }
+
+      ref_frame_mapi = other_surface->index;
+    } else {
+      ref_frame_mapi = 0xff;
+    }
+  }
+
+  vp9_params->LastRefIdx = ref_frame_mapframe_hdr->ref_frame_idx0;
+  vp9_params->GoldenRefIdx = ref_frame_mapframe_hdr->ref_frame_idx1;
+  vp9_params->AltRefIdx = ref_frame_mapframe_hdr->ref_frame_idx2;
+
+  vp9_params->profile = frame_hdr->profile;
+  vp9_params->frameContextIdx = frame_hdr->frame_context_idx;
+  vp9_params->frameType = frame_hdr->frame_type;
+  vp9_params->showFrame = frame_hdr->show_frame;
+  vp9_params->errorResilient = frame_hdr->error_resilient_mode;
+  vp9_params->frameParallelDecoding = frame_hdr->frame_parallel_decoding_mode;
+  vp9_params->subSamplingX = frame_hdr->subsampling_x;
+  vp9_params->subSamplingY = frame_hdr->subsampling_y;
+  vp9_params->intraOnly = frame_hdr->intra_only;
+  vp9_params->allow_high_precision_mv = frame_hdr->allow_high_precision_mv;
+  vp9_params->refreshEntropyProbs = frame_hdr->refresh_frame_context;
+  vp9_params->bitDepthMinus8Luma = frame_hdr->bit_depth - 8;
+  vp9_params->bitDepthMinus8Chroma = frame_hdr->bit_depth - 8;
+
+  vp9_params->loopFilterLevel = lfp->loop_filter_level;
+  vp9_params->loopFilterSharpness = lfp->loop_filter_sharpness;
+  vp9_params->modeRefLfEnabled = lfp->loop_filter_delta_enabled;
+
+  vp9_params->log2_tile_columns = frame_hdr->tile_cols_log2;
+  vp9_params->log2_tile_rows = frame_hdr->tile_rows_log2;
+
+  vp9_params->segmentEnabled = sp->segmentation_enabled;
+  vp9_params->segmentMapUpdate = sp->segmentation_update_map;
+  vp9_params->segmentMapTemporalUpdate = sp->segmentation_temporal_update;
+  vp9_params->segmentFeatureMode = sp->segmentation_abs_or_delta_update;
+
+  vp9_params->qpYAc = qp->base_q_idx;
+  vp9_params->qpYDc = qp->delta_q_y_dc;
+  vp9_params->qpChDc = qp->delta_q_uv_dc;
+  vp9_params->qpChAc = qp->delta_q_uv_ac;
+
+  vp9_params->resetFrameContext = frame_hdr->reset_frame_context;
+  vp9_params->mcomp_filter_type = frame_hdr->interpolation_filter;
+  vp9_params->frameTagSize = frame_hdr->frame_header_length_in_bytes;
+  vp9_params->offsetToDctParts = frame_hdr->header_size_in_bytes;
+
+  for (i = 0; i < GST_VP9_MAX_REF_LF_DELTAS; i++)
+    vp9_params->mbRefLfDeltai = lfp->loop_filter_ref_deltasi;
+
+  for (i = 0; i < GST_VP9_MAX_MODE_LF_DELTAS; i++)
+    vp9_params->mbModeLfDeltai = lfp->loop_filter_mode_deltasi;
+
+  memcpy (vp9_params->mb_segment_tree_probs, sp->segmentation_tree_probs,
+      sizeof (sp->segmentation_tree_probs));
+  memcpy (vp9_params->segment_pred_probs, sp->segmentation_pred_prob,
+      sizeof (sp->segmentation_pred_prob));
+  memcpy (vp9_params->refFrameSignBias, frame_hdr->ref_frame_sign_bias,
+      sizeof (frame_hdr->ref_frame_sign_bias));
+
+  for (i = 0; i < GST_VP9_REFS_PER_FRAME; i++) {
+    vp9_params->activeRefIdxi = frame_hdr->ref_frame_idxi;
+  }
+
+  memcpy (vp9_params->segmentFeatureEnable, sp->feature_enabled,
+      sizeof (sp->feature_enabled));
+  memcpy (vp9_params->segmentFeatureData, sp->feature_data,
+      sizeof (sp->feature_data));
+
+  if (!gst_nv_decoder_decode (self->decoder, &self->params))
+    return GST_FLOW_ERROR;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_nv_vp9_dec_output_picture (GstVp9Decoder * decoder,
+    GstVideoCodecFrame * frame, GstVp9Picture * picture)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+
+  return gst_nv_decoder_output_picture (self->decoder,
+      GST_VIDEO_DECODER (decoder), frame, GST_CODEC_PICTURE (picture), 0);
+}
+
+static guint
+gst_nv_vp9_dec_get_preferred_output_delay (GstVp9Decoder * decoder,
+    gboolean is_live)
+{
+  GstNvVp9Dec *self = GST_NV_VP9_DEC (decoder);
+
+  if (self->max_display_delay >= 0)
+    return self->max_display_delay;
+
+  /* Prefer to zero latency for live pipeline */
+  if (is_live)
+    return 0;
+
+  return 2;
+}
+
+void
+gst_nv_vp9_dec_register (GstPlugin * plugin, guint device_id,
+    gint64 adapter_luid, guint rank, GstCaps * sink_caps, GstCaps * src_caps)
+{
+  GType type;
+  gchar *type_name;
+  gchar *feature_name;
+  GstNvDecoderClassData *cdata;
+  gint index = 0;
+  const GValue *value;
+  GstStructure *s;
+  GTypeInfo type_info = {
+    sizeof (GstNvVp9DecClass),
+    nullptr,
+    nullptr,
+    (GClassInitFunc) gst_nv_vp9_dec_class_init,
+    nullptr,
+    nullptr,
+    sizeof (GstNvVp9Dec),
+    0,
+    (GInstanceInitFunc) gst_nv_vp9_dec_init,
+  };
+
+  GST_DEBUG_CATEGORY_INIT (gst_nv_vp9_dec_debug, "nvvp9dec", 0, "nvvp9dec");
+
+  cdata = g_new0 (GstNvDecoderClassData, 1);
+
+  s = gst_caps_get_structure (sink_caps, 0);
+  value = gst_structure_get_value (s, "width");
+  cdata->max_width = (guint) gst_value_get_int_range_max (value);
+
+  value = gst_structure_get_value (s, "height");
+  cdata->max_height = (guint) gst_value_get_int_range_max (value);
+
+  cdata->sink_caps = gst_caps_copy (sink_caps);
+  gst_caps_set_simple (cdata->sink_caps,
+      "alignment", G_TYPE_STRING, "frame", nullptr);
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  cdata->src_caps = gst_caps_ref (src_caps);
+  cdata->cuda_device_id = device_id;
+  cdata->adapter_luid = adapter_luid;
+
+  type_name = g_strdup ("GstNvVp9Dec");
+  feature_name = g_strdup ("nvvp9dec");
+
+  while (g_type_from_name (type_name)) {
+    index++;
+    g_free (type_name);
+    g_free (feature_name);
+    type_name = g_strdup_printf ("GstNvVp9Device%dDec", index);
+    feature_name = g_strdup_printf ("nvvp9device%ddec", index);
+  }
+
+  type_info.class_data = cdata;
+
+  type = g_type_register_static (GST_TYPE_VP9_DECODER,
+      type_name, &type_info, (GTypeFlags) 0);
+
+  /* make lower rank than default device */
+  if (rank > 0 && index > 0)
+    rank--;
+
+  if (!gst_element_register (plugin, feature_name, rank, type))
+    GST_WARNING ("Failed to register plugin '%s'", type_name);
+
+  g_free (type_name);
+  g_free (feature_name);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/gstnvvp9dec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/gstnvvp9dec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/meson.build Changed

@@ -2,23 +2,30 @@
   'gstcudabasetransform.c',
   'gstcudaconverter.c',
   'gstcudaconvertscale.c',
-  'gstcudafilter.c',
+  'gstcudaipc.cpp',
+  'gstcudaipcclient.cpp',
+  'gstcudaipcserver.cpp',
+  'gstcudaipcsink.cpp',
+  'gstcudaipcsrc.cpp',
   'gstcudamemorycopy.c',
   'gstcuvidloader.c',
-  'gstnvav1dec.c',
+  'gstnvav1dec.cpp',
   'gstnvbaseenc.c',
   'gstnvdec.c',
-  'gstnvdecoder.c',
+  'gstnvdecobject.cpp',
+  'gstnvdecoder.cpp',
   'gstnvenc.c',
+  'gstnvencobject.cpp',
   'gstnvencoder.cpp',
+  'gstnvh264dec.cpp',
   'gstnvh264enc.c',
   'gstnvh264encoder.cpp',
+  'gstnvh265dec.cpp',
   'gstnvh265enc.c',
   'gstnvh265encoder.cpp',
-  'gstnvh264dec.c',
-  'gstnvh265dec.c',
-  'gstnvvp8dec.c',
-  'gstnvvp9dec.c',
+  'gstnvjpegenc.cpp',
+  'gstnvvp8dec.cpp',
+  'gstnvvp9dec.cpp',
   'plugin.c',
 
 
@@ -26,6 +33,16 @@
   'gstcudanvmm.c',
 
 
+nvcodec_win32_sources = 
+  'gstcudaipcclient_win32.cpp',
+  'gstcudaipcserver_win32.cpp',
+
+
+nvcodec_unix_sources = 
+  'gstcudaipcclient_unix.cpp',
+  'gstcudaipcserver_unix.cpp',
+
+
 if get_option('nvcodec').disabled()
   subdir_done()
 endif
@@ -39,13 +56,10 @@
 
 plugin_incdirs = configinc, cuda_stubinc
 extra_args = '-DGST_USE_UNSTABLE_API'
+extra_deps = 
 
 if gstgl_dep.found()
-  extra_args += '-DHAVE_NVCODEC_GST_GL=1'
-endif
-
-if gstd3d11_dep.found()
-  extra_args += '-DGST_CUDA_HAS_D3D=1', '-DCOBJMACROS'
+  extra_args += '-DHAVE_CUDA_GST_GL'
 endif
 
 if host_system == 'linux'
@@ -62,6 +76,13 @@
     extra_args += '-DHAVE_NVCODEC_NVMM'
     nvcodec_sources += nvmm_sources
   endif
+
+  gio_unix_dep = dependency('gio-unix-2.0', required : get_option('nvcodec'))
+  extra_deps += gio_dep, gio_unix_dep
+
+  nvcodec_sources += nvcodec_unix_sources
+else
+  nvcodec_sources += nvcodec_win32_sources
 endif
 
 if cc.get_id() != 'msvc'
@@ -84,7 +105,10 @@
   c_args : gst_plugins_bad_args + extra_args,
   cpp_args : gst_plugins_bad_args + extra_args,
   include_directories : plugin_incdirs,
-  dependencies : gstbase_dep, gstvideo_dep, gstpbutils_dep, gstgl_dep, gstglproto_dep, gmodule_dep, gstcodecs_dep, gstd3d11_dep, gstcuda_dep,
+  dependencies : gstbase_dep, gstvideo_dep, gstpbutils_dep, gstgl_dep,
+                  gstglproto_dep, gmodule_dep, gstcodecs_dep,
+                  gstd3d11_dep, gstcuda_dep + extra_deps,
+  override_options : 'cpp_std=c++14',
   install : true,
   install_dir : plugins_install_dir,
 )

gst-plugins-bad-1.22.7.tar.xz/sys/nvcodec/plugin.c -> gst-plugins-bad-1.24.5.tar.xz/sys/nvcodec/plugin.c Changed

@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 
+#include <gst/cuda/gstcuda.h>
 #include "gstnvdec.h"
 #include "gstnvenc.h"
 #include "gstnvav1dec.h"
@@ -38,17 +39,22 @@
 #include "gstnvvp9dec.h"
 #include "gstnvdecoder.h"
 #include "gstcudamemorycopy.h"
-#include "gstcudafilter.h"
-#include <gst/cuda/gstcudamemory.h>
+#include "gstcudaconvertscale.h"
 #ifdef HAVE_NVCODEC_NVMM
 #include "gstcudanvmm.h"
 #endif
 
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
 #include <gst/d3d11/gstd3d11.h>
 #endif
 #include "gstnvh264encoder.h"
 #include "gstnvh265encoder.h"
+#include "gstcudaipcsink.h"
+#include "gstcudaipcsrc.h"
+#include "gstnvcodecutils.h"
+#include "gstnvjpegenc.h"
+
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY (gst_nvcodec_debug);
 GST_DEBUG_CATEGORY (gst_nvdec_debug);
@@ -61,6 +67,51 @@
 
 #define GST_CAT_DEFAULT gst_nvcodec_debug
 
+#ifdef G_OS_WIN32
+#define CUDA_LIBNAME "nvcuda.dll"
+#define NVCUVID_LIBNAME "nvcuvid.dll"
+#ifdef _WIN64
+#define NVENC_LIBNAME "nvEncodeAPI64.dll"
+#else
+#define NVENC_LIBNAME "nvEncodeAPI.dll"
+#endif
+#define NVRTC_LIBNAME "nvrtc64_*_0.dll"
+#else /* G_OS_WIN32 */
+#define CUDA_LIBNAME "libcuda.so.1"
+#define NVCUVID_LIBNAME "libnvcuvid.so.1"
+#define NVENC_LIBNAME "libnvidia-encode.so.1"
+#define NVRTC_LIBNAME "libnvrtc.so"
+#endif /* G_OS_WIN32 */
+
+static void
+plugin_deinit (gpointer data)
+{
+  gst_cuda_ipc_client_deinit ();
+}
+
+static gboolean
+check_runtime_compiler (void)
+{
+  /* *INDENT-OFF* */
+  const gchar *nvrtc_test_source =
+    "__global__ void\n"
+    "my_kernel (void) {}";
+  /* *INDENT-ON* */
+
+  gchar *test_ptx;
+
+  if (!gst_cuda_nvrtc_load_library ())
+    return FALSE;
+
+  test_ptx = gst_cuda_nvrtc_compile (nvrtc_test_source);
+  if (!test_ptx)
+    return FALSE;
+
+  g_free (test_ptx);
+
+  return TRUE;
+}
+
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
@@ -73,13 +124,9 @@
   /* hardcoded minimum supported version */
   guint api_major_ver = 8;
   guint api_minor_ver = 1;
-  const gchar *env;
-  gboolean use_h264_sl_dec = FALSE;
-  gboolean use_h265_sl_dec = FALSE;
-  gboolean use_vp8_sl_dec = FALSE;
-  gboolean use_vp9_sl_dec = FALSE;
   GList *h264_enc_cdata = NULL;
   GList *h265_enc_cdata = NULL;
+  gboolean have_nvrtc = FALSE;
 
   GST_DEBUG_CATEGORY_INIT (gst_nvcodec_debug, "nvcodec", 0, "nvcodec");
   GST_DEBUG_CATEGORY_INIT (gst_nvdec_debug, "nvdec", 0, "nvdec");
@@ -91,20 +138,24 @@
 #endif
 
   if (!gst_cuda_load_library ()) {
-    GST_WARNING ("Failed to load cuda library");
+    gst_plugin_add_status_warning (plugin,
+        "CUDA library \"" CUDA_LIBNAME "\" was not found.");
     return TRUE;
   }
 
   /* get available API version from nvenc and it will be passed to
    * nvdec */
   if (!gst_nvenc_load_library (&api_major_ver, &api_minor_ver)) {
-    GST_WARNING ("Failed to load nvenc library");
+    gst_plugin_add_status_warning (plugin,
+        "NVENC library \"" NVENC_LIBNAME "\" was not found.");
     nvenc_available = FALSE;
   }
 
   if (!gst_cuvid_load_library (api_major_ver, api_minor_ver)) {
     GST_WARNING ("Failed to load nvdec library version %u.%u", api_major_ver,
         api_minor_ver);
+    gst_plugin_add_status_warning (plugin,
+        "NVDEC library \"" NVCUVID_LIBNAME "\" was not found.");
     nvdec_available = FALSE;
   }
 
@@ -117,6 +168,13 @@
     CuGetErrorString (cuda_ret, &err_desc);
     GST_ERROR ("Failed to init cuda, cuInit ret: 0x%x: %s: %s",
         (int) cuda_ret, err_name, err_desc);
+
+    /* to abort if GST_CUDA_CRITICAL_ERRORS is configured */
+    gst_cuda_result (CUDA_ERROR_NO_DEVICE);
+
+    gst_plugin_add_status_error (plugin,
+        N_("Unable to initialize CUDA library."));
+
     return TRUE;
   }
 
@@ -126,44 +184,32 @@
     CuGetErrorString (cuda_ret, &err_desc);
     GST_ERROR ("No available device, cuDeviceGetCount ret: 0x%x: %s %s",
         (int) cuda_ret, err_name, err_desc);
+
+    gst_plugin_add_status_warning (plugin,
+        N_("No NVIDIA graphics cards detected!"));
+
     return TRUE;
   }
 
-  /* check environment to determine primary h264decoder */
-  env = g_getenv ("GST_USE_NV_STATELESS_CODEC");
-  if (env) {
-    gchar **split;
-    gchar **iter;
-
-    split = g_strsplit (env, ",", 0);
-
-    for (iter = split; *iter; iter++) {
-      if (g_ascii_strcasecmp (*iter, "h264") == 0) {
-        GST_INFO ("Found %s in GST_USE_NV_STATELESS_CODEC environment", *iter);
-        use_h264_sl_dec = TRUE;
-      } else if (g_ascii_strcasecmp (*iter, "h265") == 0) {
-        GST_INFO ("Found %s in GST_USE_NV_STATELESS_CODEC environment", *iter);
-        use_h265_sl_dec = TRUE;
-      } else if (g_ascii_strcasecmp (*iter, "vp8") == 0) {
-        GST_INFO ("Found %s in GST_USE_NV_STATELESS_CODEC environment", *iter);
-        use_vp8_sl_dec = TRUE;
-      } else if (g_ascii_strcasecmp (*iter, "vp9") == 0) {
-        GST_INFO ("Found %s in GST_USE_NV_STATELESS_CODEC environment", *iter);
-        use_vp9_sl_dec = TRUE;
-      }
-    }
-
-    g_strfreev (split);
+  have_nvrtc = check_runtime_compiler ();
+  if (!have_nvrtc) {
+    gst_plugin_add_status_info (plugin,
+        "CUDA runtime compilation library \"" NVRTC_LIBNAME "\" was not found, "
+        "check CUDA toolkit package installation");
   }
 
   for (i = 0; i < dev_count; i++) {
     GstCudaContext *context = gst_cuda_context_new (i);
     CUcontext cuda_ctx;
+    gint64 adapter_luid = 0;
 
     if (!context) {
       GST_WARNING ("Failed to create context for device %d", i);
       continue;
     }
+#ifdef G_OS_WIN32
+    g_object_get (context, "dxgi-adapter-luid", &adapter_luid, NULL);
+#endif
 
     cuda_ctx = gst_cuda_context_get_handle (context);
     if (nvdec_available) {
@@ -173,7 +219,7 @@
         GstCaps *sink_template = NULL;
         GstCaps *src_template = NULL;
         cudaVideoCodec codec = (cudaVideoCodec) j;
-        gboolean register_cuviddec = TRUE;
+        gboolean register_cuviddec = FALSE;
 
         if (gst_nv_decoder_check_device_caps (cuda_ctx,
                 codec, &sink_template, &src_template)) {
@@ -185,59 +231,30 @@
 
           switch (codec) {
             case cudaVideoCodec_H264:
-              gst_nv_h264_dec_register (plugin,
-                  i, GST_RANK_SECONDARY, sink_template, src_template, FALSE);
-              if (use_h264_sl_dec) {
-                GST_INFO
-                    ("Skipping registration of CUVID parser based nvh264dec element");
-                register_cuviddec = FALSE;
-
-                gst_nv_h264_dec_register (plugin,
-                    i, GST_RANK_PRIMARY, sink_template, src_template, TRUE);
-              }
+              /* higher than avdec_h264 */
+              gst_nv_h264_dec_register (plugin, i, adapter_luid,
+                  GST_RANK_PRIMARY + 1, sink_template, src_template);
               break;
             case cudaVideoCodec_HEVC:
-              gst_nv_h265_dec_register (plugin,
-                  i, GST_RANK_SECONDARY, sink_template, src_template, FALSE);
-              if (use_h265_sl_dec) {
-                GST_INFO
-                    ("Skipping registration of CUVID parser based nvh265dec element");
-                register_cuviddec = FALSE;
-
-                gst_nv_h265_dec_register (plugin,
-                    i, GST_RANK_PRIMARY, sink_template, src_template, TRUE);
-              }
+              /* higher than avdec_h265 */
+              gst_nv_h265_dec_register (plugin, i, adapter_luid,
+                  GST_RANK_PRIMARY + 1, sink_template, src_template);
               break;
             case cudaVideoCodec_VP8:
-              gst_nv_vp8_dec_register (plugin,
-                  i, GST_RANK_SECONDARY, sink_template, src_template, FALSE);
-              if (use_vp8_sl_dec) {
-                GST_INFO
-                    ("Skipping registration of CUVID parser based nvhvp8dec element");
-                register_cuviddec = FALSE;
-
-                gst_nv_vp8_dec_register (plugin,
-                    i, GST_RANK_PRIMARY, sink_template, src_template, TRUE);
-              }
+              gst_nv_vp8_dec_register (plugin, i, adapter_luid,
+                  GST_RANK_PRIMARY, sink_template, src_template);
               break;
             case cudaVideoCodec_VP9:
-              gst_nv_vp9_dec_register (plugin,
-                  i, GST_RANK_SECONDARY, sink_template, src_template, FALSE);
-              if (use_vp9_sl_dec) {
-                GST_INFO ("Skip register cuvid parser based nvhvp9dec");
-                register_cuviddec = FALSE;
-
-                gst_nv_vp9_dec_register (plugin,
-                    i, GST_RANK_PRIMARY, sink_template, src_template, TRUE);
-              }
+              gst_nv_vp9_dec_register (plugin, i, adapter_luid,
+                  GST_RANK_PRIMARY, sink_template, src_template);
               break;
             case cudaVideoCodec_AV1:
-              gst_nv_av1_dec_register (plugin, i, GST_RANK_PRIMARY,
-                  sink_template, src_template);
-              /* Stateless decoder only in case of AV1 */
-              register_cuviddec = FALSE;
+              /* rust dav1ddec has "primary" rank */
+              gst_nv_av1_dec_register (plugin, i, adapter_luid,
+                  GST_RANK_PRIMARY + 1, sink_template, src_template);
               break;
             default:
+              register_cuviddec = TRUE;
               break;
           }
 
@@ -255,12 +272,10 @@
     if (nvenc_available) {
       GstNvEncoderClassData *cdata;
 
-#ifdef GST_CUDA_HAS_D3D
+#ifdef G_OS_WIN32
       if (g_win32_check_windows_version (6, 0, 0, G_WIN32_OS_ANY)) {
-        gint64 adapter_luid;
         GstD3D11Device *d3d11_device;
 
-        g_object_get (context, "dxgi-adapter-luid", &adapter_luid, NULL);
         d3d11_device = gst_d3d11_device_new_for_adapter_luid (adapter_luid,
             D3D11_CREATE_DEVICE_BGRA_SUPPORT);
         if (!d3d11_device) {
@@ -293,6 +308,8 @@
       gst_nvenc_plugin_init (plugin, i, cuda_ctx);
     }
 
+    gst_nv_jpeg_enc_register (plugin, context, GST_RANK_NONE, have_nvrtc);
+
     gst_object_unref (context);
   }
 
@@ -307,7 +324,19 @@
 
   gst_cuda_memory_copy_register (plugin, GST_RANK_NONE);
 
-  gst_cuda_filter_plugin_init (plugin);
+  if (have_nvrtc) {
+    gst_element_register (plugin, "cudaconvert", GST_RANK_NONE,
+        GST_TYPE_CUDA_CONVERT);
+    gst_element_register (plugin, "cudascale", GST_RANK_NONE,
+        GST_TYPE_CUDA_SCALE);
+    gst_element_register (plugin, "cudaconvertscale", GST_RANK_NONE,
+        GST_TYPE_CUDA_CONVERT_SCALE);
+  }
+  gst_element_register (plugin,
+      "cudaipcsink", GST_RANK_NONE, GST_TYPE_CUDA_IPC_SINK);
+  gst_element_register (plugin,
+      "cudaipcsrc", GST_RANK_NONE, GST_TYPE_CUDA_IPC_SRC);
+
   gst_cuda_memory_init_once ();
 
 #ifdef HAVE_NVCODEC_NVMM
@@ -316,6 +345,10 @@
   }
 #endif
 
+  g_object_set_data_full (G_OBJECT (plugin),
+      "plugin-nvcodec-shutdown", (gpointer) "shutdown-data",
+      (GDestroyNotify) plugin_deinit);
+
   return TRUE;
 }

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvallocator.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvallocator.cpp Changed

@@ -149,6 +149,8 @@
 {
   GstQsvAllocatorPrivate *priv;
 
+  self->is_gbr = FALSE;
+
   priv = self->priv = (GstQsvAllocatorPrivate *)
       gst_qsv_allocator_get_instance_private (self);
 
@@ -199,33 +201,7 @@
     return MFX_ERR_UNSUPPORTED;
   }
 
-  switch (request->Info.FourCC) {
-    case MFX_FOURCC_NV12:
-      format = GST_VIDEO_FORMAT_NV12;
-      break;
-    case MFX_FOURCC_P010:
-      format = GST_VIDEO_FORMAT_P010_10LE;
-      break;
-    case MFX_FOURCC_P016:
-      format = GST_VIDEO_FORMAT_P016_LE;
-      break;
-    case MFX_FOURCC_AYUV:
-      format = GST_VIDEO_FORMAT_VUYA;
-      break;
-    case MFX_FOURCC_Y410:
-      format = GST_VIDEO_FORMAT_Y410;
-      break;
-    case MFX_FOURCC_YUY2:
-      format = GST_VIDEO_FORMAT_YUY2;
-      break;
-    case MFX_FOURCC_RGB4:
-      format = GST_VIDEO_FORMAT_BGRA;
-      break;
-    default:
-      /* TODO: add more formats */
-      break;
-  }
-
+  format = gst_qsv_frame_info_format_to_gst (&request->Info, self->is_gbr);
   if (format == GST_VIDEO_FORMAT_UNKNOWN) {
     GST_ERROR_OBJECT (self, "Unknown MFX format fourcc %" GST_FOURCC_FORMAT,
         GST_FOURCC_ARGS (request->Info.FourCC));
@@ -408,49 +384,59 @@
 
   frame->map_count++;
   stride = GST_VIDEO_FRAME_PLANE_STRIDE (&frame->frame, 0);
+  ptr->PitchHigh = (mfxU16) (stride / (1 << 16));
+  ptr->PitchLow = (mfxU16) (stride % (1 << 16));
 
   /* FIXME: check and handle other formats */
   switch (GST_VIDEO_INFO_FORMAT (&frame->info)) {
     case GST_VIDEO_FORMAT_NV12:
     case GST_VIDEO_FORMAT_P010_10LE:
+    case GST_VIDEO_FORMAT_P012_LE:
     case GST_VIDEO_FORMAT_P016_LE:
-      ptr->Pitch = (mfxU16) stride;
       ptr->Y = (mfxU8 *) GST_VIDEO_FRAME_PLANE_DATA (&frame->frame, 0);
       ptr->UV = (mfxU8 *) GST_VIDEO_FRAME_PLANE_DATA (&frame->frame, 1);
       break;
+    case GST_VIDEO_FORMAT_YUY2:
+      ptr->Y = (mfxU8 *) GST_VIDEO_FRAME_PLANE_DATA (&frame->frame, 0);
+      ptr->U = ptr->Y + 1;
+      ptr->V = ptr->Y + 3;
+      break;
+    case GST_VIDEO_FORMAT_Y210:
+    case GST_VIDEO_FORMAT_Y212_LE:
+      ptr->Y16 = (mfxU16 *) GST_VIDEO_FRAME_PLANE_DATA (&frame->frame, 0);
+      ptr->U16 = ptr->Y16 + 1;
+      ptr->V16 = ptr->Y16 + 3;
+      break;
     case GST_VIDEO_FORMAT_VUYA:
-      ptr->PitchHigh = (mfxU16) (stride / (1 << 16));
-      ptr->PitchLow = (mfxU16) (stride % (1 << 16));
+    case GST_VIDEO_FORMAT_RBGA:
       ptr->V = (mfxU8 *) GST_VIDEO_FRAME_PLANE_DATA (&frame->frame, 0);
       ptr->U = ptr->V + 1;
       ptr->Y = ptr->V + 2;
       ptr->A = ptr->V + 3;
       break;
     case GST_VIDEO_FORMAT_Y410:
-      ptr->PitchHigh = (mfxU16) (stride / (1 << 16));
-      ptr->PitchLow = (mfxU16) (stride % (1 << 16));
+    case GST_VIDEO_FORMAT_BGR10A2_LE:
       ptr->Y410 = (mfxY410 *) GST_VIDEO_FRAME_PLANE_DATA (&frame->frame, 0);
       break;
+    case GST_VIDEO_FORMAT_Y412_LE:
+    case GST_VIDEO_FORMAT_BGRA64_LE:
+      ptr->U = (mfxU8 *) GST_VIDEO_FRAME_PLANE_DATA (&frame->frame, 0);
+      ptr->Y = ptr->Y + 2;
+      ptr->V = ptr->Y + 4;
+      ptr->A = ptr->Y + 6;
+      break;
     case GST_VIDEO_FORMAT_BGRA:
-      ptr->Pitch = (mfxU16) stride;
       ptr->B = (mfxU8 *) GST_VIDEO_FRAME_PLANE_DATA (&frame->frame, 0);
       ptr->G = ptr->B + 1;
       ptr->R = ptr->B + 2;
       ptr->A = ptr->B + 3;
       break;
     case GST_VIDEO_FORMAT_RGBA:
-      ptr->Pitch = (mfxU16) stride;
       ptr->R = (mfxU8 *) GST_VIDEO_FRAME_PLANE_DATA (&frame->frame, 0);
       ptr->G = ptr->R + 1;
       ptr->B = ptr->R + 2;
       ptr->A = ptr->R + 3;
       break;
-    case GST_VIDEO_FORMAT_YUY2:
-      ptr->Pitch = (mfxU16) stride;
-      ptr->Y = (mfxU8 *) GST_VIDEO_FRAME_PLANE_DATA (&frame->frame, 0);
-      ptr->U = ptr->Y + 1;
-      ptr->V = ptr->Y + 3;
-      break;
     default:
       break;
   }

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvallocator.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvallocator.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvallocator_d3d11.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvallocator_d3d11.cpp Changed

@@ -89,7 +89,7 @@
     mfxFrameAllocResponse * response)
 {
   GstQsvD3D11Allocator *self = GST_QSV_D3D11_ALLOCATOR (allocator);
-  DXGI_FORMAT dxgi_format = DXGI_FORMAT_UNKNOWN;
+  GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
   GstQsvFrame **mids = nullptr;
 
   /* Something unexpected and went wrong */
@@ -99,37 +99,9 @@
     return MFX_ERR_UNSUPPORTED;
   }
 
-  switch (request->Info.FourCC) {
-    case MFX_FOURCC_NV12:
-      dxgi_format = DXGI_FORMAT_NV12;
-      break;
-    case MFX_FOURCC_P010:
-      dxgi_format = DXGI_FORMAT_P010;
-      break;
-    case MFX_FOURCC_P016:
-      dxgi_format = DXGI_FORMAT_P016;
-      break;
-    case MFX_FOURCC_AYUV:
-      dxgi_format = DXGI_FORMAT_AYUV;
-      break;
-    case MFX_FOURCC_Y410:
-      dxgi_format = DXGI_FORMAT_Y410;
-      break;
-    case MFX_FOURCC_RGB4:
-      dxgi_format = DXGI_FORMAT_B8G8R8A8_UNORM;
-      break;
-    case MFX_FOURCC_BGR4:
-      dxgi_format = DXGI_FORMAT_R8G8B8A8_UNORM;
-      break;
-    case MFX_FOURCC_YUY2:
-      dxgi_format = DXGI_FORMAT_YUY2;
-      break;
-    default:
-      /* TODO: add more formats */
-      break;
-  }
+  format = gst_qsv_frame_info_format_to_gst (&request->Info, allocator->is_gbr);
 
-  if (dxgi_format == DXGI_FORMAT_UNKNOWN &&
+  if (format == GST_VIDEO_FORMAT_UNKNOWN &&
       request->Info.FourCC != MFX_FOURCC_P8) {
     GST_ERROR_OBJECT (self, "Failed to convert %d to DXGI format",
         request->Info.FourCC);
@@ -175,7 +147,6 @@
         nullptr);
   } else {
     GstBufferPool *pool;
-    GstVideoFormat format;
     GstVideoInfo info;
     GstCaps *caps;
     GstStructure *config;
@@ -207,7 +178,6 @@
     mids = g_new0 (GstQsvFrame *, request->NumFrameSuggested);
     response->NumFrameActual = request->NumFrameSuggested;
 
-    format = gst_d3d11_dxgi_format_to_gst (dxgi_format);
     gst_video_info_set_format (&info,
         format, request->Info.CropW, request->Info.CropH);

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvav1enc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvav1enc.cpp Changed

@@ -83,11 +83,10 @@
     {0, nullptr, nullptr}
   };
 
-  if (g_once_init_enter (&rate_control_type)) {
-    GType type =
+  GST_QSV_CALL_ONCE_BEGIN {
+    rate_control_type =
         g_enum_register_static ("GstQsvAV1EncRateControl", rate_controls);
-    g_once_init_leave (&rate_control_type, type);
-  }
+  } GST_QSV_CALL_ONCE_END;
 
   return rate_control_type;
 }
@@ -317,13 +316,11 @@
   if (*old_val == new_val)
     return;
 
-  g_mutex_lock (&self->prop_lock);
   *old_val = new_val;
   if (is_bitrate_param)
     self->bitrate_updated = TRUE;
   else
     self->property_updated = TRUE;
-  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -333,10 +330,8 @@
   if (*old_val == (mfxU16) new_val)
     return;
 
-  g_mutex_lock (&self->prop_lock);
   *old_val = (mfxU16) new_val;
   self->property_updated = TRUE;
-  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -345,6 +340,7 @@
 {
   GstQsvAV1Enc *self = GST_QSV_AV1_ENC (object);
 
+  g_mutex_lock (&self->prop_lock);
   switch (prop_id) {
     case PROP_QP_I:
       gst_qsv_av1_enc_check_update_uint (self, &self->qp_i,
@@ -378,6 +374,7 @@
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
+  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -386,6 +383,7 @@
 {
   GstQsvAV1Enc *self = GST_QSV_AV1_ENC (object);
 
+  g_mutex_lock (&self->prop_lock);
   switch (prop_id) {
     case PROP_QP_I:
       g_value_set_uint (value, self->qp_i);
@@ -412,6 +410,7 @@
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
+  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -460,6 +459,7 @@
   mfxFrameInfo *frame_info;
   mfxExtAV1BitstreamParam *bs_param;
   mfxExtAV1ResolutionParam *res_param;
+  GstVideoFormat format;
 
   frame_info = &param->mfx.FrameInfo;
 
@@ -482,24 +482,15 @@
   frame_info->AspectRatioW = GST_VIDEO_INFO_PAR_N (info);
   frame_info->AspectRatioH = GST_VIDEO_INFO_PAR_D (info);
 
-  switch (GST_VIDEO_INFO_FORMAT (info)) {
+  format = GST_VIDEO_INFO_FORMAT (info);
+  switch (format) {
     case GST_VIDEO_FORMAT_NV12:
-      frame_info->ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-      frame_info->FourCC = MFX_FOURCC_NV12;
-      frame_info->BitDepthLuma = 8;
-      frame_info->BitDepthChroma = 8;
-      frame_info->Shift = 0;
-      break;
     case GST_VIDEO_FORMAT_P010_10LE:
-      frame_info->ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-      frame_info->FourCC = MFX_FOURCC_P010;
-      frame_info->BitDepthLuma = 10;
-      frame_info->BitDepthChroma = 10;
-      frame_info->Shift = 1;
+      gst_qsv_frame_info_set_format (frame_info, format);
       break;
     default:
       GST_ERROR_OBJECT (self, "Unexpected format %s",
-          gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (info)));
+          gst_video_format_to_string (format));
       return FALSE;
   }
 
@@ -678,21 +669,11 @@
   resolution_param.FrameHeight = 240;
 
   /* MAIN profile covers NV12 and P010 */
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  mfx->FrameInfo.FourCC = MFX_FOURCC_NV12;
-  mfx->FrameInfo.BitDepthLuma = 8;
-  mfx->FrameInfo.BitDepthChroma = 8;
-  mfx->FrameInfo.Shift = 0;
-
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_NV12);
   if (MFXVideoENCODE_Query (session, &param, &param) == MFX_ERR_NONE)
     supported_formats.push_back ("NV12");
 
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  mfx->FrameInfo.FourCC = MFX_FOURCC_P010;
-  mfx->FrameInfo.BitDepthLuma = 10;
-  mfx->FrameInfo.BitDepthChroma = 10;
-  mfx->FrameInfo.Shift = 1;
-
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_P010_10LE);
   if (MFXVideoENCODE_Query (session, &param, &param) == MFX_ERR_NONE)
     supported_formats.push_back ("P010_10LE");
 
@@ -701,11 +682,7 @@
     return;
   }
 
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  mfx->FrameInfo.FourCC = MFX_FOURCC_NV12;
-  mfx->FrameInfo.BitDepthLuma = 8;
-  mfx->FrameInfo.BitDepthChroma = 8;
-  mfx->FrameInfo.Shift = 0;
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_NV12);
 
   /* Check max-resolution */
   for (guint i = 0; i < G_N_ELEMENTS (gst_qsv_resolutions); i++) {

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvdecoder.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvdecoder.cpp Changed

@@ -37,6 +37,8 @@
 #include "gstqsvallocator_va.h"
 #endif /* G_OS_WIN32 */
 
+#include <queue>
+
 GST_DEBUG_CATEGORY_STATIC (gst_qsv_decoder_debug);
 #define GST_CAT_DEFAULT gst_qsv_decoder_debug
 
@@ -81,6 +83,8 @@
 
   mfxSession session;
   mfxVideoParam video_param;
+  mfxExtVideoSignalInfo signal_info;
+  mfxExtBuffer *video_param_ext1;
 
   /* holding allocated GstQsvFrame, should be cleared via
    * mfxFrameAllocator::Free() */
@@ -522,6 +526,7 @@
 static GstVideoCodecFrame *
 gst_qsv_decoder_find_output_frame (GstQsvDecoder * self, GstClockTime pts)
 {
+  auto videodec = GST_VIDEO_DECODER (self);
   GList *frames, *iter;
   GstVideoCodecFrame *ret = nullptr;
   GstVideoCodecFrame *closest = nullptr;
@@ -529,9 +534,9 @@
 
   /* give up, just returns the oldest frame */
   if (!GST_CLOCK_TIME_IS_VALID (pts))
-    return gst_video_decoder_get_oldest_frame (GST_VIDEO_DECODER (self));
+    return gst_video_decoder_get_oldest_frame (videodec);
 
-  frames = gst_video_decoder_get_frames (GST_VIDEO_DECODER (self));
+  frames = gst_video_decoder_get_frames (videodec);
 
   for (iter = frames; iter; iter = g_list_next (iter)) {
     GstVideoCodecFrame *frame = (GstVideoCodecFrame *) iter->data;
@@ -562,21 +567,33 @@
   if (ret) {
     gst_video_codec_frame_ref (ret);
 
+    /* Do garbage collection */
+    std::queue < GstVideoCodecFrame * >old_frames;
+
     /* Release older frames, it can happen if input buffer holds only single
-     * field in case of H264 */
+     * field in case of H264 or incomplete AU */
     for (iter = frames; iter; iter = g_list_next (iter)) {
       GstVideoCodecFrame *frame = (GstVideoCodecFrame *) iter->data;
 
       if (frame == ret)
-        continue;
+        break;
 
-      if (!GST_CLOCK_TIME_IS_VALID (frame->pts))
-        continue;
+      old_frames.push (gst_video_codec_frame_ref (frame));
+    }
 
-      if (frame->pts < ret->pts) {
-        gst_video_decoder_release_frame (GST_VIDEO_DECODER (self),
-            gst_video_codec_frame_ref (frame));
-      }
+    GST_LOG_OBJECT (self, "%u frames are queued before the current output",
+        (guint) old_frames.size ());
+
+    while (old_frames.size () > 16) {
+      auto front = old_frames.front ();
+      old_frames.pop ();
+      gst_video_decoder_release_frame (videodec, front);
+    }
+
+    while (!old_frames.empty ()) {
+      auto front = old_frames.front ();
+      old_frames.pop ();
+      gst_video_codec_frame_unref (front);
     }
   } else {
     ret = gst_video_decoder_get_oldest_frame (GST_VIDEO_DECODER (self));
@@ -888,6 +905,10 @@
 
   memset (&priv->video_param, 0, sizeof (mfxVideoParam));
   priv->video_param.mfx.CodecId = klass->codec_id;
+  priv->signal_info.Header.BufferId = MFX_EXTBUFF_VIDEO_SIGNAL_INFO;
+  priv->signal_info.Header.BufferSz = sizeof (mfxExtVideoSignalInfo);
+  priv->video_param_ext0 = (mfxExtBuffer *) & priv->signal_info;
+  priv->video_param.ExtParam = priv->video_param_ext;
 
   /* If upstream is live, we will use single async-depth for low-latency
    * decoding */
@@ -1199,6 +1220,7 @@
   mfxFrameInfo *frame_info = &param->mfx.FrameInfo;
   GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
   GstVideoInterlaceMode interlace_mode = GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
+  gboolean is_gbr = FALSE;
 
   width = coded_width = frame_info->Width;
   height = coded_height = frame_info->Height;
@@ -1208,23 +1230,16 @@
     height = frame_info->CropH;
   }
 
-  switch (frame_info->FourCC) {
-    case MFX_FOURCC_NV12:
-      format = GST_VIDEO_FORMAT_NV12;
-      break;
-    case MFX_FOURCC_P010:
-      format = GST_VIDEO_FORMAT_P010_10LE;
-      break;
-    case MFX_FOURCC_P016:
-      format = GST_VIDEO_FORMAT_P016_LE;
-      break;
-    case MFX_FOURCC_RGB4:
-      format = GST_VIDEO_FORMAT_BGRA;
-      break;
-    default:
-      break;
+  if (klass->codec_id == MFX_CODEC_HEVC &&
+      priv->signal_info.ColourDescriptionPresent &&
+      gst_video_color_matrix_from_iso (priv->signal_info.MatrixCoefficients) ==
+      GST_VIDEO_COLOR_MATRIX_RGB) {
+    is_gbr = TRUE;
   }
 
+  if (priv->allocator)
+    priv->allocator->is_gbr = is_gbr;
+
   if (klass->codec_id == MFX_CODEC_JPEG) {
     if (param->mfx.JPEGChromaFormat == MFX_CHROMAFORMAT_YUV422) {
       format = GST_VIDEO_FORMAT_YUY2;
@@ -1235,6 +1250,8 @@
       frame_info->FourCC = MFX_FOURCC_RGB4;
       frame_info->ChromaFormat = MFX_CHROMAFORMAT_YUV444;
     }
+  } else {
+    format = gst_qsv_frame_info_format_to_gst (frame_info, is_gbr);
   }
 
   if (format == GST_VIDEO_FORMAT_UNKNOWN) {
@@ -1352,7 +1369,7 @@
             D3D11_FORMAT_SUPPORT_SHADER_SAMPLE) != 0)
       bind_flags |= D3D11_BIND_SHADER_RESOURCE;
 
-    d3d11_params->desc0.BindFlags |= bind_flags;
+    gst_d3d11_allocation_params_set_bind_flags (d3d11_params, bind_flags);
     gst_buffer_pool_config_set_d3d11_allocation_params (config, d3d11_params);
     gst_d3d11_allocation_params_free (d3d11_params);
   }
@@ -1467,8 +1484,11 @@
 
 new_sequence:
   if (!priv->decoder) {
+    if (klass->codec_id == MFX_CODEC_HEVC)
+      priv->video_param.NumExtParam = 1;
     status = MFXVideoDECODE_DecodeHeader (priv->session,
         &bs, &priv->video_param);
+    priv->video_param.NumExtParam = 0;
 
     if (status != MFX_ERR_NONE) {
       if (status == MFX_ERR_MORE_DATA) {

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvencoder.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvencoder.cpp Changed

@@ -74,11 +74,10 @@
     {0, nullptr, nullptr}
   };
 
-  if (g_once_init_enter (&coding_opt_type)) {
-    GType type = g_enum_register_static ("GstQsvCodingOption",
+  GST_QSV_CALL_ONCE_BEGIN {
+    coding_opt_type = g_enum_register_static ("GstQsvCodingOption",
         coding_opts);
-    g_once_init_leave (&coding_opt_type, type);
-  }
+  } GST_QSV_CALL_ONCE_END;
 
   return coding_opt_type;
 }
@@ -982,8 +981,7 @@
 
   gst_allocation_params_init (&params);
 
-  priv->internal_pool = gst_va_pool_new_with_config (caps,
-      GST_VIDEO_INFO_SIZE (aligned_info), 0, 0,
+  priv->internal_pool = gst_va_pool_new_with_config (caps, 0, 0,
       VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC, GST_VA_FEATURE_AUTO,
       allocator, &params);
   gst_object_unref (allocator);
@@ -1593,8 +1591,7 @@
     return FALSE;
   }
 
-  pool = gst_va_pool_new_with_config (caps,
-      GST_VIDEO_INFO_SIZE (&info), priv->surface_pool->len, 0,
+  pool = gst_va_pool_new_with_config (caps, priv->surface_pool->len, 0,
       VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC, GST_VA_FEATURE_AUTO,
       allocator, &params);

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvh264dec.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvh264dec.cpp Changed

@@ -302,7 +302,7 @@
 
   s = gst_caps_get_structure (state->caps, 0);
   str = gst_structure_get_string (s, "stream-format");
-  if ((g_strcmp0 (str, "avc") == 0 || g_strcmp0 (str, "avc3")) &&
+  if ((g_strcmp0 (str, "avc") == 0 || g_strcmp0 (str, "avc3") == 0) &&
       state->codec_data) {
     self->packetized = TRUE;
     /* Will be updated */
@@ -403,7 +403,7 @@
     memcpy (data + sizeof (start_code), nalu.data + nalu.offset, nalu.size);
 
     mem = gst_memory_new_wrapped ((GstMemoryFlags) 0, data, size, 0, size,
-        nullptr, (GDestroyNotify) g_free);
+        data, (GDestroyNotify) g_free);
     gst_buffer_append_memory (new_buf, mem);
   } while (pres == GST_H264_PARSER_OK);
 
@@ -460,12 +460,9 @@
   mfx->FrameInfo.FrameRateExtD = 1;
   mfx->FrameInfo.AspectRatioW = 1;
   mfx->FrameInfo.AspectRatioH = 1;
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  mfx->FrameInfo.FourCC = MFX_FOURCC_NV12;
-  mfx->FrameInfo.BitDepthLuma = 8;
-  mfx->FrameInfo.BitDepthChroma = 8;
   mfx->FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
   mfx->CodecProfile = MFX_PROFILE_AVC_MAIN;
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_NV12);
 
   /* Check max-resolution */
   for (guint i = 0; i < G_N_ELEMENTS (gst_qsv_resolutions); i++) {

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvh264enc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvh264enc.cpp Changed

@@ -95,11 +95,10 @@
     {0, nullptr, nullptr}
   };
 
-  if (g_once_init_enter (&sei_insert_mode_type)) {
-    GType type =
+  GST_QSV_CALL_ONCE_BEGIN {
+    sei_insert_mode_type =
         g_enum_register_static ("GstQsvH264EncSeiInsertMode", insert_modes);
-    g_once_init_leave (&sei_insert_mode_type, type);
-  }
+  } GST_QSV_CALL_ONCE_END;
 
   return sei_insert_mode_type;
 }
@@ -188,11 +187,10 @@
     {0, nullptr, nullptr}
   };
 
-  if (g_once_init_enter (&rate_control_type)) {
-    GType type =
+  GST_QSV_CALL_ONCE_BEGIN {
+    rate_control_type =
         g_enum_register_static ("GstQsvH264EncRateControl", rate_controls);
-    g_once_init_leave (&rate_control_type, type);
-  }
+  } GST_QSV_CALL_ONCE_END;
 
   return rate_control_type;
 }
@@ -240,15 +238,69 @@
     {0, nullptr, nullptr}
   };
 
-  if (g_once_init_enter (&rc_lookahead_ds_type)) {
-    GType type =
+  GST_QSV_CALL_ONCE_BEGIN {
+    rc_lookahead_ds_type =
         g_enum_register_static ("GstQsvH264EncRCLookAheadDS", rc_lookahead_ds);
-    g_once_init_leave (&rc_lookahead_ds_type, type);
-  }
+  } GST_QSV_CALL_ONCE_END;
 
   return rc_lookahead_ds_type;
 }
 
+/**
+ * GstQsvH264Trellis:
+ *
+ * Since: 1.24
+ */
+#define GST_TYPE_QSV_H264_ENC_TRELLIS (gst_qsv_h264_enc_trellis_get_type ())
+static GType
+gst_qsv_h264_enc_trellis_get_type (void)
+{
+  static GType trellis_type = 0;
+  static const GFlagsValue trellis = {
+    /**
+     * GstQsvH264Trellis::unknown
+     *
+     * Since: 1.22
+     */
+    {MFX_TRELLIS_UNKNOWN, "Unknown", "unknown"},
+
+    /**
+     * GstQsvH264Trellis::off
+     *
+     * Since: 1.24
+     */
+    {MFX_TRELLIS_OFF, "Disable for all frame types", "off"},
+
+    /**
+     * GstQsvH264Trellis::i
+     *
+     * Since: 1.24
+     */
+    {MFX_TRELLIS_I, "Enable for I frames", "i"},
+
+    /**
+     * GstQsvH264Trellis::p
+     *
+     * Since: 1.24
+     */
+    {MFX_TRELLIS_P, "Enable for P frames", "p"},
+
+    /**
+     * GstQsvH264Trellis::b
+     *
+     * Since: 1.24
+     */
+    {MFX_TRELLIS_B, "Enable for B frames", "b"},
+    {0, nullptr, nullptr}
+  };
+
+  GST_QSV_CALL_ONCE_BEGIN {
+    trellis_type = g_flags_register_static ("GstQsvH264Trellis", trellis);
+  } GST_QSV_CALL_ONCE_END;
+
+  return trellis_type;
+}
+
 enum
 {
   PROP_0,
@@ -277,6 +329,15 @@
   PROP_QVBR_QUALITY,
   PROP_DISABLE_HRD_CONFORMANCE,
   PROP_CC_INSERT,
+  PROP_TRELLIS,
+  PROP_MAX_FRAME_SIZE,
+  PROP_MAX_FRAME_SIZE_I,
+  PROP_MAX_FRAME_SIZE_P,
+  PROP_MAX_SLICE_SIZE,
+  PROP_NUM_SLICE,
+  PROP_NUM_SLICE_I,
+  PROP_NUM_SLICE_P,
+  PROP_NUM_SLICE_B,
 };
 
 #define DEFAULT_CABAC MFX_CODINGOPTION_UNKNOWN
@@ -296,6 +357,10 @@
 #define DEFAULT_QVBR_QUALITY 0
 #define DEFAULT_DISABLE_HRD_CONFORMANCE FALSE
 #define DEFAULT_CC_INSERT GST_QSV_H264_ENC_SEI_INSERT
+#define DEFAULT_TRELLIS MFX_TRELLIS_UNKNOWN
+#define DEFAULT_MAX_FRAME_SIZE 0
+#define DEFAULT_MAX_SLICE_SIZE 0
+#define DEFAULT_NUM_SLICE 0
 
 #define DOC_SINK_CAPS_COMM \
     "format = (string) NV12, " \
@@ -367,6 +432,15 @@
   guint qvbr_quality;
   gboolean disable_hrd_conformance;
   GstQsvH264EncSeiInsertMode cc_insert;
+  mfxU16 trellis;
+  guint max_frame_size;
+  guint max_frame_size_i;
+  guint max_frame_size_p;
+  guint max_slice_size;
+  guint num_slice;
+  guint num_slice_i;
+  guint num_slice_p;
+  guint num_slice_b;
 } GstQsvH264Enc;
 
 typedef struct _GstQsvH264EncClass
@@ -556,6 +630,110 @@
           "Only CEA-708 RAW format is supported for now",
           GST_TYPE_QSV_H264_ENC_SEI_INSERT_MODE, DEFAULT_CC_INSERT,
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+  /**
+   * GstQsvH264Enc:trellis:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_TRELLIS,
+      g_param_spec_flags ("trellis", "Trellis",
+          "Trellis quantization mode",
+          GST_TYPE_QSV_H264_ENC_TRELLIS, DEFAULT_TRELLIS,
+          (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstQsvH264Enc:max-frame-size:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_MAX_FRAME_SIZE,
+      g_param_spec_uint ("max-frame-size", "Max Frame Size",
+          "Maximum encoded frame size in bytes, "
+          "used for VBR based bitrate control modes",
+          0, G_MAXUINT32, DEFAULT_MAX_FRAME_SIZE, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstQsvH264Enc:max-frame-size-i:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_MAX_FRAME_SIZE_I,
+      g_param_spec_uint ("max-frame-size-i", "Max Frame Size I",
+          "Maximum encoded I frame size in bytes, "
+          "used for VBR based bitrate control modes",
+          0, G_MAXUINT32, DEFAULT_MAX_FRAME_SIZE, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstQsvH264Enc:max-frame-size-p:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_MAX_FRAME_SIZE_P,
+      g_param_spec_uint ("max-frame-size-p", "Max Frame Size P",
+          "Maximum encoded P and B frame size in bytes, "
+          "used for VBR based bitrate control modes. "
+          "\"max-frame-size-i\" must be non-zero, "
+          "otherwise this propert will be ignored",
+          0, G_MAXUINT32, DEFAULT_MAX_FRAME_SIZE, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstQsvH264Enc:max-slice-size:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_MAX_SLICE_SIZE,
+      g_param_spec_uint ("max-slice-size", "Max Slice Size",
+          "Maximum slice size in bytes. If this parameter is specified other "
+          "controls over number of slices are ignored",
+          0, G_MAXUINT32, DEFAULT_MAX_SLICE_SIZE, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstQsvH264Enc:num-slice:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_NUM_SLICE,
+      g_param_spec_uint ("num-slice", "Num Slice",
+          "Number of slices in each video frame",
+          0, G_MAXUINT16, DEFAULT_NUM_SLICE, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstQsvH264Enc:num-slice-i:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_NUM_SLICE_I,
+      g_param_spec_uint ("num-slice-i", "Num Slice I",
+          "Number of slices for I frame",
+          0, G_MAXUINT16, DEFAULT_NUM_SLICE, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstQsvH264Enc:num-slice-p:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_NUM_SLICE_P,
+      g_param_spec_uint ("num-slice-p", "Num Slice P",
+          "Number of slices for P frame",
+          0, G_MAXUINT16, DEFAULT_NUM_SLICE, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  /**
+   * GstQsvH264Enc:num-slice-b:
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (object_class, PROP_NUM_SLICE_B,
+      g_param_spec_uint ("num-slice-b", "Num Slice B",
+          "Number of slices for B frame",
+          0, G_MAXUINT16, DEFAULT_NUM_SLICE, (GParamFlags)
+          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
   parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
 
@@ -610,6 +788,8 @@
       (GstPluginAPIFlags) 0);
   gst_type_mark_as_plugin_api (GST_TYPE_QSV_H264_ENC_RC_LOOKAHEAD_DS,
       (GstPluginAPIFlags) 0);
+  gst_type_mark_as_plugin_api (GST_TYPE_QSV_H264_ENC_TRELLIS,
+      (GstPluginAPIFlags) 0);
 
   gst_caps_unref (cdata->sink_caps);
   gst_caps_unref (cdata->src_caps);
@@ -645,6 +825,15 @@
   self->qvbr_quality = DEFAULT_QVBR_QUALITY;
   self->disable_hrd_conformance = DEFAULT_DISABLE_HRD_CONFORMANCE;
   self->cc_insert = DEFAULT_CC_INSERT;
+  self->trellis = DEFAULT_TRELLIS;
+  self->max_frame_size = DEFAULT_MAX_FRAME_SIZE;
+  self->max_frame_size_i = DEFAULT_MAX_FRAME_SIZE;
+  self->max_frame_size_p = DEFAULT_MAX_FRAME_SIZE;
+  self->max_slice_size = DEFAULT_MAX_SLICE_SIZE;
+  self->num_slice = DEFAULT_NUM_SLICE;
+  self->num_slice_i = DEFAULT_NUM_SLICE;
+  self->num_slice_p = DEFAULT_NUM_SLICE;
+  self->num_slice_b = DEFAULT_NUM_SLICE;
 
   g_mutex_init (&self->prop_lock);
 
@@ -669,13 +858,11 @@
   if (*old_val == new_val)
     return;
 
-  g_mutex_lock (&self->prop_lock);
   *old_val = new_val;
   if (is_bitrate_param)
     self->bitrate_updated = TRUE;
   else
     self->property_updated = TRUE;
-  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -685,10 +872,8 @@
   if (*old_val == (mfxU16) new_val)
     return;
 
-  g_mutex_lock (&self->prop_lock);
   *old_val = (mfxU16) new_val;
   self->property_updated = TRUE;
-  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -698,10 +883,8 @@
   if (*old_val == new_val)
     return;
 
-  g_mutex_lock (&self->prop_lock);
   *old_val = new_val;
   self->property_updated = TRUE;
-  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -710,6 +893,7 @@
 {
   GstQsvH264Enc *self = GST_QSV_H264_ENC (object);
 
+  g_mutex_lock (&self->prop_lock);
   switch (prop_id) {
     case PROP_CABAC:
       gst_qsv_h264_enc_check_update_enum (self, &self->cabac,
@@ -812,10 +996,47 @@
       /* This property is unrelated to encoder-reset */
       self->cc_insert = (GstQsvH264EncSeiInsertMode) g_value_get_enum (value);
       break;
+    case PROP_TRELLIS:
+      gst_qsv_h264_enc_check_update_enum (self, &self->trellis,
+          g_value_get_flags (value));
+      break;
+    case PROP_MAX_FRAME_SIZE:
+      gst_qsv_h264_enc_check_update_uint (self, &self->max_frame_size,
+          g_value_get_uint (value), FALSE);
+      break;
+    case PROP_MAX_FRAME_SIZE_I:
+      gst_qsv_h264_enc_check_update_uint (self, &self->max_frame_size_i,
+          g_value_get_uint (value), FALSE);
+      break;
+    case PROP_MAX_FRAME_SIZE_P:
+      gst_qsv_h264_enc_check_update_uint (self, &self->max_frame_size_p,
+          g_value_get_uint (value), FALSE);
+      break;
+    case PROP_MAX_SLICE_SIZE:
+      gst_qsv_h264_enc_check_update_uint (self, &self->max_slice_size,
+          g_value_get_uint (value), FALSE);
+      break;
+    case PROP_NUM_SLICE:
+      gst_qsv_h264_enc_check_update_uint (self, &self->num_slice,
+          g_value_get_uint (value), FALSE);
+      break;
+    case PROP_NUM_SLICE_I:
+      gst_qsv_h264_enc_check_update_uint (self, &self->num_slice,
+          g_value_get_uint (value), FALSE);
+      break;
+    case PROP_NUM_SLICE_P:
+      gst_qsv_h264_enc_check_update_uint (self, &self->num_slice_p,
+          g_value_get_uint (value), FALSE);
+      break;
+    case PROP_NUM_SLICE_B:
+      gst_qsv_h264_enc_check_update_uint (self, &self->num_slice_b,
+          g_value_get_uint (value), FALSE);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
+  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -824,6 +1045,7 @@
 {
   GstQsvH264Enc *self = GST_QSV_H264_ENC (object);
 
+  g_mutex_lock (&self->prop_lock);
   switch (prop_id) {
     case PROP_CABAC:
       g_value_set_enum (value, self->cabac);
@@ -900,10 +1122,38 @@
     case PROP_DISABLE_HRD_CONFORMANCE:
       g_value_set_boolean (value, self->disable_hrd_conformance);
       break;
+    case PROP_TRELLIS:
+      g_value_set_flags (value, self->trellis);
+      break;
+    case PROP_MAX_FRAME_SIZE:
+      g_value_set_uint (value, self->max_frame_size);
+      break;
+    case PROP_MAX_FRAME_SIZE_I:
+      g_value_set_uint (value, self->max_frame_size_i);
+      break;
+    case PROP_MAX_FRAME_SIZE_P:
+      g_value_set_uint (value, self->max_frame_size_p);
+      break;
+    case PROP_MAX_SLICE_SIZE:
+      g_value_set_uint (value, self->max_slice_size);
+      break;
+    case PROP_NUM_SLICE:
+      g_value_set_uint (value, self->num_slice);
+      break;
+    case PROP_NUM_SLICE_I:
+      g_value_set_uint (value, self->num_slice_i);
+      break;
+    case PROP_NUM_SLICE_P:
+      g_value_set_uint (value, self->num_slice_p);
+      break;
+    case PROP_NUM_SLICE_B:
+      g_value_set_uint (value, self->num_slice_b);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
+  g_mutex_unlock (&self->prop_lock);
 }
 
 static gboolean
@@ -1175,6 +1425,7 @@
   GstStructure *s;
   const gchar *stream_format;
   mfxFrameInfo *frame_info;
+  GstVideoFormat format;
 
   frame_info = &param->mfx.FrameInfo;
 
@@ -1184,16 +1435,11 @@
   frame_info->Width = GST_ROUND_UP_16 (info->width);
   if (GST_VIDEO_INFO_IS_INTERLACED (info)) {
     frame_info->Height = GST_ROUND_UP_32 (info->height);
-    switch (GST_VIDEO_INFO_FIELD_ORDER (info)) {
-      case GST_VIDEO_FIELD_ORDER_TOP_FIELD_FIRST:
-        frame_info->PicStruct = MFX_PICSTRUCT_FIELD_TFF;
-        break;
-      case GST_VIDEO_FIELD_ORDER_BOTTOM_FIELD_FIRST:
-        frame_info->PicStruct = MFX_PICSTRUCT_FIELD_BFF;
-        break;
-      default:
-        frame_info->PicStruct = MFX_PICSTRUCT_UNKNOWN;
-        break;
+    if (GST_VIDEO_INFO_FIELD_ORDER (info) ==
+        GST_VIDEO_FIELD_ORDER_TOP_FIELD_FIRST) {
+      frame_info->PicStruct = MFX_PICSTRUCT_FIELD_TFF;
+    } else {
+      frame_info->PicStruct = MFX_PICSTRUCT_FIELD_BFF;
     }
   } else {
     frame_info->Height = GST_ROUND_UP_16 (info->height);
@@ -1222,16 +1468,14 @@
   frame_info->AspectRatioH = GST_VIDEO_INFO_PAR_D (info);
 
   /* TODO: update for non 4:2:0 formats. Currently NV12 only */
-  frame_info->ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  switch (GST_VIDEO_INFO_FORMAT (info)) {
+  format = GST_VIDEO_INFO_FORMAT (info);
+  switch (format) {
     case GST_VIDEO_FORMAT_NV12:
-      frame_info->FourCC = MFX_FOURCC_NV12;
-      frame_info->BitDepthLuma = 8;
-      frame_info->BitDepthChroma = 8;
+      gst_qsv_frame_info_set_format (frame_info, format);
       break;
     default:
       GST_ERROR_OBJECT (self, "Unexpected format %s",
-          gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (info)));
+          gst_video_format_to_string (format));
       return FALSE;
   }
 
@@ -1378,6 +1622,7 @@
   param->mfx.GopPicSize = self->gop_size;
   param->mfx.IdrInterval = self->idr_interval;
   param->mfx.RateControlMethod = self->rate_control;
+  param->mfx.NumSlice = self->num_slice;
   param->mfx.NumRefFrame = self->ref_frames;
 
   gst_qsv_h264_enc_set_bitrate (self, param);
@@ -1459,6 +1704,17 @@
   if (param->mfx.RateControlMethod == MFX_RATECONTROL_QVBR)
     option3->QVBRQuality = self->qvbr_quality;
 
+  option2->Trellis = self->trellis;
+
+  option2->MaxFrameSize = self->max_frame_size;
+  option3->MaxFrameSizeI = self->max_frame_size_i;
+  if (self->max_frame_size_p && self->max_frame_size_i)
+    option3->MaxFrameSizeP = self->max_frame_size_p;
+
+  option3->NumSliceI = self->num_slice_i;
+  option3->NumSliceP = self->num_slice_p;
+  option3->NumSliceB = self->num_slice_b;
+
   if (signal_info)
     g_ptr_array_add (extra_params, signal_info);
   g_ptr_array_add (extra_params, option);
@@ -1755,7 +2011,11 @@
     buf = gst_buffer_new_memdup (bitstream->Data + bitstream->DataOffset,
         bitstream->DataLength);
   } else {
-    buf = gst_buffer_new ();
+    std::vector < GstH264NalUnit > nalu_list;
+    gsize total_size = 0;
+    GstMapInfo info;
+    guint8 *data;
+
     rst = gst_h264_parser_identify_nalu (self->parser,
         bitstream->Data + bitstream->DataOffset, 0, bitstream->DataLength,
         &nalu);
@@ -1763,16 +2023,8 @@
       rst = GST_H264_PARSER_OK;
 
     while (rst == GST_H264_PARSER_OK) {
-      GstMemory *mem;
-      guint8 *data;
-
-      data = (guint8 *) g_malloc0 (nalu.size + 4);
-      GST_WRITE_UINT32_BE (data, nalu.size);
-      memcpy (data + 4, nalu.data + nalu.offset, nalu.size);
-
-      mem = gst_memory_new_wrapped ((GstMemoryFlags) 0, data, nalu.size + 4,
-          0, nalu.size + 4, data, (GDestroyNotify) g_free);
-      gst_buffer_append_memory (buf, mem);
+      nalu_list.push_back (nalu);
+      total_size += nalu.size + 4;
 
       rst = gst_h264_parser_identify_nalu (self->parser,
           bitstream->Data + bitstream->DataOffset, nalu.offset + nalu.size,
@@ -1781,6 +2033,21 @@
       if (rst == GST_H264_PARSER_NO_NAL_END)
         rst = GST_H264_PARSER_OK;
     }
+
+    buf = gst_buffer_new_and_alloc (total_size);
+    gst_buffer_map (buf, &info, GST_MAP_WRITE);
+    data = (guint8 *) info.data;
+
+    /* *INDENT-OFF* */
+    for (const auto & it : nalu_list) {
+      GST_WRITE_UINT32_BE (data, it.size);
+      data += 4;
+      memcpy (data, it.data + it.offset, it.size);
+      data += it.size;
+    }
+    /* *INDENT-ON* */
+
+    gst_buffer_unmap (buf, &info);
   }
 
   /* This buffer must be the end of a frame boundary */
@@ -1873,11 +2140,8 @@
   mfx->FrameInfo.FrameRateExtD = 1;
   mfx->FrameInfo.AspectRatioW = 1;
   mfx->FrameInfo.AspectRatioH = 1;
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  mfx->FrameInfo.FourCC = MFX_FOURCC_NV12;
-  mfx->FrameInfo.BitDepthLuma = 8;
-  mfx->FrameInfo.BitDepthChroma = 8;
   mfx->FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_NV12);
 
   /* Check supported profiles */
   for (guint i = 0; i < G_N_ELEMENTS (profile_map); i++) {

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvh265dec.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvh265dec.cpp Changed

@@ -53,10 +53,12 @@
 #define DOC_SINK_CAPS \
     "video/x-h265, width = (int)  1, 16384 , height = (int)  1, 16384 , " \
     "stream-format = (string) { byte-stream, hev1, hvc1 }, " \
-    "alignment = (string) au, profile = (string) { main, main-10 }"
+    "alignment = (string) au, profile = (string) { main, main-10, main-12, " \
+    "main-422-10, main-422-12, main-444, main-444-10, main-444-12 }"
 
 #define DOC_SRC_CAPS_COMM \
-    "format = (string) NV12, " \
+    "format = (string) { NV12, P010_10LE, P012_LE, YUY2, Y210, Y212_LE, " \
+    "VUYA, RBGA, Y410, BGR10A2_LE, Y412_LE, BGRA64_LE }, " \
     "width = (int)  1, 16384 , height = (int)  1, 16384 "
 
 #define DOC_SRC_CAPS \
@@ -236,89 +238,73 @@
     gsize size)
 {
   GstH265Parser *parser = self->parser;
-  guint num_nal_arrays;
-  guint off;
-  guint num_nals, i, j;
   GstH265ParserResult pres;
-  GstH265NalUnit nalu;
   GstH265VPS vps;
   GstH265SPS sps;
   GstH265PPS pps;
+  gboolean ret = FALSE;
+  GstH265DecoderConfigRecord *config = nullptr;
 
-  /* parse the hvcC data */
-  if (size < 23) {
-    GST_WARNING_OBJECT (self, "hvcC too small");
-    return FALSE;
-  }
-
-  /* wrong hvcC version */
-  if (data0 != 0 && data0 != 1) {
+  pres = gst_h265_parser_parse_decoder_config_record (parser,
+      data, size, &config);
+  if (pres != GST_H265_PARSER_OK) {
+    GST_WARNING_OBJECT (self, "Failed to parse hvcC data");
     return FALSE;
   }
 
-  self->nal_length_size = (data21 & 0x03) + 1;
+  self->nal_length_size = config->length_size_minus_one + 1;
   GST_DEBUG_OBJECT (self, "nal length size %u", self->nal_length_size);
 
-  num_nal_arrays = data22;
-  off = 23;
+  for (guint i = 0; i < config->nalu_array->len; i++) {
+    GstH265DecoderConfigRecordNalUnitArray *array =
+        &g_array_index (config->nalu_array,
+        GstH265DecoderConfigRecordNalUnitArray, i);
 
-  for (i = 0; i < num_nal_arrays; i++) {
-    if (off + 3 >= size) {
-      GST_WARNING_OBJECT (self, "hvcC too small");
-      return FALSE;
-    }
-
-    num_nals = GST_READ_UINT16_BE (data + off + 1);
-    off += 3;
-    for (j = 0; j < num_nals; j++) {
-      pres = gst_h265_parser_identify_nalu_hevc (parser,
-          data, off, size, 2, &nalu);
-
-      if (pres != GST_H265_PARSER_OK) {
-        GST_WARNING_OBJECT (self, "hvcC too small");
-        return FALSE;
-      }
+    for (guint j = 0; j < array->nalu->len; j++) {
+      GstH265NalUnit *nalu = &g_array_index (array->nalu, GstH265NalUnit, j);
 
-      switch (nalu.type) {
+      switch (nalu->type) {
         case GST_H265_NAL_VPS:
-          pres = gst_h265_parser_parse_vps (parser, &nalu, &vps);
+          pres = gst_h265_parser_parse_vps (parser, nalu, &vps);
           if (pres != GST_H265_PARSER_OK) {
             GST_WARNING_OBJECT (self, "Failed to parse VPS");
-            return FALSE;
+            goto out;
           }
 
           gst_qsv_h265_dec_store_nal (self, vps.id,
-              (GstH265NalUnitType) nalu.type, &nalu);
+              (GstH265NalUnitType) nalu->type, nalu);
           break;
         case GST_H265_NAL_SPS:
-          pres = gst_h265_parser_parse_sps (self->parser, &nalu, &sps, FALSE);
+          pres = gst_h265_parser_parse_sps (self->parser, nalu, &sps, FALSE);
           if (pres != GST_H265_PARSER_OK) {
             GST_WARNING_OBJECT (self, "Failed to parse SPS");
-            return FALSE;
+            goto out;
           }
 
           gst_qsv_h265_dec_store_nal (self, sps.id,
-              (GstH265NalUnitType) nalu.type, &nalu);
+              (GstH265NalUnitType) nalu->type, nalu);
           break;
         case GST_H265_NAL_PPS:
-          pres = gst_h265_parser_parse_pps (parser, &nalu, &pps);
+          pres = gst_h265_parser_parse_pps (parser, nalu, &pps);
           if (pres != GST_H265_PARSER_OK) {
             GST_WARNING_OBJECT (self, "Failed to parse PPS");
-            return FALSE;
+            goto out;
           }
 
           gst_qsv_h265_dec_store_nal (self, pps.id,
-              (GstH265NalUnitType) nalu.type, &nalu);
+              (GstH265NalUnitType) nalu->type, nalu);
           break;
         default:
           break;
       }
-
-      off = nalu.offset + nalu.size;
     }
   }
 
-  return TRUE;
+  ret = TRUE;
+
+out:
+  gst_h265_decoder_config_record_free (config);
+  return ret;
 }
 
 static gboolean
@@ -335,7 +321,7 @@
 
   s = gst_caps_get_structure (state->caps, 0);
   str = gst_structure_get_string (s, "stream-format");
-  if ((g_strcmp0 (str, "avc") == 0 || g_strcmp0 (str, "avc3")) &&
+  if ((g_strcmp0 (str, "hev1") == 0 || g_strcmp0 (str, "hvc1") == 0) &&
       state->codec_data) {
     self->packetized = TRUE;
     /* Will be updated */
@@ -435,7 +421,7 @@
     memcpy (data + sizeof (start_code), nalu.data + nalu.offset, nalu.size);
 
     mem = gst_memory_new_wrapped ((GstMemoryFlags) 0, data, size, 0, size,
-        nullptr, (GDestroyNotify) g_free);
+        data, (GDestroyNotify) g_free);
     gst_buffer_append_memory (new_buf, mem);
   } while (pres == GST_H265_PARSER_OK);
 
@@ -503,11 +489,8 @@
   mfx->FrameInfo.FrameRateExtD = 1;
   mfx->FrameInfo.AspectRatioW = 1;
   mfx->FrameInfo.AspectRatioH = 1;
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  mfx->FrameInfo.FourCC = MFX_FOURCC_NV12;
-  mfx->FrameInfo.BitDepthLuma = 8;
-  mfx->FrameInfo.BitDepthChroma = 8;
   mfx->FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_NV12);
   mfx->CodecProfile = MFX_PROFILE_HEVC_MAIN;
 
   /* Check max-resolution */
@@ -533,14 +516,8 @@
   supported_profiles.push_back ("main");
   supported_formats.push_back ("NV12");
 
-  /* Check other profile/formats */
-  /* TODO: check other profiles too */
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  mfx->FrameInfo.FourCC = MFX_FOURCC_P010;
-  mfx->FrameInfo.BitDepthLuma = 10;
-  mfx->FrameInfo.BitDepthChroma = 10;
-  mfx->FrameInfo.Shift = 1;
-  mfx->FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+  /* main-10 */
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_P010_10LE);
   mfx->CodecProfile = MFX_PROFILE_HEVC_MAIN10;
   mfx->FrameInfo.Width = GST_ROUND_UP_16 (gst_qsv_resolutions0.width);
   mfx->FrameInfo.Height = GST_ROUND_UP_16 (gst_qsv_resolutions0.height);
@@ -551,6 +528,59 @@
     supported_formats.push_back ("P010_10LE");
   }
 
+  /* main-12 */
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_P012_LE);
+  mfx->CodecProfile = MFX_PROFILE_HEVC_REXT;
+  if (MFXVideoDECODE_Query (session, &param, &param) == MFX_ERR_NONE) {
+    supported_profiles.push_back ("main-12");
+    supported_formats.push_back ("P012_LE");
+  }
+
+  /* main-422-{10,12} */
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_YUY2);
+  mfx->CodecProfile = MFX_PROFILE_HEVC_REXT;
+  if (MFXVideoDECODE_Query (session, &param, &param) == MFX_ERR_NONE) {
+    gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_Y210);
+    if (MFXVideoDECODE_Query (session, &param, &param) == MFX_ERR_NONE) {
+      supported_profiles.push_back ("main-422-10");
+      supported_formats.push_back ("YUY2");
+      supported_formats.push_back ("Y210");
+
+      gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_Y212_LE);
+      if (MFXVideoDECODE_Query (session, &param, &param) == MFX_ERR_NONE) {
+        supported_profiles.push_back ("main-422-12");
+        supported_formats.push_back ("Y212_LE");
+      }
+    }
+  }
+
+  /* main-444 */
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_VUYA);
+  mfx->CodecProfile = MFX_PROFILE_HEVC_REXT;
+  if (MFXVideoDECODE_Query (session, &param, &param) == MFX_ERR_NONE) {
+    supported_profiles.push_back ("main-444");
+    supported_formats.push_back ("VUYA");
+    supported_formats.push_back ("RBGA");
+  }
+
+  /* main-444-10 */
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_Y410);
+  mfx->CodecProfile = MFX_PROFILE_HEVC_REXT;
+  if (MFXVideoDECODE_Query (session, &param, &param) == MFX_ERR_NONE) {
+    supported_profiles.push_back ("main-444-10");
+    supported_formats.push_back ("Y410");
+    supported_formats.push_back ("BGR10A2_LE");
+  }
+
+  /* main-444-12 */
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_Y412_LE);
+  mfx->CodecProfile = MFX_PROFILE_HEVC_REXT;
+  if (MFXVideoDECODE_Query (session, &param, &param) == MFX_ERR_NONE) {
+    supported_profiles.push_back ("main-444-12");
+    supported_formats.push_back ("Y412_LE");
+    supported_formats.push_back ("BGRA64_LE");
+  }
+
   /* To cover both landscape and portrait,
    * select max value (width in this case) */
   guint resolution = MAX (max_resolution.width, max_resolution.height);

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvh265enc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvh265enc.cpp Changed

@@ -94,11 +94,10 @@
     {0, nullptr, nullptr}
   };
 
-  if (g_once_init_enter (&sei_insert_mode_type)) {
-    GType type =
+  GST_QSV_CALL_ONCE_BEGIN {
+    sei_insert_mode_type =
         g_enum_register_static ("GstQsvH265EncSeiInsertMode", insert_modes);
-    g_once_init_leave (&sei_insert_mode_type, type);
-  }
+  } GST_QSV_CALL_ONCE_END;
 
   return sei_insert_mode_type;
 }
@@ -158,11 +157,10 @@
     {0, nullptr, nullptr}
   };
 
-  if (g_once_init_enter (&rate_control_type)) {
-    GType type =
+  GST_QSV_CALL_ONCE_BEGIN {
+    rate_control_type =
         g_enum_register_static ("GstQsvH265EncRateControl", rate_controls);
-    g_once_init_leave (&rate_control_type, type);
-  }
+  } GST_QSV_CALL_ONCE_END;
 
   return rate_control_type;
 }
@@ -540,13 +538,11 @@
   if (*old_val == new_val)
     return;
 
-  g_mutex_lock (&self->prop_lock);
   *old_val = new_val;
   if (is_bitrate_param)
     self->bitrate_updated = TRUE;
   else
     self->property_updated = TRUE;
-  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -556,10 +552,8 @@
   if (*old_val == (mfxU16) new_val)
     return;
 
-  g_mutex_lock (&self->prop_lock);
   *old_val = (mfxU16) new_val;
   self->property_updated = TRUE;
-  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -569,10 +563,8 @@
   if (*old_val == new_val)
     return;
 
-  g_mutex_lock (&self->prop_lock);
   *old_val = new_val;
   self->property_updated = TRUE;
-  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -581,6 +573,7 @@
 {
   GstQsvH265Enc *self = GST_QSV_H265_ENC (object);
 
+  g_mutex_lock (&self->prop_lock);
   switch (prop_id) {
     case PROP_MIN_QP_I:
       gst_qsv_h265_enc_check_update_uint (self, &self->min_qp_i,
@@ -666,6 +659,7 @@
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
+  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -674,6 +668,7 @@
 {
   GstQsvH265Enc *self = GST_QSV_H265_ENC (object);
 
+  g_mutex_lock (&self->prop_lock);
   switch (prop_id) {
     case PROP_MIN_QP_I:
       g_value_set_uint (value, self->min_qp_i);
@@ -739,6 +734,7 @@
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
+  g_mutex_unlock (&self->prop_lock);
 }
 
 static gboolean
@@ -1464,29 +1460,23 @@
 
   /* Check supported profiles */
   for (guint i = 0; i < G_N_ELEMENTS (profile_map); i++) {
+    GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
     mfx->CodecProfile = profile_mapi.profile;
     mfx->CodecLevel = MFX_LEVEL_UNKNOWN;
 
     switch (mfx->CodecProfile) {
       case MFX_PROFILE_HEVC_MAIN:
-        mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-        mfx->FrameInfo.FourCC = MFX_FOURCC_NV12;
-        mfx->FrameInfo.BitDepthLuma = 8;
-        mfx->FrameInfo.BitDepthChroma = 8;
-        mfx->FrameInfo.Shift = 0;
+        format = GST_VIDEO_FORMAT_NV12;
         break;
       case MFX_PROFILE_HEVC_MAIN10:
-        mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-        mfx->FrameInfo.FourCC = MFX_FOURCC_P010;
-        mfx->FrameInfo.BitDepthLuma = 10;
-        mfx->FrameInfo.BitDepthChroma = 10;
-        mfx->FrameInfo.Shift = 1;
+        format = GST_VIDEO_FORMAT_P010_10LE;
         break;
       default:
         g_assert_not_reached ();
         return;
     }
 
+    gst_qsv_frame_info_set_format (&mfx->FrameInfo, format);
     if (MFXVideoENCODE_Query (session, &param, &param) != MFX_ERR_NONE)
       continue;
 
@@ -1499,11 +1489,7 @@
     return;
   }
 
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  mfx->FrameInfo.FourCC = MFX_FOURCC_NV12;
-  mfx->FrameInfo.BitDepthLuma = 8;
-  mfx->FrameInfo.BitDepthChroma = 8;
-  mfx->FrameInfo.Shift = 0;
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_NV12);
   mfx->CodecProfile = MFX_PROFILE_HEVC_MAIN;
 
   /* check hdr10 metadata SEI support */

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvjpegdec.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvjpegdec.cpp Changed

@@ -157,11 +157,8 @@
   mfx->FrameInfo.FrameRateExtD = 1;
   mfx->FrameInfo.AspectRatioW = 1;
   mfx->FrameInfo.AspectRatioH = 1;
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  mfx->FrameInfo.FourCC = MFX_FOURCC_NV12;
-  mfx->FrameInfo.BitDepthLuma = 8;
-  mfx->FrameInfo.BitDepthChroma = 8;
   mfx->FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_NV12);
   mfx->CodecProfile = MFX_PROFILE_JPEG_BASELINE;
   mfx->JPEGChromaFormat = MFX_CHROMAFORMAT_YUV420;
   mfx->JPEGColorFormat = MFX_JPEG_COLORFORMAT_YCbCr;
@@ -188,14 +185,12 @@
 
   supported_formats.push_back ("NV12");
 
-  mfx->FrameInfo.FourCC = MFX_FOURCC_YUY2;
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV422;
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_YUY2);
   mfx->JPEGChromaFormat = MFX_CHROMAFORMAT_YUV422;
   if (MFXVideoDECODE_Query (session, &param, &param) == MFX_ERR_NONE)
     supported_formats.push_back ("YUY2");
 
-  mfx->FrameInfo.FourCC = MFX_FOURCC_RGB4;
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV444;
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_BGRA);
   mfx->JPEGChromaFormat = MFX_CHROMAFORMAT_YUV444;
   mfx->JPEGColorFormat = MFX_JPEG_COLORFORMAT_RGB;
   if (MFXVideoDECODE_Query (session, &param, &param) == MFX_ERR_NONE)

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvjpegenc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvjpegenc.cpp Changed

@@ -216,10 +216,8 @@
   if (*old_val == new_val)
     return;
 
-  g_mutex_lock (&self->prop_lock);
   *old_val = new_val;
   self->property_updated = TRUE;
-  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -228,6 +226,7 @@
 {
   GstQsvJpegEnc *self = GST_QSV_JPEG_ENC (object);
 
+  g_mutex_lock (&self->prop_lock);
   switch (prop_id) {
     case PROP_QUALITY:
       gst_qsv_jpeg_enc_check_update_uint (self, &self->quality,
@@ -237,6 +236,7 @@
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
+  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -245,6 +245,7 @@
 {
   GstQsvJpegEnc *self = GST_QSV_JPEG_ENC (object);
 
+  g_mutex_lock (&self->prop_lock);
   switch (prop_id) {
     case PROP_QUALITY:
       g_value_set_uint (value, self->quality);
@@ -253,6 +254,7 @@
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
+  g_mutex_unlock (&self->prop_lock);
 }
 
 static gboolean
@@ -263,6 +265,7 @@
   GstQsvJpegEncClass *klass = GST_QSV_JPEG_ENC_GET_CLASS (self);
   GstVideoInfo *info = &state->info;
   mfxFrameInfo *frame_info;
+  GstVideoFormat format;
 
   frame_info = &param->mfx.FrameInfo;
 
@@ -283,22 +286,12 @@
   frame_info->AspectRatioW = GST_VIDEO_INFO_PAR_N (info);
   frame_info->AspectRatioH = GST_VIDEO_INFO_PAR_D (info);
 
-  switch (GST_VIDEO_INFO_FORMAT (info)) {
+  format = GST_VIDEO_INFO_FORMAT (info);
+  switch (format) {
     case GST_VIDEO_FORMAT_NV12:
-      frame_info->ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-      frame_info->FourCC = MFX_FOURCC_NV12;
-      frame_info->BitDepthLuma = 8;
-      frame_info->BitDepthChroma = 8;
-      break;
     case GST_VIDEO_FORMAT_YUY2:
-      frame_info->ChromaFormat = MFX_CHROMAFORMAT_YUV422;
-      frame_info->FourCC = MFX_FOURCC_YUY2;
-      frame_info->BitDepthLuma = 8;
-      frame_info->BitDepthChroma = 8;
-      break;
     case GST_VIDEO_FORMAT_BGRA:
-      frame_info->ChromaFormat = MFX_CHROMAFORMAT_YUV444;
-      frame_info->FourCC = MFX_FOURCC_RGB4;
+      gst_qsv_frame_info_set_format (frame_info, format);
       break;
     default:
       GST_ERROR_OBJECT (self, "Unexpected format %s",

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvutils.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvutils.cpp Changed

@@ -39,12 +39,9 @@
 mfxLoader
 gst_qsv_get_loader (void)
 {
-  static gsize load_once = 0;
-
-  if (g_once_init_enter (&load_once)) {
+  GST_QSV_CALL_ONCE_BEGIN {
     _loader = MFXLoad ();
-    g_once_init_leave (&load_once, 1);
-  }
+  } GST_QSV_CALL_ONCE_END;
 
   return _loader;
 }
@@ -201,3 +198,147 @@
 
   return "Unknown";
 }
+
+GstVideoFormat
+gst_qsv_frame_info_format_to_gst (const mfxFrameInfo * info, gboolean is_gbr)
+{
+  GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
+
+  switch (info->FourCC) {
+    case MFX_FOURCC_NV12:
+      format = GST_VIDEO_FORMAT_NV12;
+      break;
+    case MFX_FOURCC_P010:
+      format = GST_VIDEO_FORMAT_P010_10LE;
+      break;
+    case MFX_FOURCC_P016:
+      if (info->BitDepthLuma == 12)
+        format = GST_VIDEO_FORMAT_P012_LE;
+      else
+        format = GST_VIDEO_FORMAT_P016_LE;
+      break;
+    case MFX_FOURCC_YUY2:
+      format = GST_VIDEO_FORMAT_YUY2;
+      break;
+    case MFX_FOURCC_Y210:
+      format = GST_VIDEO_FORMAT_Y210;
+      break;
+    case MFX_FOURCC_Y216:
+      format = GST_VIDEO_FORMAT_Y212_LE;
+      break;
+      break;
+    case MFX_FOURCC_AYUV:
+      if (is_gbr)
+        format = GST_VIDEO_FORMAT_RBGA;
+      else
+        format = GST_VIDEO_FORMAT_VUYA;
+      break;
+    case MFX_FOURCC_Y410:
+      if (is_gbr)
+        format = GST_VIDEO_FORMAT_BGR10A2_LE;
+      else
+        format = GST_VIDEO_FORMAT_Y410;
+      break;
+    case MFX_FOURCC_Y416:
+      if (is_gbr)
+        format = GST_VIDEO_FORMAT_BGRA64_LE;
+      else
+        format = GST_VIDEO_FORMAT_Y412_LE;
+      break;
+    case MFX_FOURCC_RGB4:
+      format = GST_VIDEO_FORMAT_BGRA;
+      break;
+    default:
+      break;
+  }
+
+  return format;
+}
+
+gboolean
+gst_qsv_frame_info_set_format (mfxFrameInfo * info, GstVideoFormat format)
+{
+  switch (format) {
+    case GST_VIDEO_FORMAT_NV12:
+      info->FourCC = MFX_FOURCC_NV12;
+      info->ChromaFormat = MFX_CHROMAFORMAT_YUV420;
+      info->BitDepthLuma = 8;
+      info->BitDepthChroma = 8;
+      info->Shift = 0;
+      break;
+    case GST_VIDEO_FORMAT_P010_10LE:
+      info->FourCC = MFX_FOURCC_P010;
+      info->ChromaFormat = MFX_CHROMAFORMAT_YUV420;
+      info->BitDepthLuma = 10;
+      info->BitDepthChroma = 10;
+      info->Shift = 1;
+      break;
+    case GST_VIDEO_FORMAT_P012_LE:
+      info->FourCC = MFX_FOURCC_P016;
+      info->ChromaFormat = MFX_CHROMAFORMAT_YUV420;
+      info->BitDepthLuma = 12;
+      info->BitDepthChroma = 12;
+      info->Shift = 1;
+      break;
+    case GST_VIDEO_FORMAT_P016_LE:
+      info->FourCC = MFX_FOURCC_P016;
+      info->ChromaFormat = MFX_CHROMAFORMAT_YUV420;
+      info->BitDepthLuma = 16;
+      info->BitDepthChroma = 16;
+      info->Shift = 0;
+      break;
+    case GST_VIDEO_FORMAT_YUY2:
+      info->FourCC = MFX_FOURCC_YUY2;
+      info->ChromaFormat = MFX_CHROMAFORMAT_YUV422;
+      info->BitDepthLuma = 8;
+      info->BitDepthChroma = 8;
+      info->Shift = 0;
+      break;
+    case GST_VIDEO_FORMAT_Y210:
+      info->FourCC = MFX_FOURCC_Y210;
+      info->ChromaFormat = MFX_CHROMAFORMAT_YUV422;
+      info->BitDepthLuma = 10;
+      info->BitDepthChroma = 10;
+      info->Shift = 1;
+      break;
+    case GST_VIDEO_FORMAT_Y212_LE:
+      info->FourCC = MFX_FOURCC_Y216;
+      info->ChromaFormat = MFX_CHROMAFORMAT_YUV422;
+      info->BitDepthLuma = 12;
+      info->BitDepthChroma = 12;
+      info->Shift = 1;
+      break;
+    case GST_VIDEO_FORMAT_VUYA:
+    case GST_VIDEO_FORMAT_RBGA:
+      info->FourCC = MFX_FOURCC_AYUV;
+      info->ChromaFormat = MFX_CHROMAFORMAT_YUV444;
+      info->BitDepthLuma = 8;
+      info->BitDepthChroma = 8;
+      info->Shift = 0;
+      break;
+    case GST_VIDEO_FORMAT_Y410:
+    case GST_VIDEO_FORMAT_BGR10A2_LE:
+      info->FourCC = MFX_FOURCC_Y410;
+      info->ChromaFormat = MFX_CHROMAFORMAT_YUV444;
+      info->BitDepthLuma = 10;
+      info->BitDepthChroma = 10;
+      info->Shift = 0;
+      break;
+    case GST_VIDEO_FORMAT_Y412_LE:
+    case GST_VIDEO_FORMAT_BGRA64_LE:
+      info->FourCC = MFX_FOURCC_Y416;
+      info->ChromaFormat = MFX_CHROMAFORMAT_YUV444;
+      info->BitDepthLuma = 12;
+      info->BitDepthChroma = 12;
+      info->Shift = 1;
+      break;
+    case GST_VIDEO_FORMAT_BGRA:
+      info->FourCC = MFX_FOURCC_RGB4;
+      info->ChromaFormat = MFX_CHROMAFORMAT_YUV444;
+      break;
+    default:
+      return FALSE;
+  }
+
+  return TRUE;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvutils.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvutils.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvvp9dec.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvvp9dec.cpp Changed

@@ -54,7 +54,7 @@
     "alignment = (string) frame, profile = (string) { 0, 2 }"
 
 #define DOC_SRC_CAPS_COMM \
-    "format = (string) { NV12, P010_10LE, P016_LE}, " \
+    "format = (string) { NV12, P010_10LE, P012_LE}, " \
     "width = (int)  1, 16384 , height = (int)  1, 16384 "
 
 #define DOC_SRC_CAPS \
@@ -159,11 +159,8 @@
   mfx->FrameInfo.FrameRateExtD = 1;
   mfx->FrameInfo.AspectRatioW = 1;
   mfx->FrameInfo.AspectRatioH = 1;
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  mfx->FrameInfo.FourCC = MFX_FOURCC_NV12;
-  mfx->FrameInfo.BitDepthLuma = 8;
-  mfx->FrameInfo.BitDepthChroma = 8;
   mfx->FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_NV12);
   mfx->CodecProfile = MFX_PROFILE_VP9_0;
 
   /* Check max-resolution */
@@ -189,22 +186,16 @@
   supported_formats.push_back ("NV12");
 
   /* Check other profile/formats */
-  mfx->FrameInfo.FourCC = MFX_FOURCC_P010;
-  mfx->FrameInfo.BitDepthLuma = 10;
-  mfx->FrameInfo.BitDepthChroma = 10;
-  mfx->FrameInfo.Shift = 1;
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_P010_10LE);
   mfx->CodecProfile = MFX_PROFILE_VP9_2;
   if (MFXVideoDECODE_Query (session, &param, &param) == MFX_ERR_NONE) {
     have_profile_2 = TRUE;
     supported_formats.push_back ("P010_10LE");
 
-    mfx->FrameInfo.FourCC = MFX_FOURCC_P016;
-    mfx->FrameInfo.BitDepthLuma = 12;
-    mfx->FrameInfo.BitDepthChroma = 12;
-
+    gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_P012_LE);
     if (MFXVideoDECODE_Query (session, &param, &param) == MFX_ERR_NONE) {
       have_profile_2_12bits = TRUE;
-      supported_formats.push_back ("P016_LE");
+      supported_formats.push_back ("P012_LE");
     }
   }

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/gstqsvvp9enc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/gstqsvvp9enc.cpp Changed

@@ -91,11 +91,10 @@
     {0, nullptr, nullptr}
   };
 
-  if (g_once_init_enter (&rate_control_type)) {
-    GType type =
+  GST_QSV_CALL_ONCE_BEGIN {
+    rate_control_type =
         g_enum_register_static ("GstQsvVP9EncRateControl", rate_controls);
-    g_once_init_leave (&rate_control_type, type);
-  }
+  } GST_QSV_CALL_ONCE_END;
 
   return rate_control_type;
 }
@@ -342,13 +341,11 @@
   if (*old_val == new_val)
     return;
 
-  g_mutex_lock (&self->prop_lock);
   *old_val = new_val;
   if (is_bitrate_param)
     self->bitrate_updated = TRUE;
   else
     self->property_updated = TRUE;
-  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -358,10 +355,8 @@
   if (*old_val == (mfxU16) new_val)
     return;
 
-  g_mutex_lock (&self->prop_lock);
   *old_val = (mfxU16) new_val;
   self->property_updated = TRUE;
-  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -370,6 +365,7 @@
 {
   GstQsvVP9Enc *self = GST_QSV_VP9_ENC (object);
 
+  g_mutex_lock (&self->prop_lock);
   switch (prop_id) {
     case PROP_QP_I:
       gst_qsv_vp9_enc_check_update_uint (self, &self->qp_i,
@@ -407,6 +403,7 @@
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
+  g_mutex_unlock (&self->prop_lock);
 }
 
 static void
@@ -415,6 +412,7 @@
 {
   GstQsvVP9Enc *self = GST_QSV_VP9_ENC (object);
 
+  g_mutex_lock (&self->prop_lock);
   switch (prop_id) {
     case PROP_QP_I:
       g_value_set_uint (value, self->qp_i);
@@ -444,6 +442,7 @@
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
   }
+  g_mutex_unlock (&self->prop_lock);
 }
 
 static GstCaps *
@@ -648,6 +647,7 @@
   GstVideoInfo *info = &state->info;
   mfxExtVP9Param *vp9_param;
   mfxFrameInfo *frame_info;
+  GstVideoFormat format;
 
   frame_info = &param->mfx.FrameInfo;
 
@@ -670,45 +670,28 @@
   frame_info->AspectRatioW = GST_VIDEO_INFO_PAR_N (info);
   frame_info->AspectRatioH = GST_VIDEO_INFO_PAR_D (info);
 
-  switch (GST_VIDEO_INFO_FORMAT (info)) {
+  format = GST_VIDEO_INFO_FORMAT (info);
+  switch (format) {
     case GST_VIDEO_FORMAT_NV12:
       mfx_profile = MFX_PROFILE_VP9_0;
-      frame_info->ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-      frame_info->FourCC = MFX_FOURCC_NV12;
-      frame_info->BitDepthLuma = 8;
-      frame_info->BitDepthChroma = 8;
-      frame_info->Shift = 0;
       break;
     case GST_VIDEO_FORMAT_VUYA:
       mfx_profile = MFX_PROFILE_VP9_1;
-      frame_info->ChromaFormat = MFX_CHROMAFORMAT_YUV444;
-      frame_info->FourCC = MFX_FOURCC_AYUV;
-      frame_info->BitDepthLuma = 8;
-      frame_info->BitDepthChroma = 8;
-      frame_info->Shift = 0;
       break;
     case GST_VIDEO_FORMAT_P010_10LE:
       mfx_profile = MFX_PROFILE_VP9_2;
-      frame_info->ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-      frame_info->FourCC = MFX_FOURCC_P010;
-      frame_info->BitDepthLuma = 10;
-      frame_info->BitDepthChroma = 10;
-      frame_info->Shift = 1;
       break;
     case GST_VIDEO_FORMAT_Y410:
       mfx_profile = MFX_PROFILE_VP9_3;
-      frame_info->ChromaFormat = MFX_CHROMAFORMAT_YUV444;
-      frame_info->FourCC = MFX_FOURCC_Y410;
-      frame_info->BitDepthLuma = 10;
-      frame_info->BitDepthChroma = 10;
-      frame_info->Shift = 0;
       break;
     default:
       GST_ERROR_OBJECT (self, "Unexpected format %s",
-          gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (info)));
+          gst_video_format_to_string (format));
       return FALSE;
   }
 
+  gst_qsv_frame_info_set_format (frame_info, format);
+
   gst_qsv_vp9_enc_init_vp9_param (&self->vp9_param);
   vp9_param = &self->vp9_param;
 
@@ -873,6 +856,8 @@
   param.ExtParam = ext_bufs;
 
   for (guint i = 0; i < G_N_ELEMENTS (profile_map); i++) {
+    GstVideoFormat format;
+
     mfx->CodecProfile = profile_mapi.profile;
 
     gst_qsv_vp9_enc_init_vp9_param (&vp9_param);
@@ -883,38 +868,24 @@
 
     switch (mfx->CodecProfile) {
       case MFX_PROFILE_VP9_0:
-        mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-        mfx->FrameInfo.FourCC = MFX_FOURCC_NV12;
-        mfx->FrameInfo.BitDepthLuma = 8;
-        mfx->FrameInfo.BitDepthChroma = 8;
-        mfx->FrameInfo.Shift = 0;
+        format = GST_VIDEO_FORMAT_NV12;
         break;
       case MFX_PROFILE_VP9_1:
-        mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV444;
-        mfx->FrameInfo.FourCC = MFX_FOURCC_AYUV;
-        mfx->FrameInfo.BitDepthLuma = 8;
-        mfx->FrameInfo.BitDepthChroma = 8;
-        mfx->FrameInfo.Shift = 0;
+        format = GST_VIDEO_FORMAT_VUYA;
         break;
       case MFX_PROFILE_VP9_2:
-        mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-        mfx->FrameInfo.FourCC = MFX_FOURCC_P010;
-        mfx->FrameInfo.BitDepthLuma = 10;
-        mfx->FrameInfo.BitDepthChroma = 10;
-        mfx->FrameInfo.Shift = 1;
+        format = GST_VIDEO_FORMAT_P010_10LE;
         break;
       case MFX_PROFILE_VP9_3:
-        mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV444;
-        mfx->FrameInfo.FourCC = MFX_FOURCC_Y410;
-        mfx->FrameInfo.BitDepthLuma = 10;
-        mfx->FrameInfo.BitDepthChroma = 10;
-        mfx->FrameInfo.Shift = 0;
+        format = GST_VIDEO_FORMAT_Y410;
         break;
       default:
         g_assert_not_reached ();
         return;
     }
 
+    gst_qsv_frame_info_set_format (&mfx->FrameInfo, format);
+
     if (MFXVideoENCODE_Query (session, &param, &param) != MFX_ERR_NONE)
       continue;
 
@@ -928,11 +899,7 @@
   }
 
   mfx->CodecProfile = MFX_PROFILE_VP9_0;
-  mfx->FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
-  mfx->FrameInfo.FourCC = MFX_FOURCC_NV12;
-  mfx->FrameInfo.BitDepthLuma = 8;
-  mfx->FrameInfo.BitDepthChroma = 8;
-  mfx->FrameInfo.Shift = 0;
+  gst_qsv_frame_info_set_format (&mfx->FrameInfo, GST_VIDEO_FORMAT_NV12);
 
   /* Check max-resolution */
   for (guint i = 0; i < G_N_ELEMENTS (gst_qsv_resolutions); i++) {

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfx.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfx.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfxadapter.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxadapter.h Changed

@@ -31,8 +31,12 @@
    MFX_WRN_OUT_OF_RANGE  Not enough memory to report back entire list of adapters. In this case as many adapters as possible will be returned.
 
    @since This function is available since API version 1.31.
+
+   @deprecated Deprecated in API version 2.9. Use MFXEnumImplementations and MFXSetConfigFilterProperty to query adapter capabilities and
+               to select a suitable adapter for the input workload.
+               Use MFX_DEPRECATED_OFF macro to turn off the deprecation message visualization.
 */
-mfxStatus MFX_CDECL MFXQueryAdapters(mfxComponentInfo* input_info, mfxAdaptersInfo* adapters);
+MFX_DEPRECATED mfxStatus MFX_CDECL MFXQueryAdapters(mfxComponentInfo* input_info, mfxAdaptersInfo* adapters);
 
 /*!
    @brief
@@ -49,8 +53,12 @@
    MFX_WRN_OUT_OF_RANGE Not enough memory to report back entire list of adapters. In this case as many adapters as possible will be returned.
 
    @since This function is available since API version 1.31.
+
+   @deprecated Deprecated in API version 2.9. Use MFXEnumImplementations and MFXSetConfigFilterProperty to query adapter capabilities and
+               to select a suitable adapter for the input workload.
+               Use MFX_DEPRECATED_OFF macro to turn off the deprecation message visualization.
 */
-mfxStatus MFX_CDECL MFXQueryAdaptersDecode(mfxBitstream* bitstream, mfxU32 codec_id, mfxAdaptersInfo* adapters);
+MFX_DEPRECATED mfxStatus MFX_CDECL MFXQueryAdaptersDecode(mfxBitstream* bitstream, mfxU32 codec_id, mfxAdaptersInfo* adapters);
 
 /*!
    @brief
@@ -63,8 +71,12 @@
    MFX_ERR_NULL_PTR  num_adapters pointer is NULL.
 
    @since This function is available since API version 1.31.
+
+   @deprecated Deprecated in API version 2.9. Use MFXEnumImplementations and MFXSetConfigFilterProperty to query adapter capabilities and
+               to select a suitable adapter for the input workload.
+               Use MFX_DEPRECATED_OFF macro to turn off the deprecation message visualization.
 */
-mfxStatus MFX_CDECL MFXQueryAdaptersNumber(mfxU32* num_adapters);
+MFX_DEPRECATED mfxStatus MFX_CDECL MFXQueryAdaptersNumber(mfxU32* num_adapters);
 #ifdef __cplusplus
 } // extern "C"
 #endif

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfxbrc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxbrc.h Changed

@@ -53,15 +53,15 @@
                                          initial_cpb_removal_delay==0 && initial_cpb_removal_offset == 0 && HRD control is switched on. */
     mfxU32 reserved17;
     mfxU32 MaxFrameSize;            /*!< Max frame size in bytes. Option for repack feature. Driver calls PAK until current frame size is
-                                         less than or equal to maxFrameSize, or number of repacking for this frame is equal to maxNumRePak. Repack is available
-                                         if there is driver support, MaxFrameSize !=0, and MaxNumRePak != 0. Ignored if maxNumRePak == 0. */
-    mfxU8  DeltaQP8;              /*!< Option for repack feature. Ignored if maxNumRePak == 0 or maxNumRePak==0. If current
-                                         frame size > maxFrameSize and/or number of repacking (nRepack) for this frame <= maxNumRePak,
+                                         less than or equal to MaxFrameSize, or number of repacking for this frame is equal to MaxNumRePak. Repack is available
+                                         if there is driver support, MaxFrameSize !=0, and MaxNumRePak != 0. Ignored if MaxNumRePak == 0. */
+    mfxU8  DeltaQP8;              /*!< Option for repack feature. Ignored if MaxNumRePak == 0 or MaxNumRePak==0. If current
+                                         frame size > MaxFrameSize and/or number of repacking (nRepack) for this frame <= MaxNumRePak,
                                          PAK is called with QP = mfxBRCFrameCtrl::QpY + Sum(DeltaQPi), where i = 0,nRepack.
-                                         Non zero DeltaQPnRepack are ignored if nRepack > maxNumRePak.
-                                         If repacking feature is on ( maxFrameSize & maxNumRePak are not zero), it is calculated by the encoder. */
-    mfxU16 MaxNumRepak;             /*!< Number of possible repacks in driver if current frame size > maxFrameSize. Ignored if maxFrameSize==0.
-                                         See maxFrameSize description. Possible values are in the range of 0 to 8. */
+                                         Non zero DeltaQPnRepack are ignored if nRepack > MaxNumRePak.
+                                         If repacking feature is on ( MaxFrameSize & MaxNumRePak are not zero), it is calculated by the encoder. */
+    mfxU16 MaxNumRepak;             /*!< Number of possible repacks in driver if current frame size > MaxFrameSize. Ignored if MaxFrameSize==0.
+                                         See MaxFrameSize description. Possible values are in the range of 0 to 8. */
     mfxU16 NumExtParam;             /*!< Reserved for future use. */
     mfxExtBuffer** ExtParam;        /*!< Reserved for future use. */
 } mfxBRCFrameCtrl;

gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxcamera.h Added

@@ -0,0 +1,406 @@
+/*############################################################################
+  # Copyright Intel Corporation
+  #
+  # SPDX-License-Identifier: MIT
+  ############################################################################*/
+#ifndef __MFXCAMERA_H__
+#define __MFXCAMERA_H__
+
+#include "mfxcommon.h"
+
+#ifdef ONEVPL_EXPERIMENTAL
+
+#if !defined(__GNUC__)
+    #pragma warning(disable : 4201)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/*!
+  The ExtendedBufferID enumerator itemizes and defines identifiers (BufferId) for extended buffers in camera processing.
+  The application should attach these extended buffers to the mfxVideoParam structure to configure camera processing through VideoVPP functions.
+  And Implementation capabilities of camera processing features can be delivered by the function MFXQueryImplsDescription via VPP configuration
+  mfxVPPDescription.
+  */
+enum {
+    /*!
+      This extended buffer is mandatory for camera raw acclerator initialization. See the mfxExtCamPipeControl structure for details.
+      The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_PIPECONTROL = MFX_MAKEFOURCC('C', 'P', 'P', 'C'),
+    /*!
+      This extended buffer defines control parameters for the Camera White Balance filter algorithm. See mfxExtCamWhiteBalance structure for details.
+      The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_WHITE_BALANCE = MFX_MAKEFOURCC('C', 'W', 'B', 'L'),
+    /*!
+     This extended buffer defines control parameters for the Camera Hot Pixel Removal filter algorithm. See mfxExtCamHotPixelRemoval structure for details.
+     The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+   */
+    MFX_EXTBUF_CAM_HOT_PIXEL_REMOVAL = MFX_MAKEFOURCC('C', 'H', 'P', 'R'),
+    /*!
+     This extended buffer defines control parameters for the Camera Black Level Correction filter algorithm. See mfxExtCamBlackLevelCorrection structure for details.
+     The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_BLACK_LEVEL_CORRECTION = MFX_MAKEFOURCC('C', 'B', 'L', 'C'),
+    /*!
+     This extended buffer defines control parameters for the Camera Vignette Correction filter algorithm. See mfxCamVignetteCorrectionParam structure for details.
+     The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_VIGNETTE_CORRECTION = MFX_MAKEFOURCC('C', 'V', 'G', 'T'),
+    /*!
+     This extended buffer defines control parameters for the Camera Bayer Denoise filter algorithm. See mfxExtCamBayerDenoise structure for details.
+     The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_BAYER_DENOISE = MFX_MAKEFOURCC('C', 'D', 'N', 'S'),
+    /*!
+     This extended buffer defines control parameters for the Camera Color Correction filter algorithm. See mfxExtCamColorCorrection3x3 structure for details.
+     The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_COLOR_CORRECTION_3X3 = MFX_MAKEFOURCC('C', 'C', '3', '3'),
+    /*!
+     This extended buffer defines control parameters for the Camera Padding. See mfxExtCamPadding structure for details.
+     The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_PADDING = MFX_MAKEFOURCC('C', 'P', 'A', 'D'),
+    /*!
+     This extended buffer defines control parameters for the Camera Forward Gamma Correction filter algorithm. See mfxExtCamFwdGamma structure for details.
+     The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_FORWARD_GAMMA_CORRECTION =
+        MFX_MAKEFOURCC('C', 'F', 'G', 'C'),
+    /*!
+    This extended buffer defines control parameters for the Camera Lens Geometry Distortion and Chroma Aberration Correction filter algorithm. See mfxExtCamLensGeomDistCorrection structure for details.
+    The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_LENS_GEOM_DIST_CORRECTION =
+        MFX_MAKEFOURCC('C', 'L', 'G', 'D'),
+    /*!
+    This extended buffer defines control parameters for the Camera 3DLUT filter algorithm. See mfxExtCam3DLut structure for details.
+    The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_3DLUT = MFX_MAKEFOURCC('C', 'L', 'U', 'T'),
+    /*!
+    This extended buffer defines control parameters for the Camera Total Color Control algorithm. See mfxExtCamTotalColorControl structure for details.
+    The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_TOTAL_COLOR_CONTROL = MFX_MAKEFOURCC('C', 'T', 'C', 'C'),
+    /*!
+    This extended buffer defines control parameters for the Camera YUV to RGB conversion algorithm. See mfxExtCamCscYuvRgb structure for details.
+    The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
+    */
+    MFX_EXTBUF_CAM_CSC_YUV_RGB = MFX_MAKEFOURCC('C', 'C', 'Y', 'R')
+};
+
+/*!
+    A enumeration that defines white balance mode.
+*/
+typedef enum {
+    MFX_CAM_WHITE_BALANCE_MANUAL = 0x0001, /*!< White balance manual mode.*/
+    MFX_CAM_WHITE_BALANCE_AUTO   = 0x0002 /*!< White balance auto mode.*/
+} mfxCamWhiteBalanceMode;
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A hint structure that configures Camera White Balance filter.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_WHITE_BALANCE. */
+    mfxU32
+        Mode; /*!< Specifies one of White Balance operation modes defined in enumeration mfxCamWhiteBalanceMode. */
+    mfxF64 R; /*!< White Balance Red correction..*/
+    mfxF64 G0; /*!< White Balance Green Top correction..*/
+    mfxF64 B; /*!< White Balance Blue correction.*/
+    mfxF64 G1; /*!< White Balance Green Bottom correction..*/
+    mfxU32 reserved8; /*!< Reserved for future extension.*/
+} mfxExtCamWhiteBalance;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A hint structure that configures Camera Total Color Control filter.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_TOTAL_COLOR_CONTROL. */
+    mfxU16 R; /*!< Red element.*/
+    mfxU16 G; /*!< Green element.*/
+    mfxU16 B; /*!< Blue element.*/
+    mfxU16 C; /*!< Cyan element.*/
+    mfxU16 M; /*!< Magenta element.*/
+    mfxU16 Y; /*!< Yellow element.*/
+    mfxU16 reserved6; /*!< Reserved for future extension.*/
+} mfxExtCamTotalColorControl;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A hint structure that configures Camera YUV to RGB format conversion.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_CSC_YUV_RGB. */
+    mfxF32 PreOffset
+        3; /*!< Specifies offset for conversion from full range RGB input to limited range YUV for input color coordinate.*/
+    mfxF32 Matrix3
+                 3; /*!< Specifies conversion matrix with CSC coefficients.*/
+    mfxF32 PostOffset
+        3; /*!< Specifies offset for conversion from full range RGB input to limited range YUV for output color coordinate.*/
+    mfxU16 reserved30; /*!< Reserved for future extension.*/
+} mfxExtCamCscYuvRgb;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A hint structure that configures Camera Hot Pixel Removal filter.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_HOT_PIXEL_REMOVAL. */
+    mfxU16 PixelThresholdDifference; /*!< Threshold for Hot Pixel difference. */
+    mfxU16 PixelCountThreshold; /*!< Count pixel detection.*/
+    mfxU16 reserved32; /*!< Reserved for future extension.*/
+} mfxExtCamHotPixelRemoval;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+typedef struct {
+    /*!
+    A hint structure that configures Camera black level correction.
+*/
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_BLACK_LEVEL_CORRECTION. */
+    mfxU16 R; /*!< Black Level Red correction.*/
+    mfxU16 G0; /*!< Black Level Green Top correction.*/
+    mfxU16 B; /*!< Black Level Blue correction.*/
+    mfxU16 G1; /*!< Black Level Green Bottom correction.*/
+    mfxU32 reserved4; /*!< Reserved for future extension.*/
+} mfxExtCamBlackLevelCorrection;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A structure that defines Camera Vignette Correction Element.
+*/
+typedef struct {
+    mfxU8 integer; /*!< Integer part of correction element.*/
+    mfxU8 mantissa; /*!< Fractional part of correction element.*/
+    mfxU8 reserved6; /*!< Reserved for future extension.*/
+} mfxCamVignetteCorrectionElement;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A structure that defines Camera Vignette Correction Parameters.
+*/
+typedef struct {
+    mfxCamVignetteCorrectionElement R; /*!< Red correction element.*/
+    mfxCamVignetteCorrectionElement G0; /*!< Green top correction element.*/
+    mfxCamVignetteCorrectionElement B; /*!< Blue Correction element.*/
+    mfxCamVignetteCorrectionElement G1; /*!< Green bottom correction element.*/
+    mfxU32 reserved4; /*!< Reserved for future extension.*/
+} mfxCamVignetteCorrectionParam;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_STRUCT_W_PTR()
+/*!
+    A hint structure that configures Camera Vignette Correction filter.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_VIGNETTE_CORRECTION. */
+    mfxU32
+        Width; /*!< Width of Correction Map 2D buffer in mfxCamVignetteCorrectionParam elements. */
+    mfxU32
+        Height; /*!< Height of Correction Map 2D buffer in mfxCamVignetteCorrectionParam elements. */
+    mfxU32
+        Pitch; /*!< Pitch of Correction Map 2D buffer in mfxCamVignetteCorrectionParam elements. */
+    mfxU32 reserved7; /*!< Reserved for future extension.*/
+
+    union {
+        mfxCamVignetteCorrectionParam*
+            CorrectionMap; /*!< 2D buffer of mfxCamVignetteCorrectionParam elements.*/
+        mfxU64 reserved1; /*!< Reserved for alignment on 32bit and 64bit.*/
+    };
+} mfxExtCamVignetteCorrection;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A hint structure that configures Camera Bayer denoise filter.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_BAYER_DENOISE. */
+    mfxU16 Threshold; /*!< Level of denoise, legal values: 0:63.*/
+    mfxU16 reserved27; /*!< Reserved for future extension.*/
+} mfxExtCamBayerDenoise;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
+/*!
+    A hint structure that configures Camera Color correction filter.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_COLOR_CORRECTION_3X3. */
+    mfxF32 CCM
+        3
+        3; /*!< 3x3 dimension matrix providing RGB Color Correction coefficients.*/
+    mfxU32 reserved32; /*!< Reserved for future extension.*/
+} mfxExtCamColorCorrection3x3;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A hint structure that configures Camera Padding.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_PADDING. */
+    mfxU16
+        Top; /*!< Specify number of padded columns respectively. Currently only 8 pixels supported for all dimensions..*/
+    mfxU16
+        Bottom; /*!< Specify number of padded columns respectively. Currently only 8 pixels supported for all dimensions..*/
+    mfxU16
+        Left; /*!< Specify number of padded rows respectively. Currently only 8 pixels supported for all dimensions..*/
+    mfxU16
+        Right; /*!< Specify number of padded rows respectively. Currently only 8 pixels supported for all dimensions..*/
+    mfxU32 reserved4; /*!< Reserved for future extension.*/
+} mfxExtCamPadding;
+MFX_PACK_END()
+
+/*!
+    A enumeration that defines Bayer mode.
+*/
+typedef enum {
+    /*!
+     Pixel Representation BG
+                          GR.
+     */
+    MFX_CAM_BAYER_BGGR = 0x0000,
+    /*!
+     Pixel Representation RG
+                          GB.
+     */
+    MFX_CAM_BAYER_RGGB = 0x0001,
+    /*!
+     Pixel Representation GB
+                          RG.
+     */
+    MFX_CAM_BAYER_GBRG = 0x0002,
+    /*!
+     Pixel Representation GR
+                          BG.
+     */
+    MFX_CAM_BAYER_GRBG = 0x0003
+} mfxCamBayerFormat;
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A hint structure that configures camera pipe control.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_PIPECONTROL. */
+    mfxU16
+        RawFormat; /*!< Specifies one of the four Bayer patterns defined in mfxCamBayerFormat enumeration.*/
+    mfxU16 reserved1; /*!< Reserved for future extension.*/
+    mfxU32 reserved5; /*!< Reserved for future extension.*/
+} mfxExtCamPipeControl;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A structure that specifies forward gamma segment.
+*/
+typedef struct {
+    mfxU16 Pixel; /*!< Pixel value.*/
+    mfxU16 Red; /*!< Corrected Red value.*/
+    mfxU16 Green; /*!< Corrected Green value.*/
+    mfxU16 Blue; /*!< Corrected Blue value.*/
+} mfxCamFwdGammaSegment;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
+/*!
+    A hint structure that configures Camera Forward Gamma Correction filter.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_FORWARD_GAMMA_CORRECTION. */
+
+    mfxU16 reserved19; /*!< Reserved for future extension.*/
+    mfxU16 NumSegments; /*!< Number of Gamma segments.*/
+    union {
+        mfxCamFwdGammaSegment* Segment; /*!< Pointer to Gamma segments array.*/
+        mfxU64 reserved1; /*!< Reserved for future extension.*/
+    };
+} mfxExtCamFwdGamma;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A hint structure that configures Camera Lens Geometry Distortion and Chroma Aberration Correction filter.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_LENS_GEOM_DIST_CORRECTION. */
+
+    mfxF32 a3; /*!< Polynomial coefficients a for R/G/B*/
+    mfxF32 b3; /*!< Polynomial coefficients b for R/G/B*/
+    mfxF32 c3; /*!< Polynomial coefficients c for R/G/B*/
+    mfxF32 d3; /*!< Polynomial coefficients d for R/G/B*/
+    mfxU16 reserved36; /*!< Reserved for future extension.*/
+} mfxExtCamLensGeomDistCorrection;
+MFX_PACK_END()
+
+/*!
+    A enumeration that defines 3DLUT size.
+*/
+enum {
+    MFX_CAM_3DLUT17_SIZE = (17 * 17 * 17), /*!< 17^3 LUT size*/
+    MFX_CAM_3DLUT33_SIZE = (33 * 33 * 33), /*!< 33^3 LUT size*/
+    MFX_CAM_3DLUT65_SIZE = (65 * 65 * 65) /*!< 65^3 LUT size*/
+};
+
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*!
+    A structure that defines 3DLUT entry.
+*/
+typedef struct {
+    mfxU16 R; /*!< R channel*/
+    mfxU16 G; /*!< G channel*/
+    mfxU16 B; /*!< B channel*/
+    mfxU16 Reserved; /*!< Reserved for future extension.*/
+} mfxCam3DLutEntry;
+MFX_PACK_END()
+
+MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
+/*!
+    A hint structure that configures Camera 3DLUT filter.
+*/
+typedef struct {
+    mfxExtBuffer
+        Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_3DLUT. */
+
+    mfxU16 reserved10; /*!< Reserved for future extension.*/
+    mfxU32
+        Size; /*!< LUT size, defined in MFX_CAM_3DLUT17/33/65_SIZE enumeration.*/
+    union {
+        mfxCam3DLutEntry*
+            Table; /*!< Pointer to mfxCam3DLutEntry, size of each dimension depends on LUT size, e.g. LUT171717 for 17x17x17 look up table.*/
+        mfxU64 reserved1; /*!< Reserved for future extension.*/
+    };
+} mfxExtCam3DLut;
+MFX_PACK_END()
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // ONEVPL_EXPERIMENTAL
+#endif // __MFXCAMERA_H__
\ No newline at end of file

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfxcommon.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxcommon.h Changed

@@ -34,7 +34,7 @@
 #define MFX_REFINTERFACE_VERSION MFX_STRUCT_VERSION(1, 0)
 
 MFX_PACK_BEGIN_STRUCT_W_PTR()
-/*! The structure respresents reference counted interface structure.
+/*! The structure represents reference counted interface structure.
     The memory is allocated and released by the implementation.
 */
 typedef struct mfxRefInterface {
@@ -191,7 +191,10 @@
     MFX_GPUCOPY_DEFAULT = 0, /*!< Use default mode for the legacy Intel(r) Media SDK implementation. */
     MFX_GPUCOPY_ON      = 1, /*!< The hint to enable GPU accelerated copying when it is supported by the library. 
                                   If the library doesn't support GPU accelerated copy the operation will be made by CPU. */
-    MFX_GPUCOPY_OFF     = 2  /*!< Disable GPU accelerated copying. */
+    MFX_GPUCOPY_OFF     = 2,  /*!< Disable GPU accelerated copying. */
+#ifdef ONEVPL_EXPERIMENTAL
+    MFX_GPUCOPY_SAFE    = 3  /*!< The hint to disable buffer caching for GPU accelerated copying. Actual when GPU accelerated copying is supported by the library. */
+#endif
 };
 
 MFX_PACK_BEGIN_STRUCT_W_PTR()
@@ -234,35 +237,34 @@
 } mfxExtThreadsParam;
 MFX_PACK_END()
 
-/*! The PlatformCodeName enumerator itemizes product code names for platforms. 
-    For details about Intel code names, see ark.intel.com. */
+/*! Deprecated. */
 enum {
-    MFX_PLATFORM_UNKNOWN        = 0,  /*!< Unknown platform. */
-    MFX_PLATFORM_SANDYBRIDGE    = 1,  /*!< Intel(r) microarchitecture code name Sandy Bridge. */
-    MFX_PLATFORM_IVYBRIDGE      = 2,  /*!< Intel(r) microarchitecture code name Ivy Bridge. */
-    MFX_PLATFORM_HASWELL        = 3,  /*!< Code name Haswell. */
-    MFX_PLATFORM_BAYTRAIL       = 4,  /*!< Code name Bay Trail. */
-    MFX_PLATFORM_BROADWELL      = 5,  /*!< Intel(r) microarchitecture code name Broadwell. */
-    MFX_PLATFORM_CHERRYTRAIL    = 6,  /*!< Code name Cherry Trail. */
-    MFX_PLATFORM_SKYLAKE        = 7,  /*!< Intel(r) microarchitecture code name Skylake. */
-    MFX_PLATFORM_APOLLOLAKE     = 8,  /*!< Code name Apollo Lake. */
-    MFX_PLATFORM_KABYLAKE       = 9,  /*!< Code name Kaby Lake. */
-    MFX_PLATFORM_GEMINILAKE     = 10, /*!< Code name Gemini Lake. */
-    MFX_PLATFORM_COFFEELAKE     = 11, /*!< Code name Coffee Lake. */
-    MFX_PLATFORM_CANNONLAKE     = 20, /*!< Code name Cannon Lake. */
-    MFX_PLATFORM_ICELAKE        = 30, /*!< Code name Ice Lake. */
-    MFX_PLATFORM_JASPERLAKE     = 32, /*!< Code name Jasper Lake. */
-    MFX_PLATFORM_ELKHARTLAKE    = 33, /*!< Code name Elkhart Lake. */
-    MFX_PLATFORM_TIGERLAKE      = 40, /*!< Code name Tiger Lake. */
-    MFX_PLATFORM_ROCKETLAKE     = 42, /*!< Code name Rocket Lake. */
-    MFX_PLATFORM_ALDERLAKE_S    = 43, /*!< Code name Alder Lake S. */
-    MFX_PLATFORM_ALDERLAKE_P    = 44, /*!< Code name Alder Lake P. */
-    MFX_PLATFORM_ARCTICSOUND_P  = 45,
-    MFX_PLATFORM_XEHP_SDV       = 45, /*!< Code name XeHP SDV. */
-    MFX_PLATFORM_DG2            = 46, /*!< Code name DG2. */
-    MFX_PLATFORM_ATS_M          = 46, /*!< Code name ATS-M, same media functionality as DG2. */
-    MFX_PLATFORM_ALDERLAKE_N    = 55, /*!< Code name Alder Lake N. */
-    MFX_PLATFORM_KEEMBAY        = 50, /*!< Code name Keem Bay. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_UNKNOWN)        = 0,  /*!< Unknown platform. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_SANDYBRIDGE)    = 1,  /*!< Intel(r) microarchitecture code name Sandy Bridge. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_IVYBRIDGE)      = 2,  /*!< Intel(r) microarchitecture code name Ivy Bridge. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_HASWELL)        = 3,  /*!< Code name Haswell. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_BAYTRAIL)       = 4,  /*!< Code name Bay Trail. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_BROADWELL)      = 5,  /*!< Intel(r) microarchitecture code name Broadwell. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_CHERRYTRAIL)    = 6,  /*!< Code name Cherry Trail. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_SKYLAKE)        = 7,  /*!< Intel(r) microarchitecture code name Skylake. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_APOLLOLAKE)     = 8,  /*!< Code name Apollo Lake. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_KABYLAKE)       = 9,  /*!< Code name Kaby Lake. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_GEMINILAKE)     = 10, /*!< Code name Gemini Lake. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_COFFEELAKE)     = 11, /*!< Code name Coffee Lake. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_CANNONLAKE)     = 20, /*!< Code name Cannon Lake. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_ICELAKE)        = 30, /*!< Code name Ice Lake. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_JASPERLAKE)     = 32, /*!< Code name Jasper Lake. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_ELKHARTLAKE)    = 33, /*!< Code name Elkhart Lake. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_TIGERLAKE)      = 40, /*!< Code name Tiger Lake. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_ROCKETLAKE)     = 42, /*!< Code name Rocket Lake. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_ALDERLAKE_S)    = 43, /*!< Code name Alder Lake S. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_ALDERLAKE_P)    = 44, /*!< Code name Alder Lake P. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_ARCTICSOUND_P)  = 45,
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_XEHP_SDV)       = 45, /*!< Code name XeHP SDV. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_DG2)            = 46, /*!< Code name DG2. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_ATS_M)          = 46, /*!< Code name ATS-M, same media functionality as DG2. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_ALDERLAKE_N)    = 55, /*!< Code name Alder Lake N. */
+    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLATFORM_KEEMBAY)        = 50, /*!< Code name Keem Bay. */
 };
 
 /*! The mfxMediaAdapterType enumerator itemizes types of graphics adapters. */
@@ -276,7 +278,7 @@
 MFX_PACK_BEGIN_USUAL_STRUCT()
 /*! Contains information about hardware platform for the Legacy mode. */
 typedef struct {
-    mfxU16 CodeName;         /*!< Microarchitecture code name. See the PlatformCodeName enumerator for a list of possible values. */
+   MFX_DEPRECATED  mfxU16 CodeName;         /*!< Deprecated. */
     mfxU16 DeviceId;         /*!< Unique identifier of graphics device. */
     mfxU16 MediaAdapterType; /*!< Description of graphics adapter type. See the mfxMediaAdapterType enumerator for a list of possible values. */
     mfxU16 reserved13;     /*!< Reserved for future use. */
@@ -534,13 +536,13 @@
 #define MFX_EXTENDEDDEVICEID_VERSION MFX_STRUCT_VERSION(1, 0)
 
 MFX_PACK_BEGIN_USUAL_STRUCT()
-/*! Specifies variouse physical device properties for device matching and identification outside of oneVPL. */
+/*! Specifies various physical device properties for device matching and identification outside of oneVPL. */
 typedef struct {
     mfxStructVersion Version;                       /*!< Version of the structure. */
     mfxU16           VendorID;                      /*!< PCI vendor ID. */
     mfxU16           DeviceID;                      /*!< PCI device ID. */
     mfxU32           PCIDomain;                     /*!< PCI bus domain. Equals to '0' if OS doesn't support it or
-                                                         has sequential numbering of buses accross domains. */
+                                                         has sequential numbering of buses across domains. */
     mfxU32           PCIBus;                        /*!< The number of the bus that the physical device is located on. */
     mfxU32           PCIDevice;                     /*!< The index of the physical device on the bus. */
     mfxU32           PCIFunction;                   /*!< The function number of the device on the physical device. */
@@ -550,17 +552,33 @@
     mfxU32           LUIDValid;                     /*!< Boolean value that will be 1 if DeviceLUID contains a valid LUID
                                                          and LUIDDeviceNodeMask contains a valid node mask,
                                                          and 0 if they do not. */
-    mfxU32           DRMRenderNodeNum;              /*!< Number of the DRM render node from the path /dev/dri/RenderD<num>.
+    mfxU32           DRMRenderNodeNum;              /*!< Number of the DRM render node from the path /dev/dri/RenderD\<num\>.
                                                          Value equals to 0 means that this field doesn't contain valid DRM Render
                                                          Node number.*/
-    mfxU32           DRMPrimaryNodeNum;             /*!< Number of the DRM primary node from the path /dev/dri/card<num>.
+    mfxU32           DRMPrimaryNodeNum;             /*!< Number of the DRM primary node from the path /dev/dri/card\<num\>.
                                                          Value equals to 0x7FFFFFFF means that this field doesn't contain valid DRM Primary
                                                          Node number.*/
-    mfxU8            reserved120;                 /*!< Reserved for future use. */
+    mfxU16           RevisionID;                    /*!< PCI revision ID. The value contains microarchitecture version. */
+    mfxU8            reserved118;                 /*!< Reserved for future use. */
     mfxChar          DeviceNameMFX_STRFIELD_LEN;  /*!< Null-terminated string in utf-8 with the name of the device. */
 } mfxExtendedDeviceId;
 MFX_PACK_END()
 
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*! Cross domain structure to define device UUID. It is defined here to check backward compatibility.*/
+typedef struct {
+      mfxU16 vendor_id;                             /*!< PCI vendor ID. Same as mfxExtendedDeviceId::VendorID. */
+      mfxU16 device_id;                             /*!< PCI device ID. Same as mfxExtendedDeviceId::DeviceID. */
+      mfxU16 revision_id;                           /*!< PCI revision ID. Same as mfxExtendedDeviceId::RevisionID. */
+      mfxU16 pci_domain;                            /*!< PCI bus domain. Same as mfxExtendedDeviceId::PCIDomain. */
+      mfxU8  pci_bus;                               /*!< The number of the bus that the physical device is located on. Same as mfxExtendedDeviceId::PCIBus. */
+      mfxU8  pci_dev;                               /*!< The index of the physical device on the bus. Same as mfxExtendedDeviceId::PCIDevice. */
+      mfxU8  pci_func;                              /*!< The function number of the device on the physical device.  Same as mfxExtendedDeviceId::PCIFunction. */
+      mfxU8  reserved4;                           /*!< Reserved for future use. */
+      mfxU8  sub_device_id;                         /*!< SubDevice ID.*/  
+} extDeviceUUID;
+MFX_PACK_END()
+
 #endif
 
 /* The mfxImplCapsDeliveryFormat enumerator specifies delivery format of the implementation capability. */
@@ -605,4 +623,3 @@
 #endif /* __cplusplus */
 
 #endif
-

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfxdefs.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxdefs.h Changed

@@ -8,7 +8,7 @@
 #define __MFXDEFS_H__
 
 #define MFX_VERSION_MAJOR 2
-#define MFX_VERSION_MINOR 7
+#define MFX_VERSION_MINOR 9
 
 // MFX_VERSION - version of API that 'assumed' by build may be provided externally
 // if it omitted then latest stable API derived from Major.Minor is assumed
@@ -68,7 +68,7 @@
     #define MFX_PACK_BEGIN_STRUCT_W_PTR()    MFX_PACK_BEGIN_X(4)
     #define MFX_PACK_BEGIN_STRUCT_W_L_TYPE() MFX_PACK_BEGIN_X(8)
 /* 32-bit ILP32 data model Linux* */
-#elif defined(__ILP32__)
+#elif defined(__ILP32__) || defined(__arm__)
     #define MFX_PACK_BEGIN_STRUCT_W_PTR()    MFX_PACK_BEGIN_X(4)
     #define MFX_PACK_BEGIN_STRUCT_W_L_TYPE() MFX_PACK_BEGIN_X(4)
 #else
@@ -148,6 +148,9 @@
 typedef mfxHDL              mfxMemId;      /*!< Memory ID type. */
 typedef void*               mfxThreadTask; /*!< Thread task type. */
 typedef char                mfxChar;       /*!< UTF-8 byte. */
+#ifdef ONEVPL_EXPERIMENTAL
+typedef unsigned short      mfxFP16;       /*!< Half precision floating point, 16 bit type. */
+#endif
 
 /* MFX structures version info */
 MFX_PACK_BEGIN_USUAL_STRUCT()
@@ -189,6 +192,10 @@
     MFX_DATA_TYPE_I64,                    /*!< 64-bit signed integer. */
     MFX_DATA_TYPE_F32,                    /*!< 32-bit single precision floating point. */
     MFX_DATA_TYPE_F64,                    /*!< 64-bit double precision floating point. */
+    MFX_DATA_TYPE_PTR,                    /*!< Generic type pointer. */
+#ifdef ONEVPL_EXPERIMENTAL
+    MFX_DATA_TYPE_FP16,                   /*!< 16-bit half precision floating point. */
+#endif
 }mfxDataType;
 
 /*! The mfxVariantType enumerator data types for mfxVariantType. */
@@ -204,7 +211,10 @@
     MFX_VARIANT_TYPE_I64   = MFX_DATA_TYPE_I64,                          /*!< 64-bit signed integer. */
     MFX_VARIANT_TYPE_F32   = MFX_DATA_TYPE_F32,                          /*!< 32-bit single precision floating point. */
     MFX_VARIANT_TYPE_F64   = MFX_DATA_TYPE_F64,                          /*!< 64-bit double precision floating point. */
-    MFX_VARIANT_TYPE_PTR,                                                /*!< Generic type pointer. */
+    MFX_VARIANT_TYPE_PTR   = MFX_DATA_TYPE_PTR,                          /*!< Generic type pointer. */
+#ifdef ONEVPL_EXPERIMENTAL
+    MFX_VARIANT_TYPE_FP16  = MFX_DATA_TYPE_FP16,                         /*!< 16-bit half precision floating point. */
+#endif
 } mfxVariantType;
 
 MFX_PACK_BEGIN_STRUCT_W_PTR()
@@ -224,6 +234,9 @@
         mfxI64 I64; /*!< mfxI64 data. */
         mfxF32 F32; /*!< mfxF32 data. */
         mfxF64 F64; /*!< mfxF64 data. */
+#ifdef ONEVPL_EXPERIMENTAL
+        mfxFP16 FP16; /*!< mfxFP16 data. */
+#endif
         mfxHDL Ptr; /*!< Pointer. When this points to a string the string must be null terminated. */
     } Data;         /*!< Value data member. */
 } mfxVariant;

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfxdispatcher.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxdispatcher.h Changed

@@ -81,11 +81,13 @@
 
 /*!
    @brief Iterates over filtered out implementations to gather their details. This function allocates memory to store
-          mfxImplDescription structure instance. Use the MFXDispReleaseImplDescription function to free memory allocated to the mfxImplDescription structure.
+          a structure or string corresponding to the type specified by format. For example, if format is set to
+          MFX_IMPLCAPS_IMPLDESCSTRUCTURE, then idesc will return a pointer to a structure of type mfxImplDescription.
+          Use the MFXDispReleaseImplDescription function to free memory allocated to this structure or string.
    @paramin loader Loader handle.
    @paramin i Index of the implementation.
    @paramin format Format in which capabilities need to be delivered. See the mfxImplCapsDeliveryFormat enumerator for more details.
-   @paramout idesc Pointer to the mfxImplDescription structure.
+   @paramout idesc Pointer to the structure or string corresponding to the requested format.
    @return
       MFX_ERR_NONE        The function completed successfully. The idesc contains valid information.\n
       MFX_ERR_NULL_PTR    If loader is NULL. \n
@@ -147,6 +149,32 @@
 */
 mfxStatus MFX_CDECL MFXDispReleaseImplDescription(mfxLoader loader, mfxHDL hdl);
 
+#ifdef ONEVPL_EXPERIMENTAL
+/*!
+   @brief
+      Macro help to return UUID in the common oneAPI format. 
+
+   @paramin  devinfo Handle to mfxExtendedDeviceId.
+   @paramin  sub_device_id SubDevice number. Can be obtained from mfxDeviceDescription::SubDevices::Index. Set to zero if no SubDevices.
+   @paramout uuid    Pointer to UUID.
+
+*/
+#define MFX_UUID_COMPUTE_DEVICE_ID(devinfo, sub_device_id, uuid)              \
+{                                                                             \
+   extDeviceUUID t_uuid = { 0 };                                              \
+   extDeviceUUID* shared_uuid = (extDeviceUUID*)uuid;                         \
+   t_uuid.vendor_id   = devinfo->VendorID;                                    \
+   t_uuid.device_id   = devinfo->DeviceID;                                    \
+   t_uuid.revision_id = devinfo->RevisionID;                                  \
+   t_uuid.pci_domain  = devinfo->PCIDomain;                                   \
+   t_uuid.pci_bus     = (mfxU8)devinfo->PCIBus;                               \
+   t_uuid.pci_dev     = (mfxU8)devinfo->PCIDevice;                            \
+   t_uuid.pci_func    = (mfxU8)devinfo->PCIFunction;                          \
+   t_uuid.sub_device_id = (mfxU8)sub_device_id;                               \
+   *shared_uuid = t_uuid;                                                     \
+}                                                                             
+#endif
+
 /* Helper macro definitions to add config filter properties. */
 
 /*! Adds single property of mfxU32 type.

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfxencodestats.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxencodestats.h Changed

@@ -335,7 +335,7 @@
         mfxU32  NumCTU; /*!< number of CTUs per frame for H.265. */
     };
 
-    mfxBlockSize   BlockSize; /*! For H.264 it is always 16x16 coresponding to MB size. 
+    mfxBlockSize   BlockSize; /*! For H.264 it is always 16x16 corresponding to MB size. 
                                In H.265 it's normalized to 4x4, so for each CU we calculate number of 4x4 which belongs to the block. */
     
     mfxU32  NumIntraBlock;   /*! Number of intra blocks in the frame. The size of block is defined by BlockSize. 
@@ -377,7 +377,7 @@
 
 
 MFX_PACK_BEGIN_STRUCT_W_PTR()
-/*! The structure respresnts reference counted container for output after encoding operation which includes statistics
+/*! The structure represents reference counted container for output after encoding operation which includes statistics
     and synchronization primitive for compressed bitstream. 
     The memory is allocated and released by the library.
 */
@@ -442,7 +442,7 @@
 typedef struct {
     mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_ENCODESTATS_BLK. */
     mfxU16                       EncodeStatsFlags;       /*! What statistics is required: block/slice/tile/frame level or any combinations. 
-                                                             In case of slice or tile output statistics for one slice or tile will be availbale only.*/
+                                                             In case of slice or tile output statistics for one slice or tile will be available only.*/
     mfxEncodeStatsMode           Mode;                   /*!< What encoding mode should be used to gather statistics. */
     mfxEncodeStatsContainer     *EncodeStatsContainer; /*!< encode output, filled by the implementation. */ 
     mfxU32       reserved8;

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfxjpeg.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxjpeg.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfxstructures.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxstructures.h Changed

@@ -174,6 +174,9 @@
     /*! 8bit per sample 4:4:4 format packed in 32 bits, X=unused/undefined, 'X' channel is 8 MSBs, then 'Y', then 'U', and then 'V' channels. This format should be mapped to VA_FOURCC_XYUV. */
     MFX_FOURCC_XYUV         = MFX_MAKEFOURCC('X','Y','U','V'),
 #endif
+#ifdef ONEVPL_EXPERIMENTAL
+    MFX_FOURCC_ABGR16F      = MFX_MAKEFOURCC('B', 'G', 'R', 'F'),  /*!< 16 bits float point ABGR color format packed in 64 bits. 'A' channel is 16 MSBs, then 'B', then 'G' and then 'R' channels. This format should be mapped to DXGI_FORMAT_R16G16B16A16_FLOAT or D3DFMT_A16B16G16R16F formats.. */
+#endif
 };
 
 /* PicStruct */
@@ -268,6 +271,19 @@
 } mfxA2RGB10;
 MFX_PACK_END()
 
+#ifdef ONEVPL_EXPERIMENTAL
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*! Specifies "pixel" in ABGR 16 bit half float point color format */
+typedef struct
+{
+    mfxFP16 R; /*!< R component. */
+    mfxFP16 G; /*!< G component. */
+    mfxFP16 B; /*!< B component. */
+    mfxFP16 A; /*!< A component. */
+} mfxABGR16FP;
+MFX_PACK_END()
+#endif
+
 /*! Describes frame buffer pointers. */
 MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
 typedef struct {
@@ -330,6 +346,9 @@
         mfxU16  *V16;   /*!< V16 channel. */
         mfxU8   *B;     /*!< B channel. */
         mfxA2RGB10 *A2RGB10; /*!< A2RGB10 channel for A2RGB10 format (merged ARGB). */
+#ifdef ONEVPL_EXPERIMENTAL
+        mfxABGR16FP* ABGRFP16; /*!< ABGRFP16 channel for half float ARGB format (use this merged one due to no separate FP16 Alpha Channel). */
+#endif
     };
     mfxU8       *A;     /*!< A channel. */
     mfxMemId    MemId;  /*!< Memory ID of the data buffers. Ignored if any of the preceding data pointers is non-zero. */
@@ -703,6 +722,9 @@
                 mfxU16  InitialDelayInKB;
                 /*! Quantization Parameter (QP) for I-frames for constant QP mode (CQP). Zero QP is not valid and means that the default value is assigned by the library.
                     Non-zero QPI might be clipped to supported QPI range.
+                    @note In the HEVC design, a further adjustment to QPs can occur based on bit depth.
+                    Adjusted QPI value = QPI - (6 * (BitDepthLuma - 8)) for BitDepthLuma in the range 8,14.
+                    For HEVC_MAIN10, we minus (6*(10-8)=12) on our side and continue.
                     @note Default QPI value is implementation dependent and subject to change without additional notice in this document. */
                 mfxU16  QPI;
                 mfxU16  Accuracy; /*!< Specifies accuracy range in the unit of tenth of percent. */
@@ -713,6 +735,9 @@
                 mfxU16  TargetKbps;
                 /*! Quantization Parameter (QP) for P-frames for constant QP mode (CQP). Zero QP is not valid and means that the default value is assigned by the library.
                     Non-zero QPP might be clipped to supported QPI range.
+                    @note In the HEVC design, a further adjustment to QPs can occur based on bit depth.
+                    Adjusted QPP value = QPP - (6 * (BitDepthLuma - 8)) for BitDepthLuma in the range 8,14.
+                    For HEVC_MAIN10, we minus (6*(10-8)=12) on our side and continue.
                     @note Default QPP value is implementation dependent and subject to change without additional notice in this document. */
                 mfxU16  QPP;
                 mfxU16  ICQQuality; /*!< Used by the Intelligent Constant Quality (ICQ) bitrate control algorithm. Values are in the 1 to 51 range, where 1 corresponds the best quality. */
@@ -722,6 +747,9 @@
                 mfxU16  MaxKbps;
                 /*! Quantization Parameter (QP) for B-frames for constant QP mode (CQP). Zero QP is not valid and means that the default value is assigned by the library.
                     Non-zero QPI might be clipped to supported QPB range.
+                    @note In the HEVC design, a further adjustment to QPs can occur based on bit depth.
+                    Adjusted QPB value = QPB - (6 * (BitDepthLuma - 8)) for BitDepthLuma in the range 8,14.
+                    For HEVC_MAIN10, we minus (6*(10-8)=12) on our side and continue.
                     @note Default QPB value is implementation dependent and subject to change without additional notice in this document. */
                 mfxU16  QPB;
                 mfxU16  Convergence; /*!< Convergence period in the unit of 100 frames. */
@@ -1346,8 +1374,10 @@
        This parameter is valid only during initialization. Flag works with MFX_CODEC_AVC only, it is ignored with other codecs.
        See the CodingOptionValue
        enumerator for values of this option.
+
+       @deprecated Deprecated in API version 2.9
     */
-    mfxU16      BitrateLimit;
+    MFX_DEPRECATED mfxU16      BitrateLimit; /* Deprecated */
     /*!
        Setting this flag enables macroblock level bitrate control that generally improves subjective visual quality. Enabling this flag may
        have negative impact on performance and objective visual quality metric. See the CodingOptionValue enumerator for values of this option.
@@ -1402,7 +1432,7 @@
     */
     mfxU16      NumMbPerSlice;
     /*!
-       Enables usage of mfxEncodeCtrl::SkipFrameparameter. See the SkipFrame enumerator for values of this option.
+       Enables usage of mfxEncodeCtrl::SkipFrame parameter. See the SkipFrame enumerator for values of this option.
        @note Not all codecs and implementations support this value. Use the Query API function to check if this feature is supported.
     */
     mfxU16      SkipFrame;
@@ -1478,7 +1508,10 @@
 enum {
     MFX_CONTENT_UNKNOWN              = 0,
     MFX_CONTENT_FULL_SCREEN_VIDEO    = 1,
-    MFX_CONTENT_NON_VIDEO_SCREEN     = 2
+    MFX_CONTENT_NON_VIDEO_SCREEN     = 2,
+#ifdef ONEVPL_EXPERIMENTAL
+    MFX_CONTENT_NOISY_VIDEO          = 3
+#endif
 };
 
 /*! The PRefType enumerator itemizes models of reference list construction and DPB management when GopRefDist=1. */
@@ -1701,9 +1734,9 @@
 
     union {
         MFX_DEPRECATED mfxU16      ExtBrcAdaptiveLTR; /* Deprecated */
-        
+
         /*!
-            If this flag is set to ON, encoder will mark, modify, or remove LTR frames based on encoding parameters and content          
+            If this flag is set to ON, encoder will mark, modify, or remove LTR frames based on encoding parameters and content
             properties. Turn OFF to prevent Adaptive marking of Long Term Reference Frames. 
         */
         mfxU16      AdaptiveLTR;
@@ -1717,7 +1750,7 @@
     */
     mfxU16      AdaptiveCQM;
     /*!
-       If this flag is set to ON, encoder adaptively selects list of reference frames to imrove encoding quality.
+       If this flag is set to ON, encoder adaptively selects list of reference frames to improve encoding quality.
        Enabling of the flag can increase computation complexity and introduce additional delay.
        If this flag is set to OFF, regular reference frames are used for encoding.
     */
@@ -1979,7 +2012,7 @@
     */
     MFX_EXTBUFF_PRED_WEIGHT_TABLE               = MFX_MAKEFOURCC('E','P','W','T'),
     /*!
-       See the mfxExtDitrtyRect structure for details.
+       See the mfxExtDirtyRect structure for details.
     */
     MFX_EXTBUFF_DIRTY_RECTANGLES                = MFX_MAKEFOURCC('D','R','O','I'),
     /*!
@@ -2043,22 +2076,22 @@
     */
     MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO        = MFX_MAKEFOURCC('L', 'L', 'I', 'S'),
     /*!
-       This extended buffer configures HDR SEI message. See the mfxExtMasteringDisplayColourVolume structure for details. If colour volume changes
+       This extended buffer configures HDR SEI message. See the mfxExtMasteringDisplayColourVolume structure for details. If color volume changes
        per frame, the application can attach this buffer to the mfxFrameData structure for video processing.
     */
     MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME = MFX_MAKEFOURCC('D', 'C', 'V', 'S'),
     /*!
        This extended buffer configures HDR SEI message. See the mfxExtMasteringDisplayColourVolume structure for details. The application can
-       attach this buffer to the mfxVideoParam structure for the input of video processing if the mastering display colour volume changes per
+       attach this buffer to the mfxVideoParam structure for the input of video processing if the mastering display color volume changes per
        sequence. In this case, this buffer should be together with MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO to indicate the light level and mastering
-       colour volume of the input of video processing. If colour Volume changes per frame instead of per sequence, the application can attach
+       color volume of the input of video processing. If color Volume changes per frame instead of per sequence, the application can attach
        MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME to mfxFrameData for frame based processing.
     */
     MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME_IN         = MFX_MAKEFOURCC('D', 'C', 'V', 'I'),
     /*!
        This extended buffer configures HDR SEI message. See the mfxExtMasteringDisplayColourVolume structure for details. The application can
-       attach this buffer to the mfxVideoParam structure for the output of video processing if the mastering display colour volume changes per
-       sequence. If colour volume changes per frame instead of per sequence, the application can attach the buffer with MFX_EXTBUFF_MASTERING_
+       attach this buffer to the mfxVideoParam structure for the output of video processing if the mastering display color volume changes per
+       sequence. If color volume changes per frame instead of per sequence, the application can attach the buffer with MFX_EXTBUFF_MASTERING_
        DISPLAY_COLOUR_VOLUME to mfxFrameData for frame based processing.
     */
     MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME_OUT        = MFX_MAKEFOURCC('D', 'C', 'V', 'O'),
@@ -2143,13 +2176,13 @@
        See the mfxExtTemporalLayers structure for more details.
     */
     MFX_EXTBUFF_UNIVERSAL_TEMPORAL_LAYERS = MFX_MAKEFOURCC('U', 'T', 'M', 'P'),
-#ifdef ONEVPL_EXPERIMENTAL    
     /*!
        This extended buffer defines additional encoding controls for reference list. See the mfxExtRefListCtrl structure for details.
        The application can attach this buffer to the mfxVideoParam structure for encoding & decoding initialization, or
        the mfxEncodeCtrl structure for per-frame encoding configuration.
     */
     MFX_EXTBUFF_UNIVERSAL_REFLIST_CTRL = MFX_EXTBUFF_AVC_REFLIST_CTRL,
+#ifdef ONEVPL_EXPERIMENTAL    
     /*!
        See the mfxExtEncodeStats structure for details.
     */
@@ -2164,6 +2197,22 @@
        See the mfxExtAllocationHints structure for more details.
     */
     MFX_EXTBUFF_ALLOCATION_HINTS = MFX_MAKEFOURCC('A','L','C','H'),
+    
+#ifdef ONEVPL_EXPERIMENTAL    
+    /*!
+       See the mfxExtSyncSubmission structure for more details.
+    */
+    MFX_EXTBUFF_SYNCSUBMISSION = MFX_MAKEFOURCC('S','Y','N','C'),
+
+    /*!
+       See the mfxExtVPPPercEncPrefilter structure for details.
+    */
+    MFX_EXTBUFF_VPP_PERC_ENC_PREFILTER        = MFX_MAKEFOURCC('V','P','E','F'),
+    /*!
+       See the mfxExtTuneEncodeQuality structure for details.
+    */
+    MFX_EXTBUFF_TUNE_ENCODE_QUALITY           = MFX_MAKEFOURCC('T','U','N','E'),
+#endif
 };
 
 /* VPP Conf: Do not use certain algorithms  */
@@ -2214,7 +2263,7 @@
 typedef struct {
     mfxExtBuffer    Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_VPP_DENOISE2. */
     mfxDenoiseMode  Mode;   /*!< Indicates the mode of denoise. mfxDenoiseMode enumerator.  */
-    mfxU16  Strength;       /*!< Denoise strength in manaul mode. Value of 0-100 (inclusive) indicates the strength of denoise.
+    mfxU16  Strength;       /*!< Denoise strength in manual mode. Value of 0-100 (inclusive) indicates the strength of denoise.
                                  The strength of denoise controls degree of possible changes of pixel values; the bigger the strength
                                  the larger the change is.  */
     mfxU16  reserved15;
@@ -2830,49 +2879,55 @@
 MFX_PACK_END()
 
 
-/*! The InsertHDRPayload enumerator itemizes HDR payloads insertion rules. */
+/*!
+    The InsertHDRPayload enumerator itemizes HDR payloads insertion rules in the encoder,
+    and indicates if there is valid HDR SEI message in the clip in the decoder.
+*/
 enum {
-    MFX_PAYLOAD_OFF = 0, /*!< Do not insert payload. */
-    MFX_PAYLOAD_IDR = 1  /*!< Insert payload on IDR frames. */
+    MFX_PAYLOAD_OFF = 0, /*!< Do not insert payload when encoding;
+                              Clip does not have valid HDE SEI when decoding. */
+    MFX_PAYLOAD_IDR = 1  /*!< Insert payload on IDR frames when encoding;
+                              Clip has valid HDE SEI when decoding. */
 };
 
 MFX_PACK_BEGIN_USUAL_STRUCT()
 /*!
    Handle the HDR SEI message.
 
-   If the application attaches this structure to the mfxEncodeCtrl structure
-   at runtime, the encoder inserts the HDR SEI message for the current frame and ignores InsertPayloadToggle.
-
-   If the application attaches this
+   During encoding: If the application attaches this structure to the mfxEncodeCtrl structure at runtime,
+   the encoder inserts the HDR SEI message for the current frame and ignores InsertPayloadToggle. If the application attaches this
    structure to the mfxVideoParam structure during initialization or reset, the encoder inserts the HDR SEI message based on InsertPayloadToggle.
 
-   If the application attaches this structure for video processing, InsertPayloadToggle will be ignored.
+   During video processing: If the application attaches this structure for video processing, InsertPayloadToggle will be ignored.
+   And DisplayPrimariesX3, DisplayPrimariesY3 specify the color primaries where 0,1,2 specifies Red, Green, Blue respectively.
 
-   If the application attaches this structure to the mfxFrameSurface1 structure at runtime
+   During decoding: If the application attaches this structure to the mfxFrameSurface1 structure at runtime
    which will seed to the MFXVideoDECODE_DecodeFrameAsync() as surface_work parameter,
    the decoder will parse the HDR SEI message if the bitstream include HDR SEI message per frame.
-   The parsed HDR SEI will be attached to the ExtendBuffer of surface_out parameter of MFXVideoDECODE_DecodeFrameAsync().
+   The parsed HDR SEI will be attached to the ExtendBuffer of surface_out parameter of MFXVideoDECODE_DecodeFrameAsync()
+   with flag `InsertPayloadToggle` to indicate if there is valid HDR SEI message in the clip.
+   `InsertPayloadToggle` will be set to `MFX_PAYLOAD_IDR` if oneVPL gets valid HDR SEI, otherwise it will be set to `MFX_PAYLOAD_OFF`.
    This function is support for HEVC only now.
 
-   Field semantics are defined in ITU-T* H.265 Annex D.
+   Encoding or Decoding, Field semantics are defined in ITU-T* H.265 Annex D, AV1 6.7.4 Metadata OBU semantics.
+
+   Video processing, `DisplayPrimariesX3` and `WhitePointX` are in increments of 0.00002, in the range of 5, 37000. `DisplayPrimariesY3`
+   and `WhitePointY` are in increments of 0.00002, in the range of 5, 42000. `MaxDisplayMasteringLuminance` is in units of 1 candela per square meter.
+   `MinDisplayMasteringLuminance` is in units of 0.0001 candela per square meter.
 */
 typedef struct {
     mfxExtBuffer    Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME. */
     mfxU16      reserved15;
 
     mfxU16 InsertPayloadToggle;  /*!< InsertHDRPayload enumerator value. */
-    mfxU16 DisplayPrimariesX3; /*!< Color primaries for a video source in increments of 0.00002. Consist of RGB x coordinates and
-                                       define how to convert colors from RGB color space to CIE XYZ color space. Fields range is
-                                       0 to 50000. */
-    mfxU16 DisplayPrimariesY3; /*!< Color primaries for a video source in increments of 0.00002. Consists of RGB y coordinates and
-                                       defines how to convert colors from RGB color space to CIE XYZ color space. Field range is
-                                       0 to 50000. */
+    mfxU16 DisplayPrimariesX3; /*!< Color primaries for a video source. Consist of RGB x coordinates and
+                                       define how to convert colors from RGB color space to CIE XYZ color space. */
+    mfxU16 DisplayPrimariesY3; /*!< Color primaries for a video source. Consists of RGB y coordinates and
+                                       defines how to convert colors from RGB color space to CIE XYZ color space.*/
     mfxU16 WhitePointX;          /*!< White point X coordinate. */
     mfxU16 WhitePointY;          /*!< White point Y coordinate. */
-    mfxU32 MaxDisplayMasteringLuminance; /*!< Specify maximum luminance of the display on which the content was authored in units of 0.00001
-                                              candelas per square meter. Field range is 1 to 65535. */
-    mfxU32 MinDisplayMasteringLuminance; /*!< Specify minimum luminance of the display on which the content was authored in units of 0.00001
-                                              candelas per square meter. Field range is 1 to 65535. */
+    mfxU32 MaxDisplayMasteringLuminance; /*!< Specify maximum luminance of the display on which the content was authored.*/
+    mfxU32 MinDisplayMasteringLuminance; /*!< Specify minimum luminance of the display on which the content was authored. */
 } mfxExtMasteringDisplayColourVolume;
 MFX_PACK_END()
 
@@ -2880,22 +2935,22 @@
 /*!
    Handle the HDR SEI message.
 
-   If the application attaches this structure to the mfxEncodeCtrl
-   structure at runtime, the encoder inserts the HDR SEI message for the current frame and ignores InsertPayloadToggle.
-
-   If the application
-   attaches this structure to the mfxVideoParam structure during initialization or reset, the encoder inserts the HDR SEI message based on
-   InsertPayloadToggle.
+   During encoding: If the application attaches this structure to the mfxEncodeCtrl structure at runtime,
+   the encoder inserts the HDR SEI message for the current frame and ignores InsertPayloadToggle. If the application
+   attaches this structure to the mfxVideoParam structure during initialization or reset, the encoder inserts
+   the HDR SEI message based on InsertPayloadToggle.
 
-   If the application attaches this structure for video processing, InsertPayloadToggle will be ignored.
+   During video processing: If the application attaches this structure for video processing, InsertPayloadToggle will be ignored.
 
-   If the application attaches this structure to the mfxFrameSurface1 structure at runtime
+   During decoding: If the application attaches this structure to the mfxFrameSurface1 structure at runtime
    which will seed to the MFXVideoDECODE_DecodeFrameAsync() as surface_work parameter,
    the decoder will parse the HDR SEI message if the bitstream include HDR SEI message per frame.
-   The parsed HDR SEI will be attached to the ExtendBuffer of surface_out parameter of MFXVideoDECODE_DecodeFrameAsync().
+   The parsed HDR SEI will be attached to the ExtendBuffer of surface_out parameter of MFXVideoDECODE_DecodeFrameAsync()
+   with flag `InsertPayloadToggle` to indicate if there is valid HDR SEI message in the clip.
+   `InsertPayloadToggle` will be set to `MFX_PAYLOAD_IDR` if oneVPL gets valid HDR SEI, otherwise it will be set to `MFX_PAYLOAD_OFF`.
    This function is support for HEVC only now.
 
-   Field semantics are defined in ITU-T* H.265 Annex D.
+   Field semantics are defined in ITU-T* H.265 Annex D, AV1 6.7.3 Metadata high dynamic range content light level semantics.
 */
 typedef struct {
     mfxExtBuffer    Header; /*!< Extension buffer header. Header.BufferId must be equal to EXTBUFF_CONTENT_LIGHT_LEVEL_INFO. */
@@ -3446,6 +3501,8 @@
    Members of this structure define the location of chroma samples information.
 
    See Annex E of the ISO*\/IEC* 14496-10 specification for the definition of these parameters.
+
+   @note Not all implementations of the encoder support this structure. The application must use the Query API function to determine if it is supported.
 */
 typedef struct {
     mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_CHROMA_LOC_INFO. */
@@ -3466,7 +3523,7 @@
 
 MFX_PACK_BEGIN_USUAL_STRUCT()
 /*!
-   Specifies per-MB or per-CU mode and QP or deltaQP value depending on the mode type.
+   Specifies per-MB or per-CU mode and QP or DeltaQP value depending on the mode type.
  */
 typedef struct{
     union {
@@ -3499,7 +3556,12 @@
 typedef struct {
     mfxExtBuffer    Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_MBQP. */
 
+#ifdef ONEVPL_EXPERIMENTAL
+    mfxU32 reserved9;
+    mfxU32 Pitch;       /*!< Distance in bytes between the start of two consecutive rows in the QP array. */
+#else
     mfxU32 reserved10;
+#endif
     mfxU16 Mode;        /*!< Defines QP update mode. See MBQPMode enumerator for more details. */
     mfxU16 BlockSize;   /*!< QP block size, valid for HEVC only during Init and Runtime. */
     mfxU32 NumQPAlloc;  /*!< Size of allocated by application QP or DeltaQP array. */
@@ -3747,6 +3809,8 @@
 MFX_PACK_BEGIN_USUAL_STRUCT()
 /*!
    Attached to the mfxVideoParam structure during HEVC encoder initialization. Specifies the region to encode.
+
+   @note Not all implementations of the encoder support this structure. The application must use the Query API function to determine if it is supported.
 */
 typedef struct {
     mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_HEVC_REGION. */
@@ -3954,9 +4018,7 @@
 typedef mfxExtAVCRefLists mfxExtHEVCRefLists;
 typedef mfxExtAvcTemporalLayers mfxExtHEVCTemporalLayers;
 
-#ifdef ONEVPL_EXPERIMENTAL
 typedef mfxExtAVCRefListCtrl mfxExtRefListCtrl;
-#endif
 
 /* The MirroringType enumerator itemizes mirroring types. */
 enum
@@ -4453,7 +4515,7 @@
 
     mfxU16 NumTileRows;    /*!< Number of tile rows, default value is 1. */
     mfxU16 NumTileColumns; /*!< Number of tile columns, default value is 1. */
-    mfxU16 NumTileGroups;  /*!< Number of tile groups, it will be ingored if the tile groups num is invalid, default value is 1. */
+    mfxU16 NumTileGroups;  /*!< Number of tile groups, it will be ignored if the tile groups num is invalid, default value is 1. */
 
     mfxU16 reserved5;
 } mfxExtAV1TileParam;
@@ -4675,7 +4737,7 @@
 MFX_PACK_END()
 
 MFX_PACK_BEGIN_STRUCT_W_PTR()
-/*! The structure is used for VPP channels initializtion in Decode_VPP component.  */
+/*! The structure is used for VPP channels initialization in Decode_VPP component.  */
 typedef struct {
     mfxFrameInfo  VPP; /*!< The configuration parameters of VPP filters per each channel. */
     mfxU16  Protected; /*!< Specifies the content protection mechanism. */
@@ -4687,7 +4749,7 @@
 MFX_PACK_END()
 
 MFX_PACK_BEGIN_USUAL_STRUCT()
-/*! The structure describes rectangle coordinates wat can bse used for ROI or for Cropping. */
+/*! The structure describes rectangle coordinates that can be used for ROI or for Cropping. */
     typedef struct {
         mfxU16  Left;   /*!< X coordinate of region of top-left corner of rectangle. */
         mfxU16  Top;    /*!< Y coordinate of region of top-left corner of rectangle. */
@@ -4776,6 +4838,71 @@
 } mfxExtTemporalLayers;
 MFX_PACK_END()
 
+#ifdef ONEVPL_EXPERIMENTAL
+MFX_PACK_BEGIN_STRUCT_W_PTR()
+/*! The structure is used to get a synchronization object which signalizes about submission of a task to GPU.  */
+typedef struct {
+    mfxExtBuffer     Header;     /*! Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_SYNCSUBMISSION. */
+    mfxSyncPoint     *SubmissionSyncPoint; /*!< SyncPoint object to get a moment of a submission task to GPU.  */
+    mfxU32 reserved18; /*!< Reserved for future use. */
+} mfxExtSyncSubmission;
+MFX_PACK_END()
+#endif
+
+#ifdef ONEVPL_EXPERIMENTAL
+MFX_PACK_BEGIN_USUAL_STRUCT()
+/*! The structure is used to configure perceptual encoding prefilter in VPP. */
+typedef struct {
+    mfxExtBuffer Header;         /*! Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_VPP_PERC_ENC_PREFILTER. */
+    mfxU16       reserved252;
+} mfxExtVPPPercEncPrefilter;
+MFX_PACK_END()
+#endif
+
+#ifdef ONEVPL_EXPERIMENTAL
+/*! The TuneQuality enumerator specifies tuning option for encode. Multiple tuning options can be combined using bit mask. */
+enum {
+    MFX_ENCODE_TUNE_DEFAULT = 0,   /*!< The balanced option to keep quality balanced across all metrics.  */
+    MFX_ENCODE_TUNE_PSNR    = 0x1, /*!< The encoder optimizes quality according to Peak Signal-to-Noise Ratio (PSNR) metric. */
+    MFX_ENCODE_TUNE_SSIM    = 0x2, /*!< The encoder optimizes quality according to Structural Similarity Index Measure (SSIM) metric. */
+    MFX_ENCODE_TUNE_MS_SSIM = 0x4, /*!< The encoder optimizes quality according to Multi-Scale Structural Similarity Index Measure (MS-SSIM) metric. */
+    MFX_ENCODE_TUNE_VMAF    = 0x8, /*!< The encoder optimizes quality according to Video Multi-Method Assessment Fusion (VMAF) metric. */
+    MFX_ENCODE_TUNE_PERCEPTUAL    = 0x10, /*!< The encoder makes perceptual quality optimization. */
+};
+
+MFX_PACK_BEGIN_STRUCT_W_PTR()
+/*! The structure specifies type of quality optimization used by the encoder. The buffer can also be attached for VPP functions to make correspondent pre-filtering. */
+typedef struct {
+    mfxExtBuffer   Header;         /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_TUNE_ENCODE_QUALITY. */
+    mfxU32         TuneQuality;    /*!< The control to specify type of encode quality metric(s) to optimize; See correspondent enum. */
+    mfxExtBuffer** ExtParam;       /*!< Points to an array of pointers to the extra configuration structures; see the ExtendedBufferID enumerator for a list of extended configurations. */
+    mfxU16         NumExtParam;    /*!< The number of extra configuration structures attached to the structure. */
+    mfxU16         reserved11;
+} mfxExtTuneEncodeQuality;
+MFX_PACK_END()
+#endif
+
+#ifdef ONEVPL_EXPERIMENTAL
+/* The mfxAutoSelectImplType enumerator specifies the method for automatically selecting an implementation. */
+typedef enum {
+    MFX_AUTO_SELECT_IMPL_TYPE_UNKNOWN = 0,         /*!< Unspecified automatic implementation selection. */
+    MFX_AUTO_SELECT_IMPL_TYPE_DEVICE_HANDLE = 1,   /*!< Select implementation corresponding to device handle. */
+} mfxAutoSelectImplType;
+
+MFX_PACK_BEGIN_STRUCT_W_PTR()
+/*! Specifies that an implementation should be selected which matches the device handle provided by the application. */
+typedef struct {
+    mfxAutoSelectImplType AutoSelectImplType;      /*!< Must be set to MFX_AUTO_SELECT_IMPL_TYPE_DEVICE_HANDLE. */
+
+    mfxAccelerationMode   AccelMode;               /*!< Hardware acceleration mode of provided device handle. */
+    mfxHandleType         DeviceHandleType;        /*!< Type of provided device handle. */
+    mfxHDL                DeviceHandle;            /*!< System handle to hardware device. */
+
+    mfxU16                reserved8;             /*!< Reserved for future use. */
+} mfxAutoSelectImplDeviceHandle;
+MFX_PACK_END()
+#endif
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfxsurfacepool.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxsurfacepool.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfxvideo++.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxvideo++.h Changed

@@ -7,7 +7,12 @@
 #ifndef __MFXVIDEOPLUSPLUS_H
 #define __MFXVIDEOPLUSPLUS_H
 
+#ifdef MFXVIDEO_CPP_ENABLE_MFXLOAD
+#include "vpl/mfx.h"
+#define MFX_IMPL_ACCELMODE(x) (0xff00 & (x))
+#else
 #include "mfxvideo.h"
+#endif
 
 class MFXVideoSessionBase {
 public:
@@ -111,23 +116,53 @@
 class MFXVideoSession : public MFXVideoSessionBase {
 public:
     MFXVideoSession(void) {
-        m_session = (mfxSession)0;
+        m_session     = (mfxSession)0;
+#ifdef MFXVIDEO_CPP_ENABLE_MFXLOAD
+        m_loader      = (mfxLoader)0;
+#endif
     }
     virtual ~MFXVideoSession(void) {
         Close();
     }
 
     virtual mfxStatus Init(mfxIMPL impl, mfxVersion *ver) override {
+#ifdef MFXVIDEO_CPP_ENABLE_MFXLOAD
+        mfxInitParam par   = {};
+        par.Implementation = impl;
+        par.Version        = *ver;
+        return InitSession(par);
+#else
         return MFXInit(impl, ver, &m_session);
+#endif
     }
     virtual mfxStatus InitEx(mfxInitParam par) override {
+#ifdef MFXVIDEO_CPP_ENABLE_MFXLOAD
+        return InitSession(par);
+#else
         return MFXInitEx(par, &m_session);
+#endif
     }
     virtual mfxStatus Close(void) override {
+#ifdef MFXVIDEO_CPP_ENABLE_MFXLOAD
+        if (m_session) {
+            mfxStatus mfxRes;
+            mfxRes    = MFXClose(m_session);
+            m_session = (mfxSession)0;
+            if (m_loader) {
+                MFXUnload(m_loader);
+                m_loader = (mfxLoader)0;
+            }
+            return mfxRes;
+        }
+        else {
+            return MFX_ERR_NONE;
+        }
+#else
         mfxStatus mfxRes;
         mfxRes    = MFXClose(m_session);
         m_session = (mfxSession)0;
         return mfxRes;
+#endif
     }
 
     virtual mfxStatus QueryIMPL(mfxIMPL *impl) override {
@@ -189,6 +224,155 @@
 
 protected:
     mfxSession m_session; // (mfxSession) handle to the owning session
+
+#ifdef MFXVIDEO_CPP_ENABLE_MFXLOAD
+    mfxLoader m_loader;
+
+    inline void InitVariant(mfxVariant *var, mfxU32 data) {
+        var->Version.Version = (mfxU16)MFX_VARIANT_VERSION;
+        var->Type            = MFX_VARIANT_TYPE_U32;
+        var->Data.U32        = data;
+    }
+
+    inline void InitVariant(mfxVariant *var, mfxU16 data) {
+        var->Version.Version = (mfxU16)MFX_VARIANT_VERSION;
+        var->Type            = MFX_VARIANT_TYPE_U16;
+        var->Data.U16        = data;
+    }
+
+    inline void InitVariant(mfxVariant *var, mfxHDL data) {
+        var->Version.Version = (mfxU16)MFX_VARIANT_VERSION;
+        var->Type            = MFX_VARIANT_TYPE_PTR;
+        var->Data.Ptr        = data;
+    }
+
+    template <typename varDataType>
+    mfxStatus CreateConfig(varDataType data, const char *propertyName) {
+        mfxConfig cfg = MFXCreateConfig(m_loader);
+        if (cfg == nullptr)
+            return MFX_ERR_NULL_PTR;
+
+        mfxVariant variant;
+        InitVariant(&variant, data);
+
+        return MFXSetConfigFilterProperty(cfg, (mfxU8 *)propertyName, variant);
+    }
+
+    mfxStatus InitSession(mfxInitParam par) {
+        // already initialized
+        if (m_session)
+            return MFX_ERR_NONE;
+
+        m_loader = MFXLoad();
+        if (!m_loader)
+            return MFX_ERR_NOT_FOUND;
+
+        mfxStatus mfxRes = MFX_ERR_NONE;
+
+        mfxU32 implBaseType = MFX_IMPL_BASETYPE(par.Implementation);
+
+        // select implementation type
+        switch (implBaseType) {
+            case MFX_IMPL_AUTO:
+            case MFX_IMPL_AUTO_ANY:
+                break;
+
+            case MFX_IMPL_SOFTWARE:
+                mfxRes = CreateConfig<mfxU32>(MFX_IMPL_TYPE_SOFTWARE, "mfxImplDescription.Impl");
+                break;
+
+            case MFX_IMPL_HARDWARE:
+            case MFX_IMPL_HARDWARE_ANY:
+            case MFX_IMPL_HARDWARE2:
+            case MFX_IMPL_HARDWARE3:
+            case MFX_IMPL_HARDWARE4:
+                mfxRes = CreateConfig<mfxU32>(MFX_IMPL_TYPE_HARDWARE, "mfxImplDescription.Impl");
+                break;
+
+            default:
+                mfxRes = MFX_ERR_UNSUPPORTED;
+                break;
+        }
+
+        if (MFX_ERR_NONE != mfxRes)
+            return MFX_ERR_UNSUPPORTED;
+
+        // select adapter index (if specified)
+        // see notes below about how VendorImplID is interpreted for each acceleration mode
+        switch (implBaseType) {
+            case MFX_IMPL_HARDWARE:
+                mfxRes = CreateConfig<mfxU32>(0, "mfxImplDescription.VendorImplID");
+                break;
+            case MFX_IMPL_HARDWARE2:
+                mfxRes = CreateConfig<mfxU32>(1, "mfxImplDescription.VendorImplID");
+                break;
+            case MFX_IMPL_HARDWARE3:
+                mfxRes = CreateConfig<mfxU32>(2, "mfxImplDescription.VendorImplID");
+                break;
+            case MFX_IMPL_HARDWARE4:
+                mfxRes = CreateConfig<mfxU32>(3, "mfxImplDescription.VendorImplID");
+                break;
+        }
+
+        if (MFX_ERR_NONE != mfxRes)
+            return MFX_ERR_UNSUPPORTED;
+
+        mfxU32 implAccelMode = MFX_IMPL_ACCELMODE(par.Implementation);
+        if (implAccelMode == MFX_IMPL_VIA_D3D9) {
+            // D3D9 - because VendorImplID corresponds to DXGI adapter index (DX11 enumeration),
+            //   this may not map directly to D3D9 index in multi-adapter/multi-monitor configurations
+            mfxRes = CreateConfig<mfxU32>(MFX_ACCEL_MODE_VIA_D3D9,
+                                        "mfxImplDescription.AccelerationMode");
+        }
+        else if (implAccelMode == MFX_IMPL_VIA_D3D11) {
+            // D3D11 - VendorImplID corresponds to DXGI adapter index
+            mfxRes = CreateConfig<mfxU32>(MFX_ACCEL_MODE_VIA_D3D11,
+                                        "mfxImplDescription.AccelerationMode");
+        }
+        else if (implAccelMode == MFX_IMPL_VIA_VAAPI) {
+            // VAAPI - in general MFXInitEx treats any HARDWAREn the same way (relies on application to pass
+            //   correct VADisplay via SetHandle), but 2.x RT only reports actual number of adapters
+            mfxRes = CreateConfig<mfxU32>(MFX_ACCEL_MODE_VIA_VAAPI,
+                                        "mfxImplDescription.AccelerationMode");
+        }
+
+        if (MFX_ERR_NONE != mfxRes)
+            return MFX_ERR_UNSUPPORTED;
+
+        // set required API level
+        mfxRes =
+            CreateConfig<mfxU32>(par.Version.Version, "mfxImplDescription.ApiVersion.Version");
+        if (MFX_ERR_NONE != mfxRes)
+            return MFX_ERR_UNSUPPORTED;
+
+        // set GPUCopy parameter
+        if (par.GPUCopy) {
+            mfxRes = CreateConfig<mfxU16>(par.GPUCopy, "DeviceCopy");
+            if (MFX_ERR_NONE != mfxRes)
+                return MFX_ERR_UNSUPPORTED;
+        }
+
+        // ExternalThreads was deprecated in API 2.x along with MFXDoWork()
+        if (par.ExternalThreads) {
+            return MFX_ERR_UNSUPPORTED;
+        }
+
+        // pass extBufs
+        if (par.NumExtParam) {
+            for (mfxU32 idx = 0; idx < par.NumExtParam; idx++) {
+                mfxRes = CreateConfig<mfxHDL>(par.ExtParamidx, "ExtBuffer");
+                if (MFX_ERR_NONE != mfxRes)
+                    return MFX_ERR_UNSUPPORTED;
+            }
+        }
+
+        // create session with highest priority implementation remaining after filters
+        mfxRes = MFXCreateSession(m_loader, 0, &m_session);
+
+        return mfxRes;
+    }
+#endif
+
 private:
     MFXVideoSession(const MFXVideoSession &);
     void operator=(MFXVideoSession &);
@@ -353,7 +537,9 @@
 class MFXVideoDECODE_VPP
 {
 public:
-    explicit MFXVideoDECODE_VPP(mfxSession session) { m_session = session; }
+    explicit MFXVideoDECODE_VPP(mfxSession session) {
+        m_session = session;
+    }
     virtual ~MFXVideoDECODE_VPP(void) {
         Close();
     }

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/api/vpl/mfxvideo.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/api/vpl/mfxvideo.h Changed

@@ -971,7 +971,7 @@
    @return
    MFX_ERR_NONE The output frame is ready after synchronization. \n
    MFX_ERR_MORE_DATA Need more input frames before VPP can produce an output. \n
-   MFX_ERR_MEMORY_ALLOC The function failed to allocate output videoframe. \n
+   MFX_ERR_MEMORY_ALLOC The function failed to allocate output video frame. \n
 
    MFX_ERR_DEVICE_LOST  Hardware device was lost.
    \verbatim embed:rst
@@ -991,7 +991,7 @@
    but application has to provide array of pointers to mfxVideoChannelParam and num_channel_param - number of channels. Application is responsible for    
    memory allocation for mfxVideoChannelParam parameters and for each channel it should specify channel IDs:    
    mfxVideoChannelParam::mfxFrameInfo::ChannelId. ChannelId should be unique value within one session. ChannelID equals to the 0
-   is reserved for the orginal decoded frame.
+   is reserved for the original decoded frame.
    The application can attach mfxExtInCrops to mfxVideoChannelParam::ExtParam to annotate input video frame if it wants to enable 
    letterboxing operation.
    @paramin session SDK session handle.

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/dispatcher/linux/device_ids.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/dispatcher/linux/device_ids.h Changed

@@ -12,6 +12,7 @@
 //   https://github.com/Intel-Media-SDK/MediaSDK/blob/master/_studio/shared/include/mfxstructures-int.h
 
 #include <algorithm>
+#include <fstream>
 #include <string>
 #include <vector>
 
@@ -384,30 +385,47 @@
 
     int i = 0;
     for (; i < 64; ++i) {
-        int ret;
         Device device;
         std::string path = std::string(dir) + "/renderD" + std::to_string(128 + i) + vendor_id_file;
+        std::string line;
+        std::ifstream dev_str;
 
-        FILE *file = fopen(path.c_str(), "r");
-        if (!file)
+        dev_str.open(path);
+        if (!dev_str.is_open()) {
             continue;
-        ret = fscanf(file, "%x", &device.vendor_id);
-        fclose(file);
-        if (ret != 1)
+        }
+        std::getline(dev_str, line);
+        dev_str.close();
+        try {
+            device.vendor_id = std::stoul(line, 0, 16);
+        }
+        catch (std::invalid_argument &) {
             continue;
+        }
+        catch (std::out_of_range &) {
+            continue;
+        }
 
         // Filter out non-Intel devices
         if (device.vendor_id != 0x8086)
             continue;
 
         path = std::string(dir) + "/renderD" + std::to_string(128 + i) + device_id_file;
-        file = fopen(path.c_str(), "r");
-        if (!file)
+        dev_str.open(path);
+        if (!dev_str.is_open()) {
             continue;
-        ret = fscanf(file, "%x", &device.device_id);
-        fclose(file);
-        if (ret != 1)
+        }
+        std::getline(dev_str, line);
+        dev_str.close();
+        try {
+            device.device_id = std::stoul(line, 0, 16);
+        }
+        catch (std::invalid_argument &) {
             continue;
+        }
+        catch (std::out_of_range &) {
+            continue;
+        }
 
         device.platform = get_platform(device.device_id);

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/dispatcher/linux/mfxloader.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/dispatcher/linux/mfxloader.cpp Changed

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl.h -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_config.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_config.cpp Changed

@@ -107,6 +107,7 @@
     ePropExtDev_LUIDDeviceNodeMask,
     ePropExtDev_DRMRenderNodeNum,
     ePropExtDev_DRMPrimaryNodeNum,
+    ePropExtDev_RevisionID,
     ePropExtDev_DeviceName,
 
     // special properties not part of description struct
@@ -182,6 +183,7 @@
     { "ePropExtDev_LUIDDeviceNodeMask",     MFX_VARIANT_TYPE_U32 },
     { "ePropExtDev_DRMRenderNodeNum",       MFX_VARIANT_TYPE_U32 },
     { "ePropExtDev_DRMPrimaryNodeNum",      MFX_VARIANT_TYPE_U32 },
+    { "ePropExtDev_RevisionID",             MFX_VARIANT_TYPE_U16 },
     { "ePropExtDev_DeviceName",             MFX_VARIANT_TYPE_PTR },
 
     { "ePropSpecial_HandleType",            MFX_VARIANT_TYPE_U32 },
@@ -554,6 +556,9 @@
         else if (nextProp == "DRMPrimaryNodeNum") {
             return ValidateAndSetProp(ePropExtDev_DRMPrimaryNodeNum, value);
         }
+        else if (nextProp == "RevisionID") {
+            return ValidateAndSetProp(ePropExtDev_RevisionID, value);
+        }
         else if (nextProp == "DeviceName") {
             return ValidateAndSetProp(ePropExtDev_DeviceName, value);
         }
@@ -1124,6 +1129,8 @@
         }
     }
 
+    CHECK_PROP(ePropExtDev_RevisionID, U16, libImplExtDevID->RevisionID);
+
     // check string: DeviceName (string match)
     if (cfgPropsAllePropExtDev_DeviceName.Type != MFX_VARIANT_TYPE_UNSET) {
         std::string filtName = *(std::string *)(cfgPropsAllePropExtDev_DeviceName.Data.Ptr);

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp Changed

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/libmfx/dispatcher/vpl/mfx_dispatcher_vpl_msdk.cpp Changed

@@ -4,6 +4,7 @@
   # SPDX-License-Identifier: MIT
   ############################################################################*/
 
+#include <fstream>
 #include "vpl/mfx_dispatcher_vpl.h"
 
 #if defined(_WIN32) || defined(_WIN64)
@@ -12,7 +13,7 @@
 
 #ifdef __linux__
     #include <pthread.h>
-    #define strncpy_s(dst, size, src, cnt) strcpy((dst), (src)) // NOLINT
+    #define strncpy_s(dst, size, src, cnt) strncpy((dst), (src), (cnt)) // NOLINT
 #endif
 
 // leave table formatting alone
@@ -39,7 +40,7 @@
 #define NUM_POOL_POLICIES_MSDK 0
 
 static const mfxPoolPolicyDescription PoolPolicies = {
-    { 0, 1 },                   // struct Version
+    {{ 0, 1 }},                   // struct Version
     {},                         // reserved
     NUM_POOL_POLICIES_MSDK,     // NumPoolPolicies
     nullptr,
@@ -96,6 +97,20 @@
     (mfxChar**)msdkImplFuncsNames
 };
 
+// optional extBuf to limit threads created in MSDK session creation
+// to enable, set vplParam.NumExtParam and vplParam.ExtParam before calling MFXInitEx2()
+static const mfxExtThreadsParam extThreadParam = {
+    {MFX_EXTBUFF_THREADS_PARAM, sizeof(mfxExtThreadsParam)},
+    2,
+    0,
+    0,
+    {},
+};
+
+static const mfxExtBuffer* extParams1 = { 
+    (mfxExtBuffer *)&extThreadParam,
+};
+
 // end table formatting
 // clang-format on
 
@@ -128,6 +143,14 @@
     mfxInitializationParam vplParam = {};
     vplParam.AccelerationMode       = accelMode;
 
+#ifdef __linux__
+    vplParam.ExtParam    = (mfxExtBuffer **)&extParams;
+    vplParam.NumExtParam = 1;
+#else
+    vplParam.ExtParam    = nullptr;
+    vplParam.NumExtParam = 0;
+#endif
+
     return MFXInitEx2(reqVersion,
                       vplParam,
                       hwImpl,
@@ -213,6 +236,14 @@
         vplParam.AccelerationMode =
             (mfxAccelerationMode)CvtAccelType(MFX_IMPL_HARDWARE, implDefault & 0xFF00);
 
+#ifdef __linux__
+        vplParam.ExtParam    = (mfxExtBuffer **)&extParams;
+        vplParam.NumExtParam = 1;
+#else
+        vplParam.ExtParam    = nullptr;
+        vplParam.NumExtParam = 0;
+#endif
+
         mfxU16 deviceID;
         sts = MFXInitEx2(reqVersion,
                          vplParam,
@@ -335,8 +366,11 @@
 
     // fill in strings
     strncpy_s(m_id.ImplName, sizeof(m_id.ImplName), strImplName, sizeof(strImplName));
+    m_id.ImplNamesizeof(m_id.ImplName) - 1 = 0;
     strncpy_s(m_id.License, sizeof(m_id.License), strLicense, sizeof(strLicense));
+    m_id.Licensesizeof(m_id.License) - 1 = 0;
     strncpy_s(m_id.Keywords, sizeof(m_id.Keywords), strKeywords, sizeof(strKeywords));
+    m_id.Keywordssizeof(m_id.Keywords) - 1 = 0;
 
     m_id.VendorID    = 0x8086;
     m_id.NumExtParam = 0;
@@ -422,6 +456,10 @@
         mfxInitializationParam vplParam = {};
         vplParam.AccelerationMode       = MFX_ACCEL_MODE_VIA_D3D9;
 
+        // thread limit not enabled on Windows
+        vplParam.ExtParam    = nullptr;
+        vplParam.NumExtParam = 0;
+
         mfxU16 deviceID;
         sts = MFXInitEx2(reqVersion,
                          vplParam,
@@ -446,6 +484,27 @@
 #endif
 }
 
+mfxU32 read_device_file(std::string &path) {
+    mfxU32 result = 0;
+    std::string line;
+    std::ifstream dev_str(path);
+    if (!dev_str.is_open()) {
+        return 0;
+    }
+    std::getline(dev_str, line);
+    dev_str.close();
+    try {
+        result = std::stoul(line, 0, 16);
+    }
+    catch (std::invalid_argument &) {
+        return 0;
+    }
+    catch (std::out_of_range &) {
+        return 0;
+    }
+    return result;
+}
+
 mfxStatus LoaderCtxMSDK::GetRenderNodeDescription(mfxU32 adapterID,
                                                   mfxU32 &vendorID,
                                                   mfxU16 &deviceID) {
@@ -459,28 +518,12 @@
     std::string vendorPath = "/sys/class/drm/renderD" + nodeStr + "/device/vendor";
     std::string devPath    = "/sys/class/drm/renderD" + nodeStr + "/device/device";
 
-    // check if vendor == 0x8086
-    FILE *vendorFile = fopen(vendorPath.c_str(), "r");
-    if (vendorFile) {
-        unsigned int u32 = 0;
-        int nRead        = fscanf(vendorFile, "%x", &u32);
-        if (nRead == 1)
-            vendorID = (mfxU32)u32;
-        fclose(vendorFile);
-    }
+    vendorID = read_device_file(vendorPath);
 
     if (vendorID != 0x8086)
         return MFX_ERR_UNSUPPORTED;
 
-    // get deviceID for this node
-    FILE *devFile = fopen(devPath.c_str(), "r");
-    if (devFile) {
-        unsigned int u32 = 0;
-        int nRead        = fscanf(devFile, "%x", &u32);
-        if (nRead == 1)
-            deviceID = (mfxU32)u32;
-        fclose(devFile);
-    }
+    deviceID = read_device_file(devPath);
 
     if (deviceID == 0)
         return MFX_ERR_UNSUPPORTED;
@@ -525,6 +568,9 @@
     extDeviceID->DRMRenderNodeNum  = 0;
     extDeviceID->DRMPrimaryNodeNum = 0x7FFFFFFF;
 
+    // default - no PCI RevisionID
+    extDeviceID->RevisionID        = 0xFFFF;
+
     snprintf(extDeviceID->DeviceName, sizeof(extDeviceID->DeviceName), "%s", strImplName);
 
 #if defined(_WIN32) || defined(_WIN64)

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/sys/qsv/plugin.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/qsv/plugin.cpp Changed

@@ -61,6 +61,8 @@
 #include <gst/va/gstva.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 GST_DEBUG_CATEGORY (gst_qsv_debug);
 GST_DEBUG_CATEGORY (gst_qsv_allocator_debug);
 
@@ -214,8 +216,11 @@
 #ifdef G_OS_WIN32
   /* D3D11 Video API is supported since Windows 8.
    * Do we want to support old OS (Windows 7 for example) with D3D9 ?? */
-  if (!IsWindows8OrGreater ())
+  if (!IsWindows8OrGreater ()) {
+    gst_plugin_add_status_warning (plugin,
+        N_("This plugin requires at least Windows 8 or newer."));
     return TRUE;
+  }
 
   enc_rank = GST_RANK_PRIMARY;
 #endif
@@ -225,11 +230,15 @@
       "qsvallocator", 0, "qsvallocator");
 
   loader = gst_qsv_get_loader ();
-  if (!loader)
+  if (!loader) {
+    // FIXME: any status/error/warning message we should show here?
     return TRUE;
+  }
 
   platform_devices = gst_qsv_get_platform_devices ();
   if (!platform_devices) {
+    gst_plugin_add_status_warning (plugin,
+        N_("No Intel graphics cards detected!"));
     gst_qsv_deinit ();
     return TRUE;
   }

gst-plugins-bad-1.22.7.tar.xz/sys/shm/gstshmsink.c -> gst-plugins-bad-1.24.5.tar.xz/sys/shm/gstshmsink.c Changed

@@ -175,7 +175,7 @@
   }
   gst_object_unref (mem->allocator);
 
-  g_slice_free (GstShmSinkMemory, mymem);
+  g_free (mymem);
 }
 
 static gpointer
@@ -206,7 +206,7 @@
   if (size == -1)
     size = mem->size - offset;
 
-  mysub = g_slice_new0 (GstShmSinkMemory);
+  mysub = g_new0 (GstShmSinkMemory, 1);
   /* the shared memory is always readonly */
   gst_memory_init (GST_MEMORY_CAST (mysub), GST_MINI_OBJECT_FLAGS (parent) |
       GST_MINI_OBJECT_FLAG_LOCK_READONLY, gst_object_ref (mem->allocator),
@@ -271,7 +271,7 @@
         "Allocated block %p with %" G_GSIZE_FORMAT " bytes at %p", block, size,
         sp_writer_block_get_buf (block));
 
-    mymem = g_slice_new0 (GstShmSinkMemory);
+    mymem = g_new0 (GstShmSinkMemory, 1);
     memory = GST_MEMORY_CAST (mymem);
     mymem->data = sp_writer_block_get_buf (block);
     mymem->sink = gst_object_ref (self->sink);
@@ -630,7 +630,7 @@
         (sp_buffer_free_callback) gst_buffer_unref, NULL);
     g_signal_emit (self, signalsSIGNAL_CLIENT_DISCONNECTED, 0,
         client->pollfd.fd);
-    g_slice_free (struct GstShmClient, client);
+    g_free (client);
   }
 
   gst_poll_free (self->poll);
@@ -877,7 +877,7 @@
         return NULL;
       }
 
-      gclient = g_slice_new (struct GstShmClient);
+      gclient = g_new (struct GstShmClient, 1);
       gclient->client = client;
       gst_poll_fd_init (&gclient->pollfd);
       gclient->pollfd.fd = sp_writer_get_client_fd (client);
@@ -943,7 +943,7 @@
 
       g_signal_emit (self, signalsSIGNAL_CLIENT_DISCONNECTED, 0,
           gclient->pollfd.fd);
-      g_slice_free (struct GstShmClient, gclient);
+      g_free (gclient);
 
       goto again;
     }

gst-plugins-bad-1.22.7.tar.xz/sys/shm/gstshmsrc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/shm/gstshmsrc.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/shm/shmalloc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/shm/shmalloc.h Changed

gst-plugins-bad-1.24.5.tar.xz/sys/uvcgadget Added

gst-plugins-bad-1.24.5.tar.xz/sys/uvcgadget/configfs.c Added

@@ -0,0 +1,1002 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * ConfigFS Gadget device handling
+ *
+ * Copyright (C) 2018 Kieran Bingham
+ *
+ * Contact: Kieran Bingham <kieran.bingham@ideasonboard.com>
+ */
+
+/* To provide asprintf from the GNU library. */
+#define _GNU_SOURCE
+
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <glob.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "linux/videodev2.h"
+
+#include "configfs.h"
+
+/* ------------------------------------------------------------------------
+ * GUIDs and formats
+ */
+
+#define UVC_GUID_FORMAT_MJPEG \
+	{ 'M',  'J',  'P',  'G', 0x00, 0x00, 0x10, 0x00, \
+	 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
+#define UVC_GUID_FORMAT_YUY2 \
+	{ 'Y',  'U',  'Y',  '2', 0x00, 0x00, 0x10, 0x00, \
+	 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
+
+struct uvc_function_format_info
+{
+  uint8_t guid16;
+  uint32_t fcc;
+};
+
+static struct uvc_function_format_info uvc_formats = {
+  {
+        .guid = UVC_GUID_FORMAT_YUY2,
+        .fcc = V4L2_PIX_FMT_YUYV,
+      },
+  {
+        .guid = UVC_GUID_FORMAT_MJPEG,
+        .fcc = V4L2_PIX_FMT_MJPEG,
+      },
+};
+
+/* -----------------------------------------------------------------------------
+ * Path handling and support
+ */
+
+static char *
+path_join (const char *dirname, const char *name)
+{
+  char *path;
+  int ret;
+
+  ret = asprintf (&path, "%s/%s", dirname, name);
+
+  /*
+   * asprintf returns -1 on allocation or other errors, leaving 'path'
+   * undefined. We shouldn't even call free(path) here. We want to return
+   * NULL on error, so we must manually set it.
+   */
+  if (ret < 0)
+    path = NULL;
+
+  return path;
+}
+
+static char *
+path_glob_first_match (const char *g)
+{
+  glob_t globbuf;
+  char *match = NULL;
+
+  glob (g, 0, NULL, &globbuf);
+
+  if (globbuf.gl_pathc)
+    match = strdup (globbuf.gl_pathv0);
+
+  globfree (&globbuf);
+
+  return match;
+}
+
+/*
+ * Find and return the full path of the first directory entry that satisfies
+ * the match function.
+ */
+static char *
+dir_first_match (const char *dir, int (*match) (const struct dirent *))
+{
+  struct dirent **entries;
+  unsigned int i;
+  int n_entries;
+  char *path;
+
+  n_entries = scandir (dir, &entries, match, alphasort);
+  if (n_entries < 0)
+    return NULL;
+
+  if (n_entries == 0) {
+    free (entries);
+    return NULL;
+  }
+
+  path = path_join (dir, entries0->d_name);
+
+  for (i = 0; i < (unsigned int) n_entries; ++i)
+    free (entriesi);
+
+  free (entries);
+
+  return path;
+}
+
+/* -----------------------------------------------------------------------------
+ * Attribute handling
+ */
+
+static int
+attribute_read (const char *path, const char *file, void *buf, unsigned int len)
+{
+  char *f;
+  int ret;
+  int fd;
+
+  f = path_join (path, file);
+  if (!f)
+    return -ENOMEM;
+
+  fd = open (f, O_RDONLY);
+  free (f);
+  if (fd == -1) {
+    printf ("Failed to open attribute %s: %s\n", file, strerror (errno));
+    return -ENOENT;
+  }
+
+  ret = read (fd, buf, len);
+  close (fd);
+
+  if (ret < 0) {
+    printf ("Failed to read attribute %s: %s\n", file, strerror (errno));
+    return -ENODATA;
+  }
+
+  return len;
+}
+
+static int
+attribute_read_uint (const char *path, const char *file, unsigned int *val)
+{
+  /* 4,294,967,295 */
+  char buf11;
+  char *endptr;
+  int ret;
+
+  ret = attribute_read (path, file, buf, sizeof (buf) - 1);
+  if (ret < 0)
+    return ret;
+
+  bufret = '\0';
+
+  errno = 0;
+
+  /* base 0: Autodetect hex, octal, decimal. */
+  *val = strtoul (buf, &endptr, 0);
+  if (errno)
+    return -errno;
+
+  if (endptr == buf)
+    return -ENODATA;
+
+  return 0;
+}
+
+static char *
+attribute_read_str (const char *path, const char *file)
+{
+  char buf1024;
+  char *p;
+  int ret;
+
+  ret = attribute_read (path, file, buf, sizeof (buf) - 1);
+  if (ret < 0)
+    return NULL;
+
+  bufret = '\0';
+
+  p = strrchr (buf, '\n');
+  if (p != buf)
+    *p = '\0';
+
+  return strdup (buf);
+}
+
+/* -----------------------------------------------------------------------------
+ * UDC parsing
+ */
+
+/*
+ * udc_find_video_device - Find the video device node for a UVC function
+ * @udc: The UDC name
+ * @function: The UVC function name
+ *
+ * This function finds the video device node corresponding to a UVC function as
+ * specified by a @function name and @udc name.
+ *
+ * The @function parameter specifies the name of the USB function, usually in
+ * the form "uvc.%u". If NULL the first function found will be used.
+ *
+ * The @udc parameter specifies the name of the UDC. If NULL any UDC that
+ * contains a function matching the @function name will be used.
+ *
+ * Return a pointer to a newly allocated string containing the video device node
+ * full path if the function is found. Otherwise return NULL. The returned
+ * pointer must be freed by the caller with a call to free().
+ */
+static char *
+udc_find_video_device (const char *udc, const char *function)
+{
+  char *vpath;
+  char *video = NULL;
+  glob_t globbuf;
+  unsigned int i;
+  int ret;
+
+  ret = asprintf (&vpath,
+      "/sys/class/udc/%s/device/gadget*/video4linux/video*", udc ? udc : "*");
+  if (!ret)
+    return NULL;
+
+  glob (vpath, 0, NULL, &globbuf);
+  free (vpath);
+
+  for (i = 0; i < globbuf.gl_pathc; ++i) {
+    char *config;
+    bool match;
+
+    /* Match on the first if no search string. */
+    if (!function)
+      break;
+
+    config = attribute_read_str (globbuf.gl_pathvi, "function_name");
+    match = strcmp (function, config) == 0;
+
+    free (config);
+
+    if (match)
+      break;
+  }
+
+  if (i < globbuf.gl_pathc) {
+    gchar *v = g_path_get_basename (globbuf.gl_pathvi);
+
+    video = path_join ("/dev", v);
+    g_free (v);
+  }
+
+  globfree (&globbuf);
+
+  return video;
+}
+
+/* -----------------------------------------------------------------------------
+ * Legacy g_webcam support
+ */
+
+static const struct uvc_function_config g_webcam_config = {
+  .control = {
+        .intf = {
+              .bInterfaceNumber = 0,
+            },
+      },
+  .streaming = {
+        .intf = {
+              .bInterfaceNumber = 1,
+            },
+        .ep = {
+              .bInterval = 1,
+              .bMaxBurst = 0,
+              .wMaxPacketSize = 1024,
+            },
+        .num_formats = 2,
+        .formats = (struct uvc_function_config_format) {
+              {
+                    .index = 1,
+                    .guid = UVC_GUID_FORMAT_YUY2,
+                    .fcc = V4L2_PIX_FMT_YUYV,
+                    .num_frames = 2,
+                    .frames = (struct uvc_function_config_frame) {
+                          {
+                                .index = 1,
+                                .width = 640,
+                                .height = 360,
+                                .num_intervals = 3,
+                                .intervals = (unsigned int) {
+                                      666666,
+                                      10000000,
+                                      50000000,
+                                    },
+                              }, {
+                                .index = 2,
+                                .width = 1280,
+                                .height = 720,
+                                .num_intervals = 1,
+                                .intervals = (unsigned int) {
+                                      50000000,
+                                    },
+                              },
+                        },
+                  }, {
+                    .index = 2,
+                    .guid = UVC_GUID_FORMAT_MJPEG,
+                    .fcc = V4L2_PIX_FMT_MJPEG,
+                    .num_frames = 2,
+                    .frames = (struct uvc_function_config_frame) {
+                          {
+                                .index = 1,
+                                .width = 640,
+                                .height = 360,
+                                .num_intervals = 3,
+                                .intervals = (unsigned int) {
+                                      666666,
+                                      10000000,
+                                      50000000,
+                                    },
+                              }, {
+                                .index = 2,
+                                .width = 1280,
+                                .height = 720,
+                                .num_intervals = 1,
+                                .intervals = (unsigned int) {
+                                      50000000,
+                                    },
+                              },
+                        },
+                  },
+            },
+      },
+};
+
+static void *
+memdup (const void *src, size_t size)
+{
+  void *dst;
+
+  dst = malloc (size);
+  if (!dst)
+    return NULL;
+  memcpy (dst, src, size);
+  return dst;
+}
+
+static int
+parse_legacy_g_webcam (const char *udc, struct uvc_function_config *fc)
+{
+  unsigned int i, j;
+  size_t size;
+
+  *fc = g_webcam_config;
+
+  /*
+   * We need to duplicate all sub-structures as the
+   * configfs_free_uvc_function() function expects them to be dynamically
+   * allocated.
+   */
+  size = sizeof *fc->streaming.formats * fc->streaming.num_formats;
+  fc->streaming.formats = memdup (fc->streaming.formats, size);
+
+  for (i = 0; i < fc->streaming.num_formats; ++i) {
+    struct uvc_function_config_format *format = &fc->streaming.formatsi;
+
+    size = sizeof *format->frames * format->num_frames;
+    format->frames = memdup (format->frames, size);
+
+    for (j = 0; j < format->num_frames; ++j) {
+      struct uvc_function_config_frame *frame = &format->framesj;
+
+      size = sizeof *frame->intervals * frame->num_intervals;
+      frame->intervals = memdup (frame->intervals, size);
+    }
+  }
+
+  fc->video = udc_find_video_device (udc, NULL);
+
+  return fc->video ? 0 : -ENODEV;
+}
+
+/* -----------------------------------------------------------------------------
+ * ConfigFS support
+ */
+
+/*
+ * configfs_mount_point - Identify the ConfigFS mount location
+ *
+ * Return a pointer to a newly allocated string containing the fully qualified
+ * path to the ConfigFS mount point if located. Returns NULL if the ConfigFS
+ * mount point can not be identified.
+ */
+static char *
+configfs_mount_point (void)
+{
+  FILE *mounts;
+  char *line = NULL;
+  char *path = NULL;
+  size_t len = 0;
+
+  mounts = fopen ("/proc/mounts", "r");
+  if (mounts == NULL)
+    return NULL;
+
+  while (getline (&line, &len, mounts) != -1) {
+    if (strstr (line, "configfs")) {
+      char *saveptr;
+      char *token;
+
+      /* Obtain the second token. */
+      token = strtok_r (line, " ", &saveptr);
+      token = strtok_r (NULL, " ", &saveptr);
+
+      if (token)
+        path = strdup (token);
+
+      break;
+    }
+  }
+
+  free (line);
+  fclose (mounts);
+
+  return path;
+}
+
+/*
+ * configfs_find_uvc_function - Find the ConfigFS full path for a UVC function
+ * @function: The UVC function name
+ *
+ * Return a pointer to a newly allocated string containing the full ConfigFS
+ * path to the function if the function is found. Otherwise return NULL. The
+ * returned pointer must be freed by the caller with a call to free().
+ */
+static char *
+configfs_find_uvc_function (const char *function)
+{
+  const char *target = function ? function : "*";
+  const char *format;
+  char *configfs;
+  char *func_path;
+  char *path;
+  int ret;
+
+  configfs = configfs_mount_point ();
+  if (!configfs)
+    printf ("Failed to locate configfs mount point, using default\n");
+
+  /*
+   * The function description can be provided as a path from the
+   * usb_gadget root "g1/functions/uvc.0", or if there is no ambiguity
+   * over the gadget name, a shortcut "uvc.0" can be provided.
+   */
+  if (!strchr (target, '/'))
+    format = "%s/usb_gadget/*/functions/%s";
+  else
+    format = "%s/usb_gadget/%s";
+
+  ret = asprintf (&path, format, configfs ? configfs : "/sys/kernel/config",
+      target);
+  free (configfs);
+  if (!ret)
+    return NULL;
+
+  func_path = path_glob_first_match (path);
+  free (path);
+
+  return func_path;
+}
+
+/*
+ * configfs_free_uvc_function - Free a uvc_function_config object
+ * @fc: The uvc_function_config to be freed
+ *
+ * Free the given @fc function previously allocated by a call to
+ * configfs_parse_uvc_function().
+ */
+void
+configfs_free_uvc_function (struct uvc_function_config *fc)
+{
+  unsigned int i, j;
+
+  free (fc->udc);
+  free (fc->video);
+
+  for (i = 0; i < fc->streaming.num_formats; ++i) {
+    struct uvc_function_config_format *format = &fc->streaming.formatsi;
+
+    for (j = 0; j < format->num_frames; ++j) {
+      struct uvc_function_config_frame *frame = &format->framesj;
+
+      free (frame->intervals);
+    }
+
+    free (format->frames);
+  }
+
+  free (fc->streaming.formats);
+  free (fc);
+}
+
+#define configfs_parse_child(parent, child, cfg, parse)			\
+({									\
+	char *__path;							\
+	int __ret;							\
+									\
+	__path = path_join((parent), (child));				\
+	if (__path) {							\
+		__ret = parse(__path, (cfg));				\
+		free(__path);						\
+	} else {							\
+		__ret = -ENOMEM;					\
+	}								\
+									\
+	__ret;								\
+})
+
+static int
+configfs_parse_interface (const char *path,
+    struct uvc_function_config_interface *cfg)
+{
+  int ret;
+
+  ret = attribute_read_uint (path, "bInterfaceNumber", &cfg->bInterfaceNumber);
+
+  return ret;
+}
+
+static int
+configfs_parse_control (const char *path,
+    struct uvc_function_config_control *cfg)
+{
+  int ret;
+
+  ret = configfs_parse_interface (path, &cfg->intf);
+
+  return ret;
+}
+
+static int
+configfs_parse_streaming_frame (const char *path,
+    struct uvc_function_config_frame *frame)
+{
+  char *intervals;
+  char *p;
+  int ret = 0;
+
+  ret = ret ? : attribute_read_uint (path, "bFrameIndex", &frame->index);
+  ret = ret ? : attribute_read_uint (path, "wWidth", &frame->width);
+  ret = ret ? : attribute_read_uint (path, "wHeight", &frame->height);
+  ret = ret ? : attribute_read_uint (path, "dwMaxVideoFrameBufferSize",
+      &frame->maxvideofbsize);
+  if (ret)
+    return ret;
+
+  intervals = attribute_read_str (path, "dwFrameInterval");
+  if (!intervals)
+    return -EINVAL;
+
+  for (p = intervals; *p;) {
+    unsigned int interval;
+    unsigned int *mem;
+    char *endp;
+    size_t size;
+
+    interval = strtoul (p, &endp, 10);
+    if (*endp != '\0' && *endp != '\n') {
+      ret = -EINVAL;
+      break;
+    }
+
+    p = *endp ? endp + 1 : endp;
+
+    size = sizeof *frame->intervals * (frame->num_intervals + 1);
+    mem = realloc (frame->intervals, size);
+    if (!mem) {
+      ret = -ENOMEM;
+      break;
+    }
+
+    frame->intervals = mem;
+    frame->intervalsframe->num_intervals++ = interval;
+  }
+
+  free (intervals);
+
+  return ret;
+}
+
+static int
+frame_filter (const struct dirent *ent)
+{
+  /* Accept all directories but "." and "..". */
+  if (ent->d_type != DT_DIR)
+    return 0;
+  if (!strcmp (ent->d_name, "."))
+    return 0;
+  if (!strcmp (ent->d_name, ".."))
+    return 0;
+  return 1;
+}
+
+static int
+frame_compare (const void *a, const void *b)
+{
+  const struct uvc_function_config_frame *fa = a;
+  const struct uvc_function_config_frame *fb = b;
+
+  if (fa->index < fb->index)
+    return -1;
+  else if (fa->index == fb->index)
+    return 0;
+  else
+    return 1;
+}
+
+static int
+configfs_parse_streaming_format (const char *path,
+    struct uvc_function_config_format *format)
+{
+  struct dirent **entries;
+  char link_target1024;
+  char *segment;
+  unsigned int i;
+  int n_entries;
+  int ret;
+
+  ret = attribute_read_uint (path, "bFormatIndex", &format->index);
+  if (ret < 0)
+    return ret;
+
+  ret = readlink (path, link_target, sizeof (link_target) - 1);
+  if (ret < 0)
+    return ret;
+
+  link_targetret = '\0';
+
+  /*
+   * Extract the second-to-last path component of the link target,
+   * which contains the format descriptor type name as exposed by
+   * the UVC function driver.
+   */
+  segment = strrchr (link_target, '/');
+  if (!segment)
+    return -EINVAL;
+  *segment = '\0';
+  segment = strrchr (link_target, '/');
+  if (!segment)
+    return -EINVAL;
+  segment++;
+
+  if (!strcmp (segment, "mjpeg")) {
+    static const uint8_t guid16 = UVC_GUID_FORMAT_MJPEG;
+    memcpy (format->guid, guid, 16);
+  } else if (!strcmp (segment, "uncompressed")) {
+    ret = attribute_read (path, "guidFormat", format->guid,
+        sizeof (format->guid));
+    if (ret < 0)
+      return ret;
+  } else {
+    return -EINVAL;
+  }
+
+  for (i = 0; i < G_N_ELEMENTS (uvc_formats); ++i) {
+    if (!memcmp (uvc_formatsi.guid, format->guid, 16)) {
+      format->fcc = uvc_formatsi.fcc;
+      break;
+    }
+  }
+
+  /* Find all entries corresponding to a frame and parse them. */
+  n_entries = scandir (path, &entries, frame_filter, alphasort);
+  if (n_entries < 0)
+    return -errno;
+
+  if (n_entries == 0) {
+    free (entries);
+    return -EINVAL;
+  }
+
+  format->num_frames = n_entries;
+  format->frames = calloc (sizeof *format->frames, format->num_frames);
+  if (!format->frames)
+    return -ENOMEM;
+
+  for (i = 0; i < (unsigned int) n_entries; ++i) {
+    char *frame;
+
+    frame = path_join (path, entriesi->d_name);
+    if (!frame) {
+      ret = -ENOMEM;
+      goto done;
+    }
+
+    ret = configfs_parse_streaming_frame (frame, &format->framesi);
+    free (frame);
+    if (ret < 0)
+      goto done;
+  }
+
+  /* Sort the frames by index. */
+  qsort (format->frames, format->num_frames, sizeof *format->frames,
+      frame_compare);
+
+done:
+  for (i = 0; i < (unsigned int) n_entries; ++i)
+    free (entriesi);
+  free (entries);
+
+  return ret;
+}
+
+static int
+format_filter (const struct dirent *ent)
+{
+  char *path;
+  bool valid;
+
+  /*
+   * Accept all links that point to a directory containing a
+   * "bFormatIndex" file.
+   */
+  if (ent->d_type != DT_LNK)
+    return 0;
+
+  path = path_join (ent->d_name, "bFormatIndex");
+  if (!path)
+    return 0;
+
+  valid = access (path, R_OK);
+  free (path);
+  return valid;
+}
+
+static int
+format_compare (const void *a, const void *b)
+{
+  const struct uvc_function_config_format *fa = a;
+  const struct uvc_function_config_format *fb = b;
+
+  if (fa->index < fb->index)
+    return -1;
+  else if (fa->index == fb->index)
+    return 0;
+  else
+    return 1;
+}
+
+static int
+configfs_parse_streaming_header (const char *path,
+    struct uvc_function_config_streaming *cfg)
+{
+  struct dirent **entries;
+  unsigned int i;
+  int n_entries;
+  int ret;
+
+  /* Find all entries corresponding to a format and parse them. */
+  n_entries = scandir (path, &entries, format_filter, alphasort);
+  if (n_entries < 0)
+    return -errno;
+
+  if (n_entries == 0) {
+    free (entries);
+    return -EINVAL;
+  }
+
+  cfg->num_formats = n_entries;
+  cfg->formats = calloc (sizeof *cfg->formats, cfg->num_formats);
+  if (!cfg->formats)
+    return -ENOMEM;
+
+  for (i = 0; i < (unsigned int) n_entries; ++i) {
+    char *format;
+
+    format = path_join (path, entriesi->d_name);
+    if (!format) {
+      ret = -ENOMEM;
+      goto done;
+    }
+
+    ret = configfs_parse_streaming_format (format, &cfg->formatsi);
+    free (format);
+    if (ret < 0)
+      goto done;
+  }
+
+  /* Sort the formats by index. */
+  qsort (cfg->formats, cfg->num_formats, sizeof *cfg->formats, format_compare);
+
+done:
+  for (i = 0; i < (unsigned int) n_entries; ++i)
+    free (entriesi);
+  free (entries);
+
+  return ret;
+}
+
+static int
+link_filter (const struct dirent *ent)
+{
+  /* Accept all links. */
+  return ent->d_type == DT_LNK;
+}
+
+static int
+configfs_parse_streaming (const char *path,
+    struct uvc_function_config_streaming *cfg)
+{
+  char *header;
+  char *class;
+  int ret;
+
+  ret = configfs_parse_interface (path, &cfg->intf);
+  if (ret < 0)
+    return ret;
+
+  /*
+   * Handle the high-speed class descriptors only for now. Find the first
+   * link to the class descriptors.
+   */
+  class = path_join (path, "class/hs");
+  if (!class)
+    return -ENOMEM;
+
+  header = dir_first_match (class, link_filter);
+  free (class);
+  if (!header)
+    return -EINVAL;
+
+  ret = configfs_parse_streaming_header (header, cfg);
+  free (header);
+  return ret;
+}
+
+static int
+configfs_parse_uvc (const char *fpath, struct uvc_function_config *fc)
+{
+  int ret = 0;
+
+  ret = ret ? : configfs_parse_child (fpath, "control", &fc->control,
+      configfs_parse_control);
+  ret = ret ? : configfs_parse_child (fpath, "streaming", &fc->streaming,
+      configfs_parse_streaming);
+
+  /*
+   * These parameters should be part of the streaming interface in
+   * ConfigFS, but for legacy reasons they are located directly in the
+   * function directory.
+   */
+  ret = ret ? : attribute_read_uint (fpath, "streaming_interval",
+      &fc->streaming.ep.bInterval);
+  ret = ret ? : attribute_read_uint (fpath, "streaming_maxburst",
+      &fc->streaming.ep.bMaxBurst);
+  ret = ret ? : attribute_read_uint (fpath, "streaming_maxpacket",
+      &fc->streaming.ep.wMaxPacketSize);
+
+  return ret;
+}
+
+/*
+ * configfs_parse_uvc_function - Parse a UVC function configuration in ConfigFS
+ * @function: The function name
+ *
+ * This function locates and parse the configuration of a UVC function in
+ * ConfigFS as specified by the @function name argument. The function name can
+ * be fully qualified with a gadget name (e.g. "g%u/functions/uvc.%u"), or as a
+ * shortcut can be an unqualified function name (e.g. "uvc.%u"). When the
+ * function name is unqualified, the first function matching the name in any
+ * UDC will be returned.
+ *
+ * Return a pointer to a newly allocated UVC function configuration structure
+ * that contains configuration parameters for the function, if the function is
+ * found. Otherwise return NULL. The returned pointer must be freed by the
+ * caller with a call to free().
+ */
+struct uvc_function_config *
+configfs_parse_uvc_function (const char *function)
+{
+  struct uvc_function_config *fc;
+  char *fpath;
+  gchar *bname;
+  int ret = 0;
+
+  fc = malloc (sizeof *fc);
+  if (fc == NULL)
+    return NULL;
+
+  memset (fc, 0, sizeof *fc);
+
+  /* Find the function in ConfigFS. */
+  fpath = configfs_find_uvc_function (function);
+  if (!fpath) {
+    /*
+     * If the function can't be found attempt legacy parsing to
+     * support the g_webcam gadget. The function parameter contains
+     * a UDC name in that case.
+     */
+    ret = parse_legacy_g_webcam (function, fc);
+    if (ret) {
+      configfs_free_uvc_function (fc);
+      fc = NULL;
+    }
+
+    return fc;
+  }
+
+  /*
+   * Parse the function configuration. Remove the gadget name qualifier
+   * from the function name, if any.
+   */
+  bname = g_path_get_basename (function);
+
+  fc->udc = attribute_read_str (fpath, "../../UDC");
+  fc->video = udc_find_video_device (fc->udc, bname);
+  if (!fc->video) {
+    ret = -ENODEV;
+    goto done;
+  }
+
+  ret = configfs_parse_uvc (fpath, fc);
+
+done:
+  if (ret) {
+    configfs_free_uvc_function (fc);
+    fc = NULL;
+  }
+
+  free (fpath);
+  g_free (bname);
+
+  return fc;
+}
+
+static char *
+video_find_config_name (const char *video)
+{
+  char *vpath;
+  glob_t globbuf;
+  char *config;
+  int ret;
+
+  ret = asprintf (&vpath,
+      "/sys/class/udc/*/device/gadget*/video4linux/%s", video ? video : "*");
+  if (!ret)
+    return NULL;
+
+  glob (vpath, 0, NULL, &globbuf);
+  free (vpath);
+
+  if (globbuf.gl_pathc != 1)
+    return NULL;
+
+  config = attribute_read_str (globbuf.gl_pathv0, "function_name");
+
+  globfree (&globbuf);
+
+  return config;
+}
+
+struct uvc_function_config *
+configfs_parse_uvc_videodev (int fd, const char *video)
+{
+  struct uvc_function_config *fc;
+  char *function = NULL;
+  char rpathPATH_MAX;
+  char *res;
+  gchar *bname;
+
+  res = realpath (video, rpath);
+  if (!res)
+    return NULL;
+
+  bname = g_path_get_basename (rpath);
+  function = video_find_config_name (bname);
+  g_free (bname);
+
+  if (!function)
+    return NULL;
+
+  fc = configfs_parse_uvc_function (function);
+
+  free (function);
+
+  return fc;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/uvcgadget/configfs.h Added

@@ -0,0 +1,119 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * ConfigFS Gadget device handling
+ *
+ * Copyright (C) 2018 Kieran Bingham
+ *
+ * Contact: Kieran Bingham <kieran.bingham@ideasonboard.com>
+ */
+
+#ifndef __CONFIGFS_H__
+#define __CONFIGFS_H__
+
+#include <stdint.h>
+
+/*
+ * struct uvc_function_config_endpoint - Endpoint parameters
+ * @bInterval: Transfer interval (interrupt and isochronous only)
+ * @bMaxBurst: Transfer burst size (super-speed only)
+ * @wMaxPacketSize: Maximum packet size (including the multiplier)
+ */
+struct uvc_function_config_endpoint
+{
+  unsigned int bInterval;
+  unsigned int bMaxBurst;
+  unsigned int wMaxPacketSize;
+};
+
+/*
+ * struct uvc_function_config_interface - Interface parameters
+ * @bInterfaceNumber: Interface number
+ */
+struct uvc_function_config_interface
+{
+  unsigned int bInterfaceNumber;
+};
+
+/*
+ * struct uvc_function_config_control - Control interface parameters
+ * @intf: Generic interface parameters
+ */
+struct uvc_function_config_control
+{
+  struct uvc_function_config_interface intf;
+};
+
+/*
+ * struct uvc_function_config_frame - Streaming frame parameters
+ * @index: Frame index in the UVC descriptors
+ * @width: Frame width in pixels
+ * @height: Frame height in pixels
+ * @num_intervals: Number of entries in the intervals array
+ * @intervals: Array of frame intervals
+ */
+struct uvc_function_config_frame
+{
+  unsigned int index;
+  unsigned int width;
+  unsigned int height;
+  unsigned int num_intervals;
+  unsigned int *intervals;
+  unsigned int maxvideofbsize;
+};
+
+/*
+ * struct uvc_function_config_format - Streaming format parameters
+ * @index: Format index in the UVC descriptors
+ * @guid: Format GUID
+ * @fcc: V4L2 pixel format
+ * @num_frames: Number of entries in the frames array
+ * @frames: Array of frame descriptors
+ */
+struct uvc_function_config_format
+{
+  unsigned int index;
+  uint8_t guid16;
+  unsigned int fcc;
+  unsigned int num_frames;
+  struct uvc_function_config_frame *frames;
+};
+
+/*
+ * struct uvc_function_config_streaming - Streaming interface parameters
+ * @intf: Generic interface parameters
+ * @ep: Endpoint parameters
+ * @num_formats: Number of entries in the formats array
+ * @formats: Array of format descriptors
+ */
+struct uvc_function_config_streaming
+{
+  struct uvc_function_config_interface intf;
+  struct uvc_function_config_endpoint ep;
+
+  unsigned int num_formats;
+  struct uvc_function_config_format *formats;
+};
+
+/*
+ * struct uvc_function_config - UVC function configuration parameters
+ * @video: Full path to the video device node
+ * @udc: UDC name
+ * @control: Control interface configuration
+ * @streaming: Streaming interface configuration
+ */
+struct uvc_function_config
+{
+  char *video;
+  char *udc;
+
+  struct uvc_function_config_control control;
+  struct uvc_function_config_streaming streaming;
+};
+
+struct uvc_function_config *configfs_parse_uvc_function (const char *function);
+void configfs_free_uvc_function (struct uvc_function_config *fc);
+
+struct uvc_function_config *configfs_parse_uvc_videodev (int fd,
+    const char *video);
+
+#endif

gst-plugins-bad-1.24.5.tar.xz/sys/uvcgadget/gstuvcsink.c Added

@@ -0,0 +1,874 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.0-or-later
+ *
+ * Copyright (C) 2023 Pengutronix e.K. - www.pengutronix.de
+ *
+ */
+
+/**
+ * SECTION:plugin-uvcgadget
+ * @title: uvcgadget
+ *
+ * Since: 1.24
+ */
+
+/**
+ * SECTION:element-uvcsink
+ * @title: uvcsink
+ *
+ * uvcsink can be used to push frames to the Linux UVC Gadget
+ * driver.
+ *
+ * ## Example launch lines
+ * |
+ * gst-launch videotestsrc ! uvcsink v4l2sink::device=/dev/video1
+ * |
+ * This pipeline streams a test pattern on UVC gadget /dev/video1.
+ *
+ * Before starting the pipeline, the linux system needs an uvc gadget
+ * configured on the udc (usb device controller)
+ *
+ * Either by using the legacy g_webcam gadget or by preconfiguring it
+ * with configfs. One way to configure is to use the example script from
+ * uvc-gadget:
+ *
+ * https://git.ideasonboard.org/uvc-gadget.git/blob/HEAD:/scripts/uvc-gadget.sh
+ *
+ * A modern way of configuring the gadget with an scheme file that gets
+ * loaded by gadget-tool (gt) using libusbgx.
+ *
+ * https://github.com/linux-usb-gadgets/libusbgx
+ * https://github.com/linux-usb-gadgets/gt
+ *
+ * Since: 1.24
+ */
+#define _GNU_SOURCE
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <gst/gst.h>
+#include <gst/pbutils/pbutils.h>
+
+#include "gstuvcsink.h"
+
+GST_DEBUG_CATEGORY (uvcsink_debug);
+#define GST_CAT_DEFAULT uvcsink_debug
+
+enum
+{
+  ARG_0,
+  PROP_STREAMING,
+  PROP_LAST
+};
+
+#define gst_uvc_sink_parent_class parent_class
+G_DEFINE_TYPE (GstUvcSink, gst_uvc_sink, GST_TYPE_BIN);
+GST_ELEMENT_REGISTER_DEFINE (uvcsink,
+    "uvcsink", GST_RANK_NONE, GST_TYPE_UVCSINK);
+
+/* GstElement methods: */
+static GstStateChangeReturn gst_uvc_sink_change_state (GstElement *
+    element, GstStateChange transition);
+
+static void gst_uvc_sink_dispose (GObject * object);
+static gboolean gst_uvc_sink_prepare_configfs (GstUvcSink * self);
+
+static void
+gst_uvc_sink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstUvcSink *self = GST_UVCSINK (object);
+
+  switch (prop_id) {
+    case PROP_STREAMING:
+      g_value_set_boolean (value, g_atomic_int_get (&self->streaming));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstStructure *
+gst_v4l2uvc_fourcc_to_bare_struct (guint32 fourcc)
+{
+  GstStructure *structure = NULL;
+
+  /* Since MJPEG and YUY2 are currently the only one supported
+   * we limit the function to parse only these fourccs
+   */
+  switch (fourcc) {
+    case V4L2_PIX_FMT_MJPEG:   /* Motion-JPEG */
+    case V4L2_PIX_FMT_JPEG:    /* JFIF JPEG */
+      structure = gst_structure_new_empty ("image/jpeg");
+      break;
+    case V4L2_PIX_FMT_YUYV:{
+      GstVideoFormat format = GST_VIDEO_FORMAT_YUY2;
+      if (format != GST_VIDEO_FORMAT_UNKNOWN)
+        structure = gst_structure_new ("video/x-raw",
+            "format", G_TYPE_STRING, gst_video_format_to_string (format), NULL);
+      break;
+    }
+      break;
+    default:
+      GST_DEBUG ("Unsupported fourcc 0x%08x %" GST_FOURCC_FORMAT,
+          fourcc, GST_FOURCC_ARGS (fourcc));
+      break;
+  }
+
+  return structure;
+}
+
+/* The UVC EVENT_DATA from the host, which is committing the currently
+ * selected configuration (format+resolution+framerate) is only selected
+ * by some index values (except the framerate). We have to transform
+ * those values to an valid caps string that we can return on the caps
+ * query.
+ */
+static GstCaps *
+gst_uvc_sink_get_configured_caps (GstUvcSink * self)
+{
+  struct v4l2_fmtdesc format;
+  struct v4l2_frmsizeenum size;
+  struct v4l2_frmivalenum ival;
+  guint32 width, height;
+  gint device_fd;
+  GstStructure *s;
+  gint numerator, denominator;
+  GValue framerate = { 0, };
+
+  g_object_get (G_OBJECT (self->v4l2sink), "device-fd", &device_fd, NULL);
+
+  format.index = self->cur.bFormatIndex - 1;
+  format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+
+  if (ioctl (device_fd, VIDIOC_ENUM_FMT, &format) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, READ, ("Linux kernel error"),
+        ("VIDIOC_ENUM_FMT failed: %s (%d)", g_strerror (errno), errno));
+    return NULL;
+  }
+
+  s = gst_v4l2uvc_fourcc_to_bare_struct (format.pixelformat);
+
+  memset (&size, 0, sizeof (struct v4l2_frmsizeenum));
+  size.index = self->cur.bFrameIndex - 1;
+  size.pixel_format = format.pixelformat;
+
+  if (ioctl (device_fd, VIDIOC_ENUM_FRAMESIZES, &size) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, READ, ("Linux kernel error"),
+        ("VIDIOC_ENUM_FRAMESIZES failed: %s (%d)", g_strerror (errno), errno));
+    return NULL;
+  }
+
+  GST_LOG_OBJECT (self, "got discrete frame size %dx%d",
+      size.discrete.width, size.discrete.height);
+
+  width = MIN (size.discrete.width, G_MAXINT);
+  height = MIN (size.discrete.height, G_MAXINT);
+
+  if (!width || !height)
+    return NULL;
+
+  g_value_init (&framerate, GST_TYPE_FRACTION);
+
+  memset (&ival, 0, sizeof (struct v4l2_frmivalenum));
+
+  ival.index = 0;
+  ival.pixel_format = format.pixelformat;
+  ival.width = width;
+  ival.height = height;
+
+#define SIMPLIFY_FRACTION_N_TERMS   8
+#define SIMPLIFY_FRACTION_THRESHOLD 333
+
+  numerator = self->cur.dwFrameInterval;
+  denominator = 10000000;
+  gst_util_simplify_fraction (&numerator, &denominator,
+      SIMPLIFY_FRACTION_N_TERMS, SIMPLIFY_FRACTION_THRESHOLD);
+
+  if (ioctl (device_fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, READ, ("Linux kernel error"),
+        ("VIDIOC_ENUM_FRAMEINTERVALS failed: %s (%d)",
+            g_strerror (errno), errno));
+    return NULL;
+  }
+
+  do {
+    gint inumerator = ival.discrete.numerator;
+    gint idenominator = ival.discrete.denominator;
+
+    gst_util_simplify_fraction (&inumerator, &idenominator,
+        SIMPLIFY_FRACTION_N_TERMS, SIMPLIFY_FRACTION_THRESHOLD);
+
+    if (numerator == inumerator && denominator == idenominator)
+      /* swap to get the framerate */
+      gst_value_set_fraction (&framerate, denominator, numerator);
+
+    ival.index++;
+  } while (ioctl (device_fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) >= 0);
+
+  gst_structure_set (s, "width", G_TYPE_INT, (gint) width,
+      "height", G_TYPE_INT, (gint) height, NULL);
+
+  gst_structure_take_value (s, "framerate", &framerate);
+
+  return gst_caps_new_full (s, NULL);
+}
+
+static gboolean gst_uvc_sink_to_fakesink (GstUvcSink * self);
+static gboolean gst_uvc_sink_to_v4l2sink (GstUvcSink * self);
+
+static void
+gst_uvc_sink_update_streaming (GstUvcSink * self)
+{
+  if (self->streamon && !self->streaming)
+    GST_ERROR_OBJECT (self, "Unexpected STREAMON");
+  if (self->streamoff && self->streaming)
+    GST_ERROR_OBJECT (self, "Unexpected STREAMOFF");
+
+  if (self->streamon)
+    gst_uvc_sink_to_v4l2sink (self);
+
+  g_atomic_int_set (&self->streamon, FALSE);
+  g_atomic_int_set (&self->streamoff, FALSE);
+}
+
+static gboolean
+gst_uvc_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+{
+  GstUvcSink *self = GST_UVCSINK (parent);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_CAPS:
+      GST_DEBUG_OBJECT (self, "Handling %" GST_PTR_FORMAT, event);
+
+      /* EVENT CAPS signals that the buffers after the event will use new caps.
+       * If the UVC host requested a new format, we now must start the stream.
+       */
+      if (self->caps_changed) {
+        if (self->streamon || self->streamoff)
+          g_atomic_int_set (&self->caps_changed, FALSE);
+
+        gst_uvc_sink_update_streaming (self);
+      }
+      break;
+    default:
+      break;
+  }
+
+  return gst_pad_event_default (pad, parent, event);
+}
+
+static gboolean
+gst_uvc_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
+{
+  GstUvcSink *self = GST_UVCSINK (parent);
+
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_CAPS:
+    {
+      if (gst_caps_is_empty (self->cur_caps))
+        return gst_pad_query_default (pad, parent, query);
+
+      GST_DEBUG_OBJECT (self, "caps %" GST_PTR_FORMAT, self->cur_caps);
+      gst_query_set_caps_result (query, self->cur_caps);
+
+      if (!self->caps_changed)
+        gst_uvc_sink_update_streaming (self);
+
+      return TRUE;
+    }
+    case GST_QUERY_ALLOCATION:
+      return TRUE;
+    default:
+      return gst_pad_query_default (pad, parent, query);
+  }
+  return TRUE;
+}
+
+static void
+gst_uvc_sink_class_init (GstUvcSinkClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstElementClass *element_class;
+
+  element_class = GST_ELEMENT_CLASS (klass);
+
+  element_class->change_state = gst_uvc_sink_change_state;
+
+  gst_element_class_set_metadata (element_class,
+      "UVC Sink", "Sink/Video",
+      "Streams Video via UVC Gadget", "Michael Grzeschik <mgr@pengutronix.de>");
+
+  GST_DEBUG_CATEGORY_INIT (uvcsink_debug, "uvcsink", 0, "uvc sink element");
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->dispose = gst_uvc_sink_dispose;
+  gobject_class->get_property = gst_uvc_sink_get_property;
+
+  /**
+   * uvcsink:streaming:
+   *
+   * The stream status of the host.
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class, PROP_STREAMING,
+      g_param_spec_boolean ("streaming", "streaming",
+          "The stream status of the host", 0,
+          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+}
+
+static gboolean
+gst_uvc_sink_to_fakesink (GstUvcSink * self)
+{
+  if (gst_pad_is_linked (self->fakesinkpad)) {
+    GST_DEBUG_OBJECT (self, "v4l2sink already disabled");
+    return FALSE;
+  }
+
+  GST_DEBUG_OBJECT (self, "switching to fakesink");
+  gst_ghost_pad_set_target (GST_GHOST_PAD (self->sinkpad), self->fakesinkpad);
+  gst_element_set_state (GST_ELEMENT (self->fakesink), GST_STATE_PLAYING);
+
+  /* going to state READY makes v4l2sink lose its reference to the clock */
+  self->v4l2_clock = gst_element_get_clock (self->v4l2sink);
+
+  gst_pad_query (self->v4l2sinkpad, gst_query_new_drain ());
+
+  gst_element_set_state (GST_ELEMENT (self->v4l2sink), GST_STATE_READY);
+
+  return TRUE;
+}
+
+static gboolean
+gst_uvc_sink_to_v4l2sink (GstUvcSink * self)
+{
+  if (gst_pad_is_linked (self->v4l2sinkpad)) {
+    GST_DEBUG_OBJECT (self, "fakesink already disabled");
+    return FALSE;
+  }
+
+  if (self->v4l2_clock) {
+    gst_element_set_clock (self->v4l2sink, self->v4l2_clock);
+    gst_object_unref (self->v4l2_clock);
+  }
+
+  GST_DEBUG_OBJECT (self, "switching to v4l2sink");
+
+  gst_ghost_pad_set_target (GST_GHOST_PAD (self->sinkpad), self->v4l2sinkpad);
+  gst_element_set_state (GST_ELEMENT (self->v4l2sink), GST_STATE_PLAYING);
+
+  gst_pad_query (self->fakesinkpad, gst_query_new_drain ());
+
+  gst_element_set_state (GST_ELEMENT (self->fakesink), GST_STATE_READY);
+
+  return TRUE;
+}
+
+static GstPadProbeReturn
+gst_uvc_sink_sinkpad_buffer_peer_probe (GstPad * pad,
+    GstPadProbeInfo * info, gpointer user_data)
+{
+  GstUvcSink *self = user_data;
+
+  if (self->streamon || self->streamoff)
+    return GST_PAD_PROBE_DROP;
+
+  self->buffer_peer_probe_id = 0;
+
+  return GST_PAD_PROBE_REMOVE;
+}
+
+static GstPadProbeReturn
+gst_uvc_sink_sinkpad_idle_probe (GstPad * pad,
+    GstPadProbeInfo * info, gpointer user_data)
+{
+  GstUvcSink *self = user_data;
+
+  if (self->streamon || self->streamoff) {
+    /* Drop all incoming buffers until the streamoff or streamon is done. */
+    self->buffer_peer_probe_id =
+        gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_BUFFER,
+        gst_uvc_sink_sinkpad_buffer_peer_probe, self, NULL);
+
+    GST_DEBUG_OBJECT (self, "Send reconfigure");
+    gst_pad_push_event (self->sinkpad, gst_event_new_reconfigure ());
+  }
+
+  if (self->streamoff)
+    gst_uvc_sink_to_fakesink (self);
+
+  return GST_PAD_PROBE_PASS;
+}
+
+static void
+gst_uvc_sink_remove_buffer_peer_probe (GstUvcSink * self)
+{
+  GstPad *peerpad = gst_pad_get_peer (self->sinkpad);
+  if (peerpad && self->buffer_peer_probe_id) {
+    gst_pad_remove_probe (peerpad, self->buffer_peer_probe_id);
+    gst_object_unref (peerpad);
+    self->buffer_peer_probe_id = 0;
+  }
+}
+
+static void
+gst_uvc_sink_create_idle_probe (GstUvcSink * self)
+{
+  GstPad *peerpad = gst_pad_get_peer (self->sinkpad);
+  if (peerpad) {
+    self->idle_probe_id =
+        gst_pad_add_probe (peerpad, GST_PAD_PROBE_TYPE_IDLE,
+        gst_uvc_sink_sinkpad_idle_probe, self, NULL);
+    gst_object_unref (peerpad);
+  }
+}
+
+static void
+gst_uvc_sink_remove_idle_probe (GstUvcSink * self)
+{
+  GstPad *peerpad = gst_pad_get_peer (self->sinkpad);
+  if (peerpad && self->idle_probe_id) {
+    gst_pad_remove_probe (peerpad, self->idle_probe_id);
+    gst_object_unref (peerpad);
+    self->idle_probe_id = 0;
+  }
+}
+
+static gboolean
+gst_uvc_sink_open (GstUvcSink * self)
+{
+  if (!self->v4l2sink) {
+    gst_element_post_message (GST_ELEMENT_CAST (self),
+        gst_missing_element_message_new (GST_ELEMENT_CAST (self), "v4l2sink"));
+
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("No v4l2sink element found"), ("Check your plugin installation"));
+    return FALSE;
+  }
+
+  if (!self->fakesink) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("No fakesink element found"), ("Check your plugin installation"));
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static void
+gst_uvc_sink_init (GstUvcSink * self)
+{
+  /* add the v4l2sink element */
+  self->v4l2sink = gst_element_factory_make ("v4l2sink", "v4l2sink");
+  if (!self->v4l2sink)
+    return;
+
+  g_object_set (G_OBJECT (self->v4l2sink), "async", FALSE, NULL);
+  gst_bin_add (GST_BIN (self), self->v4l2sink);
+
+  /* add the fakesink element */
+  self->fakesink = gst_element_factory_make ("fakesink", "fakesink");
+  if (!self->fakesink)
+    return;
+
+  g_object_set (G_OBJECT (self->fakesink), "sync", TRUE, NULL);
+  gst_bin_add (GST_BIN (self), self->fakesink);
+
+  self->v4l2sinkpad = gst_element_get_static_pad (self->v4l2sink, "sink");
+  g_return_if_fail (self->v4l2sinkpad != NULL);
+
+  self->fakesinkpad = gst_element_get_static_pad (self->fakesink, "sink");
+  g_return_if_fail (self->fakesinkpad != NULL);
+
+  /* create ghost pad sink */
+  self->sinkpad = gst_ghost_pad_new ("sink", self->fakesinkpad);
+  gst_element_add_pad (GST_ELEMENT (self), self->sinkpad);
+
+  g_atomic_int_set (&self->streaming, FALSE);
+
+  g_atomic_int_set (&self->streamon, FALSE);
+  g_atomic_int_set (&self->streamoff, FALSE);
+
+  gst_pad_set_query_function (self->sinkpad, gst_uvc_sink_query);
+  gst_pad_set_event_function (self->sinkpad, gst_uvc_sink_event);
+
+  self->cur_caps = gst_caps_new_empty ();
+}
+
+static void
+gst_uvc_sink_dispose (GObject * object)
+{
+  GstUvcSink *self = GST_UVCSINK (object);
+
+  if (self->sinkpad) {
+    gst_uvc_sink_remove_buffer_peer_probe (self);
+
+    gst_pad_set_active (self->sinkpad, FALSE);
+    gst_element_remove_pad (GST_ELEMENT (self), self->sinkpad);
+    self->sinkpad = NULL;
+  }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static gboolean gst_uvc_sink_unwatch (GstUvcSink * self);
+
+/* the thread where everything happens */
+static void
+gst_uvc_sink_task (gpointer data)
+{
+  GstUvcSink *self = GST_UVCSINK (data);
+  GstClockTime timeout = GST_CLOCK_TIME_NONE;
+  struct uvc_request_data resp;
+  gboolean ret = TRUE;
+
+  /* Since the plugin needs to be able to start immidiatly in PLAYING
+     state we ensure the pipeline is not blocked while we poll for
+     events.
+   */
+  GST_PAD_STREAM_UNLOCK (self->sinkpad);
+
+  ret = gst_poll_wait (self->poll, timeout);
+  if (G_UNLIKELY (ret < 0))
+    return;
+
+  timeout = GST_CLOCK_TIME_NONE;
+
+  if (gst_poll_fd_has_closed (self->poll, &self->pollfd)) {
+    GST_ELEMENT_ERROR (self, RESOURCE, READ, ("videofd was closed"), NULL);
+    gst_uvc_sink_unwatch (self);
+    gst_element_set_state (GST_ELEMENT (self), GST_STATE_NULL);
+    return;
+  }
+
+  if (gst_poll_fd_has_error (self->poll, &self->pollfd)) {
+    GST_ELEMENT_ERROR (self, RESOURCE, READ, ("videofd has error"), NULL);
+    gst_uvc_sink_unwatch (self);
+    gst_element_set_state (GST_ELEMENT (self), GST_STATE_NULL);
+    return;
+  }
+
+  /* PRI is used to signal that events are available */
+  if (gst_poll_fd_has_pri (self->poll, &self->pollfd)) {
+    struct v4l2_event event = { 0, };
+    struct uvc_event *uvc_event = (void *) &event.u.data;
+
+    if (ioctl (self->pollfd.fd, VIDIOC_DQEVENT, &event) < 0) {
+      GST_ELEMENT_ERROR (self, RESOURCE, READ,
+          ("could not dequeue event"), NULL);
+      gst_uvc_sink_unwatch (self);
+      gst_element_set_state (GST_ELEMENT (self), GST_STATE_NULL);
+      return;
+    }
+
+    switch (event.type) {
+      case UVC_EVENT_STREAMON:
+        GST_DEBUG_OBJECT (self, "UVC_EVENT_STREAMON");
+        GST_STATE_LOCK (GST_ELEMENT (self));
+        g_atomic_int_set (&self->streaming, TRUE);
+        g_atomic_int_set (&self->streamon, TRUE);
+        GST_STATE_UNLOCK (GST_ELEMENT (self));
+        g_object_notify (G_OBJECT (self), "streaming");
+        break;
+      case UVC_EVENT_STREAMOFF:
+      case UVC_EVENT_DISCONNECT:
+        GST_DEBUG_OBJECT (self, "UVC_EVENT_STREAMOFF");
+        GST_STATE_LOCK (GST_ELEMENT (self));
+        g_atomic_int_set (&self->streaming, FALSE);
+        g_atomic_int_set (&self->streamoff, TRUE);
+        GST_STATE_UNLOCK (GST_ELEMENT (self));
+        g_object_notify (G_OBJECT (self), "streaming");
+        break;
+      case UVC_EVENT_SETUP:
+        GST_DEBUG_OBJECT (self, "UVC_EVENT_SETUP");
+
+        memset (&resp, 0, sizeof (resp));
+        resp.length = -EL2HLT;
+
+        uvc_events_process_setup (self, &uvc_event->req, &resp);
+
+        if (ioctl (self->pollfd.fd, UVCIOC_SEND_RESPONSE, &resp) < 0) {
+          GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+              ("UVCIOC_SEND_RESPONSE failed"),
+              ("UVCIOC_SEND_RESPONSE on UVC_EVENT_SETUP failed"));
+          gst_uvc_sink_unwatch (self);
+          gst_element_set_state (GST_ELEMENT (self), GST_STATE_NULL);
+          return;
+        }
+        break;
+      case UVC_EVENT_DATA:
+        GST_DEBUG_OBJECT (self, "UVC_EVENT_DATA");
+        uvc_events_process_data (self, &uvc_event->data);
+        if (self->control == UVC_VS_COMMIT_CONTROL) {
+          GstCaps *configured_caps;
+          GstCaps *prev_caps;
+
+          /* The configured caps are not sufficient for negotiation. Select caps
+           * from the probed caps that match the configured caps.
+           */
+          configured_caps = gst_uvc_sink_get_configured_caps (self);
+          gst_clear_caps (&self->cur_caps);
+          self->cur_caps =
+              gst_caps_intersect_full (self->probed_caps, configured_caps,
+              GST_CAPS_INTERSECT_FIRST);
+          GST_INFO_OBJECT (self, "UVC host selected %" GST_PTR_FORMAT,
+              self->cur_caps);
+          gst_caps_unref (configured_caps);
+
+          prev_caps = gst_pad_get_current_caps (self->sinkpad);
+          if (!gst_caps_is_subset (prev_caps, self->cur_caps)) {
+            self->caps_changed = TRUE;
+            GST_DEBUG_OBJECT (self,
+                "caps changed from %" GST_PTR_FORMAT, prev_caps);
+          }
+          gst_caps_unref (prev_caps);
+        }
+        break;
+      default:
+        break;
+    }
+  }
+}
+
+static gboolean
+gst_uvc_sink_watch (GstUvcSink * self)
+{
+  struct v4l2_event_subscription sub = {.type = UVC_EVENT_STREAMON };
+  gboolean ret = TRUE;
+  gint device_fd;
+  gint fd;
+
+  ret = gst_uvc_sink_prepare_configfs (self);
+  if (!ret) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("could not parse configfs"), ("Check your configfs setup"));
+    return FALSE;
+  }
+
+  g_object_get (G_OBJECT (self->v4l2sink), "device-fd", &device_fd, NULL);
+
+  fd = dup3 (device_fd, device_fd + 1, O_CLOEXEC);
+  if (fd < 0)
+    return FALSE;
+
+  self->poll = gst_poll_new (TRUE);
+  gst_poll_fd_init (&self->pollfd);
+  self->pollfd.fd = fd;
+  gst_poll_add_fd (self->poll, &self->pollfd);
+  gst_poll_fd_ctl_pri (self->poll, &self->pollfd, TRUE);
+
+  if (ioctl (device_fd, VIDIOC_SUBSCRIBE_EVENT, &sub) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Failed to subscribe event"),
+        ("UVC_EVENT_STREAMON could not be subscribed"));
+    return FALSE;
+  }
+
+  sub.type = UVC_EVENT_STREAMOFF;
+  if (ioctl (device_fd, VIDIOC_SUBSCRIBE_EVENT, &sub) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Failed to subscribe event"),
+        ("UVC_EVENT_STREAMOFF could not be subscribed"));
+    return FALSE;
+  }
+
+  sub.type = UVC_EVENT_DISCONNECT;
+  if (ioctl (device_fd, VIDIOC_SUBSCRIBE_EVENT, &sub) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Failed to subscribe event"),
+        ("UVC_EVENT_DISCONNECT could not be subscribed"));
+    return FALSE;
+  }
+
+  sub.type = UVC_EVENT_SETUP;
+  if (ioctl (device_fd, VIDIOC_SUBSCRIBE_EVENT, &sub) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Failed to subscribe event"),
+        ("UVC_EVENT_SETUP could not be subscribed"));
+    return FALSE;
+  }
+
+  sub.type = UVC_EVENT_DATA;
+  if (ioctl (device_fd, VIDIOC_SUBSCRIBE_EVENT, &sub) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Failed to subscribe event"),
+        ("UVC_EVENT_DATA could not be subscribed"));
+    return FALSE;
+  }
+
+  if (!gst_pad_start_task (GST_PAD (self->sinkpad),
+          (GstTaskFunction) gst_uvc_sink_task, self, NULL)) {
+    GST_ELEMENT_ERROR (self, CORE, THREAD, ("Could not start pad task"),
+        ("Could not start pad task"));
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_uvc_sink_unwatch (GstUvcSink * self)
+{
+  struct v4l2_event_subscription sub = {.type = UVC_EVENT_DATA };
+  gint device_fd;
+
+  gst_poll_set_flushing (self->poll, TRUE);
+  gst_pad_stop_task (GST_PAD (self->sinkpad));
+
+  g_object_get (G_OBJECT (self->v4l2sink), "device-fd", &device_fd, NULL);
+
+  if (ioctl (device_fd, VIDIOC_UNSUBSCRIBE_EVENT, &sub) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Failed to unsubscribe event"),
+        ("UVC_EVENT_DATA could not be unsubscribed"));
+    return FALSE;
+  }
+
+  sub.type = UVC_EVENT_SETUP;
+  if (ioctl (device_fd, VIDIOC_UNSUBSCRIBE_EVENT, &sub) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Failed to unsubscribe event"),
+        ("UVC_EVENT_SETUP could not be unsubscribed"));
+    return FALSE;
+  }
+
+  sub.type = UVC_EVENT_STREAMON;
+  if (ioctl (device_fd, VIDIOC_UNSUBSCRIBE_EVENT, &sub) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Failed to unsubscribe event"),
+        ("UVC_EVENT_STREAMON could not be unsubscribed"));
+    return FALSE;
+  }
+
+  sub.type = UVC_EVENT_STREAMOFF;
+  if (ioctl (device_fd, VIDIOC_UNSUBSCRIBE_EVENT, &sub) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Failed to unsubscribe event"),
+        ("UVC_EVENT_STREAMOFF could not be unsubscribed"));
+    return FALSE;
+  }
+
+  sub.type = UVC_EVENT_DISCONNECT;
+  if (ioctl (device_fd, VIDIOC_UNSUBSCRIBE_EVENT, &sub) < 0) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Failed to unsubscribe event"),
+        ("UVC_EVENT_DISCONNECT could not be unsubscribed"));
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_uvc_sink_prepare_configfs (GstUvcSink * self)
+{
+  gint device_fd;
+  GValue device = G_VALUE_INIT;
+
+  g_object_get (G_OBJECT (self->v4l2sink), "device-fd", &device_fd, NULL);
+  g_object_get_property (G_OBJECT (self->v4l2sink), "device", &device);
+
+  self->fc = configfs_parse_uvc_videodev (device_fd,
+      g_value_get_string (&device));
+  if (!self->fc) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Failed to identify function configuration"),
+        ("Check your configfs setup"));
+    return FALSE;
+  }
+
+  uvc_fill_streaming_control (self, &self->probe, self->cur.bFrameIndex,
+      self->cur.bFormatIndex, self->cur.dwFrameInterval);
+  uvc_fill_streaming_control (self, &self->commit, self->cur.bFrameIndex,
+      self->cur.bFormatIndex, self->cur.dwFrameInterval);
+
+  return TRUE;
+}
+
+static gboolean
+gst_uvc_sink_query_probed_caps (GstUvcSink * self)
+{
+  GstQuery *caps_query = gst_query_new_caps (NULL);
+  GstCaps *query_caps;
+
+  gst_clear_caps (&self->probed_caps);
+  if (!gst_pad_query (self->v4l2sinkpad, caps_query))
+    return FALSE;
+
+  gst_query_parse_caps_result (caps_query, &query_caps);
+  gst_query_unref (caps_query);
+
+  self->probed_caps = gst_caps_copy (query_caps);
+
+  gst_caps_replace (&self->cur_caps, self->probed_caps);
+
+  return TRUE;
+}
+
+static GstStateChangeReturn
+gst_uvc_sink_change_state (GstElement * element, GstStateChange transition)
+{
+  GstUvcSink *self = GST_UVCSINK (element);
+  int bret = GST_STATE_CHANGE_SUCCESS;
+
+  GST_DEBUG_OBJECT (self, "%s -> %s",
+      gst_element_state_get_name (GST_STATE_TRANSITION_CURRENT (transition)),
+      gst_element_state_get_name (GST_STATE_TRANSITION_NEXT (transition)));
+
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+      if (!gst_uvc_sink_open (self))
+        return GST_STATE_CHANGE_FAILURE;
+      break;
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      gst_uvc_sink_create_idle_probe (self);
+      break;
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      gst_element_sync_state_with_parent (GST_ELEMENT (self->fakesink));
+      gst_uvc_sink_remove_idle_probe (self);
+      break;
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      if (!gst_uvc_sink_unwatch (self))
+        return GST_STATE_CHANGE_FAILURE;
+      break;
+    default:
+      break;
+  }
+
+  bret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      break;
+    case GST_STATE_CHANGE_NULL_TO_READY:
+      if (!gst_uvc_sink_watch (self))
+        return GST_STATE_CHANGE_FAILURE;
+      if (!gst_uvc_sink_query_probed_caps (self))
+        return GST_STATE_CHANGE_FAILURE;
+      break;
+    default:
+      break;
+  }
+
+  return bret;
+}
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  return GST_ELEMENT_REGISTER (uvcsink, plugin);
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    uvcgadget,
+    "gstuvcgadget plugin",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

gst-plugins-bad-1.24.5.tar.xz/sys/uvcgadget/gstuvcsink.h Added

@@ -0,0 +1,79 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.0-or-later
+ *
+ * Copyright (C) 2023 Pengutronix e.K. - www.pengutronix.de
+ *
+ */
+
+#pragma once
+
+#include "linux/usb/g_uvc.h"
+#include "linux/usb/video.h"
+#include "linux/videodev2.h"
+
+#include <gst/gst.h>
+
+#include "configfs.h"
+
+G_BEGIN_DECLS GST_DEBUG_CATEGORY_EXTERN (uvcsink_debug);
+
+#define GST_TYPE_UVCSINK (gst_uvc_sink_get_type())
+G_DECLARE_FINAL_TYPE (GstUvcSink, gst_uvc_sink, GST, UVCSINK, GstBin)
+
+GST_ELEMENT_REGISTER_DECLARE (uvcsink);
+
+struct _GstUvcSink
+{
+  GstBin bin;
+  GstElement *fakesink;
+  GstElement *v4l2sink;
+  GstPad *sinkpad;
+  GstPad *fakesinkpad;
+  GstPad *v4l2sinkpad;
+
+  /* streaming status */
+  gboolean streaming;
+
+  GstCaps *probed_caps;
+  GstCaps *cur_caps;
+
+  /* a poll for video_fd */
+  GstPoll *poll;
+  GstPollFD pollfd;
+
+  struct uvc_function_config *fc;
+
+  struct {
+    int bFrameIndex;
+    int bFormatIndex;
+    unsigned int dwFrameInterval;
+  } cur;
+
+  struct uvc_streaming_control probe;
+  struct uvc_streaming_control commit;
+
+  int control;
+
+  /* probes */
+  int buffer_peer_probe_id;
+  int idle_probe_id;
+
+  GstClock *v4l2_clock;
+
+  int caps_changed;
+  int streamon;
+  int streamoff;
+};
+
+#define UVCSINK_MSG_LOCK(v) g_mutex_lock(&(v)->msg_lock)
+#define UVCSINK_MSG_UNLOCK(v) g_mutex_unlock(&(v)->msg_lock)
+
+int uvc_events_process_data(GstUvcSink * self,
+                                   const struct uvc_request_data *data);
+int uvc_events_process_setup(GstUvcSink * self,
+                         const struct usb_ctrlrequest *ctrl,
+                         struct uvc_request_data *resp);
+int uvc_fill_streaming_control(GstUvcSink * self,
+                           struct uvc_streaming_control *ctrl,
+                           int iframe, int iformat, unsigned int dwival);
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/uvcgadget/meson.build Added

@@ -0,0 +1,40 @@
+uvcgadget_sources = 
+  'gstuvcsink.c',
+  'configfs.c',
+  'uvc.c'
+
+
+libgudev_dep = dependency('gudev-1.0', required: get_option('uvcgadget'))
+
+if get_option('uvcgadget').disabled()
+  have_v4l2 = false
+  message('UVCSink plugin is disabled')
+else
+  # Should only be built on Linux, check for Linux kernel headers even though
+  # we have our own copy.
+  have_v4l2 = cc.has_header('linux/videodev2.h') or cc.has_header('sys/videodev2.h') or cc.has_header('sys/videoio.h')
+  if get_option('uvcgadget').enabled() and not have_v4l2
+    error('UVCGADGET is requested but kernel headers were not found')
+  endif
+
+  # Find makedev in various header files. Different operating systems put the
+  # macro in different header files.
+  foreach name: 'mkdev', 'sysmacros', 'types'
+    have_makedev = cc.has_header_symbol('sys/@0@.h'.format(name), 'makedev')
+    cdata.set10('HAVE_MAKEDEV_IN_' + name.to_upper(), have_makedev)
+  endforeach
+endif
+
+if have_v4l2 and libgudev_dep.found()
+  gstuvcgadget = library('gstuvcgadget',
+    uvcgadget_sources,
+    c_args : gst_plugins_bad_args,
+    cpp_args: gst_plugins_bad_args,
+    include_directories : configinc, include_directories('../v4l2codecs'),
+    dependencies : gstbase_dep, gstvideo_dep, gstallocators_dep, libgudev_dep, gstpbutils_dep,,
+    install : true,
+    install_dir : plugins_install_dir,
+  )
+  pkgconfig.generate(gstuvcgadget, install_dir : plugins_pkgconfig_install_dir)
+  plugins += gstuvcgadget
+endif

gst-plugins-bad-1.24.5.tar.xz/sys/uvcgadget/uvc.c Added

@@ -0,0 +1,420 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.0-or-later
+ *
+ * Copyright (C) 2023 Pengutronix e.K. - www.pengutronix.de
+ *
+ */
+
+#define _GNU_SOURCE
+
+#include <endian.h>
+#include <glob.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#include "gstuvcsink.h"
+#include "configfs.h"
+
+#define GST_CAT_DEFAULT uvcsink_debug
+
+#define UVC_STRING_CONTROL_IDX                  0
+#define UVC_STRING_STREAMING_IDX                1
+
+/* --------------------------------------------------------------------------
+ * Control requests
+ */
+
+static const char *
+uvc_request_name (uint8_t req)
+{
+  switch (req) {
+    case UVC_SET_CUR:
+      return "SET_CUR";
+    case UVC_GET_CUR:
+      return "GET_CUR";
+    case UVC_GET_MIN:
+      return "GET_MIN";
+    case UVC_GET_MAX:
+      return "GET_MAX";
+    case UVC_GET_RES:
+      return "GET_RES";
+    case UVC_GET_LEN:
+      return "GET_LEN";
+    case UVC_GET_INFO:
+      return "GET_INFO";
+    case UVC_GET_DEF:
+      return "GET_DEF";
+    default:
+      return "<invalid>";
+  }
+}
+
+static const char *
+uvc_video_control_interface_control_selector_name (uint8_t cs)
+{
+  switch (cs) {
+    case UVC_VC_CONTROL_UNDEFINED:
+      return "UVC_VC_CONTROL_UNDEFINED";
+    case UVC_VC_VIDEO_POWER_MODE_CONTROL:
+      return "UVC_VC_VIDEO_POWER_MODE_CONTROL";
+    case UVC_VC_REQUEST_ERROR_CODE_CONTROL:
+      return "UVC_VC_REQUEST_ERROR_CODE_CONTROL";
+    default:
+      return "<unknown video control interface control selector>";
+  }
+}
+
+static const char *
+uvc_camera_terminal_control_selector_name (uint8_t cs)
+{
+  switch (cs) {
+    case UVC_CT_CONTROL_UNDEFINED:
+      return "UVC_CT_CONTROL_UNDEFINED";
+    case UVC_CT_SCANNING_MODE_CONTROL:
+      return "UVC_CT_SCANNING_MODE_CONTROL";
+    case UVC_CT_AE_MODE_CONTROL:
+      return "UVC_CT_AE_MODE_CONTROL";
+    case UVC_CT_AE_PRIORITY_CONTROL:
+      return "UVC_CT_AE_PRIORITY_CONTROL";
+    case UVC_CT_EXPOSURE_TIME_ABSOLUTE_CONTROL:
+      return "UVC_CT_EXPOSURE_TIME_ABSOLUTE_CONTROL";
+    case UVC_CT_EXPOSURE_TIME_RELATIVE_CONTROL:
+      return "UVC_CT_EXPOSURE_TIME_RELATIVE_CONTROL";
+    case UVC_CT_FOCUS_ABSOLUTE_CONTROL:
+      return "UVC_CT_FOCUS_ABSOLUTE_CONTROL";
+    case UVC_CT_FOCUS_RELATIVE_CONTROL:
+      return "UVC_CT_FOCUS_RELATIVE_CONTROL";
+    case UVC_CT_FOCUS_AUTO_CONTROL:
+      return "UVC_CT_FOCUS_AUTO_CONTROL";
+    case UVC_CT_IRIS_ABSOLUTE_CONTROL:
+      return "UVC_CT_IRIS_ABSOLUTE_CONTROL";
+    case UVC_CT_IRIS_RELATIVE_CONTROL:
+      return "UVC_CT_IRIS_RELATIVE_CONTROL";
+    case UVC_CT_ZOOM_ABSOLUTE_CONTROL:
+      return "UVC_CT_ZOOM_ABSOLUTE_CONTROL";
+    case UVC_CT_ZOOM_RELATIVE_CONTROL:
+      return "UVC_CT_ZOOM_RELATIVE_CONTROL";
+    case UVC_CT_PANTILT_ABSOLUTE_CONTROL:
+      return "UVC_CT_PANTILT_ABSOLUTE_CONTROL";
+    case UVC_CT_PANTILT_RELATIVE_CONTROL:
+      return "UVC_CT_PANTILT_RELATIVE_CONTROL";
+    case UVC_CT_ROLL_ABSOLUTE_CONTROL:
+      return "UVC_CT_ROLL_ABSOLUTE_CONTROL";
+    case UVC_CT_ROLL_RELATIVE_CONTROL:
+      return "UVC_CT_ROLL_RELATIVE_CONTROL";
+    case UVC_CT_PRIVACY_CONTROL:
+      return "UVC_CT_PRIVACY_CONTROL";
+    default:
+      return "<unknown camera terminal control selector>";
+  }
+}
+
+static const char *
+uvc_processing_unit_control_selector_name (uint8_t cs)
+{
+  switch (cs) {
+    case UVC_PU_CONTROL_UNDEFINED:
+      return "UVC_PU_CONTROL_UNDEFINED";
+    case UVC_PU_BACKLIGHT_COMPENSATION_CONTROL:
+      return "UVC_PU_BACKLIGHT_COMPENSATION_CONTROL";
+    case UVC_PU_BRIGHTNESS_CONTROL:
+      return "UVC_PU_BRIGHTNESS_CONTROL";
+    case UVC_PU_CONTRAST_CONTROL:
+      return "UVC_PU_CONTRAST_CONTROL";
+    case UVC_PU_GAIN_CONTROL:
+      return "UVC_PU_GAIN_CONTROL";
+    case UVC_PU_POWER_LINE_FREQUENCY_CONTROL:
+      return "UVC_PU_POWER_LINE_FREQUENCY_CONTROL";
+    case UVC_PU_HUE_CONTROL:
+      return "UVC_PU_HUE_CONTROL";
+    case UVC_PU_SATURATION_CONTROL:
+      return "UVC_PU_SATURATION_CONTROL";
+    case UVC_PU_SHARPNESS_CONTROL:
+      return "UVC_PU_SHARPNESS_CONTROL";
+    case UVC_PU_GAMMA_CONTROL:
+      return "UVC_PU_GAMMA_CONTROL";
+    case UVC_PU_WHITE_BALANCE_TEMPERATURE_CONTROL:
+      return "UVC_PU_WHITE_BALANCE_TEMPERATURE_CONTROL";
+    case UVC_PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL:
+      return "UVC_PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL";
+    case UVC_PU_WHITE_BALANCE_COMPONENT_CONTROL:
+      return "UVC_PU_WHITE_BALANCE_COMPONENT_CONTROL";
+    case UVC_PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL:
+      return "UVC_PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL";
+    case UVC_PU_DIGITAL_MULTIPLIER_CONTROL:
+      return "UVC_PU_DIGITAL_MULTIPLIER_CONTROL";
+    case UVC_PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL:
+      return "UVC_PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL";
+    case UVC_PU_HUE_AUTO_CONTROL:
+      return "UVC_PU_HUE_AUTO_CONTROL";
+    case UVC_PU_ANALOG_VIDEO_STANDARD_CONTROL:
+      return "UVC_PU_ANALOG_VIDEO_STANDARD_CONTROL";
+    case UVC_PU_ANALOG_LOCK_STATUS_CONTROL:
+      return "UVC_PU_ANALOG_LOCK_STATUS_CONTROL";
+    default:
+      return "<unknown processing unit control selector>";
+  }
+}
+
+static const char *
+uvc_video_streaming_interface_control_selector_name (uint8_t cs)
+{
+  switch (cs) {
+    case UVC_VS_CONTROL_UNDEFINED:
+      return "UVC_VS_CONTROL_UNDEFINED";
+    case UVC_VS_PROBE_CONTROL:
+      return "UVC_VS_PROBE_CONTROL";
+    case UVC_VS_COMMIT_CONTROL:
+      return "UVC_VS_COMMIT_CONTROL";
+    case UVC_VS_STILL_PROBE_CONTROL:
+      return "UVC_VS_STILL_PROBE_CONTROL";
+    case UVC_VS_STILL_COMMIT_CONTROL:
+      return "UVC_VS_STILL_COMMIT_CONTROL";
+    case UVC_VS_STILL_IMAGE_TRIGGER_CONTROL:
+      return "UVC_VS_STILL_IMAGE_TRIGGER_CONTROL";
+    case UVC_VS_STREAM_ERROR_CODE_CONTROL:
+      return "UVC_VS_STREAM_ERROR_CODE_CONTROL";
+    case UVC_VS_GENERATE_KEY_FRAME_CONTROL:
+      return "UVC_VS_GENERATE_KEY_FRAME_CONTROL";
+    case UVC_VS_UPDATE_FRAME_SEGMENT_CONTROL:
+      return "UVC_VS_UPDATE_FRAME_SEGMENT_CONTROL";
+    case UVC_VS_SYNC_DELAY_CONTROL:
+      return "UVC_VS_SYNC_DELAY_CONTROL";
+    default:
+      return "<unknown video streaming interface control selector>";
+  }
+}
+
+int
+uvc_fill_streaming_control (GstUvcSink * self,
+    struct uvc_streaming_control *ctrl,
+    int iframe, int iformat, unsigned int dwival)
+{
+  const struct uvc_function_config_format *format;
+  const struct uvc_function_config_frame *frame;
+  unsigned int i;
+
+  if (!self->fc)
+    return -ENOENT;
+  /*
+   * Restrict the iformat, iframe and ival to valid values. Negative
+   * values for iformat or iframe will result in the maximum valid value
+   * being selected.
+   */
+  iformat = CLAMP ((unsigned int) iformat, 1U, self->fc->streaming.num_formats);
+  format = &self->fc->streaming.formatsiformat - 1;
+
+  iframe = CLAMP ((unsigned int) iframe, 1U, format->num_frames);
+  frame = &format->framesiframe - 1;
+
+  for (i = 0; i < frame->num_intervals; ++i) {
+    if (dwival <= frame->intervalsi) {
+      dwival = frame->intervalsi;
+      break;
+    }
+  }
+
+  if (i == frame->num_intervals)
+    dwival = frame->intervalsframe->num_intervals - 1;
+
+  memset (ctrl, 0, sizeof (*ctrl));
+
+  ctrl->bmHint = 1;
+  ctrl->bFormatIndex = iformat;
+  ctrl->bFrameIndex = iframe;
+  ctrl->dwFrameInterval = dwival;
+
+  switch (format->fcc) {
+    case V4L2_PIX_FMT_YUYV:
+      ctrl->dwMaxVideoFrameSize = frame->width * frame->height * 2;
+      break;
+    case V4L2_PIX_FMT_MJPEG:
+      ctrl->dwMaxVideoFrameSize = frame->maxvideofbsize;
+      break;
+  }
+
+  ctrl->dwMaxPayloadTransferSize = self->fc->streaming.ep.wMaxPacketSize;
+  ctrl->bmFramingInfo = 3;
+  ctrl->bPreferedVersion = 1;
+  ctrl->bMaxVersion = 1;
+
+  return 0;
+}
+
+int
+uvc_events_process_data (GstUvcSink * self, const struct uvc_request_data *data)
+{
+  const struct uvc_streaming_control *ctrl =
+      (const struct uvc_streaming_control *) &data->data;
+  struct uvc_streaming_control *target;
+  int ret;
+
+  switch (self->control) {
+    case UVC_VS_PROBE_CONTROL:
+      GST_DEBUG_OBJECT (self, "setting probe control");
+      target = &self->probe;
+      break;
+
+    case UVC_VS_COMMIT_CONTROL:
+      GST_DEBUG_OBJECT (self, "setting commit control");
+      target = &self->commit;
+      break;
+
+    default:
+      GST_ELEMENT_ERROR (self, RESOURCE, READ,
+          ("setting unknown control, %d", self->control), NULL);
+      return -EOPNOTSUPP;
+  }
+
+  ret = uvc_fill_streaming_control (self, target, ctrl->bFrameIndex,
+      ctrl->bFormatIndex, ctrl->dwFrameInterval);
+  if (ret)
+    return ret;
+
+  if (self->control == UVC_VS_COMMIT_CONTROL) {
+    self->cur.bFrameIndex = ctrl->bFrameIndex;
+    self->cur.bFormatIndex = ctrl->bFormatIndex;
+    self->cur.dwFrameInterval = ctrl->dwFrameInterval;
+  }
+
+  return 0;
+}
+
+static int
+uvc_events_process_streaming (GstUvcSink * self, uint8_t req, uint8_t cs,
+    struct uvc_request_data *resp)
+{
+  struct uvc_streaming_control *ctrl;
+  int ret;
+
+  GST_DEBUG_OBJECT (self,
+      "%s: %s",
+      uvc_video_streaming_interface_control_selector_name (cs),
+      uvc_request_name (req));
+
+  if (cs != UVC_VS_PROBE_CONTROL && cs != UVC_VS_COMMIT_CONTROL)
+    return 0;
+
+  ctrl = (struct uvc_streaming_control *) &resp->data;
+  resp->length = sizeof (*ctrl);
+
+  switch (req) {
+    case UVC_SET_CUR:
+      self->control = cs;
+      resp->length = 34;
+      break;
+
+    case UVC_GET_CUR:
+      if (cs == UVC_VS_PROBE_CONTROL)
+        memcpy (ctrl, &self->probe, sizeof (*ctrl));
+      else
+        memcpy (ctrl, &self->commit, sizeof (*ctrl));
+      break;
+
+    case UVC_GET_MIN:
+    case UVC_GET_MAX:
+    case UVC_GET_DEF:
+      if (req == UVC_GET_MAX)
+        ret = uvc_fill_streaming_control (self, ctrl, -1, -1, UINT_MAX);
+      else
+        ret = uvc_fill_streaming_control (self, ctrl, 1, 1, 0);
+      if (ret)
+        return ret;
+      break;
+
+    case UVC_GET_RES:
+      memset (ctrl, 0, sizeof (*ctrl));
+      break;
+
+    case UVC_GET_LEN:
+      resp->data0 = 0x00;
+      resp->data1 = 0x22;
+      resp->length = 2;
+      break;
+
+    case UVC_GET_INFO:
+      resp->data0 = 0x03;
+      resp->length = 1;
+      break;
+  }
+
+  return 0;
+}
+
+static void
+uvc_events_parse_control (GstUvcSink * self, uint8_t req,
+    uint8_t cs, uint8_t entity_id, uint8_t len, struct uvc_request_data *resp)
+{
+  switch (entity_id) {
+    case 0:
+      GST_DEBUG_OBJECT (self, "%s",
+          uvc_video_control_interface_control_selector_name (cs));
+      break;
+
+    case 1:
+      GST_DEBUG_OBJECT (self, "%s: %s",
+          uvc_camera_terminal_control_selector_name (cs),
+          uvc_request_name (req));
+      break;
+
+    case 2:
+      GST_DEBUG_OBJECT (self, "%s: %s",
+          uvc_processing_unit_control_selector_name (cs),
+          uvc_request_name (req));
+      break;
+
+    default:
+      GST_DEBUG_OBJECT (self,
+          "Unknown entity ID (0x%02x), CS: 0x%02x, Request %s (0x%02x)",
+          entity_id, cs, uvc_request_name (req), req);
+      break;
+  }
+}
+
+static int
+uvc_events_process_class (GstUvcSink * self,
+    const struct usb_ctrlrequest *ctrl, struct uvc_request_data *resp)
+{
+  unsigned int interface = le16toh (ctrl->wIndex) & 0xff;
+
+  if ((ctrl->bRequestType & USB_RECIP_MASK) != USB_RECIP_INTERFACE)
+    return -EINVAL;
+
+  if (interface == UVC_STRING_CONTROL_IDX) {
+    uvc_events_parse_control (self, ctrl->bRequest, ctrl->wValue >> 8,
+        ctrl->wIndex >> 8, ctrl->wLength, resp);
+    return -EOPNOTSUPP;
+  } else if (interface == UVC_STRING_STREAMING_IDX) {
+    return uvc_events_process_streaming (self, ctrl->bRequest,
+        le16toh (ctrl->wValue) >> 8, resp);
+  }
+
+  return 0;
+}
+
+int
+uvc_events_process_setup (GstUvcSink * self,
+    const struct usb_ctrlrequest *ctrl, struct uvc_request_data *resp)
+{
+  self->control = 0;
+
+  GST_DEBUG_OBJECT (self,
+      "bRequestType %02x bRequest %02x wValue %04x wIndex %04x wLength %04x",
+      ctrl->bRequestType, ctrl->bRequest, ctrl->wValue,
+      ctrl->wIndex, ctrl->wLength);
+
+  switch (ctrl->bRequestType & USB_TYPE_MASK) {
+    case USB_TYPE_STANDARD:
+      return -EOPNOTSUPP;
+
+    case USB_TYPE_CLASS:
+      return uvc_events_process_class (self, ctrl, resp);
+
+    default:
+      break;
+  }
+
+  return 0;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/uvch264/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/uvch264/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/gstv4l2codecalphadecodebin.c -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2codecalphadecodebin.c Changed

gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2codecav1dec.c Added

@@ -0,0 +1,1641 @@
+/* GStreamer
+ *  Copyright (C) 2020 Collabora
+ *     Author: Daniel Almeida <daniel.almeida@collabora.com>
+ *
+ * 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 the0
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstv4l2codecallocator.h"
+#include "gstv4l2codecav1dec.h"
+#include "gstv4l2codecpool.h"
+#include "gstv4l2format.h"
+#include "linux/v4l2-controls.h"
+
+#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+
+#define V4L2_MIN_KERNEL_VER_MAJOR 6
+#define V4L2_MIN_KERNEL_VER_MINOR 7
+#define V4L2_MIN_KERNEL_VERSION KERNEL_VERSION(V4L2_MIN_KERNEL_VER_MAJOR, V4L2_MIN_KERNEL_VER_MINOR, 0)
+
+GST_DEBUG_CATEGORY_STATIC (v4l2_av1dec_debug);
+#define GST_CAT_DEFAULT v4l2_av1dec_debug
+
+/* Used to mark picture that have been outputted */
+#define FLAG_PICTURE_HOLDS_BUFFER GST_MINI_OBJECT_FLAG_LAST
+
+enum
+{
+  PROP_0,
+  PROP_LAST = PROP_0
+};
+
+static GstStaticPadTemplate sink_template =
+GST_STATIC_PAD_TEMPLATE (GST_VIDEO_DECODER_SINK_NAME,
+    GST_PAD_SINK, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-av1, alignment=frame"));
+
+#define SRC_CAPS \
+    GST_VIDEO_DMA_DRM_CAPS_MAKE " ; " \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+#define SRC_CAPS_NO_DRM \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+static GstStaticCaps static_src_caps = GST_STATIC_CAPS (SRC_CAPS);
+static GstStaticCaps static_src_caps_no_drm = GST_STATIC_CAPS (SRC_CAPS_NO_DRM);
+
+static GstStaticPadTemplate src_template =
+GST_STATIC_PAD_TEMPLATE (GST_VIDEO_DECODER_SRC_NAME,
+    GST_PAD_SRC, GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (SRC_CAPS));
+
+struct _GstV4l2CodecAV1Dec
+{
+  GstAV1Decoder parent;
+  GstV4l2Decoder *decoder;
+  GstVideoCodecState *output_state;
+  GstVideoInfo vinfo;
+  GstVideoInfoDmaDrm vinfo_drm;
+
+  GstV4l2CodecAllocator *sink_allocator;
+  GstV4l2CodecAllocator *src_allocator;
+  GstV4l2CodecPool *src_pool;
+  gint min_pool_size;
+  gboolean has_videometa;
+  gboolean streaming;
+  gboolean copy_frames;
+
+  gint frame_width;
+  gint frame_height;
+  gint render_width;
+  gint render_height;
+  guint bit_depth;
+  guint profile;
+  guint16 operating_point_idc;
+
+  struct v4l2_ctrl_av1_sequence v4l2_sequence;
+  struct v4l2_ctrl_av1_frame v4l2_frame;
+  struct v4l2_ctrl_av1_film_grain v4l2_film_grain;
+
+  gboolean need_sequence;
+
+  GArray *tile_group_entries;
+
+  gboolean fill_film_grain;
+
+  GstMemory *bitstream;
+  GstMapInfo bitstream_map;
+};
+
+G_DEFINE_ABSTRACT_TYPE (GstV4l2CodecAV1Dec, gst_v4l2_codec_av1_dec,
+    GST_TYPE_AV1_DECODER);
+
+#define parent_class gst_v4l2_codec_av1_dec_parent_class
+
+static GstFlowReturn
+gst_v4l2_codec_av1_dec_ensure_bitstream (GstV4l2CodecAV1Dec * self)
+{
+  if (self->bitstream)
+    goto done;
+
+  self->bitstream = gst_v4l2_codec_allocator_alloc (self->sink_allocator);
+
+  if (!self->bitstream) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NO_SPACE_LEFT,
+        ("Not enough memory to decode AV1 stream."), (NULL));
+    return GST_FLOW_ERROR;
+  }
+
+  if (!gst_memory_map (self->bitstream, &self->bitstream_map, GST_MAP_WRITE)) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Could not access bitstream memory for writing"), (NULL));
+    g_clear_pointer (&self->bitstream, gst_memory_unref);
+    return GST_FLOW_ERROR;
+  }
+
+done:
+  /* We use this field to track how much we have written */
+  self->bitstream_map.size = 0;
+
+  return GST_FLOW_OK;
+}
+
+static void
+gst_v4l2_codec_av1_reset_bitstream (GstV4l2CodecAV1Dec * self)
+{
+  if (self->bitstream) {
+    if (self->bitstream_map.memory)
+      gst_memory_unmap (self->bitstream, &self->bitstream_map);
+    g_clear_pointer (&self->bitstream, gst_memory_unref);
+    self->bitstream_map = (GstMapInfo) GST_MAP_INFO_INIT;
+  }
+}
+
+static gboolean
+gst_v4l2_decoder_av1_api_check (GstV4l2Decoder * decoder)
+{
+  guint i, ret_size;
+  /* *INDENT-OFF* */
+  #define SET_ID(cid) .id = (cid), .name = #cid
+  struct
+  {
+    const gchar *name;
+    unsigned int id;
+    unsigned int size;
+    gboolean optional;
+  } controls = {
+    {
+      SET_ID (V4L2_CID_STATELESS_AV1_FRAME),
+      .size = sizeof(struct v4l2_ctrl_av1_frame),
+    }, {
+      SET_ID (V4L2_CID_STATELESS_AV1_TILE_GROUP_ENTRY),
+      .size = sizeof(struct v4l2_ctrl_av1_tile_group_entry),
+    }, {
+      SET_ID (V4L2_CID_STATELESS_AV1_SEQUENCE),
+      .size = sizeof(struct v4l2_ctrl_av1_sequence),
+    }, {
+      SET_ID (V4L2_CID_STATELESS_AV1_FILM_GRAIN),
+      .size = sizeof(struct v4l2_ctrl_av1_film_grain),
+      .optional = TRUE,
+    }
+  };
+  #undef SET_ID
+  /* *INDENT-ON* */
+
+  /*
+   * Compatibility check: make sure the pointer controls are
+   * the right size.
+   */
+  for (i = 0; i < G_N_ELEMENTS (controls); i++) {
+    gboolean control_found;
+
+    control_found = gst_v4l2_decoder_query_control_size (decoder,
+        controlsi.id, &ret_size);
+
+    if (!controlsi.optional && !control_found) {
+      GST_WARNING ("Driver is missing %s support.", controlsi.name);
+      return FALSE;
+    }
+
+    if (control_found && ret_size != controlsi.size) {
+      GST_WARNING ("%s control size mismatch: got %d bytes but %d expected.",
+          controlsi.name, ret_size, controlsi.size);
+      return FALSE;
+    }
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_v4l2_codec_av1_dec_open (GstVideoDecoder * decoder)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+
+  if (!gst_v4l2_decoder_open (self->decoder)) {
+    GST_ELEMENT_ERROR (self, RESOURCE, OPEN_READ_WRITE,
+        ("Failed to open AV1 decoder"),
+        ("gst_v4l2_decoder_open() failed: %s", g_strerror (errno)));
+    return FALSE;
+  }
+
+  self->fill_film_grain =
+      gst_v4l2_decoder_query_control_size (self->decoder,
+      V4L2_CID_STATELESS_AV1_FILM_GRAIN, NULL);
+  return TRUE;
+}
+
+static gboolean
+gst_v4l2_codec_av1_dec_close (GstVideoDecoder * decoder)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+  gst_v4l2_decoder_close (self->decoder);
+  return TRUE;
+}
+
+static void
+gst_v4l2_codec_av1_dec_streamoff (GstV4l2CodecAV1Dec * self)
+{
+  if (self->streaming) {
+    gst_v4l2_decoder_streamoff (self->decoder, GST_PAD_SINK);
+    gst_v4l2_decoder_streamoff (self->decoder, GST_PAD_SRC);
+    self->streaming = FALSE;
+  }
+}
+
+static void
+gst_v4l2_codec_av1_dec_reset_allocation (GstV4l2CodecAV1Dec * self)
+{
+  if (self->sink_allocator) {
+    gst_v4l2_codec_allocator_detach (self->sink_allocator);
+    g_clear_object (&self->sink_allocator);
+  }
+
+  if (self->src_allocator) {
+    gst_v4l2_codec_allocator_detach (self->src_allocator);
+    g_clear_object (&self->src_allocator);
+    g_clear_object (&self->src_pool);
+  }
+}
+
+static gboolean
+gst_v4l2_codec_av1_dec_stop (GstVideoDecoder * decoder)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+
+  gst_v4l2_decoder_streamoff (self->decoder, GST_PAD_SINK);
+  gst_v4l2_decoder_streamoff (self->decoder, GST_PAD_SRC);
+
+  gst_v4l2_codec_av1_dec_reset_allocation (self);
+
+  if (self->output_state)
+    gst_video_codec_state_unref (self->output_state);
+  self->output_state = NULL;
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->stop (decoder);
+}
+
+static gboolean
+gst_v4l2_codec_av1_dec_negotiate (GstVideoDecoder * decoder)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+  GstAV1Decoder *av1dec = GST_AV1_DECODER (decoder);
+
+  /* *INDENT-OFF* */
+  struct v4l2_ext_control control = {
+    {
+      .id = V4L2_CID_STATELESS_AV1_SEQUENCE,
+      .ptr = &self->v4l2_sequence,
+      .size = sizeof (self->v4l2_sequence),
+    },
+  };
+  /* *INDENT-ON* */
+
+  GstCaps *peer_caps, *filter, *caps;
+  GstStaticCaps *static_filter;
+
+  /* Ignore downstream renegotiation request. */
+  if (self->streaming)
+    goto done;
+
+  GST_DEBUG_OBJECT (self, "Negotiate");
+
+  gst_v4l2_codec_av1_dec_reset_allocation (self);
+
+  if (!gst_v4l2_decoder_set_sink_fmt (self->decoder, V4L2_PIX_FMT_AV1_FRAME,
+          self->frame_width, self->frame_height, self->bit_depth)) {
+    GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
+        ("Failed to configure AV1 decoder"),
+        ("gst_v4l2_decoder_set_sink_fmt() failed: %s", g_strerror (errno)));
+    gst_v4l2_decoder_close (self->decoder);
+    return FALSE;
+  }
+
+  if (!gst_v4l2_decoder_set_controls (self->decoder, NULL, control,
+          G_N_ELEMENTS (control))) {
+    GST_ELEMENT_ERROR (decoder, RESOURCE, WRITE,
+        ("Driver does not support the selected stream."), (NULL));
+    return FALSE;
+  }
+
+  /* If the peer has ANY caps only advertise system memory caps */
+  peer_caps = gst_pad_peer_query_caps (decoder->srcpad, NULL);
+  static_filter =
+      gst_caps_is_any (peer_caps) ? &static_src_caps_no_drm : &static_src_caps;
+  gst_caps_unref (peer_caps);
+
+  filter = gst_v4l2_decoder_enum_src_formats (self->decoder, static_filter);
+  if (!filter) {
+    GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
+        ("No supported decoder output formats"), (NULL));
+    return FALSE;
+  }
+  GST_DEBUG_OBJECT (self, "Supported output formats: %" GST_PTR_FORMAT, filter);
+
+  caps = gst_pad_peer_query_caps (decoder->srcpad, filter);
+  gst_caps_unref (filter);
+  GST_DEBUG_OBJECT (self, "Peer supported formats: %" GST_PTR_FORMAT, caps);
+
+  if (!gst_v4l2_decoder_select_src_format (self->decoder, caps, &self->vinfo,
+          &self->vinfo_drm)) {
+    GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
+        ("Unsupported pixel format"),
+        ("No support for %ux%u", self->frame_width, self->frame_height));
+    gst_caps_unref (caps);
+    return FALSE;
+  }
+  gst_caps_unref (caps);
+
+done:
+  if (self->output_state)
+    gst_video_codec_state_unref (self->output_state);
+
+  self->output_state =
+      gst_v4l2_decoder_set_output_state (GST_VIDEO_DECODER (self), &self->vinfo,
+      &self->vinfo_drm, self->render_width, self->render_height,
+      av1dec->input_state);
+
+  if (GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder)) {
+    if (self->streaming)
+      return TRUE;
+
+    if (!gst_v4l2_decoder_streamon (self->decoder, GST_PAD_SINK)) {
+      GST_ELEMENT_ERROR (self, RESOURCE, FAILED,
+          ("Could not enable the decoder driver."),
+          ("VIDIOC_STREAMON(SINK) failed: %s", g_strerror (errno)));
+      return FALSE;
+    }
+
+    if (!gst_v4l2_decoder_streamon (self->decoder, GST_PAD_SRC)) {
+      GST_ELEMENT_ERROR (self, RESOURCE, FAILED,
+          ("Could not enable the decoder driver."),
+          ("VIDIOC_STREAMON(SRC) failed: %s", g_strerror (errno)));
+      return FALSE;
+    }
+
+    self->streaming = TRUE;
+
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+static gboolean
+gst_v4l2_codec_av1_dec_decide_allocation (GstVideoDecoder * decoder,
+    GstQuery * query)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+  GstCaps *caps = NULL;
+  guint min = 0, num_bitstream;
+
+  /* If we are streaming here, then it means there is nothing allocation
+   * related in the new state and allocation can be ignored */
+  if (self->streaming)
+    goto no_internal_changes;
+
+  g_clear_object (&self->src_pool);
+  g_clear_object (&self->src_allocator);
+
+  self->has_videometa = gst_query_find_allocation_meta (query,
+      GST_VIDEO_META_API_TYPE, NULL);
+
+  gst_query_parse_allocation (query, &caps, NULL);
+  if (!caps) {
+    GST_ERROR_OBJECT (self, "No valid caps");
+    return FALSE;
+  }
+
+  if (gst_video_is_dma_drm_caps (caps) && !self->has_videometa) {
+    GST_ERROR_OBJECT (self,
+        "DMABuf caps negotiated without the mandatory support of VideoMeta");
+    return FALSE;
+  }
+
+  if (gst_query_get_n_allocation_pools (query) > 0)
+    gst_query_parse_nth_allocation_pool (query, 0, NULL, NULL, &min, NULL);
+
+  min = MAX (2, min);
+
+  num_bitstream = 1 +
+      MAX (1, gst_v4l2_decoder_get_render_delay (self->decoder));
+
+  self->sink_allocator = gst_v4l2_codec_allocator_new (self->decoder,
+      GST_PAD_SINK, num_bitstream);
+  if (!self->sink_allocator) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NO_SPACE_LEFT,
+        ("Not enough memory to allocate sink buffers."), (NULL));
+    return FALSE;
+  }
+
+  self->src_allocator = gst_v4l2_codec_allocator_new (self->decoder,
+      GST_PAD_SRC, self->min_pool_size + min);
+  if (!self->src_allocator) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NO_SPACE_LEFT,
+        ("Not enough memory to allocate source buffers."), (NULL));
+    g_clear_object (&self->sink_allocator);
+    return FALSE;
+  }
+
+  self->src_pool = gst_v4l2_codec_pool_new (self->src_allocator, &self->vinfo);
+
+no_internal_changes:
+  /* Our buffer pool is internal, we will let the base class create a video
+   * pool, and use it if we are running out of buffers or if downstream does
+   * not support GstVideoMeta */
+  return GST_VIDEO_DECODER_CLASS (parent_class)->decide_allocation
+      (decoder, query);
+}
+
+static guint
+gst_v4l2_codec_av1_dec_get_preferred_output_delay (GstAV1Decoder * decoder,
+    gboolean live)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+  guint delay;
+
+  if (live)
+    delay = 0;
+  else
+    /* Just one for now, perhaps we can make this configurable in the future. */
+    delay = 1;
+
+  gst_v4l2_decoder_set_render_delay (self->decoder, delay);
+
+  return delay;
+}
+
+static void
+gst_v4l2_codec_av1_dec_set_flushing (GstV4l2CodecAV1Dec * self,
+    gboolean flushing)
+{
+  if (self->sink_allocator)
+    gst_v4l2_codec_allocator_set_flushing (self->sink_allocator, flushing);
+  if (self->src_allocator)
+    gst_v4l2_codec_allocator_set_flushing (self->src_allocator, flushing);
+}
+
+static gboolean
+gst_v4l2_codec_av1_dec_flush (GstVideoDecoder * decoder)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+
+  GST_DEBUG_OBJECT (self, "Flushing decoder state.");
+
+  gst_v4l2_decoder_flush (self->decoder);
+  gst_v4l2_codec_av1_dec_set_flushing (self, FALSE);
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->flush (decoder);
+}
+
+static gboolean
+gst_v4l2_codec_av1_dec_sink_event (GstVideoDecoder * decoder, GstEvent * event)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+
+  switch (GST_EVENT_TYPE (event)) {
+    case GST_EVENT_FLUSH_START:
+      GST_DEBUG_OBJECT (self, "flush start");
+      gst_v4l2_codec_av1_dec_set_flushing (self, TRUE);
+      break;
+    default:
+      break;
+  }
+
+  return GST_VIDEO_DECODER_CLASS (parent_class)->sink_event (decoder, event);
+}
+
+static GstStateChangeReturn
+gst_v4l2_codec_av1_dec_change_state (GstElement * element,
+    GstStateChange transition)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (element);
+
+  if (transition == GST_STATE_CHANGE_PAUSED_TO_READY)
+    gst_v4l2_codec_av1_dec_set_flushing (self, TRUE);
+
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+}
+
+static void
+gst_v4l2_codec_av1_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (object);
+  GObject *dec = G_OBJECT (self->decoder);
+
+  switch (prop_id) {
+    default:
+      gst_v4l2_decoder_set_property (dec, prop_id - PROP_LAST, value, pspec);
+      break;
+  }
+}
+
+static void
+gst_v4l2_codec_av1_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (object);
+  GObject *dec = G_OBJECT (self->decoder);
+
+  switch (prop_id) {
+    default:
+      gst_v4l2_decoder_get_property (dec, prop_id - PROP_LAST, value, pspec);
+      break;
+  }
+}
+
+static void
+gst_v4l2_codec_av1_dec_fill_sequence_params (GstV4l2CodecAV1Dec * self,
+    const GstAV1SequenceHeaderOBU * seq_hdr)
+{
+  /* *INDENT-OFF* */
+  self->v4l2_sequence = (struct v4l2_ctrl_av1_sequence) {
+    .flags =
+      (seq_hdr->still_picture ? V4L2_AV1_SEQUENCE_FLAG_STILL_PICTURE : 0) |
+      (seq_hdr->use_128x128_superblock ? V4L2_AV1_SEQUENCE_FLAG_USE_128X128_SUPERBLOCK : 0) |
+      (seq_hdr->enable_filter_intra ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_FILTER_INTRA : 0) |
+      (seq_hdr->enable_intra_edge_filter ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_INTRA_EDGE_FILTER : 0) |
+      (seq_hdr->enable_interintra_compound ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_INTERINTRA_COMPOUND : 0) |
+      (seq_hdr->enable_masked_compound ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_MASKED_COMPOUND : 0) |
+      (seq_hdr->enable_warped_motion ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_WARPED_MOTION : 0) |
+      (seq_hdr->enable_dual_filter ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_DUAL_FILTER : 0) |
+      (seq_hdr->enable_order_hint ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_ORDER_HINT : 0) |
+      (seq_hdr->enable_jnt_comp ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_JNT_COMP : 0) |
+      (seq_hdr->enable_ref_frame_mvs ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_REF_FRAME_MVS : 0) |
+      (seq_hdr->enable_superres ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_SUPERRES : 0) |
+      (seq_hdr->enable_cdef ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_CDEF : 0) |
+      (seq_hdr->enable_restoration ? V4L2_AV1_SEQUENCE_FLAG_ENABLE_RESTORATION : 0) |
+      (seq_hdr->color_config.mono_chrome ? V4L2_AV1_SEQUENCE_FLAG_MONO_CHROME : 0) |
+      (seq_hdr->color_config.color_range ? V4L2_AV1_SEQUENCE_FLAG_COLOR_RANGE : 0) |
+      (seq_hdr->color_config.subsampling_x ? V4L2_AV1_SEQUENCE_FLAG_SUBSAMPLING_X : 0) |
+      (seq_hdr->color_config.subsampling_y ? V4L2_AV1_SEQUENCE_FLAG_SUBSAMPLING_Y : 0) |
+      (seq_hdr->film_grain_params_present ? V4L2_AV1_SEQUENCE_FLAG_FILM_GRAIN_PARAMS_PRESENT : 0) |
+      (seq_hdr->color_config.separate_uv_delta_q ? V4L2_AV1_SEQUENCE_FLAG_SEPARATE_UV_DELTA_Q : 0),
+      .seq_profile = seq_hdr->seq_profile,
+      .order_hint_bits = seq_hdr->order_hint_bits,
+      .bit_depth = seq_hdr->bit_depth,
+      .max_frame_width_minus_1 = seq_hdr->max_frame_width_minus_1,
+      .max_frame_height_minus_1 = seq_hdr->max_frame_height_minus_1,
+  };
+  /* *INDENT-ON* */
+}
+
+static void
+gst_v4l2_codec_av1_fill_refs (GstV4l2CodecAV1Dec * self,
+    const GstAV1FrameHeaderOBU * frame_hdr, const GstAV1Dpb * reference_frames)
+{
+  gint i;
+
+  G_STATIC_ASSERT (G_N_ELEMENTS (self->v4l2_frame.reference_frame_ts) ==
+      G_N_ELEMENTS (reference_frames->pic_list));
+  G_STATIC_ASSERT (sizeof (self->v4l2_frame.ref_frame_idx) ==
+      sizeof (frame_hdr->ref_frame_idx));
+  g_return_if_fail (reference_frames != NULL);
+
+  for (i = 0; i < G_N_ELEMENTS (reference_frames->pic_list); i++) {
+    GstAV1Picture *ref_pic = reference_frames->pic_listi;
+
+    /* the decoder might not have filled all slots in the first few frames */
+    self->v4l2_frame.reference_frame_tsi =
+        ref_pic ? GST_CODEC_PICTURE_TS_NS (ref_pic) : 0;
+  }
+
+  memcpy (self->v4l2_frame.ref_frame_idx, frame_hdr->ref_frame_idx,
+      sizeof (frame_hdr->ref_frame_idx));
+}
+
+static void
+gst_v4l2_codec_av1_fill_tile_info (GstV4l2CodecAV1Dec * self,
+    const GstAV1TileInfo * ti)
+{
+  struct v4l2_av1_tile_info *v4l2_ti = &self->v4l2_frame.tile_info;
+
+  G_STATIC_ASSERT (sizeof (v4l2_ti->mi_col_starts) ==
+      sizeof (ti->mi_col_starts));
+  G_STATIC_ASSERT (sizeof (v4l2_ti->mi_row_starts) ==
+      sizeof (ti->mi_row_starts));
+  G_STATIC_ASSERT (sizeof (v4l2_ti->width_in_sbs_minus_1) ==
+      sizeof (ti->width_in_sbs_minus_1));
+  G_STATIC_ASSERT (sizeof (v4l2_ti->height_in_sbs_minus_1) ==
+      sizeof (ti->height_in_sbs_minus_1));
+
+  memcpy (v4l2_ti->mi_col_starts, ti->mi_col_starts,
+      sizeof (v4l2_ti->mi_col_starts));
+  memcpy (v4l2_ti->mi_row_starts, ti->mi_row_starts,
+      sizeof (v4l2_ti->mi_row_starts));
+  memcpy (v4l2_ti->width_in_sbs_minus_1, ti->width_in_sbs_minus_1,
+      sizeof (v4l2_ti->width_in_sbs_minus_1));
+  memcpy (v4l2_ti->height_in_sbs_minus_1, ti->height_in_sbs_minus_1,
+      sizeof (v4l2_ti->height_in_sbs_minus_1));
+}
+
+static void
+gst_v4l2_codec_av1_fill_loop_filter (GstV4l2CodecAV1Dec * self,
+    const GstAV1LoopFilterParams * lf)
+{
+  struct v4l2_av1_loop_filter *v4l2_lf = &self->v4l2_frame.loop_filter;
+
+  G_STATIC_ASSERT (sizeof (v4l2_lf->level) == sizeof (lf->loop_filter_level));
+  G_STATIC_ASSERT (sizeof (v4l2_lf->ref_deltas) ==
+      sizeof (lf->loop_filter_ref_deltas));
+  G_STATIC_ASSERT (sizeof (v4l2_lf->mode_deltas) ==
+      sizeof (lf->loop_filter_mode_deltas));
+
+  memcpy (v4l2_lf->level, lf->loop_filter_level, sizeof (v4l2_lf->level));
+  memcpy (v4l2_lf->ref_deltas, lf->loop_filter_ref_deltas,
+      sizeof (v4l2_lf->ref_deltas));
+  memcpy (v4l2_lf->mode_deltas, lf->loop_filter_mode_deltas,
+      sizeof (v4l2_lf->mode_deltas));
+}
+
+static void
+gst_v4l2_codec_av1_fill_segmentation (GstV4l2CodecAV1Dec * self,
+    const GstAV1SegmenationParams * seg)
+{
+  struct v4l2_av1_segmentation *v4l2_seg = &self->v4l2_frame.segmentation;
+  guint32 i;
+  guint32 j;
+
+  G_STATIC_ASSERT (sizeof (v4l2_seg->feature_data) ==
+      sizeof (seg->feature_data));
+
+  for (i = 0; i < G_N_ELEMENTS (v4l2_seg->feature_enabled); i++)
+    for (j = 0; j < V4L2_AV1_SEG_LVL_MAX; j++)
+      v4l2_seg->feature_enabledi |= (seg->feature_enabledij << j);
+
+  memcpy (v4l2_seg->feature_data, seg->feature_data,
+      sizeof (v4l2_seg->feature_data));
+}
+
+static void
+gst_v4l2_codec_av1_fill_cdef (GstV4l2CodecAV1Dec * self,
+    const GstAV1CDEFParams * cdef)
+{
+  struct v4l2_av1_cdef *v4l2_cdef = &self->v4l2_frame.cdef;
+
+  G_STATIC_ASSERT (sizeof (v4l2_cdef->y_pri_strength) ==
+      sizeof (cdef->cdef_y_pri_strength));
+  G_STATIC_ASSERT (sizeof (v4l2_cdef->y_sec_strength) ==
+      sizeof (cdef->cdef_y_sec_strength));
+  G_STATIC_ASSERT (sizeof (v4l2_cdef->uv_pri_strength) ==
+      sizeof (cdef->cdef_uv_pri_strength));
+  G_STATIC_ASSERT (sizeof (v4l2_cdef->uv_sec_strength) ==
+      sizeof (cdef->cdef_uv_sec_strength));
+
+  memcpy (v4l2_cdef->y_pri_strength, cdef->cdef_y_pri_strength,
+      sizeof (v4l2_cdef->y_pri_strength));
+  memcpy (v4l2_cdef->y_sec_strength, cdef->cdef_y_sec_strength,
+      sizeof (v4l2_cdef->y_sec_strength));
+  memcpy (v4l2_cdef->uv_pri_strength, cdef->cdef_uv_pri_strength,
+      sizeof (v4l2_cdef->uv_pri_strength));
+  memcpy (v4l2_cdef->uv_sec_strength, cdef->cdef_uv_sec_strength,
+      sizeof (v4l2_cdef->uv_sec_strength));
+}
+
+static void
+gst_v4l2_codec_av1_fill_loop_restoration (GstV4l2CodecAV1Dec * self,
+    const GstAV1LoopRestorationParams * lr)
+{
+  struct v4l2_av1_loop_restoration *v4l2_lr =
+      &self->v4l2_frame.loop_restoration;
+
+  G_STATIC_ASSERT (sizeof (v4l2_lr->loop_restoration_size) ==
+      sizeof (lr->loop_restoration_size));
+
+  memcpy (v4l2_lr->loop_restoration_size, lr->loop_restoration_size,
+      sizeof (v4l2_lr->loop_restoration_size));
+}
+
+static void
+gst_v4l2_codec_av1_fill_global_motion (GstV4l2CodecAV1Dec * self,
+    const GstAV1GlobalMotionParams * gm)
+{
+  struct v4l2_av1_global_motion *v4l2_gm = &self->v4l2_frame.global_motion;
+  gint i;
+
+  G_STATIC_ASSERT (sizeof (v4l2_gm->type) == sizeof (gm->gm_type));
+  G_STATIC_ASSERT (sizeof (v4l2_gm->params) == sizeof (gm->gm_params));
+  G_STATIC_ASSERT (G_N_ELEMENTS (v4l2_gm->flags) == GST_AV1_SEG_LVL_MAX);
+
+  for (i = 0; i < G_N_ELEMENTS (v4l2_gm->flags); i++) {
+    v4l2_gm->flagsi =
+        (gm->is_globali ? V4L2_AV1_GLOBAL_MOTION_FLAG_IS_GLOBAL : 0) |
+        (gm->is_rot_zoomi ? V4L2_AV1_GLOBAL_MOTION_FLAG_IS_ROT_ZOOM : 0) |
+        (gm->is_translationi ? V4L2_AV1_GLOBAL_MOTION_FLAG_IS_TRANSLATION :
+        0);
+
+    switch (gm->gm_typei) {
+      case GST_AV1_WARP_MODEL_IDENTITY:
+        v4l2_gm->typei = V4L2_AV1_WARP_MODEL_IDENTITY;
+        break;
+      case GST_AV1_WARP_MODEL_TRANSLATION:
+        v4l2_gm->typei = V4L2_AV1_WARP_MODEL_TRANSLATION;
+        break;
+      case GST_AV1_WARP_MODEL_ROTZOOM:
+        v4l2_gm->typei = V4L2_AV1_WARP_MODEL_ROTZOOM;
+        break;
+      case GST_AV1_WARP_MODEL_AFFINE:
+        v4l2_gm->typei = V4L2_AV1_WARP_MODEL_AFFINE;
+        break;
+    }
+    v4l2_gm->invalid |= (gm->invalidi << i);
+  }
+
+  memcpy (v4l2_gm->type, gm->gm_type, sizeof (v4l2_gm->type));
+  memcpy (v4l2_gm->params, gm->gm_params, sizeof (v4l2_gm->params));
+}
+
+static void
+gst_v4l2_codec_av1_fill_film_grain (GstV4l2CodecAV1Dec * self,
+    const GstAV1FilmGrainParams * fg)
+{
+  struct v4l2_ctrl_av1_film_grain *v4l2_fg = &self->v4l2_film_grain;
+
+  *v4l2_fg = (struct v4l2_ctrl_av1_film_grain) {
+    .flags =
+        (fg->apply_grain ? V4L2_AV1_FILM_GRAIN_FLAG_APPLY_GRAIN : 0) |
+        (fg->update_grain ? V4L2_AV1_FILM_GRAIN_FLAG_UPDATE_GRAIN : 0) |
+        (fg->chroma_scaling_from_luma ?
+        V4L2_AV1_FILM_GRAIN_FLAG_CHROMA_SCALING_FROM_LUMA : 0) |
+        (fg->overlap_flag ? V4L2_AV1_FILM_GRAIN_FLAG_OVERLAP : 0) |
+        (fg->clip_to_restricted_range ?
+        V4L2_AV1_FILM_GRAIN_FLAG_CLIP_TO_RESTRICTED_RANGE : 0),
+
+    .grain_seed = fg->grain_seed,
+    .film_grain_params_ref_idx = fg->film_grain_params_ref_idx,
+    .num_y_points = fg->num_y_points,
+    .num_cb_points = fg->num_cb_points,
+    .num_cr_points = fg->num_cr_points,
+    .grain_scaling_minus_8 = fg->grain_scaling_minus_8,
+    .ar_coeff_lag = fg->ar_coeff_lag,
+    .ar_coeff_shift_minus_6 = fg->ar_coeff_shift_minus_6,
+    .grain_scale_shift = fg->grain_scale_shift,
+    .cb_mult = fg->cb_mult,
+    .cb_luma_mult = fg->cb_luma_mult,
+    .cb_offset = fg->cb_offset,
+    .cr_mult = fg->cr_mult,
+    .cr_luma_mult = fg->cr_luma_mult,
+    .cr_offset = fg->cr_offset
+  };
+
+  G_STATIC_ASSERT (sizeof (v4l2_fg->point_y_value) ==
+      sizeof (fg->point_y_value));
+  G_STATIC_ASSERT (sizeof (v4l2_fg->point_y_scaling) ==
+      sizeof (fg->point_y_scaling));
+  G_STATIC_ASSERT (sizeof (v4l2_fg->point_cb_value) ==
+      sizeof (fg->point_cb_value));
+  G_STATIC_ASSERT (sizeof (v4l2_fg->point_cb_scaling) ==
+      sizeof (fg->point_cb_scaling));
+  G_STATIC_ASSERT (sizeof (v4l2_fg->point_cr_value) ==
+      sizeof (fg->point_cr_value));
+  G_STATIC_ASSERT (sizeof (v4l2_fg->point_cr_scaling) ==
+      sizeof (fg->point_cr_scaling));
+  G_STATIC_ASSERT (sizeof (v4l2_fg->ar_coeffs_y_plus_128) ==
+      sizeof (fg->ar_coeffs_y_plus_128));
+  G_STATIC_ASSERT (sizeof (v4l2_fg->ar_coeffs_cb_plus_128) ==
+      sizeof (fg->ar_coeffs_cb_plus_128));
+  G_STATIC_ASSERT (sizeof (v4l2_fg->ar_coeffs_cr_plus_128) ==
+      sizeof (fg->ar_coeffs_cr_plus_128));
+
+  memcpy (v4l2_fg->point_y_value, fg->point_y_value,
+      sizeof (v4l2_fg->point_y_value));
+  memcpy (v4l2_fg->point_y_scaling, fg->point_y_scaling,
+      sizeof (v4l2_fg->point_y_scaling));
+  memcpy (v4l2_fg->point_cb_value, fg->point_cb_value,
+      sizeof (v4l2_fg->point_cb_value));
+  memcpy (v4l2_fg->point_cb_scaling, fg->point_cb_scaling,
+      sizeof (v4l2_fg->point_cb_scaling));
+  memcpy (v4l2_fg->point_cr_value, fg->point_cr_value,
+      sizeof (v4l2_fg->point_cr_value));
+  memcpy (v4l2_fg->point_cr_scaling, fg->point_cr_scaling,
+      sizeof (v4l2_fg->point_cr_scaling));
+  memcpy (v4l2_fg->ar_coeffs_y_plus_128, fg->ar_coeffs_y_plus_128,
+      sizeof (v4l2_fg->ar_coeffs_y_plus_128));
+  memcpy (v4l2_fg->ar_coeffs_cb_plus_128, fg->ar_coeffs_cb_plus_128,
+      sizeof (v4l2_fg->ar_coeffs_cb_plus_128));
+  memcpy (v4l2_fg->ar_coeffs_cr_plus_128, fg->ar_coeffs_cr_plus_128,
+      sizeof (v4l2_fg->ar_coeffs_cr_plus_128));
+}
+
+static void
+gst_v4l2_codec_av1_dec_fill_frame_hdr (GstV4l2CodecAV1Dec * self,
+    const GstAV1Picture * pic, const GstAV1Dpb * reference_frames)
+{
+  const GstAV1FrameHeaderOBU *f = &pic->frame_hdr;
+  const GstAV1TileInfo *ti = &f->tile_info;
+  const GstAV1QuantizationParams *q = &f->quantization_params;
+  const GstAV1SegmenationParams *seg = &f->segmentation_params; /* FIXME: send patch upstream to fix spelling on the parser s/segmenation/segmentation */
+  const GstAV1LoopFilterParams *lf = &f->loop_filter_params;
+  const GstAV1LoopRestorationParams *lr = &f->loop_restoration_params;
+  guint i;
+
+  G_STATIC_ASSERT (sizeof (self->v4l2_frame.
+          loop_restoration.frame_restoration_type) ==
+      sizeof (lr->frame_restoration_type));
+  G_STATIC_ASSERT (sizeof (self->v4l2_frame.buffer_removal_time) ==
+      sizeof (f->buffer_removal_time));
+  G_STATIC_ASSERT (sizeof (self->v4l2_frame.order_hints) ==
+      sizeof (f->order_hints));
+  G_STATIC_ASSERT (sizeof (self->v4l2_frame.skip_mode_frame) ==
+      sizeof (f->skip_mode_frame));
+
+  self->v4l2_frame = (struct v4l2_ctrl_av1_frame) {
+  /* *INDENT-OFF* */
+    .flags =
+      (f->show_frame ? V4L2_AV1_FRAME_FLAG_SHOW_FRAME : 0) |
+      (f->showable_frame ? V4L2_AV1_FRAME_FLAG_SHOWABLE_FRAME : 0) |
+      (f->error_resilient_mode ? V4L2_AV1_FRAME_FLAG_ERROR_RESILIENT_MODE : 0) |
+      (f->disable_cdf_update ? V4L2_AV1_FRAME_FLAG_DISABLE_CDF_UPDATE : 0) |
+      (f->allow_screen_content_tools ? V4L2_AV1_FRAME_FLAG_ALLOW_SCREEN_CONTENT_TOOLS : 0) |
+      (f->force_integer_mv ? V4L2_AV1_FRAME_FLAG_FORCE_INTEGER_MV : 0) |
+      (f->allow_intrabc ? V4L2_AV1_FRAME_FLAG_ALLOW_INTRABC : 0) |
+      (f->use_superres ? V4L2_AV1_FRAME_FLAG_USE_SUPERRES : 0) |
+      (f->allow_high_precision_mv ? V4L2_AV1_FRAME_FLAG_ALLOW_HIGH_PRECISION_MV : 0) |
+      (f->is_motion_mode_switchable ? V4L2_AV1_FRAME_FLAG_IS_MOTION_MODE_SWITCHABLE : 0) |
+      (f->use_ref_frame_mvs ? V4L2_AV1_FRAME_FLAG_USE_REF_FRAME_MVS : 0) |
+      (f->disable_frame_end_update_cdf ? V4L2_AV1_FRAME_FLAG_DISABLE_FRAME_END_UPDATE_CDF : 0) |
+      (f->allow_warped_motion ? V4L2_AV1_FRAME_FLAG_ALLOW_WARPED_MOTION : 0) |
+      (f->reference_select ? V4L2_AV1_FRAME_FLAG_REFERENCE_SELECT : 0) |
+      (f->reduced_tx_set ? V4L2_AV1_FRAME_FLAG_REDUCED_TX_SET : 0) |
+      (f->skip_mode_frame0 > 0 ? V4L2_AV1_FRAME_FLAG_SKIP_MODE_ALLOWED : 0) |
+      (f->skip_mode_present ? V4L2_AV1_FRAME_FLAG_SKIP_MODE_PRESENT : 0) |
+      (f->frame_size_override_flag ? V4L2_AV1_FRAME_FLAG_FRAME_SIZE_OVERRIDE : 0) |
+      (f->buffer_removal_time_present_flag ? V4L2_AV1_FRAME_FLAG_BUFFER_REMOVAL_TIME_PRESENT : 0) |
+      (f->frame_refs_short_signaling ? V4L2_AV1_FRAME_FLAG_FRAME_REFS_SHORT_SIGNALING : 0),
+
+    .order_hint = f->order_hint,
+    .superres_denom = f->superres_denom,
+    .upscaled_width = f->upscaled_width,
+    .frame_width_minus_1 = f->frame_width - 1,
+    .frame_height_minus_1 = f->frame_height - 1,
+    .render_width_minus_1 = f->render_width - 1,
+    .render_height_minus_1 = f->render_height - 1,
+    .current_frame_id = f->current_frame_id,
+    .primary_ref_frame = f->primary_ref_frame,
+    .refresh_frame_flags = f->refresh_frame_flags,
+
+    .tile_info = (struct v4l2_av1_tile_info) {
+      .flags =
+        (f->tile_info.uniform_tile_spacing_flag ? V4L2_AV1_TILE_INFO_FLAG_UNIFORM_TILE_SPACING : 0),
+      .tile_size_bytes = f->tile_info.tile_size_bytes,
+      .context_update_tile_id = f->tile_info.context_update_tile_id,
+      .tile_cols = f->tile_info.tile_cols,
+      .tile_rows = f->tile_info.tile_rows,
+    },
+
+    .quantization = (struct v4l2_av1_quantization) {
+      .flags =
+        (q->diff_uv_delta ? V4L2_AV1_QUANTIZATION_FLAG_DIFF_UV_DELTA : 0) |
+        (q->using_qmatrix ? V4L2_AV1_QUANTIZATION_FLAG_USING_QMATRIX : 0) |
+        (q->delta_q_present ? V4L2_AV1_QUANTIZATION_FLAG_DELTA_Q_PRESENT : 0),
+
+      .base_q_idx = q->base_q_idx,
+      .delta_q_y_dc = q->delta_q_y_dc,
+      .delta_q_u_dc = q->delta_q_u_dc,
+      .delta_q_u_ac = q->delta_q_u_ac,
+      .delta_q_v_dc = q->delta_q_v_dc,
+      .delta_q_v_ac = q->delta_q_v_ac,
+      .qm_y = q->qm_y,
+      .qm_u = q->qm_u,
+      .qm_v = q->qm_v,
+      .delta_q_res = q->delta_q_res,
+    },
+
+    .segmentation = (struct v4l2_av1_segmentation)  {
+      .flags =
+        (seg->segmentation_enabled ? V4L2_AV1_SEGMENTATION_FLAG_ENABLED : 0) |
+        (seg->segmentation_update_map ? V4L2_AV1_SEGMENTATION_FLAG_UPDATE_MAP : 0) |
+        (seg->segmentation_temporal_update ? V4L2_AV1_SEGMENTATION_FLAG_TEMPORAL_UPDATE : 0) |
+        (seg->segmentation_update_data ? V4L2_AV1_SEGMENTATION_FLAG_UPDATE_DATA : 0) |
+        (seg->seg_id_pre_skip ? V4L2_AV1_SEGMENTATION_FLAG_SEG_ID_PRE_SKIP : 0),
+
+      .last_active_seg_id = seg->last_active_seg_id,
+    },
+
+    .loop_filter = (struct v4l2_av1_loop_filter) {
+      .flags =
+        (lf->loop_filter_delta_enabled ? V4L2_AV1_LOOP_FILTER_FLAG_DELTA_ENABLED : 0) |
+        (lf->loop_filter_delta_update ? V4L2_AV1_LOOP_FILTER_FLAG_DELTA_UPDATE : 0) |
+        (lf->delta_lf_present ? V4L2_AV1_LOOP_FILTER_FLAG_DELTA_LF_PRESENT : 0) |
+        (lf->delta_lf_multi ? V4L2_AV1_LOOP_FILTER_FLAG_DELTA_LF_MULTI : 0),
+
+        .sharpness = lf->loop_filter_sharpness,
+        .delta_lf_res = lf->delta_lf_res,
+    },
+
+    .cdef = (struct v4l2_av1_cdef) {
+      .damping_minus_3 = f->cdef_params.cdef_damping - 3, /* FIXME: is minus 3 really needed? */
+      .bits = f->cdef_params.cdef_bits,
+    },
+
+    .loop_restoration = (struct v4l2_av1_loop_restoration) {
+      .flags =
+        (lr->uses_lr ? V4L2_AV1_LOOP_RESTORATION_FLAG_USES_LR : 0) |
+        (lr->frame_restoration_type1 ? V4L2_AV1_LOOP_RESTORATION_FLAG_USES_CHROMA_LR : 0),
+      .lr_unit_shift = lr->lr_unit_shift,
+      .lr_uv_shift = lr->lr_uv_shift,
+    }
+  /* *INDENT-ON* */
+  };
+
+  switch (f->frame_type) {
+    case GST_AV1_KEY_FRAME:
+      self->v4l2_frame.frame_type = V4L2_AV1_KEY_FRAME;
+      break;
+    case GST_AV1_INTER_FRAME:
+      self->v4l2_frame.frame_type = V4L2_AV1_INTER_FRAME;
+      break;
+    case GST_AV1_INTRA_ONLY_FRAME:
+      self->v4l2_frame.frame_type = V4L2_AV1_INTRA_ONLY_FRAME;
+      break;
+    case GST_AV1_SWITCH_FRAME:
+      self->v4l2_frame.frame_type = V4L2_AV1_SWITCH_FRAME;
+      break;
+  }
+
+  switch (f->interpolation_filter) {
+    case GST_AV1_INTERPOLATION_FILTER_EIGHTTAP:
+      self->v4l2_frame.interpolation_filter =
+          V4L2_AV1_INTERPOLATION_FILTER_EIGHTTAP;
+      break;
+    case GST_AV1_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH:
+      self->v4l2_frame.interpolation_filter =
+          V4L2_AV1_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH;
+      break;
+    case GST_AV1_INTERPOLATION_FILTER_EIGHTTAP_SHARP:
+      self->v4l2_frame.interpolation_filter =
+          V4L2_AV1_INTERPOLATION_FILTER_EIGHTTAP_SHARP;
+      break;
+    case GST_AV1_INTERPOLATION_FILTER_BILINEAR:
+      self->v4l2_frame.interpolation_filter =
+          V4L2_AV1_INTERPOLATION_FILTER_BILINEAR;
+      break;
+    case GST_AV1_INTERPOLATION_FILTER_SWITCHABLE:
+      self->v4l2_frame.interpolation_filter =
+          V4L2_AV1_INTERPOLATION_FILTER_SWITCHABLE;
+      break;
+  }
+
+  switch (f->tx_mode) {
+    case GST_AV1_TX_MODE_ONLY_4x4:
+      self->v4l2_frame.tx_mode = V4L2_AV1_TX_MODE_ONLY_4X4;
+      break;
+    case GST_AV1_TX_MODE_LARGEST:
+      self->v4l2_frame.tx_mode = V4L2_AV1_TX_MODE_LARGEST;
+      break;
+    case GST_AV1_TX_MODE_SELECT:
+      self->v4l2_frame.tx_mode = V4L2_AV1_TX_MODE_SELECT;
+      break;
+  }
+
+  for (i = 0; i < V4L2_AV1_NUM_PLANES_MAX; i++)
+    switch (lr->frame_restoration_typei) {
+      case GST_AV1_FRAME_RESTORE_NONE:
+        self->v4l2_frame.loop_restoration.frame_restoration_typei =
+            V4L2_AV1_FRAME_RESTORE_NONE;
+        break;
+      case GST_AV1_FRAME_RESTORE_WIENER:
+        self->v4l2_frame.loop_restoration.frame_restoration_typei =
+            V4L2_AV1_FRAME_RESTORE_WIENER;
+        break;
+      case GST_AV1_FRAME_RESTORE_SGRPROJ:
+        self->v4l2_frame.loop_restoration.frame_restoration_typei =
+            V4L2_AV1_FRAME_RESTORE_SGRPROJ;
+        break;
+      case GST_AV1_FRAME_RESTORE_SWITCHABLE:
+        self->v4l2_frame.loop_restoration.frame_restoration_typei =
+            V4L2_AV1_FRAME_RESTORE_SWITCHABLE;
+        break;
+    }
+
+  gst_v4l2_codec_av1_fill_refs (self, f, reference_frames);
+  gst_v4l2_codec_av1_fill_tile_info (self, ti);
+  gst_v4l2_codec_av1_fill_segmentation (self, seg);
+  gst_v4l2_codec_av1_fill_loop_filter (self, lf);
+  gst_v4l2_codec_av1_fill_cdef (self, &f->cdef_params);
+  gst_v4l2_codec_av1_fill_loop_restoration (self, &f->loop_restoration_params);
+  gst_v4l2_codec_av1_fill_global_motion (self, &f->global_motion_params);
+
+  if (self->fill_film_grain)
+    gst_v4l2_codec_av1_fill_film_grain (self, &f->film_grain_params);
+
+  memcpy (self->v4l2_frame.buffer_removal_time, f->buffer_removal_time,
+      sizeof (self->v4l2_frame.buffer_removal_time));
+  memcpy (self->v4l2_frame.order_hints, f->order_hints,
+      sizeof (self->v4l2_frame.order_hints));
+  memcpy (self->v4l2_frame.skip_mode_frame, f->skip_mode_frame,
+      sizeof (self->v4l2_frame.skip_mode_frame));
+}
+
+static GstFlowReturn
+gst_v4l2_codec_av1_dec_new_sequence (GstAV1Decoder * decoder,
+    const GstAV1SequenceHeaderOBU * seq_hdr, gint max_dpb_size)
+{
+
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+
+  /* we'll use this as a hint to allow smaller resolution to be decoded
+   * without sending new caps, but some better signalling would be nice from
+   * the base class. */
+  self->operating_point_idc = seq_hdr->operating_points0.idc;
+
+  gst_v4l2_codec_av1_dec_fill_sequence_params (self, seq_hdr);
+  self->min_pool_size = max_dpb_size;
+  self->need_sequence = TRUE;
+
+  return GST_FLOW_OK;
+}
+
+static void
+gst_v4l2_codec_av1_dec_reset_picture (GstV4l2CodecAV1Dec * self)
+{
+  gst_v4l2_codec_av1_reset_bitstream (self);
+  g_array_set_size (self->tile_group_entries, 0);
+}
+
+static GstFlowReturn
+gst_v4l2_codec_av1_dec_new_picture (GstAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+  GstAV1FrameHeaderOBU *frame_hdr = &picture->frame_hdr;
+  struct v4l2_ctrl_av1_sequence *seq_hdr = &self->v4l2_sequence;
+  gboolean negotiation_needed = FALSE;
+  gint max_width;
+  gint max_height;
+
+  max_width = seq_hdr->max_frame_width_minus_1 + 1;
+  max_height = seq_hdr->max_frame_height_minus_1 + 1;
+
+  if (self->vinfo.finfo->format == GST_VIDEO_FORMAT_UNKNOWN)
+    negotiation_needed = TRUE;
+
+  /* FIXME the base class could signal this, but let's assume that when we
+   * have spatial layers, that smaller resolution will never be shown, and
+   * that the max size can be assumed to be render size. */
+  if ((self->operating_point_idc >> 8)) {
+    if (self->frame_width != max_width || self->frame_height != max_height) {
+      self->frame_width = self->render_width = max_width;
+      self->frame_height = self->render_height = max_height;
+
+      negotiation_needed = TRUE;
+
+      GST_INFO_OBJECT (self, "max {width|height} changed to %dx%d",
+          self->frame_width, self->frame_height);
+    }
+
+    if (self->frame_height < frame_hdr->frame_height || self->frame_width <
+        frame_hdr->upscaled_width) {
+      GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
+          ("SVC AV1 frame is larger then sequence max size."),
+          ("Frame have size %dx%d but the max size is %dx%d",
+              frame_hdr->upscaled_width, frame_hdr->frame_height,
+              max_width, max_height));
+      return GST_FLOW_ERROR;
+    }
+  } else if (self->frame_width != frame_hdr->upscaled_width ||
+      self->frame_height != frame_hdr->frame_height ||
+      self->render_width != frame_hdr->render_width ||
+      self->render_height != frame_hdr->render_height) {
+
+    self->frame_width = frame_hdr->upscaled_width;
+    self->frame_height = frame_hdr->frame_height;
+    self->render_width = frame_hdr->render_width;
+    self->render_height = frame_hdr->render_height;
+
+    negotiation_needed = TRUE;
+
+    GST_INFO_OBJECT (self, "frame {width|height} changed to %dx%d",
+        self->frame_width, self->frame_height);
+    GST_INFO_OBJECT (self, "render {width|height} changed to %dx%d",
+        self->render_width, self->render_height);
+  }
+
+  if (self->bit_depth != seq_hdr->bit_depth) {
+    GST_DEBUG_OBJECT (self, "bit-depth changed from %d to %d", self->bit_depth,
+        seq_hdr->bit_depth);
+    self->bit_depth = seq_hdr->bit_depth;
+    negotiation_needed = TRUE;
+  }
+
+  if (self->profile != GST_AV1_PROFILE_UNDEFINED &&
+      seq_hdr->seq_profile != self->profile) {
+    GST_DEBUG_OBJECT (self, "profile changed from %d to %d", self->profile,
+        seq_hdr->seq_profile);
+    self->profile = seq_hdr->seq_profile;
+    negotiation_needed = TRUE;
+  }
+
+  if (seq_hdr->bit_depth != self->bit_depth) {
+    GST_DEBUG_OBJECT (self, "bit-depth changed from %d to %d",
+        self->bit_depth, seq_hdr->bit_depth);
+    self->bit_depth = seq_hdr->bit_depth;
+    negotiation_needed = TRUE;
+  }
+
+  if (negotiation_needed) {
+    if (frame_hdr->frame_type != GST_AV1_KEY_FRAME) {
+      GST_ERROR_OBJECT (self,
+          "Inter-frame resolution changes are not yet supported in v4l2");
+      return GST_FLOW_ERROR;
+    }
+
+    gst_v4l2_codec_av1_dec_streamoff (self);
+    if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (self))) {
+      GST_ERROR_OBJECT (self, "Failed to negotiate with downstream");
+      return GST_FLOW_ERROR;
+    }
+
+    /* Check if we can zero-copy buffers */
+    if (!self->has_videometa) {
+      GstVideoInfo ref_vinfo;
+      gint i;
+
+      gst_video_info_set_format (&ref_vinfo,
+          GST_VIDEO_INFO_FORMAT (&self->vinfo),
+          self->render_width, self->render_height);
+
+      for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&self->vinfo); i++) {
+        if (self->vinfo.stridei != ref_vinfo.stridei ||
+            self->vinfo.offseti != ref_vinfo.offseti) {
+          GST_WARNING_OBJECT (self,
+              "GstVideoMeta support required, copying frames.");
+          self->copy_frames = TRUE;
+          break;
+        }
+      }
+    } else {
+      self->copy_frames = FALSE;
+    }
+  }
+
+  /*
+   * if for any reason the base class has dropped the frame midway through
+   * decoding, then make sure we start off with a clean slate and that the
+   * GstMemory is unmapped.
+   */
+  gst_v4l2_codec_av1_dec_reset_picture (self);
+  return gst_v4l2_codec_av1_dec_ensure_bitstream (self);
+}
+
+static GstAV1Picture *
+gst_v4l2_codec_av1_dec_duplicate_picture (GstAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+{
+  GstAV1Picture *new_picture;
+
+  GST_DEBUG_OBJECT (decoder, "Duplicate picture %u",
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture));
+
+  new_picture = gst_av1_picture_new ();
+  new_picture->frame_hdr = picture->frame_hdr;
+  GST_CODEC_PICTURE_COPY_FRAME_NUMBER (new_picture, picture);
+
+  if (GST_MINI_OBJECT_FLAG_IS_SET (picture, FLAG_PICTURE_HOLDS_BUFFER)) {
+    GstBuffer *output_buffer = gst_av1_picture_get_user_data (picture);
+    if (output_buffer) {
+      frame->output_buffer = gst_buffer_ref (output_buffer);
+      gst_av1_picture_set_user_data (new_picture,
+          gst_buffer_ref (frame->output_buffer),
+          (GDestroyNotify) gst_buffer_unref);
+    }
+
+    GST_MINI_OBJECT_FLAG_SET (new_picture, FLAG_PICTURE_HOLDS_BUFFER);
+  } else {
+    GstV4l2Request *request = gst_av1_picture_get_user_data (picture);
+    gst_av1_picture_set_user_data (new_picture, gst_v4l2_request_ref (request),
+        (GDestroyNotify) gst_v4l2_request_unref);
+    frame->output_buffer = gst_v4l2_request_dup_pic_buf (request);
+  }
+
+  return new_picture;
+}
+
+static GstFlowReturn
+gst_v4l2_codec_av1_dec_start_picture (GstAV1Decoder * decoder,
+    GstAV1Picture * picture, GstAV1Dpb * dpb)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+
+  gst_v4l2_codec_av1_dec_fill_frame_hdr (self, picture, dpb);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+_copy_into_bitstream_buffer (GstV4l2CodecAV1Dec * self, guint8 * src, gsize len)
+{
+  guint8 *bitstream_ptr = self->bitstream_map.data + self->bitstream_map.size;
+
+  if (self->bitstream_map.size + len > self->bitstream_map.maxsize) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NO_SPACE_LEFT,
+        ("Not enough space left on the bitstream buffer."), (NULL));
+    gst_v4l2_codec_av1_dec_reset_picture (self);
+    return GST_FLOW_ERROR;
+  }
+
+  memcpy (bitstream_ptr, src, len);
+  self->bitstream_map.size += len;
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_v4l2_codec_av1_dec_decode_tile (GstAV1Decoder * decoder,
+    GstAV1Picture * picture, GstAV1Tile * tile)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+  GstAV1TileGroupOBU *tile_group = &tile->tile_group;
+  struct v4l2_ctrl_av1_tile_group_entry v4l2_tile_group_entry;
+  guint32 obu_offset = self->bitstream_map.size;
+  gint i;
+
+  for (i = tile_group->tg_start; i <= tile_group->tg_end; i++) {
+    v4l2_tile_group_entry = (struct v4l2_ctrl_av1_tile_group_entry) {
+      .tile_offset = tile_group->entryi.tile_offset + obu_offset,
+      .tile_size = tile_group->entryi.tile_size,
+      .tile_row = tile_group->entryi.tile_row,
+      .tile_col = tile_group->entryi.tile_col,
+    };
+
+    GST_DEBUG_OBJECT (self,
+        "Decoded tile group entry %d of size %d at offset %d, rows: %d, cols %d",
+        self->tile_group_entries->len, v4l2_tile_group_entry.tile_size,
+        v4l2_tile_group_entry.tile_offset, v4l2_tile_group_entry.tile_row,
+        v4l2_tile_group_entry.tile_col);
+
+    g_array_append_val (self->tile_group_entries, v4l2_tile_group_entry);
+  }
+
+  return _copy_into_bitstream_buffer (self, tile->obu.data, tile->obu.obu_size);
+}
+
+static GstFlowReturn
+gst_v4l2_codec_av1_dec_end_picture (GstAV1Decoder * decoder,
+    GstAV1Picture * picture)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+  GstVideoCodecFrame *frame;
+  GstV4l2Request *request;
+  GstFlowReturn flow_ret;
+  guint count = 1;
+  gsize bytesused;
+
+  struct v4l2_ctrl_av1_tile_group_entry tge = { };
+
+  /* *INDENT-OFF* */
+  struct v4l2_ext_control decode_params_control = {
+    {
+      .id = V4L2_CID_STATELESS_AV1_FRAME,
+      .ptr = &self->v4l2_frame,
+      .size = sizeof(self->v4l2_frame),
+    },
+    {}, /* tile groups */
+    {}, /* tile group entries */
+    {}, /* sequence */
+    {}, /* film grain */
+  };
+  /* *INDENT-ON* */
+
+  if (self->tile_group_entries->len > 0) {
+    decode_params_controlcount++ = (struct v4l2_ext_control) {
+      .id = V4L2_CID_STATELESS_AV1_TILE_GROUP_ENTRY,
+      .ptr = self->tile_group_entries->data,
+      .size =
+          g_array_get_element_size (self->tile_group_entries) *
+          self->tile_group_entries->len,
+    };
+  } else {
+    decode_params_controlcount++ = (struct v4l2_ext_control) {
+      .id = V4L2_CID_STATELESS_AV1_TILE_GROUP_ENTRY,
+      .ptr = &tge,
+      .size = sizeof (tge),
+    };
+  }
+
+  if (self->need_sequence) {
+    decode_params_controlcount++ = (struct v4l2_ext_control) {
+      .id = V4L2_CID_STATELESS_AV1_SEQUENCE,
+      .ptr = &self->v4l2_sequence,
+      .size = sizeof (self->v4l2_sequence),
+    };
+
+    self->need_sequence = FALSE;
+  }
+
+
+  if (self->fill_film_grain) {
+    decode_params_controlcount++ = (struct v4l2_ext_control) {
+      .id = V4L2_CID_STATELESS_AV1_FILM_GRAIN,
+      .ptr = &self->v4l2_film_grain,
+      .size = sizeof (self->v4l2_film_grain),
+    };
+  }
+
+  bytesused = self->bitstream_map.size;
+  gst_memory_unmap (self->bitstream, &self->bitstream_map);
+  self->bitstream_map = (GstMapInfo) GST_MAP_INFO_INIT;
+  gst_memory_resize (self->bitstream, 0, bytesused);
+
+  frame = gst_video_decoder_get_frame (GST_VIDEO_DECODER (self),
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture));
+  g_return_val_if_fail (frame, FALSE);
+
+  flow_ret = gst_buffer_pool_acquire_buffer (GST_BUFFER_POOL (self->src_pool),
+      &frame->output_buffer, NULL);
+  if (flow_ret != GST_FLOW_OK) {
+    if (flow_ret == GST_FLOW_FLUSHING)
+      GST_DEBUG_OBJECT (self, "Frame decoding aborted, we are flushing.");
+    else
+      GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+          ("No more picture buffer available."), (NULL));
+    goto fail;
+  }
+
+  request = gst_v4l2_decoder_alloc_request (self->decoder,
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture), self->bitstream,
+      frame->output_buffer);
+
+  gst_video_codec_frame_unref (frame);
+
+  if (!request) {
+    GST_ELEMENT_ERROR (self, RESOURCE, NO_SPACE_LEFT,
+        ("Failed to allocate a media request object."), (NULL));
+    goto fail;
+  }
+
+  if (!gst_v4l2_decoder_set_controls (self->decoder, request,
+          decode_params_control, count)) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Driver did not accept the bitstream parameters."), (NULL));
+    goto fail;
+  }
+
+  if (!gst_v4l2_request_queue (request, 0)) {
+    GST_ELEMENT_ERROR (self, RESOURCE, WRITE,
+        ("Driver did not accept the decode request."), (NULL));
+    goto fail;
+  }
+
+  gst_av1_picture_set_user_data (picture, request,
+      (GDestroyNotify) gst_v4l2_request_unref);
+  gst_v4l2_codec_av1_dec_reset_picture (self);
+  return GST_FLOW_OK;
+
+fail:
+  gst_v4l2_codec_av1_dec_reset_picture (self);
+  return GST_FLOW_ERROR;
+}
+
+static gboolean
+gst_v4l2_codec_av1_dec_copy_output_buffer (GstV4l2CodecAV1Dec * self,
+    GstVideoCodecFrame * codec_frame)
+{
+  GstVideoFrame src_frame;
+  GstVideoFrame dest_frame;
+  GstVideoInfo dest_vinfo;
+  GstBuffer *buffer;
+
+  gst_video_info_set_format (&dest_vinfo, GST_VIDEO_INFO_FORMAT (&self->vinfo),
+      self->render_width, self->render_height);
+
+  buffer = gst_video_decoder_allocate_output_buffer (GST_VIDEO_DECODER (self));
+  if (!buffer)
+    goto fail;
+
+  if (!gst_video_frame_map (&src_frame, &self->vinfo,
+          codec_frame->output_buffer, GST_MAP_READ))
+    goto fail;
+
+  if (!gst_video_frame_map (&dest_frame, &dest_vinfo, buffer, GST_MAP_WRITE)) {
+    gst_video_frame_unmap (&dest_frame);
+    goto fail;
+  }
+
+  /* gst_video_frame_copy can crop this, but does not know, so let make it
+   * think it's all right */
+  GST_VIDEO_INFO_WIDTH (&src_frame.info) = self->render_width;
+  GST_VIDEO_INFO_HEIGHT (&src_frame.info) = self->render_height;
+
+  if (!gst_video_frame_copy (&dest_frame, &src_frame)) {
+    gst_video_frame_unmap (&src_frame);
+    gst_video_frame_unmap (&dest_frame);
+    goto fail;
+  }
+
+  gst_video_frame_unmap (&src_frame);
+  gst_video_frame_unmap (&dest_frame);
+  gst_buffer_replace (&codec_frame->output_buffer, buffer);
+  gst_buffer_unref (buffer);
+
+  return TRUE;
+
+fail:
+  GST_ERROR_OBJECT (self, "Failed copy output buffer.");
+  return FALSE;
+}
+
+static GstFlowReturn
+gst_v4l2_codec_av1_dec_output_picture (GstAV1Decoder * decoder,
+    GstVideoCodecFrame * frame, GstAV1Picture * picture)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (decoder);
+  GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
+  GstV4l2Request *request = NULL;
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
+  gint ret;
+
+  if (codec_picture->discont_state) {
+    if (!gst_video_decoder_negotiate (vdec)) {
+      GST_ERROR_OBJECT (vdec, "Could not re-negotiate with updated state");
+      return FALSE;
+    }
+  }
+
+  GST_DEBUG_OBJECT (self, "Output picture %u",
+      codec_picture->system_frame_number);
+
+  if (!GST_MINI_OBJECT_FLAG_IS_SET (picture, FLAG_PICTURE_HOLDS_BUFFER))
+    request = gst_av1_picture_get_user_data (picture);
+
+  if (request) {
+    ret = gst_v4l2_request_set_done (request);
+    if (ret == 0) {
+      GST_ELEMENT_ERROR (self, STREAM, DECODE,
+          ("Decoding frame took too long"), (NULL));
+      goto error;
+    } else if (ret < 0) {
+      GST_ELEMENT_ERROR (self, STREAM, DECODE,
+          ("Decoding request failed: %s", g_strerror (errno)), (NULL));
+      goto error;
+    }
+
+    if (gst_v4l2_request_failed (request)) {
+      GST_ELEMENT_ERROR (self, STREAM, DECODE,
+          ("Failed to decode frame %u", codec_picture->system_frame_number),
+          (NULL));
+      goto error;
+    }
+
+    /* Hold on reference buffers for the rest of the picture lifetime */
+    gst_av1_picture_set_user_data (picture,
+        gst_buffer_ref (frame->output_buffer),
+        (GDestroyNotify) gst_buffer_unref);
+
+    GST_MINI_OBJECT_FLAG_SET (picture, FLAG_PICTURE_HOLDS_BUFFER);
+  }
+
+  /* This may happen if we duplicate a picture witch failed to decode */
+  if (!frame->output_buffer) {
+    GST_ELEMENT_ERROR (self, STREAM, DECODE,
+        ("Failed to decode frame %u", codec_picture->system_frame_number),
+        (NULL));
+    goto error;
+  }
+
+  if (self->copy_frames)
+    gst_v4l2_codec_av1_dec_copy_output_buffer (self, frame);
+
+  gst_av1_picture_unref (picture);
+
+  return gst_video_decoder_finish_frame (vdec, frame);
+
+error:
+  gst_video_decoder_drop_frame (vdec, frame);
+  gst_av1_picture_unref (picture);
+
+  return GST_FLOW_ERROR;
+}
+
+static void
+gst_v4l2_codec_av1_dec_dispose (GObject * object)
+{
+  GstV4l2CodecAV1Dec *self = GST_V4L2_CODEC_AV1_DEC (object);
+
+  g_clear_object (&self->decoder);
+  g_clear_pointer (&self->tile_group_entries, g_array_unref);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+gst_v4l2_codec_av1_dec_subclass_init (GstV4l2CodecAV1DecClass * klass,
+    GstV4l2CodecDevice * device)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstVideoDecoderClass *decoder_class = GST_VIDEO_DECODER_CLASS (klass);
+  GstAV1DecoderClass *av1decoder_class = GST_AV1_DECODER_CLASS (klass);
+
+  gobject_class->set_property = gst_v4l2_codec_av1_dec_set_property;
+  gobject_class->get_property = gst_v4l2_codec_av1_dec_get_property;
+  gobject_class->dispose = gst_v4l2_codec_av1_dec_dispose;
+
+  gst_element_class_set_static_metadata (element_class,
+      "V4L2 Stateless AV1 Video Decoder",
+      "Codec/Decoder/Video/Hardware",
+      "A V4L2 based AV1 video decoder",
+      "Daniel Almeida <daniel.almeida@collabora.com>");
+
+  gst_element_class_add_static_pad_template (element_class, &sink_template);
+  gst_element_class_add_static_pad_template (element_class, &src_template);
+
+  element_class->change_state =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_change_state);
+
+  decoder_class->open = GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_open);
+  decoder_class->close = GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_close);
+  decoder_class->stop = GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_stop);
+  decoder_class->negotiate =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_negotiate);
+  decoder_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_decide_allocation);
+  decoder_class->flush = GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_flush);
+  decoder_class->sink_event =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_sink_event);
+
+  av1decoder_class->new_sequence =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_new_sequence);
+  av1decoder_class->new_picture =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_new_picture);
+  av1decoder_class->start_picture =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_start_picture);
+  av1decoder_class->decode_tile =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_decode_tile);
+  av1decoder_class->end_picture =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_end_picture);
+  av1decoder_class->output_picture =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_output_picture);
+  av1decoder_class->duplicate_picture =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_duplicate_picture);
+  av1decoder_class->get_preferred_output_delay =
+      GST_DEBUG_FUNCPTR (gst_v4l2_codec_av1_dec_get_preferred_output_delay);
+
+  klass->device = device;
+  gst_v4l2_decoder_install_properties (gobject_class, PROP_LAST, device);
+}
+
+static void
+gst_v4l2_codec_av1_dec_subinit (GstV4l2CodecAV1Dec * self,
+    GstV4l2CodecAV1DecClass * klass)
+{
+  self->decoder = gst_v4l2_decoder_new (klass->device);
+  gst_video_info_init (&self->vinfo);
+  gst_video_info_dma_drm_init (&self->vinfo_drm);
+  self->tile_group_entries =
+      g_array_new (FALSE, TRUE, sizeof (struct v4l2_ctrl_av1_tile_group_entry));
+}
+
+static void
+gst_v4l2_codec_av1_dec_class_init (GstV4l2CodecAV1DecClass * klass)
+{
+}
+
+static void
+gst_v4l2_codec_av1_dec_init (GstV4l2CodecAV1Dec * self)
+{
+}
+
+void
+gst_v4l2_codec_av1_dec_register (GstPlugin * plugin, GstV4l2Decoder * decoder,
+    GstV4l2CodecDevice * device, guint rank)
+{
+  GstCaps *src_caps;
+
+  GST_DEBUG_CATEGORY_INIT (v4l2_av1dec_debug, "v4l2codecs-av1dec", 0,
+      "V4L2 stateless AV1 decoder");
+
+  if (!gst_v4l2_decoder_set_sink_fmt (decoder, V4L2_PIX_FMT_AV1_FRAME,
+          320, 240, 8))
+    return;
+
+  src_caps = gst_v4l2_decoder_enum_src_formats (decoder, &static_src_caps);
+
+  if (gst_caps_is_empty (src_caps)) {
+    GST_WARNING ("Not registering AV1 decoder since it produces no "
+        "supported format");
+    goto done;
+  }
+
+  /* TODO uncomment this when AV1 get included in Linus tree */
+#if 0
+  version = gst_v4l2_decoder_get_version (decoder);
+  if (version < V4L2_MIN_KERNEL_VERSION)
+    GST_WARNING ("V4L2 API v%u.%u too old, at least v%u.%u required",
+        (version >> 16) & 0xff, (version >> 8) & 0xff,
+        V4L2_MIN_KERNEL_VER_MAJOR, V4L2_MIN_KERNEL_VER_MINOR);
+#endif
+
+  if (!gst_v4l2_decoder_av1_api_check (decoder)) {
+    GST_WARNING ("Not registering AV1 decoder as it failed ABI check.");
+    goto done;
+  }
+
+  gst_v4l2_decoder_register (plugin, GST_TYPE_V4L2_CODEC_AV1_DEC,
+      (GClassInitFunc) gst_v4l2_codec_av1_dec_subclass_init,
+      gst_mini_object_ref (GST_MINI_OBJECT (device)),
+      (GInstanceInitFunc) gst_v4l2_codec_av1_dec_subinit,
+      "v4l2sl%sav1dec", device, rank, NULL);
+
+done:
+  gst_caps_unref (src_caps);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2codecav1dec.h Added

@@ -0,0 +1,54 @@
+/* GStreamer
+ * Copyright (C) 2020 Daniel Almeida <daniel.almeida@collabora.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_V4L2_CODEC_AV1_DEC_H__
+#define __GST_V4L2_CODEC_AV1_DEC_H__
+
+#define GST_USE_UNSTABLE_API
+#include <gst/codecs/gstav1decoder.h>
+
+#include "gstv4l2decoder.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_V4L2_CODEC_AV1_DEC           (gst_v4l2_codec_av1_dec_get_type())
+#define GST_V4L2_CODEC_AV1_DEC(obj)           (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_V4L2_CODEC_AV1_DEC,GstV4l2CodecAV1Dec))
+#define GST_V4L2_CODEC_AV1_DEC_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_V4L2_CODEC_AV1_DEC,GstV4l2CodecAV1DecClass))
+#define GST_V4L2_CODEC_AV1_DEC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_V4L2_CODEC_AV1_DEC, GstV4l2CodecAV1DecClass))
+#define GST_IS_V4L2_CODEC_AV1_DEC(obj)        (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_V4L2_CODEC_AV1_DEC))
+#define GST_IS_V4L2_CODEC_AV1_DEC_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_V4L2_CODEC_AV1_DEC))
+
+typedef struct _GstV4l2CodecAV1Dec GstV4l2CodecAV1Dec;
+typedef struct _GstV4l2CodecAV1DecClass GstV4l2CodecAV1DecClass;
+
+struct _GstV4l2CodecAV1DecClass
+{
+  GstAV1DecoderClass parent_class;
+  GstV4l2CodecDevice *device;
+};
+
+GType gst_v4l2_codec_av1_dec_get_type (void);
+void  gst_v4l2_codec_av1_dec_register (GstPlugin * plugin,
+                                       GstV4l2Decoder * decoder,
+                                       GstV4l2CodecDevice * device,
+                                       guint rank);
+
+G_END_DECLS
+
+#endif /* __GST_D3D11_AV1_DEC_H__ */

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/gstv4l2codech264dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2codech264dec.c Changed

@@ -50,10 +50,20 @@
         "alignment=(string) au")
     );
 
+#define SRC_CAPS \
+    GST_VIDEO_DMA_DRM_CAPS_MAKE " ; " \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+#define SRC_CAPS_NO_DRM \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+static GstStaticCaps static_src_caps = GST_STATIC_CAPS (SRC_CAPS);
+static GstStaticCaps static_src_caps_no_drm = GST_STATIC_CAPS (SRC_CAPS_NO_DRM);
+
 static GstStaticPadTemplate src_template =
 GST_STATIC_PAD_TEMPLATE (GST_VIDEO_DECODER_SRC_NAME,
     GST_PAD_SRC, GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)));
+    GST_STATIC_CAPS (SRC_CAPS));
 
 struct _GstV4l2CodecH264Dec
 {
@@ -61,6 +71,7 @@
   GstV4l2Decoder *decoder;
   GstVideoCodecState *output_state;
   GstVideoInfo vinfo;
+  GstVideoInfoDmaDrm vinfo_drm;
   gint display_width;
   gint display_height;
   gint coded_width;
@@ -319,7 +330,8 @@
     },
   };
   /* *INDENT-ON* */
-  GstCaps *filter, *caps;
+  GstCaps *peer_caps, *filter, *caps;
+  GstStaticCaps *static_filter;
 
   /* Ignore downstream renegotiation request. */
   if (self->streaming)
@@ -345,7 +357,13 @@
     return FALSE;
   }
 
-  filter = gst_v4l2_decoder_enum_src_formats (self->decoder);
+  /* If the peer has ANY caps only advertise system memory caps */
+  peer_caps = gst_pad_peer_query_caps (decoder->srcpad, NULL);
+  static_filter =
+      gst_caps_is_any (peer_caps) ? &static_src_caps_no_drm : &static_src_caps;
+  gst_caps_unref (peer_caps);
+
+  filter = gst_v4l2_decoder_enum_src_formats (self->decoder, static_filter);
   if (!filter) {
     GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
         ("No supported decoder output formats"), (NULL));
@@ -357,7 +375,8 @@
   gst_caps_unref (filter);
   GST_DEBUG_OBJECT (self, "Peer supported formats: %" GST_PTR_FORMAT, caps);
 
-  if (!gst_v4l2_decoder_select_src_format (self->decoder, caps, &self->vinfo)) {
+  if (!gst_v4l2_decoder_select_src_format (self->decoder, caps, &self->vinfo,
+          &self->vinfo_drm)) {
     GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
         ("Unsupported bitdepth/chroma format"),
         ("No support for %ux%u %ubit chroma IDC %i", self->coded_width,
@@ -367,20 +386,18 @@
   }
   gst_caps_unref (caps);
 
+done:
   if (self->output_state)
     gst_video_codec_state_unref (self->output_state);
 
-done:
   self->output_state =
-      gst_video_decoder_set_output_state (GST_VIDEO_DECODER (self),
-      self->vinfo.finfo->format, self->display_width,
-      self->display_height, h264dec->input_state);
+      gst_v4l2_decoder_set_output_state (GST_VIDEO_DECODER (self), &self->vinfo,
+      &self->vinfo_drm, self->display_width, self->display_height,
+      h264dec->input_state);
 
   if (self->interlaced)
     self->output_state->info.interlace_mode = GST_VIDEO_INTERLACE_MODE_MIXED;
 
-  self->output_state->caps = gst_video_info_to_caps (&self->output_state->info);
-
   if (GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder)) {
     if (self->streaming)
       return TRUE;
@@ -412,18 +429,31 @@
     GstQuery * query)
 {
   GstV4l2CodecH264Dec *self = GST_V4L2_CODEC_H264_DEC (decoder);
+  GstCaps *caps = NULL;
   guint min = 0, num_bitstream;
 
   /* If we are streaming here, then it means there is nothing allocation
    * related in the new state and allocation can be ignored */
   if (self->streaming)
-    return TRUE;
+    goto no_internal_changes;
+
+  g_clear_object (&self->src_pool);
+  g_clear_object (&self->src_allocator);
 
   self->has_videometa = gst_query_find_allocation_meta (query,
       GST_VIDEO_META_API_TYPE, NULL);
 
-  g_clear_object (&self->src_pool);
-  g_clear_object (&self->src_allocator);
+  gst_query_parse_allocation (query, &caps, NULL);
+  if (!caps) {
+    GST_ERROR_OBJECT (self, "No valid caps");
+    return FALSE;
+  }
+
+  if (gst_video_is_dma_drm_caps (caps) && !self->has_videometa) {
+    GST_ERROR_OBJECT (self,
+        "DMABuf caps negotiated without the mandatory support of VideoMeta");
+    return FALSE;
+  }
 
   if (gst_query_get_n_allocation_pools (query) > 0)
     gst_query_parse_nth_allocation_pool (query, 0, NULL, NULL, &min, NULL);
@@ -452,6 +482,7 @@
 
   self->src_pool = gst_v4l2_codec_pool_new (self->src_allocator, &self->vinfo);
 
+no_internal_changes:
   /* Our buffer pool is internal, we will let the base class create a video
    * pool, and use it if we are running out of buffers or if downstream does
    * not support GstVideoMeta */
@@ -627,7 +658,7 @@
        * The reference is multiplied by 1000 because it's was set as micro
        * seconds and this TS is nanosecond.
        */
-      .reference_ts = (guint64) ref_pic->system_frame_number * 1000,
+      .reference_ts = GST_CODEC_PICTURE_TS_NS (ref_pic),
       .frame_num = frame_num,
       .pic_num = pic_num,
       .flags = V4L2_H264_DPB_ENTRY_FLAG_VALID
@@ -778,7 +809,7 @@
   if (ref_pic->second_field && ref_pic->other_field)
     ref_pic = ref_pic->other_field;
 
-  ref_ts = (guint64) ref_pic->system_frame_number * 1000;
+  ref_ts = (guint64) GST_CODEC_PICTURE_FRAME_NUMBER (ref_pic) * 1000;
   for (i = 0; i < 16; i++) {
     if (dpbi.flags & V4L2_H264_DPB_ENTRY_FLAG_ACTIVE
         && dpbi.reference_ts == ref_ts)
@@ -1055,21 +1086,23 @@
   GstV4l2CodecH264Dec *self = GST_V4L2_CODEC_H264_DEC (decoder);
   GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
   GstV4l2Request *request = gst_h264_picture_get_user_data (picture);
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
   gint ret;
 
-  if (picture->discont_state) {
+  if (codec_picture->discont_state) {
     if (!gst_video_decoder_negotiate (vdec)) {
       GST_ERROR_OBJECT (vdec, "Could not re-negotiate with updated state");
       return FALSE;
     }
   }
 
-  GST_DEBUG_OBJECT (self, "Output picture %u", picture->system_frame_number);
+  GST_DEBUG_OBJECT (self, "Output picture %u",
+      codec_picture->system_frame_number);
 
   ret = gst_v4l2_request_set_done (request);
   if (ret == 0) {
     GST_ELEMENT_ERROR (self, STREAM, DECODE,
-        ("Decoding frame %u took too long", picture->system_frame_number),
+        ("Decoding frame %u took too long", codec_picture->system_frame_number),
         (NULL));
     goto error;
   } else if (ret < 0) {
@@ -1081,7 +1114,8 @@
 
   if (gst_v4l2_request_failed (request)) {
     GST_ELEMENT_ERROR (self, STREAM, DECODE,
-        ("Failed to decode frame %u", picture->system_frame_number), (NULL));
+        ("Failed to decode frame %u", codec_picture->system_frame_number),
+        (NULL));
     goto error;
   }
 
@@ -1174,16 +1208,17 @@
         self->bitstream);
   } else {
     GstVideoCodecFrame *frame;
+    guint32 system_frame_number = GST_CODEC_PICTURE_FRAME_NUMBER (picture);
 
     frame = gst_video_decoder_get_frame (GST_VIDEO_DECODER (self),
-        picture->system_frame_number);
+        system_frame_number);
     g_return_val_if_fail (frame, FALSE);
 
     if (!gst_v4l2_codec_h264_dec_ensure_output_buffer (self, frame))
       goto done;
 
     request = gst_v4l2_decoder_alloc_request (self->decoder,
-        picture->system_frame_number, self->bitstream, frame->output_buffer);
+        system_frame_number, self->bitstream, frame->output_buffer);
 
     gst_video_codec_frame_unref (frame);
   }
@@ -1477,6 +1512,7 @@
 {
   self->decoder = gst_v4l2_decoder_new (klass->device);
   gst_video_info_init (&self->vinfo);
+  gst_video_info_dma_drm_init (&self->vinfo_drm);
   self->slice_params = g_array_sized_new (FALSE, TRUE,
       sizeof (struct v4l2_ctrl_h264_slice_params), 4);
   g_array_set_size (self->slice_params, 4);
@@ -1565,7 +1601,7 @@
   if (!gst_v4l2_decoder_set_sink_fmt (decoder, V4L2_PIX_FMT_H264_SLICE,
           320, 240, 8))
     return;
-  src_caps = gst_v4l2_decoder_enum_src_formats (decoder);
+  src_caps = gst_v4l2_decoder_enum_src_formats (decoder, &static_src_caps);
 
   if (gst_caps_is_empty (src_caps)) {
     GST_WARNING ("Not registering H264 decoder since it produces no "

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/gstv4l2codech265dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2codech265dec.c Changed

@@ -51,10 +51,20 @@
         "alignment=(string) au")
     );
 
+#define SRC_CAPS \
+    GST_VIDEO_DMA_DRM_CAPS_MAKE " ; " \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+#define SRC_CAPS_NO_DRM \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+static GstStaticCaps static_src_caps = GST_STATIC_CAPS (SRC_CAPS);
+static GstStaticCaps static_src_caps_no_drm = GST_STATIC_CAPS (SRC_CAPS_NO_DRM);
+
 static GstStaticPadTemplate src_template =
 GST_STATIC_PAD_TEMPLATE (GST_VIDEO_DECODER_SRC_NAME,
     GST_PAD_SRC, GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)));
+    GST_STATIC_CAPS (SRC_CAPS));
 
 struct _GstV4l2CodecH265Dec
 {
@@ -62,6 +72,7 @@
   GstV4l2Decoder *decoder;
   GstVideoCodecState *output_state;
   GstVideoInfo vinfo;
+  GstVideoInfoDmaDrm vinfo_drm;
   gint display_width;
   gint display_height;
   gint coded_width;
@@ -353,7 +364,8 @@
     },
   };
   /* *INDENT-ON* */
-  GstCaps *filter, *caps;
+  GstCaps *peer_caps, *filter, *caps;
+  GstStaticCaps *static_filter;
 
   /* Ignore downstream renegotiation request. */
   if (self->streaming)
@@ -379,7 +391,13 @@
     return FALSE;
   }
 
-  filter = gst_v4l2_decoder_enum_src_formats (self->decoder);
+  /* If the peer has ANY caps only advertise system memory caps */
+  peer_caps = gst_pad_peer_query_caps (decoder->srcpad, NULL);
+  static_filter =
+      gst_caps_is_any (peer_caps) ? &static_src_caps_no_drm : &static_src_caps;
+  gst_caps_unref (peer_caps);
+
+  filter = gst_v4l2_decoder_enum_src_formats (self->decoder, static_filter);
   if (!filter) {
     GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
         ("No supported decoder output formats"), (NULL));
@@ -391,7 +409,8 @@
   gst_caps_unref (filter);
   GST_DEBUG_OBJECT (self, "Peer supported formats: %" GST_PTR_FORMAT, caps);
 
-  if (!gst_v4l2_decoder_select_src_format (self->decoder, caps, &self->vinfo)) {
+  if (!gst_v4l2_decoder_select_src_format (self->decoder, caps, &self->vinfo,
+          &self->vinfo_drm)) {
     GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
         ("Unsupported bitdepth/chroma format"),
         ("No support for %ux%u %ubit chroma IDC %i", self->coded_width,
@@ -406,11 +425,9 @@
     gst_video_codec_state_unref (self->output_state);
 
   self->output_state =
-      gst_video_decoder_set_output_state (GST_VIDEO_DECODER (self),
-      self->vinfo.finfo->format, self->display_width,
-      self->display_height, h265dec->input_state);
-
-  self->output_state->caps = gst_video_info_to_caps (&self->output_state->info);
+      gst_v4l2_decoder_set_output_state (GST_VIDEO_DECODER (self), &self->vinfo,
+      &self->vinfo_drm, self->display_width, self->display_height,
+      h265dec->input_state);
 
   if (GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder)) {
     if (self->streaming)
@@ -443,16 +460,29 @@
     GstQuery * query)
 {
   GstV4l2CodecH265Dec *self = GST_V4L2_CODEC_H265_DEC (decoder);
+  GstCaps *caps = NULL;
   guint min = 0;
 
   if (self->streaming)
-    return TRUE;
+    goto no_internal_changes;
+
+  g_clear_object (&self->src_pool);
+  g_clear_object (&self->src_allocator);
 
   self->has_videometa = gst_query_find_allocation_meta (query,
       GST_VIDEO_META_API_TYPE, NULL);
 
-  g_clear_object (&self->src_pool);
-  g_clear_object (&self->src_allocator);
+  gst_query_parse_allocation (query, &caps, NULL);
+  if (!caps) {
+    GST_ERROR_OBJECT (self, "No valid caps");
+    return FALSE;
+  }
+
+  if (gst_video_is_dma_drm_caps (caps) && !self->has_videometa) {
+    GST_ERROR_OBJECT (self,
+        "DMABuf caps negotiated without the mandatory support of VideoMeta");
+    return FALSE;
+  }
 
   if (gst_query_get_n_allocation_pools (query) > 0)
     gst_query_parse_nth_allocation_pool (query, 0, NULL, NULL, &min, NULL);
@@ -465,6 +495,7 @@
       GST_PAD_SRC, self->min_pool_size + min + 1);
   self->src_pool = gst_v4l2_codec_pool_new (self->src_allocator, &self->vinfo);
 
+no_internal_changes:
   /* Our buffer pool is internal, we will let the base class create a video
    * pool, and use it if we are running out of buffers or if downstream does
    * not support GstVideoMeta */
@@ -813,7 +844,7 @@
   if (!ref_pic)
     return 0xff;
 
-  ref_ts = (guint64) ref_pic->system_frame_number * 1000;
+  ref_ts = GST_CODEC_PICTURE_TS_NS (ref_pic);
   for (i = 0; i < 16; i++) {
     if (dpbi.timestamp == ref_ts)
       return i;
@@ -988,6 +1019,7 @@
     .num_poc_st_curr_before = decoder->NumPocStCurrBefore,
     .num_poc_st_curr_after = decoder->NumPocStCurrAfter,
     .num_poc_lt_curr = decoder->NumPocLtCurr,
+    .num_delta_pocs_of_ref_rps_idx = slice->header.short_term_ref_pic_sets.NumDeltaPocsOfRefRpsIdx,
     .flags =
       (GST_H265_IS_NAL_TYPE_IRAP (slice->nalu.type) ? V4L2_HEVC_DECODE_PARAM_FLAG_IRAP_PIC : 0) |
       (GST_H265_IS_NAL_TYPE_IDR (slice->nalu.type) ? V4L2_HEVC_DECODE_PARAM_FLAG_IDR_PIC : 0) |
@@ -1008,7 +1040,7 @@
        * The reference is multiplied by 1000 because it's wassed as micro
        * seconds and this TS is nanosecond.
        */
-      .timestamp = (guint64) ref_pic->system_frame_number * 1000,
+      .timestamp = (guint64) GST_CODEC_PICTURE_FRAME_NUMBER (ref_pic) * 1000,
       .flags = ref_pic->long_term ? V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE : 0,
       .field_pic = ref_pic->pic_struct,
       .pic_order_cnt_val = ref_pic->pic_order_cnt,
@@ -1189,21 +1221,23 @@
   GstV4l2CodecH265Dec *self = GST_V4L2_CODEC_H265_DEC (decoder);
   GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
   GstV4l2Request *request = gst_h265_picture_get_user_data (picture);
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
   gint ret;
 
-  if (picture->discont_state) {
+  if (codec_picture->discont_state) {
     if (!gst_video_decoder_negotiate (vdec)) {
       GST_ERROR_OBJECT (vdec, "Could not re-negotiate with updated state");
       return FALSE;
     }
   }
 
-  GST_DEBUG_OBJECT (self, "Output picture %u", picture->system_frame_number);
+  GST_DEBUG_OBJECT (self, "Output picture %u",
+      codec_picture->system_frame_number);
 
   ret = gst_v4l2_request_set_done (request);
   if (ret == 0) {
     GST_ELEMENT_ERROR (self, STREAM, DECODE,
-        ("Decoding frame %u took too long", picture->system_frame_number),
+        ("Decoding frame %u took too long", codec_picture->system_frame_number),
         (NULL));
     goto error;
   } else if (ret < 0) {
@@ -1215,7 +1249,8 @@
 
   if (gst_v4l2_request_failed (request)) {
     GST_ELEMENT_ERROR (self, STREAM, DECODE,
-        ("Failed to decode frame %u", picture->system_frame_number), (NULL));
+        ("Failed to decode frame %u", codec_picture->system_frame_number),
+        (NULL));
     goto error;
   }
 
@@ -1309,16 +1344,17 @@
         self->bitstream);
   } else {
     GstVideoCodecFrame *frame;
+    guint32 system_frame_number = GST_CODEC_PICTURE_FRAME_NUMBER (picture);
 
     frame = gst_video_decoder_get_frame (GST_VIDEO_DECODER (self),
-        picture->system_frame_number);
+        system_frame_number);
     g_return_val_if_fail (frame, FALSE);
 
     if (!gst_v4l2_codec_h265_dec_ensure_output_buffer (self, frame))
       goto done;
 
     request = gst_v4l2_decoder_alloc_request (self->decoder,
-        picture->system_frame_number, self->bitstream, frame->output_buffer);
+        system_frame_number, self->bitstream, frame->output_buffer);
 
     gst_video_codec_frame_unref (frame);
   }
@@ -1590,6 +1626,7 @@
 {
   self->decoder = gst_v4l2_decoder_new (klass->device);
   gst_video_info_init (&self->vinfo);
+  gst_video_info_dma_drm_init (&self->vinfo_drm);
   self->slice_params = g_array_sized_new (FALSE, TRUE,
       sizeof (struct v4l2_ctrl_hevc_slice_params), 4);
   g_array_set_size (self->slice_params, 4);
@@ -1679,7 +1716,7 @@
   if (!gst_v4l2_decoder_set_sink_fmt (decoder, V4L2_PIX_FMT_HEVC_SLICE,
           320, 240, 8))
     return;
-  src_caps = gst_v4l2_decoder_enum_src_formats (decoder);
+  src_caps = gst_v4l2_decoder_enum_src_formats (decoder, &static_src_caps);
 
   if (gst_caps_is_empty (src_caps)) {
     GST_WARNING ("Not registering H265 decoder since it produces no "

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/gstv4l2codecmpeg2dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2codecmpeg2dec.c Changed

@@ -53,10 +53,20 @@
         "systemstream=(boolean) false, "
         "mpegversion=(int) 2, " "profile=(string) {main, simple} "));
 
+#define SRC_CAPS \
+    GST_VIDEO_DMA_DRM_CAPS_MAKE " ; " \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+#define SRC_CAPS_NO_DRM \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+static GstStaticCaps static_src_caps = GST_STATIC_CAPS (SRC_CAPS);
+static GstStaticCaps static_src_caps_no_drm = GST_STATIC_CAPS (SRC_CAPS_NO_DRM);
+
 static GstStaticPadTemplate src_template =
 GST_STATIC_PAD_TEMPLATE (GST_VIDEO_DECODER_SRC_NAME,
     GST_PAD_SRC, GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)));
+    GST_STATIC_CAPS (SRC_CAPS));
 
 struct _GstV4l2CodecMpeg2Dec
 {
@@ -65,6 +75,7 @@
   GstV4l2Decoder *decoder;
   GstVideoCodecState *output_state;
   GstVideoInfo vinfo;
+  GstVideoInfoDmaDrm vinfo_drm;
 
   guint16 width;
   guint16 height;
@@ -241,7 +252,8 @@
   };
 
   /* *INDENT-ON* */
-  GstCaps *filter, *caps;
+  GstCaps *peer_caps, *filter, *caps;
+  GstStaticCaps *static_filter;
 
   /* Ignore downstream renegotiation request. */
   if (self->streaming)
@@ -267,7 +279,13 @@
     return FALSE;
   }
 
-  filter = gst_v4l2_decoder_enum_src_formats (self->decoder);
+  /* If the peer has ANY caps only advertise system memory caps */
+  peer_caps = gst_pad_peer_query_caps (decoder->srcpad, NULL);
+  static_filter =
+      gst_caps_is_any (peer_caps) ? &static_src_caps_no_drm : &static_src_caps;
+  gst_caps_unref (peer_caps);
+
+  filter = gst_v4l2_decoder_enum_src_formats (self->decoder, static_filter);
   if (!filter) {
     GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
         ("No supported decoder output formats"), (NULL));
@@ -279,7 +297,8 @@
   gst_caps_unref (filter);
   GST_DEBUG_OBJECT (self, "Peer supported formats: %" GST_PTR_FORMAT, caps);
 
-  if (!gst_v4l2_decoder_select_src_format (self->decoder, caps, &self->vinfo)) {
+  if (!gst_v4l2_decoder_select_src_format (self->decoder, caps, &self->vinfo,
+          &self->vinfo_drm)) {
     GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
         ("Unsupported bitdepth/chroma format"),
         ("No support for %ux%u chroma IDC %i", self->width,
@@ -294,16 +313,13 @@
     gst_video_codec_state_unref (self->output_state);
 
   self->output_state =
-      gst_video_decoder_set_output_state (GST_VIDEO_DECODER (self),
-      self->vinfo.finfo->format, self->width,
-      self->height, mpeg2dec->input_state);
+      gst_v4l2_decoder_set_output_state (GST_VIDEO_DECODER (self), &self->vinfo,
+      &self->vinfo_drm, self->width, self->height, mpeg2dec->input_state);
 
   if (self->interlaced)
     self->output_state->info.interlace_mode =
         GST_VIDEO_INTERLACE_MODE_INTERLEAVED;
 
-  self->output_state->caps = gst_video_info_to_caps (&self->output_state->info);
-
   if (GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder)) {
     if (self->streaming)
       return TRUE;
@@ -335,14 +351,32 @@
     GstQuery * query)
 {
   GstV4l2CodecMpeg2Dec *self = GST_V4L2_CODEC_MPEG2_DEC (decoder);
+  GstCaps *caps = NULL;
   guint min = 0, num_bitstream;
 
-  self->has_videometa = gst_query_find_allocation_meta (query,
-      GST_VIDEO_META_API_TYPE, NULL);
+  /* If we are streaming here, then it means there is nothing allocation
+   * related in the new state and allocation can be ignored */
+  if (self->streaming)
+    goto no_internal_changes;
 
   g_clear_object (&self->src_pool);
   g_clear_object (&self->src_allocator);
 
+  self->has_videometa = gst_query_find_allocation_meta (query,
+      GST_VIDEO_META_API_TYPE, NULL);
+
+  gst_query_parse_allocation (query, &caps, NULL);
+  if (!caps) {
+    GST_ERROR_OBJECT (self, "No valid caps");
+    return FALSE;
+  }
+
+  if (gst_video_is_dma_drm_caps (caps) && !self->has_videometa) {
+    GST_ERROR_OBJECT (self,
+        "DMABuf caps negotiated without the mandatory support of VideoMeta");
+    return FALSE;
+  }
+
   if (gst_query_get_n_allocation_pools (query) > 0)
     gst_query_parse_nth_allocation_pool (query, 0, NULL, NULL, &min, NULL);
 
@@ -357,6 +391,7 @@
       GST_PAD_SRC, self->min_pool_size + min + 4);
   self->src_pool = gst_v4l2_codec_pool_new (self->src_allocator, &self->vinfo);
 
+no_internal_changes:
   /* Our buffer pool is internal, we will let the base class create a video
    * pool, and use it if we are running out of buffers or if downstream does
    * not support GstVideoMeta */
@@ -577,8 +612,10 @@
 
   /* *INDENT-OFF* */
   self->v4l2_picture = (struct v4l2_ctrl_mpeg2_picture) {
-    .backward_ref_ts = next_picture ? next_picture->system_frame_number * 1000 : GST_CLOCK_TIME_NONE,
-    .forward_ref_ts = prev_picture ? prev_picture->system_frame_number * 1000 : GST_CLOCK_TIME_NONE,
+    .backward_ref_ts = next_picture ?
+        GST_CODEC_PICTURE_TS_NS (next_picture) : GST_CLOCK_TIME_NONE,
+    .forward_ref_ts = prev_picture ?
+        GST_CODEC_PICTURE_TS_NS (prev_picture) : GST_CLOCK_TIME_NONE,
     .intra_dc_precision = slice->pic_ext ? slice->pic_ext->intra_dc_precision : 0,
     .flags = (slice->pic_ext && slice->pic_ext->top_field_first ? V4L2_MPEG2_PIC_FLAG_TOP_FIELD_FIRST : 0) |
              (slice->pic_ext && slice->pic_ext->frame_pred_frame_dct ? V4L2_MPEG2_PIC_FLAG_FRAME_PRED_DCT : 0 ) |
@@ -680,21 +717,23 @@
   GstV4l2CodecMpeg2Dec *self = GST_V4L2_CODEC_MPEG2_DEC (decoder);
   GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
   GstV4l2Request *request = gst_mpeg2_picture_get_user_data (picture);
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
   gint ret;
 
-  if (picture->discont_state) {
+  if (codec_picture->discont_state) {
     if (!gst_video_decoder_negotiate (vdec)) {
       GST_ERROR_OBJECT (vdec, "Could not re-negotiate with updated state");
       return FALSE;
     }
   }
 
-  GST_DEBUG_OBJECT (self, "Output picture %u", picture->system_frame_number);
+  GST_DEBUG_OBJECT (self, "Output picture %u",
+      codec_picture->system_frame_number);
 
   ret = gst_v4l2_request_set_done (request);
   if (ret == 0) {
     GST_ELEMENT_ERROR (self, STREAM, DECODE,
-        ("Decoding frame %u took too long", picture->system_frame_number),
+        ("Decoding frame %u took too long", codec_picture->system_frame_number),
         (NULL));
     goto error;
   } else if (ret < 0) {
@@ -706,7 +745,8 @@
 
   if (gst_v4l2_request_failed (request)) {
     GST_ELEMENT_ERROR (self, STREAM, DECODE,
-        ("Failed to decode frame %u", picture->system_frame_number), (NULL));
+        ("Failed to decode frame %u", codec_picture->system_frame_number),
+        (NULL));
     goto error;
   }
 
@@ -801,16 +841,17 @@
         self->bitstream);
   } else {
     GstVideoCodecFrame *frame;
+    guint32 system_frame_number = GST_CODEC_PICTURE_FRAME_NUMBER (picture);
 
     frame = gst_video_decoder_get_frame (GST_VIDEO_DECODER (self),
-        picture->system_frame_number);
+        system_frame_number);
     g_return_val_if_fail (frame, FALSE);
 
     if (!gst_v4l2_codec_mpeg2_dec_ensure_output_buffer (self, frame))
       goto done;
 
     request = gst_v4l2_decoder_alloc_request (self->decoder,
-        picture->system_frame_number, self->bitstream, frame->output_buffer);
+        system_frame_number, self->bitstream, frame->output_buffer);
 
     gst_video_codec_frame_unref (frame);
   }
@@ -995,6 +1036,7 @@
 {
   self->decoder = gst_v4l2_decoder_new (klass->device);
   gst_video_info_init (&self->vinfo);
+  gst_video_info_dma_drm_init (&self->vinfo_drm);
 }
 
 static void
@@ -1076,7 +1118,7 @@
   if (!gst_v4l2_decoder_set_sink_fmt (decoder, V4L2_PIX_FMT_MPEG2_SLICE,
           320, 240, 8))
     return;
-  src_caps = gst_v4l2_decoder_enum_src_formats (decoder);
+  src_caps = gst_v4l2_decoder_enum_src_formats (decoder, &static_src_caps);
 
   if (gst_caps_is_empty (src_caps)) {
     GST_WARNING ("Not registering MPEG2 decoder since it produces no "

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/gstv4l2codecvp8dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2codecvp8dec.c Changed

@@ -54,10 +54,20 @@
     GST_STATIC_CAPS ("video/x-vp8, codec-alpha = (boolean) true")
     );
 
+#define SRC_CAPS \
+    GST_VIDEO_DMA_DRM_CAPS_MAKE " ; " \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+#define SRC_CAPS_NO_DRM \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+static GstStaticCaps static_src_caps = GST_STATIC_CAPS (SRC_CAPS);
+static GstStaticCaps static_src_caps_no_drm = GST_STATIC_CAPS (SRC_CAPS_NO_DRM);
+
 static GstStaticPadTemplate src_template =
 GST_STATIC_PAD_TEMPLATE (GST_VIDEO_DECODER_SRC_NAME,
     GST_PAD_SRC, GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)));
+    GST_STATIC_CAPS (SRC_CAPS));
 
 struct _GstV4l2CodecVp8Dec
 {
@@ -65,6 +75,7 @@
   GstV4l2Decoder *decoder;
   GstVideoCodecState *output_state;
   GstVideoInfo vinfo;
+  GstVideoInfoDmaDrm vinfo_drm;
   gint width;
   gint height;
 
@@ -190,7 +201,8 @@
     },
   };
   /* *INDENT-ON* */
-  GstCaps *filter, *caps;
+  GstCaps *peer_caps, *filter, *caps;
+  GstStaticCaps *static_filter;
 
   /* Ignore downstream renegotiation request. */
   if (self->streaming)
@@ -216,7 +228,13 @@
     return FALSE;
   }
 
-  filter = gst_v4l2_decoder_enum_src_formats (self->decoder);
+  /* If the peer has ANY caps only advertise system memory caps */
+  peer_caps = gst_pad_peer_query_caps (decoder->srcpad, NULL);
+  static_filter =
+      gst_caps_is_any (peer_caps) ? &static_src_caps_no_drm : &static_src_caps;
+  gst_caps_unref (peer_caps);
+
+  filter = gst_v4l2_decoder_enum_src_formats (self->decoder, static_filter);
   if (!filter) {
     GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
         ("No supported decoder output formats"), (NULL));
@@ -228,7 +246,8 @@
   gst_caps_unref (filter);
   GST_DEBUG_OBJECT (self, "Peer supported formats: %" GST_PTR_FORMAT, caps);
 
-  if (!gst_v4l2_decoder_select_src_format (self->decoder, caps, &self->vinfo)) {
+  if (!gst_v4l2_decoder_select_src_format (self->decoder, caps, &self->vinfo,
+          &self->vinfo_drm)) {
     GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
         ("Unsupported pixel format"),
         ("No support for %ux%u format %s", self->width, self->height,
@@ -243,11 +262,8 @@
     gst_video_codec_state_unref (self->output_state);
 
   self->output_state =
-      gst_video_decoder_set_output_state (GST_VIDEO_DECODER (self),
-      self->vinfo.finfo->format, self->width,
-      self->height, vp8dec->input_state);
-
-  self->output_state->caps = gst_video_info_to_caps (&self->output_state->info);
+      gst_v4l2_decoder_set_output_state (GST_VIDEO_DECODER (self), &self->vinfo,
+      &self->vinfo_drm, self->width, self->height, vp8dec->input_state);
 
   if (GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder)) {
     if (self->streaming)
@@ -280,17 +296,30 @@
     GstQuery * query)
 {
   GstV4l2CodecVp8Dec *self = GST_V4L2_CODEC_VP8_DEC (decoder);
+  GstCaps *caps = NULL;
   guint min = 0;
   guint num_bitstream;
 
   if (self->streaming)
-    return TRUE;
+    goto no_internal_changes;
+
+  g_clear_object (&self->src_pool);
+  g_clear_object (&self->src_allocator);
 
   self->has_videometa = gst_query_find_allocation_meta (query,
       GST_VIDEO_META_API_TYPE, NULL);
 
-  g_clear_object (&self->src_pool);
-  g_clear_object (&self->src_allocator);
+  gst_query_parse_allocation (query, &caps, NULL);
+  if (!caps) {
+    GST_ERROR_OBJECT (self, "No valid caps");
+    return FALSE;
+  }
+
+  if (gst_video_is_dma_drm_caps (caps) && !self->has_videometa) {
+    GST_ERROR_OBJECT (self,
+        "DMABuf caps negotiated without the mandatory support of VideoMeta");
+    return FALSE;
+  }
 
   if (gst_query_get_n_allocation_pools (query) > 0)
     gst_query_parse_nth_allocation_pool (query, 0, NULL, NULL, &min, NULL);
@@ -319,6 +348,7 @@
 
   self->src_pool = gst_v4l2_codec_pool_new (self->src_allocator, &self->vinfo);
 
+no_internal_changes:
   /* Our buffer pool is internal, we will let the base class create a video
    * pool, and use it if we are running out of buffers or if downstream does
    * not support GstVideoMeta */
@@ -443,17 +473,20 @@
 {
   GstVp8Decoder *decoder = &self->parent;
 
-  if (decoder->last_picture)
+  if (decoder->last_picture) {
     self->frame_header.last_frame_ts =
-        decoder->last_picture->system_frame_number * 1000;
+        GST_CODEC_PICTURE_TS_NS (decoder->last_picture);
+  }
 
-  if (decoder->golden_ref_picture)
+  if (decoder->golden_ref_picture) {
     self->frame_header.golden_frame_ts =
-        decoder->golden_ref_picture->system_frame_number * 1000;
+        GST_CODEC_PICTURE_TS_NS (decoder->golden_ref_picture);
+  }
 
-  if (decoder->alt_ref_picture)
+  if (decoder->alt_ref_picture) {
     self->frame_header.alt_frame_ts =
-        decoder->alt_ref_picture->system_frame_number * 1000;
+        GST_CODEC_PICTURE_TS_NS (decoder->alt_ref_picture);
+  }
 
   GST_DEBUG_OBJECT (self, "Passing references: last %u, golden %u, alt %u",
       (guint32) self->frame_header.last_frame_ts / 1000,
@@ -623,14 +656,14 @@
   }
 
   frame = gst_video_decoder_get_frame (GST_VIDEO_DECODER (self),
-      picture->system_frame_number);
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture));
   g_return_val_if_fail (frame, GST_FLOW_ERROR);
   g_warn_if_fail (frame->output_buffer == NULL);
   frame->output_buffer = buffer;
   gst_video_codec_frame_unref (frame);
 
   request = gst_v4l2_decoder_alloc_request (self->decoder,
-      picture->system_frame_number, self->bitstream, buffer);
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture), self->bitstream, buffer);
   if (!request) {
     GST_ELEMENT_ERROR (decoder, RESOURCE, NO_SPACE_LEFT,
         ("Failed to allocate a media request object."), (NULL));
@@ -721,16 +754,18 @@
   GstV4l2CodecVp8Dec *self = GST_V4L2_CODEC_VP8_DEC (decoder);
   GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
   GstV4l2Request *request = gst_vp8_picture_get_user_data (picture);
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
   gint ret;
 
-  if (picture->discont_state) {
+  if (codec_picture->discont_state) {
     if (!gst_video_decoder_negotiate (vdec)) {
       GST_ERROR_OBJECT (vdec, "Could not re-negotiate with updated state");
       return FALSE;
     }
   }
 
-  GST_DEBUG_OBJECT (self, "Output picture %u", picture->system_frame_number);
+  GST_DEBUG_OBJECT (self, "Output picture %u",
+      codec_picture->system_frame_number);
 
   ret = gst_v4l2_request_set_done (request);
   if (ret == 0) {
@@ -747,7 +782,8 @@
 
   if (gst_v4l2_request_failed (request)) {
     GST_ELEMENT_ERROR (self, STREAM, DECODE,
-        ("Failed to decode frame %u", picture->system_frame_number), (NULL));
+        ("Failed to decode frame %u", codec_picture->system_frame_number),
+        (NULL));
     goto error;
   }
 
@@ -860,6 +896,7 @@
 {
   self->decoder = gst_v4l2_decoder_new (klass->device);
   gst_video_info_init (&self->vinfo);
+  gst_video_info_dma_drm_init (&self->vinfo_drm);
 }
 
 static void
@@ -958,7 +995,7 @@
   if (!gst_v4l2_decoder_set_sink_fmt (decoder, V4L2_PIX_FMT_VP8_FRAME,
           320, 240, 8))
     return;
-  src_caps = gst_v4l2_decoder_enum_src_formats (decoder);
+  src_caps = gst_v4l2_decoder_enum_src_formats (decoder, &static_src_caps);
 
   if (gst_caps_is_empty (src_caps)) {
     GST_WARNING ("Not registering VP8 decoder since it produces no "

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/gstv4l2codecvp9dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2codecvp9dec.c Changed

@@ -55,10 +55,20 @@
         "alignment = frame")
     );
 
+#define SRC_CAPS \
+    GST_VIDEO_DMA_DRM_CAPS_MAKE " ; " \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+#define SRC_CAPS_NO_DRM \
+    GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)
+
+static GstStaticCaps static_src_caps = GST_STATIC_CAPS (SRC_CAPS);
+static GstStaticCaps static_src_caps_no_drm = GST_STATIC_CAPS (SRC_CAPS_NO_DRM);
+
 static GstStaticPadTemplate src_template =
 GST_STATIC_PAD_TEMPLATE (GST_VIDEO_DECODER_SRC_NAME,
     GST_PAD_SRC, GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (GST_V4L2_DEFAULT_VIDEO_FORMATS)));
+    GST_STATIC_CAPS (SRC_CAPS));
 
 struct _GstV4l2CodecVp9Dec
 {
@@ -66,6 +76,7 @@
   GstV4l2Decoder *decoder;
   GstVideoCodecState *output_state;
   GstVideoInfo vinfo;
+  GstVideoInfoDmaDrm vinfo_drm;
   gint width;
   gint height;
 
@@ -271,19 +282,22 @@
 {
   GstVp9Picture *ref_pic;
 
-  if (reference_frames && reference_frames->pic_listh->ref_frame_idx0) {
+  if (!reference_frames)
+    return;
+
+  if (reference_frames->pic_listh->ref_frame_idx0) {
     ref_pic = reference_frames->pic_listh->ref_frame_idx0;
-    self->v4l2_vp9_frame.last_frame_ts = ref_pic->system_frame_number * 1000;
+    self->v4l2_vp9_frame.last_frame_ts = GST_CODEC_PICTURE_TS_NS (ref_pic);
   }
 
-  if (reference_frames && reference_frames->pic_listh->ref_frame_idx1) {
+  if (reference_frames->pic_listh->ref_frame_idx1) {
     ref_pic = reference_frames->pic_listh->ref_frame_idx1;
-    self->v4l2_vp9_frame.golden_frame_ts = ref_pic->system_frame_number * 1000;
+    self->v4l2_vp9_frame.golden_frame_ts = GST_CODEC_PICTURE_TS_NS (ref_pic);
   }
 
-  if (reference_frames && reference_frames->pic_listh->ref_frame_idx2) {
+  if (reference_frames->pic_listh->ref_frame_idx2) {
     ref_pic = reference_frames->pic_listh->ref_frame_idx2;
-    self->v4l2_vp9_frame.alt_frame_ts = ref_pic->system_frame_number * 1000;
+    self->v4l2_vp9_frame.alt_frame_ts = GST_CODEC_PICTURE_TS_NS (ref_pic);
   }
 }
 
@@ -459,7 +473,9 @@
   };
   /* *INDENT-ON* */
 
-  GstCaps *filter, *caps;
+  GstCaps *peer_caps, *filter, *caps;
+  GstStaticCaps *static_filter;
+
   /* Ignore downstream renegotiation request. */
   if (self->streaming)
     goto done;
@@ -483,7 +499,13 @@
     return FALSE;
   }
 
-  filter = gst_v4l2_decoder_enum_src_formats (self->decoder);
+  /* If the peer has ANY caps only advertise system memory caps */
+  peer_caps = gst_pad_peer_query_caps (decoder->srcpad, NULL);
+  static_filter =
+      gst_caps_is_any (peer_caps) ? &static_src_caps_no_drm : &static_src_caps;
+  gst_caps_unref (peer_caps);
+
+  filter = gst_v4l2_decoder_enum_src_formats (self->decoder, static_filter);
   if (!filter) {
     GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
         ("No supported decoder output formats"), (NULL));
@@ -495,7 +517,8 @@
   gst_caps_unref (filter);
   GST_DEBUG_OBJECT (self, "Peer supported formats: %" GST_PTR_FORMAT, caps);
 
-  if (!gst_v4l2_decoder_select_src_format (self->decoder, caps, &self->vinfo)) {
+  if (!gst_v4l2_decoder_select_src_format (self->decoder, caps, &self->vinfo,
+          &self->vinfo_drm)) {
     GST_ELEMENT_ERROR (self, CORE, NEGOTIATION,
         ("Unsupported pixel format"),
         ("No support for %ux%u format %s", self->width, self->height,
@@ -510,11 +533,8 @@
     gst_video_codec_state_unref (self->output_state);
 
   self->output_state =
-      gst_video_decoder_set_output_state (GST_VIDEO_DECODER (self),
-      self->vinfo.finfo->format, self->width,
-      self->height, vp9dec->input_state);
-
-  self->output_state->caps = gst_video_info_to_caps (&self->output_state->info);
+      gst_v4l2_decoder_set_output_state (GST_VIDEO_DECODER (self), &self->vinfo,
+      &self->vinfo_drm, self->width, self->height, vp9dec->input_state);
 
   if (GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (decoder)) {
     if (self->streaming)
@@ -547,15 +567,33 @@
     GstQuery * query)
 {
   GstV4l2CodecVp9Dec *self = GST_V4L2_CODEC_VP9_DEC (decoder);
+  GstCaps *caps = NULL;
   guint min = 0;
   guint num_bitstream;
 
-  self->has_videometa = gst_query_find_allocation_meta (query,
-      GST_VIDEO_META_API_TYPE, NULL);
+  /* If we are streaming here, then it means there is nothing allocation
+   * related in the new state and allocation can be ignored */
+  if (self->streaming)
+    goto no_internal_changes;
 
   g_clear_object (&self->src_pool);
   g_clear_object (&self->src_allocator);
 
+  self->has_videometa = gst_query_find_allocation_meta (query,
+      GST_VIDEO_META_API_TYPE, NULL);
+
+  gst_query_parse_allocation (query, &caps, NULL);
+  if (!caps) {
+    GST_ERROR_OBJECT (self, "No valid caps");
+    return FALSE;
+  }
+
+  if (gst_video_is_dma_drm_caps (caps) && !self->has_videometa) {
+    GST_ERROR_OBJECT (self,
+        "DMABuf caps negotiated without the mandatory support of VideoMeta");
+    return FALSE;
+  }
+
   if (gst_query_get_n_allocation_pools (query) > 0)
     gst_query_parse_nth_allocation_pool (query, 0, NULL, NULL, &min, NULL);
 
@@ -583,6 +621,7 @@
 
   self->src_pool = gst_v4l2_codec_pool_new (self->src_allocator, &self->vinfo);
 
+no_internal_changes:
   /* Our buffer pool is internal, we will let the base class create a video
    * pool, and use it if we are running out of buffers or if downstream does
    * not support GstVideoMeta */
@@ -796,7 +835,7 @@
   gst_memory_resize (self->bitstream, 0, bytesused);
 
   frame = gst_video_decoder_get_frame (GST_VIDEO_DECODER (self),
-      picture->system_frame_number);
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture));
   g_return_val_if_fail (frame, FALSE);
 
   flow_ret = gst_buffer_pool_acquire_buffer (GST_BUFFER_POOL (self->src_pool),
@@ -811,7 +850,8 @@
   }
 
   request = gst_v4l2_decoder_alloc_request (self->decoder,
-      picture->system_frame_number, self->bitstream, frame->output_buffer);
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture), self->bitstream,
+      frame->output_buffer);
 
   gst_video_codec_frame_unref (frame);
 
@@ -903,11 +943,11 @@
   GstVp9Picture *new_picture;
 
   GST_DEBUG_OBJECT (decoder, "Duplicate picture %u",
-      picture->system_frame_number);
+      GST_CODEC_PICTURE_FRAME_NUMBER (picture));
 
   new_picture = gst_vp9_picture_new ();
   new_picture->frame_hdr = picture->frame_hdr;
-  new_picture->system_frame_number = frame->system_frame_number;
+  GST_CODEC_PICTURE_FRAME_NUMBER (new_picture) = frame->system_frame_number;
 
   if (GST_MINI_OBJECT_FLAG_IS_SET (picture, FLAG_PICTURE_HOLDS_BUFFER)) {
     GstBuffer *output_buffer = gst_vp9_picture_get_user_data (picture);
@@ -942,16 +982,18 @@
   GstV4l2CodecVp9Dec *self = GST_V4L2_CODEC_VP9_DEC (decoder);
   GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
   GstV4l2Request *request = NULL;
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
   gint ret;
 
-  if (picture->discont_state) {
+  if (codec_picture->discont_state) {
     if (!gst_video_decoder_negotiate (vdec)) {
       GST_ERROR_OBJECT (vdec, "Could not re-negotiate with updated state");
       return FALSE;
     }
   }
 
-  GST_DEBUG_OBJECT (self, "Output picture %u", picture->system_frame_number);
+  GST_DEBUG_OBJECT (self, "Output picture %u",
+      codec_picture->system_frame_number);
 
   if (!GST_MINI_OBJECT_FLAG_IS_SET (picture, FLAG_PICTURE_HOLDS_BUFFER))
     request = gst_vp9_picture_get_user_data (picture);
@@ -971,7 +1013,8 @@
 
     if (gst_v4l2_request_failed (request)) {
       GST_ELEMENT_ERROR (self, STREAM, DECODE,
-          ("Failed to decode frame %u", picture->system_frame_number), (NULL));
+          ("Failed to decode frame %u", codec_picture->system_frame_number),
+          (NULL));
       goto error;
     }
 
@@ -986,7 +1029,8 @@
   /* This may happen if we duplicate a picture witch failed to decode */
   if (!frame->output_buffer) {
     GST_ELEMENT_ERROR (self, STREAM, DECODE,
-        ("Failed to decode frame %u", picture->system_frame_number), (NULL));
+        ("Failed to decode frame %u", codec_picture->system_frame_number),
+        (NULL));
     goto error;
   }
 
@@ -1095,6 +1139,7 @@
 {
   self->decoder = gst_v4l2_decoder_new (klass->device);
   gst_video_info_init (&self->vinfo);
+  gst_video_info_dma_drm_init (&self->vinfo_drm);
 }
 
 static void
@@ -1195,7 +1240,7 @@
   if (!gst_v4l2_decoder_set_sink_fmt (decoder, V4L2_PIX_FMT_VP9_FRAME,
           320, 240, 8))
     return;
-  src_caps = gst_v4l2_decoder_enum_src_formats (decoder);
+  src_caps = gst_v4l2_decoder_enum_src_formats (decoder, &static_src_caps);
 
   if (gst_caps_is_empty (src_caps)) {
     GST_WARNING ("Not registering VP9 decoder since it produces no "

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/gstv4l2decoder.c -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2decoder.c Changed

@@ -398,8 +398,7 @@
       size.discrete.width, size.discrete.height, index,
       GST_FOURCC_ARGS (pixelformat));
 
-  return gst_caps_new_simple ("video/x-raw", "format", G_TYPE_STRING,
-      gst_video_format_to_string (format),
+  return gst_caps_new_simple ("video/x-raw",
       "width", G_TYPE_INT, size.discrete.width,
       "height", G_TYPE_INT, size.discrete.height, NULL);
 }
@@ -409,8 +408,9 @@
     guint32 pixelformat, gint unscaled_width, gint unscaled_height)
 {
   gint index = 0;
-  GstCaps *caps, *tmp;
+  GstCaps *caps, *tmp, *size_caps;
   GstVideoFormat format;
+  guint32 drm_fourcc;
 
   GST_DEBUG_OBJECT (self, "enumerate size for %" GST_FOURCC_FORMAT,
       GST_FOURCC_ARGS (pixelformat));
@@ -421,22 +421,71 @@
   caps = gst_caps_new_simple ("video/x-raw", "format", G_TYPE_STRING,
       gst_video_format_to_string (format), NULL);
 
+  size_caps = gst_caps_new_empty ();
   while ((tmp = gst_v4l2_decoder_enum_size_for_format (self, pixelformat,
               index++, unscaled_width, unscaled_height))) {
-    caps = gst_caps_merge (caps, tmp);
+    size_caps = gst_caps_merge (size_caps, tmp);
+  }
+
+  if (!gst_caps_is_empty (size_caps)) {
+    tmp = caps;
+    caps = gst_caps_intersect_full (tmp, size_caps, GST_CAPS_INTERSECT_FIRST);
+    gst_caps_unref (tmp);
   }
 
+  /* TODO: Add a V4L2 to DRM fourcc translator for formats that we don't support
+   * in software.
+   */
+  drm_fourcc = gst_video_dma_drm_fourcc_from_format (format);
+  if (drm_fourcc /* != DRM_FORMAT_INVALID */ ) {
+    GstCaps *drm_caps;
+
+    drm_caps = gst_caps_new_simple ("video/x-raw", "format", G_TYPE_STRING,
+        "DMA_DRM", "drm-format", G_TYPE_STRING,
+        gst_video_dma_drm_fourcc_to_string (drm_fourcc, 0), NULL);
+    gst_caps_set_features_simple (drm_caps,
+        gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_DMABUF));
+
+    if (!gst_caps_is_empty (size_caps)) {
+      gst_caps_set_features_simple (size_caps,
+          gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_DMABUF));
+      tmp = drm_caps;
+      drm_caps =
+          gst_caps_intersect_full (tmp, size_caps, GST_CAPS_INTERSECT_FIRST);
+      gst_caps_unref (tmp);
+    }
+
+    caps = gst_caps_merge (drm_caps, caps);
+  }
+
+  gst_caps_unref (size_caps);
+
   return caps;
 }
 
+static gboolean
+filter_only_dmabuf_caps (GstCapsFeatures * features,
+    GstStructure * structure, gpointer user_data)
+{
+  return gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_DMABUF);
+}
+
+static gboolean
+filter_non_dmabuf_caps (GstCapsFeatures * features,
+    GstStructure * structure, gpointer user_data)
+{
+  return !gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_DMABUF);
+}
+
 GstCaps *
-gst_v4l2_decoder_enum_src_formats (GstV4l2Decoder * self)
+gst_v4l2_decoder_enum_src_formats (GstV4l2Decoder * self,
+    GstStaticCaps * static_filter)
 {
   gint ret;
   struct v4l2_format fmt = {
     .type = self->src_buf_type,
   };
-  GstCaps *caps;
+  GstCaps *caps, *filter, *tmp;
   gint i;
 
   g_return_val_if_fail (self->opened, FALSE);
@@ -455,7 +504,6 @@
    * structure in the caps */
   for (i = 0; ret >= 0; i++) {
     struct v4l2_fmtdesc fmtdesc = { i, self->src_buf_type, };
-    GstCaps *tmp;
 
     ret = ioctl (self->video_fd, VIDIOC_ENUM_FMT, &fmtdesc);
     if (ret < 0) {
@@ -470,21 +518,34 @@
     caps = gst_caps_merge (caps, tmp);
   }
 
+  filter = gst_static_caps_get (static_filter);
+  tmp = caps;
+  caps = gst_caps_intersect_full (tmp, filter, GST_CAPS_INTERSECT_FIRST);
+  gst_caps_unref (tmp);
+  gst_caps_unref (filter);
+
+  tmp = gst_caps_copy (caps);
+  gst_caps_filter_and_map_in_place (caps, filter_only_dmabuf_caps, NULL);
+  gst_caps_filter_and_map_in_place (tmp, filter_non_dmabuf_caps, NULL);
+  gst_caps_append (caps, tmp);
+
+  GST_DEBUG_OBJECT (self, "Probed caps: %" GST_PTR_FORMAT, caps);
+
   return caps;
 }
 
 gboolean
 gst_v4l2_decoder_select_src_format (GstV4l2Decoder * self, GstCaps * caps,
-    GstVideoInfo * info)
+    GstVideoInfo * vinfo, GstVideoInfoDmaDrm * vinfo_drm)
 {
   gint ret;
   struct v4l2_format fmt = {
     .type = self->src_buf_type,
   };
-  GstStructure *str;
-  const gchar *format_str;
   GstVideoFormat format;
   guint32 pix_fmt;
+  GstVideoInfo tmp_vinfo;
+  GstVideoInfoDmaDrm tmp_vinfo_drm;
 
   if (gst_caps_is_empty (caps))
     return FALSE;
@@ -495,16 +556,31 @@
     return FALSE;
   }
 
-  caps = gst_caps_make_writable (caps);
-  str = gst_caps_get_structure (caps, 0);
-  gst_structure_fixate_field (str, "format");
+  gst_video_info_init (&tmp_vinfo);
+  gst_video_info_dma_drm_init (&tmp_vinfo_drm);
 
-  format_str = gst_structure_get_string (str, "format");
-  format = gst_video_format_from_string (format_str);
+  GST_DEBUG_OBJECT (self, "Original caps: %" GST_PTR_FORMAT, caps);
+  caps = gst_caps_fixate (caps);
+  GST_DEBUG_OBJECT (self, "Fixated caps: %" GST_PTR_FORMAT, caps);
 
-  if (gst_v4l2_format_from_video_format (format, &pix_fmt) &&
-      pix_fmt != fmt.fmt.pix_mp.pixelformat) {
-    GST_DEBUG_OBJECT (self, "Trying to use peer format: %s ", format_str);
+  if (gst_video_info_dma_drm_from_caps (&tmp_vinfo_drm, caps)) {
+    format = tmp_vinfo_drm.vinfo.finfo->format;
+  } else if (gst_video_info_from_caps (&tmp_vinfo, caps)) {
+    format = tmp_vinfo.finfo->format;
+  } else {
+    GST_WARNING_OBJECT (self, "Can't transform caps into video info!");
+    return FALSE;
+  }
+
+  if (!gst_v4l2_format_from_video_format (format, &pix_fmt)) {
+    GST_ERROR_OBJECT (self, "Unsupported V4L2 pixelformat %" GST_FOURCC_FORMAT,
+        GST_FOURCC_ARGS (fmt.fmt.pix_mp.pixelformat));
+    return FALSE;
+  }
+
+  if (pix_fmt != fmt.fmt.pix_mp.pixelformat) {
+    GST_WARNING_OBJECT (self, "Trying to use peer format: %s",
+        gst_video_format_to_string (format));
     fmt.fmt.pix_mp.pixelformat = pix_fmt;
 
     ret = ioctl (self->video_fd, VIDIOC_S_FMT, &fmt);
@@ -514,19 +590,54 @@
     }
   }
 
-  if (!gst_v4l2_format_to_video_info (&fmt, info)) {
+  if (!gst_v4l2_format_to_video_info (&fmt, vinfo)) {
     GST_ERROR_OBJECT (self, "Unsupported V4L2 pixelformat %" GST_FOURCC_FORMAT,
         GST_FOURCC_ARGS (fmt.fmt.pix_mp.pixelformat));
     return FALSE;
   }
 
+  if (tmp_vinfo_drm.drm_fourcc) {
+    if (!gst_video_info_dma_drm_from_video_info (vinfo_drm, vinfo, 0)) {
+      GST_ERROR_OBJECT (self,
+          "Unsupported V4L2 pixelformat for DRM %" GST_FOURCC_FORMAT,
+          GST_FOURCC_ARGS (fmt.fmt.pix_mp.pixelformat));
+      return FALSE;
+    }
+  } else {
+    gst_video_info_dma_drm_init (vinfo_drm);
+  }
+
   GST_INFO_OBJECT (self, "Selected format %s %ix%i",
-      gst_video_format_to_string (info->finfo->format),
-      info->width, info->height);
+      gst_video_format_to_string (vinfo->finfo->format),
+      vinfo->width, vinfo->height);
 
   return TRUE;
 }
 
+GstVideoCodecState *
+gst_v4l2_decoder_set_output_state (GstVideoDecoder * decoder,
+    GstVideoInfo * vinfo, GstVideoInfoDmaDrm * vinfo_drm, guint width,
+    guint height, GstVideoCodecState * reference)
+{
+  GstVideoCodecState *state;
+
+  state = gst_video_decoder_set_output_state (decoder, vinfo->finfo->format,
+      width, height, reference);
+
+  if (vinfo_drm->drm_fourcc /* != DRM_FORMAT_INVALID */ ) {
+    GstVideoInfoDmaDrm tmp_vinfo_drm;
+
+    gst_video_info_dma_drm_from_video_info (&tmp_vinfo_drm, &state->info, 0);
+    state->caps = gst_video_info_dma_drm_to_caps (&tmp_vinfo_drm);
+  } else {
+    state->caps = gst_video_info_to_caps (&state->info);
+  }
+
+  GST_DEBUG_OBJECT (decoder, "Setting caps: %" GST_PTR_FORMAT, state->caps);
+
+  return state;
+}
+
 gint
 gst_v4l2_decoder_request_buffers (GstV4l2Decoder * self,
     GstPadDirection direction, guint num_buffers)
@@ -564,7 +675,7 @@
   gint i, ret;
   struct v4l2_plane planesGST_VIDEO_MAX_PLANES = { {0} };
   struct v4l2_buffer v4l2_buf = {
-    .index = 0,
+    .index = index,
     .type = direction_to_buffer_type (self, direction),
   };
 
@@ -757,7 +868,7 @@
 
 gboolean
 gst_v4l2_decoder_set_controls (GstV4l2Decoder * self, GstV4l2Request * request,
-    struct v4l2_ext_control * control, guint count)
+    struct v4l2_ext_control *control, guint count)
 {
   gint ret;
   struct v4l2_ext_controls controls = {
@@ -779,7 +890,7 @@
 
 gboolean
 gst_v4l2_decoder_get_controls (GstV4l2Decoder * self,
-    struct v4l2_ext_control * control, guint count)
+    struct v4l2_ext_control *control, guint count)
 {
   gint ret;
   struct v4l2_ext_controls controls = {

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/gstv4l2decoder.h -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2decoder.h Changed

@@ -26,6 +26,17 @@
 #include "gstv4l2codecdevice.h"
 #include "linux/videodev2.h"
 
+/**
+ * GST_CODEC_PICTURE_TS_NS:
+ * @picture: a #GstCodecPicture
+ *
+ * Returns system_frame_number field of @picture converted to nanosecond.
+ *
+ * Since: 1.24
+ */
+#define GST_CODEC_PICTURE_TS_NS(picture)	\
+	gst_util_uint64_scale_int (GST_CODEC_PICTURE_FRAME_NUMBER(picture), 1000, 1)
+
 G_BEGIN_DECLS
 
 #define GST_TYPE_V4L2_DECODER gst_v4l2_decoder_get_type ()
@@ -56,11 +67,20 @@
                                                  gint width, gint height,
                                                  gint pixel_bitdepth);
 
-GstCaps *         gst_v4l2_decoder_enum_src_formats (GstV4l2Decoder * self);
+GstCaps *         gst_v4l2_decoder_enum_src_formats (GstV4l2Decoder * self,
+                                                     GstStaticCaps * static_filter);
 
 gboolean          gst_v4l2_decoder_select_src_format (GstV4l2Decoder * self,
                                                       GstCaps * caps,
-                                                      GstVideoInfo * info);
+                                                      GstVideoInfo * vinfo,
+                                                      GstVideoInfoDmaDrm * vinfo_drm);
+
+GstVideoCodecState * gst_v4l2_decoder_set_output_state (GstVideoDecoder * decoder,
+                                                        GstVideoInfo * vinfo,
+                                                        GstVideoInfoDmaDrm * drm_info,
+                                                        guint width,
+                                                        guint height,
+                                                        GstVideoCodecState * reference);
 
 gint              gst_v4l2_decoder_request_buffers (GstV4l2Decoder * self,
                                                     GstPadDirection direction,

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/gstv4l2format.c -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2format.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/gstv4l2format.h -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/gstv4l2format.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/linux/media.h -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/linux/media.h Changed

@@ -140,8 +140,8 @@
 #define MEDIA_ENT_F_DV_ENCODER			(MEDIA_ENT_F_BASE + 0x6002)
 
 /* Entity flags */
-#define MEDIA_ENT_FL_DEFAULT			(1 << 0)
-#define MEDIA_ENT_FL_CONNECTOR			(1 << 1)
+#define MEDIA_ENT_FL_DEFAULT			(1U << 0)
+#define MEDIA_ENT_FL_CONNECTOR			(1U << 1)
 
 /* OR with the entity id value to find the next entity */
 #define MEDIA_ENT_ID_FLAG_NEXT			(1U << 31)
@@ -203,9 +203,9 @@
 	};
 };
 
-#define MEDIA_PAD_FL_SINK			(1 << 0)
-#define MEDIA_PAD_FL_SOURCE			(1 << 1)
-#define MEDIA_PAD_FL_MUST_CONNECT		(1 << 2)
+#define MEDIA_PAD_FL_SINK			(1U << 0)
+#define MEDIA_PAD_FL_SOURCE			(1U << 1)
+#define MEDIA_PAD_FL_MUST_CONNECT		(1U << 2)
 
 struct media_pad_desc {
 	__u32 entity;		/* entity ID */
@@ -214,13 +214,14 @@
 	__u32 reserved2;
 };
 
-#define MEDIA_LNK_FL_ENABLED			(1 << 0)
-#define MEDIA_LNK_FL_IMMUTABLE			(1 << 1)
-#define MEDIA_LNK_FL_DYNAMIC			(1 << 2)
+#define MEDIA_LNK_FL_ENABLED			(1U << 0)
+#define MEDIA_LNK_FL_IMMUTABLE			(1U << 1)
+#define MEDIA_LNK_FL_DYNAMIC			(1U << 2)
 
 #define MEDIA_LNK_FL_LINK_TYPE			(0xf << 28)
-#  define MEDIA_LNK_FL_DATA_LINK		(0 << 28)
-#  define MEDIA_LNK_FL_INTERFACE_LINK		(1 << 28)
+#  define MEDIA_LNK_FL_DATA_LINK		(0U << 28)
+#  define MEDIA_LNK_FL_INTERFACE_LINK		(1U << 28)
+#  define MEDIA_LNK_FL_ANCILLARY_LINK		(2U << 28)
 
 struct media_link_desc {
 	struct media_pad_desc source;
@@ -275,7 +276,7 @@
  * struct media_device_info.
  */
 #define MEDIA_V2_ENTITY_HAS_FLAGS(media_version) \
-	((media_version) >= ((4 << 16) | (19 << 8) | 0))
+	((media_version) >= ((4U << 16) | (19U << 8) | 0U))
 
 struct media_v2_entity {
 	__u32 id;
@@ -310,7 +311,7 @@
  * struct media_device_info.
  */
 #define MEDIA_V2_PAD_HAS_INDEX(media_version) \
-	((media_version) >= ((4 << 16) | (19 << 8) | 0))
+	((media_version) >= ((4U << 16) | (19U << 8) | 0U))
 
 struct media_v2_pad {
 	__u32 id;
@@ -413,7 +414,7 @@
 #define MEDIA_INTF_T_ALSA_TIMER                (MEDIA_INTF_T_ALSA_BASE + 7)
 
 /* Obsolete symbol for media_version, no longer used in the kernel */
-#define MEDIA_API_VERSION			((0 << 16) | (1 << 8) | 0)
+#define MEDIA_API_VERSION			((0U << 16) | (1U << 8) | 0U)
 
 
 #endif /* __LINUX_MEDIA_H */

gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/linux/usb Added

gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/linux/usb/g_uvc.h Added

@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
+/*
+ * g_uvc.h  --  USB Video Class Gadget driver API
+ *
+ * Copyright (C) 2009-2010 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ */
+
+#ifndef __LINUX_USB_G_UVC_H
+#define __LINUX_USB_G_UVC_H
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/usb/ch9.h>
+
+#define UVC_EVENT_FIRST			(V4L2_EVENT_PRIVATE_START + 0)
+#define UVC_EVENT_CONNECT		(V4L2_EVENT_PRIVATE_START + 0)
+#define UVC_EVENT_DISCONNECT		(V4L2_EVENT_PRIVATE_START + 1)
+#define UVC_EVENT_STREAMON		(V4L2_EVENT_PRIVATE_START + 2)
+#define UVC_EVENT_STREAMOFF		(V4L2_EVENT_PRIVATE_START + 3)
+#define UVC_EVENT_SETUP			(V4L2_EVENT_PRIVATE_START + 4)
+#define UVC_EVENT_DATA			(V4L2_EVENT_PRIVATE_START + 5)
+#define UVC_EVENT_LAST			(V4L2_EVENT_PRIVATE_START + 5)
+
+struct uvc_request_data {
+	__s32 length;
+	__u8 data60;
+};
+
+struct uvc_event {
+	union {
+		enum usb_device_speed speed;
+		struct usb_ctrlrequest req;
+		struct uvc_request_data data;
+	};
+};
+
+#define UVCIOC_SEND_RESPONSE		_IOW('U', 1, struct uvc_request_data)
+
+#endif /* __LINUX_USB_G_UVC_H */

gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/linux/usb/video.h Added

@@ -0,0 +1,571 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+ * USB Video Class definitions.
+ *
+ * Copyright (C) 2009 Laurent Pinchart <laurent.pinchart@skynet.be>
+ *
+ * This file holds USB constants and structures defined by the USB Device
+ * Class Definition for Video Devices. Unless otherwise stated, comments
+ * below reference relevant sections of the USB Video Class 1.1 specification
+ * available at
+ *
+ * http://www.usb.org/developers/devclass_docs/USB_Video_Class_1_1.zip
+ */
+
+#ifndef __LINUX_USB_VIDEO_H
+#define __LINUX_USB_VIDEO_H
+
+#include <linux/types.h>
+
+/* --------------------------------------------------------------------------
+ * UVC constants
+ */
+
+/* A.2. Video Interface Subclass Codes */
+#define UVC_SC_UNDEFINED				0x00
+#define UVC_SC_VIDEOCONTROL				0x01
+#define UVC_SC_VIDEOSTREAMING				0x02
+#define UVC_SC_VIDEO_INTERFACE_COLLECTION		0x03
+
+/* A.3. Video Interface Protocol Codes */
+#define UVC_PC_PROTOCOL_UNDEFINED			0x00
+#define UVC_PC_PROTOCOL_15				0x01
+
+/* A.5. Video Class-Specific VC Interface Descriptor Subtypes */
+#define UVC_VC_DESCRIPTOR_UNDEFINED			0x00
+#define UVC_VC_HEADER					0x01
+#define UVC_VC_INPUT_TERMINAL				0x02
+#define UVC_VC_OUTPUT_TERMINAL				0x03
+#define UVC_VC_SELECTOR_UNIT				0x04
+#define UVC_VC_PROCESSING_UNIT				0x05
+#define UVC_VC_EXTENSION_UNIT				0x06
+
+/* A.6. Video Class-Specific VS Interface Descriptor Subtypes */
+#define UVC_VS_UNDEFINED				0x00
+#define UVC_VS_INPUT_HEADER				0x01
+#define UVC_VS_OUTPUT_HEADER				0x02
+#define UVC_VS_STILL_IMAGE_FRAME			0x03
+#define UVC_VS_FORMAT_UNCOMPRESSED			0x04
+#define UVC_VS_FRAME_UNCOMPRESSED			0x05
+#define UVC_VS_FORMAT_MJPEG				0x06
+#define UVC_VS_FRAME_MJPEG				0x07
+#define UVC_VS_FORMAT_MPEG2TS				0x0a
+#define UVC_VS_FORMAT_DV				0x0c
+#define UVC_VS_COLORFORMAT				0x0d
+#define UVC_VS_FORMAT_FRAME_BASED			0x10
+#define UVC_VS_FRAME_FRAME_BASED			0x11
+#define UVC_VS_FORMAT_STREAM_BASED			0x12
+
+/* A.7. Video Class-Specific Endpoint Descriptor Subtypes */
+#define UVC_EP_UNDEFINED				0x00
+#define UVC_EP_GENERAL					0x01
+#define UVC_EP_ENDPOINT					0x02
+#define UVC_EP_INTERRUPT				0x03
+
+/* A.8. Video Class-Specific Request Codes */
+#define UVC_RC_UNDEFINED				0x00
+#define UVC_SET_CUR					0x01
+#define UVC_GET_CUR					0x81
+#define UVC_GET_MIN					0x82
+#define UVC_GET_MAX					0x83
+#define UVC_GET_RES					0x84
+#define UVC_GET_LEN					0x85
+#define UVC_GET_INFO					0x86
+#define UVC_GET_DEF					0x87
+
+/* A.9.1. VideoControl Interface Control Selectors */
+#define UVC_VC_CONTROL_UNDEFINED			0x00
+#define UVC_VC_VIDEO_POWER_MODE_CONTROL			0x01
+#define UVC_VC_REQUEST_ERROR_CODE_CONTROL		0x02
+
+/* A.9.2. Terminal Control Selectors */
+#define UVC_TE_CONTROL_UNDEFINED			0x00
+
+/* A.9.3. Selector Unit Control Selectors */
+#define UVC_SU_CONTROL_UNDEFINED			0x00
+#define UVC_SU_INPUT_SELECT_CONTROL			0x01
+
+/* A.9.4. Camera Terminal Control Selectors */
+#define UVC_CT_CONTROL_UNDEFINED			0x00
+#define UVC_CT_SCANNING_MODE_CONTROL			0x01
+#define UVC_CT_AE_MODE_CONTROL				0x02
+#define UVC_CT_AE_PRIORITY_CONTROL			0x03
+#define UVC_CT_EXPOSURE_TIME_ABSOLUTE_CONTROL		0x04
+#define UVC_CT_EXPOSURE_TIME_RELATIVE_CONTROL		0x05
+#define UVC_CT_FOCUS_ABSOLUTE_CONTROL			0x06
+#define UVC_CT_FOCUS_RELATIVE_CONTROL			0x07
+#define UVC_CT_FOCUS_AUTO_CONTROL			0x08
+#define UVC_CT_IRIS_ABSOLUTE_CONTROL			0x09
+#define UVC_CT_IRIS_RELATIVE_CONTROL			0x0a
+#define UVC_CT_ZOOM_ABSOLUTE_CONTROL			0x0b
+#define UVC_CT_ZOOM_RELATIVE_CONTROL			0x0c
+#define UVC_CT_PANTILT_ABSOLUTE_CONTROL			0x0d
+#define UVC_CT_PANTILT_RELATIVE_CONTROL			0x0e
+#define UVC_CT_ROLL_ABSOLUTE_CONTROL			0x0f
+#define UVC_CT_ROLL_RELATIVE_CONTROL			0x10
+#define UVC_CT_PRIVACY_CONTROL				0x11
+
+/* A.9.5. Processing Unit Control Selectors */
+#define UVC_PU_CONTROL_UNDEFINED			0x00
+#define UVC_PU_BACKLIGHT_COMPENSATION_CONTROL		0x01
+#define UVC_PU_BRIGHTNESS_CONTROL			0x02
+#define UVC_PU_CONTRAST_CONTROL				0x03
+#define UVC_PU_GAIN_CONTROL				0x04
+#define UVC_PU_POWER_LINE_FREQUENCY_CONTROL		0x05
+#define UVC_PU_HUE_CONTROL				0x06
+#define UVC_PU_SATURATION_CONTROL			0x07
+#define UVC_PU_SHARPNESS_CONTROL			0x08
+#define UVC_PU_GAMMA_CONTROL				0x09
+#define UVC_PU_WHITE_BALANCE_TEMPERATURE_CONTROL	0x0a
+#define UVC_PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL	0x0b
+#define UVC_PU_WHITE_BALANCE_COMPONENT_CONTROL		0x0c
+#define UVC_PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL	0x0d
+#define UVC_PU_DIGITAL_MULTIPLIER_CONTROL		0x0e
+#define UVC_PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL		0x0f
+#define UVC_PU_HUE_AUTO_CONTROL				0x10
+#define UVC_PU_ANALOG_VIDEO_STANDARD_CONTROL		0x11
+#define UVC_PU_ANALOG_LOCK_STATUS_CONTROL		0x12
+
+/* A.9.7. VideoStreaming Interface Control Selectors */
+#define UVC_VS_CONTROL_UNDEFINED			0x00
+#define UVC_VS_PROBE_CONTROL				0x01
+#define UVC_VS_COMMIT_CONTROL				0x02
+#define UVC_VS_STILL_PROBE_CONTROL			0x03
+#define UVC_VS_STILL_COMMIT_CONTROL			0x04
+#define UVC_VS_STILL_IMAGE_TRIGGER_CONTROL		0x05
+#define UVC_VS_STREAM_ERROR_CODE_CONTROL		0x06
+#define UVC_VS_GENERATE_KEY_FRAME_CONTROL		0x07
+#define UVC_VS_UPDATE_FRAME_SEGMENT_CONTROL		0x08
+#define UVC_VS_SYNC_DELAY_CONTROL			0x09
+
+/* B.1. USB Terminal Types */
+#define UVC_TT_VENDOR_SPECIFIC				0x0100
+#define UVC_TT_STREAMING				0x0101
+
+/* B.2. Input Terminal Types */
+#define UVC_ITT_VENDOR_SPECIFIC				0x0200
+#define UVC_ITT_CAMERA					0x0201
+#define UVC_ITT_MEDIA_TRANSPORT_INPUT			0x0202
+
+/* B.3. Output Terminal Types */
+#define UVC_OTT_VENDOR_SPECIFIC				0x0300
+#define UVC_OTT_DISPLAY					0x0301
+#define UVC_OTT_MEDIA_TRANSPORT_OUTPUT			0x0302
+
+/* B.4. External Terminal Types */
+#define UVC_EXTERNAL_VENDOR_SPECIFIC			0x0400
+#define UVC_COMPOSITE_CONNECTOR				0x0401
+#define UVC_SVIDEO_CONNECTOR				0x0402
+#define UVC_COMPONENT_CONNECTOR				0x0403
+
+/* 2.4.2.2. Status Packet Type */
+#define UVC_STATUS_TYPE_CONTROL				1
+#define UVC_STATUS_TYPE_STREAMING			2
+
+/* 2.4.3.3. Payload Header Information */
+#define UVC_STREAM_EOH					(1 << 7)
+#define UVC_STREAM_ERR					(1 << 6)
+#define UVC_STREAM_STI					(1 << 5)
+#define UVC_STREAM_RES					(1 << 4)
+#define UVC_STREAM_SCR					(1 << 3)
+#define UVC_STREAM_PTS					(1 << 2)
+#define UVC_STREAM_EOF					(1 << 1)
+#define UVC_STREAM_FID					(1 << 0)
+
+/* 4.1.2. Control Capabilities */
+#define UVC_CONTROL_CAP_GET				(1 << 0)
+#define UVC_CONTROL_CAP_SET				(1 << 1)
+#define UVC_CONTROL_CAP_DISABLED			(1 << 2)
+#define UVC_CONTROL_CAP_AUTOUPDATE			(1 << 3)
+#define UVC_CONTROL_CAP_ASYNCHRONOUS			(1 << 4)
+
+/* ------------------------------------------------------------------------
+ * UVC structures
+ */
+
+/* All UVC descriptors have these 3 fields at the beginning */
+struct uvc_descriptor_header {
+	__u8  bLength;
+	__u8  bDescriptorType;
+	__u8  bDescriptorSubType;
+} __attribute__((packed));
+
+/* 3.7.2. Video Control Interface Header Descriptor */
+struct uvc_header_descriptor {
+	__u8   bLength;
+	__u8   bDescriptorType;
+	__u8   bDescriptorSubType;
+	__le16 bcdUVC;
+	__le16 wTotalLength;
+	__le32 dwClockFrequency;
+	__u8   bInCollection;
+	__u8   baInterfaceNr;
+} __attribute__((__packed__));
+
+#define UVC_DT_HEADER_SIZE(n)				(12+(n))
+
+#define UVC_HEADER_DESCRIPTOR(n) \
+	uvc_header_descriptor_##n
+
+#define DECLARE_UVC_HEADER_DESCRIPTOR(n)		\
+struct UVC_HEADER_DESCRIPTOR(n) {			\
+	__u8   bLength;					\
+	__u8   bDescriptorType;				\
+	__u8   bDescriptorSubType;			\
+	__le16 bcdUVC;					\
+	__le16 wTotalLength;				\
+	__le32 dwClockFrequency;			\
+	__u8   bInCollection;				\
+	__u8   baInterfaceNrn;			\
+} __attribute__ ((packed))
+
+/* 3.7.2.1. Input Terminal Descriptor */
+struct uvc_input_terminal_descriptor {
+	__u8   bLength;
+	__u8   bDescriptorType;
+	__u8   bDescriptorSubType;
+	__u8   bTerminalID;
+	__le16 wTerminalType;
+	__u8   bAssocTerminal;
+	__u8   iTerminal;
+} __attribute__((__packed__));
+
+#define UVC_DT_INPUT_TERMINAL_SIZE			8
+
+/* 3.7.2.2. Output Terminal Descriptor */
+struct uvc_output_terminal_descriptor {
+	__u8   bLength;
+	__u8   bDescriptorType;
+	__u8   bDescriptorSubType;
+	__u8   bTerminalID;
+	__le16 wTerminalType;
+	__u8   bAssocTerminal;
+	__u8   bSourceID;
+	__u8   iTerminal;
+} __attribute__((__packed__));
+
+#define UVC_DT_OUTPUT_TERMINAL_SIZE			9
+
+/* 3.7.2.3. Camera Terminal Descriptor */
+struct uvc_camera_terminal_descriptor {
+	__u8   bLength;
+	__u8   bDescriptorType;
+	__u8   bDescriptorSubType;
+	__u8   bTerminalID;
+	__le16 wTerminalType;
+	__u8   bAssocTerminal;
+	__u8   iTerminal;
+	__le16 wObjectiveFocalLengthMin;
+	__le16 wObjectiveFocalLengthMax;
+	__le16 wOcularFocalLength;
+	__u8   bControlSize;
+	__u8   bmControls3;
+} __attribute__((__packed__));
+
+#define UVC_DT_CAMERA_TERMINAL_SIZE(n)			(15+(n))
+
+/* 3.7.2.4. Selector Unit Descriptor */
+struct uvc_selector_unit_descriptor {
+	__u8  bLength;
+	__u8  bDescriptorType;
+	__u8  bDescriptorSubType;
+	__u8  bUnitID;
+	__u8  bNrInPins;
+	__u8  baSourceID0;
+	__u8  iSelector;
+} __attribute__((__packed__));
+
+#define UVC_DT_SELECTOR_UNIT_SIZE(n)			(6+(n))
+
+#define UVC_SELECTOR_UNIT_DESCRIPTOR(n)	\
+	uvc_selector_unit_descriptor_##n
+
+#define DECLARE_UVC_SELECTOR_UNIT_DESCRIPTOR(n)	\
+struct UVC_SELECTOR_UNIT_DESCRIPTOR(n) {		\
+	__u8  bLength;					\
+	__u8  bDescriptorType;				\
+	__u8  bDescriptorSubType;			\
+	__u8  bUnitID;					\
+	__u8  bNrInPins;				\
+	__u8  baSourceIDn;				\
+	__u8  iSelector;				\
+} __attribute__ ((packed))
+
+/* 3.7.2.5. Processing Unit Descriptor */
+struct uvc_processing_unit_descriptor {
+	__u8   bLength;
+	__u8   bDescriptorType;
+	__u8   bDescriptorSubType;
+	__u8   bUnitID;
+	__u8   bSourceID;
+	__le16 wMaxMultiplier;
+	__u8   bControlSize;
+	__u8   bmControls2;
+	__u8   iProcessing;
+	__u8   bmVideoStandards;
+} __attribute__((__packed__));
+
+#define UVC_DT_PROCESSING_UNIT_SIZE(n)			(10+(n))
+
+/* 3.7.2.6. Extension Unit Descriptor */
+struct uvc_extension_unit_descriptor {
+	__u8  bLength;
+	__u8  bDescriptorType;
+	__u8  bDescriptorSubType;
+	__u8  bUnitID;
+	__u8  guidExtensionCode16;
+	__u8  bNumControls;
+	__u8  bNrInPins;
+	__u8  baSourceID0;
+	__u8  bControlSize;
+	__u8  bmControls0;
+	__u8  iExtension;
+} __attribute__((__packed__));
+
+#define UVC_DT_EXTENSION_UNIT_SIZE(p, n)		(24+(p)+(n))
+
+#define UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) \
+	uvc_extension_unit_descriptor_##p_##n
+
+#define DECLARE_UVC_EXTENSION_UNIT_DESCRIPTOR(p, n)	\
+struct UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) {		\
+	__u8  bLength;					\
+	__u8  bDescriptorType;				\
+	__u8  bDescriptorSubType;			\
+	__u8  bUnitID;					\
+	__u8  guidExtensionCode16;			\
+	__u8  bNumControls;				\
+	__u8  bNrInPins;				\
+	__u8  baSourceIDp;				\
+	__u8  bControlSize;				\
+	__u8  bmControlsn;				\
+	__u8  iExtension;				\
+} __attribute__ ((packed))
+
+/* 3.8.2.2. Video Control Interrupt Endpoint Descriptor */
+struct uvc_control_endpoint_descriptor {
+	__u8   bLength;
+	__u8   bDescriptorType;
+	__u8   bDescriptorSubType;
+	__le16 wMaxTransferSize;
+} __attribute__((__packed__));
+
+#define UVC_DT_CONTROL_ENDPOINT_SIZE			5
+
+/* 3.9.2.1. Input Header Descriptor */
+struct uvc_input_header_descriptor {
+	__u8   bLength;
+	__u8   bDescriptorType;
+	__u8   bDescriptorSubType;
+	__u8   bNumFormats;
+	__le16 wTotalLength;
+	__u8   bEndpointAddress;
+	__u8   bmInfo;
+	__u8   bTerminalLink;
+	__u8   bStillCaptureMethod;
+	__u8   bTriggerSupport;
+	__u8   bTriggerUsage;
+	__u8   bControlSize;
+	__u8   bmaControls;
+} __attribute__((__packed__));
+
+#define UVC_DT_INPUT_HEADER_SIZE(n, p)			(13+(n*p))
+
+#define UVC_INPUT_HEADER_DESCRIPTOR(n, p) \
+	uvc_input_header_descriptor_##n_##p
+
+#define DECLARE_UVC_INPUT_HEADER_DESCRIPTOR(n, p)	\
+struct UVC_INPUT_HEADER_DESCRIPTOR(n, p) {		\
+	__u8   bLength;					\
+	__u8   bDescriptorType;				\
+	__u8   bDescriptorSubType;			\
+	__u8   bNumFormats;				\
+	__le16 wTotalLength;				\
+	__u8   bEndpointAddress;			\
+	__u8   bmInfo;					\
+	__u8   bTerminalLink;				\
+	__u8   bStillCaptureMethod;			\
+	__u8   bTriggerSupport;				\
+	__u8   bTriggerUsage;				\
+	__u8   bControlSize;				\
+	__u8   bmaControlspn;			\
+} __attribute__ ((packed))
+
+/* 3.9.2.2. Output Header Descriptor */
+struct uvc_output_header_descriptor {
+	__u8   bLength;
+	__u8   bDescriptorType;
+	__u8   bDescriptorSubType;
+	__u8   bNumFormats;
+	__le16 wTotalLength;
+	__u8   bEndpointAddress;
+	__u8   bTerminalLink;
+	__u8   bControlSize;
+	__u8   bmaControls;
+} __attribute__((__packed__));
+
+#define UVC_DT_OUTPUT_HEADER_SIZE(n, p)			(9+(n*p))
+
+#define UVC_OUTPUT_HEADER_DESCRIPTOR(n, p) \
+	uvc_output_header_descriptor_##n_##p
+
+#define DECLARE_UVC_OUTPUT_HEADER_DESCRIPTOR(n, p)	\
+struct UVC_OUTPUT_HEADER_DESCRIPTOR(n, p) {		\
+	__u8   bLength;					\
+	__u8   bDescriptorType;				\
+	__u8   bDescriptorSubType;			\
+	__u8   bNumFormats;				\
+	__le16 wTotalLength;				\
+	__u8   bEndpointAddress;			\
+	__u8   bTerminalLink;				\
+	__u8   bControlSize;				\
+	__u8   bmaControlspn;			\
+} __attribute__ ((packed))
+
+/* 3.9.2.6. Color matching descriptor */
+struct uvc_color_matching_descriptor {
+	__u8  bLength;
+	__u8  bDescriptorType;
+	__u8  bDescriptorSubType;
+	__u8  bColorPrimaries;
+	__u8  bTransferCharacteristics;
+	__u8  bMatrixCoefficients;
+} __attribute__((__packed__));
+
+#define UVC_DT_COLOR_MATCHING_SIZE			6
+
+/* 4.3.1.1. Video Probe and Commit Controls */
+struct uvc_streaming_control {
+	__u16 bmHint;
+	__u8  bFormatIndex;
+	__u8  bFrameIndex;
+	__u32 dwFrameInterval;
+	__u16 wKeyFrameRate;
+	__u16 wPFrameRate;
+	__u16 wCompQuality;
+	__u16 wCompWindowSize;
+	__u16 wDelay;
+	__u32 dwMaxVideoFrameSize;
+	__u32 dwMaxPayloadTransferSize;
+	__u32 dwClockFrequency;
+	__u8  bmFramingInfo;
+	__u8  bPreferedVersion;
+	__u8  bMinVersion;
+	__u8  bMaxVersion;
+} __attribute__((__packed__));
+
+/* Uncompressed Payload - 3.1.1. Uncompressed Video Format Descriptor */
+struct uvc_format_uncompressed {
+	__u8  bLength;
+	__u8  bDescriptorType;
+	__u8  bDescriptorSubType;
+	__u8  bFormatIndex;
+	__u8  bNumFrameDescriptors;
+	__u8  guidFormat16;
+	__u8  bBitsPerPixel;
+	__u8  bDefaultFrameIndex;
+	__u8  bAspectRatioX;
+	__u8  bAspectRatioY;
+	__u8  bmInterfaceFlags;
+	__u8  bCopyProtect;
+} __attribute__((__packed__));
+
+#define UVC_DT_FORMAT_UNCOMPRESSED_SIZE			27
+
+/* Uncompressed Payload - 3.1.2. Uncompressed Video Frame Descriptor */
+struct uvc_frame_uncompressed {
+	__u8   bLength;
+	__u8   bDescriptorType;
+	__u8   bDescriptorSubType;
+	__u8   bFrameIndex;
+	__u8   bmCapabilities;
+	__le16 wWidth;
+	__le16 wHeight;
+	__le32 dwMinBitRate;
+	__le32 dwMaxBitRate;
+	__le32 dwMaxVideoFrameBufferSize;
+	__le32 dwDefaultFrameInterval;
+	__u8   bFrameIntervalType;
+	__le32 dwFrameInterval;
+} __attribute__((__packed__));
+
+#define UVC_DT_FRAME_UNCOMPRESSED_SIZE(n)		(26+4*(n))
+
+#define UVC_FRAME_UNCOMPRESSED(n) \
+	uvc_frame_uncompressed_##n
+
+#define DECLARE_UVC_FRAME_UNCOMPRESSED(n)		\
+struct UVC_FRAME_UNCOMPRESSED(n) {			\
+	__u8   bLength;					\
+	__u8   bDescriptorType;				\
+	__u8   bDescriptorSubType;			\
+	__u8   bFrameIndex;				\
+	__u8   bmCapabilities;				\
+	__le16 wWidth;					\
+	__le16 wHeight;					\
+	__le32 dwMinBitRate;				\
+	__le32 dwMaxBitRate;				\
+	__le32 dwMaxVideoFrameBufferSize;		\
+	__le32 dwDefaultFrameInterval;			\
+	__u8   bFrameIntervalType;			\
+	__le32 dwFrameIntervaln;			\
+} __attribute__ ((packed))
+
+/* MJPEG Payload - 3.1.1. MJPEG Video Format Descriptor */
+struct uvc_format_mjpeg {
+	__u8  bLength;
+	__u8  bDescriptorType;
+	__u8  bDescriptorSubType;
+	__u8  bFormatIndex;
+	__u8  bNumFrameDescriptors;
+	__u8  bmFlags;
+	__u8  bDefaultFrameIndex;
+	__u8  bAspectRatioX;
+	__u8  bAspectRatioY;
+	__u8  bmInterfaceFlags;
+	__u8  bCopyProtect;
+} __attribute__((__packed__));
+
+#define UVC_DT_FORMAT_MJPEG_SIZE			11
+
+/* MJPEG Payload - 3.1.2. MJPEG Video Frame Descriptor */
+struct uvc_frame_mjpeg {
+	__u8   bLength;
+	__u8   bDescriptorType;
+	__u8   bDescriptorSubType;
+	__u8   bFrameIndex;
+	__u8   bmCapabilities;
+	__le16 wWidth;
+	__le16 wHeight;
+	__le32 dwMinBitRate;
+	__le32 dwMaxBitRate;
+	__le32 dwMaxVideoFrameBufferSize;
+	__le32 dwDefaultFrameInterval;
+	__u8   bFrameIntervalType;
+	__le32 dwFrameInterval;
+} __attribute__((__packed__));
+
+#define UVC_DT_FRAME_MJPEG_SIZE(n)			(26+4*(n))
+
+#define UVC_FRAME_MJPEG(n) \
+	uvc_frame_mjpeg_##n
+
+#define DECLARE_UVC_FRAME_MJPEG(n)			\
+struct UVC_FRAME_MJPEG(n) {				\
+	__u8   bLength;					\
+	__u8   bDescriptorType;				\
+	__u8   bDescriptorSubType;			\
+	__u8   bFrameIndex;				\
+	__u8   bmCapabilities;				\
+	__le16 wWidth;					\
+	__le16 wHeight;					\
+	__le32 dwMinBitRate;				\
+	__le32 dwMaxBitRate;				\
+	__le32 dwMaxVideoFrameBufferSize;		\
+	__le32 dwDefaultFrameInterval;			\
+	__u8   bFrameIntervalType;			\
+	__le32 dwFrameIntervaln;			\
+} __attribute__ ((packed))
+
+#endif /* __LINUX_USB_VIDEO_H */
+

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/linux/v4l2-common.h -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/linux/v4l2-common.h Changed

@@ -10,45 +10,6 @@
  *
  * Copyright (C) 2012 Nokia Corporation
  * Contact: Sakari Ailus <sakari.ailus@iki.fi>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  Alternatively you can redistribute this file under the terms of the
- *  BSD license as stated below:
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *  3. The names of its contributors may not be used to endorse or promote
- *     products derived from this software without specific prior written
- *     permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  */
 
 #ifndef __V4L2_COMMON__

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/linux/v4l2-controls.h -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/linux/v4l2-controls.h Changed

@@ -4,44 +4,6 @@
  *
  *  Copyright (C) 1999-2012 the contributors
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  Alternatively you can redistribute this file under the terms of the
- *  BSD license as stated below:
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *  3. The names of its contributors may not be used to endorse or promote
- *     products derived from this software without specific prior written
- *     permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  *  The contents of this header was split off from videodev2.h. All control
  *  definitions should be added to this header, which is included by
  *  videodev2.h.
@@ -152,8 +114,10 @@
 
 /* USER-class private control IDs */
 
-/* The base for the meye driver controls. See linux/meye.h for the list
- * of controls. We reserve 16 controls for this driver. */
+/*
+ * The base for the meye driver controls. This driver was removed, but
+ * we keep this define in case any software still uses it.
+ */
 #define V4L2_CID_USER_MEYE_BASE			(V4L2_CID_USER_BASE + 0x1000)
 
 /* The base for the bttv driver controls.
@@ -224,6 +188,18 @@
  */
 #define V4L2_CID_USER_ISL7998X_BASE		(V4L2_CID_USER_BASE + 0x1180)
 
+/*
+ * The base for DW100 driver controls.
+ * We reserve 16 controls for this driver.
+ */
+#define V4L2_CID_USER_DW100_BASE		(V4L2_CID_USER_BASE + 0x1190)
+
+/*
+ * The base for Aspeed driver controls.
+ * We reserve 16 controls for this driver.
+ */
+#define V4L2_CID_USER_ASPEED_BASE		(V4L2_CID_USER_BASE + 0x11a0)
+
 /* MPEG-class control IDs */
 /* The MPEG controls are applicable to all codec controls
  * and the 'MPEG' part of the define is historical */
@@ -823,6 +799,88 @@
 #define V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY		(V4L2_CID_CODEC_BASE + 653)
 #define V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE	(V4L2_CID_CODEC_BASE + 654)
 
+#define V4L2_CID_MPEG_VIDEO_AV1_PROFILE (V4L2_CID_CODEC_BASE + 655)
+/**
+ * enum v4l2_mpeg_video_av1_profile - AV1 profiles
+ *
+ * @V4L2_MPEG_VIDEO_AV1_PROFILE_MAIN: compliant decoders must be able to decode
+ * streams with seq_profile equal to 0.
+ * @V4L2_MPEG_VIDEO_AV1_PROFILE_HIGH: compliant decoders must be able to decode
+ * streams with seq_profile equal less than or equal to 1.
+ * @V4L2_MPEG_VIDEO_AV1_PROFILE_PROFESSIONAL: compliant decoders must be able to
+ * decode streams with seq_profile less than or equal to 2.
+ *
+ * Conveys the highest profile a decoder can work with.
+ */
+enum v4l2_mpeg_video_av1_profile {
+	V4L2_MPEG_VIDEO_AV1_PROFILE_MAIN = 0,
+	V4L2_MPEG_VIDEO_AV1_PROFILE_HIGH = 1,
+	V4L2_MPEG_VIDEO_AV1_PROFILE_PROFESSIONAL = 2,
+};
+
+#define V4L2_CID_MPEG_VIDEO_AV1_LEVEL (V4L2_CID_CODEC_BASE + 656)
+/**
+ * enum v4l2_mpeg_video_av1_level - AV1 levels
+ *
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_2_0: Level 2.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_2_1: Level 2.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_2_2: Level 2.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_2_3: Level 2.3.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_3_0: Level 3.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_3_1: Level 3.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_3_2: Level 3.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_3_3: Level 3.3.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_4_0: Level 4.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_4_1: Level 4.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_4_2: Level 4.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_4_3: Level 4.3.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_5_0: Level 5.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_5_1: Level 5.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_5_2: Level 5.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_5_3: Level 5.3.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_6_0: Level 6.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_6_1: Level 6.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_6_2: Level 6.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_6_3: Level 6.3.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_7_0: Level 7.0.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_7_1: Level 7.1.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_7_2: Level 7.2.
+ * @V4L2_MPEG_VIDEO_AV1_LEVEL_7_3: Level 7.3.
+ *
+ * Conveys the highest level a decoder can work with.
+ */
+enum v4l2_mpeg_video_av1_level {
+	V4L2_MPEG_VIDEO_AV1_LEVEL_2_0 = 0,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_2_1 = 1,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_2_2 = 2,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_2_3 = 3,
+
+	V4L2_MPEG_VIDEO_AV1_LEVEL_3_0 = 4,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_3_1 = 5,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_3_2 = 6,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_3_3 = 7,
+
+	V4L2_MPEG_VIDEO_AV1_LEVEL_4_0 = 8,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_4_1 = 9,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_4_2 = 10,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_4_3 = 11,
+
+	V4L2_MPEG_VIDEO_AV1_LEVEL_5_0 = 12,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_5_1 = 13,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_5_2 = 14,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_5_3 = 15,
+
+	V4L2_MPEG_VIDEO_AV1_LEVEL_6_0 = 16,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_6_1 = 17,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_6_2 = 18,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_6_3 = 19,
+
+	V4L2_MPEG_VIDEO_AV1_LEVEL_7_0 = 20,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_7_1 = 21,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_7_2 = 22,
+	V4L2_MPEG_VIDEO_AV1_LEVEL_7_3 = 23
+};
+
 /*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
 #define V4L2_CID_CODEC_CX2341X_BASE				(V4L2_CTRL_CLASS_CODEC | 0x1000)
 #define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE		(V4L2_CID_CODEC_CX2341X_BASE+0)
@@ -1010,6 +1068,8 @@
 
 #define V4L2_CID_CAMERA_SENSOR_ROTATION		(V4L2_CID_CAMERA_CLASS_BASE+35)
 
+#define V4L2_CID_HDR_SENSOR_MODE		(V4L2_CID_CAMERA_CLASS_BASE+36)
+
 /* FM Modulator class control IDs */
 
 #define V4L2_CID_FM_TX_CLASS_BASE		(V4L2_CTRL_CLASS_FM_TX | 0x900)
@@ -1727,7 +1787,7 @@
  * @sharpness_level: matches sharpness_level syntax element.
  * @level: matches loop_filter_level syntax element.
  * @padding: padding field. Should be zeroed by applications.
- * @flags: see V4L2_VP8_LF_FLAG_{}.
+ * @flags: see V4L2_VP8_LF_{}.
  *
  * This structure contains loop filter related parameters.
  * See the 'mb_lf_adjustments()' part of the frame header syntax,
@@ -2402,6 +2462,9 @@
  * @poc_st_curr_after: provides the index of the short term after references
  *		       in DPB array
  * @poc_lt_curr: provides the index of the long term references in DPB array
+ * @num_delta_pocs_of_ref_rps_idx: same as the derived value NumDeltaPocsRefRpsIdx,
+ *				   can be used to parse the RPS data in slice headers
+ *				   instead of skipping it with @short_term_ref_pic_set_size.
  * @reserved: padding field. Should be zeroed by applications.
  * @dpb: the decoded picture buffer, for meta-data about reference frames
  * @flags: see V4L2_HEVC_DECODE_PARAM_FLAG_{}
@@ -2417,7 +2480,8 @@
 	__u8	poc_st_curr_beforeV4L2_HEVC_DPB_ENTRIES_NUM_MAX;
 	__u8	poc_st_curr_afterV4L2_HEVC_DPB_ENTRIES_NUM_MAX;
 	__u8	poc_lt_currV4L2_HEVC_DPB_ENTRIES_NUM_MAX;
-	__u8	reserved4;
+	__u8	num_delta_pocs_of_ref_rps_idx;
+	__u8	reserved3;
 	struct	v4l2_hevc_dpb_entry dpbV4L2_HEVC_DPB_ENTRIES_NUM_MAX;
 	__u64	flags;
 };
@@ -2771,6 +2835,645 @@
 	struct v4l2_vp9_mv_probs mv;
 };
 
+/* Stateless AV1 controls */
+
+#define V4L2_AV1_TOTAL_REFS_PER_FRAME	8
+#define V4L2_AV1_CDEF_MAX		8
+#define V4L2_AV1_NUM_PLANES_MAX		3 /* 1 if monochrome, 3 otherwise */
+#define V4L2_AV1_MAX_SEGMENTS		8
+#define V4L2_AV1_MAX_OPERATING_POINTS	(1 << 5) /* 5 bits to encode */
+#define V4L2_AV1_REFS_PER_FRAME		7
+#define V4L2_AV1_MAX_NUM_Y_POINTS	(1 << 4) /* 4 bits to encode */
+#define V4L2_AV1_MAX_NUM_CB_POINTS	(1 << 4) /* 4 bits to encode */
+#define V4L2_AV1_MAX_NUM_CR_POINTS	(1 << 4) /* 4 bits to encode */
+#define V4L2_AV1_AR_COEFFS_SIZE		25 /* (2 * 3 * (3 + 1)) + 1 */
+#define V4L2_AV1_MAX_NUM_PLANES		3
+#define V4L2_AV1_MAX_TILE_COLS		64
+#define V4L2_AV1_MAX_TILE_ROWS		64
+#define V4L2_AV1_MAX_TILE_COUNT		512
+
+#define V4L2_AV1_SEQUENCE_FLAG_STILL_PICTURE		  0x00000001
+#define V4L2_AV1_SEQUENCE_FLAG_USE_128X128_SUPERBLOCK	  0x00000002
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_FILTER_INTRA	  0x00000004
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_INTRA_EDGE_FILTER   0x00000008
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_INTERINTRA_COMPOUND 0x00000010
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_MASKED_COMPOUND	  0x00000020
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_WARPED_MOTION	  0x00000040
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_DUAL_FILTER	  0x00000080
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_ORDER_HINT	  0x00000100
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_JNT_COMP		  0x00000200
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_REF_FRAME_MVS	  0x00000400
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_SUPERRES		  0x00000800
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_CDEF		  0x00001000
+#define V4L2_AV1_SEQUENCE_FLAG_ENABLE_RESTORATION	  0x00002000
+#define V4L2_AV1_SEQUENCE_FLAG_MONO_CHROME		  0x00004000
+#define V4L2_AV1_SEQUENCE_FLAG_COLOR_RANGE		  0x00008000
+#define V4L2_AV1_SEQUENCE_FLAG_SUBSAMPLING_X		  0x00010000
+#define V4L2_AV1_SEQUENCE_FLAG_SUBSAMPLING_Y		  0x00020000
+#define V4L2_AV1_SEQUENCE_FLAG_FILM_GRAIN_PARAMS_PRESENT  0x00040000
+#define V4L2_AV1_SEQUENCE_FLAG_SEPARATE_UV_DELTA_Q	  0x00080000
+
+#define V4L2_CID_STATELESS_AV1_SEQUENCE (V4L2_CID_CODEC_STATELESS_BASE + 500)
+/**
+ * struct v4l2_ctrl_av1_sequence - AV1 Sequence
+ *
+ * Represents an AV1 Sequence OBU. See section 5.5 "Sequence header OBU syntax"
+ * for more details.
+ *
+ * @flags: See V4L2_AV1_SEQUENCE_FLAG_{}.
+ * @seq_profile: specifies the features that can be used in the coded video
+ * sequence.
+ * @order_hint_bits: specifies the number of bits used for the order_hint field
+ * at each frame.
+ * @bit_depth: the bitdepth to use for the sequence as described in section
+ * 5.5.2 "Color config syntax".
+ * @reserved: padding field. Should be zeroed by applications.
+ * @max_frame_width_minus_1: specifies the maximum frame width minus 1 for the
+ * frames represented by this sequence header.
+ * @max_frame_height_minus_1: specifies the maximum frame height minus 1 for the
+ * frames represented by this sequence header.
+ */
+struct v4l2_ctrl_av1_sequence {
+	__u32 flags;
+	__u8 seq_profile;
+	__u8 order_hint_bits;
+	__u8 bit_depth;
+	__u8 reserved;
+	__u16 max_frame_width_minus_1;
+	__u16 max_frame_height_minus_1;
+};
+
+#define V4L2_CID_STATELESS_AV1_TILE_GROUP_ENTRY (V4L2_CID_CODEC_STATELESS_BASE + 501)
+/**
+ * struct v4l2_ctrl_av1_tile_group_entry - AV1 Tile Group entry
+ *
+ * Represents a single AV1 tile inside an AV1 Tile Group. Note that MiRowStart,
+ * MiRowEnd, MiColStart and MiColEnd can be retrieved from struct
+ * v4l2_av1_tile_info in struct v4l2_ctrl_av1_frame using tile_row and
+ * tile_col. See section 6.10.1 "General tile group OBU semantics" for more
+ * details.
+ *
+ * @tile_offset: offset from the OBU data, i.e. where the coded tile data
+ * actually starts.
+ * @tile_size: specifies the size in bytes of the coded tile. Equivalent to
+ * "TileSize" in the AV1 Specification.
+ * @tile_row: specifies the row of the current tile. Equivalent to "TileRow" in
+ * the AV1 Specification.
+ * @tile_col: specifies the col of the current tile. Equivalent to "TileCol" in
+ * the AV1 Specification.
+ */
+struct v4l2_ctrl_av1_tile_group_entry {
+	__u32 tile_offset;
+	__u32 tile_size;
+	__u32 tile_row;
+	__u32 tile_col;
+};
+
+/**
+ * enum v4l2_av1_warp_model - AV1 Warp Model as described in section 3
+ * "Symbols and abbreviated terms" of the AV1 Specification.
+ *
+ * @V4L2_AV1_WARP_MODEL_IDENTITY: Warp model is just an identity transform.
+ * @V4L2_AV1_WARP_MODEL_TRANSLATION: Warp model is a pure translation.
+ * @V4L2_AV1_WARP_MODEL_ROTZOOM: Warp model is a rotation + symmetric zoom +
+ * translation.
+ * @V4L2_AV1_WARP_MODEL_AFFINE: Warp model is a general affine transform.
+ */
+enum v4l2_av1_warp_model {
+	V4L2_AV1_WARP_MODEL_IDENTITY = 0,
+	V4L2_AV1_WARP_MODEL_TRANSLATION = 1,
+	V4L2_AV1_WARP_MODEL_ROTZOOM = 2,
+	V4L2_AV1_WARP_MODEL_AFFINE = 3,
+};
+
+/**
+ * enum v4l2_av1_reference_frame - AV1 reference frames
+ *
+ * @V4L2_AV1_REF_INTRA_FRAME: Intra Frame Reference
+ * @V4L2_AV1_REF_LAST_FRAME: Last Reference Frame
+ * @V4L2_AV1_REF_LAST2_FRAME: Last2 Reference Frame
+ * @V4L2_AV1_REF_LAST3_FRAME: Last3 Reference Frame
+ * @V4L2_AV1_REF_GOLDEN_FRAME: Golden Reference Frame
+ * @V4L2_AV1_REF_BWDREF_FRAME: BWD Reference Frame
+ * @V4L2_AV1_REF_ALTREF2_FRAME: Alternative2 Reference Frame
+ * @V4L2_AV1_REF_ALTREF_FRAME: Alternative Reference Frame
+ */
+enum v4l2_av1_reference_frame {
+	V4L2_AV1_REF_INTRA_FRAME = 0,
+	V4L2_AV1_REF_LAST_FRAME = 1,
+	V4L2_AV1_REF_LAST2_FRAME = 2,
+	V4L2_AV1_REF_LAST3_FRAME = 3,
+	V4L2_AV1_REF_GOLDEN_FRAME = 4,
+	V4L2_AV1_REF_BWDREF_FRAME = 5,
+	V4L2_AV1_REF_ALTREF2_FRAME = 6,
+	V4L2_AV1_REF_ALTREF_FRAME = 7,
+};
+
+#define V4L2_AV1_GLOBAL_MOTION_IS_INVALID(ref) (1 << (ref))
+
+#define V4L2_AV1_GLOBAL_MOTION_FLAG_IS_GLOBAL	   0x1
+#define V4L2_AV1_GLOBAL_MOTION_FLAG_IS_ROT_ZOOM	   0x2
+#define V4L2_AV1_GLOBAL_MOTION_FLAG_IS_TRANSLATION 0x4
+/**
+ * struct v4l2_av1_global_motion - AV1 Global Motion parameters as described in
+ * section 6.8.17 "Global motion params semantics" of the AV1 specification.
+ *
+ * @flags: A bitfield containing the flags per reference frame. See
+ * V4L2_AV1_GLOBAL_MOTION_FLAG_{}
+ * @type: The type of global motion transform used.
+ * @params: this field has the same meaning as "gm_params" in the AV1
+ * specification.
+ * @invalid: bitfield indicating whether the global motion params are invalid
+ * for a given reference frame. See section 7.11.3.6 Setup shear process and
+ * the variable "warpValid". Use V4L2_AV1_GLOBAL_MOTION_IS_INVALID(ref) to
+ * create a suitable mask.
+ * @reserved: padding field. Should be zeroed by applications.
+ */
+
+struct v4l2_av1_global_motion {
+	__u8 flagsV4L2_AV1_TOTAL_REFS_PER_FRAME;
+	enum v4l2_av1_warp_model typeV4L2_AV1_TOTAL_REFS_PER_FRAME;
+	__s32 paramsV4L2_AV1_TOTAL_REFS_PER_FRAME6;
+	__u8 invalid;
+	__u8 reserved3;
+};
+
+/**
+ * enum v4l2_av1_frame_restoration_type - AV1 Frame Restoration Type
+ * @V4L2_AV1_FRAME_RESTORE_NONE: no filtering is applied.
+ * @V4L2_AV1_FRAME_RESTORE_WIENER: Wiener filter process is invoked.
+ * @V4L2_AV1_FRAME_RESTORE_SGRPROJ: self guided filter process is invoked.
+ * @V4L2_AV1_FRAME_RESTORE_SWITCHABLE: restoration filter is swichtable.
+ */
+enum v4l2_av1_frame_restoration_type {
+	V4L2_AV1_FRAME_RESTORE_NONE = 0,
+	V4L2_AV1_FRAME_RESTORE_WIENER = 1,
+	V4L2_AV1_FRAME_RESTORE_SGRPROJ = 2,
+	V4L2_AV1_FRAME_RESTORE_SWITCHABLE = 3,
+};
+
+#define V4L2_AV1_LOOP_RESTORATION_FLAG_USES_LR		0x1
+#define V4L2_AV1_LOOP_RESTORATION_FLAG_USES_CHROMA_LR	0x2
+
+/**
+ * struct v4l2_av1_loop_restoration - AV1 Loop Restauration as described in
+ * section 6.10.15 "Loop restoration params semantics" of the AV1 specification.
+ *
+ * @flags: See V4L2_AV1_LOOP_RESTORATION_FLAG_{}.
+ * @lr_unit_shift: specifies if the luma restoration size should be halved.
+ * @lr_uv_shift: specifies if the chroma size should be half the luma size.
+ * @reserved: padding field. Should be zeroed by applications.
+ * @frame_restoration_type: specifies the type of restoration used for each
+ * plane. See enum v4l2_av1_frame_restoration_type.
+ * @loop_restoration_size: specifies the size of loop restoration units in units
+ * of samples in the current plane.
+ */
+struct v4l2_av1_loop_restoration {
+	__u8 flags;
+	__u8 lr_unit_shift;
+	__u8 lr_uv_shift;
+	__u8 reserved;
+	enum v4l2_av1_frame_restoration_type frame_restoration_typeV4L2_AV1_NUM_PLANES_MAX;
+	__u32 loop_restoration_sizeV4L2_AV1_MAX_NUM_PLANES;
+};
+
+/**
+ * struct v4l2_av1_cdef - AV1 CDEF params semantics as described in section
+ * 6.10.14 "CDEF params semantics" of the AV1 specification
+ *
+ * @damping_minus_3: controls the amount of damping in the deringing filter.
+ * @bits: specifies the number of bits needed to specify which CDEF filter to
+ * apply.
+ * @y_pri_strength: specifies the strength of the primary filter.
+ * @y_sec_strength: specifies the strength of the secondary filter.
+ * @uv_pri_strength: specifies the strength of the primary filter.
+ * @uv_sec_strength: specifies the strength of the secondary filter.
+ */
+struct v4l2_av1_cdef {
+	__u8 damping_minus_3;
+	__u8 bits;
+	__u8 y_pri_strengthV4L2_AV1_CDEF_MAX;
+	__u8 y_sec_strengthV4L2_AV1_CDEF_MAX;
+	__u8 uv_pri_strengthV4L2_AV1_CDEF_MAX;
+	__u8 uv_sec_strengthV4L2_AV1_CDEF_MAX;
+};
+
+#define V4L2_AV1_SEGMENTATION_FLAG_ENABLED	   0x1
+#define V4L2_AV1_SEGMENTATION_FLAG_UPDATE_MAP	   0x2
+#define V4L2_AV1_SEGMENTATION_FLAG_TEMPORAL_UPDATE 0x4
+#define V4L2_AV1_SEGMENTATION_FLAG_UPDATE_DATA	   0x8
+#define V4L2_AV1_SEGMENTATION_FLAG_SEG_ID_PRE_SKIP 0x10
+
+/**
+ * enum v4l2_av1_segment_feature - AV1 segment features as described in section
+ * 3 "Symbols and abbreviated terms" of the AV1 specification.
+ *
+ * @V4L2_AV1_SEG_LVL_ALT_Q: Index for quantizer segment feature.
+ * @V4L2_AV1_SEG_LVL_ALT_LF_Y_V: Index for vertical luma loop filter segment
+ * feature.
+ * @V4L2_AV1_SEG_LVL_REF_FRAME: Index for reference frame segment feature.
+ * @V4L2_AV1_SEG_LVL_REF_SKIP: Index for skip segment feature.
+ * @V4L2_AV1_SEG_LVL_REF_GLOBALMV: Index for global mv feature.
+ * @V4L2_AV1_SEG_LVL_MAX: Number of segment features.
+ */
+enum v4l2_av1_segment_feature {
+	V4L2_AV1_SEG_LVL_ALT_Q = 0,
+	V4L2_AV1_SEG_LVL_ALT_LF_Y_V = 1,
+	V4L2_AV1_SEG_LVL_REF_FRAME = 5,
+	V4L2_AV1_SEG_LVL_REF_SKIP = 6,
+	V4L2_AV1_SEG_LVL_REF_GLOBALMV = 7,
+	V4L2_AV1_SEG_LVL_MAX = 8
+};
+
+#define V4L2_AV1_SEGMENT_FEATURE_ENABLED(id)	(1 << (id))
+
+/**
+ * struct v4l2_av1_segmentation - AV1 Segmentation params as defined in section
+ * 6.8.13 "Segmentation params semantics" of the AV1 specification.
+ *
+ * @flags: see V4L2_AV1_SEGMENTATION_FLAG_{}.
+ * @last_active_seg_id: indicates the highest numbered segment id that has some
+ * enabled feature. This is used when decoding the segment id to only decode
+ * choices corresponding to used segments.
+ * @feature_enabled: bitmask defining which features are enabled in each
+ * segment. Use V4L2_AV1_SEGMENT_FEATURE_ENABLED to build a suitable mask.
+ * @feature_data: data attached to each feature. Data entry is only valid if the
+ * feature is enabled
+ */
+struct v4l2_av1_segmentation {
+	__u8 flags;
+	__u8 last_active_seg_id;
+	__u8 feature_enabledV4L2_AV1_MAX_SEGMENTS;
+	__s16 feature_dataV4L2_AV1_MAX_SEGMENTSV4L2_AV1_SEG_LVL_MAX;
+};
+
+#define V4L2_AV1_LOOP_FILTER_FLAG_DELTA_ENABLED    0x1
+#define V4L2_AV1_LOOP_FILTER_FLAG_DELTA_UPDATE     0x2
+#define V4L2_AV1_LOOP_FILTER_FLAG_DELTA_LF_PRESENT 0x4
+#define V4L2_AV1_LOOP_FILTER_FLAG_DELTA_LF_MULTI   0x8
+
+/**
+ * struct v4l2_av1_loop_filter - AV1 Loop filter params as defined in section
+ * 6.8.10 "Loop filter semantics" and 6.8.16 "Loop filter delta parameters
+ * semantics" of the AV1 specification.
+ *
+ * @flags: see V4L2_AV1_LOOP_FILTER_FLAG_{}
+ * @level: an array containing loop filter strength values. Different loop
+ * filter strength values from the array are used depending on the image plane
+ * being filtered, and the edge direction (vertical or horizontal) being
+ * filtered.
+ * @sharpness: indicates the sharpness level. The loop_filter_level and
+ * loop_filter_sharpness together determine when a block edge is filtered, and
+ * by how much the filtering can change the sample values. The loop filter
+ * process is described in section 7.14 of the AV1 specification.
+ * @ref_deltas: contains the adjustment needed for the filter level based on the
+ * chosen reference frame. If this syntax element is not present, it maintains
+ * its previous value.
+ * @mode_deltas: contains the adjustment needed for the filter level based on
+ * the chosen mode. If this syntax element is not present, it maintains its
+ * previous value.
+ * @delta_lf_res: specifies the left shift which should be applied to decoded
+ * loop filter delta values.
+ */
+struct v4l2_av1_loop_filter {
+	__u8 flags;
+	__u8 level4;
+	__u8 sharpness;
+	__s8 ref_deltasV4L2_AV1_TOTAL_REFS_PER_FRAME;
+	__s8 mode_deltas2;
+	__u8 delta_lf_res;
+};
+
+#define V4L2_AV1_QUANTIZATION_FLAG_DIFF_UV_DELTA   0x1
+#define V4L2_AV1_QUANTIZATION_FLAG_USING_QMATRIX   0x2
+#define V4L2_AV1_QUANTIZATION_FLAG_DELTA_Q_PRESENT 0x4
+
+/**
+ * struct v4l2_av1_quantization - AV1 Quantization params as defined in section
+ * 6.8.11 "Quantization params semantics" of the AV1 specification.
+ *
+ * @flags: see V4L2_AV1_QUANTIZATION_FLAG_{}
+ * @base_q_idx: indicates the base frame qindex. This is used for Y AC
+ * coefficients and as the base value for the other quantizers.
+ * @delta_q_y_dc: indicates the Y DC quantizer relative to base_q_idx.
+ * @delta_q_u_dc: indicates the U DC quantizer relative to base_q_idx.
+ * @delta_q_u_ac: indicates the U AC quantizer relative to base_q_idx.
+ * @delta_q_v_dc: indicates the V DC quantizer relative to base_q_idx.
+ * @delta_q_v_ac: indicates the V AC quantizer relative to base_q_idx.
+ * @qm_y: specifies the level in the quantizer matrix that should be used for
+ * luma plane decoding.
+ * @qm_u: specifies the level in the quantizer matrix that should be used for
+ * chroma U plane decoding.
+ * @qm_v: specifies the level in the quantizer matrix that should be used for
+ * chroma V plane decoding.
+ * @delta_q_res: specifies the left shift which should be applied to decoded
+ * quantizer index delta values.
+ */
+struct v4l2_av1_quantization {
+	__u8 flags;
+	__u8 base_q_idx;
+	__s8 delta_q_y_dc;
+	__s8 delta_q_u_dc;
+	__s8 delta_q_u_ac;
+	__s8 delta_q_v_dc;
+	__s8 delta_q_v_ac;
+	__u8 qm_y;
+	__u8 qm_u;
+	__u8 qm_v;
+	__u8 delta_q_res;
+};
+
+#define V4L2_AV1_TILE_INFO_FLAG_UNIFORM_TILE_SPACING	0x1
+
+/**
+ * struct v4l2_av1_tile_info - AV1 Tile info as defined in section 6.8.14 "Tile
+ * info semantics" of the AV1 specification.
+ *
+ * @flags: see V4L2_AV1_TILE_INFO_FLAG_{}
+ * @context_update_tile_id: specifies which tile to use for the CDF update.
+ * @tile_rows: specifies the number of tiles down the frame.
+ * @tile_cols: specifies the number of tiles across the frame.
+ * @mi_col_starts: an array specifying the start column (in units of 4x4 luma
+ * samples) for each tile across the image.
+ * @mi_row_starts: an array specifying the start row (in units of 4x4 luma
+ * samples) for each tile down the image.
+ * @width_in_sbs_minus_1: specifies the width of a tile minus 1 in units of
+ * superblocks.
+ * @height_in_sbs_minus_1:  specifies the height of a tile minus 1 in units of
+ * superblocks.
+ * @tile_size_bytes: specifies the number of bytes needed to code each tile
+ * size.
+ * @reserved: padding field. Should be zeroed by applications.
+ */
+struct v4l2_av1_tile_info {
+	__u8 flags;
+	__u8 context_update_tile_id;
+	__u8 tile_cols;
+	__u8 tile_rows;
+	__u32 mi_col_startsV4L2_AV1_MAX_TILE_COLS + 1;
+	__u32 mi_row_startsV4L2_AV1_MAX_TILE_ROWS + 1;
+	__u32 width_in_sbs_minus_1V4L2_AV1_MAX_TILE_COLS;
+	__u32 height_in_sbs_minus_1V4L2_AV1_MAX_TILE_ROWS;
+	__u8 tile_size_bytes;
+	__u8 reserved3;
+};
+
+/**
+ * enum v4l2_av1_frame_type - AV1 Frame Type
+ *
+ * @V4L2_AV1_KEY_FRAME: Key frame
+ * @V4L2_AV1_INTER_FRAME: Inter frame
+ * @V4L2_AV1_INTRA_ONLY_FRAME: Intra-only frame
+ * @V4L2_AV1_SWITCH_FRAME: Switch frame
+ */
+enum v4l2_av1_frame_type {
+	V4L2_AV1_KEY_FRAME = 0,
+	V4L2_AV1_INTER_FRAME = 1,
+	V4L2_AV1_INTRA_ONLY_FRAME = 2,
+	V4L2_AV1_SWITCH_FRAME = 3
+};
+
+/**
+ * enum v4l2_av1_interpolation_filter - AV1 interpolation filter types
+ *
+ * @V4L2_AV1_INTERPOLATION_FILTER_EIGHTTAP: eight tap filter
+ * @V4L2_AV1_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH: eight tap smooth filter
+ * @V4L2_AV1_INTERPOLATION_FILTER_EIGHTTAP_SHARP: eight tap sharp filter
+ * @V4L2_AV1_INTERPOLATION_FILTER_BILINEAR: bilinear filter
+ * @V4L2_AV1_INTERPOLATION_FILTER_SWITCHABLE: filter selection is signaled at
+ * the block level
+ *
+ * See section 6.8.9 "Interpolation filter semantics" of the AV1 specification
+ * for more details.
+ */
+enum v4l2_av1_interpolation_filter {
+	V4L2_AV1_INTERPOLATION_FILTER_EIGHTTAP = 0,
+	V4L2_AV1_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH = 1,
+	V4L2_AV1_INTERPOLATION_FILTER_EIGHTTAP_SHARP = 2,
+	V4L2_AV1_INTERPOLATION_FILTER_BILINEAR = 3,
+	V4L2_AV1_INTERPOLATION_FILTER_SWITCHABLE = 4,
+};
+
+/**
+ * enum v4l2_av1_tx_mode - AV1 Tx mode as described in section 6.8.21 "TX mode
+ * semantics" of the AV1 specification.
+ * @V4L2_AV1_TX_MODE_ONLY_4X4: the inverse transform will use only 4x4
+ * transforms
+ * @V4L2_AV1_TX_MODE_LARGEST: the inverse transform will use the largest
+ * transform size that fits inside the block
+ * @V4L2_AV1_TX_MODE_SELECT: the choice of transform size is specified
+ * explicitly for each block.
+ */
+enum v4l2_av1_tx_mode {
+	V4L2_AV1_TX_MODE_ONLY_4X4 = 0,
+	V4L2_AV1_TX_MODE_LARGEST = 1,
+	V4L2_AV1_TX_MODE_SELECT = 2
+};
+
+#define V4L2_AV1_FRAME_FLAG_SHOW_FRAME			 0x00000001
+#define V4L2_AV1_FRAME_FLAG_SHOWABLE_FRAME		 0x00000002
+#define V4L2_AV1_FRAME_FLAG_ERROR_RESILIENT_MODE	 0x00000004
+#define V4L2_AV1_FRAME_FLAG_DISABLE_CDF_UPDATE		 0x00000008
+#define V4L2_AV1_FRAME_FLAG_ALLOW_SCREEN_CONTENT_TOOLS	 0x00000010
+#define V4L2_AV1_FRAME_FLAG_FORCE_INTEGER_MV		 0x00000020
+#define V4L2_AV1_FRAME_FLAG_ALLOW_INTRABC		 0x00000040
+#define V4L2_AV1_FRAME_FLAG_USE_SUPERRES		 0x00000080
+#define V4L2_AV1_FRAME_FLAG_ALLOW_HIGH_PRECISION_MV	 0x00000100
+#define V4L2_AV1_FRAME_FLAG_IS_MOTION_MODE_SWITCHABLE	 0x00000200
+#define V4L2_AV1_FRAME_FLAG_USE_REF_FRAME_MVS		 0x00000400
+#define V4L2_AV1_FRAME_FLAG_DISABLE_FRAME_END_UPDATE_CDF 0x00000800
+#define V4L2_AV1_FRAME_FLAG_ALLOW_WARPED_MOTION		 0x00001000
+#define V4L2_AV1_FRAME_FLAG_REFERENCE_SELECT		 0x00002000
+#define V4L2_AV1_FRAME_FLAG_REDUCED_TX_SET		 0x00004000
+#define V4L2_AV1_FRAME_FLAG_SKIP_MODE_ALLOWED		 0x00008000
+#define V4L2_AV1_FRAME_FLAG_SKIP_MODE_PRESENT		 0x00010000
+#define V4L2_AV1_FRAME_FLAG_FRAME_SIZE_OVERRIDE		 0x00020000
+#define V4L2_AV1_FRAME_FLAG_BUFFER_REMOVAL_TIME_PRESENT	 0x00040000
+#define V4L2_AV1_FRAME_FLAG_FRAME_REFS_SHORT_SIGNALING	 0x00080000
+
+#define V4L2_CID_STATELESS_AV1_FRAME (V4L2_CID_CODEC_STATELESS_BASE + 502)
+/**
+ * struct v4l2_ctrl_av1_frame - Represents an AV1 Frame Header OBU.
+ *
+ * @tile_info: tile info
+ * @quantization: quantization params
+ * @segmentation: segmentation params
+ * @superres_denom: the denominator for the upscaling ratio.
+ * @loop_filter: loop filter params
+ * @cdef: cdef params
+ * @skip_mode_frame: specifies the frames to use for compound prediction when
+ * skip_mode is equal to 1.
+ * @primary_ref_frame: specifies which reference frame contains the CDF values
+ * and other state that should be loaded at the start of the frame.
+ * @loop_restoration: loop restoration params
+ * @global_motion: global motion params
+ * @flags: see V4L2_AV1_FRAME_FLAG_{}
+ * @frame_type: specifies the AV1 frame type
+ * @order_hint: specifies OrderHintBits least significant bits of the expected
+ * output order for this frame.
+ * @upscaled_width: the upscaled width.
+ * @interpolation_filter: specifies the filter selection used for performing
+ * inter prediction.
+ * @tx_mode: specifies how the transform size is determined.
+ * @frame_width_minus_1: add 1 to get the frame's width.
+ * @frame_height_minus_1: add 1 to get the frame's height
+ * @render_width_minus_1: add 1 to get the render width of the frame in luma
+ * samples.
+ * @render_height_minus_1: add 1 to get the render height of the frame in luma
+ * samples.
+ * @current_frame_id: specifies the frame id number for the current frame. Frame
+ * id numbers are additional information that do not affect the decoding
+ * process, but provide decoders with a way of detecting missing reference
+ * frames so that appropriate action can be taken.
+ * @buffer_removal_time: specifies the frame removal time in units of DecCT clock
+ * ticks counted from the removal time of the last random access point for
+ * operating point opNum.
+ * @reserved: padding field. Should be zeroed by applications.
+ * @order_hints: specifies the expected output order hint for each reference
+ * frame. This field corresponds to the OrderHints variable from the
+ * specification (section 5.9.2 "Uncompressed header syntax"). As such, this is
+ * only used for non-intra frames and ignored otherwise. order_hints0 is
+ * always ignored.
+ * @reference_frame_ts: the V4L2 timestamp of the reference frame slots.
+ * @ref_frame_idx: used to index into @reference_frame_ts when decoding
+ * inter-frames. The meaning of this array is the same as in the specification.
+ * The timestamp refers to the timestamp field in struct v4l2_buffer. Use
+ * v4l2_timeval_to_ns() to convert the struct timeval to a __u64.
+ * @refresh_frame_flags: contains a bitmask that specifies which reference frame
+ * slots will be updated with the current frame after it is decoded.
+ */
+struct v4l2_ctrl_av1_frame {
+	struct v4l2_av1_tile_info tile_info;
+	struct v4l2_av1_quantization quantization;
+	__u8 superres_denom;
+	struct v4l2_av1_segmentation segmentation;
+	struct v4l2_av1_loop_filter loop_filter;
+	struct v4l2_av1_cdef cdef;
+	__u8 skip_mode_frame2;
+	__u8 primary_ref_frame;
+	struct v4l2_av1_loop_restoration loop_restoration;
+	struct v4l2_av1_global_motion global_motion;
+	__u32 flags;
+	enum v4l2_av1_frame_type frame_type;
+	__u32 order_hint;
+	__u32 upscaled_width;
+	enum v4l2_av1_interpolation_filter interpolation_filter;
+	enum v4l2_av1_tx_mode tx_mode;
+	__u32 frame_width_minus_1;
+	__u32 frame_height_minus_1;
+	__u16 render_width_minus_1;
+	__u16 render_height_minus_1;
+
+	__u32 current_frame_id;
+	__u32 buffer_removal_timeV4L2_AV1_MAX_OPERATING_POINTS;
+	__u8 reserved4;
+	__u32 order_hintsV4L2_AV1_TOTAL_REFS_PER_FRAME;
+	__u64 reference_frame_tsV4L2_AV1_TOTAL_REFS_PER_FRAME;
+	__s8 ref_frame_idxV4L2_AV1_REFS_PER_FRAME;
+	__u8 refresh_frame_flags;
+};
+
+#define V4L2_AV1_FILM_GRAIN_FLAG_APPLY_GRAIN 0x1
+#define V4L2_AV1_FILM_GRAIN_FLAG_UPDATE_GRAIN 0x2
+#define V4L2_AV1_FILM_GRAIN_FLAG_CHROMA_SCALING_FROM_LUMA 0x4
+#define V4L2_AV1_FILM_GRAIN_FLAG_OVERLAP 0x8
+#define V4L2_AV1_FILM_GRAIN_FLAG_CLIP_TO_RESTRICTED_RANGE 0x10
+
+#define V4L2_CID_STATELESS_AV1_FILM_GRAIN (V4L2_CID_CODEC_STATELESS_BASE + 505)
+/**
+ * struct v4l2_ctrl_av1_film_grain - AV1 Film Grain parameters.
+ *
+ * Film grain parameters as specified by section 6.8.20 of the AV1 Specification.
+ *
+ * @flags: see V4L2_AV1_FILM_GRAIN_{}.
+ * @cr_mult: represents a multiplier for the cr component used in derivation of
+ * the input index to the cr component scaling function.
+ * @grain_seed: specifies the starting value for the pseudo-random numbers used
+ * during film grain synthesis.
+ * @film_grain_params_ref_idx: indicates which reference frame contains the
+ * film grain parameters to be used for this frame.
+ * @num_y_points: specifies the number of points for the piece-wise linear
+ * scaling function of the luma component.
+ * @point_y_value: represents the x (luma value) coordinate for the i-th point
+ * of the piecewise linear scaling function for luma component. The values are
+ * signaled on the scale of 0..255. In case of 10 bit video, these values
+ * correspond to luma values divided by 4. In case of 12 bit video, these values
+ * correspond to luma values divided by 16.
+ * @point_y_scaling:  represents the scaling (output) value for the i-th point
+ * of the piecewise linear scaling function for luma component.
+ * @num_cb_points: specifies the number of points for the piece-wise linear
+ * scaling function of the cb component.
+ * @point_cb_value: represents the x coordinate for the i-th point of the
+ * piece-wise linear scaling function for cb component. The values are signaled
+ * on the scale of 0..255.
+ * @point_cb_scaling: represents the scaling (output) value for the i-th point
+ * of the piecewise linear scaling function for cb component.
+ * @num_cr_points: specifies represents the number of points for the piece-wise
+ * linear scaling function of the cr component.
+ * @point_cr_value:  represents the x coordinate for the i-th point of the
+ * piece-wise linear scaling function for cr component. The values are signaled
+ * on the scale of 0..255.
+ * @point_cr_scaling:  represents the scaling (output) value for the i-th point
+ * of the piecewise linear scaling function for cr component.
+ * @grain_scaling_minus_8: represents the shift – 8 applied to the values of the
+ * chroma component. The grain_scaling_minus_8 can take values of 0..3 and
+ * determines the range and quantization step of the standard deviation of film
+ * grain.
+ * @ar_coeff_lag: specifies the number of auto-regressive coefficients for luma
+ * and chroma.
+ * @ar_coeffs_y_plus_128: specifies auto-regressive coefficients used for the Y
+ * plane.
+ * @ar_coeffs_cb_plus_128: specifies auto-regressive coefficients used for the U
+ * plane.
+ * @ar_coeffs_cr_plus_128: specifies auto-regressive coefficients used for the V
+ * plane.
+ * @ar_coeff_shift_minus_6: specifies the range of the auto-regressive
+ * coefficients. Values of 0, 1, 2, and 3 correspond to the ranges for
+ * auto-regressive coefficients of -2, 2), -1, 1), -0.5, 0.5) and -0.25,
+ * 0.25) respectively.
+ * @grain_scale_shift: specifies how much the Gaussian random numbers should be
+ * scaled down during the grain synthesis process.
+ * @cb_mult: represents a multiplier for the cb component used in derivation of
+ * the input index to the cb component scaling function.
+ * @cb_luma_mult: represents a multiplier for the average luma component used in
+ * derivation of the input index to the cb component scaling function.
+ * @cr_luma_mult: represents a multiplier for the average luma component used in
+ * derivation of the input index to the cr component scaling function.
+ * @cb_offset: represents an offset used in derivation of the input index to the
+ * cb component scaling function.
+ * @cr_offset: represents an offset used in derivation of the input index to the
+ * cr component scaling function.
+ * @reserved: padding field. Should be zeroed by applications.
+ */
+struct v4l2_ctrl_av1_film_grain {
+	__u8 flags;
+	__u8 cr_mult;
+	__u16 grain_seed;
+	__u8 film_grain_params_ref_idx;
+	__u8 num_y_points;
+	__u8 point_y_valueV4L2_AV1_MAX_NUM_Y_POINTS;
+	__u8 point_y_scalingV4L2_AV1_MAX_NUM_Y_POINTS;
+	__u8 num_cb_points;
+	__u8 point_cb_valueV4L2_AV1_MAX_NUM_CB_POINTS;
+	__u8 point_cb_scalingV4L2_AV1_MAX_NUM_CB_POINTS;
+	__u8 num_cr_points;
+	__u8 point_cr_valueV4L2_AV1_MAX_NUM_CR_POINTS;
+	__u8 point_cr_scalingV4L2_AV1_MAX_NUM_CR_POINTS;
+	__u8 grain_scaling_minus_8;
+	__u8 ar_coeff_lag;
+	__u8 ar_coeffs_y_plus_128V4L2_AV1_AR_COEFFS_SIZE;
+	__u8 ar_coeffs_cb_plus_128V4L2_AV1_AR_COEFFS_SIZE;
+	__u8 ar_coeffs_cr_plus_128V4L2_AV1_AR_COEFFS_SIZE;
+	__u8 ar_coeff_shift_minus_6;
+	__u8 grain_scale_shift;
+	__u8 cb_mult;
+	__u8 cb_luma_mult;
+	__u8 cr_luma_mult;
+	__u16 cb_offset;
+	__u16 cr_offset;
+	__u8 reserved4;
+};
+
 /* MPEG-compression definitions kept for backwards compatibility */
 #define V4L2_CTRL_CLASS_MPEG            V4L2_CTRL_CLASS_CODEC
 #define V4L2_CID_MPEG_CLASS             V4L2_CID_CODEC_CLASS

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/linux/videodev2.h -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/linux/videodev2.h Changed

@@ -243,6 +243,7 @@
 
 	/* DCI-P3 colorspace, used by cinema projectors */
 	V4L2_COLORSPACE_DCI_P3        = 12,
+
 };
 
 /*
@@ -474,7 +475,6 @@
 #define V4L2_CAP_META_CAPTURE		0x00800000  /* Is a metadata capture device */
 
 #define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
-#define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
 #define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
 #define V4L2_CAP_META_OUTPUT		0x08000000  /* Is a metadata output device */
 
@@ -549,6 +549,13 @@
 #define V4L2_PIX_FMT_RGBX32  v4l2_fourcc('X', 'B', '2', '4') /* 32  RGBX-8-8-8-8  */
 #define V4L2_PIX_FMT_ARGB32  v4l2_fourcc('B', 'A', '2', '4') /* 32  ARGB-8-8-8-8  */
 #define V4L2_PIX_FMT_XRGB32  v4l2_fourcc('B', 'X', '2', '4') /* 32  XRGB-8-8-8-8  */
+#define V4L2_PIX_FMT_RGBX1010102 v4l2_fourcc('R', 'X', '3', '0') /* 32  RGBX-10-10-10-2 */
+#define V4L2_PIX_FMT_RGBA1010102 v4l2_fourcc('R', 'A', '3', '0') /* 32  RGBA-10-10-10-2 */
+#define V4L2_PIX_FMT_ARGB2101010 v4l2_fourcc('A', 'R', '3', '0') /* 32  ARGB-2-10-10-10 */
+
+/* RGB formats (6 or 8 bytes per pixel) */
+#define V4L2_PIX_FMT_BGR48_12    v4l2_fourcc('B', '3', '1', '2') /* 48  BGR 12-bit per component */
+#define V4L2_PIX_FMT_ABGR64_12   v4l2_fourcc('B', '4', '1', '2') /* 64  BGRA 12-bit per component */
 
 /* Grey formats */
 #define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
@@ -556,6 +563,7 @@
 #define V4L2_PIX_FMT_Y6      v4l2_fourcc('Y', '0', '6', ' ') /*  6  Greyscale     */
 #define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
 #define V4L2_PIX_FMT_Y12     v4l2_fourcc('Y', '1', '2', ' ') /* 12  Greyscale     */
+#define V4L2_PIX_FMT_Y012    v4l2_fourcc('Y', '0', '1', '2') /* 12  Greyscale     */
 #define V4L2_PIX_FMT_Y14     v4l2_fourcc('Y', '1', '4', ' ') /* 14  Greyscale     */
 #define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
 #define V4L2_PIX_FMT_Y16_BE  v4l2_fourcc_be('Y', '1', '6', ' ') /* 16  Greyscale BE  */
@@ -563,6 +571,7 @@
 /* Grey bit-packed formats */
 #define V4L2_PIX_FMT_Y10BPACK    v4l2_fourcc('Y', '1', '0', 'B') /* 10  Greyscale bit-packed */
 #define V4L2_PIX_FMT_Y10P    v4l2_fourcc('Y', '1', '0', 'P') /* 10  Greyscale, MIPI RAW10 packed */
+#define V4L2_PIX_FMT_IPU3_Y10		v4l2_fourcc('i', 'p', '3', 'y') /* IPU3 packed 10-bit greyscale */
 
 /* Palette formats */
 #define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
@@ -586,7 +595,18 @@
 #define V4L2_PIX_FMT_XYUV32  v4l2_fourcc('X', 'Y', 'U', 'V') /* 32  XYUV-8-8-8-8  */
 #define V4L2_PIX_FMT_VUYA32  v4l2_fourcc('V', 'U', 'Y', 'A') /* 32  VUYA-8-8-8-8  */
 #define V4L2_PIX_FMT_VUYX32  v4l2_fourcc('V', 'U', 'Y', 'X') /* 32  VUYX-8-8-8-8  */
+#define V4L2_PIX_FMT_YUVA32  v4l2_fourcc('Y', 'U', 'V', 'A') /* 32  YUVA-8-8-8-8  */
+#define V4L2_PIX_FMT_YUVX32  v4l2_fourcc('Y', 'U', 'V', 'X') /* 32  YUVX-8-8-8-8  */
 #define V4L2_PIX_FMT_M420    v4l2_fourcc('M', '4', '2', '0') /* 12  YUV 4:2:0 2 lines y, 1 line uv interleaved */
+#define V4L2_PIX_FMT_YUV48_12    v4l2_fourcc('Y', '3', '1', '2') /* 48  YUV 4:4:4 12-bit per component */
+
+/*
+ * YCbCr packed format. For each Y2xx format, xx bits of valid data occupy the MSBs
+ * of the 16 bit components, and 16-xx bits of zero padding occupy the LSBs.
+ */
+#define V4L2_PIX_FMT_Y210    v4l2_fourcc('Y', '2', '1', '0') /* 32  YUYV 4:2:2 */
+#define V4L2_PIX_FMT_Y212    v4l2_fourcc('Y', '2', '1', '2') /* 32  YUYV 4:2:2 */
+#define V4L2_PIX_FMT_Y216    v4l2_fourcc('Y', '2', '1', '6') /* 32  YUYV 4:2:2 */
 
 /* two planes -- one Y, one Cr + Cb interleaved  */
 #define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
@@ -596,12 +616,14 @@
 #define V4L2_PIX_FMT_NV24    v4l2_fourcc('N', 'V', '2', '4') /* 24  Y/CbCr 4:4:4  */
 #define V4L2_PIX_FMT_NV42    v4l2_fourcc('N', 'V', '4', '2') /* 24  Y/CrCb 4:4:4  */
 #define V4L2_PIX_FMT_P010    v4l2_fourcc('P', '0', '1', '0') /* 24  Y/CbCr 4:2:0 10-bit per component */
+#define V4L2_PIX_FMT_P012    v4l2_fourcc('P', '0', '1', '2') /* 24  Y/CbCr 4:2:0 12-bit per component */
 
 /* two non contiguous planes - one Y, one Cr + Cb interleaved  */
 #define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
 #define V4L2_PIX_FMT_NV21M   v4l2_fourcc('N', 'M', '2', '1') /* 21  Y/CrCb 4:2:0  */
 #define V4L2_PIX_FMT_NV16M   v4l2_fourcc('N', 'M', '1', '6') /* 16  Y/CbCr 4:2:2  */
 #define V4L2_PIX_FMT_NV61M   v4l2_fourcc('N', 'M', '6', '1') /* 16  Y/CrCb 4:2:2  */
+#define V4L2_PIX_FMT_P012M   v4l2_fourcc('P', 'M', '1', '2') /* 24  Y/CbCr 4:2:0 12-bit per component */
 
 /* three planes - Y Cb, Cr */
 #define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
@@ -623,10 +645,16 @@
 #define V4L2_PIX_FMT_NV12_4L4 v4l2_fourcc('V', 'T', '1', '2')   /* 12  Y/CbCr 4:2:0  4x4 tiles */
 #define V4L2_PIX_FMT_NV12_16L16 v4l2_fourcc('H', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 16x16 tiles */
 #define V4L2_PIX_FMT_NV12_32L32 v4l2_fourcc('S', 'T', '1', '2') /* 12  Y/CbCr 4:2:0 32x32 tiles */
+#define V4L2_PIX_FMT_NV15_4L4 v4l2_fourcc('V', 'T', '1', '5') /* 15 Y/CbCr 4:2:0 10-bit 4x4 tiles */
+#define V4L2_PIX_FMT_P010_4L4 v4l2_fourcc('T', '0', '1', '0') /* 12  Y/CbCr 4:2:0 10-bit 4x4 macroblocks */
+#define V4L2_PIX_FMT_NV12_8L128       v4l2_fourcc('A', 'T', '1', '2') /* Y/CbCr 4:2:0 8x128 tiles */
+#define V4L2_PIX_FMT_NV12_10BE_8L128  v4l2_fourcc_be('A', 'X', '1', '2') /* Y/CbCr 4:2:0 10-bit 8x128 tiles */
 
 /* Tiled YUV formats, non contiguous planes */
 #define V4L2_PIX_FMT_NV12MT  v4l2_fourcc('T', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 64x32 tiles */
 #define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 16x16 tiles */
+#define V4L2_PIX_FMT_NV12M_8L128      v4l2_fourcc('N', 'A', '1', '2') /* Y/CbCr 4:2:0 8x128 tiles */
+#define V4L2_PIX_FMT_NV12M_10BE_8L128 v4l2_fourcc_be('N', 'T', '1', '2') /* Y/CbCr 4:2:0 10-bit 8x128 tiles */
 
 /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
 #define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
@@ -704,6 +732,10 @@
 #define V4L2_PIX_FMT_FWHT_STATELESS     v4l2_fourcc('S', 'F', 'W', 'H') /* Stateless FWHT (vicodec) */
 #define V4L2_PIX_FMT_H264_SLICE v4l2_fourcc('S', '2', '6', '4') /* H264 parsed slices */
 #define V4L2_PIX_FMT_HEVC_SLICE v4l2_fourcc('S', '2', '6', '5') /* HEVC parsed slices */
+#define V4L2_PIX_FMT_AV1_FRAME v4l2_fourcc('A', 'V', '1', 'F') /* AV1 parsed frame */
+#define V4L2_PIX_FMT_SPK      v4l2_fourcc('S', 'P', 'K', '0') /* Sorenson Spark */
+#define V4L2_PIX_FMT_RV30     v4l2_fourcc('R', 'V', '3', '0') /* RealVideo 8 */
+#define V4L2_PIX_FMT_RV40     v4l2_fourcc('R', 'V', '4', '0') /* RealVideo 9 & 10 */
 
 /*  Vendor-specific formats   */
 #define V4L2_PIX_FMT_CPIA1    v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
@@ -737,11 +769,16 @@
 #define V4L2_PIX_FMT_Z16      v4l2_fourcc('Z', '1', '6', ' ') /* Depth data 16-bit */
 #define V4L2_PIX_FMT_MT21C    v4l2_fourcc('M', 'T', '2', '1') /* Mediatek compressed block mode  */
 #define V4L2_PIX_FMT_MM21     v4l2_fourcc('M', 'M', '2', '1') /* Mediatek 8-bit block mode, two non-contiguous planes */
+#define V4L2_PIX_FMT_MT2110T  v4l2_fourcc('M', 'T', '2', 'T') /* Mediatek 10-bit block tile mode */
+#define V4L2_PIX_FMT_MT2110R  v4l2_fourcc('M', 'T', '2', 'R') /* Mediatek 10-bit block raster mode */
 #define V4L2_PIX_FMT_INZI     v4l2_fourcc('I', 'N', 'Z', 'I') /* Intel Planar Greyscale 10-bit and Depth 16-bit */
 #define V4L2_PIX_FMT_CNF4     v4l2_fourcc('C', 'N', 'F', '4') /* Intel 4-bit packed depth confidence information */
 #define V4L2_PIX_FMT_HI240    v4l2_fourcc('H', 'I', '2', '4') /* BTTV 8-bit dithered RGB */
+#define V4L2_PIX_FMT_QC08C    v4l2_fourcc('Q', '0', '8', 'C') /* Qualcomm 8-bit compressed */
+#define V4L2_PIX_FMT_QC10C    v4l2_fourcc('Q', '1', '0', 'C') /* Qualcomm 10-bit compressed */
+#define V4L2_PIX_FMT_AJPG     v4l2_fourcc('A', 'J', 'P', 'G') /* Aspeed JPEG */
 
-/* 10bit raw bayer packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */
+/* 10bit raw packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */
 #define V4L2_PIX_FMT_IPU3_SBGGR10	v4l2_fourcc('i', 'p', '3', 'b') /* IPU3 packed 10-bit BGGR bayer */
 #define V4L2_PIX_FMT_IPU3_SGBRG10	v4l2_fourcc('i', 'p', '3', 'g') /* IPU3 packed 10-bit GBRG bayer */
 #define V4L2_PIX_FMT_IPU3_SGRBG10	v4l2_fourcc('i', 'p', '3', 'G') /* IPU3 packed 10-bit GRBG bayer */
@@ -1543,7 +1580,8 @@
 	((bt)->width + V4L2_DV_BT_BLANKING_WIDTH(bt))
 #define V4L2_DV_BT_BLANKING_HEIGHT(bt) \
 	((bt)->vfrontporch + (bt)->vsync + (bt)->vbackporch + \
-	 (bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch)
+	 ((bt)->interlaced ? \
+	  ((bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch) : 0))
 #define V4L2_DV_BT_FRAME_HEIGHT(bt) \
 	((bt)->height + V4L2_DV_BT_BLANKING_HEIGHT(bt))
 
@@ -1634,7 +1672,7 @@
 	__u8	     name32;		/*  Label */
 	__u32	     type;		/*  Type of input */
 	__u32	     audioset;		/*  Associated audios (bitfield) */
-	__u32        tuner;             /*  enum v4l2_tuner_type */
+	__u32        tuner;             /*  Tuner index */
 	v4l2_std_id  std;
 	__u32	     status;
 	__u32	     capabilities;
@@ -1721,6 +1759,8 @@
 		__u8 *p_u8;
 		__u16 *p_u16;
 		__u32 *p_u32;
+		__s32 *p_s32;
+		__s64 *p_s64;
 		struct v4l2_area *p_area;
 		struct v4l2_ctrl_h264_sps *p_h264_sps;
 		struct v4l2_ctrl_h264_pps *p_h264_pps;
@@ -1740,6 +1780,10 @@
 		struct v4l2_ctrl_hevc_slice_params *p_hevc_slice_params;
 		struct v4l2_ctrl_hevc_scaling_matrix *p_hevc_scaling_matrix;
 		struct v4l2_ctrl_hevc_decode_params *p_hevc_decode_params;
+		struct v4l2_ctrl_av1_sequence *p_av1_sequence;
+		struct v4l2_ctrl_av1_tile_group_entry *p_av1_tile_group_entry;
+		struct v4l2_ctrl_av1_frame *p_av1_frame;
+		struct v4l2_ctrl_av1_film_grain *p_av1_film_grain;
 		void *ptr;
 	};
 } __attribute__ ((packed));
@@ -1757,9 +1801,7 @@
 };
 
 #define V4L2_CTRL_ID_MASK	  (0x0fffffff)
-#ifndef __KERNEL__
 #define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
-#endif
 #define V4L2_CTRL_ID2WHICH(id)    ((id) & 0x0fff0000UL)
 #define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
 #define V4L2_CTRL_MAX_DIMS	  (4)
@@ -1811,6 +1853,11 @@
 	V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS	= 0x0272,
 	V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX	= 0x0273,
 	V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS	= 0x0274,
+
+	V4L2_CTRL_TYPE_AV1_SEQUENCE	    = 0x280,
+	V4L2_CTRL_TYPE_AV1_TILE_GROUP_ENTRY = 0x281,
+	V4L2_CTRL_TYPE_AV1_FRAME	    = 0x282,
+	V4L2_CTRL_TYPE_AV1_FILM_GRAIN	    = 0x283,
 };
 
 /*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
@@ -2374,6 +2421,7 @@
 #define V4L2_EVENT_CTRL_CH_VALUE		(1 << 0)
 #define V4L2_EVENT_CTRL_CH_FLAGS		(1 << 1)
 #define V4L2_EVENT_CTRL_CH_RANGE		(1 << 2)
+#define V4L2_EVENT_CTRL_CH_DIMENSIONS		(1 << 3)
 
 struct v4l2_event_ctrl {
 	__u32 changes;
@@ -2616,5 +2664,10 @@
 /* Deprecated definitions kept for backwards compatibility */
 #define V4L2_PIX_FMT_HM12 V4L2_PIX_FMT_NV12_16L16
 #define V4L2_PIX_FMT_SUNXI_TILED_NV12 V4L2_PIX_FMT_NV12_32L32
+/*
+ * This capability was never implemented, anyone using this cap should drop it
+ * from their code.
+ */
+#define V4L2_CAP_ASYNCIO 0x02000000
 
 #endif /* __LINUX_VIDEODEV2_H */

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/sys/v4l2codecs/plugin.c -> gst-plugins-bad-1.24.5.tar.xz/sys/v4l2codecs/plugin.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvaav1dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvaav1dec.c Changed

@@ -44,6 +44,7 @@
 #endif
 
 #include <gst/va/gstva.h>
+#include <gst/va/vasurfaceimage.h>
 
 #include "gstvaav1dec.h"
 #include "gstvabasedec.h"
@@ -255,6 +256,7 @@
   GstAllocator *allocator;
   GstCaps *caps = NULL;
   GstBufferPool *pool;
+  guint usage_hint;
   GstAllocationParams params = { 0, };
 
   gst_allocation_params_init (&params);
@@ -265,7 +267,7 @@
     GstVideoFormat format;
 
     gst_va_base_dec_get_preferred_format_and_caps_features (base,
-        &format, NULL);
+        &format, NULL, NULL);
     if (format == GST_VIDEO_FORMAT_UNKNOWN) {
       GST_WARNING_OBJECT (self, "Failed to get format for internal pool");
       return NULL;
@@ -288,9 +290,11 @@
   surface_formats = gst_va_decoder_get_surface_formats (base->decoder);
   allocator = gst_va_allocator_new (base->display, surface_formats);
 
-  pool = gst_va_pool_new_with_config (caps, GST_VIDEO_INFO_SIZE (&info),
-      1, 0, VA_SURFACE_ATTRIB_USAGE_HINT_DECODER, GST_VA_FEATURE_AUTO,
-      allocator, &params);
+  usage_hint = va_get_surface_usage_hint (base->display,
+      VAEntrypointVLD, GST_PAD_SRC, FALSE);
+
+  pool = gst_va_pool_new_with_config (caps, 1, 0, usage_hint,
+      GST_VA_FEATURE_AUTO, allocator, &params);
 
   gst_clear_caps (&caps);
   gst_object_unref (allocator);
@@ -919,7 +923,7 @@
   GstVaDecodePicture *va_pic;
 
   GST_LOG_OBJECT (self, "end picture %p, (system_frame_number %d)",
-      picture, picture->system_frame_number);
+      picture, GST_CODEC_PICTURE_FRAME_NUMBER (picture));
 
   va_pic = gst_av1_picture_get_user_data (picture);
 
@@ -938,6 +942,7 @@
   GstVaAV1Dec *self = GST_VA_AV1_DEC (decoder);
   GstVaBaseDec *base = GST_VA_BASE_DEC (decoder);
   GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
   gboolean ret;
 
   g_assert (picture->frame_hdr.show_frame ||
@@ -945,7 +950,7 @@
 
   GST_LOG_OBJECT (self,
       "Outputting picture %p (system_frame_number %d)",
-      picture, picture->system_frame_number);
+      picture, codec_picture->system_frame_number);
 
   if (picture->frame_hdr.show_existing_frame) {
     GstVaDecodePicture *pic;
@@ -955,7 +960,8 @@
     frame->output_buffer = gst_buffer_ref (pic->gstbuffer);
   }
 
-  ret = gst_va_base_dec_process_output (base, frame, picture->discont_state, 0);
+  ret = gst_va_base_dec_process_output (base,
+      frame, codec_picture->discont_state, 0);
   gst_av1_picture_unref (picture);
 
   if (ret)
@@ -1107,22 +1113,9 @@
 
   type_info.class_data = cdata;
 
-  /* The first decoder to be registered should use a constant name,
-   * like vaav1dec, for any additional decoders, we create unique
-   * names, using inserting the render device name. */
-  if (device->index == 0) {
-    type_name = g_strdup ("GstVaAV1Dec");
-    feature_name = g_strdup ("vaav1dec");
-  } else {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    type_name = g_strdup_printf ("GstVa%sAV1Dec", basename);
-    feature_name = g_strdup_printf ("va%sav1dec", basename);
-    cdata->description = basename;
-
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
-  }
+  gst_va_create_feature_name (device, "GstVaAV1Dec", "GstVa%sAV1Dec",
+      &type_name, "vaav1dec", "va%sav1dec", &feature_name,
+      &cdata->description, &rank);
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvaav1enc.c Added

@@ -0,0 +1,4654 @@
+/* GStreamer
+ *  Copyright (C) 2022 Intel Corporation
+ *     Author: He Junyan <junyan.he@intel.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * SECTION:element-vaav1enc
+ * @title: vaav1enc
+ * @short_description: A VA-API based AV1 video encoder
+ *
+ * vaav1enc encodes raw video VA surfaces into AV1 bitstreams using
+ * the installed and chosen VA-API(https://01.org/linuxmedia/vaapi)
+ * driver.
+ *
+ * The raw video frames in main memory can be imported into VA surfaces.
+ *
+ * ## Example launch line
+ * ```
+ * gst-launch-1.0 videotestsrc num-buffers=60 ! timeoverlay ! vaav1enc ! av1parse ! mp4mux ! filesink location=test.mp4
+ * ```
+ *
+ * Since: 1.22
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstvaav1enc.h"
+
+#include <gst/codecparsers/gstav1bitwriter.h>
+#include <gst/va/gstva.h>
+#include <gst/va/gstvavideoformat.h>
+#include <gst/video/video.h>
+#include <va/va_drmcommon.h>
+
+#include "vacompat.h"
+#include "gstvabaseenc.h"
+#include "gstvaencoder.h"
+#include "gstvacaps.h"
+#include "gstvaprofile.h"
+#include "gstvadisplay_priv.h"
+#include "gstvapluginutils.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_va_av1enc_debug);
+#define GST_CAT_DEFAULT gst_va_av1enc_debug
+
+#define GST_VA_AV1_ENC(obj)            ((GstVaAV1Enc *) obj)
+#define GST_VA_AV1_ENC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_FROM_INSTANCE (obj), GstVaAV1EncClass))
+#define GST_VA_AV1_ENC_CLASS(klass)    ((GstVaAV1EncClass *) klass)
+
+typedef struct _GstVaAV1Enc GstVaAV1Enc;
+typedef struct _GstVaAV1EncClass GstVaAV1EncClass;
+typedef struct _GstVaAV1LevelLimits GstVaAV1LevelLimits;
+typedef struct _GstVaAV1GFGroup GstVaAV1GFGroup;
+typedef struct _GstVaAV1Ref GstVaAV1Ref;
+typedef struct _GstVaAV1EncFrame GstVaAV1EncFrame;
+
+enum
+{
+  PROP_KEYFRAME_INT = 1,
+  PROP_GOLDEN_GROUP_SIZE,
+  PROP_NUM_REF_FRAMES,
+  PROP_HIERARCHICAL_LEVEL,
+  PROP_128X128_SUPERBLOCK,
+  PROP_MIN_QP,
+  PROP_MAX_QP,
+  PROP_QP,
+  PROP_BITRATE,
+  PROP_TARGET_PERCENTAGE,
+  PROP_TARGET_USAGE,
+  PROP_CPB_SIZE,
+  PROP_NUM_TILE_COLS,
+  PROP_NUM_TILE_ROWS,
+  PROP_TILE_GROUPS,
+  PROP_MBBRC,
+  PROP_RATE_CONTROL,
+  N_PROPERTIES
+};
+
+static GParamSpec *propertiesN_PROPERTIES;
+
+static GstElementClass *parent_class = NULL;
+
+#define DEFAULT_BASE_QINDEX  128
+
+#define MAX_KEY_FRAME_INTERVAL  1024
+#define MAX_GF_GROUP_SIZE  32
+#define HIGHEST_PYRAMID_LEVELS  6
+#define INVALID_PYRAMID_LEVEL  -1
+
+#define FRAME_TYPE_INVALID  -1
+#define FRAME_TYPE_REPEAT  0x80
+/* The frame is golden frame */
+#define FRAME_FLAG_GF  0x01
+/* The frame is alt frame */
+#define FRAME_FLAG_ALT  0x02
+/* The frame is on the top level */
+#define FRAME_FLAG_LEAF  0x04
+/* The frame can be internal alt frame */
+#define FRAME_FLAG_ALT_INL  0x08
+/* The frame update the DPB reference */
+#define FRAME_FLAG_UPDATE_REF  0x10
+/* The frame is the last frame in a GF group */
+#define FRAME_FLAG_LAST_IN_GF  0x20
+/* The frame has already be encoded */
+#define FRAME_FLAG_ALREADY_ENCODED  0x40
+/* The frame has already outputted */
+#define FRAME_FLAG_ALREADY_OUTPUTTED  0x80
+/* The frame not show */
+#define FRAME_FLAG_NOT_SHOW  0x100
+/* The frame is inside a TU cache */
+#define FRAME_FLAG_FRAME_IN_TU_CACHE  0x200
+
+#define MAX_ORDER_HINT_BITS_MINUS_1 7
+
+struct _GstVaAV1GFGroup
+{
+  /* where this GF group start since key frame. */
+  gint start_frame_offset;
+  /* Total frame number of this group. */
+  gint group_frame_num;
+  /* Be different from group_frame_num, include repeat */
+  gint output_frame_num;
+  gint last_pushed_num;
+  gint last_poped_index;
+  guint8 highest_level;
+  gboolean use_alt;
+  gboolean intra_only;
+  GQueue *reorder_list;
+
+  /* Include FRAME_TYPEs or FRAME_TYPE_REPEAT. */
+  GstAV1FrameType frame_typesMAX_GF_GROUP_SIZE * 2;
+  gint8 pyramid_levelsMAX_GF_GROUP_SIZE * 2;
+  guint32 flagsMAX_GF_GROUP_SIZE * 2;
+  /* offset from start_frame_num. */
+  gint frame_offsetsMAX_GF_GROUP_SIZE * 2;
+};
+
+struct _GstVaAV1Ref
+{
+  GstVideoCodecFrame *frame;
+  guint index_in_dpb;
+};
+
+struct _GstVaAV1EncFrame
+{
+  GstVaEncodePicture *picture;
+  GstAV1FrameType type;
+  guint8 temporal_id;
+  guint8 spatial_id;
+  /* AV1 does not define a frame number.
+     This is a virtual number after the key frame. */
+  gint frame_num;
+  guint32 flags;
+  guint pyramid_level;
+  gboolean bidir_ref;
+  gint8 ref_frame_idxGST_AV1_NUM_REF_FRAMES;
+  /* The index in reference list to update */
+  gint update_index;
+  gint order_hint;
+  /* The current frame to repeat */
+  gint8 repeat_index;
+
+  guint cached_frame_header_size;
+  guint8 cached_frame_header32;
+};
+
+struct _GstVaAV1Enc
+{
+  /*< private > */
+  GstVaBaseEnc parent;
+
+  guint32 packed_headers;
+
+  guint mi_rows;
+  guint mi_cols;
+  gint level_idx;
+  const gchar *level_str;
+  guint tier;
+  guint cr;
+  guint depth;
+  guint chrome;
+  GstClockTime last_pts;
+  GstClockTime last_dts;
+
+  /* properties */
+  struct
+  {
+    /* kbps */
+    guint bitrate;
+    /* VA_RC_XXX */
+    guint rc_ctrl;
+    guint32 target_usage;
+    guint32 cpb_size;
+    guint32 target_percentage;
+    guint gf_group_size;
+    guint num_ref_frames;
+    guint max_hierarchical_level;
+    gboolean use_128x128_superblock;
+    guint keyframe_interval;
+    guint32 qp;
+    guint32 min_qp;
+    guint32 max_qp;
+    guint32 num_tile_cols;
+    guint32 num_tile_rows;
+    guint32 tile_groups;
+    guint32 mbbrc;
+  } prop;
+
+  struct
+  {
+    guint keyframe_interval;
+    guint gf_group_size;
+    guint max_level;
+    guint num_ref_frames;
+    /* Forward only(P kind frame) may have diff refs num in l0 */
+    guint forward_only_ref_num;
+    guint forward_ref_num;
+    guint backward_ref_num;
+    guint frame_num_since_kf;
+    gboolean enable_order_hint;
+    GstVaAV1GFGroup current_group;
+    GstVideoCodecFrame *last_keyframe;
+    GstVideoCodecFrame *ref_listGST_AV1_NUM_REF_FRAMES;
+  } gop;
+
+  struct
+  {
+    guint sb_rows;
+    guint sb_cols;
+    gboolean use_128x128_superblock;
+    guint32 num_tile_cols;
+    guint32 num_tile_rows;
+    guint32 tile_groups;
+    guint32 tile_cols_log2;
+    guint32 tile_rows_log2;
+    gboolean uniform;
+    guint32 tile_width_sb;
+    guint32 tile_height_sb;
+    /* To calculate tile size bytes in tile group obu */
+    guint32 tile_size_bytes_minus_1;
+    guint32 max_tile_num;
+  } partition;
+
+  struct
+  {
+    guint target_usage;
+    guint32 target_percentage;
+    guint32 cpb_size;
+    guint32 cpb_length_bits;
+    guint32 rc_ctrl_mode;
+    guint max_bitrate;
+    guint max_bitrate_bits;
+    guint target_bitrate;
+    guint target_bitrate_bits;
+    guint32 base_qindex;
+    guint32 min_qindex;
+    guint32 max_qindex;
+    guint32 mbbrc;
+  } rc;
+
+  struct
+  {
+    gboolean enable_cdef;
+    gboolean cdef_channel_strength;
+    gboolean enable_filter_intra;
+    gboolean enable_intra_edge_filter;
+    gboolean enable_interintra_compound;
+    gboolean enable_masked_compound;
+    gboolean enable_warped_motion;
+    gboolean enable_palette_mode;
+    gboolean enable_dual_filter;
+    gboolean enable_jnt_comp;
+    gboolean enable_ref_frame_mvs;
+    gboolean enable_superres;
+    gboolean enable_restoration;
+    gboolean allow_intrabc;
+    gboolean enable_segmentation;
+    /* (1 << interpolation_filter) means support not not. */
+    guint32 interpolation_filter_support;
+    /* The interpolation type we choose */
+    GstAV1InterpolationFilter interpolation_type;
+    /* The size field bytes in obu header */
+    guint obu_size_bytes;
+    /* (tx_mode_support & mode) == 1 means support the mode. */
+    guint tx_mode_support;
+  } features;
+
+  /* The cached frames in the same TU. */
+  GstVideoCodecFrame *frames_in_tuGST_AV1_NUM_REF_FRAMES - 1;
+  guint frames_in_tu_num;
+  gboolean inside_tu;
+
+  GstAV1SequenceHeaderOBU sequence_hdr;
+};
+
+struct _GstVaAV1EncClass
+{
+  GstVaBaseEncClass parent_class;
+
+  GType rate_control_type;
+  char rate_control_type_name64;
+  GEnumValue rate_control16;
+};
+
+/**
+ * GstVaAV1LevelLimits:
+ * @level_name: the level name
+ * @seq_level_idx: specifies the level index value
+ * @MaxPicSize: the maximum of picture size in samples
+ * @MaxHSize: the maximum of picture width in samples
+ * @MaxVSize: the maximum of picture height in samples
+ * @MaxDisplayRate: the maximum of display luma samples rate per second
+ * @MaxDecodeRate: the maximum of decode luma samples rate per second
+ * @MaxHeaderRate: the maximum number of frame/frame_header per second
+ * @MainMbps: the maximum bit rate in for main tier
+ * @HighMbps: the maximum bit rate in for high tier
+ * @MainCR: the minimum picture compress ratio for main tier
+ * @HighCR: the minimum picture compress ratio for high tier
+ * @MaxTiles: the maximum tile number
+ * @MaxTileCols: the maximum tile number in column
+ *
+ * The data structure that describes the limits of an AV1 level.
+ */
+struct _GstVaAV1LevelLimits
+{
+  const gchar *level_name;
+  guint8 seq_level_idx;
+  guint32 MaxPicSize;
+  guint32 MaxHSize;
+  guint32 MaxVSize;
+  guint64 MaxDisplayRate;
+  guint64 MaxDecodeRate;
+  guint32 MaxHeaderRate;
+  guint32 MainMbps;
+  guint32 HighMbps;
+  guint32 MainCR;
+  guint32 HighCR;
+  guint32 MaxTiles;
+  guint32 MaxTileCols;
+};
+
+/* A.3. Levels */
+/* *INDENT-OFF* */
+static const GstVaAV1LevelLimits _va_av1_level_limits = {
+/* level idx MaxPicSize MaxHSize MaxVSize MaxDisplayRate MaxDecodeRate MaxHeaderRate MainMbps  HighMbps  MainCR HighCR MaxTiles MaxTileCols*/
+  {"2.0", 0, 147456,    2048,    1152,    4423680,       5529600,      150,          1500000,  0,        2,     0,     8,       4           },
+  {"2.1", 1, 278784,    2816,    1584,    8363520,       10454400,     150,          3000000,  0,        2,     0,     8,       4           },
+  {"3.0", 4, 665856,    4352,    2448,    19975680,      24969600,     150,          6000000,  0,        2,     0,     16,      6           },
+  {"3.1", 5, 1065024,   5504,    3096,    31950720,      39938400,     150,          10000000, 0,        2,     0,     16,      6           },
+  {"4.0", 8, 2359296,   6144,    3456,    70778880,      77856768,     300,          12000000, 30000000, 4,     4,     32,      8           },
+  {"4.1", 9, 2359296,   6144,    3456,    141557760,     155713536,    300,          20000000, 50000000, 4,     4,     32,      8           },
+  {"5.0", 12,8912896,   8192,    4352,    267386880,     273715200,    300,          30000000, 100000000,6,     4,     64,      8           },
+  {"5.1", 13,8912896,   8192,    4352,    534773760,     547430400,    300,          40000000, 160000000,8,     4,     64,      8           },
+  {"5.2", 14,8912896,   8192,    4352,    1069547520,    1094860800,   300,          60000000, 240000000,8,     4,     64,      8           },
+  {"5.3", 15,8912896,   8192,    4352,    1069547520,    1176502272,   300,          60000000, 240000000,8,     4,     64,      8           },
+  {"6.0", 16,35651584,  16384,   8704,    1069547520,    1176502272,   300,          60000000, 240000000,8,     4,     128,     16          },
+  {"6.1", 17,35651584,  16384,   8704,    2139095040,    2189721600,   300,          100000000,480000000,8,     4,     128,     16          },
+  {"6.2", 18,35651584,  16384,   8704,    4278190080,    4379443200,   300,          160000000,800000000,8,     4,     128,     16          },
+  {"6.3", 19,35651584,  16384,   8704,    4278190080,    4706009088,   300,          160000000,800000000,8,     4,     128,     16          },
+};
+/* *INDENT-ON* */
+
+static gboolean
+_av1_calculate_level_and_tier (GstVaAV1Enc * self)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  gint pic_size;
+  guint64 display_rate /* TotalDisplayLumaSampleRate */ ;
+  guint max_bitrate;
+  guint tier = 0;
+  int i;
+
+  pic_size = base->width * base->height;
+  display_rate = gst_util_uint64_scale_int_ceil (pic_size,
+      GST_VIDEO_INFO_FPS_N (&base->in_info),
+      GST_VIDEO_INFO_FPS_D (&base->in_info));
+
+  for (i = 0; i < G_N_ELEMENTS (_va_av1_level_limits); i++) {
+    const GstVaAV1LevelLimits *limits = &_va_av1_level_limitsi;
+
+    tier = 0;
+
+    if (pic_size > limits->MaxPicSize)
+      continue;
+
+    if (base->width > limits->MaxHSize)
+      continue;
+
+    if (base->height > limits->MaxVSize)
+      continue;
+
+    if (display_rate > limits->MaxDisplayRate)
+      continue;
+
+    max_bitrate = limits->HighMbps != 0 ? limits->HighMbps : limits->MainMbps;
+    if (self->rc.max_bitrate > max_bitrate)
+      continue;
+    if (self->rc.max_bitrate > limits->MainMbps)
+      tier = 1;
+
+    if (self->partition.num_tile_cols * self->partition.num_tile_rows >
+        limits->MaxTiles)
+      continue;
+
+    if (self->partition.num_tile_cols > limits->MaxTileCols)
+      continue;
+
+    /* decode rate, header rate, compress rate, etc. are not considered. */
+    break;
+  }
+
+  if (i == G_N_ELEMENTS (_va_av1_level_limits)) {
+    GST_ERROR_OBJECT (self,
+        "failed to find suitable level and tier matching codec config");
+    return FALSE;
+  }
+
+  self->level_idx = _va_av1_level_limitsi.seq_level_idx;
+  self->level_str = _va_av1_level_limitsi.level_name;
+  self->tier = tier;
+  self->cr =
+      tier ? _va_av1_level_limitsi.HighCR : _va_av1_level_limitsi.MainCR;
+  g_assert (self->cr > 0);
+
+  GST_INFO_OBJECT (self, "Use level: %s, tier is %d, cr is %d",
+      self->level_str, self->tier, self->cr);
+  return TRUE;
+}
+
+static gint
+_av1_helper_msb (guint n)
+{
+  int log = 0;
+  guint value = n;
+  int i;
+
+  g_assert (n != 0);
+
+  for (i = 4; i >= 0; --i) {
+    const gint shift = (1 << i);
+    const guint x = value >> shift;
+    if (x != 0) {
+      value = x;
+      log += shift;
+    }
+  }
+
+  return log;
+}
+
+static inline GstVaAV1EncFrame *
+_enc_frame (GstVideoCodecFrame * frame)
+{
+  GstVaAV1EncFrame *enc_frame = gst_video_codec_frame_get_user_data (frame);
+
+  g_assert (enc_frame);
+
+  return enc_frame;
+}
+
+#ifndef GST_DISABLE_GST_DEBUG
+static const gchar *
+_rate_control_get_name (guint32 rc_mode)
+{
+  GParamSpecEnum *spec;
+  guint i;
+
+  if (!(propertiesPROP_RATE_CONTROL
+          && G_IS_PARAM_SPEC_ENUM (propertiesPROP_RATE_CONTROL)))
+    return NULL;
+
+  spec = G_PARAM_SPEC_ENUM (propertiesPROP_RATE_CONTROL);
+  for (i = 0; i < spec->enum_class->n_values; i++) {
+    if (spec->enum_class->valuesi.value == rc_mode)
+      return spec->enum_class->valuesi.value_nick;
+  }
+
+  return NULL;
+}
+#endif /* end of GST_DISABLE_GST_DEBUG */
+
+static GstVaAV1EncFrame *
+gst_va_av1_enc_frame_new (void)
+{
+  GstVaAV1EncFrame *frame;
+
+  frame = g_slice_new (GstVaAV1EncFrame);
+  frame->frame_num = -1;
+  frame->type = FRAME_TYPE_INVALID;
+  frame->temporal_id = 0;
+  frame->spatial_id = 0;
+  frame->picture = NULL;
+  frame->pyramid_level = 0;
+  frame->flags = 0;
+  frame->bidir_ref = FALSE;
+  frame->update_index = -1;
+  frame->order_hint = -1;
+  frame->repeat_index = -1;
+  frame->cached_frame_header_size = 0;
+
+  return frame;
+}
+
+static void
+gst_va_av1_enc_frame_free (gpointer pframe)
+{
+  GstVaAV1EncFrame *frame = pframe;
+
+  g_clear_pointer (&frame->picture, gst_va_encode_picture_free);
+  g_slice_free (GstVaAV1EncFrame, frame);
+}
+
+static gboolean
+gst_va_av1_enc_new_frame (GstVaBaseEnc * base, GstVideoCodecFrame * frame)
+{
+  GstVaAV1EncFrame *frame_in;
+
+  frame_in = gst_va_av1_enc_frame_new ();
+  gst_video_codec_frame_set_user_data (frame, frame_in,
+      gst_va_av1_enc_frame_free);
+
+  return TRUE;
+}
+
+#ifndef GST_DISABLE_GST_DEBUG
+static const char *
+_av1_get_frame_type_name (GstAV1FrameType frame_type)
+{
+  const gchar *frame_type_name = NULL;
+  guint type = frame_type;
+
+  if (type & FRAME_TYPE_REPEAT)
+    return "Repeat ";
+
+  switch (type) {
+    case GST_AV1_KEY_FRAME:
+      frame_type_name = "Key    ";
+      break;
+    case GST_AV1_INTER_FRAME:
+      frame_type_name = "Inter  ";
+      break;
+    case GST_AV1_INTRA_ONLY_FRAME:
+      frame_type_name = "Intra  ";
+      break;
+    case GST_AV1_SWITCH_FRAME:
+      frame_type_name = "Switch ";
+      break;
+    default:
+      frame_type_name = "Unknown";
+      break;
+  }
+
+  return frame_type_name;
+}
+#endif
+
+static void
+_av1_print_gf_group (GstVaAV1Enc * self, GstVaAV1GFGroup * gf_group)
+{
+#ifndef GST_DISABLE_GST_DEBUG
+  gint pushed_frame_num = gf_group->last_pushed_num < 0 ? 0 :
+      gf_group->last_pushed_num - gf_group->start_frame_offset + 1;
+  GString *str;
+  gint i;
+
+  if (gst_debug_category_get_threshold (GST_CAT_DEFAULT) < GST_LEVEL_LOG)
+    return;
+
+  str = g_string_new (NULL);
+
+  g_string_append_printf (str, "\n============================"
+      " GF Group ===========================\n");
+  g_string_append_printf (str, " start:%d,  size:%d  ",
+      gf_group->start_frame_offset, gf_group->group_frame_num);
+  g_string_append_printf (str, "pushed:%d,  poped:%d  ",
+      pushed_frame_num, gf_group->last_poped_index + 1);
+  g_string_append_printf (str, "\n ALT: %s  max level: %d  output num: %d",
+      gf_group->use_alt ? "yes" : "no", gf_group->highest_level,
+      gf_group->output_frame_num);
+
+  g_string_append_printf (str, "\n----------------------------"
+      "-------------------------------------\n");
+  g_string_append_printf (str, "|     |  type   | level |"
+      "             flags            | offset |\n");
+
+  g_string_append_printf (str, "----------------------------"
+      "-------------------------------------\n");
+  for (i = 0; i < gf_group->output_frame_num; i++) {
+    g_string_append_printf (str, "| %3d ", i);
+    g_string_append_printf (str, "| %s ",
+        _av1_get_frame_type_name (gf_group->frame_typesi));
+
+    g_string_append_printf (str, "| %5d | ", gf_group->pyramid_levelsi);
+
+    if (gf_group->flagsi & FRAME_FLAG_GF) {
+      g_string_append_printf (str, "GF ");
+    } else {
+      g_string_append_printf (str, "   ");
+    }
+
+    if (gf_group->flagsi & FRAME_FLAG_LAST_IN_GF) {
+      g_string_append_printf (str, "Last ");
+    } else {
+      g_string_append_printf (str, "     ");
+    }
+
+    if (gf_group->flagsi & (FRAME_FLAG_ALT | FRAME_FLAG_ALT_INL)) {
+      g_string_append_printf (str, "ALT ");
+    } else {
+      g_string_append_printf (str, "    ");
+    }
+
+    if (gf_group->flagsi & FRAME_FLAG_NOT_SHOW) {
+      g_string_append_printf (str, "Unshown ");
+    } else {
+      g_string_append_printf (str, "Shown   ");
+    }
+
+    if (gf_group->flagsi & FRAME_FLAG_LEAF) {
+      g_string_append_printf (str, "Leaf ");
+    } else {
+      g_string_append_printf (str, "     ");
+    }
+
+    if (gf_group->flagsi & FRAME_FLAG_UPDATE_REF) {
+      g_string_append_printf (str, "Ref ");
+    } else {
+      g_string_append_printf (str, "    ");
+    }
+
+    g_string_append_printf (str, "| %-5d  | ", gf_group->frame_offsetsi);
+
+    g_string_append_printf (str, "\n");
+  }
+
+  g_string_append_printf (str, "---------------------------"
+      "--------------------------------------\n");
+
+  GST_LOG_OBJECT (self, "%s", str->str);
+
+  g_string_free (str, TRUE);
+
+#endif
+}
+
+#ifndef GST_DISABLE_GST_DEBUG
+static void
+_av1_print_ref_list (GstVaAV1Enc * self, GString * str)
+{
+  gint i;
+
+  g_string_append_printf (str, "\n================== Reference List "
+      "===================\n");
+
+  g_string_append_printf (str, "|   index   |");
+  for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++)
+    g_string_append_printf (str, "%3d |", i);
+
+  g_string_append_printf (str, "\n-------------------------------"
+      "----------------------\n");
+
+  g_string_append_printf (str, "| frame num |");
+  for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
+    if (self->gop.ref_listi) {
+      GstVaAV1EncFrame *va_frame = _enc_frame (self->gop.ref_listi);
+      g_string_append_printf (str, "%3d |", va_frame->frame_num);
+    } else {
+      g_string_append_printf (str, "%3d |", -1);
+    }
+  }
+  g_string_append_printf (str, "\n-------------------------------"
+      "----------------------\n");
+}
+#endif
+
+static void
+_av1_print_frame_reference (GstVaAV1Enc * self, GstVideoCodecFrame * frame)
+{
+#ifndef GST_DISABLE_GST_DEBUG
+  GString *str;
+  GstVaAV1EncFrame *va_frame;
+  gint i;
+
+  if (gst_debug_category_get_threshold (GST_CAT_DEFAULT) < GST_LEVEL_LOG)
+    return;
+
+  str = g_string_new (NULL);
+
+  _av1_print_ref_list (self, str);
+
+  va_frame = _enc_frame (frame);
+
+  g_string_append_printf (str, "Current %sframe num: %d,  ",
+      va_frame->frame_num == 0 ? "key " : "", va_frame->frame_num);
+
+  if (va_frame->type & FRAME_TYPE_REPEAT) {
+    g_string_append_printf (str, "repeat index %d", va_frame->repeat_index);
+    goto print;
+  }
+
+  g_string_append_printf (str, "Reference: ");
+
+  for (i = GST_AV1_REF_LAST_FRAME; i < GST_AV1_NUM_REF_FRAMES; i++) {
+    switch (i) {
+      case GST_AV1_REF_LAST_FRAME:
+        g_string_append_printf (str, " %s", "Last");
+        break;
+      case GST_AV1_REF_LAST2_FRAME:
+        g_string_append_printf (str, " %s", "Last2");
+        break;
+      case GST_AV1_REF_LAST3_FRAME:
+        g_string_append_printf (str, " %s", "Last3");
+        break;
+      case GST_AV1_REF_GOLDEN_FRAME:
+        g_string_append_printf (str, " %s", "Golden");
+        break;
+      case GST_AV1_REF_BWDREF_FRAME:
+        g_string_append_printf (str, " %s", "Bwd");
+        break;
+      case GST_AV1_REF_ALTREF2_FRAME:
+        g_string_append_printf (str, " %s", "Alt2");
+        break;
+      case GST_AV1_REF_ALTREF_FRAME:
+        g_string_append_printf (str, " %s", "Alt");
+        break;
+      default:
+        g_assert_not_reached ();
+        break;
+    }
+    g_string_append_printf (str, ":");
+
+    if (va_frame->ref_frame_idxi == -1) {
+      g_string_append_printf (str, "unused");
+    } else {
+      g_string_append_printf (str, "%d", va_frame->ref_frame_idxi);
+    }
+
+    if (i != GST_AV1_NUM_REF_FRAMES - 1) {
+      g_string_append_printf (str, ", ");
+    } else {
+      g_string_append_printf (str, " ");
+    }
+  }
+
+  g_string_append_printf (str, "");
+
+print:
+  GST_LOG_OBJECT (self, "%s", str->str);
+
+  g_string_free (str, TRUE);
+#endif
+}
+
+static void
+_av1_print_ref_list_update (GstVaAV1Enc * self, gint update_index,
+    GstVideoCodecFrame * del_frame, GstVideoCodecFrame * add_frame)
+{
+#ifndef GST_DISABLE_GST_DEBUG
+  GString *str;
+
+  if (gst_debug_category_get_threshold (GST_CAT_DEFAULT) < GST_LEVEL_LOG)
+    return;
+
+  str = g_string_new (NULL);
+
+  _av1_print_ref_list (self, str);
+
+  if (_enc_frame (add_frame)->frame_num == 0)
+    g_string_append_printf (str, "Key frame clear all reference list.\n");
+
+  if (update_index >= 0) {
+    if (del_frame) {
+      g_string_append_printf (str, "Replace index %d, delete frame num %d, "
+          "add frame num %d.", update_index, _enc_frame (del_frame)->frame_num,
+          _enc_frame (add_frame)->frame_num);
+    } else {
+      g_string_append_printf (str, "Add frame %d to index %d.",
+          _enc_frame (add_frame)->frame_num, update_index);
+    }
+  }
+
+  GST_LOG_OBJECT (self, "%s", str->str);
+
+  g_string_free (str, TRUE);
+#endif
+}
+
+/*  start, end ) */
+static void
+_set_multi_layer (GstVaAV1GFGroup * gf_group, gint * frame_index,
+    gint start, gint end, guint level, guint max_level)
+{
+  const gint num_frames_to_process = end - start;
+  guint m = (start + end - 1) / 2;
+
+  g_assert (level <= max_level);
+
+  if (level == max_level || num_frames_to_process <= 2) {
+    guint i;
+
+    for (i = 0; i < num_frames_to_process; i++) {
+      gf_group->frame_types*frame_index = GST_AV1_INTER_FRAME;
+      gf_group->pyramid_levels*frame_index = level;
+      gf_group->flags*frame_index = FRAME_FLAG_LEAF | FRAME_FLAG_UPDATE_REF;
+      gf_group->frame_offsets*frame_index = start + i;
+      (*frame_index)++;
+    }
+    return;
+  }
+
+  gf_group->frame_types*frame_index = GST_AV1_INTER_FRAME;
+  gf_group->pyramid_levels*frame_index = level;
+  gf_group->flags*frame_index = FRAME_FLAG_ALT_INL | FRAME_FLAG_UPDATE_REF;
+  gf_group->flags*frame_index |= FRAME_FLAG_NOT_SHOW;
+  gf_group->frame_offsets*frame_index = m;
+  (*frame_index)++;
+
+  /* The frames between start and this internal ALT */
+  _set_multi_layer (gf_group, frame_index, start, m, level + 1, max_level);
+
+  /* Repeat for this internal ALT frame */
+  gf_group->frame_types*frame_index = FRAME_TYPE_REPEAT;
+  gf_group->pyramid_levels*frame_index = -1;
+  gf_group->flags*frame_index = 0;
+  gf_group->frame_offsets*frame_index = m;
+  (*frame_index)++;
+
+  /* The frames between this internal ALT and end */
+  _set_multi_layer (gf_group, frame_index, m + 1, end, level + 1, max_level);
+}
+
+static void
+_av1_init_gf_group (GstVaAV1GFGroup * gf_group, GQueue * reorder_list)
+{
+  guint i;
+
+  gf_group->start_frame_offset = -1;
+  gf_group->group_frame_num = 0;
+  gf_group->last_pushed_num = -1;
+  gf_group->use_alt = FALSE;
+  gf_group->intra_only = FALSE;
+  gf_group->last_poped_index = -1;
+  gf_group->output_frame_num = 0;
+
+  for (i = 0; i < MAX_GF_GROUP_SIZE * 2; i++) {
+    gf_group->frame_typesi = FRAME_TYPE_INVALID;
+    gf_group->pyramid_levelsi = INVALID_PYRAMID_LEVEL;
+    gf_group->flagsi = 0;
+    gf_group->frame_offsetsi = -1;
+  }
+
+  /* We just use it, not own it. */
+  gf_group->reorder_list = reorder_list;
+}
+
+static void
+_av1_start_gf_group (GstVaAV1Enc * self, GstVideoCodecFrame * gf_frame)
+{
+  GstVaAV1GFGroup *gf_group = &self->gop.current_group;
+  guint group_size = self->gop.gf_group_size + 1;
+  gboolean use_alt = self->gop.backward_ref_num > 0;
+  gboolean intra_only = (self->gop.num_ref_frames == 0);
+  guint max_level = self->gop.max_level;
+  GstVaAV1EncFrame *frame = _enc_frame (gf_frame);
+  gboolean key_frame_start = (frame->frame_num == 0);
+  gint frame_index;
+  guint i;
+
+  if (use_alt) {
+    /* At least 2 levels if bi-direction ref,
+       1st for ALT, and 2nd for leaves. */
+    g_assert (max_level >= 2);
+    g_assert (intra_only == FALSE);
+  }
+
+  /* + 1 for golden frame itself. */
+  g_assert (group_size <= MAX_GF_GROUP_SIZE + 1);
+  g_assert (max_level <= HIGHEST_PYRAMID_LEVELS);
+  /* If size < 3, no backward ref needed. */
+  g_assert (group_size > 3 || use_alt == FALSE);
+
+  gf_group->start_frame_offset = frame->frame_num;
+  gf_group->group_frame_num = group_size;
+  gf_group->last_pushed_num = frame->frame_num;
+  gf_group->use_alt = use_alt;
+  gf_group->intra_only = intra_only;
+
+  gf_group->last_poped_index = -1;
+  /* An already encoded frame as the GF,
+     for example, the ALT of the previous GF group. */
+  if (frame->flags & FRAME_FLAG_ALREADY_ENCODED)
+    gf_group->last_poped_index = 0;
+
+  for (i = 0; i < MAX_GF_GROUP_SIZE * 2; i++) {
+    gf_group->frame_typesi = FRAME_TYPE_INVALID;
+    gf_group->pyramid_levelsi = INVALID_PYRAMID_LEVEL;
+    gf_group->flagsi = 0;
+    gf_group->frame_offsetsi = -1;
+  }
+
+  frame_index = 0;
+  /* GF frame is the first */
+  gf_group->frame_typesframe_index = key_frame_start ? GST_AV1_KEY_FRAME :
+      intra_only ? GST_AV1_INTRA_ONLY_FRAME : GST_AV1_INTER_FRAME;
+  gf_group->pyramid_levelsframe_index = 0;
+  gf_group->flagsframe_index = FRAME_FLAG_GF;
+  gf_group->flagsframe_index |= FRAME_FLAG_UPDATE_REF;
+  gf_group->frame_offsetsframe_index = 0;
+  frame_index++;
+
+  /* No backward ref, in simple I/P mode */
+  if (gf_group->use_alt == FALSE) {
+    for (; frame_index < gf_group->group_frame_num; frame_index++) {
+      gf_group->frame_typesframe_index =
+          intra_only ? GST_AV1_INTRA_ONLY_FRAME : GST_AV1_INTER_FRAME;
+      gf_group->pyramid_levelsframe_index = 1;
+      gf_group->flagsframe_index = FRAME_FLAG_UPDATE_REF | FRAME_FLAG_LEAF;
+      if (frame_index == gf_group->group_frame_num - 1)
+        gf_group->flagsframe_index |= FRAME_FLAG_LAST_IN_GF;
+      gf_group->frame_offsetsframe_index = frame_index;
+    }
+
+    gf_group->output_frame_num = gf_group->group_frame_num;
+    gf_group->highest_level = 1;
+
+    _av1_print_gf_group (self, gf_group);
+    return;
+  }
+
+  /* ALT frame */
+  gf_group->frame_typesframe_index = GST_AV1_INTER_FRAME;
+  gf_group->pyramid_levelsframe_index = 1;
+  gf_group->flagsframe_index = FRAME_FLAG_ALT | FRAME_FLAG_UPDATE_REF;
+  gf_group->flagsframe_index |= FRAME_FLAG_LAST_IN_GF;
+  gf_group->flagsframe_index |= FRAME_FLAG_NOT_SHOW;
+  gf_group->frame_offsetsframe_index = gf_group->group_frame_num - 1;
+  frame_index++;
+
+  /* The frames between GF and ALT */
+  _set_multi_layer (gf_group, &frame_index, 1,
+      gf_group->group_frame_num - 1, 2, max_level);
+
+  /* Repeat for ALT frame */
+  gf_group->frame_typesframe_index = FRAME_TYPE_REPEAT;
+  gf_group->pyramid_levelsframe_index = -1;
+  gf_group->flagsframe_index = 0;
+  gf_group->frame_offsetsframe_index = gf_group->group_frame_num - 1;
+  frame_index++;
+
+  gf_group->output_frame_num = frame_index;
+
+  gf_group->highest_level = 0;
+  for (i = 0; i < gf_group->output_frame_num; i++) {
+    if (gf_group->highest_level < gf_group->pyramid_levelsi)
+      gf_group->highest_level = gf_group->pyramid_levelsi;
+  }
+
+  _av1_print_gf_group (self, gf_group);
+  return;
+}
+
+static gboolean
+_av1_gf_group_push_frame (GstVaAV1GFGroup * gf_group,
+    GstVideoCodecFrame * gst_frame)
+{
+  GstVaAV1EncFrame *frame = _enc_frame (gst_frame);
+  gint pushed_frame_num = gf_group->last_pushed_num < 0 ? 0 :
+      gf_group->last_pushed_num - gf_group->start_frame_offset + 1;
+
+  /* No room for a new one. */
+  g_return_val_if_fail (pushed_frame_num < gf_group->group_frame_num, FALSE);
+  /* The frame num should just increase. */
+  g_return_val_if_fail (frame->frame_num == gf_group->last_pushed_num + 1,
+      FALSE);
+
+  if (gf_group->use_alt)
+    /* If we already begin pop, no more push again. */
+    g_return_val_if_fail (gf_group->last_poped_index <= 0, FALSE);
+
+  g_queue_push_tail (gf_group->reorder_list,
+      gst_video_codec_frame_ref (gst_frame));
+
+  gf_group->last_pushed_num = frame->frame_num;
+  return TRUE;
+}
+
+static gboolean
+_av1_gf_group_pop_frame (GstVaAV1GFGroup * gf_group,
+    GstVideoCodecFrame * ref_listGST_AV1_NUM_REF_FRAMES,
+    GstVideoCodecFrame ** out_frame)
+{
+  GstVaAV1EncFrame *vaframe;
+  GstVideoCodecFrame *frame;
+  gint pushed_frame_num = gf_group->last_pushed_num < 0 ? 0 :
+      gf_group->last_pushed_num - gf_group->start_frame_offset + 1;
+  guint i;
+
+  g_assert (pushed_frame_num <= gf_group->group_frame_num);
+
+  if (pushed_frame_num == 0)
+    goto no_frame;
+
+  if (!gf_group->use_alt) {
+    g_assert (gf_group->last_poped_index < pushed_frame_num);
+
+    if (gf_group->last_poped_index + 1 < pushed_frame_num) {
+      gf_group->last_poped_index++;
+      goto find_frame;
+    }
+
+    goto no_frame;
+  }
+
+  /* The first frame of a GF group has no backward ref, pop immediately. */
+  if (gf_group->last_poped_index < 0) {
+    gf_group->last_poped_index++;
+    goto find_frame;
+  }
+
+  /* The ALT frame has not come. */
+  if (pushed_frame_num < gf_group->group_frame_num)
+    goto no_frame;
+
+  gf_group->last_poped_index++;
+  g_assert (gf_group->last_poped_index < gf_group->output_frame_num);
+
+find_frame:
+  vaframe = NULL;
+  frame = NULL;
+
+  /* If repeating some frame, it should be in reference list,
+     or it should be in reorder list. */
+  if (gf_group->frame_typesgf_group->last_poped_index == FRAME_TYPE_REPEAT) {
+    for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
+      GstVaAV1EncFrame *vaf;
+
+      if (ref_listi == NULL)
+        continue;
+
+      vaf = _enc_frame (ref_listi);
+      if (vaf->frame_num == gf_group->start_frame_offset +
+          gf_group->frame_offsetsgf_group->last_poped_index) {
+        vaframe = vaf;
+        frame = ref_listi;
+        break;
+      }
+    }
+
+    g_return_val_if_fail (vaframe, FALSE);
+
+    g_assert (vaframe->flags & FRAME_FLAG_ALREADY_ENCODED);
+    vaframe->type |= FRAME_TYPE_REPEAT;
+  } else {
+    for (i = 0; i < g_queue_get_length (gf_group->reorder_list); i++) {
+      GstVaAV1EncFrame *vaf;
+      GstVideoCodecFrame *f;
+
+      f = g_queue_peek_nth (gf_group->reorder_list, i);
+      vaf = _enc_frame (f);
+      if (vaf->frame_num == gf_group->start_frame_offset +
+          gf_group->frame_offsetsgf_group->last_poped_index) {
+        vaframe = vaf;
+        frame = f;
+        break;
+      }
+    }
+    /* We push the frame num in increment order, so it must exist. */
+    g_return_val_if_fail (vaframe, FALSE);
+    /* Clear that frame from reorder list. */
+    g_queue_pop_nth (gf_group->reorder_list, i);
+
+    vaframe->type = gf_group->frame_typesgf_group->last_poped_index;
+    vaframe->pyramid_level =
+        gf_group->pyramid_levelsgf_group->last_poped_index;
+    vaframe->flags = gf_group->flagsgf_group->last_poped_index;
+
+    /* unref frame popped from reorder queue */
+    gst_video_codec_frame_unref (frame);
+  }
+
+  *out_frame = frame;
+  return TRUE;
+
+no_frame:
+  *out_frame = NULL;
+  return TRUE;
+}
+
+/* Force to finish current group, no matter how many frames we have. */
+static void
+_av1_finish_current_gf_group (GstVaAV1Enc * self, GstVaAV1GFGroup * gf_group)
+{
+  gint frame_index;
+  gint pushed_frame_num = gf_group->last_pushed_num < 0 ? 0 :
+      gf_group->last_pushed_num - gf_group->start_frame_offset + 1;
+  guint i;
+
+  g_assert (pushed_frame_num <= gf_group->group_frame_num);
+
+  /* Alt comes and already finished. */
+  if (gf_group->use_alt && gf_group->last_poped_index > 0)
+    return;
+
+  /* Already pushed all frames. */
+  if (pushed_frame_num == gf_group->group_frame_num)
+    return;
+
+  /* Not enough frames, no need to use backward ref. */
+  if (gf_group->use_alt && pushed_frame_num <= 3)
+    gf_group->use_alt = FALSE;
+
+  if (gf_group->use_alt == FALSE) {
+    g_assert (gf_group->last_poped_index < pushed_frame_num);
+
+    gf_group->group_frame_num = pushed_frame_num;
+
+    for (frame_index = 1; frame_index < gf_group->group_frame_num;
+        frame_index++) {
+      gf_group->frame_typesframe_index =
+          gf_group->intra_only ? GST_AV1_INTRA_ONLY_FRAME : GST_AV1_INTER_FRAME;
+      gf_group->pyramid_levelsframe_index = 1;
+      gf_group->flagsframe_index = FRAME_FLAG_UPDATE_REF | FRAME_FLAG_LEAF;
+      gf_group->frame_offsetsframe_index = frame_index;
+      if (frame_index == gf_group->group_frame_num - 1) {
+        gf_group->flagsframe_index |= FRAME_FLAG_LAST_IN_GF;
+      }
+
+    }
+
+    gf_group->output_frame_num = gf_group->group_frame_num;
+    gf_group->highest_level = 1;
+
+    GST_LOG_OBJECT (self, "Finish current golden group.");
+    _av1_print_gf_group (self, gf_group);
+    return;
+  }
+
+  g_assert (gf_group->highest_level >= 2);
+
+  gf_group->group_frame_num = pushed_frame_num;
+
+  frame_index = 1;
+  /* ALT frame */
+  gf_group->frame_typesframe_index = GST_AV1_INTER_FRAME;
+  gf_group->pyramid_levelsframe_index = 1;
+  gf_group->flagsframe_index = FRAME_FLAG_ALT | FRAME_FLAG_UPDATE_REF;
+  gf_group->flagsframe_index |= FRAME_FLAG_LAST_IN_GF;
+  gf_group->flagsframe_index |= FRAME_FLAG_NOT_SHOW;
+  gf_group->frame_offsetsframe_index = gf_group->group_frame_num - 1;
+  frame_index++;
+
+  /* The frames between GF and ALT */
+  _set_multi_layer (gf_group, &frame_index, 1, gf_group->group_frame_num - 1,
+      2, gf_group->highest_level);
+
+  /* Repeat of ALT frame */
+  gf_group->frame_typesframe_index = FRAME_TYPE_REPEAT;
+  gf_group->pyramid_levelsframe_index = -1;
+  gf_group->flagsframe_index = 0;
+  gf_group->frame_offsetsframe_index = gf_group->group_frame_num - 1;
+  frame_index++;
+
+  gf_group->output_frame_num = frame_index;
+
+  gf_group->highest_level = 0;
+  for (i = 0; i < gf_group->output_frame_num; i++) {
+    if (gf_group->highest_level < gf_group->pyramid_levelsi)
+      gf_group->highest_level = gf_group->pyramid_levelsi;
+  }
+
+  GST_LOG_OBJECT (self, "Finish current golden group.");
+  _av1_print_gf_group (self, gf_group);
+  return;
+}
+
+static inline gboolean
+_av1_gf_group_is_empty (GstVaAV1GFGroup * gf_group)
+{
+  gint pushed_frame_num = gf_group->last_pushed_num < 0 ? 0 :
+      gf_group->last_pushed_num - gf_group->start_frame_offset + 1;
+
+  if (pushed_frame_num <= 0)
+    return TRUE;
+
+  if (gf_group->use_alt == FALSE) {
+    g_assert (gf_group->last_poped_index + 1 <= pushed_frame_num);
+    if (gf_group->last_poped_index + 1 == pushed_frame_num)
+      return TRUE;
+
+    return FALSE;
+  }
+
+  g_assert (gf_group->last_poped_index < gf_group->output_frame_num);
+  if (gf_group->last_poped_index == gf_group->output_frame_num - 1)
+    return TRUE;
+
+  return FALSE;
+}
+
+static inline gboolean
+_av1_gf_group_is_finished (GstVaAV1GFGroup * gf_group)
+{
+  g_assert (gf_group->last_poped_index < gf_group->output_frame_num);
+  if (gf_group->last_poped_index == gf_group->output_frame_num - 1)
+    return TRUE;
+
+  return FALSE;
+}
+
+static GstVideoCodecFrame *
+_av1_find_next_golden_frame (GstVaAV1Enc * self)
+{
+  guint i;
+  GstVideoCodecFrame *f, *f_max_frame_num;
+  GstVaAV1EncFrame *vaf;
+  gint max_frame_num;
+
+  g_assert (_av1_gf_group_is_empty (&self->gop.current_group));
+
+  f = NULL;
+  f_max_frame_num = NULL;
+  max_frame_num = -1;
+  for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
+    if (self->gop.ref_listi == NULL)
+      continue;
+
+    vaf = _enc_frame (self->gop.ref_listi);
+    if (vaf->flags & FRAME_FLAG_LAST_IN_GF) {
+      /* Should not have 2 of group end frame at the same time. */
+      g_assert (f == NULL);
+      f = self->gop.ref_listi;
+    }
+
+    if (vaf->frame_num > max_frame_num) {
+      max_frame_num = vaf->frame_num;
+      f_max_frame_num = self->gop.ref_listi;
+    }
+
+    /* clear all flags about last GF group. */
+    vaf->flags &= ~(FRAME_FLAG_LAST_IN_GF | FRAME_FLAG_ALT_INL |
+        FRAME_FLAG_ALT | FRAME_FLAG_GF);
+  }
+
+  if (f == NULL)
+    f = f_max_frame_num;
+
+  vaf = _enc_frame (f);
+  vaf->flags |= FRAME_FLAG_GF;
+
+  GST_LOG_OBJECT (self, "Find the next golden frame num %d", vaf->frame_num);
+
+  return f;
+}
+
+static gboolean
+gst_va_av1_enc_reorder_frame (GstVaBaseEnc * base, GstVideoCodecFrame * frame,
+    gboolean bump_all, GstVideoCodecFrame ** out_frame)
+{
+  GstVaAV1Enc *self = GST_VA_AV1_ENC (base);
+  GstVaAV1EncFrame *va_frame;
+
+  *out_frame = NULL;
+
+  if (bump_all) {
+    g_return_val_if_fail (frame == NULL, FALSE);
+
+    _av1_finish_current_gf_group (self, &self->gop.current_group);
+
+    if (!_av1_gf_group_is_finished (&self->gop.current_group)) {
+      g_assert (!_av1_gf_group_is_empty (&self->gop.current_group));
+      goto pop;
+    }
+
+    /* no more frames, the cached key frame is the last frame */
+    if (self->gop.last_keyframe) {
+      g_assert (_av1_gf_group_is_empty (&self->gop.current_group));
+
+      *out_frame = self->gop.last_keyframe;
+      self->gop.last_keyframe = NULL;
+    }
+
+    goto finish;
+  }
+
+  /* Pop only. We can pop some frame if:
+     1. The current GF group is not finished.
+     2. Encountered a key frame last time and force to finish
+     the current GF group. */
+  if (frame == NULL) {
+    if (!_av1_gf_group_is_empty (&self->gop.current_group))
+      goto pop;
+
+    if (self->gop.last_keyframe) {
+      GstVideoCodecFrame *f = self->gop.last_keyframe;
+      self->gop.last_keyframe = NULL;
+
+      _av1_start_gf_group (self, f);
+      goto pop;
+    }
+
+    goto finish;
+  }
+
+  if (self->gop.frame_num_since_kf == self->gop.keyframe_interval)
+    self->gop.frame_num_since_kf = 0;
+
+  if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame))
+    self->gop.frame_num_since_kf = 0;
+
+  va_frame = _enc_frame (frame);
+  va_frame->frame_num = self->gop.frame_num_since_kf;
+  self->gop.frame_num_since_kf++;
+
+  GST_LOG_OBJECT (self, "push frame: system_frame_number %d, frame_num: %d",
+      frame->system_frame_number, va_frame->frame_num);
+
+  /* A new key frame force to finish the current GF group. */
+  if (va_frame->frame_num == 0) {
+    _av1_finish_current_gf_group (self, &self->gop.current_group);
+
+    g_queue_push_tail (&base->reorder_list, gst_video_codec_frame_ref (frame));
+
+    if (_av1_gf_group_is_finished (&self->gop.current_group)) {
+      g_assert (_av1_gf_group_is_empty (&self->gop.current_group));
+
+      /* Already poped all of the last group,
+         so begin a new group with this keyframe. */
+      _av1_start_gf_group (self, frame);
+    } else {
+      g_assert (!_av1_gf_group_is_empty (&self->gop.current_group));
+
+      /* The reorder() should exhaust all available frames in the
+         reorder list before push a frame again, so the last key
+         frame should already be popped. */
+      g_return_val_if_fail (self->gop.last_keyframe == NULL, FALSE);
+      self->gop.last_keyframe = frame;
+    }
+
+    goto pop;
+  }
+
+  if (_av1_gf_group_is_finished (&self->gop.current_group)) {
+    GstVideoCodecFrame *gf_frame;
+
+    g_assert (_av1_gf_group_is_empty (&self->gop.current_group));
+
+    gf_frame = _av1_find_next_golden_frame (self);
+    /* At least, there are some frames inside the reference list. */
+    g_assert (gf_frame);
+
+    _av1_start_gf_group (self, gf_frame);
+  }
+
+  if (!_av1_gf_group_push_frame (&self->gop.current_group, frame)) {
+    GST_WARNING_OBJECT (base, "Failed to push the frame,"
+        " system_frame_number %d.", frame->system_frame_number);
+    goto error;
+  }
+
+pop:
+  frame = NULL;
+
+  if (!_av1_gf_group_pop_frame (&self->gop.current_group, self->gop.ref_list,
+          out_frame))
+    goto error;
+
+finish:
+  if (*out_frame) {
+    va_frame = _enc_frame (*out_frame);
+    GST_LOG_OBJECT (self, "pop frame: system_frame_number %d,"
+        " frame_num: %d, frame_type %s", (*out_frame)->system_frame_number,
+        va_frame->frame_num, _av1_get_frame_type_name (va_frame->type));
+  }
+
+  return TRUE;
+
+error:
+  if (frame) {
+    GST_ERROR_OBJECT (base, "Failed to reorder the frame,"
+        " system_frame_number %d.", frame->system_frame_number);
+  } else {
+    GST_ERROR_OBJECT (base, "error when poping frame.");
+  }
+  return FALSE;
+}
+
+static gint
+_av1_sort_by_frame_num (gconstpointer a, gconstpointer b, gpointer user_data)
+{
+  GstVaAV1EncFrame *frame1 = _enc_frame (((GstVaAV1Ref *) a)->frame);
+  GstVaAV1EncFrame *frame2 = _enc_frame (((GstVaAV1Ref *) b)->frame);
+
+  g_assert (frame1->frame_num != frame2->frame_num);
+
+  return frame1->frame_num - frame2->frame_num;
+}
+
+static gboolean
+_av1_assign_ref_index (GstVaAV1Enc * self, GstVideoCodecFrame * frame)
+{
+  GstVaAV1Ref all_refsGST_AV1_NUM_REF_FRAMES;
+  guint ref_num;
+  gint forward_num, backward_num;
+  gint forward_ref_num, backward_ref_num;;
+  GstVaAV1EncFrame *va_frame = _enc_frame (frame);
+  gint i, num;
+  gboolean gf_assigned;
+
+  memset (va_frame->ref_frame_idx, -1, sizeof (va_frame->ref_frame_idx));
+
+  if (va_frame->type & FRAME_TYPE_REPEAT) {
+    va_frame->repeat_index = -1;
+
+    for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
+      if (self->gop.ref_listi == frame) {
+        va_frame->repeat_index = i;
+        break;
+      }
+    }
+
+    g_return_val_if_fail (va_frame->repeat_index >= 0, FALSE);
+    goto finish;
+  }
+
+  /* key frame has no ref */
+  if (va_frame->frame_num == 0) {
+    g_assert (va_frame->type == GST_AV1_KEY_FRAME);
+    va_frame->bidir_ref = FALSE;
+    goto finish;
+  }
+
+  /* intra frame has no ref */
+  if (va_frame->type == GST_AV1_INTRA_ONLY_FRAME) {
+    va_frame->bidir_ref = FALSE;
+    goto finish;
+  }
+
+  ref_num = forward_num = backward_num = 0;
+  for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
+    GstVaAV1EncFrame *va_f;
+
+    if (self->gop.ref_listi == NULL)
+      continue;
+
+    all_refsref_num.frame = self->gop.ref_listi;
+    all_refsref_num.index_in_dpb = i;
+    ref_num++;
+
+    va_f = _enc_frame (self->gop.ref_listi);
+    g_assert (va_f->frame_num != va_frame->frame_num);
+    if (va_f->frame_num < va_frame->frame_num) {
+      forward_num++;
+    } else {
+      backward_num++;
+      g_assert (va_f->flags & FRAME_FLAG_ALT ||
+          va_f->flags & FRAME_FLAG_ALT_INL);
+    }
+
+    if (va_f->flags & FRAME_FLAG_GF)
+      va_frame->ref_frame_idxGST_AV1_REF_GOLDEN_FRAME = i;
+  }
+
+  if (va_frame->ref_frame_idxGST_AV1_REF_GOLDEN_FRAME == -1) {
+    GST_WARNING_OBJECT (self, "failed to find the golden frame.");
+    return FALSE;
+  }
+
+  g_qsort_with_data (all_refs, ref_num, sizeof (GstVaAV1Ref),
+      _av1_sort_by_frame_num, NULL);
+
+  /* Assign the forward references in order of:
+   * 1. The last frame which has the smallest diff.
+   * 2. The golden frame which can be a key frame with better quality.
+   * 3. The other frames by inverse frame number order.
+   */
+  va_frame->bidir_ref = FALSE;
+  gf_assigned = FALSE;
+
+  num = forward_num - 1;
+  g_assert (num >= 0);
+  /* if forward only, should use forward_only_ref_num */
+  forward_ref_num = backward_num > 0 ?
+      self->gop.forward_ref_num : self->gop.forward_only_ref_num;
+  g_assert (forward_ref_num > 0);
+
+  /* The golden frame happens to be the last frame. */
+  if (all_refsnum.index_in_dpb ==
+      va_frame->ref_frame_idxGST_AV1_REF_GOLDEN_FRAME) {
+    num--;
+    forward_ref_num--;
+    gf_assigned = TRUE;
+  }
+
+  if (num >= 0 && forward_ref_num > 0) {
+    va_frame->ref_frame_idxGST_AV1_REF_LAST_FRAME =
+        all_refsnum.index_in_dpb;
+  } else {
+    /* At least one forward reference.
+       Just let the last frame be the same as the golden frame. */
+    g_assert (gf_assigned);
+    va_frame->ref_frame_idxGST_AV1_REF_LAST_FRAME =
+        va_frame->ref_frame_idxGST_AV1_REF_GOLDEN_FRAME;
+  }
+
+  num--;
+  forward_ref_num--;
+
+  if (!gf_assigned) {
+    if (forward_ref_num <= 0) {
+      va_frame->ref_frame_idxGST_AV1_REF_GOLDEN_FRAME =
+          va_frame->ref_frame_idxGST_AV1_REF_LAST_FRAME;
+    } else {
+      /* The golden frame index is already found. */
+      forward_ref_num--;
+    }
+  }
+
+  if (num >= 0 && all_refsnum.index_in_dpb ==
+      va_frame->ref_frame_idxGST_AV1_REF_GOLDEN_FRAME)
+    num--;
+
+  if (num >= 0 && forward_ref_num > 0) {
+    va_frame->ref_frame_idxGST_AV1_REF_LAST2_FRAME =
+        all_refsnum.index_in_dpb;
+  } else {
+    va_frame->ref_frame_idxGST_AV1_REF_LAST2_FRAME =
+        va_frame->ref_frame_idxGST_AV1_REF_LAST_FRAME;
+  }
+
+  num--;
+  forward_ref_num--;
+  if (num >= 0 && all_refsnum.index_in_dpb ==
+      va_frame->ref_frame_idxGST_AV1_REF_GOLDEN_FRAME)
+    num--;
+
+  if (num >= 0 && forward_ref_num > 0) {
+    va_frame->ref_frame_idxGST_AV1_REF_LAST3_FRAME =
+        all_refsnum.index_in_dpb;
+  } else {
+    va_frame->ref_frame_idxGST_AV1_REF_LAST3_FRAME =
+        va_frame->ref_frame_idxGST_AV1_REF_LAST_FRAME;
+  }
+
+  /* Setting the backward refs */
+  if (backward_num > 0 && self->gop.backward_ref_num > 0) {
+    backward_ref_num = self->gop.backward_ref_num;
+
+    g_assert (_enc_frame (all_refsref_num - 1.frame)->flags & FRAME_FLAG_ALT);
+
+    va_frame->bidir_ref = TRUE;
+
+    if (backward_num >= 3 && backward_ref_num >= 3) {
+      /* Set the BWDREF to the nearest future frame, ALTREF2 to the next
+         nearest future frame and ALTREF to the furthest future frame
+         in the GF group. */
+      va_frame->ref_frame_idxGST_AV1_REF_ALTREF_FRAME =
+          all_refsref_num - 1.index_in_dpb;
+      va_frame->ref_frame_idxGST_AV1_REF_ALTREF2_FRAME =
+          all_refsforward_num + 1.index_in_dpb;
+      va_frame->ref_frame_idxGST_AV1_REF_BWDREF_FRAME =
+          all_refsforward_num.index_in_dpb;
+    } else if (backward_num == 2 && backward_ref_num >= 2) {
+      /* Set the BWDREF to the nearest future frame and ALTREF to the furthest
+         future frame in the GF group. ALTREF2 is just set to GOLDEN. */
+      va_frame->ref_frame_idxGST_AV1_REF_ALTREF_FRAME =
+          all_refsref_num - 1.index_in_dpb;
+      va_frame->ref_frame_idxGST_AV1_REF_BWDREF_FRAME =
+          all_refsforward_num.index_in_dpb;
+
+      va_frame->ref_frame_idxGST_AV1_REF_ALTREF2_FRAME =
+          va_frame->ref_frame_idxGST_AV1_REF_ALTREF_FRAME;
+    } else {
+      /* Set the ALTREF to the nearest future frame. ALTREF2 and BWDREF
+         are just set to GOLDEN. */
+      va_frame->ref_frame_idxGST_AV1_REF_ALTREF_FRAME =
+          all_refsforward_num.index_in_dpb;
+
+      va_frame->ref_frame_idxGST_AV1_REF_ALTREF2_FRAME =
+          va_frame->ref_frame_idxGST_AV1_REF_ALTREF_FRAME;
+      va_frame->ref_frame_idxGST_AV1_REF_BWDREF_FRAME =
+          va_frame->ref_frame_idxGST_AV1_REF_ALTREF_FRAME;
+    }
+  } else {
+    /* If no backward refs, BWDREF, ALTREF and ALTREF2 are set to GOLDEN. */
+    va_frame->ref_frame_idxGST_AV1_REF_ALTREF_FRAME =
+        va_frame->ref_frame_idxGST_AV1_REF_GOLDEN_FRAME;
+    va_frame->ref_frame_idxGST_AV1_REF_ALTREF2_FRAME =
+        va_frame->ref_frame_idxGST_AV1_REF_GOLDEN_FRAME;
+    va_frame->ref_frame_idxGST_AV1_REF_BWDREF_FRAME =
+        va_frame->ref_frame_idxGST_AV1_REF_GOLDEN_FRAME;
+  }
+
+finish:
+  _av1_print_frame_reference (self, frame);
+  return TRUE;
+}
+
+static void
+_av1_find_ref_to_update (GstVaBaseEnc * base, GstVideoCodecFrame * frame)
+{
+  GstVaAV1Enc *self = GST_VA_AV1_ENC (base);
+  GstVaAV1EncFrame *va_frame = _enc_frame (frame);
+  gint slot;
+  gint lowest_slot;
+  gint lowest_frame_num = MAX_KEY_FRAME_INTERVAL + 1;
+  gint i;
+
+  if (va_frame->type & FRAME_TYPE_REPEAT)
+    return;
+
+  if ((va_frame->flags & FRAME_FLAG_UPDATE_REF) == 0) {
+    /* Key frame should always clean the reference list. */
+    g_assert (va_frame->type != GST_AV1_KEY_FRAME);
+    return;
+  }
+
+  va_frame->update_index = -1;
+
+  /* key frame will clear the whole ref list, just use the 0 */
+  if (va_frame->type == GST_AV1_KEY_FRAME) {
+    va_frame->update_index = 0;
+    return;
+  }
+
+  /* 1. Find an empty slot in the reference list.
+     2. If the list is full, kick out the non GF frame with lowest
+     frame num. GF frame should not be kicked out because we always
+     set GOLDEN to GF frame.
+     3. If still not find, we drop ourself. */
+  lowest_frame_num = MAX_KEY_FRAME_INTERVAL + 1;
+  slot = lowest_slot = -1;
+  for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
+    GstVaAV1EncFrame *va_f;
+
+    if (self->gop.ref_listi == NULL) {
+      slot = i;
+      break;
+    }
+
+    va_f = _enc_frame (self->gop.ref_listi);
+    if (va_f->flags & FRAME_FLAG_GF)
+      continue;
+
+    if (va_f->frame_num > va_frame->frame_num)
+      continue;
+
+    if (va_f->frame_num < lowest_frame_num) {
+      lowest_frame_num = va_f->frame_num;
+      lowest_slot = i;
+    }
+  }
+
+  if (slot < 0 && lowest_slot >= 0)
+    slot = lowest_slot;
+
+  if (slot >= 0)
+    va_frame->update_index = slot;
+}
+
+static void
+_av1_update_ref_list (GstVaBaseEnc * base, GstVideoCodecFrame * frame)
+{
+  GstVaAV1Enc *self = GST_VA_AV1_ENC (base);
+  GstVaAV1EncFrame *va_frame = _enc_frame (frame);
+  GstVideoCodecFrame *del_f;
+  gint i;
+
+  if (va_frame->type & FRAME_TYPE_REPEAT)
+    return;
+
+  /* key frame, clear the whole ref list. */
+  if (va_frame->type == GST_AV1_KEY_FRAME) {
+    g_assert (va_frame->update_index == 0);
+    g_assert (va_frame->flags & FRAME_FLAG_UPDATE_REF);
+
+    for (i = 0; i < GST_AV1_NUM_REF_FRAMES; i++) {
+      if (self->gop.ref_listi == NULL)
+        continue;
+
+      g_queue_remove (&base->ref_list, self->gop.ref_listi);
+      gst_video_codec_frame_unref (self->gop.ref_listi);
+      self->gop.ref_listi = NULL;
+    }
+
+    g_assert (g_queue_is_empty (&base->ref_list));
+  }
+
+  /* We drop ourself. */
+  if (va_frame->update_index < 0) {
+    GST_DEBUG_OBJECT (self, "Drop the non ref frame %d,"
+        " reference list unchanged", va_frame->frame_num);
+    return;
+  }
+
+  del_f = self->gop.ref_listva_frame->update_index;
+
+  g_queue_push_tail (&base->ref_list, gst_video_codec_frame_ref (frame));
+  self->gop.ref_listva_frame->update_index = frame;
+
+  _av1_print_ref_list_update (self, va_frame->update_index, del_f, frame);
+
+  if (del_f) {
+    g_queue_remove (&base->ref_list, del_f);
+    gst_video_codec_frame_unref (del_f);
+  }
+}
+
+static void
+_av1_clear_frames_in_tu (GstVaAV1Enc * self)
+{
+  guint i;
+  GstVaAV1EncFrame *frame_enc;
+
+  for (i = 0; i < self->frames_in_tu_num; i++) {
+    frame_enc = _enc_frame (self->frames_in_tui);
+    frame_enc->flags &= (~FRAME_FLAG_FRAME_IN_TU_CACHE);
+  }
+
+  memset (self->frames_in_tu, 0, sizeof (self->frames_in_tu));
+  self->frames_in_tu_num = 0;
+}
+
+static void
+gst_va_av1_enc_reset_state (GstVaBaseEnc * base)
+{
+  GstVaAV1Enc *self = GST_VA_AV1_ENC (base);
+
+  GST_VA_BASE_ENC_CLASS (parent_class)->reset_state (base);
+
+  GST_OBJECT_LOCK (self);
+  self->rc.rc_ctrl_mode = self->prop.rc_ctrl;
+  self->rc.target_usage = self->prop.target_usage;
+  self->rc.base_qindex = self->prop.qp;
+  self->rc.min_qindex = self->prop.min_qp;
+  self->rc.max_qindex = self->prop.max_qp;
+  self->rc.target_percentage = self->prop.target_percentage;
+  self->rc.cpb_size = self->prop.cpb_size;
+  self->rc.mbbrc = self->prop.mbbrc;
+
+  self->gop.keyframe_interval = self->prop.keyframe_interval;
+  self->gop.gf_group_size = self->prop.gf_group_size;
+  self->gop.num_ref_frames = self->prop.num_ref_frames;
+  self->gop.max_level = self->prop.max_hierarchical_level;
+  self->partition.use_128x128_superblock = self->prop.use_128x128_superblock;
+  self->partition.num_tile_cols = self->prop.num_tile_cols;
+  self->partition.num_tile_rows = self->prop.num_tile_rows;
+  self->partition.tile_groups = self->prop.tile_groups;
+  GST_OBJECT_UNLOCK (self);
+
+  self->packed_headers = 0;
+
+  self->mi_rows = 0;
+  self->mi_cols = 0;
+  self->depth = 0;
+  self->chrome = 0;
+  self->level_idx = -1;
+  self->level_str = NULL;
+  self->tier = 0;
+  self->cr = 0;
+  self->last_pts = GST_CLOCK_TIME_NONE;
+  self->last_dts = GST_CLOCK_TIME_NONE;
+
+  self->features.enable_filter_intra = FALSE;
+  self->features.enable_intra_edge_filter = FALSE;
+  self->features.enable_interintra_compound = FALSE;
+  self->features.enable_masked_compound = FALSE;
+  self->features.enable_warped_motion = FALSE;
+  self->features.enable_palette_mode = FALSE;
+  self->features.enable_dual_filter = FALSE;
+  self->features.enable_jnt_comp = FALSE;
+  self->features.enable_ref_frame_mvs = FALSE;
+  self->features.enable_superres = FALSE;
+  self->features.enable_restoration = FALSE;
+  self->features.allow_intrabc = FALSE;
+  self->features.enable_segmentation = FALSE;
+  self->features.enable_cdef = FALSE;
+  self->features.interpolation_filter_support = 0;
+  self->features.interpolation_type = 0;
+  self->features.obu_size_bytes = 0;
+  self->features.tx_mode_support = 0;
+  self->features.cdef_channel_strength = FALSE;
+
+  _av1_init_gf_group (&self->gop.current_group, &base->reorder_list);
+  self->gop.last_keyframe = NULL;
+  memset (self->gop.ref_list, 0, sizeof (self->gop.ref_list));
+  self->gop.frame_num_since_kf = 0;
+  self->gop.forward_only_ref_num = 0;
+  self->gop.forward_ref_num = 0;
+  self->gop.backward_ref_num = 0;
+  self->gop.enable_order_hint = FALSE;
+
+  self->partition.sb_rows = 0;
+  self->partition.sb_cols = 0;
+  self->partition.tile_size_bytes_minus_1 = 0;
+  self->partition.tile_width_sb = 0;
+  self->partition.tile_height_sb = 0;
+  self->partition.uniform = TRUE;
+  self->partition.max_tile_num = 0;
+  self->partition.tile_cols_log2 = 0;
+  self->partition.tile_rows_log2 = 0;
+
+  self->rc.max_bitrate = 0;
+  self->rc.target_bitrate = 0;
+  self->rc.max_bitrate_bits = 0;
+  self->rc.cpb_length_bits = 0;
+
+  memset (self->frames_in_tu, 0, sizeof (self->frames_in_tu));
+  self->frames_in_tu_num = 0;
+  self->inside_tu = FALSE;
+
+  memset (&self->sequence_hdr, 0, sizeof (self->sequence_hdr));
+}
+
+static gboolean
+gst_va_av1_enc_flush (GstVideoEncoder * venc)
+{
+  GstVaAV1Enc *self = GST_VA_AV1_ENC (venc);
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+
+  _av1_clear_frames_in_tu (self);
+  self->inside_tu = FALSE;
+
+  /* begin from an key frame after flush. */
+  self->gop.frame_num_since_kf = 0;
+
+  /* Parent's flush will release all frames for us. */
+  _av1_init_gf_group (&self->gop.current_group, &base->reorder_list);
+  self->gop.last_keyframe = NULL;
+  memset (self->gop.ref_list, 0, sizeof (self->gop.ref_list));
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->flush (venc);
+}
+
+static guint
+_av1_get_rtformat (GstVaAV1Enc * self, GstVideoFormat format,
+    guint * depth, guint * chrome)
+{
+  guint chroma;
+
+  chroma = gst_va_chroma_from_video_format (format);
+
+  switch (chroma) {
+    case VA_RT_FORMAT_YUV400:
+      *depth = 8;
+      *chrome = 0;
+      break;
+    case VA_RT_FORMAT_YUV420:
+      *depth = 8;
+      *chrome = 1;
+      break;
+    case VA_RT_FORMAT_YUV420_10:
+      *depth = 10;
+      *chrome = 1;
+      break;
+    case VA_RT_FORMAT_YUV444:
+      *depth = 8;
+      *chrome = 3;
+      break;
+    case VA_RT_FORMAT_YUV422_10:
+      *depth = 10;
+      *chrome = 2;
+      break;
+    default:
+      chroma = 0;
+      GST_ERROR_OBJECT (self, "Unsupported chroma for video format: %s",
+          gst_video_format_to_string (format));
+      break;
+  }
+
+  return chroma;
+}
+
+#define update_property(type, obj, old_val, new_val, prop_id)           \
+  gst_va_base_enc_update_property_##type (obj, old_val, new_val, propertiesprop_id)
+#define update_property_uint(obj, old_val, new_val, prop_id)    \
+  update_property (uint, obj, old_val, new_val, prop_id)
+#define update_property_bool(obj, old_val, new_val, prop_id)    \
+  update_property (bool, obj, old_val, new_val, prop_id)
+
+static gboolean
+_av1_decide_profile (GstVaAV1Enc * self, guint rt_format,
+    guint depth, guint chrome)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  GstCaps *allowed_caps = NULL;
+  guint num_structures, i;
+  GstStructure *structure;
+  const GValue *v_profile;
+  GArray *candidates = NULL;
+  VAProfile va_profile, ret_profile = VAProfileNone;
+
+  candidates = g_array_new (TRUE, TRUE, sizeof (VAProfile));
+
+  /* First, check whether the downstream requires a specified profile. */
+  allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (base));
+  if (!allowed_caps)
+    allowed_caps = gst_pad_query_caps (GST_VIDEO_ENCODER_SRC_PAD (base), NULL);
+
+  if (allowed_caps && !gst_caps_is_empty (allowed_caps)) {
+    num_structures = gst_caps_get_size (allowed_caps);
+    for (i = 0; i < num_structures; i++) {
+      structure = gst_caps_get_structure (allowed_caps, i);
+      v_profile = gst_structure_get_value (structure, "profile");
+      if (!v_profile)
+        continue;
+
+      if (G_VALUE_HOLDS_STRING (v_profile)) {
+        va_profile =
+            gst_va_profile_from_name (AV1, g_value_get_string (v_profile));
+        g_array_append_val (candidates, va_profile);
+      } else if (GST_VALUE_HOLDS_LIST (v_profile)) {
+        guint j;
+
+        for (j = 0; j < gst_value_list_get_size (v_profile); j++) {
+          const GValue *p = gst_value_list_get_value (v_profile, j);
+          if (!p)
+            continue;
+
+          va_profile = gst_va_profile_from_name (AV1, g_value_get_string (p));
+          g_array_append_val (candidates, va_profile);
+        }
+      }
+    }
+  }
+
+  if (candidates->len == 0) {
+    GST_ERROR_OBJECT (self, "No available profile in caps");
+    goto out;
+  }
+
+  /* 6.4.1:
+     seq_profile  Bit depth  Monochrome support  Chroma subsampling
+     0            8 or 10    Yes                 YUV 4:2:0
+     1            8 or 10    No                  YUV 4:4:4
+     2            8 or 10    Yes                 YUV 4:2:2
+     2            12         Yes                 YUV 4:2:0,YUV 4:2:2,YUV 4:4:4
+   */
+  /* We only support 0 and 1 profile now */
+  if (chrome == 0 || chrome == 1) {
+    va_profile = VAProfileAV1Profile0;
+  } else if (chrome == 3) {
+    va_profile = VAProfileAV1Profile1;
+  } else {
+    va_profile = VAProfileNone;
+    GST_ERROR_OBJECT (self, "No suitable profile for chroma value %d", chrome);
+    goto out;
+  }
+
+  for (i = 0; i < candidates->len; i++) {
+    VAProfile p;
+
+    p = g_array_index (candidates, VAProfile, i);
+    if (!gst_va_encoder_has_profile (base->encoder, p))
+      continue;
+
+    if ((rt_format & gst_va_encoder_get_rtformat (base->encoder,
+                p, GST_VA_BASE_ENC_ENTRYPOINT (base))) == 0)
+      continue;
+
+    if (p == va_profile) {
+      ret_profile = p;
+      goto out;
+    }
+  }
+
+out:
+  if (ret_profile != VAProfileNone)
+    GST_INFO_OBJECT (self, "Decide the profile: %s",
+        gst_va_profile_name (ret_profile));
+
+  return ret_profile;
+}
+
+static gboolean
+_av1_init_packed_headers (GstVaAV1Enc * self)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  guint32 packed_headers;
+  guint32 desired_packed_headers = VA_ENC_PACKED_HEADER_SEQUENCE        /* Sequence Header */
+      | VA_ENC_PACKED_HEADER_PICTURE    /* Frame Header */
+      | VA_ENC_PACKED_HEADER_RAW_DATA;  /* Meta, TU, etc. */
+
+  self->packed_headers = 0;
+
+  if (!gst_va_encoder_get_packed_headers (base->encoder, base->profile,
+          GST_VA_BASE_ENC_ENTRYPOINT (base), &packed_headers))
+    return FALSE;
+
+  if (desired_packed_headers & ~packed_headers) {
+    GST_INFO_OBJECT (self, "Driver does not support some wanted packed headers "
+        "(wanted %#x, found %#x)", desired_packed_headers, packed_headers);
+  }
+
+  self->packed_headers = desired_packed_headers & packed_headers;
+
+  return TRUE;
+}
+
+static gboolean
+_av1_generate_gop_structure (GstVaAV1Enc * self)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  guint32 list0, list1, listp_0;
+
+  /* If not set, generate a key frame every 2 second */
+  if (self->gop.keyframe_interval == 0) {
+    self->gop.keyframe_interval = (2 * GST_VIDEO_INFO_FPS_N (&base->in_info)
+        + GST_VIDEO_INFO_FPS_D (&base->in_info) - 1) /
+        GST_VIDEO_INFO_FPS_D (&base->in_info);
+  }
+
+  if (self->gop.keyframe_interval > MAX_KEY_FRAME_INTERVAL)
+    self->gop.keyframe_interval = MAX_KEY_FRAME_INTERVAL;
+
+  if (self->gop.gf_group_size >= self->gop.keyframe_interval)
+    self->gop.gf_group_size = self->gop.keyframe_interval - 1;
+
+  if (!gst_va_encoder_get_max_num_reference (base->encoder, base->profile,
+          GST_VA_BASE_ENC_ENTRYPOINT (base), &list0, &list1)) {
+    GST_INFO_OBJECT (self, "Failed to get the max num reference");
+    list0 = 1;
+    list1 = 0;
+    listp_0 = list0;
+  }
+
+  listp_0 = list0;
+
+  /* At most, 4 forward refs */
+  if (list0 > 4)
+    list0 = 4;
+  if (listp_0 > 4)
+    listp_0 = 4;
+
+  /* At most, 3 backward refs */
+  if (list1 > 3)
+    list1 = 3;
+
+  /* No more backward refs than forward refs. */
+  if (list1 > list0)
+    list1 = list0;
+
+  /* Do not let P frames have more refs than B frames. */
+  if (listp_0 > list0 + list1)
+    listp_0 = list0 + list1;
+  /* B frame should not have more forward refs than P frame */
+  if (listp_0 != 0 && list0 > listp_0)
+    list0 = listp_0;
+
+  /* Only I/P mode is needed */
+  if (self->gop.max_level < 2 || self->gop.gf_group_size < 3) {
+    list1 = 0;
+    list0 = listp_0;
+  }
+
+  if (self->gop.num_ref_frames == 0) {
+    list0 = 0;
+    listp_0 = 0;
+    list1 = 0;
+    self->gop.num_ref_frames = list0 + list1;
+    GST_INFO_OBJECT (self, "No reference for each frame, intra only stream");
+  } else if (self->gop.num_ref_frames <= 2) {
+    list0 = MIN (self->gop.num_ref_frames, list0);
+    listp_0 = list0;
+    list1 = 0;
+    self->gop.num_ref_frames = list0 + list1;
+    GST_INFO_OBJECT (self, "Only %d reference frames, disable backward ref",
+        self->gop.num_ref_frames);
+  } else {
+    if (self->gop.num_ref_frames > list0 + list1) {
+      self->gop.num_ref_frames = list0 + list1;
+      GST_INFO_OBJECT (self, "Lowering the number of reference frames to %d "
+          "because of the reference number limit", self->gop.num_ref_frames);
+    } else if (self->gop.num_ref_frames < list0 + list1) {
+      guint l0 = 0;
+      guint l1 = 0;
+
+      g_assert (list0 > 0);
+      g_assert (list0 >= list1);
+
+      while (list0 > 0 || list1 > 0) {
+        if (list0 > 0) {
+          l0++;
+          list0--;
+        }
+        if (l0 + l1 >= self->gop.num_ref_frames)
+          break;
+
+        if (list1 > 0) {
+          l1++;
+          list1--;
+        }
+
+        if (l0 + l1 >= self->gop.num_ref_frames)
+          break;
+      }
+
+      list0 = l0;
+      list1 = l1;
+      listp_0 = MIN (l0 + l1, listp_0);
+
+      self->gop.num_ref_frames = list0 + list1;
+    }
+  }
+
+  self->gop.forward_only_ref_num = listp_0;
+  self->gop.forward_ref_num = list0;
+  self->gop.backward_ref_num = list1;
+
+  if (self->gop.num_ref_frames > 0) {
+    self->gop.enable_order_hint = TRUE;
+  } else {
+    self->gop.enable_order_hint = FALSE;
+  }
+
+  GST_INFO_OBJECT (self, "key frame interval %d, golden frame group size %d,"
+      " max hierarchical level %d, reference num %d, forward_only_ref_num %d,"
+      " forward ref num %d, backward ref num %d, order hint is %d",
+      self->gop.keyframe_interval, self->gop.gf_group_size, self->gop.max_level,
+      self->gop.num_ref_frames, self->gop.forward_only_ref_num,
+      self->gop.forward_ref_num, self->gop.backward_ref_num,
+      self->gop.enable_order_hint);
+
+  update_property_uint (base, &self->prop.keyframe_interval,
+      self->gop.keyframe_interval, PROP_KEYFRAME_INT);
+  update_property_uint (base, &self->prop.gf_group_size,
+      self->gop.gf_group_size, PROP_GOLDEN_GROUP_SIZE);
+  update_property_uint (base, &self->prop.num_ref_frames,
+      self->gop.num_ref_frames, PROP_NUM_REF_FRAMES);
+  update_property_uint (base, &self->prop.max_hierarchical_level,
+      self->gop.max_level, PROP_HIERARCHICAL_LEVEL);
+
+  _av1_init_gf_group (&self->gop.current_group, &base->reorder_list);
+
+  return TRUE;
+}
+
+/* 5.9.16. Tile size calculation function */
+static gint
+_av1_tile_log2 (gint blkSize, gint target)
+{
+  gint k;
+
+  for (k = 0; (blkSize << k) < target; k++);
+
+  return k;
+}
+
+static gboolean
+_av1_setup_tile_partition (GstVaAV1Enc * self)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  guint sb_shift, sb_size;
+  guint max_tile_width_sb, max_tile_area_sb;
+  guint min_log2_tile_cols, max_log2_tile_cols,
+      max_log2_tile_rows, min_log2_tiles;
+
+  /* 5.9.15. Tile info syntax */
+  self->partition.sb_cols = self->partition.use_128x128_superblock ?
+      ((self->mi_cols + 31) >> 5) : ((self->mi_cols + 15) >> 4);
+  self->partition.sb_rows = self->partition.use_128x128_superblock ?
+      ((self->mi_rows + 31) >> 5) : ((self->mi_rows + 15) >> 4);
+
+  sb_shift = self->partition.use_128x128_superblock ? 5 : 4;
+  sb_size = sb_shift + 2;
+  max_tile_width_sb = GST_AV1_MAX_TILE_WIDTH >> sb_size;
+  max_tile_area_sb = GST_AV1_MAX_TILE_AREA >> (2 * sb_size);
+
+  min_log2_tile_cols =
+      _av1_tile_log2 (max_tile_width_sb, self->partition.sb_cols);
+  max_log2_tile_cols =
+      _av1_tile_log2 (1, MIN (self->partition.sb_cols, GST_AV1_MAX_TILE_COLS));
+  max_log2_tile_rows =
+      _av1_tile_log2 (1, MIN (self->partition.sb_rows, GST_AV1_MAX_TILE_ROWS));
+  min_log2_tiles = MAX (min_log2_tile_cols, _av1_tile_log2 (max_tile_area_sb,
+          self->partition.sb_rows * self->partition.sb_cols));
+
+  if (self->partition.max_tile_num < (1 << min_log2_tiles)) {
+    GST_ERROR_OBJECT (self, "HW only support %d tiles, less than the min"
+        " required tile number %d", self->partition.max_tile_num,
+        (1 << min_log2_tiles));
+    return FALSE;
+  }
+
+  if (self->partition.num_tile_cols * self->partition.num_tile_rows >
+      self->partition.max_tile_num) {
+    GST_ERROR_OBJECT (self, "HW only support %d tiles, less than the"
+        " total tile number %dx%d = %d we set", self->partition.max_tile_num,
+        self->partition.num_tile_cols, self->partition.num_tile_rows,
+        self->partition.num_tile_cols * self->partition.num_tile_rows);
+    return FALSE;
+  }
+
+  self->partition.tile_cols_log2 =
+      _av1_tile_log2 (1, self->partition.num_tile_cols);
+  if (self->partition.tile_cols_log2 < min_log2_tile_cols)
+    self->partition.tile_cols_log2 = min_log2_tile_cols;
+  if (self->partition.tile_cols_log2 > max_log2_tile_cols)
+    self->partition.tile_cols_log2 = max_log2_tile_cols;
+
+  self->partition.tile_rows_log2 =
+      _av1_tile_log2 (1, self->partition.num_tile_rows);
+  if (self->partition.tile_rows_log2 > max_log2_tile_rows)
+    self->partition.tile_rows_log2 = max_log2_tile_rows;
+  if (self->partition.tile_cols_log2 + self->partition.tile_rows_log2 <
+      min_log2_tiles)
+    self->partition.tile_rows_log2 =
+        min_log2_tiles - self->partition.tile_cols_log2;
+
+  /* Only support uniform now */
+  self->partition.uniform = TRUE;
+  self->partition.tile_width_sb = (self->partition.sb_cols +
+      (1 << self->partition.tile_cols_log2) - 1)
+      >> self->partition.tile_cols_log2;
+  self->partition.tile_height_sb = (self->partition.sb_rows +
+      (1 << self->partition.tile_rows_log2) - 1)
+      >> self->partition.tile_rows_log2;
+
+  self->partition.num_tile_cols = (self->partition.sb_cols +
+      self->partition.tile_width_sb - 1) / self->partition.tile_width_sb;
+  self->partition.num_tile_rows = (self->partition.sb_rows +
+      self->partition.tile_height_sb - 1) / self->partition.tile_height_sb;
+
+  /* At least one tile for each tile group. */
+  if (self->partition.tile_groups >
+      self->partition.num_tile_cols * self->partition.num_tile_rows)
+    self->partition.tile_groups =
+        self->partition.num_tile_cols * self->partition.num_tile_rows;
+
+  update_property_uint (base, &self->prop.num_tile_cols,
+      self->partition.num_tile_cols, PROP_NUM_TILE_COLS);
+  update_property_uint (base, &self->prop.num_tile_rows,
+      self->partition.num_tile_rows, PROP_NUM_TILE_ROWS);
+  update_property_uint (base, &self->prop.tile_groups,
+      self->partition.tile_groups, PROP_TILE_GROUPS);
+
+  GST_INFO_OBJECT (self, "Tile info: uniform = %d, num_tile_cols = %d, "
+      "num_tile_rows = %d, tile_cols_log2 = %d, tile_rows_log2 = %d, "
+      "tile_width_sb = %d, tile_height_sb = %d, tile_groups = %d",
+      self->partition.uniform, self->partition.num_tile_cols,
+      self->partition.num_tile_rows, self->partition.tile_cols_log2,
+      self->partition.tile_rows_log2, self->partition.tile_width_sb,
+      self->partition.tile_height_sb, self->partition.tile_groups);
+
+  return TRUE;
+}
+
+/* We need to decide the profile and entrypoint before call this.
+   It applies the optimized features provided by the va driver. */
+static void
+_av1_setup_encoding_features (GstVaAV1Enc * self)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  VAStatus status;
+  VAConfigAttrib attrib;
+
+  attrib.type = VAConfigAttribEncAV1;
+  attrib.value = 0;
+  status = vaGetConfigAttributes (gst_va_display_get_va_dpy (base->display),
+      base->profile, GST_VA_BASE_ENC_ENTRYPOINT (base), &attrib, 1);
+  if (status != VA_STATUS_SUCCESS || attrib.value == VA_ATTRIB_NOT_SUPPORTED) {
+    if (status != VA_STATUS_SUCCESS) {
+      GST_INFO_OBJECT (self, "Failed to query encoding features: %s",
+          vaErrorStr (status));
+    } else {
+      GST_INFO_OBJECT (self, "Driver does not support query encoding features");
+    }
+
+    GST_INFO_OBJECT (self, "Use default values for AV1 features");
+
+    self->partition.use_128x128_superblock = FALSE;
+    GST_INFO_OBJECT (self, "128x128 superblock query not supported,"
+        " just disable it");
+
+    self->features.enable_filter_intra = FALSE;
+    self->features.enable_intra_edge_filter = FALSE;
+    self->features.enable_interintra_compound = FALSE;
+    self->features.enable_masked_compound = FALSE;
+    self->features.enable_warped_motion = FALSE;
+    self->features.enable_palette_mode = FALSE;
+    self->features.enable_dual_filter = FALSE;
+    self->features.enable_jnt_comp = FALSE;
+    self->features.enable_ref_frame_mvs = FALSE;
+    self->features.enable_superres = FALSE;
+    self->features.enable_restoration = FALSE;
+    self->features.allow_intrabc = FALSE;
+    self->features.enable_cdef = FALSE;
+    self->features.cdef_channel_strength = FALSE;
+  } else {
+    VAConfigAttribValEncAV1 features;
+
+    features.value = attrib.value;
+
+    if (self->partition.use_128x128_superblock
+        && (features.bits.support_128x128_superblock == 0)) {
+      GST_INFO_OBJECT (self, "128x128 superblock is not supported.");
+      self->partition.use_128x128_superblock = FALSE;
+    }
+
+    self->features.enable_filter_intra =
+        (features.bits.support_filter_intra != 0);
+    self->features.enable_intra_edge_filter =
+        (features.bits.support_intra_edge_filter != 0);
+    self->features.enable_interintra_compound =
+        (features.bits.support_interintra_compound != 0);
+    self->features.enable_masked_compound =
+        (features.bits.support_masked_compound != 0);
+    /* not enable it now. */
+    self->features.enable_warped_motion = FALSE;
+    // (features.bits.support_warped_motion != 0);
+    self->features.enable_palette_mode =
+        (features.bits.support_palette_mode != 0);
+    self->features.enable_dual_filter =
+        (features.bits.support_dual_filter != 0);
+    self->features.enable_jnt_comp = (features.bits.support_jnt_comp != 0);
+    self->features.enable_ref_frame_mvs =
+        (features.bits.support_ref_frame_mvs != 0);
+    /* not enable it now. */
+    self->features.enable_superres = FALSE;
+    self->features.enable_restoration = FALSE;
+    // (features.bits.support_restoration != 0);
+    /* not enable it now. */
+    self->features.allow_intrabc = FALSE;
+    self->features.enable_cdef = TRUE;
+    self->features.cdef_channel_strength =
+        (features.bits.support_cdef_channel_strength != 0);
+  }
+
+  update_property_bool (base, &self->prop.use_128x128_superblock,
+      self->partition.use_128x128_superblock, PROP_128X128_SUPERBLOCK);
+
+  attrib.type = VAConfigAttribEncAV1Ext1;
+  attrib.value = 0;
+  status = vaGetConfigAttributes (gst_va_display_get_va_dpy (base->display),
+      base->profile, GST_VA_BASE_ENC_ENTRYPOINT (base), &attrib, 1);
+  if (status != VA_STATUS_SUCCESS || attrib.value == VA_ATTRIB_NOT_SUPPORTED) {
+    if (status != VA_STATUS_SUCCESS) {
+      GST_INFO_OBJECT (self, "Failed to query encoding feature ext1: %s",
+          vaErrorStr (status));
+    } else {
+      GST_INFO_OBJECT (self, "Driver does not support query encoding"
+          " feature ext1");
+    }
+
+    GST_INFO_OBJECT (self, "Use default values for AV1 feature ext1");
+
+    /* Only EIGHTTAP */
+    self->features.interpolation_filter_support =
+        1 << GST_AV1_INTERPOLATION_FILTER_EIGHTTAP;
+    self->features.interpolation_type = GST_AV1_INTERPOLATION_FILTER_EIGHTTAP;
+
+    self->features.enable_segmentation = FALSE;
+  } else {
+    VAConfigAttribValEncAV1Ext1 features_ext1;
+    guint i;
+
+    features_ext1.value = attrib.value;
+
+    self->features.interpolation_filter_support =
+        (features_ext1.bits.interpolation_filter & 0x1f);
+    if (self->features.interpolation_filter_support == 0) {
+      GST_INFO_OBJECT (self, "No interpolation filter support,"
+          " just assume it supports EIGHTTAP type");
+      self->features.interpolation_filter_support =
+          1 << GST_AV1_INTERPOLATION_FILTER_EIGHTTAP;
+    }
+
+    for (i = 0; i < 5; i++) {
+      if (self->features.interpolation_filter_support & (1 << i)) {
+        self->features.interpolation_type = i;
+        break;
+      }
+    }
+
+    /* not enable segmentation now. */
+    self->features.enable_segmentation = FALSE;
+  }
+
+  attrib.type = VAConfigAttribEncAV1Ext2;
+  attrib.value = 0;
+  status = vaGetConfigAttributes (gst_va_display_get_va_dpy (base->display),
+      base->profile, GST_VA_BASE_ENC_ENTRYPOINT (base), &attrib, 1);
+  if (status != VA_STATUS_SUCCESS || attrib.value == VA_ATTRIB_NOT_SUPPORTED) {
+    if (status != VA_STATUS_SUCCESS) {
+      GST_INFO_OBJECT (self, "Failed to query encoding feature ext2: %s",
+          vaErrorStr (status));
+    } else {
+      GST_INFO_OBJECT (self, "Driver does not support query encoding"
+          " feature ext2");
+    }
+
+    GST_INFO_OBJECT (self, "Use default values for AV1 feature ext2");
+
+    self->partition.tile_size_bytes_minus_1 = 3;
+    self->features.obu_size_bytes = 4;
+    self->features.tx_mode_support = GST_AV1_TX_MODE_LARGEST;
+    self->partition.max_tile_num = 1;
+  } else {
+    VAConfigAttribValEncAV1Ext2 features_ext2;
+
+    features_ext2.value = attrib.value;
+
+    self->partition.tile_size_bytes_minus_1 =
+        features_ext2.bits.tile_size_bytes_minus1;
+    self->features.obu_size_bytes = 4;
+    /* features_ext2.bits.obu_size_bytes_minus1 + 1; */
+
+    self->features.tx_mode_support = features_ext2.bits.tx_mode_support;
+    if (!(self->features.tx_mode_support &
+            (1 << GST_AV1_TX_MODE_LARGEST | 1 << GST_AV1_TX_MODE_SELECT))) {
+      GST_WARNING_OBJECT (self, "query tx_mode_support get invalid"
+          " value 0x%x, set to support TX_MODE_LARGEST",
+          self->features.tx_mode_support);
+      self->features.tx_mode_support = 1 << GST_AV1_TX_MODE_LARGEST;
+    }
+
+    self->partition.max_tile_num = features_ext2.bits.max_tile_num_minus1 + 1;
+  }
+
+  GST_INFO_OBJECT (self, "Setting the features: use_128x128_superblock = %d,"
+      " enable_filter_intra = %d, enable_intra_edge_filter = %d,"
+      " enable_interintra_compound = %d, enable_masked_compound = %d,"
+      " enable_warped_motion = %d, enable_palette_mode = %d,"
+      " enable_dual_filter = %d, enable_jnt_comp = %d,"
+      " enable_ref_frame_mvs = %d, enable_superres = %d,"
+      " enable_restoration = %d, allow_intrabc = %d,"
+      " enable_cdef = %d, cdef_channel_strength = %d,"
+      " interpolation_filter_support = %d,"
+      " interpolation_type = %d, enable_segmentation = %d,"
+      " tile_size_bytes_minus_1 = %d, obu_size_bytes = %d,"
+      " tx_mode_support = 0x%x, max_tile_num = %d",
+      self->partition.use_128x128_superblock,
+      self->features.enable_filter_intra,
+      self->features.enable_intra_edge_filter,
+      self->features.enable_interintra_compound,
+      self->features.enable_masked_compound,
+      self->features.enable_warped_motion, self->features.enable_palette_mode,
+      self->features.enable_dual_filter, self->features.enable_jnt_comp,
+      self->features.enable_ref_frame_mvs, self->features.enable_superres,
+      self->features.enable_restoration, self->features.allow_intrabc,
+      self->features.enable_cdef, self->features.cdef_channel_strength,
+      self->features.interpolation_filter_support,
+      self->features.interpolation_type, self->features.enable_segmentation,
+      self->partition.tile_size_bytes_minus_1, self->features.obu_size_bytes,
+      self->features.tx_mode_support, self->partition.max_tile_num);
+}
+
+static void
+_av1_calculate_coded_size (GstVaAV1Enc * self)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  guint un_compressed_size /* UnCompressedSize */ ;
+  guint pic_size_profile_factor /* PicSizeProfileFactor */ ;
+
+  /* Annex A: */
+  switch (base->profile) {
+    case VAProfileAV1Profile0:
+      pic_size_profile_factor = 15;
+      break;
+    case VAProfileAV1Profile1:
+      pic_size_profile_factor = 30;
+      break;
+    default:
+      pic_size_profile_factor = 36;
+      break;
+  }
+
+  un_compressed_size =
+      ((base->width * base->height * pic_size_profile_factor) >> 3);
+
+  /* FIXME: Using only a rough approximation for bitstream headers.
+     We do not calculate SpeedAdj and do not consider still_picture. */
+  base->codedbuf_size = un_compressed_size / self->cr;
+
+  GST_INFO_OBJECT (self, "Calculate codedbuf size: %u", base->codedbuf_size);
+}
+
+/* Normalizes bitrate (and CPB size) for HRD conformance */
+static void
+_av1_calculate_bitrate_hrd (GstVaAV1Enc * self)
+{
+  guint bitrate_bits, cpb_bits_size;
+
+  bitrate_bits = self->rc.max_bitrate * 1000;
+  GST_DEBUG_OBJECT (self, "Max bitrate: %u bits/sec", bitrate_bits);
+  self->rc.max_bitrate_bits = bitrate_bits;
+
+  bitrate_bits = self->rc.target_bitrate * 1000;
+  GST_DEBUG_OBJECT (self, "Target bitrate: %u bits/sec", bitrate_bits);
+  self->rc.target_bitrate_bits = bitrate_bits;
+
+  if (self->rc.cpb_size > 0 && self->rc.cpb_size < (self->rc.max_bitrate / 2)) {
+    GST_INFO_OBJECT (self, "Too small cpb_size: %d", self->rc.cpb_size);
+    self->rc.cpb_size = 0;
+  }
+
+  if (self->rc.cpb_size == 0) {
+    /* We cache 2 second coded data by default. */
+    self->rc.cpb_size = self->rc.max_bitrate * 2;
+    GST_INFO_OBJECT (self, "Adjust cpb_size to: %d", self->rc.cpb_size);
+  }
+
+  cpb_bits_size = self->rc.cpb_size * 1000;
+
+  GST_DEBUG_OBJECT (self, "HRD CPB size: %u bits", cpb_bits_size);
+  self->rc.cpb_length_bits = cpb_bits_size;
+}
+
+/* Estimates a good enough bitrate if none was supplied */
+static gboolean
+_av1_ensure_rate_control (GstVaAV1Enc * self)
+{
+  /* User can specify the properties of: "bitrate", "target-percentage",
+   * "max-qp", "min-qp", "qp", "mbbrc", "cpb-size", "rate-control" and
+   * "target-usage" to control the RC behavior.
+   *
+   * "target-usage" is different from the others, it controls the encoding
+   * speed and quality, while the others control encoding bit rate and
+   * quality. The lower value has better quality(maybe bigger MV search
+   * range) but slower speed, the higher value has faster speed but lower
+   * quality.
+   *
+   * The possible composition to control the bit rate and quality:
+   *
+   * 1. CQP mode: "rate-control=cqp", then "qp"(the qindex in AV1) specify
+   *    the QP of frames(within the "max-qp" and "min-qp" range). The QP
+   *    will not change during the whole stream. Other properties related
+   *    to rate control are ignored.
+   *
+   * 2. CBR mode: "rate-control=CBR", then the "bitrate" specify the
+   *    target bit rate and the "cpb-size" specifies the max coded
+   *    picture buffer size to avoid overflow. If the "bitrate" is not
+   *    set, it is calculated by the picture resolution and frame
+   *    rate. If "cpb-size" is not set, it is set to the size of
+   *    caching 2 second coded data. Encoder will try its best to make
+   *    the QP with in the "max-qp", "min-qp" range. "mbbrc" can
+   *    enable bit rate control in macro block level. Other paramters
+   *    are ignored.
+   *
+   * 3. VBR mode: "rate-control=VBR", then the "bitrate" specify the
+   *    target bit rate, "target-percentage" is used to calculate the
+   *    max bit rate of VBR mode by ("bitrate" * 100) /
+   *    "target-percentage". It is also used by driver to calculate
+   *    the min bit rate. The "cpb-size" specifies the max coded
+   *    picture buffer size to avoid overflow. If the "bitrate" is not
+   *    set, the target bit rate will be calculated by the picture
+   *    resolution and frame rate. Encoder will try its best to make
+   *    the QP with in the "max-qp", "min-qp" range. "mbbrc" can
+   *    enable bit rate control in macro block level. Other paramters
+   *    are ignored.
+   *
+   * 4. VCM mode: "rate-control=VCM", then the "bitrate" specify the
+   *    target bit rate, and encoder will try its best to make the QP
+   *    with in the "max-qp", "min-qp" range. Other paramters are
+   *    ignored.
+   */
+
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  guint bitrate;
+  guint32 rc_ctrl, rc_mode, quality_level;
+
+  quality_level = gst_va_encoder_get_quality_level (base->encoder,
+      base->profile, GST_VA_BASE_ENC_ENTRYPOINT (base));
+  if (self->rc.target_usage > quality_level) {
+    GST_INFO_OBJECT (self, "User setting target-usage: %d is not supported, "
+        "fallback to %d", self->rc.target_usage, quality_level);
+    self->rc.target_usage = quality_level;
+
+    update_property_uint (base, &self->prop.target_usage, self->rc.target_usage,
+        PROP_TARGET_USAGE);
+  }
+
+  GST_OBJECT_LOCK (self);
+  rc_ctrl = self->prop.rc_ctrl;
+  GST_OBJECT_UNLOCK (self);
+
+  if (rc_ctrl != VA_RC_NONE) {
+    rc_mode = gst_va_encoder_get_rate_control_mode (base->encoder,
+        base->profile, GST_VA_BASE_ENC_ENTRYPOINT (base));
+    if (!(rc_mode & rc_ctrl)) {
+      guint32 defval =
+          G_PARAM_SPEC_ENUM (propertiesPROP_RATE_CONTROL)->default_value;
+      GST_INFO_OBJECT (self, "The rate control mode %s is not supported, "
+          "fallback to %s mode", _rate_control_get_name (rc_ctrl),
+          _rate_control_get_name (defval));
+      self->rc.rc_ctrl_mode = defval;
+
+      update_property_uint (base, &self->prop.rc_ctrl, self->rc.rc_ctrl_mode,
+          PROP_RATE_CONTROL);
+    }
+  } else {
+    self->rc.rc_ctrl_mode = VA_RC_NONE;
+  }
+
+  if (self->rc.min_qindex > self->rc.max_qindex) {
+    GST_INFO_OBJECT (self, "The min_qindex %d is bigger than the max_qindex"
+        " %d, set it to the max_qindex", self->rc.min_qindex,
+        self->rc.max_qindex);
+    self->rc.min_qindex = self->rc.max_qindex;
+
+    update_property_uint (base, &self->prop.min_qp, self->rc.min_qindex,
+        PROP_MIN_QP);
+  }
+
+  /* Make the qp in the valid range */
+  if (self->rc.base_qindex < self->rc.min_qindex) {
+    if (self->rc.base_qindex != DEFAULT_BASE_QINDEX)
+      GST_INFO_OBJECT (self, "The base_qindex %d is smaller than the"
+          " min_qindex %d, set it to the min_qindex", self->rc.base_qindex,
+          self->rc.min_qindex);
+    self->rc.base_qindex = self->rc.min_qindex;
+  }
+  if (self->rc.base_qindex > self->rc.max_qindex) {
+    if (self->rc.base_qindex != DEFAULT_BASE_QINDEX)
+      GST_INFO_OBJECT (self, "The base_qindex %d is bigger than the"
+          " max_qindex %d, set it to the max_qindex", self->rc.base_qindex,
+          self->rc.max_qindex);
+    self->rc.base_qindex = self->rc.max_qindex;
+  }
+
+  GST_OBJECT_LOCK (self);
+  bitrate = self->prop.bitrate;
+  GST_OBJECT_UNLOCK (self);
+
+  /* Calculate a bitrate if it is not set. */
+  if ((self->rc.rc_ctrl_mode == VA_RC_CBR || self->rc.rc_ctrl_mode == VA_RC_VBR
+          || self->rc.rc_ctrl_mode == VA_RC_VCM) && bitrate == 0) {
+    /* FIXME: Provide better estimation. */
+    /* Choose the max value of all levels' MainCR which is 8, and x2 for
+       conservative calculation. So just using a 1/16 compression ratio,
+       12 bits per pixel for 4:2:0, 16 bits per pixel for 4:2:2 and 24 bits
+       per pixel for 4:4:4. Also the depth should be considered. */
+    guint64 factor;
+    guint depth = 8, chrome = 1;
+    guint bits_per_pix;
+
+    if (!_av1_get_rtformat (self,
+            GST_VIDEO_INFO_FORMAT (&base->in_info), &depth, &chrome))
+      g_assert_not_reached ();
+
+    if (chrome == 3) {
+      bits_per_pix = 24;
+    } else if (chrome == 2) {
+      bits_per_pix = 16;
+    } else {
+      bits_per_pix = 12;
+    }
+    bits_per_pix = bits_per_pix + bits_per_pix * (depth - 8) / 8;
+
+    factor = (guint64) base->width * base->height * bits_per_pix / 16;
+    bitrate = gst_util_uint64_scale (factor,
+        GST_VIDEO_INFO_FPS_N (&base->in_info),
+        GST_VIDEO_INFO_FPS_D (&base->in_info)) / 1000;
+
+    GST_INFO_OBJECT (self, "target bitrate computed to %u kbps", bitrate);
+
+    self->prop.bitrate = bitrate;
+    g_object_notify_by_pspec (G_OBJECT (self), propertiesPROP_BITRATE);
+  }
+
+  /* Adjust the setting based on RC mode. */
+  switch (self->rc.rc_ctrl_mode) {
+    case VA_RC_NONE:
+    case VA_RC_CQP:
+      self->rc.max_bitrate = 0;
+      self->rc.target_bitrate = 0;
+      self->rc.target_percentage = 0;
+      self->rc.cpb_size = 0;
+      self->rc.mbbrc = 0;
+      break;
+    case VA_RC_CBR:
+      self->rc.max_bitrate = bitrate;
+      self->rc.target_bitrate = bitrate;
+      self->rc.target_percentage = 100;
+      self->rc.base_qindex = DEFAULT_BASE_QINDEX;
+      break;
+    case VA_RC_VBR:
+      g_assert (self->rc.target_percentage >= 10);
+      self->rc.max_bitrate = (guint) gst_util_uint64_scale_int (bitrate,
+          100, self->rc.target_percentage);
+      self->rc.target_bitrate = bitrate;
+      self->rc.base_qindex = DEFAULT_BASE_QINDEX;
+      break;
+    case VA_RC_VCM:
+      self->rc.max_bitrate = bitrate;
+      self->rc.target_bitrate = bitrate;
+      self->rc.target_percentage = 0;
+      self->rc.base_qindex = DEFAULT_BASE_QINDEX;
+      self->rc.cpb_size = 0;
+
+      if (self->gop.max_level > 1) {
+        GST_INFO_OBJECT (self, "VCM mode does not reorder frames");
+        self->gop.max_level = 1;
+      }
+      break;
+    default:
+      GST_WARNING_OBJECT (self, "Unsupported rate control");
+      return FALSE;
+      break;
+  }
+
+  GST_DEBUG_OBJECT (self, "Max bitrate: %u bits/sec, "
+      "Target bitrate: %u bits/sec", self->rc.max_bitrate,
+      self->rc.target_bitrate);
+
+  if (self->rc.rc_ctrl_mode != VA_RC_NONE && self->rc.rc_ctrl_mode != VA_RC_CQP)
+    _av1_calculate_bitrate_hrd (self);
+
+  /* notifications */
+  update_property_uint (base, &self->prop.cpb_size, self->rc.cpb_size,
+      PROP_CPB_SIZE);
+  update_property_uint (base, &self->prop.target_percentage,
+      self->rc.target_percentage, PROP_TARGET_PERCENTAGE);
+  update_property_uint (base, &self->prop.qp, self->rc.base_qindex, PROP_QP);
+  update_property_uint (base, &self->prop.mbbrc, self->rc.mbbrc, PROP_MBBRC);
+
+  return TRUE;
+}
+
+static gboolean
+gst_va_av1_enc_reconfig (GstVaBaseEnc * base)
+{
+  GstVaBaseEncClass *klass = GST_VA_BASE_ENC_GET_CLASS (base);
+  GstVideoEncoder *venc = GST_VIDEO_ENCODER (base);
+  GstVaAV1Enc *self = GST_VA_AV1_ENC (base);
+  GstCaps *out_caps, *reconf_caps = NULL;
+  GstVideoCodecState *output_state;
+  GstVideoFormat format, reconf_format = GST_VIDEO_FORMAT_UNKNOWN;
+  VAProfile profile;
+  gboolean do_renegotiation = TRUE, do_reopen, need_negotiation;
+  guint max_ref_frames, max_surfaces = 0,
+      rt_format, depth = 0, chrome = 0, codedbuf_size;
+  gint width, height;
+
+  width = GST_VIDEO_INFO_WIDTH (&base->in_info);
+  height = GST_VIDEO_INFO_HEIGHT (&base->in_info);
+  format = GST_VIDEO_INFO_FORMAT (&base->in_info);
+  codedbuf_size = base->codedbuf_size;
+
+  need_negotiation =
+      !gst_va_encoder_get_reconstruct_pool_config (base->encoder, &reconf_caps,
+      &max_surfaces);
+  if (!need_negotiation && reconf_caps) {
+    GstVideoInfo vi;
+    if (!gst_video_info_from_caps (&vi, reconf_caps))
+      return FALSE;
+    reconf_format = GST_VIDEO_INFO_FORMAT (&vi);
+  }
+
+  rt_format = _av1_get_rtformat (self, format, &depth, &chrome);
+  if (!rt_format) {
+    GST_ERROR_OBJECT (self, "unrecognized input format.");
+    return FALSE;
+  }
+
+  profile = _av1_decide_profile (self, rt_format, depth, chrome);
+  if (profile == VAProfileNone)
+    return FALSE;
+
+  /* first check */
+  do_reopen = !(base->profile == profile && base->rt_format == rt_format
+      && format == reconf_format && width == base->width
+      && height == base->height && self->prop.rc_ctrl == self->rc.rc_ctrl_mode
+      && depth == self->depth && chrome == self->chrome);
+
+  if (do_reopen && gst_va_encoder_is_open (base->encoder))
+    gst_va_encoder_close (base->encoder);
+
+  gst_va_base_enc_reset_state (base);
+
+  base->profile = profile;
+  base->rt_format = rt_format;
+  self->depth = depth;
+  self->chrome = chrome;
+  base->width = width;
+  base->height = height;
+  self->mi_cols = 2 * ((base->width + 7) >> 3);
+  self->mi_rows = 2 * ((base->height + 7) >> 3);
+
+  /* Frame rate is needed for rate control and PTS setting. */
+  if (GST_VIDEO_INFO_FPS_N (&base->in_info) == 0
+      || GST_VIDEO_INFO_FPS_D (&base->in_info) == 0) {
+    GST_INFO_OBJECT (self, "Unknown framerate, just set to 30 fps");
+    GST_VIDEO_INFO_FPS_N (&base->in_info) = 30;
+    GST_VIDEO_INFO_FPS_D (&base->in_info) = 1;
+  }
+  base->frame_duration = gst_util_uint64_scale (GST_SECOND,
+      GST_VIDEO_INFO_FPS_D (&base->in_info),
+      GST_VIDEO_INFO_FPS_N (&base->in_info));
+
+  GST_DEBUG_OBJECT (self, "resolution:%dx%d, Mi size: %dx%d, "
+      "frame duration is %" GST_TIME_FORMAT, base->width, base->height,
+      self->mi_cols, self->mi_rows, GST_TIME_ARGS (base->frame_duration));
+
+  if (!_av1_ensure_rate_control (self))
+    return FALSE;
+
+  if (!_av1_calculate_level_and_tier (self))
+    return FALSE;
+
+  if (!_av1_init_packed_headers (self))
+    return FALSE;
+
+  _av1_setup_encoding_features (self);
+
+  if (!_av1_generate_gop_structure (self))
+    return FALSE;
+
+  if (!_av1_setup_tile_partition (self))
+    return FALSE;
+
+  _av1_calculate_coded_size (self);
+
+  max_ref_frames = GST_AV1_NUM_REF_FRAMES + 3 /* scratch frames */ ;
+
+  /* second check after calculations */
+  do_reopen |=
+      !(max_ref_frames == max_surfaces && codedbuf_size == base->codedbuf_size);
+  if (do_reopen && gst_va_encoder_is_open (base->encoder))
+    gst_va_encoder_close (base->encoder);
+
+  if (!gst_va_encoder_is_open (base->encoder)
+      && !gst_va_encoder_open (base->encoder, base->profile,
+          GST_VIDEO_INFO_FORMAT (&base->in_info), base->rt_format,
+          base->width, base->height, base->codedbuf_size, max_ref_frames,
+          self->rc.rc_ctrl_mode, self->packed_headers)) {
+    GST_ERROR_OBJECT (self, "Failed to open the VA encoder.");
+    return FALSE;
+  }
+
+  /* Add some tags */
+  gst_va_base_enc_add_codec_tag (base, "AV1");
+
+  out_caps = gst_va_profile_caps (base->profile, klass->entrypoint);
+  g_assert (out_caps);
+  out_caps = gst_caps_fixate (out_caps);
+
+  if (self->level_str)
+    gst_caps_set_simple (out_caps, "level", G_TYPE_STRING, self->level_str,
+        NULL);
+
+  gst_caps_set_simple (out_caps, "width", G_TYPE_INT, base->width,
+      "height", G_TYPE_INT, base->height, "alignment", G_TYPE_STRING, "tu",
+      "stream-format", G_TYPE_STRING, "obu-stream", NULL);
+
+  if (!need_negotiation) {
+    output_state = gst_video_encoder_get_output_state (venc);
+    do_renegotiation = TRUE;
+    if (output_state) {
+      do_renegotiation = !gst_caps_is_subset (output_state->caps, out_caps);
+      gst_video_codec_state_unref (output_state);
+    }
+    if (!do_renegotiation) {
+      gst_caps_unref (out_caps);
+      return TRUE;
+    }
+  }
+
+  GST_DEBUG_OBJECT (self, "output caps is %" GST_PTR_FORMAT, out_caps);
+
+  output_state =
+      gst_video_encoder_set_output_state (venc, out_caps, base->input_state);
+  gst_video_codec_state_unref (output_state);
+
+  if (!gst_video_encoder_negotiate (venc)) {
+    GST_ERROR_OBJECT (self, "Failed to negotiate with the downstream");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static inline void
+_av1_fill_sequence_param (GstVaAV1Enc * self,
+    VAEncSequenceParameterBufferAV1 * sequence)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  guint8 seq_profile;
+  guint8 order_hint_bits_minus_1;
+
+  if (base->profile == VAProfileAV1Profile0) {
+    seq_profile = 0;
+  } else if (base->profile == VAProfileAV1Profile1) {
+    seq_profile = 1;
+  } else {
+    GST_ERROR_OBJECT (self, "VA profile %d not supported", base->profile);
+    g_assert_not_reached ();
+    return;
+  }
+
+  order_hint_bits_minus_1 = _av1_helper_msb (self->gop.keyframe_interval);
+  if (order_hint_bits_minus_1 > MAX_ORDER_HINT_BITS_MINUS_1)
+    order_hint_bits_minus_1 = MAX_ORDER_HINT_BITS_MINUS_1;
+
+  /* *INDENT-OFF* */
+  *sequence = (VAEncSequenceParameterBufferAV1) {
+    .seq_profile = seq_profile,
+    .seq_level_idx = self->level_idx,
+    .seq_tier = self->tier,
+    .intra_period = self->gop.num_ref_frames == 0 ? 1 :
+        self->gop.keyframe_interval,
+    .ip_period = self->gop.backward_ref_num == 0 ? 1 :
+        self->gop.gf_group_size,
+    .bits_per_second = self->rc.target_bitrate_bits,
+    .seq_fields.bits = {
+      .still_picture = 0,
+      .use_128x128_superblock = self->partition.use_128x128_superblock,
+      .enable_filter_intra = self->features.enable_filter_intra,
+      .enable_intra_edge_filter = self->features.enable_intra_edge_filter,
+      .enable_interintra_compound = self->features.enable_interintra_compound,
+      .enable_masked_compound = self->features.enable_masked_compound,
+      .enable_warped_motion = self->features.enable_warped_motion,
+      .enable_dual_filter = self->features.enable_dual_filter,
+      .enable_order_hint = self->gop.enable_order_hint,
+      .enable_jnt_comp = self->features.enable_jnt_comp,
+      .enable_ref_frame_mvs = self->features.enable_ref_frame_mvs,
+      .enable_superres = self->features.enable_superres,
+      .enable_cdef = self->features.enable_cdef,
+      .enable_restoration = self->features.enable_restoration,
+      .bit_depth_minus8 = self->depth - 8,
+      .subsampling_x = (self->chrome != 3),
+      .subsampling_y = (self->chrome != 3 && self->chrome != 2),
+    },
+    .order_hint_bits_minus_1 = order_hint_bits_minus_1,
+  };
+  /* *INDENT-ON* */
+}
+
+static void
+_av1_fill_sequence_header (GstVaAV1Enc * self,
+    VAEncSequenceParameterBufferAV1 * seq_param)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+
+  /* *INDENT-OFF* */
+  self->sequence_hdr = (GstAV1SequenceHeaderOBU) {
+    .seq_profile = seq_param->seq_profile,
+    .still_picture = 0,
+    .num_planes = (self->chrome == 0 ? 1 : 3),
+    .reduced_still_picture_header = 0,
+    .timing_info_present_flag = 0,
+    .decoder_model_info_present_flag = 0,
+    .initial_display_delay_present_flag = 0,
+    .operating_points_cnt_minus_1 = 0,
+    .operating_points = {
+      {
+        .seq_level_idx = seq_param->seq_level_idx,
+        .seq_tier = seq_param->seq_tier,
+        .idc = 0,
+      },
+    },
+    .frame_width_bits_minus_1 = _av1_helper_msb (base->width),
+    .frame_height_bits_minus_1 = _av1_helper_msb (base->height),
+    .max_frame_width_minus_1 = base->width - 1,
+    .max_frame_height_minus_1 = base->height - 1,
+    .frame_id_numbers_present_flag = 0,
+    .use_128x128_superblock = seq_param->seq_fields.bits.use_128x128_superblock,
+    .enable_filter_intra = seq_param->seq_fields.bits.enable_filter_intra,
+    .enable_intra_edge_filter = seq_param->seq_fields.bits.enable_intra_edge_filter,
+    .enable_interintra_compound = seq_param->seq_fields.bits.enable_interintra_compound,
+    .enable_masked_compound = seq_param->seq_fields.bits.enable_masked_compound,
+    .enable_warped_motion = seq_param->seq_fields.bits.enable_warped_motion,
+    .enable_dual_filter = seq_param->seq_fields.bits.enable_dual_filter,
+    .enable_order_hint = seq_param->seq_fields.bits.enable_order_hint,
+    .enable_jnt_comp = seq_param->seq_fields.bits.enable_jnt_comp,
+    .enable_ref_frame_mvs = seq_param->seq_fields.bits.enable_ref_frame_mvs,
+    .seq_choose_screen_content_tools = 0,
+    .order_hint_bits_minus_1 = seq_param->order_hint_bits_minus_1,
+    .enable_superres = seq_param->seq_fields.bits.enable_superres,
+    .enable_cdef = seq_param->seq_fields.bits.enable_cdef,
+    .enable_restoration = seq_param->seq_fields.bits.enable_restoration,
+    .color_config = {
+      .high_bitdepth = (seq_param->seq_fields.bits.bit_depth_minus8 > 0),
+      .mono_chrome = (self->chrome == 0),
+      .color_description_present_flag = 0,
+      .color_primaries = GST_AV1_CP_UNSPECIFIED,
+      .transfer_characteristics = GST_AV1_TC_UNSPECIFIED,
+      .matrix_coefficients = GST_AV1_MC_UNSPECIFIED,
+      .color_range = 0,
+      .subsampling_x = seq_param->seq_fields.bits.subsampling_x,
+      .subsampling_y = seq_param->seq_fields.bits.subsampling_y,
+      .chroma_sample_position = 0,
+      .separate_uv_delta_q = 0,
+    },
+    .film_grain_params_present = 0,
+  };
+  /* *INDENT-ON* */
+}
+
+static gboolean
+_av1_add_sequence_param (GstVaAV1Enc * self, GstVaEncodePicture * picture,
+    VAEncSequenceParameterBufferAV1 * sequence)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+
+  if (!gst_va_encoder_add_param (base->encoder, picture,
+          VAEncSequenceParameterBufferType, sequence, sizeof (*sequence))) {
+    GST_ERROR_OBJECT (self, "Failed to create the sequence parameter");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+_av1_add_sequence_header (GstVaAV1Enc * self, GstVaAV1EncFrame * frame,
+    guint * size_offset)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  guint size;
+  guint8 packed_sps256 = { 0, };
+
+  size = sizeof (packed_sps);
+  if (gst_av1_bit_writer_sequence_header_obu (&self->sequence_hdr, TRUE,
+          packed_sps, &size)
+      != GST_AV1_BIT_WRITER_OK) {
+    GST_ERROR_OBJECT (self, "Failed to write sequence header.");
+    return FALSE;
+  }
+
+  *size_offset += size;
+
+  if (!gst_va_encoder_add_packed_header (base->encoder, frame->picture,
+          VAEncPackedHeaderAV1_SPS, packed_sps, size * 8, FALSE)) {
+    GST_ERROR_OBJECT (self, "Failed to add packed sequence header.");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static guint8
+_av1_calculate_filter_level (guint32 base_qindex, gboolean chroma)
+{
+  /* *INDENT-OFF* */
+  static const guint8 loop_filter_levels_luma256 = {
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  2,
+    2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,  4,  4,  4,
+    4,  4,  4,  4,  5,  5,  5,  5,  5,  5,  5,  6,  6,  6,  6,  6,
+    6,  7,  7,  7,  8,  8,  8,  8,  9,  9,  9,  9,  10, 10, 10, 10,
+    11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15,
+    15, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 19, 19, 20, 20, 20,
+    21, 21, 21, 22, 22, 22, 23, 23, 24, 24, 24, 25, 25, 25, 26, 26,
+    27, 27, 27, 28, 28, 29, 29, 29, 30, 30, 31, 31, 31, 32, 32, 33,
+    33, 34, 34, 34, 35, 35, 36, 36, 37, 37, 38, 38, 39, 39, 40, 41,
+    41, 42, 42, 43, 44, 45, 45, 46, 47, 48, 49, 50, 51, 52, 53, 55,
+    56, 58, 59, 61, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+    63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+    63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63
+  };
+
+  static const guint8 loop_filter_levels_chroma256 = {
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  2,
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,
+    3,  3,  3,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
+    5,  5,  5,  5,  5,  5,  5,  5,  6,  6,  6,  6,  6,  6,  6,  6,
+    6,  6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  8,  8,
+    8,  8,  8,  8,  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  10,
+    10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15,
+    16, 17, 18, 19, 20, 21, 22, 24, 25, 26, 28, 30, 31, 31, 31, 31,
+    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31
+  };
+  /* *INDENT-ON* */
+  guint8 level = 0;
+
+  if (!chroma) {
+    level = loop_filter_levels_lumabase_qindex;
+  } else {
+    level = loop_filter_levels_chromabase_qindex;
+  }
+
+  return level;
+}
+
+static void
+_av1_calculate_cdef_param (GstVaAV1Enc * self,
+    VAEncPictureParameterBufferAV1 * pic_param)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  guint32 strengthsGST_AV1_CDEF_MAX = { 36, 50, 0, 24, 8, 17, 4, 9 };
+  guint8 cdef_bits = 3;
+  guint cdef_damping;
+  guint i;
+
+  /* Adjust the CDEF parameter for CQP mode. In bitrate control mode, the
+     driver will update the CDEF value for each frame automatically. */
+  if (self->rc.rc_ctrl_mode == VA_RC_CQP) {
+    if (self->rc.base_qindex < 90) {
+      /* Low QP setting. */
+      strengths0 = 5;
+      strengths1 = 41;
+      strengths3 = 6;
+      strengths5 = 16;
+    } else if (self->rc.base_qindex > 140) {
+      /* High QP setting. */
+      cdef_bits = 2;
+      strengths1 = 63;
+      if (self->rc.base_qindex > 210) {
+        cdef_bits = 1;
+        strengths0 = 0;
+      }
+    } else {
+      /* Medium QP setting. */
+      cdef_bits = 2;
+      strengths1 = 63;
+
+      if (base->width < 1600 && base->height < 1600) {
+        strengths3 = 1;
+      } else {
+        strengths3 = 32;
+      }
+    }
+  }
+
+  cdef_damping = (self->rc.base_qindex >> 6) + 3;
+
+  pic_param->cdef_bits = cdef_bits;
+  pic_param->cdef_damping_minus_3 = cdef_damping - 3;
+  for (i = 0; i < GST_AV1_CDEF_MAX; i++) {
+    pic_param->cdef_y_strengthsi = strengthsi;
+    pic_param->cdef_uv_strengthsi = strengthsi;
+  }
+}
+
+static gboolean
+_av1_fill_frame_param (GstVaAV1Enc * self, GstVaAV1EncFrame * va_frame,
+    VAEncPictureParameterBufferAV1 * pic_param)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  gint i;
+  uint8_t primary_ref_frame = GST_AV1_PRIMARY_REF_NONE;
+  uint8_t refresh_frame_flags = 0xff;
+  gboolean frame_is_intra;
+  gboolean allow_intrabc;
+  guint tx_mode;
+  guint reference_mode;
+  guint loop_filter_level_y;
+  guint loop_filter_level_uv;
+
+  g_assert (!(va_frame->type & FRAME_TYPE_REPEAT));
+
+  /* *INDENT-OFF* */
+  if (self->rc.rc_ctrl_mode == VA_RC_CQP) {
+    loop_filter_level_y =
+        _av1_calculate_filter_level (self->rc.base_qindex, FALSE);
+    loop_filter_level_uv =
+        _av1_calculate_filter_level (self->rc.base_qindex, TRUE);
+  } else {
+    /* In bitrate control mode, the driver will set the loop filter
+       level for each frame, we do not care here. */
+    loop_filter_level_y = 0xff;
+    loop_filter_level_uv = 0xff;
+  }
+
+  tx_mode = 0;
+  for (i = GST_AV1_TX_MODE_SELECT; i >= GST_AV1_TX_MODE_ONLY_4x4; i--) {
+    if (self->features.tx_mode_support & (1 << i)) {
+      tx_mode = i;
+      break;
+    }
+  }
+  g_assert (tx_mode != 0);
+
+  frame_is_intra = (va_frame->type == GST_AV1_INTRA_ONLY_FRAME
+      || va_frame->type == GST_AV1_KEY_FRAME);
+
+  /* Prefer to let the driver make decision. */
+  reference_mode = frame_is_intra ? 0 : (va_frame->bidir_ref ? 2 : 0);
+
+  if (va_frame->type != GST_AV1_INTER_FRAME) {
+    primary_ref_frame = GST_AV1_PRIMARY_REF_NONE;
+  } else {
+    /* Set it to GST_AV1_REF_LAST_FRAME */
+    primary_ref_frame = GST_AV1_REF_LAST_FRAME - GST_AV1_REF_LAST_FRAME;
+  }
+
+  if (va_frame->type != GST_AV1_KEY_FRAME
+      && va_frame->type != GST_AV1_SWITCH_FRAME) {
+    if (va_frame->update_index >= 0) {
+      refresh_frame_flags = (1 << va_frame->update_index);
+    } else {
+      refresh_frame_flags = 0;
+    }
+  }
+
+  allow_intrabc = self->features.allow_intrabc;
+  if (va_frame->type != GST_AV1_KEY_FRAME
+      && va_frame->type != GST_AV1_INTRA_ONLY_FRAME)
+    allow_intrabc = 0;
+
+  *pic_param = (VAEncPictureParameterBufferAV1) {
+    .frame_width_minus_1 = base->width - 1,
+    .frame_height_minus_1 = base->height - 1,
+    .reconstructed_frame =
+        gst_va_encode_picture_get_reconstruct_surface (va_frame->picture),
+    .coded_buf = va_frame->picture->coded_buffer,
+    .primary_ref_frame = primary_ref_frame,
+    .order_hint = va_frame->order_hint,
+    .refresh_frame_flags = refresh_frame_flags,
+    /* Set ref_frame_ctrl later if inter frame. */
+    .ref_frame_ctrl_l0 = { .value = 0 },
+    .ref_frame_ctrl_l1 = { .value = 0 },
+    .picture_flags.bits = {
+      .frame_type = va_frame->type,
+      /* We do not support error resilient mode now. */
+      .error_resilient_mode = (va_frame->type == GST_AV1_KEY_FRAME),
+      .disable_cdf_update = 0,
+      .use_superres = self->features.enable_superres,
+      .allow_high_precision_mv = (frame_is_intra == FALSE),
+      .use_ref_frame_mvs = self->features.enable_ref_frame_mvs,
+      .disable_frame_end_update_cdf = 0,
+      .reduced_tx_set = 0,
+      /* We just use frame header + tile group mode */
+      .enable_frame_obu = 0,
+      .long_term_reference = 0,
+      .disable_frame_recon = 0,
+      .allow_intrabc = allow_intrabc,
+      .palette_mode_enable = self->features.enable_palette_mode,
+    },
+    /* segmentation does not support now */
+    .seg_id_block_size = 0,
+    .num_tile_groups_minus1 = self->partition.tile_groups - 1,
+    .temporal_id = va_frame->temporal_id,
+    .filter_level = { loop_filter_level_y, loop_filter_level_y },
+    .filter_level_u = loop_filter_level_uv,
+    .filter_level_v = loop_filter_level_uv,
+    .loop_filter_flags.bits = {
+      .sharpness_level = 0,
+      .mode_ref_delta_enabled = 0,
+      .mode_ref_delta_update = 0,
+    },
+    .superres_scale_denominator = 0,
+    .interpolation_filter = self->features.interpolation_type,
+    /* Default ref deltas */
+    .ref_deltas = { 1, 0, 0, 0, -1, 0, -1, -1 },
+    .mode_deltas = { 0, 0 },
+    .base_qindex = self->rc.base_qindex,
+    /* Just set to 0. */
+    .y_dc_delta_q = 0,
+    .u_dc_delta_q = 0,
+    .u_ac_delta_q = 0,
+    .v_dc_delta_q = 0,
+    .v_ac_delta_q = 0,
+    .min_base_qindex = self->rc.min_qindex,
+    .max_base_qindex = self->rc.max_qindex,
+    .qmatrix_flags.bits = {
+      .using_qmatrix = 0,
+      .qm_y = 0,
+      .qm_u = 0,
+      .qm_v = 0,
+    },
+    .mode_control_flags.bits = {
+      .delta_q_present = 0,
+      .delta_q_res = 0,
+      .delta_lf_present = 0,
+      .delta_lf_res = 0,
+      .delta_lf_multi = 0,
+      .tx_mode = tx_mode,
+      .reference_mode = reference_mode,
+      .skip_mode_present = 0,
+    },
+    /* Do not enable segments now. */
+    .segments.seg_flags.bits.segmentation_enabled =
+        self->features.enable_segmentation,
+    .tile_cols = self->partition.num_tile_cols,
+    .tile_rows = self->partition.num_tile_rows,
+    /* Set it later. */
+    .width_in_sbs_minus_1 = { 0 },
+    .height_in_sbs_minus_1 = { 0 },
+    .context_update_tile_id = 0,
+    /* CDEF parameter will be set later. */
+    .cdef_damping_minus_3 = 0,
+    .cdef_bits = 0,
+    .cdef_y_strengths = { 0, },
+    .cdef_uv_strengths = { 0, },
+    .loop_restoration_flags.bits = {
+      .yframe_restoration_type = 0,
+      .cbframe_restoration_type = 0,
+      .crframe_restoration_type = 0,
+      .lr_unit_shift = 0,
+      .lr_uv_shift = 0,
+    },
+    /* TODO: wm setting. */
+    //.wm = { },
+    /* Feed all the offsets later. */
+    .tile_group_obu_hdr_info.bits = {
+      .obu_extension_flag = 0,
+      .obu_has_size_field = 1,
+      .temporal_id = va_frame->temporal_id,
+      .spatial_id = va_frame->spatial_id,
+    },
+    .number_skip_frames = 0,
+    .skip_frames_reduced_size = 0,
+  };
+  /* *INDENT-ON* */
+
+  _av1_calculate_cdef_param (self, pic_param);
+
+  for (i = 0; i < self->partition.num_tile_cols - 1; i++)
+    pic_param->width_in_sbs_minus_1i = self->partition.tile_width_sb - 1;
+  pic_param->width_in_sbs_minus_1i = self->partition.sb_cols -
+      (self->partition.num_tile_cols - 1) * self->partition.tile_width_sb - 1;
+
+  for (i = 0; i < self->partition.num_tile_rows - 1; i++)
+    pic_param->height_in_sbs_minus_1i = self->partition.tile_height_sb - 1;
+  pic_param->height_in_sbs_minus_1i = self->partition.sb_rows -
+      (self->partition.num_tile_rows - 1) * self->partition.tile_height_sb - 1;
+
+  if (va_frame->type == GST_AV1_INTER_FRAME) {
+    for (i = 0; i < 8; i++) {
+      if (self->gop.ref_listi == NULL) {
+        pic_param->reference_framesi = VA_INVALID_SURFACE;
+        continue;
+      }
+
+      pic_param->reference_framesi =
+          gst_va_encode_picture_get_reconstruct_surface
+          (_enc_frame (self->gop.ref_listi)->picture);
+    }
+
+    for (i = 0; i < 7; i++) {
+      if (va_frame->ref_frame_idxi + GST_AV1_REF_LAST_FRAME == -1) {
+        pic_param->ref_frame_idxi = 0xFF;
+        continue;
+      }
+
+      pic_param->ref_frame_idxi =
+          va_frame->ref_frame_idxi + GST_AV1_REF_LAST_FRAME;
+    }
+
+    g_assert (va_frame->ref_frame_idxGST_AV1_REF_GOLDEN_FRAME != -1);
+    pic_param->ref_frame_ctrl_l0.fields.search_idx0 = GST_AV1_REF_LAST_FRAME;
+
+    if (va_frame->bidir_ref) {
+      if (va_frame->ref_frame_idxGST_AV1_REF_ALTREF_FRAME != -1)
+        pic_param->ref_frame_ctrl_l1.fields.search_idx0 =
+            GST_AV1_REF_BWDREF_FRAME;
+    }
+  } else {
+    for (i = 0; i < 8; i++)
+      pic_param->reference_framesi = VA_INVALID_SURFACE;
+    for (i = 0; i < 7; i++)
+      pic_param->ref_frame_idxi = 0xFF;
+  }
+
+  return TRUE;
+}
+
+/* 5.9.3 */
+static gint
+_av1_get_relative_dist (GstAV1SequenceHeaderOBU * seq_header, gint a, gint b)
+{
+  gint m, diff;
+  if (!seq_header->enable_order_hint)
+    return 0;
+
+  diff = a - b;
+  m = 1 << seq_header->order_hint_bits_minus_1;
+  diff = (diff & (m - 1)) - (diff & m);
+  return diff;
+}
+
+/* We need to calculate whether the skip mode is available */
+static void
+_av1_set_skip_mode_frame (GstVaAV1Enc * self, GstVaAV1EncFrame * va_frame,
+    GstAV1FrameHeaderOBU * frame_hdr)
+{
+  GstAV1SequenceHeaderOBU *seq_header;
+  gint skip_mode_allowed /* skipModeAllowed */ ;
+  GstVideoCodecFrame *ref_frame;
+  guint i;
+
+  seq_header = &self->sequence_hdr;
+  skip_mode_allowed = 0;
+
+  if (frame_hdr->frame_is_intra || !frame_hdr->reference_select
+      || !seq_header->enable_order_hint) {
+    skip_mode_allowed = 0;
+  } else {
+    gint forward_idx = -1 /* forwardIdx */ ;
+    gint forward_hint = 0 /* forwardHint */ ;
+    gint backward_idx = -1 /* backwardIdx */ ;
+    gint backward_hint = 0 /* backwardHint */ ;
+    gint ref_hint = 0 /* refHint */ ;
+
+    for (i = 0; i < GST_AV1_REFS_PER_FRAME; i++) {
+      ref_frame = self->gop.ref_listva_frame->ref_frame_idxi +
+              GST_AV1_REF_LAST_FRAME;
+      g_assert (ref_frame);
+      ref_hint = _enc_frame (ref_frame)->order_hint;
+
+      if (_av1_get_relative_dist (seq_header, ref_hint,
+              frame_hdr->order_hint) < 0) {
+        if (forward_idx < 0 || _av1_get_relative_dist (seq_header, ref_hint,
+                forward_hint) > 0) {
+          forward_idx = i;
+          forward_hint = ref_hint;
+        }
+      } else
+          if (_av1_get_relative_dist (seq_header, ref_hint,
+              frame_hdr->order_hint) > 0) {
+        if (backward_idx < 0 || _av1_get_relative_dist (seq_header, ref_hint,
+                backward_hint) < 0) {
+          backward_idx = i;
+          backward_hint = ref_hint;
+        }
+      }
+    }
+
+    if (forward_idx < 0) {
+      skip_mode_allowed = 0;
+    } else if (backward_idx >= 0) {
+      skip_mode_allowed = 1;
+      frame_hdr->skip_mode_frame0 =
+          GST_AV1_REF_LAST_FRAME + MIN (forward_idx, backward_idx);
+      frame_hdr->skip_mode_frame1 =
+          GST_AV1_REF_LAST_FRAME + MAX (forward_idx, backward_idx);
+    } else {
+      gint second_forward_idx = -1 /* secondForwardIdx */ ;
+      gint second_forward_hint = 0 /* secondForwardHint */ ;
+
+      for (i = 0; i < GST_AV1_REFS_PER_FRAME; i++) {
+        ref_frame = self->gop.ref_listva_frame->ref_frame_idxi +
+                GST_AV1_REF_LAST_FRAME;
+        g_assert (ref_frame);
+        ref_hint = _enc_frame (ref_frame)->order_hint;
+
+        if (_av1_get_relative_dist (seq_header, ref_hint, forward_hint) < 0) {
+          if (second_forward_idx < 0 || _av1_get_relative_dist (seq_header,
+                  ref_hint, second_forward_hint) > 0) {
+            second_forward_idx = i;
+            second_forward_hint = ref_hint;
+          }
+        }
+      }
+
+      if (second_forward_idx < 0) {
+        skip_mode_allowed = 0;
+      } else {
+        skip_mode_allowed = 1;
+        frame_hdr->skip_mode_frame0 =
+            GST_AV1_REF_LAST_FRAME + MIN (forward_idx, second_forward_idx);
+        frame_hdr->skip_mode_frame1 =
+            GST_AV1_REF_LAST_FRAME + MAX (forward_idx, second_forward_idx);
+      }
+    }
+  }
+
+  if (skip_mode_allowed) {
+    g_assert (frame_hdr->skip_mode_frame0 > 0 &&
+        frame_hdr->skip_mode_frame1 > 0);
+  } else {
+    frame_hdr->skip_mode_frame0 = 0;
+    frame_hdr->skip_mode_frame1 = 0;
+  }
+}
+
+static void
+_av1_fill_frame_header (GstVaAV1Enc * self,
+    VAEncPictureParameterBufferAV1 * pic_param,
+    GstAV1FrameHeaderOBU * frame_hdr, GstVaAV1EncFrame * va_frame)
+{
+  guint i;
+  guint8 frame_is_intra = (va_frame->type == GST_AV1_INTRA_ONLY_FRAME
+      || va_frame->type == GST_AV1_KEY_FRAME);
+
+  /* *INDENT-OFF* */
+  *frame_hdr = (GstAV1FrameHeaderOBU) {
+    .frame_is_intra = frame_is_intra,
+    .show_existing_frame = 0,
+    .frame_type = va_frame->type,
+    .show_frame = !(va_frame->flags & FRAME_FLAG_NOT_SHOW),
+    .showable_frame = 1,
+    .error_resilient_mode = pic_param->picture_flags.bits.error_resilient_mode,
+    .disable_cdf_update = pic_param->picture_flags.bits.disable_cdf_update,
+    .allow_screen_content_tools = 0,
+    .frame_size_override_flag = 0,
+    .frame_width = self->sequence_hdr.max_frame_width_minus_1 + 1,
+    .frame_height = self->sequence_hdr.max_frame_height_minus_1 + 1,
+    .order_hint = pic_param->order_hint,
+    .primary_ref_frame = pic_param->primary_ref_frame,
+    .buffer_removal_time_present_flag = 0,
+    .refresh_frame_flags = pic_param->refresh_frame_flags,
+    .allow_intrabc = pic_param->picture_flags.bits.allow_intrabc,
+    .frame_refs_short_signaling = 0,
+    /* Set ref_frame_idx later. */
+    .ref_frame_idx = { 0, },
+    .allow_high_precision_mv =
+        pic_param->picture_flags.bits.allow_high_precision_mv,
+    .is_motion_mode_switchable = 0,
+    .use_ref_frame_mvs = pic_param->picture_flags.bits.use_ref_frame_mvs,
+    .disable_frame_end_update_cdf =
+        pic_param->picture_flags.bits.disable_frame_end_update_cdf,
+    .allow_warped_motion = self->features.enable_warped_motion,
+    .reduced_tx_set = pic_param->picture_flags.bits.reduced_tx_set,
+    .render_and_frame_size_different = 0,
+    .use_superres = pic_param->picture_flags.bits.use_superres,
+    .is_filter_switchable = (pic_param->interpolation_filter ==
+        GST_AV1_INTERPOLATION_FILTER_SWITCHABLE),
+    .interpolation_filter = pic_param->interpolation_filter,
+    .loop_filter_params = {
+      .loop_filter_level0 = pic_param->filter_level0,
+      .loop_filter_level1 = pic_param->filter_level1,
+      .loop_filter_level2 = pic_param->filter_level_u,
+      .loop_filter_level3 = pic_param->filter_level_v,
+      .loop_filter_sharpness =
+          pic_param->loop_filter_flags.bits.sharpness_level,
+      .loop_filter_delta_enabled =
+          pic_param->loop_filter_flags.bits.mode_ref_delta_enabled,
+      .loop_filter_delta_update =
+          pic_param->loop_filter_flags.bits.mode_ref_delta_update,
+      /* Set it later. */
+      .loop_filter_ref_deltas = { 0, },
+      .loop_filter_mode_deltas = { 0, },
+      .delta_lf_present = pic_param->mode_control_flags.bits.delta_lf_present,
+      .delta_lf_res = pic_param->mode_control_flags.bits.delta_lf_res,
+      .delta_lf_multi = pic_param->mode_control_flags.bits.delta_lf_multi,
+    },
+    .quantization_params = {
+      .base_q_idx = pic_param->base_qindex,
+      .diff_uv_delta = 0,
+      .using_qmatrix = pic_param->qmatrix_flags.bits.using_qmatrix,
+      .qm_y = pic_param->qmatrix_flags.bits.qm_y,
+      .qm_u = pic_param->qmatrix_flags.bits.qm_u,
+      .qm_v = pic_param->qmatrix_flags.bits.qm_v,
+      .delta_q_present = pic_param->mode_control_flags.bits.delta_q_present,
+      .delta_q_res = pic_param->mode_control_flags.bits.delta_q_res,
+      .delta_q_y_dc = pic_param->y_dc_delta_q,
+      .delta_q_u_dc = pic_param->u_dc_delta_q,
+      .delta_q_u_ac = pic_param->u_ac_delta_q,
+      .delta_q_v_dc = pic_param->v_dc_delta_q,
+      .delta_q_v_ac = pic_param->v_ac_delta_q,
+    },
+    .segmentation_params = {
+      /* Not enabled. */
+      .segmentation_enabled =
+          pic_param->segments.seg_flags.bits.segmentation_enabled,
+    },
+    .tile_info = {
+      .uniform_tile_spacing_flag = 1,
+      .tile_cols_log2 = self->partition.tile_cols_log2,
+      .tile_rows_log2 = self->partition.tile_rows_log2,
+      .context_update_tile_id = 0,
+      .tile_size_bytes_minus_1 = self->partition.tile_size_bytes_minus_1,
+    },
+    .cdef_params = {
+      .cdef_damping = pic_param->cdef_damping_minus_3 + 3,
+      .cdef_bits = pic_param->cdef_bits,
+      /* Set to later. */
+      .cdef_y_pri_strength = { 0, },
+      .cdef_y_sec_strength = { 0, },
+      .cdef_uv_pri_strength = { 0, },
+      .cdef_uv_sec_strength = { 0, },
+    },
+    /* TODO: disable seq->enable_restoration now. */
+    .loop_restoration_params = { 0, },
+    .tx_mode = pic_param->mode_control_flags.bits.tx_mode,
+    .skip_mode_present = pic_param->mode_control_flags.bits.skip_mode_present,
+    .reference_select = pic_param->mode_control_flags.bits.reference_mode != 0,
+    /* warped motion is not supported. */
+    .global_motion_params = {
+      .gm_type = {
+        GST_AV1_WARP_MODEL_IDENTITY,
+        GST_AV1_WARP_MODEL_IDENTITY,
+        GST_AV1_WARP_MODEL_IDENTITY,
+        GST_AV1_WARP_MODEL_IDENTITY,
+        GST_AV1_WARP_MODEL_IDENTITY,
+        GST_AV1_WARP_MODEL_IDENTITY,
+        GST_AV1_WARP_MODEL_IDENTITY,
+        GST_AV1_WARP_MODEL_IDENTITY
+      },
+    },
+    /* film grain is not supported. */
+    .film_grain_params = {
+      .apply_grain = FALSE,
+    },
+  };
+  /* *INDENT-ON* */
+
+  for (i = 0; i < GST_AV1_CDEF_MAX; i++) {
+    frame_hdr->cdef_params.cdef_y_pri_strengthi =
+        pic_param->cdef_y_strengthsi / 4;
+    frame_hdr->cdef_params.cdef_y_sec_strengthi =
+        pic_param->cdef_y_strengthsi % 4;
+    frame_hdr->cdef_params.cdef_uv_pri_strengthi =
+        pic_param->cdef_uv_strengthsi / 4;
+    frame_hdr->cdef_params.cdef_uv_sec_strengthi =
+        pic_param->cdef_uv_strengthsi % 4;
+  }
+
+  _av1_set_skip_mode_frame (self, va_frame, frame_hdr);
+
+  for (i = 0; i < GST_AV1_REFS_PER_FRAME; i++)
+    frame_hdr->ref_frame_idxi = pic_param->ref_frame_idxi;
+
+  for (i = 0; i < GST_AV1_REFS_PER_FRAME; i++)
+    frame_hdr->loop_filter_params.loop_filter_ref_deltasi =
+        pic_param->ref_deltasi;
+  for (i = 0; i < 2; i++)
+    frame_hdr->loop_filter_params.loop_filter_mode_deltasi =
+        pic_param->mode_deltasi;
+}
+
+static gboolean
+_av1_add_tile_group_param (GstVaAV1Enc * self, GstVaAV1EncFrame * va_frame,
+    guint index)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  VAEncTileGroupBufferAV1 tile_group_param;
+  guint div;
+
+  div = self->partition.num_tile_cols * self->partition.num_tile_rows /
+      self->partition.tile_groups;
+
+  tile_group_param.tg_start = div * index;
+
+  if (index == self->partition.tile_groups - 1) {
+    tile_group_param.tg_end =
+        self->partition.num_tile_cols * self->partition.num_tile_rows - 1;
+  } else {
+    tile_group_param.tg_end = (index + 1) * div - 1;
+  }
+
+  if (!gst_va_encoder_add_param (base->encoder, va_frame->picture,
+          VAEncSliceParameterBufferType, &tile_group_param,
+          sizeof (VAEncTileGroupBufferAV1))) {
+    GST_ERROR_OBJECT (self, "Failed to add one tile group parameter");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+_av1_encode_one_frame (GstVaAV1Enc * self, GstVaAV1EncFrame * va_frame,
+    guint size_offset)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  VAEncPictureParameterBufferAV1 pic_param;
+  GstAV1FrameHeaderOBU frame_hdr;
+  guint frame_hdr_size;
+  guint8 packed_frame_hdr512 = { 0, };
+  guint i;
+
+  va_frame->order_hint = va_frame->frame_num;
+
+  if (!_av1_fill_frame_param (self, va_frame, &pic_param)) {
+    GST_ERROR_OBJECT (self, "Fails to fill the frame parameter.");
+    return FALSE;
+  }
+
+  _av1_fill_frame_header (self, &pic_param, &frame_hdr, va_frame);
+
+  frame_hdr_size = sizeof (packed_frame_hdr);
+
+  if (self->packed_headers & VA_ENC_PACKED_HEADER_PICTURE) {
+    if (self->rc.rc_ctrl_mode == VA_RC_CQP) {
+      if (gst_av1_bit_writer_frame_header_obu (&frame_hdr,
+              &self->sequence_hdr, va_frame->temporal_id, va_frame->spatial_id,
+              TRUE, packed_frame_hdr, &frame_hdr_size)
+          != GST_AV1_BIT_WRITER_OK) {
+        GST_ERROR_OBJECT (self, "Failed to write frame header.");
+        return FALSE;
+      }
+    } else {
+      guint qindex_offset = 0;
+      guint segmentation_offset = 0;
+      guint loopfilter_offset = 0;
+      guint cdef_offset = 0;
+      guint cdef_size_in_bits = 0;
+
+      /* For rate control modes, the driver needs to adjust the values of
+         qindex, loop filter, etc. The accroding fields of frame header are
+         modified by the driver. And so the total frame header size may
+         also change and need rewrite. */
+      if (gst_av1_bit_writer_frame_header_obu_with_offsets (&frame_hdr,
+              &self->sequence_hdr, va_frame->temporal_id, va_frame->spatial_id,
+              TRUE, self->features.obu_size_bytes, &qindex_offset,
+              &segmentation_offset, &loopfilter_offset, &cdef_offset,
+              &cdef_size_in_bits, packed_frame_hdr, &frame_hdr_size)
+          != GST_AV1_BIT_WRITER_OK) {
+        GST_ERROR_OBJECT (self, "Failed to write frame header.");
+        return FALSE;
+      }
+
+      /* Fix all the offsets based on the packed frame header */
+      pic_param.bit_offset_qindex = qindex_offset;
+      pic_param.bit_offset_segmentation = segmentation_offset;
+      pic_param.bit_offset_loopfilter_params = loopfilter_offset;
+      pic_param.bit_offset_cdef_params = cdef_offset;
+      pic_param.size_in_bits_cdef_params = cdef_size_in_bits;
+      pic_param.byte_offset_frame_hdr_obu_size = size_offset + 1 +
+          /* OBU extension header */
+          (va_frame->temporal_id > 0 || va_frame->spatial_id > 0);
+      pic_param.size_in_bits_frame_hdr_obu = frame_hdr_size * 8;
+    }
+  }
+
+  if (!gst_va_encoder_add_param (base->encoder, va_frame->picture,
+          VAEncPictureParameterBufferType, &pic_param, sizeof (pic_param))) {
+    GST_ERROR_OBJECT (self, "Failed to create the frame parameter");
+    return FALSE;
+  }
+
+  if ((self->packed_headers & VA_ENC_PACKED_HEADER_PICTURE) &&
+      !gst_va_encoder_add_packed_header (base->encoder, va_frame->picture,
+          VAEncPackedHeaderAV1_PPS, packed_frame_hdr, frame_hdr_size * 8,
+          FALSE)) {
+    GST_ERROR_OBJECT (self, "Failed to add the packed frame header");
+    return FALSE;
+  }
+
+  for (i = 0; i < self->partition.tile_groups; i++) {
+    if (!_av1_add_tile_group_param (self, va_frame, i)) {
+      GST_ERROR_OBJECT (self, "Failed to add tile groups");
+      return FALSE;
+    }
+  }
+
+  if (!gst_va_encoder_encode (base->encoder, va_frame->picture)) {
+    GST_ERROR_OBJECT (self, "Encode frame error");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static void
+_av1_add_td (GstVaAV1Enc * self, GstVaAV1EncFrame * va_frame)
+{
+  guint td_data_size;
+
+  td_data_size = sizeof (va_frame->cached_frame_header) -
+      va_frame->cached_frame_header_size;
+
+  if (gst_av1_bit_writer_temporal_delimiter_obu (TRUE,
+          va_frame->cached_frame_header + va_frame->cached_frame_header_size,
+          &td_data_size) != GST_AV1_BIT_WRITER_OK) {
+    GST_ERROR_OBJECT (self, "Failed to write temporal delimiter.");
+    /* The only possible failure is not enough buffer size,
+       user should ensure that. */
+    g_assert_not_reached ();
+  }
+
+  va_frame->cached_frame_header_size += td_data_size;
+}
+
+static void
+_av1_add_repeat_frame_header (GstVaAV1Enc * self, GstVaAV1EncFrame * va_frame)
+{
+  GstAV1FrameHeaderOBU frame_hdr = { 0, };
+  guint frame_hdr_data_size;
+
+  /* Repeat frame always shows a frame and so begins with a TD. */
+  _av1_add_td (self, va_frame);
+
+  frame_hdr.show_existing_frame = 1;
+  frame_hdr.frame_to_show_map_idx = va_frame->repeat_index;
+
+  frame_hdr_data_size = sizeof (va_frame->cached_frame_header) -
+      va_frame->cached_frame_header_size;
+
+  if (gst_av1_bit_writer_frame_header_obu (&frame_hdr, &self->sequence_hdr,
+          va_frame->temporal_id, va_frame->spatial_id, TRUE,
+          va_frame->cached_frame_header + va_frame->cached_frame_header_size,
+          &frame_hdr_data_size) != GST_AV1_BIT_WRITER_OK) {
+    GST_ERROR_OBJECT (self, "Failed to write repeat frame header.");
+    g_assert_not_reached ();
+  }
+
+  va_frame->cached_frame_header_size += frame_hdr_data_size;
+}
+
+static GstFlowReturn
+gst_va_av1_enc_encode_frame (GstVaBaseEnc * base,
+    GstVideoCodecFrame * gst_frame, gboolean is_last)
+{
+  GstVaAV1Enc *self = GST_VA_AV1_ENC (base);
+  GstVaAV1EncFrame *va_frame = _enc_frame (gst_frame);
+  VAEncSequenceParameterBufferAV1 seq_param;
+
+  if (!_av1_assign_ref_index (self, gst_frame)) {
+    GST_ERROR_OBJECT (self, "Failed to assign reference for frame:"
+        "system_frame_number %d, frame_num: %d, frame_type %s",
+        gst_frame->system_frame_number, va_frame->frame_num,
+        _av1_get_frame_type_name (va_frame->type));
+    return GST_FLOW_ERROR;
+  }
+
+  memset (va_frame->cached_frame_header, 0,
+      sizeof (va_frame->cached_frame_header));
+  va_frame->cached_frame_header_size = 0;
+
+  if (va_frame->type & FRAME_TYPE_REPEAT) {
+    g_assert (va_frame->flags & FRAME_FLAG_ALREADY_ENCODED);
+    _av1_add_repeat_frame_header (self, va_frame);
+    self->inside_tu = FALSE;
+  } else {
+    guint size_offset = 0;
+
+    g_assert (va_frame->picture == NULL);
+    va_frame->picture = gst_va_encode_picture_new (base->encoder,
+        gst_frame->input_buffer);
+
+    _av1_find_ref_to_update (base, gst_frame);
+
+    if (!self->inside_tu &&
+        (self->packed_headers & VA_ENC_PACKED_HEADER_RAW_DATA)) {
+      _av1_add_td (self, va_frame);
+    }
+
+    if (va_frame->flags & FRAME_FLAG_NOT_SHOW) {
+      if (!self->inside_tu)
+        self->inside_tu = TRUE;
+    } else {
+      self->inside_tu = FALSE;
+    }
+
+    /* Repeat the sequence for each key. */
+    if (va_frame->frame_num == 0) {
+      if (!gst_va_base_enc_add_rate_control_parameter (base, va_frame->picture,
+              self->rc.rc_ctrl_mode, self->rc.max_bitrate_bits,
+              self->rc.target_percentage, self->rc.base_qindex,
+              self->rc.min_qindex, self->rc.max_qindex, self->rc.mbbrc))
+        return FALSE;
+
+      if (!gst_va_base_enc_add_quality_level_parameter (base, va_frame->picture,
+              self->rc.target_usage))
+        return FALSE;
+
+      if (!gst_va_base_enc_add_frame_rate_parameter (base, va_frame->picture))
+        return FALSE;
+
+      if (!gst_va_base_enc_add_hrd_parameter (base, va_frame->picture,
+              self->rc.rc_ctrl_mode, self->rc.cpb_length_bits))
+        return FALSE;
+
+      _av1_fill_sequence_param (self, &seq_param);
+      if (!_av1_add_sequence_param (self, va_frame->picture, &seq_param))
+        return FALSE;
+
+      _av1_fill_sequence_header (self, &seq_param);
+      if ((self->packed_headers & VA_ENC_PACKED_HEADER_SEQUENCE) &&
+          !_av1_add_sequence_header (self, va_frame, &size_offset))
+        return FALSE;
+    }
+
+    if (!_av1_encode_one_frame (self, va_frame, size_offset)) {
+      GST_ERROR_OBJECT (self, "Fails to encode one frame.");
+      return GST_FLOW_ERROR;
+    }
+
+    va_frame->flags |= FRAME_FLAG_ALREADY_ENCODED;
+  }
+
+  _av1_update_ref_list (base, gst_frame);
+
+  g_queue_push_tail (&base->output_list, gst_video_codec_frame_ref (gst_frame));
+
+  return GST_FLOW_OK;
+}
+
+static GstBuffer *
+_av1_create_tu_output_buffer (GstVaAV1Enc * self,
+    GstVideoCodecFrame * last_frame)
+{
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+  guint8 *data;
+  guint total_sz, offset;
+  gint frame_size;
+  GstVaAV1EncFrame *frame_enc;
+  GstBuffer *buf = NULL;
+  guint num;
+
+  g_assert ((_enc_frame (last_frame)->flags & FRAME_TYPE_REPEAT) == 0);
+  g_assert ((_enc_frame (last_frame)->flags & FRAME_FLAG_NOT_SHOW) == 0);
+  g_assert (self->frames_in_tu_num <= GST_AV1_NUM_REF_FRAMES - 1);
+
+  /* cached_frame_header + max codedbuf_size for each */
+  total_sz = (self->frames_in_tu_num + 1) * (32 + base->codedbuf_size);
+
+  data = g_malloc (total_sz);
+  if (!data)
+    goto error;
+
+  offset = 0;
+  for (num = 0; num < self->frames_in_tu_num; num++) {
+    frame_enc = _enc_frame (self->frames_in_tunum);
+
+    if (frame_enc->cached_frame_header_size > 0) {
+      memcpy (data + offset, frame_enc->cached_frame_header,
+          frame_enc->cached_frame_header_size);
+      offset += frame_enc->cached_frame_header_size;
+    }
+
+    frame_size = gst_va_base_enc_copy_output_data (base,
+        frame_enc->picture, data + offset, total_sz - offset);
+    if (frame_size <= 0) {
+      GST_ERROR_OBJECT (self, "Fails to copy the output data of "
+          "system_frame_number %d, frame_num: %d",
+          self->frames_in_tunum->system_frame_number, frame_enc->frame_num);
+      goto error;
+    }
+
+    offset += frame_size;
+  }
+
+  frame_enc = _enc_frame (last_frame);
+
+  if (frame_enc->cached_frame_header_size > 0) {
+    memcpy (data + offset, frame_enc->cached_frame_header,
+        frame_enc->cached_frame_header_size);
+    offset += frame_enc->cached_frame_header_size;
+  }
+
+  frame_size = gst_va_base_enc_copy_output_data (base,
+      frame_enc->picture, data + offset, total_sz - offset);
+  if (frame_size <= 0) {
+    GST_ERROR_OBJECT (self, "Fails to copy the output data of "
+        "system_frame_number %d, frame_num: %d",
+        last_frame->system_frame_number, frame_enc->frame_num);
+    goto error;
+  }
+  offset += frame_size;
+  num++;
+
+  buf = gst_video_encoder_allocate_output_buffer
+      (GST_VIDEO_ENCODER_CAST (base), offset);
+  if (!buf) {
+    GST_ERROR_OBJECT (base, "Failed to create output buffer");
+    goto error;
+  }
+
+  if (gst_buffer_fill (buf, 0, data, offset) != offset) {
+    GST_ERROR_OBJECT (base, "Failed to write output buffer for TU");
+    goto error;
+  }
+
+  g_free (data);
+
+  _av1_clear_frames_in_tu (self);
+
+  return buf;
+
+error:
+  {
+    if (data)
+      g_free (data);
+
+    _av1_clear_frames_in_tu (self);
+    gst_clear_buffer (&buf);
+
+    return NULL;
+  }
+}
+
+static gboolean
+gst_va_av1_enc_prepare_output (GstVaBaseEnc * base,
+    GstVideoCodecFrame * frame, gboolean * complete)
+{
+  GstVaAV1Enc *self = GST_VA_AV1_ENC (base);
+  GstVaAV1EncFrame *frame_enc;
+  GstBuffer *buf = NULL;
+
+  frame_enc = _enc_frame (frame);
+
+  if (frame_enc->flags & FRAME_FLAG_NOT_SHOW &&
+      (frame_enc->flags & FRAME_FLAG_ALREADY_OUTPUTTED) == 0) {
+    g_assert (self->frames_in_tu_num <= GST_AV1_NUM_REF_FRAMES - 1);
+    self->frames_in_tuself->frames_in_tu_num = frame;
+    self->frames_in_tu_num++;
+
+    g_assert ((frame_enc->flags & FRAME_FLAG_FRAME_IN_TU_CACHE) == 0);
+    frame_enc->flags |= FRAME_FLAG_FRAME_IN_TU_CACHE;
+    frame_enc->flags |= FRAME_FLAG_ALREADY_OUTPUTTED;
+
+    *complete = FALSE;
+
+    gst_buffer_replace (&frame->output_buffer, NULL);
+
+    return TRUE;
+  }
+
+  if (frame_enc->flags & FRAME_FLAG_ALREADY_OUTPUTTED) {
+    gsize sz;
+
+    /* Already outputted, must be a repeat this time. */
+    g_assert (frame_enc->type & FRAME_TYPE_REPEAT);
+    /* Should already sync and complete in previous TU. */
+    g_assert ((frame_enc->flags & FRAME_FLAG_FRAME_IN_TU_CACHE) == 0);
+
+    buf = gst_video_encoder_allocate_output_buffer
+        (GST_VIDEO_ENCODER_CAST (base), frame_enc->cached_frame_header_size);
+    if (!buf) {
+      GST_ERROR_OBJECT (base, "Failed to create output buffer");
+      return FALSE;
+    }
+
+    sz = gst_buffer_fill (buf, 0, frame_enc->cached_frame_header,
+        frame_enc->cached_frame_header_size);
+
+    if (sz != frame_enc->cached_frame_header_size) {
+      GST_ERROR_OBJECT (base, "Failed to write output buffer for repeat frame");
+      gst_clear_buffer (&buf);
+      return FALSE;
+    }
+  } else {
+    if (self->frames_in_tu_num > 0) {
+      buf = _av1_create_tu_output_buffer (self, frame);
+    } else {
+      buf = gst_va_base_enc_create_output_buffer (base, frame_enc->picture,
+          (frame_enc->cached_frame_header_size > 0 ?
+              frame_enc->cached_frame_header : NULL),
+          frame_enc->cached_frame_header_size);
+    }
+    if (!buf) {
+      GST_ERROR_OBJECT (base, "Failed to create output buffer%s",
+          self->frames_in_tu_num > 0 ? " for TU" : "");
+      return FALSE;
+    }
+
+    frame_enc->flags |= FRAME_FLAG_ALREADY_OUTPUTTED;
+  }
+
+  *complete = TRUE;
+
+  GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_MARKER);
+  if (frame_enc->frame_num == 0) {
+    GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_HEADER);
+    GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
+    GST_BUFFER_FLAG_UNSET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
+  } else {
+    GST_VIDEO_CODEC_FRAME_UNSET_SYNC_POINT (frame);
+    GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
+  }
+
+  gst_buffer_replace (&frame->output_buffer, buf);
+  gst_clear_buffer (&buf);
+
+  return TRUE;
+}
+
+/* *INDENT-OFF* */
+static const gchar *sink_caps_str =
+    GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_VA,
+        "{ NV12 }") " ;"
+    GST_VIDEO_CAPS_MAKE ("{ NV12 }");
+/* *INDENT-ON* */
+
+static const gchar *src_caps_str = "video/x-av1,alignment=(string)tu,"
+    "stream-format=(string)obu-stream";
+
+static gpointer
+_register_debug_category (gpointer data)
+{
+  GST_DEBUG_CATEGORY_INIT (gst_va_av1enc_debug, "vaav1enc", 0,
+      "VA av1 encoder");
+
+  return NULL;
+}
+
+static void
+gst_va_av1_enc_init (GTypeInstance * instance, gpointer g_class)
+{
+  GstVaAV1Enc *self = GST_VA_AV1_ENC (instance);
+
+  /* default values */
+  self->prop.bitrate = 0;
+  self->prop.target_usage = 4;
+  self->prop.cpb_size = 0;
+  self->prop.target_percentage = 66;
+  self->prop.gf_group_size = MAX_GF_GROUP_SIZE;
+  self->prop.num_ref_frames = 7;
+  self->prop.max_hierarchical_level = HIGHEST_PYRAMID_LEVELS;
+  self->prop.use_128x128_superblock = FALSE;
+  self->prop.keyframe_interval = MAX_KEY_FRAME_INTERVAL;
+  self->prop.qp = DEFAULT_BASE_QINDEX;
+  self->prop.min_qp = 0;
+  self->prop.max_qp = 255;
+  self->prop.num_tile_cols = 1;
+  self->prop.num_tile_rows = 1;
+  self->prop.tile_groups = 1;
+  self->prop.mbbrc = 0;
+
+  if (propertiesPROP_RATE_CONTROL) {
+    self->prop.rc_ctrl =
+        G_PARAM_SPEC_ENUM (propertiesPROP_RATE_CONTROL)->default_value;
+  } else {
+    self->prop.rc_ctrl = VA_RC_NONE;
+  }
+}
+
+static void
+gst_va_av1_enc_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstVaAV1Enc *const self = GST_VA_AV1_ENC (object);
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
+
+  if (base->encoder && gst_va_encoder_is_open (base->encoder)) {
+    GST_ERROR_OBJECT (object,
+        "failed to set any property after encoding started");
+    return;
+  }
+
+  GST_OBJECT_LOCK (self);
+
+  switch (prop_id) {
+    case PROP_KEYFRAME_INT:
+      self->prop.keyframe_interval = g_value_get_uint (value);
+      break;
+    case PROP_GOLDEN_GROUP_SIZE:
+      self->prop.gf_group_size = g_value_get_uint (value);
+      break;
+    case PROP_NUM_REF_FRAMES:
+      self->prop.num_ref_frames = g_value_get_uint (value);
+      break;
+    case PROP_HIERARCHICAL_LEVEL:
+      self->prop.max_hierarchical_level = g_value_get_uint (value);
+      break;
+    case PROP_128X128_SUPERBLOCK:
+      self->prop.use_128x128_superblock = g_value_get_boolean (value);
+      break;
+    case PROP_QP:
+      self->prop.qp = g_value_get_uint (value);
+      break;
+    case PROP_MAX_QP:
+      self->prop.max_qp = g_value_get_uint (value);
+      break;
+    case PROP_MIN_QP:
+      self->prop.min_qp = g_value_get_uint (value);
+      break;
+    case PROP_BITRATE:
+      self->prop.bitrate = g_value_get_uint (value);
+      break;
+    case PROP_NUM_TILE_COLS:
+      self->prop.num_tile_cols = g_value_get_uint (value);
+      break;
+    case PROP_NUM_TILE_ROWS:
+      self->prop.num_tile_rows = g_value_get_uint (value);
+      break;
+    case PROP_TILE_GROUPS:
+      self->prop.tile_groups = g_value_get_uint (value);
+      break;
+    case PROP_TARGET_USAGE:
+      self->prop.target_usage = g_value_get_uint (value);
+      break;
+    case PROP_TARGET_PERCENTAGE:
+      self->prop.target_percentage = g_value_get_uint (value);
+      break;
+    case PROP_CPB_SIZE:
+      self->prop.cpb_size = g_value_get_uint (value);
+      break;
+    case PROP_RATE_CONTROL:
+      self->prop.rc_ctrl = g_value_get_enum (value);
+      break;
+    case PROP_MBBRC:{
+      /* Macroblock-level rate control.
+       * 0: use default,
+       * 1: always enable,
+       * 2: always disable,
+       * other: reserved. */
+      switch (g_value_get_enum (value)) {
+        case GST_VA_FEATURE_DISABLED:
+          self->prop.mbbrc = 2;
+          break;
+        case GST_VA_FEATURE_ENABLED:
+          self->prop.mbbrc = 1;
+          break;
+        case GST_VA_FEATURE_AUTO:
+          self->prop.mbbrc = 0;
+          break;
+      }
+      break;
+    }
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+  }
+
+  GST_OBJECT_UNLOCK (self);
+}
+
+static void
+gst_va_av1_enc_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstVaAV1Enc *const self = GST_VA_AV1_ENC (object);
+
+  GST_OBJECT_LOCK (self);
+
+  switch (prop_id) {
+    case PROP_KEYFRAME_INT:
+      g_value_set_uint (value, self->prop.keyframe_interval);
+      break;
+    case PROP_GOLDEN_GROUP_SIZE:
+      g_value_set_uint (value, self->prop.gf_group_size);
+      break;
+    case PROP_NUM_REF_FRAMES:
+      g_value_set_uint (value, self->prop.num_ref_frames);
+      break;
+    case PROP_HIERARCHICAL_LEVEL:
+      g_value_set_uint (value, self->prop.max_hierarchical_level);
+      break;
+    case PROP_128X128_SUPERBLOCK:
+      g_value_set_boolean (value, self->prop.use_128x128_superblock);
+      break;
+    case PROP_QP:
+      g_value_set_uint (value, self->prop.qp);
+      break;
+    case PROP_MIN_QP:
+      g_value_set_uint (value, self->prop.min_qp);
+      break;
+    case PROP_MAX_QP:
+      g_value_set_uint (value, self->prop.max_qp);
+      break;
+    case PROP_NUM_TILE_COLS:
+      g_value_set_uint (value, self->prop.num_tile_cols);
+      break;
+    case PROP_NUM_TILE_ROWS:
+      g_value_set_uint (value, self->prop.num_tile_rows);
+      break;
+    case PROP_TILE_GROUPS:
+      g_value_set_uint (value, self->prop.tile_groups);
+      break;
+    case PROP_BITRATE:
+      g_value_set_uint (value, self->prop.bitrate);
+      break;
+    case PROP_TARGET_USAGE:
+      g_value_set_uint (value, self->prop.target_usage);
+      break;
+    case PROP_TARGET_PERCENTAGE:
+      g_value_set_uint (value, self->prop.target_percentage);
+      break;
+    case PROP_CPB_SIZE:
+      g_value_set_uint (value, self->prop.cpb_size);
+      break;
+    case PROP_RATE_CONTROL:
+      g_value_set_enum (value, self->prop.rc_ctrl);
+      break;
+    case PROP_MBBRC:
+      g_value_set_enum (value, self->prop.mbbrc);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+  }
+
+  GST_OBJECT_UNLOCK (self);
+}
+
+static void
+gst_va_av1_enc_class_init (gpointer g_klass, gpointer class_data)
+{
+  GstCaps *src_doc_caps, *sink_doc_caps;
+  GstPadTemplate *sink_pad_templ, *src_pad_templ;
+  GObjectClass *object_class = G_OBJECT_CLASS (g_klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_klass);
+  GstVideoEncoderClass *venc_class = GST_VIDEO_ENCODER_CLASS (g_klass);
+  GstVaBaseEncClass *va_enc_class = GST_VA_BASE_ENC_CLASS (g_klass);
+  GstVaAV1EncClass *vaav1enc_class = GST_VA_AV1_ENC_CLASS (g_klass);
+  GstVaDisplay *display;
+  GstVaEncoder *encoder;
+  struct CData *cdata = class_data;
+  gchar *long_name;
+  const gchar *name, *desc;
+  gint n_props = N_PROPERTIES;
+
+  if (cdata->entrypoint == VAEntrypointEncSlice) {
+    desc = "VA-API based AV1 video encoder";
+    name = "VA-API AV1 Encoder";
+  } else {
+    desc = "VA-API based AV1 low power video encoder";
+    name = "VA-API AV1 Low Power Encoder";
+  }
+
+  if (cdata->description)
+    long_name = g_strdup_printf ("%s in %s", name, cdata->description);
+  else
+    long_name = g_strdup (name);
+
+  gst_element_class_set_metadata (element_class, long_name,
+      "Codec/Encoder/Video/Hardware", desc, "He Junyan <junyan.he@intel.com>");
+
+  sink_doc_caps = gst_caps_from_string (sink_caps_str);
+  src_doc_caps = gst_caps_from_string (src_caps_str);
+
+  parent_class = g_type_class_peek_parent (g_klass);
+
+  va_enc_class->codec = AV1;
+  va_enc_class->entrypoint = cdata->entrypoint;
+  va_enc_class->render_device_path = g_strdup (cdata->render_device_path);
+
+  sink_pad_templ = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+      cdata->sink_caps);
+  gst_element_class_add_pad_template (element_class, sink_pad_templ);
+
+  gst_pad_template_set_documentation_caps (sink_pad_templ, sink_doc_caps);
+  gst_caps_unref (sink_doc_caps);
+
+  src_pad_templ = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+      cdata->src_caps);
+  gst_element_class_add_pad_template (element_class, src_pad_templ);
+
+  gst_pad_template_set_documentation_caps (src_pad_templ, src_doc_caps);
+  gst_caps_unref (src_doc_caps);
+
+  object_class->set_property = gst_va_av1_enc_set_property;
+  object_class->get_property = gst_va_av1_enc_get_property;
+
+  venc_class->flush = GST_DEBUG_FUNCPTR (gst_va_av1_enc_flush);
+  va_enc_class->reset_state = GST_DEBUG_FUNCPTR (gst_va_av1_enc_reset_state);
+  va_enc_class->reconfig = GST_DEBUG_FUNCPTR (gst_va_av1_enc_reconfig);
+  va_enc_class->new_frame = GST_DEBUG_FUNCPTR (gst_va_av1_enc_new_frame);
+  va_enc_class->reorder_frame =
+      GST_DEBUG_FUNCPTR (gst_va_av1_enc_reorder_frame);
+  va_enc_class->encode_frame = GST_DEBUG_FUNCPTR (gst_va_av1_enc_encode_frame);
+  va_enc_class->prepare_output =
+      GST_DEBUG_FUNCPTR (gst_va_av1_enc_prepare_output);
+
+  {
+    display = gst_va_display_platform_new (va_enc_class->render_device_path);
+    encoder = gst_va_encoder_new (display, va_enc_class->codec,
+        va_enc_class->entrypoint);
+    if (gst_va_encoder_get_rate_control_enum (encoder,
+            vaav1enc_class->rate_control)) {
+      g_snprintf (vaav1enc_class->rate_control_type_name,
+          G_N_ELEMENTS (vaav1enc_class->rate_control_type_name) - 1,
+          "GstVaEncoderRateControl_%" GST_FOURCC_FORMAT "%s_%s",
+          GST_FOURCC_ARGS (va_enc_class->codec),
+          (va_enc_class->entrypoint == VAEntrypointEncSliceLP) ? "_LP" : "",
+          g_path_get_basename (va_enc_class->render_device_path));
+      vaav1enc_class->rate_control_type =
+          g_enum_register_static (vaav1enc_class->rate_control_type_name,
+          vaav1enc_class->rate_control);
+      gst_type_mark_as_plugin_api (vaav1enc_class->rate_control_type, 0);
+    }
+    gst_object_unref (encoder);
+    gst_object_unref (display);
+  }
+
+  g_free (long_name);
+  g_free (cdata->description);
+  g_free (cdata->render_device_path);
+  gst_caps_unref (cdata->src_caps);
+  gst_caps_unref (cdata->sink_caps);
+  g_free (cdata);
+
+  /**
+   * GstVaAV1Enc:key-int-max:
+   *
+   * The maximal distance between two keyframes.
+   */
+  propertiesPROP_KEYFRAME_INT = g_param_spec_uint ("key-int-max",
+      "Key frame maximal interval",
+      "The maximal distance between two keyframes. It decides the size of GOP"
+      " (0: auto-calculate)", 0, MAX_KEY_FRAME_INTERVAL, 60,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:gf-group-size:
+   *
+   * The size of the golden frame group.
+   */
+  propertiesPROP_GOLDEN_GROUP_SIZE = g_param_spec_uint ("gf-group-size",
+      "Golden frame group size",
+      "The size of the golden frame group.",
+      1, MAX_GF_GROUP_SIZE, MAX_GF_GROUP_SIZE,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:ref-frames:
+   *
+   * The number of reference frames.
+   */
+  propertiesPROP_NUM_REF_FRAMES = g_param_spec_uint ("ref-frames",
+      "Number of Reference Frames",
+      "Number of reference frames, including both the forward and the backward",
+      0, 7, 7, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:hierarchical-level:
+   *
+   * The hierarchical level for golden frame group.
+   */
+  propertiesPROP_HIERARCHICAL_LEVEL =
+      g_param_spec_uint ("hierarchical-level", "The hierarchical level",
+      "The hierarchical level for golden frame group. Setting to 1 disables "
+      "all future reference", 1, HIGHEST_PYRAMID_LEVELS,
+      HIGHEST_PYRAMID_LEVELS,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:superblock-128x128:
+   *
+   * Enable the 128x128 superblock mode.
+   */
+  propertiesPROP_128X128_SUPERBLOCK =
+      g_param_spec_boolean ("superblock-128x128", "128x128 superblock",
+      "Enable the 128x128 superblock mode", FALSE,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:min-qp:
+   *
+   * The minimum quantizer value.
+   */
+  propertiesPROP_MIN_QP = g_param_spec_uint ("min-qp", "Minimum QP",
+      "Minimum quantizer value for each frame", 0, 255, 0,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:max-qp:
+   *
+   * The maximum quantizer value.
+   */
+  propertiesPROP_MAX_QP = g_param_spec_uint ("max-qp", "Maximum QP",
+      "Maximum quantizer value for each frame", 1, 255, 255,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:qp:
+   *
+   * The basic quantizer value for all frames.
+   */
+  propertiesPROP_QP = g_param_spec_uint ("qp", "The frame QP",
+      "The basic quantizer value for all frames.", 0, 255, DEFAULT_BASE_QINDEX,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:bitrate:
+   *
+   * The desired target bitrate, expressed in kbps.
+   * This is not available in CQP mode.
+   *
+   * CBR: This applies equally to the minimum, maximum and target bitrate.
+   * VBR: This applies to the target bitrate. The driver will use the
+   * "target-percentage" together to calculate the minimum and maximum bitrate.
+   * VCM: This applies to the target bitrate. The minimum and maximum bitrate
+   * are not needed.
+   */
+  propertiesPROP_BITRATE = g_param_spec_uint ("bitrate", "Bitrate (kbps)",
+      "The desired bitrate expressed in kbps (0: auto-calculate)",
+      0, 2000 * 1024, 0,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:target-percentage:
+   *
+   * The target percentage of the max bitrate, and expressed in uint,
+   * equal to "target percentage"*100.
+   * "target percentage" = "target bitrate" * 100 / "max bitrate"
+   * This is available only when rate-control is VBR.
+   * The driver uses it to calculate the minimum and maximum bitrate.
+   */
+  propertiesPROP_TARGET_PERCENTAGE = g_param_spec_uint ("target-percentage",
+      "target bitrate percentage",
+      "The percentage for 'target bitrate'/'maximum bitrate' (Only in VBR)",
+      50, 100, 66,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:cpb-size:
+   *
+   * The desired max CPB size in Kb (0: auto-calculate).
+   */
+  propertiesPROP_CPB_SIZE = g_param_spec_uint ("cpb-size",
+      "max CPB size in Kb",
+      "The desired max CPB size in Kb (0: auto-calculate)", 0, 2000 * 1024, 0,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:target-usage:
+   *
+   * The target usage of the encoder. It controls and balances the encoding
+   * speed and the encoding quality. The lower value has better quality but
+   * slower speed, the higher value has faster speed but lower quality.
+   */
+  propertiesPROP_TARGET_USAGE = g_param_spec_uint ("target-usage",
+      "target usage",
+      "The target usage to control and balance the encoding speed/quality",
+      1, 7, 4, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:num-tile-cols:
+   *
+   * The number of tile columns when tile encoding is enabled.
+   */
+  propertiesPROP_NUM_TILE_COLS = g_param_spec_uint ("num-tile-cols",
+      "number of tile columns",
+      "The number of columns for tile encoding", 1, GST_AV1_MAX_TILE_COLS, 1,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:num-tile-rows:
+   *
+   * The number of tile rows when tile encoding is enabled.
+   */
+  propertiesPROP_NUM_TILE_ROWS = g_param_spec_uint ("num-tile-rows",
+      "number of tile rows",
+      "The number of rows for tile encoding", 1, GST_AV1_MAX_TILE_ROWS, 1,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:tile-groups:
+   *
+   * The number of tile groups for each frame.
+   */
+  propertiesPROP_TILE_GROUPS = g_param_spec_uint ("tile-groups",
+      "Number of tile groups", "Number of tile groups for each frame",
+      1, GST_AV1_MAX_TILE_COLS * GST_AV1_MAX_TILE_ROWS, 1,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  /**
+   * GstVaAV1Enc:mbbrc:
+   *
+   * Macroblock level bitrate control.
+   * This is not compatible with Constant QP rate control.
+   */
+  propertiesPROP_MBBRC = g_param_spec_enum ("mbbrc",
+      "Macroblock level Bitrate Control",
+      "Macroblock level Bitrate Control. It is not compatible with CQP",
+      GST_TYPE_VA_FEATURE, GST_VA_FEATURE_AUTO,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+
+  if (vaav1enc_class->rate_control_type > 0) {
+    propertiesPROP_RATE_CONTROL = g_param_spec_enum ("rate-control",
+        "rate control mode",
+        "The desired rate control mode for the encoder",
+        vaav1enc_class->rate_control_type,
+        vaav1enc_class->rate_control0.value,
+        GST_PARAM_CONDITIONALLY_AVAILABLE | G_PARAM_READWRITE |
+        G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT);
+  } else {
+    n_props--;
+    propertiesPROP_RATE_CONTROL = NULL;
+  }
+
+  g_object_class_install_properties (object_class, n_props, properties);
+
+  /**
+   * GstVaFeature:
+   * @GST_VA_FEATURE_DISABLED: The feature is disabled.
+   * @GST_VA_FEATURE_ENABLED: The feature is enabled.
+   * @GST_VA_FEATURE_AUTO: The feature is enabled automatically.
+   *
+   * Since: 1.22
+   */
+  gst_type_mark_as_plugin_api (GST_TYPE_VA_FEATURE, 0);
+}
+
+static GstCaps *
+_complete_src_caps (GstCaps * srccaps)
+{
+  GstCaps *caps = gst_caps_copy (srccaps);
+  GValue val = G_VALUE_INIT;
+
+  g_value_init (&val, G_TYPE_STRING);
+  g_value_set_string (&val, "tu");
+  gst_caps_set_value (caps, "alignment", &val);
+  g_value_unset (&val);
+
+  g_value_init (&val, G_TYPE_STRING);
+  g_value_set_string (&val, "obu-stream");
+  gst_caps_set_value (caps, "stream-format", &val);
+  g_value_unset (&val);
+
+  return caps;
+}
+
+gboolean
+gst_va_av1_enc_register (GstPlugin * plugin, GstVaDevice * device,
+    GstCaps * sink_caps, GstCaps * src_caps, guint rank,
+    VAEntrypoint entrypoint)
+{
+  static GOnce debug_once = G_ONCE_INIT;
+  GType type;
+  GTypeInfo type_info = {
+    .class_size = sizeof (GstVaAV1EncClass),
+    .class_init = gst_va_av1_enc_class_init,
+    .instance_size = sizeof (GstVaAV1Enc),
+    .instance_init = gst_va_av1_enc_init,
+  };
+  struct CData *cdata;
+  gboolean ret;
+  gchar *type_name, *feature_name;
+
+  g_return_val_if_fail (GST_IS_PLUGIN (plugin), FALSE);
+  g_return_val_if_fail (GST_IS_VA_DEVICE (device), FALSE);
+  g_return_val_if_fail (GST_IS_CAPS (sink_caps), FALSE);
+  g_return_val_if_fail (GST_IS_CAPS (src_caps), FALSE);
+  g_return_val_if_fail (entrypoint == VAEntrypointEncSlice ||
+      entrypoint == VAEntrypointEncSliceLP, FALSE);
+
+  cdata = g_new (struct CData, 1);
+  cdata->entrypoint = entrypoint;
+  cdata->description = NULL;
+  cdata->render_device_path = g_strdup (device->render_device_path);
+  cdata->sink_caps = gst_caps_ref (sink_caps);
+  cdata->src_caps = _complete_src_caps (src_caps);
+
+  /* class data will be leaked if the element never gets instantiated */
+  GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+  GST_MINI_OBJECT_FLAG_SET (cdata->src_caps,
+      GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);
+
+  type_info.class_data = cdata;
+
+  if (entrypoint == VAEntrypointEncSlice) {
+    gst_va_create_feature_name (device, "GstVaAV1Enc", "GstVa%sAV1Enc",
+        &type_name, "vaav1enc", "va%sav1enc", &feature_name,
+        &cdata->description, &rank);
+  } else {
+    gst_va_create_feature_name (device, "GstVaAV1LPEnc", "GstVa%sAV1LPEnc",
+        &type_name, "vaav1lpenc", "va%sav1lpenc", &feature_name,
+        &cdata->description, &rank);
+  }
+
+  g_once (&debug_once, _register_debug_category, NULL);
+  type = g_type_register_static (GST_TYPE_VA_BASE_ENC,
+      type_name, &type_info, 0);
+  ret = gst_element_register (plugin, feature_name, rank, type);
+
+  g_free (type_name);
+  g_free (feature_name);
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvaav1enc.h Added

@@ -0,0 +1,34 @@
+/* GStreamer
+ *  Copyright (C) 2022 Intel Corporation
+ *     Author: He Junyan <junyan.he@intel.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include "gstvadevice.h"
+
+G_BEGIN_DECLS
+
+gboolean     gst_va_av1_enc_register                 (GstPlugin * plugin,
+                                                      GstVaDevice * device,
+                                                      GstCaps * sink_caps,
+                                                      GstCaps * src_caps,
+                                                      guint rank,
+                                                      VAEntrypoint entrypoint);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvabase.c Added

@@ -0,0 +1,222 @@
+/* GStreamer
+ * Copyright (C) 2023 Igalia, S.L.
+ *     Author: Víctor Jáquez <vjaquez@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstvabase.h"
+
+#include <gst/video/video.h>
+
+#include <gst/va/gstvavideoformat.h>
+#include <gst/va/vasurfaceimage.h>
+
+#define GST_CAT_DEFAULT (importer->debug_category)
+
+/* big bad mutex to exclusive access to shared stream buffers, such as
+ * DMABuf after a tee */
+static GRecMutex GST_VA_SHARED_LOCK = { 0, };
+
+static gboolean
+_try_import_dmabuf_unlocked (GstVaBufferImporter * importer, GstBuffer * inbuf)
+{
+  GstVideoMeta *meta;
+  GstVideoInfo in_info = *importer->in_info;
+  GstVideoInfoDmaDrm drm_info = *importer->in_drm_info;
+  GstMemory *memsGST_VIDEO_MAX_PLANES;
+  guint i, n_planes, usage_hint;
+  gsize offsetGST_VIDEO_MAX_PLANES;
+  uintptr_t fdGST_VIDEO_MAX_PLANES;
+  gsize plane_sizeGST_VIDEO_MAX_PLANES;
+  GstVideoAlignment align = { 0, };
+
+  /* This will eliminate most non-dmabuf out there */
+  if (!gst_is_dmabuf_memory (gst_buffer_peek_memory (inbuf, 0)))
+    return FALSE;
+
+  n_planes = GST_VIDEO_INFO_N_PLANES (&in_info);
+
+  meta = gst_buffer_get_video_meta (inbuf);
+
+  /* Update video info importerd on video meta */
+  if (meta) {
+    GST_VIDEO_INFO_WIDTH (&in_info) = meta->width;
+    GST_VIDEO_INFO_HEIGHT (&in_info) = meta->height;
+
+    g_assert (n_planes == meta->n_planes);
+
+    for (i = 0; i < n_planes; i++) {
+      GST_VIDEO_INFO_PLANE_OFFSET (&in_info, i) = meta->offseti;
+      GST_VIDEO_INFO_PLANE_STRIDE (&in_info, i) = meta->stridei;
+    }
+  }
+
+  if (!gst_video_info_align_full (&in_info, &align, plane_size))
+    return FALSE;
+
+  /* Find and validate all memories */
+  for (i = 0; i < n_planes; i++) {
+    guint length;
+    guint mem_idx;
+    gsize mem_skip;
+
+    if (!gst_buffer_find_memory (inbuf,
+            GST_VIDEO_INFO_PLANE_OFFSET (&in_info, i), plane_sizei, &mem_idx,
+            &length, &mem_skip))
+      return FALSE;
+
+    /* We can't have more then one dmabuf per plane */
+    if (length != 1)
+      return FALSE;
+
+    memsi = gst_buffer_peek_memory (inbuf, mem_idx);
+
+    /* And all memory found must be dmabuf */
+    if (!gst_is_dmabuf_memory (memsi))
+      return FALSE;
+
+    offseti = memsi->offset + mem_skip;
+    fdi = gst_dmabuf_memory_get_fd (memsi);
+  }
+
+  usage_hint = va_get_surface_usage_hint (importer->display,
+      importer->entrypoint, GST_PAD_SINK, TRUE);
+
+  /* Now create a VASurfaceID for the buffer */
+  return gst_va_dmabuf_memories_setup (importer->display, &drm_info, mems, fd,
+      offset, usage_hint);
+}
+
+static gboolean
+_try_import_buffer (GstVaBufferImporter * importer, GstBuffer * inbuf)
+{
+  VASurfaceID surface;
+  gboolean ret;
+
+  surface = gst_va_buffer_get_surface (inbuf);
+  if (surface != VA_INVALID_ID &&
+      (gst_va_buffer_peek_display (inbuf) == importer->display))
+    return TRUE;
+
+  g_rec_mutex_lock (&GST_VA_SHARED_LOCK);
+  ret = _try_import_dmabuf_unlocked (importer, inbuf);
+  g_rec_mutex_unlock (&GST_VA_SHARED_LOCK);
+
+  return ret;
+}
+
+GstFlowReturn
+gst_va_buffer_importer_import (GstVaBufferImporter * importer,
+    GstBuffer * inbuf, GstBuffer ** outbuf)
+{
+  GstBuffer *buffer = NULL;
+  GstBufferPool *pool;
+  GstFlowReturn ret;
+  GstVideoFrame in_frame, out_frame;
+  gboolean imported, copied;
+
+  imported = _try_import_buffer (importer, inbuf);
+  if (imported) {
+    *outbuf = gst_buffer_ref (inbuf);
+    return GST_FLOW_OK;
+  }
+
+  /* input buffer doesn't come from a vapool, thus it is required to
+   * have a pool, grab from it a new buffer and copy the input
+   * buffer to the new one */
+  if (!(pool = importer->get_sinkpad_pool (importer->element,
+              importer->pool_data)))
+    return GST_FLOW_ERROR;
+
+  ret = gst_buffer_pool_acquire_buffer (pool, &buffer, NULL);
+  if (ret != GST_FLOW_OK)
+    return ret;
+
+  GST_LOG_OBJECT (importer->element, "copying input frame");
+
+  if (!gst_video_frame_map (&in_frame, importer->in_info, inbuf, GST_MAP_READ))
+    goto invalid_buffer;
+
+  if (!gst_video_frame_map (&out_frame, importer->sinkpad_info, buffer,
+          GST_MAP_WRITE)) {
+    gst_video_frame_unmap (&in_frame);
+    goto invalid_buffer;
+  }
+
+  copied = gst_video_frame_copy (&out_frame, &in_frame);
+
+  gst_video_frame_unmap (&out_frame);
+  gst_video_frame_unmap (&in_frame);
+
+  if (!copied)
+    goto invalid_buffer;
+
+  if (!gst_buffer_copy_into (buffer, inbuf, GST_BUFFER_COPY_FLAGS |
+          GST_BUFFER_COPY_TIMESTAMPS, 0, -1)) {
+    GST_WARNING_OBJECT (importer->element,
+        "Couldn't import buffer flags and timestamps");
+  }
+
+  *outbuf = buffer;
+
+  return GST_FLOW_OK;
+
+invalid_buffer:
+  {
+    GST_ELEMENT_WARNING (importer->element, STREAM, FORMAT, (NULL),
+        ("invalid video buffer received"));
+    if (buffer)
+      gst_buffer_unref (buffer);
+    return GST_FLOW_ERROR;
+  }
+}
+
+
+gboolean
+gst_va_base_convert_caps_to_va (GstCaps * caps)
+{
+  g_return_val_if_fail (gst_caps_is_fixed (caps), FALSE);
+
+  /* For DMA buffer, we can only import linear buffers. Replace the drm-format
+   * into format field. */
+  if (gst_video_is_dma_drm_caps (caps)) {
+    GstVideoInfoDmaDrm dma_info;
+    GstVideoInfo info;
+
+    if (!gst_video_info_dma_drm_from_caps (&dma_info, caps))
+      return FALSE;
+
+    if (dma_info.drm_modifier != DRM_FORMAT_MOD_LINEAR)
+      return FALSE;
+
+    if (!gst_va_dma_drm_info_to_video_info (&dma_info, &info))
+      return FALSE;
+
+    gst_caps_set_simple (caps, "format", G_TYPE_STRING,
+        gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&info)), NULL);
+    gst_structure_remove_field (gst_caps_get_structure (caps, 0), "drm-format");
+  }
+
+  gst_caps_set_features_simple (caps,
+      gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_VA));
+
+  return TRUE;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvabase.h Added

@@ -0,0 +1,53 @@
+/* GStreamer
+ * Copyright (C) 2021 Igalia, S.L.
+ *     Author: Víctor Jáquez <vjaquez@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+
+#include <gst/va/gstva.h>
+
+typedef struct _GstVaBufferImporter GstVaBufferImporter;
+
+typedef GstBufferPool *(*GstVaBufferImporterGetSinkPool) (GstElement * element, gpointer data);
+
+struct _GstVaBufferImporter
+{
+  GstElement *element;
+  GstDebugCategory *debug_category;
+
+  GstVaDisplay *display;
+  VAEntrypoint entrypoint;
+
+  union {
+    GstVideoInfo *in_info;
+    GstVideoInfoDmaDrm *in_drm_info;
+  };
+  GstVideoInfo *sinkpad_info;
+
+  gpointer pool_data;
+  GstVaBufferImporterGetSinkPool get_sinkpad_pool;
+};
+
+GstFlowReturn         gst_va_buffer_importer_import       (GstVaBufferImporter * base,
+                                                           GstBuffer * inbuf,
+                                                           GstBuffer ** outbuf);
+
+gboolean              gst_va_base_convert_caps_to_va      (GstCaps * caps);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvabasedec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvabasedec.c Changed

@@ -22,8 +22,10 @@
 
 #include <gst/va/gstva.h>
 #include <gst/va/gstvavideoformat.h>
+#include <gst/va/vasurfaceimage.h>
 
 #include "gstvacaps.h"
+#include "gstvapluginutils.h"
 
 #define GST_CAT_DEFAULT (base->debug_category)
 #define GST_VA_BASE_DEC_GET_PARENT_CLASS(obj) (GST_VA_BASE_DEC_GET_CLASS(obj)->parent_decoder_class)
@@ -33,14 +35,17 @@
     GValue * value, GParamSpec * pspec)
 {
   GstVaBaseDec *self = GST_VA_BASE_DEC (object);
+  GstVaBaseDecClass *klass = GST_VA_BASE_DEC_GET_CLASS (self);
 
   switch (prop_id) {
     case GST_VA_DEC_PROP_DEVICE_PATH:{
-      if (!(self->display && GST_IS_VA_DISPLAY_DRM (self->display))) {
+      if (!self->display)
+        g_value_set_string (value, klass->render_device_path);
+      else if (GST_IS_VA_DISPLAY_PLATFORM (self->display))
+        g_object_get_property (G_OBJECT (self->display), "path", value);
+      else
         g_value_set_string (value, NULL);
-        return;
-      }
-      g_object_get_property (G_OBJECT (self->display), "path", value);
+
       break;
     }
     default:
@@ -234,30 +239,6 @@
   return allocator;
 }
 
-static void
-_create_other_pool (GstVaBaseDec * base, GstAllocator * allocator,
-    GstAllocationParams * params, GstCaps * caps, guint size)
-{
-  GstBufferPool *pool;
-  GstStructure *config;
-
-  gst_clear_object (&base->other_pool);
-
-  GST_DEBUG_OBJECT (base, "making new other pool for copy");
-
-  pool = gst_video_buffer_pool_new ();
-  config = gst_buffer_pool_get_config (pool);
-
-  gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
-  gst_buffer_pool_config_set_allocator (config, allocator, params);
-  if (!gst_buffer_pool_set_config (pool, config)) {
-    GST_ERROR_OBJECT (base, "Couldn't configure other pool for copy.");
-    gst_clear_object (&pool);
-  }
-
-  base->other_pool = pool;
-}
-
 static gboolean
 _need_video_crop (GstVaBaseDec * base)
 {
@@ -269,19 +250,28 @@
   return FALSE;
 }
 
+static GstVaFeature
+_use_derived (GstVaBaseDec * base)
+{
+  /* i965 driver has a very poor performance reading derived images */
+  if (GST_VA_DISPLAY_IS_IMPLEMENTATION (base->display, INTEL_I965))
+    return GST_VA_FEATURE_DISABLED;
+  return GST_VA_FEATURE_AUTO;
+}
+
 /* This path for pool setting is a little complicated but not commonly
    used. We deliberately separate it from the main path of pool setting. */
 static gboolean
 _decide_allocation_for_video_crop (GstVideoDecoder * decoder,
-    GstQuery * query, GstCaps * caps, const GstVideoInfo * info)
+    GstQuery * query, GstCaps * caps)
 {
   GstAllocator *allocator = NULL, *other_allocator = NULL;
   GstAllocationParams other_params, params;
   gboolean update_pool = FALSE, update_allocator = FALSE;
   GstBufferPool *pool = NULL, *other_pool = NULL;
-  guint size = 0, min, max;
+  guint size = 0, min, max, usage_hint;
   GstVaBaseDec *base = GST_VA_BASE_DEC (decoder);
-  gboolean ret = TRUE;
+  gboolean ret = FALSE;
   gboolean dont_use_other_pool = FALSE;
   GstCaps *va_caps = NULL;
 
@@ -311,29 +301,35 @@
       gst_clear_object (&other_pool);
 
     min += base->min_buffers;
-    size = MAX (size, GST_VIDEO_INFO_SIZE (info));
     update_pool = TRUE;
   } else {
-    size = GST_VIDEO_INFO_SIZE (info);
     min = base->min_buffers;
     max = 0;
   }
 
   /* Ensure that the other pool is ready */
   if (gst_caps_is_raw (caps)) {
-    if (GST_IS_VA_POOL (other_pool))
+    if (GST_IS_VA_POOL (other_pool)) {
       gst_clear_object (&other_pool);
+      size = 0;
+    }
 
     if (!other_pool) {
       if (other_allocator && (GST_IS_VA_DMABUF_ALLOCATOR (other_allocator)
               || GST_IS_VA_ALLOCATOR (other_allocator)))
         gst_clear_object (&other_allocator);
 
-      _create_other_pool (base, other_allocator, &other_params, caps, size);
+      GST_DEBUG_OBJECT (base, "making new other pool for copy");
+      base->other_pool =
+          gst_va_create_other_pool (other_allocator, &other_params, caps, size);
     } else {
       gst_object_replace ((GstObject **) & base->other_pool,
           (GstObject *) other_pool);
     }
+    if (!base->other_pool) {
+      GST_ERROR_OBJECT (base, "Couldn't configure other pool for copy");
+      goto cleanup;
+    }
   } else {
     GstStructure *other_config;
 
@@ -349,51 +345,45 @@
 
     if (!other_allocator) {
       other_allocator = _create_allocator (base, caps);
-      if (!other_allocator) {
-        ret = FALSE;
+      if (!other_allocator)
         goto cleanup;
-      }
     }
 
     other_config = gst_buffer_pool_get_config (other_pool);
 
-    gst_buffer_pool_config_set_params (other_config, caps, size, min, max);
+    gst_buffer_pool_config_set_params (other_config, caps, 0, min, max);
     gst_buffer_pool_config_set_allocator (other_config, other_allocator,
         &other_params);
     /* Always support VideoMeta but no VideoCropMeta here. */
     gst_buffer_pool_config_add_option (other_config,
         GST_BUFFER_POOL_OPTION_VIDEO_META);
 
-    gst_buffer_pool_config_set_va_allocation_params (other_config, 0,
-        GST_VA_FEATURE_AUTO);
+    gst_buffer_pool_config_set_va_allocation_params (other_config,
+        VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC, _use_derived (base));
 
-    if (!gst_buffer_pool_set_config (other_pool, other_config)) {
-      ret = FALSE;
+    if (!gst_buffer_pool_set_config (other_pool, other_config))
       goto cleanup;
-    }
 
     gst_object_replace ((GstObject **) & base->other_pool,
         (GstObject *) other_pool);
   }
 
   /* Now setup the buffer pool for decoder */
-  pool = gst_va_pool_new ();
 
   va_caps = gst_caps_copy (caps);
   gst_caps_set_features_simple (va_caps,
       gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_VA));
 
-  if (!(allocator = _create_allocator (base, va_caps))) {
-    ret = FALSE;
+  if (!(allocator = _create_allocator (base, va_caps)))
     goto cleanup;
-  }
 
   gst_allocation_params_init (&params);
 
+  pool = gst_va_pool_new ();
   {
     GstStructure *config = gst_buffer_pool_get_config (pool);
 
-    gst_buffer_pool_config_set_params (config, caps, size, min, max);
+    gst_buffer_pool_config_set_params (config, caps, 0, min, max);
     gst_buffer_pool_config_set_allocator (config, allocator, &params);
     gst_buffer_pool_config_add_option (config,
         GST_BUFFER_POOL_OPTION_VIDEO_META);
@@ -401,13 +391,16 @@
     if (_need_video_crop (base))
       gst_buffer_pool_config_set_va_alignment (config, &base->valign);
 
+    usage_hint = va_get_surface_usage_hint (base->display,
+        VAEntrypointVLD, GST_PAD_SRC, gst_video_is_dma_drm_caps (caps));
+
     gst_buffer_pool_config_set_va_allocation_params (config,
-        VA_SURFACE_ATTRIB_USAGE_HINT_DECODER, GST_VA_FEATURE_AUTO);
+        usage_hint, _use_derived (base));
 
-    if (!gst_buffer_pool_set_config (pool, config)) {
-      ret = FALSE;
+    if (!gst_buffer_pool_set_config (pool, config))
+      goto cleanup;
+    if (!gst_va_pool_get_buffer_size (pool, &size))
       goto cleanup;
-    }
   }
 
   if (update_allocator)
@@ -427,9 +420,9 @@
   base->copy_frames = TRUE;
   base->apply_video_crop = TRUE;
 
+  ret = TRUE;
+
 cleanup:
-  if (ret != TRUE)
-    gst_clear_object (&base->other_pool);
   gst_clear_object (&allocator);
   gst_clear_object (&other_allocator);
   gst_clear_object (&pool);
@@ -485,19 +478,17 @@
   GstAllocationParams other_params, params;
   GstBufferPool *pool = NULL, *other_pool = NULL;
   GstCaps *caps = NULL;
-  GstVideoInfo info;
   GstVaBaseDec *base = GST_VA_BASE_DEC (decoder);
-  guint size = 0, min, max;
+  guint other_size = 0, size = 0, min, max, usage_hint;
   gboolean update_pool = FALSE, update_allocator = FALSE;
   gboolean has_videometa, has_video_crop_meta;
-  gboolean dont_use_other_pool = FALSE;
-  gboolean ret = TRUE;
+  gboolean dont_use_other_pool = FALSE, ret = FALSE;
 
   g_assert (base->min_buffers > 0);
 
   gst_query_parse_allocation (query, &caps, NULL);
 
-  if (!(caps && gst_video_info_from_caps (&info, caps)))
+  if (!caps)
     goto wrong_caps;
 
   has_videometa = gst_query_find_allocation_meta (query,
@@ -505,16 +496,25 @@
   has_video_crop_meta = has_videometa && gst_query_find_allocation_meta (query,
       GST_VIDEO_CROP_META_API_TYPE, NULL);
 
+  if (gst_video_is_dma_drm_caps (caps) && !has_videometa) {
+    GST_ERROR_OBJECT (base,
+        "DMABuf caps negotiated without the mandatory support of VideoMeta ");
+    return FALSE;
+  }
+
   /* 1. The output picture locates in the middle of the decoded buffer,
      but the downstream element does not support VideoCropMeta, we
      definitely need a copy.
      2. Some codec such as H265, it does not clean the DPB when new SPS
      comes. The new SPS may set the crop window to top-left corner and
      so no video crop is needed here. But we may still have cached frames
-     in DPB which need a copy. */
-  if ((_need_video_crop (base) && !has_video_crop_meta) ||
-      base->apply_video_crop) {
-    return _decide_allocation_for_video_crop (decoder, query, caps, &info);
+     in DPB which need a copy.
+     3. For DMA kind memory, because we may not be able to map this buffer,
+     just disable the copy for crop. This may cause some alignment garbage. */
+  if (!gst_video_is_dma_drm_caps (caps) &&
+      ((_need_video_crop (base) && !has_video_crop_meta) ||
+          base->apply_video_crop)) {
+    return _decide_allocation_for_video_crop (decoder, query, caps);
   }
 
   if (gst_query_get_n_allocation_params (query) > 0) {
@@ -547,26 +547,22 @@
             "may need other pool for copy frames %" GST_PTR_FORMAT, pool);
         other_pool = pool;
         pool = NULL;
+        other_size = size;
       } else if (dont_use_other_pool) {
         gst_clear_object (&pool);
       }
     }
 
     min += base->min_buffers;
-    size = MAX (size, GST_VIDEO_INFO_SIZE (&info));
-
     update_pool = TRUE;
   } else {
-    size = GST_VIDEO_INFO_SIZE (&info);
     min = base->min_buffers;
     max = 0;
   }
 
   if (!allocator) {
-    if (!(allocator = _create_allocator (base, caps))) {
-      ret = FALSE;
+    if (!(allocator = _create_allocator (base, caps)))
       goto cleanup;
-    }
   }
 
   if (!pool)
@@ -575,7 +571,7 @@
   {
     GstStructure *config = gst_buffer_pool_get_config (pool);
 
-    gst_buffer_pool_config_set_params (config, caps, size, min, max);
+    gst_buffer_pool_config_set_params (config, caps, 0, min, max);
     gst_buffer_pool_config_set_allocator (config, allocator, &params);
     gst_buffer_pool_config_add_option (config,
         GST_BUFFER_POOL_OPTION_VIDEO_META);
@@ -583,13 +579,16 @@
     if (base->need_valign)
       gst_buffer_pool_config_set_va_alignment (config, &base->valign);
 
+    usage_hint = va_get_surface_usage_hint (base->display,
+        VAEntrypointVLD, GST_PAD_SRC, gst_video_is_dma_drm_caps (caps));
+
     gst_buffer_pool_config_set_va_allocation_params (config,
-        VA_SURFACE_ATTRIB_USAGE_HINT_DECODER, GST_VA_FEATURE_AUTO);
+        usage_hint, _use_derived (base));
 
-    if (!gst_buffer_pool_set_config (pool, config)) {
-      ret = FALSE;
+    if (!gst_buffer_pool_set_config (pool, config))
+      goto cleanup;
+    if (!gst_va_pool_get_buffer_size (pool, &size))
       goto cleanup;
-    }
   }
 
   if (update_allocator)
@@ -609,7 +608,14 @@
       gst_object_replace ((GstObject **) & base->other_pool,
           (GstObject *) other_pool);
     } else {
-      _create_other_pool (base, other_allocator, &other_params, caps, size);
+      gst_clear_object (&base->other_pool);
+      base->other_pool =
+          gst_va_create_other_pool (other_allocator, &other_params, caps,
+          other_size);
+    }
+    if (!base->other_pool) {
+      GST_ERROR_OBJECT (base, "Couldn't configure other pool for copy");
+      goto cleanup;
     }
     GST_DEBUG_OBJECT (base, "Use the other pool for copy %" GST_PTR_FORMAT,
         base->other_pool);
@@ -617,6 +623,8 @@
     gst_clear_object (&base->other_pool);
   }
 
+  ret = TRUE;
+
 cleanup:
   gst_clear_object (&allocator);
   gst_clear_object (&other_allocator);
@@ -747,105 +755,107 @@
 
   g_object_class_install_property (object_class, GST_VA_DEC_PROP_DEVICE_PATH,
       g_param_spec_string ("device-path", "Device Path",
-          "DRM device path", NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+          GST_VA_DEVICE_PATH_PROP_DESC, NULL, GST_PARAM_DOC_SHOW_DEFAULT |
+          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+}
+
+static inline GstVideoFormat
+_get_video_format_from_value (const GValue * format, gboolean drm_format,
+    guint64 * modifier)
+{
+  guint32 fourcc;
+  const char *fmt;
+
+  g_assert (G_VALUE_HOLDS_STRING (format));
+
+  fmt = g_value_get_string (format);
+
+  if (drm_format) {
+    fourcc = gst_video_dma_drm_fourcc_from_string (fmt, modifier);
+    return gst_va_video_format_from_drm_fourcc (fourcc);
+  }
+
+  return gst_video_format_from_string (fmt);
 }
 
-/* XXX: if chroma has not an available format, the first format is
- * returned, relying on an hypothetical internal CSC */
 static GstVideoFormat
-_find_video_format_from_chroma (const GValue * formats, guint chroma_type)
+_find_video_format_from_chroma (const GValue * formats, guint chroma_type,
+    gboolean drm_format, guint64 * modifier)
 {
-  GstVideoFormat fmt;
+  GstVideoFormat fmt = GST_VIDEO_FORMAT_UNKNOWN;
   guint i, num_values;
 
   if (!formats)
     return GST_VIDEO_FORMAT_UNKNOWN;
 
   if (G_VALUE_HOLDS_STRING (formats)) {
-    return gst_video_format_from_string (g_value_get_string (formats));
+    fmt = _get_video_format_from_value (formats, drm_format, modifier);
+    if (gst_va_chroma_from_video_format (fmt) == chroma_type)
+      return fmt;
   } else if (GST_VALUE_HOLDS_LIST (formats)) {
-    GValue *val, *first_val = NULL;
+    const GValue *format;
 
     num_values = gst_value_list_get_size (formats);
     for (i = 0; i < num_values; i++) {
-      val = (GValue *) gst_value_list_get_value (formats, i);
-      if (!val)
-        continue;
-      if (!first_val)
-        first_val = val;
-      fmt = gst_video_format_from_string (g_value_get_string (val));
+      format = gst_value_list_get_value (formats, i);
+      fmt = _get_video_format_from_value (format, drm_format, modifier);
+
       if (gst_va_chroma_from_video_format (fmt) == chroma_type)
         return fmt;
     }
-
-    if (first_val)
-      return gst_video_format_from_string (g_value_get_string (first_val));
   }
 
   return GST_VIDEO_FORMAT_UNKNOWN;
 }
 
 static GstVideoFormat
-_caps_video_format_from_chroma (GstCaps * caps, GstCapsFeatures * features,
-    guint chroma_type)
+_caps_video_format_from_chroma (GstCaps * caps, guint chroma_type)
 {
   guint i, num_structures;
   GstCapsFeatures *feats;
   GstStructure *structure;
   const GValue *format;
+  GstVideoFormat fmt;
 
   num_structures = gst_caps_get_size (caps);
   for (i = 0; i < num_structures; i++) {
     feats = gst_caps_get_features (caps, i);
-    if (!gst_caps_features_is_equal (feats, features))
+    if (!gst_caps_features_is_equal (feats,
+            GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY))
       continue;
     structure = gst_caps_get_structure (caps, i);
     format = gst_structure_get_value (structure, "format");
-    return _find_video_format_from_chroma (format, chroma_type);
+
+    fmt = _find_video_format_from_chroma (format, chroma_type, FALSE, NULL);
+    if (fmt == GST_VIDEO_FORMAT_UNKNOWN)
+      continue;
+    if (gst_va_chroma_from_video_format (fmt) == chroma_type)
+      return fmt;
   }
 
   return GST_VIDEO_FORMAT_UNKNOWN;
 }
 
-static GstVideoFormat
-_default_video_format_from_chroma (GstVaBaseDec * base,
-    GstCapsFeatures * features, guint chroma_type)
-{
-  GstCaps *tmpl_caps;
-  GstVideoFormat ret = GST_VIDEO_FORMAT_UNKNOWN;
-
-  tmpl_caps = gst_pad_get_pad_template_caps (GST_VIDEO_DECODER_SRC_PAD (base));
-  ret = _caps_video_format_from_chroma (tmpl_caps, features, chroma_type);
-  gst_caps_unref (tmpl_caps);
-
-  return ret;
-}
-
-/* Check whether the downstream supports VideoMeta; if not, we need to
- * fallback to the system memory. */
-static gboolean
-_downstream_has_video_meta (GstVaBaseDec * base, GstCaps * caps)
-{
-  GstQuery *query;
-  gboolean ret = FALSE;
-
-  query = gst_query_new_allocation (caps, FALSE);
-  if (gst_pad_peer_query (GST_VIDEO_DECODER_SRC_PAD (base), query))
-    ret = gst_query_find_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);
-  gst_query_unref (query);
-
-  return ret;
-}
+/* ordered list of capsfeature preference */
+enum
+{ VA, DMABUF, SYSMEM };
 
 void
 gst_va_base_dec_get_preferred_format_and_caps_features (GstVaBaseDec * base,
-    GstVideoFormat * format, GstCapsFeatures ** capsfeatures)
+    GstVideoFormat * format, GstCapsFeatures ** capsfeatures,
+    guint64 * modifier)
 {
-  GstCaps *peer_caps, *preferred_caps = NULL;
+  GstCaps *peer_caps, *allowed_caps;
   GstCapsFeatures *features;
-  GstStructure *structure;
-  guint num_structures, i;
+  guint num_structures, i, j;
   gboolean is_any;
+  /* array designators might not be supported by some compilers */
+  const GQuark feats = {
+    /* VA = */ g_quark_from_string (GST_CAPS_FEATURE_MEMORY_VA),
+    /* DMABUF = */ g_quark_from_string (GST_CAPS_FEATURE_MEMORY_DMABUF),
+    /* SYSMEM = */
+    g_quark_from_string (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY),
+  };
 
   g_return_if_fail (base);
 
@@ -857,68 +867,70 @@
     gst_clear_caps (&peer_caps);
   }
 
-  peer_caps = gst_pad_get_allowed_caps (GST_VIDEO_DECODER_SRC_PAD (base));
-  GST_DEBUG_OBJECT (base, "Allowed caps %" GST_PTR_FORMAT, peer_caps);
-
-  /* prefer memory:VASurface over other caps features */
-  num_structures = gst_caps_get_size (peer_caps);
-  for (i = 0; i < num_structures; i++) {
-    features = gst_caps_get_features (peer_caps, i);
-    structure = gst_caps_get_structure (peer_caps, i);
-
-    if (gst_caps_features_is_any (features))
-      continue;
+  allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_DECODER_SRC_PAD (base));
+  GST_DEBUG_OBJECT (base, "Allowed caps %" GST_PTR_FORMAT, allowed_caps);
+
+  /* if peer caps is any, returns format according memory to system caps in
+   * allowed caps
+   *
+   * if downstream doesn't support system memory negotiation will fail later.
+   */
+  if (is_any) {
+    GstVideoFormat fmt =
+        _caps_video_format_from_chroma (allowed_caps, base->rt_format);
+    features = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
 
-    if (gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_VA)) {
-      preferred_caps = gst_caps_new_full (gst_structure_copy (structure), NULL);
-      gst_caps_set_features_simple (preferred_caps,
-          gst_caps_features_copy (features));
-      break;
-    }
+    if (format)
+      *format = fmt;
+    if (capsfeatures && fmt != GST_VIDEO_FORMAT_UNKNOWN)
+      *capsfeatures = gst_caps_features_copy (features);
+    goto bail;
   }
 
-  if (!preferred_caps)
-    preferred_caps = peer_caps;
-  else
-    gst_clear_caps (&peer_caps);
+  /* iterate allowed caps to find the first "capable" capability according our
+   * ordered list of preferred caps features */
+  num_structures = gst_caps_get_size (allowed_caps);
+  for (i = 0; i < G_N_ELEMENTS (feats); i++) {
+    for (j = 0; j < num_structures; j++) {
+      GstStructure *structure;
+      const GValue *formats;
+      GstVideoFormat fmt;
+      guint64 mod = 0;
+
+      features = gst_caps_get_features (allowed_caps, j);
+      if (!gst_caps_features_contains_id (features, featsi))
+        continue;
 
-  if (gst_caps_is_empty (preferred_caps)) {
-    if (capsfeatures)
-      *capsfeatures = NULL;     /* system memory */
-    if (format) {
-      *format = _default_video_format_from_chroma (base,
-          GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY, base->rt_format);
-    }
-    goto bail;
-  }
+      structure = gst_caps_get_structure (allowed_caps, j);
+      if (i == DMABUF)
+        formats = gst_structure_get_value (structure, "drm-format");
+      else
+        formats = gst_structure_get_value (structure, "format");
 
-  /* Use the first structure/feature is caps because is the
-   * "preferred" one */
-  features = gst_caps_get_features (preferred_caps, 0);
-  if (!features) {
-    features = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
-  } else if (is_any
-      && !gst_caps_features_is_equal (features,
-          GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)
-      && !_downstream_has_video_meta (base, preferred_caps)) {
-    GST_INFO_OBJECT (base, "Downstream reports ANY caps but without"
-        " VideoMeta support; fallback to system memory.");
-    features = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
-  }
+      fmt = _find_video_format_from_chroma (formats, base->rt_format,
+          i == DMABUF, &mod);
 
+      /* if doesn't found a proper format let's try other structure */
+      if (fmt == GST_VIDEO_FORMAT_UNKNOWN)
+        continue;
 
-  if (capsfeatures)
-    *capsfeatures = gst_caps_features_copy (features);
+      if (format)
+        *format = fmt;
+      if (i == DMABUF && modifier)
+        *modifier = mod;
+      if (capsfeatures)
+        *capsfeatures = gst_caps_features_new_id (featsi, NULL);
 
-  /* Use the format from chroma and available format for selected
-   * capsfeature */
-  if (format) {
-    *format = _default_video_format_from_chroma (base, features,
-        base->rt_format);
+      goto bail;
+    }
   }
 
+  /* no matching format, let's fail */
+  if (i == G_N_ELEMENTS (feats))
+    *format = GST_VIDEO_FORMAT_UNKNOWN;
+
 bail:
-  gst_clear_caps (&preferred_caps);
+  gst_caps_unref (allowed_caps);
 }
 
 static gboolean
@@ -1066,19 +1078,13 @@
   GstVideoDecoder *vdec = GST_VIDEO_DECODER (base);
 
   if (input_state) {
-
-    g_assert (GST_VIDEO_INFO_WIDTH (&input_state->info) ==
-        GST_VIDEO_INFO_WIDTH (&base->input_state->info)
-        && GST_VIDEO_INFO_HEIGHT (&input_state->info) ==
-        GST_VIDEO_INFO_HEIGHT (&input_state->info));
-
     g_clear_pointer (&base->input_state, gst_video_codec_state_unref);
     base->input_state = gst_video_codec_state_ref (input_state);
 
     base->need_negotiation = TRUE;
     if (!gst_video_decoder_negotiate (vdec)) {
       GST_ERROR_OBJECT (base, "Could not re-negotiate with updated state");
-      return GST_FLOW_ERROR;
+      return FALSE;
     }
   }
 
@@ -1124,6 +1130,7 @@
 {
   GstVideoDecoder *decoder = GST_VIDEO_DECODER (base);
   GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
+  guint64 modifier;
   GstCapsFeatures *capsfeatures = NULL;
   GstVideoInfo *info = &base->output_info;
 
@@ -1131,7 +1138,7 @@
     gst_video_codec_state_unref (base->output_state);
 
   gst_va_base_dec_get_preferred_format_and_caps_features (base, &format,
-      &capsfeatures);
+      &capsfeatures, &modifier);
   if (format == GST_VIDEO_FORMAT_UNKNOWN)
     return FALSE;
 
@@ -1141,7 +1148,15 @@
       GST_VIDEO_INFO_HEIGHT (info), base->input_state);
 
   /* set caps feature */
-  base->output_state->caps = gst_video_info_to_caps (&base->output_state->info);
+  if (capsfeatures && gst_caps_features_contains (capsfeatures,
+          GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+    base->output_state->caps =
+        gst_va_video_info_to_dma_caps (&base->output_state->info, modifier);
+  } else {
+    base->output_state->caps =
+        gst_video_info_to_caps (&base->output_state->info);
+  }
+
   if (capsfeatures)
     gst_caps_set_features_simple (base->output_state->caps, capsfeatures);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvabasedec.h -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvabasedec.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvabaseenc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvabaseenc.c Changed

@@ -22,9 +22,12 @@
 
 #include <gst/va/gstva.h>
 #include <gst/va/vasurfaceimage.h>
+#include <gst/va/gstvavideoformat.h>
 
 #include "vacompat.h"
+#include "gstvabase.h"
 #include "gstvacaps.h"
+#include "gstvapluginutils.h"
 
 #define GST_CAT_DEFAULT gst_va_base_enc_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
@@ -58,6 +61,8 @@
         "vabaseenc", 0, "vabaseenc element"););
 /* *INDENT-ON* */
 
+extern GRecMutex GST_VA_SHARED_LOCK;
+
 static void
 gst_va_base_enc_reset_state_default (GstVaBaseEnc * base)
 {
@@ -120,17 +125,8 @@
 
   gst_va_base_enc_reset_state (base);
 
-  base->input_frame_count = 0;
-  base->output_frame_count = 0;
-
   base->input_state = NULL;
 
-  /* Set the minimum pts to some huge value (1000 hours). This keeps
-   * the dts at the start of the stream from needing to be
-   * negative. */
-  base->start_pts = GST_SECOND * 60 * 60 * 1000;
-  gst_video_encoder_set_min_pts (venc, base->start_pts);
-
   return TRUE;
 }
 
@@ -191,11 +187,12 @@
 }
 
 static GstBufferPool *
-_get_sinkpad_pool (GstVaBaseEnc * base)
+_get_sinkpad_pool (GstElement * element, gpointer data)
 {
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (element);
   GstAllocator *allocator;
   GstAllocationParams params = { 0, };
-  guint size, usage_hint = 0;
+  guint usage_hint;
   GArray *surface_formats = NULL;
   GstCaps *caps = NULL;
 
@@ -204,19 +201,24 @@
 
   g_assert (base->input_state);
   caps = gst_caps_copy (base->input_state->caps);
-  gst_caps_set_features_simple (caps,
-      gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_VA));
 
-  gst_allocation_params_init (&params);
+  if (!gst_va_base_convert_caps_to_va (caps)) {
+    GST_ERROR_OBJECT (base, "Invalid caps %" GST_PTR_FORMAT, caps);
+    gst_caps_unref (caps);
+    return NULL;
+  }
 
-  size = GST_VIDEO_INFO_SIZE (&base->input_state->info);
+  gst_allocation_params_init (&params);
 
   surface_formats = gst_va_encoder_get_surface_formats (base->encoder);
 
   allocator = gst_va_allocator_new (base->display, surface_formats);
 
-  base->priv->raw_pool = gst_va_pool_new_with_config (caps, size, 1, 0,
-      usage_hint, GST_VA_FEATURE_AUTO, allocator, &params);
+  usage_hint = va_get_surface_usage_hint (base->display,
+      VAEntrypointEncSlice, GST_PAD_SINK, FALSE);
+
+  base->priv->raw_pool = gst_va_pool_new_with_config (caps, 1, 0, usage_hint,
+      GST_VA_FEATURE_AUTO, allocator, &params);
   gst_clear_caps (&caps);
 
   if (!base->priv->raw_pool) {
@@ -237,89 +239,31 @@
   return base->priv->raw_pool;
 }
 
-static gboolean
-_try_import_buffer (GstVaBaseEnc * base, GstBuffer * inbuf)
-{
-  VASurfaceID surface;
-
-  /* The VA buffer. */
-  surface = gst_va_buffer_get_surface (inbuf);
-  if (surface != VA_INVALID_ID &&
-      (gst_va_buffer_peek_display (inbuf) == base->display))
-    return TRUE;
-
-  /* TODO: DMA buffer. */
-
-  return FALSE;
-}
-
 static GstFlowReturn
 gst_va_base_enc_import_input_buffer (GstVaBaseEnc * base,
     GstBuffer * inbuf, GstBuffer ** buf)
 {
-  GstBuffer *buffer = NULL;
-  GstBufferPool *pool;
-  GstFlowReturn ret;
-  GstVideoFrame in_frame, out_frame;
-  gboolean imported, copied;
-
-  imported = _try_import_buffer (base, inbuf);
-  if (imported) {
-    *buf = gst_buffer_ref (inbuf);
-    return GST_FLOW_OK;
-  }
-
-  /* input buffer doesn't come from a vapool, thus it is required to
-   * have a pool, grab from it a new buffer and copy the input
-   * buffer to the new one */
-  if (!(pool = _get_sinkpad_pool (base)))
-    return GST_FLOW_ERROR;
-
-  ret = gst_buffer_pool_acquire_buffer (pool, &buffer, NULL);
-  if (ret != GST_FLOW_OK)
-    return ret;
-
-  GST_LOG_OBJECT (base, "copying input frame");
-
-  if (!gst_video_frame_map (&in_frame, &base->input_state->info,
-          inbuf, GST_MAP_READ))
-    goto invalid_buffer;
-  if (!gst_video_frame_map (&out_frame, &base->priv->sinkpad_info, buffer,
-          GST_MAP_WRITE)) {
-    gst_video_frame_unmap (&in_frame);
-    goto invalid_buffer;
-  }
-
-  copied = gst_video_frame_copy (&out_frame, &in_frame);
-
-  gst_video_frame_unmap (&out_frame);
-  gst_video_frame_unmap (&in_frame);
-
-  if (!copied)
-    goto invalid_buffer;
-
-  /* strictly speaking this is not needed but let's play safe */
-  if (!gst_buffer_copy_into (buffer, inbuf, GST_BUFFER_COPY_FLAGS |
-          GST_BUFFER_COPY_TIMESTAMPS, 0, -1))
-    return GST_FLOW_ERROR;
-
-  *buf = buffer;
+  GstVaBufferImporter importer = {
+    .element = GST_ELEMENT_CAST (base),
+#ifndef GST_DISABLE_GST_DEBUG
+    .debug_category = GST_CAT_DEFAULT,
+#endif
+    .display = base->display,
+    .entrypoint = GST_VA_BASE_ENC_ENTRYPOINT (base),
+    .in_drm_info = &base->in_drm_info,
+    .sinkpad_info = &base->priv->sinkpad_info,
+    .get_sinkpad_pool = _get_sinkpad_pool,
+  };
 
-  return GST_FLOW_OK;
+  g_return_val_if_fail (GST_IS_VA_BASE_ENC (base), GST_FLOW_ERROR);
 
-invalid_buffer:
-  {
-    GST_ELEMENT_WARNING (base, CORE, NOT_IMPLEMENTED, (NULL),
-        ("invalid video buffer received"));
-    if (buffer)
-      gst_buffer_unref (buffer);
-    return GST_FLOW_ERROR;
-  }
+  return gst_va_buffer_importer_import (&importer, inbuf, buf);
 }
 
-static GstBuffer *
+GstBuffer *
 gst_va_base_enc_create_output_buffer (GstVaBaseEnc * base,
-    GstVaEncodePicture * picture)
+    GstVaEncodePicture * picture, const guint8 * prefix_data,
+    guint prefix_data_len)
 {
   guint coded_size;
   goffset offset;
@@ -334,7 +278,7 @@
 
   seg_list = NULL;
   if (!va_map_buffer (base->display, picture->coded_buffer,
-          (gpointer *) & seg_list))
+          GST_MAP_READ, (gpointer *) & seg_list))
     goto error;
 
   if (!seg_list) {
@@ -348,7 +292,7 @@
     coded_size += seg->size;
 
   buf = gst_video_encoder_allocate_output_buffer (GST_VIDEO_ENCODER_CAST (base),
-      coded_size);
+      coded_size + prefix_data_len);
   if (!buf) {
     va_unmap_buffer (base->display, picture->coded_buffer);
     GST_ERROR_OBJECT (base, "Failed to allocate output buffer, size %d",
@@ -357,6 +301,12 @@
   }
 
   offset = 0;
+  if (prefix_data) {
+    g_assert (prefix_data_len > 0);
+    gst_buffer_fill (buf, offset, prefix_data, prefix_data_len);
+    offset += prefix_data_len;
+  }
+
   for (seg = seg_list; seg; seg = seg->next) {
     gsize write_size;
 
@@ -378,6 +328,53 @@
   return NULL;
 }
 
+/* Return 0 means error and -1 means not enough data. */
+gint
+gst_va_base_enc_copy_output_data (GstVaBaseEnc * base,
+    GstVaEncodePicture * picture, guint8 * data, gint size)
+{
+  guint coded_size;
+  VASurfaceID surface;
+  VACodedBufferSegment *seg, *seg_list;
+  gint ret_sz = 0;
+
+  /* Wait for encoding to finish */
+  surface = gst_va_encode_picture_get_raw_surface (picture);
+  if (!va_sync_surface (base->display, surface))
+    goto out;
+
+  seg_list = NULL;
+  if (!va_map_buffer (base->display, picture->coded_buffer,
+          GST_MAP_READ, (gpointer *) & seg_list))
+    goto out;
+
+  if (!seg_list) {
+    va_unmap_buffer (base->display, picture->coded_buffer);
+    GST_WARNING_OBJECT (base, "coded buffer has no segment list");
+    goto out;
+  }
+
+  coded_size = 0;
+  for (seg = seg_list; seg; seg = seg->next)
+    coded_size += seg->size;
+
+  if (coded_size > size) {
+    GST_DEBUG_OBJECT (base, "Not enough space for coded data");
+    ret_sz = -1;
+    goto out;
+  }
+
+  for (seg = seg_list; seg; seg = seg->next) {
+    memcpy (data + ret_sz, seg->buf, seg->size);
+    ret_sz += seg->size;
+  }
+
+  va_unmap_buffer (base->display, picture->coded_buffer);
+
+out:
+  return ret_sz;
+}
+
 static GstAllocator *
 _allocator_from_caps (GstVaBaseEnc * base, GstCaps * caps)
 {
@@ -402,35 +399,33 @@
   GstAllocationParams params = { 0, };
   GstBufferPool *pool;
   GstCaps *caps;
-  GstVideoInfo info;
   gboolean need_pool = FALSE;
-  guint size, usage_hint = 0;
+  guint size = 0, usage_hint;
 
   gst_query_parse_allocation (query, &caps, &need_pool);
   if (!caps)
     return FALSE;
 
-  if (!gst_video_info_from_caps (&info, caps)) {
-    GST_ERROR_OBJECT (base, "Cannot parse caps %" GST_PTR_FORMAT, caps);
-    return FALSE;
-  }
-
-  size = GST_VIDEO_INFO_SIZE (&info);
+  usage_hint = va_get_surface_usage_hint (base->display,
+      VAEntrypointEncSlice, GST_PAD_SINK, gst_video_is_dma_drm_caps (caps));
 
   gst_allocation_params_init (&params);
 
   if (!(allocator = _allocator_from_caps (base, caps)))
     return FALSE;
 
-  pool = gst_va_pool_new_with_config (caps, size, 1, 0, usage_hint,
+  pool = gst_va_pool_new_with_config (caps, 1, 0, usage_hint,
       GST_VA_FEATURE_AUTO, allocator, &params);
   if (!pool) {
     gst_object_unref (allocator);
     goto config_failed;
   }
 
+  if (!gst_va_pool_get_buffer_size (pool, &size))
+    goto config_failed;
+
   gst_query_add_allocation_param (query, allocator, &params);
-  gst_query_add_allocation_pool (query, pool, size, 0, 0);
+  gst_query_add_allocation_pool (query, pool, size, 1, 0);
 
   GST_DEBUG_OBJECT (base,
       "proposing %" GST_PTR_FORMAT " with allocator %" GST_PTR_FORMAT,
@@ -454,37 +449,35 @@
 static GstFlowReturn
 _push_buffer_to_downstream (GstVaBaseEnc * base, GstVideoCodecFrame * frame)
 {
-  GstVaEncodePicture *enc_picture;
   GstVaBaseEncClass *base_class = GST_VA_BASE_ENC_GET_CLASS (base);
-  GstBuffer *buf;
-
-  if (base_class->prepare_output)
-    base_class->prepare_output (base, frame);
-
-  enc_picture =
-      *((GstVaEncodePicture **) gst_video_codec_frame_get_user_data (frame));
+  GstFlowReturn ret;
+  gboolean complete = TRUE;
 
-  buf = gst_va_base_enc_create_output_buffer (base, enc_picture);
-  if (!buf) {
-    GST_ERROR_OBJECT (base, "Failed to create output buffer");
+  if (!base_class->prepare_output (base, frame, &complete)) {
+    GST_ERROR_OBJECT (base, "Failed to prepare output");
     goto error;
   }
 
-  gst_buffer_replace (&frame->output_buffer, buf);
-  gst_clear_buffer (&buf);
+  if (frame->output_buffer)
+    GST_LOG_OBJECT (base, "Push to downstream: frame system_frame_number: %d,"
+        " pts: %" GST_TIME_FORMAT ", dts: %" GST_TIME_FORMAT
+        " duration: %" GST_TIME_FORMAT ", buffer size: %" G_GSIZE_FORMAT,
+        frame->system_frame_number, GST_TIME_ARGS (frame->pts),
+        GST_TIME_ARGS (frame->dts), GST_TIME_ARGS (frame->duration),
+        gst_buffer_get_size (frame->output_buffer));
 
-  GST_LOG_OBJECT (base, "Push to downstream: frame system_frame_number: %d,"
-      " pts: %" GST_TIME_FORMAT ", dts: %" GST_TIME_FORMAT
-      " duration: %" GST_TIME_FORMAT ", buffer size: %" G_GSIZE_FORMAT,
-      frame->system_frame_number, GST_TIME_ARGS (frame->pts),
-      GST_TIME_ARGS (frame->dts), GST_TIME_ARGS (frame->duration),
-      gst_buffer_get_size (frame->output_buffer));
+  if (complete) {
+    ret = gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (base), frame);
+  } else {
+    /* Allow to output later and no data here. */
+    g_assert (!frame->output_buffer);
+    ret = GST_FLOW_OK;
+  }
 
-  return gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (base), frame);
+  return ret;
 
 error:
   gst_clear_buffer (&frame->output_buffer);
-  gst_clear_buffer (&buf);
   gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (base), frame);
 
   return GST_FLOW_ERROR;
@@ -564,6 +557,8 @@
   g_queue_clear_full (&base->ref_list,
       (GDestroyNotify) gst_video_codec_frame_unref);
 
+  gst_queue_array_clear (base->dts_queue);
+
   return GST_FLOW_OK;
 
 error_and_purge_all:
@@ -598,6 +593,8 @@
   g_queue_clear_full (&base->ref_list,
       (GDestroyNotify) gst_video_codec_frame_unref);
 
+  gst_queue_array_clear (base->dts_queue);
+
   return ret;
 }
 
@@ -635,8 +632,10 @@
       GST_TIME_ARGS (GST_BUFFER_PTS (frame->input_buffer)));
 
   if (g_atomic_int_compare_and_exchange (&base->reconf, TRUE, FALSE)) {
-    if (!gst_va_base_enc_reset (base))
+    if (!gst_va_base_enc_reset (base)) {
+      gst_video_encoder_finish_frame (venc, frame);
       return GST_FLOW_ERROR;
+    }
   }
 
   ret = gst_va_base_enc_import_input_buffer (base,
@@ -722,6 +721,19 @@
 
   g_return_val_if_fail (state->caps != NULL, FALSE);
 
+  if (!gst_video_is_dma_drm_caps (state->caps)) {
+    gst_video_info_dma_drm_init (&base->in_drm_info);
+    base->in_info = state->info;
+  } else {
+    GstVideoInfo info;
+
+    if (!gst_video_info_dma_drm_from_caps (&base->in_drm_info, state->caps))
+      return FALSE;
+    if (!gst_va_dma_drm_info_to_video_info (&base->in_drm_info, &info))
+      return FALSE;
+    base->in_info = info;
+  }
+
   if (base->input_state)
     gst_video_codec_state_unref (base->input_state);
   base->input_state = gst_video_codec_state_ref (state);
@@ -736,7 +748,12 @@
 static gboolean
 gst_va_base_enc_flush (GstVideoEncoder * venc)
 {
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (venc);
+
   _flush_all_frames (GST_VA_BASE_ENC (venc));
+
+  gst_queue_array_clear (base->dts_queue);
+
   return TRUE;
 }
 
@@ -848,14 +865,17 @@
     GValue * value, GParamSpec * pspec)
 {
   GstVaBaseEnc *base = GST_VA_BASE_ENC (object);
+  GstVaBaseEncClass *klass = GST_VA_BASE_ENC_GET_CLASS (base);
 
   switch (prop_id) {
     case PROP_DEVICE_PATH:{
-      if (!(base->display && GST_IS_VA_DISPLAY_DRM (base->display))) {
+      if (!base->display)
+        g_value_set_string (value, klass->render_device_path);
+      else if (GST_IS_VA_DISPLAY_PLATFORM (base->display))
+        g_object_get_property (G_OBJECT (base->display), "path", value);
+      else
         g_value_set_string (value, NULL);
-        return;
-      }
-      g_object_get_property (G_OBJECT (base->display), "path", value);
+
       break;
     }
     default:
@@ -869,6 +889,9 @@
   g_queue_init (&self->reorder_list);
   g_queue_init (&self->ref_list);
   g_queue_init (&self->output_list);
+  gst_video_info_init (&self->in_info);
+
+  self->dts_queue = gst_queue_array_new_for_struct (sizeof (GstClockTime), 8);
 
   self->priv = gst_va_base_enc_get_instance_private (self);
 }
@@ -876,8 +899,11 @@
 static void
 gst_va_base_enc_dispose (GObject * object)
 {
+  GstVaBaseEnc *base = GST_VA_BASE_ENC (object);
+
   _flush_all_frames (GST_VA_BASE_ENC (object));
   gst_va_base_enc_close (GST_VIDEO_ENCODER (object));
+  g_clear_pointer (&base->dts_queue, gst_queue_array_free);
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
@@ -917,8 +943,8 @@
    * It shows the DRM device path used for the VA operation, if any.
    */
   propertiesPROP_DEVICE_PATH = g_param_spec_string ("device-path",
-      "Device Path", "DRM device path", NULL,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+      "Device Path", GST_VA_DEVICE_PATH_PROP_DESC, NULL,
+      GST_PARAM_DOC_SHOW_DEFAULT | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (gobject_class, N_PROPERTIES, properties);
 
@@ -1011,8 +1037,8 @@
     /* denominator = framerate >> 16 & 0xffff;
      * numerator   = framerate & 0xffff; */
     .fr.framerate =
-        (GST_VIDEO_INFO_FPS_N (&base->input_state->info) & 0xffff) |
-        ((GST_VIDEO_INFO_FPS_D (&base->input_state->info) & 0xffff) << 16)
+        (GST_VIDEO_INFO_FPS_N (&base->in_info) & 0xffff) |
+        ((GST_VIDEO_INFO_FPS_D (&base->in_info) & 0xffff) << 16)
   };
   /* *INDENT-ON* */
 
@@ -1114,6 +1140,48 @@
 }
 
 void
+gst_va_base_enc_push_dts (GstVaBaseEnc * base,
+    GstVideoCodecFrame * frame, guint max_reorder_num)
+{
+  /* We need to manually insert max_reorder_num slots before the
+     first frame to ensure DTS never bigger than PTS. */
+  if (gst_queue_array_get_length (base->dts_queue) == 0 && max_reorder_num > 0) {
+    GstClockTime dts_diff = 0, dts;
+
+    if (GST_CLOCK_TIME_IS_VALID (frame->duration))
+      dts_diff = frame->duration;
+
+    if (GST_CLOCK_TIME_IS_VALID (base->frame_duration))
+      dts_diff = MAX (base->frame_duration, dts_diff);
+
+    while (max_reorder_num > 0) {
+      if (GST_CLOCK_TIME_IS_VALID (frame->pts)) {
+        dts = frame->pts - dts_diff * max_reorder_num;
+      } else {
+        dts = frame->pts;
+      }
+
+      gst_queue_array_push_tail_struct (base->dts_queue, &dts);
+      max_reorder_num--;
+    }
+  }
+
+  gst_queue_array_push_tail_struct (base->dts_queue, &frame->pts);
+}
+
+GstClockTime
+gst_va_base_enc_pop_dts (GstVaBaseEnc * base)
+{
+  GstClockTime dts;
+
+  g_return_val_if_fail (gst_queue_array_get_length (base->dts_queue) > 0,
+      GST_CLOCK_TIME_NONE);
+
+  dts = *((GstClockTime *) gst_queue_array_pop_head_struct (base->dts_queue));
+  return dts;
+}
+
+void
 gst_va_base_enc_reset_state (GstVaBaseEnc * base)
 {
   GstVaBaseEncClass *klass = GST_VA_BASE_ENC_GET_CLASS (base);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvabaseenc.h -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvabaseenc.h Changed

@@ -23,6 +23,7 @@
 #include "gstvadevice.h"
 #include "gstvaencoder.h"
 #include "gstvaprofile.h"
+#include <gst/base/gstqueuearray.h>
 
 G_BEGIN_DECLS
 
@@ -56,15 +57,17 @@
 
   GstClockTime start_pts;
   GstClockTime frame_duration;
-  /* Total frames we handled since reconfig. */
-  guint input_frame_count;
-  guint output_frame_count;
 
   GQueue reorder_list;
   GQueue ref_list;
   GQueue output_list;
+  GstQueueArray *dts_queue;
 
   GstVideoCodecState *input_state;
+  union {
+    GstVideoInfo in_info;
+    GstVideoInfoDmaDrm in_drm_info;
+  };
 
   /*< private >*/
   GstVaBaseEncPrivate *priv;
@@ -87,8 +90,9 @@
   GstFlowReturn (*encode_frame) (GstVaBaseEnc * encoder,
                                  GstVideoCodecFrame * frame,
                                  gboolean is_last);
-  void     (*prepare_output) (GstVaBaseEnc * encoder,
-                              GstVideoCodecFrame * frame);
+  gboolean (*prepare_output) (GstVaBaseEnc * encoder,
+                              GstVideoCodecFrame * frame,
+                              gboolean * complete);
 
   GstVaCodecs codec;
   VAEntrypoint entrypoint;
@@ -132,7 +136,18 @@
 void                  gst_va_base_enc_add_codec_tag       (GstVaBaseEnc * base,
                                                            const gchar * codec_name);
 void                  gst_va_base_enc_reset_state         (GstVaBaseEnc * base);
-
+GstBuffer *           gst_va_base_enc_create_output_buffer (GstVaBaseEnc * base,
+                                                            GstVaEncodePicture * picture,
+                                                            const guint8 * prefix_data,
+                                                            guint prefix_data_len);
+gint                  gst_va_base_enc_copy_output_data    (GstVaBaseEnc * base,
+                                                           GstVaEncodePicture * picture,
+                                                           guint8 * data,
+                                                           gint size);
+void                  gst_va_base_enc_push_dts            (GstVaBaseEnc * base,
+                                                           GstVideoCodecFrame * frame,
+                                                           guint max_reorder_num);
+GstClockTime          gst_va_base_enc_pop_dts             (GstVaBaseEnc * base);
 void                  gst_va_base_enc_update_property_uint (GstVaBaseEnc * base,
                                                             guint32 * old_val,
                                                             guint32 new_val,

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvabasetransform.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvabasetransform.c Changed

@@ -25,8 +25,12 @@
 #include "gstvabasetransform.h"
 
 #include <gst/va/gstva.h>
+#include <gst/va/gstvavideoformat.h>
+#include <gst/va/vasurfaceimage.h>
 
+#include "gstvabase.h"
 #include "gstvacaps.h"
+#include "gstvapluginutils.h"
 
 #define GST_CAT_DEFAULT gst_va_base_transform_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
@@ -39,6 +43,15 @@
 
 static GParamSpec *propertiesN_PROPERTIES;
 
+#define META_TAG_COLORSPACE meta_tag_colorspace_quark
+static GQuark meta_tag_colorspace_quark;
+#define META_TAG_SIZE meta_tag_size_quark
+static GQuark meta_tag_size_quark;
+#define META_TAG_ORIENTATION meta_tag_orientation_quark
+static GQuark meta_tag_orientation_quark;
+#define META_TAG_VIDEO meta_tag_video_quark
+static GQuark meta_tag_video_quark;
+
 struct _GstVaBaseTransformPrivate
 {
   GstVideoInfo srcpad_info;
@@ -48,6 +61,8 @@
   GstCaps *sinkpad_caps;
   GstVideoInfo sinkpad_info;
   GstBufferPool *sinkpad_pool;
+  guint uncropped_width;
+  guint uncropped_height;
 
   GstCaps *filter_caps;
 };
@@ -66,21 +81,22 @@
         "vabasetransform", 0, "vabasetransform element");
     );
 
-extern GRecMutex GST_VA_SHARED_LOCK;
-
 static void
 gst_va_base_transform_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec)
 {
   GstVaBaseTransform *self = GST_VA_BASE_TRANSFORM (object);
+  GstVaBaseTransformClass *klass = GST_VA_BASE_TRANSFORM_GET_CLASS (self);
 
   switch (prop_id) {
     case PROP_DEVICE_PATH:{
-      if (!(self->display && GST_IS_VA_DISPLAY_DRM (self->display))) {
+      if (!self->display)
+        g_value_set_string (value, klass->render_device_path);
+      else if (GST_IS_VA_DISPLAY_PLATFORM (self->display))
+        g_object_get_property (G_OBJECT (self->display), "path", value);
+      else
         g_value_set_string (value, NULL);
-        return;
-      }
-      g_object_get_property (G_OBJECT (self->display), "path", value);
+
       break;
     }
     default:
@@ -162,11 +178,19 @@
   gboolean res;
 
   /* input caps */
-  if (!gst_video_info_from_caps (&in_info, incaps))
-    goto invalid_caps;
+  if (!gst_video_is_dma_drm_caps (incaps)) {
+    gst_video_info_dma_drm_init (&self->in_drm_info);
+    if (!gst_video_info_from_caps (&in_info, incaps))
+      goto invalid_caps;
+  } else {
+    if (!gst_video_info_dma_drm_from_caps (&self->in_drm_info, incaps))
+      goto invalid_caps;
+    if (!gst_va_dma_drm_info_to_video_info (&self->in_drm_info, &in_info))
+      goto invalid_caps;
+  }
 
   /* output caps */
-  if (!gst_video_info_from_caps (&out_info, outcaps))
+  if (!gst_va_video_info_from_caps (&out_info, NULL, outcaps))
     goto invalid_caps;
 
   fclass = GST_VA_BASE_TRANSFORM_GET_CLASS (self);
@@ -216,11 +240,8 @@
   GstAllocationParams params = { 0, };
   GstBufferPool *pool;
   GstCaps *caps;
-  GstVideoInfo info;
   gboolean update_allocator = FALSE;
-  guint size, usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC;        /* it migth be
-                                                                         * used by a va
-                                                                         * decoder */
+  guint size, usage_hint;
 
   gst_clear_caps (&self->priv->sinkpad_caps);
 
@@ -238,12 +259,9 @@
   gst_query_parse_allocation (query, &caps, NULL);
   if (!caps)
     return FALSE;
-  if (!gst_video_info_from_caps (&info, caps)) {
-    GST_ERROR_OBJECT (self, "Cannot parse caps %" GST_PTR_FORMAT, caps);
-    return FALSE;
-  }
 
-  size = GST_VIDEO_INFO_SIZE (&info);
+  usage_hint = va_get_surface_usage_hint (self->display,
+      VAEntrypointVideoProc, GST_PAD_SINK, gst_video_is_dma_drm_caps (caps));
 
   if (gst_query_get_n_allocation_params (query) > 0) {
     gst_query_parse_nth_allocation_param (query, 0, &allocator, &params);
@@ -260,8 +278,8 @@
       return FALSE;
   }
 
-  pool = gst_va_pool_new_with_config (caps, size, 1 + self->extra_min_buffers,
-      0, usage_hint, GST_VA_FEATURE_AUTO, allocator, &params);
+  pool = gst_va_pool_new_with_config (caps, 1 + self->extra_min_buffers, 0,
+      usage_hint, GST_VA_FEATURE_AUTO, allocator, &params);
   if (!pool) {
     gst_object_unref (allocator);
     goto config_failed;
@@ -272,6 +290,9 @@
   else
     gst_query_add_allocation_param (query, allocator, &params);
 
+  if (!gst_va_pool_get_buffer_size (pool, &size))
+    goto config_failed;
+
   gst_query_add_allocation_pool (query, pool, size, 1 + self->extra_min_buffers,
       0);
 
@@ -296,25 +317,6 @@
   }
 }
 
-static GstBufferPool *
-_create_other_pool (GstAllocator * allocator,
-    GstAllocationParams * params, GstCaps * caps, guint size)
-{
-  GstBufferPool *pool = NULL;
-  GstStructure *config;
-
-  pool = gst_video_buffer_pool_new ();
-  config = gst_buffer_pool_get_config (pool);
-
-  gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
-  gst_buffer_pool_config_set_allocator (config, allocator, params);
-  if (!gst_buffer_pool_set_config (pool, config)) {
-    gst_clear_object (&pool);
-  }
-
-  return pool;
-}
-
 /* configure the allocation query that was answered downstream, we can
  * configure some properties on it. Only it's called when not in
  * passthrough mode. */
@@ -328,18 +330,19 @@
   GstBufferPool *pool = NULL, *other_pool = NULL;
   GstCaps *outcaps = NULL;
   GstStructure *config;
-  GstVideoInfo vinfo;
-  guint min, max, size = 0, usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_VPP_WRITE;
+  guint min, max, other_size = 0, size = 0, usage_hint;
   gboolean update_pool, update_allocator, has_videometa, copy_frames;
   gboolean dont_use_other_pool = FALSE;
 
   gst_query_parse_allocation (query, &outcaps, NULL);
+  if (!outcaps)
+    return FALSE;
 
-  gst_allocation_params_init (&other_params);
-  gst_allocation_params_init (&params);
-
-  if (!gst_video_info_from_caps (&vinfo, outcaps)) {
-    GST_ERROR_OBJECT (self, "Cannot parse caps %" GST_PTR_FORMAT, outcaps);
+  has_videometa = gst_query_find_allocation_meta (query,
+      GST_VIDEO_META_API_TYPE, NULL);
+  if (gst_video_is_dma_drm_caps (outcaps) && !has_videometa) {
+    GST_ERROR_OBJECT (trans,
+        "DMABuf caps negotiated without the mandatory support of VideoMeta ");
     return FALSE;
   }
 
@@ -372,6 +375,7 @@
             "may need other pool for copy frames %" GST_PTR_FORMAT, pool);
         other_pool = pool;
         pool = NULL;
+        other_size = size;
       } else if (dont_use_other_pool) {
         gst_clear_object (&pool);
       }
@@ -379,40 +383,39 @@
 
     update_pool = TRUE;
   } else {
-    size = GST_VIDEO_INFO_SIZE (&vinfo);
     min = 1;
     max = 0;
     update_pool = FALSE;
   }
 
   if (!allocator) {
-    /* XXX(victor): USAGE_HINT_VPP_WRITE creates tiled dmabuf frames
-     * in iHD */
-    if (gst_caps_is_dmabuf (outcaps) && GST_VIDEO_INFO_IS_RGB (&vinfo))
-      usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC;
     if (!(allocator =
             gst_va_base_transform_allocator_from_caps (self, outcaps)))
-      return FALSE;
+      goto bail;
   }
 
   if (!pool)
     pool = gst_va_pool_new ();
 
+  usage_hint = va_get_surface_usage_hint (self->display,
+      VAEntrypointVideoProc, GST_PAD_SRC, gst_video_is_dma_drm_caps (outcaps));
+
   config = gst_buffer_pool_get_config (pool);
   gst_buffer_pool_config_set_allocator (config, allocator, &params);
   gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
-  gst_buffer_pool_config_set_params (config, outcaps, size, min, max);
+  gst_buffer_pool_config_set_params (config, outcaps, 0, min, max);
   gst_buffer_pool_config_set_va_allocation_params (config, usage_hint,
       GST_VA_FEATURE_AUTO);
-  if (!gst_buffer_pool_set_config (pool, config)) {
-    gst_object_unref (allocator);
-    gst_object_unref (pool);
-    return FALSE;
-  }
+  if (!gst_buffer_pool_set_config (pool, config))
+    goto bail;
+  if (!gst_va_pool_get_buffer_size (pool, &size))
+    goto bail;
 
   if (GST_IS_VA_DMABUF_ALLOCATOR (allocator)) {
-    gst_va_dmabuf_allocator_get_format (allocator, &self->priv->srcpad_info,
-        NULL);
+    GstVideoInfoDmaDrm dma_info;
+
+    gst_va_dmabuf_allocator_get_format (allocator, &dma_info, NULL);
+    self->priv->srcpad_info = dma_info.vinfo;
   } else if (GST_IS_VA_ALLOCATOR (allocator)) {
     gst_va_allocator_get_format (allocator, &self->priv->srcpad_info, NULL,
         NULL);
@@ -428,9 +431,6 @@
   else
     gst_query_add_allocation_pool (query, pool, size, min, max);
 
-  has_videometa = gst_query_find_allocation_meta (query,
-      GST_VIDEO_META_API_TYPE, NULL);
-
   copy_frames = (!has_videometa && gst_va_pool_requires_video_meta (pool)
       && gst_caps_is_raw (outcaps));
   if (copy_frames) {
@@ -438,9 +438,13 @@
       gst_object_replace ((GstObject **) & self->priv->other_pool,
           (GstObject *) other_pool);
     } else {
+      gst_clear_object (&self->priv->other_pool);
       self->priv->other_pool =
-          _create_other_pool (other_allocator, &other_params, outcaps, size);
+          gst_va_create_other_pool (other_allocator, &other_params, outcaps,
+          other_size);
     }
+    if (!self->priv->other_pool)
+      goto bail;
     GST_DEBUG_OBJECT (self, "Use the other pool for copy %" GST_PTR_FORMAT,
         self->priv->other_pool);
   } else {
@@ -460,6 +464,13 @@
   return GST_BASE_TRANSFORM_CLASS (parent_class)->decide_allocation (trans,
       query);
 
+bail:
+  gst_object_unref (allocator);
+  gst_object_unref (pool);
+  gst_clear_object (&other_allocator);
+  gst_clear_object (&other_pool);
+
+  return FALSE;
 }
 
 /* output buffers must be from our VA-based pool, they cannot be
@@ -616,6 +627,15 @@
   GstElementClass *element_class;
   GstBaseTransformClass *trans_class;
 
+#define D(type) \
+  G_PASTE (META_TAG_, type) = \
+    g_quark_from_static_string (G_PASTE (G_PASTE (GST_META_TAG_VIDEO_, type), _STR))
+  D (COLORSPACE);
+  D (SIZE);
+  D (ORIENTATION);
+#undef D
+  META_TAG_VIDEO = g_quark_from_static_string (GST_META_TAG_VIDEO_STR);
+
   gobject_class = G_OBJECT_CLASS (klass);
   element_class = GST_ELEMENT_CLASS (klass);
   trans_class = GST_BASE_TRANSFORM_CLASS (klass);
@@ -647,8 +667,8 @@
    * Since: 1.22
    */
   propertiesPROP_DEVICE_PATH = g_param_spec_string ("device-path",
-      "Device Path", "DRM device path", NULL,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+      "Device Path", GST_VA_DEVICE_PATH_PROP_DESC, NULL,
+      GST_PARAM_DOC_SHOW_DEFAULT | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (gobject_class, N_PROPERTIES, properties);
 
@@ -671,131 +691,104 @@
   return allocator;
 }
 
-static inline gsize
-_get_plane_data_size (GstVideoInfo * info, guint plane)
+static gboolean
+_check_uncropped_size (GstVaBaseTransform * self, GstBuffer * inbuf)
 {
-  gint compGST_VIDEO_MAX_COMPONENTS;
-  gint height, padded_height;
-
-  gst_video_format_info_component (info->finfo, plane, comp);
+  GstVideoCropMeta *crop_meta;
+  GstVideoMeta *video_meta;
 
-  height = GST_VIDEO_INFO_HEIGHT (info);
-  padded_height =
-      GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT (info->finfo, comp0, height);
+  crop_meta = gst_buffer_get_video_crop_meta (inbuf);
+  video_meta = gst_buffer_get_video_meta (inbuf);
 
-  return GST_VIDEO_INFO_PLANE_STRIDE (info, plane) * padded_height;
-}
+  if (!crop_meta) {
+    if (self->priv->uncropped_width > 0 || self->priv->uncropped_height > 0) {
+      self->priv->uncropped_width = 0;
+      self->priv->uncropped_height = 0;
+      return TRUE;
+    }
 
-static gboolean
-_try_import_dmabuf_unlocked (GstVaBaseTransform * self, GstBuffer * inbuf)
-{
-  GstVaBaseTransform *btrans = GST_VA_BASE_TRANSFORM (self);
-  GstVideoMeta *meta;
-  GstVideoInfo in_info = btrans->in_info;
-  GstMemory *memsGST_VIDEO_MAX_PLANES;
-  guint i, n_mem, n_planes;
-  gsize offsetGST_VIDEO_MAX_PLANES;
-  uintptr_t fdGST_VIDEO_MAX_PLANES;
-
-  n_planes = GST_VIDEO_INFO_N_PLANES (&in_info);
-  n_mem = gst_buffer_n_memory (inbuf);
-  meta = gst_buffer_get_video_meta (inbuf);
-
-  /* This will eliminate most non-dmabuf out there */
-  if (!gst_is_dmabuf_memory (gst_buffer_peek_memory (inbuf, 0)))
     return FALSE;
+  }
 
-  /* We cannot have multiple dmabuf per plane */
-  if (n_mem > n_planes)
+  if (!video_meta) {
+    GST_WARNING_OBJECT (self, "The buffer has video crop meta without "
+        "video meta, the cropped result may be wrong.");
+    self->priv->uncropped_width = 0;
+    self->priv->uncropped_height = 0;
     return FALSE;
-
-  /* Update video info based on video meta */
-  if (meta) {
-    GST_VIDEO_INFO_WIDTH (&in_info) = meta->width;
-    GST_VIDEO_INFO_HEIGHT (&in_info) = meta->height;
-
-    for (i = 0; i < meta->n_planes; i++) {
-      GST_VIDEO_INFO_PLANE_OFFSET (&in_info, i) = meta->offseti;
-      GST_VIDEO_INFO_PLANE_STRIDE (&in_info, i) = meta->stridei;
-    }
   }
 
-  /* Find and validate all memories */
-  for (i = 0; i < n_planes; i++) {
-    guint plane_size;
-    guint length;
-    guint mem_idx;
-    gsize mem_skip;
-
-    plane_size = _get_plane_data_size (&in_info, i);
-
-    if (!gst_buffer_find_memory (inbuf, in_info.offseti, plane_size,
-            &mem_idx, &length, &mem_skip))
-      return FALSE;
-
-    /* We can't have more then one dmabuf per plane */
-    if (length != 1)
-      return FALSE;
-
-    memsi = gst_buffer_peek_memory (inbuf, mem_idx);
-
-    /* And all memory found must be dmabuf */
-    if (!gst_is_dmabuf_memory (memsi))
-      return FALSE;
+  if (video_meta->width < crop_meta->x + crop_meta->width ||
+      video_meta->height < crop_meta->y + crop_meta->height) {
+    GST_WARNING_OBJECT (self, "Invalid video meta or crop meta, "
+        "the cropped result may be wrong.");
+    self->priv->uncropped_width = 0;
+    self->priv->uncropped_height = 0;
+    return FALSE;
+  }
 
-    offseti = memsi->offset + mem_skip;
-    fdi = gst_dmabuf_memory_get_fd (memsi);
+  if (self->priv->uncropped_width != video_meta->width ||
+      self->priv->uncropped_height != video_meta->height) {
+    self->priv->uncropped_width = video_meta->width;
+    self->priv->uncropped_height = video_meta->height;
+    return TRUE;
   }
 
-  /* Now create a VASurfaceID for the buffer */
-  return gst_va_dmabuf_memories_setup (btrans->display, &in_info, n_planes,
-      mems, fd, offset, VA_SURFACE_ATTRIB_USAGE_HINT_VPP_READ);
+  return FALSE;
 }
 
 static GstBufferPool *
-_get_sinkpad_pool (GstVaBaseTransform * self)
+_get_sinkpad_pool (GstElement * element, gpointer data)
 {
+  GstVaBaseTransform *self = GST_VA_BASE_TRANSFORM (element);
   GstAllocator *allocator;
   GstAllocationParams params = { 0, };
   GstCaps *caps;
-  GstVideoInfo in_info;
-  guint size, usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_VPP_READ;
+  guint usage_hint;
 
   if (self->priv->sinkpad_pool)
     return self->priv->sinkpad_pool;
 
-  gst_allocation_params_init (&params);
+  if (self->priv->sinkpad_caps)
+    caps = gst_caps_copy (self->priv->sinkpad_caps);
+  else
+    caps = gst_caps_copy (self->in_caps);
 
-  if (self->priv->sinkpad_caps) {
-    caps = self->priv->sinkpad_caps;
-    if (!gst_video_info_from_caps (&in_info, caps)) {
-      GST_ERROR_OBJECT (self, "Cannot parse caps %" GST_PTR_FORMAT, caps);
-      return NULL;
-    }
-  } else {
-    caps = self->in_caps;
-    in_info = self->in_info;
+  if (!gst_va_base_convert_caps_to_va (caps)) {
+    GST_ERROR_OBJECT (self, "Invalid caps %" GST_PTR_FORMAT, caps);
+    gst_caps_unref (caps);
+    return NULL;
   }
 
-  size = GST_VIDEO_INFO_SIZE (&in_info);
+  /* When the input buffer contains video crop meta, the real video
+     resolution can be bigger than the caps. The video meta should
+     contain the real video resolution. */
+  if (self->priv->uncropped_width > 0)
+    gst_caps_set_simple (caps, "width", G_TYPE_INT,
+        self->priv->uncropped_width, NULL);
+  if (self->priv->uncropped_height > 0)
+    gst_caps_set_simple (caps, "height", G_TYPE_INT,
+        self->priv->uncropped_height, NULL);
+
+  usage_hint = va_get_surface_usage_hint (self->display,
+      VAEntrypointVideoProc, GST_PAD_SINK, FALSE);
 
   allocator = gst_va_base_transform_allocator_from_caps (self, caps);
-  self->priv->sinkpad_pool = gst_va_pool_new_with_config (caps, size, 1, 0,
+  g_assert (GST_IS_VA_ALLOCATOR (allocator));
+
+  self->priv->sinkpad_pool = gst_va_pool_new_with_config (caps, 1, 0,
       usage_hint, GST_VA_FEATURE_AUTO, allocator, &params);
   if (!self->priv->sinkpad_pool) {
+    gst_caps_unref (caps);
     gst_object_unref (allocator);
     return NULL;
   }
 
-  if (GST_IS_VA_DMABUF_ALLOCATOR (allocator)) {
-    gst_va_dmabuf_allocator_get_format (allocator, &self->priv->sinkpad_info,
-        NULL);
-  } else if (GST_IS_VA_ALLOCATOR (allocator)) {
-    gst_va_allocator_get_format (allocator, &self->priv->sinkpad_info, NULL,
-        NULL);
-  }
+  gst_va_allocator_get_format (allocator, &self->priv->sinkpad_info,
+      NULL, NULL);
 
   gst_object_unref (allocator);
+  gst_caps_unref (caps);
 
   if (!gst_buffer_pool_set_active (self->priv->sinkpad_pool, TRUE)) {
     GST_WARNING_OBJECT (self, "failed to active the sinkpad pool %"
@@ -806,88 +799,84 @@
   return self->priv->sinkpad_pool;
 }
 
-static gboolean
-_try_import_buffer (GstVaBaseTransform * self, GstBuffer * inbuf)
+typedef struct
 {
-  VASurfaceID surface;
-  gboolean ret;
-
-  surface = gst_va_buffer_get_surface (inbuf);
-  if (surface != VA_INVALID_ID &&
-      (gst_va_buffer_peek_display (inbuf) == self->display))
-    return TRUE;
+  GstVaBaseTransform *self;
+  GstBuffer *outbuf;
+} CopyMetaData;
 
-  g_rec_mutex_lock (&GST_VA_SHARED_LOCK);
-  ret = _try_import_dmabuf_unlocked (self, inbuf);
-  g_rec_mutex_unlock (&GST_VA_SHARED_LOCK);
-
-  return ret;
+static gboolean
+foreach_metadata (GstBuffer * inbuf, GstMeta ** meta, gpointer user_data)
+{
+  CopyMetaData *data = user_data;
+  GstVaBaseTransform *self = data->self;
+  GstBuffer *outbuf = data->outbuf;
+  const GstMetaInfo *info = (*meta)->info;
+  gboolean do_copy = FALSE;
+
+  if (gst_meta_api_type_has_tag (info->api, META_TAG_COLORSPACE)
+      || gst_meta_api_type_has_tag (info->api, META_TAG_SIZE)
+      || gst_meta_api_type_has_tag (info->api, META_TAG_ORIENTATION)
+      || gst_meta_api_type_has_tag (info->api, META_TAG_VIDEO)) {
+    do_copy = TRUE;
+  }
+
+  if (do_copy) {
+    GstMetaTransformCopy copy_data = { FALSE, 0, -1 };
+    /* simply copy then */
+    if (info->transform_func) {
+      GST_DEBUG_OBJECT (self, "copy metadata %s", g_type_name (info->api));
+      info->transform_func (outbuf, *meta, inbuf,
+          _gst_meta_transform_copy, &copy_data);
+    } else {
+      GST_DEBUG_OBJECT (self, "couldn't copy metadata %s",
+          g_type_name (info->api));
+    }
+  }
+  return TRUE;
 }
 
 GstFlowReturn
 gst_va_base_transform_import_buffer (GstVaBaseTransform * self,
     GstBuffer * inbuf, GstBuffer ** buf)
 {
-  GstBuffer *buffer = NULL;
-  GstBufferPool *pool;
+  GstVaBufferImporter importer = {
+    .element = GST_ELEMENT_CAST (self),
+#ifndef GST_DISABLE_GST_DEBUG
+    .debug_category = GST_CAT_DEFAULT,
+#endif
+    .display = self->display,
+    .entrypoint = VAEntrypointVideoProc,
+    .in_drm_info = &self->in_drm_info,
+    .sinkpad_info = &self->priv->sinkpad_info,
+    .get_sinkpad_pool = _get_sinkpad_pool,
+  };
   GstFlowReturn ret;
-  GstVideoFrame in_frame, out_frame;
-  gboolean imported, copied;
+  CopyMetaData data;
 
   g_return_val_if_fail (GST_IS_VA_BASE_TRANSFORM (self), GST_FLOW_ERROR);
 
-  imported = _try_import_buffer (self, inbuf);
-  if (imported) {
-    *buf = gst_buffer_ref (inbuf);
-    return GST_FLOW_OK;
-  }
-
-  /* input buffer doesn't come from a vapool, thus it is required to
-   * have a pool, grab from it a new buffer and copy the input
-   * buffer to the new one */
-  if (!(pool = _get_sinkpad_pool (self)))
-    return GST_FLOW_ERROR;
+  if (_check_uncropped_size (self, inbuf)) {
+    if (self->priv->sinkpad_pool)
+      gst_buffer_pool_set_active (self->priv->sinkpad_pool, FALSE);
 
-  ret = gst_buffer_pool_acquire_buffer (pool, &buffer, NULL);
-  if (ret != GST_FLOW_OK)
-    return ret;
-
-  GST_LOG_OBJECT (self, "copying input frame");
-
-  if (!gst_video_frame_map (&in_frame, &self->in_info, inbuf, GST_MAP_READ))
-    goto invalid_buffer;
-
-  if (!gst_video_frame_map (&out_frame, &self->priv->sinkpad_info, buffer,
-          GST_MAP_WRITE)) {
-    gst_video_frame_unmap (&in_frame);
-    goto invalid_buffer;
+    gst_clear_object (&self->priv->sinkpad_pool);
   }
 
-  copied = gst_video_frame_copy (&out_frame, &in_frame);
-
-  gst_video_frame_unmap (&out_frame);
-  gst_video_frame_unmap (&in_frame);
-
-  if (!copied)
-    goto invalid_buffer;
+  ret = gst_va_buffer_importer_import (&importer, inbuf, buf);
+  if (ret != GST_FLOW_OK)
+    goto bail;
 
-  /* copy metadata, default implemenation of baseclass will copy everything
-   * what we need */
-  GST_BASE_TRANSFORM_CLASS (parent_class)->copy_metadata
-      (GST_BASE_TRANSFORM_CAST (self), inbuf, buffer);
+  if (*buf == inbuf)
+    goto bail;
 
-  *buf = buffer;
+  data.self = self;
+  data.outbuf = *buf;
 
-  return GST_FLOW_OK;
+  gst_buffer_foreach_meta (inbuf, foreach_metadata, &data);
 
-invalid_buffer:
-  {
-    GST_ELEMENT_WARNING (self, STREAM, FORMAT, (NULL),
-        ("invalid video buffer received"));
-    if (buffer)
-      gst_buffer_unref (buffer);
-    return GST_FLOW_ERROR;
-  }
+bail:
+  return ret;
 }
 
 GstCaps *

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvabasetransform.h -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvabasetransform.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvacaps.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvacaps.c Changed

@@ -25,6 +25,7 @@
 #include "gstvacaps.h"
 
 #include <gst/va/gstvavideoformat.h>
+#include <gst/va/vasurfaceimage.h>
 #include <va/va_drmcommon.h>
 
 #include "gstvadisplay_priv.h"
@@ -145,6 +146,38 @@
   return TRUE;
 }
 
+static gboolean
+gst_caps_set_drm_format_array (GstCaps * caps, GPtrArray * formats)
+{
+  GValue v_formats = G_VALUE_INIT;
+  const gchar *format;
+  guint i;
+
+  g_return_val_if_fail (GST_IS_CAPS (caps), FALSE);
+  g_return_val_if_fail (formats, FALSE);
+
+  if (formats->len == 1) {
+    format = g_ptr_array_index (formats, 0);
+    g_value_init (&v_formats, G_TYPE_STRING);
+    g_value_set_string (&v_formats, format);
+  } else if (formats->len > 1) {
+
+    gst_value_list_init (&v_formats, formats->len);
+
+    for (i = 0; i < formats->len; i++) {
+      format = g_ptr_array_index (formats, i);
+      _value_list_append_string (&v_formats, format);
+    }
+  } else {
+    return FALSE;
+  }
+
+  gst_caps_set_value (caps, "drm-format", &v_formats);
+  g_value_unset (&v_formats);
+
+  return TRUE;
+}
+
 /* Fix raw frames ill reported by drivers.
  *
  * Mesa Gallium reports P010 and P016 for H264 encoder:
@@ -154,24 +187,98 @@
  * XXX: add issue or pr
  */
 static gboolean
-fix_raw_formats (GstVaDisplay * display, VAConfigID config, GArray * formats)
+fix_raw_formats (GstVaDisplay * display, VAProfile profile,
+    VAEntrypoint entrypoint, GArray * formats)
 {
-  VADisplay dpy;
-  VAStatus status;
-  VAProfile profile;
-  VAEntrypoint entrypoint;
-  VAConfigAttrib *attribs;
   GstVideoFormat format;
-  int num;
 
   if (!(GST_VA_DISPLAY_IS_IMPLEMENTATION (display, INTEL_I965) ||
           GST_VA_DISPLAY_IS_IMPLEMENTATION (display, MESA_GALLIUM)))
     return TRUE;
 
+  if (gst_va_profile_codec (profile) != H264
+      || entrypoint != VAEntrypointEncSlice)
+    return TRUE;
+
+  formats = g_array_set_size (formats, 0);
+  format = GST_VIDEO_FORMAT_NV12;
+  g_array_append_val (formats, format);
+  return TRUE;
+}
+
+GstCaps *
+gst_va_create_dma_caps (GstVaDisplay * display, VAEntrypoint entrypoint,
+    GArray * formats, gint min_width, gint max_width,
+    gint min_height, gint max_height)
+{
+  guint usage_hint;
+  guint64 modifier;
+  guint32 fourcc;
+  GstVideoFormat fmt;
+  gchar *drm_fmt_str;
+  GPtrArray *drm_formats_str;
+  GstCaps *caps = NULL;
+  guint i;
+
+  usage_hint = va_get_surface_usage_hint (display,
+      entrypoint, GST_PAD_UNKNOWN, TRUE);
+
+  drm_formats_str = g_ptr_array_new_with_free_func (g_free);
+
+  for (i = 0; i < formats->len; i++) {
+    fmt = g_array_index (formats, GstVideoFormat, i);
+
+    fourcc = gst_va_drm_fourcc_from_video_format (fmt);
+    if (fourcc == DRM_FORMAT_INVALID)
+      continue;
+
+    modifier = gst_va_dmabuf_get_modifier_for_format (display, fmt, usage_hint);
+    if (modifier == DRM_FORMAT_MOD_INVALID)
+      continue;
+
+    drm_fmt_str = gst_video_dma_drm_fourcc_to_string (fourcc, modifier);
+
+    g_ptr_array_add (drm_formats_str, drm_fmt_str);
+  }
+
+  if (drm_formats_str->len == 0)
+    goto out;
+
+  caps = gst_caps_new_simple ("video/x-raw", "width", GST_TYPE_INT_RANGE,
+      min_width, max_width, "height", GST_TYPE_INT_RANGE, min_height,
+      max_height, NULL);
+
+  gst_caps_set_features_simple (caps,
+      gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_DMABUF));
+
+  gst_caps_set_simple (caps, "format", G_TYPE_STRING, "DMA_DRM", NULL);
+
+  if (!gst_caps_set_drm_format_array (caps, drm_formats_str)) {
+    gst_clear_caps (&caps);
+    goto out;
+  }
+
+out:
+  g_ptr_array_unref (drm_formats_str);
+  return caps;
+}
+
+static gboolean
+_get_entrypoint_from_config (GstVaDisplay * display, VAConfigID config,
+    VAProfile * profile_out, VAEntrypoint * entrypoint_out)
+{
+  VADisplay dpy;
+  VAStatus status;
+  VAProfile profile;
+  VAEntrypoint entrypoint;
+  VAConfigAttrib *attribs;
+  int num_attribs = 0;
+
   dpy = gst_va_display_get_va_dpy (display);
+
   attribs = g_new (VAConfigAttrib, vaMaxNumConfigAttributes (dpy));
   status = vaQueryConfigAttributes (dpy, config, &profile, &entrypoint, attribs,
-      &num);
+      &num_attribs);
   g_free (attribs);
 
   if (status != VA_STATUS_SUCCESS) {
@@ -180,13 +287,11 @@
     return FALSE;
   }
 
-  if (gst_va_profile_codec (profile) != H264
-      || entrypoint != VAEntrypointEncSlice)
-    return TRUE;
+  if (profile_out)
+    *profile_out = profile;
+  if (entrypoint_out)
+    *entrypoint_out = entrypoint;
 
-  formats = g_array_set_size (formats, 0);
-  format = GST_VIDEO_FORMAT_NV12;
-  g_array_append_val (formats, format);
   return TRUE;
 }
 
@@ -198,10 +303,15 @@
   GstCapsFeatures *features;
   GstVideoFormat format;
   VASurfaceAttrib *attribs;
+  VAEntrypoint entrypoint;
+  VAProfile profile;
   guint i, attrib_count, mem_type = 0;
   gint min_width = 1, max_width = G_MAXINT;
   gint min_height = 1, max_height = G_MAXINT;
 
+  if (!_get_entrypoint_from_config (display, config, &profile, &entrypoint))
+    return NULL;
+
   attribs = gst_va_get_surface_attribs (display, config, &attrib_count);
   if (!attribs)
     return NULL;
@@ -241,7 +351,7 @@
   if (formats->len == 0)
     goto bail;
 
-  if (!fix_raw_formats (display, config, formats))
+  if (!fix_raw_formats (display, profile, entrypoint, formats))
     goto bail;
 
   base_caps = gst_caps_new_simple ("video/x-raw", "width", GST_TYPE_INT_RANGE,
@@ -263,10 +373,10 @@
   }
   if (mem_type & VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME
       || mem_type & VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2) {
-    feature_caps = gst_caps_copy (base_caps);
-    features = gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_DMABUF);
-    gst_caps_set_features_simple (feature_caps, features);
-    caps = gst_caps_merge (caps, feature_caps);
+    feature_caps = gst_va_create_dma_caps (display, entrypoint, formats,
+        min_width, max_width, min_height, max_height);
+    if (feature_caps)
+      caps = gst_caps_merge (caps, feature_caps);
   }
 
   /* raw caps */
@@ -313,6 +423,41 @@
   return caps;
 }
 
+gboolean
+gst_va_video_info_from_caps (GstVideoInfo * info, guint64 * modifier,
+    GstCaps * caps)
+{
+  GstVideoInfoDmaDrm drm_info;
+
+  if (!gst_video_is_dma_drm_caps (caps))
+    return gst_video_info_from_caps (info, caps);
+
+  if (!gst_video_info_dma_drm_from_caps (&drm_info, caps))
+    return FALSE;
+
+  if (!gst_va_dma_drm_info_to_video_info (&drm_info, info))
+    return FALSE;
+
+  if (modifier)
+    *modifier = drm_info.drm_modifier;
+
+  return TRUE;
+}
+
+GstCaps *
+gst_va_video_info_to_dma_caps (GstVideoInfo * info, guint64 modifier)
+{
+  GstVideoInfoDmaDrm drm_info;
+
+  gst_video_info_dma_drm_init (&drm_info);
+  drm_info.vinfo = *info;
+  drm_info.drm_fourcc =
+      gst_va_drm_fourcc_from_video_format (GST_VIDEO_INFO_FORMAT (info));
+  drm_info.drm_modifier = modifier;
+
+  return gst_video_info_dma_drm_to_caps (&drm_info);
+}
+
 /* the purpose of this function is to find broken configurations in
  * JPEG decoders: if the driver doesn't expose a pixel format for a
  * config with a specific sampling, that sampling is not valid */
@@ -501,7 +646,7 @@
   if (rt_formats_ptr)
     *rt_formats_ptr = rt_formats;
 
-  caps = gst_va_profile_caps (profile);
+  caps = gst_va_profile_caps (profile, entrypoint);
   if (!caps)
     return NULL;

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvacaps.h -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvacaps.h Changed

@@ -35,15 +35,27 @@
                                                            VAConfigID config,
                                                            guint * attrib_count);
 
+GstCaps *             gst_va_create_dma_caps              (GstVaDisplay * display,
+                                                           VAEntrypoint entrypoint,
+                                                           GArray * formats,
+                                                           gint min_width,
+                                                           gint max_width,
+                                                           gint min_height,
+                                                           gint max_height);
 GstCaps *             gst_va_create_raw_caps_from_config  (GstVaDisplay * display,
                                                            VAConfigID config);
 GstCaps *             gst_va_create_coded_caps            (GstVaDisplay * display,
                                                            VAProfile profile,
                                                            VAEntrypoint entrypoint,
                                                            guint32 * rt_formats_ptr);
+gboolean              gst_va_video_info_from_caps         (GstVideoInfo * info,
+                                                           guint64 * modifier,
+                                                           GstCaps * caps);
+GstCaps *             gst_va_video_info_to_dma_caps       (GstVideoInfo * info,
+                                                           guint64 modifier);
 
 gboolean              gst_caps_set_format_array           (GstCaps * caps,
-							   GArray * formats);
+                                                           GArray * formats);
 
 gboolean              gst_caps_is_dmabuf                  (GstCaps * caps);
 gboolean              gst_caps_is_vamemory                (GstCaps * caps);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvacompositor.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvacompositor.c Changed

@@ -47,12 +47,17 @@
 #include "gstvacompositor.h"
 
 #include <gst/va/gstva.h>
+#include <gst/va/gstvavideoformat.h>
+#include <gst/va/vasurfaceimage.h>
+#include <gst/va/gstvavideoformat.h>
 #include <gst/video/video.h>
 #include <va/va_drmcommon.h>
 
+#include "gstvabase.h"
 #include "gstvacaps.h"
 #include "gstvadisplay_priv.h"
 #include "gstvafilter.h"
+#include "gstvapluginutils.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_va_compositor_debug);
 #define GST_CAT_DEFAULT gst_va_compositor_debug
@@ -76,6 +81,14 @@
   gint width;
   gint height;
   gdouble alpha;
+
+  GstCaps *sinkpad_caps;
+  GstVideoInfo sinkpad_info;
+  union
+  {
+    GstVideoInfo in_info;
+    GstVideoInfoDmaDrm in_drm_info;
+  };
 };
 
 enum
@@ -165,6 +178,8 @@
     gst_clear_object (&self->pool);
   }
 
+  gst_clear_caps (&self->sinkpad_caps);
+
   G_OBJECT_CLASS (gst_va_compositor_pad_parent_class)->finalize (object);
 }
 
@@ -177,6 +192,8 @@
   self->width = DEFAULT_PAD_WIDTH;
   self->height = DEFAULT_PAD_HEIGHT;
   self->alpha = DEFAULT_PAD_ALPHA;
+
+  self->sinkpad_caps = NULL;
 }
 
 static void
@@ -287,15 +304,18 @@
     GValue * value, GParamSpec * pspec)
 {
   GstVaCompositor *self = GST_VA_COMPOSITOR (object);
+  GstVaCompositorClass *klass = GST_VA_COMPOSITOR_GET_CLASS (self);
 
   switch (prop_id) {
     case PROP_DEVICE_PATH:
     {
-      if (!(self->display && GST_IS_VA_DISPLAY_DRM (self->display))) {
+      if (!self->display)
+        g_value_set_string (value, klass->render_device_path);
+      else if (GST_IS_VA_DISPLAY_PLATFORM (self->display))
+        g_object_get_property (G_OBJECT (self->display), "path", value);
+      else
         g_value_set_string (value, NULL);
-        return;
-      }
-      g_object_get_property (G_OBJECT (self->display), "path", value);
+
       break;
     }
     case PROP_SCALE_METHOD:
@@ -558,7 +578,7 @@
   GstCaps *caps;
   GstVideoInfo info;
   gboolean update_allocator = FALSE;
-  guint size, usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC;
+  guint size, usage_hint;
 
   gst_query_parse_allocation (query, &caps, NULL);
 
@@ -571,7 +591,8 @@
   if (gst_query_get_n_allocation_pools (query) > 0)
     return TRUE;
 
-  size = GST_VIDEO_INFO_SIZE (&info);
+  usage_hint = va_get_surface_usage_hint (self->display,
+      VAEntrypointVideoProc, GST_PAD_SINK, gst_video_is_dma_drm_caps (caps));
 
   if (gst_query_get_n_allocation_params (query) > 0) {
     gst_query_parse_nth_allocation_param (query, 0, &allocator, &params);
@@ -590,13 +611,16 @@
 
   /* Now we have a VA-based allocator */
 
-  pool = gst_va_pool_new_with_config (caps, size, 1, 0, usage_hint,
+  pool = gst_va_pool_new_with_config (caps, 1, 0, usage_hint,
       GST_VA_FEATURE_AUTO, allocator, &params);
   if (!pool) {
     gst_object_unref (allocator);
     goto config_failed;
   }
 
+  if (!gst_va_pool_get_buffer_size (pool, &size))
+    goto config_failed;
+
   if (update_allocator)
     gst_query_set_nth_allocation_param (query, 0, allocator, &params);
   else
@@ -622,25 +646,6 @@
   }
 }
 
-static GstBufferPool *
-_create_other_pool (GstAllocator * allocator, GstAllocationParams * params,
-    GstCaps * caps, guint size)
-{
-  GstBufferPool *pool = NULL;
-  GstStructure *config;
-
-  pool = gst_video_buffer_pool_new ();
-  config = gst_buffer_pool_get_config (pool);
-
-  gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
-  gst_buffer_pool_config_set_allocator (config, allocator, params);
-  if (!gst_buffer_pool_set_config (pool, config)) {
-    gst_clear_object (&pool);
-  }
-
-  return pool;
-}
-
 /* configure the allocation query that was answered downstream */
 static gboolean
 gst_va_compositor_decide_allocation (GstAggregator * agg, GstQuery * query)
@@ -653,18 +658,19 @@
   GstBufferPool *pool = NULL, *other_pool = NULL;
   GstCaps *caps = NULL;
   GstStructure *config;
-  GstVideoInfo info;
-  guint min, max, size = 0, usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_VPP_WRITE;
+  guint min, max, other_size = 0, size = 0, usage_hint;
   gboolean update_pool, update_allocator, has_videometa, copy_frames;
-  gboolean dont_use_other_pool = FALSE;
+  gboolean dont_use_other_pool = FALSE, ret = FALSE;;
 
   gst_query_parse_allocation (query, &caps, NULL);
+  if (!caps)
+    return FALSE;
 
-  gst_allocation_params_init (&other_params);
-  gst_allocation_params_init (&params);
-
-  if (!gst_video_info_from_caps (&info, caps)) {
-    GST_ERROR_OBJECT (self, "Cannot parse caps %" GST_PTR_FORMAT, caps);
+  has_videometa = gst_query_find_allocation_meta (query,
+      GST_VIDEO_META_API_TYPE, NULL);
+  if (gst_video_is_dma_drm_caps (caps) && !has_videometa) {
+    GST_ERROR_OBJECT (self,
+        "DMABuf caps negotiated without the mandatory support of VideoMeta ");
     return FALSE;
   }
 
@@ -697,6 +703,7 @@
             "may need other pool for copy frames %" GST_PTR_FORMAT, pool);
         other_pool = pool;
         pool = NULL;
+        other_size = size;
       } else if (dont_use_other_pool) {
         gst_clear_object (&pool);
       }
@@ -704,36 +711,51 @@
 
     update_pool = TRUE;
   } else {
-    size = GST_VIDEO_INFO_SIZE (&info);
     min = 1;
     max = 0;
     update_pool = FALSE;
   }
 
   if (!allocator) {
-    if (gst_caps_is_dmabuf (caps) && GST_VIDEO_INFO_IS_RGB (&info))
-      usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC;
     if (!(allocator = gst_va_compositor_allocator_from_caps (self, caps)))
-      return FALSE;
+      goto bail;
   }
 
   if (!pool)
     pool = gst_va_pool_new ();
 
+  {
+    GstVideoInfo info;
+
+    if (!gst_va_video_info_from_caps (&info, NULL, caps)) {
+      GST_ERROR_OBJECT (self, "Cannot parse caps %" GST_PTR_FORMAT, caps);
+      goto bail;
+    }
+
+    if (gst_caps_is_dmabuf (caps) && GST_VIDEO_INFO_IS_RGB (&info)) {
+      usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC;
+    } else {
+      usage_hint = va_get_surface_usage_hint (self->display,
+          VAEntrypointVideoProc, GST_PAD_SRC, gst_video_is_dma_drm_caps (caps));
+    }
+  }
+
   config = gst_buffer_pool_get_config (pool);
   gst_buffer_pool_config_set_allocator (config, allocator, &params);
   gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
-  gst_buffer_pool_config_set_params (config, caps, size, min, max);
+  gst_buffer_pool_config_set_params (config, caps, 0, min, max);
   gst_buffer_pool_config_set_va_allocation_params (config, usage_hint,
       GST_VA_FEATURE_AUTO);
-  if (!gst_buffer_pool_set_config (pool, config)) {
-    gst_object_unref (allocator);
-    gst_object_unref (pool);
-    return FALSE;
-  }
+  if (!gst_buffer_pool_set_config (pool, config))
+    goto bail;
+  if (!gst_va_pool_get_buffer_size (pool, &size))
+    goto bail;
 
   if (GST_IS_VA_DMABUF_ALLOCATOR (allocator)) {
-    gst_va_dmabuf_allocator_get_format (allocator, &vagg->info, NULL);
+    GstVideoInfoDmaDrm dma_info;
+
+    gst_va_dmabuf_allocator_get_format (allocator, &dma_info, NULL);
+    vagg->info = dma_info.vinfo;
   } else if (GST_IS_VA_ALLOCATOR (allocator)) {
     gst_va_allocator_get_format (allocator, &vagg->info, NULL, NULL);
   }
@@ -748,9 +770,6 @@
   else
     gst_query_add_allocation_pool (query, pool, size, min, max);
 
-  has_videometa = gst_query_find_allocation_meta (query,
-      GST_VIDEO_META_API_TYPE, NULL);
-
   copy_frames = (!has_videometa && gst_va_pool_requires_video_meta (pool)
       && gst_caps_is_raw (caps));
   if (copy_frames) {
@@ -758,54 +777,64 @@
       gst_object_replace ((GstObject **) & self->other_pool,
           (GstObject *) other_pool);
     } else {
+      gst_clear_object (&self->other_pool);
       self->other_pool =
-          _create_other_pool (other_allocator, &other_params, caps, size);
+          gst_va_create_other_pool (other_allocator, &other_params, caps,
+          other_size);
     }
+    if (!self->other_pool)
+      goto bail;
     GST_DEBUG_OBJECT (self, "Use the other pool for copy %" GST_PTR_FORMAT,
         self->other_pool);
   } else {
     gst_clear_object (&self->other_pool);
   }
 
+  ret = TRUE;
+
   GST_DEBUG_OBJECT (self,
       "decided pool %" GST_PTR_FORMAT " with allocator %" GST_PTR_FORMAT,
       pool, allocator);
 
+bail:
   gst_object_unref (allocator);
   gst_object_unref (pool);
   gst_clear_object (&other_allocator);
   gst_clear_object (&other_pool);
 
-  return TRUE;
+  return ret;
 }
 
 static GstBufferPool *
-_get_sinkpad_pool (GstVaCompositor * self, GstVaCompositorPad * pad)
+_get_sinkpad_pool (GstElement * element, gpointer data)
 {
+  GstVaCompositor *self = GST_VA_COMPOSITOR (element);
+  GstVaCompositorPad *pad = GST_VA_COMPOSITOR_PAD (data);
   GstAllocator *allocator;
   GstAllocationParams params = { 0, };
   GstCaps *caps;
-  GstVideoInfo info;
-  guint size, usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_VPP_READ;
+  guint usage_hint;
 
   if (pad->pool)
     return pad->pool;
 
   gst_allocation_params_init (&params);
 
-  caps = gst_pad_get_current_caps (GST_PAD (pad));
+  caps = gst_caps_copy (pad->sinkpad_caps);
   if (!caps)
     return NULL;
-  if (!gst_video_info_from_caps (&info, caps)) {
-    GST_ERROR_OBJECT (self, "Cannot parse caps %" GST_PTR_FORMAT, caps);
+
+  if (!gst_va_base_convert_caps_to_va (caps)) {
+    GST_ERROR_OBJECT (self, "Invalid caps %" GST_PTR_FORMAT, caps);
     gst_caps_unref (caps);
     return NULL;
   }
 
-  size = GST_VIDEO_INFO_SIZE (&info);
+  usage_hint = va_get_surface_usage_hint (self->display,
+      VAEntrypointVideoProc, GST_PAD_SINK, FALSE);
 
   allocator = gst_va_compositor_allocator_from_caps (self, caps);
-  pad->pool = gst_va_pool_new_with_config (caps, size, 1, 0, usage_hint,
+  pad->pool = gst_va_pool_new_with_config (caps, 1, 0, usage_hint,
       GST_VA_FEATURE_AUTO, allocator, &params);
   gst_caps_unref (caps);
 
@@ -814,11 +843,7 @@
     return NULL;
   }
 
-  if (GST_IS_VA_DMABUF_ALLOCATOR (allocator)) {
-    gst_va_dmabuf_allocator_get_format (allocator, &info, NULL);
-  } else if (GST_IS_VA_ALLOCATOR (allocator)) {
-    gst_va_allocator_get_format (allocator, &info, NULL, NULL);
-  }
+  gst_va_allocator_get_format (allocator, &pad->sinkpad_info, NULL, NULL);
 
   gst_object_unref (allocator);
 
@@ -831,175 +856,25 @@
   return pad->pool;
 }
 
-static inline gsize
-_get_plane_data_size (GstVideoInfo * info, guint plane)
-{
-  gint compGST_VIDEO_MAX_COMPONENTS;
-  gint height, padded_height;
-
-  gst_video_format_info_component (info->finfo, plane, comp);
-
-  height = GST_VIDEO_INFO_HEIGHT (info);
-  padded_height =
-      GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT (info->finfo, comp0, height);
-
-  return GST_VIDEO_INFO_PLANE_STRIDE (info, plane) * padded_height;
-}
-
-static gboolean
-_try_import_dmabuf_unlocked (GstVaCompositor * self, GstVideoInfo * info,
-    GstBuffer * inbuf)
-{
-  GstVideoMeta *meta;
-  GstMemory *memsGST_VIDEO_MAX_PLANES;
-  guint i, n_mem, n_planes;
-  gsize offsetGST_VIDEO_MAX_PLANES;
-  uintptr_t fdGST_VIDEO_MAX_PLANES;
-
-  n_planes = GST_VIDEO_INFO_N_PLANES (info);
-  n_mem = gst_buffer_n_memory (inbuf);
-  meta = gst_buffer_get_video_meta (inbuf);
-
-  /* This will eliminate most non-dmabuf out there */
-  if (!gst_is_dmabuf_memory (gst_buffer_peek_memory (inbuf, 0)))
-    return FALSE;
-
-  /* We cannot have multiple dmabuf per plane */
-  if (n_mem > n_planes)
-    return FALSE;
-
-  /* Update video info based on video meta */
-  if (meta) {
-    GST_VIDEO_INFO_WIDTH (info) = meta->width;
-    GST_VIDEO_INFO_HEIGHT (info) = meta->height;
-
-    for (i = 0; i < meta->n_planes; i++) {
-      GST_VIDEO_INFO_PLANE_OFFSET (info, i) = meta->offseti;
-      GST_VIDEO_INFO_PLANE_STRIDE (info, i) = meta->stridei;
-    }
-  }
-
-  /* Find and validate all memories */
-  for (i = 0; i < n_planes; i++) {
-    guint plane_size;
-    guint length;
-    guint mem_idx;
-    gsize mem_skip;
-
-    plane_size = _get_plane_data_size (info, i);
-
-    if (!gst_buffer_find_memory (inbuf, info->offseti, plane_size,
-            &mem_idx, &length, &mem_skip))
-      return FALSE;
-
-    /* We can't have more then one dmabuf per plane */
-    if (length != 1)
-      return FALSE;
-
-    memsi = gst_buffer_peek_memory (inbuf, mem_idx);
-
-    /* And all memory found must be dmabuf */
-    if (!gst_is_dmabuf_memory (memsi))
-      return FALSE;
-
-    offseti = memsi->offset + mem_skip;
-    fdi = gst_dmabuf_memory_get_fd (memsi);
-  }
-
-  /* Now create a VASurfaceID for the buffer */
-  return gst_va_dmabuf_memories_setup (self->display, info, n_planes,
-      mems, fd, offset, VA_SURFACE_ATTRIB_USAGE_HINT_VPP_READ);
-}
-
-extern GRecMutex GST_VA_SHARED_LOCK;
-
-static gboolean
-_try_import_buffer (GstVaCompositor * self, GstVideoInfo * info,
-    GstBuffer * inbuf)
-{
-  VASurfaceID surface;
-  gboolean ret;
-
-  surface = gst_va_buffer_get_surface (inbuf);
-  if (surface != VA_INVALID_ID &&
-      (gst_va_buffer_peek_display (inbuf) == self->display))
-    return TRUE;
-
-  g_rec_mutex_lock (&GST_VA_SHARED_LOCK);
-  ret = _try_import_dmabuf_unlocked (self, info, inbuf);
-  g_rec_mutex_unlock (&GST_VA_SHARED_LOCK);
-
-  return ret;
-}
-
 static GstFlowReturn
 gst_va_compositor_import_buffer (GstVaCompositor * self,
     GstVaCompositorPad * pad, GstBuffer * inbuf, GstBuffer ** buf)
 {
-  GstBuffer *buffer = NULL;
-  GstBufferPool *pool;
-  GstFlowReturn ret;
-  GstCaps *caps;
-  GstVideoInfo info;
-  GstVideoFrame in_frame, out_frame;
-  gboolean imported, copied;
-
-  caps = gst_pad_get_current_caps (GST_PAD (pad));
-  if (!caps)
-    return GST_FLOW_ERROR;
-  if (!gst_video_info_from_caps (&info, caps)) {
-    GST_ERROR_OBJECT (self, "Cannot parse caps %" GST_PTR_FORMAT, caps);
-    gst_caps_unref (caps);
-    return GST_FLOW_ERROR;
-  }
-  gst_caps_unref (caps);
-
-  imported = _try_import_buffer (self, &info, inbuf);
-  if (imported) {
-    *buf = gst_buffer_ref (inbuf);
-    return GST_FLOW_OK;
-  }
-
-  GST_LOG_OBJECT (self, "copying input frame");
-
-  /* input buffer doesn't come from a vapool, thus it is required to
-   * have a pool, grab from it a new buffer and copy the input
-   * buffer to the new one */
-  if (!(pool = _get_sinkpad_pool (self, pad)))
-    return GST_FLOW_ERROR;
-
-  ret = gst_buffer_pool_acquire_buffer (pool, &buffer, NULL);
-  if (ret != GST_FLOW_OK)
-    return ret;
-
-  if (!gst_video_frame_map (&in_frame, &info, inbuf, GST_MAP_READ))
-    goto invalid_buffer;
-
-  if (!gst_video_frame_map (&out_frame, &info, buffer, GST_MAP_WRITE)) {
-    gst_video_frame_unmap (&in_frame);
-    goto invalid_buffer;
-  }
-
-  copied = gst_video_frame_copy (&out_frame, &in_frame);
-
-  gst_video_frame_unmap (&out_frame);
-  gst_video_frame_unmap (&in_frame);
-
-  if (!copied)
-    goto invalid_buffer;
-
-  *buf = buffer;
-
-  return GST_FLOW_OK;
+  /* Already hold GST_OBJECT_LOCK */
+  GstVaBufferImporter importer = {
+    .element = GST_ELEMENT_CAST (self),
+#ifndef GST_DISABLE_GST_DEBUG
+    .debug_category = GST_CAT_DEFAULT,
+#endif
+    .display = self->display,
+    .entrypoint = VAEntrypointVideoProc,
+    .get_sinkpad_pool = _get_sinkpad_pool,
+    .pool_data = pad,
+    .in_drm_info = &pad->in_drm_info,
+    .sinkpad_info = &pad->sinkpad_info,
+  };
 
-invalid_buffer:
-  {
-    GST_ELEMENT_WARNING (self, CORE, NOT_IMPLEMENTED, (NULL),
-        ("invalid video buffer received"));
-    if (buffer)
-      gst_buffer_unref (buffer);
-    return GST_FLOW_OK;
-  }
+  return gst_va_buffer_importer_import (&importer, inbuf, buf);
 }
 
 typedef struct _GstVaCompositorSampleGenerator GstVaCompositorSampleGenerator;
@@ -1212,7 +1087,7 @@
 {
   GstVaCompositor *self = GST_VA_COMPOSITOR (agg);
 
-  if (!gst_video_info_from_caps (&self->other_info, caps)) {
+  if (!gst_va_video_info_from_caps (&self->other_info, NULL, caps)) {
     GST_ERROR_OBJECT (self, "invalid caps");
     return FALSE;
   }
@@ -1303,6 +1178,353 @@
   return gst_caps_fixate (ret);
 }
 
+static GstCaps *
+_caps_from_format_and_feature (GstVideoFormat format,
+    guint64 modifier, const gchar * feature)
+{
+  GstCaps *caps;
+  gboolean is_dma = g_strcmp0 (feature, GST_CAPS_FEATURE_MEMORY_DMABUF) == 0;
+
+  caps = gst_caps_new_empty_simple ("video/x-raw");
+
+  if (is_dma) {
+    gchar *dma_str;
+    guint32 fourcc = gst_va_drm_fourcc_from_video_format (format);
+
+    dma_str = gst_video_dma_drm_fourcc_to_string (fourcc, modifier);
+
+    gst_caps_set_simple (caps, "format", G_TYPE_STRING, "DMA_DRM",
+        "drm-format", G_TYPE_STRING, dma_str, NULL);
+    g_free (dma_str);
+  } else {
+    gst_caps_set_simple (caps, "format", G_TYPE_STRING,
+        gst_video_format_to_string (format), NULL);
+  }
+
+  if (g_strcmp0 (feature, GST_CAPS_FEATURE_MEMORY_DMABUF) == 0 ||
+      g_strcmp0 (feature, GST_CAPS_FEATURE_MEMORY_VA) == 0)
+    gst_caps_set_features_simple (caps,
+        gst_caps_features_from_string (feature));
+
+  return caps;
+}
+
+static GArray *
+_collect_formats_in_caps_by_feature (GstCaps * caps,
+    const gchar * feature, GArray ** ret_modifiers)
+{
+  guint i, j, len, capslen;
+  GstCapsFeatures *features;
+  GstStructure *structure;
+  gboolean is_dma;
+  GstVideoFormat fmt;
+  guint64 modifier;
+  GArray *formats, *modifiers = NULL;
+  const GValue *format;
+  guint32 fourcc;
+
+  is_dma = (g_strcmp0 (feature, GST_CAPS_FEATURE_MEMORY_DMABUF) == 0);
+
+  formats = g_array_new (FALSE, TRUE, sizeof (GstVideoFormat));
+  if (is_dma)
+    modifiers = g_array_new (FALSE, TRUE, sizeof (guint64));
+
+  capslen = gst_caps_get_size (caps);
+  for (i = 0; i < capslen; i++) {
+    features = gst_caps_get_features (caps, i);
+    if (!gst_caps_features_contains (features, feature))
+      continue;
+
+    structure = gst_caps_get_structure (caps, i);
+
+    format = (is_dma) ? gst_structure_get_value (structure, "drm-format")
+        : gst_structure_get_value (structure, "format");
+    if (!format)
+      continue;
+
+    if (GST_VALUE_HOLDS_LIST (format)) {
+      len = gst_value_list_get_size (format);
+
+      for (j = 0; j < len; j++) {
+        const GValue *val;
+
+        val = gst_value_list_get_value (format, j);
+        if (!G_VALUE_HOLDS_STRING (val))
+          continue;
+
+        if (is_dma) {
+          fourcc = gst_video_dma_drm_fourcc_from_string
+              (g_value_get_string (val), &modifier);
+          fmt = gst_va_video_format_from_drm_fourcc (fourcc);
+        } else {
+          fmt = gst_video_format_from_string (g_value_get_string (val));
+        }
+        if (fmt == GST_VIDEO_FORMAT_UNKNOWN)
+          continue;
+
+        g_array_append_val (formats, fmt);
+
+        if (is_dma)
+          g_array_append_val (modifiers, modifier);
+      }
+    } else if (G_VALUE_HOLDS_STRING (format)) {
+      if (is_dma) {
+        fourcc = gst_video_dma_drm_fourcc_from_string
+            (g_value_get_string (format), &modifier);
+        fmt = gst_va_video_format_from_drm_fourcc (fourcc);
+      } else {
+        fmt = gst_video_format_from_string (g_value_get_string (format));
+      }
+      if (fmt != GST_VIDEO_FORMAT_UNKNOWN) {
+        g_array_append_val (formats, fmt);
+        if (is_dma)
+          g_array_append_val (modifiers, modifier);
+      }
+    }
+  }
+
+  if (formats->len == 0)
+    g_clear_pointer (&formats, g_array_unref);
+
+  if (modifiers && modifiers->len == 0)
+    g_clear_pointer (&modifiers, g_array_unref);
+
+  if (ret_modifiers)
+    *ret_modifiers = modifiers;
+  else if (modifiers)
+    g_array_unref (modifiers);
+
+  return formats;
+}
+
+static GstVideoFormat
+_choose_format (GstVideoFormat fmt1, GstVideoFormat fmt2)
+{
+  const GstVideoFormatInfo *info1 = gst_video_format_get_info (fmt1);
+  const GstVideoFormatInfo *info2 = gst_video_format_get_info (fmt2);
+
+
+#define IS_KNONWN(info) (GST_VIDEO_FORMAT_INFO_FORMAT(info) != GST_VIDEO_FORMAT_UNKNOWN)
+#define IS_8_BITS(info) (GST_VIDEO_FORMAT_INFO_BITS (info) == 8)
+#define IS_RGB_PLANAR(info) (GST_VIDEO_FORMAT_INFO_N_PLANES (info) == 1)
+#define IS_YUV_420(info) ((GST_VIDEO_FORMAT_INFO_W_SUB (info, 1) == 1)  \
+                          && (GST_VIDEO_FORMAT_INFO_H_SUB (info, 1) == 1))
+#define CHOOSE_FORMAT(cmp)                        \
+    G_STMT_START {                                \
+      if (cmp (info1) && !cmp (info2)) return fmt1; \
+      if (!cmp (info1) && cmp (info2)) return fmt2; \
+    } G_STMT_END;
+
+  /* prefer the other if one is unknown */
+  CHOOSE_FORMAT (IS_KNONWN);
+
+  /* Prefer non-complex format */
+  CHOOSE_FORMAT (!GST_VIDEO_FORMAT_INFO_IS_COMPLEX);
+
+  /* Prefer the depth of 8 */
+  CHOOSE_FORMAT (IS_8_BITS);
+
+  /* Prefer RGB */
+  CHOOSE_FORMAT (GST_VIDEO_FORMAT_INFO_IS_RGB);
+
+  if (GST_VIDEO_FORMAT_INFO_IS_RGB (info1)
+      && GST_VIDEO_FORMAT_INFO_IS_RGB (info2)) {
+    /* Prefer packed RGB than planar. */
+    CHOOSE_FORMAT (IS_RGB_PLANAR);
+
+    /* Prefer RGB with alpha channel. */
+    CHOOSE_FORMAT (GST_VIDEO_FORMAT_INFO_HAS_ALPHA);
+  }
+
+  if (GST_VIDEO_FORMAT_INFO_IS_YUV (info1)
+      && GST_VIDEO_FORMAT_INFO_IS_YUV (info2)) {
+    /* Prefer YUV 4:2:0. */
+    CHOOSE_FORMAT (IS_YUV_420);
+  }
+
+  /* Fallback */
+  return fmt1;
+
+#undef IS_8_BITS
+#undef IS_RGB_PLANAR
+#undef IS_YUV_420
+#undef CHOOSE_FORMAT
+}
+
+static GstCaps *
+gst_va_compositor_update_caps (GstVideoAggregator * vagg, GstCaps * src_caps)
+{
+  GList *tmp;
+  GstVideoFormat fmt, best_va, best_dma, best_sys;
+  GstVideoAggregatorPad *pad;
+  GstVaCompositorPad *va_pad;
+  GArray *va_formats, *dma_formats, *modifiers, *sys_formats;
+  GstCaps *ret_caps = NULL, *clip_caps = NULL;
+  guint i;
+
+  /* We only decide caps feature and video format here. Other fields are
+     fixated in fixate_src_caps() later.
+     We consider the features first, in the order of "memory:VAMemory",
+     "memory:DMABuf" and "memory:SystemMemory". Then within that feature,
+     we iterate each input pad's format and find the best matched one. */
+  va_formats = _collect_formats_in_caps_by_feature (src_caps,
+      GST_CAPS_FEATURE_MEMORY_VA, NULL);
+  dma_formats = _collect_formats_in_caps_by_feature (src_caps,
+      GST_CAPS_FEATURE_MEMORY_DMABUF, &modifiers);
+  sys_formats = _collect_formats_in_caps_by_feature (src_caps,
+      GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, NULL);
+
+  best_va = GST_VIDEO_FORMAT_UNKNOWN;
+  best_dma = GST_VIDEO_FORMAT_UNKNOWN;
+  best_sys = GST_VIDEO_FORMAT_UNKNOWN;
+
+  GST_OBJECT_LOCK (vagg);
+
+  for (tmp = GST_ELEMENT (vagg)->sinkpads; tmp; tmp = tmp->next) {
+    pad = tmp->data;
+    va_pad = GST_VA_COMPOSITOR_PAD (pad);
+
+    g_assert (!GST_IS_VIDEO_AGGREGATOR_CONVERT_PAD (pad));
+
+    if (!pad->info.finfo)
+      continue;
+
+    if (!va_pad->sinkpad_caps)
+      continue;
+
+    fmt = GST_VIDEO_INFO_FORMAT (&va_pad->in_info);
+    if (fmt == GST_VIDEO_FORMAT_UNKNOWN)
+      continue;
+
+    if (va_formats) {
+      for (i = 0; i < va_formats->len; i++) {
+        if (fmt == g_array_index (va_formats, GstVideoFormat, i))
+          break;
+      }
+
+      if (i < va_formats->len)
+        best_va = _choose_format (best_va, fmt);
+    }
+
+    if (dma_formats) {
+      for (i = 0; i < dma_formats->len; i++) {
+        if (fmt == g_array_index (dma_formats, GstVideoFormat, i))
+          break;
+      }
+
+      if (i < dma_formats->len)
+        best_dma = _choose_format (best_dma, fmt);
+    }
+
+    if (sys_formats) {
+      for (i = 0; i < sys_formats->len; i++) {
+        if (fmt == g_array_index (sys_formats, GstVideoFormat, i))
+          break;
+      }
+
+      if (i < sys_formats->len)
+        best_sys = _choose_format (best_sys, fmt);
+    }
+  }
+
+  GST_OBJECT_UNLOCK (vagg);
+
+  if (va_formats) {
+    if (best_va != GST_VIDEO_FORMAT_UNKNOWN) {
+      clip_caps = _caps_from_format_and_feature (best_va,
+          DRM_FORMAT_MOD_INVALID, GST_CAPS_FEATURE_MEMORY_VA);
+    } else {
+      clip_caps = gst_caps_new_empty_simple ("video/x-raw");
+      gst_caps_set_features_simple (clip_caps,
+          gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_VA));
+    }
+  } else if (dma_formats) {
+    g_assert (dma_formats->len == modifiers->len);
+
+    if (best_dma != GST_VIDEO_FORMAT_UNKNOWN) {
+      for (i = 0; i < dma_formats->len; i++) {
+        if (best_dma == g_array_index (dma_formats, GstVideoFormat, i))
+          break;
+      }
+
+      g_assert (i < dma_formats->len);
+      g_assert (i < modifiers->len);
+      clip_caps = _caps_from_format_and_feature (best_dma,
+          g_array_index (modifiers, guint64, i),
+          GST_CAPS_FEATURE_MEMORY_DMABUF);
+    } else {
+      clip_caps = gst_caps_new_empty_simple ("video/x-raw");
+      gst_caps_set_features_simple (clip_caps,
+          gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_DMABUF));
+    }
+  } else if (sys_formats) {
+    if (best_sys != GST_VIDEO_FORMAT_UNKNOWN) {
+      clip_caps = _caps_from_format_and_feature (best_sys,
+          DRM_FORMAT_MOD_INVALID, GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
+    } else {
+      clip_caps = gst_caps_new_empty_simple ("video/x-raw");
+    }
+  }
+
+  if (clip_caps)
+    ret_caps = gst_caps_intersect (src_caps, clip_caps);
+
+  if (clip_caps)
+    gst_caps_unref (clip_caps);
+  if (va_formats)
+    g_array_unref (va_formats);
+  if (dma_formats)
+    g_array_unref (dma_formats);
+  if (modifiers)
+    g_array_unref (modifiers);
+  if (sys_formats)
+    g_array_unref (sys_formats);
+
+  GST_DEBUG_OBJECT (vagg, "update src caps: %" GST_PTR_FORMAT
+      "get result caps: %" GST_PTR_FORMAT, src_caps, ret_caps);
+
+  return ret_caps;
+}
+
+static gboolean
+gst_va_compositor_pad_set_info_unlocked (GstVaCompositorPad * pad,
+    GstCaps * caps)
+{
+  if (!gst_video_is_dma_drm_caps (caps)) {
+    gst_video_info_dma_drm_init (&pad->in_drm_info);
+    return gst_video_info_from_caps (&pad->in_info, caps);
+  }
+
+  if (!gst_video_info_dma_drm_from_caps (&pad->in_drm_info, caps))
+    return FALSE;
+  if (!gst_va_dma_drm_info_to_video_info (&pad->in_drm_info, &pad->in_info))
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+gst_va_compositor_sink_event (GstAggregator * agg, GstAggregatorPad * bpad,
+    GstEvent * event)
+{
+  GstVaCompositorPad *va_pad = GST_VA_COMPOSITOR_PAD (bpad);
+  GstCaps *caps;
+
+  if (GST_EVENT_TYPE (event) == GST_EVENT_CAPS) {
+    gst_event_parse_caps (event, &caps);
+
+    GST_OBJECT_LOCK (agg);
+    if (!gst_va_compositor_pad_set_info_unlocked (va_pad, caps)) {
+      GST_OBJECT_UNLOCK (agg);
+      return FALSE;
+    }
+    gst_caps_replace (&va_pad->sinkpad_caps, caps);
+    GST_OBJECT_UNLOCK (agg);
+  }
+
+  return GST_AGGREGATOR_CLASS (parent_class)->sink_event (agg, bpad, event);
+}
+
 /* *INDENT-OFF* */
 static const gchar *caps_str =
     GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_VA,
@@ -1337,7 +1559,7 @@
     long_name = g_strdup ("VA-API Video Compositor");
   }
 
-  display = gst_va_display_drm_new_from_path (klass->render_device_path);
+  display = gst_va_display_platform_new (klass->render_device_path);
   filter = gst_va_filter_new (display);
 
   if (gst_va_filter_open (filter)) {
@@ -1394,11 +1616,13 @@
       GST_DEBUG_FUNCPTR (gst_va_compositor_negotiated_src_caps);
   agg_class->decide_allocation =
       GST_DEBUG_FUNCPTR (gst_va_compositor_decide_allocation);
+  agg_class->sink_event = GST_DEBUG_FUNCPTR (gst_va_compositor_sink_event);
 
   vagg_class->aggregate_frames =
       GST_DEBUG_FUNCPTR (gst_va_compositor_aggregate_frames);
   vagg_class->create_output_buffer =
       GST_DEBUG_FUNCPTR (gst_va_compositor_create_output_buffer);
+  vagg_class->update_caps = GST_DEBUG_FUNCPTR (gst_va_compositor_update_caps);
 
   /**
    * GstVaCompositor:device-path:
@@ -1406,8 +1630,8 @@
    * It shows the DRM device path used for the VA operation, if any.
    */
   propertiesPROP_DEVICE_PATH = g_param_spec_string ("device-path",
-      "Device Path", "DRM device path", NULL,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+      "Device Path", GST_VA_DEVICE_PATH_PROP_DESC, NULL,
+      GST_PARAM_DOC_SHOW_DEFAULT | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   /**
    * GstVaCompositor:scale-method:
@@ -1514,24 +1738,9 @@
 
   type_info.class_data = cdata;
 
-  type_name = g_strdup ("GstVaCompositor");
-  feature_name = g_strdup ("vacompositor");
-
-  /* The first compositor to be registered should use a constant
-   * name, like vacompositor, for any additional compositors, we
-   * create unique names, using the render device name. */
-  if (g_type_from_name (type_name)) {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    g_free (type_name);
-    g_free (feature_name);
-    type_name = g_strdup_printf ("GstVa%sCompositor", basename);
-    feature_name = g_strdup_printf ("va%scompositor", basename);
-    cdata->description = basename;
-
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
-  }
+  gst_va_create_feature_name (device, "GstVaCompositor", "GstVa%sCompositor",
+      &type_name, "vacompositor", "va%scompositor", &feature_name,
+      &cdata->description, &rank);
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvadecoder.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvadecoder.c Changed

@@ -197,6 +197,8 @@
   g_return_val_if_fail (GST_IS_VA_DISPLAY (display), NULL);
 
   self = g_object_new (GST_TYPE_VA_DECODER, "display", display, NULL);
+  gst_object_ref_sink (self);
+
   if (!gst_va_decoder_initialize (self, codec))
     gst_clear_object (&self);
 
@@ -725,15 +727,17 @@
 static gboolean
 _destroy_buffers (GstVaDecodePicture * pic)
 {
+  GstVaDisplay *display;
   VABufferID buffer;
   VADisplay dpy;
   VAStatus status;
   guint i;
   gboolean ret = TRUE;
 
-  g_return_val_if_fail (GST_IS_VA_DISPLAY (pic->display), FALSE);
-
-  dpy = gst_va_display_get_va_dpy (pic->display);
+  display = gst_va_buffer_peek_display (pic->gstbuffer);
+  if (!display)
+    return FALSE;
+  dpy = gst_va_display_get_va_dpy (display);
 
   if (pic->buffers) {
     for (i = 0; i < pic->buffers->len; i++) {
@@ -773,11 +777,10 @@
   g_return_val_if_fail (buffer && GST_IS_BUFFER (buffer), NULL);
   g_return_val_if_fail (self && GST_IS_VA_DECODER (self), NULL);
 
-  pic = g_slice_new (GstVaDecodePicture);
+  pic = g_new (GstVaDecodePicture, 1);
   pic->gstbuffer = gst_buffer_ref (buffer);
   pic->buffers = g_array_sized_new (FALSE, FALSE, sizeof (VABufferID), 16);
   pic->slices = g_array_sized_new (FALSE, FALSE, sizeof (VABufferID), 64);
-  pic->display = gst_object_ref (self->display);
 
   return pic;
 }
@@ -810,9 +813,8 @@
   gst_buffer_unref (pic->gstbuffer);
   g_clear_pointer (&pic->buffers, g_array_unref);
   g_clear_pointer (&pic->slices, g_array_unref);
-  gst_clear_object (&pic->display);
 
-  g_slice_free (GstVaDecodePicture, pic);
+  g_free (pic);
 }
 
 GstVaDecodePicture *
@@ -822,9 +824,8 @@
 
   g_return_val_if_fail (pic, NULL);
 
-  dup = g_slice_new0 (GstVaDecodePicture);
+  dup = g_new0 (GstVaDecodePicture, 1);
 
-  dup->display = gst_object_ref (pic->display);
   /* dups only need gstbuffer */
   dup->gstbuffer = gst_buffer_ref (pic->gstbuffer);
   return dup;

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvadecoder.h -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvadecoder.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvadeinterlace.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvadeinterlace.c Changed

@@ -59,6 +59,7 @@
 #include "gstvacaps.h"
 #include "gstvadisplay_priv.h"
 #include "gstvafilter.h"
+#include "gstvapluginutils.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_va_deinterlace_debug);
 #define GST_CAT_DEFAULT gst_va_deinterlace_debug
@@ -718,7 +719,7 @@
       "Filter/Effect/Video/Deinterlace",
       "VA-API based deinterlacer", "Víctor Jáquez <vjaquez@igalia.com>");
 
-  display = gst_va_display_drm_new_from_path (btrans_class->render_device_path);
+  display = gst_va_display_platform_new (btrans_class->render_device_path);
   filter = gst_va_filter_new (display);
 
   if (gst_va_filter_open (filter)) {
@@ -828,24 +829,9 @@
 
   type_info.class_data = cdata;
 
-  type_name = g_strdup ("GstVaDeinterlace");
-  feature_name = g_strdup ("vadeinterlace");
-
-  /* The first postprocessor to be registered should use a constant
-   * name, like vadeinterlace, for any additional postprocessors, we
-   * create unique names, using inserting the render device name. */
-  if (g_type_from_name (type_name)) {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    g_free (type_name);
-    g_free (feature_name);
-    type_name = g_strdup_printf ("GstVa%sDeinterlace", basename);
-    feature_name = g_strdup_printf ("va%sdeinterlace", basename);
-    cdata->description = basename;
-
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
-  }
+  gst_va_create_feature_name (device, "GstVaDeinterlace", "GstVa%sDeinterlace",
+      &type_name, "vadeinterlace", "va%sdeinterlace", &feature_name,
+      &cdata->description, &rank);
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvadevice_linux.c Added

@@ -0,0 +1,142 @@
+/* GStreamer
+ * Copyright (C) 2020 Igalia, S.L.
+ *     Author: Víctor Jáquez <vjaquez@igalia.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstvadevice.h"
+
+#ifdef HAVE_GUDEV
+#include <gudev/gudev.h>
+#endif
+
+#define GST_CAT_DEFAULT gstva_debug
+GST_DEBUG_CATEGORY_EXTERN (gstva_debug);
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstVaDevice, gst_va_device);
+
+static void
+gst_va_device_free (GstVaDevice * device)
+{
+  gst_clear_object (&device->display);
+  g_free (device->render_device_path);
+  g_free (device);
+}
+
+static GstVaDevice *
+gst_va_device_new (GstVaDisplay * display, const gchar * render_device_path,
+    gint index)
+{
+  GstVaDevice *device = g_new0 (GstVaDevice, 1);
+
+  gst_mini_object_init (GST_MINI_OBJECT_CAST (device), 0, GST_TYPE_VA_DEVICE,
+      NULL, NULL, (GstMiniObjectFreeFunction) gst_va_device_free);
+
+  /* take ownership */
+  device->display = display;
+  device->render_device_path = g_strdup (render_device_path);
+  device->index = index;
+
+  return device;
+}
+
+#ifdef HAVE_GUDEV
+static gint
+compare_udev_path (gconstpointer a, gconstpointer b)
+{
+  GUdevDevice *pa = (GUdevDevice *) a;
+  GUdevDevice *pb = (GUdevDevice *) b;
+
+  return g_strcmp0 (g_udev_device_get_device_file (pa),
+      g_udev_device_get_device_file (pb));
+}
+
+GList *
+gst_va_device_find_devices (void)
+{
+  GUdevClient *client;
+  GList *udev_devices, *dev;
+  GQueue devices = G_QUEUE_INIT;
+  gint i = 0;
+
+  client = g_udev_client_new (NULL);
+  udev_devices = g_udev_client_query_by_subsystem (client, "drm");
+
+  if (!udev_devices) {
+    g_object_unref (client);
+    return NULL;
+  }
+
+  udev_devices = g_list_sort (udev_devices, compare_udev_path);
+
+  for (dev = udev_devices; dev; dev = g_list_next (dev)) {
+    GstVaDisplay *dpy;
+    GUdevDevice *udev = (GUdevDevice *) dev->data;
+    const gchar *path = g_udev_device_get_device_file (udev);
+    const gchar *name = g_udev_device_get_name (udev);
+
+    if (!path || !g_str_has_prefix (name, "renderD")) {
+      GST_LOG ("Ignoring %s in %s", name, path);
+      continue;
+    }
+
+    if (!(dpy = gst_va_display_drm_new_from_path (path)))
+      continue;
+
+    GST_INFO ("Found VA-API device: %s", path);
+    g_queue_push_tail (&devices, gst_va_device_new (dpy, path, i++));
+  }
+
+  g_list_free_full (udev_devices, g_object_unref);
+  g_object_unref (client);
+
+  return devices.head;
+}
+#else
+GList *
+gst_va_device_find_devices (void)
+{
+  GstVaDisplay *dpy;
+  GQueue devices = G_QUEUE_INIT;
+  gchar path64;
+  guint i, j = 0;
+
+  for (i = 0; i < 8; i++) {
+    g_snprintf (path, sizeof (path), "/dev/dri/renderD%d", 128 + i);
+    if (!g_file_test (path, G_FILE_TEST_EXISTS))
+      continue;
+
+    if (!(dpy = gst_va_display_drm_new_from_path (path)))
+      continue;
+
+    GST_INFO ("Found VA-API device: %s", path);
+    g_queue_push_tail (&devices, gst_va_device_new (dpy, path, j++));
+  }
+
+  return devices.head;
+}
+#endif
+
+void
+gst_va_device_list_free (GList * devices)
+{
+  g_list_free_full (devices, (GDestroyNotify) gst_mini_object_unref);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvadevice_win32.cpp Added

@@ -0,0 +1,116 @@
+/* GStreamer
+ * Copyright (C) 2020 Igalia, S.L.
+ *     Author: Víctor Jáquez <vjaquez@igalia.com>
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstvadevice.h"
+
+#include <wrl.h>
+#include <dxgi.h>
+#include <string>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+extern "C" {
+GST_DEBUG_CATEGORY_EXTERN (gstva_debug);
+#define GST_CAT_DEFAULT gstva_debug
+}
+/* *INDENT-ON* */
+
+GST_DEFINE_MINI_OBJECT_TYPE (GstVaDevice, gst_va_device);
+
+static void
+gst_va_device_free (GstVaDevice * device)
+{
+  gst_clear_object (&device->display);
+  g_free (device->render_device_path);
+  g_free (device);
+}
+
+static GstVaDevice *
+gst_va_device_new (GstVaDisplay * display, const gchar * render_device_path,
+    gint index)
+{
+  GstVaDevice *device = g_new0 (GstVaDevice, 1);
+
+  gst_mini_object_init (GST_MINI_OBJECT_CAST (device), 0, GST_TYPE_VA_DEVICE,
+      NULL, NULL, (GstMiniObjectFreeFunction) gst_va_device_free);
+
+  /* take ownership */
+  device->display = display;
+  device->render_device_path = g_strdup (render_device_path);
+  device->index = index;
+
+  return device;
+}
+
+GList *
+gst_va_device_find_devices (void)
+{
+  HRESULT hr;
+  ComPtr < IDXGIFactory1 > factory;
+  GList *ret = nullptr;
+  guint idx = 0;
+
+  hr = CreateDXGIFactory1 (IID_PPV_ARGS (&factory));
+  if (FAILED (hr))
+    return nullptr;
+
+  for (guint i = 0;; i++) {
+    ComPtr < IDXGIAdapter > adapter;
+    LARGE_INTEGER val;
+    DXGI_ADAPTER_DESC desc;
+    std::string luid_str;
+    GstVaDisplay *dpy;
+    GstVaDevice *dev;
+
+    hr = factory->EnumAdapters (i, &adapter);
+    if (FAILED (hr))
+      break;
+
+    hr = adapter->GetDesc (&desc);
+    if (FAILED (hr))
+      continue;
+
+    val.LowPart = desc.AdapterLuid.LowPart;
+    val.HighPart = desc.AdapterLuid.HighPart;
+
+    luid_str = std::to_string (val.QuadPart);
+    dpy = gst_va_display_win32_new (luid_str.c_str ());
+    if (!dpy)
+      continue;
+
+    dev = gst_va_device_new (dpy, luid_str.c_str (), idx);
+    ret = g_list_append (ret, dev);
+    idx++;
+  }
+
+  return ret;
+}
+
+void
+gst_va_device_list_free (GList * devices)
+{
+  g_list_free_full (devices, (GDestroyNotify) gst_mini_object_unref);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvaencoder.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvaencoder.c Changed

@@ -26,6 +26,7 @@
 #include "gstvaencoder.h"
 
 #include <gst/va/gstvavideoformat.h>
+#include <gst/va/vasurfaceimage.h>
 
 #include "gstvacaps.h"
 #include "gstvaprofile.h"
@@ -261,6 +262,51 @@
   return TRUE;
 }
 
+/* for querying the customized surface alignment */
+guint
+gst_va_encoder_get_surface_alignment (GstVaDisplay * display,
+    VAProfile profile, VAEntrypoint entrypoint)
+{
+  guint alignment = 0;
+#if VA_CHECK_VERSION(1, 21, 0)
+  VAConfigAttrib *attrib = NULL;
+  VASurfaceAttrib *attr_list;
+  guint i, count;
+  VAConfigID config;
+  VADisplay dpy;
+  VAStatus status;
+
+  dpy = gst_va_display_get_va_dpy (display);
+  status = vaCreateConfig (dpy, profile, entrypoint, attrib, 0, &config);
+  if (status != VA_STATUS_SUCCESS) {
+    GST_ERROR_OBJECT (display, "vaCreateConfig: %s", vaErrorStr (status));
+    return alignment;
+  }
+  attr_list = gst_va_get_surface_attribs (display, config, &count);
+  if (!attr_list)
+    goto bail;
+
+  for (i = 0; i < count; i++) {
+    if (attr_listi.type == VASurfaceAttribAlignmentSize) {
+      alignment = attr_listi.value.value.i;
+      GST_INFO_OBJECT (display,
+          "Using customized surface alignment %dx%d\n",
+          1 << (alignment & 0xf), 1 << ((alignment & 0xf0) >> 4));
+      break;
+    }
+  }
+  g_free (attr_list);
+
+bail:
+  status = vaDestroyConfig (dpy, config);
+  if (status != VA_STATUS_SUCCESS) {
+    GST_ERROR_OBJECT (display, "vaDestroyConfig: %s", vaErrorStr (status));
+    return alignment;
+  }
+#endif
+  return alignment;
+}
+
 static GArray *
 _get_surface_formats (GstVaDisplay * display, VAConfigID config)
 {
@@ -305,16 +351,16 @@
     guint max_buffers)
 {
   GstAllocator *allocator = NULL;
-  guint usage_hint = VA_SURFACE_ATTRIB_USAGE_HINT_ENCODER;
+  guint usage_hint;
   GstVideoInfo info;
   GstAllocationParams params = { 0, };
   GstBufferPool *pool;
-  guint size;
   GstCaps *caps = NULL;
 
   gst_video_info_set_format (&info, format, coded_width, coded_height);
 
-  size = GST_VIDEO_INFO_SIZE (&info);
+  usage_hint = va_get_surface_usage_hint (display,
+      VAEntrypointEncSlice, GST_PAD_SINK, FALSE);
 
   caps = gst_video_info_to_caps (&info);
   gst_caps_set_features_simple (caps,
@@ -322,9 +368,7 @@
 
   allocator = gst_va_allocator_new (display, surface_formats);
 
-  gst_allocation_params_init (&params);
-
-  pool = gst_va_pool_new_with_config (caps, size, 0, max_buffers, usage_hint,
+  pool = gst_va_pool_new_with_config (caps, 0, max_buffers, usage_hint,
       GST_VA_FEATURE_AUTO, allocator, &params);
 
   gst_clear_object (&allocator);
@@ -532,6 +576,8 @@
 
   self = g_object_new (GST_TYPE_VA_ENCODER, "display", display,
       "va-entrypoint", entrypoint, NULL);
+  gst_object_ref_sink (self);
+
   if (!gst_va_encoder_initialize (self, codec))
     gst_clear_object (&self);
 
@@ -679,7 +725,6 @@
 gst_va_encoder_get_prediction_direction (GstVaEncoder * self,
     VAProfile profile, VAEntrypoint entrypoint)
 {
-#if VA_CHECK_VERSION(1,9,0)
   VAStatus status;
   VADisplay dpy;
   VAConfigAttrib attrib = {.type = VAConfigAttribPredictionDirection };
@@ -708,9 +753,6 @@
 
   return attrib.value & (VA_PREDICTION_DIRECTION_PREVIOUS |
       VA_PREDICTION_DIRECTION_FUTURE | VA_PREDICTION_DIRECTION_BI_NOT_EMPTY);
-#else
-  return 0;
-#endif
 }
 
 guint32
@@ -1045,15 +1087,18 @@
 static gboolean
 _destroy_all_buffers (GstVaEncodePicture * pic)
 {
+  GstVaDisplay *display;
   VABufferID buffer;
   guint i;
   gboolean ret = TRUE;
 
-  g_return_val_if_fail (GST_IS_VA_DISPLAY (pic->display), FALSE);
+  display = gst_va_buffer_peek_display (pic->raw_buffer);
+  if (!display)
+    return FALSE;
 
   for (i = 0; i < pic->params->len; i++) {
     buffer = g_array_index (pic->params, VABufferID, i);
-    ret &= _destroy_buffer (pic->display, buffer);
+    ret &= _destroy_buffer (display, buffer);
   }
   pic->params = g_array_set_size (pic->params, 0);
 
@@ -1201,10 +1246,9 @@
     return NULL;
   }
 
-  pic = g_slice_new (GstVaEncodePicture);
+  pic = g_new (GstVaEncodePicture, 1);
   pic->raw_buffer = gst_buffer_ref (raw_buffer);
   pic->reconstruct_buffer = reconstruct_buffer;
-  pic->display = gst_object_ref (self->display);
   pic->coded_buffer = coded_buffer;
 
   pic->params = g_array_sized_new (FALSE, FALSE, sizeof (VABufferID), 8);
@@ -1215,20 +1259,25 @@
 void
 gst_va_encode_picture_free (GstVaEncodePicture * pic)
 {
+  GstVaDisplay *display;
+
   g_return_if_fail (pic);
 
   _destroy_all_buffers (pic);
 
+  display = gst_va_buffer_peek_display (pic->raw_buffer);
+  if (!display)
+    return;
+
   if (pic->coded_buffer != VA_INVALID_ID)
-    _destroy_buffer (pic->display, pic->coded_buffer);
+    _destroy_buffer (display, pic->coded_buffer);
 
   gst_buffer_unref (pic->raw_buffer);
   gst_buffer_unref (pic->reconstruct_buffer);
 
   g_clear_pointer (&pic->params, g_array_unref);
-  gst_clear_object (&pic->display);
 
-  g_slice_free (GstVaEncodePicture, pic);
+  g_free (pic);
 }
 
 /* currently supported rate controls */

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvaencoder.h -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvaencoder.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvafilter.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvafilter.c Changed

@@ -171,9 +171,14 @@
 GstVaFilter *
 gst_va_filter_new (GstVaDisplay * display)
 {
+  GstVaFilter *self;
+
   g_return_val_if_fail (GST_IS_VA_DISPLAY (display), NULL);
 
-  return g_object_new (GST_TYPE_VA_FILTER, "display", display, NULL);
+  self = g_object_new (GST_TYPE_VA_FILTER, "display", display, NULL);
+  gst_object_ref_sink (self);
+
+  return self;
 }
 
 gboolean
@@ -446,9 +451,7 @@
   F(TotalColorCorrection, VAProcTotalColorCorrectionCount),
   F(HVSNoiseReduction, 0),
   F(HighDynamicRangeToneMapping, VAProcHighDynamicRangeMetadataTypeCount),
-#if VA_CHECK_VERSION (1, 12, 0)
   F(3DLUT, 16),
-#endif
 #undef F
 };
 /* *INDENT-ON* */
@@ -485,9 +488,7 @@
     VAProcFilterCapTotalColorCorrection ccVAProcTotalColorCorrectionCount;
       VAProcFilterCapHighDynamicRange
         hdrVAProcHighDynamicRangeMetadataTypeCount;
-#if VA_CHECK_VERSION (1, 12, 0)
     VAProcFilterCap3DLUT lut16;
-#endif
   } caps;
 };
 
@@ -1075,10 +1076,11 @@
   }
   if (mem_types & VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME
       || mem_types & VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2) {
-    feature_caps = gst_caps_copy (base_caps);
-    features = gst_caps_features_from_string (GST_CAPS_FEATURE_MEMORY_DMABUF);
-    gst_caps_set_features_simple (feature_caps, features);
-    caps = gst_caps_merge (caps, feature_caps);
+    feature_caps = gst_va_create_dma_caps (self->display,
+        VAEntrypointVideoProc, surface_formats,
+        self->min_width, self->max_width, self->min_height, self->max_height);
+    if (feature_caps)
+      caps = gst_caps_merge (caps, feature_caps);
   }
 
   gst_caps_unref (base_caps);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvah264dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvah264dec.c Changed

@@ -123,8 +123,8 @@
   GST_LOG_OBJECT (self,
       "Outputting picture %p (poc %d)", picture, picture->pic_order_cnt);
 
-  ret = gst_va_base_dec_process_output (base, frame, picture->discont_state,
-      picture->buffer_flags);
+  ret = gst_va_base_dec_process_output (base, frame,
+      GST_CODEC_PICTURE (picture)->discont_state, picture->buffer_flags);
   gst_h264_picture_unref (picture);
 
   if (ret)
@@ -967,22 +967,9 @@
 
   type_info.class_data = cdata;
 
-  /* The first decoder to be registered should use a constant name,
-   * like vah264dec, for any additional decoders, we create unique
-   * names, using inserting the render device name. */
-  if (device->index == 0) {
-    type_name = g_strdup ("GstVaH264Dec");
-    feature_name = g_strdup ("vah264dec");
-  } else {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    type_name = g_strdup_printf ("GstVa%sH264Dec", basename);
-    feature_name = g_strdup_printf ("va%sh264dec", basename);
-    cdata->description = basename;
-
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
-  }
+  gst_va_create_feature_name (device, "GstVaH264Dec", "GstVa%sH264Dec",
+      &type_name, "vah264dec", "va%sh264dec", &feature_name,
+      &cdata->description, &rank);
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvah264enc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvah264enc.c Changed

@@ -66,6 +66,7 @@
 #include "gstvaencoder.h"
 #include "gstvaprofile.h"
 #include "vacompat.h"
+#include "gstvapluginutils.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_va_h264enc_debug);
 #define GST_CAT_DEFAULT gst_va_h264enc_debug
@@ -99,10 +100,10 @@
   PROP_BITRATE,
   PROP_TARGET_PERCENTAGE,
   PROP_TARGET_USAGE,
-  PROP_RATE_CONTROL,
   PROP_CPB_SIZE,
   PROP_AUD,
   PROP_CC,
+  PROP_RATE_CONTROL,
   N_PROPERTIES
 };
 
@@ -228,6 +229,8 @@
     guint32 ref_num_list1;
 
     guint num_reorder_frames;
+
+    GstVideoCodecFrame *last_keyframe;
   } gop;
 
   struct
@@ -274,9 +277,6 @@
    * explicitly. */
   gint unused_for_reference_pic_num;
 
-  /* The total frame count we handled. */
-  guint total_frame_count;
-
   gboolean last_frame;
 };
 
@@ -309,26 +309,26 @@
 /* *INDENT-OFF* */
 static const GstVaH264LevelLimits _va_h264_level_limits = {
   /* level   idc   MaxMBPS   MaxFS   MaxDpbMbs  MaxBR   MaxCPB  MinCr */
-  {  "1",    10,   1485,     99,     396,       64,     175,    2 },
-  {  "1b",   11,   1485,     99,     396,       128,    350,    2 },
-  {  "1.1",  11,   3000,     396,    900,       192,    500,    2 },
-  {  "1.2",  12,   6000,     396,    2376,      384,    1000,   2 },
-  {  "1.3",  13,   11880,    396,    2376,      768,    2000,   2 },
-  {  "2",    20,   11880,    396,    2376,      2000,   2000,   2 },
-  {  "2.1",  21,   19800,    792,    4752,      4000,   4000,   2 },
-  {  "2.2",  22,   20250,    1620,   8100,      4000,   4000,   2 },
-  {  "3",    30,   40500,    1620,   8100,      10000,  10000,  2 },
-  {  "3.1",  31,   108000,   3600,   18000,     14000,  14000,  4 },
-  {  "3.2",  32,   216000,   5120,   20480,     20000,  20000,  4 },
-  {  "4",    40,   245760,   8192,   32768,     20000,  25000,  4 },
-  {  "4.1",  41,   245760,   8192,   32768,     50000,  62500,  2 },
-  {  "4.2",  42,   522240,   8704,   34816,     50000,  62500,  2 },
-  {  "5",    50,   589824,   22080,  110400,    135000, 135000, 2 },
-  {  "5.1",  51,   983040,   36864,  184320,    240000, 240000, 2 },
-  {  "5.2",  52,   2073600,  36864,  184320,    240000, 240000, 2 },
-  {  "6",    60,   4177920,  139264, 696320,    240000, 240000, 2 },
-  {  "6.1",  61,   8355840,  139264, 696320,    480000, 480000, 2 },
-  {  "6.2",  62,  16711680,  139264, 696320,    800000, 800000, 2 },
+  {  "1",    GST_H264_LEVEL_L1,   1485,     99,     396,       64,     175,    2 },
+  {  "1b",   GST_H264_LEVEL_L1B,   1485,     99,     396,       128,    350,    2 },
+  {  "1.1",  GST_H264_LEVEL_L1_1,   3000,     396,    900,       192,    500,    2 },
+  {  "1.2",  GST_H264_LEVEL_L1_2,   6000,     396,    2376,      384,    1000,   2 },
+  {  "1.3",  GST_H264_LEVEL_L1_3,   11880,    396,    2376,      768,    2000,   2 },
+  {  "2",    GST_H264_LEVEL_L2,   11880,    396,    2376,      2000,   2000,   2 },
+  {  "2.1",  GST_H264_LEVEL_L2_1,   19800,    792,    4752,      4000,   4000,   2 },
+  {  "2.2",  GST_H264_LEVEL_L2_2,   20250,    1620,   8100,      4000,   4000,   2 },
+  {  "3",    GST_H264_LEVEL_L3,   40500,    1620,   8100,      10000,  10000,  2 },
+  {  "3.1",  GST_H264_LEVEL_L3_1,   108000,   3600,   18000,     14000,  14000,  4 },
+  {  "3.2",  GST_H264_LEVEL_L3_2,   216000,   5120,   20480,     20000,  20000,  4 },
+  {  "4",    GST_H264_LEVEL_L4,   245760,   8192,   32768,     20000,  25000,  4 },
+  {  "4.1",  GST_H264_LEVEL_L4_1,   245760,   8192,   32768,     50000,  62500,  2 },
+  {  "4.2",  GST_H264_LEVEL_L4_2,   522240,   8704,   34816,     50000,  62500,  2 },
+  {  "5",    GST_H264_LEVEL_L5,   589824,   22080,  110400,    135000, 135000, 2 },
+  {  "5.1",  GST_H264_LEVEL_L5_1,   983040,   36864,  184320,    240000, 240000, 2 },
+  {  "5.2",  GST_H264_LEVEL_L5_2,   2073600,  36864,  184320,    240000, 240000, 2 },
+  {  "6",    GST_H264_LEVEL_L6,   4177920,  139264, 696320,    240000, 240000, 2 },
+  {  "6.1",  GST_H264_LEVEL_L6_1,   8355840,  139264, 696320,    480000, 480000, 2 },
+  {  "6.2",  GST_H264_LEVEL_L6_2,  16711680,  139264, 696320,    800000, 800000, 2 },
 };
 /* *INDENT-ON* */
 
@@ -375,11 +375,10 @@
 {
   GstVaH264EncFrame *frame;
 
-  frame = g_slice_new (GstVaH264EncFrame);
+  frame = g_new (GstVaH264EncFrame, 1);
   frame->frame_num = 0;
   frame->unused_for_reference_pic_num = -1;
   frame->picture = NULL;
-  frame->total_frame_count = 0;
   frame->last_frame = FALSE;
 
   return frame;
@@ -390,7 +389,7 @@
 {
   GstVaH264EncFrame *frame = pframe;
   g_clear_pointer (&frame->picture, gst_va_encode_picture_free);
-  g_slice_free (GstVaH264EncFrame, frame);
+  g_free (frame);
 }
 
 static inline GstVaH264EncFrame *
@@ -600,8 +599,8 @@
 
     factor = (guint64) self->mb_width * self->mb_height * bits_per_mb;
     bitrate = gst_util_uint64_scale (factor,
-        GST_VIDEO_INFO_FPS_N (&base->input_state->info),
-        GST_VIDEO_INFO_FPS_D (&base->input_state->info)) / 1000;
+        GST_VIDEO_INFO_FPS_N (&base->in_info),
+        GST_VIDEO_INFO_FPS_D (&base->in_info)) / 1000;
     GST_INFO_OBJECT (self, "target bitrate computed to %u kbps", bitrate);
   }
 
@@ -703,8 +702,8 @@
   PicSizeMbs = self->mb_width * self->mb_height;
   MaxDpbMbs = PicSizeMbs * (self->gop.num_ref_frames + 1);
   MaxMBPS = gst_util_uint64_scale_int_ceil (PicSizeMbs,
-      GST_VIDEO_INFO_FPS_N (&base->input_state->info),
-      GST_VIDEO_INFO_FPS_D (&base->input_state->info));
+      GST_VIDEO_INFO_FPS_N (&base->in_info),
+      GST_VIDEO_INFO_FPS_D (&base->in_info));
 
   for (i = 0; i < G_N_ELEMENTS (_va_h264_level_limits); i++) {
     const GstVaH264LevelLimits *const limits = &_va_h264_level_limitsi;
@@ -948,9 +947,9 @@
 
   /* If not set, generate a idr every second */
   if (self->gop.idr_period == 0) {
-    self->gop.idr_period = (GST_VIDEO_INFO_FPS_N (&base->input_state->info)
-        + GST_VIDEO_INFO_FPS_D (&base->input_state->info) - 1) /
-        GST_VIDEO_INFO_FPS_D (&base->input_state->info);
+    self->gop.idr_period = (GST_VIDEO_INFO_FPS_N (&base->in_info)
+        + GST_VIDEO_INFO_FPS_D (&base->in_info) - 1) /
+        GST_VIDEO_INFO_FPS_D (&base->in_info);
   }
 
   /* Do not use a too huge GOP size. */
@@ -1345,7 +1344,7 @@
     goto out;
   }
 
-  in_format = GST_VIDEO_INFO_FORMAT (&base->input_state->info);
+  in_format = GST_VIDEO_INFO_FORMAT (&base->in_info);
   rt_format = _get_rtformat (self, in_format);
   if (!rt_format) {
     GST_ERROR_OBJECT (self, "unsupported video format %s",
@@ -1514,6 +1513,7 @@
   self->gop.ref_num_list0 = 0;
   self->gop.ref_num_list1 = 0;
   self->gop.num_reorder_frames = 0;
+  self->gop.last_keyframe = NULL;
 
   self->rc.max_bitrate = 0;
   self->rc.target_bitrate = 0;
@@ -1527,6 +1527,7 @@
 static gboolean
 gst_va_h264_enc_reconfig (GstVaBaseEnc * base)
 {
+  GstVaBaseEncClass *klass = GST_VA_BASE_ENC_GET_CLASS (base);
   GstVideoEncoder *venc = GST_VIDEO_ENCODER (base);
   GstVaH264Enc *self = GST_VA_H264_ENC (base);
   GstCaps *out_caps, *reconf_caps = NULL;
@@ -1537,9 +1538,9 @@
   guint max_ref_frames, max_surfaces = 0, rt_format = 0, codedbuf_size;
   gint width, height;
 
-  width = GST_VIDEO_INFO_WIDTH (&base->input_state->info);
-  height = GST_VIDEO_INFO_HEIGHT (&base->input_state->info);
-  format = GST_VIDEO_INFO_FORMAT (&base->input_state->info);
+  width = GST_VIDEO_INFO_WIDTH (&base->in_info);
+  height = GST_VIDEO_INFO_HEIGHT (&base->in_info);
+  format = GST_VIDEO_INFO_FORMAT (&base->in_info);
   codedbuf_size = base->codedbuf_size;
 
   need_negotiation =
@@ -1574,15 +1575,15 @@
   self->mb_height = GST_ROUND_UP_16 (base->height) / 16;
 
   /* Frame rate is needed for rate control and PTS setting. */
-  if (GST_VIDEO_INFO_FPS_N (&base->input_state->info) == 0
-      || GST_VIDEO_INFO_FPS_D (&base->input_state->info) == 0) {
+  if (GST_VIDEO_INFO_FPS_N (&base->in_info) == 0
+      || GST_VIDEO_INFO_FPS_D (&base->in_info) == 0) {
     GST_INFO_OBJECT (self, "Unknown framerate, just set to 30 fps");
-    GST_VIDEO_INFO_FPS_N (&base->input_state->info) = 30;
-    GST_VIDEO_INFO_FPS_D (&base->input_state->info) = 1;
+    GST_VIDEO_INFO_FPS_N (&base->in_info) = 30;
+    GST_VIDEO_INFO_FPS_D (&base->in_info) = 1;
   }
   base->frame_duration = gst_util_uint64_scale (GST_SECOND,
-      GST_VIDEO_INFO_FPS_D (&base->input_state->info),
-      GST_VIDEO_INFO_FPS_N (&base->input_state->info));
+      GST_VIDEO_INFO_FPS_D (&base->in_info),
+      GST_VIDEO_INFO_FPS_N (&base->in_info));
 
   GST_DEBUG_OBJECT (self, "resolution:%dx%d, MB size: %dx%d,"
       " frame duration is %" GST_TIME_FORMAT,
@@ -1637,7 +1638,7 @@
   /* Add some tags */
   gst_va_base_enc_add_codec_tag (base, "H264");
 
-  out_caps = gst_va_profile_caps (base->profile);
+  out_caps = gst_va_profile_caps (base->profile, klass->entrypoint);
   g_assert (out_caps);
   out_caps = gst_caps_fixate (out_caps);
 
@@ -1682,58 +1683,97 @@
 {
   GstVaH264Enc *self = GST_VA_H264_ENC (base);
   GstVaH264EncFrame *frame;
+  gboolean add_cached_key_frame = FALSE;
 
   g_return_val_if_fail (self->gop.cur_frame_index <= self->gop.idr_period,
       FALSE);
 
   if (gst_frame) {
-    /* Begin a new GOP, should have a empty reorder_list. */
-    if (self->gop.cur_frame_index == self->gop.idr_period) {
-      g_assert (g_queue_is_empty (&base->reorder_list));
-      self->gop.cur_frame_index = 0;
-      self->gop.cur_frame_num = 0;
-    }
-
     frame = _enc_frame (gst_frame);
-    frame->poc =
-        ((self->gop.cur_frame_index * 2) % self->gop.max_pic_order_cnt);
 
-    /* TODO: move most this logic onto vabaseenc class  */
-    if (self->gop.cur_frame_index == 0) {
-      g_assert (frame->poc == 0);
-      GST_LOG_OBJECT (self, "system_frame_number: %d, an IDR frame, starts"
-          " a new GOP", gst_frame->system_frame_number);
+    /* Force to insert the key frame inside a GOP, just end the current
+       GOP and start a new one. */
+    if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (gst_frame) &&
+        !(self->gop.cur_frame_index == 0 ||
+            self->gop.cur_frame_index == self->gop.idr_period)) {
+      GST_DEBUG_OBJECT (base, "system_frame_number: %d is a force key "
+          "frame(IDR), begin a new GOP.", gst_frame->system_frame_number);
+
+      frame->poc = 0;
+      frame->type = self->gop.frame_types0.slice_type;
+      frame->is_ref = self->gop.frame_types0.is_ref;
+      frame->pyramid_level = self->gop.frame_types0.pyramid_level;
+      frame->left_ref_poc_diff = self->gop.frame_types0.left_ref_poc_diff;
+      frame->right_ref_poc_diff = self->gop.frame_types0.right_ref_poc_diff;
+
+      /* The previous key frame should be already be poped out. */
+      g_assert (self->gop.last_keyframe == NULL);
+
+      /* An empty reorder list, start the new GOP immediately. */
+      if (g_queue_is_empty (&base->reorder_list)) {
+        self->gop.cur_frame_index = 1;
+        self->gop.cur_frame_num = 0;
+        g_queue_clear_full (&base->ref_list,
+            (GDestroyNotify) gst_video_codec_frame_unref);
+        last = FALSE;
+      } else {
+        /* Cache the key frame and end the current GOP.
+           Next time calling this push() without frame, start the new GOP. */
+        self->gop.last_keyframe = gst_frame;
+        last = TRUE;
+      }
 
-      g_queue_clear_full (&base->ref_list,
-          (GDestroyNotify) gst_video_codec_frame_unref);
+      add_cached_key_frame = TRUE;
+    } else {
+      /* Begin a new GOP, should have a empty reorder_list. */
+      if (self->gop.cur_frame_index == self->gop.idr_period) {
+        g_assert (g_queue_is_empty (&base->reorder_list));
+        self->gop.cur_frame_index = 0;
+        self->gop.cur_frame_num = 0;
+      }
 
-      GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (gst_frame);
-    }
+      frame->poc =
+          ((self->gop.cur_frame_index * 2) % self->gop.max_pic_order_cnt);
 
-    frame->type = self->gop.frame_typesself->gop.cur_frame_index.slice_type;
-    frame->is_ref = self->gop.frame_typesself->gop.cur_frame_index.is_ref;
-    frame->pyramid_level =
-        self->gop.frame_typesself->gop.cur_frame_index.pyramid_level;
-    frame->left_ref_poc_diff =
-        self->gop.frame_typesself->gop.cur_frame_index.left_ref_poc_diff;
-    frame->right_ref_poc_diff =
-        self->gop.frame_typesself->gop.cur_frame_index.right_ref_poc_diff;
-
-    if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (gst_frame)) {
-      GST_DEBUG_OBJECT (self, "system_frame_number: %d, a force key frame,"
-          " promote its type from %s to %s", gst_frame->system_frame_number,
-          _slice_type_name (frame->type), _slice_type_name (GST_H264_I_SLICE));
-      frame->type = GST_H264_I_SLICE;
-      frame->is_ref = TRUE;
-    }
-
-    GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, "
-        "frame type %s", gst_frame->system_frame_number, frame->poc,
-        _slice_type_name (frame->type));
+      /* TODO: move most this logic onto vabaseenc class  */
+      if (self->gop.cur_frame_index == 0) {
+        g_assert (frame->poc == 0);
+        GST_LOG_OBJECT (self, "system_frame_number: %d, an IDR frame, starts"
+            " a new GOP", gst_frame->system_frame_number);
 
-    self->gop.cur_frame_index++;
-    g_queue_push_tail (&base->reorder_list,
-        gst_video_codec_frame_ref (gst_frame));
+        g_queue_clear_full (&base->ref_list,
+            (GDestroyNotify) gst_video_codec_frame_unref);
+      }
+
+      frame->type = self->gop.frame_typesself->gop.cur_frame_index.slice_type;
+      frame->is_ref = self->gop.frame_typesself->gop.cur_frame_index.is_ref;
+      frame->pyramid_level =
+          self->gop.frame_typesself->gop.cur_frame_index.pyramid_level;
+      frame->left_ref_poc_diff =
+          self->gop.frame_typesself->gop.cur_frame_index.left_ref_poc_diff;
+      frame->right_ref_poc_diff =
+          self->gop.frame_typesself->gop.cur_frame_index.right_ref_poc_diff;
+
+      GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, "
+          "frame type %s", gst_frame->system_frame_number, frame->poc,
+          _slice_type_name (frame->type));
+
+      self->gop.cur_frame_index++;
+
+      g_queue_push_tail (&base->reorder_list,
+          gst_video_codec_frame_ref (gst_frame));
+    }
+  } else if (self->gop.last_keyframe) {
+    g_assert (self->gop.last_keyframe ==
+        g_queue_peek_tail (&base->reorder_list));
+    if (g_queue_get_length (&base->reorder_list) == 1) {
+      /* The last cached key frame begins a new GOP */
+      self->gop.cur_frame_index = 1;
+      self->gop.cur_frame_num = 0;
+      self->gop.last_keyframe = NULL;
+      g_queue_clear_full (&base->ref_list,
+          (GDestroyNotify) gst_video_codec_frame_unref);
+    }
   }
 
   /* ensure the last one a non-B and end the GOP. */
@@ -1753,6 +1793,12 @@
     }
   }
 
+  /* Insert the cached next key frame after ending the current GOP. */
+  if (add_cached_key_frame) {
+    g_queue_push_tail (&base->reorder_list,
+        gst_video_codec_frame_ref (gst_frame));
+  }
+
   return TRUE;
 }
 
@@ -1774,7 +1820,7 @@
 }
 
 static GstVideoCodecFrame *
-_pop_pyramid_b_frame (GstVaH264Enc * self)
+_pop_pyramid_b_frame (GstVaH264Enc * self, guint gop_len)
 {
   GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
   guint i;
@@ -1789,7 +1835,7 @@
   b_vaframe = NULL;
 
   /* Find the lowest level with smallest poc. */
-  for (i = 0; i < g_queue_get_length (&base->reorder_list); i++) {
+  for (i = 0; i < gop_len; i++) {
     GstVaH264EncFrame *vaf;
     GstVideoCodecFrame *f;
 
@@ -1821,7 +1867,7 @@
   /* Check whether its refs are already poped. */
   g_assert (b_vaframe->left_ref_poc_diff != 0);
   g_assert (b_vaframe->right_ref_poc_diff != 0);
-  for (i = 0; i < g_queue_get_length (&base->reorder_list); i++) {
+  for (i = 0; i < gop_len; i++) {
     GstVaH264EncFrame *vaf;
     GstVideoCodecFrame *f;
 
@@ -1863,6 +1909,7 @@
   GstVaH264Enc *self = GST_VA_H264_ENC (base);
   GstVaH264EncFrame *vaframe;
   GstVideoCodecFrame *frame;
+  guint gop_len;
   struct RefFramesCount count;
 
   g_return_val_if_fail (self->gop.cur_frame_index <= self->gop.idr_period,
@@ -1873,16 +1920,21 @@
   if (g_queue_is_empty (&base->reorder_list))
     return TRUE;
 
+  gop_len = g_queue_get_length (&base->reorder_list);
+
+  if (self->gop.last_keyframe && gop_len > 1)
+    gop_len--;
+
   /* Return the last pushed non-B immediately. */
-  frame = g_queue_peek_tail (&base->reorder_list);
+  frame = g_queue_peek_nth (&base->reorder_list, gop_len - 1);
   vaframe = _enc_frame (frame);
   if (vaframe->type != GST_H264_B_SLICE) {
-    frame = g_queue_pop_tail (&base->reorder_list);
+    frame = g_queue_pop_nth (&base->reorder_list, gop_len - 1);
     goto get_one;
   }
 
   if (self->gop.b_pyramid) {
-    frame = _pop_pyramid_b_frame (self);
+    frame = _pop_pyramid_b_frame (self, gop_len);
     if (frame == NULL)
       return TRUE;
     goto get_one;
@@ -2179,10 +2231,10 @@
     },
     .aspect_ratio_idc = 0xff,
     /* FIXME: what if no framerate info is provided */
-    .sar_width = GST_VIDEO_INFO_PAR_N (&base->input_state->info),
-    .sar_height = GST_VIDEO_INFO_PAR_D (&base->input_state->info),
-    .num_units_in_tick = GST_VIDEO_INFO_FPS_D (&base->input_state->info),
-    .time_scale = GST_VIDEO_INFO_FPS_N (&base->input_state->info) * 2,
+    .sar_width = GST_VIDEO_INFO_PAR_N (&base->in_info),
+    .sar_height = GST_VIDEO_INFO_PAR_D (&base->in_info),
+    .num_units_in_tick = GST_VIDEO_INFO_FPS_D (&base->in_info),
+    .time_scale = GST_VIDEO_INFO_FPS_N (&base->in_info) * 2,
   };
   /* *INDENT-ON* */
 
@@ -3032,26 +3084,52 @@
   /* begin from an IDR after flush. */
   self->gop.cur_frame_index = 0;
   self->gop.cur_frame_num = 0;
+  self->gop.last_keyframe = NULL;
 
   return GST_VIDEO_ENCODER_CLASS (parent_class)->flush (venc);
 }
 
-static void
-gst_va_h264_enc_prepare_output (GstVaBaseEnc * base, GstVideoCodecFrame * frame)
+static gboolean
+gst_va_h264_enc_prepare_output (GstVaBaseEnc * base,
+    GstVideoCodecFrame * frame, gboolean * complete)
 {
-  GstVaH264Enc *self = GST_VA_H264_ENC (base);
   GstVaH264EncFrame *frame_enc;
+  GstBuffer *buf;
 
   frame_enc = _enc_frame (frame);
 
-  frame->pts =
-      base->start_pts + base->frame_duration * frame_enc->total_frame_count;
-  /* The PTS should always be later than the DTS. */
-  frame->dts = base->start_pts + base->frame_duration *
-      ((gint64) base->output_frame_count -
-      (gint64) self->gop.num_reorder_frames);
-  base->output_frame_count++;
-  frame->duration = base->frame_duration;
+  frame->dts = gst_va_base_enc_pop_dts (base);
+  if (!GST_CLOCK_TIME_IS_VALID (frame->dts)) {
+    GST_DEBUG_OBJECT (base, "Pop invalid DTS.");
+  } else if (GST_CLOCK_TIME_IS_VALID (frame->pts) && frame->dts > frame->pts) {
+    GST_WARNING_OBJECT (base, "Pop DTS: %" GST_TIME_FORMAT " > PTS: %"
+        GST_TIME_FORMAT, GST_TIME_ARGS (frame->dts),
+        GST_TIME_ARGS (frame->pts));
+    frame->dts = frame->pts;
+  }
+
+  buf = gst_va_base_enc_create_output_buffer (base,
+      frame_enc->picture, NULL, 0);
+  if (!buf) {
+    GST_ERROR_OBJECT (base, "Failed to create output buffer");
+    return FALSE;
+  }
+
+  GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_MARKER);
+  if (frame_enc->poc == 0) {
+    GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
+    GST_BUFFER_FLAG_UNSET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
+    GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_HEADER);
+  } else {
+    GST_VIDEO_CODEC_FRAME_UNSET_SYNC_POINT (frame);
+    GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
+  }
+
+  gst_buffer_replace (&frame->output_buffer, buf);
+  gst_clear_buffer (&buf);
+
+  *complete = TRUE;
+  return TRUE;
 }
 
 static gint
@@ -3178,15 +3256,27 @@
 static gboolean
 gst_va_h264_enc_new_frame (GstVaBaseEnc * base, GstVideoCodecFrame * frame)
 {
+  GstVaH264Enc *self = GST_VA_H264_ENC (base);
   GstVaH264EncFrame *frame_in;
 
   frame_in = gst_va_enc_frame_new ();
-  frame_in->total_frame_count = base->input_frame_count++;
   gst_video_codec_frame_set_user_data (frame, frame_in, gst_va_enc_frame_free);
 
+  gst_va_base_enc_push_dts (base, frame, self->gop.num_reorder_frames);
+
   return TRUE;
 }
 
+static gboolean
+gst_va_h264_enc_start (GstVideoEncoder * venc)
+{
+  /* Set the minimum pts to some huge value (1000 hours). This keeps
+   * the dts at the start of the stream from needing to be negative. */
+  gst_video_encoder_set_min_pts (venc, GST_SECOND * 60 * 60 * 1000);
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->start (venc);
+}
+
 /* *INDENT-OFF* */
 static const gchar *sink_caps_str =
     GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_VA,
@@ -3520,6 +3610,7 @@
   object_class->get_property = gst_va_h264_enc_get_property;
 
   venc_class->flush = GST_DEBUG_FUNCPTR (gst_va_h264_enc_flush);
+  venc_class->start = GST_DEBUG_FUNCPTR (gst_va_h264_enc_start);
 
   va_enc_class->reset_state = GST_DEBUG_FUNCPTR (gst_va_h264_enc_reset_state);
   va_enc_class->reconfig = GST_DEBUG_FUNCPTR (gst_va_h264_enc_reconfig);
@@ -3531,8 +3622,7 @@
       GST_DEBUG_FUNCPTR (gst_va_h264_enc_prepare_output);
 
   {
-    display =
-        gst_va_display_drm_new_from_path (va_enc_class->render_device_path);
+    display = gst_va_display_platform_new (va_enc_class->render_device_path);
     encoder = gst_va_encoder_new (display, va_enc_class->codec,
         va_enc_class->entrypoint);
     if (gst_va_encoder_get_rate_control_enum (encoder,
@@ -3840,30 +3930,14 @@
 
   type_info.class_data = cdata;
 
-  /* The first encoder to be registered should use a constant name,
-   * like vah264enc, for any additional encoders, we create unique
-   * names, using inserting the render device name. */
-  if (device->index == 0) {
-    if (entrypoint == VAEntrypointEncSlice) {
-      type_name = g_strdup ("GstVaH264Enc");
-      feature_name = g_strdup ("vah264enc");
-    } else {
-      type_name = g_strdup ("GstVaH264LPEnc");
-      feature_name = g_strdup ("vah264lpenc");
-    }
+  if (entrypoint == VAEntrypointEncSlice) {
+    gst_va_create_feature_name (device, "GstVaH264Enc", "GstVa%sH264Enc",
+        &type_name, "vah264enc", "va%sh264enc", &feature_name,
+        &cdata->description, &rank);
   } else {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    if (entrypoint == VAEntrypointEncSlice) {
-      type_name = g_strdup_printf ("GstVa%sH264Enc", basename);
-      feature_name = g_strdup_printf ("va%sh264enc", basename);
-    } else {
-      type_name = g_strdup_printf ("GstVa%sH264LPEnc", basename);
-      feature_name = g_strdup_printf ("va%sh264lpenc", basename);
-    }
-    cdata->description = basename;
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
+    gst_va_create_feature_name (device, "GstVaH264LPEnc", "GstVa%sH264LPEnc",
+        &type_name, "vah264lpenc", "va%sh264lpenc", &feature_name,
+        &cdata->description, &rank);
   }
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvah265dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvah265dec.c Changed

@@ -126,10 +126,7 @@
 {
   if (profile == VAProfileHEVCSccMain || profile == VAProfileHEVCSccMain10
       || profile == VAProfileHEVCSccMain444
-#if VA_CHECK_VERSION(1, 8, 0)
-      || profile == VAProfileHEVCSccMain444_10
-#endif
-      )
+      || profile == VAProfileHEVCSccMain444_10)
     return TRUE;
 
   return FALSE;
@@ -240,8 +237,8 @@
 
   gst_buffer_replace (&frame->output_buffer, va_pic->gstbuffer);
 
-  ret = gst_va_base_dec_process_output (base, frame, picture->discont_state,
-      picture->buffer_flags);
+  ret = gst_va_base_dec_process_output (base, frame,
+      GST_CODEC_PICTURE (picture)->discont_state, picture->buffer_flags);
   gst_h265_picture_unref (picture);
 
   if (ret)
@@ -935,8 +932,8 @@
 #define P(idc, va) { G_PASTE (GST_H265_PROFILE_, idc), G_PASTE (VAProfileHEVC, va) }
   P (MAIN, Main),
   P (MAIN_10, Main10),
-  /*P (MAIN_STILL_PICTURE, ),
-  P (MONOCHROME, ),
+  P (MAIN_STILL_PICTURE, Main),
+  /*P (MONOCHROME, ),
   P (MONOCHROME_12, ),
   P (MONOCHROME_16, ),*/
   P (MAIN_12, Main12),
@@ -945,9 +942,9 @@
   P (MAIN_444, Main444),
   P (MAIN_444_10, Main444_10),
   P (MAIN_444_12, Main444_12),
-  /*P (MAIN_INTRA, ),
-  P (MAIN_10_INTRA, ),
-  P (MAIN_12_INTRA, ),
+  P (MAIN_INTRA, Main),
+  P (MAIN_10_INTRA, Main10),
+  /*P (MAIN_12_INTRA, ),
   P (MAIN_422_10_INTRA, ),
   P (MAIN_422_12_INTRA, ),
   P (MAIN_444_INTRA, ),
@@ -964,9 +961,7 @@
   P (SCREEN_EXTENDED_MAIN, SccMain),
   P (SCREEN_EXTENDED_MAIN_10, SccMain10),
   P (SCREEN_EXTENDED_MAIN_444, SccMain444),
-#if VA_CHECK_VERSION(1, 8, 0)
   P (SCREEN_EXTENDED_MAIN_444_10, SccMain444_10),
-#endif
   /*P (SCREEN_EXTENDED_HIGH_THROUGHPUT_444, ),
   P (SCREEN_EXTENDED_HIGH_THROUGHPUT_444_10, ),
   P (SCREEN_EXTENDED_HIGH_THROUGHPUT_444_14, ),
@@ -1323,22 +1318,9 @@
 
   type_info.class_data = cdata;
 
-  /* The first decoder to be registered should use a constant name,
-   * like vah265dec, for any additional decoders, we create unique
-   * names, using inserting the render device name. */
-  if (device->index == 0) {
-    type_name = g_strdup ("GstVaH265Dec");
-    feature_name = g_strdup ("vah265dec");
-  } else {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    type_name = g_strdup_printf ("GstVa%sH265Dec", basename);
-    feature_name = g_strdup_printf ("va%sh265dec", basename);
-    cdata->description = basename;
-
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
-  }
+  gst_va_create_feature_name (device, "GstVaH265Dec", "GstVa%sH265Dec",
+      &type_name, "vah265dec", "va%sh265dec", &feature_name,
+      &cdata->description, &rank);
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvah265enc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvah265enc.c Changed

@@ -56,6 +56,7 @@
 #include "gstvacaps.h"
 #include "gstvaprofile.h"
 #include "gstvadisplay_priv.h"
+#include "gstvapluginutils.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_va_h265enc_debug);
 #define GST_CAT_DEFAULT gst_va_h265enc_debug
@@ -87,11 +88,11 @@
   PROP_BITRATE,
   PROP_TARGET_PERCENTAGE,
   PROP_TARGET_USAGE,
-  PROP_RATE_CONTROL,
   PROP_CPB_SIZE,
   PROP_AUD,
   PROP_NUM_TILE_COLS,
   PROP_NUM_TILE_ROWS,
+  PROP_RATE_CONTROL,
   N_PROPERTIES
 };
 
@@ -306,6 +307,8 @@
 
     guint num_reorder_frames;
     guint max_dpb_size;
+
+    GstVideoCodecFrame *last_keyframe;
   } gop;
 
   struct
@@ -348,8 +351,6 @@
 
   gint poc;
   gboolean last_frame;
-  /* The total frame count we handled. */
-  guint total_frame_count;
 };
 
 /**
@@ -448,10 +449,9 @@
 {
   GstVaH265EncFrame *frame;
 
-  frame = g_slice_new (GstVaH265EncFrame);
+  frame = g_new (GstVaH265EncFrame, 1);
   frame->last_frame = FALSE;
   frame->picture = NULL;
-  frame->total_frame_count = 0;
 
   return frame;
 }
@@ -461,7 +461,7 @@
 {
   GstVaH265EncFrame *frame = pframe;
   g_clear_pointer (&frame->picture, gst_va_encode_picture_free);
-  g_slice_free (GstVaH265EncFrame, frame);
+  g_free (frame);
 }
 
 static inline GstVaH265EncFrame *
@@ -486,10 +486,7 @@
   if (base->profile == VAProfileHEVCSccMain
       || base->profile == VAProfileHEVCSccMain10
       || base->profile == VAProfileHEVCSccMain444
-#if VA_CHECK_VERSION(1, 8, 0)
-      || base->profile == VAProfileHEVCSccMain444_10
-#endif
-      )
+      || base->profile == VAProfileHEVCSccMain444_10)
     return TRUE;
 
   return FALSE;
@@ -685,7 +682,6 @@
         ptl->one_picture_only_constraint_flag = 0;
         ptl->lower_bit_rate_constraint_flag = 1;
         break;
-#if VA_CHECK_VERSION(1, 8, 0)
       case VAProfileHEVCSccMain444_10:
         ptl->max_14bit_constraint_flag = 1;
         ptl->max_12bit_constraint_flag = 1;
@@ -698,7 +694,6 @@
         ptl->one_picture_only_constraint_flag = 0;
         ptl->lower_bit_rate_constraint_flag = 1;
         break;
-#endif
       default:
         GST_WARNING_OBJECT (self, "do not support the profile: %s of screen"
             " content coding extensions.", gst_va_profile_name (base->profile));
@@ -892,7 +887,6 @@
     .sps_3d_extension_flag = 0,
     .sps_scc_extension_flag = _is_scc_enabled (self),
     /* if sps_scc_extension_flag */
-#if VA_CHECK_VERSION(1, 8, 0)
     .sps_scc_extension_params = {
       .sps_curr_pic_ref_enabled_flag = 1,
       .palette_mode_enabled_flag =
@@ -905,7 +899,6 @@
       .motion_vector_resolution_control_idc = 0,
       .intra_boundary_filtering_disabled_flag = 0,
     },
-#endif
   };
   /* *INDENT-ON* */
 
@@ -983,14 +976,12 @@
     .pps_3d_extension_flag = 0,
     .pps_scc_extension_flag = _is_scc_enabled (self),
     /* if pps_scc_extension_flag*/
-#if VA_CHECK_VERSION(1, 8, 0)
     .pps_scc_extension_params = {
       .pps_curr_pic_ref_enabled_flag =
           pic_param->scc_fields.bits.pps_curr_pic_ref_enabled_flag,
       .residual_adaptive_colour_transform_enabled_flag = 0,
       .pps_palette_predictor_initializers_present_flag = 0,
     },
-#endif
   };
   /* *INDENT-ON* */
 }
@@ -1354,9 +1345,7 @@
     case VAProfileHEVCSccMain:
     case VAProfileHEVCSccMain10:
     case VAProfileHEVCSccMain444:
-#if VA_CHECK_VERSION(1, 8, 0)
     case VAProfileHEVCSccMain444_10:
-#endif
       profile_idc = GST_H265_PROFILE_IDC_SCREEN_CONTENT_CODING;
       break;
     default:
@@ -1425,14 +1414,12 @@
     },
     /* if (vui_fields.bits.aspect_ratio_info_present_flag) */
     .aspect_ratio_idc = 0xff,
-    .sar_width = GST_VIDEO_INFO_PAR_N (&base->input_state->info),
-    .sar_height = GST_VIDEO_INFO_PAR_D (&base->input_state->info),
+    .sar_width = GST_VIDEO_INFO_PAR_N (&base->in_info),
+    .sar_height = GST_VIDEO_INFO_PAR_D (&base->in_info),
     /* if (vui_fields.bits.vui_timing_info_present_flag) */
-    .vui_num_units_in_tick = GST_VIDEO_INFO_FPS_D (&base->input_state->info),
-    .vui_time_scale = GST_VIDEO_INFO_FPS_N (&base->input_state->info),
-#if VA_CHECK_VERSION(1, 8, 0)
+    .vui_num_units_in_tick = GST_VIDEO_INFO_FPS_D (&base->in_info),
+    .vui_time_scale = GST_VIDEO_INFO_FPS_N (&base->in_info),
     .scc_fields.bits.palette_mode_enabled_flag = _is_scc_enabled (self),
-#endif
   };
   /* *INDENT-ON* */
 
@@ -1552,10 +1539,8 @@
     },
     /* We use coding_type here, set this to 0. */
     .hierarchical_level_plus1 = hierarchical_level_plus1,
-#if VA_CHECK_VERSION(1, 8, 0)
     .scc_fields.bits.pps_curr_pic_ref_enabled_flag =
         _is_scc_enabled (self),
-#endif
   };
   /* *INDENT-ON* */
 
@@ -1726,10 +1711,8 @@
       .collocated_from_l0_flag = (frame_type == GST_H265_I_SLICE ?
           0 : self->features.collocated_from_l0_flag),
     },
-#if VA_CHECK_VERSION(1, 10, 0)
     .pred_weight_table_bit_offset = 0,
     .pred_weight_table_bit_length = 0,
-#endif
   };
   /* *INDENT-ON* */
 
@@ -2044,55 +2027,92 @@
 {
   GstVaH265Enc *self = GST_VA_H265_ENC (base);
   GstVaH265EncFrame *frame;
+  gboolean add_cached_key_frame = FALSE;
 
   g_return_val_if_fail (self->gop.cur_frame_index <= self->gop.idr_period,
       FALSE);
 
   if (gst_frame) {
-    /* Begin a new GOP, should have a empty reorder_list. */
-    if (self->gop.cur_frame_index == self->gop.idr_period) {
-      g_assert (g_queue_is_empty (&base->reorder_list));
-      self->gop.cur_frame_index = 0;
-    }
-
     frame = _enc_frame (gst_frame);
-    frame->poc = self->gop.cur_frame_index;
-    g_assert (self->gop.cur_frame_index <= self->gop.max_pic_order_cnt);
 
-    if (self->gop.cur_frame_index == 0) {
-      g_assert (frame->poc == 0);
-      GST_LOG_OBJECT (self, "system_frame_number: %d, an IDR frame, starts"
-          " a new GOP", gst_frame->system_frame_number);
+    /* Force to insert the key frame inside a GOP, just end the current
+       GOP and start a new one. */
+    if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (gst_frame) &&
+        !(self->gop.cur_frame_index == 0 ||
+            self->gop.cur_frame_index == self->gop.idr_period)) {
+      GST_DEBUG_OBJECT (base, "system_frame_number: %d is a force key "
+          "frame(IDR), begin a new GOP.", gst_frame->system_frame_number);
+
+      frame->poc = 0;
+      frame->type = self->gop.frame_types0.slice_type;
+      frame->is_ref = self->gop.frame_types0.is_ref;
+      frame->pyramid_level = self->gop.frame_types0.pyramid_level;
+      frame->left_ref_poc_diff = self->gop.frame_types0.left_ref_poc_diff;
+      frame->right_ref_poc_diff = self->gop.frame_types0.right_ref_poc_diff;
+
+      /* The previous key frame should be already be poped out. */
+      g_assert (self->gop.last_keyframe == NULL);
+
+      /* An empty reorder list, start the new GOP immediately. */
+      if (g_queue_is_empty (&base->reorder_list)) {
+        self->gop.cur_frame_index = 1;
+        g_queue_clear_full (&base->ref_list,
+            (GDestroyNotify) gst_video_codec_frame_unref);
+        last = FALSE;
+      } else {
+        /* Cache the key frame and end the current GOP.
+           Next time calling this push() without frame, start the new GOP. */
+        self->gop.last_keyframe = gst_frame;
+        last = TRUE;
+      }
+
+      add_cached_key_frame = TRUE;
+    } else {
+      /* Begin a new GOP, should have a empty reorder_list. */
+      if (self->gop.cur_frame_index == self->gop.idr_period) {
+        g_assert (g_queue_is_empty (&base->reorder_list));
+        self->gop.cur_frame_index = 0;
+      }
+
+      frame->poc = self->gop.cur_frame_index;
+      g_assert (self->gop.cur_frame_index <= self->gop.max_pic_order_cnt);
+
+      if (self->gop.cur_frame_index == 0) {
+        g_assert (frame->poc == 0);
+        GST_LOG_OBJECT (self, "system_frame_number: %d, an IDR frame, starts"
+            " a new GOP", gst_frame->system_frame_number);
+
+        g_queue_clear_full (&base->ref_list,
+            (GDestroyNotify) gst_video_codec_frame_unref);
+      }
+
+      frame->type = self->gop.frame_typesself->gop.cur_frame_index.slice_type;
+      frame->is_ref = self->gop.frame_typesself->gop.cur_frame_index.is_ref;
+      frame->pyramid_level =
+          self->gop.frame_typesself->gop.cur_frame_index.pyramid_level;
+      frame->left_ref_poc_diff =
+          self->gop.frame_typesself->gop.cur_frame_index.left_ref_poc_diff;
+      frame->right_ref_poc_diff =
+          self->gop.frame_typesself->gop.cur_frame_index.right_ref_poc_diff;
+
+      GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, "
+          "frame type %s", gst_frame->system_frame_number, frame->poc,
+          _h265_slice_type_name (frame->type));
 
+      self->gop.cur_frame_index++;
+      g_queue_push_tail (&base->reorder_list,
+          gst_video_codec_frame_ref (gst_frame));
+    }
+  } else if (self->gop.last_keyframe) {
+    g_assert (self->gop.last_keyframe ==
+        g_queue_peek_tail (&base->reorder_list));
+    if (g_queue_get_length (&base->reorder_list) == 1) {
+      /* The last cached key frame begins a new GOP */
+      self->gop.cur_frame_index = 1;
+      self->gop.last_keyframe = NULL;
       g_queue_clear_full (&base->ref_list,
           (GDestroyNotify) gst_video_codec_frame_unref);
     }
-
-    frame->type = self->gop.frame_typesself->gop.cur_frame_index.slice_type;
-    frame->is_ref = self->gop.frame_typesself->gop.cur_frame_index.is_ref;
-    frame->pyramid_level =
-        self->gop.frame_typesself->gop.cur_frame_index.pyramid_level;
-    frame->left_ref_poc_diff =
-        self->gop.frame_typesself->gop.cur_frame_index.left_ref_poc_diff;
-    frame->right_ref_poc_diff =
-        self->gop.frame_typesself->gop.cur_frame_index.right_ref_poc_diff;
-
-    if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (gst_frame)) {
-      GST_DEBUG_OBJECT (self, "system_frame_number: %d, a force key frame,"
-          " promote its type from %s to %s", gst_frame->system_frame_number,
-          _h265_slice_type_name (frame->type),
-          _h265_slice_type_name (GST_H265_I_SLICE));
-      frame->type = GST_H265_I_SLICE;
-      frame->is_ref = TRUE;
-    }
-
-    GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, "
-        "frame type %s", gst_frame->system_frame_number, frame->poc,
-        _h265_slice_type_name (frame->type));
-
-    self->gop.cur_frame_index++;
-    g_queue_push_tail (&base->reorder_list,
-        gst_video_codec_frame_ref (gst_frame));
   }
 
   /* ensure the last one a non-B and end the GOP. */
@@ -2112,6 +2132,12 @@
     }
   }
 
+  /* Insert the cached next key frame after ending the current GOP. */
+  if (add_cached_key_frame) {
+    g_queue_push_tail (&base->reorder_list,
+        gst_video_codec_frame_ref (gst_frame));
+  }
+
   return TRUE;
 }
 
@@ -2133,7 +2159,7 @@
 }
 
 static GstVideoCodecFrame *
-_h265_pop_pyramid_b_frame (GstVaH265Enc * self)
+_h265_pop_pyramid_b_frame (GstVaH265Enc * self, guint gop_len)
 {
   GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
   guint i;
@@ -2148,7 +2174,7 @@
   b_vaframe = NULL;
 
   /* Find the highest level with smallest poc. */
-  for (i = 0; i < g_queue_get_length (&base->reorder_list); i++) {
+  for (i = 0; i < gop_len; i++) {
     GstVaH265EncFrame *vaf;
     GstVideoCodecFrame *f;
 
@@ -2180,7 +2206,7 @@
   /* Check whether its refs are already poped. */
   g_assert (b_vaframe->left_ref_poc_diff != 0);
   g_assert (b_vaframe->right_ref_poc_diff != 0);
-  for (i = 0; i < g_queue_get_length (&base->reorder_list); i++) {
+  for (i = 0; i < gop_len; i++) {
     GstVaH265EncFrame *vaf;
     GstVideoCodecFrame *f;
 
@@ -2222,6 +2248,7 @@
   GstVaH265Enc *self = GST_VA_H265_ENC (base);
   GstVaH265EncFrame *vaframe;
   GstVideoCodecFrame *frame;
+  guint gop_len;
   struct RefFramesCount count;
 
   g_return_val_if_fail (self->gop.cur_frame_index <= self->gop.idr_period,
@@ -2232,16 +2259,21 @@
   if (g_queue_is_empty (&base->reorder_list))
     return TRUE;
 
+  gop_len = g_queue_get_length (&base->reorder_list);
+
+  if (self->gop.last_keyframe && gop_len > 1)
+    gop_len--;
+
   /* Return the last pushed non-B immediately. */
-  frame = g_queue_peek_tail (&base->reorder_list);
+  frame = g_queue_peek_nth (&base->reorder_list, gop_len - 1);
   vaframe = _enc_frame (frame);
   if (vaframe->type != GST_H265_B_SLICE) {
-    frame = g_queue_pop_tail (&base->reorder_list);
+    frame = g_queue_pop_nth (&base->reorder_list, gop_len - 1);
     goto get_one;
   }
 
   if (self->gop.b_pyramid) {
-    frame = _h265_pop_pyramid_b_frame (self);
+    frame = _h265_pop_pyramid_b_frame (self, gop_len);
     if (frame == NULL)
       return TRUE;
 
@@ -2545,6 +2577,7 @@
   self->gop.backward_ref_num = 0;
   self->gop.num_reorder_frames = 0;
   self->gop.max_dpb_size = 0;
+  self->gop.last_keyframe = NULL;
 
   self->rc.max_bitrate = 0;
   self->rc.target_bitrate = 0;
@@ -2631,15 +2664,6 @@
   GArray *caps_candidates = NULL;
   GArray *chroma_candidates = NULL;
   guint depth = 0, chrome = 0;
-  gboolean support_scc = TRUE;
-
-  /* We do not have scc_fields defined in sequence and picture
-     before 1.8.0, just disable scc all. */
-#if VA_CHECK_VERSION(1, 8, 0)
-  support_scc = TRUE;
-#else
-  support_scc = FALSE;
-#endif
 
   caps_candidates = g_array_new (TRUE, TRUE, sizeof (VAProfile));
   chroma_candidates = g_array_new (TRUE, TRUE, sizeof (VAProfile));
@@ -2687,7 +2711,7 @@
     goto out;
   }
 
-  in_format = GST_VIDEO_INFO_FORMAT (&base->input_state->info);
+  in_format = GST_VIDEO_INFO_FORMAT (&base->in_info);
   rt_format = _h265_get_rtformat (self, in_format, &depth, &chrome);
   if (!rt_format) {
     GST_ERROR_OBJECT (self, "unsupported video format %s",
@@ -2705,19 +2729,15 @@
     if (depth == 8) {
       profile = VAProfileHEVCMain444;
       g_array_append_val (chroma_candidates, profile);
-      if (support_scc) {
-        profile = VAProfileHEVCSccMain444;
-        g_array_append_val (chroma_candidates, profile);
-      }
+      profile = VAProfileHEVCSccMain444;
+      g_array_append_val (chroma_candidates, profile);
     }
 
     if (depth <= 10) {
       profile = VAProfileHEVCMain444_10;
       g_array_append_val (chroma_candidates, profile);
-#if VA_CHECK_VERSION(1, 8, 0)
       profile = VAProfileHEVCSccMain444_10;
       g_array_append_val (chroma_candidates, profile);
-#endif
     }
 
     if (depth <= 12) {
@@ -2740,19 +2760,15 @@
     if (depth == 8) {
       profile = VAProfileHEVCMain;
       g_array_append_val (chroma_candidates, profile);
-      if (support_scc) {
-        profile = VAProfileHEVCSccMain;
-        g_array_append_val (chroma_candidates, profile);
-      }
+      profile = VAProfileHEVCSccMain;
+      g_array_append_val (chroma_candidates, profile);
     }
 
     if (depth <= 10) {
       profile = VAProfileHEVCMain10;
       g_array_append_val (chroma_candidates, profile);
-      if (support_scc) {
-        profile = VAProfileHEVCSccMain10;
-        g_array_append_val (chroma_candidates, profile);
-      }
+      profile = VAProfileHEVCSccMain10;
+      g_array_append_val (chroma_candidates, profile);
     }
 
     if (depth <= 12) {
@@ -3363,7 +3379,7 @@
     guint bits_per_pix;
 
     if (!_h265_get_rtformat (self,
-            GST_VIDEO_INFO_FORMAT (&base->input_state->info), &depth, &chrome))
+            GST_VIDEO_INFO_FORMAT (&base->in_info), &depth, &chrome))
       g_assert_not_reached ();
 
     if (chrome == 3) {
@@ -3377,8 +3393,8 @@
 
     factor = (guint64) self->luma_width * self->luma_height * bits_per_pix / 16;
     bitrate = gst_util_uint64_scale (factor,
-        GST_VIDEO_INFO_FPS_N (&base->input_state->info),
-        GST_VIDEO_INFO_FPS_D (&base->input_state->info)) / 1000;
+        GST_VIDEO_INFO_FPS_N (&base->in_info),
+        GST_VIDEO_INFO_FPS_D (&base->in_info)) / 1000;
 
     GST_INFO_OBJECT (self, "target bitrate computed to %u kbps", bitrate);
 
@@ -3456,8 +3472,8 @@
 
   PicSizeInSamplesY = self->luma_width * self->luma_height;
   LumaSr = gst_util_uint64_scale_int_ceil (PicSizeInSamplesY,
-      GST_VIDEO_INFO_FPS_N (&base->input_state->info),
-      GST_VIDEO_INFO_FPS_D (&base->input_state->info));
+      GST_VIDEO_INFO_FPS_N (&base->in_info),
+      GST_VIDEO_INFO_FPS_D (&base->in_info));
 
   for (i = 0; i < G_N_ELEMENTS (_va_h265_level_limits); i++) {
     const GstVaH265LevelLimits *const limits = &_va_h265_level_limitsi;
@@ -3681,7 +3697,7 @@
   guint chrome, depth;
 
   if (!_h265_get_rtformat (self,
-          GST_VIDEO_INFO_FORMAT (&base->input_state->info), &depth, &chrome))
+          GST_VIDEO_INFO_FORMAT (&base->in_info), &depth, &chrome))
     g_assert_not_reached ();
 
   switch (chrome) {
@@ -3767,9 +3783,9 @@
 
   /* If not set, generate a idr every second */
   if (self->gop.idr_period == 0) {
-    self->gop.idr_period = (GST_VIDEO_INFO_FPS_N (&base->input_state->info)
-        + GST_VIDEO_INFO_FPS_D (&base->input_state->info) - 1) /
-        GST_VIDEO_INFO_FPS_D (&base->input_state->info);
+    self->gop.idr_period = (GST_VIDEO_INFO_FPS_N (&base->in_info)
+        + GST_VIDEO_INFO_FPS_D (&base->in_info) - 1) /
+        GST_VIDEO_INFO_FPS_D (&base->in_info);
   }
 
   /* Do not use a too huge GOP size. */
@@ -3818,7 +3834,6 @@
   prediction_direction = gst_va_encoder_get_prediction_direction (base->encoder,
       base->profile, GST_VA_BASE_ENC_ENTRYPOINT (base));
   if (prediction_direction) {
-#if VA_CHECK_VERSION(1,9,0)
     if (!(prediction_direction & VA_PREDICTION_DIRECTION_PREVIOUS)) {
       GST_INFO_OBJECT (self, "No forward prediction support");
       forward_num = 0;
@@ -3840,7 +3855,6 @@
       GST_INFO_OBJECT (self, "Enable low-delay-b mode");
       self->gop.low_delay_b_mode = TRUE;
     }
-#endif
   }
 
   if (forward_num > self->gop.num_ref_frames)
@@ -4172,9 +4186,15 @@
   self->features.transform_skip_enabled_flag =
       (features.bits.transform_skip != 0);
 
-  self->features.cu_qp_delta_enabled_flag =
-      (self->rc.rc_ctrl_mode != VA_RC_CQP);
-  self->features.diff_cu_qp_delta_depth = features.bits.cu_qp_delta;
+  if (self->rc.rc_ctrl_mode != VA_RC_CQP)
+    self->features.cu_qp_delta_enabled_flag = !!features.bits.cu_qp_delta;
+  else
+    self->features.cu_qp_delta_enabled_flag = 0;
+
+  if (self->features.cu_qp_delta_enabled_flag) {
+    self->features.diff_cu_qp_delta_depth =
+        self->features.log2_diff_max_min_luma_coding_block_size;
+  }
 
   /* TODO: use weighted pred */
   self->features.weighted_pred_flag = FALSE;
@@ -4429,6 +4449,7 @@
 static gboolean
 gst_va_h265_enc_reconfig (GstVaBaseEnc * base)
 {
+  GstVaBaseEncClass *klass = GST_VA_BASE_ENC_GET_CLASS (base);
   GstVideoEncoder *venc = GST_VIDEO_ENCODER (base);
   GstVaH265Enc *self = GST_VA_H265_ENC (base);
   GstCaps *out_caps, *reconf_caps = NULL;;
@@ -4438,10 +4459,11 @@
   gboolean do_renegotiation = TRUE, do_reopen, need_negotiation;
   guint max_ref_frames, max_surfaces = 0, rt_format = 0, codedbuf_size;
   gint width, height;
+  guint alignment;
 
-  width = GST_VIDEO_INFO_WIDTH (&base->input_state->info);
-  height = GST_VIDEO_INFO_HEIGHT (&base->input_state->info);
-  format = GST_VIDEO_INFO_FORMAT (&base->input_state->info);
+  width = GST_VIDEO_INFO_WIDTH (&base->in_info);
+  height = GST_VIDEO_INFO_HEIGHT (&base->in_info);
+  format = GST_VIDEO_INFO_FORMAT (&base->in_info);
   codedbuf_size = base->codedbuf_size;
 
   need_negotiation =
@@ -4472,16 +4494,24 @@
   base->width = width;
   base->height = height;
 
-  self->luma_width = GST_ROUND_UP_16 (base->width);
-  self->luma_height = GST_ROUND_UP_16 (base->height);
+  alignment = gst_va_encoder_get_surface_alignment (base->display,
+      profile, klass->entrypoint);
+  if (alignment) {
+    self->luma_width = GST_ROUND_UP_N (base->width, 1 << (alignment & 0xf));
+    self->luma_height =
+        GST_ROUND_UP_N (base->height, 1 << ((alignment & 0xf0) >> 4));
+  } else {
+    self->luma_width = GST_ROUND_UP_16 (base->width);
+    self->luma_height = GST_ROUND_UP_16 (base->height);
+  }
 
   /* Frame Cropping */
-  if ((base->width & 15) || (base->height & 15)) {
+  if (self->luma_width != base->width || self->luma_height != base->height) {
     /* 6.1, Table 6-1 */
     static const guint SubWidthC = { 1, 2, 2, 1 };
     static const guint SubHeightC = { 1, 2, 1, 1 };
     guint index = _get_chroma_format_idc (gst_va_chroma_from_video_format
-        (GST_VIDEO_INFO_FORMAT (&base->input_state->info)));
+        (GST_VIDEO_INFO_FORMAT (&base->in_info)));
 
     self->conformance_window_flag = 1;
     self->conf_win_left_offset = 0;
@@ -4500,16 +4530,16 @@
     return FALSE;
 
   self->bits_depth_luma_minus8 =
-      GST_VIDEO_FORMAT_INFO_DEPTH (base->input_state->info.finfo, 0);
+      GST_VIDEO_FORMAT_INFO_DEPTH (base->in_info.finfo, 0);
   self->bits_depth_luma_minus8 -= 8;
 
-  if (GST_VIDEO_FORMAT_INFO_N_COMPONENTS (base->input_state->info.finfo)) {
+  if (GST_VIDEO_FORMAT_INFO_N_COMPONENTS (base->in_info.finfo)) {
     self->bits_depth_chroma_minus8 =
-        GST_VIDEO_FORMAT_INFO_DEPTH (base->input_state->info.finfo, 1);
+        GST_VIDEO_FORMAT_INFO_DEPTH (base->in_info.finfo, 1);
     if (self->bits_depth_chroma_minus8 <
-        GST_VIDEO_FORMAT_INFO_DEPTH (base->input_state->info.finfo, 2))
+        GST_VIDEO_FORMAT_INFO_DEPTH (base->in_info.finfo, 2))
       self->bits_depth_chroma_minus8 =
-          GST_VIDEO_FORMAT_INFO_DEPTH (base->input_state->info.finfo, 2);
+          GST_VIDEO_FORMAT_INFO_DEPTH (base->in_info.finfo, 2);
 
     self->bits_depth_chroma_minus8 -= 8;
   } else {
@@ -4517,15 +4547,15 @@
   }
 
   /* Frame rate is needed for rate control and PTS setting. */
-  if (GST_VIDEO_INFO_FPS_N (&base->input_state->info) == 0
-      || GST_VIDEO_INFO_FPS_D (&base->input_state->info) == 0) {
+  if (GST_VIDEO_INFO_FPS_N (&base->in_info) == 0
+      || GST_VIDEO_INFO_FPS_D (&base->in_info) == 0) {
     GST_INFO_OBJECT (self, "Unknown framerate, just set to 30 fps");
-    GST_VIDEO_INFO_FPS_N (&base->input_state->info) = 30;
-    GST_VIDEO_INFO_FPS_D (&base->input_state->info) = 1;
+    GST_VIDEO_INFO_FPS_N (&base->in_info) = 30;
+    GST_VIDEO_INFO_FPS_D (&base->in_info) = 1;
   }
   base->frame_duration = gst_util_uint64_scale (GST_SECOND,
-      GST_VIDEO_INFO_FPS_D (&base->input_state->info),
-      GST_VIDEO_INFO_FPS_N (&base->input_state->info));
+      GST_VIDEO_INFO_FPS_D (&base->in_info),
+      GST_VIDEO_INFO_FPS_N (&base->in_info));
 
   GST_DEBUG_OBJECT (self, "resolution:%dx%d, CTU size: %dx%d,"
       " frame duration is %" GST_TIME_FORMAT,
@@ -4574,7 +4604,7 @@
   /* Add some tags */
   gst_va_base_enc_add_codec_tag (base, "H265");
 
-  out_caps = gst_va_profile_caps (base->profile);
+  out_caps = gst_va_profile_caps (base->profile, klass->entrypoint);
   g_assert (out_caps);
   out_caps = gst_caps_fixate (out_caps);
 
@@ -4622,39 +4652,77 @@
 
   /* begin from an IDR after flush. */
   self->gop.cur_frame_index = 0;
+  self->gop.last_keyframe = NULL;
 
   return GST_VIDEO_ENCODER_CLASS (parent_class)->flush (venc);
 }
 
 static gboolean
+gst_va_h265_enc_start (GstVideoEncoder * venc)
+{
+  /* Set the minimum pts to some huge value (1000 hours). This keeps
+   * the dts at the start of the stream from needing to be negative. */
+  gst_video_encoder_set_min_pts (venc, GST_SECOND * 60 * 60 * 1000);
+
+  return GST_VIDEO_ENCODER_CLASS (parent_class)->start (venc);
+}
+
+static gboolean
 gst_va_h265_enc_new_frame (GstVaBaseEnc * base, GstVideoCodecFrame * frame)
 {
+  GstVaH265Enc *self = GST_VA_H265_ENC (base);
   GstVaH265EncFrame *frame_in;
 
   frame_in = gst_va_h265_enc_frame_new ();
-  frame_in->total_frame_count = base->input_frame_count++;
   gst_video_codec_frame_set_user_data (frame, frame_in,
       gst_va_h265_enc_frame_free);
 
+  gst_va_base_enc_push_dts (base, frame, self->gop.num_reorder_frames);
+
   return TRUE;
 }
 
-static void
-gst_va_h265_enc_prepare_output (GstVaBaseEnc * base, GstVideoCodecFrame * frame)
+static gboolean
+gst_va_h265_enc_prepare_output (GstVaBaseEnc * base,
+    GstVideoCodecFrame * frame, gboolean * complete)
 {
-  GstVaH265Enc *self = GST_VA_H265_ENC (base);
   GstVaH265EncFrame *frame_enc;
+  GstBuffer *buf;
 
   frame_enc = _enc_frame (frame);
 
-  frame->pts =
-      base->start_pts + base->frame_duration * frame_enc->total_frame_count;
-  /* The PTS should always be later than the DTS. */
-  frame->dts = base->start_pts + base->frame_duration *
-      ((gint64) base->output_frame_count -
-      (gint64) self->gop.num_reorder_frames);
-  base->output_frame_count++;
-  frame->duration = base->frame_duration;
+  frame->dts = gst_va_base_enc_pop_dts (base);
+  if (!GST_CLOCK_TIME_IS_VALID (frame->dts)) {
+    GST_DEBUG_OBJECT (base, "Pop invalid DTS.");
+  } else if (GST_CLOCK_TIME_IS_VALID (frame->pts) && frame->dts > frame->pts) {
+    GST_WARNING_OBJECT (base, "Pop DTS: %" GST_TIME_FORMAT " > PTS: %"
+        GST_TIME_FORMAT, GST_TIME_ARGS (frame->dts),
+        GST_TIME_ARGS (frame->pts));
+    frame->dts = frame->pts;
+  }
+
+  buf = gst_va_base_enc_create_output_buffer (base,
+      frame_enc->picture, NULL, 0);
+  if (!buf) {
+    GST_ERROR_OBJECT (base, "Failed to create output buffer");
+    return FALSE;
+  }
+
+  GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_MARKER);
+  if (frame_enc->poc == 0) {
+    GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
+    GST_BUFFER_FLAG_UNSET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
+    GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_HEADER);
+  } else {
+    GST_VIDEO_CODEC_FRAME_UNSET_SYNC_POINT (frame);
+    GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
+  }
+
+  gst_buffer_replace (&frame->output_buffer, buf);
+  gst_clear_buffer (&buf);
+
+  *complete = TRUE;
+  return TRUE;
 }
 
 /* *INDENT-OFF* */
@@ -4927,6 +4995,19 @@
 }
 
 static void
+gst_va_h265_enc_dispose (GObject * object)
+{
+  GstVaH265Enc *self = GST_VA_H265_ENC (object);
+
+  g_clear_pointer (&self->partition.slice_segment_address, g_free);
+  g_clear_pointer (&self->partition.num_ctu_in_slice, g_free);
+  g_clear_pointer (&self->partition.tile_ctu_cols, g_free);
+  g_clear_pointer (&self->partition.tile_ctu_rows, g_free);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
 gst_va_h265_enc_class_init (gpointer g_klass, gpointer class_data)
 {
   GstCaps *src_doc_caps, *sink_doc_caps;
@@ -4986,8 +5067,10 @@
 
   object_class->set_property = gst_va_h265_enc_set_property;
   object_class->get_property = gst_va_h265_enc_get_property;
+  object_class->dispose = gst_va_h265_enc_dispose;
 
   venc_class->flush = GST_DEBUG_FUNCPTR (gst_va_h265_enc_flush);
+  venc_class->start = GST_DEBUG_FUNCPTR (gst_va_h265_enc_start);
 
   va_enc_class->reset_state = GST_DEBUG_FUNCPTR (gst_va_h265_enc_reset_state);
   va_enc_class->reconfig = GST_DEBUG_FUNCPTR (gst_va_h265_enc_reconfig);
@@ -4999,8 +5082,7 @@
       GST_DEBUG_FUNCPTR (gst_va_h265_enc_prepare_output);
 
   {
-    display =
-        gst_va_display_drm_new_from_path (va_enc_class->render_device_path);
+    display = gst_va_display_platform_new (va_enc_class->render_device_path);
     encoder = gst_va_encoder_new (display, va_enc_class->codec,
         va_enc_class->entrypoint);
     if (gst_va_encoder_get_rate_control_enum (encoder,
@@ -5313,31 +5395,14 @@
 
   type_info.class_data = cdata;
 
-  /* The first encoder to be registered should use a constant name,
-   * like vah265enc, for any additional encoders, we create unique
-   * names, using inserting the render device name. */
-  if (device->index == 0) {
-    if (entrypoint == VAEntrypointEncSlice) {
-      type_name = g_strdup ("GstVaH265Enc");
-      feature_name = g_strdup ("vah265enc");
-    } else {
-      type_name = g_strdup ("GstVaH265LPEnc");
-      feature_name = g_strdup ("vah265lpenc");
-    }
+  if (entrypoint == VAEntrypointEncSlice) {
+    gst_va_create_feature_name (device, "GstVaH265Enc", "GstVa%sH265Enc",
+        &type_name, "vah265enc", "va%sh265enc", &feature_name,
+        &cdata->description, &rank);
   } else {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    if (entrypoint == VAEntrypointEncSlice) {
-      type_name = g_strdup_printf ("GstVa%sH265Enc", basename);
-      feature_name = g_strdup_printf ("va%sh265enc", basename);
-    } else {
-      type_name = g_strdup_printf ("GstVa%sH265LPEnc", basename);
-      feature_name = g_strdup_printf ("va%sh265lpenc", basename);
-    }
-    cdata->description = basename;
-
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
+    gst_va_create_feature_name (device, "GstVaH265LPEnc", "GstVa%sH265LPEnc",
+        &type_name, "vah265lpenc", "va%sh265lpenc", &feature_name,
+        &cdata->description, &rank);
   }
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvajpegdec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvajpegdec.c Changed

@@ -46,6 +46,7 @@
 
 #include <gst/va/gstvavideoformat.h>
 
+#include "gstvacaps.h"
 #include "gstvabasedec.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_va_jpegdec_debug);
@@ -356,6 +357,7 @@
   GstVaBaseDec *base = GST_VA_BASE_DEC (decoder);
   GstVaJpegDec *self = GST_VA_JPEG_DEC (decoder);
   GstVideoFormat format;
+  guint64 modifier;
   GstCapsFeatures *capsfeatures = NULL;
 
   /* Ignore downstream renegotiation request. */
@@ -386,7 +388,7 @@
     base->rt_format = VA_RT_FORMAT_RGBP;
 
   gst_va_base_dec_get_preferred_format_and_caps_features (base, &format,
-      &capsfeatures);
+      &capsfeatures, &modifier);
   if (format == GST_VIDEO_FORMAT_UNKNOWN)
     return FALSE;
 
@@ -402,7 +404,16 @@
       gst_video_decoder_set_output_state (decoder, format,
       base->width, base->height, base->input_state);
 
-  base->output_state->caps = gst_video_info_to_caps (&base->output_state->info);
+  /* set caps feature */
+  if (capsfeatures && gst_caps_features_contains (capsfeatures,
+          GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+    base->output_state->caps =
+        gst_va_video_info_to_dma_caps (&base->output_state->info, modifier);
+  } else {
+    base->output_state->caps =
+        gst_video_info_to_caps (&base->output_state->info);
+  }
+
   if (capsfeatures)
     gst_caps_set_features_simple (base->output_state->caps, capsfeatures);
 
@@ -524,6 +535,10 @@
     g_value_unset (&sampling);
     return ret;
   }
+
+  /* TODO: support interleaved mjpeg */
+  gst_caps_set_simple (caps, "interlace-mode", G_TYPE_STRING, "progressive",
+      NULL);
   return gst_caps_ref (caps);
 }
 
@@ -532,42 +547,44 @@
 {
   if (GST_VA_DISPLAY_IS_IMPLEMENTATION (display, INTEL_IHD)) {
     GstCaps *ret;
-    GstStructure *s;
-    GstCapsFeatures *f;
     guint i, len;
 
     ret = gst_caps_copy (caps);
 
     len = gst_caps_get_size (ret);
     for (i = 0; i < len; i++) {
-      s = gst_caps_get_structure (ret, i);
+      guint j, size;
+      GValue out = G_VALUE_INIT;
+      const GValue *in;
+      GstStructure *s;
+      GstCapsFeatures *f;
+
       f = gst_caps_get_features (ret, i);
-      if (gst_caps_features_is_equal (f,
-              GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)) {
+      if (!gst_caps_features_is_equal (f,
+              GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY))
+        continue;
+
+      s = gst_caps_get_structure (ret, i);
+
+      in = gst_structure_get_value (s, "format");
+
+      size = gst_value_list_get_size (in);
+      gst_value_list_init (&out, size);
+      for (j = 0; j < size; j++) {
+        const GValue *fmt = gst_value_list_get_value (in, j);
+
         /* rgbp is not correctly mapped into memory */
-        guint i, size;
-        GValue out = G_VALUE_INIT;
-        const GValue *in = gst_structure_get_value (s, "format");
-
-        size = gst_value_list_get_size (in);
-        gst_value_list_init (&out, size);
-        for (i = 0; i < size; i++) {
-          const GValue *fmt = gst_value_list_get_value (in, i);
-          if (g_strcmp0 (g_value_get_string (fmt), "RGBP") != 0)
-            gst_value_list_append_value (&out, fmt);
-        }
-        gst_structure_set_value (s, "format", &out);
-        g_value_unset (&out);
-      } else if (gst_caps_features_contains (f, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
-        /* dmabuf exportation only handles NV12 */
-        gst_structure_set (s, "format", G_TYPE_STRING, "NV12", NULL);
+        if (g_strcmp0 (g_value_get_string (fmt), "RGBP") != 0)
+          gst_value_list_append_value (&out, fmt);
       }
+      gst_structure_take_value (s, "format", &out);
     }
 
     return ret;
   } else if (GST_VA_DISPLAY_IS_IMPLEMENTATION (display, INTEL_I965)) {
     GstCaps *ret;
     GstStructure *s;
+    GstCapsFeatures *f;
     guint i, len;
 
     ret = gst_caps_copy (caps);
@@ -575,6 +592,12 @@
     len = gst_caps_get_size (ret);
     for (i = 0; i < len; i++) {
       s = gst_caps_get_structure (ret, i);
+      f = gst_caps_get_features (ret, i);
+
+      /* DMA kind formats have modifiers, we should not change */
+      if (gst_caps_features_contains (f, GST_CAPS_FEATURE_MEMORY_DMABUF))
+        continue;
+
       /* only NV12 works in this nigthmare */
       gst_structure_set (s, "format", G_TYPE_STRING, "NV12", NULL);
     }
@@ -619,23 +642,9 @@
 
   type_info.class_data = cdata;
 
-
-  /* The first decoder to be registered should use a constant name,
-   * like vajpegdec, for any additional decoders, we create unique
-   * names, using inserting the render device name. */
-  if (device->index == 0) {
-    type_name = g_strdup ("GstVaJpegDec");
-    feature_name = g_strdup ("vajpegdec");
-  } else {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    type_name = g_strdup_printf ("GstVa%sJpegDec", basename);
-    feature_name = g_strdup_printf ("va%sjpegdec", basename);
-    cdata->description = basename;
-
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
-  }
+  gst_va_create_feature_name (device, "GstVaJpegDec", "GstVa%sJpegDec",
+      &type_name, "vajpegdec", "va%sjpegdec", &feature_name,
+      &cdata->description, &rank);
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvampeg2dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvampeg2dec.c Changed

@@ -518,8 +518,8 @@
   GST_LOG_OBJECT (self,
       "Outputting picture %p (poc %d)", picture, picture->pic_order_cnt);
 
-  ret = gst_va_base_dec_process_output (base, frame, picture->discont_state,
-      picture->buffer_flags);
+  ret = gst_va_base_dec_process_output (base, frame,
+      GST_CODEC_PICTURE (picture)->discont_state, picture->buffer_flags);
   gst_mpeg2_picture_unref (picture);
 
   if (ret)
@@ -646,22 +646,9 @@
 
   type_info.class_data = cdata;
 
-  /* The first decoder to be registered should use a constant name,
-   * like vampeg2dec, for any additional decoders, we create unique
-   * names, using inserting the render device name. */
-  if (device->index == 0) {
-    type_name = g_strdup ("GstVaMpeg2Dec");
-    feature_name = g_strdup ("vampeg2dec");
-  } else {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    type_name = g_strdup_printf ("GstVa%sMpeg2Dec", basename);
-    feature_name = g_strdup_printf ("va%smpeg2dec", basename);
-    cdata->description = basename;
-
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
-  }
+  gst_va_create_feature_name (device, "GstVaMpeg2Dec", "GstVa%sMpeg2Dec",
+      &type_name, "vampeg2dec", "va%smpeg2dec", &feature_name,
+      &cdata->description, &rank);
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvapluginutils.c Added

@@ -0,0 +1,101 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstvapluginutils.h"
+
+GstVaDisplay *
+gst_va_display_platform_new (const gchar * path)
+{
+#ifdef G_OS_WIN32
+  return gst_va_display_win32_new (path);
+#else
+  return gst_va_display_drm_new_from_path (path);
+#endif
+}
+
+void
+gst_va_create_feature_name (GstVaDevice * device,
+    const gchar * type_name_default, const gchar * type_name_templ,
+    gchar ** type_name, const gchar * feature_name_default,
+    const gchar * feature_name_templ, gchar ** feature_name,
+    gchar ** desc, guint * rank)
+{
+  gchar *basename;
+
+  /* The first element to be registered should use a constant name,
+   * like vah264dec, for any additional elements, we create unique
+   * names, using inserting the render device name. */
+  if (device->index == 0) {
+    *type_name = g_strdup (type_name_default);
+    *feature_name = g_strdup (feature_name_default);
+    g_object_get (device->display, "description", desc, NULL);
+    return;
+  }
+#ifdef G_OS_WIN32
+  basename = g_strdup_printf ("device%d", device->index);
+#else
+  basename = g_path_get_basename (device->render_device_path);
+#endif
+
+  *type_name = g_strdup_printf (type_name_templ, basename);
+  *feature_name = g_strdup_printf (feature_name_templ, basename);
+
+  g_object_get (device->display, "description", desc, NULL);
+#ifndef G_OS_WIN32
+  {
+    gchar *newdesc = g_strdup_printf ("%s in %s", *desc, basename);
+    g_free (*desc);
+    *desc = newdesc;
+  }
+#endif
+  g_free (basename);
+
+  if (*rank > 0)
+    *rank -= 1;
+}
+
+GstBufferPool *
+gst_va_create_other_pool (GstAllocator * allocator,
+    GstAllocationParams * params, GstCaps * caps, guint size)
+{
+  GstBufferPool *pool = NULL;
+  GstStructure *config;
+
+  if (size == 0) {
+    GstVideoInfo info;
+
+    if (!gst_video_info_from_caps (&info, caps))
+      return NULL;
+    size = GST_VIDEO_INFO_SIZE (&info);
+  }
+
+  pool = gst_video_buffer_pool_new ();
+  config = gst_buffer_pool_get_config (pool);
+
+  gst_buffer_pool_config_set_params (config, caps, size, 0, 0);
+  gst_buffer_pool_config_set_allocator (config, allocator, params);
+  if (!gst_buffer_pool_set_config (pool, config))
+    gst_clear_object (&pool);
+
+  return pool;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvapluginutils.h Added

@@ -0,0 +1,53 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include <gst/va/gstva.h>
+#include "gstvadevice.h"
+
+G_BEGIN_DECLS
+
+#ifdef G_OS_WIN32
+#define GST_IS_VA_DISPLAY_PLATFORM(dpy) GST_IS_VA_DISPLAY_WIN32(dpy)
+#define GST_VA_DEVICE_PATH_PROP_DESC "DXGI Adapter LUID"
+#else
+#define GST_IS_VA_DISPLAY_PLATFORM(dpy) GST_IS_VA_DISPLAY_DRM(dpy)
+#define GST_VA_DEVICE_PATH_PROP_DESC "DRM device path"
+#endif
+
+GstVaDisplay * gst_va_display_platform_new (const gchar * path);
+
+void gst_va_create_feature_name (GstVaDevice * device,
+                                 const gchar * type_name_default,
+                                 const gchar * type_name_templ,
+                                 gchar ** type_name,
+                                 const gchar * feature_name_default,
+                                 const gchar * feature_name_templ,
+                                 gchar ** feature_name,
+                                 gchar ** desc,
+                                 guint * rank);
+
+GstBufferPool * gst_va_create_other_pool (GstAllocator * allocator,
+                                          GstAllocationParams * params,
+                                          GstCaps * caps,
+                                          guint size);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvaprofile.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvaprofile.c Changed

@@ -33,11 +33,16 @@
   const gchar *name;
   const gchar *media_type;
   const gchar *caps_str;
+  const gchar *decoder_compatible_caps_str;
 } profile_map = {
-#define P(codec, va_name, name, media_type, caps_str) {          \
-    G_PASTE (G_PASTE (VAProfile, codec), va_name), codec,        \
-    G_STRINGIFY (G_PASTE (G_PASTE (VAProfile, codec), va_name)), \
-    name, media_type, caps_str }
+#define O(codec, va_name, name, media_type, caps_str, all_caps_str)   \
+    G_PASTE (G_PASTE (VAProfile, codec), va_name), codec,             \
+    G_STRINGIFY (G_PASTE (G_PASTE (VAProfile, codec), va_name)),      \
+    name, media_type, caps_str, all_caps_str
+#define P(codec, va_name, name, media_type, caps_str) {               \
+    O(codec, va_name, name, media_type, caps_str, NULL) }
+#define Q(codec, va_name, name, media_type, caps_str, all_caps_str) { \
+    O(codec, va_name, name, media_type, caps_str, all_caps_str) }
   P (MPEG2, Simple, "simple", "video/mpeg",
       "mpegversion = (int) 2, profile = (string) simple"),
   P (MPEG2, Main, "main", "video/mpeg",
@@ -69,8 +74,10 @@
   /*     "profile = (string) {  multiview-high, stereo-high }"), */
   /* P (H264, StereoHigh, "video/x-h264", */
   /*     "profile = (string) {  multiview-high, stereo-high }"), */
-  P (HEVC, Main, "main", "video/x-h265", "profile = (string) main"),
-  P (HEVC, Main10, "main-10", "video/x-h265", "profile = (string) main-10"),
+  Q (HEVC, Main, "main", "video/x-h265", "profile = (string) main",
+     "profile = (string) { main, main-intra, main-still-picture }"),
+  Q (HEVC, Main10, "main-10", "video/x-h265", "profile = (string) main-10",
+     "profile = (string) { main-10, main-10-intra }"),
   P (VP9, Profile0, "0", "video/x-vp9", "profile = (string) 0"),
   P (VP9, Profile1, "1", "video/x-vp9", "profile = (string) 1"),
   P (VP9, Profile2, "2", "video/x-vp9", "profile = (string) 2"),
@@ -91,7 +98,6 @@
       "profile = (string) screen-extended-main-10"),
   P (HEVC, SccMain444, "screen-extended-main-444", "video/x-h265",
       "profile = (string) screen-extended-main-444"),
-#if VA_CHECK_VERSION(1,7,0)
   /* Spec A.2:
      "Main" compliant decoders must be able to decode streams with
      seq_profile equal to 0.
@@ -110,12 +116,11 @@
      we just map "0" to "main" and "1" to "high".  */
   P (AV1, Profile0, "main", "video/x-av1", "profile = (string) main"),
   P (AV1, Profile1, "high", "video/x-av1", "profile = (string) high"),
-#endif
-#if VA_CHECK_VERSION(1, 8, 0)
   P (HEVC, SccMain444_10, "screen-extended-main-444-10", "video/x-h265",
       "profile = (string) screen-extended-main-444-10"),
-#endif
+#undef O
 #undef P
+#undef Q
 };
 /* *INDENT-ON* */
 
@@ -161,7 +166,7 @@
 }
 
 GstCaps *
-gst_va_profile_caps (VAProfile profile)
+gst_va_profile_caps (VAProfile profile, VAEntrypoint entrypoint)
 {
   const struct ProfileMap *map = get_profile_map (profile);
   GstCaps *caps;
@@ -170,7 +175,10 @@
   if (!map)
     return NULL;
 
-  if (map->caps_str)
+  if (entrypoint == VAEntrypointVLD && map->decoder_compatible_caps_str) {
+    caps_str = g_strdup_printf ("%s, %s", map->media_type,
+        map->decoder_compatible_caps_str);
+  } else if (map->caps_str)
     caps_str = g_strdup_printf ("%s, %s", map->media_type, map->caps_str);
   else
     caps_str = g_strdup (map->media_type);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvaprofile.h -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvaprofile.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvavp8dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvavp8dec.c Changed

@@ -375,7 +375,7 @@
   GstVaDecodePicture *va_pic;
 
   GST_LOG_OBJECT (base, "end picture %p, (system_frame_number %d)",
-      picture, picture->system_frame_number);
+      picture, GST_CODEC_PICTURE (picture)->system_frame_number);
 
   va_pic = gst_vp8_picture_get_user_data (picture);
 
@@ -392,13 +392,15 @@
   GstVaBaseDec *base = GST_VA_BASE_DEC (decoder);
   GstVaVp8Dec *self = GST_VA_VP8_DEC (decoder);
   GstVideoDecoder *vdec = GST_VIDEO_DECODER (decoder);
+  GstCodecPicture *codec_picture = GST_CODEC_PICTURE (picture);
   gboolean ret;
 
   GST_LOG_OBJECT (self,
       "Outputting picture %p (system_frame_number %d)",
-      picture, picture->system_frame_number);
+      picture, codec_picture->system_frame_number);
 
-  ret = gst_va_base_dec_process_output (base, frame, picture->discont_state, 0);
+  ret = gst_va_base_dec_process_output (base, frame,
+      codec_picture->discont_state, 0);
   gst_vp8_picture_unref (picture);
 
   if (ret)
@@ -520,22 +522,9 @@
 
   type_info.class_data = cdata;
 
-  /* The first decoder to be registered should use a constant name,
-   * like vavp8dec, for any additional decoders, we create unique
-   * names, using inserting the render device name. */
-  if (device->index == 0) {
-    type_name = g_strdup ("GstVaVp8Dec");
-    feature_name = g_strdup ("vavp8dec");
-  } else {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    type_name = g_strdup_printf ("GstVa%sVp8Dec", basename);
-    feature_name = g_strdup_printf ("va%svp8dec", basename);
-    cdata->description = basename;
-
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
-  }
+  gst_va_create_feature_name (device, "GstVaVp8Dec", "GstVa%sVp8Dec",
+      &type_name, "vavp8dec", "va%svp8dec", &feature_name,
+      &cdata->description, &rank);
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvavp9dec.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvavp9dec.c Changed

@@ -506,7 +506,8 @@
 
   GST_LOG_OBJECT (self, "Outputting picture %p", picture);
 
-  ret = gst_va_base_dec_process_output (base, frame, picture->discont_state, 0);
+  ret = gst_va_base_dec_process_output (base,
+      frame, GST_CODEC_PICTURE (picture)->discont_state, 0);
   gst_vp9_picture_unref (picture);
 
   if (ret)
@@ -718,22 +719,9 @@
 
   type_info.class_data = cdata;
 
-  /* The first decoder to be registered should use a constant name,
-   * like vavp9dec, for any additional decoders, we create unique
-   * names, using inserting the render device name. */
-  if (device->index == 0) {
-    type_name = g_strdup ("GstVaVp9Dec");
-    feature_name = g_strdup ("vavp9dec");
-  } else {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    type_name = g_strdup_printf ("GstVa%sVp9Dec", basename);
-    feature_name = g_strdup_printf ("va%svp9dec", basename);
-    cdata->description = basename;
-
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
-  }
+  gst_va_create_feature_name (device, "GstVaVp9Dec", "GstVa%sVp9Dec",
+      &type_name, "vavp9dec", "va%svp9dec", &feature_name,
+      &cdata->description, &rank);
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.22.7.tar.xz/sys/va/gstvavpp.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/gstvavpp.c Changed

@@ -65,11 +65,13 @@
 #include <gst/va/gstva.h>
 #include <gst/video/video.h>
 #include <va/va_drmcommon.h>
+#include <gst/va/gstvavideoformat.h>
 
 #include "gstvabasetransform.h"
 #include "gstvacaps.h"
 #include "gstvadisplay_priv.h"
 #include "gstvafilter.h"
+#include "gstvapluginutils.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_va_vpp_debug);
 #define GST_CAT_DEFAULT gst_va_vpp_debug
@@ -123,6 +125,8 @@
   gboolean has_hdr_meta;
   VAHdrMetaDataHDR10 hdr_meta;
 
+  gboolean pseudo_passthrough;
+
   GList *channels;
 };
 
@@ -812,11 +816,31 @@
     self->op_flags &= ~VPP_CONVERT_CROP;
   }
   gst_va_filter_enable_cropping (btrans->filter,
-      (self->op_flags & VPP_CONVERT_CROP));
+      (self->op_flags & VPP_CONVERT_CROP) == VPP_CONVERT_CROP);
   GST_OBJECT_UNLOCK (self);
 }
 
 static GstFlowReturn
+gst_va_vpp_prepare_output_buffer (GstBaseTransform * trans, GstBuffer * inbuf,
+    GstBuffer ** outbuf)
+{
+  GstVaVpp *self = GST_VA_VPP (trans);
+  GstVaBaseTransform *btrans = GST_VA_BASE_TRANSFORM (self);
+
+  if (((self->op_flags & VPP_CONVERT_FEATURE) == self->op_flags)
+      && gst_caps_is_vamemory (btrans->in_caps)
+      && gst_caps_is_raw (btrans->out_caps)) {
+    self->pseudo_passthrough = TRUE;
+    *outbuf = inbuf;
+    return GST_FLOW_OK;
+  }
+
+  self->pseudo_passthrough = FALSE;
+  return GST_BASE_TRANSFORM_CLASS (parent_class)->prepare_output_buffer (trans,
+      inbuf, outbuf);
+}
+
+static GstFlowReturn
 gst_va_vpp_transform (GstBaseTransform * trans, GstBuffer * inbuf,
     GstBuffer * outbuf)
 {
@@ -833,6 +857,9 @@
   if (res != GST_FLOW_OK)
     return res;
 
+  if (self->pseudo_passthrough && (inbuf == buf))
+    goto bail;
+
   /* *INDENT-OFF* */
   src = (GstVaSample) {
     .buffer = buf,
@@ -852,6 +879,7 @@
     res = GST_BASE_TRANSFORM_FLOW_DROPPED;
   }
 
+bail:
   gst_buffer_unref (buf);
 
   return res;
@@ -878,13 +906,13 @@
     return TRUE;
 
   /* don't copy colorspace/size/orientation specific metadata */
-  if ((self->op_flags & VPP_CONVERT_FORMAT)
+  if ((self->op_flags & VPP_CONVERT_FORMAT) == VPP_CONVERT_FORMAT
       && gst_meta_api_type_has_tag (info->api, META_TAG_COLORSPACE))
     return FALSE;
-  else if ((self->op_flags & (VPP_CONVERT_SIZE | VPP_CONVERT_CROP))
+  else if ((self->op_flags & (VPP_CONVERT_SIZE | VPP_CONVERT_CROP)) != 0
       && gst_meta_api_type_has_tag (info->api, META_TAG_SIZE))
     return FALSE;
-  else if ((self->op_flags & VPP_CONVERT_DIRECTION)
+  else if ((self->op_flags & VPP_CONVERT_DIRECTION) == VPP_CONVERT_DIRECTION
       && gst_meta_api_type_has_tag (info->api, META_TAG_ORIENTATION))
     return FALSE;
   else if (gst_meta_api_type_has_tag (info->api, META_TAG_VIDEO))
@@ -941,8 +969,8 @@
         }
 
         /* remove format-related fields */
-        gst_structure_remove_fields (structure, "format", "colorimetry",
-            "chroma-site", NULL);
+        gst_structure_remove_fields (structure, "format", "drm-format",
+            "colorimetry", "chroma-site", NULL);
 
         break;
       }
@@ -1189,34 +1217,63 @@
   GstVideoFormat fmt;
   gint min_loss = G_MAXINT;
   guint i, best_i, capslen;
+  guint64 best_modifier;
 
   ins = gst_caps_get_structure (caps, 0);
-  in_format = gst_structure_get_string (ins, "format");
-  if (!in_format)
-    return NULL;
 
-  GST_DEBUG_OBJECT (self, "source format %s", in_format);
+  if (gst_video_is_dma_drm_caps (caps)) {
+    guint32 fourcc;
+    GstVideoFormat video_format;
+
+    in_format = gst_structure_get_string (ins, "drm-format");
+    if (!in_format)
+      return NULL;
+
+    fourcc = gst_video_dma_drm_fourcc_from_string (in_format, NULL);
+    video_format = gst_va_video_format_from_drm_fourcc (fourcc);
+    if (video_format == GST_VIDEO_FORMAT_UNKNOWN)
+      return NULL;
+
+    in_info = gst_video_format_get_info (video_format);
+  } else {
+    in_format = gst_structure_get_string (ins, "format");
+    if (!in_format)
+      return NULL;
+
+    in_info =
+        gst_video_format_get_info (gst_video_format_from_string (in_format));
+  }
 
-  in_info =
-      gst_video_format_get_info (gst_video_format_from_string (in_format));
   if (!in_info)
     return NULL;
 
+  GST_DEBUG_OBJECT (self, "source format %s", in_format);
+
   best_i = 0;
+  best_modifier = DRM_FORMAT_MOD_INVALID;
   capslen = gst_caps_get_size (result);
   GST_DEBUG_OBJECT (self, "iterate %d structures", capslen);
   for (i = 0; i < capslen; i++) {
+    gboolean is_dma;
     GstStructure *tests;
     const GValue *format;
+    guint64 modifier;
+    guint32 fourcc;
 
+    features = gst_caps_get_features (result, i);
     tests = gst_caps_get_structure (result, i);
-    format = gst_structure_get_value (tests, "format");
+
+    if (gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+      format = gst_structure_get_value (tests, "drm-format");
+      is_dma = TRUE;
+    } else {
+      format = gst_structure_get_value (tests, "format");
+      is_dma = FALSE;
+    }
     /* should not happen */
     if (format == NULL)
       continue;
 
-    features = gst_caps_get_features (result, i);
-
     if (GST_VALUE_HOLDS_LIST (format)) {
       gint j, len;
 
@@ -1225,23 +1282,52 @@
       for (j = 0; j < len; j++) {
         const GValue *val;
 
+        modifier = DRM_FORMAT_MOD_INVALID;
+
         val = gst_value_list_get_value (format, j);
         if (G_VALUE_HOLDS_STRING (val)) {
-          fmt = gst_video_format_from_string (g_value_get_string (val));
+          if (is_dma) {
+            fourcc = gst_video_dma_drm_fourcc_from_string
+                (g_value_get_string (val), &modifier);
+            fmt = gst_va_video_format_from_drm_fourcc (fourcc);
+          } else {
+            fmt = gst_video_format_from_string (g_value_get_string (val));
+          }
+          if (fmt == GST_VIDEO_FORMAT_UNKNOWN)
+            continue;
+
           if (!gst_va_filter_has_video_format (btrans->filter, fmt, features))
             continue;
-          if (score_value (self, in_info, fmt, &min_loss, &out_info))
+
+          if (score_value (self, in_info, fmt, &min_loss, &out_info)) {
             best_i = i;
+            best_modifier = modifier;
+          }
+
           if (min_loss == 0)
             break;
         }
       }
     } else if (G_VALUE_HOLDS_STRING (format)) {
-      fmt = gst_video_format_from_string (g_value_get_string (format));
+      modifier = DRM_FORMAT_MOD_INVALID;
+
+      if (is_dma) {
+        fourcc = gst_video_dma_drm_fourcc_from_string
+            (g_value_get_string (format), &modifier);
+        fmt = gst_va_video_format_from_drm_fourcc (fourcc);
+      } else {
+        fmt = gst_video_format_from_string (g_value_get_string (format));
+      }
+      if (fmt == GST_VIDEO_FORMAT_UNKNOWN)
+        continue;
+
       if (!gst_va_filter_has_video_format (btrans->filter, fmt, features))
         continue;
-      if (score_value (self, in_info, fmt, &min_loss, &out_info))
+
+      if (score_value (self, in_info, fmt, &min_loss, &out_info)) {
         best_i = i;
+        best_modifier = modifier;
+      }
     }
 
     if (min_loss == 0)
@@ -1254,8 +1340,21 @@
 
     features = gst_caps_features_copy (gst_caps_get_features (result, best_i));
     out = gst_structure_copy (gst_caps_get_structure (result, best_i));
-    gst_structure_set (out, "format", G_TYPE_STRING,
-        GST_VIDEO_FORMAT_INFO_NAME (out_info), NULL);
+
+    if (gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
+      gchar *drm_fmt_name;
+
+      g_assert (best_modifier != DRM_FORMAT_MOD_INVALID);
+
+      drm_fmt_name = gst_video_dma_drm_fourcc_to_string
+          (gst_va_drm_fourcc_from_video_format (out_info->format),
+          best_modifier);
+      gst_structure_set (out, "drm-format", G_TYPE_STRING, drm_fmt_name, NULL);
+      g_free (drm_fmt_name);
+    } else {
+      gst_structure_set (out, "format", G_TYPE_STRING,
+          GST_VIDEO_FORMAT_INFO_NAME (out_info), NULL);
+    }
     ret = gst_caps_new_full (out, NULL);
     gst_caps_set_features_simple (ret, features);
     return ret;
@@ -1756,12 +1855,13 @@
     const GValue *in_colorimetry =
         gst_structure_get_value (in_caps_s, "colorimetry");
 
-    if (!gst_video_info_from_caps (&in_info, in_caps)) {
+    if (!gst_va_video_info_from_caps (&in_info, NULL, in_caps)) {
       GST_WARNING_OBJECT (self,
           "Failed to convert sink pad caps to video info");
       return;
     }
-    if (!gst_video_info_from_caps (&out_info, out_caps)) {
+
+    if (!gst_va_video_info_from_caps (&out_info, NULL, out_caps)) {
       GST_WARNING_OBJECT (self, "Failed to convert src pad caps to video info");
       return;
     }
@@ -1843,7 +1943,7 @@
 
   have_colorimetry = gst_structure_has_field (s, "colorimetry");
   if (!have_colorimetry) {
-    if (gst_video_info_from_caps (&out_info, result)) {
+    if (gst_va_video_info_from_caps (&out_info, NULL, result)) {
       gchar *colorimetry_str =
           gst_video_colorimetry_to_string (&out_info.colorimetry);
       gst_caps_set_simple (result, "colorimetry", G_TYPE_STRING,
@@ -2114,7 +2214,7 @@
 
   klass = g_string_new ("Converter/Filter/Colorspace/Scaler/Video/Hardware");
 
-  display = gst_va_display_drm_new_from_path (btrans_class->render_device_path);
+  display = gst_va_display_platform_new (btrans_class->render_device_path);
   filter = gst_va_filter_new (display);
 
   if (gst_va_filter_open (filter)) {
@@ -2183,6 +2283,8 @@
   trans_class->transform_meta = GST_DEBUG_FUNCPTR (gst_va_vpp_transform_meta);
   trans_class->src_event = GST_DEBUG_FUNCPTR (gst_va_vpp_src_event);
   trans_class->sink_event = GST_DEBUG_FUNCPTR (gst_va_vpp_sink_event);
+  trans_class->prepare_output_buffer =
+      GST_DEBUG_FUNCPTR (gst_va_vpp_prepare_output_buffer);
 
   trans_class->transform_ip_on_passthrough = FALSE;
 
@@ -2320,24 +2422,9 @@
 
   type_info.class_data = cdata;
 
-  type_name = g_strdup ("GstVaPostProc");
-  feature_name = g_strdup ("vapostproc");
-
-  /* The first postprocessor to be registered should use a constant
-   * name, like vapostproc, for any additional postprocessors, we
-   * create unique names, using inserting the render device name. */
-  if (g_type_from_name (type_name)) {
-    gchar *basename = g_path_get_basename (device->render_device_path);
-    g_free (type_name);
-    g_free (feature_name);
-    type_name = g_strdup_printf ("GstVa%sPostProc", basename);
-    feature_name = g_strdup_printf ("va%spostproc", basename);
-    cdata->description = basename;
-
-    /* lower rank for non-first device */
-    if (rank > 0)
-      rank--;
-  }
+  gst_va_create_feature_name (device, "GstVaPostProc", "GstVa%sPostProc",
+      &type_name, "vapostproc", "va%spostproc", &feature_name,
+      &cdata->description, &rank);
 
   g_once (&debug_once, _register_debug_category, NULL);

gst-plugins-bad-1.22.7.tar.xz/sys/va/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/va/meson.build Changed

@@ -1,14 +1,15 @@
 va_sources = 
   'plugin.c',
   'gstjpegdecoder.c',
+  'gstvaav1dec.c',
+  'gstvabase.c',
   'gstvabasedec.c',
-  'gstvabasetransform.c',
   'gstvabaseenc.c',
+  'gstvabasetransform.c',
   'gstvacaps.c',
   'gstvacompositor.c',
   'gstvadecoder.c',
   'gstvadeinterlace.c',
-  'gstvadevice.c',
   'gstvadisplay_priv.c',
   'gstvaencoder.c',
   'gstvafilter.c',
@@ -18,13 +19,22 @@
   'gstvah265enc.c',
   'gstvajpegdec.c',
   'gstvampeg2dec.c',
+  'gstvapluginutils.c',
   'gstvaprofile.c',
   'gstvavp8dec.c',
   'gstvavp9dec.c',
   'gstvavpp.c',
 
 
-if host_system != 'linux'
+va_linux_sources = 
+  'gstvadevice_linux.c'
+
+
+va_win32_sources = 
+  'gstvadevice_win32.cpp'
+
+
+if host_system not in 'linux', 'windows'
   subdir_done()
 endif
 
@@ -33,28 +43,45 @@
   subdir_done()
 endif
 
-libgudev_dep = dependency('gudev-1.0', required: false)
-cdata.set10('HAVE_GUDEV', libgudev_dep.found())
-
-if libva_dep.version().version_compare('>= 1.8')
-  va_sources += 'gstvaav1dec.c'
-endif
-
 driverdir = libva_dep.get_variable('driverdir', default_value: '')
 if driverdir == ''
   driverdir = join_paths(get_option('prefix'), get_option('libdir'), 'dri')
 endif
-gstva_cargs = 
+
+extra_args = 
   '-DLIBVA_DRIVERS_PATH="' + driverdir + '"',
-  '-std=c99',
   '-DGST_USE_UNSTABLE_API',
 
+extra_dep = 
+c_std_arg = 'c_std=c99'
+
+if host_system == 'linux'
+  libgudev_dep = dependency('gudev-1.0', required: get_option('udev'), allow_fallback: true)
+  if libgudev_dep.found()
+    extra_args += '-DHAVE_GUDEV'
+    extra_dep += libgudev_dep
+  endif
+  va_sources += va_linux_sources
+else
+  va_sources += va_win32_sources
+endif
+
+# MSVC does not understand c99
+if cc.get_id() == 'msvc'
+  c_std_arg = 'c_std=c11'
+endif
+
+if libva_dep.version().version_compare('>= 1.15')
+  va_sources += 'gstvaav1enc.c'
+endif
 
 gstva = library('gstva',
   va_sources,
-  c_args : gst_plugins_bad_args + gstva_cargs,
+  c_args : gst_plugins_bad_args + extra_args,
+  cpp_args : gst_plugins_bad_args + extra_args,
   include_directories : configinc,
   dependencies : gstcodecs_dep, gstva_dep, libgudev_dep + extra_dep,
+  override_options : c_std_arg,
   install : true,
   install_dir : plugins_install_dir,
 )

gst-plugins-bad-1.22.7.tar.xz/sys/va/plugin.c -> gst-plugins-bad-1.24.5.tar.xz/sys/va/plugin.c Changed

@@ -28,6 +28,7 @@
 #endif
 
 #include "gstvaav1dec.h"
+#include "gstvaav1enc.h"
 #include "gstvacaps.h"
 #include "gstvacompositor.h"
 #include "gstvadeinterlace.h"
@@ -47,14 +48,18 @@
 #define GST_CAT_DEFAULT gstva_debug
 GST_DEBUG_CATEGORY (gstva_debug);
 
-/* big bad mutex to exclusive access to shared stream buffers, such as
- * DMABuf after a tee */
-GRecMutex GST_VA_SHARED_LOCK = { 0, };
+#ifdef G_OS_WIN32
+/* Windows support is still experimental */
+#define GST_VA_RANK_PRIMARY GST_RANK_NONE
+#else
+#define GST_VA_RANK_PRIMARY (GST_RANK_PRIMARY + 1)
+#endif
 
 static void
 plugin_add_dependencies (GstPlugin * plugin)
 {
-  const gchar *env_vars = { "LIBVA_DRIVER_NAME", NULL };
+#ifndef G_OS_WIN32
+  const gchar *env_vars = { "LIBVA_DRIVER_NAME", "GST_VA_ALL_DRIVERS", NULL };
   const gchar *kernel_paths = { "/dev/dri", NULL };
   const gchar *kernel_names = { "renderD", NULL };
 
@@ -62,7 +67,8 @@
   gst_plugin_add_dependency (plugin, NULL, kernel_paths, kernel_names,
       GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_PREFIX);
 
-  /* features get updated upon changes on LIBVA_DRIVER_NAME envvar */
+  /* features get updated upon changes on LIBVA_DRIVER_NAME and
+   * GST_VA_ALL_DRIVERS envvar */
   gst_plugin_add_dependency (plugin, env_vars, NULL, NULL,
       GST_PLUGIN_DEPENDENCY_FLAG_NONE);
 
@@ -72,6 +78,7 @@
       LIBVA_DRIVERS_PATH, "_drv_video.so",
       GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX |
       GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY);
+#endif
 }
 
 static void
@@ -102,48 +109,46 @@
     switch (codec) {
       case H264:
         if (!gst_va_h264_dec_register (plugin, device, sinkcaps, srccaps,
-                GST_RANK_NONE)) {
+                GST_VA_RANK_PRIMARY)) {
           GST_WARNING ("Failed to register H264 decoder: %s",
               device->render_device_path);
         }
         break;
       case HEVC:
         if (!gst_va_h265_dec_register (plugin, device, sinkcaps, srccaps,
-                GST_RANK_NONE)) {
+                GST_VA_RANK_PRIMARY)) {
           GST_WARNING ("Failed to register H265 decoder: %s",
               device->render_device_path);
         }
         break;
       case VP8:
         if (!gst_va_vp8_dec_register (plugin, device, sinkcaps, srccaps,
-                GST_RANK_NONE)) {
+                GST_VA_RANK_PRIMARY)) {
           GST_WARNING ("Failed to register VP8 decoder: %s",
               device->render_device_path);
         }
         break;
       case VP9:
         if (!gst_va_vp9_dec_register (plugin, device, sinkcaps, srccaps,
-                GST_RANK_NONE)) {
+                GST_VA_RANK_PRIMARY)) {
           GST_WARNING ("Failed to register VP9 decoder: %s",
               device->render_device_path);
         }
         break;
       case MPEG2:
         if (!gst_va_mpeg2_dec_register (plugin, device, sinkcaps, srccaps,
-                GST_RANK_NONE)) {
+                GST_VA_RANK_PRIMARY)) {
           GST_WARNING ("Failed to register Mpeg2 decoder: %s",
               device->render_device_path);
         }
         break;
-#if VA_CHECK_VERSION(1, 8, 0)
       case AV1:
         if (!gst_va_av1_dec_register (plugin, device, sinkcaps, srccaps,
-                GST_RANK_NONE)) {
+                GST_VA_RANK_PRIMARY)) {
           GST_WARNING ("Failed to register AV1 decoder: %s",
               device->render_device_path);
         }
         break;
-#endif
       case JPEG:
         if (!gst_va_jpeg_dec_register (plugin, device, sinkcaps, srccaps,
                 GST_RANK_NONE)) {
@@ -203,6 +208,15 @@
               device->render_device_path);
         }
         break;
+#if VA_CHECK_VERSION(1, 15, 0)
+      case AV1:
+        if (!gst_va_av1_enc_register (plugin, device, sinkcaps, srccaps,
+                GST_RANK_NONE, entrypoint)) {
+          GST_WARNING ("Failed to register AV1 encoder: %s",
+              device->render_device_path);
+        }
+        break;
+#endif
       default:
         GST_DEBUG ("No encoder implementation for %" GST_FOURCC_FORMAT,
             GST_FOURCC_ARGS (codec));
@@ -297,7 +311,7 @@
 
   status = vaQueryConfigProfiles (dpy, profiles, &num_profiles);
   if (status != VA_STATUS_SUCCESS) {
-    GST_ERROR ("vaQueryConfigProfile: %s", vaErrorStr (status));
+    GST_WARNING ("vaQueryConfigProfile: %s", vaErrorStr (status));
     goto bail;
   }
 
@@ -305,7 +319,7 @@
     status = vaQueryConfigEntrypoints (dpy, profilesi, entrypoints,
         &num_entrypoints);
     if (status != VA_STATUS_SUCCESS) {
-      GST_ERROR ("vaQueryConfigEntrypoints: %s", vaErrorStr (status));
+      GST_WARNING ("vaQueryConfigEntrypoints: %s", vaErrorStr (status));
       goto bail;
     }
 
@@ -348,22 +362,18 @@
 plugin_init (GstPlugin * plugin)
 {
   GList *devices, *dev;
-  gboolean ret = TRUE;
 
   GST_DEBUG_CATEGORY_INIT (gstva_debug, "va", 0, "VA general debug");
 
   plugin_add_dependencies (plugin);
 
   devices = gst_va_device_find_devices ();
-  for (dev = devices; dev; dev = g_list_next (dev)) {
-    if (!plugin_register_elements (plugin, dev->data)) {
-      ret = FALSE;
-      break;
-    }
-  }
+  for (dev = devices; dev; dev = g_list_next (dev))
+    plugin_register_elements (plugin, dev->data);
+
   gst_va_device_list_free (devices);
 
-  return ret;
+  return TRUE;
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi/gstwasapisink.c -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi/gstwasapisink.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi/gstwasapisrc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi/gstwasapisrc.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi/gstwasapiutil.c -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi/gstwasapiutil.c Changed

@@ -27,29 +27,18 @@
  * initguid.h must be included in the C file before mmdeviceapi.h
  * which is included in gstwasapiutil.h.
  */
-#ifdef _MSC_VER
 #include <initguid.h>
-#endif
 #include "gstwasapiutil.h"
 #include "gstwasapidevice.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gst_wasapi_debug);
 #define GST_CAT_DEFAULT gst_wasapi_debug
 
-/* This was only added to MinGW in ~2015 and our Cerbero toolchain is too old */
-#if defined(_MSC_VER)
 #include <functiondiscoverykeys_devpkey.h>
-#elif !defined(PKEY_Device_FriendlyName)
-#include <initguid.h>
-#include <propkey.h>
-DEFINE_PROPERTYKEY (PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80,
-    0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14);
-DEFINE_PROPERTYKEY (PKEY_AudioEngine_DeviceFormat, 0xf19f064d, 0x82c, 0x4e27,
-    0xbc, 0x73, 0x68, 0x82, 0xa1, 0xbb, 0x8e, 0x4c, 0);
-#endif
 
 /* __uuidof is only available in C++, so we hard-code the GUID values for all
- * these. This is ok because these are ABI. */
+ * these. This is ok because these are ABI. MSYS2 provides these in C. */
+#ifndef HAVE_AUDCLNT_GUIDS
 const CLSID CLSID_MMDeviceEnumerator = { 0xbcde0395, 0xe52f, 0x467c,
   {0x8e, 0x3d, 0xc4, 0x57, 0x92, 0x91, 0x69, 0x2e}
 };
@@ -66,10 +55,6 @@
   {0xb1, 0x78, 0xc2, 0xf5, 0x68, 0xa7, 0x03, 0xb2}
 };
 
-const IID IID_IAudioClient3 = { 0x7ed4ee07, 0x8e67, 0x4cd4,
-  {0x8c, 0x1a, 0x2b, 0x7a, 0x59, 0x87, 0xad, 0x42}
-};
-
 const IID IID_IAudioClock = { 0xcd63314f, 0x3fba, 0x4a1b,
   {0x81, 0x2c, 0xef, 0x96, 0x35, 0x87, 0x28, 0xe7}
 };
@@ -81,6 +66,13 @@
 const IID IID_IAudioRenderClient = { 0xf294acfc, 0x3146, 0x4483,
   {0xa7, 0xbf, 0xad, 0xdc, 0xa7, 0xc2, 0x60, 0xe2}
 };
+#endif
+
+#ifndef HAVE_AUDCLNT3_GUID
+const IID IID_IAudioClient3 = { 0x7ed4ee07, 0x8e67, 0x4cd4,
+  {0x8c, 0x1a, 0x2b, 0x7a, 0x59, 0x87, 0xad, 0x42}
+};
+#endif
 
 /* Desktop only defines */
 #ifndef KSAUDIO_SPEAKER_MONO
@@ -415,6 +407,7 @@
     GstDevice *device;
     GstStructure *props;
     GstCaps *caps;
+    gboolean parse_ret;
 
     hr = IMMDeviceCollection_Item (device_collection, ii, &item);
     if (hr != S_OK)
@@ -477,8 +470,12 @@
       goto next;
     }
 
-    if (!gst_wasapi_util_parse_waveformatex ((WAVEFORMATEXTENSIBLE *) format,
-            gst_static_caps_get (&scaps), &caps, NULL))
+    parse_ret =
+        gst_wasapi_util_parse_waveformatex ((WAVEFORMATEXTENSIBLE *) format,
+        gst_static_caps_get (&scaps), &caps, NULL);
+    CoTaskMemFree (format);
+
+    if (!parse_ret)
       goto next;
 
     /* Set some useful properties */
@@ -564,7 +561,7 @@
       return FALSE;
     }
 
-    format = malloc (var.blob.cbSize);
+    format = CoTaskMemAlloc (var.blob.cbSize);
     memcpy (format, var.blob.pBlobData, var.blob.cbSize);
 
     PropVariantClear (&var);
@@ -578,7 +575,7 @@
     goto out;
 
   GST_ERROR_OBJECT (self, "AudioEngine DeviceFormat not supported");
-  free (format);
+  CoTaskMemFree (format);
   return FALSE;
 
 out:
@@ -588,7 +585,7 @@
 
 gboolean
 gst_wasapi_util_get_device (GstMMDeviceEnumerator * self,
-    gint data_flow, gint role, const wchar_t * device_strid,
+    gint data_flow, gint role, const wchar_t *device_strid,
     IMMDevice ** ret_device)
 {
   gboolean res = FALSE;

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi2/gstwasapi2client.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi2/gstwasapi2client.cpp Changed

@@ -40,6 +40,7 @@
 #include <string>
 #include <locale>
 #include <codecvt>
+#include <atomic>
 
 /* *INDENT-OFF* */
 using namespace ABI::Windows::ApplicationModel::Core;
@@ -95,15 +96,29 @@
 gst_wasapi2_client_on_device_activated (GstWasapi2Client * client,
     IAudioClient * audio_client);
 
+static void
+gst_wasapi2_client_on_endpoint_volume_activated (GstWasapi2Client * client,
+    IAudioEndpointVolume * audio_endpoint_volume);
+
+static void
+gst_wasapi2_client_set_endpoint_muted (GstWasapi2Client * client,
+    gboolean muted);
+
 /* *INDENT-OFF* */
 class GstWasapiDeviceActivator
     : public RuntimeClass<RuntimeClassFlags<ClassicCom>, FtmBase,
         IActivateAudioInterfaceCompletionHandler>
 {
 public:
+  typedef enum {
+    WASAPI_IFACE_AUDIO_CLIENT,
+    WASAPI_IFACE_AUDIO_ENDPOINT_VOLUME,
+  } WasapiInterface;
+
   GstWasapiDeviceActivator ()
   {
     g_weak_ref_init (&listener_, nullptr);
+    interface_to_activate_ = WASAPI_IFACE_AUDIO_CLIENT;
   }
 
   ~GstWasapiDeviceActivator ()
@@ -112,7 +127,9 @@
   }
 
   HRESULT
-  RuntimeClassInitialize (GstWasapi2Client * listener, gpointer dispatcher)
+  RuntimeClassInitialize (GstWasapi2Client * listener,
+      gpointer dispatcher,
+      WasapiInterface interface_to_activate)
   {
     if (!listener)
       return E_INVALIDARG;
@@ -129,6 +146,8 @@
         GST_INFO("Main UI dispatcher is available");
     }
 
+    interface_to_activate_ = interface_to_activate;
+
     return S_OK;
   }
 
@@ -136,6 +155,7 @@
   (IActivateAudioInterfaceAsyncOperation *async_op)
   {
     ComPtr<IAudioClient> audio_client;
+    ComPtr<IAudioEndpointVolume> audio_endpoint_volume;
     HRESULT hr = S_OK;
     HRESULT hr_async_op = S_OK;
     ComPtr<IUnknown> audio_interface;
@@ -162,15 +182,34 @@
       goto done;
     }
 
-    hr = audio_interface.As (&audio_client);
-    if (!gst_wasapi2_result (hr)) {
-      GST_ERROR_OBJECT (client, "Failed to get IAudioClient3 interface");
-      goto done;
+    switch (interface_to_activate_) {
+      case WASAPI_IFACE_AUDIO_CLIENT:
+        hr = audio_interface.As (&audio_client);
+        if (!gst_wasapi2_result (hr)) {
+          GST_ERROR_OBJECT (client, "Failed to get IAudioClient3 interface");
+          goto done;
+        }
+        break;
+      case WASAPI_IFACE_AUDIO_ENDPOINT_VOLUME:
+        hr = audio_interface.As (&audio_endpoint_volume);
+        if (!gst_wasapi2_result (hr)) {
+          GST_ERROR_OBJECT (client, "Failed to get IAudioEndpointVolume interface");
+          goto done;
+        }
+        break;
     }
 
   done:
     /* Should call this method anyway, listener will wait this event */
-    gst_wasapi2_client_on_device_activated (client, audio_client.Get());
+    switch (interface_to_activate_) {
+      case WASAPI_IFACE_AUDIO_CLIENT:
+        gst_wasapi2_client_on_device_activated (client, audio_client.Get());
+        break;
+      case WASAPI_IFACE_AUDIO_ENDPOINT_VOLUME:
+        gst_wasapi2_client_on_endpoint_volume_activated (client, audio_endpoint_volume.Get());
+        break;
+    }
+
     gst_object_unref (client);
     /* return S_OK anyway, but listener can know it's succeeded or not
      * by passed IAudioClient handle via gst_wasapi2_client_on_device_activated
@@ -192,16 +231,27 @@
       ComPtr<IActivateAudioInterfaceAsyncOperation> async_op;
       HRESULT async_hr = S_OK;
       PROPVARIANT activate_params = {};
+      IID iid = {};
+
+      switch (interface_to_activate_) {
+        case WASAPI_IFACE_AUDIO_CLIENT:
+          iid = __uuidof (IAudioClient);
+          break;
+        case WASAPI_IFACE_AUDIO_ENDPOINT_VOLUME:
+          iid = __uuidof (IAudioEndpointVolume);
+          break;
+      }
+
       if (params) {
         activate_params.vt = VT_BLOB;
         activate_params.blob.cbSize = sizeof(GST_AUDIOCLIENT_ACTIVATION_PARAMS);
         activate_params.blob.pBlobData = (BYTE *) params;
 
         async_hr = ActivateAudioInterfaceAsync (device_id.c_str (),
-              __uuidof(IAudioClient), &activate_params, this, &async_op);
+              iid, &activate_params, this, &async_op);
       } else {
         async_hr = ActivateAudioInterfaceAsync (device_id.c_str (),
-              __uuidof(IAudioClient), nullptr, this, &async_op);
+              iid, nullptr, this, &async_op);
       }
 
       /* for debugging */
@@ -234,6 +284,46 @@
 private:
   GWeakRef listener_;
   ComPtr<ICoreDispatcher> dispatcher_;
+  WasapiInterface interface_to_activate_;
+};
+
+class GstWasapiEndpointVolumeCallback
+    : public RuntimeClass<RuntimeClassFlags<ClassicCom>, FtmBase,
+        IAudioEndpointVolumeCallback>
+{
+public:
+  GstWasapiEndpointVolumeCallback ()
+  {
+    g_weak_ref_init (&client_, nullptr);
+  }
+
+  ~GstWasapiEndpointVolumeCallback ()
+  {
+    g_weak_ref_set (&client_, nullptr);
+  }
+
+  HRESULT
+  RuntimeClassInitialize (GstWasapi2Client * client)
+  {
+    if (!client)
+      return E_INVALIDARG;
+    g_weak_ref_set (&client_, client);
+    return S_OK;
+  }
+
+  STDMETHOD(OnNotify)
+  (AUDIO_VOLUME_NOTIFICATION_DATA * notify)
+  {
+    GstWasapi2Client *client = (GstWasapi2Client *) g_weak_ref_get (&client_);
+    if (client) {
+      gst_wasapi2_client_set_endpoint_muted (client, notify->bMuted);
+      gst_object_unref (client);
+    }
+    return S_OK;
+  }
+
+private:
+  GWeakRef client_;
 };
 /* *INDENT-ON* */
 
@@ -261,10 +351,17 @@
 #define DEFAULT_DEVICE_INDEX  -1
 #define DEFAULT_DEVICE_CLASS  GST_WASAPI2_CLIENT_DEVICE_CLASS_CAPTURE
 
+struct GstWasapi2ClientPrivate
+{
+  std::atomic < bool >is_endpoint_muted;
+};
+
 struct _GstWasapi2Client
 {
   GstObject parent;
 
+  GstWasapi2ClientPrivate *priv;
+
   GstWasapi2ClientDeviceClass device_class;
   gchar *device_id;
   gchar *device_name;
@@ -274,7 +371,10 @@
   guint target_pid;
 
   IAudioClient *audio_client;
-  GstWasapiDeviceActivator *activator;
+
+  GMutex endpoint_volume_lock;
+  IAudioEndpointVolume *audio_endpoint_volume;
+  GstWasapiEndpointVolumeCallback *endpoint_volume_callback;
 
   GstCaps *supported_caps;
 
@@ -345,7 +445,9 @@
 
   g_object_class_install_property (gobject_class, PROP_DEVICE,
       g_param_spec_string ("device", "Device",
-          "WASAPI playback device as a GUID string", nullptr, param_flags));
+          "Audio device ID as provided by "
+          "Windows.Devices.Enumeration.DeviceInformation.Id",
+          nullptr, param_flags));
   g_object_class_install_property (gobject_class, PROP_DEVICE_NAME,
       g_param_spec_string ("device-name", "Device Name",
           "The human-readable device name", nullptr, param_flags));
@@ -383,8 +485,13 @@
   g_cond_init (&self->init_cond);
   self->activate_state = GST_WASAPI2_CLIENT_ACTIVATE_INIT;
 
+  g_mutex_init (&self->endpoint_volume_lock);
+
   self->context = g_main_context_new ();
   self->loop = g_main_loop_new (self->context, FALSE);
+
+  self->priv = new GstWasapi2ClientPrivate ();
+  self->priv->is_endpoint_muted.store (false, std::memory_order_release);
 }
 
 static void
@@ -433,6 +540,10 @@
   g_mutex_clear (&self->init_lock);
   g_cond_clear (&self->init_cond);
 
+  g_mutex_clear (&self->endpoint_volume_lock);
+
+  delete self->priv;
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -535,6 +646,55 @@
   g_mutex_unlock (&self->init_lock);
 }
 
+static void
+gst_wasapi2_client_on_endpoint_volume_activated (GstWasapi2Client * self,
+    IAudioEndpointVolume * audio_endpoint_volume)
+{
+  GST_INFO_OBJECT (self, "Audio Endpoint Volume activated");
+
+  if (audio_endpoint_volume) {
+    HRESULT hr;
+    ComPtr < GstWasapiEndpointVolumeCallback > callback;
+
+    g_mutex_lock (&self->endpoint_volume_lock);
+    audio_endpoint_volume->AddRef ();
+    self->audio_endpoint_volume = audio_endpoint_volume;
+
+    hr = MakeAndInitialize < GstWasapiEndpointVolumeCallback > (&callback,
+        self);
+    if (!gst_wasapi2_result (hr)) {
+      GST_WARNING_OBJECT (self,
+          "Could not create endpoint volume callback object");
+    } else {
+      hr = audio_endpoint_volume->RegisterControlChangeNotify (callback.Get ());
+      if (!gst_wasapi2_result (hr)) {
+        GST_WARNING_OBJECT (self,
+            "Failed to register endpoint volume callback");
+      } else {
+        BOOL initially_muted = FALSE;
+
+        self->endpoint_volume_callback = callback.Detach ();
+
+        hr = audio_endpoint_volume->GetMute (&initially_muted);
+        if (gst_wasapi2_result (hr)) {
+          gst_wasapi2_client_set_endpoint_muted (self, initially_muted);
+        }
+      }
+    }
+    g_mutex_unlock (&self->endpoint_volume_lock);
+  } else {
+    GST_WARNING_OBJECT (self, "IAudioEndpointVolume is unavailable");
+  }
+}
+
+static void
+gst_wasapi2_client_set_endpoint_muted (GstWasapi2Client * self, gboolean muted)
+{
+  GST_DEBUG_OBJECT (self, "Audio Endpoint Volume: muted=%d", muted);
+
+  self->priv->is_endpoint_muted.store (muted, std::memory_order_release);
+}
+
 /* *INDENT-OFF* */
 static std::string
 convert_wstring_to_string (const std::wstring &wstr)
@@ -582,7 +742,8 @@
 
 static void
 gst_wasapi2_client_activate_async (GstWasapi2Client * self,
-    GstWasapiDeviceActivator * activator)
+    GstWasapiDeviceActivator * activator,
+    GstWasapiDeviceActivator * endpoint_volume_activator)
 {
   /* *INDENT-OFF* */
   ComPtr<IDeviceInformationStatics> device_info_static;
@@ -872,6 +1033,20 @@
     return;
   }
 
+  /* activate the endpoint volume interface */
+  if (endpoint_volume_activator) {
+    if (use_default_device) {
+      GST_INFO_OBJECT (self,
+          "Endpoint volume monitoring for the default device is not implemented.");
+    } else {
+      hr = endpoint_volume_activator->ActivateDeviceAsync
+          (target_device_id_wstring, nullptr);
+      if (!gst_wasapi2_result (hr)) {
+        GST_WARNING_OBJECT (self, "Failed to activate device");
+      }
+    }
+  }
+
   g_mutex_lock (&self->lock);
   if (self->activate_state == GST_WASAPI2_CLIENT_ACTIVATE_INIT)
     self->activate_state = GST_WASAPI2_CLIENT_ACTIVATE_WAIT;
@@ -906,10 +1081,11 @@
   GSource *source;
   HRESULT hr;
   /* *INDENT-OFF* */
-  ComPtr<GstWasapiDeviceActivator> activator;
+  ComPtr<GstWasapiDeviceActivator> client_activator;
+  ComPtr<GstWasapiDeviceActivator> endpoint_volume_activator;
 
-  hr = MakeAndInitialize<GstWasapiDeviceActivator> (&activator,
-      self, self->dispatcher);
+  hr = MakeAndInitialize<GstWasapiDeviceActivator> (&client_activator,
+      self, self->dispatcher, GstWasapiDeviceActivator::WASAPI_IFACE_AUDIO_CLIENT);
   /* *INDENT-ON* */
 
   if (!gst_wasapi2_result (hr)) {
@@ -918,7 +1094,17 @@
     goto run_loop;
   }
 
-  gst_wasapi2_client_activate_async (self, activator.Get ());
+  /* Initialize audio endpoint volume activator */
+  hr = MakeAndInitialize < GstWasapiDeviceActivator >
+      (&endpoint_volume_activator, self, self->dispatcher,
+      GstWasapiDeviceActivator::WASAPI_IFACE_AUDIO_ENDPOINT_VOLUME);
+  if (!gst_wasapi2_result (hr)) {
+    GST_WARNING_OBJECT (self,
+        "Could not create endpoint volume activator object");
+  }
+
+  gst_wasapi2_client_activate_async (self, client_activator.Get (),
+      endpoint_volume_activator.Get ());
 
   if (!self->dispatcher) {
     /* In case that dispatcher is unavailable, wait activation synchroniously */
@@ -949,9 +1135,19 @@
 
   GST_WASAPI2_CLEAR_COM (self->audio_client);
 
+  g_mutex_lock (&self->endpoint_volume_lock);
+  if (self->audio_endpoint_volume && self->endpoint_volume_callback) {
+    self->audio_endpoint_volume->
+        UnregisterControlChangeNotify (self->endpoint_volume_callback);
+  }
+  GST_WASAPI2_CLEAR_COM (self->endpoint_volume_callback);
+  GST_WASAPI2_CLEAR_COM (self->audio_endpoint_volume);
+  g_mutex_unlock (&self->endpoint_volume_lock);
+
   /* Reset explicitly to ensure that it happens before
    * RoInitializeWrapper dtor is called */
-  activator.Reset ();
+  client_activator.Reset ();
+  endpoint_volume_activator.Reset ();
 
   GST_DEBUG_OBJECT (self, "Exit thread function");
 
@@ -1136,3 +1332,11 @@
 
   return client->audio_client;
 }
+
+gboolean
+gst_wasapi2_client_is_endpoint_muted (GstWasapi2Client * client)
+{
+  g_return_val_if_fail (GST_IS_WASAPI2_CLIENT (client), FALSE);
+
+  return client->priv->is_endpoint_muted.load (std::memory_order_acquire);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi2/gstwasapi2client.h -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi2/gstwasapi2client.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi2/gstwasapi2device.c -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi2/gstwasapi2device.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi2/gstwasapi2ringbuffer.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi2/gstwasapi2ringbuffer.cpp Changed

@@ -21,6 +21,8 @@
 #include <string.h>
 #include <mfapi.h>
 #include <wrl.h>
+#include <memory>
+#include <atomic>
 #include <vector>
 
 GST_DEBUG_CATEGORY_STATIC (gst_wasapi2_ring_buffer_debug);
@@ -33,22 +35,28 @@
 /* *INDENT-OFF* */
 using namespace Microsoft::WRL;
 
+struct GstWasapi2RingBufferPtr
+{
+  GstWasapi2RingBufferPtr (GstWasapi2RingBuffer * ringbuffer)
+      : obj(ringbuffer)
+  {
+  }
+
+  /* Point to ringbuffer without holding ownership */
+  GstWasapi2RingBuffer *obj;
+};
+
 class GstWasapiAsyncCallback : public IMFAsyncCallback
 {
 public:
-  GstWasapiAsyncCallback(GstWasapi2RingBuffer *listener,
+  GstWasapiAsyncCallback(std::shared_ptr<GstWasapi2RingBufferPtr> listener,
                          DWORD queue_id,
                          gboolean loopback)
     : ref_count_(1)
     , queue_id_(queue_id)
+    , listener_(listener)
     , loopback_(loopback)
   {
-    g_weak_ref_init (&listener_, listener);
-  }
-
-  virtual ~GstWasapiAsyncCallback ()
-  {
-    g_weak_ref_set (&listener_, nullptr);
   }
 
   /* IUnknown */
@@ -109,20 +117,18 @@
   STDMETHODIMP
   Invoke(IMFAsyncResult * pAsyncResult)
   {
-    GstWasapi2RingBuffer *ringbuffer;
     HRESULT hr;
+    auto ptr = listener_.lock ();
 
-    ringbuffer = (GstWasapi2RingBuffer *) g_weak_ref_get (&listener_);
-    if (!ringbuffer) {
+    if (!ptr) {
       GST_WARNING ("Listener was removed");
       return S_OK;
     }
 
     if (loopback_)
-      hr = gst_wasapi2_ring_buffer_loopback_callback (ringbuffer);
+      hr = gst_wasapi2_ring_buffer_loopback_callback (ptr->obj);
     else
-      hr = gst_wasapi2_ring_buffer_io_callback (ringbuffer);
-    gst_object_unref (ringbuffer);
+      hr = gst_wasapi2_ring_buffer_io_callback (ptr->obj);
 
     return hr;
   }
@@ -130,9 +136,15 @@
 private:
   ULONG ref_count_;
   DWORD queue_id_;
-  GWeakRef listener_;
+  std::weak_ptr<GstWasapi2RingBufferPtr> listener_;
   gboolean loopback_;
 };
+
+struct GstWasapi2RingBufferPrivate
+{
+  std::shared_ptr<GstWasapi2RingBufferPtr> obj_ptr;
+  std::atomic<bool> monitor_device_mute;
+};
 /* *INDENT-ON* */
 
 struct _GstWasapi2RingBuffer
@@ -178,6 +190,8 @@
   gboolean volume_changed;
 
   GstCaps *supported_caps;
+
+  GstWasapi2RingBufferPrivate *priv;
 };
 
 static void gst_wasapi2_ring_buffer_constructed (GObject * object);
@@ -238,6 +252,10 @@
   self->event_handle = CreateEvent (nullptr, FALSE, FALSE, nullptr);
   self->loopback_event_handle = CreateEvent (nullptr, FALSE, FALSE, nullptr);
   g_mutex_init (&self->volume_lock);
+
+  self->priv = new GstWasapi2RingBufferPrivate ();
+  self->priv->obj_ptr = std::make_shared < GstWasapi2RingBufferPtr > (self);
+  self->priv->monitor_device_mute.store (false, std::memory_order_release);
 }
 
 static void
@@ -254,7 +272,8 @@
     goto out;
   }
 
-  self->callback_object = new GstWasapiAsyncCallback (self, queue_id, FALSE);
+  self->callback_object = new GstWasapiAsyncCallback (self->priv->obj_ptr,
+      queue_id, FALSE);
   hr = MFCreateAsyncResult (nullptr, self->callback_object, nullptr,
       &self->callback_result);
   if (!gst_wasapi2_result (hr)) {
@@ -264,7 +283,7 @@
 
   /* Create another callback object for loopback silence feed */
   self->loopback_callback_object =
-      new GstWasapiAsyncCallback (self, queue_id, TRUE);
+      new GstWasapiAsyncCallback (self->priv->obj_ptr, queue_id, TRUE);
   hr = MFCreateAsyncResult (nullptr, self->loopback_callback_object, nullptr,
       &self->loopback_callback_result);
   if (!gst_wasapi2_result (hr)) {
@@ -283,6 +302,8 @@
 {
   GstWasapi2RingBuffer *self = GST_WASAPI2_RING_BUFFER (object);
 
+  self->priv->obj_ptr = nullptr;
+
   GST_WASAPI2_CLEAR_COM (self->render_client);
   GST_WASAPI2_CLEAR_COM (self->capture_client);
   GST_WASAPI2_CLEAR_COM (self->volume_object);
@@ -308,6 +329,8 @@
   CloseHandle (self->loopback_event_handle);
   g_mutex_clear (&self->volume_lock);
 
+  delete self->priv;
+
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -461,6 +484,7 @@
   gint segment;
   guint8 *readptr;
   gint len;
+  bool is_device_muted;
 
   if (!capture_client) {
     GST_ERROR_OBJECT (self, "IAudioCaptureClient is not available");
@@ -474,6 +498,10 @@
     goto out;
   }
 
+  is_device_muted =
+      self->priv->monitor_device_mute.load (std::memory_order_acquire) &&
+      gst_wasapi2_client_is_endpoint_muted (self->client);
+
   to_read_bytes = to_read * GST_AUDIO_INFO_BPF (info);
 
   GST_LOG_OBJECT (self, "Reading %d frames offset at %" G_GUINT64_FORMAT
@@ -538,7 +566,8 @@
     if (len > to_read_bytes)
       len = to_read_bytes;
 
-    if ((flags & AUDCLNT_BUFFERFLAGS_SILENT) == AUDCLNT_BUFFERFLAGS_SILENT) {
+    if (((flags & AUDCLNT_BUFFERFLAGS_SILENT) == AUDCLNT_BUFFERFLAGS_SILENT) ||
+        is_device_muted) {
       gst_audio_format_info_fill_silence (ringbuffer->spec.info.finfo,
           readptr + self->segoffset, len);
     } else {
@@ -869,13 +898,15 @@
 static HRESULT
 gst_wasapi2_ring_buffer_initialize_audio_client (GstWasapi2RingBuffer * self,
     IAudioClient * client_handle, WAVEFORMATEX * mix_format, guint * period,
-    DWORD extra_flags, GstWasapi2ClientDeviceClass device_class)
+    DWORD extra_flags, GstWasapi2ClientDeviceClass device_class,
+    GstAudioRingBufferSpec * spec, gboolean low_latency)
 {
   GstAudioRingBuffer *ringbuffer = GST_AUDIO_RING_BUFFER_CAST (self);
   REFERENCE_TIME default_period, min_period;
   DWORD stream_flags =
       AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST;
   HRESULT hr;
+  REFERENCE_TIME buf_dur = 0;
 
   stream_flags |= extra_flags;
 
@@ -889,12 +920,29 @@
     GST_INFO_OBJECT (self, "wasapi2 default period: %" G_GINT64_FORMAT
         ", min period: %" G_GINT64_FORMAT, default_period, min_period);
 
+    /* https://learn.microsoft.com/en-us/windows/win32/api/audioclient/nf-audioclient-iaudioclient-initialize
+     * For a shared-mode stream that uses event-driven buffering,
+     * the caller must set both hnsPeriodicity and hnsBufferDuration to 0
+     *
+     * The above MS documentation does not seem to correct. By setting
+     * zero hnsBufferDuration, we can use audio engine determined buffer size
+     * but it seems to cause glitch depending on device. Calculate buffer size
+     * like wasapi plugin does. Note that MS example code uses non-zero
+     * buffer duration for event-driven shared-mode case as well.
+     */
+    if (spec && !low_latency) {
+      /* Ensure that the period (latency_time) used is an integral multiple of
+       * either the default period or the minimum period */
+      guint64 factor = (spec->latency_time * 10) / default_period;
+      REFERENCE_TIME period = default_period * MAX (factor, 1);
+
+      buf_dur = spec->buffer_time * 10;
+      if (buf_dur < 2 * period)
+        buf_dur = 2 * period;
+    }
+
     hr = client_handle->Initialize (AUDCLNT_SHAREMODE_SHARED, stream_flags,
-        /* hnsBufferDuration should be same as hnsPeriodicity
-         * when AUDCLNT_STREAMFLAGS_EVENTCALLBACK is used.
-         * And in case of shared mode, hnsPeriodicity should be zero, so
-         * this value should be zero as well */
-        0,
+        buf_dur,
         /* This must always be 0 in shared mode */
         0, mix_format, nullptr);
   } else {
@@ -952,7 +1000,9 @@
   }
 
   hr = gst_wasapi2_ring_buffer_initialize_audio_client (self, client_handle,
-      mix_format, &period, 0, GST_WASAPI2_CLIENT_DEVICE_CLASS_RENDER);
+      mix_format, &period, 0, GST_WASAPI2_CLIENT_DEVICE_CLASS_RENDER,
+      nullptr, FALSE);
+  CoTaskMemFree (mix_format);
 
   if (!gst_wasapi2_result (hr)) {
     GST_ERROR_OBJECT (self, "Failed to initialize audio client");
@@ -1016,6 +1066,7 @@
   ComPtr < IAudioStreamVolume > audio_volume;
   GstAudioChannelPosition *position = nullptr;
   guint period = 0;
+  gint segtotal = 2;
 
   GST_DEBUG_OBJECT (buf, "Acquire");
 
@@ -1076,7 +1127,8 @@
       extra_flags = AUDCLNT_STREAMFLAGS_LOOPBACK;
 
     hr = gst_wasapi2_ring_buffer_initialize_audio_client (self, client_handle,
-        mix_format, &period, extra_flags, self->device_class);
+        mix_format, &period, extra_flags, self->device_class, spec,
+        self->low_latency);
   }
 
   if (!gst_wasapi2_result (hr)) {
@@ -1095,8 +1147,6 @@
     gst_audio_ring_buffer_set_channel_positions (buf, position);
   g_free (position);
 
-  CoTaskMemFree (mix_format);
-
   if (!gst_wasapi2_result (hr)) {
     GST_ERROR_OBJECT (self, "Failed to init audio client");
     goto error;
@@ -1110,18 +1160,13 @@
 
   g_assert (period > 0);
 
-  if (self->buffer_size > period) {
-    GST_INFO_OBJECT (self, "Updating buffer size %d -> %d", self->buffer_size,
-        period);
-    self->buffer_size = period;
-  }
-
   spec->segsize = period * GST_AUDIO_INFO_BPF (&buf->spec.info);
-  spec->segtotal = 2;
+  segtotal = (self->buffer_size / period);
+  spec->segtotal = MAX (segtotal, 2);
 
   GST_INFO_OBJECT (self,
-      "Buffer size: %d frames, period: %d frames, segsize: %d bytes",
-      self->buffer_size, period, spec->segsize);
+      "Buffer size: %d frames, period: %d frames, segsize: %d bytes, "
+      "segtotal: %d", self->buffer_size, period, spec->segsize, spec->segtotal);
 
   if (self->device_class == GST_WASAPI2_CLIENT_DEVICE_CLASS_RENDER) {
     ComPtr < IAudioRenderClient > render_client;
@@ -1167,12 +1212,15 @@
   gst_audio_format_info_fill_silence (buf->spec.info.finfo,
       buf->memory, buf->size);
 
+  CoTaskMemFree (mix_format);
+
   return TRUE;
 
 error:
   GST_WASAPI2_CLEAR_COM (self->render_client);
   GST_WASAPI2_CLEAR_COM (self->capture_client);
   GST_WASAPI2_CLEAR_COM (self->volume_object);
+  CoTaskMemFree (mix_format);
 
   gst_wasapi2_ring_buffer_post_open_error (self);
 
@@ -1463,7 +1511,7 @@
 HRESULT
 gst_wasapi2_ring_buffer_set_volume (GstWasapi2RingBuffer * buf, gfloat volume)
 {
-  HRESULT hr = S_OK;
+  HRESULT hr;
 
   g_return_val_if_fail (GST_IS_WASAPI2_RING_BUFFER (buf), E_INVALIDARG);
   g_return_val_if_fail (volume >= 0 && volume <= 1.0, E_INVALIDARG);
@@ -1493,3 +1541,12 @@
 
   return S_OK;
 }
+
+void
+gst_wasapi2_ring_buffer_set_device_mute_monitoring (GstWasapi2RingBuffer * buf,
+    gboolean value)
+{
+  g_return_if_fail (GST_IS_WASAPI2_RING_BUFFER (buf));
+
+  buf->priv->monitor_device_mute.store (value, std::memory_order_release);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi2/gstwasapi2ringbuffer.h -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi2/gstwasapi2ringbuffer.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi2/gstwasapi2sink.c -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi2/gstwasapi2sink.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi2/gstwasapi2src.c -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi2/gstwasapi2src.c Changed

@@ -119,6 +119,7 @@
 #define DEFAULT_VOLUME        1.0
 #define DEFAULT_LOOPBACK      FALSE
 #define DEFAULT_LOOPBACK_MODE GST_WASAPI2_SRC_LOOPBACK_DEFAULT
+#define DEFAULT_LOOPBACK_SILENCE_ON_DEVICE_MUTE FALSE
 
 enum
 {
@@ -131,6 +132,7 @@
   PROP_LOOPBACK,
   PROP_LOOPBACK_MODE,
   PROP_LOOPBACK_TARGET_PID,
+  PROP_LOOPBACK_SILENCE_ON_DEVICE_MUTE,
 };
 
 struct _GstWasapi2Src
@@ -146,6 +148,7 @@
   gboolean loopback;
   GstWasapi2SrcLoopbackMode loopback_mode;
   guint loopback_pid;
+  gboolean loopback_silence_on_device_mute;
 
   gboolean mute_changed;
   gboolean volume_changed;
@@ -168,6 +171,8 @@
 static gboolean gst_wasapi2_src_get_mute (GstWasapi2Src * self);
 static void gst_wasapi2_src_set_volume (GstWasapi2Src * self, gdouble volume);
 static gdouble gst_wasapi2_src_get_volume (GstWasapi2Src * self);
+static void gst_wasapi2_src_set_silence_on_mute (GstWasapi2Src * self,
+    gboolean value);
 
 #define gst_wasapi2_src_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstWasapi2Src, gst_wasapi2_src,
@@ -188,7 +193,8 @@
 
   g_object_class_install_property (gobject_class, PROP_DEVICE,
       g_param_spec_string ("device", "Device",
-          "WASAPI playback device as a GUID string",
+          "Audio device ID as provided by "
+          "Windows.Devices.Enumeration.DeviceInformation.Id",
           NULL, GST_PARAM_MUTABLE_READY | G_PARAM_READWRITE |
           G_PARAM_STATIC_STRINGS));
 
@@ -274,6 +280,22 @@
             G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   }
 
+  /**
+   * GstWasapi2Src:loopback-silence-on-device-mute:
+   *
+   * When loopback recording, if the device is muted, inject silence in the pipeline
+   *
+   * Since: 1.24
+   */
+  g_object_class_install_property (gobject_class,
+      PROP_LOOPBACK_SILENCE_ON_DEVICE_MUTE,
+      g_param_spec_boolean ("loopback-silence-on-device-mute",
+          "Loopback Silence On Device Mute",
+          "When loopback recording, if the device is muted, inject silence in the pipeline",
+          DEFAULT_LOOPBACK_SILENCE_ON_DEVICE_MUTE,
+          GST_PARAM_MUTABLE_PLAYING | G_PARAM_READWRITE |
+          G_PARAM_STATIC_STRINGS));
+
   gst_element_class_add_static_pad_template (element_class, &src_template);
   gst_element_class_set_static_metadata (element_class, "Wasapi2Src",
       "Source/Audio/Hardware",
@@ -304,6 +326,8 @@
   self->volume = DEFAULT_VOLUME;
   self->low_latency = DEFAULT_LOW_LATENCY;
   self->loopback = DEFAULT_LOOPBACK;
+  self->loopback_silence_on_device_mute =
+      DEFAULT_LOOPBACK_SILENCE_ON_DEVICE_MUTE;
 }
 
 static void
@@ -348,6 +372,9 @@
     case PROP_LOOPBACK_TARGET_PID:
       self->loopback_pid = g_value_get_uint (value);
       break;
+    case PROP_LOOPBACK_SILENCE_ON_DEVICE_MUTE:
+      gst_wasapi2_src_set_silence_on_mute (self, g_value_get_boolean (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -382,6 +409,9 @@
     case PROP_LOOPBACK_TARGET_PID:
       g_value_set_uint (value, self->loopback_pid);
       break;
+    case PROP_LOOPBACK_SILENCE_ON_DEVICE_MUTE:
+      g_value_set_boolean (value, self->loopback_silence_on_device_mute);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -489,6 +519,11 @@
       self->loopback_pid);
   g_free (name);
 
+  if (self->loopback) {
+    gst_wasapi2_ring_buffer_set_device_mute_monitoring (GST_WASAPI2_RING_BUFFER
+        (ringbuffer), self->loopback_silence_on_device_mute);
+  }
+
   return ringbuffer;
 }
 
@@ -608,3 +643,22 @@
 
   return volume;
 }
+
+static void
+gst_wasapi2_src_set_silence_on_mute (GstWasapi2Src * self, gboolean value)
+{
+  GstAudioBaseSrc *bsrc = GST_AUDIO_BASE_SRC_CAST (self);
+
+  GST_OBJECT_LOCK (self);
+
+  self->loopback_silence_on_device_mute = value;
+
+  if (self->loopback && bsrc->ringbuffer) {
+    GstWasapi2RingBuffer *ringbuffer =
+        GST_WASAPI2_RING_BUFFER (bsrc->ringbuffer);
+
+    gst_wasapi2_ring_buffer_set_device_mute_monitoring (ringbuffer, value);
+  }
+
+  GST_OBJECT_UNLOCK (self);
+}

gst-plugins-bad-1.22.7.tar.xz/sys/wasapi2/gstwasapi2util.h -> gst-plugins-bad-1.24.5.tar.xz/sys/wasapi2/gstwasapi2util.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/wic/gstwicutils.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/wic/gstwicutils.cpp Changed

gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/gstwin32ipcbufferpool.cpp Added

@@ -0,0 +1,241 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstwin32ipcbufferpool.h"
+#include "gstwin32ipcmemory.h"
+#include <gst/video/video.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_win32_ipc_buffer_pool_debug);
+#define GST_CAT_DEFAULT gst_win32_ipc_buffer_pool_debug
+
+struct _GstWin32IpcBufferPool
+{
+  GstBufferPool parent;
+
+  GstWin32IpcAllocator *alloc;
+  GstVideoInfo info;
+  gboolean add_videometa;
+};
+
+#define gst_win32_ipc_buffer_pool_parent_class parent_class
+G_DEFINE_TYPE (GstWin32IpcBufferPool,
+    gst_win32_ipc_buffer_pool, GST_TYPE_BUFFER_POOL);
+
+static void gst_win32_ipc_buffer_pool_dispose (GObject * object);
+static const gchar **gst_win32_ipc_buffer_pool_get_options (GstBufferPool *
+    pool);
+static gboolean gst_win32_ipc_buffer_pool_set_config (GstBufferPool * pool,
+    GstStructure * config);
+static GstFlowReturn gst_win32_ipc_buffer_pool_alloc_buffer (GstBufferPool *
+    pool, GstBuffer ** buffer, GstBufferPoolAcquireParams * params);
+static gboolean gst_win32_ipc_buffer_pool_start (GstBufferPool * pool);
+static gboolean gst_win32_ipc_buffer_pool_stop (GstBufferPool * pool);
+
+static void
+gst_win32_ipc_buffer_pool_class_init (GstWin32IpcBufferPoolClass * klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GstBufferPoolClass *bufferpool_class = GST_BUFFER_POOL_CLASS (klass);
+
+  gobject_class->dispose = gst_win32_ipc_buffer_pool_dispose;
+
+  bufferpool_class->get_options = gst_win32_ipc_buffer_pool_get_options;
+  bufferpool_class->set_config = gst_win32_ipc_buffer_pool_set_config;
+  bufferpool_class->alloc_buffer = gst_win32_ipc_buffer_pool_alloc_buffer;
+  bufferpool_class->start = gst_win32_ipc_buffer_pool_start;
+  bufferpool_class->stop = gst_win32_ipc_buffer_pool_stop;
+
+  GST_DEBUG_CATEGORY_INIT (gst_win32_ipc_buffer_pool_debug,
+      "win32_ipcbufferpool", 0, "win32_ipcbufferpool object");
+}
+
+static void
+gst_win32_ipc_buffer_pool_init (GstWin32IpcBufferPool * self)
+{
+}
+
+static void
+gst_win32_ipc_buffer_pool_dispose (GObject * object)
+{
+  GstWin32IpcBufferPool *self = GST_WIN32_IPC_BUFFER_POOL (object);
+
+  if (self->alloc) {
+    gst_win32_ipc_allocator_set_active (self->alloc, FALSE);
+    gst_clear_object (&self->alloc);
+  }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static const gchar **
+gst_win32_ipc_buffer_pool_get_options (GstBufferPool * pool)
+{
+  static const gchar *options = { GST_BUFFER_POOL_OPTION_VIDEO_META,
+    nullptr
+  };
+
+  return options;
+}
+
+static gboolean
+gst_win32_ipc_buffer_pool_set_config (GstBufferPool * pool,
+    GstStructure * config)
+{
+  GstWin32IpcBufferPool *self = GST_WIN32_IPC_BUFFER_POOL (pool);
+  GstVideoInfo info;
+  GstCaps *caps = nullptr;
+  gboolean ret = TRUE;
+  guint size, min_buffers, max_buffers;
+
+  if (!gst_buffer_pool_config_get_params (config, &caps, &size, &min_buffers,
+          &max_buffers)) {
+    GST_WARNING_OBJECT (pool, "Invalid config");
+    return FALSE;
+  }
+
+  if (!caps) {
+    GST_WARNING_OBJECT (pool, "No caps");
+    return FALSE;
+  }
+
+  /* now parse the caps from the config */
+  if (!gst_video_info_from_caps (&info, caps)) {
+    GST_WARNING_OBJECT (self, "Couldn't get video info from caps");
+    return FALSE;
+  }
+
+  if (size < info.size) {
+    GST_WARNING_OBJECT (self, "Size is smaller for the caps");
+    return FALSE;
+  }
+
+  info.size = MAX (size, info.size);
+  self->info = info;
+
+  GST_LOG_OBJECT (pool, "%dx%d, caps %" GST_PTR_FORMAT, info.width, info.height,
+      caps);
+
+  if (self->alloc) {
+    gst_win32_ipc_allocator_set_active (self->alloc, FALSE);
+    gst_clear_object (&self->alloc);
+  }
+
+  self->alloc = gst_win32_ipc_allocator_new (size);
+  if (!self->alloc) {
+    GST_ERROR_OBJECT (self, "Couldn't create allocator");
+    return FALSE;
+  }
+
+  self->add_videometa = gst_buffer_pool_config_has_option (config,
+      GST_BUFFER_POOL_OPTION_VIDEO_META);
+
+  gst_buffer_pool_config_set_params (config,
+      caps, info.size, min_buffers, max_buffers);
+
+  return GST_BUFFER_POOL_CLASS (parent_class)->set_config (pool, config) && ret;
+}
+
+static GstFlowReturn
+gst_win32_ipc_buffer_pool_alloc_buffer (GstBufferPool * pool,
+    GstBuffer ** buffer, GstBufferPoolAcquireParams * params)
+{
+  GstWin32IpcBufferPool *self = GST_WIN32_IPC_BUFFER_POOL (pool);
+  GstFlowReturn ret = GST_FLOW_OK;
+  GstBuffer *buf;
+  GstMemory *mem = nullptr;
+  GstVideoInfo *info = &self->info;
+
+  ret = gst_win32_ipc_allocator_acquire_memory (self->alloc, &mem);
+  if (ret != GST_FLOW_OK) {
+    GST_WARNING_OBJECT (self, "Couldn't acquire memory");
+    return ret;
+  }
+
+  buf = gst_buffer_new ();
+  gst_buffer_append_memory (buf, mem);
+
+  if (self->add_videometa) {
+    gst_buffer_add_video_meta_full (buf, GST_VIDEO_FRAME_FLAG_NONE,
+        GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info),
+        GST_VIDEO_INFO_HEIGHT (info), GST_VIDEO_INFO_N_PLANES (info),
+        info->offset, info->stride);
+  }
+
+  *buffer = buf;
+
+  return GST_FLOW_OK;
+}
+
+static gboolean
+gst_win32_ipc_buffer_pool_start (GstBufferPool * pool)
+{
+  GstWin32IpcBufferPool *self = GST_WIN32_IPC_BUFFER_POOL (pool);
+  gboolean ret;
+
+  GST_DEBUG_OBJECT (self, "Start");
+
+  if (!self->alloc) {
+    GST_ERROR_OBJECT (self, "No allocator");
+    return FALSE;
+  }
+
+  if (!gst_win32_ipc_allocator_set_active (self->alloc, TRUE)) {
+    GST_ERROR_OBJECT (self, "Failed to activate allocator");
+    return FALSE;
+  }
+
+  ret = GST_BUFFER_POOL_CLASS (parent_class)->start (pool);
+  if (!ret) {
+    GST_ERROR_OBJECT (self, "Failed to start");
+    gst_win32_ipc_allocator_set_active (self->alloc, FALSE);
+
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+gst_win32_ipc_buffer_pool_stop (GstBufferPool * pool)
+{
+  GstWin32IpcBufferPool *self = GST_WIN32_IPC_BUFFER_POOL (pool);
+
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  if (self->alloc)
+    gst_win32_ipc_allocator_set_active (self->alloc, FALSE);
+
+  return GST_BUFFER_POOL_CLASS (parent_class)->stop (pool);
+}
+
+GstBufferPool *
+gst_win32_ipc_buffer_pool_new (void)
+{
+  GstWin32IpcBufferPool *self;
+
+  self = (GstWin32IpcBufferPool *)
+      g_object_new (GST_TYPE_WIN32_IPC_BUFFER_POOL, nullptr);
+  gst_object_ref_sink (self);
+
+  return GST_BUFFER_POOL_CAST (self);
+}

gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/gstwin32ipcbufferpool.h Added

@@ -0,0 +1,32 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_WIN32_IPC_BUFFER_POOL (gst_win32_ipc_buffer_pool_get_type())
+G_DECLARE_FINAL_TYPE (GstWin32IpcBufferPool, gst_win32_ipc_buffer_pool,
+    GST, WIN32_IPC_BUFFER_POOL, GstBufferPool);
+
+GstBufferPool * gst_win32_ipc_buffer_pool_new (void);
+
+G_END_DECLS

gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/gstwin32ipcmemory.cpp Added

@@ -0,0 +1,545 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstwin32ipcmemory.h"
+#include "gstwin32ipcutils.h"
+#include <string>
+#include <mutex>
+#include <string.h>
+
+GST_DEBUG_CATEGORY_STATIC (gst_win32_ipc_allocator_debug);
+#define GST_CAT_DEFAULT gst_win32_ipc_allocator_debug
+
+#define GST_WIN32_IPC_MEMORY_NAME "Win32IpcMemory"
+#define GST_WIN32_IPC_ALLOCATOR_IS_FLUSHING(alloc) \
+    (g_atomic_int_get (&alloc->flushing))
+
+static GstWin32IpcAllocator *gc_allocator = nullptr;
+
+struct _GstWin32IpcAllocator
+{
+  GstAllocator parent;
+
+  guint size;
+
+  gboolean is_gc;
+
+  GstAtomicQueue *queue;
+  GstPoll *poll;
+  gchar *prefix;
+  LONG64 seq_num;
+
+  CRITICAL_SECTION lock;
+  gboolean started;
+  gboolean active;
+
+  /* atomic */
+  gint outstanding;
+  guint max_mems;
+  guint cur_mems;
+  gboolean flushing;
+};
+
+static void gst_win32_ipc_allocator_finalize (GObject * object);
+static GstMemory *gst_win32_ipc_allocator_dummy_alloc (GstAllocator * alloc,
+    gsize size, GstAllocationParams * params);
+static void gst_win32_ipc_allocator_free (GstAllocator * alloc,
+    GstMemory * mem);
+
+static gpointer gst_win32_ipc_allocator_map (GstMemory * mem, gsize maxsize,
+    GstMapFlags flags);
+static void gst_win32_ipc_allocator_unmap (GstMemory * mem);
+static GstMemory *gst_win32_ipc_allocator_share (GstMemory * mem,
+    gssize offset, gssize size);
+
+static gboolean gst_win32_ipc_allocator_start (GstWin32IpcAllocator * self);
+static gboolean gst_win32_ipc_allocator_stop (GstWin32IpcAllocator * self);
+static gboolean gst_win32_ipc_memory_release (GstMiniObject * mini_object);
+
+#define gst_win32_ipc_allocator_parent_class parent_class
+G_DEFINE_TYPE (GstWin32IpcAllocator, gst_win32_ipc_allocator,
+    GST_TYPE_ALLOCATOR);
+
+static void
+gst_win32_ipc_allocator_class_init (GstWin32IpcAllocatorClass * klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstAllocatorClass *alloc_class = GST_ALLOCATOR_CLASS (klass);
+
+  object_class->finalize = gst_win32_ipc_allocator_finalize;
+
+  alloc_class->alloc = gst_win32_ipc_allocator_dummy_alloc;
+  alloc_class->free = gst_win32_ipc_allocator_free;
+
+  GST_DEBUG_CATEGORY_INIT (gst_win32_ipc_allocator_debug,
+      "win32ipcallocator", 0, "win32ipcallocator");
+}
+
+static void
+gst_win32_ipc_allocator_init (GstWin32IpcAllocator * self)
+{
+  GstAllocator *alloc = GST_ALLOCATOR (self);
+
+  alloc->mem_type = GST_WIN32_IPC_MEMORY_NAME;
+  alloc->mem_map = gst_win32_ipc_allocator_map;
+  alloc->mem_unmap = gst_win32_ipc_allocator_unmap;
+  alloc->mem_share = gst_win32_ipc_allocator_share;
+
+  GST_OBJECT_FLAG_SET (alloc, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC);
+
+  InitializeCriticalSection (&self->lock);
+
+  self->poll = gst_poll_new_timer ();
+  self->queue = gst_atomic_queue_new (16);
+  self->flushing = 1;
+  self->active = FALSE;
+  self->started = FALSE;
+
+  /* 1 control write for flushing - the flush token */
+  gst_poll_write_control (self->poll);
+  /* 1 control write for marking that we are not waiting for poll - the wait token */
+  gst_poll_write_control (self->poll);
+}
+
+static void
+gst_win32_ipc_allocator_finalize (GObject * object)
+{
+  GstWin32IpcAllocator *self = GST_WIN32_IPC_ALLOCATOR (object);
+
+  GST_DEBUG_OBJECT (self, "Finalize");
+
+  gst_win32_ipc_allocator_stop (self);
+  gst_atomic_queue_unref (self->queue);
+  gst_poll_free (self->poll);
+  DeleteCriticalSection (&self->lock);
+  g_free (self->prefix);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static GstMemory *
+gst_win32_ipc_allocator_dummy_alloc (GstAllocator * alloc, gsize size,
+    GstAllocationParams * params)
+{
+  g_return_val_if_reached (nullptr);
+}
+
+static void
+gst_win32_ipc_allocator_free (GstAllocator * alloc, GstMemory * mem)
+{
+  GstWin32IpcMemory *imem = (GstWin32IpcMemory *) mem;
+
+  win32_ipc_mmf_unref (imem->mmf);
+  g_free (imem);
+}
+
+static gpointer
+gst_win32_ipc_allocator_map (GstMemory * mem, gsize maxsize, GstMapFlags flags)
+{
+  GstWin32IpcMemory *imem = (GstWin32IpcMemory *) mem;
+
+  return win32_ipc_mmf_get_raw (imem->mmf);
+}
+
+static void
+gst_win32_ipc_allocator_unmap (GstMemory * mem)
+{
+  /* do nothing */
+}
+
+static GstMemory *
+gst_win32_ipc_allocator_share (GstMemory * mem, gssize offset, gssize size)
+{
+  /* not supported */
+  return nullptr;
+}
+
+static gboolean
+gst_win32_ipc_allocator_start (GstWin32IpcAllocator * self)
+{
+  if (self->started)
+    return TRUE;
+
+  self->started = TRUE;
+
+  return TRUE;
+}
+
+static void
+gst_win32_ipc_allocator_do_set_flushing (GstWin32IpcAllocator * self,
+    gboolean flushing)
+{
+  if (GST_WIN32_IPC_ALLOCATOR_IS_FLUSHING (self) == flushing)
+    return;
+
+  if (flushing) {
+    g_atomic_int_set (&self->flushing, 1);
+    /* Write the flush token to wake up any waiters */
+    gst_poll_write_control (self->poll);
+  } else {
+    while (!gst_poll_read_control (self->poll)) {
+      if (errno == EWOULDBLOCK) {
+        /* This should not really happen unless flushing and unflushing
+         * happens on different threads. Let's wait a bit to get back flush
+         * token from the thread that was setting it to flushing */
+        g_thread_yield ();
+        continue;
+      } else {
+        /* Critical error but GstPoll already complained */
+        break;
+      }
+    }
+
+    g_atomic_int_set (&self->flushing, 0);
+  }
+}
+
+gboolean
+gst_win32_ipc_allocator_set_active (GstWin32IpcAllocator * self,
+    gboolean active)
+{
+  gboolean ret = TRUE;
+
+  g_return_val_if_fail (GST_IS_WIN32_IPC_ALLOCATOR (self), FALSE);
+
+  EnterCriticalSection (&self->lock);
+  if (self->active == active)
+    goto out;
+
+  if (active) {
+    gst_win32_ipc_allocator_start (self);
+
+    /* flush_stop may release memory objects, setting to active to avoid running
+     * do_stop while activating the pool */
+    self->active = TRUE;
+
+    gst_win32_ipc_allocator_do_set_flushing (self, FALSE);
+  } else {
+    gint outstanding;
+
+    /* set to flushing first */
+    gst_win32_ipc_allocator_do_set_flushing (self, TRUE);
+
+    /* when all memory objects are in the pool, free them. Else they will be
+     * freed when they are released */
+    outstanding = g_atomic_int_get (&self->outstanding);
+    GST_LOG_OBJECT (self, "outstanding memories %d, (in queue %d)",
+        outstanding, gst_atomic_queue_length (self->queue));
+    if (outstanding == 0) {
+      if (!gst_win32_ipc_allocator_stop (self)) {
+        GST_ERROR_OBJECT (self, "stop failed");
+        ret = FALSE;
+        goto out;
+      }
+    }
+
+    self->active = FALSE;
+  }
+
+out:
+  LeaveCriticalSection (&self->lock);
+
+  return ret;
+}
+
+static void
+gst_win32_ipc_allocator_free_memory (GstWin32IpcAllocator * self,
+    GstMemory * mem)
+{
+  g_atomic_int_add (&self->cur_mems, -1);
+  GST_LOG_OBJECT (self, "freeing memory %p (%u left)", mem, self->cur_mems);
+
+  GST_MINI_OBJECT_CAST (mem)->dispose = nullptr;
+  gst_memory_unref (mem);
+}
+
+/* must be called with the lock */
+static gboolean
+gst_win32_ipc_allocator_clear_queue (GstWin32IpcAllocator * self)
+{
+  GstMemory *memory;
+
+  GST_LOG_OBJECT (self, "Clearing queue");
+
+  /* clear the pool */
+  while ((memory = (GstMemory *) gst_atomic_queue_pop (self->queue))) {
+    while (!gst_poll_read_control (self->poll)) {
+      if (errno == EWOULDBLOCK) {
+        /* We put the memory into the queue but did not finish writing control
+         * yet, let's wait a bit and retry */
+        g_thread_yield ();
+        continue;
+      } else {
+        /* Critical error but GstPoll already complained */
+        break;
+      }
+    }
+    gst_win32_ipc_allocator_free_memory (self, memory);
+  }
+
+  GST_LOG_OBJECT (self, "Clear done");
+
+  return self->cur_mems == 0;
+}
+
+static gboolean
+gst_win32_ipc_allocator_stop (GstWin32IpcAllocator * self)
+{
+  GST_DEBUG_OBJECT (self, "Stop");
+
+  if (self->started) {
+    if (!gst_win32_ipc_allocator_clear_queue (self))
+      return FALSE;
+
+    self->started = FALSE;
+  }
+
+  return TRUE;
+}
+
+static void
+dec_outstanding (GstWin32IpcAllocator * self)
+{
+  if (g_atomic_int_dec_and_test (&self->outstanding)) {
+    /* all memory objects are returned to the pool, see if we need to free them */
+    if (GST_WIN32_IPC_ALLOCATOR_IS_FLUSHING (self)) {
+      /* take the lock so that set_active is not run concurrently */
+      EnterCriticalSection (&self->lock);
+      /* now that we have the lock, check if we have been de-activated with
+       * outstanding buffers */
+      if (!self->active)
+        gst_win32_ipc_allocator_stop (self);
+      LeaveCriticalSection (&self->lock);
+    }
+  }
+}
+
+static void
+gst_win32_ipc_allocator_release_memory (GstWin32IpcAllocator * self,
+    GstMemory * mem)
+{
+  GST_MINI_OBJECT_CAST (mem)->dispose = nullptr;
+  mem->allocator = (GstAllocator *) gst_object_ref (gc_allocator);
+
+  /* keep it around in our queue */
+  gst_atomic_queue_push (self->queue, mem);
+  gst_poll_write_control (self->poll);
+  dec_outstanding (self);
+
+  gst_object_unref (self);
+}
+
+static gboolean
+gst_win32_ipc_memory_release (GstMiniObject * mini_object)
+{
+  GstMemory *mem = GST_MEMORY_CAST (mini_object);
+  GstWin32IpcAllocator *self;
+
+  g_assert (mem->allocator != nullptr);
+
+  self = GST_WIN32_IPC_ALLOCATOR (mem->allocator);
+
+  /* Memory belongs to garbage collector, free this */
+  if (self->is_gc)
+    return TRUE;
+
+  if (GST_WIN32_IPC_ALLOCATOR_IS_FLUSHING (self))
+    return TRUE;
+
+  /* return the memory to the allocator */
+  gst_memory_ref (mem);
+  gst_win32_ipc_allocator_release_memory (self, mem);
+
+  return FALSE;
+}
+
+static GstFlowReturn
+gst_win32_ipc_allocator_alloc (GstWin32IpcAllocator * self, GstMemory ** mem)
+{
+  GstWin32IpcMemory *new_mem;
+  Win32IpcMmf *mmf;
+  std::string mmf_name;
+
+  mmf_name = std::string (self->prefix) +
+      std::to_string (InterlockedIncrement64 (&self->seq_num));
+
+  mmf = win32_ipc_mmf_alloc (self->size, mmf_name.c_str ());
+  if (!mmf) {
+    GST_ERROR_OBJECT (self, "Couldn't allocate memory");
+    return GST_FLOW_ERROR;
+  }
+
+  memset (win32_ipc_mmf_get_raw (mmf), 0, win32_ipc_mmf_get_size (mmf));
+
+  g_atomic_int_add (&self->cur_mems, 1);
+  new_mem = g_new0 (GstWin32IpcMemory, 1);
+  gst_memory_init (GST_MEMORY_CAST (new_mem), (GstMemoryFlags) 0,
+      GST_ALLOCATOR_CAST (gc_allocator), nullptr, self->size, 0, 0, self->size);
+  new_mem->mmf = mmf;
+
+  *mem = GST_MEMORY_CAST (new_mem);
+
+  return GST_FLOW_OK;
+}
+
+static GstFlowReturn
+gst_win32_ipc_allocator_acquire_memory_internal (GstWin32IpcAllocator * self,
+    GstMemory ** memory)
+{
+  GstFlowReturn result;
+
+  while (TRUE) {
+    if (GST_WIN32_IPC_ALLOCATOR_IS_FLUSHING (self)) {
+      GST_DEBUG_OBJECT (self, "We are flushing");
+      return GST_FLOW_FLUSHING;
+    }
+
+    /* try to get a memory from the queue */
+    *memory = (GstMemory *) gst_atomic_queue_pop (self->queue);
+    if (*memory) {
+      while (!gst_poll_read_control (self->poll)) {
+        if (errno == EWOULDBLOCK) {
+          /* We put the memory into the queue but did not finish writing control
+           * yet, let's wait a bit and retry */
+          g_thread_yield ();
+          continue;
+        } else {
+          /* Critical error but GstPoll already complained */
+          break;
+        }
+      }
+      result = GST_FLOW_OK;
+      GST_LOG_OBJECT (self, "acquired memory %p", *memory);
+      break;
+    }
+
+    /* no memory, try to allocate some more */
+    GST_LOG_OBJECT (self, "no memory, trying to allocate");
+    result = gst_win32_ipc_allocator_alloc (self, memory);
+    if (result == GST_FLOW_OK)
+      /* we have a memory, return it */
+      break;
+
+    if (G_UNLIKELY (result != GST_FLOW_EOS))
+      /* something went wrong, return error */
+      break;
+
+    /* now we release the control socket, we wait for a memory release or
+     * flushing */
+    if (!gst_poll_read_control (self->poll)) {
+      if (errno == EWOULDBLOCK) {
+        /* This means that we have two threads trying to allocate memory
+         * already, and the other one already got the wait token. This
+         * means that we only have to wait for the poll now and not write the
+         * token afterwards: we will be woken up once the other thread is
+         * woken up and that one will write the wait token it removed */
+        GST_LOG_OBJECT (self, "waiting for free memory or flushing");
+        gst_poll_wait (self->poll, GST_CLOCK_TIME_NONE);
+      } else {
+        /* This is a critical error, GstPoll already gave a warning */
+        result = GST_FLOW_ERROR;
+        break;
+      }
+    } else {
+      /* We're the first thread waiting, we got the wait token and have to
+       * write it again later
+       * OR
+       * We're a second thread and just consumed the flush token and block all
+       * other threads, in which case we must not wait and give it back
+       * immediately */
+      if (!GST_WIN32_IPC_ALLOCATOR_IS_FLUSHING (self)) {
+        GST_LOG_OBJECT (self, "waiting for free memory or flushing");
+        gst_poll_wait (self->poll, GST_CLOCK_TIME_NONE);
+      }
+      gst_poll_write_control (self->poll);
+    }
+  }
+
+  return result;
+}
+
+gboolean
+gst_is_win32_ipc_memory (GstMemory * mem)
+{
+  return mem != nullptr && mem->allocator != nullptr &&
+      GST_IS_WIN32_IPC_ALLOCATOR (mem->allocator);
+}
+
+static void
+gst_win32_ipc_allocator_init_once (void)
+{
+  static std::once_flag once_flag;
+  std::call_once (once_flag,() {
+        gc_allocator = (GstWin32IpcAllocator *)
+        g_object_new (GST_TYPE_WIN32_IPC_ALLOCATOR, nullptr);
+        gst_object_ref_sink (gc_allocator);
+        GST_OBJECT_FLAG_SET (gc_allocator, GST_OBJECT_FLAG_MAY_BE_LEAKED);
+        gc_allocator->is_gc = TRUE;
+      });
+}
+
+GstWin32IpcAllocator *
+gst_win32_ipc_allocator_new (guint size)
+{
+  GstWin32IpcAllocator *self;
+
+  g_return_val_if_fail (size != 0, nullptr);
+
+  gst_win32_ipc_allocator_init_once ();
+
+  self = (GstWin32IpcAllocator *)
+      g_object_new (GST_TYPE_WIN32_IPC_ALLOCATOR, nullptr);
+  self->size = size;
+  self->prefix = gst_win32_ipc_get_mmf_prefix ();
+
+  gst_object_ref_sink (self);
+
+  return self;
+}
+
+GstFlowReturn
+gst_win32_ipc_allocator_acquire_memory (GstWin32IpcAllocator * alloc,
+    GstMemory ** memory)
+{
+  GstFlowReturn ret;
+
+  g_return_val_if_fail (GST_IS_WIN32_IPC_ALLOCATOR (alloc), GST_FLOW_ERROR);
+  g_return_val_if_fail (memory != nullptr, GST_FLOW_ERROR);
+
+  *memory = nullptr;
+
+  g_atomic_int_inc (&alloc->outstanding);
+  ret = gst_win32_ipc_allocator_acquire_memory_internal (alloc, memory);
+
+  if (ret == GST_FLOW_OK) {
+    GstMemory *mem = *memory;
+    /* Replace default allocator with ours */
+    gst_object_unref (mem->allocator);
+    mem->allocator = (GstAllocator *) gst_object_ref (alloc);
+    GST_MINI_OBJECT_CAST (mem)->dispose = gst_win32_ipc_memory_release;
+  } else {
+    dec_outstanding (alloc);
+  }
+
+  return ret;
+}

gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/gstwin32ipcmemory.h Added

@@ -0,0 +1,50 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#pragma once
+
+#include <gst/gst.h>
+#include "protocol/win32ipcmmf.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_WIN32_IPC_ALLOCATOR (gst_win32_ipc_allocator_get_type())
+G_DECLARE_FINAL_TYPE (GstWin32IpcAllocator, gst_win32_ipc_allocator,
+    GST, WIN32_IPC_ALLOCATOR, GstAllocator);
+
+typedef struct _GstWin32IpcMemory GstWin32IpcMemory;
+
+struct _GstWin32IpcMemory
+{
+  GstMemory mem;
+
+  Win32IpcMmf *mmf;
+};
+
+gboolean gst_is_win32_ipc_memory (GstMemory * mem);
+
+GstWin32IpcAllocator * gst_win32_ipc_allocator_new (guint size);
+
+gboolean               gst_win32_ipc_allocator_set_active (GstWin32IpcAllocator * alloc,
+                                                           gboolean active);
+
+GstFlowReturn          gst_win32_ipc_allocator_acquire_memory (GstWin32IpcAllocator * alloc,
+                                                               GstMemory ** memory);
+
+G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/sys/win32ipc/gstwin32ipcvideosink.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/gstwin32ipcvideosink.cpp Changed

@@ -39,6 +39,8 @@
 
 #include "gstwin32ipcvideosink.h"
 #include "gstwin32ipcutils.h"
+#include "gstwin32ipcbufferpool.h"
+#include "gstwin32ipcmemory.h"
 #include "protocol/win32ipcpipeserver.h"
 #include <string>
 #include <string.h>
@@ -65,13 +67,12 @@
 
   GstVideoInfo info;
   Win32IpcPipeServer *pipe;
-  gchar *mmf_prefix;
-  guint64 seq_num;
-  LARGE_INTEGER frequency;
 
-  Win32IpcMmf *mmf;
   Win32IpcVideoInfo minfo;
 
+  GstBufferPool *fallback_pool;
+  GstBuffer *prepared_buffer;
+
   /* properties */
   gchar *pipe_name;
 };
@@ -148,7 +149,6 @@
 gst_win32_ipc_video_sink_init (GstWin32IpcVideoSink * self)
 {
   self->pipe_name = g_strdup (DEFAULT_PIPE_NAME);
-  QueryPerformanceFrequency (&self->frequency);
 
   GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_PROVIDE_CLOCK);
   GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_REQUIRE_CLOCK);
@@ -222,9 +222,6 @@
     return FALSE;
   }
 
-  self->mmf_prefix = gst_win32_ipc_get_mmf_prefix ();
-  self->seq_num = 0;
-
   return TRUE;
 }
 
@@ -236,8 +233,12 @@
   GST_DEBUG_OBJECT (self, "Stop");
 
   g_clear_pointer (&self->pipe, win32_ipc_pipe_server_unref);
-  g_clear_pointer (&self->mmf_prefix, g_free);
-  g_clear_pointer (&self->mmf, win32_ipc_mmf_unref);
+  gst_clear_buffer (&self->prepared_buffer);
+
+  if (self->fallback_pool) {
+    gst_buffer_pool_set_active (self->fallback_pool, FALSE);
+    gst_clear_object (&self->fallback_pool);
+  }
 
   return TRUE;
 }
@@ -247,7 +248,7 @@
 {
   GstWin32IpcVideoSink *self = GST_WIN32_IPC_VIDEO_SINK (sink);
 
-  g_clear_pointer (&self->mmf, win32_ipc_mmf_unref);
+  gst_clear_buffer (&self->prepared_buffer);
 
   return TRUE;
 }
@@ -281,6 +282,7 @@
 gst_win32_ipc_video_sink_set_caps (GstBaseSink * sink, GstCaps * caps)
 {
   GstWin32IpcVideoSink *self = GST_WIN32_IPC_VIDEO_SINK (sink);
+  GstStructure *config;
 
   if (!gst_video_info_from_caps (&self->info, caps)) {
     GST_WARNING_OBJECT (self, "Invalid caps");
@@ -297,6 +299,19 @@
   self->minfo.par_n = self->info.par_n;
   self->minfo.par_d = self->info.par_d;
 
+  if (self->fallback_pool) {
+    gst_buffer_pool_set_active (self->fallback_pool, FALSE);
+    gst_object_unref (self->fallback_pool);
+  }
+
+  self->fallback_pool = gst_win32_ipc_buffer_pool_new ();
+  config = gst_buffer_pool_get_config (self->fallback_pool);
+  gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+  gst_buffer_pool_config_set_params (config, caps, (guint) self->info.size,
+      0, 0);
+  gst_buffer_pool_set_config (self->fallback_pool, config);
+  gst_buffer_pool_set_active (self->fallback_pool, TRUE);
+
   return TRUE;
 }
 
@@ -326,7 +341,7 @@
   if (need_pool) {
     GstStructure *config;
 
-    pool = gst_video_buffer_pool_new ();
+    pool = gst_win32_ipc_buffer_pool_new ();
     config = gst_buffer_pool_get_config (pool);
     gst_buffer_pool_config_add_option (config,
         GST_BUFFER_POOL_OPTION_VIDEO_META);
@@ -355,56 +370,107 @@
 gst_win32_ipc_video_sink_prepare (GstBaseSink * sink, GstBuffer * buf)
 {
   GstWin32IpcVideoSink *self = GST_WIN32_IPC_VIDEO_SINK (sink);
-  std::string mmf_name;
-  GstVideoFrame frame;
-  GstMapInfo info;
+  GstVideoFrame frame, mmf_frame;
+  GstMemory *mem;
+  GstFlowReturn ret;
 
-  g_clear_pointer (&self->mmf, win32_ipc_mmf_unref);
+  gst_clear_buffer (&self->prepared_buffer);
 
   if (!gst_video_frame_map (&frame, &self->info, buf, GST_MAP_READ)) {
     GST_ERROR_OBJECT (self, "Couldn't map frame");
     return GST_FLOW_ERROR;
   }
 
-  mmf_name = std::string (self->mmf_prefix) + std::to_string (self->seq_num);
-  self->seq_num++;
+  mem = gst_buffer_peek_memory (buf, 0);
+  if (gst_is_win32_ipc_memory (mem) && gst_buffer_n_memory (buf) == 1) {
+    GST_LOG_OBJECT (self, "Upstream memory is mmf");
+
+    self->prepared_buffer = gst_buffer_ref (buf);
+
+    self->minfo.size = GST_VIDEO_FRAME_SIZE (&frame);
+    for (guint i = 0; i < GST_VIDEO_FRAME_N_PLANES (&frame); i++) {
+      self->minfo.offseti = GST_VIDEO_FRAME_PLANE_OFFSET (&frame, i);
+      self->minfo.stridei = GST_VIDEO_FRAME_PLANE_STRIDE (&frame, i);
+    }
+
+    gst_video_frame_unmap (&frame);
+
+    return GST_FLOW_OK;
+  }
+
+  GST_LOG_OBJECT (self, "Copying into mmf buffer");
+
+  ret = gst_buffer_pool_acquire_buffer (self->fallback_pool,
+      &self->prepared_buffer, nullptr);
+  if (ret != GST_FLOW_OK) {
+    GST_ERROR_OBJECT (self, "Couldn't acquire buffer");
+    gst_video_frame_unmap (&frame);
+    return GST_FLOW_ERROR;
+  }
 
-  self->mmf = win32_ipc_mmf_alloc (GST_VIDEO_FRAME_SIZE (&frame),
-      mmf_name.c_str ());
-  if (!self->mmf) {
-    GST_ERROR_OBJECT (self, "Couldn't create memory with name %s",
-        mmf_name.c_str ());
+  if (!gst_video_frame_map (&mmf_frame, &self->info, self->prepared_buffer,
+          GST_MAP_WRITE)) {
+    GST_ERROR_OBJECT (self, "Couldn't map mmf frame");
     gst_video_frame_unmap (&frame);
+    gst_clear_buffer (&self->prepared_buffer);
     return GST_FLOW_ERROR;
   }
 
-  self->minfo.size = GST_VIDEO_FRAME_SIZE (&frame);
-  for (guint i = 0; i < GST_VIDEO_FRAME_N_PLANES (&frame); i++) {
-    self->minfo.offseti = GST_VIDEO_FRAME_PLANE_OFFSET (&frame, i);
-    self->minfo.stridei = GST_VIDEO_FRAME_PLANE_STRIDE (&frame, i);
+  if (!gst_video_frame_copy (&mmf_frame, &frame)) {
+    GST_ERROR_OBJECT (self, "Couldn't copy buffer");
+    gst_video_frame_unmap (&frame);
+    gst_video_frame_unmap (&mmf_frame);
+    gst_clear_buffer (&self->prepared_buffer);
+    return GST_FLOW_ERROR;
   }
+
   gst_video_frame_unmap (&frame);
 
-  gst_buffer_map (buf, &info, GST_MAP_READ);
-  memcpy (win32_ipc_mmf_get_raw (self->mmf), info.data, self->minfo.size);
-  gst_buffer_unmap (buf, &info);
+  self->minfo.size = GST_VIDEO_FRAME_SIZE (&mmf_frame);
+  for (guint i = 0; i < GST_VIDEO_FRAME_N_PLANES (&mmf_frame); i++) {
+    self->minfo.offseti = GST_VIDEO_FRAME_PLANE_OFFSET (&mmf_frame, i);
+    self->minfo.stridei = GST_VIDEO_FRAME_PLANE_STRIDE (&mmf_frame, i);
+  }
+
+  gst_video_frame_unmap (&mmf_frame);
 
   return GST_FLOW_OK;
 }
 
+static void
+gst_win32_ipc_video_sink_mmf_free (void *user_data)
+{
+  GstBuffer *buffer = GST_BUFFER_CAST (user_data);
+
+  GST_LOG ("Relese %" GST_PTR_FORMAT, buffer);
+
+  gst_buffer_unref (buffer);
+}
+
 static GstFlowReturn
 gst_win32_ipc_video_sink_render (GstBaseSink * sink, GstBuffer * buf)
 {
   GstWin32IpcVideoSink *self = GST_WIN32_IPC_VIDEO_SINK (sink);
-  LARGE_INTEGER cur_time;
   GstClockTime pts;
   GstClockTime now_qpc;
   GstClockTime buf_pts;
   GstClockTime buffer_clock = GST_CLOCK_TIME_NONE;
+  Win32IpcMmf *mmf;
+  GstWin32IpcMemory *mem;
+
+  if (!self->prepared_buffer) {
+    GST_ERROR_OBJECT (self, "No prepared buffer");
+    return GST_FLOW_ERROR;
+  }
+
+  mem = (GstWin32IpcMemory *) gst_buffer_peek_memory (self->prepared_buffer, 0);
+
+  g_assert (mem != nullptr);
+  g_assert (gst_is_win32_ipc_memory (GST_MEMORY_CAST (mem)));
+
+  mmf = mem->mmf;
 
-  QueryPerformanceCounter (&cur_time);
-  pts = now_qpc = gst_util_uint64_scale (cur_time.QuadPart, GST_SECOND,
-      self->frequency.QuadPart);
+  pts = now_qpc = gst_util_get_timestamp ();
 
   buf_pts = GST_BUFFER_PTS (buf);
   if (!GST_CLOCK_TIME_IS_VALID (buf_pts))
@@ -454,7 +520,9 @@
 
   /* win32_ipc_pipe_server_send_mmf() takes ownership of mmf */
   if (!win32_ipc_pipe_server_send_mmf (self->pipe,
-          (Win32IpcMmf *) g_steal_pointer (&self->mmf), &self->minfo)) {
+          win32_ipc_mmf_ref (mmf), &self->minfo,
+          g_steal_pointer (&self->prepared_buffer),
+          gst_win32_ipc_video_sink_mmf_free)) {
     GST_ERROR_OBJECT (self, "Couldn't send buffer");
     return GST_FLOW_ERROR;
   }

gst-plugins-bad-1.22.7.tar.xz/sys/win32ipc/gstwin32ipcvideosrc.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/gstwin32ipcvideosrc.cpp Changed

@@ -73,7 +73,6 @@
   gboolean have_video_meta;
   gsize offsetGST_VIDEO_MAX_PLANES;
   gint strideGST_VIDEO_MAX_PLANES;
-  LARGE_INTEGER frequency;
   GstBufferPool *pool;
 
   /* properties */
@@ -156,7 +155,6 @@
   gst_base_src_set_live (GST_BASE_SRC (self), TRUE);
   self->pipe_name = g_strdup (DEFAULT_PIPE_NAME);
   self->processing_deadline = DEFAULT_PROCESSING_DEADLINE;
-  QueryPerformanceFrequency (&self->frequency);
 
   GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_PROVIDE_CLOCK);
   GST_OBJECT_FLAG_SET (self, GST_ELEMENT_FLAG_REQUIRE_CLOCK);
@@ -257,7 +255,11 @@
 
   GST_DEBUG_OBJECT (self, "Stop");
 
-  g_clear_pointer (&self->pipe, win32_ipc_pipe_client_unref);
+  if (self->pipe) {
+    win32_ipc_pipe_client_stop (self->pipe);
+    g_clear_pointer (&self->pipe, win32_ipc_pipe_client_unref);
+  }
+
   gst_clear_caps (&self->caps);
   if (self->pool) {
     gst_buffer_pool_set_active (self->pool, FALSE);
@@ -277,7 +279,7 @@
   AcquireSRWLockExclusive (&self->lock);
   self->flushing = TRUE;
   if (self->pipe)
-    win32_ipc_pipe_client_shutdown (self->pipe);
+    win32_ipc_pipe_client_set_flushing (self->pipe, TRUE);
   ReleaseSRWLockExclusive (&self->lock);
 
   return TRUE;
@@ -291,9 +293,9 @@
   GST_DEBUG_OBJECT (self, "Unlock stop");
 
   AcquireSRWLockExclusive (&self->lock);
-  g_clear_pointer (&self->pipe, win32_ipc_pipe_client_unref);
-  gst_clear_caps (&self->caps);
   self->flushing = FALSE;
+  if (self->pipe)
+    win32_ipc_pipe_client_set_flushing (self->pipe, FALSE);
   ReleaseSRWLockExclusive (&self->lock);
 
   return TRUE;
@@ -393,6 +395,20 @@
   return FALSE;
 }
 
+struct MmfReleaseData
+{
+  Win32IpcPipeClient *pipe;
+  Win32IpcMmf *mmf;
+};
+
+static void
+gst_win32_ipc_video_src_release_mmf (MmfReleaseData * data)
+{
+  win32_ipc_pipe_client_release_mmf (data->pipe, data->mmf);
+  win32_ipc_pipe_client_unref (data->pipe);
+  delete data;
+}
+
 static GstFlowReturn
 gst_win32_ipc_video_src_create (GstBaseSrc * src, guint64 offset, guint size,
     GstBuffer ** buf)
@@ -408,7 +424,6 @@
   GstClockTime base_time;
   GstClockTime now_qpc;
   GstClockTime now_gst;
-  LARGE_INTEGER cur_time;
   gboolean is_qpc = TRUE;
   gboolean need_video_meta = FALSE;
 
@@ -465,10 +480,14 @@
   }
 
   if (self->have_video_meta || !need_video_meta) {
+    MmfReleaseData *data = new MmfReleaseData ();
+    data->pipe = win32_ipc_pipe_client_ref (self->pipe);
+    data->mmf = mmf;
+
     buffer = gst_buffer_new_wrapped_full (GST_MEMORY_FLAG_READONLY,
         win32_ipc_mmf_get_raw (mmf), win32_ipc_mmf_get_size (mmf),
-        0, win32_ipc_mmf_get_size (mmf), mmf,
-        (GDestroyNotify) win32_ipc_mmf_unref);
+        0, win32_ipc_mmf_get_size (mmf), data,
+        (GDestroyNotify) gst_win32_ipc_video_src_release_mmf);
 
     if (self->have_video_meta) {
       gst_buffer_add_video_meta_full (buffer,
@@ -507,9 +526,7 @@
     win32_ipc_mmf_unref (mmf);
   }
 
-  QueryPerformanceCounter (&cur_time);
-  now_qpc = gst_util_uint64_scale (cur_time.QuadPart, GST_SECOND,
-      self->frequency.QuadPart);
+  now_qpc = gst_util_get_timestamp ();
   clock = gst_element_get_clock (GST_ELEMENT_CAST (self));
   now_gst = gst_clock_get_time (clock);
   base_time = GST_ELEMENT_CAST (self)->base_time;

gst-plugins-bad-1.22.7.tar.xz/sys/win32ipc/meson.build -> gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/sys/win32ipc/protocol/win32ipcpipeclient.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/protocol/win32ipcpipeclient.cpp Changed

@@ -66,8 +66,10 @@
 struct Win32IpcPipeClient
 {
   explicit Win32IpcPipeClient (const std::string & n)
-    : name (n), ref_count(1), last_err (ERROR_SUCCESS)
+    : name (n), ref_count(1), last_err (ERROR_SUCCESS), flushing (FALSE)
+    , stopped (FALSE), io_pending (FALSE)
   {
+    release_event = CreateEventA (nullptr, FALSE, FALSE, nullptr);
     cancellable = CreateEventA (nullptr, TRUE, FALSE, nullptr);
     conn.pipe = INVALID_HANDLE_VALUE;
     conn.self = this;
@@ -76,7 +78,21 @@
   ~Win32IpcPipeClient ()
   {
     GST_DEBUG ("Free client %p", this);
-    win32_ipc_pipe_client_shutdown (this);
+    SetEvent (cancellable);
+    if (thread) {
+      thread->join ();
+      thread = nullptr;
+    }
+
+    last_err = ERROR_OPERATION_ABORTED;
+    while (!queue.empty ()) {
+      MmfInfo info = queue.front ();
+
+      queue.pop ();
+      win32_ipc_mmf_unref (info.mmf);
+    }
+
+    CloseHandle (release_event);
     CloseHandle (cancellable);
   }
 
@@ -84,33 +100,63 @@
   std::condition_variable cond;
   std::unique_ptr<std::thread> thread;
   std::queue<MmfInfo> queue;
+  std::queue<std::string> unused_mmf;
   std::string name;
 
   ULONG ref_count;
+  HANDLE release_event;
   HANDLE cancellable;
   UINT last_err;
+  BOOL flushing;
+  BOOL stopped;
+  BOOL io_pending;
   ClientConnection conn;
 };
 
 static DWORD
 win32_ipc_pipe_client_send_need_data_async (Win32IpcPipeClient * self);
+static DWORD
+win32_ipc_pipe_client_send_release_data_async (Win32IpcPipeClient * self,
+    const char * mmf_name);
 
 static VOID WINAPI
-win32_ipc_pipe_client_send_read_done_finish (DWORD error_code, DWORD n_bytes,
+win32_ipc_pipe_client_send_finish (DWORD error_code, DWORD n_bytes,
     LPOVERLAPPED overlapped)
 {
   ClientConnection *conn = (ClientConnection *) overlapped;
   Win32IpcPipeClient *self = conn->self;
+  std::string unused_mmf;
 
   if (error_code != ERROR_SUCCESS) {
     std::string msg = win32_ipc_error_message (error_code);
     self->last_err = error_code;
-    GST_WARNING ("READ-DONE failed with 0x%x (%s)",
-        self->last_err, msg.c_str ());
+    GST_WARNING ("Failed with 0x%x (%s)", self->last_err, msg.c_str ());
     goto error;
   }
 
-  GST_TRACE ("READ-DONE sent");
+  self->lock.lock ();
+  if (!self->unused_mmf.empty ()) {
+    unused_mmf = self->unused_mmf.front ();
+    self->unused_mmf.pop ();
+  }
+  self->lock.unlock ();
+
+  if (unused_mmf.size () > 0) {
+    self->last_err = win32_ipc_pipe_client_send_release_data_async (self,
+        unused_mmf.c_str ());
+    if (self->last_err != ERROR_SUCCESS)
+      goto error;
+
+    return;
+  }
+
+  /* Don't request data anymore if we are stopped, but keep connection
+   * to send release data message later */
+  if (self->stopped) {
+    GST_DEBUG ("We are stopped");
+    self->io_pending = FALSE;
+    return;
+  }
 
   self->last_err = win32_ipc_pipe_client_send_need_data_async (self);
   if (self->last_err != ERROR_SUCCESS)
@@ -124,6 +170,32 @@
 }
 
 static DWORD
+win32_ipc_pipe_client_send_release_data_async (Win32IpcPipeClient * self,
+    const char * mmf_name)
+{
+  ClientConnection *conn = &self->conn;
+
+  conn->to_write = win32_ipc_pkt_build_release_data (conn->client_msg,
+      CONN_BUFFER_SIZE, conn->seq_num, mmf_name);
+  if (conn->to_write == 0) {
+    GST_ERROR ("Couldn't build RELEASE-DATA pkt");
+    return ERROR_BAD_FORMAT;
+  }
+
+  GST_TRACE ("Sending RELEASE-DATA");
+
+  if (!WriteFileEx (conn->pipe, conn->client_msg, conn->to_write,
+      (OVERLAPPED *) conn, win32_ipc_pipe_client_send_finish)) {
+    UINT last_err = GetLastError ();
+    std::string msg = win32_ipc_error_message (last_err);
+    GST_WARNING ("WriteFileEx failed with 0x%x (%s)", last_err, msg.c_str ());
+    return last_err;
+  }
+
+  return ERROR_SUCCESS;
+}
+
+static DWORD
 win32_ipc_pipe_client_send_read_done_async (Win32IpcPipeClient * self)
 {
   ClientConnection *conn = &self->conn;
@@ -138,7 +210,7 @@
   GST_TRACE ("Sending READ-DONE");
 
   if (!WriteFileEx (conn->pipe, conn->client_msg, conn->to_write,
-      (OVERLAPPED *) conn, win32_ipc_pipe_client_send_read_done_finish)) {
+      (OVERLAPPED *) conn, win32_ipc_pipe_client_send_finish)) {
     UINT last_err = GetLastError ();
     std::string msg = win32_ipc_error_message (last_err);
 
@@ -171,7 +243,7 @@
   if (!win32_ipc_pkt_parse_have_data (conn->server_msg, n_bytes,
       &conn->seq_num, mmf_name, &info)) {
     self->last_err = ERROR_BAD_FORMAT;
-    GST_WARNING ("Couldn't parse HAVE-DATA pkg");
+    GST_WARNING ("Couldn't parse HAVE-DATA pkt");
     goto error;
   }
 
@@ -285,6 +357,8 @@
   DWORD mode = PIPE_READMODE_MESSAGE;
   std::unique_lock<std::mutex> lk (self->lock);
   ClientConnection *conn = &self->conn;
+  HANDLE waitables2;
+  DWORD wait_ret;
 
   conn->pipe = CreateFileA (self->name.c_str (),
         GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING,
@@ -319,28 +393,60 @@
   if (self->last_err != ERROR_SUCCESS)
     goto out;
 
+  self->io_pending = TRUE;
+  waitables0 = self->cancellable;
+  waitables1 = self->release_event;
+
   do {
     /* Enters alertable thread state and wait for I/O completion event
      * or cancellable event */
-    DWORD ret = WaitForSingleObjectEx (self->cancellable, INFINITE, TRUE);
-    if (ret == WAIT_OBJECT_0) {
+    wait_ret = WaitForMultipleObjectsEx (2, waitables, FALSE, INFINITE, TRUE);
+    if (wait_ret == WAIT_OBJECT_0) {
       GST_DEBUG ("Operation cancelled");
-      CancelIoEx (conn->pipe, (OVERLAPPED *) &conn);
-      break;
-    } else if (ret != WAIT_IO_COMPLETION) {
-      GST_WARNING ("Unexpected wait return 0x%x", (UINT) ret);
-      CancelIoEx (conn->pipe, (OVERLAPPED *) &conn);
-      break;
+      goto out;
+    }
+
+    switch (wait_ret) {
+      case WAIT_OBJECT_0 + 1:
+      case WAIT_IO_COMPLETION:
+      {
+        std::string unused_mmf;
+        /* If I/O chain is stopped, send release data message here */
+        if (!self->io_pending) {
+          lk.lock ();
+          if (!self->unused_mmf.empty ()) {
+            unused_mmf = self->unused_mmf.front ();
+            self->unused_mmf.pop ();
+          }
+          lk.unlock ();
+        }
+
+        if (unused_mmf.size () > 0) {
+          GST_DEBUG ("Sending release data for %s", unused_mmf.c_str ());
+          self->io_pending = TRUE;
+          self->last_err = win32_ipc_pipe_client_send_release_data_async (self,
+              unused_mmf.c_str ());
+          if (self->last_err != ERROR_SUCCESS)
+            goto out;
+        }
+        break;
+      }
+      default:
+        GST_WARNING ("Unexpected wait return 0x%x", (UINT) wait_ret);
+        goto out;
     }
   } while (true);
 
 out:
-  if (conn->pipe != INVALID_HANDLE_VALUE)
+  if (conn->pipe != INVALID_HANDLE_VALUE) {
+    CancelIoEx (conn->pipe, (OVERLAPPED *) &conn);
     CloseHandle (conn->pipe);
+  }
 
   lk.lock ();
   self->last_err = ERROR_OPERATION_ABORTED;
   conn->pipe = INVALID_HANDLE_VALUE;
+  self->io_pending = FALSE;
   self->cond.notify_all ();
 }
 
@@ -401,24 +507,10 @@
 }
 
 void
-win32_ipc_pipe_client_shutdown (Win32IpcPipeClient * client)
+win32_ipc_pipe_client_set_flushing (Win32IpcPipeClient * client, BOOL flushing)
 {
-  GST_DEBUG ("Shutting down %p", client);
-
-  SetEvent (client->cancellable);
-  if (client->thread) {
-    client->thread->join ();
-    client->thread = nullptr;
-  }
-
   std::lock_guard<std::mutex> lk (client->lock);
-  client->last_err = ERROR_OPERATION_ABORTED;
-  while (!client->queue.empty ()) {
-    MmfInfo info = client->queue.front ();
-
-    client->queue.pop ();
-    win32_ipc_mmf_unref (info.mmf);
-  }
+  client->flushing = flushing;
   client->cond.notify_all ();
 }
 
@@ -432,10 +524,12 @@
     return FALSE;
   }
 
-  while (client->queue.empty () && client->last_err == ERROR_SUCCESS)
+  while (client->queue.empty () && client->last_err == ERROR_SUCCESS &&
+      !client->flushing && !client->stopped) {
     client->cond.wait (lk);
+  }
 
-  if (client->last_err != ERROR_SUCCESS || client->queue.empty ())
+  if (client->queue.empty ())
     return FALSE;
 
   MmfInfo mmf_info = client->queue.front ();
@@ -446,3 +540,30 @@
 
   return TRUE;
 }
+
+void
+win32_ipc_pipe_client_release_mmf (Win32IpcPipeClient * client,
+    Win32IpcMmf * mmf)
+{
+  std::string name = win32_ipc_mmf_get_name (mmf);
+
+  win32_ipc_mmf_unref (mmf);
+
+  std::lock_guard<std::mutex> lk (client->lock);
+  if (client->last_err != ERROR_SUCCESS)
+    return;
+
+  GST_LOG ("Enqueue release data %s", name.c_str ());
+  client->unused_mmf.push (name);
+  SetEvent (client->release_event);
+}
+
+void
+win32_ipc_pipe_client_stop (Win32IpcPipeClient * client)
+{
+  GST_DEBUG ("Stopping %p", client);
+
+  std::lock_guard<std::mutex> lk (client->lock);
+  client->stopped = TRUE;
+  client->cond.notify_all ();
+}

gst-plugins-bad-1.22.7.tar.xz/sys/win32ipc/protocol/win32ipcpipeclient.h -> gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/protocol/win32ipcpipeclient.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/win32ipc/protocol/win32ipcpipeserver.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/protocol/win32ipcpipeserver.cpp Changed

@@ -41,22 +41,30 @@
 
 struct MmfInfo
 {
-  explicit MmfInfo (Win32IpcMmf * m, const Win32IpcVideoInfo * i, UINT64 s)
+  explicit MmfInfo (Win32IpcMmf * m, const Win32IpcVideoInfo * i, UINT64 s,
+      void * u, Win32IpcMmfDestroy n)
   {
     mmf = m;
     info = *i;
     seq_num = s;
+    user_data = u;
+    notify = n;
   }
 
   ~MmfInfo()
   {
     if (mmf)
       win32_ipc_mmf_unref (mmf);
+
+    if (notify)
+      notify (user_data);
   }
 
   Win32IpcMmf *mmf = nullptr;
   Win32IpcVideoInfo info;
   UINT64 seq_num;
+  void *user_data;
+  Win32IpcMmfDestroy notify;
 };
 
 struct ServerConnection : public OVERLAPPED
@@ -73,6 +81,7 @@
 
   Win32IpcPipeServer *self;
   std::shared_ptr<MmfInfo> minfo;
+  std::vector<std::shared_ptr<MmfInfo>> used_minfo;
   HANDLE pipe = INVALID_HANDLE_VALUE;
   UINT8 client_msgCONN_BUFFER_SIZE;
   UINT32 to_read = 0;
@@ -113,7 +122,7 @@
 };
 
 static void
-win32_ipc_pipe_server_receive_need_data_async (ServerConnection * conn);
+win32_ipc_pipe_server_wait_client_msg_async (ServerConnection * conn);
 
 static void
 win32_ipc_pipe_server_close_connection (ServerConnection * conn,
@@ -140,44 +149,6 @@
 }
 
 static void WINAPI
-win32_ipc_pipe_server_receive_read_done_finish (DWORD error_code, DWORD n_bytes,
-    LPOVERLAPPED overlapped)
-{
-  ServerConnection *conn = (ServerConnection *) overlapped;
-
-  if (error_code != ERROR_SUCCESS) {
-    std::string msg = win32_ipc_error_message (error_code);
-
-    GST_WARNING ("READ-DONE failed with 0x%x (%s)",
-        (UINT) error_code, msg.c_str ());
-    win32_ipc_pipe_server_close_connection (conn, TRUE);
-    return;
-  }
-
-  GST_TRACE ("Got READ-DONE %p", conn);
-
-  conn->minfo = nullptr;
-
-  /* All done, wait for need-data again */
-  win32_ipc_pipe_server_receive_need_data_async (conn);
-}
-
-static void
-win32_ipc_pipe_server_receive_read_done_async (ServerConnection * conn)
-{
-  GST_TRACE ("Waiting READ-DONE %p", conn);
-
-  if (!ReadFileEx (conn->pipe, conn->client_msg, CONN_BUFFER_SIZE,
-      (OVERLAPPED *) conn, win32_ipc_pipe_server_receive_read_done_finish)) {
-    UINT last_err = GetLastError ();
-    std::string msg = win32_ipc_error_message (last_err);
-    GST_WARNING ("ReadFileEx failed with 0x%x (%s)", last_err, msg.c_str ());
-
-    win32_ipc_pipe_server_close_connection (conn, TRUE);
-  }
-}
-
-static void WINAPI
 win32_ipc_pipe_server_send_have_data_finish (DWORD error_code, DWORD n_bytes,
     LPOVERLAPPED overlapped)
 {
@@ -194,7 +165,7 @@
   GST_TRACE ("HAVE-DATA done with %s",
       win32_ipc_mmf_get_name (conn->minfo->mmf));
 
-  win32_ipc_pipe_server_receive_read_done_async (conn);
+  win32_ipc_pipe_server_wait_client_msg_async (conn);
 }
 
 static void
@@ -228,11 +199,13 @@
 }
 
 static void WINAPI
-win32_ipc_pipe_server_receive_need_data_finish (DWORD error_code, DWORD n_bytes,
+win32_ipc_pipe_server_wait_client_msg_finish (DWORD error_code, DWORD n_bytes,
     LPOVERLAPPED overlapped)
 {
   ServerConnection *conn = (ServerConnection *) overlapped;
   UINT64 seq_num;
+  Win32IpcPktType type;
+  char mmf_name1024;
 
   if (error_code != ERROR_SUCCESS) {
     std::string msg = win32_ipc_error_message (error_code);
@@ -242,32 +215,74 @@
     return;
   }
 
-  if (!win32_ipc_pkt_parse_need_data (conn->client_msg, CONN_BUFFER_SIZE,
-      &seq_num)) {
-    GST_ERROR ("Couldn't parse NEED-DATA message");
-    win32_ipc_pipe_server_close_connection (conn, TRUE);
-    return;
-  }
+  type = win32_ipc_pkt_type_from_raw (conn->client_msg0);
+  switch (type) {
+    case WIN32_IPC_PKT_NEED_DATA:
+      GST_TRACE ("Got NEED-DATA %p", conn);
 
-  GST_TRACE ("Got NEED-DATA");
+      if (!win32_ipc_pkt_parse_need_data (conn->client_msg, CONN_BUFFER_SIZE,
+          &seq_num)) {
+        GST_ERROR ("Couldn't parse NEED-DATA message");
+        win32_ipc_pipe_server_close_connection (conn, TRUE);
+        return;
+      }
 
-  /* Will response later once data is available */
-  if (!conn->minfo) {
-    GST_LOG ("No data available, waiting");
-    conn->pending_have_data = TRUE;
-    return;
-  }
+      /* Will response later once data is available */
+      if (!conn->minfo) {
+        GST_LOG ("No data available, waiting");
+        conn->pending_have_data = TRUE;
+        return;
+      }
+
+      win32_ipc_pipe_server_send_have_data_async (conn);
+      break;
+    case WIN32_IPC_PKT_READ_DONE:
+      GST_TRACE ("Got READ-DONE %p", conn);
 
-  win32_ipc_pipe_server_send_have_data_async (conn);
+      conn->used_minfo.push_back (conn->minfo);
+      conn->minfo = nullptr;
+
+      /* All done, wait for need-data again */
+      win32_ipc_pipe_server_wait_client_msg_async (conn);
+      break;
+    case WIN32_IPC_PKT_RELEASE_DATA:
+    {
+      GST_TRACE ("Got RELEASE-DATA %p", conn);
+
+      if (!win32_ipc_pkt_parse_release_data (conn->client_msg, CONN_BUFFER_SIZE,
+          &seq_num, mmf_name)) {
+        GST_WARNING ("Couldn't parse RELEASE-DATA mssage");
+        return;
+      }
+
+      auto it = std::find_if (conn->used_minfo.begin (),
+          conn->used_minfo.end (), &(const std::shared_ptr<MmfInfo> info) -> bool {
+            return strcmp (mmf_name, win32_ipc_mmf_get_name (info->mmf)) == 0;
+          });
+
+      if (it != conn->used_minfo.end ()) {
+        conn->used_minfo.erase (it);
+      } else {
+        GST_WARNING ("Unknown memory name %s", mmf_name);
+      }
+
+      win32_ipc_pipe_server_wait_client_msg_async (conn);
+      break;
+    }
+    default:
+      GST_WARNING ("Unexpected packet type");
+      win32_ipc_pipe_server_close_connection (conn, TRUE);
+      break;
+  }
 }
 
 static void
-win32_ipc_pipe_server_receive_need_data_async (ServerConnection * conn)
+win32_ipc_pipe_server_wait_client_msg_async (ServerConnection * conn)
 {
-  GST_TRACE ("Waiting NEED-DATA");
+  GST_TRACE ("Waiting client message");
 
   if (!ReadFileEx (conn->pipe, conn->client_msg, CONN_BUFFER_SIZE,
-      (OVERLAPPED *) conn, win32_ipc_pipe_server_receive_need_data_finish)) {
+      (OVERLAPPED *) conn, win32_ipc_pipe_server_wait_client_msg_finish)) {
     UINT last_err = GetLastError ();
     std::string msg = win32_ipc_error_message (last_err);
 
@@ -350,13 +365,13 @@
   self->cond.notify_all ();
   lk.unlock ();
 
+  waitables0 = overlap.hEvent;
+  waitables1 = self->enqueue_event;
+  waitables2 = self->cancellable;
+
   do {
     ServerConnection *conn;
 
-    waitables0 = overlap.hEvent;
-    waitables1 = self->enqueue_event;
-    waitables2 = self->cancellable;
-
     /* Enters alertable state and wait for
      * 1) Client's connection request
      *    (similar to socket listen/accept in async manner)
@@ -393,7 +408,7 @@
 
         pipe = INVALID_HANDLE_VALUE;
         self->conn.push_back (conn);
-        win32_ipc_pipe_server_receive_need_data_async (conn);
+        win32_ipc_pipe_server_wait_client_msg_async (conn);
         pipe = win32_ipc_pipe_server_create_pipe (self, &overlap, &io_pending);
         if (pipe == INVALID_HANDLE_VALUE)
           goto out;
@@ -537,10 +552,11 @@
 
 BOOL
 win32_ipc_pipe_server_send_mmf (Win32IpcPipeServer * server, Win32IpcMmf * mmf,
-    const Win32IpcVideoInfo * info)
+    const Win32IpcVideoInfo * info, void * user_data, Win32IpcMmfDestroy notify)
 {
   std::lock_guard<std::mutex> lk (server->lock);
-  server->minfo = std::make_shared<MmfInfo> (mmf, info, server->seq_num);
+  server->minfo = std::make_shared<MmfInfo> (mmf, info, server->seq_num,
+      user_data, notify);
 
   GST_LOG ("Enqueue mmf %s", win32_ipc_mmf_get_name (mmf));

gst-plugins-bad-1.22.7.tar.xz/sys/win32ipc/protocol/win32ipcpipeserver.h -> gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/protocol/win32ipcpipeserver.h Changed

gst-plugins-bad-1.22.7.tar.xz/sys/win32ipc/protocol/win32ipcprotocol.cpp -> gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/protocol/win32ipcprotocol.cpp Changed

@@ -35,6 +35,8 @@
       return "HAVE-DATA";
     case WIN32_IPC_PKT_READ_DONE:
       return "READ-DONE";
+    case WIN32_IPC_PKT_RELEASE_DATA:
+      return "RELEASE-DATA";
     default:
       break;
   }
@@ -235,3 +237,56 @@
 
   return TRUE;
 }
+
+UINT32
+win32_ipc_pkt_build_release_data (UINT8 * pkt, UINT32 pkt_size, UINT64 seq_num,
+    const char * mmf_name)
+{
+  UINT8 *data = pkt;
+  size_t len;
+
+  if (!pkt || !mmf_name)
+    return 0;
+
+  len = strlen (mmf_name);
+  if (len == 0)
+    return 0;
+
+  len++;
+
+  data0 = win32_ipc_pkt_type_to_raw (WIN32_IPC_PKT_RELEASE_DATA);
+  data++;
+
+  WRITE_UINT64 (data, seq_num);
+
+  strcpy ((char *) data, mmf_name);
+  data += len;
+
+  return data - pkt;
+}
+
+BOOL
+win32_ipc_pkt_parse_release_data (UINT8 * pkt, UINT32 pkt_size,
+    UINT64 * seq_num, char * mmf_name)
+{
+  UINT8 *data = pkt;
+  size_t len;
+
+  if (win32_ipc_pkt_type_from_raw (pkt0) != WIN32_IPC_PKT_RELEASE_DATA)
+    return FALSE;
+
+  data++;
+
+  READ_UINT64 (data, seq_num);
+
+  len = strnlen ((const char *) data, pkt_size - (data - pkt));
+  if (len == 0)
+    return FALSE;
+
+  len++;
+
+  strcpy (mmf_name, (const char *) data);
+  data += len;
+
+  return TRUE;
+}

gst-plugins-bad-1.22.7.tar.xz/sys/win32ipc/protocol/win32ipcprotocol.h -> gst-plugins-bad-1.24.5.tar.xz/sys/win32ipc/protocol/win32ipcprotocol.h Changed

@@ -47,6 +47,12 @@
  *  shared-memory |                               |
  *       +------->+                               |
  *                |--------- READ-DONE ---------->|
+ *                |                               |
+ *       +--------+                               |
+ *    release     |                               |
+ *  shared-memory |                               |
+ *       +--------|                               |
+ *                |------- RELEASE-Data---------->|
  */
 
 typedef enum
@@ -55,6 +61,7 @@
   WIN32_IPC_PKT_NEED_DATA,
   WIN32_IPC_PKT_HAVE_DATA,
   WIN32_IPC_PKT_READ_DONE,
+  WIN32_IPC_PKT_RELEASE_DATA,
 } Win32IpcPktType;
 
 /* Same as GstVideoFormat */
@@ -239,5 +246,15 @@
                                                 UINT32 pkt_size,
                                                 UINT64 * seq_num);
 
+UINT32           win32_ipc_pkt_build_release_data (UINT8 * pkt,
+                                                   UINT32 pkt_size,
+                                                   UINT64 seq_num,
+                                                   const char * mmf_name);
+
+BOOL             win32_ipc_pkt_parse_release_data (UINT8 * pkt,
+                                                   UINT32 pkt_size,
+                                                   UINT64 * seq_num,
+                                                   char * mmf_name);
+
 G_END_DECLS

gst-plugins-bad-1.22.7.tar.xz/sys/winks/gstksvideosrc.c -> gst-plugins-bad-1.24.5.tar.xz/sys/winks/gstksvideosrc.c Changed

gst-plugins-bad-1.22.7.tar.xz/sys/winks/ksvideohelpers.c -> gst-plugins-bad-1.24.5.tar.xz/sys/winks/ksvideohelpers.c Changed

@@ -531,9 +531,20 @@
               entry = NULL;
             }
 
-            if (entry != NULL) {
-              g_assert (entry->sample_size != 0);
+            /* XXX: We've been doing g_assert (entry->sample_size != 0)
+             * since more than 10 years ago, but it's quite questionable.
+             * According to MS documentation,
+             * SampleSize field in KSDATARANGE struct is ignored,
+             * and biSizeImage in KS_BITMAPINFOHEADER is required only if
+             * compression is used. (driver maybe set zero for raw image).
+             * But since we've expected the value shouldn't be zero,
+             * let's ignore a media type with entry->sample_size == 0 for now.
+             * Actually people should not use this plugin in newly written code
+             * anymore */
+            if (entry && entry->sample_size == 0)
+              g_clear_pointer (&entry, ks_video_media_type_free);
 
+            if (entry != NULL) {
               if (src_vscc != NULL) {
                 memcpy ((gpointer) & entry->vscc, src_vscc,
                     sizeof (entry->vscc));

gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/audiovisualizer.c Added

@@ -0,0 +1,106 @@
+/* GStreamer
+ *
+ * Copyright (C) 2024 Piotr BrzeziÅ„ski <piotr@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/check/gstcheck.h>
+
+static void
+eos_cb (GstBus * bus, GstMessage * message, GMainLoop * loop)
+{
+  GST_DEBUG ("Received EOS");
+  g_main_loop_quit (loop);
+}
+
+static void
+error_cb (GstBus * bus, GstMessage * message, GMainLoop * loop)
+{
+  GError *err = NULL;
+  gchar *dbg = NULL;
+
+  gst_message_parse_error (message, &err, &dbg);
+  g_error ("ERROR: %s\n%s\n", err->message, dbg);
+}
+
+static void
+test_element (const gchar * element)
+{
+  GstElement *pipeline;
+  GstBus *bus;
+  GError *error = NULL;
+  gchar *pipe_str;
+  GMainLoop *loop;
+
+  pipe_str =
+      g_strdup_printf
+      ("audiotestsrc num-buffers=20 ! audio/x-raw,format=S16LE,channels=2 ! %s ! fakesink",
+      element);
+
+  pipeline = gst_parse_launch (pipe_str, &error);
+  fail_unless (pipeline != NULL, "Could not create pipeline: %s",
+      error->message);
+  g_free (pipe_str);
+
+  loop = g_main_loop_new (NULL, FALSE);
+
+  bus = gst_element_get_bus (pipeline);
+  fail_if (bus == NULL);
+  gst_bus_add_signal_watch (bus);
+  g_signal_connect (bus, "message::eos", (GCallback) eos_cb, loop);
+  g_signal_connect (bus, "message::error", (GCallback) error_cb, loop);
+
+  gst_element_set_state (pipeline, GST_STATE_PLAYING);
+  g_main_loop_run (loop);
+  gst_element_set_state (pipeline, GST_STATE_NULL);
+
+  g_main_loop_unref (loop);
+  gst_object_unref (bus);
+  gst_object_unref (pipeline);
+}
+
+GST_START_TEST (test_simple_pipelines)
+{
+  /* Simple pipeline tests to see if these elements run at all.
+   * Will help catch breakages like https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6800. */
+  test_element ("wavescope");
+  test_element ("spacescope");
+  test_element ("spectrascope");
+  test_element ("synaescope");
+}
+
+GST_END_TEST;
+
+static Suite *
+audiovisualizer_suite (void)
+{
+  Suite *s = suite_create ("audiovisualizer");
+  TCase *tc_chain = tcase_create ("general");
+
+  suite_add_tcase (s, tc_chain);
+#ifndef GST_DISABLE_PARSE
+  tcase_add_test (tc_chain, test_simple_pipelines);
+#endif
+
+  return s;
+}
+
+GST_CHECK_MAIN (audiovisualizer);

gst-plugins-bad-1.22.7.tar.xz/tests/check/elements/avtpcrfsync.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/avtpcrfsync.c Changed

@@ -271,24 +271,30 @@
   gst_object_unref (avtpcrfbase);
 
   orig = (struct buffer_tstamps) {
-  .buf_pts = 103000,.buf_dts = 100000,.avtp_ts = 110000,.h264_ts = 108000};
+    .buf_pts = 103000,.buf_dts = 100000,.avtp_ts = 110000,.h264_ts = 108000
+  };
   expected = (struct buffer_tstamps) {
-  .buf_pts = 104204,.buf_dts = 100000,.avtp_ts = 110000,.h264_ts = 109204};
+    .buf_pts = 104204,.buf_dts = 100000,.avtp_ts = 110000,.h264_ts = 109204
+  };
   test_crf_tstamps (h, buf, &orig, &expected);
 
   orig = (struct buffer_tstamps) {
-  .buf_pts = 107000,.buf_dts = 105000,.avtp_ts = 113000,.h264_ts = 118500};
+    .buf_pts = 107000,.buf_dts = 105000,.avtp_ts = 113000,.h264_ts = 118500
+  };
   expected = (struct buffer_tstamps) {
-  .buf_pts = 108400,.buf_dts = 105300,.avtp_ts = 113300,.h264_ts = 119900};
+    .buf_pts = 108400,.buf_dts = 105300,.avtp_ts = 113300,.h264_ts = 119900
+  };
   test_crf_tstamps (h, buf, &orig, &expected);
 
   /* test for invalid DTS */
   orig = (struct buffer_tstamps) {
-  .buf_pts = 107000,.buf_dts = GST_CLOCK_TIME_NONE,.avtp_ts =
-        113000,.h264_ts = 118500};
+    .buf_pts = 107000,.buf_dts = GST_CLOCK_TIME_NONE,.avtp_ts =
+        113000,.h264_ts = 118500
+  };
   expected = (struct buffer_tstamps) {
-  .buf_pts = 108400,.buf_dts = GST_CLOCK_TIME_NONE,.avtp_ts =
-        113300,.h264_ts = 119900};
+    .buf_pts = 108400,.buf_dts = GST_CLOCK_TIME_NONE,.avtp_ts =
+        113300,.h264_ts = 119900
+  };
   test_crf_tstamps (h, buf, &orig, &expected);
 
   gst_buffer_unref (buf);
@@ -313,15 +319,19 @@
   gst_object_unref (avtpcrfbase);
 
   orig = (struct buffer_tstamps) {
-  .buf_pts = 108000,.buf_dts = 0,.avtp_ts = 110000,.h264_ts = 0};
+    .buf_pts = 108000,.buf_dts = 0,.avtp_ts = 110000,.h264_ts = 0
+  };
   expected = (struct buffer_tstamps) {
-  .buf_pts = 108000,.buf_dts = 0,.avtp_ts = 110000,.h264_ts = 0};
+    .buf_pts = 108000,.buf_dts = 0,.avtp_ts = 110000,.h264_ts = 0
+  };
   test_crf_tstamps (h, buf, &orig, &expected);
 
   orig = (struct buffer_tstamps) {
-  .buf_pts = 110000,.buf_dts = 0,.avtp_ts = 113000,.h264_ts = 0};
+    .buf_pts = 110000,.buf_dts = 0,.avtp_ts = 113000,.h264_ts = 0
+  };
   expected = (struct buffer_tstamps) {
-  .buf_pts = 110300,.buf_dts = 0,.avtp_ts = 113300,.h264_ts = 0};
+    .buf_pts = 110300,.buf_dts = 0,.avtp_ts = 113300,.h264_ts = 0
+  };
   test_crf_tstamps (h, buf, &orig, &expected);
 
   gst_buffer_unref (buf);
@@ -346,9 +356,11 @@
   gst_object_unref (avtpcrfbase);
 
   orig = (struct buffer_tstamps) {
-  .buf_pts = 100,.buf_dts = 105,.avtp_ts = 112,.h264_ts = 110};
+    .buf_pts = 100,.buf_dts = 105,.avtp_ts = 112,.h264_ts = 110
+  };
   expected = (struct buffer_tstamps) {
-  .buf_pts = 100,.buf_dts = 105,.avtp_ts = 112,.h264_ts = 110};
+    .buf_pts = 100,.buf_dts = 105,.avtp_ts = 112,.h264_ts = 110
+  };
   test_crf_tstamps (h, buf, &orig, &expected);
 
   gst_buffer_unref (buf);

gst-plugins-bad-1.22.7.tar.xz/tests/check/elements/avwait.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/avwait.c Changed

gst-plugins-bad-1.22.7.tar.xz/tests/check/elements/cccombiner.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/cccombiner.c Changed

@@ -29,6 +29,8 @@
 #include <string.h>
 
 static GstStaticCaps foo_bar_caps = GST_STATIC_CAPS ("foo/bar");
+static GstStaticCaps foo_bar_caps_60fps =
+GST_STATIC_CAPS ("foo/bar,framerate=60/1");
 static GstStaticCaps cea708_cc_data_caps =
 GST_STATIC_CAPS ("closedcaption/x-cea-708,format=(string) cc_data");
 
@@ -105,7 +107,13 @@
   GstBuffer *second_video_buf, *second_caption_buf;
   const guint8 cc_data3 = { 0xfc, 0x20, 0x20 };
 
-  h = gst_harness_new_with_padnames ("cccombiner", "sink", "src");
+  GstElement *element = gst_element_factory_make ("cccombiner", NULL);
+  g_assert (element != NULL);
+  /* these must be set before it changes the state */
+  g_object_set (element, "schedule", FALSE, "output-padding", FALSE, NULL);
+
+  h = gst_harness_new_with_element (element, "sink", "src");
+  gst_object_unref (element);
   h2 = gst_harness_new_with_element (h->element, NULL, NULL);
   caption_pad = gst_element_request_pad_simple (h->element, "caption");
   gst_harness_add_element_sink_pad (h2, caption_pad);
@@ -191,6 +199,106 @@
 
 GST_END_TEST;
 
+GST_START_TEST (captions_no_output_padding_60fps_608_field1_only)
+{
+  GstHarness *h, *h2;
+  GstBuffer *outbuf;
+  GstPad *caption_pad;
+  GstCaps *caps;
+  GstVideoCaptionMeta *meta;
+  const guint8 cc_data3 = { 0xfc, 0x20, 0x20 };
+  int i = 0;
+
+  h = gst_harness_new_with_padnames ("cccombiner", "sink", "src");
+  h2 = gst_harness_new_with_element (h->element, NULL, NULL);
+  caption_pad = gst_element_request_pad_simple (h->element, "caption");
+  gst_harness_add_element_sink_pad (h2, caption_pad);
+  gst_object_unref (caption_pad);
+
+  g_object_set (h->element, "emit-signals", TRUE, NULL);
+  g_signal_connect (h->element, "samples-selected",
+      G_CALLBACK (samples_selected_cb), NULL);
+  g_object_set (h->element, "output-padding", FALSE, NULL);
+
+  gst_element_set_state (h->element, GST_STATE_NULL);
+  gst_element_set_state (h->element, GST_STATE_PLAYING);
+
+  gst_harness_set_src_caps_str (h, foo_bar_caps_60fps.string);
+  gst_harness_set_src_caps_str (h2, cea708_cc_data_caps.string);
+
+  /* Push a buffer and caption buffer */
+  for (i = 0; i < 8; i++) {
+    GstBuffer *video_buf, *caption_buf = NULL;
+
+    video_buf = gst_buffer_new_and_alloc (128);
+    GST_BUFFER_PTS (video_buf) = i * 40 * GST_MSECOND;
+    GST_BUFFER_DURATION (video_buf) = 40 * GST_MSECOND;
+    gst_harness_push (h, video_buf);
+
+    caption_buf = gst_buffer_new_and_alloc (3);
+    gst_buffer_fill (caption_buf, 0, cc_data, 3);
+    GST_BUFFER_PTS (caption_buf) = i * 40 * GST_MSECOND;
+    GST_BUFFER_DURATION (caption_buf) = 40 * GST_MSECOND;
+    gst_harness_push (h2, caption_buf);
+
+    /* Pull the previous output buffer */
+    if (i > 0) {
+      int j;
+      outbuf = gst_harness_pull (h);
+      fail_unless (outbuf != NULL);
+
+      meta = gst_buffer_get_video_caption_meta (outbuf);
+      fail_unless (meta != NULL);
+      fail_unless_equals_int (meta->caption_type,
+          GST_VIDEO_CAPTION_TYPE_CEA708_RAW);
+      fail_unless_equals_int (meta->size, 3);
+      GST_MEMDUMP ("caption data", meta->data, meta->size);
+
+      for (j = 0; j < meta->size; j++) {
+        if ((i % 2) == 1) {
+          fail_unless_equals_int (meta->dataj, cc_dataj);
+        } else {
+          int padding_field2 = { 0xf9, 0x00, 0x00 };
+          fail_unless_equals_int (meta->dataj, padding_field2j);
+        }
+      }
+
+      gst_buffer_unref (outbuf);
+    }
+    expected_video_buffer = video_buf;
+    if (caption_buf)
+      expected_caption_buffer = caption_buf;
+  }
+
+  /* Push EOS on both pads get the second output buffer, we otherwise wait
+   * in case there are further captions for the current video buffer */
+  gst_harness_push_event (h, gst_event_new_eos ());
+  gst_harness_push_event (h2, gst_event_new_eos ());
+
+  outbuf = gst_harness_pull (h);
+  fail_unless (outbuf != NULL);
+
+  meta = gst_buffer_get_video_caption_meta (outbuf);
+  fail_unless (meta != NULL);
+  fail_unless_equals_int (meta->caption_type,
+      GST_VIDEO_CAPTION_TYPE_CEA708_RAW);
+  fail_unless_equals_int (meta->size, 3);
+
+  gst_buffer_unref (outbuf);
+
+  /* Caps should be equal to input caps */
+  caps = gst_pad_get_current_caps (h->sinkpad);
+  fail_unless (caps != NULL);
+  fail_unless (gst_caps_can_intersect (caps,
+          gst_static_caps_get (&foo_bar_caps)));
+  gst_caps_unref (caps);
+
+  gst_harness_teardown (h);
+  gst_harness_teardown (h2);
+}
+
+GST_END_TEST;
+
 static Suite *
 cccombiner_suite (void)
 {
@@ -201,6 +309,7 @@
 
   tcase_add_test (tc, no_captions);
   tcase_add_test (tc, captions_and_eos);
+  tcase_add_test (tc, captions_no_output_padding_60fps_608_field1_only);
 
   return s;
 }

gst-plugins-bad-1.22.7.tar.xz/tests/check/elements/ccconverter.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/ccconverter.c Changed

@@ -360,7 +360,7 @@
     0xfa, 0x00, 0x00, 0x74, 0x00, 0x00, 0x6b
   };
   const guint8 out2 =
-      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x01, 0x72, 0xea, 0xf9, 0x80, 0x80,
+      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x01, 0x72, 0xea, 0xf9, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0x74, 0x00, 0x01, 0x6f
@@ -415,14 +415,14 @@
 
 GST_START_TEST (convert_cea608_s334_1a_cea708_cdp)
 {
-  const guint8 in = { 0x80, 0x80, 0x80, 0x00, 0x80, 0x80 };
+  const guint8 in = { 0x80, 0x81, 0x82, 0x00, 0x83, 0x84 };
   const guint8 out =
-      { 0x96, 0x69, 0x49, 0x5f, 0x43, 0x00, 0x00, 0x72, 0xf4, 0xf8, 0x80, 0x80,
-    0xf9, 0x80, 0x80, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
+      { 0x96, 0x69, 0x49, 0x5f, 0x43, 0x00, 0x00, 0x72, 0xf4, 0xfc, 0x81, 0x82,
+    0xfd, 0x83, 0x84, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
-    0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x74, 0x00, 0x00, 0xb7
+    0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x74, 0x00, 0x00, 0xa5
   };
   check_conversion (in, sizeof (in), out, sizeof (out),
       "closedcaption/x-cea-608,format=(string)s334-1a,framerate=(fraction)30/1",
@@ -458,10 +458,10 @@
 {
   const guint8 in = { 0xfc, 0x80, 0x80, 0xfe, 0x80, 0x80 };
   const guint8 out =
-      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x00, 0x72, 0xea, 0xf8, 0x80, 0x80,
+      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x00, 0x72, 0xea, 0xfc, 0x80, 0x80,
     0xfe, 0x80, 0x80, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
-    0xfa, 0x00, 0x00, 0x74, 0x00, 0x00, 0x6e
+    0xfa, 0x00, 0x00, 0x74, 0x00, 0x00, 0x6a
   };
   check_conversion (in, sizeof (in), out, sizeof (out),
       "closedcaption/x-cea-708,format=(string)cc_data,framerate=(fraction)60/1",
@@ -512,7 +512,7 @@
       { 0x96, 0x69, 0x13, 0x5f, 0x43, 0x00, 0x00, 0x72, 0xe2, 0xfc, 0x80, 0x80,
     0xfd, 0x80, 0x80, 0x74, 0x00, 0x00, 0x8a
   };
-  const guint8 out = { 0xf8, 0x80, 0x80, 0xf9, 0x80, 0x80 };
+  const guint8 out = { 0xfc, 0x80, 0x80, 0xfd, 0x80, 0x80 };
   check_conversion_tc_passthrough (in, sizeof (in), out, sizeof (out),
       "closedcaption/x-cea-708,format=(string)cdp,framerate=30/1",
       "closedcaption/x-cea-708,format=(string)cc_data");
@@ -524,7 +524,7 @@
 {
   /* tests that too large input is truncated */
   const guint8 in =
-      { 0x96, 0x69, 0x4c, 0x8f, 0x43, 0x00, 0x00, 0x72, 0xf5, 0xfc, 0x80, 0x80,
+      { 0x96, 0x69, 0x4c, 0x8f, 0x43, 0x00, 0x00, 0x72, 0xf5, 0xfc, 0x81, 0x82,
     0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80,
     0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80,
     0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80,
@@ -532,7 +532,7 @@
     0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80,
     0x74, 0x00, 0x00, 0x8a,
   };
-  const guint8 out = { 0xf8, 0x80, 0x80, 0xf9, 0x80, 0x80, 0xfe, 0x80, 0x80,
+  const guint8 out = { 0xfc, 0x81, 0x82, 0xf9, 0x00, 0x00, 0xfe, 0x80, 0x80,
     0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80,
     0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80,
     0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80, 0xfe, 0x80, 0x80,
@@ -679,7 +679,7 @@
 
   const guint8 out1 =
       { 0x96, 0x69, 0x58, 0x1f, 0x43, 0x00, 0x00, 0x72, 0xf9, 0xfc, 0x01, 0x02,
-    0xf9, 0x80, 0x80, 0xfc, 0x01, 0x02, 0xfe, 0x03, 0x04, 0xfe, 0x05, 0x06,
+    0xf9, 0x00, 0x00, 0xfc, 0x01, 0x02, 0xfe, 0x03, 0x04, 0xfe, 0x05, 0x06,
     0xfe, 0x07, 0x08, 0xfe, 0x09, 0x0a, 0xfe, 0x0b, 0x0c, 0xfe, 0x0d, 0x0e,
     0xfe, 0x0f, 0x10, 0xfe, 0x11, 0x12, 0xfe, 0x13, 0x14, 0xfe, 0x03, 0x04,
     0xfe, 0x05, 0x06, 0xfe, 0x07, 0x08, 0xfe, 0x09, 0x0a, 0xfe, 0x0b, 0x0c,
@@ -688,8 +688,8 @@
     0x74, 0x00, 0x00, 0xcb
   };
   const guint8 out2 =
-      { 0x96, 0x69, 0x58, 0x1f, 0x43, 0x00, 0x01, 0x72, 0xf9, 0xf9, 0x80, 0x80,
-    0xfc, 0x01, 0x02, 0xf9, 0x80, 0x80, 0xfe, 0x0b, 0x0c, 0xfe, 0x0d, 0x0e,
+      { 0x96, 0x69, 0x58, 0x1f, 0x43, 0x00, 0x01, 0x72, 0xf9, 0xf9, 0x00, 0x00,
+    0xfc, 0x01, 0x02, 0xf9, 0x00, 0x00, 0xfe, 0x0b, 0x0c, 0xfe, 0x0d, 0x0e,
     0xfe, 0x0f, 0x10, 0xfe, 0x11, 0x12, 0xfe, 0x13, 0x14, 0xfe, 0x03, 0x04,
     0xfe, 0x05, 0x06, 0xfe, 0x07, 0x08, 0xfe, 0x09, 0x0a, 0xfe, 0x0b, 0x0c,
     0xfe, 0x0d, 0x0e, 0xfe, 0x0f, 0x10, 0xfe, 0x11, 0x12, 0xfe, 0x13, 0x14,
@@ -813,21 +813,21 @@
 
   const guint8 out1 =
       { 0x96, 0x69, 0x4e, 0x5f, 0xc3, 0x00, 0x00, 0x71, 0xc0, 0x81, 0x59, 0x29,
-    0x72, 0xf4, 0xf8, 0x80, 0x80, 0xf9, 0x80, 0x80, 0xfa, 0x00, 0x00, 0xfa,
+    0x72, 0xf4, 0xfc, 0x80, 0x80, 0xf9, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa,
     0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa,
     0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa,
     0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa,
     0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa,
-    0x00, 0x00, 0x74, 0x00, 0x00, 0xfe
+    0x00, 0x00, 0x74, 0x00, 0x00, 0xfa
   };
   const guint8 out2 =
       { 0x96, 0x69, 0x4e, 0x5f, 0xc3, 0x00, 0x01, 0x71, 0xc0, 0x82, 0x00, 0x00,
-    0x72, 0xf4, 0xf8, 0x80, 0x80, 0xf9, 0x80, 0x80, 0xfa, 0x00, 0x00, 0xfa,
+    0x72, 0xf4, 0xfc, 0x80, 0x80, 0xf9, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa,
     0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa,
     0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa,
     0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa,
     0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa,
-    0x00, 0x00, 0x74, 0x00, 0x01, 0x7d
+    0x00, 0x00, 0x74, 0x00, 0x01, 0x79
   };
   const guint8 *out = { out1, out2 };
   guint out_len = { sizeof (out1), sizeof (out2) };
@@ -917,7 +917,7 @@
     0xfa, 0x00, 0x00, 0x74, 0x00, 0x00, 0x6d
   };
   const guint8 out2 =
-      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x01, 0x72, 0xea, 0xf9, 0x80, 0x80,
+      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x01, 0x72, 0xea, 0xf9, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0x74, 0x00, 0x01, 0x6f
@@ -929,7 +929,7 @@
     0xfa, 0x00, 0x00, 0x74, 0x00, 0x02, 0x65
   };
   const guint8 out4 =
-      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x03, 0x72, 0xea, 0xf9, 0x80, 0x80,
+      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x03, 0x72, 0xea, 0xf9, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0x74, 0x00, 0x03, 0x6b
@@ -988,6 +988,97 @@
 
 GST_END_TEST;
 
+GST_START_TEST (convert_cea608_raw_cea608_s334_1a_field_one)
+{
+  const guint8 in = { 0x80, 0x80 };
+  const guint8 out = { 0x00, 0x80, 0x80 };
+  check_conversion_tc_passthrough (in, sizeof (in), out, sizeof (out),
+      "closedcaption/x-cea-608,format=(string)raw,field=(int)1",
+      "closedcaption/x-cea-608,format=(string)s334-1a");
+}
+
+GST_END_TEST;
+
+GST_START_TEST (convert_cea608_raw_cea708_cc_data_field_one)
+{
+  const guint8 in = { 0x80, 0x80 };
+  const guint8 out = { 0xfd, 0x80, 0x80 };
+  check_conversion_tc_passthrough (in, sizeof (in), out, sizeof (out),
+      "closedcaption/x-cea-608,format=(string)raw,field=(int)1",
+      "closedcaption/x-cea-708,format=(string)cc_data");
+}
+
+GST_END_TEST;
+
+GST_START_TEST (convert_cea608_raw_cea708_cdp_field_one)
+{
+  const guint8 in = { 0x81, 0x82 };
+  const guint8 out =
+      { 0x96, 0x69, 0x49, 0x5f, 0x43, 0x00, 0x00, 0x72, 0xf4, 0xfc, 0x80, 0x80,
+    0xfd, 0x81, 0x82, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
+    0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
+    0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
+    0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
+    0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x74, 0x00, 0x00,
+    0xac
+  };
+
+  check_conversion (in, sizeof (in), out, sizeof (out),
+      "closedcaption/x-cea-608,format=(string)raw,framerate=(fraction)30/1,field=(int)1",
+      "closedcaption/x-cea-708,format=(string)cdp,framerate=(fraction)30/1",
+      NULL, NULL);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (convert_cea608_s334_1a_cea608_raw_field_one)
+{
+  const guint8 in = { 0x80, 0x00, 0x00, 0x00, 0x80, 0x80 };
+  const guint8 out = { 0x80, 0x80 };
+  check_conversion_tc_passthrough (in, sizeof (in), out, sizeof (out),
+      "closedcaption/x-cea-608,format=(string)s334-1a",
+      "closedcaption/x-cea-608,format=(string)raw,field=(int)1");
+}
+
+GST_END_TEST;
+
+GST_START_TEST (convert_cea708_cc_data_cea608_raw_field_one)
+{
+  const guint8 in = { 0xfc, 0x00, 0x00, 0xfd, 0x80, 0x80 };
+  const guint8 out = { 0x80, 0x80 };
+  check_conversion_tc_passthrough (in, sizeof (in), out, sizeof (out),
+      "closedcaption/x-cea-708,format=(string)cc_data",
+      "closedcaption/x-cea-608,format=(string)raw,field=(int)1");
+}
+
+GST_END_TEST;
+
+GST_START_TEST (convert_cea708_cdp_cea608_raw_field_one)
+{
+  const guint8 in =
+      { 0x96, 0x69, 0x13, 0x5f, 0x43, 0x00, 0x00, 0x72, 0xe2, 0xfc, 0x00, 0x00,
+    0xfd, 0x80, 0x80, 0x74, 0x00, 0x00, 0x8a
+  };
+  const guint8 out = { 0x80, 0x80 };
+  check_conversion_tc_passthrough (in, sizeof (in), out, sizeof (out),
+      "closedcaption/x-cea-708,format=(string)cdp,framerate=30/1",
+      "closedcaption/x-cea-608,format=(string)raw,framerate=30/1,field=(int)1");
+}
+
+GST_END_TEST;
+
+GST_START_TEST (convert_cea608_raw_cea608_raw_field_one)
+{
+  /* Control codes must be translated when converting from field 0 to field 1 */
+  const guint8 in = { 0x94, 0x20 };
+  const guint8 out = { 0x15, 0x20 };
+  check_conversion_tc_passthrough (in, sizeof (in), out, sizeof (out),
+      "closedcaption/x-cea-608,format=(string)raw,field=(int)0",
+      "closedcaption/x-cea-608,format=(string)raw,field=(int)1");
+}
+
+GST_END_TEST;
+
 GST_START_TEST (convert_cea708_cdp_cea708_cc_data_double_input_data)
 {
   /* caps say 60fps, data has 30fps. Ensure data is taken alternatatively from
@@ -1011,7 +1102,7 @@
    * buffer */
   const guint8 out1 = { 0xfc, 0x81, 0x82, };
   const guint8 out2 = { 0xfd, 0x83, 0x84, };
-  const guint8 out3 = { 0xfc, 0x85, 0x86, };
+  const guint8 out3 = { 0xfc, 0x80, 0x80, };
   const guint8 *out = { out1, out2, out3, };
   guint out_len = { sizeof (out1), sizeof (out2), sizeof (out3), };
   check_conversion_multiple (G_N_ELEMENTS (in_len), in, in_len,
@@ -1042,7 +1133,7 @@
   };
   /* padding buffer */
   const guint8 out2 =
-      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x01, 0x72, 0xea, 0xf9, 0x80, 0x80,
+      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x01, 0x72, 0xea, 0xf9, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0x74, 0x00, 0x01, 0x6f
@@ -1054,7 +1145,7 @@
     0xfa, 0x00, 0x00, 0x74, 0x00, 0x02, 0x63
   };
   const guint8 out4 =
-      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x03, 0x72, 0xea, 0xf9, 0x80, 0x80,
+      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x03, 0x72, 0xea, 0xf9, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
     0xfa, 0x00, 0x00, 0x74, 0x00, 0x03, 0x6b
@@ -1150,8 +1241,8 @@
       out_datai * 43 + 11 = in_datain_data_offset + 2;
     } else {
       out_datai * 43 + 9 = 0xf9;
-      out_datai * 43 + 10 = 0x80;
-      out_datai * 43 + 11 = 0x80;
+      out_datai * 43 + 10 = 0x00;
+      out_datai * 43 + 11 = 0x00;
     }
     out_datai * 43 + 42 = calculate_cdp_checksum (&out_datai * 43, 42);
     outi = &out_datai * 43;
@@ -1166,6 +1257,34 @@
 
 GST_END_TEST;
 
+GST_START_TEST (convert_cea608_raw_field1_cea708_cdp_60fps)
+{
+  const guint8 in1 = { 0x81, 0x82 };
+  const guint8 *in = { in1 };
+  guint in_len = { sizeof (in1) };
+  const guint8 out1 =
+      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x00, 0x72, 0xea, 0xfc, 0x80, 0x80,
+    0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
+    0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
+    0xfa, 0x00, 0x00, 0x74, 0x00, 0x00, 0x6e,
+  };
+  const guint8 out2 =
+      { 0x96, 0x69, 0x2b, 0x8f, 0x43, 0x00, 0x01, 0x72, 0xea, 0xfd, 0x81, 0x82,
+    0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
+    0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00, 0xfa, 0x00, 0x00,
+    0xfa, 0x00, 0x00, 0x74, 0x00, 0x01, 0x68,
+  };
+  const guint8 *out = { out1, out2 };
+  guint out_len = { sizeof (out1), sizeof (out2) };
+  check_conversion_multiple (1, in, in_len, G_N_ELEMENTS (out_len), out,
+      out_len,
+      "closedcaption/x-cea-608,format=(string)raw,framerate=30/1,field=1",
+      "closedcaption/x-cea-708,format=(string)cdp,framerate=60/1", NULL, NULL,
+      0);
+}
+
+GST_END_TEST;
+
 static Suite *
 ccextractor_suite (void)
 {
@@ -1205,6 +1324,15 @@
   tcase_add_test (tc, convert_cea708_cc_data_cea708_cdp_double_input_data);
   tcase_add_test (tc, convert_cea708_cc_data_cea708_cdp_field1_overflow);
 
+  tcase_add_test (tc, convert_cea608_raw_cea608_s334_1a_field_one);
+  tcase_add_test (tc, convert_cea608_raw_cea708_cc_data_field_one);
+  tcase_add_test (tc, convert_cea608_raw_cea708_cdp_field_one);
+  tcase_add_test (tc, convert_cea608_s334_1a_cea608_raw_field_one);
+  tcase_add_test (tc, convert_cea708_cc_data_cea608_raw_field_one);
+  tcase_add_test (tc, convert_cea708_cdp_cea608_raw_field_one);
+  tcase_add_test (tc, convert_cea608_raw_cea608_raw_field_one);
+  tcase_add_test (tc, convert_cea608_raw_field1_cea708_cdp_60fps);
+
   return s;
 }

gst-plugins-bad-1.22.7.tar.xz/tests/check/elements/cudafilter.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/cudafilter.c Changed

gst-plugins-bad-1.22.7.tar.xz/tests/check/elements/h265parse.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/h265parse.c Changed

@@ -24,6 +24,7 @@
  */
 
 #include <gst/check/check.h>
+#include <gst/video/video-sei.h>
 #include "parser.h"
 
 #define SRC_CAPS_TMPL   "video/x-h265, parsed=(boolean)false"
@@ -1116,6 +1117,59 @@
 
 GST_END_TEST;
 
+GST_START_TEST (test_parse_sei_userdefinedunregistered)
+{
+  GstVideoSEIUserDataUnregisteredMeta *meta;
+  GstHarness *h;
+  GstBuffer *buf;
+
+  const guint8 bytestream = {
+    0x00, 0x00, 0x00, 0x01, 0x42, 0x01, 0x01, 0x04, 0x08, 0x00, 0x00, 0x03,
+    0x00, 0x9e, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x1e, 0x90, 0x11, 0x08,
+    0xb2, 0xca, 0xcd, 0x57, 0x95, 0xcd, 0xc0, 0x80, 0x80, 0x01, 0x00, 0x00,
+    0x03, 0x00, 0x01, 0x00, 0x00, 0x03, 0x00, 0x19, 0x08, 0x00, 0x00, 0x00,
+    0x01, 0x44, 0x01, 0xc1, 0x73, 0x18, 0x31, 0x08, 0x90,
+    // SEI
+    0x00, 0x00, 0x01, 0x4e, 0x01,
+    0x05,                       // SEI Type.
+    0x18,                       // SEI Payload size (16 UUID size + 8 payload size = 24).
+    // SEI User Data Unregistered UUID.
+    0xee, 0x2c, 0xa2, 0xde, 0x09, 0xb5, 0x17, 0x47, 0xdb, 0xbb, 0x55, 0xa4,
+    0xfe, 0x7f, 0xc2, 0xfc,
+    // SEI User Data Unregistered Payload.
+    0x4e, 0x78, 0x32, 0x36, 0x35, 0x20, 0x28, 0x62,
+  };
+  const gsize bytestream_size = sizeof (bytestream);
+  const guint8 uuid = {
+    0xee, 0x2c, 0xa2, 0xde, 0x09, 0xb5, 0x17, 0x47, 0xdb, 0xbb, 0x55, 0xa4,
+    0xfe, 0x7f, 0xc2, 0xfc
+  };
+  const guint8 payload = { 0x4e, 0x78, 0x32, 0x36, 0x35, 0x20, 0x28, 0x62 };
+
+  h = gst_harness_new ("h265parse");
+  gst_harness_set_src_caps_str (h, "video/x-h265, stream-format=byte-stream");
+
+  buf = gst_buffer_new_and_alloc (bytestream_size);
+  gst_buffer_fill (buf, 0, bytestream, bytestream_size);
+  fail_unless_equals_int (gst_harness_push (h, buf), GST_FLOW_OK);
+
+  gst_harness_push_event (h, gst_event_new_eos ());
+
+  buf = gst_harness_pull (h);
+  meta = gst_buffer_get_video_sei_user_data_unregistered_meta (buf);
+  fail_unless (meta != NULL);
+
+  fail_unless (memcmp (meta->uuid, uuid, 16) == 0);
+  fail_unless_equals_int (meta->size, G_N_ELEMENTS (payload));
+  fail_unless (memcmp (meta->data, payload, meta->size) == 0);
+
+  gst_buffer_unref (buf);
+
+  gst_harness_teardown (h);
+}
+
+GST_END_TEST;
+
 GST_START_TEST (test_invalid_sei_in_hvcc)
 {
   GstHarness *h;
@@ -1214,6 +1268,7 @@
 
   tcase_add_test (tc_chain, test_drain);
 
+  tcase_add_test (tc_chain, test_parse_sei_userdefinedunregistered);
   tcase_add_test (tc_chain, test_invalid_sei_in_hvcc);
 
   return s;

gst-plugins-bad-1.22.7.tar.xz/tests/check/elements/jpegparse.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/jpegparse.c Changed

@@ -192,7 +192,8 @@
   caps_in = gst_caps_new_simple ("image/jpeg", "parsed", G_TYPE_BOOLEAN, FALSE,
       NULL);
   caps_out = gst_caps_new_simple ("image/jpeg", "parsed", G_TYPE_BOOLEAN, TRUE,
-      "framerate", GST_TYPE_FRACTION, 0, 1, NULL);
+      "framerate", GST_TYPE_FRACTION, 0, 1, "interlace-mode", G_TYPE_STRING,
+      "progressive", "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1, NULL);
 
   /* Push the data byte by byte, injecting some garbage. */
   buffer_in = make_buffers_in (buffer_in, test_data_garbage);
@@ -262,7 +263,8 @@
   buffer_in = g_list_append (buffer_in, buffer);
 
   caps_out = gst_caps_new_simple ("image/jpeg", "parsed", G_TYPE_BOOLEAN, TRUE,
-      "framerate", GST_TYPE_FRACTION, 0, 1, NULL);
+      "framerate", GST_TYPE_FRACTION, 0, 1, "interlace-mode", G_TYPE_STRING,
+      "progressive", "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1, NULL);
   buffer_out = make_buffers_out (buffer_out, test_data_short_frame);
   buffer_out = make_buffers_out (buffer_out, test_data_normal_frame);
   buffer_out = make_buffers_out (buffer_out, test_data_entropy);
@@ -328,7 +330,9 @@
   caps_out = gst_caps_new_simple ("image/jpeg", "parsed", G_TYPE_BOOLEAN, TRUE,
       "framerate", GST_TYPE_FRACTION, 0, 1, "width", G_TYPE_INT, 80, "height",
       G_TYPE_INT, 60, "sof-marker", G_TYPE_INT, 0, "colorspace", G_TYPE_STRING,
-      "sYUV", "sampling", G_TYPE_STRING, "YCbCr-4:2:0", NULL);
+      "sYUV", "sampling", G_TYPE_STRING, "YCbCr-4:2:0", "interlace-mode",
+      G_TYPE_STRING, "progressive", "pixel-aspect-ratio", GST_TYPE_FRACTION, 1,
+      1, NULL);
 
   buffer_in = make_my_input_buffer (test_data_app1_exif,
       sizeof (test_data_app1_exif));
@@ -354,7 +358,9 @@
   caps_out = gst_caps_new_simple ("image/jpeg", "parsed", G_TYPE_BOOLEAN, TRUE,
       "framerate", GST_TYPE_FRACTION, 0, 1, "width", G_TYPE_INT, 80, "height",
       G_TYPE_INT, 60, "sof-marker", G_TYPE_INT, 0, "colorspace", G_TYPE_STRING,
-      "sYUV", "sampling", G_TYPE_STRING, "YCbCr-4:2:0", NULL);
+      "sYUV", "sampling", G_TYPE_STRING, "YCbCr-4:2:0", "interlace-mode",
+      G_TYPE_STRING, "progressive", "pixel-aspect-ratio", GST_TYPE_FRACTION, 1,
+      1, NULL);
 
   buffer_in = make_my_input_buffer (test_data_comment,
       sizeof (test_data_comment));

gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/lc3.c Added

@@ -0,0 +1,440 @@
+/* GStreamer
+ *
+ * Unit tests for lc3enc and lc3dec
+ *
+ * Copyright (C) <2023> Asymptotic Inc. <taruntej@asymptotic.io>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <string.h>
+#include <unistd.h>
+
+#include <gst/gst.h>
+#include <gst/check/gstcheck.h>
+#include <gst/check/gstharness.h>
+#include <gst/audio/audio.h>
+
+/* For ease of programming we use globals to keep refs for our floating
+ * src and sink pads we create; otherwise we always have to do get_pad,
+ * get_peer, and then remove references in every test function
+ * `srcpad` is the peer pad of lc3enc sinkpad upstream
+ * `sinkpad` is the peer pad of lc3enc srcpad downstream
+ */
+static GstPad *srcpad, *sinkpad;
+
+#define SAMPLE_RATES "8000, 16000, 24000, 32000, 48000"
+#define FORMATS "S16LE, S24LE, S32LE, F32LE"
+
+#define FRAME_DURATION_10000US 10000
+#define FRAME_DURATION_7500US 7500
+#define FRAME_BYTES_MIN 20
+#define FRAME_BYTES_MAX 400
+
+#define FRAME_DURATIONS G_STRINGIFY(FRAME_DURATION_10000US) ", " G_STRINGIFY(FRAME_DURATION_7500US)
+#define FRAME_BYTES_RANGE  G_STRINGIFY(FRAME_BYTES_MIN) ", " G_STRINGIFY(FRAME_BYTES_MAX)
+
+#define RAW_AUDIO_CAPS_STRING "audio/x-raw, " \
+        "format = { " FORMATS "  }, " \
+        "rate = (int) { " SAMPLE_RATES  " }, " "channels = (int) 1, MAX" \
+        ", layout=(string)interleaved"
+
+#define LC3_AUDIO_CAPS_STRING "audio/x-lc3, " \
+        "rate = (int) { " SAMPLE_RATES " }, " \
+        "channels = (int) 1, MAX, " \
+        "frame-bytes = (int) " FRAME_BYTES_RANGE ", " \
+        "frame-duration-us = (int) { " FRAME_DURATIONS "}, " \
+        "framed=(boolean) true"
+
+#define LC3_AUDIO_CAPS_STRING_10000US "audio/x-lc3, " \
+        "rate = (int) { " SAMPLE_RATES " }, " \
+        "channels = (int) 1, MAX, " \
+        "frame-bytes = (int) " FRAME_BYTES_RANGE ", " \
+        "frame-duration-us = (int) 10000, " \
+        "framed=(boolean) true"
+
+#define LC3_AUDIO_CAPS_STRING_7500US "audio/x-lc3, " \
+        "rate = (int) { " SAMPLE_RATES " }, " \
+        "channels = (int) 1, MAX, " \
+        "frame-bytes = (int) " FRAME_BYTES_RANGE ", " \
+        "frame-duration-us = (int)  7500, " \
+        "framed=(boolean) true"
+
+static GstStaticPadTemplate sinktemplate_10000us =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (LC3_AUDIO_CAPS_STRING_10000US));
+
+static GstStaticPadTemplate sinktemplate_7500us =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (LC3_AUDIO_CAPS_STRING_7500US));
+
+static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (RAW_AUDIO_CAPS_STRING));
+
+static GstStaticPadTemplate dec_srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (LC3_AUDIO_CAPS_STRING));
+
+static GstStaticPadTemplate dec_sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (RAW_AUDIO_CAPS_STRING));
+
+/* a fixed array of the size `frame-bytes` (i.e. 200)
+ * contains the first few bytes of the encoded output
+ * for an input buffer containing all 1's e.g. {'1','1','1','1' ....}
+ */
+static guint8 lc3_encoded_buff_48K200 = {
+  0x16, 0x34, 0x7b, 0x8f, 0x5f, 0xd4, 0xf0, 0xa8, 0x34, 0x7f, 0xd1, 0xc7,
+  0x55, 0xdc, 0x1a, 0x85, 0x77, 0x8d, 0xb1, 0xb7, 0x78, 0x2c, 0x20, 0x88,
+  0x87, 0xd3, 0x4d, 0xb7, 0xf5, 0x1a, 0x15, 0x7d, 0xc1, 0xde, 0x25, 0xca,
+  0x94, 0x80, 0x1d, 0x95, 0xbd, 0xf3, 0x50, 0x01, 0x64, 0xe2, 0x60, 0x28,
+  0xec, 0xd3, 0xf6, 0x72, 0x2b, 0xf2, 0x6d, 0xf0, 0x83, 0xb4, 0x68, 0x97,
+  0x7e, 0x6f, 0x49, 0xc6, 0x38, 0x79, 0x9e, 0xa8, 0x49, 0xab, 0xfc, 0xca,
+  0xb8, 0x5c, 0xc6, 0xa5, 0xd9, 0x6e, 0xb4, 0xd2, 0x6a, 0x79, 0x17, 0x29,
+  0xac, 0x70, 0x32, 0x6b, 0x13, 0x1b, 0x65, 0xdf, 0xc8, 0x6e, 0x81, 0xa4,
+  0xe2, 0x8e, 0xd6, 0x4d, 0xe7, 0x30, 0xdc, 0x02, 0x12, 0xbb, 0x8c, 0x4d,
+  0x11, 0x82, 0x66, 0xfa, 0x23, 0xa7, 0xcc, 0xd0, 0x35, 0x2b, 0x1d, 0x30,
+  0x09, 0x52, 0x35, 0xf1, 0x3f, 0xc9, 0xb4, 0x52, 0xb5, 0x2b, 0x52, 0xb5,
+  0x2b, 0x52, 0xb5, 0x2b, 0x52, 0xb5, 0x2b, 0x52, 0xb5, 0x2b, 0x52, 0xb5,
+  0x2b, 0x52, 0xb5, 0x2b, 0x52, 0xb5, 0x55, 0xa9, 0x5a, 0x94, 0x6a, 0x29,
+  0x8d, 0x59, 0x4d, 0xd6, 0x75, 0x53, 0x59, 0xd4, 0x4b, 0x64, 0x72, 0xa6,
+  0x9d, 0x19, 0x4c, 0xae, 0xea, 0xd1, 0xc5, 0x91, 0x37, 0x50, 0x0e, 0xea,
+  0xfb, 0xbb, 0x6b, 0x49, 0xee, 0xe3, 0x91, 0x96, 0xe2, 0x7a, 0x39, 0x84,
+  0x1d, 0x17, 0xb8, 0x92, 0x34, 0x3c, 0x86, 0x3c
+};
+
+static guint8 lc3_encoded_buff_48K_7500us200 = {
+  0x08, 0x90, 0x6b, 0x8b, 0x5d, 0x8e, 0x39, 0x55, 0x6c, 0x78, 0xb9, 0xed,
+  0x00, 0x10, 0xeb, 0x7a, 0x67, 0x97, 0x4c, 0x59, 0xf4, 0xde, 0x4e, 0xc6,
+  0x21, 0x9f, 0xf0, 0x83, 0x63, 0xd1, 0xa3, 0xe2, 0x28, 0x11, 0x30, 0xa0,
+  0xf9, 0xa7, 0x6c, 0x38, 0x4c, 0xfb, 0xf0, 0xc3, 0x68, 0x70, 0xa3, 0x6e,
+  0x3c, 0x4f, 0x8b, 0xd1, 0xd9, 0x67, 0x9b, 0x2c, 0x2b, 0x03, 0xca, 0xc8,
+  0xa6, 0x62, 0xb1, 0xb1, 0xe2, 0x8b, 0x29, 0x5e, 0xd2, 0x6e, 0xaf, 0x3e,
+  0xc3, 0x04, 0x0f, 0x16, 0xc8, 0xb4, 0xaf, 0x37, 0x3c, 0x64, 0x99, 0x52,
+  0xb8, 0x55, 0x0e, 0x23, 0x6f, 0xf2, 0x1c, 0xc1, 0x10, 0xad, 0xd2, 0x41,
+  0x55, 0x2a, 0xad, 0x2a, 0x96, 0xab, 0x4a, 0xa5, 0x55, 0xaa, 0xa5, 0x55,
+  0xaa, 0xaa, 0xaa, 0xad, 0x56, 0x95, 0x56, 0xab, 0x4a, 0xd5, 0xab, 0x4a,
+  0xd5, 0x68, 0x8b, 0x99, 0x5e, 0xaa, 0x5c, 0x60, 0x83, 0xcd, 0x99, 0x1b,
+  0x69, 0xf7, 0xd0, 0xfa, 0x04, 0xeb, 0xb8, 0x24, 0xf1, 0x59, 0x00, 0xca,
+  0x20, 0xe8, 0x38, 0x3c, 0x54, 0xac, 0x08, 0x90, 0x6b, 0x8b, 0x5d, 0x8e,
+  0x39, 0x55, 0x6c, 0x78, 0xb9, 0xed, 0x00, 0x10, 0xeb, 0x7a, 0x67, 0x97,
+  0x4c, 0x59, 0xf4, 0xde, 0x4e, 0xc6, 0x21, 0x9f, 0xf0, 0x83, 0x63, 0xd1,
+  0xa3, 0xe2, 0x28, 0x11, 0x30, 0xa0, 0xf9, 0xa7, 0x6c, 0x38, 0x4c, 0xfb,
+  0xf0, 0xc3, 0x68, 0x70, 0xa3, 0x6e, 0x3c, 0x4f
+};
+
+
+static guint8 lc3_encoded_buff_24K200 = {
+  0x08, 0xb8, 0xd1, 0xf2, 0xa8, 0x25, 0x52, 0x16, 0x75, 0x74, 0xab, 0x3d,
+  0xae, 0x0f, 0xed, 0x0a, 0xfe, 0x7a, 0xf4, 0x16, 0x85, 0x14, 0x6f, 0x12,
+  0x42, 0x6f, 0xdc, 0xea, 0x7e, 0x55, 0x01, 0x0c, 0x7d, 0x70, 0x91, 0x9d,
+  0x42, 0xd9, 0xc2, 0x1e, 0x37, 0xdd, 0x27, 0xb6, 0x6e, 0x21, 0x48, 0xc0,
+  0x6d, 0xe8, 0x56, 0xe2, 0x62, 0x56, 0x5b, 0x89, 0x0b, 0x5d, 0x4c, 0xc9,
+  0x1e, 0x37, 0xe8, 0x7f, 0xb3, 0xa4, 0x32, 0xee, 0xce, 0x41, 0x26, 0x46,
+  0x75, 0x49, 0xec, 0xdd, 0x7e, 0xed, 0x10, 0x84, 0xc8, 0x74, 0xac, 0xbc,
+  0xff, 0x7b, 0x3b, 0x9e, 0xf8, 0xb7, 0xee, 0x26, 0xe6, 0xa5, 0xc0, 0xfb,
+  0x4b, 0x2f, 0x90, 0x4c, 0x68, 0x7d, 0x57, 0x2e, 0x5a, 0xba, 0xaa, 0x45,
+  0xf3, 0xba, 0xae, 0x5c, 0x91, 0xa8, 0xa2, 0x13, 0x74, 0x6c, 0xa2, 0x15,
+  0x25, 0x6e, 0xb8, 0x26, 0x79, 0x8c, 0x3a, 0xe5, 0x55, 0x55, 0xcd, 0xb4,
+  0xe5, 0x24, 0xd3, 0xfa, 0x89, 0xb0, 0x33, 0x59, 0x55, 0x45, 0x19, 0x92,
+  0xad, 0xb2, 0xdb, 0x63, 0xc8, 0x19, 0xae, 0xb2, 0x0e, 0x23, 0xb9, 0x15,
+  0x37, 0x16, 0xa4, 0xbc, 0xcc, 0xf4, 0x48, 0x4a, 0x50, 0x8e, 0x20, 0xad,
+  0x8c, 0xb5, 0x9c, 0x45, 0xcd, 0xcc, 0xea, 0xd4, 0xc9, 0xa0, 0xc9, 0xac,
+  0x57, 0x18, 0x10, 0x9c, 0xc3, 0x1d, 0x2d, 0xb2, 0x87, 0x0c, 0x3b, 0xe9,
+  0xe3, 0xbf, 0x24, 0x08, 0x47, 0x07, 0x15, 0xde
+};
+
+static GstElement *
+setup_lc3enc (GstStaticPadTemplate * srctmpl, GstStaticPadTemplate * sinktmpl)
+{
+  GstElement *lc3enc;
+
+  GST_DEBUG ("setup_lc3enc");
+  lc3enc = gst_check_setup_element ("lc3enc");
+
+  srcpad = gst_check_setup_src_pad (lc3enc, srctmpl);
+  sinkpad = gst_check_setup_sink_pad (lc3enc, sinktmpl);
+
+  gst_pad_set_active (srcpad, TRUE);
+  gst_pad_set_active (sinkpad, TRUE);
+
+  return lc3enc;
+}
+
+
+static void
+cleanup_lc3enc (GstElement * lc3enc)
+{
+  GST_DEBUG ("cleanup_lc3enc");
+  gst_element_set_state (lc3enc, GST_STATE_NULL);
+
+  gst_pad_set_active (srcpad, FALSE);
+  gst_pad_set_active (sinkpad, FALSE);
+
+  gst_check_teardown_src_pad (lc3enc);
+  gst_check_teardown_sink_pad (lc3enc);
+  gst_check_teardown_element (lc3enc);
+}
+
+static int
+get_delay_samples (gint rate, gint frame_duration_us)
+{
+  /* delay is
+     - 2.5ms for 10ms
+     - 4ms for 7.5ms
+   */
+  int frame_samples = (rate * frame_duration_us) / GST_MSECOND;
+
+  if (frame_duration_us == 10000) {
+    return (2.5 * frame_samples) / 10;
+  } else if (frame_duration_us == 7500) {
+    return (4 * frame_samples) / 7.5;
+  }
+  return 0;
+}
+
+static void
+enc_buffer_test (gint rate, gint channels, gint nbuffers, int frame_dur_us,
+    guint8 * expected_output)
+{
+  GstElement *lc3enc;
+  GstBuffer *inbuffer, *outbuffer;
+  GstCaps *caps;
+  guint i, num_buffers;
+  GstStructure *s;
+  gint frame_duration_us;
+  gint frame_bytes;
+  guint outbuffers;
+  guint64 chmask;
+  int num;
+  GstStaticPadTemplate *sinktmpl =
+      frame_dur_us == 7500 ? &sinktemplate_7500us : &sinktemplate_10000us;
+
+  /* cleanup any stale buffers from previous run */
+  g_list_free (buffers);
+  buffers = NULL;
+
+  lc3enc = setup_lc3enc (&srctemplate, sinktmpl);
+  fail_unless (gst_element_set_state (lc3enc,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+      "could not set to playing");
+
+  /* corresponds to audio buffer mentioned in the caps */
+  inbuffer = gst_buffer_new_and_alloc (1024 * nbuffers * 2 * channels);
+  /* makes valgrind's memcheck happier */
+  gst_buffer_memset (inbuffer, 0, '1', 1024 * nbuffers * 2 * channels);
+
+  chmask = gst_audio_channel_get_fallback_mask (channels);
+
+  caps =
+      gst_caps_new_simple ("audio/x-raw", "rate", G_TYPE_INT, rate, "channels",
+      G_TYPE_INT, channels, "format", G_TYPE_STRING, "S16LE", "layout",
+      G_TYPE_STRING, "interleaved", "channel-mask", GST_TYPE_BITMASK, chmask,
+      NULL);
+
+  gst_check_setup_events (srcpad, lc3enc, caps, GST_FORMAT_TIME);
+  gst_caps_unref (caps);
+
+  GST_BUFFER_TIMESTAMP (inbuffer) = 0;
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+  fail_unless (gst_pad_push (srcpad, inbuffer) == GST_FLOW_OK);
+
+  /* send eos to have all flushed if needed */
+  fail_unless (gst_pad_push_event (srcpad, gst_event_new_eos ()) == TRUE);
+
+  /* get the caps on the srcpad of lc3enc */
+  fail_unless (gst_pad_has_current_caps (sinkpad));
+  caps = gst_pad_get_current_caps (sinkpad);
+  fail_unless (gst_caps_is_fixed (caps));
+  s = gst_caps_get_structure (caps, 0);
+  fail_if (s == NULL);
+
+  gst_structure_get_int (s, "frame-duration-us", &frame_duration_us);
+  fail_unless (frame_duration_us == frame_dur_us);
+  gst_structure_get_int (s, "frame-bytes", &frame_bytes);
+  fail_if (frame_bytes == 0);
+
+  gst_caps_unref (caps);
+  num = get_delay_samples (rate, frame_duration_us) + (1024 * nbuffers);
+  outbuffers =
+      gst_util_uint64_scale_int_ceil (1, num,
+      ((rate * frame_duration_us) / GST_MSECOND));
+  num_buffers = g_list_length (buffers);
+  /* check the num of outbuffers is as expected */
+  fail_unless_equals_int (num_buffers, outbuffers);
+
+  /* clean up buffers */
+  for (i = 0; i < num_buffers; ++i) {
+    GstMapInfo map;
+    gsize size;
+    guint8 *data;
+
+    outbuffer = GST_BUFFER (buffers->data);
+    fail_if (outbuffer == NULL);
+
+    gst_buffer_map (outbuffer, &map, GST_MAP_READ);
+    data = map.data;
+    size = map.size;
+
+    /* check the size of each out buffer per channel
+     * is same as frame_bytes
+     */
+    fail_unless_equals_int (size / channels, frame_bytes);
+    if (i == 0) {
+      /* verify the first channel data */
+      fail_unless (0 == memcmp (data, expected_output, frame_bytes));
+
+      /* verify the first channel data */
+      fail_unless (0 == memcmp (data + (frame_bytes * (channels - 1)),
+              expected_output, frame_bytes));
+    }
+
+    gst_buffer_unmap (outbuffer, &map);
+
+    buffers = g_list_remove (buffers, outbuffer);
+
+    ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1);
+    gst_buffer_unref (outbuffer);
+    outbuffer = NULL;
+  }
+
+  cleanup_lc3enc (lc3enc);
+  g_list_free (buffers);
+  buffers = NULL;
+}
+
+static GstBuffer *
+create_test_buffer (guint64 num, guint64 size)
+{
+  GstBuffer *buffer;
+  guint64 *data = g_malloc (sizeof (guint64));
+
+  *data = num;
+
+  buffer = gst_buffer_new_wrapped (data, size);
+
+  GST_BUFFER_PTS (buffer) = num * 10 * GST_MSECOND;
+  GST_BUFFER_DURATION (buffer) = 10 * GST_MSECOND;
+
+  return buffer;
+}
+
+static void
+dec_plc_test (void)
+{
+  GstElement *dec;
+  GstClockTime pts;
+  GstClockTime dur;
+  GstBuffer *buf;
+  GstHarness *h;
+  GstCaps *caps;
+
+  dec = gst_check_setup_element ("lc3dec");
+  g_object_set (dec, "plc", TRUE, NULL);
+
+  dur = GST_MSECOND * 10;
+  h = gst_harness_new_full (dec, &dec_srctemplate, "sink", &dec_sinktemplate,
+      "src");
+  caps =
+      gst_caps_from_string
+      ("audio/x-lc3,channels=2,frame-bytes=100,frame-duration-us=10000,framed=true,rate=48000");
+
+  gst_check_setup_events (h->srcpad, dec, caps, GST_FORMAT_TIME);
+  gst_caps_unref (caps);
+
+  pts = 0;
+  gst_harness_push (h, create_test_buffer (0, 2 * 100));
+  buf = gst_harness_pull (h);
+  fail_unless_equals_int (pts, GST_BUFFER_PTS (buf));
+  fail_unless_equals_int (dur, GST_BUFFER_DURATION (buf));
+  /* first buffer is marked with discont in the gstaudiodecoder */
+  fail_unless (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DISCONT));
+  gst_buffer_unref (buf);
+
+  pts = 10 * GST_MSECOND;
+  fail_unless (gst_harness_push_event (h, gst_event_new_gap (pts, dur)));
+  buf = gst_harness_try_pull (h);
+  fail_unless (buf);
+  fail_unless_equals_int (pts, GST_BUFFER_PTS (buf));
+  fail_unless_equals_int (dur, GST_BUFFER_DURATION (buf));
+  fail_unless (!GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DISCONT));
+  gst_buffer_unref (buf);
+
+  pts = 2 * 10 * GST_MSECOND;
+  buf = create_test_buffer (2, 2 * 100);
+  GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DISCONT);
+  gst_harness_push (h, buf);
+  buf = gst_harness_pull (h);
+  fail_unless_equals_int (pts, GST_BUFFER_PTS (buf));
+  fail_unless_equals_int (dur, GST_BUFFER_DURATION (buf));
+  fail_unless (!GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DISCONT));
+
+  gst_buffer_unref (buf);
+  gst_harness_teardown (h);
+}
+
+GST_START_TEST (test_48k_8ch_10000us)
+{
+  enc_buffer_test (48000, 8, 100, 10000, lc3_encoded_buff_48K);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_48k_8ch_7500us)
+{
+  enc_buffer_test (48000, 8, 100, 7500, lc3_encoded_buff_48K_7500us);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_24k_4ch_10000us)
+{
+  enc_buffer_test (24000, 4, 150, 10000, lc3_encoded_buff_24K);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_dec_plc)
+{
+  dec_plc_test ();
+}
+
+GST_END_TEST;
+
+static Suite *
+lc3_suite (void)
+{
+  Suite *s = suite_create ("lc3");
+  TCase *tc_chain = tcase_create ("general");
+
+  suite_add_tcase (s, tc_chain);
+  tcase_add_test (tc_chain, test_48k_8ch_10000us);
+  tcase_add_test (tc_chain, test_48k_8ch_7500us);
+  tcase_add_test (tc_chain, test_24k_4ch_10000us);
+  tcase_add_test (tc_chain, test_dec_plc);
+
+  return s;
+}
+
+GST_CHECK_MAIN (lc3);

gst-plugins-bad-1.22.7.tar.xz/tests/check/elements/mpegtsmux.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/mpegtsmux.c Changed

gst-plugins-bad-1.22.7.tar.xz/tests/check/elements/pnm.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/pnm.c Changed

gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/sdpdemux.c Added

@@ -0,0 +1,186 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include "../../../gst/sdp/gstsdpdemux.h"
+#include "../../../gst/sdp/gstsdpdemux.c"
+#undef GST_CAT_DEFAULT
+
+#include <gst/check/gstcheck.h>
+
+static void
+test_source_filter (const gchar * str, guint size, const gchar * result)
+{
+  GstSDPMessage sdp = { 0 };
+  GstSDPDemux *demux = g_object_new (GST_TYPE_SDP_DEMUX, NULL);
+  GstSDPStream *stream;
+
+  gst_sdp_message_init (&sdp);
+  fail_if (gst_sdp_message_parse_buffer ((const guint8 *) str, size,
+          &sdp) != GST_SDP_OK);
+
+  stream = gst_sdp_demux_create_stream (demux, &sdp, 0);
+  fail_if (stream == NULL);
+
+  if (result) {
+    fail_unless_equals_string (stream->src_list, result);
+  } else {
+    fail_if (stream->src_list);
+  }
+
+  gst_sdp_demux_cleanup (demux);
+  gst_object_unref (demux);
+  gst_sdp_message_uninit (&sdp);
+}
+
+GST_START_TEST (test_parse_source_filter_incl)
+{
+  static const gchar sdp =
+      "v=0\r\n"
+      "o=- 18 0 IN IP4 127.0.0.1\r\n"
+      "s=TestSdp\r\n"
+      "t=0 0\r\n"
+      "m=audio 5004 RTP/AVP 98\r\n"
+      "c=IN IP4 224.0.0.0\r\n"
+      "a=recvonly\r\n"
+      "a=source-filter: incl IN IP4 224.0.0.0 127.0.0.1\r\n"
+      "a=rtpmap:98 L24/48000/2\r\n" "a=framecount:48\r\n" "a=recvonly\r\n";
+
+  test_source_filter (sdp, sizeof (sdp), "+127.0.0.1");
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_parse_source_filter_incl_multi_list)
+{
+  static const gchar sdp =
+      "v=0\r\n"
+      "o=- 18 0 IN IP4 127.0.0.1\r\n"
+      "s=TestSdp\r\n"
+      "t=0 0\r\n"
+      "m=audio 5004 RTP/AVP 98\r\n"
+      "c=IN IP4 224.0.0.0\r\n"
+      "a=recvonly\r\n"
+      "a=source-filter: incl IN IP4 224.0.0.0 127.0.0.1 127.0.0.2\r\n"
+      "a=rtpmap:98 L24/48000/2\r\n" "a=framecount:48\r\n" "a=recvonly\r\n";
+
+  test_source_filter (sdp, sizeof (sdp), "+127.0.0.1+127.0.0.2");
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_parse_source_filter_excl)
+{
+  static const gchar sdp =
+      "v=0\r\n"
+      "o=- 18 0 IN IP4 127.0.0.1\r\n"
+      "s=TestSdp\r\n"
+      "t=0 0\r\n"
+      "m=audio 5004 RTP/AVP 98\r\n"
+      "c=IN IP4 224.0.0.0\r\n"
+      "a=recvonly\r\n"
+      "a=source-filter: excl IN IP4 224.0.0.0 127.0.0.2\r\n"
+      "a=rtpmap:98 L24/48000/2\r\n" "a=framecount:48\r\n" "a=recvonly\r\n";
+
+  test_source_filter (sdp, sizeof (sdp), "-127.0.0.2");
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_parse_source_filter_incl_excl)
+{
+  static const gchar sdp =
+      "v=0\r\n"
+      "o=- 18 0 IN IP4 127.0.0.1\r\n"
+      "s=TestSdp\r\n"
+      "t=0 0\r\n"
+      "m=audio 5004 RTP/AVP 98\r\n"
+      "c=IN IP4 224.0.0.0\r\n"
+      "a=recvonly\r\n"
+      "a=source-filter: incl IN IP4 224.0.0.0 127.0.0.1\r\n"
+      "a=source-filter: excl IN IP4 224.0.0.0 127.0.0.2\r\n"
+      "a=rtpmap:98 L24/48000/2\r\n" "a=framecount:48\r\n" "a=recvonly\r\n";
+
+  test_source_filter (sdp, sizeof (sdp), "+127.0.0.1-127.0.0.2");
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_parse_source_filter_with_trailing_space)
+{
+  static const gchar sdp =
+      "v=0\r\n"
+      "o=- 18 0 IN IP4 127.0.0.1\r\n"
+      "s=TestSdp\r\n"
+      "t=0 0\r\n"
+      "m=audio 5004 RTP/AVP 98\r\n"
+      "c=IN IP4 224.0.0.0\r\n"
+      "a=recvonly\r\n"
+      "a=source-filter: incl  IN   IP4  224.0.0.0   127.0.0.1    \r\n"
+      "a=rtpmap:98 L24/48000/2\r\n" "a=framecount:48\r\n" "a=recvonly\r\n";
+
+  test_source_filter (sdp, sizeof (sdp), "+127.0.0.1");
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_parse_source_filter_missing_list)
+{
+  static const gchar sdp =
+      "v=0\r\n"
+      "o=- 18 0 IN IP4 127.0.0.1\r\n"
+      "s=TestSdp\r\n"
+      "t=0 0\r\n"
+      "m=audio 5004 RTP/AVP 98\r\n"
+      "c=IN IP4 224.0.0.0\r\n"
+      "a=recvonly\r\n"
+      "a=source-filter: incl IN IP4 224.0.0.0 \r\n"
+      "a=rtpmap:98 L24/48000/2\r\n" "a=framecount:48\r\n" "a=recvonly\r\n";
+
+  test_source_filter (sdp, sizeof (sdp), NULL);
+}
+
+GST_END_TEST;
+
+static Suite *
+sdpdemux_suite (void)
+{
+  Suite *s;
+  TCase *tc_chain;
+
+  s = suite_create ("sdpdemux");
+  tc_chain = tcase_create ("general");
+
+  suite_add_tcase (s, tc_chain);
+  tcase_add_test (tc_chain, test_parse_source_filter_incl);
+  tcase_add_test (tc_chain, test_parse_source_filter_incl_multi_list);
+  tcase_add_test (tc_chain, test_parse_source_filter_excl);
+  tcase_add_test (tc_chain, test_parse_source_filter_incl_excl);
+  tcase_add_test (tc_chain, test_parse_source_filter_with_trailing_space);
+  tcase_add_test (tc_chain, test_parse_source_filter_missing_list);
+
+  return s;
+}
+
+GST_CHECK_MAIN (sdpdemux);

gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/srt.c Added

@@ -0,0 +1,192 @@
+/* GStreamer
+ * Copyright (C) 2023 Jonas Danielsson <jonas.danielsson@spiideo.com>
+ *
+ * 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.
+ *
+ */
+
+/* Using GValueArray for stats */
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
+#include <gst/check/gstcheck.h>
+#include <gst/check/gstharness.h>
+
+#include "../ext/srt/gstsrt-enums.h"
+
+static const gchar elements8 = { "srtsrc", "srtsink" };
+
+static void
+check_play (const gchar * src_uri,
+    GstSRTConnectionMode src_mode,
+    const gchar * sink_uri, GstSRTConnectionMode sink_mode)
+{
+  GstHarness *h_src, *h_sink;
+  GstStructure *stats;
+  gint64 packets_received;
+  GstBuffer *in_buf, *out_buf;
+  gchar *src_launchline, *sink_launchline;
+  GstElement *src_element;
+  guint8 data1316 = { 0 };
+
+  sink_launchline = g_strdup_printf ("srtsink uri=%s", sink_uri);
+  h_sink = gst_harness_new_parse (sink_launchline);
+  g_free (sink_launchline);
+
+  src_launchline = g_strdup_printf ("srtsrc name=src uri=%s", src_uri);
+  h_src = gst_harness_new_parse (src_launchline);
+  g_free (src_launchline);
+
+  gst_harness_set_src_caps_str (h_sink, "video/mpegts");
+
+  if (src_mode == GST_SRT_CONNECTION_MODE_LISTENER) {
+    fail_unless (gst_element_set_state (h_src->element,
+            GST_STATE_PLAYING) != GST_STATE_CHANGE_FAILURE);
+    fail_unless (gst_element_set_state (h_sink->element,
+            GST_STATE_PLAYING) != GST_STATE_CHANGE_FAILURE);
+  } else {
+    fail_unless (gst_element_set_state (h_sink->element,
+            GST_STATE_PLAYING) != GST_STATE_CHANGE_FAILURE);
+    fail_unless (gst_element_set_state (h_src->element,
+            GST_STATE_PLAYING) != GST_STATE_CHANGE_FAILURE);
+  }
+
+  in_buf = gst_buffer_new ();
+  gst_buffer_append_memory (in_buf,
+      gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY,
+          data, sizeof (data), 0, sizeof (data), NULL, NULL));
+  gst_harness_push (h_sink, in_buf);
+  out_buf = gst_harness_pull (h_src);
+
+  src_element = gst_bin_get_by_name (GST_BIN (h_src->element), "src");
+  g_object_get (src_element, "stats", &stats, NULL);
+  g_assert_cmpstr (gst_structure_get_name (stats), ==,
+      "application/x-srt-statistics");
+
+  if (src_mode == GST_SRT_CONNECTION_MODE_CALLER) {
+    fail_unless (gst_structure_get_int64 (stats,
+            "packets-received", &packets_received));
+    g_assert_cmpint (packets_received, ==, 1);
+  } else {
+    const GValue *array_value;
+    const GValue *value;
+    GValueArray *callers;
+    GstStructure *caller_stats;
+
+    fail_unless ((array_value = gst_structure_get_value (stats, "callers")));
+    callers = (GValueArray *) g_value_get_boxed (array_value);
+    value = g_value_array_get_nth (callers, 0);
+    caller_stats = GST_STRUCTURE (g_value_get_boxed (value));
+    fail_unless (gst_structure_get_int64 (caller_stats,
+            "packets-received", &packets_received));
+    g_assert_cmpint (packets_received, ==, 1);
+  }
+
+  gst_element_set_state (h_src->element, GST_STATE_NULL);
+  gst_element_set_state (h_sink->element, GST_STATE_NULL);
+
+  gst_buffer_unref (out_buf);
+  gst_structure_free (stats);
+  gst_object_unref (src_element);
+  gst_harness_teardown (h_src);
+  gst_harness_teardown (h_sink);
+}
+
+GST_START_TEST (test_create_and_unref)
+{
+  GstElement *e;
+
+  e = gst_element_factory_make (elements__i__, NULL);
+  g_assert_nonnull (e);
+
+  gst_element_set_state (e, GST_STATE_NULL);
+  gst_object_unref (e);
+
+  e = gst_element_factory_make (elements__i__, NULL);
+  g_assert_nonnull (e);
+
+  gst_element_set_state (e, GST_STATE_NULL);
+  gst_object_unref (e);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_uri_to_properties)
+{
+  GstElement *element;
+  gint latency = 0, poll_timeout = 0, mode = 0, pbkeylen = 0;
+  guint localport = 0;
+  gchar *streamid = NULL, *localaddress = NULL;
+
+  element = gst_element_factory_make (elements__i__, NULL);
+
+  /* Sets properties to non-default values (make sure this stays in sync) */
+  g_object_set (element, "uri", "srt://83.0.2.14:4847?"
+      "latency=300" "&mode=listener" "&streamid=the-stream-id"
+      "&pbkeylen=32" "&poll-timeout=500", NULL);
+
+  g_object_get (element,
+      "latency", &latency, "mode", &mode, "streamid", &streamid,
+      "pbkeylen", &pbkeylen, "poll-timeout", &poll_timeout,
+      "localport", &localport, "localaddress", &localaddress, NULL);
+
+  /* Make sure these values are in sync with the one from the URI. */
+  g_assert_cmpint (latency, ==, 300);
+  g_assert_cmpint (mode, ==, 2);
+  g_assert_cmpstr (streamid, ==, "the-stream-id");
+  g_assert_cmpint (pbkeylen, ==, 32);
+  g_assert_cmpint (poll_timeout, ==, 500);
+  g_assert_cmpstr (localaddress, ==, "83.0.2.14");
+  g_assert_cmpint (localport, ==, 4847);
+
+  g_free (streamid);
+  g_free (localaddress);
+  gst_object_unref (element);
+}
+
+GST_END_TEST;
+
+
+GST_START_TEST (test_src_caller_sink_listener)
+{
+  check_play ("srt://127.0.0.1:3434?mode=caller",
+      GST_SRT_CONNECTION_MODE_CALLER,
+      "srt://:3434?mode=listener", GST_SRT_CONNECTION_MODE_LISTENER);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_src_listener_sink_caller)
+{
+  check_play ("srt://:4242?mode=listener",
+      GST_SRT_CONNECTION_MODE_LISTENER,
+      "srt://127.0.0.1:4242?mode=caller", GST_SRT_CONNECTION_MODE_CALLER);
+}
+
+GST_END_TEST;
+
+static Suite *
+srt_suite (void)
+{
+  Suite *s = suite_create ("srt");
+  TCase *tc_chain = tcase_create ("general");
+
+  suite_add_tcase (s, tc_chain);
+  tcase_add_loop_test (tc_chain, test_create_and_unref, 0,
+      G_N_ELEMENTS (elements));
+  tcase_add_loop_test (tc_chain, test_uri_to_properties, 0,
+      G_N_ELEMENTS (elements));
+  tcase_add_test (tc_chain, test_src_caller_sink_listener);
+  tcase_add_test (tc_chain, test_src_listener_sink_caller);
+
+  return s;
+}
+
+GST_CHECK_MAIN (srt);

gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/unixfd.c Added

@@ -0,0 +1,240 @@
+/* GStreamer unix file-descriptor source/sink tests
+ *
+ * Copyright (C) 2023 Netflix Inc.
+ *  Author: Xavier Claessens <xavier.claessens@collabora.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/check/gstcheck.h>
+#include <gst/app/app.h>
+#include <glib/gstdio.h>
+
+static void
+wait_preroll (GstElement * element)
+{
+  GstStateChangeReturn state_res =
+      gst_element_set_state (element, GST_STATE_PLAYING);
+  fail_unless (state_res != GST_STATE_CHANGE_FAILURE);
+  state_res = gst_element_get_state (element, NULL, NULL, GST_CLOCK_TIME_NONE);
+  fail_unless (state_res == GST_STATE_CHANGE_SUCCESS);
+}
+
+static GstPadProbeReturn
+buffer_pad_probe_cb (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
+{
+  GstBuffer *buffer = GST_PAD_PROBE_INFO_BUFFER (info);
+  if (buffer != NULL) {
+    GstCustomMeta *cmeta =
+        gst_buffer_add_custom_meta (buffer, "unix-fd-custom-meta");
+    GstStructure *s = gst_custom_meta_get_structure (cmeta);
+    gst_structure_set (s, "field", G_TYPE_INT, 42, NULL);
+  }
+  return GST_PAD_PROBE_OK;
+}
+
+GST_START_TEST (test_unixfd_videotestsrc)
+{
+  GError *error = NULL;
+
+  const gchar *tags = { NULL };
+  gst_meta_register_custom ("unix-fd-custom-meta", tags, NULL, NULL, NULL);
+
+  /* Ensure we don't have socket from previous failed test */
+  gchar *socket_path =
+      g_strdup_printf ("%s/unixfd-test-socket", g_get_user_runtime_dir ());
+  if (g_file_test (socket_path, G_FILE_TEST_EXISTS)) {
+    g_unlink (socket_path);
+  }
+
+  /* Setup source */
+  gchar *pipeline_str =
+      g_strdup_printf ("videotestsrc name=src ! unixfdsink socket-path=%s",
+      socket_path);
+  GstElement *pipeline_service = gst_parse_launch (pipeline_str, &error);
+  g_assert_no_error (error);
+  g_free (pipeline_str);
+
+  /* Add a custom meta on each buffer */
+  GstElement *src = gst_bin_get_by_name (GST_BIN (pipeline_service), "src");
+  GstPad *pad = gst_element_get_static_pad (src, "src");
+  gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_BUFFER, buffer_pad_probe_cb, NULL,
+      NULL);
+  gst_object_unref (src);
+  gst_object_unref (pad);
+
+  wait_preroll (pipeline_service);
+
+  /* Setup sink */
+  pipeline_str =
+      g_strdup_printf ("unixfdsrc socket-path=%s ! fakesink name=sink",
+      socket_path);
+  GstElement *pipeline_client_1 = gst_parse_launch (pipeline_str, &error);
+  g_assert_no_error (error);
+  wait_preroll (pipeline_client_1);
+
+  /* disconnect, reconnect */
+  fail_unless (gst_element_set_state (pipeline_client_1,
+          GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS);
+  wait_preroll (pipeline_client_1);
+
+  /* Connect 2nd sink */
+  GstElement *pipeline_client_2 = gst_parse_launch (pipeline_str, &error);
+  g_assert_no_error (error);
+  wait_preroll (pipeline_client_2);
+
+  /* Check we received our custom meta */
+  GstSample *sample;
+  GstElement *sink = gst_bin_get_by_name (GST_BIN (pipeline_client_2), "sink");
+  g_object_get (sink, "last-sample", &sample, NULL);
+  fail_unless (sample);
+  GstBuffer *buffer = gst_sample_get_buffer (sample);
+  GstCustomMeta *cmeta =
+      gst_buffer_get_custom_meta (buffer, "unix-fd-custom-meta");
+  fail_unless (cmeta);
+  GstStructure *s = gst_custom_meta_get_structure (cmeta);
+  gint value;
+  fail_unless (gst_structure_get_int (s, "field", &value));
+  fail_unless_equals_int (value, 42);
+  gst_object_unref (sink);
+  gst_sample_unref (sample);
+
+  /* Teardown */
+  fail_unless (gst_element_set_state (pipeline_client_1,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS);
+  fail_unless (gst_element_set_state (pipeline_client_2,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS);
+  fail_unless (gst_element_set_state (pipeline_service,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS);
+  fail_if (g_file_test (socket_path, G_FILE_TEST_EXISTS));
+
+  gst_object_unref (pipeline_service);
+  gst_object_unref (pipeline_client_1);
+  gst_object_unref (pipeline_client_2);
+  g_free (socket_path);
+  g_free (pipeline_str);
+}
+
+GST_END_TEST;
+
+// Disable test_unixfd_segment for now, it's flaky and it's a problem with the test
+#if 0
+GST_START_TEST (test_unixfd_segment)
+{
+  GError *error = NULL;
+
+  /* Ensure we don't have socket from previous failed test */
+  gchar *socket_path =
+      g_strdup_printf ("%s/unixfd-test-socket", g_get_user_runtime_dir ());
+  if (g_file_test (socket_path, G_FILE_TEST_EXISTS)) {
+    g_unlink (socket_path);
+  }
+
+  GstCaps *caps = gst_caps_new_empty_simple ("video/x-raw");
+
+  /* Setup service */
+  gchar *pipeline_str =
+      g_strdup_printf
+      ("appsrc name=src format=time handle-segment-change=true ! unixfdsink socket-path=%s sync=false async=false",
+      socket_path);
+  GstElement *pipeline_service = gst_parse_launch (pipeline_str, &error);
+  g_assert_no_error (error);
+  fail_unless (gst_element_set_state (pipeline_service,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS);
+  GstElement *appsrc = gst_bin_get_by_name (GST_BIN (pipeline_service), "src");
+  gst_object_unref (appsrc);
+  g_free (pipeline_str);
+
+  /* Setup client */
+  pipeline_str =
+      g_strdup_printf
+      ("unixfdsrc socket-path=%s ! appsink name=sink sync=false async=false",
+      socket_path);
+  GstElement *pipeline_client = gst_parse_launch (pipeline_str, &error);
+  g_assert_no_error (error);
+  fail_unless (gst_element_set_state (pipeline_client,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS);
+  GstElement *appsink = gst_bin_get_by_name (GST_BIN (pipeline_client), "sink");
+  gst_object_unref (appsink);
+  g_free (pipeline_str);
+
+  /* Send a buffer with PTS=30s */
+  GstSegment segment;
+  gst_segment_init (&segment, GST_FORMAT_TIME);
+  GstBuffer *buf = gst_buffer_new ();
+  GST_BUFFER_PTS (buf) = 30 * GST_SECOND;
+  GstSample *sample = gst_sample_new (buf, caps, &segment, NULL);
+  gst_app_src_push_sample (GST_APP_SRC (appsrc), sample);
+  gst_sample_unref (sample);
+  gst_buffer_unref (buf);
+
+  /* Wait for it */
+  sample = gst_app_sink_pull_sample (GST_APP_SINK (appsink));
+  buf = gst_sample_get_buffer (sample);
+  GstClockTime first_pts = GST_BUFFER_PTS (buf);
+  gst_sample_unref (sample);
+
+  /* Send a buffer with PTS=1s but with 30s offset in the segment */
+  segment.base = 30 * GST_SECOND;
+  buf = gst_buffer_new ();
+  GST_BUFFER_PTS (buf) = 1 * GST_SECOND;
+  sample = gst_sample_new (buf, caps, &segment, NULL);
+  gst_app_src_push_sample (GST_APP_SRC (appsrc), sample);
+  gst_sample_unref (sample);
+  gst_buffer_unref (buf);
+
+  /* Wait for it */
+  sample = gst_app_sink_pull_sample (GST_APP_SINK (appsink));
+  buf = gst_sample_get_buffer (sample);
+  GstClockTime second_pts = GST_BUFFER_PTS (buf);
+  gst_sample_unref (sample);
+
+  /* They should be 1s appart */
+  fail_unless_equals_uint64 (second_pts - first_pts, GST_SECOND);
+
+  /* Teardown */
+  fail_unless (gst_element_set_state (pipeline_client,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS);
+  fail_unless (gst_element_set_state (pipeline_service,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS);
+  gst_object_unref (pipeline_service);
+  gst_object_unref (pipeline_client);
+  g_free (socket_path);
+  gst_caps_unref (caps);
+}
+
+GST_END_TEST;
+#endif
+
+static Suite *
+unixfd_suite (void)
+{
+  Suite *s = suite_create ("unixfd");
+  TCase *tc = tcase_create ("unixfd");
+
+  suite_add_tcase (s, tc);
+  tcase_add_test (tc, test_unixfd_videotestsrc);
+  //tcase_add_test (tc, test_unixfd_segment);
+
+  return s;
+}
+
+GST_CHECK_MAIN (unixfd);

gst-plugins-bad-1.22.7.tar.xz/tests/check/elements/webrtcbin.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/elements/webrtcbin.c Changed

@@ -845,7 +845,7 @@
   g_mutex_lock (&t->lock);
   g_object_get (t->webrtc1, "ice-gathering-state", &ice_state1, NULL);
   g_object_get (t->webrtc2, "ice-gathering-state", &ice_state2, NULL);
-  while (ice_state1 != GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE &&
+  while (ice_state1 != GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE ||
       ice_state2 != GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE) {
     g_cond_wait (&t->cond, &t->lock);
     g_object_get (t->webrtc1, "ice-gathering-state", &ice_state1, NULL);
@@ -1211,6 +1211,9 @@
   guint port_as_int;
   guint peer_number;
 
+  if (!candidate || candidate0 == '\0')
+    return;
+
   regex =
       g_regex_new ("candidate:(\\d+) (1) (UDP|TCP) (\\d+) (0-9.+|0-9a-f:+)"
       " (\\d+) typ (a-z+)", 0, 0, NULL);
@@ -1677,6 +1680,18 @@
   g_free (protocol);
 }
 
+static void
+validate_peer_connection_stats (const GstStructure * s)
+{
+  guint opened, closed;
+
+  fail_unless (gst_structure_get (s, "data-channels-opened", G_TYPE_UINT,
+          &opened, NULL));
+  fail_unless (gst_structure_get (s, "data-channels-closed", G_TYPE_UINT,
+          &closed, NULL));
+  fail_unless (opened >= closed);
+}
+
 static gboolean
 validate_stats_foreach (GQuark field_id, const GValue * value,
     const GstStructure * stats)
@@ -1705,6 +1720,7 @@
     validate_remote_outbound_rtp_stats (s, stats);
   } else if (type == GST_WEBRTC_STATS_CSRC) {
   } else if (type == GST_WEBRTC_STATS_PEER_CONNECTION) {
+    validate_peer_connection_stats (s);
   } else if (type == GST_WEBRTC_STATS_DATA_CHANNEL) {
   } else if (type == GST_WEBRTC_STATS_STREAM) {
   } else if (type == GST_WEBRTC_STATS_TRANSPORT) {
@@ -5771,6 +5787,131 @@
 
 GST_END_TEST;
 
+static void
+_check_ice_end_of_candidates (struct test_webrtc *t, GstElement * element,
+    guint mlineindex, gchar * candidate, GstElement * other, gpointer user_data)
+{
+  gint *end_count = user_data;
+
+  if (!candidate || candidate0 == '\0') {
+    g_atomic_int_inc (end_count);
+  }
+}
+
+static void
+sdp_media_has_end_of_candidates (struct test_webrtc *t, GstElement * element,
+    GstWebRTCSessionDescription * desc, gpointer user_data)
+{
+  guint i;
+
+  for (i = 0; i < gst_sdp_message_medias_len (desc->sdp); i++) {
+    const GstSDPMedia *media = gst_sdp_message_get_media (desc->sdp, i);
+
+    fail_unless_equals_string (gst_sdp_media_get_attribute_val_n (media,
+            "end-of-candidates", 0), "");
+
+    fail_unless (gst_sdp_media_get_attribute_val_n (media, "end-of-candidates",
+            1) == NULL);
+  }
+}
+
+GST_START_TEST (test_ice_end_of_candidates)
+{
+  struct test_webrtc *t = create_audio_test ();
+  GstWebRTCSessionDescription *local_desc;
+  gint end_candidate_count = 0;
+
+  VAL_SDP_INIT (offer, _count_num_sdp_media, GUINT_TO_POINTER (1), NULL);
+  VAL_SDP_INIT (answer, _count_num_sdp_media, GUINT_TO_POINTER (1), NULL);
+
+
+  t->on_ice_candidate = _check_ice_end_of_candidates;
+  t->ice_candidate_data = &end_candidate_count;
+  test_validate_sdp (t, &offer, &answer);
+
+  test_webrtc_wait_for_ice_gathering_complete (t);
+
+  fail_unless_equals_int (end_candidate_count, 2);
+
+  g_object_get (t->webrtc1, "current-local-description", &local_desc, NULL);
+  sdp_media_has_end_of_candidates (t, t->webrtc1, local_desc, NULL);
+  gst_webrtc_session_description_free (local_desc);
+
+  test_webrtc_free (t);
+}
+
+GST_END_TEST;
+
+static void
+_set_setup_session_attr_on_answer (struct test_webrtc *t, GstElement * element,
+    GstPromise * promise, gpointer user_data)
+{
+  GstSDPMessage *sdp;
+  GstSDPMessage *modified_sdp = NULL;
+  const GstSDPMedia *media;
+  GstSDPMedia *modified_media;
+  const gchar *attr;
+
+  if (TEST_IS_OFFER_ELEMENT (t, element))
+    return;
+
+  sdp = t->answer_desc->sdp;
+  media = gst_sdp_message_get_media (sdp, 0);
+  attr = gst_sdp_media_get_attribute_val (media, "setup");
+
+  /* Remove the setup attribute from first media */
+  gst_sdp_media_copy (media, &modified_media);
+  for (unsigned index = 0;
+      index < gst_sdp_media_attributes_len (modified_media); index++) {
+    const GstSDPAttribute *current =
+        gst_sdp_media_get_attribute (modified_media, index);
+    if (!g_str_equal (current->key, "setup"))
+      continue;
+    gst_sdp_media_remove_attribute (modified_media, index);
+    break;
+  }
+
+  gst_sdp_message_copy (sdp, &modified_sdp);
+
+  /* Add session-level setup attribute to modified answer */
+  gst_sdp_message_add_attribute (modified_sdp, "setup", attr);
+
+  /* Replace first media of answer with a media without session attribute */
+  gst_sdp_message_remove_media (modified_sdp, 0);
+  gst_sdp_message_add_media (modified_sdp, modified_media);
+  gst_sdp_media_free (modified_media);
+
+  gst_sdp_message_free (sdp);
+  t->answer_desc->sdp = modified_sdp;
+}
+
+static void
+_offer_created_do_nothing (struct test_webrtc *t, GstElement * element,
+    GstPromise * promise, gpointer user_data)
+{
+}
+
+GST_START_TEST (test_sdp_session_setup_attribute)
+{
+  struct test_webrtc *t = create_audio_test ();
+
+  t->on_offer_created = _offer_created_do_nothing;
+  t->on_answer_created = _set_setup_session_attr_on_answer;
+
+  fail_if (gst_element_set_state (t->webrtc1, GST_STATE_READY) ==
+      GST_STATE_CHANGE_FAILURE);
+  fail_if (gst_element_set_state (t->webrtc2, GST_STATE_READY) ==
+      GST_STATE_CHANGE_FAILURE);
+  test_webrtc_create_offer (t);
+  test_webrtc_wait_for_state_mask (t, 1 << STATE_ANSWER_SET);
+
+  test_webrtc_wait_for_ice_gathering_complete (t);
+
+  test_webrtc_free (t);
+}
+
+GST_END_TEST;
+
 static Suite *
 webrtcbin_suite (void)
 {
@@ -5836,6 +5977,8 @@
     tcase_add_test (tc, test_invalid_add_media_in_answer);
     tcase_add_test (tc, test_add_turn_server);
     tcase_add_test (tc, test_msid);
+    tcase_add_test (tc, test_ice_end_of_candidates);
+    tcase_add_test (tc, test_sdp_session_setup_attribute);
     if (sctpenc && sctpdec) {
       tcase_add_test (tc, test_data_channel_create);
       tcase_add_test (tc, test_data_channel_create_two_channels);

gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/analyticsmeta.c Added

@@ -0,0 +1,984 @@
+/* GStreamer
+ * Copyright (C) 2022 Collabora Ltd
+ *
+ * analyticmeta.c
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gst/check/gstcheck.h>
+#include <gst/analytics/analytics.h>
+
+GST_START_TEST (test_add_classification_meta)
+{
+  /* Verify we can create a relation metadata
+   * and attach it classification mtd
+   */
+  GstBuffer *buf;
+  GstAnalyticsRelationMeta *rmeta;
+  GstAnalyticsClsMtd cls_mtd;
+  gfloat conf_lvl = { 0.5f, 0.5f };
+  GQuark class_quarks2;
+  gboolean ret;
+
+  class_quarks0 = g_quark_from_string ("dog");
+  class_quarks1 = g_quark_from_string ("cat");
+
+  buf = gst_buffer_new ();
+  rmeta = gst_buffer_add_analytics_relation_meta (buf);
+  ret = gst_analytics_relation_meta_add_cls_mtd (rmeta, 2, conf_lvl,
+      class_quarks, &cls_mtd);
+  fail_unless (ret == TRUE);
+  gst_buffer_unref (buf);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_meta_pooled)
+{
+  GstBufferPool *pool;
+  GstStructure *config;
+  GstBuffer *buf;
+  GstAnalyticsRelationMeta *rmeta1, *rmeta2;
+
+  pool = gst_buffer_pool_new ();
+  config = gst_buffer_pool_get_config (pool);
+  gst_buffer_pool_config_set_params (config, NULL, 1, 1, 1);
+  gst_buffer_pool_set_config (pool, config);
+  gst_buffer_pool_set_active (pool, TRUE);
+
+  gst_buffer_pool_acquire_buffer (pool, &buf, NULL);
+  rmeta1 = gst_buffer_add_analytics_relation_meta (buf);
+  gst_buffer_unref (buf);
+
+  gst_buffer_pool_acquire_buffer (pool, &buf, NULL);
+
+  rmeta2 = gst_buffer_add_analytics_relation_meta (buf);
+
+  fail_unless (rmeta1 == rmeta2);
+  gst_buffer_unref (buf);
+  gst_object_unref (pool);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_classification_meta_classes)
+{
+  /* Verify we can retrieve classification data
+   * from the relation metadata
+   */
+  GstBuffer *buf;
+  GstAnalyticsRelationMeta *rmeta;
+  gboolean ret;
+  GQuark class_quarks2;
+  GstAnalyticsClsMtd cls_mtd, cls_mtd2;
+
+  class_quarks0 = g_quark_from_string ("dog");
+  class_quarks1 = g_quark_from_string ("cat");
+
+  buf = gst_buffer_new ();
+  rmeta = gst_buffer_add_analytics_relation_meta (buf);
+  gfloat conf_lvl = { 0.6f, 0.4f };
+  ret = gst_analytics_relation_meta_add_cls_mtd (rmeta, 2, conf_lvl,
+      class_quarks, &cls_mtd);
+  fail_unless (ret == TRUE);
+  fail_unless (gst_analytics_relation_get_length (rmeta) == 1);
+
+  gint dogIndex = gst_analytics_cls_mtd_get_index_by_quark (&cls_mtd,
+      class_quarks0);
+  fail_unless (dogIndex == 0);
+  gfloat confLvl = gst_analytics_cls_mtd_get_level (&cls_mtd, dogIndex);
+  GST_LOG ("dog:%f", confLvl);
+  assert_equals_float (confLvl, 0.6f);
+
+  gint catIndex = gst_analytics_cls_mtd_get_index_by_quark (&cls_mtd,
+      g_quark_from_string ("cat"));
+  confLvl = gst_analytics_cls_mtd_get_level (&cls_mtd, catIndex);
+  GST_LOG ("Cat:%f", confLvl);
+  assert_equals_float (confLvl, 0.4f);
+  assert_equals_int (gst_analytics_mtd_get_id ((GstAnalyticsMtd *) & cls_mtd),
+      0);
+
+  conf_lvl0 = 0.1f;
+  conf_lvl1 = 0.9f;
+  ret =
+      gst_analytics_relation_meta_add_cls_mtd (rmeta, 2, conf_lvl,
+      class_quarks, &cls_mtd2);
+  fail_unless (ret == TRUE);
+  fail_unless (gst_analytics_relation_get_length (rmeta) == 2);
+
+  dogIndex = gst_analytics_cls_mtd_get_index_by_quark (&cls_mtd2,
+      class_quarks0);
+  confLvl = gst_analytics_cls_mtd_get_level (&cls_mtd2, dogIndex);
+  assert_equals_float (confLvl, 0.1f);
+
+  catIndex = gst_analytics_cls_mtd_get_index_by_quark (&cls_mtd2,
+      class_quarks0);
+  confLvl = gst_analytics_cls_mtd_get_level (&cls_mtd2, catIndex);
+  assert_equals_float (confLvl, 0.1f);
+
+  /* Verify the relation meta contain the correct number of relatable metadata */
+  fail_unless (gst_analytics_relation_get_length (rmeta) == 2);
+
+  /* Verify first relatable metadata has the correct id. */
+  assert_equals_int (gst_analytics_mtd_get_id ((GstAnalyticsMtd *) & cls_mtd),
+      0);
+
+  /* Verify second relatable metadata has the correct id. */
+  assert_equals_int (gst_analytics_mtd_get_id (
+          (GstAnalyticsMtd *) & cls_mtd2), 1);
+
+  gst_buffer_unref (buf);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_add_relation_meta)
+{
+  /* Verify we set a relation between relatable metadata. */
+
+  GstBuffer *buf;
+  GstAnalyticsClsMtd cls_mtd3;
+  GstAnalyticsRelationMetaInitParams init_params = { 5, 150 };
+  GstAnalyticsRelationMeta *relations;
+  GQuark class_quarks2;
+  gboolean ret;
+
+  buf = gst_buffer_new ();
+  relations = gst_buffer_add_analytics_relation_meta_full (buf, &init_params);
+
+  gfloat conf_lvl = { 0.6f, 0.4f };
+  class_quarks0 = g_quark_from_string ("dog");
+  class_quarks1 = g_quark_from_string ("cat");
+
+  ret = gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd0);
+  fail_unless (ret == TRUE);
+  gst_analytics_mtd_get_id ((GstAnalyticsMtd *)
+      & cls_mtd0);
+
+  conf_lvl0 = 0.6f;
+  conf_lvl1 = 0.4f;
+
+  class_quarks0 = g_quark_from_string ("plant");
+  class_quarks1 = g_quark_from_string ("animal");
+
+
+  ret = gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd1);
+  gst_analytics_mtd_get_id ((GstAnalyticsMtd *)
+      & cls_mtd1);
+
+  fail_unless (gst_analytics_relation_meta_set_relation (relations,
+          GST_ANALYTICS_REL_TYPE_IS_PART_OF, cls_mtd0.id,
+          cls_mtd1.id) == TRUE);
+
+  gst_buffer_unref (buf);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_add_relation_inefficiency_reporting_cases)
+{
+  /*
+   * Verify inefficiency of relation order is reported.
+   */
+  GstBuffer *buf;
+  GstAnalyticsClsMtd cls_mtd3;
+  GstAnalyticsRelationMetaInitParams init_params = { 2, 10 };
+  GstAnalyticsRelationMeta *relations;
+  gboolean ret;
+  GQuark class_quarks2;
+
+
+  buf = gst_buffer_new ();
+  relations = gst_buffer_add_analytics_relation_meta_full (buf, &init_params);
+
+  gfloat conf_lvl = { 0.6f, 0.4f };
+
+  class_quarks0 = g_quark_from_string ("dog");
+  class_quarks1 = g_quark_from_string ("cat");
+
+  ret = gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd0);
+  fail_unless (gst_analytics_relation_get_length (relations) == 1);
+  fail_unless (ret == TRUE);
+
+  conf_lvl0 = 0.6f;
+  conf_lvl1 = 0.4f;
+  class_quarks0 = g_quark_from_string ("plant");
+  class_quarks1 = g_quark_from_string ("animal");
+
+  ret = gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd1);
+  fail_unless (gst_analytics_relation_get_length (relations) == 2);
+  fail_unless (ret == TRUE);
+
+  conf_lvl0 = 0.6f;
+  conf_lvl1 = 0.4f;
+  class_quarks0 = g_quark_from_string ("male");
+  class_quarks1 = g_quark_from_string ("female");
+
+  ret = gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd2);
+  fail_unless (gst_analytics_relation_get_length (relations) == 3);
+  fail_unless (ret == TRUE);
+
+  fail_unless (gst_analytics_relation_meta_set_relation (relations,
+          GST_ANALYTICS_REL_TYPE_IS_PART_OF, cls_mtd0.id, cls_mtd1.id)
+      == TRUE);
+  fail_unless (gst_analytics_relation_meta_set_relation (relations,
+          GST_ANALYTICS_REL_TYPE_IS_PART_OF, cls_mtd0.id, cls_mtd2.id)
+      == TRUE);
+
+  gst_buffer_unref (buf);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_query_relation_meta_cases)
+{
+  /* Verify we can query existence of direct and indirect relation */
+  GstBuffer *buf;
+  GstAnalyticsClsMtd cls_mtd3;
+  GstAnalyticsRelationMetaInitParams init_params = { 2, 150 };
+  GstAnalyticsRelationMeta *relations;
+  gboolean ret;
+  GQuark class_quarks2;
+
+  buf = gst_buffer_new ();
+  relations = gst_buffer_add_analytics_relation_meta_full (buf, &init_params);
+
+  gfloat conf_lvl = { 0.6f, 0.4f };
+
+  class_quarks0 = g_quark_from_string ("dog");
+  class_quarks1 = g_quark_from_string ("cat");
+
+  ret = gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd0);
+  fail_unless (ret == TRUE);
+
+  conf_lvl0 = 0.6f;
+  conf_lvl1 = 0.4f;
+  class_quarks0 = g_quark_from_string ("plant");
+  class_quarks1 = g_quark_from_string ("animal");
+
+  ret = gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd1);
+  fail_unless (ret == TRUE);
+
+  conf_lvl0 = 0.6f;
+  conf_lvl1 = 0.4f;
+  class_quarks0 = g_quark_from_string ("male");
+  class_quarks1 = g_quark_from_string ("female");
+
+  ret = gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd2);
+  fail_unless (ret == TRUE);
+
+  // Pet is part of kingdom
+  gst_analytics_relation_meta_set_relation (relations,
+      GST_ANALYTICS_REL_TYPE_IS_PART_OF, cls_mtd0.id, cls_mtd1.id);
+
+  // Kingdom contain pet
+  gst_analytics_relation_meta_set_relation (relations,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, cls_mtd1.id, cls_mtd0.id);
+
+  // Pet contain gender
+  gst_analytics_relation_meta_set_relation (relations,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, cls_mtd0.id, cls_mtd2.id);
+
+  /* Query if pet relate kingdom through a IS_PART relation with a maximum
+   * relation span of 1. Max relation span of 1 mean they directly related.*/
+  gboolean exist = gst_analytics_relation_meta_exist (relations, cls_mtd0.id,
+      cls_mtd1.id, 1, GST_ANALYTICS_REL_TYPE_IS_PART_OF, NULL);
+  fail_unless (exist == TRUE);
+
+  /* Query if pet relate to gender through a IS_PART relation. */
+  exist = gst_analytics_relation_meta_exist (relations, cls_mtd0.id,
+      cls_mtd2.id, 1, GST_ANALYTICS_REL_TYPE_IS_PART_OF, NULL);
+  fail_unless (exist == FALSE);
+
+  /* Query if pet relate to kingdom through a CONTAIN relation. */
+  exist = gst_analytics_relation_meta_exist (relations, cls_mtd0.id,
+      cls_mtd1.id, 1, GST_ANALYTICS_REL_TYPE_CONTAIN, NULL);
+  fail_unless (exist == FALSE);
+
+  GstAnalyticsRelTypes cond =
+      GST_ANALYTICS_REL_TYPE_IS_PART_OF | GST_ANALYTICS_REL_TYPE_CONTAIN |
+      GST_ANALYTICS_REL_TYPE_RELATE_TO;
+
+  /* Query if pet relate to gender through IS_PART or CONTAIN or
+   * RELATE_TO relation. */
+  exist = gst_analytics_relation_meta_exist (relations, cls_mtd0.id,
+      cls_mtd2.id, 1, cond, NULL);
+  fail_unless (exist == TRUE);
+
+  /* Query if pet relate to kindom through CONTAIN or RELATE_TO relation */
+  cond = GST_ANALYTICS_REL_TYPE_CONTAIN | GST_ANALYTICS_REL_TYPE_RELATE_TO;
+  exist = gst_analytics_relation_meta_exist (relations, cls_mtd0.id,
+      cls_mtd1.id, 1, cond, NULL);
+  fail_unless (exist == FALSE);
+
+  /* Query if kingdom relate to gender through a CONTAIN relation with a maximum
+   * relation span of 1. */
+  exist = gst_analytics_relation_meta_exist (relations, cls_mtd1.id,
+      cls_mtd2.id, 1, GST_ANALYTICS_REL_TYPE_CONTAIN, NULL);
+
+  /* We expect this to fail because kingdom relate to gender CONTAIN relations
+   * but indirectly (via pet) and we set the max relation span to 1*/
+  fail_unless (exist == FALSE);
+
+  /* Same has previous check but using INFINIT relation span */
+  exist = gst_analytics_relation_meta_exist (relations, cls_mtd1.id,
+      cls_mtd2.id, GST_INF_RELATION_SPAN, GST_ANALYTICS_REL_TYPE_CONTAIN,
+      NULL);
+  fail_unless (exist == TRUE);
+
+  exist = gst_analytics_relation_meta_exist (relations, cls_mtd2.id,
+      cls_mtd1.id, GST_INF_RELATION_SPAN, GST_ANALYTICS_REL_TYPE_CONTAIN,
+      NULL);
+  fail_unless (exist == FALSE);
+
+  gst_buffer_unref (buf);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_path_relation_meta)
+{
+  /* Verify we can retrieve relation path */
+  GstBuffer *buf;
+  GstAnalyticsClsMtd cls_mtd3;
+  GstAnalyticsRelationMetaInitParams init_params = { 2, 150 };
+  GstAnalyticsRelationMeta *relations;
+  gboolean ret;
+  GQuark class_quarks2;
+
+  buf = gst_buffer_new ();
+  relations = gst_buffer_add_analytics_relation_meta_full (buf, &init_params);
+
+  gfloat conf_lvl = { 0.6f, 0.4f };
+  class_quarks0 = g_quark_from_string ("dog");
+  class_quarks1 = g_quark_from_string ("cat");
+
+  ret = gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd0);
+  fail_unless (ret == TRUE);
+  fail_unless (cls_mtd0.id == 0);
+
+  conf_lvl0 = 0.6f;
+  conf_lvl1 = 0.4f;
+  class_quarks0 = g_quark_from_string ("plant");
+  class_quarks1 = g_quark_from_string ("animal");
+
+  ret = gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd1);
+  fail_unless (ret == TRUE);
+  fail_unless (cls_mtd1.id == 1);
+
+  conf_lvl0 = 0.6f;
+  conf_lvl1 = 0.4f;
+  class_quarks0 = g_quark_from_string ("male");
+  class_quarks1 = g_quark_from_string ("female");
+
+  ret = gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd2);
+  fail_unless (ret == TRUE);
+  fail_unless (cls_mtd2.id == 2);
+
+  // Pet is part of kingdom
+  gst_analytics_relation_meta_set_relation (relations,
+      GST_ANALYTICS_REL_TYPE_IS_PART_OF, cls_mtd0.id, cls_mtd1.id);
+
+  // Kingdom contain pet
+  gst_analytics_relation_meta_set_relation (relations,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, cls_mtd1.id, cls_mtd0.id);
+
+  // Pet contain gender
+  gst_analytics_relation_meta_set_relation (relations,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, cls_mtd0.id, cls_mtd2.id);
+
+  GArray *path = NULL;
+  GstAnalyticsRelTypes cond = GST_ANALYTICS_REL_TYPE_CONTAIN;
+  gboolean exist = gst_analytics_relation_meta_exist (relations, cls_mtd0.id,
+      cls_mtd2.id, GST_INF_RELATION_SPAN, cond, &path);
+  if (exist) {
+    fail_unless (path != NULL);
+    gint i;
+    guint path_check_ids = { 0, 2 };
+    fail_unless (path->len == 2);
+    for (i = 0; i < path->len; i++) {
+      fail_unless (path_check_idsi == g_array_index (path, guint, i));
+    }
+    g_array_free (g_steal_pointer (&path), TRUE);
+    fail_unless (i == 2);
+  }
+
+  cond = GST_ANALYTICS_REL_TYPE_CONTAIN;
+  exist = gst_analytics_relation_meta_exist (relations, cls_mtd1.id,
+      cls_mtd2.id, GST_INF_RELATION_SPAN, cond, &path);
+  if (exist) {
+    gint i;
+    guint path_check_ids = { 1, 0, 2 };
+    fail_unless (path != NULL);
+    fail_unless (path->len == 3);
+    for (i = 0; i < path->len; i++) {
+      fail_unless (path_check_idsi == g_array_index (path, guint, i));
+    }
+    g_array_free (g_steal_pointer (&path), TRUE);
+    fail_unless (i == 3);
+  }
+  gst_buffer_unref (buf);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_cyclic_relation_meta)
+{
+  /* Verify we can discover cycle in relation and not report multiple time
+   * the same node and get into an infinit exploration */
+
+  GstBuffer *buf;
+  GstAnalyticsClsMtd cls_mtd3;
+  GstAnalyticsRelationMetaInitParams init_params = { 2, 150 };
+  GstAnalyticsRelationMeta *relations;
+  gfloat conf_lvl2;
+  GQuark class_quarks2;
+
+  class_quarks0 = g_quark_from_string ("attr1");
+  class_quarks1 = g_quark_from_string ("attr2");
+
+  buf = gst_buffer_new ();
+  relations = gst_buffer_add_analytics_relation_meta_full (buf, &init_params);
+
+  conf_lvl0 = 0.5f;
+  conf_lvl1 = 0.5f;
+  gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd0);
+
+  gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd1);
+
+  gst_analytics_relation_meta_add_cls_mtd (relations, 2, conf_lvl,
+      class_quarks, &cls_mtd2);
+
+  // (0) -> (1)
+  gst_analytics_relation_meta_set_relation (relations,
+      GST_ANALYTICS_REL_TYPE_IS_PART_OF, cls_mtd0.id, cls_mtd1.id);
+
+  // (1)->(2)
+  gst_analytics_relation_meta_set_relation (relations,
+      GST_ANALYTICS_REL_TYPE_IS_PART_OF, cls_mtd1.id, cls_mtd2.id);
+
+  // (2) -> (0)
+  gst_analytics_relation_meta_set_relation (relations,
+      GST_ANALYTICS_REL_TYPE_IS_PART_OF, cls_mtd2.id, cls_mtd0.id);
+
+  GArray *path = NULL;
+  GstAnalyticsRelTypes cond = GST_ANALYTICS_REL_TYPE_CONTAIN;
+  gboolean exist = gst_analytics_relation_meta_exist (relations, cls_mtd0.id,
+      cls_mtd2.id, GST_INF_RELATION_SPAN, cond, &path);
+  fail_unless (exist == FALSE);
+
+  cond = GST_ANALYTICS_REL_TYPE_IS_PART_OF;
+  exist =
+      gst_analytics_relation_meta_exist (relations, cls_mtd0.id,
+      cls_mtd2.id, GST_INF_RELATION_SPAN, cond, &path);
+  fail_unless (exist == TRUE);
+  if (exist) {
+    gint i;
+    guint path_ids = { 0, 1, 2 };
+    fail_unless (path->len == 3);
+    for (i = 0; i < path->len; i++) {
+      fail_unless (path_idsi == g_array_index (path, guint, i));
+    }
+    g_array_free (g_steal_pointer (&path), TRUE);
+    fail_unless (i == 3);
+  }
+
+  gst_buffer_unref (buf);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_add_od_meta)
+{
+  /* Verity we can add Object Detection relatable metadata to a relation
+   * metadata */
+  GstBuffer *buf;
+  GstAnalyticsRelationMetaInitParams init_params = { 5, 150 };
+  GstAnalyticsRelationMeta *rmeta;
+  GstAnalyticsODMtd od_mtd;
+  gboolean ret;
+  buf = gst_buffer_new ();
+
+  rmeta = gst_buffer_add_analytics_relation_meta_full (buf, &init_params);
+
+  GQuark type = g_quark_from_string ("dog");
+  gint x = 20;
+  gint y = 20;
+  gint w = 10;
+  gint h = 15;
+  gfloat loc_conf_lvl = 0.6f;
+  ret = gst_analytics_relation_meta_add_od_mtd (rmeta, type, x, y,
+      w, h, loc_conf_lvl, &od_mtd);
+  fail_unless (ret == TRUE);
+  gst_buffer_unref (buf);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_od_meta_fields)
+{
+  /* Verify we can readback fields of object detection metadata */
+  GstBuffer *buf;
+  GstAnalyticsRelationMetaInitParams init_params = { 5, 150 };
+  GstAnalyticsRelationMeta *rmeta;
+  GstAnalyticsODMtd od_mtd;
+  gboolean ret;
+  buf = gst_buffer_new ();
+
+  rmeta = gst_buffer_add_analytics_relation_meta_full (buf, &init_params);
+
+  GQuark type = g_quark_from_string ("dog");
+  gint x = 21;
+  gint y = 20;
+  gint w = 10;
+  gint h = 15;
+  gfloat loc_conf_lvl = 0.6f;
+  ret = gst_analytics_relation_meta_add_od_mtd (rmeta, type, x, y,
+      w, h, loc_conf_lvl, &od_mtd);
+
+  fail_unless (ret == TRUE);
+
+  gint _x, _y, _w, _h;
+  gfloat _loc_conf_lvl;
+  gst_analytics_od_mtd_get_location (&od_mtd, &_x, &_y, &_w, &_h,
+      &_loc_conf_lvl);
+
+  fail_unless (_x == x);
+  fail_unless (_y == y);
+  fail_unless (_w == w);
+  fail_unless (_h == h);
+  fail_unless (_loc_conf_lvl == loc_conf_lvl);
+
+  _loc_conf_lvl = -200.0;       // dirty this var by setting invalid value.
+  gst_analytics_od_mtd_get_confidence_lvl (&od_mtd, &_loc_conf_lvl);
+
+  fail_unless (_loc_conf_lvl == loc_conf_lvl);
+
+  gst_buffer_unref (buf);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_od_cls_relation)
+{
+  /* Verify we can add a object detection and classification metadata to
+   * a relation metadata */
+
+  GstBuffer *buf;
+  GstAnalyticsClsMtd cls_mtd;
+  GstAnalyticsODMtd od_mtd;
+  /* We intentionally set buffer small than required to verify sanity
+   * with re-allocation */
+  GstAnalyticsRelationMetaInitParams init_params = { 5, 150 };
+  GstAnalyticsRelationMeta *rmeta;
+  gboolean ret;
+  GArray *path = NULL;
+  gboolean exist;
+  gint _x, _y, _w, _h;
+  gfloat _loc_conf_lvl;
+  GQuark class_quarks2;
+
+  buf = gst_buffer_new ();
+  rmeta = gst_buffer_add_analytics_relation_meta_full (buf, &init_params);
+
+  gfloat conf_lvl = { 0.7f, 0.3f };
+  class_quarks0 = g_quark_from_string ("dog");
+  class_quarks1 = g_quark_from_string ("cat");
+
+  gst_analytics_relation_meta_add_cls_mtd (rmeta, 2, conf_lvl,
+      class_quarks, &cls_mtd);
+
+  GQuark type = g_quark_from_string ("dog");
+  gint x = 21;
+  gint y = 20;
+  gint w = 10;
+  gint h = 15;
+  gfloat loc_conf_lvl = 0.6f;
+  gst_analytics_relation_meta_add_od_mtd (rmeta, type, x, y, w, h,
+      loc_conf_lvl, &od_mtd);
+
+  ret = gst_analytics_relation_meta_set_relation (rmeta,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, od_mtd.id, cls_mtd.id);
+  fail_unless (ret == TRUE);
+
+  ret = gst_analytics_relation_meta_set_relation (rmeta,
+      GST_ANALYTICS_REL_TYPE_IS_PART_OF, cls_mtd.id, od_mtd.id);
+  fail_unless (ret == TRUE);
+
+  /* Verify OD relate to CLS only through a CONTAIN relation */
+  exist = gst_analytics_relation_meta_exist (rmeta,
+      od_mtd.id, cls_mtd.id, GST_INF_RELATION_SPAN,
+      GST_ANALYTICS_REL_TYPE_IS_PART_OF, NULL);
+  fail_unless (exist == FALSE);
+
+  exist = gst_analytics_relation_meta_exist (rmeta,
+      od_mtd.id, cls_mtd.id, GST_INF_RELATION_SPAN,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, &path);
+  fail_unless (exist == TRUE);
+
+  /* Query the relation path and verify it is correct */
+  guint ids2;
+  gint i;
+  fail_unless (path->len == 2);
+  for (i = 0; i < path->len; i++) {
+    idsi = g_array_index (path, guint, i);
+    GST_LOG ("id=%u", idsi);
+  }
+  g_array_free (g_steal_pointer (&path), TRUE);
+  fail_unless (ids0 == 1);
+  fail_unless (ids1 == 0);
+
+  GstAnalyticsMtd rlt_mtd;
+  exist = gst_analytics_relation_meta_get_mtd (rmeta, ids0, 0, &rlt_mtd);
+  fail_unless (exist == TRUE);
+
+  GstAnalyticsMtdType mtd_type = gst_analytics_mtd_get_mtd_type (&rlt_mtd);
+
+  /* Verify relatable meta with id == 1 is of type Object Detection */
+  fail_unless (mtd_type == gst_analytics_od_mtd_get_mtd_type ());
+
+  gst_analytics_od_mtd_get_location ((GstAnalyticsODMtd *) & rlt_mtd, &_x, &_y,
+      &_w, &_h, &_loc_conf_lvl);
+  fail_unless (_x == x);
+  fail_unless (_y == y);
+  fail_unless (_w == w);
+  fail_unless (_h == h);
+  fail_unless (_loc_conf_lvl == loc_conf_lvl);
+
+  GST_LOG ("mtd_type:%s", gst_analytics_mtd_type_get_name (mtd_type));
+
+  exist = gst_analytics_relation_meta_get_mtd (rmeta, ids1, 0, &rlt_mtd);
+  fail_unless (exist == TRUE);
+  mtd_type = gst_analytics_mtd_get_mtd_type (&rlt_mtd);
+
+  /* Verify relatable meta with id == 0 is of type classification */
+  fail_unless (mtd_type == gst_analytics_cls_mtd_get_mtd_type ());
+  gint index =
+      gst_analytics_cls_mtd_get_index_by_quark ((GstAnalyticsClsMtd *) &
+      rlt_mtd,
+      g_quark_from_string ("dog"));
+  gfloat lvl =
+      gst_analytics_cls_mtd_get_level ((GstAnalyticsClsMtd *) & rlt_mtd, index);
+  GST_LOG ("dog %f %d, %d %d, %d", lvl, _x, _y, _w, _h);
+
+  fail_unless (lvl == 0.7f);
+  index =
+      gst_analytics_cls_mtd_get_index_by_quark ((GstAnalyticsClsMtd *) &
+      rlt_mtd, g_quark_from_string ("cat"));
+  lvl =
+      gst_analytics_cls_mtd_get_level ((GstAnalyticsClsMtd *) & rlt_mtd, index);
+  fail_unless (lvl == 0.3f);
+
+  GST_LOG ("mtd_type:%s", gst_analytics_mtd_type_get_name (mtd_type));
+  GST_LOG ("cat %f %d, %d %d, %d", lvl, _x, _y, _w, _h);
+
+  gst_buffer_unref (buf);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_multi_od_cls_relation)
+{
+  GstBuffer *buf;
+  GstAnalyticsClsMtd cls_mtd3;
+  GstAnalyticsODMtd od_mtd2;
+  GstAnalyticsRelationMetaInitParams init_params = { 5, 150 };
+  GstAnalyticsRelationMeta *rmeta;
+  guint cls_id, ids2, i;
+  gboolean ret;
+  const gint dog_cls_index = 0;
+  const gint cat_cls_index = 1;
+  gfloat cls_conf_lvl2, lvl;
+  GArray *path = NULL;
+  gfloat _loc_conf_lvl;
+  gint x, _x, y, _y, w, _w, h, _h;
+  GstAnalyticsMtdType mtd_type;
+  GQuark cls_type;
+  GstAnalyticsMtd mtd;
+  gpointer state = NULL;
+  GQuark class_quarks2;
+  class_quarks0 = g_quark_from_string ("dog");
+  class_quarks1 = g_quark_from_string ("cat");
+
+
+  buf = gst_buffer_new ();
+  rmeta = gst_buffer_add_analytics_relation_meta_full (buf, &init_params);
+
+  /* Define first relation ObjectDetection -contain-> Classification */
+  cls_conf_lvldog_cls_index = 0.7f;
+  cls_conf_lvlcat_cls_index = 0.3f;
+
+  gst_analytics_relation_meta_add_cls_mtd (rmeta, 2, cls_conf_lvl,
+      class_quarks, &cls_mtd0);
+
+  cls_type = g_quark_from_string ("dog");
+  x = 21;
+  y = 20;
+  w = 10;
+  h = 15;
+  gfloat loc_conf_lvl = 0.6f;
+  gst_analytics_relation_meta_add_od_mtd (rmeta, cls_type, x, y, w,
+      h, loc_conf_lvl, &od_mtd0);
+
+  ret = gst_analytics_relation_meta_set_relation (rmeta,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, od_mtd0.id, cls_mtd0.id);
+  fail_unless (ret == TRUE);
+  GST_LOG ("Set rel Obj:%d -c-> Cls:%d", od_mtd0.id, cls_mtd0.id);
+
+  /* Define second relation ObjectDetection -contain-> Classification */
+  cls_conf_lvldog_cls_index = 0.1f;
+  cls_conf_lvlcat_cls_index = 0.9f;
+  gst_analytics_relation_meta_add_cls_mtd (rmeta, 2, cls_conf_lvl,
+      class_quarks, &cls_mtd1);
+
+  cls_type = g_quark_from_string ("cat");
+  x = 50;
+  y = 21;
+  w = 11;
+  h = 16;
+  loc_conf_lvl = 0.7f;
+  gst_analytics_relation_meta_add_od_mtd (rmeta, cls_type, x, y, w,
+      h, loc_conf_lvl, &od_mtd1);
+
+  ret = gst_analytics_relation_meta_set_relation (rmeta,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, od_mtd1.id, cls_mtd1.id);
+
+  GST_LOG ("Set rel Obj:%d -c-> Cls:%d", od_mtd1.id, cls_mtd1.id);
+  fail_unless (ret == TRUE);
+
+  /* Query relations */
+
+  /* Query relation between first object detection and first classification
+   * and verify they are only related by CONTAIN relation OD relate to
+   * CLASSIFICATION through a CONTAIN relation. */
+  gboolean exist =
+      gst_analytics_relation_meta_exist (rmeta, od_mtd0.id, cls_mtd0.id,
+      GST_INF_RELATION_SPAN,
+      GST_ANALYTICS_REL_TYPE_IS_PART_OF, NULL);
+  fail_unless (exist == FALSE);
+
+  exist =
+      gst_analytics_relation_meta_exist (rmeta, od_mtd0.id, cls_mtd0.id,
+      GST_INF_RELATION_SPAN, GST_ANALYTICS_REL_TYPE_CONTAIN, NULL);
+  fail_unless (exist == TRUE);
+
+
+  /* Query relation between second object detection and second classification
+   * and verify they are only related by CONTAIN relation OD relate to
+   * CLASSIFICATION through a CONTAIN relation.
+   */
+  exist =
+      gst_analytics_relation_meta_exist (rmeta, od_mtd1.id, cls_mtd1.id,
+      GST_INF_RELATION_SPAN, GST_ANALYTICS_REL_TYPE_CONTAIN, &path);
+  fail_unless (exist == TRUE);
+
+  /* Verify relation path between OD second (id=3) and Cls second (id=2)
+   * is correct
+   */
+  fail_unless (path->len == 2);
+  for (i = 0; i < path->len; i++) {
+    idsi = g_array_index (path, guint, i);
+    GST_LOG ("id=%u", idsi);
+  }
+  g_array_free (g_steal_pointer (&path), TRUE);
+  fail_unless (ids0 == 3);
+  fail_unless (ids1 == 2);
+
+  /* Verify the relatable metadata 3 is of correct type
+   * (ObjectDetection). Verify it describe the correct
+   * the correct data.
+   */
+  gst_analytics_relation_meta_get_mtd (rmeta, ids0, 0, &mtd);
+  mtd_type = gst_analytics_mtd_get_mtd_type (&mtd);
+  fail_unless (mtd_type == gst_analytics_od_mtd_get_mtd_type ());
+
+  gst_analytics_od_mtd_get_location ((GstAnalyticsODMtd *) & mtd, &_x, &_y, &_w,
+      &_h, &_loc_conf_lvl);
+  fail_unless (_x == 50);
+  fail_unless (_y == 21);
+  fail_unless (_w == 11);
+  fail_unless (_h == 16);
+  fail_unless (_loc_conf_lvl == 0.7f);
+
+  GST_LOG ("mtd_type:%s", gst_analytics_mtd_type_get_name (mtd_type));
+
+  /* Verify the relatable metadata 2 is of correct type
+   * (ObjectDetection).
+   */
+  gst_analytics_relation_meta_get_mtd (rmeta, ids1, 0, &mtd);
+  mtd_type = gst_analytics_mtd_get_mtd_type (&mtd);
+  fail_unless (mtd_type == gst_analytics_cls_mtd_get_mtd_type ());
+
+  /* Verify data of the CLASSIFICATION retrieved */
+  gint index =
+      gst_analytics_cls_mtd_get_index_by_quark ((GstAnalyticsClsMtd *) & mtd,
+      g_quark_from_string ("dog"));
+  lvl = gst_analytics_cls_mtd_get_level ((GstAnalyticsClsMtd *) & mtd, index);
+  GST_LOG ("dog %f %d, %d %d, %d", lvl, _x, _y, _w, _h);
+  fail_unless (lvl == 0.1f);
+
+  /* Verify data of the CLASSIFICATION retrieved */
+  index =
+      gst_analytics_cls_mtd_get_index_by_quark ((GstAnalyticsClsMtd *) & mtd,
+      g_quark_from_string ("cat"));
+  lvl = gst_analytics_cls_mtd_get_level ((GstAnalyticsClsMtd *) & mtd, index);
+  GST_LOG ("mtd_type:%s", gst_analytics_mtd_type_get_name (mtd_type));
+  GST_LOG ("cat %f %d, %d %d, %d", lvl, _x, _y, _w, _h);
+  fail_unless (lvl == 0.9f);
+
+  /* Retrieve relatable metadata related to the first object detection
+   * through a CONTAIN relation of type CLASSIFICATION
+   * Verify it's the first classification metadata
+   */
+  gst_analytics_relation_meta_get_direct_related (rmeta, od_mtd0.id,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, gst_analytics_cls_mtd_get_mtd_type (),
+      &state, &mtd);
+
+  cls_id = gst_analytics_mtd_get_id (&mtd);
+  GST_LOG ("Obj:%d -> Cls:%d", od_mtd0.id, cls_id);
+  fail_unless (cls_id == cls_mtd0.id);
+
+  state = NULL;
+  /* Retrieve relatable metadata related to the second object detection
+   * through a CONTAIN relation of type CLASSIFICATION
+   * Verify it's the first classification metadata
+   */
+  gst_analytics_relation_meta_get_direct_related (rmeta, od_mtd1.id,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, gst_analytics_cls_mtd_get_mtd_type (),
+      &state, &mtd);
+  cls_id = gst_analytics_mtd_get_id (&mtd);
+
+  GST_LOG ("Obj:%d -> Cls:%d", od_mtd1.id, cls_id);
+  fail_unless (cls_id == cls_mtd1.id);
+
+  cls_conf_lvldog_cls_index = 0.2f;
+  cls_conf_lvlcat_cls_index = 0.8f;
+  class_quarks0 = g_quark_from_string ("canine");
+  class_quarks1 = g_quark_from_string ("feline");
+  gst_analytics_relation_meta_add_cls_mtd (rmeta, 2, cls_conf_lvl,
+      class_quarks, &cls_mtd2);
+
+  ret = gst_analytics_relation_meta_set_relation (rmeta,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, od_mtd1.id, cls_mtd2.id);
+
+  state = NULL;
+  ret = gst_analytics_relation_meta_get_direct_related (rmeta, od_mtd1.id,
+      GST_ANALYTICS_REL_TYPE_CONTAIN, gst_analytics_od_mtd_get_mtd_type (),
+      &state, &mtd);
+
+  fail_unless (ret == FALSE);
+
+  gst_buffer_unref (buf);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_add_tracking_meta)
+{
+  /* Verify we can add tracking relatable meta to relation meta */
+  GstBuffer *buf1, *buf2;
+  GstAnalyticsRelationMetaInitParams init_params = { 5, 150 };
+  GstAnalyticsRelationMeta *rmeta;
+  GstAnalyticsTrackingMtd tracking_mtd;
+  guint tracking_id;
+  GstClockTime tracking_observation_time_1;
+  gboolean ret;
+
+  /* Verify we can add multiple trackings to relation metadata
+   */
+
+  buf1 = gst_buffer_new ();
+  rmeta = gst_buffer_add_analytics_relation_meta_full (buf1, &init_params);
+  tracking_id = 1;
+  tracking_observation_time_1 = GST_BUFFER_TIMESTAMP (buf1);
+  ret = gst_analytics_relation_meta_add_tracking_mtd (rmeta, tracking_id,
+      tracking_observation_time_1, &tracking_mtd);
+  fail_unless (ret == TRUE);
+
+  gst_buffer_unref (buf1);
+
+  buf2 = gst_buffer_new ();
+  rmeta = gst_buffer_add_analytics_relation_meta_full (buf2, &init_params);
+  tracking_id = 1;
+  ret = gst_analytics_relation_meta_add_tracking_mtd (rmeta, tracking_id,
+      tracking_observation_time_1, &tracking_mtd);
+  fail_unless (ret == TRUE);
+
+  gst_buffer_unref (buf2);
+}
+
+GST_END_TEST;
+
+static Suite *
+analyticmeta_suite (void)
+{
+
+  Suite *s;
+  TCase *tc_chain_cls;
+  TCase *tc_chain_relation;
+  TCase *tc_chain_od;
+  TCase *tc_chain_od_cls;
+  TCase *tc_chain_tracking;
+
+  s = suite_create ("Analytic Meta Library");
+
+  tc_chain_cls = tcase_create ("Classification Mtd");
+  suite_add_tcase (s, tc_chain_cls);
+  tcase_add_test (tc_chain_cls, test_add_classification_meta);
+  tcase_add_test (tc_chain_cls, test_classification_meta_classes);
+
+  tcase_add_test (tc_chain_cls, test_meta_pooled);
+
+  tc_chain_relation = tcase_create ("Relation Meta");
+  suite_add_tcase (s, tc_chain_relation);
+  tcase_add_test (tc_chain_relation, test_add_relation_meta);
+  tcase_add_test (tc_chain_relation,
+      test_add_relation_inefficiency_reporting_cases);
+  tcase_add_test (tc_chain_relation, test_query_relation_meta_cases);
+  tcase_add_test (tc_chain_relation, test_path_relation_meta);
+  tcase_add_test (tc_chain_relation, test_cyclic_relation_meta);
+
+  tc_chain_od = tcase_create ("Object Detection Mtd");
+  suite_add_tcase (s, tc_chain_od);
+  tcase_add_test (tc_chain_od, test_add_od_meta);
+  tcase_add_test (tc_chain_od, test_od_meta_fields);
+
+  tc_chain_od_cls = tcase_create ("Object Detection <-> Classification Mtd");
+  suite_add_tcase (s, tc_chain_od_cls);
+  tcase_add_test (tc_chain_od_cls, test_od_cls_relation);
+  tcase_add_test (tc_chain_od_cls, test_multi_od_cls_relation);
+
+  tc_chain_tracking = tcase_create ("Tracking Mtd");
+  suite_add_tcase (s, tc_chain_tracking);
+  tcase_add_test (tc_chain_tracking, test_add_tracking_meta);
+  return s;
+}
+
+GST_CHECK_MAIN (analyticmeta);

gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/av1bitwriter.c Added

@@ -0,0 +1,662 @@
+/* GStreamer
+ *  Copyright (C) 2022 Intel Corporation
+ *     Author: He Junyan <junyan.he@intel.com>
+ *
+ * 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 the0
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gst/check/gstcheck.h>
+#include <gst/codecparsers/gstav1bitwriter.h>
+
+/* *INDENT-OFF* */
+static const GstAV1SequenceHeaderOBU sequence = {
+  .seq_profile = 0,
+  .still_picture = 0,
+  .num_planes = 3,
+  .reduced_still_picture_header = 0,
+  .timing_info_present_flag = 1,
+  .timing_info = {
+    .num_units_in_display_tick = 127,
+    .time_scale = 10,
+    .equal_picture_interval = 1,
+    .num_ticks_per_picture_minus_1 = 1082,
+  },
+  .decoder_model_info_present_flag = 0,
+  .initial_display_delay_present_flag = 0,
+  .operating_points_cnt_minus_1 = 3,
+  .operating_points = {
+    {
+      .seq_level_idx = 1,
+      .seq_tier = 0,
+      .idc = 771,
+    },
+    {
+      .seq_level_idx = 1,
+      .seq_tier = 0,
+      .idc = 769,
+    },
+    {
+      .seq_level_idx = 1,
+      .seq_tier = 0,
+      .idc = 259,
+    },
+    {
+      .seq_level_idx = 1,
+      .seq_tier = 0,
+      .idc = 257,
+    },
+  },
+
+  .frame_width_bits_minus_1 = 10,
+  .frame_height_bits_minus_1 = 9,
+  .max_frame_width_minus_1 = 1279,
+  .max_frame_height_minus_1 = 719,
+
+  .frame_id_numbers_present_flag = 0,
+  .use_128x128_superblock = 1,
+  .enable_filter_intra = 1,
+  .enable_intra_edge_filter = 1,
+  .enable_interintra_compound = 1,
+  .enable_masked_compound = 1,
+  .enable_warped_motion = 1,
+  .enable_dual_filter = 1,
+  .enable_order_hint = 1,
+  .enable_jnt_comp = 1,
+  .enable_ref_frame_mvs = 1,
+  .seq_choose_screen_content_tools = 1,
+  .seq_force_screen_content_tools = GST_AV1_SELECT_SCREEN_CONTENT_TOOLS,
+  .seq_choose_integer_mv = 1,
+  .order_hint_bits_minus_1 = 6,
+  .enable_superres = 0,
+  .enable_cdef = 1,
+  .enable_restoration = 1,
+
+  .color_config = {
+    .high_bitdepth = 0,
+    .mono_chrome = 0,
+    .color_description_present_flag = 1,
+    .color_primaries = 1,
+    .transfer_characteristics = 1,
+    .matrix_coefficients = 1,
+    .color_range = 0,
+    .subsampling_x = 1,
+    .subsampling_y = 1,
+    .chroma_sample_position = 0,
+    .separate_uv_delta_q = 0,
+  },
+
+  .film_grain_params_present = 0,
+};
+
+static const GstAV1FrameHeaderOBU key_frame = {
+  /* default setting */
+  .frame_is_intra = 1,
+  .last_frame_idx = -1,
+  .gold_frame_idx = -1,
+  .ref_frame_idx = { -1, -1, -1, -1, -1, -1, -1 },
+
+  .show_existing_frame = 0,
+  .frame_type = 0,
+  .show_frame = 1,
+  .disable_cdf_update = 0,
+  .allow_screen_content_tools = 0,
+  .frame_size_override_flag = 1,
+  .order_hint = 0,
+  .primary_ref_frame = 7,
+  .frame_width = 640,
+  .frame_height = 360,
+  .use_superres = 0,
+  .render_and_frame_size_different = 0,
+  .disable_frame_end_update_cdf = 1,
+  .tile_info = {
+    .uniform_tile_spacing_flag = 1,
+    .tile_cols_log2 = 2,
+    .tile_rows_log2 = 0,
+    .context_update_tile_id = 1,
+    .tile_size_bytes_minus_1 = 3,
+  },
+  .quantization_params = {
+    .base_q_idx = 19,
+    .delta_q_y_dc = 2,
+    .delta_q_u_dc = 3,
+    .delta_q_u_ac = -5,
+    .using_qmatrix = 0,
+
+    .delta_q_present = 0,
+  },
+  .segmentation_params = {
+    .segmentation_enabled = 0,
+  },
+  .loop_filter_params = {
+    .loop_filter_level = { 0, 0, },
+    .loop_filter_sharpness = 1,
+    .loop_filter_delta_enabled = 1,
+    .loop_filter_delta_update = 1,
+    .loop_filter_ref_deltas = { 1, 2, 0, 0, -1, 0, -1, -1 },
+    .loop_filter_mode_deltas = { 0, 0 },
+  },
+  .cdef_params = {
+    .cdef_damping = 3,
+    .cdef_bits = 3,
+    .cdef_y_pri_strength = { 0, 0, 2, 0, 0, 0, 0, 0, },
+    .cdef_y_sec_strength = { 0, 1, 0, 1, 1, 1, 3, 0, },
+    .cdef_uv_pri_strength = { 0, 0, 2, 1, 0, 0, 0, 0, },
+    .cdef_uv_sec_strength = { 1, 1, 0, 0, 0, 3, 0, 3, },
+  },
+  .loop_restoration_params = {
+    .uses_lr = 1,
+    .frame_restoration_type0 = GST_AV1_FRAME_RESTORE_SWITCHABLE,
+    .frame_restoration_type1 = GST_AV1_FRAME_RESTORE_SGRPROJ,
+    .frame_restoration_type2 = GST_AV1_FRAME_RESTORE_SGRPROJ,
+    .lr_unit_shift = 1,
+    .lr_uv_shift = 0,
+  },
+  .tx_mode = GST_AV1_TX_MODE_SELECT,
+  .reduced_tx_set = 0,
+};
+
+static const GstAV1FrameHeaderOBU inter_frame = {
+  /* default setting */
+  .frame_is_intra = 0,
+
+  .show_existing_frame = 0,
+  .frame_type = 1,
+  .show_frame = 1,
+  .error_resilient_mode = 0,
+  .disable_cdf_update = 0,
+  .allow_screen_content_tools = 0,
+  .frame_size_override_flag = 0,
+  .frame_width = 1280,
+  .frame_height = 720,
+  .order_hint = 1,
+  .primary_ref_frame = 7,
+  .refresh_frame_flags = 0x08,
+  .frame_refs_short_signaling = 0,
+  .ref_frame_idx = { 0, 1, 2, 3, 4, 5, 6 },
+  .render_and_frame_size_different = 0,
+  .allow_high_precision_mv = 1,
+  .is_filter_switchable = 1,
+  .is_motion_mode_switchable = 1,
+  .use_ref_frame_mvs = 1,
+  .disable_frame_end_update_cdf = 1,
+  .tile_info = {
+    .uniform_tile_spacing_flag = 1,
+    .tile_cols_log2 = 2,
+    .tile_rows_log2 = 0,
+    .context_update_tile_id = 1,
+    .tile_size_bytes_minus_1 = 3,
+  },
+  .quantization_params = {
+    .base_q_idx = 61,
+    .delta_q_y_dc = -2,
+    .delta_q_u_dc = -1,
+    .delta_q_u_ac = 2,
+    .using_qmatrix = 0,
+
+    .delta_q_present = 0,
+  },
+  .segmentation_params = {
+    .segmentation_enabled = 0,
+  },
+  .loop_filter_params = {
+    .loop_filter_level = { 0, 0, },
+    .loop_filter_sharpness = 0,
+    .loop_filter_delta_enabled = 0,
+  },
+  .cdef_params = {
+    .cdef_damping = 3,
+    .cdef_bits = 3,
+    .cdef_y_pri_strength = { 0, 3, 0, 7, 1, 2, 0, 1, },
+    .cdef_y_sec_strength = { 3, 1, 1, 1, 2, 0, 0, 1, },
+    .cdef_uv_pri_strength = { 2, 7, 0, 0, 0, 7, 7, 3, },
+    .cdef_uv_sec_strength = { 0, 0, 2, 3, 1, 0, 0, 0, },
+  },
+  .loop_restoration_params = {
+    .uses_lr = 1,
+    .frame_restoration_type0 = GST_AV1_FRAME_RESTORE_WIENER,
+    .frame_restoration_type1 = GST_AV1_FRAME_RESTORE_SWITCHABLE,
+    .frame_restoration_type2 = GST_AV1_FRAME_RESTORE_WIENER,
+    .lr_unit_shift = 1,
+    .lr_uv_shift = 0,
+  },
+  .tx_mode = GST_AV1_TX_MODE_SELECT,
+  .reference_select = 0,
+  .allow_warped_motion = 1,
+  .reduced_tx_set = 0,
+  .global_motion_params = {
+    .gm_type = {
+      GST_AV1_WARP_MODEL_IDENTITY,
+      GST_AV1_WARP_MODEL_IDENTITY,
+      GST_AV1_WARP_MODEL_IDENTITY,
+      GST_AV1_WARP_MODEL_IDENTITY,
+      GST_AV1_WARP_MODEL_IDENTITY,
+      GST_AV1_WARP_MODEL_IDENTITY,
+      GST_AV1_WARP_MODEL_IDENTITY,
+      GST_AV1_WARP_MODEL_IDENTITY
+    },
+  },
+};
+
+static const GstAV1FrameHeaderOBU show_existing_frame = {
+  .show_existing_frame = 1,
+  .frame_to_show_map_idx = 3,
+};
+
+static const GstAV1MetadataOBU hdr_mdcv = {
+  .metadata_type = GST_AV1_METADATA_TYPE_HDR_MDCV,
+  .hdr_mdcv = {
+    .primary_chromaticity_x = { 6554, 19661, 32768 },
+    .primary_chromaticity_y = { 13107, 26214, 39322 },
+    .white_point_chromaticity_x = 45875,
+    .white_point_chromaticity_y = 52429,
+    .luminance_max = 512,
+    .luminance_min = 16384,
+  }
+};
+
+static const GstAV1MetadataOBU hdr_cll = {
+  .metadata_type = GST_AV1_METADATA_TYPE_HDR_CLL,
+  .hdr_cll = {
+    .max_cll = 11122,
+    .max_fall = 22211,
+  }
+};
+/* *INDENT-ON* */
+
+GST_START_TEST (test_av1_bitwriter_sequence_and_frame_hdr)
+{
+  GstAV1ParserResult res;
+  gboolean ret;
+  guint size;
+  guint i;
+  GstAV1Parser *const parser = gst_av1_parser_new ();
+  GstAV1OBU obu;
+  guint32 consumed;
+  GstAV1SequenceHeaderOBU seq_header = { 0, };
+  GstAV1FrameHeaderOBU frame_header = { 0, };
+  guint8 sequence_obu128 = { 0, };
+  guint8 frame_header_obu256 = { 0, };
+  guint8 td_obu16 = { 0, };
+
+  size = sizeof (sequence_obu);
+  ret = gst_av1_bit_writer_sequence_header_obu (&sequence, TRUE,
+      sequence_obu, &size);
+  fail_if (ret != GST_AV1_BIT_WRITER_OK);
+
+  /* Parse it again */
+  res = gst_av1_parser_identify_one_obu (parser,
+      sequence_obu, size, &obu, &consumed);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+  assert_equals_int (obu.obu_type, GST_AV1_OBU_SEQUENCE_HEADER);
+
+  res = gst_av1_parser_parse_sequence_header_obu (parser, &obu, &seq_header);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+
+  /* We can not do simply memcmp, the parser may set some default
+     value for the fields which are not used for writing. */
+#define CHECK_FIELD(FIELD)  fail_if(seq_header.FIELD != sequence.FIELD)
+  CHECK_FIELD (seq_profile);
+  CHECK_FIELD (still_picture);
+  CHECK_FIELD (reduced_still_picture_header);
+  CHECK_FIELD (frame_width_bits_minus_1);
+  CHECK_FIELD (frame_height_bits_minus_1);
+  CHECK_FIELD (max_frame_width_minus_1);
+  CHECK_FIELD (max_frame_height_minus_1);
+  CHECK_FIELD (frame_id_numbers_present_flag);
+  CHECK_FIELD (delta_frame_id_length_minus_2);
+  CHECK_FIELD (additional_frame_id_length_minus_1);
+  CHECK_FIELD (use_128x128_superblock);
+  CHECK_FIELD (enable_filter_intra);
+  CHECK_FIELD (enable_intra_edge_filter);
+  CHECK_FIELD (enable_interintra_compound);
+  CHECK_FIELD (enable_masked_compound);
+  CHECK_FIELD (enable_warped_motion);
+  CHECK_FIELD (enable_order_hint);
+  CHECK_FIELD (enable_dual_filter);
+  CHECK_FIELD (enable_jnt_comp);
+  CHECK_FIELD (enable_ref_frame_mvs);
+  CHECK_FIELD (seq_choose_screen_content_tools);
+  CHECK_FIELD (seq_force_screen_content_tools);
+  CHECK_FIELD (seq_choose_integer_mv);
+  CHECK_FIELD (order_hint_bits_minus_1);
+  CHECK_FIELD (enable_superres);
+  CHECK_FIELD (enable_cdef);
+  CHECK_FIELD (enable_restoration);
+  CHECK_FIELD (film_grain_params_present);
+
+  CHECK_FIELD (operating_points_cnt_minus_1);
+  for (i = 0; i < 4; i++) {
+    CHECK_FIELD (operating_pointsi.seq_level_idx);
+    CHECK_FIELD (operating_pointsi.seq_tier);
+    CHECK_FIELD (operating_pointsi.idc);
+  }
+
+  CHECK_FIELD (decoder_model_info_present_flag);
+  CHECK_FIELD (initial_display_delay_present_flag);
+
+  CHECK_FIELD (timing_info_present_flag);
+  CHECK_FIELD (timing_info.num_units_in_display_tick);
+  CHECK_FIELD (timing_info.time_scale);
+  CHECK_FIELD (timing_info.equal_picture_interval);
+  CHECK_FIELD (timing_info.num_ticks_per_picture_minus_1);
+#undef CHECK_FIELD
+
+  size = sizeof (frame_header_obu);
+  ret = gst_av1_bit_writer_frame_header_obu (&key_frame, &sequence, 0, 0, TRUE,
+      frame_header_obu, &size);
+  fail_if (ret != GST_AV1_BIT_WRITER_OK);
+
+  /* Parse it again */
+  res = gst_av1_parser_identify_one_obu (parser,
+      frame_header_obu, size, &obu, &consumed);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+  assert_equals_int (obu.obu_type, GST_AV1_OBU_FRAME_HEADER);
+
+  res = gst_av1_parser_parse_frame_header_obu (parser, &obu, &frame_header);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+
+#define CHECK_FIELD(FIELD)  fail_if(frame_header.FIELD != key_frame.FIELD)
+  CHECK_FIELD (show_existing_frame);
+  CHECK_FIELD (frame_type);
+  CHECK_FIELD (show_frame);
+  CHECK_FIELD (disable_cdf_update);
+  CHECK_FIELD (allow_screen_content_tools);
+  CHECK_FIELD (frame_size_override_flag);
+  CHECK_FIELD (order_hint);
+  CHECK_FIELD (frame_width);
+  CHECK_FIELD (frame_height);
+  CHECK_FIELD (use_superres);
+  CHECK_FIELD (render_and_frame_size_different);
+  CHECK_FIELD (disable_frame_end_update_cdf);
+
+  CHECK_FIELD (tile_info.uniform_tile_spacing_flag);
+  CHECK_FIELD (tile_info.tile_cols_log2);
+  CHECK_FIELD (tile_info.tile_rows_log2);
+  CHECK_FIELD (tile_info.context_update_tile_id);
+  CHECK_FIELD (tile_info.tile_size_bytes_minus_1);
+
+  CHECK_FIELD (quantization_params.base_q_idx);
+  CHECK_FIELD (quantization_params.delta_q_y_dc);
+  CHECK_FIELD (quantization_params.delta_q_u_dc);
+  CHECK_FIELD (quantization_params.delta_q_u_ac);
+  CHECK_FIELD (quantization_params.using_qmatrix);
+  CHECK_FIELD (quantization_params.delta_q_present);
+
+  CHECK_FIELD (segmentation_params.segmentation_enabled);
+
+  for (i = 0; i < 2; i++)
+    CHECK_FIELD (loop_filter_params.loop_filter_leveli);
+  CHECK_FIELD (loop_filter_params.loop_filter_sharpness);
+  CHECK_FIELD (loop_filter_params.loop_filter_delta_enabled);
+  CHECK_FIELD (loop_filter_params.loop_filter_delta_update);
+  for (i = 0; i < 8; i++)
+    CHECK_FIELD (loop_filter_params.loop_filter_ref_deltasi);
+
+  CHECK_FIELD (cdef_params.cdef_damping);
+  CHECK_FIELD (cdef_params.cdef_bits);
+  for (i = 0; i < 8; i++)
+    CHECK_FIELD (cdef_params.cdef_y_pri_strengthi);
+  for (i = 0; i < 8; i++) {
+    if (frame_header.cdef_params.cdef_y_sec_strengthi == 4)
+      frame_header.cdef_params.cdef_y_sec_strengthi--;
+    CHECK_FIELD (cdef_params.cdef_y_sec_strengthi);
+  }
+  for (i = 0; i < 8; i++)
+    CHECK_FIELD (cdef_params.cdef_uv_pri_strengthi);
+  for (i = 0; i < 8; i++) {
+    if (frame_header.cdef_params.cdef_uv_sec_strengthi == 4)
+      frame_header.cdef_params.cdef_uv_sec_strengthi--;
+    CHECK_FIELD (cdef_params.cdef_uv_sec_strengthi);
+  }
+
+  CHECK_FIELD (loop_restoration_params.uses_lr);
+  for (i = 0; i < 3; i++)
+    CHECK_FIELD (loop_restoration_params.frame_restoration_typei);
+  CHECK_FIELD (loop_restoration_params.lr_unit_shift);
+  CHECK_FIELD (loop_restoration_params.lr_uv_shift);
+
+  CHECK_FIELD (tx_mode);
+  CHECK_FIELD (reduced_tx_set);
+#undef CHECK_FIELD
+
+  /* Append a TD */
+  size = sizeof (td_obu);
+  ret = gst_av1_bit_writer_temporal_delimiter_obu (TRUE, td_obu, &size);
+  fail_if (ret != GST_AV1_BIT_WRITER_OK);
+
+  /* Parse it again */
+  res = gst_av1_parser_identify_one_obu (parser, td_obu, size, &obu, &consumed);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+  assert_equals_int (obu.obu_type, GST_AV1_OBU_TEMPORAL_DELIMITER);
+
+  res = gst_av1_parser_parse_temporal_delimiter_obu (parser, &obu);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+
+  ret = gst_av1_parser_reference_frame_update (parser, &frame_header);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+
+  /* Inter frame */
+  size = sizeof (frame_header_obu);
+  memset (frame_header_obu, 0, size);
+
+  ret = gst_av1_bit_writer_frame_header_obu (&inter_frame, &sequence, 1, 0,
+      TRUE, frame_header_obu, &size);
+  fail_if (ret != GST_AV1_BIT_WRITER_OK);
+
+  /* Parse it again */
+  res = gst_av1_parser_identify_one_obu (parser,
+      frame_header_obu, size, &obu, &consumed);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+  assert_equals_int (obu.obu_type, GST_AV1_OBU_FRAME_HEADER);
+
+  res = gst_av1_parser_parse_frame_header_obu (parser, &obu, &frame_header);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+
+#define CHECK_FIELD(FIELD)  fail_if(frame_header.FIELD != inter_frame.FIELD)
+  CHECK_FIELD (show_existing_frame);
+  CHECK_FIELD (frame_type);
+  CHECK_FIELD (show_frame);
+  CHECK_FIELD (error_resilient_mode);
+  CHECK_FIELD (disable_cdf_update);
+  CHECK_FIELD (allow_screen_content_tools);
+  CHECK_FIELD (frame_size_override_flag);
+  CHECK_FIELD (order_hint);
+  CHECK_FIELD (primary_ref_frame);
+  CHECK_FIELD (refresh_frame_flags);
+  CHECK_FIELD (frame_refs_short_signaling);
+  for (i = 0; i < 7; i++)
+    CHECK_FIELD (ref_frame_idxi);
+  CHECK_FIELD (render_and_frame_size_different);
+  CHECK_FIELD (allow_high_precision_mv);
+  CHECK_FIELD (is_filter_switchable);
+  CHECK_FIELD (is_motion_mode_switchable);
+  CHECK_FIELD (use_ref_frame_mvs);
+  CHECK_FIELD (disable_frame_end_update_cdf);
+
+  CHECK_FIELD (tile_info.uniform_tile_spacing_flag);
+  CHECK_FIELD (tile_info.tile_cols_log2);
+  CHECK_FIELD (tile_info.tile_rows_log2);
+  CHECK_FIELD (tile_info.context_update_tile_id);
+  CHECK_FIELD (tile_info.tile_size_bytes_minus_1);
+
+  CHECK_FIELD (quantization_params.base_q_idx);
+  CHECK_FIELD (quantization_params.delta_q_y_dc);
+  CHECK_FIELD (quantization_params.delta_q_u_dc);
+  CHECK_FIELD (quantization_params.delta_q_u_ac);
+  CHECK_FIELD (quantization_params.using_qmatrix);
+  CHECK_FIELD (quantization_params.delta_q_present);
+
+  CHECK_FIELD (segmentation_params.segmentation_enabled);
+
+  for (i = 0; i < 2; i++)
+    CHECK_FIELD (loop_filter_params.loop_filter_leveli);
+  CHECK_FIELD (loop_filter_params.loop_filter_sharpness);
+  CHECK_FIELD (loop_filter_params.loop_filter_delta_enabled);
+
+  CHECK_FIELD (cdef_params.cdef_damping);
+  CHECK_FIELD (cdef_params.cdef_bits);
+  for (i = 0; i < 8; i++)
+    CHECK_FIELD (cdef_params.cdef_y_pri_strengthi);
+  for (i = 0; i < 8; i++) {
+    if (frame_header.cdef_params.cdef_y_sec_strengthi == 4)
+      frame_header.cdef_params.cdef_y_sec_strengthi--;
+    CHECK_FIELD (cdef_params.cdef_y_sec_strengthi);
+  }
+  for (i = 0; i < 8; i++)
+    CHECK_FIELD (cdef_params.cdef_uv_pri_strengthi);
+  for (i = 0; i < 8; i++) {
+    if (frame_header.cdef_params.cdef_uv_sec_strengthi == 4)
+      frame_header.cdef_params.cdef_uv_sec_strengthi--;
+    CHECK_FIELD (cdef_params.cdef_uv_sec_strengthi);
+  }
+
+  CHECK_FIELD (loop_restoration_params.uses_lr);
+  for (i = 0; i < 3; i++)
+    CHECK_FIELD (loop_restoration_params.frame_restoration_typei);
+  CHECK_FIELD (loop_restoration_params.lr_unit_shift);
+  CHECK_FIELD (loop_restoration_params.lr_uv_shift);
+
+  CHECK_FIELD (tx_mode);
+  CHECK_FIELD (reference_select);
+  CHECK_FIELD (allow_warped_motion);
+  CHECK_FIELD (reduced_tx_set);
+
+  for (i = 0; i < 8; i++)
+    CHECK_FIELD (global_motion_params.gm_typei);
+#undef CHECK_FIELD
+
+  ret = gst_av1_parser_reference_frame_update (parser, &frame_header);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+
+  /* Append a TD */
+  size = sizeof (td_obu);
+  ret = gst_av1_bit_writer_temporal_delimiter_obu (TRUE, td_obu, &size);
+  fail_if (ret != GST_AV1_BIT_WRITER_OK);
+
+  res = gst_av1_parser_identify_one_obu (parser, td_obu, size, &obu, &consumed);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+  assert_equals_int (obu.obu_type, GST_AV1_OBU_TEMPORAL_DELIMITER);
+
+  res = gst_av1_parser_parse_temporal_delimiter_obu (parser, &obu);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+
+  /* Show existing frame */
+  size = sizeof (frame_header_obu);
+  memset (frame_header_obu, 0, size);
+
+  ret = gst_av1_bit_writer_frame_header_obu (&show_existing_frame, &sequence, 1,
+      0, TRUE, frame_header_obu, &size);
+  fail_if (ret != GST_AV1_BIT_WRITER_OK);
+
+  /* Parse it again */
+  res = gst_av1_parser_identify_one_obu (parser,
+      frame_header_obu, size, &obu, &consumed);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+  assert_equals_int (obu.obu_type, GST_AV1_OBU_FRAME_HEADER);
+
+  res = gst_av1_parser_parse_frame_header_obu (parser, &obu, &frame_header);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+
+  fail_if (frame_header.show_existing_frame !=
+      show_existing_frame.show_existing_frame);
+  fail_if (frame_header.frame_to_show_map_idx !=
+      show_existing_frame.frame_to_show_map_idx);
+
+  gst_av1_parser_free (parser);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_av1_bitwriter_metadata)
+{
+  GstAV1ParserResult res;
+  gboolean ret;
+  guint size;
+  guint i;
+  GstAV1Parser *const parser = gst_av1_parser_new ();
+  GstAV1OBU obu;
+  guint32 consumed;
+  GstAV1MetadataOBU metadata = { 0, };
+  guint8 meta_obu128 = { 0, };
+
+  size = sizeof (meta_obu);
+
+  ret = gst_av1_bit_writer_metadata_obu (&hdr_mdcv, 0, 0,
+      TRUE, meta_obu, &size);
+  fail_if (ret != GST_AV1_BIT_WRITER_OK);
+
+  /* Parse it again */
+  res = gst_av1_parser_identify_one_obu (parser,
+      meta_obu, size, &obu, &consumed);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+  assert_equals_int (obu.obu_type, GST_AV1_OBU_METADATA);
+
+  res = gst_av1_parser_parse_metadata_obu (parser, &obu, &metadata);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+
+#define CHECK_FIELD(FIELD)  fail_if(metadata.hdr_mdcv.FIELD != hdr_mdcv.hdr_mdcv.FIELD)
+  fail_if (metadata.metadata_type != hdr_mdcv.metadata_type);
+  for (i = 0; i < 3; i++) {
+    CHECK_FIELD (primary_chromaticity_xi);
+    CHECK_FIELD (primary_chromaticity_yi);
+  }
+  CHECK_FIELD (white_point_chromaticity_x);
+  CHECK_FIELD (white_point_chromaticity_y);
+  CHECK_FIELD (luminance_max);
+  CHECK_FIELD (luminance_min);
+#undef CHECK_FIELD
+
+  size = sizeof (meta_obu);
+  memset (meta_obu, 0, size);
+
+  ret = gst_av1_bit_writer_metadata_obu (&hdr_cll, 0, 0, TRUE, meta_obu, &size);
+  fail_if (ret != GST_AV1_BIT_WRITER_OK);
+
+  /* Parse it again */
+  res = gst_av1_parser_identify_one_obu (parser,
+      meta_obu, size, &obu, &consumed);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+  assert_equals_int (obu.obu_type, GST_AV1_OBU_METADATA);
+
+  res = gst_av1_parser_parse_metadata_obu (parser, &obu, &metadata);
+  assert_equals_int (res, GST_AV1_PARSER_OK);
+
+  fail_if (metadata.metadata_type != hdr_cll.metadata_type);
+  fail_if (metadata.hdr_cll.max_cll != hdr_cll.hdr_cll.max_cll);
+  fail_if (metadata.hdr_cll.max_fall != hdr_cll.hdr_cll.max_fall);
+
+  gst_av1_parser_free (parser);
+}
+
+GST_END_TEST;
+
+static Suite *
+av1bitwriter_suite (void)
+{
+  Suite *s = suite_create ("av1 bitwriter library");
+
+  TCase *tc_chain = tcase_create ("general");
+
+  suite_add_tcase (s, tc_chain);
+
+  tcase_add_test (tc_chain, test_av1_bitwriter_sequence_and_frame_hdr);
+
+  tcase_add_test (tc_chain, test_av1_bitwriter_metadata);
+
+  return s;
+}
+
+GST_CHECK_MAIN (av1bitwriter);

gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/cudamemory.c Added

@@ -0,0 +1,192 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/check/gstcheck.h>
+#include <gst/cuda/gstcuda.h>
+#include <gst/video/video.h>
+
+static GstCudaContext *context = NULL;
+static GQuark memory_tester_quark;
+
+static void
+setup_func (void)
+{
+  context = gst_cuda_context_new (0);
+  fail_unless (GST_IS_CUDA_CONTEXT (context));
+
+  memory_tester_quark = g_quark_from_static_string ("gst-cuda-memory-tester");
+}
+
+static void
+teardown_func (void)
+{
+  gst_object_unref (context);
+}
+
+static void
+allocator_finalize_cb (gboolean * alloc_finalized)
+{
+  *alloc_finalized = TRUE;
+}
+
+GST_START_TEST (test_free_active_allocator)
+{
+  GstCudaPoolAllocator *alloc;
+  GstVideoInfo info;
+  GstMemory *mem = NULL;
+  gboolean ret;
+  GstFlowReturn flow_ret;
+  gboolean alloc_finalized = FALSE;
+
+  gst_video_info_set_format (&info, GST_VIDEO_FORMAT_NV12, 320, 240);
+
+  alloc = gst_cuda_pool_allocator_new (context, NULL, &info);
+  fail_unless (alloc);
+
+  g_object_set_qdata_full (G_OBJECT (alloc), memory_tester_quark,
+      &alloc_finalized, (GDestroyNotify) allocator_finalize_cb);
+
+  /* inactive pool should return flusing */
+  flow_ret = gst_cuda_pool_allocator_acquire_memory (alloc, &mem);
+  fail_unless (flow_ret == GST_FLOW_FLUSHING);
+  fail_if (mem);
+
+  ret = gst_cuda_allocator_set_active (GST_CUDA_ALLOCATOR (alloc), TRUE);
+  fail_unless (ret);
+
+  flow_ret = gst_cuda_pool_allocator_acquire_memory (alloc, &mem);
+  fail_unless (flow_ret == GST_FLOW_OK);
+  fail_unless (mem);
+
+  gst_object_unref (alloc);
+  /* Only memory should hold refcount at this moment */
+  fail_unless (G_OBJECT (alloc)->ref_count == 1);
+  fail_if (alloc_finalized);
+
+  /* allocator should be finalized as well */
+  gst_memory_unref (mem);
+  fail_unless (alloc_finalized);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_free_buffer_after_deactivate)
+{
+  GstVideoInfo info;
+  gboolean ret;
+  GstFlowReturn flow_ret;
+  GstBufferPool *pool;
+  GstStructure *config;
+  GstCaps *caps;
+  GstBuffer *buffers2;
+  gboolean alloc_finalized = FALSE;
+
+  gst_video_info_set_format (&info, GST_VIDEO_FORMAT_NV12, 320, 240);
+
+  caps = gst_video_info_to_caps (&info);
+  fail_unless (caps);
+
+  pool = gst_cuda_buffer_pool_new (context);
+  fail_unless (pool);
+
+  g_object_set_qdata_full (G_OBJECT (pool), memory_tester_quark,
+      &alloc_finalized, (GDestroyNotify) allocator_finalize_cb);
+
+  config = gst_buffer_pool_get_config (pool);
+  fail_unless (config);
+
+  gst_buffer_pool_config_set_params (config, caps, info.size, 0, 0);
+  gst_caps_unref (caps);
+
+  ret = gst_buffer_pool_set_config (pool, config);
+  fail_unless (ret);
+
+  ret = gst_buffer_pool_set_active (pool, TRUE);
+  fail_unless (ret);
+
+  flow_ret = gst_buffer_pool_acquire_buffer (pool, &buffers0, NULL);
+  fail_unless (flow_ret == GST_FLOW_OK);
+
+  flow_ret = gst_buffer_pool_acquire_buffer (pool, &buffers1, NULL);
+  fail_unless (flow_ret == GST_FLOW_OK);
+
+  ret = gst_buffer_pool_set_active (pool, FALSE);
+  fail_unless (ret);
+  fail_if (alloc_finalized);
+
+  gst_object_unref (pool);
+  fail_if (alloc_finalized);
+
+  gst_buffer_unref (buffers0);
+  fail_if (alloc_finalized);
+
+  gst_buffer_unref (buffers1);
+  fail_unless (alloc_finalized);
+}
+
+GST_END_TEST;
+
+static gboolean
+check_cuda_device (void)
+{
+  GstCudaContext *context;
+
+  if (!gst_cuda_load_library ())
+    return FALSE;
+
+  context = gst_cuda_context_new (0);
+  if (context) {
+    gst_object_unref (context);
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+static Suite *
+cudamemory_suite (void)
+{
+  Suite *s;
+  TCase *tc_chain;
+
+  /* CUDA doesn't work well with fork  */
+  g_setenv ("CK_FORK", "no", TRUE);
+
+  s = suite_create ("cudamemory");
+  tc_chain = tcase_create ("general");
+
+  suite_add_tcase (s, tc_chain);
+  tcase_add_checked_fixture (tc_chain, setup_func, teardown_func);
+
+  if (!check_cuda_device ())
+    return s;
+
+  tcase_add_test (tc_chain, test_free_active_allocator);
+  tcase_add_test (tc_chain, test_free_buffer_after_deactivate);
+
+  return s;
+}
+
+GST_CHECK_MAIN (cudamemory);

gst-plugins-bad-1.22.7.tar.xz/tests/check/libs/d3d11memory.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/d3d11memory.c Changed

@@ -102,6 +102,62 @@
 
 GST_END_TEST;
 
+GST_START_TEST (test_free_buffer_after_deactivate)
+{
+  GstVideoInfo info;
+  gboolean ret;
+  GstFlowReturn flow_ret;
+  GstBufferPool *pool;
+  GstStructure *config;
+  GstCaps *caps;
+  GstBuffer *buffers2;
+  gboolean alloc_finalized = FALSE;
+
+  gst_video_info_set_format (&info, GST_VIDEO_FORMAT_NV12, 320, 240);
+
+  caps = gst_video_info_to_caps (&info);
+  fail_unless (caps);
+
+  pool = gst_d3d11_buffer_pool_new (device);
+  fail_unless (pool);
+
+  g_object_set_qdata_full (G_OBJECT (pool), memory_tester_quark,
+      &alloc_finalized, (GDestroyNotify) allocator_finalize_cb);
+
+  config = gst_buffer_pool_get_config (pool);
+  fail_unless (config);
+
+  gst_buffer_pool_config_set_params (config, caps, info.size, 0, 0);
+  gst_caps_unref (caps);
+
+  ret = gst_buffer_pool_set_config (pool, config);
+  fail_unless (ret);
+
+  ret = gst_buffer_pool_set_active (pool, TRUE);
+  fail_unless (ret);
+
+  flow_ret = gst_buffer_pool_acquire_buffer (pool, &buffers0, NULL);
+  fail_unless (flow_ret == GST_FLOW_OK);
+
+  flow_ret = gst_buffer_pool_acquire_buffer (pool, &buffers1, NULL);
+  fail_unless (flow_ret == GST_FLOW_OK);
+
+  ret = gst_buffer_pool_set_active (pool, FALSE);
+  fail_unless (ret);
+  fail_if (alloc_finalized);
+
+  gst_object_unref (pool);
+  fail_if (alloc_finalized);
+
+  gst_buffer_unref (buffers0);
+  fail_if (alloc_finalized);
+
+  gst_buffer_unref (buffers1);
+  fail_unless (alloc_finalized);
+}
+
+GST_END_TEST;
+
 typedef struct
 {
   GMutex lock;
@@ -162,10 +218,10 @@
   fail_unless (config);
 
   params = gst_d3d11_allocation_params_new (device,
-      &info, GST_D3D11_ALLOCATION_FLAG_TEXTURE_ARRAY, 0, 0);
+      &info, GST_D3D11_ALLOCATION_FLAG_DEFAULT, 0, 0);
   fail_unless (params);
 
-  params->desc0.ArraySize = 2;
+  gst_d3d11_allocation_params_set_array_size (params, 2);
 
   gst_buffer_pool_config_set_d3d11_allocation_params (config, params);
   gst_d3d11_allocation_params_free (params);
@@ -225,6 +281,7 @@
     return s;
 
   tcase_add_test (tc_chain, test_free_active_allocator);
+  tcase_add_test (tc_chain, test_free_buffer_after_deactivate);
   tcase_add_test (tc_chain, test_unblock_on_stop);
 
   return s;

gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/gstlibscpp.cc Added

@@ -0,0 +1,78 @@
+/* GStreamer
+ * Copyright (C) 2024 Tim-Philipp Müller <tim centricular net>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gst/gst.h>
+#include <gst/check/gstcheck.h>
+
+#include <gst/analytics/analytics.h>
+
+#include <gst/audio/gstnonstreamaudiodecoder.h>
+#include <gst/audio/gstplanaraudioadapter.h>
+
+#include <gst/basecamerabinsrc/gstbasecamerasrc.h>
+#include <gst/basecamerabinsrc/gstcamerabinpreview.h>
+/*
+#include <gst/codecparsers/x>
+#include <gst/codecs/x>
+#include <gst/cuda/x>
+*/
+#include <gst/insertbin/gstinsertbin.h>
+#include <gst/interfaces/photography.h>
+#include <gst/mpegts/mpegts.h>
+#include <gst/mse/mse.h>
+/*
+#include <gst/opencv/x>
+*/
+#include <gst/play/play.h>
+#include <gst/player/player.h>
+// #include <gst/sctp/x>
+#include <gst/transcoder/gsttranscoder.h>
+/*
+#include <gst/va/x>
+#include <gst/vulkan/x>
+#include <gst/wayland/x>
+*/
+#include <gst/webrtc/webrtc.h>
+
+/* we mostly just want to make sure that our library headers don't
+ * contain anything a C++ compiler might not like */
+GST_START_TEST (test_nothing)
+{
+  gst_init (NULL, NULL);
+}
+
+GST_END_TEST;
+
+static Suite *
+libscpp_suite (void)
+{
+  Suite *s = suite_create ("BadLibsCpp");
+  TCase *tc_chain = tcase_create ("C++ bad libs header tests");
+
+  suite_add_tcase (s, tc_chain);
+  tcase_add_test (tc_chain, test_nothing);
+
+  return s;
+}
+
+GST_CHECK_MAIN (libscpp);

gst-plugins-bad-1.22.7.tar.xz/tests/check/libs/h264parser.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/h264parser.c Changed

@@ -332,6 +332,16 @@
   0x00, 0xff, 0x80
 };
 
+static guint8 h264_sei_user_data_unregistered = {
+  0x00, 0x00, 0x00, 0x01, 0x06,
+  0x05,                         // Payload type.
+  0x18,                         // Payload size.
+  0x4D, 0x49, 0x53, 0x50, 0x6D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x65, 0x63,
+  0x74, 0x69, 0x6D, 0x65,       // UUID.
+  0x70, 0x69, 0x67, 0x73, 0x20, 0x66, 0x6c, 0x79,       // Payload data
+  0x80
+};
+
 /* frame packing, side-by-side */
 static guint8 h264_sei_frame_packing = {
   0x00, 0x00, 0x00, 0x01, 0x06, 0x2d, 0x07, 0x81, 0x81, 0x00, 0x00, 0x03,
@@ -426,6 +436,15 @@
 }
 
 static gboolean
+check_sei_user_data_unregistered (const GstH264UserDataUnregistered * a,
+    const GstH264UserDataUnregistered * b)
+{
+  return a->size == b->size &&
+      !memcmp (a->uuid, b->uuid, sizeof (a->uuid)) &&
+      !memcmp (a->data, b->data, a->size);
+}
+
+static gboolean
 check_sei_frame_packing (const GstH264FramePacking * a,
     const GstH264FramePacking * b)
 {
@@ -594,6 +613,9 @@
     {h264_sei_user_data_registered, G_N_ELEMENTS (h264_sei_user_data_registered),
         GST_H264_SEI_REGISTERED_USER_DATA, {0,},
         (SEICheckFunc) check_sei_user_data_registered},
+    {h264_sei_user_data_unregistered, G_N_ELEMENTS (h264_sei_user_data_unregistered),
+        GST_H264_SEI_USER_DATA_UNREGISTERED, {0,},
+        (SEICheckFunc) check_sei_user_data_unregistered},
     {h264_sei_frame_packing, G_N_ELEMENTS (h264_sei_frame_packing),
         GST_H264_SEI_FRAME_PACKING, {0,},
         (SEICheckFunc) check_sei_frame_packing},
@@ -671,6 +693,16 @@
 
       dst_rud->data = g_malloc (src_rud->size);
       memcpy ((guint8 *) dst_rud->data, src_rud->data, src_rud->size);
+    } else if (test_listi.type == GST_H264_SEI_USER_DATA_UNREGISTERED) {
+      GstH264UserDataUnregistered *dst_udu =
+          &test_listi.parsed_message.payload.user_data_unregistered;
+      const GstH264SEIMessage *src_msg =
+          &g_array_index (msg_array, GstH264SEIMessage, 0);
+      const GstH264UserDataUnregistered *src_udu =
+          &src_msg->payload.user_data_unregistered;
+
+      dst_udu->data = g_malloc (src_udu->size);
+      memcpy ((guint8 *) dst_udu->data, src_udu->data, src_udu->size);
     }
     g_array_unref (msg_array);
   }
@@ -825,6 +857,225 @@
 
 GST_END_TEST;
 
+GST_START_TEST (test_h264_parse_partial_nal_header)
+{
+  GstH264ParserResult res;
+  GstH264NalUnit nalu;
+  GstH264NalParser *const parser = gst_h264_nal_parser_new ();
+  const guint8 buf = { 0x00, 0x00, 0x00, 0x01, 0x0e };
+  guint buf_size = sizeof (buf);
+
+  /* Test that incomplete prefix NAL do return NO_NAL_END and not BROKEN_NAL.
+   * This also covers for SLICE_EXT. */
+  res = gst_h264_parser_identify_nalu (parser, buf, 0, buf_size, &nalu);
+
+  assert_equals_int (res, GST_H264_PARSER_NO_NAL);
+  assert_equals_int (nalu.type, GST_H264_NAL_PREFIX_UNIT);
+  assert_equals_int (nalu.size, 0);
+
+  gst_h264_nal_parser_free (parser);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_h264_split_avc)
+{
+  GstH264NalParser *parser;
+  GArray *array;
+  GstH264NalUnit *nal;
+  static const guint8 aud = { 0x09, 0xf0 };
+  static const guint8 seq_end = { 0x0a };
+  static const guint8 sc_3bytes = { 0x00, 0x00, 0x01 };
+  static const guint8 sc_4bytes = { 0x00, 0x00, 0x00, 0x01 };
+  const guint8 nal_length_size = 4;
+  guint8 data128;
+  gsize size;
+  GstH264ParserResult ret;
+  gsize consumed;
+  guint off;
+
+  parser = gst_h264_nal_parser_new ();
+  array = g_array_new (FALSE, FALSE, sizeof (GstH264NalUnit));
+
+#define BUILD_NAL(arr) G_STMT_START { \
+  memcpy (data + off, arr, sizeof (arr)); \
+  off += sizeof (arr); \
+} G_STMT_END
+
+  /* 1) Complete packetized nalu */
+  size = nal_length_size + sizeof (aud);
+  off = nal_length_size;
+  GST_WRITE_UINT32_BE (data, sizeof (aud));
+  BUILD_NAL (aud);
+  ret = gst_h264_parser_identify_and_split_nalu_avc (parser, data,
+      0, size, nal_length_size, array, &consumed);
+  assert_equals_int (ret, GST_H264_PARSER_OK);
+  assert_equals_int (array->len, 1);
+  assert_equals_int (consumed, size);
+  nal = &g_array_index (array, GstH264NalUnit, 0);
+  assert_equals_int (nal->type, GST_H264_NAL_AU_DELIMITER);
+  assert_equals_int (nal->sc_offset, 0);
+  assert_equals_int (nal->offset, nal_length_size);
+  assert_equals_int (nal->size, sizeof (aud));
+
+  /* 2-1) SC (3 bytes) + nalu */
+  size = nal_length_size + sizeof (sc_3bytes) + sizeof (aud);
+  off = nal_length_size;
+  GST_WRITE_UINT32_BE (data, sizeof (sc_3bytes) + sizeof (aud));
+  BUILD_NAL (sc_3bytes);
+  BUILD_NAL (aud);
+  ret = gst_h264_parser_identify_and_split_nalu_avc (parser, data,
+      0, size, nal_length_size, array, &consumed);
+  assert_equals_int (ret, GST_H264_PARSER_OK);
+  assert_equals_int (array->len, 1);
+  assert_equals_int (consumed, size);
+  nal = &g_array_index (array, GstH264NalUnit, 0);
+  assert_equals_int (nal->type, GST_H264_NAL_AU_DELIMITER);
+  assert_equals_int (nal->sc_offset, nal_length_size);
+  assert_equals_int (nal->offset, nal_length_size + sizeof (sc_3bytes));
+  assert_equals_int (nal->size, sizeof (aud));
+
+  /* 2-2) SC (4 bytes) + nalu */
+  size = nal_length_size + sizeof (sc_4bytes) + sizeof (aud);
+  off = nal_length_size;
+  GST_WRITE_UINT32_BE (data, sizeof (sc_4bytes) + sizeof (aud));
+  BUILD_NAL (sc_4bytes);
+  BUILD_NAL (aud);
+  ret = gst_h264_parser_identify_and_split_nalu_avc (parser, data,
+      0, size, nal_length_size, array, &consumed);
+  assert_equals_int (ret, GST_H264_PARSER_OK);
+  assert_equals_int (array->len, 1);
+  assert_equals_int (consumed, size);
+  nal = &g_array_index (array, GstH264NalUnit, 0);
+  assert_equals_int (nal->type, GST_H264_NAL_AU_DELIMITER);
+  assert_equals_int (nal->sc_offset, nal_length_size);
+  assert_equals_int (nal->offset, nal_length_size + sizeof (sc_4bytes));
+  assert_equals_int (nal->size, sizeof (aud));
+
+  /* 3-1) nalu + trailing SC (3 bytes) */
+  size = nal_length_size + sizeof (aud) + sizeof (sc_3bytes);
+  off = nal_length_size;
+  GST_WRITE_UINT32_BE (data, sizeof (aud) + sizeof (sc_3bytes));
+  BUILD_NAL (aud);
+  BUILD_NAL (sc_3bytes);
+  ret = gst_h264_parser_identify_and_split_nalu_avc (parser, data,
+      0, size, nal_length_size, array, &consumed);
+  assert_equals_int (ret, GST_H264_PARSER_OK);
+  assert_equals_int (array->len, 1);
+  assert_equals_int (consumed, size);
+  nal = &g_array_index (array, GstH264NalUnit, 0);
+  assert_equals_int (nal->type, GST_H264_NAL_AU_DELIMITER);
+  assert_equals_int (nal->sc_offset, 0);
+  assert_equals_int (nal->offset, nal_length_size);
+  assert_equals_int (nal->size, sizeof (aud));
+
+  /* 3-2) nalu + trailing SC (4 bytes) */
+  size = nal_length_size + sizeof (aud) + sizeof (sc_4bytes);
+  off = nal_length_size;
+  GST_WRITE_UINT32_BE (data, sizeof (aud) + sizeof (sc_4bytes));
+  BUILD_NAL (aud);
+  BUILD_NAL (sc_4bytes);
+  ret = gst_h264_parser_identify_and_split_nalu_avc (parser, data,
+      0, size, nal_length_size, array, &consumed);
+  assert_equals_int (ret, GST_H264_PARSER_OK);
+  assert_equals_int (array->len, 1);
+  assert_equals_int (consumed, size);
+  nal = &g_array_index (array, GstH264NalUnit, 0);
+  assert_equals_int (nal->type, GST_H264_NAL_AU_DELIMITER);
+  assert_equals_int (nal->sc_offset, 0);
+  assert_equals_int (nal->offset, nal_length_size);
+  assert_equals_int (nal->size, sizeof (aud));
+
+  /* 4-1) SC + nalu + SC + nalu */
+  size = nal_length_size + sizeof (sc_3bytes) + sizeof (aud) +
+      sizeof (sc_4bytes) + sizeof (seq_end);
+  off = nal_length_size;
+  GST_WRITE_UINT32_BE (data, sizeof (sc_3bytes) + sizeof (aud) +
+      sizeof (sc_4bytes) + sizeof (seq_end));
+  BUILD_NAL (sc_3bytes);
+  BUILD_NAL (aud);
+  BUILD_NAL (sc_4bytes);
+  BUILD_NAL (seq_end);
+  ret = gst_h264_parser_identify_and_split_nalu_avc (parser, data,
+      0, size, nal_length_size, array, &consumed);
+  assert_equals_int (ret, GST_H264_PARSER_OK);
+  assert_equals_int (array->len, 2);
+  assert_equals_int (consumed, size);
+  nal = &g_array_index (array, GstH264NalUnit, 0);
+  assert_equals_int (nal->type, GST_H264_NAL_AU_DELIMITER);
+  assert_equals_int (nal->sc_offset, nal_length_size);
+  assert_equals_int (nal->offset, nal_length_size + sizeof (sc_3bytes));
+  assert_equals_int (nal->size, sizeof (aud));
+  nal = &g_array_index (array, GstH264NalUnit, 1);
+  assert_equals_int (nal->type, GST_H264_NAL_SEQ_END);
+  assert_equals_int (nal->sc_offset, nal_length_size + sizeof (sc_3bytes)
+      + sizeof (aud));
+  assert_equals_int (nal->offset, nal_length_size + sizeof (sc_3bytes)
+      + sizeof (aud) + sizeof (sc_4bytes));
+  assert_equals_int (nal->size, sizeof (seq_end));
+
+  /* 4-2) SC + nalu + SC + nalu + trailing SC */
+  size = nal_length_size + sizeof (sc_3bytes) + sizeof (aud) +
+      sizeof (sc_4bytes) + sizeof (seq_end) + sizeof (sc_3bytes);
+  off = nal_length_size;
+  GST_WRITE_UINT32_BE (data, sizeof (sc_3bytes) + sizeof (aud) +
+      sizeof (sc_4bytes) + sizeof (seq_end) + sizeof (sc_3bytes));
+  BUILD_NAL (sc_3bytes);
+  BUILD_NAL (aud);
+  BUILD_NAL (sc_4bytes);
+  BUILD_NAL (seq_end);
+  BUILD_NAL (sc_3bytes);
+  ret = gst_h264_parser_identify_and_split_nalu_avc (parser, data,
+      0, size, nal_length_size, array, &consumed);
+  assert_equals_int (ret, GST_H264_PARSER_OK);
+  assert_equals_int (array->len, 2);
+  assert_equals_int (consumed, size);
+  nal = &g_array_index (array, GstH264NalUnit, 0);
+  assert_equals_int (nal->type, GST_H264_NAL_AU_DELIMITER);
+  assert_equals_int (nal->sc_offset, nal_length_size);
+  assert_equals_int (nal->offset, nal_length_size + sizeof (sc_3bytes));
+  assert_equals_int (nal->size, sizeof (aud));
+  nal = &g_array_index (array, GstH264NalUnit, 1);
+  assert_equals_int (nal->type, GST_H264_NAL_SEQ_END);
+  assert_equals_int (nal->sc_offset, nal_length_size + sizeof (sc_3bytes)
+      + sizeof (aud));
+  assert_equals_int (nal->offset, nal_length_size + sizeof (sc_3bytes)
+      + sizeof (aud) + sizeof (sc_4bytes));
+  assert_equals_int (nal->size, sizeof (seq_end));
+
+  /* 4-3) nalu + SC + nalu */
+  size = nal_length_size + sizeof (aud) + sizeof (sc_4bytes) + sizeof (seq_end);
+  off = nal_length_size;
+  GST_WRITE_UINT32_BE (data, sizeof (aud) + sizeof (sc_4bytes) +
+      sizeof (seq_end));
+  BUILD_NAL (aud);
+  BUILD_NAL (sc_4bytes);
+  BUILD_NAL (seq_end);
+  ret = gst_h264_parser_identify_and_split_nalu_avc (parser, data,
+      0, size, nal_length_size, array, &consumed);
+  assert_equals_int (ret, GST_H264_PARSER_OK);
+  assert_equals_int (array->len, 2);
+  assert_equals_int (consumed, size);
+  nal = &g_array_index (array, GstH264NalUnit, 0);
+  assert_equals_int (nal->type, GST_H264_NAL_AU_DELIMITER);
+  assert_equals_int (nal->sc_offset, 0);
+  assert_equals_int (nal->offset, nal_length_size);
+  assert_equals_int (nal->size, sizeof (aud));
+  nal = &g_array_index (array, GstH264NalUnit, 1);
+  assert_equals_int (nal->type, GST_H264_NAL_SEQ_END);
+  assert_equals_int (nal->sc_offset, nal_length_size + sizeof (aud));
+  assert_equals_int (nal->offset,
+      nal_length_size + sizeof (aud) + sizeof (sc_4bytes));
+  assert_equals_int (nal->size, sizeof (seq_end));
+
+#undef BUILD_NAL
+
+  gst_h264_nal_parser_free (parser);
+  g_array_unref (array);
+}
+
+GST_END_TEST;
+
 static Suite *
 h264parser_suite (void)
 {
@@ -840,6 +1091,8 @@
   tcase_add_test (tc_chain, test_h264_parse_invalid_sei);
   tcase_add_test (tc_chain, test_h264_create_sei);
   tcase_add_test (tc_chain, test_h264_decoder_config_record);
+  tcase_add_test (tc_chain, test_h264_parse_partial_nal_header);
+  tcase_add_test (tc_chain, test_h264_split_avc);
 
   return s;
 }

gst-plugins-bad-1.22.7.tar.xz/tests/check/libs/h265parser.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/h265parser.c Changed

@@ -123,6 +123,16 @@
   0xa6, 0xae, 0x5c, 0x83, 0x50, 0xdd, 0xf9, 0x8e, 0xc7, 0xbd, 0x00, 0x80
 };
 
+static guint8 h265_sei_user_data_unregistered = {
+  0x00, 0x00, 0x00, 0x01, 0x4e, 0x01,
+  0x05,                         // Payload type.
+  0x18,                         // Payload size.
+  0x4D, 0x49, 0x53, 0x50, 0x6D, 0x69, 0x63, 0x72, 0x6F, 0x73, 0x65, 0x63,
+  0x74, 0x69, 0x6D, 0x65,       // UUID.
+  0x70, 0x69, 0x67, 0x73, 0x20, 0x66, 0x6c, 0x79,       // Payload data
+  0x80
+};
+
 static guint8 h265_sei_time_code = {
   0x00, 0x00, 0x00, 0x01, 0x4e, 0x01, 0x88, 0x06, 0x60, 0x40, 0x00, 0x00, 0x03,
   0x00, 0x10, 0x80
@@ -973,6 +983,15 @@
 }
 
 static gboolean
+check_sei_user_data_unregistered (const GstH265UserDataUnregistered * a,
+    const GstH265UserDataUnregistered * b)
+{
+  return a->size == b->size &&
+      !memcmp (a->uuid, b->uuid, sizeof (a->uuid)) &&
+      !memcmp (a->data, b->data, a->size);
+}
+
+static gboolean
 check_sei_time_code (const GstH265TimeCode * a, const GstH265TimeCode * b)
 {
   gint i;
@@ -1076,6 +1095,9 @@
     {h265_sei_user_data_registered, G_N_ELEMENTS (h265_sei_user_data_registered),
         GST_H265_SEI_REGISTERED_USER_DATA, {0,},
         (SEICheckFunc) check_sei_user_data_registered},
+    {h265_sei_user_data_unregistered, G_N_ELEMENTS (h265_sei_user_data_unregistered),
+        GST_H265_SEI_USER_DATA_UNREGISTERED, {0,},
+        (SEICheckFunc) check_sei_user_data_unregistered},
     {h265_sei_time_code, G_N_ELEMENTS (h265_sei_time_code),
         GST_H265_SEI_TIME_CODE, {0,}, (
         SEICheckFunc) check_sei_time_code},
@@ -1372,6 +1394,104 @@
 
 GST_END_TEST;
 
+/* Captured from Apple's HLS test stream
+ * http://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_adv_example_hevc/v14/prog_index.m3u8
+ */
+static const guint8 h265_codec_data = {
+  0x01, 0x02, 0x00, 0x00, 0x00, 0x04, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x7b, 0xf0, 0x00, 0xfc, 0xfd, 0xfa, 0xfa, 0x00, 0x00, 0x0f, 0x03, 0xa0,
+  0x00, 0x01, 0x00, 0x18, 0x40, 0x01, 0x0c, 0x01, 0xff, 0xff, 0x02, 0x20,
+  0x00, 0x00, 0x03, 0x00, 0xb0, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00,
+  0x7b, 0x18, 0xb0, 0x24, 0xa1, 0x00, 0x01, 0x00, 0x3c, 0x42, 0x01, 0x01,
+  0x02, 0x20, 0x00, 0x00, 0x03, 0x00, 0xb0, 0x00, 0x00, 0x03, 0x00, 0x00,
+  0x03, 0x00, 0x7b, 0xa0, 0x07, 0x82, 0x00, 0x88, 0x7d, 0xb6, 0x71, 0x8b,
+  0x92, 0x44, 0x80, 0x53, 0x88, 0x88, 0x92, 0xcf, 0x24, 0xa6, 0x92, 0x72,
+  0xc9, 0x12, 0x49, 0x22, 0xdc, 0x91, 0xaa, 0x48, 0xfc, 0xa2, 0x23, 0xff,
+  0x00, 0x01, 0x00, 0x01, 0x6a, 0x02, 0x02, 0x02, 0x01, 0xa2, 0x00, 0x01,
+  0x00, 0x08, 0x44, 0x01, 0xc0, 0x25, 0x2f, 0x05, 0x32, 0x40
+};
+
+GST_START_TEST (test_h265_decoder_config_record)
+{
+  GstH265Parser *parser;
+  GstH265ParserResult ret;
+  GstH265DecoderConfigRecord *config = NULL;
+  GstH265VPS vps;
+  GstH265SPS sps;
+  GstH265PPS pps;
+  GstH265DecoderConfigRecordNalUnitArray *nalu_array;
+  GstH265NalUnit *nalu;
+
+  parser = gst_h265_parser_new ();
+
+  ret = gst_h265_parser_parse_decoder_config_record (parser,
+      h265_codec_data, sizeof (h265_codec_data), &config);
+  assert_equals_int (ret, GST_H265_PARSER_OK);
+  fail_unless (config != NULL);
+
+  assert_equals_int (config->length_size_minus_one, 3);
+  fail_unless (config->nalu_array != NULL);
+  assert_equals_int (config->nalu_array->len, 3);
+
+  /* VPS */
+  nalu_array = &g_array_index (config->nalu_array,
+      GstH265DecoderConfigRecordNalUnitArray, 0);
+  fail_unless (nalu_array->nalu != NULL);
+  assert_equals_int (nalu_array->nalu->len, 1);
+
+  nalu = &g_array_index (nalu_array->nalu, GstH265NalUnit, 0);
+  assert_equals_int (nalu->type, GST_H265_NAL_VPS);
+  ret = gst_h265_parser_parse_vps (parser, nalu, &vps);
+  assert_equals_int (ret, GST_H265_PARSER_OK);
+
+  /* SPS */
+  nalu_array = &g_array_index (config->nalu_array,
+      GstH265DecoderConfigRecordNalUnitArray, 1);
+  fail_unless (nalu_array->nalu != NULL);
+  assert_equals_int (nalu_array->nalu->len, 1);
+
+  nalu = &g_array_index (nalu_array->nalu, GstH265NalUnit, 0);
+  assert_equals_int (nalu->type, GST_H265_NAL_SPS);
+  ret = gst_h265_parser_parse_sps (parser, nalu, &sps, TRUE);
+  assert_equals_int (ret, GST_H265_PARSER_OK);
+
+  /* PPS */
+  nalu_array = &g_array_index (config->nalu_array,
+      GstH265DecoderConfigRecordNalUnitArray, 2);
+  fail_unless (nalu_array->nalu != NULL);
+  assert_equals_int (nalu_array->nalu->len, 1);
+
+  nalu = &g_array_index (nalu_array->nalu, GstH265NalUnit, 0);
+  assert_equals_int (nalu->type, GST_H265_NAL_PPS);
+  ret = gst_h265_parser_parse_pps (parser, nalu, &pps);
+  assert_equals_int (ret, GST_H265_PARSER_OK);
+
+  gst_h265_decoder_config_record_free (config);
+  gst_h265_parser_free (parser);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_h265_parse_partial_nal)
+{
+  GstH265ParserResult res;
+  GstH265NalUnit nalu;
+  GstH265Parser *parser = gst_h265_parser_new ();
+  const guint8 *buf = slice_eos_slice_eob;
+  const guint buf_size = 5;
+
+  res = gst_h265_parser_identify_nalu (parser, buf, 0, buf_size, &nalu);
+
+  /* H.265 parser is a bit different then H.264 one, and will return
+   * NO_NAL if there is a start code but not enough bytes to hold the
+   * header. */
+  assert_equals_int (res, GST_H265_PARSER_NO_NAL);
+
+  gst_h265_parser_free (parser);
+}
+
+GST_END_TEST;
+
 static Suite *
 h265parser_suite (void)
 {
@@ -1395,6 +1515,8 @@
   tcase_add_test (tc_chain, test_h265_sei_registered_user_data);
   tcase_add_test (tc_chain, test_h265_create_sei);
   tcase_add_test (tc_chain, test_h265_split_hevc);
+  tcase_add_test (tc_chain, test_h265_decoder_config_record);
+  tcase_add_test (tc_chain, test_h265_parse_partial_nal);
 
   return s;
 }

gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/mse.c Added

@@ -0,0 +1,1119 @@
+/* GStreamer
+ *
+ * SPDX-License-Identifier: LGPL-2.1
+ *
+ * Copyright (C) 2022, 2023 Collabora Ltd.
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_VALGRIND
+# include <valgrind/valgrind.h>
+#endif
+
+#include <gst/check/gstcheck.h>
+
+#include <gst/mse/mse.h>
+#include <gst/mse/gstappendpipeline-private.h>
+#include <gst/mse/gstmediasource-private.h>
+#include <gst/mse/gstmediasourcetrack-private.h>
+#include <gst/mse/gstmediasourcetrackbuffer-private.h>
+#include <gst/mse/gstmediasourcesamplemap-private.h>
+
+static GstCheckLogFilter *
+add_log_filter (GLogLevelFlags level, const gchar * regex)
+{
+  GRegex *gregex = g_regex_new (regex, 0, 0, NULL);
+  return gst_check_add_log_filter ("GStreamer-MSE", level, gregex, NULL, NULL,
+      NULL);
+}
+
+static gchar *
+test_mp4_path (void)
+{
+  return g_build_filename (GST_TEST_FILES_PATH, "mse.mp4", NULL);
+}
+
+static gchar *
+test_webm_path (void)
+{
+  return g_build_filename (GST_TEST_FILES_PATH, "mse.webm", NULL);
+}
+
+static GstMediaSource *
+opened_media_source (void)
+{
+  GstMediaSource *media_source = gst_media_source_new ();
+  media_source->ready_state = GST_MEDIA_SOURCE_READY_STATE_OPEN;
+  return media_source;
+}
+
+static GstSample *
+new_empty_sample_full (GstClockTime dts, GstClockTime pts,
+    GstClockTime duration, GstBufferFlags flags, GstCaps * caps,
+    GstSegment * segment, GstStructure * info)
+{
+  GstBuffer *buffer = gst_buffer_new ();
+  GST_BUFFER_DTS (buffer) = dts;
+  GST_BUFFER_PTS (buffer) = pts;
+  GST_BUFFER_DURATION (buffer) = duration;
+  GST_BUFFER_FLAGS (buffer) = flags;
+  GstSample *sample = gst_sample_new (buffer, caps, segment, info);
+  gst_buffer_unref (buffer);
+  return sample;
+}
+
+static GstSample *
+new_empty_sample_with_timing (GstClockTime dts, GstClockTime pts,
+    GstClockTime duration)
+{
+  return new_empty_sample_full (dts, pts, duration, 0, NULL, NULL, NULL);
+}
+
+static GstSample *
+new_sample_with_bytes_and_timing (GBytes * bytes, GstClockTime dts,
+    GstClockTime pts, GstClockTime duration)
+{
+  GstBuffer *buffer = gst_buffer_new_wrapped_bytes (bytes);
+  GST_BUFFER_DTS (buffer) = dts;
+  GST_BUFFER_PTS (buffer) = pts;
+  GST_BUFFER_DURATION (buffer) = duration;
+  GstSample *sample = gst_sample_new (buffer, NULL, NULL, NULL);
+  gst_buffer_unref (buffer);
+  g_bytes_unref (bytes);
+  return sample;
+}
+
+GST_START_TEST (test_create_and_free)
+{
+  GstMediaSource *media_source = gst_media_source_new ();
+  fail_unless (GST_IS_MEDIA_SOURCE (media_source));
+  gst_check_object_destroyed_on_unref (media_source);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_create_initial_state)
+{
+  GstMediaSource *media_source = gst_media_source_new ();
+
+  GstSourceBufferList *buffers =
+      gst_media_source_get_source_buffers (media_source);
+  GstSourceBufferList *active_buffers =
+      gst_media_source_get_active_source_buffers (media_source);
+
+  fail_unless (gst_media_source_get_ready_state (media_source) ==
+      GST_MEDIA_SOURCE_READY_STATE_CLOSED);
+  fail_unless (gst_source_buffer_list_get_length (buffers) == 0);
+  fail_unless (gst_source_buffer_list_get_length (active_buffers) == 0);
+  fail_unless (gst_media_source_get_position (media_source) ==
+      GST_CLOCK_TIME_NONE);
+
+  gst_object_unref (media_source);
+  gst_object_unref (buffers);
+  gst_object_unref (active_buffers);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_add_source_buffer_with_content_type_null)
+{
+  add_log_filter (G_LOG_LEVEL_CRITICAL,
+      "^.*_add_source_buffer: assertion 'type != NULL' failed");
+
+  GstMediaSource *media_source = gst_media_source_new ();
+
+  g_assert_null (gst_media_source_add_source_buffer (media_source, NULL, NULL));
+
+  gst_object_unref (media_source);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_add_source_buffer_with_content_type_empty)
+{
+  GError *error = NULL;
+  GstMediaSource *media_source = gst_media_source_new ();
+  GstSourceBuffer *source_buffer =
+      gst_media_source_add_source_buffer (media_source, "", &error);
+
+  g_assert_null (source_buffer);
+  g_assert_error (error, GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_TYPE);
+
+  gst_object_unref (media_source);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_add_source_buffer_with_content_type_fake)
+{
+  GError *error = NULL;
+  GstMediaSource *media_source = gst_media_source_new ();
+  GstSourceBuffer *source_buffer =
+      gst_media_source_add_source_buffer (media_source, "fake/type", &error);
+
+  g_assert_null (source_buffer);
+  g_assert_error (error, GST_MEDIA_SOURCE_ERROR,
+      GST_MEDIA_SOURCE_ERROR_NOT_SUPPORTED);
+
+  gst_object_unref (media_source);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_add_source_buffer_to_unopened_media_source)
+{
+  GError *error = NULL;
+  GstMediaSource *media_source = gst_media_source_new ();
+  GstSourceBuffer *source_buffer =
+      gst_media_source_add_source_buffer (media_source, "video/webm", &error);
+
+  g_assert_null (source_buffer);
+  g_assert_error (error, GST_MEDIA_SOURCE_ERROR,
+      GST_MEDIA_SOURCE_ERROR_INVALID_STATE);
+
+  gst_object_unref (media_source);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_add_source_buffer_to_opened_media_source)
+{
+  GError *error = NULL;
+  GstMediaSource *media_source = opened_media_source ();
+  GstSourceBufferList *buffers =
+      gst_media_source_get_source_buffers (media_source);
+  guint n_buffers_before = gst_source_buffer_list_get_length (buffers);
+  GstSourceBuffer *source_buffer =
+      gst_media_source_add_source_buffer (media_source, "video/webm", &error);
+  guint n_buffers_after = gst_source_buffer_list_get_length (buffers);
+
+  fail_unless (GST_IS_SOURCE_BUFFER (source_buffer));
+  g_assert_no_error (error);
+  fail_unless (n_buffers_before < n_buffers_after);
+
+  g_object_unref (media_source);
+  g_object_unref (buffers);
+  g_object_unref (source_buffer);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_remove_source_buffer_from_unrelated_media_source)
+{
+  GError *error = NULL;
+  GstMediaSource *a = opened_media_source ();
+  GstMediaSource *b = opened_media_source ();
+  GstSourceBuffer *buffer_in_b =
+      gst_media_source_add_source_buffer (b, "video/webm", &error);
+
+  gst_media_source_remove_source_buffer (a, buffer_in_b, &error);
+  g_assert_error (error, GST_MEDIA_SOURCE_ERROR,
+      GST_MEDIA_SOURCE_ERROR_NOT_FOUND);
+
+  gst_object_unref (a);
+  gst_object_unref (b);
+  gst_object_unref (buffer_in_b);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_remove_source_buffer_from_parent_media_source)
+{
+  GError *error = NULL;
+  GstMediaSource *media_source = opened_media_source ();
+  GstSourceBufferList *buffers =
+      gst_media_source_get_source_buffers (media_source);
+  GstSourceBuffer *buffer =
+      gst_media_source_add_source_buffer (media_source, "video/webm", &error);
+
+  guint n_buffers_before = gst_source_buffer_list_get_length (buffers);
+  gst_media_source_remove_source_buffer (media_source, buffer, &error);
+  guint n_buffers_after = gst_source_buffer_list_get_length (buffers);
+
+  g_assert_no_error (error);
+  fail_unless (n_buffers_before > n_buffers_after);
+
+  gst_object_unref (media_source);
+  gst_object_unref (buffers);
+  gst_object_unref (buffer);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_set_live_seekable_range_on_unopened_media_source)
+{
+  GError *error = NULL;
+  GstMediaSource *media_source = gst_media_source_new ();
+
+  gst_media_source_set_live_seekable_range (media_source, 0, 1, &error);
+
+  g_assert_error (error, GST_MEDIA_SOURCE_ERROR,
+      GST_MEDIA_SOURCE_ERROR_INVALID_STATE);
+
+  gst_object_unref (media_source);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_set_backwards_live_seekable_range_on_opened_media_source)
+{
+  GError *error = NULL;
+  GstMediaSource *media_source = opened_media_source ();
+
+  gst_media_source_set_live_seekable_range (media_source, 2, 1, &error);
+
+  GstMediaSourceRange range = {
+    .start = GST_CLOCK_TIME_NONE,
+    .end = GST_CLOCK_TIME_NONE,
+  };
+  gst_media_source_get_live_seekable_range (media_source, &range);
+
+  g_assert_error (error, GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_TYPE);
+  fail_unless (range.start == 0);
+  fail_unless (range.end == 0);
+
+  gst_object_unref (media_source);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_set_live_seekable_range_on_opened_media_source)
+{
+  GError *error = NULL;
+  GstClockTime start = 1, end = 2;
+  GstMediaSource *media_source = opened_media_source ();
+
+  gst_media_source_set_live_seekable_range (media_source, start, end, &error);
+
+  GstMediaSourceRange range = {
+    .start = GST_CLOCK_TIME_NONE,
+    .end = GST_CLOCK_TIME_NONE,
+  };
+  gst_media_source_get_live_seekable_range (media_source, &range);
+
+  g_assert_no_error (error);
+  fail_unless (range.start == start);
+  fail_unless (range.end == end);
+
+  gst_object_unref (media_source);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_clear_live_seekable_range_on_unopened_media_source)
+{
+  GError *error = NULL;
+  GstMediaSource *media_source = gst_media_source_new ();
+
+  gst_media_source_clear_live_seekable_range (media_source, &error);
+
+  g_assert_error (error, GST_MEDIA_SOURCE_ERROR,
+      GST_MEDIA_SOURCE_ERROR_INVALID_STATE);
+
+  gst_object_unref (media_source);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_clear_live_seekable_range_on_opened_media_source)
+{
+  GError *error = NULL;
+  GstMediaSource *media_source = opened_media_source ();
+  gst_media_source_set_live_seekable_range (media_source, 1, 2, NULL);
+
+  gst_media_source_clear_live_seekable_range (media_source, &error);
+  GstMediaSourceRange range = {
+    .start = GST_CLOCK_TIME_NONE,
+    .end = GST_CLOCK_TIME_NONE,
+  };
+  gst_media_source_get_live_seekable_range (media_source, &range);
+
+  g_assert_no_error (error);
+  fail_unless (range.start == 0);
+  fail_unless (range.end == 0);
+
+  gst_object_unref (media_source);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_append_pipeline_create_and_free)
+{
+  GError *error = NULL;
+  GstAppendPipeline *pipeline = gst_append_pipeline_new (NULL, NULL, &error);
+  g_assert_no_error (error);
+  fail_unless (GST_IS_APPEND_PIPELINE (pipeline));
+  gst_check_object_destroyed_on_unref (pipeline);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+typedef struct
+{
+  GMutex mutex;
+  GCond eos_cond;
+  GCond error_cond;
+} AppendPipelineTestContext;
+
+static void
+test_append_pipeline_eos (GstAppendPipeline * pipeline,
+    GstMediaSourceTrack * track, gpointer user_data)
+{
+  AppendPipelineTestContext *context = user_data;
+  g_mutex_lock (&context->mutex);
+  g_cond_signal (&context->eos_cond);
+  g_mutex_unlock (&context->mutex);
+  GST_DEBUG_OBJECT (pipeline, "signalled eos");
+}
+
+static void
+test_append_pipeline_error (GstAppendPipeline * pipeline, gpointer user_data)
+{
+  AppendPipelineTestContext *context = user_data;
+  g_mutex_lock (&context->mutex);
+  g_cond_signal (&context->error_cond);
+  g_mutex_unlock (&context->mutex);
+  GST_DEBUG_OBJECT (pipeline, "signalled error");
+}
+
+static void
+test_append_pipeline_await_eos (GstAppendPipeline * pipeline,
+    AppendPipelineTestContext * context)
+{
+  GST_DEBUG_OBJECT (pipeline, "waiting for eos");
+  g_mutex_lock (&context->mutex);
+  while (!gst_append_pipeline_get_eos (pipeline)) {
+    g_cond_wait (&context->eos_cond, &context->mutex);
+  }
+  g_mutex_unlock (&context->mutex);
+  GST_DEBUG_OBJECT (pipeline, "received eos");
+}
+
+static void
+test_append_pipeline_await_error (GstAppendPipeline * pipeline,
+    AppendPipelineTestContext * context)
+{
+  GST_DEBUG_OBJECT (pipeline, "waiting for error");
+  g_mutex_lock (&context->mutex);
+  while (!gst_append_pipeline_get_failed (pipeline)) {
+    g_cond_wait (&context->error_cond, &context->mutex);
+  }
+  g_mutex_unlock (&context->mutex);
+  GST_DEBUG_OBJECT (pipeline, "received error");
+}
+
+static void
+test_append_pipeline (const gchar * filename)
+{
+  AppendPipelineTestContext context = { 0 };
+  GstAppendPipelineCallbacks callbacks = {
+    .eos = test_append_pipeline_eos,
+  };
+  GstAppendPipeline *pipeline =
+      gst_append_pipeline_new (&callbacks, &context, NULL);
+  GError *error = NULL;
+
+  gchar *data;
+  gsize length;
+
+  g_file_get_contents (filename, &data, &length, &error);
+  g_assert_no_error (error);
+
+  fail_unless (gst_append_pipeline_append (pipeline,
+          gst_buffer_new_wrapped (data, length)) == GST_FLOW_OK);
+
+  gst_append_pipeline_eos (pipeline);
+
+  test_append_pipeline_await_eos (pipeline, &context);
+
+  fail_if (gst_append_pipeline_get_failed (pipeline));
+
+  gst_object_unref (pipeline);
+  g_clear_error (&error);
+}
+
+GST_START_TEST (test_append_pipeline_mp4)
+{
+  gchar *filename = test_mp4_path ();
+  test_append_pipeline (filename);
+  g_free (filename);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_append_pipeline_webm)
+{
+  gchar *filename = test_webm_path ();
+  test_append_pipeline (filename);
+  g_free (filename);
+}
+
+GST_END_TEST;
+
+static GstAppendPipeline *
+failed_append_pipeline (GstAppendPipelineCallbacks * callbacks,
+    AppendPipelineTestContext * context)
+{
+  GstAppendPipeline *pipeline =
+      gst_append_pipeline_new (callbacks, context, NULL);
+
+  gst_append_pipeline_fail (pipeline);
+
+  return pipeline;
+}
+
+GST_START_TEST (test_append_pipeline_invalid_data_triggers_error)
+{
+  AppendPipelineTestContext context = { 0 };
+  GstAppendPipelineCallbacks callbacks = {
+    .eos = test_append_pipeline_eos,
+    .error = test_append_pipeline_error,
+  };
+  GstAppendPipeline *pipeline = failed_append_pipeline (&callbacks, &context);
+
+  test_append_pipeline_await_error (pipeline, &context);
+
+  gst_object_unref (pipeline);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_append_pipeline_invalid_data_triggers_eos)
+{
+  AppendPipelineTestContext context = { 0 };
+  GstAppendPipelineCallbacks callbacks = {
+    .eos = test_append_pipeline_eos,
+    .error = test_append_pipeline_error,
+  };
+  GstAppendPipeline *pipeline = failed_append_pipeline (&callbacks, &context);
+
+  test_append_pipeline_await_eos (pipeline, &context);
+
+  gst_object_unref (pipeline);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_append_pipeline_reset_recovery)
+{
+  AppendPipelineTestContext context = { 0 };
+  GstAppendPipelineCallbacks callbacks = {
+    .eos = test_append_pipeline_eos,
+    .error = test_append_pipeline_error,
+  };
+  GstAppendPipeline *pipeline = failed_append_pipeline (&callbacks, &context);
+
+  test_append_pipeline_await_error (pipeline, &context);
+  fail_unless (gst_append_pipeline_get_failed (pipeline));
+
+  fail_unless (gst_append_pipeline_reset (pipeline));
+  fail_if (gst_append_pipeline_get_failed (pipeline));
+
+  gchar *data;
+  gsize length;
+  {
+    GError *error = NULL;
+    gchar *filename = test_webm_path ();
+    g_file_get_contents (filename, &data, &length, &error);
+    g_assert_no_error (error);
+    g_clear_error (&error);
+    g_free (filename);
+  }
+
+  fail_unless (gst_append_pipeline_append (pipeline,
+          gst_buffer_new_wrapped (data, length)) == GST_FLOW_OK);
+
+  gst_append_pipeline_eos (pipeline);
+
+  test_append_pipeline_await_eos (pipeline, &context);
+
+  fail_if (gst_append_pipeline_get_failed (pipeline));
+
+  gst_object_unref (pipeline);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_track_create_and_free)
+{
+  GstMediaSourceTrack *track =
+      gst_media_source_track_new (GST_MEDIA_SOURCE_TRACK_TYPE_OTHER, "");
+  fail_unless (GST_IS_MEDIA_SOURCE_TRACK (track));
+  gst_check_object_destroyed_on_unref (track);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_track_create_with_invalid_type)
+{
+  add_log_filter (G_LOG_LEVEL_CRITICAL,
+      "^.*track_new_full: assertion .*type .* failed");
+
+  g_assert_null (gst_media_source_track_new (-1, ""));
+  g_assert_null (gst_media_source_track_new (GST_MEDIA_SOURCE_TRACK_TYPE_OTHER +
+          1, ""));
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_track_push_with_adequate_space)
+{
+  GstMediaSourceTrack *track =
+      gst_media_source_track_new_with_size (GST_MEDIA_SOURCE_TRACK_TYPE_OTHER,
+      "", 1);
+  GstBuffer *buffer = gst_buffer_new ();
+  GstSample *sample = gst_sample_new (buffer, NULL, NULL, NULL);
+  gboolean result = gst_media_source_track_push (track, sample);
+  fail_unless (result);
+  gst_buffer_unref (buffer);
+  gst_object_unref (track);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_track_push_with_inadequate_space)
+{
+  GstMediaSourceTrack *track =
+      gst_media_source_track_new_with_size (GST_MEDIA_SOURCE_TRACK_TYPE_OTHER,
+      "", 0);
+  GstBuffer *buffer = gst_buffer_new ();
+  GstSample *sample = gst_sample_new (buffer, NULL, NULL, NULL);
+  gboolean result = gst_media_source_track_try_push (track, sample);
+  fail_if (result);
+  gst_sample_unref (sample);
+  gst_buffer_unref (buffer);
+  gst_object_unref (track);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_track_buffer_empty)
+{
+  GstMediaSourceTrackBuffer *buffer = gst_media_source_track_buffer_new ();
+
+  GArray *ranges = gst_media_source_track_buffer_get_ranges (buffer);
+  fail_unless_equals_uint64 (ranges->len, 0);
+
+  gst_object_unref (buffer);
+  g_array_unref (ranges);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_track_buffer_single_span)
+{
+  GstMediaSourceTrackBuffer *buffer = gst_media_source_track_buffer_new ();
+
+  GstSample *sample = new_empty_sample_with_timing (0, 0, 1);
+  gst_media_source_track_buffer_add (buffer, sample);
+
+  GArray *ranges = gst_media_source_track_buffer_get_ranges (buffer);
+  fail_unless_equals_uint64 (ranges->len, 1);
+
+  GstMediaSourceRange range = g_array_index (ranges, GstMediaSourceRange, 0);
+  fail_unless_equals_uint64 (range.start, 0);
+  fail_unless_equals_uint64 (range.end, 1);
+
+  gst_sample_unref (sample);
+  gst_object_unref (buffer);
+  g_array_unref (ranges);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_track_buffer_continuous_span)
+{
+  GstMediaSourceTrackBuffer *buffer = gst_media_source_track_buffer_new ();
+
+  GstClockTime a_start = 0;
+  GstClockTime a_duration = GST_SECOND;
+  GstClockTime b_start = a_start + a_duration;
+  GstClockTime b_duration = a_duration;
+  GstSample *a = new_empty_sample_with_timing (a_start, a_start, a_duration);
+  GstSample *b = new_empty_sample_with_timing (b_start, b_start, b_duration);
+  gst_media_source_track_buffer_add (buffer, a);
+  gst_media_source_track_buffer_add (buffer, b);
+
+  GArray *ranges = gst_media_source_track_buffer_get_ranges (buffer);
+  fail_unless_equals_uint64 (ranges->len, 1);
+
+  GstMediaSourceRange range = g_array_index (ranges, GstMediaSourceRange, 0);
+  fail_unless_equals_uint64 (range.start, a_start);
+  fail_unless_equals_uint64 (range.end, a_start + a_duration + b_duration);
+
+  gst_sample_unref (a);
+  gst_sample_unref (b);
+  gst_object_unref (buffer);
+  g_array_unref (ranges);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_track_buffer_discontinuous_span)
+{
+  GstMediaSourceTrackBuffer *buffer = gst_media_source_track_buffer_new ();
+
+  GstClockTime a_start = 0;
+  GstClockTime a_duration = GST_SECOND;
+  GstClockTime b_start = a_start + a_duration + GST_SECOND;
+  GstClockTime b_duration = a_duration;
+  GstSample *a = new_empty_sample_with_timing (a_start, a_start, a_duration);
+  GstSample *b = new_empty_sample_with_timing (b_start, b_start, b_duration);
+  gst_media_source_track_buffer_add (buffer, a);
+  gst_media_source_track_buffer_add (buffer, b);
+
+  GArray *ranges = gst_media_source_track_buffer_get_ranges (buffer);
+  fail_unless_equals_uint64 (ranges->len, 2);
+
+  GstMediaSourceRange range_a = g_array_index (ranges, GstMediaSourceRange, 0);
+  fail_unless_equals_uint64 (range_a.start, a_start);
+  fail_unless_equals_uint64 (range_a.end, a_start + a_duration);
+
+  GstMediaSourceRange range_b = g_array_index (ranges, GstMediaSourceRange, 1);
+  fail_unless_equals_uint64 (range_b.start, b_start);
+  fail_unless_equals_uint64 (range_b.end, b_start + b_duration);
+
+  gst_sample_unref (a);
+  gst_sample_unref (b);
+  gst_object_unref (buffer);
+  g_array_unref (ranges);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_source_buffer_generate_timestamps_mp4)
+{
+  GstMediaSource *media_source = opened_media_source ();
+  GstSourceBuffer *source_buffer = gst_media_source_add_source_buffer
+      (media_source, "video/mp4", NULL);
+
+  fail_unless_equals_uint64 (gst_source_buffer_get_append_mode (source_buffer),
+      GST_SOURCE_BUFFER_APPEND_MODE_SEGMENTS);
+
+  gst_object_unref (source_buffer);
+  gst_object_unref (media_source);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_source_buffer_generate_timestamps_aac)
+{
+  GstMediaSource *media_source = opened_media_source ();
+  GstSourceBuffer *source_buffer = gst_media_source_add_source_buffer
+      (media_source, "audio/aac", NULL);
+
+  fail_unless (GST_IS_SOURCE_BUFFER (source_buffer));
+
+  fail_unless_equals_uint64 (gst_source_buffer_get_append_mode (source_buffer),
+      GST_SOURCE_BUFFER_APPEND_MODE_SEQUENCE);
+
+  gst_object_unref (source_buffer);
+  gst_object_unref (media_source);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_source_buffer_change_content_type_null)
+{
+  GstMediaSource *media_source = opened_media_source ();
+  GstSourceBuffer *source_buffer = gst_media_source_add_source_buffer
+      (media_source, "video/mp4", NULL);
+
+  fail_unless (GST_IS_SOURCE_BUFFER (source_buffer));
+
+  GError *error = NULL;
+  gst_source_buffer_change_content_type (source_buffer, NULL, &error);
+  g_assert_error (error, GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_TYPE);
+
+  g_clear_error (&error);
+  gst_object_unref (source_buffer);
+  gst_object_unref (media_source);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_source_buffer_change_content_type_empty)
+{
+  GstMediaSource *media_source = opened_media_source ();
+  GstSourceBuffer *source_buffer = gst_media_source_add_source_buffer
+      (media_source, "video/mp4", NULL);
+
+  fail_unless (GST_IS_SOURCE_BUFFER (source_buffer));
+
+  GError *error = NULL;
+  gst_source_buffer_change_content_type (source_buffer, "", &error);
+  g_assert_error (error, GST_MEDIA_SOURCE_ERROR, GST_MEDIA_SOURCE_ERROR_TYPE);
+
+  g_clear_error (&error);
+  gst_object_unref (source_buffer);
+  gst_object_unref (media_source);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_source_buffer_change_content_type)
+{
+  GstMediaSource *media_source = opened_media_source ();
+  GstSourceBuffer *source_buffer = gst_media_source_add_source_buffer
+      (media_source, "video/mp4", NULL);
+
+  fail_unless (GST_IS_SOURCE_BUFFER (source_buffer));
+
+  GError *error = NULL;
+  gst_source_buffer_change_content_type (source_buffer, "video/webm", &error);
+  g_assert_error (error, GST_MEDIA_SOURCE_ERROR,
+      GST_MEDIA_SOURCE_ERROR_NOT_SUPPORTED);
+
+  gst_object_unref (source_buffer);
+  gst_object_unref (media_source);
+  g_clear_error (&error);
+}
+
+GST_END_TEST;
+
+static const gchar *unsupported_content_types = {
+  "xxx",
+  "text/html",
+  "image/jpeg",
+};
+
+GST_START_TEST (test_media_source_unsupported_content_type)
+{
+  const gchar *content_type = unsupported_content_types__i__;
+  ck_assert_msg (!gst_media_source_is_type_supported (content_type),
+      "%s should be rejected as an unsupported MIME type", content_type);
+}
+
+GST_END_TEST;
+
+static const gchar *valid_mp4_content_types = {
+  "video/mp4;codecs=\"avc1.4d001e\"",   // H.264 Main Profile level 3.0
+  "video/mp4;codecs=\"avc1.42001e\"",   // H.264 Baseline Profile level 3.0
+  "audio/mp4;codecs=\"mp4a.40.2\"",     // MPEG4 AAC-LC
+  "audio/mp4;codecs=\"mp4a.40.5\"",     // MPEG4 HE-AAC
+  "audio/mp4;codecs=\"mp4a.67\"",       // MPEG2 AAC-LC
+  "video/mp4;codecs=\"mp4a.40.2\"",
+  "video/mp4;codecs=\"avc1.4d001e,mp4a.40.2\"",
+  "video/mp4;codecs=\"mp4a.40.2 , avc1.4d001e \"",
+  "video/mp4;codecs=\"avc1.4d001e,mp4a.40.5\"",
+  "audio/mp4;codecs=\"Opus\"",
+  "video/mp4;codecs=\"Opus\"",
+  "audio/mp4;codecs=\"fLaC\"",
+  "video/mp4;codecs=\"fLaC\"",
+};
+
+GST_START_TEST (test_media_source_supported_mp4_content_type)
+{
+  const gchar *content_type = valid_mp4_content_types__i__;
+  ck_assert_msg (gst_media_source_is_type_supported (content_type),
+      "%s must be a supported MP4 content type", content_type);
+}
+
+GST_END_TEST;
+
+static const gchar *valid_webm_content_types = {
+  "video/webm;codecs=\"vp8\"",
+  "video/webm;codecs=\"vorbis\"",
+  "video/webm;codecs=\"vp8,vorbis\"",
+  "video/webm;codecs=\"vorbis, vp8\"",
+  "audio/webm;codecs=\"vorbis\"",
+  "AUDIO/WEBM;CODECS=\"vorbis\"",
+  "audio/webm;codecs=vorbis;test=\"6\"",
+  "audio/webm;codecs=\"opus\"",
+  "video/webm;codecs=\"opus\"",
+};
+
+GST_START_TEST (test_media_source_supported_webm_content_type)
+{
+  const gchar *content_type = valid_webm_content_types__i__;
+  ck_assert_msg (gst_media_source_is_type_supported (content_type),
+      "%s must be a supported WebM content type", content_type);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_sample_map_create_and_destroy)
+{
+  GstMediaSourceSampleMap *map = gst_media_source_sample_map_new ();
+  gst_check_object_destroyed_on_unref (map);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_sample_map_add_valid_sample)
+{
+  GstMediaSourceSampleMap *map = gst_media_source_sample_map_new ();
+
+  GstSample *sample = new_empty_sample_with_timing (0, 0, 0);
+
+  fail_if (gst_media_source_sample_map_contains (map, sample));
+
+  gst_media_source_sample_map_add (map, sample);
+
+  fail_unless (gst_media_source_sample_map_contains (map, sample));
+
+  gst_object_unref (map);
+  gst_sample_unref (sample);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_sample_map_add_invalid_sample)
+{
+  add_log_filter (G_LOG_LEVEL_CRITICAL,
+      "^.*_sample_map_add: assertion .* failed");
+
+  GstMediaSourceSampleMap *map = gst_media_source_sample_map_new ();
+
+  GstSample *sample = new_empty_sample_with_timing (GST_CLOCK_TIME_NONE,
+      GST_CLOCK_STIME_NONE, GST_CLOCK_TIME_NONE);
+
+  gst_media_source_sample_map_add (map, sample);
+
+  fail_if (gst_media_source_sample_map_contains (map, sample));
+
+  gst_object_unref (map);
+  gst_sample_unref (sample);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_sample_map_remove_sample)
+{
+  GstMediaSourceSampleMap *map = gst_media_source_sample_map_new ();
+
+  GstSample *sample = new_empty_sample_with_timing (0, 0, 0);
+  gst_media_source_sample_map_add (map, sample);
+
+  gst_media_source_sample_map_remove (map, sample);
+
+  fail_if (gst_media_source_sample_map_contains (map, sample));
+
+  gst_object_unref (map);
+  gst_sample_unref (sample);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_sample_map_remove_range_from_start)
+{
+  GstMediaSourceSampleMap *map = gst_media_source_sample_map_new ();
+
+  GstSample *samples_to_remove100 = { NULL };
+  for (guint i = 0; i < G_N_ELEMENTS (samples_to_remove); i++) {
+    GstClockTime time = i;
+    GstSample *sample = new_empty_sample_with_timing (time, time, 1);
+    gst_media_source_sample_map_add (map, sample);
+    samples_to_removei = sample;
+  }
+  GstSample *samples_to_preserve100 = { NULL };
+  for (guint i = 0; i < G_N_ELEMENTS (samples_to_preserve); i++) {
+    GstClockTime time = i + G_N_ELEMENTS (samples_to_remove);
+    GstSample *sample = new_empty_sample_with_timing (time, time, 0);
+    gst_media_source_sample_map_add (map, sample);
+    samples_to_preservei = sample;
+  }
+
+  gst_media_source_sample_map_remove_range_from_start (map, 100);
+
+  for (guint i = 0; i < G_N_ELEMENTS (samples_to_remove); i++) {
+    GstSample *sample = samples_to_removei;
+    fail_if (gst_media_source_sample_map_contains (map, sample));
+    gst_sample_unref (sample);
+  }
+  for (guint i = 0; i < G_N_ELEMENTS (samples_to_preserve); i++) {
+    GstSample *sample = samples_to_preservei;
+    fail_unless (gst_media_source_sample_map_contains (map, sample));
+    gst_sample_unref (sample);
+  }
+
+  gst_object_unref (map);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_sample_map_remove_range_from_start_byte_count)
+{
+  GstMediaSourceSampleMap *map = gst_media_source_sample_map_new ();
+
+  GstSample *samples_to_remove100 = { NULL };
+  const guint8 chunk1000 = { 0 };
+  gsize total_bytes_to_remove = 0;
+  for (guint i = 0; i < G_N_ELEMENTS (samples_to_remove); i++) {
+    GstClockTime time = i;
+    gsize buffer_size = g_random_int_range (0, G_N_ELEMENTS (chunk));
+    GBytes *bytes = g_bytes_new_static (chunk, buffer_size);
+    total_bytes_to_remove += buffer_size;
+    GstSample *sample = new_sample_with_bytes_and_timing (bytes, time, time, 1);
+    gst_media_source_sample_map_add (map, sample);
+    samples_to_removei = sample;
+  }
+  GstSample *samples_to_preserve100 = { NULL };
+  for (guint i = 0; i < G_N_ELEMENTS (samples_to_preserve); i++) {
+    GstClockTime time = i + G_N_ELEMENTS (samples_to_remove);
+    GBytes *bytes = g_bytes_new_static (chunk, 1);
+    GstSample *sample = new_sample_with_bytes_and_timing (bytes, time, time, 0);
+    gst_media_source_sample_map_add (map, sample);
+    samples_to_preservei = sample;
+  }
+
+  gsize bytes_removed =
+      gst_media_source_sample_map_remove_range_from_start (map,
+      G_N_ELEMENTS (samples_to_remove));
+  fail_unless_equals_uint64 (bytes_removed, total_bytes_to_remove);
+
+  for (guint i = 0; i < G_N_ELEMENTS (samples_to_remove); i++) {
+    gst_sample_unref (samples_to_removei);
+  }
+  for (guint i = 0; i < G_N_ELEMENTS (samples_to_preserve); i++) {
+    gst_sample_unref (samples_to_preservei);
+  }
+
+  gst_object_unref (map);
+}
+
+GST_END_TEST;
+
+#define DEFAULT_TCASE_TIMEOUT 15
+
+#ifdef HAVE_VALGRIND
+#define TCASE_TIMEOUT (RUNNING_ON_VALGRIND ? (5 * 60) : DEFAULT_TCASE_TIMEOUT)
+#else
+#define TCASE_TIMEOUT DEFAULT_TCASE_TIMEOUT
+#endif
+
+static inline TCase *
+new_tcase (const gchar * name)
+{
+  TCase *tcase = tcase_create (name);
+  tcase_set_timeout (tcase, TCASE_TIMEOUT);
+  return tcase;
+}
+
+static Suite *
+mse_suite (void)
+{
+  Suite *s = suite_create ("GstMse");
+
+  TCase *tc_media_source = new_tcase ("GstMediaSource");
+  TCase *tc_source_buffer = new_tcase ("GstSourceBuffer");
+  TCase *tc_source_buffer_list = new_tcase ("GstSourceBufferList");
+  TCase *tc_append_pipeline = new_tcase ("GstAppendPipeline");
+  TCase *tc_track = new_tcase ("GstMediaSourceTrack");
+  TCase *tc_track_buffer = new_tcase ("GstMediaSourceTrackBuffer");
+  TCase *tc_sample_map = new_tcase ("GstMediaSourceSampleMap");
+
+  tcase_add_test (tc_media_source, test_create_and_free);
+  tcase_add_test (tc_media_source, test_create_initial_state);
+  tcase_add_test (tc_media_source,
+      test_add_source_buffer_with_content_type_null);
+  tcase_add_test (tc_media_source,
+      test_add_source_buffer_with_content_type_empty);
+  tcase_add_test (tc_media_source,
+      test_add_source_buffer_with_content_type_fake);
+  tcase_add_test (tc_media_source,
+      test_add_source_buffer_to_unopened_media_source);
+  tcase_add_test (tc_media_source,
+      test_add_source_buffer_to_opened_media_source);
+  tcase_add_test (tc_media_source,
+      test_remove_source_buffer_from_unrelated_media_source);
+  tcase_add_test (tc_media_source,
+      test_remove_source_buffer_from_parent_media_source);
+  tcase_add_test (tc_media_source,
+      test_set_live_seekable_range_on_unopened_media_source);
+  tcase_add_test (tc_media_source,
+      test_set_backwards_live_seekable_range_on_opened_media_source);
+  tcase_add_test (tc_media_source,
+      test_set_live_seekable_range_on_opened_media_source);
+  tcase_add_test (tc_media_source,
+      test_clear_live_seekable_range_on_unopened_media_source);
+  tcase_add_test (tc_media_source,
+      test_clear_live_seekable_range_on_opened_media_source);
+  tcase_add_loop_test (tc_media_source,
+      test_media_source_unsupported_content_type,
+      0, G_N_ELEMENTS (unsupported_content_types));
+  tcase_add_loop_test (tc_media_source,
+      test_media_source_supported_mp4_content_type,
+      0, G_N_ELEMENTS (valid_mp4_content_types));
+  tcase_add_loop_test (tc_media_source,
+      test_media_source_supported_webm_content_type,
+      0, G_N_ELEMENTS (valid_webm_content_types));
+
+  tcase_add_test (tc_source_buffer, test_source_buffer_generate_timestamps_mp4);
+  tcase_add_test (tc_source_buffer, test_source_buffer_generate_timestamps_aac);
+
+  tcase_add_test (tc_source_buffer,
+      test_source_buffer_change_content_type_null);
+  tcase_add_test (tc_source_buffer,
+      test_source_buffer_change_content_type_empty);
+  tcase_add_test (tc_source_buffer, test_source_buffer_change_content_type);
+
+  tcase_add_test (tc_append_pipeline, test_append_pipeline_create_and_free);
+  tcase_add_test (tc_append_pipeline, test_append_pipeline_mp4);
+  tcase_add_test (tc_append_pipeline, test_append_pipeline_webm);
+  tcase_add_test (tc_append_pipeline,
+      test_append_pipeline_invalid_data_triggers_eos);
+  tcase_add_test (tc_append_pipeline,
+      test_append_pipeline_invalid_data_triggers_error);
+  tcase_add_test (tc_append_pipeline, test_append_pipeline_reset_recovery);
+
+  tcase_add_test (tc_track, test_track_create_and_free);
+  tcase_add_test (tc_track, test_track_create_with_invalid_type);
+  tcase_add_test (tc_track, test_track_push_with_adequate_space);
+  tcase_add_test (tc_track, test_track_push_with_inadequate_space);
+
+  tcase_add_test (tc_track_buffer, test_track_buffer_empty);
+  tcase_add_test (tc_track_buffer, test_track_buffer_single_span);
+  tcase_add_test (tc_track_buffer, test_track_buffer_continuous_span);
+  tcase_add_test (tc_track_buffer, test_track_buffer_discontinuous_span);
+
+  tcase_add_test (tc_sample_map, test_sample_map_create_and_destroy);
+  tcase_add_test (tc_sample_map, test_sample_map_add_valid_sample);
+  tcase_add_test (tc_sample_map, test_sample_map_add_invalid_sample);
+  tcase_add_test (tc_sample_map, test_sample_map_remove_sample);
+  tcase_add_test (tc_sample_map, test_sample_map_remove_range_from_start);
+  tcase_add_test (tc_sample_map,
+      test_sample_map_remove_range_from_start_byte_count);
+
+  suite_add_tcase (s, tc_media_source);
+  suite_add_tcase (s, tc_source_buffer);
+  suite_add_tcase (s, tc_source_buffer_list);
+  suite_add_tcase (s, tc_append_pipeline);
+  suite_add_tcase (s, tc_track);
+  suite_add_tcase (s, tc_track_buffer);
+  suite_add_tcase (s, tc_sample_map);
+
+  return s;
+}
+
+GST_CHECK_MAIN (mse)

gst-plugins-bad-1.22.7.tar.xz/tests/check/libs/play.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/play.c Changed

gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/vkformat.c Added

@@ -0,0 +1,117 @@
+/* GStreamer
+ *
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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 <gst/gst.h>
+#include <gst/check/gstcheck.h>
+#include <gst/vulkan/vulkan.h>
+
+static GstVulkanInstance *instance;
+static GstVulkanDevice *device;
+
+static void
+setup (void)
+{
+  instance = gst_vulkan_instance_new ();
+  fail_unless (gst_vulkan_instance_open (instance, NULL));
+  device = gst_vulkan_device_new_with_index (instance, 0);
+  fail_unless (gst_vulkan_device_open (device, NULL));
+}
+
+static void
+teardown (void)
+{
+  gst_object_unref (instance);
+  gst_object_unref (device);
+}
+
+GST_START_TEST (test_format_from_video_info_2)
+{
+  GstVulkanPhysicalDevice *phy_dev = device->physical_device;
+  GstVideoInfo vinfo;
+  VkFormat vk_fmtsGST_VIDEO_MAX_PLANES;
+  int n_imgs;
+  VkImageUsageFlags supported_usage;
+
+  fail_unless (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_NV12, 620,
+          480));
+
+  fail_unless (gst_vulkan_format_from_video_info_2 (phy_dev, &vinfo,
+          VK_IMAGE_TILING_OPTIMAL, TRUE, 0, vk_fmts, &n_imgs,
+          &supported_usage));
+
+  fail_unless (n_imgs == 2 && vk_fmts0 == VK_FORMAT_R8_UNORM
+      && vk_fmts1 == VK_FORMAT_R8G8_UNORM);
+
+  fail_unless (gst_vulkan_format_from_video_info_2 (phy_dev, &vinfo,
+          VK_IMAGE_TILING_LINEAR, FALSE, 0, vk_fmts, &n_imgs,
+          &supported_usage));
+
+  fail_unless (n_imgs == 1 && vk_fmts0 == VK_FORMAT_G8_B8R8_2PLANE_420_UNORM);
+
+  fail_unless (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_RGBA, 620,
+          480));
+  fail_unless (GST_VIDEO_INFO_COLORIMETRY (&vinfo).transfer ==
+      GST_VIDEO_TRANSFER_SRGB);
+
+  fail_unless (gst_vulkan_format_from_video_info_2 (phy_dev, &vinfo,
+          VK_IMAGE_TILING_LINEAR, TRUE, 0, vk_fmts, &n_imgs, &supported_usage));
+
+  fail_unless (n_imgs == 1 && vk_fmts0 == VK_FORMAT_R8G8B8A8_SRGB);
+
+  fail_unless (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_RGBA, 620,
+          480));
+  fail_unless (gst_video_colorimetry_from_string
+      (&GST_VIDEO_INFO_COLORIMETRY (&vinfo), "smpte240m"));
+
+  fail_unless (gst_vulkan_format_from_video_info_2 (phy_dev, &vinfo,
+          VK_IMAGE_TILING_LINEAR, TRUE, 0, vk_fmts, &n_imgs, &supported_usage));
+
+  fail_unless (n_imgs == 1 && vk_fmts0 == VK_FORMAT_R8G8B8A8_UNORM);
+}
+
+GST_END_TEST;
+
+static Suite *
+vkformat_suite (void)
+{
+  Suite *s = suite_create ("vkmemory");
+  TCase *tc_basic = tcase_create ("general");
+  gboolean have_instance;
+
+  suite_add_tcase (s, tc_basic);
+  tcase_add_checked_fixture (tc_basic, setup, teardown);
+
+  /* FIXME: CI doesn't have a software vulkan renderer (and none exists currently) */
+  instance = gst_vulkan_instance_new ();
+  have_instance = gst_vulkan_instance_open (instance, NULL);
+  gst_object_unref (instance);
+  if (have_instance) {
+    tcase_add_test (tc_basic, test_format_from_video_info_2);
+  }
+
+  return s;
+}
+
+
+GST_CHECK_MAIN (vkformat);

gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/vkimagebufferpool.c Added

@@ -0,0 +1,235 @@
+/* GStreamer
+ *
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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 <gst/gst.h>
+#include <gst/check/gstcheck.h>
+#include <gst/vulkan/vulkan.h>
+
+static GstVulkanInstance *instance;
+static GstVulkanDevice *device;
+static GstVulkanQueue *queue = NULL;
+
+static void
+setup (void)
+{
+  instance = gst_vulkan_instance_new ();
+  fail_unless (gst_vulkan_instance_open (instance, NULL));
+
+  device = gst_vulkan_device_new_with_index (instance, 0);
+  fail_unless (gst_vulkan_device_open (device, NULL));
+
+}
+
+static void
+teardown (void)
+{
+  gst_clear_object (&queue);
+  gst_clear_object (&device);
+  gst_object_unref (instance);
+}
+
+static void
+setup_queue (guint expected_flags)
+{
+  queue = gst_vulkan_device_select_queue (device, VK_QUEUE_COMPUTE_BIT);
+
+  fail_unless (GST_IS_VULKAN_QUEUE (queue));
+}
+
+static GstBufferPool *
+create_buffer_pool (const char *format, VkImageUsageFlags usage,
+    VkImageLayout initial_layout, guint64 initial_access, GstCaps * dec_caps)
+{
+  GstCaps *caps;
+  GstBufferPool *pool;
+  GstStructure *config;
+
+  caps = gst_caps_new_simple ("video/x-raw", "format", G_TYPE_STRING, format,
+      "width", G_TYPE_INT, 1024, "height", G_TYPE_INT, 780, NULL);
+  gst_caps_set_features_simple (caps,
+      gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_VULKAN_IMAGE, NULL));
+
+  pool = gst_vulkan_image_buffer_pool_new (device);
+
+  config = gst_buffer_pool_get_config (pool);
+
+  gst_buffer_pool_config_set_params (config, caps, 1024, 1, 0);
+  gst_caps_unref (caps);
+
+  gst_vulkan_image_buffer_pool_config_set_allocation_params (config,
+      usage, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, initial_layout,
+      initial_access);
+
+  if (dec_caps)
+    gst_vulkan_image_buffer_pool_config_set_decode_caps (config, dec_caps);
+
+  fail_unless (gst_buffer_pool_set_config (pool, config));
+  gst_buffer_pool_set_active (pool, TRUE);
+
+  return pool;
+}
+
+GST_START_TEST (test_image)
+{
+  GstBufferPool *pool;
+  GstFlowReturn ret;
+  GstBuffer *buffer = NULL;
+
+  setup_queue (VK_QUEUE_COMPUTE_BIT);
+  pool = create_buffer_pool ("NV12", 0, VK_IMAGE_LAYOUT_UNDEFINED, 0, NULL);
+
+  ret = gst_buffer_pool_acquire_buffer (pool, &buffer, NULL);
+  fail_unless (ret == GST_FLOW_OK);
+  gst_buffer_unref (buffer);
+
+  gst_buffer_pool_set_active (pool, FALSE);
+  gst_object_unref (pool);
+}
+
+GST_END_TEST;
+
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+GST_START_TEST (test_vulkan_profiles)
+{
+  GstCaps *caps;
+  /* *INDENT-OFF* */
+  GstVulkanVideoProfile profile2 = { { 0, }, }, profile = {
+    .profile = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR,
+      .pNext = &profile.codec,
+      .videoCodecOperation = VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR,
+      .chromaSubsampling = VK_VIDEO_CHROMA_SUBSAMPLING_420_BIT_KHR,
+      .chromaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_10_BIT_KHR,
+      .lumaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_10_BIT_KHR,
+    },
+    .codec.h265dec = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR,
+      .stdProfileIdc = STD_VIDEO_H265_PROFILE_IDC_MAIN_10,
+    }
+  };
+  /* *INDENT-ON* */
+
+  caps = gst_vulkan_video_profile_to_caps (&profile);
+  fail_unless (caps);
+
+  fail_unless (gst_vulkan_video_profile_from_caps (&profile2, caps,
+          GST_VULKAN_VIDEO_OPERATION_DECODE));
+  gst_caps_unref (caps);
+  fail_unless (profile2.profile.sType
+      == VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR);
+  fail_unless (profile2.profile.videoCodecOperation
+      == profile.profile.videoCodecOperation);
+  fail_unless (profile2.codec.h265dec.stdProfileIdc
+      == profile.codec.h265dec.stdProfileIdc);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_decoding_image)
+{
+  GstBufferPool *pool;
+  GstCaps *dec_caps;
+  GstBuffer *buffer = NULL;
+  GstFlowReturn ret;
+  /* *INDENT-OFF* */
+  GstVulkanVideoProfile profile = {
+    .profile = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR,
+      .pNext = &profile.codec,
+      .videoCodecOperation = VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR,
+      .chromaSubsampling = VK_VIDEO_CHROMA_SUBSAMPLING_420_BIT_KHR,
+      .chromaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR,
+      .lumaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR,
+    },
+    .codec.h264dec = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR,
+      .stdProfileIdc = STD_VIDEO_H264_PROFILE_IDC_MAIN,
+      .pictureLayout = VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_PROGRESSIVE_KHR,
+    }
+  };
+  /* *INDENT-ON* */
+
+  /* force to use a queue with decoding support */
+  if (queue && (device->physical_device->queue_family_opsqueue->family.video
+          & VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR) == 0)
+    gst_clear_object (&queue);
+
+  if (!queue) {
+    queue =
+        gst_vulkan_device_select_queue (device, VK_QUEUE_VIDEO_DECODE_BIT_KHR);
+  }
+
+  if (!queue)
+    return;
+
+  if ((device->physical_device->queue_family_opsqueue->family.video
+          & VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR) == 0)
+    return;
+
+  dec_caps = gst_vulkan_video_profile_to_caps (&profile);
+  fail_unless (dec_caps);
+
+  pool = create_buffer_pool ("NV12", VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR,
+      VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR, VK_ACCESS_TRANSFER_WRITE_BIT,
+      dec_caps);
+
+  gst_caps_unref (dec_caps);
+
+  ret = gst_buffer_pool_acquire_buffer (pool, &buffer, NULL);
+  fail_unless (ret == GST_FLOW_OK);
+  gst_buffer_unref (buffer);
+
+  gst_buffer_pool_set_active (pool, FALSE);
+  gst_object_unref (pool);
+}
+
+GST_END_TEST;
+#endif
+
+static Suite *
+vkimagebufferpool_suite (void)
+{
+  Suite *s = suite_create ("vkimagebufferpool");
+  TCase *tc_basic = tcase_create ("general");
+  gboolean have_instance;
+
+  suite_add_tcase (s, tc_basic);
+  tcase_add_checked_fixture (tc_basic, setup, teardown);
+
+  /* FIXME: CI doesn't have a software vulkan renderer (and none exists currently) */
+  instance = gst_vulkan_instance_new ();
+  have_instance = gst_vulkan_instance_open (instance, NULL);
+  gst_object_unref (instance);
+  if (have_instance) {
+    tcase_add_test (tc_basic, test_image);
+#if GST_VULKAN_HAVE_VIDEO_EXTENSIONS
+    tcase_add_test (tc_basic, test_decoding_image);
+    tcase_add_test (tc_basic, test_vulkan_profiles);
+#endif
+  }
+
+  return s;
+}
+
+GST_CHECK_MAIN (vkimagebufferpool);

gst-plugins-bad-1.24.5.tar.xz/tests/check/libs/vkvideodecode.c Added

@@ -0,0 +1,846 @@
+/* GStreamer
+ *
+ * Copyright (C) 2023 Igalia, S.L.
+ *
+ * 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 <gst/gst.h>
+#include <gst/check/gstcheck.h>
+#include <gst/vulkan/vulkan.h>
+
+static GstVulkanInstance *instance;
+static GstVulkanDevice *device;
+static GstVulkanQueue *video_queue = NULL;
+static GstVulkanQueue *graphics_queue = NULL;
+
+static void
+setup (void)
+{
+  instance = gst_vulkan_instance_new ();
+  fail_unless (gst_vulkan_instance_open (instance, NULL));
+}
+
+static void
+teardown (void)
+{
+  gst_clear_object (&video_queue);
+  gst_clear_object (&graphics_queue);
+  gst_clear_object (&device);
+  gst_object_unref (instance);
+}
+
+struct QueueProps
+{
+  guint expected_flags;
+  guint codec;
+};
+
+static gboolean
+_choose_queue (GstVulkanDevice * device, GstVulkanQueue * _queue, gpointer data)
+{
+  guint flags =
+      device->physical_device->queue_family_props_queue->family.queueFlags;
+  guint32 codec =
+      device->physical_device->queue_family_ops_queue->family.video;
+  struct QueueProps *qprops = data;
+
+  if ((flags & VK_QUEUE_TRANSFER_BIT) == VK_QUEUE_TRANSFER_BIT) {
+    gst_object_replace ((GstObject **) & graphics_queue,
+        GST_OBJECT_CAST (_queue));
+  }
+
+  if (((flags & qprops->expected_flags) == qprops->expected_flags)
+      && ((codec & qprops->codec) == qprops->codec))
+    gst_object_replace ((GstObject **) & video_queue, GST_OBJECT_CAST (_queue));
+
+
+  return !(graphics_queue && video_queue);
+}
+
+static void
+setup_queue (guint expected_flags, guint codec)
+{
+  int i;
+  struct QueueProps qprops = { expected_flags, codec };
+
+  for (i = 0; i < instance->n_physical_devices; i++) {
+    device = gst_vulkan_device_new_with_index (instance, i);
+    fail_unless (gst_vulkan_device_open (device, NULL));
+    gst_vulkan_device_foreach_queue (device, _choose_queue, &qprops);
+    if (video_queue && GST_IS_VULKAN_QUEUE (video_queue)
+        && graphics_queue && GST_IS_VULKAN_QUEUE (graphics_queue))
+      break;
+    gst_clear_object (&device);
+    gst_clear_object (&video_queue);
+    gst_clear_object (&graphics_queue);
+  }
+}
+
+static void
+get_output_buffer (GstVulkanDecoder * dec, VkFormat vk_format,
+    GstVulkanDecoderPicture * pic)
+{
+  GstBuffer *outbuf;
+  VkImageUsageFlags usage =
+      VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR
+      | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
+  GstVideoFormat format = gst_vulkan_format_to_video_format (vk_format);
+  GstCaps *profile_caps, *caps = gst_caps_new_simple ("video/x-raw", "format",
+      G_TYPE_STRING, gst_video_format_to_string (format), "width", G_TYPE_INT,
+      320, "height", G_TYPE_INT, 240, NULL);
+  GstBufferPool *pool;
+  GstStructure *config;
+
+  gst_caps_set_features_simple (caps,
+      gst_caps_features_new (GST_CAPS_FEATURE_MEMORY_VULKAN_IMAGE, NULL));
+
+  profile_caps = gst_vulkan_decoder_profile_caps (dec);
+  fail_unless (profile_caps);
+  fail_unless (gst_vulkan_decoder_create_dpb_pool (dec, caps));
+
+  if (!dec->dedicated_dpb)
+    usage |= VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR;
+
+  pool = gst_vulkan_image_buffer_pool_new (device);
+
+  config = gst_buffer_pool_get_config (pool);
+
+  gst_buffer_pool_config_set_params (config, caps, 1024, 1, 0);
+
+  gst_caps_unref (caps);
+
+  gst_vulkan_image_buffer_pool_config_set_allocation_params (config, usage,
+      VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+      VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR, VK_ACCESS_TRANSFER_WRITE_BIT);
+  gst_vulkan_image_buffer_pool_config_set_decode_caps (config, profile_caps);
+
+  gst_caps_unref (profile_caps);
+
+  fail_unless (gst_buffer_pool_set_config (pool, config));
+  fail_unless (gst_buffer_pool_set_active (pool, TRUE));
+
+  fail_unless (gst_buffer_pool_acquire_buffer (pool, &outbuf, NULL) ==
+      GST_FLOW_OK);
+
+  fail_unless (gst_vulkan_decoder_picture_init (dec, pic, outbuf));
+
+  gst_buffer_unref (outbuf);
+  fail_unless (gst_buffer_pool_set_active (pool, FALSE));
+  gst_object_unref (pool);
+}
+
+static void
+download_and_check_output_buffer (GstVulkanDecoder * dec, VkFormat vk_format,
+    GstVulkanDecoderPicture * pic)
+{
+  GstVulkanOperation *exec;
+  GstVulkanCommandPool *cmd_pool;
+  GstBufferPool *out_pool = gst_vulkan_buffer_pool_new (dec->queue->device);
+  GstStructure *config = gst_buffer_pool_get_config (out_pool);
+  GstVideoFormat format = gst_vulkan_format_to_video_format (vk_format);
+  GstCaps *caps = gst_caps_new_simple ("video/x-raw", "format",
+      G_TYPE_STRING, gst_video_format_to_string (format), "width", G_TYPE_INT,
+      320, "height", G_TYPE_INT, 240, NULL);
+  GstBuffer *rawbuf;
+  GError *error = NULL;
+  GArray *barriers;
+  GstVideoInfo info;
+  GstMapInfo mapinfo;
+  guint i, n_mems, n_planes;
+
+  gst_buffer_pool_config_set_params (config, caps, 1, 0, 0);
+  gst_buffer_pool_set_config (out_pool, config);
+
+  gst_video_info_from_caps (&info, caps);
+  gst_caps_unref (caps);
+
+  gst_buffer_pool_set_active (out_pool, TRUE);
+  fail_unless (gst_buffer_pool_acquire_buffer (out_pool, &rawbuf, NULL)
+      == GST_FLOW_OK);
+
+  cmd_pool = gst_vulkan_queue_create_command_pool (graphics_queue, &error);
+  fail_unless (cmd_pool);
+  exec = gst_vulkan_operation_new (cmd_pool);
+  gst_object_unref (cmd_pool);
+
+  fail_unless (gst_vulkan_operation_begin (exec, &error));
+  gst_vulkan_operation_add_dependency_frame (exec, pic->out,
+      VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
+
+  gst_vulkan_operation_add_frame_barrier (exec, pic->out,
+      VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+      VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
+      VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, NULL);
+
+  barriers = gst_vulkan_operation_retrieve_image_barriers (exec);
+  /* *INDENT-OFF* */
+  vkCmdPipelineBarrier2 (exec->cmd_buf->cmd, &(VkDependencyInfo) {
+      .sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO,
+      .pImageMemoryBarriers = (gpointer) barriers->data,
+      .imageMemoryBarrierCount = barriers->len,
+    });
+  /* *INDENT-ON* */
+
+  n_planes = GST_VIDEO_INFO_N_PLANES (&info);
+  n_mems = gst_buffer_n_memory (pic->out);
+
+  for (i = 0; i < n_planes; i++) {
+    VkBufferImageCopy region;
+    GstMemory *out_mem;
+    GstVulkanBufferMemory *buf_mem;
+    GstVulkanImageMemory *img_mem;
+    gint idx;
+    const VkImageAspectFlags aspects = { VK_IMAGE_ASPECT_PLANE_0_BIT,
+      VK_IMAGE_ASPECT_PLANE_1_BIT, VK_IMAGE_ASPECT_PLANE_2_BIT,
+    };
+    VkImageAspectFlags plane_aspect;
+
+    idx = MIN (i, n_mems - 1);
+    img_mem = (GstVulkanImageMemory *) gst_buffer_peek_memory (pic->out, idx);
+
+    out_mem = gst_buffer_peek_memory (rawbuf, i);
+    buf_mem = (GstVulkanBufferMemory *) out_mem;
+
+    if (n_planes == n_mems)
+      plane_aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+    else
+      plane_aspect = aspectsi;
+
+    /* *INDENT-OFF* */
+    region = (VkBufferImageCopy) {
+      .bufferOffset = 0,
+      .bufferRowLength = GST_VIDEO_INFO_COMP_WIDTH (&info, i),
+      .bufferImageHeight = GST_VIDEO_INFO_COMP_HEIGHT (&info, i),
+      .imageSubresource = {
+        /* XXX: each plane is a buffer */
+        .aspectMask = plane_aspect,
+        .mipLevel = 0,
+        .baseArrayLayer = 0,
+        .layerCount = 1,
+      },
+      .imageOffset = { .x = 0, .y = 0, .z = 0, },
+      .imageExtent = {
+        .width = GST_VIDEO_INFO_COMP_WIDTH (&info, i),
+        .height = GST_VIDEO_INFO_COMP_HEIGHT (&info, i),
+        .depth = 1,
+      }
+    };
+    /* *INDENT-ON* */
+
+    vkCmdCopyImageToBuffer (exec->cmd_buf->cmd, img_mem->image,
+        g_array_index (barriers, VkImageMemoryBarrier2, 0).newLayout,
+        buf_mem->buffer, 1, &region);
+  }
+
+  g_array_unref (barriers);
+
+  fail_unless (gst_vulkan_operation_end (exec, &error));
+
+  gst_vulkan_operation_wait (exec);
+  gst_object_unref (exec);
+
+  fail_unless (gst_buffer_map (rawbuf, &mapinfo, GST_MAP_READ));
+
+  /* Check for a blue square */
+  /* Y */
+  for (i = 0; i < 0x12c00; i++)
+    fail_unless (mapinfo.datai == 0x29);
+  /* UV */
+  for (i = 0x12c00; i < 0x1c1f0; i++)
+    fail_unless (mapinfo.datai == 0xf0 && mapinfo.data++i == 0x6e);
+  gst_buffer_unmap (rawbuf, &mapinfo);
+
+  gst_buffer_unref (rawbuf);
+  fail_unless (gst_buffer_pool_set_active (out_pool, FALSE));
+  gst_object_unref (out_pool);
+}
+
+
+/* DECODER: 1 frame 320x240 blue box  */
+StdVideoH264HrdParameters h264_std_hrd = {
+  .cpb_cnt_minus1 = 0,
+  .bit_rate_scale = 4,
+  .cpb_size_scale = 0,
+  .reserved1 = 0,
+  .bit_rate_value_minus1 = {2928,},
+  .cpb_size_value_minus1 = {74999,},
+  .cbr_flag = {0,},
+  .initial_cpb_removal_delay_length_minus1 = 23,
+  .cpb_removal_delay_length_minus1 = 23,
+  .dpb_output_delay_length_minus1 = 23,
+  .time_offset_length = 24,
+};
+
+StdVideoH264SequenceParameterSetVui h264_std_vui = {
+  .flags = {
+        .aspect_ratio_info_present_flag = 1,
+        .overscan_info_present_flag = 0,
+        .overscan_appropriate_flag = 0,
+        .video_signal_type_present_flag = 0,
+        .video_full_range_flag = 1,
+        .color_description_present_flag = 0,
+        .chroma_loc_info_present_flag = 1,
+        .timing_info_present_flag = 1,
+        .fixed_frame_rate_flag = 1,
+        .bitstream_restriction_flag = 1,
+        .nal_hrd_parameters_present_flag = 1,
+        .vcl_hrd_parameters_present_flag = 0,
+      },
+  .aspect_ratio_idc = STD_VIDEO_H264_ASPECT_RATIO_IDC_SQUARE,
+  .sar_width = 1,
+  .sar_height = 1,
+  .video_format = 0,
+  .colour_primaries = 0,
+  .transfer_characteristics = 0,
+  .matrix_coefficients = 2,
+  .num_units_in_tick = 1,
+  .time_scale = 60,
+  .max_num_reorder_frames = 0,
+  .max_dec_frame_buffering = 2,
+  .chroma_sample_loc_type_top_field = 0,
+  .chroma_sample_loc_type_bottom_field = 0,
+  .pHrdParameters = &h264_std_hrd,
+};
+
+StdVideoH264SequenceParameterSet h264_std_sps = {
+  .flags = {
+        .constraint_set0_flag = 0,
+        .constraint_set1_flag = 0,
+        .constraint_set2_flag = 0,
+        .constraint_set3_flag = 0,
+        .constraint_set4_flag = 0,
+        .constraint_set5_flag = 0,
+        .direct_8x8_inference_flag = 1,
+        .mb_adaptive_frame_field_flag = 0,
+        .frame_mbs_only_flag = 1,
+        .delta_pic_order_always_zero_flag = 0,
+        .separate_colour_plane_flag = 0,
+        .gaps_in_frame_num_value_allowed_flag = 0,
+        .qpprime_y_zero_transform_bypass_flag = 0,
+        .frame_cropping_flag = 0,
+        .seq_scaling_matrix_present_flag = 0,
+        .vui_parameters_present_flag = 1,
+      },
+  .profile_idc = STD_VIDEO_H264_PROFILE_IDC_MAIN,
+  .level_idc = STD_VIDEO_H264_LEVEL_IDC_2_1,
+  .chroma_format_idc = STD_VIDEO_H264_CHROMA_FORMAT_IDC_420,
+  .seq_parameter_set_id = 0,
+  .bit_depth_luma_minus8 = 0,
+  .bit_depth_chroma_minus8 = 0,
+  .log2_max_frame_num_minus4 = 4,
+  .pic_order_cnt_type = STD_VIDEO_H264_POC_TYPE_2,
+  .offset_for_non_ref_pic = 0,
+  .offset_for_top_to_bottom_field = 0,
+  .log2_max_pic_order_cnt_lsb_minus4 = 0,
+  .num_ref_frames_in_pic_order_cnt_cycle = 0,
+  .max_num_ref_frames = 2,
+  .pic_width_in_mbs_minus1 = 19,
+  .pic_height_in_map_units_minus1 = 14,
+  .frame_crop_left_offset = 0,
+  .frame_crop_right_offset = 0,
+  .frame_crop_top_offset = 0,
+  .frame_crop_bottom_offset = 0,
+  .pOffsetForRefFrame = NULL,
+  .pScalingLists = NULL,
+  .pSequenceParameterSetVui = &h264_std_vui,
+};
+
+StdVideoH264PictureParameterSet h264_std_pps = {
+  .flags = {
+        .transform_8x8_mode_flag = 0,
+        .redundant_pic_cnt_present_flag = 0,
+        .constrained_intra_pred_flag = 0,
+        .deblocking_filter_control_present_flag = 1,
+        .weighted_pred_flag = 0,
+        .bottom_field_pic_order_in_frame_present_flag = 0,
+        .entropy_coding_mode_flag = 1,
+        .pic_scaling_matrix_present_flag = 0,
+      },
+  .seq_parameter_set_id = 0,
+  .pic_parameter_set_id = 0,
+  .num_ref_idx_l0_default_active_minus1 = 0,
+  .num_ref_idx_l1_default_active_minus1 = 0,
+  .weighted_bipred_idc = STD_VIDEO_H264_WEIGHTED_BIPRED_IDC_DEFAULT,
+  .pic_init_qp_minus26 = 0,
+  .pic_init_qs_minus26 = 0,
+  .chroma_qp_index_offset = 0,
+  .second_chroma_qp_index_offset = 0,
+  .pScalingLists = NULL,
+};
+
+VkVideoDecodeH264SessionParametersAddInfoKHR h264_params = {
+  .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_KHR,
+  .stdSPSCount = 1,
+  .pStdSPSs = &h264_std_sps,
+  .stdPPSCount = 1,
+  .pStdPPSs = &h264_std_pps,
+};
+
+GST_START_TEST (test_h264_decoder)
+{
+  GstVulkanDecoder *dec;
+  GError *err = NULL;
+  VkVideoFormatPropertiesKHR format_prop;
+  /* *INDENT-OFF* */
+  GstVulkanVideoProfile profile = {
+    .profile = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR,
+      .pNext = &profile.usage,
+      .videoCodecOperation = VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR,
+      .chromaSubsampling = VK_VIDEO_CHROMA_SUBSAMPLING_420_BIT_KHR,
+      .chromaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR,
+      .lumaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR,
+    },
+    .usage.decode = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR,
+      .videoUsageHints = VK_VIDEO_DECODE_USAGE_DEFAULT_KHR,
+      .pNext = &profile.codec,
+    },
+    .codec.h264dec = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR,
+      .stdProfileIdc = STD_VIDEO_H264_PROFILE_IDC_MAIN,
+      .pictureLayout = VK_VIDEO_DECODE_H264_PICTURE_LAYOUT_PROGRESSIVE_KHR,
+    }
+  };
+  GstVulkanDecoderParameters create_params = { {
+    .sType =
+        VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_KHR,
+    .maxStdSPSCount = h264_params.stdSPSCount,
+    .maxStdPPSCount = h264_params.stdPPSCount,
+    .pParametersAddInfo = &h264_params,
+    } };
+  /* *INDENT-ON* */
+  GstVulkanVideoCapabilities video_caps;
+  GstVulkanDecoderPicture pic = { NULL, };
+
+  setup_queue (VK_QUEUE_VIDEO_DECODE_BIT_KHR,
+      VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR);
+  if (!video_queue) {
+    GST_WARNING ("Unable to find decoding queue");
+    return;
+  }
+
+  dec = gst_vulkan_queue_create_decoder (video_queue,
+      VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR);
+  if (!dec) {
+    GST_WARNING ("Unable to create a vulkan decoder");
+    return;
+  }
+
+  fail_unless (gst_vulkan_decoder_start (dec, &profile, &err));
+
+  fail_unless (gst_vulkan_decoder_update_ycbcr_sampler (dec,
+          VK_SAMPLER_YCBCR_RANGE_ITU_FULL, VK_CHROMA_LOCATION_COSITED_EVEN,
+          VK_CHROMA_LOCATION_MIDPOINT, &err));
+
+  fail_unless (gst_vulkan_decoder_update_video_session_parameters (dec,
+          &create_params, &err));
+
+  fail_unless (gst_vulkan_decoder_out_format (dec, &format_prop));
+  fail_unless (gst_vulkan_decoder_caps (dec, &video_caps));
+
+  get_output_buffer (dec, format_prop.format, &pic);
+
+  /* get input buffer */
+  {
+    static const guint8 slice = {
+      0x25, 0x88, 0x80, 0x4f, 0xb8, 0x15, 0x59, 0xd0, 0x00, 0x3d, 0xe7, 0xfe,
+      0x6e, 0x22, 0xeb, 0xb9,
+      0x72, 0x7b, 0x52, 0x8d, 0xd8, 0xf7, 0x14, 0x97, 0xc7, 0xa3, 0x62, 0xb7,
+      0x6a, 0x61, 0x8e, 0xd2,
+      0xec, 0x64, 0xbc, 0xa4, 0x00, 0x00, 0x05, 0x93, 0xa2, 0x39, 0xa9, 0x99,
+      0x1e, 0xc5, 0x01, 0x4a,
+      0x00, 0x0c, 0x03, 0x0d, 0x75, 0x45, 0x2a, 0xe3, 0x3d, 0x7f, 0x10, 0x03,
+      0x82
+    };
+
+    fail_unless (gst_vulkan_decoder_append_slice (dec, &pic, slice,
+            sizeof (slice), TRUE));
+  }
+
+  /* decode */
+  {
+    StdVideoDecodeH264PictureInfo std_pic = {
+      .flags = {
+            .field_pic_flag = 0,
+            .is_intra = 1,
+            .IdrPicFlag = 1,
+            .bottom_field_flag = 0,
+            .is_reference = 1,
+            .complementary_field_pair = 0,
+          },
+      .seq_parameter_set_id = 0,
+      .pic_parameter_set_id = 0,
+      .reserved1 = 0,
+      .reserved2 = 0,
+      .frame_num = 0,
+      .idr_pic_id = 0,
+      .PicOrderCnt = {0,},
+    };
+    StdVideoDecodeH264ReferenceInfo std_h264_ref = {
+      .flags = {
+            .top_field_flag = 0,
+            .bottom_field_flag = 0,
+            .used_for_long_term_reference = 0,
+            .is_non_existing = 0,
+          },
+      .FrameNum = 0,
+      .reserved = 0,
+      .PicOrderCnt = {0,},
+    };
+    VkVideoDecodeH264DpbSlotInfoKHR h264_dpb_slot = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR,
+      .pStdReferenceInfo = &std_h264_ref,
+    };
+    VkVideoDecodeH264PictureInfoKHR vk_pic = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_KHR,
+      .pStdPictureInfo = &std_pic,
+      .sliceCount = pic.slice_offs->len - 1,
+      .pSliceOffsets = (guint32 *) pic.slice_offs->data,
+    };
+
+    /* *INDENT-OFF* */
+    pic.pic_res = (VkVideoPictureResourceInfoKHR) {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR,
+      .codedOffset = (VkOffset2D) {0, 0},
+      .codedExtent = (VkExtent2D) {320, 240},
+      .baseArrayLayer = 0,
+      .imageViewBinding = pic.img_view_ref->view,
+    };
+    pic.slot = (VkVideoReferenceSlotInfoKHR) {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR,
+      .pNext = &h264_dpb_slot,
+      .slotIndex = 0,
+      .pPictureResource = &pic.pic_res,
+    };
+    pic.decode_info = (VkVideoDecodeInfoKHR) {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR,
+      .pNext = &vk_pic,
+      .flags = 0,
+      .srcBufferOffset = 0,
+      .dstPictureResource = {
+        .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR,
+        .codedOffset = (VkOffset2D) {0, 0},
+        .codedExtent = (VkExtent2D) {320, 240},
+        .baseArrayLayer = 0,
+        .imageViewBinding = pic.img_view_out->view,
+      },
+      .pSetupReferenceSlot = &pic.slot,
+      .referenceSlotCount = 0,
+      .pReferenceSlots = pic.slots,
+    };
+    /* *INDENT-ON* */
+
+    fail_unless (gst_vulkan_decoder_decode (dec, &pic, &err));
+  }
+
+  download_and_check_output_buffer (dec, format_prop.format, &pic);
+
+  fail_unless (gst_vulkan_decoder_stop (dec));
+
+  gst_vulkan_decoder_picture_release (&pic);
+
+  gst_object_unref (dec);
+}
+
+GST_END_TEST;
+
+StdVideoH265HrdParameters h265_std_hrd = { 0, };
+
+StdVideoH265ProfileTierLevel h265_std_ptl = {
+  .flags = {
+        .general_progressive_source_flag = 1,
+        .general_frame_only_constraint_flag = 1,
+      },
+  .general_profile_idc = STD_VIDEO_H265_PROFILE_IDC_MAIN,
+  .general_level_idc = STD_VIDEO_H265_LEVEL_IDC_6_0,
+};
+
+StdVideoH265DecPicBufMgr h265_std_pbm = {
+  .max_latency_increase_plus1 = {5, 0,},
+  .max_dec_pic_buffering_minus1 = {4, 0,},
+  .max_num_reorder_pics = {2, 0,},
+};
+
+StdVideoH265VideoParameterSet h265_std_vps = {
+  .flags = {
+        .vps_temporal_id_nesting_flag = 1,
+        .vps_sub_layer_ordering_info_present_flag = 1,
+      },
+  .vps_video_parameter_set_id = 0,
+  .pDecPicBufMgr = &h265_std_pbm,
+  .pHrdParameters = &h265_std_hrd,
+  .pProfileTierLevel = &h265_std_ptl,
+};
+
+StdVideoH265SequenceParameterSetVui h265_std_sps_vui = {
+  .flags = {
+        .video_signal_type_present_flag = 1,
+        .vui_timing_info_present_flag = 1,
+      },
+  .aspect_ratio_idc = STD_VIDEO_H265_ASPECT_RATIO_IDC_UNSPECIFIED,
+  .video_format = 5,
+  .colour_primaries = 2,
+  .transfer_characteristics = 2,
+  .matrix_coeffs = 2,
+  .vui_num_units_in_tick = 1,
+  .vui_time_scale = 25,
+  .pHrdParameters = &h265_std_hrd,
+};
+
+StdVideoH265SequenceParameterSet h265_std_sps = {
+  .flags = {
+        .sps_temporal_id_nesting_flag = 1,
+        .sps_sub_layer_ordering_info_present_flag = 1,
+        .sample_adaptive_offset_enabled_flag = 1,
+        .sps_temporal_mvp_enabled_flag = 1,
+        .strong_intra_smoothing_enabled_flag = 1,
+        .vui_parameters_present_flag = 1,
+        .sps_extension_present_flag = 1,
+      },
+  .chroma_format_idc = STD_VIDEO_H265_CHROMA_FORMAT_IDC_420,
+  .pic_width_in_luma_samples = 320,
+  .pic_height_in_luma_samples = 240,
+  .sps_video_parameter_set_id = 0,
+  .sps_seq_parameter_set_id = 0,
+  .log2_max_pic_order_cnt_lsb_minus4 = 4,
+  .log2_diff_max_min_luma_coding_block_size = 3,
+  .log2_diff_max_min_luma_transform_block_size = 3,
+  .pProfileTierLevel = &h265_std_ptl,
+  .pDecPicBufMgr = &h265_std_pbm,
+  .pSequenceParameterSetVui = &h265_std_sps_vui,
+};
+
+StdVideoH265PictureParameterSet h265_std_pps = {
+  .flags = {
+        .sign_data_hiding_enabled_flag = 1,
+        .cu_qp_delta_enabled_flag = 1,
+        .weighted_pred_flag = 1,
+        .entropy_coding_sync_enabled_flag = 1,
+        .uniform_spacing_flag = 1,
+        .loop_filter_across_tiles_enabled_flag = 1,
+        .pps_loop_filter_across_slices_enabled_flag = 1,
+      },
+  .pps_pic_parameter_set_id = 0,
+  .pps_seq_parameter_set_id = 0,
+  .sps_video_parameter_set_id = 0,
+  .diff_cu_qp_delta_depth = 1,
+};
+
+VkVideoDecodeH265SessionParametersAddInfoKHR h265_params = {
+  .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_KHR,
+  .stdVPSCount = 1,
+  .pStdVPSs = &h265_std_vps,
+  .stdSPSCount = 1,
+  .pStdSPSs = &h265_std_sps,
+  .stdPPSCount = 1,
+  .pStdPPSs = &h265_std_pps,
+};
+
+GST_START_TEST (test_h265_decoder)
+{
+  GstVulkanDecoder *dec;
+  GError *err = NULL;
+  VkVideoFormatPropertiesKHR format_prop;
+  /* *INDENT-OFF* */
+  GstVulkanVideoProfile profile = {
+    .profile = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PROFILE_INFO_KHR,
+      .pNext = &profile.usage,
+      .videoCodecOperation = VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR,
+      .chromaSubsampling = VK_VIDEO_CHROMA_SUBSAMPLING_420_BIT_KHR,
+      .chromaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR,
+      .lumaBitDepth = VK_VIDEO_COMPONENT_BIT_DEPTH_8_BIT_KHR,
+    },
+    .usage.decode = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR,
+      .videoUsageHints = VK_VIDEO_DECODE_USAGE_DEFAULT_KHR,
+      .pNext = &profile.codec,
+    },
+    .codec.h265dec = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR,
+      .stdProfileIdc = STD_VIDEO_H265_PROFILE_IDC_MAIN,
+    }
+  };
+  GstVulkanDecoderParameters create_params = {
+    .h265 = {
+      .sType =
+          VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR,
+      .maxStdVPSCount = h265_params.stdVPSCount,
+      .maxStdSPSCount = h265_params.stdSPSCount,
+      .maxStdPPSCount = h265_params.stdPPSCount,
+      .pParametersAddInfo = &h265_params,
+    }
+  };
+  /* *INDENT-ON* */
+  GstVulkanVideoCapabilities video_caps;
+  GstVulkanDecoderPicture pic = { NULL, };
+
+  setup_queue (VK_QUEUE_VIDEO_DECODE_BIT_KHR,
+      VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR);
+  if (!video_queue) {
+    GST_WARNING ("Unable to find decoding queue");
+    return;
+  }
+
+  dec = gst_vulkan_queue_create_decoder (video_queue,
+      VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR);
+  if (!dec) {
+    GST_WARNING ("Unable to create a vulkan decoder");
+    return;
+  }
+
+  fail_unless (gst_vulkan_decoder_start (dec, &profile, &err));
+
+  fail_unless (gst_vulkan_decoder_update_ycbcr_sampler (dec,
+          VK_SAMPLER_YCBCR_RANGE_ITU_FULL, VK_CHROMA_LOCATION_COSITED_EVEN,
+          VK_CHROMA_LOCATION_MIDPOINT, &err));
+
+  fail_unless (gst_vulkan_decoder_update_video_session_parameters (dec,
+          &create_params, &err));
+
+  fail_unless (gst_vulkan_decoder_out_format (dec, &format_prop));
+  fail_unless (gst_vulkan_decoder_caps (dec, &video_caps));
+
+  get_output_buffer (dec, format_prop.format, &pic);
+
+  /* get input buffer */
+  {
+    static const guint8 slice = {
+      0x28, 0x01, 0xaf, 0x1d, 0x21, 0x6a, 0x83, 0x40, 0xf7, 0xcf, 0x80, 0xff,
+      0xf8, 0x90, 0xfa, 0x3b, 0x77, 0x87, 0x96, 0x96, 0xba, 0xfa, 0xcd, 0x61,
+      0xb5, 0xe3, 0xc1, 0x02, 0x2d, 0xe0, 0xa8, 0x17, 0x96, 0x03, 0x4c, 0x4e,
+      0x1a, 0x9e, 0xd0, 0x93, 0x0b, 0x93, 0x40, 0x00, 0x05, 0xec, 0x87, 0x00,
+      0x00, 0x03, 0x00, 0x00, 0x03, 0x00, 0x56, 0x40
+    };
+
+    fail_unless (gst_vulkan_decoder_append_slice (dec, &pic, slice,
+            sizeof (slice), TRUE));
+  }
+
+  /* decode */
+  {
+    StdVideoDecodeH265PictureInfo std_pic = {
+      .flags = {
+            .IrapPicFlag = 1,
+            .IdrPicFlag = 1,
+            .IsReference = 1,
+            .short_term_ref_pic_set_sps_flag = 0,
+          },
+      .sps_video_parameter_set_id = 0,
+      .pps_seq_parameter_set_id = 0,
+      .pps_pic_parameter_set_id = 0,
+      .NumDeltaPocsOfRefRpsIdx = 0,
+      .PicOrderCntVal = 0,
+      .NumBitsForSTRefPicSetInSlice = 0,
+      .RefPicSetStCurrBefore =
+          {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,},
+      .RefPicSetStCurrAfter = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,},
+      .RefPicSetLtCurr = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,},
+    };
+    StdVideoDecodeH265ReferenceInfo std_h265_ref = {
+      .flags = {
+            .used_for_long_term_reference = 0,
+            .unused_for_reference = 0,
+          },
+      .PicOrderCntVal = 0,
+    };
+    VkVideoDecodeH265DpbSlotInfoKHR h265_dpb_slot = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_KHR,
+      .pStdReferenceInfo = &std_h265_ref,
+    };
+    VkVideoDecodeH265PictureInfoKHR vk_pic = {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_KHR,
+      .pStdPictureInfo = &std_pic,
+      .sliceSegmentCount = pic.slice_offs->len - 1,
+      .pSliceSegmentOffsets = (guint32 *) pic.slice_offs->data,
+    };
+
+    /* *INDENT-OFF* */
+    pic.pic_res = (VkVideoPictureResourceInfoKHR) {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR,
+      .codedOffset = (VkOffset2D) {0, 0},
+      .codedExtent = (VkExtent2D) {320, 240},
+      .baseArrayLayer = 0,
+      .imageViewBinding = pic.img_view_ref->view,
+    };
+    pic.slot = (VkVideoReferenceSlotInfoKHR) {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR,
+      .pNext = &h265_dpb_slot,
+      .slotIndex = 0,
+      .pPictureResource = &pic.pic_res,
+    };
+    pic.decode_info = (VkVideoDecodeInfoKHR) {
+      .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR,
+      .pNext = &vk_pic,
+      .flags = 0,
+      .srcBufferOffset = 0,
+      .dstPictureResource = {
+        .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR,
+        .codedOffset = (VkOffset2D) {0, 0},
+        .codedExtent = (VkExtent2D) {320, 240},
+        .baseArrayLayer = 0,
+        .imageViewBinding = pic.img_view_out->view,
+      },
+      .pSetupReferenceSlot = &pic.slot,
+      .referenceSlotCount = 0,
+      .pReferenceSlots = pic.slots,
+    };
+    /* *INDENT-ON* */
+
+    fail_unless (gst_vulkan_decoder_decode (dec, &pic, &err));
+  }
+
+  download_and_check_output_buffer (dec, format_prop.format, &pic);
+
+  fail_unless (gst_vulkan_decoder_stop (dec));
+
+  gst_vulkan_decoder_picture_release (&pic);
+
+  gst_object_unref (dec);
+}
+
+GST_END_TEST;
+
+
+static Suite *
+vkvideo_suite (void)
+{
+  Suite *s = suite_create ("vkvideo");
+  TCase *tc_basic = tcase_create ("general");
+  gboolean have_instance;
+
+  suite_add_tcase (s, tc_basic);
+  tcase_add_checked_fixture (tc_basic, setup, teardown);
+
+  /* FIXME: CI doesn't have a software vulkan renderer (and none exists currently) */
+  instance = gst_vulkan_instance_new ();
+  have_instance = gst_vulkan_instance_open (instance, NULL);
+  gst_object_unref (instance);
+  if (have_instance) {
+    tcase_add_test (tc_basic, test_h264_decoder);
+    tcase_add_test (tc_basic, test_h265_decoder);
+  }
+
+  return s;
+}
+
+GST_CHECK_MAIN (vkvideo);

gst-plugins-bad-1.22.7.tar.xz/tests/check/meson.build -> gst-plugins-bad-1.24.5.tar.xz/tests/check/meson.build Changed

@@ -25,6 +25,7 @@
   'elements/aesdec.c', not aes_dep.found(), aes_dep,
   'elements/aiffparse.c', get_option('aiff').disabled(),
   'elements/asfmux.c', get_option('asfmux').disabled(),
+  'elements/audiovisualizer.c', get_option('audiovisualizers').disabled(),
   'elements/autoconvert.c', get_option('autoconvert').disabled(),
   'elements/autovideoconvert.c', get_option('autoconvert').disabled(),
   'elements/avwait.c', get_option('timecode').disabled(),
@@ -68,6 +69,8 @@
   'elements/rtponviftimestamp.c', get_option('onvif').disabled(),
   'elements/rtpsrc.c', get_option('rtp').disabled(),
   'elements/rtpsink.c', get_option('rtp').disabled(),
+  'elements/sdpdemux.c', get_option('sdp').disabled(), gstsdp_dep,
+  'elements/srt.c', not srt_dep.found(), srt_dep,
   'elements/srtp.c', not srtp_dep.found(), srtp_dep,
   'elements/switchbin.c', get_option('switchbin').disabled(),
   'elements/videoframe-audiolevel.c', get_option('videoframe_audiolevel').disabled(),
@@ -84,6 +87,7 @@
   'libs/nalutils.c', '../../gst-libs/gst/codecparsers/nalutils.c', false, nalutils_dep,
   'libs/mpegts.c', false, gstmpegts_dep,
   'libs/mpegvideoparser.c', false, gstcodecparsers_dep,
+  'libs/mse.c', false, gstmse_private_test_dep,
   'libs/planaraudioadapter.c', false, gstbadaudio_dep,
   'libs/play.c', not enable_gst_play_tests, gstplay_dep, libsoup_dep,
   'libs/vc1parser.c', false, gstcodecparsers_dep,
@@ -92,7 +96,10 @@
   'libs/av1parser.c', false, gstcodecparsers_dep,
   'libs/h264bitwriter.c', false, gstcodecparsers_dep,
   'libs/h265bitwriter.c', false, gstcodecparsers_dep,
+  'libs/vkformat.c', not gstvulkan_dep.found(), gstvulkan_dep,
+  'libs/av1bitwriter.c', false, gstcodecparsers_dep,
   'libs/vkmemory.c', not gstvulkan_dep.found(), gstvulkan_dep,
+  'libs/analyticsmeta.c', false, gstanalytics_dep,
   'elements/vkcolorconvert.c', not gstvulkan_dep.found(), gstvulkan_dep,
   'libs/vkwindow.c', not gstvulkan_dep.found(), gstvulkan_dep,
   'libs/vkdevice.c', not gstvulkan_dep.found(), gstvulkan_dep,
@@ -100,10 +107,20 @@
   'libs/vkcommandpool.c', not gstvulkan_dep.found(), gstvulkan_dep,
   'libs/vkimage.c', not gstvulkan_dep.found(), gstvulkan_dep,
   'libs/vkinstance.c', not gstvulkan_dep.found(), gstvulkan_dep,
+  'libs/vkimagebufferpool.c', not gstvulkan_dep.found(), gstvulkan_dep,
+  'libs/vkvideodecode.c', not gstvulkan_dep.found() or vulkan_conf.get('GST_VULKAN_HAVE_VIDEO_EXTENSIONS') != 1, gstvulkan_dep,
   'libs/d3d11device.cpp', not gstd3d11_dep.found(), gstd3d11_dep,
   'libs/d3d11memory.c', not gstd3d11_dep.found(), gstd3d11_dep,
+  'libs/cudamemory.c', not gstcuda_dep.found(), gstcuda_dep, gstcuda_stub_dep,
 
 
+# Make sure our headers are C++ clean
+if add_languages('cpp', native: false, required: false)
+  base_tests += 
+    'libs/gstlibscpp.cc', false ,
+  
+endif
+
 # FIXME: unistd dependency, unstable or not tested yet on windows
 if host_machine.system() != 'windows'
   base_tests += 
@@ -136,16 +153,16 @@
     'elements/jifmux.c',
         not exif_dep.found() or not cdata.has('HAVE_UNISTD_H'), exif_dep,
     'elements/jpegparse.c', not cdata.has('HAVE_UNISTD_H'),
-    'elements/kate.c',
-        not kate_dep.found() or not cdata.has('HAVE_UNISTD_H'), kate_dep,
     'elements/netsim.c',
     'elements/shm.c', not shm_enabled, shm_deps,
+    'elements/unixfd.c', not gio_unix_dep.found(),
     'elements/voaacenc.c',
         not voaac_dep.found() or not cdata.has('HAVE_UNISTD_H'), voaac_dep,
     'elements/webrtcbin.c', not libnice_dep.found(), gstwebrtc_dep,
     'elements/x265enc.c', not x265_dep.found(), x265_dep,
     'elements/zbar.c', not zbar_dep.found(), zbar_dep,
     'elements/zxing.c', not zxing_dep.found(), zxing_dep,
+    'elements/lc3.c', not lc3_dep.found(), lc3_dep,
   
 endif
 
@@ -157,18 +174,21 @@
   
 endif
 
+fsmod = import('fs')
 test_defines = 
   '-UG_DISABLE_ASSERT',
   '-UG_DISABLE_CAST_CHECKS',
   '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"',
-  '-DGST_TEST_FILES_PATH="' + meson.current_source_dir() + '/../files"',
-  '-DTEST_PATH="' + meson.current_build_dir() + '/media"',
-  '-DDASH_MPD_DATADIR=' + meson.current_source_dir() + '/elements/dash_mpd_data',
+  '-DGST_TEST_FILES_PATH="' + fsmod.as_posix(meson.current_source_dir()) + '/../files"',
+  '-DTEST_PATH="' + fsmod.as_posix(meson.current_build_dir()) + '/media"',
+  '-DDASH_MPD_DATADIR=' + fsmod.as_posix(meson.current_source_dir()) + '/elements/dash_mpd_data',
   '-DGST_USE_UNSTABLE_API',
 
 
-test_deps = gst_dep, gstapp_dep, gstbase_dep,
-             gstbasecamerabin_dep, gstphotography_dep,
+test_deps = gst_dep, gstapp_dep, gstbase_dep, gstbadaudio_dep,
+             gstbasecamerabin_dep, gstphotography_dep, gstwebrtc_dep,
+             gstmpegts_dep, gstmse_dep, gstplay_dep, gstplayer_dep,
+             gstanalytics_dep, gstinsertbin_dep, gst_transcoder_dep,
              gstpbutils_dep, gstcontroller_dep, gstaudio_dep,
              gstvideo_dep, gstrtp_dep, gsturidownloader_dep,
              gstcheck_dep, gio_dep, gsttag_dep

gst-plugins-bad-1.22.7.tar.xz/tests/check/pipelines/ipcpipeline.c -> gst-plugins-bad-1.24.5.tar.xz/tests/check/pipelines/ipcpipeline.c Changed

@@ -548,9 +548,9 @@
     int fdoutv, test_data * td)
 {
   GstElement *pipeline = NULL;
-  gboolean live = ! !(features & TEST_FEATURE_LIVE);
-  gboolean longdur = ! !(features & TEST_FEATURE_LONG_DURATION);
-  gboolean has_video = ! !(features & TEST_FEATURE_HAS_VIDEO);
+  gboolean live = !!(features & TEST_FEATURE_LIVE);
+  gboolean longdur = !!(features & TEST_FEATURE_LONG_DURATION);
+  gboolean has_video = !!(features & TEST_FEATURE_HAS_VIDEO);
 
   if (features & TEST_FEATURE_TEST_SOURCE) {
 
@@ -874,7 +874,7 @@
       if (pid) {
         die_on_child_death ();
       }
-      c_src = ! !pid;
+      c_src = !!pid;
       c_sink = !pid;
     } else {
       c_src = TRUE;
@@ -5020,7 +5020,7 @@
 
   g_mutex_lock (&d->mutex);
   switch_av (td->p, gst_element_get_name (source),
-      ! !(td->features & TEST_FEATURE_LIVE), TRUE);
+      !!(td->features & TEST_FEATURE_LIVE), TRUE);
   g_mutex_unlock (&d->mutex);
 
   g_idle_add_full (G_PRIORITY_HIGH, remove_source, source, g_object_unref);
@@ -5093,7 +5093,7 @@
 
   g_mutex_lock (&d->mutex);
   change_audio_channel (td->p, gst_element_get_name (source),
-      ipcpipelinesink_name, ! !(td->features & TEST_FEATURE_LIVE));
+      ipcpipelinesink_name, !!(td->features & TEST_FEATURE_LIVE));
   g_mutex_unlock (&d->mutex);
 
   g_idle_add_full (G_PRIORITY_HIGH, remove_source, source, g_object_unref);

gst-plugins-bad-1.22.7.tar.xz/tests/examples/camerabin2/meson.build -> gst-plugins-bad-1.24.5.tar.xz/tests/examples/camerabin2/meson.build Changed

gst-plugins-bad-1.24.5.tar.xz/tests/examples/d3d11/d3d11overlay.cpp Added

@@ -0,0 +1,341 @@
+/*
+ * GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/d3d11/gstd3d11.h>
+#include <d2d1.h>
+#include <dwrite.h>
+#include <wrl.h>
+#include <string>
+#include <locale>
+#include <codecvt>
+
+/* *INDENT-OFF* */
+using namespace Microsoft::WRL;
+
+struct OverlayContext
+{
+  GstElement *pipeline = nullptr;
+
+  ID2D1Factory *d2d_factory = nullptr;
+  IDWriteFactory *dwrite_factory = nullptr;
+
+  IDWriteTextFormat *format = nullptr;
+  IDWriteTextLayout *layout = nullptr;
+
+  std::wstring text;
+
+  FLOAT width;
+  FLOAT height;
+  FLOAT origin_y;
+  gint text_width;
+  gint last_position = 0;
+
+  GMainLoop *loop = nullptr;
+};
+/* *INDENT-ON* */
+
+static gboolean
+bus_msg (GstBus * bus, GstMessage * msg, OverlayContext * context)
+{
+  switch (GST_MESSAGE_TYPE (msg)) {
+    case GST_MESSAGE_ERROR:{
+      GError *err;
+      gchar *dbg;
+
+      gst_message_parse_error (msg, &err, &dbg);
+      gst_printerrln ("ERROR %s", err->message);
+      if (dbg)
+        gst_printerrln ("ERROR debug information: %s", dbg);
+      g_clear_error (&err);
+      g_free (dbg);
+
+      g_main_loop_quit (context->loop);
+      break;
+    }
+    case GST_MESSAGE_EOS:
+      gst_println ("Got EOS");
+      g_main_loop_quit (context->loop);
+      break;
+    default:
+      break;
+  }
+
+  return TRUE;
+}
+
+/* This callback will be called with gst_d3d11_device_lock() taken by
+ * d3d11overlay. We can perform GPU operation here safely */
+static gboolean
+on_draw (GstElement * overlay, GstD3D11Device * device,
+    ID3D11RenderTargetView * rtv, GstClockTime pts, GstClockTime duration,
+    OverlayContext * context)
+{
+  ComPtr < ID3D11Resource > resource;
+  ComPtr < IDXGISurface > surface;
+  ComPtr < ID2D1RenderTarget > d2d_target;
+  ComPtr < ID2D1SolidColorBrush > text_brush;
+  ComPtr < ID2D1SolidColorBrush > bg_brush;
+  HRESULT hr;
+  ID2D1Factory *d2d_factory;
+  FLOAT position;
+
+  rtv->GetResource (&resource);
+  hr = resource.As (&surface);
+  g_assert (SUCCEEDED (hr));
+
+  d2d_factory = context->d2d_factory;
+  D2D1_RENDER_TARGET_PROPERTIES props;
+  props.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
+  props.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM;
+  props.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED;
+  /* default DPI */
+  props.dpiX = 0;
+  props.dpiY = 0;
+  props.usage = D2D1_RENDER_TARGET_USAGE_NONE;
+  props.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
+
+  /* Creates D2D render target using swapchin's backbuffer */
+  hr = d2d_factory->CreateDxgiSurfaceRenderTarget (surface.Get (), props,
+      &d2d_target);
+  g_assert (SUCCEEDED (hr));
+
+  hr = d2d_target->CreateSolidColorBrush (D2D1::ColorF (D2D1::ColorF::Black),
+      &bg_brush);
+  g_assert (SUCCEEDED (hr));
+
+  hr = d2d_target->CreateSolidColorBrush (D2D1::ColorF (D2D1::ColorF::White),
+      &text_brush);
+  g_assert (SUCCEEDED (hr));
+
+  d2d_target->BeginDraw ();
+
+  /* Draw background */
+  d2d_target->FillRectangle (D2D1::RectF (0, context->origin_y, context->width,
+          context->height), bg_brush.Get ());
+
+  /* Draw text */
+  position = -context->last_position;
+
+  do {
+    d2d_target->DrawTextLayout (D2D1::Point2F (position, context->origin_y),
+        context->layout, text_brush.Get (),
+        static_cast<D2D1_DRAW_TEXT_OPTIONS>(D2D1_DRAW_TEXT_OPTIONS_CLIP | D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT));
+    position = position + context->text_width;
+  } while (position < context->width);
+
+  d2d_target->EndDraw ();
+
+  context->last_position += 2;
+  if (context->last_position >= context->text_width) {
+    context->last_position %= context->text_width;
+  }
+
+  return TRUE;
+}
+
+gint
+main (gint argc, gchar ** argv)
+{
+  GOptionContext *option_ctx;
+  GError *error = nullptr;
+  gboolean ret;
+  gchar *text = nullptr;
+  gint width = 1280;
+  gint height = 720;
+  GOptionEntry options = {
+    {"text", 0, 0, G_OPTION_ARG_STRING, &text, "Text to render", nullptr},
+    {"width", 0, 0, G_OPTION_ARG_INT, &width, "Width of video stream", nullptr},
+    {"height", 0, 0, G_OPTION_ARG_INT, &height, "Height of video stream",
+        nullptr},
+    {nullptr}
+  };
+  OverlayContext context;
+  GstStateChangeReturn sret;
+  HRESULT hr;
+  std::wstring text_wide;
+  std::string pipeline_str;
+  GstElement *overlay;
+  DWRITE_TEXT_METRICS metrics;
+  FLOAT font_size;
+  bool was_decreased = false;
+  DWRITE_TEXT_RANGE range;
+  FLOAT text_height;
+  gchar **win32_argv;
+  ComPtr < IDWriteTextFormat > text_format;
+  ComPtr < IDWriteTextLayout > text_layout;
+
+  win32_argv = g_win32_get_command_line ();
+
+  option_ctx = g_option_context_new ("d3d11overlay example");
+  g_option_context_add_main_entries (option_ctx, options, nullptr);
+  g_option_context_add_group (option_ctx, gst_init_get_option_group ());
+  ret = g_option_context_parse_strv (option_ctx, &win32_argv, &error);
+  g_option_context_free (option_ctx);
+  g_strfreev (win32_argv);
+
+  if (!ret) {
+    gst_printerrln ("option parsing failed: %s", error->message);
+    g_clear_error (&error);
+    return 1;
+  }
+
+  /* Prepare device independent D2D objects */
+  hr = D2D1CreateFactory (D2D1_FACTORY_TYPE_MULTI_THREADED,
+      IID_PPV_ARGS (&context.d2d_factory));
+  if (FAILED (hr)) {
+    gst_printerrln ("Couldn't create D2D factory");
+    return 1;
+  }
+
+  hr = DWriteCreateFactory (DWRITE_FACTORY_TYPE_SHARED,
+      __uuidof (context.dwrite_factory),
+      reinterpret_cast < IUnknown ** >(&context.dwrite_factory));
+  if (FAILED (hr)) {
+    gst_printerrln ("Couldn't create DirectWrite factory");
+    return 1;
+  }
+
+  hr = context.dwrite_factory->CreateTextFormat (L"Arial", nullptr,
+      DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL,
+      DWRITE_FONT_STRETCH_NORMAL, 12.0f, L"en-us", &text_format);
+  if (FAILED (hr)) {
+    gst_printerrln ("Couldn't create IDWriteTextFormat");
+    return 1;
+  }
+
+  text_format->SetTextAlignment (DWRITE_TEXT_ALIGNMENT_LEADING);
+  text_format->SetParagraphAlignment (DWRITE_PARAGRAPH_ALIGNMENT_CENTER);
+  text_format->SetWordWrapping (DWRITE_WORD_WRAPPING_NO_WRAP);
+
+  if (text && text0 != '\0') {
+    std::wstring_convert < std::codecvt_utf8_utf16 < wchar_t >>converter;
+    text_wide = converter.from_bytes (text);
+  } else {
+    /* *INDENT-OFF* */
+    text_wide =
+        std::wstring (L"Hello GStreamer! 😊 안녕하세요 GStreamer! 😉 ") +
+        std::wstring (L"नमस्ते GStreamer! ❤️ Bonjour GStreamer! 😁 ") +
+        std::wstring (L"Hallo GStreamer! 😎 Hola GStreamer! 😍 ") +
+        std::wstring (L"こんにちは GStreamer! ✌️ 你好 GStreamer! 👍");
+    /* *INDENT-ON* */
+  }
+
+  text_height = (FLOAT) height / 10.0f;
+
+  hr = context.dwrite_factory->CreateTextLayout (text_wide.c_str (),
+      text_wide.length (), text_format.Get (), G_MAXFLOAT, G_MAXFLOAT,
+      &text_layout);
+  if (FAILED (hr)) {
+    gst_printerrln ("Couldn't create IDWriteTextLayout");
+    return 1;
+  }
+
+  /* Calculate best font size */
+  range.startPosition = 0;
+  range.length = text_wide.length ();
+
+  do {
+    hr = text_layout->GetMetrics (&metrics);
+    g_assert (SUCCEEDED (hr));
+
+    text_layout->GetFontSize (0, &font_size);
+    if (metrics.height >= (FLOAT) text_height) {
+      if (font_size > 1.0f) {
+        font_size -= 0.5f;
+        was_decreased = true;
+        hr = text_layout->SetFontSize (font_size, range);
+        g_assert (SUCCEEDED (hr));
+        continue;
+      }
+
+      break;
+    }
+
+    if (was_decreased)
+      break;
+
+    if (metrics.height < text_height) {
+      if (metrics.height >= text_height * 0.9)
+        break;
+
+      font_size += 0.5f;
+      hr = text_layout->SetFontSize (font_size, range);
+      g_assert (SUCCEEDED (hr));
+      continue;
+    }
+  } while (true);
+
+  gst_println ("Calculated font size %lf", font_size);
+
+  /* 10 pixels padding per loop */
+  text_layout->SetMaxWidth (metrics.widthIncludingTrailingWhitespace + 10);
+  text_layout->SetMaxHeight (metrics.height);
+
+  context.text = text_wide;
+  context.origin_y = (FLOAT) height - text_height;
+  context.width = width;
+  context.height = height;
+  context.text_width = metrics.widthIncludingTrailingWhitespace + 10;
+  context.layout = text_layout.Detach ();
+
+  context.loop = g_main_loop_new (nullptr, FALSE);
+
+  pipeline_str =
+      "d3d11testsrc ! video/x-raw(memory:D3D11Memory),format=BGRA,width=" +
+      std::to_string (width) + ",height=" + std::to_string (height) +
+      ",framerate=60/1 ! d3d11overlay name=overlay ! queue ! d3d11videosink";
+
+  context.pipeline = gst_parse_launch (pipeline_str.c_str (), nullptr);
+  g_assert (context.pipeline);
+
+  overlay = gst_bin_get_by_name (GST_BIN (context.pipeline), "overlay");
+  g_assert (overlay);
+
+  g_signal_connect (overlay, "draw", G_CALLBACK (on_draw), &context);
+  gst_object_unref (overlay);
+
+  gst_bus_add_watch (GST_ELEMENT_BUS (context.pipeline),
+      (GstBusFunc) bus_msg, &context);
+
+  sret = gst_element_set_state (context.pipeline, GST_STATE_PLAYING);
+  g_assert (sret != GST_STATE_CHANGE_FAILURE);
+
+  g_main_loop_run (context.loop);
+
+  gst_element_set_state (context.pipeline, GST_STATE_NULL);
+  gst_bus_remove_watch (GST_ELEMENT_BUS (context.pipeline));
+  gst_object_unref (context.pipeline);
+
+  context.format->Release ();
+  context.layout->Release ();
+  context.d2d_factory->Release ();
+  context.dwrite_factory->Release ();
+
+  g_main_loop_unref (context.loop);
+  g_free (text);
+
+  return 0;
+}

gst-plugins-bad-1.22.7.tar.xz/tests/examples/d3d11/d3d11videosink.c -> gst-plugins-bad-1.24.5.tar.xz/tests/examples/d3d11/d3d11videosink.c Changed

gst-plugins-bad-1.22.7.tar.xz/tests/examples/d3d11/meson.build -> gst-plugins-bad-1.24.5.tar.xz/tests/examples/d3d11/meson.build Changed

gst-plugins-bad-1.24.5.tar.xz/tests/examples/d3d12 Added

gst-plugins-bad-1.24.5.tar.xz/tests/examples/d3d12/d3d12enc-dynamic-reconfigure.c Added

@@ -0,0 +1,508 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <stdlib.h>
+#include "../key-handler.h"
+
+static gchar *rc_modes = {
+  "cqp", "cbr", "vbr", "qvbr"
+};
+
+static gchar *slice_modes = {
+  "full", "subregions"
+};
+
+static GMainLoop *loop = NULL;
+static gint width = 640;
+static gint height = 480;
+static guint bitrate = 1000;
+static guint max_bitrate = 2000;
+static guint rc_index = 0;
+static guint qp_i = 24;
+static guint qp_p = 24;
+static guint qp_b = 24;
+static guint max_qp = 51;
+static guint gop_size = 30;
+static guint ref_frames = 0;
+static guint slice_mode_index = 0;
+static guint num_slices = 2;
+
+#define BITRATE_STEP 100
+
+G_LOCK_DEFINE_STATIC (input_lock);
+
+typedef struct
+{
+  GstElement *pipeline;
+  GstElement *capsfilter;
+  GstElement *encoder;
+  gulong probe_id;
+
+  gint prev_width;
+  gint prev_height;
+} TestCallbackData;
+
+static void
+print_keyboard_help (void)
+{
+  /* *INDENT-OFF* */
+  static struct
+  {
+    const gchar *key_desc;
+    const gchar *key_help;
+  } key_controls = {
+    {
+    "q", "Quit"}, {
+    "right arrow", "Increase Width"}, {
+    "left arrow", "Decrease Width"}, {
+    "up arrow", "Increase Height"}, {
+    "down arrow", "Decrease Height"}, {
+    "f", "Sends force keyunit event"}, {
+    "", "Increase bitrate by 100 kbps"}, {
+    "", "Decrease bitrate by 100 kbps"}, {
+    "}", "Increase max-bitrate by 100 kbps"}, {
+    "{", "Decrease max-bitrate by 100 kbps"}, {
+    "r", "Toggle rate-control mode"}, {
+    "<", "Decrease GOP size"}, {
+    ">", "Increase GOP size"}, {
+    "+", "Incrase ref-frames"}, {
+    "-", "Decrase ref-frames"}, {
+    "I", "Increase QP-I"}, {
+    "i", "Decrease QP-I"}, {
+    "P", "Increase QP-P"}, {
+    "p", "Decrease QP-P"}, {
+    "m", "Toggle slice mode"}, {
+    "S", "Incrase number of slices"}, {
+    "s", "Decrease number of slices"}, {
+    "k", "show keyboard shortcuts"}
+  };
+  /* *INDENT-ON* */
+
+  guint i, chars_to_pad, desc_len, max_desc_len = 0;
+
+  gst_print ("\n\n%s\n\n", "Keyboard controls:");
+
+  for (i = 0; i < G_N_ELEMENTS (key_controls); ++i) {
+    desc_len = g_utf8_strlen (key_controlsi.key_desc, -1);
+    max_desc_len = MAX (max_desc_len, desc_len);
+  }
+  ++max_desc_len;
+
+  for (i = 0; i < G_N_ELEMENTS (key_controls); ++i) {
+    chars_to_pad = max_desc_len - g_utf8_strlen (key_controlsi.key_desc, -1);
+    gst_print ("\t%s", key_controlsi.key_desc);
+    gst_print ("%-*s: ", chars_to_pad, "");
+    gst_print ("%s\n", key_controlsi.key_help);
+  }
+  gst_print ("\n");
+}
+
+static void
+keyboard_cb (gchar input, gboolean is_ascii, gpointer user_data)
+{
+  TestCallbackData *data = (TestCallbackData *) user_data;
+
+  G_LOCK (input_lock);
+
+  if (!is_ascii) {
+    switch (input) {
+      case KB_ARROW_UP:
+        height += 2;
+        gst_println ("Increase height to %d", height);
+        break;
+      case KB_ARROW_DOWN:
+        height -= 2;
+        height = MAX (height, 16);
+        gst_println ("Decrease height to %d", height);
+        break;
+      case KB_ARROW_LEFT:
+        width -= 2;
+        width = MAX (width, 16);
+        gst_println ("Decrease width to %d", width);
+        break;
+      case KB_ARROW_RIGHT:
+        width += 2;
+        gst_println ("Increase width to %d", width);
+        break;
+      default:
+        break;
+    }
+  } else {
+    switch (input) {
+      case 'k':
+      case 'K':
+        print_keyboard_help ();
+        break;
+      case 'q':
+      case 'Q':
+        gst_element_send_event (data->pipeline, gst_event_new_eos ());
+        g_main_loop_quit (loop);
+        break;
+      case 'f':
+      {
+        GstEvent *event =
+            gst_video_event_new_upstream_force_key_unit (GST_CLOCK_TIME_NONE,
+            TRUE, 0);
+        gst_println ("Sending force keyunit event");
+        gst_element_send_event (data->encoder, event);
+        break;
+      }
+      case '':
+        if (bitrate < G_MAXUINT64 - BITRATE_STEP) {
+          bitrate += BITRATE_STEP;
+          max_bitrate = MAX (max_bitrate, bitrate);
+          gst_println ("Increase bitrate to %" G_GUINT64_FORMAT, bitrate);
+          g_object_set (data->encoder, "bitrate", bitrate, "max-bitrate",
+              max_bitrate, NULL);
+        }
+        break;
+      case '':
+        if (bitrate > 2 * BITRATE_STEP) {
+          bitrate -= BITRATE_STEP;
+          gst_println ("Decrease bitrate to %" G_GUINT64_FORMAT, bitrate);
+          g_object_set (data->encoder, "bitrate", bitrate, NULL);
+        }
+        break;
+      case '}':
+        if (max_bitrate < G_MAXUINT64 - BITRATE_STEP) {
+          max_bitrate += BITRATE_STEP;
+          gst_println ("Increase max bitrate to %" G_GUINT64_FORMAT,
+              max_bitrate);
+          g_object_set (data->encoder, "max-bitrate", max_bitrate, NULL);
+        }
+        break;
+      case '{':
+        if (max_bitrate > 2 * BITRATE_STEP) {
+          max_bitrate -= BITRATE_STEP;
+          bitrate = MAX (bitrate, max_bitrate);
+          gst_println ("Decrease max bitrate to %" G_GUINT64_FORMAT,
+              max_bitrate);
+          g_object_set (data->encoder, "bitrate", bitrate, "max-bitrate",
+              max_bitrate, NULL);
+        }
+        break;
+      case 'r':
+        rc_index++;
+        rc_index %= G_N_ELEMENTS (rc_modes);
+        gst_println ("Change rate control mode to %s", rc_modesrc_index);
+        gst_util_set_object_arg (G_OBJECT (data->encoder), "rate-control",
+            rc_modesrc_index);
+        break;
+      case '<':
+        gop_size--;
+        gst_println ("Updating GOP size to %u", gop_size);
+        g_object_set (data->encoder, "gop-size", gop_size, NULL);
+        break;
+      case '>':
+        gop_size++;
+        gst_println ("Updating GOP size to %u", gop_size);
+        g_object_set (data->encoder, "gop-size", gop_size, NULL);
+        break;
+      case '+':
+        ref_frames++;
+        ref_frames %= 17;
+        gst_println ("Updating ref frames to %u", ref_frames);
+        g_object_set (data->encoder, "ref-frames", ref_frames, NULL);
+        break;
+      case '-':
+        ref_frames--;
+        ref_frames %= 17;
+        gst_println ("Updating ref frames to %u", ref_frames);
+        g_object_set (data->encoder, "ref-frames", ref_frames, NULL);
+        break;
+      case 'I':
+        qp_i++;
+        qp_i %= 52;
+        if (qp_i == 0)
+          qp_i++;
+        gst_println ("Updating QP-I to %d", qp_i);
+        g_object_set (data->encoder, "qp-i", qp_i, NULL);
+        break;
+      case 'i':
+        qp_i--;
+        qp_i %= 52;
+        if (qp_i == 0)
+          qp_i = 51;
+        gst_println ("Updating QP-I to %d", qp_i);
+        g_object_set (data->encoder, "qp-i", qp_i, NULL);
+        break;
+      case 'P':
+        qp_p++;
+        qp_p %= 52;
+        if (qp_p == 0)
+          qp_p++;
+        gst_println ("Updating QP-P to %d", qp_p);
+        g_object_set (data->encoder, "qp-p", qp_p, NULL);
+        break;
+      case 'p':
+        qp_p--;
+        qp_p %= 52;
+        if (qp_p == 0)
+          qp_p = 51;
+        gst_println ("Updating QP-P to %d", qp_i);
+        g_object_set (data->encoder, "qp-p", qp_i, NULL);
+        break;
+      case 'm':
+        slice_mode_index++;
+        slice_mode_index %= G_N_ELEMENTS (slice_modes);
+        gst_println ("Updating slice mode to %s",
+            slice_modesslice_mode_index);
+        gst_util_set_object_arg (G_OBJECT (data->encoder), "slice-mode",
+            slice_modesslice_mode_index);
+        break;
+      case 'S':
+        num_slices++;
+        gst_println ("Updating slice partition to %u", num_slices);
+        g_object_set (data->encoder, "slice-partition", num_slices, NULL);
+        break;
+      case 's':
+        num_slices--;
+        gst_println ("Updating slice partition to %u", num_slices);
+        g_object_set (data->encoder, "slice-partition", num_slices, NULL);
+        break;
+      default:
+        break;
+    }
+  }
+
+  G_UNLOCK (input_lock);
+}
+
+static gboolean
+bus_msg (GstBus * bus, GstMessage * msg, gpointer user_data)
+{
+  switch (GST_MESSAGE_TYPE (msg)) {
+    case GST_MESSAGE_ERROR:{
+      GError *err;
+      gchar *dbg;
+
+      gst_message_parse_error (msg, &err, &dbg);
+      gst_printerrln ("ERROR %s", err->message);
+      if (dbg != NULL)
+        gst_printerrln ("ERROR debug information: %s", dbg);
+      g_clear_error (&err);
+      g_free (dbg);
+
+      g_main_loop_quit (loop);
+      break;
+    }
+    default:
+      break;
+  }
+
+  return TRUE;
+}
+
+static gboolean
+check_encoder_available (const gchar * encoder_name)
+{
+  gboolean ret = TRUE;
+  GstElement *elem;
+
+  elem = gst_element_factory_make (encoder_name, NULL);
+  if (!elem) {
+    gst_printerrln ("%s is not available", encoder_name);
+    return FALSE;
+  }
+
+  if (gst_element_set_state (elem,
+          GST_STATE_PAUSED) != GST_STATE_CHANGE_SUCCESS) {
+    gst_printerrln ("cannot open device");
+    ret = FALSE;
+  }
+
+  gst_element_set_state (elem, GST_STATE_NULL);
+  gst_object_unref (elem);
+
+  return ret;
+}
+
+static GstPadProbeReturn
+resolution_change_probe (GstPad * pad, GstPadProbeInfo * info,
+    gpointer user_data)
+{
+  GstPadProbeReturn ret = GST_PAD_PROBE_OK;
+  TestCallbackData *data = (TestCallbackData *) user_data;
+
+  G_LOCK (input_lock);
+
+  if (GST_IS_BUFFER (GST_PAD_PROBE_INFO_DATA (info))) {
+    GstBuffer *buffer = GST_PAD_PROBE_INFO_BUFFER (info);
+    GstPad *peer = gst_pad_get_peer (pad);
+    GstFlowReturn flow_ret = GST_FLOW_OK;
+
+    ret = GST_PAD_PROBE_HANDLED;
+
+    if (peer) {
+      flow_ret = gst_pad_chain (peer, buffer);
+
+      if (flow_ret != GST_FLOW_OK) {
+        gst_pad_remove_probe (pad, data->probe_id);
+        data->probe_id = 0;
+      } else {
+        if (data->prev_width != width || data->prev_height != height) {
+          GstCaps *caps = NULL;
+          gint next_width, next_height;
+
+          next_width = width;
+          next_height = height;
+
+          g_object_get (data->capsfilter, "caps", &caps, NULL);
+          caps = gst_caps_make_writable (caps);
+          gst_caps_set_simple (caps,
+              "width", G_TYPE_INT, next_width, "height", G_TYPE_INT,
+              next_height, NULL);
+          g_object_set (data->capsfilter, "caps", caps, NULL);
+          gst_caps_unref (caps);
+
+          data->prev_width = next_width;
+          data->prev_height = next_height;
+        }
+      }
+    }
+  }
+
+  G_UNLOCK (input_lock);
+
+  return ret;
+}
+
+gint
+main (gint argc, gchar ** argv)
+{
+  GstElement *pipeline;
+  GstElement *src, *capsfilter, *enc, *enc_queue, *dec, *parser, *queue, *sink;
+  GstStateChangeReturn sret;
+  GError *error = NULL;
+  GOptionContext *option_ctx;
+  GstCaps *caps;
+  TestCallbackData data = { 0, };
+  GstPad *pad;
+  gchar *encoder_name = NULL;
+  /* *INDENT-OFF* */
+  GOptionEntry options = {
+    {"encoder", 0, 0, G_OPTION_ARG_STRING, &encoder_name,
+        "Video encoder element to test, default: d3d12h264enc"},
+    {NULL}
+  };
+  /* *INDENT-ON* */
+
+#define MAKE_ELEMENT_AND_ADD(elem, name) G_STMT_START { \
+  GstElement *_elem = gst_element_factory_make (name, NULL); \
+  if (!_elem) { \
+    gst_printerrln ("%s is not available", name); \
+    exit (1); \
+  } \
+  gst_println ("Adding element %s", name); \
+  elem = _elem; \
+  gst_bin_add (GST_BIN (pipeline), elem); \
+} G_STMT_END
+
+  option_ctx =
+      g_option_context_new ("d3d12 video encoder dynamic reconfigure example");
+  g_option_context_add_main_entries (option_ctx, options, NULL);
+  g_option_context_set_help_enabled (option_ctx, TRUE);
+  if (!g_option_context_parse (option_ctx, &argc, &argv, &error)) {
+    gst_printerrln ("option parsing failed: %s\n", error->message);
+    g_clear_error (&error);
+    exit (1);
+  }
+
+  g_option_context_free (option_ctx);
+  gst_init (NULL, NULL);
+
+  if (!encoder_name)
+    encoder_name = g_strdup ("d3d12h264enc");
+
+  if (!check_encoder_available (encoder_name)) {
+    gst_printerrln ("Cannot load %s plugin", encoder_name);
+    exit (1);
+  }
+
+  /* prepare the pipeline */
+  loop = g_main_loop_new (NULL, FALSE);
+
+  pipeline = gst_pipeline_new (NULL);
+
+  MAKE_ELEMENT_AND_ADD (src, "videotestsrc");
+  g_object_set (src, "pattern", 1, "is-live", TRUE, NULL);
+
+  MAKE_ELEMENT_AND_ADD (capsfilter, "capsfilter");
+  MAKE_ELEMENT_AND_ADD (enc, encoder_name);
+
+  g_object_set (enc, "bitrate", bitrate, "max-bitrate", max_bitrate,
+      "qp-i", qp_i, "qp-p", qp_p, "gop-size", 30, NULL);
+
+  gst_util_set_object_arg (G_OBJECT (enc), "rate-control", rc_modesrc_index);
+
+  MAKE_ELEMENT_AND_ADD (enc_queue, "queue");
+  MAKE_ELEMENT_AND_ADD (parser, "h264parse");
+  MAKE_ELEMENT_AND_ADD (dec, "d3d12h264dec");
+  MAKE_ELEMENT_AND_ADD (queue, "queue");
+  MAKE_ELEMENT_AND_ADD (sink, "d3d12videosink");
+
+  if (!gst_element_link_many (src, capsfilter, enc, enc_queue,
+          parser, dec, queue, sink, NULL)) {
+    gst_printerrln ("Failed to link element");
+    exit (1);
+  }
+
+  caps = gst_caps_new_simple ("video/x-raw", "width", G_TYPE_INT,
+      width, "height", G_TYPE_INT, height, NULL);
+  g_object_set (capsfilter, "caps", caps, NULL);
+  gst_caps_unref (caps);
+
+  data.pipeline = pipeline;
+  data.capsfilter = capsfilter;
+  data.encoder = enc;
+
+  pad = gst_element_get_static_pad (capsfilter, "src");
+  data.probe_id = gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_BUFFER,
+      (GstPadProbeCallback) resolution_change_probe, &data, NULL);
+  gst_object_unref (pad);
+  data.prev_width = width;
+  data.prev_height = height;
+
+  gst_bus_add_watch (GST_ELEMENT_BUS (pipeline), bus_msg, &data);
+
+  /* run the pipeline */
+  sret = gst_element_set_state (pipeline, GST_STATE_PLAYING);
+  if (sret == GST_STATE_CHANGE_FAILURE) {
+    gst_printerrln ("Pipeline doesn't want to playing\n");
+  } else {
+    set_key_handler ((KeyInputCallback) keyboard_cb, &data);
+    g_main_loop_run (loop);
+    unset_key_handler ();
+  }
+
+  gst_element_set_state (pipeline, GST_STATE_NULL);
+  gst_bus_remove_watch (GST_ELEMENT_BUS (pipeline));
+
+  gst_object_unref (pipeline);
+  g_main_loop_unref (loop);
+  g_free (encoder_name);
+
+  return 0;
+}

gst-plugins-bad-1.24.5.tar.xz/tests/examples/d3d12/meson.build Added

gst-plugins-bad-1.22.7.tar.xz/tests/examples/meson.build -> gst-plugins-bad-1.24.5.tar.xz/tests/examples/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/tests/examples/mpegts/ts-parser.c -> gst-plugins-bad-1.24.5.tar.xz/tests/examples/mpegts/ts-parser.c Changed

@@ -31,6 +31,7 @@
 #include <glib/gprintf.h>
 #include <gst/gst.h>
 #include <gst/mpegts/mpegts.h>
+
 #define MPEGTIME_TO_GSTTIME(t) ((t) * (guint64)100000 / 9)
 
 static void
@@ -779,6 +780,47 @@
       }
     }
       break;
+    case GST_MTS_DESC_METADATA:
+    {
+      GstMpegtsMetadataDescriptor *metadataDescriptor;
+      if (gst_mpegts_descriptor_parse_metadata (desc, &metadataDescriptor)) {
+        g_printf ("%*s   metadata application format : 0x%04x\n", spacing, "",
+            metadataDescriptor->metadata_application_format);
+        g_printf ("%*s   metadata format             : 0x%02x\n", spacing, "",
+            metadataDescriptor->metadata_format);
+        if (metadataDescriptor->metadata_format ==
+            GST_MPEGTS_METADATA_FORMAT_IDENTIFIER_FIELD) {
+          g_printf ("%*s   metadata format identifier  : 0x%08x\n", spacing, "",
+              metadataDescriptor->metadata_format_identifier);
+        }
+        g_printf ("%*s   metadata service id         : 0x%02x\n", spacing, "",
+            metadataDescriptor->metadata_service_id);
+        g_printf ("%*s   decoder config flags        : 0x%x\n", spacing, "",
+            metadataDescriptor->decoder_config_flags);
+        g_printf ("%*s   DSM-CC flag                 : %s\n", spacing, "",
+            metadataDescriptor->dsm_cc_flag ? "Set" : "Not set");
+        g_free (metadataDescriptor);
+      }
+    }
+      break;
+    case GST_MTS_DESC_METADATA_STD:
+    {
+      guint32 metadata_input_leak_rate;
+      guint32 metadata_buffer_size;
+      guint32 metadata_output_leak_rate;
+
+      if (gst_mpegts_descriptor_parse_metadata_std (desc,
+              &metadata_input_leak_rate, &metadata_buffer_size,
+              &metadata_output_leak_rate)) {
+        g_printf ("%*s   metadata input leak rate  : %i\n", spacing, "",
+            metadata_input_leak_rate);
+        g_printf ("%*s   metadata buffer size      : %i\n", spacing, "",
+            metadata_buffer_size);
+        g_printf ("%*s   metadata output leak rate : %i\n", spacing, "",
+            metadata_output_leak_rate);
+      }
+    }
+      break;
     default:
       break;
   }

gst-plugins-bad-1.24.5.tar.xz/tests/examples/nvcodec/cudaipc.c Added

@@ -0,0 +1,189 @@
+/* GStreamer
+ * Copyright (C) 2024 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gst/gst.h>
+
+#define CUSTOM_META_NAME "GstCudaIpcTestMeta"
+
+static GstPadProbeReturn
+server_probe_cb (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
+{
+  GstBuffer *buf;
+  GstCustomMeta *meta;
+  GstStructure *s;
+  gchar *str;
+
+  buf = GST_PAD_PROBE_INFO_BUFFER (info);
+
+  meta = gst_buffer_add_custom_meta (buf, CUSTOM_META_NAME);
+  s = gst_custom_meta_get_structure (meta);
+  gst_structure_set (s, "foo", G_TYPE_STRING, "bar", "timestamp",
+      G_TYPE_UINT64, GST_BUFFER_PTS (buf), NULL);
+  str = gst_structure_serialize_full (s, GST_SERIALIZE_FLAG_NONE);
+
+  gst_println ("Added custom meta %s", str);
+
+  return GST_PAD_PROBE_OK;
+}
+
+static GstElement *
+server_process (const gchar * address)
+{
+  GError *error = NULL;
+  GstPad *sinkpad;
+  GstElement *sink;
+  GstElement *pipeline =
+      gst_parse_launch
+      ("videotestsrc ! video/x-raw,format=RGBA,framerate=1/1 ! "
+      "queue ! cudaupload ! cudaipcsink name=sink", &error);
+
+  if (!pipeline) {
+    gst_printerrln ("couldn't create pipeline, err: %s", error->message);
+    g_clear_error (&error);
+    return NULL;
+  }
+
+  sink = gst_bin_get_by_name (GST_BIN (pipeline), "sink");
+  g_assert (sink);
+
+  if (address)
+    g_object_set (sink, "address", address, NULL);
+
+  sinkpad = gst_element_get_static_pad (sink, "sink");
+  gst_pad_add_probe (sinkpad, GST_PAD_PROBE_TYPE_BUFFER,
+      (GstPadProbeCallback) server_probe_cb, NULL, NULL);
+  gst_object_unref (sinkpad);
+
+  return pipeline;
+}
+
+static GstPadProbeReturn
+client_probe_cb (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
+{
+  GstBuffer *buf;
+  GstCustomMeta *meta;
+
+  buf = GST_PAD_PROBE_INFO_BUFFER (info);
+
+  meta = gst_buffer_get_custom_meta (buf, CUSTOM_META_NAME);
+  if (!meta) {
+    gst_printerrln ("Buffer without meta");
+  } else {
+    GstStructure *s;
+    gchar *str;
+
+    s = gst_custom_meta_get_structure (meta);
+    str = gst_structure_serialize_full (s, GST_SERIALIZE_FLAG_NONE);
+    gst_println ("Found custom meta \"%s\"", str);
+    g_free (str);
+  }
+
+  return GST_PAD_PROBE_OK;
+}
+
+static GstElement *
+client_process (const gchar * address)
+{
+  GError *error = NULL;
+  GstPad *srcpad;
+  GstElement *src;
+  GstElement *pipeline =
+      gst_parse_launch ("cudaipcsrc name=src ! fakesink", &error);
+
+  if (!pipeline) {
+    gst_printerrln ("couldn't create pipeline, err: %s", error->message);
+    g_clear_error (&error);
+    return NULL;
+  }
+
+  src = gst_bin_get_by_name (GST_BIN (pipeline), "src");
+  g_assert (src);
+
+  if (address)
+    g_object_set (src, "address", address, NULL);
+
+  srcpad = gst_element_get_static_pad (src, "src");
+  gst_pad_add_probe (srcpad, GST_PAD_PROBE_TYPE_BUFFER,
+      (GstPadProbeCallback) client_probe_cb, NULL, NULL);
+  gst_object_unref (srcpad);
+
+  return pipeline;
+}
+
+gint
+main (gint argc, gchar ** argv)
+{
+  GstElement *pipeline = NULL;
+  GstStateChangeReturn sret;
+  GError *error = NULL;
+  GOptionContext *option_ctx;
+  gboolean is_server = FALSE;
+  gchar *address = NULL;
+  gboolean ret;
+  static const gchar *tags = { NULL };
+  GOptionEntry options = {
+    {"server", 0, 0, G_OPTION_ARG_NONE, &is_server,
+        "Launch server process", NULL},
+    {"address", 0, 0, G_OPTION_ARG_STRING, &address,
+        "IPC communication address"},
+    {NULL}
+  };
+  GMainLoop *loop;
+
+  option_ctx = g_option_context_new ("CUDA IPC example");
+  g_option_context_add_main_entries (option_ctx, options, NULL);
+  g_option_context_add_group (option_ctx, gst_init_get_option_group ());
+  ret = g_option_context_parse (option_ctx, &argc, &argv, &error);
+  g_option_context_free (option_ctx);
+
+  if (!ret) {
+    g_printerr ("option parsing failed: %s\n", error->message);
+    g_clear_error (&error);
+    return 1;
+  }
+
+  loop = g_main_loop_new (NULL, FALSE);
+  gst_meta_register_custom ("GstCudaIpcTestMeta", tags, NULL, NULL, NULL);
+
+  if (is_server)
+    pipeline = server_process (address);
+  else
+    pipeline = client_process (address);
+
+  if (!pipeline)
+    return 1;
+
+  sret = gst_element_set_state (pipeline, GST_STATE_PLAYING);
+  if (sret == GST_STATE_CHANGE_FAILURE) {
+    g_printerr ("Pipeline doesn't want to playing\n");
+  } else {
+    g_main_loop_run (loop);
+  }
+
+  gst_element_set_state (pipeline, GST_STATE_NULL);
+  gst_object_unref (pipeline);
+  g_main_loop_unref (loop);
+  g_free (address);
+
+  return 0;
+}

gst-plugins-bad-1.22.7.tar.xz/tests/examples/nvcodec/meson.build -> gst-plugins-bad-1.24.5.tar.xz/tests/examples/nvcodec/meson.build Changed

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11 Added

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11/meson.build Added

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11/qml6d3d11sink Added

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11/qml6d3d11sink-dyn-add Added

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11/qml6d3d11sink-dyn-add/meson.build Added

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11/qml6d3d11sink-dyn-add/qml6d3d11sink-dyn-add.cpp Added

@@ -0,0 +1,101 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QApplication>
+#include <QQmlApplicationEngine>
+#include <QQuickWindow>
+#include <QQuickItem>
+#include <QTimer>
+#include <gst/gst.h>
+
+static int
+run_application (int argc, char ** argv, GstElement * pipeline)
+{
+  QGuiApplication app(argc, argv);
+  int ret;
+
+  /* NOTE: Default API on Windows is D3D11 already */
+  QQuickWindow::setGraphicsApi(QSGRendererInterface::Direct3D11);
+
+  QQmlApplicationEngine engine;
+  engine.load (QUrl (QStringLiteral ("qrc:/qml6d3d11sink-dyn-add.qml")));
+
+  QQuickWindow *rootObject;
+
+  rootObject = static_cast<QQuickWindow *> (engine.rootObjects().first());
+
+  gst_element_set_state (pipeline, GST_STATE_PLAYING);
+
+  GstElement *tee = gst_bin_get_by_name (GST_BIN (pipeline), "t");
+  /* Add the qml6d3d11sink element on timer callback */
+  QTimer::singleShot(5000, &()
+    {
+      GstElement *queue, *sink;
+      QQuickItem *videoItem = rootObject->findChild<QQuickItem *> ("videoItem");
+
+      queue = gst_element_factory_make ("queue", nullptr);
+      sink = gst_element_factory_make ("qml6d3d11sink", nullptr);
+
+      g_object_set (sink, "widget", videoItem, nullptr);
+
+      gst_println ("Adding new qml6d3d11sink to pipeline");
+
+      gst_bin_add_many (GST_BIN (pipeline), queue, sink, nullptr);
+
+      gst_element_sync_state_with_parent (sink);
+      gst_element_sync_state_with_parent (queue);
+
+      gst_element_link_many (tee, queue, sink, nullptr);
+
+      gst_object_unref (tee);
+    });
+
+  ret = app.exec();
+
+  gst_element_set_state (pipeline, GST_STATE_NULL);
+
+  return ret;
+}
+
+int
+main(int argc, char *argv)
+{
+  GstElement *pipeline = nullptr;
+  GstElement *sink = nullptr;
+  int exit_code;
+
+  gst_init (&argc, &argv);
+
+  pipeline = gst_parse_launch ("d3d11testsrc ! "
+    "video/x-raw(memory:D3D11Memory),format=RGBA ! "
+    "tee name=t allow-not-linked=true ! queue ! fakesink sync=true", nullptr);
+
+  /* the plugin must be loaded before loading the qml file to register the
+   * GstD3D11Qt6VideoItem */
+  sink = gst_element_factory_make ("qml6d3d11sink", nullptr);
+  gst_object_unref (sink);
+
+  exit_code = run_application (argc, argv, pipeline);
+
+  gst_object_unref (pipeline);
+
+  gst_deinit ();
+
+  return exit_code;
+}

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11/qml6d3d11sink-dyn-add/qml6d3d11sink-dyn-add.qml Added

@@ -0,0 +1,59 @@
+import QtQuick 6.0
+import QtQuick.Controls 6.0
+import QtQuick.Dialogs 6.0
+import QtQuick.Window 6.0
+
+import org.freedesktop.gstreamer.Qt6D3D11VideoItem 1.0
+
+ApplicationWindow {
+    id: window
+    visible: true
+    width: 640
+    height: 480
+    x: 30
+    y: 30
+    color: "black"
+
+    Item {
+        anchors.fill: parent
+
+        GstD3D11Qt6VideoItem {
+            id: video
+            objectName: "videoItem"
+            anchors.centerIn: parent
+            width: parent.width
+            height: parent.height
+        }
+
+        Rectangle {
+            color: Qt.rgba(1, 1, 1, 0.3)
+            border.width: 1
+            border.color: "white"
+            anchors.bottom: video.bottom
+            anchors.bottomMargin: 15
+            anchors.horizontalCenter: parent.horizontalCenter
+            width : parent.width - 30
+            height: parent.height - 30
+            radius: 8
+
+            MouseArea {
+                id: mousearea
+                anchors.fill: parent
+                hoverEnabled: true
+                onEntered: {
+                    parent.opacity = 1.0
+                    hidetimer.start()
+                }
+            }
+
+            Timer {
+                id: hidetimer
+                interval: 5000
+                onTriggered: {
+                    parent.opacity = 0.0
+                    stop()
+                }
+            }
+        }
+    }
+}

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11/qml6d3d11sink-dyn-add/qml6d3d11sink-dyn-add.qrc Added

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11/qml6d3d11sink/meson.build Added

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11/qml6d3d11sink/qml6d3d11sink.cpp Added

@@ -0,0 +1,215 @@
+/* GStreamer
+ * Copyright (C) 2023 Seungha Yang <seungha@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QApplication>
+#include <QQmlApplicationEngine>
+#include <QQuickWindow>
+#include <QQuickItem>
+#include <QRunnable>
+
+#include <gst/gst.h>
+
+class PipelineRunner : public QRunnable
+{
+public:
+  PipelineRunner(GstElement * p);
+  ~PipelineRunner();
+
+  void run ();
+
+private:
+  GstElement *pipeline;
+};
+
+PipelineRunner::PipelineRunner (GstElement * p)
+{
+  pipeline = (GstElement *) gst_object_ref (p);
+}
+
+PipelineRunner::~PipelineRunner ()
+{
+  gst_object_unref (this->pipeline);
+}
+
+void
+PipelineRunner::run ()
+{
+  gst_element_set_state (this->pipeline, GST_STATE_PLAYING);
+}
+
+struct AppData
+{
+  QGuiApplication *app;
+  GstElement *pipeline;
+  GMainLoop *loop;
+  GMainContext *context;
+};
+
+static gboolean
+message_cb (GstBus * bus, GstMessage * msg, AppData * data)
+{
+  gboolean do_exit = FALSE;
+
+  switch (GST_MESSAGE_TYPE (msg)) {
+    case GST_MESSAGE_ERROR:
+      gst_println ("Got pipeline error");
+      do_exit = TRUE;
+      break;
+    case GST_MESSAGE_EOS:
+      gst_println ("Got pipeline EOS");
+      do_exit = TRUE;
+      break;
+    default:
+      break;
+  }
+
+  if (do_exit) {
+    g_main_loop_quit (data->loop);
+    data->app->quit ();
+  }
+
+  return G_SOURCE_CONTINUE;
+}
+
+static gpointer
+pipeline_watch_thread (AppData * data)
+{
+  GstBus *bus;
+
+  g_main_context_push_thread_default (data->context);
+
+  bus = gst_pipeline_get_bus (GST_PIPELINE (data->pipeline));
+  gst_bus_add_watch (bus, (GstBusFunc) message_cb, data);
+
+  g_main_loop_run (data->loop);
+
+  gst_bus_remove_watch (bus);
+  gst_object_unref (bus);
+  g_main_context_pop_thread_default (data->context);
+
+  return nullptr;
+}
+
+static int
+run_application (int argc, char ** argv, GstElement * pipeline,
+    GstElement * sink)
+{
+  QGuiApplication app (argc, argv);
+  GThread *bus_thread;
+  int ret;
+
+  /* NOTE: Default API on Windows is D3D11 already */
+  QQuickWindow::setGraphicsApi (QSGRendererInterface::Direct3D11);
+
+  QQmlApplicationEngine engine;
+  engine.load (QUrl (QStringLiteral ("qrc:/qml6d3d11sink.qml")));
+
+  QQuickItem *videoItem;
+  QQuickWindow *rootObject;
+  AppData app_data;
+
+  app_data.app = &app;
+  app_data.pipeline = pipeline;
+  app_data.context = g_main_context_new ();
+  app_data.loop = g_main_loop_new (app_data.context, FALSE);
+
+  /* find and set the videoItem on the sink */
+  rootObject = static_cast<QQuickWindow *> (engine.rootObjects().first());
+  videoItem = rootObject->findChild<QQuickItem *> ("videoItem");
+  g_assert (videoItem);
+  g_object_set (sink, "widget", videoItem, nullptr);
+
+  rootObject->scheduleRenderJob (new PipelineRunner (pipeline),
+      QQuickWindow::BeforeSynchronizingStage);
+
+  bus_thread = g_thread_new ("pipeline-watch-thread",
+      (GThreadFunc) pipeline_watch_thread, &app_data);
+
+  ret = app.exec();
+
+  g_main_loop_quit (app_data.loop);
+  g_thread_join (bus_thread);
+  g_main_loop_unref (app_data.loop);
+  g_main_context_unref (app_data.context);
+
+  gst_element_set_state (pipeline, GST_STATE_NULL);
+
+  return ret;
+}
+
+int
+main(int argc, char *argv)
+{
+  GOptionContext *option_ctx;
+  gchar *uri = nullptr;
+  GError *err = nullptr;
+  gboolean ret;
+  GOptionEntry options = {
+    {"uri", 0, 0, G_OPTION_ARG_STRING, &uri, "URI to play", nullptr},
+    {nullptr, }
+  };
+  GstElement *pipeline = nullptr;
+  GstElement *sink = nullptr;
+  int exit_code;
+
+  option_ctx = g_option_context_new ("Qt6 Direct3D11 QML render");
+  g_option_context_add_main_entries (option_ctx, options, nullptr);
+  g_option_context_add_group (option_ctx, gst_init_get_option_group ());
+  ret = g_option_context_parse (option_ctx, &argc, &argv, &err);
+  g_option_context_free (option_ctx);
+
+  if (!ret) {
+    gst_printerrln ("option parsing failed: %s", err->message);
+    g_clear_error (&err);
+    return 1;
+  }
+
+  /* the plugin must be loaded before loading the qml file to register the
+   * GstD3D11Qt6VideoItem */
+  sink = gst_element_factory_make ("qml6d3d11sink", nullptr);
+
+  if (!uri) {
+    pipeline = gst_pipeline_new (nullptr);
+
+    GstElement *src = gst_element_factory_make ("videotestsrc", nullptr);
+    GstElement *upload = gst_element_factory_make ("d3d11upload", nullptr);
+    GstElement *capsfilter = gst_element_factory_make ("capsfilter", nullptr);
+    GstCaps *caps;
+
+    caps = gst_caps_from_string ("video/x-raw(memory:D3D11Memory),format=RGBA");
+    g_object_set (capsfilter, "caps", caps, nullptr);
+    gst_caps_unref (caps);
+
+    gst_bin_add_many (GST_BIN (pipeline),
+        src, upload, capsfilter, sink, nullptr);
+    gst_element_link_many (src, upload, capsfilter, sink, nullptr);
+  } else {
+    pipeline = gst_element_factory_make ("playbin", nullptr);
+
+    g_object_set (pipeline, "uri", uri, "video-sink", sink, nullptr);
+  }
+
+  exit_code = run_application (argc, argv, pipeline, sink);
+
+  gst_object_unref (pipeline);
+
+  gst_deinit ();
+
+  return exit_code;
+}

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11/qml6d3d11sink/qml6d3d11sink.qml Added

gst-plugins-bad-1.24.5.tar.xz/tests/examples/qt6d3d11/qml6d3d11sink/qml6d3d11sink.qrc Added

gst-plugins-bad-1.22.7.tar.xz/tests/examples/va/vaenc-dynamic-reconfigure.c -> gst-plugins-bad-1.24.5.tar.xz/tests/examples/va/vaenc-dynamic-reconfigure.c Changed

gst-plugins-bad-1.22.7.tar.xz/tests/examples/webrtc/webrtcrenego.c -> gst-plugins-bad-1.24.5.tar.xz/tests/examples/webrtc/webrtcrenego.c Changed

@@ -8,15 +8,16 @@
 static GstElement *pipe1, *webrtc1, *webrtc2, *extra_src;
 static GstBus *bus1;
 
-#define SEND_SRC(pattern) "videotestsrc is-live=true pattern=" pattern " ! timeoverlay ! queue ! vp8enc ! rtpvp8pay ! queue ! " \
-    "capsfilter caps=application/x-rtp,media=video,payload=96,encoding-name=VP8"
+#define SEND_SRC(pattern, pt) "videotestsrc is-live=true pattern=" pattern \
+    " ! timeoverlay ! queue ! vp8enc ! rtpvp8pay ! queue ! capsfilter " \
+    " caps=application/x-rtp,media=video,payload=" pt ",encoding-name=VP8"
 
 static void
 _element_message (GstElement * parent, GstMessage * msg)
 {
   switch (GST_MESSAGE_TYPE (msg)) {
     case GST_MESSAGE_EOS:{
-      GstElement *receive, *webrtc;
+      GstElement *receive;
       GstPad *pad, *peer;
 
       g_print ("Got element EOS message from %s parent %s\n",
@@ -27,11 +28,9 @@
       pad = gst_element_get_static_pad (receive, "sink");
       peer = gst_pad_get_peer (pad);
 
-      webrtc = GST_ELEMENT (gst_pad_get_parent (peer));
       gst_bin_remove (GST_BIN (pipe1), receive);
 
       gst_pad_unlink (peer, pad);
-      gst_element_release_request_pad (webrtc, peer);
 
       gst_object_unref (pad);
       gst_object_unref (peer);
@@ -201,8 +200,8 @@
 {
   if (!extra_src) {
     g_print ("Adding extra stream\n");
-    extra_src =
-        gst_parse_bin_from_description (SEND_SRC ("circular"), TRUE, NULL);
+    extra_src = gst_parse_bin_from_description (SEND_SRC ("circular", "97"),
+        TRUE, NULL);
 
     gst_element_set_locked_state (extra_src, TRUE);
     gst_bin_add (GST_BIN (pipe1), extra_src);
@@ -218,9 +217,12 @@
     g_print ("Removing extra stream\n");
     pad = gst_element_get_static_pad (extra_src, "src");
     peer = gst_pad_get_peer (pad);
-    gst_element_send_event (extra_src, gst_event_new_eos ());
 
     g_object_get (peer, "transceiver", &transceiver, NULL);
+    /* Instead of removing the source, you can add a pad probe to block data
+     * flow, and you can set this to SENDONLY later to switch this track from
+     * inactive to sendonly, but this only works with non-gstreamer receivers
+     * at present. */
     g_object_set (transceiver, "direction",
         GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_INACTIVE, NULL);
 
@@ -248,8 +250,9 @@
   gst_init (&argc, &argv);
 
   loop = g_main_loop_new (NULL, FALSE);
-  pipe1 = gst_parse_launch (SEND_SRC ("smpte")
-      " ! webrtcbin name=smpte bundle-policy=max-bundle " SEND_SRC ("ball")
+  pipe1 = gst_parse_launch (SEND_SRC ("smpte", "96")
+      " ! webrtcbin name=smpte bundle-policy=max-bundle "
+      SEND_SRC ("ball", "96")
       " ! webrtcbin name=ball bundle-policy=max-bundle", NULL);
   g_object_set (pipe1, "message-forward", TRUE, NULL);
   bus1 = gst_pipeline_get_bus (GST_PIPELINE (pipe1));

gst-plugins-bad-1.22.7.tar.xz/tests/examples/webrtc/webrtcswap.c -> gst-plugins-bad-1.24.5.tar.xz/tests/examples/webrtc/webrtcswap.c Changed

gst-plugins-bad-1.24.5.tar.xz/tests/files/mse.mp4 Added

gst-plugins-bad-1.24.5.tar.xz/tests/files/mse.webm Added

gst-plugins-bad-1.22.7.tar.xz/tests/meson.build -> gst-plugins-bad-1.24.5.tar.xz/tests/meson.build Changed

gst-plugins-bad-1.24.5.tar.xz/tests/validate/autovideoconvert Added

gst-plugins-bad-1.24.5.tar.xz/tests/validate/autovideoconvert/renegotiate Added

gst-plugins-bad-1.24.5.tar.xz/tests/validate/autovideoconvert/renegotiate.validatetest Added

gst-plugins-bad-1.24.5.tar.xz/tests/validate/autovideoconvert/renegotiate/flow-expectations Added

gst-plugins-bad-1.24.5.tar.xz/tests/validate/autovideoconvert/renegotiate/flow-expectations/log-^convert-src569JNRXZghikmsexpected Added

@@ -0,0 +1,24 @@
+event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE;
+event caps: video/x-raw(memory:GLMemory), format=(string)RGBA, framerate=(fraction)30/1, height=(int)240, texture-target=(string)2D, width=(int)320;
+event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
+buffer: pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
+buffer: pts=0:00:00.033333333, dur=0:00:00.033333333
+buffer: pts=0:00:00.066666666, dur=0:00:00.033333334
+
+CHECKPOINT: Setup capsfilter caps=video/x-raw
+
+event caps: video/x-raw, format=(string)RGBA, framerate=(fraction)30/1, height=(int)240, width=(int)320;
+buffer: pts=0:00:00.100000000, dur=0:00:00.033333333
+buffer: pts=0:00:00.133333333, dur=0:00:00.033333333
+
+CHECKPOINT: Setup capsfilter caps=video/x-raw(memory:GLMemory)
+
+event caps: video/x-raw(memory:GLMemory), format=(string)RGBA, framerate=(fraction)30/1, height=(int)240, texture-target=(string)2D, width=(int)320;
+buffer: pts=0:00:00.166666666, dur=0:00:00.033333334
+buffer: pts=0:00:00.200000000, dur=0:00:00.033333333
+
+CHECKPOINT: Setup capsfilter caps=video/x-raw
+
+event caps: video/x-raw, format=(string)RGBA, framerate=(fraction)30/1, height=(int)240, width=(int)320;
+buffer: pts=0:00:00.233333333, dur=0:00:00.033333333
+buffer: pts=0:00:00.266666666, dur=0:00:00.033333334

gst-plugins-bad-1.24.5.tar.xz/tests/validate/codectimestamper Added

gst-plugins-bad-1.24.5.tar.xz/tests/validate/codectimestamper/h264_propagate_caps Added

gst-plugins-bad-1.24.5.tar.xz/tests/validate/codectimestamper/h264_propagate_caps.validatetest Added

gst-plugins-bad-1.24.5.tar.xz/tests/validate/codectimestamper/h264_propagate_caps/flow-expectations Added

gst-plugins-bad-1.24.5.tar.xz/tests/validate/codectimestamper/h264_propagate_caps/flow-expectations/log-sink-sink-expected Added

gst-plugins-bad-1.22.7.tar.xz/tests/validate/meson.build -> gst-plugins-bad-1.24.5.tar.xz/tests/validate/meson.build Changed

gst-plugins-bad-1.22.7.tar.xz/tests/validate/testsrcbin/caps_spec/flow-expectations/log-testsrcbin0-video_src_0-expected -> gst-plugins-bad-1.24.5.tar.xz/tests/validate/testsrcbin/caps_spec/flow-expectations/log-testsrcbin0-video_src_0-expected Changed

@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1, stream=(GstStream)"$GstStream$\ videotestsrc_stream_0";
-event caps: video/x-raw, format=(string)ABGR64_LE, framerate=(fraction)30/1, height=(int)1080, interlace-mode=(string)progressive, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, width=(int)1920;
-event stream-collection: stream-collection, collection=(GstStreamCollection)"$GstStreamCollection$\ streamcollection0";
+event caps: video/x-raw, format=(string)A444_16LE, framerate=(fraction)30/1, height=(int)1080, interlace-mode=(string)progressive, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, width=(int)1920;
+event stream-collection: stream-collection, collection=(GstStreamCollection)"$GstStreamCollection$\ unparented";
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
 event eos: (no structure)

gst-plugins-bad-1.22.7.tar.xz/tools/meson.build -> gst-plugins-bad-1.24.5.tar.xz/tools/meson.build Changed

@@ -1,7 +1,24 @@
-executable('gst-transcoder-' + api_version,
-  'gst-transcoder.c', 'utils.c',
-  install : true,
-  install_tag : 'bin',
-  dependencies : gst_dep, gstpbutils_dep, gst_transcoder_dep,
-  c_args: '-DG_LOG_DOMAIN="gst-transcoder-@0@"'.format(api_version),
-)
+gst_tools = {
+  'gst-transcoder': {
+    'files': files('gst-transcoder.c', 'utils.c'),
+    'deps': gst_dep, gstpbutils_dep, gst_transcoder_dep,
+  },
+}
+
+if not get_option('tools').disabled() and not static_build
+  foreach tool, data: gst_tools
+    exe_name = '@0@-@1@'.format(tool, api_version)
+    executable(exe_name,
+      data.get('files'),
+      install: data.get('install', true),
+      install_tag: 'bin',
+      include_directories : data.get('include_directories', configinc),
+      dependencies : data.get('deps'),
+      c_args: data.get('extra_c_args', ) + '-DG_LOG_DOMAIN="@0@"'.format(exe_name),
+    )
+
+    if data.has_key('man_page')
+      install_man(data.get('man_page'))
+    endif
+  endforeach
+endif
\ No newline at end of file

Build Results
RPM Lint

Refresh

Comments for request 6068 0

Request History

zaitor created request 6 months ago

New stable branch

zaitor accepted request 6 months ago

Xin